commit 68928a326d9ca9b0a9a68b2629f8fd05a0a22e86
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 16 00:46:30 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 00:46:30 2025 -0800
tree d9521c6a57c9476766c836510342ebbed9d306df
parent e392a6af29de15e1a4a97fe8b72d00ab6bac7b64
parent 93c562b16c621a5061922d0279025a2995d1d653

Merge "Update memoffset to 0.9.1" into main

crates/anyhow/.android-checksum.json

diff --git a/crates/anyhow/.android-checksum.json b/crates/anyhow/.android-checksum.json
index 6806122..17f0459 100644
--- a/crates/anyhow/.android-checksum.json
+++ b/crates/anyhow/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"eb6ac638329e1e22dff1a85c94cc3466af98a3e057d9806dcf354570cac200cd","Android.bp":"ee8a7d1eb0ed6f0e9f6170590dd0ffb1fbfab561db53e96e76105a5043c17554","Cargo.toml":"a239b1153fe69af2dac6e8cb8858711a84ca06b7a39fb2a08eb5745225a4d314","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"e28c08e692d8edcf4cf416b41f8679d3acdd4b8cb3d7ac93bd1d07335841fb16","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","README.md":"8a77d709791a6f1cb645d2526bc5213c9de5c9d17c631844dd3a23958be1ad73","TEST_MAPPING":"29c108f688eb487511b09dad52fd194a6c615116e8b6cbd1e086bfd0446fbe49","build.rs":"e0dac83067c845e156836f0024fca74692325f6ebbae30f702b53e4e530e4051","build/probe.rs":"d6fedff361865fdfac422b38c7e377cd9044b4ee6cfddc971f69647568bdb727","cargo_embargo.json":"8de1ddbaead22702faddd35234241c9bac36a1732a4d91d693ac3c9f1ef9de27","patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch":"c1f3920eccde9102ec4eb781e16af4a8d44332d9340afa5890463fce7fe6e767","rust-toolchain.toml":"25bc44c2a4cb625e0f16003c73ac0db2fc79a3b79a5b0e6d4b6175c6dbe5af69","src/backtrace.rs":"d9d4415db753717978ccb20df5fccca2e7bfac14ae5529cb384b82732c4db804","src/chain.rs":"c1af745a06948c326758c185c50d5f46e54b5628098091d1ca53b3569d29dc66","src/context.rs":"0c9b6ee3126f2af8d34e7e749d0a70aaa0fa33c6b462b14a7c7fa2e9c9792336","src/ensure.rs":"db4aa1411171ce2cd03518d583b302bbbf4e6f7f456bac15d1d867bd6f8808f6","src/error.rs":"9c5d4ee6a6473c7dcbbeb0d01c41cc56e36e01dd4af7e453135d669a82d5bce4","src/fmt.rs":"805c7503e09f60bf78932b36b3e3ba56881597358cafe183f99878a256bd1bf1","src/kind.rs":"d466f5fe9d5ddc1ec010ee3a8e8bfdacd241ceffc3672a207a6a82a0ff8ec9f0","src/lib.rs":"da49746563a57801f83b5b5e530dce47a018aa84daa8768cb79656011213aa99","src/macros.rs":"e3e5aaa02b7c76ef9282dcff6763c0df8418c032a7e11a410be33390c033fb35","src/ptr.rs":"fb5381f35e251f864d19bbf5c12267500e3f1dba4b2a3b778c43a28f9d37ddf1","src/wrapper.rs":"ea6e738a1be71dc45be466df6b5fdac2967c47e487f0ae0579d5274a827094d4","tests/common/mod.rs":"d94b75b7944203361428a1c836608fb591b794756dfc05e64f82d6ac4462ce79","tests/compiletest.rs":"8f2cbc080ae802a72afbc627b943e187f66bfe0214f7d989460badb57ddfbb8d","tests/drop/mod.rs":"6014e5b3530fe0827b9dc65ef01de6bfc1a0b1f8649dc69c3e40f61343985dc6","tests/test_autotrait.rs":"4a0dee1d8479aff7d4e39e06fb750df4b6e9cac492099bbab91ed20a5248e457","tests/test_backtrace.rs":"fa323eec398ca29f95a1cda7cd52602d7550d251cf0ee0791100a477e0656ed9","tests/test_boxed.rs":"09eb41525fc3cecb764e6778be876d1d4ffb81fa096659ca7ff2e753d3f2030c","tests/test_chain.rs":"262727a8ac16a701bf71c86d768e14452a77fffcebb34943186a0cbb87161866","tests/test_context.rs":"4746fa09f5ae9284304d2bb394350f089ce8ca5c2f0418b34145f3588e2aeb58","tests/test_convert.rs":"06562ab10fd1d88990a38ed400eb6ab4707e89c7f1e5cd1125992b4615ad8046","tests/test_downcast.rs":"c30595e7dab09f0d1246a554a6fc1f0857665234498ff13eb7df7597d0a4718d","tests/test_ensure.rs":"6d957308486ed80d4b9ae2c4ddaafb52f4a39145479cd93a9eddb927b57b03ec","tests/test_ffi.rs":"161a32a63dbdda98e129e2f943afb3fae4e68ca2cee1fef40f18e84b1e74138b","tests/test_fmt.rs":"f2e5123bd2232f59809f633e955027a2d0e9aa567dc8eedbee417eeebfa76e60","tests/test_macros.rs":"074a6d20e953d38d44c8860aa9083b7570c3cd58b0f632bef37d290b60aa5067","tests/test_repr.rs":"053356028202f3fea232745ab3aa8eba05fec011da43fcb8f856c81927f455cd","tests/test_source.rs":"54bb2d6fc197ede956f7696f86371357e4c14665a685d83a54b94fbfa6511d95","tests/ui/chained-comparison.rs":"910c5b8fdc859eabc2d6bc99b40569327f876cc85575039c4c3abf2c3977f1df","tests/ui/chained-comparison.stderr":"4f747b5a7e118a5d01c45e5d873c7f9461064e182b465dacb51ebf0c74abc235","tests/ui/empty-ensure.rs":"cc27e33cf5a48c9da6c1428a2369ca42dfa278229e479208f18efce5a4b12dcf","tests/ui/empty-ensure.stderr":"4a10e37a7eb01e15df621dd7ae340e71eb1b1e27bdd8da987bc3c5dc23bc437c","tests/ui/must-use.rs":"ec808205dd1957405858e72d67ae797de6059646858177840d9236554d3bc216","tests/ui/must-use.stderr":"211bddda8eed673b87e886ccd2beeb2f444c347d2be8cbd6f4c0dd2e3bb736a1","tests/ui/no-impl.rs":"f6262246417870658aa407892096680e0fc251873a33ed3ea4aa5f36b856d616","tests/ui/no-impl.stderr":"704ea781435ed5f2780b7af28c88cf8915e5475c8bf9ea6b9fe764d7b0611ccd","tests/ui/temporary-value.rs":"5b41a722c1de06cf094a9778d772f1fbde2f11e4fabfcd1d63020f930bfda107","tests/ui/temporary-value.stderr":"85c060a15ec8dad4a1971706e22e048bb3d3b1d1307b56628fd03e95563bdfce","tests/ui/wrong-interpolation.rs":"27554486996e93cc5ae9b05f74cd6b8c92d0654284741bc3d1426dcf622c8ea1","tests/ui/wrong-interpolation.stderr":"86394096d6b66ce0355c77a466dfb355ebe700154f82412dad391767c007290e"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"2b9bbb7069087bdff3bb65c77f5a097a646046eaf140639622ffee9b41227e93","Android.bp":"19834c7501599ed756a6e2427e00e3ebab75ba73288d19cd164a7bd9f162d840","Cargo.toml":"ac95f981b23c70ea175e59704904b74ead55d82a37d98629b44ed9f8ea164469","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"bcae4642b151f8ba51561f3a2a2d39ec6c236b292b0b9c2e7d6f124283aa6587","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","README.md":"183e2c7bed174e9a35c3917de2160585f057bf302d56958329de0d867e1ce537","TEST_MAPPING":"29c108f688eb487511b09dad52fd194a6c615116e8b6cbd1e086bfd0446fbe49","build.rs":"37a90d5fe4a386cdf72c0a81f40d49572e0e8e44b3c5c4c034c6288bcd01b60b","build/probe.rs":"ca94474c6ba3d02f68acda33b5cf060ba7c21c916a3925fec514212861d0e25c","cargo_embargo.json":"8de1ddbaead22702faddd35234241c9bac36a1732a4d91d693ac3c9f1ef9de27","patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch":"3d7d29ffe13113a36e0cac95abafb1dec4fbd27d8527ca0eba357c1fcbb793b8","rust-toolchain.toml":"25bc44c2a4cb625e0f16003c73ac0db2fc79a3b79a5b0e6d4b6175c6dbe5af69","src/backtrace.rs":"bff4118d23ae4585136bea47b6ce87ebb1d836ad4a962dcc2ef35ccabc7d518a","src/chain.rs":"9b925129e4aa99f6aaa66f801752cace3924ddeabb858655dae7d82083c5f05a","src/context.rs":"5903781a8cdf048199cd29b065714f7f1b1d3b4baa3b982a40901ef0404e1231","src/ensure.rs":"3c2f8c92d1b878d16caa2a1cef527eff4afa0184e76fecba2454974b0bebc50f","src/error.rs":"873995ea757d30a10ab7db12352065bb0c0ff082f0ccae2489eb838d92150f31","src/fmt.rs":"21689e9443109fa58677269fc6c6004909c63677da0886e8d99e2b8d63c15438","src/kind.rs":"3f6731b901afe9be7877db5a125d0e18ee2ddd8d4b7a572534cd132b9d5e144a","src/lib.rs":"82761355a51533ba8eecf44c68496e2218321f11bb50aac294465491b51aff1e","src/macros.rs":"ea096b7a733c527eac71fac0479439e9a6d9860264796a640fc69b83dae39bf3","src/ptr.rs":"fb5381f35e251f864d19bbf5c12267500e3f1dba4b2a3b778c43a28f9d37ddf1","src/wrapper.rs":"8a7323dd2981eb7faf05bba78b9a989f7f6ade45adae5a082616631cea3dc79a","tests/common/mod.rs":"d94b75b7944203361428a1c836608fb591b794756dfc05e64f82d6ac4462ce79","tests/compiletest.rs":"5876a4728abd95ed4ed3b78777fe95428d32a32730d7718f58001bdbd4d1e168","tests/drop/mod.rs":"6014e5b3530fe0827b9dc65ef01de6bfc1a0b1f8649dc69c3e40f61343985dc6","tests/test_autotrait.rs":"f3a4992b0a9c7e68395f8c6ffe7256c64a0effb729dbb638dde5bfc596df74f6","tests/test_backtrace.rs":"12f8d2bc280eb7a843c1ec423ed74c156deeebcb2f4f0df6657fc32661d21d9a","tests/test_boxed.rs":"09eb41525fc3cecb764e6778be876d1d4ffb81fa096659ca7ff2e753d3f2030c","tests/test_chain.rs":"262727a8ac16a701bf71c86d768e14452a77fffcebb34943186a0cbb87161866","tests/test_context.rs":"4746fa09f5ae9284304d2bb394350f089ce8ca5c2f0418b34145f3588e2aeb58","tests/test_convert.rs":"06562ab10fd1d88990a38ed400eb6ab4707e89c7f1e5cd1125992b4615ad8046","tests/test_downcast.rs":"c30595e7dab09f0d1246a554a6fc1f0857665234498ff13eb7df7597d0a4718d","tests/test_ensure.rs":"6a3f2121ad073878599c0c13631f6897351e2890a44ed7b87b148680f59a433f","tests/test_ffi.rs":"161a32a63dbdda98e129e2f943afb3fae4e68ca2cee1fef40f18e84b1e74138b","tests/test_fmt.rs":"2a971e5e9595a0af78325658cb74fa0e88fc39da8af05ec8c443dd35b359fccc","tests/test_macros.rs":"8b6f94d010bf74947e73862ca117e786ad440a0d800e387964bd0320d47f73ae","tests/test_repr.rs":"aac784a91c2347f397b960a92cfe6c56aba38f68216579e3e802e2cac131f761","tests/test_source.rs":"54bb2d6fc197ede956f7696f86371357e4c14665a685d83a54b94fbfa6511d95","tests/ui/chained-comparison.rs":"910c5b8fdc859eabc2d6bc99b40569327f876cc85575039c4c3abf2c3977f1df","tests/ui/chained-comparison.stderr":"4f747b5a7e118a5d01c45e5d873c7f9461064e182b465dacb51ebf0c74abc235","tests/ui/empty-ensure.rs":"cc27e33cf5a48c9da6c1428a2369ca42dfa278229e479208f18efce5a4b12dcf","tests/ui/empty-ensure.stderr":"4a10e37a7eb01e15df621dd7ae340e71eb1b1e27bdd8da987bc3c5dc23bc437c","tests/ui/ensure-nonbool.rs":"81e39527169c0cc2e0c34bbf4714570efb21ce65ad7e7abe421a5ab87c6da1c5","tests/ui/ensure-nonbool.stderr":"2819e6e4261e3b2a2e10d177d1c8f9622c8723843d2bb2cc8ef7a16acd9630c1","tests/ui/must-use.rs":"ec808205dd1957405858e72d67ae797de6059646858177840d9236554d3bc216","tests/ui/must-use.stderr":"211bddda8eed673b87e886ccd2beeb2f444c347d2be8cbd6f4c0dd2e3bb736a1","tests/ui/no-impl.rs":"f6262246417870658aa407892096680e0fc251873a33ed3ea4aa5f36b856d616","tests/ui/no-impl.stderr":"850e114f66992b8ec3a7c52e394195be98cdb55176b01a2e0e61db7fd0a5ac49","tests/ui/temporary-value.rs":"5b41a722c1de06cf094a9778d772f1fbde2f11e4fabfcd1d63020f930bfda107","tests/ui/temporary-value.stderr":"85c060a15ec8dad4a1971706e22e048bb3d3b1d1307b56628fd03e95563bdfce","tests/ui/wrong-interpolation.rs":"27554486996e93cc5ae9b05f74cd6b8c92d0654284741bc3d1426dcf622c8ea1","tests/ui/wrong-interpolation.stderr":"86394096d6b66ce0355c77a466dfb355ebe700154f82412dad391767c007290e"}}
\ No newline at end of file

crates/anyhow/.cargo-checksum.json

diff --git a/crates/anyhow/.cargo-checksum.json b/crates/anyhow/.cargo-checksum.json
index 367a669..f976510 100644
--- a/crates/anyhow/.cargo-checksum.json
+++ b/crates/anyhow/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"1696b9f34686556027ae9ba768e09f5e4a2362291158399fed2a1891a13d02ed","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"0999fd320cdb3300dd22ff03b97cd41945cc9833a02a5b7c53ed36ab6d6f66e7","build.rs":"a5ac61a8922f6b9bf319e2f8c0c20bdafb362b9c1f7805fc6d878660708e5ac2","build/probe.rs":"b8b792036f13c9c1fbc6b1244198ea2305e61ddfcda3856563b581dcb1e1fe6e","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"652ab0ff85c57cb6d34b97e15a705494f50aef77fc3916333d2b25ee05e6406c","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"04e4b80b9f6d8163edc53455b98ab0c40cb9ad104bcf0c74f8075f22024471ab","src/ensure.rs":"d4c2588608e529275bfee1c1afc8860d7def868ab01e95a692a995ee06b2936e","src/error.rs":"a274234af662770340b237c9016beea2f94e7906f3fe69d0d78057929889f25b","src/fmt.rs":"b27311c860a9bd7c2b16367a30fc5131b3eea56751e69208d196dfc656a2ba91","src/kind.rs":"89883cd3287921355ee99c988fb7687beb77644c3dec6fb3bb1308db5d6dc51a","src/lib.rs":"bbe72815f1ab2fdba675990e4083b77f62a96e76031a55ce5ad27ef98a230f2b","src/macros.rs":"dd35f2ec2a0a25e4504fb04bcd42f6d0963bc0035aaaefc412f5ee1d78945fe1","src/ptr.rs":"4cb31d2f815b178daf951bfb94a1930383e056c0ca68d494603f45d8eea35d50","src/wrapper.rs":"8800848623b464eb19e77550201e446ff6913c8c39537fe6f70df9e2b43a9b21","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"ecccf9202a33611f64b76598806aa82abec2560ae058e32f63fb2fb3ef225be9","tests/test_backtrace.rs":"ed144f90bf62cc441de067f6cee09ece94bca9da8f9b492d11d3dc652ba83e26","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"3a8a8d7569913bd98c0e27c69d0bda35101e7fde7c056ed57cdd8ed018e4cbcb","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"797e69a72d125758c4c4897e5dc776d549d52cc9a6a633e0a33193f588a62b88","tests/test_ensure.rs":"89bb15f2a6288037bcf6ad976705038d9bea714da4244dee8314c720f88393c8","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"81b14dd207ba5fbf02aaed031646810906c9c9c2fc5cabffc8e88f82462be499","tests/test_macros.rs":"11f05010bc9b16319884c1286444100e30cddc2ecd1ffe5e0fd3fee5ffb32683","tests/test_repr.rs":"b3fa96b52a98b2111e845b59974910acb107a6526514c80fc5d9db7eed402682","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"315782f5f4246290fe190e3767b22c3dcaffaabc19c5ace0373537d53e765278","tests/ui/must-use.rs":"fb59860b43f673bf4a430a6036ba463e95028844d8dd4243cfe5ebc7f2be582f","tests/ui/must-use.stderr":"c2848c5f254b4c061eea6714d9baf709924aba06619eaf2a8b3aee1266b75f9e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"04415aeaa14995f47f06f35fb1f6971d332d2110aabca920c30ab0803d6a0a5e","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"171f6c1c962503855480696e5d39e68946ec2a027b61a6f36ca1ad1b40265c5d","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"}
\ No newline at end of file
+{"files":{"Cargo.toml":"c48ec90cc7af9588407beaafaebf22839f25cf8bcb7a3c6cac5cc8c83bde3a91","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"136d2b44cc4060192516f18e43ec3eafb65693c1819a80a867e7a00c60a45ee6","build.rs":"27bcb3380f8b9b52a12d1aedad324858a94de974f17efa86ff93aa7e556b3798","build/probe.rs":"ee0a4518493c0b3cca121ed2e937b1779eb7e8313a5c4d5fc5aea28ff015366b","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"bbaa0e0e228475c9c9532786e305cf04f53729f386c48adb1d93bb8ce07f37ad","src/chain.rs":"85af447405f075633fab186b7f1c94d7f33a36474f239c50a961b2d6197d5426","src/context.rs":"a80ec8f297c1eae04653a6786042e316c5ff2fa6f5ea8566108bee8bdcc705cb","src/ensure.rs":"709524741c8f9365e01cb36fc2349a8724513de02cf9e253809a93af8d6a7b6e","src/error.rs":"c212c4599541c7561d5098aa61a9d112d6291ab181502e7cf874cc7085083398","src/fmt.rs":"adf4be906b29900153bfb4b767a6049d58697dc3bcce7dfbb85ca773f5de5b33","src/kind.rs":"ddcabf15b3b47a4ef16ed361c45cc0cc82e7be90622995ff6c04b3fec78bb04f","src/lib.rs":"bd57600ee8caa6a1c2fc9a60befa627223add2177527db49c144c902112e3698","src/macros.rs":"875797636fde708dcb9c82e0cb3107cf38334086274aaada267fb5bfd60547a9","src/ptr.rs":"4cb31d2f815b178daf951bfb94a1930383e056c0ca68d494603f45d8eea35d50","src/wrapper.rs":"d4e45caee3c2d861d4609a8141310d5c901af59a57d5f0a0de30251347dbd23c","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"ba9bc18416115cb48fd08675a3e7fc89584de7926dad6b2be6645dc13d5931df","tests/test_backtrace.rs":"60afdd7ee5850dc22625ff486fe41c47fd322db874a93c4871ddfed2bf603930","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"3a8a8d7569913bd98c0e27c69d0bda35101e7fde7c056ed57cdd8ed018e4cbcb","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"797e69a72d125758c4c4897e5dc776d549d52cc9a6a633e0a33193f588a62b88","tests/test_ensure.rs":"5ac28daf6889e957134309c0a0fbdec89b6bd974596e2205fbc4e8c1bb02ee5b","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"0e49b48f08e4faaf03e2f202e1efc5250018876c4e1b01b8379d7a38ae8df870","tests/test_macros.rs":"68673942662a43bceee62aaed69c25d7ddbc55e25d62d528e13033c3e2e756cd","tests/test_repr.rs":"034dee888abd08741e11ac2e95ef4fcb2ab3943d0a76e8e976db404658e1a252","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"315782f5f4246290fe190e3767b22c3dcaffaabc19c5ace0373537d53e765278","tests/ui/ensure-nonbool.rs":"7e57cb93fbcd82959b36586ed6bd2ad978b051fe5facd5274651fde6b1600905","tests/ui/ensure-nonbool.stderr":"0b4d1611e3bb65081bf38c1e49b1f12e5096738f276608661016e68f1fe13f7c","tests/ui/must-use.rs":"fb59860b43f673bf4a430a6036ba463e95028844d8dd4243cfe5ebc7f2be582f","tests/ui/must-use.stderr":"c2848c5f254b4c061eea6714d9baf709924aba06619eaf2a8b3aee1266b75f9e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"0d8ed712d25de898eae18cfdffc575a47f4d5596346058cf6cd50d016c4f8ce8","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"171f6c1c962503855480696e5d39e68946ec2a027b61a6f36ca1ad1b40265c5d","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"}
\ No newline at end of file

crates/anyhow/Android.bp

diff --git a/crates/anyhow/Android.bp b/crates/anyhow/Android.bp
index 9b9c2cf..cc6311c 100644
--- a/crates/anyhow/Android.bp
+++ b/crates/anyhow/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "anyhow",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -41,7 +41,7 @@
     host_supported: true,
     crate_name: "test_autotrait",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_autotrait.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -65,7 +65,7 @@
     host_supported: true,
     crate_name: "test_boxed",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_boxed.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -89,7 +89,7 @@
     host_supported: true,
     crate_name: "test_chain",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_chain.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -113,7 +113,7 @@
     host_supported: true,
     crate_name: "test_context",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_context.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -137,7 +137,7 @@
     host_supported: true,
     crate_name: "test_convert",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_convert.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -161,7 +161,7 @@
     host_supported: true,
     crate_name: "test_downcast",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_downcast.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -185,7 +185,7 @@
     host_supported: true,
     crate_name: "test_fmt",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_fmt.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -209,7 +209,7 @@
     host_supported: true,
     crate_name: "test_macros",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_macros.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -233,7 +233,7 @@
     host_supported: true,
     crate_name: "test_repr",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_repr.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -257,7 +257,7 @@
     host_supported: true,
     crate_name: "test_source",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "tests/test_source.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -281,7 +281,7 @@
     host_supported: true,
     crate_name: "anyhow",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.79",
+    cargo_pkg_version: "1.0.95",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [

crates/anyhow/Cargo.toml

diff --git a/crates/anyhow/Cargo.toml b/crates/anyhow/Cargo.toml
index b92e7a3..119adf4 100644
--- a/crates/anyhow/Cargo.toml
+++ b/crates/anyhow/Cargo.toml
@@ -13,8 +13,14 @@
 edition = "2018"
 rust-version = "1.39"
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.95"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
+build = "build.rs"
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Flexible concrete Error type built on std::error::Error"
 documentation = "https://docs.rs/anyhow"
 readme = "README.md"
@@ -30,16 +36,74 @@
 repository = "https://github.com/dtolnay/anyhow"
 
 [package.metadata.docs.rs]
-rustdoc-args = [
-    "--cfg",
-    "doc_cfg",
-    "--generate-link-to-definition",
-]
+rustdoc-args = ["--generate-link-to-definition"]
 targets = ["x86_64-unknown-linux-gnu"]
 
+[features]
+default = ["std"]
+std = []
+
 [lib]
+name = "anyhow"
+path = "src/lib.rs"
 doc-scrape-examples = false
 
+[[test]]
+name = "compiletest"
+path = "tests/compiletest.rs"
+
+[[test]]
+name = "test_autotrait"
+path = "tests/test_autotrait.rs"
+
+[[test]]
+name = "test_backtrace"
+path = "tests/test_backtrace.rs"
+
+[[test]]
+name = "test_boxed"
+path = "tests/test_boxed.rs"
+
+[[test]]
+name = "test_chain"
+path = "tests/test_chain.rs"
+
+[[test]]
+name = "test_context"
+path = "tests/test_context.rs"
+
+[[test]]
+name = "test_convert"
+path = "tests/test_convert.rs"
+
+[[test]]
+name = "test_downcast"
+path = "tests/test_downcast.rs"
+
+[[test]]
+name = "test_ensure"
+path = "tests/test_ensure.rs"
+
+[[test]]
+name = "test_ffi"
+path = "tests/test_ffi.rs"
+
+[[test]]
+name = "test_fmt"
+path = "tests/test_fmt.rs"
+
+[[test]]
+name = "test_macros"
+path = "tests/test_macros.rs"
+
+[[test]]
+name = "test_repr"
+path = "tests/test_repr.rs"
+
+[[test]]
+name = "test_source"
+path = "tests/test_source.rs"
+
 [dependencies.backtrace]
 version = "0.3.51"
 optional = true
@@ -56,12 +120,8 @@
 features = ["full"]
 
 [dev-dependencies.thiserror]
-version = "1.0.45"
+version = "2"
 
 [dev-dependencies.trybuild]
 version = "1.0.66"
 features = ["diff"]
-
-[features]
-default = ["std"]
-std = []

crates/anyhow/METADATA

diff --git a/crates/anyhow/METADATA b/crates/anyhow/METADATA
index 3600ae8..164ed5c 100644
--- a/crates/anyhow/METADATA
+++ b/crates/anyhow/METADATA
@@ -1,17 +1,17 @@
 name: "anyhow"
 description: "Flexible concrete Error type built on std::error::Error"
 third_party {
-  version: "1.0.79"
+  version: "1.0.95"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
+    year: 2025
     month: 1
-    day: 31
+    day: 15
   }
   homepage: "https://crates.io/crates/anyhow"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/anyhow/anyhow-1.0.79.crate"
-    version: "1.0.79"
+    value: "https://static.crates.io/crates/anyhow/anyhow-1.0.95.crate"
+    version: "1.0.95"
   }
 }

crates/anyhow/README.md

diff --git a/crates/anyhow/README.md b/crates/anyhow/README.md
index ccf3097..ff83168 100644
--- a/crates/anyhow/README.md
+++ b/crates/anyhow/README.md
@@ -26,7 +26,7 @@
   return type of any fallible function.
 
   Within the function, use `?` to easily propagate any error that implements the
-  `std::error::Error` trait.
+  [`std::error::Error`] trait.
 
   ```rust
   use anyhow::Result;
@@ -38,6 +38,8 @@
   }
   ```
 
+  [`std::error::Error`]: https://doc.rust-lang.org/std/error/trait.Error.html
+
 - Attach context to help the person troubleshooting the error understand where
   things went wrong. A low-level error like "No such file or directory" can be
   annoying to debug without more context about what higher level step the
@@ -125,8 +127,8 @@
 
 ## No-std support
 
-In no_std mode, the same API is almost all available and works the same way. To
-depend on Anyhow in no_std mode, disable our default enabled "std" feature in
+In no_std mode, almost all of the same API is available and works the same way.
+To depend on Anyhow in no_std mode, disable our default enabled "std" feature in
 Cargo.toml. A global allocator is required.
 
 ```toml
@@ -134,10 +136,10 @@
 anyhow = { version = "1.0", default-features = false }
 ```
 
-Since the `?`-based error conversions would normally rely on the
-`std::error::Error` trait which is only available through std, no_std mode will
-require an explicit `.map_err(Error::msg)` when working with a non-Anyhow error
-type inside a function that returns Anyhow's error type.
+With versions of Rust older than 1.81, no_std mode may require an additional
+`.map_err(Error::msg)` when working with a non-Anyhow error type inside a
+function that returns Anyhow's error type, as the trait that `?`-based error
+conversions are defined by is only available in std in those old versions.
 
 <br>
 

crates/anyhow/build.rs

diff --git a/crates/anyhow/build.rs b/crates/anyhow/build.rs
index 7e95e6b..8124690 100644
--- a/crates/anyhow/build.rs
+++ b/crates/anyhow/build.rs
@@ -1,5 +1,8 @@
 use std::env;
 use std::ffi::OsString;
+use std::fs;
+use std::io::ErrorKind;
+use std::iter;
 use std::path::Path;
 use std::process::{self, Command, Stdio};
 use std::str;
@@ -64,6 +67,17 @@
         None => return,
     };
 
+    if rustc >= 80 {
+        println!("cargo:rustc-check-cfg=cfg(anyhow_nightly_testing)");
+        println!("cargo:rustc-check-cfg=cfg(anyhow_no_core_error)");
+        println!("cargo:rustc-check-cfg=cfg(anyhow_no_core_unwind_safe)");
+        println!("cargo:rustc-check-cfg=cfg(anyhow_no_fmt_arguments_as_str)");
+        println!("cargo:rustc-check-cfg=cfg(anyhow_no_ptr_addr_of)");
+        println!("cargo:rustc-check-cfg=cfg(anyhow_no_unsafe_op_in_unsafe_fn_lint)");
+        println!("cargo:rustc-check-cfg=cfg(error_generic_member_access)");
+        println!("cargo:rustc-check-cfg=cfg(std_backtrace)");
+    }
+
     if rustc < 51 {
         // core::ptr::addr_of
         // https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#stabilized-apis
@@ -80,11 +94,23 @@
         println!("cargo:rustc-cfg=anyhow_no_unsafe_op_in_unsafe_fn_lint");
     }
 
+    if rustc < 56 {
+        // core::panic::{UnwindSafe, RefUnwindSafe}
+        // https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html#stabilized-apis
+        println!("cargo:rustc-cfg=anyhow_no_core_unwind_safe");
+    }
+
     if !error_generic_member_access && cfg!(feature = "std") && rustc >= 65 {
         // std::backtrace::Backtrace
         // https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html#stabilized-apis
         println!("cargo:rustc-cfg=std_backtrace");
     }
+
+    if rustc < 81 {
+        // core::error::Error
+        // https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#coreerrorerror
+        println!("cargo:rustc-cfg=anyhow_no_core_error");
+    }
 }
 
 fn compile_probe(rustc_bootstrap: bool) -> bool {
@@ -101,17 +127,25 @@
 
     let rustc = cargo_env_var("RUSTC");
     let out_dir = cargo_env_var("OUT_DIR");
+    let out_subdir = Path::new(&out_dir).join("probe");
     let probefile = Path::new("build").join("probe.rs");
 
-    // Make sure to pick up Cargo rustc configuration.
-    let mut cmd = if let Some(wrapper) = env::var_os("RUSTC_WRAPPER") {
-        let mut cmd = Command::new(wrapper);
-        // The wrapper's first argument is supposed to be the path to rustc.
-        cmd.arg(rustc);
-        cmd
-    } else {
-        Command::new(rustc)
-    };
+    if let Err(err) = fs::create_dir(&out_subdir) {
+        if err.kind() != ErrorKind::AlreadyExists {
+            eprintln!("Failed to create {}: {}", out_subdir.display(), err);
+            process::exit(1);
+        }
+    }
+
+    let rustc_wrapper = env::var_os("RUSTC_WRAPPER").filter(|wrapper| !wrapper.is_empty());
+    let rustc_workspace_wrapper =
+        env::var_os("RUSTC_WORKSPACE_WRAPPER").filter(|wrapper| !wrapper.is_empty());
+    let mut rustc = rustc_wrapper
+        .into_iter()
+        .chain(rustc_workspace_wrapper)
+        .chain(iter::once(rustc));
+    let mut cmd = Command::new(rustc.next().unwrap());
+    cmd.args(rustc);
 
     if !rustc_bootstrap {
         cmd.env_remove("RUSTC_BOOTSTRAP");
@@ -122,8 +156,9 @@
         .arg("--crate-name=anyhow")
         .arg("--crate-type=lib")
         .arg("--emit=dep-info,metadata")
+        .arg("--cap-lints=allow")
         .arg("--out-dir")
-        .arg(out_dir)
+        .arg(&out_subdir)
         .arg(probefile);
 
     if let Some(target) = env::var_os("TARGET") {
@@ -139,10 +174,22 @@
         }
     }
 
-    match cmd.status() {
+    let success = match cmd.status() {
         Ok(status) => status.success(),
         Err(_) => false,
+    };
+
+    // Clean up to avoid leaving nondeterministic absolute paths in the dep-info
+    // file in OUT_DIR, which causes nonreproducible builds in build systems
+    // that treat the entire OUT_DIR as an artifact.
+    if let Err(err) = fs::remove_dir_all(&out_subdir) {
+        if err.kind() != ErrorKind::NotFound {
+            eprintln!("Failed to clean up {}: {}", out_subdir.display(), err);
+            process::exit(1);
+        }
     }
+
+    success
 }
 
 fn rustc_minor_version() -> Option<u32> {

crates/anyhow/build/probe.rs

diff --git a/crates/anyhow/build/probe.rs b/crates/anyhow/build/probe.rs
index 21e776d..742d15c 100644
--- a/crates/anyhow/build/probe.rs
+++ b/crates/anyhow/build/probe.rs
@@ -4,9 +4,9 @@
 
 #![feature(error_generic_member_access)]
 
+use core::error::{self, Error, Request};
+use core::fmt::{self, Debug, Display};
 use std::backtrace::Backtrace;
-use std::error::{self, Error, Request};
-use std::fmt::{self, Debug, Display};
 
 struct MyError(Thing);
 struct Thing;

crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch

diff --git a/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch b/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
index 55087e6..e453046 100644
--- a/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
+++ b/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
@@ -21,14 +21,14 @@
 index 9766d366..016b4b8c 100644
 --- b/tests/test_fmt.rs
 +++ a/tests/test_fmt.rs
-@@ -68,27 +68,27 @@ Error {
- 
+@@ -68,26 +68,26 @@
+
  #[test]
  fn test_display() {
 -    assert_eq!("g failed", h().unwrap_err().to_string());
 +    assert!(h().unwrap_err().to_string().starts_with("g failed"));
  }
- 
+
  #[test]
  fn test_altdisplay() {
 -    assert_eq!(EXPECTED_ALTDISPLAY_F, format!("{:#}", f().unwrap_err()));
@@ -38,9 +38,8 @@
 +    assert!(format!("{:#}", g().unwrap_err()).starts_with(EXPECTED_ALTDISPLAY_G));
 +    assert!(format!("{:#}", h().unwrap_err()).starts_with(EXPECTED_ALTDISPLAY_H));
  }
- 
+
  #[test]
- #[cfg_attr(not(std_backtrace), ignore)]
  fn test_debug() {
 -    assert_eq!(EXPECTED_DEBUG_F, format!("{:?}", f().unwrap_err()));
 -    assert_eq!(EXPECTED_DEBUG_G, format!("{:?}", g().unwrap_err()));
@@ -49,7 +48,7 @@
 +    assert!(format!("{:?}", g().unwrap_err()).starts_with(EXPECTED_DEBUG_G));
 +    assert!(format!("{:?}", h().unwrap_err()).starts_with(EXPECTED_DEBUG_H));
  }
- 
+
  #[test]
  fn test_altdebug() {
 -    assert_eq!(EXPECTED_ALTDEBUG_F, format!("{:#?}", f().unwrap_err()));

crates/anyhow/src/backtrace.rs

diff --git a/crates/anyhow/src/backtrace.rs b/crates/anyhow/src/backtrace.rs
index 65ad1cc..303f911 100644
--- a/crates/anyhow/src/backtrace.rs
+++ b/crates/anyhow/src/backtrace.rs
@@ -38,7 +38,8 @@
 #[cfg(error_generic_member_access)]
 macro_rules! backtrace_if_absent {
     ($err:expr) => {
-        match std::error::request_ref::<std::backtrace::Backtrace>($err as &dyn std::error::Error) {
+        match core::error::request_ref::<std::backtrace::Backtrace>($err as &dyn core::error::Error)
+        {
             Some(_) => None,
             None => backtrace!(),
         }
@@ -46,7 +47,7 @@
 }
 
 #[cfg(all(
-    feature = "std",
+    any(feature = "std", not(anyhow_no_core_error)),
     not(error_generic_member_access),
     any(std_backtrace, feature = "backtrace")
 ))]
@@ -56,7 +57,11 @@
     };
 }
 
-#[cfg(all(feature = "std", not(std_backtrace), not(feature = "backtrace")))]
+#[cfg(all(
+    any(feature = "std", not(anyhow_no_core_error)),
+    not(std_backtrace),
+    not(feature = "backtrace"),
+))]
 macro_rules! backtrace_if_absent {
     ($err:expr) => {
         None
@@ -65,11 +70,12 @@
 
 #[cfg(all(not(std_backtrace), feature = "backtrace"))]
 mod capture {
+    use alloc::borrow::{Cow, ToOwned as _};
+    use alloc::vec::Vec;
     use backtrace::{BacktraceFmt, BytesOrWideString, Frame, PrintFmt, SymbolName};
     use core::cell::UnsafeCell;
     use core::fmt::{self, Debug, Display};
     use core::sync::atomic::{AtomicUsize, Ordering};
-    use std::borrow::Cow;
     use std::env;
     use std::path::{self, Path, PathBuf};
     use std::sync::Once;
@@ -400,6 +406,6 @@
 }
 
 fn _assert_send_sync() {
-    fn _assert<T: Send + Sync>() {}
-    _assert::<Backtrace>();
+    fn assert<T: Send + Sync>() {}
+    assert::<Backtrace>();
 }

crates/anyhow/src/chain.rs

diff --git a/crates/anyhow/src/chain.rs b/crates/anyhow/src/chain.rs
index f7baff2..e56bc66 100644
--- a/crates/anyhow/src/chain.rs
+++ b/crates/anyhow/src/chain.rs
@@ -1,13 +1,13 @@
 use self::ChainState::*;
 use crate::StdError;
 
-#[cfg(feature = "std")]
-use std::vec;
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
+use alloc::vec::{self, Vec};
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 pub(crate) use crate::Chain;
 
-#[cfg(not(feature = "std"))]
+#[cfg(all(not(feature = "std"), anyhow_no_core_error))]
 pub(crate) struct Chain<'a> {
     state: ChainState<'a>,
 }
@@ -17,7 +17,7 @@
     Linked {
         next: Option<&'a (dyn StdError + 'static)>,
     },
-    #[cfg(feature = "std")]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     Buffered {
         rest: vec::IntoIter<&'a (dyn StdError + 'static)>,
     },
@@ -42,7 +42,7 @@
                 *next = error.source();
                 Some(error)
             }
-            #[cfg(feature = "std")]
+            #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
             Buffered { rest } => rest.next(),
         }
     }
@@ -53,7 +53,7 @@
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl DoubleEndedIterator for Chain<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         match &mut self.state {
@@ -84,13 +84,13 @@
                 }
                 len
             }
-            #[cfg(feature = "std")]
+            #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
             Buffered { rest } => rest.len(),
         }
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl Default for Chain<'_> {
     fn default() -> Self {
         Chain {

crates/anyhow/src/context.rs

diff --git a/crates/anyhow/src/context.rs b/crates/anyhow/src/context.rs
index 11b31ba..326c2a4 100644
--- a/crates/anyhow/src/context.rs
+++ b/crates/anyhow/src/context.rs
@@ -4,7 +4,7 @@
 use core::fmt::{self, Debug, Display, Write};
 
 #[cfg(error_generic_member_access)]
-use std::error::Request;
+use core::error::Request;
 
 mod ext {
     use super::*;
@@ -15,17 +15,17 @@
             C: Display + Send + Sync + 'static;
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     impl<E> StdError for E
     where
-        E: std::error::Error + Send + Sync + 'static,
+        E: crate::StdError + Send + Sync + 'static,
     {
         fn ext_context<C>(self, context: C) -> Error
         where
             C: Display + Send + Sync + 'static,
         {
             let backtrace = backtrace_if_absent!(&self);
-            Error::from_context(context, self, backtrace)
+            Error::construct_from_context(context, self, backtrace)
         }
     }
 
@@ -96,7 +96,7 @@
         // backtrace.
         match self {
             Some(ok) => Ok(ok),
-            None => Err(Error::from_display(context, backtrace!())),
+            None => Err(Error::construct_from_display(context, backtrace!())),
         }
     }
 
@@ -107,7 +107,7 @@
     {
         match self {
             Some(ok) => Ok(ok),
-            None => Err(Error::from_display(context(), backtrace!())),
+            None => Err(Error::construct_from_display(context(), backtrace!())),
         }
     }
 }

crates/anyhow/src/ensure.rs

diff --git a/crates/anyhow/src/ensure.rs b/crates/anyhow/src/ensure.rs
index c40cb92..795757d 100644
--- a/crates/anyhow/src/ensure.rs
+++ b/crates/anyhow/src/ensure.rs
@@ -147,14 +147,22 @@
         $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $let) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($life:tt $colon:tt $($dup:tt)*) $label:lifetime : $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $life $colon) $($parse)*} ($($rest)*) $($rest)*)
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($lifetime:tt $colon:tt $($dup:tt)*) $label:lifetime : $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $lifetime $colon) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $mut:tt $($dup:tt)*) &mut $($rest:tt)*) => {
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $and $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $raw:tt $mut:tt $($dup:tt)*) &raw mut $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $and $raw $mut) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $raw:tt $const:tt $($dup:tt)*) &raw const $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $and $raw $const) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $($dup:tt)*) & $($rest:tt)*) => {
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $and) $($parse)*} ($($rest)*) $($rest)*)
     };
@@ -163,6 +171,14 @@
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $andand $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($andand:tt $raw:tt $mut:tt $($dup:tt)*) &&raw mut $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $andand $raw $mut) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($andand:tt $raw:tt $const:tt $($dup:tt)*) &&raw const $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $andand $raw $const) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($andand:tt $($dup:tt)*) && $($rest:tt)*) => {
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $andand) $($parse)*} ($($rest)*) $($rest)*)
     };
@@ -236,17 +252,17 @@
         $crate::__parse_ensure!(atom $stack $bail ($($fuel)*) {($($buf)* $const $block) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $lit:literal $($rest:tt)*) => {
-        $crate::__parse_ensure!(atom $stack $bail ($($fuel)*) {($($buf)* $lit) $($parse)*} ($($rest)*) $($rest)*)
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($literal:tt $($dup:tt)*) $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(atom $stack $bail ($($fuel)*) {($($buf)* $literal) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     // path expressions
 
-    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: $ident:ident $($rest:tt)*) => {
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $ident:tt $($dup:tt)*) :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(epath (atom $stack) $bail ($($fuel)*) {($($buf)* $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $ident:ident $($rest:tt)*) => {
+    (0 $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($ident:tt $($dup:tt)*) $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(epath (atom $stack) $bail ($($fuel)*) {($($buf)* $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -258,15 +274,19 @@
         $crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)*) {($($buf)* $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: << $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)*) {($($buf)* $colons <) $($parse)*} (< $($rest)*) < $($rest)*)
+    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $langle:tt $($dup:tt)*) :: << $($rest:tt)*) => {
+        $crate::__parse_ensure!(type (qpath (tpath (arglist (epath $stack)))) $bail ($($fuel)*) {($($buf)* $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: <- $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)*) {($($buf)* $colons <) $($parse)*} (- $($rest)*) - $($rest)*)
+    (epath $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt :: <- - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
     };
 
-    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: $ident:ident $($rest:tt)*) => {
+    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $larrow:tt $($dup:tt)*) :: <- $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)*) {($($buf)* $colons $larrow) $($parse)*} ($($dup)*) $($dup)*)
+    };
+
+    (epath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $ident:tt $($dup:tt)*) :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(epath $stack $bail ($($fuel)*) {($($buf)* $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -282,6 +302,10 @@
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $bang $args) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (epath (split ($pop:ident $stack:tt)) $bail:tt (~$($fuel:tt)*) $parse:tt $dup:tt $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop (split $stack) $bail ($($fuel)*) $parse $dup $($rest)*)
+    };
+
     (epath ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) $parse:tt $dup:tt $($rest:tt)*) => {
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) $parse $dup $($rest)*)
     };
@@ -308,18 +332,26 @@
         $crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)*) {($($buf)* $dot $ident $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $ident:tt $colons:tt $($dup:tt)*) . $i:ident :: << $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)*) {($($buf)* $dot $ident $colons <) $($parse)*} (< $($rest)*) < $($rest)*)
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $ident:tt $colons:tt $langle:tt $($dup:tt)*) . $i:ident :: << $($rest:tt)*) => {
+        $crate::__parse_ensure!(type (qpath (tpath (arglist (atom $stack)))) $bail ($($fuel)*) {($($buf)* $dot $ident $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $ident:tt $colons:tt $($dup:tt)*) . $i:ident :: <- $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)*) {($($buf)* $dot $ident $colons <) $($parse)*} (- $($rest)*) - $($rest)*)
+    (atom $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt . $i:ident :: <- - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
     };
 
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $($dup:tt)*) . $field:ident $($rest:tt)*) => {
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $ident:tt $colons:tt $larrow:tt $($dup:tt)*) . $i:ident :: <- $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)*) {($($buf)* $dot $ident $colons $larrow) $($parse)*} ($($dup)*) $($dup)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $field:tt $($dup:tt)*) . $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(atom $stack $bail ($($fuel)*) {($($buf)* $dot $field) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (atom $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt . - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
     (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($dot:tt $index:tt $($dup:tt)*) . $lit:literal $($rest:tt)*) => {
         $crate::__parse_ensure!(atom $stack $bail ($($fuel)*) {($($buf)* $dot $index) $($parse)*} ($($rest)*) $($rest)*)
     };
@@ -346,43 +378,51 @@
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $star $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $life:lifetime $mut:tt $($dup:tt)*) & $l:lifetime mut $($rest:tt)*) => {
-        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $life $mut) $($parse)*} ($($rest)*) $($rest)*)
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $lifetime:tt $mut:tt $($dup:tt)*) & $l:lifetime mut $($rest:tt)*) => {
+        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $lifetime $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $mut:tt $($dup:tt)*) & mut $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $life:lifetime $($dup:tt)*) & $l:lifetime $($rest:tt)*) => {
-        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $life) $($parse)*} ($($rest)*) $($rest)*)
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $lifetime:tt $($dup:tt)*) & $l:lifetime $($rest:tt)*) => {
+        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $lifetime) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $($dup:tt)*) & $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $life:lifetime $mut:tt $($dup:tt)*) && $l:lifetime mut $($rest:tt)*) => {
-        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $life $mut) $($parse)*} ($($rest)*) $($rest)*)
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $lifetime:tt $mut:tt $($dup:tt)*) && $l:lifetime mut $($rest:tt)*) => {
+        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $lifetime $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $mut:tt $($dup:tt)*) && mut $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $mut) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $life:lifetime $($dup:tt)*) && $l:lifetime $($rest:tt)*) => {
-        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $life) $($parse)*} ($($rest)*) $($rest)*)
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $lifetime:tt $($dup:tt)*) && $l:lifetime $($rest:tt)*) => {
+        $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and $lifetime) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $($dup:tt)*) && $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $and) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (type $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt unsafe extern - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
     (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($unsafe:tt $(extern $($abi:literal)?)? fn $($dup:tt)*) unsafe $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $unsafe) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($extern:tt $abi:literal fn $($dup:tt)*) extern $lit:literal $($rest:tt)*) => {
+    (type $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt extern - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($extern:tt $abi:tt fn $($dup:tt)*) extern $lit:literal $($rest:tt)*) => {
         $crate::__parse_ensure!(type $stack $bail ($($fuel)*) {($($buf)* $extern $abi) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -420,11 +460,11 @@
 
     // path types
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: $ident:ident $($rest:tt)*) => {
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $ident:tt $($dup:tt)*) :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(tpath $stack $bail ($($fuel)*) {($($buf)* $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $ident:ident $($rest:tt)*) => {
+    (type $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($ident:tt $($dup:tt)*) $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(tpath $stack $bail ($($fuel)*) {($($buf)* $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -436,27 +476,35 @@
         $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt << $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* <) $($parse)*} (< $($rest)*) < $($rest)*)
+    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($langle:tt $($dup:tt)*) << $($rest:tt)*) => {
+        $crate::__parse_ensure!(type (qpath (tpath (arglist (tpath $stack)))) $bail ($($fuel)*) {($($buf)* $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt <- $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* <) $($parse)*} (- $($rest)*) - $($rest)*)
+    (tpath $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt <- - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($larrow:tt $($dup:tt)*) <- $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $larrow) $($parse)*} ($($dup)*) $($dup)*)
     };
 
     (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $langle:tt $($dup:tt)*) :: < $($rest:tt)*) => {
         $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: << $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $colons <) $($parse)*} (< $($rest)*) < $($rest)*)
+    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $langle:tt $($dup:tt)*) :: << $($rest:tt)*) => {
+        $crate::__parse_ensure!(type (qpath (tpath (arglist (tpath $stack)))) $bail ($($fuel)*) {($($buf)* $colons $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: <- $($rest:tt)*) => {
-        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $colons <) $($parse)*} (- $($rest)*) - $($rest)*)
+    (tpath $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt :: <- - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
     };
 
-    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: $ident:ident $($rest:tt)*) => {
+    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $larrow:tt $($dup:tt)*) :: <- $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)*) {($($buf)* $colons $larrow) $($parse)*} ($($dup)*) $($dup)*)
+    };
+
+    (tpath $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $ident:tt $($dup:tt)*) :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(tpath $stack $bail ($($fuel)*) {($($buf)* $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -494,7 +542,11 @@
 
     // qualified paths
 
-    (qpath ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $colons:tt $($dup:tt)*) > :: $ident:ident $($rest:tt)*) => {
+    (qpath (split ($pop:ident $stack:tt)) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $colons:tt $ident:tt $($dup:tt)*) >> :: $i:ident $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $rangle $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (qpath ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $colons:tt $ident:tt $($dup:tt)*) > :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $rangle $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -504,41 +556,61 @@
 
     // trait objects
 
-    (object (arglist $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($plus:tt $colons:tt $($dup:tt)*) + :: $ident:ident $($rest:tt)*) => {
+    (object (arglist $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($plus:tt $colons:tt $ident:tt $($dup:tt)*) + :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(tpath (arglist $stack) $bail ($($fuel)*) {($($buf)* $plus $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (object (arglist $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($plus:tt $($dup:tt)*) + $ident:ident $($rest:tt)*) => {
+    (object (arglist $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($plus:tt $ident:tt $($dup:tt)*) + $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(tpath (arglist $stack) $bail ($($fuel)*) {($($buf)* $plus $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (object (split ($pop:ident $stack:tt)) $bail:tt (~$($fuel:tt)*) $parse:tt $dup:tt $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop (split $stack) $bail ($($fuel)*) $parse $dup $($rest)*)
+    };
+
     (object ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) $parse:tt $dup:tt $($rest:tt)*) => {
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) $parse $dup $($rest)*)
     };
 
     // angle bracketed generic arguments
 
+    (generic (split ($pop:ident $stack:tt)) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $rangle) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     (generic ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) > $($rest:tt)*) => {
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $rangle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (generic ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt >> $($rest:tt)*) => {
-        $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* >) $($parse)*} (> $($rest)*) > $($rest)*)
+    (generic ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop (split $stack) $bail ($($fuel)*) {($($buf)*) $($parse)*} ($rangle $($rest)*) $rangle $($rest)*)
     };
 
-    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $lit:literal $($rest:tt)*) => {
-        $crate::__parse_ensure!(arglist $stack $bail ($($fuel)*) {($($buf)* $lit) $($parse)*} ($($rest)*) $($rest)*)
+    (generic $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt - - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($neg:tt $($dup:tt)*) - $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(generic $stack $bail ($($fuel)*) {($($buf)* $neg) $($parse)*} ($($dup)*) $($dup)*)
+    };
+
+    (generic $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($literal:tt $($dup:tt)*) $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(arglist $stack $bail ($($fuel)*) {($($buf)* $literal) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($brace:tt $($dup:tt)*) {$($block:tt)*} $($rest:tt)*) => {
         $crate::__parse_ensure!(arglist $stack $bail ($($fuel)*) {($($buf)* $brace) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $life:lifetime $($rest:tt)*) => {
-        $crate::__parse_ensure!(arglist $stack $bail ($($fuel)*) {($($buf)* $life) $($parse)*} ($($rest)*) $($rest)*)
+    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($lifetime:tt $($dup:tt)*) $l:lifetime $($rest:tt)*) => {
+        $crate::__parse_ensure!(arglist $stack $bail ($($fuel)*) {($($buf)* $lifetime) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($assoc:ident $eq:tt $($dup:tt)*) $ident:ident = $($rest:tt)*) => {
+    (generic $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($assoc:tt $eq:tt $($dup:tt)*) $ident:ident = $($rest:tt)*) => {
         $crate::__parse_ensure!(type (arglist $stack) $bail ($($fuel)*) {($($buf)* $assoc $eq) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -550,12 +622,16 @@
         $crate::__parse_ensure!(generic $stack $bail ($($fuel)*) {($($buf)* $comma) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (arglist (split ($pop:ident $stack:tt)) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)*) $rangle $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     (arglist ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) > $($rest:tt)*) => {
         $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* $rangle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (arglist ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt >> $($rest:tt)*) => {
-        $crate::__parse_ensure!($pop $stack $bail ($($fuel)*) {($($buf)* >) $($parse)*} (> $($rest)*) > $($rest)*)
+    (arglist ($pop:ident $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rangle:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!($pop (split $stack) $bail ($($fuel)*) {($($buf)*) $($parse)*} ($rangle $($rest)*) $rangle $($rest)*)
     };
 
     // patterns
@@ -584,8 +660,20 @@
         $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $at) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $lit:literal $($rest:tt)*) => {
-        $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $lit) $($parse)*} ($($rest)*) $($rest)*)
+    (pat $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt - - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($neg:tt $($dup:tt)*) - $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $neg) $($parse)*} ($($dup)*) $($dup)*)
+    };
+
+    (pat $stack:tt ($($bail:tt)*) (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt - $($rest:tt)*) => {
+        $crate::__fallback_ensure!($($bail)*)
+    };
+
+    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($literal:tt $($dup:tt)*) $lit:literal $($rest:tt)*) => {
+        $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $literal) $($parse)*} ($($rest)*) $($rest)*)
     };
 
     (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($range:tt $($dup:tt)*) .. $($rest:tt)*) => {
@@ -620,11 +708,11 @@
         $crate::__parse_ensure!(pat $stack $bail ($($fuel)*) {($($buf)* $wild) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $($dup:tt)*) :: $ident:ident $($rest:tt)*) => {
+    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($colons:tt $ident:tt $($dup:tt)*) :: $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(epath (pat $stack) $bail ($($fuel)*) {($($buf)* $colons $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt $ident:ident $($rest:tt)*) => {
+    (pat $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($ident:tt $($dup:tt)*) $i:ident $($rest:tt)*) => {
         $crate::__parse_ensure!(epath (pat $stack) $bail ($($fuel)*) {($($buf)* $ident) $($parse)*} ($($rest)*) $($rest)*)
     };
 
@@ -632,48 +720,6 @@
         $crate::__parse_ensure!(type (qpath (epath (pat $stack))) $bail ($($fuel)*) {($($buf)* $langle) $($parse)*} ($($rest)*) $($rest)*)
     };
 
-    // high precedence binary operators
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($add:tt $($dup:tt)*) + $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $add) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($sub:tt $($dup:tt)*) - $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $sub) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($mul:tt $($dup:tt)*) * $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $mul) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($div:tt $($dup:tt)*) / $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $div) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rem:tt $($dup:tt)*) % $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $rem) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitxor:tt $($dup:tt)*) ^ $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitxor) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitand:tt $($dup:tt)*) & $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitand) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitor:tt $($dup:tt)*) | $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitor) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($shl:tt $($dup:tt)*) << $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $shl) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
-    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($shr:tt $($dup:tt)*) >> $($rest:tt)*) => {
-        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $shr) $($parse)*} ($($rest)*) $($rest)*)
-    };
-
     // comparison binary operators
 
     (atom () $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($eq:tt $($dup:tt)*) == $($rest:tt)*) => {
@@ -716,14 +762,64 @@
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $ge) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    (atom (split ()) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} $dup:tt >> $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 () $bail ($($fuel)*) {() $($parse)* ($($buf)* > ) > } ($($rest)*) $($rest)*)
+    };
+
     (atom () $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($gt:tt $($dup:tt)*) > $($rest:tt)*) => {
         $crate::__parse_ensure!(0 () $bail ($($fuel)*) {() $($parse)* ($($buf)*) $gt} ($($rest)*) $($rest)*)
     };
 
+    (atom (split $stack:tt) $bail:tt (~$($fuel:tt)*) {($($buf:tt)+) $($parse:tt)*} ($rangle:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $rangle) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)+) $($parse:tt)*} ($gt:tt $($dup:tt)*) > $($rest:tt)*) => {
         $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $gt) $($parse)*} ($($rest)*) $($rest)*)
     };
 
+    // high precedence binary operators
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($add:tt $($dup:tt)*) + $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $add) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($sub:tt $($dup:tt)*) - $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $sub) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($mul:tt $($dup:tt)*) * $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $mul) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($div:tt $($dup:tt)*) / $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $div) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($rem:tt $($dup:tt)*) % $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $rem) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitxor:tt $($dup:tt)*) ^ $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitxor) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitand:tt $($dup:tt)*) & $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitand) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($bitor:tt $($dup:tt)*) | $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $bitor) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($shl:tt $($dup:tt)*) << $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $shl) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
+    (atom $stack:tt $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($shr:tt $($dup:tt)*) >> $($rest:tt)*) => {
+        $crate::__parse_ensure!(0 $stack $bail ($($fuel)*) {($($buf)* $shr) $($parse)*} ($($rest)*) $($rest)*)
+    };
+
     // low precedence binary operators
 
     (atom ($($stack:tt)+) $bail:tt (~$($fuel:tt)*) {($($buf:tt)*) $($parse:tt)*} ($and:tt $($dup:tt)*) && $($rest:tt)*) => {
@@ -815,24 +911,24 @@
 #[macro_export]
 macro_rules! __fallback_ensure {
     ($cond:expr $(,)?) => {
-        if !$cond {
+        if $crate::__private::not($cond) {
             return $crate::__private::Err($crate::Error::msg(
                 $crate::__private::concat!("Condition failed: `", $crate::__private::stringify!($cond), "`")
             ));
         }
     };
     ($cond:expr, $msg:literal $(,)?) => {
-        if !$cond {
+        if $crate::__private::not($cond) {
             return $crate::__private::Err($crate::__anyhow!($msg));
         }
     };
     ($cond:expr, $err:expr $(,)?) => {
-        if !$cond {
+        if $crate::__private::not($cond) {
             return $crate::__private::Err($crate::__anyhow!($err));
         }
     };
     ($cond:expr, $fmt:expr, $($arg:tt)*) => {
-        if !$cond {
+        if $crate::__private::not($cond) {
             return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*));
         }
     };

crates/anyhow/src/error.rs

diff --git a/crates/anyhow/src/error.rs b/crates/anyhow/src/error.rs
index f24c4a6..cd1f5f5 100644
--- a/crates/anyhow/src/error.rs
+++ b/crates/anyhow/src/error.rs
@@ -1,21 +1,24 @@
 use crate::backtrace::Backtrace;
 use crate::chain::Chain;
-#[cfg(any(feature = "std", anyhow_no_ptr_addr_of))]
+#[cfg(any(feature = "std", not(anyhow_no_core_error), anyhow_no_ptr_addr_of))]
 use crate::ptr::Mut;
 use crate::ptr::{Own, Ref};
 use crate::{Error, StdError};
 use alloc::boxed::Box;
 use core::any::TypeId;
+#[cfg(error_generic_member_access)]
+use core::error::{self, Request};
 use core::fmt::{self, Debug, Display};
 use core::mem::ManuallyDrop;
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
+use core::ops::{Deref, DerefMut};
+#[cfg(not(anyhow_no_core_unwind_safe))]
+use core::panic::{RefUnwindSafe, UnwindSafe};
 #[cfg(not(anyhow_no_ptr_addr_of))]
 use core::ptr;
 use core::ptr::NonNull;
-#[cfg(error_generic_member_access)]
-use std::error::{self, Request};
-
-#[cfg(feature = "std")]
-use core::ops::{Deref, DerefMut};
+#[cfg(all(feature = "std", anyhow_no_core_unwind_safe))]
+use std::panic::{RefUnwindSafe, UnwindSafe};
 
 impl Error {
     /// Create a new error object from any error type.
@@ -25,8 +28,7 @@
     ///
     /// If the error type does not provide a backtrace, a backtrace will be
     /// created here to ensure that a backtrace exists.
-    #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     #[cold]
     #[must_use]
     pub fn new<E>(error: E) -> Self
@@ -34,7 +36,7 @@
         E: StdError + Send + Sync + 'static,
     {
         let backtrace = backtrace_if_absent!(&error);
-        Error::from_std(error, backtrace)
+        Error::construct_from_std(error, backtrace)
     }
 
     /// Create a new error object from a printable error message.
@@ -80,12 +82,73 @@
     where
         M: Display + Debug + Send + Sync + 'static,
     {
-        Error::from_adhoc(message, backtrace!())
+        Error::construct_from_adhoc(message, backtrace!())
     }
 
-    #[cfg(feature = "std")]
+    /// Construct an error object from a type-erased standard library error.
+    ///
+    /// This is mostly useful for interop with other error libraries.
+    ///
+    /// # Example
+    ///
+    /// Here is a skeleton of a library that provides its own error abstraction.
+    /// The pair of `From` impls provide bidirectional support for `?`
+    /// conversion between `Report` and `anyhow::Error`.
+    ///
+    /// ```
+    /// use std::error::Error as StdError;
+    ///
+    /// pub struct Report {/* ... */}
+    ///
+    /// impl<E> From<E> for Report
+    /// where
+    ///     E: Into<anyhow::Error>,
+    ///     Result<(), E>: anyhow::Context<(), E>,
+    /// {
+    ///     fn from(error: E) -> Self {
+    ///         let anyhow_error: anyhow::Error = error.into();
+    ///         let boxed_error: Box<dyn StdError + Send + Sync + 'static> = anyhow_error.into();
+    ///         Report::from_boxed(boxed_error)
+    ///     }
+    /// }
+    ///
+    /// impl From<Report> for anyhow::Error {
+    ///     fn from(report: Report) -> Self {
+    ///         let boxed_error: Box<dyn StdError + Send + Sync + 'static> = report.into_boxed();
+    ///         anyhow::Error::from_boxed(boxed_error)
+    ///     }
+    /// }
+    ///
+    /// impl Report {
+    ///     fn from_boxed(boxed_error: Box<dyn StdError + Send + Sync + 'static>) -> Self {
+    ///         todo!()
+    ///     }
+    ///     fn into_boxed(self) -> Box<dyn StdError + Send + Sync + 'static> {
+    ///         todo!()
+    ///     }
+    /// }
+    ///
+    /// // Example usage: can use `?` in both directions.
+    /// fn a() -> anyhow::Result<()> {
+    ///     b()?;
+    ///     Ok(())
+    /// }
+    /// fn b() -> Result<(), Report> {
+    ///     a()?;
+    ///     Ok(())
+    /// }
+    /// ```
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     #[cold]
-    pub(crate) fn from_std<E>(error: E, backtrace: Option<Backtrace>) -> Self
+    #[must_use]
+    pub fn from_boxed(boxed_error: Box<dyn StdError + Send + Sync + 'static>) -> Self {
+        let backtrace = backtrace_if_absent!(&*boxed_error);
+        Error::construct_from_boxed(boxed_error, backtrace)
+    }
+
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
+    #[cold]
+    pub(crate) fn construct_from_std<E>(error: E, backtrace: Option<Backtrace>) -> Self
     where
         E: StdError + Send + Sync + 'static,
     {
@@ -111,7 +174,7 @@
     }
 
     #[cold]
-    pub(crate) fn from_adhoc<M>(message: M, backtrace: Option<Backtrace>) -> Self
+    pub(crate) fn construct_from_adhoc<M>(message: M, backtrace: Option<Backtrace>) -> Self
     where
         M: Display + Debug + Send + Sync + 'static,
     {
@@ -120,7 +183,7 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<MessageError<M>>,
             object_ref: object_ref::<MessageError<M>>,
-            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+            #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<MessageError<M>>,
             object_boxed: object_boxed::<MessageError<M>>,
             object_downcast: object_downcast::<M>,
@@ -140,7 +203,7 @@
     }
 
     #[cold]
-    pub(crate) fn from_display<M>(message: M, backtrace: Option<Backtrace>) -> Self
+    pub(crate) fn construct_from_display<M>(message: M, backtrace: Option<Backtrace>) -> Self
     where
         M: Display + Send + Sync + 'static,
     {
@@ -149,7 +212,7 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<DisplayError<M>>,
             object_ref: object_ref::<DisplayError<M>>,
-            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+            #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<DisplayError<M>>,
             object_boxed: object_boxed::<DisplayError<M>>,
             object_downcast: object_downcast::<M>,
@@ -168,9 +231,13 @@
         unsafe { Error::construct(error, vtable, backtrace) }
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     #[cold]
-    pub(crate) fn from_context<C, E>(context: C, error: E, backtrace: Option<Backtrace>) -> Self
+    pub(crate) fn construct_from_context<C, E>(
+        context: C,
+        error: E,
+        backtrace: Option<Backtrace>,
+    ) -> Self
     where
         C: Display + Send + Sync + 'static,
         E: StdError + Send + Sync + 'static,
@@ -198,9 +265,9 @@
         unsafe { Error::construct(error, vtable, backtrace) }
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     #[cold]
-    pub(crate) fn from_boxed(
+    pub(crate) fn construct_from_boxed(
         error: Box<dyn StdError + Send + Sync>,
         backtrace: Option<Backtrace>,
     ) -> Self {
@@ -325,7 +392,7 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<ContextError<C, Error>>,
             object_ref: object_ref::<ContextError<C, Error>>,
-            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+            #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<ContextError<C, Error>>,
             object_boxed: object_boxed::<ContextError<C, Error>>,
             object_downcast: context_chain_downcast::<C>,
@@ -399,8 +466,7 @@
     ///     None
     /// }
     /// ```
-    #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     #[cold]
     pub fn chain(&self) -> Chain {
         unsafe { ErrorImpl::chain(self.inner.by_ref()) }
@@ -411,8 +477,7 @@
     ///
     /// The root cause is the last error in the iterator produced by
     /// [`chain()`][Error::chain].
-    #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     pub fn root_cause(&self) -> &(dyn StdError + 'static) {
         self.chain().last().unwrap()
     }
@@ -554,8 +619,7 @@
     }
 }
 
-#[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl<E> From<E> for Error
 where
     E: StdError + Send + Sync + 'static,
@@ -563,12 +627,11 @@
     #[cold]
     fn from(error: E) -> Self {
         let backtrace = backtrace_if_absent!(&error);
-        Error::from_std(error, backtrace)
+        Error::construct_from_std(error, backtrace)
     }
 }
 
-#[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl Deref for Error {
     type Target = dyn StdError + Send + Sync + 'static;
 
@@ -577,8 +640,7 @@
     }
 }
 
-#[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl DerefMut for Error {
     fn deref_mut(&mut self) -> &mut Self::Target {
         unsafe { ErrorImpl::error_mut(self.inner.by_mut()) }
@@ -609,7 +671,7 @@
 struct ErrorVTable {
     object_drop: unsafe fn(Own<ErrorImpl>),
     object_ref: unsafe fn(Ref<ErrorImpl>) -> Ref<dyn StdError + Send + Sync + 'static>,
-    #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+    #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))]
     object_mut: unsafe fn(Mut<ErrorImpl>) -> &mut (dyn StdError + Send + Sync + 'static),
     object_boxed: unsafe fn(Own<ErrorImpl>) -> Box<dyn StdError + Send + Sync + 'static>,
     object_downcast: unsafe fn(Ref<ErrorImpl>, TypeId) -> Option<Ref<()>>,
@@ -661,7 +723,7 @@
 
 // Safety: requires layout of *e to match ErrorImpl<E>, and for `e` to be derived
 // from a `&mut`
-#[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+#[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))]
 unsafe fn object_mut<E>(e: Mut<ErrorImpl>) -> &mut (dyn StdError + Send + Sync + 'static)
 where
     E: StdError + Send + Sync + 'static,
@@ -734,7 +796,7 @@
 }
 
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, E>>.
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 unsafe fn context_downcast<C, E>(e: Ref<ErrorImpl>, target: TypeId) -> Option<Ref<()>>
 where
     C: 'static,
@@ -774,7 +836,7 @@
 }
 
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, E>>.
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 unsafe fn context_drop_rest<C, E>(e: Own<ErrorImpl>, target: TypeId)
 where
     C: 'static,
@@ -906,7 +968,7 @@
         unsafe { (vtable(this.ptr).object_ref)(this).deref() }
     }
 
-    #[cfg(feature = "std")]
+    #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
     pub(crate) unsafe fn error_mut(this: Mut<Self>) -> &mut (dyn StdError + Send + Sync + 'static) {
         // Use vtable to attach E's native StdError vtable for the right
         // original type E.
@@ -1009,16 +1071,22 @@
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl AsRef<dyn StdError + Send + Sync> for Error {
     fn as_ref(&self) -> &(dyn StdError + Send + Sync + 'static) {
         &**self
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl AsRef<dyn StdError> for Error {
     fn as_ref(&self) -> &(dyn StdError + 'static) {
         &**self
     }
 }
+
+#[cfg(any(feature = "std", not(anyhow_no_core_unwind_safe)))]
+impl UnwindSafe for Error {}
+
+#[cfg(any(feature = "std", not(anyhow_no_core_unwind_safe)))]
+impl RefUnwindSafe for Error {}

crates/anyhow/src/fmt.rs

diff --git a/crates/anyhow/src/fmt.rs b/crates/anyhow/src/fmt.rs
index a99649b..85c84a9 100644
--- a/crates/anyhow/src/fmt.rs
+++ b/crates/anyhow/src/fmt.rs
@@ -43,6 +43,7 @@
         #[cfg(any(std_backtrace, feature = "backtrace"))]
         {
             use crate::backtrace::BacktraceStatus;
+            use alloc::string::ToString;
 
             let backtrace = unsafe { Self::backtrace(this) };
             if let BacktraceStatus::Captured = backtrace.status() {
@@ -102,6 +103,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloc::string::String;
 
     #[test]
     fn one_digit() {

crates/anyhow/src/kind.rs

diff --git a/crates/anyhow/src/kind.rs b/crates/anyhow/src/kind.rs
index 21d76aa..a9f40c3 100644
--- a/crates/anyhow/src/kind.rs
+++ b/crates/anyhow/src/kind.rs
@@ -47,8 +47,10 @@
 use crate::Error;
 use core::fmt::{Debug, Display};
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 use crate::StdError;
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
+use alloc::boxed::Box;
 
 pub struct Adhoc;
 
@@ -68,7 +70,7 @@
     where
         M: Display + Debug + Send + Sync + 'static,
     {
-        Error::from_adhoc(message, backtrace!())
+        Error::construct_from_adhoc(message, backtrace!())
     }
 }
 
@@ -94,10 +96,10 @@
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 pub struct Boxed;
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 #[doc(hidden)]
 pub trait BoxedKind: Sized {
     #[inline]
@@ -106,14 +108,14 @@
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl BoxedKind for Box<dyn StdError + Send + Sync> {}
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl Boxed {
     #[cold]
     pub fn new(self, error: Box<dyn StdError + Send + Sync>) -> Error {
         let backtrace = backtrace_if_absent!(&*error);
-        Error::from_boxed(error, backtrace)
+        Error::construct_from_boxed(error, backtrace)
     }
 }

crates/anyhow/src/lib.rs

diff --git a/crates/anyhow/src/lib.rs b/crates/anyhow/src/lib.rs
index 490a075..947ed20 100644
--- a/crates/anyhow/src/lib.rs
+++ b/crates/anyhow/src/lib.rs
@@ -17,7 +17,7 @@
 //!   the return type of any fallible function.
 //!
 //!   Within the function, use `?` to easily propagate any error that implements
-//!   the `std::error::Error` trait.
+//!   the [`std::error::Error`] trait.
 //!
 //!   ```
 //!   # pub trait Deserialize {}
@@ -192,8 +192,8 @@
 //!
 //! # No-std support
 //!
-//! In no_std mode, the same API is almost all available and works the same way.
-//! To depend on Anyhow in no_std mode, disable our default enabled "std"
+//! In no_std mode, almost all of the same API is available and works the same
+//! way. To depend on Anyhow in no_std mode, disable our default enabled "std"
 //! feature in Cargo.toml. A global allocator is required.
 //!
 //! ```toml
@@ -201,15 +201,14 @@
 //! anyhow = { version = "1.0", default-features = false }
 //! ```
 //!
-//! Since the `?`-based error conversions would normally rely on the
-//! `std::error::Error` trait which is only available through std, no_std mode
-//! will require an explicit `.map_err(Error::msg)` when working with a
-//! non-Anyhow error type inside a function that returns Anyhow's error type.
+//! With versions of Rust older than 1.81, no_std mode may require an additional
+//! `.map_err(Error::msg)` when working with a non-Anyhow error type inside a
+//! function that returns Anyhow's error type, as the trait that `?`-based error
+//! conversions are defined by is only available in std in those old versions.
 
-#![doc(html_root_url = "https://docs.rs/anyhow/1.0.79")]
+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.95")]
 #![cfg_attr(error_generic_member_access, feature(error_generic_member_access))]
-#![cfg_attr(doc_cfg, feature(doc_cfg))]
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 #![deny(dead_code, unused_imports, unused_mut)]
 #![cfg_attr(
     not(anyhow_no_unsafe_op_in_unsafe_fn_lint),
@@ -221,12 +220,14 @@
     clippy::enum_glob_use,
     clippy::explicit_auto_deref,
     clippy::extra_unused_type_parameters,
+    clippy::incompatible_msrv,
     clippy::let_underscore_untyped,
     clippy::missing_errors_doc,
     clippy::missing_panics_doc,
     clippy::module_name_repetitions,
     clippy::must_use_candidate,
     clippy::needless_doctest_main,
+    clippy::needless_lifetimes,
     clippy::new_ret_no_self,
     clippy::redundant_else,
     clippy::return_self_not_must_use,
@@ -246,6 +247,9 @@
 
 extern crate alloc;
 
+#[cfg(feature = "std")]
+extern crate std;
+
 #[macro_use]
 mod backtrace;
 mod chain;
@@ -262,13 +266,16 @@
 use crate::ptr::Own;
 use core::fmt::Display;
 
-#[cfg(not(feature = "std"))]
+#[cfg(all(not(feature = "std"), anyhow_no_core_error))]
 use core::fmt::Debug;
 
 #[cfg(feature = "std")]
 use std::error::Error as StdError;
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(any(feature = "std", anyhow_no_core_error)))]
+use core::error::Error as StdError;
+
+#[cfg(all(not(feature = "std"), anyhow_no_core_error))]
 trait StdError: Debug + Display {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
         None
@@ -379,7 +386,7 @@
 ///     # Ok(())
 /// }
 /// ```
-#[cfg_attr(not(doc), repr(transparent))]
+#[repr(transparent)]
 pub struct Error {
     inner: Own<ErrorImpl>,
 }
@@ -403,8 +410,7 @@
 ///     None
 /// }
 /// ```
-#[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 #[derive(Clone)]
 pub struct Chain<'a> {
     state: crate::chain::ChainState<'a>,
@@ -621,11 +627,11 @@
         F: FnOnce() -> C;
 }
 
-/// Equivalent to Ok::<_, anyhow::Error>(value).
+/// Equivalent to `Ok::<_, anyhow::Error>(value)`.
 ///
-/// This simplifies creation of an anyhow::Result in places where type inference
-/// cannot deduce the `E` type of the result &mdash; without needing to write
-/// `Ok::<_, anyhow::Error>(value)`.
+/// This simplifies creation of an `anyhow::Result` in places where type
+/// inference cannot deduce the `E` type of the result &mdash; without needing
+/// to write`Ok::<_, anyhow::Error>(value)`.
 ///
 /// One might think that `anyhow::Result::Ok(value)` would work in such cases
 /// but it does not.
@@ -640,13 +646,14 @@
 ///    |         consider giving this pattern the explicit type `std::result::Result<i32, E>`, where the type parameter `E` is specified
 /// ```
 #[allow(non_snake_case)]
-pub fn Ok<T>(t: T) -> Result<T> {
-    Result::Ok(t)
+pub fn Ok<T>(value: T) -> Result<T> {
+    Result::Ok(value)
 }
 
 // Not public API. Referenced by macro-generated code.
 #[doc(hidden)]
 pub mod __private {
+    use self::not::Bool;
     use crate::Error;
     use alloc::fmt;
     use core::fmt::Arguments;
@@ -665,7 +672,7 @@
         #[doc(hidden)]
         pub use crate::kind::{AdhocKind, TraitKind};
 
-        #[cfg(feature = "std")]
+        #[cfg(any(feature = "std", not(anyhow_no_core_error)))]
         #[doc(hidden)]
         pub use crate::kind::BoxedKind;
     }
@@ -695,4 +702,31 @@
     pub fn must_use(error: Error) -> Error {
         error
     }
+
+    #[doc(hidden)]
+    #[inline]
+    pub fn not(cond: impl Bool) -> bool {
+        cond.not()
+    }
+
+    mod not {
+        #[doc(hidden)]
+        pub trait Bool {
+            fn not(self) -> bool;
+        }
+
+        impl Bool for bool {
+            #[inline]
+            fn not(self) -> bool {
+                !self
+            }
+        }
+
+        impl Bool for &bool {
+            #[inline]
+            fn not(self) -> bool {
+                !*self
+            }
+        }
+    }
 }

crates/anyhow/src/macros.rs

diff --git a/crates/anyhow/src/macros.rs b/crates/anyhow/src/macros.rs
index 6dd2274..469b3d8 100644
--- a/crates/anyhow/src/macros.rs
+++ b/crates/anyhow/src/macros.rs
@@ -1,9 +1,10 @@
 /// Return early with an error.
 ///
-/// This macro is equivalent to `return Err(`[`anyhow!($args...)`][anyhow!]`)`.
+/// This macro is equivalent to
+/// <code>return Err([anyhow!($args\...)][anyhow!])</code>.
 ///
 /// The surrounding function's or closure's return value is required to be
-/// `Result<_,`[`anyhow::Error`][crate::Error]`>`.
+/// <code>Result&lt;_, [anyhow::Error][crate::Error]&gt;</code>.
 ///
 /// [anyhow!]: crate::anyhow
 ///
@@ -65,98 +66,108 @@
     };
 }
 
-/// Return early with an error if a condition is not satisfied.
-///
-/// This macro is equivalent to `if !$cond { return
-/// Err(`[`anyhow!($args...)`][anyhow!]`); }`.
-///
-/// The surrounding function's or closure's return value is required to be
-/// `Result<_,`[`anyhow::Error`][crate::Error]`>`.
-///
-/// Analogously to `assert!`, `ensure!` takes a condition and exits the function
-/// if the condition fails. Unlike `assert!`, `ensure!` returns an `Error`
-/// rather than panicking.
-///
-/// [anyhow!]: crate::anyhow
-///
-/// # Example
-///
-/// ```
-/// # use anyhow::{ensure, Result};
-/// #
-/// # fn main() -> Result<()> {
-/// #     let user = 0;
-/// #
-/// ensure!(user == 0, "only user 0 is allowed");
-/// #     Ok(())
-/// # }
-/// ```
-///
-/// ```
-/// # use anyhow::{ensure, Result};
-/// # use thiserror::Error;
-/// #
-/// # const MAX_DEPTH: usize = 1;
-/// #
-/// #[derive(Error, Debug)]
-/// enum ScienceError {
-///     #[error("recursion limit exceeded")]
-///     RecursionLimitExceeded,
-///     # #[error("...")]
-///     # More = (stringify! {
-///     ...
-///     # }, 1).1,
-/// }
-///
-/// # fn main() -> Result<()> {
-/// #     let depth = 0;
-/// #
-/// ensure!(depth <= MAX_DEPTH, ScienceError::RecursionLimitExceeded);
-/// #     Ok(())
-/// # }
-/// ```
-#[cfg(doc)]
-#[macro_export]
-macro_rules! ensure {
-    ($cond:expr $(,)?) => {
-        if !$cond {
-            return $crate::__private::Err($crate::Error::msg(
-                $crate::__private::concat!("Condition failed: `", $crate::__private::stringify!($cond), "`")
-            ));
-        }
-    };
-    ($cond:expr, $msg:literal $(,)?) => {
-        if !$cond {
-            return $crate::__private::Err($crate::__anyhow!($msg));
-        }
-    };
-    ($cond:expr, $err:expr $(,)?) => {
-        if !$cond {
-            return $crate::__private::Err($crate::__anyhow!($err));
-        }
-    };
-    ($cond:expr, $fmt:expr, $($arg:tt)*) => {
-        if !$cond {
-            return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*));
-        }
+macro_rules! __ensure {
+    ($ensure:item) => {
+        /// Return early with an error if a condition is not satisfied.
+        ///
+        /// This macro is equivalent to
+        /// <code>if !$cond { return Err([anyhow!($args\...)][anyhow!]); }</code>.
+        ///
+        /// The surrounding function's or closure's return value is required to be
+        /// <code>Result&lt;_, [anyhow::Error][crate::Error]&gt;</code>.
+        ///
+        /// Analogously to `assert!`, `ensure!` takes a condition and exits the function
+        /// if the condition fails. Unlike `assert!`, `ensure!` returns an `Error`
+        /// rather than panicking.
+        ///
+        /// [anyhow!]: crate::anyhow
+        ///
+        /// # Example
+        ///
+        /// ```
+        /// # use anyhow::{ensure, Result};
+        /// #
+        /// # fn main() -> Result<()> {
+        /// #     let user = 0;
+        /// #
+        /// ensure!(user == 0, "only user 0 is allowed");
+        /// #     Ok(())
+        /// # }
+        /// ```
+        ///
+        /// ```
+        /// # use anyhow::{ensure, Result};
+        /// # use thiserror::Error;
+        /// #
+        /// # const MAX_DEPTH: usize = 1;
+        /// #
+        /// #[derive(Error, Debug)]
+        /// enum ScienceError {
+        ///     #[error("recursion limit exceeded")]
+        ///     RecursionLimitExceeded,
+        ///     # #[error("...")]
+        ///     # More = (stringify! {
+        ///     ...
+        ///     # }, 1).1,
+        /// }
+        ///
+        /// # fn main() -> Result<()> {
+        /// #     let depth = 0;
+        /// #
+        /// ensure!(depth <= MAX_DEPTH, ScienceError::RecursionLimitExceeded);
+        /// #     Ok(())
+        /// # }
+        /// ```
+        $ensure
     };
 }
 
+#[cfg(doc)]
+__ensure![
+    #[macro_export]
+    macro_rules! ensure {
+        ($cond:expr $(,)?) => {
+            if !$cond {
+                return $crate::__private::Err($crate::Error::msg(
+                    $crate::__private::concat!("Condition failed: `", $crate::__private::stringify!($cond), "`")
+                ));
+            }
+        };
+        ($cond:expr, $msg:literal $(,)?) => {
+            if !$cond {
+                return $crate::__private::Err($crate::__anyhow!($msg));
+            }
+        };
+        ($cond:expr, $err:expr $(,)?) => {
+            if !$cond {
+                return $crate::__private::Err($crate::__anyhow!($err));
+            }
+        };
+        ($cond:expr, $fmt:expr, $($arg:tt)*) => {
+            if !$cond {
+                return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*));
+            }
+        };
+    }
+];
+
 #[cfg(not(doc))]
-#[macro_export]
-macro_rules! ensure {
-    ($($tt:tt)*) => {
-        $crate::__parse_ensure!(
-            /* state */ 0
-            /* stack */ ()
-            /* bail */ ($($tt)*)
-            /* fuel */ (~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~)
-            /* parse */ {()}
-            /* dup */ ($($tt)*)
-            /* rest */ $($tt)*
-        )
-    };
-}
+__ensure![
+    #[macro_export]
+    macro_rules! ensure {
+        ($($tt:tt)*) => {
+            $crate::__parse_ensure!(
+                /* state */ 0
+                /* stack */ ()
+                /* bail */ ($($tt)*)
+                /* fuel */ (~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~)
+                /* parse */ {()}
+                /* dup */ ($($tt)*)
+                /* rest */ $($tt)*
+            )
+        };
+    }
+];
 
 /// Construct an ad-hoc error from a string or existing non-`anyhow` error
 /// value.

crates/anyhow/src/wrapper.rs

diff --git a/crates/anyhow/src/wrapper.rs b/crates/anyhow/src/wrapper.rs
index 0eb5478..6f46779 100644
--- a/crates/anyhow/src/wrapper.rs
+++ b/crates/anyhow/src/wrapper.rs
@@ -1,8 +1,11 @@
 use crate::StdError;
 use core::fmt::{self, Debug, Display};
 
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
+use alloc::boxed::Box;
+
 #[cfg(error_generic_member_access)]
-use std::error::Request;
+use core::error::Request;
 
 #[repr(transparent)]
 pub struct MessageError<M>(pub M);
@@ -50,25 +53,25 @@
 
 impl<M> StdError for DisplayError<M> where M: Display + 'static {}
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 #[repr(transparent)]
 pub struct BoxedError(pub Box<dyn StdError + Send + Sync>);
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl Debug for BoxedError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         Debug::fmt(&self.0, f)
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl Display for BoxedError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         Display::fmt(&self.0, f)
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", not(anyhow_no_core_error)))]
 impl StdError for BoxedError {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
         self.0.source()

crates/anyhow/tests/compiletest.rs

diff --git a/crates/anyhow/tests/compiletest.rs b/crates/anyhow/tests/compiletest.rs
index 7974a62..23a6a06 100644
--- a/crates/anyhow/tests/compiletest.rs
+++ b/crates/anyhow/tests/compiletest.rs
@@ -1,5 +1,5 @@
-#[rustversion::attr(not(nightly), ignore)]
-#[cfg_attr(miri, ignore)]
+#[rustversion::attr(not(nightly), ignore = "requires nightly")]
+#[cfg_attr(miri, ignore = "incompatible with miri")]
 #[test]
 fn ui() {
     let t = trybuild::TestCases::new();

crates/anyhow/tests/test_autotrait.rs

diff --git a/crates/anyhow/tests/test_autotrait.rs b/crates/anyhow/tests/test_autotrait.rs
index 94d7a59..080b3b9 100644
--- a/crates/anyhow/tests/test_autotrait.rs
+++ b/crates/anyhow/tests/test_autotrait.rs
@@ -1,6 +1,7 @@
 #![allow(clippy::extra_unused_type_parameters)]
 
 use anyhow::Error;
+use std::panic::{RefUnwindSafe, UnwindSafe};
 
 #[test]
 fn test_send() {
@@ -13,3 +14,21 @@
     fn assert_sync<T: Sync>() {}
     assert_sync::<Error>();
 }
+
+#[test]
+fn test_unwind_safe() {
+    fn assert_unwind_safe<T: UnwindSafe>() {}
+    assert_unwind_safe::<Error>();
+}
+
+#[test]
+fn test_ref_unwind_safe() {
+    fn assert_ref_unwind_safe<T: RefUnwindSafe>() {}
+    assert_ref_unwind_safe::<Error>();
+}
+
+#[test]
+fn test_unpin() {
+    fn assert_unpin<T: Unpin>() {}
+    assert_unpin::<Error>();
+}

crates/anyhow/tests/test_backtrace.rs

diff --git a/crates/anyhow/tests/test_backtrace.rs b/crates/anyhow/tests/test_backtrace.rs
index c89559e..938c1c2 100644
--- a/crates/anyhow/tests/test_backtrace.rs
+++ b/crates/anyhow/tests/test_backtrace.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::let_underscore_untyped)]
 
 #[rustversion::not(nightly)]
-#[ignore]
+#[ignore = "requires nightly"]
 #[test]
 fn test_backtrace() {}
 

crates/anyhow/tests/test_ensure.rs

diff --git a/crates/anyhow/tests/test_ensure.rs b/crates/anyhow/tests/test_ensure.rs
index aeff3ac..b43490a 100644
--- a/crates/anyhow/tests/test_ensure.rs
+++ b/crates/anyhow/tests/test_ensure.rs
@@ -1,6 +1,9 @@
 #![allow(
     clippy::bool_to_int_with_if,
+    clippy::char_lit_as_u8,
+    clippy::deref_addrof,
     clippy::diverging_sub_expression,
+    clippy::erasing_op,
     clippy::extra_unused_type_parameters,
     clippy::if_same_then_else,
     clippy::ifs_same_cond,
@@ -16,6 +19,7 @@
     clippy::redundant_pattern_matching,
     clippy::too_many_lines,
     clippy::unit_arg,
+    clippy::unnecessary_cast,
     clippy::while_immutable_condition,
     clippy::zero_ptr,
     irrefutable_let_patterns
@@ -128,6 +132,19 @@
         test,
         "Condition failed: `while false == true && false {} < ()` (() vs ())",
     );
+
+    let a = 15;
+    let b = 3;
+    let test = || Ok(ensure!(a <= b || a - b <= 10));
+    assert_err(test, "Condition failed: `a <= b || a - b <= 10`");
+}
+
+#[test]
+fn test_high_precedence_binary_operator() {
+    let a = 15;
+    let b = 3;
+    let test = || Ok(ensure!(a - b <= 10));
+    assert_err(test, "Condition failed: `a - b <= 10` (12 vs 10)");
 }
 
 #[test]
@@ -136,18 +153,18 @@
     // identifier, nor as `(S + move || 1) == (1)` by misinterpreting the
     // closure precedence.
     let test = || Ok(ensure!(S + move || 1 == 1));
-    assert_err(test, "Condition failed: `S + (move || 1 == 1)`");
+    assert_err(test, "Condition failed: `S + move || 1 == 1`");
 
     let test = || Ok(ensure!(S + || 1 == 1));
-    assert_err(test, "Condition failed: `S + (|| 1 == 1)`");
+    assert_err(test, "Condition failed: `S + || 1 == 1`");
 
     // Must not partition as `S + ((move | ()) | 1) == 1` by treating those
     // pipes as bitwise-or.
     let test = || Ok(ensure!(S + move |()| 1 == 1));
-    assert_err(test, "Condition failed: `S + (move |()| 1 == 1)`");
+    assert_err(test, "Condition failed: `S + move |()| 1 == 1`");
 
     let test = || Ok(ensure!(S + |()| 1 == 1));
-    assert_err(test, "Condition failed: `S + (|()| 1 == 1)`");
+    assert_err(test, "Condition failed: `S + |()| 1 == 1`");
 }
 
 #[test]
@@ -169,6 +186,17 @@
     assert_err(test, "Condition failed: `&mut x == *&&mut &2` (1 vs 2)");
 }
 
+#[rustversion::since(1.82)]
+#[test]
+fn test_raw_addr() {
+    let mut x = 1;
+    let test = || Ok(ensure!(S + &raw const x != S + &raw mut x));
+    assert_err(
+        test,
+        "Condition failed: `S + &raw const x != S + &raw mut x` (false vs false)",
+    );
+}
+
 #[test]
 fn test_if() {
     #[rustfmt::skip]
@@ -207,7 +235,7 @@
     let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2));
     assert_err(
         test,
-        "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
+        "Condition failed: `if let | 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
     );
 }
 
@@ -252,7 +280,7 @@
     let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2));
     assert_err(
         test,
-        "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
+        "Condition failed: `for | _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
     );
 
     #[rustfmt::skip]
@@ -269,7 +297,7 @@
     let test = || Ok(ensure!(match 1 == 1 { true => 1, false => 0 } == 2));
     assert_err(
         test,
-        "Condition failed: `match 1 == 1 { true => 1, false => 0, } == 2` (1 vs 2)",
+        "Condition failed: `match 1 == 1 { true => 1, false => 0 } == 2` (1 vs 2)",
     );
 }
 
@@ -326,7 +354,7 @@
     let test = || Ok(ensure!(Error::msg::<&str,>.t(1) == 2));
     assert_err(
         test,
-        "Condition failed: `Error::msg::<&str>.t(1) == 2` (1 vs 2)",
+        "Condition failed: `Error::msg::<&str,>.t(1) == 2` (1 vs 2)",
     );
 
     let test = || Ok(ensure!(Error::msg::<<str as ToOwned>::Owned>.t(1) == 2));
@@ -345,7 +373,7 @@
     let test = || Ok(ensure!(Chain::<'static,>::new.t(1) == 2));
     assert_err(
         test,
-        "Condition failed: `Chain::<'static>::new.t(1) == 2` (1 vs 2)",
+        "Condition failed: `Chain::<'static,>::new.t(1) == 2` (1 vs 2)",
     );
 
     fn f<const I: isize>() {}
@@ -377,7 +405,7 @@
 
     #[rustfmt::skip]
     let test = || Ok(ensure!(E::U::<u8,>>E::U));
-    assert_err(test, "Condition failed: `E::U::<u8> > E::U` (U vs U)");
+    assert_err(test, "Condition failed: `E::U::<u8,> > E::U` (U vs U)");
 
     let test = || Ok(ensure!(Generic::<dyn Debug + Sync> != Generic));
     assert_err(
@@ -399,7 +427,7 @@
     };
     assert_err(
         test,
-        "Condition failed: `Generic::<dyn Fn() + ::std::marker::Sync> != Generic` (Generic vs Generic)",
+        "Condition failed: `Generic::<dyn Fn::() + ::std::marker::Sync> != Generic` (Generic vs Generic)",
     );
 }
 
@@ -464,7 +492,9 @@
 fn test_whitespace() {
     #[derive(Debug)]
     pub struct Point {
+        #[allow(dead_code)]
         pub x: i32,
+        #[allow(dead_code)]
         pub y: i32,
     }
 

crates/anyhow/tests/test_fmt.rs

diff --git a/crates/anyhow/tests/test_fmt.rs b/crates/anyhow/tests/test_fmt.rs
index 016b4b8..4cd2d7b 100644
--- a/crates/anyhow/tests/test_fmt.rs
+++ b/crates/anyhow/tests/test_fmt.rs
@@ -79,7 +79,6 @@
 }
 
 #[test]
-#[cfg_attr(not(std_backtrace), ignore)]
 fn test_debug() {
     assert!(format!("{:?}", f().unwrap_err()).starts_with(EXPECTED_DEBUG_F));
     assert!(format!("{:?}", g().unwrap_err()).starts_with(EXPECTED_DEBUG_G));

crates/anyhow/tests/test_macros.rs

diff --git a/crates/anyhow/tests/test_macros.rs b/crates/anyhow/tests/test_macros.rs
index a3342ab..10740a9 100644
--- a/crates/anyhow/tests/test_macros.rs
+++ b/crates/anyhow/tests/test_macros.rs
@@ -1,7 +1,9 @@
 #![allow(
     clippy::assertions_on_result_states,
     clippy::eq_op,
+    clippy::incompatible_msrv, // https://github.com/rust-lang/rust-clippy/issues/12257
     clippy::items_after_statements,
+    clippy::match_single_binding,
     clippy::needless_pass_by_value,
     clippy::shadow_unrelated,
     clippy::wildcard_imports
@@ -10,7 +12,7 @@
 mod common;
 
 use self::common::*;
-use anyhow::{anyhow, ensure};
+use anyhow::{anyhow, ensure, Result};
 use std::cell::Cell;
 use std::future;
 
@@ -53,6 +55,20 @@
 }
 
 #[test]
+fn test_ensure_nonbool() -> Result<()> {
+    struct Struct {
+        condition: bool,
+    }
+
+    let s = Struct { condition: true };
+    match &s {
+        Struct { condition } => ensure!(condition), // &bool
+    }
+
+    Ok(())
+}
+
+#[test]
 fn test_temporaries() {
     fn require_send_sync(_: impl Send + Sync) {}
 

crates/anyhow/tests/test_repr.rs

diff --git a/crates/anyhow/tests/test_repr.rs b/crates/anyhow/tests/test_repr.rs
index 065041c..2976cd8 100644
--- a/crates/anyhow/tests/test_repr.rs
+++ b/crates/anyhow/tests/test_repr.rs
@@ -4,7 +4,6 @@
 
 use self::drop::{DetectDrop, Flag};
 use anyhow::Error;
-use std::marker::Unpin;
 use std::mem;
 
 #[test]

crates/anyhow/tests/ui/ensure-nonbool.rs

diff --git a/crates/anyhow/tests/ui/ensure-nonbool.rs b/crates/anyhow/tests/ui/ensure-nonbool.rs
new file mode 100644
index 0000000..c7df4e1
--- /dev/null
+++ b/crates/anyhow/tests/ui/ensure-nonbool.rs
@@ -0,0 +1,40 @@
+use anyhow::{ensure, Result};
+use std::ops::{Deref, Not};
+
+struct Bool(bool);
+
+struct DerefBool(bool);
+
+struct NotBool(bool);
+
+impl Deref for DerefBool {
+    type Target = bool;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl Not for NotBool {
+    type Output = bool;
+    fn not(self) -> Self::Output {
+        !self.0
+    }
+}
+
+fn main() -> Result<()> {
+    ensure!("...");
+
+    let mut s = Bool(true);
+    match &mut s {
+        Bool(cond) => ensure!(cond),
+    }
+
+    let db = DerefBool(true);
+    ensure!(db);
+    ensure!(&db);
+
+    let nb = NotBool(true);
+    ensure!(nb);
+
+    Ok(())
+}

crates/anyhow/tests/ui/ensure-nonbool.stderr

diff --git a/crates/anyhow/tests/ui/ensure-nonbool.stderr b/crates/anyhow/tests/ui/ensure-nonbool.stderr
new file mode 100644
index 0000000..3fdb8e6
--- /dev/null
+++ b/crates/anyhow/tests/ui/ensure-nonbool.stderr
@@ -0,0 +1,91 @@
+error[E0277]: the trait bound `&str: __private::not::Bool` is not satisfied
+  --> tests/ui/ensure-nonbool.rs:25:13
+   |
+25 |     ensure!("...");
+   |     --------^^^^^-
+   |     |       |
+   |     |       the trait `__private::not::Bool` is not implemented for `&str`
+   |     required by a bound introduced by this call
+   |
+   = help: the following other types implement trait `__private::not::Bool`:
+             &bool
+             bool
+note: required by a bound in `anyhow::__private::not`
+  --> src/lib.rs
+   |
+   |     pub fn not(cond: impl Bool) -> bool {
+   |                           ^^^^ required by this bound in `not`
+
+error[E0277]: the trait bound `&mut bool: __private::not::Bool` is not satisfied
+  --> tests/ui/ensure-nonbool.rs:29:31
+   |
+29 |         Bool(cond) => ensure!(cond),
+   |                       --------^^^^-
+   |                       |       |
+   |                       |       the trait `__private::not::Bool` is not implemented for `&mut bool`
+   |                       required by a bound introduced by this call
+   |
+   = help: the following other types implement trait `__private::not::Bool`:
+             &bool
+             bool
+   = note: `__private::not::Bool` is implemented for `&bool`, but not for `&mut bool`
+note: required by a bound in `anyhow::__private::not`
+  --> src/lib.rs
+   |
+   |     pub fn not(cond: impl Bool) -> bool {
+   |                           ^^^^ required by this bound in `not`
+
+error[E0277]: the trait bound `DerefBool: __private::not::Bool` is not satisfied
+  --> tests/ui/ensure-nonbool.rs:33:13
+   |
+33 |     ensure!(db);
+   |     --------^^-
+   |     |       |
+   |     |       the trait `__private::not::Bool` is not implemented for `DerefBool`
+   |     required by a bound introduced by this call
+   |
+   = help: the following other types implement trait `__private::not::Bool`:
+             &bool
+             bool
+note: required by a bound in `anyhow::__private::not`
+  --> src/lib.rs
+   |
+   |     pub fn not(cond: impl Bool) -> bool {
+   |                           ^^^^ required by this bound in `not`
+
+error[E0277]: the trait bound `&DerefBool: __private::not::Bool` is not satisfied
+  --> tests/ui/ensure-nonbool.rs:34:13
+   |
+34 |     ensure!(&db);
+   |     --------^^^-
+   |     |       |
+   |     |       the trait `__private::not::Bool` is not implemented for `&DerefBool`
+   |     required by a bound introduced by this call
+   |
+note: required by a bound in `anyhow::__private::not`
+  --> src/lib.rs
+   |
+   |     pub fn not(cond: impl Bool) -> bool {
+   |                           ^^^^ required by this bound in `not`
+help: consider dereferencing here
+   |
+34 |     ensure!(&*db);
+   |              +
+
+error[E0277]: the trait bound `NotBool: __private::not::Bool` is not satisfied
+  --> tests/ui/ensure-nonbool.rs:37:13
+   |
+37 |     ensure!(nb);
+   |     --------^^-
+   |     |       |
+   |     |       the trait `__private::not::Bool` is not implemented for `NotBool`
+   |     required by a bound introduced by this call
+   |
+   = help: the following other types implement trait `__private::not::Bool`:
+             &bool
+             bool
+note: required by a bound in `anyhow::__private::not`
+  --> src/lib.rs
+   |
+   |     pub fn not(cond: impl Bool) -> bool {
+   |                           ^^^^ required by this bound in `not`

crates/anyhow/tests/ui/no-impl.stderr

diff --git a/crates/anyhow/tests/ui/no-impl.stderr b/crates/anyhow/tests/ui/no-impl.stderr
index 1ddf768..e06d70b 100644
--- a/crates/anyhow/tests/ui/no-impl.stderr
+++ b/crates/anyhow/tests/ui/no-impl.stderr
@@ -2,11 +2,7 @@
  --> tests/ui/no-impl.rs:7:13
   |
 4 | struct Error;
-  | ------------
-  | |
-  | doesn't satisfy `Error: Into<anyhow::Error>`
-  | doesn't satisfy `Error: anyhow::kind::TraitKind`
-  | doesn't satisfy `Error: std::fmt::Display`
+  | ------------ doesn't satisfy `Error: Into<anyhow::Error>`, `Error: anyhow::kind::TraitKind` or `Error: std::fmt::Display`
 ...
 7 |     let _ = anyhow!(Error);
   |             ^^^^^^^^^^^^^^ method cannot be called on `&Error` due to unsatisfied trait bounds
@@ -28,4 +24,9 @@
   |
   | pub trait Into<T>: Sized {
   | ^^^^^^^^^^^^^^^^^^^^^^^^
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following traits define an item `anyhow_kind`, perhaps you need to implement one of them:
+          candidate #1: `anyhow::kind::AdhocKind`
+          candidate #2: `anyhow::kind::BoxedKind`
+          candidate #3: `anyhow::kind::TraitKind`
   = note: this error originates in the macro `anyhow` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/async-stream-impl/.android-checksum.json

diff --git a/crates/async-stream-impl/.android-checksum.json b/crates/async-stream-impl/.android-checksum.json
index 27df696..6e09cdb 100644
--- a/crates/async-stream-impl/.android-checksum.json
+++ b/crates/async-stream-impl/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"767b664bae40d2075fd7887afdec649f0ab36d9e112c2dba93d62dc34dd72020","Android.bp":"96ab42f04228a484e6ad76ffacf5ff7244168bf1b3c5d74270572138b65daeaa","Cargo.toml":"2375783628e541d3c6f6816588da50ba935ee96e877995b3aeeb164fda7d40a8","LICENSE":"91082263680ee4bff8afdf40be03814231c4372e71daac0260a975337400b98b","METADATA":"3187251957fbecbb9b21230abc1a605527c2feeb7a6f3837aee1947fe20480e0","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","TEST_MAPPING":"43e2cf8ae35c5ef457ca9c08ad1d0ba2d47f7b7aade538d11115f9aafd40cc80","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","patches/lib.diff":"fe0c7dacbe88947e17b84340ff9a1ff798aa6477a6444c8cf5bb26bfa2f1bcb7","src/lib.rs":"13abe9413fbf0f99aea263305d1b7c18d6916964f717ec3e2671ad5f8ad24aa4"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"de9810e9d94e3c96c800c147eaeab1e9fd92c3f5a9ca9fc0bb369995ee9f5bfc","Android.bp":"26299825397cac3b250fb97a48dc727369327f77998957e44a24588f87b88361","Cargo.toml":"df0e3db7d5e0fd74076a14468cf98241d8714bc679c3629d66b55084c5ec32ea","LICENSE":"91082263680ee4bff8afdf40be03814231c4372e71daac0260a975337400b98b","METADATA":"82347b33bf6149dfa0883b742eb58f3abe1f34628e0e59dc2e3e5cd96c7a2c62","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","TEST_MAPPING":"43e2cf8ae35c5ef457ca9c08ad1d0ba2d47f7b7aade538d11115f9aafd40cc80","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","patches/lib.diff":"fe0c7dacbe88947e17b84340ff9a1ff798aa6477a6444c8cf5bb26bfa2f1bcb7","src/lib.rs":"8f5283ccfb0a058b1a09b6749d25f736e9f1d9d4341fe5f69395ecf7bebb454e"}}
\ No newline at end of file

crates/async-stream-impl/.cargo-checksum.json

diff --git a/crates/async-stream-impl/.cargo-checksum.json b/crates/async-stream-impl/.cargo-checksum.json
index 2c49a9a..87984c5 100644
--- a/crates/async-stream-impl/.cargo-checksum.json
+++ b/crates/async-stream-impl/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"913f0add50ab2cfe79fbd9d026e5d94b2edf8215472cd5a08d97044567b7d051","LICENSE":"157d381f6304eba77459fc10dfb5b1b22fc0d04e384a32865f32d8e67a34c0eb","src/lib.rs":"2e6390ba6770fb457f2db6a5cbe45725ea64e636fe3b8efc11ef6adf4ae3b63e"},"package":"16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0a6ec9f20c5312e8ec19d902cd330a69b3cf8a14a1081faaa6540046652b9f92","LICENSE":"157d381f6304eba77459fc10dfb5b1b22fc0d04e384a32865f32d8e67a34c0eb","src/lib.rs":"71ec1ba96d3ac995fbe1adcf29a492eb1ad9ea28922c07521416c4291e627081"},"package":"c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"}
\ No newline at end of file

crates/async-stream-impl/Android.bp

diff --git a/crates/async-stream-impl/Android.bp b/crates/async-stream-impl/Android.bp
index 24d776f..48b943e 100644
--- a/crates/async-stream-impl/Android.bp
+++ b/crates/async-stream-impl/Android.bp
@@ -17,9 +17,9 @@
     name: "libasync_stream_impl",
     crate_name: "async_stream_impl",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.6",
     crate_root: "src/lib.rs",
-    edition: "2018",
+    edition: "2021",
     rustlibs: [
         "libproc_macro2",
         "libquote",

crates/async-stream-impl/Cargo.toml

diff --git a/crates/async-stream-impl/Cargo.toml b/crates/async-stream-impl/Cargo.toml
index 51f8dd0..6e492ff 100644
--- a/crates/async-stream-impl/Cargo.toml
+++ b/crates/async-stream-impl/Cargo.toml
@@ -10,20 +10,28 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
-rust-version = "1.56"
+edition = "2021"
+rust-version = "1.65"
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 authors = ["Carl Lerche <me@carllerche.com>"]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "proc macros for async-stream crate"
+readme = false
 license = "MIT"
 repository = "https://github.com/tokio-rs/async-stream"
 
 [lib]
+name = "async_stream_impl"
+path = "src/lib.rs"
 proc-macro = true
 
 [dependencies.proc-macro2]
-version = "1"
+version = "1.0.60"
 
 [dependencies.quote]
 version = "1"

crates/async-stream-impl/METADATA

diff --git a/crates/async-stream-impl/METADATA b/crates/async-stream-impl/METADATA
index 510a3aa..53263c8 100644
--- a/crates/async-stream-impl/METADATA
+++ b/crates/async-stream-impl/METADATA
@@ -1,17 +1,17 @@
 name: "async-stream-impl"
 description: "proc macros for async-stream crate"
 third_party {
-  version: "0.3.5"
+  version: "0.3.6"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 11
-    day: 10
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/async-stream-impl"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/async-stream-impl/async-stream-impl-0.3.5.crate"
-    version: "0.3.5"
+    value: "https://static.crates.io/crates/async-stream-impl/async-stream-impl-0.3.6.crate"
+    version: "0.3.6"
   }
 }

crates/async-stream-impl/src/lib.rs

diff --git a/crates/async-stream-impl/src/lib.rs b/crates/async-stream-impl/src/lib.rs
index 8a9561b..7649d5b 100644
--- a/crates/async-stream-impl/src/lib.rs
+++ b/crates/async-stream-impl/src/lib.rs
@@ -66,7 +66,7 @@
                         tokens = rest.into_iter().peekable();
                     }
                     Err(e) => {
-                        out.append_all(&mut e.to_compile_error().into_iter());
+                        out.append_all(e.to_compile_error().into_iter());
                         *modified = true;
                         return;
                     }
@@ -121,10 +121,19 @@
 
                 // let ident = &self.yielder;
 
-                *i = if self.is_try {
-                    syn::parse_quote! { __yield_tx.send(::core::result::Result::Ok(#value_expr)).await }
+                let yield_expr = if self.is_try {
+                    quote! { __yield_tx.send(::core::result::Result::Ok(#value_expr)).await }
                 } else {
-                    syn::parse_quote! { __yield_tx.send(#value_expr).await }
+                    quote! { __yield_tx.send(#value_expr).await }
+                };
+                *i = syn::parse_quote! {
+                    {
+                        #[allow(unreachable_code)]
+                        if false {
+                            break '__async_stream_private_check_scope (loop {});
+                        }
+                        #yield_expr
+                    }
                 };
             }
             syn::Expr::Try(try_expr) => {
@@ -226,8 +235,10 @@
     quote!({
         let (mut __yield_tx, __yield_rx) = unsafe { #crate_path::__private::yielder::pair() };
         #crate_path::__private::AsyncStream::new(__yield_rx, async move {
-            #dummy_yield
-            #(#stmts)*
+            '__async_stream_private_check_scope: {
+                #dummy_yield
+                #(#stmts)*
+            }
         })
     })
     .into()
@@ -260,8 +271,10 @@
     quote!({
         let (mut __yield_tx, __yield_rx) = unsafe { #crate_path::__private::yielder::pair() };
         #crate_path::__private::AsyncStream::new(__yield_rx, async move {
-            #dummy_yield
-            #(#stmts)*
+            '__async_stream_private_check_scope: {
+                #dummy_yield
+                #(#stmts)*
+            }
         })
     })
     .into()

crates/async-stream/.android-checksum.json

diff --git a/crates/async-stream/.android-checksum.json b/crates/async-stream/.android-checksum.json
index 69c1e3c..97bfc74 100644
--- a/crates/async-stream/.android-checksum.json
+++ b/crates/async-stream/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"46d48ad7a7b117189bfe7b1e0e041a69a83e110847442bfcf83184f5988d1d64","Android.bp":"cd86d1fe1b0f58369eac5d5ee4b24cccfbd0f242c873c266e43468827642600c","CHANGELOG.md":"3a21892b745b6380f538451457cbfa28026741ac5e8da8abd3bd3ec0a5d01ff1","Cargo.lock":"07f9887bfb432fdac60d9f93d20352f085e7fd8fe526d750519d1ea5d00aff06","Cargo.toml":"a9529cab7fcbebec4f46c89b60b23d901a2ab24577ab325743e2116823a60102","LICENSE":"91082263680ee4bff8afdf40be03814231c4372e71daac0260a975337400b98b","METADATA":"a757f4c9f2aee11eced7b3bfbce52d669fa2c194c01deaed347cbffae6dca2da","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"f0806a491d2976eff281a0e3b81cad943ddd5dbcfb7b3a690502a1d5ca3429c7","README.tpl":"e8c2900699fa59ea7a57feef0a9d91bca4cb4dc0e628192b26df11251338101a","TEST_MAPPING":"c1b16be00743c49de6738602d1ccf26f85d9b17572099062574e43ef6381b3ac","cargo_embargo.json":"5e34a57533730dbe4f69fd74d6fd4fad1ad2c236b1bf4e6c623185196ea0641f","examples/tcp_accept.rs":"72940097b7695feab435843fdb4f702f306897c6785f8eb53457924b2c8aec55","src/async_stream.rs":"6405184bfe29f8b0f79ddc08006569d34d8f7c78386378e3dcfadd14205c16fb","src/lib.rs":"1fb9494c50ee63747fba55e434f1b3c00e6d87ee699dd3f46b16ed5facc71ebf","src/next.rs":"6623bff128133cc2e6c6109b2f574d384957aad2a1873dbf0aa1678c8c1185ad","src/yielder.rs":"f52ca4154c4e177f31d423d56400fc68c269efb1d6cf539e2a0a7c3890a4c83e","tests/for_await.rs":"75a8c89607ed676127ac635378eb939a127d1c1a880ca54e8af41304d9c08d8e","tests/spans_preserved.rs":"c5ec0ce7737636dcbb36fba773b6938b010e08238b89e4d495fbcd6269684266","tests/stream.rs":"9b12aa0514c5cced818a797dc1ba554c10154f665a25eee45aa50a2d7f9e5e1b","tests/try_stream.rs":"4508cf64e4f74aff6b8c48bd9d1e442e5fb7c10a2796370833969bd432ae3933","tests/ui/yield_bad_expr_in_macro.rs":"3f5e39a63d331613a78a0eacc5709d216ced8b191ef48fb8bff9d5a84e1c774b","tests/ui/yield_bad_expr_in_macro.stderr":"58fb82304e9f2b3301a4e108a736c8a3cbd445f86db730065f9a7198b817e37a","tests/ui/yield_in_async.rs":"607ed44a432759f337e87884efb2daeca475025f022f55d471bf68c82b00f72c","tests/ui/yield_in_async.stderr":"3823b3c79619d17258b17dd050300db0c75e96cbd2cce0ac08fad21073c31213","tests/ui/yield_in_closure.rs":"151793f2d8676476e95d0539cb8b56c1c6f119c4027168ef0f392316aa2e13f6","tests/ui/yield_in_closure.stderr":"3d46c672d0bf18ee749c39b5bd697b3d2cb0b8eec654ae43995f7f76e1f2fa7d","tests/ui/yield_in_nested_fn.rs":"6445989b2556adece9a9aca66d13bfdb9abd68e55d343f4f261cfe1281132703","tests/ui/yield_in_nested_fn.stderr":"45d843c439d25b136f40fb39dc346dfa3a30c42bb0f36a3f71c1aa24fbef0b94"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"140749fe925cfe0d32cbd86a2a5385acb2ab91b0d4ccfe2d0a1fb3c5fddca0d6","Android.bp":"3dfae7d0981346bca97b119e88ee4f01b2c78895f1d3bf5d8bd067324debefac","CHANGELOG.md":"0adacb1536b92bf26b6aa977fab9884b89d11c1862e2f76edd35da5e40167afc","Cargo.lock":"ab6e1732fde04c12a7ca825370feee0b645862d132142dda59deb2f4285577ce","Cargo.toml":"ebc7d4676552846c04ba6b2051f2b0b7b799513d5814f5aaadf6f1fdcade29f1","LICENSE":"91082263680ee4bff8afdf40be03814231c4372e71daac0260a975337400b98b","METADATA":"e2a429dab6b87a18a06305a2751fbfd710075ea4392f5d7fe89f9e4f4346f6d7","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"452bd87c1831a30eba219774671414f90c2d41c001808ad4002fbb1acec5cd05","README.tpl":"e8c2900699fa59ea7a57feef0a9d91bca4cb4dc0e628192b26df11251338101a","TEST_MAPPING":"c1b16be00743c49de6738602d1ccf26f85d9b17572099062574e43ef6381b3ac","cargo_embargo.json":"5e34a57533730dbe4f69fd74d6fd4fad1ad2c236b1bf4e6c623185196ea0641f","examples/tcp_accept.rs":"72940097b7695feab435843fdb4f702f306897c6785f8eb53457924b2c8aec55","src/async_stream.rs":"6405184bfe29f8b0f79ddc08006569d34d8f7c78386378e3dcfadd14205c16fb","src/lib.rs":"1fb9494c50ee63747fba55e434f1b3c00e6d87ee699dd3f46b16ed5facc71ebf","src/next.rs":"6623bff128133cc2e6c6109b2f574d384957aad2a1873dbf0aa1678c8c1185ad","src/yielder.rs":"731d15640dbdf0a9c75b4f645a89c166b1d68f18e3f6d8fffa17f13a8ba8736d","tests/for_await.rs":"75a8c89607ed676127ac635378eb939a127d1c1a880ca54e8af41304d9c08d8e","tests/spans_preserved.rs":"c5ec0ce7737636dcbb36fba773b6938b010e08238b89e4d495fbcd6269684266","tests/stream.rs":"9b12aa0514c5cced818a797dc1ba554c10154f665a25eee45aa50a2d7f9e5e1b","tests/try_stream.rs":"4508cf64e4f74aff6b8c48bd9d1e442e5fb7c10a2796370833969bd432ae3933","tests/ui/unsoundness_issue_106.rs":"0cf6835f5bfb886b9ad97c03fcef37fa854fb6748c5bcba5028f494e28da3eab","tests/ui/unsoundness_issue_106.stderr":"1f09fd02e6aade19d05fafec2b489a0b2041f696abb067c1c59ae4630f5e5b3e","tests/ui/unsoundness_issue_107.rs":"f06de861273302965ed82eb6f354dcd14e2f25f7356612ef53492e3bc4714049","tests/ui/unsoundness_issue_107.stderr":"f30e95bc3c8f4f22aa8211284028faa77d6340c2ed2b78b0d8043848c2aed4f6","tests/ui/yield_bad_expr_in_macro.rs":"3f5e39a63d331613a78a0eacc5709d216ced8b191ef48fb8bff9d5a84e1c774b","tests/ui/yield_bad_expr_in_macro.stderr":"4ca137503db9d1ddb1acd8556c2267862cb55196e737ce325c8e60056509d7e2","tests/ui/yield_in_async.rs":"607ed44a432759f337e87884efb2daeca475025f022f55d471bf68c82b00f72c","tests/ui/yield_in_async.stderr":"4743471fcc0cbb0c8213fae5ed8086cb98c0e45a781bdb673262a648c224849a","tests/ui/yield_in_closure.rs":"151793f2d8676476e95d0539cb8b56c1c6f119c4027168ef0f392316aa2e13f6","tests/ui/yield_in_closure.stderr":"3be0032c69b7509fb06f14e1b33614209940397834620680bb366232783b33fa","tests/ui/yield_in_nested_fn.rs":"6445989b2556adece9a9aca66d13bfdb9abd68e55d343f4f261cfe1281132703","tests/ui/yield_in_nested_fn.stderr":"5980894294048f4cfd2cc193fb83ad1c516fe444bb44e291b76081490e536f34"}}
\ No newline at end of file

crates/async-stream/.cargo-checksum.json

diff --git a/crates/async-stream/.cargo-checksum.json b/crates/async-stream/.cargo-checksum.json
index b4be1aa..be45dea 100644
--- a/crates/async-stream/.cargo-checksum.json
+++ b/crates/async-stream/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"63b8ee59b5bbdc99c4b0deef506392998b52404a266565f089e03f8702b5e178","Cargo.lock":"368b07ef515917e79070a670c6dc5ebc5ff1e89ef987de576cb62ffbc18a41bb","Cargo.toml":"0d465dbc7b803a82461804bfaf48caa372feff0eb466a93570c081b1b56f3f13","LICENSE":"157d381f6304eba77459fc10dfb5b1b22fc0d04e384a32865f32d8e67a34c0eb","README.md":"209c9018f3b85232a60676e725d0aa074493a67c7e0ddcdd4de95aac92e6fa85","README.tpl":"ffd534f536d1ee9a6590fb71be3468972bbc21db05fc7a1e51938fc347e4c64b","examples/tcp_accept.rs":"938586c070b73bfe6cf2088e4663b3fa3432adf2f1a7612ffeb22af9db0be449","src/async_stream.rs":"08dd739c3536d9bcbfdd254264b46d644f8293423b30c6469f099ba63537e8fd","src/lib.rs":"0daea6a62239a15ed514c4b30da9e28d46c59ebe080c542a582a68dfe1823d71","src/next.rs":"8ac0114e52e72de3bc9ff88b2c6ae1985af078ddc4e8a1de759cdfd097f11afd","src/yielder.rs":"1f1e81055fcf2325ac8887dc17977b6211c92a635ac187c0aa03a0bee181ed02","tests/for_await.rs":"1777db6587cacede1b7a23cd4f06816560a1c5c6974ee926f433f85370262409","tests/spans_preserved.rs":"d1178a4dd59129a3acd359aa7ff54d792070519a408197ffd6e5890f0e9cccd0","tests/stream.rs":"09f2ae6cfea5a416266595b3c97f9c19826e309185e5fbd75b6d1d8f2212410d","tests/try_stream.rs":"bb274c38a5850bf0a0b0c9a8c5ba32ff7ebe483e32d25cd47a80394f49224576","tests/ui/yield_bad_expr_in_macro.rs":"f73924f3472c02110605df078caa61f8ce0aad4380e8cc32fd72dedee2b6c69f","tests/ui/yield_bad_expr_in_macro.stderr":"299ab8335e20759296eec20704514b30c24a026db458aaf37a90532d4faab517","tests/ui/yield_in_async.rs":"304219f34f612d4c5cbf50ce5a9655c7846f2b1beb6d2e8a289851d72f4b5e07","tests/ui/yield_in_async.stderr":"0e20a40c40256c1cdbb6d0ecd22c594728ce895493cb2ee7cb4b320a1d59ba61","tests/ui/yield_in_closure.rs":"07fb117b239364bb2ca94312dc97e1a9af11f16b8ce782776c4ee713dba43119","tests/ui/yield_in_closure.stderr":"ed42c938e627f594ec94bd748a41a63a9e819e9b2f82494c332d2dfbaa2c9264","tests/ui/yield_in_nested_fn.rs":"250d639394184ea041e77fb866bd51516e6bbd302375a72d03c81fcf70a1c105","tests/ui/yield_in_nested_fn.stderr":"a79508bff0c7457b1988b189c05100b95441557e04e546e3ff16d59eeeb8afb2"},"package":"cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"407302e1ec8384aa88bfe8504d1aadf2f72e4b7bc5b79ddbd15166dfa23a9078","Cargo.lock":"e35d343b398984c7ba3a8998c5bcf497caf9bdfb15387e78dcbb3ade2def0d7b","Cargo.toml":"c7e1770e44b788dee452861a143ce0726f4d0fa44e10e7d5e3ccd499ee647ada","LICENSE":"157d381f6304eba77459fc10dfb5b1b22fc0d04e384a32865f32d8e67a34c0eb","README.md":"1aa663e5f6ae78fb012916bb89e53cba3d4a040aadd1aee71135c2008cb7ae6f","README.tpl":"ffd534f536d1ee9a6590fb71be3468972bbc21db05fc7a1e51938fc347e4c64b","examples/tcp_accept.rs":"938586c070b73bfe6cf2088e4663b3fa3432adf2f1a7612ffeb22af9db0be449","src/async_stream.rs":"08dd739c3536d9bcbfdd254264b46d644f8293423b30c6469f099ba63537e8fd","src/lib.rs":"0daea6a62239a15ed514c4b30da9e28d46c59ebe080c542a582a68dfe1823d71","src/next.rs":"8ac0114e52e72de3bc9ff88b2c6ae1985af078ddc4e8a1de759cdfd097f11afd","src/yielder.rs":"a6d56ea369dc7346f4b78b90ad9bedf2643f5189e0cdf958c89eac96af59280b","tests/for_await.rs":"1777db6587cacede1b7a23cd4f06816560a1c5c6974ee926f433f85370262409","tests/spans_preserved.rs":"d1178a4dd59129a3acd359aa7ff54d792070519a408197ffd6e5890f0e9cccd0","tests/stream.rs":"09f2ae6cfea5a416266595b3c97f9c19826e309185e5fbd75b6d1d8f2212410d","tests/try_stream.rs":"bb274c38a5850bf0a0b0c9a8c5ba32ff7ebe483e32d25cd47a80394f49224576","tests/ui/unsoundness_issue_106.rs":"36f2f633bfae0704e320499b55471c91e754e52613f2700ed731be67548df5d4","tests/ui/unsoundness_issue_106.stderr":"b1bffbd0652327ed2b3bb6252a2294c48207817854e34aca10640574a54d198b","tests/ui/unsoundness_issue_107.rs":"3945986ea1c4d8e597a39be4c88e7ea7815551d2c5bb837297a84f7a7bc03d8e","tests/ui/unsoundness_issue_107.stderr":"42aac83f97f2c80015e195c67a416643b090d63f2db67ada5bb5f72bc37f6614","tests/ui/yield_bad_expr_in_macro.rs":"f73924f3472c02110605df078caa61f8ce0aad4380e8cc32fd72dedee2b6c69f","tests/ui/yield_bad_expr_in_macro.stderr":"088c6051209f3bb879b6d442f0e643d72e5462d4a28c6aea84963240f53bdc7a","tests/ui/yield_in_async.rs":"304219f34f612d4c5cbf50ce5a9655c7846f2b1beb6d2e8a289851d72f4b5e07","tests/ui/yield_in_async.stderr":"1d34d7852e1bcfe5b4d8d3c483cd4226ebb046160758337261695625209e4e81","tests/ui/yield_in_closure.rs":"07fb117b239364bb2ca94312dc97e1a9af11f16b8ce782776c4ee713dba43119","tests/ui/yield_in_closure.stderr":"2b880896140483e9cde620bb326a8c95121fbb0e741cecf9e20c716bc8a7d068","tests/ui/yield_in_nested_fn.rs":"250d639394184ea041e77fb866bd51516e6bbd302375a72d03c81fcf70a1c105","tests/ui/yield_in_nested_fn.stderr":"88d09035f8405b6ab47e9ed86d6f879b085d841aae890f15ae134d57e72553e5"},"package":"0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"}
\ No newline at end of file

crates/async-stream/Android.bp

diff --git a/crates/async-stream/Android.bp b/crates/async-stream/Android.bp
index dd2ae61..160883c 100644
--- a/crates/async-stream/Android.bp
+++ b/crates/async-stream/Android.bp
@@ -18,14 +18,14 @@
     host_supported: true,
     crate_name: "for_await",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.6",
     crate_root: "tests/for_await.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     rustlibs: [
         "libasync_stream",
         "libfutures_core",
@@ -44,14 +44,14 @@
     host_supported: true,
     crate_name: "spans_preserved",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.6",
     crate_root: "tests/spans_preserved.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     rustlibs: [
         "libasync_stream",
         "libfutures_core",
@@ -70,14 +70,14 @@
     host_supported: true,
     crate_name: "try_stream",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.6",
     crate_root: "tests/try_stream.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     rustlibs: [
         "libasync_stream",
         "libfutures_core",
@@ -96,9 +96,9 @@
     host_supported: true,
     crate_name: "async_stream",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.6",
     crate_root: "src/lib.rs",
-    edition: "2018",
+    edition: "2021",
     rustlibs: [
         "libfutures_core",
         "libpin_project_lite",

crates/async-stream/CHANGELOG.md

diff --git a/crates/async-stream/CHANGELOG.md b/crates/async-stream/CHANGELOG.md
index 2eb7df1..f78b947 100644
--- a/crates/async-stream/CHANGELOG.md
+++ b/crates/async-stream/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.3.6
+
+* Fix soundness bugs (#109)
+* Bump MSRV to 1.65 (#109)
+
 # 0.3.5
 
 * Update to syn 2.0 (#93)

crates/async-stream/Cargo.lock

diff --git a/crates/async-stream/Cargo.lock b/crates/async-stream/Cargo.lock
index 62e85bd..52dc855 100644
--- a/crates/async-stream/Cargo.lock
+++ b/crates/async-stream/Cargo.lock
@@ -3,8 +3,23 @@
 version = 3
 
 [[package]]
+name = "addr2line"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -17,9 +32,9 @@
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -28,30 +43,36 @@
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
-name = "basic-toml"
-version = "0.1.2"
+name = "backtrace"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
- "serde",
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cfg-if"
@@ -60,16 +81,22 @@
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "futures-core"
-version = "0.3.28"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -78,15 +105,15 @@
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -97,84 +124,102 @@
 ]
 
 [[package]]
+name = "gimli"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+
+[[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
-name = "hermit-abi"
-version = "0.2.6"
+name = "hashbrown"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "indexmap"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
- "libc",
+ "equivalent",
+ "hashbrown",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
 ]
 
 [[package]]
-name = "log"
-version = "0.4.17"
+name = "memchr"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "cfg-if",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi",
  "libc",
+ "wasi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.17.1"
+name = "object"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -182,22 +227,22 @@
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys",
+ "windows-targets",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -207,60 +252,69 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
-name = "rustversion"
-version = "1.0.12"
+name = "rustc-demangle"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -269,54 +323,64 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.95"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
+name = "serde_spanned"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.13"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -325,37 +389,36 @@
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -363,25 +426,58 @@
 ]
 
 [[package]]
-name = "trybuild"
-version = "1.0.80"
+name = "toml"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "basic-toml",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "trybuild"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8"
+dependencies = [
  "glob",
- "once_cell",
  "serde",
  "serde_derive",
  "serde_json",
  "termcolor",
+ "toml",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "wasi"
@@ -390,54 +486,42 @@
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
+ "windows_i686_gnullvm",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
@@ -446,42 +530,57 @@
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]

crates/async-stream/Cargo.toml

diff --git a/crates/async-stream/Cargo.toml b/crates/async-stream/Cargo.toml
index 8d9ec58..b9526b3 100644
--- a/crates/async-stream/Cargo.toml
+++ b/crates/async-stream/Cargo.toml
@@ -10,18 +10,47 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
-rust-version = "1.56"
+edition = "2021"
+rust-version = "1.65"
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 authors = ["Carl Lerche <me@carllerche.com>"]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Asynchronous streams using async & await notation"
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/tokio-rs/async-stream"
 
+[lib]
+name = "async_stream"
+path = "src/lib.rs"
+
+[[example]]
+name = "tcp_accept"
+path = "examples/tcp_accept.rs"
+
+[[test]]
+name = "for_await"
+path = "tests/for_await.rs"
+
+[[test]]
+name = "spans_preserved"
+path = "tests/spans_preserved.rs"
+
+[[test]]
+name = "stream"
+path = "tests/stream.rs"
+
+[[test]]
+name = "try_stream"
+path = "tests/try_stream.rs"
+
 [dependencies.async-stream-impl]
-version = "=0.3.5"
+version = "=0.3.6"
 
 [dependencies.futures-core]
 version = "0.3"

crates/async-stream/METADATA

diff --git a/crates/async-stream/METADATA b/crates/async-stream/METADATA
index 1653269..f67587d 100644
--- a/crates/async-stream/METADATA
+++ b/crates/async-stream/METADATA
@@ -1,17 +1,17 @@
 name: "async-stream"
 description: "Asynchronous streams using async & await notation"
 third_party {
-  version: "0.3.5"
+  version: "0.3.6"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 11
-    day: 24
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/async-stream"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/async-stream/async-stream-0.3.5.crate"
-    version: "0.3.5"
+    value: "https://static.crates.io/crates/async-stream/async-stream-0.3.6.crate"
+    version: "0.3.6"
   }
 }

crates/async-stream/README.md

diff --git a/crates/async-stream/README.md b/crates/async-stream/README.md
index 8688423..79c5012 100644
--- a/crates/async-stream/README.md
+++ b/crates/async-stream/README.md
@@ -152,7 +152,7 @@
 
 ## Supported Rust Versions
 
-The current minimum supported Rust version is 1.56.
+The current minimum supported Rust version is 1.65.
 
 ## License
 

crates/async-stream/src/yielder.rs

diff --git a/crates/async-stream/src/yielder.rs b/crates/async-stream/src/yielder.rs
index 597e1c9..4b7a944 100644
--- a/crates/async-stream/src/yielder.rs
+++ b/crates/async-stream/src/yielder.rs
@@ -7,7 +7,7 @@
 
 #[derive(Debug)]
 pub struct Sender<T> {
-    _p: PhantomData<T>,
+    _p: PhantomData<fn(T) -> T>,
 }
 
 #[derive(Debug)]
@@ -34,7 +34,7 @@
 // Tracks the pointer to `Option<T>`.
 //
 // TODO: Ensure wakers match?
-thread_local!(static STORE: Cell<*mut ()> = Cell::new(ptr::null_mut()));
+thread_local!(static STORE: Cell<*mut ()> = const { Cell::new(ptr::null_mut()) });
 
 // ===== impl Sender =====
 

crates/async-stream/tests/ui/unsoundness_issue_106.rs

diff --git a/crates/async-stream/tests/ui/unsoundness_issue_106.rs b/crates/async-stream/tests/ui/unsoundness_issue_106.rs
new file mode 100644
index 0000000..2b969ee
--- /dev/null
+++ b/crates/async-stream/tests/ui/unsoundness_issue_106.rs
@@ -0,0 +1,30 @@
+use async_stream::stream;
+use futures_util::StreamExt;
+
+use std::pin::pin;
+
+macro_rules! asynk {
+    ($e:expr) => {
+        async { $e }
+    };
+}
+
+#[tokio::main]
+async fn main() {
+    pin!(stream! {
+        let yield_42 = asynk!(yield 42_usize);
+        let s = stream! {
+            yield Box::new(12345);
+            yield_42.await; // yield 42 -- wait that's not a Box!?
+        };
+        for await (n, i) in s.enumerate() {
+            println!("Item at index {n}:\n    {i}");
+            // Item at index 0:
+            //     12345
+            // Item at index 1:
+            // Segmentation fault
+        }
+    })
+    .next()
+    .await;
+}

crates/async-stream/tests/ui/unsoundness_issue_106.stderr

diff --git a/crates/async-stream/tests/ui/unsoundness_issue_106.stderr b/crates/async-stream/tests/ui/unsoundness_issue_106.stderr
new file mode 100644
index 0000000..0c0214c
--- /dev/null
+++ b/crates/async-stream/tests/ui/unsoundness_issue_106.stderr
@@ -0,0 +1,36 @@
+error[E0767]: use of unreachable label `'__async_stream_private_check_scope`
+  --> tests/ui/unsoundness_issue_106.rs:14:10
+   |
+14 |       pin!(stream! {
+   |  __________^
+15 | |         let yield_42 = asynk!(yield 42_usize);
+16 | |         let s = stream! {
+17 | |             yield Box::new(12345);
+...  |
+26 | |         }
+27 | |     })
+   | |     ^
+   | |     |
+   | |_____unreachable label `'__async_stream_private_check_scope`
+   |       unreachable label defined here
+   |
+   = note: labels are unreachable through functions, closures, async blocks and modules
+   = note: this error originates in the macro `$crate::__private::stream_inner` which comes from the expansion of the macro `stream` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0267]: `break` inside `async` block
+  --> tests/ui/unsoundness_issue_106.rs:14:10
+   |
+8  |           async { $e }
+   |           ----- enclosing `async` block
+...
+14 |       pin!(stream! {
+   |  __________^
+15 | |         let yield_42 = asynk!(yield 42_usize);
+16 | |         let s = stream! {
+17 | |             yield Box::new(12345);
+...  |
+26 | |         }
+27 | |     })
+   | |_____^ cannot `break` inside `async` block
+   |
+   = note: this error originates in the macro `$crate::__private::stream_inner` which comes from the expansion of the macro `stream` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/async-stream/tests/ui/unsoundness_issue_107.rs

diff --git a/crates/async-stream/tests/ui/unsoundness_issue_107.rs b/crates/async-stream/tests/ui/unsoundness_issue_107.rs
new file mode 100644
index 0000000..61fd153
--- /dev/null
+++ b/crates/async-stream/tests/ui/unsoundness_issue_107.rs
@@ -0,0 +1,23 @@
+use async_stream::stream;
+use futures_util::StreamExt;
+
+use std::pin::pin;
+
+#[tokio::main]
+async fn main() {
+    let mut outer = vec![];
+    {
+        let v = vec![0; 10];
+        let v_ref = &v;
+        let mut s = pin!(stream! {
+            for x in v_ref {
+                yield x
+            }
+        });
+        while let Some(x) = s.next().await {
+            outer.push(x);
+        }
+    };
+    // use-after-free
+    println!("{outer:?}"); // […garbage allocator internals…, 0, 0, 0]
+}

crates/async-stream/tests/ui/unsoundness_issue_107.stderr

diff --git a/crates/async-stream/tests/ui/unsoundness_issue_107.stderr b/crates/async-stream/tests/ui/unsoundness_issue_107.stderr
new file mode 100644
index 0000000..9b81e62
--- /dev/null
+++ b/crates/async-stream/tests/ui/unsoundness_issue_107.stderr
@@ -0,0 +1,13 @@
+error[E0597]: `v` does not live long enough
+  --> tests/ui/unsoundness_issue_107.rs:11:21
+   |
+10 |         let v = vec![0; 10];
+   |             - binding `v` declared here
+11 |         let v_ref = &v;
+   |                     ^^ borrowed value does not live long enough
+...
+20 |     };
+   |     - `v` dropped here while still borrowed
+21 |     // use-after-free
+22 |     println!("{outer:?}"); // […garbage allocator internals…, 0, 0, 0]
+   |               --------- borrow later used here

crates/async-stream/tests/ui/yield_bad_expr_in_macro.stderr

diff --git a/crates/async-stream/tests/ui/yield_bad_expr_in_macro.stderr b/crates/async-stream/tests/ui/yield_bad_expr_in_macro.stderr
index e70e200..1377054 100644
--- a/crates/async-stream/tests/ui/yield_bad_expr_in_macro.stderr
+++ b/crates/async-stream/tests/ui/yield_bad_expr_in_macro.stderr
@@ -1,4 +1,4 @@
-error: expected expression
+error: expected an expression
  --> tests/ui/yield_bad_expr_in_macro.rs:8:33
   |
 8 |             _ = work() => yield fn f() {},

crates/async-stream/tests/ui/yield_in_async.stderr

diff --git a/crates/async-stream/tests/ui/yield_in_async.stderr b/crates/async-stream/tests/ui/yield_in_async.stderr
index 4322758..db2451a 100644
--- a/crates/async-stream/tests/ui/yield_in_async.stderr
+++ b/crates/async-stream/tests/ui/yield_in_async.stderr
@@ -6,14 +6,8 @@
   |
   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
 
-error[E0727]: `async` generators are not yet supported
+error[E0727]: `async` coroutines are not yet supported
  --> tests/ui/yield_in_async.rs:6:13
   |
 6 |             yield 123;
   |             ^^^^^^^^^
-
-error[E0308]: mismatched types
- --> tests/ui/yield_in_async.rs:6:19
-  |
-6 |             yield 123;
-  |                   ^^^ expected `()`, found integer

crates/async-stream/tests/ui/yield_in_closure.stderr

diff --git a/crates/async-stream/tests/ui/yield_in_closure.stderr b/crates/async-stream/tests/ui/yield_in_closure.stderr
index 9f917f3..4d2f6c2 100644
--- a/crates/async-stream/tests/ui/yield_in_closure.stderr
+++ b/crates/async-stream/tests/ui/yield_in_closure.stderr
@@ -6,7 +6,18 @@
   |
   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
 
-error[E0277]: expected a `FnOnce<(&str,)>` closure, found `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
+error: `yield` can only be used in `#[coroutine]` closures, or `gen` blocks
+ --> tests/ui/yield_in_closure.rs:7:17
+  |
+7 |                 yield v;
+  |                 ^^^^^^^
+  |
+help: use `#[coroutine]` to make this closure a coroutine
+  |
+6 |             .and_then(#[coroutine] |v| {
+  |                       ++++++++++++
+
+error[E0277]: expected a `FnOnce(&str)` closure, found `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
  --> tests/ui/yield_in_closure.rs:6:23
   |
 6 |               .and_then(|v| {
@@ -16,9 +27,9 @@
 7 | |                 yield v;
 8 | |                 Ok(())
 9 | |             });
-  | |_____________^ expected an `FnOnce<(&str,)>` closure, found `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
+  | |_____________^ expected an `FnOnce(&str)` closure, found `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
   |
-  = help: the trait `FnOnce<(&str,)>` is not implemented for `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
+  = help: the trait `FnOnce(&str)` is not implemented for `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
 note: required by a bound in `Result::<T, E>::and_then`
  --> $RUST/core/src/result.rs
   |

crates/async-stream/tests/ui/yield_in_nested_fn.stderr

diff --git a/crates/async-stream/tests/ui/yield_in_nested_fn.stderr b/crates/async-stream/tests/ui/yield_in_nested_fn.stderr
index 54fdee9..951be34 100644
--- a/crates/async-stream/tests/ui/yield_in_nested_fn.stderr
+++ b/crates/async-stream/tests/ui/yield_in_nested_fn.stderr
@@ -6,7 +6,18 @@
   |
   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
 
-error[E0627]: yield expression outside of generator literal
+error: `yield` can only be used in `#[coroutine]` closures, or `gen` blocks
+ --> tests/ui/yield_in_nested_fn.rs:6:13
+  |
+6 |             yield "hello";
+  |             ^^^^^^^^^^^^^
+  |
+help: use `#[coroutine]` to make this closure a coroutine
+  |
+5 |         #[coroutine] fn foo() {
+  |         ++++++++++++
+
+error[E0627]: yield expression outside of coroutine literal
  --> tests/ui/yield_in_nested_fn.rs:6:13
   |
 6 |             yield "hello";

crates/data-encoding/.android-checksum.json

diff --git a/crates/data-encoding/.android-checksum.json b/crates/data-encoding/.android-checksum.json
index b711924..d7f4c30 100644
--- a/crates/data-encoding/.android-checksum.json
+++ b/crates/data-encoding/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"1ba28cdc6377156798b501bc3c5662a6f94207a7299ee1be6a1fa13481600c0d","Android.bp":"085627c4896c218c68e571cacd63b72a3fdcf51f24768b5d4d04f6da4be3724d","Cargo.toml":"ee20193b8e28d65126be9e7ef8f0175d1484f2ea50d354e4f816000edd6969c1","LICENSE":"4d3f7451d34eb020ee0ffb77747a61132dbc49fee3fb3abf55fc8853ddf2cc32","METADATA":"b454213a81f6a402f5cf5b03045a005066d66da4f40484f7b455d83c3ce1ea4c","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"91598fc69a30788275ed46543dbb7fbd280774e449c0e4234e86c19ce1e3f34f","cargo_embargo.json":"48b90df621dbf12710f97f8c66bbe1682f5d0a9d4925ec8652ba6c52a7359ce5","src/lib.rs":"117bbc4bd2ac764a67d9a57d407d0fa8adb965cf23325132ef1be141af9334d6"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"2117d63ade0406896abbf8320cb4a8006f8690f14dfc3a35b91f1d0adc593f42","Android.bp":"10bf48a2260ecaa2b3124299fd38f885461bd19870b1892f2c1948cc092d0027","Cargo.toml":"432b892835dd38b1a92fbd6fae9a1e4e314ce99b8f61987cd49b8d4446eab485","LICENSE":"4d3f7451d34eb020ee0ffb77747a61132dbc49fee3fb3abf55fc8853ddf2cc32","METADATA":"7b9ed0460f92186862a3f15174532cca07d074e78c1c995f07e90d2a4f911f26","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"91598fc69a30788275ed46543dbb7fbd280774e449c0e4234e86c19ce1e3f34f","cargo_embargo.json":"48b90df621dbf12710f97f8c66bbe1682f5d0a9d4925ec8652ba6c52a7359ce5","src/lib.rs":"dd90249b6e772b5a41a3e186451a4cab7b8bc8b5077354f5856e7755c08fe20d"}}
\ No newline at end of file

crates/data-encoding/.cargo-checksum.json

diff --git a/crates/data-encoding/.cargo-checksum.json b/crates/data-encoding/.cargo-checksum.json
index cb74973..ce048d3 100644
--- a/crates/data-encoding/.cargo-checksum.json
+++ b/crates/data-encoding/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0ec3d9c4bbe44a03ebe4ebfc5d212db66fef007490f82d98d08016aaa5058d40","LICENSE":"b68ad1a3367b825447089e1f8d6829b97f47a89eb78d2f4ebaef4672f5606186","README.md":"3e363840aec7b9ac3718330a61601bf2f49623e0749d923c866daf3bdd2ed87f","src/lib.rs":"864640728624d2c5001f1f8ea1b957447d7376817fb41e7e99abb07a3324e799"},"package":"e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"7032be54d660c2140a28a9213b2d90e3db040b7218c5d505b2dab8e5bbcdfb5a","LICENSE":"b68ad1a3367b825447089e1f8d6829b97f47a89eb78d2f4ebaef4672f5606186","README.md":"3e363840aec7b9ac3718330a61601bf2f49623e0749d923c866daf3bdd2ed87f","src/lib.rs":"b322168807852426c91aa1e1e41ab1bf4ed6f10d7b6deab3606a5b1ef9bdc2ef"},"package":"0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"}
\ No newline at end of file

crates/data-encoding/Android.bp

diff --git a/crates/data-encoding/Android.bp b/crates/data-encoding/Android.bp
index f28f62e..c2d50eb 100644
--- a/crates/data-encoding/Android.bp
+++ b/crates/data-encoding/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "data_encoding",
     cargo_env_compat: true,
-    cargo_pkg_version: "2.6.0",
+    cargo_pkg_version: "2.7.0",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [

crates/data-encoding/Cargo.toml

diff --git a/crates/data-encoding/Cargo.toml b/crates/data-encoding/Cargo.toml
index 0d22428..bc6fa61 100644
--- a/crates/data-encoding/Cargo.toml
+++ b/crates/data-encoding/Cargo.toml
@@ -13,14 +13,20 @@
 edition = "2018"
 rust-version = "1.48"
 name = "data-encoding"
-version = "2.6.0"
+version = "2.7.0"
 authors = ["Julien Cretin <git@ia0.eu>"]
+build = false
 include = [
     "Cargo.toml",
     "LICENSE",
     "README.md",
     "src/lib.rs",
 ]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Efficient and customizable data-encoding functions like base64, base32, and hex"
 documentation = "https://docs.rs/data-encoding"
 readme = "README.md"
@@ -44,3 +50,7 @@
 alloc = []
 default = ["std"]
 std = ["alloc"]
+
+[lib]
+name = "data_encoding"
+path = "src/lib.rs"

crates/data-encoding/METADATA

diff --git a/crates/data-encoding/METADATA b/crates/data-encoding/METADATA
index 4655376..b362372 100644
--- a/crates/data-encoding/METADATA
+++ b/crates/data-encoding/METADATA
@@ -1,17 +1,17 @@
 name: "data-encoding"
 description: "Efficient and customizable data-encoding functions like base64, base32, and hex"
 third_party {
-  version: "2.6.0"
+  version: "2.7.0"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 10
-    day: 3
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/data-encoding"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/data-encoding/data-encoding-2.6.0.crate"
-    version: "2.6.0"
+    value: "https://static.crates.io/crates/data-encoding/data-encoding-2.7.0.crate"
+    version: "2.7.0"
   }
 }

crates/data-encoding/src/lib.rs

diff --git a/crates/data-encoding/src/lib.rs b/crates/data-encoding/src/lib.rs
index ed8b194..e169c10 100644
--- a/crates/data-encoding/src/lib.rs
+++ b/crates/data-encoding/src/lib.rs
@@ -255,12 +255,12 @@
     ($body: expr) => { $body };
 }
 
-unsafe fn chunk_unchecked(x: &[u8], n: usize, i: usize) -> &[u8] {
+unsafe fn chunk_unchecked<T>(x: &[T], n: usize, i: usize) -> &[T] {
     debug_assert!((i + 1) * n <= x.len());
     unsafe { core::slice::from_raw_parts(x.as_ptr().add(n * i), n) }
 }
 
-unsafe fn chunk_mut_unchecked(x: &mut [u8], n: usize, i: usize) -> &mut [u8] {
+unsafe fn chunk_mut_unchecked<T>(x: &mut [T], n: usize, i: usize) -> &mut [T] {
     debug_assert!((i + 1) * n <= x.len());
     unsafe { core::slice::from_raw_parts_mut(x.as_mut_ptr().add(n * i), n) }
 }
@@ -273,6 +273,7 @@
     x / m * m
 }
 
+#[inline]
 fn vectorize<F: FnMut(usize)>(n: usize, bs: usize, mut f: F) {
     for k in 0 .. n / bs {
         for i in k * bs .. (k + 1) * bs {
@@ -362,6 +363,7 @@
     }
 }
 
+#[inline]
 fn enc(bit: usize) -> usize {
     match bit {
         1 | 2 | 4 => 1,
@@ -371,6 +373,7 @@
     }
 }
 
+#[inline]
 fn dec(bit: usize) -> usize {
     enc(bit) * 8 / bit
 }
@@ -432,7 +435,7 @@
         x |= u64::from(y) << (bit * order(msb, dec(bit), j));
     }
     for (j, output) in output.iter_mut().enumerate() {
-        *output = (x >> (8 * order(msb, enc(bit), j)) & 0xff) as u8;
+        *output = ((x >> (8 * order(msb, enc(bit), j))) & 0xff) as u8;
     }
     Ok(())
 }
@@ -880,6 +883,7 @@
 // - width % dec(bit) == 0
 // - for all x in separator values[x] is IGNORE
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[repr(transparent)]
 pub struct Encoding(#[doc(hidden)] pub InternalEncoding);
 
 /// How to translate characters when decoding
@@ -1370,6 +1374,22 @@
         Ok(())
     }
 
+    /// Returns an object to display the encoding of `input`
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use data_encoding::BASE64;
+    /// assert_eq!(
+    ///     format!("Payload: {}", BASE64.encode_display(b"Hello world")),
+    ///     "Payload: SGVsbG8gd29ybGQ=",
+    /// );
+    /// ```
+    #[must_use]
+    pub fn encode_display<'a>(&'a self, input: &'a [u8]) -> Display<'a> {
+        Display { encoding: self, input }
+    }
+
     /// Returns encoded `input`
     ///
     /// # Examples
@@ -1386,9 +1406,10 @@
         unsafe { String::from_utf8_unchecked(output) }
     }
 
-    /// Returns the decoded length of an input of length `len`
+    /// Returns the maximum decoded length of an input of length `len`
     ///
-    /// See [`decode_mut`] for when to use it.
+    /// See [`decode_mut`] for when to use it. In particular, the actual decoded length might be
+    /// smaller if the actual input contains padding or ignored characters.
     ///
     /// # Errors
     ///
@@ -1623,7 +1644,7 @@
 }
 
 #[cfg(feature = "alloc")]
-impl<'a> Drop for Encoder<'a> {
+impl Drop for Encoder<'_> {
     fn drop(&mut self) {
         self.encoding.encode_append(&self.buffer[.. self.length as usize], self.output);
     }
@@ -1670,6 +1691,19 @@
     pub fn finalize(self) {}
 }
 
+/// Wraps an encoding and input for display purposes.
+#[derive(Debug)]
+pub struct Display<'a> {
+    encoding: &'a Encoding,
+    input: &'a [u8],
+}
+
+impl core::fmt::Display for Display<'_> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        self.encoding.encode_write(self.input, f)
+    }
+}
+
 #[derive(Debug, Copy, Clone)]
 #[cfg(feature = "alloc")]
 enum SpecificationErrorImpl {

crates/googletest/.android-checksum.json

diff --git a/crates/googletest/.android-checksum.json b/crates/googletest/.android-checksum.json
index 2db3741..774a9d6 100644
--- a/crates/googletest/.android-checksum.json
+++ b/crates/googletest/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"d6b2b0d30a03b5a480e0c9a54b655d8eb406a699a4d54a1b79f086264f813155","Android.bp":"26dbfa23b3d723fa6e4cff6247a4574d3de9e15abf7ea529443ea6279f723c08","Cargo.toml":"a5ea2564b9871a41486fa1e377e576e5f1f3f173de5812f14ac7cd6f0eff3dce","LICENSE":"7c6512d88b3127990067585f24881ba1f182c5c49a04cb1975b226b7be95709e","METADATA":"699e61a9efcc1e3a7534f11530d9486333cc82b7bbe820d66aba3d6fc4d41a6e","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"07d4f57eac87d9661107bd8ae50f13f05e63ab60a22a5d6e84159a446412f658","cargo_embargo.json":"2b7db5752ae086bd42bc615742f3fe1183fff050dd0fe67aea0c4519d4b592d3","crate_docs.md":"22353450101e1ea34aebd2263b5c9f6b0fc2dca5d876d2a755b52fa9c0a570b0","src/assertions.rs":"dd45066e3462691b73cf78ea08d86bc6106c9d8b3292ea67de80f7c65d5425ab","src/description.rs":"f342abc02a9808cd6ac8efbb0dc5653cf75960fe0e6b65c604a02eb33d18f078","src/internal/description_renderer.rs":"ad2cfa43baa63ec7c33b73cfb66f16fe7fad6379576bd896ab22a1ec418255f0","src/internal/mod.rs":"13cf778b7e517506ee21cce6c347c409ff476a805b76874a320e350a7f5f86de","src/internal/source_location.rs":"2a0bfa8a6556301f4b469711568741d601f3cc35bd46efa48887d123e1ad6cf4","src/internal/test_outcome.rs":"bd48ed72e39f7cb48ab8591ee0786d4aa810a49877e4a300a949dde27fc28f00","src/lib.rs":"e79ac41262f17c185c57c6993ac2fd3aad1f2c127f160451fdfe40f9c2dd6570","src/matcher.rs":"6c4f8bb7c1869c5a4e4bfe4a6fa88ea253256fceacd7d11a71299f17b044a4fb","src/matcher_support/count_elements.rs":"7487aa09ddfd68e7786943bc68ba97fb54857441e9fb7160f5eac1785a1d2176","src/matcher_support/edit_distance.rs":"0cf896f82ccaed727c0a1c7e2578fd1430d812fe52168e17b08e53b185385c81","src/matcher_support/mod.rs":"9e594fb5d2ae79a34c451f21beb1912cf9c05646156a8bcb482dccf55adece03","src/matcher_support/summarize_diff.rs":"7fedfdc6228307cce6da7ff3519be8d2c516c9e2f5fbdbc05ce679e476877024","src/matcher_support/zipped_iterator.rs":"2c022b163bb1defda1522df9ff6824c0db0044e9314cdd45dfe39e2e1e335b96","src/matchers/all_matcher.rs":"f58ad8690c1237eb53c7d745ef9df667f6c38dc19e02d1a0641d563392feb6f3","src/matchers/any_matcher.rs":"d5c4d03d9f515bed370ca538013b6d6d8d62c57309fef9decd3c4b684a73e4a9","src/matchers/anything_matcher.rs":"664c706c76d7603664a81f043589f5ab6cf1e9585bc307ab07a16df4d75cad32","src/matchers/char_count_matcher.rs":"2707f530252e29c45b953e4d5fb9c86e0ff62041b07ce6331cb9cf7db9858e2a","src/matchers/conjunction_matcher.rs":"8cb736a15d2be8405e200d6599e2c6d8e86b79c27822a3bde2361fdd3c9d6a2d","src/matchers/container_eq_matcher.rs":"97eded933a75fc0a42905c455c53a31bea88b5f65cb7a072214313db72c97d84","src/matchers/contains_matcher.rs":"297cdbcf152caca7593f809fb805bedc25c5448157f351c63cbaa97e10304c20","src/matchers/contains_regex_matcher.rs":"d818d0aac0302fb9aaa805aa72cbec240c1303b59e59b85a070a983796a068aa","src/matchers/disjunction_matcher.rs":"a0e72b4c6aaf33c468f74ef9d276006e800ad675a8e572c9310271a4cb2b0d0e","src/matchers/display_matcher.rs":"2a73d326a2e547abbebc58c401128649187ec57aafaf3a71cde58ec0611646b7","src/matchers/each_matcher.rs":"b0e0d70598601135f31715823cbeb2c1709900b11d07c1d9305e37f31adff61a","src/matchers/elements_are_matcher.rs":"16e10c4bf6755c26ec72f6343aa1b363c8260dd387561c9ab2595e3dec84b46e","src/matchers/empty_matcher.rs":"6d29920215cb48e880a1fa0519727467e83ab74cccd3472b9aa2bae016b7d35c","src/matchers/eq_deref_of_matcher.rs":"9d1fe8c2094a3649ace379731af601b6c4abb1aed412a718d25dcd191f1c9496","src/matchers/eq_matcher.rs":"e9b985a9cc3bbd471aead0cd7100b0725edd4faea0d35713f43385ee19ca3af7","src/matchers/err_matcher.rs":"0da1c872fded683fd515786c5b8aab8ee99c3bd8d8ba35ae74ac354473393447","src/matchers/field_matcher.rs":"50b4589bac6222e3e7a3aa1c140fda70a259fde39b538b7513e3305362c675e3","src/matchers/ge_matcher.rs":"af4641c64a43fa29c9d3878443a62dca64620c311e1957609277ea707fcf5a7a","src/matchers/gt_matcher.rs":"d9bf9d216f61335e067a39f421ef1e3baff2871776f6287541f06711c23a2733","src/matchers/has_entry_matcher.rs":"f2ec364e57853468c941f52329dab2251b581a7c2deca69e953b4b94be509e63","src/matchers/is_encoded_string_matcher.rs":"f95f3fed1b0e161829983fc50077dd931f5cc16e7fedfec2de088a7083d926c4","src/matchers/is_matcher.rs":"6a2a68665a079e21406da1454408d606e62c5e21ee07ae94e7eeb4335ea3f044","src/matchers/is_nan_matcher.rs":"33a179908c1f0ab95351c6ec623d5d0dc494bfb64cd8df2ff4244f01916395e7","src/matchers/le_matcher.rs":"c2c6818514773564ac578ffe86e5e2b9bff58785ddab0b37697c4bb80bea38dd","src/matchers/len_matcher.rs":"015b86c053595e3fbc7ede581ab03b5e168369b6f8cd133f3b479c181f474001","src/matchers/lt_matcher.rs":"c937c756416f7ba5f5ea907f9ae5539ad9520c33227346c4abd481c8e70330f1","src/matchers/matches_pattern.rs":"f17968108e733459a06fbb0709ed7b76ce8245e183925c06d8575545f5c23071","src/matchers/matches_regex_matcher.rs":"3d95e01bdb64b1081cfccb11465edb94dfde8566ea3950d03fefb75eab854189","src/matchers/mod.rs":"09235b20fb2166d2d5c72316a9b3ecb736344b7a9636855bd9d94bb1fb5b4831","src/matchers/near_matcher.rs":"645e70df5f2f4c1d3e3b89d377296e21a30cb90d34426069f5aae36fe29206cb","src/matchers/none_matcher.rs":"d1a13d3de32e7ba5781accf9d01104cc54d0a9e6df3a38cd00768ea2f6eeb18e","src/matchers/not_matcher.rs":"43ec462558eec8021ef238a72541433210fe9915be235a5845cbc9217e8f0f23","src/matchers/ok_matcher.rs":"f358885ba1be7f8b24ad658788c9c1673f03950fda6b166d2eecd8eb1899efce","src/matchers/points_to_matcher.rs":"30f88451c8806aee81d0f9925583f15531773399089e54ad2fe4b81544b45fb8","src/matchers/pointwise_matcher.rs":"8dd05061cb3a86cde777c16f4b9d84dab6469084e8878dabfe4f34748555a96d","src/matchers/predicate_matcher.rs":"e18e614fdb2a4ce28ae92b33fd605641b9c9720391e0e9d067f90b7060b62958","src/matchers/property_matcher.rs":"8507ec831853e9947f57fece53bf7e79b1c902290ae1cf55284186b8f06b354b","src/matchers/some_matcher.rs":"c643fe7aae9fac6565894b83080a352c3f843c785e44e27ad3053eccee141403","src/matchers/str_matcher.rs":"37657e56b32530124d04903ec7622a35881cbb39fed0b719a24c1362b2ab8574","src/matchers/subset_of_matcher.rs":"1bf4fee1617e65744b3ec9cc18721783804ed84fd27d7d7f253b5fc82979b6bc","src/matchers/superset_of_matcher.rs":"d1a8dbd21113d22eb1fef9fcf45d136a388a6ce4622f8244344b0b81d2856144","src/matchers/tuple_matcher.rs":"9e08b6b4e7bb5cce0f47047ca89a34d058d634eeeb13357c3c8140962f20a1cd","src/matchers/unordered_elements_are_matcher.rs":"802cad45924cdfcf1d1a72b83aa01a0c06d7e6b01a219f76638af3cacae69056","tests/all_matcher_test.rs":"91a95c6aca516f2cedf7ecb297280ae52b5cf96e25eafe29cd0b4bf40493b5be","tests/any_matcher_test.rs":"e8aae6ac19e3a8501cd0101cda2cc0c5fd49ce05bf81651cec925e2f01eaedfb","tests/colorized_diff_test.rs":"9632e5d8460f67331df2edda7848db3b79bcefa043cd44d8aab7eafc90945dae","tests/composition_test.rs":"dfe726b38d357ff8d547eeddbdca539b8bf70f6681125f063c88db6140c8bf65","tests/elements_are_matcher_test.rs":"5ccaafb93fec5d9790edefb2d06ed5376f898e8e971d9663614bffcc939a96e0","tests/field_matcher_test.rs":"b3e7f0f6d403d4dc768d282128ae6eda68a96fcf1cd3127c107cf68f423a0bf5","tests/lib.rs":"d48d840a933a9a9e1076865eb6e443b538d4f37d94b45b7110333511f9a50d9d","tests/matches_pattern_test.rs":"35101434bbb3dea2e3054dfc55381a886d2055002156ebb2fa1575fef6386a63","tests/no_color_test.rs":"13795788bd9045f25f040067cb359e4d55505ddf6a1524922db23f3aeff570af","tests/pointwise_matcher_test.rs":"e0c14a1e030f83c3ebfae00d73c49af60d5958836aa8264ce4a3374330196f5f","tests/property_matcher_test.rs":"57da661e975d2af939ffd3bbd5fac7d11b2d344fa62d709a78080a68053370f4","tests/proptest_integration_test.rs":"0f75081bd6bfd89b8a5e430238a9da78a2f13ce6ccc4e105e32705596e9c3a7f","tests/tuple_matcher_test.rs":"b16ce00f9857206f9ebaf18175c4d2df5de739fe85873fb0f30b1c69e794ffe3","tests/unordered_elements_are_matcher_test.rs":"2d3402327bf2915cc79a3fce01f939e4454d45dc8f53826211add79d389f3c29"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"410493270e72d4760c1e835f510b65d50a78811d6946a3f93170a161f8b9d815","Android.bp":"31cf3dbb287b6b5c5fd4dd46be662c4b64ca88577b495dc9436f8d5db5707bb0","Cargo.toml":"a194180b19517aeb9c05048610d5f7422c6e50113ebc55b5f381f06b22414b3d","LICENSE":"7c6512d88b3127990067585f24881ba1f182c5c49a04cb1975b226b7be95709e","METADATA":"8e573ebeca353ef9a3892bf4ba8ae4c0b0f781d737b2716ce2b791903a85540d","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"440fe5145aa23165197219e0378cbb71cd7ca336fb1dc0fe53a3d5a2e3d4471d","cargo_embargo.json":"2b7db5752ae086bd42bc615742f3fe1183fff050dd0fe67aea0c4519d4b592d3","crate_docs.md":"86974c308ad2e035d0368179b32191c32672353273cfe5ea970687a97849b016","src/assertions.rs":"3f9defd623a7006b23d3963caffdf701b78c8cf0696a94ead1541e43698d3866","src/description.rs":"7bf3fec806182d8a011b46ca0dd7f14adcd17ece7fe81dc7770a232ecb21b21f","src/fixtures.rs":"b8ebce97930de9822eed6fa6e1d0aadf9e8eda61c989ba27644878444babe143","src/fmt.rs":"f6e89ce1eac6215301c185762f0ca5214efeda1fb431a9adfa29dafec6bc238e","src/internal/description_renderer.rs":"22f0dafd9d02a37483bbd689409f01b001184d30c095459b21c61cf90df071dd","src/internal/mod.rs":"bfaca36e81794979c6f7976e96a6ac8f7b09d0181ac8f44538d40a2e40d8453d","src/internal/test_outcome.rs":"e8a39aa3bc29d79e64ad42da4f22a18452b76171d28d14be3cbb0b822f517299","src/lib.rs":"109c5e2b09705cb4bd11330e10c69daf2523b01422f103db6c10353823f6fccb","src/matcher.rs":"e80fadb4a9939d190e1fe94570e9f50ed2359842505d7862e34136cd8f6ac55d","src/matcher_support/auto_eq.rs":"5a6d9607a884b9a21e0ec29a8b75a78e741448ac858b618506521eb67a2d255f","src/matcher_support/count_elements.rs":"0973e4f0f73ea1d92b8cf6559aa696d84ae27179765f93fa03acfbd239a447ca","src/matcher_support/edit_distance.rs":"83aadc058939cf5338038650b9edb85fdf2ecf6d90ac35656eda69d7f4715102","src/matcher_support/mod.rs":"fc213e3f665b23bf34f639dae133920fd17db0a5c673d4957f9cbb3d4e706d71","src/matcher_support/summarize_diff.rs":"6aafcc3b42872ce9a07e0d422816f4f9e62c470b028e36bcd577c140d5017888","src/matcher_support/zipped_iterator.rs":"2c022b163bb1defda1522df9ff6824c0db0044e9314cdd45dfe39e2e1e335b96","src/matchers/all_matcher.rs":"b9534e5d1657791b341b411989b5ceba03a48ad625afc208a4290c04a5a3c3a7","src/matchers/any_matcher.rs":"1b082cd64719aad9f01b3862ff87b20cb41ccd64c268f18ab67e9a5207f6ed0c","src/matchers/anything_matcher.rs":"1bcde76add015ff9edb69b6ea55eafd8d3e34b61f56efd146fad748652d974f3","src/matchers/bool_matcher.rs":"abe9fd9f0afa6b0276e62e45d19e6c030a3e9fe4e162506ad77a3a815062d3d0","src/matchers/char_count_matcher.rs":"93ffefefa301e1968cd0cb166e451fba1662d684a682f66229cebb3c01e78c16","src/matchers/conjunction_matcher.rs":"15761c0a4cbb2f97935088f58fc00b659f1a2c12f36a22958ac96c203e16e5f1","src/matchers/container_eq_matcher.rs":"03efddf8e882415f9734721c6fb4b507f60d376088594be98c684cb913caca0a","src/matchers/contains_matcher.rs":"012416f5634b0d1c72fb529983fc9a7d42f70d652bc786402853ec40f1675845","src/matchers/contains_regex_matcher.rs":"04aa3ec505c57ed5cebbcbd5ae8341d3e45ed0dd567ba401dc8e63f1c65aab8d","src/matchers/derefs_to_matcher.rs":"3d2f6870fcdc52c4619914a04dcf4d4bf94e28f23287f06091088e4a00512670","src/matchers/disjunction_matcher.rs":"193b85d9ba177af4592e40be36cc67bdb4d2d4ce561d9f9bdc8f8e196a11cc05","src/matchers/display_matcher.rs":"f6b7216ec2c6f6200c4493e874d73c19a921b65381f9dbf147c689454ed5c87d","src/matchers/each_matcher.rs":"5cd5d03983475db8c93ef89781e3ab3e68fad81fefd829eeedc96be94bbae4e9","src/matchers/elements_are_matcher.rs":"6e593c19c7ae1c60f5e8a811ac2a5a48edd21d72e788af69fe588fbfd6caf110","src/matchers/empty_matcher.rs":"e5dc9e0e7b2799b14590b2d93ffee056339b0befa9acaf4a17aa15799e8d5716","src/matchers/eq_matcher.rs":"59f3839dc3ba5928c784fbc72c79d90d41a23ac14b27de6d8f3d50eaa2cec866","src/matchers/err_matcher.rs":"eef9b9bdbe342903c4545d7696e52d7b06df6677a91a59274fc16999ee5f658e","src/matchers/field_matcher.rs":"db9c32306aad1010dfe9c6acc96acf867a22ff8324bf560ace44f680e07d174b","src/matchers/ge_matcher.rs":"6fb61cbfb8f3e81f71900df9b0420ae155c0a19591cc95ecb024481d9047299f","src/matchers/gt_matcher.rs":"9555f0c294def104eb738de55c63f012267375e4db269cf5ca60ff5ea8d56275","src/matchers/has_entry_matcher.rs":"20bf4c271ff1d3673393d6f8c00ccce4d1e0f1604a16055f0c46bc0e5b793ddd","src/matchers/is_encoded_string_matcher.rs":"f4b60009696d1396029d36ae187fcc3528a661e1b5c38479fac9f4e9e416dd4a","src/matchers/is_matcher.rs":"df8fc55cec747b9764bae05595a403dac253514a21fccd98ea7c46a83e541999","src/matchers/is_nan_matcher.rs":"111cf9e8aca5d709942909e41fa0f6578418bc890dfeba52f9102038c5633283","src/matchers/le_matcher.rs":"3e151e3d13f944d81620aca4311dd15b382dc575266638df09eeb0e66cc674e0","src/matchers/len_matcher.rs":"24adda42e1750d8bb49ffe12a3f431c6c173c27c313d973b7eea31dd616a1642","src/matchers/lt_matcher.rs":"ff7ce1397b713955d643debc6200dc0bd5bfc4f8252433ea1650f105886ae8ef","src/matchers/matches_pattern.rs":"5c36c3f0eecded409b7fb336013a84db00176f861b65f07dc82f207570feadba","src/matchers/matches_regex_matcher.rs":"ebd8e88cfeedf394bc2550137d67dc0e15759565d49f4e3ce2e7f59c9f24808d","src/matchers/mod.rs":"fa62f807cc57cc5ee784f630e75b7447079ff5ae7513e2f15086dd061428f2ad","src/matchers/near_matcher.rs":"1e009423fc9326a984558db4efaee53d5de4acb820ef475c72c4696ed074a99b","src/matchers/none_matcher.rs":"fa403c8c7868fb41005042dfd874d5d096c52590bdd252ec5be990225f36b6ff","src/matchers/not_matcher.rs":"c98ce0362a9d7ca308b3bed4b7853d7320b22478185d777cc09fd0c627010ea0","src/matchers/ok_matcher.rs":"cadab709d5c52f2219bf59118a0a29dba8614532ead56847490e489634e5d147","src/matchers/points_to_matcher.rs":"7e845a3fa699be23e917dd90bafe4d68bbdc8d7c3fc042ba689277e3f7c8ec4a","src/matchers/pointwise_matcher.rs":"ecccadc3baa9afeacc6242e41501b27cb1581dd1502aeb127ff1fbf52cc62338","src/matchers/predicate_matcher.rs":"b9d64d86e7ef292d57aa2a62bab7ccc64b0fec262fe0bd73d08924e203d784f5","src/matchers/property_matcher.rs":"1f4fda841361381145c2c96c56cc2d50f4af008c169bfec6615b77e4b6886722","src/matchers/result_of_matcher.rs":"0d0f66f4f5d4e76062e0d427e6f7349cceb7a574d3097eb5ac982f16c311f848","src/matchers/some_matcher.rs":"6179779b798ee60e4fca6ded4330206a398798656f3a6ecb00f44cb7e81d39d0","src/matchers/str_matcher.rs":"1aedc67db3a0d0197a32f52f583e40bc89a95cca1dd70513fadecc24a7733346","src/matchers/subset_of_matcher.rs":"1a463f7c277f31e7f07fb6ef3901ad4e6d3907cb8725f2d8ec4647a4e5a8ffd8","src/matchers/superset_of_matcher.rs":"5b40ed602c8aabd66136f932aac1f5c031b99e1d3c0adcf81a50b998e1bcfde7","src/matchers/tuple_matcher.rs":"6dc905a4ccf5748f855868d2f5819dd3b92d5a4934d2639a2a3e3f6e40050b70","src/matchers/unordered_elements_are_matcher.rs":"1b5508b3aacc164ad9276834579d75baa241504f26d591995c04e51959daad01","tests/all_matcher_test.rs":"a1347ab53409098f3ea78068a2523e2f6885c22d988d50131e32e1c21f96f7a9","tests/any_matcher_test.rs":"709ca1a20c82fcaf6be821d4b328506f17855e5ffbe21996f27d67c3ae96af04","tests/assertions_test.rs":"c6e952cfed6998b6ecc7d4260d7f6c3b3a29f031856e6e4683a223a0cdf392b4","tests/colorized_diff_test.rs":"a55aa6e001df9fdc8684136a59555bf0ec27ae84848aa4c9a3a31842934b30f7","tests/composition_test.rs":"51ff2e05d3b4dd06e246eb9e4cfb3c1997369ca9cbb34ca2a7d1d5599a9900c0","tests/elements_are_matcher_test.rs":"c98dd588a184b118afd71767b3f07dfc8299ad8a9147e0835e33906a43a41552","tests/field_matcher_test.rs":"634fe967a801bc077f477ccb38649580011c2957b0f37e06a73f5654b46a7211","tests/fmt_test.rs":"67c0032bc3b3d2e07aa74c87bc583c85cba477840f1782358776f5aa33c0e3f4","tests/lib.rs":"357bbd54eb3dc3af000e2f3eaecafdc0a59a1fca30445773b64872c050870657","tests/matches_pattern_test.rs":"390038894798d08feed6dd2209427d8729dd9029ab95dd685190bc24de28364a","tests/no_color_test.rs":"f7472284fc864d4654d4677fa44274825f9286f696228c59175ee6525a8a5343","tests/pointwise_matcher_test.rs":"159bc32c50b792e9c96327c970ea44ae895e842a5f92fe817ca4d8f1e344bbc2","tests/property_matcher_test.rs":"6f2afd05c0a55624c3ef6e0f30398cb49188690956351c9a2f2e6f428874f381","tests/proptest_integration_test.rs":"0f75081bd6bfd89b8a5e430238a9da78a2f13ce6ccc4e105e32705596e9c3a7f","tests/tuple_matcher_test.rs":"3cf3a362ec753ba2e0f48db6716f32d31521335ed66a2d27aef69a271f5a902a","tests/unordered_elements_are_matcher_test.rs":"38c4f8711a056284afa0d3af3ada3a216d1b58ace71b3d1d4b844277fca45217"}}
\ No newline at end of file

crates/googletest/.cargo-checksum.json

diff --git a/crates/googletest/.cargo-checksum.json b/crates/googletest/.cargo-checksum.json
index 4b4a4f0..9ceb8e9 100644
--- a/crates/googletest/.cargo-checksum.json
+++ b/crates/googletest/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"81f8a9a3e6798d1747bcbdd240617b84f26d5a5c88ab748152f6a7ce792e3ef0","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"15ead96c81651817d7b9d02c697aaedf0909a80dba2d0acb5c173c9d1d98d3e3","crate_docs.md":"4fbb126bcf704aec6e587348c5683030f28516baf1924e37f0eb4908e09a79ee","src/assertions.rs":"6bc4c890ce36a54838049eb39b35807009fc103ed2f07980e76606c8f0a417b3","src/description.rs":"b51af6bfe83fe8d41837fea2d6a8eb9efd0966df8384228aa86cccd444fd688b","src/internal/description_renderer.rs":"df583f7096cacd4e63eb720e18bf17c7f5e45eb81c57bfcffc04711abce5add8","src/internal/mod.rs":"bb5bb3dd31ccd33f893c79f81e4f629186d1047935036d773a2d5cee3feee959","src/internal/source_location.rs":"ae5014cfea179d3a619714a64810bb8feeb7e8c9267cc8c9066cc52620762b46","src/internal/test_outcome.rs":"9081c258ba3bad2f1222a006a0cfc6268b6c06fdd998e8d51f1ee6c2079900e1","src/lib.rs":"523c79fb0da7a59b0146456c919db2c20cfddda5bb03c7494fb70dd454d67390","src/matcher.rs":"6eaeec6b6d90b4ae74d298a861c03e985147f194c0c6ac296948b479d4721414","src/matcher_support/count_elements.rs":"9e9b1c238c84fb65319981267842c794f406a696895cfd84da463e050e768c23","src/matcher_support/edit_distance.rs":"72c03abebc181da092c40853e7a7e6a9d78a80074faca188bdfd3f80ef5715c2","src/matcher_support/mod.rs":"acdd182e13ecbdaa55f66526bd18ca4be826e3fa2ab9ea593d10d4a867aa12eb","src/matcher_support/summarize_diff.rs":"a27afa050f0e0b38a5813cd109f0a56152ac1552cd7400866de27f4622ba153d","src/matcher_support/zipped_iterator.rs":"ac1a1a54f866f977255403a4f7e7613a4116af163326029c54b65ca1ac57b538","src/matchers/all_matcher.rs":"b3cdaec8ffa2bb842ec8b2a9ae37890f88b00d48708c0d37584293d5d5f7ad36","src/matchers/any_matcher.rs":"c08c104699a7e7b0ad3788c1e786b15626253707de33671908cadef34f8b43e8","src/matchers/anything_matcher.rs":"d0244d3338bb8a6b9c677b1c5bcb56b56d6736f762b68110e14317f3b67c273f","src/matchers/char_count_matcher.rs":"eb89c497c73b7ef94d2cc433da0f1bdb6fd97e79fb137e7b2e3c9fd6758899ba","src/matchers/conjunction_matcher.rs":"fa7bacd6ef0b1b5fd858bb8ab48de82d09a3d4bfba1a314e5c00e35ee858e46a","src/matchers/container_eq_matcher.rs":"9b74345b3e244a574048928a3547ea00ae9dd75622feb3d5a7139c13d2c8e60b","src/matchers/contains_matcher.rs":"418c2da2366ea315bf75e610323faedf2ab6dc0d9d424cd650be691f811a384d","src/matchers/contains_regex_matcher.rs":"d6defb887ef498f4d7a9958a313927375aed996d78629e7213dffe07e2719b1c","src/matchers/disjunction_matcher.rs":"18d1918f30d58c19a9991caa0ec0cb43f55d196824373e80735a7c50ef6781c8","src/matchers/display_matcher.rs":"6ab9ddcb28173f5959d5c82dea9cb9f779f260cae2995e5f318972775317dacd","src/matchers/each_matcher.rs":"218eeb263cb1683c6a20ce80d0f127a1659a6f5da3f74bb1e3d810ab259b80c9","src/matchers/elements_are_matcher.rs":"55c890a72026eb8bc717bb0d5039b98e7f8be09da1a3c46b5a7505f63a76bb2f","src/matchers/empty_matcher.rs":"a6accac5537e29f313356b46d344354ceddd89ab9857a52febc8005b0fb5fb21","src/matchers/eq_deref_of_matcher.rs":"762038bd3e8912fe064504ca173b988bb65e3792b9d935f086cbcfba67ce346f","src/matchers/eq_matcher.rs":"fa03d1a053c6d5b0bdecfc9515e354037d9fef64cd6d2c96dc04d2ef7eb64d71","src/matchers/err_matcher.rs":"4aef1b1a5fc33825d39e4ff052dfeef7996d02eda5f931c59114125ec40ebc62","src/matchers/field_matcher.rs":"f18cc28b683beb179bbf3956ffc86852402fae96ff3fa0936ba89ba8c5f7ea65","src/matchers/ge_matcher.rs":"4c67bbdb9e4acb95f3b2b38dec4d6793781330eeb0895f3edb305215d2bcf4a1","src/matchers/gt_matcher.rs":"d557a138e30b47c9cc65d26739df3d9698ad180898cabbfa18d9a0db6474c53e","src/matchers/has_entry_matcher.rs":"a39375c7a7a12daf5080980a07564f4eaf39abe143d2bc40f64f5942b89223da","src/matchers/is_encoded_string_matcher.rs":"91f1c2e89377722248346c9cb3e87cec96e9bdec66f1a391332263ec86f955cf","src/matchers/is_matcher.rs":"6026f6f7dc9c08e65c498cbd73ea47613e65ed3e13a8dcaa0b303c54ef4bbf3a","src/matchers/is_nan_matcher.rs":"4c0d2b507e9a61ccdaaa342698cf48ed31e3d62a14b2eaa07afb95de4afe074f","src/matchers/le_matcher.rs":"6a168eca823bac8e7bb82f9d5392774fd1e0d9616cedd43c67fcdda46250a964","src/matchers/len_matcher.rs":"b77b7a4685e81ff79fceea5f382d9274e2cb8bae2abaf4f2f69ca6af4a0ceb00","src/matchers/lt_matcher.rs":"12535f0c0edad7098869fa343c225aaeac8417d97c665ff58ae917fe8497c5fe","src/matchers/matches_pattern.rs":"7d655dd989035ecdadf6cd8d59f3057bc1f115ffb162517423d6588c56ff20a8","src/matchers/matches_regex_matcher.rs":"edb52ef557ced3af81f38908917417eb08c917c166bf6fe59ab8223b53de0050","src/matchers/mod.rs":"1213c95b199519d0b978198cbfbe3239d02ade145cc6ab18a5bb91c7141b4fc1","src/matchers/near_matcher.rs":"127cfe0cc9157079a28025dd0ceceb7dea8329566e46995f4b8d1de19bc92a5e","src/matchers/none_matcher.rs":"2d9908719fcc59e281207e69c3528c8133380661b361bd159cb25e28917789ca","src/matchers/not_matcher.rs":"bf2057c6cf7b21964de766ea16d8902e6f0174793ecb602c26d39cdae5761e8e","src/matchers/ok_matcher.rs":"a05c8eb9addfb3af57a9b0b8fd56f4a966ce927be5be265b8978e19c240e145b","src/matchers/points_to_matcher.rs":"5cf3f776756b904d66847ddd49b455681266ae32c37de7eb3de729a66e1055a9","src/matchers/pointwise_matcher.rs":"0d8f9ddeacc13dcc6f34b0a4fdb7c0a5ff54f3b4b5e85f061c7907b9a2390f9b","src/matchers/predicate_matcher.rs":"d23b67acecbdd5a3bb410c8444f376947ceada2c45fd2d5e775c2e6cdcab407d","src/matchers/property_matcher.rs":"21ac721ad28ed02bc21c7d86b8fde371e1dc0606c5449b6e9aeb2c20cb0aa47f","src/matchers/some_matcher.rs":"654478b0966b9c39d5b07367b595925065cce2580c8bfec0789d5d01eb44fa41","src/matchers/str_matcher.rs":"9e24f276cc060d5174a78b862ceba65452669810cbb64505382c13395e289c10","src/matchers/subset_of_matcher.rs":"6c5f875784ae05d26adfb7532ee5d089d3de6e6369abca6b1a84f6c4aa5977a9","src/matchers/superset_of_matcher.rs":"05e6b4f965f033071fb5feec2e0d93058461b273d4613f338bd4124d59635cb7","src/matchers/tuple_matcher.rs":"d028f7e2b54264256eebc05f54891798f769d06be72572672292d77c2b6a2726","src/matchers/unordered_elements_are_matcher.rs":"ad0cc9f229fd97d689fce3b93f809260f568487d1ba17c4c8c4aa0640ede9000","tests/all_matcher_test.rs":"4b0690e97dfb426f336266bb2b09f19dd3f86504f400e89f5821a888a71e41d1","tests/any_matcher_test.rs":"064343665458ee48502697a46b14059b1971f972bcb9e92db09638b5f053505d","tests/colorized_diff_test.rs":"39227cb13b2914c14231a998bba4243309645e8f029c3c62f2a2969d699ab9a7","tests/composition_test.rs":"729dd849a7a423a000324d308874aa89558b0be6027bf4f608224a63a90322b2","tests/elements_are_matcher_test.rs":"9b2926f2f6efcd0a96f13f1f370e040c7307b2da3006f3c68a160776c5057729","tests/field_matcher_test.rs":"bc34936df7c3c4b36e1b9998565c8363967f7eeb5bae0afe4001cc0fbc36f5e9","tests/lib.rs":"506b8b37c82a7ee08ef9e8c29437b98c46097d96ae52bf75ba3c82ac24096996","tests/matches_pattern_test.rs":"8372b8823edb0028f3ed38fc9b669fcc3ad36bfa153e7671e3f6cbc8bd7798da","tests/no_color_test.rs":"3e248b14597b2b6c2b60a52f7457d822b8a19e8f5604704aa0175fd0e21069cc","tests/pointwise_matcher_test.rs":"5078a462bafe11ed27501ba789d73e4e910c2e128197c0069e1aa790cdeb2684","tests/property_matcher_test.rs":"674217ce981e7be12f569fe78279abd89a3accfa81753f58aa535814887bec09","tests/proptest_integration_test.rs":"948f4d59b7f325faa522e53f3c8a4542be349f368cb790a39c157eb6c7b47014","tests/tuple_matcher_test.rs":"2f87305c29a4692f25a481f2a30e79a765579fd538872f57669b48ca576204f6","tests/unordered_elements_are_matcher_test.rs":"1026cefc59daa8fe2aa249b87800238699d2352224c04ac4edc648b7052a13ef"},"package":"ee44a233e2e661240ef77ed5de92ea9ecf70d4832963a8582a6681e1517f3673"}
\ No newline at end of file
+{"files":{"Cargo.toml":"e00cc51a8d859b2a8fd95e199c13db5e16ed79837573b9f445e086e255d43893","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"12cf77cf9d98dab80416f8135448cae5d0bb532e9b69c63b951d49861d8d649a","crate_docs.md":"b25c57c437bd7974921b9f7172e868d3efd3b1551addc8c47f8ff6a4fc5d8ee1","src/assertions.rs":"43883536abf5f4bb9c2a746593ad1f4cba811574838f700daa703f5b952b2c41","src/description.rs":"f9fb18581c36db85a7415ffa5c9f646dfafaa7594a0a4d00ab66729de5a3f3ad","src/fixtures.rs":"528672a95a3535b2f18d28b29c2ed0a9262462738984d94af74d7cda0e4cbb86","src/fmt.rs":"986f1d796eb585999dc0614c5aed3c94230c0ba19893d2b2cf8eec90e20a38c8","src/internal/description_renderer.rs":"c7d685ed7df27e8670ec77ba7265dd220da84056e467fb62e8faf3f5e0898e8b","src/internal/mod.rs":"b07f41cae5b2b78806be89fc48da938fbe41277c37456d79891496a26e2c921f","src/internal/test_outcome.rs":"40f26fdde8a101242d376a4ffa1157fe177a017d0d4659bc747eae93762f83f3","src/lib.rs":"07bb924c81b725635a2df75b0283a3d581a92cf544923a6d6a869fce491cb4b4","src/matcher.rs":"a07acfabdc658cf23df089763c9faec77ab586cc9e153c01178cd0c9853628c6","src/matcher_support/auto_eq.rs":"e7a95ffb7ebe4f23986920e494e89ac254c596c43382bdb730a17eda02b83d87","src/matcher_support/count_elements.rs":"34ac45d3fedef1e9ff9ea46144e450fc2972e17e3d266699c61fdf68cd5ed2b1","src/matcher_support/edit_distance.rs":"e91a22eb46f1000a0ef2efac547ab1a05a18612d1c5024400800a0413ea8c74e","src/matcher_support/mod.rs":"df976626c666df50f9a12ab4486fb64c327ef9b7ee3b497d89e9a7aada889c1e","src/matcher_support/summarize_diff.rs":"82700a07cb45c20d6375227928f32e17422486373bc10377d4110537bfb271a0","src/matcher_support/zipped_iterator.rs":"ac1a1a54f866f977255403a4f7e7613a4116af163326029c54b65ca1ac57b538","src/matchers/all_matcher.rs":"a12ea32a2872ba6e0194c4b294182157ea1fcd8dd8800005c45f9faad81aa6ba","src/matchers/any_matcher.rs":"2d2b1db30790c7dadbd7e1b77e1c796b71e3770480d21e15bce7033eeae0ecb2","src/matchers/anything_matcher.rs":"5905d9ae3e01274ec514cb5f09518dc7bfd416fc0bd57b02ee10d3ead04ce7bf","src/matchers/bool_matcher.rs":"245a72604474071a00f6a4231a00d1c984aca035cc9d79c0aba090eb46d686b1","src/matchers/char_count_matcher.rs":"fe013c27c9e3a7e8b627472c272dc38fa0ab0674186384bc53ce64130821ae38","src/matchers/conjunction_matcher.rs":"687e6f1c5c8d33cec539440626790c99fb9048ca95b3e5d80f9fa531caa8674f","src/matchers/container_eq_matcher.rs":"b502076dde050afd270848c9669b0818f8f749e5afabc81441f800defdc94562","src/matchers/contains_matcher.rs":"f79b8f816a265ddb96a769e9ac48f8a6b175f127a4b1d8b24e8f4d76fca239c0","src/matchers/contains_regex_matcher.rs":"4b9e13c36ef4314ee7adbbc46e5138ebdb1fbc41f231bc9cdaad8efdb3f8cc5e","src/matchers/derefs_to_matcher.rs":"0f91f73cd0fcdb580be617f11b96b93d1055e8871554f745c76175b035e20621","src/matchers/disjunction_matcher.rs":"45f1c1fb5192f6cfd062eb05e77135b566763292589d8fe29048aaa01b357698","src/matchers/display_matcher.rs":"040296c9ad47f0dab694a7c3b3b24beecd4e02d2de011e52d432309ba97e7e02","src/matchers/each_matcher.rs":"61802a11497447a8f8144eb7be97b7600cc04fa55ed884728c4d7c14d0ca2455","src/matchers/elements_are_matcher.rs":"feccfb18fa552d94d25ca051bd9b4fe69d65004604b2ec317699f9c1bb4127ef","src/matchers/empty_matcher.rs":"7d68972d24e7d81dea6bdc77a8193d0d8c9b1988aab737ca3721b75e134b8e50","src/matchers/eq_matcher.rs":"8ea401d1e4ad5ff2f96a7178640c7d7e3b416a43e4d88086460ac4fba23e7044","src/matchers/err_matcher.rs":"0f8c9e47b76973393817d760c1b3833e4f81fd4a1cbe0bdf1237947b18c64902","src/matchers/field_matcher.rs":"01c95cca86e69266146a4331f00e2d393f88856a5aa44c2163ae9cc5e1ab348d","src/matchers/ge_matcher.rs":"cc45fae8414095959f5da830589495b0a1623666410953b027324863f8883fb0","src/matchers/gt_matcher.rs":"4c1fd646ac87f7525b3d080e78c6abf935bed50221e4dfd4339e8b75935af115","src/matchers/has_entry_matcher.rs":"3b43e0e6a24890a94910be35f0fd0c25fac602fa660d44303d769f7bd00145be","src/matchers/is_encoded_string_matcher.rs":"6519057f21db928c6dbb4d62eb7d695e992df1d660a16dbabd0c7bb73fb65113","src/matchers/is_matcher.rs":"4e842d665eb710540fbf7b274755d665727ff01f51bee57e9b2697f6aec90cd7","src/matchers/is_nan_matcher.rs":"9972b43fd35c47b89755d8ec176631f76b6cfec725d8972caed277369fc74493","src/matchers/le_matcher.rs":"108581b0fb4d9141e5aa0ec3abb640bd2828b5e39b0f3793bd767cba4eca3afb","src/matchers/len_matcher.rs":"f7312f738fc644ba942a15b017285cfc67a2458c815d5ce29e56cca307b6f357","src/matchers/lt_matcher.rs":"5966f449669160e2905acc0da5db5487d6da580bc96a6e77fb320eb8d4546990","src/matchers/matches_pattern.rs":"9895407b21823da2608be95086605f6bd508510bc987f1a840a495025b574921","src/matchers/matches_regex_matcher.rs":"5fca7eaddbe064c5053a0ebbd9532f8e00ab263101afb3948716fad4aaa0c38f","src/matchers/mod.rs":"0c0d9ca73488df9f9bed475da9d0b60ca69a5d16daf534fef77dd04d40d0290b","src/matchers/near_matcher.rs":"3ec423d88e9d52b518c9892b8271e76789971160c1f28534bce8adc250be5701","src/matchers/none_matcher.rs":"d422658c824f07afe870003383d42b090d9a7a72d539450e7903252a859352b1","src/matchers/not_matcher.rs":"140e0959a25cca75fd3aa41fad0dd71d50753b6b38220ff4a4960f2ef7d295e0","src/matchers/ok_matcher.rs":"2aae736e349bddc84b4cee5699b2e6d21817facdc49a28415a8ff919adea63bb","src/matchers/points_to_matcher.rs":"a1f55e8d9813a3651cc24307923b461f398f761b4a040d00faac623bfffeef82","src/matchers/pointwise_matcher.rs":"3b2ed83dcd216c82063697e03bad998e9c6f2d93f0c18c8edb847b1ceeea2ff4","src/matchers/predicate_matcher.rs":"825896ee6839f9b6a39f971529fc3e33d47b6f4abece86eaf911aff2af2e795e","src/matchers/property_matcher.rs":"d65d1bd8059cead41ce81db7c080ec639cf89e8d5846939b34687a1611494b24","src/matchers/result_of_matcher.rs":"fbcb266f7a65921fa799795fef21ab684706cf6b4ab79c2eb09c10c225497b8f","src/matchers/some_matcher.rs":"9ee7282180400476c39e7f43d5f028e93442423142665ecd23c397e5bd40c935","src/matchers/str_matcher.rs":"a10443574eec5c5e33c93e6208651a5f0b865a9a200517bf2e4d1f12c792a424","src/matchers/subset_of_matcher.rs":"e0966351bff9623aa63aaf7ae9403e05e6aabcdd8f4bb9074b19069cb0adff6b","src/matchers/superset_of_matcher.rs":"fd5af81f7eb390e6b6fc1c61b79963d3220d6505615171737b566e06eb441e9e","src/matchers/tuple_matcher.rs":"d00eb6fecd1d5671418e3bbe62c67f422b6a945ee1276e16edc1402c8e4f2edb","src/matchers/unordered_elements_are_matcher.rs":"fed9b464ee1597737a1ed86cd5fa0aeeb566fbd0ef3b00cc839988c3c2eb3dbc","tests/all_matcher_test.rs":"1808617e4f59b9e7ad001c45d5653d5389e761347ae4194f221767e5e6b5b7ab","tests/any_matcher_test.rs":"0ce6aa6de318e0e1f0976a04b1581f012001a9afdc1474c3a460e844e8b4f97e","tests/assertions_test.rs":"3425e5fc54a13034069305a9c30ee5fe7b9c5766a2a75d5dca721a3456b08211","tests/colorized_diff_test.rs":"01e9b2fe99aced6aad0281ba18f2442cf036e654b5fbf6c937dd957572e3ab95","tests/composition_test.rs":"bda4157c7a68001eddaabba788c72ce2db86645225cf47a105661799346eced7","tests/elements_are_matcher_test.rs":"decdfa0388dc76703ef2105fceea2bb70cc1e01c04a27208f8e68e8d6fc069af","tests/field_matcher_test.rs":"f82c36f3662e8798b7eaa7dec04b936fac2e74692cdbb90c305ae7ae41347254","tests/fmt_test.rs":"56796a45c9666bc08c7a88e62bdab9ed98b6f1d7adf0727e85c9c5bf2ebd7c31","tests/lib.rs":"e783f3e4908cb080721bdaf72ab4b6e1fb2165b5f4fb0f4baa179ad5c06dfe0f","tests/matches_pattern_test.rs":"bd5dfe2019828ae1df891f88d487bc64bb1a8ccf086fa05b28d4ddd2a785cfb5","tests/no_color_test.rs":"1bbca449ae5bdc261c96879bf5298e60b589947634bc6f8b9bdcbefdd13241a3","tests/pointwise_matcher_test.rs":"cf3e0c13c32a5e891fa47fe765e744a8d1652acc783cac9b4f0e501562df0877","tests/property_matcher_test.rs":"4461d54abaaa5135e371c516ce9b22c4b1bd187d25fea18d96562adaaf8a2839","tests/proptest_integration_test.rs":"948f4d59b7f325faa522e53f3c8a4542be349f368cb790a39c157eb6c7b47014","tests/tuple_matcher_test.rs":"cfa703ef99a2cafedb5cec8d8920fe2d146f17b0e9e1d894d473083d9d408d65","tests/unordered_elements_are_matcher_test.rs":"2fa8dbdd170567b8d02f46427b1ad5533a3f1737e0adb4fe6340b3f3dba110c7"},"package":"dce026f84cdd339bf71be01b24fe67470ee634282f68c1c4b563d00a9f002b05"}
\ No newline at end of file

crates/googletest/Android.bp

diff --git a/crates/googletest/Android.bp b/crates/googletest/Android.bp
index bd6d8f8..4ebc3a8 100644
--- a/crates/googletest/Android.bp
+++ b/crates/googletest/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "googletest",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.11.0",
+    cargo_pkg_version: "0.13.0",
     crate_root: "src/lib.rs",
     edition: "2021",
     rustlibs: [

crates/googletest/Cargo.toml

diff --git a/crates/googletest/Cargo.toml b/crates/googletest/Cargo.toml
index ed9d01c..b1d26ae 100644
--- a/crates/googletest/Cargo.toml
+++ b/crates/googletest/Cargo.toml
@@ -11,15 +11,20 @@
 
 [package]
 edition = "2021"
-rust-version = "1.66.0"
+rust-version = "1.70.0"
 name = "googletest"
-version = "0.11.0"
+version = "0.13.0"
 authors = [
     "Bradford Hovinen <hovinen@google.com>",
     "Bastien Jacot-Guillarmod <bjacotg@google.com>",
     "Maciej Pietrzak <mpi@google.com>",
     "Martin Geisler <mgeisler@google.com>",
 ]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "A rich assertion and matcher library inspired by GoogleTest for C++"
 readme = "README.md"
 keywords = [
@@ -35,12 +40,80 @@
 license = "Apache-2.0"
 repository = "https://github.com/google/googletest-rust"
 
+[lib]
+name = "googletest"
+path = "src/lib.rs"
+
+[[test]]
+name = "all_matcher_test"
+path = "tests/all_matcher_test.rs"
+
+[[test]]
+name = "any_matcher_test"
+path = "tests/any_matcher_test.rs"
+
+[[test]]
+name = "assertions_test"
+path = "tests/assertions_test.rs"
+
+[[test]]
+name = "colorized_diff_test"
+path = "tests/colorized_diff_test.rs"
+
+[[test]]
+name = "composition_test"
+path = "tests/composition_test.rs"
+
+[[test]]
+name = "elements_are_matcher_test"
+path = "tests/elements_are_matcher_test.rs"
+
+[[test]]
+name = "field_matcher_test"
+path = "tests/field_matcher_test.rs"
+
+[[test]]
+name = "fmt_test"
+path = "tests/fmt_test.rs"
+
+[[test]]
+name = "lib"
+path = "tests/lib.rs"
+
+[[test]]
+name = "matches_pattern_test"
+path = "tests/matches_pattern_test.rs"
+
+[[test]]
+name = "no_color_test"
+path = "tests/no_color_test.rs"
+
+[[test]]
+name = "pointwise_matcher_test"
+path = "tests/pointwise_matcher_test.rs"
+
+[[test]]
+name = "property_matcher_test"
+path = "tests/property_matcher_test.rs"
+
+[[test]]
+name = "proptest_integration_test"
+path = "tests/proptest_integration_test.rs"
+
+[[test]]
+name = "tuple_matcher_test"
+path = "tests/tuple_matcher_test.rs"
+
+[[test]]
+name = "unordered_elements_are_matcher_test"
+path = "tests/unordered_elements_are_matcher_test.rs"
+
 [dependencies.anyhow]
 version = "1"
 optional = true
 
 [dependencies.googletest_macro]
-version = "0.11.0"
+version = "0.13.0"
 
 [dependencies.num-traits]
 version = "0.2.17"
@@ -60,6 +133,3 @@
 
 [dev-dependencies.quickcheck]
 version = "1.0.3"
-
-[dev-dependencies.serial_test]
-version = "2.0.0"

crates/googletest/METADATA

diff --git a/crates/googletest/METADATA b/crates/googletest/METADATA
index 8b0b3e2..4b1ad07 100644
--- a/crates/googletest/METADATA
+++ b/crates/googletest/METADATA
@@ -1,17 +1,17 @@
 name: "googletest"
 description: "A rich assertion and matcher library inspired by GoogleTest for C++"
 third_party {
-  version: "0.11.0"
+  version: "0.13.0"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 2
+    year: 2025
+    month: 1
+    day: 3
   }
   homepage: "https://crates.io/crates/googletest"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/googletest/googletest-0.11.0.crate"
-    version: "0.11.0"
+    value: "https://static.crates.io/crates/googletest/googletest-0.13.0.crate"
+    version: "0.13.0"
   }
 }

crates/googletest/README.md

diff --git a/crates/googletest/README.md b/crates/googletest/README.md
index d442770..c611e79 100644
--- a/crates/googletest/README.md
+++ b/crates/googletest/README.md
@@ -25,7 +25,7 @@
  * A new set of assertion macros offering similar functionality to those of
    [GoogleTest](https://google.github.io/googletest/primer.html#assertions).
 
-**The minimum supported Rust version is 1.66**.
+**The minimum supported Rust version is 1.70**.
 
 > :warning: The API is not fully stable and may still be changed until we
 > publish version 1.0.
@@ -34,6 +34,15 @@
 > not be used directly. Those items or modules are only for internal uses and
 > their API may change without a major version update.
 
+## Learning resources
+
+If you're just getting started with `googletest`, consider going through
+the first chapter of
+["Advanced testing for Rust applications"](https://github.com/mainmatter/rust-advanced-testing-workshop),
+a self-guided Rust course: it provides a guided introduction to the library,
+with exercises to help you get comfortable with `googletest` macros,
+its matchers and its overall philosophy.
+
 ## Assertions and matchers
 
 The core of GoogleTest is its *matchers*. Matchers indicate what aspect of an
@@ -45,7 +54,7 @@
  * [`assert_that!`] panics if the assertion fails, aborting the test.
  * [`expect_that!`] logs an assertion failure, marking the test as having
    failed, but allows the test to continue running (called a _non-fatal
-   assertion_). It requires the use of the [`googletest::test`] attribute macro
+   assertion_). It requires the use of the [`gtest`] attribute macro
    on the test itself.
  * [`verify_that!`] has no side effects and evaluates to a [`Result<()>`] whose
    `Err` variant describes the assertion failure, if there is one. In
@@ -65,7 +74,7 @@
     assert_that!(value, eq(4));
 }
 
-#[googletest::test]
+#[gtest]
 fn two_logged_failures() {
     let value = 2;
     expect_that!(value, eq(4)); // Test now failed, but continues executing.
@@ -98,7 +107,7 @@
 ```rust
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn contains_at_least_one_item_at_least_3() {
     let value = vec![1, 2, 3];
     expect_that!(value, contains(ge(3)));
@@ -110,7 +119,7 @@
 ```rust
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn strictly_between_9_and_11() {
     let value = 10;
     expect_that!(value, gt(9).and(not(ge(11))));
@@ -156,11 +165,9 @@
     expected: T,
 }
 
-impl<T: PartialEq + Debug> Matcher for MyEqMatcher<T> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-         (self.expected == *actual).into()
+impl<T: PartialEq + Debug + Copy> Matcher<T> for MyEqMatcher<T> {
+    fn matches(&self, actual: T) -> MatcherResult {
+         (self.expected == actual).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> String {
@@ -179,7 +186,7 @@
 It is recommended to expose a function which constructs the matcher:
 
 ```rust
-pub fn eq_my_way<T: PartialEq + Debug>(expected: T) -> impl Matcher<ActualT = T> {
+pub fn eq_my_way<T: PartialEq + Debug>(expected: T) -> impl Matcher<T> {
     MyEqMatcher { expected }
 }
 ```
@@ -187,7 +194,7 @@
 The new matcher can then be used in the assertion macros:
 
 ```rust
-#[googletest::test]
+#[gtest]
 fn should_be_equal_by_my_definition() {
     expect_that!(10, eq_my_way(10));
 }
@@ -202,12 +209,12 @@
 This is analogous to the `EXPECT_*` family of macros in GoogleTest.
 
 To make a non-fatal assertion, use the macro [`expect_that!`]. The test must
-also be marked with [`googletest::test`] instead of the Rust-standard `#[test]`.
+also be marked with [`gtest`] instead of the Rust-standard `#[test]`.
 
 ```rust
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn three_non_fatal_assertions() {
     let value = 2;
     expect_that!(value, eq(2));  // Passes; test still considered passing.
@@ -222,7 +229,7 @@
 ```rust
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn failing_non_fatal_assertion() -> Result<()> {
     let value = 2;
     expect_that!(value, eq(3));  // Just marks the test as having failed.
@@ -235,7 +242,7 @@
 ```rust
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn failing_fatal_assertion_after_non_fatal_assertion() -> Result<()> {
     let value = 2;
     verify_that!(value, eq(3))?; // Fails and aborts the test.
@@ -246,12 +253,12 @@
 
 ### Interoperability
 
-You can use the `#[googletest::test]` macro together with many other libraries
+You can use the `#[gtest]` macro together with many other libraries
 such as [rstest](https://crates.io/crates/rstest). Just apply both attribute
 macros to the test:
 
 ```rust
-#[googletest::test]
+#[gtest]
 #[rstest]
 #[case(1)]
 #[case(2)]
@@ -261,16 +268,16 @@
 }
 ```
 
-Make sure to put `#[googletest::test]` *before* `#[rstest]`. Otherwise the
+Make sure to put `#[gtest]` *before* `#[rstest]`. Otherwise the
 annotated test will run twice, since both macros will attempt to register a test
 with the Rust test harness.
 
 The macro also works together with
-[async tests with Tokio](https://docs.rs/tokio/latest/tokio/attr.test.html) in
+[async tests with Tokio](https://docs.rs/tokio/latest/tokio/attr.gtest.html) in
 the same way:
 
 ```rust
-#[googletest::test]
+#[gtest]
 #[tokio::test]
 async fn should_work_with_tokio() -> Result<()> {
     verify_that!(3, gt(0))
@@ -348,7 +355,7 @@
 [`expect_pred!`]: https://docs.rs/googletest/*/googletest/macro.expect_pred.html
 [`expect_that!`]: https://docs.rs/googletest/*/googletest/macro.expect_that.html
 [`fail!`]: https://docs.rs/googletest/*/googletest/macro.fail.html
-[`googletest::test`]: https://docs.rs/googletest/*/googletest/attr.test.html
+[`gtest`]: https://docs.rs/googletest/*/googletest/attr.gtest.html
 [`matches_pattern!`]: https://docs.rs/googletest/*/googletest/macro.matches_pattern.html
 [`verify_pred!`]: https://docs.rs/googletest/*/googletest/macro.verify_pred.html
 [`verify_that!`]: https://docs.rs/googletest/*/googletest/macro.verify_that.html

crates/googletest/crate_docs.md

diff --git a/crates/googletest/crate_docs.md b/crates/googletest/crate_docs.md
index 8c8b47c..3a6b037 100644
--- a/crates/googletest/crate_docs.md
+++ b/crates/googletest/crate_docs.md
@@ -6,6 +6,14 @@
    range of assertions on data,
  * A rich set of matchers, and
  * A new set of test assertion macros.
+## Learning resources
+
+If you're just getting started with `googletest`, consider going through
+the first chapter of
+["Advanced testing for Rust applications"](https://github.com/mainmatter/rust-advanced-testing-workshop),
+a self-guided Rust course: it provides a guided introduction to the library,
+with exercises to help you get comfortable with `googletest` macros,
+its matchers and its overall philosophy.
 
 ## Assertions and matchers
 
@@ -18,7 +26,7 @@
  * [`assert_that!`] panics if the assertion fails, aborting the test.
  * [`expect_that!`] logs an assertion failure, marking the test as having
    failed, but allows the test to continue running (called a _non-fatal
-   assertion_). It requires the use of the [`googletest::test`][crate::test]
+   assertion_). It requires the use of the [`gtest`]
    attribute macro on the test itself.
  * [`verify_that!`] has no side effects and evaluates to a [`Result`] whose
    `Err` variant describes the assertion failure, if there is one. In
@@ -41,7 +49,7 @@
 }
 
 # /* The attribute macro would prevent the function from being compiled in a doctest.
-#[googletest::test]
+#[gtest]
 # */
 fn two_logged_failures() {
     let value = 2;
@@ -74,25 +82,25 @@
 use googletest::prelude::*;
 
 # /* The attribute macro would prevent the function from being compiled in a doctest.
-#[googletest::test]
+#[gtest]
 # */
 fn contains_at_least_one_item_at_least_3() {
 # googletest::internal::test_outcome::TestOutcome::init_current_test_outcome();
     let value = vec![1, 2, 3];
-    expect_that!(value, contains(ge(3)));
+    expect_that!(value, contains(ge(&3)));
 # googletest::internal::test_outcome::TestOutcome::close_current_test_outcome::<&str>(Ok(()))
 #     .unwrap();
 }
 # contains_at_least_one_item_at_least_3();
 ```
 
-They can also be logically combined:
+They can also be logically combined, with methods from [`MatcherBase`]:
 
 ```
 use googletest::prelude::*;
 
 # /* The attribute macro would prevent the function from being compiled in a doctest.
-#[googletest::test]
+#[gtest]
 # */
 fn strictly_between_9_and_11() {
 # googletest::internal::test_outcome::TestOutcome::init_current_test_outcome();
@@ -120,13 +128,13 @@
 | [`contains_each!`]   | A container containing distinct elements each of the arguments match.    |
 | [`contains_regex`]   | A string containing a substring matching the given regular expression.   |
 | [`contains_substring`] | A string containing the given substring.                               |
+| [`derefs_to`]        | A [`Deref`] which `deref()`s to a value that the argument matches.       |
 | [`displays_as`]      | A [`Display`] value whose formatted string is matched by the argument.   |
 | [`each`]             | A container all of whose elements the given argument matches.            |
 | [`elements_are!`]    | A container whose elements the arguments match, in order.                |
 | [`empty`]            | An empty collection.                                                     |
 | [`ends_with`]        | A string ending with the given suffix.                                   |
 | [`eq`]               | A value equal to the argument, in the sense of the [`PartialEq`] trait.  |
-| [`eq_deref_of`]      | A value equal to the dereferenced value of the argument.                 |
 | [`err`]              | A [`Result`][std::result::Result] containing an `Err` variant the argument matches. |
 | [`field!`]           | A struct or enum with a given field whose value the argument matches.    |
 | [`ge`]               | A [`PartialOrd`] value greater than or equal to the given value.         |
@@ -144,7 +152,7 @@
 | [`not`]              | Any value the argument does not match.                                   |
 | [`ok`]               | A [`Result`][std::result::Result] containing an `Ok` variant the argument matches. |
 | [`pat!`]             | Alias for [`matches_pattern!`].                                          |
-| [`points_to`]        | Any [`Deref`] such as `&`, `Rc`, etc. whose value the argument matches.  |
+| [`points_to`]        | A reference `&` which points to a value that the argument matches.       |
 | [`pointwise!`]       | A container whose contents the arguments match in a pointwise fashion.   |
 | [`predicate`]        | A value on which the given predicate returns true.                       |
 | [`some`]             | An [`Option`] containing `Some` whose value the argument matches.        |
@@ -164,12 +172,12 @@
 [`contains_regex`]: matchers::contains_regex
 [`contains_substring`]: matchers::contains_substring
 [`displays_as`]: matchers::displays_as
+[`derefs_to`]: matchers::derefs_to
 [`each`]: matchers::each
 [`elements_are!`]: matchers::elements_are
 [`empty`]: matchers::empty
 [`ends_with`]: matchers::ends_with
 [`eq`]: matchers::eq
-[`eq_deref_of`]: matchers::eq_deref_of
 [`err`]: matchers::err
 [`field!`]: matchers::field
 [`ge`]: matchers::ge
@@ -205,22 +213,21 @@
 ## Writing matchers
 
 One can extend the library by writing additional matchers. To do so, create
-a struct holding the matcher's data and have it implement the trait
-[`Matcher`]:
+a struct holding the matcher's data and have it implement the traits
+[`Matcher`] and  [`MatcherBase`]:
 
 ```no_run
-use googletest::{description::Description, matcher::{Matcher, MatcherResult}};
+use googletest::{description::Description, matcher::{Matcher, MatcherBase, MatcherResult}};
 use std::fmt::Debug;
 
+#[derive(MatcherBase)]
 struct MyEqMatcher<T> {
     expected: T,
 }
 
-impl<T: PartialEq + Debug> Matcher for MyEqMatcher<T> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-        if self.expected == *actual {
+impl<T: PartialEq + Debug + Copy> Matcher<T> for MyEqMatcher<T> {
+    fn matches(&self, actual: T) -> MatcherResult {
+        if self.expected == actual {
             MatcherResult::Match
         } else {
             MatcherResult::NoMatch
@@ -243,18 +250,16 @@
  It is recommended to expose a function which constructs the matcher:
 
  ```no_run
- # use googletest::{description::Description, matcher::{Matcher, MatcherResult}};
+ # use googletest::{description::Description, matcher::{Matcher, MatcherBase, MatcherResult}};
  # use std::fmt::Debug;
- #
+ # #[derive(MatcherBase)]
  # struct MyEqMatcher<T> {
  #    expected: T,
  # }
  #
- # impl<T: PartialEq + Debug> Matcher for MyEqMatcher<T> {
- #    type ActualT = T;
- #
- #    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
- #        if self.expected == *actual {
+ # impl<T: PartialEq + Debug + Copy> Matcher<T> for MyEqMatcher<T> {
+ #    fn matches(&self, actual: T) -> MatcherResult {
+ #        if self.expected == actual {
  #            MatcherResult::Match
  #        } else {
  #            MatcherResult::NoMatch
@@ -273,7 +278,7 @@
  #    }
  # }
  #
- pub fn eq_my_way<T: PartialEq + Debug>(expected: T) -> impl Matcher<ActualT = T> {
+ pub fn eq_my_way<T: PartialEq + Debug + Copy>(expected: T) -> impl Matcher<T> {
     MyEqMatcher { expected }
  }
  ```
@@ -282,18 +287,16 @@
 
 ```
 # use googletest::prelude::*;
-# use googletest::{description::Description, matcher::{Matcher, MatcherResult}};
+# use googletest::{description::Description, matcher::{Matcher, MatcherBase, MatcherResult}};
 # use std::fmt::Debug;
-#
+# #[derive(MatcherBase)]
 # struct MyEqMatcher<T> {
 #    expected: T,
 # }
 #
-# impl<T: PartialEq + Debug> Matcher for MyEqMatcher<T> {
-#    type ActualT = T;
-#
-#    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-#        if self.expected == *actual {
+# impl<T: PartialEq + Debug + Copy> Matcher<T> for MyEqMatcher<T> {
+#    fn matches(&self, actual: T) -> MatcherResult {
+#        if self.expected == actual {
 #            MatcherResult::Match
 #        } else {
 #            MatcherResult::NoMatch
@@ -312,11 +315,11 @@
 #    }
 # }
 #
-# pub fn eq_my_way<T: PartialEq + Debug>(expected: T) -> impl Matcher<ActualT = T> {
+# pub fn eq_my_way<T: PartialEq + Debug + Copy>(expected: T) -> impl Matcher<T> {
 #    MyEqMatcher { expected }
 # }
 # /* The attribute macro would prevent the function from being compiled in a doctest.
-#[googletest::test]
+#[gtest]
 # */
 fn should_be_equal_by_my_definition() {
 # googletest::internal::test_outcome::TestOutcome::init_current_test_outcome();
@@ -335,13 +338,12 @@
 aborts.
 
 To make a non-fatal assertion, use the macro [`expect_that!`]. The test must
-also be marked with [`googletest::test`][crate::test] instead of the
-Rust-standard `#[test]`.
+also be marked with [`gtest`] instead of the Rust-standard `#[test]`.
 
 ```no_run
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn three_non_fatal_assertions() {
     let value = 2;
     expect_that!(value, eq(2));  // Passes; test still considered passing.
@@ -357,7 +359,7 @@
 use googletest::prelude::*;
 
 # /* Make sure this also compiles as a doctest.
-#[googletest::test]
+#[gtest]
 # */
 fn failing_non_fatal_assertion() -> Result<()> {
     let value = 2;
@@ -371,7 +373,7 @@
 ```no_run
 use googletest::prelude::*;
 
-#[googletest::test]
+#[gtest]
 fn failing_fatal_assertion_after_non_fatal_assertion() -> Result<()> {
     let value = 2;
     expect_that!(value, eq(2));  // Passes; test still considered passing.
@@ -434,62 +436,98 @@
 # always_fails().unwrap_err();
 ```
 
+## Conversion from `Result::Err` and `Option::None`
+
+To simplify error management during a test arrangement, [`Result<T>`]
+provides a few conversion utilities.
+
+If your setup function returns `std::result::Result<T, E>` where `E: std::error::Error`,
+the `std::result::Result<T, E>` can simply be handled with the `?` operator. If an `Err(e)`
+is returned, the test will report a failure at the line where the `?` operator has been
+applied (or the lowest caller without `#[track_caller]`).
+
+```
+# use googletest::prelude::*;
+struct PngImage { h: i32, w: i32 /* ... */ }
+impl PngImage {
+  fn new_from_file(file_name: &str) -> std::result::Result<Self, std::io::Error> {
+    Err(std::io::Error::new(std::io::ErrorKind::Other, "oh no!"))
+
+   }
+  fn rotate(&mut self) { std::mem::swap(&mut self.h, &mut self.w);}
+  fn dimensions(&self) -> (i32, i32) { (self.h, self.w)}
+}
+
+fn test_png_image_dimensions() -> googletest::Result<()> {
+  // Arrange
+  let mut png = PngImage::new_from_file("example.png")?;
+  verify_eq!(png.dimensions(), (128, 64))?;
+
+  // Act
+  png.rotate();
+
+  // Assert
+  expect_eq!(png.dimensions(), (64, 128));
+  Ok(())
+}
+
+# test_png_image_dimensions().unwrap_err();
+```
+
+If your setup function returns `Option<T>` or `std::result::Result<T, E>` where
+`E: !std::error::Error`, then you can convert these types with `into_test_result()`
+from the `IntoTestResult` extension trait.
+
+```
+# use googletest::prelude::*;
+# struct PngImage;
+# static PNG_BINARY: [u8;0] = [];
+
+impl PngImage {
+  fn new_from_binary(bin: &[u8]) -> std::result::Result<Self, String> {
+    Err("Parsing failed".into())
+  }
+}
+
+# /* The attribute macro would prevent the function from being compiled in a doctest.
+#[gtest]
+# */
+fn test_png_image_binary() -> googletest::Result<()> {
+  // Arrange
+  let png_image = PngImage::new_from_binary(&PNG_BINARY).into_test_result()?;
+  /* ... */
+  # Ok(())
+}
+# test_png_image_binary().unwrap_err();
+
+impl PngImage {
+  fn new_from_cache(key: u64) -> Option<Self> {
+    None
+  }
+}
+
+# /* The attribute macro would prevent the function from being compiled in a doctest.
+#[gtest]
+# */
+fn test_png_from_cache() -> googletest::Result<()> {
+  // Arrange
+  let png_image = PngImage::new_from_cache(123).into_test_result()?;
+  /* ... */
+  # Ok(())
+}
+# test_png_from_cache().unwrap_err();
+```
+
+
 ## Integrations with other crates
 
 GoogleTest Rust includes integrations with the
-[Anyhow](https://crates.io/crates/anyhow) and
 [Proptest](https://crates.io/crates/proptest) crates to simplify turning
-errors from those crates into test failures.
-
-To use this, activate the `anyhow`, respectively `proptest` feature in
-GoogleTest Rust and invoke the extension method [`into_test_result()`] on a
-`Result` value in your test. For example:
-
-```
-# use googletest::prelude::*;
-# #[cfg(feature = "anyhow")]
-# use anyhow::anyhow;
-# #[cfg(feature = "anyhow")]
-# /* The attribute macro would prevent the function from being compiled in a doctest.
-#[test]
-# */
-fn has_anyhow_failure() -> Result<()> {
-    Ok(just_return_error().into_test_result()?)
-}
-
-# #[cfg(feature = "anyhow")]
-fn just_return_error() -> anyhow::Result<()> {
-    anyhow::Result::Err(anyhow!("This is an error"))
-}
-# #[cfg(feature = "anyhow")]
-# has_anyhow_failure().unwrap_err();
-```
-
-One can convert Proptest test failures into GoogleTest test failures when the
-test is invoked with
-[`TestRunner::run`](https://docs.rs/proptest/latest/proptest/test_runner/struct.TestRunner.html#method.run):
-
-```
-# use googletest::prelude::*;
-# #[cfg(feature = "proptest")]
-# use proptest::test_runner::{Config, TestRunner};
-# #[cfg(feature = "proptest")]
-# /* The attribute macro would prevent the function from being compiled in a doctest.
-#[test]
-# */
-fn numbers_are_greater_than_zero() -> Result<()> {
-    let mut runner = TestRunner::new(Config::default());
-    runner.run(&(1..100i32), |v| Ok(verify_that!(v, gt(0))?)).into_test_result()
-}
-# #[cfg(feature = "proptest")]
-# numbers_are_greater_than_zero().unwrap();
-```
-
-Similarly, when the `proptest` feature is enabled, GoogleTest assertion failures
-can automatically be converted into Proptest
+GoogleTest assertion failures into Proptest
 [`TestCaseError`](https://docs.rs/proptest/latest/proptest/test_runner/enum.TestCaseError.html)
-through the `?` operator as the example above shows.
+through the `?` operator.
 
 [`and_log_failure()`]: GoogleTestSupport::and_log_failure
 [`into_test_result()`]: IntoTestResult::into_test_result
 [`Matcher`]: matcher::Matcher
+[`MatcherBase`]: matcher::MatcherBase

crates/googletest/src/assertions.rs

diff --git a/crates/googletest/src/assertions.rs b/crates/googletest/src/assertions.rs
index 2668028..ac5177e 100644
--- a/crates/googletest/src/assertions.rs
+++ b/crates/googletest/src/assertions.rs
@@ -120,29 +120,37 @@
 /// not supported; see [Rust by Example](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html#tuples).
 #[macro_export]
 macro_rules! verify_that {
+    // specialized to sequences:
     ($actual:expr, [$($expecteds:expr),+ $(,)?]) => {
-        $crate::assertions::internal::check_matcher(
-            &$actual,
-            $crate::matchers::elements_are![$($expecteds),+],
-            stringify!($actual),
-            $crate::internal::source_location::SourceLocation::new(file!(), line!(), column!()),
-        )
+        {
+            use $crate::assertions::internal::Subject as _;
+            $actual.check(
+                $crate::matchers::elements_are![$($expecteds),+],
+                stringify!($actual),
+            )
+        }
     };
+
+    // specialized to unordered sequences:
     ($actual:expr, {$($expecteds:expr),+ $(,)?}) => {
-        $crate::assertions::internal::check_matcher(
-            &$actual,
-            $crate::matchers::unordered_elements_are![$($expecteds),+],
-            stringify!($actual),
-            $crate::internal::source_location::SourceLocation::new(file!(), line!(), column!()),
-        )
+        {
+            use $crate::assertions::internal::Subject as  _;
+            $actual.check(
+                $crate::matchers::unordered_elements_are![$($expecteds),+],
+                stringify!($actual),
+            )
+        }
     };
+
+    // general case:
     ($actual:expr, $expected:expr $(,)?) => {
-        $crate::assertions::internal::check_matcher(
-            &$actual,
-            $expected,
-            stringify!($actual),
-            $crate::internal::source_location::SourceLocation::new(file!(), line!(), column!()),
-        )
+        {
+            use $crate::assertions::internal::Subject as  _;
+            $actual.check(
+                $expected,
+                stringify!($actual),
+            )
+        }
     };
 }
 
@@ -165,30 +173,25 @@
 /// # */
 /// fn test() -> Result<()> {
 ///     let a = 1;
-///     let b = 7;
-///     let n = 5;
-///     verify_pred!(equals_modulo(a, b, n))?;
+///     fn b(_x: i32) -> i32 { 7 }
+///     verify_pred!(equals_modulo(a, b(b(2)), 2 + 3))?;
 ///     Ok(())
 /// }
 /// # verify_that!(
 /// #     test(),
-/// #     err(displays_as(contains_substring("equals_modulo(a, b, n) was false with")))
+/// #     err(displays_as(contains_substring("equals_modulo(a, b(b(2)), 2 + 3) was false with")))
 /// # ).unwrap();
 /// ```
 ///
 /// This results in the following message:
 ///
 /// ```text
-/// equals_modulo(a, b, n) was false with
+/// equals_modulo(a, b(b(2)), 2 + 3) was false with
 ///   a = 1,
-///   b = 7,
-///   n = 5
+///   b(b(2)) = 7,
+///   2 + 3 = 5,
 /// ```
 ///
-/// The function passed to this macro must return `bool`. Each of the arguments
-/// must evaluate to a type implementing [`std::fmt::Debug`]. The debug output
-/// is used to construct the failure message.
-///
 /// The predicate can also be a method on a struct, e.g.:
 ///
 /// ```ignore
@@ -201,42 +204,45 @@
 /// verify_pred!((AStruct {}).equals_modulo(a, b, n))?;
 /// ```
 ///
-/// **Warning:** This macro assumes that the arguments passed to the predicate
-/// are either *variables* or *calls to pure functions*. If two subsequent
-/// invocations to any of the expresssions passed as arguments result in
-/// different values, then the output message of a test failure will deviate
-/// from the values actually passed to the predicate. For this reason, *always
-/// assign the outputs of non-pure functions to variables before using them in
-/// this macro. For example:
+/// The expression passed to this macro must return `bool`. In the most general
+/// case, it prints out each of the `.`-separated parts of the expression and
+/// the arguments of all top-level method calls as long as they implement
+/// `Debug`. It evaluates every value (including the method receivers) exactly
+/// once. Effectively, for `verify_pred!((a + 1).b.c(x + y, &mut z, 2))`, it
+/// generates code analogous to the following, which allows printing accurate
+/// intermediate values even if they are subsequently consumed (moved out) or
+/// mutated in-place by the expression:
 ///
 /// ```ignore
-/// let output = generate_random_number();  // Assigned outside of verify_pred.
-/// verify_pred!(is_sufficiently_random(output))?;
+/// let mut error_message = "(a + 1).b.c(x + y, 2) was false with".to_string();
+/// let mut x1 = (a + 1);
+/// write!(error_message, "\n  (a + 1) = {:?},", x1);
+/// write!(error_message, "\n  (a + 1).b = {:?},", x1.b);
+/// let mut x2 = x + y;
+/// write!(error_message, "\n  x + y = {:?},", x2);
+/// let mut x3 = &mut z;
+/// write!(error_message, "\n  & mut z = {:?},", x3);
+/// let mut x4 = x1.b.c(x2, x3, 2);
+/// if (x4) {
+///   Ok(())
+/// } else {
+///   Err(error_message)
+/// }
 /// ```
+///
+/// Wrapping the passed-in expression in parens or curly braces will prevent the
+/// detailed printing of the expression.
+///
+/// ```ignore
+/// verify_pred!((a.foo()).bar())?;
+/// ```
+///
+/// would not print `a`, but would print `(a.foo())` and `(a.foo()).bar()` on
+/// error.
 #[macro_export]
 macro_rules! verify_pred {
-    ([$($predicate:tt)*]($($arg:tt),* $(,)?)) => {
-        if !$($predicate)*($($arg),*) {
-            $crate::assertions::internal::report_failed_predicate(
-                concat!(stringify!($($predicate)*), stringify!(($($arg),*))),
-                vec![$((format!(concat!(stringify!($arg), " = {:?}"), $arg))),*],
-                $crate::internal::source_location::SourceLocation::new(
-                    file!(),
-                    line!(),
-                    column!(),
-                ),
-            )
-        } else {
-            Ok(())
-        }
-    };
-
-    ([$($predicate:tt)*] $first:tt $($rest:tt)*) => {
-        $crate::verify_pred!([$($predicate)* $first] $($rest)*)
-    };
-
-    ($first:tt $($rest:tt)*) => {
-        $crate::verify_pred!([$first] $($rest)*)
+    ($expr:expr $(,)?) => {
+        $crate::assertions::internal::__googletest_macro_verify_pred!($expr)
     };
 }
 
@@ -285,27 +291,978 @@
 /// [`and_log_failure`](crate::GoogleTestSupport::and_log_failure).
 #[macro_export]
 macro_rules! fail {
-    ($($message:expr),+) => {{
-        // We wrap this in a function so that we can annotate it with the must_use attribute.
-        // must_use on expressions is still experimental.
-        #[must_use = "The assertion result must be evaluated to affect the test result."]
-        fn create_fail_result(message: String) -> $crate::Result<()> {
-            Err($crate::internal::test_outcome::TestAssertionFailure::create(format!(
-                "{}\n{}",
-                message,
-                $crate::internal::source_location::SourceLocation::new(
-                    file!(),
-                    line!(),
-                    column!(),
-                ),
-            )))
-        }
-        create_fail_result(format!($($message),*))
+    ($($message:expr),+ $(,)?) => {{
+        $crate::assertions::internal::create_fail_result(
+            format!($($message),*),
+        )
     }};
 
     () => { fail!("Test failed") };
 }
 
+/// Generates a success. This **does not** make the overall test succeed. A test
+/// is only considered successful if none of its assertions fail during its
+/// execution.
+///
+/// The succeed!() assertion is purely documentary. The only user visible output
+/// is a stdout with information on where the success was generated from.
+///
+/// ```ignore
+/// fn test_to_be_implemented() {
+///     succeed!();
+/// }
+/// ```
+///
+/// One may include formatted arguments in the success message:
+///
+/// ```ignore
+/// fn test_to_be_implemented() {
+///     succeed!("I am just a fake test: {}", "a fake test indeed");
+/// }
+/// ```
+#[macro_export]
+macro_rules! succeed {
+    ($($message:expr),+ $(,)?) => {{
+        println!(
+            "{}\n at {}:{}:{}",
+            format!($($message),*),
+            file!(), line!(), column!()
+        );
+    }};
+
+    () => {
+        succeed!("Success")
+    };
+}
+
+/// Generates a failure marking the test as failed but continue execution.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail_but_not_abort() {
+///     add_failure!();
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail_but_not_abort() {
+///     add_failure!("I am just a fake test: {}", "a fake test indeed");
+/// }
+/// ```
+#[macro_export]
+macro_rules! add_failure {
+    ($($message:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::assertions::internal::create_fail_result(
+            format!($($message),*),
+        ).and_log_failure();
+    }};
+
+    () => {
+        add_failure!("Failed")
+    };
+}
+
+/// Generates a failure at specified location marking the test as failed but
+/// continue execution.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail_but_not_abort() {
+///     add_failure_at!("src/my_file.rs", 32, 12);
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail_but_not_abort() {
+///     add_failure_at!(
+///         "src/my_file.rs",
+///         32,
+///         12,
+///         "I am just a fake test: {}", "a fake test indeed",
+///     );
+/// }
+/// ```
+#[macro_export]
+macro_rules! add_failure_at {
+    ($file:expr, $line:expr, $column:expr, $($message:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::assertions::internal::create_fail_result(
+            format!($($message),*),
+        ).map_err(|e| e.with_fake_location($file, $line, $column)).and_log_failure();
+    }};
+
+    ($file:expr, $line:expr, $column:expr $(,)?) => {
+        add_failure_at!($file, $line, $column, "Failed")
+    };
+}
+
+/// Verify if the condition evaluates to true and returns `Result`.
+///
+/// Evaluates to `Result::Ok(())` if the condition is true and
+/// `Result::Err(TestAssertionFailure)` if it evaluates to false. The caller
+/// must then decide how to handle the `Err` variant. It has a few options:
+///   * Abort the current function with the `?` operator. This requires that the
+///     function return a suitable `Result`.
+///   * Log the failure and continue by calling the method `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_true!(2 + 2 == 5)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_true {
+    ($condition:expr) => {{
+        use $crate::assertions::internal::Subject as _;
+        ($condition).check($crate::matchers::eq(true), stringify!($condition))
+    }};
+}
+
+/// Marks test as failed and continue execution if the expression evaluates to
+/// false.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_true!(2 + 2 == 5);
+///     println!("This will print");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_true {
+    ($condition:expr) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_true!($condition).and_log_failure()
+    }};
+}
+
+/// Verify if the condition evaluates to false and returns `Result`.
+///
+/// Evaluates to `Result::Ok(())` if the condition is false and
+/// `Result::Err(TestAssertionFailure)` if it evaluates to true. The caller
+/// must then decide how to handle the `Err` variant. It has a few options:
+///   * Abort the current function with the `?` operator. This requires that the
+///     function return a suitable `Result`.
+///   * Log the failure and continue by calling the method `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_false!(2 + 2 == 4)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_false {
+    ($condition:expr) => {{
+        use $crate::assertions::internal::Subject as _;
+        ($condition).check($crate::matchers::eq(false), stringify!($condition))
+    }};
+}
+
+/// Marks test as failed and continue execution if the expression evaluates to
+/// true.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_false!(2 + 2 == 4);
+///     println!("This will print");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_false {
+    ($condition:expr) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_false!($condition).and_log_failure()
+    }};
+}
+
+/// Checks whether the second argument is equal to the first argument.
+///
+/// Evaluates to `Result::Ok(())` if they are equal and
+/// `Result::Err(TestAssertionFailure)` if they are not. The caller must then
+/// decide how to handle the `Err` variant. It has a few options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_eq!(2, 1)
+/// }
+/// ```
+///
+/// This macro has special support for matching against container. Namely:
+///  * `verify_eq!(actual, [e1, e2, ...])` is equivalent to
+///    `verify_that!(actual, elements_are![eq(e1), eq(e2), ...])`
+///  * `verify_eq!(actual, {e1, e2, ...})` is equivalent to
+///    `verify_that!(actual, unordered_elements_are![eq(e1), eq(e2), ...])`
+#[macro_export]
+macro_rules! verify_eq {
+    // Specialization for ordered sequences of tuples:
+    ($actual:expr, [ $( ( $($tuple_elt:expr),* ) ),+ $(,)? ] $(,)?) => {
+        verify_that!(&$actual, [
+            $(
+                // tuple matching
+                (
+                    $(
+                        $crate::matchers::eq(&$tuple_elt)
+                    ),*
+                )
+            ),*
+        ])
+    };
+
+    // Specialization for unordered sequences of tuples:
+    ($actual:expr, { $( ( $($tuple_elt:expr),* ) ),+ $(,)?} $(,)?) => {
+        verify_that!(&$actual, {
+            $(
+                // tuple matching
+                (
+                    $(
+                        $crate::matchers::eq(&$tuple_elt)
+                    ),*
+                )
+            ),*
+        })
+    };
+
+    // Ordered sequences:
+    ($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {
+        verify_that!(&$actual, [$($crate::matchers::eq(&$expected)),*])
+    };
+
+    // Unordered sequences:
+    ($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {
+        verify_that!(&$actual, {$($crate::matchers::eq(&$expected)),*})
+    };
+
+    // General case:
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!(&$actual, $crate::matchers::eq(&$expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the second argument is not
+/// equal to first argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_eq!(2, 1);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// This macro has special support for matching against container. Namely:
+///  * `expect_eq!(actual, [e1, e2, ...])` for checking actual contains "e1, e2,
+///    ..." in order.
+///  * `expect_eq!(actual, {e1, e2, ...})` for checking actual contains "e1, e2,
+///    ..." in any order.
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_eq!(2, 1, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_eq {
+    ($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, [$($expected),*]).and_log_failure();
+    }};
+    ($actual:expr, [$($expected:expr),+ $(,)?], $($format_args:expr),* $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, [$($expected),*])
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, {$($expected),*}).and_log_failure();
+    }};
+    ($actual:expr, {$($expected:expr),+ $(,)?}, $($format_args:expr),* $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, {$($expected),*})
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, $expected).and_log_failure();
+    }};
+    ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_eq!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+}
+
+/// Checks whether the second argument is not equal to the first argument.
+///
+/// Evaluates to `Result::Ok(())` if they are not equal and
+/// `Result::Err(TestAssertionFailure)` if they are equal. The caller must then
+/// decide how to handle the `Err` variant. It has a few options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_ne!(1, 1)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_ne {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!(&$actual, $crate::matchers::not($crate::matchers::eq(&$expected)))
+    };
+}
+
+/// Marks test as failed and continues execution if the second argument is
+/// equal to first argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_ne!(1, 1);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_ne!(1, 1, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_ne {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_ne!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_ne!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the first argument is less than second argument.
+///
+/// Evaluates to `Result::Ok(())` if the first argument is less than the second
+/// and `Result::Err(TestAssertionFailure)` if it is greater or equal. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_lt!(2, 1)
+/// }
+#[macro_export]
+macro_rules! verify_lt {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::lt($expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the first argument is
+/// greater or equal to second argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_lt!(2, 1);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_lt!(1, 1, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_lt {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_lt!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_lt!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the first argument is less than or equal to the second
+/// argument.
+///
+/// Evaluates to `Result::Ok(())` if the first argument is less than or equal to
+/// the second and `Result::Err(TestAssertionFailure)` if it is greater. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_le!(2, 1)
+/// }
+#[macro_export]
+macro_rules! verify_le {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::le($expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the first argument is
+/// greater than the second argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_le!(2, 1);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_le!(2, 1, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_le {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_le!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_le!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the first argument is greater than the second argument.
+///
+/// Evaluates to `Result::Ok(())` if the first argument is greater than
+/// the second and `Result::Err(TestAssertionFailure)` if it is not. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_gt!(1, 2)
+/// }
+#[macro_export]
+macro_rules! verify_gt {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::gt($expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the first argument is
+/// not greater than the second argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_gt!(1, 2);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_gt!(1, 2, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_gt {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_gt!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_gt!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the first argument is greater than or equal to the second
+/// argument.
+///
+/// Evaluates to `Result::Ok(())` if the first argument is greater than or equal
+/// to the second and `Result::Err(TestAssertionFailure)` if it is not. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_ge!(1, 2)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_ge {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::ge($expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the first argument is
+/// not greater than or equal to the second argument.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_ge!(1, 2);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_ge!(1, 2, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_ge {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_ge!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_ge!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the float given by first argument is approximately
+/// equal to second argument.
+///
+/// This automatically computes a tolerance from the magnitude of `expected` and
+/// matches any actual value within this tolerance of the expected value. The
+/// tolerance is chosen to account for the inaccuracies in most ordinary
+/// floating point calculations. To see details of how the tolerance is
+/// calculated look at the implementation of
+/// [`googletest::approx_eq`][crate::matchers::approx_eq].
+///
+/// Evaluates to `Result::Ok(())` if the first argument is approximately equal
+/// to the second and `Result::Err(TestAssertionFailure)` if it is not. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_float_eq!(1.0, 2.0)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_float_eq {
+    ($actual:expr, $expected:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::approx_eq($expected))
+    };
+}
+
+/// Marks test as failed and continues execution if the float given by the first
+/// argument is not approximately equal to the float given by the second
+/// argument.
+///
+/// This automatically computes a tolerance from the magnitude of `expected` and
+/// matches any actual value within this tolerance of the expected value. The
+/// tolerance is chosen to account for the inaccuracies in most ordinary
+/// floating point calculations. To see details of how the tolerance is
+/// calculated look at the implementation of
+/// [`googletest::approx_eq`][crate::matchers::approx_eq].
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_float_eq!(1.0, 2.0);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_float_eq!(1.0, 2.0, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_float_eq {
+    ($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_float_eq!($actual, $expected)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_float_eq!($actual, $expected).and_log_failure();
+    }};
+}
+
+/// Checks whether the float given by first argument is equal to second argument
+/// with error tolerance of max_abs_error.
+///
+/// Evaluates to `Result::Ok(())` if the first argument is approximately equal
+/// to the second and `Result::Err(TestAssertionFailure)` if it is not. The
+/// caller must then decide how to handle the `Err` variant. It has a few
+/// options:
+///  * Abort the current function with the `?` operator. This requires that the
+///    function return a suitable `Result`.
+///  * Log the test failure and continue by calling the method
+///    `and_log_failure`.
+///
+/// Of course, one can also use all other standard methods on `Result`.
+///
+/// **Invoking this macro by itself does not cause a test failure to be recorded
+/// or output.** The resulting `Result` must be handled as described above to
+/// cause the test to be recorded as a failure.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[test]
+/// fn should_fail() -> Result<()> {
+///     verify_near!(1.12345, 1.12346, 1e-6)
+/// }
+/// ```
+#[macro_export]
+macro_rules! verify_near {
+    ($actual:expr, $expected:expr, $max_abs_error:expr $(,)?) => {
+        verify_that!($actual, $crate::matchers::near($expected, $max_abs_error))
+    };
+}
+
+/// Marks the test as failed and continues execution if the float given by first
+/// argument is not equal to second argument with error tolerance of
+/// max_abs_error.
+///
+/// This is a **not-fatal** failure. The test continues execution even after the
+/// macro execution.
+///
+/// This can only be invoked inside tests with the
+/// [`gtest`][crate::gtest] attribute. The failure must be generated
+/// in the same thread as that running the test itself.
+///
+/// Example:
+/// ```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     expect_near!(1.12345, 1.12346, 1e-6);
+///     println!("This will print!");
+/// }
+/// ```
+///
+/// One may include formatted arguments in the failure message:
+///```ignore
+/// use googletest::prelude::*;
+///
+/// #[gtest]
+/// fn should_fail() {
+///     let argument = "argument"
+///     expect_near!(1.12345, 1.12346, 1e-6, "custom failure message: {argument}");
+///     println!("This will print!");
+/// }
+/// ```
+#[macro_export]
+macro_rules! expect_near {
+    ($actual:expr, $expected:expr, $max_abs_error:expr, $($format_args:expr),+ $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_near!($actual, $expected, $max_abs_error)
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure();
+    }};
+    ($actual:expr, $expected:expr, $max_abs_error:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        verify_near!($actual, $expected, $max_abs_error).and_log_failure();
+    }};
+}
+
 /// Matches the given value against the given matcher, panicking if it does not
 /// match.
 ///
@@ -351,6 +1308,59 @@
 /// equivalent to `ASSERT_THAT`, use [`verify_that!`] with the `?` operator.
 #[macro_export]
 macro_rules! assert_that {
+    // specialized to sequence:
+    ($actual:expr, [ $($expected:expr),* ] $(,)?) => {
+        match $crate::verify_that!($actual, [ $($expected),* ]) {
+            Ok(_) => {}
+            Err(e) => {
+                // The extra newline before the assertion failure message makes the failure a
+                // bit easier to read when there's some generic boilerplate from the panic.
+                panic!("\n{}", e);
+            }
+        }
+    };
+
+    // specialized to unordered sequence
+    ($actual:expr, { $($expected:expr),* } $(,)?) => {
+        match $crate::verify_that!($actual, { $($expected),* }) {
+            Ok(_) => {}
+            Err(e) => {
+                // The extra newline before the assertion failure message makes the failure a
+                // bit easier to read when there's some generic boilerplate from the panic.
+                panic!("\n{}", e);
+            }
+        }
+    };
+
+    // w/ format args, specialized to sequence:
+    ($actual:expr, [ $($expected:expr),* ], $($format_args:expr),* $(,)?) => {
+        match $crate::verify_that!($actual, [ $($expected),* ])
+            .with_failure_message(|| format!($($format_args),*))
+        {
+            Ok(_) => {}
+            Err(e) => {
+                // The extra newline before the assertion failure message makes the failure a
+                // bit easier to read when there's some generic boilerplate from the panic.
+                panic!("\n{}", e);
+            }
+        }
+    };
+
+    // w/ format args, specialized to unordered sequence:
+    ($actual:expr, { $($expected:expr),* }, $($format_args:expr),* $(,)?) => {
+        match $crate::verify_that!($actual, { $($expected),* })
+            .with_failure_message(|| format!($($format_args),*))
+        {
+            Ok(_) => {}
+            Err(e) => {
+                // The extra newline before the assertion failure message makes the failure a
+                // bit easier to read when there's some generic boilerplate from the panic.
+                panic!("\n{}", e);
+            }
+        }
+    };
+
+    // general case:
     ($actual:expr, $expected:expr $(,)?) => {
         match $crate::verify_that!($actual, $expected) {
             Ok(_) => {}
@@ -362,6 +1372,7 @@
         }
     };
 
+    // w/ format args, general case:
     ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
         match $crate::verify_that!($actual, $expected)
             .with_failure_message(|| format!($($format_args),*))
@@ -405,7 +1416,7 @@
 /// execution in the event of assertion failure.
 ///
 /// This can only be invoked inside tests with the
-/// [`googletest::test`][crate::test] attribute. The assertion must
+/// [`gtest`][crate::gtest] attribute. The assertion must
 /// occur in the same thread as that running the test itself.
 ///
 /// Invoking this macro is equivalent to using
@@ -442,12 +1453,43 @@
 /// ```
 #[macro_export]
 macro_rules! expect_that {
+    // specialized to sequence:
+    ($actual:expr, [$($expected:expr),*] $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, [$($expected),*]).and_log_failure();
+    }};
+
+    // specialized to unordered sequence:
+    ($actual:expr, {$($expected:expr),*} $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, {$($expected),*}).and_log_failure();
+    }};
+
+    // w/ format args, specialized to sequence:
+    ($actual:expr, [$($expected:expr),*], $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, [$($expected),*])
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure()
+    };
+
+    // w/ format args, specialized to unordered sequence:
+    ($actual:expr, {$($expected:expr),*}, $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, {$($expected),*})
+            .with_failure_message(|| format!($($format_args),*))
+            .and_log_failure()
+    };
+
+    // general case:
     ($actual:expr, $expected:expr $(,)?) => {{
-        use $crate::GoogleTestSupport;
+        use $crate::GoogleTestSupport as _;
         $crate::verify_that!($actual, $expected).and_log_failure();
     }};
 
+    // w/ format args, general case:
     ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
+        use $crate::GoogleTestSupport as _;
         $crate::verify_that!($actual, $expected)
             .with_failure_message(|| format!($($format_args),*))
             .and_log_failure()
@@ -461,7 +1503,7 @@
 /// continues execution in the event of assertion failure.
 ///
 /// This can only be invoked inside tests with the
-/// [`googletest::test`][crate::test] attribute. The assertion must
+/// [`gtest`][crate::gtest] attribute. The assertion must
 /// occur in the same thread as that running the test itself.
 ///
 /// Invoking this macro is equivalent to using
@@ -473,7 +1515,7 @@
 #[macro_export]
 macro_rules! expect_pred {
     ($($content:tt)*) => {{
-        use $crate::GoogleTestSupport;
+        use $crate::GoogleTestSupport as _;
         $crate::verify_pred!($($content)*).and_log_failure();
     }};
 }
@@ -484,50 +1526,142 @@
 #[doc(hidden)]
 pub mod internal {
     use crate::{
-        internal::{source_location::SourceLocation, test_outcome::TestAssertionFailure},
+        internal::test_outcome::TestAssertionFailure,
         matcher::{create_assertion_failure, Matcher, MatcherResult},
     };
     use std::fmt::Debug;
 
-    /// Checks whether the matcher `expected` matches the value `actual`, adding
-    /// a test failure report if it does not match.
-    ///
-    /// Returns `Ok(())` if the value matches and `Err(())` if it does not
-    /// match.
-    ///
-    /// **For internal use only. API stablility is not guaranteed!**
-    #[must_use = "The assertion result must be evaluated to affect the test result."]
-    pub fn check_matcher<T: Debug + ?Sized>(
-        actual: &T,
-        expected: impl Matcher<ActualT = T>,
-        actual_expr: &'static str,
-        source_location: SourceLocation,
-    ) -> Result<(), TestAssertionFailure> {
-        match expected.matches(actual) {
-            MatcherResult::Match => Ok(()),
-            MatcherResult::NoMatch => {
-                Err(create_assertion_failure(&expected, actual, actual_expr, source_location))
+    pub use ::googletest_macro::__googletest_macro_verify_pred;
+
+    /// Extension trait to perform autoref through method lookup in the
+    /// assertion macros. With this trait, the subject can be either a value
+    /// or a reference. For example, this trait makes the following code
+    /// compile and work:
+    /// ```
+    /// # use googletest::prelude::*;
+    /// # fn would_not_compile_without_autoref() -> Result<()> {
+    /// let not_copyable = vec![1,2,3];
+    /// verify_that!(not_copyable, empty())?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    /// See [Method Lookup](https://rustc-dev-guide.rust-lang.org/method-lookup.html)
+    pub trait Subject: Copy + Debug {
+        /// Checks whether the matcher `expected` matches the `Subject `self`,
+        /// adding a test failure report if it does not match.
+        ///
+        /// Returns `Ok(())` if the value matches and `Err(_)` if it does not
+        /// match.
+        ///
+        /// **For internal use only. API stablility is not guaranteed!**
+        #[must_use = "The assertion result must be evaluated to affect the test result."]
+        #[track_caller]
+        fn check(
+            self,
+            expected: impl Matcher<Self>,
+            actual_expr: &'static str,
+        ) -> Result<(), TestAssertionFailure> {
+            match expected.matches(self) {
+                MatcherResult::Match => Ok(()),
+                MatcherResult::NoMatch => {
+                    Err(create_assertion_failure(&expected, self, actual_expr))
+                }
             }
         }
     }
 
-    /// Constructs a `Result::Err(TestAssertionFailure)` for a predicate failure
-    /// as produced by the macro [`crate::verify_pred`].
+    impl<T: Copy + Debug> Subject for T {}
+
+    /// Creates a failure at specified location.
     ///
-    /// This intended only for use by the macro [`crate::verify_pred`].
-    ///
-    /// **For internal use only. API stablility is not guaranteed!**
+    /// **For internal use only. API stability is not guaranteed!**
     #[must_use = "The assertion result must be evaluated to affect the test result."]
-    pub fn report_failed_predicate(
-        actual_expr: &'static str,
-        formatted_arguments: Vec<String>,
-        source_location: SourceLocation,
-    ) -> Result<(), TestAssertionFailure> {
-        Err(TestAssertionFailure::create(format!(
-            "{} was false with\n  {}\n{}",
-            actual_expr,
-            formatted_arguments.join(",\n  "),
-            source_location,
-        )))
+    #[track_caller]
+    pub fn create_fail_result(message: String) -> crate::Result<()> {
+        Err(crate::internal::test_outcome::TestAssertionFailure::create(message))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+
+    #[test]
+    fn verify_of_hash_maps_with_str_string_matching() -> Result<()> {
+        let hash_map: std::collections::HashMap<String, String> =
+            std::collections::HashMap::from([("a".into(), "A".into()), ("b".into(), "B".into())]);
+        verify_eq!(hash_map, {("a", "A"), ("b", "B")})
+    }
+
+    #[test]
+    fn verify_of_hash_maps_with_ad_hoc_struct() -> Result<()> {
+        #[derive(PartialEq, Debug)]
+        struct Greek(String);
+
+        let hash_map: std::collections::HashMap<String, Greek> = std::collections::HashMap::from([
+            ("a".into(), Greek("Alpha".into())),
+            ("b".into(), Greek("Beta".into())),
+        ]);
+        verify_eq!(hash_map, {
+            ("b", Greek("Beta".into())),
+            ("a", Greek("Alpha".into())),
+        })
+    }
+
+    #[test]
+    fn verify_of_hash_maps_with_i32s() -> Result<()> {
+        let hash_map: std::collections::HashMap<i32, i32> =
+            std::collections::HashMap::from([(1, 1), (2, 4), (-1, 1), (-3, 9)]);
+        verify_eq!(hash_map, {
+            (-3, 9),
+            (-1, 1),
+            (1, 1),
+            (2, 4),
+        })
+    }
+
+    #[test]
+    fn verify_eq_of_unordered_pairs() -> Result<()> {
+        verify_eq!(vec![(1, 2), (2, 3)], {(1, 2), (2, 3)})?;
+        verify_eq!(vec![(1, 2), (2, 3)], {(2, 3), (1, 2)})
+    }
+
+    #[test]
+    fn verify_eq_of_unordered_structs() -> Result<()> {
+        #[derive(PartialEq, Debug)]
+        struct P(i32, i32);
+
+        verify_eq!(vec![P(1, 1), P(1, 2), P(3, 7)],
+                  {P(1, 1), P(1, 2), P(3, 7)})?;
+        verify_eq!(vec![P(1, 1), P(1, 2), P(3, 7)],
+                  {P(3,7), P(1, 1), P(1, 2)})
+    }
+
+    #[test]
+    fn verify_eq_of_ordered_pairs() -> Result<()> {
+        verify_eq!(vec![(1, 2), (2, 3)], [(1, 2), (2, 3)])
+    }
+
+    #[test]
+    fn verify_eq_of_ordered_structs() -> Result<()> {
+        #[derive(PartialEq, Debug)]
+        struct P(i32, i32);
+
+        verify_eq!(vec![P(1, 1), P(1, 2), P(3, 7)], [P(1, 1), P(1, 2), P(3, 7)])
+    }
+
+    #[test]
+    fn verify_eq_of_ordered_pairs_order_matters() -> Result<()> {
+        let result = verify_eq!(vec![(1, 2), (2, 3)], [(2, 3), (1, 2)]);
+        verify_that!(result, err(anything()))
+    }
+
+    #[test]
+    fn verify_eq_of_ordered_structs_order_matters() -> Result<()> {
+        #[derive(PartialEq, Debug)]
+        struct P(i32, i32);
+
+        let result = verify_eq!(vec![P(1, 1), P(1, 2), P(3, 7)], [P(3, 7), P(1, 1), P(1, 2)]);
+        verify_that!(result, err(anything()))
     }
 }

crates/googletest/src/description.rs

diff --git a/crates/googletest/src/description.rs b/crates/googletest/src/description.rs
index 9605559..e7339c1 100644
--- a/crates/googletest/src/description.rs
+++ b/crates/googletest/src/description.rs
@@ -89,6 +89,8 @@
 pub struct Description {
     elements: List,
     initial_indentation: usize,
+    is_conjunction: bool,
+    is_disjunction: bool,
 }
 
 impl Description {
@@ -199,6 +201,27 @@
     pub fn is_empty(&self) -> bool {
         self.elements.is_empty()
     }
+
+    pub(crate) fn push_in_last_nested(mut self, inner: Description) -> Self {
+        self.elements.push_at_end(inner.elements);
+        self
+    }
+
+    pub(crate) fn conjunction_description(self) -> Self {
+        Self { is_conjunction: true, ..self }
+    }
+
+    pub(crate) fn is_conjunction_description(&self) -> bool {
+        self.is_conjunction
+    }
+
+    pub(crate) fn disjunction_description(self) -> Self {
+        Self { is_disjunction: true, ..self }
+    }
+
+    pub(crate) fn is_disjunction_description(&self) -> bool {
+        self.is_disjunction
+    }
 }
 
 impl Display for Description {
@@ -359,4 +382,24 @@
             )))
         )
     }
+
+    #[test]
+    fn new_is_empty() -> Result<()> {
+        verify_that!(Description::new(), predicate(Description::is_empty))
+    }
+
+    #[test]
+    fn text_is_not_empty() -> Result<()> {
+        verify_that!(Description::new().text("something"), not(predicate(Description::is_empty)))
+    }
+
+    #[test]
+    fn new_zero_length() -> Result<()> {
+        verify_that!(Description::new().len(), eq(0))
+    }
+
+    #[test]
+    fn text_one_length() -> Result<()> {
+        verify_that!(Description::new().text("something").len(), eq(1))
+    }
 }

crates/googletest/src/fixtures.rs

diff --git a/crates/googletest/src/fixtures.rs b/crates/googletest/src/fixtures.rs
new file mode 100644
index 0000000..27fc7c2
--- /dev/null
+++ b/crates/googletest/src/fixtures.rs
@@ -0,0 +1,261 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::{
+    any::{Any, TypeId},
+    collections::HashMap,
+    ops::{Deref, DerefMut},
+    sync::{Mutex, OnceLock},
+};
+
+/// Interface for structure to be set up and torn down as part of a test.
+/// Types implementing `Fixture` can be passed as a reference argument to a
+/// test function.
+///
+/// ```ignore
+/// strct MyFixture { ... }
+///
+/// impl Fixture for MyFixture { ... }
+///
+/// #[gtest]
+/// fn test_with_fixture(my_fixture: &MyFixture) {...}
+/// ```
+pub trait Fixture: Sized {
+    /// Factory method of the `Fixture`.
+    ///
+    /// This method is called by the test harness before the test case
+    /// If this method returns an `Err(...)`, then the test case is not
+    /// evaluated and only the fixtures previously set up are torn down.
+    fn set_up() -> crate::Result<Self>;
+
+    /// Clean up method for the fixture.
+    ///
+    /// This method is called by the test harness after the test case.
+    /// If the `Fixture` has been set up, the test harness will call this
+    /// method, even if the test case failed or panicked.
+    fn tear_down(self) -> crate::Result<()>;
+}
+
+/// Interface for structure to be set up before the test case.
+/// Types implementing `ConsumableFixture` can be passed by value to
+/// a test function.
+///
+/// ```ignore
+/// strct MyFixture { ... }
+///
+/// impl ConsumableFixture for MyFixture { ... }
+///
+/// #[gtest]
+/// fn test_with_fixture(my_fixture: MyFixture) {...}
+/// ```
+pub trait ConsumableFixture: Sized {
+    /// Factory method of the `ConsumableFixture`.
+    ///
+    /// This method is called by the test harness before the test case.
+    /// If this method returns an `Err(...)`, then the test case is not
+    /// evaluated.
+    fn set_up() -> crate::Result<Self>;
+}
+
+/// Generic adapter to implement `ConsumableFixture` on any type implementing
+/// `Default`.
+pub struct FixtureOf<T>(T);
+
+impl<T: Default> ConsumableFixture for FixtureOf<T> {
+    fn set_up() -> crate::Result<Self> {
+        Ok(Self(T::default()))
+    }
+}
+
+impl<T> Deref for FixtureOf<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T> DerefMut for FixtureOf<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+/// Interface for structure to be set up only once before all tests.
+/// Types implementing `StaticFixture` can be passed as a double referenced
+/// argument to a test function.
+///
+/// ```ignore
+/// strct MyFixture{ ... }
+///
+/// impl StaticFixture for MyFixture { ... }
+///
+/// #[gtest]
+/// fn test_with_fixture(my_fixture: &&MyFixture){...}
+/// ```
+pub trait StaticFixture: Sized + Sync + Send {
+    /// Factory method of the `StaticFixture`.
+    ///
+    /// This method is called by the test harness before the first test case
+    /// using this fixture. If this method returns an `Err(...)`, then every
+    /// test cases using this fixture are not evaluated.
+    fn set_up_once() -> crate::Result<Self>;
+}
+
+impl<F: StaticFixture + 'static> Fixture for &'static F {
+    fn set_up() -> crate::Result<Self> {
+        static ONCE_FIXTURE_REPO: OnceLock<
+            Mutex<HashMap<TypeId, &'static (dyn Any + Sync + Send)>>,
+        > = OnceLock::new();
+        let mut map = ONCE_FIXTURE_REPO.get_or_init(|| Mutex::new(HashMap::new())).lock()?;
+        let any =
+            map.entry(TypeId::of::<F>()).or_insert_with(|| Box::leak(Box::new(F::set_up_once())));
+        match any.downcast_ref::<crate::Result<F>>() {
+            Some(Ok(ref fixture)) => Ok(fixture),
+            Some(Err(e)) => Err(e.clone()),
+            None => panic!("Downcast failed. This is a bug in GoogleTest Rust"),
+        }
+    }
+
+    // Note that this is `&F` being torn down, not `F`.
+    fn tear_down(self) -> crate::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use std::sync::Once;
+
+    use super::FixtureOf;
+    use super::StaticFixture;
+    use crate as googletest;
+    use crate::prelude::*;
+    use crate::test;
+
+    #[test]
+    fn fixture_no_fixture() -> Result<()> {
+        Ok(())
+    }
+
+    struct AlwaysSucceed;
+
+    impl Fixture for AlwaysSucceed {
+        fn set_up() -> crate::Result<Self> {
+            Ok(Self)
+        }
+
+        fn tear_down(self) -> crate::Result<()> {
+            Ok(())
+        }
+    }
+
+    #[test]
+    fn fixture_one_fixture(_: &AlwaysSucceed) -> Result<()> {
+        Ok(())
+    }
+
+    #[test]
+    fn fixture_three_fixtures(
+        _: &AlwaysSucceed,
+        _: &AlwaysSucceed,
+        _: &AlwaysSucceed,
+    ) -> Result<()> {
+        Ok(())
+    }
+
+    struct NotAFixture {
+        a_field: i32,
+    }
+
+    impl Default for NotAFixture {
+        fn default() -> Self {
+            Self { a_field: 33 }
+        }
+    }
+
+    #[test]
+    fn fixture_of_non_fixture(not_a_fixture: FixtureOf<NotAFixture>) -> Result<()> {
+        verify_that!(not_a_fixture.a_field, eq(33))
+    }
+
+    #[test]
+    fn fixture_of_non_fixture_mut(mut not_a_fixture: FixtureOf<NotAFixture>) -> Result<()> {
+        not_a_fixture.a_field += 10;
+        verify_that!(not_a_fixture.a_field, eq(43))
+    }
+    struct PanickyFixture;
+
+    impl Fixture for PanickyFixture {
+        fn set_up() -> crate::Result<Self> {
+            Ok(Self)
+        }
+
+        fn tear_down(self) -> crate::Result<()> {
+            panic!("Whoooops");
+        }
+    }
+
+    #[test]
+    #[should_panic(expected = "Whoooops")]
+    fn fixture_teardown_called_even_if_test_fail(_: &PanickyFixture) {
+        panic!("Test failed");
+    }
+
+    struct FailingTearDown;
+
+    impl Fixture for FailingTearDown {
+        fn set_up() -> crate::Result<Self> {
+            Ok(Self)
+        }
+
+        fn tear_down(self) -> crate::Result<()> {
+            Err(googletest::TestAssertionFailure::create("It must fail!".into()))
+        }
+    }
+
+    struct OnlyOnce;
+
+    impl StaticFixture for OnlyOnce {
+        fn set_up_once() -> crate::Result<Self> {
+            static ONCE: Once = Once::new();
+            assert!(!ONCE.is_completed());
+            ONCE.call_once(|| {});
+            Ok(Self)
+        }
+    }
+
+    #[test]
+    fn static_fixture_works(_: &&OnlyOnce) {}
+
+    #[test]
+    fn static_fixture_same_static_fixture_twice(once: &&OnlyOnce, twice: &&OnlyOnce) {
+        // checks it points to the same memory address.
+        let once: *const OnlyOnce = *once;
+        let twice: *const OnlyOnce = *twice;
+        expect_eq!(once, twice);
+    }
+
+    struct AnotherStaticFixture;
+
+    impl StaticFixture for AnotherStaticFixture {
+        fn set_up_once() -> crate::Result<Self> {
+            Ok(Self)
+        }
+    }
+
+    #[test]
+    fn static_fixture_two_different_static_fixtures(_: &&OnlyOnce, _: &&AnotherStaticFixture) {}
+}

crates/googletest/src/fmt.rs

diff --git a/crates/googletest/src/fmt.rs b/crates/googletest/src/fmt.rs
new file mode 100644
index 0000000..267b127
--- /dev/null
+++ b/crates/googletest/src/fmt.rs
@@ -0,0 +1,67 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Functions for use only by the procedural macros in this module.
+///
+/// **For internal use only. API stablility is not guaranteed!**
+#[doc(hidden)]
+pub mod internal {
+    use std::fmt::{Debug, Write};
+
+    /// Wrapper to allow for inherent-method specialization based on whether a
+    /// type implements `Debug`.
+    pub struct FormatWrapper<'a, T: ?Sized>(pub &'a T);
+
+    /// Default implementation to render values that implement `Debug`.
+    ///
+    /// Used for autoref specialization to conditionally
+    /// render only values that implement `Debug`. See also
+    /// [`FormatNonDebugFallback`].
+    impl<'a, T: Debug + ?Sized> FormatWrapper<'a, T> {
+        #[track_caller]
+        pub fn __googletest_write_expr_value(&self, output: &mut dyn Write, expr_label: &str) {
+            write!(output, "\n  {} = {:?},", expr_label, self.0)
+                .expect("Formatting to String should never fail");
+        }
+    }
+
+    /// Fallback implementation for rendering values for non-`Debug` types..
+    ///
+    /// Used for inherent-method specialization to conditionally render only
+    /// values that implement `Debug`. See also the specialized inherent impl on
+    /// [`FormatWrapper`] above.
+    pub trait FormatNonDebugFallback {
+        fn __googletest_write_expr_value(&self, output: &mut dyn Write, expr_label: &str);
+    }
+
+    impl<'a, T: ?Sized> FormatNonDebugFallback for FormatWrapper<'a, T> {
+        #[track_caller]
+        fn __googletest_write_expr_value(&self, output: &mut dyn Write, expr_label: &str) {
+            write!(output, "\n  {} does not implement Debug,", expr_label)
+                .expect("Formatting to String should never fail");
+        }
+    }
+
+    #[macro_export]
+    macro_rules! __googletest__write_expr_value(
+        ($output:expr, $expr_str:expr, $value:expr $(,)?) => {
+            {
+                use $crate::fmt::internal::FormatNonDebugFallback as _;
+                $crate::fmt::internal::FormatWrapper(&$value)
+                    .__googletest_write_expr_value(&mut $output, $expr_str)
+            }
+        }
+    );
+    pub use __googletest__write_expr_value;
+}

crates/googletest/src/internal/description_renderer.rs

diff --git a/crates/googletest/src/internal/description_renderer.rs b/crates/googletest/src/internal/description_renderer.rs
index 937f0d5..e84fabe 100644
--- a/crates/googletest/src/internal/description_renderer.rs
+++ b/crates/googletest/src/internal/description_renderer.rs
@@ -83,6 +83,17 @@
         self.0.is_empty()
     }
 
+    /// Append a new [`List`] in the last element which must be a
+    /// [`Block::Nested`]. Panic if `self` is empty or the last element is
+    /// not [`Block::Nested`].
+    pub(crate) fn push_at_end(&mut self, list: List) {
+        if let Some(Block::Nested(self_list)) = self.0.last_mut() {
+            self_list.push_nested(list);
+        } else {
+            panic!("pushing elements at the end of {self:#?} which last element is not Nested")
+        }
+    }
+
     fn render_with_prefix(
         &self,
         f: &mut dyn Write,

crates/googletest/src/internal/mod.rs

diff --git a/crates/googletest/src/internal/mod.rs b/crates/googletest/src/internal/mod.rs
index 9bccdc3..1269bc9 100644
--- a/crates/googletest/src/internal/mod.rs
+++ b/crates/googletest/src/internal/mod.rs
@@ -15,5 +15,4 @@
 #![doc(hidden)]
 
 pub(crate) mod description_renderer;
-pub mod source_location;
 pub mod test_outcome;

crates/googletest/src/internal/source_location.rs

diff --git a/crates/googletest/src/internal/source_location.rs b/crates/googletest/src/internal/source_location.rs
deleted file mode 100644
index 4520c92..0000000
--- a/crates/googletest/src/internal/source_location.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::fmt::{Display, Error, Formatter};
-
-/// Encapsulates a location in source code.
-///
-/// This is intended to report the location of an assertion which failed to
-/// stdout.
-///
-/// **For internal use only. API stablility is not guaranteed!**
-#[doc(hidden)]
-pub struct SourceLocation {
-    file: &'static str,
-    line: u32,
-    column: u32,
-}
-
-impl SourceLocation {
-    /// Constructs a new [`SourceLocation`].
-    ///
-    /// **For internal use only. API stablility is not guaranteed!**
-    #[doc(hidden)]
-    pub fn new(file: &'static str, line: u32, column: u32) -> Self {
-        Self { file, line, column }
-    }
-}
-
-impl Display for SourceLocation {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        write!(f, "  at {}:{}:{}", self.file, self.line, self.column)
-    }
-}

crates/googletest/src/internal/test_outcome.rs

diff --git a/crates/googletest/src/internal/test_outcome.rs b/crates/googletest/src/internal/test_outcome.rs
index 132ba99..edc8d2b 100644
--- a/crates/googletest/src/internal/test_outcome.rs
+++ b/crates/googletest/src/internal/test_outcome.rs
@@ -32,14 +32,13 @@
 }
 
 thread_local! {
-    static CURRENT_TEST_OUTCOME: RefCell<Option<TestOutcome>> = RefCell::new(None);
+    static CURRENT_TEST_OUTCOME: RefCell<Option<TestOutcome>> = const { RefCell::new(None) };
 }
 
 impl TestOutcome {
     /// Resets the current test's [`TestOutcome`].
     ///
-    /// This is intended only for use by the attribute macro
-    /// `#[googletest::test]`.
+    /// This is intended only for use by the attribute macro `#[gtest]`.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
@@ -86,6 +85,7 @@
 
     /// Returns a `Result` corresponding to the outcome of the currently running
     /// test.
+    #[track_caller]
     pub(crate) fn get_current_test_outcome() -> Result<(), TestAssertionFailure> {
         TestOutcome::with_current_test_outcome(|mut outcome| {
             let outcome = outcome
@@ -117,12 +117,12 @@
     }
 
     /// Ensure that there is a test context present and panic if there is not.
-    pub(crate) fn ensure_text_context_present() {
+    pub(crate) fn ensure_test_context_present() {
         TestOutcome::with_current_test_outcome(|outcome| {
             outcome.as_ref().expect(
                 "
 No test context found.
- * Did you annotate the test with googletest::test?
+ * Did you annotate the test with gtest?
  * Is the assertion running in the original test thread?
 ",
             );
@@ -162,14 +162,50 @@
     /// A human-readable formatted string describing the error.
     pub description: String,
     pub custom_message: Option<String>,
+    location: Location,
+}
+
+/// A code location.
+///
+/// `std::panic::Location` does not provide a constructor, hence we cannot
+/// construct a fake value.
+///
+/// **For internal use only. API stablility is not guaranteed!**
+#[doc(hidden)]
+#[derive(Clone)]
+enum Location {
+    Real(&'static std::panic::Location<'static>),
+    Fake { file: &'static str, line: u32, column: u32 },
+}
+
+impl Display for Location {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Location::Real(l) => write!(f, "{}", l),
+            Location::Fake { file, line, column } => write!(f, "{}:{}:{}", file, line, column),
+        }
+    }
 }
 
 impl TestAssertionFailure {
     /// Creates a new instance with the given `description`.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
+    #[track_caller]
     pub fn create(description: String) -> Self {
-        Self { description, custom_message: None }
+        Self {
+            description,
+            custom_message: None,
+            location: Location::Real(std::panic::Location::caller()),
+        }
+    }
+
+    /// Set `location`` to a fake value.
+    ///
+    /// **For internal use only. API stablility is not guaranteed!**
+    pub fn with_fake_location(mut self, file: &'static str, line: u32, column: u32) -> Self {
+        self.location = Location::Fake { file, line, column };
+        self
     }
 
     pub(crate) fn log(&self) {
@@ -184,7 +220,7 @@
         if let Some(custom_message) = &self.custom_message {
             writeln!(f, "{}", custom_message)?;
         }
-        Ok(())
+        writeln!(f, "  at {}", self.location)
     }
 }
 
@@ -198,6 +234,7 @@
 }
 
 impl<T: std::error::Error> From<T> for TestAssertionFailure {
+    #[track_caller]
     fn from(value: T) -> Self {
         TestAssertionFailure::create(format!("{value}"))
     }

crates/googletest/src/lib.rs

diff --git a/crates/googletest/src/lib.rs b/crates/googletest/src/lib.rs
index 51b6345..3f59546 100644
--- a/crates/googletest/src/lib.rs
+++ b/crates/googletest/src/lib.rs
@@ -22,11 +22,16 @@
 #[macro_use]
 pub mod assertions;
 pub mod description;
+pub mod fixtures;
+#[macro_use]
+pub mod fmt;
 pub mod internal;
 pub mod matcher;
 pub mod matcher_support;
 pub mod matchers;
 
+pub use googletest_macro::{__abbreviated_stringify, __googletest_macro_verify_pred};
+
 /// Re-exports of the symbols in this crate which are most likely to be used.
 ///
 /// This includes:
@@ -42,16 +47,25 @@
 /// }
 /// ```
 pub mod prelude {
-    pub use super::matcher::Matcher;
+    pub use super::fixtures::{ConsumableFixture, Fixture, FixtureOf, StaticFixture};
+    pub use super::gtest;
+    pub use super::matcher::{Matcher, MatcherBase};
     pub use super::matchers::*;
     pub use super::verify_current_test_outcome;
     pub use super::GoogleTestSupport;
     pub use super::IntoTestResult;
     pub use super::Result;
     // Assert macros
-    pub use super::{assert_that, expect_pred, expect_that, fail, verify_pred, verify_that};
+    pub use super::{
+        add_failure, add_failure_at, assert_pred, assert_that, expect_eq, expect_false,
+        expect_float_eq, expect_ge, expect_gt, expect_le, expect_lt, expect_ne, expect_near,
+        expect_pred, expect_that, expect_true, fail, succeed, verify_eq, verify_false,
+        verify_float_eq, verify_ge, verify_gt, verify_le, verify_lt, verify_ne, verify_near,
+        verify_pred, verify_that, verify_true,
+    };
 }
 
+pub use googletest_macro::gtest;
 pub use googletest_macro::test;
 
 use internal::test_outcome::{TestAssertionFailure, TestOutcome};
@@ -89,13 +103,12 @@
 /// `?` operator to continue execution of the test conditionally on there not
 /// having been any failure yet.
 ///
-/// This requires the use of the [`#[googletest::test]`][crate::test] attribute
-/// macro.
+/// This requires the use of the [`#[gtest]`][crate::gtest] attribute macro.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # /* Make sure this also compiles as a doctest.
-/// #[googletest::test]
+/// #[gtest]
 /// # */
 /// # fn foo() -> u32 { 1 }
 /// # fn bar() -> u32 { 2 }
@@ -108,6 +121,7 @@
 /// }
 /// # verify_that!(should_fail_and_not_execute_last_assertion(), err(displays_as(contains_substring("Test failed")))).unwrap();
 /// ```
+#[track_caller]
 pub fn verify_current_test_outcome() -> Result<()> {
     TestOutcome::get_current_test_outcome()
 }
@@ -203,7 +217,7 @@
 
 impl<T> GoogleTestSupport for std::result::Result<T, TestAssertionFailure> {
     fn and_log_failure(self) {
-        TestOutcome::ensure_text_context_present();
+        TestOutcome::ensure_test_context_present();
         if let Err(failure) = self {
             failure.log();
         }
@@ -229,44 +243,52 @@
 ///
 /// A type can implement this trait to provide an easy way to return immediately
 /// from a test in conjunction with the `?` operator. This is useful for
-/// [`Result`][std::result::Result] types whose `Result::Err` variant does not
-/// implement [`std::error::Error`].
+/// [`Option`] and [`Result`][std::result::Result] types whose `Result::Err`
+/// variant does not implement [`std::error::Error`].
 ///
-/// There is an implementation of this trait for [`anyhow::Error`] (which does
-/// not implement `std::error::Error`) when the `anyhow` feature is enabled.
-/// Importing this trait allows one to easily map [`anyhow::Error`] to a test
-/// failure:
+/// If `Result::Err` implements [`std::error::Error`] you can just use the `?`
+/// operator directly.
 ///
 /// ```ignore
 /// #[test]
-/// fn should_work() -> Result<()> {
+/// fn should_work() -> googletest::Result<()> {
 ///     let value = something_which_can_fail().into_test_result()?;
+///     let value = something_which_can_fail_with_option().into_test_result()?;
 ///     ...
 /// }
 ///
-/// fn something_which_can_fail() -> anyhow::Result<...> { ... }
+/// fn something_which_can_fail() -> std::result::Result<T, String> { ... }
+/// fn something_which_can_fail_with_option() -> Option<T> { ... }
 /// ```
 pub trait IntoTestResult<T> {
     /// Converts this instance into a [`Result`].
     ///
-    /// Typically, the `Self` type is itself a [`std::result::Result`]. This
-    /// method should then map the `Err` variant to a [`TestAssertionFailure`]
-    /// and leave the `Ok` variant unchanged.
+    /// Typically, the `Self` type is itself an implementation of the
+    /// [`std::ops::Try`] trait. This method should then map the `Residual`
+    /// variant to a [`TestAssertionFailure`] and leave the `Output` variant
+    /// unchanged.
     fn into_test_result(self) -> Result<T>;
 }
 
-#[cfg(feature = "anyhow")]
-impl<T> IntoTestResult<T> for std::result::Result<T, anyhow::Error> {
+impl<T, E: std::fmt::Debug> IntoTestResult<T> for std::result::Result<T, E> {
+    #[track_caller]
     fn into_test_result(self) -> std::result::Result<T, TestAssertionFailure> {
-        self.map_err(|e| TestAssertionFailure::create(format!("{e}")))
+        match self {
+            Ok(t) => Ok(t),
+            Err(e) => Err(TestAssertionFailure::create(format!("{e:?}"))),
+        }
     }
 }
 
-#[cfg(feature = "proptest")]
-impl<OkT, CaseT: std::fmt::Debug> IntoTestResult<OkT>
-    for std::result::Result<OkT, proptest::test_runner::TestError<CaseT>>
-{
-    fn into_test_result(self) -> std::result::Result<OkT, TestAssertionFailure> {
-        self.map_err(|e| TestAssertionFailure::create(format!("{e}")))
+impl<T> IntoTestResult<T> for Option<T> {
+    #[track_caller]
+    fn into_test_result(self) -> std::result::Result<T, TestAssertionFailure> {
+        match self {
+            Some(t) => Ok(t),
+            None => Err(TestAssertionFailure::create(format!(
+                "called `Option::into_test_result()` on a `Option::<{}>::None` value",
+                std::any::type_name::<T>()
+            ))),
+        }
     }
 }

crates/googletest/src/matcher.rs

diff --git a/crates/googletest/src/matcher.rs b/crates/googletest/src/matcher.rs
index 071b0d1..948ea41 100644
--- a/crates/googletest/src/matcher.rs
+++ b/crates/googletest/src/matcher.rs
@@ -15,24 +15,35 @@
 //! The components required to implement matchers.
 
 use crate::description::Description;
-use crate::internal::source_location::SourceLocation;
 use crate::internal::test_outcome::TestAssertionFailure;
 use crate::matchers::__internal_unstable_do_not_depend_on_these::ConjunctionMatcher;
 use crate::matchers::__internal_unstable_do_not_depend_on_these::DisjunctionMatcher;
+pub use googletest_macro::MatcherBase;
 use std::fmt::Debug;
 
 /// An interface for checking an arbitrary condition on a datum.
-pub trait Matcher {
-    /// The type against which this matcher matches.
-    type ActualT: Debug + ?Sized;
+///
+/// This trait is automatically implemented for a reference of any type
+/// implementing `Matcher`. This simplifies reusing a matcher in different
+/// assertions.
+///
+/// It is also implemented for tuple of `Matcher`. If `MatcherT: Matcher<T>` and
+/// `MatcherU: Matcher<U>`, then `(MatcherT, MatcherU): Matcher<(T, U)>`, and so
+/// on, up to 12 elements. Tuples longer than that do not automatically inherit
+/// the `Debug` trait from their members, so are generally not well-supported;
+/// see [Rust by Example](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html#tuples).
 
+// `ActualT` requires `Copy` so that `actual` could be passed to `matches` and
+// if it fails passed to `explain_match`. We can relax this constraint later by
+// requiring only `Clone`.
+pub trait Matcher<ActualT: Debug + Copy>: MatcherBase {
     /// Returns whether the condition matches the datum `actual`.
     ///
     /// The trait implementation defines what it means to "match". Often the
     /// matching condition is based on data stored in the matcher. For example,
     /// `eq` matches when its stored expected value is equal (in the sense of
     /// the `==` operator) to the value `actual`.
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult;
+    fn matches(&self, actual: ActualT) -> MatcherResult;
 
     /// Returns a description of `self` or a negative description if
     /// `matcher_result` is `DoesNotMatch`.
@@ -117,8 +128,8 @@
     /// inner matcher and appears as follows:
     ///
     /// ```ignore
-    /// fn explain_match(&self, actual: &Self::ActualT) -> Description {
-    ///     self.expected.explain_match(actual.deref())
+    /// fn explain_match(&self, actual: &ActualT) -> Description {
+    ///     self.expected.explain_match(*actual)
     /// }
     /// ```
     ///
@@ -127,16 +138,30 @@
     /// inner matcher at a point where a relative clause would fit. For example:
     ///
     /// ```ignore
-    /// fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    /// fn explain_match(&self, actual: ActualT) -> Description {
     ///     Description::new()
     ///         .text("which points to a value")
-    ///         .nested(self.expected.explain_match(actual.deref()))
+    ///         .nested(self.expected.explain_match(*actual))
     /// }
     /// ```
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         format!("which {}", self.describe(self.matches(actual))).into()
     }
+}
 
+/// Base trait for matchers. Any type implementing `Matcher` must implement
+/// `MatcherBase`, but that should be done through the `#[derive(MatcherBase)]`
+/// macro.
+// The `and` and `or` functions cannot be part of the `Matcher` trait since it
+// can be implemented multiple times for a given matcher type. Consider that
+// `and` and `or` are part of the `Matcher` trait and `MyMatcher` implements
+// both `Matcher<A>` and `Matcher<B>`. Then `MyMatcher{...}.and(...)` can be
+// either:
+//   * `Matcher::<A>::and(MyMatcher{...}, ...)` or
+//   * `Matcher::<B>::and(MyMatcher{...}, ...)`.
+// Moving the `and` and `or` functions in a non-generic trait removes this
+// confusion by making `and` and `or` unique for a given type.
+pub trait MatcherBase {
     /// Constructs a matcher that matches both `self` and `right`.
     ///
     /// ```
@@ -160,10 +185,7 @@
     // TODO(b/264518763): Replace the return type with impl Matcher and reduce
     // visibility of ConjunctionMatcher once impl in return position in trait
     // methods is stable.
-    fn and<Right: Matcher<ActualT = Self::ActualT>>(
-        self,
-        right: Right,
-    ) -> ConjunctionMatcher<Self, Right>
+    fn and<Right>(self, right: Right) -> ConjunctionMatcher<Self, Right>
     where
         Self: Sized,
     {
@@ -190,10 +212,7 @@
     // TODO(b/264518763): Replace the return type with impl Matcher and reduce
     // visibility of DisjunctionMatcher once impl in return position in trait
     // methods is stable.
-    fn or<Right: Matcher<ActualT = Self::ActualT>>(
-        self,
-        right: Right,
-    ) -> DisjunctionMatcher<Self, Right>
+    fn or<Right>(self, right: Right) -> DisjunctionMatcher<Self, Right>
     where
         Self: Sized,
     {
@@ -210,11 +229,11 @@
 ///
 /// The parameter `actual_expr` contains the expression which was evaluated to
 /// obtain `actual`.
-pub(crate) fn create_assertion_failure<T: Debug + ?Sized>(
-    matcher: &impl Matcher<ActualT = T>,
-    actual: &T,
+#[track_caller]
+pub(crate) fn create_assertion_failure<T: Debug + Copy>(
+    matcher: &impl Matcher<T>,
+    actual: T,
     actual_expr: &'static str,
-    source_location: SourceLocation,
 ) -> TestAssertionFailure {
     let actual_formatted = format!("{actual:?}");
     let actual_formatted = if actual_formatted.len() > PRETTY_PRINT_LENGTH_THRESHOLD {
@@ -227,8 +246,7 @@
 Value of: {actual_expr}
 Expected: {}
 Actual: {actual_formatted},
-{}
-{source_location}",
+{}",
         matcher.describe(MatcherResult::Match),
         matcher.explain_match(actual).indent(),
     ))
@@ -245,7 +263,11 @@
 
 impl From<bool> for MatcherResult {
     fn from(b: bool) -> Self {
-        if b { MatcherResult::Match } else { MatcherResult::NoMatch }
+        if b {
+            MatcherResult::Match
+        } else {
+            MatcherResult::NoMatch
+        }
     }
 }
 
@@ -268,3 +290,39 @@
         matches!(self, MatcherResult::NoMatch)
     }
 }
+
+impl<M: ?Sized + MatcherBase> MatcherBase for &M {}
+
+impl<T: Debug + Copy, M: Matcher<T>> Matcher<T> for &M {
+    fn matches(&self, actual: T) -> MatcherResult {
+        (*self).matches(actual)
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        (*self).describe(matcher_result)
+    }
+
+    fn explain_match(&self, actual: T) -> Description {
+        (*self).explain_match(actual)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+
+    #[test]
+    fn ref_matchers_can_be_reused() -> Result<()> {
+        let matcher = eq(1);
+
+        verify_that!(1, &matcher)?;
+        verify_that!(1, &matcher)
+    }
+
+    #[test]
+    fn ref_matchers_as_inner_matcher() -> Result<()> {
+        let matcher = gt(1);
+
+        verify_that!([2, 3, 4, 5], [&matcher, &matcher, &matcher, &matcher])
+    }
+}

crates/googletest/src/matcher_support/auto_eq.rs

diff --git a/crates/googletest/src/matcher_support/auto_eq.rs b/crates/googletest/src/matcher_support/auto_eq.rs
new file mode 100644
index 0000000..16bfde3
--- /dev/null
+++ b/crates/googletest/src/matcher_support/auto_eq.rs
@@ -0,0 +1,106 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![doc(hidden)]
+
+/// Macro that wraps the expression with `eq(...)` if the expression is
+/// not a matcher.
+///
+/// This is useful to let users pass expected value to macro matchers like
+/// `field!` and `property!`.
+///`
+/// **For internal use only. API stablility is not guaranteed!**
+/// If you are interested in using it in your matcher, please file an issue to
+/// stabilize this.
+#[macro_export]
+macro_rules! __auto_eq {
+    ($e:expr) => {{
+        #[allow(unused_imports)]
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::ExpectedKind as _;
+        match $e {
+            expected => {
+                $crate::matcher_support::__internal_unstable_do_not_depend_on_these::Wrapper(
+                    &expected,
+                )
+                .kind()
+                .matcher(expected)
+            }
+        }
+    }};
+}
+
+// This reimplements the pattern presented in
+// https://github.com/dtolnay/case-studies/issues/14
+pub mod internal {
+    use crate::{
+        matcher::MatcherBase,
+        matchers::{eq, EqMatcher},
+    };
+
+    pub struct Wrapper<T>(pub T);
+
+    impl<'a, T: MatcherBase> Wrapper<&'a T> {
+        #[inline]
+        pub fn kind(&self) -> MatcherTag {
+            MatcherTag
+        }
+    }
+
+    pub trait ExpectedKind {
+        #[inline]
+        fn kind(&self) -> ExpectedTag {
+            ExpectedTag
+        }
+    }
+
+    impl<T> ExpectedKind for Wrapper<T> {}
+
+    pub struct MatcherTag;
+
+    impl MatcherTag {
+        #[inline]
+        pub fn matcher<M>(self, matcher: M) -> M {
+            matcher
+        }
+    }
+    pub struct ExpectedTag;
+
+    impl ExpectedTag {
+        #[inline]
+        pub fn matcher<T>(self, expected: T) -> EqMatcher<T> {
+            eq(expected)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+
+    #[test]
+    fn auto_ref_matcher() -> Result<()> {
+        verify_that!(123, __auto_eq!(ge(9)))
+    }
+
+    #[test]
+    fn auto_ref_expected() -> Result<()> {
+        verify_that!(123, __auto_eq!(123))
+    }
+
+    #[test]
+    fn auto_ref_on_ref_matcher() -> Result<()> {
+        let matcher = eq(123);
+        verify_that!(123, __auto_eq!(&matcher))
+    }
+}

crates/googletest/src/matcher_support/count_elements.rs

diff --git a/crates/googletest/src/matcher_support/count_elements.rs b/crates/googletest/src/matcher_support/count_elements.rs
index 662dcc9..6d6b8e6 100644
--- a/crates/googletest/src/matcher_support/count_elements.rs
+++ b/crates/googletest/src/matcher_support/count_elements.rs
@@ -18,10 +18,7 @@
 /// unambiguous answer, i.e., the upper bound exists and the lower and upper
 /// bounds agree. Otherwise it iterates through `value` and counts the
 /// elements.
-pub(crate) fn count_elements<ContainerT: ?Sized>(value: &ContainerT) -> usize
-where
-    for<'b> &'b ContainerT: IntoIterator,
-{
+pub(crate) fn count_elements<ContainerT: IntoIterator>(value: ContainerT) -> usize {
     let iterator = value.into_iter();
     if let (lower, Some(higher)) = iterator.size_hint() {
         if lower == higher {
@@ -30,3 +27,53 @@
     }
     iterator.count()
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use crate::prelude::*;
+
+    #[test]
+    fn count_elements_vec() -> Result<()> {
+        verify_that!(count_elements(vec![1, 2, 3]), eq(3))
+    }
+
+    #[test]
+    fn count_elements_with_imprecise_hint() -> Result<()> {
+        struct FakeIterator;
+
+        impl Iterator for FakeIterator {
+            type Item = ();
+
+            fn next(&mut self) -> Option<Self::Item> {
+                None
+            }
+
+            fn size_hint(&self) -> (usize, Option<usize>) {
+                (0, Some(123))
+            }
+        }
+
+        verify_that!(count_elements(FakeIterator), eq(0))
+    }
+
+    #[test]
+    fn count_elements_with_no_hint() -> Result<()> {
+        struct FakeIterator;
+
+        impl Iterator for FakeIterator {
+            type Item = ();
+
+            fn next(&mut self) -> Option<Self::Item> {
+                None
+            }
+
+            fn size_hint(&self) -> (usize, Option<usize>) {
+                (0, None)
+            }
+        }
+
+        verify_that!(count_elements(FakeIterator), eq(0))
+    }
+}

crates/googletest/src/matcher_support/edit_distance.rs

diff --git a/crates/googletest/src/matcher_support/edit_distance.rs b/crates/googletest/src/matcher_support/edit_distance.rs
index 8847bc9..f5e1b9a 100644
--- a/crates/googletest/src/matcher_support/edit_distance.rs
+++ b/crates/googletest/src/matcher_support/edit_distance.rs
@@ -289,7 +289,7 @@
     #[test]
     fn returns_equal_when_strings_are_equal() -> Result<()> {
         let result = edit_list(["A string"], ["A string"], Mode::Exact);
-        verify_that!(result, matches_pattern!(Difference::Equal))
+        verify_that!(result, matches_pattern!(&Difference::Equal))
     }
 
     #[test]
@@ -299,7 +299,7 @@
             ["A string (1)", "A string (2)"],
             Mode::Exact,
         );
-        verify_that!(result, matches_pattern!(Difference::Equal))
+        verify_that!(result, matches_pattern!(&Difference::Equal))
     }
 
     #[test]
@@ -307,8 +307,8 @@
         let result = edit_list(["A string"], [], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![matches_pattern!(
-                Edit::ExtraActual(eq("A string"))
+            matches_pattern!(&Difference::Editable(ref elements_are![matches_pattern!(
+                &Edit::ExtraActual(eq("A string"))
             )]))
         )
     }
@@ -318,8 +318,8 @@
         let result = edit_list([], ["A string"], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![matches_pattern!(
-                Edit::ExtraExpected(eq("A string"))
+            matches_pattern!(&Difference::Editable(ref elements_are![matches_pattern!(
+                &Edit::ExtraExpected(eq("A string"))
             )]))
         )
     }
@@ -329,9 +329,9 @@
         let result = edit_list(["A string"], ["Another string"], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("A string"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Another string"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("A string"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Another string"))),
             ]))
         )
     }
@@ -342,11 +342,11 @@
             edit_list(["A string", "A string"], ["Another string", "Another string"], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("A string"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Another string"))),
-                matches_pattern!(Edit::ExtraActual(eq("A string"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Another string"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("A string"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Another string"))),
+                matches_pattern!(&Edit::ExtraActual(eq("A string"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Another string"))),
             ]))
         )
     }
@@ -360,10 +360,10 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part"))),
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part"))),
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
             ]))
         )
     }
@@ -373,9 +373,9 @@
         let result = edit_list(["Common part", "Actual only"], ["Common part"], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part"))),
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part"))),
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
             ]))
         )
     }
@@ -385,9 +385,9 @@
         let result = edit_list(["Common part"], ["Common part", "Expected only"], Mode::Exact);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
             ]))
         )
     }
@@ -401,10 +401,10 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
-                matches_pattern!(Edit::Both(eq("Common part"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
+                matches_pattern!(&Edit::Both(eq("Common part"))),
             ]))
         )
     }
@@ -419,19 +419,19 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("Actual only (1)"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only (1)"))),
-                matches_pattern!(Edit::Both(eq("Common part"))),
-                matches_pattern!(Edit::ExtraActual(eq("Actual only (2)"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only (2)"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only (1)"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only (1)"))),
+                matches_pattern!(&Edit::Both(eq("Common part"))),
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only (2)"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only (2)"))),
             ]))
         )
     }
 
     #[test]
-    fn returns_common_part_plus_difference_plus_common_part_when_there_is_common_prefix_and_suffix()
-    -> Result<()> {
+    fn returns_common_part_plus_difference_plus_common_part_when_there_is_common_prefix_and_suffix(
+    ) -> Result<()> {
         let result = edit_list(
             ["Common part (1)", "Actual only", "Common part (2)"],
             ["Common part (1)", "Expected only", "Common part (2)"],
@@ -439,18 +439,18 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part (1)"))),
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
-                matches_pattern!(Edit::Both(eq("Common part (2)"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part (1)"))),
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
+                matches_pattern!(&Edit::Both(eq("Common part (2)"))),
             ]))
         )
     }
 
     #[test]
-    fn returns_common_part_plus_extra_actual_plus_common_part_when_there_is_common_prefix_and_suffix()
-    -> Result<()> {
+    fn returns_common_part_plus_extra_actual_plus_common_part_when_there_is_common_prefix_and_suffix(
+    ) -> Result<()> {
         let result = edit_list(
             ["Common part (1)", "Actual only", "Common part (2)"],
             ["Common part (1)", "Common part (2)"],
@@ -458,17 +458,17 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part (1)"))),
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::Both(eq("Common part (2)"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part (1)"))),
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::Both(eq("Common part (2)"))),
             ]))
         )
     }
 
     #[test]
-    fn returns_common_part_plus_extra_expected_plus_common_part_when_there_is_common_prefix_and_suffix()
-    -> Result<()> {
+    fn returns_common_part_plus_extra_expected_plus_common_part_when_there_is_common_prefix_and_suffix(
+    ) -> Result<()> {
         let result = edit_list(
             ["Common part (1)", "Common part (2)"],
             ["Common part (1)", "Expected only", "Common part (2)"],
@@ -476,10 +476,10 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::Both(eq("Common part (1)"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
-                matches_pattern!(Edit::Both(eq("Common part (2)"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::Both(eq("Common part (1)"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
+                matches_pattern!(&Edit::Both(eq("Common part (2)"))),
             ]))
         )
     }
@@ -493,15 +493,15 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(not(contains(matches_pattern!(
-                Edit::ExtraActual(eq("Actual only"))
+            matches_pattern!(&Difference::Editable(ref not(contains(matches_pattern!(
+                &Edit::ExtraActual(eq("Actual only"))
             )))))
         )
     }
 
     #[test]
-    fn does_not_skip_extra_parts_on_actual_in_prefix_mode_at_end_when_they_are_in_common()
-    -> Result<()> {
+    fn does_not_skip_extra_parts_on_actual_in_prefix_mode_at_end_when_they_are_in_common(
+    ) -> Result<()> {
         let result = edit_list(
             ["Actual only", "Common part"],
             ["Expected only", "Common part"],
@@ -509,24 +509,24 @@
         );
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
-                matches_pattern!(Edit::Both(eq("Common part"))),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
+                matches_pattern!(&Edit::Both(eq("Common part"))),
             ]))
         )
     }
 
     #[test]
-    fn does_not_skip_corresponding_line_on_actual_when_actual_and_expected_differ_in_prefix_mode()
-    -> Result<()> {
+    fn does_not_skip_corresponding_line_on_actual_when_actual_and_expected_differ_in_prefix_mode(
+    ) -> Result<()> {
         let result = edit_list(["Actual only"], ["Expected only"], Mode::Prefix);
         verify_that!(
             result,
-            matches_pattern!(Difference::Editable(elements_are![
-                matches_pattern!(Edit::ExtraActual(eq("Actual only"))),
-                matches_pattern!(Edit::ExtraExpected(eq("Expected only"))),
-                matches_pattern!(Edit::AdditionalActual),
+            matches_pattern!(&Difference::Editable(ref elements_are![
+                matches_pattern!(&Edit::ExtraActual(eq("Actual only"))),
+                matches_pattern!(&Edit::ExtraExpected(eq("Expected only"))),
+                matches_pattern!(&Edit::AdditionalActual),
             ]))
         )
     }
@@ -534,7 +534,7 @@
     #[test]
     fn returns_unrelated_when_maximum_distance_exceeded() -> Result<()> {
         let result = edit_list(0..=50, 60..110, Mode::Exact);
-        verify_that!(result, matches_pattern!(Difference::Unrelated))
+        verify_that!(result, matches_pattern!(&Difference::Unrelated))
     }
 
     quickcheck! {

crates/googletest/src/matcher_support/mod.rs

diff --git a/crates/googletest/src/matcher_support/mod.rs b/crates/googletest/src/matcher_support/mod.rs
index 8a72ba4..8e138a1 100644
--- a/crates/googletest/src/matcher_support/mod.rs
+++ b/crates/googletest/src/matcher_support/mod.rs
@@ -18,7 +18,13 @@
 //! these facilities could be useful to downstream users writing custom
 //! matchers.
 
+mod auto_eq;
 pub(crate) mod count_elements;
 pub(crate) mod edit_distance;
 pub(crate) mod summarize_diff;
 pub(crate) mod zipped_iterator;
+
+pub mod __internal_unstable_do_not_depend_on_these {
+    pub use super::auto_eq::internal::{ExpectedKind, Wrapper};
+    pub use crate::__auto_eq as auto_eq;
+}

crates/googletest/src/matcher_support/summarize_diff.rs

diff --git a/crates/googletest/src/matcher_support/summarize_diff.rs b/crates/googletest/src/matcher_support/summarize_diff.rs
index cd4efa7..b7cf641 100644
--- a/crates/googletest/src/matcher_support/summarize_diff.rs
+++ b/crates/googletest/src/matcher_support/summarize_diff.rs
@@ -17,7 +17,7 @@
 use crate::matcher_support::edit_distance;
 #[rustversion::since(1.70)]
 use std::io::IsTerminal;
-use std::{borrow::Cow, fmt::Display};
+use std::{borrow::Cow, cell::Cell, fmt::Display};
 
 /// Returns a string describing how the expected and actual lines differ.
 ///
@@ -38,10 +38,29 @@
         // line-by-line diff.
         return "".into();
     }
+
     match edit_distance::edit_list(actual_debug.lines(), expected_debug.lines(), diff_mode) {
-        edit_distance::Difference::Equal => "No difference found between debug strings.".into(),
+        edit_distance::Difference::Equal => {
+            // str.lines() is oblivious to the last newline in a
+            // string, so we need to check this to make sure we don't spuriously
+            // claim that 'hello' and 'hello\n' are identical debug strings.
+            //
+            // Although we would have liked to resolve by replacing
+            // str::lines() with str::split('\n'), the potentially
+            // empty last element interferes with good diff output for
+            // "contains" checks.
+            let actual_newline_terminated = actual_debug.ends_with('\n');
+            let expected_newline_terminated = expected_debug.ends_with('\n');
+            if actual_newline_terminated && !expected_newline_terminated {
+                "Actual includes a terminating newline that is absent from expected.".into()
+            } else if !actual_newline_terminated && expected_newline_terminated {
+                "Actual omits a terminating newline that is present in expected.".into()
+            } else {
+                "No difference found between debug strings.".into()
+            }
+        }
         edit_distance::Difference::Editable(edit_list) => {
-            format!("\n{}{}", summary_header(), edit_list.into_iter().collect::<BufferedSummary>(),)
+            format!("{}{}", summary_header(), edit_list.into_iter().collect::<BufferedSummary>(),)
                 .into()
         }
         edit_distance::Difference::Unrelated => "".into(),
@@ -73,7 +92,7 @@
         edit_distance::Difference::Equal => "No difference found between debug strings.".into(),
         edit_distance::Difference::Editable(mut edit_list) => {
             edit_list.reverse();
-            format!("\n{}{}", summary_header(), edit_list.into_iter().collect::<BufferedSummary>(),)
+            format!("{}{}", summary_header(), edit_list.into_iter().collect::<BufferedSummary>(),)
                 .into()
         }
         edit_distance::Difference::Unrelated => "".into(),
@@ -81,9 +100,9 @@
 }
 
 // Produces the header, with or without coloring depending on
-// stdout_supports_color()
+// USE_COLOR
 fn summary_header() -> Cow<'static, str> {
-    if stdout_supports_color() {
+    if USE_COLOR.with(Cell::get) {
         format!(
             "Difference(-{ACTUAL_ONLY_STYLE}actual{RESET_ALL} / +{EXPECTED_ONLY_STYLE}expected{RESET_ALL}):"
         ).into()
@@ -105,11 +124,11 @@
 impl<'a> BufferedSummary<'a> {
     // Appends a new line which is common to both actual and expected.
     fn feed_common_lines(&mut self, common_line: &'a str) {
-        if let Buffer::CommonLineBuffer(ref mut common_lines) = self.buffer {
+        if let Buffer::CommonLines(ref mut common_lines) = self.buffer {
             common_lines.push(common_line);
         } else {
             self.flush_buffer();
-            self.buffer = Buffer::CommonLineBuffer(vec![common_line]);
+            self.buffer = Buffer::CommonLines(vec![common_line]);
         }
     }
 
@@ -229,7 +248,7 @@
 
 enum Buffer<'a> {
     Empty,
-    CommonLineBuffer(Vec<&'a str>),
+    CommonLines(Vec<&'a str>),
     ExtraActualLineChunk(&'a str),
     ExtraExpectedLineChunk(&'a str),
 }
@@ -238,7 +257,7 @@
     fn flush(&mut self, summary: &mut SummaryBuilder) {
         match self {
             Buffer::Empty => {}
-            Buffer::CommonLineBuffer(common_lines) => {
+            Buffer::CommonLines(common_lines) => {
                 Self::flush_common_lines(std::mem::take(common_lines), summary);
             }
             Buffer::ExtraActualLineChunk(extra_actual) => {
@@ -294,8 +313,13 @@
     }
 }
 
+thread_local! {
+  pub(crate) static USE_COLOR: Cell<bool> = Cell::new(stdout_supports_color());
+}
+
 #[rustversion::since(1.70)]
 fn stdout_supports_color() -> bool {
+    #[allow(clippy::incompatible_msrv)]
     match (is_env_var_set("NO_COLOR"), is_env_var_set("FORCE_COLOR")) {
         (true, _) => false,
         (false, true) => true,
@@ -305,7 +329,7 @@
 
 #[rustversion::not(since(1.70))]
 fn stdout_supports_color() -> bool {
-    is_env_var_set("FORCE_COLOR")
+    is_env_var_set("FORCE_COLOR") && !is_env_var_set("NO_COLOR")
 }
 
 fn is_env_var_set(var: &'static str) -> bool {
@@ -388,14 +412,14 @@
     }
 
     fn reset_ansi(&mut self) {
-        if !self.last_ansi_style.is_empty() && stdout_supports_color() {
+        if !self.last_ansi_style.is_empty() && USE_COLOR.with(Cell::get) {
             self.summary.push_str(RESET_ALL);
             self.last_ansi_style = "";
         }
     }
 
     fn set_ansi(&mut self, ansi_style: &'static str) {
-        if !stdout_supports_color() || self.last_ansi_style == ansi_style {
+        if !USE_COLOR.with(Cell::get) || self.last_ansi_style == ansi_style {
             return;
         }
         if !self.last_ansi_style.is_empty() {
@@ -411,7 +435,6 @@
     use super::*;
     use crate::{matcher_support::edit_distance::Mode, prelude::*};
     use indoc::indoc;
-    use serial_test::{parallel, serial};
     use std::fmt::Write;
 
     // Make a long text with each element of the iterator on one line.
@@ -427,13 +450,11 @@
     }
 
     #[test]
-    #[parallel]
     fn create_diff_smaller_than_one_line() -> Result<()> {
         verify_that!(create_diff("One", "Two", Mode::Exact), eq(""))
     }
 
     #[test]
-    #[parallel]
     fn create_diff_exact_same() -> Result<()> {
         let expected = indoc! {"
             One
@@ -450,7 +471,6 @@
     }
 
     #[test]
-    #[parallel]
     fn create_diff_multiline_diff() -> Result<()> {
         let expected = indoc! {"
             prefix
@@ -469,7 +489,6 @@
             create_diff(expected, actual, Mode::Exact),
             eq(indoc!(
                 "
-
                 Difference(-actual / +expected):
                  prefix
                 -Actual#1
@@ -483,19 +502,16 @@
     }
 
     #[test]
-    #[parallel]
     fn create_diff_exact_unrelated() -> Result<()> {
         verify_that!(create_diff(&build_text(1..500), &build_text(501..1000), Mode::Exact), eq(""))
     }
 
     #[test]
-    #[parallel]
     fn create_diff_exact_small_difference() -> Result<()> {
         verify_that!(
             create_diff(&build_text(1..50), &build_text(1..51), Mode::Exact),
             eq(indoc! {
                 "
-
                 Difference(-actual / +expected):
                  1
                  2
@@ -507,33 +523,14 @@
         )
     }
 
-    // Test with color enabled.
-
-    struct ForceColor;
-
-    fn force_color() -> ForceColor {
-        std::env::set_var("FORCE_COLOR", "1");
-        std::env::remove_var("NO_COLOR");
-        ForceColor
-    }
-
-    impl Drop for ForceColor {
-        fn drop(&mut self) {
-            std::env::remove_var("FORCE_COLOR");
-            std::env::set_var("NO_COLOR", "1");
-        }
-    }
-
     #[test]
-    #[serial]
     fn create_diff_exact_small_difference_with_color() -> Result<()> {
-        let _keep = force_color();
+        USE_COLOR.with(|cell| cell.set(true));
 
         verify_that!(
             create_diff(&build_text(1..50), &build_text(1..51), Mode::Exact),
             eq(indoc! {
                 "
-
                 Difference(-\x1B[1;31mactual\x1B[0m / +\x1B[1;32mexpected\x1B[0m):
                  1
                  2
@@ -546,9 +543,9 @@
     }
 
     #[test]
-    #[serial]
     fn create_diff_exact_difference_with_inline_color() -> Result<()> {
-        let _keep = force_color();
+        USE_COLOR.with(|cell| cell.set(true));
+
         let actual = indoc!(
             "There is a home in Nouvelle Orleans
             They say, it is the rising sons
@@ -565,7 +562,6 @@
             create_diff(actual, expected, Mode::Exact),
             eq(indoc! {
                 "
-
                 Difference(-\x1B[1;31mactual\x1B[0m / +\x1B[1;32mexpected\x1B[0m):
                 -\x1B[31mThere is a ho\x1B[0m\x1B[1;31mm\x1B[0m\x1B[31me in N\x1B[0m\x1B[1;31mouv\x1B[0m\x1B[31me\x1B[0m\x1B[1;31mlle\x1B[0m\x1B[31m Orleans\x1B[0m
                 +\x1B[32mThere is a ho\x1B[0m\x1B[1;32mus\x1B[0m\x1B[32me \x1B[0m\x1B[1;32mway down \x1B[0m\x1B[32min Ne\x1B[0m\x1B[1;32mw\x1B[0m\x1B[32m Orleans\x1B[0m
@@ -576,4 +572,20 @@
             })
         )
     }
+
+    #[test]
+    fn create_diff_line_termination_diff() -> Result<()> {
+        verify_that!(
+            create_diff("1\n2\n3", "1\n2\n3\n", Mode::Exact),
+            eq("Actual omits a terminating newline that is present in expected.")
+        )?;
+        verify_that!(
+            create_diff("1\n2\n3\n", "1\n2\n3", Mode::Exact),
+            eq("Actual includes a terminating newline that is absent from expected.")
+        )?;
+        verify_that!(
+            create_diff("1\n2\n3\n", "1\n2\n3\n", Mode::Exact),
+            eq("No difference found between debug strings.")
+        )
+    }
 }

crates/googletest/src/matchers/all_matcher.rs

diff --git a/crates/googletest/src/matchers/all_matcher.rs b/crates/googletest/src/matchers/all_matcher.rs
index f2e6d06..d03e7d4 100644
--- a/crates/googletest/src/matchers/all_matcher.rs
+++ b/crates/googletest/src/matchers/all_matcher.rs
@@ -38,7 +38,7 @@
 /// ```
 ///
 /// Using this macro is equivalent to using the
-/// [`and`][crate::matcher::Matcher::and] method:
+/// [`and`][crate::matcher::MatcherBase::and] method:
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -50,109 +50,41 @@
 /// ```
 ///
 /// Assertion failure messages are not guaranteed to be identical, however.
+///
+///  If an inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+///
+/// verify_that!(123, all![123, lt(1000), gt(100)])
+/// #     .unwrap();
+/// ```
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __all {
-    ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::AllMatcher;
-        AllMatcher::new([$(Box::new($matcher)),*])
+    ($(,)?) => {{
+        $crate::matchers::anything()
+    }} ;
+    ($matcher:expr $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        auto_eq!($matcher)
+    }};
+    ($head:expr, $head2:expr $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::ConjunctionMatcher::new(auto_eq!($head), auto_eq!($head2))
+    }};
+    ($head:expr, $head2:expr, $($tail:expr),+ $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        $crate::__all![
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::ConjunctionMatcher::new(auto_eq!($head), auto_eq!($head2)),
+            $($tail),+
+        ]
     }}
 }
 
-/// Functionality needed by the [`all`] macro.
-///
-/// For internal use only. API stablility is not guaranteed!
-#[doc(hidden)]
-pub mod internal {
-    use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
-    use crate::matchers::anything;
-    use std::fmt::Debug;
-
-    /// A matcher which matches an input value matched by all matchers in the
-    /// array `components`.
-    ///
-    /// For internal use only. API stablility is not guaranteed!
-    #[doc(hidden)]
-    pub struct AllMatcher<'a, T: Debug + ?Sized, const N: usize> {
-        components: [Box<dyn Matcher<ActualT = T> + 'a>; N],
-    }
-
-    impl<'a, T: Debug + ?Sized, const N: usize> AllMatcher<'a, T, N> {
-        /// Constructs an [`AllMatcher`] with the given component matchers.
-        ///
-        /// Intended for use only by the [`all`] macro.
-        pub fn new(components: [Box<dyn Matcher<ActualT = T> + 'a>; N]) -> Self {
-            Self { components }
-        }
-    }
-
-    impl<'a, T: Debug + ?Sized, const N: usize> Matcher for AllMatcher<'a, T, N> {
-        type ActualT = T;
-
-        fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-            for component in &self.components {
-                match component.matches(actual) {
-                    MatcherResult::NoMatch => {
-                        return MatcherResult::NoMatch;
-                    }
-                    MatcherResult::Match => {}
-                }
-            }
-            MatcherResult::Match
-        }
-
-        fn explain_match(&self, actual: &Self::ActualT) -> Description {
-            match N {
-                0 => anything::<T>().explain_match(actual),
-                1 => self.components[0].explain_match(actual),
-                _ => {
-                    let failures = self
-                        .components
-                        .iter()
-                        .filter(|component| component.matches(actual).is_no_match())
-                        .collect::<Vec<_>>();
-
-                    if failures.len() == 1 {
-                        failures[0].explain_match(actual)
-                    } else {
-                        Description::new()
-                            .collect(
-                                failures
-                                    .into_iter()
-                                    .map(|component| component.explain_match(actual)),
-                            )
-                            .bullet_list()
-                    }
-                }
-            }
-        }
-
-        fn describe(&self, matcher_result: MatcherResult) -> Description {
-            match N {
-                0 => anything::<T>().describe(matcher_result),
-                1 => self.components[0].describe(matcher_result),
-                _ => {
-                    let header = if matcher_result.into() {
-                        "has all the following properties:"
-                    } else {
-                        "has at least one of the following properties:"
-                    };
-                    Description::new().text(header).nested(
-                        Description::new()
-                            .bullet_list()
-                            .collect(self.components.iter().map(|m| m.describe(matcher_result))),
-                    )
-                }
-            }
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use super::internal;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -160,10 +92,10 @@
     fn description_shows_more_than_one_matcher() -> Result<()> {
         let first_matcher = starts_with("A");
         let second_matcher = ends_with("string");
-        let matcher: internal::AllMatcher<String, 2> = all!(first_matcher, second_matcher);
+        let matcher = all!(first_matcher, second_matcher);
 
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<&String>::describe(&matcher, MatcherResult::Match),
             displays_as(eq(indoc!(
                 "
                 has all the following properties:
@@ -176,10 +108,10 @@
     #[test]
     fn description_shows_one_matcher_directly() -> Result<()> {
         let first_matcher = starts_with("A");
-        let matcher: internal::AllMatcher<String, 1> = all!(first_matcher);
+        let matcher = all!(first_matcher);
 
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<&String>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("starts with prefix \"A\""))
         )
     }
@@ -189,7 +121,7 @@
     {
         let first_matcher = starts_with("Another");
         let second_matcher = ends_with("string");
-        let matcher: internal::AllMatcher<str, 2> = all!(first_matcher, second_matcher);
+        let matcher = all!(first_matcher, second_matcher);
 
         verify_that!(
             matcher.explain_match("A string"),
@@ -200,11 +132,16 @@
     #[test]
     fn mismatch_description_is_simple_when_only_one_consistuent() -> Result<()> {
         let first_matcher = starts_with("Another");
-        let matcher: internal::AllMatcher<str, 1> = all!(first_matcher);
+        let matcher = all!(first_matcher);
 
         verify_that!(
             matcher.explain_match("A string"),
             displays_as(eq("which does not start with \"Another\""))
         )
     }
+
+    #[test]
+    fn all_with_auto_eq() -> Result<()> {
+        verify_that!(42, all![eq(42), 42, lt(100)])
+    }
 }

crates/googletest/src/matchers/any_matcher.rs

diff --git a/crates/googletest/src/matchers/any_matcher.rs b/crates/googletest/src/matchers/any_matcher.rs
index 95d53fe..6f988c8 100644
--- a/crates/googletest/src/matchers/any_matcher.rs
+++ b/crates/googletest/src/matchers/any_matcher.rs
@@ -40,7 +40,7 @@
 /// ```
 ///
 /// Using this macro is equivalent to using the
-/// [`or`][crate::matcher::Matcher::or] method:
+/// [`or`][crate::matcher::MatcherBase::or] method:
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -52,107 +52,41 @@
 /// ```
 ///
 /// Assertion failure messages are not guaranteed to be identical, however.
+///
+///  If an inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+///
+/// verify_that!(123, any![lt(1), 123, gt(1000)])
+/// #     .unwrap();
+/// ```
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __any {
-    ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::AnyMatcher;
-        AnyMatcher::new([$(Box::new($matcher)),*])
+    ($(,)?) => {{
+        $crate::matchers::not($crate::matchers::anything())
+    }} ;
+    ($matcher:expr $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        auto_eq!($matcher)
+    }};
+    ($head:expr, $head2:expr $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::DisjunctionMatcher::new(auto_eq!($head), auto_eq!($head2))
+    }};
+    ($head:expr, $head2:expr, $($tail:expr),+ $(,)?) => {{
+        use $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq;
+        $crate::__any![
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::DisjunctionMatcher::new(auto_eq!($head), auto_eq!($head2)),
+            $($tail),+
+        ]
     }}
 }
 
-/// Functionality needed by the [`any`] macro.
-///
-/// For internal use only. API stablility is not guaranteed!
-#[doc(hidden)]
-pub mod internal {
-    use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
-    use crate::matchers::anything;
-    use std::fmt::Debug;
-
-    /// A matcher which matches an input value matched by all matchers in the
-    /// array `components`.
-    ///
-    /// For internal use only. API stablility is not guaranteed!
-    #[doc(hidden)]
-    pub struct AnyMatcher<'a, T: Debug + ?Sized, const N: usize> {
-        components: [Box<dyn Matcher<ActualT = T> + 'a>; N],
-    }
-
-    impl<'a, T: Debug + ?Sized, const N: usize> AnyMatcher<'a, T, N> {
-        /// Constructs an [`AnyMatcher`] with the given component matchers.
-        ///
-        /// Intended for use only by the [`all`] macro.
-        pub fn new(components: [Box<dyn Matcher<ActualT = T> + 'a>; N]) -> Self {
-            Self { components }
-        }
-    }
-
-    impl<'a, T: Debug + ?Sized, const N: usize> Matcher for AnyMatcher<'a, T, N> {
-        type ActualT = T;
-
-        fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-            MatcherResult::from(self.components.iter().any(|c| c.matches(actual).is_match()))
-        }
-
-        fn explain_match(&self, actual: &Self::ActualT) -> Description {
-            match N {
-                0 => format!("which {}", anything::<T>().describe(MatcherResult::NoMatch)).into(),
-                1 => self.components[0].explain_match(actual),
-                _ => {
-                    let failures = self
-                        .components
-                        .iter()
-                        .filter(|component| component.matches(actual).is_no_match())
-                        .collect::<Vec<_>>();
-
-                    if failures.len() == 1 {
-                        failures[0].explain_match(actual)
-                    } else {
-                        Description::new()
-                            .collect(
-                                failures
-                                    .into_iter()
-                                    .map(|component| component.explain_match(actual)),
-                            )
-                            .bullet_list()
-                    }
-                }
-            }
-        }
-
-        fn describe(&self, matcher_result: MatcherResult) -> Description {
-            match N {
-                0 => anything::<T>().describe(matcher_result),
-                1 => self.components[0].describe(matcher_result),
-                _ => {
-                    let properties = self
-                        .components
-                        .iter()
-                        .map(|m| m.describe(matcher_result))
-                        .collect::<Description>()
-                        .bullet_list()
-                        .indent();
-                    format!(
-                        "{}:\n{properties}",
-                        if matcher_result.into() {
-                            "has at least one of the following properties"
-                        } else {
-                            "has none of the following properties"
-                        }
-                    )
-                    .into()
-                }
-            }
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use super::internal;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -160,10 +94,10 @@
     fn description_shows_more_than_one_matcher() -> Result<()> {
         let first_matcher = starts_with("A");
         let second_matcher = ends_with("string");
-        let matcher: internal::AnyMatcher<String, 2> = any!(first_matcher, second_matcher);
+        let matcher = any!(first_matcher, second_matcher);
 
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<&String>::describe(&matcher, MatcherResult::Match),
             displays_as(eq(indoc!(
                 "
                 has at least one of the following properties:
@@ -176,10 +110,10 @@
     #[test]
     fn description_shows_one_matcher_directly() -> Result<()> {
         let first_matcher = starts_with("A");
-        let matcher: internal::AnyMatcher<String, 1> = any!(first_matcher);
+        let matcher = any!(first_matcher);
 
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("starts with prefix \"A\""))
         )
     }
@@ -189,7 +123,7 @@
     {
         let first_matcher = starts_with("Another");
         let second_matcher = ends_with("string");
-        let matcher: internal::AnyMatcher<str, 2> = any!(first_matcher, second_matcher);
+        let matcher = any!(first_matcher, second_matcher);
 
         verify_that!(
             matcher.explain_match("A string"),
@@ -200,11 +134,21 @@
     #[test]
     fn mismatch_description_is_simple_when_only_one_constituent() -> Result<()> {
         let first_matcher = starts_with("Another");
-        let matcher: internal::AnyMatcher<str, 1> = any!(first_matcher);
+        let matcher = any!(first_matcher);
 
         verify_that!(
             matcher.explain_match("A string"),
             displays_as(eq("which does not start with \"Another\""))
         )
     }
+
+    #[test]
+    fn empty_any_matcher_never_matches() -> Result<()> {
+        verify_that!(123, not(any![]))
+    }
+
+    #[test]
+    fn any_with_auto_eq() -> Result<()> {
+        verify_that!(42, any![1, 2, 42, gt(123)])
+    }
 }

crates/googletest/src/matchers/anything_matcher.rs

diff --git a/crates/googletest/src/matchers/anything_matcher.rs b/crates/googletest/src/matchers/anything_matcher.rs
index 36be478..a920974 100644
--- a/crates/googletest/src/matchers/anything_matcher.rs
+++ b/crates/googletest/src/matchers/anything_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches anything. This matcher always succeeds.
 ///
@@ -32,16 +32,15 @@
 /// # }
 /// # should_pass().unwrap();
 /// ```
-pub fn anything<T: Debug + ?Sized>() -> impl Matcher<ActualT = T> {
-    Anything::<T>(Default::default())
+pub fn anything() -> Anything {
+    Anything
 }
 
-struct Anything<T: ?Sized>(PhantomData<T>);
+#[derive(MatcherBase)]
+pub struct Anything;
 
-impl<T: Debug + ?Sized> Matcher for Anything<T> {
-    type ActualT = T;
-
-    fn matches(&self, _: &T) -> MatcherResult {
+impl<T: Debug + Copy> Matcher<T> for Anything {
+    fn matches(&self, _: T) -> MatcherResult {
         MatcherResult::Match
     }
 
@@ -55,7 +54,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::anything;
     use crate::prelude::*;
 
     #[test]

crates/googletest/src/matchers/bool_matcher.rs

diff --git a/crates/googletest/src/matchers/bool_matcher.rs b/crates/googletest/src/matchers/bool_matcher.rs
new file mode 100644
index 0000000..380e011
--- /dev/null
+++ b/crates/googletest/src/matchers/bool_matcher.rs
@@ -0,0 +1,99 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+    description::Description,
+    matcher::{Matcher, MatcherBase, MatcherResult},
+};
+
+/// Matches boolean value `true`.
+pub fn is_true() -> BoolMatcher {
+    BoolMatcher { expected: true }
+}
+
+/// Matches boolean value `false`.
+pub fn is_false() -> BoolMatcher {
+    BoolMatcher { expected: false }
+}
+
+/// Matches a bool value or bool reference.
+#[derive(MatcherBase)]
+pub struct BoolMatcher {
+    expected: bool,
+}
+
+impl BoolMatcher {
+    fn matches(&self, actual: bool) -> MatcherResult {
+        (actual == self.expected).into()
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        match (matcher_result, self.expected) {
+            (MatcherResult::Match, true) | (MatcherResult::NoMatch, false) => "is true".into(),
+            (MatcherResult::Match, false) | (MatcherResult::NoMatch, true) => "is false".into(),
+        }
+    }
+}
+
+impl Matcher<bool> for BoolMatcher {
+    fn matches(&self, actual: bool) -> MatcherResult {
+        self.matches(actual)
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        self.describe(matcher_result)
+    }
+}
+
+impl<'a> Matcher<&'a bool> for BoolMatcher {
+    fn matches(&self, actual: &'a bool) -> MatcherResult {
+        self.matches(*actual)
+    }
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        self.describe(matcher_result)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::prelude::*;
+
+    #[test]
+    fn match_value() -> Result<()> {
+        verify_that!(true, is_true())?;
+        verify_that!(true, not(is_false()))?;
+        verify_that!(false, is_false())?;
+        verify_that!(false, not(is_true()))
+    }
+
+    #[test]
+    fn match_ref() -> Result<()> {
+        let t = true;
+        let f = false;
+
+        verify_that!(&t, is_true())?;
+        verify_that!(&t, not(is_false()))?;
+        verify_that!(&f, is_false())?;
+        verify_that!(&f, not(is_true()))
+    }
+
+    #[test]
+    fn describe() {
+        assert_eq!(is_true().describe(MatcherResult::Match).to_string(), "is true");
+        assert_eq!(is_true().describe(MatcherResult::NoMatch).to_string(), "is false");
+        assert_eq!(is_false().describe(MatcherResult::Match).to_string(), "is false");
+        assert_eq!(is_false().describe(MatcherResult::NoMatch).to_string(), "is true");
+    }
+}

crates/googletest/src/matchers/char_count_matcher.rs

diff --git a/crates/googletest/src/matchers/char_count_matcher.rs b/crates/googletest/src/matchers/char_count_matcher.rs
index 70977d7..4f11edd 100644
--- a/crates/googletest/src/matchers/char_count_matcher.rs
+++ b/crates/googletest/src/matchers/char_count_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a string whose number of Unicode scalars matches `expected`.
 ///
@@ -56,22 +56,18 @@
 /// # }
 /// # should_pass().unwrap();
 /// ```
-pub fn char_count<T: Debug + ?Sized + AsRef<str>, E: Matcher<ActualT = usize>>(
-    expected: E,
-) -> impl Matcher<ActualT = T> {
-    CharLenMatcher { expected, phantom: Default::default() }
+pub fn char_count<E: Matcher<usize>>(expected: E) -> CharLenMatcher<E> {
+    CharLenMatcher { expected }
 }
 
-struct CharLenMatcher<T: ?Sized, E> {
+#[derive(MatcherBase)]
+pub struct CharLenMatcher<E> {
     expected: E,
-    phantom: PhantomData<T>,
 }
 
-impl<T: Debug + ?Sized + AsRef<str>, E: Matcher<ActualT = usize>> Matcher for CharLenMatcher<T, E> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
-        self.expected.matches(&actual.as_ref().chars().count())
+impl<T: Debug + Copy + AsRef<str>, E: Matcher<usize>> Matcher<T> for CharLenMatcher<E> {
+    fn matches(&self, actual: T) -> MatcherResult {
+        self.expected.matches(actual.as_ref().chars().count())
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -89,12 +85,12 @@
         }
     }
 
-    fn explain_match(&self, actual: &T) -> Description {
+    fn explain_match(&self, actual: T) -> Description {
         let actual_size = actual.as_ref().chars().count();
         format!(
             "which has character count {}, {}",
             actual_size,
-            self.expected.explain_match(&actual_size)
+            self.expected.explain_match(actual_size)
         )
         .into()
     }
@@ -102,13 +98,11 @@
 
 #[cfg(test)]
 mod tests {
-    use super::char_count;
     use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::fmt::Debug;
-    use std::marker::PhantomData;
 
     #[test]
     fn char_count_matches_string_slice() -> Result<()> {
@@ -130,11 +124,11 @@
 
     #[test]
     fn char_count_explains_match() -> Result<()> {
-        struct TestMatcher<T>(PhantomData<T>);
-        impl<T: Debug> Matcher for TestMatcher<T> {
-            type ActualT = T;
+        #[derive(MatcherBase)]
+        struct TestMatcher;
 
-            fn matches(&self, _: &T) -> MatcherResult {
+        impl<T: Debug + Copy> Matcher<T> for TestMatcher {
+            fn matches(&self, _: T) -> MatcherResult {
                 false.into()
             }
 
@@ -142,12 +136,12 @@
                 "called described".into()
             }
 
-            fn explain_match(&self, _: &T) -> Description {
+            fn explain_match(&self, _: T) -> Description {
                 "called explain_match".into()
             }
         }
         verify_that!(
-            char_count(TestMatcher(Default::default())).explain_match(&"A string"),
+            char_count(TestMatcher).explain_match("A string"),
             displays_as(eq("which has character count 8, called explain_match"))
         )
     }

crates/googletest/src/matchers/conjunction_matcher.rs

diff --git a/crates/googletest/src/matchers/conjunction_matcher.rs b/crates/googletest/src/matchers/conjunction_matcher.rs
index dc50833..b2e2e27 100644
--- a/crates/googletest/src/matchers/conjunction_matcher.rs
+++ b/crates/googletest/src/matchers/conjunction_matcher.rs
@@ -17,56 +17,87 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
 use std::fmt::Debug;
 
-/// Matcher created by [`Matcher::and`].
+/// Matcher created by [`Matcher::and`] and [`all!`].
+///
+/// Both [`Matcher::and`] and [`all!`] nest on m1. In other words,
+/// both `x.and(y).and(z)` and `all![x, y, z]` produce:
+/// ```ignore
+/// ConjunctionMatcher {
+///     m1: ConjunctionMatcher {
+///         m1: x,
+///         m2: y
+///     },
+///     m2: z
+/// }
+/// ```
+///
+/// This behavior must be respected
+/// to ensure that [`Matcher::explain_match`] and [`Matcher::describe`] produce
+/// useful descriptions.
 ///
 /// **For internal use only. API stablility is not guaranteed!**
 #[doc(hidden)]
+#[derive(MatcherBase)]
 pub struct ConjunctionMatcher<M1, M2> {
     m1: M1,
     m2: M2,
 }
 
 impl<M1, M2> ConjunctionMatcher<M1, M2> {
-    pub(crate) fn new(m1: M1, m2: M2) -> Self {
+    pub fn new(m1: M1, m2: M2) -> Self {
         Self { m1, m2 }
     }
 }
 
-impl<M1: Matcher, M2: Matcher<ActualT = M1::ActualT>> Matcher for ConjunctionMatcher<M1, M2>
-where
-    M1::ActualT: Debug,
-{
-    type ActualT = M1::ActualT;
-
-    fn matches(&self, actual: &M1::ActualT) -> MatcherResult {
+impl<T: Debug + Copy, M1: Matcher<T>, M2: Matcher<T>> Matcher<T> for ConjunctionMatcher<M1, M2> {
+    fn matches(&self, actual: T) -> MatcherResult {
         match (self.m1.matches(actual), self.m2.matches(actual)) {
             (MatcherResult::Match, MatcherResult::Match) => MatcherResult::Match,
             _ => MatcherResult::NoMatch,
         }
     }
 
-    fn explain_match(&self, actual: &M1::ActualT) -> Description {
+    fn explain_match(&self, actual: T) -> Description {
         match (self.m1.matches(actual), self.m2.matches(actual)) {
-            (MatcherResult::Match, MatcherResult::Match) => Description::new()
-                .nested(self.m1.explain_match(actual))
-                .text("and")
-                .nested(self.m2.explain_match(actual)),
             (MatcherResult::NoMatch, MatcherResult::Match) => self.m1.explain_match(actual),
             (MatcherResult::Match, MatcherResult::NoMatch) => self.m2.explain_match(actual),
-            (MatcherResult::NoMatch, MatcherResult::NoMatch) => Description::new()
-                .nested(self.m1.explain_match(actual))
-                .text("and")
-                .nested(self.m2.explain_match(actual)),
+            (_, _) => {
+                let m1_description = self.m1.explain_match(actual);
+                if m1_description.is_conjunction_description() {
+                    m1_description.nested(self.m2.explain_match(actual))
+                } else {
+                    Description::new()
+                        .bullet_list()
+                        .collect([m1_description, self.m2.explain_match(actual)])
+                        .conjunction_description()
+                }
+            }
         }
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
-        format!("{}, and {}", self.m1.describe(matcher_result), self.m2.describe(matcher_result))
-            .into()
+        let m1_description = self.m1.describe(matcher_result);
+        if m1_description.is_conjunction_description() {
+            m1_description.push_in_last_nested(self.m2.describe(matcher_result))
+        } else {
+            let header = if matcher_result.into() {
+                "has all the following properties:"
+            } else {
+                "has at least one of the following properties:"
+            };
+            Description::new()
+                .text(header)
+                .nested(
+                    Description::new()
+                        .bullet_list()
+                        .collect([m1_description, self.m2.describe(matcher_result)]),
+                )
+                .conjunction_description()
+        }
     }
 }
 
@@ -88,7 +119,9 @@
             err(displays_as(contains_substring(indoc!(
                 "
                 Value of: 1
-                Expected: is anything, and never matches
+                Expected: has all the following properties:
+                  * is anything
+                  * never matches
                 Actual: 1,
                   which is anything
                 "
@@ -104,7 +137,9 @@
             err(displays_as(contains_substring(indoc!(
                 "
                     Value of: 1
-                    Expected: never matches, and is anything
+                    Expected: has all the following properties:
+                      * never matches
+                      * is anything
                     Actual: 1,
                       which is anything
                 "
@@ -120,11 +155,37 @@
             err(displays_as(contains_substring(indoc!(
                 "
                 Value of: 1
-                Expected: never matches, and never matches
+                Expected: has all the following properties:
+                  * never matches
+                  * never matches
                 Actual: 1,
-                    which is anything
-                  and
-                    which is anything
+                  * which is anything
+                  * which is anything
+                "
+            ))))
+        )
+    }
+
+    #[test]
+    fn and_long_chain_of_matchers() -> Result<()> {
+        let result = verify_that!(
+            1,
+            anything().and(not(anything())).and(anything()).and(not(anything())).and(anything())
+        );
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                Value of: 1
+                Expected: has all the following properties:
+                  * is anything
+                  * never matches
+                  * is anything
+                  * never matches
+                  * is anything
+                Actual: 1,
+                  * which is anything
+                  * which is anything
                 "
             ))))
         )
@@ -132,7 +193,7 @@
 
     #[test]
     fn chained_and_matches() -> Result<()> {
-        #[derive(Debug)]
+        #[derive(Debug, Clone, Copy)]
         struct Struct {
             a: i32,
             b: i32,

crates/googletest/src/matchers/container_eq_matcher.rs

diff --git a/crates/googletest/src/matchers/container_eq_matcher.rs b/crates/googletest/src/matchers/container_eq_matcher.rs
index d4f872c..7eb0933 100644
--- a/crates/googletest/src/matchers/container_eq_matcher.rs
+++ b/crates/googletest/src/matchers/container_eq_matcher.rs
@@ -13,9 +13,8 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use std::fmt::Debug;
-use std::marker::PhantomData;
 
 /// Matches a container equal (in the sense of `==`) to `expected`.
 ///
@@ -30,15 +29,12 @@
 ///   Unexpected: [4]
 /// ```
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
+/// The actual value must be a container such as a `&Vec`, an array, or a
+/// dereferenced slice. More precisely, the actual value must
 /// implement [`IntoIterator`] whose `Item` type implements
 /// [`PartialEq<ExpectedT>`], where `ExpectedT` is the element type of the
 /// expected value.
 ///
-/// If the container type is a `Vec`, then the expected type may be a slice of
-/// the same element type. For example:
-///
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
@@ -49,78 +45,40 @@
 /// # should_pass().unwrap();
 /// ```
 ///
-/// As an exception, if the actual type is a `Vec<String>`, the expected type
-/// may be a slice of `&str`:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # fn should_pass() -> Result<()> {
-/// let vec: Vec<String> = vec!["A string".into(), "Another string".into()];
-/// verify_that!(vec, container_eq(["A string", "Another string"]))?;
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-///
-/// These exceptions allow one to avoid unnecessary allocations in test
-/// assertions.
-///
-/// One can also check container equality of a slice with an array. To do so,
-/// dereference the slice:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # fn should_pass() -> Result<()> {
-/// let value = &[1, 2, 3];
-/// verify_that!(*value, container_eq([1, 2, 3]))?;
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-///
-/// Otherwise, the actual and expected types must be identical.
-///
 /// *Performance note*: In the event of a mismatch leading to an assertion
 /// failure, the construction of the lists of missing and unexpected values
 /// uses a naive algorithm requiring time proportional to the product of the
 /// sizes of the expected and actual values. This should therefore only be used
 /// when the containers are small enough that this is not a problem.
-// This returns ContainerEqMatcher and not impl Matcher because
-// ContainerEqMatcher has some specialisations for slice types (see
-// documentation above). Returning impl Matcher would hide those from the
-// compiler.
-pub fn container_eq<ActualContainerT, ExpectedContainerT>(
+pub fn container_eq<ExpectedContainerT>(
     expected: ExpectedContainerT,
-) -> ContainerEqMatcher<ActualContainerT, ExpectedContainerT>
+) -> ContainerEqMatcher<ExpectedContainerT>
 where
-    ActualContainerT: PartialEq<ExpectedContainerT> + Debug + ?Sized,
     ExpectedContainerT: Debug,
 {
-    ContainerEqMatcher { expected, phantom: Default::default() }
+    ContainerEqMatcher { expected }
 }
 
-pub struct ContainerEqMatcher<ActualContainerT: ?Sized, ExpectedContainerT> {
+#[derive(MatcherBase)]
+pub struct ContainerEqMatcher<ExpectedContainerT> {
     expected: ExpectedContainerT,
-    phantom: PhantomData<ActualContainerT>,
 }
 
-impl<ActualElementT, ActualContainerT, ExpectedElementT, ExpectedContainerT> Matcher
-    for ContainerEqMatcher<ActualContainerT, ExpectedContainerT>
+impl<ActualElementT, ActualContainerT, ExpectedElementT, ExpectedContainerT>
+    Matcher<ActualContainerT> for ContainerEqMatcher<ExpectedContainerT>
 where
-    ActualElementT: PartialEq<ExpectedElementT> + Debug + ?Sized,
-    ActualContainerT: PartialEq<ExpectedContainerT> + Debug + ?Sized,
+    ActualElementT: for<'a> PartialEq<&'a ExpectedElementT> + Debug + Copy,
+    ActualContainerT: for<'a> PartialEq<&'a ExpectedContainerT> + Debug + Copy,
     ExpectedElementT: Debug,
     ExpectedContainerT: Debug,
-    for<'a> &'a ActualContainerT: IntoIterator<Item = &'a ActualElementT>,
+    ActualContainerT: IntoIterator<Item = ActualElementT>,
     for<'a> &'a ExpectedContainerT: IntoIterator<Item = &'a ExpectedElementT>,
 {
-    type ActualT = ActualContainerT;
-
-    fn matches(&self, actual: &ActualContainerT) -> MatcherResult {
-        (*actual == self.expected).into()
+    fn matches(&self, actual: ActualContainerT) -> MatcherResult {
+        (actual == &self.expected).into()
     }
 
-    fn explain_match(&self, actual: &ActualContainerT) -> Description {
+    fn explain_match(&self, actual: ActualContainerT) -> Description {
         build_explanation(self.get_missing_items(actual), self.get_unexpected_items(actual)).into()
     }
 
@@ -132,20 +90,32 @@
     }
 }
 
-impl<ActualElementT, ActualContainerT, ExpectedElementT, ExpectedContainerT>
-    ContainerEqMatcher<ActualContainerT, ExpectedContainerT>
+impl<ExpectedElementT, ExpectedContainerT> ContainerEqMatcher<ExpectedContainerT>
 where
-    ActualElementT: PartialEq<ExpectedElementT> + ?Sized,
-    ActualContainerT: PartialEq<ExpectedContainerT> + ?Sized,
-    for<'a> &'a ActualContainerT: IntoIterator<Item = &'a ActualElementT>,
     for<'a> &'a ExpectedContainerT: IntoIterator<Item = &'a ExpectedElementT>,
 {
-    fn get_missing_items(&self, actual: &ActualContainerT) -> Vec<&ExpectedElementT> {
-        self.expected.into_iter().filter(|&i| !actual.into_iter().any(|j| j == i)).collect()
+    fn get_missing_items<ActualElementT, ActualContainerT>(
+        &self,
+        actual: ActualContainerT,
+    ) -> Vec<&'_ ExpectedElementT>
+    where
+        ActualElementT: for<'a> PartialEq<&'a ExpectedElementT> + Copy,
+        ActualContainerT: for<'a> PartialEq<&'a ExpectedContainerT> + Copy,
+        ActualContainerT: IntoIterator<Item = ActualElementT>,
+    {
+        self.expected.into_iter().filter(|i| !actual.into_iter().any(|j| j == *i)).collect()
     }
 
-    fn get_unexpected_items<'a>(&self, actual: &'a ActualContainerT) -> Vec<&'a ActualElementT> {
-        actual.into_iter().filter(|&i| !self.expected.into_iter().any(|j| i == j)).collect()
+    fn get_unexpected_items<ActualElementT, ActualContainerT>(
+        &self,
+        actual: ActualContainerT,
+    ) -> Vec<ActualElementT>
+    where
+        ActualElementT: for<'a> PartialEq<&'a ExpectedElementT> + Copy,
+        ActualContainerT: for<'a> PartialEq<&'a ExpectedContainerT> + Copy,
+        ActualContainerT: IntoIterator<Item = ActualElementT>,
+    {
+        actual.into_iter().filter(|i| !self.expected.into_iter().any(|j| i == &j)).collect()
     }
 }
 
@@ -185,8 +155,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::container_eq;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashSet;
@@ -199,7 +168,7 @@
     #[test]
     fn container_eq_matches_array_with_slice() -> Result<()> {
         let value = &[1, 2, 3];
-        verify_that!(*value, container_eq([1, 2, 3]))
+        verify_that!(value, container_eq([1, 2, 3]))
     }
 
     #[test]
@@ -271,15 +240,15 @@
     }
 
     #[test]
-    fn container_eq_matches_owned_vec_of_owned_strings_with_slice_of_string_references()
-    -> Result<()> {
+    fn container_eq_matches_owned_vec_of_owned_strings_with_slice_of_string_references(
+    ) -> Result<()> {
         let vector = vec!["A string".to_string(), "Another string".to_string()];
         verify_that!(vector, container_eq(["A string", "Another string"]))
     }
 
     #[test]
-    fn container_eq_matches_owned_vec_of_owned_strings_with_shorter_slice_of_string_references()
-    -> Result<()> {
+    fn container_eq_matches_owned_vec_of_owned_strings_with_shorter_slice_of_string_references(
+    ) -> Result<()> {
         let actual = vec!["A string".to_string(), "Another string".to_string()];
         let matcher = container_eq(["A string"]);
 

crates/googletest/src/matchers/contains_matcher.rs

diff --git a/crates/googletest/src/matchers/contains_matcher.rs b/crates/googletest/src/matchers/contains_matcher.rs
index 1a27ce0..3ce60ec 100644
--- a/crates/googletest/src/matchers/contains_matcher.rs
+++ b/crates/googletest/src/matchers/contains_matcher.rs
@@ -14,11 +14,12 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
-/// Matches an iterable type whose elements contain a value matched by `inner`.
+/// Matches an [`IntoIterator`] type whose elements contain a value matched by
+/// `inner`.
 ///
 /// By default, this matches a container with any number of elements matched
 /// by `inner`. Use the method [`ContainsMatcher::times`] to constrain the
@@ -28,11 +29,11 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// verify_that!(["Some value"], contains(eq("Some value")))?;  // Passes
-/// verify_that!(vec!["Some value"], contains(eq("Some value")))?;  // Passes
+/// verify_that!(vec!["Some value"], contains(eq(&"Some value")))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail_1() -> Result<()> {
-/// verify_that!([] as [String; 0], contains(eq("Some value")))?;   // Fails
+/// verify_that!([] as [&String; 0], contains(eq("Some value")))?;   // Fails
 /// #     Ok(())
 /// # }
 /// # fn should_fail_2() -> Result<()> {
@@ -43,19 +44,19 @@
 /// # should_fail_1().unwrap_err();
 /// # should_fail_2().unwrap_err();
 /// ```
-pub fn contains<T, InnerMatcherT>(inner: InnerMatcherT) -> ContainsMatcher<T, InnerMatcherT> {
-    ContainsMatcher { inner, count: None, phantom: Default::default() }
+pub fn contains<InnerMatcherT>(inner: InnerMatcherT) -> ContainsMatcher<InnerMatcherT> {
+    ContainsMatcher { inner, count: None }
 }
 
 /// A matcher which matches a container containing one or more elements a given
 /// inner [`Matcher`] matches.
-pub struct ContainsMatcher<T, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct ContainsMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    count: Option<Box<dyn Matcher<ActualT = usize>>>,
-    phantom: PhantomData<T>,
+    count: Option<Box<dyn Matcher<usize>>>,
 }
 
-impl<T, InnerMatcherT> ContainsMatcher<T, InnerMatcherT> {
+impl<InnerMatcherT> ContainsMatcher<InnerMatcherT> {
     /// Configures this instance to match containers which contain a number of
     /// matching items matched by `count`.
     ///
@@ -68,7 +69,7 @@
     ///
     /// One can also use `times(eq(0))` to test for the *absence* of an item
     /// matching the expected value.
-    pub fn times(mut self, count: impl Matcher<ActualT = usize> + 'static) -> Self {
+    pub fn times(mut self, count: impl Matcher<usize> + 'static) -> Self {
         self.count = Some(Box::new(count));
         self
     }
@@ -84,16 +85,14 @@
 //  because val is dropped before matcher but the trait bound requires that
 //  the argument to matches outlive the matcher. It works fine if one defines
 //  val before matcher.
-impl<T: Debug, InnerMatcherT: Matcher<ActualT = T>, ContainerT: Debug> Matcher
-    for ContainsMatcher<ContainerT, InnerMatcherT>
+impl<T: Debug + Copy, InnerMatcherT: Matcher<T>, ContainerT: Debug + Copy> Matcher<ContainerT>
+    for ContainsMatcher<InnerMatcherT>
 where
-    for<'a> &'a ContainerT: IntoIterator<Item = &'a T>,
+    ContainerT: IntoIterator<Item = T>,
 {
-    type ActualT = ContainerT;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+    fn matches(&self, actual: ContainerT) -> MatcherResult {
         if let Some(count) = &self.count {
-            count.matches(&self.count_matches(actual))
+            count.matches(self.count_matches(actual))
         } else {
             for v in actual.into_iter() {
                 if self.inner.matches(v).into() {
@@ -104,7 +103,7 @@
         }
     }
 
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    fn explain_match(&self, actual: ContainerT) -> Description {
         let count = self.count_matches(actual);
         match (count, &self.count) {
             (_, Some(_)) => format!("which contains {} matching elements", count).into(),
@@ -140,11 +139,11 @@
     }
 }
 
-impl<ActualT, InnerMatcherT> ContainsMatcher<ActualT, InnerMatcherT> {
-    fn count_matches<T: Debug, ContainerT>(&self, actual: &ContainerT) -> usize
+impl<InnerMatcherT> ContainsMatcher<InnerMatcherT> {
+    fn count_matches<T: Debug + Copy, ContainerT>(&self, actual: ContainerT) -> usize
     where
-        for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
-        InnerMatcherT: Matcher<ActualT = T>,
+        ContainerT: IntoIterator<Item = T>,
+        InnerMatcherT: Matcher<T>,
     {
         let mut count = 0;
         for v in actual.into_iter() {
@@ -158,13 +157,12 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{contains, ContainsMatcher};
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
 
     #[test]
     fn contains_matches_singleton_slice_with_value() -> Result<()> {
-        let matcher = contains(eq(1));
+        let matcher = contains(eq(&1));
 
         let result = matcher.matches(&vec![1]);
 
@@ -173,7 +171,7 @@
 
     #[test]
     fn contains_matches_singleton_vec_with_value() -> Result<()> {
-        let matcher = contains(eq(1));
+        let matcher = contains(eq(&1));
 
         let result = matcher.matches(&vec![1]);
 
@@ -182,7 +180,7 @@
 
     #[test]
     fn contains_matches_two_element_slice_with_value() -> Result<()> {
-        let matcher = contains(eq(1));
+        let matcher = contains(eq(&1));
 
         let result = matcher.matches(&[0, 1]);
 
@@ -191,7 +189,7 @@
 
     #[test]
     fn contains_does_not_match_singleton_slice_with_wrong_value() -> Result<()> {
-        let matcher = contains(eq(1));
+        let matcher = contains(eq(&1));
 
         let result = matcher.matches(&[0]);
 
@@ -200,16 +198,16 @@
 
     #[test]
     fn contains_does_not_match_empty_slice() -> Result<()> {
-        let matcher = contains(eq::<i32, _>(1));
+        let matcher = contains(eq(&1));
 
-        let result = matcher.matches(&[]);
+        let result = matcher.matches(&[1; 0]);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
     fn contains_matches_slice_with_repeated_value() -> Result<()> {
-        let matcher = contains(eq(1)).times(eq(2));
+        let matcher = contains(eq(&1)).times(eq(2));
 
         let result = matcher.matches(&[1, 1]);
 
@@ -218,7 +216,7 @@
 
     #[test]
     fn contains_does_not_match_slice_with_too_few_of_value() -> Result<()> {
-        let matcher = contains(eq(1)).times(eq(2));
+        let matcher = contains(eq(&1)).times(eq(2));
 
         let result = matcher.matches(&[0, 1]);
 
@@ -227,7 +225,7 @@
 
     #[test]
     fn contains_does_not_match_slice_with_too_many_of_value() -> Result<()> {
-        let matcher = contains(eq(1)).times(eq(1));
+        let matcher = contains(eq(&1)).times(eq(1));
 
         let result = matcher.matches(&[1, 1]);
 
@@ -236,20 +234,20 @@
 
     #[test]
     fn contains_formats_without_multiplicity_by_default() -> Result<()> {
-        let matcher: ContainsMatcher<Vec<i32>, _> = contains(eq(1));
+        let matcher = contains(eq(&1));
 
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&Vec<i32>>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("contains at least one element which is equal to 1"))
         )
     }
 
     #[test]
     fn contains_formats_with_multiplicity_when_specified() -> Result<()> {
-        let matcher: ContainsMatcher<Vec<i32>, _> = contains(eq(1)).times(eq(2));
+        let matcher = contains(eq(&1)).times(eq(2));
 
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&Vec<i32>>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("contains n elements which is equal to 1\n  where n is equal to 2"))
         )
     }
@@ -257,7 +255,7 @@
     #[test]
     fn contains_mismatch_shows_number_of_times_element_was_found() -> Result<()> {
         verify_that!(
-            contains(eq(3)).times(eq(1)).explain_match(&vec![1, 2, 3, 3]),
+            contains(eq(&3)).times(eq(1)).explain_match(&vec![1, 2, 3, 3]),
             displays_as(eq("which contains 2 matching elements"))
         )
     }
@@ -265,7 +263,7 @@
     #[test]
     fn contains_mismatch_shows_when_matches() -> Result<()> {
         verify_that!(
-            contains(eq(3)).explain_match(&vec![1, 2, 3, 3]),
+            contains(eq(&3)).explain_match(&vec![1, 2, 3, 3]),
             displays_as(eq("which contains a matching element"))
         )
     }
@@ -273,7 +271,7 @@
     #[test]
     fn contains_mismatch_shows_when_no_matches() -> Result<()> {
         verify_that!(
-            contains(eq(3)).explain_match(&vec![1, 2]),
+            contains(eq(&3)).explain_match(&vec![1, 2]),
             displays_as(eq("which does not contain a matching element"))
         )
     }

crates/googletest/src/matchers/contains_regex_matcher.rs

diff --git a/crates/googletest/src/matchers/contains_regex_matcher.rs b/crates/googletest/src/matchers/contains_regex_matcher.rs
index 6f68168..61a2d30 100644
--- a/crates/googletest/src/matchers/contains_regex_matcher.rs
+++ b/crates/googletest/src/matchers/contains_regex_matcher.rs
@@ -13,10 +13,9 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use regex::Regex;
 use std::fmt::Debug;
-use std::marker::PhantomData;
 use std::ops::Deref;
 
 /// Matches a string containing a substring which matches the given regular
@@ -47,18 +46,9 @@
 ///
 /// Panics if the given `pattern` is not a syntactically valid regular
 /// expression.
-// N.B. This returns the concrete type rather than an impl Matcher so that it
-// can act simultaneously as a Matcher<str> and a Matcher<String>. Otherwise the
-// compiler treats it as a Matcher<str> only and the code
-//   verify_that!("Some value".to_string(), contains_regex(".*value"))?;
-// doesn't compile.
-pub fn contains_regex<ActualT: ?Sized, PatternT: Deref<Target = str>>(
-    pattern: PatternT,
-) -> ContainsRegexMatcher<ActualT> {
-    ContainsRegexMatcher {
-        regex: Regex::new(pattern.deref()).unwrap(),
-        phantom: Default::default(),
-    }
+#[track_caller]
+pub fn contains_regex<PatternT: Deref<Target = str>>(pattern: PatternT) -> ContainsRegexMatcher {
+    ContainsRegexMatcher { regex: Regex::new(pattern.deref()).unwrap() }
 }
 
 /// A matcher matching a string-like type containing a substring matching a
@@ -66,15 +56,13 @@
 ///
 /// Intended only to be used from the function [`contains_regex`] only.
 /// Should not be referenced by code outside this library.
-pub struct ContainsRegexMatcher<ActualT: ?Sized> {
+#[derive(MatcherBase)]
+pub struct ContainsRegexMatcher {
     regex: Regex,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ActualT: AsRef<str> + Debug + ?Sized> Matcher for ContainsRegexMatcher<ActualT> {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
+impl<ActualT: AsRef<str> + Debug + Copy> Matcher<ActualT> for ContainsRegexMatcher {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         self.regex.is_match(actual.as_ref()).into()
     }
 
@@ -92,8 +80,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{contains_regex, ContainsRegexMatcher};
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
 
     #[test]
@@ -139,10 +126,10 @@
 
     #[test]
     fn contains_regex_displays_quoted_debug_of_pattern() -> Result<()> {
-        let matcher: ContainsRegexMatcher<&str> = contains_regex("\n");
+        let matcher = contains_regex("\n");
 
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("contains the regular expression \"\\n\""))
         )
     }

crates/googletest/src/matchers/derefs_to_matcher.rs

diff --git a/crates/googletest/src/matchers/derefs_to_matcher.rs b/crates/googletest/src/matchers/derefs_to_matcher.rs
new file mode 100644
index 0000000..2c9082e
--- /dev/null
+++ b/crates/googletest/src/matchers/derefs_to_matcher.rs
@@ -0,0 +1,99 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+    description::Description,
+    matcher::{Matcher, MatcherBase, MatcherResult},
+};
+use std::{fmt::Debug, ops::Deref};
+
+/// Dereferences the `actual` value and verifies that the returned reference
+/// matches the `inner` matcher.
+///
+/// ```
+/// # use googletest::{matchers::{derefs_to, eq}, verify_that};
+/// verify_that!(Box::new(123), derefs_to(eq(&123)))
+/// #    .unwrap()
+/// ```
+pub fn derefs_to<Inner>(inner: Inner) -> DerefsTo<Inner> {
+    DerefsTo { inner }
+}
+
+/// A matcher which derefs a value and verifies that the result matches the
+/// `inner` matcher.
+///
+/// See [`derefs_to`].
+#[derive(MatcherBase)]
+pub struct DerefsTo<InnerT> {
+    pub(crate) inner: InnerT,
+}
+
+impl<'a, ActualT, ExpectedT, Inner> Matcher<&'a ActualT> for DerefsTo<Inner>
+where
+    ActualT: Deref<Target = ExpectedT> + Debug,
+    ExpectedT: Copy + Debug + 'a,
+    Inner: Matcher<&'a ExpectedT>,
+{
+    fn matches(&self, actual: &'a ActualT) -> MatcherResult {
+        self.inner.matches(actual.deref())
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        self.inner.describe(matcher_result)
+    }
+
+    fn explain_match(&self, actual: &'a ActualT) -> Description {
+        self.inner.explain_match(actual.deref())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::rc::Rc;
+
+    use crate::prelude::*;
+    use indoc::indoc;
+
+    #[test]
+    fn deref_to_matches_box_of_int_with_int() -> Result<()> {
+        let actual = Box::new(123);
+        verify_that!(actual, derefs_to(eq(&123)))
+    }
+
+    #[test]
+    fn deref_to_matches_rc_of_int_with_int() -> Result<()> {
+        verify_that!(Rc::new(123), derefs_to(eq(&123)))
+    }
+
+    #[test]
+    fn deref_to_combines_with_points_to_for_copy() -> Result<()> {
+        verify_that!(Rc::new(123), derefs_to(points_to(eq(123))))
+    }
+
+    #[test]
+    fn match_explanation_references_actual_value() -> Result<()> {
+        let actual = Box::new(1);
+        let result = verify_that!(actual, derefs_to(eq(&0)));
+
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                    Actual: 1,
+                      which isn't equal to 0
+                "
+            ))))
+        )
+    }
+}

crates/googletest/src/matchers/disjunction_matcher.rs

diff --git a/crates/googletest/src/matchers/disjunction_matcher.rs b/crates/googletest/src/matchers/disjunction_matcher.rs
index dd56be2..77e18f6 100644
--- a/crates/googletest/src/matchers/disjunction_matcher.rs
+++ b/crates/googletest/src/matchers/disjunction_matcher.rs
@@ -17,48 +17,81 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
 use std::fmt::Debug;
 
-/// Matcher created by [`Matcher::or`].
+/// Matcher created by [`Matcher::or`] and [`any!`].
 ///
+/// Both [`Matcher::or`] and [`any!`] nest on m1. In other words,
+/// both `x.or(y).or(z)` and `any![x, y, z]` produce:
+/// ```ignore
+/// DisjunctionMatcher {
+///     m1: DisjunctionMatcher {
+///         m1: x, m2: y
+///     },
+///     m2: z
+/// }
+/// ```
 /// **For internal use only. API stablility is not guaranteed!**
 #[doc(hidden)]
+#[derive(MatcherBase)]
 pub struct DisjunctionMatcher<M1, M2> {
     m1: M1,
     m2: M2,
 }
 
 impl<M1, M2> DisjunctionMatcher<M1, M2> {
-    pub(crate) fn new(m1: M1, m2: M2) -> Self {
+    pub fn new(m1: M1, m2: M2) -> Self {
         Self { m1, m2 }
     }
 }
 
-impl<M1: Matcher, M2: Matcher<ActualT = M1::ActualT>> Matcher for DisjunctionMatcher<M1, M2>
-where
-    M1::ActualT: Debug,
-{
-    type ActualT = M1::ActualT;
-
-    fn matches(&self, actual: &M1::ActualT) -> MatcherResult {
+impl<T: Debug + Copy, M1: Matcher<T>, M2: Matcher<T>> Matcher<T> for DisjunctionMatcher<M1, M2> {
+    fn matches(&self, actual: T) -> MatcherResult {
         match (self.m1.matches(actual), self.m2.matches(actual)) {
             (MatcherResult::NoMatch, MatcherResult::NoMatch) => MatcherResult::NoMatch,
             _ => MatcherResult::Match,
         }
     }
 
-    fn explain_match(&self, actual: &M1::ActualT) -> Description {
-        Description::new()
-            .nested(self.m1.explain_match(actual))
-            .text("and")
-            .nested(self.m2.explain_match(actual))
+    fn explain_match(&self, actual: T) -> Description {
+        match (self.m1.matches(actual), self.m2.matches(actual)) {
+            (MatcherResult::NoMatch, MatcherResult::Match) => self.m1.explain_match(actual),
+            (MatcherResult::Match, MatcherResult::NoMatch) => self.m2.explain_match(actual),
+            (_, _) => {
+                let m1_description = self.m1.explain_match(actual);
+                if m1_description.is_disjunction_description() {
+                    m1_description.nested(self.m2.explain_match(actual))
+                } else {
+                    Description::new()
+                        .bullet_list()
+                        .collect([m1_description, self.m2.explain_match(actual)])
+                        .disjunction_description()
+                }
+            }
+        }
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
-        format!("{}, or {}", self.m1.describe(matcher_result), self.m2.describe(matcher_result))
-            .into()
+        let m1_description = self.m1.describe(matcher_result);
+        if m1_description.is_disjunction_description() {
+            m1_description.push_in_last_nested(self.m2.describe(matcher_result))
+        } else {
+            let header = if matcher_result.into() {
+                "has at least one of the following properties:"
+            } else {
+                "has all of the following properties:"
+            };
+            Description::new()
+                .text(header)
+                .nested(
+                    Description::new()
+                        .bullet_list()
+                        .collect([m1_description, self.m2.describe(matcher_result)]),
+                )
+                .disjunction_description()
+        }
     }
 }
 
@@ -90,11 +123,12 @@
             err(displays_as(contains_substring(indoc!(
                 "
                 Value of: 1
-                Expected: never matches, or never matches
+                Expected: has at least one of the following properties:
+                  * never matches
+                  * never matches
                 Actual: 1,
-                    which is anything
-                  and
-                    which is anything
+                  * which is anything
+                  * which is anything
                 "
             ))))
         )

crates/googletest/src/matchers/display_matcher.rs

diff --git a/crates/googletest/src/matchers/display_matcher.rs b/crates/googletest/src/matchers/display_matcher.rs
index 51a5bff..9edccca 100644
--- a/crates/googletest/src/matchers/display_matcher.rs
+++ b/crates/googletest/src/matchers/display_matcher.rs
@@ -13,9 +13,8 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use std::fmt::{Debug, Display};
-use std::marker::PhantomData;
 
 /// Matches the string representation of types that implement `Display`.
 ///
@@ -23,29 +22,31 @@
 /// let result: impl Display = ...;
 /// verify_that!(result, displays_as(eq(format!("{}", result))))?;
 /// ```
-pub fn displays_as<T: Debug + Display, InnerMatcher: Matcher<ActualT = String>>(
+pub fn displays_as<InnerMatcher: for<'a> Matcher<&'a str>>(
     inner: InnerMatcher,
-) -> impl Matcher<ActualT = T> {
-    DisplayMatcher::<T, _> { inner, phantom: Default::default() }
+) -> DisplayMatcher<InnerMatcher> {
+    DisplayMatcher { inner }
 }
 
-struct DisplayMatcher<T, InnerMatcher: Matcher> {
+#[derive(MatcherBase)]
+pub struct DisplayMatcher<InnerMatcher> {
     inner: InnerMatcher,
-    phantom: PhantomData<T>,
 }
 
-impl<T: Debug + Display, InnerMatcher: Matcher<ActualT = String>> Matcher
-    for DisplayMatcher<T, InnerMatcher>
+impl<T: Debug + Display + Copy, InnerMatcher: for<'a> Matcher<&'a str>> Matcher<T>
+    for DisplayMatcher<InnerMatcher>
 {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+    fn matches(&self, actual: T) -> MatcherResult {
         self.inner.matches(&format!("{actual}"))
     }
 
-    fn explain_match(&self, actual: &T) -> Description {
-        format!("which displays as a string {}", self.inner.explain_match(&format!("{actual}")))
-            .into()
+    fn explain_match(&self, actual: T) -> Description {
+        format!(
+            "which displays as {:?} {}",
+            actual.to_string(),
+            self.inner.explain_match(&format!("{actual}"))
+        )
+        .into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -65,7 +66,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::displays_as;
     use crate::prelude::*;
     use indoc::indoc;
     use std::fmt::{Debug, Display, Error, Formatter};
@@ -110,7 +110,8 @@
             err(displays_as(contains_substring(indoc!(
                 "
                   Actual: \"123\\n234\",
-                    which displays as a string which isn't equal to \"123\\n345\"
+                    which displays as \"123\\n234\" which isn't equal to \"123\\n345\"
+                    
                     Difference(-actual / +expected):
                      123
                     -234

crates/googletest/src/matchers/each_matcher.rs

diff --git a/crates/googletest/src/matchers/each_matcher.rs b/crates/googletest/src/matchers/each_matcher.rs
index 08a0742..6b76432 100644
--- a/crates/googletest/src/matchers/each_matcher.rs
+++ b/crates/googletest/src/matchers/each_matcher.rs
@@ -13,77 +13,58 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
-use std::{fmt::Debug, marker::PhantomData};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
+use std::fmt::Debug;
 
 /// Matches a container all of whose elements are matched by the matcher
 /// `inner`.
 ///
-/// `T` can be any container such that `&T` implements `IntoIterator`. This
-/// includes `Vec`, arrays, and (dereferenced) slices.
+/// `T` must implement [`IntoIterator`]. This
+/// includes `&Vec`, arrays, and slices.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # use std::collections::HashSet;
 /// # fn should_pass_1() -> Result<()> {
 /// let value = vec![1, 2, 3];
-/// verify_that!(value, each(gt(0)))?;  // Passes
+/// verify_that!(value, each(gt(&0)))?;  // Passes
 /// let array_value = [1, 2, 3];
 /// verify_that!(array_value, each(gt(0)))?;  // Passes
 /// let slice_value = &[1, 2, 3];
-/// verify_that!(*slice_value, each(gt(0)))?;  // Passes
+/// verify_that!(slice_value, each(gt(&0)))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
 /// #     let value = vec![1, 2, 3];
-/// verify_that!(value, each(lt(2)))?;  // Fails: 2 and 3 are not less than 2
+/// verify_that!(value, each(lt(&2)))?;  // Fails: 2 and 3 are not less than 2
 /// #     Ok(())
 /// # }
 ///
 /// # fn should_pass_2() -> Result<()> {
 /// let value: HashSet<i32> = [1, 2, 3].into();
-/// verify_that!(value, each(gt(0)))?;  // Passes
+/// verify_that!(value, each(gt(&0)))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass_1().unwrap();
 /// # should_fail().unwrap_err();
 /// # should_pass_2().unwrap();
 /// ```
-///
-/// One can also verify the contents of a slice by dereferencing it:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # fn should_pass() -> Result<()> {
-/// let value = &[1, 2, 3];
-/// verify_that!(*value, each(gt(0)))?;
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-pub fn each<ElementT: Debug, ActualT: Debug + ?Sized, MatcherT>(
-    inner: MatcherT,
-) -> impl Matcher<ActualT = ActualT>
-where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
-    MatcherT: Matcher<ActualT = ElementT>,
-{
-    EachMatcher { inner, phantom: Default::default() }
+pub fn each<MatcherT>(inner: MatcherT) -> EachMatcher<MatcherT> {
+    EachMatcher { inner }
 }
 
-struct EachMatcher<ActualT: ?Sized, MatcherT> {
+#[derive(MatcherBase)]
+pub struct EachMatcher<MatcherT> {
     inner: MatcherT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ElementT: Debug, ActualT: Debug + ?Sized, MatcherT> Matcher for EachMatcher<ActualT, MatcherT>
+impl<ElementT: Debug + Copy, ActualT: Debug + Copy, MatcherT> Matcher<ActualT>
+    for EachMatcher<MatcherT>
 where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
-    MatcherT: Matcher<ActualT = ElementT>,
+    ActualT: IntoIterator<Item = ElementT>,
+    MatcherT: Matcher<ElementT>,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         for element in actual {
             if self.inner.matches(element).is_no_match() {
                 return MatcherResult::NoMatch;
@@ -92,7 +73,7 @@
         MatcherResult::Match
     }
 
-    fn explain_match(&self, actual: &ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         let mut non_matching_elements = Vec::new();
         for (index, element) in actual.into_iter().enumerate() {
             if self.inner.matches(element).is_no_match() {
@@ -137,7 +118,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::each;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashSet;
@@ -145,19 +125,19 @@
     #[test]
     fn each_matches_empty_vec() -> Result<()> {
         let value: Vec<i32> = vec![];
-        verify_that!(value, each(gt(0)))
+        verify_that!(value, each(gt(&0)))
     }
 
     #[test]
     fn each_matches_vec_with_one_element() -> Result<()> {
         let value = vec![1];
-        verify_that!(value, each(gt(0)))
+        verify_that!(value, each(gt(&0)))
     }
 
     #[test]
     fn each_matches_vec_with_two_elements() -> Result<()> {
         let value = vec![1, 2];
-        verify_that!(value, each(gt(0)))
+        verify_that!(value, each(gt(&0)))
     }
 
     #[test]
@@ -169,24 +149,24 @@
     #[test]
     fn each_matches_hash_set_with_one_element() -> Result<()> {
         let value: HashSet<i32> = [1].into();
-        verify_that!(value, each(gt(0)))
+        verify_that!(value, each(gt(&0)))
     }
 
     #[test]
     fn each_does_not_match_when_first_element_does_not_match() -> Result<()> {
         let value = vec![0];
-        verify_that!(value, not(each(gt(1))))
+        verify_that!(value, not(each(gt(&1))))
     }
 
     #[test]
     fn each_does_not_match_when_second_element_does_not_match() -> Result<()> {
         let value = vec![2, 0];
-        verify_that!(value, not(each(gt(1))))
+        verify_that!(value, not(each(gt(&1))))
     }
 
     #[test]
     fn each_shows_correct_message_when_first_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 2, 3], each(gt(0)));
+        let result = verify_that!(vec![0, 2, 3], each(gt(&0)));
 
         verify_that!(
             result,
@@ -202,7 +182,7 @@
 
     #[test]
     fn each_shows_correct_message_when_second_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![1, 0, 3], each(gt(0)));
+        let result = verify_that!(vec![1, 0, 3], each(gt(&0)));
 
         verify_that!(
             result,
@@ -218,7 +198,7 @@
 
     #[test]
     fn each_shows_correct_message_when_first_two_items_do_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 1, 3], each(gt(1)));
+        let result = verify_that!(vec![0, 1, 3], each(gt(&1)));
 
         verify_that!(
             result,
@@ -235,7 +215,7 @@
     }
     #[test]
     fn each_shows_inner_explanation() -> Result<()> {
-        let result = verify_that!(vec![vec![1, 2], vec![1]], each(each(eq(1))));
+        let result = verify_that!(vec![vec![1, 2], vec![1]], each(each(eq(&1))));
 
         verify_that!(
             result,

crates/googletest/src/matchers/elements_are_matcher.rs

diff --git a/crates/googletest/src/matchers/elements_are_matcher.rs b/crates/googletest/src/matchers/elements_are_matcher.rs
index 3a4b5b2..a1b926b 100644
--- a/crates/googletest/src/matchers/elements_are_matcher.rs
+++ b/crates/googletest/src/matchers/elements_are_matcher.rs
@@ -24,19 +24,18 @@
 ///
 /// ```
 /// # use googletest::prelude::*;
-/// verify_that!(vec![1, 2, 3], elements_are![eq(1), anything(), gt(0).and(lt(123))])
+/// verify_that!(vec![1, 2, 3], elements_are![eq(&1), anything(), gt(&0).and(lt(&123))])
 /// #    .unwrap();
 /// ```
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
-/// implement [`IntoIterator`].
+/// The actual value must be a container such as a `&Vec`, an array, or a slice.
+/// More precisely, the actual value must implement [`IntoIterator`].
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// let vector = vec![1, 2, 3];
 /// let slice = vector.as_slice();
-/// verify_that!(*slice, elements_are![eq(1), anything(), gt(0).and(lt(123))])
+/// verify_that!(slice, elements_are![eq(&1), anything(), gt(&0).and(lt(&123))])
 /// #    .unwrap();
 /// ```
 ///
@@ -45,7 +44,7 @@
 ///
 /// ```
 /// # use googletest::prelude::*;
-///  verify_that!(vec![1, 2], [eq(1), eq(2)])
+///  verify_that!(vec![1, 2], [eq(&1), eq(&2)])
 /// #     .unwrap();
 /// ```
 ///
@@ -55,19 +54,25 @@
 ///
 /// ```compile_fail
 /// # use googletest::prelude::*;
-/// verify_that!(vec![vec![1,2], vec![3]], [[eq(1), eq(2)], [eq(3)]])
+/// verify_that!(vec![vec![1,2], vec![3]], [[eq(&1), eq(&2)], [eq(&3)]])
 /// # .unwrap();
 /// ```
 ///
 /// Use this instead:
 /// ```
 /// # use googletest::prelude::*;
-/// verify_that!(vec![vec![1,2], vec![3]], [elements_are![eq(1), eq(2)], elements_are![eq(3)]])
+/// verify_that!(vec![vec![1,2], vec![3]], [elements_are![eq(&1), eq(&2)], elements_are![eq(&3)]])
 /// # .unwrap();
 /// ```
 ///
-/// This matcher does not support matching directly against an [`Iterator`]. To
-/// match against an iterator, use [`Iterator::collect`] to build a [`Vec`].
+///  If an inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+///
+/// verify_that!(vec![1,2,3], elements_are![&1, lt(&1000), gt(&1)])
+/// #     .unwrap();
+/// ```
 ///
 /// Do not use this with unordered containers, since that will lead to flaky
 /// tests. Use
@@ -82,8 +87,12 @@
 #[doc(hidden)]
 macro_rules! __elements_are {
     ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::ElementsAre;
-        ElementsAre::new(vec![$(Box::new($matcher)),*])
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::ElementsAre::new(
+            vec![$(Box::new(
+                $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!(
+                    $matcher
+                )
+            )),*])
     }}
 }
 
@@ -93,36 +102,34 @@
 #[doc(hidden)]
 pub mod internal {
     use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::{Matcher, MatcherBase, MatcherResult};
     use crate::matcher_support::zipped_iterator::zip;
-    use std::{fmt::Debug, marker::PhantomData};
+    use std::fmt::Debug;
 
     /// This struct is meant to be used only by the macro `elements_are!`.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub struct ElementsAre<'a, ContainerT: ?Sized, T: Debug> {
-        elements: Vec<Box<dyn Matcher<ActualT = T> + 'a>>,
-        phantom: PhantomData<ContainerT>,
+    #[derive(MatcherBase)]
+    pub struct ElementsAre<'a, T: Debug + Copy> {
+        elements: Vec<Box<dyn Matcher<T> + 'a>>,
     }
 
-    impl<'a, ContainerT: ?Sized, T: Debug> ElementsAre<'a, ContainerT, T> {
+    impl<'a, T: Debug + Copy> ElementsAre<'a, T> {
         /// Factory only intended for use in the macro `elements_are!`.
         ///
         /// **For internal use only. API stablility is not guaranteed!**
         #[doc(hidden)]
-        pub fn new(elements: Vec<Box<dyn Matcher<ActualT = T> + 'a>>) -> Self {
-            Self { elements, phantom: Default::default() }
+        pub fn new(elements: Vec<Box<dyn Matcher<T> + 'a>>) -> Self {
+            Self { elements }
         }
     }
 
-    impl<'a, T: Debug, ContainerT: Debug + ?Sized> Matcher for ElementsAre<'a, ContainerT, T>
+    impl<'a, T: Debug + Copy, ContainerT: Debug + Copy> Matcher<ContainerT> for ElementsAre<'a, T>
     where
-        for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
+        ContainerT: IntoIterator<Item = T>,
     {
-        type ActualT = ContainerT;
-
-        fn matches(&self, actual: &ContainerT) -> MatcherResult {
+        fn matches(&self, actual: ContainerT) -> MatcherResult {
             let mut zipped_iterator = zip(actual.into_iter(), self.elements.iter());
             for (a, e) in zipped_iterator.by_ref() {
                 if e.matches(a).is_no_match() {
@@ -136,7 +143,7 @@
             }
         }
 
-        fn explain_match(&self, actual: &ContainerT) -> Description {
+        fn explain_match(&self, actual: ContainerT) -> Description {
             let actual_iterator = actual.into_iter();
             let mut zipped_iterator = zip(actual_iterator, self.elements.iter());
             let mut mismatches = Vec::new();

crates/googletest/src/matchers/empty_matcher.rs

diff --git a/crates/googletest/src/matchers/empty_matcher.rs b/crates/googletest/src/matchers/empty_matcher.rs
index 11cb675..7631fc8 100644
--- a/crates/googletest/src/matchers/empty_matcher.rs
+++ b/crates/googletest/src/matchers/empty_matcher.rs
@@ -14,15 +14,15 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches an empty container.
 ///
-/// `T` can be any container such that `&T` implements `IntoIterator`. For
-/// instance, `T` can be a common container like `Vec` and
-/// [`HashSet`][std::collections::HashSet].
+/// `T` can be any container that implements `IntoIterator`. For instance, `T`
+/// can be the reference of a common container like `&Vec` and
+/// [`&HashSet`][std::collections::HashSet].
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -32,42 +32,24 @@
 /// verify_that!(value, empty())?;
 /// let value: HashSet<i32> = HashSet::new();
 /// verify_that!(value, empty())?;
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-///
-/// One can also check whether a slice is empty by dereferencing it:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # use std::collections::HashSet;
-/// # fn should_pass() -> Result<()> {
 /// let value: &[u32] = &[];
-/// verify_that!(*value, empty())?;
+/// verify_that!(value, empty())?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// ```
-
-pub fn empty<T: Debug + ?Sized>() -> impl Matcher<ActualT = T>
-where
-    for<'a> &'a T: IntoIterator,
-{
-    EmptyMatcher { phantom: Default::default() }
+pub fn empty() -> EmptyMatcher {
+    EmptyMatcher
 }
 
-struct EmptyMatcher<T: ?Sized> {
-    phantom: PhantomData<T>,
-}
+#[derive(MatcherBase)]
+pub struct EmptyMatcher;
 
-impl<T: Debug + ?Sized> Matcher for EmptyMatcher<T>
+impl<T: Debug + Copy> Matcher<T> for EmptyMatcher
 where
-    for<'a> &'a T: IntoIterator,
+    T: IntoIterator,
 {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+    fn matches(&self, actual: T) -> MatcherResult {
         actual.into_iter().next().is_none().into()
     }
 
@@ -78,7 +60,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::empty;
     use crate::prelude::*;
     use std::collections::HashSet;
 
@@ -97,7 +78,7 @@
     #[test]
     fn empty_matcher_matches_empty_slice() -> Result<()> {
         let value: &[i32] = &[];
-        verify_that!(*value, empty())
+        verify_that!(value, empty())
     }
 
     #[test]

crates/googletest/src/matchers/eq_deref_of_matcher.rs

diff --git a/crates/googletest/src/matchers/eq_deref_of_matcher.rs b/crates/googletest/src/matchers/eq_deref_of_matcher.rs
deleted file mode 100644
index 320aafb..0000000
--- a/crates/googletest/src/matchers/eq_deref_of_matcher.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use crate::{
-    description::Description,
-    matcher::{Matcher, MatcherResult},
-    matcher_support::{edit_distance, summarize_diff::create_diff},
-};
-use std::{fmt::Debug, marker::PhantomData, ops::Deref};
-
-/// Matches a value equal (in the sense of `==`) to the dereferenced value of
-/// `expected`.
-///
-/// This is similar to [`eq`][crate::matchers::eq] but takes a reference or
-/// smart pointer to the expected value rather than consuming it. This is useful
-/// when:
-///
-///  * one has only a reference to the expected value, and
-///  * the expected value cannot or should not be copied or cloned to create an
-///    owned value from it.
-///
-/// ```
-/// # use googletest::{matchers::eq_deref_of, verify_that};
-/// #[derive(Debug, PartialEq)]
-/// struct NonCloneableStruct(i32);
-/// let expected = NonCloneableStruct(123);
-/// verify_that!(NonCloneableStruct(123), eq_deref_of(&expected))
-/// #    .unwrap()
-/// ```
-///
-/// **Note**: while one can use `eq_deref_of` with the configuration methods of
-/// [`StrMatcherConfigurator`][crate::matchers::str_matcher::StrMatcherConfigurator]
-/// to configure string equality, it is not possible to do so when the input is
-/// a smart pointer to a string.
-///
-/// ```compile_fail
-/// # use googletest::{matchers::{eq_deref_of, str_matcher::StrMatcherConfigurator}, verify_that};
-/// verify_that!("A string", eq_deref_of(Box::new("A STRING")).ignoring_ascii_case()) // Does not compile
-/// #    .unwrap()
-/// ```
-///
-/// Otherwise, this has the same behaviour as [`eq`][crate::matchers::eq].
-pub fn eq_deref_of<ActualT: ?Sized, ExpectedRefT>(
-    expected: ExpectedRefT,
-) -> EqDerefOfMatcher<ActualT, ExpectedRefT> {
-    EqDerefOfMatcher { expected, phantom: Default::default() }
-}
-
-/// A matcher which matches a value equal to the derefenced value of `expected`.
-///
-/// See [`eq_deref_of`].
-pub struct EqDerefOfMatcher<ActualT: ?Sized, ExpectedRefT> {
-    pub(crate) expected: ExpectedRefT,
-    phantom: PhantomData<ActualT>,
-}
-
-impl<ActualT, ExpectedRefT, ExpectedT> Matcher for EqDerefOfMatcher<ActualT, ExpectedRefT>
-where
-    ActualT: Debug + ?Sized,
-    ExpectedRefT: Deref<Target = ExpectedT> + Debug,
-    ExpectedT: PartialEq<ActualT> + Debug,
-{
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        (self.expected.deref() == actual).into()
-    }
-
-    fn describe(&self, matcher_result: MatcherResult) -> Description {
-        match matcher_result {
-            MatcherResult::Match => format!("is equal to {:?}", self.expected).into(),
-            MatcherResult::NoMatch => format!("isn't equal to {:?}", self.expected).into(),
-        }
-    }
-
-    fn explain_match(&self, actual: &ActualT) -> Description {
-        format!(
-            "which {}{}",
-            &self.describe(self.matches(actual)),
-            create_diff(
-                &format!("{:#?}", actual),
-                &format!("{:#?}", self.expected.deref()),
-                edit_distance::Mode::Exact,
-            )
-        )
-        .into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::eq_deref_of;
-    use crate::prelude::*;
-    use indoc::indoc;
-
-    #[derive(Debug, PartialEq)]
-    struct NonCloneNonCopyStruct(i32);
-
-    #[test]
-    fn matches_value_with_ref_to_equal_value() -> Result<()> {
-        verify_that!(NonCloneNonCopyStruct(123), eq_deref_of(&NonCloneNonCopyStruct(123)))
-    }
-
-    #[test]
-    fn matches_value_with_box_of_equal_value() -> Result<()> {
-        verify_that!(NonCloneNonCopyStruct(123), eq_deref_of(Box::new(NonCloneNonCopyStruct(123))))
-    }
-
-    #[test]
-    fn does_not_match_value_with_non_equal_value() -> Result<()> {
-        verify_that!(NonCloneNonCopyStruct(123), not(eq_deref_of(&NonCloneNonCopyStruct(234))))
-    }
-
-    #[test]
-    fn shows_structured_diff() -> Result<()> {
-        #[derive(Debug, PartialEq)]
-        struct Strukt {
-            int: i32,
-            string: String,
-        }
-
-        let result = verify_that!(
-            Strukt { int: 123, string: "something".into() },
-            eq_deref_of(Box::new(Strukt { int: 321, string: "someone".into() }))
-        );
-        verify_that!(
-            result,
-            err(displays_as(contains_substring(indoc! {
-            "
-            Actual: Strukt { int: 123, string: \"something\" },
-              which isn't equal to Strukt { int: 321, string: \"someone\" }
-              Difference(-actual / +expected):
-               Strukt {
-              -    int: 123,
-              +    int: 321,
-              -    string: \"something\",
-              +    string: \"someone\",
-               }
-            "})))
-        )
-    }
-}

crates/googletest/src/matchers/eq_matcher.rs

diff --git a/crates/googletest/src/matchers/eq_matcher.rs b/crates/googletest/src/matchers/eq_matcher.rs
index 985307f..c39b79b 100644
--- a/crates/googletest/src/matchers/eq_matcher.rs
+++ b/crates/googletest/src/matchers/eq_matcher.rs
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use crate::matcher_support::edit_distance;
 use crate::matcher_support::summarize_diff::create_diff;
 
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a value equal (in the sense of `==`) to `expected`.
 ///
@@ -71,23 +71,21 @@
 /// options on how equality is checked through the
 /// [`StrMatcherConfigurator`][crate::matchers::str_matcher::StrMatcherConfigurator]
 /// extension trait, which is implemented for this matcher.
-pub fn eq<A: ?Sized, T>(expected: T) -> EqMatcher<A, T> {
-    EqMatcher { expected, phantom: Default::default() }
+pub fn eq<T>(expected: T) -> EqMatcher<T> {
+    EqMatcher { expected }
 }
 
 /// A matcher which matches a value equal to `expected`.
 ///
 /// See [`eq`].
-pub struct EqMatcher<A: ?Sized, T> {
+#[derive(MatcherBase)]
+pub struct EqMatcher<T> {
     pub(crate) expected: T,
-    phantom: PhantomData<A>,
 }
 
-impl<T: Debug, A: Debug + ?Sized + PartialEq<T>> Matcher for EqMatcher<A, T> {
-    type ActualT = A;
-
-    fn matches(&self, actual: &A) -> MatcherResult {
-        (*actual == self.expected).into()
+impl<T: Debug, A: Debug + Copy + PartialEq<T>> Matcher<A> for EqMatcher<T> {
+    fn matches(&self, actual: A) -> MatcherResult {
+        (actual == self.expected).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -97,10 +95,10 @@
         }
     }
 
-    fn explain_match(&self, actual: &A) -> Description {
+    fn explain_match(&self, actual: A) -> Description {
         let expected_debug = format!("{:#?}", self.expected);
         let actual_debug = format!("{:#?}", actual);
-        let description = self.describe(self.matches(actual));
+        let description = Matcher::<A>::describe(self, self.matches(actual));
 
         let diff = if is_multiline_string_debug(&actual_debug)
             && is_multiline_string_debug(&expected_debug)
@@ -118,7 +116,11 @@
             create_diff(&actual_debug, &expected_debug, edit_distance::Mode::Exact)
         };
 
-        format!("which {description}{diff}").into()
+        if diff.is_empty() {
+            format!("which {description}").into()
+        } else {
+            format!("which {description}\n\n{diff}").into()
+        }
     }
 }
 
@@ -135,7 +137,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::eq;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -171,7 +172,7 @@
 
         let result = verify_that!(
             Strukt { int: 123, string: "something".into() },
-            eq(Strukt { int: 321, string: "someone".into() })
+            eq(&Strukt { int: 321, string: "someone".into() })
         );
         verify_that!(
             result,
@@ -179,6 +180,7 @@
             "
             Actual: Strukt { int: 123, string: \"something\" },
               which isn't equal to Strukt { int: 321, string: \"someone\" }
+              
               Difference(-actual / +expected):
                Strukt {
               -    int: 123,
@@ -192,7 +194,7 @@
 
     #[test]
     fn eq_vec_debug_diff() -> Result<()> {
-        let result = verify_that!(vec![1, 2, 3], eq(vec![1, 3, 4]));
+        let result = verify_that!(vec![1, 2, 3], eq(&vec![1, 3, 4]));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
@@ -201,6 +203,7 @@
             Expected: is equal to [1, 3, 4]
             Actual: [1, 2, 3],
               which isn't equal to [1, 3, 4]
+              
               Difference(-actual / +expected):
                [
                    1,
@@ -214,7 +217,7 @@
 
     #[test]
     fn eq_vec_debug_diff_length_mismatch() -> Result<()> {
-        let result = verify_that!(vec![1, 2, 3, 4, 5], eq(vec![1, 3, 5]));
+        let result = verify_that!(vec![1, 2, 3, 4, 5], eq(&vec![1, 3, 5]));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
@@ -223,6 +226,7 @@
             Expected: is equal to [1, 3, 5]
             Actual: [1, 2, 3, 4, 5],
               which isn't equal to [1, 3, 5]
+              
               Difference(-actual / +expected):
                [
                    1,
@@ -237,13 +241,14 @@
 
     #[test]
     fn eq_debug_diff_common_lines_omitted() -> Result<()> {
-        let result = verify_that!((1..50).collect::<Vec<_>>(), eq((3..52).collect::<Vec<_>>()));
+        let result = verify_that!((1..50).collect::<Vec<_>>(), eq(&(3..52).collect::<Vec<_>>()));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
             "
             ],
               which isn't equal to [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51]
+              
               Difference(-actual / +expected):
                [
               -    1,
@@ -261,13 +266,14 @@
 
     #[test]
     fn eq_debug_diff_5_common_lines_not_omitted() -> Result<()> {
-        let result = verify_that!((1..8).collect::<Vec<_>>(), eq((3..10).collect::<Vec<_>>()));
+        let result = verify_that!((1..8).collect::<Vec<_>>(), eq(&(3..10).collect::<Vec<_>>()));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
             "
             Actual: [1, 2, 3, 4, 5, 6, 7],
               which isn't equal to [3, 4, 5, 6, 7, 8, 9]
+              
               Difference(-actual / +expected):
                [
               -    1,
@@ -285,13 +291,14 @@
 
     #[test]
     fn eq_debug_diff_start_common_lines_omitted() -> Result<()> {
-        let result = verify_that!((1..50).collect::<Vec<_>>(), eq((1..52).collect::<Vec<_>>()));
+        let result = verify_that!((1..50).collect::<Vec<_>>(), eq(&(1..52).collect::<Vec<_>>()));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
             "
             ],
               which isn't equal to [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51]
+              
               Difference(-actual / +expected):
                [
                    1,
@@ -306,13 +313,14 @@
 
     #[test]
     fn eq_debug_diff_end_common_lines_omitted() -> Result<()> {
-        let result = verify_that!((1..52).collect::<Vec<_>>(), eq((3..52).collect::<Vec<_>>()));
+        let result = verify_that!((1..52).collect::<Vec<_>>(), eq(&(3..52).collect::<Vec<_>>()));
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc! {
             "
             ],
               which isn't equal to [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51]
+              
               Difference(-actual / +expected):
                [
               -    1,

crates/googletest/src/matchers/err_matcher.rs

diff --git a/crates/googletest/src/matchers/err_matcher.rs b/crates/googletest/src/matchers/err_matcher.rs
index 3b10de4..aa88045 100644
--- a/crates/googletest/src/matchers/err_matcher.rs
+++ b/crates/googletest/src/matchers/err_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a `Result` containing `Err` with a value matched by `inner`.
 ///
@@ -38,28 +38,53 @@
 /// # should_fail_1().unwrap_err();
 /// # should_fail_2().unwrap_err();
 /// ```
-pub fn err<T: Debug, E: Debug>(
-    inner: impl Matcher<ActualT = E>,
-) -> impl Matcher<ActualT = std::result::Result<T, E>> {
-    ErrMatcher::<T, E, _> { inner, phantom_t: Default::default(), phantom_e: Default::default() }
+pub fn err<Inner>(inner: Inner) -> ErrMatcher<Inner> {
+    ErrMatcher { inner }
 }
 
-struct ErrMatcher<T, E, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct ErrMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    phantom_t: PhantomData<T>,
-    phantom_e: PhantomData<E>,
 }
 
-impl<T: Debug, E: Debug, InnerMatcherT: Matcher<ActualT = E>> Matcher
-    for ErrMatcher<T, E, InnerMatcherT>
+impl<T: Debug + Copy, E: Debug + Copy, InnerMatcherT: Matcher<E>> Matcher<std::result::Result<T, E>>
+    for ErrMatcher<InnerMatcherT>
 {
-    type ActualT = std::result::Result<T, E>;
+    fn matches(&self, actual: std::result::Result<T, E>) -> MatcherResult {
+        actual.err().map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
+    }
 
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+    fn explain_match(&self, actual: std::result::Result<T, E>) -> Description {
+        match actual {
+            Err(e) => {
+                Description::new().text("which is an error").nested(self.inner.explain_match(e))
+            }
+            Ok(_) => "which is a success".into(),
+        }
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        match matcher_result {
+            MatcherResult::Match => {
+                format!("is an error which {}", self.inner.describe(MatcherResult::Match)).into()
+            }
+            MatcherResult::NoMatch => format!(
+                "is a success or is an error containing a value which {}",
+                self.inner.describe(MatcherResult::NoMatch)
+            )
+            .into(),
+        }
+    }
+}
+
+impl<'a, T: Debug, E: Debug, InnerMatcherT: Matcher<&'a E>> Matcher<&'a std::result::Result<T, E>>
+    for ErrMatcher<InnerMatcherT>
+{
+    fn matches(&self, actual: &'a std::result::Result<T, E>) -> MatcherResult {
         actual.as_ref().err().map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
     }
 
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    fn explain_match(&self, actual: &'a std::result::Result<T, E>) -> Description {
         match actual {
             Err(e) => {
                 Description::new().text("which is an error").nested(self.inner.explain_match(e))
@@ -84,8 +109,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::err;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -94,7 +118,7 @@
         let matcher = err(eq(1));
         let value: std::result::Result<i32, i32> = Err(1);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -104,7 +128,7 @@
         let matcher = err(eq(1));
         let value: std::result::Result<i32, i32> = Err(0);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -114,12 +138,30 @@
         let matcher = err(eq(1));
         let value: std::result::Result<i32, i32> = Ok(1);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
+    fn err_matches_result_with_err_value_by_ref() -> Result<()> {
+        let value: std::result::Result<String, String> = Err("123".to_string());
+        verify_that!(value, err(eq("123")))
+    }
+
+    #[test]
+    fn err_does_not_match_result_with_wrong_err_value_by_ref() -> Result<()> {
+        let value: std::result::Result<String, String> = Err("321".to_string());
+        verify_that!(value, not(err(eq("123"))))
+    }
+
+    #[test]
+    fn err_does_not_match_result_with_ok_by_ref() -> Result<()> {
+        let value: std::result::Result<String, String> = Ok("123".to_string());
+        verify_that!(value, not(err(eq("123"))))
+    }
+
+    #[test]
     fn err_full_error_message() -> Result<()> {
         let result = verify_that!(Err::<i32, i32>(1), err(eq(2)));
 
@@ -138,15 +180,102 @@
     }
 
     #[test]
-    fn err_describe_matches() -> Result<()> {
-        let matcher = super::ErrMatcher::<i32, i32, _> {
-            inner: eq(1),
-            phantom_t: Default::default(),
-            phantom_e: Default::default(),
-        };
+    fn err_describe_match() -> Result<()> {
+        let matcher = err(eq(1));
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<std::result::Result<i32, i32>>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is an error which is equal to 1"))
         )
     }
+
+    #[test]
+    fn err_describe_no_match() -> Result<()> {
+        let matcher = err(eq(1));
+        verify_that!(
+            Matcher::<std::result::Result<i32, i32>>::describe(&matcher, MatcherResult::NoMatch),
+            displays_as(eq(
+                "is a success or is an error containing a value which isn't equal to 1"
+            ))
+        )
+    }
+
+    #[test]
+    fn err_describe_match_by_ref() -> Result<()> {
+        let matcher = err(eq("123"));
+        verify_that!(
+            Matcher::<&std::result::Result<String, String>>::describe(
+                &matcher,
+                MatcherResult::Match
+            ),
+            displays_as(eq("is an error which is equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn err_describe_no_match_by_ref() -> Result<()> {
+        let matcher = err(eq("123"));
+        verify_that!(
+            Matcher::<&std::result::Result<String, String>>::describe(
+                &matcher,
+                MatcherResult::NoMatch
+            ),
+            displays_as(eq(
+                "is a success or is an error containing a value which isn't equal to \"123\""
+            ))
+        )
+    }
+
+    #[test]
+    fn err_explain_match_success() -> Result<()> {
+        let actual: std::result::Result<i32, i32> = Err(1);
+        let matcher = err(eq(1));
+        verify_that!(
+            matcher.explain_match(actual),
+            displays_as(eq("which is an error\n  which is equal to 1"))
+        )
+    }
+
+    #[test]
+    fn err_explain_match_fail() -> Result<()> {
+        let actual: std::result::Result<i32, i32> = Err(2);
+        let matcher = err(eq(1));
+        verify_that!(
+            matcher.explain_match(actual),
+            displays_as(eq("which is an error\n  which isn't equal to 1"))
+        )
+    }
+
+    #[test]
+    fn err_explain_match_ok() -> Result<()> {
+        let actual: std::result::Result<i32, i32> = Ok(1);
+        let matcher = err(eq(1));
+        verify_that!(matcher.explain_match(actual), displays_as(eq("which is a success")))
+    }
+
+    #[test]
+    fn err_explain_match_success_by_ref() -> Result<()> {
+        let actual: std::result::Result<String, String> = Err("123".to_string());
+        let matcher = err(eq("123"));
+        verify_that!(
+            matcher.explain_match(&actual),
+            displays_as(eq("which is an error\n  which is equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn err_explain_match_fail_by_ref() -> Result<()> {
+        let actual: std::result::Result<String, String> = Err("321".to_string());
+        let matcher = err(eq("123"));
+        verify_that!(
+            matcher.explain_match(&actual),
+            displays_as(eq("which is an error\n  which isn't equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn err_explain_match_ok_by_ref() -> Result<()> {
+        let actual: std::result::Result<String, String> = Ok("123".to_string());
+        let matcher = err(eq("123"));
+        verify_that!(matcher.explain_match(&actual), displays_as(eq("which is a success")))
+    }
 }

crates/googletest/src/matchers/field_matcher.rs

diff --git a/crates/googletest/src/matchers/field_matcher.rs b/crates/googletest/src/matchers/field_matcher.rs
index fc37ce6..58a55c6 100644
--- a/crates/googletest/src/matchers/field_matcher.rs
+++ b/crates/googletest/src/matchers/field_matcher.rs
@@ -33,7 +33,7 @@
 ///   int: i32
 /// }
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(IntField{int: 32}, field!(IntField.int, eq(32)))?;
+/// verify_that!(IntField{int: 32}, field!(&IntField.int, eq(32)))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -46,7 +46,7 @@
 /// #[derive(Debug)]
 /// struct IntField(i32);
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(IntField(32), field!(IntField.0, eq(32)))?;
+/// verify_that!(IntField(32), field!(&IntField.0, eq(32)))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -63,11 +63,11 @@
 ///     B,
 /// }
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(MyEnum::A(32), field!(MyEnum::A.0, eq(32)))?; // Passes
+/// verify_that!(MyEnum::A(32), field!(&MyEnum::A.0, eq(32)))?; // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
-/// verify_that!(MyEnum::B, field!(MyEnum::A.0, eq(32)))?; // Fails: wrong enum variant
+/// verify_that!(MyEnum::B, field!(&MyEnum::A.0, eq(32)))?; // Fails: wrong enum variant
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -83,7 +83,22 @@
 ///     pub struct AStruct(pub i32);
 /// }
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(a_module::AStruct(32), field!(a_module::AStruct.0, eq(32)))?;
+/// verify_that!(a_module::AStruct(32), field!(&a_module::AStruct.0, eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// If the inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// struct IntField {
+///   int: i32
+/// }
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(IntField{int: 32}, field!(&IntField.int, 32))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -105,6 +120,67 @@
 /// # }
 /// ```
 ///
+/// # Specification of the field pattern
+///
+/// The specification of the field follow the syntax: `(ref)? (&)?
+/// $TYPE.$FIELD`.
+/// The `&` allows to specify whether this matcher matches against an actual of
+/// type `$TYPE` (`$TYPE`` must implement `Copy`) or a `&$TYPE`.
+///
+/// For instance:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct AStruct{a_field: i32};
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct{a_field: 32}, field!(&AStruct.a_field, eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug, Clone, Copy)]
+/// pub struct AStruct{a_field: i32};
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct{a_field: 32}, field!(AStruct.a_field, eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// The `ref` allows to bind the field value by reference, which is required if
+/// the field type does not implement `Copy`.
+///
+/// For instance:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct AStruct{a_field: i32};
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct{a_field: 32}, field!(&AStruct.a_field, eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// If `field!` is qualified by both `&` and `ref`, they can both be omitted.
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct AStruct{a_field: String};
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct{a_field: "32".into()}, field!(&AStruct.a_field, ref eq("32")))?;
+/// verify_that!(AStruct{a_field: "32".into()}, field!(AStruct.a_field, eq("32")))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
 /// See also the macro [`property`][crate::matchers::property] for an analogous
 /// mechanism to extract a datum by invoking a method.
 #[macro_export]
@@ -115,15 +191,16 @@
 
 // Internal-only macro created so that the macro definition does not appear in
 // generated documentation.
+// We cannot use `path` or `ty` to capture the type as we are terminating the
+// type with a . (dot).
 #[doc(hidden)]
 #[macro_export]
 macro_rules! field_internal {
-    ($($t:ident)::+.$field:tt, $m:expr) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::field_matcher;
-        field_matcher(
-            |o| {
+    (&$($t:ident)::+.$field:tt, ref $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::field_matcher(
+            |o: &_| {
                 match o {
-                    $($t)::* { $field: value, .. } => Some(value),
+                    &$($t)::* {$field: ref value, .. } => Some(value),
                     // The pattern below is unreachable if the type is a struct (as opposed to an
                     // enum). Since the macro can't know which it is, we always include it and just
                     // tell the compiler not to complain.
@@ -132,7 +209,37 @@
                 }
             },
             &stringify!($field),
-            $m)
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
+    }};
+    (&$($t:ident)::+.$field:tt, $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::field_matcher(
+            |o: &&_| {
+                match o {
+                    &$($t)::* {$field: value, .. } => Some(value),
+                    // The pattern below is unreachable if the type is a struct (as opposed to an
+                    // enum). Since the macro can't know which it is, we always include it and just
+                    // tell the compiler not to complain.
+                    #[allow(unreachable_patterns)]
+                    _ => None,
+                }
+            },
+            &stringify!($field),
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
+    }};
+    ($($t:ident)::+.$field:tt, $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::field_matcher(
+            |o: &_| {
+                match o {
+                    $($t)::* {$field: value, .. } => Some(value),
+                    // The pattern below is unreachable if the type is a struct (as opposed to an
+                    // enum). Since the macro can't know which it is, we always include it and just
+                    // tell the compiler not to complain.
+                    #[allow(unreachable_patterns)]
+                    _ => None,
+                }
+            },
+            &stringify!($field),
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
     }};
 }
 
@@ -143,7 +250,7 @@
 pub mod internal {
     use crate::{
         description::Description,
-        matcher::{Matcher, MatcherResult},
+        matcher::{Matcher, MatcherBase, MatcherResult},
     };
     use std::fmt::Debug;
 
@@ -152,26 +259,25 @@
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub fn field_matcher<OuterT: Debug, InnerT: Debug, InnerMatcher: Matcher<ActualT = InnerT>>(
+    pub fn field_matcher<OuterT, InnerT, InnerMatcher>(
         field_accessor: fn(&OuterT) -> Option<&InnerT>,
         field_path: &'static str,
         inner: InnerMatcher,
-    ) -> impl Matcher<ActualT = OuterT> {
+    ) -> FieldMatcher<OuterT, InnerT, InnerMatcher> {
         FieldMatcher { field_accessor, field_path, inner }
     }
 
-    struct FieldMatcher<OuterT, InnerT, InnerMatcher> {
+    #[derive(MatcherBase)]
+    pub struct FieldMatcher<OuterT, InnerT, InnerMatcher> {
         field_accessor: fn(&OuterT) -> Option<&InnerT>,
         field_path: &'static str,
         inner: InnerMatcher,
     }
 
-    impl<OuterT: Debug, InnerT: Debug, InnerMatcher: Matcher<ActualT = InnerT>> Matcher
-        for FieldMatcher<OuterT, InnerT, InnerMatcher>
+    impl<'a, OuterT: Debug + 'a, InnerT: Debug + 'a, InnerMatcher: Matcher<&'a InnerT>>
+        Matcher<&'a OuterT> for FieldMatcher<OuterT, InnerT, InnerMatcher>
     {
-        type ActualT = OuterT;
-
-        fn matches(&self, actual: &OuterT) -> MatcherResult {
+        fn matches(&self, actual: &'a OuterT) -> MatcherResult {
             if let Some(value) = (self.field_accessor)(actual) {
                 self.inner.matches(value)
             } else {
@@ -179,7 +285,7 @@
             }
         }
 
-        fn explain_match(&self, actual: &OuterT) -> Description {
+        fn explain_match(&self, actual: &'a OuterT) -> Description {
             if let Some(actual) = (self.field_accessor)(actual) {
                 format!(
                     "which has field `{}`, {}",
@@ -204,4 +310,41 @@
             .into()
         }
     }
+
+    impl<OuterT: Debug + Copy, InnerT: Debug + Copy, InnerMatcher: Matcher<InnerT>> Matcher<OuterT>
+        for FieldMatcher<OuterT, InnerT, InnerMatcher>
+    {
+        fn matches(&self, actual: OuterT) -> MatcherResult {
+            if let Some(value) = (self.field_accessor)(&actual) {
+                self.inner.matches(*value)
+            } else {
+                MatcherResult::NoMatch
+            }
+        }
+
+        fn explain_match(&self, actual: OuterT) -> Description {
+            if let Some(actual) = (self.field_accessor)(&actual) {
+                format!(
+                    "which has field `{}`, {}",
+                    self.field_path,
+                    self.inner.explain_match(*actual)
+                )
+                .into()
+            } else {
+                let formatted_actual_value = format!("{actual:?}");
+                let without_fields = formatted_actual_value.split('(').next().unwrap_or("");
+                let without_fields = without_fields.split('{').next().unwrap_or("").trim_end();
+                format!("which has the wrong enum variant `{without_fields}`").into()
+            }
+        }
+
+        fn describe(&self, matcher_result: MatcherResult) -> Description {
+            format!(
+                "has field `{}`, which {}",
+                self.field_path,
+                self.inner.describe(matcher_result)
+            )
+            .into()
+        }
+    }
 }

crates/googletest/src/matchers/ge_matcher.rs

diff --git a/crates/googletest/src/matchers/ge_matcher.rs b/crates/googletest/src/matchers/ge_matcher.rs
index cb2a91f..4919f2c 100644
--- a/crates/googletest/src/matchers/ge_matcher.rs
+++ b/crates/googletest/src/matchers/ge_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a value greater than or equal to (in the sense of `>=`) `expected`.
 ///
@@ -74,24 +74,20 @@
 ///
 /// You can find the standard library `PartialOrd` implementation in
 /// <https://doc.rust-lang.org/core/cmp/trait.PartialOrd.html#implementors>
-pub fn ge<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug>(
-    expected: ExpectedT,
-) -> impl Matcher<ActualT = ActualT> {
-    GeMatcher::<ActualT, _> { expected, phantom: Default::default() }
+pub fn ge<ExpectedT>(expected: ExpectedT) -> GeMatcher<ExpectedT> {
+    GeMatcher { expected }
 }
 
-struct GeMatcher<ActualT, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct GeMatcher<ExpectedT> {
     expected: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
-    for GeMatcher<ActualT, ExpectedT>
+impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for GeMatcher<ExpectedT>
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        (*actual >= self.expected).into()
+    fn matches(&self, actual: ActualT) -> MatcherResult {
+        (actual >= self.expected).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -106,8 +102,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::ge;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::ffi::OsString;
@@ -122,7 +117,7 @@
     #[test]
     fn ge_does_not_match_smaller_i32() -> Result<()> {
         let matcher = ge(10);
-        let result = matcher.matches(&9);
+        let result = matcher.matches(9);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -134,7 +129,7 @@
     #[test]
     fn ge_does_not_match_lesser_str() -> Result<()> {
         let matcher = ge("z");
-        let result = matcher.matches(&"a");
+        let result = matcher.matches("a");
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 

crates/googletest/src/matchers/gt_matcher.rs

diff --git a/crates/googletest/src/matchers/gt_matcher.rs b/crates/googletest/src/matchers/gt_matcher.rs
index b52c6e3..123201f 100644
--- a/crates/googletest/src/matchers/gt_matcher.rs
+++ b/crates/googletest/src/matchers/gt_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a value greater (in the sense of `>`) than `expected`.
 ///
@@ -74,24 +74,20 @@
 ///
 /// You can find the standard library `PartialOrd` implementation in
 /// <https://doc.rust-lang.org/core/cmp/trait.PartialOrd.html#implementors>
-pub fn gt<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug>(
-    expected: ExpectedT,
-) -> impl Matcher<ActualT = ActualT> {
-    GtMatcher::<ActualT, _> { expected, phantom: Default::default() }
+pub fn gt<ExpectedT: Debug>(expected: ExpectedT) -> GtMatcher<ExpectedT> {
+    GtMatcher { expected }
 }
 
-struct GtMatcher<ActualT, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct GtMatcher<ExpectedT> {
     expected: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
-    for GtMatcher<ActualT, ExpectedT>
+impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for GtMatcher<ExpectedT>
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        (*actual > self.expected).into()
+    fn matches(&self, actual: ActualT) -> MatcherResult {
+        (actual > self.expected).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -106,8 +102,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::gt;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::ffi::OsString;
@@ -122,14 +117,14 @@
     #[test]
     fn gt_does_not_match_equal_i32() -> Result<()> {
         let matcher = gt(10);
-        let result = matcher.matches(&10);
+        let result = matcher.matches(10);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
     fn gt_does_not_match_lower_i32() -> Result<()> {
         let matcher = gt(-50);
-        let result = matcher.matches(&-51);
+        let result = matcher.matches(-51);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -141,7 +136,7 @@
     #[test]
     fn gt_does_not_match_lesser_str() -> Result<()> {
         let matcher = gt("B");
-        let result = matcher.matches(&"A");
+        let result = matcher.matches("A");
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -163,7 +158,7 @@
 
     #[test]
     fn gt_mismatch_combined_with_each() -> Result<()> {
-        let result = verify_that!(vec![19, 23, 11], each(gt(15)));
+        let result = verify_that!(vec![19, 23, 11], each(gt(&15)));
 
         verify_that!(
             result,
@@ -181,7 +176,7 @@
     #[test]
     fn gt_describe_matches() -> Result<()> {
         verify_that!(
-            gt::<i32, i32>(232).describe(MatcherResult::Match),
+            Matcher::<i32>::describe(&gt(232), MatcherResult::Match),
             displays_as(eq("is greater than 232"))
         )
     }
@@ -189,7 +184,7 @@
     #[test]
     fn gt_describe_does_not_match() -> Result<()> {
         verify_that!(
-            gt::<i32, i32>(232).describe(MatcherResult::NoMatch),
+            Matcher::<i32>::describe(&gt(232), MatcherResult::NoMatch),
             displays_as(eq("is less than or equal to 232"))
         )
     }

crates/googletest/src/matchers/has_entry_matcher.rs

diff --git a/crates/googletest/src/matchers/has_entry_matcher.rs b/crates/googletest/src/matchers/has_entry_matcher.rs
index 7f9d2ad..b5cce71 100644
--- a/crates/googletest/src/matchers/has_entry_matcher.rs
+++ b/crates/googletest/src/matchers/has_entry_matcher.rs
@@ -13,31 +13,30 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::hash::Hash;
-use std::marker::PhantomData;
 
-/// Matches a HashMap containing the given `key` whose value is matched by the
-/// matcher `inner`.
+/// Matches a `&HashMap` containing the given `key` whose value is matched by
+/// the matcher `inner`.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # use std::collections::HashMap;
 /// # fn should_pass() -> Result<()> {
 /// let value = HashMap::from([(0, 1), (1, -1)]);
-/// verify_that!(value, has_entry(0, eq(1)))?;  // Passes
+/// verify_that!(value, has_entry(0, eq(&1)))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail_1() -> Result<()> {
 /// # let value = HashMap::from([(0, 1), (1, -1)]);
-/// verify_that!(value, has_entry(1, gt(0)))?;  // Fails: value not matched
+/// verify_that!(value, has_entry(1, gt(&0)))?;  // Fails: value not matched
 /// #     Ok(())
 /// # }
 /// # fn should_fail_2() -> Result<()> {
 /// # let value = HashMap::from([(0, 1), (1, -1)]);
-/// verify_that!(value, has_entry(2, eq(0)))?;  // Fails: key not present
+/// verify_that!(value, has_entry(2, eq(&0)))?;  // Fails: key not present
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -45,42 +44,33 @@
 /// # should_fail_2().unwrap_err();
 /// ```
 ///
-/// Note: One could obtain the same effect by collecting entries into a `Vec`
-/// and using `contains`:
+/// Note: One could obtain the same effect by using `contains` and a
+/// `Matcher<(&Key, &Value)>`:
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # use std::collections::HashMap;
 /// # fn should_pass() -> Result<()> {
 /// let value = HashMap::from([(0, 1), (1, -1)]);
-/// verify_that!(value.into_iter().collect::<Vec<_>>(), contains(eq((0, 1))))?;
+/// verify_that!(value, contains(eq((&0, &1))))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// ```
-///
-/// However, `has_entry` will offer somewhat better diagnostic messages in the
-/// case of assertion failure. And it avoid the extra allocation hidden in the
-/// code above.
-pub fn has_entry<KeyT: Debug + Eq + Hash, ValueT: Debug, MatcherT: Matcher<ActualT = ValueT>>(
-    key: KeyT,
-    inner: MatcherT,
-) -> impl Matcher<ActualT = HashMap<KeyT, ValueT>> {
-    HasEntryMatcher { key, inner, phantom: Default::default() }
+pub fn has_entry<KeyT, MatcherT>(key: KeyT, inner: MatcherT) -> HasEntryMatcher<KeyT, MatcherT> {
+    HasEntryMatcher { key, inner }
 }
 
-struct HasEntryMatcher<KeyT, ValueT, MatcherT> {
+#[derive(MatcherBase)]
+pub struct HasEntryMatcher<KeyT, MatcherT> {
     key: KeyT,
     inner: MatcherT,
-    phantom: PhantomData<ValueT>,
 }
 
-impl<KeyT: Debug + Eq + Hash, ValueT: Debug, MatcherT: Matcher<ActualT = ValueT>> Matcher
-    for HasEntryMatcher<KeyT, ValueT, MatcherT>
+impl<'a, KeyT: Debug + Eq + Hash, ValueT: Debug, MatcherT: Matcher<&'a ValueT>>
+    Matcher<&'a HashMap<KeyT, ValueT>> for HasEntryMatcher<KeyT, MatcherT>
 {
-    type ActualT = HashMap<KeyT, ValueT>;
-
-    fn matches(&self, actual: &HashMap<KeyT, ValueT>) -> MatcherResult {
+    fn matches(&self, actual: &'a HashMap<KeyT, ValueT>) -> MatcherResult {
         if let Some(value) = actual.get(&self.key) {
             self.inner.matches(value)
         } else {
@@ -88,7 +78,7 @@
         }
     }
 
-    fn explain_match(&self, actual: &HashMap<KeyT, ValueT>) -> Description {
+    fn explain_match(&self, actual: &'a HashMap<KeyT, ValueT>) -> Description {
         if let Some(value) = actual.get(&self.key) {
             format!(
                 "which contains key {:?}, but is mapped to value {:#?}, {}",
@@ -123,7 +113,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::has_entry;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashMap;
@@ -131,30 +120,30 @@
     #[test]
     fn has_entry_does_not_match_empty_hash_map() -> Result<()> {
         let value: HashMap<i32, i32> = HashMap::new();
-        verify_that!(value, not(has_entry(0, eq(0))))
+        verify_that!(&value, not(has_entry(0, eq(&0))))
     }
 
     #[test]
     fn has_entry_matches_hash_map_with_value() -> Result<()> {
         let value: HashMap<i32, i32> = HashMap::from([(0, 0)]);
-        verify_that!(value, has_entry(0, eq(0)))
+        verify_that!(&value, has_entry(0, eq(&0)))
     }
 
     #[test]
     fn has_entry_does_not_match_hash_map_with_wrong_value() -> Result<()> {
         let value: HashMap<i32, i32> = HashMap::from([(0, 1)]);
-        verify_that!(value, not(has_entry(0, eq(0))))
+        verify_that!(&value, not(has_entry(0, eq(&0))))
     }
 
     #[test]
     fn has_entry_does_not_match_hash_map_with_wrong_key() -> Result<()> {
         let value: HashMap<i32, i32> = HashMap::from([(1, 0)]);
-        verify_that!(value, not(has_entry(0, eq(0))))
+        verify_that!(&value, not(has_entry(0, eq(&0))))
     }
 
     #[test]
     fn has_entry_shows_correct_message_when_key_is_not_present() -> Result<()> {
-        let result = verify_that!(HashMap::from([(0, 0)]), has_entry(1, eq(0)));
+        let result = verify_that!(HashMap::from([(0, 0)]), has_entry(1, eq(&0)));
 
         verify_that!(
             result,
@@ -171,7 +160,7 @@
 
     #[test]
     fn has_entry_shows_correct_message_when_key_has_non_matching_value() -> Result<()> {
-        let result = verify_that!(HashMap::from([(0, 0)]), has_entry(0, eq(1)));
+        let result = verify_that!(HashMap::from([(0, 0)]), has_entry(0, eq(&1)));
 
         verify_that!(
             result,

crates/googletest/src/matchers/is_encoded_string_matcher.rs

diff --git a/crates/googletest/src/matchers/is_encoded_string_matcher.rs b/crates/googletest/src/matchers/is_encoded_string_matcher.rs
index d2fb259..098658b 100644
--- a/crates/googletest/src/matchers/is_encoded_string_matcher.rs
+++ b/crates/googletest/src/matchers/is_encoded_string_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a byte sequence which is a UTF-8 encoded string matched by `inner`.
 ///
@@ -48,30 +48,26 @@
 /// # should_fail_1().unwrap_err();
 /// # should_fail_2().unwrap_err();
 /// ```
-pub fn is_utf8_string<'a, ActualT: AsRef<[u8]> + Debug + 'a, InnerMatcherT>(
-    inner: InnerMatcherT,
-) -> impl Matcher<ActualT = ActualT>
+pub fn is_utf8_string<InnerMatcherT>(inner: InnerMatcherT) -> IsEncodedStringMatcher<InnerMatcherT>
 where
-    InnerMatcherT: Matcher<ActualT = String>,
+    InnerMatcherT: for<'a> Matcher<&'a str>,
 {
-    IsEncodedStringMatcher { inner, phantom: Default::default() }
+    IsEncodedStringMatcher { inner }
 }
 
-struct IsEncodedStringMatcher<ActualT, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct IsEncodedStringMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<'a, ActualT: AsRef<[u8]> + Debug + 'a, InnerMatcherT> Matcher
-    for IsEncodedStringMatcher<ActualT, InnerMatcherT>
+impl<ActualT: AsRef<[u8]> + Debug + Copy, InnerMatcherT> Matcher<ActualT>
+    for IsEncodedStringMatcher<InnerMatcherT>
 where
-    InnerMatcherT: Matcher<ActualT = String>,
+    InnerMatcherT: for<'a> Matcher<&'a str>,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
-        String::from_utf8(actual.as_ref().to_vec())
-            .map(|s| self.inner.matches(&s))
+    fn matches(&self, actual: ActualT) -> MatcherResult {
+        std::str::from_utf8(actual.as_ref())
+            .map(|s| self.inner.matches(s))
             .unwrap_or(MatcherResult::NoMatch)
     }
 
@@ -90,10 +86,10 @@
         }
     }
 
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
-        match String::from_utf8(actual.as_ref().to_vec()) {
+    fn explain_match(&self, actual: ActualT) -> Description {
+        match std::str::from_utf8(actual.as_ref()) {
             Ok(s) => {
-                format!("which is a UTF-8 encoded string {}", self.inner.explain_match(&s)).into()
+                format!("which is a UTF-8 encoded string {}", self.inner.explain_match(s)).into()
             }
             Err(e) => format!("which is not a UTF-8 encoded string: {e}").into(),
         }
@@ -132,27 +128,27 @@
 
     #[test]
     fn has_correct_description_in_matched_case() -> Result<()> {
-        let matcher = is_utf8_string::<&[u8], _>(eq("A string"));
+        let matcher = is_utf8_string(eq("A string"));
 
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<&[u8]>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is a UTF-8 encoded string which is equal to \"A string\""))
         )
     }
 
     #[test]
     fn has_correct_description_in_not_matched_case() -> Result<()> {
-        let matcher = is_utf8_string::<&[u8], _>(eq("A string"));
+        let matcher = is_utf8_string(eq("A string"));
 
         verify_that!(
-            matcher.describe(MatcherResult::NoMatch),
+            Matcher::<&[u8]>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("is not a UTF-8 encoded string which is equal to \"A string\""))
         )
     }
 
     #[test]
     fn has_correct_explanation_in_matched_case() -> Result<()> {
-        let explanation = is_utf8_string(eq("A string")).explain_match(&"A string".as_bytes());
+        let explanation = is_utf8_string(eq("A string")).explain_match("A string".as_bytes());
 
         verify_that!(
             explanation,
@@ -162,15 +158,14 @@
 
     #[test]
     fn has_correct_explanation_when_byte_array_is_not_utf8_encoded() -> Result<()> {
-        let explanation = is_utf8_string(eq("A string")).explain_match(&&[192, 128, 0, 64]);
+        let explanation = is_utf8_string(eq("A string")).explain_match([192, 128, 0, 64]);
 
         verify_that!(explanation, displays_as(starts_with("which is not a UTF-8 encoded string: ")))
     }
 
     #[test]
     fn has_correct_explanation_when_inner_matcher_does_not_match() -> Result<()> {
-        let explanation =
-            is_utf8_string(eq("A string")).explain_match(&"Another string".as_bytes());
+        let explanation = is_utf8_string(eq("A string")).explain_match("Another string".as_bytes());
 
         verify_that!(
             explanation,

crates/googletest/src/matchers/is_matcher.rs

diff --git a/crates/googletest/src/matchers/is_matcher.rs b/crates/googletest/src/matchers/is_matcher.rs
index 336ce53..3748858 100644
--- a/crates/googletest/src/matchers/is_matcher.rs
+++ b/crates/googletest/src/matchers/is_matcher.rs
@@ -16,34 +16,29 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches precisely values matched by `inner`.
 ///
 /// The returned matcher produces a description prefixed by the string
 /// `description`. This is useful in contexts where the test assertion failure
 /// output must include the additional description.
-pub fn is<'a, ActualT: Debug + 'a, InnerMatcherT: Matcher<ActualT = ActualT> + 'a>(
-    description: &'a str,
-    inner: InnerMatcherT,
-) -> impl Matcher<ActualT = ActualT> + 'a {
-    IsMatcher { description, inner, phantom: Default::default() }
+pub fn is<InnerMatcherT>(description: &str, inner: InnerMatcherT) -> IsMatcher<'_, InnerMatcherT> {
+    IsMatcher { description, inner }
 }
 
-struct IsMatcher<'a, ActualT, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct IsMatcher<'a, InnerMatcherT> {
     description: &'a str,
     inner: InnerMatcherT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<'a, ActualT: Debug, InnerMatcherT: Matcher<ActualT = ActualT>> Matcher
-    for IsMatcher<'a, ActualT, InnerMatcherT>
+impl<'a, ActualT: Debug + Copy, InnerMatcherT: Matcher<ActualT>> Matcher<ActualT>
+    for IsMatcher<'a, InnerMatcherT>
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         self.inner.matches(actual)
     }
 
@@ -64,7 +59,7 @@
         }
     }
 
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         self.inner.explain_match(actual)
     }
 }

crates/googletest/src/matchers/is_nan_matcher.rs

diff --git a/crates/googletest/src/matchers/is_nan_matcher.rs b/crates/googletest/src/matchers/is_nan_matcher.rs
index 0af4338..f6fae89 100644
--- a/crates/googletest/src/matchers/is_nan_matcher.rs
+++ b/crates/googletest/src/matchers/is_nan_matcher.rs
@@ -14,22 +14,21 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
 use num_traits::float::Float;
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a floating point value which is NaN.
-pub fn is_nan<T: Float + Debug>() -> impl Matcher<ActualT = T> {
-    IsNanMatcher::<T>(Default::default())
+pub fn is_nan() -> IsNanMatcher {
+    IsNanMatcher
 }
 
-struct IsNanMatcher<T>(PhantomData<T>);
+#[derive(MatcherBase)]
+pub struct IsNanMatcher;
 
-impl<T: Float + Debug> Matcher for IsNanMatcher<T> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+impl<T: Float + Debug + Copy> Matcher<T> for IsNanMatcher {
+    fn matches(&self, actual: T) -> MatcherResult {
         actual.is_nan().into()
     }
 
@@ -40,7 +39,6 @@
 
 #[cfg(test)]
 mod tests {
-    use super::is_nan;
     use crate::prelude::*;
 
     #[test]

crates/googletest/src/matchers/le_matcher.rs

diff --git a/crates/googletest/src/matchers/le_matcher.rs b/crates/googletest/src/matchers/le_matcher.rs
index cfc5781..980c516 100644
--- a/crates/googletest/src/matchers/le_matcher.rs
+++ b/crates/googletest/src/matchers/le_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a value less than or equal to (in the sense of `<=`) `expected`.
 ///
@@ -74,24 +74,20 @@
 ///
 /// You can find the standard library `PartialOrd` implementation in
 /// <https://doc.rust-lang.org/core/cmp/trait.PartialOrd.html#implementors>
-pub fn le<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug>(
-    expected: ExpectedT,
-) -> impl Matcher<ActualT = ActualT> {
-    LeMatcher::<ActualT, _> { expected, phantom: Default::default() }
+pub fn le<ExpectedT>(expected: ExpectedT) -> LeMatcher<ExpectedT> {
+    LeMatcher { expected }
 }
 
-struct LeMatcher<ActualT, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct LeMatcher<ExpectedT> {
     expected: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
-    for LeMatcher<ActualT, ExpectedT>
+impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for LeMatcher<ExpectedT>
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        (*actual <= self.expected).into()
+    fn matches(&self, actual: ActualT) -> MatcherResult {
+        (actual <= self.expected).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -104,8 +100,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::le;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::ffi::OsString;
@@ -120,7 +115,7 @@
     #[test]
     fn le_does_not_match_bigger_i32() -> Result<()> {
         let matcher = le(0);
-        let result = matcher.matches(&1);
+        let result = matcher.matches(1);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -132,7 +127,7 @@
     #[test]
     fn le_does_not_match_bigger_str() -> Result<()> {
         let matcher = le("a");
-        let result = matcher.matches(&"z");
+        let result = matcher.matches("z");
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -186,7 +181,7 @@
         /// A custom "number" that is lower than all other numbers. The only
         /// things we define about this "special" number is `PartialOrd` and
         /// `PartialEq` against `u32`.
-        #[derive(Debug)]
+        #[derive(Debug, Clone, Copy)]
         struct VeryLowNumber {}
 
         impl std::cmp::PartialEq<u32> for VeryLowNumber {

crates/googletest/src/matchers/len_matcher.rs

diff --git a/crates/googletest/src/matchers/len_matcher.rs b/crates/googletest/src/matchers/len_matcher.rs
index be903c9..a48d32c 100644
--- a/crates/googletest/src/matchers/len_matcher.rs
+++ b/crates/googletest/src/matchers/len_matcher.rs
@@ -13,16 +13,15 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use crate::matcher_support::count_elements::count_elements;
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a container whose number of elements matches `expected`.
 ///
 /// This matches against a container over which one can iterate. This includes
-/// the standard Rust containers, arrays, and (when dereferenced) slices. More
-/// precisely, a shared borrow of the actual type must implement
-/// [`IntoIterator`].
+/// the standard Rust containers, arrays, and slices. More
+/// precisely, the actual type must implement [`IntoIterator`].
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -49,26 +48,21 @@
 /// # }
 /// # should_pass().unwrap();
 /// ```
-pub fn len<T: Debug + ?Sized, E: Matcher<ActualT = usize>>(expected: E) -> impl Matcher<ActualT = T>
-where
-    for<'a> &'a T: IntoIterator,
-{
-    LenMatcher { expected, phantom: Default::default() }
+pub fn len<E>(expected: E) -> LenMatcher<E> {
+    LenMatcher { expected }
 }
 
-struct LenMatcher<T: ?Sized, E> {
+#[derive(MatcherBase)]
+pub struct LenMatcher<E> {
     expected: E,
-    phantom: PhantomData<T>,
 }
 
-impl<T: Debug + ?Sized, E: Matcher<ActualT = usize>> Matcher for LenMatcher<T, E>
+impl<T: Debug + Copy, E: Matcher<usize>> Matcher<T> for LenMatcher<E>
 where
-    for<'a> &'a T: IntoIterator,
+    T: IntoIterator,
 {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
-        self.expected.matches(&count_elements(actual))
+    fn matches(&self, actual: T) -> MatcherResult {
+        self.expected.matches(count_elements(actual))
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -83,25 +77,23 @@
         }
     }
 
-    fn explain_match(&self, actual: &T) -> Description {
+    fn explain_match(&self, actual: T) -> Description {
         let actual_size = count_elements(actual);
-        format!("which has length {}, {}", actual_size, self.expected.explain_match(&actual_size))
+        format!("which has length {}, {}", actual_size, self.expected.explain_match(actual_size))
             .into()
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::len;
     use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::{
         BTreeMap, BTreeSet, BinaryHeap, HashMap, HashSet, LinkedList, VecDeque,
     };
     use std::fmt::Debug;
-    use std::marker::PhantomData;
 
     #[test]
     fn len_matcher_match_vec() -> Result<()> {
@@ -112,7 +104,7 @@
     #[test]
     fn len_matcher_match_array_reference() -> Result<()> {
         let value = &[1, 2, 3];
-        verify_that!(*value, len(eq(3)))
+        verify_that!(value, len(eq(3)))
     }
 
     #[test]
@@ -125,7 +117,7 @@
     fn len_matcher_match_slice_of_vec() -> Result<()> {
         let value = vec![1, 2, 3];
         let slice = value.as_slice();
-        verify_that!(*slice, len(eq(3)))
+        verify_that!(slice, len(eq(3)))
     }
 
     #[test]
@@ -178,11 +170,10 @@
 
     #[test]
     fn len_matcher_explain_match() -> Result<()> {
-        struct TestMatcher<T>(PhantomData<T>);
-        impl<T: Debug> Matcher for TestMatcher<T> {
-            type ActualT = T;
-
-            fn matches(&self, _: &T) -> MatcherResult {
+        #[derive(MatcherBase)]
+        struct TestMatcher;
+        impl<T: Debug + Copy> Matcher<T> for TestMatcher {
+            fn matches(&self, _: T) -> MatcherResult {
                 false.into()
             }
 
@@ -190,12 +181,12 @@
                 "called described".into()
             }
 
-            fn explain_match(&self, _: &T) -> Description {
+            fn explain_match(&self, _: T) -> Description {
                 "called explain_match".into()
             }
         }
         verify_that!(
-            len(TestMatcher(Default::default())).explain_match(&[1, 2, 3]),
+            len(TestMatcher).explain_match([1, 2, 3]),
             displays_as(eq("which has length 3, called explain_match"))
         )
     }

crates/googletest/src/matchers/lt_matcher.rs

diff --git a/crates/googletest/src/matchers/lt_matcher.rs b/crates/googletest/src/matchers/lt_matcher.rs
index 08bc563..1758e83 100644
--- a/crates/googletest/src/matchers/lt_matcher.rs
+++ b/crates/googletest/src/matchers/lt_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a value less (in the sense of `<`) than `expected`.
 ///
@@ -74,24 +74,20 @@
 ///
 /// You can find the standard library `PartialOrd` implementation in
 /// <https://doc.rust-lang.org/core/cmp/trait.PartialOrd.html#implementors>
-pub fn lt<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug>(
-    expected: ExpectedT,
-) -> impl Matcher<ActualT = ActualT> {
-    LtMatcher::<ActualT, _> { expected, phantom: Default::default() }
+pub fn lt<ExpectedT>(expected: ExpectedT) -> LtMatcher<ExpectedT> {
+    LtMatcher { expected }
 }
 
-struct LtMatcher<ActualT, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct LtMatcher<ExpectedT> {
     expected: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
-    for LtMatcher<ActualT, ExpectedT>
+impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for LtMatcher<ExpectedT>
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        (*actual < self.expected).into()
+    fn matches(&self, actual: ActualT) -> MatcherResult {
+        (actual < self.expected).into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -106,8 +102,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::lt;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::ffi::OsString;
@@ -122,14 +117,14 @@
     #[test]
     fn lt_does_not_match_equal_i32() -> Result<()> {
         let matcher = lt(10);
-        let result = matcher.matches(&10);
+        let result = matcher.matches(10);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
     fn lt_does_not_match_lower_i32() -> Result<()> {
         let matcher = lt(-50);
-        let result = matcher.matches(&50);
+        let result = matcher.matches(50);
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -141,7 +136,7 @@
     #[test]
     fn lt_does_not_match_bigger_str() -> Result<()> {
         let matcher = lt("ab");
-        let result = matcher.matches(&"az");
+        let result = matcher.matches("az");
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
@@ -195,7 +190,7 @@
         /// A custom "number" that is smaller than all other numbers. The only
         /// things we define about this "special" number is `PartialOrd` and
         /// `PartialEq` against `u32`.
-        #[derive(Debug)]
+        #[derive(Debug, Clone, Copy)]
         struct VeryLowNumber {}
 
         impl std::cmp::PartialEq<u32> for VeryLowNumber {

crates/googletest/src/matchers/matches_pattern.rs

diff --git a/crates/googletest/src/matchers/matches_pattern.rs b/crates/googletest/src/matchers/matches_pattern.rs
index 106a5d7..7dc9ce3 100644
--- a/crates/googletest/src/matchers/matches_pattern.rs
+++ b/crates/googletest/src/matchers/matches_pattern.rs
@@ -84,7 +84,7 @@
 ///     a_nested_struct: MyInnerStruct { a_field: "Something to believe in".into() },
 /// };
 /// verify_that!(my_struct, matches_pattern!(MyStruct {
-///     a_nested_struct: matches_pattern!(MyInnerStruct {
+///      a_nested_struct: matches_pattern!(MyInnerStruct {
 ///         a_field: starts_with("Something"),
 ///     }),
 /// }))
@@ -138,12 +138,33 @@
 /// #     .unwrap();
 /// ```
 ///
+/// If an inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// struct MyStruct {
+///     a_field: String,
+///     another_field: String,
+/// }
+///
+/// let my_struct = MyStruct {
+///     a_field: "this".into(),
+///     another_field: "that".into()
+/// };
+/// verify_that!(my_struct, matches_pattern!(MyStruct {
+///     a_field: "this",
+///     another_field: "that",
+/// }))
+/// #     .unwrap();
+/// ```
+///
 /// **Important**: The method should be pure function with a deterministic
 /// output and no side effects. In particular, in the event of an assertion
 /// failure, it will be invoked a second time, with the assertion failure output
 /// reflecting the *second* invocation.
 ///
-/// These may also include extra parameters you pass in:
+/// These may also include extra litteral parameters you pass in:
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -157,13 +178,14 @@
 /// }
 ///
 /// # let my_struct = MyStruct { a_field: "Something to believe in".into() };
-/// verify_that!(my_struct, matches_pattern!(MyStruct {
-///     append_to_a_field("a suffix"): ends_with("a suffix"),
+/// verify_that!(my_struct, matches_pattern!(&MyStruct {
+///     append_to_a_field("a suffix"): ref ends_with("a suffix"),
 /// }))
 /// #     .unwrap();
 /// ```
 ///
-/// If the method returns a reference, precede it with a `*`:
+/// You can precede both field and property matchers with a `ref` to match the
+/// result by reference:
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -173,12 +195,34 @@
 /// # }
 /// #
 /// impl MyStruct {
-///     fn get_a_field_ref(&self) -> &String { &self.a_field }
+///     fn get_a_field_ref(&self) -> String { self.a_field.clone() }
+/// }
+///
+/// # let my_struct = MyStruct { a_field: "Something to believe in".into() };
+/// verify_that!(my_struct, matches_pattern!(&MyStruct {
+///     get_a_field_ref(): ref starts_with("Something"),
+/// }))
+/// #    .unwrap();
+/// ```
+///
+/// Note that if the `actual` is of type `&ActualT` and the pattern type is
+/// `ActualT`, this is automatically performed. This behavior is similar to the
+/// reference binding mode in pattern matching.
+///
+/// ```
+/// # use googletest::prelude::*;
+/// # #[derive(Debug)]
+/// # struct MyStruct {
+/// #     a_field: String,
+/// # }
+/// #
+/// impl MyStruct {
+///     fn get_a_field_ref(&self) -> String { self.a_field.clone() }
 /// }
 ///
 /// # let my_struct = MyStruct { a_field: "Something to believe in".into() };
 /// verify_that!(my_struct, matches_pattern!(MyStruct {
-///     *get_a_field_ref(): starts_with("Something"),
+///     get_a_field_ref(): starts_with("Something"),
 /// }))
 /// #    .unwrap();
 /// ```
@@ -194,7 +238,7 @@
 /// let my_struct = MyTupleStruct("Something".into(), "Some other thing".into());
 /// verify_that!(
 ///     my_struct,
-///     matches_pattern!(MyTupleStruct(eq("Something"), eq("Some other thing")))
+///     matches_pattern!(&MyTupleStruct(ref eq("Something"), ref eq("Some other thing")))
 /// )
 /// #    .unwrap();
 /// ```
@@ -210,42 +254,34 @@
 /// }
 ///
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(MyEnum::A(123), matches_pattern!(MyEnum::A(eq(123))))?; // Passes
+/// verify_that!(MyEnum::A(123), matches_pattern!(&MyEnum::A(eq(123))))?; // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
-/// verify_that!(MyEnum::B, matches_pattern!(MyEnum::A(eq(123))))?; // Fails - wrong enum variant
+/// verify_that!(MyEnum::B, matches_pattern!(&MyEnum::A(eq(123))))?; // Fails - wrong enum variant
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// # should_fail().unwrap_err();
 /// ```
 ///
-/// This macro does not support plain (non-struct) tuples. Use the macro
-/// [`tuple`] for that purpose.
+/// This macro does not support plain (non-struct) tuples. But it should not be
+/// necessary as tuple of matchers are matchers of tuple. In other words, if
+/// `MatcherU: Matcher<U>` and `MatcherT: Matcher<T>`, then `(MatcherU,
+/// MatcherT): Matcher<(U, T)>`.
 ///
 /// Trailing commas are allowed (but not required) in both ordinary and tuple
 /// structs.
 ///
-/// Unfortunately, this matcher does *not* work with methods returning string
-/// slices:
+/// Note that the default format (rustfmt) can format macros if the macro
+/// argument is parseable Rust code. This is mostly true for this macro with two
+/// exceptions:
+///  * property matching
+///  * `ref` keyword with named fields
 ///
-/// ```compile_fail
-/// # use googletest::prelude::*;
-/// # #[derive(Debug)]
-/// pub struct MyStruct {
-///     a_string: String,
-/// }
-/// impl MyStruct {
-///     pub fn get_a_string(&self) -> &str { &self.a_string }
-/// }
-///
-/// let value = MyStruct { a_string: "A string".into() };
-/// verify_that!(value, matches_pattern!( MyStruct {
-///     get_a_string(): eq("A string"),   // Does not compile
-/// }))
-/// #    .unwrap();
-/// ```
+/// An option for formatting large is to avoid these exceptions (by removing the
+/// parenthesis of properties and the `ref` keywords), run `rustfmt` and add
+/// them back.
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __matches_pattern {
@@ -258,7 +294,17 @@
 #[macro_export]
 macro_rules! matches_pattern_internal {
     (
-        [$($struct_name:tt)*],
+        @name [$($struct_name:tt)*],
+        { $field_name:ident : ref $matcher:expr $(,)? }
+    ) => {
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(field!($($struct_name)*.$field_name, ref $matcher))
+        )
+    };
+
+    (
+        @name [$($struct_name:tt)*],
         { $field_name:ident : $matcher:expr $(,)? }
     ) => {
         $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
@@ -268,7 +314,17 @@
     };
 
     (
-        [$($struct_name:tt)*],
+        @name [$($struct_name:tt)*],
+        { $property_name:ident($($argument:expr),* $(,)?) : ref $matcher:expr $(,)? }
+    ) => {
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(property!($($struct_name)*.$property_name($($argument),*), ref $matcher))
+        )
+    };
+
+    (
+        @name [$($struct_name:tt)*],
         { $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr $(,)? }
     ) => {
         $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
@@ -278,88 +334,123 @@
     };
 
     (
-        [$($struct_name:tt)*],
-        { * $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr $(,)? }
-    ) => {
-        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
-            stringify!($($struct_name)*),
-            all!(property!(* $($struct_name)*.$property_name($($argument),*), $matcher))
-        )
-    };
-
-    (
-        [$($struct_name:tt)*],
-        { $field_name:ident : $matcher:expr, $($rest:tt)* }
+        @name [$($struct_name:tt)*],
+        { $field_name:ident : ref $matcher:expr, $($rest:tt)* }
     ) => {
         $crate::matches_pattern_internal!(
-            all!(field!($($struct_name)*.$field_name, $matcher)),
+            @fields (field!($($struct_name)*.$field_name, ref $matcher)),
             [$($struct_name)*],
             { $($rest)* }
         )
     };
 
     (
-        [$($struct_name:tt)*],
+        @name [$($struct_name:tt)*],
+        { $field_name:ident : $matcher:expr, $($rest:tt)* }
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (field!($($struct_name)*.$field_name, $matcher)),
+            [$($struct_name)*],
+            { $($rest)* }
+        )
+    };
+
+    (
+        @name [$($struct_name:tt)*],
+        { $property_name:ident($($argument:expr),* $(,)?) : ref $matcher:expr, $($rest:tt)* }
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (property!($($struct_name)*.$property_name($($argument),*), ref $matcher)),
+            [$($struct_name)*],
+            { $($rest)* }
+        )
+    };
+
+    (
+        @name [$($struct_name:tt)*],
         { $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr, $($rest:tt)* }
     ) => {
         $crate::matches_pattern_internal!(
-            all!(property!($($struct_name)*.$property_name($($argument),*), $matcher)),
+            @fields (property!($($struct_name)*.$property_name($($argument),*), $matcher)),
             [$($struct_name)*],
             { $($rest)* }
         )
     };
 
     (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
-        { * $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr, $($rest:tt)* }
+        { $field_name:ident : ref $matcher:expr $(,)? }
     ) => {
-        $crate::matches_pattern_internal!(
-            all!(property!(* $($struct_name)*.$property_name($($argument),*), $matcher)),
-            [$($struct_name)*],
-            { $($rest)* }
-        )
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                field!($($struct_name)*.$field_name, ref $matcher)
+            ))
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         { $field_name:ident : $matcher:expr $(,)? }
     ) => {
-        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(stringify!($($struct_name)*), all!(
-            $($processed)*,
-            field!($($struct_name)*.$field_name, $matcher)
-        ))
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                field!($($struct_name)*.$field_name, $matcher)
+            ))
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        { $property_name:ident($($argument:expr),* $(,)?) : ref $matcher:expr $(,)? }
+    ) => {
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                property!($($struct_name)*.$property_name($($argument),*), ref $matcher)
+            ))
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         { $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr $(,)? }
     ) => {
-        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(stringify!($($struct_name)*), all!(
-            $($processed)*,
-            property!($($struct_name)*.$property_name($($argument),*), $matcher)
-        ))
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                property!($($struct_name)*.$property_name($($argument),*), $matcher)
+            ))
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
-        { * $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr $(,)? }
+        { $field_name:ident : ref $matcher:expr, $($rest:tt)* }
     ) => {
-        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(stringify!($($struct_name)*), all!(
-            $($processed)*,
-            property!(* $($struct_name)*.$property_name($($argument),*), $matcher)
-        ))
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.$field_name, ref $matcher)
+            ),
+            [$($struct_name)*],
+            { $($rest)* }
+        )
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         { $field_name:ident : $matcher:expr, $($rest:tt)* }
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.$field_name, $matcher)
             ),
@@ -369,12 +460,27 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        { $property_name:ident($($argument:expr),* $(,)?) : ref $matcher:expr, $($rest:tt)* }
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                property!(ref $($struct_name)*.$property_name($($argument),*), $matcher)
+            ),
+            [$($struct_name)*],
+            { $($rest)* }
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         { $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr, $($rest:tt)* }
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 property!($($struct_name)*.$property_name($($argument),*), $matcher)
             ),
@@ -384,32 +490,26 @@
     };
 
     (
-        all!($($processed:tt)*),
-        [$($struct_name:tt)*],
-        { * $property_name:ident($($argument:expr),* $(,)?) : $matcher:expr, $($rest:tt)* }
+        @name [$($struct_name:tt)*],
     ) => {
-        $crate::matches_pattern_internal!(
-            all!(
-                $($processed)*,
-                property!(* $($struct_name)*.$property_name($($argument),*), $matcher)
-            ),
-            [$($struct_name)*],
-            { $($rest)* }
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::pattern_only(
+            |v| matches!(v, $($struct_name)*),
+            concat!("is ", stringify!($($struct_name)*)),
+            concat!("is not ", stringify!($($struct_name)*)))
+    };
+
+    (
+        @name [$($struct_name:tt)*],
+        (ref $matcher:expr $(,)?)
+    ) => {
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(field!($($struct_name)*.0, ref $matcher))
         )
     };
 
     (
-        [$($struct_name:tt)*],
-    ) => {
-        $crate::matchers::predicate(|v| matches!(v, $($struct_name)*))
-            .with_description(
-                concat!("is ", stringify!($($struct_name)*)),
-                concat!("is not ", stringify!($($struct_name)*)),
-            )
-    };
-
-    (
-        [$($struct_name:tt)*],
+        @name [$($struct_name:tt)*],
         ($matcher:expr $(,)?)
     ) => {
         $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
@@ -419,11 +519,25 @@
     };
 
     (
-        [$($struct_name:tt)*],
+        @name [$($struct_name:tt)*],
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                field!($($struct_name)*.0, ref $matcher)
+            ),
+            [$($struct_name)*],
+            1,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @name [$($struct_name:tt)*],
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 field!($($struct_name)*.0, $matcher)
             ),
             [$($struct_name)*],
@@ -433,28 +547,61 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        $field:tt,
+        (ref $matcher:expr $(,)?)
+    ) => {
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                field!($($struct_name)*.$field, ref $matcher)
+            ))
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         $field:tt,
         ($matcher:expr $(,)?)
     ) => {
-        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(stringify!($($struct_name)*), all!(
-            $($processed)*,
-            field!($($struct_name)*.$field, $matcher)
-        ))
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::is(
+            stringify!($($struct_name)*),
+            all!(
+                $($processed)*,
+                field!($($struct_name)*.$field, $matcher)
+            ))
     };
 
     // We need to repeat this once for every supported field position, unfortunately. There appears
     // to be no way in declarative macros to compute $field + 1 and have the result evaluated to a
     // token which can be used as a tuple index.
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        1,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.1, ref $matcher)
+            ),
+            [$($struct_name)*],
+            2,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         1,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.1, $matcher)
             ),
@@ -465,13 +612,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        2,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.2, ref $matcher)
+            ),
+            [$($struct_name)*],
+            3,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         2,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.2, $matcher)
             ),
@@ -482,13 +646,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        3,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.3, ref $matcher)
+            ),
+            [$($struct_name)*],
+            4,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         3,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.3, $matcher)
             ),
@@ -499,13 +680,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        4,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.4, ref $matcher)
+            ),
+            [$($struct_name)*],
+            5,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         4,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.4, $matcher)
             ),
@@ -516,13 +714,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        5,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.5, ref $matcher)
+            ),
+            [$($struct_name)*],
+            6,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         5,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.5, $matcher)
             ),
@@ -533,13 +748,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        6,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.6, ref $matcher)
+            ),
+            [$($struct_name)*],
+            7,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         6,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.6, $matcher)
             ),
@@ -550,13 +782,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        7,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.7, ref $matcher)
+            ),
+            [$($struct_name)*],
+            8,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         7,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.7, $matcher)
             ),
@@ -567,13 +816,30 @@
     };
 
     (
-        all!($($processed:tt)*),
+        @fields ($($processed:tt)*),
+        [$($struct_name:tt)*],
+        8,
+        (ref $matcher:expr, $($rest:tt)*)
+    ) => {
+        $crate::matches_pattern_internal!(
+            @fields (
+                $($processed)*,
+                field!($($struct_name)*.8, ref $matcher)
+            ),
+            [$($struct_name)*],
+            9,
+            ($($rest)*)
+        )
+    };
+
+    (
+        @fields ($($processed:tt)*),
         [$($struct_name:tt)*],
         8,
         ($matcher:expr, $($rest:tt)*)
     ) => {
         $crate::matches_pattern_internal!(
-            all!(
+            @fields (
                 $($processed)*,
                 field!($($struct_name)*.8, $matcher)
             ),
@@ -583,14 +849,14 @@
         )
     };
 
-    ([$($struct_name:tt)*], $first:tt $($rest:tt)*) => {
-        $crate::matches_pattern_internal!([$($struct_name)* $first], $($rest)*)
+    (@name [$($struct_name:tt)*], $first:tt $($rest:tt)*) => {
+        $crate::matches_pattern_internal!(@name [$($struct_name)* $first], $($rest)*)
     };
 
     ($first:tt $($rest:tt)*) => {{
         #[allow(unused)]
         use $crate::matchers::{all, field, property};
-        $crate::matches_pattern_internal!([$first], $($rest)*)
+        $crate::matches_pattern_internal!(@name [$first], $($rest)*)
     }};
 }
 
@@ -600,3 +866,59 @@
 macro_rules! __pat {
     ($($t:tt)*) => { $crate::matches_pattern_internal!($($t)*) }
 }
+
+#[doc(hidden)]
+pub mod internal {
+    use crate::matcher::{Matcher, MatcherBase};
+    use std::fmt::Debug;
+
+    // Specialized implementation of the `predicate` matcher to support ref binding
+    // mode for `matches_pattern`.
+    pub fn pattern_only<T>(
+        matcher_function: fn(&T) -> bool,
+        match_description: &'static str,
+        no_match_description: &'static str,
+    ) -> PatternOnlyMatcher<T> {
+        PatternOnlyMatcher { matcher_function, match_description, no_match_description }
+    }
+
+    #[derive(MatcherBase)]
+    #[doc(hidden)]
+    pub struct PatternOnlyMatcher<T> {
+        matcher_function: fn(&T) -> bool,
+        match_description: &'static str,
+        no_match_description: &'static str,
+    }
+
+    impl<'a, T: Debug> Matcher<&'a T> for PatternOnlyMatcher<T> {
+        fn matches(&self, actual: &'a T) -> crate::matcher::MatcherResult {
+            (self.matcher_function)(actual).into()
+        }
+
+        fn describe(
+            &self,
+            matcher_result: crate::matcher::MatcherResult,
+        ) -> crate::description::Description {
+            match matcher_result {
+                crate::matcher::MatcherResult::Match => self.match_description.into(),
+                crate::matcher::MatcherResult::NoMatch => self.no_match_description.into(),
+            }
+        }
+    }
+
+    impl<T: Debug + Copy> Matcher<T> for PatternOnlyMatcher<T> {
+        fn matches(&self, actual: T) -> crate::matcher::MatcherResult {
+            (self.matcher_function)(&actual).into()
+        }
+
+        fn describe(
+            &self,
+            matcher_result: crate::matcher::MatcherResult,
+        ) -> crate::description::Description {
+            match matcher_result {
+                crate::matcher::MatcherResult::Match => self.match_description.into(),
+                crate::matcher::MatcherResult::NoMatch => self.no_match_description.into(),
+            }
+        }
+    }
+}

crates/googletest/src/matchers/matches_regex_matcher.rs

diff --git a/crates/googletest/src/matchers/matches_regex_matcher.rs b/crates/googletest/src/matchers/matches_regex_matcher.rs
index 32b053b..2e00fb6 100644
--- a/crates/googletest/src/matchers/matches_regex_matcher.rs
+++ b/crates/googletest/src/matchers/matches_regex_matcher.rs
@@ -13,10 +13,9 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use regex::Regex;
 use std::fmt::Debug;
-use std::marker::PhantomData;
 use std::ops::Deref;
 
 /// Matches a string the entirety of which which matches the given regular
@@ -60,38 +59,31 @@
 // compiler treats it as a Matcher<str> only and the code
 //   verify_that!("Some value".to_string(), matches_regex(".*value"))?;
 // doesn't compile.
-pub fn matches_regex<ActualT: ?Sized, PatternT: Deref<Target = str>>(
+pub fn matches_regex<PatternT: Deref<Target = str>>(
     pattern: PatternT,
-) -> MatchesRegexMatcher<ActualT, PatternT> {
+) -> MatchesRegexMatcher<PatternT> {
     let adjusted_pattern = format!("^{}$", pattern.deref());
     let regex = Regex::new(adjusted_pattern.as_str()).unwrap();
-    MatchesRegexMatcher {
-        regex,
-        pattern,
-        _adjusted_pattern: adjusted_pattern,
-        phantom: Default::default(),
-    }
+    MatchesRegexMatcher { regex, pattern, _adjusted_pattern: adjusted_pattern }
 }
 
 /// A matcher matching a string-like type matching a given regular expression.
 ///
 /// Intended only to be used from the function [`matches_regex`] only.
 /// Should not be referenced by code outside this library.
-pub struct MatchesRegexMatcher<ActualT: ?Sized, PatternT: Deref<Target = str>> {
+#[derive(MatcherBase)]
+pub struct MatchesRegexMatcher<PatternT: Deref<Target = str>> {
     regex: Regex,
     pattern: PatternT,
     _adjusted_pattern: String,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<PatternT, ActualT> Matcher for MatchesRegexMatcher<ActualT, PatternT>
+impl<PatternT, ActualT> Matcher<ActualT> for MatchesRegexMatcher<PatternT>
 where
     PatternT: Deref<Target = str>,
-    ActualT: AsRef<str> + Debug + ?Sized,
+    ActualT: AsRef<str> + Debug + Copy,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         self.regex.is_match(actual.as_ref()).into()
     }
 
@@ -109,8 +101,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{matches_regex, MatchesRegexMatcher};
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
 
     #[test]
@@ -201,10 +192,10 @@
 
     #[test]
     fn matches_regex_displays_quoted_debug_of_pattern() -> Result<()> {
-        let matcher: MatchesRegexMatcher<&str, _> = matches_regex("\n");
+        let matcher = matches_regex("\n");
 
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("matches the regular expression \"\\n\""))
         )
     }

crates/googletest/src/matchers/mod.rs

diff --git a/crates/googletest/src/matchers/mod.rs b/crates/googletest/src/matchers/mod.rs
index 1e028b9..16ca900 100644
--- a/crates/googletest/src/matchers/mod.rs
+++ b/crates/googletest/src/matchers/mod.rs
@@ -17,17 +17,18 @@
 mod all_matcher;
 mod any_matcher;
 mod anything_matcher;
+mod bool_matcher;
 mod char_count_matcher;
 mod conjunction_matcher;
 mod container_eq_matcher;
 mod contains_matcher;
 mod contains_regex_matcher;
+mod derefs_to_matcher;
 mod disjunction_matcher;
 mod display_matcher;
 mod each_matcher;
 mod elements_are_matcher;
 mod empty_matcher;
-mod eq_deref_of_matcher;
 mod eq_matcher;
 mod err_matcher;
 mod field_matcher;
@@ -50,6 +51,7 @@
 mod pointwise_matcher;
 mod predicate_matcher;
 mod property_matcher;
+mod result_of_matcher;
 mod some_matcher;
 mod str_matcher;
 mod subset_of_matcher;
@@ -58,14 +60,15 @@
 mod unordered_elements_are_matcher;
 
 pub use anything_matcher::anything;
+pub use bool_matcher::{is_false, is_true};
 pub use char_count_matcher::char_count;
 pub use container_eq_matcher::container_eq;
 pub use contains_matcher::{contains, ContainsMatcher};
 pub use contains_regex_matcher::contains_regex;
+pub use derefs_to_matcher::derefs_to;
 pub use display_matcher::displays_as;
 pub use each_matcher::each;
 pub use empty_matcher::empty;
-pub use eq_deref_of_matcher::eq_deref_of;
 pub use eq_matcher::{eq, EqMatcher};
 pub use err_matcher::err;
 pub use ge_matcher::ge;
@@ -95,8 +98,8 @@
 pub use crate::{
     __all as all, __any as any, __contains_each as contains_each, __elements_are as elements_are,
     __field as field, __is_contained_in as is_contained_in, __matches_pattern as matches_pattern,
-    __pat as pat, __pointwise as pointwise, __property as property,
-    __unordered_elements_are as unordered_elements_are,
+    __pat as pat, __pointwise as pointwise, __property as property, __result_of as result_of,
+    __result_of_ref as result_of_ref, __unordered_elements_are as unordered_elements_are,
 };
 
 // Types and functions used by macros matchers.
@@ -105,16 +108,16 @@
 // should only be used through their respective macros.
 #[doc(hidden)]
 pub mod __internal_unstable_do_not_depend_on_these {
-    pub use super::all_matcher::internal::AllMatcher;
-    pub use super::any_matcher::internal::AnyMatcher;
     pub use super::conjunction_matcher::ConjunctionMatcher;
     pub use super::disjunction_matcher::DisjunctionMatcher;
     pub use super::elements_are_matcher::internal::ElementsAre;
     pub use super::field_matcher::internal::field_matcher;
     pub use super::is_matcher::is;
+    pub use super::matches_pattern::internal::pattern_only;
     pub use super::pointwise_matcher::internal::PointwiseMatcher;
     pub use super::property_matcher::internal::{property_matcher, property_ref_matcher};
+    pub use super::result_of_matcher::internal::{result_of, result_of_ref};
     pub use super::unordered_elements_are_matcher::internal::{
-        Requirements, UnorderedElementsAreMatcher, UnorderedElementsOfMapAreMatcher,
+        Requirements, UnorderedElementsAreMatcher,
     };
 }

crates/googletest/src/matchers/near_matcher.rs

diff --git a/crates/googletest/src/matchers/near_matcher.rs b/crates/googletest/src/matchers/near_matcher.rs
index ca7cbdf..de1eb3d 100644
--- a/crates/googletest/src/matchers/near_matcher.rs
+++ b/crates/googletest/src/matchers/near_matcher.rs
@@ -14,7 +14,7 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
 use num_traits::{Float, FloatConst};
 use std::fmt::Debug;
@@ -110,6 +110,7 @@
 /// # }
 /// # should_pass().unwrap();
 /// ```
+#[track_caller]
 pub fn near<T: Debug + Float + Copy>(expected: T, max_abs_error: T) -> NearMatcher<T> {
     if max_abs_error.is_nan() {
         panic!("max_abs_error must not be NaN");
@@ -139,6 +140,7 @@
 
 /// A matcher which matches floating-point numbers approximately equal to its
 /// expected value.
+#[derive(MatcherBase)]
 pub struct NearMatcher<T: Debug> {
     expected: T,
     max_abs_error: T,
@@ -166,15 +168,13 @@
     }
 }
 
-impl<T: Debug + Float> Matcher for NearMatcher<T> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+impl<T: Debug + Float + Copy> Matcher<T> for NearMatcher<T> {
+    fn matches(&self, actual: T) -> MatcherResult {
         if self.nans_are_equal && self.expected.is_nan() && actual.is_nan() {
             return MatcherResult::Match;
         }
 
-        let delta = *actual - self.expected;
+        let delta = actual - self.expected;
         if delta >= -self.max_abs_error && delta <= self.max_abs_error {
             MatcherResult::Match
         } else {
@@ -196,15 +196,14 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{approx_eq, near};
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
 
     #[test]
     fn matches_value_inside_range() -> Result<()> {
         let matcher = near(1.0f64, 0.1f64);
 
-        let result = matcher.matches(&1.0f64);
+        let result = matcher.matches(1.0f64);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -213,7 +212,7 @@
     fn matches_value_at_low_end_of_range() -> Result<()> {
         let matcher = near(1.0f64, 0.1f64);
 
-        let result = matcher.matches(&0.9f64);
+        let result = matcher.matches(0.9f64);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -222,7 +221,7 @@
     fn matches_value_at_high_end_of_range() -> Result<()> {
         let matcher = near(1.0f64, 0.25f64);
 
-        let result = matcher.matches(&1.25f64);
+        let result = matcher.matches(1.25f64);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -231,7 +230,7 @@
     fn does_not_match_value_below_low_end_of_range() -> Result<()> {
         let matcher = near(1.0f64, 0.1f64);
 
-        let result = matcher.matches(&0.899999f64);
+        let result = matcher.matches(0.899999f64);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -240,7 +239,7 @@
     fn does_not_match_value_above_high_end_of_range() -> Result<()> {
         let matcher = near(1.0f64, 0.1f64);
 
-        let result = matcher.matches(&1.100001f64);
+        let result = matcher.matches(1.100001f64);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -249,7 +248,7 @@
     fn nan_is_not_near_a_number() -> Result<()> {
         let matcher = near(0.0f64, f64::MAX);
 
-        let result = matcher.matches(&f64::NAN);
+        let result = matcher.matches(f64::NAN);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -283,7 +282,7 @@
     fn inf_is_not_near_inf() -> Result<()> {
         let matcher = near(f64::INFINITY, f64::MAX);
 
-        let result = matcher.matches(&f64::INFINITY);
+        let result = matcher.matches(f64::INFINITY);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -292,7 +291,7 @@
     fn inf_is_not_near_a_number() -> Result<()> {
         let matcher = near(f64::INFINITY, f64::MAX);
 
-        let result = matcher.matches(&f64::MIN);
+        let result = matcher.matches(f64::MIN);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -301,7 +300,7 @@
     fn any_two_numbers_are_within_inf_of_each_other() -> Result<()> {
         let matcher = near(f64::MIN, f64::INFINITY);
 
-        let result = matcher.matches(&f64::MAX);
+        let result = matcher.matches(f64::MAX);
 
         verify_that!(result, eq(MatcherResult::Match))
     }

crates/googletest/src/matchers/none_matcher.rs

diff --git a/crates/googletest/src/matchers/none_matcher.rs b/crates/googletest/src/matchers/none_matcher.rs
index af28932..b7a3555 100644
--- a/crates/googletest/src/matchers/none_matcher.rs
+++ b/crates/googletest/src/matchers/none_matcher.rs
@@ -13,9 +13,8 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use std::fmt::Debug;
-use std::marker::PhantomData;
 
 /// Matches an `Option` containing `None`.
 ///
@@ -32,19 +31,29 @@
 /// # should_pass().unwrap();
 /// # should_fail().unwrap_err();
 /// ```
-pub fn none<T: Debug>() -> impl Matcher<ActualT = Option<T>> {
-    NoneMatcher::<T> { phantom: Default::default() }
+pub fn none() -> NoneMatcher {
+    NoneMatcher
 }
 
-struct NoneMatcher<T> {
-    phantom: PhantomData<T>,
+#[derive(MatcherBase)]
+pub struct NoneMatcher;
+
+impl<T: Debug + Copy> Matcher<Option<T>> for NoneMatcher {
+    fn matches(&self, actual: Option<T>) -> MatcherResult {
+        actual.is_none().into()
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        match matcher_result {
+            MatcherResult::Match => "is none".into(),
+            MatcherResult::NoMatch => "is some(_)".into(),
+        }
+    }
 }
 
-impl<T: Debug> Matcher for NoneMatcher<T> {
-    type ActualT = Option<T>;
-
-    fn matches(&self, actual: &Option<T>) -> MatcherResult {
-        (actual.is_none()).into()
+impl<'a, T: Debug> Matcher<&'a Option<T>> for NoneMatcher {
+    fn matches(&self, actual: &'a Option<T>) -> MatcherResult {
+        actual.is_none().into()
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -57,15 +66,14 @@
 
 #[cfg(test)]
 mod tests {
-    use super::none;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
 
     #[test]
     fn none_matches_option_with_none() -> Result<()> {
-        let matcher = none::<i32>();
+        let matcher = none();
 
-        let result = matcher.matches(&None);
+        let result = matcher.matches(None::<i32>);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -74,8 +82,47 @@
     fn none_does_not_match_option_with_value() -> Result<()> {
         let matcher = none();
 
-        let result = matcher.matches(&Some(0));
+        let result = matcher.matches(Some(0));
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
+
+    #[test]
+    fn none_matches_option_by_ref() -> Result<()> {
+        verify_that!(None::<String>, none())
+    }
+    #[test]
+    fn none_does_not_match_option_with_value_by_ref() -> Result<()> {
+        verify_that!(Some("123".to_string()), not(none()))
+    }
+
+    #[test]
+    fn none_describe_match_option_by_ref() -> Result<()> {
+        verify_that!(
+            Matcher::<&Option<String>>::describe(&none(), MatcherResult::Match),
+            displays_as(eq("is none"))
+        )
+    }
+    #[test]
+    fn none_describe_no_match_option_by_ref() -> Result<()> {
+        verify_that!(
+            Matcher::<&Option<String>>::describe(&none(), MatcherResult::NoMatch),
+            displays_as(eq("is some(_)"))
+        )
+    }
+
+    #[test]
+    fn none_describe_match_option() -> Result<()> {
+        verify_that!(
+            Matcher::<Option<i32>>::describe(&none(), MatcherResult::Match),
+            displays_as(eq("is none"))
+        )
+    }
+    #[test]
+    fn none_describe_no_match_option() -> Result<()> {
+        verify_that!(
+            Matcher::<Option<i32>>::describe(&none(), MatcherResult::NoMatch),
+            displays_as(eq("is some(_)"))
+        )
+    }
 }

crates/googletest/src/matchers/not_matcher.rs

diff --git a/crates/googletest/src/matchers/not_matcher.rs b/crates/googletest/src/matchers/not_matcher.rs
index f03d4ce..fa5f192 100644
--- a/crates/googletest/src/matchers/not_matcher.rs
+++ b/crates/googletest/src/matchers/not_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches the actual value exactly when the inner matcher does _not_ match.
 ///
@@ -33,28 +33,24 @@
 /// # should_pass().unwrap();
 /// # should_fail().unwrap_err();
 /// ```
-pub fn not<T: Debug, InnerMatcherT: Matcher<ActualT = T>>(
-    inner: InnerMatcherT,
-) -> impl Matcher<ActualT = T> {
-    NotMatcher::<T, _> { inner, phantom: Default::default() }
+pub fn not<InnerMatcherT>(inner: InnerMatcherT) -> NotMatcher<InnerMatcherT> {
+    NotMatcher { inner }
 }
 
-struct NotMatcher<T, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct NotMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    phantom: PhantomData<T>,
 }
 
-impl<T: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher for NotMatcher<T, InnerMatcherT> {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+impl<T: Debug + Copy, InnerMatcherT: Matcher<T>> Matcher<T> for NotMatcher<InnerMatcherT> {
+    fn matches(&self, actual: T) -> MatcherResult {
         match self.inner.matches(actual) {
             MatcherResult::Match => MatcherResult::NoMatch,
             MatcherResult::NoMatch => MatcherResult::Match,
         }
     }
 
-    fn explain_match(&self, actual: &T) -> Description {
+    fn explain_match(&self, actual: T) -> Description {
         self.inner.explain_match(actual)
     }
 
@@ -69,8 +65,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::not;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -78,7 +73,7 @@
     fn matches_when_inner_matcher_does_not_match() -> Result<()> {
         let matcher = not(eq(1));
 
-        let result = matcher.matches(&0);
+        let result = matcher.matches(0);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -87,14 +82,14 @@
     fn does_not_match_when_inner_matcher_matches() -> Result<()> {
         let matcher = not(eq(1));
 
-        let result = matcher.matches(&1);
+        let result = matcher.matches(1);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
     fn match_explanation_references_actual_value() -> Result<()> {
-        let result = verify_that!([1], not(container_eq([1])));
+        let result = verify_that!(&[1], not(container_eq([1])));
 
         verify_that!(
             result,

crates/googletest/src/matchers/ok_matcher.rs

diff --git a/crates/googletest/src/matchers/ok_matcher.rs b/crates/googletest/src/matchers/ok_matcher.rs
index 8425b93..f399673 100644
--- a/crates/googletest/src/matchers/ok_matcher.rs
+++ b/crates/googletest/src/matchers/ok_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a `Result` containing `Ok` with a value matched by `inner`.
 ///
@@ -38,28 +38,55 @@
 /// # should_fail_1().unwrap_err();
 /// # should_fail_2().unwrap_err();
 /// ```
-pub fn ok<T: Debug, E: Debug>(
-    inner: impl Matcher<ActualT = T>,
-) -> impl Matcher<ActualT = std::result::Result<T, E>> {
-    OkMatcher::<T, E, _> { inner, phantom_t: Default::default(), phantom_e: Default::default() }
+pub fn ok<InnerMatcherT>(inner: InnerMatcherT) -> OkMatcher<InnerMatcherT> {
+    OkMatcher { inner }
 }
 
-struct OkMatcher<T, E, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct OkMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    phantom_t: PhantomData<T>,
-    phantom_e: PhantomData<E>,
 }
 
-impl<T: Debug, E: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher
-    for OkMatcher<T, E, InnerMatcherT>
+impl<T: Debug + Copy, E: Debug + Copy, InnerMatcherT: Matcher<T>> Matcher<std::result::Result<T, E>>
+    for OkMatcher<InnerMatcherT>
 {
-    type ActualT = std::result::Result<T, E>;
+    fn matches(&self, actual: std::result::Result<T, E>) -> MatcherResult {
+        actual.map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
+    }
 
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+    fn explain_match(&self, actual: std::result::Result<T, E>) -> Description {
+        match actual {
+            Ok(o) => {
+                Description::new().text("which is a success").nested(self.inner.explain_match(o))
+            }
+            Err(_) => "which is an error".into(),
+        }
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        match matcher_result {
+            MatcherResult::Match => format!(
+                "is a success containing a value, which {}",
+                self.inner.describe(MatcherResult::Match)
+            )
+            .into(),
+            MatcherResult::NoMatch => format!(
+                "is an error or a success containing a value, which {}",
+                self.inner.describe(MatcherResult::NoMatch)
+            )
+            .into(),
+        }
+    }
+}
+
+impl<'a, T: Debug, E: Debug, InnerMatcherT: Matcher<&'a T>> Matcher<&'a std::result::Result<T, E>>
+    for OkMatcher<InnerMatcherT>
+{
+    fn matches(&self, actual: &'a std::result::Result<T, E>) -> MatcherResult {
         actual.as_ref().map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
     }
 
-    fn explain_match(&self, actual: &Self::ActualT) -> Description {
+    fn explain_match(&self, actual: &'a std::result::Result<T, E>) -> Description {
         match actual {
             Ok(o) => {
                 Description::new().text("which is a success").nested(self.inner.explain_match(o))
@@ -86,8 +113,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::ok;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -96,7 +122,7 @@
         let matcher = ok(eq(1));
         let value: std::result::Result<i32, i32> = Ok(1);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -106,7 +132,7 @@
         let matcher = ok(eq(1));
         let value: std::result::Result<i32, i32> = Ok(0);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
@@ -116,12 +142,30 @@
         let matcher = ok(eq(1));
         let value: std::result::Result<i32, i32> = Err(1);
 
-        let result = matcher.matches(&value);
+        let result = matcher.matches(value);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
+    fn ok_matches_result_with_value_by_ref() -> Result<()> {
+        let result: std::result::Result<String, String> = Ok("123".into());
+        verify_that!(result, ok(eq("123")))
+    }
+
+    #[test]
+    fn ok_does_not_match_result_with_wrong_value_by_ref() -> Result<()> {
+        let result: std::result::Result<String, String> = Ok("321".into());
+        verify_that!(result, not(ok(eq("123"))))
+    }
+
+    #[test]
+    fn ok_does_not_match_result_with_err_by_ref() -> Result<()> {
+        let result: std::result::Result<String, String> = Err("123".into());
+        verify_that!(result, not(ok(eq("123"))))
+    }
+
+    #[test]
     fn ok_full_error_message() -> Result<()> {
         let result = verify_that!(Ok::<i32, i32>(1), ok(eq(2)));
 
@@ -140,15 +184,107 @@
     }
 
     #[test]
-    fn ok_describe_matches() -> Result<()> {
-        let matcher = super::OkMatcher::<i32, i32, _> {
-            inner: eq(1),
-            phantom_t: Default::default(),
-            phantom_e: Default::default(),
-        };
+    fn ok_describe_match() -> Result<()> {
+        let matcher = ok(eq(1));
         verify_that!(
-            matcher.describe(MatcherResult::Match),
+            Matcher::<std::result::Result<i32, i32>>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is a success containing a value, which is equal to 1"))
         )
     }
+
+    #[test]
+    fn ok_describe_no_match() -> Result<()> {
+        let matcher = ok(eq(1));
+        verify_that!(
+            Matcher::<std::result::Result<i32, i32>>::describe(&matcher, MatcherResult::NoMatch),
+            displays_as(eq("is an error or a success containing a value, which isn't equal to 1"))
+        )
+    }
+
+    #[test]
+    fn ok_describe_match_by_ref() -> Result<()> {
+        let matcher = ok(eq(&1));
+        verify_that!(
+            Matcher::<&std::result::Result<i32, String>>::describe(&matcher, MatcherResult::Match),
+            displays_as(eq("is a success containing a value, which is equal to 1"))
+        )
+    }
+
+    #[test]
+    fn ok_describe_no_match_by_ref() -> Result<()> {
+        let matcher = ok(eq(&1));
+        verify_that!(
+            Matcher::<&std::result::Result<i32, String>>::describe(
+                &matcher,
+                MatcherResult::NoMatch
+            ),
+            displays_as(eq("is an error or a success containing a value, which isn't equal to 1"))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_success() -> Result<()> {
+        let actual = Ok(1);
+        let matcher = ok(eq(1));
+
+        verify_that!(
+            Matcher::<std::result::Result<i32, i32>>::explain_match(&matcher, actual),
+            displays_as(eq("which is a success\n  which is equal to 1"))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_fail() -> Result<()> {
+        let actual = Ok(1);
+        let matcher = ok(eq(2));
+
+        verify_that!(
+            Matcher::<std::result::Result<i32, i32>>::explain_match(&matcher, actual),
+            displays_as(eq("which is a success\n  which isn't equal to 2"))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_err() -> Result<()> {
+        let actual = Err(1);
+        let matcher = ok(eq(2));
+
+        verify_that!(
+            Matcher::<std::result::Result<i32, i32>>::explain_match(&matcher, actual),
+            displays_as(eq("which is an error"))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_success_by_ref() -> Result<()> {
+        let actual = Ok("123".to_string());
+        let matcher = ok(eq("123"));
+
+        verify_that!(
+            Matcher::<&std::result::Result<String, String>>::explain_match(&matcher, &actual),
+            displays_as(eq("which is a success\n  which is equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_fail_by_ref() -> Result<()> {
+        let actual = Ok("321".to_string());
+        let matcher = ok(eq("123"));
+
+        verify_that!(
+            Matcher::<&std::result::Result<String, String>>::explain_match(&matcher, &actual),
+            displays_as(eq("which is a success\n  which isn't equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn ok_explain_match_ok_err_by_ref() -> Result<()> {
+        let actual = Err("123".to_string());
+        let matcher = ok(eq("123"));
+
+        verify_that!(
+            Matcher::<&std::result::Result<String, String>>::explain_match(&matcher, &actual),
+            displays_as(eq("which is an error"))
+        )
+    }
 }

crates/googletest/src/matchers/points_to_matcher.rs

diff --git a/crates/googletest/src/matchers/points_to_matcher.rs b/crates/googletest/src/matchers/points_to_matcher.rs
index 2c516d0..0653e03 100644
--- a/crates/googletest/src/matchers/points_to_matcher.rs
+++ b/crates/googletest/src/matchers/points_to_matcher.rs
@@ -13,55 +13,46 @@
 // limitations under the License.
 
 use crate::description::Description;
-use crate::matcher::{Matcher, MatcherResult};
+use crate::matcher::{Matcher, MatcherBase, MatcherResult};
 use std::fmt::Debug;
-use std::marker::PhantomData;
-use std::ops::Deref;
 
-/// Matches a (smart) pointer pointing to a value matched by the [`Matcher`]
+/// Matches a reference pointing to a value matched by the [`Matcher`]
 /// `expected`.
 ///
-/// This allows easily matching smart pointers such as `Box`, `Rc`, and `Arc`.
+/// This is useful for combining matchers, especially when working with
+/// iterators.
+///
 /// For example:
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(Box::new(123), points_to(eq(123)))?;
+/// verify_that!(&123, points_to(eq(123)))?;
+/// verify_that!(vec![1,2,3], each(points_to(gt(0))))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// ```
-pub fn points_to<ExpectedT, MatcherT, ActualT>(
-    expected: MatcherT,
-) -> impl Matcher<ActualT = ActualT>
-where
-    ExpectedT: Debug,
-    MatcherT: Matcher<ActualT = ExpectedT>,
-    ActualT: Deref<Target = ExpectedT> + Debug + ?Sized,
-{
-    PointsToMatcher { expected, phantom: Default::default() }
+pub fn points_to<MatcherT>(expected: MatcherT) -> PointsToMatcher<MatcherT> {
+    PointsToMatcher { expected }
 }
 
-struct PointsToMatcher<ActualT: ?Sized, MatcherT> {
+#[derive(MatcherBase)]
+pub struct PointsToMatcher<MatcherT> {
     expected: MatcherT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ExpectedT, MatcherT, ActualT> Matcher for PointsToMatcher<ActualT, MatcherT>
+impl<'a, ExpectedT, MatcherT> Matcher<&'a ExpectedT> for PointsToMatcher<MatcherT>
 where
-    ExpectedT: Debug,
-    MatcherT: Matcher<ActualT = ExpectedT>,
-    ActualT: Deref<Target = ExpectedT> + Debug + ?Sized,
+    ExpectedT: Debug + Copy,
+    MatcherT: Matcher<ExpectedT>,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
-        self.expected.matches(actual.deref())
+    fn matches(&self, actual: &'a ExpectedT) -> MatcherResult {
+        self.expected.matches(*actual)
     }
 
-    fn explain_match(&self, actual: &ActualT) -> Description {
-        self.expected.explain_match(actual.deref())
+    fn explain_match(&self, actual: &'a ExpectedT) -> Description {
+        self.expected.explain_match(*actual)
     }
 
     fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -71,36 +62,24 @@
 
 #[cfg(test)]
 mod tests {
-    use super::points_to;
     use crate::prelude::*;
     use indoc::indoc;
-    use std::rc::Rc;
 
     #[test]
-    fn points_to_matches_box_of_int_with_int() -> Result<()> {
-        verify_that!(Box::new(123), points_to(eq(123)))
-    }
-
-    #[test]
-    fn points_to_matches_rc_of_int_with_int() -> Result<()> {
-        verify_that!(Rc::new(123), points_to(eq(123)))
-    }
-
-    #[test]
-    fn points_to_matches_box_of_owned_string_with_string_reference() -> Result<()> {
-        verify_that!(Rc::new("A string".to_string()), points_to(eq("A string")))
+    fn points_to_matches_ref() -> Result<()> {
+        verify_that!(&123, points_to(eq(123)))
     }
 
     #[test]
     fn match_explanation_references_actual_value() -> Result<()> {
-        let result = verify_that!(&vec![1], points_to(container_eq([])));
+        let result = verify_that!(&1, points_to(eq(0)));
 
         verify_that!(
             result,
             err(displays_as(contains_substring(indoc!(
                 "
-                    Actual: [1],
-                      which contains the unexpected element 1
+                    Actual: 1,
+                      which isn't equal to 0
                 "
             ))))
         )

crates/googletest/src/matchers/pointwise_matcher.rs

diff --git a/crates/googletest/src/matchers/pointwise_matcher.rs b/crates/googletest/src/matchers/pointwise_matcher.rs
index 01e70c0..a3a0d74 100644
--- a/crates/googletest/src/matchers/pointwise_matcher.rs
+++ b/crates/googletest/src/matchers/pointwise_matcher.rs
@@ -27,13 +27,14 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value = vec![1, 2, 3];
-/// verify_that!(value, pointwise!(le, [1, 3, 3]))?; // Passes
-/// verify_that!(value, pointwise!(le, vec![1, 3, 3]))?; // Passes
+/// verify_that!(value, pointwise!(le, [&1, &2, &3]))?; // Passes
+/// verify_that!(value, pointwise!(|e| points_to(le(e)), [1, 2, 3]))?; // Passes
+/// verify_that!(value, pointwise!(|e| points_to(le(e)), vec![1, 3, 3]))?; // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
 /// #     let value = vec![1, 2, 3];
-/// verify_that!(value, pointwise!(le, [1, 1, 3]))?; // Fails
+/// verify_that!(value, pointwise!(|e| points_to(le(e)), [1, 1, 3]))?; // Fails
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -46,7 +47,7 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value = vec![1.00001, 2.000001, 3.00001];
-/// verify_that!(value, pointwise!(|v| near(v, 0.001), [1.0, 2.0, 3.0]))?;
+/// verify_that!(value, pointwise!(|v| points_to(near(v, 0.001)), [1.0, 2.0, 3.0]))?;
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -59,12 +60,11 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value = vec![1.00001, 2.000001, 3.00001];
-/// verify_that!(value, pointwise!(|v, t| near(v, t), [1.0, 2.0, 3.0], [0.001, 0.0001, 0.01]))?;
-/// verify_that!(value, pointwise!(near, [1.0, 2.0, 3.0], [0.001, 0.0001, 0.01]))?; // Same as above
+/// verify_that!(value, pointwise!(|v, t| points_to(near(v, t)), [1.0, 2.0, 3.0], [0.001, 0.0001, 0.01]))?;
 /// verify_that!(
 ///     value,
 ///     pointwise!(
-///         |v, t, u| near(v, t * u),
+///         |v, t, u| points_to(near(v, t * u)),
 ///         [1.0, 2.0, 3.0],
 ///         [0.001, 0.0001, 0.01],
 ///         [0.5, 0.5, 1.0]
@@ -79,25 +79,20 @@
 /// that all of the containers have the same size. This matcher does not check
 /// whether the sizes match.
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
-/// implement [`IntoIterator`].
+/// The actual value must be a container such as a `&Vec`, an array, or a
+/// slice. More precisely, the actual value must implement [`IntoIterator`].
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value = vec![1, 2, 3];
-/// verify_that!(*value.as_slice(), pointwise!(le, [1, 3, 3]))?; // Passes
+/// verify_that!(value, pointwise!(|i| points_to(le(i)), [1, 3, 3]))?; // Passes
 /// verify_that!([1, 2, 3], pointwise!(le, [1, 3, 3]))?; // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// ```
 ///
-/// This matcher does not support matching directly against an [`Iterator`]. To
-/// match against an iterator, use [`Iterator::collect`] to build a [`Vec`]
-/// first.
-///
 /// The second argument can be any value implementing `IntoIterator`, such as a
 /// `Vec` or an array. The container does not have to have the same type as the
 /// actual value, but the value type must be the same.
@@ -119,13 +114,13 @@
 #[doc(hidden)]
 macro_rules! __pointwise {
     ($matcher:expr, $container:expr) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher;
-        PointwiseMatcher::new($container.into_iter().map($matcher).collect())
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher::new(
+            $container.into_iter().map($matcher).collect(),
+        )
     }};
 
     ($matcher:expr, $left_container:expr, $right_container:expr) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher;
-        PointwiseMatcher::new(
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher::new(
             $left_container
                 .into_iter()
                 .zip($right_container.into_iter())
@@ -135,8 +130,7 @@
     }};
 
     ($matcher:expr, $left_container:expr, $middle_container:expr, $right_container:expr) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher;
-        PointwiseMatcher::new(
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::PointwiseMatcher::new(
             $left_container
                 .into_iter()
                 .zip($right_container.into_iter().zip($middle_container.into_iter()))
@@ -152,33 +146,31 @@
 #[doc(hidden)]
 pub mod internal {
     use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::{Matcher, MatcherBase, MatcherResult};
     use crate::matcher_support::zipped_iterator::zip;
-    use std::{fmt::Debug, marker::PhantomData};
+    use std::fmt::Debug;
 
     /// This struct is meant to be used only through the `pointwise` macro.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub struct PointwiseMatcher<ContainerT: ?Sized, MatcherT> {
+    #[derive(MatcherBase)]
+    pub struct PointwiseMatcher<MatcherT> {
         matchers: Vec<MatcherT>,
-        phantom: PhantomData<ContainerT>,
     }
 
-    impl<ContainerT: ?Sized, MatcherT> PointwiseMatcher<ContainerT, MatcherT> {
+    impl<MatcherT> PointwiseMatcher<MatcherT> {
         pub fn new(matchers: Vec<MatcherT>) -> Self {
-            Self { matchers, phantom: Default::default() }
+            Self { matchers }
         }
     }
 
-    impl<T: Debug, MatcherT: Matcher<ActualT = T>, ContainerT: ?Sized + Debug> Matcher
-        for PointwiseMatcher<ContainerT, MatcherT>
+    impl<T: Debug + Copy, MatcherT: Matcher<T>, ContainerT: Copy + Debug> Matcher<ContainerT>
+        for PointwiseMatcher<MatcherT>
     where
-        for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
+        ContainerT: IntoIterator<Item = T>,
     {
-        type ActualT = ContainerT;
-
-        fn matches(&self, actual: &ContainerT) -> MatcherResult {
+        fn matches(&self, actual: ContainerT) -> MatcherResult {
             let mut zipped_iterator = zip(actual.into_iter(), self.matchers.iter());
             for (element, matcher) in zipped_iterator.by_ref() {
                 if matcher.matches(element).is_no_match() {
@@ -192,7 +184,7 @@
             }
         }
 
-        fn explain_match(&self, actual: &ContainerT) -> Description {
+        fn explain_match(&self, actual: ContainerT) -> Description {
             // TODO(b/260819741) This code duplicates elements_are_matcher.rs. Consider
             // extract as a separate library. (or implement pointwise! with
             // elements_are)

crates/googletest/src/matchers/predicate_matcher.rs

diff --git a/crates/googletest/src/matchers/predicate_matcher.rs b/crates/googletest/src/matchers/predicate_matcher.rs
index 5bc067d..1ba81c4 100644
--- a/crates/googletest/src/matchers/predicate_matcher.rs
+++ b/crates/googletest/src/matchers/predicate_matcher.rs
@@ -14,43 +14,37 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Creates a matcher based on the predicate provided.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(3, predicate(|x: &i32| x % 2 == 1))?;  // Passes
+/// verify_that!(3, predicate(|x: i32| x % 2 == 1))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
 /// ```
 ///
-/// The predicate should take the subject type by reference and return a
+/// The predicate should take the subject type and return a
 /// boolean.
 ///
 /// Note: even if the Rust compiler should be able to infer the type of
 /// the closure argument, it is likely that it won't.
 /// See <https://github.com/rust-lang/rust/issues/12679> for update on this issue.
 /// This is easily fixed by explicitly declaring the type of the argument
-pub fn predicate<T: Debug + ?Sized, P>(
-    predicate: P,
-) -> PredicateMatcher<T, P, NoDescription, NoDescription>
-where
-    for<'a> P: Fn(&'a T) -> bool,
-{
+pub fn predicate<P>(predicate: P) -> PredicateMatcher<P, NoDescription, NoDescription> {
     PredicateMatcher {
         predicate,
         positive_description: NoDescription,
         negative_description: NoDescription,
-        phantom: Default::default(),
     }
 }
 
-impl<T, P> PredicateMatcher<T, P, NoDescription, NoDescription> {
+impl<P> PredicateMatcher<P, NoDescription, NoDescription> {
     /// Configures this instance to provide a more meaningful description.
     ///
     /// For example, to make sure the error message is more useful
@@ -58,7 +52,7 @@
     /// ```
     /// # use googletest::matchers::{predicate, PredicateMatcher};
     /// # let _ =
-    /// predicate(|x: &i32| x % 2 == 1)
+    /// predicate(|x: i32| x % 2 == 1)
     ///     .with_description("is odd", "is even")
     /// # ;
     /// ```
@@ -70,24 +64,19 @@
         self,
         positive_description: D1,
         negative_description: D2,
-    ) -> PredicateMatcher<T, P, D1, D2> {
-        PredicateMatcher {
-            predicate: self.predicate,
-            positive_description,
-            negative_description,
-            phantom: Default::default(),
-        }
+    ) -> PredicateMatcher<P, D1, D2> {
+        PredicateMatcher { predicate: self.predicate, positive_description, negative_description }
     }
 }
 
 /// A matcher which applies `predicate` on the value.
 ///
 /// See [`predicate`].
-pub struct PredicateMatcher<T: ?Sized, P, D1, D2> {
+#[derive(MatcherBase)]
+pub struct PredicateMatcher<P, D1, D2> {
     predicate: P,
     positive_description: D1,
     negative_description: D2,
-    phantom: PhantomData<T>,
 }
 
 /// A trait to allow [`PredicateMatcher::with_description`] to accept multiple
@@ -124,13 +113,11 @@
 #[doc(hidden)]
 pub struct NoDescription;
 
-impl<T: Debug, P> Matcher for PredicateMatcher<T, P, NoDescription, NoDescription>
+impl<T: Debug + Copy, P> Matcher<T> for PredicateMatcher<P, NoDescription, NoDescription>
 where
-    for<'a> P: Fn(&'a T) -> bool,
+    P: Fn(T) -> bool,
 {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+    fn matches(&self, actual: T) -> MatcherResult {
         (self.predicate)(actual).into()
     }
 
@@ -142,14 +129,12 @@
     }
 }
 
-impl<T: Debug, P, D1: PredicateDescription, D2: PredicateDescription> Matcher
-    for PredicateMatcher<T, P, D1, D2>
+impl<T: Debug + Copy, P, D1: PredicateDescription, D2: PredicateDescription> Matcher<T>
+    for PredicateMatcher<P, D1, D2>
 where
-    for<'a> P: Fn(&'a T) -> bool,
+    P: Fn(T) -> bool,
 {
-    type ActualT = T;
-
-    fn matches(&self, actual: &T) -> MatcherResult {
+    fn matches(&self, actual: T) -> MatcherResult {
         (self.predicate)(actual).into()
     }
 
@@ -163,12 +148,10 @@
 
 #[cfg(test)]
 mod tests {
-    use super::predicate;
-    use crate::matcher::Matcher;
     use crate::prelude::*;
 
     // Simple matcher with a description
-    fn is_odd() -> impl Matcher<ActualT = i32> {
+    fn is_odd() -> impl Matcher<i32> {
         predicate(|x| x % 2 == 1).with_description("is odd", "is even")
     }
 
@@ -179,16 +162,16 @@
 
     #[test]
     fn predicate_matcher_odd_explain_match_matches() -> Result<()> {
-        verify_that!(is_odd().explain_match(&1), displays_as(eq("which is odd")))
+        verify_that!(is_odd().explain_match(1), displays_as(eq("which is odd")))
     }
 
     #[test]
     fn predicate_matcher_odd_explain_match_does_not_match() -> Result<()> {
-        verify_that!(is_odd().explain_match(&2), displays_as(eq("which is even")))
+        verify_that!(is_odd().explain_match(2), displays_as(eq("which is even")))
     }
 
     // Simple Matcher without description
-    fn is_even() -> impl Matcher<ActualT = i32> {
+    fn is_even() -> impl Matcher<i32> {
         predicate(|x| x % 2 == 0)
     }
 
@@ -199,18 +182,18 @@
 
     #[test]
     fn predicate_matcher_even_explain_match_matches() -> Result<()> {
-        verify_that!(is_even().explain_match(&2), displays_as(eq("which matches")))
+        verify_that!(is_even().explain_match(2), displays_as(eq("which matches")))
     }
 
     #[test]
     fn predicate_matcher_even_explain_match_does_not_match() -> Result<()> {
-        verify_that!(is_even().explain_match(&1), displays_as(eq("which does not match")))
+        verify_that!(is_even().explain_match(1), displays_as(eq("which does not match")))
     }
 
     #[test]
     fn predicate_matcher_generator_lambda() -> Result<()> {
         let is_divisible_by = |quotient| {
-            predicate(move |x: &i32| x % quotient == 0).with_description(
+            predicate(move |x: i32| x % quotient == 0).with_description(
                 move || format!("is divisible by {quotient}"),
                 move || format!("is not divisible by {quotient}"),
             )
@@ -220,12 +203,12 @@
 
     #[test]
     fn predicate_matcher_inline() -> Result<()> {
-        verify_that!(2048, predicate(|x: &i32| x.count_ones() == 1))
+        verify_that!(2048, predicate(|x: i32| x.count_ones() == 1))
     }
 
     #[test]
     fn predicate_matcher_function_pointer() -> Result<()> {
         use std::time::Duration;
-        verify_that!(Duration::new(0, 0), predicate(Duration::is_zero))
+        verify_that!(&Duration::new(0, 0), predicate(Duration::is_zero))
     }
 }

crates/googletest/src/matchers/property_matcher.rs

diff --git a/crates/googletest/src/matchers/property_matcher.rs b/crates/googletest/src/matchers/property_matcher.rs
index 19b4862..98c51a6 100644
--- a/crates/googletest/src/matchers/property_matcher.rs
+++ b/crates/googletest/src/matchers/property_matcher.rs
@@ -35,7 +35,26 @@
 /// }
 ///
 /// let value = vec![MyStruct { a_field: 100 }];
-/// verify_that!(value, contains(property!(MyStruct.get_a_field(), eq(100))))
+/// verify_that!(value, contains(property!(&MyStruct.get_a_field(), eq(100))))
+/// #    .unwrap();
+/// ```
+///
+///
+/// If the inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct MyStruct {
+///     a_field: u32,
+/// }
+///
+/// impl MyStruct {
+///     pub fn get_a_field(&self) -> u32 { self.a_field }
+/// }
+///
+/// let value = vec![MyStruct { a_field: 100 }];
+/// verify_that!(value, contains(property!(&MyStruct.get_a_field(), 100)))
 /// #    .unwrap();
 /// ```
 ///
@@ -44,24 +63,7 @@
 /// failure, it will be invoked a second time, with the assertion failure output
 /// reflecting the *second* invocation.
 ///
-/// If the method returns a *reference*, then it must be preceded by a `*`:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # #[derive(Debug)]
-/// # pub struct MyStruct {
-/// #     a_field: u32,
-/// # }
-/// impl MyStruct {
-///     pub fn get_a_field(&self) -> &u32 { &self.a_field }
-/// }
-///
-/// # let value = vec![MyStruct { a_field: 100 }];
-/// verify_that!(value, contains(property!(*MyStruct.get_a_field(), eq(100))))
-/// #    .unwrap();
-/// ```
-///
-/// The method may also take additional arguments:
+/// The method may also take additional litteral arguments:
 ///
 /// ```
 /// # use googletest::prelude::*;
@@ -74,26 +76,88 @@
 /// }
 ///
 /// # let value = vec![MyStruct { a_field: 100 }];
-/// verify_that!(value, contains(property!(MyStruct.add_to_a_field(50), eq(150))))
+/// verify_that!(value, contains(property!(&MyStruct.add_to_a_field(50), eq(150))))
 /// #    .unwrap();
 /// ```
 ///
-/// Unfortunately, this matcher does *not* work with methods returning string
-/// slices:
+/// The arguments must be litteral as `property!` is not able to capture them.
 ///
-/// ```compile_fail
+/// # Specification of the property pattern
+///
+/// The specification of the field follow the syntax: `(ref)? (&)?
+/// $TYPE.$PROPERTY\($ARGUMENT\)`.
+///
+/// The `&` allows to specify whether this matcher matches against an actual of
+/// type `$TYPE` (`$TYPE` must implement `Copy`) or a `&$TYPE`.
+///
+/// For instance:
+///
+/// ```
 /// # use googletest::prelude::*;
 /// #[derive(Debug)]
-/// pub struct MyStruct {
-///     a_string: String,
-/// }
-/// impl MyStruct {
-///     pub fn get_a_string(&self) -> &str { &self.a_string }
-/// }
+/// pub struct AStruct;
 ///
-/// let value = MyStruct { a_string: "A string".into() };
-/// verify_that!(value, property!(*MyStruct.get_a_string(), eq("A string"))) // Does not compile
-/// #    .unwrap();
+/// impl AStruct {
+///   fn a_property(&self) -> i32 {32}
+/// }
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct, property!(&AStruct.a_property(), eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug, Clone, Copy)]
+/// pub struct AStruct;
+///
+/// impl AStruct {
+///   fn a_property(self) -> i32 {32}
+/// }
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct, property!(AStruct.a_property(), eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// The `ref` allows to bind the property returned value by reference, which is
+/// required if the field type does not implement `Copy`.
+///
+/// For instance:
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct AStruct;
+///
+/// impl AStruct {
+///   fn a_property(&self) -> i32 {32}
+/// }
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct, property!(&AStruct.a_property(), eq(32)))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
+/// ```
+///
+/// If `property!` is qualified by both `&` and `ref`, they can both be omitted.
+///
+/// ```
+/// # use googletest::prelude::*;
+/// #[derive(Debug)]
+/// pub struct AStruct;
+///
+/// impl AStruct {
+///   fn a_property(&self) -> String {"32".into()}
+/// }
+/// # fn should_pass() -> Result<()> {
+/// verify_that!(AStruct, property!(&AStruct.a_property(), ref eq("32")))?;
+/// verify_that!(AStruct, property!(AStruct.a_property(), eq("32")))?;
+/// #     Ok(())
+/// # }
+/// # should_pass().unwrap();
 /// ```
 ///
 /// This macro is analogous to [`field`][crate::matchers::field], except that it
@@ -112,20 +176,30 @@
 #[doc(hidden)]
 #[macro_export]
 macro_rules! property_internal {
-    ($($t:ident)::+.$method:tt($($argument:tt),* $(,)?), $m:expr) => {{
-         use $crate::matchers::__internal_unstable_do_not_depend_on_these::property_matcher;
-        property_matcher(
-            |o: &$($t)::+| o.$method($($argument),*),
-            &stringify!($method($($argument),*)),
-            $m)
-    }};
 
-    (* $($t:ident)::+.$method:tt($($argument:tt),* $(,)?), $m:expr) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::property_ref_matcher;
-        property_ref_matcher(
+    (&$($t:ident)::+.$method:tt($($argument:tt),* $(,)?), ref $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::property_ref_matcher(
+            |o: &$($t)::+| $($t)::+::$method(o, $($argument),*),
+            &stringify!($method($($argument),*)),
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
+    }};
+    ($($t:ident)::+.$method:tt($($argument:tt),* $(,)?), ref $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::property_ref_matcher(
+            |o: $($t)::+| $($t)::+::$method(o, $($argument),*),
+            &stringify!($method($($argument),*)),
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
+    }};
+    (& $($t:ident)::+.$method:tt($($argument:tt),* $(,)?), $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::property_matcher(
+            |o: &&$($t)::+| o.$method($($argument),*),
+            &stringify!($method($($argument),*)),
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
+    }};
+    ($($t:ident)::+.$method:tt($($argument:tt),* $(,)?), $m:expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::property_matcher(
             |o: &$($t)::+| o.$method($($argument),*),
             &stringify!($method($($argument),*)),
-            $m)
+            $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!($m))
     }};
 }
 
@@ -136,37 +210,65 @@
 pub mod internal {
     use crate::{
         description::Description,
-        matcher::{Matcher, MatcherResult},
+        matcher::{Matcher, MatcherBase, MatcherResult},
     };
-    use std::{fmt::Debug, marker::PhantomData};
+    use std::fmt::Debug;
 
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub fn property_matcher<OuterT: Debug, InnerT: Debug, MatcherT: Matcher<ActualT = InnerT>>(
-        extractor: impl Fn(&OuterT) -> InnerT,
+    pub fn property_matcher<OuterT: Debug, InnerT: Debug, MatcherT>(
+        extractor: fn(&OuterT) -> InnerT,
         property_desc: &'static str,
         inner: MatcherT,
-    ) -> impl Matcher<ActualT = OuterT> {
-        PropertyMatcher { extractor, property_desc, inner, phantom: Default::default() }
+    ) -> PropertyMatcher<OuterT, InnerT, MatcherT> {
+        PropertyMatcher { extractor, property_desc, inner }
     }
 
-    struct PropertyMatcher<OuterT, ExtractorT, MatcherT> {
-        extractor: ExtractorT,
+    #[derive(MatcherBase)]
+    pub struct PropertyMatcher<OuterT, InnerT, MatcherT> {
+        extractor: fn(&OuterT) -> InnerT,
         property_desc: &'static str,
         inner: MatcherT,
-        phantom: PhantomData<OuterT>,
     }
 
-    impl<InnerT, OuterT, ExtractorT, MatcherT> Matcher for PropertyMatcher<OuterT, ExtractorT, MatcherT>
+    impl<InnerT, OuterT, MatcherT> Matcher<OuterT> for PropertyMatcher<OuterT, InnerT, MatcherT>
+    where
+        InnerT: Debug + Copy,
+        OuterT: Debug + Copy,
+        MatcherT: Matcher<InnerT>,
+    {
+        fn matches(&self, actual: OuterT) -> MatcherResult {
+            self.inner.matches((self.extractor)(&actual))
+        }
+
+        fn describe(&self, matcher_result: MatcherResult) -> Description {
+            format!(
+                "has property `{}`, which {}",
+                self.property_desc,
+                self.inner.describe(matcher_result)
+            )
+            .into()
+        }
+
+        fn explain_match(&self, actual: OuterT) -> Description {
+            let actual_inner = (self.extractor)(&actual);
+            format!(
+                "whose property `{}` is `{:#?}`, {}",
+                self.property_desc,
+                actual_inner,
+                self.inner.explain_match(actual_inner)
+            )
+            .into()
+        }
+    }
+
+    impl<'a, InnerT, OuterT, MatcherT> Matcher<&'a OuterT> for PropertyMatcher<OuterT, InnerT, MatcherT>
     where
         InnerT: Debug,
         OuterT: Debug,
-        ExtractorT: Fn(&OuterT) -> InnerT,
-        MatcherT: Matcher<ActualT = InnerT>,
+        MatcherT: for<'b> Matcher<&'b InnerT>,
     {
-        type ActualT = OuterT;
-
-        fn matches(&self, actual: &OuterT) -> MatcherResult {
+        fn matches(&self, actual: &'a OuterT) -> MatcherResult {
             self.inner.matches(&(self.extractor)(actual))
         }
 
@@ -179,7 +281,7 @@
             .into()
         }
 
-        fn explain_match(&self, actual: &OuterT) -> Description {
+        fn explain_match(&self, actual: &'a OuterT) -> Description {
             let actual_inner = (self.extractor)(actual);
             format!(
                 "whose property `{}` is `{:#?}`, {}",
@@ -193,32 +295,36 @@
 
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub fn property_ref_matcher<OuterT, InnerT, MatcherT>(
-        extractor: fn(&OuterT) -> &InnerT,
+    pub fn property_ref_matcher<OuterT, InnerT, ExtractorT, MatcherT>(
+        extractor: ExtractorT,
         property_desc: &'static str,
         inner: MatcherT,
-    ) -> impl Matcher<ActualT = OuterT>
+    ) -> PropertyRefMatcher<ExtractorT, MatcherT>
     where
         OuterT: Debug,
-        InnerT: Debug + ?Sized,
-        MatcherT: Matcher<ActualT = InnerT>,
+        InnerT: Debug,
+        MatcherT: for<'a> Matcher<&'a InnerT>,
+        ExtractorT: Fn(OuterT) -> InnerT,
     {
         PropertyRefMatcher { extractor, property_desc, inner }
     }
 
-    struct PropertyRefMatcher<InnerT: ?Sized, OuterT, MatcherT> {
-        extractor: fn(&OuterT) -> &InnerT,
+    #[derive(MatcherBase)]
+    pub struct PropertyRefMatcher<ExtractorT, MatcherT> {
+        extractor: ExtractorT,
         property_desc: &'static str,
         inner: MatcherT,
     }
 
-    impl<InnerT: Debug + ?Sized, OuterT: Debug, MatcherT: Matcher<ActualT = InnerT>> Matcher
-        for PropertyRefMatcher<InnerT, OuterT, MatcherT>
+    impl<
+            InnerT: Debug,
+            OuterT: Debug + Copy,
+            MatcherT: for<'a> Matcher<&'a InnerT>,
+            ExtractorT: Fn(OuterT) -> InnerT,
+        > Matcher<OuterT> for PropertyRefMatcher<ExtractorT, MatcherT>
     {
-        type ActualT = OuterT;
-
-        fn matches(&self, actual: &OuterT) -> MatcherResult {
-            self.inner.matches((self.extractor)(actual))
+        fn matches(&self, actual: OuterT) -> MatcherResult {
+            self.inner.matches(&(self.extractor)(actual))
         }
 
         fn describe(&self, matcher_result: MatcherResult) -> Description {
@@ -230,13 +336,13 @@
             .into()
         }
 
-        fn explain_match(&self, actual: &OuterT) -> Description {
+        fn explain_match(&self, actual: OuterT) -> Description {
             let actual_inner = (self.extractor)(actual);
             format!(
                 "whose property `{}` is `{:#?}`, {}",
                 self.property_desc,
                 actual_inner,
-                self.inner.explain_match(actual_inner)
+                self.inner.explain_match(&actual_inner)
             )
             .into()
         }

crates/googletest/src/matchers/result_of_matcher.rs

diff --git a/crates/googletest/src/matchers/result_of_matcher.rs b/crates/googletest/src/matchers/result_of_matcher.rs
new file mode 100644
index 0000000..c75fe66
--- /dev/null
+++ b/crates/googletest/src/matchers/result_of_matcher.rs
@@ -0,0 +1,440 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Matches a value where the result of `callable` applied to the value matches
+/// the inner matcher.
+///
+/// The `callable` will be called twice, so make sure it is pure.
+/// ```
+/// use googletest::prelude::*;
+/// fn should_pass() -> googletest::Result<()> {
+///    verify_that!(100, result_of!(|value| value + 1, eq(101)))?; // Passes
+///    Ok(())
+/// }
+///
+/// fn should_fail() -> googletest::Result<()> {
+///    verify_that!(100, result_of!(|value| value * 2, eq(100)))?; // Fails
+///    Ok(())
+/// }
+/// should_pass().unwrap();
+/// should_fail().unwrap_err();
+/// ```
+#[macro_export]
+macro_rules! __result_of {
+    ($function: expr, $matcher: expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::result_of(
+            $function,
+            $matcher,
+            stringify!($function),
+        )
+    }};
+}
+
+/// Matches a value where the reference to the result of `callable` applied to
+/// the value matches the inner matcher.
+///
+/// The `callable` will be called twice, so make sure it is pure.
+/// ```
+/// use googletest::prelude::*;
+/// fn should_pass_1() -> googletest::Result<()> {
+///    verify_that!("hello", result_of_ref!(|s: &str| s.to_uppercase(), eq("HELLO")))?; // Passes
+///    Ok(())
+/// }
+///
+/// fn should_pass_2() -> googletest::Result<()> {
+///    verify_that!(100, result_of_ref!(|value| value + 1, eq(&101)))?; // Passes
+///    Ok(())
+/// }
+///
+/// fn should_fail() -> googletest::Result<()> {
+///    verify_that!("world", result_of_ref!(|s: &str| s.to_uppercase(), eq("HELLO")))?; // Passes
+///    Ok(())
+/// }
+/// should_pass_1().unwrap();
+/// should_pass_2().unwrap();
+/// should_fail().unwrap_err();
+/// ```
+#[macro_export]
+macro_rules! __result_of_ref {
+    ($function: expr, $matcher: expr) => {{
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::result_of_ref(
+            $function,
+            $matcher,
+            stringify!($function),
+        )
+    }};
+}
+
+/// Items for use only by the declarative macros in this module.
+///
+/// **For internal use only. API stability is not guaranteed!**
+#[doc(hidden)]
+pub mod internal {
+    use crate::description::Description;
+    use crate::matcher::{Matcher, MatcherBase, MatcherResult};
+    use std::fmt::Debug;
+
+    pub fn result_of<Callable, InnerMatcher>(
+        callable: Callable,
+        inner_matcher: InnerMatcher,
+        callable_description: &'static str,
+    ) -> ResultOfMatcher<Callable, InnerMatcher> {
+        ResultOfMatcher { callable, inner_matcher, callable_description }
+    }
+
+    #[derive(MatcherBase)]
+    pub struct ResultOfMatcher<Callable, InnerMatcher> {
+        callable: Callable,
+        inner_matcher: InnerMatcher,
+        callable_description: &'static str,
+    }
+
+    impl<I: Copy + Debug, T: Debug + Copy, CallableT: Fn(I) -> T, InnerMatcherT: Matcher<T>>
+        Matcher<I> for ResultOfMatcher<CallableT, InnerMatcherT>
+    {
+        fn matches(&self, actual: I) -> MatcherResult {
+            self.inner_matcher.matches((self.callable)(actual))
+        }
+
+        fn describe(&self, matcher_result: MatcherResult) -> Description {
+            Description::new()
+                .text(format!("by applying {},", self.callable_description))
+                .nested(self.inner_matcher.describe(matcher_result))
+        }
+
+        fn explain_match(&self, actual: I) -> Description {
+            let actual_result = (self.callable)(actual);
+            Description::new()
+                .text(format!("which, results into {actual_result:?}",))
+                .nested(self.describe(self.matches(actual)))
+        }
+    }
+
+    pub fn result_of_ref<Callable, InnerMatcher>(
+        callable: Callable,
+        inner_matcher: InnerMatcher,
+        callable_description: &'static str,
+    ) -> ResultOfRefMatcher<Callable, InnerMatcher> {
+        ResultOfRefMatcher { callable, inner_matcher, callable_description }
+    }
+    #[derive(MatcherBase)]
+    pub struct ResultOfRefMatcher<Callable, InnerMatcher> {
+        callable: Callable,
+        inner_matcher: InnerMatcher,
+        callable_description: &'static str,
+    }
+
+    impl<
+            I: Copy + Debug,
+            T: Debug,
+            Callable: Fn(I) -> T,
+            InnerMatcherT: for<'a> Matcher<&'a T>,
+        > Matcher<I> for ResultOfRefMatcher<Callable, InnerMatcherT>
+    {
+        fn matches(&self, actual: I) -> MatcherResult {
+            self.inner_matcher.matches(&(self.callable)(actual))
+        }
+
+        fn describe(&self, matcher_result: MatcherResult) -> Description {
+            Description::new()
+                .text(format!("by applying {},", self.callable_description))
+                .nested(self.inner_matcher.describe(matcher_result))
+        }
+
+        fn explain_match(&self, actual: I) -> Description {
+            let actual_result = (self.callable)(actual);
+            Description::new()
+                .text(format!("which, results into {actual_result:?}",))
+                .nested(self.describe(self.matches(actual)))
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+    use indoc::indoc;
+
+    #[test]
+    fn result_of_match_with_value() -> Result<()> {
+        verify_that!(1, result_of!(|value| value + 1, eq(2)))
+    }
+
+    #[test]
+    fn result_of_match_with_value_function() -> Result<()> {
+        fn inc_by_one(value: i32) -> i32 {
+            value + 1
+        }
+        verify_that!(1, result_of!(inc_by_one, eq(2)))
+    }
+
+    #[test]
+    fn result_of_match_with_different_value() -> Result<()> {
+        let result = verify_that!(0, result_of!(|value| value - 1, eq(2)));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                Value of: 0
+                Expected: by applying |value| value - 1,
+                  is equal to 2
+                Actual: 0,
+                  which, results into -1
+                    by applying |value| value - 1,
+                      isn't equal to 2
+                "
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_match_with_different_value_block_closure() -> Result<()> {
+        let result = verify_that!(0, result_of!(|value| { value - 1 }, eq(2)));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                Value of: 0
+                Expected: by applying |value| { value - 1 },
+                  is equal to 2
+                Actual: 0,
+                  which, results into -1
+                    by applying |value| { value - 1 },
+                      isn't equal to 2
+                "
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_match_with_different_value_multiline_closure() -> Result<()> {
+        let result = verify_that!(
+            0,
+            result_of!(
+                |value| {
+                    let dec = value - 1;
+                    let inc = dec + 1;
+                    inc - 2
+                },
+                eq(2)
+            )
+        );
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                Value of: 0
+                Expected: by applying |value| { let dec = value - 1; let inc = dec + 1; inc - 2 },
+                  is equal to 2
+                Actual: 0,
+                  which, results into -2
+                    by applying |value| { let dec = value - 1; let inc = dec + 1; inc - 2 },
+                      isn't equal to 2
+                "
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_match_with_different_value_function() -> Result<()> {
+        fn dec_by_one(value: i32) -> i32 {
+            value - 1
+        }
+        let result = verify_that!(0, result_of!(dec_by_one, eq(2)));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                "
+                Value of: 0
+                Expected: by applying dec_by_one,
+                  is equal to 2
+                Actual: 0,
+                  which, results into -1
+                    by applying dec_by_one,
+                      isn't equal to 2
+                "
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_with_string_reference() -> Result<()> {
+        verify_that!("hello", result_of_ref!(|s: &str| s.to_uppercase(), eq("HELLO")))
+    }
+
+    #[test]
+    fn result_of_ref_match_with_string_reference_function() -> Result<()> {
+        fn to_upper_case<S: AsRef<str>>(s: S) -> String {
+            s.as_ref().to_uppercase()
+        }
+        verify_that!("hello", result_of_ref!(to_upper_case, eq("HELLO")))
+    }
+
+    #[test]
+    fn result_of_ref_match_with_copy_types() -> Result<()> {
+        verify_that!(100, result_of_ref!(|value| value + 1, eq(&101)))
+    }
+
+    #[test]
+    fn result_of_ref_match_with_different_value() -> Result<()> {
+        let result = verify_that!("world", result_of_ref!(|s: &str| s.to_uppercase(), eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+                Value of: "world"
+                Expected: by applying |s: &str| s.to_uppercase(),
+                  is equal to "HELLO"
+                Actual: "world",
+                  which, results into "WORLD"
+                    by applying |s: &str| s.to_uppercase(),
+                      isn't equal to "HELLO""#
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_with_different_value_block_closure() -> Result<()> {
+        let result =
+            verify_that!("world", result_of_ref!(|s: &str| { s.to_uppercase() }, eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+            Value of: "world"
+            Expected: by applying |s: &str| { s.to_uppercase() },
+              is equal to "HELLO"
+            Actual: "world",
+              which, results into "WORLD"
+                by applying |s: &str| { s.to_uppercase() },
+                  isn't equal to "HELLO"
+            "#
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_with_different_value_function() -> Result<()> {
+        fn to_upper_case<S: AsRef<str>>(s: S) -> String {
+            s.as_ref().to_uppercase()
+        }
+        let result = verify_that!("world", result_of_ref!(to_upper_case, eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+            Value of: "world"
+            Expected: by applying to_upper_case,
+              is equal to "HELLO"
+            Actual: "world",
+              which, results into "WORLD"
+                by applying to_upper_case,
+                  isn't equal to "HELLO"
+            "#
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_different_with_closure_variable() -> Result<()> {
+        let to_upper_case = |s: &str| s.to_uppercase();
+        let result = verify_that!("world", result_of_ref!(to_upper_case, eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+                Value of: "world"
+                Expected: by applying to_upper_case,
+                  is equal to "HELLO"
+                Actual: "world",
+                  which, results into "WORLD"
+                    by applying to_upper_case,
+                      isn't equal to "HELLO"
+            "#
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_different_with_method_literal() -> Result<()> {
+        let result = verify_that!("world", result_of_ref!(str::to_uppercase, eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+                Value of: "world"
+                Expected: by applying str::to_uppercase,
+                  is equal to "HELLO"
+                Actual: "world",
+                  which, results into "WORLD"
+                    by applying str::to_uppercase,
+                      isn't equal to "HELLO"
+            "#
+            ))))
+        )
+    }
+
+    #[test]
+    fn result_of_ref_match_different_with_function_return_closure() -> Result<()> {
+        fn upper_case() -> impl Fn(&str) -> String {
+            |s: &str| s.to_uppercase()
+        }
+        let result = verify_that!("world", result_of_ref!(upper_case(), eq("HELLO")));
+        verify_that!(
+            result,
+            err(displays_as(contains_substring(indoc!(
+                r#"
+            Value of: "world"
+            Expected: by applying upper_case(),
+              is equal to "HELLO"
+            Actual: "world",
+              which, results into "WORLD"
+                by applying upper_case(),
+                  isn't equal to "HELLO"
+            "#
+            ))))
+        )
+    }
+
+    #[test]
+    fn test_describe_simple() -> Result<()> {
+        let matcher = result_of!(|x| x + 1, eq(2));
+        let description = matcher.describe(matcher.matches(0));
+        verify_that!(
+            description,
+            displays_as(eq(indoc!(
+                r#"
+        by applying |x| x + 1,
+          isn't equal to 2"#
+            )))
+        )
+    }
+
+    #[test]
+    fn test_describe_complicated() -> Result<()> {
+        let matcher = result_of_ref!(
+            |s: &str| s.chars().collect::<Vec<_>>(),
+            each(predicate(char::is_ascii_alphabetic))
+        );
+        let description = matcher.describe(matcher.matches("A quick brown fox"));
+        verify_that!(
+            description,
+            displays_as(eq(indoc!(
+                r#"
+        by applying |s: &str| s.chars().collect::<Vec<_>>(),
+          contains no element that matches"#
+            )))
+        )
+    }
+}

crates/googletest/src/matchers/some_matcher.rs

diff --git a/crates/googletest/src/matchers/some_matcher.rs b/crates/googletest/src/matchers/some_matcher.rs
index 905aa17..8c926f9 100644
--- a/crates/googletest/src/matchers/some_matcher.rs
+++ b/crates/googletest/src/matchers/some_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches an `Option` containing a value matched by `inner`.
 ///
@@ -38,23 +38,51 @@
 /// # should_fail_1().unwrap_err();
 /// # should_fail_2().unwrap_err();
 /// ```
-pub fn some<T: Debug>(inner: impl Matcher<ActualT = T>) -> impl Matcher<ActualT = Option<T>> {
-    SomeMatcher { inner, phantom: Default::default() }
+pub fn some<Inner>(inner: Inner) -> SomeMatcher<Inner> {
+    SomeMatcher { inner }
 }
 
-struct SomeMatcher<T, InnerMatcherT> {
+#[derive(MatcherBase)]
+pub struct SomeMatcher<InnerMatcherT> {
     inner: InnerMatcherT,
-    phantom: PhantomData<T>,
 }
 
-impl<T: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher for SomeMatcher<T, InnerMatcherT> {
-    type ActualT = Option<T>;
+impl<T: Debug + Copy, InnerMatcherT: Matcher<T>> Matcher<Option<T>> for SomeMatcher<InnerMatcherT> {
+    fn matches(&self, actual: Option<T>) -> MatcherResult {
+        actual.map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
+    }
 
-    fn matches(&self, actual: &Option<T>) -> MatcherResult {
+    fn explain_match(&self, actual: Option<T>) -> Description {
+        match (self.matches(actual), actual) {
+            (_, Some(t)) => {
+                Description::new().text("which has a value").nested(self.inner.explain_match(t))
+            }
+            (_, None) => "which is None".into(),
+        }
+    }
+
+    fn describe(&self, matcher_result: MatcherResult) -> Description {
+        match matcher_result {
+            MatcherResult::Match => {
+                format!("has a value which {}", self.inner.describe(MatcherResult::Match)).into()
+            }
+            MatcherResult::NoMatch => format!(
+                "is None or has a value which {}",
+                self.inner.describe(MatcherResult::NoMatch)
+            )
+            .into(),
+        }
+    }
+}
+
+impl<'a, T: Debug, InnerMatcherT: Matcher<&'a T>> Matcher<&'a Option<T>>
+    for SomeMatcher<InnerMatcherT>
+{
+    fn matches(&self, actual: &'a Option<T>) -> MatcherResult {
         actual.as_ref().map(|v| self.inner.matches(v)).unwrap_or(MatcherResult::NoMatch)
     }
 
-    fn explain_match(&self, actual: &Option<T>) -> Description {
+    fn explain_match(&self, actual: &'a Option<T>) -> Description {
         match (self.matches(actual), actual) {
             (_, Some(t)) => {
                 Description::new().text("which has a value").nested(self.inner.explain_match(t))
@@ -79,8 +107,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::some;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -88,7 +115,7 @@
     fn some_matches_option_with_value() -> Result<()> {
         let matcher = some(eq(1));
 
-        let result = matcher.matches(&Some(1));
+        let result = matcher.matches(Some(1));
 
         verify_that!(result, eq(MatcherResult::Match))
     }
@@ -97,21 +124,36 @@
     fn some_does_not_match_option_with_wrong_value() -> Result<()> {
         let matcher = some(eq(1));
 
-        let result = matcher.matches(&Some(0));
+        let result = matcher.matches(Some(0));
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
     fn some_does_not_match_option_with_none() -> Result<()> {
-        let matcher = some(eq::<i32, _>(1));
+        let matcher = some(eq(1));
 
-        let result = matcher.matches(&None);
+        let result = matcher.matches(None::<i32>);
 
         verify_that!(result, eq(MatcherResult::NoMatch))
     }
 
     #[test]
+    fn some_matches_option_with_by_ref_value() -> Result<()> {
+        verify_that!(Some("123".to_string()), some(eq("123")))
+    }
+
+    #[test]
+    fn some_does_not_match_option_with_wrong_by_ref_value() -> Result<()> {
+        verify_that!(Some("321".to_string()), not(some(eq("123"))))
+    }
+
+    #[test]
+    fn some_does_not_match_option_with_by_ref_none() -> Result<()> {
+        verify_that!(None::<String>, not(some(eq("123"))))
+    }
+
+    #[test]
     fn some_full_error_message() -> Result<()> {
         let result = verify_that!(Some(2), some(eq(1)));
         verify_that!(
@@ -131,7 +173,7 @@
     #[test]
     fn some_describe_matches() -> Result<()> {
         verify_that!(
-            some(eq::<i32, _>(1)).describe(MatcherResult::Match),
+            Matcher::<Option<i32>>::describe(&some(eq(1)), MatcherResult::Match),
             displays_as(eq("has a value which is equal to 1"))
         )
     }
@@ -139,20 +181,36 @@
     #[test]
     fn some_describe_does_not_match() -> Result<()> {
         verify_that!(
-            some(eq::<i32, _>(1)).describe(MatcherResult::NoMatch),
+            Matcher::<Option<i32>>::describe(&some(eq(1)), MatcherResult::NoMatch),
             displays_as(eq("is None or has a value which isn't equal to 1"))
         )
     }
 
     #[test]
+    fn some_describe_matches_of_by_ref() -> Result<()> {
+        verify_that!(
+            Matcher::<Option<&String>>::describe(&some(eq("123")), MatcherResult::Match),
+            displays_as(eq("has a value which is equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn some_describe_does_not_match_of_by_ref() -> Result<()> {
+        verify_that!(
+            Matcher::<Option<&String>>::describe(&some(eq("123")), MatcherResult::NoMatch),
+            displays_as(eq("is None or has a value which isn't equal to \"123\""))
+        )
+    }
+
+    #[test]
     fn some_explain_match_with_none() -> Result<()> {
-        verify_that!(some(eq::<i32, _>(1)).explain_match(&None), displays_as(eq("which is None")))
+        verify_that!(some(eq(1)).explain_match(None::<i32>), displays_as(eq("which is None")))
     }
 
     #[test]
     fn some_explain_match_with_some_success() -> Result<()> {
         verify_that!(
-            some(eq(1)).explain_match(&Some(1)),
+            some(eq(1)).explain_match(Some(1)),
             displays_as(eq("which has a value\n  which is equal to 1"))
         )
     }
@@ -160,8 +218,32 @@
     #[test]
     fn some_explain_match_with_some_fail() -> Result<()> {
         verify_that!(
-            some(eq(1)).explain_match(&Some(2)),
+            some(eq(1)).explain_match(Some(2)),
             displays_as(eq("which has a value\n  which isn't equal to 1"))
         )
     }
+
+    #[test]
+    fn some_explain_match_with_none_by_ref() -> Result<()> {
+        verify_that!(
+            some(eq("123")).explain_match(&None::<String>),
+            displays_as(eq("which is None"))
+        )
+    }
+
+    #[test]
+    fn some_explain_match_with_some_success_by_ref() -> Result<()> {
+        verify_that!(
+            some(eq("123")).explain_match(&Some("123".to_string())),
+            displays_as(eq("which has a value\n  which is equal to \"123\""))
+        )
+    }
+
+    #[test]
+    fn some_explain_match_with_some_fail_by_ref() -> Result<()> {
+        verify_that!(
+            some(eq("123")).explain_match(&Some("321".to_string())),
+            displays_as(eq("which has a value\n  which isn't equal to \"123\""))
+        )
+    }
 }

crates/googletest/src/matchers/str_matcher.rs

diff --git a/crates/googletest/src/matchers/str_matcher.rs b/crates/googletest/src/matchers/str_matcher.rs
index b624d44..aa58d4c 100644
--- a/crates/googletest/src/matchers/str_matcher.rs
+++ b/crates/googletest/src/matchers/str_matcher.rs
@@ -14,16 +14,15 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
     matcher_support::{
         edit_distance,
         summarize_diff::{create_diff, create_diff_reversed},
     },
-    matchers::{eq_deref_of_matcher::EqDerefOfMatcher, eq_matcher::EqMatcher},
+    matchers::eq_matcher::EqMatcher,
 };
 use std::borrow::Cow;
 use std::fmt::Debug;
-use std::marker::PhantomData;
 use std::ops::Deref;
 
 /// Matches a string containing a given substring.
@@ -59,11 +58,10 @@
 /// > and expected values when matching strings while
 /// > [`ignoring_ascii_case`][StrMatcherConfigurator::ignoring_ascii_case] is
 /// > set.
-pub fn contains_substring<A: ?Sized, T>(expected: T) -> StrMatcher<A, T> {
+pub fn contains_substring<T>(expected: T) -> StrMatcher<T> {
     StrMatcher {
         configuration: Configuration { mode: MatchMode::Contains, ..Default::default() },
         expected,
-        phantom: Default::default(),
     }
 }
 
@@ -99,11 +97,10 @@
 ///
 /// See the [`StrMatcherConfigurator`] extension trait for more options on how
 /// the string is matched.
-pub fn starts_with<A: ?Sized, T>(expected: T) -> StrMatcher<A, T> {
+pub fn starts_with<T>(expected: T) -> StrMatcher<T> {
     StrMatcher {
         configuration: Configuration { mode: MatchMode::StartsWith, ..Default::default() },
         expected,
-        phantom: Default::default(),
     }
 }
 
@@ -139,11 +136,10 @@
 ///
 /// See the [`StrMatcherConfigurator`] extension trait for more options on how
 /// the string is matched.
-pub fn ends_with<A: ?Sized, T>(expected: T) -> StrMatcher<A, T> {
+pub fn ends_with<T>(expected: T) -> StrMatcher<T> {
     StrMatcher {
         configuration: Configuration { mode: MatchMode::EndsWith, ..Default::default() },
         expected,
-        phantom: Default::default(),
     }
 }
 
@@ -152,7 +148,7 @@
 /// Matchers which match against string values and, through configuration,
 /// specialise to [`StrMatcher`] implement this trait. That includes
 /// [`EqMatcher`] and [`StrMatcher`].
-pub trait StrMatcherConfigurator<ActualT: ?Sized, ExpectedT> {
+pub trait StrMatcherConfigurator<ExpectedT> {
     /// Configures the matcher to ignore any leading whitespace in either the
     /// actual or the expected value.
     ///
@@ -171,7 +167,7 @@
     /// When all other configuration options are left as the defaults, this is
     /// equivalent to invoking [`str::trim_start`] on both the expected and
     /// actual value.
-    fn ignoring_leading_whitespace(self) -> StrMatcher<ActualT, ExpectedT>;
+    fn ignoring_leading_whitespace(self) -> StrMatcher<ExpectedT>;
 
     /// Configures the matcher to ignore any trailing whitespace in either the
     /// actual or the expected value.
@@ -191,7 +187,7 @@
     /// When all other configuration options are left as the defaults, this is
     /// equivalent to invoking [`str::trim_end`] on both the expected and
     /// actual value.
-    fn ignoring_trailing_whitespace(self) -> StrMatcher<ActualT, ExpectedT>;
+    fn ignoring_trailing_whitespace(self) -> StrMatcher<ExpectedT>;
 
     /// Configures the matcher to ignore both leading and trailing whitespace in
     /// either the actual or the expected value.
@@ -215,7 +211,7 @@
     /// When all other configuration options are left as the defaults, this is
     /// equivalent to invoking [`str::trim`] on both the expected and actual
     /// value.
-    fn ignoring_outer_whitespace(self) -> StrMatcher<ActualT, ExpectedT>;
+    fn ignoring_outer_whitespace(self) -> StrMatcher<ExpectedT>;
 
     /// Configures the matcher to ignore ASCII case when comparing values.
     ///
@@ -237,7 +233,7 @@
     ///
     /// This is **not guaranteed** to match strings with differing upper/lower
     /// case characters outside of the codepoints 0-127 covered by ASCII.
-    fn ignoring_ascii_case(self) -> StrMatcher<ActualT, ExpectedT>;
+    fn ignoring_ascii_case(self) -> StrMatcher<ExpectedT>;
 
     /// Configures the matcher to match only strings which otherwise satisfy the
     /// conditions a number times matched by the matcher `times`.
@@ -272,10 +268,7 @@
     /// This is only meaningful when the matcher was constructed with
     /// [`contains_substring`]. This method will panic when it is used with any
     /// other matcher construction.
-    fn times(
-        self,
-        times: impl Matcher<ActualT = usize> + 'static,
-    ) -> StrMatcher<ActualT, ExpectedT>;
+    fn times(self, times: impl Matcher<usize> + 'static) -> StrMatcher<ExpectedT>;
 }
 
 /// A matcher which matches equality or containment of a string-like value in a
@@ -287,20 +280,18 @@
 ///  * [`contains_substring`],
 ///  * [`starts_with`],
 ///  * [`ends_with`].
-pub struct StrMatcher<ActualT: ?Sized, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct StrMatcher<ExpectedT> {
     expected: ExpectedT,
     configuration: Configuration,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ExpectedT, ActualT> Matcher for StrMatcher<ActualT, ExpectedT>
+impl<ExpectedT, ActualT> Matcher<ActualT> for StrMatcher<ExpectedT>
 where
     ExpectedT: Deref<Target = str> + Debug,
-    ActualT: AsRef<str> + Debug + ?Sized,
+    ActualT: AsRef<str> + Debug + Copy,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         self.configuration.do_strings_match(self.expected.deref(), actual.as_ref()).into()
     }
 
@@ -308,15 +299,15 @@
         self.configuration.describe(matcher_result, self.expected.deref())
     }
 
-    fn explain_match(&self, actual: &ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         self.configuration.explain_match(self.expected.deref(), actual.as_ref())
     }
 }
 
-impl<ActualT: ?Sized, ExpectedT, MatcherT: Into<StrMatcher<ActualT, ExpectedT>>>
-    StrMatcherConfigurator<ActualT, ExpectedT> for MatcherT
+impl<ExpectedT, MatcherT: Into<StrMatcher<ExpectedT>>> StrMatcherConfigurator<ExpectedT>
+    for MatcherT
 {
-    fn ignoring_leading_whitespace(self) -> StrMatcher<ActualT, ExpectedT> {
+    fn ignoring_leading_whitespace(self) -> StrMatcher<ExpectedT> {
         let existing = self.into();
         StrMatcher {
             configuration: existing.configuration.ignoring_leading_whitespace(),
@@ -324,7 +315,7 @@
         }
     }
 
-    fn ignoring_trailing_whitespace(self) -> StrMatcher<ActualT, ExpectedT> {
+    fn ignoring_trailing_whitespace(self) -> StrMatcher<ExpectedT> {
         let existing = self.into();
         StrMatcher {
             configuration: existing.configuration.ignoring_trailing_whitespace(),
@@ -332,20 +323,17 @@
         }
     }
 
-    fn ignoring_outer_whitespace(self) -> StrMatcher<ActualT, ExpectedT> {
+    fn ignoring_outer_whitespace(self) -> StrMatcher<ExpectedT> {
         let existing = self.into();
         StrMatcher { configuration: existing.configuration.ignoring_outer_whitespace(), ..existing }
     }
 
-    fn ignoring_ascii_case(self) -> StrMatcher<ActualT, ExpectedT> {
+    fn ignoring_ascii_case(self) -> StrMatcher<ExpectedT> {
         let existing = self.into();
         StrMatcher { configuration: existing.configuration.ignoring_ascii_case(), ..existing }
     }
 
-    fn times(
-        self,
-        times: impl Matcher<ActualT = usize> + 'static,
-    ) -> StrMatcher<ActualT, ExpectedT> {
+    fn times(self, times: impl Matcher<usize> + 'static) -> StrMatcher<ExpectedT> {
         let existing = self.into();
         if !matches!(existing.configuration.mode, MatchMode::Contains) {
             panic!("The times() configurator is only meaningful with contains_substring().");
@@ -354,25 +342,19 @@
     }
 }
 
-impl<A: ?Sized, T: Deref<Target = str>> From<EqMatcher<A, T>> for StrMatcher<A, T> {
-    fn from(value: EqMatcher<A, T>) -> Self {
+impl<T: Deref<Target = str>> From<EqMatcher<T>> for StrMatcher<T> {
+    fn from(value: EqMatcher<T>) -> Self {
         Self::with_default_config(value.expected)
     }
 }
 
-impl<A: ?Sized, T: Deref<Target = str>> From<EqDerefOfMatcher<A, T>> for StrMatcher<A, T> {
-    fn from(value: EqDerefOfMatcher<A, T>) -> Self {
-        Self::with_default_config(value.expected)
-    }
-}
-
-impl<A: ?Sized, T> StrMatcher<A, T> {
+impl<T> StrMatcher<T> {
     /// Returns a [`StrMatcher`] with a default configuration to match against
     /// the given expected value.
     ///
     /// This default configuration is sensitive to whitespace and case.
     fn with_default_config(expected: T) -> Self {
-        Self { expected, configuration: Default::default(), phantom: Default::default() }
+        Self { expected, configuration: Default::default() }
     }
 }
 
@@ -387,7 +369,7 @@
     ignore_leading_whitespace: bool,
     ignore_trailing_whitespace: bool,
     case_policy: CasePolicy,
-    times: Option<Box<dyn Matcher<ActualT = usize>>>,
+    times: Option<Box<dyn Matcher<usize>>>,
 }
 
 #[derive(Clone)]
@@ -461,13 +443,13 @@
             // Split returns an iterator over the "boundaries" left and right of the
             // substring to be matched, of which there is one more than the number of
             // substrings.
-            matches!(times.matches(&(actual.split(expected).count() - 1)), MatcherResult::Match)
+            matches!(times.matches(actual.split(expected).count() - 1), MatcherResult::Match)
         } else {
             actual.contains(expected)
         }
     }
 
-    // StrMatcher::describe redirects immediately to this function.
+    // StrMatcher::<str>::describe redirects immediately to this function.
     fn describe(&self, matcher_result: MatcherResult, expected: &str) -> Description {
         let mut addenda: Vec<Cow<'static, str>> = Vec::with_capacity(3);
         match (self.ignore_leading_whitespace, self.ignore_trailing_whitespace) {
@@ -551,7 +533,11 @@
             MatchMode::EndsWith => create_diff_reversed(actual, expected, self.mode.to_diff_mode()),
         };
 
-        format!("{default_explanation}\n{diff}").into()
+        if diff.is_empty() {
+            format!("{default_explanation}").into()
+        } else {
+            format!("{default_explanation}\n\n{diff}").into()
+        }
     }
 
     fn ignoring_leading_whitespace(self) -> Self {
@@ -570,7 +556,7 @@
         Self { case_policy: CasePolicy::IgnoreAscii, ..self }
     }
 
-    fn times(self, times: impl Matcher<ActualT = usize> + 'static) -> Self {
+    fn times(self, times: impl Matcher<usize> + 'static) -> Self {
         Self { times: Some(Box::new(times)), ..self }
     }
 }
@@ -589,8 +575,7 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{contains_substring, ends_with, starts_with, StrMatcher, StrMatcherConfigurator};
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
 
@@ -713,23 +698,13 @@
     }
 
     #[test]
-    fn allows_ignoring_ascii_case_from_eq_deref_of_str_slice() -> Result<()> {
-        verify_that!("A string", eq_deref_of("A STRING").ignoring_ascii_case())
-    }
-
-    #[test]
-    fn allows_ignoring_ascii_case_from_eq_deref_of_owned_string() -> Result<()> {
-        verify_that!("A string", eq_deref_of("A STRING".to_string()).ignoring_ascii_case())
-    }
-
-    #[test]
     fn matches_string_containing_expected_value_in_contains_mode() -> Result<()> {
         verify_that!("Some string", contains_substring("str"))
     }
 
     #[test]
-    fn matches_string_containing_expected_value_in_contains_mode_while_ignoring_ascii_case()
-    -> Result<()> {
+    fn matches_string_containing_expected_value_in_contains_mode_while_ignoring_ascii_case(
+    ) -> Result<()> {
         verify_that!("Some string", contains_substring("STR").ignoring_ascii_case())
     }
 
@@ -810,48 +785,45 @@
 
     #[test]
     fn describes_itself_for_matching_result() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = StrMatcher::with_default_config("A string");
+        let matcher = StrMatcher::with_default_config("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is equal to \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_non_matching_result() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = StrMatcher::with_default_config("A string");
+        let matcher = StrMatcher::with_default_config("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::NoMatch),
+            Matcher::<&str>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("isn't equal to \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_matching_result_ignoring_leading_whitespace() -> Result<()> {
-        let matcher: StrMatcher<&str, _> =
-            StrMatcher::with_default_config("A string").ignoring_leading_whitespace();
+        let matcher = StrMatcher::with_default_config("A string").ignoring_leading_whitespace();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is equal to \"A string\" (ignoring leading whitespace)"))
         )
     }
 
     #[test]
     fn describes_itself_for_non_matching_result_ignoring_leading_whitespace() -> Result<()> {
-        let matcher: StrMatcher<&str, _> =
-            StrMatcher::with_default_config("A string").ignoring_leading_whitespace();
+        let matcher = StrMatcher::with_default_config("A string").ignoring_leading_whitespace();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::NoMatch),
+            Matcher::<&str>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("isn't equal to \"A string\" (ignoring leading whitespace)"))
         )
     }
 
     #[test]
     fn describes_itself_for_matching_result_ignoring_trailing_whitespace() -> Result<()> {
-        let matcher: StrMatcher<&str, _> =
-            StrMatcher::with_default_config("A string").ignoring_trailing_whitespace();
+        let matcher = StrMatcher::with_default_config("A string").ignoring_trailing_whitespace();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is equal to \"A string\" (ignoring trailing whitespace)"))
         )
     }
@@ -859,32 +831,30 @@
     #[test]
     fn describes_itself_for_matching_result_ignoring_leading_and_trailing_whitespace() -> Result<()>
     {
-        let matcher: StrMatcher<&str, _> =
-            StrMatcher::with_default_config("A string").ignoring_outer_whitespace();
+        let matcher = StrMatcher::with_default_config("A string").ignoring_outer_whitespace();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is equal to \"A string\" (ignoring leading and trailing whitespace)"))
         )
     }
 
     #[test]
     fn describes_itself_for_matching_result_ignoring_ascii_case() -> Result<()> {
-        let matcher: StrMatcher<&str, _> =
-            StrMatcher::with_default_config("A string").ignoring_ascii_case();
+        let matcher = StrMatcher::with_default_config("A string").ignoring_ascii_case();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("is equal to \"A string\" (ignoring ASCII case)"))
         )
     }
 
     #[test]
-    fn describes_itself_for_matching_result_ignoring_ascii_case_and_leading_whitespace()
-    -> Result<()> {
-        let matcher: StrMatcher<&str, _> = StrMatcher::with_default_config("A string")
+    fn describes_itself_for_matching_result_ignoring_ascii_case_and_leading_whitespace(
+    ) -> Result<()> {
+        let matcher = StrMatcher::with_default_config("A string")
             .ignoring_leading_whitespace()
             .ignoring_ascii_case();
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq(
                 "is equal to \"A string\" (ignoring leading whitespace, ignoring ASCII case)"
             ))
@@ -893,63 +863,63 @@
 
     #[test]
     fn describes_itself_for_matching_result_in_contains_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = contains_substring("A string");
+        let matcher = contains_substring("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("contains a substring \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_non_matching_result_in_contains_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = contains_substring("A string");
+        let matcher = contains_substring("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::NoMatch),
+            Matcher::<&str>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("does not contain a substring \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_with_count_number() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = contains_substring("A string").times(gt(2));
+        let matcher = contains_substring("A string").times(gt(2));
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("contains a substring \"A string\" (count is greater than 2)"))
         )
     }
 
     #[test]
     fn describes_itself_for_matching_result_in_starts_with_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = starts_with("A string");
+        let matcher = starts_with("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("starts with prefix \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_non_matching_result_in_starts_with_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = starts_with("A string");
+        let matcher = starts_with("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::NoMatch),
+            Matcher::<&str>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("does not start with \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_matching_result_in_ends_with_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = ends_with("A string");
+        let matcher = ends_with("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&str>::describe(&matcher, MatcherResult::Match),
             displays_as(eq("ends with suffix \"A string\""))
         )
     }
 
     #[test]
     fn describes_itself_for_non_matching_result_in_ends_with_mode() -> Result<()> {
-        let matcher: StrMatcher<&str, _> = ends_with("A string");
+        let matcher = ends_with("A string");
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::NoMatch),
+            Matcher::<&str>::describe(&matcher, MatcherResult::NoMatch),
             displays_as(eq("does not end with \"A string\""))
         )
     }
@@ -1019,8 +989,8 @@
     }
 
     #[test]
-    fn match_explanation_for_starts_with_includes_both_versions_of_differing_last_line()
-    -> Result<()> {
+    fn match_explanation_for_starts_with_includes_both_versions_of_differing_last_line(
+    ) -> Result<()> {
         let result = verify_that!(
             indoc!(
                 "
@@ -1121,8 +1091,8 @@
     }
 
     #[test]
-    fn match_explanation_for_contains_substring_shows_diff_when_first_and_last_line_are_incomplete()
-    -> Result<()> {
+    fn match_explanation_for_contains_substring_shows_diff_when_first_and_last_line_are_incomplete(
+    ) -> Result<()> {
         let result = verify_that!(
             indoc!(
                 "

crates/googletest/src/matchers/subset_of_matcher.rs

diff --git a/crates/googletest/src/matchers/subset_of_matcher.rs b/crates/googletest/src/matchers/subset_of_matcher.rs
index 24c00d8..2beaf2d 100644
--- a/crates/googletest/src/matchers/subset_of_matcher.rs
+++ b/crates/googletest/src/matchers/subset_of_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a container all of whose items are in the given container
 /// `superset`.
@@ -24,23 +24,23 @@
 /// The element type `ElementT` must implement `PartialEq` to allow element
 /// comparison.
 ///
-/// `ActualT` and `ExpectedT` can each be any container a reference to which
+/// `ActualT` and `ExpectedT` can each be any container which
 /// implements `IntoIterator`. For instance, `T` can be a common container like
-/// `Vec` or arrays. They need not be the same container type.
+/// `&Vec` or arrays. They need not be the same container type.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # use std::collections::HashSet;
 /// # fn should_pass_1() -> Result<()> {
 /// let value = vec![1, 2, 3];
-/// verify_that!(value, subset_of([1, 2, 3, 4]))?;  // Passes
+/// verify_that!(value, subset_of([&1, &2, &3, &4]))?;  // Passes
 /// let array_value = [1, 2, 3];
 /// verify_that!(array_value, subset_of([1, 2, 3, 4]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
 /// # let value = vec![1, 2, 3];
-/// verify_that!(value, subset_of([1, 2]))?;  // Fails: 3 is not in the superset
+/// verify_that!(value, subset_of([&1, &2]))?;  // Fails: 3 is not in the superset
 /// #     Ok(())
 /// # }
 /// # should_pass_1().unwrap();
@@ -48,7 +48,7 @@
 ///
 /// # fn should_pass_2() -> Result<()> {
 /// let value: HashSet<i32> = [1, 2, 3].into();
-/// verify_that!(value, subset_of([1, 2, 3]))?;  // Passes
+/// verify_that!(value, subset_of([&1, &2, &3]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass_2().unwrap();
@@ -60,20 +60,8 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value: Vec<i32> = vec![0, 0, 1];
-/// verify_that!(value, subset_of([0, 1]))?;  // Passes
-/// verify_that!(value, subset_of([0, 1, 1]))?;  // Passes
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-///
-/// One can also verify the contents of a slice by dereferencing it:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # fn should_pass() -> Result<()> {
-/// let value = &[1, 2, 3];
-/// verify_that!(*value, subset_of([1, 2, 3]))?;
+/// verify_that!(value, subset_of([&0, &1]))?;  // Passes
+/// verify_that!(value, subset_of([&0, &1, &1]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -83,43 +71,35 @@
 /// runtime proportional to the *product* of the sizes of the actual and
 /// expected containers as well as the time to check equality of each pair of
 /// items. It should not be used on especially large containers.
-pub fn subset_of<ElementT: Debug + PartialEq, ActualT: Debug + ?Sized, ExpectedT: Debug>(
-    superset: ExpectedT,
-) -> impl Matcher<ActualT = ActualT>
-where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
-    for<'a> &'a ExpectedT: IntoIterator<Item = &'a ElementT>,
-{
-    SubsetOfMatcher::<ActualT, _> { superset, phantom: Default::default() }
+pub fn subset_of<ExpectedT>(superset: ExpectedT) -> SubsetOfMatcher<ExpectedT> {
+    SubsetOfMatcher { superset }
 }
 
-struct SubsetOfMatcher<ActualT: ?Sized, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct SubsetOfMatcher<ExpectedT> {
     superset: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ElementT: Debug + PartialEq, ActualT: Debug + ?Sized, ExpectedT: Debug> Matcher
-    for SubsetOfMatcher<ActualT, ExpectedT>
+impl<ElementT: Debug + PartialEq + Copy, ActualT: Debug + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for SubsetOfMatcher<ExpectedT>
 where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
+    ActualT: IntoIterator<Item = ElementT>,
     for<'a> &'a ExpectedT: IntoIterator<Item = &'a ElementT>,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         for actual_item in actual {
-            if self.expected_is_missing(actual_item) {
+            if self.expected_is_missing(&actual_item) {
                 return MatcherResult::NoMatch;
             }
         }
         MatcherResult::Match
     }
 
-    fn explain_match(&self, actual: &ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         let unexpected_elements = actual
             .into_iter()
             .enumerate()
-            .filter(|&(_, actual_item)| self.expected_is_missing(actual_item))
+            .filter(|item| self.expected_is_missing(&item.1))
             .map(|(idx, actual_item)| format!("{actual_item:#?} at #{idx}"))
             .collect::<Vec<_>>();
 
@@ -138,18 +118,17 @@
     }
 }
 
-impl<ActualT: ?Sized, ElementT: PartialEq, ExpectedT> SubsetOfMatcher<ActualT, ExpectedT>
+impl<ElementT: PartialEq, ExpectedT> SubsetOfMatcher<ExpectedT>
 where
     for<'a> &'a ExpectedT: IntoIterator<Item = &'a ElementT>,
 {
     fn expected_is_missing(&self, needle: &ElementT) -> bool {
-        !self.superset.into_iter().any(|item| *item == *needle)
+        !self.superset.into_iter().any(|item| item == needle)
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::subset_of;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashSet;
@@ -163,54 +142,54 @@
     #[test]
     fn subset_of_matches_vec_with_one_element() -> Result<()> {
         let value = vec![1];
-        verify_that!(value, subset_of([1]))
+        verify_that!(value, subset_of([&1]))
     }
 
     #[test]
     fn subset_of_matches_vec_with_two_elements() -> Result<()> {
         let value = vec![1, 2];
-        verify_that!(value, subset_of([1, 2]))
+        verify_that!(value, subset_of([&1, &2]))
     }
 
     #[test]
     fn subset_of_matches_vec_when_expected_has_excess_element() -> Result<()> {
         let value = vec![1, 2];
-        verify_that!(value, subset_of([1, 2, 3]))
+        verify_that!(value, subset_of([&1, &2, &3]))
     }
 
     #[test]
     fn subset_of_matches_vec_when_expected_has_excess_element_first() -> Result<()> {
         let value = vec![1, 2];
-        verify_that!(value, subset_of([3, 1, 2]))
+        verify_that!(value, subset_of([&3, &1, &2]))
     }
 
     #[test]
     fn subset_of_matches_slice_with_one_element() -> Result<()> {
         let value = &[1];
-        verify_that!(*value, subset_of([1]))
+        verify_that!(value, subset_of([&1]))
     }
 
     #[test]
     fn subset_of_matches_hash_set_with_one_element() -> Result<()> {
         let value: HashSet<i32> = [1].into();
-        verify_that!(value, subset_of([1]))
+        verify_that!(value, subset_of([&1]))
     }
 
     #[test]
     fn subset_of_does_not_match_when_first_element_does_not_match() -> Result<()> {
         let value = vec![0];
-        verify_that!(value, not(subset_of([1])))
+        verify_that!(value, not(subset_of([&1])))
     }
 
     #[test]
     fn subset_of_does_not_match_when_second_element_does_not_match() -> Result<()> {
         let value = vec![2, 0];
-        verify_that!(value, not(subset_of([2])))
+        verify_that!(value, not(subset_of([&2])))
     }
 
     #[test]
     fn subset_of_shows_correct_message_when_first_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 2, 3], subset_of([1, 2, 3]));
+        let result = verify_that!(vec![0, 2, 3], subset_of([&1, &2, &3]));
 
         verify_that!(
             result,
@@ -231,7 +210,7 @@
 
     #[test]
     fn subset_of_shows_correct_message_when_second_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![1, 0, 3], subset_of([1, 2, 3]));
+        let result = verify_that!(vec![1, 0, 3], subset_of([&1, &2, &3]));
 
         verify_that!(
             result,
@@ -252,7 +231,7 @@
 
     #[test]
     fn subset_of_shows_correct_message_when_first_two_items_do_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 0, 3], subset_of([1, 2, 3]));
+        let result = verify_that!(vec![0, 0, 3], subset_of([&1, &2, &3]));
 
         verify_that!(
             result,

crates/googletest/src/matchers/superset_of_matcher.rs

diff --git a/crates/googletest/src/matchers/superset_of_matcher.rs b/crates/googletest/src/matchers/superset_of_matcher.rs
index d1e9d72..8d28e45 100644
--- a/crates/googletest/src/matchers/superset_of_matcher.rs
+++ b/crates/googletest/src/matchers/superset_of_matcher.rs
@@ -14,9 +14,9 @@
 
 use crate::{
     description::Description,
-    matcher::{Matcher, MatcherResult},
+    matcher::{Matcher, MatcherBase, MatcherResult},
 };
-use std::{fmt::Debug, marker::PhantomData};
+use std::fmt::Debug;
 
 /// Matches a container containing all of the items in the given container
 /// `subset`.
@@ -24,24 +24,24 @@
 /// The element type `ElementT` must implement `PartialEq` to allow element
 /// comparison.
 ///
-/// `ActualT` and `ExpectedT` can each be any container a reference to which
-/// implements `IntoIterator`. For instance, `ActualT` and `ExpectedT` can be a
-/// common container like `Vec` or arrays. They need not be the same container
-/// type.
+/// `ActualT` and `ExpectedT` can each be any container which implements
+/// `IntoIterator`. For instance, `ActualT` and `ExpectedT` can be a
+/// common container like `&Vec`, arrays or slices. They need not be the same
+/// container type.
 ///
 /// ```
 /// # use googletest::prelude::*;
 /// # use std::collections::HashSet;
 /// # fn should_pass_1() -> Result<()> {
 /// let value = vec![1, 2, 3];
-/// verify_that!(value, superset_of([1, 2]))?;  // Passes
+/// verify_that!(value, superset_of([&1, &2]))?;  // Passes
 /// let array_value = [1, 2, 3];
 /// verify_that!(array_value, superset_of([1, 2]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail() -> Result<()> {
 /// # let value = vec![1, 2, 3];
-/// verify_that!(value, superset_of([1, 2, 4]))?;  // Fails: 4 is not in the subset
+/// verify_that!(value, superset_of([&1, &2, &4]))?;  // Fails: 4 is not in the subset
 /// #     Ok(())
 /// # }
 /// # should_pass_1().unwrap();
@@ -49,7 +49,7 @@
 ///
 /// # fn should_pass_2() -> Result<()> {
 /// let value: HashSet<i32> = [1, 2, 3].into();
-/// verify_that!(value, superset_of([1, 2, 3]))?;  // Passes
+/// verify_that!(value, superset_of([&1, &2, &3]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass_2().unwrap();
@@ -61,20 +61,8 @@
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
 /// let value: Vec<i32> = vec![0, 0, 1];
-/// verify_that!(value, superset_of([0, 1]))?;  // Passes
-/// verify_that!(value, superset_of([0, 1, 1]))?;  // Passes
-/// #     Ok(())
-/// # }
-/// # should_pass().unwrap();
-/// ```
-///
-/// One can also verify the contents of a slice by dereferencing it:
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # fn should_pass() -> Result<()> {
-/// let value = &[1, 2, 3];
-/// verify_that!(*value, superset_of([1, 2, 3]))?;
+/// verify_that!(value, superset_of([&0, &1]))?;  // Passes
+/// verify_that!(value, superset_of([&0, &1, &1]))?;  // Passes
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -84,30 +72,22 @@
 /// runtime proportional to the *product* of the sizes of the actual and
 /// expected containers as well as the time to check equality of each pair of
 /// items. It should not be used on especially large containers.
-pub fn superset_of<ElementT: Debug + PartialEq, ActualT: Debug + ?Sized, ExpectedT: Debug>(
-    subset: ExpectedT,
-) -> impl Matcher<ActualT = ActualT>
-where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
-    for<'a> &'a ExpectedT: IntoIterator<Item = &'a ElementT>,
-{
-    SupersetOfMatcher::<ActualT, _> { subset, phantom: Default::default() }
+pub fn superset_of<ExpectedT>(subset: ExpectedT) -> SupersetOfMatcher<ExpectedT> {
+    SupersetOfMatcher { subset }
 }
 
-struct SupersetOfMatcher<ActualT: ?Sized, ExpectedT> {
+#[derive(MatcherBase)]
+pub struct SupersetOfMatcher<ExpectedT> {
     subset: ExpectedT,
-    phantom: PhantomData<ActualT>,
 }
 
-impl<ElementT: Debug + PartialEq, ActualT: Debug + ?Sized, ExpectedT: Debug> Matcher
-    for SupersetOfMatcher<ActualT, ExpectedT>
+impl<ElementT: Debug + Copy + PartialEq, ActualT: Debug + Copy, ExpectedT: Debug> Matcher<ActualT>
+    for SupersetOfMatcher<ExpectedT>
 where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
+    ActualT: IntoIterator<Item = ElementT>,
     for<'a> &'a ExpectedT: IntoIterator<Item = &'a ElementT>,
 {
-    type ActualT = ActualT;
-
-    fn matches(&self, actual: &ActualT) -> MatcherResult {
+    fn matches(&self, actual: ActualT) -> MatcherResult {
         for expected_item in &self.subset {
             if actual_is_missing(actual, expected_item) {
                 return MatcherResult::NoMatch;
@@ -116,11 +96,11 @@
         MatcherResult::Match
     }
 
-    fn explain_match(&self, actual: &ActualT) -> Description {
+    fn explain_match(&self, actual: ActualT) -> Description {
         let missing_items: Vec<_> = self
             .subset
             .into_iter()
-            .filter(|expected_item| actual_is_missing(actual, expected_item))
+            .filter(|expected_item| actual_is_missing(actual, *expected_item))
             .map(|expected_item| format!("{expected_item:#?}"))
             .collect();
         match missing_items.len() {
@@ -138,19 +118,14 @@
     }
 }
 
-fn actual_is_missing<ElementT: PartialEq, ActualT: ?Sized>(
-    actual: &ActualT,
-    needle: &ElementT,
-) -> bool
+fn actual_is_missing<ElementT: PartialEq, ActualT>(actual: ActualT, needle: &ElementT) -> bool
 where
-    for<'a> &'a ActualT: IntoIterator<Item = &'a ElementT>,
+    ActualT: IntoIterator<Item = ElementT>,
 {
-    !actual.into_iter().any(|item| *item == *needle)
+    !actual.into_iter().any(|item| &item == needle)
 }
-
 #[cfg(test)]
 mod tests {
-    use super::superset_of;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashSet;
@@ -164,54 +139,54 @@
     #[test]
     fn superset_of_matches_vec_with_one_element() -> Result<()> {
         let value = vec![1];
-        verify_that!(value, superset_of([1]))
+        verify_that!(value, superset_of([&1]))
     }
 
     #[test]
     fn superset_of_matches_vec_with_two_items() -> Result<()> {
         let value = vec![1, 2];
-        verify_that!(value, superset_of([1, 2]))
+        verify_that!(value, superset_of([&1, &2]))
     }
 
     #[test]
     fn superset_of_matches_vec_when_actual_has_excess_element() -> Result<()> {
         let value = vec![1, 2, 3];
-        verify_that!(value, superset_of([1, 2]))
+        verify_that!(value, superset_of([&1, &2]))
     }
 
     #[test]
     fn superset_of_matches_vec_when_actual_has_excess_element_first() -> Result<()> {
         let value = vec![3, 1, 2];
-        verify_that!(value, superset_of([1, 2]))
+        verify_that!(value, superset_of([&1, &2]))
     }
 
     #[test]
     fn superset_of_matches_slice_with_one_element() -> Result<()> {
         let value = &[1];
-        verify_that!(*value, superset_of([1]))
+        verify_that!(value, superset_of([&1]))
     }
 
     #[test]
     fn superset_of_matches_hash_set_with_one_element() -> Result<()> {
         let value: HashSet<i32> = [1].into();
-        verify_that!(value, superset_of([1]))
+        verify_that!(value, superset_of([&1]))
     }
 
     #[test]
     fn superset_of_does_not_match_when_first_element_does_not_match() -> Result<()> {
         let value = vec![0];
-        verify_that!(value, not(superset_of([1])))
+        verify_that!(value, not(superset_of([&1])))
     }
 
     #[test]
     fn superset_of_does_not_match_when_second_element_does_not_match() -> Result<()> {
         let value = vec![2];
-        verify_that!(value, not(superset_of([2, 0])))
+        verify_that!(value, not(superset_of([&2, &0])))
     }
 
     #[test]
     fn superset_of_shows_correct_message_when_first_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 2, 3], superset_of([1, 2, 3]));
+        let result = verify_that!(vec![0, 2, 3], superset_of([&1, &2, &3]));
 
         verify_that!(
             result,
@@ -232,7 +207,7 @@
 
     #[test]
     fn superset_of_shows_correct_message_when_second_item_does_not_match() -> Result<()> {
-        let result = verify_that!(vec![1, 0, 3], superset_of([1, 2, 3]));
+        let result = verify_that!(vec![1, 0, 3], superset_of([&1, &2, &3]));
 
         verify_that!(
             result,
@@ -253,7 +228,7 @@
 
     #[test]
     fn superset_of_shows_correct_message_when_first_two_items_do_not_match() -> Result<()> {
-        let result = verify_that!(vec![0, 0, 3], superset_of([1, 2, 3]));
+        let result = verify_that!(vec![0, 0, 3], superset_of([&1, &2, &3]));
 
         verify_that!(
             result,

crates/googletest/src/matchers/tuple_matcher.rs

diff --git a/crates/googletest/src/matchers/tuple_matcher.rs b/crates/googletest/src/matchers/tuple_matcher.rs
index af55cbf..4822d52 100644
--- a/crates/googletest/src/matchers/tuple_matcher.rs
+++ b/crates/googletest/src/matchers/tuple_matcher.rs
@@ -23,16 +23,16 @@
 pub mod internal {
     use crate::{
         description::Description,
-        matcher::{Matcher, MatcherResult},
+        matcher::{Matcher, MatcherBase, MatcherResult},
     };
     use std::fmt::Debug;
 
+    impl MatcherBase for () {}
+
     // This implementation is provided for completeness, but is completely trivial.
     // The only actual value which can be supplied is (), which must match.
-    impl Matcher for () {
-        type ActualT = ();
-
-        fn matches(&self, _: &Self::ActualT) -> MatcherResult {
+    impl Matcher<()> for () {
+        fn matches(&self, _: ()) -> MatcherResult {
             MatcherResult::Match
         }
 
@@ -44,18 +44,75 @@
         }
     }
 
+    impl Matcher<&()> for () {
+        fn matches(&self, _: &()) -> MatcherResult {
+            MatcherResult::Match
+        }
+
+        fn describe(&self, matcher_result: MatcherResult) -> Description {
+            <Self as Matcher<()>>::describe(self, matcher_result)
+        }
+    }
+
     /// Generates a tuple matcher for tuples of a specific length.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
     macro_rules! tuple_matcher_n {
         ($([$field_number:tt, $matcher_type:ident, $field_type:ident]),*) => {
-            impl<$($field_type: Debug, $matcher_type: Matcher<ActualT = $field_type>),*>
-                Matcher for ($($matcher_type,)*)
-            {
-                type ActualT = ($($field_type,)*);
+            impl<$($matcher_type: MatcherBase),*> MatcherBase for ($($matcher_type,)*){}
 
-                fn matches(&self, actual: &($($field_type,)*)) -> MatcherResult {
+            impl<$($field_type: Debug + Copy, $matcher_type: Matcher<$field_type>),*>
+                Matcher<($($field_type,)*)> for ($($matcher_type,)*)
+            {
+                fn matches(&self, actual:  ($($field_type,)*)) -> MatcherResult {
+                    $(match self.$field_number.matches(actual.$field_number) {
+                        MatcherResult::Match => {},
+                        MatcherResult::NoMatch => {
+                            return MatcherResult::NoMatch;
+                        }
+                    })*
+                    MatcherResult::Match
+                }
+
+                fn explain_match(&self, actual:  ($($field_type,)*)) -> Description  {
+                    let mut explanation = Description::new().text("which").nested(
+                        self.describe(self.matches(actual)));
+                    $(match self.$field_number.matches(actual.$field_number) {
+                        MatcherResult::Match => {},
+                        MatcherResult::NoMatch => {
+                            explanation = explanation
+                                .text(format!(concat!("Element #", $field_number, " is {:?},"),
+                                    actual.$field_number))
+                                .nested(self.$field_number.explain_match(actual.$field_number));
+                        }
+                    })*
+                    explanation
+                }
+
+                fn describe(&self, matcher_result: MatcherResult) -> Description {
+                    match matcher_result {
+                        MatcherResult::Match => {
+                            let mut description = Description::new().text(
+                                "is a tuple whose values respectively match:");
+                            $(description = description.nested(
+                                self.$field_number.describe(matcher_result));)*
+                            description
+                        }
+                        MatcherResult::NoMatch => {
+                            let mut description = Description::new().text(
+                                "is a tuple whose values do not respectively match:");
+                            $(description = description.nested(
+                                self.$field_number.describe(MatcherResult::Match));)*
+                            description
+                        }
+                    }
+                }
+            }
+            impl<'a, $($field_type: Debug, $matcher_type: Matcher<&'a $field_type>),*>
+                Matcher<&'a ($($field_type,)*)> for ($($matcher_type,)*)
+            {
+                fn matches(&self, actual:  &'a ($($field_type,)*)) -> MatcherResult {
                     $(match self.$field_number.matches(&actual.$field_number) {
                         MatcherResult::Match => {},
                         MatcherResult::NoMatch => {
@@ -65,13 +122,22 @@
                     MatcherResult::Match
                 }
 
-                fn explain_match(&self, actual: &($($field_type,)*)) -> Description {
-                    let mut explanation = Description::new().text("which").nested(self.describe(self.matches(actual)));
+                fn explain_match(&self, actual:  &'a ($($field_type,)*)) -> Description  {
+                    let mut explanation = Description::new()
+                        .text("which")
+                        .nested(
+                            Matcher::<&'a ($($field_type,)*)>::describe(
+                                self, self.matches(actual)));
                     $(match self.$field_number.matches(&actual.$field_number) {
                         MatcherResult::Match => {},
                         MatcherResult::NoMatch => {
                             explanation = explanation
-                                .text(format!(concat!("Element #", $field_number, " is {:?},"), actual.$field_number))
+                                .text(format!(
+                                    concat!(
+                                        "Element #",
+                                        $field_number,
+                                        " is {:?},"),
+                                        actual.$field_number))
                                 .nested(self.$field_number.explain_match(&actual.$field_number));
                         }
                     })*
@@ -81,13 +147,17 @@
                 fn describe(&self, matcher_result: MatcherResult) -> Description {
                     match matcher_result {
                         MatcherResult::Match => {
-                            let mut description = Description::new().text("is a tuple whose values respectively match:");
-                            $(description = description.nested(self.$field_number.describe(matcher_result));)*
+                            let mut description = Description::new().text(
+                                "is a tuple whose values respectively match:");
+                            $(description = description.nested(
+                                self.$field_number.describe(matcher_result));)*
                             description
                         }
                         MatcherResult::NoMatch => {
-                            let mut description = Description::new().text("is a tuple whose values do not respectively match:");
-                            $(description = description.nested(self.$field_number.describe(MatcherResult::Match));)*
+                            let mut description = Description::new().text(
+                                "is a tuple whose values do not respectively match:");
+                            $(description = description.nested(
+                                self.$field_number.describe(MatcherResult::Match));)*
                             description
                         }
                     }

crates/googletest/src/matchers/unordered_elements_are_matcher.rs

diff --git a/crates/googletest/src/matchers/unordered_elements_are_matcher.rs b/crates/googletest/src/matchers/unordered_elements_are_matcher.rs
index f4585a4..50951d7 100644
--- a/crates/googletest/src/matchers/unordered_elements_are_matcher.rs
+++ b/crates/googletest/src/matchers/unordered_elements_are_matcher.rs
@@ -22,19 +22,19 @@
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], unordered_elements_are![eq(1), ge(2), anything()])?;   // Passes
+/// verify_that!(vec![3, 2, 1], unordered_elements_are![eq(&1), ge(&2), anything()])?;   // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail_1() -> Result<()> {
-/// verify_that!(vec![1], unordered_elements_are![eq(1), ge(2)])?;              // Fails: container has wrong size
+/// verify_that!(vec![1], unordered_elements_are![eq(&1), ge(&2)])?;              // Fails: container has wrong size
 /// #     Ok(())
 /// # }
 /// # fn should_fail_2() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], unordered_elements_are![eq(1), ge(4), eq(2)])?; // Fails: second matcher not matched
+/// verify_that!(vec![3, 2, 1], unordered_elements_are![eq(&1), ge(&4), eq(&2)])?; // Fails: second matcher not matched
 /// #     Ok(())
 /// # }
 /// # fn should_fail_3() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], unordered_elements_are![ge(3), ge(3), ge(3)])?; // Fails: no 1:1 correspondence
+/// verify_that!(vec![3, 2, 1], unordered_elements_are![ge(&3), ge(&3), ge(&3)])?; // Fails: no 1:1 correspondence
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -43,32 +43,15 @@
 /// # should_fail_3().unwrap_err();
 /// ```
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
-/// implement [`IntoIterator`].
-///
-/// This can also match against [`HashMap`][std::collections::HashMap] and
-/// similar collections. The arguments are a sequence of pairs of matchers
-/// corresponding to the keys and their respective values.
-///
-/// ```
-/// # use googletest::prelude::*;
-/// # use std::collections::HashMap;
-/// let value: HashMap<u32, &'static str> =
-///     HashMap::from_iter([(1, "One"), (2, "Two"), (3, "Three")]);
-/// verify_that!(
-///     value,
-///     unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))]
-/// )
-/// #     .unwrap();
-/// ```
+/// The actual value must be a container such as a `&Vec`, an array, or a
+/// slice. More precisely, the actual value must implement [`IntoIterator`].
 ///
 /// This can also be omitted in [`verify_that!`] macros and replaced with curly
 /// brackets.
 ///
 /// ```
 /// # use googletest::prelude::*;
-///  verify_that!(vec![1, 2], {eq(2), eq(1)})
+///  verify_that!(vec![1, 2], {eq(&2), eq(&1)})
 /// #     .unwrap();
 /// ```
 ///
@@ -86,12 +69,18 @@
 /// ```
 /// # use googletest::prelude::*;
 /// verify_that!(vec![vec![1,2], vec![3]],
-///   {unordered_elements_are![eq(2), eq(1)], unordered_elements_are![eq(3)]})
+///   {unordered_elements_are![eq(&2), eq(&1)], unordered_elements_are![eq(&3)]})
 /// # .unwrap();
 /// ```
 ///
-/// This matcher does not support matching directly against an [`Iterator`]. To
-/// match against an iterator, use [`Iterator::collect`] to build a [`Vec`].
+///  If an inner matcher is `eq(...)`, it can be omitted:
+///
+/// ```
+/// # use googletest::prelude::*;
+///
+/// verify_that!(vec![1,2,3], unordered_elements_are![lt(&2), gt(&1), &3])
+/// #     .unwrap();
+/// ```
 ///
 /// The matcher proceeds in three stages:
 ///
@@ -119,29 +108,23 @@
 #[doc(hidden)]
 macro_rules! __unordered_elements_are {
     ($(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([], Requirements::PerfectMatch)
-    }};
-
-    // TODO: Consider an alternative map-like syntax here similar to that used in
-    // https://crates.io/crates/maplit.
-    ($(($key_matcher:expr, $value_matcher:expr)),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsOfMapAreMatcher, Requirements
-        };
-        UnorderedElementsOfMapAreMatcher::new(
-            [$((Box::new($key_matcher), Box::new($value_matcher))),*],
-            Requirements::PerfectMatch
-        )
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [],
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::
+            Requirements::PerfectMatch)
     }};
 
     ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([$(Box::new($matcher)),*], Requirements::PerfectMatch)
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [$(Box::new(
+                $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!(
+                    $matcher
+                )
+            )),*],
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::
+            Requirements::PerfectMatch)
     }};
 }
 
@@ -160,20 +143,20 @@
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], contains_each![eq(2), ge(3)])?;   // Passes
-/// verify_that!(vec![3, 2, 1], contains_each![ge(2), ge(2)])?;   // Passes
+/// verify_that!(vec![3, 2, 1], contains_each![eq(&2), ge(&3)])?;   // Passes
+/// verify_that!(vec![3, 2, 1], contains_each![ge(&2), ge(&2)])?;   // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail_1() -> Result<()> {
-/// verify_that!(vec![1], contains_each![eq(1), ge(2)])?;         // Fails: container too small
+/// verify_that!(vec![1], contains_each![eq(&1), ge(&2)])?;         // Fails: container too small
 /// #     Ok(())
 /// # }
 /// # fn should_fail_2() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], contains_each![eq(1), ge(4)])?;   // Fails: second matcher unmatched
+/// verify_that!(vec![3, 2, 1], contains_each![eq(&1), ge(&4)])?;   // Fails: second matcher unmatched
 /// #     Ok(())
 /// # }
 /// # fn should_fail_3() -> Result<()> {
-/// verify_that!(vec![3, 2, 1], contains_each![ge(3), ge(3), ge(3)])?; // Fails: no matching
+/// verify_that!(vec![3, 2, 1], contains_each![ge(&3), ge(&3), ge(&3)])?; // Fails: no matching
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -182,26 +165,18 @@
 /// # should_fail_3().unwrap_err();
 /// ```
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
-/// implement [`IntoIterator`].
+/// The actual value must be a container such as a `&Vec`, an array, or a
+/// slice. More precisely, the actual value must implement [`IntoIterator`].
 ///
-/// This can also match against [`HashMap`][std::collections::HashMap] and
-/// similar collections. The arguments are a sequence of pairs of matchers
-/// corresponding to the keys and their respective values.
+///  If an inner matcher is `eq(...)`, it can be omitted:
 ///
 /// ```
 /// # use googletest::prelude::*;
-/// # use std::collections::HashMap;
-/// let value: HashMap<u32, &'static str> =
-///     HashMap::from_iter([(1, "One"), (2, "Two"), (3, "Three")]);
-/// verify_that!(value, contains_each![(eq(2), eq("Two")), (eq(1), eq("One"))])
+///
+/// verify_that!(vec![1,2,3], contains_each![lt(&2), &3])
 /// #     .unwrap();
 /// ```
 ///
-/// This matcher does not support matching directly against an [`Iterator`]. To
-/// match against an iterator, use [`Iterator::collect`] to build a [`Vec`].
-///
 /// The matcher proceeds in three stages:
 ///
 /// 1. It first checks whether the actual value is large enough to possibly be
@@ -225,29 +200,21 @@
 #[doc(hidden)]
 macro_rules! __contains_each {
     ($(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([], Requirements::Superset)
-    }};
-
-    // TODO: Consider an alternative map-like syntax here similar to that used in
-    // https://crates.io/crates/maplit.
-    ($(($key_matcher:expr, $value_matcher:expr)),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsOfMapAreMatcher, Requirements
-        };
-        UnorderedElementsOfMapAreMatcher::new(
-            [$((Box::new($key_matcher), Box::new($value_matcher))),*],
-            Requirements::Superset
-        )
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [],
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::Requirements::Superset)
     }};
 
     ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([$(Box::new($matcher)),*], Requirements::Superset)
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [$(Box::new(
+                $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!(
+                    $matcher
+                )
+            )),*],
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::Requirements::Superset)
     }}
 }
 
@@ -267,20 +234,20 @@
 /// ```
 /// # use googletest::prelude::*;
 /// # fn should_pass() -> Result<()> {
-/// verify_that!(vec![2, 1], is_contained_in![eq(1), ge(2)])?;   // Passes
-/// verify_that!(vec![2, 1], is_contained_in![ge(1), ge(1)])?;   // Passes
+/// verify_that!(vec![2, 1], is_contained_in![eq(&1), ge(&2)])?;   // Passes
+/// verify_that!(vec![2, 1], is_contained_in![ge(&1), ge(&1)])?;   // Passes
 /// #     Ok(())
 /// # }
 /// # fn should_fail_1() -> Result<()> {
-/// verify_that!(vec![1, 2, 3], is_contained_in![eq(1), ge(2)])?; // Fails: container too large
+/// verify_that!(vec![1, 2, 3], is_contained_in![eq(&1), ge(&2)])?; // Fails: container too large
 /// #     Ok(())
 /// # }
 /// # fn should_fail_2() -> Result<()> {
-/// verify_that!(vec![2, 1], is_contained_in![eq(1), ge(4)])?;    // Fails: second matcher unmatched
+/// verify_that!(vec![2, 1], is_contained_in![eq(&1), ge(&4)])?;    // Fails: second matcher unmatched
 /// #     Ok(())
 /// # }
 /// # fn should_fail_3() -> Result<()> {
-/// verify_that!(vec![3, 1], is_contained_in![ge(3), ge(3), ge(3)])?; // Fails: no matching
+/// verify_that!(vec![3, 1], is_contained_in![ge(&3), ge(&3), ge(&3)])?; // Fails: no matching
 /// #     Ok(())
 /// # }
 /// # should_pass().unwrap();
@@ -289,28 +256,18 @@
 /// # should_fail_3().unwrap_err();
 /// ```
 ///
-/// The actual value must be a container such as a `Vec`, an array, or a
-/// dereferenced slice. More precisely, a shared borrow of the actual value must
-/// implement [`IntoIterator`].
+/// The actual value must be a container such as a `&Vec`, an array, or a slice.
+/// More precisely, the actual value must implement [`IntoIterator`].
 ///
-/// This can also match against [`HashMap`][std::collections::HashMap] and
-/// similar collections. The arguments are a sequence of pairs of matchers
-/// corresponding to the keys and their respective values.
+///  If an inner matcher is `eq(...)`, it can be omitted:
 ///
 /// ```
 /// # use googletest::prelude::*;
-/// # use std::collections::HashMap;
-/// let value: HashMap<u32, &'static str> = HashMap::from_iter([(1, "One"), (2, "Two")]);
-/// verify_that!(
-///     value,
-///     is_contained_in![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))]
-/// )
+///
+/// verify_that!(vec![1,2,3], is_contained_in![lt(&2), &3, &4, gt(&0)])
 /// #     .unwrap();
 /// ```
 ///
-/// This matcher does not support matching directly against an [`Iterator`]. To
-/// match against an iterator, use [`Iterator::collect`] to build a [`Vec`].
-///
 /// The matcher proceeds in three stages:
 ///
 /// 1. It first checks whether the actual value is too large to possibly be
@@ -334,29 +291,20 @@
 #[doc(hidden)]
 macro_rules! __is_contained_in {
     ($(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([], Requirements::Subset)
-    }};
-
-    // TODO: Consider an alternative map-like syntax here similar to that used in
-    // https://crates.io/crates/maplit.
-    ($(($key_matcher:expr, $value_matcher:expr)),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsOfMapAreMatcher, Requirements
-        };
-        UnorderedElementsOfMapAreMatcher::new(
-            [$((Box::new($key_matcher), Box::new($value_matcher))),*],
-            Requirements::Subset
-        )
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [], $crate::matchers::__internal_unstable_do_not_depend_on_these::Requirements::Subset)
     }};
 
     ($($matcher:expr),* $(,)?) => {{
-        use $crate::matchers::__internal_unstable_do_not_depend_on_these::{
-            UnorderedElementsAreMatcher, Requirements
-        };
-        UnorderedElementsAreMatcher::new([$(Box::new($matcher)),*], Requirements::Subset)
+        $crate::matchers::__internal_unstable_do_not_depend_on_these::
+        UnorderedElementsAreMatcher::new(
+            [$(Box::new(
+                $crate::matcher_support::__internal_unstable_do_not_depend_on_these::auto_eq!(
+                    $matcher
+                )
+            )),*],
+            $crate::matchers::__internal_unstable_do_not_depend_on_these::Requirements::Subset)
     }}
 }
 
@@ -366,31 +314,25 @@
 #[doc(hidden)]
 pub mod internal {
     use crate::description::Description;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::{Matcher, MatcherBase, MatcherResult};
     use crate::matcher_support::count_elements::count_elements;
     use std::collections::HashSet;
     use std::fmt::{Debug, Display};
-    use std::marker::PhantomData;
 
     /// This struct is meant to be used only through the
     /// `unordered_elements_are![...]` macro.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub struct UnorderedElementsAreMatcher<'a, ContainerT: ?Sized, T: Debug, const N: usize> {
-        elements: [Box<dyn Matcher<ActualT = T> + 'a>; N],
+    #[derive(MatcherBase)]
+    pub struct UnorderedElementsAreMatcher<'a, T: Debug + Copy, const N: usize> {
+        elements: [Box<dyn Matcher<T> + 'a>; N],
         requirements: Requirements,
-        phantom: PhantomData<ContainerT>,
     }
 
-    impl<'a, ContainerT: ?Sized, T: Debug, const N: usize>
-        UnorderedElementsAreMatcher<'a, ContainerT, T, N>
-    {
-        pub fn new(
-            elements: [Box<dyn Matcher<ActualT = T> + 'a>; N],
-            requirements: Requirements,
-        ) -> Self {
-            Self { elements, requirements, phantom: Default::default() }
+    impl<'a, T: Debug + Copy, const N: usize> UnorderedElementsAreMatcher<'a, T, N> {
+        pub fn new(elements: [Box<dyn Matcher<T> + 'a>; N], requirements: Requirements) -> Self {
+            Self { elements, requirements }
         }
     }
 
@@ -403,19 +345,17 @@
     // least one expected element and vice versa.
     // 3. `UnorderedElementsAreMatcher` verifies that a perfect matching exists
     // using Ford-Fulkerson.
-    impl<'a, T: Debug, ContainerT: Debug + ?Sized, const N: usize> Matcher
-        for UnorderedElementsAreMatcher<'a, ContainerT, T, N>
+    impl<'a, T: Debug + Copy, ContainerT: Debug + Copy, const N: usize> Matcher<ContainerT>
+        for UnorderedElementsAreMatcher<'a, T, N>
     where
-        for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
+        ContainerT: IntoIterator<Item = T>,
     {
-        type ActualT = ContainerT;
-
-        fn matches(&self, actual: &ContainerT) -> MatcherResult {
+        fn matches(&self, actual: ContainerT) -> MatcherResult {
             let match_matrix = MatchMatrix::generate(actual, &self.elements);
             match_matrix.is_match_for(self.requirements).into()
         }
 
-        fn explain_match(&self, actual: &ContainerT) -> Description {
+        fn explain_match(&self, actual: ContainerT) -> Description {
             if let Some(size_mismatch_explanation) =
                 self.requirements.explain_size_mismatch(actual, N)
             {
@@ -450,89 +390,8 @@
         }
     }
 
-    type KeyValueMatcher<'a, KeyT, ValueT> =
-        (Box<dyn Matcher<ActualT = KeyT> + 'a>, Box<dyn Matcher<ActualT = ValueT> + 'a>);
-
-    /// This is the analogue to [UnorderedElementsAreMatcher] for maps and
-    /// map-like collections.
-    ///
-    /// **For internal use only. API stablility is not guaranteed!**
-    #[doc(hidden)]
-    pub struct UnorderedElementsOfMapAreMatcher<'a, ContainerT, KeyT, ValueT, const N: usize>
-    where
-        ContainerT: ?Sized,
-        KeyT: Debug,
-        ValueT: Debug,
-    {
-        elements: [KeyValueMatcher<'a, KeyT, ValueT>; N],
-        requirements: Requirements,
-        phantom: PhantomData<ContainerT>,
-    }
-
-    impl<'a, ContainerT, KeyT: Debug, ValueT: Debug, const N: usize>
-        UnorderedElementsOfMapAreMatcher<'a, ContainerT, KeyT, ValueT, N>
-    {
-        pub fn new(
-            elements: [KeyValueMatcher<'a, KeyT, ValueT>; N],
-            requirements: Requirements,
-        ) -> Self {
-            Self { elements, requirements, phantom: Default::default() }
-        }
-    }
-
-    impl<'a, KeyT: Debug, ValueT: Debug, ContainerT: Debug + ?Sized, const N: usize> Matcher
-        for UnorderedElementsOfMapAreMatcher<'a, ContainerT, KeyT, ValueT, N>
-    where
-        for<'b> &'b ContainerT: IntoIterator<Item = (&'b KeyT, &'b ValueT)>,
-    {
-        type ActualT = ContainerT;
-
-        fn matches(&self, actual: &ContainerT) -> MatcherResult {
-            let match_matrix = MatchMatrix::generate_for_map(actual, &self.elements);
-            match_matrix.is_match_for(self.requirements).into()
-        }
-
-        fn explain_match(&self, actual: &ContainerT) -> Description {
-            if let Some(size_mismatch_explanation) =
-                self.requirements.explain_size_mismatch(actual, N)
-            {
-                return size_mismatch_explanation;
-            }
-
-            let match_matrix = MatchMatrix::generate_for_map(actual, &self.elements);
-            if let Some(unmatchable_explanation) =
-                match_matrix.explain_unmatchable(self.requirements)
-            {
-                return unmatchable_explanation;
-            }
-
-            let best_match = match_matrix.find_best_match();
-
-            best_match
-                .get_explanation_for_map(actual, &self.elements, self.requirements)
-                .unwrap_or("whose elements all match".into())
-        }
-
-        fn describe(&self, matcher_result: MatcherResult) -> Description {
-            format!(
-                "{} elements matching in any order:\n{}",
-                if matcher_result.into() { "contains" } else { "doesn't contain" },
-                self.elements
-                    .iter()
-                    .map(|(key_matcher, value_matcher)| format!(
-                        "{} => {}",
-                        key_matcher.describe(MatcherResult::Match),
-                        value_matcher.describe(MatcherResult::Match)
-                    ))
-                    .collect::<Description>()
-                    .indent()
-            )
-            .into()
-        }
-    }
-
     /// The requirements of the mapping between matchers and actual values by
-    /// which [`UnorderedElemetnsAre`] is deemed to match its input.
+    /// which [`UnorderedElementsAre`] is deemed to match its input.
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
@@ -552,14 +411,11 @@
     }
 
     impl Requirements {
-        fn explain_size_mismatch<ContainerT: ?Sized>(
+        fn explain_size_mismatch<ContainerT: IntoIterator + Copy>(
             &self,
-            actual: &ContainerT,
+            actual: ContainerT,
             expected_size: usize,
-        ) -> Option<Description>
-        where
-            for<'b> &'b ContainerT: IntoIterator,
-        {
+        ) -> Option<Description> {
             let actual_size = count_elements(actual);
             match self {
                 Requirements::PerfectMatch if actual_size != expected_size => Some(
@@ -601,13 +457,10 @@
     struct MatchMatrix<const N: usize>(Vec<[MatcherResult; N]>);
 
     impl<const N: usize> MatchMatrix<N> {
-        fn generate<'a, T: Debug + 'a, ContainerT: Debug + ?Sized>(
-            actual: &ContainerT,
-            expected: &[Box<dyn Matcher<ActualT = T> + 'a>; N],
-        ) -> Self
-        where
-            for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
-        {
+        fn generate<'a, T: Debug + Copy + 'a, ContainerT: Debug + Copy + IntoIterator<Item = T>>(
+            actual: ContainerT,
+            expected: &[Box<dyn Matcher<T> + 'a>; N],
+        ) -> Self {
             let mut matrix = MatchMatrix(vec![[MatcherResult::NoMatch; N]; count_elements(actual)]);
             for (actual_idx, actual) in actual.into_iter().enumerate() {
                 for (expected_idx, expected) in expected.iter().enumerate() {
@@ -617,24 +470,6 @@
             matrix
         }
 
-        fn generate_for_map<'a, KeyT: Debug, ValueT: Debug, ContainerT: Debug + ?Sized>(
-            actual: &ContainerT,
-            expected: &[KeyValueMatcher<'a, KeyT, ValueT>; N],
-        ) -> Self
-        where
-            for<'b> &'b ContainerT: IntoIterator<Item = (&'b KeyT, &'b ValueT)>,
-        {
-            let mut matrix = MatchMatrix(vec![[MatcherResult::NoMatch; N]; count_elements(actual)]);
-            for (actual_idx, (actual_key, actual_value)) in actual.into_iter().enumerate() {
-                for (expected_idx, (expected_key, expected_value)) in expected.iter().enumerate() {
-                    matrix.0[actual_idx][expected_idx] = (expected_key.matches(actual_key).into()
-                        && expected_value.matches(actual_value).into())
-                    .into();
-                }
-            }
-            matrix
-        }
-
         fn is_match_for(&self, requirements: Requirements) -> bool {
             match requirements {
                 Requirements::PerfectMatch => {
@@ -959,15 +794,16 @@
             (0..N).filter(|expected_idx| !matched_expected.contains(expected_idx)).collect()
         }
 
-        fn get_explanation<'a, T: Debug, ContainerT: Debug + ?Sized>(
+        fn get_explanation<
+            'a,
+            T: Debug + Copy,
+            ContainerT: Debug + Copy + IntoIterator<Item = T>,
+        >(
             &self,
-            actual: &ContainerT,
-            expected: &[Box<dyn Matcher<ActualT = T> + 'a>; N],
+            actual: ContainerT,
+            expected: &[Box<dyn Matcher<T> + 'a>; N],
             requirements: Requirements,
-        ) -> Option<Description>
-        where
-            for<'b> &'b ContainerT: IntoIterator<Item = &'b T>,
-        {
+        ) -> Option<Description> {
             let actual: Vec<_> = actual.into_iter().collect();
             if self.is_full_match() {
                 return None;
@@ -1005,71 +841,12 @@
                 "which does not have a {requirements} match with the expected elements. The best match found was:\n{best_match}"
             ).into())
         }
-
-        fn get_explanation_for_map<'a, KeyT: Debug, ValueT: Debug, ContainerT: Debug + ?Sized>(
-            &self,
-            actual: &ContainerT,
-            expected: &[KeyValueMatcher<'a, KeyT, ValueT>; N],
-            requirements: Requirements,
-        ) -> Option<Description>
-        where
-            for<'b> &'b ContainerT: IntoIterator<Item = (&'b KeyT, &'b ValueT)>,
-        {
-            let actual: Vec<_> = actual.into_iter().collect();
-            if self.is_full_match() {
-                return None;
-            }
-            let mut error_message =
-                format!("which does not have a {requirements} match with the expected elements.");
-
-            error_message.push_str("\n  The best match found was: ");
-
-            let matches = self.get_matches()
-                .map(|(actual_idx, expected_idx)| {
-                    format!(
-                        "Actual element {:?} => {:?} at index {actual_idx} matched expected element `{}` => `{}` at index {expected_idx}.",
-                        actual[actual_idx].0,
-                        actual[actual_idx].1,
-                        expected[expected_idx].0.describe(MatcherResult::Match),
-                        expected[expected_idx].1.describe(MatcherResult::Match),
-                    )
-                });
-
-            let unmatched_actual = self.get_unmatched_actual()
-                .map(|actual_idx| {
-                    format!(
-                        "Actual element {:#?} => {:#?} at index {actual_idx} did not match any remaining expected element.",
-                        actual[actual_idx].0,
-                        actual[actual_idx].1,
-                    )
-                });
-
-            let unmatched_expected = self.get_unmatched_expected()
-                .into_iter()
-                .map(|expected_idx| {
-                    format!(
-                        "Expected element `{}` => `{}` at index {expected_idx} did not match any remaining actual element.",
-                        expected[expected_idx].0.describe(MatcherResult::Match),
-                        expected[expected_idx].1.describe(MatcherResult::Match),
-                    )
-                });
-
-            let best_match = matches
-                .chain(unmatched_actual)
-                .chain(unmatched_expected)
-                .collect::<Description>()
-                .indent();
-            Some(format!(
-                "which does not have a {requirements} match with the expected elements. The best match found was:\n{best_match}"
-            ).into())
-        }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::internal::UnorderedElementsOfMapAreMatcher;
-    use crate::matcher::{Matcher, MatcherResult};
+    use crate::matcher::MatcherResult;
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashMap;
@@ -1081,20 +858,26 @@
         // compiler takes care of that, but when the matcher is created separately,
         // we must create the constitute matchers separately so that they
         // aren't dropped too early.
-        let matchers = ((eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three")));
-        let matcher: UnorderedElementsOfMapAreMatcher<HashMap<i32, &str>, _, _, 3> = unordered_elements_are![
-            (matchers.0.0, matchers.0.1),
-            (matchers.1.0, matchers.1.1),
-            (matchers.2.0, matchers.2.1)
+        let matchers = ((eq(&2), eq(&"Two")), (eq(&1), eq(&"One")), (eq(&3), eq(&"Three")));
+        let matcher = unordered_elements_are![
+            (matchers.0 .0, matchers.0 .1),
+            (matchers.1 .0, matchers.1 .1),
+            (matchers.2 .0, matchers.2 .1)
         ];
         verify_that!(
-            Matcher::describe(&matcher, MatcherResult::Match),
+            Matcher::<&HashMap<i32, String>>::describe(&matcher, MatcherResult::Match),
             displays_as(eq(indoc!(
                 "
                 contains elements matching in any order:
-                  is equal to 2 => is equal to \"Two\"
-                  is equal to 1 => is equal to \"One\"
-                  is equal to 3 => is equal to \"Three\""
+                  0. is a tuple whose values respectively match:
+                       is equal to 2
+                       is equal to \"Two\"
+                  1. is a tuple whose values respectively match:
+                       is equal to 1
+                       is equal to \"One\"
+                  2. is a tuple whose values respectively match:
+                       is equal to 3
+                       is equal to \"Three\""
             )))
         )
     }
@@ -1106,22 +889,26 @@
         // compiler takes care of that, but when the matcher is created separately,
         // we must create the constitute matchers separately so that they
         // aren't dropped too early.
-        let matchers = ((anything(), eq(1)), (anything(), eq(2)), (anything(), eq(2)));
-        let matcher: UnorderedElementsOfMapAreMatcher<HashMap<u32, u32>, _, _, 3> = unordered_elements_are![
-            (matchers.0.0, matchers.0.1),
-            (matchers.1.0, matchers.1.1),
-            (matchers.2.0, matchers.2.1),
-        ];
         let value: HashMap<u32, u32> = HashMap::from_iter([(0, 1), (1, 1), (2, 2)]);
+        let matchers = ((anything(), eq(&1)), (anything(), eq(&2)), (anything(), eq(&2)));
+        let matcher = unordered_elements_are![
+            (matchers.0 .0, matchers.0 .1),
+            (matchers.1 .0, matchers.1 .1),
+            (matchers.2 .0, matchers.2 .1),
+        ];
         verify_that!(
             matcher.explain_match(&value),
-            displays_as(contains_regex(
-                "Actual element 2 => 2 at index [0-2] matched expected element `is anything` => `is equal to 2` at index [0-2]."
-            )).and(displays_as(contains_regex(
-                "Actual element [0-1] => [0-1] at index [0-2] did not match any remaining expected element."
-            ))).and(displays_as(contains_substring(
-                "Expected element `is anything` => `is equal to 2` at index 2 did not match any remaining actual element."
-            )))
+            all![
+                displays_as(contains_regex(
+                    "Actual element \\(2, 2\\) at index [0-2] matched expected element `is a tuple whose values respectively match:\n    is anything\n    is equal to 2` at index [0-2]."
+                )),
+                displays_as(contains_regex(
+                    "Actual element \\(\n      [0-1],\n      [0-1],\n  \\) at index [0-2] did not match any remaining expected element."
+                )),
+                displays_as(contains_substring(
+                    "Expected element `is a tuple whose values respectively match:\n    is anything\n    is equal to 2` at index 2 did not match any remaining actual element."
+                ))
+            ]
         )
     }
 }

crates/googletest/tests/all_matcher_test.rs

diff --git a/crates/googletest/tests/all_matcher_test.rs b/crates/googletest/tests/all_matcher_test.rs
index 8b36fc0..03f645a 100644
--- a/crates/googletest/tests/all_matcher_test.rs
+++ b/crates/googletest/tests/all_matcher_test.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 
@@ -54,7 +53,7 @@
     #[derive(Debug, PartialEq)]
     struct AStruct(i32);
     let expected_value = AStruct(123);
-    verify_that!(AStruct(123), all![eq_deref_of(&expected_value)])
+    verify_that!(AStruct(123), all![eq(&expected_value)])
 }
 
 #[test]
@@ -115,7 +114,7 @@
 #[test]
 fn formats_error_message_correctly_when_all_is_inside_ok() -> Result<()> {
     let value: std::result::Result<i32, std::io::Error> = Ok(4);
-    let result = verify_that!(value, ok(all![eq(1), eq(2), eq(3)]));
+    let result = verify_that!(value, ok(all![eq(&1), eq(&2), eq(&3)]));
     verify_that!(
         result,
         err(displays_as(contains_substring(indoc!(

crates/googletest/tests/any_matcher_test.rs

diff --git a/crates/googletest/tests/any_matcher_test.rs b/crates/googletest/tests/any_matcher_test.rs
index 82ed046..425e99c 100644
--- a/crates/googletest/tests/any_matcher_test.rs
+++ b/crates/googletest/tests/any_matcher_test.rs
@@ -12,16 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 
 #[test]
-fn does_not_match_value_when_list_is_empty() -> Result<()> {
-    verify_that!((), not(any!()))
-}
-
-#[test]
 fn matches_value_with_single_matching_component() -> Result<()> {
     verify_that!(123, any!(eq(123)))
 }
@@ -54,7 +48,7 @@
     #[derive(Debug, PartialEq)]
     struct AStruct(i32);
     let expected_value = AStruct(123);
-    verify_that!(AStruct(123), any![eq_deref_of(&expected_value)])
+    verify_that!(AStruct(123), any![eq(&expected_value)])
 }
 
 #[test]
@@ -66,11 +60,6 @@
 }
 
 #[test]
-fn mismatch_description_empty_matcher() -> Result<()> {
-    verify_that!(any!().explain_match("Three"), displays_as(eq("which never matches")))
-}
-
-#[test]
 fn all_multiple_failed_assertions() -> Result<()> {
     let result = verify_that!(4, any![eq(1), eq(2), eq(3)]);
     verify_that!(
@@ -115,7 +104,7 @@
 #[test]
 fn formats_error_message_correctly_when_any_is_inside_ok() -> Result<()> {
     let value: std::result::Result<i32, std::io::Error> = Ok(4);
-    let result = verify_that!(value, ok(any![eq(1), eq(2), eq(3)]));
+    let result = verify_that!(value, ok(any![eq(&1), eq(&2), eq(&3)]));
     verify_that!(
         result,
         err(displays_as(contains_substring(indoc!(

crates/googletest/tests/assertions_test.rs

diff --git a/crates/googletest/tests/assertions_test.rs b/crates/googletest/tests/assertions_test.rs
new file mode 100644
index 0000000..dee073d
--- /dev/null
+++ b/crates/googletest/tests/assertions_test.rs
@@ -0,0 +1,427 @@
+mod verify_pred {
+    use googletest::prelude::*;
+    use indoc::indoc;
+
+    #[test]
+    fn supports_function_call_with_non_debug_types() -> Result<()> {
+        // Non-Debug - cannot be printed.
+        struct Apple;
+        fn f(_a: &Apple, _b: u32, _c: u32) -> bool {
+            false
+        }
+        fn g(_a: u32) -> u32 {
+            5
+        }
+
+        let a = &Apple;
+        let res = verify_pred!(f(a, g(g(3)), 1 + 2));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                f(a, g(g(3)), 1 + 2) was false with
+                  a does not implement Debug,
+                  g(g(3)) = 5,
+                  1 + 2 = 3,
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn supports_trailing_comma() -> Result<()> {
+        verify_that!(verify_pred!(false,), err(anything()))
+    }
+
+    #[test]
+    fn supports_non_function() -> Result<()> {
+        verify_pred!(true)?;
+        verify_that!(verify_pred!(false), err(anything()))
+    }
+
+    #[test]
+    fn does_not_print_literals() -> Result<()> {
+        trait Foo {
+            fn f(&self, _a: u32, _b: i32, _c: u32, _d: &str) -> bool {
+                false
+            }
+        }
+        impl Foo for i32 {}
+
+        let res = verify_pred!(0.f(1, 2_i32.abs(), 1 + 2, "hello"));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {r#"
+                0.f(1, 2_i32.abs(), 1 + 2, "hello") was false with
+                  2_i32.abs() = 2,
+                  1 + 2 = 3,
+                  at"#
+            })))
+        )
+    }
+
+    #[test]
+    fn supports_chained_field_access_and_method_calls_with_non_debug_types() -> Result<()> {
+        // Non-Debug
+        struct Apple {
+            b: Banana,
+        }
+        #[derive(Debug)]
+        struct Banana;
+        impl Banana {
+            fn c(&self, _c: &Cherry, _d: u32) -> bool {
+                false
+            }
+        }
+        // Non-Debug - cannot be printed.
+        struct Cherry;
+
+        let a = Apple { b: Banana };
+        let c = &Cherry;
+        let d = 3;
+        let res = verify_pred!(a.b.c(c, d));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                a.b.c(c, d) was false with
+                  a does not implement Debug,
+                  a.b = Banana,
+                  c does not implement Debug,
+                  d = 3,
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn evaluates_functions_and_arguments_exactly_once() -> Result<()> {
+        let mut a = 0;
+        let mut foo = |_b: u32| {
+            a += 1;
+            false
+        };
+        let mut b = 0;
+        let mut bar = || {
+            b += 10;
+            b
+        };
+
+        let res = verify_pred!(foo(bar()));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                foo(bar()) was false with
+                  bar() = 10,
+                  at"
+            })))
+        )?;
+
+        verify_that!((a, b), eq((1, 10)))
+    }
+
+    #[test]
+    fn evaluates_methods_and_arguments_exactly_once() -> Result<()> {
+        struct Apple(u32);
+        impl Apple {
+            fn c(&mut self, _b: bool) -> bool {
+                self.0 += 1;
+                false
+            }
+        }
+        let mut a = Apple(0);
+        let mut b = Apple(10);
+
+        let res = verify_pred!(a.c(b.c(false)));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                a.c(b.c(false)) was false with
+                  a does not implement Debug,
+                  b.c(false) = false,
+                  at"
+            })))
+        )?;
+
+        verify_that!((a.0, b.0), eq((1, 11)))
+    }
+
+    #[test]
+    fn supports_chained_method_calls() -> Result<()> {
+        #[derive(Debug)]
+        struct Apple;
+        impl Apple {
+            fn b(&self, _b: u32) -> Banana {
+                Banana
+            }
+        }
+        // Non-Debug: not printed on error.
+        struct Banana;
+        impl Banana {
+            fn c(&self, _c0: u32, _c1: Cherry) -> bool {
+                false
+            }
+        }
+        // Non-Debug: not printed on error.
+        #[derive(Copy, Clone)]
+        struct Cherry;
+
+        let a = Apple;
+        let v = 10;
+        let res = verify_pred!(a.b(v).c(11, Cherry));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                a.b(v).c(11, Cherry) was false with
+                  a = Apple,
+                  v = 10,
+                  a.b(v) does not implement Debug,
+                  Cherry does not implement Debug,
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn prints_consumed_values() -> Result<()> {
+        // Non-Debug
+        struct Apple;
+        impl Apple {
+            fn b(self) -> Banana {
+                Banana
+            }
+        }
+        #[derive(Debug)]
+        struct Banana;
+        impl Banana {
+            fn c(self) -> bool {
+                false
+            }
+        }
+
+        let a = Apple;
+        let res = verify_pred!(a.b().c());
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                a.b().c() was false with
+                  a does not implement Debug,
+                  a.b() = Banana,
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn works_with_realistic_example_with_consumed_intermediate_values() -> Result<()> {
+        let res =
+            verify_pred!(vec![1, 2].into_iter().map(|x| x * 2).collect::<Vec<_>>().is_empty());
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                vec! [1, 2].into_iter().map(| x | x * 2).collect :: < Vec < _ > >
+                ().is_empty() was false with
+                  vec! [1, 2] = [1, 2],
+                  vec! [1, 2].into_iter() = IntoIter([1, 2]),
+                  | x | x * 2 does not implement Debug,
+                  vec! [1, 2].into_iter().map(| x | x * 2) = Map { iter: IntoIter([1, 2]) },
+                  vec! [1, 2].into_iter().map(| x | x * 2).collect :: < Vec < _ > > () = [2, 4],
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn values_should_be_accessible_after_test() -> Result<()> {
+        // Not `Copy` and should not be consumed by the generated test code.
+        #[derive(Debug)]
+        struct Apple;
+        impl Apple {
+            fn b(&self, _c: &mut u32) -> bool {
+                false
+            }
+        }
+
+        let mut c = 0;
+        let a = Apple;
+        let res = verify_pred!(a.b(&mut c));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                a.b(& mut c) was false with
+                  a = Apple,
+                  & mut c = 0,
+                  at"
+            })))
+        )?;
+
+        // `a` and `&mut c` should still be accessible after the test despite not being
+        // `Copy`.
+        let _ = a.b(&mut c);
+
+        Ok(())
+    }
+
+    #[test]
+    fn prints_values_for_mutating_expressions() -> Result<()> {
+        let mut a = 1;
+        let mut b = 2;
+        let mut c = 0;
+        trait Mutator {
+            fn mutate_and_false(&mut self, b: &mut u32) -> bool;
+        }
+        impl Mutator for u32 {
+            fn mutate_and_false(&mut self, b: &mut u32) -> bool {
+                *self += 10;
+                *b += 20;
+                false
+            }
+        }
+
+        // Macro to to avoid the inconsistency in how `;` and `&mut` are printed between
+        // Rust versions when printing out the stringified version of the block.
+        macro_rules! block_a {
+            () => {{
+                c += 10;
+                &mut a
+            }};
+        }
+        macro_rules! block_b {
+            () => {{
+                c += 100;
+                &mut b
+            }};
+        }
+        let res = verify_pred! { block_a!().mutate_and_false(block_b!()) };
+
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                block_a! ().mutate_and_false(block_b! ()) was false with
+                  block_a! () = 1,
+                  block_b! () = 2,
+                  at"
+            })))
+        )?;
+
+        verify_that!((a, b, c), eq((11, 22, 110)))
+    }
+
+    #[test]
+    fn values_can_be_insulated_with_parens() -> Result<()> {
+        // Not `Copy` and has a consuming method.
+        struct Apple;
+        impl Apple {
+            fn b(self) -> Banana {
+                Banana
+            }
+        }
+        #[derive(Debug)]
+        struct Banana;
+        impl Banana {
+            fn c(&self) -> bool {
+                false
+            }
+        }
+
+        let a = Apple;
+        let res = verify_pred!({ a.b() }.c());
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                { a.b() }.c() was false with
+                  { a.b() } = Banana,
+                  at"
+            })))
+        )
+    }
+
+    #[test]
+    fn binary_operator() -> Result<()> {
+        // Add chaining and function calls.
+        fn f(x: u32) -> u32 {
+            x + 1
+        }
+        #[derive(Debug)]
+        struct Apple;
+        impl Apple {
+            fn b(&self, y: u32) -> u32 {
+                y + 10
+            }
+        }
+        let a = Apple;
+        let x = 1;
+        let y = 2;
+        let res = verify_pred!(f(x) - 1 == a.b(y + 1) + f(y));
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                f(x) - 1 == a.b(y + 1) + f(y) was false with
+                  x = 1,
+                  f(x) = 2,
+                  f(x) - 1 = 1,
+                  a = Apple,
+                  y + 1 = 3,
+                  a.b(y + 1) = 13,
+                  y = 2,
+                  f(y) = 3,
+                  a.b(y + 1) + f(y) = 16,
+                  at"
+            })))
+        )
+    }
+
+    #[rustversion::before(1.77)]
+    #[test]
+    fn unary_operator() -> Result<()> {
+        #[derive(Debug)]
+        struct Apple;
+        impl Apple {
+            fn b(&self, _b: u32, _c: i32) -> i32 {
+                0
+            }
+        }
+
+        let a = Apple;
+        let b = 1;
+        let res = verify_pred!(!a.b(b, -1) == !-2);
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                ! a.b(b, - 1) ==! - 2 was false with
+                  a = Apple,
+                  b = 1,
+                  a.b(b, - 1) = 0,
+                  ! a.b(b, - 1) = -1,
+                  ! - 2 = 1,
+                  at"
+            })))
+        )
+    }
+
+    #[rustversion::since(1.77)]
+    #[test]
+    fn unary_operator() -> Result<()> {
+        #[derive(Debug)]
+        struct Apple;
+        impl Apple {
+            fn b(&self, _b: u32, _c: i32) -> i32 {
+                0
+            }
+        }
+
+        let a = Apple;
+        let b = 1;
+        let res = verify_pred!(!a.b(b, -1) == !-2);
+        verify_that!(
+            res,
+            err(displays_as(contains_substring(indoc! {"
+                ! a.b(b, - 1) == ! - 2 was false with
+                  a = Apple,
+                  b = 1,
+                  a.b(b, - 1) = 0,
+                  ! a.b(b, - 1) = -1,
+                  ! - 2 = 1,
+                  at"
+            })))
+        )
+    }
+}

crates/googletest/tests/colorized_diff_test.rs

diff --git a/crates/googletest/tests/colorized_diff_test.rs b/crates/googletest/tests/colorized_diff_test.rs
index d056020..2029521 100644
--- a/crates/googletest/tests/colorized_diff_test.rs
+++ b/crates/googletest/tests/colorized_diff_test.rs
@@ -32,7 +32,7 @@
     std::env::remove_var("NO_COLOR");
     std::env::set_var("FORCE_COLOR", "1");
 
-    let result = verify_that!(build_text(1..50), eq(build_text(1..51)));
+    let result = verify_that!(build_text(1..50), eq(&build_text(1..51)));
 
     verify_that!(
         result,

crates/googletest/tests/composition_test.rs

diff --git a/crates/googletest/tests/composition_test.rs b/crates/googletest/tests/composition_test.rs
index 7ae146f..e5f2cd7 100644
--- a/crates/googletest/tests/composition_test.rs
+++ b/crates/googletest/tests/composition_test.rs
@@ -17,14 +17,14 @@
 #[test]
 fn all_matcher_works_as_inner_matcher() -> Result<()> {
     let value = vec![1];
-    verify_that!(value, contains_each![all!(gt(0), lt(2))])
+    verify_that!(value, contains_each![all!(gt(&0), lt(&2))])
 }
 
 #[test]
 fn matches_pattern_works_as_inner_matcher() -> Result<()> {
     #[derive(Debug)]
     struct AStruct(i32);
-    verify_that!(vec![AStruct(123)], contains_each![matches_pattern!(AStruct(eq(123)))])
+    verify_that!(vec![AStruct(123)], contains_each![matches_pattern!(&AStruct(eq(123)))])
 }
 
 #[test]
@@ -38,7 +38,7 @@
     }
     verify_that!(
         vec![AStruct(123)],
-        contains_each![matches_pattern!(AStruct {
+        contains_each![matches_pattern!(&AStruct {
             get_value(): eq(123)
         })]
     )
@@ -48,24 +48,139 @@
 fn contains_each_works_as_inner_matcher() -> Result<()> {
     #[derive(Debug)]
     struct AStruct(Vec<i32>);
-    verify_that!(AStruct(vec![123]), matches_pattern!(AStruct(contains_each![eq(123)])))
+    verify_that!(AStruct(vec![123]), matches_pattern!(&AStruct(ref contains_each![eq(&123)])))
 }
 
 #[test]
 fn pointwise_works_as_inner_matcher() -> Result<()> {
     #[derive(Debug)]
     struct AStruct(Vec<i32>);
-    verify_that!(AStruct(vec![123]), matches_pattern!(AStruct(pointwise!(eq, [123]))))
+    verify_that!(AStruct(vec![123]), matches_pattern!(&AStruct(ref pointwise!(eq, [&123]))))
 }
 
 #[test]
 fn elements_are_works_as_inner_matcher() -> Result<()> {
     #[derive(Debug)]
     struct AStruct(Vec<i32>);
-    verify_that!(AStruct(vec![123]), matches_pattern!(AStruct(elements_are![eq(123)])))
+    verify_that!(AStruct(vec![123]), matches_pattern!(&AStruct(ref elements_are![eq(&123)])))
 }
 
 #[test]
 fn tuple_works_as_inner_matcher() -> Result<()> {
-    verify_that!(vec![(123,)], elements_are![(eq(123),)])
+    verify_that!(vec![(123,)], elements_are![(eq(&123),)])
+}
+
+#[test]
+fn matches_struct_with_method_returning_option_of_non_copy_value() -> Result<()> {
+    #[derive(Debug)]
+    struct AnInnerStruct;
+
+    #[derive(Debug)]
+    struct AStruct;
+
+    impl AStruct {
+        fn get_value(&self) -> Option<AnInnerStruct> {
+            Some(AnInnerStruct)
+        }
+    }
+
+    verify_that!(
+        AStruct,
+        matches_pattern!(&AStruct {
+            get_value(): ref some(matches_pattern!(&AnInnerStruct))
+        })
+    )
+}
+
+#[test]
+fn matches_struct_with_method_returning_option_of_non_copy_enum() -> Result<()> {
+    #[derive(Debug)]
+    enum AnInnerStruct {
+        ThisCase,
+        #[allow(unused)]
+        ThatCase,
+    }
+    #[derive(Debug)]
+    struct AStruct;
+    impl AStruct {
+        fn get_value(&self) -> Option<AnInnerStruct> {
+            Some(AnInnerStruct::ThisCase)
+        }
+    }
+
+    verify_that!(
+        AStruct,
+        matches_pattern!(&AStruct {
+            get_value(): ref some(matches_pattern!(&AnInnerStruct::ThisCase))
+        })
+    )
+}
+
+#[test]
+fn matches_struct_with_method_returning_option_ref_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct AnInnerStruct;
+    #[derive(Debug)]
+    struct AStruct;
+    impl AStruct {
+        fn get_value(&self) -> Option<AnInnerStruct> {
+            Some(AnInnerStruct)
+        }
+    }
+
+    verify_that!(
+        AStruct,
+        matches_pattern!(AStruct {
+            get_value(): some(matches_pattern!(AnInnerStruct))
+        })
+    )
+}
+
+#[test]
+fn matches_struct_with_method_returning_option_enum_ref_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    enum AnInnerStruct {
+        ThisCase,
+        #[allow(unused)]
+        ThatCase,
+    }
+    #[derive(Debug)]
+    struct AStruct;
+    impl AStruct {
+        fn get_value(&self) -> Option<AnInnerStruct> {
+            Some(AnInnerStruct::ThisCase)
+        }
+    }
+
+    verify_that!(
+        AStruct,
+        matches_pattern!(AStruct {
+            get_value(): some(matches_pattern!(AnInnerStruct::ThisCase))
+        })
+    )
+}
+
+#[test]
+fn matches_struct_with_property_against_predicate() -> Result<()> {
+    #[derive(Debug)]
+    enum AnInnerStruct {
+        ThisCase,
+        #[allow(unused)]
+        ThatCase,
+    }
+
+    #[derive(Debug)]
+    struct AStruct;
+    impl AStruct {
+        fn get_value(&self) -> AnInnerStruct {
+            AnInnerStruct::ThisCase
+        }
+    }
+
+    verify_that!(
+        AStruct,
+        matches_pattern!(AStruct {
+            get_value(): predicate(|_: &_| true)
+        })
+    )
 }

crates/googletest/tests/elements_are_matcher_test.rs

diff --git a/crates/googletest/tests/elements_are_matcher_test.rs b/crates/googletest/tests/elements_are_matcher_test.rs
index 4de2314..3aafbc7 100644
--- a/crates/googletest/tests/elements_are_matcher_test.rs
+++ b/crates/googletest/tests/elements_are_matcher_test.rs
@@ -12,21 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 
 #[test]
 fn elements_are_matches_vector() -> Result<()> {
     let value = vec![1, 2, 3];
-    verify_that!(value, elements_are![eq(1), eq(2), eq(3)])
+    verify_that!(value, elements_are![eq(&1), eq(&2), eq(&3)])
 }
 
 #[test]
 fn elements_are_matches_slice() -> Result<()> {
     let value = vec![1, 2, 3];
     let slice = value.as_slice();
-    verify_that!(*slice, elements_are![eq(1), eq(2), eq(3)])
+    verify_that!(slice, elements_are![eq(&1), eq(&2), eq(&3)])
 }
 
 #[test]
@@ -37,13 +36,13 @@
 #[test]
 fn elements_are_supports_trailing_comma() -> Result<()> {
     let value = vec![1, 2, 3];
-    verify_that!(value, elements_are![eq(1), eq(2), eq(3),])
+    verify_that!(value, elements_are![eq(&1), eq(&2), eq(&3),])
 }
 
 #[test]
 fn elements_are_returns_no_match_when_expected_and_actual_sizes_differ() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, not(elements_are![eq(1), eq(2), eq(3)]))
+    verify_that!(value, not(elements_are![eq(&1), eq(&2), eq(&3)]))
 }
 
 #[test]
@@ -51,12 +50,32 @@
     #[derive(Debug, PartialEq)]
     struct AStruct(i32);
     let expected_value = AStruct(123);
-    verify_that!(vec![AStruct(123)], elements_are![eq_deref_of(&expected_value)])
+    verify_that!(vec![AStruct(123)], elements_are![eq(&expected_value)])
+}
+
+#[test]
+fn elements_are_matches_iterator_returning_by_value() -> Result<()> {
+    #[derive(Debug, Copy, Clone)]
+    struct Countdown(i32);
+    impl Iterator for Countdown {
+        type Item = i32;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            match self.0 {
+                0 => None,
+                x => {
+                    self.0 -= 1;
+                    Some(x)
+                }
+            }
+        }
+    }
+    verify_that!(Countdown(3), elements_are![eq(3), eq(2), eq(1)])
 }
 
 #[test]
 fn elements_are_produces_correct_failure_message() -> Result<()> {
-    let result = verify_that!(vec![1, 4, 3], elements_are![eq(1), eq(2), eq(3)]);
+    let result = verify_that!(vec![1, 4, 3], elements_are![eq(&1), eq(&2), eq(&3)]);
     verify_that!(
         result,
         err(displays_as(contains_substring(indoc!(
@@ -76,7 +95,7 @@
 fn elements_are_produces_correct_failure_message_nested() -> Result<()> {
     let result = verify_that!(
         vec![vec![0, 1], vec![1, 2]],
-        elements_are![elements_are![eq(1), eq(2)], elements_are![eq(2), eq(3)]]
+        elements_are![elements_are![eq(&1), eq(&2)], elements_are![eq(&2), eq(&3)]]
     );
     verify_that!(
         result,
@@ -103,14 +122,12 @@
 
 #[test]
 fn elements_are_explain_match_wrong_size() -> Result<()> {
-    verify_that!(
-        elements_are![eq(1)].explain_match(&vec![1, 2]),
-        displays_as(eq("whose size is 2"))
-    )
+    let matcher = elements_are![eq(&1)];
+    verify_that!(matcher.explain_match(&vec![1, 2]), displays_as(eq("whose size is 2")))
 }
 
-fn create_matcher() -> impl Matcher<ActualT = Vec<i32>> {
-    elements_are![eq(1)]
+fn create_matcher<'a>() -> impl Matcher<&'a Vec<i32>> {
+    elements_are![eq(&1)]
 }
 
 #[test]
@@ -120,5 +137,10 @@
 
 #[test]
 fn elements_are_implicitly_called() -> Result<()> {
-    verify_that!(vec![1, 2, 3], [eq(1), eq(2), eq(3)])
+    verify_that!(vec![1, 2, 3], [eq(&1), eq(&2), eq(&3)])
+}
+
+#[test]
+fn elements_are_with_auto_eq() -> Result<()> {
+    verify_that!(vec![1, 2, 3], [&1, &2, lt(&43)])
 }

crates/googletest/tests/field_matcher_test.rs

diff --git a/crates/googletest/tests/field_matcher_test.rs b/crates/googletest/tests/field_matcher_test.rs
index f585c21..c239b47 100644
--- a/crates/googletest/tests/field_matcher_test.rs
+++ b/crates/googletest/tests/field_matcher_test.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::{Matcher, MatcherResult};
+use googletest::matcher::MatcherResult;
 use googletest::prelude::*;
 
 #[derive(Debug)]
@@ -22,7 +22,7 @@
 
 #[test]
 fn field_matches_integer_field() -> Result<()> {
-    verify_that!(IntField { int: 32 }, field!(IntField.int, eq(32)))
+    verify_that!(IntField { int: 32 }, field!(&IntField.int, eq(32)))
 }
 
 #[derive(Debug)]
@@ -32,12 +32,15 @@
 
 #[test]
 fn field_matches_string_field() -> Result<()> {
-    verify_that!(StringField { strink: "yes".to_string() }, field!(StringField.strink, eq("yes")))
+    verify_that!(
+        StringField { strink: "yes".to_string() },
+        field!(&StringField.strink, ref eq("yes"))
+    )
 }
 
 #[test]
 fn field_error_message_shows_field_name_and_inner_matcher() -> Result<()> {
-    let matcher = field!(IntField.int, eq(31));
+    let matcher = field!(&IntField.int, eq(31));
 
     verify_that!(
         matcher.describe(MatcherResult::Match),
@@ -54,15 +57,15 @@
 
 #[test]
 fn struct_in_other_module_matches() -> Result<()> {
-    verify_that!(sub::SubStruct { field: 32 }, field!(sub::SubStruct.field, eq(32)))
+    verify_that!(sub::SubStruct { field: 32 }, field!(&sub::SubStruct.field, eq(32)))
 }
 
 #[derive(Debug)]
-struct Tuple(i32, String);
+struct Tuple(i32, #[allow(unused)] String);
 
 #[test]
 fn tuple_matches_with_index() -> Result<()> {
-    verify_that!(Tuple(32, "yes".to_string()), field!(Tuple.0, eq(32)))
+    verify_that!(Tuple(32, "yes".to_string()), field!(&Tuple.0, eq(32)))
 }
 
 #[test]
@@ -73,7 +76,7 @@
     }
     let value = AnEnum::AValue(123);
 
-    verify_that!(value, field!(AnEnum::AValue.0, eq(123)))
+    verify_that!(value, field!(&AnEnum::AValue.0, eq(123)))
 }
 
 #[test]
@@ -84,7 +87,7 @@
     }
     let value = AStruct { a: vec![1] };
 
-    let result = verify_that!(value, field!(AStruct.a, container_eq([])));
+    let result = verify_that!(value, field!(&AStruct.a, ref container_eq([])));
 
     verify_that!(
         result,
@@ -104,7 +107,7 @@
     }
     let value = AnEnum::AnotherValue;
 
-    verify_that!(value, not(field!(AnEnum::AValue.0, eq(123))))
+    verify_that!(&value, not(field!(&AnEnum::AValue.0, eq(123))))
 }
 
 #[test]
@@ -119,7 +122,7 @@
     }
     let value = AnEnum::AnotherValue;
 
-    let result = verify_that!(value, field!(AnEnum::AValue.a, eq(123)));
+    let result = verify_that!(value, field!(&AnEnum::AValue.a, eq(123)));
 
     verify_that!(
         result,
@@ -133,11 +136,12 @@
     enum AnEnum {
         #[allow(dead_code)] // This variant is intentionally unused.
         AValue(u32),
+        #[allow(unused)]
         AnotherValue(u32),
     }
     let value = AnEnum::AnotherValue(123);
 
-    let result = verify_that!(value, field!(AnEnum::AValue.0, eq(123)));
+    let result = verify_that!(value, field!(&AnEnum::AValue.0, eq(123)));
 
     verify_that!(
         result,
@@ -158,7 +162,7 @@
     }
     let value = AnEnum::AnotherValue { a: 123 };
 
-    let result = verify_that!(value, field!(AnEnum::AValue.0, eq(123)));
+    let result = verify_that!(value, field!(&AnEnum::AValue.0, eq(123)));
 
     verify_that!(
         result,
@@ -174,5 +178,87 @@
     }
     let value = AnEnum::AValue { a_field: 123 };
 
-    verify_that!(value, field!(AnEnum::AValue.a_field, eq(123)))
+    verify_that!(value, field!(&AnEnum::AValue.a_field, eq(123)))
+}
+
+#[test]
+fn matches_struct_copy_to_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct Strukt {
+        a_field: i32,
+    }
+
+    verify_that!(Strukt { a_field: 32 }, field!(Strukt.a_field, eq(32)))
+}
+
+#[test]
+fn matches_struct_ref_to_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct Strukt {
+        a_field: i32,
+    }
+
+    verify_that!(Strukt { a_field: 32 }, field!(&Strukt.a_field, eq(32)))
+}
+
+#[test]
+fn matches_struct_ref_to_ref() -> Result<()> {
+    #[derive(Debug)]
+    struct Strukt {
+        a_field: String,
+    }
+
+    verify_that!(Strukt { a_field: "32".into() }, field!(&Strukt.a_field, ref eq("32")))
+}
+
+#[test]
+fn matches_struct_copy_to_ref() -> Result<()> {
+    // It is not possible to have a copy struct with non-copy field. Hence, this
+    // test case is not necessary.
+    Ok(())
+}
+
+#[test]
+fn matches_struct_ref_to_ref_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct Strukt {
+        a_field: String,
+    }
+
+    verify_that!(Strukt { a_field: "32".into() }, field!(Strukt.a_field, eq("32")))
+}
+
+#[test]
+fn matches_struct_with_auto_eq() -> Result<()> {
+    #[derive(Debug)]
+    struct Strukt {
+        a_field: String,
+    }
+
+    verify_that!(Strukt { a_field: "32".into() }, field!(Strukt.a_field, "32"))
+}
+
+#[test]
+fn matches_enum_with_auto_eq() -> Result<()> {
+    #[derive(Debug)]
+    enum Enum {
+        Str(String),
+        #[allow(unused)]
+        Int(i32),
+    }
+
+    verify_that!(Enum::Str("32".into()), field!(Enum::Str.0, "32"))
+}
+
+#[test]
+fn matches_enum_with_auto_eq_with_wrapper() -> Result<()> {
+    #[derive(Debug)]
+    struct Wrapper<I> {
+        wrapped: I,
+    }
+
+    verify_that!(
+        Wrapper { wrapped: Wrapper { wrapped: 23 } },
+        field!(Wrapper.wrapped, field!(Wrapper.wrapped, &23))
+    )
 }

crates/googletest/tests/fmt_test.rs

diff --git a/crates/googletest/tests/fmt_test.rs b/crates/googletest/tests/fmt_test.rs
new file mode 100644
index 0000000..63e2dd7
--- /dev/null
+++ b/crates/googletest/tests/fmt_test.rs
@@ -0,0 +1,58 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod write_expr_value {
+    use googletest::prelude::*;
+
+    // Converts the formatting call to a `String` for testing.
+    macro_rules! write_expr_value {
+        ($expr_str:expr, $expr: expr $(,)?) => {{
+            let mut s = String::new();
+            ::googletest::fmt::internal::__googletest__write_expr_value!(s, $expr_str, $expr);
+            s
+        }};
+    }
+
+    #[test]
+    fn test_with_debug_value_references() -> Result<()> {
+        #[derive(Debug)]
+        struct Foo;
+        let mut val = Foo;
+
+        verify_that!(write_expr_value!("val", val), eq("\n  val = Foo,"))?;
+        verify_that!(write_expr_value!("val", &val), eq("\n  val = Foo,"))?;
+        verify_that!(write_expr_value!("val", &&val), eq("\n  val = Foo,"))?;
+        verify_that!(write_expr_value!("val", &mut val), eq("\n  val = Foo,"))?;
+        verify_that!(write_expr_value!("val", &mut &mut val), eq("\n  val = Foo,"))?;
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_with_non_debug_value_references() -> Result<()> {
+        struct Foo;
+        let mut val = Foo;
+
+        verify_that!(write_expr_value!("val", val), eq("\n  val does not implement Debug,"))?;
+        verify_that!(write_expr_value!("val", &val), eq("\n  val does not implement Debug,"))?;
+        verify_that!(write_expr_value!("val", &&val), eq("\n  val does not implement Debug,"))?;
+        verify_that!(write_expr_value!("val", &mut val), eq("\n  val does not implement Debug,"))?;
+        verify_that!(
+            write_expr_value!("val", &mut &mut val),
+            eq("\n  val does not implement Debug,")
+        )?;
+
+        Ok(())
+    }
+}

crates/googletest/tests/lib.rs

diff --git a/crates/googletest/tests/lib.rs b/crates/googletest/tests/lib.rs
index fb243ca..f5d8f75 100644
--- a/crates/googletest/tests/lib.rs
+++ b/crates/googletest/tests/lib.rs
@@ -14,6 +14,7 @@
 
 mod all_matcher_test;
 mod any_matcher_test;
+mod assertions_test;
 mod colorized_diff_test;
 mod composition_test;
 mod elements_are_matcher_test;
@@ -21,7 +22,6 @@
 mod matches_pattern_test;
 mod pointwise_matcher_test;
 mod property_matcher_test;
-#[cfg(feature = "proptest")]
 mod proptest_integration_test;
 mod tuple_matcher_test;
 mod unordered_elements_are_matcher_test;

crates/googletest/tests/matches_pattern_test.rs

diff --git a/crates/googletest/tests/matches_pattern_test.rs b/crates/googletest/tests/matches_pattern_test.rs
index 3298e36..d1b97e7 100644
--- a/crates/googletest/tests/matches_pattern_test.rs
+++ b/crates/googletest/tests/matches_pattern_test.rs
@@ -23,7 +23,7 @@
     }
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct { a_field: eq(123) }))
+    verify_that!(actual, matches_pattern!(&AStruct { a_field: eq(123) }))
 }
 
 #[test]
@@ -35,7 +35,7 @@
     }
     let actual = AStruct { a_field: 123, another_field: 234 };
 
-    verify_that!(actual, matches_pattern!(AStruct { a_field: eq(123), another_field: eq(234) }))
+    verify_that!(actual, matches_pattern!(&AStruct { a_field: eq(123), another_field: eq(234) }))
 }
 
 #[test]
@@ -47,7 +47,7 @@
     }
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct {
+    verify_that!(actual, matches_pattern!(&AStruct {
         a_field: eq(123), // Block reformatting
     }))
 }
@@ -63,7 +63,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             a_field: eq(123),
             another_field: eq(234), // Block reformatting
         })
@@ -82,7 +82,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             a_field: eq(123),
             another_field: eq(234),
             a_third_field: eq(345),
@@ -104,29 +104,69 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { a_nested_struct: pat!(ANestedStruct { a_field: eq(123) }) })
+        matches_pattern!(&AStruct { a_nested_struct: ref pat!(&ANestedStruct { a_field: eq(123) }) })
     )
 }
 
 #[test]
+fn matches_struct_containing_nested_struct_with_field_with_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct {
+        a_nested_struct: ANestedStruct,
+    }
+    #[derive(Debug)]
+    struct ANestedStruct {
+        a_field: u32,
+    }
+    let actual = AStruct { a_nested_struct: ANestedStruct { a_field: 123 } };
+
+    verify_that!(
+        actual,
+        matches_pattern!(AStruct { a_nested_struct: pat!(ANestedStruct { a_field: eq(&123) }) })
+    )
+}
+
+#[test]
+fn matches_struct_containing_non_copy_field_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct {
+        a_string: String,
+    }
+    let actual = AStruct { a_string: "123".into() };
+
+    verify_that!(actual, matches_pattern!(AStruct { a_string: eq("123") }))
+}
+
+#[test]
 fn has_correct_assertion_failure_message_for_single_field() -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
     }
     let actual = AStruct { a_field: 123 };
-    let result = verify_that!(actual, matches_pattern!(AStruct { a_field: eq(234) }));
+    let result = verify_that!(actual, matches_pattern!(&AStruct { a_field: eq(234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(indoc! {"
-            Value of: actual
-            Expected: is AStruct which has field `a_field`, which is equal to 234
-            Actual: AStruct { a_field: 123 },
-              which has field `a_field`, which isn't equal to 234
-            "
-        })))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+        Value of: actual
+        Expected: is & AStruct which has field `a_field`, which is equal to 234
+        Actual: AStruct { a_field: 123 },
+          which has field `a_field`, which isn't equal to 234
+        "
+    );
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+        Value of: actual
+        Expected: is &AStruct which has field `a_field`, which is equal to 234
+        Actual: AStruct { a_field: 123 },
+          which has field `a_field`, which isn't equal to 234
+        "
+    );
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
 
 #[test]
@@ -139,21 +179,34 @@
     let actual = AStruct { a_field: 123, another_field: 234 };
     let result = verify_that!(
         actual,
-        matches_pattern!(AStruct { a_field: eq(234), another_field: eq(123) })
+        matches_pattern!(&AStruct { a_field: eq(234), another_field: eq(123) })
     );
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(indoc!(
-            "
-            Value of: actual
-            Expected: is AStruct which has all the following properties:
-              * has field `a_field`, which is equal to 234
-              * has field `another_field`, which is equal to 123
-            Actual: AStruct { a_field: 123, another_field: 234 },
-              * which has field `a_field`, which isn't equal to 234
-              * which has field `another_field`, which isn't equal to 123"
-        ))))
-    )
+
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+        Value of: actual
+        Expected: is & AStruct which has all the following properties:
+          * has field `a_field`, which is equal to 234
+          * has field `another_field`, which is equal to 123
+        Actual: AStruct { a_field: 123, another_field: 234 },
+          * which has field `a_field`, which isn't equal to 234
+          * which has field `another_field`, which isn't equal to 123"
+    );
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+        Value of: actual
+        Expected: is &AStruct which has all the following properties:
+          * has field `a_field`, which is equal to 234
+          * has field `another_field`, which is equal to 123
+        Actual: AStruct { a_field: 123, another_field: 234 },
+          * which has field `a_field`, which isn't equal to 234
+          * which has field `another_field`, which isn't equal to 123"
+    );
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
 
 #[test]
@@ -171,33 +224,47 @@
     let actual = AStruct { a_field: 123, another_field: 234 };
     let result = verify_that!(
         actual,
-        matches_pattern!(AStruct { get_field(): eq(234), another_field: eq(123) })
+        matches_pattern!(&AStruct { get_field(): eq(234), another_field: eq(123) })
     );
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(indoc!(
-            "
-            Value of: actual
-            Expected: is AStruct which has all the following properties:
-              * has property `get_field ()`, which is equal to 234
-              * has field `another_field`, which is equal to 123
-            Actual: AStruct { a_field: 123, another_field: 234 },
-              * whose property `get_field ()` is `123`, which isn't equal to 234
-              * which has field `another_field`, which isn't equal to 123"
-        ))))
-    )
+
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+    Value of: actual
+    Expected: is & AStruct which has all the following properties:
+      * has property `get_field ()`, which is equal to 234
+      * has field `another_field`, which is equal to 123
+    Actual: AStruct { a_field: 123, another_field: 234 },
+      * whose property `get_field ()` is `123`, which isn't equal to 234
+      * which has field `another_field`, which isn't equal to 123"
+    );
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = indoc!(
+        "
+    Value of: actual
+    Expected: is &AStruct which has all the following properties:
+      * has property `get_field ()`, which is equal to 234
+      * has field `another_field`, which is equal to 123
+    Actual: AStruct { a_field: 123, another_field: 234 },
+      * whose property `get_field ()` is `123`, which isn't equal to 234
+      * which has field `another_field`, which isn't equal to 123"
+    );
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
 
 #[test]
 fn has_meaningful_assertion_failure_message_when_wrong_enum_variant_is_used() -> Result<()> {
     #[derive(Debug)]
     enum AnEnum {
+        #[allow(unused)]
         A(u32),
         #[allow(unused)]
         B(u32),
     }
     let actual = AnEnum::A(123);
-    let result = verify_that!(actual, matches_pattern!(AnEnum::B(eq(123))));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::B(eq(123))));
 
     verify_that!(
         result,
@@ -219,7 +286,7 @@
     }
     let actual = a_module::AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(a_module::AStruct { a_field: eq(123) }))
+    verify_that!(actual, matches_pattern!(&a_module::AStruct { a_field: eq(123) }))
 }
 
 #[test]
@@ -228,7 +295,7 @@
     struct AStruct(u32);
     let actual = AStruct(123);
 
-    verify_that!(actual, matches_pattern!(AStruct(eq(123))))
+    verify_that!(actual, matches_pattern!(&AStruct(eq(123))))
 }
 
 #[test]
@@ -237,7 +304,7 @@
     struct AStruct(u32, u32);
     let actual = AStruct(123, 234);
 
-    verify_that!(actual, matches_pattern!(AStruct(eq(123), eq(234))))
+    verify_that!(actual, matches_pattern!(&AStruct(eq(123), eq(234))))
 }
 
 #[test]
@@ -246,7 +313,7 @@
     struct AStruct(u32, u32, u32);
     let actual = AStruct(123, 234, 345);
 
-    verify_that!(actual, matches_pattern!(AStruct(eq(123), eq(234), eq(345))))
+    verify_that!(actual, matches_pattern!(&AStruct(eq(123), eq(234), eq(345))))
 }
 
 #[test]
@@ -255,7 +322,7 @@
     struct AStruct(u32, u32, u32, u32);
     let actual = AStruct(123, 234, 345, 456);
 
-    verify_that!(actual, matches_pattern!(AStruct(eq(123), eq(234), eq(345), eq(456))))
+    verify_that!(actual, matches_pattern!(&AStruct(eq(123), eq(234), eq(345), eq(456))))
 }
 
 #[test]
@@ -264,7 +331,7 @@
     struct AStruct(u32, u32, u32, u32, u32);
     let actual = AStruct(123, 234, 345, 456, 567);
 
-    verify_that!(actual, matches_pattern!(AStruct(eq(123), eq(234), eq(345), eq(456), eq(567))))
+    verify_that!(actual, matches_pattern!(&AStruct(eq(123), eq(234), eq(345), eq(456), eq(567))))
 }
 
 #[test]
@@ -275,7 +342,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(eq(123), eq(234), eq(345), eq(456), eq(567), eq(678)))
+        matches_pattern!(&AStruct(eq(123), eq(234), eq(345), eq(456), eq(567), eq(678)))
     )
 }
 
@@ -287,7 +354,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(eq(123), eq(234), eq(345), eq(456), eq(567), eq(678), eq(789)))
+        matches_pattern!(&AStruct(eq(123), eq(234), eq(345), eq(456), eq(567), eq(678), eq(789)))
     )
 }
 
@@ -299,7 +366,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(
+        matches_pattern!(&AStruct(
             eq(123),
             eq(234),
             eq(345),
@@ -320,7 +387,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(
+        matches_pattern!(&AStruct(
             eq(123),
             eq(234),
             eq(345),
@@ -342,7 +409,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(
+        matches_pattern!(&AStruct(
             eq(123),
             eq(234),
             eq(345),
@@ -358,6 +425,29 @@
 }
 
 #[test]
+fn matches_tuple_struct_containing_ten_fields_by_ref() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct(u32, u32, u32, u32, u32, u32, u32, u32, u32, u32);
+    let actual = AStruct(123, 234, 345, 456, 567, 678, 789, 890, 901, 12);
+
+    verify_that!(
+        actual,
+        matches_pattern!(&AStruct(
+            ref eq(&123),
+            ref eq(&234),
+            ref eq(&345),
+            ref eq(&456),
+            ref eq(&567),
+            ref eq(&678),
+            ref eq(&789),
+            ref eq(&890),
+            ref eq(&901),
+            ref eq(&12)
+        ))
+    )
+}
+
+#[test]
 fn matches_tuple_struct_with_trailing_comma() -> Result<()> {
     #[derive(Debug)]
     struct AStruct(u32);
@@ -365,7 +455,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(
+        matches_pattern!(&AStruct(
             eq(123), // Keep the trailing comma, block reformatting
         ))
     )
@@ -379,7 +469,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct(
+        matches_pattern!(&AStruct(
             eq(123),
             eq(234), // Keep the trailing comma, block reformatting
         ))
@@ -394,14 +484,30 @@
     }
     let actual = AnEnum::A;
 
+    verify_that!(actual, matches_pattern!(&AnEnum::A))
+}
+
+#[test]
+fn matches_enum_without_field_ref_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    enum AnEnum {
+        A,
+    }
+    let actual = AnEnum::A;
+
     verify_that!(actual, matches_pattern!(AnEnum::A))
 }
 
-#[rustversion::before(1.76)]
-const ANENUM_A_REPR: &str = "AnEnum :: A";
+#[test]
+fn matches_enum_without_field_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    enum AnEnum {
+        A,
+    }
+    let actual = AnEnum::A;
 
-#[rustversion::since(1.76)]
-const ANENUM_A_REPR: &str = "AnEnum::A";
+    verify_that!(actual, matches_pattern!(AnEnum::A))
+}
 
 #[test]
 fn generates_correct_failure_output_when_enum_variant_without_field_is_not_matched() -> Result<()> {
@@ -413,11 +519,16 @@
     }
     let actual = AnEnum::B;
 
-    let result = verify_that!(actual, matches_pattern!(AnEnum::A));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::A));
 
-    verify_that!(result, err(displays_as(contains_substring(format!("is not {ANENUM_A_REPR}")))))
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "is not & AnEnum :: A";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "is not &AnEnum::A";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn generates_correct_failure_output_when_enum_variant_without_field_is_matched() -> Result<()> {
     #[derive(Debug)]
@@ -426,11 +537,16 @@
     }
     let actual = AnEnum::A;
 
-    let result = verify_that!(actual, not(matches_pattern!(AnEnum::A)));
+    let result = verify_that!(actual, not(matches_pattern!(&AnEnum::A)));
 
-    verify_that!(result, err(displays_as(contains_substring(format!("is {ANENUM_A_REPR}")))))
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "is & AnEnum :: A";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "is &AnEnum::A";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn matches_enum_with_field() -> Result<()> {
     #[derive(Debug)]
@@ -439,9 +555,8 @@
     }
     let actual = AnEnum::A(123);
 
-    verify_that!(actual, matches_pattern!(AnEnum::A(eq(123))))
+    verify_that!(actual, matches_pattern!(&AnEnum::A(eq(123))))
 }
-
 #[test]
 fn does_not_match_wrong_enum_value() -> Result<()> {
     #[derive(Debug)]
@@ -452,9 +567,8 @@
     }
     let actual = AnEnum::B;
 
-    verify_that!(actual, not(matches_pattern!(AnEnum::A(eq(123)))))
+    verify_that!(actual, not(matches_pattern!(&AnEnum::A(eq(123)))))
 }
-
 #[test]
 fn includes_enum_variant_in_description_with_field() -> Result<()> {
     #[derive(Debug)]
@@ -463,16 +577,16 @@
     }
     let actual = AnEnum::A(123);
 
-    let result = verify_that!(actual, matches_pattern!(AnEnum::A(eq(234))));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::A(eq(234))));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is {ANENUM_A_REPR} which has field `0`"
-        ))))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AnEnum :: A which has field `0`";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AnEnum::A which has field `0`";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_enum_variant_in_negative_description_with_field() -> Result<()> {
     #[derive(Debug)]
@@ -481,16 +595,16 @@
     }
     let actual = AnEnum::A(123);
 
-    let result = verify_that!(actual, not(matches_pattern!(AnEnum::A(eq(123)))));
+    let result = verify_that!(actual, not(matches_pattern!(&AnEnum::A(eq(123)))));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is not {ANENUM_A_REPR} which has field `0`, which is equal to"
-        ))))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is not & AnEnum :: A which has field `0`, which is equal to";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is not &AnEnum::A which has field `0`, which is equal to";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_enum_variant_in_description_with_two_fields() -> Result<()> {
     #[derive(Debug)]
@@ -499,16 +613,16 @@
     }
     let actual = AnEnum::A(123, 234);
 
-    let result = verify_that!(actual, matches_pattern!(AnEnum::A(eq(234), eq(234))));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::A(eq(234), eq(234))));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is {ANENUM_A_REPR} which has all the following properties"
-        ))))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AnEnum :: A which has all the following properties";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AnEnum::A which has all the following properties";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_enum_variant_in_description_with_three_fields() -> Result<()> {
     #[derive(Debug)]
@@ -517,16 +631,16 @@
     }
     let actual = AnEnum::A(123, 234, 345);
 
-    let result = verify_that!(actual, matches_pattern!(AnEnum::A(eq(234), eq(234), eq(345))));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::A(eq(234), eq(234), eq(345))));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is {ANENUM_A_REPR} which has all the following properties"
-        ))))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AnEnum :: A which has all the following properties";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AnEnum::A which has all the following properties";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_enum_variant_in_description_with_named_field() -> Result<()> {
     #[derive(Debug)]
@@ -535,16 +649,16 @@
     }
     let actual = AnEnum::A { field: 123 };
 
-    let result = verify_that!(actual, matches_pattern!(AnEnum::A { field: eq(234) }));
+    let result = verify_that!(actual, matches_pattern!(&AnEnum::A { field: eq(234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is {ANENUM_A_REPR} which has field `field`"
-        ))))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AnEnum :: A which has field `field`";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AnEnum::A which has field `field`";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_enum_variant_in_description_with_two_named_fields() -> Result<()> {
     #[derive(Debug)]
@@ -555,17 +669,17 @@
 
     let result = verify_that!(
         actual,
-        matches_pattern!(AnEnum::A { field: eq(234), another_field: eq(234) })
+        matches_pattern!(&AnEnum::A { field: eq(234), another_field: eq(234) })
     );
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(format!(
-            "Expected: is {ANENUM_A_REPR} which has all the following properties"
-        ))))
-    )
-}
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AnEnum :: A which has all the following properties";
 
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AnEnum::A which has all the following properties";
+
+    verify_that!(&result, err(displays_as(contains_substring(EXPECTED))))
+}
 #[test]
 fn includes_struct_name_in_description_with_property() -> Result<()> {
     #[derive(Debug)]
@@ -579,16 +693,16 @@
     }
     let actual = AStruct { field: 123 };
 
-    let result = verify_that!(actual, matches_pattern!(AStruct { get_field(): eq(234) }));
+    let result = verify_that!(actual, matches_pattern!(&AStruct { get_field(): eq(234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(
-            "Expected: is AStruct which has property `get_field ()`"
-        )))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AStruct which has property `get_field ()`";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AStruct which has property `get_field ()`";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn includes_struct_name_in_description_with_ref_property() -> Result<()> {
     #[derive(Debug)]
@@ -602,14 +716,15 @@
     }
     let actual = AStruct { field: 123 };
 
-    let result = verify_that!(actual, matches_pattern!(AStruct { *get_field(): eq(234) }));
+    let result = verify_that!(actual, matches_pattern!(&AStruct { get_field(): eq(&234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(
-            "Expected: is AStruct which has property `get_field ()`"
-        )))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AStruct which has property `get_field ()`";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AStruct which has property `get_field ()`";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
 
 #[test]
@@ -626,14 +741,15 @@
     let actual = AStruct { field: 123 };
 
     let result =
-        verify_that!(actual, matches_pattern!(AStruct { field: eq(123), get_field(): eq(234) }));
+        verify_that!(actual, matches_pattern!(&AStruct { field: eq(123), get_field(): eq(234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(
-            "Expected: is AStruct which has all the following properties"
-        )))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AStruct which has all the following properties";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AStruct which has all the following properties";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
 
 #[test]
@@ -650,16 +766,16 @@
     let actual = AStruct { field: 123 };
 
     let result =
-        verify_that!(actual, matches_pattern!(AStruct { field: eq(123), *get_field(): eq(234) }));
+        verify_that!(actual, matches_pattern!(&AStruct { field: eq(123), get_field(): eq(&234) }));
 
-    verify_that!(
-        result,
-        err(displays_as(contains_substring(
-            "Expected: is AStruct which has all the following properties"
-        )))
-    )
+    #[rustversion::before(1.76)]
+    const EXPECTED: &str = "Expected: is & AStruct which has all the following properties";
+
+    #[rustversion::since(1.76)]
+    const EXPECTED: &str = "Expected: is &AStruct which has all the following properties";
+
+    verify_that!(result, err(displays_as(contains_substring(EXPECTED))))
 }
-
 #[test]
 fn matches_struct_with_a_method() -> Result<()> {
     #[derive(Debug)]
@@ -675,9 +791,8 @@
 
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct { get_field(): eq(123) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field(): eq(123) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_and_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -693,9 +808,8 @@
 
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct { get_field(): eq(123), }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field(): eq(123), }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_parameter() -> Result<()> {
     #[derive(Debug)]
@@ -711,9 +825,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { add_to_field(2): eq(3) }))
+    verify_that!(actual, matches_pattern!(&AStruct { add_to_field(2): eq(3) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters() -> Result<()> {
     #[derive(Debug)]
@@ -729,9 +842,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { add_product_to_field(2, 3): eq(7) }))
+    verify_that!(actual, matches_pattern!(&AStruct { add_product_to_field(2, 3): eq(7) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_enum_value_parameter() -> Result<()> {
     enum AnEnum {
@@ -751,9 +863,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { get_a_field(AnEnum::AVariant): eq(1) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_a_field(AnEnum::AVariant): eq(1) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_with_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -769,9 +880,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { add_product_to_field(2, 3,): eq(7) }))
+    verify_that!(actual, matches_pattern!(&AStruct { add_product_to_field(2, 3,): eq(7) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_returning_a_reference() -> Result<()> {
     #[derive(Debug)]
@@ -787,9 +897,8 @@
 
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct { *get_field_ref(): eq(123) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field_ref(): eq(&123) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_returning_a_reference_with_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -805,9 +914,8 @@
 
     let actual = AStruct { a_field: 123 };
 
-    verify_that!(actual, matches_pattern!(AStruct { *get_field_ref(): eq(123), }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field_ref(): eq(&123), }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_ret_ref() -> Result<()> {
     #[derive(Debug)]
@@ -823,9 +931,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { *get_field_ref(2, 3): eq(1) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field_ref(2, 3): eq(&1) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_returning_reference_taking_enum_value_parameter() -> Result<()> {
     enum AnEnum {
@@ -845,9 +952,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { *get_field_ref(AnEnum::AVariant): eq(1) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field_ref(AnEnum::AVariant): eq(&1) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_with_trailing_comma_ret_ref() -> Result<()> {
     #[derive(Debug)]
@@ -863,9 +969,8 @@
 
     let actual = AStruct { a_field: 1 };
 
-    verify_that!(actual, matches_pattern!(AStruct { *get_field_ref(2, 3,): eq(1) }))
+    verify_that!(actual, matches_pattern!(&AStruct { get_field_ref(2, 3,): eq(&1) }))
 }
-
 #[test]
 fn matches_struct_with_a_method_followed_by_a_field() -> Result<()> {
     #[derive(Debug)]
@@ -882,9 +987,11 @@
 
     let actual = AStruct { a_field: 123, another_field: 234 };
 
-    verify_that!(actual, matches_pattern!(AStruct { get_field(): eq(123), another_field: eq(234) }))
+    verify_that!(
+        actual,
+        matches_pattern!(&AStruct { get_field(): eq(123), another_field: eq(234) })
+    )
 }
-
 #[test]
 fn matches_struct_with_a_method_followed_by_a_field_with_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -903,10 +1010,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { get_field(): eq(123), another_field: eq(234), })
+        matches_pattern!(&AStruct { get_field(): eq(123), another_field: eq(234), })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_and_field() -> Result<()> {
     #[derive(Debug)]
@@ -925,10 +1031,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { add_product_to_field(2, 3): eq(7), another_field: eq(123) })
+        matches_pattern!(&AStruct { add_product_to_field(2, 3): eq(7), another_field: eq(123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_enum_value_parameter_followed_by_field() -> Result<()> {
     enum AnEnum {
@@ -951,10 +1056,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { get_field(AnEnum::AVariant): eq(1), another_field: eq(2) })
+        matches_pattern!(&AStruct { get_field(AnEnum::AVariant): eq(1), another_field: eq(2) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_with_trailing_comma_and_field() -> Result<()>
 {
@@ -974,10 +1078,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { add_product_to_field(2, 3,): eq(7), another_field: eq(123) })
+        matches_pattern!(&AStruct { add_product_to_field(2, 3,): eq(7), another_field: eq(123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_returning_reference_followed_by_a_field() -> Result<()> {
     #[derive(Debug)]
@@ -996,13 +1099,12 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { *get_field_ref(): eq(123), another_field: eq(234) })
+        matches_pattern!(&AStruct { get_field_ref(): eq(&123), another_field: eq(234) })
     )
 }
-
 #[test]
-fn matches_struct_with_a_method_returning_reference_followed_by_a_field_with_trailing_comma()
--> Result<()> {
+fn matches_struct_with_a_method_returning_reference_followed_by_a_field_with_trailing_comma(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1019,10 +1121,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { *get_field_ref(): eq(123), another_field: eq(234), })
+        matches_pattern!(&AStruct { get_field_ref(): eq(&123), another_field: eq(234), })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_two_parameters_ret_ref_and_field() -> Result<()> {
     #[derive(Debug)]
@@ -1041,10 +1142,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { *get_field_ref(2, 3): eq(1), another_field: eq(123) })
+        matches_pattern!(&AStruct { get_field_ref(2, 3): eq(&1), another_field: eq(123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_method_taking_enum_value_param_ret_ref_followed_by_field() -> Result<()> {
     enum AnEnum {
@@ -1067,13 +1167,12 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { *get_field_ref(AnEnum::AVariant): eq(1), another_field: eq(2) })
+        matches_pattern!(&AStruct { get_field_ref(AnEnum::AVariant): eq(&1), another_field: eq(2) })
     )
 }
-
 #[test]
-fn matches_struct_with_a_method_taking_two_parameters_with_trailing_comma_ret_ref_and_field()
--> Result<()> {
+fn matches_struct_with_a_method_taking_two_parameters_with_trailing_comma_ret_ref_and_field(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1090,10 +1189,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { *get_field_ref(2, 3,): eq(1), another_field: eq(123) })
+        matches_pattern!(&AStruct { get_field_ref(2, 3,): eq(&1), another_field: eq(123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method() -> Result<()> {
     #[derive(Debug)]
@@ -1110,9 +1208,11 @@
 
     let actual = AStruct { a_field: 123, another_field: 234 };
 
-    verify_that!(actual, matches_pattern!(AStruct { another_field: eq(234), get_field(): eq(123) }))
+    verify_that!(
+        actual,
+        matches_pattern!(&AStruct { another_field: eq(234), get_field(): eq(123) })
+    )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_with_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -1131,10 +1231,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), get_field(): eq(123), })
+        matches_pattern!(&AStruct { another_field: eq(234), get_field(): eq(123), })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_with_params() -> Result<()> {
     #[derive(Debug)]
@@ -1153,10 +1252,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), add_product_to_field(2, 3): eq(7) })
+        matches_pattern!(&AStruct { another_field: eq(234), add_product_to_field(2, 3): eq(7) })
     )
 }
-
 #[test]
 fn matches_struct_with_field_followed_by_method_taking_enum_value_param() -> Result<()> {
     enum AnEnum {
@@ -1179,10 +1277,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(2), get_field(AnEnum::AVariant): eq(1) })
+        matches_pattern!(&AStruct { another_field: eq(2), get_field(AnEnum::AVariant): eq(1) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_with_params_and_trailing_comma() -> Result<()> {
     #[derive(Debug)]
@@ -1201,10 +1298,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), add_product_to_field(2, 3,): eq(7) })
+        matches_pattern!(&AStruct { another_field: eq(234), add_product_to_field(2, 3,): eq(7) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_returning_reference() -> Result<()> {
     #[derive(Debug)]
@@ -1223,10 +1319,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), *get_field_ref(): eq(123) })
+        matches_pattern!(&AStruct { another_field: eq(234), get_field_ref(): eq(&123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_returning_ref_and_trailing_comma() -> Result<()>
 {
@@ -1246,10 +1341,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), *get_field_ref(): eq(123), })
+        matches_pattern!(&AStruct { another_field: eq(234), get_field_ref(): eq(&123), })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_with_params_ret_ref() -> Result<()> {
     #[derive(Debug)]
@@ -1268,10 +1362,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), *get_field_ref(2, 3): eq(123) })
+        matches_pattern!(&AStruct { another_field: eq(234), get_field_ref(2, 3): eq(&123) })
     )
 }
-
 #[test]
 fn matches_struct_with_field_followed_by_method_taking_enum_value_param_ret_ref() -> Result<()> {
     enum AnEnum {
@@ -1294,13 +1387,12 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(2), *get_field_ref(AnEnum::AVariant): eq(1) })
+        matches_pattern!(&AStruct { another_field: eq(2), get_field_ref(AnEnum::AVariant): eq(&1) })
     )
 }
-
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_with_params_and_trailing_comma_ret_ref()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_with_params_and_trailing_comma_ret_ref(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1317,10 +1409,9 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct { another_field: eq(234), *get_field_ref(2, 3,): eq(123) })
+        matches_pattern!(&AStruct { another_field: eq(234), get_field_ref(2, 3,): eq(&123) })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_followed_by_a_field() -> Result<()> {
     #[derive(Debug)]
@@ -1340,17 +1431,16 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
             get_field(): eq(123),
             a_third_field: eq(345)
         })
     )
 }
-
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_followed_by_a_field_with_trailing_comma()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_followed_by_a_field_with_trailing_comma(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1368,14 +1458,13 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
             get_field(): eq(123),
             a_third_field: eq(345),
         })
     )
 }
-
 #[test]
 fn matches_struct_with_a_field_followed_by_a_method_with_params_followed_by_a_field() -> Result<()>
 {
@@ -1396,7 +1485,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
             add_product_to_field(2, 3): eq(7),
             a_third_field: eq(345),
@@ -1405,8 +1494,8 @@
 }
 
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_with_params_and_trailing_comma_followed_by_a_field()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_with_params_and_trailing_comma_followed_by_a_field(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1424,7 +1513,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
             add_product_to_field(2, 3,): eq(7),
             a_third_field: eq(345),
@@ -1433,8 +1522,8 @@
 }
 
 #[test]
-fn matches_struct_with_field_followed_by_method_taking_enum_value_param_followed_by_field()
--> Result<()> {
+fn matches_struct_with_field_followed_by_method_taking_enum_value_param_followed_by_field(
+) -> Result<()> {
     enum AnEnum {
         AVariant,
     }
@@ -1456,7 +1545,7 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(2),
             get_field(AnEnum::AVariant): eq(1),
             a_third_field: eq(3),
@@ -1483,17 +1572,17 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
-            *get_field_ref(): eq(123),
+            get_field_ref(): eq(&123),
             a_third_field: eq(345)
         })
     )
 }
 
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_ret_ref_followed_by_a_field_with_trailing_comma()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_ret_ref_followed_by_a_field_with_trailing_comma(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1511,17 +1600,17 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
-            *get_field_ref(): eq(123),
+            get_field_ref(): eq(&123),
             a_third_field: eq(345),
         })
     )
 }
 
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_with_params_ret_ref_followed_by_a_field()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_with_params_ret_ref_followed_by_a_field(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1539,17 +1628,17 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
-            *get_field_ref(2, 3): eq(123),
+            get_field_ref(2, 3): eq(&123),
             a_third_field: eq(345),
         })
     )
 }
 
 #[test]
-fn matches_struct_with_field_followed_by_method_taking_enum_value_param_ret_ref_followed_by_field()
--> Result<()> {
+fn matches_struct_with_field_followed_by_method_taking_enum_value_param_ret_ref_followed_by_field(
+) -> Result<()> {
     enum AnEnum {
         AVariant,
     }
@@ -1571,17 +1660,17 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(2),
-            *get_field_ref(AnEnum::AVariant): eq(1),
+            get_field_ref(AnEnum::AVariant): eq(&1),
             a_third_field: eq(3),
         })
     )
 }
 
 #[test]
-fn matches_struct_with_a_field_followed_by_a_method_with_params_trailing_comma_ret_ref_followed_by_a_field()
--> Result<()> {
+fn matches_struct_with_a_field_followed_by_a_method_with_params_trailing_comma_ret_ref_followed_by_a_field(
+) -> Result<()> {
     #[derive(Debug)]
     struct AStruct {
         a_field: u32,
@@ -1599,10 +1688,129 @@
 
     verify_that!(
         actual,
-        matches_pattern!(AStruct {
+        matches_pattern!(&AStruct {
             another_field: eq(234),
-            *get_field_ref(2, 3,): eq(123),
+            get_field_ref(2, 3,): eq(&123),
             a_third_field: eq(345),
         })
     )
 }
+
+#[test]
+fn matches_struct_field_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct {
+        a_field: u32,
+    }
+
+    let actual = AStruct { a_field: 123 };
+
+    verify_that!(actual, matches_pattern!(&AStruct { a_field: eq(123) }))
+}
+
+#[test]
+fn matches_struct_field_non_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct {
+        a_field: String,
+    }
+
+    let actual = AStruct { a_field: "123".into() };
+
+    verify_that!(
+        actual,
+        matches_pattern!(&AStruct {
+            a_field: ref eq("123"),
+        })
+    )
+}
+
+#[test]
+fn matches_copy_struct_field_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct AStruct {
+        a_field: i32,
+    }
+
+    let actual = AStruct { a_field: 123 };
+
+    verify_that!(actual, matches_pattern!(AStruct { a_field: eq(123) }))
+}
+
+#[test]
+fn matches_struct_property_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct;
+
+    impl AStruct {
+        fn prop(&self) -> i32 {
+            123
+        }
+    }
+
+    let actual = AStruct;
+
+    verify_that!(actual, matches_pattern!(&AStruct { prop(): eq(123) }))
+}
+
+#[test]
+fn matches_struct_property_non_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct AStruct;
+
+    impl AStruct {
+        fn prop(&self) -> String {
+            "123".into()
+        }
+    }
+
+    let actual = AStruct;
+
+    verify_that!(actual, matches_pattern!(&AStruct { prop(): ref eq("123") }))
+}
+
+#[test]
+fn matches_copy_struct_property_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct AStruct;
+
+    impl AStruct {
+        fn prop(self) -> i32 {
+            123
+        }
+    }
+
+    let actual = AStruct;
+
+    verify_that!(actual, matches_pattern!(AStruct { prop(): eq(123) }))
+}
+
+#[test]
+fn matches_copy_struct_property_non_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct AStruct;
+
+    impl AStruct {
+        fn prop(self) -> String {
+            "123".into()
+        }
+    }
+    let actual = AStruct;
+
+    verify_that!(actual, matches_pattern!(AStruct { prop(): ref eq("123") }))
+}
+
+#[test]
+fn matches_struct_auto_eq() -> Result<()> {
+    #[derive(Debug, Clone)]
+    struct AStruct {
+        int: i32,
+        string: String,
+        option: Option<i32>,
+    }
+
+    verify_that!(
+        AStruct { int: 123, string: "123".into(), option: Some(123) },
+        matches_pattern!(&AStruct { int: 123, string: ref "123", option: Some(123) })
+    )
+}

crates/googletest/tests/no_color_test.rs

diff --git a/crates/googletest/tests/no_color_test.rs b/crates/googletest/tests/no_color_test.rs
index f307890..84e4cad 100644
--- a/crates/googletest/tests/no_color_test.rs
+++ b/crates/googletest/tests/no_color_test.rs
@@ -12,10 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![cfg(feature = "supports-color")]
-
 use googletest::prelude::*;
-use indoc::indoc;
 use std::fmt::{Display, Write};
 
 // Make a long text with each element of the iterator on one line.
@@ -35,20 +32,19 @@
     std::env::set_var("NO_COLOR", "1");
     std::env::set_var("FORCE_COLOR", "1");
 
-    let result = verify_that!(build_text(1..50), eq(build_text(1..51)));
+    let result = verify_that!(build_text(1..50), eq(&build_text(1..51)));
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(indoc! {
+        err(displays_as(contains_substring(
             "
-
-            Difference(-actual / +expected):
-             1
-             2
-             <---- 45 common lines omitted ---->
-             48
-             49
-            +50"
-        })))
+  Difference(-actual / +expected):
+   1
+   2
+   <---- 45 common lines omitted ---->
+   48
+   49
+  +50"
+        )))
     )
 }

crates/googletest/tests/pointwise_matcher_test.rs

diff --git a/crates/googletest/tests/pointwise_matcher_test.rs b/crates/googletest/tests/pointwise_matcher_test.rs
index cb8ef3b..b7fd7c5 100644
--- a/crates/googletest/tests/pointwise_matcher_test.rs
+++ b/crates/googletest/tests/pointwise_matcher_test.rs
@@ -18,44 +18,64 @@
 #[test]
 fn pointwise_matches_single_element() -> Result<()> {
     let value = vec![1];
-    verify_that!(value, pointwise!(lt, vec![2]))
+    verify_that!(value, pointwise!(lt, vec![&2]))
 }
 
 #[test]
 fn pointwise_matches_two_elements() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, pointwise!(lt, vec![2, 3]))
+    verify_that!(value, pointwise!(|x| points_to(lt(x)), vec![2, 3]))
+}
+
+#[test]
+fn pointwise_matches_iterator_returning_by_value() -> Result<()> {
+    #[derive(Clone, Copy, Debug)]
+    struct Countdown(i32);
+    impl Iterator for Countdown {
+        type Item = i32;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            match self.0 {
+                0 => None,
+                x => {
+                    self.0 -= 1;
+                    Some(x)
+                }
+            }
+        }
+    }
+    verify_that!(Countdown(3), pointwise!(eq, vec![3, 2, 1]))
 }
 
 #[test]
 fn pointwise_matches_two_elements_with_array() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, pointwise!(lt, [2, 3]))
+    verify_that!(value, pointwise!(lt, [&2, &3]))
 }
 
 #[test]
 fn pointwise_matches_two_element_slice() -> Result<()> {
     let value = vec![1, 2];
     let slice = value.as_slice();
-    verify_that!(*slice, pointwise!(lt, [2, 3]))
+    verify_that!(slice, pointwise!(lt, [&2, &3]))
 }
 
 #[test]
 fn pointwise_does_not_match_value_of_wrong_length() -> Result<()> {
     let value = vec![1];
-    verify_that!(value, not(pointwise!(lt, vec![2, 3])))
+    verify_that!(value, not(pointwise!(lt, vec![&2, &3])))
 }
 
 #[test]
 fn pointwise_does_not_match_value_not_matching_in_first_position() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, not(pointwise!(lt, vec![1, 3])))
+    verify_that!(value, not(pointwise!(lt, vec![&1, &3])))
 }
 
 #[test]
 fn pointwise_does_not_match_value_not_matching_in_second_position() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, not(pointwise!(lt, vec![2, 2])))
+    verify_that!(value, not(pointwise!(lt, vec![&2, &2])))
 }
 
 #[test]
@@ -64,12 +84,12 @@
         pub(super) use super::lt;
     }
     let value = vec![1];
-    verify_that!(value, pointwise!(submodule::lt, vec![2]))
+    verify_that!(value, pointwise!(submodule::lt, vec![&2]))
 }
 
 #[test]
 fn pointwise_returns_mismatch_when_actual_value_has_wrong_length() -> Result<()> {
-    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![1, 2]));
+    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![&1, &2]));
 
     verify_that!(
         result,
@@ -88,7 +108,7 @@
 
 #[test]
 fn pointwise_returns_mismatch_when_actual_value_does_not_match_on_first_item() -> Result<()> {
-    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![2, 2, 3]));
+    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![&2, &2, &3]));
 
     verify_that!(
         result,
@@ -108,7 +128,7 @@
 
 #[test]
 fn pointwise_returns_mismatch_when_actual_value_does_not_match_on_second_item() -> Result<()> {
-    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![1, 3, 3]));
+    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, &vec![1, 3, 3]));
 
     verify_that!(
         result,
@@ -127,9 +147,9 @@
 }
 
 #[test]
-fn pointwise_returns_mismatch_when_actual_value_does_not_match_on_first_and_second_items()
--> Result<()> {
-    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, vec![2, 3, 3]));
+fn pointwise_returns_mismatch_when_actual_value_does_not_match_on_first_and_second_items(
+) -> Result<()> {
+    let result = verify_that!(vec![1, 2, 3], pointwise!(eq, &vec![2, 3, 3]));
 
     verify_that!(
         result,
@@ -150,21 +170,21 @@
 
 #[test]
 fn pointwise_matches_single_element_with_lambda_expression_with_extra_value() -> Result<()> {
-    let value = vec![1.00001f32];
+    let value = [1.00001f32];
     verify_that!(value, pointwise!(|v| near(v, 0.0001), vec![1.0]))
 }
 
 #[test]
 fn pointwise_matches_single_element_with_two_containers() -> Result<()> {
-    let value = vec![1.00001f32];
+    let value = [1.00001f32];
     verify_that!(value, pointwise!(near, vec![1.0], vec![0.0001]))
 }
 
 #[test]
 fn pointwise_matches_single_element_with_three_containers() -> Result<()> {
-    let value = vec![1.00001f32];
+    let value = [1.00001f32];
     verify_that!(
         value,
-        pointwise!(|v, t, u| near(v, t * u), vec![1.0f32], vec![0.0001f32], vec![0.5f32])
+        pointwise!(|v, t, u| near(v, t + u), vec![1.0f32], vec![0.0001f32], vec![0.5f32])
     )
 }

crates/googletest/tests/property_matcher_test.rs

diff --git a/crates/googletest/tests/property_matcher_test.rs b/crates/googletest/tests/property_matcher_test.rs
index 7092446..3c9043d 100644
--- a/crates/googletest/tests/property_matcher_test.rs
+++ b/crates/googletest/tests/property_matcher_test.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::{Matcher, MatcherResult};
+use googletest::matcher::MatcherResult;
 use googletest::prelude::*;
 
 #[derive(Debug)]
@@ -41,33 +41,25 @@
 #[test]
 fn matches_struct_with_matching_property() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(SomeStruct.get_property(), eq(10)))
+    verify_that!(value, property!(&SomeStruct.get_property(), eq(10)))
 }
 
 #[test]
 fn matches_struct_with_matching_property_with_parameters() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(SomeStruct.add_product_to_field(2, 3), eq(16)))
-}
-
-#[test]
-fn matches_struct_with_matching_property_with_captured_arguments() -> Result<()> {
-    let value = SomeStruct { a_property: 10 };
-    let arg1 = 2;
-    let arg2 = 3;
-    verify_that!(value, property!(SomeStruct.add_product_to_field(arg1, arg2), eq(16)))
+    verify_that!(value, property!(&SomeStruct.add_product_to_field(2, 3), eq(16)))
 }
 
 #[test]
 fn matches_struct_with_matching_property_with_parameters_with_trailing_comma() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(SomeStruct.add_product_to_field(2, 3,), eq(16)))
+    verify_that!(value, property!(&SomeStruct.add_product_to_field(2, 3,), eq(16)))
 }
 
 #[test]
 fn matches_struct_with_matching_property_ref() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(*SomeStruct.get_property_ref(), eq(10)))
+    verify_that!(value, property!(&SomeStruct.get_property_ref(), eq(&10)))
 }
 
 #[test]
@@ -82,7 +74,7 @@
         }
     }
     let value = StructWithString { property: "Something".into() };
-    verify_that!(value, property!(*StructWithString.get_property_ref(), eq("Something")))
+    verify_that!(value, property!(&StructWithString.get_property_ref(), eq("Something")))
 }
 
 #[test]
@@ -97,31 +89,31 @@
         }
     }
     let value = StructWithVec { property: vec![1, 2, 3] };
-    verify_that!(value, property!(*StructWithVec.get_property_ref(), eq([1, 2, 3])))
+    verify_that!(value, property!(&StructWithVec.get_property_ref(), eq([1, 2, 3])))
 }
 
 #[test]
 fn matches_struct_with_matching_property_ref_with_parameters() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(*SomeStruct.get_property_ref_with_params(2, 3), eq(10)))
+    verify_that!(value, property!(&SomeStruct.get_property_ref_with_params(2, 3), eq(&10)))
 }
 
 #[test]
 fn matches_struct_with_matching_property_ref_with_parameters_and_trailing_comma() -> Result<()> {
     let value = SomeStruct { a_property: 10 };
-    verify_that!(value, property!(*SomeStruct.get_property_ref_with_params(2, 3,), eq(10)))
+    verify_that!(value, property!(&SomeStruct.get_property_ref_with_params(2, 3,), eq(&10)))
 }
 
 #[test]
 fn does_not_match_struct_with_non_matching_property() -> Result<()> {
     let value = SomeStruct { a_property: 2 };
-    verify_that!(value, not(property!(SomeStruct.get_property(), eq(1))))
+    verify_that!(value, not(property!(&SomeStruct.get_property(), eq(1))))
 }
 
 #[test]
 fn describes_itself_in_matching_case() -> Result<()> {
     verify_that!(
-        property!(SomeStruct.get_property(), eq(1)).describe(MatcherResult::Match),
+        property!(&SomeStruct.get_property(), eq(1)).describe(MatcherResult::Match),
         displays_as(eq("has property `get_property()`, which is equal to 1"))
     )
 }
@@ -129,20 +121,44 @@
 #[test]
 fn describes_itself_in_not_matching_case() -> Result<()> {
     verify_that!(
-        property!(SomeStruct.get_property(), eq(1)).describe(MatcherResult::NoMatch),
+        property!(&SomeStruct.get_property(), eq(1)).describe(MatcherResult::NoMatch),
         displays_as(eq("has property `get_property()`, which isn't equal to 1"))
     )
 }
 
 #[test]
 fn explains_mismatch_referencing_explanation_of_inner_matcher() -> Result<()> {
+    #[derive(Debug)]
+    struct SomeStruct;
+
     impl SomeStruct {
         fn get_a_collection(&self) -> Vec<u32> {
             vec![]
         }
     }
-    let value = SomeStruct { a_property: 2 };
-    let result = verify_that!(value, property!(SomeStruct.get_a_collection(), container_eq([1])));
+    let value = SomeStruct;
+    let result =
+        verify_that!(value, property!(&SomeStruct.get_a_collection(), ref container_eq([1])));
+
+    verify_that!(
+        result,
+        err(displays_as(contains_substring(
+            "whose property `get_a_collection()` is `[]`, which is missing the element 1"
+        )))
+    )
+}
+
+#[test]
+fn explains_mismatch_referencing_explanation_of_inner_matcher_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct SomeStruct;
+    impl SomeStruct {
+        fn get_a_collection(&self) -> Vec<u32> {
+            vec![]
+        }
+    }
+    let result =
+        verify_that!(SomeStruct, property!(SomeStruct.get_a_collection(), container_eq([1])));
 
     verify_that!(
         result,
@@ -155,7 +171,7 @@
 #[test]
 fn describes_itself_in_matching_case_for_ref() -> Result<()> {
     verify_that!(
-        property!(*SomeStruct.get_property_ref(), eq(1)).describe(MatcherResult::Match),
+        property!(&SomeStruct.get_property_ref(), eq(&1)).describe(MatcherResult::Match),
         displays_as(eq("has property `get_property_ref()`, which is equal to 1"))
     )
 }
@@ -163,7 +179,7 @@
 #[test]
 fn describes_itself_in_not_matching_case_for_ref() -> Result<()> {
     verify_that!(
-        property!(*SomeStruct.get_property_ref(), eq(1)).describe(MatcherResult::NoMatch),
+        property!(&SomeStruct.get_property_ref(), eq(&1)).describe(MatcherResult::NoMatch),
         displays_as(eq("has property `get_property_ref()`, which isn't equal to 1"))
     )
 }
@@ -171,14 +187,16 @@
 #[test]
 fn explains_mismatch_referencing_explanation_of_inner_matcher_for_ref() -> Result<()> {
     static EMPTY_COLLECTION: Vec<u32> = vec![];
+    #[derive(Debug)]
+    struct SomeStruct;
     impl SomeStruct {
         fn get_a_collection_ref(&self) -> &[u32] {
             &EMPTY_COLLECTION
         }
     }
-    let value = SomeStruct { a_property: 2 };
+    let value = SomeStruct;
     let result =
-        verify_that!(value, property!(*SomeStruct.get_a_collection_ref(), container_eq([1])));
+        verify_that!(value, property!(&SomeStruct.get_a_collection_ref(), container_eq([1])));
 
     verify_that!(
         result,
@@ -187,3 +205,94 @@
         )))
     )
 }
+
+#[test]
+fn matches_copy_to_copy() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct Struct;
+    impl Struct {
+        fn property(self) -> i32 {
+            32
+        }
+    }
+
+    verify_that!(Struct, property!(Struct.property(), eq(32)))
+}
+
+#[test]
+fn matches_copy_to_ref() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct Struct;
+    impl Struct {
+        fn property(self) -> String {
+            "something".into()
+        }
+    }
+
+    verify_that!(Struct, property!(Struct.property(), ref eq("something")))
+}
+
+#[test]
+fn matches_copy_but_by_ref() -> Result<()> {
+    #[derive(Debug, Clone, Copy)]
+    struct Struct;
+    impl Struct {
+        fn property(&self) -> String {
+            "something".into()
+        }
+    }
+
+    verify_that!(&Struct, property!(&Struct.property(), ref eq("something")))
+}
+
+#[test]
+fn matches_ref_to_ref() -> Result<()> {
+    #[derive(Debug)]
+    struct Struct;
+    impl Struct {
+        fn property(&self) -> String {
+            "something".into()
+        }
+    }
+
+    verify_that!(Struct, property!(&Struct.property(), ref eq("something")))
+}
+
+#[test]
+fn matches_ref_to_copy() -> Result<()> {
+    #[derive(Debug)]
+    struct Struct;
+    impl Struct {
+        fn property(&self) -> i32 {
+            32
+        }
+    }
+
+    verify_that!(Struct, property!(&Struct.property(), eq(32)))
+}
+
+#[test]
+fn matches_ref_to_ref_with_binding_mode() -> Result<()> {
+    #[derive(Debug)]
+    struct Struct;
+    impl Struct {
+        fn property(&self) -> String {
+            "something".into()
+        }
+    }
+
+    verify_that!(Struct, property!(Struct.property(), eq("something")))
+}
+
+#[test]
+fn matches_property_auto_eq() -> Result<()> {
+    #[derive(Debug)]
+    struct Struct;
+    impl Struct {
+        fn property(&self) -> String {
+            "something".into()
+        }
+    }
+
+    verify_that!(Struct, property!(Struct.property(), "something"))
+}

crates/googletest/tests/tuple_matcher_test.rs

diff --git a/crates/googletest/tests/tuple_matcher_test.rs b/crates/googletest/tests/tuple_matcher_test.rs
index a93ffee..a19e6fd 100644
--- a/crates/googletest/tests/tuple_matcher_test.rs
+++ b/crates/googletest/tests/tuple_matcher_test.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::{Matcher, MatcherResult};
+use googletest::matcher::MatcherResult;
 use googletest::prelude::*;
 use indoc::indoc;
 
@@ -22,6 +22,12 @@
 }
 
 #[test]
+fn empty_matcher_matches_empty_tuple_reference() -> Result<()> {
+    let a_ok: std::result::Result<(), String> = Ok(()); // Non copy
+    verify_that!(a_ok, ok(()))
+}
+
+#[test]
 fn singleton_matcher_matches_matching_singleton_tuple() -> Result<()> {
     verify_that!((123,), (eq(123),))
 }
@@ -176,7 +182,7 @@
 #[test]
 fn tuple_matcher_1_has_correct_description_for_match() -> Result<()> {
     verify_that!(
-        (eq::<i32, _>(1),).describe(MatcherResult::Match),
+        Matcher::<(i32,)>::describe(&(eq(1),), MatcherResult::Match),
         displays_as(eq(indoc!(
             "
             is a tuple whose values respectively match:
@@ -188,7 +194,7 @@
 #[test]
 fn tuple_matcher_1_has_correct_description_for_mismatch() -> Result<()> {
     verify_that!(
-        (eq::<i32, _>(1),).describe(MatcherResult::NoMatch),
+        Matcher::<(i32,)>::describe(&(eq(1),), MatcherResult::NoMatch),
         displays_as(eq(indoc!(
             "
             is a tuple whose values do not respectively match:
@@ -200,7 +206,7 @@
 #[test]
 fn tuple_matcher_2_has_correct_description_for_match() -> Result<()> {
     verify_that!(
-        (eq::<i32, _>(1), eq::<i32, _>(2)).describe(MatcherResult::Match),
+        Matcher::<(i32, i32)>::describe(&(eq(1), eq(2)), MatcherResult::Match),
         displays_as(eq(indoc!(
             "
             is a tuple whose values respectively match:
@@ -213,7 +219,7 @@
 #[test]
 fn tuple_matcher_2_has_correct_description_for_mismatch() -> Result<()> {
     verify_that!(
-        (eq::<i32, _>(1), eq::<i32, _>(2)).describe(MatcherResult::NoMatch),
+        Matcher::<(i32, i32)>::describe(&(eq(1), eq(2)), MatcherResult::NoMatch),
         displays_as(eq(indoc!(
             "
             is a tuple whose values do not respectively match:
@@ -226,7 +232,7 @@
 #[test]
 fn describe_match_shows_which_tuple_element_did_not_match() -> Result<()> {
     verify_that!(
-        (eq(1), eq(2)).explain_match(&(1, 3)),
+        (eq(1), eq(2)).explain_match((1, 3)),
         displays_as(eq(indoc!(
             "
             which
@@ -242,7 +248,7 @@
 #[test]
 fn describe_match_shows_which_two_tuple_elements_did_not_match() -> Result<()> {
     verify_that!(
-        (eq(1), eq(2)).explain_match(&(2, 3)),
+        (eq(1), eq(2)).explain_match((2, 3)),
         displays_as(eq(indoc!(
             "
             which

crates/googletest/tests/unordered_elements_are_matcher_test.rs

diff --git a/crates/googletest/tests/unordered_elements_are_matcher_test.rs b/crates/googletest/tests/unordered_elements_are_matcher_test.rs
index bd61417..0678b0c 100644
--- a/crates/googletest/tests/unordered_elements_are_matcher_test.rs
+++ b/crates/googletest/tests/unordered_elements_are_matcher_test.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 use std::collections::HashMap;
@@ -32,20 +31,40 @@
 #[test]
 fn unordered_elements_are_matches_vector() -> Result<()> {
     let value = vec![1, 2, 3];
-    verify_that!(value, unordered_elements_are![eq(1), eq(2), eq(3)])
+    verify_that!(value, unordered_elements_are![eq(&1), eq(&2), eq(&3)])
+}
+
+#[test]
+fn unordered_elements_are_matches_iterator_returning_by_value() -> Result<()> {
+    #[derive(Debug, Copy, Clone)]
+    struct Countdown(i32);
+    impl Iterator for Countdown {
+        type Item = i32;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            match self.0 {
+                0 => None,
+                x => {
+                    self.0 -= 1;
+                    Some(x)
+                }
+            }
+        }
+    }
+    verify_that!(Countdown(3), unordered_elements_are![eq(1), eq(2), eq(3)])
 }
 
 #[test]
 fn unordered_elements_are_omitted() -> Result<()> {
     let value = vec![1, 2, 3];
-    verify_that!(value, {eq(3), eq(2), eq(1)})
+    verify_that!(value, {eq(&3), eq(&2), eq(&1)})
 }
 
 #[test]
 fn unordered_elements_are_matches_slice() -> Result<()> {
     let value = vec![1, 2, 3];
     let slice = value.as_slice();
-    verify_that!(*slice, unordered_elements_are![eq(1), eq(2), eq(3)])
+    verify_that!(slice, unordered_elements_are![eq(&1), eq(&2), eq(&3)])
 }
 
 #[test]
@@ -53,7 +72,7 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Three")]);
     verify_that!(
         value,
-        unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))]
+        unordered_elements_are![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One")), (eq(&3), eq(&"Three"))]
     )
 }
 
@@ -62,7 +81,7 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Three")]);
     verify_that!(
         value,
-        unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three")),]
+        unordered_elements_are![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One")), (eq(&3), eq(&"Three")),]
     )
 }
 
@@ -71,7 +90,11 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (4, "Three")]);
     verify_that!(
         value,
-        not(unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))])
+        not(unordered_elements_are![
+            (eq(&2), eq(&"Two")),
+            (eq(&1), eq(&"One")),
+            (eq(&3), eq(&"Three"))
+        ])
     )
 }
 
@@ -80,7 +103,11 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Four")]);
     verify_that!(
         value,
-        not(unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))])
+        not(unordered_elements_are![
+            (eq(&2), eq(&"Two")),
+            (eq(&1), eq(&"One")),
+            (eq(&3), eq(&"Three"))
+        ])
     )
 }
 
@@ -89,14 +116,18 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two")]);
     verify_that!(
         value,
-        not(unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))])
+        not(unordered_elements_are![
+            (eq(&2), eq(&"Two")),
+            (eq(&1), eq(&"One")),
+            (eq(&3), eq(&"Three"))
+        ])
     )
 }
 
 #[test]
 fn unordered_elements_are_does_not_match_hash_map_with_extra_element() -> Result<()> {
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Three")]);
-    verify_that!(value, not(unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One"))]))
+    verify_that!(value, not(unordered_elements_are![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One"))]))
 }
 
 #[test]
@@ -104,20 +135,24 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Three"), (3, "Two")]);
     verify_that!(
         value,
-        not(unordered_elements_are![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))])
+        not(unordered_elements_are![
+            (eq(&2), eq(&"Two")),
+            (eq(&1), eq(&"One")),
+            (eq(&3), eq(&"Three"))
+        ])
     )
 }
 
 #[test]
 fn unordered_elements_are_matches_vector_with_trailing_comma() -> Result<()> {
     let value = vec![1, 2, 3];
-    verify_that!(value, unordered_elements_are![eq(1), eq(2), eq(3),])
+    verify_that!(value, unordered_elements_are![eq(&1), eq(&2), eq(&3),])
 }
 
 #[test]
 fn unordered_elements_are_matches_size() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, not(unordered_elements_are![eq(1), eq(2), eq(3)]))
+    verify_that!(value, not(unordered_elements_are![eq(&1), eq(&2), eq(&3)]))
 }
 
 #[test]
@@ -125,7 +160,7 @@
     #[derive(Debug, PartialEq)]
     struct AStruct(i32);
     let expected_value = AStruct(123);
-    verify_that!(vec![AStruct(123)], unordered_elements_are![eq_deref_of(&expected_value)])
+    verify_that!(vec![AStruct(123)], unordered_elements_are![eq(&expected_value)])
 }
 
 #[test]
@@ -135,13 +170,13 @@
     let expected_value = AStruct(123);
     verify_that!(
         HashMap::from([(1, AStruct(123))]),
-        unordered_elements_are![(eq(1), eq_deref_of(&expected_value))]
+        unordered_elements_are![(eq(&1), eq(&expected_value))]
     )
 }
 
 #[test]
 fn unordered_elements_are_description_mismatch() -> Result<()> {
-    let result = verify_that!(vec![1, 4, 3], unordered_elements_are![eq(1), eq(2), eq(3)]);
+    let result = verify_that!(vec![1, 4, 3], unordered_elements_are![eq(&1), eq(&2), eq(&3)]);
     verify_that!(
         result,
         err(displays_as(contains_substring(indoc!(
@@ -160,27 +195,29 @@
 #[test]
 fn unordered_elements_are_matches_unordered() -> Result<()> {
     let value = vec![1, 2];
-    verify_that!(value, unordered_elements_are![eq(2), eq(1)])
+    verify_that!(value, unordered_elements_are![eq(&2), eq(&1)])
 }
 
 #[test]
 fn unordered_elements_are_matches_unordered_with_repetition() -> Result<()> {
     let value = vec![1, 2, 1, 2, 1];
-    verify_that!(value, unordered_elements_are![eq(1), eq(1), eq(1), eq(2), eq(2)])
+    verify_that!(value, unordered_elements_are![eq(&1), eq(&1), eq(&1), eq(&2), eq(&2)])
 }
 
 #[test]
 fn unordered_elements_are_explains_mismatch_due_to_wrong_size() -> Result<()> {
+    let matcher = unordered_elements_are![eq(&2), eq(&3), eq(&4)];
     verify_that!(
-        unordered_elements_are![eq(2), eq(3), eq(4)].explain_match(&vec![2, 3]),
+        matcher.explain_match(&vec![2, 3]),
         displays_as(eq("which has size 2 (expected 3)"))
     )
 }
 
 #[test]
 fn unordered_elements_are_description_no_full_match() -> Result<()> {
+    let matcher = unordered_elements_are![eq(&1), eq(&2), eq(&2)];
     verify_that!(
-        unordered_elements_are![eq(1), eq(2), eq(2)].explain_match(&vec![1, 1, 2]),
+        matcher.explain_match(&vec![1, 1, 2]),
         displays_as(eq(indoc!(
             "
             which does not have a perfect match with the expected elements. The best match found was:
@@ -194,22 +231,24 @@
 
 #[test]
 fn unordered_elements_are_unmatchable_expected_description_mismatch() -> Result<()> {
+    let matcher = unordered_elements_are![eq(&1), eq(&2), eq(&3)];
     verify_that!(
-        unordered_elements_are![eq(1), eq(2), eq(3)].explain_match(&vec![1, 1, 3]),
+        matcher.explain_match(&vec![1, 1, 3]),
         displays_as(eq("which has no element matching the expected element #1"))
     )
 }
 
 #[test]
 fn unordered_elements_are_unmatchable_actual_description_mismatch() -> Result<()> {
+    let matcher = unordered_elements_are![eq(&1), eq(&1), eq(&3)];
     verify_that!(
-        unordered_elements_are![eq(1), eq(1), eq(3)].explain_match(&vec![1, 2, 3]),
+        matcher.explain_match(&vec![1, 2, 3]),
         displays_as(eq("whose element #1 does not match any expected elements"))
     )
 }
 
-fn create_matcher() -> impl Matcher<ActualT = Vec<i32>> {
-    unordered_elements_are![eq(1)]
+fn create_matcher<'a>() -> impl Matcher<&'a Vec<i32>> {
+    unordered_elements_are![eq(&1)]
 }
 
 #[test]
@@ -217,8 +256,8 @@
     verify_that!(vec![1], create_matcher())
 }
 
-fn create_matcher_for_map() -> impl Matcher<ActualT = HashMap<i32, i32>> {
-    unordered_elements_are![(eq(1), eq(1))]
+fn create_matcher_for_map<'a>() -> impl Matcher<&'a HashMap<i32, i32>> {
+    unordered_elements_are![(eq(&1), eq(&1))]
 }
 
 #[test]
@@ -228,24 +267,24 @@
 
 #[test]
 fn contains_each_matches_when_one_to_one_correspondence_present() -> Result<()> {
-    verify_that!(vec![2, 3, 4], contains_each!(eq(2), eq(3), eq(4)))
+    verify_that!(vec![2, 3, 4], contains_each!(eq(&2), eq(&3), eq(&4)))
 }
 
 #[test]
 fn contains_each_supports_trailing_comma() -> Result<()> {
-    verify_that!(vec![2, 3, 4], contains_each!(eq(2), eq(3), eq(4),))
+    verify_that!(vec![2, 3, 4], contains_each!(eq(&2), eq(&3), eq(&4),))
 }
 
 #[test]
 fn contains_each_matches_hash_map() -> Result<()> {
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Three")]);
-    verify_that!(value, contains_each![(eq(2), eq("Two")), (eq(1), eq("One"))])
+    verify_that!(value, contains_each![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One"))])
 }
 
 #[test]
 fn contains_each_matches_hash_map_with_trailing_comma() -> Result<()> {
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two"), (3, "Three")]);
-    verify_that!(value, contains_each![(eq(2), eq("Two")), (eq(1), eq("One")),])
+    verify_that!(value, contains_each![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One")),])
 }
 
 #[test]
@@ -265,42 +304,46 @@
 
 #[test]
 fn contains_each_matches_when_excess_elements_present() -> Result<()> {
-    verify_that!(vec![1, 2, 3, 4], contains_each!(eq(2), eq(3), eq(4)))
+    verify_that!(vec![1, 2, 3, 4], contains_each!(eq(&2), eq(&3), eq(&4)))
 }
 
 #[test]
 fn contains_each_does_not_match_when_matchers_are_unmatched() -> Result<()> {
-    verify_that!(vec![1, 2, 3], not(contains_each!(eq(2), eq(3), eq(4))))
+    verify_that!(vec![1, 2, 3], not(contains_each!(eq(&2), eq(&3), eq(&4))))
 }
 
 #[test]
 fn contains_each_explains_mismatch_due_to_wrong_size() -> Result<()> {
+    let matcher = contains_each![eq(&2), eq(&3), eq(&4)];
     verify_that!(
-        contains_each![eq(2), eq(3), eq(4)].explain_match(&vec![2, 3]),
+        matcher.explain_match(&vec![2, 3]),
         displays_as(eq("which has size 2 (expected at least 3)"))
     )
 }
 
 #[test]
 fn contains_each_explains_missing_element_in_mismatch() -> Result<()> {
+    let matcher = contains_each![eq(&2), eq(&3), eq(&4)];
     verify_that!(
-        contains_each![eq(2), eq(3), eq(4)].explain_match(&vec![1, 2, 3]),
+        matcher.explain_match(&vec![1, 2, 3]),
         displays_as(eq("which has no element matching the expected element #2"))
     )
 }
 
 #[test]
 fn contains_each_explains_missing_elements_in_mismatch() -> Result<()> {
+    let matcher = contains_each![eq(&2), eq(&3), eq(&4), eq(&5)];
     verify_that!(
-        contains_each![eq(2), eq(3), eq(4), eq(5)].explain_match(&vec![0, 1, 2, 3]),
+        matcher.explain_match(&vec![0, 1, 2, 3]),
         displays_as(eq("which has no elements matching the expected elements #2, #3"))
     )
 }
 
 #[test]
 fn contains_each_explains_mismatch_due_to_no_graph_matching_found() -> Result<()> {
+    let matcher = contains_each![ge(&2), ge(&2)];
     verify_that!(
-        contains_each![ge(2), ge(2)].explain_match(&vec![1, 2]),
+        matcher .explain_match(&vec![1, 2]),
         displays_as(eq(indoc!(
             "
             which does not have a superset match with the expected elements. The best match found was:
@@ -324,12 +367,12 @@
 
 #[test]
 fn is_contained_in_matches_when_one_to_one_correspondence_present() -> Result<()> {
-    verify_that!(vec![2, 3, 4], is_contained_in!(eq(2), eq(3), eq(4)))
+    verify_that!(vec![2, 3, 4], is_contained_in!(eq(&2), eq(&3), eq(&4)))
 }
 
 #[test]
 fn is_contained_supports_trailing_comma() -> Result<()> {
-    verify_that!(vec![2, 3, 4], is_contained_in!(eq(2), eq(3), eq(4),))
+    verify_that!(vec![2, 3, 4], is_contained_in!(eq(&2), eq(&3), eq(&4),))
 }
 
 #[test]
@@ -337,7 +380,7 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two")]);
     verify_that!(
         value,
-        is_contained_in![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three"))]
+        is_contained_in![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One")), (eq(&3), eq(&"Three"))]
     )
 }
 
@@ -346,53 +389,57 @@
     let value: HashMap<u32, &'static str> = HashMap::from([(1, "One"), (2, "Two")]);
     verify_that!(
         value,
-        is_contained_in![(eq(2), eq("Two")), (eq(1), eq("One")), (eq(3), eq("Three")),]
+        is_contained_in![(eq(&2), eq(&"Two")), (eq(&1), eq(&"One")), (eq(&3), eq(&"Three")),]
     )
 }
 
 #[test]
 fn is_contained_in_matches_when_container_is_empty() -> Result<()> {
-    verify_that!(vec![], is_contained_in!(eq::<i32, _>(2), eq(3), eq(4)))
+    verify_that!(vec![1; 0], is_contained_in!(eq(&2), eq(&3), eq(&4)))
 }
 
 #[test]
 fn is_contained_in_matches_when_excess_matchers_present() -> Result<()> {
-    verify_that!(vec![3, 4], is_contained_in!(eq(2), eq(3), eq(4)))
+    verify_that!(vec![3, 4], is_contained_in!(eq(&2), eq(&3), eq(&4)))
 }
 
 #[test]
 fn is_contained_in_does_not_match_when_elements_are_unmatched() -> Result<()> {
-    verify_that!(vec![1, 2, 3], not(is_contained_in!(eq(2), eq(3), eq(4))))
+    verify_that!(vec![1, 2, 3], not(is_contained_in!(eq(&2), eq(&3), eq(&4))))
 }
 
 #[test]
 fn is_contained_in_explains_mismatch_due_to_wrong_size() -> Result<()> {
+    let matcher = is_contained_in![eq(&2), eq(&3)];
     verify_that!(
-        is_contained_in![eq(2), eq(3)].explain_match(&vec![2, 3, 4]),
+        matcher.explain_match(&vec![2, 3, 4]),
         displays_as(eq("which has size 3 (expected at most 2)"))
     )
 }
 
 #[test]
 fn is_contained_in_explains_missing_element_in_mismatch() -> Result<()> {
+    let matcher = is_contained_in![eq(&2), eq(&3), eq(&4)];
     verify_that!(
-        is_contained_in![eq(2), eq(3), eq(4)].explain_match(&vec![1, 2, 3]),
+        matcher.explain_match(&vec![1, 2, 3]),
         displays_as(eq("whose element #0 does not match any expected elements"))
     )
 }
 
 #[test]
 fn is_contained_in_explains_missing_elements_in_mismatch() -> Result<()> {
+    let matcher = is_contained_in![eq(&2), eq(&3), eq(&4), eq(&5)];
     verify_that!(
-        is_contained_in![eq(2), eq(3), eq(4), eq(5)].explain_match(&vec![0, 1, 2, 3]),
+        matcher.explain_match(&vec![0, 1, 2, 3]),
         displays_as(eq("whose elements #0, #1 do not match any expected elements"))
     )
 }
 
 #[test]
 fn is_contained_in_explains_mismatch_due_to_no_graph_matching_found() -> Result<()> {
+    let matcher = is_contained_in![ge(&1), ge(&3)];
     verify_that!(
-        is_contained_in![ge(1), ge(3)].explain_match(&vec![1, 2]),
+        matcher.explain_match(&vec![1, 2]),
         displays_as(eq(indoc!(
             "
             which does not have a subset match with the expected elements. The best match found was:
@@ -401,3 +448,18 @@
               Expected element `is greater than or equal to 3` at index 1 did not match any remaining actual element."))
     ))
 }
+
+#[test]
+fn unordered_elements_are_with_auto_eq() -> Result<()> {
+    verify_that!(vec![3, 4, 2], unordered_elements_are![&2, &3, &4])
+}
+
+#[test]
+fn contains_each_with_auto_eq() -> Result<()> {
+    verify_that!(vec![3, 4, 2], contains_each![&2, &4])
+}
+
+#[test]
+fn is_contained_in_with_auto_eq() -> Result<()> {
+    verify_that!(vec![3, 4, 2], is_contained_in![&1, &2, &3, &4])
+}

crates/libz-sys/.android-checksum.json

diff --git a/crates/libz-sys/.android-checksum.json b/crates/libz-sys/.android-checksum.json
index daa158b..ee22bcb 100644
--- a/crates/libz-sys/.android-checksum.json
+++ b/crates/libz-sys/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"8ddb025a55fae448c54f9717a4dfa33375a9193f777c8a547e4f3c612c63867f","Android.bp":"baf1e273a1a280fcd32db46ca9eb367f0aaa08c1c74f69639bd46359f42e2954","Cargo.toml":"b3731a56e4f3cbd8130f37ca4d4a3bbb25913d0c620c978653da3f1d8e90c17f","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"9acbb7b79590c4e57f954f867a8127525e583b3aa55e33d2b413a43c172ae14f","METADATA":"658dd2e0585a1d90efbc05a692525123a923673b4b29e6398286625a5fc3f259","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README-zng.md":"9042e2523fc4aa3801655e41794821b33415fa1a227af280681f8448a7a398db","README.android":"4707eda9b9853468d6af947830a72232157afa13f2fb6ad78a04d7a502d61e57","README.md":"34d3194c8378c9c9e05aa8b481742c540611697b4e04edbfa499709d80ac9be2","TEST_MAPPING":"16dc7654734aa1b0b24e6311107dfd5fc00f51292b2fcf45b2764cfcce3c71c5","build.rs":"d32ea89ee11f4a5171b4b34f9e60af2ccf9223619792a2d4e8e9137d71c979ae","build_zng.rs":"51f13e005858c15773766580866be26ffe8c2caa95c4355d3c1e0a360ce4beb5","cargo_embargo.json":"c3e1f34bad0ee501484da7e2ede9f8be6de2c26b2ae7e9f9bfd8251f6a797db0","patches/readme.patch":"6bf296bb117f72606ba7be2db46bdea6e4401bca977bb09a592d5c514cd7016b","src/lib.rs":"4f2433152b03cbaf2a4fa06747ff8028cbd2f0254eef57074bd8c0f2e04abf2b","src/smoke.c":"4a36cb1d00aaf9ef21958dad2e46a2bdae4e5f309c32bf58b9ac447d3eb189ea","src/zlib-ng/CMakeLists.txt":"287f6dc9d3e0cb49976624d7afb7d579ab3d7d3ac3dd5a31b6b07fa7de884815","src/zlib-ng/FAQ.zlib":"ed4751dd376e305b667ea670ada3942b2be9e35176de7128da30b4e7b8ddc5fb","src/zlib-ng/INDEX.md":"f4c9c1e9a47d1fe11b31c04516576c02496f2f51e3d98afabb1e6c3f9e57c24d","src/zlib-ng/LICENSE.md":"3448c7f3e3dcad953e3f2b794b3e38efd2ab34459bf25b768f4eb00912b51ba1","src/zlib-ng/Makefile.in":"7baafd34667d02f7deac5cb7d80e74b4c9a853496e38670514a11333ec52da8d","src/zlib-ng/PORTING.md":"ba92bff759acfb42bdc9fc2ca9fecda4b0ae101b31baf95915fe33f9327d2b16","src/zlib-ng/README.md":"9d6015427db3f893101be2b4d75a7b634a2116d74055379509243d2dea9557a2","src/zlib-ng/adler32.c":"ee3bdef617d6ee99e5488af67ae30f61623223f8cf243871ad4ae95cff9e21c3","src/zlib-ng/adler32_fold.c":"52a0a0a6465c9d3f22f505d93f86e0d940705779d77681d69d7a08fa547acbd2","src/zlib-ng/adler32_fold.h":"1dd780b64192507f4865eb851bf45675bbcdae6fbd6d166e5897c17be467baee","src/zlib-ng/adler32_p.h":"a02de5e0232c0484785352a85866eaa890dbda22d428debc8d295ff24e0de5cb","src/zlib-ng/arch/arm/Makefile.in":"901dc5b5f03608fcdb0b4fb4fc36bbf011ee1e32219b4a4c428e015e73faa810","src/zlib-ng/arch/arm/adler32_neon.c":"cba8d24c66b2071329864dc0f70f550fe5ed8a20e8667cddbaa1d0274739cf62","src/zlib-ng/arch/arm/arm_features.c":"2bea94b06e05225a7e00233ae4e32c0b0b5dbe23a0c2e91c222016e7eb43f8a8","src/zlib-ng/arch/arm/arm_features.h":"1838855accab2f176844b9a9f2ae781020eb06e9470a5c27462f4da074d6bca6","src/zlib-ng/arch/arm/chunkset_neon.c":"cd6b8643875a8c4a50ab35649920923cffe607f6e8880569097eb31abd601df4","src/zlib-ng/arch/arm/compare256_neon.c":"ce97b3302b410fbb83bdd8d1cd20a6e2d6c3d1db4f0458f406a4fdf3b5486079","src/zlib-ng/arch/arm/crc32_acle.c":"12b1247f6cc0d447f68d89ce70870637ccd5aefcc01f2f7ba8a7a55858ae59d3","src/zlib-ng/arch/arm/ctzl.h":"db2a3eacb6a669fe4bea91322b2cdd7f2b56cedc1f0373aa87be6a1c96c70dd7","src/zlib-ng/arch/arm/insert_string_acle.c":"b217bbb2a54f0a3075423811a1d2becb99a8922dc87f7aacae7ee98af577ea95","src/zlib-ng/arch/arm/slide_hash_neon.c":"2b6674a532cdeb742a5c65ce01eeb6fbab830eaa11b7b3f2a6069167726f97fe","src/zlib-ng/arch/generic/Makefile.in":"9e500d3e917a6b109fdc7f5aef9b6e956a81e9195bb4b4436970140b736d4e5f","src/zlib-ng/arch/power/Makefile.in":"11537645bb1a6c39cd9ab7bd528d09d549a13cf03a02e09b10ef252e492adfbf","src/zlib-ng/arch/power/adler32_power8.c":"44164f93a6f743dab41782f9c909b6dc89ce09259bf6231465fa3e92ec3059f5","src/zlib-ng/arch/power/adler32_vmx.c":"fba39ccbf8083e6abb477af7ae5dab0958e1ae227be8ed314ee8455796cef24e","src/zlib-ng/arch/power/chunkset_power8.c":"7ae44b007a1d663e054e0d7a526be70dbaeeb27d52ddd2ba0bf1faeb89795a00","src/zlib-ng/arch/power/compare256_power9.c":"4b6af5fed4bb8cffb397f8d0d3fad8a757547ca4307f68faf79709a76770604d","src/zlib-ng/arch/power/crc32_constants.h":"9e6ba96e5aa422517a3c96bb928f0c790d36717cd85f3ea8d19ce12f477dab3a","src/zlib-ng/arch/power/crc32_power8.c":"13c15fe75fb3c6854fab478cf886381f946a9ed54777dd705a7cef17a74b59ac","src/zlib-ng/arch/power/fallback_builtins.h":"7a487d45b247f2be1358b8bc9333b624b4796f42bdc782c721299486e9a6dda2","src/zlib-ng/arch/power/power_features.c":"6944eefc280f944f75e2ea68301a1ba9260984fcf5524e7a2e620f8e6869272d","src/zlib-ng/arch/power/power_features.h":"c93bf325b8dcd6c4f53fa5137240993779f164eb9ce4453567e9dd065f59fd70","src/zlib-ng/arch/power/slide_hash_power8.c":"0037144d6c85b2be4bcb6806437d5f273015bf00113fb3ff465c8125aebe8a14","src/zlib-ng/arch/power/slide_hash_vmx.c":"e987465af7bcaea3ddaa1982968e1782b4d7eb7b174a7798774ea469cfefa50b","src/zlib-ng/arch/power/slide_ppc_tpl.h":"050417359e59d3b6d7178d35db032852859dc6a729878a0a9b1cf791017cdf5f","src/zlib-ng/arch/s390/Makefile.in":"0b6f3fa9c3c8e6ab592baac056aa26f19dc76d72d42548166e186409ff744986","src/zlib-ng/arch/s390/README.md":"06b87b008755d4ba2e530fb96b4dd80b34a5158140f9f6afc9598e2c8729313e","src/zlib-ng/arch/s390/crc32-vx.c":"1f3cc5121bd66f486116250b5d63c6a34817fdd31f0bf14212f0f67a6293d92f","src/zlib-ng/arch/s390/dfltcc_common.c":"8ae4a83c3c61a85c10df9d0628d438206b1e1a62bda01a2ca73cc89c3845bfcb","src/zlib-ng/arch/s390/dfltcc_common.h":"e039450ef4ad73aff9bab6be7e2f0a7534c19724459e708a28968032f9efa4ea","src/zlib-ng/arch/s390/dfltcc_deflate.c":"d03eecf1676bb6ebc749973b9c9dcb8a398e7715a5812ee7834f405db5c79983","src/zlib-ng/arch/s390/dfltcc_deflate.h":"cc405e3649e046cd4a9759314763d289aadf4a035105804d60e3a89605822e20","src/zlib-ng/arch/s390/dfltcc_detail.h":"8bf1c2b6bc1a59193f4a732280381ecaeada4cc1cefc72b90e10c768f66dad77","src/zlib-ng/arch/s390/dfltcc_inflate.c":"ca51bb439f1f841a6108e7a1ea73f2891a09a55eef3a063a44e3f8d080a51bec","src/zlib-ng/arch/s390/dfltcc_inflate.h":"4d8e7b9886eb5025432c5ddbc83deec732d90ca405dc628b283d8cc887b791d6","src/zlib-ng/arch/s390/s390_features.c":"808941d58574031d275b229b8641b1e50345b43580b9479cc0c16595cb53c300","src/zlib-ng/arch/s390/s390_features.h":"33ba70a4c17d6f77cd01d1e163873a2f404d9a68567f3a72fd15efc193305b97","src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.Dockerfile":"459bd65561cdd77a41d0e4eadd73de603abb0df6d7b8fea3f31f6ba40bb4aeb8","src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.service":"e43ebc0cd21540541b1529afc068ddcecd57b12c52dfe857338b6daccab0647d","src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/actions-runner":"7bcc8bcb643aa3f0862e7e47298f24d3845dd368d8c6c5b35e291db48fec4560","src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/entrypoint":"8bcf577435e4bb59d3c1543e1a6cc075f73204c891004adaec12e2a28d33c1b1","src/zlib-ng/arch/s390/self-hosted-builder/qemu-user-static.service":"7dcd9abb563c005949edfae8c8faa6148d638e3f08aed77a08b3424e645a1415","src/zlib-ng/arch/x86/Makefile.in":"a91ebff7a586c2410d1967c5409fe88be360fb029722f4743fa41478b65b3af5","src/zlib-ng/arch/x86/adler32_avx2.c":"df2c03a59498f7664cfefd9f877833dbd79dfb315e9ad6ddb0830288e9c73d19","src/zlib-ng/arch/x86/adler32_avx2_p.h":"4941e889a659778faa07d6460064a1195ab4e30e9ea9b7eb3464baee8495915d","src/zlib-ng/arch/x86/adler32_avx2_tpl.h":"6b76672ed1e78faaddc53c5fd71ac6b5645c7d1c9861ef9e785873a77fa0dad8","src/zlib-ng/arch/x86/adler32_avx512.c":"64e5629c1e03090765dbe7394bec90655757815bd168f33c069e71a2fe9de21a","src/zlib-ng/arch/x86/adler32_avx512_p.h":"31988501db44b5e43deed0f5fb5b084193d95e43f5972cfecfb21435e9b626d3","src/zlib-ng/arch/x86/adler32_avx512_tpl.h":"7b2ea4c0565e25f0ce4e822b273d18d4178a67edd748d99f4233ae2e3035e266","src/zlib-ng/arch/x86/adler32_avx512_vnni.c":"777894d9dff4f43e07989a872c55f4c47bc11fe18333090bad5b038ccac1b388","src/zlib-ng/arch/x86/adler32_sse42.c":"2da8a9767983b00a2ef43ecd22ce96e9ba04f07011ee4f30c7e556a782aa3c47","src/zlib-ng/arch/x86/adler32_ssse3.c":"9bfc926b8e2f3ba1065b289a5731aae44accf201df8c7ae9f4e1b5928c081db6","src/zlib-ng/arch/x86/adler32_ssse3_p.h":"eedf6a33650f644bc8b7f3d091000bb6c41096786dff181c98f09d2f2f38f1b0","src/zlib-ng/arch/x86/chunk_permute_table.h":"965a2cf22055bb16c06abd8db4274ae327c31cf9fcf0fa7abf2ffd370f30210b","src/zlib-ng/arch/x86/chunkset_avx.c":"e20e89b3fcaa6f7c249f4c8e25823e4d4580765a83e7b96bd0ec5b27b5dbb131","src/zlib-ng/arch/x86/chunkset_sse2.c":"3d03ba28457dee1725710788d23883f9e403a7910e9dc673865c3878a4d5d4d0","src/zlib-ng/arch/x86/chunkset_sse41.c":"ebc6ecd8ab20fd10cf90c822c7561bb911e0f7e9a58e909ea4165f9670087f98","src/zlib-ng/arch/x86/compare256_avx2.c":"fdb761626b754bf530edcb787bd30cf2a38afcc7310e45b2d504abd3fd128945","src/zlib-ng/arch/x86/compare256_sse2.c":"cd04ce7a3e10ca6905fb4c338d41f8c53feae5a09ac11c3d21529b504c8750ff","src/zlib-ng/arch/x86/crc32_fold_pclmulqdq.c":"9b47939c44e7dcf53f25f99749559e7b4ab3aec835300144a91dfca72e20eb73","src/zlib-ng/arch/x86/crc32_fold_vpclmulqdq.c":"c600fbd9aad1bd7dd3bc5ef8abcf29016fc6700719cb2fc87139a66cb6e600c1","src/zlib-ng/arch/x86/insert_string_sse42.c":"6dcdd78f99393ad69dff21ea04e9a9af5b99672e972f6e0ddfc75a9c93dd7b8d","src/zlib-ng/arch/x86/slide_hash_avx2.c":"0196de806065d1ab170f946ba9ba70ba4577520f53d70f1f02f8af9b2f18e0c0","src/zlib-ng/arch/x86/slide_hash_sse2.c":"3ac9aec2c5899b5429bdaf9c58a81271703d397625756bca258131ca6e09f9a9","src/zlib-ng/arch/x86/x86_features.c":"36263ac435b1d324c18a9428a01b64cc4f97e8c56fbb540ed2910e31b2e63d76","src/zlib-ng/arch/x86/x86_features.h":"9c6f95aae111f7426c01796a78166a713624f710fb53f877aad38d2f319613de","src/zlib-ng/chunkset.c":"b650aa84fb06ec1ca9b7697b9958f7042b75f4c4009a2d20daac7231fc87d41b","src/zlib-ng/chunkset_tpl.h":"72a8f6dfb04d5e56f350f94805df7ff5fe0b250781f069c289acbbf69a66b81d","src/zlib-ng/cmake/detect-arch.c":"2d14298c588a679bb595376212574f37a8b01a1cfdef2e75ddc93eff5d5cbe1b","src/zlib-ng/cmake/detect-arch.cmake":"459993d1ad8ffeb5eef7a31b7d37a3ead1aaa579abcabdc6420f836979344ccb","src/zlib-ng/cmake/detect-coverage.cmake":"3f67ddd8c23b8172eadcf1781cd846b898ad7e2e05a834438ce5ee921337c4a5","src/zlib-ng/cmake/detect-install-dirs.cmake":"8723f727de22cc33e533f3d32c20ac616715c51cea19e1f123c474a2f682dbc9","src/zlib-ng/cmake/detect-intrinsics.cmake":"8f2e0d949cf9cb89b940c93cc18e244039cc0831eef5eda795f1f2286df0bb52","src/zlib-ng/cmake/detect-sanitizer.cmake":"f911f2cd81ea094854a03414a2cd7545300a008b3a66c33ab6cd01de74030c3f","src/zlib-ng/cmake/fallback-macros.cmake":"8f3e42c0acf04caca1808631d92c5ffa3a1646dc93ee54ec2dc6c262496824aa","src/zlib-ng/cmake/run-and-compare.cmake":"2915c122feff4af7fe68c94d9873e7254607f84fa52533252de372ff38779515","src/zlib-ng/cmake/run-and-redirect.cmake":"98b9eccfc74366fa50d7b742a71578d41c7ca7e88c067fb22bab5d6c08c23a06","src/zlib-ng/cmake/test-compress.cmake":"a6a650fbb929e712751c4e84d44978d82a7bc04c6c60c0f527a5a4295b6ada88","src/zlib-ng/cmake/test-tools.cmake":"7a8fc9ade43b7fc885c75f1b250aff634f6567adc9ec6cca7f779fa71e7f1acf","src/zlib-ng/cmake/toolchain-aarch64.cmake":"4a98f70006741cc1a92223a1f684f60cf48bdcdaa4c752619bb31a58da04fd47","src/zlib-ng/cmake/toolchain-arm.cmake":"a748cf6d417ad488675324b563f84e2f42f7ceeb078bd23a8d8a7223df89ab4d","src/zlib-ng/cmake/toolchain-armhf.cmake":"5b8d0c39144b3404ca1ecb02c1c5e4cb604f677cc62e76c326ee47aa29a05c27","src/zlib-ng/cmake/toolchain-mingw-i686.cmake":"cb53a3589675e8178e44960c884828d2d179b93cc0352bd1baa07b5592a2e089","src/zlib-ng/cmake/toolchain-mingw-x86_64.cmake":"e4cace09aec4866c75b4d697f81db1e0583cecc875ed4a7c19d866e140ee7fad","src/zlib-ng/cmake/toolchain-powerpc.cmake":"7fdaf3cfb81bce571f445168a0104e44b4eb91fc6832e01e0a51052bc1c5fe01","src/zlib-ng/cmake/toolchain-powerpc64.cmake":"e7b32852c23e0faeb86387ee265932e957ed1b28f39f485737541eb73eac7358","src/zlib-ng/cmake/toolchain-powerpc64le.cmake":"aa4470c19a58dbd16931aef3df6d81413ec62a6e056c2eda7a00963b8ef2c0b2","src/zlib-ng/cmake/toolchain-s390x.cmake":"8c792f23ff683bcfa0c713dba970829524204265364d04aa8093c06300aca286","src/zlib-ng/cmake/toolchain-sparc64.cmake":"d90fbcad60fab1754c903aace951927639b104af23f6283b1e82107c44417c92","src/zlib-ng/compare256.c":"27bb66d717a5b0628aefbe33ea0bf93065a520de6e53246f26fa404f7aa1a058","src/zlib-ng/compress.c":"5c74691c0dbf6440ede38e2cc0417d310a074449399ca6eff62eb1c4828fad65","src/zlib-ng/configure":"486f91dd56783b31bd0b04dd6bcc28aa7bba095f54c743262448753c6515965a","src/zlib-ng/cpu_features.c":"035032e4b5358a4c8914362b86cb927b7cddbffbab20fca487d0929a04bafcba","src/zlib-ng/cpu_features.h":"44f60b8ff137b0214f894c5a0d098b25ef79b0e63c8c1cb4d53e8fe55c639e0e","src/zlib-ng/crc32_braid.c":"658c1a3c672af0f95e1a86b2b1ad6ef09a66dd8bb670e7247d64652d8b820f5c","src/zlib-ng/crc32_braid_comb.c":"62d6eee5030f92b0181b5f276a2e454ed65b2b53e8eb1a27f75ce5e905261a2f","src/zlib-ng/crc32_braid_comb_p.h":"8dd9d410276a7e1f18a2e7c386e11cb9252b0697a559b54dd6508559304a4988","src/zlib-ng/crc32_braid_p.h":"de114d909daac4349dfe0a1e9f6a7223b6002a6819d72c32e6effe280d97902b","src/zlib-ng/crc32_braid_tbl.h":"6684f091ecc332eae90d5d09dd5e602e90c3c888d2bdc27ed0013d066f3b3a60","src/zlib-ng/crc32_fold.c":"e7fa500ffe1bec6aa8e699545b6c1a4aca9ba49911adf441fe9cc2e8f9400621","src/zlib-ng/crc32_fold.h":"b4fef88b66b7a3e41bfe5c6b48b38140c521b864c4b9b1f4a1f2cd4b758564cc","src/zlib-ng/deflate.c":"4e217695625688e9e0cfc170b8f7315863a3ce378f1d314a2e5f22e1a3d576ca","src/zlib-ng/deflate.h":"50a67f8675c31b470d3d03d70e33e2bced1774b2b31498770c3c15c83d3f4f4f","src/zlib-ng/deflate_fast.c":"4433a2e5cab3290da213bc2225763da923812195faba06d8091b213ffe980c52","src/zlib-ng/deflate_huff.c":"f8e4cb1af3d9b3070c782f649608acbcde5a5fc50882a7100b76dd7b99638998","src/zlib-ng/deflate_medium.c":"c71b65c712c40de6f7cc8462fa32d5945beb56cb24f3d54adbcddb11adea037d","src/zlib-ng/deflate_p.h":"16131a70339db6550d8544e2338fd8abd3307de4c8fa362be0142a5b3de5e4a2","src/zlib-ng/deflate_quick.c":"f20041cde1729c573aaedc668699abe3361db3dbe107701c6e0fd151ae06a12a","src/zlib-ng/deflate_rle.c":"0622a37434e7b2e3172bf1371ca5bcce5520deb71a0fabe33b8370e13f61ce86","src/zlib-ng/deflate_slow.c":"d0e228badfb5f04945963309b1c4500203a75128ac18bb3d4cdaadb25990f2b5","src/zlib-ng/deflate_stored.c":"594dfc31d58452aa9e00487cec4880d8f7ae8017159c96a51bfc3cb618b8dd3c","src/zlib-ng/doc/algorithm.txt":"1550b5bdd378a14796b8dba858a53a47a2e8b009753827d0c6233d2dbc8798b6","src/zlib-ng/doc/crc-doc.1.0.pdf":"05ce448e3f82ba470cf8f90b44c5897beef8b2d369d44f59ec3c577bba27bfa5","src/zlib-ng/doc/rfc1950.txt":"79deebf1e572f19a656d7f2f8b78970fbd7db668a957057f16a231d433ffdd32","src/zlib-ng/doc/rfc1951.txt":"27af2450240610482c3f1dafeec569911b46c0218f14e1f50c20b665a3b34a62","src/zlib-ng/doc/rfc1952.txt":"993bed4ef10ec55f1c5bcc2a81a239a921c764b22cc98c9dbf298f2d2a534ee6","src/zlib-ng/doc/txtvsbin.txt":"866284a7f69da33b2c04ab4387808edf9142f082c0fcf408a0921fa1f2f657d7","src/zlib-ng/fallback_builtins.h":"45605d5151665a64d1477d767b0fcb58794c4a0e10c5ebfd70e9f368f2fb525b","src/zlib-ng/functable.c":"c7cefc8a300bcfebd482890e1cb974d3fc1aff979fd503c0cd7f2045f5144308","src/zlib-ng/functable.h":"bad56fc6ee16528ff418a8dd2397640f79f0b85cd0e5c3d2a9710030e3466071","src/zlib-ng/gzguts.h":"3578150a678d8d0ecd86dbf38faf2b2a4fa6a1780288baf9585150b6680542de","src/zlib-ng/gzlib.c":"1295047385fec81fa774990c0fea3ae656deea772b10b78fa8b61cd9ee029312","src/zlib-ng/gzread.c.in":"af65d7218f53b71fcb538d04f0cc3f2a691cfcc7a4b86c6db56a54d547aebf90","src/zlib-ng/gzwrite.c":"c80f6e7241b007f838f988de7cc1602399644cf5c83dace551ab1cc3947a862b","src/zlib-ng/infback.c":"3f882e52c51199ab25bd6f01881bb85d763840738d1dce1f5f5ddb7790b4d46b","src/zlib-ng/inffast.c":"ba5c0f8eaa9add537fce89abf852acce6b429bebad4d18b9ccdbd413bc5125b6","src/zlib-ng/inffast.h":"0085f8f97492a82e08139226557c4673766c15a15ba13c8b8d92848adcd3d71b","src/zlib-ng/inffixed_tbl.h":"33b5b0f3932bf6e68c72f16dd660d6a72f549b6cacfd6fa94725cd4c332e7f72","src/zlib-ng/inflate.c":"7067b6ec88d4bc99e4ddc194c393774e50e735d73328b2c4b3877b4db9b13986","src/zlib-ng/inflate.h":"9b4b799bed234164c6c56f1fef5be2081ad1c05fd66c87645a51d283a9cdbced","src/zlib-ng/inflate_p.h":"0caaa9fb479784ba04aed62ddab130b268e96d5562b5101803a3221a76fa2835","src/zlib-ng/inftrees.c":"e6b5f558d18dde2264a7346b7203638dfce105f06b8a07c953e05d7ef6dedfac","src/zlib-ng/inftrees.h":"927545019e374db739ab1ad60958b5e8cd99d30228b792ac8d01b9e2ca99fac2","src/zlib-ng/insert_string.c":"91ed6d67c393e76e7706f733ffd2b08acefb5a808014b254cb49e478cb526b71","src/zlib-ng/insert_string_roll.c":"8a1ac231d9ceceeef9109b4987070d61b7fe760cb93a1fc6401fe772c178acb2","src/zlib-ng/insert_string_tpl.h":"3b8da63e458be3957cbf1ea2fc1f23385046770f9d828bc07252e60065149199","src/zlib-ng/match_tpl.h":"5740a2e4b9e0d0efb98825843ac48c3a0ac4227bcf09ac0347d69d3210b1e5c1","src/zlib-ng/slide_hash.c":"2a3bf30e2b841ca658264f7d9656b045bdf10ff10b955f2b9a07dfe995332bbb","src/zlib-ng/test/CMakeLists.txt":"ec0ec58d4d976dadd086e63ff2dc64e00f5c071788e8044edd24f02b6ec11e99","src/zlib-ng/test/CVE-2002-0059/test.gz":"6cc1de3fa07a0629f77edf0b61131763286de4845fb77934ef7500dd735be57b","src/zlib-ng/test/CVE-2004-0797/test.gz":"e4a1195da06476c08f94be0a13cb18bb86855e0354be4420d1a5f8a64f4b87e8","src/zlib-ng/test/CVE-2005-1849/test.gz":"03cfe2bc9cc7c7bf3d4d33820741538dda6a3646e591812d74634a16f9e2c5a3","src/zlib-ng/test/CVE-2005-2096/test.gz":"f917212ae58ac512bb30f46aee4d0f414774b1307ec246a4afbdfac941e61a72","src/zlib-ng/test/CVE-2018-25032/default.txt":"bffc0cec4333a1e36d1e7cb2052e13d710b9517d8b541ac5b8fa03fc85caa5f5","src/zlib-ng/test/CVE-2018-25032/fixed.txt":"b144311edc782a7cefbdce24bfecc47333f96bfd18b55c26b78c682d7667dce5","src/zlib-ng/test/GH-361/test.txt":"32f5e6f301c072044f621177fb7496629fd9448f6ceee6bbd551ef54f8ef8118","src/zlib-ng/test/GH-364/test.bin":"ed87423a505434e51c9ebb7bf703d092e0b16277021ee9be2a2a7a7a47779413","src/zlib-ng/test/GH-382/defneg3.dat":"1d32f4521d9fad2e441a3ebec74521eca6689dae716b6c0e9f63ad108f5dd333","src/zlib-ng/test/GH-751/test.txt":"1d7932bf7de65547e7483a7c1454904db9c2083e1cad19b526052f4fc62363f9","src/zlib-ng/test/GH-979/pigz-2.6.tar.gz":"6c4547ff80264236ca8cebb02fe76ef0c9863682d137aaafa361192600228897","src/zlib-ng/test/Makefile.in":"1ed3cda483f2fafabe5c40eda6425f4580ab76f7b95c0d709b26c9be49c7cc97","src/zlib-ng/test/README.md":"2d873d89a50283a4bb61fdced537196014b42a4a2fb7b839557fc339e8beedf2","src/zlib-ng/test/abi/ignore":"e46dbb40d282cdde8e8d6c0e4c14b9bae6885eab96176285b37a3b0d217393c8","src/zlib-ng/test/abi/zlib-v1.2.11-arm-linux-gnueabihf.abi":"ca3eccca63156e670c7093ba19b51f9d6286881afe11b95e0c4d50b957b68c56","src/zlib-ng/test/abi/zlib-v1.2.11-x86_64-linux-gnu.abi":"a1d10e41ac8649a89b90e36006700932b4f3ac3820f7b36e39f3c67adfa64ef5","src/zlib-ng/test/abicheck.md":"9cc8c0ecac4675ea3c5e861815e469b74dde3901d56beeb75e9a5436460764a4","src/zlib-ng/test/abicheck.sh":"4a3d947de57c06500d18c9a20604a642ac945d3ada527ed98df71ef78fda7ef4","src/zlib-ng/test/benchmarks/CMakeLists.txt":"64169a7b129a49d3c2214eeb651e24f051b86ed5512defb4433ff19b1d360db9","src/zlib-ng/test/benchmarks/README.md":"76124de93b68ddd131d3e5b0f4b29289998ea7a41c0e295941264979799bc9a5","src/zlib-ng/test/benchmarks/benchmark_adler32.cc":"c99619bcdd0c806eff7ebe37d17806155312e5f619692a045387aefdb334be7b","src/zlib-ng/test/benchmarks/benchmark_adler32_copy.cc":"3bb0ae97edefd2076b32fa8c1019048389b07e94ef531487528551cd4a2442ed","src/zlib-ng/test/benchmarks/benchmark_compare256.cc":"f783f843c9aa1db495fb4dc85213eddcc5e99d051d2c7f2cee9c0692658d3f63","src/zlib-ng/test/benchmarks/benchmark_crc32.cc":"b6968f1fec4e412f3a3632bc3029a94ba7a0232cbd2b75acd3681aabebb3dcb7","src/zlib-ng/test/benchmarks/benchmark_main.cc":"fff89a26efbca0d07069a778d7bd4058473670339f29a89a041c56418946d1dc","src/zlib-ng/test/benchmarks/benchmark_png_decode.cc":"a9d549224cb58900d3f6e0f69359cb35afbb4f21eddbddf229831322a6aaf9a6","src/zlib-ng/test/benchmarks/benchmark_png_encode.cc":"1770163cf83cd19068affa715f10131bd05a782cfe7c06b4d844315d620fba48","src/zlib-ng/test/benchmarks/benchmark_png_shared.h":"0b374459aaf61b0a9a5a00e4297d17f1128af1bfd659945c9cb99294d43c3320","src/zlib-ng/test/benchmarks/benchmark_slidehash.cc":"5c808502e8018ccb742e42a85f1ba76277e5190b7f8614db2cdc35cb63349b50","src/zlib-ng/test/data/fireworks.jpg":"a9a168db97a7b9339a12e2ef7157f680d353b222f036dc265cc9c16c54ba8be3","src/zlib-ng/test/data/lcet10.txt":"9f70037c62fe712d846f3e7a2b2dd3767b55cc74e203a278d27da2e9369c852b","src/zlib-ng/test/data/paper-100k.pdf":"70f8fa85287ddb0c6e93c620758a734c6f8eb5682f32268aa7b385737c1fb378","src/zlib-ng/test/example.c":"9d785b92a88f58479c3072624df0c670b0288f1c7e3795721cd208683155bb15","src/zlib-ng/test/fuzz/CMakeLists.txt":"6bb539858cd9db72ced248269e9c61baf1a4298ff0ee552d962a485d5619e481","src/zlib-ng/test/fuzz/fuzzer_checksum.c":"04261d6d22c7dccc335a7eec8c28d96d36a36ca917ad48fa9fe55b367d4539cf","src/zlib-ng/test/fuzz/fuzzer_compress.c":"948325b3713ee161c0456f2590de4e5cc4350f96f5e2ed1fb46bd2a3883a77b3","src/zlib-ng/test/fuzz/fuzzer_example_dict.c":"cb8228e3cad2b17e62e2f6b0bc7252e56ab446efd8978391080ab841aef9f799","src/zlib-ng/test/fuzz/fuzzer_example_flush.c":"bf56dea60e62dc5afa21b2f9d2b6542d20dd2d94e880bd6523627952d8c33d39","src/zlib-ng/test/fuzz/fuzzer_example_large.c":"4d87e159e78dbdd86eb5eb94af34006d03b182eb6402832667157968c2a6271c","src/zlib-ng/test/fuzz/fuzzer_example_small.c":"cd30c48373e1814c46a42b99eb9f3475e2589002d2ba196289899e447c275494","src/zlib-ng/test/fuzz/fuzzer_minigzip.c":"8b28343e7924c06ffe367bae270046de8177a5a52cd166431084140ca63379ef","src/zlib-ng/test/fuzz/standalone_fuzz_target_runner.c":"3392ac00383b1d07f5ca6a589e3fa5932d514ec29590b4c8567e48cc0426e6ef","src/zlib-ng/test/gh1235.c":"e1b84e377b497b0e6c1de3d588cd643bf2a4967bcd4d2b8307d7141ae520b610","src/zlib-ng/test/infcover.c":"e7a8196596725c6b44f6b3b21e51c120e12171ba9e85be2b86af1b10504bcde8","src/zlib-ng/test/minideflate.c":"2e45c8ae7197e5515021743ce447f2e91c8a541ecfc5a73395ec09e8376ef6e0","src/zlib-ng/test/minigzip.c":"a97b56e4f944056a251638a7f077277b402aefc12d6fd383fd2478170cf63763","src/zlib-ng/test/pigz/CMakeLists.txt":"bb58f843ba25a96e8786b2f26c5a202054b6c1e458ccb92b0c7097c294f87700","src/zlib-ng/test/pkgcheck.sh":"597b3482f73a0b6176bf662df2b8c1e5f70552fed03a679f43bc700c37d41a1d","src/zlib-ng/test/switchlevels.c":"c394feea8d2e50e4341c89bf5a93ca6115ac48e871d8d481182669acec7ca772","src/zlib-ng/test/test_adler32.cc":"aad68c3be94e9ee2f6f87d0f24b80d7bd2ae9eb9cb5c5700700a84dfcd1539ed","src/zlib-ng/test/test_aligned_alloc.cc":"12bf1e3c6d166a13f11973d7b75bf3ffe812a2169c7d82a9cbf77bcf2db89c46","src/zlib-ng/test/test_compare256.cc":"57ec6a1b8d321242f2e53ae93f8010c2edc4d42fe799c16522c67608926657c2","src/zlib-ng/test/test_compress.cc":"179f2918d2657d5d30d3f2a4e552361fe54d34af55cb243f0d24ecf1ec8bbba9","src/zlib-ng/test/test_compress_bound.cc":"6e4eada96c3ac9db793e1955e4e2853d741a5865dc2f1fd915c569b2f6c3ed5c","src/zlib-ng/test/test_crc32.cc":"23c6fc26c968357561266a180dcf2f5cc6c08472f6bafff33607f05ee43d69f9","src/zlib-ng/test/test_cve-2003-0107.cc":"7402e5c3c2196c994de1a92db899e966217e3001ef04c77776940eb3ec746f5f","src/zlib-ng/test/test_deflate_bound.cc":"36441e564426a8e7fd728a74999ad501899c3f2a7a6e9304d2a36cf84e5fea20","src/zlib-ng/test/test_deflate_copy.cc":"f1393819bf88420a36562b37489df4c434bec5f2428c685851476c08a087471b","src/zlib-ng/test/test_deflate_dict.cc":"f34c12784e91ccaacb4f3dc9bb1c049f262aa469d1632b5c0c0248e359f2a1a9","src/zlib-ng/test/test_deflate_hash_head_0.cc":"5373fd2069d478701de33a7e8fd47c7ed168fd46135eab279a4d9bfde028a7e6","src/zlib-ng/test/test_deflate_header.cc":"c205074a94d66bbdf416c44257537d33e97054cfc3313b6653ece7b4063b4683","src/zlib-ng/test/test_deflate_params.cc":"092136c57c9b3aba730ad21ce1ab6c0b8da61ee51b5412eb04541613a5340ece","src/zlib-ng/test/test_deflate_pending.cc":"09955e3d13c9f507314620c3b6c1065e5852c1a1d4901bdabdd09f2236c29a98","src/zlib-ng/test/test_deflate_prime.cc":"9d7c32513b81e024082eca0d1d15d431d9df7b29ec7bf643a57744b09c7c802f","src/zlib-ng/test/test_deflate_quick_bi_valid.cc":"803603863ff2ac69f1b8a1bfdcad105452552122f7014ecdc93a6a74ce657fc4","src/zlib-ng/test/test_deflate_quick_block_open.cc":"c5967f8b0f82a629c7998fd8a51997bf26e94c103acb0614698170df7e581488","src/zlib-ng/test/test_deflate_tune.cc":"77dd0933bf350033358e90ba40223a5fc775287d18ec497e5df58c8134821ac2","src/zlib-ng/test/test_dict.cc":"353bf75f44ddafc323f818ed2385a391e1552adb8032a2e65b5c189428e0956f","src/zlib-ng/test/test_gzio.cc":"8291cb70b87ad7c1227e1fa00367a450bb85a320e07bcb9feb9c36dfa2e93c3a","src/zlib-ng/test/test_inflate_adler32.cc":"fb8b075839a168f42bade7c55fe4f59a449ed2c59dd5feac5de47942563cba69","src/zlib-ng/test/test_inflate_sync.cc":"d51f6f44f5f60aad4838f992cec682b339d1fee5f2f30db2efadd7bfc0ba63f7","src/zlib-ng/test/test_large_buffers.cc":"ebd670bca2dca03c6d8f24eca596fb2bd7060c0b3ba7a4eea4f5ee2264e20518","src/zlib-ng/test/test_main.cc":"39209bb75f66ed2bf98943f4f04809a85f7c5e04c88c902ae67fec72517def4b","src/zlib-ng/test/test_shared.h":"c2e95045b9c79b5b5445263cae194ad68f07c2694b460f9f9d9beb0239e8d42c","src/zlib-ng/test/test_small_buffers.cc":"33347abc5795374a4f8bb6a47be9c51da4d5f28420b11b217bc49b8dbd5bdd6f","src/zlib-ng/test/test_version.cc":"2153ad7f6a64cf21cb005336f419a17758aa84c47389fe81fb6d71606a3a067b","src/zlib-ng/tools/config.sub":"927a4db0bd76b1916886ae3675cf2ef8f21fcbcb7c0841580df411b9462182d2","src/zlib-ng/tools/makecrct.c":"f2d63bff02b0122878b58ec4d8623e74faeecdb46f2cb02d74097bf5ece22813","src/zlib-ng/tools/makefixed.c":"55330c8160f7a0cd35cbbdc96750b435b6043a4775fe0ec90c0e199f0700a427","src/zlib-ng/tools/maketrees.c":"96bceb532b54918fc589a4ff92855faf25c427906c646b720d663dcc8b3b8b4d","src/zlib-ng/trees.c":"d5f65d458b52b9a581b3d3de124e28f266c12865623e233ae0b208e45899d974","src/zlib-ng/trees.h":"f9b6b4aa667a2bf0b2d47c606951811086426ce82d7fc69508605388fd5a80d6","src/zlib-ng/trees_emit.h":"eecc4df54c86a1cbdfc8a5634329ef748fed8e7c655cac43a4dafb5080cd9a41","src/zlib-ng/trees_tbl.h":"17fa1593e59e81c246671b082582b1e48043b499ea30f746215808ffe8fb4e72","src/zlib-ng/uncompr.c":"8e4133eb83b6ba452e991957084f362ccb3c525cee6dc7e4e32a4678cedde256","src/zlib-ng/win32/Makefile.a64":"d2d5ba40f7a074cb8e035e739bff97caeb19fbb302b4497969928d53a5143f89","src/zlib-ng/win32/Makefile.arm":"4d5ba119bc3651021b66065b83f598a144abe747edb6092d3409c7dc12260726","src/zlib-ng/win32/Makefile.msc":"a212ad4088d05f9037e529798ba68b792d872cf832376d6bb4b3494a0b58b4a1","src/zlib-ng/win32/replace.vbs":"6e03414944920d5bba24404ddf44f7c71da17e9d6cef425de81d332ed7fc3f17","src/zlib-ng/win32/zlib-ng.def.in":"72ae1f1b6b1767d0064349241fa86fbf043d7ab7dd0137573e9d9f9927c21ac2","src/zlib-ng/win32/zlib-ng1.rc":"8ae031fdc84163e504b5f08580a3ed9495326e54f2d3ae8bb693bbc52769d3d6","src/zlib-ng/win32/zlib.def.in":"53ab4a548b3fd7a790566c822f1bec5d0104bf5eda9a468229a1975d6b3918a0","src/zlib-ng/win32/zlib1.rc":"63ace8e85e7d3acb2d0ea8464755a7ece3410ad247b0ff8e74bc0d60253ec7ce","src/zlib-ng/win32/zlibcompat.def.in":"8a3ef5cc1de16f6e74bf386cd0bae1e04c7447fa235b88951e46c23c6c152ae9","src/zlib-ng/zbuild.h":"92778d43556306bafda3ccda32afaf41f8b4c720eec109546b8f508cef39d2a5","src/zlib-ng/zconf-ng.h.in":"b64bf683cabbd07ba319cd66136163227ede5ea73b32bfd724b55bd7d3d71487","src/zlib-ng/zconf.h.in":"5a256ad048babe6a4063b05b15146d85c78f3bf0eb6ca32f8a99c2c514a64f04","src/zlib-ng/zendian.h":"e50a5a02652731698e197ccc9e5073ae363990fc7c5dfbfd9a24fe2c5693f54d","src/zlib-ng/zlib-ng.h.in":"9a46ee46b4568b181d3e8d29681b238592c67191ffae8398fbf6886e48f9844f","src/zlib-ng/zlib-ng.map":"ab1e5e8017206f44aff1de7ded62e231cdcf523e2937646dacc7837795c2a945","src/zlib-ng/zlib.h.in":"cd5262a103134211cff781caf2b78b44deb460eaecd06a5c93340570bcca99d4","src/zlib-ng/zlib.map":"5eed7cfc0ca9f554e5db24045ba19ce55733645031cd90b9fb716287694c90f3","src/zlib-ng/zlib.pc.cmakein":"a654e85c6eaf00e6b5e778461c1e8054d48b9a4e7824350cd77196a1497b7792","src/zlib-ng/zlib.pc.in":"be1f54e304de8835ac763c6a87ce0253a7a83a78678eb66c57269a880eb346ed","src/zlib-ng/zlib_name_mangling-ng.h.in":"bfa5486c9e2b7b1d36f50f1b66c7dc3656bdf11dace8f15b6539e8d6c0036b07","src/zlib-ng/zlib_name_mangling.h.empty":"7bef71ee6283a408887f8515c6250f79b01882ccef0c3f0de6bf1752e3a273dd","src/zlib-ng/zlib_name_mangling.h.in":"e1caa3b5edbbad19358de1e1e7cf3ff1c0c78fd25cf19c3e8260fd8e6073d369","src/zlib-ng/zutil.c":"aa0d2713f59b11d5b7c96d304ff09d79080e5168b32478e8ccc333b2f112b1d9","src/zlib-ng/zutil.h":"fa6d09669e1e6020c6a2be460b75c04b4ca906bb777bd2181ec841f54f687e44","src/zlib-ng/zutil_p.h":"34246f8eecd8c5210c709b21e6f6a4ecc40ca5d3a32a7dcf925593000ac3924f","src/zlib/CMakeLists.txt":"6028cca388e8067249dc658dba99a4c74b066ca8d5e088e83a12715e16c696bb","src/zlib/ChangeLog":"9742c6832cb3cab0a93d8a67c713480663c4f33a93cd212539dbda321659fd08","src/zlib/FAQ":"9b28911fa4c275feffb22bbb0196a61e6be335b56f6f357d6a90996b218d56dd","src/zlib/INDEX":"213f8d0d99917f4cc46afd9aaa7f36f8a1123096de672149d8b720613525f6bd","src/zlib/Makefile":"02322af4821b5127d65d390a28bab2db0ab46e65c7bf3c5bc58a398f483a2ca7","src/zlib/Makefile.in":"fd67be2e9115ca410547d1a7db66f06f5aafc2c16adf0f996fdf4c9d2b7075a6","src/zlib/README":"35ba8ee67728c4b7a40a6bc810bdd4f8ed01283d84d1ad8bccf62e3469c8b376","src/zlib/adler32.c":"3d5ed4e8a0e4cf480b757e48b6a33a1a7b32b66e082b6b5277216d0f4d981733","src/zlib/amiga/Makefile.pup":"8fc073ee0cc6a200d36f9080312218d73edd1844169954b4f779c03ebde698d7","src/zlib/amiga/Makefile.sas":"8edc482f945aa7ad45f6c9c0dc4cf06b60434f0c4af3af5f4fb73f0cdd7c4d39","src/zlib/compress.c":"eb8aa5defa0f769b57553874bae321964514380ae598521464a37c6b34638178","src/zlib/configure":"9f12a1221a1020ba37e3065ee2679e1473cb0f620ade8723c56ae217358441ea","src/zlib/contrib/README.contrib":"0f2f5b91fa0f5a725e941981f1dc1dcf47517d4238268e27676dc3a1d9c4a0fb","src/zlib/contrib/ada/buffer_demo.adb":"8bbc69870235ee78788b90c74fdfd8b55b9b57a8c944e04e24f8bfcc2afb1c2c","src/zlib/contrib/ada/mtest.adb":"940e58b55c9e33974f1b23f56e1709557dd7184ba4d715c353833241892531d9","src/zlib/contrib/ada/read.adb":"88fe64aa7c62d1e7ba5017db2c5941e39bb2b7106ec7e87ac95ed2dbc0adc262","src/zlib/contrib/ada/readme.txt":"c4e130af4c354ff9cb01a8d62f5c2504ec84671b285c9cc0ed34226cecbba7e9","src/zlib/contrib/ada/test.adb":"eb5f51d64671cd99d02cb39b4058b03b9fbe6a951d5ea1b89d5cbc1832cb855a","src/zlib/contrib/ada/zlib-streams.adb":"64b524addccba6e1548f42ac5b127c87ba01d710e360f64c42dacb2804a3b2e2","src/zlib/contrib/ada/zlib-streams.ads":"ff2de82aefade769c031d147e1db2622d41d298b9298e7ce2cabecb7e14fa472","src/zlib/contrib/ada/zlib-thin.adb":"131d8d69ef56a18264d47aba21a9dc6f0ecb8d1a9a789a215f2b95a60b5d07f9","src/zlib/contrib/ada/zlib-thin.ads":"765c3baee919e18384ee343f1893da8ca502f466552e78a3d4bc91ffcbd99213","src/zlib/contrib/ada/zlib.adb":"fb81d8d8591bd6a02eb22b4fc6cd6d612a8b80f1d6c9623b0f82a0f67da77b1a","src/zlib/contrib/ada/zlib.ads":"bd73164ac72be19f79d672afb8e0a2487f11e8ae29877f3947ee07dfa66e534a","src/zlib/contrib/ada/zlib.gpr":"328e7d60b8d64d707a50efbd6ecb954f816bca41723389420d843fafd792dc11","src/zlib/contrib/amd64/amd64-match.S":"e8f20f20cf8e5d580a7709442956485b2379629034f0947fac03a653cf24c716","src/zlib/contrib/asm686/README.686":"4ed41a7054336edb58c0d06e6c6e01fe867568d1ad35332207558672b9ad93db","src/zlib/contrib/asm686/match.S":"02cbac31a8d6510a3981d88eae93461d283d6c09161d8e4ce1d3422ff9f0330a","src/zlib/contrib/blast/Makefile":"801f3f058631512259ce7e6078bf79673917fadde18e3399929c4f7bde0995a2","src/zlib/contrib/blast/README":"c939880d1564e4f41b9f6a4f8fad9e44027c8fbf0db9be2b0d68d38848777999","src/zlib/contrib/blast/blast.c":"e40fc783cdb9eddb8f0bc4cf46b1566b784edeb15addc31d7af0209134ed1bfb","src/zlib/contrib/blast/blast.h":"b654e9feb6b61832d9529dcaf7885f562bb8c53c86969cef5d897137be96a3b8","src/zlib/contrib/blast/test.pk":"3fcf650f8e7a476b76f018e415da92dfe2b22ec6dbbc9d9dbd3ba437bd706ca3","src/zlib/contrib/blast/test.txt":"b7707b028c5be27fc3050860a4fe392c401c2cd3ed7348f71950b3beeb3f701a","src/zlib/contrib/delphi/ZLib.pas":"1ffd4c68f3758b5823a45a2353f2a3a7121c8294bacef3ecdd9c90811f81c0c3","src/zlib/contrib/delphi/ZLibConst.pas":"6c4bd0ba18bd4aef6270fa40d9e3f72e38647061ae3cd9118ea0bf648b44d99e","src/zlib/contrib/delphi/readme.txt":"b2663f326b0dfe70ae291bb147b26704afd8271d6a526164d2b264b46ccfe959","src/zlib/contrib/delphi/zlibd32.mak":"af69d722365420f65abb73ae3c731c21a9ba21ba69cc924c06de84c97404ebcd","src/zlib/contrib/dotzlib/DotZLib.build":"bc5233473e84d967c9eb8f1361080de8d387f22b208397d4fc973a2f1acf6963","src/zlib/contrib/dotzlib/DotZLib.chm":"f15e253792f4cae278d132e95b13a4ee26b206869261afcbc9ba98a04b025535","src/zlib/contrib/dotzlib/DotZLib.sln":"4b217166d4fc37fa742d8bf89886a083b546bc7df487c9af7495798a57544b72","src/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs":"6a0a0cbb0517b226c63211afa1b31ec90b99adfa83d88ad8487163c66eee116d","src/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs":"4e0fac8af7b263ceb73eaed85d77f4ecffbb1f5d5c1a42a13f76bffbf710a7bb","src/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs":"0f3d6187c7813183e02f96cc426a4c4a88343ccc2e4b6374bcd84a851524782e","src/zlib/contrib/dotzlib/DotZLib/CodecBase.cs":"2cc9c27d947f88e3f5c0cbf3b1f902363a958ac4cd51c8484901dad2ee2382f7","src/zlib/contrib/dotzlib/DotZLib/Deflater.cs":"3a4f63296a632fcd012288f3921c1e3dcb087699434ff82c98885f71dd2b863a","src/zlib/contrib/dotzlib/DotZLib/DotZLib.cs":"c40162e122f184c367455b4f21ed2343d85a818d6f4fcc6b4fc4463a14a058eb","src/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj":"515c6db467d66ed01cd591954e1f5d8fbd0f8989c8fae58fcc0b06e9992e6371","src/zlib/contrib/dotzlib/DotZLib/GZipStream.cs":"d60f326c3e1ad68b13ff4a8b537b28dead84b08b992e5d51c84b447fbcc6c180","src/zlib/contrib/dotzlib/DotZLib/Inflater.cs":"9391708158c44ec321c05119da83fe340e0fcd3c9fed2caf1cf60a5d1ceec2bc","src/zlib/contrib/dotzlib/DotZLib/UnitTests.cs":"a165b4a8da9291e198b8a442b738fa821a49732d0b2b10ef8818db812d2377f9","src/zlib/contrib/dotzlib/LICENSE_1_0.txt":"fecb8bf3e4ea9756d12aaa1285946a183b80ea105d5d7e7ce28b808569f1481d","src/zlib/contrib/dotzlib/readme.txt":"751ad5cc05f51d85f19b0444da9660b7d1eb31a9a20921136405178095727851","src/zlib/contrib/gcc_gvmat64/gvmat64.S":"41925b111a50c5aef1eb0a74c43de98adab482cc044d603902e0802472bb8fcb","src/zlib/contrib/infback9/README":"171063d2739032be2f005f08c73c2a1ccdf603140f2f7976a736277270b2b961","src/zlib/contrib/infback9/infback9.c":"450259e660a929c6d492d185210d5bb8dd93692f5b4eb4ffec6fd55e86eb9f84","src/zlib/contrib/infback9/infback9.h":"279f730c6d9e268e0d4942be95bbd656e764ff1fd28bf5c553ef9d2ca6242fcd","src/zlib/contrib/infback9/inffix9.h":"07c79b4cf18befffc4a9a6387a15a230a8b7d5688c6771152b28480a4f5deb08","src/zlib/contrib/infback9/inflate9.h":"405e617004cac009c2f314f8c49b0d740b7741b3ccf9d191638dd3d72fbbc5e2","src/zlib/contrib/infback9/inftree9.c":"ad21fce5fd3183074f2efdec67236c2bbf1491991f7a56fd86c526b6845ed5d7","src/zlib/contrib/infback9/inftree9.h":"3b4c908db46365d22b5c533d26fcf39d317b91b6893de8ee156bad2636a65125","src/zlib/contrib/inflate86/inffas86.c":"4f750e744673b3106c8229379ed5d67c5a8f1deceabbeb35a5f9541d9624fa95","src/zlib/contrib/inflate86/inffast.S":"fb5a53871deb8432e9e214d6c29d85e23e9310f9ed0bb693f29a44900597e8f1","src/zlib/contrib/iostream/test.cpp":"e55028625bcc05a9e336626db533bc303375c38acc9c3b69a6252cfb8bc718a3","src/zlib/contrib/iostream/zfstream.cpp":"4b3159426a8b697b33cf195187fdb1eb8b915e5089acf3023a70e867c811353f","src/zlib/contrib/iostream/zfstream.h":"efea187c52392076d05795fa7e7d2970d8c96b76361186ae9de01e57a6c34394","src/zlib/contrib/iostream2/zstream.h":"727cbf1dcdf69b998de350a4883a1c40f0952ac1fc9931819d3df8f56fcc1a8a","src/zlib/contrib/iostream2/zstream_test.cpp":"d67c658ad922bffb472d9b3f0fdac31259ee6ab3377758e2aad47a7c364b3c3d","src/zlib/contrib/iostream3/README":"a123825c103109d19887640c49720a42721fd6e0a057b4fea6b2b127875f81de","src/zlib/contrib/iostream3/TODO":"35544fe98f2a6ca665c96a838006ad70295b0606f50982a839513791b2f85f57","src/zlib/contrib/iostream3/test.cc":"8e7e0ac23493468ab7f31d1751b1d4efb086ceab3912f61c890cb763bf04ee10","src/zlib/contrib/iostream3/zfstream.cc":"674cf8294609467552591209e216beb0141b7d5eee183c925e0020c5bd801128","src/zlib/contrib/iostream3/zfstream.h":"9841145cf187d45f9cb64557bc0c0c7fb0dcac132ff0ccc340fa30f8c42c3d2a","src/zlib/contrib/masmx64/bld_ml64.bat":"381a02fd8de3d2524159996045d24ed82470ba4c2979a33946632ab493cc075a","src/zlib/contrib/masmx64/gvmat64.asm":"ad543533ac2ced3920d8c2dcd08926549189562a9e5a5800abe4a96478e62583","src/zlib/contrib/masmx64/inffas8664.c":"5b4f7d758e4656ec103c2129f76fef48cc0c87b73a7573a0bfd9300b3042a22f","src/zlib/contrib/masmx64/inffasx64.asm":"ce74402fbdd9c1f580072b8af7128016e3120a6d637d502ca3c748fc1fb98b6a","src/zlib/contrib/masmx64/readme.txt":"636077c135f37ada75efbc9018286b700ec8b5a9c44a960ad24fbb9789e09268","src/zlib/contrib/masmx86/bld_ml32.bat":"45a53c00aef2ef76956bb31d8053c47f77ed2bc86a49199591cf16ca5741002c","src/zlib/contrib/masmx86/inffas32.asm":"3027b2cc1abfa1bbf36f8403226da25722b1cf6ed3340c4ba04ad1c88540bf9a","src/zlib/contrib/masmx86/match686.asm":"bda96509d150eb0de9c4e9a904778215a6a06deda75c5707d4940c9a122a4623","src/zlib/contrib/masmx86/readme.txt":"2b89fe506a7b7bfa274a53c58c839503986a97566c077d9de6cbc5025ae4bf54","src/zlib/contrib/minizip/Makefile":"234ed6f894df97b4d39050059095117396749a0705c3e98b802bbd50581cfdce","src/zlib/contrib/minizip/Makefile.am":"e6c796bb9e46f68db5028c2f2de70cfe4203fc2181a796fb192763037f648baf","src/zlib/contrib/minizip/MiniZip64_Changes.txt":"400ddabb9b3642631e09ee49c62a9892c56e89889a6f8adf6956b18997207cfc","src/zlib/contrib/minizip/MiniZip64_info.txt":"9f6dfd77123722b2fdd79db68954fde10495055375d4a9ca281e945f1cce5292","src/zlib/contrib/minizip/configure.ac":"0024fc32377bfe833ba98c2079af8d00c4cd25fe0d3fe1f51003b1afcea347c1","src/zlib/contrib/minizip/crypt.h":"710227f2541af2da01d9db220c3c7cfebf7b07f946aa5bb0c363529e6cb84018","src/zlib/contrib/minizip/ioapi.c":"427783b53936846989b9b869b391b9371da855ec8de311c606cb2ad5f69a20e7","src/zlib/contrib/minizip/ioapi.h":"50a7cd49b12ebfb4a020fb40f00177c99bce4abbdf6eecff2dc8b8ea9e66f0a9","src/zlib/contrib/minizip/iowin32.c":"ad6f88c2ef209e028776e45aa587a333e0ba83d59afdf13efe52695e233b36e2","src/zlib/contrib/minizip/iowin32.h":"df81521ddc8712edf2040af52598b5ce5f8b594320fe67f6d20cb39263b3d1f7","src/zlib/contrib/minizip/make_vms.com":"bc5c5b2c4c42d6256f25e98cf3c966ceebba94112f4786c6c75f80eea6e88a28","src/zlib/contrib/minizip/miniunz.c":"a037c57e762d6a2afdebae1d15274a664e9a806bc16b3086a0e300382f9fa874","src/zlib/contrib/minizip/miniunzip.1":"5ea452445f439a3a935a79f4b2da84a4d6fa31bdfb9732eb60972088573b079a","src/zlib/contrib/minizip/minizip.1":"88f09933cb2698bef65d1fec6a2ade8b6dac61e392ac6e36754929d12a61b7ef","src/zlib/contrib/minizip/minizip.c":"d1efa4bb671d1f9567902022ca17465226280b27ab772687befcb9c46baf086a","src/zlib/contrib/minizip/minizip.pc.in":"5d0bee9c37172a53d22032b9db0c4ee821e0b263b1825363745fbe9990f6b0e0","src/zlib/contrib/minizip/mztools.c":"94e2621a2688052762408d8c5c5dc86a73af6613b60627a32deab259ae68800c","src/zlib/contrib/minizip/mztools.h":"4345e81c564fd90ea52bb4b5712af445885166ffc89f84655b917c80a9b13498","src/zlib/contrib/minizip/unzip.c":"e2063bf8ce9473dc409f1f515b1b66e3cab6570f2eba5f3b7c706a0c28f3ed09","src/zlib/contrib/minizip/unzip.h":"2a4058f5663eadeb72731c49e3b072e1791bbdda6cbcf28b3e3fa1873d960de6","src/zlib/contrib/minizip/zip.c":"6ed3b52e01d0de7f3c68f8a369e5489b342448aa82f82159449393508f76dd66","src/zlib/contrib/minizip/zip.h":"8d8fa86cd014f1168d1e3471e5325dbd483bf90a384c067e72612788cd35ae94","src/zlib/contrib/pascal/example.pas":"f5c4da06e4c91f6f9d701673d7afbc0a68996af08a30dcf9aa32d489c69ff11b","src/zlib/contrib/pascal/readme.txt":"22b1467f4c86ef757705478ae343f710c0828f65152cb35e27ec8d99f2ad9e96","src/zlib/contrib/pascal/zlibd32.mak":"af69d722365420f65abb73ae3c731c21a9ba21ba69cc924c06de84c97404ebcd","src/zlib/contrib/pascal/zlibpas.pas":"a19622368dc87bc1e3c22ad69528f50f8bb641bd4bf4243e9fa667e3227e260f","src/zlib/contrib/puff/Makefile":"aa87c83693e2699a1309d1c06bf87a896bae9c38bfa839da42123ac876f378d4","src/zlib/contrib/puff/README":"491f7c44c0d9bf2c47f8b59d4ee504b2f3458d8f239eb9edb76cd30eb2105f17","src/zlib/contrib/puff/puff.c":"865828e4746db224a89ae247ef7ae2dd1c5fe2be42bd58570d17b6b4a35e53ba","src/zlib/contrib/puff/puff.h":"7e0f5b534d76f6097c69e8c1dd80b912d0d896bb24b9615a96520425a02d1d31","src/zlib/contrib/puff/pufftest.c":"6da70c250a457a3f503e5568058cd54a038db4d874971a3a5b0dfbd669107561","src/zlib/contrib/puff/zeros.raw":"77cc7b92737977fa2484d3cf37d296fbfbbc74506fbf69e8facdef0953dde763","src/zlib/contrib/testzlib/testzlib.c":"4a7a0a50dd0488ab4423c67cf9d8bc6e92b84c83ae934760a8931a2d3cdfe407","src/zlib/contrib/testzlib/testzlib.txt":"d5ea5b7654760c69b037ec2462dfbc2b338de30817123f510a712a2f12991713","src/zlib/contrib/untgz/Makefile":"beba7e3d723d1e02265def5858b488fddd3de4784d5ccf8a96d6ae073584510c","src/zlib/contrib/untgz/Makefile.msc":"98b3aadb1a09550bf9ea4782d354fa4427488b2a4b937686e0556c31e6985e5e","src/zlib/contrib/untgz/untgz.c":"94789c8e5b3bc16f0fc8825ea1b39a979dcb8cf1cf49563b4d1ebb98a5ad23bc","src/zlib/contrib/vstudio/readme.txt":"d26b7b8388e100fec26c66424d8f45158ed637eff4686c25dc47e213caa64ae9","src/zlib/contrib/vstudio/vc10/miniunz.vcxproj":"c4943891ba7db04ebc165c86ea3f61124729aa2aa215f85703c1fa02570775ef","src/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters":"2addb4227bb1afab84a885c044fac08738e98c2c4f5ab4f71d683f3afccd3cac","src/zlib/contrib/vstudio/vc10/minizip.vcxproj":"aaa574e1f9036425c12cfb65f93c35e2980890e39415215f3539d6d1ad18c0e2","src/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters":"fa28b15015f797cad82a8390cb934e2dda8404e6cea0afad517b9d4fa21defff","src/zlib/contrib/vstudio/vc10/testzlib.vcxproj":"fa9b44d19a669d6004fc34fe0e51efd73e6bc0e7208048bfcc051559d0a70831","src/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters":"2611a927b1d5dcd73b6ba2678513ae6fdc40805caab6afc078bd6c1f5f6792cf","src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj":"5223cf876f8cf291d25846ee14b3c7e15e9d7ee89c482ba122dccf33d6e7fea1","src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters":"16542497aba75bd5672e4a8fc49287b15dad94d37cb6cac5bfaf5fa8deaea160","src/zlib/contrib/vstudio/vc10/zlib.rc":"3b9df60a10908876deae58f0b9445c78d7b5e7f61fa2cfc8e809a7d929df84e1","src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj":"19216fd0c67f352110cf42abff4feb1a283fbceb2eb736d40830f7eda0d46d38","src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters":"5d4ffa81e3fdb7dd9d2bb2d7129e17ca4f58f5b1d720c20e93a91d20026088f3","src/zlib/contrib/vstudio/vc10/zlibvc.def":"a8179ae609a12e11ec94d4fff884392e0517ee18cd224e77dde63b4674c99bfb","src/zlib/contrib/vstudio/vc10/zlibvc.sln":"26b5cad9823683630be54ff4e5417047003275d3bdefcb31ec833326716d1f4c","src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj":"edfdcc6db437267c76b0d9cf6f7ce9d0227b3bbade25fd1b763e76882846a074","src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters":"558223ab15a9c0b3abc339da04b90248bd43af2423f549f55c998e9ad7d8907d","src/zlib/contrib/vstudio/vc11/miniunz.vcxproj":"09c757df3f6d7b405d310c70b5dd6b81b36a3a190eb5c3738a8d9d7a98387d50","src/zlib/contrib/vstudio/vc11/minizip.vcxproj":"d2cb7a226ac0c9f4e1d723addf941d7a3540215bd6974f9edff6cf7ad7498919","src/zlib/contrib/vstudio/vc11/testzlib.vcxproj":"25a0f20ede30ada0df5756b801006f87315d4d4f9477a8584ba5befca9f4ec7e","src/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj":"cf60948a4785328d1f196d52a6e0fcbb7069fe64b625493f4917ecc26f4be1fd","src/zlib/contrib/vstudio/vc11/zlib.rc":"3b9df60a10908876deae58f0b9445c78d7b5e7f61fa2cfc8e809a7d929df84e1","src/zlib/contrib/vstudio/vc11/zlibstat.vcxproj":"176c57460867dfe8d94d5569fade82d8abc444492e8a4f9887da3ea4c46aad16","src/zlib/contrib/vstudio/vc11/zlibvc.def":"a8179ae609a12e11ec94d4fff884392e0517ee18cd224e77dde63b4674c99bfb","src/zlib/contrib/vstudio/vc11/zlibvc.sln":"836158f77855522a4aae78f6ef40dc496f8fbaa7a858638eb11298204cb503e4","src/zlib/contrib/vstudio/vc11/zlibvc.vcxproj":"d4180c3d6b3ac95c62be7a1dc343ad53eb6710103a36c83222dd05101fe67078","src/zlib/contrib/vstudio/vc12/miniunz.vcxproj":"664f428f874002b89d7bb2c15f19f2af517ca41678139db425c20fdb9616ec7e","src/zlib/contrib/vstudio/vc12/minizip.vcxproj":"c667c2d10ad91faac506301e95903a7977f99194106f3e2231a04c54d03c6273","src/zlib/contrib/vstudio/vc12/testzlib.vcxproj":"69105d1a6e210e24cc77620580d08142c47db6f3eaf8a3a40bb3fa6ee59b752b","src/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj":"b1265a9bb7953d1a327d273b11f9e6dd3b78c2984ce1bddf16e28ca60bfbd8d1","src/zlib/contrib/vstudio/vc12/zlib.rc":"23123c36c6ff28b54f637845be8c0c9f2291a42fb9782b84d6892e5cd847506b","src/zlib/contrib/vstudio/vc12/zlibstat.vcxproj":"0171c39bc9eb77554b764a6b80c5a051961f47883885d88e7d83a33666167d8a","src/zlib/contrib/vstudio/vc12/zlibvc.def":"a8179ae609a12e11ec94d4fff884392e0517ee18cd224e77dde63b4674c99bfb","src/zlib/contrib/vstudio/vc12/zlibvc.sln":"93e679bc5baf9f97ce74f97431d11470efc68bd67f70e76e7aa2397f72a3385c","src/zlib/contrib/vstudio/vc12/zlibvc.vcxproj":"a49901348f5454f8863b582b1ad1e240412b6359000c83a9e32d71662117b197","src/zlib/contrib/vstudio/vc14/miniunz.vcxproj":"0467a461c4dbc95e4ae2c5f6f93b0d560fc0885e52ccda5469bfe1de1cc8d525","src/zlib/contrib/vstudio/vc14/minizip.vcxproj":"2af823bf8f966e31a2a319d1570a7a5a95411a3cc9e96afb1d9351cebce49067","src/zlib/contrib/vstudio/vc14/testzlib.vcxproj":"3bab6f794c54aa086d1b9bf718030df93247903e422d0a3e8aeea40ea7f1d2fa","src/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj":"ca2a32bc3d2da23c0c4a3cd1cdaf9210d37bdf3d370b00211c000f0275889739","src/zlib/contrib/vstudio/vc14/zlib.rc":"23123c36c6ff28b54f637845be8c0c9f2291a42fb9782b84d6892e5cd847506b","src/zlib/contrib/vstudio/vc14/zlibstat.vcxproj":"82651da97bdd9c1ea56f5a9307ec6e4e1af2304b1bd78bc6cf71f1b6a84881f6","src/zlib/contrib/vstudio/vc14/zlibvc.def":"a8179ae609a12e11ec94d4fff884392e0517ee18cd224e77dde63b4674c99bfb","src/zlib/contrib/vstudio/vc14/zlibvc.sln":"c1d7720e3d9f52c4637494986f0bbd0a8b59c4655499883717640d8b5feb0af2","src/zlib/contrib/vstudio/vc14/zlibvc.vcxproj":"7f8b11bedfb85110b03dabf103aab9de779bd244b50f7f48acec757dda87a3fb","src/zlib/contrib/vstudio/vc9/miniunz.vcproj":"d7ec5514397d2485ffa2d81118b79c22f50cf57352e1b083000602490b9f15ed","src/zlib/contrib/vstudio/vc9/minizip.vcproj":"1c1d6f03ca5b59745def2132b88d38aaac2316babffd6e89978aa4c96ab93c2e","src/zlib/contrib/vstudio/vc9/testzlib.vcproj":"b6db0fcc42c980a2c91c3b08216e113af73558cb466e4b90750acc38b52cd07f","src/zlib/contrib/vstudio/vc9/testzlibdll.vcproj":"fb3287a61ff0740dbc1407af6f30860b42e02ec427c1520c3631d61dc40a5d0b","src/zlib/contrib/vstudio/vc9/zlib.rc":"3b9df60a10908876deae58f0b9445c78d7b5e7f61fa2cfc8e809a7d929df84e1","src/zlib/contrib/vstudio/vc9/zlibstat.vcproj":"dcd96fff43a30b95cec5f9591ee8a6b3b4861d39eea65511c430bd8062f7e5b9","src/zlib/contrib/vstudio/vc9/zlibvc.def":"a8179ae609a12e11ec94d4fff884392e0517ee18cd224e77dde63b4674c99bfb","src/zlib/contrib/vstudio/vc9/zlibvc.sln":"dd92d6066c2eac5f6f72952fed37218cc927933b7fe93fc27ca19cd2859dc7b1","src/zlib/contrib/vstudio/vc9/zlibvc.vcproj":"b58700f67c7cd76eea5228b2cd63fd9d29d92b735853458e9bda7c28cba120ec","src/zlib/crc32.c":"8d51d859ba2c1a70fcec131e56847c955a008db4daa96c6dcff151b4af1a2267","src/zlib/crc32.h":"8c64f0179cd2e713b70017172cb0fe59a96b7dda99f88d8ffd01a0625155ed11","src/zlib/deflate.c":"6c467e53064b0cde25c1525fc6d77c5d1ad5d324365431fc2946413492840cfc","src/zlib/deflate.h":"49f68a6909712bda91094cfc0037704e381e14d89605c5206c0dd587501d1de2","src/zlib/doc/algorithm.txt":"8ad31eb03b079ea39d2bd0deaeba8ab5b7220422d27d9beb9823d191b8d70ea4","src/zlib/doc/rfc1950.txt":"79deebf1e572f19a656d7f2f8b78970fbd7db668a957057f16a231d433ffdd32","src/zlib/doc/rfc1951.txt":"27af2450240610482c3f1dafeec569911b46c0218f14e1f50c20b665a3b34a62","src/zlib/doc/rfc1952.txt":"ec47c491c84c4fbe96f706e904f5e308723d228d8c8125c02f1e163ae6ab713a","src/zlib/doc/txtvsbin.txt":"866284a7f69da33b2c04ab4387808edf9142f082c0fcf408a0921fa1f2f657d7","src/zlib/examples/README.examples":"26cc0f94378c96d5b10fb8fc7b067a75981f2ab38a5c1cccda2daf839f6b9ea6","src/zlib/examples/enough.c":"51268283ce0fb7ab518ad536e2e4fee665c215975716c0fb6c921b696760f168","src/zlib/examples/fitblk.c":"dff50b34b2b8f9d8d291de71b5d00d9540f152ab717ea4009c0c93b02fc28abb","src/zlib/examples/gun.c":"f594d4c4b7dc70911aa3214532c4dc71e4ccda25c0f6adecef503b7dba9d7cb5","src/zlib/examples/gzappend.c":"1db9ac5d9c7b0cd756d57d4283282e46c502dff970a9a4c216b7f960527134ff","src/zlib/examples/gzjoin.c":"8d78e08e02a02c7fc9635b536a0e45a19565e08afdba1b83aa95f80e410a12f8","src/zlib/examples/gzlog.c":"6ca62a915aac759411719fad5a11d25d3fe58672e5412df21d9e0969db85def1","src/zlib/examples/gzlog.h":"7c390f441a7a71e40e076280d079c35742e454ad89bd1e556a57f2862fba525d","src/zlib/examples/zlib_how.html":"2cb7d5e7a86e8395bc0bdc55852922c8c9efb0bd751f1758e4a60bcfd35bb4f8","src/zlib/examples/zpipe.c":"707dbc3134cba5ac4a771a3dfdc26954b1ecee46e22ab834bc938857fa967f25","src/zlib/examples/zran.c":"8597d5881573c8264582941b2f786357902ae9163f1731ff2676bbaea0ad8fa9","src/zlib/gzclose.c":"7443f83f9e62b986bc66076313f84f2ed9e4464c8fa9ee1e74094f69774f29a2","src/zlib/gzguts.h":"bd07ed73ce33b24d63323a465559aa19051604050d224d8f8f3fbb3c8b0f6eb4","src/zlib/gzlib.c":"edc805afdb618303ca937406fd3be341747aa7475d02085e2b7bd1a0fdd7f366","src/zlib/gzread.c":"28a167c9077cab7afca7b564305c8ca2e52f251c1a1fa24b69127151f35fb0c4","src/zlib/gzwrite.c":"2bda3a1cb935bf6b01be87ccbe6a50d69739a1feb8a204dfc1423af90ce415c8","src/zlib/infback.c":"ba4b664cc67656d73871a9513d3a0f9519d8abf562030e0f38aeb1669ab046fb","src/zlib/inffast.c":"2cbc4f99a990ea2f4999fa9c1e71be766c983a7966071e76b6d5ad80d3404d88","src/zlib/inffast.h":"4a0d1688a9553fd941e9e0856144a33afbfef2fe220c7815987d2910914c2571","src/zlib/inffixed.h":"82c82b131e5e2699518210b635c756fe9a70edb6eb84441b8bfe601ca0e9bbfc","src/zlib/inflate.c":"bee9c90c2794605e428a0d23b5c01c61e3415d7cf37da3420a6eee867a25b8a0","src/zlib/inflate.h":"6071bca460fad986e1ce23ac99543ec7acf631d028325ad2d33fd4c1aae8e7da","src/zlib/inftrees.c":"b0da94a3029b03b64c62b3c71d4be0d27d16954fa7a1ad38a2d2683e7c4a902b","src/zlib/inftrees.h":"8d753479a2e230c57404ed19a52002c7629f1fd848be0ae038c438dd82607d97","src/zlib/make_vms.com":"d9139323630189c40409717bf52b66485cb621a050e0c589e0e6f631b07b7530","src/zlib/msdos/Makefile.bor":"9cab10931b72c270ccc1670c7d308dbca226df6782214d7862283eb797195d9f","src/zlib/msdos/Makefile.dj2":"7a43d46e89c51c5453b6bc3f0096a6a8cbc0c29d37ab18544ffcb2f0d0c5efa8","src/zlib/msdos/Makefile.emx":"680f9ac021438b70f38e1ef8ec1843f3372d2642a2c4d8223ec880a8d87d1f3c","src/zlib/msdos/Makefile.msc":"4cfead79698213e7b89a5efa08679e4b01bc0af788fa5791e9942fdf7dc12e42","src/zlib/msdos/Makefile.tc":"fc16a0bd5f2a4839d66353b4eef3a37deee71c3d1905b6bd3e044db5efaa2122","src/zlib/nintendods/Makefile":"8b8590632ad66369622323f86df1f2042a9c213efbb141f891d2456dc59b6158","src/zlib/nintendods/README":"6f860207f2addba503e12e35f0c85b1dfd031634e0e4a8b58fcf2e2652f87168","src/zlib/old/Makefile.emx":"ddc007801d1b366be2e6e5d3a3f2afa283fc6d8971b743966a6d002933b159f6","src/zlib/old/Makefile.riscos":"155bc8d78968ec2b2c3992eaeb1c97f15b2f0fb1de97f7e42c0bd4300aa49309","src/zlib/old/README":"7a7237fc6ba1a8de1a608840bb3c6bb58c339436883205b608643aaebea94cb1","src/zlib/old/descrip.mms":"3404506b28cd3bf13e753f6b998afd2d6dc6656f92e9cf6ec917758862740aed","src/zlib/old/os2/Makefile.os2":"7bcd6b884b71617ae6b815cbf3483ce66f2374f47894c03d833e3ba2ad1ba1ac","src/zlib/old/os2/zlib.def":"041cfa199cc7e7e813166c65a2515f297aa042d635fee792549b57c8184e777f","src/zlib/old/visual-basic.txt":"2fe16a28a54f15e9de06f359c5af3cd46df353b22b2a0bdeb49a4c0edd46df50","src/zlib/os400/README400":"9489fa71cd76382773e370b55222bf6365441ff63693b627fc45828fce3ee2e3","src/zlib/os400/bndsrc":"dc412a2448dc92d2fa908783719f49631afbebb732ca041d991863ac831ffc65","src/zlib/os400/make.sh":"665813de57fc1935a944c847f234249527a5a538f5156a5ed62cd43072c09f76","src/zlib/os400/zlib.inc":"c0003839861898ef5914e9c9fdcccb3534ab79105f758a1148a777927d0d662e","src/zlib/qnx/package.qpg":"1090fb0bb128eb6402c945549a948b35d2b53244d0b6c85e077203d6bfbc7e40","src/zlib/test/example.c":"30234a0a8505d4f60073edd023659c73a9ed3c57d0037d76c8e418ca1e1abf92","src/zlib/test/infcover.c":"9fc27589cfdd1b5adf063734b6bbfa5a447f01488f9ce20a70af5021bc5df0f9","src/zlib/test/minigzip.c":"e977eac9751852bb57a31477846fc76b7496381f02c67d87311221bcc24d287f","src/zlib/treebuild.xml":"2cba32ba140d6eb952a70244b11d85d51ca73f92b574a31b1725481e93627412","src/zlib/trees.c":"4272aa26254e8e9085920d0d4d617218182b9c59c698a5784e00be66372e7dea","src/zlib/trees.h":"e158801740a19c696183d371dceefb4f145871b6679640127e0a64eaf5c72e7b","src/zlib/uncompr.c":"ce637efafb478aa591690c0bbd642b43c36e23c1124fc2f55e11b82ddc374c34","src/zlib/watcom/watcom_f.mak":"0ebf3e2f690bb44050316e4bc9edeb59f805cf67aaf10efb40e57bfbe078dd0a","src/zlib/watcom/watcom_l.mak":"e9b1d7683287486d4f4b9842cb6d4e39a2bbe6cccbab5cfc17c816ed956e1d41","src/zlib/win32/DLL_FAQ.txt":"8aa5093efddcb015ee7fb205dce2076ed31afa890bf464d58f12cdf5044c1266","src/zlib/win32/Makefile.bor":"7c451c8a45384554b06c1fdbf807d7488ae68e6f77a012b935b5b13feef40ce2","src/zlib/win32/Makefile.gcc":"2e18877171abe18ccefdf2ad5b49c461112923136f18e1e7a0093982ed54cb83","src/zlib/win32/Makefile.msc":"9a2b856cf6d39d3d40ecb18cf5dbf6c1fbc910b1371f09ddac61eb531a662025","src/zlib/win32/README-WIN32.txt":"ed426b28a8bcfc57bf34114f283e4eb60a997bbf990dcb6c268eb3665017d5a5","src/zlib/win32/VisualC.txt":"8248df251e24b1111336e1d5fefdba238977f7d4a131ddfb0e0664f02c8cc70b","src/zlib/win32/zlib.def":"eca8c1a95b2d679a91734735a576a2ecca50728da4ce5f83e220f412890e3c5b","src/zlib/win32/zlib1.rc":"3f2d6b75e2402c9f6d7a81838e5e92d9ea52da6130e06005f45bc92de234e10d","src/zlib/zconf.h":"13367ec3f07a5e46b79a0267abb716fa5d6c5706eb645af44ef325139a76e10b","src/zlib/zconf.h.cmakein":"fe51ee2e319dc4104c0e78f016d4f71e1a56473086577b85a18500563d39b1da","src/zlib/zconf.h.in":"13367ec3f07a5e46b79a0267abb716fa5d6c5706eb645af44ef325139a76e10b","src/zlib/zlib.3":"dd4e0cbd08bca0f90f226fc4425f7db4a9e3d44b8ccbbcfa0fcb1254246c319b","src/zlib/zlib.3.pdf":"3aab43c8bdb5cbbff5184111718b7c1922a2c91981fb81f0c00e6c493d23d175","src/zlib/zlib.h":"2b5f88206a0b00f2c3c549076cea30e7f85b2782496dafa501d50640007479b8","src/zlib/zlib.map":"2e7844e8b163617798cc84928535a5554d08c67d566a26fb00daf735b74b043e","src/zlib/zlib.pc.cmakein":"97ad4905bc5c35242b3ba27f664acf2cf54dd162391c92eb8b496c20e4955e69","src/zlib/zlib.pc.in":"df631f2997e1a360b1e5d3cc75a4dd982f8d33616640a751f33b7d47bc2a5b70","src/zlib/zlib2ansi":"d22eefa19435928237fcbbf9628cc51fa1b7e0fbf8711ceded1f498b19eb7dd5","src/zlib/zutil.c":"354d7aa1e28cfdf47b60915f5aefa42b63fccb214801385ee44b4eb2fb782a42","src/zlib/zutil.h":"0799c4ac82b1381aaf4f23088aea68f1b58011dd63ad012d19baba69162164ae"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"8ddb025a55fae448c54f9717a4dfa33375a9193f777c8a547e4f3c612c63867f","Android.bp":"baf1e273a1a280fcd32db46ca9eb367f0aaa08c1c74f69639bd46359f42e2954","Cargo.toml":"b3731a56e4f3cbd8130f37ca4d4a3bbb25913d0c620c978653da3f1d8e90c17f","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"9acbb7b79590c4e57f954f867a8127525e583b3aa55e33d2b413a43c172ae14f","METADATA":"658dd2e0585a1d90efbc05a692525123a923673b4b29e6398286625a5fc3f259","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README-zng.md":"9042e2523fc4aa3801655e41794821b33415fa1a227af280681f8448a7a398db","README.android":"4707eda9b9853468d6af947830a72232157afa13f2fb6ad78a04d7a502d61e57","README.md":"34d3194c8378c9c9e05aa8b481742c540611697b4e04edbfa499709d80ac9be2","TEST_MAPPING":"16dc7654734aa1b0b24e6311107dfd5fc00f51292b2fcf45b2764cfcce3c71c5","build.rs":"d32ea89ee11f4a5171b4b34f9e60af2ccf9223619792a2d4e8e9137d71c979ae","build_zng.rs":"51f13e005858c15773766580866be26ffe8c2caa95c4355d3c1e0a360ce4beb5","cargo_embargo.json":"c3e1f34bad0ee501484da7e2ede9f8be6de2c26b2ae7e9f9bfd8251f6a797db0","patches/readme.patch":"6bf296bb117f72606ba7be2db46bdea6e4401bca977bb09a592d5c514cd7016b","src/lib.rs":"4f2433152b03cbaf2a4fa06747ff8028cbd2f0254eef57074bd8c0f2e04abf2b","src/smoke.c":"4a36cb1d00aaf9ef21958dad2e46a2bdae4e5f309c32bf58b9ac447d3eb189ea"}}
\ No newline at end of file

crates/libz-sys/src/zlib-ng/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib-ng/CMakeLists.txt b/crates/libz-sys/src/zlib-ng/CMakeLists.txt
deleted file mode 100644
index a62a95e..0000000
--- a/crates/libz-sys/src/zlib-ng/CMakeLists.txt
+++ /dev/null
@@ -1,1496 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-if(CMAKE_VERSION VERSION_LESS 3.12)
-    cmake_policy(VERSION ${CMAKE_VERSION})
-else()
-    cmake_policy(VERSION 3.5.1...3.13.2)
-endif()
-message(STATUS "Using CMake version ${CMAKE_VERSION}")
-
-set(CMAKE_MACOSX_RPATH 1)
-
-# If not specified on the command line, enable C11 as the default
-# Configuration items that affect the global compiler environment standards
-# should be issued before the "project" command.
-if(NOT CMAKE_C_STANDARD)
-    set(CMAKE_C_STANDARD 11)          # The C standard whose features are requested to build this target
-endif()
-if(NOT CMAKE_C_STANDARD_REQUIRED)
-    set(CMAKE_C_STANDARD_REQUIRED ON) # Boolean describing whether the value of C_STANDARD is a requirement
-endif()
-if(NOT CMAKE_C_EXTENSIONS)
-    set(CMAKE_C_EXTENSIONS OFF)       # Boolean specifying whether compiler specific extensions are requested
-endif()
-set(VALID_C_STANDARDS "99" "11")
-if(NOT CMAKE_C_STANDARD IN_LIST VALID_C_STANDARDS)
-    MESSAGE(FATAL_ERROR "CMAKE_C_STANDARD:STRING=${CMAKE_C_STANDARD} not in known standards list\n ${VALID_C_STANDARDS}")
-endif()
-
-# Parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.h.in _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9]+.[0-9]+.[0-9]+).*\".*"
-        "\\1" ZLIB_HEADER_VERSION ${_zlib_h_contents})
-string(REGEX REPLACE ".*#define[ \t]+ZLIBNG_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-        "\\1" ZLIBNG_HEADER_VERSION ${_zlib_h_contents})
-message(STATUS "ZLIB_HEADER_VERSION: ${ZLIB_HEADER_VERSION}")
-message(STATUS "ZLIBNG_HEADER_VERSION: ${ZLIBNG_HEADER_VERSION}")
-
-project(zlib VERSION ${ZLIB_HEADER_VERSION} LANGUAGES C)
-
-include(CheckTypeSize)
-include(CheckSymbolExists)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckCSourceCompiles)
-include(CheckCSourceRuns)
-include(CheckCCompilerFlag)
-include(CMakeDependentOption)
-include(FeatureSummary)
-
-include(cmake/detect-arch.cmake)
-include(cmake/detect-install-dirs.cmake)
-include(cmake/detect-coverage.cmake)
-include(cmake/detect-intrinsics.cmake)
-include(cmake/detect-sanitizer.cmake)
-include(cmake/fallback-macros.cmake)
-
-if(CMAKE_TOOLCHAIN_FILE)
-    message(STATUS "Using CMake toolchain: ${CMAKE_TOOLCHAIN_FILE}")
-endif()
-
-# Make sure we use an appropriate BUILD_TYPE by default, "Release" to be exact
-# this should select the maximum generic optimisation on the current platform (i.e. -O3 for gcc/clang)
-if(NOT GENERATOR_IS_MULTI_CONFIG)
-    if(NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE "Release" CACHE STRING
-            "Choose the type of build, standard options are: Debug Release RelWithDebInfo MinSizeRel."
-            FORCE)
-        add_feature_info(CMAKE_BUILD_TYPE 1 "Build type: ${CMAKE_BUILD_TYPE} (default)")
-    else()
-        add_feature_info(CMAKE_BUILD_TYPE 1 "Build type: ${CMAKE_BUILD_TYPE} (selected)")
-    endif()
-endif()
-
-#
-# Options parsing
-#
-option(WITH_GZFILEOP "Compile with support for gzFile related functions" ON)
-option(ZLIB_COMPAT "Compile with zlib compatible API" OFF)
-option(ZLIB_ENABLE_TESTS "Build test binaries" ON)
-option(ZLIB_DUAL_LINK "Dual link tests against system zlib" OFF)
-option(WITH_FUZZERS "Build test/fuzz" OFF)
-option(WITH_BENCHMARKS "Build test/benchmarks" OFF)
-option(WITH_BENCHMARK_APPS "Build application benchmarks" OFF)
-option(WITH_OPTIM "Build with optimisation" ON)
-option(WITH_REDUCED_MEM "Reduced memory usage for special cases (reduces performance)" OFF)
-option(WITH_NEW_STRATEGIES "Use new strategies" ON)
-option(WITH_NATIVE_INSTRUCTIONS
-    "Instruct the compiler to use the full instruction set on this host (gcc/clang -march=native)" OFF)
-option(WITH_MAINTAINER_WARNINGS "Build with project maintainer warnings" OFF)
-option(WITH_CODE_COVERAGE "Enable code coverage reporting" OFF)
-option(WITH_INFLATE_STRICT "Build with strict inflate distance checking" OFF)
-option(WITH_INFLATE_ALLOW_INVALID_DIST "Build with zero fill for inflate invalid distances" OFF)
-option(WITH_UNALIGNED "Support unaligned reads on platforms that support it" ON)
-
-set(ZLIB_SYMBOL_PREFIX "" CACHE STRING "Give this prefix to all publicly exported symbols.
-Useful when embedding into a larger library.
-Default is no prefix (empty prefix).")
-
-# Add multi-choice option
-set(WITH_SANITIZER AUTO CACHE STRING "Enable sanitizer support")
-set_property(CACHE WITH_SANITIZER PROPERTY STRINGS "Memory" "Address" "Undefined" "Thread")
-
-if(BASEARCH_ARM_FOUND)
-    option(WITH_ACLE "Build with ACLE" ON)
-    option(WITH_NEON "Build with NEON intrinsics" ON)
-elseif(BASEARCH_PPC_FOUND)
-    option(WITH_ALTIVEC "Build with AltiVec (VMX) optimisations for PowerPC" ON)
-    option(WITH_POWER8 "Build with optimisations for POWER8" ON)
-    option(WITH_POWER9 "Build with optimisations for POWER9" ON)
-elseif(BASEARCH_S360_FOUND)
-    option(WITH_DFLTCC_DEFLATE "Build with DFLTCC intrinsics for compression on IBM Z" OFF)
-    option(WITH_DFLTCC_INFLATE "Build with DFLTCC intrinsics for decompression on IBM Z" OFF)
-    option(WITH_CRC32_VX "Build with vectorized CRC32 on IBM Z" ON)
-elseif(BASEARCH_X86_FOUND)
-    option(FORCE_TZCNT "Always assume CPU is TZCNT capable" OFF)
-    option(WITH_AVX2 "Build with AVX2" ON)
-    option(WITH_AVX512 "Build with AVX512" ON)
-    option(WITH_AVX512VNNI "Build with AVX512 VNNI extensions" ON)
-    option(WITH_SSE2 "Build with SSE2" ON)
-    option(WITH_SSSE3 "Build with SSSE3" ON)
-    option(WITH_SSE41 "Build with SSE41" ON)
-    option(WITH_SSE42 "Build with SSE42" ON)
-    option(WITH_PCLMULQDQ "Build with PCLMULQDQ" ON)
-    option(WITH_VPCLMULQDQ "Build with VPCLMULQDQ" ON)
-endif()
-
-option(INSTALL_UTILS "Copy minigzip and minideflate during install" OFF)
-
-mark_as_advanced(FORCE
-    ZLIB_SYMBOL_PREFIX
-    ZLIB_DUAL_LINK
-    WITH_REDUCED_MEM
-    WITH_ACLE WITH_NEON
-    WITH_DFLTCC_DEFLATE
-    WITH_DFLTCC_INFLATE
-    WITH_CRC32_VX
-    WITH_AVX2 WITH_SSE2
-    WITH_SSSE3 WITH_SSE41
-    WITH_SSE42
-    WITH_PCLMULQDQ
-    WITH_ALTIVEC
-    WITH_POWER8
-    WITH_POWER9
-    WITH_INFLATE_STRICT
-    WITH_INFLATE_ALLOW_INVALID_DIST
-    WITH_UNALIGNED
-    INSTALL_UTILS
-    )
-
-if(ZLIB_COMPAT)
-    add_definitions(-DZLIB_COMPAT)
-    set(WITH_GZFILEOP ON)
-    set(SUFFIX "")
-else()
-    set(SUFFIX "-ng")
-endif()
-
-if(WITH_GZFILEOP)
-    add_definitions(-DWITH_GZFILEOP)
-endif()
-
-if(CMAKE_C_COMPILER_ID MATCHES "^Intel")
-    if(CMAKE_HOST_UNIX)
-        set(WARNFLAGS -Wall)
-        set(WARNFLAGS_MAINTAINER -Wall -Wcheck -Wremarks)
-        set(WARNFLAGS_DISABLE)
-    else()
-        set(WARNFLAGS /Wall)
-        set(WARNFLAGS_MAINTAINER /W5)
-        set(WARNFLAGS_DISABLE)
-    endif()
-    if(WITH_NATIVE_INSTRUCTIONS)
-        message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not supported on this configuration")
-        set(WITH_NATIVE_INSTRUCTIONS OFF)
-    endif()
-elseif(MSVC)
-    # Minimum supported MSVC version is 1800 = Visual Studio 12.0/2013
-    # See also https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
-    if(MSVC_VERSION VERSION_LESS 1800)
-        message(SEND_ERROR "Unsupported Visual Studio compiler version (requires 2013 or later).")
-    endif()
-    # TODO. ICC can be used through MSVC. I'm not sure if we'd ever see that combination
-    # (who'd use cmake from an IDE...) but checking for ICC before checking for MSVC should
-    # avoid mistakes.
-    # /Oi ?
-    set(WARNFLAGS /W3)
-    set(WARNFLAGS_MAINTAINER /W4)
-    set(WARNFLAGS_DISABLE)
-    if(BASEARCH_ARM_FOUND)
-        add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
-        if(NOT "${ARCH}" MATCHES "aarch64")
-            set(NEONFLAG "/arch:VFPv4")
-        endif()
-        endif()
-    if(WITH_NATIVE_INSTRUCTIONS)
-        message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not supported on this configuration")
-        set(WITH_NATIVE_INSTRUCTIONS OFF)
-    endif()
-elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-    # Enable warnings in GCC and Clang
-    set(WARNFLAGS -Wall)
-    set(WARNFLAGS_MAINTAINER -Wextra -Wpedantic)
-    set(WARNFLAGS_DISABLE -Wno-implicit-fallthrough)
-    if(WITH_NATIVE_INSTRUCTIONS)
-        if(BASEARCH_PPC_FOUND)
-            set(NATIVEFLAG "-mcpu=native")
-        else()
-            set(NATIVEFLAG "-march=native")
-        endif()
-    else()
-        if(BASEARCH_ARM_FOUND)
-            if("${ARCH}" MATCHES "arm" AND NOT CMAKE_C_FLAGS MATCHES "-mfloat-abi")
-                # Auto-detect support for ARM floating point ABI
-                set(CMAKE_REQUIRED_FLAGS -mfloat-abi=softfp)
-                check_c_source_compiles(
-                    "#include <features.h>
-                    int main() { return 0; }"
-                    HAVE_FLOATABI_SOFTFP)
-                if(HAVE_FLOATABI_SOFTFP)
-                    set(FLOATABI -mfloat-abi=softfp)
-                else()
-                    set(CMAKE_REQUIRED_FLAGS -mfloat-abi=hard)
-                    check_c_source_compiles(
-                        "#include <features.h>
-                        int main() { return 0; }"
-                        HAVE_FLOATABI_HARD)
-                    if(HAVE_FLOATABI_HARD)
-                        set(FLOATABI -mfloat-abi=hard)
-                    endif()
-                endif()
-                set(CMAKE_REQUIRED_FLAGS)
-                if(FLOATABI)
-                    message(STATUS "ARM floating point arch: ${FLOATABI}")
-                    add_compile_options(${FLOATABI})
-                else()
-                    message(STATUS "ARM floating point arch not auto-detected")
-                endif()
-            endif()
-        endif()
-        # Check whether -fno-lto is available
-        set(CMAKE_REQUIRED_FLAGS "-fno-lto")
-        check_c_source_compiles(
-            "int main() { return 0; }"
-            FNO_LTO_AVAILABLE FAIL_REGEX "not supported")
-        set(CMAKE_REQUIRED_FLAGS)
-        if(FNO_LTO_AVAILABLE)
-            set(NOLTOFLAG "-fno-lto")
-        endif()
-    endif()
-else()
-    if(WITH_NATIVE_INSTRUCTIONS)
-        message(STATUS "Ignoring WITH_NATIVE_INSTRUCTIONS; not implemented yet on this configuration")
-        set(WITH_NATIVE_INSTRUCTIONS OFF)
-    endif()
-endif()
-
-# Disable LTO
-if(NOT WITH_NATIVE_INSTRUCTIONS)
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
-    foreach(_cfg_name IN LISTS CMAKE_CONFIGURATION_TYPES)
-        string(TOUPPER "${_cfg_name}" _cfg_name_uc)
-        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_${_cfg_name_uc} OFF)
-    endforeach()
-endif()
-
-# Set architecture alignment requirements
-if(NOT WITH_UNALIGNED)
-    add_definitions(-DNO_UNALIGNED)
-    message(STATUS "Unaligned reads manually disabled")
-endif()
-
-# Apply warning compiler flags
-if(WITH_MAINTAINER_WARNINGS)
-    add_compile_options(${WARNFLAGS} ${WARNFLAGS_MAINTAINER} ${WARNFLAGS_DISABLE})
-else()
-    add_compile_options(${WARNFLAGS} ${WARNFLAGS_DISABLE})
-endif()
-
-# Set code coverage compiler flags
-if(WITH_CODE_COVERAGE)
-    add_code_coverage()
-endif()
-
-# Replace optimization level 3 added by default with level 2
-if(NOT WITH_CODE_COVERAGE AND NOT MSVC AND NOT CMAKE_C_FLAGS MATCHES "([\\/\\-]O)3")
-    string(REGEX REPLACE "([\\/\\-]O)3" "\\12"
-        CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-endif()
-
-# Set native instruction set compiler flag
-if(WITH_NATIVE_INSTRUCTIONS AND DEFINED NATIVEFLAG)
-    # Apply flag to all source files and compilation checks
-    add_compile_options(${NATIVEFLAG})
-endif()
-
-#
-# Check for standard/system includes
-#
-check_include_file(sys/auxv.h  HAVE_SYS_AUXV_H)
-if(HAVE_SYS_AUXV_H)
-    add_definitions(-DHAVE_SYS_AUXV_H)
-endif()
-check_include_file(sys/sdt.h   HAVE_SYS_SDT_H)
-if(HAVE_SYS_SDT_H)
-    add_definitions(-DHAVE_SYS_SDT_H)
-endif()
-check_include_file(unistd.h    HAVE_UNISTD_H)
-
-#
-# Check to see if we have large file support
-#
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-    add_definitions(-D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
-else()
-    check_type_size(_off64_t _OFF64_T)
-    if(HAVE__OFF64_T)
-        add_definitions(-D_LARGEFILE64_SOURCE=1 -D__USE_LARGEFILE64)
-    else()
-        check_type_size(__off64_t __OFF64_T)
-    endif()
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-#
-# Check for fseeko and other optional functions
-#
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-check_function_exists(strerror HAVE_STRERROR)
-if(NOT HAVE_STRERROR)
-    add_definitions(-DNO_STRERROR)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS -D _POSIX_C_SOURCE=200112L)
-check_function_exists(posix_memalign HAVE_POSIX_MEMALIGN)
-if(HAVE_POSIX_MEMALIGN)
-    add_definitions(-DHAVE_POSIX_MEMALIGN)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS)
-
-if(WITH_SANITIZER STREQUAL "Address")
-    add_address_sanitizer()
-elseif(WITH_SANITIZER STREQUAL "Memory")
-    add_memory_sanitizer()
-elseif(WITH_SANITIZER STREQUAL "Thread")
-    add_thread_sanitizer()
-elseif(WITH_SANITIZER STREQUAL "Undefined")
-    add_undefined_sanitizer()
-endif()
-
-#
-# Check whether compiler supports -fno-semantic-interposition parameter
-#
-check_c_compiler_flag(-fno-semantic-interposition HAVE_NO_INTERPOSITION)
-
-#
-# Check if we can hide zlib internal symbols that are linked between separate source files using hidden
-#
-check_c_source_compiles(
-    "#define Z_INTERNAL __attribute__((visibility (\"hidden\")))
-    int Z_INTERNAL foo;
-    int main() {
-        return 0;
-    }"
-    HAVE_ATTRIBUTE_VISIBILITY_HIDDEN FAIL_REGEX "not supported")
-if(HAVE_ATTRIBUTE_VISIBILITY_HIDDEN)
-    add_definitions(-DHAVE_VISIBILITY_HIDDEN)
-endif()
-
-#
-# Check if we can hide zlib internal symbols that are linked between separate source files using internal
-#
-check_c_source_compiles(
-    "#define Z_INTERNAL __attribute__((visibility (\"internal\")))
-    int Z_INTERNAL foo;
-    int main() {
-        return 0;
-    }"
-    HAVE_ATTRIBUTE_VISIBILITY_INTERNAL FAIL_REGEX "not supported")
-if(HAVE_ATTRIBUTE_VISIBILITY_INTERNAL)
-    add_definitions(-DHAVE_VISIBILITY_INTERNAL)
-endif()
-
-#
-# check for __builtin_ctz() support in the compiler
-#
-check_c_source_compiles(
-    "int main(void) {
-        unsigned int zero = 0;
-        long test = __builtin_ctz(zero);
-        (void)test;
-        return 0;
-    }"
-    HAVE_BUILTIN_CTZ
-)
-if(HAVE_BUILTIN_CTZ)
-    add_definitions(-DHAVE_BUILTIN_CTZ)
-endif()
-#
-# check for __builtin_ctzll() support in the compiler
-#
-check_c_source_compiles(
-    "int main(void) {
-        unsigned int zero = 0;
-        long test = __builtin_ctzll(zero);
-        (void)test;
-        return 0;
-    }"
-    HAVE_BUILTIN_CTZLL
-)
-if(HAVE_BUILTIN_CTZLL)
-    add_definitions(-DHAVE_BUILTIN_CTZLL)
-endif()
-
-#
-# check for ptrdiff_t support
-#
-check_c_source_compiles(
-    "#include <stddef.h>
-     int main() {
-         ptrdiff_t *a;
-         (void)a;
-         return 0;
-    }"
-    HAVE_PTRDIFF_T
-)
-if(NOT HAVE_PTRDIFF_T)
-    set(NEED_PTRDIFF_T 1)
-
-    check_type_size("void *" SIZEOF_DATA_PTR)
-    message(STATUS "sizeof(void *) is ${SIZEOF_DATA_PTR} bytes")
-
-    if(${SIZEOF_DATA_PTR} MATCHES "4")
-        set(PTRDIFF_TYPE "uint32_t")
-    elseif(${SIZEOF_DATA_PTR} MATCHES "8")
-        set(PTRDIFF_TYPE "uint64_t")
-    else()
-        message(FATAL_ERROR "sizeof(void *) is neither 32 nor 64 bit")
-    endif()
-endif()
-
-# Macro to check if source compiles
-# (and, when compiling very natively, also runs).
-macro(check_c_source_compile_or_run source flag)
-    if(CMAKE_CROSSCOMPILING OR NOT WITH_NATIVE_INSTRUCTIONS)
-        check_c_source_compiles("${source}" ${flag})
-    else()
-        check_c_source_runs("${source}" ${flag})
-    endif()
-endmacro()
-
-add_compile_options($<$<CONFIG:Debug>:-DZLIB_DEBUG>)
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-endif()
-
-if(BASEARCH_X86_FOUND)
-    # FORCE_SSE2 option will only be shown if HAVE_SSE2_INTRIN is true
-    if("${ARCH}" MATCHES "i[3-6]86")
-        cmake_dependent_option(FORCE_SSE2 "Always assume CPU is SSE2 capable" OFF "HAVE_SSE2_INTRIN" OFF)
-    endif()
-endif()
-
-#
-# Enable deflate_quick at level 1
-#
-if(NOT WITH_NEW_STRATEGIES)
-    add_definitions(-DNO_QUICK_STRATEGY)
-endif()
-#
-# Enable deflate_medium at level 4-6
-#
-if(NOT WITH_NEW_STRATEGIES)
-    add_definitions(-DNO_MEDIUM_STRATEGY)
-endif()
-#
-# Enable inflate compilation options
-#
-if(WITH_INFLATE_STRICT)
-    add_definitions(-DINFLATE_STRICT)
-    message(STATUS "Inflate strict distance checking enabled")
-endif()
-if(WITH_INFLATE_ALLOW_INVALID_DIST)
-    add_definitions(-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR)
-    message(STATUS "Inflate zero data for invalid distances enabled")
-endif()
-#
-# Enable reduced memory configuration
-#
-if(WITH_REDUCED_MEM)
-    add_definitions(-DHASH_SIZE=32768u -DGZBUFSIZE=8192)
-    message(STATUS "Configured for reduced memory environment")
-endif()
-
-
-set(ZLIB_ARCH_SRCS)
-set(ZLIB_ARCH_HDRS)
-set(ARCHDIR "arch/generic")
-if(BASEARCH_ARM_FOUND)
-    set(ARCHDIR "arch/arm")
-elseif(BASEARCH_PPC_FOUND)
-    set(ARCHDIR "arch/power")
-elseif(BASEARCH_S360_FOUND)
-    set(ARCHDIR "arch/s390")
-elseif(BASEARCH_X86_FOUND)
-    set(ARCHDIR "arch/x86")
-    if(NOT ${ARCH} MATCHES "x86_64")
-        add_feature_info(SSE2 1 "Support the SSE2 instruction set, using \"${SSE2FLAG}\"")
-    endif()
-else()
-    message(STATUS "No optimized architecture: using ${ARCHDIR}")
-endif()
-
-if(WITH_OPTIM)
-    if(BASEARCH_ARM_FOUND)
-        add_definitions(-DARM_FEATURES)
-        if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-            if(NOT "${ARCH}" MATCHES "aarch64")
-                check_c_source_compiles(
-                    "#include <sys/auxv.h>
-                    int main() {
-                        return (getauxval(AT_HWCAP2) & HWCAP2_CRC32);
-                    }"
-                    ARM_AUXV_HAS_CRC32
-                )
-                if(ARM_AUXV_HAS_CRC32)
-                    add_definitions(-DARM_AUXV_HAS_CRC32)
-                else()
-                    check_c_source_compiles(
-                        "#include <sys/auxv.h>
-                        #include <asm/hwcap.h>
-                        int main() {
-                            return (getauxval(AT_HWCAP2) & HWCAP2_CRC32);
-                        }"
-                        ARM_HWCAP_HAS_CRC32
-                    )
-                    if (ARM_HWCAP_HAS_CRC32)
-                        add_definitions(-DARM_AUXV_HAS_CRC32 -DARM_ASM_HWCAP)
-                    else()
-                        message(STATUS "HWCAP2_CRC32 not present in sys/auxv.h; cannot detect support at runtime.")
-                    endif()
-                endif()
-            else()
-                check_c_source_compiles(
-                    "#include <sys/auxv.h>
-                    int main() {
-                        return (getauxval(AT_HWCAP) & HWCAP_CRC32);
-                    }"
-                    ARM_AUXV_HAS_CRC32
-                )
-                if(ARM_AUXV_HAS_CRC32)
-                    add_definitions(-DARM_AUXV_HAS_CRC32)
-                else()
-                   message(STATUS "HWCAP_CRC32 not present in sys/auxv.h; cannot detect support at runtime.")
-                endif()
-            endif()
-            if(NOT "${ARCH}" MATCHES "aarch64")
-                check_c_source_compiles(
-                    "#include <sys/auxv.h>
-                    int main() {
-                      return (getauxval(AT_HWCAP) & HWCAP_ARM_NEON);
-                    }"
-                    ARM_AUXV_HAS_NEON
-                )
-                if(ARM_AUXV_HAS_NEON)
-                    add_definitions(-DARM_AUXV_HAS_NEON)
-                else()
-                    check_c_source_compiles(
-                        "#include <sys/auxv.h>
-                        int main() {
-                          return (getauxval(AT_HWCAP) & HWCAP_NEON);
-                        }"
-                        ARM_AUXV_HAS_NEON
-                    )
-                    if (ARM_AUXV_HAS_NEON)
-                        add_definitions(-DARM_AUXV_HAS_NEON)
-                    else()
-                        message(STATUS "Neither HWCAP_ARM_NEON or HWCAP_NEON present in sys/auxv.h; cannot detect support at runtime.")
-                    endif()
-                endif()
-            endif()
-        endif()
-        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm_features.h)
-        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/arm_features.c)
-        if(WITH_ACLE AND NOT MSVC AND NOT "${ARCH}" MATCHES "armv[2-7]")
-            check_acle_compiler_flag()
-            if(HAVE_ACLE_FLAG)
-                add_definitions(-DARM_ACLE_CRC_HASH)
-                set(ACLE_SRCS ${ARCHDIR}/crc32_acle.c ${ARCHDIR}/insert_string_acle.c)
-                set_property(SOURCE ${ACLE_SRCS} PROPERTY COMPILE_FLAGS "${ACLEFLAG} ${NOLTOFLAG}")
-                list(APPEND ZLIB_ARCH_SRCS ${ACLE_SRCS})
-                add_feature_info(ACLE_CRC 1 "Support ACLE optimized CRC hash generation, using \"${ACLEFLAG}\"")
-            else()
-                set(WITH_ACLE OFF)
-            endif()
-        else()
-            set(WITH_ACLE OFF)
-        endif()
-        if(WITH_NEON)
-            check_neon_compiler_flag()
-            if(MFPU_NEON_AVAILABLE)
-                add_definitions(-DARM_NEON -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH)
-                set(NEON_SRCS ${ARCHDIR}/adler32_neon.c ${ARCHDIR}/chunkset_neon.c
-                    ${ARCHDIR}/compare256_neon.c ${ARCHDIR}/slide_hash_neon.c)
-                list(APPEND ZLIB_ARCH_SRCS ${NEON_SRCS})
-                set_property(SOURCE ${NEON_SRCS} PROPERTY COMPILE_FLAGS "${NEONFLAG} ${NOLTOFLAG}")
-                if(MSVC)
-                    add_definitions(-D__ARM_NEON__)
-                endif()
-                add_feature_info(NEON_ADLER32 1 "Support NEON instructions in adler32, using \"${NEONFLAG}\"")
-                add_feature_info(NEON_SLIDEHASH 1 "Support NEON instructions in slide_hash, using \"${NEONFLAG}\"")
-                check_neon_ld4_intrinsics()
-                if(NEON_HAS_LD4)
-                    add_definitions(-DARM_NEON_HASLD4)
-                endif()
-            else()
-                set(WITH_NEON OFF)
-            endif()
-        endif()
-    elseif(BASEARCH_PPC_FOUND)
-        # Common arch detection code
-        if(WITH_ALTIVEC)
-            check_ppc_intrinsics()
-        endif()
-        if(WITH_POWER8)
-            check_power8_intrinsics()
-        endif()
-        if(WITH_POWER9)
-            check_power9_intrinsics()
-        endif()
-        if(HAVE_VMX OR HAVE_POWER8_INTRIN OR HAVE_POWER9_INTRIN)
-            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c)
-        endif()
-        # VMX specific options and files
-        if(WITH_ALTIVEC)
-            if(HAVE_VMX)
-                add_definitions(-DPPC_FEATURES)
-                if(HAVE_ALTIVEC)
-                    add_definitions(-DPPC_VMX_ADLER32)
-                    add_definitions(-DPPC_VMX_SLIDEHASH)
-                    set(PPC_SRCS ${ARCHDIR}/adler32_vmx.c ${ARCHDIR}/slide_hash_vmx.c)
-                    list(APPEND ZLIB_ARCH_SRCS ${PPC_SRCS})
-                    add_feature_info(ALTIVEC 1 "Support the AltiVec instruction set, using \"-maltivec\"")
-                    set_property(SOURCE ${PPC_SRCS} PROPERTY COMPILE_FLAGS "${PPCFLAGS}")
-                else()
-                    set(WITH_ALTIVEC OFF)
-                endif()
-            endif()
-        endif()
-        # Power8 specific options and files
-        if(WITH_POWER8)
-            if(HAVE_POWER8_INTRIN)
-                add_definitions(-DPOWER8)
-                add_definitions(-DPOWER_FEATURES)
-                add_definitions(-DPOWER8_VSX_ADLER32)
-                add_definitions(-DPOWER8_VSX_CHUNKSET)
-                add_definitions(-DPOWER8_VSX_SLIDEHASH)
-                set(POWER8_SRCS ${ARCHDIR}/adler32_power8.c ${ARCHDIR}/chunkset_power8.c ${ARCHDIR}/slide_hash_power8.c)
-                if("${ARCH}" MATCHES "powerpc64(le)?")
-                    add_definitions(-DPOWER8_VSX_CRC32)
-                    list(APPEND POWER8_SRCS ${ARCHDIR}/crc32_power8.c)
-                endif()
-                list(APPEND ZLIB_ARCH_SRCS ${POWER8_SRCS})
-                set_property(SOURCE ${POWER8_SRCS} PROPERTY COMPILE_FLAGS "${POWER8FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_POWER8 OFF)
-            endif()
-        endif()
-        # Power9 specific options and files
-        if(WITH_POWER9)
-            if(HAVE_POWER9_INTRIN)
-                add_definitions(-DPOWER9)
-                set(POWER9_SRCS ${ARCHDIR}/compare256_power9.c)
-                list(APPEND ZLIB_ARCH_SRCS ${POWER9_SRCS})
-                set_property(SOURCE ${POWER9_SRCS} PROPERTY COMPILE_FLAGS "${POWER9FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_POWER9 OFF)
-            endif()
-        endif()
-    elseif(BASEARCH_S360_FOUND)
-        check_s390_intrinsics()
-        if(HAVE_S390_INTRIN)
-            add_definitions(-DS390_FEATURES)
-            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/s390_features.h)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/s390_features.c)
-        endif()
-        if(WITH_DFLTCC_DEFLATE OR WITH_DFLTCC_INFLATE)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/dfltcc_common.c)
-        endif()
-        if(WITH_DFLTCC_DEFLATE)
-            add_definitions(-DS390_DFLTCC_DEFLATE)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/dfltcc_deflate.c)
-        endif()
-        if(WITH_DFLTCC_INFLATE)
-            add_definitions(-DS390_DFLTCC_INFLATE)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/dfltcc_inflate.c)
-        endif()
-        if(WITH_CRC32_VX)
-            check_vgfma_intrinsics()
-            if(HAVE_VGFMA_INTRIN)
-                add_definitions(-DS390_CRC32_VX)
-                set(CRC32_VX_SRCS ${ARCHDIR}/crc32-vx.c)
-                list(APPEND ZLIB_ARCH_SRCS ${CRC32_VX_SRCS})
-                set_property(SOURCE ${CRC32_VX_SRCS} PROPERTY COMPILE_FLAGS "${VGFMAFLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_CRC32_VX OFF)
-            endif()
-        endif()
-    elseif(BASEARCH_X86_FOUND)
-        add_definitions(-DX86_FEATURES)
-        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86_features.h)
-        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86_features.c)
-        if(MSVC)
-            list(APPEND ZLIB_ARCH_HDRS fallback_builtins.h)
-        endif()
-        if(WITH_AVX2)
-            check_avx2_intrinsics()
-            if(HAVE_AVX2_INTRIN)
-                add_definitions(-DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET)
-                set(AVX2_SRCS ${ARCHDIR}/slide_hash_avx2.c)
-                add_feature_info(AVX2_SLIDEHASH 1 "Support AVX2 optimized slide_hash, using \"${AVX2FLAG}\"")
-                list(APPEND AVX2_SRCS ${ARCHDIR}/chunkset_avx.c)
-                add_feature_info(AVX_CHUNKSET 1 "Support AVX optimized chunkset, using \"${AVX2FLAG}\"")
-                list(APPEND AVX2_SRCS ${ARCHDIR}/compare256_avx2.c)
-                add_feature_info(AVX2_COMPARE256 1 "Support AVX2 optimized compare256, using \"${AVX2FLAG}\"")
-                list(APPEND AVX2_SRCS ${ARCHDIR}/adler32_avx2.c)
-                add_feature_info(AVX2_ADLER32 1 "Support AVX2-accelerated adler32, using \"${AVX2FLAG}\"")
-                list(APPEND ZLIB_ARCH_SRCS ${AVX2_SRCS})
-                set_property(SOURCE ${AVX2_SRCS} PROPERTY COMPILE_FLAGS "${AVX2FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_AVX2 OFF)
-            endif()
-        endif()
-        if(WITH_AVX512)
-            check_avx512_intrinsics()
-            if(HAVE_AVX512_INTRIN)
-                add_definitions(-DX86_AVX512 -DX86_AVX512_ADLER32)
-                list(APPEND AVX512_SRCS ${ARCHDIR}/adler32_avx512.c)
-                add_feature_info(AVX512_ADLER32 1 "Support AVX512-accelerated adler32, using \"${AVX512FLAG}\"")
-                list(APPEND ZLIB_ARCH_SRCS ${AVX512_SRCS})
-                list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/adler32_avx512_p.h)
-                if(HAVE_MASK_INTRIN)
-                    add_definitions(-DX86_MASK_INTRIN)
-                endif()
-                set_property(SOURCE ${AVX512_SRCS} PROPERTY COMPILE_FLAGS "${AVX512FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_AVX512 OFF)
-            endif()
-        endif()
-        if(WITH_AVX512VNNI)
-            check_avx512vnni_intrinsics()
-            if(HAVE_AVX512VNNI_INTRIN)
-                add_definitions(-DX86_AVX512VNNI -DX86_AVX512VNNI_ADLER32)
-                add_feature_info(AVX512VNNI_ADLER32 1 "Support AVX512VNNI adler32, using \"${AVX512VNNIFLAG}\"")
-                list(APPEND AVX512VNNI_SRCS ${ARCHDIR}/adler32_avx512_vnni.c)
-                list(APPEND ZLIB_ARCH_SRCS ${AVX512VNNI_SRCS})
-                set_property(SOURCE ${AVX512VNNI_SRCS} PROPERTY COMPILE_FLAGS "${AVX512VNNIFLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_AVX512VNNI OFF)
-            endif()
-        endif()
-        if(WITH_SSE41)
-            check_sse41_intrinsics()
-            if(HAVE_SSE41_INTRIN)
-                add_definitions(-DX86_SSE41)
-                list(APPEND SSE41_SRCS ${ARCHDIR}/chunkset_sse41.c)
-                list(APPEND ZLIB_ARCH_SRCS ${SSE41_SRCS})
-                set_property(SOURCE ${SSE41_SRCS} PROPERTY COMPILE_FLAGS "${SSE41FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_SSE41 OFF)
-            endif()
-        endif()
-        if(WITH_SSE42)
-            check_sse42_intrinsics()
-            if(HAVE_SSE42CRC_INLINE_ASM OR HAVE_SSE42CRC_INTRIN)
-                add_definitions(-DX86_SSE42_CRC_HASH -DX86_SSE42_ADLER32)
-                set(SSE42_SRCS ${ARCHDIR}/adler32_sse42.c ${ARCHDIR}/insert_string_sse42.c)
-                add_feature_info(SSE42_CRC 1 "Support SSE4.2 optimized CRC hash generation, using \"${SSE42FLAG}\"")
-                list(APPEND ZLIB_ARCH_SRCS ${SSE42_SRCS})
-                set_property(SOURCE ${SSE42_SRCS} PROPERTY COMPILE_FLAGS "${SSE42FLAG} ${NOLTOFLAG}")
-                if(HAVE_SSE42CRC_INTRIN)
-                    add_definitions(-DX86_SSE42_CRC_INTRIN)
-                endif()
-            endif()
-            if(NOT HAVE_SSE42CRC_INLINE_ASM AND NOT HAVE_SSE42CRC_INTRIN AND NOT HAVE_SSE42CMPSTR_INTRIN)
-                set(WITH_SSE4 OFF)
-            endif()
-        endif()
-        if(FORCE_TZCNT)
-            add_definitions(-DX86_NOCHECK_TZCNT)
-        endif()
-        add_feature_info(FORCE_TZCNT FORCE_TZCNT "Assume CPU is TZCNT capable")
-        if(WITH_SSE2)
-            check_sse2_intrinsics()
-            if(HAVE_SSE2_INTRIN)
-                add_definitions(-DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH)
-                set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/compare256_sse2.c ${ARCHDIR}/slide_hash_sse2.c)
-                list(APPEND ZLIB_ARCH_SRCS ${SSE2_SRCS})
-                if(NOT ${ARCH} MATCHES "x86_64")
-                    set_property(SOURCE ${SSE2_SRCS} PROPERTY COMPILE_FLAGS "${SSE2FLAG} ${NOLTOFLAG}")
-                    add_feature_info(FORCE_SSE2 FORCE_SSE2 "Assume CPU is SSE2 capable")
-                    if(FORCE_SSE2)
-                        add_definitions(-DX86_NOCHECK_SSE2)
-                    endif()
-                endif()
-            else()
-                set(WITH_SSE2 OFF)
-            endif()
-        endif()
-        if(WITH_SSSE3)
-            check_ssse3_intrinsics()
-            if(HAVE_SSSE3_INTRIN)
-                add_definitions(-DX86_SSSE3 -DX86_SSSE3_ADLER32)
-                set(SSSE3_SRCS ${ARCHDIR}/adler32_ssse3.c)
-                add_feature_info(SSSE3_ADLER32 1 "Support SSSE3-accelerated adler32, using \"${SSSE3FLAG}\"")
-                list(APPEND ZLIB_ARCH_SRCS ${SSSE3_SRCS})
-                set_property(SOURCE ${SSSE3_SRCS} PROPERTY COMPILE_FLAGS "${SSSE3FLAG} ${NOLTOFLAG}")
-            else()
-                set(WITH_SSSE3 OFF)
-            endif()
-        endif()
-        if(WITH_PCLMULQDQ AND WITH_SSSE3 AND WITH_SSE42)
-            check_pclmulqdq_intrinsics()
-            if(HAVE_PCLMULQDQ_INTRIN AND HAVE_SSSE3_INTRIN)
-                add_definitions(-DX86_PCLMULQDQ_CRC)
-                set(PCLMULQDQ_SRCS ${ARCHDIR}/crc32_fold_pclmulqdq.c)
-                add_feature_info(PCLMUL_CRC 1 "Support CRC hash generation using PCLMULQDQ, using \"${SSSE3FLAG} ${SSE42FLAG} ${PCLMULFLAG}\"")
-                list(APPEND ZLIB_ARCH_SRCS ${PCLMULQDQ_SRCS})
-                set_property(SOURCE ${PCLMULQDQ_SRCS} PROPERTY COMPILE_FLAGS "${SSSE3FLAG} ${SSE42FLAG} ${PCLMULFLAG} ${NOLTOFLAG}")
-
-                if(WITH_VPCLMULQDQ AND WITH_AVX512)
-                    check_vpclmulqdq_intrinsics()
-                    if(HAVE_VPCLMULQDQ_INTRIN AND HAVE_AVX512_INTRIN)
-                        add_definitions(-DX86_VPCLMULQDQ_CRC)
-                        set(VPCLMULQDQ_SRCS ${ARCHDIR}/crc32_fold_vpclmulqdq.c)
-                        add_feature_info(VPCLMUL_CRC 1 "Support CRC hash generation using VPCLMULQDQ, using \"${VPCLMULFLAG} ${AVX512FLAG}\"")
-                        list(APPEND ZLIB_ARCH_SRCS ${VPCLMULQDQ_SRCS})
-                        set_property(SOURCE ${VPCLMULQDQ_SRCS} PROPERTY COMPILE_FLAGS "${VPCLMULFLAG} ${AVX512FLAG} ${NOLTOFLAG}")
-                    else()
-                        set(WITH_VPCLMULQDQ OFF)
-                    endif()
-                else()
-                    set(WITH_VPCLMULQDQ OFF)
-                endif()
-            else()
-                set(WITH_PCLMULQDQ OFF)
-                set(WITH_VPCLMULQDQ OFF)
-            endif()
-        else()
-            set(WITH_PCLMULQDQ OFF)
-            set(WITH_VPCLMULQDQ OFF)
-        endif()
-    endif()
-endif()
-
-message(STATUS "Architecture-specific source files: ${ZLIB_ARCH_SRCS}")
-
-#============================================================================
-# zconf.h
-#============================================================================
-
-macro(generate_cmakein input output)
-    file(REMOVE ${output})
-    file(STRINGS ${input} _lines)
-    foreach(_line IN LISTS _lines)
-        string(REGEX REPLACE "#ifdef HAVE_UNISTD_H.*" "@ZCONF_UNISTD_LINE@" _line "${_line}")
-        string(REGEX REPLACE "#ifdef NEED_PTRDIFF_T.*" "@ZCONF_PTRDIFF_LINE@" _line "${_line}")
-        if(NEED_PTRDIFF_T)
-            string(REGEX REPLACE "typedef PTRDIFF_TYPE" "typedef @PTRDIFF_TYPE@" _line "${_line}")
-        endif()
-        file(APPEND ${output} "${_line}\n")
-    endforeach()
-endmacro(generate_cmakein)
-
-generate_cmakein( ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.in ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein )
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h)
-        message(STATUS "Renaming")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h")
-        message(STATUS "to 'zconf${SUFFIX}.h.included' because this file is included with zlib")
-        message(STATUS "but CMake generates it automatically in the build directory.")
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.included)
-    endif()
-
-    # If we're doing an out of source build and the user has a zconf.h.cmakein
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein)
-        message(STATUS "Renaming")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein")
-        message(STATUS "to 'zconf${SUFFIX}.h.cmakeincluded' because this file is included with zlib")
-        message(STATUS "but CMake generates it automatically in the build directory.")
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakein ${CMAKE_CURRENT_SOURCE_DIR}/zconf${SUFFIX}.h.cmakeincluded)
-    endif()
-endif()
-
-# Refer to prefix symbolically to ease relocation by end user,
-# as Makefile-generated .pc file does.
-if(INC_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/include")
-  set(PC_INC_INSTALL_DIR "\${prefix}/include")
-else()
-  set(PC_INC_INSTALL_DIR "${INC_INSTALL_DIR}")
-endif()
-if(LIB_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib")
-  set(PC_LIB_INSTALL_DIR "\${exec_prefix}/lib")
-else()
-  set(PC_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
-endif()
-
-#============================================================================
-# zlib
-#============================================================================
-
-set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h
-    ${CMAKE_CURRENT_BINARY_DIR}/zlib_name_mangling${SUFFIX}.h
-    ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.h
-)
-set(ZLIB_PRIVATE_HDRS
-    adler32_p.h
-    chunkset_tpl.h
-    cpu_features.h
-    crc32_braid_p.h
-    crc32_braid_comb_p.h
-    crc32_braid_tbl.h
-    crc32_fold.h
-    deflate.h
-    deflate_p.h
-    functable.h
-    inffast.h
-    inffixed_tbl.h
-    inflate.h
-    inflate_p.h
-    inftrees.h
-    insert_string_tpl.h
-    match_tpl.h
-    trees.h
-    trees_emit.h
-    trees_tbl.h
-    zbuild.h
-    zendian.h
-    zutil.h
-)
-set(ZLIB_SRCS
-    adler32.c
-    adler32_fold.c
-    chunkset.c
-    compare256.c
-    compress.c
-    cpu_features.c
-    crc32_braid.c
-    crc32_braid_comb.c
-    crc32_fold.c
-    deflate.c
-    deflate_fast.c
-    deflate_huff.c
-    deflate_medium.c
-    deflate_quick.c
-    deflate_rle.c
-    deflate_slow.c
-    deflate_stored.c
-    functable.c
-    infback.c
-    inffast.c
-    inflate.c
-    inftrees.c
-    insert_string.c
-    insert_string_roll.c
-    slide_hash.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-set(ZLIB_GZFILE_PRIVATE_HDRS
-    gzguts.h
-)
-set(ZLIB_GZFILE_SRCS
-    gzlib.c
-    ${CMAKE_CURRENT_BINARY_DIR}/gzread.c
-    gzwrite.c
-)
-
-set(ZLIB_ALL_SRCS ${ZLIB_SRCS} ${ZLIB_ARCH_HDRS} ${ZLIB_ARCH_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-if(WITH_GZFILEOP)
-    list(APPEND ZLIB_ALL_SRCS ${ZLIB_GZFILE_PRIVATE_HDRS} ${ZLIB_GZFILE_SRCS})
-endif()
-
-if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-    if(NOT MINGW AND NOT MSYS AND NOT CYGWIN)
-        # If present will override custom build rule below.
-        set(ZLIB_DLL_SRCS win32/zlib${SUFFIX}1.rc)
-    endif()
-
-    if(MINGW OR MSYS OR CYGWIN)
-        # This gets us DLL resource information when compiling on MinGW.
-        if(NOT CMAKE_RC_COMPILER)
-            set(CMAKE_RC_COMPILER windres.exe)
-        endif()
-
-        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-            COMMAND ${CMAKE_RC_COMPILER}
-                -D GCC_WINDRES
-                -I ${CMAKE_CURRENT_SOURCE_DIR}
-                -I ${CMAKE_CURRENT_BINARY_DIR}
-                -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib${SUFFIX}1.rc)
-        set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-    endif()
-endif()
-
-if(NOT DEFINED BUILD_SHARED_LIBS)
-    add_library(zlib SHARED ${ZLIB_ALL_SRCS} ${ZLIB_DLL_SRCS})
-    add_library(zlibstatic STATIC ${ZLIB_ALL_SRCS})
-
-    set(ZLIB_INSTALL_LIBRARIES zlib zlibstatic)
-else()
-    add_library(zlib ${ZLIB_ALL_SRCS})
-
-    if(BUILD_SHARED_LIBS)
-        target_sources(zlib PRIVATE ${ZLIB_DLL_SRCS})
-    else()
-        add_library(zlibstatic ALIAS zlib)
-    endif()
-
-    set(ZLIB_INSTALL_LIBRARIES zlib)
-endif()
-
-foreach(ZLIB_INSTALL_LIBRARY ${ZLIB_INSTALL_LIBRARIES})
-    target_include_directories(${ZLIB_INSTALL_LIBRARY} PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
-        "$<INSTALL_INTERFACE:include>")
-endforeach()
-
-if(WIN32)
-    # Shared library
-    if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-        set_target_properties(zlib PROPERTIES OUTPUT_NAME zlib${SUFFIX})
-    endif()
-    # Static library
-    if(NOT DEFINED BUILD_SHARED_LIBS)
-        if(MSVC)
-            set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME zlibstatic${SUFFIX})
-        else()
-            set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z${SUFFIX})
-        endif()
-    elseif(NOT BUILD_SHARED_LIBS)
-        if(MSVC)
-            set_target_properties(zlib PROPERTIES OUTPUT_NAME zlibstatic${SUFFIX})
-        else()
-            set_target_properties(zlib PROPERTIES OUTPUT_NAME z${SUFFIX})
-        endif()
-    endif()
-else()
-    # On unix-like platforms the library is almost always called libz
-    set_target_properties(${ZLIB_INSTALL_LIBRARIES} PROPERTIES OUTPUT_NAME z${SUFFIX})
-endif()
-
-if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-    set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-
-    if(ZLIB_COMPAT)
-        set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng)
-        set_target_properties(zlib PROPERTIES SOVERSION 1)
-    else()
-        set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION})
-        set_target_properties(zlib PROPERTIES SOVERSION 2)
-    endif()
-
-    if(NOT CYGWIN)
-        # This property causes shared libraries on Linux to have the full version
-        # encoded into their final filename.  We disable this on Cygwin because
-        # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-        # seems to be the default.
-        #
-        # This has no effect with MSVC, on that platform the version info for
-        # the DLL comes from the resource file win32/zlib1.rc
-        set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-    endif()
-
-    if(UNIX)
-        if(HAVE_NO_INTERPOSITION)
-            set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-fno-semantic-interposition")
-        endif()
-        if(NOT APPLE)
-            set_target_properties(zlib PROPERTIES LINK_FLAGS
-                "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.map\"")
-        else()
-            # Match configure/make's behavior (i.e. don't use @rpath on mac).
-            set_target_properties(zlib PROPERTIES INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
-        endif()
-    endif()
-    if(MSYS OR CYGWIN)
-        # Suppress version number from shared library name
-        set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 0)
-    elseif(WIN32)
-        # Creates zlib1.dll when building shared library version
-        if(ZLIB_COMPAT)
-            set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-        else()
-            set_target_properties(zlib PROPERTIES SUFFIX "2.dll")
-        endif()
-    endif()
-endif()
-
-if(HAVE_UNISTD_H)
-  SET(ZCONF_UNISTD_LINE "#if 1    /* was set to #if 1 by configure/cmake/etc */")
-else()
-  SET(ZCONF_UNISTD_LINE "#if 0    /* was set to #if 0 by configure/cmake/etc */")
-endif()
-if(NEED_PTRDIFF_T)
-    SET(ZCONF_PTRDIFF_LINE "#if 1    /* was set to #if 1 by configure/cmake/etc */")
-else()
-    SET(ZCONF_PTRDIFF_LINE "#ifdef NEED_PTRDIFF_T    /* may be set to #if 1 by configure/cmake/etc */")
-endif()
-
-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.pc)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-    ${ZLIB_PC} @ONLY)
-configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.h @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gzread.c.in
-    ${CMAKE_CURRENT_BINARY_DIR}/gzread.c @ONLY)
-
-
-if (NOT ZLIB_SYMBOL_PREFIX STREQUAL "")
-    add_feature_info(ZLIB_SYMBOL_PREFIX ON "Publicly exported symbols have a custom prefix")
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib_name_mangling${SUFFIX}.h.in
-        ${CMAKE_CURRENT_BINARY_DIR}/zlib_name_mangling${SUFFIX}.h @ONLY)
-else()
-    add_feature_info(ZLIB_SYMBOL_PREFIX OFF "Publicly exported symbols DO NOT have a custom prefix")
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib_name_mangling.h.empty
-        ${CMAKE_CURRENT_BINARY_DIR}/zlib_name_mangling${SUFFIX}.h COPYONLY)
-endif()
-# add_definitions(-DZLIB_SYMBOL_PREFIX=${ZLIB_SYMBOL_PREFIX}) # not needed
-
-
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-    install(TARGETS ${ZLIB_INSTALL_LIBRARIES}
-        RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-        ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
-        LIBRARY DESTINATION "${LIB_INSTALL_DIR}")
-endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.h
-        DESTINATION "${INC_INSTALL_DIR}" RENAME zlib${SUFFIX}.h)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zlib_name_mangling${SUFFIX}.h
-        DESTINATION "${INC_INSTALL_DIR}" RENAME zlib_name_mangling${SUFFIX}.h)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h
-        DESTINATION "${INC_INSTALL_DIR}" RENAME zconf${SUFFIX}.h)
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
-    install(FILES ${ZLIB_PC} DESTINATION "${PKGCONFIG_INSTALL_DIR}")
-endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-option(ZLIB_ENABLE_TESTS "Build test binaries" ON)
-if(ZLIB_ENABLE_TESTS)
-    enable_testing()
-
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
-        add_subdirectory(test)
-        if(WITH_BENCHMARKS)
-            add_subdirectory(test/benchmarks)
-        endif()
-    else()
-        message(WARNING "Minimum cmake version of 3.12 not met for GoogleTest or benchmarks!")
-    endif()
-
-    macro(configure_test_executable target)
-        target_include_directories(${target} PUBLIC
-            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
-            "$<INSTALL_INTERFACE:include>")
-        if(NOT WITH_GZFILEOP)
-            target_compile_definitions(${target} PUBLIC -DWITH_GZFILEOP)
-            target_sources(${target} PRIVATE ${ZLIB_GZFILE_PRIVATE_HDRS} ${ZLIB_GZFILE_SRCS})
-        endif()
-        if(ZLIB_DUAL_LINK)
-            find_package(ZLIB)
-            if(ZLIB_FOUND)
-                target_link_libraries(${target} ${ZLIB_LIBRARIES})
-            endif()
-        endif()
-    endmacro()
-
-    macro(add_simple_test_executable target)
-        add_executable(${target} test/${target}.c)
-        configure_test_executable(${target})
-        target_link_libraries(${target} zlib)
-        add_test(NAME ${target} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${target}>)
-    endmacro()
-
-    add_simple_test_executable(example)
-
-    set(MINIGZIP_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:minigzip>)
-    add_executable(minigzip test/minigzip.c)
-    configure_test_executable(minigzip)
-    if(NOT DEFINED BUILD_SHARED_LIBS)
-        target_link_libraries(minigzip zlibstatic)
-    else()
-        target_link_libraries(minigzip zlib)
-    endif()
-    if(BASEARCH_S360_FOUND)
-        if(WITH_DFLTCC_DEFLATE OR WITH_DFLTCC_INFLATE)
-            set_source_files_properties(test/minigzip.c PROPERTIES COMPILE_DEFINITIONS BUFLEN=262144)
-        endif()
-    endif()
-
-    set(MINIDEFLATE_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:minideflate>)
-    add_executable(minideflate test/minideflate.c)
-    configure_test_executable(minideflate)
-    target_link_libraries(minideflate zlib)
-
-    if(INSTALL_UTILS)
-        install(TARGETS minigzip minideflate
-            RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-            ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
-            LIBRARY DESTINATION "${LIB_INSTALL_DIR}")
-    endif()
-
-    set(SWITCHLEVELS_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:switchlevels>)
-    add_executable(switchlevels test/switchlevels.c)
-    configure_test_executable(switchlevels)
-    target_link_libraries(switchlevels zlib)
-
-    add_simple_test_executable(infcover)
-    if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-        target_sources(infcover PRIVATE inftrees.c)
-    endif()
-
-    add_executable(makefixed tools/makefixed.c inftrees.c)
-    target_include_directories(makefixed PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
-        "$<INSTALL_INTERFACE:include>")
-
-    set(MAKEFIXED_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makefixed>)
-    add_test(NAME makefixed
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMMAND=${MAKEFIXED_COMMAND}"
-        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/inffixed_tbl._h
-        -DCOMPARE=${CMAKE_CURRENT_SOURCE_DIR}/inffixed_tbl.h
-        -DIGNORE_LINE_ENDINGS=ON
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
-
-    add_executable(maketrees tools/maketrees.c trees.c zutil.c)
-    target_include_directories(maketrees PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
-        "$<INSTALL_INTERFACE:include>")
-
-    set(MAKETREES_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:maketrees>)
-    add_test(NAME maketrees
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMMAND=${MAKETREES_COMMAND}"
-        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/trees_tbl._h
-        -DCOMPARE=${CMAKE_CURRENT_SOURCE_DIR}/trees_tbl.h
-        -DIGNORE_LINE_ENDINGS=ON
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
-
-    add_executable(makecrct tools/makecrct.c)
-    target_include_directories(makecrct PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
-        "$<INSTALL_INTERFACE:include>")
-
-    set(MAKECRCT_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makecrct>)
-    add_test(NAME makecrct
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMMAND=${MAKECRCT_COMMAND}"
-        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/crc32_braid_tbl._h
-        -DCOMPARE=${CMAKE_CURRENT_SOURCE_DIR}/crc32_braid_tbl.h
-        -DIGNORE_LINE_ENDINGS=ON
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
-
-    if(WITH_FUZZERS)
-        add_subdirectory(test/fuzz)
-    endif()
-
-    macro(test_minigzip name path)
-        # Construct compression arguments for minigzip
-        set(compress_args -k -c)
-        foreach(extra_arg IN ITEMS "${ARGN}")
-            list(APPEND compress_args ${extra_arg})
-        endforeach()
-
-        # Create unique friendly string for test
-        string(REPLACE ";" "" arg_list "${ARGN}")
-        string(REPLACE " " "" arg_list "${arg_list}")
-        string(REPLACE "-" "" arg_list "${arg_list}")
-
-        set(test_id minigzip-${name}-${arg_list})
-
-        if(NOT TEST ${test_id})
-            add_test(NAME ${test_id}
-                COMMAND ${CMAKE_COMMAND}
-                "-DTARGET=${MINIGZIP_COMMAND}"
-                "-DCOMPRESS_ARGS=${compress_args}"
-                "-DDECOMPRESS_ARGS=-d;-c"
-                -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/${path}
-                -DTEST_NAME=${test_id}
-                -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-        endif()
-    endmacro()
-
-    set(TEST_CONFIGS
-        -R      # Z_RLE
-        -h      # Z_HUFFMAN_ONLY
-        -T      # Direct store
-        -0      # No compression
-        -1      # Deflate quick
-        -4      # Deflate medium (lazy matches)
-        "-5;-F" # Deflate medium (Z_FIXED)
-        -6      # Deflate medium
-        -9      # Deflate slow
-        "-9;-f" # Deflate slow (Z_FILTERED)
-    )
-
-    file(GLOB_RECURSE TEST_FILE_PATHS
-        LIST_DIRECTORIES false
-        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/test/data/*)
-
-    foreach(TEST_FILE_PATH ${TEST_FILE_PATHS})
-        if("${TEST_FILE_PATH}" MATCHES ".gz$" OR "${TEST_FILE_PATH}" MATCHES ".out$" OR
-           "${TEST_FILE_PATH}" MATCHES "/.git/" OR "${TEST_FILE_PATH}" MATCHES ".md$")
-            continue()
-        endif()
-        foreach(TEST_CONFIG ${TEST_CONFIGS})
-            get_filename_component(TEST_NAME ${TEST_FILE_PATH} NAME)
-            if (TEST_NAME STREQUAL "")
-                continue()
-            endif()
-            test_minigzip(${TEST_NAME} ${TEST_FILE_PATH} ${TEST_CONFIG})
-        endforeach()
-    endforeach()
-
-    test_minigzip("detect-text" "test/data/lcet10.txt" -A)
-    test_minigzip("detect-binary" "test/data/paper-100k.pdf" -A)
-
-    set(CVES CVE-2002-0059 CVE-2004-0797 CVE-2005-1849 CVE-2005-2096)
-    foreach(CVE ${CVES})
-        set(CVE_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:minigzip> -d)
-        add_test(NAME ${CVE}
-            COMMAND ${CMAKE_COMMAND}
-            "-DCOMMAND=${CVE_COMMAND}"
-            -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/${CVE}/test.gz
-            "-DSUCCESS_EXIT=0;1"
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
-    endforeach()
-
-    set(TEST_LEVELS 6 1 2)
-    foreach(TEST_LEVEL ${TEST_LEVELS})
-        add_test(NAME CVE-2018-25032-fixed-level-${TEST_LEVEL}
-            COMMAND ${CMAKE_COMMAND}
-            "-DTARGET=${MINIDEFLATE_COMMAND}"
-            "-DCOMPRESS_ARGS=-c;-k;-m;1;-w;-15;-s;4;-F;-${TEST_LEVEL}"
-            "-DDECOMPRESS_ARGS=-c;-k;-d;-m;1;-w;-15;-${TEST_LEVEL}"
-            -DGZIP_VERIFY=OFF
-            -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/CVE-2018-25032/fixed.txt
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-        add_test(NAME CVE-2018-25032-default-level-${TEST_LEVEL}
-            COMMAND ${CMAKE_COMMAND}
-            "-DTARGET=${MINIDEFLATE_COMMAND}"
-            "-DCOMPRESS_ARGS=-c;-k;-m;1;-w;-15;-s;4;-${TEST_LEVEL}"
-            "-DDECOMPRESS_ARGS=-c;-k;-d;-m;1;-w;-15;-${TEST_LEVEL}"
-            -DGZIP_VERIFY=OFF
-            -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/CVE-2018-25032/default.txt
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-    endforeach()
-
-    # Run tests targeting tools
-    include(cmake/test-tools.cmake)
-
-    add_test(NAME GH-361
-        COMMAND ${CMAKE_COMMAND}
-        "-DTARGET=${MINIGZIP_COMMAND}"
-        "-DCOMPRESS_ARGS=-c;-k;-4"
-        -DTEST_NAME=GH-361-test-txt
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-361/test.txt
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-364
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMPRESS_TARGET=${SWITCHLEVELS_COMMAND}"
-        "-DCOMPRESS_ARGS=1;5;9;3"
-        "-DDECOMPRESS_TARGET=${MINIGZIP_COMMAND}"
-        -DTEST_NAME=GH-364-test-bin
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-364/test.bin
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-382
-        COMMAND ${CMAKE_COMMAND}
-        "-DTARGET=${MINIDEFLATE_COMMAND}"
-        "-DCOMPRESS_ARGS=-c;-m;1;-w;-15;-1;-s;4"
-        "-DDECOMPRESS_ARGS=-c;-d;-m;1;-w;-15"
-        -DGZIP_VERIFY=OFF
-        -DTEST_NAME=GH-382-defneg3-dat
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-382/defneg3.dat
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-536-segfault
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMPRESS_TARGET=${SWITCHLEVELS_COMMAND}"
-        "-DCOMPRESS_ARGS=6;9744;1;91207"
-        "-DDECOMPRESS_TARGET=${MINIGZIP_COMMAND}"
-        -DCOMPARE=OFF
-        -DGZIP_VERIFY=OFF
-        -DTEST_NAME=GH-536-segfault-lcet10-txt
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-536-incomplete-read
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMPRESS_TARGET=${SWITCHLEVELS_COMMAND}"
-        "-DCOMPRESS_ARGS=6;88933;1;195840;2;45761"
-        "-DDECOMPRESS_TARGET=${MINIGZIP_COMMAND}"
-        -DCOMPARE=OFF
-        -DGZIP_VERIFY=OFF
-        -DTEST_NAME=GH-536-incomplete-read-lcet10-txt
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-536-zero-stored-block
-        COMMAND ${CMAKE_COMMAND}
-        "-DCOMPRESS_TARGET=${SWITCHLEVELS_COMMAND}"
-        "-DCOMPRESS_ARGS=6;15248;1;1050;2;25217"
-        "-DDECOMPRESS_TARGET=${MINIGZIP_COMMAND}"
-        -DCOMPARE=OFF
-        -DGZIP_VERIFY=OFF
-        -DTEST_NAME=GH-536-zero-stored-block-lcet10-txt
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-
-    add_test(NAME GH-751
-        COMMAND ${CMAKE_COMMAND}
-        "-DTARGET=${MINIGZIP_COMMAND}"
-        -DTEST_NAME=GH-751-test-txt
-        -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-751/test.txt
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
-endif()
-
-add_feature_info(WITH_GZFILEOP WITH_GZFILEOP "Compile with support for gzFile related functions")
-add_feature_info(ZLIB_COMPAT ZLIB_COMPAT "Compile with zlib compatible API")
-add_feature_info(ZLIB_ENABLE_TESTS ZLIB_ENABLE_TESTS "Build test binaries")
-add_feature_info(ZLIB_DUAL_LINK ZLIB_DUAL_LINK "Dual link tests against system zlib")
-add_feature_info(WITH_SANITIZER WITH_SANITIZER "Enable sanitizer support")
-add_feature_info(WITH_FUZZERS WITH_FUZZERS "Build test/fuzz")
-add_feature_info(WITH_BENCHMARKS WITH_BENCHMARKS "Build test/benchmarks")
-add_feature_info(WITH_BENCHMARK_APPS WITH_BENCHMARK_APPS "Build application benchmarks")
-add_feature_info(WITH_OPTIM WITH_OPTIM "Build with optimisation")
-add_feature_info(WITH_NEW_STRATEGIES WITH_NEW_STRATEGIES "Use new strategies")
-add_feature_info(WITH_NATIVE_INSTRUCTIONS WITH_NATIVE_INSTRUCTIONS
-    "Instruct the compiler to use the full instruction set on this host (gcc/clang -march=native)")
-add_feature_info(WITH_MAINTAINER_WARNINGS WITH_MAINTAINER_WARNINGS "Build with project maintainer warnings")
-add_feature_info(WITH_CODE_COVERAGE WITH_CODE_COVERAGE "Enable code coverage reporting")
-add_feature_info(WITH_INFLATE_STRICT WITH_INFLATE_STRICT "Build with strict inflate distance checking")
-add_feature_info(WITH_INFLATE_ALLOW_INVALID_DIST WITH_INFLATE_ALLOW_INVALID_DIST "Build with zero fill for inflate invalid distances")
-
-if(BASEARCH_ARM_FOUND)
-    add_feature_info(WITH_ACLE WITH_ACLE "Build with ACLE")
-    add_feature_info(WITH_NEON WITH_NEON "Build with NEON intrinsics")
-elseif(BASEARCH_PPC_FOUND)
-    add_feature_info(WITH_ALTIVEC WITH_ALTIVEC "Build with AltiVec optimisations")
-    add_feature_info(WITH_POWER8 WITH_POWER8 "Build with optimisations for POWER8")
-    add_feature_info(WITH_POWER9 WITH_POWER9 "Build with optimisations for POWER9")
-elseif(BASEARCH_S360_FOUND)
-    add_feature_info(WITH_DFLTCC_DEFLATE WITH_DFLTCC_DEFLATE "Build with DFLTCC intrinsics for compression on IBM Z")
-    add_feature_info(WITH_DFLTCC_INFLATE WITH_DFLTCC_INFLATE "Build with DFLTCC intrinsics for decompression on IBM Z")
-    add_feature_info(WITH_CRC32_VX WITH_CRC32_VX "Build with vectorized CRC32 on IBM Z")
-elseif(BASEARCH_X86_FOUND)
-    add_feature_info(WITH_AVX2 WITH_AVX2 "Build with AVX2")
-    add_feature_info(WITH_AVX512 WITH_AVX512 "Build with AVX512")
-    add_feature_info(WITH_AVX512VNNI WITH_AVX512VNNI "Build with AVX512 VNNI")
-    add_feature_info(WITH_SSE2 WITH_SSE2 "Build with SSE2")
-    add_feature_info(WITH_SSSE3 WITH_SSSE3 "Build with SSSE3")
-    add_feature_info(WITH_SSE41 WITH_SSE41 "Build with SSE41")
-    add_feature_info(WITH_SSE42 WITH_SSE42 "Build with SSE42")
-    add_feature_info(WITH_PCLMULQDQ WITH_PCLMULQDQ "Build with PCLMULQDQ")
-    add_feature_info(WITH_VPCLMULQDQ WITH_VPCLMULQDQ "Build with VPCLMULQDQ")
-endif()
-
-add_feature_info(INSTALL_UTILS INSTALL_UTILS "Copy minigzip and minideflate during install")
-
-FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)

crates/libz-sys/src/zlib-ng/FAQ.zlib

diff --git a/crates/libz-sys/src/zlib-ng/FAQ.zlib b/crates/libz-sys/src/zlib-ng/FAQ.zlib
deleted file mode 100644
index 163160c..0000000
--- a/crates/libz-sys/src/zlib-ng/FAQ.zlib
+++ /dev/null
@@ -1,374 +0,0 @@
-##
-# THIS IS AN UNMAINTAINED COPY OF THE ORIGINAL FILE DISTRIBUTED WITH ZLIB 1.2.11
-##
-
-
-
-
-                Frequently Asked Questions about zlib
-
-
-If your question is not there, please check the zlib home page
-https://zlib.net/ which may have more recent information.
-The latest zlib FAQ is at https://zlib.net/zlib_faq.html
-
-
- 1. Is zlib Y2K-compliant?
-
-    Yes. zlib doesn't handle dates.
-
- 2. Where can I get a Windows DLL version?
-
-    The zlib sources can be compiled without change to produce a DLL.  See the
-    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
-    precompiled DLL are found in the zlib web site at https://zlib.net/ .
-
- 3. Where can I get a Visual Basic interface to zlib?
-
-    See
-        * https://marknelson.us/1997/01/01/zlib-engine/
-        * win32/DLL_FAQ.txt in the zlib distribution
-
- 4. compress() returns Z_BUF_ERROR.
-
-    Make sure that before the call of compress(), the length of the compressed
-    buffer is equal to the available size of the compressed buffer and not
-    zero.  For Visual Basic, check that this parameter is passed by reference
-    ("as any"), not by value ("as long").
-
- 5. deflate() or inflate() returns Z_BUF_ERROR.
-
-    Before making the call, make sure that avail_in and avail_out are not zero.
-    When setting the parameter flush equal to Z_FINISH, also make sure that
-    avail_out is big enough to allow processing all pending input.  Note that a
-    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
-    made with more input or output space.  A Z_BUF_ERROR may in fact be
-    unavoidable depending on how the functions are used, since it is not
-    possible to tell whether or not there is more output pending when
-    strm.avail_out returns with zero.  See https://zlib.net/zlib_how.html for a
-    heavily annotated example.
-
- 6. Where's the zlib documentation (man pages, etc.)?
-
-    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
-    and test/minigzip.c, with more in examples/ .
-
- 7. Why don't you use GNU autoconf or libtool or ...?
-
-    Because we would like to keep zlib as a very small and simple package.
-    zlib is rather portable and doesn't need much configuration.
-
- 8. I found a bug in zlib.
-
-    Most of the time, such problems are due to an incorrect usage of zlib.
-    Please try to reproduce the problem with a small program and send the
-    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
-    data files without prior agreement.
-
- 9. Why do I get "undefined reference to gzputc"?
-
-    If "make test" produces something like
-
-       example.o(.text+0x154): undefined reference to `gzputc'
-
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
-    /usr/X11R6/lib. Remove any old versions, then do "make install".
-
-10. I need a Delphi interface to zlib.
-
-    See the contrib/delphi directory in the zlib distribution.
-
-11. Can zlib handle .zip archives?
-
-    Not by itself, no.  See the directory contrib/minizip in the zlib
-    distribution.
-
-12. Can zlib handle .Z files?
-
-    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
-    the code of uncompress on your own.
-
-13. How can I make a Unix shared library?
-
-    By default a shared (and a static) library is built for Unix.  So:
-
-    make distclean
-    ./configure
-    make
-
-14. How do I install a shared zlib library on Unix?
-
-    After the above, then:
-
-    make install
-
-    However, many flavors of Unix come with a shared zlib already installed.
-    Before going to the trouble of compiling a shared version of zlib and
-    trying to install it, you may want to check if it's already there!  If you
-    can #include <zlib.h>, it's there.  The -lz option will probably link to
-    it.  You can check the version at the top of zlib.h or with the
-    ZLIB_VERSION symbol defined in zlib.h .
-
-15. I have a question about OttoPDF.
-
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site: Joel Hainley, jhainley@myndkryme.com.
-
-16. Can zlib decode Flate data in an Adobe PDF file?
-
-    Yes. See https://www.pdflib.com/ . To modify PDF forms, see
-    https://sourceforge.net/projects/acroformtool/ .
-
-17. Why am I getting this "register_frame_info not found" error on Solaris?
-
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
-    generates an error such as:
-
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
-        symbol __register_frame_info: referenced symbol not found
-
-    The symbol __register_frame_info is not part of zlib, it is generated by
-    the C compiler (cc or gcc).  You must recompile applications using zlib
-    which have this problem.  This problem is specific to Solaris.  See
-    http://www.sunfreeware.com/ for Solaris versions of zlib and applications
-    using zlib.
-
-18. Why does gzip give an error on a file I make with compress/deflate?
-
-    The compress and deflate functions produce data in the zlib format, which
-    is different and incompatible with the gzip format.  The gz* functions in
-    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
-    use the same compressed data format internally, but have different headers
-    and trailers around the compressed data.
-
-19. Ok, so why are there two different formats?
-
-    The gzip format was designed to retain the directory information about a
-    single file, such as the name and last modification date.  The zlib format
-    on the other hand was designed for in-memory and communication channel
-    applications, and has a much more compact header and trailer and uses a
-    faster integrity check than gzip.
-
-20. Well that's nice, but how do I make a gzip file in memory?
-
-    You can request that deflate write the gzip format instead of the zlib
-    format using deflateInit2().  You can also request that inflate decode the
-    gzip format using inflateInit2().  Read zlib.h for more details.
-
-21. Is zlib thread-safe?
-
-    Yes.  However any library routines that zlib uses and any application-
-    provided memory allocation routines must also be thread-safe.  zlib's gz*
-    functions use stdio library routines, and most of zlib's functions use the
-    library memory allocation routines by default.  zlib's *Init* functions
-    allow for the application to provide custom memory allocation routines.
-
-    Of course, you should only operate on any given zlib or gzip stream from a
-    single thread at a time.
-
-22. Can I use zlib in my commercial application?
-
-    Yes.  Please read the license in zlib.h.
-
-23. Is zlib under the GNU license?
-
-    No.  Please read the license in zlib.h.
-
-24. The license says that altered source versions must be "plainly marked". So
-    what exactly do I need to do to meet that requirement?
-
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
-    particular, the final version number needs to be changed to "f", and an
-    identification string should be appended to ZLIB_VERSION.  Version numbers
-    x.x.x.f are reserved for modifications to zlib by others than the zlib
-    maintainers.  For example, if the version of the base zlib you are altering
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
-    update the version strings in deflate.c and inftrees.c.
-
-    For altered source distributions, you should also note the origin and
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along
-    with the dates of the alterations.  The origin should include at least your
-    name (or your company's name), and an email address to contact for help or
-    issues with the library.
-
-    Note that distributing a compiled zlib library along with zlib.h and
-    zconf.h is also a source distribution, and so you should change
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
-    in zlib.h as you would for a full source distribution.
-
-25. Will zlib work on a big-endian or little-endian architecture, and can I
-    exchange compressed data between them?
-
-    Yes and yes.
-
-26. Will zlib work on a 64-bit machine?
-
-    Yes.  It has been tested on 64-bit machines, and has no dependence on any
-    data types being limited to 32-bits in length.  If you have any
-    difficulties, please provide a complete problem report to zlib@gzip.org
-
-27. Will zlib decompress data from the PKWare Data Compression Library?
-
-    No.  The PKWare DCL uses a completely different compressed data format than
-    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
-    directory for a possible solution to your problem.
-
-28. Can I access data randomly in a compressed stream?
-
-    No, not without some preparation.  If when compressing you periodically use
-    Z_FULL_FLUSH, carefully write all the pending data at those points, and
-    keep an index of those locations, then you can start decompression at those
-    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
-    can significantly degrade compression.  Alternatively, you can scan a
-    deflate stream once to generate an index, and then use that index for
-    random access.  See examples/zran.c .
-
-29. Does zlib work on MVS, OS/390, CICS, etc.?
-
-    It has in the past, but we have not heard of any recent evidence.  There
-    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
-    If you know of recent, successful applications of zlib on these operating
-    systems, please let us know.  Thanks.
-
-30. Is there some simpler, easier to read version of inflate I can look at to
-    understand the deflate format?
-
-    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
-    contrib/puff directory.
-
-31. Does zlib infringe on any patents?
-
-    As far as we know, no.  In fact, that was originally the whole point behind
-    zlib.  Look here for some more information:
-
-    https://www.gzip.org/#faq11
-
-32. Can zlib work with greater than 4 GB of data?
-
-    Yes.  inflate() and deflate() will process any amount of data correctly.
-    Each call of inflate() or deflate() is limited to input and output chunks
-    of the maximum value that can be stored in the compiler's "unsigned int"
-    type, but there is no limit to the number of chunks.  Note however that the
-    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
-    counters are provided as a convenience and are not used internally by
-    inflate() or deflate().  The application can easily set up its own counters
-    updated after each call of inflate() or deflate() to count beyond 4 GB.
-    compress() and uncompress() may be limited to 4 GB, since they operate in a
-    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
-    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
-
-    The word "may" appears several times above since there is a 4 GB limit only
-    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
-    64 bits, then the limit is 16 exabytes.
-
-33. Does zlib have any security vulnerabilities?
-
-    The only one that we are aware of is potentially in gzprintf().  If zlib is
-    compiled to use sprintf() or vsprintf(), then there is no protection
-    against a buffer overflow of an 8K string space (or other value as set by
-    gzbuffer()), other than the caller of gzprintf() assuring that the output
-    will not exceed 8K.  On the other hand, if zlib is compiled to use
-    snprintf() or vsnprintf(), which should normally be the case, then there is
-    no vulnerability.  The ./configure script will display warnings if an
-    insecure variation of sprintf() will be used by gzprintf().  Also the
-    zlibCompileFlags() function will return information on what variant of
-    sprintf() is used by gzprintf().
-
-    If you don't have snprintf() or vsnprintf() and would like one, you can
-    find a portable implementation here:
-
-        https://www.ijs.si/software/snprintf/
-
-    Note that you should be using the most recent version of zlib.  Versions
-    1.1.3 and before were subject to a double-free vulnerability, and versions
-    1.2.1 and 1.2.2 were subject to an access exception when decompressing
-    invalid compressed data.
-
-34. Is there a Java version of zlib?
-
-    Probably what you want is to use zlib in Java. zlib is already included
-    as part of the Java SDK in the java.util.zip package. If you really want
-    a version of zlib written in the Java language, look on the zlib home
-    page for links: https://zlib.net/ .
-
-35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pedantic. Can't you guys write proper code?
-
-    Many years ago, we gave up attempting to avoid warnings on every compiler
-    in the universe.  It just got to be a waste of time, and some compilers
-    were downright silly as well as contradicted each other.  So now, we simply
-    make sure that the code always works.
-
-36. Valgrind (or some similar memory access checker) says that deflate is
-    performing a conditional jump that depends on an uninitialized value.
-    Isn't that a bug?
-
-    No.  That is intentional for performance reasons, and the output of deflate
-    is not affected.  This only started showing up recently since zlib 1.2.x
-    uses malloc() by default for allocations, whereas earlier versions used
-    calloc(), which zeros out the allocated memory.  Even though the code was
-    correct, versions 1.2.4 and later was changed to not stimulate these
-    checkers.
-
-37. Will zlib read the (insert any ancient or arcane format here) compressed
-    data format?
-
-    Probably not. Look in the comp.compression FAQ for pointers to various
-    formats and associated software.
-
-38. How can I encrypt/decrypt zip files with zlib?
-
-    zlib doesn't support encryption.  The original PKZIP encryption is very
-    weak and can be broken with freely available programs.  To get strong
-    encryption, use GnuPG, https://www.gnupg.org/ , which already includes zlib
-    compression.  For PKZIP compatible "encryption", look at
-    http://infozip.sourceforge.net/
-
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
-
-    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
-    probably have called the second one "zlib" instead to avoid confusion with
-    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
-    correctly points to the zlib specification in RFC 1950 for the "deflate"
-    transfer encoding, there have been reports of servers and browsers that
-    incorrectly produce or expect raw deflate data per the deflate
-    specification in RFC 1951, most notably Microsoft.  So even though the
-    "deflate" transfer encoding using the zlib format would be the more
-    efficient approach (and in fact exactly what the zlib format was designed
-    for), using the "gzip" transfer encoding is probably more reliable due to
-    an unfortunate choice of name on the part of the HTTP 1.1 authors.
-
-    Bottom line: use the gzip format for HTTP 1.1 encoding.
-
-40. Does zlib support the new "Deflate64" format introduced by PKWare?
-
-    No.  PKWare has apparently decided to keep that format proprietary, since
-    they have not documented it as they have previous compression formats.  In
-    any case, the compression improvements are so modest compared to other more
-    modern approaches, that it's not worth the effort to implement.
-
-41. I'm having a problem with the zip functions in zlib, can you help?
-
-    There are no zip functions in zlib.  You are probably using minizip by
-    Giles Vollant, which is found in the contrib directory of zlib.  It is not
-    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
-    files in there are not supported by the zlib authors.  You need to contact
-    the authors of the respective contribution for help.
-
-42. The match.asm code in contrib is under the GNU General Public License.
-    Since it's part of zlib, doesn't that mean that all of zlib falls under the
-    GNU GPL?
-
-    No.  The files in contrib are not part of zlib.  They were contributed by
-    other authors and are provided as a convenience to the user within the zlib
-    distribution.  Each item in contrib has its own license.
-
-43. Is zlib subject to export controls?  What is its ECCN?
-
-    zlib is not subject to export controls, and so is classified as EAR99.
-
-44. Can you please sign these lengthy legal documents and fax them back to us
-    so that we can use your software in our product?
-
-    No. Go away. Shoo.

crates/libz-sys/src/zlib-ng/INDEX.md

diff --git a/crates/libz-sys/src/zlib-ng/INDEX.md b/crates/libz-sys/src/zlib-ng/INDEX.md
deleted file mode 100644
index 22fd470..0000000
--- a/crates/libz-sys/src/zlib-ng/INDEX.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Contents
---------
-
-| Name             | Description                                                    |
-|:-----------------|:---------------------------------------------------------------|
-| arch/            | Architecture-specific code                                     |
-| doc/             | Documentation for formats and algorithms                       |
-| test/example.c   | Zlib usages examples for build testing                         |
-| test/minigzip.c  | Minimal gzip-like functionality for build testing              |
-| test/infcover.c  | Inflate code coverage for build testing                        |
-| win32/           | Shared library version resources for Windows                   |
-| CMakeLists.txt   | Cmake build script                                             |
-| configure        | Bash configure/build script                                    |
-| adler32.c        | Compute the Adler-32 checksum of a data stream                 |
-| chunkset.*       | Inline functions to copy small data chunks                     |
-| compress.c       | Compress a memory buffer                                       |
-| deflate.*        | Compress data using the deflate algorithm                      |
-| deflate_fast.c   | Compress data using the deflate algorithm with fast strategy   |
-| deflate_medium.c | Compress data using the deflate algorithm with medium strategy |
-| deflate_slow.c   | Compress data using the deflate algorithm with slow strategy   |
-| functable.*      | Struct containing function pointers to optimized functions     |
-| gzguts.h         | Internal definitions for gzip operations                       |
-| gzlib.c          | Functions common to reading and writing gzip files             |
-| gzread.c         | Read gzip files                                                |
-| gzwrite.c        | Write gzip files                                               |
-| infback.*        | Inflate using a callback interface                             |
-| inflate.*        | Decompress data                                                |
-| inffast.*        | Decompress data with speed optimizations                       |
-| inffixed_tbl.h   | Table for decoding fixed codes                                 |
-| inftrees.h       | Generate Huffman trees for efficient decoding                  |
-| trees.*          | Output deflated data using Huffman coding                      |
-| uncompr.c        | Decompress a memory buffer                                     |
-| zconf.h.cmakein  | zconf.h template for cmake                                     |
-| zendian.h        | BYTE_ORDER for endian tests                                    |
-| zlib.map         | Linux symbol information                                       |
-| zlib.pc.in       | Pkg-config template                                            |

crates/libz-sys/src/zlib-ng/LICENSE.md

diff --git a/crates/libz-sys/src/zlib-ng/LICENSE.md b/crates/libz-sys/src/zlib-ng/LICENSE.md
deleted file mode 100644
index adb48d4..0000000
--- a/crates/libz-sys/src/zlib-ng/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-(C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.

crates/libz-sys/src/zlib-ng/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/Makefile.in b/crates/libz-sys/src/zlib-ng/Makefile.in
deleted file mode 100644
index 4e25ef9..0000000
--- a/crates/libz-sys/src/zlib-ng/Makefile.in
+++ /dev/null
@@ -1,397 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#    ./configure; make test
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
-
-CC=cc
-
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-SFLAGS=-O
-LDFLAGS=-L.
-LIBNAME1=libz-ng
-LIBNAME2=zlib-ng
-SUFFIX=-ng
-TEST_LIBS=$(LIBNAME1).a
-LDSHARED=$(CC)
-LDSHAREDFLAGS=-shared
-
-VER=2.1.0.devel
-VER1=2
-
-STATICLIB=$(LIBNAME1).a
-SHAREDLIB=$(LIBNAME1).so
-SHAREDLIBV=$(LIBNAME1).so.$(VER)
-SHAREDLIBM=$(LIBNAME1).so.$(VER1)
-IMPORTLIB=
-SHAREDTARGET=$(LIBNAME1).so.$(VER)
-PKGFILE=$(LIBNAME2).pc
-
-LIBS=$(STATICLIB) $(SHAREDTARGET)
-
-AR=ar
-ARFLAGS=rc
-DEFFILE=
-RC=
-RCFLAGS=
-RCOBJS=
-STRIP=
-RANLIB=ranlib
-LDCONFIG=ldconfig
-LDSHAREDLIBC=
-EXE=
-
-SRCDIR=.
-INCLUDES=-I$(SRCDIR)
-
-BUILDDIR=.
-
-ARCHDIR=arch/generic
-ARCH_STATIC_OBJS=
-ARCH_SHARED_OBJS=
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-libdir = ${exec_prefix}/lib
-sharedlibdir = ${libdir}
-includedir = ${prefix}/include
-mandir = ${prefix}/share/man
-man3dir = ${mandir}/man3
-pkgconfigdir = ${libdir}/pkgconfig
-
-OBJZ = \
-	adler32.o \
-	adler32_fold.o \
-	chunkset.o \
-	compare256.o \
-	compress.o \
-	cpu_features.o \
-	crc32_braid.o \
-	crc32_braid_comb.o \
-	crc32_fold.o \
-	deflate.o \
-	deflate_fast.o \
-	deflate_huff.o \
-	deflate_medium.o \
-	deflate_quick.o \
-	deflate_rle.o \
-	deflate_slow.o \
-	deflate_stored.o \
-	functable.o \
-	infback.o \
-	inffast.o \
-	inflate.o \
-	inftrees.o \
-	insert_string.o \
-	insert_string_roll.o \
-	slide_hash.o \
-	trees.o \
-	uncompr.o \
-	zutil.o \
-	$(ARCH_STATIC_OBJS)
-
-OBJG = \
-	gzlib.o \
-	gzread.o \
-	gzwrite.o
-
-OBJC = $(OBJZ) $(OBJG)
-
-PIC_OBJZ = \
-	adler32.lo \
-	adler32_fold.lo \
-	chunkset.lo \
-	compare256.lo \
-	compress.lo \
-	cpu_features.lo \
-	crc32_braid.lo \
-	crc32_braid_comb.lo \
-	crc32_fold.lo \
-	deflate.lo \
-	deflate_fast.lo \
-	deflate_huff.lo \
-	deflate_medium.lo \
-	deflate_quick.lo \
-	deflate_rle.lo \
-	deflate_slow.lo \
-	deflate_stored.lo \
-	functable.lo \
-	infback.lo \
-	inffast.lo \
-	inflate.lo \
-	inftrees.lo \
-	insert_string.lo \
-	insert_string_roll.lo \
-	slide_hash.lo \
-	trees.lo \
-	uncompr.lo \
-	zutil.lo \
-	$(ARCH_SHARED_OBJS)
-
-PIC_OBJG = \
-	gzlib.lo \
-	gzread.lo \
-	gzwrite.lo
-
-PIC_TESTOBJG =
-PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
-
-OBJS = $(OBJC)
-
-PIC_OBJS = $(PIC_OBJC)
-
-all: static shared
-
-static: example$(EXE) minigzip$(EXE) makefixed$(EXE) maketrees$(EXE) makecrct$(EXE)
-
-shared: examplesh$(EXE) minigzipsh$(EXE)
-
-check: test
-
-.SECONDARY:
-
-$(ARCHDIR)/%.o: $(SRCDIR)/$(ARCHDIR)/%.c
-	$(MAKE) -C $(ARCHDIR) $(notdir $@)
-
-$(ARCHDIR)/%.lo: $(SRCDIR)/$(ARCHDIR)/%.c
-	$(MAKE) -C $(ARCHDIR) $(notdir $@)
-
-%.o: $(ARCHDIR)/%.o
-	-cp $< $@
-
-%.lo: $(ARCHDIR)/%.lo
-	-cp $< $@
-
-test: all
-	$(MAKE) -C test
-
-infcover.o: $(SRCDIR)/test/infcover.c zlib$(SUFFIX).h zconf$(SUFFIX).h zlib_name_mangling$(SUFFIX).h
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/infcover.c
-
-infcover$(EXE): infcover.o $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ infcover.o $(STATICLIB)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-cover: infcover$(EXE)
-	rm -f *.gcda
-	./infcover
-	gcov inf*.c
-
-$(STATICLIB): $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-example.o:
-	$(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $(SRCDIR)/test/example.c
-
-minigzip.o:
-	$(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $(SRCDIR)/test/minigzip.c
-
-makefixed.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/tools/makefixed.c
-
-maketrees.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/tools/maketrees.c
-
-makecrct.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/tools/makecrct.c
-
-zlibrc.o: win32/zlib$(SUFFIX)1.rc
-	$(RC) $(RCFLAGS) -o $@ win32/zlib$(SUFFIX)1.rc
-
-.SUFFIXES: .lo
-
-%.o: $(SRCDIR)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-%.lo: $(SRCDIR)/%.c
-	$(CC) $(SFLAGS) -DPIC $(INCLUDES) -c -o $@ $<
-
-gzlib.o: $(SRCDIR)/gzlib.c
-	$(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-gzlib.lo: $(SRCDIR)/gzlib.c
-	$(CC) $(SFLAGS) -DPIC -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-gzread.o: gzread.c
-	$(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-gzread.lo: gzread.c
-	$(CC) $(SFLAGS) -DPIC -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-gzwrite.o: $(SRCDIR)/gzwrite.c
-	$(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-gzwrite.lo: $(SRCDIR)/gzwrite.c
-	$(CC) $(SFLAGS) -DPIC -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-
-$(SHAREDTARGET): $(PIC_OBJS) $(DEFFILE) $(RCOBJS)
-ifneq ($(SHAREDTARGET),)
-	$(LDSHARED) $(CFLAGS) $(LDSHAREDFLAGS) $(LDFLAGS) -o $@ $(DEFFILE) $(PIC_OBJS) $(RCOBJS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-ifneq ($(SHAREDLIB),$(SHAREDTARGET))
-	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-	ln -s $@ $(SHAREDLIB)
-	ln -s $@ $(SHAREDLIBM)
-endif
-endif
-
-example$(EXE): example.o $(OBJG) $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-minigzip$(EXE): minigzip.o $(OBJG) $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-minigzipsh$(EXE): minigzip.o $(OBJG) $(SHAREDTARGET)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip.o $(OBJG) $(SHAREDTARGET) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-
-examplesh$(EXE): example.o $(PIC_TESTOBJG) $(SHAREDTARGET)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(PIC_TESTOBJG) $(SHAREDTARGET) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-makefixed$(EXE): makefixed.o $(OBJG) $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ makefixed.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-maketrees$(EXE): maketrees.o $(OBJG) $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ maketrees.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-makecrct$(EXE): makecrct.o $(OBJG) $(STATICLIB)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ makecrct.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC)
-ifneq ($(STRIP),)
-	$(STRIP) $@
-endif
-
-install-shared: $(SHAREDTARGET)
-ifneq ($(SHAREDTARGET),)
-	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)
-	cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir)
-	chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)
-ifneq ($(SHAREDLIB),$(SHAREDTARGET))
-	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM)
-	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB)
-	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM)
-	($(LDCONFIG) || true)  >/dev/null 2>&1
-# ldconfig is for Linux
-endif
-ifneq ($(IMPORTLIB),)
-	cp $(IMPORTLIB) $(DESTDIR)$(sharedlibdir)
-	chmod 644 $(DESTDIR)$(sharedlibdir)/$(IMPORTLIB)
-endif
-endif
-
-install-static: $(STATICLIB)
-	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
-	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
-	cp $(STATICLIB) $(DESTDIR)$(libdir)
-	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
-	-@($(RANLIB) $(DESTDIR)$(libdir)/$(STATICLIB) || true) >/dev/null 2>&1
-# The ranlib in install-static is needed on NeXTSTEP which checks file times
-
-install-libs: install-shared install-static
-	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
-	rm -f $(DESTDIR)$(pkgconfigdir)/$(PKGFILE)
-	cp $(PKGFILE) $(DESTDIR)$(pkgconfigdir)
-	chmod 644 $(DESTDIR)$(pkgconfigdir)/$(PKGFILE)
-
-install: install-libs
-	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
-	rm -f $(DESTDIR)$(includedir)/zlib$(SUFFIX).h $(DESTDIR)$(includedir)/zconf$(SUFFIX).h $(DESTDIR)$(includedir)/zlib_name_mangling$(SUFFIX).h
-	cp zlib$(SUFFIX).h $(DESTDIR)$(includedir)/zlib$(SUFFIX).h
-	cp zconf$(SUFFIX).h $(DESTDIR)$(includedir)/zconf$(SUFFIX).h
-	cp zlib_name_mangling$(SUFFIX).h $(DESTDIR)$(includedir)/zlib_name_mangling$(SUFFIX).h
-	chmod 644 $(DESTDIR)$(includedir)/zlib$(SUFFIX).h $(DESTDIR)$(includedir)/zconf$(SUFFIX).h $(DESTDIR)$(includedir)/zlib_name_mangling$(SUFFIX).h
-
-uninstall-static:
-	cd $(DESTDIR)$(libdir) && rm -f $(STATICLIB)
-
-uninstall-shared:
-ifneq ($(SHAREDLIB),)
-	cd $(DESTDIR)$(sharedlibdir) && rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM)
-endif
-ifneq ($(IMPORTLIB),)
-	cd $(DESTDIR)$(sharedlibdir) && rm -f $(IMPORTLIB)
-endif
-
-uninstall: uninstall-static uninstall-shared
-	cd $(DESTDIR)$(includedir) && rm -f zlib$(SUFFIX).h zconf$(SUFFIX).h zlib_name_mangling$(SUFFIX).h
-	cd $(DESTDIR)$(pkgconfigdir) && rm -f $(PKGFILE)
-
-mostlyclean: clean
-clean:
-	@if [ -f $(ARCHDIR)/Makefile ]; then $(MAKE) -C $(ARCHDIR) clean; fi
-	@if [ -f test/Makefile ]; then $(MAKE) -C test clean; fi
-	rm -f *.o *.lo *~ \
-	   example$(EXE) minigzip$(EXE) minigzipsh$(EXE) \
-	   infcover makefixed$(EXE) maketrees$(EXE) makecrct$(EXE) \
-	   $(STATICLIB) $(IMPORTLIB) $(SHAREDLIB) $(SHAREDLIBV) $(SHAREDLIBM) \
-	   foo.gz so_locations \
-	   _match.s maketree
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-	rm -f a.out a.exe
-	rm -f *.pc
-	rm -f *._h
-	rm -rf btmp1 btmp2 pkgtmp1 pkgtmp2
-
-maintainer-clean: distclean
-distclean: clean
-	@if [ -f $(ARCHDIR)/Makefile ]; then $(MAKE) -C $(ARCHDIR) distclean; fi
-	@if [ -f test/Makefile ]; then $(MAKE) -C test distclean; fi
-	rm -f $(PKGFILE) configure.log zconf.h zconf.h.cmakein zlib$(SUFFIX).h zlib_name_mangling$(SUFFIX)}.h
-	-@rm -f .DS_Store
-# Reset Makefile if building inside source tree
-	@if [ -f Makefile.in ]; then \
-	printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
-	printf '\ndistclean:\n\t$(MAKE) -f Makefile.in distclean\n' >> Makefile ; \
-	touch -r $(SRCDIR)/Makefile.in Makefile ; fi
-# Reset zconf.h and zconf.h.cmakein if building inside source tree
-	@if [ -f zconf.h.in ]; then \
-	cp -p $(SRCDIR)/zconf.h.in zconf.h ; \
-	grep -v '^#cmakedefine' $(SRCDIR)/zconf.h.in > zconf.h.cmakein &&\
-	touch -r $(SRCDIR)/zconf.h.in zconf.h.cmakein ; fi
-# Cleanup these files if building outside source tree
-	@if [ ! -f README.md ]; then rm -f Makefile; fi
-# Remove arch and test directory if building outside source tree
-	@if [ ! -f $(ARCHDIR)/Makefile.in ]; then rm -rf arch; fi
-	@if [ ! -f test/Makefile.in ]; then rm -rf test; fi
-
-tags:
-	etags $(SRCDIR)/*.[ch]

crates/libz-sys/src/zlib-ng/PORTING.md

diff --git a/crates/libz-sys/src/zlib-ng/PORTING.md b/crates/libz-sys/src/zlib-ng/PORTING.md
deleted file mode 100644
index 3875ccc..0000000
--- a/crates/libz-sys/src/zlib-ng/PORTING.md
+++ /dev/null
@@ -1,78 +0,0 @@
-Porting applications to use zlib-ng
-===================================
-
-Zlib-ng can be used/compiled in two different modes, that require some
-consideration by the application developer.
-
-zlib-compat mode
-----------------
-Zlib-ng can be compiled in zlib-compat mode, suitable for zlib-replacement
-in a single application or system-wide.
-
-Please note that zlib-ng in zlib-compat mode tries to maintain both API and
-ABI compatibility with the original zlib. Any issues regarding compatibility
-can be reported as bugs.
-
-In certain instances you may not be able to simply replace the zlib library/dll
-files and expect the application to work. The application may need to be
-recompiled against the zlib-ng headers and libs to ensure full compatibility.
-
-It is also possible for the deflate output stream to differ from the original
-zlib due to algorithmic differences between the two libraries. Any tests or
-applications that depend on the exact length of the deflate stream being a
-certain value will need to be updated.
-
-**Advantages:**
-- Easy to port to, since it only requires a recompile of the application and
-  no changes to the application code.
-
-**Disadvantages:**
-- Can conflict with a system-installed zlib, as that can often be linked in
-  by another library you are linking into your application. This can cause
-  crashes or incorrect output.
-- If your application is pre-allocating a memory buffer and you are providing
-  deflate/inflate init with your own allocator that allocates from that buffer
-  (looking at you nginx), you should be aware that zlib-ng needs to allocate
-  more memory than stock zlib needs. The same problem exists with Intel’s and
-  Cloudflare’s zlib forks. Doing this is not recommended since it makes it
-  very hard to maintain compatibility over time.
-
-**Build Considerations:**
-- Compile against the *zlib.h* provided by zlib-ng
-- Configuration header is named *zconf.h*
-- Static library is *libz.a* on Unix and macOS, or *zlib.lib* on Windows
-- Shared library is *libz.so* on Unix, *libz.dylib* on macOS, or *zlib1.dll*
-  on Windows
-- Type `z_size_t` is *unsigned long*
-
-zlib-ng native mode
--------------------
-Zlib-ng in native mode is suitable for co-existing with the standard zlib
-library, allowing applications to implement support and testing separately.
-
-The zlib-ng native has implemented some modernization and simplifications
-in its API, intended to make life easier for application developers.
-
-**Advantages:**
-- Does not conflict with other zlib implementations, and can co-exist as a
-  system library along with zlib.
-- In certain places zlib-ng native uses more appropriate data types, removing
-  the need for some workarounds in the API compared to zlib.
-
-**Disadvantages:**
-- Requires minor changes to applications to use the prefixed zlib-ng
-  function calls and structs. Usually this means a small prefix `zng_` has to be added.
-
-**Build Considerations:**
-- Compile against *zlib-ng.h*
-- Configuration header is named *zconf-ng.h*
-- Static library is *libz-ng.a* on Unix and macOS, or *zlib-ng.lib* on Windows
-- Shared library is *libz-ng.so* on Unix, *libz-ng.dylib* on macOS, or
-  *zlib-ng2.dll* on Windows
-- Type `z_size_t` is *size_t*
-
-zlib-ng compile-time detection
-------------------------------
-
-To distinguish zlib-ng from other zlib implementations at compile-time check for the
-existence of `ZLIBNG_VERSION` defined in the zlib header.

crates/libz-sys/src/zlib-ng/README.md

diff --git a/crates/libz-sys/src/zlib-ng/README.md b/crates/libz-sys/src/zlib-ng/README.md
deleted file mode 100644
index 0dd1b1c..0000000
--- a/crates/libz-sys/src/zlib-ng/README.md
+++ /dev/null
@@ -1,226 +0,0 @@
-## zlib-ng
-*zlib data compression library for the next generation systems*
-
-Maintained by Hans Kristian Rosbach
-          aka Dead2 (zlib-ng àt circlestorm dót org)
-
-|CI|Status|
-|:-|-|
-|GitHub Actions|[![Master Branch Status](https://github.com/zlib-ng/zlib-ng/workflows/CI%20CMake/badge.svg)](https://github.com/zlib-ng/zlib-ng/actions) [![Master Branch Status](https://github.com/zlib-ng/zlib-ng/workflows/CI%20Configure/badge.svg)](https://github.com/zlib-ng/zlib-ng/actions) [![Master Branch Status](https://github.com/zlib-ng/zlib-ng/workflows/CI%20NMake/badge.svg)](https://github.com/zlib-ng/zlib-ng/actions)|
-|Buildkite|[![Build status](https://badge.buildkite.com/7bb1ef84356d3baee26202706cc053ee1de871c0c712b65d26.svg?branch=develop)](https://buildkite.com/circlestorm-productions/zlib-ng)|
-|CodeFactor|[![CodeFactor](https://www.codefactor.io/repository/github/zlib-ng/zlib-ng/badge)](https://www.codefactor.io/repository/github/zlib-ng/zlib-ng)|
-|OSS-Fuzz|[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/zlib-ng.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:zlib-ng)
-|Codecov|[![codecov.io](https://codecov.io/github/zlib-ng/zlib-ng/coverage.svg?branch=develop)](https://codecov.io/github/zlib-ng/zlib-ng/)|
-
-
-Features
---------
-
-* Zlib compatible API with support for dual-linking
-* Modernized native API based on zlib API for ease of porting
-* Modern C11 syntax and a clean code layout
-* Deflate medium and quick algorithms based on Intel’s zlib fork
-* Support for CPU intrinsics when available
-  * Adler32 implementation using SSSE3, AVX2, AVX512, AVX512-VNNI, Neon, VMX & VSX
-  * CRC32-B implementation using PCLMULQDQ, VPCLMULQDQ, ACLE, & IBM Z
-  * Hash table implementation using CRC32-C intrinsics on x86 and ARM
-  * Slide hash implementations using SSE2, AVX2, Neon, VMX & VSX
-  * Compare256 implementations using SSE2, AVX2, Neon, & POWER9
-  * Inflate chunk copying using SSE2, AVX, Neon & VSX
-  * Support for hardware-accelerated deflate using IBM Z DFLTCC
-* Unaligned memory read/writes and large bit buffer improvements
-* Includes improvements from Cloudflare and Intel forks
-* Configure, CMake, and NMake build system support
-* Comprehensive set of CMake unit tests
-* Code sanitizers, fuzzing, and coverage
-* GitHub Actions continuous integration on Windows, macOS, and Linux
-  * Emulated CI for ARM, AARCH64, PPC, PPC64, SPARC64, S390x using qemu
-
-
-History
--------
-
-The motivation for this fork came after seeing several 3rd party
-contributions containing new optimizations not getting implemented
-into the official zlib repository.
-
-Mark Adler has been maintaining zlib for a very long time, and he has
-done a great job and hopefully he will continue for a long time yet.
-The idea of zlib-ng is not to replace zlib, but to co-exist as a
-drop-in replacement with a lower threshold for code change.
-
-zlib has a long history and is incredibly portable, even supporting
-lots of systems that predate the Internet. This is great, but it does
-complicate further development and maintainability.
-The zlib code has numerous workarounds for old compilers that do not
-understand ANSI-C or to accommodate systems with limitations such as
-operating in a 16-bit environment.
-
-Many of these workarounds are only maintenance burdens, some of them
-are pretty huge code-wise. For example, the [v]s[n]printf workaround
-code has a whopping 8 different implementations just to cater to
-various old compilers. With this many workarounds cluttered throughout
-the code, new programmers with an idea/interest for zlib will need
-to take some time to figure out why all of these seemingly strange
-things are used, and how to work within those confines.
-
-So I decided to make a fork, merge all the Intel optimizations, merge
-the Cloudflare optimizations that did not conflict, plus a couple
-of other smaller patches. Then I started cleaning out workarounds,
-various dead code, all contrib and example code as there is little
-point in having those in this fork for various reasons.
-
-A lot of improvements have gone into zlib-ng since its start, and
-numerous people and companies have contributed both small and big
-improvements, or valuable testing.
-
-Please read LICENSE.md, it is very simple and very liberal.
-
-
-Build
------
-
-There are two ways to build zlib-ng:
-
-### Cmake
-
-To build zlib-ng using the cross-platform makefile generator cmake.
-
-```
-cmake .
-cmake --build . --config Release
-ctest --verbose -C Release
-```
-
-Alternatively, you can use the cmake configuration GUI tool ccmake:
-
-```
-ccmake .
-```
-
-### Configure
-
-To build zlib-ng using the bash configure script:
-
-```
-./configure
-make
-make test
-```
-
-Build Options
--------------
-
-| CMake                    | configure                | Description                                                                           | Default |
-|:-------------------------|:-------------------------|:--------------------------------------------------------------------------------------|---------|
-| ZLIB_COMPAT              | --zlib-compat            | Compile with zlib compatible API                                                      | OFF     |
-| ZLIB_ENABLE_TESTS        |                          | Build test binaries                                                                   | ON      |
-| WITH_GZFILEOP            | --without-gzfileops      | Compile with support for gzFile related functions                                     | ON      |
-| WITH_OPTIM               | --without-optimizations  | Build with optimisations                                                              | ON      |
-| WITH_NEW_STRATEGIES      | --without-new-strategies | Use new strategies                                                                    | ON      |
-| WITH_NATIVE_INSTRUCTIONS | --native                 | Compiles with full instruction set supported on this host (gcc/clang -march=native)   | OFF     |
-| WITH_SANITIZER           |                          | Build with sanitizer (memory, address, undefined)                                     | OFF     |
-| WITH_FUZZERS             |                          | Build test/fuzz                                                                       | OFF     |
-| WITH_BENCHMARKS          |                          | Build test/benchmarks                                                                 | OFF     |
-| WITH_MAINTAINER_WARNINGS |                          | Build with project maintainer warnings                                                | OFF     |
-| WITH_CODE_COVERAGE       |                          | Enable code coverage reporting                                                        | OFF     |
-
-
-Install
--------
-
-WARNING: We do not recommend manually installing unless you really
-know what you are doing, because this can potentially override the system
-default zlib library, and any incompatibility or wrong configuration of
-zlib-ng can make the whole system unusable, requiring recovery or reinstall.
-If you still want a manual install, we recommend using the /opt/ path prefix.
-
-For Linux distros, an alternative way to use zlib-ng (if compiled in
-zlib-compat mode) instead of zlib, is through the use of the
-_LD_PRELOAD_ environment variable. If the program is dynamically linked
-with zlib, then zlib-ng will temporarily be used instead by the program,
-without risking system-wide instability.
-
-```
-LD_PRELOAD=/opt/zlib-ng/libz.so.1.2.11.zlib-ng /usr/bin/program
-```
-
-### Cmake
-
-To install zlib-ng system-wide using cmake:
-
-```
-cmake --build . --target install
-```
-
-### Configure
-
-To install zlib-ng system-wide using the configure script:
-
-```
-make install
-```
-
-Contributing
-------------
-
-Zlib-ng is a aiming to be open to contributions, and we would be delighted to
-receive pull requests on github.
-Just remember that any code you submit must be your own and it must be zlib licensed.
-Help with testing and reviewing of pull requests etc is also very much appreciated.
-
-If you are interested in contributing, please consider joining our
-IRC channel #zlib-ng on the Freenode IRC network.
-
-
-Acknowledgments
-----------------
-
-Thanks to Servebolt.com for sponsoring my maintainership of zlib-ng.
-
-Thanks go out to all the people and companies who have taken the time to contribute
-code reviews, testing and/or patches. Zlib-ng would not have been nearly as good without you.
-
-The deflate format used by zlib was defined by Phil Katz.
-The deflate and zlib specifications were written by L. Peter Deutsch.
-
-zlib was originally created by Jean-loup Gailly (compression)
-and Mark Adler (decompression).
-
-
-Advanced Build Options
-----------------------
-
-| CMake                           | configure             | Description                                                         | Default                |
-|:--------------------------------|:----------------------|:--------------------------------------------------------------------|------------------------|
-| ZLIB_DUAL_LINK                  |                       | Dual link tests with system zlib                                    | OFF                    |
-| FORCE_SSE2                      | --force-sse2          | Skip runtime check for SSE2 instructions (Always on for x86_64)     | OFF (x86)              |
-| FORCE_TZCNT                     | --force-tzcnt         | Skip runtime check for TZCNT instructions                           | OFF                    |
-| WITH_AVX2                       |                       | Build with AVX2 intrinsics                                          | ON                     |
-| WITH_AVX512                     |                       | Build with AVX512 intrinsics                                        | ON                     |
-| WITH_AVX512VNNI                 |                       | Build with AVX512VNNI intrinsics                                    | ON                     |
-| WITH_SSE2                       |                       | Build with SSE2 intrinsics                                          | ON                     |
-| WITH_SSE41                      |                       | Build with SSE41 intrinsics                                         | ON                     |
-| WITH_SSE42                      |                       | Build with SSE42 intrinsics                                         | ON                     |
-| WITH_PCLMULQDQ                  |                       | Build with PCLMULQDQ intrinsics                                     | ON                     |
-| WITH_VPCLMULQDQ                 | --without-vpclmulqdq  | Build with VPCLMULQDQ intrinsics                                    | ON                     |
-| WITH_ACLE                       | --without-acle        | Build with ACLE intrinsics                                          | ON                     |
-| WITH_NEON                       | --without-neon        | Build with NEON intrinsics                                          | ON                     |
-| WITH_ALTIVEC                    | --without-altivec     | Build with AltiVec (VMX) intrinsics                                 | ON                     |
-| WITH_POWER8                     | --without-power8      | Build with POWER8 optimisations                                     | ON                     |
-| WITH_CRC32_VX                   | --without-crc32-vx    | Build with vectorized CRC32 on IBM Z                                | ON                     |
-| WITH_DFLTCC_DEFLATE             | --with-dfltcc-deflate | Build with DFLTCC intrinsics for compression on IBM Z               | OFF                    |
-| WITH_DFLTCC_INFLATE             | --with-dfltcc-inflate | Build with DFLTCC intrinsics for decompression on IBM Z             | OFF                    |
-| WITH_UNALIGNED                  | --without-unaligned   | Allow optimizations that use unaligned reads if safe on current arch| ON                     |
-| WITH_INFLATE_STRICT             |                       | Build with strict inflate distance checking                         | OFF                    |
-| WITH_INFLATE_ALLOW_INVALID_DIST |                       | Build with zero fill for inflate invalid distances                  | OFF                    |
-| INSTALL_UTILS                   |                       | Copy minigzip and minideflate during install                        | OFF                    |
-
-
-Related Projects
-----------------
-
-* Fork of the popular minigzip                  https://github.com/zlib-ng/minizip-ng
-* Python tool to benchmark minigzip/minideflate https://github.com/zlib-ng/deflatebench
-* Python tool to benchmark pigz                 https://github.com/zlib-ng/pigzbench
-* 3rd party patches for zlib-ng compatibility   https://github.com/zlib-ng/patches

crates/libz-sys/src/zlib-ng/adler32.c

diff --git a/crates/libz-sys/src/zlib-ng/adler32.c b/crates/libz-sys/src/zlib-ng/adler32.c
deleted file mode 100644
index 42e7b0f..0000000
--- a/crates/libz-sys/src/zlib-ng/adler32.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "functable.h"
-#include "adler32_p.h"
-
-/* ========================================================================= */
-Z_INTERNAL uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len) {
-    uint32_t sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (UNLIKELY(len == 1))
-        return adler32_len_1(adler, buf, sum2);
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (UNLIKELY(buf == NULL))
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (UNLIKELY(len < 16))
-        return adler32_len_16(adler, buf, len, sum2);
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-#ifdef UNROLL_MORE
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-#else
-        n = NMAX / 8;           /* NMAX is divisible by 8 */
-#endif
-        do {
-#ifdef UNROLL_MORE
-            DO16(adler, sum2, buf);          /* 16 sums unrolled */
-            buf += 16;
-#else
-            DO8(adler, sum2, buf, 0);         /* 8 sums unrolled */
-            buf += 8;
-#endif
-        } while (--n);
-        adler %= BASE;
-        sum2 %= BASE;
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    return adler32_len_64(adler, buf, len, sum2);
-}
-
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(adler32_z)(unsigned long adler, const unsigned char *buf, size_t len) {
-    return (unsigned long)functable.adler32((uint32_t)adler, buf, len);
-}
-#else
-uint32_t Z_EXPORT PREFIX(adler32_z)(uint32_t adler, const unsigned char *buf, size_t len) {
-    return functable.adler32(adler, buf, len);
-}
-#endif
-
-/* ========================================================================= */
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(adler32)(unsigned long adler, const unsigned char *buf, unsigned int len) {
-    return (unsigned long)functable.adler32((uint32_t)adler, buf, len);
-}
-#else
-uint32_t Z_EXPORT PREFIX(adler32)(uint32_t adler, const unsigned char *buf, uint32_t len) {
-    return functable.adler32(adler, buf, len);
-}
-#endif
-
-/* ========================================================================= */
-static uint32_t adler32_combine_(uint32_t adler1, uint32_t adler2, z_off64_t len2) {
-    uint32_t sum1;
-    uint32_t sum2;
-    unsigned rem;
-
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffff;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    len2 %= BASE;                 /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    sum2 %= BASE;
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
-
-/* ========================================================================= */
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(adler32_combine)(unsigned long adler1, unsigned long adler2, z_off_t len2) {
-    return (unsigned long)adler32_combine_((uint32_t)adler1, (uint32_t)adler2, len2);
-}
-
-unsigned long Z_EXPORT PREFIX4(adler32_combine)(unsigned long adler1, unsigned long adler2, z_off64_t len2) {
-    return (unsigned long)adler32_combine_((uint32_t)adler1, (uint32_t)adler2, len2);
-}
-#else
-uint32_t Z_EXPORT PREFIX4(adler32_combine)(uint32_t adler1, uint32_t adler2, z_off64_t len2) {
-    return adler32_combine_(adler1, adler2, len2);
-}
-#endif

crates/libz-sys/src/zlib-ng/adler32_fold.c

diff --git a/crates/libz-sys/src/zlib-ng/adler32_fold.c b/crates/libz-sys/src/zlib-ng/adler32_fold.c
deleted file mode 100644
index 20fec2b..0000000
--- a/crates/libz-sys/src/zlib-ng/adler32_fold.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* adler32_fold.c -- adler32 folding interface
- * Copyright (C) 2022 Adam Stylinski 
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "functable.h"
-#include "adler32_fold.h"
-
-Z_INTERNAL uint32_t adler32_fold_copy_c(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-    memcpy(dst, src, len);
-    return functable.adler32(adler, src, len);
-}

crates/libz-sys/src/zlib-ng/adler32_fold.h

diff --git a/crates/libz-sys/src/zlib-ng/adler32_fold.h b/crates/libz-sys/src/zlib-ng/adler32_fold.h
deleted file mode 100644
index 20aa1c7..0000000
--- a/crates/libz-sys/src/zlib-ng/adler32_fold.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* adler32_fold.h -- adler32 folding interface
- * Copyright (C) 2022 Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ADLER32_FOLD_H_
-#define ADLER32_FOLD_H_
-
-Z_INTERNAL uint32_t adler32_fold_copy_c(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-
-#endif

crates/libz-sys/src/zlib-ng/adler32_p.h

diff --git a/crates/libz-sys/src/zlib-ng/adler32_p.h b/crates/libz-sys/src/zlib-ng/adler32_p.h
deleted file mode 100644
index 1d2e77f..0000000
--- a/crates/libz-sys/src/zlib-ng/adler32_p.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* adler32_p.h -- Private inline functions and macros shared with
- *                different computation of the Adler-32 checksum
- *                of a data stream.
- * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ADLER32_P_H
-#define ADLER32_P_H
-
-#define BASE 65521U     /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(sum1, sum2, buf, i)  {(sum1) += buf[(i)]; (sum2) += (sum1);}
-#define DO2(sum1, sum2, buf, i)  {DO1(sum1, sum2, buf, i); DO1(sum1, sum2, buf, i+1);}
-#define DO4(sum1, sum2, buf, i)  {DO2(sum1, sum2, buf, i); DO2(sum1, sum2, buf, i+2);}
-#define DO8(sum1, sum2, buf, i)  {DO4(sum1, sum2, buf, i); DO4(sum1, sum2, buf, i+4);}
-#define DO16(sum1, sum2, buf)    {DO8(sum1, sum2, buf, 0); DO8(sum1, sum2, buf, 8);}
-
-static inline uint32_t adler32_len_1(uint32_t adler, const unsigned char *buf, uint32_t sum2) {
-    adler += buf[0];
-    adler %= BASE;
-    sum2 += adler;
-    sum2 %= BASE;
-    return adler | (sum2 << 16);
-}
-
-static inline uint32_t adler32_len_16(uint32_t adler, const unsigned char *buf, size_t len, uint32_t sum2) {
-    while (len) {
-        --len;
-        adler += *buf++;
-        sum2 += adler;
-    }
-    adler %= BASE;
-    sum2 %= BASE;            /* only added so many BASE's */
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-static inline uint32_t adler32_copy_len_16(uint32_t adler, const unsigned char *buf, uint8_t *dst, size_t len, uint32_t sum2) {
-    while (len--) {
-        *dst = *buf++; 
-        adler += *dst++;
-        sum2 += adler;
-    }
-    adler %= BASE;
-    sum2 %= BASE;            /* only added so many BASE's */
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-static inline uint32_t adler32_len_64(uint32_t adler, const unsigned char *buf, size_t len, uint32_t sum2) {
-#ifdef UNROLL_MORE
-    while (len >= 16) {
-        len -= 16;
-        DO16(adler, sum2, buf);
-        buf += 16;
-#else
-    while (len >= 8) {
-        len -= 8;
-        DO8(adler, sum2, buf, 0);
-        buf += 8;
-#endif
-    }
-    /* Process tail (len < 16).  */
-    return adler32_len_16(adler, buf, len, sum2);
-}
-
-#endif /* ADLER32_P_H */

crates/libz-sys/src/zlib-ng/arch/arm/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/Makefile.in b/crates/libz-sys/src/zlib-ng/arch/arm/Makefile.in
deleted file mode 100644
index abf6193..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/Makefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-CC=
-CFLAGS=
-SFLAGS=
-INCLUDES=
-SUFFIX=
-
-ACLEFLAG=
-NEONFLAG=
-NOLTOFLAG=
-
-SRCDIR=.
-SRCTOP=../..
-TOPDIR=$(SRCTOP)
-
-all: \
-	adler32_neon.o adler32_neon.lo \
-	arm_features.o arm_features.lo \
-	chunkset_neon.o chunkset_neon.lo \
-	compare256_neon.o compare256_neon.lo \
-	crc32_acle.o crc32_acle.lo \
-	slide_hash_neon.o slide_hash_neon.lo \
-	insert_string_acle.o insert_string_acle.lo
-
-adler32_neon.o:
-	$(CC) $(CFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_neon.c
-
-adler32_neon.lo:
-	$(CC) $(SFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_neon.c
-
-arm_features.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arm_features.c
-
-arm_features.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arm_features.c
-
-chunkset_neon.o:
-	$(CC) $(CFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_neon.c
-
-chunkset_neon.lo:
-	$(CC) $(SFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_neon.c
-
-compare256_neon.o:
-	$(CC) $(CFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_neon.c
-
-compare256_neon.lo:
-	$(CC) $(SFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_neon.c
-
-crc32_acle.o:
-	$(CC) $(CFLAGS) $(ACLEFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_acle.c
-
-crc32_acle.lo:
-	$(CC) $(SFLAGS) $(ACLEFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_acle.c
-
-slide_hash_neon.o:
-	$(CC) $(CFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_neon.c
-
-slide_hash_neon.lo:
-	$(CC) $(SFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_neon.c
-
-insert_string_acle.o:
-	$(CC) $(CFLAGS) $(ACLEFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_acle.c
-
-insert_string_acle.lo:
-	$(CC) $(SFLAGS) $(ACLEFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_acle.c
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-
-distclean:
-	rm -f Makefile

crates/libz-sys/src/zlib-ng/arch/arm/adler32_neon.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/adler32_neon.c b/crates/libz-sys/src/zlib-ng/arch/arm/adler32_neon.c
deleted file mode 100644
index 7c2c51f..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/adler32_neon.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright (C) 1995-2011, 2016 Mark Adler
- * Copyright (C) 2017 ARM Holdings Inc.
- * Authors:
- *   Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
- *   Adam Stylinski <kungfujesus06@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#ifdef ARM_NEON_ADLER32
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../fallback_builtins.h"
-
-static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) {
-    static const uint16_t ALIGNED_(16) taps[64] = {
-        64, 63, 62, 61, 60, 59, 58, 57,
-        56, 55, 54, 53, 52, 51, 50, 49,
-        48, 47, 46, 45, 44, 43, 42, 41,
-        40, 39, 38, 37, 36, 35, 34, 33,
-        32, 31, 30, 29, 28, 27, 26, 25,
-        24, 23, 22, 21, 20, 19, 18, 17,
-        16, 15, 14, 13, 12, 11, 10, 9,
-        8, 7, 6, 5, 4, 3, 2, 1 };
-
-    uint32x4_t adacc = vdupq_n_u32(0);
-    uint32x4_t s2acc = vdupq_n_u32(0);
-    uint32x4_t s2acc_0 = vdupq_n_u32(0);
-    uint32x4_t s2acc_1 = vdupq_n_u32(0);
-    uint32x4_t s2acc_2 = vdupq_n_u32(0);
-
-    adacc = vsetq_lane_u32(s[0], adacc, 0);
-    s2acc = vsetq_lane_u32(s[1], s2acc, 0);
-
-    uint32x4_t s3acc = vdupq_n_u32(0);
-    uint32x4_t adacc_prev = adacc;
-
-    uint16x8_t s2_0, s2_1, s2_2, s2_3;
-    s2_0 = s2_1 = s2_2 = s2_3 = vdupq_n_u16(0);
-
-    uint16x8_t s2_4, s2_5, s2_6, s2_7;
-    s2_4 = s2_5 = s2_6 = s2_7 = vdupq_n_u16(0);
-
-    int num_iter = len >> 2;
-    int rem = len & 3;
-
-    for (int i = 0; i < num_iter; ++i) {
-        uint8x16x4_t d0_d3 = vld1q_u8_x4(buf);
-
-        /* Unfortunately it doesn't look like there's a direct sum 8 bit to 32
-         * bit instruction, we'll have to make due summing to 16 bits first */
-        uint16x8x2_t hsum, hsum_fold;
-        hsum.val[0] = vpaddlq_u8(d0_d3.val[0]);
-        hsum.val[1] = vpaddlq_u8(d0_d3.val[1]);
-
-        hsum_fold.val[0] = vpadalq_u8(hsum.val[0], d0_d3.val[2]);
-        hsum_fold.val[1] = vpadalq_u8(hsum.val[1], d0_d3.val[3]);
-
-        adacc = vpadalq_u16(adacc, hsum_fold.val[0]);
-        s3acc = vaddq_u32(s3acc, adacc_prev);
-        adacc = vpadalq_u16(adacc, hsum_fold.val[1]);
-
-        /* If we do straight widening additions to the 16 bit values, we don't incur
-         * the usual penalties of a pairwise add. We can defer the multiplications
-         * until the very end. These will not overflow because we are incurring at
-         * most 408 loop iterations (NMAX / 64), and a given lane is only going to be
-         * summed into once. This means for the maximum input size, the largest value
-         * we will see is 255 * 102 = 26010, safely under uint16 max */
-        s2_0 = vaddw_u8(s2_0, vget_low_u8(d0_d3.val[0]));
-        s2_1 = vaddw_high_u8(s2_1, d0_d3.val[0]);
-        s2_2 = vaddw_u8(s2_2, vget_low_u8(d0_d3.val[1]));
-        s2_3 = vaddw_high_u8(s2_3, d0_d3.val[1]);
-        s2_4 = vaddw_u8(s2_4, vget_low_u8(d0_d3.val[2]));
-        s2_5 = vaddw_high_u8(s2_5, d0_d3.val[2]);
-        s2_6 = vaddw_u8(s2_6, vget_low_u8(d0_d3.val[3]));
-        s2_7 = vaddw_high_u8(s2_7, d0_d3.val[3]);
-
-        adacc_prev = adacc;
-        buf += 64;
-    }
-
-    s3acc = vshlq_n_u32(s3acc, 6);
-
-    if (rem) {
-        uint32x4_t s3acc_0 = vdupq_n_u32(0);
-        while (rem--) {
-            uint8x16_t d0 = vld1q_u8(buf);
-            uint16x8_t adler;
-            adler = vpaddlq_u8(d0);
-            s2_6 = vaddw_u8(s2_6, vget_low_u8(d0));
-            s2_7 = vaddw_high_u8(s2_7, d0);
-            adacc = vpadalq_u16(adacc, adler);
-            s3acc_0 = vaddq_u32(s3acc_0, adacc_prev);
-            adacc_prev = adacc;
-            buf += 16;
-        }
-
-        s3acc_0 = vshlq_n_u32(s3acc_0, 4);
-        s3acc = vaddq_u32(s3acc_0, s3acc);
-    }
-
-    uint16x8x4_t t0_t3 = vld1q_u16_x4(taps);
-    uint16x8x4_t t4_t7 = vld1q_u16_x4(taps + 32);
-
-    s2acc = vmlal_high_u16(s2acc, t0_t3.val[0], s2_0);
-    s2acc_0 = vmlal_u16(s2acc_0, vget_low_u16(t0_t3.val[0]), vget_low_u16(s2_0));
-    s2acc_1 = vmlal_high_u16(s2acc_1, t0_t3.val[1], s2_1);
-    s2acc_2 = vmlal_u16(s2acc_2, vget_low_u16(t0_t3.val[1]), vget_low_u16(s2_1));
-
-    s2acc = vmlal_high_u16(s2acc, t0_t3.val[2], s2_2);
-    s2acc_0 = vmlal_u16(s2acc_0, vget_low_u16(t0_t3.val[2]), vget_low_u16(s2_2));
-    s2acc_1 = vmlal_high_u16(s2acc_1, t0_t3.val[3], s2_3);
-    s2acc_2 = vmlal_u16(s2acc_2, vget_low_u16(t0_t3.val[3]), vget_low_u16(s2_3));
-
-    s2acc = vmlal_high_u16(s2acc, t4_t7.val[0], s2_4);
-    s2acc_0 = vmlal_u16(s2acc_0, vget_low_u16(t4_t7.val[0]), vget_low_u16(s2_4));
-    s2acc_1 = vmlal_high_u16(s2acc_1, t4_t7.val[1], s2_5);
-    s2acc_2 = vmlal_u16(s2acc_2, vget_low_u16(t4_t7.val[1]), vget_low_u16(s2_5));
-
-    s2acc = vmlal_high_u16(s2acc, t4_t7.val[2], s2_6);
-    s2acc_0 = vmlal_u16(s2acc_0, vget_low_u16(t4_t7.val[2]), vget_low_u16(s2_6));
-    s2acc_1 = vmlal_high_u16(s2acc_1, t4_t7.val[3], s2_7);
-    s2acc_2 = vmlal_u16(s2acc_2, vget_low_u16(t4_t7.val[3]), vget_low_u16(s2_7));
-
-    s2acc = vaddq_u32(s2acc_0, s2acc);
-    s2acc_2 = vaddq_u32(s2acc_1, s2acc_2);
-    s2acc = vaddq_u32(s2acc, s2acc_2);
-
-    uint32x2_t adacc2, s2acc2, as;
-    s2acc = vaddq_u32(s2acc, s3acc);
-    adacc2 = vpadd_u32(vget_low_u32(adacc), vget_high_u32(adacc));
-    s2acc2 = vpadd_u32(vget_low_u32(s2acc), vget_high_u32(s2acc));
-    as = vpadd_u32(adacc2, s2acc2);
-    s[0] = vget_lane_u32(as, 0);
-    s[1] = vget_lane_u32(as, 1);
-}
-
-static void NEON_handle_tail(uint32_t *pair, const unsigned char *buf, size_t len) {
-    unsigned int i;
-    for (i = 0; i < len; ++i) {
-        pair[0] += buf[i];
-        pair[1] += pair[0];
-    }
-}
-
-uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len) {
-    /* split Adler-32 into component sums */
-    uint32_t sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
-        return adler32_len_1(adler, buf, sum2);
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
-        return adler32_len_16(adler, buf, len, sum2);
-
-    uint32_t pair[2];
-    int n = NMAX;
-    unsigned int done = 0;
-
-    /* Split Adler-32 into component sums, it can be supplied by
-     * the caller sites (e.g. in a PNG file).
-     */
-    pair[0] = adler;
-    pair[1] = sum2;
-
-    /* If memory is not SIMD aligned, do scalar sums to an aligned
-     * offset, provided that doing so doesn't completely eliminate
-     * SIMD operation. Aligned loads are still faster on ARM, even
-     * though there's no explicit aligned load instruction */
-    unsigned int align_offset = ((uintptr_t)buf & 15);
-    unsigned int align_adj = (align_offset) ? 16 - align_offset : 0;
-
-    if (align_offset && len >= (16 + align_adj)) {
-        NEON_handle_tail(pair, buf, align_adj);
-        n -= align_adj;
-        done += align_adj;
-
-    } else {
-        /* If here, we failed the len criteria test, it wouldn't be
-         * worthwhile to do scalar aligning sums */
-        align_adj = 0;
-    }
-
-    while (done < len) {
-        int remaining = (int)(len - done);
-        n = MIN(remaining, (done == align_adj) ? n : NMAX);
-
-        if (n < 16)
-            break;
-
-        NEON_accum32(pair, buf + done, n >> 4);
-        pair[0] %= BASE;
-        pair[1] %= BASE;
-
-        int actual_nsums = (n >> 4) << 4;
-        done += actual_nsums;
-    }
-
-    /* Handle the tail elements. */
-    if (done < len) {
-        NEON_handle_tail(pair, (buf + done), len - done);
-        pair[0] %= BASE;
-        pair[1] %= BASE;
-    }
-
-    /* D = B * 65536 + A, see: https://en.wikipedia.org/wiki/Adler-32. */
-    return (pair[1] << 16) | pair[0];
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/arm_features.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.c b/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.c
deleted file mode 100644
index 979204b..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "../../zbuild.h"
-
-#if defined(__linux__) && defined(HAVE_SYS_AUXV_H)
-#  include <sys/auxv.h>
-#  ifdef ARM_ASM_HWCAP
-#    include <asm/hwcap.h>
-#  endif
-#elif defined(__FreeBSD__) && defined(__aarch64__)
-#  include <machine/armreg.h>
-#  ifndef ID_AA64ISAR0_CRC32_VAL
-#    define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-#  endif
-#elif defined(__APPLE__)
-#  if !defined(_DARWIN_C_SOURCE)
-#    define _DARWIN_C_SOURCE /* enable types aliases (eg u_int) */
-#  endif
-#  include <sys/sysctl.h>
-#elif defined(_WIN32)
-#  include <winapifamily.h>
-#endif
-
-static int arm_has_crc32() {
-#if defined(__linux__) && defined(ARM_AUXV_HAS_CRC32)
-#  ifdef HWCAP_CRC32
-    return (getauxval(AT_HWCAP) & HWCAP_CRC32) != 0 ? 1 : 0;
-#  else
-    return (getauxval(AT_HWCAP2) & HWCAP2_CRC32) != 0 ? 1 : 0;
-#  endif
-#elif defined(__FreeBSD__) && defined(__aarch64__)
-    return getenv("QEMU_EMULATING") == NULL
-      && ID_AA64ISAR0_CRC32_VAL(READ_SPECIALREG(id_aa64isar0_el1)) >= ID_AA64ISAR0_CRC32_BASE;
-#elif defined(__APPLE__)
-    int hascrc32;
-    size_t size = sizeof(hascrc32);
-    return sysctlbyname("hw.optional.armv8_crc32", &hascrc32, &size, NULL, 0) == 0
-      && hascrc32 == 1;
-#elif defined(ARM_NOCHECK_ACLE)
-    return 1;
-#else
-    return 0;
-#endif
-}
-
-/* AArch64 has neon. */
-#if !defined(__aarch64__) && !defined(_M_ARM64)
-static inline int arm_has_neon() {
-#if defined(__linux__) && defined(ARM_AUXV_HAS_NEON)
-#  ifdef HWCAP_ARM_NEON
-    return (getauxval(AT_HWCAP) & HWCAP_ARM_NEON) != 0 ? 1 : 0;
-#  else
-    return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0 ? 1 : 0;
-#  endif
-#elif defined(__APPLE__)
-    int hasneon;
-    size_t size = sizeof(hasneon);
-    return sysctlbyname("hw.optional.neon", &hasneon, &size, NULL, 0) == 0
-      && hasneon == 1;
-#elif defined(_M_ARM) && defined(WINAPI_FAMILY_PARTITION)
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-    return 1; /* Always supported */
-#  endif
-#endif
-
-#if defined(ARM_NOCHECK_NEON)
-    return 1;
-#else
-    return 0;
-#endif
-}
-#endif
-
-Z_INTERNAL int arm_cpu_has_neon;
-Z_INTERNAL int arm_cpu_has_crc32;
-
-void Z_INTERNAL arm_check_features(void) {
-#if defined(__aarch64__) || defined(_M_ARM64)
-    arm_cpu_has_neon = 1; /* always available */
-#else
-    arm_cpu_has_neon = arm_has_neon();
-#endif
-    arm_cpu_has_crc32 = arm_has_crc32();
-}

crates/libz-sys/src/zlib-ng/arch/arm/arm_features.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.h b/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.h
deleted file mode 100644
index 7998e79..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/arm_features.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* arm_features.h -- check for ARM features.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ARM_H_
-#define ARM_H_
-
-extern int arm_cpu_has_neon;
-extern int arm_cpu_has_crc32;
-
-void Z_INTERNAL arm_check_features(void);
-
-#endif /* ARM_H_ */

crates/libz-sys/src/zlib-ng/arch/arm/chunkset_neon.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/chunkset_neon.c b/crates/libz-sys/src/zlib-ng/arch/arm/chunkset_neon.c
deleted file mode 100644
index e2b9b8b..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/chunkset_neon.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* chunkset_neon.c -- NEON inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef ARM_NEON_CHUNKSET
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-#include "../../zbuild.h"
-
-typedef uint8x16_t chunk_t;
-
-#define CHUNK_SIZE 16
-
-#define HAVE_CHUNKMEMSET_2
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-
-static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
-    uint16_t tmp;
-    zmemcpy_2(&tmp, from);
-    *chunk = vreinterpretq_u8_u16(vdupq_n_u16(tmp));
-}
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    uint32_t tmp;
-    zmemcpy_4(&tmp, from);
-    *chunk = vreinterpretq_u8_u32(vdupq_n_u32(tmp));
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    uint64_t tmp;
-    zmemcpy_8(&tmp, from);
-    *chunk = vreinterpretq_u8_u64(vdupq_n_u64(tmp));
-}
-
-#define CHUNKSIZE        chunksize_neon
-#define CHUNKCOPY        chunkcopy_neon
-#define CHUNKCOPY_SAFE   chunkcopy_safe_neon
-#define CHUNKUNROLL      chunkunroll_neon
-#define CHUNKMEMSET      chunkmemset_neon
-#define CHUNKMEMSET_SAFE chunkmemset_safe_neon
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    *chunk = vld1q_u8(s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    vst1q_u8(out, *chunk);
-}
-
-#include "chunkset_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/compare256_neon.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/compare256_neon.c b/crates/libz-sys/src/zlib-ng/arch/arm/compare256_neon.c
deleted file mode 100644
index 53a088c..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/compare256_neon.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* compare256_neon.c - NEON version of compare256
- * Copyright (C) 2022 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-#include "../../zbuild.h"
-
-static inline uint32_t compare256_neon_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        uint8x16_t a, b, cmp;
-        uint64_t lane;
-
-        a = vld1q_u8(src0);
-        b = vld1q_u8(src1);
-
-        cmp = veorq_u8(a, b);
-
-        lane = vgetq_lane_u64(vreinterpretq_u64_u8(cmp), 0);
-        if (lane) {
-            uint32_t match_byte = (uint32_t)__builtin_ctzll(lane) / 8;
-            return len + match_byte;
-        }
-        len += 8;
-        lane = vgetq_lane_u64(vreinterpretq_u64_u8(cmp), 1);
-        if (lane) {
-            uint32_t match_byte = (uint32_t)__builtin_ctzll(lane) / 8;
-            return len + match_byte;
-        }
-        len += 8;
-
-        src0 += 16, src1 += 16;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_neon(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_neon_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_neon
-#define COMPARE256          compare256_neon_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_neon
-#define COMPARE256          compare256_neon_static
-
-#include "match_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/crc32_acle.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/crc32_acle.c b/crates/libz-sys/src/zlib-ng/arch/arm/crc32_acle.c
deleted file mode 100644
index 6f6ed45..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/crc32_acle.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crc32_acle.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
- * Copyright (C) 2016 Yang Zhang
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
-*/
-
-#ifdef ARM_ACLE_CRC_HASH
-#ifndef _MSC_VER
-#  include <arm_acle.h>
-#endif
-#include "../../zbuild.h"
-
-uint32_t crc32_acle(uint32_t crc, const unsigned char *buf, uint64_t len) {
-    Z_REGISTER uint32_t c;
-    Z_REGISTER const uint16_t *buf2;
-    Z_REGISTER const uint32_t *buf4;
-
-    c = ~crc;
-    if (len && ((ptrdiff_t)buf & 1)) {
-        c = __crc32b(c, *buf++);
-        len--;
-    }
-
-    if ((len > sizeof(uint16_t)) && ((ptrdiff_t)buf & sizeof(uint16_t))) {
-        buf2 = (const uint16_t *) buf;
-        c = __crc32h(c, *buf2++);
-        len -= sizeof(uint16_t);
-        buf4 = (const uint32_t *) buf2;
-    } else {
-        buf4 = (const uint32_t *) buf;
-    }
-
-#if defined(__aarch64__)
-    if ((len > sizeof(uint32_t)) && ((ptrdiff_t)buf & sizeof(uint32_t))) {
-        c = __crc32w(c, *buf4++);
-        len -= sizeof(uint32_t);
-    }
-
-    const uint64_t *buf8 = (const uint64_t *) buf4;
-
-#ifdef UNROLL_MORE
-    while (len >= 4 * sizeof(uint64_t)) {
-        c = __crc32d(c, *buf8++);
-        c = __crc32d(c, *buf8++);
-        c = __crc32d(c, *buf8++);
-        c = __crc32d(c, *buf8++);
-        len -= 4 * sizeof(uint64_t);
-    }
-#endif
-
-    while (len >= sizeof(uint64_t)) {
-        c = __crc32d(c, *buf8++);
-        len -= sizeof(uint64_t);
-    }
-
-    if (len >= sizeof(uint32_t)) {
-        buf4 = (const uint32_t *) buf8;
-        c = __crc32w(c, *buf4++);
-        len -= sizeof(uint32_t);
-        buf2 = (const uint16_t *) buf4;
-    } else {
-        buf2 = (const uint16_t *) buf8;
-    }
-
-    if (len >= sizeof(uint16_t)) {
-        c = __crc32h(c, *buf2++);
-        len -= sizeof(uint16_t);
-    }
-
-    buf = (const unsigned char *) buf2;
-#else /* __aarch64__ */
-
-#  ifdef UNROLL_MORE
-    while (len >= 8 * sizeof(uint32_t)) {
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        c = __crc32w(c, *buf4++);
-        len -= 8 * sizeof(uint32_t);
-    }
-#  endif
-
-    while (len >= sizeof(uint32_t)) {
-        c = __crc32w(c, *buf4++);
-        len -= sizeof(uint32_t);
-    }
-
-    if (len >= sizeof(uint16_t)) {
-        buf2 = (const uint16_t *) buf4;
-        c = __crc32h(c, *buf2++);
-        len -= sizeof(uint16_t);
-        buf = (const unsigned char *) buf2;
-    } else {
-        buf = (const unsigned char *) buf4;
-    }
-#endif /* __aarch64__ */
-
-    if (len) {
-        c = __crc32b(c, *buf);
-    }
-
-    c = ~c;
-    return c;
-}
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/ctzl.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/ctzl.h b/crates/libz-sys/src/zlib-ng/arch/arm/ctzl.h
deleted file mode 100644
index 77218de..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/ctzl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef ARM_CTZL_H
-#define ARM_CTZL_H
-
-#include <armintr.h>
-
-#if defined(_MSC_VER) && !defined(__clang__)
-static __forceinline unsigned long __builtin_ctzl(unsigned long value) {
-    return _arm_clz(_arm_rbit(value));
-}
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/insert_string_acle.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/insert_string_acle.c b/crates/libz-sys/src/zlib-ng/arch/arm/insert_string_acle.c
deleted file mode 100644
index de99023..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/insert_string_acle.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* insert_string_acle.c -- insert_string integer hash variant using ACLE's CRC instructions
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#ifdef ARM_ACLE_CRC_HASH
-#ifndef _MSC_VER
-#  include <arm_acle.h>
-#endif
-#include "../../zbuild.h"
-#include "../../deflate.h"
-
-#define HASH_CALC(s, h, val) \
-    h = __crc32w(0, val)
-
-#define HASH_CALC_VAR       h
-#define HASH_CALC_VAR_INIT  uint32_t h = 0
-
-#define UPDATE_HASH         update_hash_acle
-#define INSERT_STRING       insert_string_acle
-#define QUICK_INSERT_STRING quick_insert_string_acle
-
-#include "../../insert_string_tpl.h"
-#endif

crates/libz-sys/src/zlib-ng/arch/arm/slide_hash_neon.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/arm/slide_hash_neon.c b/crates/libz-sys/src/zlib-ng/arch/arm/slide_hash_neon.c
deleted file mode 100644
index 8dc8873..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/arm/slide_hash_neon.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* slide_hash_neon.c -- Optimized hash table shifting for ARM with support for NEON instructions
- * Copyright (C) 2017-2020 Mika T. Lindqvist
- *
- * Authors:
- * Mika T. Lindqvist <postmaster@raasu.org>
- * Jun He <jun.he@arm.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#if defined(ARM_NEON_SLIDEHASH)
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-#include "../../zbuild.h"
-#include "../../deflate.h"
-#include "../../fallback_builtins.h"
-
-/* SIMD version of hash_chain rebase */
-static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {
-    Z_REGISTER uint16x8_t v;
-    uint16x8x4_t p0, p1;
-    Z_REGISTER size_t n;
-
-    size_t size = entries*sizeof(table[0]);
-    Assert((size % sizeof(uint16x8_t) * 8 == 0), "hash table size err");
-
-    Assert(sizeof(Pos) == 2, "Wrong Pos size");
-    v = vdupq_n_u16(wsize);
-
-    n = size / (sizeof(uint16x8_t) * 8);
-    do {
-        p0 = vld1q_u16_x4(table);
-        p1 = vld1q_u16_x4(table+32);
-        vqsubq_u16_x4_x1(p0, p0, v);
-        vqsubq_u16_x4_x1(p1, p1, v);
-        vst1q_u16_x4(table, p0);
-        vst1q_u16_x4(table+32, p1);
-        table += 64;
-    } while (--n);
-}
-
-Z_INTERNAL void slide_hash_neon(deflate_state *s) {
-    unsigned int wsize = s->w_size;
-
-    slide_hash_chain(s->head, HASH_SIZE, wsize);
-    slide_hash_chain(s->prev, wsize, wsize);
-}
-#endif

crates/libz-sys/src/zlib-ng/arch/generic/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/arch/generic/Makefile.in b/crates/libz-sys/src/zlib-ng/arch/generic/Makefile.in
deleted file mode 100644
index be8c185..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/generic/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-CC=
-CFLAGS=
-SFLAGS=
-INCLUDES=
-
-SRCDIR=.
-SRCTOP=../..
-TOPDIR=$(SRCTOP)
-
-all:
-
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~ \
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov

crates/libz-sys/src/zlib-ng/arch/power/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/Makefile.in b/crates/libz-sys/src/zlib-ng/arch/power/Makefile.in
deleted file mode 100644
index e9be6dd..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/Makefile.in
+++ /dev/null
@@ -1,93 +0,0 @@
-# Makefile for POWER-specific files
-# Copyright (C) 2020 Matheus Castanho <msc@linux.ibm.com>, IBM
-# Copyright (C) 2021 Mika T. Lindqvist <postmaster@raasu.org>
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-CC=
-CFLAGS=
-SFLAGS=
-INCLUDES=
-SUFFIX=
-
-P8FLAGS=-mcpu=power8
-P9FLAGS=-mcpu=power9
-PPCFLAGS=-maltivec
-NOLTOFLAG=
-
-SRCDIR=.
-SRCTOP=../..
-TOPDIR=$(SRCTOP)
-
-all: power_features.o \
-     power_features.lo \
-     adler32_power8.o \
-     adler32_power8.lo \
-     adler32_vmx.o \
-     adler32_vmx.lo \
-     chunkset_power8.o \
-     chunkset_power8.lo \
-     compare256_power9.o \
-     compare256_power9.lo \
-     crc32_power8.o \
-     crc32_power8.lo \
-     slide_hash_power8.o \
-     slide_hash_power8.lo \
-     slide_hash_vmx.o \
-     slide_hash_vmx.lo
-
-power_features.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power_features.c
-
-power_features.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power_features.c
-
-adler32_power8.o:
-	$(CC) $(CFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_power8.c
-
-adler32_power8.lo:
-	$(CC) $(SFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_power8.c
-
-adler32_vmx.o:
-	$(CC) $(CFLAGS) $(PPCFLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_vmx.c
-
-adler32_vmx.lo:
-	$(CC) $(SFLAGS) $(PPCFLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_vmx.c
-
-chunkset_power8.o:
-	$(CC) $(CFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_power8.c
-
-chunkset_power8.lo:
-	$(CC) $(SFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_power8.c
-
-compare256_power9.o:
-	$(CC) $(CFLAGS) $(P9FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_power9.c
-
-compare256_power9.lo:
-	$(CC) $(SFLAGS) $(P9FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_power9.c
-
-crc32_power8.o:
-	$(CC) $(CFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_power8.c
-
-crc32_power8.lo:
-	$(CC) $(SFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_power8.c
-
-slide_hash_power8.o:
-	$(CC) $(CFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_power8.c
-
-slide_hash_power8.lo:
-	$(CC) $(SFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_power8.c
-
-slide_hash_vmx.o:
-	$(CC) $(CFLAGS) ${PPCFLAGS} $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_vmx.c
-
-slide_hash_vmx.lo:
-	$(CC) $(SFLAGS) ${PPCFLAGS} $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_vmx.c
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-
-distclean:
-	rm -f Makefile

crates/libz-sys/src/zlib-ng/arch/power/adler32_power8.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/adler32_power8.c b/crates/libz-sys/src/zlib-ng/arch/power/adler32_power8.c
deleted file mode 100644
index f39f002..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/adler32_power8.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Adler32 for POWER8 using VSX instructions.
- * Copyright (C) 2020 IBM Corporation
- * Author: Rogerio Alves <rcardoso@linux.ibm.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Calculate adler32 checksum for 16 bytes at once using POWER8+ VSX (vector)
- * instructions.
- *
- * If adler32 do 1 byte at time on the first iteration s1 is s1_0 (_n means
- * iteration n) is the initial value of adler - at start  _0 is 1 unless
- * adler initial value is different than 1. So s1_1 = s1_0 + c[0] after
- * the first calculation. For the iteration s1_2 = s1_1 + c[1] and so on.
- * Hence, for iteration N, s1_N = s1_(N-1) + c[N] is the value of s1 on
- * after iteration N.
- *
- * Therefore, for s2 and iteration N, s2_N = s2_0 + N*s1_N + N*c[0] +
- * N-1*c[1] + ... + c[N]
- *
- * In a more general way:
- *
- * s1_N = s1_0 + sum(i=1 to N)c[i]
- * s2_N = s2_0 + N*s1 + sum (i=1 to N)(N-i+1)*c[i]
- *
- * Where s1_N, s2_N are the values for s1, s2 after N iterations. So if we
- * can process N-bit at time we can do this at once.
- *
- * Since VSX can support 16-bit vector instructions, we can process
- * 16-bit at time using N = 16 we have:
- *
- * s1 = s1_16 = s1_(16-1) + c[16] = s1_0 + sum(i=1 to 16)c[i]
- * s2 = s2_16 = s2_0 + 16*s1 + sum(i=1 to 16)(16-i+1)*c[i]
- *
- * After the first iteration we calculate the adler32 checksum for 16 bytes.
- *
- * For more background about adler32 please check the RFC:
- * https://www.ietf.org/rfc/rfc1950.txt
- */
-
-#ifdef POWER8_VSX_ADLER32
-
-#include <altivec.h>
-#include "zbuild.h"
-#include "adler32_p.h"
-
-/* Vector across sum unsigned int (saturate).  */
-static inline vector unsigned int vec_sumsu(vector unsigned int __a, vector unsigned int __b) {
-    __b = vec_sld(__a, __a, 8);
-    __b = vec_add(__b, __a);
-    __a = vec_sld(__b, __b, 4);
-    __a = vec_add(__a, __b);
-
-    return __a;
-}
-
-uint32_t adler32_power8(uint32_t adler, const unsigned char* buf, size_t len) {
-    uint32_t s1 = adler & 0xffff;
-    uint32_t s2 = (adler >> 16) & 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (UNLIKELY(len == 1))
-        return adler32_len_1(s1, buf, s2);
-
-    /* If buffer is empty or len=0 we need to return adler initial value.  */
-    if (UNLIKELY(buf == NULL))
-        return 1;
-
-    /* This is faster than VSX code for len < 64.  */
-    if (len < 64)
-        return adler32_len_64(s1, buf, len, s2);
-
-    /* Use POWER VSX instructions for len >= 64. */
-    const vector unsigned int v_zeros = { 0 };
-    const vector unsigned char v_mul = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7,
-         6, 5, 4, 3, 2, 1};
-    const vector unsigned char vsh = vec_splat_u8(4);
-    const vector unsigned int vmask = {0xffffffff, 0x0, 0x0, 0x0};
-    vector unsigned int vs1 = { 0 };
-    vector unsigned int vs2 = { 0 };
-    vector unsigned int vs1_save = { 0 };
-    vector unsigned int vsum1, vsum2;
-    vector unsigned char vbuf;
-    int n;
-
-    vs1[0] = s1;
-    vs2[0] = s2;
-
-    /* Do length bigger than NMAX in blocks of NMAX size.  */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;
-        do {
-            vbuf = vec_xl(0, (unsigned char *) buf);
-            vsum1 = vec_sum4s(vbuf, v_zeros); /* sum(i=1 to 16) buf[i].  */
-            /* sum(i=1 to 16) buf[i]*(16-i+1).  */
-            vsum2 = vec_msum(vbuf, v_mul, v_zeros);
-            /* Save vs1.  */
-            vs1_save = vec_add(vs1_save, vs1);
-            /* Accumulate the sums.  */
-            vs1 = vec_add(vsum1, vs1);
-            vs2 = vec_add(vsum2, vs2);
-
-            buf += 16;
-        } while (--n);
-        /* Once each block of NMAX size.  */
-        vs1 = vec_sumsu(vs1, vsum1);
-        vs1_save = vec_sll(vs1_save, vsh); /* 16*vs1_save.  */
-        vs2 = vec_add(vs1_save, vs2);
-        vs2 = vec_sumsu(vs2, vsum2);
-
-        /* vs1[0] = (s1_i + sum(i=1 to 16)buf[i]) mod 65521.  */
-        vs1[0] = vs1[0] % BASE;
-        /* vs2[0] = s2_i + 16*s1_save +
-           sum(i=1 to 16)(16-i+1)*buf[i] mod 65521.  */
-        vs2[0] = vs2[0] % BASE;
-
-        vs1 = vec_and(vs1, vmask);
-        vs2 = vec_and(vs2, vmask);
-        vs1_save = v_zeros;
-    }
-
-    /* len is less than NMAX one modulo is needed.  */
-    if (len >= 16) {
-        while (len >= 16) {
-            len -= 16;
-
-            vbuf = vec_xl(0, (unsigned char *) buf);
-
-            vsum1 = vec_sum4s(vbuf, v_zeros); /* sum(i=1 to 16) buf[i].  */
-            /* sum(i=1 to 16) buf[i]*(16-i+1).  */
-            vsum2 = vec_msum(vbuf, v_mul, v_zeros);
-            /* Save vs1.  */
-            vs1_save = vec_add(vs1_save, vs1);
-            /* Accumulate the sums.  */
-            vs1 = vec_add(vsum1, vs1);
-            vs2 = vec_add(vsum2, vs2);
-
-            buf += 16;
-        }
-        /* Since the size will be always less than NMAX we do this once.  */
-        vs1 = vec_sumsu(vs1, vsum1);
-        vs1_save = vec_sll(vs1_save, vsh); /* 16*vs1_save.  */
-        vs2 = vec_add(vs1_save, vs2);
-        vs2 = vec_sumsu(vs2, vsum2);
-    }
-    /* Copy result back to s1, s2 (mod 65521).  */
-    s1 = vs1[0] % BASE;
-    s2 = vs2[0] % BASE;
-
-    /* Process tail (len < 16).  */
-    return adler32_len_16(s1, buf, len, s2);
-}
-
-#endif /* POWER8_VSX_ADLER32 */

crates/libz-sys/src/zlib-ng/arch/power/adler32_vmx.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/adler32_vmx.c b/crates/libz-sys/src/zlib-ng/arch/power/adler32_vmx.c
deleted file mode 100644
index 6b7d915..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/adler32_vmx.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* adler32_vmx.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * Copyright (C) 2017-2021 Mika T. Lindqvist <postmaster@raasu.org>
- * Copyright (C) 2021 Adam Stylinski <kungfujesus06@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef PPC_VMX_ADLER32
-#include <altivec.h>
-#include "zbuild.h"
-#include "adler32_p.h"
-
-#define vmx_zero()  (vec_splat_u32(0))
-
-static inline void vmx_handle_head_or_tail(uint32_t *pair, const unsigned char *buf, size_t len) {
-    unsigned int i;
-    for (i = 0; i < len; ++i) {
-        pair[0] += buf[i];
-        pair[1] += pair[0];
-    }
-}
-
-static void vmx_accum32(uint32_t *s, const unsigned char *buf, size_t len) {
-    /* Different taps for the separable components of sums */
-    const vector unsigned char t0 = {64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49};
-    const vector unsigned char t1 = {48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33};
-    const vector unsigned char t2 = {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17};
-    const vector unsigned char t3 = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
-    /* As silly and inefficient as it seems, creating 1 permutation vector to permute
-     * a 2 element vector from a single load + a subsequent shift is just barely faster
-     * than doing 2 indexed insertions into zero initialized vectors from unaligned memory. */
-    const vector unsigned char s0_perm = {0, 1, 2, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8};
-    const vector unsigned char shift_vec = vec_sl(vec_splat_u8(8), vec_splat_u8(2));
-    vector unsigned int  adacc, s2acc;
-    vector unsigned int pair_vec = vec_ld(0, s);
-    adacc = vec_perm(pair_vec, pair_vec, s0_perm);
-    s2acc = vec_slo(pair_vec, shift_vec);
-
-    vector unsigned int zero = vmx_zero();
-    vector unsigned int s3acc = zero;
-    vector unsigned int s3acc_0 = zero;
-    vector unsigned int adacc_prev = adacc;
-    vector unsigned int adacc_prev_0 = zero;
-
-    vector unsigned int s2acc_0 = zero;
-    vector unsigned int s2acc_1 = zero;
-    vector unsigned int s2acc_2 = zero;
-
-    /* Maintain a running sum of a second half, this might help use break yet another
-     * data dependency bubble in the sum */
-    vector unsigned int adacc_0 = zero;
-
-    int num_iter = len / 4;
-    int rem = len & 3;
-
-    for (int i = 0; i < num_iter; ++i) {
-        vector unsigned char d0 = vec_ld(0, buf);
-        vector unsigned char d1 = vec_ld(16, buf);
-        vector unsigned char d2 = vec_ld(32, buf);
-        vector unsigned char d3 = vec_ld(48, buf);
-
-        /* The core operation of the loop, basically
-         * what is being unrolled below */
-        adacc = vec_sum4s(d0, adacc);
-        s3acc = vec_add(s3acc, adacc_prev);
-        s3acc_0 = vec_add(s3acc_0, adacc_prev_0);
-        s2acc = vec_msum(t0, d0, s2acc);
-
-        /* interleave dependent sums in here */
-        adacc_0 = vec_sum4s(d1, adacc_0);
-        s2acc_0 = vec_msum(t1, d1, s2acc_0);
-        adacc = vec_sum4s(d2, adacc);
-        s2acc_1 = vec_msum(t2, d2, s2acc_1);
-        s2acc_2 = vec_msum(t3, d3, s2acc_2);
-        adacc_0 = vec_sum4s(d3, adacc_0);
-
-        adacc_prev = adacc;
-        adacc_prev_0 = adacc_0;
-        buf += 64;
-    }
-
-    adacc = vec_add(adacc, adacc_0);
-    s3acc = vec_add(s3acc, s3acc_0);
-    s3acc = vec_sl(s3acc, vec_splat_u32(6));
-
-    if (rem) {
-        adacc_prev = vec_add(adacc_prev_0, adacc_prev);
-        adacc_prev = vec_sl(adacc_prev, vec_splat_u32(4));
-        while (rem--) {
-            vector unsigned char d0 = vec_ld(0, buf);
-            adacc = vec_sum4s(d0, adacc);
-            s3acc = vec_add(s3acc, adacc_prev);
-            s2acc = vec_msum(t3, d0, s2acc);
-            adacc_prev = vec_sl(adacc, vec_splat_u32(4));
-            buf += 16;
-        }
-    }
-
-
-    /* Sum up independent second sums */
-    s2acc = vec_add(s2acc, s2acc_0);
-    s2acc_2 = vec_add(s2acc_1, s2acc_2);
-    s2acc = vec_add(s2acc, s2acc_2);
-
-    s2acc = vec_add(s2acc, s3acc);
-
-    adacc = vec_add(adacc, vec_sld(adacc, adacc, 8));
-    s2acc = vec_add(s2acc, vec_sld(s2acc, s2acc, 8));
-    adacc = vec_add(adacc, vec_sld(adacc, adacc, 4));
-    s2acc = vec_add(s2acc, vec_sld(s2acc, s2acc, 4));
-
-    vec_ste(adacc, 0, s);
-    vec_ste(s2acc, 0, s+1);
-}
-
-uint32_t adler32_vmx(uint32_t adler, const unsigned char *buf, size_t len) {
-    uint32_t sum2;
-    uint32_t pair[16] ALIGNED_(16);
-    memset(&pair[2], 0, 14);
-    int n = NMAX;
-    unsigned int done = 0, i;
-
-    /* Split Adler-32 into component sums, it can be supplied by
-     * the caller sites (e.g. in a PNG file).
-     */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-    pair[0] = adler;
-    pair[1] = sum2;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (UNLIKELY(len == 1))
-        return adler32_len_1(adler, buf, sum2);
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (UNLIKELY(buf == NULL))
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (UNLIKELY(len < 16))
-        return adler32_len_16(adler, buf, len, sum2);
-
-    // Align buffer
-    unsigned int al = 0;
-    if ((uintptr_t)buf & 0xf) {
-        al = 16-((uintptr_t)buf & 0xf);
-        if (al > len) {
-            al=len;
-        }
-        vmx_handle_head_or_tail(pair, buf, al);
-
-        done += al;
-        /* Rather than rebasing, we can reduce the max sums for the
-         * first round only */
-        n -= al;
-    }
-    for (i = al; i < len; i += n) {
-        int remaining = (int)(len-i);
-        n = MIN(remaining, (i == al) ? n : NMAX);
-
-        if (n < 16)
-            break;
-
-        vmx_accum32(pair, buf + i, n / 16);
-        pair[0] %= BASE;
-        pair[1] %= BASE;
-
-        done += (n / 16) * 16;
-    }
-
-    /* Handle the tail elements. */
-    if (done < len) {
-        vmx_handle_head_or_tail(pair, (buf + done), len - done);
-        pair[0] %= BASE;
-        pair[1] %= BASE;
-    }
-
-    /* D = B * 65536 + A, see: https://en.wikipedia.org/wiki/Adler-32. */
-    return (pair[1] << 16) | pair[0];
-}
-#endif

crates/libz-sys/src/zlib-ng/arch/power/chunkset_power8.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/chunkset_power8.c b/crates/libz-sys/src/zlib-ng/arch/power/chunkset_power8.c
deleted file mode 100644
index 5db7821..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/chunkset_power8.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* chunkset_power8.c -- VSX inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef POWER8_VSX_CHUNKSET
-#include <altivec.h>
-#include "../../zbuild.h"
-
-typedef vector unsigned char chunk_t;
-
-#define CHUNK_SIZE 16
-
-#define HAVE_CHUNKMEMSET_2
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-
-static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
-    uint16_t tmp;
-    zmemcpy_2(&tmp, from);
-    *chunk = (vector unsigned char)vec_splats(tmp);
-}
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    uint32_t tmp;
-    zmemcpy_4(&tmp, from);
-    *chunk = (vector unsigned char)vec_splats(tmp);
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    uint64_t tmp;
-    zmemcpy_8(&tmp, from);
-    *chunk = (vector unsigned char)vec_splats(tmp);
-}
-
-#define CHUNKSIZE        chunksize_power8
-#define CHUNKCOPY        chunkcopy_power8
-#define CHUNKCOPY_SAFE   chunkcopy_safe_power8
-#define CHUNKUNROLL      chunkunroll_power8
-#define CHUNKMEMSET      chunkmemset_power8
-#define CHUNKMEMSET_SAFE chunkmemset_safe_power8
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    *chunk = vec_xl(0, s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    vec_xst(*chunk, 0, out);
-}
-
-#include "chunkset_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/power/compare256_power9.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/compare256_power9.c b/crates/libz-sys/src/zlib-ng/arch/power/compare256_power9.c
deleted file mode 100644
index 9b3e617..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/compare256_power9.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* compare256_power9.c - Power9 version of compare256
- * Copyright (C) 2019 Matheus Castanho <msc@linux.ibm.com>, IBM
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef POWER9
-#include <altivec.h>
-#include "../../zbuild.h"
-#include "../../zendian.h"
-
-/* Older versions of GCC misimplemented semantics for these bit counting builtins.
- * https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=3f30f2d1dbb3228b8468b26239fe60c2974ce2ac */
-#if defined(__GNUC__) && (__GNUC__ < 12)
-#  define zng_vec_vctzlsbb(vc, len) __asm__ volatile("vctzlsbb %0, %1\n\t" : "=r" (len) : "v" (vc))
-#  define zng_vec_vclzlsbb(vc, len) __asm__ volatile("vclzlsbb %0, %1\n\t" : "=r" (len) : "v" (vc))
-#else
-#  define zng_vec_vctzlsbb(vc, len) len = __builtin_vec_vctzlsbb(vc)
-#  define zng_vec_vclzlsbb(vc, len) len = __builtin_vec_vclzlsbb(vc)
-#endif
-
-static inline uint32_t compare256_power9_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0, cmplen;
-
-    do {
-        vector unsigned char vsrc0, vsrc1, vc;
-
-        vsrc0 = *((vector unsigned char *)src0);
-        vsrc1 = *((vector unsigned char *)src1);
-
-        /* Compare 16 bytes at a time. Each byte of vc will be either
-         * all ones or all zeroes, depending on the result of the comparison. */
-        vc = (vector unsigned char)vec_cmpne(vsrc0, vsrc1);
-
-        /* Since the index of matching bytes will contain only zeroes
-         * on vc (since we used cmpne), counting the number of consecutive
-         * bytes where LSB == 0 is the same as counting the length of the match. */
-#if BYTE_ORDER == LITTLE_ENDIAN
-        zng_vec_vctzlsbb(vc, cmplen);
-#else
-        zng_vec_vclzlsbb(vc, cmplen);
-#endif
-        if (cmplen != 16)
-            return len + cmplen;
-
-        src0 += 16, src1 += 16, len += 16;
-    } while (len < 256);
-
-   return 256;
-}
-
-Z_INTERNAL uint32_t compare256_power9(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_power9_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_power9
-#define COMPARE256          compare256_power9_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_power9
-#define COMPARE256          compare256_power9_static
-
-#include "match_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/power/crc32_constants.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/crc32_constants.h b/crates/libz-sys/src/zlib-ng/arch/power/crc32_constants.h
deleted file mode 100644
index 8c8f215..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/crc32_constants.h
+++ /dev/null
@@ -1,1123 +0,0 @@
-/* Constants table used by crc32_power8.c
- * Copyright (C) 2021 IBM Corporation
- *
- * This file was automatically generated, DO NOT EDIT IT MANUALLY.
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zendian.h"
-#include "zbuild.h"
-
-/* Reduce 262144 kbits to 1024 bits */
-static const __vector unsigned long long vcrc_const[255] ALIGNED_(16) = {
-#if BYTE_ORDER == LITTLE_ENDIAN
-    /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */
-    { 0x0000000099ea94a8, 0x00000001651797d2 },
-    /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */
-    { 0x00000000945a8420, 0x0000000021e0d56c },
-    /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */
-    { 0x0000000030762706, 0x000000000f95ecaa },
-    /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */
-    { 0x00000001a52fc582, 0x00000001ebd224ac },
-    /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */
-    { 0x00000001a4a7167a, 0x000000000ccb97ca },
-    /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */
-    { 0x000000000c18249a, 0x00000001006ec8a8 },
-    /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */
-    { 0x00000000a924ae7c, 0x000000014f58f196 },
-    /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */
-    { 0x00000001e12ccc12, 0x00000001a7192ca6 },
-    /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */
-    { 0x00000000a0b9d4ac, 0x000000019a64bab2 },
-    /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */
-    { 0x0000000095e8ddfe, 0x0000000014f4ed2e },
-    /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */
-    { 0x00000000233fddc4, 0x000000011092b6a2 },
-    /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */
-    { 0x00000001b4529b62, 0x00000000c8a1629c },
-    /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */
-    { 0x00000001a7fa0e64, 0x000000017bf32e8e },
-    /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */
-    { 0x00000001b5334592, 0x00000001f8cc6582 },
-    /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */
-    { 0x000000011f8ee1b4, 0x000000008631ddf0 },
-    /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */
-    { 0x000000006252e632, 0x000000007e5a76d0 },
-    /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */
-    { 0x00000000ab973e84, 0x000000002b09b31c },
-    /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */
-    { 0x000000007734f5ec, 0x00000001b2df1f84 },
-    /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */
-    { 0x000000007c547798, 0x00000001d6f56afc },
-    /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */
-    { 0x000000007ec40210, 0x00000001b9b5e70c },
-    /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */
-    { 0x00000001ab1695a8, 0x0000000034b626d2 },
-    /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */
-    { 0x0000000090494bba, 0x000000014c53479a },
-    /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */
-    { 0x00000001123fb816, 0x00000001a6d179a4 },
-    /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */
-    { 0x00000001e188c74c, 0x000000015abd16b4 },
-    /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */
-    { 0x00000001c2d3451c, 0x00000000018f9852 },
-    /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */
-    { 0x00000000f55cf1ca, 0x000000001fb3084a },
-    /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */
-    { 0x00000001a0531540, 0x00000000c53dfb04 },
-    /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */
-    { 0x0000000132cd7ebc, 0x00000000e10c9ad6 },
-    /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */
-    { 0x0000000073ab7f36, 0x0000000025aa994a },
-    /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */
-    { 0x0000000041aed1c2, 0x00000000fa3a74c4 },
-    /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */
-    { 0x0000000136c53800, 0x0000000033eb3f40 },
-    /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */
-    { 0x0000000126835a30, 0x000000017193f296 },
-    /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */
-    { 0x000000006241b502, 0x0000000043f6c86a },
-    /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */
-    { 0x00000000d5196ad4, 0x000000016b513ec6 },
-    /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */
-    { 0x000000009cfa769a, 0x00000000c8f25b4e },
-    /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */
-    { 0x00000000920e5df4, 0x00000001a45048ec },
-    /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */
-    { 0x0000000169dc310e, 0x000000000c441004 },
-    /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */
-    { 0x0000000009fc331c, 0x000000000e17cad6 },
-    /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */
-    { 0x000000010d94a81e, 0x00000001253ae964 },
-    /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */
-    { 0x0000000027a20ab2, 0x00000001d7c88ebc },
-    /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */
-    { 0x0000000114f87504, 0x00000001e7ca913a },
-    /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */
-    { 0x000000004b076d96, 0x0000000033ed078a },
-    /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */
-    { 0x00000000da4d1e74, 0x00000000e1839c78 },
-    /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */
-    { 0x000000001b81f672, 0x00000001322b267e },
-    /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */
-    { 0x000000009367c988, 0x00000000638231b6 },
-    /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */
-    { 0x00000001717214ca, 0x00000001ee7f16f4 },
-    /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */
-    { 0x000000009f47d820, 0x0000000117d9924a },
-    /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */
-    { 0x000000010d9a47d2, 0x00000000e1a9e0c4 },
-    /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */
-    { 0x00000000a696c58c, 0x00000001403731dc },
-    /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */
-    { 0x000000002aa28ec6, 0x00000001a5ea9682 },
-    /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */
-    { 0x00000001fe18fd9a, 0x0000000101c5c578 },
-    /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */
-    { 0x000000019d4fc1ae, 0x00000000dddf6494 },
-    /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */
-    { 0x00000001ba0e3dea, 0x00000000f1c3db28 },
-    /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */
-    { 0x0000000074b59a5e, 0x000000013112fb9c },
-    /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */
-    { 0x00000000f2b5ea98, 0x00000000b680b906 },
-    /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */
-    { 0x0000000187132676, 0x000000001a282932 },
-    /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */
-    { 0x000000010a8c6ad4, 0x0000000089406e7e },
-    /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */
-    { 0x00000001e21dfe70, 0x00000001def6be8c },
-    /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */
-    { 0x00000001da0050e4, 0x0000000075258728 },
-    /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */
-    { 0x00000000772172ae, 0x000000019536090a },
-    /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */
-    { 0x00000000e47724aa, 0x00000000f2455bfc },
-    /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */
-    { 0x000000003cd63ac4, 0x000000018c40baf4 },
-    /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */
-    { 0x00000001bf47d352, 0x000000004cd390d4 },
-    /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */
-    { 0x000000018dc1d708, 0x00000001e4ece95a },
-    /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */
-    { 0x000000002d4620a4, 0x000000001a3ee918 },
-    /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */
-    { 0x0000000058fd1740, 0x000000007c652fb8 },
-    /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */
-    { 0x00000000dadd9bfc, 0x000000011c67842c },
-    /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */
-    { 0x00000001ea2140be, 0x00000000254f759c },
-    /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */
-    { 0x000000009de128ba, 0x000000007ece94ca },
-    /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */
-    { 0x000000013ac3aa8e, 0x0000000038f258c2 },
-    /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */
-    { 0x0000000099980562, 0x00000001cdf17b00 },
-    /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */
-    { 0x00000001c1579c86, 0x000000011f882c16 },
-    /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */
-    { 0x0000000068dbbf94, 0x0000000100093fc8 },
-    /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */
-    { 0x000000004509fb04, 0x00000001cd684f16 },
-    /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */
-    { 0x00000001202f6398, 0x000000004bc6a70a },
-    /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */
-    { 0x000000013aea243e, 0x000000004fc7e8e4 },
-    /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */
-    { 0x00000001b4052ae6, 0x0000000130103f1c },
-    /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */
-    { 0x00000001cd2a0ae8, 0x0000000111b0024c },
-    /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */
-    { 0x00000001fe4aa8b4, 0x000000010b3079da },
-    /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */
-    { 0x00000001d1559a42, 0x000000010192bcc2 },
-    /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */
-    { 0x00000001f3e05ecc, 0x0000000074838d50 },
-    /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */
-    { 0x0000000104ddd2cc, 0x000000001b20f520 },
-    /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */
-    { 0x000000015393153c, 0x0000000050c3590a },
-    /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */
-    { 0x0000000057e942c6, 0x00000000b41cac8e },
-    /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */
-    { 0x000000012c633850, 0x000000000c72cc78 },
-    /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */
-    { 0x00000000ebcaae4c, 0x0000000030cdb032 },
-    /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */
-    { 0x000000013ee532a6, 0x000000013e09fc32 },
-    /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */
-    { 0x00000001bf0cbc7e, 0x000000001ed624d2 },
-    /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */
-    { 0x00000000d50b7a5a, 0x00000000781aee1a },
-    /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */
-    { 0x0000000002fca6e8, 0x00000001c4d8348c },
-    /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */
-    { 0x000000007af40044, 0x0000000057a40336 },
-    /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */
-    { 0x0000000016178744, 0x0000000085544940 },
-    /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */
-    { 0x000000014c177458, 0x000000019cd21e80 },
-    /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */
-    { 0x000000011b6ddf04, 0x000000013eb95bc0 },
-    /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */
-    { 0x00000001f3e29ccc, 0x00000001dfc9fdfc },
-    /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */
-    { 0x0000000135ae7562, 0x00000000cd028bc2 },
-    /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */
-    { 0x0000000190ef812c, 0x0000000090db8c44 },
-    /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */
-    { 0x0000000067a2c786, 0x000000010010a4ce },
-    /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */
-    { 0x0000000048b9496c, 0x00000001c8f4c72c },
-    /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */
-    { 0x000000015a422de6, 0x000000001c26170c },
-    /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */
-    { 0x00000001ef0e3640, 0x00000000e3fccf68 },
-    /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */
-    { 0x00000001006d2d26, 0x00000000d513ed24 },
-    /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */
-    { 0x00000001170d56d6, 0x00000000141beada },
-    /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */
-    { 0x00000000a5fb613c, 0x000000011071aea0 },
-    /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */
-    { 0x0000000040bbf7fc, 0x000000012e19080a },
-    /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */
-    { 0x000000016ac3a5b2, 0x0000000100ecf826 },
-    /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */
-    { 0x00000000abf16230, 0x0000000069b09412 },
-    /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */
-    { 0x00000001ebe23fac, 0x0000000122297bac },
-    /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */
-    { 0x000000008b6a0894, 0x00000000e9e4b068 },
-    /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */
-    { 0x00000001288ea478, 0x000000004b38651a },
-    /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */
-    { 0x000000016619c442, 0x00000001468360e2 },
-    /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */
-    { 0x0000000086230038, 0x00000000121c2408 },
-    /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */
-    { 0x000000017746a756, 0x00000000da7e7d08 },
-    /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */
-    { 0x0000000191b8f8f8, 0x00000001058d7652 },
-    /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */
-    { 0x000000008e167708, 0x000000014a098a90 },
-    /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */
-    { 0x0000000148b22d54, 0x0000000020dbe72e },
-    /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */
-    { 0x0000000044ba2c3c, 0x000000011e7323e8 },
-    /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */
-    { 0x00000000b54d2b52, 0x00000000d5d4bf94 },
-    /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */
-    { 0x0000000005a4fd8a, 0x0000000199d8746c },
-    /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */
-    { 0x0000000139f9fc46, 0x00000000ce9ca8a0 },
-    /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */
-    { 0x000000015a1fa824, 0x00000000136edece },
-    /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */
-    { 0x000000000a61ae4c, 0x000000019b92a068 },
-    /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */
-    { 0x0000000145e9113e, 0x0000000071d62206 },
-    /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */
-    { 0x000000006a348448, 0x00000000dfc50158 },
-    /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */
-    { 0x000000004d80a08c, 0x00000001517626bc },
-    /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */
-    { 0x000000014b6837a0, 0x0000000148d1e4fa },
-    /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */
-    { 0x000000016896a7fc, 0x0000000094d8266e },
-    /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */
-    { 0x000000014f187140, 0x00000000606c5e34 },
-    /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */
-    { 0x000000019581b9da, 0x000000019766beaa },
-    /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */
-    { 0x00000001091bc984, 0x00000001d80c506c },
-    /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */
-    { 0x000000001067223c, 0x000000001e73837c },
-    /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */
-    { 0x00000001ab16ea02, 0x0000000064d587de },
-    /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */
-    { 0x000000013c4598a8, 0x00000000f4a507b0 },
-    /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */
-    { 0x00000000b3735430, 0x0000000040e342fc },
-    /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */
-    { 0x00000001bb3fc0c0, 0x00000001d5ad9c3a },
-    /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */
-    { 0x00000001570ae19c, 0x0000000094a691a4 },
-    /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */
-    { 0x00000001ea910712, 0x00000001271ecdfa },
-    /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */
-    { 0x0000000167127128, 0x000000009e54475a },
-    /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */
-    { 0x0000000019e790a2, 0x00000000c9c099ee },
-    /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */
-    { 0x000000003788f710, 0x000000009a2f736c },
-    /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */
-    { 0x00000001682a160e, 0x00000000bb9f4996 },
-    /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */
-    { 0x000000007f0ebd2e, 0x00000001db688050 },
-    /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */
-    { 0x000000002b032080, 0x00000000e9b10af4 },
-    /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */
-    { 0x00000000cfd1664a, 0x000000012d4545e4 },
-    /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */
-    { 0x00000000aa1181c2, 0x000000000361139c },
-    /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */
-    { 0x00000000ddd08002, 0x00000001a5a1a3a8 },
-    /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */
-    { 0x00000000e8dd0446, 0x000000006844e0b0 },
-    /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */
-    { 0x00000001bbd94a00, 0x00000000c3762f28 },
-    /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */
-    { 0x00000000ab6cd180, 0x00000001d26287a2 },
-    /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */
-    { 0x0000000031803ce2, 0x00000001f6f0bba8 },
-    /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */
-    { 0x0000000024f40b0c, 0x000000002ffabd62 },
-    /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */
-    { 0x00000001ba1d9834, 0x00000000fb4516b8 },
-    /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */
-    { 0x0000000104de61aa, 0x000000018cfa961c },
-    /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */
-    { 0x0000000113e40d46, 0x000000019e588d52 },
-    /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */
-    { 0x00000001415598a0, 0x00000001180f0bbc },
-    /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */
-    { 0x00000000bf6c8c90, 0x00000000e1d9177a },
-    /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */
-    { 0x00000001788b0504, 0x0000000105abc27c },
-    /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */
-    { 0x0000000038385d02, 0x00000000972e4a58 },
-    /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */
-    { 0x00000001b6c83844, 0x0000000183499a5e },
-    /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */
-    { 0x0000000051061a8a, 0x00000001c96a8cca },
-    /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */
-    { 0x000000017351388a, 0x00000001a1a5b60c },
-    /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */
-    { 0x0000000132928f92, 0x00000000e4b6ac9c },
-    /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */
-    { 0x00000000e6b4f48a, 0x00000001807e7f5a },
-    /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */
-    { 0x0000000039d15e90, 0x000000017a7e3bc8 },
-    /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */
-    { 0x00000000312d6074, 0x00000000d73975da },
-    /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */
-    { 0x000000017bbb2cc4, 0x000000017375d038 },
-    /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */
-    { 0x000000016ded3e18, 0x00000000193680bc },
-    /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */
-    { 0x00000000f1638b16, 0x00000000999b06f6 },
-    /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */
-    { 0x00000001d38b9ecc, 0x00000001f685d2b8 },
-    /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */
-    { 0x000000018b8d09dc, 0x00000001f4ecbed2 },
-    /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */
-    { 0x00000000e7bc27d2, 0x00000000ba16f1a0 },
-    /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */
-    { 0x00000000275e1e96, 0x0000000115aceac4 },
-    /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */
-    { 0x00000000e2e3031e, 0x00000001aeff6292 },
-    /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */
-    { 0x00000001041c84d8, 0x000000009640124c },
-    /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */
-    { 0x00000000706ce672, 0x0000000114f41f02 },
-    /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */
-    { 0x000000015d5070da, 0x000000009c5f3586 },
-    /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */
-    { 0x0000000038f9493a, 0x00000001878275fa },
-    /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */
-    { 0x00000000a3348a76, 0x00000000ddc42ce8 },
-    /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */
-    { 0x00000001ad0aab92, 0x0000000181d2c73a },
-    /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */
-    { 0x000000019e85f712, 0x0000000141c9320a },
-    /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */
-    { 0x000000005a871e76, 0x000000015235719a },
-    /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */
-    { 0x000000017249c662, 0x00000000be27d804 },
-    /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */
-    { 0x000000003a084712, 0x000000006242d45a },
-    /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */
-    { 0x00000000ed438478, 0x000000009a53638e },
-    /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */
-    { 0x00000000abac34cc, 0x00000001001ecfb6 },
-    /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */
-    { 0x000000005f35ef3e, 0x000000016d7c2d64 },
-    /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */
-    { 0x0000000047d6608c, 0x00000001d0ce46c0 },
-    /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */
-    { 0x000000002d01470e, 0x0000000124c907b4 },
-    /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */
-    { 0x0000000158bbc7b0, 0x0000000018a555ca },
-    /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */
-    { 0x00000000c0a23e8e, 0x000000006b0980bc },
-    /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */
-    { 0x00000001ebd85c88, 0x000000008bbba964 },
-    /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */
-    { 0x000000019ee20bb2, 0x00000001070a5a1e },
-    /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */
-    { 0x00000001acabf2d6, 0x000000002204322a },
-    /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */
-    { 0x00000001b7963d56, 0x00000000a27524d0 },
-    /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */
-    { 0x000000017bffa1fe, 0x0000000020b1e4ba },
-    /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */
-    { 0x000000001f15333e, 0x0000000032cc27fc },
-    /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */
-    { 0x000000018593129e, 0x0000000044dd22b8 },
-    /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */
-    { 0x000000019cb32602, 0x00000000dffc9e0a },
-    /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */
-    { 0x0000000142b05cc8, 0x00000001b7a0ed14 },
-    /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */
-    { 0x00000001be49e7a4, 0x00000000c7842488 },
-    /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */
-    { 0x0000000108f69d6c, 0x00000001c02a4fee },
-    /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */
-    { 0x000000006c0971f0, 0x000000003c273778 },
-    /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */
-    { 0x000000005b16467a, 0x00000001d63f8894 },
-    /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */
-    { 0x00000001551a628e, 0x000000006be557d6 },
-    /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */
-    { 0x000000019e42ea92, 0x000000006a7806ea },
-    /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */
-    { 0x000000012fa83ff2, 0x000000016155aa0c },
-    /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */
-    { 0x000000011ca9cde0, 0x00000000908650ac },
-    /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */
-    { 0x00000000c8e5cd74, 0x00000000aa5a8084 },
-    /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */
-    { 0x0000000096c27f0c, 0x0000000191bb500a },
-    /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */
-    { 0x000000002baed926, 0x0000000064e9bed0 },
-    /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */
-    { 0x000000017c8de8d2, 0x000000009444f302 },
-    /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */
-    { 0x00000000d43d6068, 0x000000019db07d3c },
-    /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */
-    { 0x00000000cb2c4b26, 0x00000001359e3e6e },
-    /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */
-    { 0x0000000145b8da26, 0x00000001e4f10dd2 },
-    /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */
-    { 0x000000018fff4b08, 0x0000000124f5735e },
-    /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */
-    { 0x0000000150b58ed0, 0x0000000124760a4c },
-    /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */
-    { 0x00000001549f39bc, 0x000000000f1fc186 },
-    /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */
-    { 0x00000000ef4d2f42, 0x00000000150e4cc4 },
-    /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */
-    { 0x00000001b1468572, 0x000000002a6204e8 },
-    /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */
-    { 0x000000013d7403b2, 0x00000000beb1d432 },
-    /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */
-    { 0x00000001a4681842, 0x0000000135f3f1f0 },
-    /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */
-    { 0x0000000167714492, 0x0000000074fe2232 },
-    /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */
-    { 0x00000001e599099a, 0x000000001ac6e2ba },
-    /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */
-    { 0x00000000fe128194, 0x0000000013fca91e },
-    /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */
-    { 0x0000000077e8b990, 0x0000000183f4931e },
-    /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */
-    { 0x00000001a267f63a, 0x00000000b6d9b4e4 },
-    /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */
-    { 0x00000001945c245a, 0x00000000b5188656 },
-    /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */
-    { 0x0000000149002e76, 0x0000000027a81a84 },
-    /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */
-    { 0x00000001bb8310a4, 0x0000000125699258 },
-    /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */
-    { 0x000000019ec60bcc, 0x00000001b23de796 },
-    /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */
-    { 0x000000012d8590ae, 0x00000000fe4365dc },
-    /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */
-    { 0x0000000065b00684, 0x00000000c68f497a },
-    /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */
-    { 0x000000015e5aeadc, 0x00000000fbf521ee },
-    /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */
-    { 0x00000000b77ff2b0, 0x000000015eac3378 },
-    /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */
-    { 0x0000000188da2ff6, 0x0000000134914b90 },
-    /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */
-    { 0x0000000063da929a, 0x0000000016335cfe },
-    /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */
-    { 0x00000001389caa80, 0x000000010372d10c },
-    /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */
-    { 0x000000013db599d2, 0x000000015097b908 },
-    /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */
-    { 0x0000000122505a86, 0x00000001227a7572 },
-    /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */
-    { 0x000000016bd72746, 0x000000009a8f75c0 },
-    /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */
-    { 0x00000001c3faf1d4, 0x00000000682c77a2 },
-    /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */
-    { 0x00000001111c826c, 0x00000000231f091c },
-    /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */
-    { 0x00000000153e9fb2, 0x000000007d4439f2 },
-    /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */
-    { 0x000000002b1f7b60, 0x000000017e221efc },
-    /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */
-    { 0x00000000b1dba570, 0x0000000167457c38 },
-    /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */
-    { 0x00000001f6397b76, 0x00000000bdf081c4 },
-    /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */
-    { 0x0000000156335214, 0x000000016286d6b0 },
-    /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */
-    { 0x00000001d70e3986, 0x00000000c84f001c },
-    /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */
-    { 0x000000003701a774, 0x0000000064efe7c0 },
-    /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */
-    { 0x00000000ac81ef72, 0x000000000ac2d904 },
-    /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */
-    { 0x0000000133212464, 0x00000000fd226d14 },
-    /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */
-    { 0x00000000e4e45610, 0x000000011cfd42e0 },
-    /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */
-    { 0x000000000c1bd370, 0x000000016e5a5678 },
-    /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */
-    { 0x00000001a7b9e7a6, 0x00000001d888fe22 },
-    /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */
-    { 0x000000007d657a10, 0x00000001af77fcd4 }
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-    /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */
-    { 0x00000001651797d2, 0x0000000099ea94a8 },
-    /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */
-    { 0x0000000021e0d56c, 0x00000000945a8420 },
-    /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */
-    { 0x000000000f95ecaa, 0x0000000030762706 },
-    /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */
-    { 0x00000001ebd224ac, 0x00000001a52fc582 },
-    /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */
-    { 0x000000000ccb97ca, 0x00000001a4a7167a },
-    /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */
-    { 0x00000001006ec8a8, 0x000000000c18249a },
-    /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */
-    { 0x000000014f58f196, 0x00000000a924ae7c },
-    /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */
-    { 0x00000001a7192ca6, 0x00000001e12ccc12 },
-    /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */
-    { 0x000000019a64bab2, 0x00000000a0b9d4ac },
-    /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */
-    { 0x0000000014f4ed2e, 0x0000000095e8ddfe },
-    /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */
-    { 0x000000011092b6a2, 0x00000000233fddc4 },
-    /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */
-    { 0x00000000c8a1629c, 0x00000001b4529b62 },
-    /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */
-    { 0x000000017bf32e8e, 0x00000001a7fa0e64 },
-    /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */
-    { 0x00000001f8cc6582, 0x00000001b5334592 },
-    /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */
-    { 0x000000008631ddf0, 0x000000011f8ee1b4 },
-    /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */
-    { 0x000000007e5a76d0, 0x000000006252e632 },
-    /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */
-    { 0x000000002b09b31c, 0x00000000ab973e84 },
-    /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */
-    { 0x00000001b2df1f84, 0x000000007734f5ec },
-    /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */
-    { 0x00000001d6f56afc, 0x000000007c547798 },
-    /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */
-    { 0x00000001b9b5e70c, 0x000000007ec40210 },
-    /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */
-    { 0x0000000034b626d2, 0x00000001ab1695a8 },
-    /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */
-    { 0x000000014c53479a, 0x0000000090494bba },
-    /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */
-    { 0x00000001a6d179a4, 0x00000001123fb816 },
-    /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */
-    { 0x000000015abd16b4, 0x00000001e188c74c },
-    /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */
-    { 0x00000000018f9852, 0x00000001c2d3451c },
-    /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */
-    { 0x000000001fb3084a, 0x00000000f55cf1ca },
-    /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */
-    { 0x00000000c53dfb04, 0x00000001a0531540 },
-    /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */
-    { 0x00000000e10c9ad6, 0x0000000132cd7ebc },
-    /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */
-    { 0x0000000025aa994a, 0x0000000073ab7f36 },
-    /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */
-    { 0x00000000fa3a74c4, 0x0000000041aed1c2 },
-    /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */
-    { 0x0000000033eb3f40, 0x0000000136c53800 },
-    /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */
-    { 0x000000017193f296, 0x0000000126835a30 },
-    /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */
-    { 0x0000000043f6c86a, 0x000000006241b502 },
-    /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */
-    { 0x000000016b513ec6, 0x00000000d5196ad4 },
-    /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */
-    { 0x00000000c8f25b4e, 0x000000009cfa769a },
-    /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */
-    { 0x00000001a45048ec, 0x00000000920e5df4 },
-    /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */
-    { 0x000000000c441004, 0x0000000169dc310e },
-    /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */
-    { 0x000000000e17cad6, 0x0000000009fc331c },
-    /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */
-    { 0x00000001253ae964, 0x000000010d94a81e },
-    /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */
-    { 0x00000001d7c88ebc, 0x0000000027a20ab2 },
-    /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */
-    { 0x00000001e7ca913a, 0x0000000114f87504 },
-    /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */
-    { 0x0000000033ed078a, 0x000000004b076d96 },
-    /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */
-    { 0x00000000e1839c78, 0x00000000da4d1e74 },
-    /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */
-    { 0x00000001322b267e, 0x000000001b81f672 },
-    /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */
-    { 0x00000000638231b6, 0x000000009367c988 },
-    /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */
-    { 0x00000001ee7f16f4, 0x00000001717214ca },
-    /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */
-    { 0x0000000117d9924a, 0x000000009f47d820 },
-    /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */
-    { 0x00000000e1a9e0c4, 0x000000010d9a47d2 },
-    /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */
-    { 0x00000001403731dc, 0x00000000a696c58c },
-    /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */
-    { 0x00000001a5ea9682, 0x000000002aa28ec6 },
-    /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */
-    { 0x0000000101c5c578, 0x00000001fe18fd9a },
-    /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */
-    { 0x00000000dddf6494, 0x000000019d4fc1ae },
-    /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */
-    { 0x00000000f1c3db28, 0x00000001ba0e3dea },
-    /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */
-    { 0x000000013112fb9c, 0x0000000074b59a5e },
-    /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */
-    { 0x00000000b680b906, 0x00000000f2b5ea98 },
-    /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */
-    { 0x000000001a282932, 0x0000000187132676 },
-    /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */
-    { 0x0000000089406e7e, 0x000000010a8c6ad4 },
-    /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */
-    { 0x00000001def6be8c, 0x00000001e21dfe70 },
-    /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */
-    { 0x0000000075258728, 0x00000001da0050e4 },
-    /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */
-    { 0x000000019536090a, 0x00000000772172ae },
-    /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */
-    { 0x00000000f2455bfc, 0x00000000e47724aa },
-    /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */
-    { 0x000000018c40baf4, 0x000000003cd63ac4 },
-    /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */
-    { 0x000000004cd390d4, 0x00000001bf47d352 },
-    /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */
-    { 0x00000001e4ece95a, 0x000000018dc1d708 },
-    /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */
-    { 0x000000001a3ee918, 0x000000002d4620a4 },
-    /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */
-    { 0x000000007c652fb8, 0x0000000058fd1740 },
-    /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */
-    { 0x000000011c67842c, 0x00000000dadd9bfc },
-    /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */
-    { 0x00000000254f759c, 0x00000001ea2140be },
-    /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */
-    { 0x000000007ece94ca, 0x000000009de128ba },
-    /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */
-    { 0x0000000038f258c2, 0x000000013ac3aa8e },
-    /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */
-    { 0x00000001cdf17b00, 0x0000000099980562 },
-    /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */
-    { 0x000000011f882c16, 0x00000001c1579c86 },
-    /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */
-    { 0x0000000100093fc8, 0x0000000068dbbf94 },
-    /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */
-    { 0x00000001cd684f16, 0x000000004509fb04 },
-    /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */
-    { 0x000000004bc6a70a, 0x00000001202f6398 },
-    /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */
-    { 0x000000004fc7e8e4, 0x000000013aea243e },
-    /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */
-    { 0x0000000130103f1c, 0x00000001b4052ae6 },
-    /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */
-    { 0x0000000111b0024c, 0x00000001cd2a0ae8 },
-    /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */
-    { 0x000000010b3079da, 0x00000001fe4aa8b4 },
-    /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */
-    { 0x000000010192bcc2, 0x00000001d1559a42 },
-    /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */
-    { 0x0000000074838d50, 0x00000001f3e05ecc },
-    /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */
-    { 0x000000001b20f520, 0x0000000104ddd2cc },
-    /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */
-    { 0x0000000050c3590a, 0x000000015393153c },
-    /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */
-    { 0x00000000b41cac8e, 0x0000000057e942c6 },
-    /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */
-    { 0x000000000c72cc78, 0x000000012c633850 },
-    /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */
-    { 0x0000000030cdb032, 0x00000000ebcaae4c },
-    /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */
-    { 0x000000013e09fc32, 0x000000013ee532a6 },
-    /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */
-    { 0x000000001ed624d2, 0x00000001bf0cbc7e },
-    /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */
-    { 0x00000000781aee1a, 0x00000000d50b7a5a },
-    /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */
-    { 0x00000001c4d8348c, 0x0000000002fca6e8 },
-    /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */
-    { 0x0000000057a40336, 0x000000007af40044 },
-    /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */
-    { 0x0000000085544940, 0x0000000016178744 },
-    /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */
-    { 0x000000019cd21e80, 0x000000014c177458 },
-    /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */
-    { 0x000000013eb95bc0, 0x000000011b6ddf04 },
-    /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */
-    { 0x00000001dfc9fdfc, 0x00000001f3e29ccc },
-    /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */
-    { 0x00000000cd028bc2, 0x0000000135ae7562 },
-    /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */
-    { 0x0000000090db8c44, 0x0000000190ef812c },
-    /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */
-    { 0x000000010010a4ce, 0x0000000067a2c786 },
-    /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */
-    { 0x00000001c8f4c72c, 0x0000000048b9496c },
-    /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */
-    { 0x000000001c26170c, 0x000000015a422de6 },
-    /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */
-    { 0x00000000e3fccf68, 0x00000001ef0e3640 },
-    /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */
-    { 0x00000000d513ed24, 0x00000001006d2d26 },
-    /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */
-    { 0x00000000141beada, 0x00000001170d56d6 },
-    /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */
-    { 0x000000011071aea0, 0x00000000a5fb613c },
-    /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */
-    { 0x000000012e19080a, 0x0000000040bbf7fc },
-    /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */
-    { 0x0000000100ecf826, 0x000000016ac3a5b2 },
-    /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */
-    { 0x0000000069b09412, 0x00000000abf16230 },
-    /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */
-    { 0x0000000122297bac, 0x00000001ebe23fac },
-    /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */
-    { 0x00000000e9e4b068, 0x000000008b6a0894 },
-    /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */
-    { 0x000000004b38651a, 0x00000001288ea478 },
-    /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */
-    { 0x00000001468360e2, 0x000000016619c442 },
-    /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */
-    { 0x00000000121c2408, 0x0000000086230038 },
-    /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */
-    { 0x00000000da7e7d08, 0x000000017746a756 },
-    /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */
-    { 0x00000001058d7652, 0x0000000191b8f8f8 },
-    /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */
-    { 0x000000014a098a90, 0x000000008e167708 },
-    /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */
-    { 0x0000000020dbe72e, 0x0000000148b22d54 },
-    /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */
-    { 0x000000011e7323e8, 0x0000000044ba2c3c },
-    /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */
-    { 0x00000000d5d4bf94, 0x00000000b54d2b52 },
-    /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */
-    { 0x0000000199d8746c, 0x0000000005a4fd8a },
-    /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */
-    { 0x00000000ce9ca8a0, 0x0000000139f9fc46 },
-    /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */
-    { 0x00000000136edece, 0x000000015a1fa824 },
-    /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */
-    { 0x000000019b92a068, 0x000000000a61ae4c },
-    /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */
-    { 0x0000000071d62206, 0x0000000145e9113e },
-    /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */
-    { 0x00000000dfc50158, 0x000000006a348448 },
-    /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */
-    { 0x00000001517626bc, 0x000000004d80a08c },
-    /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */
-    { 0x0000000148d1e4fa, 0x000000014b6837a0 },
-    /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */
-    { 0x0000000094d8266e, 0x000000016896a7fc },
-    /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */
-    { 0x00000000606c5e34, 0x000000014f187140 },
-    /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */
-    { 0x000000019766beaa, 0x000000019581b9da },
-    /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */
-    { 0x00000001d80c506c, 0x00000001091bc984 },
-    /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */
-    { 0x000000001e73837c, 0x000000001067223c },
-    /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */
-    { 0x0000000064d587de, 0x00000001ab16ea02 },
-    /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */
-    { 0x00000000f4a507b0, 0x000000013c4598a8 },
-    /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */
-    { 0x0000000040e342fc, 0x00000000b3735430 },
-    /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */
-    { 0x00000001d5ad9c3a, 0x00000001bb3fc0c0 },
-    /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */
-    { 0x0000000094a691a4, 0x00000001570ae19c },
-    /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */
-    { 0x00000001271ecdfa, 0x00000001ea910712 },
-    /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */
-    { 0x000000009e54475a, 0x0000000167127128 },
-    /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */
-    { 0x00000000c9c099ee, 0x0000000019e790a2 },
-    /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */
-    { 0x000000009a2f736c, 0x000000003788f710 },
-    /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */
-    { 0x00000000bb9f4996, 0x00000001682a160e },
-    /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */
-    { 0x00000001db688050, 0x000000007f0ebd2e },
-    /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */
-    { 0x00000000e9b10af4, 0x000000002b032080 },
-    /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */
-    { 0x000000012d4545e4, 0x00000000cfd1664a },
-    /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */
-    { 0x000000000361139c, 0x00000000aa1181c2 },
-    /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */
-    { 0x00000001a5a1a3a8, 0x00000000ddd08002 },
-    /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */
-    { 0x000000006844e0b0, 0x00000000e8dd0446 },
-    /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */
-    { 0x00000000c3762f28, 0x00000001bbd94a00 },
-    /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */
-    { 0x00000001d26287a2, 0x00000000ab6cd180 },
-    /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */
-    { 0x00000001f6f0bba8, 0x0000000031803ce2 },
-    /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */
-    { 0x000000002ffabd62, 0x0000000024f40b0c },
-    /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */
-    { 0x00000000fb4516b8, 0x00000001ba1d9834 },
-    /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */
-    { 0x000000018cfa961c, 0x0000000104de61aa },
-    /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */
-    { 0x000000019e588d52, 0x0000000113e40d46 },
-    /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */
-    { 0x00000001180f0bbc, 0x00000001415598a0 },
-    /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */
-    { 0x00000000e1d9177a, 0x00000000bf6c8c90 },
-    /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */
-    { 0x0000000105abc27c, 0x00000001788b0504 },
-    /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */
-    { 0x00000000972e4a58, 0x0000000038385d02 },
-    /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */
-    { 0x0000000183499a5e, 0x00000001b6c83844 },
-    /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */
-    { 0x00000001c96a8cca, 0x0000000051061a8a },
-    /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */
-    { 0x00000001a1a5b60c, 0x000000017351388a },
-    /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */
-    { 0x00000000e4b6ac9c, 0x0000000132928f92 },
-    /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */
-    { 0x00000001807e7f5a, 0x00000000e6b4f48a },
-    /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */
-    { 0x000000017a7e3bc8, 0x0000000039d15e90 },
-    /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */
-    { 0x00000000d73975da, 0x00000000312d6074 },
-    /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */
-    { 0x000000017375d038, 0x000000017bbb2cc4 },
-    /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */
-    { 0x00000000193680bc, 0x000000016ded3e18 },
-    /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */
-    { 0x00000000999b06f6, 0x00000000f1638b16 },
-    /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */
-    { 0x00000001f685d2b8, 0x00000001d38b9ecc },
-    /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */
-    { 0x00000001f4ecbed2, 0x000000018b8d09dc },
-    /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */
-    { 0x00000000ba16f1a0, 0x00000000e7bc27d2 },
-    /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */
-    { 0x0000000115aceac4, 0x00000000275e1e96 },
-    /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */
-    { 0x00000001aeff6292, 0x00000000e2e3031e },
-    /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */
-    { 0x000000009640124c, 0x00000001041c84d8 },
-    /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */
-    { 0x0000000114f41f02, 0x00000000706ce672 },
-    /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */
-    { 0x000000009c5f3586, 0x000000015d5070da },
-    /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */
-    { 0x00000001878275fa, 0x0000000038f9493a },
-    /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */
-    { 0x00000000ddc42ce8, 0x00000000a3348a76 },
-    /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */
-    { 0x0000000181d2c73a, 0x00000001ad0aab92 },
-    /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */
-    { 0x0000000141c9320a, 0x000000019e85f712 },
-    /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */
-    { 0x000000015235719a, 0x000000005a871e76 },
-    /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */
-    { 0x00000000be27d804, 0x000000017249c662 },
-    /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */
-    { 0x000000006242d45a, 0x000000003a084712 },
-    /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */
-    { 0x000000009a53638e, 0x00000000ed438478 },
-    /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */
-    { 0x00000001001ecfb6, 0x00000000abac34cc },
-    /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */
-    { 0x000000016d7c2d64, 0x000000005f35ef3e },
-    /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */
-    { 0x00000001d0ce46c0, 0x0000000047d6608c },
-    /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */
-    { 0x0000000124c907b4, 0x000000002d01470e },
-    /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */
-    { 0x0000000018a555ca, 0x0000000158bbc7b0 },
-    /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */
-    { 0x000000006b0980bc, 0x00000000c0a23e8e },
-    /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */
-    { 0x000000008bbba964, 0x00000001ebd85c88 },
-    /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */
-    { 0x00000001070a5a1e, 0x000000019ee20bb2 },
-    /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */
-    { 0x000000002204322a, 0x00000001acabf2d6 },
-    /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */
-    { 0x00000000a27524d0, 0x00000001b7963d56 },
-    /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */
-    { 0x0000000020b1e4ba, 0x000000017bffa1fe },
-    /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */
-    { 0x0000000032cc27fc, 0x000000001f15333e },
-    /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */
-    { 0x0000000044dd22b8, 0x000000018593129e },
-    /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */
-    { 0x00000000dffc9e0a, 0x000000019cb32602 },
-    /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */
-    { 0x00000001b7a0ed14, 0x0000000142b05cc8 },
-    /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */
-    { 0x00000000c7842488, 0x00000001be49e7a4 },
-    /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */
-    { 0x00000001c02a4fee, 0x0000000108f69d6c },
-    /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */
-    { 0x000000003c273778, 0x000000006c0971f0 },
-    /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */
-    { 0x00000001d63f8894, 0x000000005b16467a },
-    /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */
-    { 0x000000006be557d6, 0x00000001551a628e },
-    /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */
-    { 0x000000006a7806ea, 0x000000019e42ea92 },
-    /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */
-    { 0x000000016155aa0c, 0x000000012fa83ff2 },
-    /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */
-    { 0x00000000908650ac, 0x000000011ca9cde0 },
-    /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */
-    { 0x00000000aa5a8084, 0x00000000c8e5cd74 },
-    /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */
-    { 0x0000000191bb500a, 0x0000000096c27f0c },
-    /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */
-    { 0x0000000064e9bed0, 0x000000002baed926 },
-    /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */
-    { 0x000000009444f302, 0x000000017c8de8d2 },
-    /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */
-    { 0x000000019db07d3c, 0x00000000d43d6068 },
-    /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */
-    { 0x00000001359e3e6e, 0x00000000cb2c4b26 },
-    /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */
-    { 0x00000001e4f10dd2, 0x0000000145b8da26 },
-    /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */
-    { 0x0000000124f5735e, 0x000000018fff4b08 },
-    /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */
-    { 0x0000000124760a4c, 0x0000000150b58ed0 },
-    /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */
-    { 0x000000000f1fc186, 0x00000001549f39bc },
-    /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */
-    { 0x00000000150e4cc4, 0x00000000ef4d2f42 },
-    /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */
-    { 0x000000002a6204e8, 0x00000001b1468572 },
-    /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */
-    { 0x00000000beb1d432, 0x000000013d7403b2 },
-    /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */
-    { 0x0000000135f3f1f0, 0x00000001a4681842 },
-    /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */
-    { 0x0000000074fe2232, 0x0000000167714492 },
-    /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */
-    { 0x000000001ac6e2ba, 0x00000001e599099a },
-    /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */
-    { 0x0000000013fca91e, 0x00000000fe128194 },
-    /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */
-    { 0x0000000183f4931e, 0x0000000077e8b990 },
-    /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */
-    { 0x00000000b6d9b4e4, 0x00000001a267f63a },
-    /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */
-    { 0x00000000b5188656, 0x00000001945c245a },
-    /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */
-    { 0x0000000027a81a84, 0x0000000149002e76 },
-    /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */
-    { 0x0000000125699258, 0x00000001bb8310a4 },
-    /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */
-    { 0x00000001b23de796, 0x000000019ec60bcc },
-    /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */
-    { 0x00000000fe4365dc, 0x000000012d8590ae },
-    /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */
-    { 0x00000000c68f497a, 0x0000000065b00684 },
-    /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */
-    { 0x00000000fbf521ee, 0x000000015e5aeadc },
-    /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */
-    { 0x000000015eac3378, 0x00000000b77ff2b0 },
-    /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */
-    { 0x0000000134914b90, 0x0000000188da2ff6 },
-    /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */
-    { 0x0000000016335cfe, 0x0000000063da929a },
-    /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */
-    { 0x000000010372d10c, 0x00000001389caa80 },
-    /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */
-    { 0x000000015097b908, 0x000000013db599d2 },
-    /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */
-    { 0x00000001227a7572, 0x0000000122505a86 },
-    /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */
-    { 0x000000009a8f75c0, 0x000000016bd72746 },
-    /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */
-    { 0x00000000682c77a2, 0x00000001c3faf1d4 },
-    /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */
-    { 0x00000000231f091c, 0x00000001111c826c },
-    /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */
-    { 0x000000007d4439f2, 0x00000000153e9fb2 },
-    /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */
-    { 0x000000017e221efc, 0x000000002b1f7b60 },
-    /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */
-    { 0x0000000167457c38, 0x00000000b1dba570 },
-    /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */
-    { 0x00000000bdf081c4, 0x00000001f6397b76 },
-    /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */
-    { 0x000000016286d6b0, 0x0000000156335214 },
-    /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */
-    { 0x00000000c84f001c, 0x00000001d70e3986 },
-    /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */
-    { 0x0000000064efe7c0, 0x000000003701a774 },
-    /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */
-    { 0x000000000ac2d904, 0x00000000ac81ef72 },
-    /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */
-    { 0x00000000fd226d14, 0x0000000133212464 },
-    /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */
-    { 0x000000011cfd42e0, 0x00000000e4e45610 },
-    /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */
-    { 0x000000016e5a5678, 0x000000000c1bd370 },
-    /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */
-    { 0x00000001d888fe22, 0x00000001a7b9e7a6 },
-    /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */
-    { 0x00000001af77fcd4, 0x000000007d657a10 }
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-};
-
-/* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros */
-
-static const __vector unsigned long long vcrc_short_const[16] ALIGNED_(16) = {
-#if BYTE_ORDER == LITTLE_ENDIAN
-    /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x)  */
-    { 0x99168a18ec447f11, 0xed837b2613e8221e },
-    /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x)  */
-    { 0xe23e954e8fd2cd3c, 0xc8acdd8147b9ce5a },
-    /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x)  */
-    { 0x92f8befe6b1d2b53, 0xd9ad6d87d4277e25 },
-    /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x)  */
-    { 0xf38a3556291ea462, 0xc10ec5e033fbca3b },
-    /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x)  */
-    { 0x974ac56262b6ca4b, 0xc0b55b0e82e02e2f },
-    /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x)  */
-    { 0x855712b3784d2a56, 0x71aa1df0e172334d },
-    /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x)  */
-    { 0xa5abe9f80eaee722, 0xfee3053e3969324d },
-    /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x)  */
-    { 0x1fa0943ddb54814c, 0xf44779b93eb2bd08 },
-    /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x)  */
-    { 0xa53ff440d7bbfe6a, 0xf5449b3f00cc3374 },
-    /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x)  */
-    { 0xebe7e3566325605c, 0x6f8346e1d777606e },
-    /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x)  */
-    { 0xc65a272ce5b592b8, 0xe3ab4f2ac0b95347 },
-    /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x)  */
-    { 0x5705a9ca4721589f, 0xaa2215ea329ecc11 },
-    /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x)  */
-    { 0xe3720acb88d14467, 0x1ed8f66ed95efd26 },
-    /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x)  */
-    { 0xba1aca0315141c31, 0x78ed02d5a700e96a },
-    /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x)  */
-    { 0xad2a31b3ed627dae, 0xba8ccbe832b39da3 },
-    /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x)  */
-    { 0x6655004fa06a2517, 0xedb88320b1e6b092 }
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-    /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x)  */
-    { 0xed837b2613e8221e, 0x99168a18ec447f11 },
-    /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x)  */
-    { 0xc8acdd8147b9ce5a, 0xe23e954e8fd2cd3c },
-    /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x)  */
-    { 0xd9ad6d87d4277e25, 0x92f8befe6b1d2b53 },
-    /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x)  */
-    { 0xc10ec5e033fbca3b, 0xf38a3556291ea462 },
-    /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x)  */
-    { 0xc0b55b0e82e02e2f, 0x974ac56262b6ca4b },
-    /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x)  */
-    { 0x71aa1df0e172334d, 0x855712b3784d2a56 },
-    /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x)  */
-    { 0xfee3053e3969324d, 0xa5abe9f80eaee722 },
-    /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x)  */
-    { 0xf44779b93eb2bd08, 0x1fa0943ddb54814c },
-    /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x)  */
-    { 0xf5449b3f00cc3374, 0xa53ff440d7bbfe6a },
-    /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x)  */
-    { 0x6f8346e1d777606e, 0xebe7e3566325605c },
-    /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x)  */
-    { 0xe3ab4f2ac0b95347, 0xc65a272ce5b592b8 },
-    /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x)  */
-    { 0xaa2215ea329ecc11, 0x5705a9ca4721589f },
-    /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x)  */
-    { 0x1ed8f66ed95efd26, 0xe3720acb88d14467 },
-    /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x)  */
-    { 0x78ed02d5a700e96a, 0xba1aca0315141c31 },
-    /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x)  */
-    { 0xba8ccbe832b39da3, 0xad2a31b3ed627dae },
-    /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x)  */
-    { 0xedb88320b1e6b092, 0x6655004fa06a2517 }
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-};
-
-/* Barrett constants */
-/* 33 bit reflected Barrett constant m - (4^32)/n */
-
-static const __vector unsigned long long v_Barrett_const[2] ALIGNED_(16) = {
-    /* x^64 div p(x)  */
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { 0x00000001f7011641, 0x0000000000000000 },
-    { 0x00000001db710641, 0x0000000000000000 }
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-    { 0x0000000000000000, 0x00000001f7011641 },
-    { 0x0000000000000000, 0x00000001db710641 }
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-};

crates/libz-sys/src/zlib-ng/arch/power/crc32_power8.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/crc32_power8.c b/crates/libz-sys/src/zlib-ng/arch/power/crc32_power8.c
deleted file mode 100644
index fbb6472..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/crc32_power8.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/* crc32 for POWER8 using VSX instructions
- * Copyright (C) 2021 IBM Corporation
- *
- * Author: Rogerio Alves <rogealve@br.ibm.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Calculate the checksum of data that is 16 byte aligned and a multiple of
- * 16 bytes.
- *
- * The first step is to reduce it to 1024 bits. We do this in 8 parallel
- * chunks in order to mask the latency of the vpmsum instructions. If we
- * have more than 32 kB of data to checksum we repeat this step multiple
- * times, passing in the previous 1024 bits.
- *
- * The next step is to reduce the 1024 bits to 64 bits. This step adds
- * 32 bits of 0s to the end - this matches what a CRC does. We just
- * calculate constants that land the data in this 32 bits.
- *
- * We then use fixed point Barrett reduction to compute a mod n over GF(2)
- * for n = CRC using POWER8 instructions. We use x = 32.
- *
- * http://en.wikipedia.org/wiki/Barrett_reduction
- *
- * This code uses gcc vector builtins instead using assembly directly.
- */
-
-#include <altivec.h>
-#include "zendian.h"
-#include "zbuild.h"
-
-#include "crc32_constants.h"
-#include "crc32_braid_tbl.h"
-
-#if defined (__clang__)
-#include "fallback_builtins.h"
-#endif
-
-#define MAX_SIZE    32768
-#define VMX_ALIGN	16
-#define VMX_ALIGN_MASK	(VMX_ALIGN-1)
-
-static unsigned int crc32_align(unsigned int crc, const unsigned char *p, unsigned long len) {
-    while (len--)
-        crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8);
-    return crc;
-}
-
-static unsigned int ALIGNED_(32) __crc32_vpmsum(unsigned int crc, const void* p, unsigned long len);
-
-Z_INTERNAL uint32_t crc32_power8(uint32_t crc, const unsigned char *p, uint64_t _len) {
-    unsigned int prealign;
-    unsigned int tail;
-
-    unsigned long len = (unsigned long) _len;
-
-    if (p == (const unsigned char *) 0x0)
-        return 0;
-
-    crc ^= 0xffffffff;
-
-    if (len < VMX_ALIGN + VMX_ALIGN_MASK) {
-        crc = crc32_align(crc, p, len);
-        goto out;
-    }
-
-    if ((unsigned long)p & VMX_ALIGN_MASK) {
-        prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK);
-        crc = crc32_align(crc, p, prealign);
-        len -= prealign;
-        p += prealign;
-    }
-
-    crc = __crc32_vpmsum(crc, p, len & ~VMX_ALIGN_MASK);
-
-    tail = len & VMX_ALIGN_MASK;
-    if (tail) {
-        p += len & ~VMX_ALIGN_MASK;
-        crc = crc32_align(crc, p, tail);
-    }
-
-out:
-    crc ^= 0xffffffff;
-
-    return crc;
-}
-
-/* When we have a load-store in a single-dispatch group and address overlap
- * such that forward is not allowed (load-hit-store) the group must be flushed.
- * A group ending NOP prevents the flush.
- */
-#define GROUP_ENDING_NOP __asm__("ori 2,2,0" ::: "memory")
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define BYTESWAP_DATA
-#endif
-
-#ifdef BYTESWAP_DATA
-#define VEC_PERM(vr, va, vb, vc) vr = vec_perm(va, vb, (__vector unsigned char) vc)
-#if BYTE_ORDER == LITTLE_ENDIAN
-/* Byte reverse permute constant LE. */
-static const __vector unsigned long long vperm_const ALIGNED_(16) = { 0x08090A0B0C0D0E0FUL, 0x0001020304050607UL };
-#else
-static const __vector unsigned long long vperm_const ALIGNED_(16) = { 0x0F0E0D0C0B0A0908UL, 0X0706050403020100UL };
-#endif
-#else
-#define VEC_PERM(vr, va, vb, vc)
-#endif
-
-static unsigned int ALIGNED_(32) __crc32_vpmsum(unsigned int crc, const void* p, unsigned long len) {
-
-    const __vector unsigned long long vzero = {0,0};
-    const __vector unsigned long long vones = {0xffffffffffffffffUL, 0xffffffffffffffffUL};
-
-    const __vector unsigned long long vmask_32bit =
-        (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, (__vector unsigned char)vones, 4);
-
-    const __vector unsigned long long vmask_64bit =
-        (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, (__vector unsigned char)vones, 8);
-
-    __vector unsigned long long vcrc;
-
-    __vector unsigned long long vconst1, vconst2;
-
-    /* vdata0-vdata7 will contain our data (p). */
-    __vector unsigned long long vdata0, vdata1, vdata2, vdata3, vdata4, vdata5, vdata6, vdata7;
-
-    /* v0-v7 will contain our checksums */
-    __vector unsigned long long v0 = {0,0};
-    __vector unsigned long long v1 = {0,0};
-    __vector unsigned long long v2 = {0,0};
-    __vector unsigned long long v3 = {0,0};
-    __vector unsigned long long v4 = {0,0};
-    __vector unsigned long long v5 = {0,0};
-    __vector unsigned long long v6 = {0,0};
-    __vector unsigned long long v7 = {0,0};
-
-
-    /* Vector auxiliary variables. */
-    __vector unsigned long long va0, va1, va2, va3, va4, va5, va6, va7;
-
-    unsigned int offset; /* Constant table offset. */
-
-    unsigned long i; /* Counter. */
-    unsigned long chunks;
-
-    unsigned long block_size;
-    int next_block = 0;
-
-    /* Align by 128 bits. The last 128 bit block will be processed at end. */
-    unsigned long length = len & 0xFFFFFFFFFFFFFF80UL;
-
-    vcrc = (__vector unsigned long long)__builtin_pack_vector_int128(0UL, crc);
-
-    /* Short version. */
-    if (len < 256) {
-        /* Calculate where in the constant table we need to start. */
-        offset = 256 - len;
-
-        vconst1 = vec_ld(offset, vcrc_short_const);
-        vdata0 = vec_ld(0, (__vector unsigned long long*) p);
-        VEC_PERM(vdata0, vdata0, vconst1, vperm_const);
-
-        /* xor initial value */
-        vdata0 = vec_xor(vdata0, vcrc);
-
-        vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata0, (__vector unsigned int)vconst1);
-        v0 = vec_xor(v0, vdata0);
-
-        for (i = 16; i < len; i += 16) {
-            vconst1 = vec_ld(offset + i, vcrc_short_const);
-            vdata0 = vec_ld(i, (__vector unsigned long long*) p);
-            VEC_PERM(vdata0, vdata0, vconst1, vperm_const);
-            vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw(
-                (__vector unsigned int)vdata0, (__vector unsigned int)vconst1);
-            v0 = vec_xor(v0, vdata0);
-        }
-    } else {
-
-        /* Load initial values. */
-        vdata0 = vec_ld(0, (__vector unsigned long long*) p);
-        vdata1 = vec_ld(16, (__vector unsigned long long*) p);
-
-        VEC_PERM(vdata0, vdata0, vdata0, vperm_const);
-        VEC_PERM(vdata1, vdata1, vdata1, vperm_const);
-
-        vdata2 = vec_ld(32, (__vector unsigned long long*) p);
-        vdata3 = vec_ld(48, (__vector unsigned long long*) p);
-
-        VEC_PERM(vdata2, vdata2, vdata2, vperm_const);
-        VEC_PERM(vdata3, vdata3, vdata3, vperm_const);
-
-        vdata4 = vec_ld(64, (__vector unsigned long long*) p);
-        vdata5 = vec_ld(80, (__vector unsigned long long*) p);
-
-        VEC_PERM(vdata4, vdata4, vdata4, vperm_const);
-        VEC_PERM(vdata5, vdata5, vdata5, vperm_const);
-
-        vdata6 = vec_ld(96, (__vector unsigned long long*) p);
-        vdata7 = vec_ld(112, (__vector unsigned long long*) p);
-
-        VEC_PERM(vdata6, vdata6, vdata6, vperm_const);
-        VEC_PERM(vdata7, vdata7, vdata7, vperm_const);
-
-        /* xor in initial value */
-        vdata0 = vec_xor(vdata0, vcrc);
-
-        p = (char *)p + 128;
-
-        do {
-            /* Checksum in blocks of MAX_SIZE. */
-            block_size = length;
-            if (block_size > MAX_SIZE) {
-                block_size = MAX_SIZE;
-            }
-
-            length = length - block_size;
-
-            /*
-             * Work out the offset into the constants table to start at. Each
-             * constant is 16 bytes, and it is used against 128 bytes of input
-             * data - 128 / 16 = 8
-             */
-            offset = (MAX_SIZE/8) - (block_size/8);
-            /* We reduce our final 128 bytes in a separate step */
-            chunks = (block_size/128)-1;
-
-            vconst1 = vec_ld(offset, vcrc_const);
-
-            va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0,
-                                           (__vector unsigned long long)vconst1);
-            va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1,
-                                           (__vector unsigned long long)vconst1);
-            va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata2,
-                                           (__vector unsigned long long)vconst1);
-            va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3,
-                                           (__vector unsigned long long)vconst1);
-            va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4,
-                                           (__vector unsigned long long)vconst1);
-            va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5,
-                                           (__vector unsigned long long)vconst1);
-            va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6,
-                                           (__vector unsigned long long)vconst1);
-            va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7,
-                                           (__vector unsigned long long)vconst1);
-
-            if (chunks > 1) {
-                offset += 16;
-                vconst2 = vec_ld(offset, vcrc_const);
-                GROUP_ENDING_NOP;
-
-                vdata0 = vec_ld(0, (__vector unsigned long long*) p);
-                VEC_PERM(vdata0, vdata0, vdata0, vperm_const);
-
-                vdata1 = vec_ld(16, (__vector unsigned long long*) p);
-                VEC_PERM(vdata1, vdata1, vdata1, vperm_const);
-
-                vdata2 = vec_ld(32, (__vector unsigned long long*) p);
-                VEC_PERM(vdata2, vdata2, vdata2, vperm_const);
-
-                vdata3 = vec_ld(48, (__vector unsigned long long*) p);
-                VEC_PERM(vdata3, vdata3, vdata3, vperm_const);
-
-                vdata4 = vec_ld(64, (__vector unsigned long long*) p);
-                VEC_PERM(vdata4, vdata4, vdata4, vperm_const);
-
-                vdata5 = vec_ld(80, (__vector unsigned long long*) p);
-                VEC_PERM(vdata5, vdata5, vdata5, vperm_const);
-
-                vdata6 = vec_ld(96, (__vector unsigned long long*) p);
-                VEC_PERM(vdata6, vdata6, vdata6, vperm_const);
-
-                vdata7 = vec_ld(112, (__vector unsigned long long*) p);
-                VEC_PERM(vdata7, vdata7, vdata7, vperm_const);
-
-                p = (char *)p + 128;
-
-                /*
-                 * main loop. Each iteration calculates the CRC for a 128-byte
-                 * block.
-                 */
-                for (i = 0; i < chunks-2; i++) {
-                    vconst1 = vec_ld(offset, vcrc_const);
-                    offset += 16;
-                    GROUP_ENDING_NOP;
-
-                    v0 = vec_xor(v0, va0);
-                    va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0,
-                                                   (__vector unsigned long long)vconst2);
-                    vdata0 = vec_ld(0, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata0, vdata0, vdata0, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v1 = vec_xor(v1, va1);
-                    va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1,
-                                                   (__vector unsigned long long)vconst2);
-                    vdata1 = vec_ld(16, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata1, vdata1, vdata1, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v2 = vec_xor(v2, va2);
-                    va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)
-                                                   vdata2, (__vector unsigned long long)vconst2);
-                    vdata2 = vec_ld(32, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata2, vdata2, vdata2, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v3 = vec_xor(v3, va3);
-                    va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3,
-                                                   (__vector unsigned long long)vconst2);
-                    vdata3 = vec_ld(48, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata3, vdata3, vdata3, vperm_const);
-
-                    vconst2 = vec_ld(offset, vcrc_const);
-                    GROUP_ENDING_NOP;
-
-                    v4 = vec_xor(v4, va4);
-                    va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4,
-                                                   (__vector unsigned long long)vconst1);
-                    vdata4 = vec_ld(64, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata4, vdata4, vdata4, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v5 = vec_xor(v5, va5);
-                    va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5,
-                                                   (__vector unsigned long long)vconst1);
-                    vdata5 = vec_ld(80, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata5, vdata5, vdata5, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v6 = vec_xor(v6, va6);
-                    va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6,
-                                                   (__vector unsigned long long)vconst1);
-                    vdata6 = vec_ld(96, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata6, vdata6, vdata6, vperm_const);
-                    GROUP_ENDING_NOP;
-
-                    v7 = vec_xor(v7, va7);
-                    va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7,
-                                                   (__vector unsigned long long)vconst1);
-                    vdata7 = vec_ld(112, (__vector unsigned long long*) p);
-                    VEC_PERM(vdata7, vdata7, vdata7, vperm_const);
-
-                    p = (char *)p + 128;
-                }
-
-                /* First cool down */
-                vconst1 = vec_ld(offset, vcrc_const);
-                offset += 16;
-
-                v0 = vec_xor(v0, va0);
-                va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v1 = vec_xor(v1, va1);
-                va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v2 = vec_xor(v2, va2);
-                va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata2,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v3 = vec_xor(v3, va3);
-                va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v4 = vec_xor(v4, va4);
-                va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v5 = vec_xor(v5, va5);
-                va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v6 = vec_xor(v6, va6);
-                va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6,
-                                               (__vector unsigned long long)vconst1);
-                GROUP_ENDING_NOP;
-
-                v7 = vec_xor(v7, va7);
-                va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7,
-                                               (__vector unsigned long long)vconst1);
-            }/* else */
-
-            /* Second cool down. */
-            v0 = vec_xor(v0, va0);
-            v1 = vec_xor(v1, va1);
-            v2 = vec_xor(v2, va2);
-            v3 = vec_xor(v3, va3);
-            v4 = vec_xor(v4, va4);
-            v5 = vec_xor(v5, va5);
-            v6 = vec_xor(v6, va6);
-            v7 = vec_xor(v7, va7);
-
-            /*
-             * vpmsumd produces a 96 bit result in the least significant bits
-             * of the register. Since we are bit reflected we have to shift it
-             * left 32 bits so it occupies the least significant bits in the
-             * bit reflected domain.
-             */
-            v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0,
-                                                      (__vector unsigned char)vzero, 4);
-            v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v1,
-                                                      (__vector unsigned char)vzero, 4);
-            v2 = (__vector unsigned long long)vec_sld((__vector unsigned char)v2,
-                                                      (__vector unsigned char)vzero, 4);
-            v3 = (__vector unsigned long long)vec_sld((__vector unsigned char)v3,
-                                                      (__vector unsigned char)vzero, 4);
-            v4 = (__vector unsigned long long)vec_sld((__vector unsigned char)v4,
-                                                      (__vector unsigned char)vzero, 4);
-            v5 = (__vector unsigned long long)vec_sld((__vector unsigned char)v5,
-                                                      (__vector unsigned char)vzero, 4);
-            v6 = (__vector unsigned long long)vec_sld((__vector unsigned char)v6,
-                                                      (__vector unsigned char)vzero, 4);
-            v7 = (__vector unsigned long long)vec_sld((__vector unsigned char)v7,
-                                                      (__vector unsigned char)vzero, 4);
-
-            /* xor with the last 1024 bits. */
-            va0 = vec_ld(0, (__vector unsigned long long*) p);
-            VEC_PERM(va0, va0, va0, vperm_const);
-
-            va1 = vec_ld(16, (__vector unsigned long long*) p);
-            VEC_PERM(va1, va1, va1, vperm_const);
-
-            va2 = vec_ld(32, (__vector unsigned long long*) p);
-            VEC_PERM(va2, va2, va2, vperm_const);
-
-            va3 = vec_ld(48, (__vector unsigned long long*) p);
-            VEC_PERM(va3, va3, va3, vperm_const);
-
-            va4 = vec_ld(64, (__vector unsigned long long*) p);
-            VEC_PERM(va4, va4, va4, vperm_const);
-
-            va5 = vec_ld(80, (__vector unsigned long long*) p);
-            VEC_PERM(va5, va5, va5, vperm_const);
-
-            va6 = vec_ld(96, (__vector unsigned long long*) p);
-            VEC_PERM(va6, va6, va6, vperm_const);
-
-            va7 = vec_ld(112, (__vector unsigned long long*) p);
-            VEC_PERM(va7, va7, va7, vperm_const);
-
-            p = (char *)p + 128;
-
-            vdata0 = vec_xor(v0, va0);
-            vdata1 = vec_xor(v1, va1);
-            vdata2 = vec_xor(v2, va2);
-            vdata3 = vec_xor(v3, va3);
-            vdata4 = vec_xor(v4, va4);
-            vdata5 = vec_xor(v5, va5);
-            vdata6 = vec_xor(v6, va6);
-            vdata7 = vec_xor(v7, va7);
-
-            /* Check if we have more blocks to process */
-            next_block = 0;
-            if (length != 0) {
-                next_block = 1;
-
-                /* zero v0-v7 */
-                v0 = vec_xor(v0, v0);
-                v1 = vec_xor(v1, v1);
-                v2 = vec_xor(v2, v2);
-                v3 = vec_xor(v3, v3);
-                v4 = vec_xor(v4, v4);
-                v5 = vec_xor(v5, v5);
-                v6 = vec_xor(v6, v6);
-                v7 = vec_xor(v7, v7);
-            }
-            length = length + 128;
-
-        } while (next_block);
-
-        /* Calculate how many bytes we have left. */
-        length = (len & 127);
-
-        /* Calculate where in (short) constant table we need to start. */
-        offset = 128 - length;
-
-        v0 = vec_ld(offset, vcrc_short_const);
-        v1 = vec_ld(offset + 16, vcrc_short_const);
-        v2 = vec_ld(offset + 32, vcrc_short_const);
-        v3 = vec_ld(offset + 48, vcrc_short_const);
-        v4 = vec_ld(offset + 64, vcrc_short_const);
-        v5 = vec_ld(offset + 80, vcrc_short_const);
-        v6 = vec_ld(offset + 96, vcrc_short_const);
-        v7 = vec_ld(offset + 112, vcrc_short_const);
-
-        offset += 128;
-
-        v0 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata0, (__vector unsigned int)v0);
-        v1 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata1, (__vector unsigned int)v1);
-        v2 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata2, (__vector unsigned int)v2);
-        v3 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata3, (__vector unsigned int)v3);
-        v4 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata4, (__vector unsigned int)v4);
-        v5 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata5, (__vector unsigned int)v5);
-        v6 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata6, (__vector unsigned int)v6);
-        v7 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-            (__vector unsigned int)vdata7, (__vector unsigned int)v7);
-
-        /* Now reduce the tail (0-112 bytes). */
-        for (i = 0; i < length; i+=16) {
-            vdata0 = vec_ld(i,(__vector unsigned long long*)p);
-            VEC_PERM(vdata0, vdata0, vdata0, vperm_const);
-            va0 = vec_ld(offset + i,vcrc_short_const);
-            va0 = (__vector unsigned long long)__builtin_crypto_vpmsumw(
-                (__vector unsigned int)vdata0, (__vector unsigned int)va0);
-            v0 = vec_xor(v0, va0);
-        }
-
-        /* xor all parallel chunks together. */
-        v0 = vec_xor(v0, v1);
-        v2 = vec_xor(v2, v3);
-        v4 = vec_xor(v4, v5);
-        v6 = vec_xor(v6, v7);
-
-        v0 = vec_xor(v0, v2);
-        v4 = vec_xor(v4, v6);
-
-        v0 = vec_xor(v0, v4);
-    }
-
-    /* Barrett Reduction */
-    vconst1 = vec_ld(0, v_Barrett_const);
-    vconst2 = vec_ld(16, v_Barrett_const);
-
-    v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0,
-                                              (__vector unsigned char)v0, 8);
-    v0 = vec_xor(v1,v0);
-
-    /* shift left one bit */
-    __vector unsigned char vsht_splat = vec_splat_u8 (1);
-    v0 = (__vector unsigned long long)vec_sll((__vector unsigned char)v0, vsht_splat);
-
-    v0 = vec_and(v0, vmask_64bit);
-
-    /*
-     * The reflected version of Barrett reduction. Instead of bit
-     * reflecting our data (which is expensive to do), we bit reflect our
-     * constants and our algorithm, which means the intermediate data in
-     * our vector registers goes from 0-63 instead of 63-0. We can reflect
-     * the algorithm because we don't carry in mod 2 arithmetic.
-     */
-
-    /* bottom 32 bits of a */
-    v1 = vec_and(v0, vmask_32bit);
-
-    /* ma */
-    v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v1,
-                                  (__vector unsigned long long)vconst1);
-
-    /* bottom 32bits of ma */
-    v1 = vec_and(v1, vmask_32bit);
-    /* qn */
-    v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v1,
-                                  (__vector unsigned long long)vconst2);
-    /* a - qn, subtraction is xor in GF(2) */
-    v0 = vec_xor (v0, v1);
-
-    /*
-     * Since we are bit reflected, the result (ie the low 32 bits) is in
-     * the high 32 bits. We just need to shift it left 4 bytes
-     * V0 [ 0 1 X 3 ]
-     * V0 [ 0 X 2 3 ]
-     */
-
-    /* shift result into top 64 bits of */
-    v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0,
-                                              (__vector unsigned char)vzero, 4);
-
-#if BYTE_ORDER == BIG_ENDIAN
-    return v0[0];
-#else
-    return v0[1];
-#endif
-}

crates/libz-sys/src/zlib-ng/arch/power/fallback_builtins.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/fallback_builtins.h b/crates/libz-sys/src/zlib-ng/arch/power/fallback_builtins.h
deleted file mode 100644
index ed95846..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/fallback_builtins.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Helper functions to work around issues with clang builtins
- * Copyright (C) 2021 IBM Corporation
- *
- * Authors:
- *   Daniel Black <daniel@linux.vnet.ibm.com>
- *   Rogerio Alves <rogealve@br.ibm.com>
- *   Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef POWER_BUILTINS_H
-#define POWER_BUILTINS_H
-
-/*
- * These stubs fix clang incompatibilities with GCC builtins.
- */
-
-#ifndef __builtin_crypto_vpmsumw
-#define __builtin_crypto_vpmsumw __builtin_crypto_vpmsumb
-#endif
-#ifndef __builtin_crypto_vpmsumd
-#define __builtin_crypto_vpmsumd __builtin_crypto_vpmsumb
-#endif
-
-static inline __vector unsigned long long __attribute__((overloadable))
-vec_ld(int __a, const __vector unsigned long long* __b) {
-    return (__vector unsigned long long)__builtin_altivec_lvx(__a, __b);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/power/power_features.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/power_features.c b/crates/libz-sys/src/zlib-ng/arch/power/power_features.c
deleted file mode 100644
index 7c0350c..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/power_features.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* power_features.c - POWER feature check
- * Copyright (C) 2020 Matheus Castanho <msc@linux.ibm.com>, IBM
- * Copyright (C) 2021-2022 Mika T. Lindqvist <postmaster@raasu.org>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef HAVE_SYS_AUXV_H
-#  include <sys/auxv.h>
-#endif
-#include "../../zbuild.h"
-#include "power_features.h"
-
-Z_INTERNAL int power_cpu_has_altivec = 0;
-Z_INTERNAL int power_cpu_has_arch_2_07 = 0;
-Z_INTERNAL int power_cpu_has_arch_3_00 = 0;
-
-void Z_INTERNAL power_check_features(void) {
-#ifdef PPC_FEATURES
-    unsigned long hwcap;
-    hwcap = getauxval(AT_HWCAP);
-
-    if (hwcap & PPC_FEATURE_HAS_ALTIVEC)
-        power_cpu_has_altivec = 1;
-#endif
-
-#ifdef POWER_FEATURES
-    unsigned long hwcap2;
-    hwcap2 = getauxval(AT_HWCAP2);
-
-    if (hwcap2 & PPC_FEATURE2_ARCH_2_07)
-        power_cpu_has_arch_2_07 = 1;
-    if (hwcap2 & PPC_FEATURE2_ARCH_3_00)
-        power_cpu_has_arch_3_00 = 1;
-#endif
-}

crates/libz-sys/src/zlib-ng/arch/power/power_features.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/power_features.h b/crates/libz-sys/src/zlib-ng/arch/power/power_features.h
deleted file mode 100644
index 8df9f9e..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/power_features.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* power_features.h -- check for POWER CPU features
- * Copyright (C) 2020 Matheus Castanho <msc@linux.ibm.com>, IBM
- * Copyright (C) 2021 Mika T. Lindqvist <postmaster@raasu.org>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef POWER_H_
-#define POWER_H_
-
-extern int power_cpu_has_altivec;
-extern int power_cpu_has_arch_2_07;
-extern int power_cpu_has_arch_3_00;
-
-void Z_INTERNAL power_check_features(void);
-
-#endif /* POWER_H_ */

crates/libz-sys/src/zlib-ng/arch/power/slide_hash_power8.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_power8.c b/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_power8.c
deleted file mode 100644
index 5b078ec..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_power8.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Optimized slide_hash for POWER processors
- * Copyright (C) 2019-2020 IBM Corporation
- * Author: Matheus Castanho <msc@linux.ibm.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef POWER8_VSX_SLIDEHASH
-
-#define SLIDE_PPC slide_hash_power8
-#include "slide_ppc_tpl.h"
-
-#endif /* POWER8_VSX_SLIDEHASH */

crates/libz-sys/src/zlib-ng/arch/power/slide_hash_vmx.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_vmx.c b/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_vmx.c
deleted file mode 100644
index cf9bd7b..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/slide_hash_vmx.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Optimized slide_hash for PowerPC processors with VMX instructions
- * Copyright (C) 2017-2021 Mika T. Lindqvist <postmaster@raasu.org>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#ifdef PPC_VMX_SLIDEHASH
-
-#define SLIDE_PPC slide_hash_vmx
-#include "slide_ppc_tpl.h"
-
-#endif /* PPC_VMX_SLIDEHASH */

crates/libz-sys/src/zlib-ng/arch/power/slide_ppc_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/power/slide_ppc_tpl.h b/crates/libz-sys/src/zlib-ng/arch/power/slide_ppc_tpl.h
deleted file mode 100644
index 5c17e38..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/power/slide_ppc_tpl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Optimized slide_hash for PowerPC processors
- * Copyright (C) 2017-2021 Mika T. Lindqvist <postmaster@raasu.org>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <altivec.h>
-#include "zbuild.h"
-#include "deflate.h"
-
-static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {
-    const vector unsigned short vmx_wsize = vec_splats(wsize);
-    Pos *p = table;
-
-    do {
-        vector unsigned short value, result;
-
-        value = vec_ld(0, p);
-        result = vec_subs(value, vmx_wsize);
-        vec_st(result, 0, p);
-
-        p += 8;
-        entries -= 8;
-   } while (entries > 0);
-}
-
-void Z_INTERNAL SLIDE_PPC(deflate_state *s) {
-    uint16_t wsize = s->w_size;
-
-    slide_hash_chain(s->head, HASH_SIZE, wsize);
-    slide_hash_chain(s->prev, wsize, wsize);
-}

crates/libz-sys/src/zlib-ng/arch/s390/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/Makefile.in b/crates/libz-sys/src/zlib-ng/arch/s390/Makefile.in
deleted file mode 100644
index 39b5aae..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# Makefile for zlib-ng
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-CC=
-CFLAGS=
-SFLAGS=
-INCLUDES=
-SUFFIX=
-VGFMAFLAG=
-NOLTOFLAG=
-
-SRCDIR=.
-SRCTOP=../..
-TOPDIR=$(SRCTOP)
-
-s390_features.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390_features.c
-
-s390_features.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390_features.c
-
-dfltcc_common.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_common.c
-
-dfltcc_common.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_common.c
-
-dfltcc_deflate.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_deflate.c
-
-dfltcc_deflate.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_deflate.c
-
-dfltcc_inflate.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_inflate.c
-
-dfltcc_inflate.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_inflate.c
-
-crc32-vx.o:
-	$(CC) $(CFLAGS) $(VGFMAFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32-vx.c
-
-crc32-vx.lo:
-	$(CC) $(SFLAGS) $(VGFMAFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32-vx.c
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-
-distclean:
-	rm -f Makefile

crates/libz-sys/src/zlib-ng/arch/s390/README.md

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/README.md b/crates/libz-sys/src/zlib-ng/arch/s390/README.md
deleted file mode 100644
index 18a7ca8..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/README.md
+++ /dev/null
@@ -1,284 +0,0 @@
-# Introduction
-
-This directory contains SystemZ deflate hardware acceleration support.
-It can be enabled using the following build commands:
-
-    $ ./configure --with-dfltcc-deflate --with-dfltcc-inflate
-    $ make
-
-or
-
-    $ cmake -DWITH_DFLTCC_DEFLATE=1 -DWITH_DFLTCC_INFLATE=1 .
-    $ make
-
-When built like this, zlib-ng would compress using hardware on level 1,
-and using software on all other levels. Decompression will always happen
-in hardware. In order to enable hardware compression for levels 1-6
-(i.e. to make it used by default) one could add
-`-DDFLTCC_LEVEL_MASK=0x7e` to CFLAGS when building zlib-ng.
-
-SystemZ deflate hardware acceleration is available on [IBM z15](
-https://www.ibm.com/products/z15) and newer machines under the name [
-"Integrated Accelerator for zEnterprise Data Compression"](
-https://www.ibm.com/support/z-content-solutions/compression/). The
-programming interface to it is a machine instruction called DEFLATE
-CONVERSION CALL (DFLTCC). It is documented in Chapter 26 of [Principles
-of Operation](https://publibfp.dhe.ibm.com/epubs/pdf/a227832c.pdf). Both
-the code and the rest of this document refer to this feature simply as
-"DFLTCC".
-
-# Performance
-
-Performance figures are published [here](
-https://github.com/iii-i/zlib-ng/wiki/Performance-with-dfltcc-patch-applied-and-dfltcc-support-built-on-dfltcc-enabled-machine
-). The compression speed-up can be as high as 110x and the decompression
-speed-up can be as high as 15x.
-
-# Limitations
-
-Two DFLTCC compression calls with identical inputs are not guaranteed to
-produce identical outputs. Therefore care should be taken when using
-hardware compression when reproducible results are desired. In
-particular, zlib-ng-specific `zng_deflateSetParams` call allows setting
-`Z_DEFLATE_REPRODUCIBLE` parameter, which disables DFLTCC support for a
-particular stream.
-
-DFLTCC does not support every single zlib-ng feature, in particular:
-
-* `inflate(Z_BLOCK)` and `inflate(Z_TREES)`
-* `inflateMark()`
-* `inflatePrime()`
-* `inflateSyncPoint()`
-
-When used, these functions will either switch to software, or, in case
-this is not possible, gracefully fail.
-
-# Code structure
-
-All SystemZ-specific code lives in `arch/s390` directory and is
-integrated with the rest of zlib-ng using hook macros.
-
-## Hook macros
-
-DFLTCC takes as arguments a parameter block, an input buffer, an output
-buffer and a window. `ZALLOC_DEFLATE_STATE()`, `ZALLOC_INFLATE_STATE()`,
-`ZFREE_STATE()`, `ZCOPY_DEFLATE_STATE()`, `ZCOPY_INFLATE_STATE()`,
-`ZALLOC_WINDOW()` and `TRY_FREE_WINDOW()` macros encapsulate allocation
-details for the parameter block (which is allocated alongside zlib-ng
-state) and the window (which must be page-aligned).
-
-While inflate software and hardware window formats match, this is not
-the case for deflate. Therefore, `deflateSetDictionary()` and
-`deflateGetDictionary()` need special handling, which is triggered using
-`DEFLATE_SET_DICTIONARY_HOOK()` and `DEFLATE_GET_DICTIONARY_HOOK()`
-macros.
-
-`deflateResetKeep()` and `inflateResetKeep()` update the DFLTCC
-parameter block using `DEFLATE_RESET_KEEP_HOOK()` and
-`INFLATE_RESET_KEEP_HOOK()` macros.
-
-`INFLATE_PRIME_HOOK()`, `INFLATE_MARK_HOOK()` and
-`INFLATE_SYNC_POINT_HOOK()` macros make the respective unsupported
-calls gracefully fail.
-
-`DEFLATE_PARAMS_HOOK()` implements switching between hardware and
-software compression mid-stream using `deflateParams()`. Switching
-normally entails flushing the current block, which might not be possible
-in low memory situations. `deflateParams()` uses `DEFLATE_DONE()` hook
-in order to detect and gracefully handle such situations.
-
-The algorithm implemented in hardware has different compression ratio
-than the one implemented in software. `DEFLATE_BOUND_ADJUST_COMPLEN()`
-and `DEFLATE_NEED_CONSERVATIVE_BOUND()` macros make `deflateBound()`
-return the correct results for the hardware implementation.
-
-Actual compression and decompression are handled by `DEFLATE_HOOK()` and
-`INFLATE_TYPEDO_HOOK()` macros. Since inflation with DFLTCC manages the
-window on its own, calling `updatewindow()` is suppressed using
-`INFLATE_NEED_UPDATEWINDOW()` macro.
-
-In addition to compression, DFLTCC computes CRC-32 and Adler-32
-checksums, therefore, whenever it's used, software checksumming is
-suppressed using `DEFLATE_NEED_CHECKSUM()` and `INFLATE_NEED_CHECKSUM()`
-macros.
-
-While software always produces reproducible compression results, this
-is not the case for DFLTCC. Therefore, zlib-ng users are given the
-ability to specify whether or not reproducible compression results
-are required. While it is always possible to specify this setting
-before the compression begins, it is not always possible to do so in
-the middle of a deflate stream - the exact conditions for that are
-determined by `DEFLATE_CAN_SET_REPRODUCIBLE()` macro.
-
-## SystemZ-specific code
-
-When zlib-ng is built with DFLTCC, the hooks described above are
-converted to calls to functions, which are implemented in
-`arch/s390/dfltcc_*` files. The functions can be grouped in three broad
-categories:
-
-* Base DFLTCC support, e.g. wrapping the machine instruction -
-  `dfltcc()` and allocating aligned memory - `dfltcc_alloc_state()`.
-* Translating between software and hardware data formats, e.g.
-  `dfltcc_deflate_set_dictionary()`.
-* Translating between software and hardware state machines, e.g.
-  `dfltcc_deflate()` and `dfltcc_inflate()`.
-
-The functions from the first two categories are fairly simple, however,
-various quirks in both software and hardware state machines make the
-functions from the third category quite complicated.
-
-### `dfltcc_deflate()` function
-
-This function is called by `deflate()` and has the following
-responsibilities:
-
-* Checking whether DFLTCC can be used with the current stream. If this
-  is not the case, then it returns `0`, making `deflate()` use some
-  other function in order to compress in software. Otherwise it returns
-  `1`.
-* Block management and Huffman table generation. DFLTCC ends blocks only
-  when explicitly instructed to do so by the software. Furthermore,
-  whether to use fixed or dynamic Huffman tables must also be determined
-  by the software. Since looking at data in order to gather statistics
-  would negate performance benefits, the following approach is used: the
-  first `DFLTCC_FIRST_FHT_BLOCK_SIZE` bytes are placed into a fixed
-  block, and every next `DFLTCC_BLOCK_SIZE` bytes are placed into
-  dynamic blocks.
-* Writing EOBS. Block Closing Control bit in the parameter block
-  instructs DFLTCC to write EOBS, however, certain conditions need to be
-  met: input data length must be non-zero or Continuation Flag must be
-  set. To put this in simpler terms, DFLTCC will silently refuse to
-  write EOBS if this is the only thing that it is asked to do. Since the
-  code has to be able to emit EOBS in software anyway, in order to avoid
-  tricky corner cases Block Closing Control is never used. Whether to
-  write EOBS is instead controlled by `soft_bcc` variable.
-* Triggering block post-processing. Depending on flush mode, `deflate()`
-  must perform various additional actions when a block or a stream ends.
-  `dfltcc_deflate()` informs `deflate()` about this using
-  `block_state *result` parameter.
-* Converting software state fields into hardware parameter block fields,
-  and vice versa. For example, `wrap` and Check Value Type or `bi_valid`
-  and Sub-Byte Boundary. Certain fields cannot be translated and must
-  persist untouched in the parameter block between calls, for example,
-  Continuation Flag or Continuation State Buffer.
-* Handling flush modes and low-memory situations. These aspects are
-  quite intertwined and pervasive. The general idea here is that the
-  code must not do anything in software - whether explicitly by e.g.
-  calling `send_eobs()`, or implicitly - by returning to `deflate()`
-  with certain return and `*result` values, when Continuation Flag is
-  set.
-* Ending streams. When a new block is started and flush mode is
-  `Z_FINISH`, Block Header Final parameter block bit is used to mark
-  this block as final. However, sometimes an empty final block is
-  needed, and, unfortunately, just like with EOBS, DFLTCC will silently
-  refuse to do this. The general idea of DFLTCC implementation is to
-  rely as much as possible on the existing code. Here in order to do
-  this, the code pretends that it does not support DFLTCC, which makes
-  `deflate()` call a software compression function, which writes an
-  empty final block. Whether this is required is controlled by
-  `need_empty_block` variable.
-* Error handling. This is simply converting
-  Operation-Ending-Supplemental Code to string. Errors can only happen
-  due to things like memory corruption, and therefore they don't affect
-  the `deflate()` return code.
-
-### `dfltcc_inflate()` function
-
-This function is called by `inflate()` from the `TYPEDO` state (that is,
-when all the metadata is parsed and the stream is positioned at the type
-bits of deflate block header) and it's responsible for the following:
-
-* Falling back to software when flush mode is `Z_BLOCK` or `Z_TREES`.
-  Unfortunately, there is no way to ask DFLTCC to stop decompressing on
-  block or tree boundary.
-* `inflate()` decompression loop management. This is controlled using
-  the return value, which can be either `DFLTCC_INFLATE_BREAK` or
-  `DFLTCC_INFLATE_CONTINUE`.
-* Converting software state fields into hardware parameter block fields,
-  and vice versa. For example, `whave` and History Length or `wnext` and
-  History Offset.
-* Ending streams. This instructs `inflate()` to return `Z_STREAM_END`
-  and is controlled by `last` state field.
-* Error handling. Like deflate, error handling comprises
-  Operation-Ending-Supplemental Code to string conversion. Unlike
-  deflate, errors may happen due to bad inputs, therefore they are
-  propagated to `inflate()` by setting `mode` field to `MEM` or `BAD`.
-
-# Testing
-
-Given complexity of DFLTCC machine instruction, it is not clear whether
-QEMU TCG will ever support it. At the time of writing, one has to have
-access to an IBM z15+ VM or LPAR in order to test DFLTCC support. Since
-DFLTCC is a non-privileged instruction, neither special VM/LPAR
-configuration nor root are required.
-
-zlib-ng CI uses an IBM-provided z15 self-hosted builder for the DFLTCC
-testing. There are no IBM Z builds of GitHub Actions runner, and
-stable qemu-user has problems with .NET apps, so the builder runs the
-x86_64 runner version with qemu-user built from the master branch.
-
-## Configuring the builder.
-
-### Install prerequisites.
-
-```
-$ sudo dnf install docker
-```
-
-### Add services.
-
-```
-$ sudo cp self-hosted-builder/*.service /etc/systemd/system/
-$ sudo systemctl daemon-reload
-```
-
-### Create a config file.
-
-```
-$ sudo tee /etc/actions-runner
-repo=<owner>/<name>
-access_token=<ghp_***>
-```
-
-Access token should have the repo scope, consult
-https://docs.github.com/en/rest/reference/actions#create-a-registration-token-for-a-repository
-for details.
-
-### Autostart the x86_64 emulation support.
-
-```
-$ sudo systemctl enable --now qemu-user-static
-```
-
-### Autostart the runner.
-
-```
-$ sudo systemctl enable --now actions-runner
-```
-
-## Rebuilding the image
-
-In order to update the `iiilinuxibmcom/actions-runner` image, e.g. to get the
-latest OS security fixes, use the following commands:
-
-```
-$ sudo docker build \
-      --pull \
-      -f self-hosted-builder/actions-runner.Dockerfile \
-      -t iiilinuxibmcom/actions-runner
-$ sudo systemctl restart actions-runner
-```
-
-## Removing persistent data
-
-The `actions-runner` service stores various temporary data, such as runner
-registration information, work directories and logs, in the `actions-runner`
-volume. In order to remove it and start from scratch, e.g. when switching the
-runner to a different repository, use the following commands:
-
-```
-$ sudo systemctl stop actions-runner
-$ sudo docker rm -f actions-runner
-$ sudo docker volume rm actions-runner
-```

crates/libz-sys/src/zlib-ng/arch/s390/crc32-vx.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/crc32-vx.c b/crates/libz-sys/src/zlib-ng/arch/s390/crc32-vx.c
deleted file mode 100644
index d0df83c..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/crc32-vx.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Hardware-accelerated CRC-32 variants for Linux on z Systems
- *
- * Use the z/Architecture Vector Extension Facility to accelerate the
- * computing of bitreflected CRC-32 checksums.
- *
- * This CRC-32 implementation algorithm is bitreflected and processes
- * the least-significant bit first (Little-Endian).
- *
- * This code was originally written by Hendrik Brueckner
- * <brueckner@linux.vnet.ibm.com> for use in the Linux kernel and has been
- * relicensed under the zlib license.
- */
-
-#include "../../zbuild.h"
-#include "crc32_braid_p.h"
-
-#include <vecintrin.h>
-
-typedef unsigned char uv16qi __attribute__((vector_size(16)));
-typedef unsigned int uv4si __attribute__((vector_size(16)));
-typedef unsigned long long uv2di __attribute__((vector_size(16)));
-
-static uint32_t crc32_le_vgfm_16(uint32_t crc, const unsigned char *buf, size_t len) {
-    /*
-     * The CRC-32 constant block contains reduction constants to fold and
-     * process particular chunks of the input data stream in parallel.
-     *
-     * For the CRC-32 variants, the constants are precomputed according to
-     * these definitions:
-     *
-     *      R1 = [(x4*128+32 mod P'(x) << 32)]' << 1
-     *      R2 = [(x4*128-32 mod P'(x) << 32)]' << 1
-     *      R3 = [(x128+32 mod P'(x) << 32)]'   << 1
-     *      R4 = [(x128-32 mod P'(x) << 32)]'   << 1
-     *      R5 = [(x64 mod P'(x) << 32)]'       << 1
-     *      R6 = [(x32 mod P'(x) << 32)]'       << 1
-     *
-     *      The bitreflected Barret reduction constant, u', is defined as
-     *      the bit reversal of floor(x**64 / P(x)).
-     *
-     *      where P(x) is the polynomial in the normal domain and the P'(x) is the
-     *      polynomial in the reversed (bitreflected) domain.
-     *
-     * CRC-32 (IEEE 802.3 Ethernet, ...) polynomials:
-     *
-     *      P(x)  = 0x04C11DB7
-     *      P'(x) = 0xEDB88320
-     */
-    const uv16qi perm_le2be = {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};  /* BE->LE mask */
-    const uv2di r2r1 = {0x1C6E41596, 0x154442BD4};                                     /* R2, R1 */
-    const uv2di r4r3 = {0x0CCAA009E, 0x1751997D0};                                     /* R4, R3 */
-    const uv2di r5 = {0, 0x163CD6124};                                                 /* R5 */
-    const uv2di ru_poly = {0, 0x1F7011641};                                            /* u' */
-    const uv2di crc_poly = {0, 0x1DB710641};                                           /* P'(x) << 1 */
-
-    /*
-     * Load the initial CRC value.
-     *
-     * The CRC value is loaded into the rightmost word of the
-     * vector register and is later XORed with the LSB portion
-     * of the loaded input data.
-     */
-    uv2di v0 = {0, 0};
-    v0 = (uv2di)vec_insert(crc, (uv4si)v0, 3);
-
-    /* Load a 64-byte data chunk and XOR with CRC */
-    uv2di v1 = vec_perm(((uv2di *)buf)[0], ((uv2di *)buf)[0], perm_le2be);
-    uv2di v2 = vec_perm(((uv2di *)buf)[1], ((uv2di *)buf)[1], perm_le2be);
-    uv2di v3 = vec_perm(((uv2di *)buf)[2], ((uv2di *)buf)[2], perm_le2be);
-    uv2di v4 = vec_perm(((uv2di *)buf)[3], ((uv2di *)buf)[3], perm_le2be);
-
-    v1 ^= v0;
-    buf += 64;
-    len -= 64;
-
-    while (len >= 64) {
-        /* Load the next 64-byte data chunk */
-        uv16qi part1 = vec_perm(((uv16qi *)buf)[0], ((uv16qi *)buf)[0], perm_le2be);
-        uv16qi part2 = vec_perm(((uv16qi *)buf)[1], ((uv16qi *)buf)[1], perm_le2be);
-        uv16qi part3 = vec_perm(((uv16qi *)buf)[2], ((uv16qi *)buf)[2], perm_le2be);
-        uv16qi part4 = vec_perm(((uv16qi *)buf)[3], ((uv16qi *)buf)[3], perm_le2be);
-
-        /*
-         * Perform a GF(2) multiplication of the doublewords in V1 with
-         * the R1 and R2 reduction constants in V0.  The intermediate result
-         * is then folded (accumulated) with the next data chunk in PART1 and
-         * stored in V1. Repeat this step for the register contents
-         * in V2, V3, and V4 respectively.
-         */
-        v1 = (uv2di)vec_gfmsum_accum_128(r2r1, v1, part1);
-        v2 = (uv2di)vec_gfmsum_accum_128(r2r1, v2, part2);
-        v3 = (uv2di)vec_gfmsum_accum_128(r2r1, v3, part3);
-        v4 = (uv2di)vec_gfmsum_accum_128(r2r1, v4, part4);
-
-        buf += 64;
-        len -= 64;
-    }
-
-    /*
-     * Fold V1 to V4 into a single 128-bit value in V1.  Multiply V1 with R3
-     * and R4 and accumulating the next 128-bit chunk until a single 128-bit
-     * value remains.
-     */
-    v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v2);
-    v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v3);
-    v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v4);
-
-    while (len >= 16) {
-        /* Load next data chunk */
-        v2 = vec_perm(*(uv2di *)buf, *(uv2di *)buf, perm_le2be);
-
-        /* Fold next data chunk */
-        v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v2);
-
-        buf += 16;
-        len -= 16;
-    }
-
-    /*
-     * Set up a vector register for byte shifts.  The shift value must
-     * be loaded in bits 1-4 in byte element 7 of a vector register.
-     * Shift by 8 bytes: 0x40
-     * Shift by 4 bytes: 0x20
-     */
-    uv16qi v9 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    v9 = vec_insert((unsigned char)0x40, v9, 7);
-
-    /*
-     * Prepare V0 for the next GF(2) multiplication: shift V0 by 8 bytes
-     * to move R4 into the rightmost doubleword and set the leftmost
-     * doubleword to 0x1.
-     */
-    v0 = vec_srb(r4r3, (uv2di)v9);
-    v0[0] = 1;
-
-    /*
-     * Compute GF(2) product of V1 and V0.  The rightmost doubleword
-     * of V1 is multiplied with R4.  The leftmost doubleword of V1 is
-     * multiplied by 0x1 and is then XORed with rightmost product.
-     * Implicitly, the intermediate leftmost product becomes padded
-     */
-    v1 = (uv2di)vec_gfmsum_128(v0, v1);
-
-    /*
-     * Now do the final 32-bit fold by multiplying the rightmost word
-     * in V1 with R5 and XOR the result with the remaining bits in V1.
-     *
-     * To achieve this by a single VGFMAG, right shift V1 by a word
-     * and store the result in V2 which is then accumulated.  Use the
-     * vector unpack instruction to load the rightmost half of the
-     * doubleword into the rightmost doubleword element of V1; the other
-     * half is loaded in the leftmost doubleword.
-     * The vector register with CONST_R5 contains the R5 constant in the
-     * rightmost doubleword and the leftmost doubleword is zero to ignore
-     * the leftmost product of V1.
-     */
-    v9 = vec_insert((unsigned char)0x20, v9, 7);
-    v2 = vec_srb(v1, (uv2di)v9);
-    v1 = vec_unpackl((uv4si)v1);  /* Split rightmost doubleword */
-    v1 = (uv2di)vec_gfmsum_accum_128(r5, v1, (uv16qi)v2);
-
-    /*
-     * Apply a Barret reduction to compute the final 32-bit CRC value.
-     *
-     * The input values to the Barret reduction are the degree-63 polynomial
-     * in V1 (R(x)), degree-32 generator polynomial, and the reduction
-     * constant u.  The Barret reduction result is the CRC value of R(x) mod
-     * P(x).
-     *
-     * The Barret reduction algorithm is defined as:
-     *
-     *    1. T1(x) = floor( R(x) / x^32 ) GF2MUL u
-     *    2. T2(x) = floor( T1(x) / x^32 ) GF2MUL P(x)
-     *    3. C(x)  = R(x) XOR T2(x) mod x^32
-     *
-     *  Note: The leftmost doubleword of vector register containing
-     *  CONST_RU_POLY is zero and, thus, the intermediate GF(2) product
-     *  is zero and does not contribute to the final result.
-     */
-
-    /* T1(x) = floor( R(x) / x^32 ) GF2MUL u */
-    v2 = vec_unpackl((uv4si)v1);
-    v2 = (uv2di)vec_gfmsum_128(ru_poly, v2);
-
-    /*
-     * Compute the GF(2) product of the CRC polynomial with T1(x) in
-     * V2 and XOR the intermediate result, T2(x), with the value in V1.
-     * The final result is stored in word element 2 of V2.
-     */
-    v2 = vec_unpackl((uv4si)v2);
-    v2 = (uv2di)vec_gfmsum_accum_128(crc_poly, v2, (uv16qi)v1);
-
-    return ((uv4si)v2)[2];
-}
-
-#define VX_MIN_LEN 64
-#define VX_ALIGNMENT 16L
-#define VX_ALIGN_MASK (VX_ALIGNMENT - 1)
-
-uint32_t Z_INTERNAL PREFIX(s390_crc32_vx)(uint32_t crc, const unsigned char *buf, uint64_t len) {
-    uint64_t prealign, aligned, remaining;
-
-    if (len < VX_MIN_LEN + VX_ALIGN_MASK)
-        return crc32_braid(crc, buf, len);
-
-    if ((uintptr_t)buf & VX_ALIGN_MASK) {
-        prealign = VX_ALIGNMENT - ((uintptr_t)buf & VX_ALIGN_MASK);
-        len -= prealign;
-        crc = crc32_braid(crc, buf, prealign);
-        buf += prealign;
-    }
-    aligned = len & ~VX_ALIGN_MASK;
-    remaining = len & VX_ALIGN_MASK;
-
-    crc = crc32_le_vgfm_16(crc ^ 0xffffffff, buf, (size_t)aligned) ^ 0xffffffff;
-
-    if (remaining)
-        crc = crc32_braid(crc, buf + aligned, remaining);
-
-    return crc;
-}

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.c b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.c
deleted file mode 100644
index 2937d8d..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* dfltcc_deflate.c - IBM Z DEFLATE CONVERSION CALL general support. */
-
-#include "zbuild.h"
-#include "dfltcc_common.h"
-#include "dfltcc_detail.h"
-
-/*
-   Memory management.
-
-   DFLTCC requires parameter blocks and window to be aligned. zlib-ng allows
-   users to specify their own allocation functions, so using e.g.
-   `posix_memalign' is not an option. Thus, we overallocate and take the
-   aligned portion of the buffer.
-*/
-
-static const int PAGE_ALIGN = 0x1000;
-
-void Z_INTERNAL *PREFIX(dfltcc_alloc_window)(PREFIX3(streamp) strm, uInt items, uInt size) {
-    void *p;
-    void *w;
-
-    /* To simplify freeing, we store the pointer to the allocated buffer right
-     * before the window.
-     */
-    p = ZALLOC(strm, sizeof(void *) + items * size + PAGE_ALIGN, sizeof(unsigned char));
-    if (p == NULL)
-        return NULL;
-    w = ALIGN_UP((char *)p + sizeof(void *), PAGE_ALIGN);
-    *(void **)((char *)w - sizeof(void *)) = p;
-    return w;
-}
-
-void Z_INTERNAL PREFIX(dfltcc_free_window)(PREFIX3(streamp) strm, void *w) {
-    if (w)
-        ZFREE(strm, *(void **)((unsigned char *)w - sizeof(void *)));
-}

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.h b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.h
deleted file mode 100644
index 4f48bd9..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_common.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef DFLTCC_COMMON_H
-#define DFLTCC_COMMON_H
-
-#include "zutil.h"
-
-void Z_INTERNAL *PREFIX(dfltcc_alloc_window)(PREFIX3(streamp) strm, uInt items, uInt size);
-void Z_INTERNAL PREFIX(dfltcc_free_window)(PREFIX3(streamp) strm, void *w);
-
-#define ZFREE_STATE ZFREE
-
-#define ZALLOC_WINDOW PREFIX(dfltcc_alloc_window)
-
-#define ZFREE_WINDOW PREFIX(dfltcc_free_window)
-
-#define TRY_FREE_WINDOW PREFIX(dfltcc_free_window)
-
-#define DFLTCC_BLOCK_HEADER_BITS 3
-#define DFLTCC_HLITS_COUNT_BITS 5
-#define DFLTCC_HDISTS_COUNT_BITS 5
-#define DFLTCC_HCLENS_COUNT_BITS 4
-#define DFLTCC_MAX_HCLENS 19
-#define DFLTCC_HCLEN_BITS 3
-#define DFLTCC_MAX_HLITS 286
-#define DFLTCC_MAX_HDISTS 30
-#define DFLTCC_MAX_HLIT_HDIST_BITS 7
-#define DFLTCC_MAX_SYMBOL_BITS 16
-#define DFLTCC_MAX_EOBS_BITS 15
-#define DFLTCC_MAX_PADDING_BITS 7
-
-#define DEFLATE_BOUND_COMPLEN(source_len) \
-    ((DFLTCC_BLOCK_HEADER_BITS + \
-      DFLTCC_HLITS_COUNT_BITS + \
-      DFLTCC_HDISTS_COUNT_BITS + \
-      DFLTCC_HCLENS_COUNT_BITS + \
-      DFLTCC_MAX_HCLENS * DFLTCC_HCLEN_BITS + \
-      (DFLTCC_MAX_HLITS + DFLTCC_MAX_HDISTS) * DFLTCC_MAX_HLIT_HDIST_BITS + \
-      (source_len) * DFLTCC_MAX_SYMBOL_BITS + \
-      DFLTCC_MAX_EOBS_BITS + \
-      DFLTCC_MAX_PADDING_BITS) >> 3)
-
-#endif

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.c b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.c
deleted file mode 100644
index 0210ddc..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* dfltcc_deflate.c - IBM Z DEFLATE CONVERSION CALL compression support. */
-
-/*
-   Use the following commands to build zlib-ng with DFLTCC compression support:
-
-        $ ./configure --with-dfltcc-deflate
-   or
-
-        $ cmake -DWITH_DFLTCC_DEFLATE=1 .
-
-   and then
-
-        $ make
-*/
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "trees_emit.h"
-#include "dfltcc_deflate.h"
-#include "dfltcc_detail.h"
-
-struct dfltcc_deflate_state {
-    struct dfltcc_state common;
-    uint16_t level_mask;               /* Levels on which to use DFLTCC */
-    uint32_t block_size;               /* New block each X bytes */
-    size_t block_threshold;            /* New block after total_in > X */
-    uint32_t dht_threshold;            /* New block only if avail_in >= X */
-};
-
-#define GET_DFLTCC_DEFLATE_STATE(state) ((struct dfltcc_deflate_state *)GET_DFLTCC_STATE(state))
-
-void Z_INTERNAL *PREFIX(dfltcc_alloc_deflate_state)(PREFIX3(streamp) strm) {
-    return dfltcc_alloc_state(strm, sizeof(deflate_state), sizeof(struct dfltcc_deflate_state));
-}
-
-void Z_INTERNAL PREFIX(dfltcc_reset_deflate_state)(PREFIX3(streamp) strm) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_deflate_state *dfltcc_state = GET_DFLTCC_DEFLATE_STATE(state);
-
-    dfltcc_reset_state(&dfltcc_state->common);
-
-    /* Initialize tuning parameters */
-    dfltcc_state->level_mask = DFLTCC_LEVEL_MASK;
-    dfltcc_state->block_size = DFLTCC_BLOCK_SIZE;
-    dfltcc_state->block_threshold = DFLTCC_FIRST_FHT_BLOCK_SIZE;
-    dfltcc_state->dht_threshold = DFLTCC_DHT_MIN_SAMPLE_SIZE;
-}
-
-void Z_INTERNAL PREFIX(dfltcc_copy_deflate_state)(void *dst, const void *src) {
-    dfltcc_copy_state(dst, src, sizeof(deflate_state), sizeof(struct dfltcc_deflate_state));
-}
-
-static inline int dfltcc_can_deflate_with_params(PREFIX3(streamp) strm, int level, uInt window_bits, int strategy,
-                                       int reproducible) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_deflate_state *dfltcc_state = GET_DFLTCC_DEFLATE_STATE(state);
-
-    /* Unsupported compression settings */
-    if ((dfltcc_state->level_mask & (1 << level)) == 0)
-        return 0;
-    if (window_bits != HB_BITS)
-        return 0;
-    if (strategy != Z_FIXED && strategy != Z_DEFAULT_STRATEGY)
-        return 0;
-    if (reproducible)
-        return 0;
-
-    /* Unsupported hardware */
-    if (!is_bit_set(dfltcc_state->common.af.fns, DFLTCC_GDHT) ||
-            !is_bit_set(dfltcc_state->common.af.fns, DFLTCC_CMPR) ||
-            !is_bit_set(dfltcc_state->common.af.fmts, DFLTCC_FMT0))
-        return 0;
-
-    return 1;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_can_deflate)(PREFIX3(streamp) strm) {
-    deflate_state *state = (deflate_state *)strm->state;
-
-    return dfltcc_can_deflate_with_params(strm, state->level, state->w_bits, state->strategy, state->reproducible);
-}
-
-static inline void dfltcc_gdht(PREFIX3(streamp) strm) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
-    size_t avail_in = strm->avail_in;
-
-    dfltcc(DFLTCC_GDHT, param, NULL, NULL, &strm->next_in, &avail_in, NULL);
-}
-
-static inline dfltcc_cc dfltcc_cmpr(PREFIX3(streamp) strm) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
-    size_t avail_in = strm->avail_in;
-    size_t avail_out = strm->avail_out;
-    dfltcc_cc cc;
-
-    cc = dfltcc(DFLTCC_CMPR | HBT_CIRCULAR,
-                param, &strm->next_out, &avail_out,
-                &strm->next_in, &avail_in, state->window);
-    strm->total_in += (strm->avail_in - avail_in);
-    strm->total_out += (strm->avail_out - avail_out);
-    strm->avail_in = avail_in;
-    strm->avail_out = avail_out;
-    return cc;
-}
-
-static inline void send_eobs(PREFIX3(streamp) strm, const struct dfltcc_param_v0 *param) {
-    deflate_state *state = (deflate_state *)strm->state;
-
-    send_bits(state, PREFIX(bi_reverse)(param->eobs >> (15 - param->eobl), param->eobl), param->eobl, state->bi_buf, state->bi_valid);
-    PREFIX(flush_pending)(strm);
-    if (state->pending != 0) {
-        /* The remaining data is located in pending_out[0:pending]. If someone
-         * calls put_byte() - this might happen in deflate() - the byte will be
-         * placed into pending_buf[pending], which is incorrect. Move the
-         * remaining data to the beginning of pending_buf so that put_byte() is
-         * usable again.
-         */
-        memmove(state->pending_buf, state->pending_out, state->pending);
-        state->pending_out = state->pending_buf;
-    }
-#ifdef ZLIB_DEBUG
-    state->compressed_len += param->eobl;
-#endif
-}
-
-int Z_INTERNAL PREFIX(dfltcc_deflate)(PREFIX3(streamp) strm, int flush, block_state *result) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_deflate_state *dfltcc_state = GET_DFLTCC_DEFLATE_STATE(state);
-    struct dfltcc_param_v0 *param = &dfltcc_state->common.param;
-    uInt masked_avail_in;
-    dfltcc_cc cc;
-    int need_empty_block;
-    int soft_bcc;
-    int no_flush;
-
-    if (!PREFIX(dfltcc_can_deflate)(strm)) {
-        /* Clear history. */
-        if (flush == Z_FULL_FLUSH)
-            param->hl = 0;
-        return 0;
-    }
-
-again:
-    masked_avail_in = 0;
-    soft_bcc = 0;
-    no_flush = flush == Z_NO_FLUSH;
-
-    /* No input data. Return, except when Continuation Flag is set, which means
-     * that DFLTCC has buffered some output in the parameter block and needs to
-     * be called again in order to flush it.
-     */
-    if (strm->avail_in == 0 && !param->cf) {
-        /* A block is still open, and the hardware does not support closing
-         * blocks without adding data. Thus, close it manually.
-         */
-        if (!no_flush && param->bcf) {
-            send_eobs(strm, param);
-            param->bcf = 0;
-        }
-        /* Let one of deflate_* functions write a trailing empty block. */
-        if (flush == Z_FINISH)
-            return 0;
-        /* Clear history. */
-        if (flush == Z_FULL_FLUSH)
-            param->hl = 0;
-        /* Trigger block post-processing if necessary. */
-        *result = no_flush ? need_more : block_done;
-        return 1;
-    }
-
-    /* There is an open non-BFINAL block, we are not going to close it just
-     * yet, we have compressed more than DFLTCC_BLOCK_SIZE bytes and we see
-     * more than DFLTCC_DHT_MIN_SAMPLE_SIZE bytes. Open a new block with a new
-     * DHT in order to adapt to a possibly changed input data distribution.
-     */
-    if (param->bcf && no_flush &&
-            strm->total_in > dfltcc_state->block_threshold &&
-            strm->avail_in >= dfltcc_state->dht_threshold) {
-        if (param->cf) {
-            /* We need to flush the DFLTCC buffer before writing the
-             * End-of-block Symbol. Mask the input data and proceed as usual.
-             */
-            masked_avail_in += strm->avail_in;
-            strm->avail_in = 0;
-            no_flush = 0;
-        } else {
-            /* DFLTCC buffer is empty, so we can manually write the
-             * End-of-block Symbol right away.
-             */
-            send_eobs(strm, param);
-            param->bcf = 0;
-            dfltcc_state->block_threshold = strm->total_in + dfltcc_state->block_size;
-        }
-    }
-
-    /* No space for compressed data. If we proceed, dfltcc_cmpr() will return
-     * DFLTCC_CC_OP1_TOO_SHORT without buffering header bits, but we will still
-     * set BCF=1, which is wrong. Avoid complications and return early.
-     */
-    if (strm->avail_out == 0) {
-        *result = need_more;
-        return 1;
-    }
-
-    /* The caller gave us too much data. Pass only one block worth of
-     * uncompressed data to DFLTCC and mask the rest, so that on the next
-     * iteration we start a new block.
-     */
-    if (no_flush && strm->avail_in > dfltcc_state->block_size) {
-        masked_avail_in += (strm->avail_in - dfltcc_state->block_size);
-        strm->avail_in = dfltcc_state->block_size;
-    }
-
-    /* When we have an open non-BFINAL deflate block and caller indicates that
-     * the stream is ending, we need to close an open deflate block and open a
-     * BFINAL one.
-     */
-    need_empty_block = flush == Z_FINISH && param->bcf && !param->bhf;
-
-    /* Translate stream to parameter block */
-    param->cvt = state->wrap == 2 ? CVT_CRC32 : CVT_ADLER32;
-    if (!no_flush)
-        /* We need to close a block. Always do this in software - when there is
-         * no input data, the hardware will not honor BCC. */
-        soft_bcc = 1;
-    if (flush == Z_FINISH && !param->bcf)
-        /* We are about to open a BFINAL block, set Block Header Final bit
-         * until the stream ends.
-         */
-        param->bhf = 1;
-    /* DFLTCC-CMPR will write to next_out, so make sure that buffers with
-     * higher precedence are empty.
-     */
-    Assert(state->pending == 0, "There must be no pending bytes");
-    Assert(state->bi_valid < 8, "There must be less than 8 pending bits");
-    param->sbb = (unsigned int)state->bi_valid;
-    if (param->sbb > 0)
-        *strm->next_out = (unsigned char)state->bi_buf;
-    /* Honor history and check value */
-    param->nt = 0;
-    param->cv = state->wrap == 2 ? ZSWAP32(state->crc_fold.value) : strm->adler;
-
-    /* When opening a block, choose a Huffman-Table Type */
-    if (!param->bcf) {
-        if (state->strategy == Z_FIXED || (strm->total_in == 0 && dfltcc_state->block_threshold > 0))
-            param->htt = HTT_FIXED;
-        else {
-            param->htt = HTT_DYNAMIC;
-            dfltcc_gdht(strm);
-        }
-    }
-
-    /* Deflate */
-    do {
-        cc = dfltcc_cmpr(strm);
-        if (strm->avail_in < 4096 && masked_avail_in > 0)
-            /* We are about to call DFLTCC with a small input buffer, which is
-             * inefficient. Since there is masked data, there will be at least
-             * one more DFLTCC call, so skip the current one and make the next
-             * one handle more data.
-             */
-            break;
-    } while (cc == DFLTCC_CC_AGAIN);
-
-    /* Translate parameter block to stream */
-    strm->msg = oesc_msg(dfltcc_state->common.msg, param->oesc);
-    state->bi_valid = param->sbb;
-    if (state->bi_valid == 0)
-        state->bi_buf = 0; /* Avoid accessing next_out */
-    else
-        state->bi_buf = *strm->next_out & ((1 << state->bi_valid) - 1);
-    if (state->wrap == 2)
-        state->crc_fold.value = ZSWAP32(param->cv);
-    else
-        strm->adler = param->cv;
-
-    /* Unmask the input data */
-    strm->avail_in += masked_avail_in;
-    masked_avail_in = 0;
-
-    /* If we encounter an error, it means there is a bug in DFLTCC call */
-    Assert(cc != DFLTCC_CC_OP2_CORRUPT || param->oesc == 0, "BUG");
-
-    /* Update Block-Continuation Flag. It will be used to check whether to call
-     * GDHT the next time.
-     */
-    if (cc == DFLTCC_CC_OK) {
-        if (soft_bcc) {
-            send_eobs(strm, param);
-            param->bcf = 0;
-            dfltcc_state->block_threshold = strm->total_in + dfltcc_state->block_size;
-        } else
-            param->bcf = 1;
-        if (flush == Z_FINISH) {
-            if (need_empty_block)
-                /* Make the current deflate() call also close the stream */
-                return 0;
-            else {
-                bi_windup(state);
-                *result = finish_done;
-            }
-        } else {
-            if (flush == Z_FULL_FLUSH)
-                param->hl = 0; /* Clear history */
-            *result = flush == Z_NO_FLUSH ? need_more : block_done;
-        }
-    } else {
-        param->bcf = 1;
-        *result = need_more;
-    }
-    if (strm->avail_in != 0 && strm->avail_out != 0)
-        goto again; /* deflate() must use all input or all output */
-    return 1;
-}
-
-/*
-   Switching between hardware and software compression.
-
-   DFLTCC does not support all zlib settings, e.g. generation of non-compressed
-   blocks or alternative window sizes. When such settings are applied on the
-   fly with deflateParams, we need to convert between hardware and software
-   window formats.
-*/
-static int dfltcc_was_deflate_used(PREFIX3(streamp) strm) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
-
-    return strm->total_in > 0 || param->nt == 0 || param->hl > 0;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_deflate_params)(PREFIX3(streamp) strm, int level, int strategy, int *flush) {
-    deflate_state *state = (deflate_state *)strm->state;
-    int could_deflate = PREFIX(dfltcc_can_deflate)(strm);
-    int can_deflate = dfltcc_can_deflate_with_params(strm, level, state->w_bits, strategy, state->reproducible);
-
-    if (can_deflate == could_deflate)
-        /* We continue to work in the same mode - no changes needed */
-        return Z_OK;
-
-    if (!dfltcc_was_deflate_used(strm))
-        /* DFLTCC was not used yet - no changes needed */
-        return Z_OK;
-
-    /* For now, do not convert between window formats - simply get rid of the old data instead */
-    *flush = Z_FULL_FLUSH;
-    return Z_OK;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_deflate_done)(PREFIX3(streamp) strm, int flush) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-    struct dfltcc_param_v0 *param = &dfltcc_state->param;
-
-    /* When deflate(Z_FULL_FLUSH) is called with small avail_out, it might
-     * close the block without resetting the compression state. Detect this
-     * situation and return that deflation is not done.
-     */
-    if (flush == Z_FULL_FLUSH && strm->avail_out == 0)
-        return 0;
-
-    /* Return that deflation is not done if DFLTCC is used and either it
-     * buffered some data (Continuation Flag is set), or has not written EOBS
-     * yet (Block-Continuation Flag is set).
-     */
-    return !PREFIX(dfltcc_can_deflate)(strm) || (!param->cf && !param->bcf);
-}
-
-int Z_INTERNAL PREFIX(dfltcc_can_set_reproducible)(PREFIX3(streamp) strm, int reproducible) {
-    deflate_state *state = (deflate_state *)strm->state;
-
-    return reproducible != state->reproducible && !dfltcc_was_deflate_used(strm);
-}
-
-/*
-   Preloading history.
-*/
-static void append_history(struct dfltcc_param_v0 *param, unsigned char *history, const unsigned char *buf, uInt count) {
-    size_t offset;
-    size_t n;
-
-    /* Do not use more than 32K */
-    if (count > HB_SIZE) {
-        buf += count - HB_SIZE;
-        count = HB_SIZE;
-    }
-    offset = (param->ho + param->hl) % HB_SIZE;
-    if (offset + count <= HB_SIZE)
-        /* Circular history buffer does not wrap - copy one chunk */
-        memcpy(history + offset, buf, count);
-    else {
-        /* Circular history buffer wraps - copy two chunks */
-        n = HB_SIZE - offset;
-        memcpy(history + offset, buf, n);
-        memcpy(history, buf + n, count - n);
-    }
-    n = param->hl + count;
-    if (n <= HB_SIZE)
-        /* All history fits into buffer - no need to discard anything */
-        param->hl = n;
-    else {
-        /* History does not fit into buffer - discard extra bytes */
-        param->ho = (param->ho + (n - HB_SIZE)) % HB_SIZE;
-        param->hl = HB_SIZE;
-    }
-}
-
-int Z_INTERNAL PREFIX(dfltcc_deflate_set_dictionary)(PREFIX3(streamp) strm,
-                                                const unsigned char *dictionary, uInt dict_length) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-    struct dfltcc_param_v0 *param = &dfltcc_state->param;
-
-    append_history(param, state->window, dictionary, dict_length);
-    state->strstart = 1; /* Add FDICT to zlib header */
-    state->block_start = state->strstart; /* Make deflate_stored happy */
-    return Z_OK;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_deflate_get_dictionary)(PREFIX3(streamp) strm, unsigned char *dictionary, uInt *dict_length) {
-    deflate_state *state = (deflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-    struct dfltcc_param_v0 *param = &dfltcc_state->param;
-
-    if (dictionary) {
-        if (param->ho + param->hl <= HB_SIZE)
-            /* Circular history buffer does not wrap - copy one chunk */
-            memcpy(dictionary, state->window + param->ho, param->hl);
-        else {
-            /* Circular history buffer wraps - copy two chunks */
-            memcpy(dictionary, state->window + param->ho, HB_SIZE - param->ho);
-            memcpy(dictionary + HB_SIZE - param->ho, state->window, param->ho + param->hl - HB_SIZE);
-        }
-    }
-    if (dict_length)
-        *dict_length = param->hl;
-    return Z_OK;
-}

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.h b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.h
deleted file mode 100644
index d125230..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_deflate.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef DFLTCC_DEFLATE_H
-#define DFLTCC_DEFLATE_H
-
-#include "dfltcc_common.h"
-
-void Z_INTERNAL *PREFIX(dfltcc_alloc_deflate_state)(PREFIX3(streamp));
-void Z_INTERNAL PREFIX(dfltcc_reset_deflate_state)(PREFIX3(streamp));
-void Z_INTERNAL PREFIX(dfltcc_copy_deflate_state)(void *dst, const void *src);
-int Z_INTERNAL PREFIX(dfltcc_can_deflate)(PREFIX3(streamp) strm);
-int Z_INTERNAL PREFIX(dfltcc_deflate)(PREFIX3(streamp) strm, int flush, block_state *result);
-int Z_INTERNAL PREFIX(dfltcc_deflate_params)(PREFIX3(streamp) strm, int level, int strategy, int *flush);
-int Z_INTERNAL PREFIX(dfltcc_deflate_done)(PREFIX3(streamp) strm, int flush);
-int Z_INTERNAL PREFIX(dfltcc_can_set_reproducible)(PREFIX3(streamp) strm, int reproducible);
-int Z_INTERNAL PREFIX(dfltcc_deflate_set_dictionary)(PREFIX3(streamp) strm,
-                                                const unsigned char *dictionary, uInt dict_length);
-int Z_INTERNAL PREFIX(dfltcc_deflate_get_dictionary)(PREFIX3(streamp) strm, unsigned char *dictionary, uInt* dict_length);
-
-#define ZALLOC_DEFLATE_STATE PREFIX(dfltcc_alloc_deflate_state)
-#define ZCOPY_DEFLATE_STATE PREFIX(dfltcc_copy_deflate_state)
-
-#define DEFLATE_SET_DICTIONARY_HOOK(strm, dict, dict_len) \
-    do { \
-        if (PREFIX(dfltcc_can_deflate)((strm))) \
-            return PREFIX(dfltcc_deflate_set_dictionary)((strm), (dict), (dict_len)); \
-    } while (0)
-
-#define DEFLATE_GET_DICTIONARY_HOOK(strm, dict, dict_len) \
-    do { \
-        if (PREFIX(dfltcc_can_deflate)((strm))) \
-            return PREFIX(dfltcc_deflate_get_dictionary)((strm), (dict), (dict_len)); \
-    } while (0)
-
-#define DEFLATE_RESET_KEEP_HOOK PREFIX(dfltcc_reset_deflate_state)
-
-#define DEFLATE_PARAMS_HOOK(strm, level, strategy, hook_flush) \
-    do { \
-        int err; \
-\
-        err = PREFIX(dfltcc_deflate_params)((strm), (level), (strategy), (hook_flush)); \
-        if (err == Z_STREAM_ERROR) \
-            return err; \
-    } while (0)
-
-#define DEFLATE_DONE PREFIX(dfltcc_deflate_done)
-
-#define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, source_len) \
-    do { \
-        if (PREFIX(dfltcc_can_deflate)((strm))) \
-            (complen) = DEFLATE_BOUND_COMPLEN(source_len); \
-    } while (0)
-
-#define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) (PREFIX(dfltcc_can_deflate)((strm)))
-
-#define DEFLATE_HOOK PREFIX(dfltcc_deflate)
-
-#define DEFLATE_NEED_CHECKSUM(strm) (!PREFIX(dfltcc_can_deflate)((strm)))
-
-#define DEFLATE_CAN_SET_REPRODUCIBLE PREFIX(dfltcc_can_set_reproducible)
-
-#endif

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_detail.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_detail.h b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_detail.h
deleted file mode 100644
index 8292423..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_detail.h
+++ /dev/null
@@ -1,241 +0,0 @@
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_SDT_H
-#include <sys/sdt.h>
-#endif
-
-/*
-   Tuning parameters.
- */
-#ifndef DFLTCC_LEVEL_MASK
-#define DFLTCC_LEVEL_MASK 0x2
-#endif
-#ifndef DFLTCC_BLOCK_SIZE
-#define DFLTCC_BLOCK_SIZE 1048576
-#endif
-#ifndef DFLTCC_FIRST_FHT_BLOCK_SIZE
-#define DFLTCC_FIRST_FHT_BLOCK_SIZE 4096
-#endif
-#ifndef DFLTCC_DHT_MIN_SAMPLE_SIZE
-#define DFLTCC_DHT_MIN_SAMPLE_SIZE 4096
-#endif
-#ifndef DFLTCC_RIBM
-#define DFLTCC_RIBM 0
-#endif
-
-/*
-   C wrapper for the DEFLATE CONVERSION CALL instruction.
- */
-typedef enum {
-    DFLTCC_CC_OK = 0,
-    DFLTCC_CC_OP1_TOO_SHORT = 1,
-    DFLTCC_CC_OP2_TOO_SHORT = 2,
-    DFLTCC_CC_OP2_CORRUPT = 2,
-    DFLTCC_CC_AGAIN = 3,
-} dfltcc_cc;
-
-#define DFLTCC_QAF 0
-#define DFLTCC_GDHT 1
-#define DFLTCC_CMPR 2
-#define DFLTCC_XPND 4
-#define HBT_CIRCULAR (1 << 7)
-#define HB_BITS 15
-#define HB_SIZE (1 << HB_BITS)
-#define DFLTCC_FACILITY 151
-
-static inline dfltcc_cc dfltcc(int fn, void *param,
-                               unsigned char **op1, size_t *len1, z_const unsigned char **op2, size_t *len2, void *hist) {
-    unsigned char *t2 = op1 ? *op1 : NULL;
-    size_t t3 = len1 ? *len1 : 0;
-    z_const unsigned char *t4 = op2 ? *op2 : NULL;
-    size_t t5 = len2 ? *len2 : 0;
-    Z_REGISTER int r0 __asm__("r0") = fn;
-    Z_REGISTER void *r1 __asm__("r1") = param;
-    Z_REGISTER unsigned char *r2 __asm__("r2") = t2;
-    Z_REGISTER size_t r3 __asm__("r3") = t3;
-    Z_REGISTER z_const unsigned char *r4 __asm__("r4") = t4;
-    Z_REGISTER size_t r5 __asm__("r5") = t5;
-    int cc;
-
-    __asm__ volatile(
-#ifdef HAVE_SYS_SDT_H
-                     STAP_PROBE_ASM(zlib, dfltcc_entry, STAP_PROBE_ASM_TEMPLATE(5))
-#endif
-                     ".insn rrf,0xb9390000,%[r2],%[r4],%[hist],0\n"
-#ifdef HAVE_SYS_SDT_H
-                     STAP_PROBE_ASM(zlib, dfltcc_exit, STAP_PROBE_ASM_TEMPLATE(5))
-#endif
-                     "ipm %[cc]\n"
-                     : [r2] "+r" (r2)
-                     , [r3] "+r" (r3)
-                     , [r4] "+r" (r4)
-                     , [r5] "+r" (r5)
-                     , [cc] "=r" (cc)
-                     : [r0] "r" (r0)
-                     , [r1] "r" (r1)
-                     , [hist] "r" (hist)
-#ifdef HAVE_SYS_SDT_H
-                     , STAP_PROBE_ASM_OPERANDS(5, r2, r3, r4, r5, hist)
-#endif
-                     : "cc", "memory");
-    t2 = r2; t3 = r3; t4 = r4; t5 = r5;
-
-    if (op1)
-        *op1 = t2;
-    if (len1)
-        *len1 = t3;
-    if (op2)
-        *op2 = t4;
-    if (len2)
-        *len2 = t5;
-    return (cc >> 28) & 3;
-}
-
-/*
-   Parameter Block for Query Available Functions.
- */
-#define static_assert(c, msg) __attribute__((unused)) static char static_assert_failed_ ## msg[c ? 1 : -1]
-
-struct dfltcc_qaf_param {
-    char fns[16];
-    char reserved1[8];
-    char fmts[2];
-    char reserved2[6];
-};
-
-static_assert(sizeof(struct dfltcc_qaf_param) == 32, sizeof_struct_dfltcc_qaf_param_is_32);
-
-static inline int is_bit_set(const char *bits, int n) {
-    return bits[n / 8] & (1 << (7 - (n % 8)));
-}
-
-static inline void clear_bit(char *bits, int n) {
-    bits[n / 8] &= ~(1 << (7 - (n % 8)));
-}
-
-static inline int is_dfltcc_enabled(void) {
-    uint64_t facilities[(DFLTCC_FACILITY / 64) + 1];
-    Z_REGISTER uint8_t r0 __asm__("r0");
-
-    memset(facilities, 0, sizeof(facilities));
-    r0 = sizeof(facilities) / sizeof(facilities[0]) - 1;
-    /* STFLE is supported since z9-109 and only in z/Architecture mode. When
-     * compiling with -m31, gcc defaults to ESA mode, however, since the kernel
-     * is 64-bit, it's always z/Architecture mode at runtime.
-     */
-    __asm__ volatile(
-#ifndef __clang__
-                     ".machinemode push\n"
-                     ".machinemode zarch\n"
-#endif
-                     "stfle %[facilities]\n"
-#ifndef __clang__
-                     ".machinemode pop\n"
-#endif
-                     : [facilities] "=Q" (facilities), [r0] "+r" (r0) :: "cc");
-    return is_bit_set((const char *)facilities, DFLTCC_FACILITY);
-}
-
-#define DFLTCC_FMT0 0
-
-/*
-   Parameter Block for Generate Dynamic-Huffman Table, Compress and Expand.
- */
-#define CVT_CRC32 0
-#define CVT_ADLER32 1
-#define HTT_FIXED 0
-#define HTT_DYNAMIC 1
-
-struct dfltcc_param_v0 {
-    uint16_t pbvn;                     /* Parameter-Block-Version Number */
-    uint8_t mvn;                       /* Model-Version Number */
-    uint8_t ribm;                      /* Reserved for IBM use */
-    uint32_t reserved32 : 31;
-    uint32_t cf : 1;                   /* Continuation Flag */
-    uint8_t reserved64[8];
-    uint32_t nt : 1;                   /* New Task */
-    uint32_t reserved129 : 1;
-    uint32_t cvt : 1;                  /* Check Value Type */
-    uint32_t reserved131 : 1;
-    uint32_t htt : 1;                  /* Huffman-Table Type */
-    uint32_t bcf : 1;                  /* Block-Continuation Flag */
-    uint32_t bcc : 1;                  /* Block Closing Control */
-    uint32_t bhf : 1;                  /* Block Header Final */
-    uint32_t reserved136 : 1;
-    uint32_t reserved137 : 1;
-    uint32_t dhtgc : 1;                /* DHT Generation Control */
-    uint32_t reserved139 : 5;
-    uint32_t reserved144 : 5;
-    uint32_t sbb : 3;                  /* Sub-Byte Boundary */
-    uint8_t oesc;                      /* Operation-Ending-Supplemental Code */
-    uint32_t reserved160 : 12;
-    uint32_t ifs : 4;                  /* Incomplete-Function Status */
-    uint16_t ifl;                      /* Incomplete-Function Length */
-    uint8_t reserved192[8];
-    uint8_t reserved256[8];
-    uint8_t reserved320[4];
-    uint16_t hl;                       /* History Length */
-    uint32_t reserved368 : 1;
-    uint16_t ho : 15;                  /* History Offset */
-    uint32_t cv;                       /* Check Value */
-    uint32_t eobs : 15;                /* End-of-block Symbol */
-    uint32_t reserved431: 1;
-    uint8_t eobl : 4;                  /* End-of-block Length */
-    uint32_t reserved436 : 12;
-    uint32_t reserved448 : 4;
-    uint16_t cdhtl : 12;               /* Compressed-Dynamic-Huffman Table
-                                          Length */
-    uint8_t reserved464[6];
-    uint8_t cdht[288];
-    uint8_t reserved[32];
-    uint8_t csb[1152];
-};
-
-static_assert(sizeof(struct dfltcc_param_v0) == 1536, sizeof_struct_dfltcc_param_v0_is_1536);
-
-static inline z_const char *oesc_msg(char *buf, int oesc) {
-    if (oesc == 0x00)
-        return NULL; /* Successful completion */
-    else {
-        sprintf(buf, "Operation-Ending-Supplemental Code is 0x%.2X", oesc);
-        return buf;
-    }
-}
-
-/*
-   Extension of inflate_state and deflate_state. Must be doubleword-aligned.
-*/
-struct dfltcc_state {
-    struct dfltcc_param_v0 param;      /* Parameter block. */
-    struct dfltcc_qaf_param af;        /* Available functions. */
-    char msg[64];                      /* Buffer for strm->msg */
-};
-
-#define ALIGN_UP(p, size) (__typeof__(p))(((uintptr_t)(p) + ((size) - 1)) & ~((size) - 1))
-
-#define GET_DFLTCC_STATE(state) ((struct dfltcc_state *)((char *)(state) + ALIGN_UP(sizeof(*state), 8)))
-
-static inline void *dfltcc_alloc_state(PREFIX3(streamp) strm, uInt size, uInt extension_size) {
-    return ZALLOC(strm, 1, ALIGN_UP(size, 8) + extension_size);
-}
-
-static inline void dfltcc_reset_state(struct dfltcc_state *dfltcc_state) {
-    /* Initialize available functions */
-    if (is_dfltcc_enabled()) {
-        dfltcc(DFLTCC_QAF, &dfltcc_state->param, NULL, NULL, NULL, NULL, NULL);
-        memmove(&dfltcc_state->af, &dfltcc_state->param, sizeof(dfltcc_state->af));
-    } else
-        memset(&dfltcc_state->af, 0, sizeof(dfltcc_state->af));
-
-    /* Initialize parameter block */
-    memset(&dfltcc_state->param, 0, sizeof(dfltcc_state->param));
-    dfltcc_state->param.nt = 1;
-    dfltcc_state->param.ribm = DFLTCC_RIBM;
-}
-
-static inline void dfltcc_copy_state(void *dst, const void *src, uInt size, uInt extension_size) {
-    memcpy(dst, src, ALIGN_UP(size, 8) + extension_size);
-}

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.c b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.c
deleted file mode 100644
index 7a422d9..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* dfltcc_inflate.c - IBM Z DEFLATE CONVERSION CALL decompression support. */
-
-/*
-   Use the following commands to build zlib-ng with DFLTCC decompression support:
-
-        $ ./configure --with-dfltcc-inflate
-   or
-
-        $ cmake -DWITH_DFLTCC_INFLATE=1 .
-
-   and then
-
-        $ make
-*/
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "dfltcc_inflate.h"
-#include "dfltcc_detail.h"
-
-struct inflate_state Z_INTERNAL *PREFIX(dfltcc_alloc_inflate_state)(PREFIX3(streamp) strm) {
-    return (struct inflate_state *)dfltcc_alloc_state(strm, sizeof(struct inflate_state), sizeof(struct dfltcc_state));
-}
-
-void Z_INTERNAL PREFIX(dfltcc_reset_inflate_state)(PREFIX3(streamp) strm) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-
-    dfltcc_reset_state(dfltcc_state);
-}
-
-void Z_INTERNAL PREFIX(dfltcc_copy_inflate_state)(struct inflate_state *dst, const struct inflate_state *src) {
-    dfltcc_copy_state(dst, src, sizeof(struct inflate_state), sizeof(struct dfltcc_state));
-}
-
-int Z_INTERNAL PREFIX(dfltcc_can_inflate)(PREFIX3(streamp) strm) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-
-    /* Unsupported compression settings */
-    if (state->wbits != HB_BITS)
-        return 0;
-
-    /* Unsupported hardware */
-    return is_bit_set(dfltcc_state->af.fns, DFLTCC_XPND) && is_bit_set(dfltcc_state->af.fmts, DFLTCC_FMT0);
-}
-
-static inline dfltcc_cc dfltcc_xpnd(PREFIX3(streamp) strm) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
-    size_t avail_in = strm->avail_in;
-    size_t avail_out = strm->avail_out;
-    dfltcc_cc cc;
-
-    cc = dfltcc(DFLTCC_XPND | HBT_CIRCULAR,
-                param, &strm->next_out, &avail_out,
-                &strm->next_in, &avail_in, state->window);
-    strm->avail_in = avail_in;
-    strm->avail_out = avail_out;
-    return cc;
-}
-
-dfltcc_inflate_action Z_INTERNAL PREFIX(dfltcc_inflate)(PREFIX3(streamp) strm, int flush, int *ret) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-    struct dfltcc_param_v0 *param = &dfltcc_state->param;
-    dfltcc_cc cc;
-
-    if (flush == Z_BLOCK || flush == Z_TREES) {
-        /* DFLTCC does not support stopping on block boundaries */
-        if (PREFIX(dfltcc_inflate_disable)(strm)) {
-            *ret = Z_STREAM_ERROR;
-            return DFLTCC_INFLATE_BREAK;
-        } else
-            return DFLTCC_INFLATE_SOFTWARE;
-    }
-
-    if (state->last) {
-        if (state->bits != 0) {
-            strm->next_in++;
-            strm->avail_in--;
-            state->bits = 0;
-        }
-        state->mode = CHECK;
-        return DFLTCC_INFLATE_CONTINUE;
-    }
-
-    if (strm->avail_in == 0 && !param->cf)
-        return DFLTCC_INFLATE_BREAK;
-
-    if (PREFIX(inflate_ensure_window)(state)) {
-        state->mode = MEM;
-        return DFLTCC_INFLATE_CONTINUE;
-    }
-
-    /* Translate stream to parameter block */
-    param->cvt = state->flags ? CVT_CRC32 : CVT_ADLER32;
-    param->sbb = state->bits;
-    param->hl = state->whave; /* Software and hardware history formats match */
-    param->ho = (state->wnext - state->whave) & ((1 << HB_BITS) - 1);
-    if (param->hl)
-        param->nt = 0; /* Honor history for the first block */
-    param->cv = state->flags ? ZSWAP32(state->check) : state->check;
-
-    /* Inflate */
-    do {
-        cc = dfltcc_xpnd(strm);
-    } while (cc == DFLTCC_CC_AGAIN);
-
-    /* Translate parameter block to stream */
-    strm->msg = oesc_msg(dfltcc_state->msg, param->oesc);
-    state->last = cc == DFLTCC_CC_OK;
-    state->bits = param->sbb;
-    state->whave = param->hl;
-    state->wnext = (param->ho + param->hl) & ((1 << HB_BITS) - 1);
-    state->check = state->flags ? ZSWAP32(param->cv) : param->cv;
-    if (cc == DFLTCC_CC_OP2_CORRUPT && param->oesc != 0) {
-        /* Report an error if stream is corrupted */
-        state->mode = BAD;
-        return DFLTCC_INFLATE_CONTINUE;
-    }
-    state->mode = TYPEDO;
-    /* Break if operands are exhausted, otherwise continue looping */
-    return (cc == DFLTCC_CC_OP1_TOO_SHORT || cc == DFLTCC_CC_OP2_TOO_SHORT) ?
-        DFLTCC_INFLATE_BREAK : DFLTCC_INFLATE_CONTINUE;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_was_inflate_used)(PREFIX3(streamp) strm) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_param_v0 *param = &GET_DFLTCC_STATE(state)->param;
-
-    return !param->nt;
-}
-
-int Z_INTERNAL PREFIX(dfltcc_inflate_disable)(PREFIX3(streamp) strm) {
-    struct inflate_state *state = (struct inflate_state *)strm->state;
-    struct dfltcc_state *dfltcc_state = GET_DFLTCC_STATE(state);
-
-    if (!PREFIX(dfltcc_can_inflate)(strm))
-        return 0;
-    if (PREFIX(dfltcc_was_inflate_used)(strm))
-        /* DFLTCC has already decompressed some data. Since there is not
-         * enough information to resume decompression in software, the call
-         * must fail.
-         */
-        return 1;
-    /* DFLTCC was not used yet - decompress in software */
-    memset(&dfltcc_state->af, 0, sizeof(dfltcc_state->af));
-    return 0;
-}

crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.h b/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.h
deleted file mode 100644
index 5e86fe8..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/dfltcc_inflate.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DFLTCC_INFLATE_H
-#define DFLTCC_INFLATE_H
-
-#include "dfltcc_common.h"
-
-struct inflate_state Z_INTERNAL *PREFIX(dfltcc_alloc_inflate_state)(PREFIX3(streamp) strm);
-void Z_INTERNAL PREFIX(dfltcc_reset_inflate_state)(PREFIX3(streamp) strm);
-void Z_INTERNAL PREFIX(dfltcc_copy_inflate_state)(struct inflate_state *dst, const struct inflate_state *src);
-int Z_INTERNAL PREFIX(dfltcc_can_inflate)(PREFIX3(streamp) strm);
-typedef enum {
-    DFLTCC_INFLATE_CONTINUE,
-    DFLTCC_INFLATE_BREAK,
-    DFLTCC_INFLATE_SOFTWARE,
-} dfltcc_inflate_action;
-dfltcc_inflate_action Z_INTERNAL PREFIX(dfltcc_inflate)(PREFIX3(streamp) strm, int flush, int *ret);
-int Z_INTERNAL PREFIX(dfltcc_was_inflate_used)(PREFIX3(streamp) strm);
-int Z_INTERNAL PREFIX(dfltcc_inflate_disable)(PREFIX3(streamp) strm);
-
-#define ZALLOC_INFLATE_STATE PREFIX(dfltcc_alloc_inflate_state)
-#define ZCOPY_INFLATE_STATE PREFIX(dfltcc_copy_inflate_state)
-
-#define INFLATE_RESET_KEEP_HOOK PREFIX(dfltcc_reset_inflate_state)
-
-#define INFLATE_PRIME_HOOK(strm, bits, value) \
-    do { if (PREFIX(dfltcc_inflate_disable)((strm))) return Z_STREAM_ERROR; } while (0)
-
-#define INFLATE_TYPEDO_HOOK(strm, flush) \
-    if (PREFIX(dfltcc_can_inflate)((strm))) { \
-        dfltcc_inflate_action action; \
-\
-        RESTORE(); \
-        action = PREFIX(dfltcc_inflate)((strm), (flush), &ret); \
-        LOAD(); \
-        if (action == DFLTCC_INFLATE_CONTINUE) \
-            break; \
-        else if (action == DFLTCC_INFLATE_BREAK) \
-            goto inf_leave; \
-    }
-
-#define INFLATE_NEED_CHECKSUM(strm) (!PREFIX(dfltcc_can_inflate)((strm)))
-
-#define INFLATE_NEED_UPDATEWINDOW(strm) (!PREFIX(dfltcc_can_inflate)((strm)))
-
-#define INFLATE_MARK_HOOK(strm) \
-    do { \
-        if (PREFIX(dfltcc_was_inflate_used)((strm))) return -(1L << 16); \
-    } while (0)
-
-#define INFLATE_SYNC_POINT_HOOK(strm) \
-    do { \
-        if (PREFIX(dfltcc_was_inflate_used)((strm))) return Z_STREAM_ERROR; \
-    } while (0)
-
-#endif

crates/libz-sys/src/zlib-ng/arch/s390/s390_features.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.c b/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.c
deleted file mode 100644
index 0658e4b..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "../../zbuild.h"
-#include "s390_features.h"
-
-#ifdef HAVE_SYS_AUXV_H
-#  include <sys/auxv.h>
-#endif
-
-Z_INTERNAL int PREFIX(s390_cpu_has_vx) = 0;
-
-void Z_INTERNAL PREFIX(s390_check_features)(void) {
-#ifdef S390_FEATURES
-    PREFIX(s390_cpu_has_vx) = getauxval(AT_HWCAP) & HWCAP_S390_VX;
-#endif
-}

crates/libz-sys/src/zlib-ng/arch/s390/s390_features.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.h b/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.h
deleted file mode 100644
index 9e2608f..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/s390_features.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef S390_FEATURES_H_
-#define S390_FEATURES_H_
-
-extern int PREFIX(s390_cpu_has_vx);
-
-void Z_INTERNAL PREFIX(s390_check_features)(void);
-
-#endif

crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.Dockerfile

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.Dockerfile b/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.Dockerfile
deleted file mode 100644
index 5e247fd..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Self-Hosted IBM Z Github Actions Runner.
-
-# Temporary image: amd64 dependencies.
-FROM amd64/ubuntu:20.04 as ld-prefix
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install ca-certificates libicu66 libssl1.1
-
-# Main image.
-FROM s390x/ubuntu:20.04
-
-# Packages for zlib-ng testing.
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install \
-        cmake \
-        curl \
-        gcc \
-        git \
-        jq \
-        libxml2-dev \
-        libxslt-dev \
-        ninja-build \
-        python-is-python3 \
-        python3 \
-        python3-dev \
-        python3-pip
-
-# amd64 dependencies.
-COPY --from=ld-prefix / /usr/x86_64-linux-gnu/
-RUN ln -fs ../lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /usr/x86_64-linux-gnu/lib64/
-RUN ln -fs /etc/resolv.conf /usr/x86_64-linux-gnu/etc/
-ENV QEMU_LD_PREFIX=/usr/x86_64-linux-gnu
-
-# amd64 Github Actions Runner.
-RUN useradd -m actions-runner
-USER actions-runner
-WORKDIR /home/actions-runner
-RUN curl -L https://github.com/actions/runner/releases/download/v2.287.1/actions-runner-linux-x64-2.287.1.tar.gz | tar -xz
-VOLUME /home/actions-runner
-
-# Scripts.
-COPY fs/ /
-ENTRYPOINT ["/usr/bin/entrypoint"]
-CMD ["/usr/bin/actions-runner"]

crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.service

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.service b/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.service
deleted file mode 100644
index 71053a7..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/actions-runner.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description=Self-Hosted IBM Z Github Actions Runner
-Wants=qemu-user-static
-After=qemu-user-static
-StartLimitIntervalSec=0
-
-[Service]
-Type=simple
-Restart=always
-ExecStartPre=-/usr/bin/docker rm --force actions-runner
-ExecStart=/usr/bin/docker run \
-              --env-file=/etc/actions-runner \
-              --init \
-              --interactive \
-              --name=actions-runner \
-              --rm \
-              --volume=actions-runner:/home/actions-runner \
-              iiilinuxibmcom/actions-runner
-ExecStop=/bin/sh -c "docker exec actions-runner kill -INT -- -1"
-ExecStop=/bin/sh -c "docker wait actions-runner"
-ExecStop=/bin/sh -c "docker rm actions-runner"
-
-[Install]
-WantedBy=multi-user.target

crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/actions-runner

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/actions-runner b/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/actions-runner
deleted file mode 100755
index c9d8227..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/actions-runner
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-#
-# Ephemeral runner startup script.
-#
-# Expects the following environment variables:
-#
-# - repo=<owner>/<name>
-# - access_token=<ghp_***>
-#
-
-set -e -u
-
-# Check the cached registration token.
-token_file=registration-token.json
-set +e
-expires_at=$(jq --raw-output .expires_at "$token_file" 2>/dev/null)
-status=$?
-set -e
-if [[ $status -ne 0 || $(date +%s) -ge $(date -d "$expires_at" +%s) ]]; then
-    # Refresh the cached registration token.
-    curl \
-        -X POST \
-        -H "Accept: application/vnd.github.v3+json" \
-        -H "Authorization: token $access_token" \
-        "https://api.github.com/repos/$repo/actions/runners/registration-token" \
-        -o "$token_file"
-fi
-
-# (Re-)register the runner.
-registration_token=$(jq --raw-output .token "$token_file")
-./config.sh remove --token "$registration_token" || true
-./config.sh \
-    --url "https://github.com/$repo" \
-    --token "$registration_token" \
-    --labels z15 \
-    --ephemeral
-
-# Run one job.
-./run.sh

crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/entrypoint

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/entrypoint b/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/entrypoint
deleted file mode 100755
index eb8772b..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/fs/usr/bin/entrypoint
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#
-# Container entrypoint that waits for all spawned processes.
-#
-
-set -e -u
-
-# Create a FIFO and start reading from its read end.
-tempdir=$(mktemp -d "/tmp/done.XXXXXXXXXX")
-trap 'rm -r "$tempdir"' EXIT
-done="$tempdir/pipe"
-mkfifo "$done"
-cat "$done" & waiter=$!
-
-# Start the workload. Its descendants will inherit the FIFO's write end.
-status=0
-if [ "$#" -eq 0 ]; then
-    bash 9>"$done" || status=$?
-else
-    "$@" 9>"$done" || status=$?
-fi
-
-# When the workload and all of its descendants exit, the FIFO's write end will
-# be closed and `cat "$done"` will exit. Wait until it happens. This is needed
-# in order to handle SelfUpdater, which the workload may start in background
-# before exiting.
-wait "$waiter"
-
-exit "$status"

crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/qemu-user-static.service

diff --git a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/qemu-user-static.service b/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/qemu-user-static.service
deleted file mode 100644
index 301f3ed..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/s390/self-hosted-builder/qemu-user-static.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Support for transparent execution of non-native binaries with QEMU user emulation
-
-[Service]
-Type=oneshot
-# The source code for iiilinuxibmcom/qemu-user-static is at https://github.com/iii-i/qemu-user-static/tree/v6.1.0-1
-# TODO: replace it with multiarch/qemu-user-static once version >6.1 is available
-ExecStart=/usr/bin/docker run --rm --interactive --privileged iiilinuxibmcom/qemu-user-static --reset -p yes
-
-[Install]
-WantedBy=multi-user.target

crates/libz-sys/src/zlib-ng/arch/x86/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/Makefile.in b/crates/libz-sys/src/zlib-ng/arch/x86/Makefile.in
deleted file mode 100644
index f9aedf8..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/Makefile.in
+++ /dev/null
@@ -1,147 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-CC=
-CFLAGS=
-SFLAGS=
-INCLUDES=
-SUFFIX=
-
-AVX512FLAG=-mavx512f -mavx512dq -mavx512vl -mavx512bw
-AVX512VNNIFLAG=-mavx512vnni
-AVX2FLAG=-mavx2
-SSE2FLAG=-msse2
-SSSE3FLAG=-mssse3
-SSE41FLAG=-msse4.1
-SSE42FLAG=-msse4.2
-PCLMULFLAG=-mpclmul
-VPCLMULFLAG=-mvpclmulqdq
-NOLTOFLAG=
-
-SRCDIR=.
-SRCTOP=../..
-TOPDIR=$(SRCTOP)
-
-all: \
-	x86_features.o x86_features.lo \
-	adler32_avx2.o adler32_avx2.lo \
-	adler32_avx512.o adler32_avx512.lo \
-	adler32_avx512_vnni.o adler32_avx512_vnni.lo \
-	adler32_sse42.o adler32_sse42.lo \
-	adler32_ssse3.o adler32_ssse3.lo \
-	chunkset_avx.o chunkset_avx.lo \
-	chunkset_sse2.o chunkset_sse2.lo \
-	chunkset_sse41.o chunkset_sse41.lo \
-	compare256_avx2.o compare256_avx2.lo \
-	compare256_sse2.o compare256_sse2.lo \
-	insert_string_sse42.o insert_string_sse42.lo \
-	crc32_fold_pclmulqdq.o crc32_fold_pclmulqdq.lo \
-	crc32_fold_vpclmulqdq.o crc32_fold_vpclmulqdq.lo \
-	slide_hash_avx2.o slide_hash_avx2.lo \
-	slide_hash_sse2.o slide_hash_sse2.lo
-
-x86_features.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86_features.c
-
-x86_features.lo:
-	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86_features.c
-
-chunkset_avx.o:
-	$(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_avx.c
-
-chunkset_avx.lo:
-	$(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_avx.c
-
-chunkset_sse2.o:
-	$(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse2.c
-
-chunkset_sse2.lo:
-	$(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse2.c
-
-chunkset_sse41.o:
-	$(CC) $(CFLAGS) $(SSE41FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse41.c
-
-chunkset_sse41.lo:
-	$(CC) $(SFLAGS) $(SSE41FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_sse41.c
-
-compare256_avx2.o:
-	$(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_avx2.c
-
-compare256_avx2.lo:
-	$(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_avx2.c
-
-compare256_sse2.o:
-	$(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_sse2.c
-
-compare256_sse2.lo:
-	$(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_sse2.c
-
-insert_string_sse42.o:
-	$(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse42.c
-
-insert_string_sse42.lo:
-	$(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_sse42.c
-
-crc32_fold_pclmulqdq.o:
-	$(CC) $(CFLAGS) $(PCLMULFLAG) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_pclmulqdq.c
-
-crc32_fold_pclmulqdq.lo:
-	$(CC) $(SFLAGS) $(PCLMULFLAG) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_pclmulqdq.c
-
-crc32_fold_vpclmulqdq.o:
-	$(CC) $(CFLAGS) $(VPCLMULFLAG) $(AVX512FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_vpclmulqdq.c
-
-crc32_fold_vpclmulqdq.lo:
-	$(CC) $(SFLAGS) $(VPCLMULFLAG) $(AVX512FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_vpclmulqdq.c
-
-slide_hash_avx2.o:
-	$(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx2.c
-
-slide_hash_avx2.lo:
-	$(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_avx2.c
-
-slide_hash_sse2.o:
-	$(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse2.c
-
-slide_hash_sse2.lo:
-	$(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/slide_hash_sse2.c
-
-adler32_avx2.o: $(SRCDIR)/adler32_avx2.c
-	$(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx2.c
-
-adler32_avx2.lo: $(SRCDIR)/adler32_avx2.c
-	$(CC) $(SFLAGS) $(AVX2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx2.c
-
-adler32_avx512.o: $(SRCDIR)/adler32_avx512.c
-	$(CC) $(CFLAGS) $(AVX512FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx512.c
-
-adler32_avx512.lo: $(SRCDIR)/adler32_avx512.c
-	$(CC) $(SFLAGS) $(AVX512FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx512.c
-
-adler32_avx512_vnni.o: $(SRCDIR)/adler32_avx512_vnni.c
-	$(CC) $(CFLAGS) $(AVX512VNNIFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx512_vnni.c
-
-adler32_avx512_vnni.lo: $(SRCDIR)/adler32_avx512_vnni.c
-	$(CC) $(SFLAGS) $(AVX512VNNIFLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_avx512_vnni.c
-
-adler32_ssse3.o: $(SRCDIR)/adler32_ssse3.c
-	$(CC) $(CFLAGS) $(SSSE3FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_ssse3.c
-
-adler32_ssse3.lo: $(SRCDIR)/adler32_ssse3.c
-	$(CC) $(SFLAGS) $(SSSE3FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_ssse3.c
-
-adler32_sse42.o: $(SRCDIR)/adler32_sse42.c
-	$(CC) $(CFLAGS) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_sse42.c
-
-adler32_sse42.lo: $(SRCDIR)/adler32_sse42.c
-	$(CC) $(SFLAGS) $(SSE42FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_sse42.c
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-
-distclean:
-	rm -f Makefile

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2.c b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2.c
deleted file mode 100644
index dcd1166..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* adler32_avx2.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * Authors:
- *   Brian Bockelman <bockelman@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <immintrin.h>
-
-#ifdef X86_AVX2_ADLER32
-
-#include "adler32_avx2_tpl.h"
-
-#define COPY
-#include "adler32_avx2_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_p.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_p.h b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_p.h
deleted file mode 100644
index f7079bf..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_p.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* adler32_avx2_p.h -- adler32 avx2 utility functions
- * Copyright (C) 2022 Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ADLER32_AVX2_P_H_
-#define ADLER32_AVX2_P_H_
-
-#if defined(X86_AVX2_ADLER32) || defined(X86_AVX512VNNI_ADLER32)
-
-/* 32 bit horizontal sum, adapted from Agner Fog's vector library. */
-static inline uint32_t hsum256(__m256i x) {
-    __m128i sum1  = _mm_add_epi32(_mm256_extracti128_si256(x, 1),
-                                  _mm256_castsi256_si128(x));
-    __m128i sum2  = _mm_add_epi32(sum1, _mm_unpackhi_epi64(sum1, sum1));
-    __m128i sum3  = _mm_add_epi32(sum2, _mm_shuffle_epi32(sum2, 1));
-    return (uint32_t)_mm_cvtsi128_si32(sum3);
-}
-
-static inline uint32_t partial_hsum256(__m256i x) {
-    /* We need a permutation vector to extract every other integer. The
-     * rest are going to be zeros */
-    const __m256i perm_vec = _mm256_setr_epi32(0, 2, 4, 6, 1, 1, 1, 1);
-    __m256i non_zero = _mm256_permutevar8x32_epi32(x, perm_vec);
-    __m128i non_zero_sse = _mm256_castsi256_si128(non_zero);
-    __m128i sum2  = _mm_add_epi32(non_zero_sse,_mm_unpackhi_epi64(non_zero_sse, non_zero_sse));
-    __m128i sum3  = _mm_add_epi32(sum2, _mm_shuffle_epi32(sum2, 1));
-    return (uint32_t)_mm_cvtsi128_si32(sum3);
-}
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_tpl.h b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_tpl.h
deleted file mode 100644
index 59cacfa..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx2_tpl.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* adler32_avx2_tpl.h -- adler32 avx2 vectorized function templates
- * Copyright (C) 2022 Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-#include <immintrin.h>
-#include "../../adler32_fold.h"
-#include "../../adler32_p.h"
-#include "../../fallback_builtins.h"
-#include "adler32_avx2_p.h"
-
-#ifdef X86_SSE42_ADLER32
-extern uint32_t adler32_fold_copy_sse42(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-extern uint32_t adler32_ssse3(uint32_t adler, const uint8_t *src, size_t len);
-#define copy_sub32(a, b, c, d) adler32_fold_copy_sse42(a, b, c, d)
-#define sub32(a, b, c) adler32_ssse3(a, b, c)
-#else
-#define copy_sub32(a, b, c, d) adler32_copy_len_16(adler0, c, b, d, adler1)
-#define sub32(a, b, c) adler32_len_16(adler0, b, c, adler1)
-#endif
-
-#ifdef COPY
-Z_INTERNAL uint32_t adler32_fold_copy_avx2(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-#else
-Z_INTERNAL uint32_t adler32_avx2(uint32_t adler, const uint8_t *src, size_t len) {
-#endif
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
-
-    uint32_t adler0, adler1;
-    adler1 = (adler >> 16) & 0xffff;
-    adler0 = adler & 0xffff; 
-
-rem_peel:
-    if (len < 16) {
-#ifdef COPY
-        return adler32_copy_len_16(adler0, src, dst, len, adler1);
-#else
-        return adler32_len_16(adler0, src, len, adler1);
-#endif
-    } else if (len < 32) {
-#ifdef COPY
-        return copy_sub32(adler, dst, src, len);
-#else
-        return sub32(adler, src, len);
-#endif
-    }
-
-    __m256i vs1, vs2;
-
-    const __m256i dot2v = _mm256_setr_epi8(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,
-                                           14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-    const __m256i dot3v = _mm256_set1_epi16(1);
-    const __m256i zero = _mm256_setzero_si256();
-
-    while (len >= 32) {
-       vs1 = _mm256_zextsi128_si256(_mm_cvtsi32_si128(adler0));
-       vs2 = _mm256_zextsi128_si256(_mm_cvtsi32_si128(adler1));
-       __m256i vs1_0 = vs1;
-       __m256i vs3 = _mm256_setzero_si256();
-
-       size_t k = MIN(len, NMAX);
-       k -= k % 32;
-       len -= k;
-
-       while (k >= 32) {
-           /*
-              vs1 = adler + sum(c[i])
-              vs2 = sum2 + 32 vs1 + sum( (32-i+1) c[i] )
-           */
-           __m256i vbuf = _mm256_loadu_si256((__m256i*)src);
-           src += 32;
-           k -= 32;
-
-           __m256i vs1_sad = _mm256_sad_epu8(vbuf, zero); // Sum of abs diff, resulting in 2 x int32's
-                                                          //
-#ifdef COPY
-            _mm256_storeu_si256((__m256i*)dst, vbuf);
-            dst += 32;
-#endif
-           vs1 = _mm256_add_epi32(vs1, vs1_sad);
-           vs3 = _mm256_add_epi32(vs3, vs1_0);
-           __m256i v_short_sum2 = _mm256_maddubs_epi16(vbuf, dot2v); // sum 32 uint8s to 16 shorts
-           __m256i vsum2 = _mm256_madd_epi16(v_short_sum2, dot3v); // sum 16 shorts to 8 uint32s
-           vs2 = _mm256_add_epi32(vsum2, vs2);
-           vs1_0 = vs1;
-       }
-
-       /* Defer the multiplication with 32 to outside of the loop */
-       vs3 = _mm256_slli_epi32(vs3, 5);
-       vs2 = _mm256_add_epi32(vs2, vs3);
-
-       /* The compiler is generating the following sequence for this integer modulus
-        * when done the scalar way, in GPRs:
-        
-        adler = (s1_unpack[0] % BASE) + (s1_unpack[1] % BASE) + (s1_unpack[2] % BASE) + (s1_unpack[3] % BASE) +
-                (s1_unpack[4] % BASE) + (s1_unpack[5] % BASE) + (s1_unpack[6] % BASE) + (s1_unpack[7] % BASE);
-
-        mov    $0x80078071,%edi // move magic constant into 32 bit register %edi
-        ...
-        vmovd  %xmm1,%esi // move vector lane 0 to 32 bit register %esi
-        mov    %rsi,%rax  // zero-extend this value to 64 bit precision in %rax
-        imul   %rdi,%rsi // do a signed multiplication with magic constant and vector element 
-        shr    $0x2f,%rsi // shift right by 47
-        imul   $0xfff1,%esi,%esi // do a signed multiplication with value truncated to 32 bits with 0xfff1 
-        sub    %esi,%eax // subtract lower 32 bits of original vector value from modified one above
-        ...
-        // repeats for each element with vpextract instructions
-
-        This is tricky with AVX2 for a number of reasons:
-            1.) There's no 64 bit multiplication instruction, but there is a sequence to get there
-            2.) There's ways to extend vectors to 64 bit precision, but no simple way to truncate
-                back down to 32 bit precision later (there is in AVX512) 
-            3.) Full width integer multiplications aren't cheap
-
-        We can, however, and do a relatively cheap sequence for horizontal sums. 
-        Then, we simply do the integer modulus on the resulting 64 bit GPR, on a scalar value. It was
-        previously thought that casting to 64 bit precision was needed prior to the horizontal sum, but
-        that is simply not the case, as NMAX is defined as the maximum number of scalar sums that can be
-        performed on the maximum possible inputs before overflow
-        */
-
- 
-        /* In AVX2-land, this trip through GPRs will probably be unvoidable, as there's no cheap and easy
-         * conversion from 64 bit integer to 32 bit (needed for the inexpensive modulus with a constant).
-         * This casting to 32 bit is cheap through GPRs (just register aliasing). See above for exactly
-         * what the compiler is doing to avoid integer divisions. */
-        adler0 = partial_hsum256(vs1) % BASE;
-        adler1 = hsum256(vs2) % BASE;
-    }
-
-    adler = adler0 | (adler1 << 16);
-
-    if (len) {
-        goto rem_peel;
-    }
-
-    return adler;
-}

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512.c b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512.c
deleted file mode 100644
index c0bf072..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* adler32_avx512.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * Authors:
- *   Adam Stylinski <kungfujesus06@gmail.com>
- *   Brian Bockelman <bockelman@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef X86_AVX512_ADLER32
-
-#include "adler32_avx512_tpl.h"
-
-#define COPY
-#include "adler32_avx512_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_p.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_p.h b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_p.h
deleted file mode 100644
index 5b79d2a..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_p.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef AVX512_FUNCS_H
-#define AVX512_FUNCS_H
-
-#include <immintrin.h>
-#include <stdint.h>
-/* Written because *_add_epi32(a) sets off ubsan */
-static inline uint32_t _mm512_reduce_add_epu32(__m512i x) {
-    __m256i a = _mm512_extracti64x4_epi64(x, 1);
-    __m256i b = _mm512_extracti64x4_epi64(x, 0);
-
-    __m256i a_plus_b = _mm256_add_epi32(a, b);
-    __m128i c = _mm256_extracti128_si256(a_plus_b, 1);
-    __m128i d = _mm256_extracti128_si256(a_plus_b, 0);
-    __m128i c_plus_d = _mm_add_epi32(c, d);
-
-    __m128i sum1 = _mm_unpackhi_epi64(c_plus_d, c_plus_d);
-    __m128i sum2 = _mm_add_epi32(sum1, c_plus_d);
-    __m128i sum3 = _mm_shuffle_epi32(sum2, 0x01);
-    __m128i sum4 = _mm_add_epi32(sum2, sum3);
-
-    return _mm_cvtsi128_si32(sum4);
-}
-
-static inline uint32_t partial_hsum(__m512i x) {
-    /* We need a permutation vector to extract every other integer. The
-     * rest are going to be zeros. Marking this const so the compiler stands
-     * a better chance of keeping this resident in a register through entire
-     * loop execution. We certainly have enough zmm registers (32) */
-    const __m512i perm_vec = _mm512_setr_epi32(0, 2, 4, 6, 8, 10, 12, 14,
-                                               1, 1, 1, 1, 1,  1,  1,  1);
-
-    __m512i non_zero = _mm512_permutexvar_epi32(perm_vec, x);
-
-    /* From here, it's a simple 256 bit wide reduction sum */
-    __m256i non_zero_avx = _mm512_castsi512_si256(non_zero);
-
-    /* See Agner Fog's vectorclass for a decent reference. Essentially, phadd is
-     * pretty slow, much slower than the longer instruction sequence below */
-    __m128i sum1  = _mm_add_epi32(_mm256_extracti128_si256(non_zero_avx, 1),
-                                  _mm256_castsi256_si128(non_zero_avx));
-    __m128i sum2  = _mm_add_epi32(sum1,_mm_unpackhi_epi64(sum1, sum1));
-    __m128i sum3  = _mm_add_epi32(sum2,_mm_shuffle_epi32(sum2, 1));
-    return (uint32_t)_mm_cvtsi128_si32(sum3);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_tpl.h b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_tpl.h
deleted file mode 100644
index d324ce9..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_tpl.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* adler32_avx512_tpl.h -- adler32 avx512 vectorized function templates
- * Copyright (C) 2022 Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../adler32_fold.h"
-#include "../../cpu_features.h"
-#include "../../fallback_builtins.h"
-#include <immintrin.h>
-#include "adler32_avx512_p.h"
-
-#ifdef X86_AVX512_ADLER32
-
-#ifdef COPY
-Z_INTERNAL uint32_t adler32_fold_copy_avx512(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-#else
-Z_INTERNAL uint32_t adler32_avx512(uint32_t adler, const uint8_t *src, size_t len) {
-#endif
-
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
-
-    uint32_t adler0, adler1;
-    adler1 = (adler >> 16) & 0xffff;
-    adler0 = adler & 0xffff; 
-
-rem_peel:
-    if (len < 64) {
-        /* This handles the remaining copies, just call normal adler checksum after this */
-#ifdef COPY
-        __mmask64 storemask = (0xFFFFFFFFFFFFFFFFUL >> (64 - len));
-        __m512i copy_vec = _mm512_maskz_loadu_epi8(storemask, src);
-        _mm512_mask_storeu_epi8(dst, storemask, copy_vec);
-#endif
-
-#ifdef X86_AVX2_ADLER32
-        return adler32_avx2(adler, src, len);
-#elif defined(X86_SSSE3_ADLER32)
-        return adler32_ssse3(adler, src, len);
-#else
-        return adler32_len_16(adler0, src, len, adler1); 
-#endif
-    }
-
-    __m512i vbuf, vs1_0, vs3;
-
-    const __m512i dot2v = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                          20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                          38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                          56, 57, 58, 59, 60, 61, 62, 63, 64);
-    const __m512i dot3v = _mm512_set1_epi16(1);
-    const __m512i zero = _mm512_setzero_si512();
-    size_t k;
-
-    while (len >= 64) {
-        __m512i vs1 = _mm512_zextsi128_si512(_mm_cvtsi32_si128(adler0));
-        __m512i vs2 = _mm512_zextsi128_si512(_mm_cvtsi32_si128(adler1));
-        vs1_0 = vs1;
-        vs3 = _mm512_setzero_si512();
-
-        k = MIN(len, NMAX);
-        k -= k % 64;
-        len -= k;
-
-        while (k >= 64) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 64 vs1 + sum( (64-i+1) c[i] )
-            */
-            vbuf = _mm512_loadu_si512(src);
-#ifdef COPY
-            _mm512_storeu_si512(dst, vbuf);
-            dst += 64;
-#endif
-            src += 64;
-            k -= 64;
-
-            __m512i vs1_sad = _mm512_sad_epu8(vbuf, zero);
-            __m512i v_short_sum2 = _mm512_maddubs_epi16(vbuf, dot2v);
-            vs1 = _mm512_add_epi32(vs1_sad, vs1);
-            vs3 = _mm512_add_epi32(vs3, vs1_0);
-            __m512i vsum2 = _mm512_madd_epi16(v_short_sum2, dot3v);
-            vs2 = _mm512_add_epi32(vsum2, vs2);
-            vs1_0 = vs1;
-        }
-
-        vs3 = _mm512_slli_epi32(vs3, 6);
-        vs2 = _mm512_add_epi32(vs2, vs3);
-
-        adler0 = partial_hsum(vs1) % BASE;
-        adler1 = _mm512_reduce_add_epu32(vs2) % BASE;
-    }
-
-    adler = adler0 | (adler1 << 16);
-
-    /* Process tail (len < 64). */
-    if (len) {
-        goto rem_peel;
-    }
-
-    return adler; 
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_vnni.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_vnni.c b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_vnni.c
deleted file mode 100644
index 330bfe3..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_avx512_vnni.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* adler32_avx512_vnni.c -- compute the Adler-32 checksum of a data stream
- * Based on Brian Bockelman's AVX2 version
- * Copyright (C) 1995-2011 Mark Adler
- * Authors:
- *   Adam Stylinski <kungfujesus06@gmail.com>
- *   Brian Bockelman <bockelman@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef X86_AVX512VNNI_ADLER32
-
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../cpu_features.h"
-#include "../../fallback_builtins.h"
-#include <immintrin.h>
-#include "../../adler32_fold.h"
-#include "adler32_avx512_p.h"
-#include "adler32_avx2_p.h"
-
-Z_INTERNAL uint32_t adler32_avx512_vnni(uint32_t adler, const uint8_t *src, size_t len) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
-
-    uint32_t adler0, adler1;
-    adler1 = (adler >> 16) & 0xffff;
-    adler0 = adler & 0xffff; 
-
-rem_peel:
-    if (len < 32)
-#if defined(X86_SSSE3_ADLER32)
-        return adler32_ssse3(adler, src, len);
-#else
-        return adler32_len_16(adler0, src, len, adler1); 
-#endif
-
-    if (len < 64)
-#ifdef X86_AVX2_ADLER32
-        return adler32_avx2(adler, src, len);
-#elif defined(X86_SSE3_ADLER32)
-        return adler32_ssse3(adler, src, len);
-#else
-        return adler32_len_16(adler0, src, len, adler1); 
-#endif
-
-    const __m512i dot2v = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                          20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                          38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                          56, 57, 58, 59, 60, 61, 62, 63, 64);
-
-    const __m512i zero = _mm512_setzero_si512();
-    __m512i vs1, vs2;
-
-    while (len >= 64) {
-        vs1 = _mm512_zextsi128_si512(_mm_cvtsi32_si128(adler0));
-        vs2 = _mm512_zextsi128_si512(_mm_cvtsi32_si128(adler1));
-        size_t k = MIN(len, NMAX);
-        k -= k % 64;
-        len -= k;
-        __m512i vs1_0 = vs1;
-        __m512i vs3 = _mm512_setzero_si512();
-        /* We might get a tad bit more ILP here if we sum to a second register in the loop */
-        __m512i vs2_1 = _mm512_setzero_si512();
-        __m512i vbuf0, vbuf1;
-
-        /* Remainder peeling */
-        if (k % 128) {
-            vbuf1 = _mm512_loadu_si512((__m512i*)src);
-
-            src += 64;
-            k -= 64;
-
-            __m512i vs1_sad = _mm512_sad_epu8(vbuf1, zero);
-            vs1 = _mm512_add_epi32(vs1, vs1_sad);
-            vs3 = _mm512_add_epi32(vs3, vs1_0);
-            vs2 = _mm512_dpbusd_epi32(vs2, vbuf1, dot2v);
-            vs1_0 = vs1;
-        }
-
-        /* Manually unrolled this loop by 2 for an decent amount of ILP */
-        while (k >= 128) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 64 vs1 + sum( (64-i+1) c[i] )
-            */
-            vbuf0 = _mm512_loadu_si512((__m512i*)src);
-            vbuf1 = _mm512_loadu_si512((__m512i*)(src + 64));
-            src += 128;
-            k -= 128;
-
-            __m512i vs1_sad = _mm512_sad_epu8(vbuf0, zero);
-            vs1 = _mm512_add_epi32(vs1, vs1_sad);
-            vs3 = _mm512_add_epi32(vs3, vs1_0);
-            /* multiply-add, resulting in 16 ints. Fuse with sum stage from prior versions, as we now have the dp
-             * instructions to eliminate them */
-            vs2 = _mm512_dpbusd_epi32(vs2, vbuf0, dot2v);
-
-            vs3 = _mm512_add_epi32(vs3, vs1);
-            vs1_sad = _mm512_sad_epu8(vbuf1, zero);
-            vs1 = _mm512_add_epi32(vs1, vs1_sad);
-            vs2_1 = _mm512_dpbusd_epi32(vs2_1, vbuf1, dot2v);
-            vs1_0 = vs1;
-        }
-
-        vs3 = _mm512_slli_epi32(vs3, 6);
-        vs2 = _mm512_add_epi32(vs2, vs3);
-        vs2 = _mm512_add_epi32(vs2, vs2_1);
-
-        adler0 = partial_hsum(vs1) % BASE;
-        adler1 = _mm512_reduce_add_epu32(vs2) % BASE;
-    }
-
-    adler = adler0 | (adler1 << 16);
-
-    /* Process tail (len < 64). */
-    if (len) {
-        goto rem_peel;
-    }
-
-    return adler; 
-}
-
-Z_INTERNAL uint32_t adler32_fold_copy_avx512_vnni(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
-
-    uint32_t adler0, adler1;
-    adler1 = (adler >> 16) & 0xffff;
-    adler0 = adler & 0xffff; 
-
-rem_peel_copy:
-    if (len < 32) {
-        /* This handles the remaining copies, just call normal adler checksum after this */
-        __mmask32 storemask = (0xFFFFFFFFUL >> (32 - len));
-        __m256i copy_vec = _mm256_maskz_loadu_epi8(storemask, src);
-        _mm256_mask_storeu_epi8(dst, storemask, copy_vec);
-
-#if defined(X86_SSSE3_ADLER32)
-        return adler32_ssse3(adler, src, len);
-#else
-        return adler32_len_16(adler0, src, len, adler1); 
-#endif
-    }
-
-    const __m256i dot2v = _mm256_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                          20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32);
-
-    const __m256i zero = _mm256_setzero_si256();
-    __m256i vs1, vs2;
-
-    while (len >= 32) {
-        vs1 = _mm256_zextsi128_si256(_mm_cvtsi32_si128(adler0));
-        vs2 = _mm256_zextsi128_si256(_mm_cvtsi32_si128(adler1));
-        size_t k = MIN(len, NMAX);
-        k -= k % 32;
-        len -= k;
-        __m256i vs1_0 = vs1;
-        __m256i vs3 = _mm256_setzero_si256();
-        /* We might get a tad bit more ILP here if we sum to a second register in the loop */
-        __m256i vs2_1 = _mm256_setzero_si256();
-        __m256i vbuf0, vbuf1;
-
-        /* Remainder peeling */
-        if (k % 64) {
-            vbuf1 = _mm256_loadu_si256((__m256i*)src);
-            _mm256_storeu_si256((__m256i*)dst, vbuf1);
-            dst += 32;
-
-            src += 32;
-            k -= 32;
-
-            __m256i vs1_sad = _mm256_sad_epu8(vbuf1, zero);
-            vs1 = _mm256_add_epi32(vs1, vs1_sad);
-            vs3 = _mm256_add_epi32(vs3, vs1_0);
-            vs2 = _mm256_dpbusd_epi32(vs2, vbuf1, dot2v);
-            vs1_0 = vs1;
-        }
-
-        /* Manually unrolled this loop by 2 for an decent amount of ILP */
-        while (k >= 64) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 64 vs1 + sum( (64-i+1) c[i] )
-            */
-            vbuf0 = _mm256_loadu_si256((__m256i*)src);
-            vbuf1 = _mm256_loadu_si256((__m256i*)(src + 32));
-            _mm256_storeu_si256((__m256i*)dst, vbuf0);
-            _mm256_storeu_si256((__m256i*)(dst + 32), vbuf1);
-            dst += 64;
-            src += 64;
-            k -= 64;
-
-            __m256i vs1_sad = _mm256_sad_epu8(vbuf0, zero);
-            vs1 = _mm256_add_epi32(vs1, vs1_sad);
-            vs3 = _mm256_add_epi32(vs3, vs1_0);
-            /* multiply-add, resulting in 16 ints. Fuse with sum stage from prior versions, as we now have the dp
-             * instructions to eliminate them */
-            vs2 = _mm256_dpbusd_epi32(vs2, vbuf0, dot2v);
-
-            vs3 = _mm256_add_epi32(vs3, vs1);
-            vs1_sad = _mm256_sad_epu8(vbuf1, zero);
-            vs1 = _mm256_add_epi32(vs1, vs1_sad);
-            vs2_1 = _mm256_dpbusd_epi32(vs2_1, vbuf1, dot2v);
-            vs1_0 = vs1;
-        }
-
-        vs3 = _mm256_slli_epi32(vs3, 5);
-        vs2 = _mm256_add_epi32(vs2, vs3);
-        vs2 = _mm256_add_epi32(vs2, vs2_1);
-
-        adler0 = partial_hsum256(vs1) % BASE;
-        adler1 = hsum256(vs2) % BASE;
-    }
-
-    adler = adler0 | (adler1 << 16);
-
-    /* Process tail (len < 64). */
-    if (len) {
-        goto rem_peel_copy;
-    }
-
-    return adler; 
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_sse42.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_sse42.c b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_sse42.c
deleted file mode 100644
index 92efe4d..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_sse42.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* adler32_sse42.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * Authors:
- *   Adam Stylinski <kungfujesus06@gmail.com>
- *   Brian Bockelman <bockelman@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../adler32_fold.h"
-#include "adler32_ssse3_p.h"
-#include <immintrin.h>
-
-#ifdef X86_SSE42_ADLER32
-
-Z_INTERNAL uint32_t adler32_fold_copy_sse42(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-    uint32_t adler0, adler1;
-    adler1 = (adler >> 16) & 0xffff;
-    adler0 = adler & 0xffff; 
-
-rem_peel:
-    if (len < 16) {
-       return adler32_copy_len_16(adler0, src, dst, len, adler1);
-    }
-
-    __m128i vbuf, vbuf_0;
-    __m128i vs1_0, vs3, vs1, vs2, vs2_0, v_sad_sum1, v_short_sum2, v_short_sum2_0,
-            v_sad_sum2, vsum2, vsum2_0;
-    __m128i zero = _mm_setzero_si128();
-    const __m128i dot2v = _mm_setr_epi8(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17);
-    const __m128i dot2v_0 = _mm_setr_epi8(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-    const __m128i dot3v = _mm_set1_epi16(1);
-    size_t k;
-
-    while (len >= 16) {
-
-        k = MIN(len, NMAX);
-        k -= k % 16;
-        len -= k;
-
-        vs1 = _mm_cvtsi32_si128(adler0);
-        vs2 = _mm_cvtsi32_si128(adler1);
-
-        vs3 = _mm_setzero_si128();
-        vs2_0 = _mm_setzero_si128();
-        vs1_0 = vs1;
-
-        while (k >= 32) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 16 vs1 + sum( (16-i+1) c[i] )
-            */
-            vbuf = _mm_loadu_si128((__m128i*)src);
-            vbuf_0 = _mm_loadu_si128((__m128i*)(src + 16));
-            src += 32;
-            k -= 32;
-
-            v_sad_sum1 = _mm_sad_epu8(vbuf, zero);
-            v_sad_sum2 = _mm_sad_epu8(vbuf_0, zero);
-            _mm_storeu_si128((__m128i*)dst, vbuf);
-            _mm_storeu_si128((__m128i*)(dst + 16), vbuf_0);
-            dst += 32;
-
-            v_short_sum2 = _mm_maddubs_epi16(vbuf, dot2v);
-            v_short_sum2_0 = _mm_maddubs_epi16(vbuf_0, dot2v_0);
-
-            vs1 = _mm_add_epi32(v_sad_sum1, vs1);
-            vs3 = _mm_add_epi32(vs1_0, vs3);
-
-            vsum2 = _mm_madd_epi16(v_short_sum2, dot3v);
-            vsum2_0 = _mm_madd_epi16(v_short_sum2_0, dot3v);
-            vs1 = _mm_add_epi32(v_sad_sum2, vs1);
-            vs2 = _mm_add_epi32(vsum2, vs2);
-            vs2_0 = _mm_add_epi32(vsum2_0, vs2_0);
-            vs1_0 = vs1;
-        }
-
-        vs2 = _mm_add_epi32(vs2_0, vs2);
-        vs3 = _mm_slli_epi32(vs3, 5);
-        vs2 = _mm_add_epi32(vs3, vs2);
-        vs3 = _mm_setzero_si128();
-
-        while (k >= 16) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 16 vs1 + sum( (16-i+1) c[i] )
-            */
-            vbuf = _mm_loadu_si128((__m128i*)src);
-            src += 16;
-            k -= 16;
-
-            v_sad_sum1 = _mm_sad_epu8(vbuf, zero);
-            v_short_sum2 = _mm_maddubs_epi16(vbuf, dot2v_0);
-
-            vs1 = _mm_add_epi32(v_sad_sum1, vs1);
-            vs3 = _mm_add_epi32(vs1_0, vs3);
-            vsum2 = _mm_madd_epi16(v_short_sum2, dot3v);
-            vs2 = _mm_add_epi32(vsum2, vs2);
-            vs1_0 = vs1;
-
-            _mm_storeu_si128((__m128i*)dst, vbuf);
-            dst += 16;
-        }
-
-        vs3 = _mm_slli_epi32(vs3, 4);
-        vs2 = _mm_add_epi32(vs2, vs3);
-
-        adler0 = partial_hsum(vs1) % BASE;
-        adler1 = hsum(vs2) % BASE;
-    }
-
-    /* If this is true, there's fewer than 16 elements remaining */
-    if (len) {
-        goto rem_peel;
-    }
-
-    return adler0 | (adler1 << 16);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3.c b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3.c
deleted file mode 100644
index 8c55bad..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* adler32_ssse3.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
- * Authors:
- *   Adam Stylinski <kungfujesus06@gmail.com>
- *   Brian Bockelman <bockelman@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "adler32_ssse3_p.h"
-
-#ifdef X86_SSSE3_ADLER32
-
-#include <immintrin.h>
-
-Z_INTERNAL uint32_t adler32_ssse3(uint32_t adler, const unsigned char *buf, size_t len) {
-    uint32_t sum2;
-
-     /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (UNLIKELY(len == 1))
-        return adler32_len_1(adler, buf, sum2);
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (UNLIKELY(buf == NULL))
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (UNLIKELY(len < 16))
-        return adler32_len_16(adler, buf, len, sum2);
-
-    const __m128i dot2v = _mm_setr_epi8(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17);
-    const __m128i dot2v_0 = _mm_setr_epi8(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-    const __m128i dot3v = _mm_set1_epi16(1);
-    const __m128i zero = _mm_setzero_si128();
-
-    __m128i vbuf, vs1_0, vs3, vs1, vs2, vs2_0, v_sad_sum1, v_short_sum2, v_short_sum2_0,
-            vbuf_0, v_sad_sum2, vsum2, vsum2_0;
-
-    /* If our buffer is unaligned (likely), make the determination whether
-     * or not there's enough of a buffer to consume to make the scalar, aligning
-     * additions worthwhile or if it's worth it to just eat the cost of an unaligned
-     * load. This is a pretty simple test, just test if 16 - the remainder + len is
-     * < 16 */
-    size_t max_iters = NMAX;
-    size_t rem = (uintptr_t)buf & 15;
-    size_t align_offset = 16 - rem;
-    size_t k = 0;
-    if (rem) {
-        if (len < 16 + align_offset) {
-            /* Let's eat the cost of this one unaligned load so that
-             * we don't completely skip over the vectorization. Doing
-             * 16 bytes at a time unaligned is is better than 16 + <= 15
-             * sums */
-            vbuf = _mm_loadu_si128((__m128i*)buf);
-            len -= 16;
-            buf += 16;
-            vs1 = _mm_cvtsi32_si128(adler);
-            vs2 = _mm_cvtsi32_si128(sum2);
-            vs3 = _mm_setzero_si128();
-            vs1_0 = vs1;
-            goto unaligned_jmp;
-        }
-
-        for (size_t i = 0; i < align_offset; ++i) {
-            adler += *(buf++);
-            sum2 += adler;
-        }
-
-        /* lop off the max number of sums based on the scalar sums done
-         * above */
-        len -= align_offset;
-        max_iters -= align_offset;
-    }
-
-
-    while (len >= 16) {
-        vs1 = _mm_cvtsi32_si128(adler);
-        vs2 = _mm_cvtsi32_si128(sum2);
-        vs3 = _mm_setzero_si128();
-        vs2_0 = _mm_setzero_si128();
-        vs1_0 = vs1;
-
-        k = (len < max_iters ? len : max_iters);
-        k -= k % 16;
-        len -= k;
-
-        while (k >= 32) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 16 vs1 + sum( (16-i+1) c[i] )
-            */
-            vbuf = _mm_load_si128((__m128i*)buf);
-            vbuf_0 = _mm_load_si128((__m128i*)(buf + 16));
-            buf += 32;
-            k -= 32;
-
-            v_sad_sum1 = _mm_sad_epu8(vbuf, zero);
-            v_sad_sum2 = _mm_sad_epu8(vbuf_0, zero);
-            vs1 = _mm_add_epi32(v_sad_sum1, vs1);
-            vs3 = _mm_add_epi32(vs1_0, vs3);
-
-            vs1 = _mm_add_epi32(v_sad_sum2, vs1);
-            v_short_sum2 = _mm_maddubs_epi16(vbuf, dot2v);
-            vsum2 = _mm_madd_epi16(v_short_sum2, dot3v);
-            v_short_sum2_0 = _mm_maddubs_epi16(vbuf_0, dot2v_0);
-            vs2 = _mm_add_epi32(vsum2, vs2);
-            vsum2_0 = _mm_madd_epi16(v_short_sum2_0, dot3v);
-            vs2_0 = _mm_add_epi32(vsum2_0, vs2_0);
-            vs1_0 = vs1;
-        }
-
-        vs2 = _mm_add_epi32(vs2_0, vs2);
-        vs3 = _mm_slli_epi32(vs3, 5);
-        vs2 = _mm_add_epi32(vs3, vs2);
-        vs3 = _mm_setzero_si128();
-
-        while (k >= 16) {
-            /*
-               vs1 = adler + sum(c[i])
-               vs2 = sum2 + 16 vs1 + sum( (16-i+1) c[i] )
-            */
-            vbuf = _mm_load_si128((__m128i*)buf);
-            buf += 16;
-            k -= 16;
-
-unaligned_jmp:
-            v_sad_sum1 = _mm_sad_epu8(vbuf, zero);
-            vs1 = _mm_add_epi32(v_sad_sum1, vs1);
-            vs3 = _mm_add_epi32(vs1_0, vs3);
-            v_short_sum2 = _mm_maddubs_epi16(vbuf, dot2v_0);
-            vsum2 = _mm_madd_epi16(v_short_sum2, dot3v);
-            vs2 = _mm_add_epi32(vsum2, vs2);
-            vs1_0 = vs1;
-        }
-
-        vs3 = _mm_slli_epi32(vs3, 4);
-        vs2 = _mm_add_epi32(vs2, vs3);
-
-        /* We don't actually need to do a full horizontal sum, since psadbw is actually doing
-         * a partial reduction sum implicitly and only summing to integers in vector positions
-         * 0 and 2. This saves us some contention on the shuffle port(s) */
-        adler = partial_hsum(vs1) % BASE;
-        sum2 = hsum(vs2) % BASE;
-        max_iters = NMAX;
-    }
-
-    /* Process tail (len < 16).  */
-    return adler32_len_16(adler, buf, len, sum2);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3_p.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3_p.h b/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3_p.h
deleted file mode 100644
index ba914e1..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/adler32_ssse3_p.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* adler32_ssse3_p.h -- adler32 ssse3 utility functions
- * Copyright (C) 2022 Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ADLER32_SSSE3_P_H_
-#define ADLER32_SSSE3_P_H_
-
-#ifdef X86_SSSE3_ADLER32
-
-#include <immintrin.h>
-#include <stdint.h>
-
-static inline uint32_t partial_hsum(__m128i x) {
-    __m128i second_int = _mm_bsrli_si128(x, 8);
-    __m128i sum = _mm_add_epi32(x, second_int);
-    return _mm_cvtsi128_si32(sum);
-}
-
-static inline uint32_t hsum(__m128i x) {
-    __m128i sum1 = _mm_unpackhi_epi64(x, x);
-    __m128i sum2 = _mm_add_epi32(x, sum1);
-    __m128i sum3 = _mm_shuffle_epi32(sum2, 0x01);
-    __m128i sum4 = _mm_add_epi32(sum2, sum3);
-    return _mm_cvtsi128_si32(sum4);
-}
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/chunk_permute_table.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/chunk_permute_table.h b/crates/libz-sys/src/zlib-ng/arch/x86/chunk_permute_table.h
deleted file mode 100644
index c7b2d2d..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/chunk_permute_table.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* chunk_permute_table.h - shared AVX/SSE4 permutation table for use with chunkmemset family of functions.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef CHUNK_PERMUTE_TABLE_H_
-#define CHUNK_PERMUTE_TABLE_H_
-
-#include "zbuild.h"
-
-/* Need entries for all numbers not an even modulus for 1, 2, 4, 8, 16 & 32 */
-static const ALIGNED_(32) uint8_t permute_table[26*32] = {
-    0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, /* dist 3 */
-    0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, /* dist 5 */
-    0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, /* dist 6 */
-    0, 1, 2, 3, 4, 5, 6, 0, 1, 2, 3, 4, 5, 6, 0, 1, 2, 3, 4, 5, 6, 0, 1, 2, 3, 4, 5, 6, 0, 1, 2, 3, /* dist 7 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1, 2, 3, 4, /* dist 9 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, /* dist 10 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* dist 11 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 6, 7, /* dist 12 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 1, 2, 3, 4, 5, /* dist 13 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3, /* dist 14 */
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 1, /* dist 15 */
-
-    /* Beyond dists of 15 means we have to permute from a vector > len(m128i). Because AVX couldn't permute
-     * beyond 128 bit lanes until AVX512 for sub 4-byte sequences, we have to do some math here for an eventual
-     * blend with a comparison. That means we need to wrap the indices with yet another derived table. For simplicity,
-     * we'll use absolute indexing here to derive a blend vector. This is actually a lot simpler with ARM's TBL, but,
-     * this is what we're dealt.
-     */
-
-    16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* dist 17 */
-    16, 17, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, /* dist 18 */
-    16, 17, 18, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, /* dist 19 */
-    16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, /* dist 20 */
-    16, 17, 18, 19, 20, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, /* dist 21 */
-    16, 17, 18, 19, 20, 21, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* dist 22 */
-    16, 17, 18, 19, 20, 21, 22, 0, 1, 2, 3, 4, 5, 6, 7, 8, /* dist 23 */
-    16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, /* dist 24 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, /* dist 25 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 1, 2, 3, 4, 5, /* dist 26 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 0, 1, 2, 3, 4, /* dist 27 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 0, 1, 2, 3, /* dist 28 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 0, 1, 2, /* dist 29 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 1, /* dist 30 */
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 0, /* dist 31 */
-};
-
-typedef struct lut_rem_pair_s {
-    uint16_t idx;
-    uint16_t remval;
-} lut_rem_pair;
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/chunkset_avx.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_avx.c b/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_avx.c
deleted file mode 100644
index 91aaa45..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_avx.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* chunkset_avx.c -- AVX inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#include "zbuild.h"
-
-#ifdef X86_AVX_CHUNKSET
-#include <immintrin.h>
-#include "chunk_permute_table.h"
-
-typedef __m256i chunk_t;
-
-#define CHUNK_SIZE 32
-
-#define HAVE_CHUNKMEMSET_2
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-#define HAVE_CHUNK_MAG
-
-/* Populate don't cares so that this is a direct lookup (with some indirection into the permute table), because dist can
- * never be 0 - 2, we'll start with an offset, subtracting 3 from the input */
-static const lut_rem_pair perm_idx_lut[29] = {
-    { 0, 2},                /* 3 */
-    { 0, 0},                /* don't care */
-    { 1 * 32, 2},           /* 5 */
-    { 2 * 32, 2},           /* 6 */
-    { 3 * 32, 4},           /* 7 */
-    { 0 * 32, 0},           /* don't care */
-    { 4 * 32, 5},           /* 9 */
-    { 5 * 32, 22},          /* 10 */
-    { 6 * 32, 21},          /* 11 */
-    { 7 * 32, 20},          /* 12 */
-    { 8 * 32, 6},           /* 13 */
-    { 9 * 32, 4},           /* 14 */
-    {10 * 32, 2},           /* 15 */
-    { 0 * 32, 0},           /* don't care */
-    {11 * 32, 15},          /* 17 */
-    {11 * 32 + 16, 14},     /* 18 */
-    {11 * 32 + 16 * 2, 13}, /* 19 */
-    {11 * 32 + 16 * 3, 12}, /* 20 */
-    {11 * 32 + 16 * 4, 11}, /* 21 */
-    {11 * 32 + 16 * 5, 10}, /* 22 */
-    {11 * 32 + 16 * 6,  9}, /* 23 */
-    {11 * 32 + 16 * 7,  8}, /* 24 */
-    {11 * 32 + 16 * 8,  7}, /* 25 */
-    {11 * 32 + 16 * 9,  6}, /* 26 */
-    {11 * 32 + 16 * 10, 5}, /* 27 */
-    {11 * 32 + 16 * 11, 4}, /* 28 */
-    {11 * 32 + 16 * 12, 3}, /* 29 */
-    {11 * 32 + 16 * 13, 2}, /* 30 */
-    {11 * 32 + 16 * 14, 1}  /* 31 */
-};
-
-static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
-    int16_t tmp;
-    zmemcpy_2(&tmp, from);
-    *chunk = _mm256_set1_epi16(tmp);
-}
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    int32_t tmp;
-    zmemcpy_4(&tmp, from);
-    *chunk = _mm256_set1_epi32(tmp);
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    int64_t tmp;
-    zmemcpy_8(&tmp, from);
-    *chunk = _mm256_set1_epi64x(tmp);
-}
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    *chunk = _mm256_loadu_si256((__m256i *)s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    _mm256_storeu_si256((__m256i *)out, *chunk);
-}
-
-static inline chunk_t GET_CHUNK_MAG(uint8_t *buf, uint32_t *chunk_rem, uint32_t dist) {
-    lut_rem_pair lut_rem = perm_idx_lut[dist - 3];
-    __m256i ret_vec;
-    /* While technically we only need to read 4 or 8 bytes into this vector register for a lot of cases, GCC is
-     * compiling this to a shared load for all branches, preferring the simpler code.  Given that the buf value isn't in
-     * GPRs to begin with the 256 bit load is _probably_ just as inexpensive */
-    *chunk_rem = lut_rem.remval;
-
-#ifdef Z_MEMORY_SANITIZER
-    /* See note in chunkset_sse4.c for why this is ok */
-    __msan_unpoison(buf + dist, 32 - dist);
-#endif
-
-    if (dist < 16) {
-        /* This simpler case still requires us to shuffle in 128 bit lanes, so we must apply a static offset after
-         * broadcasting the first vector register to both halves. This is _marginally_ faster than doing two separate
-         * shuffles and combining the halves later */
-        const __m256i permute_xform =
-            _mm256_setr_epi8(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                             16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16);
-        __m256i perm_vec = _mm256_load_si256((__m256i*)(permute_table+lut_rem.idx));
-        __m128i ret_vec0 = _mm_loadu_si128((__m128i*)buf);
-        perm_vec = _mm256_add_epi8(perm_vec, permute_xform);
-        ret_vec = _mm256_inserti128_si256(_mm256_castsi128_si256(ret_vec0), ret_vec0, 1);
-        ret_vec = _mm256_shuffle_epi8(ret_vec, perm_vec);
-    } else if (dist == 16) {
-        __m128i ret_vec0 = _mm_loadu_si128((__m128i*)buf);
-        return _mm256_inserti128_si256(_mm256_castsi128_si256(ret_vec0), ret_vec0, 1);
-    } else {
-        __m128i ret_vec0 = _mm_loadu_si128((__m128i*)buf);
-        __m128i ret_vec1 = _mm_loadu_si128((__m128i*)(buf + 16));
-        /* Take advantage of the fact that only the latter half of the 256 bit vector will actually differ */
-        __m128i perm_vec1 = _mm_load_si128((__m128i*)(permute_table + lut_rem.idx));
-        __m128i xlane_permutes = _mm_cmpgt_epi8(_mm_set1_epi8(16), perm_vec1);
-        __m128i xlane_res  = _mm_shuffle_epi8(ret_vec0, perm_vec1);
-        /* Since we can't wrap twice, we can simply keep the later half exactly how it is instead of having to _also_
-         * shuffle those values */
-        __m128i latter_half = _mm_blendv_epi8(ret_vec1, xlane_res, xlane_permutes);
-        ret_vec = _mm256_inserti128_si256(_mm256_castsi128_si256(ret_vec0), latter_half, 1);
-    }
-
-    return ret_vec;
-}
-
-#define CHUNKSIZE        chunksize_avx
-#define CHUNKCOPY        chunkcopy_avx
-#define CHUNKCOPY_SAFE   chunkcopy_safe_avx
-#define CHUNKUNROLL      chunkunroll_avx
-#define CHUNKMEMSET      chunkmemset_avx
-#define CHUNKMEMSET_SAFE chunkmemset_safe_avx
-
-#include "chunkset_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse2.c b/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse2.c
deleted file mode 100644
index be195cf..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse2.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* chunkset_sse2.c -- SSE2 inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-
-#ifdef X86_SSE2
-#include <immintrin.h>
-
-typedef __m128i chunk_t;
-
-#define CHUNK_SIZE 16
-
-#define HAVE_CHUNKMEMSET_2
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-
-static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
-    int16_t tmp;
-    zmemcpy_2(&tmp, from);
-    *chunk = _mm_set1_epi16(tmp);
-}
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    int32_t tmp;
-    zmemcpy_4(&tmp, from);
-    *chunk = _mm_set1_epi32(tmp);
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    int64_t tmp;
-    zmemcpy_8(&tmp, from);
-    *chunk = _mm_set1_epi64x(tmp);
-}
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    *chunk = _mm_loadu_si128((__m128i *)s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    _mm_storeu_si128((__m128i *)out, *chunk);
-}
-
-#define CHUNKSIZE        chunksize_sse2
-#define CHUNKCOPY        chunkcopy_sse2
-#define CHUNKCOPY_SAFE   chunkcopy_safe_sse2
-#define CHUNKUNROLL      chunkunroll_sse2
-#define CHUNKMEMSET      chunkmemset_sse2
-#define CHUNKMEMSET_SAFE chunkmemset_safe_sse2
-
-#include "chunkset_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse41.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse41.c b/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse41.c
deleted file mode 100644
index c6f9821..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/chunkset_sse41.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* chunkset_sse41.c -- SSE4 inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-
-/* This requires SSE2 support. While it's implicit with SSE4, we can minimize
- * code size by sharing the chunkcopy functions, which will certainly compile
- * to identical machine code */
-#if defined(X86_SSE41) && defined(X86_SSE2)
-#include <immintrin.h>
-#include "chunk_permute_table.h"
-
-typedef __m128i chunk_t;
-
-#define CHUNK_SIZE 16
-
-#define HAVE_CHUNKMEMSET_2
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-#define HAVE_CHUNK_MAG
-#define HAVE_CHUNKCOPY
-#define HAVE_CHUNKUNROLL
-
-static const lut_rem_pair perm_idx_lut[13] = {
-    {0, 1},      /* 3 */
-    {0, 0},      /* don't care */
-    {1 * 32, 1}, /* 5 */
-    {2 * 32, 4}, /* 6 */
-    {3 * 32, 2}, /* 7 */
-    {0 * 32, 0}, /* don't care */
-    {4 * 32, 7}, /* 9 */
-    {5 * 32, 6}, /* 10 */
-    {6 * 32, 5}, /* 11 */
-    {7 * 32, 4}, /* 12 */
-    {8 * 32, 3}, /* 13 */
-    {9 * 32, 2}, /* 14 */
-    {10 * 32, 1},/* 15 */
-};
-
-
-static inline void chunkmemset_2(uint8_t *from, chunk_t *chunk) {
-    int16_t tmp;
-    zmemcpy_2(&tmp, from);
-    *chunk = _mm_set1_epi16(tmp);
-}
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    int32_t tmp;
-    zmemcpy_4(&tmp, from);
-    *chunk = _mm_set1_epi32(tmp);
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    int64_t tmp;
-    zmemcpy_8(&tmp, from);
-    *chunk = _mm_set1_epi64x(tmp);
-}
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    *chunk = _mm_loadu_si128((__m128i *)s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    _mm_storeu_si128((__m128i *)out, *chunk);
-}
-
-static inline chunk_t GET_CHUNK_MAG(uint8_t *buf, uint32_t *chunk_rem, uint32_t dist) {
-    lut_rem_pair lut_rem = perm_idx_lut[dist - 3];
-    __m128i perm_vec, ret_vec;
-#ifdef Z_MEMORY_SANITIZER
-    /* Important to note: 
-     * This is _not_ to subvert the memory sanitizer but to instead unpoison some
-     * bytes we willingly and purposefully load unitialized that we swizzle over
-     * in a vector register, anyway.  If what we assume is wrong about what is used,
-     * the memory sanitizer will still usefully flag it */
-    __msan_unpoison(buf + dist, 16 - dist);
-#endif
-    ret_vec = _mm_loadu_si128((__m128i*)buf);
-    *chunk_rem = lut_rem.remval;
-
-    perm_vec = _mm_load_si128((__m128i*)(permute_table + lut_rem.idx));
-    ret_vec = _mm_shuffle_epi8(ret_vec, perm_vec);
-
-    return ret_vec;
-}
-
-extern uint8_t* chunkcopy_sse2(uint8_t *out, uint8_t const *from, unsigned len);
-
-#define CHUNKSIZE            chunksize_sse41
-#define CHUNKMEMSET          chunkmemset_sse41
-#define CHUNKMEMSET_SAFE     chunkmemset_safe_sse41
-#define CHUNKCOPY(a, b, c)   chunkcopy_sse2(a, b, c)
-#define CHUNKUNROLL(a, b, c) chunkunroll_sse2(a, b, c)
-
-#include "chunkset_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/compare256_avx2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/compare256_avx2.c b/crates/libz-sys/src/zlib-ng/arch/x86/compare256_avx2.c
deleted file mode 100644
index 1318a0e..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/compare256_avx2.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* compare256_avx2.c -- AVX2 version of compare256
- * Copyright Mika T. Lindqvist  <postmaster@raasu.org>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-
-#include "fallback_builtins.h"
-
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-
-#include <immintrin.h>
-#ifdef _MSC_VER
-#  include <nmmintrin.h>
-#endif
-
-static inline uint32_t compare256_avx2_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        __m256i ymm_src0, ymm_src1, ymm_cmp;
-        ymm_src0 = _mm256_loadu_si256((__m256i*)src0);
-        ymm_src1 = _mm256_loadu_si256((__m256i*)src1);
-        ymm_cmp = _mm256_cmpeq_epi8(ymm_src0, ymm_src1); /* non-identical bytes = 00, identical bytes = FF */
-        unsigned mask = (unsigned)_mm256_movemask_epi8(ymm_cmp);
-        if (mask != 0xFFFFFFFF) {
-            uint32_t match_byte = (uint32_t)__builtin_ctz(~mask); /* Invert bits so identical = 0 */
-            return len + match_byte;
-        }
-
-        src0 += 32, src1 += 32, len += 32;
-
-        ymm_src0 = _mm256_loadu_si256((__m256i*)src0);
-        ymm_src1 = _mm256_loadu_si256((__m256i*)src1);
-        ymm_cmp = _mm256_cmpeq_epi8(ymm_src0, ymm_src1);
-        mask = (unsigned)_mm256_movemask_epi8(ymm_cmp);
-        if (mask != 0xFFFFFFFF) {
-            uint32_t match_byte = (uint32_t)__builtin_ctz(~mask);
-            return len + match_byte;
-        }
-
-        src0 += 32, src1 += 32, len += 32;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_avx2(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_avx2_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_avx2
-#define COMPARE256          compare256_avx2_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_avx2
-#define COMPARE256          compare256_avx2_static
-
-#include "match_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/compare256_sse2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/compare256_sse2.c b/crates/libz-sys/src/zlib-ng/arch/x86/compare256_sse2.c
deleted file mode 100644
index aad4bd2..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/compare256_sse2.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* compare256_sse2.c -- SSE2 version of compare256
- * Copyright Adam Stylinski <kungfujesus06@gmail.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-
-#include "fallback_builtins.h"
-
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-
-#include <emmintrin.h>
-
-static inline uint32_t compare256_sse2_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-    int align_offset = ((uintptr_t)src0) & 15;
-    const uint8_t *end0 = src0 + 256;
-    const uint8_t *end1 = src1 + 256;
-    __m128i xmm_src0, xmm_src1, xmm_cmp;
-
-    /* Do the first load unaligned, than all subsequent ones we have at least
-     * one aligned load. Sadly aligning both loads is probably unrealistic */
-    xmm_src0 = _mm_loadu_si128((__m128i*)src0);
-    xmm_src1 = _mm_loadu_si128((__m128i*)src1);
-    xmm_cmp = _mm_cmpeq_epi8(xmm_src0, xmm_src1);
-
-    unsigned mask = (unsigned)_mm_movemask_epi8(xmm_cmp);
-
-    /* Compiler _may_ turn this branch into a ptest + movemask,
-     * since a lot of those uops are shared and fused */
-    if (mask != 0xFFFF) {
-        uint32_t match_byte = (uint32_t)__builtin_ctz(~mask);
-        return len + match_byte;
-    }
-
-    int align_adv = 16 - align_offset;
-    len += align_adv;
-    src0 += align_adv;
-    src1 += align_adv;
-
-    /* Do a flooring division (should just be a shift right) */
-    int num_iter = (256 - len) / 16;
-
-    for (int i = 0; i < num_iter; ++i) {
-        xmm_src0 = _mm_load_si128((__m128i*)src0);
-        xmm_src1 = _mm_loadu_si128((__m128i*)src1);
-        xmm_cmp = _mm_cmpeq_epi8(xmm_src0, xmm_src1);
-
-        mask = (unsigned)_mm_movemask_epi8(xmm_cmp);
-
-        /* Compiler _may_ turn this branch into a ptest + movemask,
-         * since a lot of those uops are shared and fused */
-        if (mask != 0xFFFF) {
-            uint32_t match_byte = (uint32_t)__builtin_ctz(~mask);
-            return len + match_byte;
-        }
-
-        len += 16, src0 += 16, src1 += 16;
-    }
-
-    if (align_offset) {
-        src0 = end0 - 16;
-        src1 = end1 - 16;
-        len = 256 - 16;
-
-        xmm_src0 = _mm_loadu_si128((__m128i*)src0);
-        xmm_src1 = _mm_loadu_si128((__m128i*)src1);
-        xmm_cmp = _mm_cmpeq_epi8(xmm_src0, xmm_src1);
-
-        mask = (unsigned)_mm_movemask_epi8(xmm_cmp);
-
-        if (mask != 0xFFFF) {
-            uint32_t match_byte = (uint32_t)__builtin_ctz(~mask);
-            return len + match_byte;
-        }
-    }
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_sse2(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_sse2_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_sse2
-#define COMPARE256          compare256_sse2_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_sse2
-#define COMPARE256          compare256_sse2_static
-
-#include "match_tpl.h"
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_pclmulqdq.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_pclmulqdq.c b/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_pclmulqdq.c
deleted file mode 100644
index 6bb2c98..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_pclmulqdq.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Compute the CRC32 using a parallelized folding approach with the PCLMULQDQ
- * instruction.
- *
- * A white paper describing this algorithm can be found at:
- * https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Copyright (C) 2016 Marian Beermann (support for initial value)
- * Authors:
- *     Wajdi Feghali   <wajdi.k.feghali@intel.com>
- *     Jim Guilford    <james.guilford@intel.com>
- *     Vinodh Gopal    <vinodh.gopal@intel.com>
- *     Erdinc Ozturk   <erdinc.ozturk@intel.com>
- *     Jim Kukunas     <james.t.kukunas@linux.intel.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef X86_PCLMULQDQ_CRC
-#include "../../zbuild.h"
-
-#include <immintrin.h>
-#include <wmmintrin.h>
-#include <smmintrin.h> // _mm_extract_epi32
-
-#include "x86_features.h"
-#include "cpu_features.h"
-
-#include "../../crc32_fold.h"
-#include "../../crc32_braid_p.h"
-#include <assert.h>
-
-#ifdef X86_VPCLMULQDQ_CRC
-extern size_t fold_16_vpclmulqdq(__m128i *xmm_crc0, __m128i *xmm_crc1,
-    __m128i *xmm_crc2, __m128i *xmm_crc3, uint8_t *dst, const uint8_t *src, size_t len);
-extern size_t fold_16_vpclmulqdq_nocp(__m128i *xmm_crc0, __m128i *xmm_crc1,
-    __m128i *xmm_crc2, __m128i *xmm_crc3, const uint8_t *src, size_t len, __m128i init_crc,
-    int32_t first);
-#endif
-
-static void fold_1(__m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2, __m128i *xmm_crc3) {
-    const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
-                                             0x00000001, 0xc6e41596);
-    __m128i x_tmp3;
-    __m128 ps_crc0, ps_crc3, ps_res;
-
-    x_tmp3 = *xmm_crc3;
-
-    *xmm_crc3 = *xmm_crc0;
-    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-    ps_res = _mm_xor_ps(ps_crc0, ps_crc3);
-
-    *xmm_crc0 = *xmm_crc1;
-    *xmm_crc1 = *xmm_crc2;
-    *xmm_crc2 = x_tmp3;
-    *xmm_crc3 = _mm_castps_si128(ps_res);
-}
-
-static void fold_2(__m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2, __m128i *xmm_crc3) {
-    const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
-                                             0x00000001, 0xc6e41596);
-    __m128i x_tmp3, x_tmp2;
-    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res31, ps_res20;
-
-    x_tmp3 = *xmm_crc3;
-    x_tmp2 = *xmm_crc2;
-
-    *xmm_crc3 = *xmm_crc1;
-    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-    ps_res31 = _mm_xor_ps(ps_crc3, ps_crc1);
-
-    *xmm_crc2 = *xmm_crc0;
-    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
-    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-    ps_res20 = _mm_xor_ps(ps_crc0, ps_crc2);
-
-    *xmm_crc0 = x_tmp2;
-    *xmm_crc1 = x_tmp3;
-    *xmm_crc2 = _mm_castps_si128(ps_res20);
-    *xmm_crc3 = _mm_castps_si128(ps_res31);
-}
-
-static void fold_3(__m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2, __m128i *xmm_crc3) {
-    const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
-                                             0x00000001, 0xc6e41596);
-    __m128i x_tmp3;
-    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res32, ps_res21, ps_res10;
-
-    x_tmp3 = *xmm_crc3;
-
-    *xmm_crc3 = *xmm_crc2;
-    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
-    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-    ps_res32 = _mm_xor_ps(ps_crc2, ps_crc3);
-
-    *xmm_crc2 = *xmm_crc1;
-    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
-    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-    ps_res21 = _mm_xor_ps(ps_crc1, ps_crc2);
-
-    *xmm_crc1 = *xmm_crc0;
-    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x10);
-    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-    ps_res10 = _mm_xor_ps(ps_crc0, ps_crc1);
-
-    *xmm_crc0 = x_tmp3;
-    *xmm_crc1 = _mm_castps_si128(ps_res10);
-    *xmm_crc2 = _mm_castps_si128(ps_res21);
-    *xmm_crc3 = _mm_castps_si128(ps_res32);
-}
-
-static void fold_4(__m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2, __m128i *xmm_crc3) {
-    const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
-                                             0x00000001, 0xc6e41596);
-    __m128i x_tmp0, x_tmp1, x_tmp2, x_tmp3;
-    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3;
-    __m128 ps_t0, ps_t1, ps_t2, ps_t3;
-    __m128 ps_res0, ps_res1, ps_res2, ps_res3;
-
-    x_tmp0 = *xmm_crc0;
-    x_tmp1 = *xmm_crc1;
-    x_tmp2 = *xmm_crc2;
-    x_tmp3 = *xmm_crc3;
-
-    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-    x_tmp0 = _mm_clmulepi64_si128(x_tmp0, xmm_fold4, 0x10);
-    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-    ps_t0 = _mm_castsi128_ps(x_tmp0);
-    ps_res0 = _mm_xor_ps(ps_crc0, ps_t0);
-
-    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-    x_tmp1 = _mm_clmulepi64_si128(x_tmp1, xmm_fold4, 0x10);
-    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-    ps_t1 = _mm_castsi128_ps(x_tmp1);
-    ps_res1 = _mm_xor_ps(ps_crc1, ps_t1);
-
-    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
-    x_tmp2 = _mm_clmulepi64_si128(x_tmp2, xmm_fold4, 0x10);
-    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-    ps_t2 = _mm_castsi128_ps(x_tmp2);
-    ps_res2 = _mm_xor_ps(ps_crc2, ps_t2);
-
-    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x01);
-    x_tmp3 = _mm_clmulepi64_si128(x_tmp3, xmm_fold4, 0x10);
-    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-    ps_t3 = _mm_castsi128_ps(x_tmp3);
-    ps_res3 = _mm_xor_ps(ps_crc3, ps_t3);
-
-    *xmm_crc0 = _mm_castps_si128(ps_res0);
-    *xmm_crc1 = _mm_castps_si128(ps_res1);
-    *xmm_crc2 = _mm_castps_si128(ps_res2);
-    *xmm_crc3 = _mm_castps_si128(ps_res3);
-}
-
-static const unsigned ALIGNED_(32) pshufb_shf_table[60] = {
-    0x84838281, 0x88878685, 0x8c8b8a89, 0x008f8e8d, /* shl 15 (16 - 1)/shr1 */
-    0x85848382, 0x89888786, 0x8d8c8b8a, 0x01008f8e, /* shl 14 (16 - 3)/shr2 */
-    0x86858483, 0x8a898887, 0x8e8d8c8b, 0x0201008f, /* shl 13 (16 - 4)/shr3 */
-    0x87868584, 0x8b8a8988, 0x8f8e8d8c, 0x03020100, /* shl 12 (16 - 4)/shr4 */
-    0x88878685, 0x8c8b8a89, 0x008f8e8d, 0x04030201, /* shl 11 (16 - 5)/shr5 */
-    0x89888786, 0x8d8c8b8a, 0x01008f8e, 0x05040302, /* shl 10 (16 - 6)/shr6 */
-    0x8a898887, 0x8e8d8c8b, 0x0201008f, 0x06050403, /* shl  9 (16 - 7)/shr7 */
-    0x8b8a8988, 0x8f8e8d8c, 0x03020100, 0x07060504, /* shl  8 (16 - 8)/shr8 */
-    0x8c8b8a89, 0x008f8e8d, 0x04030201, 0x08070605, /* shl  7 (16 - 9)/shr9 */
-    0x8d8c8b8a, 0x01008f8e, 0x05040302, 0x09080706, /* shl  6 (16 -10)/shr10*/
-    0x8e8d8c8b, 0x0201008f, 0x06050403, 0x0a090807, /* shl  5 (16 -11)/shr11*/
-    0x8f8e8d8c, 0x03020100, 0x07060504, 0x0b0a0908, /* shl  4 (16 -12)/shr12*/
-    0x008f8e8d, 0x04030201, 0x08070605, 0x0c0b0a09, /* shl  3 (16 -13)/shr13*/
-    0x01008f8e, 0x05040302, 0x09080706, 0x0d0c0b0a, /* shl  2 (16 -14)/shr14*/
-    0x0201008f, 0x06050403, 0x0a090807, 0x0e0d0c0b  /* shl  1 (16 -15)/shr15*/
-};
-
-static void partial_fold(const size_t len, __m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2,
-                         __m128i *xmm_crc3, __m128i *xmm_crc_part) {
-
-    const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
-                                             0x00000001, 0xc6e41596);
-    const __m128i xmm_mask3 = _mm_set1_epi32((int32_t)0x80808080);
-
-    __m128i xmm_shl, xmm_shr, xmm_tmp1, xmm_tmp2, xmm_tmp3;
-    __m128i xmm_a0_0, xmm_a0_1;
-    __m128 ps_crc3, psa0_0, psa0_1, ps_res;
-
-    xmm_shl = _mm_load_si128((__m128i *)pshufb_shf_table + (len - 1));
-    xmm_shr = xmm_shl;
-    xmm_shr = _mm_xor_si128(xmm_shr, xmm_mask3);
-
-    xmm_a0_0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shl);
-
-    *xmm_crc0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shr);
-    xmm_tmp1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shl);
-    *xmm_crc0 = _mm_or_si128(*xmm_crc0, xmm_tmp1);
-
-    *xmm_crc1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shr);
-    xmm_tmp2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shl);
-    *xmm_crc1 = _mm_or_si128(*xmm_crc1, xmm_tmp2);
-
-    *xmm_crc2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shr);
-    xmm_tmp3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shl);
-    *xmm_crc2 = _mm_or_si128(*xmm_crc2, xmm_tmp3);
-
-    *xmm_crc3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shr);
-    *xmm_crc_part = _mm_shuffle_epi8(*xmm_crc_part, xmm_shl);
-    *xmm_crc3 = _mm_or_si128(*xmm_crc3, *xmm_crc_part);
-
-    xmm_a0_1 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x10);
-    xmm_a0_0 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x01);
-
-    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-    psa0_0 = _mm_castsi128_ps(xmm_a0_0);
-    psa0_1 = _mm_castsi128_ps(xmm_a0_1);
-
-    ps_res = _mm_xor_ps(ps_crc3, psa0_0);
-    ps_res = _mm_xor_ps(ps_res, psa0_1);
-
-    *xmm_crc3 = _mm_castps_si128(ps_res);
-}
-
-static inline void crc32_fold_load(__m128i *fold, __m128i *fold0, __m128i *fold1, __m128i *fold2, __m128i *fold3) {
-    *fold0 = _mm_load_si128(fold + 0);
-    *fold1 = _mm_load_si128(fold + 1);
-    *fold2 = _mm_load_si128(fold + 2);
-    *fold3 = _mm_load_si128(fold + 3);
-}
-
-static inline void crc32_fold_save(__m128i *fold, __m128i fold0, __m128i fold1, __m128i fold2, __m128i fold3) {
-    _mm_storeu_si128(fold + 0, fold0);
-    _mm_storeu_si128(fold + 1, fold1);
-    _mm_storeu_si128(fold + 2, fold2);
-    _mm_storeu_si128(fold + 3, fold3);
-}
-
-static inline void crc32_fold_save_partial(__m128i *fold, __m128i foldp) {
-    _mm_store_si128(fold + 4, foldp);
-}
-
-Z_INTERNAL uint32_t crc32_fold_reset_pclmulqdq(crc32_fold *crc) {
-    __m128i xmm_crc0 = _mm_cvtsi32_si128(0x9db42487);
-    __m128i xmm_zero = _mm_setzero_si128();
-    crc32_fold_save((__m128i *)crc->fold, xmm_crc0, xmm_zero, xmm_zero, xmm_zero);
-    return 0;
-}
-
-Z_INTERNAL void crc32_fold_copy_pclmulqdq(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len) {
-    unsigned long algn_diff;
-    __m128i xmm_t0, xmm_t1, xmm_t2, xmm_t3;
-    __m128i xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3, xmm_crc_part;
-    char ALIGNED_(16) partial_buf[16] = { 0 };
-
-    crc32_fold_load((__m128i *)crc->fold, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-    if (len < 16) {
-        if (len == 0)
-            return;
-
-        memcpy(partial_buf, src, len);
-        xmm_crc_part = _mm_load_si128((const __m128i *)partial_buf);
-        memcpy(dst, partial_buf, len);
-        goto partial;
-    }
-
-    algn_diff = ((uintptr_t)16 - ((uintptr_t)src & 0xF)) & 0xF;
-    if (algn_diff) {
-        xmm_crc_part = _mm_loadu_si128((__m128i *)src);
-        _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
-
-        dst += algn_diff;
-        src += algn_diff;
-        len -= algn_diff;
-
-        partial_fold(algn_diff, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
-    } else {
-        xmm_crc_part = _mm_setzero_si128();
-    }
-
-#ifdef X86_VPCLMULQDQ_CRC
-    if (x86_cpu_has_vpclmulqdq && x86_cpu_has_avx512 && (len >= 256)) {
-        size_t n = fold_16_vpclmulqdq(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, dst, src, len);
-
-        len -= n;
-        src += n;
-        dst += n;
-    }
-#endif
-
-    while (len >= 64) {
-        crc32_fold_load((__m128i *)src, &xmm_t0, &xmm_t1, &xmm_t2, &xmm_t3);
-
-        fold_4(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        crc32_fold_save((__m128i *)dst, xmm_t0, xmm_t1, xmm_t2, xmm_t3);
-
-        xmm_crc0 = _mm_xor_si128(xmm_crc0, xmm_t0);
-        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t1);
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t2);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t3);
-
-        src += 64;
-        dst += 64;
-        len -= 64;
-    }
-
-    /*
-     * len = num bytes left - 64
-     */
-    if (len >= 48) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
-
-        fold_3(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
-        _mm_storeu_si128((__m128i *)dst + 2, xmm_t2);
-
-        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t0);
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t1);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t2);
-        len -= 48;
-        if (len == 0)
-            goto done;
-
-        dst += 48;
-        memcpy(&xmm_crc_part, (__m128i *)src + 3, len);
-    } else if (len >= 32) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-
-        fold_2(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
-
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t0);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t1);
-
-        len -= 32;
-        if (len == 0)
-            goto done;
-
-        dst += 32;
-        memcpy(&xmm_crc_part, (__m128i *)src + 2, len);
-    } else if (len >= 16) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-
-        fold_1(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
-
-        len -= 16;
-        if (len == 0)
-            goto done;
-
-        dst += 16;
-        memcpy(&xmm_crc_part, (__m128i *)src + 1, len);
-    } else {
-        if (len == 0)
-            goto done;
-        memcpy(&xmm_crc_part, src, len);
-    }
-
-    _mm_storeu_si128((__m128i *)partial_buf, xmm_crc_part);
-    memcpy(dst, partial_buf, len);
-
-partial:
-    partial_fold((size_t)len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
-done:
-    crc32_fold_save((__m128i *)crc->fold, xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3);
-    crc32_fold_save_partial((__m128i *)crc->fold, xmm_crc_part);
-}
-
-#define ONCE(op) if (first) { \
-    first = 0; \
-    (op); \
-}
-#define XOR_INITIAL(where) ONCE(where = _mm_xor_si128(where, xmm_initial))
-
-Z_INTERNAL void crc32_fold_pclmulqdq(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc) {
-    unsigned long algn_diff;
-    __m128i xmm_t0, xmm_t1, xmm_t2, xmm_t3;
-    __m128i xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3, xmm_crc_part;
-    __m128i xmm_initial = _mm_cvtsi32_si128(init_crc);
-    xmm_crc_part = _mm_setzero_si128();
-    int32_t first = init_crc != 0;
-
-    /* Technically the CRC functions don't even call this for input < 64, but a bare minimum of 31
-     * bytes of input is needed for the aligning load that occurs.  If there's an initial CRC, to
-     * carry it forward through the folded CRC there must be 16 - src % 16 + 16 bytes available, which
-     * by definition can be up to 15 bytes + one full vector load. */
-    assert(len >= 31 || first == 0);
-    crc32_fold_load((__m128i *)crc->fold, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-    if (len < 16) {
-        goto partial_nocpy;
-    }
-
-    algn_diff = ((uintptr_t)16 - ((uintptr_t)src & 0xF)) & 0xF;
-    if (algn_diff) {
-        if (algn_diff >= 4 || init_crc == 0) {
-            xmm_crc_part = _mm_loadu_si128((__m128i *)src);
-
-            src += algn_diff;
-            len -= algn_diff;
-
-            XOR_INITIAL(xmm_crc_part);
-            partial_fold(algn_diff, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
-        } else {
-            xmm_t0 = _mm_loadu_si128((__m128i*)src);
-            xmm_crc_part = _mm_loadu_si128((__m128i*)src + 1);
-            XOR_INITIAL(xmm_t0);
-            fold_1(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-            xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
-            partial_fold(algn_diff, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
-
-            src += (algn_diff + 16);
-            len -= (algn_diff + 16);
-        }
-
-        xmm_crc_part = _mm_setzero_si128();
-    }
-
-#ifdef X86_VPCLMULQDQ_CRC
-    if (x86_cpu_has_vpclmulqdq && x86_cpu_has_avx512 && (len >= 256)) {
-        size_t n = fold_16_vpclmulqdq_nocp(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, src, len,
-                xmm_initial, first);
-        first = 0;
-
-        len -= n;
-        src += n;
-    }
-#endif
-
-    while (len >= 64) {
-        crc32_fold_load((__m128i *)src, &xmm_t0, &xmm_t1, &xmm_t2, &xmm_t3);
-        XOR_INITIAL(xmm_t0);
-        fold_4(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        xmm_crc0 = _mm_xor_si128(xmm_crc0, xmm_t0);
-        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t1);
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t2);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t3);
-
-        src += 64;
-        len -= 64;
-    }
-
-    /*
-     * len = num bytes left - 64
-     */
-    if (len >= 48) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
-        XOR_INITIAL(xmm_t0);
-
-        fold_3(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t0);
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t1);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t2);
-        len -= 48;
-        src += 48;
-    } else if (len >= 32) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-        XOR_INITIAL(xmm_t0);
-
-        fold_2(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t0);
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t1);
-
-        len -= 32;
-        src += 32;
-    } else if (len >= 16) {
-        xmm_t0 = _mm_load_si128((__m128i *)src);
-        XOR_INITIAL(xmm_t0);
-
-        fold_1(&xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
-
-        len -= 16;
-        src += 16;
-    }
-
-partial_nocpy:
-    if (len) {
-        memcpy(&xmm_crc_part, src, len);
-        partial_fold((size_t)len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
-    }
-
-    crc32_fold_save((__m128i *)crc->fold, xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3);
-}
-
-static const unsigned ALIGNED_(16) crc_k[] = {
-    0xccaa009e, 0x00000000, /* rk1 */
-    0x751997d0, 0x00000001, /* rk2 */
-    0xccaa009e, 0x00000000, /* rk5 */
-    0x63cd6124, 0x00000001, /* rk6 */
-    0xf7011640, 0x00000001, /* rk7 */
-    0xdb710640, 0x00000001  /* rk8 */
-};
-
-static const unsigned ALIGNED_(16) crc_mask[4] = {
-    0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000
-};
-
-static const unsigned ALIGNED_(16) crc_mask2[4] = {
-    0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
-};
-
-Z_INTERNAL uint32_t crc32_fold_final_pclmulqdq(crc32_fold *crc) {
-    const __m128i xmm_mask  = _mm_load_si128((__m128i *)crc_mask);
-    const __m128i xmm_mask2 = _mm_load_si128((__m128i *)crc_mask2);
-    __m128i xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3;
-    __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
-
-    crc32_fold_load((__m128i *)crc->fold, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-
-    /*
-     * k1
-     */
-    crc_fold = _mm_load_si128((__m128i *)crc_k);
-
-    x_tmp0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x10);
-    xmm_crc0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x01);
-    xmm_crc1 = _mm_xor_si128(xmm_crc1, x_tmp0);
-    xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_crc0);
-
-    x_tmp1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x10);
-    xmm_crc1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x01);
-    xmm_crc2 = _mm_xor_si128(xmm_crc2, x_tmp1);
-    xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_crc1);
-
-    x_tmp2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x10);
-    xmm_crc2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x01);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, x_tmp2);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-
-    /*
-     * k5
-     */
-    crc_fold = _mm_load_si128((__m128i *)crc_k + 1);
-
-    xmm_crc0 = xmm_crc3;
-    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
-    xmm_crc0 = _mm_srli_si128(xmm_crc0, 8);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
-
-    xmm_crc0 = xmm_crc3;
-    xmm_crc3 = _mm_slli_si128(xmm_crc3, 4);
-    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
-    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask2);
-
-    /*
-     * k7
-     */
-    xmm_crc1 = xmm_crc3;
-    xmm_crc2 = xmm_crc3;
-    crc_fold = _mm_load_si128((__m128i *)crc_k + 2);
-
-    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask);
-
-    xmm_crc2 = xmm_crc3;
-    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc1);
-
-    crc->value = ~((uint32_t)_mm_extract_epi32(xmm_crc3, 2));
-
-    return crc->value;
-}
-
-uint32_t crc32_pclmulqdq(uint32_t crc32, const unsigned char* buf, uint64_t len) {
-    /* For lens < 64, crc32_braid method is faster. The CRC32 instruction for
-     * these short lengths might also prove to be effective */
-    if (len < 64)
-        return crc32_braid(crc32, buf, len);
-
-    crc32_fold ALIGNED_(16) crc_state;
-    crc32_fold_reset_pclmulqdq(&crc_state);
-    crc32_fold_pclmulqdq(&crc_state, buf, len, crc32);
-    return crc32_fold_final_pclmulqdq(&crc_state);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_vpclmulqdq.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_vpclmulqdq.c b/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_vpclmulqdq.c
deleted file mode 100644
index dfcdc8a..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/crc32_fold_vpclmulqdq.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* crc32_fold_vpclmulqdq.c -- VPCMULQDQ-based CRC32 folding implementation.
- * Copyright Wangyang Guo (wangyang.guo@intel.com)
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef X86_VPCLMULQDQ_CRC
-#include "../../zbuild.h"
-#include "../../fallback_builtins.h"
-
-#include <immintrin.h>
-
-#define ONCE(op) if (first) { \
-    first = 0; \
-    (op); \
-}
-#define XOR_INITIAL(where) ONCE(where = _mm512_xor_si512(where, zmm_initial))
-
-size_t fold_16_vpclmulqdq(__m128i *xmm_crc0, __m128i *xmm_crc1,
-    __m128i *xmm_crc2, __m128i *xmm_crc3, uint8_t *dst, const uint8_t *src, size_t len) {
-    size_t len_tmp = len;
-    __m512i zmm_t0, zmm_t1, zmm_t2, zmm_t3;
-    __m512i zmm_crc0, zmm_crc1, zmm_crc2, zmm_crc3;
-    __m512i z0, z1, z2, z3;
-    const __m512i zmm_fold4 = _mm512_set4_epi32(
-        0x00000001, 0x54442bd4, 0x00000001, 0xc6e41596);
-    const __m512i zmm_fold16 = _mm512_set4_epi32(
-        0x00000001, 0x1542778a, 0x00000001, 0x322d1430);
-
-    // zmm register init
-    zmm_crc0 = _mm512_setzero_si512();
-    zmm_t0 = _mm512_loadu_si512((__m512i *)src);
-    zmm_crc1 = _mm512_loadu_si512((__m512i *)src + 1);
-    zmm_crc2 = _mm512_loadu_si512((__m512i *)src + 2);
-    zmm_crc3 = _mm512_loadu_si512((__m512i *)src + 3);
-
-    /* already have intermediate CRC in xmm registers
-        * fold4 with 4 xmm_crc to get zmm_crc0
-    */
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc0, 0);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc1, 1);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc2, 2);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc3, 3);
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_t0);
-
-    _mm512_storeu_si512((__m512i *)dst, zmm_t0);
-    _mm512_storeu_si512((__m512i *)dst + 1, zmm_crc1);
-    _mm512_storeu_si512((__m512i *)dst + 2, zmm_crc2);
-    _mm512_storeu_si512((__m512i *)dst + 3, zmm_crc3);
-    len -= 256;
-    src += 256;
-    dst += 256;
-
-    // fold-16 loops
-    while (len >= 256) {
-        zmm_t0 = _mm512_loadu_si512((__m512i *)src);
-        zmm_t1 = _mm512_loadu_si512((__m512i *)src + 1);
-        zmm_t2 = _mm512_loadu_si512((__m512i *)src + 2);
-        zmm_t3 = _mm512_loadu_si512((__m512i *)src + 3);
-
-        z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold16, 0x01);
-        z1 = _mm512_clmulepi64_epi128(zmm_crc1, zmm_fold16, 0x01);
-        z2 = _mm512_clmulepi64_epi128(zmm_crc2, zmm_fold16, 0x01);
-        z3 = _mm512_clmulepi64_epi128(zmm_crc3, zmm_fold16, 0x01);
-
-        zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold16, 0x10);
-        zmm_crc1 = _mm512_clmulepi64_epi128(zmm_crc1, zmm_fold16, 0x10);
-        zmm_crc2 = _mm512_clmulepi64_epi128(zmm_crc2, zmm_fold16, 0x10);
-        zmm_crc3 = _mm512_clmulepi64_epi128(zmm_crc3, zmm_fold16, 0x10);
-
-        zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-        zmm_crc1 = _mm512_xor_si512(z1, zmm_crc1);
-        zmm_crc2 = _mm512_xor_si512(z2, zmm_crc2);
-        zmm_crc3 = _mm512_xor_si512(z3, zmm_crc3);
-
-        zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_t0);
-        zmm_crc1 = _mm512_xor_si512(zmm_crc1, zmm_t1);
-        zmm_crc2 = _mm512_xor_si512(zmm_crc2, zmm_t2);
-        zmm_crc3 = _mm512_xor_si512(zmm_crc3, zmm_t3);
-
-        _mm512_storeu_si512((__m512i *)dst, zmm_t0);
-        _mm512_storeu_si512((__m512i *)dst + 1, zmm_t1);
-        _mm512_storeu_si512((__m512i *)dst + 2, zmm_t2);
-        _mm512_storeu_si512((__m512i *)dst + 3, zmm_t3);
-        len -= 256;
-        src += 256;
-        dst += 256;
-    }
-    // zmm_crc[0,1,2,3] -> zmm_crc0
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc1);
-
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc2);
-
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc3);
-
-    // zmm_crc0 -> xmm_crc[0, 1, 2, 3]
-    *xmm_crc0 = _mm512_extracti32x4_epi32(zmm_crc0, 0);
-    *xmm_crc1 = _mm512_extracti32x4_epi32(zmm_crc0, 1);
-    *xmm_crc2 = _mm512_extracti32x4_epi32(zmm_crc0, 2);
-    *xmm_crc3 = _mm512_extracti32x4_epi32(zmm_crc0, 3);
-
-    return (len_tmp - len);  // return n bytes processed
-}
-
-size_t fold_16_vpclmulqdq_nocp(__m128i *xmm_crc0, __m128i *xmm_crc1,
-    __m128i *xmm_crc2, __m128i *xmm_crc3, const uint8_t *src, size_t len,
-    __m128i init_crc, int32_t first) {
-    size_t len_tmp = len;
-    __m512i zmm_t0, zmm_t1, zmm_t2, zmm_t3;
-    __m512i zmm_crc0, zmm_crc1, zmm_crc2, zmm_crc3;
-    __m512i z0, z1, z2, z3;
-    __m512i zmm_initial = _mm512_zextsi128_si512(init_crc);
-    const __m512i zmm_fold4 = _mm512_set4_epi32(
-        0x00000001, 0x54442bd4, 0x00000001, 0xc6e41596);
-    const __m512i zmm_fold16 = _mm512_set4_epi32(
-        0x00000001, 0x1542778a, 0x00000001, 0x322d1430);
-
-    // zmm register init
-    zmm_crc0 = _mm512_setzero_si512();
-    zmm_t0 = _mm512_loadu_si512((__m512i *)src);
-    XOR_INITIAL(zmm_t0);
-    zmm_crc1 = _mm512_loadu_si512((__m512i *)src + 1);
-    zmm_crc2 = _mm512_loadu_si512((__m512i *)src + 2);
-    zmm_crc3 = _mm512_loadu_si512((__m512i *)src + 3);
-
-    /* already have intermediate CRC in xmm registers
-        * fold4 with 4 xmm_crc to get zmm_crc0
-    */
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc0, 0);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc1, 1);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc2, 2);
-    zmm_crc0 = _mm512_inserti32x4(zmm_crc0, *xmm_crc3, 3);
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_t0);
-
-    len -= 256;
-    src += 256;
-
-    // fold-16 loops
-    while (len >= 256) {
-        zmm_t0 = _mm512_loadu_si512((__m512i *)src);
-        zmm_t1 = _mm512_loadu_si512((__m512i *)src + 1);
-        zmm_t2 = _mm512_loadu_si512((__m512i *)src + 2);
-        zmm_t3 = _mm512_loadu_si512((__m512i *)src + 3);
-
-        z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold16, 0x01);
-        z1 = _mm512_clmulepi64_epi128(zmm_crc1, zmm_fold16, 0x01);
-        z2 = _mm512_clmulepi64_epi128(zmm_crc2, zmm_fold16, 0x01);
-        z3 = _mm512_clmulepi64_epi128(zmm_crc3, zmm_fold16, 0x01);
-
-        zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold16, 0x10);
-        zmm_crc1 = _mm512_clmulepi64_epi128(zmm_crc1, zmm_fold16, 0x10);
-        zmm_crc2 = _mm512_clmulepi64_epi128(zmm_crc2, zmm_fold16, 0x10);
-        zmm_crc3 = _mm512_clmulepi64_epi128(zmm_crc3, zmm_fold16, 0x10);
-
-        zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-        zmm_crc1 = _mm512_xor_si512(z1, zmm_crc1);
-        zmm_crc2 = _mm512_xor_si512(z2, zmm_crc2);
-        zmm_crc3 = _mm512_xor_si512(z3, zmm_crc3);
-
-        zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_t0);
-        zmm_crc1 = _mm512_xor_si512(zmm_crc1, zmm_t1);
-        zmm_crc2 = _mm512_xor_si512(zmm_crc2, zmm_t2);
-        zmm_crc3 = _mm512_xor_si512(zmm_crc3, zmm_t3);
-
-        len -= 256;
-        src += 256;
-    }
-    // zmm_crc[0,1,2,3] -> zmm_crc0
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc1);
-
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc2);
-
-    z0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x01);
-    zmm_crc0 = _mm512_clmulepi64_epi128(zmm_crc0, zmm_fold4, 0x10);
-    zmm_crc0 = _mm512_xor_si512(z0, zmm_crc0);
-    zmm_crc0 = _mm512_xor_si512(zmm_crc0, zmm_crc3);
-
-    // zmm_crc0 -> xmm_crc[0, 1, 2, 3]
-    *xmm_crc0 = _mm512_extracti32x4_epi32(zmm_crc0, 0);
-    *xmm_crc1 = _mm512_extracti32x4_epi32(zmm_crc0, 1);
-    *xmm_crc2 = _mm512_extracti32x4_epi32(zmm_crc0, 2);
-    *xmm_crc3 = _mm512_extracti32x4_epi32(zmm_crc0, 3);
-
-    return (len_tmp - len);  // return n bytes processed
-}
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/insert_string_sse42.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/insert_string_sse42.c b/crates/libz-sys/src/zlib-ng/arch/x86/insert_string_sse42.c
deleted file mode 100644
index 6fe4c81..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/insert_string_sse42.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* insert_string_sse42.c -- insert_string integer hash variant using SSE4.2's CRC instructions
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#include "../../zbuild.h"
-#include <immintrin.h>
-#ifdef _MSC_VER
-#  include <nmmintrin.h>
-#endif
-#include "../../deflate.h"
-
-#ifdef X86_SSE42_CRC_INTRIN
-#  ifdef _MSC_VER
-#    define HASH_CALC(s, h, val)\
-        h = _mm_crc32_u32(h, val)
-#  else
-#    define HASH_CALC(s, h, val)\
-        h = __builtin_ia32_crc32si(h, val)
-#  endif
-#else
-#  ifdef _MSC_VER
-#    define HASH_CALC(s, h, val) {\
-        __asm mov edx, h\
-        __asm mov eax, val\
-        __asm crc32 eax, edx\
-        __asm mov h, eax\
-    }
-#  else
-#    define HASH_CALC(s, h, val) \
-        __asm__ __volatile__ (\
-            "crc32 %1,%0\n\t"\
-            : "+r" (h)\
-            : "r" (val)\
-        );
-#  endif
-#endif
-
-#define HASH_CALC_VAR       h
-#define HASH_CALC_VAR_INIT  uint32_t h = 0
-
-#define UPDATE_HASH         update_hash_sse4
-#define INSERT_STRING       insert_string_sse4
-#define QUICK_INSERT_STRING quick_insert_string_sse4
-
-#ifdef X86_SSE42_CRC_HASH
-#  include "../../insert_string_tpl.h"
-#endif

crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_avx2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_avx2.c b/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_avx2.c
deleted file mode 100644
index 94fe10c..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_avx2.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * AVX2 optimized hash slide, based on Intel's slide_sse implementation
- *
- * Copyright (C) 2017 Intel Corporation
- * Authors:
- *   Arjan van de Ven   <arjan@linux.intel.com>
- *   Jim Kukunas        <james.t.kukunas@linux.intel.com>
- *   Mika T. Lindqvist  <postmaster@raasu.org>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#include "../../zbuild.h"
-#include "../../deflate.h"
-
-#include <immintrin.h>
-
-static inline void slide_hash_chain(Pos *table, uint32_t entries, const __m256i wsize) {
-    table += entries;
-    table -= 16;
-
-    do {
-        __m256i value, result;
-
-        value = _mm256_loadu_si256((__m256i *)table);
-        result = _mm256_subs_epu16(value, wsize);
-        _mm256_storeu_si256((__m256i *)table, result);
-
-        table -= 16;
-        entries -= 16;
-    } while (entries > 0);
-}
-
-Z_INTERNAL void slide_hash_avx2(deflate_state *s) {
-    uint16_t wsize = (uint16_t)s->w_size;
-    const __m256i ymm_wsize = _mm256_set1_epi16((short)wsize);
-
-    slide_hash_chain(s->head, HASH_SIZE, ymm_wsize);
-    slide_hash_chain(s->prev, wsize, ymm_wsize);
-}

crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_sse2.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_sse2.c b/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_sse2.c
deleted file mode 100644
index 5daac4a..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/slide_hash_sse2.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SSE optimized hash slide
- *
- * Copyright (C) 2017 Intel Corporation
- * Authors:
- *   Arjan van de Ven   <arjan@linux.intel.com>
- *   Jim Kukunas        <james.t.kukunas@linux.intel.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#include "../../zbuild.h"
-#include "../../deflate.h"
-
-#include <immintrin.h>
-#include <assert.h>
-
-static inline void slide_hash_chain(Pos *table0, Pos *table1, uint32_t entries0,
-                                    uint32_t entries1, const __m128i wsize) {
-    uint32_t entries;
-    Pos *table;
-    __m128i value0, value1, result0, result1;
-
-    int on_chain = 0;
-
-next_chain:
-    table = (on_chain) ? table1 : table0;
-    entries = (on_chain) ? entries1 : entries0;
-
-    table += entries;
-    table -= 16;
-
-    /* ZALLOC allocates this pointer unless the user chose a custom allocator.
-     * Our alloc function is aligned to 64 byte boundaries */
-    do {
-        value0 = _mm_load_si128((__m128i *)table);
-        value1 = _mm_load_si128((__m128i *)(table + 8));
-        result0 = _mm_subs_epu16(value0, wsize);
-        result1 = _mm_subs_epu16(value1, wsize);
-        _mm_store_si128((__m128i *)table, result0);
-        _mm_store_si128((__m128i *)(table + 8), result1);
-
-        table -= 16;
-        entries -= 16;
-    } while (entries > 0);
-
-    ++on_chain;
-    if (on_chain > 1) {
-        return;
-    } else {
-        goto next_chain;
-    }
-}
-
-Z_INTERNAL void slide_hash_sse2(deflate_state *s) {
-    uint16_t wsize = (uint16_t)s->w_size;
-    const __m128i xmm_wsize = _mm_set1_epi16((short)wsize);
-
-    assert(((uintptr_t)s->head & 15) == 0);
-    assert(((uintptr_t)s->prev & 15) == 0);
-
-    slide_hash_chain(s->head, s->prev, HASH_SIZE, wsize, xmm_wsize);
-}

crates/libz-sys/src/zlib-ng/arch/x86/x86_features.c

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.c b/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.c
deleted file mode 100644
index 72ef885..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* x86_features.c - x86 feature check
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Author:
- *  Jim Kukunas
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "../../zbuild.h"
-
-#ifdef _MSC_VER
-#  include <intrin.h>
-#else
-// Newer versions of GCC and clang come with cpuid.h
-#  include <cpuid.h>
-#endif
-
-#include <string.h>
-
-Z_INTERNAL int x86_cpu_has_avx2;
-Z_INTERNAL int x86_cpu_has_avx512;
-Z_INTERNAL int x86_cpu_has_avx512vnni;
-Z_INTERNAL int x86_cpu_has_sse2;
-Z_INTERNAL int x86_cpu_has_ssse3;
-Z_INTERNAL int x86_cpu_has_sse41;
-Z_INTERNAL int x86_cpu_has_sse42;
-Z_INTERNAL int x86_cpu_has_pclmulqdq;
-Z_INTERNAL int x86_cpu_has_vpclmulqdq;
-Z_INTERNAL int x86_cpu_has_tzcnt;
-
-static void cpuid(int info, unsigned* eax, unsigned* ebx, unsigned* ecx, unsigned* edx) {
-#ifdef _MSC_VER
-    unsigned int registers[4];
-    __cpuid((int *)registers, info);
-
-    *eax = registers[0];
-    *ebx = registers[1];
-    *ecx = registers[2];
-    *edx = registers[3];
-#else
-    __cpuid(info, *eax, *ebx, *ecx, *edx);
-#endif
-}
-
-static void cpuidex(int info, int subinfo, unsigned* eax, unsigned* ebx, unsigned* ecx, unsigned* edx) {
-#ifdef _MSC_VER
-    unsigned int registers[4];
-    __cpuidex((int *)registers, info, subinfo);
-
-    *eax = registers[0];
-    *ebx = registers[1];
-    *ecx = registers[2];
-    *edx = registers[3];
-#else
-    __cpuid_count(info, subinfo, *eax, *ebx, *ecx, *edx);
-#endif
-}
-
-void Z_INTERNAL x86_check_features(void) {
-    unsigned eax, ebx, ecx, edx;
-    unsigned maxbasic;
-
-    cpuid(0, &maxbasic, &ebx, &ecx, &edx);
-    cpuid(1 /*CPU_PROCINFO_AND_FEATUREBITS*/, &eax, &ebx, &ecx, &edx);
-
-    x86_cpu_has_sse2 = edx & 0x4000000;
-    x86_cpu_has_ssse3 = ecx & 0x200;
-    x86_cpu_has_sse41 = ecx & 0x80000;
-    x86_cpu_has_sse42 = ecx & 0x100000;
-    x86_cpu_has_pclmulqdq = ecx & 0x2;
-
-    if (maxbasic >= 7) {
-        cpuidex(7, 0, &eax, &ebx, &ecx, &edx);
-
-        // check BMI1 bit
-        // Reference: https://software.intel.com/sites/default/files/article/405250/how-to-detect-new-instruction-support-in-the-4th-generation-intel-core-processor-family.pdf
-        x86_cpu_has_tzcnt = ebx & 0x8;
-        // check AVX2 bit
-        x86_cpu_has_avx2 = ebx & 0x20;
-        x86_cpu_has_avx512 = ebx & 0x00010000;
-        x86_cpu_has_avx512vnni = ecx & 0x800;
-        x86_cpu_has_vpclmulqdq = ecx & 0x400;
-    } else {
-        x86_cpu_has_tzcnt = 0;
-        x86_cpu_has_avx2 = 0;
-        x86_cpu_has_vpclmulqdq = 0;
-    }
-}

crates/libz-sys/src/zlib-ng/arch/x86/x86_features.h

diff --git a/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.h b/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.h
deleted file mode 100644
index 97630ab..0000000
--- a/crates/libz-sys/src/zlib-ng/arch/x86/x86_features.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* x86_features.h -- check for CPU features
-* Copyright (C) 2013 Intel Corporation Jim Kukunas
-* For conditions of distribution and use, see copyright notice in zlib.h
-*/
-
-#ifndef X86_FEATURES_H_
-#define X86_FEATURES_H_
-
-extern int x86_cpu_has_avx2;
-extern int x86_cpu_has_avx512;
-extern int x86_cpu_has_avx512vnni;
-extern int x86_cpu_has_sse2;
-extern int x86_cpu_has_ssse3;
-extern int x86_cpu_has_sse41;
-extern int x86_cpu_has_sse42;
-extern int x86_cpu_has_pclmulqdq;
-extern int x86_cpu_has_vpclmulqdq;
-extern int x86_cpu_has_tzcnt;
-
-void Z_INTERNAL x86_check_features(void);
-
-#endif /* CPU_H_ */

crates/libz-sys/src/zlib-ng/chunkset.c

diff --git a/crates/libz-sys/src/zlib-ng/chunkset.c b/crates/libz-sys/src/zlib-ng/chunkset.c
deleted file mode 100644
index 96684f4..0000000
--- a/crates/libz-sys/src/zlib-ng/chunkset.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* chunkset.c -- inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-
-typedef uint64_t chunk_t;
-
-#define CHUNK_SIZE 8
-
-#define HAVE_CHUNKMEMSET_4
-#define HAVE_CHUNKMEMSET_8
-
-static inline void chunkmemset_4(uint8_t *from, chunk_t *chunk) {
-    uint8_t *dest = (uint8_t *)chunk;
-    zmemcpy_4(dest, from);
-    zmemcpy_4(dest+4, from);
-}
-
-static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) {
-    zmemcpy_8(chunk, from);
-}
-
-static inline void loadchunk(uint8_t const *s, chunk_t *chunk) {
-    zmemcpy_8(chunk, (uint8_t *)s);
-}
-
-static inline void storechunk(uint8_t *out, chunk_t *chunk) {
-    zmemcpy_8(out, chunk);
-}
-
-#define CHUNKSIZE        chunksize_c
-#define CHUNKCOPY        chunkcopy_c
-#define CHUNKCOPY_SAFE   chunkcopy_safe_c
-#define CHUNKUNROLL      chunkunroll_c
-#define CHUNKMEMSET      chunkmemset_c
-#define CHUNKMEMSET_SAFE chunkmemset_safe_c
-
-#include "chunkset_tpl.h"

crates/libz-sys/src/zlib-ng/chunkset_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/chunkset_tpl.h b/crates/libz-sys/src/zlib-ng/chunkset_tpl.h
deleted file mode 100644
index f70ef42..0000000
--- a/crates/libz-sys/src/zlib-ng/chunkset_tpl.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* chunkset_tpl.h -- inline functions to copy small data chunks.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include <stdlib.h>
-
-#if CHUNK_SIZE == 32 && defined(X86_SSE41) && defined(X86_SSE2)
-extern uint8_t* chunkmemset_sse41(uint8_t *out, unsigned dist, unsigned len);
-#endif
-
-/* Returns the chunk size */
-Z_INTERNAL uint32_t CHUNKSIZE(void) {
-    return sizeof(chunk_t);
-}
-
-/* Behave like memcpy, but assume that it's OK to overwrite at least
-   chunk_t bytes of output even if the length is shorter than this,
-   that the length is non-zero, and that `from` lags `out` by at least
-   sizeof chunk_t bytes (or that they don't overlap at all or simply that
-   the distance is less than the length of the copy).
-
-   Aside from better memory bus utilisation, this means that short copies
-   (chunk_t bytes or fewer) will fall straight through the loop
-   without iteration, which will hopefully make the branch prediction more
-   reliable. */
-#ifndef HAVE_CHUNKCOPY
-Z_INTERNAL uint8_t* CHUNKCOPY(uint8_t *out, uint8_t const *from, unsigned len) {
-    Assert(len > 0, "chunkcopy should never have a length 0");
-    chunk_t chunk;
-    int32_t align = ((len - 1) % sizeof(chunk_t)) + 1;
-    loadchunk(from, &chunk);
-    storechunk(out, &chunk);
-    out += align;
-    from += align;
-    len -= align;
-    while (len > 0) {
-        loadchunk(from, &chunk);
-        storechunk(out, &chunk);
-        out += sizeof(chunk_t);
-        from += sizeof(chunk_t);
-        len -= sizeof(chunk_t);
-    }
-    return out;
-}
-#endif
-
-/* Perform short copies until distance can be rewritten as being at least
-   sizeof chunk_t.
-
-   This assumes that it's OK to overwrite at least the first
-   2*sizeof(chunk_t) bytes of output even if the copy is shorter than this.
-   This assumption holds because inflate_fast() starts every iteration with at
-   least 258 bytes of output space available (258 being the maximum length
-   output from a single token; see inflate_fast()'s assumptions below). */
-#ifndef HAVE_CHUNKUNROLL
-Z_INTERNAL uint8_t* CHUNKUNROLL(uint8_t *out, unsigned *dist, unsigned *len) {
-    unsigned char const *from = out - *dist;
-    chunk_t chunk;
-    while (*dist < *len && *dist < sizeof(chunk_t)) {
-        loadchunk(from, &chunk);
-        storechunk(out, &chunk);
-        out += *dist;
-        *len -= *dist;
-        *dist += *dist;
-    }
-    return out;
-}
-#endif
-
-#ifndef HAVE_CHUNK_MAG
-/* Loads a magazine to feed into memory of the pattern */
-static inline chunk_t GET_CHUNK_MAG(uint8_t *buf, uint32_t *chunk_rem, uint32_t dist) {
-        /* This code takes string of length dist from "from" and repeats
-         * it for as many times as can fit in a chunk_t (vector register) */
-        uint32_t cpy_dist;
-        uint32_t bytes_remaining = sizeof(chunk_t);
-        chunk_t chunk_load;
-        uint8_t *cur_chunk = (uint8_t *)&chunk_load;
-        while (bytes_remaining) {
-            cpy_dist = MIN(dist, bytes_remaining);
-            memcpy(cur_chunk, buf, cpy_dist);
-            bytes_remaining -= cpy_dist;
-            cur_chunk += cpy_dist;
-            /* This allows us to bypass an expensive integer division since we're effectively
-             * counting in this loop, anyway */
-            *chunk_rem = cpy_dist;
-        }
-
-        return chunk_load;
-}
-#endif
-
-/* Copy DIST bytes from OUT - DIST into OUT + DIST * k, for 0 <= k < LEN/DIST.
-   Return OUT + LEN. */
-Z_INTERNAL uint8_t* CHUNKMEMSET(uint8_t *out, unsigned dist, unsigned len) {
-    /* Debug performance related issues when len < sizeof(uint64_t):
-       Assert(len >= sizeof(uint64_t), "chunkmemset should be called on larger chunks"); */
-    Assert(dist > 0, "chunkmemset cannot have a distance 0");
-    /* Only AVX2 */
-#if CHUNK_SIZE == 32 && defined(X86_SSE41) && defined(X86_SSE2)
-    if (len <= 16) {
-        return chunkmemset_sse41(out, dist, len);
-    }
-#endif
-
-    uint8_t *from = out - dist;
-
-    if (dist == 1) {
-        memset(out, *from, len);
-        return out + len;
-    } else if (dist > sizeof(chunk_t)) {
-        return CHUNKCOPY(out, out - dist, len);
-    }
-
-    chunk_t chunk_load;
-    uint32_t chunk_mod = 0;
-
-    /* TODO: possibly build up a permutation table for this if not an even modulus */
-#ifdef HAVE_CHUNKMEMSET_2
-    if (dist == 2) {
-        chunkmemset_2(from, &chunk_load);
-    } else
-#endif
-#ifdef HAVE_CHUNKMEMSET_4
-    if (dist == 4) {
-        chunkmemset_4(from, &chunk_load);
-    } else
-#endif
-#ifdef HAVE_CHUNKMEMSET_8
-    if (dist == 8) {
-        chunkmemset_8(from, &chunk_load);
-    } else if (dist == sizeof(chunk_t)) {
-        loadchunk(from, &chunk_load);
-    } else
-#endif
-    {
-        chunk_load = GET_CHUNK_MAG(from, &chunk_mod, dist);
-    }
-
-    /* If we're lucky enough and dist happens to be an even modulus of our vector length,
-     * we can do two stores per loop iteration, which for most ISAs, especially x86, is beneficial */
-    if (chunk_mod == 0) {
-        while (len >= (2 * sizeof(chunk_t))) {
-            storechunk(out, &chunk_load);
-            storechunk(out + sizeof(chunk_t), &chunk_load);
-            out += 2 * sizeof(chunk_t);
-            len -= 2 * sizeof(chunk_t);
-        }
-    }
-
-    /* If we don't have a "dist" length that divides evenly into a vector
-     * register, we can write the whole vector register but we need only
-     * advance by the amount of the whole string that fits in our chunk_t.
-     * If we do divide evenly into the vector length, adv_amount = chunk_t size*/
-    uint32_t adv_amount = sizeof(chunk_t) - chunk_mod;
-    while (len >= sizeof(chunk_t)) {
-        storechunk(out, &chunk_load);
-        len -= adv_amount;
-        out += adv_amount;
-    }
-
-    if (len) {
-        memcpy(out, &chunk_load, len);
-        out += len;
-    }
-
-    return out;
-}
-
-Z_INTERNAL uint8_t* CHUNKMEMSET_SAFE(uint8_t *out, unsigned dist, unsigned len, unsigned left) {
-#if !defined(UNALIGNED64_OK)
-#  if !defined(UNALIGNED_OK)
-    static const uint32_t align_mask = 7;
-#  else
-    static const uint32_t align_mask = 3;
-#  endif
-#endif
-
-    len = MIN(len, left);
-    uint8_t *from = out - dist;
-#if !defined(UNALIGNED64_OK)
-    while (((uintptr_t)out & align_mask) && (len > 0)) {
-        *out++ = *from++;
-        --len;
-        --left;
-    }
-#endif
-    if (left < (unsigned)(3 * sizeof(chunk_t))) {
-        while (len > 0) {
-            *out++ = *from++;
-            --len;
-        }
-        return out;
-    }
-    if (len)
-        return CHUNKMEMSET(out, dist, len);
-
-    return out;
-}

crates/libz-sys/src/zlib-ng/cmake/detect-arch.c

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-arch.c b/crates/libz-sys/src/zlib-ng/cmake/detect-arch.c
deleted file mode 100644
index 84e6a84..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-arch.c
+++ /dev/null
@@ -1,107 +0,0 @@
-// archdetect.c -- Detect compiler architecture and raise preprocessor error
-//                 containing a simple arch identifier.
-// Copyright (C) 2019 Hans Kristian Rosbach
-// Licensed under the Zlib license, see LICENSE.md for details
-
-// x86_64
-#if defined(__x86_64__) || defined(_M_X64)
-    #error archfound x86_64
-
-// x86
-#elif defined(__i386) || defined(_M_IX86)
-    #error archfound i686
-
-// ARM
-#elif defined(__aarch64__) || defined(_M_ARM64)
-    #error archfound aarch64
-#elif defined(__arm__) || defined(__arm) || defined(_M_ARM) || defined(__TARGET_ARCH_ARM)
-    #if defined(__ARM64_ARCH_8__) || defined(__ARMv8__) || defined(__ARMv8_A__)
-        #error archfound armv8
-    #elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
-        #error archfound armv7
-    #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6M__)
-        #error archfound armv6
-    #elif defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
-        #error archfound armv5
-    #elif defined(__ARM_ARCH_4T__) || defined(__TARGET_ARCH_5E__)
-        #error archfound armv4
-    #elif defined(__ARM_ARCH_3__) || defined(__TARGET_ARCH_3M__)
-        #error archfound armv3
-    #elif defined(__ARM_ARCH_2__)
-        #error archfound armv2
-    #endif
-
-// PowerPC
-#elif defined(__powerpc__) || defined(_ppc__) || defined(__PPC__)
-    #if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
-        #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-            #error archfound powerpc64le
-        #else
-            #error archfound powerpc64
-        #endif
-    #else
-        #error archfound powerpc
-    #endif
-
-// --------------- Less common architectures alphabetically below ---------------
-
-// ALPHA
-#elif defined(__alpha__) || defined(__alpha)
-    #error archfound alpha
-
-// Blackfin
-#elif defined(__BFIN__)
-    #error archfound blackfin
-
-// Itanium
-#elif defined(__ia64) || defined(_M_IA64)
-    #error archfound ia64
-
-// MIPS
-#elif defined(__mips__) || defined(__mips)
-    #error archfound mips
-
-// Motorola 68000-series
-#elif defined(__m68k__)
-    #error archfound m68k
-
-// SuperH
-#elif defined(__sh__)
-    #error archfound sh
-
-// SPARC
-#elif defined(__sparc__) || defined(__sparc)
-    #if defined(__sparcv9) || defined(__sparc_v9__)
-        #error archfound sparc9
-    #elif defined(__sparcv8) || defined(__sparc_v8__)
-        #error archfound sparc8
-    #endif
-
-// SystemZ
-#elif defined(__370__)
-    #error archfound s370
-#elif defined(__s390__)
-    #error archfound s390
-#elif defined(__s390x) || defined(__zarch__)
-    #error archfound s390x
-
-// PARISC
-#elif defined(__hppa__)
-    #error archfound parisc
-
-// RS-6000
-#elif defined(__THW_RS6000)
-    #error archfound rs6000
-
-// RISC-V
-#elif defined(__riscv)
-    #if __riscv_xlen == 64
-        #error archfound riscv64
-    #elif __riscv_xlen == 32
-        #error archfound riscv32
-    #endif
-
-// return 'unrecognized' if we do not know what architecture this is
-#else
-    #error archfound unrecognized
-#endif

crates/libz-sys/src/zlib-ng/cmake/detect-arch.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-arch.cmake b/crates/libz-sys/src/zlib-ng/cmake/detect-arch.cmake
deleted file mode 100644
index f0547ba..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-arch.cmake
+++ /dev/null
@@ -1,96 +0,0 @@
-# detect-arch.cmake -- Detect compiler architecture and set ARCH and BASEARCH
-# Copyright (C) 2019 Hans Kristian Rosbach
-# Licensed under the Zlib license, see LICENSE.md for details
-set(ARCHDETECT_FOUND TRUE)
-
-if(CMAKE_OSX_ARCHITECTURES)
-    # If multiple architectures are requested (universal build), pick only the first
-    list(GET CMAKE_OSX_ARCHITECTURES 0 ARCH)
-elseif(MSVC)
-    if("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "X86")
-        set(ARCH "i686")
-    elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "x64")
-        set(ARCH "x86_64")
-    elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM" OR "${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARMV7")
-        set(ARCH "arm")
-    elseif ("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM64")
-        set(ARCH "aarch64")
-    endif()
-elseif(CMAKE_CROSSCOMPILING)
-    set(ARCH ${CMAKE_C_COMPILER_TARGET})
-else()
-    # Let preprocessor parse archdetect.c and raise an error containing the arch identifier
-    enable_language(C)
-    try_run(
-        run_result_unused
-        compile_result_unused
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_LIST_DIR}/detect-arch.c
-        COMPILE_OUTPUT_VARIABLE RAWOUTPUT
-        CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-    )
-
-    # Find basearch tag, and extract the arch word into BASEARCH variable
-    string(REGEX REPLACE ".*archfound ([a-zA-Z0-9_]+).*" "\\1" ARCH "${RAWOUTPUT}")
-    if(NOT ARCH)
-        set(ARCH unknown)
-    endif()
-endif()
-
-# Make sure we have ARCH set
-if(NOT ARCH OR ARCH STREQUAL "unknown")
-    set(ARCH ${CMAKE_SYSTEM_PROCESSOR})
-    message(STATUS "Arch not recognized, falling back to cmake arch: '${ARCH}'")
-else()
-    message(STATUS "Arch detected: '${ARCH}'")
-endif()
-
-# Base arch detection
-if("${ARCH}" MATCHES "(x86_64|AMD64|i[3-6]86)")
-    set(BASEARCH "x86")
-    set(BASEARCH_X86_FOUND TRUE)
-elseif("${ARCH}" MATCHES "(arm(v[0-9])?|aarch64)")
-    set(BASEARCH "arm")
-    set(BASEARCH_ARM_FOUND TRUE)
-elseif("${ARCH}" MATCHES "ppc(64(le)?)?|powerpc(64(le)?)?")
-    set(BASEARCH "ppc")
-    set(BASEARCH_PPC_FOUND TRUE)
-elseif("${ARCH}" MATCHES "alpha")
-    set(BASEARCH "alpha")
-    set(BASEARCH_ALPHA_FOUND TRUE)
-elseif("${ARCH}" MATCHES "blackfin")
-    set(BASEARCH "blackfin")
-    set(BASEARCH_BLACKFIN_FOUND TRUE)
-elseif("${ARCH}" MATCHES "ia64")
-    set(BASEARCH "ia64")
-    set(BASEARCH_IA64_FOUND TRUE)
-elseif("${ARCH}" MATCHES "mips")
-    set(BASEARCH "mips")
-    set(BASEARCH_MIPS_FOUND TRUE)
-elseif("${ARCH}" MATCHES "m68k")
-    set(BASEARCH "m68k")
-    set(BASEARCH_M68K_FOUND TRUE)
-elseif("${ARCH}" MATCHES "sh")
-    set(BASEARCH "sh")
-    set(BASEARCH_SH_FOUND TRUE)
-elseif("${ARCH}" MATCHES "sparc[89]?")
-    set(BASEARCH "sparc")
-    set(BASEARCH_SPARC_FOUND TRUE)
-elseif("${ARCH}" MATCHES "s3[679]0x?")
-    set(BASEARCH "s360")
-    set(BASEARCH_S360_FOUND TRUE)
-elseif("${ARCH}" MATCHES "parisc")
-    set(BASEARCH "parisc")
-    set(BASEARCH_PARISC_FOUND TRUE)
-elseif("${ARCH}" MATCHES "rs6000")
-    set(BASEARCH "rs6000")
-    set(BASEARCH_RS6000_FOUND TRUE)
-elseif("${ARCH}" MATCHES "riscv(32|64)")
-    set(BASEARCH "riscv")
-    set(BASEARCH_RISCV_FOUND TRUE)
-else()
-    set(BASEARCH "x86")
-    set(BASEARCH_X86_FOUND TRUE)
-    message(STATUS "Basearch '${ARCH}' not recognized, defaulting to 'x86'.")
-endif()
-message(STATUS "Basearch of '${ARCH}' has been detected as: '${BASEARCH}'")

crates/libz-sys/src/zlib-ng/cmake/detect-coverage.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-coverage.cmake b/crates/libz-sys/src/zlib-ng/cmake/detect-coverage.cmake
deleted file mode 100644
index 8e67a08..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-coverage.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-# detect-coverage.cmake -- Detect supported compiler coverage flags
-# Licensed under the Zlib license, see LICENSE.md for details
-
-macro(add_code_coverage)
-    # Check for -coverage flag support for Clang/GCC
-    if(CMAKE_VERSION VERSION_LESS 3.14)
-        set(CMAKE_REQUIRED_LIBRARIES -lgcov)
-    else()
-        set(CMAKE_REQUIRED_LINK_OPTIONS -coverage)
-    endif()
-    check_c_compiler_flag(-coverage HAVE_COVERAGE)
-    set(CMAKE_REQUIRED_LIBRARIES)
-    set(CMAKE_REQUIRED_LINK_OPTIONS)
-
-    if(HAVE_COVERAGE)
-        add_compile_options(-coverage)
-        add_link_options(-coverage)
-        message(STATUS "Code coverage enabled using: -coverage")
-    else()
-        # Some versions of GCC don't support -coverage shorthand
-        if(CMAKE_VERSION VERSION_LESS 3.14)
-            set(CMAKE_REQUIRED_LIBRARIES -lgcov)
-        else()
-            set(CMAKE_REQUIRED_LINK_OPTIONS -lgcov -fprofile-arcs)
-        endif()
-        check_c_compiler_flag("-ftest-coverage -fprofile-arcs -fprofile-values" HAVE_TEST_COVERAGE)
-        set(CMAKE_REQUIRED_LIBRARIES)
-        set(CMAKE_REQUIRED_LINK_OPTIONS)
-
-        if(HAVE_TEST_COVERAGE)
-            add_compile_options(-ftest-coverage -fprofile-arcs -fprofile-values)
-            add_link_options(-lgcov -fprofile-arcs)
-            message(STATUS "Code coverage enabled using: -ftest-coverage")
-        else()
-            message(WARNING "Compiler does not support code coverage")
-            set(WITH_CODE_COVERAGE OFF)
-        endif()
-    endif()
-
-    # Set optimization level to zero for code coverage builds
-    if (WITH_CODE_COVERAGE)
-        # Use CMake compiler flag variables due to add_compile_options failure on Windows GCC
-        set(CMAKE_C_FLAGS "-O0 ${CMAKE_C_FLAGS}")
-        set(CMAKE_CXX_FLAGS "-O0 ${CMAKE_CXX_FLAGS}")
-    endif()
-endmacro()

crates/libz-sys/src/zlib-ng/cmake/detect-install-dirs.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-install-dirs.cmake b/crates/libz-sys/src/zlib-ng/cmake/detect-install-dirs.cmake
deleted file mode 100644
index ddf1adb..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-install-dirs.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-# detect-install-dirs.cmake -- Detect install directory parameters
-# Copyright (C) 2021 Hans Kristian Rosbach
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# Determine installation directory for executables
-if (DEFINED BIN_INSTALL_DIR)
-    set(BIN_INSTALL_DIR "${BIN_INSTALL_DIR}" CACHE PATH "Installation directory for executables" FORCE)
-elseif (DEFINED INSTALL_BIN_DIR)
-    set(BIN_INSTALL_DIR "${INSTALL_BIN_DIR}" CACHE PATH "Installation directory for executables" FORCE)
-elseif (DEFINED CMAKE_INSTALL_FULL_BINDIR)
-    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Installation directory for executables" FORCE)
-elseif (DEFINED CMAKE_INSTALL_BINDIR)
-    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables" FORCE)
-else()
-    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-endif()
-
-# Determine installation directory for libraries
-if (DEFINED LIB_INSTALL_DIR)
-    set(LIB_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Installation directory for libraries" FORCE)
-elseif (DEFINED INSTALL_LIB_DIR)
-    set(LIB_INSTALL_DIR "${INSTALL_LIB_DIR}" CACHE PATH "Installation directory for libraries" FORCE)
-elseif (DEFINED CMAKE_INSTALL_FULL_LIBDIR)
-    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Installation directory for libraries" FORCE)
-elseif (DEFINED CMAKE_INSTALL_LIBDIR)
-    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries" FORCE)
-else()
-    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-endif()
-
-# Determine installation directory for include files
-if (DEFINED INC_INSTALL_DIR)
-    set(INC_INSTALL_DIR "${INC_INSTALL_DIR}" CACHE PATH "Installation directory for headers" FORCE)
-elseif (DEFINED INSTALL_INC_DIR)
-    set(INC_INSTALL_DIR "${INSTALL_INC_DIR}" CACHE PATH "Installation directory for headers" FORCE)
-elseif (DEFINED CMAKE_INSTALL_FULL_INCLUDEDIR)
-    set(INC_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "Installation directory for headers" FORCE)
-elseif (DEFINED CMAKE_INSTALL_INCLUDEDIR)
-    set(INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers" FORCE)
-else()
-    set(INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-endif()
-
-# Determine installation directory for pkgconfig files
-if (DEFINED PKGCONFIG_INSTALL_DIR)
-    set(PKGCONFIG_INSTALL_DIR "${PKGCONFIG_INSTALL_DIR}" CACHE PATH "Installation directory for pkgconfig (.pc) files" FORCE)
-elseif (DEFINED INSTALL_PKGCONFIG_DIR)
-    set(PKGCONFIG_INSTALL_DIR "${INSTALL_PKGCONFIG_DIR}" CACHE PATH "Installation directory for pkgconfig (.pc) files" FORCE)
-elseif (DEFINED CMAKE_INSTALL_FULL_PKGCONFIGDIR)
-    set(PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_FULL_PKGCONFIGDIR}" CACHE PATH "Installation directory for pkgconfig (.pc) files" FORCE)
-elseif (DEFINED CMAKE_INSTALL_PKGCONFIGDIR)
-    set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/${CMAKE_INSTALL_PKGCONFIGDIR}" CACHE PATH "Installation directory for pkgconfig (.pc) files" FORCE)
-else()
-    set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-endif()

crates/libz-sys/src/zlib-ng/cmake/detect-intrinsics.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-intrinsics.cmake b/crates/libz-sys/src/zlib-ng/cmake/detect-intrinsics.cmake
deleted file mode 100644
index c638b3b..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-intrinsics.cmake
+++ /dev/null
@@ -1,503 +0,0 @@
-# detect-intrinsics.cmake -- Detect compiler intrinsics support
-# Licensed under the Zlib license, see LICENSE.md for details
-
-macro(check_acle_compiler_flag)
-    if(NOT NATIVEFLAG AND NOT HAVE_ACLE_FLAG)
-        set(ACLEFLAG "-march=armv8-a+crc" CACHE INTERNAL "Compiler option to enable ACLE support")
-    endif()
-    # Check whether compiler supports ACLE flag
-    set(CMAKE_REQUIRED_FLAGS "${ACLEFLAG} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "int main() { return 0; }"
-        HAVE_ACLE_FLAG FAIL_REGEX "not supported")
-    if(NOT NATIVEFLAG AND NOT HAVE_ACLE_FLAG)
-        set(ACLEFLAG "-march=armv8-a+crc+simd" CACHE INTERNAL "Compiler option to enable ACLE support" FORCE)
-        # Check whether compiler supports ACLE flag
-        set(CMAKE_REQUIRED_FLAGS "${ACLEFLAG}")
-        check_c_source_compiles(
-            "int main() { return 0; }"
-            HAVE_ACLE_FLAG2 FAIL_REGEX "not supported")
-        set(HAVE_ACLE_FLAG ${HAVE_ACLE_FLAG2} CACHE INTERNAL "Have compiler option to enable ACLE intrinsics" FORCE)
-        unset(HAVE_ACLE_FLAG2 CACHE) # Don't cache this internal variable
-    endif()
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_avx512_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(AVX512FLAG "-mavx512f -mavx512dq -mavx512bw -mavx512vl")
-        else()
-            set(AVX512FLAG "/arch:AVX512")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            # For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
-            # instruction scheduling unless you specify a reasonable -mtune= target
-            set(AVX512FLAG "-mavx512f -mavx512dq -mavx512bw -mavx512vl")
-            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "ClangCl")
-                set(AVX512FLAG "${AVX512FLAG} -mtune=cascadelake")
-            endif()
-        endif()
-    elseif(MSVC)
-        set(AVX512FLAG "/arch:AVX512")
-    endif()
-    # Check whether compiler supports AVX512 intrinsics
-    set(CMAKE_REQUIRED_FLAGS "${AVX512FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m512i x = _mm512_set1_epi8(2);
-            const __m512i y = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                              20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                              38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                              56, 57, 58, 59, 60, 61, 62, 63, 64);
-            x = _mm512_sub_epi8(x, y);
-            (void)x;
-            return 0;
-        }"
-        HAVE_AVX512_INTRIN
-    )
-
-    # Evidently both GCC and clang were late to implementing these
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __mmask16 a = 0xFF;
-            a = _knot_mask16(a);
-            (void)a;
-            return 0;
-        }"
-        HAVE_MASK_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_avx512vnni_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(AVX512VNNIFLAG "-mavx512f -mavx512bw -mavx512dq -mavx512vl -mavx512vnni")
-        else()
-            set(AVX512VNNIFLAG "/arch:AVX512")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(AVX512VNNIFLAG "-mavx512f -mavx512dq -mavx512bw -mavx512vl -mavx512vnni")
-            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "ClangCl")
-                set(AVX512VNNIFLAG "${AVX512VNNIFLAG} -mtune=cascadelake")
-            endif()
-        endif()
-    elseif(MSVC)
-        set(AVX512VNNIFLAG "/arch:AVX512")
-    endif()
-
-    # Check whether compiler supports AVX512vnni intrinsics
-    set(CMAKE_REQUIRED_FLAGS "${AVX512VNNIFLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m512i x = _mm512_set1_epi8(2);
-            const __m512i y = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                              20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                              38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                              56, 57, 58, 59, 60, 61, 62, 63, 64);
-            __m512i z = _mm512_setzero_epi32();
-            z = _mm512_dpbusd_epi32(z, x, y);
-            (void)z;
-            return 0;
-        }"
-        HAVE_AVX512VNNI_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_avx2_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(AVX2FLAG "-mavx2")
-        else()
-            set(AVX2FLAG "/arch:AVX2")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(AVX2FLAG "-mavx2")
-        endif()
-    endif()
-    # Check whether compiler supports AVX2 intrinics
-    set(CMAKE_REQUIRED_FLAGS "${AVX2FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m256i x = _mm256_set1_epi16(2);
-            const __m256i y = _mm256_set1_epi16(1);
-            x = _mm256_subs_epu16(x, y);
-            (void)x;
-            return 0;
-        }"
-        HAVE_AVX2_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_neon_compiler_flag)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            if("${ARCH}" MATCHES "aarch64")
-                set(NEONFLAG "-march=armv8-a+simd")
-            else()
-                set(NEONFLAG "-mfpu=neon")
-            endif()
-        endif()
-    endif()
-    # Check whether compiler supports NEON flag
-    set(CMAKE_REQUIRED_FLAGS "${NEONFLAG} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "int main() { return 0; }"
-        MFPU_NEON_AVAILABLE FAIL_REGEX "not supported")
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_neon_ld4_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            if("${ARCH}" MATCHES "aarch64")
-                set(NEONFLAG "-march=armv8-a+simd")
-            else()
-                set(NEONFLAG "-mfpu=neon")
-            endif()
-        endif()
-    endif()
-    # Check whether compiler supports loading 4 neon vecs into a register range
-    set(CMAKE_REQUIRED_FLAGS "${NEONFLAG}")
-    check_c_source_compiles(
-        "#ifdef _M_ARM64
-        #  include <arm64_neon.h>
-        #else
-        #  include <arm_neon.h>
-        #endif
-        int main(void) {
-            int stack_var[16];
-            int32x4x4_t v = vld1q_s32_x4(stack_var);
-            (void)v;
-            return 0;
-        }"
-        NEON_HAS_LD4)
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_pclmulqdq_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(PCLMULFLAG "-mpclmul")
-        endif()
-    endif()
-    # Check whether compiler supports PCLMULQDQ intrinsics
-    if(NOT (APPLE AND "${ARCH}" MATCHES "i386"))
-        # The pclmul code currently crashes on Mac in 32bit mode. Avoid for now.
-        set(CMAKE_REQUIRED_FLAGS "${PCLMULFLAG} ${NATIVEFLAG}")
-        check_c_source_compile_or_run(
-            "#include <immintrin.h>
-            int main(void) {
-                __m128i a = _mm_setzero_si128();
-                __m128i b = _mm_setzero_si128();
-                __m128i c = _mm_clmulepi64_si128(a, b, 0x10);
-                (void)c;
-                return 0;
-            }"
-            HAVE_PCLMULQDQ_INTRIN
-        )
-        set(CMAKE_REQUIRED_FLAGS)
-    else()
-        set(HAVE_PCLMULQDQ_INTRIN OFF)
-    endif()
-endmacro()
-
-macro(check_vpclmulqdq_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(VPCLMULFLAG "-mvpclmulqdq")
-        endif()
-    endif()
-    # Check whether compiler supports VPCLMULQDQ intrinsics
-    if(NOT (APPLE AND "${ARCH}" MATCHES "i386"))
-        set(CMAKE_REQUIRED_FLAGS "${VPCLMULFLAG} ${NATIVEFLAG}")
-        check_c_source_compile_or_run(
-            "#include <immintrin.h>
-            int main(void) {
-                __m512i a = _mm512_setzero_si512();
-                __m512i b = _mm512_setzero_si512();
-                __m512i c = _mm512_clmulepi64_epi128(a, b, 0x10);
-                (void)c;
-                return 0;
-            }"
-            HAVE_VPCLMULQDQ_INTRIN
-        )
-        set(CMAKE_REQUIRED_FLAGS)
-    else()
-        set(HAVE_VPCLMULQDQ_INTRIN OFF)
-    endif()
-endmacro()
-
-macro(check_ppc_intrinsics)
-    # Check if compiler supports AltiVec
-    set(CMAKE_REQUIRED_FLAGS "-maltivec")
-    check_c_source_compiles(
-        "#include <altivec.h>
-        int main(void)
-        {
-            vector int a = vec_splats(0);
-            vector int b = vec_splats(0);
-            a = vec_add(a, b);
-            return 0;
-        }"
-        HAVE_ALTIVEC
-        )
-    set(CMAKE_REQUIRED_FLAGS)
-
-    if(HAVE_ALTIVEC)
-        set(PPCFLAGS "-maltivec")
-    endif()
-
-    set(CMAKE_REQUIRED_FLAGS "-maltivec -mno-vsx")
-    check_c_source_compiles(
-        "#include <altivec.h>
-        int main(void)
-        {
-            vector int a = vec_splats(0);
-            vector int b = vec_splats(0);
-            a = vec_add(a, b);
-            return 0;
-        }"
-        HAVE_NOVSX
-        )
-    set(CMAKE_REQUIRED_FLAGS)
-
-    if(HAVE_NOVSX)
-        set(PPCFLAGS "${PPCFLAGS} -mno-vsx")
-    endif()
-
-    # Check if we have what we need for AltiVec optimizations
-    set(CMAKE_REQUIRED_FLAGS "${PPCFLAGS} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "#include <sys/auxv.h>
-        int main() {
-            return (getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC);
-        }"
-        HAVE_VMX
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_power8_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(POWER8FLAG "-mcpu=power8")
-        endif()
-    endif()
-    # Check if we have what we need for POWER8 optimizations
-    set(CMAKE_REQUIRED_FLAGS "${POWER8FLAG} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "#include <sys/auxv.h>
-        int main() {
-            return (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07);
-        }"
-        HAVE_POWER8_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_s390_intrinsics)
-    check_c_source_compiles(
-        "#include <sys/auxv.h>
-        int main() {
-            return (getauxval(AT_HWCAP) & HWCAP_S390_VX);
-        }"
-        HAVE_S390_INTRIN
-    )
-endmacro()
-
-macro(check_power9_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(POWER9FLAG "-mcpu=power9")
-        endif()
-    endif()
-    # Check if we have what we need for POWER9 optimizations
-    set(CMAKE_REQUIRED_FLAGS "${POWER9FLAG} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "int main() {
-            return 0;
-        }"
-        HAVE_POWER9_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_sse2_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(SSE2FLAG "-msse2")
-        else()
-            set(SSE2FLAG "/arch:SSE2")
-        endif()
-    elseif(MSVC)
-        if(NOT "${ARCH}" MATCHES "x86_64")
-            set(SSE2FLAG "/arch:SSE2")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(SSE2FLAG "-msse2")
-        endif()
-    endif()
-    # Check whether compiler supports SSE2 instrinics
-    set(CMAKE_REQUIRED_FLAGS "${SSE2FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m128i zero = _mm_setzero_si128();
-            (void)zero;
-            return 0;
-        }"
-        HAVE_SSE2_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_ssse3_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(SSSE3FLAG "-mssse3")
-        else()
-            set(SSSE3FLAG "/arch:SSSE3")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(SSSE3FLAG "-mssse3")
-        endif()
-    endif()
-    # Check whether compiler supports SSSE3 intrinsics
-    set(CMAKE_REQUIRED_FLAGS "${SSSE3FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m128i u, v, w;
-            u = _mm_set1_epi32(1);
-            v = _mm_set1_epi32(2);
-            w = _mm_hadd_epi32(u, v);
-            (void)w;
-            return 0;
-        }"
-        HAVE_SSSE3_INTRIN
-    )
-endmacro()
-
-macro(check_sse41_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(SSE41FLAG "-msse4.1")
-        else()
-            set(SSE41FLAG "/arch:SSE4.1")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(SSE41FLAG "-msse4.1")
-        endif()
-    endif()
-    # Check whether compiler supports SSE4.1 intrinsics
-    set(CMAKE_REQUIRED_FLAGS "${SSE41FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            __m128i u, v, w;
-            u = _mm_set1_epi8(1);
-            v = _mm_set1_epi8(2);
-            w = _mm_sad_epu8(u, v);
-            (void)w;
-            return 0;
-        }"
-        HAVE_SSE41_INTRIN
-    )
-endmacro()
-
-macro(check_sse42_intrinsics)
-    if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-        if(CMAKE_HOST_UNIX OR APPLE)
-            set(SSE42FLAG "-msse4.2")
-        else()
-            set(SSE42FLAG "/arch:SSE4.2")
-        endif()
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        if(NOT NATIVEFLAG)
-            set(SSE42FLAG "-msse4.2")
-        endif()
-    endif()
-    # Check whether compiler supports SSE4 CRC inline asm
-    set(CMAKE_REQUIRED_FLAGS "${SSE42FLAG} ${NATIVEFLAG}")
-    check_c_source_compile_or_run(
-        "int main(void) {
-            unsigned val = 0, h = 0;
-        #if defined(_MSC_VER)
-            { __asm mov edx, h __asm mov eax, val __asm crc32 eax, edx __asm mov h, eax }
-        #else
-            __asm__ __volatile__ ( \"crc32 %1,%0\" : \"+r\" (h) : \"r\" (val) );
-        #endif
-            return (int)h;
-        }"
-        HAVE_SSE42CRC_INLINE_ASM
-    )
-    # Check whether compiler supports SSE4 CRC intrinsics
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            unsigned crc = 0;
-            char c = 'c';
-        #if defined(_MSC_VER)
-            crc = _mm_crc32_u32(crc, c);
-        #else
-            crc = __builtin_ia32_crc32qi(crc, c);
-        #endif
-            (void)crc;
-            return 0;
-        }"
-        HAVE_SSE42CRC_INTRIN
-    )
-    # Check whether compiler supports SSE4.2 compare string instrinics
-    check_c_source_compile_or_run(
-        "#include <immintrin.h>
-        int main(void) {
-            unsigned char a[64] = { 0 };
-            unsigned char b[64] = { 0 };
-            __m128i xmm_src0, xmm_src1;
-            xmm_src0 = _mm_loadu_si128((__m128i *)(char *)a);
-            xmm_src1 = _mm_loadu_si128((__m128i *)(char *)b);
-            return _mm_cmpestri(xmm_src0, 16, xmm_src1, 16, 0);
-        }"
-        HAVE_SSE42CMPSTR_INTRIN
-    )
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-macro(check_vgfma_intrinsics)
-    if(NOT NATIVEFLAG)
-        set(VGFMAFLAG "-march=z13")
-        if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-            set(VGFMAFLAG "${VGFMAFLAG} -mzarch")
-        endif()
-        if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-            set(VGFMAFLAG "${VGFMAFLAG} -fzvector")
-        endif()
-    endif()
-    # Check whether compiler supports "VECTOR GALOIS FIELD MULTIPLY SUM AND ACCUMULATE" intrinsic
-    set(CMAKE_REQUIRED_FLAGS "${VGFMAFLAG} ${NATIVEFLAG}")
-    check_c_source_compiles(
-        "#include <vecintrin.h>
-        int main(void) {
-            unsigned long long a __attribute__((vector_size(16))) = { 0 };
-            unsigned long long b __attribute__((vector_size(16))) = { 0 };
-            unsigned char c __attribute__((vector_size(16))) = { 0 };
-            c = vec_gfmsum_accum_128(a, b, c);
-            return c[0];
-        }"
-        HAVE_VGFMA_INTRIN FAIL_REGEX "not supported")
-    set(CMAKE_REQUIRED_FLAGS)
-endmacro()

crates/libz-sys/src/zlib-ng/cmake/detect-sanitizer.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/detect-sanitizer.cmake b/crates/libz-sys/src/zlib-ng/cmake/detect-sanitizer.cmake
deleted file mode 100644
index f9521ec..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/detect-sanitizer.cmake
+++ /dev/null
@@ -1,166 +0,0 @@
-# detect-sanitizer.cmake -- Detect supported compiler sanitizer flags
-# Licensed under the Zlib license, see LICENSE.md for details
-
-macro(add_common_sanitizer_flags)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        add_compile_options(-g3)
-    endif()
-    check_c_compiler_flag(-fno-omit-frame-pointer HAVE_NO_OMIT_FRAME_POINTER)
-    if(HAVE_NO_OMIT_FRAME_POINTER)
-        add_compile_options(-fno-omit-frame-pointer)
-        add_link_options(-fno-omit-frame-pointer)
-    endif()
-    check_c_compiler_flag(-fno-optimize-sibling-calls HAVE_NO_OPTIMIZE_SIBLING_CALLS)
-    if(HAVE_NO_OPTIMIZE_SIBLING_CALLS)
-        add_compile_options(-fno-optimize-sibling-calls)
-        add_link_options(-fno-optimize-sibling-calls)
-    endif()
-endmacro()
-
-macro(check_sanitizer_support known_checks supported_checks)
-    set(available_checks "")
-
-    # Build list of supported sanitizer flags by incrementally trying compilation with
-    # known sanitizer checks
-
-    foreach(check ${known_checks})
-        if(available_checks STREQUAL "")
-            set(compile_checks "${check}")
-        else()
-            set(compile_checks "${available_checks},${check}")
-        endif()
-
-        set(CMAKE_REQUIRED_FLAGS -fsanitize=${compile_checks})
-
-        check_c_source_compiles("int main() { return 0; }" HAVE_SANITIZER_${check}
-            FAIL_REGEX "not supported|unrecognized command|unknown option")
-
-        set(CMAKE_REQUIRED_FLAGS)
-
-        if(HAVE_SANITIZER_${check})
-            set(available_checks ${compile_checks})
-        endif()
-    endforeach()
-
-    set(${supported_checks} ${available_checks})
-endmacro()
-
-macro(add_address_sanitizer)
-    set(known_checks
-        address
-        pointer-compare
-        pointer-subtract
-        )
-
-    check_sanitizer_support("${known_checks}" supported_checks)
-    if(NOT ${supported_checks} STREQUAL "")
-        message(STATUS "Address sanitizer is enabled: ${supported_checks}")
-        add_compile_options(-fsanitize=${supported_checks})
-        add_link_options(-fsanitize=${supported_checks})
-        add_common_sanitizer_flags()
-    else()
-        message(STATUS "Address sanitizer is not supported")
-    endif()
-
-    if(CMAKE_CROSSCOMPILING_EMULATOR)
-        # Only check for leak sanitizer if not cross-compiling due to qemu crash
-        message(WARNING "Leak sanitizer is not supported when cross compiling")
-    else()
-        # Leak sanitizer requires address sanitizer
-        check_sanitizer_support("leak" supported_checks)
-        if(NOT ${supported_checks} STREQUAL "")
-            message(STATUS "Leak sanitizer is enabled: ${supported_checks}")
-            add_compile_options(-fsanitize=${supported_checks})
-            add_link_options(-fsanitize=${supported_checks})
-            add_common_sanitizer_flags()
-        else()
-            message(STATUS "Leak sanitizer is not supported")
-        endif()
-    endif()
-endmacro()
-
-macro(add_memory_sanitizer)
-    check_sanitizer_support("memory" supported_checks)
-    if(NOT ${supported_checks} STREQUAL "")
-        message(STATUS "Memory sanitizer is enabled: ${supported_checks}")
-        add_compile_options(-fsanitize=${supported_checks})
-        add_link_options(-fsanitize=${supported_checks})
-        add_common_sanitizer_flags()
-
-        check_c_compiler_flag(-fsanitize-memory-track-origins HAVE_MEMORY_TRACK_ORIGINS)
-        if(HAVE_MEMORY_TRACK_ORIGINS)
-            add_compile_options(-fsanitize-memory-track-origins)
-            add_link_options(-fsanitize-memory-track-origins)
-        endif()
-    else()
-        message(STATUS "Memory sanitizer is not supported")
-    endif()
-endmacro()
-
-macro(add_thread_sanitizer)
-    check_sanitizer_support("thread" supported_checks)
-    if(NOT ${supported_checks} STREQUAL "")
-        message(STATUS "Thread sanitizer is enabled: ${supported_checks}")
-        add_compile_options(-fsanitize=${supported_checks})
-        add_link_options(-fsanitize=${supported_checks})
-        add_common_sanitizer_flags()
-    else()
-        message(STATUS "Thread sanitizer is not supported")
-    endif()
-endmacro()
-
-macro(add_undefined_sanitizer)
-    set(known_checks
-        array-bounds
-        bool
-        bounds
-        builtin
-        enum
-        float-cast-overflow
-        float-divide-by-zero
-        function
-        integer-divide-by-zero
-        local-bounds
-        null
-        nonnull-attribute
-        pointer-overflow
-        return
-        returns-nonnull-attribute
-        shift
-        shift-base
-        shift-exponent
-        signed-integer-overflow
-        undefined
-        unsigned-integer-overflow
-        unsigned-shift-base
-        vla-bound
-        vptr
-        )
-
-    # Only check for alignment sanitizer flag if unaligned access is not supported
-    if(NOT WITH_UNALIGNED)
-        list(APPEND known_checks alignment)
-    endif()
-    # Object size sanitizer has no effect at -O0 and produces compiler warning if enabled
-    if(NOT CMAKE_C_FLAGS MATCHES "-O0")
-        list(APPEND known_checks object-size)
-    endif()
-
-    check_sanitizer_support("${known_checks}" supported_checks)
-
-    if(NOT ${supported_checks} STREQUAL "")
-        message(STATUS "Undefined behavior sanitizer is enabled: ${supported_checks}")
-        add_compile_options(-fsanitize=${supported_checks})
-        add_link_options(-fsanitize=${supported_checks})
-
-        # Group sanitizer flag -fsanitize=undefined will automatically add alignment, even if
-        # it is not in our sanitize flag list, so we need to explicitly disable alignment sanitizing.
-        if(WITH_UNALIGNED)
-            add_compile_options(-fno-sanitize=alignment)
-        endif()
-
-        add_common_sanitizer_flags()
-    else()
-        message(STATUS "Undefined behavior sanitizer is not supported")
-    endif()
-endmacro()

crates/libz-sys/src/zlib-ng/cmake/fallback-macros.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/fallback-macros.cmake b/crates/libz-sys/src/zlib-ng/cmake/fallback-macros.cmake
deleted file mode 100644
index 8bc6cf2..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/fallback-macros.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# fallback-macros.cmake -- CMake fallback macros
-# Copyright (C) 2022 Nathan Moinvaziri
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# CMake less than version 3.5.2
-if(NOT COMMAND add_compile_options)
-    macro(add_compile_options options)
-        string(APPEND CMAKE_C_FLAGS ${options})
-        string(APPEND CMAKE_CXX_FLAGS ${options})
-    endmacro()
-endif()
-
-# CMake less than version 3.14
-if(NOT COMMAND add_link_options)
-    macro(add_link_options options)
-        string(APPEND CMAKE_EXE_LINKER_FLAGS ${options})
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS ${options})
-    endmacro()
-endif()

crates/libz-sys/src/zlib-ng/cmake/run-and-compare.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/run-and-compare.cmake b/crates/libz-sys/src/zlib-ng/cmake/run-and-compare.cmake
deleted file mode 100644
index eb2218d..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/run-and-compare.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-# run-and-compare.cmake -- Runs a command and compares its output to an expected value
-
-# Copyright (C) 2021 Nathan Moinvaziri
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# Required Variables
-#   COMMAND             - Command to run
-#   OUTPUT              - Standard output
-#   COMPARE             - String to compare output against
-
-# Optional Variables
-#   INPUT               - Standard input
-#   IGNORE_LINE_ENDINGS - Ignore line endings when comparing output
-
-if(NOT DEFINED OUTPUT OR NOT DEFINED COMPARE OR NOT DEFINED COMMAND)
-    message(FATAL_ERROR "Run and compare arguments missing")
-endif()
-
-# Ensure directory exists for output files
-get_filename_component(OUTPUT_DIR "${OUTPUT}" DIRECTORY)
-file(MAKE_DIRECTORY "${OUTPUT_DIR}")
-
-if(INPUT)
-    # Run command with stdin input and redirect stdout to output
-    execute_process(COMMAND ${CMAKE_COMMAND}
-        "-DCOMMAND=${COMMAND}"
-        -DINPUT=${INPUT}
-        -DOUTPUT=${OUTPUT}
-        "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-        RESULT_VARIABLE CMD_RESULT)
-else()
-    # Run command and redirect stdout to output
-    execute_process(COMMAND ${CMAKE_COMMAND}
-        "-DCOMMAND=${COMMAND}"
-        -DOUTPUT=${OUTPUT}
-        "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-        RESULT_VARIABLE CMD_RESULT)
-endif()
-
-if(CMD_RESULT)
-    message(FATAL_ERROR "Run before compare failed: ${CMD_RESULT}")
-endif()
-
-# Use configure_file to normalize line-endings
-if(IGNORE_LINE_ENDINGS)
-    # Rewrite files with normalized line endings to temporary directory
-    get_filename_component(COMPARE_NAME ${COMPARE} NAME)
-    set(COMPARE_TEMP ${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/${COMPARE_NAME}.cmp)
-    configure_file(${COMPARE} ${COMPARE_TEMP} NEWLINE_STYLE LF)
-    set(COMPARE ${COMPARE_TEMP})
-
-    get_filename_component(OUTPUT_NAME ${OUTPUT} NAME)
-    set(OUTPUT_TEMP ${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/${OUTPUT_NAME}.cmp)
-    configure_file(${OUTPUT} ${OUTPUT_TEMP} NEWLINE_STYLE LF)
-    set(OUTPUT ${OUTPUT_TEMP})
-endif()
-
-# Compare that output is equal to specified file
-execute_process(COMMAND ${CMAKE_COMMAND}
-    -E compare_files ${COMPARE} ${OUTPUT}
-    RESULT_VARIABLE CMD_RESULT)
-
-# Delete temporary files used to normalize line-endings
-if(IGNORE_LINE_ENDINGS)
-    file(REMOVE ${COMPARE} ${OUTPUT})
-endif()
-
-if(CMD_RESULT)
-    message(FATAL_ERROR "Run compare failed: ${CMD_RESULT}")
-endif()

crates/libz-sys/src/zlib-ng/cmake/run-and-redirect.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/run-and-redirect.cmake b/crates/libz-sys/src/zlib-ng/cmake/run-and-redirect.cmake
deleted file mode 100644
index 6651d1a..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/run-and-redirect.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# run-and-redirect.cmake -- Runs a command and validates exit code
-
-# Copyright (C) 2021 Nathan Moinvaziri
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# Normally ctest will always fail with non-zero exit code, but we have tests
-# that need to check specific exit codes.
-
-# Required Variables
-#   COMMAND      - Command to run
-
-# Optional Variables
-#   INPUT        - Standard input
-#   OUTPUT       - Standard output (default: /dev/null)
-#   SUCCESS_EXIT - List of successful exit codes (default: 0, ie: 0;1)
-
-# If no output is specified, discard output
-if(NOT DEFINED OUTPUT)
-    if(WIN32)
-        set(OUTPUT NUL)
-    else()
-        set(OUTPUT /dev/null)
-    endif()
-endif()
-
-if(INPUT)
-    # Check to see that input file exists
-    if(NOT EXISTS ${INPUT})
-        message(FATAL_ERROR "Cannot find input: ${INPUT}")
-    endif()
-    # Execute with both stdin and stdout file
-    execute_process(COMMAND ${COMMAND}
-        RESULT_VARIABLE CMD_RESULT
-        INPUT_FILE ${INPUT}
-        OUTPUT_FILE ${OUTPUT})
-else()
-    # Execute with only stdout file
-    execute_process(COMMAND ${COMMAND}
-        RESULT_VARIABLE CMD_RESULT
-        OUTPUT_FILE ${OUTPUT})
-endif()
-
-# Check if exit code is in list of successful exit codes
-if(SUCCESS_EXIT)
-    list(FIND SUCCESS_EXIT ${CMD_RESULT} _INDEX)
-    if (${_INDEX} GREATER -1)
-        set(CMD_RESULT 0)
-    endif()
-endif()
-
-# Check to see if successful
-if(CMD_RESULT)
-    message(FATAL_ERROR "${COMMAND} failed: ${CMD_RESULT}")
-endif()

crates/libz-sys/src/zlib-ng/cmake/test-compress.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/test-compress.cmake b/crates/libz-sys/src/zlib-ng/cmake/test-compress.cmake
deleted file mode 100644
index cfc7613..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/test-compress.cmake
+++ /dev/null
@@ -1,264 +0,0 @@
-# test-compress.cmake -- Runs a test against an input file to make sure that the specified
-#   targets are able to to compress and then decompress it successfully. Optionally verify
-#   the results with gzip. Output files are generated with unique names to prevent parallel
-#   tests from corrupting one another. Default target arguments are compatible with minigzip.
-
-# Copyright (C) 2021 Nathan Moinvaziri
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# that test a specific input file for compression or decompression.
-
-# Required Variables
-#   INPUT                   - Input file to test
-#   TARGET or               - Command to run for both compress and decompress
-#     COMPRESS_TARGET and   - Command to run to compress input file
-#     DECOMPRESS_TARGET     - Command to run to decompress output file
-
-# Optional Variables
-#   TEST_NAME               - Name of test to use when constructing output file paths
-#   COMPRESS_ARGS           - Arguments to pass for compress command (default: -c -k)
-#   DECOMPRESS_ARGS         - Arguments to pass to decompress command (default: -d -c)
-
-#   GZIP_VERIFY             - Verify that gzip can decompress the COMPRESS_TARGET output and
-#                             verify that DECOMPRESS_TARGET can decompress gzip output of INPUT
-#   COMPARE                 - Verify decompressed output is the same as input
-#   SUCCESS_EXIT            - List of successful exit codes (default: 0, ie: 0;1)
-
-if(TARGET)
-    set(COMPRESS_TARGET ${TARGET})
-    set(DECOMPRESS_TARGET ${TARGET})
-endif()
-
-if(NOT DEFINED INPUT OR NOT DEFINED COMPRESS_TARGET OR NOT DEFINED DECOMPRESS_TARGET)
-    message(FATAL_ERROR "Compress test arguments missing")
-endif()
-
-# Set default values
-if(NOT DEFINED COMPARE)
-    set(COMPARE ON)
-endif()
-if(NOT DEFINED COMPRESS_ARGS)
-    set(COMPRESS_ARGS -c -k)
-endif()
-if(NOT DEFINED DECOMPRESS_ARGS)
-    set(DECOMPRESS_ARGS -d -c)
-endif()
-if(NOT DEFINED GZIP_VERIFY)
-    set(GZIP_VERIFY ON)
-endif()
-if(NOT DEFINED SUCCESS_EXIT)
-    set(SUCCESS_EXIT 0)
-endif()
-
-# Use test name from input file name
-if(NOT DEFINED TEST_NAME)
-    get_filename_component(TEST_NAME "${INPUT}" NAME)
-endif()
-
-# Generate unique output path so multiple tests can be executed at the same time
-string(RANDOM LENGTH 6 UNIQUE_ID)
-string(REPLACE "." "-" TEST_NAME "${TEST_NAME}")
-set(OUTPUT_BASE "${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/${TEST_NAME}-${UNIQUE_ID}")
-
-# Ensure directory exists for output files
-get_filename_component(OUTPUT_DIR "${OUTPUT_BASE}" DIRECTORY)
-file(MAKE_DIRECTORY "${OUTPUT_DIR}")
-
-# Cleanup temporary files
-macro(cleanup_always)
-    file(GLOB TEMP_FILES ${OUTPUT_BASE}*)
-    file(REMOVE ${TEMP_FILES})
-endmacro()
-# Clean up temporary files if not on CI
-macro(cleanup)
-    if(NOT DEFINED ENV{CI})
-        cleanup_always()
-    endif()
-endmacro()
-
-# Show differences between two files
-macro(diff src1 src2)
-    find_program(XXD xxd)
-    if(XXD)
-        find_program(DIFF diff)
-        if(DIFF)
-            set(XXD_COMMAND ${XXD} ${src1} ${src1}.hex)
-            execute_process(COMMAND ${XXD_COMMAND})
-            set(XXD_COMMAND ${XXD} ${src2} ${src2}.hex)
-            execute_process(COMMAND ${XXD_COMMAND})
-
-            set(DIFF_COMMAND ${DIFF} -u ${src1}.hex ${src2}.hex)
-            execute_process(COMMAND ${DIFF_COMMAND}
-                OUTPUT_FILE ${src2}.diff)
-
-            file(READ ${src2}.diff DIFF_OUTPUT)
-            message(STATUS "Diff:\n${DIFF_OUTPUT}")
-
-            if(NOT DEFINED ENV{CI})
-                file(REMOVE ${src1}.hex ${src2}.hex ${src2}.diff)
-            endif()
-        endif()
-    endif()
-endmacro()
-
-# Compress input file
-if(NOT EXISTS ${INPUT})
-    message(FATAL_ERROR "Cannot find compress input: ${INPUT}")
-endif()
-
-set(COMPRESS_COMMAND ${COMPRESS_TARGET} ${COMPRESS_ARGS})
-
-message(STATUS "Compress ${COMPRESS_COMMAND}")
-message(STATUS "  Input: ${INPUT}")
-message(STATUS "  Output: ${OUTPUT_BASE}.gz")
-
-execute_process(COMMAND ${CMAKE_COMMAND}
-    "-DCOMMAND=${COMPRESS_COMMAND}"
-    -DINPUT=${INPUT}
-    -DOUTPUT=${OUTPUT_BASE}.gz
-    "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-    -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-    RESULT_VARIABLE CMD_RESULT)
-
-if(CMD_RESULT)
-    cleanup()
-    message(FATAL_ERROR "Compress failed: ${CMD_RESULT}")
-endif()
-
-# Decompress output
-if(NOT EXISTS ${OUTPUT_BASE}.gz)
-    cleanup()
-    message(FATAL_ERROR "Cannot find decompress input: ${OUTPUT_BASE}.gz")
-endif()
-
-set(DECOMPRESS_COMMAND ${DECOMPRESS_TARGET} ${DECOMPRESS_ARGS})
-
-message(STATUS "Decompress ${DECOMPRESS_COMMAND}")
-message(STATUS "  Input: ${OUTPUT_BASE}.gz")
-message(STATUS "  Output: ${OUTPUT_BASE}")
-
-execute_process(COMMAND ${CMAKE_COMMAND}
-    "-DCOMMAND=${DECOMPRESS_COMMAND}"
-    -DINPUT=${OUTPUT_BASE}.gz
-    -DOUTPUT=${OUTPUT_BASE}
-    "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-    -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-    RESULT_VARIABLE CMD_RESULT)
-
-if(CMD_RESULT)
-    cleanup()
-    message(FATAL_ERROR "Decompress failed: ${CMD_RESULT}")
-endif()
-
-if(COMPARE)
-    # Compare decompressed output with original input file
-    execute_process(COMMAND ${CMAKE_COMMAND}
-        -E compare_files ${INPUT} ${OUTPUT_BASE}
-        RESULT_VARIABLE CMD_RESULT)
-
-    if(CMD_RESULT)
-        diff(${INPUT} ${OUTPUT_BASE})
-        cleanup()
-        message(FATAL_ERROR "Compare decompress failed: ${CMD_RESULT}")
-    endif()
-endif()
-
-if(GZIP_VERIFY AND NOT "${COMPRESS_ARGS}" MATCHES "-T")
-    # Transparent writing does not use gzip format
-    find_program(GZIP gzip)
-    if(GZIP)
-        if(NOT EXISTS ${OUTPUT_BASE}.gz)
-            cleanup()
-            message(FATAL_ERROR "Cannot find gzip decompress input: ${OUTPUT_BASE}.gz")
-        endif()
-
-        # Check gzip can decompress our compressed output
-        set(GZ_DECOMPRESS_COMMAND ${GZIP} --decompress)
-
-        message(STATUS "Gzip decompress ${GZ_DECOMPRESS_COMMAND}")
-        message(STATUS "  Input: ${OUTPUT_BASE}.gz")
-        message(STATUS "  Output: ${OUTPUT_BASE}-ungzip")
-
-        execute_process(COMMAND ${CMAKE_COMMAND}
-            "-DCOMMAND=${GZ_DECOMPRESS_COMMAND}"
-            -DINPUT=${OUTPUT_BASE}.gz
-            -DOUTPUT=${OUTPUT_BASE}-ungzip
-            "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-            RESULT_VARIABLE CMD_RESULT)
-
-        if(CMD_RESULT)
-            cleanup()
-            message(FATAL_ERROR "Gzip decompress failed: ${CMD_RESULT}")
-        endif()
-
-        # Compare gzip output with original input file
-        execute_process(COMMAND ${CMAKE_COMMAND}
-            -E compare_files ${INPUT} ${OUTPUT_BASE}-ungzip
-            RESULT_VARIABLE CMD_RESULT)
-
-        if(CMD_RESULT)
-            diff(${INPUT} ${OUTPUT_BASE}-ungzip)
-            cleanup()
-            message(FATAL_ERROR "Compare gzip decompress failed: ${CMD_RESULT}")
-        endif()
-
-        # Compress input file with gzip
-        set(GZ_COMPRESS_COMMAND ${GZIP} --stdout)
-
-        message(STATUS "Gzip compress ${GZ_COMPRESS_COMMAND}")
-        message(STATUS "  Input: ${INPUT}")
-        message(STATUS "  Output: ${OUTPUT_BASE}-gzip.gz")
-
-        execute_process(COMMAND ${CMAKE_COMMAND}
-            "-DCOMMAND=${GZ_COMPRESS_COMMAND}"
-            -DINPUT=${INPUT}
-            -DOUTPUT=${OUTPUT_BASE}-gzip.gz
-            "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-            RESULT_VARIABLE CMD_RESULT)
-
-        if(CMD_RESULT)
-            cleanup()
-            message(FATAL_ERROR "Gzip compress failed: ${CMD_RESULT}")
-        endif()
-
-        if(NOT EXISTS ${OUTPUT_BASE}-gzip.gz)
-            cleanup()
-            message(FATAL_ERROR "Cannot find decompress gzip input: ${OUTPUT_BASE}-gzip.gz")
-        endif()
-
-        message(STATUS "Decompress gzip ${DECOMPRESS_COMMAND}")
-        message(STATUS "  Input: ${OUTPUT_BASE}-gzip.gz")
-        message(STATUS "  Output: ${OUTPUT_BASE}-gzip")
-
-        # Check decompress target can handle gzip compressed output
-        execute_process(COMMAND ${CMAKE_COMMAND}
-            "-DCOMMAND=${DECOMPRESS_COMMAND}"
-            -DINPUT=${OUTPUT_BASE}-gzip.gz
-            -DOUTPUT=${OUTPUT_BASE}-gzip
-            "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-            RESULT_VARIABLE CMD_RESULT)
-
-        if(CMD_RESULT)
-            cleanup()
-            message(FATAL_ERROR "Decompress gzip failed: ${CMD_RESULT}")
-        endif()
-
-        if(COMPARE)
-            # Compare original input file with gzip decompressed output
-            execute_process(COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${INPUT} ${OUTPUT_BASE}-gzip
-                RESULT_VARIABLE CMD_RESULT)
-
-            if(CMD_RESULT)
-                diff(${INPUT} ${OUTPUT_BASE}-gzip)
-                cleanup()
-                message(FATAL_ERROR "Compare decompress gzip failed: ${CMD_RESULT}")
-            endif()
-        endif()
-    endif()
-endif()
-
-cleanup_always()

crates/libz-sys/src/zlib-ng/cmake/test-tools.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/test-tools.cmake b/crates/libz-sys/src/zlib-ng/cmake/test-tools.cmake
deleted file mode 100644
index 4afe07c..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/test-tools.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# test-tools.cmake -- Tests targeting tool coverage
-
-# Test --help and invalid parameters for our tools
-set(TEST_COMMAND ${MINIGZIP_COMMAND} "--help")
-add_test(NAME minigzip-help
-    COMMAND ${CMAKE_COMMAND}
-    "-DCOMMAND=${TEST_COMMAND}"
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
-
-set(TEST_COMMAND ${MINIGZIP_COMMAND} "--invalid")
-add_test(NAME minigzip-invalid
-    COMMAND ${CMAKE_COMMAND}
-    "-DCOMMAND=${TEST_COMMAND}"
-    -DSUCCESS_EXIT=64
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
-
-set(TEST_COMMAND ${MINIDEFLATE_COMMAND} "--help")
-add_test(NAME minideflate-help
-    COMMAND ${CMAKE_COMMAND}
-     "-DCOMMAND=${TEST_COMMAND}"
-     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
-
-set(TEST_COMMAND ${MINIDEFLATE_COMMAND} "--invalid")
-add_test(NAME minideflate-invalid
-    COMMAND ${CMAKE_COMMAND}
-    "-DCOMMAND=${TEST_COMMAND}"
-    -DSUCCESS_EXIT=64
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
-
-set(TEST_COMMAND ${SWITCHLEVELS_COMMAND} "--help")
-add_test(NAME switchlevels-help
-    COMMAND ${CMAKE_COMMAND}
-     "-DCOMMAND=${TEST_COMMAND}"
-     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)

crates/libz-sys/src/zlib-ng/cmake/toolchain-aarch64.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-aarch64.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-aarch64.cmake
deleted file mode 100644
index 1e24731..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-aarch64.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET "aarch64-linux-gnu")
-set(CMAKE_CXX_COMPILER_TARGET "aarch64-linux-gnu")
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-aarch64 -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-arm.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-arm.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-arm.cmake
deleted file mode 100644
index 1bdd8d2..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-arm.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-set(CMAKE_SYSTEM_VERSION 1)
-
-if(NOT DEFINED CMAKE_C_COMPILER_TARGET)
-    set(CMAKE_C_COMPILER_TARGET arm-linux-gnueabi)
-endif()
-if(NOT DEFINED CMAKE_CXX_COMPILER_TARGET)
-    set(CMAKE_CXX_COMPILER_TARGET arm-linux-gnueabi)
-endif()
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-arm -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-armhf.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-armhf.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-armhf.cmake
deleted file mode 100644
index 007859c..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-armhf.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET arm-linux-gnueabihf)
-set(CMAKE_CXX_COMPILER_TARGET arm-linux-gnueabihf)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-arm -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-i686.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-i686.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-i686.cmake
deleted file mode 100644
index 4b1264c..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-i686.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-set(CMAKE_SYSTEM_NAME Windows)
-
-set(CMAKE_C_COMPILER_TARGET i686)
-set(CMAKE_CXX_COMPILER_TARGET i686)
-set(CMAKE_RC_COMPILER_TARGET i686)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR wine)
-
-set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Prefer posix gcc variant for gtest pthread support
-find_program(C_COMPILER_FULL_PATH NAMES
-    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc-posix
-    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc
-    gcc-mingw32-w64-${CMAKE_C_COMPILER_TARGET})
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES
-    g++-mingw-w64-${CMAKE_CXX_COMPILER_TARGET}
-    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++-posix
-    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()
-
-find_program(RC_COMPILER_FULL_PATH NAMES
-    ${CMAKE_RC_COMPILER_TARGET}-w64-mingw32-windres)
-if(RC_COMPILER_FULL_PATH)
-    set(CMAKE_RC_COMPILER ${RC_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-x86_64.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-x86_64.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-x86_64.cmake
deleted file mode 100644
index 7ae8140..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-mingw-x86_64.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-set(CMAKE_SYSTEM_NAME Windows)
-
-set(CMAKE_C_COMPILER_TARGET x86_64)
-set(CMAKE_CXX_COMPILER_TARGET x86_64)
-set(CMAKE_RC_COMPILER_TARGET x86_64)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR wine)
-
-set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Prefer posix gcc variant for gtest pthread support
-find_program(C_COMPILER_FULL_PATH NAMES
-    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc-posix
-    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES
-    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-g++-posix
-    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()
-
-find_program(RC_COMPILER_FULL_PATH NAMES ${CMAKE_RC_COMPILER_TARGET}-w64-mingw32-windres)
-if(RC_COMPILER_FULL_PATH)
-    set(CMAKE_RC_COMPILER ${RC_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc.cmake
deleted file mode 100644
index f097133..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR powerpc)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET powerpc-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET powerpc-linux-gnu)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc -cpu 7400 -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64.cmake
deleted file mode 100644
index 80d8b90..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR ppc64)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET powerpc64-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET powerpc64-linux-gnu)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc64 -cpu power8 -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64le.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64le.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64le.cmake
deleted file mode 100644
index 68381de..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-powerpc64le.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR ppc64le)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET powerpc64le-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET powerpc64le-linux-gnu)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc64le -cpu power8 -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-s390x.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-s390x.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-s390x.cmake
deleted file mode 100644
index 9455a2b..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-s390x.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR s390x)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET s390x-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET s390x-linux-gnu)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-s390x -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/cmake/toolchain-sparc64.cmake

diff --git a/crates/libz-sys/src/zlib-ng/cmake/toolchain-sparc64.cmake b/crates/libz-sys/src/zlib-ng/cmake/toolchain-sparc64.cmake
deleted file mode 100644
index 16161a7..0000000
--- a/crates/libz-sys/src/zlib-ng/cmake/toolchain-sparc64.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR sparc64)
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_C_COMPILER_TARGET sparc64-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET sparc64-linux-gnu)
-
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_CROSSCOMPILING_EMULATOR qemu-sparc64 -L /usr/${CMAKE_C_COMPILER_TARGET}/)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-gcc)
-if(NOT C_COMPILER_FULL_PATH)
-    message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
-endif()
-set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
-
-find_program(CXX_COMPILER_FULL_PATH NAMES g++-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++)
-if(CXX_COMPILER_FULL_PATH)
-    set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
-endif()

crates/libz-sys/src/zlib-ng/compare256.c

diff --git a/crates/libz-sys/src/zlib-ng/compare256.c b/crates/libz-sys/src/zlib-ng/compare256.c
deleted file mode 100644
index 3c05969..0000000
--- a/crates/libz-sys/src/zlib-ng/compare256.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* compare256.c -- 256 byte memory comparison with match length return
- * Copyright (C) 2020 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "fallback_builtins.h"
-
-/* ALIGNED, byte comparison */
-static inline uint32_t compare256_c_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-        if (*src0 != *src1)
-            return len;
-        src0 += 1, src1 += 1, len += 1;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_c(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_c_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_c
-#define COMPARE256          compare256_c_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_c
-#define COMPARE256          compare256_c_static
-
-#include "match_tpl.h"
-
-#ifdef UNALIGNED_OK
-/* 16-bit unaligned integer comparison */
-static inline uint32_t compare256_unaligned_16_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        if (zmemcmp_2(src0, src1) != 0)
-            return len + (*src0 == *src1);
-        src0 += 2, src1 += 2, len += 2;
-        if (zmemcmp_2(src0, src1) != 0)
-            return len + (*src0 == *src1);
-        src0 += 2, src1 += 2, len += 2;
-        if (zmemcmp_2(src0, src1) != 0)
-            return len + (*src0 == *src1);
-        src0 += 2, src1 += 2, len += 2;
-        if (zmemcmp_2(src0, src1) != 0)
-            return len + (*src0 == *src1);
-        src0 += 2, src1 += 2, len += 2;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_unaligned_16(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_unaligned_16_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_unaligned_16
-#define COMPARE256          compare256_unaligned_16_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_unaligned_16
-#define COMPARE256          compare256_unaligned_16_static
-
-#include "match_tpl.h"
-
-#ifdef HAVE_BUILTIN_CTZ
-/* 32-bit unaligned integer comparison */
-static inline uint32_t compare256_unaligned_32_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        uint32_t sv, mv, diff;
-
-        zmemcpy_4(&sv, src0);
-        zmemcpy_4(&mv, src1);
-
-        diff = sv ^ mv;
-        if (diff) {
-            uint32_t match_byte = __builtin_ctz(diff) / 8;
-            return len + match_byte;
-        }
-
-        src0 += 4, src1 += 4, len += 4;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_unaligned_32(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_unaligned_32_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_unaligned_32
-#define COMPARE256          compare256_unaligned_32_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_unaligned_32
-#define COMPARE256          compare256_unaligned_32_static
-
-#include "match_tpl.h"
-
-#endif
-
-#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-/* UNALIGNED64_OK, 64-bit integer comparison */
-static inline uint32_t compare256_unaligned_64_static(const uint8_t *src0, const uint8_t *src1) {
-    uint32_t len = 0;
-
-    do {
-        uint64_t sv, mv, diff;
-
-        zmemcpy_8(&sv, src0);
-        zmemcpy_8(&mv, src1);
-
-        diff = sv ^ mv;
-        if (diff) {
-            uint64_t match_byte = __builtin_ctzll(diff) / 8;
-            return len + (uint32_t)match_byte;
-        }
-
-        src0 += 8, src1 += 8, len += 8;
-    } while (len < 256);
-
-    return 256;
-}
-
-Z_INTERNAL uint32_t compare256_unaligned_64(const uint8_t *src0, const uint8_t *src1) {
-    return compare256_unaligned_64_static(src0, src1);
-}
-
-#define LONGEST_MATCH       longest_match_unaligned_64
-#define COMPARE256          compare256_unaligned_64_static
-
-#include "match_tpl.h"
-
-#define LONGEST_MATCH_SLOW
-#define LONGEST_MATCH       longest_match_slow_unaligned_64
-#define COMPARE256          compare256_unaligned_64_static
-
-#include "match_tpl.h"
-
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/compress.c

diff --git a/crates/libz-sys/src/zlib-ng/compress.c b/crates/libz-sys/src/zlib-ng/compress.c
deleted file mode 100644
index 44f8dd9..0000000
--- a/crates/libz-sys/src/zlib-ng/compress.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-
-/* ===========================================================================
- *  Architecture-specific hooks.
- */
-#ifdef S390_DFLTCC_DEFLATE
-#  include "arch/s390/dfltcc_common.h"
-#else
-/* Returns the upper bound on compressed data length based on uncompressed data length, assuming default settings.
- * Zero means that arch-specific deflation code behaves identically to the regular zlib-ng algorithms. */
-#  define DEFLATE_BOUND_COMPLEN(source_len) 0
-#endif
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int Z_EXPORT PREFIX(compress2)(unsigned char *dest, z_size_t *destLen, const unsigned char *source,
-                        z_size_t sourceLen, int level) {
-    PREFIX3(stream) stream;
-    int err;
-    const unsigned int max = (unsigned int)-1;
-    z_size_t left;
-
-    left = *destLen;
-    *destLen = 0;
-
-    stream.zalloc = NULL;
-    stream.zfree = NULL;
-    stream.opaque = NULL;
-
-    err = PREFIX(deflateInit)(&stream, level);
-    if (err != Z_OK)
-        return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-    stream.next_in = (z_const unsigned char *)source;
-    stream.avail_in = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (unsigned long)max ? max : (unsigned int)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = sourceLen > (unsigned long)max ? max : (unsigned int)sourceLen;
-            sourceLen -= stream.avail_in;
-        }
-        err = PREFIX(deflate)(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
-    } while (err == Z_OK);
-
-    *destLen = (z_size_t)stream.total_out;
-    PREFIX(deflateEnd)(&stream);
-    return err == Z_STREAM_END ? Z_OK : err;
-}
-
-/* ===========================================================================
- */
-int Z_EXPORT PREFIX(compress)(unsigned char *dest, z_size_t *destLen, const unsigned char *source, z_size_t sourceLen) {
-    return PREFIX(compress2)(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-   If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-z_size_t Z_EXPORT PREFIX(compressBound)(z_size_t sourceLen) {
-    z_size_t complen = DEFLATE_BOUND_COMPLEN(sourceLen);
-
-    if (complen > 0)
-        /* Architecture-specific code provided an upper bound. */
-        return complen + ZLIB_WRAPLEN;
-
-#ifndef NO_QUICK_STRATEGY
-    return sourceLen                       /* The source size itself */
-      + (sourceLen == 0 ? 1 : 0)           /* Always at least one byte for any input */
-      + (sourceLen < 9 ? 1 : 0)            /* One extra byte for lengths less than 9 */
-      + DEFLATE_QUICK_OVERHEAD(sourceLen)  /* Source encoding overhead, padded to next full byte */
-      + DEFLATE_BLOCK_OVERHEAD             /* Deflate block overhead bytes */
-      + ZLIB_WRAPLEN;                      /* zlib wrapper */
-#else
-    return sourceLen + (sourceLen >> 4) + 7 + ZLIB_WRAPLEN;
-#endif
-}

crates/libz-sys/src/zlib-ng/configure

diff --git a/crates/libz-sys/src/zlib-ng/configure b/crates/libz-sys/src/zlib-ng/configure
deleted file mode 100755
index b90c234..0000000
--- a/crates/libz-sys/src/zlib-ng/configure
+++ /dev/null
@@ -1,2216 +0,0 @@
-#!/usr/bin/env bash
-# configure script for zlib.
-#
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-#
-# To impose specific compiler or flags or install directory, use for example:
-#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
-# or for csh/tcsh users:
-#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
-
-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
-# If you have problems, try without defining CC and CFLAGS before reporting
-# an error.
-
-# start off configure.log
-echo -------------------- >> configure.log
-echo $0 $* >> configure.log
-date >> configure.log
-
-SRCDIR=$(cd $(dirname $0); pwd)
-BUILDDIR=$(pwd)
-
-# set command prefix for cross-compilation
-if [ -n "${CHOST}" ]; then
-    # normalize the chost before parsing it
-    NORM_CHOST=$(sh "$SRCDIR"/tools/config.sub $CHOST)
-    uname="$(echo "${NORM_CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/')"
-    CROSS_PREFIX="${CHOST}-"
-    ARCH="$(echo "${NORM_CHOST}" | sed -e 's/-.*//')"
-else
-    ARCH="$(uname -m)"
-fi
-
-case "${ARCH}" in
-    x86_64)
-        case "${CFLAGS}" in
-            *-m32*)
-                ARCH=i686
-            ;;
-        esac
-    ;;
-    i386 | i486 | i586 | i686)
-        case "${CFLAGS}" in
-            *-m64*)
-                ARCH=x86_64
-            ;;
-        esac
-    ;;
-esac
-
-# destination name for windows import library
-IMPORTLIB=
-
-# establish commands for library building
-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    AR=${AR-"${CROSS_PREFIX}ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-else
-    AR=${AR-"ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-fi
-ARFLAGS=${ARFLAGS-"rc"}
-if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
-    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
-else
-    RANLIB=${RANLIB-"ranlib"}
-fi
-
-# set defaults before processing command line options
-LDCONFIG=${LDCONFIG-"ldconfig"}
-DEFFILE=
-RC=
-RCFLAGS=
-RCOBJS=
-STRIP=
-ARCHS=
-prefix=${prefix-/usr/local}
-exec_prefix=${exec_prefix-'${prefix}'}
-bindir=${bindir-'${exec_prefix}/bin'}
-libdir=${libdir-'${exec_prefix}/lib'}
-sharedlibdir=${sharedlibdir-'${libdir}'}
-includedir=${includedir-'${prefix}/include'}
-mandir=${mandir-'${prefix}/share/man'}
-shared_ext='.so'
-shared=1
-gzfileops=1
-unalignedok=1
-compat=0
-cover=0
-build32=0
-build64=0
-buildvpclmulqdq=1
-buildacle=1
-buildaltivec=1
-buildpower8=1
-buildpower9=1
-buildneon=1
-builddfltccdeflate=0
-builddfltccinflate=0
-buildcrc32vx=1
-floatabi=
-native=0
-forcesse2=0
-forcetzcnt=0
-# For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
-# instruction scheduling unless you specify a reasonable -mtune= target
-avx512flag="-mavx512f -mavx512dq -mavx512bw -mavx512vl -mtune=cascadelake"
-avx512vnniflag="-mavx512vnni ${avx512flag}"
-avx2flag="-mavx2"
-sse2flag="-msse2"
-ssse3flag="-mssse3"
-sse41flag="-msse4.1"
-sse42flag="-msse4.2"
-pclmulflag="-mpclmul"
-vpclmulflag="-mvpclmulqdq"
-acleflag=
-neonflag=
-noltoflag="-fno-lto"
-vgfmaflag="-march=z13"
-vmxflag="-maltivec"
-symbol_prefix=""
-without_optimizations=0
-without_new_strategies=0
-reducedmem=0
-gcc=0
-warn=0
-debug=0
-old_cc="$CC"
-old_cflags="$CFLAGS"
-OBJC='$(OBJZ)'
-PIC_OBJC='$(PIC_OBJZ)'
-INSTALLTARGETS="install-shared install-static"
-UNINSTALLTARGETS="uninstall-shared uninstall-static"
-
-TEST="teststatic"
-
-# leave this script, optionally in a bad way
-leave()
-{
-  if test "$*" != "0"; then
-    echo "** $0 aborting." | tee -a configure.log
-  fi
-  rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version
-  echo -------------------- >> configure.log
-  echo >> configure.log
-  echo >> configure.log
-  exit $1
-}
-
-# process command line options
-while test $# -ge 1
-do
-case "$1" in
-    -h* | --help)
-      echo 'usage:' | tee -a configure.log
-      echo '  configure [--prefix=PREFIX]  [--eprefix=EXPREFIX]' | tee -a configure.log
-      echo '    [--static] [--32] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
-      echo '    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
-      echo '    [--sprefix=SYMBOL_PREFIX]   Adds a prefix to all exported symbols' | tee -a configure.log
-      echo '    [--warn]                    Enables extra compiler warnings' | tee -a configure.log
-      echo '    [--debug]                   Enables extra debug prints during operation' | tee -a configure.log
-      echo '    [--zlib-compat]             Compiles for zlib-compatible API instead of zlib-ng API' | tee -a configure.log
-      echo '    [--without-unaligned]       Compiles without fast unaligned access' | tee -a configure.log
-      echo '    [--without-gzfileops]       Compiles without the gzfile parts of the API enabled' | tee -a configure.log
-      echo '    [--without-optimizations]   Compiles without support for optional instruction sets' | tee -a configure.log
-      echo '    [--without-new-strategies]  Compiles without using new additional deflate strategies' | tee -a configure.log
-      echo '    [--without-acle]            Compiles without ARM C Language Extensions' | tee -a configure.log
-      echo '    [--without-neon]            Compiles without ARM Neon SIMD instruction set' | tee -a configure.log
-      echo '    [--without-altivec]         Compiles without PPC AltiVec support' | tee -a configure.log
-      echo '    [--without-power8]          Compiles without Power8 instruction set' | tee -a configure.log
-      echo '    [--with-dfltcc-deflate]     Use DEFLATE CONVERSION CALL instruction for compression on IBM Z' | tee -a configure.log
-      echo '    [--with-dfltcc-inflate]     Use DEFLATE CONVERSION CALL instruction for decompression on IBM Z' | tee -a configure.log
-      echo '    [--without-crc32-vx]        Build without vectorized CRC32 on IBM Z' | tee -a configure.log
-      echo '    [--with-reduced-mem]        Reduced memory usage for special cases (reduces performance)' | tee -a configure.log
-      echo '    [--force-sse2]              Assume SSE2 instructions are always available (disabled by default on x86, enabled on x86_64)' | tee -a configure.log
-      echo '    [--force-tzcnt]             Assume TZCNT instructions are always available (disabled by default)' | tee -a configure.log
-      echo '    [--native]                  Compiles with full instruction set supported on this host' | tee -a configure.log
-        exit 0 ;;
-    -p*=* | --prefix=*) prefix=$(echo $1 | sed 's/.*=//'); shift ;;
-    -e*=* | --eprefix=*) exec_prefix=$(echo $1 | sed 's/.*=//'); shift ;;
-    -m*=* | --sprefix=*) symbol_prefix=$(echo $1 | sed 's/.*=//'); shift ;;
-    -l*=* | --libdir=*) libdir=$(echo $1 | sed 's/.*=//'); shift ;;
-    --sharedlibdir=*) sharedlibdir=$(echo $1 | sed 's/.*=//'); shift ;;
-    -i*=* | --includedir=*) includedir=$(echo $1 | sed 's/.*=//');shift ;;
-    -u*=* | --uname=*) uname=$(echo $1 | sed 's/.*=//');shift ;;
-    -p* | --prefix) prefix="$2"; shift; shift ;;
-    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
-    -m* | --sprefix) symbol_prefix="$2"; shift; shift ;;
-    -l* | --libdir) libdir="$2"; shift; shift ;;
-    -i* | --includedir) includedir="$2"; shift; shift ;;
-    -s* | --shared | --enable-shared) shared=1; shift ;;
-    -t | --static) shared=0; shift ;;
-    --zlib-compat) compat=1; shift ;;
-    --without-unaligned) unalignedok=0; shift ;;
-    --without-gzfileops) gzfileops=0; shift ;;
-    --cover) cover=1; shift ;;
-    -3* | --32) build32=1; shift ;;
-    -6* | --64) build64=1; shift ;;
-    --without-vpclmulqdq) buildvpclmulqdq=0; shift ;;
-    --without-acle) buildacle=0; shift ;;
-    --without-neon) buildneon=0; shift ;;
-    --without-altivec) buildaltivec=0 ; shift ;;
-    --without-power8) buildpower8=0 ; shift ;;
-    --without-power9) buildpower9=0 ; shift ;;
-    --with-dfltcc-deflate) builddfltccdeflate=1; shift ;;
-    --with-dfltcc-inflate) builddfltccinflate=1; shift ;;
-    --without-crc32-vx) buildcrc32vx=0; shift ;;
-    --with-reduced-mem) reducedmem=1; shift ;;
-    --force-sse2) forcesse2=1; shift ;;
-    --force-tzcnt) forcetzcnt=1; shift ;;
-    -n | --native) native=1; shift ;;
-    -a*=* | --archs=*) ARCHS=$(echo $1 | sed 's/.*=//'); shift ;;
-    --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
-    --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
-    -noopt | --without-optimizations) without_optimizations=1; shift;;
-    -oldstrat | --without-new-strategies) without_new_strategies=1; shift;;
-    -w* | --warn) warn=1; shift ;;
-    -d* | --debug) debug=1; shift ;;
-
-    *)
-      echo "unknown option: $1" | tee -a configure.log
-      echo "$0 --help for help" | tee -a configure.log
-      leave 1;;
-    esac
-done
-
-# temporary file name
-test=ztest$$
-
-# put arguments in log, also put test file in log if used in arguments
-show()
-{
-  case "$*" in
-    *$test.c*)
-      echo "=== $test.c ===" >> configure.log
-      cat $test.c >> configure.log
-      echo "===" >> configure.log;;
-  esac
-  echo $* >> configure.log
-}
-
-# check for gcc vs. cc and set compile and link flags based on the system identified by uname
-cat > $test.c <<EOF
-extern int getchar();
-int main() {return getchar();}
-EOF
-
-cc=${CC-${CROSS_PREFIX}gcc}
-echo -n "Checking for compiler... " | tee -a configure.log
-case "$cc" in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-case $($cc -v 2>&1) in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-
-if test $native -eq 1; then
-  avx512flag=""
-  avx512vnniflag=""
-  avx2flag=""
-  sse2flag=""
-  ssse3flag=""
-  sse4flag=""
-  sse42flag=""
-  pclmulflag=""
-  vpclmulflag=""
-  noltoflag=""
-fi
-
-if test $build32 -eq 1; then
-  CFLAGS="${CFLAGS} -m32"
-  SFLAGS="${SFLAGS} -m32"
-  LDFLAGS="${LDFLAGS} -m32"
-fi
-if test $build64 -eq 1; then
-  CFLAGS="${CFLAGS} -m64"
-  SFLAGS="${SFLAGS} -m64"
-  LDFLAGS="${LDFLAGS} -m64"
-fi
-
-# Set library name depending on zlib-compat option
-if test $compat -eq 0; then
-  LIBNAME=libz-ng
-  LIBNAME2=zlib-ng
-  SUFFIX=-ng
-else
-  LIBNAME=libz
-  LIBNAME2=zlib
-  SUFFIX=""
-fi
-
-STATICLIB=${LIBNAME}.a
-MAPNAME=${LIBNAME2}.map
-
-# extract zlib version numbers from zlib.h
-if test $compat -eq 0; then
-  VER=$(sed -n -e '/ZLIBNG_VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}/zlib-ng.h.in)
-  VER3=$(sed -n -e '/ZLIBNG_VERSION "/s/.*"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p' < ${SRCDIR}/zlib-ng.h.in)
-  VER2=$(sed -n -e '/ZLIBNG_VERSION "/s/.*"\([0-9]*\.[0-9]*\)\..*/\1/p' < ${SRCDIR}/zlib-ng.h.in)
-  VER1=$(sed -n -e '/ZLIBNG_VERSION "/s/.*"\([0-9]*\)\..*/\1/p' < ${SRCDIR}/zlib-ng.h.in)
-else
-  VER=$(sed -n -e '/ZLIB_VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}/zlib.h.in)
-  VER3=$(sed -n -e '/ZLIB_VERSION "/s/.*"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p' < ${SRCDIR}/zlib.h.in)
-  VER2=$(sed -n -e '/ZLIB_VERSION "/s/.*"\([0-9]*\.[0-9]*\)\..*/\1/p' < ${SRCDIR}/zlib.h.in)
-  VER1=$(sed -n -e '/ZLIB_VERSION "/s/.*"\([0-9]*\)\..*/\1/p' < ${SRCDIR}/zlib.h.in)
-fi
-
-show $cc -c $test.c
-if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
-  echo "$cc" | tee -a configure.log
-  CC="$cc"
-  CFLAGS="${CFLAGS} -std=c11"
-
-  # Re-check ARCH if the compiler is a cross-compiler.
-  if $CC -print-multiarch 1> /dev/null 2>&1 && test -n "$($CC -print-multiarch)" 1> /dev/null 2>&1; then
-      CC_ARCH=$($CC $CFLAGS -print-multiarch | sed 's/-.*//g')
-  else
-      CC_ARCH=$($CC $CFLAGS -dumpmachine | sed 's/-.*//g')
-  fi
-  case $CC_ARCH in
-    i386 | i486 | i586 | i686)
-      # Honor user choice if gcc is multilib and 64-bit is requested
-      if test $build64 -eq 1; then
-        ARCH=x86_64
-      else
-        ARCH=$CC_ARCH
-      fi ;;
-    x86_64)
-      # Honor user choice if gcc is multilib and 32-bit is requested
-      if test $build32 -ne 1; then
-        ARCH=$CC_ARCH
-      fi ;;
-    arm | armeb)
-      if test $native -eq 0; then
-        ARCH=arm
-      else
-        ARCH=native
-      fi
-      if test "${uname}" = "eabi"; then
-        # No ACLE support
-        uname=arm
-        if test $buildacle -eq 1; then
-          echo ACLE support not available
-          buildacle=0
-        fi
-      fi
-      if test $buildacle -eq 1; then
-        if test $native -eq 0; then
-          ARCH=armv8-a+crc
-        fi
-      fi ;;
-    armv8l)
-      if test $native -eq 0; then
-        ARCH=armv8-a
-      else
-        ARCH=native
-      fi ;;
-    aarch64 | aarch64_be)
-      if test "${uname}" = "elf"; then
-        uname=aarch64
-      fi
-      if test $native -eq 0; then
-        ARCH=aarch64
-      else
-        ARCH=native
-      fi ;;
-    powerpc | ppc)
-      ARCH=powerpc ;;
-    powerpc64 | ppc64)
-      ARCH=powerpc64 ;;
-    powerpc64le | ppc64le)
-      ARCH=powerpc64le ;;
-  esac
-  CFLAGS="-O2 ${CFLAGS}"
-  if test -n "${ARCHS}"; then
-    CFLAGS="${CFLAGS} ${ARCHS}"
-    LDFLAGS="${LDFLAGS} ${ARCHS}"
-  fi
-  CFLAGS="${CFLAGS} -Wall"
-  SFLAGS="${CFLAGS} -fPIC"
-  if test $native -eq 1; then
-    case $ARCH in
-      powerpc*)
-        NATIVE_FLAG="-mcpu=native" ;;
-      *)
-        NATIVE_FLAG="-march=native" ;;
-    esac
-    CFLAGS="${CFLAGS} ${NATIVE_FLAG}"
-    SFLAGS="${SFLAGS} ${NATIVE_FLAG}"
-  fi
-  if test "$warn" -eq 1; then
-    CFLAGS="${CFLAGS} -Wextra -Wpedantic -Wno-implicit-fallthrough"
-  fi
-  if test $debug -eq 1; then
-    CFLAGS="${CFLAGS} -DZLIB_DEBUG"
-    SFLAGS="${SFLAGS} -DZLIB_DEBUG"
-  else
-    CFLAGS="${CFLAGS} -DNDEBUG"
-    SFLAGS="${SFLAGS} -DNDEBUG"
-  fi
-  if test -z "$uname"; then
-    uname=$((uname -s || echo unknown) 2>/dev/null)
-  fi
-  case "$uname" in
-  Linux* | linux* | GNU | GNU/* | solaris*)
-        LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.${VER1},--version-script,${SRCDIR}/${MAPNAME}" ;;
-  *BSD | *bsd* | DragonFly)
-        LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.${VER1},--version-script,${SRCDIR}/${MAPNAME}"
-        LDCONFIG="ldconfig -m" ;;
-  CYGWIN* | Cygwin* | cygwin*)
-        ARFLAGS="rcs"
-        SFLAGS="${CFLAGS}"
-        shared_ext='.dll'
-        sharedlibdir='${bindir}'
-        if test $compat -eq 0; then
-          SHAREDLIB=cygz-ng$shared_ext
-        else
-          SHAREDLIB=cygz$shared_ext
-        fi
-        SHAREDLIBM=''
-        SHAREDLIBV=''
-        SHAREDTARGET=$SHAREDLIB
-        IMPORTLIB="${LIBNAME}.dll.a"
-        LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,--out-implib,${IMPORTLIB},--version-script,${SRCDIR}/${MAPNAME}"
-        LDSHAREDLIBC=""
-        DEFFILE='win32/${LIBNAME2}.def'
-        RC="${CROSS_PREFIX}windres"
-        RCFLAGS='--define GCC_WINDRES'
-        RCOBJS='zlibrc.o'
-        STRIP="${CROSS_PREFIX}strip"
-        EXE='.exe' ;;
-  MSYS* | msys*)
-        ARFLAGS="rcs"
-        SFLAGS="${CFLAGS}"
-        shared_ext='.dll'
-        sharedlibdir='${bindir}'
-        if test $compat -eq 0; then
-          SHAREDLIB=msys-z-ng$shared_ext
-        else
-          SHAREDLIB=msys-z$shared_ext
-        fi
-        SHAREDLIBM=''
-        SHAREDLIBV=''
-        SHAREDTARGET=$SHAREDLIB
-        IMPORTLIB="${LIBNAME}.dll.a"
-        LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,--out-implib,${IMPORTLIB}"
-        LDSHAREDLIBC=""
-        DEFFILE='win32/${LIBNAME2}.def'
-        RC="${CROSS_PREFIX}windres"
-        RCFLAGS='--define GCC_WINDRES'
-        RCOBJS='zlibrc.o'
-        STRIP="${CROSS_PREFIX}strip"
-        EXE='.exe' ;;
-  MINGW* | mingw*)
-        ARFLAGS="rcs"
-        CFLAGS="${CFLAGS} -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE=1"
-        SFLAGS="${CFLAGS}"
-        shared_ext='.dll'
-        sharedlibdir='${bindir}'
-        SHAREDLIB=${LIBNAME}-$VER1$shared_ext
-        SHAREDLIBM=''
-        SHAREDLIBV=''
-        SHAREDTARGET=$SHAREDLIB
-        IMPORTLIB="${LIBNAME}.dll.a"
-        LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,--out-implib=${IMPORTLIB} -Wl,--version-script=${SRCDIR}/${MAPNAME}"
-        LDSHAREDLIBC=""
-        DEFFILE='win32/${LIBNAME2}.def'
-        RC="${CROSS_PREFIX}windres"
-        RCFLAGS='--define GCC_WINDRES'
-        if [ "$CC" == "mingw32-gcc" ]; then
-          case $ARCH in
-          i386 | i486 | i586 | i686) RCFLAGS="${RCFLAGS} -F pe-i386";;
-          esac;
-        fi
-        RCOBJS='zlibrc.o'
-        STRIP="${CROSS_PREFIX}strip"
-        EXE='.exe' ;;
-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-         # (alain.bonnefoy@icbt.com)
-                 LDSHARED=${LDSHARED-"$cc"}
-                 LDSHAREDFLAGS="-shared -Wl,-h${LIBNAME}.so.${VER1}" ;;
-  HP-UX*)
-         LDSHARED=${LDSHARED-"$cc"}
-         LDSHAREDFLAGS="-shared"
-         case $((uname -m || echo unknown) 2>/dev/null) in
-         ia64)
-                 shared_ext='.so'
-                 SHAREDLIB='${LIBNAME}.so' ;;
-         *)
-                 shared_ext='.sl'
-                 SHAREDLIB='${LIBNAME}.sl' ;;
-         esac ;;
-  Darwin* | darwin*)
-             shared_ext='.dylib'
-             SHAREDLIB=${LIBNAME}$shared_ext
-             SHAREDLIBV=${LIBNAME}.$VER$shared_ext
-             SHAREDLIBM=${LIBNAME}.$VER1$shared_ext
-             SHAREDTARGET=$SHAREDLIBV
-             LDSHARED=${LDSHARED-"$cc"}
-             LDSHAREDFLAGS="-dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"
-             if libtool -V 2>&1 | grep Apple > /dev/null; then
-                 AR="libtool"
-             else
-                 AR="/usr/bin/libtool"
-             fi
-             ARFLAGS="-o" ;;
-  aarch64)
-             LDSHARED=${LDSHARED-"$cc"}
-             LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.${VER1} -Wl,--version-script,${SRCDIR}/${MAPNAME}"
-             LDSHAREDLIBC="-Wl,--start-group -lc -lrdimon -Wl,--end-group" ;;
-  *)
-             LDSHARED=${LDSHARED-"$cc"}
-             LDSHAREDFLAGS="-shared" ;;
-  esac
-else
-  # find system name and corresponding cc options
-  CC=${CC-cc}
-  gcc=0
-  echo "$CC" | tee -a configure.log
-  if test -z "$uname"; then
-    uname=$((uname -sr || echo unknown) 2>/dev/null)
-  fi
-  case "$uname" in
-  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"ld"}
-             LDSHAREDFLAGS="-b"
-         case $((uname -m || echo unknown) 2>/dev/null) in
-         ia64)
-             shared_ext='.so'
-             SHAREDLIB='${LIBNAME}.so' ;;
-         *)
-             shared_ext='.sl'
-             SHAREDLIB='${LIBNAME}.sl' ;;
-         esac ;;
-  AIX*)  # Courtesy of dbakker@arrayasolutions.com
-             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             LDSHARED=${LDSHARED-"xlc"}
-             LDSHAREDFLAGS="-G" ;;
-  # send working options for other systems to zlib@gzip.org
-  *)         SFLAGS=${CFLAGS-"-O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc"}
-             LDSHAREDFLAGS="-shared" ;;
-  esac
-fi
-
-# Simplify some later conditionals
-case "$uname" in
-Linux* | linux*)
-  LINUX=1 ;;
-*)
-  LINUX=0 ;;
-esac
-
-# destination names for shared library if not defined above
-SHAREDLIB=${SHAREDLIB-"${LIBNAME}$shared_ext"}
-SHAREDLIBV=${SHAREDLIBV-"${LIBNAME}$shared_ext.$VER"}
-SHAREDLIBM=${SHAREDLIBM-"${LIBNAME}$shared_ext.$VER1"}
-SHAREDTARGET=${SHAREDTARGET-"${LIBNAME}$shared_ext.$VER"}
-
-echo >> configure.log
-
-# define functions for testing compiler and library characteristics and logging the results
-
-cat > $test.c <<EOF
-#error error
-EOF
-if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
-  try()
-  {
-    show $*
-    test "$(\( $* \) 2>&1 | tee -a configure.log)" = ""
-  }
-  echo - using any output from compiler to indicate an error >> configure.log
-else
-try()
-{
-  show $*
-  ( $* ) >> configure.log 2>&1
-  ret=$?
-  if test $ret -ne 0; then
-    echo "(exit code $ret)" >> configure.log
-  fi
-  return $ret
-}
-fi
-
-tryboth()
-{
-  show $*
-  got=$(( $* ) 2>&1)
-  ret=$?
-  printf %s "$got" >> configure.log
-  if test $ret -ne 0; then
-    return $ret
-  fi
-  test "$got" = ""
-}
-
-cat > $test.c << EOF
-int foo() { return 0; }
-EOF
-echo "Checking for obsessive-compulsive compiler options..." >> configure.log
-if try $CC -c $CFLAGS $test.c; then
-  :
-else
-  echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log
-  leave 1
-fi
-
-echo >> configure.log
-
-# see if shared library build supported
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-if test $shared -eq 1; then
-  echo -n "Checking for shared library support... " | tee -a configure.log
-  # we must test in two steps (cc then ld), required at least on SunOS 4.x
-  if try $CC -w -c $SFLAGS $test.c &&
-     try $LDSHARED $LDSHAREDFLAGS $LDFLAGS -o $test$shared_ext $test.o $LDSHAREDLIBC; then
-    echo "Building shared library $SHAREDTARGET with $CC." | tee -a configure.log
-  elif test -z "$old_cc" -a -z "$old_cflags"; then
-    echo "No shared library support." | tee -a configure.log
-    shared=0;
-  else
-    echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
-    shared=0;
-  fi
-fi
-if test $shared -eq 0; then
-  LDSHARED="$CC"
-  LDSHAREDFLAGS=""
-  ALL="static"
-  SHAREDLIB=""
-  SHAREDLIBV=""
-  SHAREDLIBM=""
-  SHAREDTARGET=""
-  INSTALLTARGETS=install-static
-  UNINSTALLTARGETS=uninstall-static
-  echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
-else
-  ALL="static shared"
-  TEST="${TEST} testshared"
-fi
-
-echo >> configure.log
-
-# check for large file support, and if none, check for fseeko()
-cat > $test.c <<EOF
-#include <sys/types.h>
-off64_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
-  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
-  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
-  echo "Checking for off64_t... Yes." | tee -a configure.log
-  echo "Checking for fseeko... Yes." | tee -a configure.log
-else
-  echo "Checking for off64_t... No." | tee -a configure.log
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <sys/types.h>
-int main() {
-  _off64_t dummy = 0;
-  return 0;
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then
-    echo "Checking for _off64_t... Yes." | tee -a configure.log
-  else
-    echo "Checking for _off64_t... No." | tee -a configure.log
-  fi
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-  fseeko(NULL, 0, 0);
-  return 0;
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then
-    echo "Checking for fseeko... Yes." | tee -a configure.log
-  else
-    CFLAGS="${CFLAGS} -DNO_FSEEKO"
-    SFLAGS="${SFLAGS} -DNO_FSEEKO"
-    echo "Checking for fseeko... No." | tee -a configure.log
-  fi
-fi
-echo >> configure.log
-
-cat > $test.c <<EOF
-#define _POSIX_C_SOURCE 200112L
-#include <stdlib.h>
-int main(void) {
-  void *ptr = 0;
-  int ret = posix_memalign(&ptr, 64, 10);
-  if (ptr)
-    free(ptr);
-  return ret;
-}
-EOF
-if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then
-  echo "Checking for posix_memalign... Yes." | tee -a configure.log
-  CFLAGS="${CFLAGS} -DHAVE_POSIX_MEMALIGN"
-  SFLAGS="${SFLAGS} -DHAVE_POSIX_MEMALIGN"
-else
-  echo "Checking for posix_memalign... No." | tee -a configure.log
-fi
-echo >> configure.log
-
-# check for strerror() for use by gz* functions
-cat > $test.c <<EOF
-#include <string.h>
-#include <errno.h>
-int main() { return strlen(strerror(errno)); }
-EOF
-if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then
-  echo "Checking for strerror... Yes." | tee -a configure.log
-else
-  CFLAGS="${CFLAGS} -DNO_STRERROR"
-  SFLAGS="${SFLAGS} -DNO_STRERROR"
-  echo "Checking for strerror... No." | tee -a configure.log
-fi
-
-# check for getauxval() for architecture feature detection at run-time
-cat > $test.c <<EOF
-#include <sys/auxv.h>
-int main() { return getauxval(0); }
-EOF
-if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then
-  echo "Checking for getauxval() in sys/auxv.h... Yes." | tee -a configure.log
-  CFLAGS="${CFLAGS} -DHAVE_SYS_AUXV_H"
-  SFLAGS="${SFLAGS} -DHAVE_SYS_AUXV_H"
-else
-  echo "Checking for getauxval() in sys/auxv.h... No." | tee -a configure.log
-fi
-
-# We need to remove consigured files (zconf.h etc) from source directory if building outside of it
-if [ "$SRCDIR" != "$BUILDDIR" ]; then
-    rm -f $SRCDIR/zconf${SUFFIX}.h
-    rm -f $SRCDIR/zlib${SUFFIX}.h
-    rm -f $SRCDIR/zlib_name_mangling${SUFFIX}.h
-fi
-
-# Rename @ZLIB_SYMBOL_PREFIX@ to $symbol_prefix in gzread.c, zlib.h and zlib_name_mangling.h
-sed < $SRCDIR/gzread.c.in "s/@ZLIB_SYMBOL_PREFIX@/$symbol_prefix/g" > gzread.c
-sed < $SRCDIR/zlib${SUFFIX}.h.in "s/@ZLIB_SYMBOL_PREFIX@/$symbol_prefix/g" > zlib${SUFFIX}.h
-if [[ ! -z $symbol_prefix ]]; then
-  sed < $SRCDIR/zlib_name_mangling${SUFFIX}.h.in "s/@ZLIB_SYMBOL_PREFIX@/$symbol_prefix/g" > zlib_name_mangling${SUFFIX}.h
-else
-  # symbol_prefix is not set, copy the empty mangling header
-  cp -p $SRCDIR/zlib_name_mangling.h.empty zlib_name_mangling${SUFFIX}.h
-fi
-
-# copy clean zconf.h for subsequent edits
-cp -p $SRCDIR/zconf${SUFFIX}.h.in zconf${SUFFIX}.h
-
-echo >> configure.log
-
-# check for unistd.h and save result in zconf.h
-cat > $test.c <<EOF
-#include <unistd.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  sed < zconf${SUFFIX}.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf${SUFFIX}.temp.h
-  mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h
-  echo "Checking for unistd.h... Yes." | tee -a configure.log
-else
-  sed < zconf${SUFFIX}.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be set to #if 1/ 0\1 was set to #if 0/" > zconf${SUFFIX}.temp.h
-  mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h
-  echo "Checking for unistd.h... No." | tee -a configure.log
-fi
-
-echo >> configure.log
-
-# check for ptrdiff_t and save result in zconf.h
-echo -n "Checking for ptrdiff_t... " | tee -a configure.log
-cat > $test.c <<EOF
-#include <stddef.h>
-int fun(ptrdiff_t *a) { (void)a; return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Yes." | tee -a configure.log
-else
-    echo "No." | tee -a configure.log
-    sed < zconf${SUFFIX}.h "/^#ifdef NEED_PTRDIFF_T.* may be/s/def NEED_PTRDIFF_T\(.*\) may be/ 1\1 was/" > zconf${SUFFIX}.temp.h
-    mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h
-
-    echo -n "Checking for sizeof(void *)... " | tee -a configure.log
-    cat > $test.c <<EOF
-#include <stdint.h>
-#define COMPILE_TIME_ASSERT(pred) struct s { int x: (pred) ? 1 : -1; }
-COMPILE_TIME_ASSERT(sizeof(int32_t) == sizeof(void *));
-EOF
-    if try $CC -c $CFLAGS $test.c; then
-        echo "sizeof(int32_t)." | tee -a configure.log
-        sed < zconf${SUFFIX}.h "s/^typedef PTRDIFF_TYPE ptrdiff_t;/typedef int32_t ptrdiff_t;/g" > zconf${SUFFIX}.temp.h
-        mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h
-    else
-        cat > $test.c <<EOF
-#include <stdint.h>
-#define COMPILE_TIME_ASSERT(pred) struct s { int x: (pred) ? 1 : -1; }
-COMPILE_TIME_ASSERT(sizeof(int64_t) == sizeof(void *));
-EOF
-        if try $CC -c $CFLAGS $test.c; then
-            echo "sizeof(int64_t)." | tee -a configure.log
-            sed < zconf${SUFFIX}.h "s/^typedef PTRDIFF_TYPE ptrdiff_t;/typedef int64_t ptrdiff_t;/g" > zconf${SUFFIX}.temp.h
-            mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h
-        else
-            echo "unknown." | tee -a configure.log
-            exit 1
-        fi
-    fi
-fi
-
-# if --zlib-compat was requested
-if test $compat -eq 1; then
-  gzfileops=1
-  CFLAGS="${CFLAGS} -DZLIB_COMPAT"
-  SFLAGS="${SFLAGS} -DZLIB_COMPAT"
-  case "$uname" in
-  CYGWIN* | Cygwin* | cygwin* | MSYS* | msys* | MINGW* | mingw*)
-    DEFFILE="win32/zlibcompat.def" ;;
-  esac
-fi
-
-# if --gzfileops was requested
-if test $gzfileops -eq 1; then
-  CFLAGS="${CFLAGS} -DWITH_GZFILEOP"
-  SFLAGS="${SFLAGS} -DWITH_GZFILEOP"
-  OBJC="${OBJC} \$(OBJG)"
-  PIC_OBJC="${PIC_OBJC} \$(PIC_OBJG)"
-else
-  PIC_TESTOBJG="\$(OBJG)"
-fi
-
-# set architecture alignment requirements
-if test $unalignedok -eq 0; then
-  CFLAGS="${CFLAGS} -DNO_UNALIGNED"
-  SFLAGS="${SFLAGS} -DNO_UNALIGNED"
-  echo "Unaligned reads manually disabled." | tee -a configure.log
-fi
-
-# enable reduced memory configuration
-if test $reducedmem -eq 1; then
-  echo "Configuring for reduced memory environment." | tee -a configure.log
-  CFLAGS="${CFLAGS} -DHASH_SIZE=32768u -DGZBUFSIZE=8192"
-fi
-
-# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
-if test $cover -eq 1; then
-  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
-  LDFLAGS="${LDFLAGS} -fprofile-arcs -ftest-coverage"
-  if test -n "$GCC_CLASSIC"; then
-    CC=$GCC_CLASSIC
-  fi
-fi
-
-echo >> configure.log
-
-# Check for ANSI C compliant compiler
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-#include "zconf${SUFFIX}.h"
-int main() {
-#ifdef STDC
-  return 0;
-#endif
-  return 1;
-}
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Checking for ANSI C compliant compiler...  Yes." | tee -a configure.log
-  :
-else
-  echo "Checking for ANSI C compliant compiler...  No." | tee -a configure.log
-  echo "Error: ANSI C compatible compiler needed, cannot continue." | tee -a configure.log
-  leave 1
-fi
-
-# Check for -fno-semantic-interposition compiler support
-echo "" > test.c
-  cat > $test.c <<EOF
-int main() { return 0; }
-EOF
-if test "$gcc" -eq 1 && ($cc $CFLAGS -fno-semantic-interposition -c $test.c) >> configure.log 2>&1; then
-  echo "Checking for -fno-semantic-interposition... Yes." | tee -a configure.log
-  SFLAGS="$SFLAGS -fno-semantic-interposition"
-else
-  echo "Checking for -fno-semantic-interposition... No." | tee -a configure.log
-fi
-
-# Check for -fno-lto compiler support
-if test $gcc -eq 1 -a $without_optimizations -eq 0 -a $native -eq 0; then
-  cat > $test.c <<EOF
-int main() { return 0; }
-EOF
-  if $cc $CFLAGS -fno-lto -c $test.c >> configure.log 2>&1; then
-    echo "Checking for -fno-lto... Yes." | tee -a configure.log
-  else
-    echo "Checking for -fno-lto... No." | tee -a configure.log
-    noltoflag=""
-  fi
-fi
-
-# see if we can hide zlib internal symbols that are linked between separate source files using hidden
-if test "$gcc" -eq 1; then
-  echo >> configure.log
-  cat > $test.c <<EOF
-#define Z_INTERNAL __attribute__((visibility ("hidden")))
-int Z_INTERNAL foo;
-int main() { return 0; }
-EOF
-  if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_VISIBILITY_HIDDEN"
-    SFLAGS="$SFLAGS -DHAVE_VISIBILITY_HIDDEN"
-    echo >> configure.log
-    echo "Checking for attribute(visibility(hidden)) support... Yes." | tee -a configure.log
-  else
-    echo >> configure.log
-    echo "Checking for attribute(visibility(hidden)) support... No." | tee -a configure.log
-  fi
-fi
-
-# see if we can hide zlib internal symbols that are linked between separate source files using internal
-if test "$gcc" -eq 1; then
-  echo >> configure.log
-  cat > $test.c <<EOF
-#define Z_INTERNAL __attribute__((visibility ("internal")))
-int Z_INTERNAL foo;
-int main() { return 0; }
-EOF
-  if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_VISIBILITY_INTERNAL"
-    SFLAGS="$SFLAGS -DHAVE_VISIBILITY_INTERNAL"
-    echo >> configure.log
-    echo "Checking for attribute(visibility(internal)) support... Yes." | tee -a configure.log
-  else
-    echo >> configure.log
-    echo "Checking for attribute(visibility(internal)) support... No." | tee -a configure.log
-  fi
-fi
-
-# Check for __builtin_ctz() support in compiler
-cat > $test.c << EOF
-int main(void) {
-    unsigned int zero = 0;
-    long test = __builtin_ctz(zero);
-    (void)test;
-    return 0;
-}
-EOF
-if try ${CC} ${CFLAGS} $test.c $LDSHAREDLIBC; then
-    echo "Checking for __builtin_ctz ... Yes." | tee -a configure.log
-    CFLAGS="$CFLAGS -DHAVE_BUILTIN_CTZ"
-    SFLAGS="$SFLAGS -DHAVE_BUILTIN_CTZ"
-else
-    echo "Checking for __builtin_ctz ... No." | tee -a configure.log
-fi
-
-# Check for __builtin_ctzll() support in compiler
-cat > $test.c << EOF
-int main(void) {
-    unsigned long long zero = 0;
-    long test = __builtin_ctzll(zero);
-    (void)test;
-    return 0;
-}
-EOF
-if try ${CC} ${CFLAGS} $test.c $LDSHAREDLIBC; then
-    echo "Checking for __builtin_ctzll ... Yes." | tee -a configure.log
-    CFLAGS="$CFLAGS -DHAVE_BUILTIN_CTZLL"
-    SFLAGS="$SFLAGS -DHAVE_BUILTIN_CTZLL"
-else
-    echo "Checking for __builtin_ctzll ... No." | tee -a configure.log
-fi
-
-check_avx2_intrinsics() {
-    # Check whether compiler supports AVX2 intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void) {
-    __m256i x = _mm256_set1_epi16(2);
-    const __m256i y = _mm256_set1_epi16(1);
-    x = _mm256_subs_epu16(x, y);
-    (void)x;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${avx2flag} $test.c; then
-        echo "Checking for AVX2 intrinsics ... Yes." | tee -a configure.log
-        HAVE_AVX2_INTRIN=1
-    else
-        echo "Checking for AVX2 intrinsics ... No." | tee -a configure.log
-        HAVE_AVX2_INTRIN=0
-    fi
-}
-
-check_avx512_intrinsics() {
-    # Check whether compiler supports AVX512 intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void) {
-    __m512i x = _mm512_set1_epi8(2);
-    const __m512i y = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                      20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                      38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                      56, 57, 58, 59, 60, 61, 62, 63, 64);
-    x = _mm512_sub_epi8(x, y);
-    (void)x;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${avx512flag} $test.c; then
-        echo "Checking for AVX512 intrinsics ... Yes." | tee -a configure.log
-        HAVE_AVX512_INTRIN=1
-    else
-        echo "Checking for AVX512 intrinsics ... No." | tee -a configure.log
-        HAVE_AVX512_INTRIN=0
-    fi
-}
-
-check_avx512vnni_intrinsics() {
-    # Check whether compiler supports AVX512-VNNI intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void) {
-    __m512i x = _mm512_set1_epi8(2);
-    const __m512i y = _mm512_set_epi8(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                                      20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-                                      38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-                                      56, 57, 58, 59, 60, 61, 62, 63, 64);
-    __m512i z = _mm512_setzero_epi32();
-    z = _mm512_dpbusd_epi32(z, x, y);
-    (void)z;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${avx512vnniflag} $test.c; then
-        echo "Checking for AVX512VNNI intrinsics ... Yes." | tee -a configure.log
-        HAVE_AVX512VNNI_INTRIN=1
-    else
-        echo "Checking for AVX512VNNI intrinsics ... No." | tee -a configure.log
-        HAVE_AVX512VNNI_INTRIN=0
-    fi
-}
-
-check_mask_intrinsics() {
-    # Check whether compiler supports AVX512 k-mask intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void) {
-    __mmask16 a = 0xFF;
-    a = _knot_mask16(a);
-    (void)a;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${avx512flag} $test.c; then
-        echo "Checking for k-mask intrinsics ... Yes." | tee -a configure.log
-        HAVE_MASK_INTRIN=1
-    else
-        echo "Checking for k-mask intrinsics ... No." | tee -a configure.log
-        HAVE_MASK_INTRIN=0
-    fi
-}
-
-check_acle_compiler_flag() {
-    # Check whether -march=armv8-a+crc works correctly
-    cat > $test.c << EOF
-int main() { return 0; }
-EOF
-    if try $CC -c $CFLAGS -march=armv8-a+crc $test.c; then
-        ACLE_AVAILABLE=1
-        echo "Check whether -march=armv8-a+crc works ... Yes." | tee -a configure.log
-    else
-        echo "Check whether -march=armv8-a+crc works ... No." | tee -a configure.log
-        if try $CC -c $CFLAGS -march=armv8-a+crc+simd $test.c; then
-            ACLE_AVAILABLE=1
-            echo "Check whether -march=armv8-a+crc+simd works ... Yes." | tee -a configure.log
-            if test "$ARCH" = "armv8-a+crc"; then
-                ARCH=armv8-a+crc+simd
-            fi
-        else
-            ACLE_AVAILABLE=0
-            echo "Check whether -march=armv8-a+crc+simd works ... No." | tee -a configure.log
-        fi
-    fi
-}
-
-check_neon_compiler_flag() {
-    # Check whether -mfpu=neon is available on ARM processors.
-    cat > $test.c << EOF
-int main() { return 0; }
-EOF
-    if try $CC -c $CFLAGS -mfpu=neon $test.c; then
-        MFPU_NEON_AVAILABLE=1
-        echo "Check whether -mfpu=neon is available ... Yes." | tee -a configure.log
-    else
-        MFPU_NEON_AVAILABLE=0
-        echo "Check whether -mfpu=neon is available ... No." | tee -a configure.log
-    fi
-}
-
-check_neon_ld4_intrinsics() {
-    if test $buildneon -eq 1 && test $native -eq 0; then
-        if test "$CC_ARCH" = "aarch64" || test "$CC_ARCH" = "aarch64_be"; then
-            neonflag="-march=armv8-a+simd"
-        elif test $MFPU_NEON_AVAILABLE -eq 1; then
-            neonflag="-mfpu=neon"
-        fi
-    fi
-    cat > $test.c << EOF
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-int main(void) {
-    int stack_var[16];
-    int32x4x4_t v = vld1q_s32_x4(stack_var);
-    (void)v;
-    return 0;
-}
-EOF
-    if try $CC -c $CFLAGS $neonflag $test.c; then
-        NEON_HAS_LD4=1
-        echo "check whether compiler supports 4 wide register loads ... Yes." | tee -a configure.log
-    else
-        NEON_HAS_LD4=0
-        echo "check whether compiler supports 4 wide register loads ... No." | tee -a configure.log
-    fi
-}
-
-check_pclmulqdq_intrinsics() {
-    # Check whether compiler supports PCLMULQDQ intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-#include <wmmintrin.h>
-int main(void) {
-    __m128i a = _mm_setzero_si128();
-    __m128i b = _mm_setzero_si128();
-    __m128i c = _mm_clmulepi64_si128(a, b, 0x10);
-    (void)c;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${pclmulflag} $test.c; then
-        echo "Checking for PCLMULQDQ intrinsics ... Yes." | tee -a configure.log
-        HAVE_PCLMULQDQ_INTRIN=1
-    else
-        echo "Checking for PCLMULQDQ intrinsics ... No." | tee -a configure.log
-        HAVE_PCLMULQDQ_INTRIN=0
-    fi
-}
-
-check_vpclmulqdq_intrinsics() {
-    # Check whether compiler supports VPCLMULQDQ intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-#include <wmmintrin.h>
-int main(void) {
-    __m512i a = _mm512_setzero_si512();
-    __m512i b = _mm512_setzero_si512();
-    __m512i c = _mm512_clmulepi64_epi128(a, b, 0x10);
-    (void)c;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${vpclmulflag} $test.c; then
-        echo "Checking for VPCLMULQDQ intrinsics ... Yes." | tee -a configure.log
-        HAVE_VPCLMULQDQ_INTRIN=1
-    else
-        echo "Checking for VPCLMULQDQ intrinsics ... No." | tee -a configure.log
-        HAVE_VPCLMULQDQ_INTRIN=0
-    fi
-}
-
-check_ppc_intrinsics() {
-        cat > $test.c << EOF
-#include <altivec.h>
-int main(void)
-{
-    vector int a = vec_splats(0);
-    vector int b = vec_splats(0);
-    a = vec_add(a, b);
-    return 0;
-}
-EOF
-        if test $buildaltivec -eq 1 && try ${CC} ${CFLAGS} -maltivec $test.c; then
-            echo "Checking for AltiVec intrinsics ... Yes." | tee -a configure.log
-            HAVE_ALTIVEC_INTRIN=1
-        else
-            echo "Checking for AltiVec intrinsics ... No." | tee -a configure.log
-            HAVE_ALTIVEC_INTRIN=0
-        fi
-        if test $buildaltivec -eq 1 && try ${CC} ${CFLAGS} -maltivec -mno-vsx $test.c; then
-            echo "Checking if -mno-vsx is supported ... Yes." | tee -a configure.log
-            vmxflag="$vmxflag -mno-vsx"
-        else
-            echo "Checking if -mno-vsx is supported ... No." | tee -a configure.log
-        fi
-        cat > $test.c << EOF
-#include <sys/auxv.h>
-int main() { return (getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC); }
-EOF
-        if try $CC -c $CFLAGS -maltivec $test.c; then
-            HAVE_VMX=1
-            echo "Check whether VMX instructions are available ... Yes." | tee -a configure.log
-        else
-            HAVE_VMX=0
-            echo "Check whether VMX instructions are available ... No." | tee -a configure.log
-        fi
-}
-
-check_power8_intrinsics() {
-    # Check whether features needed by POWER8 optimisations are available
-    cat > $test.c << EOF
-#include <sys/auxv.h>
-int main() { return (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07); }
-EOF
-    if test $buildpower8 -eq 1 && try $CC -c $CFLAGS -mcpu=power8 $test.c; then
-        HAVE_POWER8_INTRIN=1
-        echo "Check whether POWER8 instructions are available ... Yes." | tee -a configure.log
-    else
-        HAVE_POWER8_INTRIN=0
-        echo "Check whether POWER8 instructions are available ... No." | tee -a configure.log
-    fi
-}
-
-check_power9_intrinsics() {
-    # Check whether features needed by POWER9 optimisations are available
-    cat > $test.c << EOF
-int main() { return 0; }
-EOF
-    if test $buildpower9 -eq 1 && try $CC -c $CFLAGS -mcpu=power9 $test.c; then
-        HAVE_POWER9_INTRIN=1
-        echo "Check whether POWER9 instructions are available ... Yes." | tee -a configure.log
-    else
-        HAVE_POWER9_INTRIN=0
-        echo "Check whether POWER9 instructions are available ... No." | tee -a configure.log
-    fi
-}
-
-check_sse2_intrinsics() {
-    # Check whether compiler supports SSE2 intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void) {
-    __m128i zero = _mm_setzero_si128();
-    (void)zero;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${sse2flag} $test.c; then
-        echo "Checking for SSE2 intrinsics ... Yes." | tee -a configure.log
-        HAVE_SSE2_INTRIN=1
-    else
-        echo "Checking for SSE2 intrinsics ... No." | tee -a configure.log
-        HAVE_SSE2_INTRIN=0
-    fi
-}
-
-check_sse41_intrinsics() {
-    # Check whether compiler supports SSE4.1 intrinsics
-    cat > $test.c << EOF
-#include <smmintrin.h>
-int main(void)
-{
-    __m128i u, v, w;
-    u = _mm_set1_epi8(1);
-    v = _mm_set1_epi8(2);
-    w = _mm_sad_epu8(u, v);
-    (void)w;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${sse41flag} $test.c; then
-        echo "Checking for SSE4.1 intrinsics ... Yes." | tee -a configure.log
-        HAVE_SSE41_INTRIN=1
-    else
-        echo "Checking for SSE4.1 intrinsics ... No." | tee -a configure.log
-        HAVE_SSE41_INTRIN=0
-    fi
-}
-
-check_sse42_intrinsics() {
-    # Check whether compiler supports SSE4 CRC inline asm
-    cat > $test.c << EOF
-int main(void) {
-    unsigned val = 0, h = 0;
-    __asm__ __volatile__ ( "crc32 %1,%0" : "+r" (h) : "r" (val) );
-    return (int) h;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${sse42flag} $test.c; then
-        echo "Checking for SSE4.2 CRC inline assembly ... Yes." | tee -a configure.log
-        HAVE_SSE42CRC_INLINE_ASM=1
-    else
-        echo "Checking for SSE4.2 CRC inline assembly ... No." | tee -a configure.log
-        HAVE_SSE42CRC_INLINE_ASM=0
-    fi
-
-    # Check whether compiler supports SSE4.2 CRC intrinsics
-    cat > $test.c << EOF
-int main(void) {
-    unsigned crc = 0;
-    char c = 'c';
-    crc = __builtin_ia32_crc32qi(crc, c);
-    (void)crc;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${sse42flag} $test.c; then
-        echo "Checking for SSE4.2 CRC intrinsics ... Yes." | tee -a configure.log
-        HAVE_SSE42CRC_INTRIN=1
-    else
-        echo "Checking for SSE4.2 CRC intrinsics ... No." | tee -a configure.log
-        HAVE_SSE42CRC_INTRIN=0
-    fi
-
-    # Check whether compiler supports SSE4.2 compare string intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void)
-{
-    unsigned char a[64] = { 0 };
-    unsigned char b[64] = { 0 };
-    __m128i xmm_src0, xmm_src1;
-    xmm_src0 = _mm_loadu_si128((__m128i *)(char *)a);
-    xmm_src1 = _mm_loadu_si128((__m128i *)(char *)b);
-    return _mm_cmpestri(xmm_src0, 16, xmm_src1, 16, 0);
-}
-EOF
-    if try ${CC} ${CFLAGS} ${sse42flag} $test.c; then
-        echo "Checking for SSE4.2 compare string intrinsics ... Yes." | tee -a configure.log
-        HAVE_SSE42CMPSTR_INTRIN=1
-    else
-        echo "Checking for SSE4.2 compare string intrinsics ... No." | tee -a configure.log
-        HAVE_SSE42CMPSTR_INTRIN=0
-    fi
-}
-
-check_ssse3_intrinsics() {
-    # Check whether compiler supports SSSE3 intrinsics
-    cat > $test.c << EOF
-#include <immintrin.h>
-int main(void)
-{
-    __m128i u, v, w;
-    u = _mm_set1_epi32(1);
-    v = _mm_set1_epi32(2);
-    w = _mm_hadd_epi32(u, v);
-    (void)w;
-    return 0;
-}
-EOF
-    if try ${CC} ${CFLAGS} ${ssse3flag} $test.c; then
-        echo "Checking for SSSE3 intrinsics ... Yes." | tee -a configure.log
-        HAVE_SSSE3_INTRIN=1
-    else
-        echo "Checking for SSSE3 intrinsics ... No." | tee -a configure.log
-        HAVE_SSSE3_INTRIN=0
-    fi
-}
-
-check_vgfma_intrinsics() {
-    # Check whether "VECTOR GALOIS FIELD MULTIPLY SUM AND ACCUMULATE" intrinsic is available
-    echo -n "Checking for -mzarch... " | tee -a configure.log
-    if try $CC -x c -c /dev/null -o /dev/null -mzarch; then
-        echo Yes. | tee -a configure.log
-        vgfmaflag="${vgfmaflag} -mzarch"
-    else
-        echo No. | tee -a configure.log
-    fi
-    echo -n "Checking for -fzvector... " | tee -a configure.log
-    if try $CC -x c -c /dev/null -o /dev/null -fzvector; then
-        echo Yes. | tee -a configure.log
-        vgfmaflag="${vgfmaflag} -fzvector"
-    else
-        echo No. | tee -a configure.log
-    fi
-    cat > $test.c << EOF
-#include <vecintrin.h>
-int main(void) {
-    unsigned long long a __attribute__((vector_size(16))) = { 0 };
-    unsigned long long b __attribute__((vector_size(16))) = { 0 };
-    unsigned char c __attribute__((vector_size(16))) = { 0 };
-    c = vec_gfmsum_accum_128(a, b, c);
-    return c[0];
-}
-EOF
-    echo -n "Checking for VGFMA support... " | tee -a configure.log
-    if try $CC -c $CFLAGS $vgfmaflag $test.c; then
-        HAVE_VGFMA_INTRIN=1
-        echo "Yes." | tee -a configure.log
-    else
-        HAVE_VGFMA_INTRIN=0
-        echo "No." | tee -a configure.log
-    fi
-}
-
-case "${ARCH}" in
-    i386 | i486 | i586 | i686 | x86_64)
-        # Enable deflate_medium at level 1
-        if test $without_new_strategies -eq 1; then
-            CFLAGS="${CFLAGS} -DNO_QUICK_STRATEGY"
-            SFLAGS="${SFLAGS} -DNO_QUICK_STRATEGY"
-        fi
-        # Enable deflate_medium at level 4-6
-        if test $without_new_strategies -eq 1; then
-            CFLAGS="${CFLAGS} -DNO_MEDIUM_STRATEGY"
-            SFLAGS="${SFLAGS} -DNO_MEDIUM_STRATEGY"
-        fi
-        ;;
-esac
-
-ARCHDIR='arch/generic'
-ARCH_STATIC_OBJS=''
-ARCH_SHARED_OBJS=''
-
-# Set ARCH specific FLAGS
-case "${ARCH}" in
-    # x86/amd64 specific optimizations
-    i386 | i486 | i586 | i686 |x86_64)
-        ARCHDIR=arch/x86
-
-        # Enable arch-specific optimizations
-        if test $without_optimizations -eq 0; then
-            CFLAGS="${CFLAGS} -DX86_FEATURES"
-            SFLAGS="${SFLAGS} -DX86_FEATURES"
-
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86_features.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86_features.lo"
-
-            check_avx2_intrinsics
-
-            if test ${HAVE_AVX2_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET"
-                SFLAGS="${SFLAGS} -DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} slide_hash_avx2.o chunkset_avx.o compare256_avx2.o adler32_avx2.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} slide_hash_avx2.lo chunkset_avx.lo compare256_avx2.lo adler32_avx2.lo"
-            fi
-
-            check_avx512_intrinsics
-
-            if test ${HAVE_AVX512_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_AVX512 -DX86_AVX512_ADLER32"
-                SFLAGS="${SFLAGS} -DX86_AVX512 -DX86_AVX512_ADLER32"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_avx512.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_avx512.lo"
-
-                check_mask_intrinsics
-
-                if test ${HAVE_MASK_INTRIN} -eq 1; then
-                    CFLAGS="${CFLAGS} -DX86_MASK_INTRIN"
-                    SFLAGS="${SFLAGS} -DX86_MASK_INTRIN"
-                fi
-            fi
-
-            check_avx512vnni_intrinsics
-
-            if test ${HAVE_AVX512VNNI_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_AVX512VNNI -DX86_AVX512VNNI_ADLER32"
-                SFLAGS="${SFLAGS} -DX86_AVX512VNNI -DX86_AVX512VNNI_ADLER32"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_avx512_vnni.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_avx512_vnni.lo"
-            fi
-
-            check_sse41_intrinsics
-
-            if test ${HAVE_SSE41_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE41"
-                SFLAGS="${SFLAGS} -DX86_SSE41"
-
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse41.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse41.lo"
-            fi
-
-            check_sse42_intrinsics
-
-            if test ${HAVE_SSE42CRC_INTRIN} -eq 1 || test ${HAVE_SSE42CRC_INLINE_ASM} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE42_CRC_HASH -DX86_SSE42_ADLER32"
-                SFLAGS="${SFLAGS} -DX86_SSE42_CRC_HASH -DX86_SSE42_ADLER32"
-
-                if test ${HAVE_SSE42CRC_INTRIN} -eq 1; then
-                  CFLAGS="${CFLAGS} -DX86_SSE42_CRC_INTRIN"
-                  SFLAGS="${SFLAGS} -DX86_SSE42_CRC_INTRIN"
-                fi
-
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_sse42.o insert_string_sse42.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_sse42.lo insert_string_sse42.lo"
-            fi
-
-            check_sse2_intrinsics
-
-            if test ${HAVE_SSE2_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
-                SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse2.o compare256_sse2.o slide_hash_sse2.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse2.lo compare256_sse2.lo slide_hash_sse2.lo"
-
-                if test $forcesse2 -eq 1; then
-                    CFLAGS="${CFLAGS} -DX86_NOCHECK_SSE2"
-                    SFLAGS="${SFLAGS} -DX86_NOCHECK_SSE2"
-                fi
-            fi
-
-            check_ssse3_intrinsics
-
-            if test ${HAVE_SSSE3_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSSE3 -DX86_SSSE3_ADLER32"
-                SFLAGS="${SFLAGS} -DX86_SSSE3 -DX86_SSSE3_ADLER32"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_ssse3.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_ssse3.lo"
-            fi
-
-            check_pclmulqdq_intrinsics
-
-            if test ${HAVE_PCLMULQDQ_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_PCLMULQDQ_CRC"
-                SFLAGS="${SFLAGS} -DX86_PCLMULQDQ_CRC"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_fold_pclmulqdq.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_fold_pclmulqdq.lo"
-
-                if test $buildvpclmulqdq -eq 1; then
-                    check_vpclmulqdq_intrinsics
-
-                    if test ${HAVE_VPCLMULQDQ_INTRIN} -eq 1 && test ${HAVE_AVX512_INTRIN} -eq 1; then
-                        CFLAGS="${CFLAGS} -DX86_VPCLMULQDQ_CRC"
-                        SFLAGS="${SFLAGS} -DX86_VPCLMULQDQ_CRC"
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_fold_vpclmulqdq.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_fold_vpclmulqdq.lo"
-                    fi
-                fi
-            fi
-
-            if test $forcetzcnt -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_NOCHECK_TZCNT"
-                SFLAGS="${SFLAGS} -DX86_NOCHECK_TZCNT"
-            fi
-        fi
-    ;;
-
-    # ARM specific optimizations
-    arm*)
-        [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=arm
-        ARCHDIR=arch/arm
-
-        if test $without_optimizations -eq 0; then
-            CFLAGS="${CFLAGS} -DARM_FEATURES"
-            SFLAGS="${SFLAGS} -DARM_FEATURES"
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} arm_features.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} arm_features.lo"
-
-            if test $LINUX -eq 1; then
-                cat > $test.c <<EOF
-#include <sys/auxv.h>
-int main() {
-    return (getauxval(AT_HWCAP2) & HWCAP2_CRC32);
-}
-EOF
-                if try $CC -c $CFLAGS $test.c; then
-                    CFLAGS="${CFLAGS} -DARM_AUXV_HAS_CRC32"
-                    SFLAGS="${SFLAGS} -DARM_AUXV_HAS_CRC32"
-                else
-                    cat > $test.c <<EOF
-#include <sys/auxv.h>
-#include <asm/hwcap.h>
-int main() {
-    return (getauxval(AT_HWCAP2) & HWCAP2_CRC32);
-}
-EOF
-                    if try $CC -c $CFLAGS $test.c; then
-                        CFLAGS="${CFLAGS} -DARM_AUXV_HAS_CRC32 -DARM_ASM_HWCAP"
-                        SFLAGS="${SFLAGS} -DARM_AUXV_HAS_CRC32 -DARM_ASM_HWCAP"
-                    else
-                        echo "HWCAP2_CRC32 not present in sys/auxv.h; cannot detect support at runtime." | tee -a configure.log
-                    fi
-                fi
-
-                cat > $test.c <<EOF
-#include <sys/auxv.h>
-int main() {
-    return (getauxval(AT_HWCAP) & HWCAP_ARM_NEON);
-}
-EOF
-                if try $CC -c $CFLAGS $test.c; then
-                    CFLAGS="${CFLAGS} -DARM_AUXV_HAS_NEON"
-                    SFLAGS="${SFLAGS} -DARM_AUXV_HAS_NEON"
-                else
-                    cat > $test.c <<EOF
-#include <sys/auxv.h>
-int main() {
-    return (getauxval(AT_HWCAP) & HWCAP_NEON);
-}
-EOF
-                    if try $CC -c $CFLAGS $test.c; then
-                        CFLAGS="${CFLAGS} -DARM_AUXV_HAS_NEON"
-                        SFLAGS="${SFLAGS} -DARM_AUXV_HAS_NEON"
-                    else
-                        echo "Neither HWCAP_ARM_NEON or HWCAP_NEON present in sys/auxv.h; cannot detect support at runtime." | tee -a configure.log
-                    fi
-                fi
-            fi
-        fi
-
-        cat > $test.c << EOF
-int main() { return 0; }
-EOF
-        if try $CC -w -c $SFLAGS $test.c -mfloat-abi=softfp &&
-           try $LDSHARED $LDSHAREDFLAGS $LDFLAGS -o $test$shared_ext $test.o $LDSHAREDLIBC; then
-            floatabi="-mfloat-abi=softfp"
-        else
-            if try $CC -w -c $SFLAGS $test.c -mfloat-abi=hard &&
-               try $LDSHARED $LDSHAREDFLAGS $LDFLAGS -o $test$shared_ext $test.o $LDSHAREDLIBC; then
-                floatabi="-mfloat-abi=hard"
-            fi
-        fi
-
-        if [ -z $floatabi ]; then
-            echo "ARM floating point arch not auto-detected" | tee -a configure.log
-        else
-            echo "ARM floating point arch: ${floatabi}" | tee -a configure.log
-
-            CFLAGS="${CFLAGS} ${floatabi}"
-            SFLAGS="${SFLAGS} ${floatabi}"
-        fi
-
-        if test $without_optimizations -eq 0; then
-            check_acle_compiler_flag
-            check_neon_compiler_flag
-            check_neon_ld4_intrinsics
-        fi
-
-        case "${ARCH}" in
-            armv[345]*)
-                if test $without_optimizations -eq 0; then
-                    if test $buildacle -eq 1; then
-                        echo ACLE support not available
-                    fi
-
-                    if test $buildneon -eq 1; then
-                        echo NEON support not available
-                    fi
-                fi
-            ;;
-            armv6l | armv6hl)
-                if test $without_optimizations -eq 0; then
-                    if test $buildacle -eq 1; then
-                        echo ACLE support not available
-                    fi
-
-                    if test $buildneon -eq 1; then
-                        echo NEON support not available
-                    fi
-                fi
-            ;;
-            arm | armv7*)
-                if test $without_optimizations -eq 0; then
-                    if test $buildacle -eq 1; then
-                        echo ACLE support not available
-                    fi
-
-                    if test $buildneon -eq 1; then
-                        CFLAGS="${CFLAGS} -DARM_NEON"
-                        SFLAGS="${SFLAGS} -DARM_NEON"
-
-                        if test $MFPU_NEON_AVAILABLE -eq 1; then
-                            neonflag="-mfpu=neon"
-                        fi
-
-                        if test $NEON_HAS_LD4 -eq 1; then
-                            CFLAGS="${CFLAGS} -DARM_NEON_HASLD4"
-                            SFLAGS="${SFLAGS} -DARM_NEON_HASLD4"
-                        fi
-
-                        CFLAGS="${CFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-                        SFLAGS="${SFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_neon.o chunkset_neon.o compare256_neon.o slide_hash_neon.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_neon.lo chunkset_neon.lo compare256_neon.lo slide_hash_neon.lo"
-                    fi
-                fi
-            ;;
-            armv8-a | armv8-a+simd)
-                if test $without_optimizations -eq 0; then
-                    if test $buildacle -eq 1; then
-                        echo ACLE support not available
-                    fi
-
-                    if test $buildneon -eq 1; then
-                        CFLAGS="${CFLAGS} -DARM_NEON"
-                        SFLAGS="${SFLAGS} -DARM_NEON"
-
-                        if test $MFPU_NEON_AVAILABLE -eq 1;then
-                            neonflag="-mfpu=neon"
-                        fi
-
-                        if test $NEON_HAS_LD4 -eq 1; then
-                            CFLAGS="${CFLAGS} -DARM_NEON_HASLD4"
-                            SFLAGS="${SFLAGS} -DARM_NEON_HASLD4"
-                        fi
-
-                        CFLAGS="${CFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-                        SFLAGS="${SFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_neon.o chunkset_neon.o compare256_neon.o slide_hash_neon.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_neon.lo chunkset_neon.lo compare256_neon.lo slide_hash_neon.lo"
-                    fi
-                fi
-            ;;
-            armv8-a+crc | armv8-a+crc+simd | armv8.[1234]-a | armv8.[1234]-a+simd)
-                acleflag="-march=${ARCH}"
-
-                if test $without_optimizations -eq 0; then
-                    if test $ACLE_AVAILABLE -eq 1; then
-                        CFLAGS="${CFLAGS} -DARM_ACLE_CRC_HASH"
-                        SFLAGS="${SFLAGS} -DARM_ACLE_CRC_HASH"
-
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_acle.o insert_string_acle.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_acle.lo insert_string_acle.lo"
-                    fi
-
-                    if test $buildneon -eq 1; then
-                        CFLAGS="${CFLAGS} -DARM_NEON"
-                        SFLAGS="${SFLAGS} -DARM_NEON"
-
-                        if test $MFPU_NEON_AVAILABLE -eq 1;then
-                            neonflag="-mfpu=neon"
-                        fi
-
-                        if test $NEON_HAS_LD4 -eq 1; then
-                            CFLAGS="${CFLAGS} -DARM_NEON_HASLD4"
-                            SFLAGS="${SFLAGS} -DARM_NEON_HASLD4"
-                        fi
-
-                        CFLAGS="${CFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-                        SFLAGS="${SFLAGS} -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_neon.o chunkset_neon.o compare256_neon.o slide_hash_neon.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_neon.lo chunkset_neon.lo compare256_neon.lo slide_hash_neon.lo"
-                    fi
-                fi
-            ;;
-        esac
-
-    ;;
-    # 64-bit ARM specific optimizations
-    aarch64)
-        [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=aarch64
-        ARCHDIR=arch/arm
-
-        if test $native -eq 0; then
-            ARCH="armv8-a"
-        else
-            ARCH="native"
-        fi
-
-        if test $without_optimizations -eq 0; then
-            check_neon_ld4_intrinsics
-
-            CFLAGS="${CFLAGS} -DARM_FEATURES"
-            SFLAGS="${SFLAGS} -DARM_FEATURES"
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} arm_features.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} arm_features.lo"
-
-            if test $LINUX -eq 1; then
-                cat > $test.c <<EOF
-#include <sys/auxv.h>
-int main() {
-    return (getauxval(AT_HWCAP) & HWCAP_CRC32);
-}
-EOF
-                if try $CC -c $CFLAGS $test.c; then
-                    CFLAGS="${CFLAGS} -DARM_AUXV_HAS_CRC32"
-                    SFLAGS="${SFLAGS} -DARM_AUXV_HAS_CRC32"
-                else
-                    echo "HWCAP_CRC32 not present in sys/auxv.h; cannot detect support at runtime." | tee -a configure.log
-                fi
-            fi
-
-            if test $NEON_HAS_LD4 -eq 1; then
-                CFLAGS="${CFLAGS} -DARM_NEON_HASLD4"
-                SFLAGS="${SFLAGS} -DARM_NEON_HASLD4"
-            fi
-
-            if test $buildacle -eq 1; then
-                if test $native -eq 0; then
-                    ARCH="${ARCH}+crc"
-                fi
-                CFLAGS="${CFLAGS} -DARM_ACLE_CRC_HASH"
-                SFLAGS="${SFLAGS} -DARM_ACLE_CRC_HASH"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_acle.o insert_string_acle.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_acle.lo insert_string_acle.lo"
-            fi
-
-            if test $buildneon -eq 1; then
-                if test $native -eq 0; then
-                    ARCH="${ARCH}+simd"
-                fi
-                CFLAGS="${CFLAGS} -DARM_NEON -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-                SFLAGS="${SFLAGS} -DARM_NEON -DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_neon.o chunkset_neon.o compare256_neon.o slide_hash_neon.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_neon.lo chunkset_neon.lo compare256_neon.lo slide_hash_neon.lo"
-            fi
-        fi
-
-        neonflag="-march=${ARCH}"
-        acleflag="-march=${ARCH}"
-    ;;
-    powerpc*)
-        case "${ARCH}" in
-            powerpc)
-                [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=ppc
-            ;;
-            powerpc64)
-                [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=ppc64
-            ;;
-            powerpc64le)
-                [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=ppc64le
-            ;;
-        esac
-
-        ARCHDIR=arch/power
-
-        if test $without_optimizations -eq 0; then
-
-            check_ppc_intrinsics
-            check_power8_intrinsics
-            check_power9_intrinsics
-
-            if test $HAVE_VMX -eq 1; then
-                CFLAGS="${CFLAGS} -DPPC_FEATURES"
-                SFLAGS="${SFLAGS} -DPPC_FEATURES"
-            fi
-            if test $HAVE_VMX -eq 1 -o $HAVE_POWER8_INTRIN -eq 1; then
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} power_features.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} power_features.lo"
-            fi
-            if test $HAVE_VMX -eq 1 -a $HAVE_ALTIVEC_INTRIN -eq 1; then
-                CFLAGS="${CFLAGS} -DPPC_VMX_ADLER32 -DPPC_VMX_SLIDEHASH"
-                SFLAGS="${SFLAGS} -DPPC_VMX_ADLER32 -DPPC_VMX_SLIDEHASH"
-
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_vmx.o slide_hash_vmx.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_vmx.lo slide_hash_vmx.lo"
-            fi
-            if test $HAVE_POWER8_INTRIN -eq 1; then
-                CFLAGS="${CFLAGS} -DPOWER8 -DPOWER_FEATURES -DPOWER8_VSX_ADLER32 -DPOWER8_VSX_CHUNKSET -DPOWER8_VSX_SLIDEHASH"
-                SFLAGS="${SFLAGS} -DPOWER8 -DPOWER_FEATURES -DPOWER8_VSX_ADLER32 -DPOWER8_VSX_CHUNKSET -DPOWER8_VSX_SLIDEHASH"
-
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_power8.o chunkset_power8.o slide_hash_power8.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_power8.lo chunkset_power8.lo slide_hash_power8.lo"
-                case "${ARCH}" in
-                    powerpc64*)
-                        ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_power8.o"
-                        ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_power8.lo"
-                        CFLAGS="${CFLAGS} -DPOWER8_VSX_CRC32"
-                        SFLAGS="${SFLAGS} -DPOWER8_VSX_CRC32"
-                        ;;
-                esac
-            fi
-            if test $HAVE_POWER9_INTRIN -eq 1; then
-                CFLAGS="${CFLAGS} -DPOWER9 -DPOWER_FEATURES"
-                SFLAGS="${SFLAGS} -DPOWER9 -DPOWER_FEATURES"
-
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} compare256_power9.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} compare256_power9.lo"
-            fi
-        fi
-    ;;
-    s390x)
-        [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=s390x
-        ARCHDIR=arch/s390
-
-        if test $without_optimizations -eq 0; then
-            if test $buildcrc32vx -eq 1; then
-                CFLAGS="${CFLAGS} -DS390_FEATURES"
-                SFLAGS="${SFLAGS} -DS390_FEATURES"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} s390_features.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} s390_features.lo"
-            fi
-
-            if test $builddfltccdeflate -eq 1 -o $builddfltccinflate -eq 1; then
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} dfltcc_common.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} dfltcc_common.lo"
-            fi
-
-            if test $builddfltccdeflate -eq 1; then
-                CFLAGS="${CFLAGS} -DS390_DFLTCC_DEFLATE"
-                SFLAGS="${SFLAGS} -DS390_DFLTCC_DEFLATE"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} dfltcc_deflate.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} dfltcc_deflate.lo"
-                ARCH="${ARCH}+dfltcc-deflate"
-            fi
-
-            if test $builddfltccinflate -eq 1; then
-                CFLAGS="${CFLAGS} -DS390_DFLTCC_INFLATE"
-                SFLAGS="${SFLAGS} -DS390_DFLTCC_INFLATE"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} dfltcc_inflate.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} dfltcc_inflate.lo"
-                ARCH="${ARCH}+dfltcc-inflate"
-            fi
-
-            if test $buildcrc32vx -eq 1; then
-                check_vgfma_intrinsics
-                if test $HAVE_VGFMA_INTRIN -eq 1; then
-                    CFLAGS="${CFLAGS} -DS390_CRC32_VX"
-                    SFLAGS="${SFLAGS} -DS390_CRC32_VX"
-                    ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32-vx.o"
-                    ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32-vx.lo"
-                    ARCH="${ARCH}+crc32-vx"
-                fi
-            fi
-        fi
-    ;;
-    *)
-        [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=$ARCH
-    ;;
-esac
-
-echo "ARCH: ${ARCH}"
-echo "Using arch directory: ${ARCHDIR}"
-echo "Architecture-specific static object files:${ARCH_STATIC_OBJS}"
-echo "Architecture-specific shared object files:${ARCH_SHARED_OBJS}"
-
-# show the results in the log
-echo >> configure.log
-echo ALL = $ALL >> configure.log
-echo AR = $AR >> configure.log
-echo ARFLAGS = $ARFLAGS >> configure.log
-echo CC = $CC >> configure.log
-echo CFLAGS = $CFLAGS >> configure.log
-echo EXE = $EXE >> configure.log
-echo LDCONFIG = $LDCONFIG >> configure.log
-echo LDFLAGS = $LDFLAGS >> configure.log
-echo LDSHARED = $LDSHARED >> configure.log
-echo LDSHAREDFLAGS = $LDSHAREDFLAGS >> configure.log
-echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
-echo DEFFILE = $DEFFILE >> configure.log
-echo RC = $RC >> configure.log
-echo RCFLAGS = $RCFLAGS >> configure.log
-echo RCOBJS = $RCOBJS >> configure.log
-echo STRIP = $STRIP >> configure.log
-echo OBJC = $OBJC >> configure.log
-echo PIC_TESTOBJG = $PIC_TESTOBJG >> configure.log
-echo PIC_OBJC = $PIC_OBJC >> configure.log
-echo RANLIB = $RANLIB >> configure.log
-echo SFLAGS = $SFLAGS >> configure.log
-echo SHAREDLIB = $SHAREDLIB >> configure.log
-echo SHAREDLIBM = $SHAREDLIBM >> configure.log
-echo SHAREDLIBV = $SHAREDLIBV >> configure.log
-echo SHAREDTARGET = $SHAREDTARGET >> configure.log
-echo IMPORTLIB = $IMPORTLIB >> configure.log
-echo INSTALLTARGETS = $INSTALLTARGETS >> configure.log
-echo UNINSTALLTARGETS = $UNINSTALLTARGETS >> configure.log
-echo SRCDIR = $SRCDIR >> configure.log
-echo BUILDDIR = $BUILDDIR >> configure.log
-echo STATICLIB = $STATICLIB >> configure.log
-echo TEST = $TEST >> configure.log
-echo VER = $VER >> configure.log
-echo exec_prefix = $exec_prefix >> configure.log
-echo includedir = $includedir >> configure.log
-echo bindir = $bindir >> configure.log
-echo libdir = $libdir >> configure.log
-echo mandir = $mandir >> configure.log
-echo prefix = $prefix >> configure.log
-echo symbol_prefix = $symbol_prefix >> configure.log
-echo sharedlibdir = $sharedlibdir >> configure.log
-echo uname = $uname >> configure.log
-echo sse2flag = $sse2flag >> configure.log
-echo ssse3flag = $ssse3flag >> configure.log
-echo sse41flag = $sse41flag >> configure.log
-echo sse42flag = $sse42flag >> configure.log
-echo pclmulflag = $pclmulflag >> configure.log
-echo vpclmulflag = $vpclmulflag >> configure.log
-echo acleflag = $acleflag >> configure.log
-echo neonflag = $neonflag >> configure.log
-echo ARCHDIR = ${ARCHDIR} >> configure.log
-echo ARCH_STATIC_OBJS = ${ARCH_STATIC_OBJS} >> configure.log
-echo ARCH_SHARED_OBJS = ${ARCH_SHARED_OBJS} >> configure.log
-
-# Handle sed incompatibilities when using -i
-replace_in_file() {
-  if [ "$OS" = 'Darwin' ]; then
-    sed -i '.tmp' -e "$1" "$2"
-  else
-    sed -i'.tmp' -e "$1" "$2"
-  fi
-}
-
-# update Makefile with the configure results
-
-INCLUDES="-I$SRCDIR"
-if [ "$SRCDIR" != "$BUILDDIR" ]; then INCLUDES="-I$BUILDDIR ${INCLUDES}"; fi
-
-sed < $SRCDIR/Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^LDSHAREDFLAGS *=/s#=.*#=$LDSHAREDFLAGS#
-/^LIBNAME1 *=/s#=.*#=$LIBNAME#
-/^LIBNAME2 *=/s#=.*#=$LIBNAME2#
-/^SUFFIX *=/s#=.*#=$SUFFIX#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^SHAREDTARGET *=/s#=.*#=$SHAREDTARGET#
-/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
-/^VER *=/s#=.*#=$VER#
-/^VER1 *=/s#=.*#=$VER1#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^LDCONFIG *=/s#=.*#=$LDCONFIG#
-/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
-/^DEFFILE *=/s#=.*#=$DEFFILE#
-/^RC *=/s#=.*#=$RC#
-/^RCFLAGS *=/s#=.*#=$RCFLAGS#
-/^RCOBJS *=/s#=.*#=$RCOBJS#
-/^STRIP *=/s#=.*#=$STRIP#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#= $prefix#
-/^exec_prefix *=/s#=.*#= $exec_prefix#
-/^bindir *=/s#=.*#= $bindir#
-/^symbol_prefix *=/s#=.*#= $symbol_prefix#
-/^libdir *=/s#=.*#= $libdir#
-/^sharedlibdir *=/s#=.*#= $sharedlibdir#
-/^includedir *=/s#=.*#= $includedir#
-/^mandir *=/s#=.*#= $mandir#
-/^SRCDIR *=/s#=.*#=$SRCDIR#
-/^INCLUDES *=/s#=.*#=$INCLUDES#
-/^OBJC *=/s#=.*#= $OBJC#
-/^PIC_TESTOBJG *=/s#=.*#= $PIC_TESTOBJG#
-/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
-/^all: */s#:.*#: $ALL#
-/^install-libs: */s#:.*#: $INSTALLTARGETS#
-/^uninstall-libs: */s#:.*#: $UNINSTALLTARGETS#
-/^ARCHDIR *=/s#=.*#=$ARCHDIR#
-/^ARCH_STATIC_OBJS *=/s#=.*#=$ARCH_STATIC_OBJS#
-/^ARCH_SHARED_OBJS *=/s#=.*#=$ARCH_SHARED_OBJS#
-" > Makefile
-
-# Append header files dependences.
-for file in $SRCDIR/*.c $SRCDIR/test/*.c $SRCDIR/test/fuzz/*.c $SRCDIR/$ARCHDIR/*.c $SRCDIR/tools/*.c; do
-    short_name=$(echo $file | sed -e "s#$SRCDIR/##g")
-    incs=$(grep -h include $file | sed -n 's/# *\include *"\(.*\.h\)".*/\1/p' | sort | uniq)
-    includes=$(for i in $incs; do
-                   # Check that the include file exists in the current dir,
-                   # otherwise it may be one of the system include header.
-                   if test -e $SRCDIR/$i; then
-                       echo -n " \$(SRCDIR)/$i"
-                   fi
-                   # We also need to check whether the include file is in the ARCHDIR.
-                   if test -e $SRCDIR/$ARCHDIR/$i; then
-                       echo -n " \$(SRCDIR)/$ARCHDIR/$i"
-                   fi
-               done)
-    obj=$(basename $(echo $file | sed -e 's/\.c/\.o/g' -e 's#^\./##g'))
-    lobj=$(basename $(echo $file | sed -e 's/\.c/\.lo/g' -e 's#^\./##g'))
-
-    if grep -q "^$obj:" Makefile; then
-        # Replace the existing line with a line with all dependences.
-        $(replace_in_file "s#$obj:.*#$obj: \$(SRCDIR)/$short_name $includes#g" Makefile)
-    else
-        # Append at the end of Makefile a new line with the header dependences.
-        echo "$obj: \$(SRCDIR)/$short_name $includes" >> Makefile
-
-        # In case this is one of the ARCHDIR files, append a dependence line
-        # that will force the `$(MAKE) -C $(ARCHDIR)` generic rule. Without this
-        # we would only execute the copy rule from ARCHDIR to SRCDIR.
-        if test -e $SRCDIR/$ARCHDIR/$(basename $file); then
-            echo "$ARCHDIR/$obj: \$(SRCDIR)/$short_name $includes" >> Makefile
-        fi
-    fi
-
-    if grep -q "^$lobj:" Makefile; then
-        # Replace the existing line with a line with all dependences.
-        $(replace_in_file "s#$lobj:.*#$lobj: \$(SRCDIR)/$short_name $includes#g" Makefile)
-    else
-        # Append at the end of Makefile a new line with the header dependences.
-        echo "$lobj: \$(SRCDIR)/$short_name $includes" >> Makefile
-    fi
-done
-
-# Generate Makefile in arch dir
-mkdir -p $ARCHDIR
-
-ARCHINCLUDES="-I$SRCDIR/$ARCHDIR -I$SRCDIR"
-if [ "$SRCDIR" != "$BUILDDIR" ]; then ARCHINCLUDES="-I$BUILDDIR ${ARCHINCLUDES}"; fi
-
-sed < $SRCDIR/$ARCHDIR/Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^INCLUDES *=/s#=.*#=$ARCHINCLUDES#
-/^SUFFIX *=/s#=.*#=$SUFFIX#
-/^SRCDIR *=/s#=.*#=$SRCDIR/$ARCHDIR#
-/^SRCTOP *=/s#=.*#=$SRCDIR#
-/^BUILDDIR *=/s#=.*#=$BUILDDIR#
-/^AVX2FLAG *=/s#=.*#=$avx2flag#
-/^AVX512FLAG *=/s#=.*#=$avx512flag#
-/^AVX512VNNIFLAG *=/s#=.*#=$avx512vnniflag#
-/^SSE2FLAG *=/s#=.*#=$sse2flag#
-/^SSSE3FLAG *=/s#=.*#=$ssse3flag#
-/^SSE41FLAG *=/s#=.*#=$sse41flag#
-/^SSE42FLAG *=/s#=.*#=$sse42flag#
-/^PCLMULFLAG *=/s#=.*#=$pclmulflag#
-/^VPCLMULFLAG *=/s#=.*#=$vpclmulflag#
-/^ACLEFLAG *=/s#=.*#=$acleflag#
-/^NEONFLAG *=/s#=.*#=$neonflag#
-/^NOLTOFLAG *=/s#=.*#=$noltoflag#
-/^VGFMAFLAG *=/s#=.*#=$vgfmaflag#
-/^PPCFLAGS *=/s#=.*#=$vmxflag#
-" > $ARCHDIR/Makefile
-
-# Append header files dependences.
-for file in $SRCDIR/$ARCHDIR/*.c; do
-    incs=$(grep -h include $file | sed -n 's/# *\include *"\(.*\.h\)".*/\1/p' | sort | uniq)
-    includes=$(for i in $incs; do
-                   # Check that the include file exists in the current dir,
-                   # otherwise it may be one of the system include header.
-                   if test -e $SRCDIR/$i; then
-                       echo -n " \$(SRCTOP)/$i"
-                   fi
-                   # We also need to check whether the include file is in the ARCHDIR.
-                   if test -e $SRCDIR/$ARCHDIR/$i; then
-                       echo -n " \$(SRCDIR)/$i"
-                   fi
-               done)
-    obj=$(basename $(echo $file | sed -e 's/\.c/\.o/g' -e 's#^\./##g'))
-    lobj=$(basename $(echo $file | sed -e 's/\.c/\.lo/g' -e 's#^\./##g'))
-    short_name=$(basename $file)
-    if grep -q "^$obj:" $ARCHDIR/Makefile; then
-        # Replace the existing line with a line with all dependences.
-        $(replace_in_file "s#$obj:.*#$obj: \$(SRCDIR)/$short_name $includes#g" $ARCHDIR/Makefile)
-    else
-        # Append at the end of Makefile a new line with the header dependences.
-        echo "$obj: \$(SRCDIR)/$short_name $includes" >> $ARCHDIR/Makefile
-    fi
-
-    if grep -q "^$lobj:" $ARCHDIR/Makefile; then
-        # Replace the existing line with a line with all dependences.
-        $(replace_in_file "s#$lobj:.*#$lobj: \$(SRCDIR)/$short_name $includes#g" $ARCHDIR/Makefile)
-    else
-        # Append at the end of Makefile a new line with the header dependences.
-        echo "$lobj: \$(SRCDIR)/$short_name $includes" >> $ARCHDIR/Makefile
-    fi
-done
-
-# Generate Makefile in test dir
-mkdir -p test
-if test $QEMU_ARCH; then QEMU_RUN="qemu-$QEMU_ARCH -L /usr/${CHOST}/"; fi
-sed < $SRCDIR/test/Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^EXE *=/s#=.*#=$EXE#
-/^oldtests: */s#:.*#: $TEST#
-/^SRCDIR *=/s#=.*#=$SRCDIR/test#
-/^SRCTOP *=/s#=.*#=$SRCDIR#
-/^QEMU_RUN *=/s#=.*#=$QEMU_RUN#
-/^LIBNAME *=/s#=.*#=$LIBNAME#
-" > test/Makefile
-
-# create zlib.pc with the configure results
-sed < $SRCDIR/zlib.pc.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^LDSHAREDFLAGS *=/s#=.*#=$LDSHAREDFLAGS#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^bindir *=/s#=.*#=$bindir#
-/^symbol_prefix *=/s#=.*#=$symbol_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-" | sed -e "
-s/\@VERSION\@/$VER/g;
-s/\@SUFFIX\@/$SUFFIX/g;
-" > ${LIBNAME2}.pc
-
-# done
-leave 0

crates/libz-sys/src/zlib-ng/cpu_features.c

diff --git a/crates/libz-sys/src/zlib-ng/cpu_features.c b/crates/libz-sys/src/zlib-ng/cpu_features.c
deleted file mode 100644
index b5e7257..0000000
--- a/crates/libz-sys/src/zlib-ng/cpu_features.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* cpu_features.c -- CPU architecture feature check
- * Copyright (C) 2017 Hans Kristian Rosbach
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-
-#include "cpu_features.h"
-
-Z_INTERNAL void cpu_check_features(void) {
-    static int features_checked = 0;
-    if (features_checked)
-        return;
-#if defined(X86_FEATURES)
-    x86_check_features();
-#elif defined(ARM_FEATURES)
-    arm_check_features();
-#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
-    power_check_features();
-#elif defined(S390_FEATURES)
-    PREFIX(s390_check_features)();
-#endif
-    features_checked = 1;
-}

crates/libz-sys/src/zlib-ng/cpu_features.h

diff --git a/crates/libz-sys/src/zlib-ng/cpu_features.h b/crates/libz-sys/src/zlib-ng/cpu_features.h
deleted file mode 100644
index ca1465d..0000000
--- a/crates/libz-sys/src/zlib-ng/cpu_features.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* cpu_features.h -- CPU architecture feature check
- * Copyright (C) 2017 Hans Kristian Rosbach
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef CPU_FEATURES_H_
-#define CPU_FEATURES_H_
-
-#include "adler32_fold.h"
-#include "crc32_fold.h"
-
-#if defined(X86_FEATURES)
-#  include "arch/x86/x86_features.h"
-#  include "fallback_builtins.h"
-#elif defined(ARM_FEATURES)
-#  include "arch/arm/arm_features.h"
-#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
-#  include "arch/power/power_features.h"
-#elif defined(S390_FEATURES)
-#  include "arch/s390/s390_features.h"
-#endif
-
-extern void cpu_check_features(void);
-
-/* adler32 */
-typedef uint32_t (*adler32_func)(uint32_t adler, const unsigned char *buf, size_t len);
-
-extern uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len);
-#ifdef ARM_NEON_ADLER32
-extern uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef PPC_VMX_ADLER32
-extern uint32_t adler32_vmx(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef X86_SSSE3_ADLER32
-extern uint32_t adler32_ssse3(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef X86_AVX2_ADLER32
-extern uint32_t adler32_avx2(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef X86_AVX512_ADLER32
-extern uint32_t adler32_avx512(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-extern uint32_t adler32_avx512_vnni(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#ifdef POWER8_VSX_ADLER32
-extern uint32_t adler32_power8(uint32_t adler, const unsigned char* buf, size_t len);
-#endif
-
-/* adler32 folding */
-#ifdef X86_SSE42_ADLER32
-extern uint32_t adler32_fold_copy_sse42(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-#endif
-#ifdef X86_AVX2_ADLER32
-extern uint32_t adler32_fold_copy_avx2(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-#endif
-#ifdef X86_AVX512_ADLER32
-extern uint32_t adler32_fold_copy_avx512(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-extern uint32_t adler32_fold_copy_avx512_vnni(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-#endif
-
-/* CRC32 folding */
-#ifdef X86_PCLMULQDQ_CRC
-extern uint32_t crc32_fold_reset_pclmulqdq(crc32_fold *crc);
-extern void     crc32_fold_copy_pclmulqdq(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len);
-extern void     crc32_fold_pclmulqdq(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc);
-extern uint32_t crc32_fold_final_pclmulqdq(crc32_fold *crc);
-extern uint32_t crc32_pclmulqdq(uint32_t crc32, const unsigned char* buf, uint64_t len);
-#endif
-
-/* memory chunking */
-extern uint32_t chunksize_c(void);
-extern uint8_t* chunkcopy_c(uint8_t *out, uint8_t const *from, unsigned len);
-extern uint8_t* chunkcopy_safe_c(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe);
-extern uint8_t* chunkunroll_c(uint8_t *out, unsigned *dist, unsigned *len);
-extern uint8_t* chunkmemset_c(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_c(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#ifdef X86_SSE2_CHUNKSET
-extern uint32_t chunksize_sse2(void);
-extern uint8_t* chunkcopy_sse2(uint8_t *out, uint8_t const *from, unsigned len);
-extern uint8_t* chunkcopy_safe_sse2(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe);
-extern uint8_t* chunkunroll_sse2(uint8_t *out, unsigned *dist, unsigned *len);
-extern uint8_t* chunkmemset_sse2(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_sse2(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#endif
-#ifdef X86_SSE41
-extern uint8_t* chunkmemset_sse41(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_sse41(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#endif
-#ifdef X86_AVX_CHUNKSET
-extern uint32_t chunksize_avx(void);
-extern uint8_t* chunkcopy_avx(uint8_t *out, uint8_t const *from, unsigned len);
-extern uint8_t* chunkcopy_safe_avx(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe);
-extern uint8_t* chunkunroll_avx(uint8_t *out, unsigned *dist, unsigned *len);
-extern uint8_t* chunkmemset_avx(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_avx(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#endif
-#ifdef ARM_NEON_CHUNKSET
-extern uint32_t chunksize_neon(void);
-extern uint8_t* chunkcopy_neon(uint8_t *out, uint8_t const *from, unsigned len);
-extern uint8_t* chunkcopy_safe_neon(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe);
-extern uint8_t* chunkunroll_neon(uint8_t *out, unsigned *dist, unsigned *len);
-extern uint8_t* chunkmemset_neon(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_neon(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-extern uint32_t chunksize_power8(void);
-extern uint8_t* chunkcopy_power8(uint8_t *out, uint8_t const *from, unsigned len);
-extern uint8_t* chunkcopy_safe_power8(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe);
-extern uint8_t* chunkunroll_power8(uint8_t *out, unsigned *dist, unsigned *len);
-extern uint8_t* chunkmemset_power8(uint8_t *out, unsigned dist, unsigned len);
-extern uint8_t* chunkmemset_safe_power8(uint8_t *out, unsigned dist, unsigned len, unsigned left);
-#endif
-
-/* CRC32 */
-typedef uint32_t (*crc32_func)(uint32_t crc32, const unsigned char * buf, uint64_t len);
-
-extern uint32_t crc32_braid(uint32_t crc, const unsigned char *buf, uint64_t len);
-#ifdef ARM_ACLE_CRC_HASH
-extern uint32_t crc32_acle(uint32_t crc, const unsigned char *buf, uint64_t len);
-#elif defined(POWER8_VSX_CRC32)
-extern uint32_t crc32_power8(uint32_t crc, const unsigned char *buf, uint64_t len);
-#elif defined(S390_CRC32_VX)
-extern uint32_t PREFIX(s390_crc32_vx)(uint32_t crc, const unsigned char *buf, uint64_t len);
-#endif
-
-/* compare256 */
-typedef uint32_t (*compare256_func)(const uint8_t *src0, const uint8_t *src1);
-
-extern uint32_t compare256_c(const uint8_t *src0, const uint8_t *src1);
-#ifdef UNALIGNED_OK
-extern uint32_t compare256_unaligned_16(const uint8_t *src0, const uint8_t *src1);
-#ifdef HAVE_BUILTIN_CTZ
-extern uint32_t compare256_unaligned_32(const uint8_t *src0, const uint8_t *src1);
-#endif
-#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-extern uint32_t compare256_unaligned_64(const uint8_t *src0, const uint8_t *src1);
-#endif
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t compare256_sse2(const uint8_t *src0, const uint8_t *src1);
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t compare256_avx2(const uint8_t *src0, const uint8_t *src1);
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-extern uint32_t compare256_neon(const uint8_t *src0, const uint8_t *src1);
-#endif
-#ifdef POWER9
-extern uint32_t compare256_power9(const uint8_t *src0, const uint8_t *src1);
-#endif
-
-#ifdef DEFLATE_H_
-/* insert_string */
-extern void insert_string_c(deflate_state *const s, const uint32_t str, uint32_t count);
-#ifdef X86_SSE42_CRC_HASH
-extern void insert_string_sse4(deflate_state *const s, const uint32_t str, uint32_t count);
-#elif defined(ARM_ACLE_CRC_HASH)
-extern void insert_string_acle(deflate_state *const s, const uint32_t str, uint32_t count);
-#endif
-
-/* longest_match */
-extern uint32_t longest_match_c(deflate_state *const s, Pos cur_match);
-#ifdef UNALIGNED_OK
-extern uint32_t longest_match_unaligned_16(deflate_state *const s, Pos cur_match);
-#ifdef HAVE_BUILTIN_CTZ
-extern uint32_t longest_match_unaligned_32(deflate_state *const s, Pos cur_match);
-#endif
-#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-extern uint32_t longest_match_unaligned_64(deflate_state *const s, Pos cur_match);
-#endif
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t longest_match_sse2(deflate_state *const s, Pos cur_match);
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t longest_match_avx2(deflate_state *const s, Pos cur_match);
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-extern uint32_t longest_match_neon(deflate_state *const s, Pos cur_match);
-#endif
-#ifdef POWER9
-extern uint32_t longest_match_power9(deflate_state *const s, Pos cur_match);
-#endif
-
-/* longest_match_slow */
-extern uint32_t longest_match_slow_c(deflate_state *const s, Pos cur_match);
-#ifdef UNALIGNED_OK
-extern uint32_t longest_match_slow_unaligned_16(deflate_state *const s, Pos cur_match);
-extern uint32_t longest_match_slow_unaligned_32(deflate_state *const s, Pos cur_match);
-#ifdef UNALIGNED64_OK
-extern uint32_t longest_match_slow_unaligned_64(deflate_state *const s, Pos cur_match);
-#endif
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t longest_match_slow_sse2(deflate_state *const s, Pos cur_match);
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-extern uint32_t longest_match_slow_avx2(deflate_state *const s, Pos cur_match);
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-extern uint32_t longest_match_slow_neon(deflate_state *const s, Pos cur_match);
-#endif
-#ifdef POWER9
-extern uint32_t longest_match_slow_power9(deflate_state *const s, Pos cur_match);
-#endif
-
-/* quick_insert_string */
-extern Pos quick_insert_string_c(deflate_state *const s, const uint32_t str);
-#ifdef X86_SSE42_CRC_HASH
-extern Pos quick_insert_string_sse4(deflate_state *const s, const uint32_t str);
-#elif defined(ARM_ACLE_CRC_HASH)
-extern Pos quick_insert_string_acle(deflate_state *const s, const uint32_t str);
-#endif
-
-/* slide_hash */
-typedef void (*slide_hash_func)(deflate_state *s);
-
-#ifdef X86_SSE2
-extern void slide_hash_sse2(deflate_state *s);
-#elif defined(ARM_NEON_SLIDEHASH)
-extern void slide_hash_neon(deflate_state *s);
-#endif
-#if defined(PPC_VMX_SLIDEHASH)
-extern void slide_hash_vmx(deflate_state *s);
-#endif
-#if defined(POWER8_VSX_SLIDEHASH)
-extern void slide_hash_power8(deflate_state *s);
-#endif
-#ifdef X86_AVX2
-extern void slide_hash_avx2(deflate_state *s);
-#endif
-
-/* update_hash */
-extern uint32_t update_hash_c(deflate_state *const s, uint32_t h, uint32_t val);
-#ifdef X86_SSE42_CRC_HASH
-extern uint32_t update_hash_sse4(deflate_state *const s, uint32_t h, uint32_t val);
-#elif defined(ARM_ACLE_CRC_HASH)
-extern uint32_t update_hash_acle(deflate_state *const s, uint32_t h, uint32_t val);
-#endif
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/crc32_braid.c

diff --git a/crates/libz-sys/src/zlib-ng/crc32_braid.c b/crates/libz-sys/src/zlib-ng/crc32_braid.c
deleted file mode 100644
index fee7992..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_braid.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* crc32_braid.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * This interleaved implementation of a CRC makes use of pipelined multiple
- * arithmetic-logic units, commonly found in modern CPU cores. It is due to
- * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "functable.h"
-#include "crc32_braid_p.h"
-#include "crc32_braid_tbl.h"
-
-/* ========================================================================= */
-
-const uint32_t * Z_EXPORT PREFIX(get_crc_table)(void) {
-    return (const uint32_t *)crc_table;
-}
-
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(crc32_z)(unsigned long crc, const unsigned char *buf, size_t len) {
-    if (buf == NULL) return 0;
-
-    return (unsigned long)functable.crc32((uint32_t)crc, buf, len);
-}
-#else
-uint32_t Z_EXPORT PREFIX(crc32_z)(uint32_t crc, const unsigned char *buf, size_t len) {
-    if (buf == NULL) return 0;
-
-    return functable.crc32(crc, buf, len);
-}
-#endif
-
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(crc32)(unsigned long crc, const unsigned char *buf, unsigned int len) {
-    return (unsigned long)PREFIX(crc32_z)((uint32_t)crc, buf, len);
-}
-#else
-uint32_t Z_EXPORT PREFIX(crc32)(uint32_t crc, const unsigned char *buf, uint32_t len) {
-    return PREFIX(crc32_z)(crc, buf, len);
-}
-#endif
-
-/* ========================================================================= */
-
-/*
-  A CRC of a message is computed on N braids of words in the message, where
-  each word consists of W bytes (4 or 8). If N is 3, for example, then three
-  running sparse CRCs are calculated respectively on each braid, at these
-  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
-  This is done starting at a word boundary, and continues until as many blocks
-  of N * W bytes as are available have been processed. The results are combined
-  into a single CRC at the end. For this code, N must be in the range 1..6 and
-  W must be 4 or 8. The upper limit on N can be increased if desired by adding
-  more #if blocks, extending the patterns apparent in the code. In addition,
-  crc32 tables would need to be regenerated, if the maximum N value is increased.
-
-  N and W are chosen empirically by benchmarking the execution time on a given
-  processor. The choices for N and W below were based on testing on Intel Kaby
-  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
-  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
-  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
-  They were all tested with either gcc or clang, all using the -O3 optimization
-  level. Your mileage may vary.
-*/
-
-/* ========================================================================= */
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#  define ZSWAPWORD(word) (word)
-#  define BRAID_TABLE crc_braid_table
-#elif BYTE_ORDER == BIG_ENDIAN
-#  if W == 8
-#    define ZSWAPWORD(word) ZSWAP64(word)
-#  elif W == 4
-#    define ZSWAPWORD(word) ZSWAP32(word)
-#  endif
-#  define BRAID_TABLE crc_braid_big_table
-#else
-#  error "No endian defined"
-#endif
-#define DO1 c = crc_table[(c ^ *buf++) & 0xff] ^ (c >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-#ifdef W
-/*
-  Return the CRC of the W bytes in the word_t data, taking the
-  least-significant byte of the word as the first byte of data, without any pre
-  or post conditioning. This is used to combine the CRCs of each braid.
- */
-#if BYTE_ORDER == LITTLE_ENDIAN
-static uint32_t crc_word(z_word_t data) {
-    int k;
-    for (k = 0; k < W; k++)
-        data = (data >> 8) ^ crc_table[data & 0xff];
-    return (uint32_t)data;
-}
-#elif BYTE_ORDER == BIG_ENDIAN
-static z_word_t crc_word(z_word_t data) {
-    int k;
-    for (k = 0; k < W; k++)
-        data = (data << 8) ^
-            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
-    return data;
-}
-#endif /* BYTE_ORDER */
-
-#endif /* W */
-
-/* ========================================================================= */
-Z_INTERNAL uint32_t crc32_braid(uint32_t crc, const unsigned char *buf, uint64_t len) {
-    Z_REGISTER uint32_t c;
-
-    /* Pre-condition the CRC */
-    c = (~crc) & 0xffffffff;
-
-#ifdef W
-    /* If provided enough bytes, do a braided CRC calculation. */
-    if (len >= N * W + W - 1) {
-        uint64_t blks;
-        z_word_t const *words;
-        int k;
-
-        /* Compute the CRC up to a z_word_t boundary. */
-        while (len && ((z_size_t)buf & (W - 1)) != 0) {
-            len--;
-            DO1;
-        }
-
-        /* Compute the CRC on as many N z_word_t blocks as are available. */
-        blks = len / (N * W);
-        len -= blks * N * W;
-        words = (z_word_t const *)buf;
-
-        z_word_t crc0, word0, comb;
-#if N > 1
-        z_word_t crc1, word1;
-#if N > 2
-        z_word_t crc2, word2;
-#if N > 3
-        z_word_t crc3, word3;
-#if N > 4
-        z_word_t crc4, word4;
-#if N > 5
-        z_word_t crc5, word5;
-#endif
-#endif
-#endif
-#endif
-#endif
-        /* Initialize the CRC for each braid. */
-        crc0 = ZSWAPWORD(c);
-#if N > 1
-        crc1 = 0;
-#if N > 2
-        crc2 = 0;
-#if N > 3
-        crc3 = 0;
-#if N > 4
-        crc4 = 0;
-#if N > 5
-        crc5 = 0;
-#endif
-#endif
-#endif
-#endif
-#endif
-        /* Process the first blks-1 blocks, computing the CRCs on each braid independently. */
-        while (--blks) {
-            /* Load the word for each braid into registers. */
-            word0 = crc0 ^ words[0];
-#if N > 1
-            word1 = crc1 ^ words[1];
-#if N > 2
-            word2 = crc2 ^ words[2];
-#if N > 3
-            word3 = crc3 ^ words[3];
-#if N > 4
-            word4 = crc4 ^ words[4];
-#if N > 5
-            word5 = crc5 ^ words[5];
-#endif
-#endif
-#endif
-#endif
-#endif
-            words += N;
-
-            /* Compute and update the CRC for each word. The loop should get unrolled. */
-            crc0 = BRAID_TABLE[0][word0 & 0xff];
-#if N > 1
-            crc1 = BRAID_TABLE[0][word1 & 0xff];
-#if N > 2
-            crc2 = BRAID_TABLE[0][word2 & 0xff];
-#if N > 3
-            crc3 = BRAID_TABLE[0][word3 & 0xff];
-#if N > 4
-            crc4 = BRAID_TABLE[0][word4 & 0xff];
-#if N > 5
-            crc5 = BRAID_TABLE[0][word5 & 0xff];
-#endif
-#endif
-#endif
-#endif
-#endif
-            for (k = 1; k < W; k++) {
-                crc0 ^= BRAID_TABLE[k][(word0 >> (k << 3)) & 0xff];
-#if N > 1
-                crc1 ^= BRAID_TABLE[k][(word1 >> (k << 3)) & 0xff];
-#if N > 2
-                crc2 ^= BRAID_TABLE[k][(word2 >> (k << 3)) & 0xff];
-#if N > 3
-                crc3 ^= BRAID_TABLE[k][(word3 >> (k << 3)) & 0xff];
-#if N > 4
-                crc4 ^= BRAID_TABLE[k][(word4 >> (k << 3)) & 0xff];
-#if N > 5
-                crc5 ^= BRAID_TABLE[k][(word5 >> (k << 3)) & 0xff];
-#endif
-#endif
-#endif
-#endif
-#endif
-            }
-        }
-
-        /* Process the last block, combining the CRCs of the N braids at the same time. */
-        comb = crc_word(crc0 ^ words[0]);
-#if N > 1
-        comb = crc_word(crc1 ^ words[1] ^ comb);
-#if N > 2
-        comb = crc_word(crc2 ^ words[2] ^ comb);
-#if N > 3
-        comb = crc_word(crc3 ^ words[3] ^ comb);
-#if N > 4
-        comb = crc_word(crc4 ^ words[4] ^ comb);
-#if N > 5
-        comb = crc_word(crc5 ^ words[5] ^ comb);
-#endif
-#endif
-#endif
-#endif
-#endif
-        words += N;
-        c = ZSWAPWORD(comb);
-
-        /* Update the pointer to the remaining bytes to process. */
-        buf = (const unsigned char *)words;
-    }
-
-#endif /* W */
-
-    /* Complete the computation of the CRC on any remaining bytes. */
-    while (len >= 8) {
-        len -= 8;
-        DO8;
-    }
-    while (len) {
-        len--;
-        DO1;
-    }
-
-    /* Return the CRC, post-conditioned. */
-    return c ^ 0xffffffff;
-}

crates/libz-sys/src/zlib-ng/crc32_braid_comb.c

diff --git a/crates/libz-sys/src/zlib-ng/crc32_braid_comb.c b/crates/libz-sys/src/zlib-ng/crc32_braid_comb.c
deleted file mode 100644
index e33fccf..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_braid_comb.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* crc32_braid_comb.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * This interleaved implementation of a CRC makes use of pipelined multiple
- * arithmetic-logic units, commonly found in modern CPU cores. It is due to
- * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "crc32_braid_p.h"
-#include "crc32_braid_tbl.h"
-#include "crc32_braid_comb_p.h"
-
-/* ========================================================================= */
-static uint32_t crc32_combine_(uint32_t crc1, uint32_t crc2, z_off64_t len2) {
-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
-}
-static uint32_t crc32_combine_gen_(z_off64_t len2) {
-     return x2nmodp(len2, 3);
-}
-static uint32_t crc32_combine_op_(uint32_t crc1, uint32_t crc2, const uint32_t op) {
-    return multmodp(op, crc1) ^ crc2;
-}
-
-/* ========================================================================= */
-
-#ifdef ZLIB_COMPAT
-unsigned long Z_EXPORT PREFIX(crc32_combine)(unsigned long crc1, unsigned long crc2, z_off_t len2) {
-    return (unsigned long)crc32_combine_((uint32_t)crc1, (uint32_t)crc2, len2);
-}
-unsigned long Z_EXPORT PREFIX4(crc32_combine)(unsigned long crc1, unsigned long crc2, z_off64_t len2) {
-    return (unsigned long)crc32_combine_((uint32_t)crc1, (uint32_t)crc2, len2);
-}
-unsigned long Z_EXPORT PREFIX(crc32_combine_gen)(z_off_t len2) {
-    return crc32_combine_gen_(len2);
-}
-unsigned long Z_EXPORT PREFIX4(crc32_combine_gen)(z_off64_t len2) {
-    return crc32_combine_gen_(len2);
-}
-unsigned long Z_EXPORT PREFIX(crc32_combine_op)(unsigned long crc1, unsigned long crc2, const unsigned long op) {
-    return (unsigned long)crc32_combine_op_((uint32_t)crc1, (uint32_t)crc2, (uint32_t)op);
-}
-#else
-uint32_t Z_EXPORT PREFIX4(crc32_combine)(uint32_t crc1, uint32_t crc2, z_off64_t len2) {
-    return crc32_combine_(crc1, crc2, len2);
-}
-uint32_t Z_EXPORT PREFIX(crc32_combine_gen)(z_off64_t len2) {
-    return crc32_combine_gen_(len2);
-}
-uint32_t Z_EXPORT PREFIX(crc32_combine_op)(uint32_t crc1, uint32_t crc2, const uint32_t op) {
-    return crc32_combine_op_(crc1, crc2, op);
-}
-#endif
-
-/* ========================================================================= */

crates/libz-sys/src/zlib-ng/crc32_braid_comb_p.h

diff --git a/crates/libz-sys/src/zlib-ng/crc32_braid_comb_p.h b/crates/libz-sys/src/zlib-ng/crc32_braid_comb_p.h
deleted file mode 100644
index a269e7f..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_braid_comb_p.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef CRC32_BRAID_COMB_P_H_
-#define CRC32_BRAID_COMB_P_H_
-
-/*
-  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
-  reflected. For speed, this requires that a not be zero.
- */
-static uint32_t multmodp(uint32_t a, uint32_t b) {
-    uint32_t m, p;
-
-    m = (uint32_t)1 << 31;
-    p = 0;
-    for (;;) {
-        if (a & m) {
-            p ^= b;
-            if ((a & (m - 1)) == 0)
-                break;
-        }
-        m >>= 1;
-        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
-    }
-    return p;
-}
-
-/*
-  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
-  initialized.
- */
-static uint32_t x2nmodp(z_off64_t n, unsigned k) {
-    uint32_t p;
-
-    p = (uint32_t)1 << 31;           /* x^0 == 1 */
-    while (n) {
-        if (n & 1)
-            p = multmodp(x2n_table[k & 31], p);
-        n >>= 1;
-        k++;
-    }
-    return p;
-}
-
-#endif /* CRC32_BRAID_COMB_P_H_ */

crates/libz-sys/src/zlib-ng/crc32_braid_p.h

diff --git a/crates/libz-sys/src/zlib-ng/crc32_braid_p.h b/crates/libz-sys/src/zlib-ng/crc32_braid_p.h
deleted file mode 100644
index 80c0f14..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_braid_p.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef CRC32_BRAID_P_H_
-#define CRC32_BRAID_P_H_
-
-#include "zbuild.h"
-#include "zendian.h"
-
-/* Define N */
-#ifdef Z_TESTN
-#  define N Z_TESTN
-#else
-#  define N 5
-#endif
-#if N < 1 || N > 6
-#  error N must be in 1..6
-#endif
-
-/*
-  Define W and the associated z_word_t type. If W is not defined, then a
-  braided calculation is not used, and the associated tables and code are not
-  compiled.
- */
-#ifdef Z_TESTW
-#  if Z_TESTW-1 != -1
-#    define W Z_TESTW
-#  endif
-#else
-#  ifndef W
-#    if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
-#      define W 8
-#    else
-#      define W 4
-#    endif
-#  endif
-#endif
-#ifdef W
-#  if W == 8
-     typedef uint64_t z_word_t;
-#  else
-#    undef W
-#    define W 4
-     typedef uint32_t z_word_t;
-#  endif
-#endif
-
-/* CRC polynomial. */
-#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
-
-extern uint32_t crc32_braid(uint32_t crc, const unsigned char *buf, uint64_t len);
-
-#endif /* CRC32_BRAID_P_H_ */

crates/libz-sys/src/zlib-ng/crc32_braid_tbl.h

diff --git a/crates/libz-sys/src/zlib-ng/crc32_braid_tbl.h b/crates/libz-sys/src/zlib-ng/crc32_braid_tbl.h
deleted file mode 100644
index 84d79a6..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_braid_tbl.h
+++ /dev/null
@@ -1,9446 +0,0 @@
-#ifndef CRC32_BRAID_TBL_H_
-#define CRC32_BRAID_TBL_H_
-
-/* crc32_braid_tbl.h -- tables for braided CRC calculation
- * Generated automatically by makecrct.c
- */
-
-static const uint32_t crc_table[] = {
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
-    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
-    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
-    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
-    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
-    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
-    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
-    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
-    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
-    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
-    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
-    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
-    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
-    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
-    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
-    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
-    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
-    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
-    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
-    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
-    0x2d02ef8d};
-
-#ifdef W
-
-#if W == 8
-
-static const z_word_t crc_big_table[] = {
-    0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
-    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
-    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
-    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
-    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
-    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
-    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
-    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
-    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
-    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
-    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
-    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
-    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
-    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
-    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
-    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
-    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
-    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
-    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
-    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
-    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
-    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
-    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
-    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
-    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
-    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
-    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
-    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
-    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
-    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
-    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
-    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
-    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
-    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
-    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
-    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
-    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
-    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
-    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
-    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
-    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
-    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
-    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
-    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
-    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
-    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
-    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
-    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
-    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
-    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
-    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
-    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
-    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
-    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
-    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
-    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
-    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
-    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
-    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
-    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
-    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
-    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
-    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
-    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
-    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
-    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
-    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
-    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
-    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
-    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
-    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
-    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
-    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
-    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
-    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
-    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
-    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
-    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
-    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
-    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
-    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
-    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
-    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
-    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
-    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
-    0x8def022d00000000};
-
-#else /* W == 4 */
-
-static const z_word_t crc_big_table[] = {
-    0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
-    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
-    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
-    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
-    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
-    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
-    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
-    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
-    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
-    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
-    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
-    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
-    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
-    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
-    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
-    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
-    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
-    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
-    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
-    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
-    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
-    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
-    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
-    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
-    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
-    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
-    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
-    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
-    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
-    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
-    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
-    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
-    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
-    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
-    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
-    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
-    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
-    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
-    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
-    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
-    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
-    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
-    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
-    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
-    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
-    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
-    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
-    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
-    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
-    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
-    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
-    0x8def022d};
-
-#endif
-
-#endif /* W */
-
-#if N == 1
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
-    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
-    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
-    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
-    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
-    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
-    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
-    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
-    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
-    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
-    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
-    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
-    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
-    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
-    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
-    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
-    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
-    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
-    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
-    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
-    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
-    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
-    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
-    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
-    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
-    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
-    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
-    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
-    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
-    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
-    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
-    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
-    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
-    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
-    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
-    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
-    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
-    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
-    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
-    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
-    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
-    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
-    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
-    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
-    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
-    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
-    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
-    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
-    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
-    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
-    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
-    0x264b06e6},
-   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
-    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
-    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
-    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
-    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
-    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
-    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
-    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
-    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
-    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
-    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
-    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
-    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
-    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
-    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
-    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
-    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
-    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
-    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
-    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
-    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
-    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
-    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
-    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
-    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
-    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
-    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
-    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
-    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
-    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
-    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
-    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
-    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
-    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
-    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
-    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
-    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
-    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
-    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
-    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
-    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
-    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
-    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
-    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
-    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
-    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
-    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
-    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
-    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
-    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
-    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
-    0x92364a30},
-   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
-    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
-    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
-    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
-    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
-    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
-    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
-    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
-    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
-    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
-    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
-    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
-    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
-    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
-    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
-    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
-    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
-    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
-    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
-    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
-    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
-    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
-    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
-    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
-    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
-    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
-    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
-    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
-    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
-    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
-    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
-    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
-    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
-    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
-    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
-    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
-    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
-    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
-    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
-    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
-    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
-    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
-    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
-    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
-    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
-    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
-    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
-    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
-    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
-    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
-    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
-    0xe4c4abcc},
-   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
-    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
-    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
-    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
-    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
-    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
-    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
-    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
-    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
-    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
-    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
-    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
-    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
-    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
-    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
-    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
-    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
-    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
-    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
-    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
-    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
-    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
-    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
-    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
-    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
-    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
-    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
-    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
-    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
-    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
-    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
-    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
-    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
-    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
-    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
-    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
-    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
-    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
-    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
-    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
-    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
-    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
-    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
-    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
-    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
-    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
-    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
-    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
-    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
-    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
-    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
-    0xca64c78c},
-   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
-    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
-    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
-    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
-    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
-    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
-    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
-    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
-    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
-    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
-    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
-    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
-    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
-    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
-    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
-    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
-    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
-    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
-    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
-    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
-    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
-    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
-    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
-    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
-    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
-    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
-    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
-    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
-    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
-    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
-    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
-    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
-    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
-    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
-    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
-    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
-    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
-    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
-    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
-    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
-    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
-    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
-    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
-    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
-    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
-    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
-    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
-    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
-    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
-    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
-    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
-    0xde0506f1},
-   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
-    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
-    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
-    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
-    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
-    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
-    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
-    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
-    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
-    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
-    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
-    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
-    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
-    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
-    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
-    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
-    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
-    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
-    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
-    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
-    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
-    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
-    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
-    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
-    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
-    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
-    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
-    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
-    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
-    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
-    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
-    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
-    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
-    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
-    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
-    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
-    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
-    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
-    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
-    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
-    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
-    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
-    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
-    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
-    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
-    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
-    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
-    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
-    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
-    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
-    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
-    0xbe9834ed},
-   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
-    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
-    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
-    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
-    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
-    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
-    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
-    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
-    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
-    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
-    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
-    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
-    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
-    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
-    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
-    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
-    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
-    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
-    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
-    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
-    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
-    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
-    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
-    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
-    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
-    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
-    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
-    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
-    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
-    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
-    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
-    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
-    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
-    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
-    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
-    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
-    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
-    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
-    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
-    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
-    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
-    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
-    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
-    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
-    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
-    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
-    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
-    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
-    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
-    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
-    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
-    0x9324fd72},
-   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
-    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
-    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
-    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
-    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
-    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
-    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
-    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
-    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
-    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
-    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
-    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
-    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
-    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
-    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
-    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
-    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
-    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
-    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
-    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
-    0x2d02ef8d}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
-    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
-    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
-    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
-    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
-    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
-    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
-    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
-    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
-    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
-    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
-    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
-    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
-    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
-    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
-    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
-    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
-    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
-    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
-    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
-    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
-    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
-    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
-    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
-    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
-    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
-    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
-    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
-    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
-    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
-    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
-    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
-    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
-    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
-    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
-    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
-    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
-    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
-    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
-    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
-    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
-    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
-    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
-    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
-    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
-    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
-    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
-    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
-    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
-    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
-    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
-    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
-    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
-    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
-    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
-    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
-    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
-    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
-    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
-    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
-    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
-    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
-    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
-    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
-    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
-    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
-    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
-    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
-    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
-    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
-    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
-    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
-    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
-    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
-    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
-    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
-    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
-    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
-    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
-    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
-    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
-    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
-    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
-    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
-    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
-    0x8def022d00000000},
-   {0x0000000000000000, 0x41311b1900000000, 0x8262363200000000,
-    0xc3532d2b00000000, 0x04c56c6400000000, 0x45f4777d00000000,
-    0x86a75a5600000000, 0xc796414f00000000, 0x088ad9c800000000,
-    0x49bbc2d100000000, 0x8ae8effa00000000, 0xcbd9f4e300000000,
-    0x0c4fb5ac00000000, 0x4d7eaeb500000000, 0x8e2d839e00000000,
-    0xcf1c988700000000, 0x5112c24a00000000, 0x1023d95300000000,
-    0xd370f47800000000, 0x9241ef6100000000, 0x55d7ae2e00000000,
-    0x14e6b53700000000, 0xd7b5981c00000000, 0x9684830500000000,
-    0x59981b8200000000, 0x18a9009b00000000, 0xdbfa2db000000000,
-    0x9acb36a900000000, 0x5d5d77e600000000, 0x1c6c6cff00000000,
-    0xdf3f41d400000000, 0x9e0e5acd00000000, 0xa224849500000000,
-    0xe3159f8c00000000, 0x2046b2a700000000, 0x6177a9be00000000,
-    0xa6e1e8f100000000, 0xe7d0f3e800000000, 0x2483dec300000000,
-    0x65b2c5da00000000, 0xaaae5d5d00000000, 0xeb9f464400000000,
-    0x28cc6b6f00000000, 0x69fd707600000000, 0xae6b313900000000,
-    0xef5a2a2000000000, 0x2c09070b00000000, 0x6d381c1200000000,
-    0xf33646df00000000, 0xb2075dc600000000, 0x715470ed00000000,
-    0x30656bf400000000, 0xf7f32abb00000000, 0xb6c231a200000000,
-    0x75911c8900000000, 0x34a0079000000000, 0xfbbc9f1700000000,
-    0xba8d840e00000000, 0x79dea92500000000, 0x38efb23c00000000,
-    0xff79f37300000000, 0xbe48e86a00000000, 0x7d1bc54100000000,
-    0x3c2ade5800000000, 0x054f79f000000000, 0x447e62e900000000,
-    0x872d4fc200000000, 0xc61c54db00000000, 0x018a159400000000,
-    0x40bb0e8d00000000, 0x83e823a600000000, 0xc2d938bf00000000,
-    0x0dc5a03800000000, 0x4cf4bb2100000000, 0x8fa7960a00000000,
-    0xce968d1300000000, 0x0900cc5c00000000, 0x4831d74500000000,
-    0x8b62fa6e00000000, 0xca53e17700000000, 0x545dbbba00000000,
-    0x156ca0a300000000, 0xd63f8d8800000000, 0x970e969100000000,
-    0x5098d7de00000000, 0x11a9ccc700000000, 0xd2fae1ec00000000,
-    0x93cbfaf500000000, 0x5cd7627200000000, 0x1de6796b00000000,
-    0xdeb5544000000000, 0x9f844f5900000000, 0x58120e1600000000,
-    0x1923150f00000000, 0xda70382400000000, 0x9b41233d00000000,
-    0xa76bfd6500000000, 0xe65ae67c00000000, 0x2509cb5700000000,
-    0x6438d04e00000000, 0xa3ae910100000000, 0xe29f8a1800000000,
-    0x21cca73300000000, 0x60fdbc2a00000000, 0xafe124ad00000000,
-    0xeed03fb400000000, 0x2d83129f00000000, 0x6cb2098600000000,
-    0xab2448c900000000, 0xea1553d000000000, 0x29467efb00000000,
-    0x687765e200000000, 0xf6793f2f00000000, 0xb748243600000000,
-    0x741b091d00000000, 0x352a120400000000, 0xf2bc534b00000000,
-    0xb38d485200000000, 0x70de657900000000, 0x31ef7e6000000000,
-    0xfef3e6e700000000, 0xbfc2fdfe00000000, 0x7c91d0d500000000,
-    0x3da0cbcc00000000, 0xfa368a8300000000, 0xbb07919a00000000,
-    0x7854bcb100000000, 0x3965a7a800000000, 0x4b98833b00000000,
-    0x0aa9982200000000, 0xc9fab50900000000, 0x88cbae1000000000,
-    0x4f5def5f00000000, 0x0e6cf44600000000, 0xcd3fd96d00000000,
-    0x8c0ec27400000000, 0x43125af300000000, 0x022341ea00000000,
-    0xc1706cc100000000, 0x804177d800000000, 0x47d7369700000000,
-    0x06e62d8e00000000, 0xc5b500a500000000, 0x84841bbc00000000,
-    0x1a8a417100000000, 0x5bbb5a6800000000, 0x98e8774300000000,
-    0xd9d96c5a00000000, 0x1e4f2d1500000000, 0x5f7e360c00000000,
-    0x9c2d1b2700000000, 0xdd1c003e00000000, 0x120098b900000000,
-    0x533183a000000000, 0x9062ae8b00000000, 0xd153b59200000000,
-    0x16c5f4dd00000000, 0x57f4efc400000000, 0x94a7c2ef00000000,
-    0xd596d9f600000000, 0xe9bc07ae00000000, 0xa88d1cb700000000,
-    0x6bde319c00000000, 0x2aef2a8500000000, 0xed796bca00000000,
-    0xac4870d300000000, 0x6f1b5df800000000, 0x2e2a46e100000000,
-    0xe136de6600000000, 0xa007c57f00000000, 0x6354e85400000000,
-    0x2265f34d00000000, 0xe5f3b20200000000, 0xa4c2a91b00000000,
-    0x6791843000000000, 0x26a09f2900000000, 0xb8aec5e400000000,
-    0xf99fdefd00000000, 0x3accf3d600000000, 0x7bfde8cf00000000,
-    0xbc6ba98000000000, 0xfd5ab29900000000, 0x3e099fb200000000,
-    0x7f3884ab00000000, 0xb0241c2c00000000, 0xf115073500000000,
-    0x32462a1e00000000, 0x7377310700000000, 0xb4e1704800000000,
-    0xf5d06b5100000000, 0x3683467a00000000, 0x77b25d6300000000,
-    0x4ed7facb00000000, 0x0fe6e1d200000000, 0xccb5ccf900000000,
-    0x8d84d7e000000000, 0x4a1296af00000000, 0x0b238db600000000,
-    0xc870a09d00000000, 0x8941bb8400000000, 0x465d230300000000,
-    0x076c381a00000000, 0xc43f153100000000, 0x850e0e2800000000,
-    0x42984f6700000000, 0x03a9547e00000000, 0xc0fa795500000000,
-    0x81cb624c00000000, 0x1fc5388100000000, 0x5ef4239800000000,
-    0x9da70eb300000000, 0xdc9615aa00000000, 0x1b0054e500000000,
-    0x5a314ffc00000000, 0x996262d700000000, 0xd85379ce00000000,
-    0x174fe14900000000, 0x567efa5000000000, 0x952dd77b00000000,
-    0xd41ccc6200000000, 0x138a8d2d00000000, 0x52bb963400000000,
-    0x91e8bb1f00000000, 0xd0d9a00600000000, 0xecf37e5e00000000,
-    0xadc2654700000000, 0x6e91486c00000000, 0x2fa0537500000000,
-    0xe836123a00000000, 0xa907092300000000, 0x6a54240800000000,
-    0x2b653f1100000000, 0xe479a79600000000, 0xa548bc8f00000000,
-    0x661b91a400000000, 0x272a8abd00000000, 0xe0bccbf200000000,
-    0xa18dd0eb00000000, 0x62defdc000000000, 0x23efe6d900000000,
-    0xbde1bc1400000000, 0xfcd0a70d00000000, 0x3f838a2600000000,
-    0x7eb2913f00000000, 0xb924d07000000000, 0xf815cb6900000000,
-    0x3b46e64200000000, 0x7a77fd5b00000000, 0xb56b65dc00000000,
-    0xf45a7ec500000000, 0x370953ee00000000, 0x763848f700000000,
-    0xb1ae09b800000000, 0xf09f12a100000000, 0x33cc3f8a00000000,
-    0x72fd249300000000},
-   {0x0000000000000000, 0x376ac20100000000, 0x6ed4840300000000,
-    0x59be460200000000, 0xdca8090700000000, 0xebc2cb0600000000,
-    0xb27c8d0400000000, 0x85164f0500000000, 0xb851130e00000000,
-    0x8f3bd10f00000000, 0xd685970d00000000, 0xe1ef550c00000000,
-    0x64f91a0900000000, 0x5393d80800000000, 0x0a2d9e0a00000000,
-    0x3d475c0b00000000, 0x70a3261c00000000, 0x47c9e41d00000000,
-    0x1e77a21f00000000, 0x291d601e00000000, 0xac0b2f1b00000000,
-    0x9b61ed1a00000000, 0xc2dfab1800000000, 0xf5b5691900000000,
-    0xc8f2351200000000, 0xff98f71300000000, 0xa626b11100000000,
-    0x914c731000000000, 0x145a3c1500000000, 0x2330fe1400000000,
-    0x7a8eb81600000000, 0x4de47a1700000000, 0xe0464d3800000000,
-    0xd72c8f3900000000, 0x8e92c93b00000000, 0xb9f80b3a00000000,
-    0x3cee443f00000000, 0x0b84863e00000000, 0x523ac03c00000000,
-    0x6550023d00000000, 0x58175e3600000000, 0x6f7d9c3700000000,
-    0x36c3da3500000000, 0x01a9183400000000, 0x84bf573100000000,
-    0xb3d5953000000000, 0xea6bd33200000000, 0xdd01113300000000,
-    0x90e56b2400000000, 0xa78fa92500000000, 0xfe31ef2700000000,
-    0xc95b2d2600000000, 0x4c4d622300000000, 0x7b27a02200000000,
-    0x2299e62000000000, 0x15f3242100000000, 0x28b4782a00000000,
-    0x1fdeba2b00000000, 0x4660fc2900000000, 0x710a3e2800000000,
-    0xf41c712d00000000, 0xc376b32c00000000, 0x9ac8f52e00000000,
-    0xada2372f00000000, 0xc08d9a7000000000, 0xf7e7587100000000,
-    0xae591e7300000000, 0x9933dc7200000000, 0x1c25937700000000,
-    0x2b4f517600000000, 0x72f1177400000000, 0x459bd57500000000,
-    0x78dc897e00000000, 0x4fb64b7f00000000, 0x16080d7d00000000,
-    0x2162cf7c00000000, 0xa474807900000000, 0x931e427800000000,
-    0xcaa0047a00000000, 0xfdcac67b00000000, 0xb02ebc6c00000000,
-    0x87447e6d00000000, 0xdefa386f00000000, 0xe990fa6e00000000,
-    0x6c86b56b00000000, 0x5bec776a00000000, 0x0252316800000000,
-    0x3538f36900000000, 0x087faf6200000000, 0x3f156d6300000000,
-    0x66ab2b6100000000, 0x51c1e96000000000, 0xd4d7a66500000000,
-    0xe3bd646400000000, 0xba03226600000000, 0x8d69e06700000000,
-    0x20cbd74800000000, 0x17a1154900000000, 0x4e1f534b00000000,
-    0x7975914a00000000, 0xfc63de4f00000000, 0xcb091c4e00000000,
-    0x92b75a4c00000000, 0xa5dd984d00000000, 0x989ac44600000000,
-    0xaff0064700000000, 0xf64e404500000000, 0xc124824400000000,
-    0x4432cd4100000000, 0x73580f4000000000, 0x2ae6494200000000,
-    0x1d8c8b4300000000, 0x5068f15400000000, 0x6702335500000000,
-    0x3ebc755700000000, 0x09d6b75600000000, 0x8cc0f85300000000,
-    0xbbaa3a5200000000, 0xe2147c5000000000, 0xd57ebe5100000000,
-    0xe839e25a00000000, 0xdf53205b00000000, 0x86ed665900000000,
-    0xb187a45800000000, 0x3491eb5d00000000, 0x03fb295c00000000,
-    0x5a456f5e00000000, 0x6d2fad5f00000000, 0x801b35e100000000,
-    0xb771f7e000000000, 0xeecfb1e200000000, 0xd9a573e300000000,
-    0x5cb33ce600000000, 0x6bd9fee700000000, 0x3267b8e500000000,
-    0x050d7ae400000000, 0x384a26ef00000000, 0x0f20e4ee00000000,
-    0x569ea2ec00000000, 0x61f460ed00000000, 0xe4e22fe800000000,
-    0xd388ede900000000, 0x8a36abeb00000000, 0xbd5c69ea00000000,
-    0xf0b813fd00000000, 0xc7d2d1fc00000000, 0x9e6c97fe00000000,
-    0xa90655ff00000000, 0x2c101afa00000000, 0x1b7ad8fb00000000,
-    0x42c49ef900000000, 0x75ae5cf800000000, 0x48e900f300000000,
-    0x7f83c2f200000000, 0x263d84f000000000, 0x115746f100000000,
-    0x944109f400000000, 0xa32bcbf500000000, 0xfa958df700000000,
-    0xcdff4ff600000000, 0x605d78d900000000, 0x5737bad800000000,
-    0x0e89fcda00000000, 0x39e33edb00000000, 0xbcf571de00000000,
-    0x8b9fb3df00000000, 0xd221f5dd00000000, 0xe54b37dc00000000,
-    0xd80c6bd700000000, 0xef66a9d600000000, 0xb6d8efd400000000,
-    0x81b22dd500000000, 0x04a462d000000000, 0x33cea0d100000000,
-    0x6a70e6d300000000, 0x5d1a24d200000000, 0x10fe5ec500000000,
-    0x27949cc400000000, 0x7e2adac600000000, 0x494018c700000000,
-    0xcc5657c200000000, 0xfb3c95c300000000, 0xa282d3c100000000,
-    0x95e811c000000000, 0xa8af4dcb00000000, 0x9fc58fca00000000,
-    0xc67bc9c800000000, 0xf1110bc900000000, 0x740744cc00000000,
-    0x436d86cd00000000, 0x1ad3c0cf00000000, 0x2db902ce00000000,
-    0x4096af9100000000, 0x77fc6d9000000000, 0x2e422b9200000000,
-    0x1928e99300000000, 0x9c3ea69600000000, 0xab54649700000000,
-    0xf2ea229500000000, 0xc580e09400000000, 0xf8c7bc9f00000000,
-    0xcfad7e9e00000000, 0x9613389c00000000, 0xa179fa9d00000000,
-    0x246fb59800000000, 0x1305779900000000, 0x4abb319b00000000,
-    0x7dd1f39a00000000, 0x3035898d00000000, 0x075f4b8c00000000,
-    0x5ee10d8e00000000, 0x698bcf8f00000000, 0xec9d808a00000000,
-    0xdbf7428b00000000, 0x8249048900000000, 0xb523c68800000000,
-    0x88649a8300000000, 0xbf0e588200000000, 0xe6b01e8000000000,
-    0xd1dadc8100000000, 0x54cc938400000000, 0x63a6518500000000,
-    0x3a18178700000000, 0x0d72d58600000000, 0xa0d0e2a900000000,
-    0x97ba20a800000000, 0xce0466aa00000000, 0xf96ea4ab00000000,
-    0x7c78ebae00000000, 0x4b1229af00000000, 0x12ac6fad00000000,
-    0x25c6adac00000000, 0x1881f1a700000000, 0x2feb33a600000000,
-    0x765575a400000000, 0x413fb7a500000000, 0xc429f8a000000000,
-    0xf3433aa100000000, 0xaafd7ca300000000, 0x9d97bea200000000,
-    0xd073c4b500000000, 0xe71906b400000000, 0xbea740b600000000,
-    0x89cd82b700000000, 0x0cdbcdb200000000, 0x3bb10fb300000000,
-    0x620f49b100000000, 0x55658bb000000000, 0x6822d7bb00000000,
-    0x5f4815ba00000000, 0x06f653b800000000, 0x319c91b900000000,
-    0xb48adebc00000000, 0x83e01cbd00000000, 0xda5e5abf00000000,
-    0xed3498be00000000},
-   {0x0000000000000000, 0x6567bcb800000000, 0x8bc809aa00000000,
-    0xeeafb51200000000, 0x5797628f00000000, 0x32f0de3700000000,
-    0xdc5f6b2500000000, 0xb938d79d00000000, 0xef28b4c500000000,
-    0x8a4f087d00000000, 0x64e0bd6f00000000, 0x018701d700000000,
-    0xb8bfd64a00000000, 0xddd86af200000000, 0x3377dfe000000000,
-    0x5610635800000000, 0x9f57195000000000, 0xfa30a5e800000000,
-    0x149f10fa00000000, 0x71f8ac4200000000, 0xc8c07bdf00000000,
-    0xada7c76700000000, 0x4308727500000000, 0x266fcecd00000000,
-    0x707fad9500000000, 0x1518112d00000000, 0xfbb7a43f00000000,
-    0x9ed0188700000000, 0x27e8cf1a00000000, 0x428f73a200000000,
-    0xac20c6b000000000, 0xc9477a0800000000, 0x3eaf32a000000000,
-    0x5bc88e1800000000, 0xb5673b0a00000000, 0xd00087b200000000,
-    0x6938502f00000000, 0x0c5fec9700000000, 0xe2f0598500000000,
-    0x8797e53d00000000, 0xd187866500000000, 0xb4e03add00000000,
-    0x5a4f8fcf00000000, 0x3f28337700000000, 0x8610e4ea00000000,
-    0xe377585200000000, 0x0dd8ed4000000000, 0x68bf51f800000000,
-    0xa1f82bf000000000, 0xc49f974800000000, 0x2a30225a00000000,
-    0x4f579ee200000000, 0xf66f497f00000000, 0x9308f5c700000000,
-    0x7da740d500000000, 0x18c0fc6d00000000, 0x4ed09f3500000000,
-    0x2bb7238d00000000, 0xc518969f00000000, 0xa07f2a2700000000,
-    0x1947fdba00000000, 0x7c20410200000000, 0x928ff41000000000,
-    0xf7e848a800000000, 0x3d58149b00000000, 0x583fa82300000000,
-    0xb6901d3100000000, 0xd3f7a18900000000, 0x6acf761400000000,
-    0x0fa8caac00000000, 0xe1077fbe00000000, 0x8460c30600000000,
-    0xd270a05e00000000, 0xb7171ce600000000, 0x59b8a9f400000000,
-    0x3cdf154c00000000, 0x85e7c2d100000000, 0xe0807e6900000000,
-    0x0e2fcb7b00000000, 0x6b4877c300000000, 0xa20f0dcb00000000,
-    0xc768b17300000000, 0x29c7046100000000, 0x4ca0b8d900000000,
-    0xf5986f4400000000, 0x90ffd3fc00000000, 0x7e5066ee00000000,
-    0x1b37da5600000000, 0x4d27b90e00000000, 0x284005b600000000,
-    0xc6efb0a400000000, 0xa3880c1c00000000, 0x1ab0db8100000000,
-    0x7fd7673900000000, 0x9178d22b00000000, 0xf41f6e9300000000,
-    0x03f7263b00000000, 0x66909a8300000000, 0x883f2f9100000000,
-    0xed58932900000000, 0x546044b400000000, 0x3107f80c00000000,
-    0xdfa84d1e00000000, 0xbacff1a600000000, 0xecdf92fe00000000,
-    0x89b82e4600000000, 0x67179b5400000000, 0x027027ec00000000,
-    0xbb48f07100000000, 0xde2f4cc900000000, 0x3080f9db00000000,
-    0x55e7456300000000, 0x9ca03f6b00000000, 0xf9c783d300000000,
-    0x176836c100000000, 0x720f8a7900000000, 0xcb375de400000000,
-    0xae50e15c00000000, 0x40ff544e00000000, 0x2598e8f600000000,
-    0x73888bae00000000, 0x16ef371600000000, 0xf840820400000000,
-    0x9d273ebc00000000, 0x241fe92100000000, 0x4178559900000000,
-    0xafd7e08b00000000, 0xcab05c3300000000, 0x3bb659ed00000000,
-    0x5ed1e55500000000, 0xb07e504700000000, 0xd519ecff00000000,
-    0x6c213b6200000000, 0x094687da00000000, 0xe7e932c800000000,
-    0x828e8e7000000000, 0xd49eed2800000000, 0xb1f9519000000000,
-    0x5f56e48200000000, 0x3a31583a00000000, 0x83098fa700000000,
-    0xe66e331f00000000, 0x08c1860d00000000, 0x6da63ab500000000,
-    0xa4e140bd00000000, 0xc186fc0500000000, 0x2f29491700000000,
-    0x4a4ef5af00000000, 0xf376223200000000, 0x96119e8a00000000,
-    0x78be2b9800000000, 0x1dd9972000000000, 0x4bc9f47800000000,
-    0x2eae48c000000000, 0xc001fdd200000000, 0xa566416a00000000,
-    0x1c5e96f700000000, 0x79392a4f00000000, 0x97969f5d00000000,
-    0xf2f123e500000000, 0x05196b4d00000000, 0x607ed7f500000000,
-    0x8ed162e700000000, 0xebb6de5f00000000, 0x528e09c200000000,
-    0x37e9b57a00000000, 0xd946006800000000, 0xbc21bcd000000000,
-    0xea31df8800000000, 0x8f56633000000000, 0x61f9d62200000000,
-    0x049e6a9a00000000, 0xbda6bd0700000000, 0xd8c101bf00000000,
-    0x366eb4ad00000000, 0x5309081500000000, 0x9a4e721d00000000,
-    0xff29cea500000000, 0x11867bb700000000, 0x74e1c70f00000000,
-    0xcdd9109200000000, 0xa8beac2a00000000, 0x4611193800000000,
-    0x2376a58000000000, 0x7566c6d800000000, 0x10017a6000000000,
-    0xfeaecf7200000000, 0x9bc973ca00000000, 0x22f1a45700000000,
-    0x479618ef00000000, 0xa939adfd00000000, 0xcc5e114500000000,
-    0x06ee4d7600000000, 0x6389f1ce00000000, 0x8d2644dc00000000,
-    0xe841f86400000000, 0x51792ff900000000, 0x341e934100000000,
-    0xdab1265300000000, 0xbfd69aeb00000000, 0xe9c6f9b300000000,
-    0x8ca1450b00000000, 0x620ef01900000000, 0x07694ca100000000,
-    0xbe519b3c00000000, 0xdb36278400000000, 0x3599929600000000,
-    0x50fe2e2e00000000, 0x99b9542600000000, 0xfcdee89e00000000,
-    0x12715d8c00000000, 0x7716e13400000000, 0xce2e36a900000000,
-    0xab498a1100000000, 0x45e63f0300000000, 0x208183bb00000000,
-    0x7691e0e300000000, 0x13f65c5b00000000, 0xfd59e94900000000,
-    0x983e55f100000000, 0x2106826c00000000, 0x44613ed400000000,
-    0xaace8bc600000000, 0xcfa9377e00000000, 0x38417fd600000000,
-    0x5d26c36e00000000, 0xb389767c00000000, 0xd6eecac400000000,
-    0x6fd61d5900000000, 0x0ab1a1e100000000, 0xe41e14f300000000,
-    0x8179a84b00000000, 0xd769cb1300000000, 0xb20e77ab00000000,
-    0x5ca1c2b900000000, 0x39c67e0100000000, 0x80fea99c00000000,
-    0xe599152400000000, 0x0b36a03600000000, 0x6e511c8e00000000,
-    0xa716668600000000, 0xc271da3e00000000, 0x2cde6f2c00000000,
-    0x49b9d39400000000, 0xf081040900000000, 0x95e6b8b100000000,
-    0x7b490da300000000, 0x1e2eb11b00000000, 0x483ed24300000000,
-    0x2d596efb00000000, 0xc3f6dbe900000000, 0xa691675100000000,
-    0x1fa9b0cc00000000, 0x7ace0c7400000000, 0x9461b96600000000,
-    0xf10605de00000000},
-   {0x0000000000000000, 0xb029603d00000000, 0x6053c07a00000000,
-    0xd07aa04700000000, 0xc0a680f500000000, 0x708fe0c800000000,
-    0xa0f5408f00000000, 0x10dc20b200000000, 0xc14b703000000000,
-    0x7162100d00000000, 0xa118b04a00000000, 0x1131d07700000000,
-    0x01edf0c500000000, 0xb1c490f800000000, 0x61be30bf00000000,
-    0xd197508200000000, 0x8297e06000000000, 0x32be805d00000000,
-    0xe2c4201a00000000, 0x52ed402700000000, 0x4231609500000000,
-    0xf21800a800000000, 0x2262a0ef00000000, 0x924bc0d200000000,
-    0x43dc905000000000, 0xf3f5f06d00000000, 0x238f502a00000000,
-    0x93a6301700000000, 0x837a10a500000000, 0x3353709800000000,
-    0xe329d0df00000000, 0x5300b0e200000000, 0x042fc1c100000000,
-    0xb406a1fc00000000, 0x647c01bb00000000, 0xd455618600000000,
-    0xc489413400000000, 0x74a0210900000000, 0xa4da814e00000000,
-    0x14f3e17300000000, 0xc564b1f100000000, 0x754dd1cc00000000,
-    0xa537718b00000000, 0x151e11b600000000, 0x05c2310400000000,
-    0xb5eb513900000000, 0x6591f17e00000000, 0xd5b8914300000000,
-    0x86b821a100000000, 0x3691419c00000000, 0xe6ebe1db00000000,
-    0x56c281e600000000, 0x461ea15400000000, 0xf637c16900000000,
-    0x264d612e00000000, 0x9664011300000000, 0x47f3519100000000,
-    0xf7da31ac00000000, 0x27a091eb00000000, 0x9789f1d600000000,
-    0x8755d16400000000, 0x377cb15900000000, 0xe706111e00000000,
-    0x572f712300000000, 0x4958f35800000000, 0xf971936500000000,
-    0x290b332200000000, 0x9922531f00000000, 0x89fe73ad00000000,
-    0x39d7139000000000, 0xe9adb3d700000000, 0x5984d3ea00000000,
-    0x8813836800000000, 0x383ae35500000000, 0xe840431200000000,
-    0x5869232f00000000, 0x48b5039d00000000, 0xf89c63a000000000,
-    0x28e6c3e700000000, 0x98cfa3da00000000, 0xcbcf133800000000,
-    0x7be6730500000000, 0xab9cd34200000000, 0x1bb5b37f00000000,
-    0x0b6993cd00000000, 0xbb40f3f000000000, 0x6b3a53b700000000,
-    0xdb13338a00000000, 0x0a84630800000000, 0xbaad033500000000,
-    0x6ad7a37200000000, 0xdafec34f00000000, 0xca22e3fd00000000,
-    0x7a0b83c000000000, 0xaa71238700000000, 0x1a5843ba00000000,
-    0x4d77329900000000, 0xfd5e52a400000000, 0x2d24f2e300000000,
-    0x9d0d92de00000000, 0x8dd1b26c00000000, 0x3df8d25100000000,
-    0xed82721600000000, 0x5dab122b00000000, 0x8c3c42a900000000,
-    0x3c15229400000000, 0xec6f82d300000000, 0x5c46e2ee00000000,
-    0x4c9ac25c00000000, 0xfcb3a26100000000, 0x2cc9022600000000,
-    0x9ce0621b00000000, 0xcfe0d2f900000000, 0x7fc9b2c400000000,
-    0xafb3128300000000, 0x1f9a72be00000000, 0x0f46520c00000000,
-    0xbf6f323100000000, 0x6f15927600000000, 0xdf3cf24b00000000,
-    0x0eaba2c900000000, 0xbe82c2f400000000, 0x6ef862b300000000,
-    0xded1028e00000000, 0xce0d223c00000000, 0x7e24420100000000,
-    0xae5ee24600000000, 0x1e77827b00000000, 0x92b0e6b100000000,
-    0x2299868c00000000, 0xf2e326cb00000000, 0x42ca46f600000000,
-    0x5216664400000000, 0xe23f067900000000, 0x3245a63e00000000,
-    0x826cc60300000000, 0x53fb968100000000, 0xe3d2f6bc00000000,
-    0x33a856fb00000000, 0x838136c600000000, 0x935d167400000000,
-    0x2374764900000000, 0xf30ed60e00000000, 0x4327b63300000000,
-    0x102706d100000000, 0xa00e66ec00000000, 0x7074c6ab00000000,
-    0xc05da69600000000, 0xd081862400000000, 0x60a8e61900000000,
-    0xb0d2465e00000000, 0x00fb266300000000, 0xd16c76e100000000,
-    0x614516dc00000000, 0xb13fb69b00000000, 0x0116d6a600000000,
-    0x11caf61400000000, 0xa1e3962900000000, 0x7199366e00000000,
-    0xc1b0565300000000, 0x969f277000000000, 0x26b6474d00000000,
-    0xf6cce70a00000000, 0x46e5873700000000, 0x5639a78500000000,
-    0xe610c7b800000000, 0x366a67ff00000000, 0x864307c200000000,
-    0x57d4574000000000, 0xe7fd377d00000000, 0x3787973a00000000,
-    0x87aef70700000000, 0x9772d7b500000000, 0x275bb78800000000,
-    0xf72117cf00000000, 0x470877f200000000, 0x1408c71000000000,
-    0xa421a72d00000000, 0x745b076a00000000, 0xc472675700000000,
-    0xd4ae47e500000000, 0x648727d800000000, 0xb4fd879f00000000,
-    0x04d4e7a200000000, 0xd543b72000000000, 0x656ad71d00000000,
-    0xb510775a00000000, 0x0539176700000000, 0x15e537d500000000,
-    0xa5cc57e800000000, 0x75b6f7af00000000, 0xc59f979200000000,
-    0xdbe815e900000000, 0x6bc175d400000000, 0xbbbbd59300000000,
-    0x0b92b5ae00000000, 0x1b4e951c00000000, 0xab67f52100000000,
-    0x7b1d556600000000, 0xcb34355b00000000, 0x1aa365d900000000,
-    0xaa8a05e400000000, 0x7af0a5a300000000, 0xcad9c59e00000000,
-    0xda05e52c00000000, 0x6a2c851100000000, 0xba56255600000000,
-    0x0a7f456b00000000, 0x597ff58900000000, 0xe95695b400000000,
-    0x392c35f300000000, 0x890555ce00000000, 0x99d9757c00000000,
-    0x29f0154100000000, 0xf98ab50600000000, 0x49a3d53b00000000,
-    0x983485b900000000, 0x281de58400000000, 0xf86745c300000000,
-    0x484e25fe00000000, 0x5892054c00000000, 0xe8bb657100000000,
-    0x38c1c53600000000, 0x88e8a50b00000000, 0xdfc7d42800000000,
-    0x6feeb41500000000, 0xbf94145200000000, 0x0fbd746f00000000,
-    0x1f6154dd00000000, 0xaf4834e000000000, 0x7f3294a700000000,
-    0xcf1bf49a00000000, 0x1e8ca41800000000, 0xaea5c42500000000,
-    0x7edf646200000000, 0xcef6045f00000000, 0xde2a24ed00000000,
-    0x6e0344d000000000, 0xbe79e49700000000, 0x0e5084aa00000000,
-    0x5d50344800000000, 0xed79547500000000, 0x3d03f43200000000,
-    0x8d2a940f00000000, 0x9df6b4bd00000000, 0x2ddfd48000000000,
-    0xfda574c700000000, 0x4d8c14fa00000000, 0x9c1b447800000000,
-    0x2c32244500000000, 0xfc48840200000000, 0x4c61e43f00000000,
-    0x5cbdc48d00000000, 0xec94a4b000000000, 0x3cee04f700000000,
-    0x8cc764ca00000000},
-   {0x0000000000000000, 0xa5d35ccb00000000, 0x0ba1c84d00000000,
-    0xae72948600000000, 0x1642919b00000000, 0xb391cd5000000000,
-    0x1de359d600000000, 0xb830051d00000000, 0x6d8253ec00000000,
-    0xc8510f2700000000, 0x66239ba100000000, 0xc3f0c76a00000000,
-    0x7bc0c27700000000, 0xde139ebc00000000, 0x70610a3a00000000,
-    0xd5b256f100000000, 0x9b02d60300000000, 0x3ed18ac800000000,
-    0x90a31e4e00000000, 0x3570428500000000, 0x8d40479800000000,
-    0x28931b5300000000, 0x86e18fd500000000, 0x2332d31e00000000,
-    0xf68085ef00000000, 0x5353d92400000000, 0xfd214da200000000,
-    0x58f2116900000000, 0xe0c2147400000000, 0x451148bf00000000,
-    0xeb63dc3900000000, 0x4eb080f200000000, 0x3605ac0700000000,
-    0x93d6f0cc00000000, 0x3da4644a00000000, 0x9877388100000000,
-    0x20473d9c00000000, 0x8594615700000000, 0x2be6f5d100000000,
-    0x8e35a91a00000000, 0x5b87ffeb00000000, 0xfe54a32000000000,
-    0x502637a600000000, 0xf5f56b6d00000000, 0x4dc56e7000000000,
-    0xe81632bb00000000, 0x4664a63d00000000, 0xe3b7faf600000000,
-    0xad077a0400000000, 0x08d426cf00000000, 0xa6a6b24900000000,
-    0x0375ee8200000000, 0xbb45eb9f00000000, 0x1e96b75400000000,
-    0xb0e423d200000000, 0x15377f1900000000, 0xc08529e800000000,
-    0x6556752300000000, 0xcb24e1a500000000, 0x6ef7bd6e00000000,
-    0xd6c7b87300000000, 0x7314e4b800000000, 0xdd66703e00000000,
-    0x78b52cf500000000, 0x6c0a580f00000000, 0xc9d904c400000000,
-    0x67ab904200000000, 0xc278cc8900000000, 0x7a48c99400000000,
-    0xdf9b955f00000000, 0x71e901d900000000, 0xd43a5d1200000000,
-    0x01880be300000000, 0xa45b572800000000, 0x0a29c3ae00000000,
-    0xaffa9f6500000000, 0x17ca9a7800000000, 0xb219c6b300000000,
-    0x1c6b523500000000, 0xb9b80efe00000000, 0xf7088e0c00000000,
-    0x52dbd2c700000000, 0xfca9464100000000, 0x597a1a8a00000000,
-    0xe14a1f9700000000, 0x4499435c00000000, 0xeaebd7da00000000,
-    0x4f388b1100000000, 0x9a8adde000000000, 0x3f59812b00000000,
-    0x912b15ad00000000, 0x34f8496600000000, 0x8cc84c7b00000000,
-    0x291b10b000000000, 0x8769843600000000, 0x22bad8fd00000000,
-    0x5a0ff40800000000, 0xffdca8c300000000, 0x51ae3c4500000000,
-    0xf47d608e00000000, 0x4c4d659300000000, 0xe99e395800000000,
-    0x47ecadde00000000, 0xe23ff11500000000, 0x378da7e400000000,
-    0x925efb2f00000000, 0x3c2c6fa900000000, 0x99ff336200000000,
-    0x21cf367f00000000, 0x841c6ab400000000, 0x2a6efe3200000000,
-    0x8fbda2f900000000, 0xc10d220b00000000, 0x64de7ec000000000,
-    0xcaacea4600000000, 0x6f7fb68d00000000, 0xd74fb39000000000,
-    0x729cef5b00000000, 0xdcee7bdd00000000, 0x793d271600000000,
-    0xac8f71e700000000, 0x095c2d2c00000000, 0xa72eb9aa00000000,
-    0x02fde56100000000, 0xbacde07c00000000, 0x1f1ebcb700000000,
-    0xb16c283100000000, 0x14bf74fa00000000, 0xd814b01e00000000,
-    0x7dc7ecd500000000, 0xd3b5785300000000, 0x7666249800000000,
-    0xce56218500000000, 0x6b857d4e00000000, 0xc5f7e9c800000000,
-    0x6024b50300000000, 0xb596e3f200000000, 0x1045bf3900000000,
-    0xbe372bbf00000000, 0x1be4777400000000, 0xa3d4726900000000,
-    0x06072ea200000000, 0xa875ba2400000000, 0x0da6e6ef00000000,
-    0x4316661d00000000, 0xe6c53ad600000000, 0x48b7ae5000000000,
-    0xed64f29b00000000, 0x5554f78600000000, 0xf087ab4d00000000,
-    0x5ef53fcb00000000, 0xfb26630000000000, 0x2e9435f100000000,
-    0x8b47693a00000000, 0x2535fdbc00000000, 0x80e6a17700000000,
-    0x38d6a46a00000000, 0x9d05f8a100000000, 0x33776c2700000000,
-    0x96a430ec00000000, 0xee111c1900000000, 0x4bc240d200000000,
-    0xe5b0d45400000000, 0x4063889f00000000, 0xf8538d8200000000,
-    0x5d80d14900000000, 0xf3f245cf00000000, 0x5621190400000000,
-    0x83934ff500000000, 0x2640133e00000000, 0x883287b800000000,
-    0x2de1db7300000000, 0x95d1de6e00000000, 0x300282a500000000,
-    0x9e70162300000000, 0x3ba34ae800000000, 0x7513ca1a00000000,
-    0xd0c096d100000000, 0x7eb2025700000000, 0xdb615e9c00000000,
-    0x63515b8100000000, 0xc682074a00000000, 0x68f093cc00000000,
-    0xcd23cf0700000000, 0x189199f600000000, 0xbd42c53d00000000,
-    0x133051bb00000000, 0xb6e30d7000000000, 0x0ed3086d00000000,
-    0xab0054a600000000, 0x0572c02000000000, 0xa0a19ceb00000000,
-    0xb41ee81100000000, 0x11cdb4da00000000, 0xbfbf205c00000000,
-    0x1a6c7c9700000000, 0xa25c798a00000000, 0x078f254100000000,
-    0xa9fdb1c700000000, 0x0c2eed0c00000000, 0xd99cbbfd00000000,
-    0x7c4fe73600000000, 0xd23d73b000000000, 0x77ee2f7b00000000,
-    0xcfde2a6600000000, 0x6a0d76ad00000000, 0xc47fe22b00000000,
-    0x61acbee000000000, 0x2f1c3e1200000000, 0x8acf62d900000000,
-    0x24bdf65f00000000, 0x816eaa9400000000, 0x395eaf8900000000,
-    0x9c8df34200000000, 0x32ff67c400000000, 0x972c3b0f00000000,
-    0x429e6dfe00000000, 0xe74d313500000000, 0x493fa5b300000000,
-    0xececf97800000000, 0x54dcfc6500000000, 0xf10fa0ae00000000,
-    0x5f7d342800000000, 0xfaae68e300000000, 0x821b441600000000,
-    0x27c818dd00000000, 0x89ba8c5b00000000, 0x2c69d09000000000,
-    0x9459d58d00000000, 0x318a894600000000, 0x9ff81dc000000000,
-    0x3a2b410b00000000, 0xef9917fa00000000, 0x4a4a4b3100000000,
-    0xe438dfb700000000, 0x41eb837c00000000, 0xf9db866100000000,
-    0x5c08daaa00000000, 0xf27a4e2c00000000, 0x57a912e700000000,
-    0x1919921500000000, 0xbccacede00000000, 0x12b85a5800000000,
-    0xb76b069300000000, 0x0f5b038e00000000, 0xaa885f4500000000,
-    0x04facbc300000000, 0xa129970800000000, 0x749bc1f900000000,
-    0xd1489d3200000000, 0x7f3a09b400000000, 0xdae9557f00000000,
-    0x62d9506200000000, 0xc70a0ca900000000, 0x6978982f00000000,
-    0xccabc4e400000000},
-   {0x0000000000000000, 0xb40b77a600000000, 0x29119f9700000000,
-    0x9d1ae83100000000, 0x13244ff400000000, 0xa72f385200000000,
-    0x3a35d06300000000, 0x8e3ea7c500000000, 0x674eef3300000000,
-    0xd345989500000000, 0x4e5f70a400000000, 0xfa54070200000000,
-    0x746aa0c700000000, 0xc061d76100000000, 0x5d7b3f5000000000,
-    0xe97048f600000000, 0xce9cde6700000000, 0x7a97a9c100000000,
-    0xe78d41f000000000, 0x5386365600000000, 0xddb8919300000000,
-    0x69b3e63500000000, 0xf4a90e0400000000, 0x40a279a200000000,
-    0xa9d2315400000000, 0x1dd946f200000000, 0x80c3aec300000000,
-    0x34c8d96500000000, 0xbaf67ea000000000, 0x0efd090600000000,
-    0x93e7e13700000000, 0x27ec969100000000, 0x9c39bdcf00000000,
-    0x2832ca6900000000, 0xb528225800000000, 0x012355fe00000000,
-    0x8f1df23b00000000, 0x3b16859d00000000, 0xa60c6dac00000000,
-    0x12071a0a00000000, 0xfb7752fc00000000, 0x4f7c255a00000000,
-    0xd266cd6b00000000, 0x666dbacd00000000, 0xe8531d0800000000,
-    0x5c586aae00000000, 0xc142829f00000000, 0x7549f53900000000,
-    0x52a563a800000000, 0xe6ae140e00000000, 0x7bb4fc3f00000000,
-    0xcfbf8b9900000000, 0x41812c5c00000000, 0xf58a5bfa00000000,
-    0x6890b3cb00000000, 0xdc9bc46d00000000, 0x35eb8c9b00000000,
-    0x81e0fb3d00000000, 0x1cfa130c00000000, 0xa8f164aa00000000,
-    0x26cfc36f00000000, 0x92c4b4c900000000, 0x0fde5cf800000000,
-    0xbbd52b5e00000000, 0x79750b4400000000, 0xcd7e7ce200000000,
-    0x506494d300000000, 0xe46fe37500000000, 0x6a5144b000000000,
-    0xde5a331600000000, 0x4340db2700000000, 0xf74bac8100000000,
-    0x1e3be47700000000, 0xaa3093d100000000, 0x372a7be000000000,
-    0x83210c4600000000, 0x0d1fab8300000000, 0xb914dc2500000000,
-    0x240e341400000000, 0x900543b200000000, 0xb7e9d52300000000,
-    0x03e2a28500000000, 0x9ef84ab400000000, 0x2af33d1200000000,
-    0xa4cd9ad700000000, 0x10c6ed7100000000, 0x8ddc054000000000,
-    0x39d772e600000000, 0xd0a73a1000000000, 0x64ac4db600000000,
-    0xf9b6a58700000000, 0x4dbdd22100000000, 0xc38375e400000000,
-    0x7788024200000000, 0xea92ea7300000000, 0x5e999dd500000000,
-    0xe54cb68b00000000, 0x5147c12d00000000, 0xcc5d291c00000000,
-    0x78565eba00000000, 0xf668f97f00000000, 0x42638ed900000000,
-    0xdf7966e800000000, 0x6b72114e00000000, 0x820259b800000000,
-    0x36092e1e00000000, 0xab13c62f00000000, 0x1f18b18900000000,
-    0x9126164c00000000, 0x252d61ea00000000, 0xb83789db00000000,
-    0x0c3cfe7d00000000, 0x2bd068ec00000000, 0x9fdb1f4a00000000,
-    0x02c1f77b00000000, 0xb6ca80dd00000000, 0x38f4271800000000,
-    0x8cff50be00000000, 0x11e5b88f00000000, 0xa5eecf2900000000,
-    0x4c9e87df00000000, 0xf895f07900000000, 0x658f184800000000,
-    0xd1846fee00000000, 0x5fbac82b00000000, 0xebb1bf8d00000000,
-    0x76ab57bc00000000, 0xc2a0201a00000000, 0xf2ea168800000000,
-    0x46e1612e00000000, 0xdbfb891f00000000, 0x6ff0feb900000000,
-    0xe1ce597c00000000, 0x55c52eda00000000, 0xc8dfc6eb00000000,
-    0x7cd4b14d00000000, 0x95a4f9bb00000000, 0x21af8e1d00000000,
-    0xbcb5662c00000000, 0x08be118a00000000, 0x8680b64f00000000,
-    0x328bc1e900000000, 0xaf9129d800000000, 0x1b9a5e7e00000000,
-    0x3c76c8ef00000000, 0x887dbf4900000000, 0x1567577800000000,
-    0xa16c20de00000000, 0x2f52871b00000000, 0x9b59f0bd00000000,
-    0x0643188c00000000, 0xb2486f2a00000000, 0x5b3827dc00000000,
-    0xef33507a00000000, 0x7229b84b00000000, 0xc622cfed00000000,
-    0x481c682800000000, 0xfc171f8e00000000, 0x610df7bf00000000,
-    0xd506801900000000, 0x6ed3ab4700000000, 0xdad8dce100000000,
-    0x47c234d000000000, 0xf3c9437600000000, 0x7df7e4b300000000,
-    0xc9fc931500000000, 0x54e67b2400000000, 0xe0ed0c8200000000,
-    0x099d447400000000, 0xbd9633d200000000, 0x208cdbe300000000,
-    0x9487ac4500000000, 0x1ab90b8000000000, 0xaeb27c2600000000,
-    0x33a8941700000000, 0x87a3e3b100000000, 0xa04f752000000000,
-    0x1444028600000000, 0x895eeab700000000, 0x3d559d1100000000,
-    0xb36b3ad400000000, 0x07604d7200000000, 0x9a7aa54300000000,
-    0x2e71d2e500000000, 0xc7019a1300000000, 0x730aedb500000000,
-    0xee10058400000000, 0x5a1b722200000000, 0xd425d5e700000000,
-    0x602ea24100000000, 0xfd344a7000000000, 0x493f3dd600000000,
-    0x8b9f1dcc00000000, 0x3f946a6a00000000, 0xa28e825b00000000,
-    0x1685f5fd00000000, 0x98bb523800000000, 0x2cb0259e00000000,
-    0xb1aacdaf00000000, 0x05a1ba0900000000, 0xecd1f2ff00000000,
-    0x58da855900000000, 0xc5c06d6800000000, 0x71cb1ace00000000,
-    0xfff5bd0b00000000, 0x4bfecaad00000000, 0xd6e4229c00000000,
-    0x62ef553a00000000, 0x4503c3ab00000000, 0xf108b40d00000000,
-    0x6c125c3c00000000, 0xd8192b9a00000000, 0x56278c5f00000000,
-    0xe22cfbf900000000, 0x7f3613c800000000, 0xcb3d646e00000000,
-    0x224d2c9800000000, 0x96465b3e00000000, 0x0b5cb30f00000000,
-    0xbf57c4a900000000, 0x3169636c00000000, 0x856214ca00000000,
-    0x1878fcfb00000000, 0xac738b5d00000000, 0x17a6a00300000000,
-    0xa3add7a500000000, 0x3eb73f9400000000, 0x8abc483200000000,
-    0x0482eff700000000, 0xb089985100000000, 0x2d93706000000000,
-    0x999807c600000000, 0x70e84f3000000000, 0xc4e3389600000000,
-    0x59f9d0a700000000, 0xedf2a70100000000, 0x63cc00c400000000,
-    0xd7c7776200000000, 0x4add9f5300000000, 0xfed6e8f500000000,
-    0xd93a7e6400000000, 0x6d3109c200000000, 0xf02be1f300000000,
-    0x4420965500000000, 0xca1e319000000000, 0x7e15463600000000,
-    0xe30fae0700000000, 0x5704d9a100000000, 0xbe74915700000000,
-    0x0a7fe6f100000000, 0x97650ec000000000, 0x236e796600000000,
-    0xad50dea300000000, 0x195ba90500000000, 0x8441413400000000,
-    0x304a369200000000},
-   {0x0000000000000000, 0x9e00aacc00000000, 0x7d07254200000000,
-    0xe3078f8e00000000, 0xfa0e4a8400000000, 0x640ee04800000000,
-    0x87096fc600000000, 0x1909c50a00000000, 0xb51be5d300000000,
-    0x2b1b4f1f00000000, 0xc81cc09100000000, 0x561c6a5d00000000,
-    0x4f15af5700000000, 0xd115059b00000000, 0x32128a1500000000,
-    0xac1220d900000000, 0x2b31bb7c00000000, 0xb53111b000000000,
-    0x56369e3e00000000, 0xc83634f200000000, 0xd13ff1f800000000,
-    0x4f3f5b3400000000, 0xac38d4ba00000000, 0x32387e7600000000,
-    0x9e2a5eaf00000000, 0x002af46300000000, 0xe32d7bed00000000,
-    0x7d2dd12100000000, 0x6424142b00000000, 0xfa24bee700000000,
-    0x1923316900000000, 0x87239ba500000000, 0x566276f900000000,
-    0xc862dc3500000000, 0x2b6553bb00000000, 0xb565f97700000000,
-    0xac6c3c7d00000000, 0x326c96b100000000, 0xd16b193f00000000,
-    0x4f6bb3f300000000, 0xe379932a00000000, 0x7d7939e600000000,
-    0x9e7eb66800000000, 0x007e1ca400000000, 0x1977d9ae00000000,
-    0x8777736200000000, 0x6470fcec00000000, 0xfa70562000000000,
-    0x7d53cd8500000000, 0xe353674900000000, 0x0054e8c700000000,
-    0x9e54420b00000000, 0x875d870100000000, 0x195d2dcd00000000,
-    0xfa5aa24300000000, 0x645a088f00000000, 0xc848285600000000,
-    0x5648829a00000000, 0xb54f0d1400000000, 0x2b4fa7d800000000,
-    0x324662d200000000, 0xac46c81e00000000, 0x4f41479000000000,
-    0xd141ed5c00000000, 0xedc29d2900000000, 0x73c237e500000000,
-    0x90c5b86b00000000, 0x0ec512a700000000, 0x17ccd7ad00000000,
-    0x89cc7d6100000000, 0x6acbf2ef00000000, 0xf4cb582300000000,
-    0x58d978fa00000000, 0xc6d9d23600000000, 0x25de5db800000000,
-    0xbbdef77400000000, 0xa2d7327e00000000, 0x3cd798b200000000,
-    0xdfd0173c00000000, 0x41d0bdf000000000, 0xc6f3265500000000,
-    0x58f38c9900000000, 0xbbf4031700000000, 0x25f4a9db00000000,
-    0x3cfd6cd100000000, 0xa2fdc61d00000000, 0x41fa499300000000,
-    0xdffae35f00000000, 0x73e8c38600000000, 0xede8694a00000000,
-    0x0eefe6c400000000, 0x90ef4c0800000000, 0x89e6890200000000,
-    0x17e623ce00000000, 0xf4e1ac4000000000, 0x6ae1068c00000000,
-    0xbba0ebd000000000, 0x25a0411c00000000, 0xc6a7ce9200000000,
-    0x58a7645e00000000, 0x41aea15400000000, 0xdfae0b9800000000,
-    0x3ca9841600000000, 0xa2a92eda00000000, 0x0ebb0e0300000000,
-    0x90bba4cf00000000, 0x73bc2b4100000000, 0xedbc818d00000000,
-    0xf4b5448700000000, 0x6ab5ee4b00000000, 0x89b261c500000000,
-    0x17b2cb0900000000, 0x909150ac00000000, 0x0e91fa6000000000,
-    0xed9675ee00000000, 0x7396df2200000000, 0x6a9f1a2800000000,
-    0xf49fb0e400000000, 0x17983f6a00000000, 0x899895a600000000,
-    0x258ab57f00000000, 0xbb8a1fb300000000, 0x588d903d00000000,
-    0xc68d3af100000000, 0xdf84fffb00000000, 0x4184553700000000,
-    0xa283dab900000000, 0x3c83707500000000, 0xda853b5300000000,
-    0x4485919f00000000, 0xa7821e1100000000, 0x3982b4dd00000000,
-    0x208b71d700000000, 0xbe8bdb1b00000000, 0x5d8c549500000000,
-    0xc38cfe5900000000, 0x6f9ede8000000000, 0xf19e744c00000000,
-    0x1299fbc200000000, 0x8c99510e00000000, 0x9590940400000000,
-    0x0b903ec800000000, 0xe897b14600000000, 0x76971b8a00000000,
-    0xf1b4802f00000000, 0x6fb42ae300000000, 0x8cb3a56d00000000,
-    0x12b30fa100000000, 0x0bbacaab00000000, 0x95ba606700000000,
-    0x76bdefe900000000, 0xe8bd452500000000, 0x44af65fc00000000,
-    0xdaafcf3000000000, 0x39a840be00000000, 0xa7a8ea7200000000,
-    0xbea12f7800000000, 0x20a185b400000000, 0xc3a60a3a00000000,
-    0x5da6a0f600000000, 0x8ce74daa00000000, 0x12e7e76600000000,
-    0xf1e068e800000000, 0x6fe0c22400000000, 0x76e9072e00000000,
-    0xe8e9ade200000000, 0x0bee226c00000000, 0x95ee88a000000000,
-    0x39fca87900000000, 0xa7fc02b500000000, 0x44fb8d3b00000000,
-    0xdafb27f700000000, 0xc3f2e2fd00000000, 0x5df2483100000000,
-    0xbef5c7bf00000000, 0x20f56d7300000000, 0xa7d6f6d600000000,
-    0x39d65c1a00000000, 0xdad1d39400000000, 0x44d1795800000000,
-    0x5dd8bc5200000000, 0xc3d8169e00000000, 0x20df991000000000,
-    0xbedf33dc00000000, 0x12cd130500000000, 0x8ccdb9c900000000,
-    0x6fca364700000000, 0xf1ca9c8b00000000, 0xe8c3598100000000,
-    0x76c3f34d00000000, 0x95c47cc300000000, 0x0bc4d60f00000000,
-    0x3747a67a00000000, 0xa9470cb600000000, 0x4a40833800000000,
-    0xd44029f400000000, 0xcd49ecfe00000000, 0x5349463200000000,
-    0xb04ec9bc00000000, 0x2e4e637000000000, 0x825c43a900000000,
-    0x1c5ce96500000000, 0xff5b66eb00000000, 0x615bcc2700000000,
-    0x7852092d00000000, 0xe652a3e100000000, 0x05552c6f00000000,
-    0x9b5586a300000000, 0x1c761d0600000000, 0x8276b7ca00000000,
-    0x6171384400000000, 0xff71928800000000, 0xe678578200000000,
-    0x7878fd4e00000000, 0x9b7f72c000000000, 0x057fd80c00000000,
-    0xa96df8d500000000, 0x376d521900000000, 0xd46add9700000000,
-    0x4a6a775b00000000, 0x5363b25100000000, 0xcd63189d00000000,
-    0x2e64971300000000, 0xb0643ddf00000000, 0x6125d08300000000,
-    0xff257a4f00000000, 0x1c22f5c100000000, 0x82225f0d00000000,
-    0x9b2b9a0700000000, 0x052b30cb00000000, 0xe62cbf4500000000,
-    0x782c158900000000, 0xd43e355000000000, 0x4a3e9f9c00000000,
-    0xa939101200000000, 0x3739bade00000000, 0x2e307fd400000000,
-    0xb030d51800000000, 0x53375a9600000000, 0xcd37f05a00000000,
-    0x4a146bff00000000, 0xd414c13300000000, 0x37134ebd00000000,
-    0xa913e47100000000, 0xb01a217b00000000, 0x2e1a8bb700000000,
-    0xcd1d043900000000, 0x531daef500000000, 0xff0f8e2c00000000,
-    0x610f24e000000000, 0x8208ab6e00000000, 0x1c0801a200000000,
-    0x0501c4a800000000, 0x9b016e6400000000, 0x7806e1ea00000000,
-    0xe6064b2600000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
-    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
-    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
-    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
-    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
-    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
-    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
-    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
-    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
-    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
-    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
-    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
-    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
-    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
-    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
-    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
-    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
-    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
-    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
-    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
-    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
-    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
-    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
-    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
-    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
-    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
-    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
-    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
-    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
-    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
-    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
-    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
-    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
-    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
-    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
-    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
-    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
-    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
-    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
-    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
-    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
-    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
-    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
-    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
-    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
-    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
-    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
-    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
-    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
-    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
-    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
-    0xde0506f1},
-   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
-    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
-    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
-    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
-    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
-    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
-    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
-    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
-    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
-    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
-    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
-    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
-    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
-    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
-    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
-    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
-    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
-    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
-    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
-    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
-    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
-    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
-    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
-    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
-    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
-    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
-    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
-    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
-    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
-    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
-    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
-    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
-    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
-    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
-    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
-    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
-    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
-    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
-    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
-    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
-    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
-    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
-    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
-    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
-    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
-    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
-    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
-    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
-    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
-    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
-    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
-    0xbe9834ed},
-   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
-    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
-    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
-    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
-    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
-    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
-    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
-    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
-    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
-    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
-    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
-    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
-    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
-    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
-    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
-    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
-    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
-    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
-    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
-    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
-    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
-    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
-    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
-    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
-    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
-    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
-    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
-    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
-    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
-    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
-    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
-    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
-    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
-    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
-    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
-    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
-    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
-    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
-    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
-    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
-    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
-    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
-    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
-    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
-    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
-    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
-    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
-    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
-    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
-    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
-    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
-    0x9324fd72},
-   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
-    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
-    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
-    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
-    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
-    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
-    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
-    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
-    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
-    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
-    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
-    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
-    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
-    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
-    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
-    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
-    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
-    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
-    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
-    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
-    0x2d02ef8d}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
-    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
-    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
-    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
-    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
-    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
-    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
-    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
-    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
-    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
-    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
-    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
-    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
-    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
-    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
-    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
-    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
-    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
-    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
-    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
-    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
-    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
-    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
-    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
-    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
-    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
-    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
-    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
-    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
-    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
-    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
-    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
-    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
-    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
-    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
-    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
-    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
-    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
-    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
-    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
-    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
-    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
-    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
-    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
-    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
-    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
-    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
-    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
-    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
-    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
-    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
-    0x8def022d},
-   {0x00000000, 0x41311b19, 0x82623632, 0xc3532d2b, 0x04c56c64,
-    0x45f4777d, 0x86a75a56, 0xc796414f, 0x088ad9c8, 0x49bbc2d1,
-    0x8ae8effa, 0xcbd9f4e3, 0x0c4fb5ac, 0x4d7eaeb5, 0x8e2d839e,
-    0xcf1c9887, 0x5112c24a, 0x1023d953, 0xd370f478, 0x9241ef61,
-    0x55d7ae2e, 0x14e6b537, 0xd7b5981c, 0x96848305, 0x59981b82,
-    0x18a9009b, 0xdbfa2db0, 0x9acb36a9, 0x5d5d77e6, 0x1c6c6cff,
-    0xdf3f41d4, 0x9e0e5acd, 0xa2248495, 0xe3159f8c, 0x2046b2a7,
-    0x6177a9be, 0xa6e1e8f1, 0xe7d0f3e8, 0x2483dec3, 0x65b2c5da,
-    0xaaae5d5d, 0xeb9f4644, 0x28cc6b6f, 0x69fd7076, 0xae6b3139,
-    0xef5a2a20, 0x2c09070b, 0x6d381c12, 0xf33646df, 0xb2075dc6,
-    0x715470ed, 0x30656bf4, 0xf7f32abb, 0xb6c231a2, 0x75911c89,
-    0x34a00790, 0xfbbc9f17, 0xba8d840e, 0x79dea925, 0x38efb23c,
-    0xff79f373, 0xbe48e86a, 0x7d1bc541, 0x3c2ade58, 0x054f79f0,
-    0x447e62e9, 0x872d4fc2, 0xc61c54db, 0x018a1594, 0x40bb0e8d,
-    0x83e823a6, 0xc2d938bf, 0x0dc5a038, 0x4cf4bb21, 0x8fa7960a,
-    0xce968d13, 0x0900cc5c, 0x4831d745, 0x8b62fa6e, 0xca53e177,
-    0x545dbbba, 0x156ca0a3, 0xd63f8d88, 0x970e9691, 0x5098d7de,
-    0x11a9ccc7, 0xd2fae1ec, 0x93cbfaf5, 0x5cd76272, 0x1de6796b,
-    0xdeb55440, 0x9f844f59, 0x58120e16, 0x1923150f, 0xda703824,
-    0x9b41233d, 0xa76bfd65, 0xe65ae67c, 0x2509cb57, 0x6438d04e,
-    0xa3ae9101, 0xe29f8a18, 0x21cca733, 0x60fdbc2a, 0xafe124ad,
-    0xeed03fb4, 0x2d83129f, 0x6cb20986, 0xab2448c9, 0xea1553d0,
-    0x29467efb, 0x687765e2, 0xf6793f2f, 0xb7482436, 0x741b091d,
-    0x352a1204, 0xf2bc534b, 0xb38d4852, 0x70de6579, 0x31ef7e60,
-    0xfef3e6e7, 0xbfc2fdfe, 0x7c91d0d5, 0x3da0cbcc, 0xfa368a83,
-    0xbb07919a, 0x7854bcb1, 0x3965a7a8, 0x4b98833b, 0x0aa99822,
-    0xc9fab509, 0x88cbae10, 0x4f5def5f, 0x0e6cf446, 0xcd3fd96d,
-    0x8c0ec274, 0x43125af3, 0x022341ea, 0xc1706cc1, 0x804177d8,
-    0x47d73697, 0x06e62d8e, 0xc5b500a5, 0x84841bbc, 0x1a8a4171,
-    0x5bbb5a68, 0x98e87743, 0xd9d96c5a, 0x1e4f2d15, 0x5f7e360c,
-    0x9c2d1b27, 0xdd1c003e, 0x120098b9, 0x533183a0, 0x9062ae8b,
-    0xd153b592, 0x16c5f4dd, 0x57f4efc4, 0x94a7c2ef, 0xd596d9f6,
-    0xe9bc07ae, 0xa88d1cb7, 0x6bde319c, 0x2aef2a85, 0xed796bca,
-    0xac4870d3, 0x6f1b5df8, 0x2e2a46e1, 0xe136de66, 0xa007c57f,
-    0x6354e854, 0x2265f34d, 0xe5f3b202, 0xa4c2a91b, 0x67918430,
-    0x26a09f29, 0xb8aec5e4, 0xf99fdefd, 0x3accf3d6, 0x7bfde8cf,
-    0xbc6ba980, 0xfd5ab299, 0x3e099fb2, 0x7f3884ab, 0xb0241c2c,
-    0xf1150735, 0x32462a1e, 0x73773107, 0xb4e17048, 0xf5d06b51,
-    0x3683467a, 0x77b25d63, 0x4ed7facb, 0x0fe6e1d2, 0xccb5ccf9,
-    0x8d84d7e0, 0x4a1296af, 0x0b238db6, 0xc870a09d, 0x8941bb84,
-    0x465d2303, 0x076c381a, 0xc43f1531, 0x850e0e28, 0x42984f67,
-    0x03a9547e, 0xc0fa7955, 0x81cb624c, 0x1fc53881, 0x5ef42398,
-    0x9da70eb3, 0xdc9615aa, 0x1b0054e5, 0x5a314ffc, 0x996262d7,
-    0xd85379ce, 0x174fe149, 0x567efa50, 0x952dd77b, 0xd41ccc62,
-    0x138a8d2d, 0x52bb9634, 0x91e8bb1f, 0xd0d9a006, 0xecf37e5e,
-    0xadc26547, 0x6e91486c, 0x2fa05375, 0xe836123a, 0xa9070923,
-    0x6a542408, 0x2b653f11, 0xe479a796, 0xa548bc8f, 0x661b91a4,
-    0x272a8abd, 0xe0bccbf2, 0xa18dd0eb, 0x62defdc0, 0x23efe6d9,
-    0xbde1bc14, 0xfcd0a70d, 0x3f838a26, 0x7eb2913f, 0xb924d070,
-    0xf815cb69, 0x3b46e642, 0x7a77fd5b, 0xb56b65dc, 0xf45a7ec5,
-    0x370953ee, 0x763848f7, 0xb1ae09b8, 0xf09f12a1, 0x33cc3f8a,
-    0x72fd2493},
-   {0x00000000, 0x376ac201, 0x6ed48403, 0x59be4602, 0xdca80907,
-    0xebc2cb06, 0xb27c8d04, 0x85164f05, 0xb851130e, 0x8f3bd10f,
-    0xd685970d, 0xe1ef550c, 0x64f91a09, 0x5393d808, 0x0a2d9e0a,
-    0x3d475c0b, 0x70a3261c, 0x47c9e41d, 0x1e77a21f, 0x291d601e,
-    0xac0b2f1b, 0x9b61ed1a, 0xc2dfab18, 0xf5b56919, 0xc8f23512,
-    0xff98f713, 0xa626b111, 0x914c7310, 0x145a3c15, 0x2330fe14,
-    0x7a8eb816, 0x4de47a17, 0xe0464d38, 0xd72c8f39, 0x8e92c93b,
-    0xb9f80b3a, 0x3cee443f, 0x0b84863e, 0x523ac03c, 0x6550023d,
-    0x58175e36, 0x6f7d9c37, 0x36c3da35, 0x01a91834, 0x84bf5731,
-    0xb3d59530, 0xea6bd332, 0xdd011133, 0x90e56b24, 0xa78fa925,
-    0xfe31ef27, 0xc95b2d26, 0x4c4d6223, 0x7b27a022, 0x2299e620,
-    0x15f32421, 0x28b4782a, 0x1fdeba2b, 0x4660fc29, 0x710a3e28,
-    0xf41c712d, 0xc376b32c, 0x9ac8f52e, 0xada2372f, 0xc08d9a70,
-    0xf7e75871, 0xae591e73, 0x9933dc72, 0x1c259377, 0x2b4f5176,
-    0x72f11774, 0x459bd575, 0x78dc897e, 0x4fb64b7f, 0x16080d7d,
-    0x2162cf7c, 0xa4748079, 0x931e4278, 0xcaa0047a, 0xfdcac67b,
-    0xb02ebc6c, 0x87447e6d, 0xdefa386f, 0xe990fa6e, 0x6c86b56b,
-    0x5bec776a, 0x02523168, 0x3538f369, 0x087faf62, 0x3f156d63,
-    0x66ab2b61, 0x51c1e960, 0xd4d7a665, 0xe3bd6464, 0xba032266,
-    0x8d69e067, 0x20cbd748, 0x17a11549, 0x4e1f534b, 0x7975914a,
-    0xfc63de4f, 0xcb091c4e, 0x92b75a4c, 0xa5dd984d, 0x989ac446,
-    0xaff00647, 0xf64e4045, 0xc1248244, 0x4432cd41, 0x73580f40,
-    0x2ae64942, 0x1d8c8b43, 0x5068f154, 0x67023355, 0x3ebc7557,
-    0x09d6b756, 0x8cc0f853, 0xbbaa3a52, 0xe2147c50, 0xd57ebe51,
-    0xe839e25a, 0xdf53205b, 0x86ed6659, 0xb187a458, 0x3491eb5d,
-    0x03fb295c, 0x5a456f5e, 0x6d2fad5f, 0x801b35e1, 0xb771f7e0,
-    0xeecfb1e2, 0xd9a573e3, 0x5cb33ce6, 0x6bd9fee7, 0x3267b8e5,
-    0x050d7ae4, 0x384a26ef, 0x0f20e4ee, 0x569ea2ec, 0x61f460ed,
-    0xe4e22fe8, 0xd388ede9, 0x8a36abeb, 0xbd5c69ea, 0xf0b813fd,
-    0xc7d2d1fc, 0x9e6c97fe, 0xa90655ff, 0x2c101afa, 0x1b7ad8fb,
-    0x42c49ef9, 0x75ae5cf8, 0x48e900f3, 0x7f83c2f2, 0x263d84f0,
-    0x115746f1, 0x944109f4, 0xa32bcbf5, 0xfa958df7, 0xcdff4ff6,
-    0x605d78d9, 0x5737bad8, 0x0e89fcda, 0x39e33edb, 0xbcf571de,
-    0x8b9fb3df, 0xd221f5dd, 0xe54b37dc, 0xd80c6bd7, 0xef66a9d6,
-    0xb6d8efd4, 0x81b22dd5, 0x04a462d0, 0x33cea0d1, 0x6a70e6d3,
-    0x5d1a24d2, 0x10fe5ec5, 0x27949cc4, 0x7e2adac6, 0x494018c7,
-    0xcc5657c2, 0xfb3c95c3, 0xa282d3c1, 0x95e811c0, 0xa8af4dcb,
-    0x9fc58fca, 0xc67bc9c8, 0xf1110bc9, 0x740744cc, 0x436d86cd,
-    0x1ad3c0cf, 0x2db902ce, 0x4096af91, 0x77fc6d90, 0x2e422b92,
-    0x1928e993, 0x9c3ea696, 0xab546497, 0xf2ea2295, 0xc580e094,
-    0xf8c7bc9f, 0xcfad7e9e, 0x9613389c, 0xa179fa9d, 0x246fb598,
-    0x13057799, 0x4abb319b, 0x7dd1f39a, 0x3035898d, 0x075f4b8c,
-    0x5ee10d8e, 0x698bcf8f, 0xec9d808a, 0xdbf7428b, 0x82490489,
-    0xb523c688, 0x88649a83, 0xbf0e5882, 0xe6b01e80, 0xd1dadc81,
-    0x54cc9384, 0x63a65185, 0x3a181787, 0x0d72d586, 0xa0d0e2a9,
-    0x97ba20a8, 0xce0466aa, 0xf96ea4ab, 0x7c78ebae, 0x4b1229af,
-    0x12ac6fad, 0x25c6adac, 0x1881f1a7, 0x2feb33a6, 0x765575a4,
-    0x413fb7a5, 0xc429f8a0, 0xf3433aa1, 0xaafd7ca3, 0x9d97bea2,
-    0xd073c4b5, 0xe71906b4, 0xbea740b6, 0x89cd82b7, 0x0cdbcdb2,
-    0x3bb10fb3, 0x620f49b1, 0x55658bb0, 0x6822d7bb, 0x5f4815ba,
-    0x06f653b8, 0x319c91b9, 0xb48adebc, 0x83e01cbd, 0xda5e5abf,
-    0xed3498be},
-   {0x00000000, 0x6567bcb8, 0x8bc809aa, 0xeeafb512, 0x5797628f,
-    0x32f0de37, 0xdc5f6b25, 0xb938d79d, 0xef28b4c5, 0x8a4f087d,
-    0x64e0bd6f, 0x018701d7, 0xb8bfd64a, 0xddd86af2, 0x3377dfe0,
-    0x56106358, 0x9f571950, 0xfa30a5e8, 0x149f10fa, 0x71f8ac42,
-    0xc8c07bdf, 0xada7c767, 0x43087275, 0x266fcecd, 0x707fad95,
-    0x1518112d, 0xfbb7a43f, 0x9ed01887, 0x27e8cf1a, 0x428f73a2,
-    0xac20c6b0, 0xc9477a08, 0x3eaf32a0, 0x5bc88e18, 0xb5673b0a,
-    0xd00087b2, 0x6938502f, 0x0c5fec97, 0xe2f05985, 0x8797e53d,
-    0xd1878665, 0xb4e03add, 0x5a4f8fcf, 0x3f283377, 0x8610e4ea,
-    0xe3775852, 0x0dd8ed40, 0x68bf51f8, 0xa1f82bf0, 0xc49f9748,
-    0x2a30225a, 0x4f579ee2, 0xf66f497f, 0x9308f5c7, 0x7da740d5,
-    0x18c0fc6d, 0x4ed09f35, 0x2bb7238d, 0xc518969f, 0xa07f2a27,
-    0x1947fdba, 0x7c204102, 0x928ff410, 0xf7e848a8, 0x3d58149b,
-    0x583fa823, 0xb6901d31, 0xd3f7a189, 0x6acf7614, 0x0fa8caac,
-    0xe1077fbe, 0x8460c306, 0xd270a05e, 0xb7171ce6, 0x59b8a9f4,
-    0x3cdf154c, 0x85e7c2d1, 0xe0807e69, 0x0e2fcb7b, 0x6b4877c3,
-    0xa20f0dcb, 0xc768b173, 0x29c70461, 0x4ca0b8d9, 0xf5986f44,
-    0x90ffd3fc, 0x7e5066ee, 0x1b37da56, 0x4d27b90e, 0x284005b6,
-    0xc6efb0a4, 0xa3880c1c, 0x1ab0db81, 0x7fd76739, 0x9178d22b,
-    0xf41f6e93, 0x03f7263b, 0x66909a83, 0x883f2f91, 0xed589329,
-    0x546044b4, 0x3107f80c, 0xdfa84d1e, 0xbacff1a6, 0xecdf92fe,
-    0x89b82e46, 0x67179b54, 0x027027ec, 0xbb48f071, 0xde2f4cc9,
-    0x3080f9db, 0x55e74563, 0x9ca03f6b, 0xf9c783d3, 0x176836c1,
-    0x720f8a79, 0xcb375de4, 0xae50e15c, 0x40ff544e, 0x2598e8f6,
-    0x73888bae, 0x16ef3716, 0xf8408204, 0x9d273ebc, 0x241fe921,
-    0x41785599, 0xafd7e08b, 0xcab05c33, 0x3bb659ed, 0x5ed1e555,
-    0xb07e5047, 0xd519ecff, 0x6c213b62, 0x094687da, 0xe7e932c8,
-    0x828e8e70, 0xd49eed28, 0xb1f95190, 0x5f56e482, 0x3a31583a,
-    0x83098fa7, 0xe66e331f, 0x08c1860d, 0x6da63ab5, 0xa4e140bd,
-    0xc186fc05, 0x2f294917, 0x4a4ef5af, 0xf3762232, 0x96119e8a,
-    0x78be2b98, 0x1dd99720, 0x4bc9f478, 0x2eae48c0, 0xc001fdd2,
-    0xa566416a, 0x1c5e96f7, 0x79392a4f, 0x97969f5d, 0xf2f123e5,
-    0x05196b4d, 0x607ed7f5, 0x8ed162e7, 0xebb6de5f, 0x528e09c2,
-    0x37e9b57a, 0xd9460068, 0xbc21bcd0, 0xea31df88, 0x8f566330,
-    0x61f9d622, 0x049e6a9a, 0xbda6bd07, 0xd8c101bf, 0x366eb4ad,
-    0x53090815, 0x9a4e721d, 0xff29cea5, 0x11867bb7, 0x74e1c70f,
-    0xcdd91092, 0xa8beac2a, 0x46111938, 0x2376a580, 0x7566c6d8,
-    0x10017a60, 0xfeaecf72, 0x9bc973ca, 0x22f1a457, 0x479618ef,
-    0xa939adfd, 0xcc5e1145, 0x06ee4d76, 0x6389f1ce, 0x8d2644dc,
-    0xe841f864, 0x51792ff9, 0x341e9341, 0xdab12653, 0xbfd69aeb,
-    0xe9c6f9b3, 0x8ca1450b, 0x620ef019, 0x07694ca1, 0xbe519b3c,
-    0xdb362784, 0x35999296, 0x50fe2e2e, 0x99b95426, 0xfcdee89e,
-    0x12715d8c, 0x7716e134, 0xce2e36a9, 0xab498a11, 0x45e63f03,
-    0x208183bb, 0x7691e0e3, 0x13f65c5b, 0xfd59e949, 0x983e55f1,
-    0x2106826c, 0x44613ed4, 0xaace8bc6, 0xcfa9377e, 0x38417fd6,
-    0x5d26c36e, 0xb389767c, 0xd6eecac4, 0x6fd61d59, 0x0ab1a1e1,
-    0xe41e14f3, 0x8179a84b, 0xd769cb13, 0xb20e77ab, 0x5ca1c2b9,
-    0x39c67e01, 0x80fea99c, 0xe5991524, 0x0b36a036, 0x6e511c8e,
-    0xa7166686, 0xc271da3e, 0x2cde6f2c, 0x49b9d394, 0xf0810409,
-    0x95e6b8b1, 0x7b490da3, 0x1e2eb11b, 0x483ed243, 0x2d596efb,
-    0xc3f6dbe9, 0xa6916751, 0x1fa9b0cc, 0x7ace0c74, 0x9461b966,
-    0xf10605de}};
-
-#endif /* W */
-
-#endif /* N == 1 */
-#if N == 2
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
-    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
-    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
-    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
-    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
-    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
-    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
-    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
-    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
-    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
-    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
-    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
-    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
-    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
-    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
-    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
-    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
-    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
-    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
-    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
-    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
-    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
-    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
-    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
-    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
-    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
-    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
-    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
-    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
-    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
-    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
-    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
-    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
-    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
-    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
-    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
-    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
-    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
-    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
-    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
-    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
-    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
-    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
-    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
-    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
-    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
-    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
-    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
-    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
-    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
-    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
-    0x0d7139d7},
-   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
-    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
-    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
-    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
-    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
-    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
-    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
-    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
-    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
-    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
-    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
-    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
-    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
-    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
-    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
-    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
-    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
-    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
-    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
-    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
-    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
-    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
-    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
-    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
-    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
-    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
-    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
-    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
-    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
-    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
-    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
-    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
-    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
-    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
-    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
-    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
-    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
-    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
-    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
-    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
-    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
-    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
-    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
-    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
-    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
-    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
-    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
-    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
-    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
-    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
-    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
-    0x1c53e98a},
-   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
-    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
-    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
-    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
-    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
-    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
-    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
-    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
-    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
-    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
-    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
-    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
-    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
-    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
-    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
-    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
-    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
-    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
-    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
-    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
-    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
-    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
-    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
-    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
-    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
-    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
-    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
-    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
-    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
-    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
-    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
-    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
-    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
-    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
-    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
-    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
-    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
-    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
-    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
-    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
-    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
-    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
-    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
-    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
-    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
-    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
-    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
-    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
-    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
-    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
-    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
-    0x3f88e851},
-   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
-    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
-    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
-    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
-    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
-    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
-    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
-    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
-    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
-    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
-    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
-    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
-    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
-    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
-    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
-    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
-    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
-    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
-    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
-    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
-    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
-    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
-    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
-    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
-    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
-    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
-    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
-    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
-    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
-    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
-    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
-    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
-    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
-    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
-    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
-    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
-    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
-    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
-    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
-    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
-    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
-    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
-    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
-    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
-    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
-    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
-    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
-    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
-    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
-    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
-    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
-    0x3dee8ca6},
-   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
-    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
-    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
-    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
-    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
-    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
-    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
-    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
-    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
-    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
-    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
-    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
-    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
-    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
-    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
-    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
-    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
-    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
-    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
-    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
-    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
-    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
-    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
-    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
-    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
-    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
-    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
-    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
-    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
-    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
-    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
-    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
-    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
-    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
-    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
-    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
-    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
-    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
-    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
-    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
-    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
-    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
-    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
-    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
-    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
-    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
-    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
-    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
-    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
-    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
-    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
-    0x36197165},
-   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
-    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
-    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
-    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
-    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
-    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
-    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
-    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
-    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
-    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
-    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
-    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
-    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
-    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
-    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
-    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
-    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
-    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
-    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
-    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
-    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
-    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
-    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
-    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
-    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
-    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
-    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
-    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
-    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
-    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
-    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
-    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
-    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
-    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
-    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
-    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
-    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
-    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
-    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
-    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
-    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
-    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
-    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
-    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
-    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
-    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
-    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
-    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
-    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
-    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
-    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
-    0x1a3b93aa},
-   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
-    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
-    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
-    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
-    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
-    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
-    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
-    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
-    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
-    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
-    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
-    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
-    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
-    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
-    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
-    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
-    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
-    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
-    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
-    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
-    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
-    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
-    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
-    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
-    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
-    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
-    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
-    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
-    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
-    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
-    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
-    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
-    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
-    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
-    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
-    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
-    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
-    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
-    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
-    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
-    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
-    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
-    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
-    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
-    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
-    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
-    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
-    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
-    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
-    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
-    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
-    0xe147d714},
-   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
-    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
-    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
-    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
-    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
-    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
-    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
-    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
-    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
-    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
-    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
-    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
-    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
-    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
-    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
-    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
-    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
-    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
-    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
-    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
-    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
-    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
-    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
-    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
-    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
-    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
-    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
-    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
-    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
-    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
-    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
-    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
-    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
-    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
-    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
-    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
-    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
-    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
-    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
-    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
-    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
-    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
-    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
-    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
-    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
-    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
-    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
-    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
-    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
-    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
-    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
-    0x494f0c4b}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0x43147b1700000000, 0x8628f62e00000000,
-    0xc53c8d3900000000, 0x0c51ec5d00000000, 0x4f45974a00000000,
-    0x8a791a7300000000, 0xc96d616400000000, 0x18a2d8bb00000000,
-    0x5bb6a3ac00000000, 0x9e8a2e9500000000, 0xdd9e558200000000,
-    0x14f334e600000000, 0x57e74ff100000000, 0x92dbc2c800000000,
-    0xd1cfb9df00000000, 0x7142c0ac00000000, 0x3256bbbb00000000,
-    0xf76a368200000000, 0xb47e4d9500000000, 0x7d132cf100000000,
-    0x3e0757e600000000, 0xfb3bdadf00000000, 0xb82fa1c800000000,
-    0x69e0181700000000, 0x2af4630000000000, 0xefc8ee3900000000,
-    0xacdc952e00000000, 0x65b1f44a00000000, 0x26a58f5d00000000,
-    0xe399026400000000, 0xa08d797300000000, 0xa382f18200000000,
-    0xe0968a9500000000, 0x25aa07ac00000000, 0x66be7cbb00000000,
-    0xafd31ddf00000000, 0xecc766c800000000, 0x29fbebf100000000,
-    0x6aef90e600000000, 0xbb20293900000000, 0xf834522e00000000,
-    0x3d08df1700000000, 0x7e1ca40000000000, 0xb771c56400000000,
-    0xf465be7300000000, 0x3159334a00000000, 0x724d485d00000000,
-    0xd2c0312e00000000, 0x91d44a3900000000, 0x54e8c70000000000,
-    0x17fcbc1700000000, 0xde91dd7300000000, 0x9d85a66400000000,
-    0x58b92b5d00000000, 0x1bad504a00000000, 0xca62e99500000000,
-    0x8976928200000000, 0x4c4a1fbb00000000, 0x0f5e64ac00000000,
-    0xc63305c800000000, 0x85277edf00000000, 0x401bf3e600000000,
-    0x030f88f100000000, 0x070392de00000000, 0x4417e9c900000000,
-    0x812b64f000000000, 0xc23f1fe700000000, 0x0b527e8300000000,
-    0x4846059400000000, 0x8d7a88ad00000000, 0xce6ef3ba00000000,
-    0x1fa14a6500000000, 0x5cb5317200000000, 0x9989bc4b00000000,
-    0xda9dc75c00000000, 0x13f0a63800000000, 0x50e4dd2f00000000,
-    0x95d8501600000000, 0xd6cc2b0100000000, 0x7641527200000000,
-    0x3555296500000000, 0xf069a45c00000000, 0xb37ddf4b00000000,
-    0x7a10be2f00000000, 0x3904c53800000000, 0xfc38480100000000,
-    0xbf2c331600000000, 0x6ee38ac900000000, 0x2df7f1de00000000,
-    0xe8cb7ce700000000, 0xabdf07f000000000, 0x62b2669400000000,
-    0x21a61d8300000000, 0xe49a90ba00000000, 0xa78eebad00000000,
-    0xa481635c00000000, 0xe795184b00000000, 0x22a9957200000000,
-    0x61bdee6500000000, 0xa8d08f0100000000, 0xebc4f41600000000,
-    0x2ef8792f00000000, 0x6dec023800000000, 0xbc23bbe700000000,
-    0xff37c0f000000000, 0x3a0b4dc900000000, 0x791f36de00000000,
-    0xb07257ba00000000, 0xf3662cad00000000, 0x365aa19400000000,
-    0x754eda8300000000, 0xd5c3a3f000000000, 0x96d7d8e700000000,
-    0x53eb55de00000000, 0x10ff2ec900000000, 0xd9924fad00000000,
-    0x9a8634ba00000000, 0x5fbab98300000000, 0x1caec29400000000,
-    0xcd617b4b00000000, 0x8e75005c00000000, 0x4b498d6500000000,
-    0x085df67200000000, 0xc130971600000000, 0x8224ec0100000000,
-    0x4718613800000000, 0x040c1a2f00000000, 0x4f00556600000000,
-    0x0c142e7100000000, 0xc928a34800000000, 0x8a3cd85f00000000,
-    0x4351b93b00000000, 0x0045c22c00000000, 0xc5794f1500000000,
-    0x866d340200000000, 0x57a28ddd00000000, 0x14b6f6ca00000000,
-    0xd18a7bf300000000, 0x929e00e400000000, 0x5bf3618000000000,
-    0x18e71a9700000000, 0xdddb97ae00000000, 0x9ecfecb900000000,
-    0x3e4295ca00000000, 0x7d56eedd00000000, 0xb86a63e400000000,
-    0xfb7e18f300000000, 0x3213799700000000, 0x7107028000000000,
-    0xb43b8fb900000000, 0xf72ff4ae00000000, 0x26e04d7100000000,
-    0x65f4366600000000, 0xa0c8bb5f00000000, 0xe3dcc04800000000,
-    0x2ab1a12c00000000, 0x69a5da3b00000000, 0xac99570200000000,
-    0xef8d2c1500000000, 0xec82a4e400000000, 0xaf96dff300000000,
-    0x6aaa52ca00000000, 0x29be29dd00000000, 0xe0d348b900000000,
-    0xa3c733ae00000000, 0x66fbbe9700000000, 0x25efc58000000000,
-    0xf4207c5f00000000, 0xb734074800000000, 0x72088a7100000000,
-    0x311cf16600000000, 0xf871900200000000, 0xbb65eb1500000000,
-    0x7e59662c00000000, 0x3d4d1d3b00000000, 0x9dc0644800000000,
-    0xded41f5f00000000, 0x1be8926600000000, 0x58fce97100000000,
-    0x9191881500000000, 0xd285f30200000000, 0x17b97e3b00000000,
-    0x54ad052c00000000, 0x8562bcf300000000, 0xc676c7e400000000,
-    0x034a4add00000000, 0x405e31ca00000000, 0x893350ae00000000,
-    0xca272bb900000000, 0x0f1ba68000000000, 0x4c0fdd9700000000,
-    0x4803c7b800000000, 0x0b17bcaf00000000, 0xce2b319600000000,
-    0x8d3f4a8100000000, 0x44522be500000000, 0x074650f200000000,
-    0xc27addcb00000000, 0x816ea6dc00000000, 0x50a11f0300000000,
-    0x13b5641400000000, 0xd689e92d00000000, 0x959d923a00000000,
-    0x5cf0f35e00000000, 0x1fe4884900000000, 0xdad8057000000000,
-    0x99cc7e6700000000, 0x3941071400000000, 0x7a557c0300000000,
-    0xbf69f13a00000000, 0xfc7d8a2d00000000, 0x3510eb4900000000,
-    0x7604905e00000000, 0xb3381d6700000000, 0xf02c667000000000,
-    0x21e3dfaf00000000, 0x62f7a4b800000000, 0xa7cb298100000000,
-    0xe4df529600000000, 0x2db233f200000000, 0x6ea648e500000000,
-    0xab9ac5dc00000000, 0xe88ebecb00000000, 0xeb81363a00000000,
-    0xa8954d2d00000000, 0x6da9c01400000000, 0x2ebdbb0300000000,
-    0xe7d0da6700000000, 0xa4c4a17000000000, 0x61f82c4900000000,
-    0x22ec575e00000000, 0xf323ee8100000000, 0xb037959600000000,
-    0x750b18af00000000, 0x361f63b800000000, 0xff7202dc00000000,
-    0xbc6679cb00000000, 0x795af4f200000000, 0x3a4e8fe500000000,
-    0x9ac3f69600000000, 0xd9d78d8100000000, 0x1ceb00b800000000,
-    0x5fff7baf00000000, 0x96921acb00000000, 0xd58661dc00000000,
-    0x10baece500000000, 0x53ae97f200000000, 0x82612e2d00000000,
-    0xc175553a00000000, 0x0449d80300000000, 0x475da31400000000,
-    0x8e30c27000000000, 0xcd24b96700000000, 0x0818345e00000000,
-    0x4b0c4f4900000000},
-   {0x0000000000000000, 0x3e6bc2ef00000000, 0x3dd0f50400000000,
-    0x03bb37eb00000000, 0x7aa0eb0900000000, 0x44cb29e600000000,
-    0x47701e0d00000000, 0x791bdce200000000, 0xf440d71300000000,
-    0xca2b15fc00000000, 0xc990221700000000, 0xf7fbe0f800000000,
-    0x8ee03c1a00000000, 0xb08bfef500000000, 0xb330c91e00000000,
-    0x8d5b0bf100000000, 0xe881ae2700000000, 0xd6ea6cc800000000,
-    0xd5515b2300000000, 0xeb3a99cc00000000, 0x9221452e00000000,
-    0xac4a87c100000000, 0xaff1b02a00000000, 0x919a72c500000000,
-    0x1cc1793400000000, 0x22aabbdb00000000, 0x21118c3000000000,
-    0x1f7a4edf00000000, 0x6661923d00000000, 0x580a50d200000000,
-    0x5bb1673900000000, 0x65daa5d600000000, 0xd0035d4f00000000,
-    0xee689fa000000000, 0xedd3a84b00000000, 0xd3b86aa400000000,
-    0xaaa3b64600000000, 0x94c874a900000000, 0x9773434200000000,
-    0xa91881ad00000000, 0x24438a5c00000000, 0x1a2848b300000000,
-    0x19937f5800000000, 0x27f8bdb700000000, 0x5ee3615500000000,
-    0x6088a3ba00000000, 0x6333945100000000, 0x5d5856be00000000,
-    0x3882f36800000000, 0x06e9318700000000, 0x0552066c00000000,
-    0x3b39c48300000000, 0x4222186100000000, 0x7c49da8e00000000,
-    0x7ff2ed6500000000, 0x41992f8a00000000, 0xccc2247b00000000,
-    0xf2a9e69400000000, 0xf112d17f00000000, 0xcf79139000000000,
-    0xb662cf7200000000, 0x88090d9d00000000, 0x8bb23a7600000000,
-    0xb5d9f89900000000, 0xa007ba9e00000000, 0x9e6c787100000000,
-    0x9dd74f9a00000000, 0xa3bc8d7500000000, 0xdaa7519700000000,
-    0xe4cc937800000000, 0xe777a49300000000, 0xd91c667c00000000,
-    0x54476d8d00000000, 0x6a2caf6200000000, 0x6997988900000000,
-    0x57fc5a6600000000, 0x2ee7868400000000, 0x108c446b00000000,
-    0x1337738000000000, 0x2d5cb16f00000000, 0x488614b900000000,
-    0x76edd65600000000, 0x7556e1bd00000000, 0x4b3d235200000000,
-    0x3226ffb000000000, 0x0c4d3d5f00000000, 0x0ff60ab400000000,
-    0x319dc85b00000000, 0xbcc6c3aa00000000, 0x82ad014500000000,
-    0x811636ae00000000, 0xbf7df44100000000, 0xc66628a300000000,
-    0xf80dea4c00000000, 0xfbb6dda700000000, 0xc5dd1f4800000000,
-    0x7004e7d100000000, 0x4e6f253e00000000, 0x4dd412d500000000,
-    0x73bfd03a00000000, 0x0aa40cd800000000, 0x34cfce3700000000,
-    0x3774f9dc00000000, 0x091f3b3300000000, 0x844430c200000000,
-    0xba2ff22d00000000, 0xb994c5c600000000, 0x87ff072900000000,
-    0xfee4dbcb00000000, 0xc08f192400000000, 0xc3342ecf00000000,
-    0xfd5fec2000000000, 0x988549f600000000, 0xa6ee8b1900000000,
-    0xa555bcf200000000, 0x9b3e7e1d00000000, 0xe225a2ff00000000,
-    0xdc4e601000000000, 0xdff557fb00000000, 0xe19e951400000000,
-    0x6cc59ee500000000, 0x52ae5c0a00000000, 0x51156be100000000,
-    0x6f7ea90e00000000, 0x166575ec00000000, 0x280eb70300000000,
-    0x2bb580e800000000, 0x15de420700000000, 0x010905e600000000,
-    0x3f62c70900000000, 0x3cd9f0e200000000, 0x02b2320d00000000,
-    0x7ba9eeef00000000, 0x45c22c0000000000, 0x46791beb00000000,
-    0x7812d90400000000, 0xf549d2f500000000, 0xcb22101a00000000,
-    0xc89927f100000000, 0xf6f2e51e00000000, 0x8fe939fc00000000,
-    0xb182fb1300000000, 0xb239ccf800000000, 0x8c520e1700000000,
-    0xe988abc100000000, 0xd7e3692e00000000, 0xd4585ec500000000,
-    0xea339c2a00000000, 0x932840c800000000, 0xad43822700000000,
-    0xaef8b5cc00000000, 0x9093772300000000, 0x1dc87cd200000000,
-    0x23a3be3d00000000, 0x201889d600000000, 0x1e734b3900000000,
-    0x676897db00000000, 0x5903553400000000, 0x5ab862df00000000,
-    0x64d3a03000000000, 0xd10a58a900000000, 0xef619a4600000000,
-    0xecdaadad00000000, 0xd2b16f4200000000, 0xabaab3a000000000,
-    0x95c1714f00000000, 0x967a46a400000000, 0xa811844b00000000,
-    0x254a8fba00000000, 0x1b214d5500000000, 0x189a7abe00000000,
-    0x26f1b85100000000, 0x5fea64b300000000, 0x6181a65c00000000,
-    0x623a91b700000000, 0x5c51535800000000, 0x398bf68e00000000,
-    0x07e0346100000000, 0x045b038a00000000, 0x3a30c16500000000,
-    0x432b1d8700000000, 0x7d40df6800000000, 0x7efbe88300000000,
-    0x40902a6c00000000, 0xcdcb219d00000000, 0xf3a0e37200000000,
-    0xf01bd49900000000, 0xce70167600000000, 0xb76bca9400000000,
-    0x8900087b00000000, 0x8abb3f9000000000, 0xb4d0fd7f00000000,
-    0xa10ebf7800000000, 0x9f657d9700000000, 0x9cde4a7c00000000,
-    0xa2b5889300000000, 0xdbae547100000000, 0xe5c5969e00000000,
-    0xe67ea17500000000, 0xd815639a00000000, 0x554e686b00000000,
-    0x6b25aa8400000000, 0x689e9d6f00000000, 0x56f55f8000000000,
-    0x2fee836200000000, 0x1185418d00000000, 0x123e766600000000,
-    0x2c55b48900000000, 0x498f115f00000000, 0x77e4d3b000000000,
-    0x745fe45b00000000, 0x4a3426b400000000, 0x332ffa5600000000,
-    0x0d4438b900000000, 0x0eff0f5200000000, 0x3094cdbd00000000,
-    0xbdcfc64c00000000, 0x83a404a300000000, 0x801f334800000000,
-    0xbe74f1a700000000, 0xc76f2d4500000000, 0xf904efaa00000000,
-    0xfabfd84100000000, 0xc4d41aae00000000, 0x710de23700000000,
-    0x4f6620d800000000, 0x4cdd173300000000, 0x72b6d5dc00000000,
-    0x0bad093e00000000, 0x35c6cbd100000000, 0x367dfc3a00000000,
-    0x08163ed500000000, 0x854d352400000000, 0xbb26f7cb00000000,
-    0xb89dc02000000000, 0x86f602cf00000000, 0xffedde2d00000000,
-    0xc1861cc200000000, 0xc23d2b2900000000, 0xfc56e9c600000000,
-    0x998c4c1000000000, 0xa7e78eff00000000, 0xa45cb91400000000,
-    0x9a377bfb00000000, 0xe32ca71900000000, 0xdd4765f600000000,
-    0xdefc521d00000000, 0xe09790f200000000, 0x6dcc9b0300000000,
-    0x53a759ec00000000, 0x501c6e0700000000, 0x6e77ace800000000,
-    0x176c700a00000000, 0x2907b2e500000000, 0x2abc850e00000000,
-    0x14d747e100000000},
-   {0x0000000000000000, 0xc0df8ec100000000, 0xc1b96c5800000000,
-    0x0166e29900000000, 0x8273d9b000000000, 0x42ac577100000000,
-    0x43cab5e800000000, 0x83153b2900000000, 0x45e1c3ba00000000,
-    0x853e4d7b00000000, 0x8458afe200000000, 0x4487212300000000,
-    0xc7921a0a00000000, 0x074d94cb00000000, 0x062b765200000000,
-    0xc6f4f89300000000, 0xcbc4f6ae00000000, 0x0b1b786f00000000,
-    0x0a7d9af600000000, 0xcaa2143700000000, 0x49b72f1e00000000,
-    0x8968a1df00000000, 0x880e434600000000, 0x48d1cd8700000000,
-    0x8e25351400000000, 0x4efabbd500000000, 0x4f9c594c00000000,
-    0x8f43d78d00000000, 0x0c56eca400000000, 0xcc89626500000000,
-    0xcdef80fc00000000, 0x0d300e3d00000000, 0xd78f9c8600000000,
-    0x1750124700000000, 0x1636f0de00000000, 0xd6e97e1f00000000,
-    0x55fc453600000000, 0x9523cbf700000000, 0x9445296e00000000,
-    0x549aa7af00000000, 0x926e5f3c00000000, 0x52b1d1fd00000000,
-    0x53d7336400000000, 0x9308bda500000000, 0x101d868c00000000,
-    0xd0c2084d00000000, 0xd1a4ead400000000, 0x117b641500000000,
-    0x1c4b6a2800000000, 0xdc94e4e900000000, 0xddf2067000000000,
-    0x1d2d88b100000000, 0x9e38b39800000000, 0x5ee73d5900000000,
-    0x5f81dfc000000000, 0x9f5e510100000000, 0x59aaa99200000000,
-    0x9975275300000000, 0x9813c5ca00000000, 0x58cc4b0b00000000,
-    0xdbd9702200000000, 0x1b06fee300000000, 0x1a601c7a00000000,
-    0xdabf92bb00000000, 0xef1948d600000000, 0x2fc6c61700000000,
-    0x2ea0248e00000000, 0xee7faa4f00000000, 0x6d6a916600000000,
-    0xadb51fa700000000, 0xacd3fd3e00000000, 0x6c0c73ff00000000,
-    0xaaf88b6c00000000, 0x6a2705ad00000000, 0x6b41e73400000000,
-    0xab9e69f500000000, 0x288b52dc00000000, 0xe854dc1d00000000,
-    0xe9323e8400000000, 0x29edb04500000000, 0x24ddbe7800000000,
-    0xe40230b900000000, 0xe564d22000000000, 0x25bb5ce100000000,
-    0xa6ae67c800000000, 0x6671e90900000000, 0x67170b9000000000,
-    0xa7c8855100000000, 0x613c7dc200000000, 0xa1e3f30300000000,
-    0xa085119a00000000, 0x605a9f5b00000000, 0xe34fa47200000000,
-    0x23902ab300000000, 0x22f6c82a00000000, 0xe22946eb00000000,
-    0x3896d45000000000, 0xf8495a9100000000, 0xf92fb80800000000,
-    0x39f036c900000000, 0xbae50de000000000, 0x7a3a832100000000,
-    0x7b5c61b800000000, 0xbb83ef7900000000, 0x7d7717ea00000000,
-    0xbda8992b00000000, 0xbcce7bb200000000, 0x7c11f57300000000,
-    0xff04ce5a00000000, 0x3fdb409b00000000, 0x3ebda20200000000,
-    0xfe622cc300000000, 0xf35222fe00000000, 0x338dac3f00000000,
-    0x32eb4ea600000000, 0xf234c06700000000, 0x7121fb4e00000000,
-    0xb1fe758f00000000, 0xb098971600000000, 0x704719d700000000,
-    0xb6b3e14400000000, 0x766c6f8500000000, 0x770a8d1c00000000,
-    0xb7d503dd00000000, 0x34c038f400000000, 0xf41fb63500000000,
-    0xf57954ac00000000, 0x35a6da6d00000000, 0x9f35e17700000000,
-    0x5fea6fb600000000, 0x5e8c8d2f00000000, 0x9e5303ee00000000,
-    0x1d4638c700000000, 0xdd99b60600000000, 0xdcff549f00000000,
-    0x1c20da5e00000000, 0xdad422cd00000000, 0x1a0bac0c00000000,
-    0x1b6d4e9500000000, 0xdbb2c05400000000, 0x58a7fb7d00000000,
-    0x987875bc00000000, 0x991e972500000000, 0x59c119e400000000,
-    0x54f117d900000000, 0x942e991800000000, 0x95487b8100000000,
-    0x5597f54000000000, 0xd682ce6900000000, 0x165d40a800000000,
-    0x173ba23100000000, 0xd7e42cf000000000, 0x1110d46300000000,
-    0xd1cf5aa200000000, 0xd0a9b83b00000000, 0x107636fa00000000,
-    0x93630dd300000000, 0x53bc831200000000, 0x52da618b00000000,
-    0x9205ef4a00000000, 0x48ba7df100000000, 0x8865f33000000000,
-    0x890311a900000000, 0x49dc9f6800000000, 0xcac9a44100000000,
-    0x0a162a8000000000, 0x0b70c81900000000, 0xcbaf46d800000000,
-    0x0d5bbe4b00000000, 0xcd84308a00000000, 0xcce2d21300000000,
-    0x0c3d5cd200000000, 0x8f2867fb00000000, 0x4ff7e93a00000000,
-    0x4e910ba300000000, 0x8e4e856200000000, 0x837e8b5f00000000,
-    0x43a1059e00000000, 0x42c7e70700000000, 0x821869c600000000,
-    0x010d52ef00000000, 0xc1d2dc2e00000000, 0xc0b43eb700000000,
-    0x006bb07600000000, 0xc69f48e500000000, 0x0640c62400000000,
-    0x072624bd00000000, 0xc7f9aa7c00000000, 0x44ec915500000000,
-    0x84331f9400000000, 0x8555fd0d00000000, 0x458a73cc00000000,
-    0x702ca9a100000000, 0xb0f3276000000000, 0xb195c5f900000000,
-    0x714a4b3800000000, 0xf25f701100000000, 0x3280fed000000000,
-    0x33e61c4900000000, 0xf339928800000000, 0x35cd6a1b00000000,
-    0xf512e4da00000000, 0xf474064300000000, 0x34ab888200000000,
-    0xb7beb3ab00000000, 0x77613d6a00000000, 0x7607dff300000000,
-    0xb6d8513200000000, 0xbbe85f0f00000000, 0x7b37d1ce00000000,
-    0x7a51335700000000, 0xba8ebd9600000000, 0x399b86bf00000000,
-    0xf944087e00000000, 0xf822eae700000000, 0x38fd642600000000,
-    0xfe099cb500000000, 0x3ed6127400000000, 0x3fb0f0ed00000000,
-    0xff6f7e2c00000000, 0x7c7a450500000000, 0xbca5cbc400000000,
-    0xbdc3295d00000000, 0x7d1ca79c00000000, 0xa7a3352700000000,
-    0x677cbbe600000000, 0x661a597f00000000, 0xa6c5d7be00000000,
-    0x25d0ec9700000000, 0xe50f625600000000, 0xe46980cf00000000,
-    0x24b60e0e00000000, 0xe242f69d00000000, 0x229d785c00000000,
-    0x23fb9ac500000000, 0xe324140400000000, 0x60312f2d00000000,
-    0xa0eea1ec00000000, 0xa188437500000000, 0x6157cdb400000000,
-    0x6c67c38900000000, 0xacb84d4800000000, 0xaddeafd100000000,
-    0x6d01211000000000, 0xee141a3900000000, 0x2ecb94f800000000,
-    0x2fad766100000000, 0xef72f8a000000000, 0x2986003300000000,
-    0xe9598ef200000000, 0xe83f6c6b00000000, 0x28e0e2aa00000000,
-    0xabf5d98300000000, 0x6b2a574200000000, 0x6a4cb5db00000000,
-    0xaa933b1a00000000},
-   {0x0000000000000000, 0x6f4ca59b00000000, 0x9f9e3bec00000000,
-    0xf0d29e7700000000, 0x7f3b060300000000, 0x1077a39800000000,
-    0xe0a53def00000000, 0x8fe9987400000000, 0xfe760c0600000000,
-    0x913aa99d00000000, 0x61e837ea00000000, 0x0ea4927100000000,
-    0x814d0a0500000000, 0xee01af9e00000000, 0x1ed331e900000000,
-    0x719f947200000000, 0xfced180c00000000, 0x93a1bd9700000000,
-    0x637323e000000000, 0x0c3f867b00000000, 0x83d61e0f00000000,
-    0xec9abb9400000000, 0x1c4825e300000000, 0x7304807800000000,
-    0x029b140a00000000, 0x6dd7b19100000000, 0x9d052fe600000000,
-    0xf2498a7d00000000, 0x7da0120900000000, 0x12ecb79200000000,
-    0xe23e29e500000000, 0x8d728c7e00000000, 0xf8db311800000000,
-    0x9797948300000000, 0x67450af400000000, 0x0809af6f00000000,
-    0x87e0371b00000000, 0xe8ac928000000000, 0x187e0cf700000000,
-    0x7732a96c00000000, 0x06ad3d1e00000000, 0x69e1988500000000,
-    0x993306f200000000, 0xf67fa36900000000, 0x79963b1d00000000,
-    0x16da9e8600000000, 0xe60800f100000000, 0x8944a56a00000000,
-    0x0436291400000000, 0x6b7a8c8f00000000, 0x9ba812f800000000,
-    0xf4e4b76300000000, 0x7b0d2f1700000000, 0x14418a8c00000000,
-    0xe49314fb00000000, 0x8bdfb16000000000, 0xfa40251200000000,
-    0x950c808900000000, 0x65de1efe00000000, 0x0a92bb6500000000,
-    0x857b231100000000, 0xea37868a00000000, 0x1ae518fd00000000,
-    0x75a9bd6600000000, 0xf0b7633000000000, 0x9ffbc6ab00000000,
-    0x6f2958dc00000000, 0x0065fd4700000000, 0x8f8c653300000000,
-    0xe0c0c0a800000000, 0x10125edf00000000, 0x7f5efb4400000000,
-    0x0ec16f3600000000, 0x618dcaad00000000, 0x915f54da00000000,
-    0xfe13f14100000000, 0x71fa693500000000, 0x1eb6ccae00000000,
-    0xee6452d900000000, 0x8128f74200000000, 0x0c5a7b3c00000000,
-    0x6316dea700000000, 0x93c440d000000000, 0xfc88e54b00000000,
-    0x73617d3f00000000, 0x1c2dd8a400000000, 0xecff46d300000000,
-    0x83b3e34800000000, 0xf22c773a00000000, 0x9d60d2a100000000,
-    0x6db24cd600000000, 0x02fee94d00000000, 0x8d17713900000000,
-    0xe25bd4a200000000, 0x12894ad500000000, 0x7dc5ef4e00000000,
-    0x086c522800000000, 0x6720f7b300000000, 0x97f269c400000000,
-    0xf8becc5f00000000, 0x7757542b00000000, 0x181bf1b000000000,
-    0xe8c96fc700000000, 0x8785ca5c00000000, 0xf61a5e2e00000000,
-    0x9956fbb500000000, 0x698465c200000000, 0x06c8c05900000000,
-    0x8921582d00000000, 0xe66dfdb600000000, 0x16bf63c100000000,
-    0x79f3c65a00000000, 0xf4814a2400000000, 0x9bcdefbf00000000,
-    0x6b1f71c800000000, 0x0453d45300000000, 0x8bba4c2700000000,
-    0xe4f6e9bc00000000, 0x142477cb00000000, 0x7b68d25000000000,
-    0x0af7462200000000, 0x65bbe3b900000000, 0x95697dce00000000,
-    0xfa25d85500000000, 0x75cc402100000000, 0x1a80e5ba00000000,
-    0xea527bcd00000000, 0x851ede5600000000, 0xe06fc76000000000,
-    0x8f2362fb00000000, 0x7ff1fc8c00000000, 0x10bd591700000000,
-    0x9f54c16300000000, 0xf01864f800000000, 0x00cafa8f00000000,
-    0x6f865f1400000000, 0x1e19cb6600000000, 0x71556efd00000000,
-    0x8187f08a00000000, 0xeecb551100000000, 0x6122cd6500000000,
-    0x0e6e68fe00000000, 0xfebcf68900000000, 0x91f0531200000000,
-    0x1c82df6c00000000, 0x73ce7af700000000, 0x831ce48000000000,
-    0xec50411b00000000, 0x63b9d96f00000000, 0x0cf57cf400000000,
-    0xfc27e28300000000, 0x936b471800000000, 0xe2f4d36a00000000,
-    0x8db876f100000000, 0x7d6ae88600000000, 0x12264d1d00000000,
-    0x9dcfd56900000000, 0xf28370f200000000, 0x0251ee8500000000,
-    0x6d1d4b1e00000000, 0x18b4f67800000000, 0x77f853e300000000,
-    0x872acd9400000000, 0xe866680f00000000, 0x678ff07b00000000,
-    0x08c355e000000000, 0xf811cb9700000000, 0x975d6e0c00000000,
-    0xe6c2fa7e00000000, 0x898e5fe500000000, 0x795cc19200000000,
-    0x1610640900000000, 0x99f9fc7d00000000, 0xf6b559e600000000,
-    0x0667c79100000000, 0x692b620a00000000, 0xe459ee7400000000,
-    0x8b154bef00000000, 0x7bc7d59800000000, 0x148b700300000000,
-    0x9b62e87700000000, 0xf42e4dec00000000, 0x04fcd39b00000000,
-    0x6bb0760000000000, 0x1a2fe27200000000, 0x756347e900000000,
-    0x85b1d99e00000000, 0xeafd7c0500000000, 0x6514e47100000000,
-    0x0a5841ea00000000, 0xfa8adf9d00000000, 0x95c67a0600000000,
-    0x10d8a45000000000, 0x7f9401cb00000000, 0x8f469fbc00000000,
-    0xe00a3a2700000000, 0x6fe3a25300000000, 0x00af07c800000000,
-    0xf07d99bf00000000, 0x9f313c2400000000, 0xeeaea85600000000,
-    0x81e20dcd00000000, 0x713093ba00000000, 0x1e7c362100000000,
-    0x9195ae5500000000, 0xfed90bce00000000, 0x0e0b95b900000000,
-    0x6147302200000000, 0xec35bc5c00000000, 0x837919c700000000,
-    0x73ab87b000000000, 0x1ce7222b00000000, 0x930eba5f00000000,
-    0xfc421fc400000000, 0x0c9081b300000000, 0x63dc242800000000,
-    0x1243b05a00000000, 0x7d0f15c100000000, 0x8ddd8bb600000000,
-    0xe2912e2d00000000, 0x6d78b65900000000, 0x023413c200000000,
-    0xf2e68db500000000, 0x9daa282e00000000, 0xe803954800000000,
-    0x874f30d300000000, 0x779daea400000000, 0x18d10b3f00000000,
-    0x9738934b00000000, 0xf87436d000000000, 0x08a6a8a700000000,
-    0x67ea0d3c00000000, 0x1675994e00000000, 0x79393cd500000000,
-    0x89eba2a200000000, 0xe6a7073900000000, 0x694e9f4d00000000,
-    0x06023ad600000000, 0xf6d0a4a100000000, 0x999c013a00000000,
-    0x14ee8d4400000000, 0x7ba228df00000000, 0x8b70b6a800000000,
-    0xe43c133300000000, 0x6bd58b4700000000, 0x04992edc00000000,
-    0xf44bb0ab00000000, 0x9b07153000000000, 0xea98814200000000,
-    0x85d424d900000000, 0x7506baae00000000, 0x1a4a1f3500000000,
-    0x95a3874100000000, 0xfaef22da00000000, 0x0a3dbcad00000000,
-    0x6571193600000000},
-   {0x0000000000000000, 0x85d996dd00000000, 0x4bb55c6000000000,
-    0xce6ccabd00000000, 0x966ab9c000000000, 0x13b32f1d00000000,
-    0xdddfe5a000000000, 0x5806737d00000000, 0x6dd3035a00000000,
-    0xe80a958700000000, 0x26665f3a00000000, 0xa3bfc9e700000000,
-    0xfbb9ba9a00000000, 0x7e602c4700000000, 0xb00ce6fa00000000,
-    0x35d5702700000000, 0xdaa607b400000000, 0x5f7f916900000000,
-    0x91135bd400000000, 0x14cacd0900000000, 0x4cccbe7400000000,
-    0xc91528a900000000, 0x0779e21400000000, 0x82a074c900000000,
-    0xb77504ee00000000, 0x32ac923300000000, 0xfcc0588e00000000,
-    0x7919ce5300000000, 0x211fbd2e00000000, 0xa4c62bf300000000,
-    0x6aaae14e00000000, 0xef73779300000000, 0xf54b7eb300000000,
-    0x7092e86e00000000, 0xbefe22d300000000, 0x3b27b40e00000000,
-    0x6321c77300000000, 0xe6f851ae00000000, 0x28949b1300000000,
-    0xad4d0dce00000000, 0x98987de900000000, 0x1d41eb3400000000,
-    0xd32d218900000000, 0x56f4b75400000000, 0x0ef2c42900000000,
-    0x8b2b52f400000000, 0x4547984900000000, 0xc09e0e9400000000,
-    0x2fed790700000000, 0xaa34efda00000000, 0x6458256700000000,
-    0xe181b3ba00000000, 0xb987c0c700000000, 0x3c5e561a00000000,
-    0xf2329ca700000000, 0x77eb0a7a00000000, 0x423e7a5d00000000,
-    0xc7e7ec8000000000, 0x098b263d00000000, 0x8c52b0e000000000,
-    0xd454c39d00000000, 0x518d554000000000, 0x9fe19ffd00000000,
-    0x1a38092000000000, 0xab918dbd00000000, 0x2e481b6000000000,
-    0xe024d1dd00000000, 0x65fd470000000000, 0x3dfb347d00000000,
-    0xb822a2a000000000, 0x764e681d00000000, 0xf397fec000000000,
-    0xc6428ee700000000, 0x439b183a00000000, 0x8df7d28700000000,
-    0x082e445a00000000, 0x5028372700000000, 0xd5f1a1fa00000000,
-    0x1b9d6b4700000000, 0x9e44fd9a00000000, 0x71378a0900000000,
-    0xf4ee1cd400000000, 0x3a82d66900000000, 0xbf5b40b400000000,
-    0xe75d33c900000000, 0x6284a51400000000, 0xace86fa900000000,
-    0x2931f97400000000, 0x1ce4895300000000, 0x993d1f8e00000000,
-    0x5751d53300000000, 0xd28843ee00000000, 0x8a8e309300000000,
-    0x0f57a64e00000000, 0xc13b6cf300000000, 0x44e2fa2e00000000,
-    0x5edaf30e00000000, 0xdb0365d300000000, 0x156faf6e00000000,
-    0x90b639b300000000, 0xc8b04ace00000000, 0x4d69dc1300000000,
-    0x830516ae00000000, 0x06dc807300000000, 0x3309f05400000000,
-    0xb6d0668900000000, 0x78bcac3400000000, 0xfd653ae900000000,
-    0xa563499400000000, 0x20badf4900000000, 0xeed615f400000000,
-    0x6b0f832900000000, 0x847cf4ba00000000, 0x01a5626700000000,
-    0xcfc9a8da00000000, 0x4a103e0700000000, 0x12164d7a00000000,
-    0x97cfdba700000000, 0x59a3111a00000000, 0xdc7a87c700000000,
-    0xe9aff7e000000000, 0x6c76613d00000000, 0xa21aab8000000000,
-    0x27c33d5d00000000, 0x7fc54e2000000000, 0xfa1cd8fd00000000,
-    0x3470124000000000, 0xb1a9849d00000000, 0x17256aa000000000,
-    0x92fcfc7d00000000, 0x5c9036c000000000, 0xd949a01d00000000,
-    0x814fd36000000000, 0x049645bd00000000, 0xcafa8f0000000000,
-    0x4f2319dd00000000, 0x7af669fa00000000, 0xff2fff2700000000,
-    0x3143359a00000000, 0xb49aa34700000000, 0xec9cd03a00000000,
-    0x694546e700000000, 0xa7298c5a00000000, 0x22f01a8700000000,
-    0xcd836d1400000000, 0x485afbc900000000, 0x8636317400000000,
-    0x03efa7a900000000, 0x5be9d4d400000000, 0xde30420900000000,
-    0x105c88b400000000, 0x95851e6900000000, 0xa0506e4e00000000,
-    0x2589f89300000000, 0xebe5322e00000000, 0x6e3ca4f300000000,
-    0x363ad78e00000000, 0xb3e3415300000000, 0x7d8f8bee00000000,
-    0xf8561d3300000000, 0xe26e141300000000, 0x67b782ce00000000,
-    0xa9db487300000000, 0x2c02deae00000000, 0x7404add300000000,
-    0xf1dd3b0e00000000, 0x3fb1f1b300000000, 0xba68676e00000000,
-    0x8fbd174900000000, 0x0a64819400000000, 0xc4084b2900000000,
-    0x41d1ddf400000000, 0x19d7ae8900000000, 0x9c0e385400000000,
-    0x5262f2e900000000, 0xd7bb643400000000, 0x38c813a700000000,
-    0xbd11857a00000000, 0x737d4fc700000000, 0xf6a4d91a00000000,
-    0xaea2aa6700000000, 0x2b7b3cba00000000, 0xe517f60700000000,
-    0x60ce60da00000000, 0x551b10fd00000000, 0xd0c2862000000000,
-    0x1eae4c9d00000000, 0x9b77da4000000000, 0xc371a93d00000000,
-    0x46a83fe000000000, 0x88c4f55d00000000, 0x0d1d638000000000,
-    0xbcb4e71d00000000, 0x396d71c000000000, 0xf701bb7d00000000,
-    0x72d82da000000000, 0x2ade5edd00000000, 0xaf07c80000000000,
-    0x616b02bd00000000, 0xe4b2946000000000, 0xd167e44700000000,
-    0x54be729a00000000, 0x9ad2b82700000000, 0x1f0b2efa00000000,
-    0x470d5d8700000000, 0xc2d4cb5a00000000, 0x0cb801e700000000,
-    0x8961973a00000000, 0x6612e0a900000000, 0xe3cb767400000000,
-    0x2da7bcc900000000, 0xa87e2a1400000000, 0xf078596900000000,
-    0x75a1cfb400000000, 0xbbcd050900000000, 0x3e1493d400000000,
-    0x0bc1e3f300000000, 0x8e18752e00000000, 0x4074bf9300000000,
-    0xc5ad294e00000000, 0x9dab5a3300000000, 0x1872ccee00000000,
-    0xd61e065300000000, 0x53c7908e00000000, 0x49ff99ae00000000,
-    0xcc260f7300000000, 0x024ac5ce00000000, 0x8793531300000000,
-    0xdf95206e00000000, 0x5a4cb6b300000000, 0x94207c0e00000000,
-    0x11f9ead300000000, 0x242c9af400000000, 0xa1f50c2900000000,
-    0x6f99c69400000000, 0xea40504900000000, 0xb246233400000000,
-    0x379fb5e900000000, 0xf9f37f5400000000, 0x7c2ae98900000000,
-    0x93599e1a00000000, 0x168008c700000000, 0xd8ecc27a00000000,
-    0x5d3554a700000000, 0x053327da00000000, 0x80eab10700000000,
-    0x4e867bba00000000, 0xcb5fed6700000000, 0xfe8a9d4000000000,
-    0x7b530b9d00000000, 0xb53fc12000000000, 0x30e657fd00000000,
-    0x68e0248000000000, 0xed39b25d00000000, 0x235578e000000000,
-    0xa68cee3d00000000},
-   {0x0000000000000000, 0x76e10f9d00000000, 0xadc46ee100000000,
-    0xdb25617c00000000, 0x1b8fac1900000000, 0x6d6ea38400000000,
-    0xb64bc2f800000000, 0xc0aacd6500000000, 0x361e593300000000,
-    0x40ff56ae00000000, 0x9bda37d200000000, 0xed3b384f00000000,
-    0x2d91f52a00000000, 0x5b70fab700000000, 0x80559bcb00000000,
-    0xf6b4945600000000, 0x6c3cb26600000000, 0x1addbdfb00000000,
-    0xc1f8dc8700000000, 0xb719d31a00000000, 0x77b31e7f00000000,
-    0x015211e200000000, 0xda77709e00000000, 0xac967f0300000000,
-    0x5a22eb5500000000, 0x2cc3e4c800000000, 0xf7e685b400000000,
-    0x81078a2900000000, 0x41ad474c00000000, 0x374c48d100000000,
-    0xec6929ad00000000, 0x9a88263000000000, 0xd87864cd00000000,
-    0xae996b5000000000, 0x75bc0a2c00000000, 0x035d05b100000000,
-    0xc3f7c8d400000000, 0xb516c74900000000, 0x6e33a63500000000,
-    0x18d2a9a800000000, 0xee663dfe00000000, 0x9887326300000000,
-    0x43a2531f00000000, 0x35435c8200000000, 0xf5e991e700000000,
-    0x83089e7a00000000, 0x582dff0600000000, 0x2eccf09b00000000,
-    0xb444d6ab00000000, 0xc2a5d93600000000, 0x1980b84a00000000,
-    0x6f61b7d700000000, 0xafcb7ab200000000, 0xd92a752f00000000,
-    0x020f145300000000, 0x74ee1bce00000000, 0x825a8f9800000000,
-    0xf4bb800500000000, 0x2f9ee17900000000, 0x597feee400000000,
-    0x99d5238100000000, 0xef342c1c00000000, 0x34114d6000000000,
-    0x42f042fd00000000, 0xf1f7b94100000000, 0x8716b6dc00000000,
-    0x5c33d7a000000000, 0x2ad2d83d00000000, 0xea78155800000000,
-    0x9c991ac500000000, 0x47bc7bb900000000, 0x315d742400000000,
-    0xc7e9e07200000000, 0xb108efef00000000, 0x6a2d8e9300000000,
-    0x1ccc810e00000000, 0xdc664c6b00000000, 0xaa8743f600000000,
-    0x71a2228a00000000, 0x07432d1700000000, 0x9dcb0b2700000000,
-    0xeb2a04ba00000000, 0x300f65c600000000, 0x46ee6a5b00000000,
-    0x8644a73e00000000, 0xf0a5a8a300000000, 0x2b80c9df00000000,
-    0x5d61c64200000000, 0xabd5521400000000, 0xdd345d8900000000,
-    0x06113cf500000000, 0x70f0336800000000, 0xb05afe0d00000000,
-    0xc6bbf19000000000, 0x1d9e90ec00000000, 0x6b7f9f7100000000,
-    0x298fdd8c00000000, 0x5f6ed21100000000, 0x844bb36d00000000,
-    0xf2aabcf000000000, 0x3200719500000000, 0x44e17e0800000000,
-    0x9fc41f7400000000, 0xe92510e900000000, 0x1f9184bf00000000,
-    0x69708b2200000000, 0xb255ea5e00000000, 0xc4b4e5c300000000,
-    0x041e28a600000000, 0x72ff273b00000000, 0xa9da464700000000,
-    0xdf3b49da00000000, 0x45b36fea00000000, 0x3352607700000000,
-    0xe877010b00000000, 0x9e960e9600000000, 0x5e3cc3f300000000,
-    0x28ddcc6e00000000, 0xf3f8ad1200000000, 0x8519a28f00000000,
-    0x73ad36d900000000, 0x054c394400000000, 0xde69583800000000,
-    0xa88857a500000000, 0x68229ac000000000, 0x1ec3955d00000000,
-    0xc5e6f42100000000, 0xb307fbbc00000000, 0xe2ef738300000000,
-    0x940e7c1e00000000, 0x4f2b1d6200000000, 0x39ca12ff00000000,
-    0xf960df9a00000000, 0x8f81d00700000000, 0x54a4b17b00000000,
-    0x2245bee600000000, 0xd4f12ab000000000, 0xa210252d00000000,
-    0x7935445100000000, 0x0fd44bcc00000000, 0xcf7e86a900000000,
-    0xb99f893400000000, 0x62bae84800000000, 0x145be7d500000000,
-    0x8ed3c1e500000000, 0xf832ce7800000000, 0x2317af0400000000,
-    0x55f6a09900000000, 0x955c6dfc00000000, 0xe3bd626100000000,
-    0x3898031d00000000, 0x4e790c8000000000, 0xb8cd98d600000000,
-    0xce2c974b00000000, 0x1509f63700000000, 0x63e8f9aa00000000,
-    0xa34234cf00000000, 0xd5a33b5200000000, 0x0e865a2e00000000,
-    0x786755b300000000, 0x3a97174e00000000, 0x4c7618d300000000,
-    0x975379af00000000, 0xe1b2763200000000, 0x2118bb5700000000,
-    0x57f9b4ca00000000, 0x8cdcd5b600000000, 0xfa3dda2b00000000,
-    0x0c894e7d00000000, 0x7a6841e000000000, 0xa14d209c00000000,
-    0xd7ac2f0100000000, 0x1706e26400000000, 0x61e7edf900000000,
-    0xbac28c8500000000, 0xcc23831800000000, 0x56aba52800000000,
-    0x204aaab500000000, 0xfb6fcbc900000000, 0x8d8ec45400000000,
-    0x4d24093100000000, 0x3bc506ac00000000, 0xe0e067d000000000,
-    0x9601684d00000000, 0x60b5fc1b00000000, 0x1654f38600000000,
-    0xcd7192fa00000000, 0xbb909d6700000000, 0x7b3a500200000000,
-    0x0ddb5f9f00000000, 0xd6fe3ee300000000, 0xa01f317e00000000,
-    0x1318cac200000000, 0x65f9c55f00000000, 0xbedca42300000000,
-    0xc83dabbe00000000, 0x089766db00000000, 0x7e76694600000000,
-    0xa553083a00000000, 0xd3b207a700000000, 0x250693f100000000,
-    0x53e79c6c00000000, 0x88c2fd1000000000, 0xfe23f28d00000000,
-    0x3e893fe800000000, 0x4868307500000000, 0x934d510900000000,
-    0xe5ac5e9400000000, 0x7f2478a400000000, 0x09c5773900000000,
-    0xd2e0164500000000, 0xa40119d800000000, 0x64abd4bd00000000,
-    0x124adb2000000000, 0xc96fba5c00000000, 0xbf8eb5c100000000,
-    0x493a219700000000, 0x3fdb2e0a00000000, 0xe4fe4f7600000000,
-    0x921f40eb00000000, 0x52b58d8e00000000, 0x2454821300000000,
-    0xff71e36f00000000, 0x8990ecf200000000, 0xcb60ae0f00000000,
-    0xbd81a19200000000, 0x66a4c0ee00000000, 0x1045cf7300000000,
-    0xd0ef021600000000, 0xa60e0d8b00000000, 0x7d2b6cf700000000,
-    0x0bca636a00000000, 0xfd7ef73c00000000, 0x8b9ff8a100000000,
-    0x50ba99dd00000000, 0x265b964000000000, 0xe6f15b2500000000,
-    0x901054b800000000, 0x4b3535c400000000, 0x3dd43a5900000000,
-    0xa75c1c6900000000, 0xd1bd13f400000000, 0x0a98728800000000,
-    0x7c797d1500000000, 0xbcd3b07000000000, 0xca32bfed00000000,
-    0x1117de9100000000, 0x67f6d10c00000000, 0x9142455a00000000,
-    0xe7a34ac700000000, 0x3c862bbb00000000, 0x4a67242600000000,
-    0x8acde94300000000, 0xfc2ce6de00000000, 0x270987a200000000,
-    0x51e8883f00000000},
-   {0x0000000000000000, 0xe8dbfbb900000000, 0x91b186a800000000,
-    0x796a7d1100000000, 0x63657c8a00000000, 0x8bbe873300000000,
-    0xf2d4fa2200000000, 0x1a0f019b00000000, 0x87cc89cf00000000,
-    0x6f17727600000000, 0x167d0f6700000000, 0xfea6f4de00000000,
-    0xe4a9f54500000000, 0x0c720efc00000000, 0x751873ed00000000,
-    0x9dc3885400000000, 0x4f9f624400000000, 0xa74499fd00000000,
-    0xde2ee4ec00000000, 0x36f51f5500000000, 0x2cfa1ece00000000,
-    0xc421e57700000000, 0xbd4b986600000000, 0x559063df00000000,
-    0xc853eb8b00000000, 0x2088103200000000, 0x59e26d2300000000,
-    0xb139969a00000000, 0xab36970100000000, 0x43ed6cb800000000,
-    0x3a8711a900000000, 0xd25cea1000000000, 0x9e3ec58800000000,
-    0x76e53e3100000000, 0x0f8f432000000000, 0xe754b89900000000,
-    0xfd5bb90200000000, 0x158042bb00000000, 0x6cea3faa00000000,
-    0x8431c41300000000, 0x19f24c4700000000, 0xf129b7fe00000000,
-    0x8843caef00000000, 0x6098315600000000, 0x7a9730cd00000000,
-    0x924ccb7400000000, 0xeb26b66500000000, 0x03fd4ddc00000000,
-    0xd1a1a7cc00000000, 0x397a5c7500000000, 0x4010216400000000,
-    0xa8cbdadd00000000, 0xb2c4db4600000000, 0x5a1f20ff00000000,
-    0x23755dee00000000, 0xcbaea65700000000, 0x566d2e0300000000,
-    0xbeb6d5ba00000000, 0xc7dca8ab00000000, 0x2f07531200000000,
-    0x3508528900000000, 0xddd3a93000000000, 0xa4b9d42100000000,
-    0x4c622f9800000000, 0x7d7bfbca00000000, 0x95a0007300000000,
-    0xecca7d6200000000, 0x041186db00000000, 0x1e1e874000000000,
-    0xf6c57cf900000000, 0x8faf01e800000000, 0x6774fa5100000000,
-    0xfab7720500000000, 0x126c89bc00000000, 0x6b06f4ad00000000,
-    0x83dd0f1400000000, 0x99d20e8f00000000, 0x7109f53600000000,
-    0x0863882700000000, 0xe0b8739e00000000, 0x32e4998e00000000,
-    0xda3f623700000000, 0xa3551f2600000000, 0x4b8ee49f00000000,
-    0x5181e50400000000, 0xb95a1ebd00000000, 0xc03063ac00000000,
-    0x28eb981500000000, 0xb528104100000000, 0x5df3ebf800000000,
-    0x249996e900000000, 0xcc426d5000000000, 0xd64d6ccb00000000,
-    0x3e96977200000000, 0x47fcea6300000000, 0xaf2711da00000000,
-    0xe3453e4200000000, 0x0b9ec5fb00000000, 0x72f4b8ea00000000,
-    0x9a2f435300000000, 0x802042c800000000, 0x68fbb97100000000,
-    0x1191c46000000000, 0xf94a3fd900000000, 0x6489b78d00000000,
-    0x8c524c3400000000, 0xf538312500000000, 0x1de3ca9c00000000,
-    0x07eccb0700000000, 0xef3730be00000000, 0x965d4daf00000000,
-    0x7e86b61600000000, 0xacda5c0600000000, 0x4401a7bf00000000,
-    0x3d6bdaae00000000, 0xd5b0211700000000, 0xcfbf208c00000000,
-    0x2764db3500000000, 0x5e0ea62400000000, 0xb6d55d9d00000000,
-    0x2b16d5c900000000, 0xc3cd2e7000000000, 0xbaa7536100000000,
-    0x527ca8d800000000, 0x4873a94300000000, 0xa0a852fa00000000,
-    0xd9c22feb00000000, 0x3119d45200000000, 0xbbf0874e00000000,
-    0x532b7cf700000000, 0x2a4101e600000000, 0xc29afa5f00000000,
-    0xd895fbc400000000, 0x304e007d00000000, 0x49247d6c00000000,
-    0xa1ff86d500000000, 0x3c3c0e8100000000, 0xd4e7f53800000000,
-    0xad8d882900000000, 0x4556739000000000, 0x5f59720b00000000,
-    0xb78289b200000000, 0xcee8f4a300000000, 0x26330f1a00000000,
-    0xf46fe50a00000000, 0x1cb41eb300000000, 0x65de63a200000000,
-    0x8d05981b00000000, 0x970a998000000000, 0x7fd1623900000000,
-    0x06bb1f2800000000, 0xee60e49100000000, 0x73a36cc500000000,
-    0x9b78977c00000000, 0xe212ea6d00000000, 0x0ac911d400000000,
-    0x10c6104f00000000, 0xf81debf600000000, 0x817796e700000000,
-    0x69ac6d5e00000000, 0x25ce42c600000000, 0xcd15b97f00000000,
-    0xb47fc46e00000000, 0x5ca43fd700000000, 0x46ab3e4c00000000,
-    0xae70c5f500000000, 0xd71ab8e400000000, 0x3fc1435d00000000,
-    0xa202cb0900000000, 0x4ad930b000000000, 0x33b34da100000000,
-    0xdb68b61800000000, 0xc167b78300000000, 0x29bc4c3a00000000,
-    0x50d6312b00000000, 0xb80dca9200000000, 0x6a51208200000000,
-    0x828adb3b00000000, 0xfbe0a62a00000000, 0x133b5d9300000000,
-    0x09345c0800000000, 0xe1efa7b100000000, 0x9885daa000000000,
-    0x705e211900000000, 0xed9da94d00000000, 0x054652f400000000,
-    0x7c2c2fe500000000, 0x94f7d45c00000000, 0x8ef8d5c700000000,
-    0x66232e7e00000000, 0x1f49536f00000000, 0xf792a8d600000000,
-    0xc68b7c8400000000, 0x2e50873d00000000, 0x573afa2c00000000,
-    0xbfe1019500000000, 0xa5ee000e00000000, 0x4d35fbb700000000,
-    0x345f86a600000000, 0xdc847d1f00000000, 0x4147f54b00000000,
-    0xa99c0ef200000000, 0xd0f673e300000000, 0x382d885a00000000,
-    0x222289c100000000, 0xcaf9727800000000, 0xb3930f6900000000,
-    0x5b48f4d000000000, 0x89141ec000000000, 0x61cfe57900000000,
-    0x18a5986800000000, 0xf07e63d100000000, 0xea71624a00000000,
-    0x02aa99f300000000, 0x7bc0e4e200000000, 0x931b1f5b00000000,
-    0x0ed8970f00000000, 0xe6036cb600000000, 0x9f6911a700000000,
-    0x77b2ea1e00000000, 0x6dbdeb8500000000, 0x8566103c00000000,
-    0xfc0c6d2d00000000, 0x14d7969400000000, 0x58b5b90c00000000,
-    0xb06e42b500000000, 0xc9043fa400000000, 0x21dfc41d00000000,
-    0x3bd0c58600000000, 0xd30b3e3f00000000, 0xaa61432e00000000,
-    0x42bab89700000000, 0xdf7930c300000000, 0x37a2cb7a00000000,
-    0x4ec8b66b00000000, 0xa6134dd200000000, 0xbc1c4c4900000000,
-    0x54c7b7f000000000, 0x2dadcae100000000, 0xc576315800000000,
-    0x172adb4800000000, 0xfff120f100000000, 0x869b5de000000000,
-    0x6e40a65900000000, 0x744fa7c200000000, 0x9c945c7b00000000,
-    0xe5fe216a00000000, 0x0d25dad300000000, 0x90e6528700000000,
-    0x783da93e00000000, 0x0157d42f00000000, 0xe98c2f9600000000,
-    0xf3832e0d00000000, 0x1b58d5b400000000, 0x6232a8a500000000,
-    0x8ae9531c00000000},
-   {0x0000000000000000, 0x919168ae00000000, 0x6325a08700000000,
-    0xf2b4c82900000000, 0x874c31d400000000, 0x16dd597a00000000,
-    0xe469915300000000, 0x75f8f9fd00000000, 0x4f9f137300000000,
-    0xde0e7bdd00000000, 0x2cbab3f400000000, 0xbd2bdb5a00000000,
-    0xc8d322a700000000, 0x59424a0900000000, 0xabf6822000000000,
-    0x3a67ea8e00000000, 0x9e3e27e600000000, 0x0faf4f4800000000,
-    0xfd1b876100000000, 0x6c8aefcf00000000, 0x1972163200000000,
-    0x88e37e9c00000000, 0x7a57b6b500000000, 0xebc6de1b00000000,
-    0xd1a1349500000000, 0x40305c3b00000000, 0xb284941200000000,
-    0x2315fcbc00000000, 0x56ed054100000000, 0xc77c6def00000000,
-    0x35c8a5c600000000, 0xa459cd6800000000, 0x7d7b3f1700000000,
-    0xecea57b900000000, 0x1e5e9f9000000000, 0x8fcff73e00000000,
-    0xfa370ec300000000, 0x6ba6666d00000000, 0x9912ae4400000000,
-    0x0883c6ea00000000, 0x32e42c6400000000, 0xa37544ca00000000,
-    0x51c18ce300000000, 0xc050e44d00000000, 0xb5a81db000000000,
-    0x2439751e00000000, 0xd68dbd3700000000, 0x471cd59900000000,
-    0xe34518f100000000, 0x72d4705f00000000, 0x8060b87600000000,
-    0x11f1d0d800000000, 0x6409292500000000, 0xf598418b00000000,
-    0x072c89a200000000, 0x96bde10c00000000, 0xacda0b8200000000,
-    0x3d4b632c00000000, 0xcfffab0500000000, 0x5e6ec3ab00000000,
-    0x2b963a5600000000, 0xba0752f800000000, 0x48b39ad100000000,
-    0xd922f27f00000000, 0xfaf67e2e00000000, 0x6b67168000000000,
-    0x99d3dea900000000, 0x0842b60700000000, 0x7dba4ffa00000000,
-    0xec2b275400000000, 0x1e9fef7d00000000, 0x8f0e87d300000000,
-    0xb5696d5d00000000, 0x24f805f300000000, 0xd64ccdda00000000,
-    0x47dda57400000000, 0x32255c8900000000, 0xa3b4342700000000,
-    0x5100fc0e00000000, 0xc09194a000000000, 0x64c859c800000000,
-    0xf559316600000000, 0x07edf94f00000000, 0x967c91e100000000,
-    0xe384681c00000000, 0x721500b200000000, 0x80a1c89b00000000,
-    0x1130a03500000000, 0x2b574abb00000000, 0xbac6221500000000,
-    0x4872ea3c00000000, 0xd9e3829200000000, 0xac1b7b6f00000000,
-    0x3d8a13c100000000, 0xcf3edbe800000000, 0x5eafb34600000000,
-    0x878d413900000000, 0x161c299700000000, 0xe4a8e1be00000000,
-    0x7539891000000000, 0x00c170ed00000000, 0x9150184300000000,
-    0x63e4d06a00000000, 0xf275b8c400000000, 0xc812524a00000000,
-    0x59833ae400000000, 0xab37f2cd00000000, 0x3aa69a6300000000,
-    0x4f5e639e00000000, 0xdecf0b3000000000, 0x2c7bc31900000000,
-    0xbdeaabb700000000, 0x19b366df00000000, 0x88220e7100000000,
-    0x7a96c65800000000, 0xeb07aef600000000, 0x9eff570b00000000,
-    0x0f6e3fa500000000, 0xfddaf78c00000000, 0x6c4b9f2200000000,
-    0x562c75ac00000000, 0xc7bd1d0200000000, 0x3509d52b00000000,
-    0xa498bd8500000000, 0xd160447800000000, 0x40f12cd600000000,
-    0xb245e4ff00000000, 0x23d48c5100000000, 0xf4edfd5c00000000,
-    0x657c95f200000000, 0x97c85ddb00000000, 0x0659357500000000,
-    0x73a1cc8800000000, 0xe230a42600000000, 0x10846c0f00000000,
-    0x811504a100000000, 0xbb72ee2f00000000, 0x2ae3868100000000,
-    0xd8574ea800000000, 0x49c6260600000000, 0x3c3edffb00000000,
-    0xadafb75500000000, 0x5f1b7f7c00000000, 0xce8a17d200000000,
-    0x6ad3daba00000000, 0xfb42b21400000000, 0x09f67a3d00000000,
-    0x9867129300000000, 0xed9feb6e00000000, 0x7c0e83c000000000,
-    0x8eba4be900000000, 0x1f2b234700000000, 0x254cc9c900000000,
-    0xb4dda16700000000, 0x4669694e00000000, 0xd7f801e000000000,
-    0xa200f81d00000000, 0x339190b300000000, 0xc125589a00000000,
-    0x50b4303400000000, 0x8996c24b00000000, 0x1807aae500000000,
-    0xeab362cc00000000, 0x7b220a6200000000, 0x0edaf39f00000000,
-    0x9f4b9b3100000000, 0x6dff531800000000, 0xfc6e3bb600000000,
-    0xc609d13800000000, 0x5798b99600000000, 0xa52c71bf00000000,
-    0x34bd191100000000, 0x4145e0ec00000000, 0xd0d4884200000000,
-    0x2260406b00000000, 0xb3f128c500000000, 0x17a8e5ad00000000,
-    0x86398d0300000000, 0x748d452a00000000, 0xe51c2d8400000000,
-    0x90e4d47900000000, 0x0175bcd700000000, 0xf3c174fe00000000,
-    0x62501c5000000000, 0x5837f6de00000000, 0xc9a69e7000000000,
-    0x3b12565900000000, 0xaa833ef700000000, 0xdf7bc70a00000000,
-    0x4eeaafa400000000, 0xbc5e678d00000000, 0x2dcf0f2300000000,
-    0x0e1b837200000000, 0x9f8aebdc00000000, 0x6d3e23f500000000,
-    0xfcaf4b5b00000000, 0x8957b2a600000000, 0x18c6da0800000000,
-    0xea72122100000000, 0x7be37a8f00000000, 0x4184900100000000,
-    0xd015f8af00000000, 0x22a1308600000000, 0xb330582800000000,
-    0xc6c8a1d500000000, 0x5759c97b00000000, 0xa5ed015200000000,
-    0x347c69fc00000000, 0x9025a49400000000, 0x01b4cc3a00000000,
-    0xf300041300000000, 0x62916cbd00000000, 0x1769954000000000,
-    0x86f8fdee00000000, 0x744c35c700000000, 0xe5dd5d6900000000,
-    0xdfbab7e700000000, 0x4e2bdf4900000000, 0xbc9f176000000000,
-    0x2d0e7fce00000000, 0x58f6863300000000, 0xc967ee9d00000000,
-    0x3bd326b400000000, 0xaa424e1a00000000, 0x7360bc6500000000,
-    0xe2f1d4cb00000000, 0x10451ce200000000, 0x81d4744c00000000,
-    0xf42c8db100000000, 0x65bde51f00000000, 0x97092d3600000000,
-    0x0698459800000000, 0x3cffaf1600000000, 0xad6ec7b800000000,
-    0x5fda0f9100000000, 0xce4b673f00000000, 0xbbb39ec200000000,
-    0x2a22f66c00000000, 0xd8963e4500000000, 0x490756eb00000000,
-    0xed5e9b8300000000, 0x7ccff32d00000000, 0x8e7b3b0400000000,
-    0x1fea53aa00000000, 0x6a12aa5700000000, 0xfb83c2f900000000,
-    0x09370ad000000000, 0x98a6627e00000000, 0xa2c188f000000000,
-    0x3350e05e00000000, 0xc1e4287700000000, 0x507540d900000000,
-    0x258db92400000000, 0xb41cd18a00000000, 0x46a819a300000000,
-    0xd739710d00000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
-    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
-    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
-    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
-    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
-    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
-    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
-    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
-    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
-    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
-    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
-    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
-    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
-    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
-    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
-    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
-    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
-    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
-    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
-    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
-    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
-    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
-    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
-    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
-    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
-    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
-    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
-    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
-    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
-    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
-    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
-    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
-    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
-    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
-    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
-    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
-    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
-    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
-    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
-    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
-    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
-    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
-    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
-    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
-    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
-    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
-    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
-    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
-    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
-    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
-    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
-    0x264b06e6},
-   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
-    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
-    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
-    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
-    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
-    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
-    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
-    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
-    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
-    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
-    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
-    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
-    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
-    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
-    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
-    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
-    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
-    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
-    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
-    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
-    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
-    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
-    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
-    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
-    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
-    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
-    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
-    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
-    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
-    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
-    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
-    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
-    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
-    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
-    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
-    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
-    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
-    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
-    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
-    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
-    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
-    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
-    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
-    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
-    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
-    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
-    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
-    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
-    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
-    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
-    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
-    0x92364a30},
-   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
-    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
-    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
-    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
-    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
-    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
-    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
-    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
-    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
-    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
-    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
-    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
-    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
-    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
-    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
-    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
-    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
-    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
-    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
-    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
-    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
-    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
-    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
-    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
-    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
-    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
-    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
-    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
-    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
-    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
-    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
-    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
-    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
-    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
-    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
-    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
-    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
-    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
-    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
-    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
-    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
-    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
-    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
-    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
-    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
-    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
-    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
-    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
-    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
-    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
-    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
-    0xe4c4abcc},
-   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
-    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
-    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
-    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
-    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
-    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
-    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
-    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
-    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
-    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
-    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
-    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
-    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
-    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
-    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
-    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
-    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
-    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
-    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
-    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
-    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
-    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
-    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
-    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
-    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
-    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
-    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
-    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
-    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
-    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
-    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
-    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
-    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
-    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
-    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
-    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
-    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
-    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
-    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
-    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
-    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
-    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
-    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
-    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
-    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
-    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
-    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
-    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
-    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
-    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
-    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
-    0xca64c78c}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0xb029603d, 0x6053c07a, 0xd07aa047, 0xc0a680f5,
-    0x708fe0c8, 0xa0f5408f, 0x10dc20b2, 0xc14b7030, 0x7162100d,
-    0xa118b04a, 0x1131d077, 0x01edf0c5, 0xb1c490f8, 0x61be30bf,
-    0xd1975082, 0x8297e060, 0x32be805d, 0xe2c4201a, 0x52ed4027,
-    0x42316095, 0xf21800a8, 0x2262a0ef, 0x924bc0d2, 0x43dc9050,
-    0xf3f5f06d, 0x238f502a, 0x93a63017, 0x837a10a5, 0x33537098,
-    0xe329d0df, 0x5300b0e2, 0x042fc1c1, 0xb406a1fc, 0x647c01bb,
-    0xd4556186, 0xc4894134, 0x74a02109, 0xa4da814e, 0x14f3e173,
-    0xc564b1f1, 0x754dd1cc, 0xa537718b, 0x151e11b6, 0x05c23104,
-    0xb5eb5139, 0x6591f17e, 0xd5b89143, 0x86b821a1, 0x3691419c,
-    0xe6ebe1db, 0x56c281e6, 0x461ea154, 0xf637c169, 0x264d612e,
-    0x96640113, 0x47f35191, 0xf7da31ac, 0x27a091eb, 0x9789f1d6,
-    0x8755d164, 0x377cb159, 0xe706111e, 0x572f7123, 0x4958f358,
-    0xf9719365, 0x290b3322, 0x9922531f, 0x89fe73ad, 0x39d71390,
-    0xe9adb3d7, 0x5984d3ea, 0x88138368, 0x383ae355, 0xe8404312,
-    0x5869232f, 0x48b5039d, 0xf89c63a0, 0x28e6c3e7, 0x98cfa3da,
-    0xcbcf1338, 0x7be67305, 0xab9cd342, 0x1bb5b37f, 0x0b6993cd,
-    0xbb40f3f0, 0x6b3a53b7, 0xdb13338a, 0x0a846308, 0xbaad0335,
-    0x6ad7a372, 0xdafec34f, 0xca22e3fd, 0x7a0b83c0, 0xaa712387,
-    0x1a5843ba, 0x4d773299, 0xfd5e52a4, 0x2d24f2e3, 0x9d0d92de,
-    0x8dd1b26c, 0x3df8d251, 0xed827216, 0x5dab122b, 0x8c3c42a9,
-    0x3c152294, 0xec6f82d3, 0x5c46e2ee, 0x4c9ac25c, 0xfcb3a261,
-    0x2cc90226, 0x9ce0621b, 0xcfe0d2f9, 0x7fc9b2c4, 0xafb31283,
-    0x1f9a72be, 0x0f46520c, 0xbf6f3231, 0x6f159276, 0xdf3cf24b,
-    0x0eaba2c9, 0xbe82c2f4, 0x6ef862b3, 0xded1028e, 0xce0d223c,
-    0x7e244201, 0xae5ee246, 0x1e77827b, 0x92b0e6b1, 0x2299868c,
-    0xf2e326cb, 0x42ca46f6, 0x52166644, 0xe23f0679, 0x3245a63e,
-    0x826cc603, 0x53fb9681, 0xe3d2f6bc, 0x33a856fb, 0x838136c6,
-    0x935d1674, 0x23747649, 0xf30ed60e, 0x4327b633, 0x102706d1,
-    0xa00e66ec, 0x7074c6ab, 0xc05da696, 0xd0818624, 0x60a8e619,
-    0xb0d2465e, 0x00fb2663, 0xd16c76e1, 0x614516dc, 0xb13fb69b,
-    0x0116d6a6, 0x11caf614, 0xa1e39629, 0x7199366e, 0xc1b05653,
-    0x969f2770, 0x26b6474d, 0xf6cce70a, 0x46e58737, 0x5639a785,
-    0xe610c7b8, 0x366a67ff, 0x864307c2, 0x57d45740, 0xe7fd377d,
-    0x3787973a, 0x87aef707, 0x9772d7b5, 0x275bb788, 0xf72117cf,
-    0x470877f2, 0x1408c710, 0xa421a72d, 0x745b076a, 0xc4726757,
-    0xd4ae47e5, 0x648727d8, 0xb4fd879f, 0x04d4e7a2, 0xd543b720,
-    0x656ad71d, 0xb510775a, 0x05391767, 0x15e537d5, 0xa5cc57e8,
-    0x75b6f7af, 0xc59f9792, 0xdbe815e9, 0x6bc175d4, 0xbbbbd593,
-    0x0b92b5ae, 0x1b4e951c, 0xab67f521, 0x7b1d5566, 0xcb34355b,
-    0x1aa365d9, 0xaa8a05e4, 0x7af0a5a3, 0xcad9c59e, 0xda05e52c,
-    0x6a2c8511, 0xba562556, 0x0a7f456b, 0x597ff589, 0xe95695b4,
-    0x392c35f3, 0x890555ce, 0x99d9757c, 0x29f01541, 0xf98ab506,
-    0x49a3d53b, 0x983485b9, 0x281de584, 0xf86745c3, 0x484e25fe,
-    0x5892054c, 0xe8bb6571, 0x38c1c536, 0x88e8a50b, 0xdfc7d428,
-    0x6feeb415, 0xbf941452, 0x0fbd746f, 0x1f6154dd, 0xaf4834e0,
-    0x7f3294a7, 0xcf1bf49a, 0x1e8ca418, 0xaea5c425, 0x7edf6462,
-    0xcef6045f, 0xde2a24ed, 0x6e0344d0, 0xbe79e497, 0x0e5084aa,
-    0x5d503448, 0xed795475, 0x3d03f432, 0x8d2a940f, 0x9df6b4bd,
-    0x2ddfd480, 0xfda574c7, 0x4d8c14fa, 0x9c1b4478, 0x2c322445,
-    0xfc488402, 0x4c61e43f, 0x5cbdc48d, 0xec94a4b0, 0x3cee04f7,
-    0x8cc764ca},
-   {0x00000000, 0xa5d35ccb, 0x0ba1c84d, 0xae729486, 0x1642919b,
-    0xb391cd50, 0x1de359d6, 0xb830051d, 0x6d8253ec, 0xc8510f27,
-    0x66239ba1, 0xc3f0c76a, 0x7bc0c277, 0xde139ebc, 0x70610a3a,
-    0xd5b256f1, 0x9b02d603, 0x3ed18ac8, 0x90a31e4e, 0x35704285,
-    0x8d404798, 0x28931b53, 0x86e18fd5, 0x2332d31e, 0xf68085ef,
-    0x5353d924, 0xfd214da2, 0x58f21169, 0xe0c21474, 0x451148bf,
-    0xeb63dc39, 0x4eb080f2, 0x3605ac07, 0x93d6f0cc, 0x3da4644a,
-    0x98773881, 0x20473d9c, 0x85946157, 0x2be6f5d1, 0x8e35a91a,
-    0x5b87ffeb, 0xfe54a320, 0x502637a6, 0xf5f56b6d, 0x4dc56e70,
-    0xe81632bb, 0x4664a63d, 0xe3b7faf6, 0xad077a04, 0x08d426cf,
-    0xa6a6b249, 0x0375ee82, 0xbb45eb9f, 0x1e96b754, 0xb0e423d2,
-    0x15377f19, 0xc08529e8, 0x65567523, 0xcb24e1a5, 0x6ef7bd6e,
-    0xd6c7b873, 0x7314e4b8, 0xdd66703e, 0x78b52cf5, 0x6c0a580f,
-    0xc9d904c4, 0x67ab9042, 0xc278cc89, 0x7a48c994, 0xdf9b955f,
-    0x71e901d9, 0xd43a5d12, 0x01880be3, 0xa45b5728, 0x0a29c3ae,
-    0xaffa9f65, 0x17ca9a78, 0xb219c6b3, 0x1c6b5235, 0xb9b80efe,
-    0xf7088e0c, 0x52dbd2c7, 0xfca94641, 0x597a1a8a, 0xe14a1f97,
-    0x4499435c, 0xeaebd7da, 0x4f388b11, 0x9a8adde0, 0x3f59812b,
-    0x912b15ad, 0x34f84966, 0x8cc84c7b, 0x291b10b0, 0x87698436,
-    0x22bad8fd, 0x5a0ff408, 0xffdca8c3, 0x51ae3c45, 0xf47d608e,
-    0x4c4d6593, 0xe99e3958, 0x47ecadde, 0xe23ff115, 0x378da7e4,
-    0x925efb2f, 0x3c2c6fa9, 0x99ff3362, 0x21cf367f, 0x841c6ab4,
-    0x2a6efe32, 0x8fbda2f9, 0xc10d220b, 0x64de7ec0, 0xcaacea46,
-    0x6f7fb68d, 0xd74fb390, 0x729cef5b, 0xdcee7bdd, 0x793d2716,
-    0xac8f71e7, 0x095c2d2c, 0xa72eb9aa, 0x02fde561, 0xbacde07c,
-    0x1f1ebcb7, 0xb16c2831, 0x14bf74fa, 0xd814b01e, 0x7dc7ecd5,
-    0xd3b57853, 0x76662498, 0xce562185, 0x6b857d4e, 0xc5f7e9c8,
-    0x6024b503, 0xb596e3f2, 0x1045bf39, 0xbe372bbf, 0x1be47774,
-    0xa3d47269, 0x06072ea2, 0xa875ba24, 0x0da6e6ef, 0x4316661d,
-    0xe6c53ad6, 0x48b7ae50, 0xed64f29b, 0x5554f786, 0xf087ab4d,
-    0x5ef53fcb, 0xfb266300, 0x2e9435f1, 0x8b47693a, 0x2535fdbc,
-    0x80e6a177, 0x38d6a46a, 0x9d05f8a1, 0x33776c27, 0x96a430ec,
-    0xee111c19, 0x4bc240d2, 0xe5b0d454, 0x4063889f, 0xf8538d82,
-    0x5d80d149, 0xf3f245cf, 0x56211904, 0x83934ff5, 0x2640133e,
-    0x883287b8, 0x2de1db73, 0x95d1de6e, 0x300282a5, 0x9e701623,
-    0x3ba34ae8, 0x7513ca1a, 0xd0c096d1, 0x7eb20257, 0xdb615e9c,
-    0x63515b81, 0xc682074a, 0x68f093cc, 0xcd23cf07, 0x189199f6,
-    0xbd42c53d, 0x133051bb, 0xb6e30d70, 0x0ed3086d, 0xab0054a6,
-    0x0572c020, 0xa0a19ceb, 0xb41ee811, 0x11cdb4da, 0xbfbf205c,
-    0x1a6c7c97, 0xa25c798a, 0x078f2541, 0xa9fdb1c7, 0x0c2eed0c,
-    0xd99cbbfd, 0x7c4fe736, 0xd23d73b0, 0x77ee2f7b, 0xcfde2a66,
-    0x6a0d76ad, 0xc47fe22b, 0x61acbee0, 0x2f1c3e12, 0x8acf62d9,
-    0x24bdf65f, 0x816eaa94, 0x395eaf89, 0x9c8df342, 0x32ff67c4,
-    0x972c3b0f, 0x429e6dfe, 0xe74d3135, 0x493fa5b3, 0xececf978,
-    0x54dcfc65, 0xf10fa0ae, 0x5f7d3428, 0xfaae68e3, 0x821b4416,
-    0x27c818dd, 0x89ba8c5b, 0x2c69d090, 0x9459d58d, 0x318a8946,
-    0x9ff81dc0, 0x3a2b410b, 0xef9917fa, 0x4a4a4b31, 0xe438dfb7,
-    0x41eb837c, 0xf9db8661, 0x5c08daaa, 0xf27a4e2c, 0x57a912e7,
-    0x19199215, 0xbccacede, 0x12b85a58, 0xb76b0693, 0x0f5b038e,
-    0xaa885f45, 0x04facbc3, 0xa1299708, 0x749bc1f9, 0xd1489d32,
-    0x7f3a09b4, 0xdae9557f, 0x62d95062, 0xc70a0ca9, 0x6978982f,
-    0xccabc4e4},
-   {0x00000000, 0xb40b77a6, 0x29119f97, 0x9d1ae831, 0x13244ff4,
-    0xa72f3852, 0x3a35d063, 0x8e3ea7c5, 0x674eef33, 0xd3459895,
-    0x4e5f70a4, 0xfa540702, 0x746aa0c7, 0xc061d761, 0x5d7b3f50,
-    0xe97048f6, 0xce9cde67, 0x7a97a9c1, 0xe78d41f0, 0x53863656,
-    0xddb89193, 0x69b3e635, 0xf4a90e04, 0x40a279a2, 0xa9d23154,
-    0x1dd946f2, 0x80c3aec3, 0x34c8d965, 0xbaf67ea0, 0x0efd0906,
-    0x93e7e137, 0x27ec9691, 0x9c39bdcf, 0x2832ca69, 0xb5282258,
-    0x012355fe, 0x8f1df23b, 0x3b16859d, 0xa60c6dac, 0x12071a0a,
-    0xfb7752fc, 0x4f7c255a, 0xd266cd6b, 0x666dbacd, 0xe8531d08,
-    0x5c586aae, 0xc142829f, 0x7549f539, 0x52a563a8, 0xe6ae140e,
-    0x7bb4fc3f, 0xcfbf8b99, 0x41812c5c, 0xf58a5bfa, 0x6890b3cb,
-    0xdc9bc46d, 0x35eb8c9b, 0x81e0fb3d, 0x1cfa130c, 0xa8f164aa,
-    0x26cfc36f, 0x92c4b4c9, 0x0fde5cf8, 0xbbd52b5e, 0x79750b44,
-    0xcd7e7ce2, 0x506494d3, 0xe46fe375, 0x6a5144b0, 0xde5a3316,
-    0x4340db27, 0xf74bac81, 0x1e3be477, 0xaa3093d1, 0x372a7be0,
-    0x83210c46, 0x0d1fab83, 0xb914dc25, 0x240e3414, 0x900543b2,
-    0xb7e9d523, 0x03e2a285, 0x9ef84ab4, 0x2af33d12, 0xa4cd9ad7,
-    0x10c6ed71, 0x8ddc0540, 0x39d772e6, 0xd0a73a10, 0x64ac4db6,
-    0xf9b6a587, 0x4dbdd221, 0xc38375e4, 0x77880242, 0xea92ea73,
-    0x5e999dd5, 0xe54cb68b, 0x5147c12d, 0xcc5d291c, 0x78565eba,
-    0xf668f97f, 0x42638ed9, 0xdf7966e8, 0x6b72114e, 0x820259b8,
-    0x36092e1e, 0xab13c62f, 0x1f18b189, 0x9126164c, 0x252d61ea,
-    0xb83789db, 0x0c3cfe7d, 0x2bd068ec, 0x9fdb1f4a, 0x02c1f77b,
-    0xb6ca80dd, 0x38f42718, 0x8cff50be, 0x11e5b88f, 0xa5eecf29,
-    0x4c9e87df, 0xf895f079, 0x658f1848, 0xd1846fee, 0x5fbac82b,
-    0xebb1bf8d, 0x76ab57bc, 0xc2a0201a, 0xf2ea1688, 0x46e1612e,
-    0xdbfb891f, 0x6ff0feb9, 0xe1ce597c, 0x55c52eda, 0xc8dfc6eb,
-    0x7cd4b14d, 0x95a4f9bb, 0x21af8e1d, 0xbcb5662c, 0x08be118a,
-    0x8680b64f, 0x328bc1e9, 0xaf9129d8, 0x1b9a5e7e, 0x3c76c8ef,
-    0x887dbf49, 0x15675778, 0xa16c20de, 0x2f52871b, 0x9b59f0bd,
-    0x0643188c, 0xb2486f2a, 0x5b3827dc, 0xef33507a, 0x7229b84b,
-    0xc622cfed, 0x481c6828, 0xfc171f8e, 0x610df7bf, 0xd5068019,
-    0x6ed3ab47, 0xdad8dce1, 0x47c234d0, 0xf3c94376, 0x7df7e4b3,
-    0xc9fc9315, 0x54e67b24, 0xe0ed0c82, 0x099d4474, 0xbd9633d2,
-    0x208cdbe3, 0x9487ac45, 0x1ab90b80, 0xaeb27c26, 0x33a89417,
-    0x87a3e3b1, 0xa04f7520, 0x14440286, 0x895eeab7, 0x3d559d11,
-    0xb36b3ad4, 0x07604d72, 0x9a7aa543, 0x2e71d2e5, 0xc7019a13,
-    0x730aedb5, 0xee100584, 0x5a1b7222, 0xd425d5e7, 0x602ea241,
-    0xfd344a70, 0x493f3dd6, 0x8b9f1dcc, 0x3f946a6a, 0xa28e825b,
-    0x1685f5fd, 0x98bb5238, 0x2cb0259e, 0xb1aacdaf, 0x05a1ba09,
-    0xecd1f2ff, 0x58da8559, 0xc5c06d68, 0x71cb1ace, 0xfff5bd0b,
-    0x4bfecaad, 0xd6e4229c, 0x62ef553a, 0x4503c3ab, 0xf108b40d,
-    0x6c125c3c, 0xd8192b9a, 0x56278c5f, 0xe22cfbf9, 0x7f3613c8,
-    0xcb3d646e, 0x224d2c98, 0x96465b3e, 0x0b5cb30f, 0xbf57c4a9,
-    0x3169636c, 0x856214ca, 0x1878fcfb, 0xac738b5d, 0x17a6a003,
-    0xa3add7a5, 0x3eb73f94, 0x8abc4832, 0x0482eff7, 0xb0899851,
-    0x2d937060, 0x999807c6, 0x70e84f30, 0xc4e33896, 0x59f9d0a7,
-    0xedf2a701, 0x63cc00c4, 0xd7c77762, 0x4add9f53, 0xfed6e8f5,
-    0xd93a7e64, 0x6d3109c2, 0xf02be1f3, 0x44209655, 0xca1e3190,
-    0x7e154636, 0xe30fae07, 0x5704d9a1, 0xbe749157, 0x0a7fe6f1,
-    0x97650ec0, 0x236e7966, 0xad50dea3, 0x195ba905, 0x84414134,
-    0x304a3692},
-   {0x00000000, 0x9e00aacc, 0x7d072542, 0xe3078f8e, 0xfa0e4a84,
-    0x640ee048, 0x87096fc6, 0x1909c50a, 0xb51be5d3, 0x2b1b4f1f,
-    0xc81cc091, 0x561c6a5d, 0x4f15af57, 0xd115059b, 0x32128a15,
-    0xac1220d9, 0x2b31bb7c, 0xb53111b0, 0x56369e3e, 0xc83634f2,
-    0xd13ff1f8, 0x4f3f5b34, 0xac38d4ba, 0x32387e76, 0x9e2a5eaf,
-    0x002af463, 0xe32d7bed, 0x7d2dd121, 0x6424142b, 0xfa24bee7,
-    0x19233169, 0x87239ba5, 0x566276f9, 0xc862dc35, 0x2b6553bb,
-    0xb565f977, 0xac6c3c7d, 0x326c96b1, 0xd16b193f, 0x4f6bb3f3,
-    0xe379932a, 0x7d7939e6, 0x9e7eb668, 0x007e1ca4, 0x1977d9ae,
-    0x87777362, 0x6470fcec, 0xfa705620, 0x7d53cd85, 0xe3536749,
-    0x0054e8c7, 0x9e54420b, 0x875d8701, 0x195d2dcd, 0xfa5aa243,
-    0x645a088f, 0xc8482856, 0x5648829a, 0xb54f0d14, 0x2b4fa7d8,
-    0x324662d2, 0xac46c81e, 0x4f414790, 0xd141ed5c, 0xedc29d29,
-    0x73c237e5, 0x90c5b86b, 0x0ec512a7, 0x17ccd7ad, 0x89cc7d61,
-    0x6acbf2ef, 0xf4cb5823, 0x58d978fa, 0xc6d9d236, 0x25de5db8,
-    0xbbdef774, 0xa2d7327e, 0x3cd798b2, 0xdfd0173c, 0x41d0bdf0,
-    0xc6f32655, 0x58f38c99, 0xbbf40317, 0x25f4a9db, 0x3cfd6cd1,
-    0xa2fdc61d, 0x41fa4993, 0xdffae35f, 0x73e8c386, 0xede8694a,
-    0x0eefe6c4, 0x90ef4c08, 0x89e68902, 0x17e623ce, 0xf4e1ac40,
-    0x6ae1068c, 0xbba0ebd0, 0x25a0411c, 0xc6a7ce92, 0x58a7645e,
-    0x41aea154, 0xdfae0b98, 0x3ca98416, 0xa2a92eda, 0x0ebb0e03,
-    0x90bba4cf, 0x73bc2b41, 0xedbc818d, 0xf4b54487, 0x6ab5ee4b,
-    0x89b261c5, 0x17b2cb09, 0x909150ac, 0x0e91fa60, 0xed9675ee,
-    0x7396df22, 0x6a9f1a28, 0xf49fb0e4, 0x17983f6a, 0x899895a6,
-    0x258ab57f, 0xbb8a1fb3, 0x588d903d, 0xc68d3af1, 0xdf84fffb,
-    0x41845537, 0xa283dab9, 0x3c837075, 0xda853b53, 0x4485919f,
-    0xa7821e11, 0x3982b4dd, 0x208b71d7, 0xbe8bdb1b, 0x5d8c5495,
-    0xc38cfe59, 0x6f9ede80, 0xf19e744c, 0x1299fbc2, 0x8c99510e,
-    0x95909404, 0x0b903ec8, 0xe897b146, 0x76971b8a, 0xf1b4802f,
-    0x6fb42ae3, 0x8cb3a56d, 0x12b30fa1, 0x0bbacaab, 0x95ba6067,
-    0x76bdefe9, 0xe8bd4525, 0x44af65fc, 0xdaafcf30, 0x39a840be,
-    0xa7a8ea72, 0xbea12f78, 0x20a185b4, 0xc3a60a3a, 0x5da6a0f6,
-    0x8ce74daa, 0x12e7e766, 0xf1e068e8, 0x6fe0c224, 0x76e9072e,
-    0xe8e9ade2, 0x0bee226c, 0x95ee88a0, 0x39fca879, 0xa7fc02b5,
-    0x44fb8d3b, 0xdafb27f7, 0xc3f2e2fd, 0x5df24831, 0xbef5c7bf,
-    0x20f56d73, 0xa7d6f6d6, 0x39d65c1a, 0xdad1d394, 0x44d17958,
-    0x5dd8bc52, 0xc3d8169e, 0x20df9910, 0xbedf33dc, 0x12cd1305,
-    0x8ccdb9c9, 0x6fca3647, 0xf1ca9c8b, 0xe8c35981, 0x76c3f34d,
-    0x95c47cc3, 0x0bc4d60f, 0x3747a67a, 0xa9470cb6, 0x4a408338,
-    0xd44029f4, 0xcd49ecfe, 0x53494632, 0xb04ec9bc, 0x2e4e6370,
-    0x825c43a9, 0x1c5ce965, 0xff5b66eb, 0x615bcc27, 0x7852092d,
-    0xe652a3e1, 0x05552c6f, 0x9b5586a3, 0x1c761d06, 0x8276b7ca,
-    0x61713844, 0xff719288, 0xe6785782, 0x7878fd4e, 0x9b7f72c0,
-    0x057fd80c, 0xa96df8d5, 0x376d5219, 0xd46add97, 0x4a6a775b,
-    0x5363b251, 0xcd63189d, 0x2e649713, 0xb0643ddf, 0x6125d083,
-    0xff257a4f, 0x1c22f5c1, 0x82225f0d, 0x9b2b9a07, 0x052b30cb,
-    0xe62cbf45, 0x782c1589, 0xd43e3550, 0x4a3e9f9c, 0xa9391012,
-    0x3739bade, 0x2e307fd4, 0xb030d518, 0x53375a96, 0xcd37f05a,
-    0x4a146bff, 0xd414c133, 0x37134ebd, 0xa913e471, 0xb01a217b,
-    0x2e1a8bb7, 0xcd1d0439, 0x531daef5, 0xff0f8e2c, 0x610f24e0,
-    0x8208ab6e, 0x1c0801a2, 0x0501c4a8, 0x9b016e64, 0x7806e1ea,
-    0xe6064b26}};
-
-#endif /* W */
-
-#endif /* N == 2 */
-#if N == 3
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
-    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
-    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
-    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
-    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
-    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
-    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
-    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
-    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
-    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
-    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
-    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
-    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
-    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
-    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
-    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
-    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
-    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
-    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
-    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
-    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
-    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
-    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
-    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
-    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
-    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
-    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
-    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
-    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
-    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
-    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
-    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
-    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
-    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
-    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
-    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
-    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
-    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
-    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
-    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
-    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
-    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
-    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
-    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
-    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
-    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
-    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
-    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
-    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
-    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
-    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
-    0x09cd8551},
-   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
-    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
-    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
-    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
-    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
-    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
-    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
-    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
-    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
-    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
-    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
-    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
-    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
-    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
-    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
-    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
-    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
-    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
-    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
-    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
-    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
-    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
-    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
-    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
-    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
-    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
-    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
-    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
-    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
-    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
-    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
-    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
-    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
-    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
-    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
-    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
-    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
-    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
-    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
-    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
-    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
-    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
-    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
-    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
-    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
-    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
-    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
-    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
-    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
-    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
-    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
-    0x7bc97a0c},
-   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
-    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
-    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
-    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
-    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
-    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
-    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
-    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
-    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
-    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
-    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
-    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
-    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
-    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
-    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
-    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
-    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
-    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
-    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
-    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
-    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
-    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
-    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
-    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
-    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
-    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
-    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
-    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
-    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
-    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
-    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
-    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
-    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
-    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
-    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
-    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
-    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
-    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
-    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
-    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
-    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
-    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
-    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
-    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
-    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
-    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
-    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
-    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
-    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
-    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
-    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
-    0x7851a2ca},
-   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
-    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
-    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
-    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
-    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
-    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
-    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
-    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
-    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
-    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
-    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
-    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
-    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
-    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
-    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
-    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
-    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
-    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
-    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
-    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
-    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
-    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
-    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
-    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
-    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
-    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
-    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
-    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
-    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
-    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
-    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
-    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
-    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
-    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
-    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
-    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
-    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
-    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
-    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
-    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
-    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
-    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
-    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
-    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
-    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
-    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
-    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
-    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
-    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
-    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
-    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
-    0x566b6848},
-   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
-    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
-    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
-    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
-    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
-    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
-    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
-    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
-    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
-    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
-    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
-    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
-    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
-    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
-    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
-    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
-    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
-    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
-    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
-    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
-    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
-    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
-    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
-    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
-    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
-    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
-    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
-    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
-    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
-    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
-    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
-    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
-    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
-    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
-    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
-    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
-    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
-    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
-    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
-    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
-    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
-    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
-    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
-    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
-    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
-    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
-    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
-    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
-    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
-    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
-    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
-    0xd8ac6b35},
-   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
-    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
-    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
-    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
-    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
-    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
-    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
-    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
-    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
-    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
-    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
-    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
-    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
-    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
-    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
-    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
-    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
-    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
-    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
-    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
-    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
-    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
-    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
-    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
-    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
-    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
-    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
-    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
-    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
-    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
-    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
-    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
-    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
-    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
-    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
-    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
-    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
-    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
-    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
-    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
-    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
-    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
-    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
-    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
-    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
-    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
-    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
-    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
-    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
-    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
-    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
-    0xa140efa8},
-   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
-    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
-    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
-    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
-    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
-    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
-    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
-    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
-    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
-    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
-    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
-    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
-    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
-    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
-    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
-    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
-    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
-    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
-    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
-    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
-    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
-    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
-    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
-    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
-    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
-    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
-    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
-    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
-    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
-    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
-    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
-    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
-    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
-    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
-    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
-    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
-    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
-    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
-    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
-    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
-    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
-    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
-    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
-    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
-    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
-    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
-    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
-    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
-    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
-    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
-    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
-    0x917cd6a1},
-   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
-    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
-    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
-    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
-    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
-    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
-    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
-    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
-    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
-    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
-    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
-    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
-    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
-    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
-    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
-    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
-    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
-    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
-    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
-    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
-    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
-    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
-    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
-    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
-    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
-    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
-    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
-    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
-    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
-    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
-    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
-    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
-    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
-    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
-    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
-    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
-    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
-    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
-    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
-    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
-    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
-    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
-    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
-    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
-    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
-    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
-    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
-    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
-    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
-    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
-    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
-    0x18ba364e}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0x43cba68700000000, 0xc7903cd400000000,
-    0x845b9a5300000000, 0xcf27087300000000, 0x8cecaef400000000,
-    0x08b734a700000000, 0x4b7c922000000000, 0x9e4f10e600000000,
-    0xdd84b66100000000, 0x59df2c3200000000, 0x1a148ab500000000,
-    0x5168189500000000, 0x12a3be1200000000, 0x96f8244100000000,
-    0xd53382c600000000, 0x7d99511700000000, 0x3e52f79000000000,
-    0xba096dc300000000, 0xf9c2cb4400000000, 0xb2be596400000000,
-    0xf175ffe300000000, 0x752e65b000000000, 0x36e5c33700000000,
-    0xe3d641f100000000, 0xa01de77600000000, 0x24467d2500000000,
-    0x678ddba200000000, 0x2cf1498200000000, 0x6f3aef0500000000,
-    0xeb61755600000000, 0xa8aad3d100000000, 0xfa32a32e00000000,
-    0xb9f905a900000000, 0x3da29ffa00000000, 0x7e69397d00000000,
-    0x3515ab5d00000000, 0x76de0dda00000000, 0xf285978900000000,
-    0xb14e310e00000000, 0x647db3c800000000, 0x27b6154f00000000,
-    0xa3ed8f1c00000000, 0xe026299b00000000, 0xab5abbbb00000000,
-    0xe8911d3c00000000, 0x6cca876f00000000, 0x2f0121e800000000,
-    0x87abf23900000000, 0xc46054be00000000, 0x403bceed00000000,
-    0x03f0686a00000000, 0x488cfa4a00000000, 0x0b475ccd00000000,
-    0x8f1cc69e00000000, 0xccd7601900000000, 0x19e4e2df00000000,
-    0x5a2f445800000000, 0xde74de0b00000000, 0x9dbf788c00000000,
-    0xd6c3eaac00000000, 0x95084c2b00000000, 0x1153d67800000000,
-    0x529870ff00000000, 0xf465465d00000000, 0xb7aee0da00000000,
-    0x33f57a8900000000, 0x703edc0e00000000, 0x3b424e2e00000000,
-    0x7889e8a900000000, 0xfcd272fa00000000, 0xbf19d47d00000000,
-    0x6a2a56bb00000000, 0x29e1f03c00000000, 0xadba6a6f00000000,
-    0xee71cce800000000, 0xa50d5ec800000000, 0xe6c6f84f00000000,
-    0x629d621c00000000, 0x2156c49b00000000, 0x89fc174a00000000,
-    0xca37b1cd00000000, 0x4e6c2b9e00000000, 0x0da78d1900000000,
-    0x46db1f3900000000, 0x0510b9be00000000, 0x814b23ed00000000,
-    0xc280856a00000000, 0x17b307ac00000000, 0x5478a12b00000000,
-    0xd0233b7800000000, 0x93e89dff00000000, 0xd8940fdf00000000,
-    0x9b5fa95800000000, 0x1f04330b00000000, 0x5ccf958c00000000,
-    0x0e57e57300000000, 0x4d9c43f400000000, 0xc9c7d9a700000000,
-    0x8a0c7f2000000000, 0xc170ed0000000000, 0x82bb4b8700000000,
-    0x06e0d1d400000000, 0x452b775300000000, 0x9018f59500000000,
-    0xd3d3531200000000, 0x5788c94100000000, 0x14436fc600000000,
-    0x5f3ffde600000000, 0x1cf45b6100000000, 0x98afc13200000000,
-    0xdb6467b500000000, 0x73ceb46400000000, 0x300512e300000000,
-    0xb45e88b000000000, 0xf7952e3700000000, 0xbce9bc1700000000,
-    0xff221a9000000000, 0x7b7980c300000000, 0x38b2264400000000,
-    0xed81a48200000000, 0xae4a020500000000, 0x2a11985600000000,
-    0x69da3ed100000000, 0x22a6acf100000000, 0x616d0a7600000000,
-    0xe536902500000000, 0xa6fd36a200000000, 0xe8cb8cba00000000,
-    0xab002a3d00000000, 0x2f5bb06e00000000, 0x6c9016e900000000,
-    0x27ec84c900000000, 0x6427224e00000000, 0xe07cb81d00000000,
-    0xa3b71e9a00000000, 0x76849c5c00000000, 0x354f3adb00000000,
-    0xb114a08800000000, 0xf2df060f00000000, 0xb9a3942f00000000,
-    0xfa6832a800000000, 0x7e33a8fb00000000, 0x3df80e7c00000000,
-    0x9552ddad00000000, 0xd6997b2a00000000, 0x52c2e17900000000,
-    0x110947fe00000000, 0x5a75d5de00000000, 0x19be735900000000,
-    0x9de5e90a00000000, 0xde2e4f8d00000000, 0x0b1dcd4b00000000,
-    0x48d66bcc00000000, 0xcc8df19f00000000, 0x8f46571800000000,
-    0xc43ac53800000000, 0x87f163bf00000000, 0x03aaf9ec00000000,
-    0x40615f6b00000000, 0x12f92f9400000000, 0x5132891300000000,
-    0xd569134000000000, 0x96a2b5c700000000, 0xddde27e700000000,
-    0x9e15816000000000, 0x1a4e1b3300000000, 0x5985bdb400000000,
-    0x8cb63f7200000000, 0xcf7d99f500000000, 0x4b2603a600000000,
-    0x08eda52100000000, 0x4391370100000000, 0x005a918600000000,
-    0x84010bd500000000, 0xc7caad5200000000, 0x6f607e8300000000,
-    0x2cabd80400000000, 0xa8f0425700000000, 0xeb3be4d000000000,
-    0xa04776f000000000, 0xe38cd07700000000, 0x67d74a2400000000,
-    0x241ceca300000000, 0xf12f6e6500000000, 0xb2e4c8e200000000,
-    0x36bf52b100000000, 0x7574f43600000000, 0x3e08661600000000,
-    0x7dc3c09100000000, 0xf9985ac200000000, 0xba53fc4500000000,
-    0x1caecae700000000, 0x5f656c6000000000, 0xdb3ef63300000000,
-    0x98f550b400000000, 0xd389c29400000000, 0x9042641300000000,
-    0x1419fe4000000000, 0x57d258c700000000, 0x82e1da0100000000,
-    0xc12a7c8600000000, 0x4571e6d500000000, 0x06ba405200000000,
-    0x4dc6d27200000000, 0x0e0d74f500000000, 0x8a56eea600000000,
-    0xc99d482100000000, 0x61379bf000000000, 0x22fc3d7700000000,
-    0xa6a7a72400000000, 0xe56c01a300000000, 0xae10938300000000,
-    0xeddb350400000000, 0x6980af5700000000, 0x2a4b09d000000000,
-    0xff788b1600000000, 0xbcb32d9100000000, 0x38e8b7c200000000,
-    0x7b23114500000000, 0x305f836500000000, 0x739425e200000000,
-    0xf7cfbfb100000000, 0xb404193600000000, 0xe69c69c900000000,
-    0xa557cf4e00000000, 0x210c551d00000000, 0x62c7f39a00000000,
-    0x29bb61ba00000000, 0x6a70c73d00000000, 0xee2b5d6e00000000,
-    0xade0fbe900000000, 0x78d3792f00000000, 0x3b18dfa800000000,
-    0xbf4345fb00000000, 0xfc88e37c00000000, 0xb7f4715c00000000,
-    0xf43fd7db00000000, 0x70644d8800000000, 0x33afeb0f00000000,
-    0x9b0538de00000000, 0xd8ce9e5900000000, 0x5c95040a00000000,
-    0x1f5ea28d00000000, 0x542230ad00000000, 0x17e9962a00000000,
-    0x93b20c7900000000, 0xd079aafe00000000, 0x054a283800000000,
-    0x46818ebf00000000, 0xc2da14ec00000000, 0x8111b26b00000000,
-    0xca6d204b00000000, 0x89a686cc00000000, 0x0dfd1c9f00000000,
-    0x4e36ba1800000000},
-   {0x0000000000000000, 0xe1b652ef00000000, 0x836bd40500000000,
-    0x62dd86ea00000000, 0x06d7a80b00000000, 0xe761fae400000000,
-    0x85bc7c0e00000000, 0x640a2ee100000000, 0x0cae511700000000,
-    0xed1803f800000000, 0x8fc5851200000000, 0x6e73d7fd00000000,
-    0x0a79f91c00000000, 0xebcfabf300000000, 0x89122d1900000000,
-    0x68a47ff600000000, 0x185ca32e00000000, 0xf9eaf1c100000000,
-    0x9b37772b00000000, 0x7a8125c400000000, 0x1e8b0b2500000000,
-    0xff3d59ca00000000, 0x9de0df2000000000, 0x7c568dcf00000000,
-    0x14f2f23900000000, 0xf544a0d600000000, 0x9799263c00000000,
-    0x762f74d300000000, 0x12255a3200000000, 0xf39308dd00000000,
-    0x914e8e3700000000, 0x70f8dcd800000000, 0x30b8465d00000000,
-    0xd10e14b200000000, 0xb3d3925800000000, 0x5265c0b700000000,
-    0x366fee5600000000, 0xd7d9bcb900000000, 0xb5043a5300000000,
-    0x54b268bc00000000, 0x3c16174a00000000, 0xdda045a500000000,
-    0xbf7dc34f00000000, 0x5ecb91a000000000, 0x3ac1bf4100000000,
-    0xdb77edae00000000, 0xb9aa6b4400000000, 0x581c39ab00000000,
-    0x28e4e57300000000, 0xc952b79c00000000, 0xab8f317600000000,
-    0x4a39639900000000, 0x2e334d7800000000, 0xcf851f9700000000,
-    0xad58997d00000000, 0x4ceecb9200000000, 0x244ab46400000000,
-    0xc5fce68b00000000, 0xa721606100000000, 0x4697328e00000000,
-    0x229d1c6f00000000, 0xc32b4e8000000000, 0xa1f6c86a00000000,
-    0x40409a8500000000, 0x60708dba00000000, 0x81c6df5500000000,
-    0xe31b59bf00000000, 0x02ad0b5000000000, 0x66a725b100000000,
-    0x8711775e00000000, 0xe5ccf1b400000000, 0x047aa35b00000000,
-    0x6cdedcad00000000, 0x8d688e4200000000, 0xefb508a800000000,
-    0x0e035a4700000000, 0x6a0974a600000000, 0x8bbf264900000000,
-    0xe962a0a300000000, 0x08d4f24c00000000, 0x782c2e9400000000,
-    0x999a7c7b00000000, 0xfb47fa9100000000, 0x1af1a87e00000000,
-    0x7efb869f00000000, 0x9f4dd47000000000, 0xfd90529a00000000,
-    0x1c26007500000000, 0x74827f8300000000, 0x95342d6c00000000,
-    0xf7e9ab8600000000, 0x165ff96900000000, 0x7255d78800000000,
-    0x93e3856700000000, 0xf13e038d00000000, 0x1088516200000000,
-    0x50c8cbe700000000, 0xb17e990800000000, 0xd3a31fe200000000,
-    0x32154d0d00000000, 0x561f63ec00000000, 0xb7a9310300000000,
-    0xd574b7e900000000, 0x34c2e50600000000, 0x5c669af000000000,
-    0xbdd0c81f00000000, 0xdf0d4ef500000000, 0x3ebb1c1a00000000,
-    0x5ab132fb00000000, 0xbb07601400000000, 0xd9dae6fe00000000,
-    0x386cb41100000000, 0x489468c900000000, 0xa9223a2600000000,
-    0xcbffbccc00000000, 0x2a49ee2300000000, 0x4e43c0c200000000,
-    0xaff5922d00000000, 0xcd2814c700000000, 0x2c9e462800000000,
-    0x443a39de00000000, 0xa58c6b3100000000, 0xc751eddb00000000,
-    0x26e7bf3400000000, 0x42ed91d500000000, 0xa35bc33a00000000,
-    0xc18645d000000000, 0x2030173f00000000, 0x81e66bae00000000,
-    0x6050394100000000, 0x028dbfab00000000, 0xe33bed4400000000,
-    0x8731c3a500000000, 0x6687914a00000000, 0x045a17a000000000,
-    0xe5ec454f00000000, 0x8d483ab900000000, 0x6cfe685600000000,
-    0x0e23eebc00000000, 0xef95bc5300000000, 0x8b9f92b200000000,
-    0x6a29c05d00000000, 0x08f446b700000000, 0xe942145800000000,
-    0x99bac88000000000, 0x780c9a6f00000000, 0x1ad11c8500000000,
-    0xfb674e6a00000000, 0x9f6d608b00000000, 0x7edb326400000000,
-    0x1c06b48e00000000, 0xfdb0e66100000000, 0x9514999700000000,
-    0x74a2cb7800000000, 0x167f4d9200000000, 0xf7c91f7d00000000,
-    0x93c3319c00000000, 0x7275637300000000, 0x10a8e59900000000,
-    0xf11eb77600000000, 0xb15e2df300000000, 0x50e87f1c00000000,
-    0x3235f9f600000000, 0xd383ab1900000000, 0xb78985f800000000,
-    0x563fd71700000000, 0x34e251fd00000000, 0xd554031200000000,
-    0xbdf07ce400000000, 0x5c462e0b00000000, 0x3e9ba8e100000000,
-    0xdf2dfa0e00000000, 0xbb27d4ef00000000, 0x5a91860000000000,
-    0x384c00ea00000000, 0xd9fa520500000000, 0xa9028edd00000000,
-    0x48b4dc3200000000, 0x2a695ad800000000, 0xcbdf083700000000,
-    0xafd526d600000000, 0x4e63743900000000, 0x2cbef2d300000000,
-    0xcd08a03c00000000, 0xa5acdfca00000000, 0x441a8d2500000000,
-    0x26c70bcf00000000, 0xc771592000000000, 0xa37b77c100000000,
-    0x42cd252e00000000, 0x2010a3c400000000, 0xc1a6f12b00000000,
-    0xe196e61400000000, 0x0020b4fb00000000, 0x62fd321100000000,
-    0x834b60fe00000000, 0xe7414e1f00000000, 0x06f71cf000000000,
-    0x642a9a1a00000000, 0x859cc8f500000000, 0xed38b70300000000,
-    0x0c8ee5ec00000000, 0x6e53630600000000, 0x8fe531e900000000,
-    0xebef1f0800000000, 0x0a594de700000000, 0x6884cb0d00000000,
-    0x893299e200000000, 0xf9ca453a00000000, 0x187c17d500000000,
-    0x7aa1913f00000000, 0x9b17c3d000000000, 0xff1ded3100000000,
-    0x1eabbfde00000000, 0x7c76393400000000, 0x9dc06bdb00000000,
-    0xf564142d00000000, 0x14d246c200000000, 0x760fc02800000000,
-    0x97b992c700000000, 0xf3b3bc2600000000, 0x1205eec900000000,
-    0x70d8682300000000, 0x916e3acc00000000, 0xd12ea04900000000,
-    0x3098f2a600000000, 0x5245744c00000000, 0xb3f326a300000000,
-    0xd7f9084200000000, 0x364f5aad00000000, 0x5492dc4700000000,
-    0xb5248ea800000000, 0xdd80f15e00000000, 0x3c36a3b100000000,
-    0x5eeb255b00000000, 0xbf5d77b400000000, 0xdb57595500000000,
-    0x3ae10bba00000000, 0x583c8d5000000000, 0xb98adfbf00000000,
-    0xc972036700000000, 0x28c4518800000000, 0x4a19d76200000000,
-    0xabaf858d00000000, 0xcfa5ab6c00000000, 0x2e13f98300000000,
-    0x4cce7f6900000000, 0xad782d8600000000, 0xc5dc527000000000,
-    0x246a009f00000000, 0x46b7867500000000, 0xa701d49a00000000,
-    0xc30bfa7b00000000, 0x22bda89400000000, 0x40602e7e00000000,
-    0xa1d67c9100000000},
-   {0x0000000000000000, 0x5880e2d700000000, 0xf106b47400000000,
-    0xa98656a300000000, 0xe20d68e900000000, 0xba8d8a3e00000000,
-    0x130bdc9d00000000, 0x4b8b3e4a00000000, 0x851da10900000000,
-    0xdd9d43de00000000, 0x741b157d00000000, 0x2c9bf7aa00000000,
-    0x6710c9e000000000, 0x3f902b3700000000, 0x96167d9400000000,
-    0xce969f4300000000, 0x0a3b421300000000, 0x52bba0c400000000,
-    0xfb3df66700000000, 0xa3bd14b000000000, 0xe8362afa00000000,
-    0xb0b6c82d00000000, 0x19309e8e00000000, 0x41b07c5900000000,
-    0x8f26e31a00000000, 0xd7a601cd00000000, 0x7e20576e00000000,
-    0x26a0b5b900000000, 0x6d2b8bf300000000, 0x35ab692400000000,
-    0x9c2d3f8700000000, 0xc4addd5000000000, 0x1476842600000000,
-    0x4cf666f100000000, 0xe570305200000000, 0xbdf0d28500000000,
-    0xf67beccf00000000, 0xaefb0e1800000000, 0x077d58bb00000000,
-    0x5ffdba6c00000000, 0x916b252f00000000, 0xc9ebc7f800000000,
-    0x606d915b00000000, 0x38ed738c00000000, 0x73664dc600000000,
-    0x2be6af1100000000, 0x8260f9b200000000, 0xdae01b6500000000,
-    0x1e4dc63500000000, 0x46cd24e200000000, 0xef4b724100000000,
-    0xb7cb909600000000, 0xfc40aedc00000000, 0xa4c04c0b00000000,
-    0x0d461aa800000000, 0x55c6f87f00000000, 0x9b50673c00000000,
-    0xc3d085eb00000000, 0x6a56d34800000000, 0x32d6319f00000000,
-    0x795d0fd500000000, 0x21dded0200000000, 0x885bbba100000000,
-    0xd0db597600000000, 0x28ec084d00000000, 0x706cea9a00000000,
-    0xd9eabc3900000000, 0x816a5eee00000000, 0xcae160a400000000,
-    0x9261827300000000, 0x3be7d4d000000000, 0x6367360700000000,
-    0xadf1a94400000000, 0xf5714b9300000000, 0x5cf71d3000000000,
-    0x0477ffe700000000, 0x4ffcc1ad00000000, 0x177c237a00000000,
-    0xbefa75d900000000, 0xe67a970e00000000, 0x22d74a5e00000000,
-    0x7a57a88900000000, 0xd3d1fe2a00000000, 0x8b511cfd00000000,
-    0xc0da22b700000000, 0x985ac06000000000, 0x31dc96c300000000,
-    0x695c741400000000, 0xa7caeb5700000000, 0xff4a098000000000,
-    0x56cc5f2300000000, 0x0e4cbdf400000000, 0x45c783be00000000,
-    0x1d47616900000000, 0xb4c137ca00000000, 0xec41d51d00000000,
-    0x3c9a8c6b00000000, 0x641a6ebc00000000, 0xcd9c381f00000000,
-    0x951cdac800000000, 0xde97e48200000000, 0x8617065500000000,
-    0x2f9150f600000000, 0x7711b22100000000, 0xb9872d6200000000,
-    0xe107cfb500000000, 0x4881991600000000, 0x10017bc100000000,
-    0x5b8a458b00000000, 0x030aa75c00000000, 0xaa8cf1ff00000000,
-    0xf20c132800000000, 0x36a1ce7800000000, 0x6e212caf00000000,
-    0xc7a77a0c00000000, 0x9f2798db00000000, 0xd4aca69100000000,
-    0x8c2c444600000000, 0x25aa12e500000000, 0x7d2af03200000000,
-    0xb3bc6f7100000000, 0xeb3c8da600000000, 0x42badb0500000000,
-    0x1a3a39d200000000, 0x51b1079800000000, 0x0931e54f00000000,
-    0xa0b7b3ec00000000, 0xf837513b00000000, 0x50d8119a00000000,
-    0x0858f34d00000000, 0xa1dea5ee00000000, 0xf95e473900000000,
-    0xb2d5797300000000, 0xea559ba400000000, 0x43d3cd0700000000,
-    0x1b532fd000000000, 0xd5c5b09300000000, 0x8d45524400000000,
-    0x24c304e700000000, 0x7c43e63000000000, 0x37c8d87a00000000,
-    0x6f483aad00000000, 0xc6ce6c0e00000000, 0x9e4e8ed900000000,
-    0x5ae3538900000000, 0x0263b15e00000000, 0xabe5e7fd00000000,
-    0xf365052a00000000, 0xb8ee3b6000000000, 0xe06ed9b700000000,
-    0x49e88f1400000000, 0x11686dc300000000, 0xdffef28000000000,
-    0x877e105700000000, 0x2ef846f400000000, 0x7678a42300000000,
-    0x3df39a6900000000, 0x657378be00000000, 0xccf52e1d00000000,
-    0x9475ccca00000000, 0x44ae95bc00000000, 0x1c2e776b00000000,
-    0xb5a821c800000000, 0xed28c31f00000000, 0xa6a3fd5500000000,
-    0xfe231f8200000000, 0x57a5492100000000, 0x0f25abf600000000,
-    0xc1b334b500000000, 0x9933d66200000000, 0x30b580c100000000,
-    0x6835621600000000, 0x23be5c5c00000000, 0x7b3ebe8b00000000,
-    0xd2b8e82800000000, 0x8a380aff00000000, 0x4e95d7af00000000,
-    0x1615357800000000, 0xbf9363db00000000, 0xe713810c00000000,
-    0xac98bf4600000000, 0xf4185d9100000000, 0x5d9e0b3200000000,
-    0x051ee9e500000000, 0xcb8876a600000000, 0x9308947100000000,
-    0x3a8ec2d200000000, 0x620e200500000000, 0x29851e4f00000000,
-    0x7105fc9800000000, 0xd883aa3b00000000, 0x800348ec00000000,
-    0x783419d700000000, 0x20b4fb0000000000, 0x8932ada300000000,
-    0xd1b24f7400000000, 0x9a39713e00000000, 0xc2b993e900000000,
-    0x6b3fc54a00000000, 0x33bf279d00000000, 0xfd29b8de00000000,
-    0xa5a95a0900000000, 0x0c2f0caa00000000, 0x54afee7d00000000,
-    0x1f24d03700000000, 0x47a432e000000000, 0xee22644300000000,
-    0xb6a2869400000000, 0x720f5bc400000000, 0x2a8fb91300000000,
-    0x8309efb000000000, 0xdb890d6700000000, 0x9002332d00000000,
-    0xc882d1fa00000000, 0x6104875900000000, 0x3984658e00000000,
-    0xf712facd00000000, 0xaf92181a00000000, 0x06144eb900000000,
-    0x5e94ac6e00000000, 0x151f922400000000, 0x4d9f70f300000000,
-    0xe419265000000000, 0xbc99c48700000000, 0x6c429df100000000,
-    0x34c27f2600000000, 0x9d44298500000000, 0xc5c4cb5200000000,
-    0x8e4ff51800000000, 0xd6cf17cf00000000, 0x7f49416c00000000,
-    0x27c9a3bb00000000, 0xe95f3cf800000000, 0xb1dfde2f00000000,
-    0x1859888c00000000, 0x40d96a5b00000000, 0x0b52541100000000,
-    0x53d2b6c600000000, 0xfa54e06500000000, 0xa2d402b200000000,
-    0x6679dfe200000000, 0x3ef93d3500000000, 0x977f6b9600000000,
-    0xcfff894100000000, 0x8474b70b00000000, 0xdcf455dc00000000,
-    0x7572037f00000000, 0x2df2e1a800000000, 0xe3647eeb00000000,
-    0xbbe49c3c00000000, 0x1262ca9f00000000, 0x4ae2284800000000,
-    0x0169160200000000, 0x59e9f4d500000000, 0xf06fa27600000000,
-    0xa8ef40a100000000},
-   {0x0000000000000000, 0x463b676500000000, 0x8c76ceca00000000,
-    0xca4da9af00000000, 0x59ebed4e00000000, 0x1fd08a2b00000000,
-    0xd59d238400000000, 0x93a644e100000000, 0xb2d6db9d00000000,
-    0xf4edbcf800000000, 0x3ea0155700000000, 0x789b723200000000,
-    0xeb3d36d300000000, 0xad0651b600000000, 0x674bf81900000000,
-    0x21709f7c00000000, 0x25abc6e000000000, 0x6390a18500000000,
-    0xa9dd082a00000000, 0xefe66f4f00000000, 0x7c402bae00000000,
-    0x3a7b4ccb00000000, 0xf036e56400000000, 0xb60d820100000000,
-    0x977d1d7d00000000, 0xd1467a1800000000, 0x1b0bd3b700000000,
-    0x5d30b4d200000000, 0xce96f03300000000, 0x88ad975600000000,
-    0x42e03ef900000000, 0x04db599c00000000, 0x0b50fc1a00000000,
-    0x4d6b9b7f00000000, 0x872632d000000000, 0xc11d55b500000000,
-    0x52bb115400000000, 0x1480763100000000, 0xdecddf9e00000000,
-    0x98f6b8fb00000000, 0xb986278700000000, 0xffbd40e200000000,
-    0x35f0e94d00000000, 0x73cb8e2800000000, 0xe06dcac900000000,
-    0xa656adac00000000, 0x6c1b040300000000, 0x2a20636600000000,
-    0x2efb3afa00000000, 0x68c05d9f00000000, 0xa28df43000000000,
-    0xe4b6935500000000, 0x7710d7b400000000, 0x312bb0d100000000,
-    0xfb66197e00000000, 0xbd5d7e1b00000000, 0x9c2de16700000000,
-    0xda16860200000000, 0x105b2fad00000000, 0x566048c800000000,
-    0xc5c60c2900000000, 0x83fd6b4c00000000, 0x49b0c2e300000000,
-    0x0f8ba58600000000, 0x16a0f83500000000, 0x509b9f5000000000,
-    0x9ad636ff00000000, 0xdced519a00000000, 0x4f4b157b00000000,
-    0x0970721e00000000, 0xc33ddbb100000000, 0x8506bcd400000000,
-    0xa47623a800000000, 0xe24d44cd00000000, 0x2800ed6200000000,
-    0x6e3b8a0700000000, 0xfd9dcee600000000, 0xbba6a98300000000,
-    0x71eb002c00000000, 0x37d0674900000000, 0x330b3ed500000000,
-    0x753059b000000000, 0xbf7df01f00000000, 0xf946977a00000000,
-    0x6ae0d39b00000000, 0x2cdbb4fe00000000, 0xe6961d5100000000,
-    0xa0ad7a3400000000, 0x81dde54800000000, 0xc7e6822d00000000,
-    0x0dab2b8200000000, 0x4b904ce700000000, 0xd836080600000000,
-    0x9e0d6f6300000000, 0x5440c6cc00000000, 0x127ba1a900000000,
-    0x1df0042f00000000, 0x5bcb634a00000000, 0x9186cae500000000,
-    0xd7bdad8000000000, 0x441be96100000000, 0x02208e0400000000,
-    0xc86d27ab00000000, 0x8e5640ce00000000, 0xaf26dfb200000000,
-    0xe91db8d700000000, 0x2350117800000000, 0x656b761d00000000,
-    0xf6cd32fc00000000, 0xb0f6559900000000, 0x7abbfc3600000000,
-    0x3c809b5300000000, 0x385bc2cf00000000, 0x7e60a5aa00000000,
-    0xb42d0c0500000000, 0xf2166b6000000000, 0x61b02f8100000000,
-    0x278b48e400000000, 0xedc6e14b00000000, 0xabfd862e00000000,
-    0x8a8d195200000000, 0xccb67e3700000000, 0x06fbd79800000000,
-    0x40c0b0fd00000000, 0xd366f41c00000000, 0x955d937900000000,
-    0x5f103ad600000000, 0x192b5db300000000, 0x2c40f16b00000000,
-    0x6a7b960e00000000, 0xa0363fa100000000, 0xe60d58c400000000,
-    0x75ab1c2500000000, 0x33907b4000000000, 0xf9ddd2ef00000000,
-    0xbfe6b58a00000000, 0x9e962af600000000, 0xd8ad4d9300000000,
-    0x12e0e43c00000000, 0x54db835900000000, 0xc77dc7b800000000,
-    0x8146a0dd00000000, 0x4b0b097200000000, 0x0d306e1700000000,
-    0x09eb378b00000000, 0x4fd050ee00000000, 0x859df94100000000,
-    0xc3a69e2400000000, 0x5000dac500000000, 0x163bbda000000000,
-    0xdc76140f00000000, 0x9a4d736a00000000, 0xbb3dec1600000000,
-    0xfd068b7300000000, 0x374b22dc00000000, 0x717045b900000000,
-    0xe2d6015800000000, 0xa4ed663d00000000, 0x6ea0cf9200000000,
-    0x289ba8f700000000, 0x27100d7100000000, 0x612b6a1400000000,
-    0xab66c3bb00000000, 0xed5da4de00000000, 0x7efbe03f00000000,
-    0x38c0875a00000000, 0xf28d2ef500000000, 0xb4b6499000000000,
-    0x95c6d6ec00000000, 0xd3fdb18900000000, 0x19b0182600000000,
-    0x5f8b7f4300000000, 0xcc2d3ba200000000, 0x8a165cc700000000,
-    0x405bf56800000000, 0x0660920d00000000, 0x02bbcb9100000000,
-    0x4480acf400000000, 0x8ecd055b00000000, 0xc8f6623e00000000,
-    0x5b5026df00000000, 0x1d6b41ba00000000, 0xd726e81500000000,
-    0x911d8f7000000000, 0xb06d100c00000000, 0xf656776900000000,
-    0x3c1bdec600000000, 0x7a20b9a300000000, 0xe986fd4200000000,
-    0xafbd9a2700000000, 0x65f0338800000000, 0x23cb54ed00000000,
-    0x3ae0095e00000000, 0x7cdb6e3b00000000, 0xb696c79400000000,
-    0xf0ada0f100000000, 0x630be41000000000, 0x2530837500000000,
-    0xef7d2ada00000000, 0xa9464dbf00000000, 0x8836d2c300000000,
-    0xce0db5a600000000, 0x04401c0900000000, 0x427b7b6c00000000,
-    0xd1dd3f8d00000000, 0x97e658e800000000, 0x5dabf14700000000,
-    0x1b90962200000000, 0x1f4bcfbe00000000, 0x5970a8db00000000,
-    0x933d017400000000, 0xd506661100000000, 0x46a022f000000000,
-    0x009b459500000000, 0xcad6ec3a00000000, 0x8ced8b5f00000000,
-    0xad9d142300000000, 0xeba6734600000000, 0x21ebdae900000000,
-    0x67d0bd8c00000000, 0xf476f96d00000000, 0xb24d9e0800000000,
-    0x780037a700000000, 0x3e3b50c200000000, 0x31b0f54400000000,
-    0x778b922100000000, 0xbdc63b8e00000000, 0xfbfd5ceb00000000,
-    0x685b180a00000000, 0x2e607f6f00000000, 0xe42dd6c000000000,
-    0xa216b1a500000000, 0x83662ed900000000, 0xc55d49bc00000000,
-    0x0f10e01300000000, 0x492b877600000000, 0xda8dc39700000000,
-    0x9cb6a4f200000000, 0x56fb0d5d00000000, 0x10c06a3800000000,
-    0x141b33a400000000, 0x522054c100000000, 0x986dfd6e00000000,
-    0xde569a0b00000000, 0x4df0deea00000000, 0x0bcbb98f00000000,
-    0xc186102000000000, 0x87bd774500000000, 0xa6cde83900000000,
-    0xe0f68f5c00000000, 0x2abb26f300000000, 0x6c80419600000000,
-    0xff26057700000000, 0xb91d621200000000, 0x7350cbbd00000000,
-    0x356bacd800000000},
-   {0x0000000000000000, 0x9e83da9f00000000, 0x7d01c4e400000000,
-    0xe3821e7b00000000, 0xbb04f91200000000, 0x2587238d00000000,
-    0xc6053df600000000, 0x5886e76900000000, 0x7609f22500000000,
-    0xe88a28ba00000000, 0x0b0836c100000000, 0x958bec5e00000000,
-    0xcd0d0b3700000000, 0x538ed1a800000000, 0xb00ccfd300000000,
-    0x2e8f154c00000000, 0xec12e44b00000000, 0x72913ed400000000,
-    0x911320af00000000, 0x0f90fa3000000000, 0x57161d5900000000,
-    0xc995c7c600000000, 0x2a17d9bd00000000, 0xb494032200000000,
-    0x9a1b166e00000000, 0x0498ccf100000000, 0xe71ad28a00000000,
-    0x7999081500000000, 0x211fef7c00000000, 0xbf9c35e300000000,
-    0x5c1e2b9800000000, 0xc29df10700000000, 0xd825c89700000000,
-    0x46a6120800000000, 0xa5240c7300000000, 0x3ba7d6ec00000000,
-    0x6321318500000000, 0xfda2eb1a00000000, 0x1e20f56100000000,
-    0x80a32ffe00000000, 0xae2c3ab200000000, 0x30afe02d00000000,
-    0xd32dfe5600000000, 0x4dae24c900000000, 0x1528c3a000000000,
-    0x8bab193f00000000, 0x6829074400000000, 0xf6aadddb00000000,
-    0x34372cdc00000000, 0xaab4f64300000000, 0x4936e83800000000,
-    0xd7b532a700000000, 0x8f33d5ce00000000, 0x11b00f5100000000,
-    0xf232112a00000000, 0x6cb1cbb500000000, 0x423edef900000000,
-    0xdcbd046600000000, 0x3f3f1a1d00000000, 0xa1bcc08200000000,
-    0xf93a27eb00000000, 0x67b9fd7400000000, 0x843be30f00000000,
-    0x1ab8399000000000, 0xf14de1f400000000, 0x6fce3b6b00000000,
-    0x8c4c251000000000, 0x12cfff8f00000000, 0x4a4918e600000000,
-    0xd4cac27900000000, 0x3748dc0200000000, 0xa9cb069d00000000,
-    0x874413d100000000, 0x19c7c94e00000000, 0xfa45d73500000000,
-    0x64c60daa00000000, 0x3c40eac300000000, 0xa2c3305c00000000,
-    0x41412e2700000000, 0xdfc2f4b800000000, 0x1d5f05bf00000000,
-    0x83dcdf2000000000, 0x605ec15b00000000, 0xfedd1bc400000000,
-    0xa65bfcad00000000, 0x38d8263200000000, 0xdb5a384900000000,
-    0x45d9e2d600000000, 0x6b56f79a00000000, 0xf5d52d0500000000,
-    0x1657337e00000000, 0x88d4e9e100000000, 0xd0520e8800000000,
-    0x4ed1d41700000000, 0xad53ca6c00000000, 0x33d010f300000000,
-    0x2968296300000000, 0xb7ebf3fc00000000, 0x5469ed8700000000,
-    0xcaea371800000000, 0x926cd07100000000, 0x0cef0aee00000000,
-    0xef6d149500000000, 0x71eece0a00000000, 0x5f61db4600000000,
-    0xc1e201d900000000, 0x22601fa200000000, 0xbce3c53d00000000,
-    0xe465225400000000, 0x7ae6f8cb00000000, 0x9964e6b000000000,
-    0x07e73c2f00000000, 0xc57acd2800000000, 0x5bf917b700000000,
-    0xb87b09cc00000000, 0x26f8d35300000000, 0x7e7e343a00000000,
-    0xe0fdeea500000000, 0x037ff0de00000000, 0x9dfc2a4100000000,
-    0xb3733f0d00000000, 0x2df0e59200000000, 0xce72fbe900000000,
-    0x50f1217600000000, 0x0877c61f00000000, 0x96f41c8000000000,
-    0x757602fb00000000, 0xebf5d86400000000, 0xa39db33200000000,
-    0x3d1e69ad00000000, 0xde9c77d600000000, 0x401fad4900000000,
-    0x18994a2000000000, 0x861a90bf00000000, 0x65988ec400000000,
-    0xfb1b545b00000000, 0xd594411700000000, 0x4b179b8800000000,
-    0xa89585f300000000, 0x36165f6c00000000, 0x6e90b80500000000,
-    0xf013629a00000000, 0x13917ce100000000, 0x8d12a67e00000000,
-    0x4f8f577900000000, 0xd10c8de600000000, 0x328e939d00000000,
-    0xac0d490200000000, 0xf48bae6b00000000, 0x6a0874f400000000,
-    0x898a6a8f00000000, 0x1709b01000000000, 0x3986a55c00000000,
-    0xa7057fc300000000, 0x448761b800000000, 0xda04bb2700000000,
-    0x82825c4e00000000, 0x1c0186d100000000, 0xff8398aa00000000,
-    0x6100423500000000, 0x7bb87ba500000000, 0xe53ba13a00000000,
-    0x06b9bf4100000000, 0x983a65de00000000, 0xc0bc82b700000000,
-    0x5e3f582800000000, 0xbdbd465300000000, 0x233e9ccc00000000,
-    0x0db1898000000000, 0x9332531f00000000, 0x70b04d6400000000,
-    0xee3397fb00000000, 0xb6b5709200000000, 0x2836aa0d00000000,
-    0xcbb4b47600000000, 0x55376ee900000000, 0x97aa9fee00000000,
-    0x0929457100000000, 0xeaab5b0a00000000, 0x7428819500000000,
-    0x2cae66fc00000000, 0xb22dbc6300000000, 0x51afa21800000000,
-    0xcf2c788700000000, 0xe1a36dcb00000000, 0x7f20b75400000000,
-    0x9ca2a92f00000000, 0x022173b000000000, 0x5aa794d900000000,
-    0xc4244e4600000000, 0x27a6503d00000000, 0xb9258aa200000000,
-    0x52d052c600000000, 0xcc53885900000000, 0x2fd1962200000000,
-    0xb1524cbd00000000, 0xe9d4abd400000000, 0x7757714b00000000,
-    0x94d56f3000000000, 0x0a56b5af00000000, 0x24d9a0e300000000,
-    0xba5a7a7c00000000, 0x59d8640700000000, 0xc75bbe9800000000,
-    0x9fdd59f100000000, 0x015e836e00000000, 0xe2dc9d1500000000,
-    0x7c5f478a00000000, 0xbec2b68d00000000, 0x20416c1200000000,
-    0xc3c3726900000000, 0x5d40a8f600000000, 0x05c64f9f00000000,
-    0x9b45950000000000, 0x78c78b7b00000000, 0xe64451e400000000,
-    0xc8cb44a800000000, 0x56489e3700000000, 0xb5ca804c00000000,
-    0x2b495ad300000000, 0x73cfbdba00000000, 0xed4c672500000000,
-    0x0ece795e00000000, 0x904da3c100000000, 0x8af59a5100000000,
-    0x147640ce00000000, 0xf7f45eb500000000, 0x6977842a00000000,
-    0x31f1634300000000, 0xaf72b9dc00000000, 0x4cf0a7a700000000,
-    0xd2737d3800000000, 0xfcfc687400000000, 0x627fb2eb00000000,
-    0x81fdac9000000000, 0x1f7e760f00000000, 0x47f8916600000000,
-    0xd97b4bf900000000, 0x3af9558200000000, 0xa47a8f1d00000000,
-    0x66e77e1a00000000, 0xf864a48500000000, 0x1be6bafe00000000,
-    0x8565606100000000, 0xdde3870800000000, 0x43605d9700000000,
-    0xa0e243ec00000000, 0x3e61997300000000, 0x10ee8c3f00000000,
-    0x8e6d56a000000000, 0x6def48db00000000, 0xf36c924400000000,
-    0xabea752d00000000, 0x3569afb200000000, 0xd6ebb1c900000000,
-    0x48686b5600000000},
-   {0x0000000000000000, 0xc064281700000000, 0x80c9502e00000000,
-    0x40ad783900000000, 0x0093a15c00000000, 0xc0f7894b00000000,
-    0x805af17200000000, 0x403ed96500000000, 0x002643b900000000,
-    0xc0426bae00000000, 0x80ef139700000000, 0x408b3b8000000000,
-    0x00b5e2e500000000, 0xc0d1caf200000000, 0x807cb2cb00000000,
-    0x40189adc00000000, 0x414af7a900000000, 0x812edfbe00000000,
-    0xc183a78700000000, 0x01e78f9000000000, 0x41d956f500000000,
-    0x81bd7ee200000000, 0xc11006db00000000, 0x01742ecc00000000,
-    0x416cb41000000000, 0x81089c0700000000, 0xc1a5e43e00000000,
-    0x01c1cc2900000000, 0x41ff154c00000000, 0x819b3d5b00000000,
-    0xc136456200000000, 0x01526d7500000000, 0xc3929f8800000000,
-    0x03f6b79f00000000, 0x435bcfa600000000, 0x833fe7b100000000,
-    0xc3013ed400000000, 0x036516c300000000, 0x43c86efa00000000,
-    0x83ac46ed00000000, 0xc3b4dc3100000000, 0x03d0f42600000000,
-    0x437d8c1f00000000, 0x8319a40800000000, 0xc3277d6d00000000,
-    0x0343557a00000000, 0x43ee2d4300000000, 0x838a055400000000,
-    0x82d8682100000000, 0x42bc403600000000, 0x0211380f00000000,
-    0xc275101800000000, 0x824bc97d00000000, 0x422fe16a00000000,
-    0x0282995300000000, 0xc2e6b14400000000, 0x82fe2b9800000000,
-    0x429a038f00000000, 0x02377bb600000000, 0xc25353a100000000,
-    0x826d8ac400000000, 0x4209a2d300000000, 0x02a4daea00000000,
-    0xc2c0f2fd00000000, 0xc7234eca00000000, 0x074766dd00000000,
-    0x47ea1ee400000000, 0x878e36f300000000, 0xc7b0ef9600000000,
-    0x07d4c78100000000, 0x4779bfb800000000, 0x871d97af00000000,
-    0xc7050d7300000000, 0x0761256400000000, 0x47cc5d5d00000000,
-    0x87a8754a00000000, 0xc796ac2f00000000, 0x07f2843800000000,
-    0x475ffc0100000000, 0x873bd41600000000, 0x8669b96300000000,
-    0x460d917400000000, 0x06a0e94d00000000, 0xc6c4c15a00000000,
-    0x86fa183f00000000, 0x469e302800000000, 0x0633481100000000,
-    0xc657600600000000, 0x864ffada00000000, 0x462bd2cd00000000,
-    0x0686aaf400000000, 0xc6e282e300000000, 0x86dc5b8600000000,
-    0x46b8739100000000, 0x06150ba800000000, 0xc67123bf00000000,
-    0x04b1d14200000000, 0xc4d5f95500000000, 0x8478816c00000000,
-    0x441ca97b00000000, 0x0422701e00000000, 0xc446580900000000,
-    0x84eb203000000000, 0x448f082700000000, 0x049792fb00000000,
-    0xc4f3baec00000000, 0x845ec2d500000000, 0x443aeac200000000,
-    0x040433a700000000, 0xc4601bb000000000, 0x84cd638900000000,
-    0x44a94b9e00000000, 0x45fb26eb00000000, 0x859f0efc00000000,
-    0xc53276c500000000, 0x05565ed200000000, 0x456887b700000000,
-    0x850cafa000000000, 0xc5a1d79900000000, 0x05c5ff8e00000000,
-    0x45dd655200000000, 0x85b94d4500000000, 0xc514357c00000000,
-    0x05701d6b00000000, 0x454ec40e00000000, 0x852aec1900000000,
-    0xc587942000000000, 0x05e3bc3700000000, 0xcf41ed4f00000000,
-    0x0f25c55800000000, 0x4f88bd6100000000, 0x8fec957600000000,
-    0xcfd24c1300000000, 0x0fb6640400000000, 0x4f1b1c3d00000000,
-    0x8f7f342a00000000, 0xcf67aef600000000, 0x0f0386e100000000,
-    0x4faefed800000000, 0x8fcad6cf00000000, 0xcff40faa00000000,
-    0x0f9027bd00000000, 0x4f3d5f8400000000, 0x8f59779300000000,
-    0x8e0b1ae600000000, 0x4e6f32f100000000, 0x0ec24ac800000000,
-    0xcea662df00000000, 0x8e98bbba00000000, 0x4efc93ad00000000,
-    0x0e51eb9400000000, 0xce35c38300000000, 0x8e2d595f00000000,
-    0x4e49714800000000, 0x0ee4097100000000, 0xce80216600000000,
-    0x8ebef80300000000, 0x4edad01400000000, 0x0e77a82d00000000,
-    0xce13803a00000000, 0x0cd372c700000000, 0xccb75ad000000000,
-    0x8c1a22e900000000, 0x4c7e0afe00000000, 0x0c40d39b00000000,
-    0xcc24fb8c00000000, 0x8c8983b500000000, 0x4cedaba200000000,
-    0x0cf5317e00000000, 0xcc91196900000000, 0x8c3c615000000000,
-    0x4c58494700000000, 0x0c66902200000000, 0xcc02b83500000000,
-    0x8cafc00c00000000, 0x4ccbe81b00000000, 0x4d99856e00000000,
-    0x8dfdad7900000000, 0xcd50d54000000000, 0x0d34fd5700000000,
-    0x4d0a243200000000, 0x8d6e0c2500000000, 0xcdc3741c00000000,
-    0x0da75c0b00000000, 0x4dbfc6d700000000, 0x8ddbeec000000000,
-    0xcd7696f900000000, 0x0d12beee00000000, 0x4d2c678b00000000,
-    0x8d484f9c00000000, 0xcde537a500000000, 0x0d811fb200000000,
-    0x0862a38500000000, 0xc8068b9200000000, 0x88abf3ab00000000,
-    0x48cfdbbc00000000, 0x08f102d900000000, 0xc8952ace00000000,
-    0x883852f700000000, 0x485c7ae000000000, 0x0844e03c00000000,
-    0xc820c82b00000000, 0x888db01200000000, 0x48e9980500000000,
-    0x08d7416000000000, 0xc8b3697700000000, 0x881e114e00000000,
-    0x487a395900000000, 0x4928542c00000000, 0x894c7c3b00000000,
-    0xc9e1040200000000, 0x09852c1500000000, 0x49bbf57000000000,
-    0x89dfdd6700000000, 0xc972a55e00000000, 0x09168d4900000000,
-    0x490e179500000000, 0x896a3f8200000000, 0xc9c747bb00000000,
-    0x09a36fac00000000, 0x499db6c900000000, 0x89f99ede00000000,
-    0xc954e6e700000000, 0x0930cef000000000, 0xcbf03c0d00000000,
-    0x0b94141a00000000, 0x4b396c2300000000, 0x8b5d443400000000,
-    0xcb639d5100000000, 0x0b07b54600000000, 0x4baacd7f00000000,
-    0x8bcee56800000000, 0xcbd67fb400000000, 0x0bb257a300000000,
-    0x4b1f2f9a00000000, 0x8b7b078d00000000, 0xcb45dee800000000,
-    0x0b21f6ff00000000, 0x4b8c8ec600000000, 0x8be8a6d100000000,
-    0x8abacba400000000, 0x4adee3b300000000, 0x0a739b8a00000000,
-    0xca17b39d00000000, 0x8a296af800000000, 0x4a4d42ef00000000,
-    0x0ae03ad600000000, 0xca8412c100000000, 0x8a9c881d00000000,
-    0x4af8a00a00000000, 0x0a55d83300000000, 0xca31f02400000000,
-    0x8a0f294100000000, 0x4a6b015600000000, 0x0ac6796f00000000,
-    0xcaa2517800000000},
-   {0x0000000000000000, 0xd4ea739b00000000, 0xe9d396ed00000000,
-    0x3d39e57600000000, 0x93a15c0000000000, 0x474b2f9b00000000,
-    0x7a72caed00000000, 0xae98b97600000000, 0x2643b90000000000,
-    0xf2a9ca9b00000000, 0xcf902fed00000000, 0x1b7a5c7600000000,
-    0xb5e2e50000000000, 0x6108969b00000000, 0x5c3173ed00000000,
-    0x88db007600000000, 0x4c86720100000000, 0x986c019a00000000,
-    0xa555e4ec00000000, 0x71bf977700000000, 0xdf272e0100000000,
-    0x0bcd5d9a00000000, 0x36f4b8ec00000000, 0xe21ecb7700000000,
-    0x6ac5cb0100000000, 0xbe2fb89a00000000, 0x83165dec00000000,
-    0x57fc2e7700000000, 0xf964970100000000, 0x2d8ee49a00000000,
-    0x10b701ec00000000, 0xc45d727700000000, 0x980ce50200000000,
-    0x4ce6969900000000, 0x71df73ef00000000, 0xa535007400000000,
-    0x0badb90200000000, 0xdf47ca9900000000, 0xe27e2fef00000000,
-    0x36945c7400000000, 0xbe4f5c0200000000, 0x6aa52f9900000000,
-    0x579ccaef00000000, 0x8376b97400000000, 0x2dee000200000000,
-    0xf904739900000000, 0xc43d96ef00000000, 0x10d7e57400000000,
-    0xd48a970300000000, 0x0060e49800000000, 0x3d5901ee00000000,
-    0xe9b3727500000000, 0x472bcb0300000000, 0x93c1b89800000000,
-    0xaef85dee00000000, 0x7a122e7500000000, 0xf2c92e0300000000,
-    0x26235d9800000000, 0x1b1ab8ee00000000, 0xcff0cb7500000000,
-    0x6168720300000000, 0xb582019800000000, 0x88bbe4ee00000000,
-    0x5c51977500000000, 0x3019ca0500000000, 0xe4f3b99e00000000,
-    0xd9ca5ce800000000, 0x0d202f7300000000, 0xa3b8960500000000,
-    0x7752e59e00000000, 0x4a6b00e800000000, 0x9e81737300000000,
-    0x165a730500000000, 0xc2b0009e00000000, 0xff89e5e800000000,
-    0x2b63967300000000, 0x85fb2f0500000000, 0x51115c9e00000000,
-    0x6c28b9e800000000, 0xb8c2ca7300000000, 0x7c9fb80400000000,
-    0xa875cb9f00000000, 0x954c2ee900000000, 0x41a65d7200000000,
-    0xef3ee40400000000, 0x3bd4979f00000000, 0x06ed72e900000000,
-    0xd207017200000000, 0x5adc010400000000, 0x8e36729f00000000,
-    0xb30f97e900000000, 0x67e5e47200000000, 0xc97d5d0400000000,
-    0x1d972e9f00000000, 0x20aecbe900000000, 0xf444b87200000000,
-    0xa8152f0700000000, 0x7cff5c9c00000000, 0x41c6b9ea00000000,
-    0x952cca7100000000, 0x3bb4730700000000, 0xef5e009c00000000,
-    0xd267e5ea00000000, 0x068d967100000000, 0x8e56960700000000,
-    0x5abce59c00000000, 0x678500ea00000000, 0xb36f737100000000,
-    0x1df7ca0700000000, 0xc91db99c00000000, 0xf4245cea00000000,
-    0x20ce2f7100000000, 0xe4935d0600000000, 0x30792e9d00000000,
-    0x0d40cbeb00000000, 0xd9aab87000000000, 0x7732010600000000,
-    0xa3d8729d00000000, 0x9ee197eb00000000, 0x4a0be47000000000,
-    0xc2d0e40600000000, 0x163a979d00000000, 0x2b0372eb00000000,
-    0xffe9017000000000, 0x5171b80600000000, 0x859bcb9d00000000,
-    0xb8a22eeb00000000, 0x6c485d7000000000, 0x6032940b00000000,
-    0xb4d8e79000000000, 0x89e102e600000000, 0x5d0b717d00000000,
-    0xf393c80b00000000, 0x2779bb9000000000, 0x1a405ee600000000,
-    0xceaa2d7d00000000, 0x46712d0b00000000, 0x929b5e9000000000,
-    0xafa2bbe600000000, 0x7b48c87d00000000, 0xd5d0710b00000000,
-    0x013a029000000000, 0x3c03e7e600000000, 0xe8e9947d00000000,
-    0x2cb4e60a00000000, 0xf85e959100000000, 0xc56770e700000000,
-    0x118d037c00000000, 0xbf15ba0a00000000, 0x6bffc99100000000,
-    0x56c62ce700000000, 0x822c5f7c00000000, 0x0af75f0a00000000,
-    0xde1d2c9100000000, 0xe324c9e700000000, 0x37ceba7c00000000,
-    0x9956030a00000000, 0x4dbc709100000000, 0x708595e700000000,
-    0xa46fe67c00000000, 0xf83e710900000000, 0x2cd4029200000000,
-    0x11ede7e400000000, 0xc507947f00000000, 0x6b9f2d0900000000,
-    0xbf755e9200000000, 0x824cbbe400000000, 0x56a6c87f00000000,
-    0xde7dc80900000000, 0x0a97bb9200000000, 0x37ae5ee400000000,
-    0xe3442d7f00000000, 0x4ddc940900000000, 0x9936e79200000000,
-    0xa40f02e400000000, 0x70e5717f00000000, 0xb4b8030800000000,
-    0x6052709300000000, 0x5d6b95e500000000, 0x8981e67e00000000,
-    0x27195f0800000000, 0xf3f32c9300000000, 0xcecac9e500000000,
-    0x1a20ba7e00000000, 0x92fbba0800000000, 0x4611c99300000000,
-    0x7b282ce500000000, 0xafc25f7e00000000, 0x015ae60800000000,
-    0xd5b0959300000000, 0xe88970e500000000, 0x3c63037e00000000,
-    0x502b5e0e00000000, 0x84c12d9500000000, 0xb9f8c8e300000000,
-    0x6d12bb7800000000, 0xc38a020e00000000, 0x1760719500000000,
-    0x2a5994e300000000, 0xfeb3e77800000000, 0x7668e70e00000000,
-    0xa282949500000000, 0x9fbb71e300000000, 0x4b51027800000000,
-    0xe5c9bb0e00000000, 0x3123c89500000000, 0x0c1a2de300000000,
-    0xd8f05e7800000000, 0x1cad2c0f00000000, 0xc8475f9400000000,
-    0xf57ebae200000000, 0x2194c97900000000, 0x8f0c700f00000000,
-    0x5be6039400000000, 0x66dfe6e200000000, 0xb235957900000000,
-    0x3aee950f00000000, 0xee04e69400000000, 0xd33d03e200000000,
-    0x07d7707900000000, 0xa94fc90f00000000, 0x7da5ba9400000000,
-    0x409c5fe200000000, 0x94762c7900000000, 0xc827bb0c00000000,
-    0x1ccdc89700000000, 0x21f42de100000000, 0xf51e5e7a00000000,
-    0x5b86e70c00000000, 0x8f6c949700000000, 0xb25571e100000000,
-    0x66bf027a00000000, 0xee64020c00000000, 0x3a8e719700000000,
-    0x07b794e100000000, 0xd35de77a00000000, 0x7dc55e0c00000000,
-    0xa92f2d9700000000, 0x9416c8e100000000, 0x40fcbb7a00000000,
-    0x84a1c90d00000000, 0x504bba9600000000, 0x6d725fe000000000,
-    0xb9982c7b00000000, 0x1700950d00000000, 0xc3eae69600000000,
-    0xfed303e000000000, 0x2a39707b00000000, 0xa2e2700d00000000,
-    0x7608039600000000, 0x4b31e6e000000000, 0x9fdb957b00000000,
-    0x31432c0d00000000, 0xe5a95f9600000000, 0xd890bae000000000,
-    0x0c7ac97b00000000},
-   {0x0000000000000000, 0x2765258100000000, 0x0fcc3bd900000000,
-    0x28a91e5800000000, 0x5f9e066900000000, 0x78fb23e800000000,
-    0x50523db000000000, 0x7737183100000000, 0xbe3c0dd200000000,
-    0x9959285300000000, 0xb1f0360b00000000, 0x9695138a00000000,
-    0xe1a20bbb00000000, 0xc6c72e3a00000000, 0xee6e306200000000,
-    0xc90b15e300000000, 0x3d7f6b7f00000000, 0x1a1a4efe00000000,
-    0x32b350a600000000, 0x15d6752700000000, 0x62e16d1600000000,
-    0x4584489700000000, 0x6d2d56cf00000000, 0x4a48734e00000000,
-    0x834366ad00000000, 0xa426432c00000000, 0x8c8f5d7400000000,
-    0xabea78f500000000, 0xdcdd60c400000000, 0xfbb8454500000000,
-    0xd3115b1d00000000, 0xf4747e9c00000000, 0x7afed6fe00000000,
-    0x5d9bf37f00000000, 0x7532ed2700000000, 0x5257c8a600000000,
-    0x2560d09700000000, 0x0205f51600000000, 0x2aaceb4e00000000,
-    0x0dc9cecf00000000, 0xc4c2db2c00000000, 0xe3a7fead00000000,
-    0xcb0ee0f500000000, 0xec6bc57400000000, 0x9b5cdd4500000000,
-    0xbc39f8c400000000, 0x9490e69c00000000, 0xb3f5c31d00000000,
-    0x4781bd8100000000, 0x60e4980000000000, 0x484d865800000000,
-    0x6f28a3d900000000, 0x181fbbe800000000, 0x3f7a9e6900000000,
-    0x17d3803100000000, 0x30b6a5b000000000, 0xf9bdb05300000000,
-    0xded895d200000000, 0xf6718b8a00000000, 0xd114ae0b00000000,
-    0xa623b63a00000000, 0x814693bb00000000, 0xa9ef8de300000000,
-    0x8e8aa86200000000, 0xb5fadc2600000000, 0x929ff9a700000000,
-    0xba36e7ff00000000, 0x9d53c27e00000000, 0xea64da4f00000000,
-    0xcd01ffce00000000, 0xe5a8e19600000000, 0xc2cdc41700000000,
-    0x0bc6d1f400000000, 0x2ca3f47500000000, 0x040aea2d00000000,
-    0x236fcfac00000000, 0x5458d79d00000000, 0x733df21c00000000,
-    0x5b94ec4400000000, 0x7cf1c9c500000000, 0x8885b75900000000,
-    0xafe092d800000000, 0x87498c8000000000, 0xa02ca90100000000,
-    0xd71bb13000000000, 0xf07e94b100000000, 0xd8d78ae900000000,
-    0xffb2af6800000000, 0x36b9ba8b00000000, 0x11dc9f0a00000000,
-    0x3975815200000000, 0x1e10a4d300000000, 0x6927bce200000000,
-    0x4e42996300000000, 0x66eb873b00000000, 0x418ea2ba00000000,
-    0xcf040ad800000000, 0xe8612f5900000000, 0xc0c8310100000000,
-    0xe7ad148000000000, 0x909a0cb100000000, 0xb7ff293000000000,
-    0x9f56376800000000, 0xb83312e900000000, 0x7138070a00000000,
-    0x565d228b00000000, 0x7ef43cd300000000, 0x5991195200000000,
-    0x2ea6016300000000, 0x09c324e200000000, 0x216a3aba00000000,
-    0x060f1f3b00000000, 0xf27b61a700000000, 0xd51e442600000000,
-    0xfdb75a7e00000000, 0xdad27fff00000000, 0xade567ce00000000,
-    0x8a80424f00000000, 0xa2295c1700000000, 0x854c799600000000,
-    0x4c476c7500000000, 0x6b2249f400000000, 0x438b57ac00000000,
-    0x64ee722d00000000, 0x13d96a1c00000000, 0x34bc4f9d00000000,
-    0x1c1551c500000000, 0x3b70744400000000, 0x6af5b94d00000000,
-    0x4d909ccc00000000, 0x6539829400000000, 0x425ca71500000000,
-    0x356bbf2400000000, 0x120e9aa500000000, 0x3aa784fd00000000,
-    0x1dc2a17c00000000, 0xd4c9b49f00000000, 0xf3ac911e00000000,
-    0xdb058f4600000000, 0xfc60aac700000000, 0x8b57b2f600000000,
-    0xac32977700000000, 0x849b892f00000000, 0xa3feacae00000000,
-    0x578ad23200000000, 0x70eff7b300000000, 0x5846e9eb00000000,
-    0x7f23cc6a00000000, 0x0814d45b00000000, 0x2f71f1da00000000,
-    0x07d8ef8200000000, 0x20bdca0300000000, 0xe9b6dfe000000000,
-    0xced3fa6100000000, 0xe67ae43900000000, 0xc11fc1b800000000,
-    0xb628d98900000000, 0x914dfc0800000000, 0xb9e4e25000000000,
-    0x9e81c7d100000000, 0x100b6fb300000000, 0x376e4a3200000000,
-    0x1fc7546a00000000, 0x38a271eb00000000, 0x4f9569da00000000,
-    0x68f04c5b00000000, 0x4059520300000000, 0x673c778200000000,
-    0xae37626100000000, 0x895247e000000000, 0xa1fb59b800000000,
-    0x869e7c3900000000, 0xf1a9640800000000, 0xd6cc418900000000,
-    0xfe655fd100000000, 0xd9007a5000000000, 0x2d7404cc00000000,
-    0x0a11214d00000000, 0x22b83f1500000000, 0x05dd1a9400000000,
-    0x72ea02a500000000, 0x558f272400000000, 0x7d26397c00000000,
-    0x5a431cfd00000000, 0x9348091e00000000, 0xb42d2c9f00000000,
-    0x9c8432c700000000, 0xbbe1174600000000, 0xccd60f7700000000,
-    0xebb32af600000000, 0xc31a34ae00000000, 0xe47f112f00000000,
-    0xdf0f656b00000000, 0xf86a40ea00000000, 0xd0c35eb200000000,
-    0xf7a67b3300000000, 0x8091630200000000, 0xa7f4468300000000,
-    0x8f5d58db00000000, 0xa8387d5a00000000, 0x613368b900000000,
-    0x46564d3800000000, 0x6eff536000000000, 0x499a76e100000000,
-    0x3ead6ed000000000, 0x19c84b5100000000, 0x3161550900000000,
-    0x1604708800000000, 0xe2700e1400000000, 0xc5152b9500000000,
-    0xedbc35cd00000000, 0xcad9104c00000000, 0xbdee087d00000000,
-    0x9a8b2dfc00000000, 0xb22233a400000000, 0x9547162500000000,
-    0x5c4c03c600000000, 0x7b29264700000000, 0x5380381f00000000,
-    0x74e51d9e00000000, 0x03d205af00000000, 0x24b7202e00000000,
-    0x0c1e3e7600000000, 0x2b7b1bf700000000, 0xa5f1b39500000000,
-    0x8294961400000000, 0xaa3d884c00000000, 0x8d58adcd00000000,
-    0xfa6fb5fc00000000, 0xdd0a907d00000000, 0xf5a38e2500000000,
-    0xd2c6aba400000000, 0x1bcdbe4700000000, 0x3ca89bc600000000,
-    0x1401859e00000000, 0x3364a01f00000000, 0x4453b82e00000000,
-    0x63369daf00000000, 0x4b9f83f700000000, 0x6cfaa67600000000,
-    0x988ed8ea00000000, 0xbfebfd6b00000000, 0x9742e33300000000,
-    0xb027c6b200000000, 0xc710de8300000000, 0xe075fb0200000000,
-    0xc8dce55a00000000, 0xefb9c0db00000000, 0x26b2d53800000000,
-    0x01d7f0b900000000, 0x297eeee100000000, 0x0e1bcb6000000000,
-    0x792cd35100000000, 0x5e49f6d000000000, 0x76e0e88800000000,
-    0x5185cd0900000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
-    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
-    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
-    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
-    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
-    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
-    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
-    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
-    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
-    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
-    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
-    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
-    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
-    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
-    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
-    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
-    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
-    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
-    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
-    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
-    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
-    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
-    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
-    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
-    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
-    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
-    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
-    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
-    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
-    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
-    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
-    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
-    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
-    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
-    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
-    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
-    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
-    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
-    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
-    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
-    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
-    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
-    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
-    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
-    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
-    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
-    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
-    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
-    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
-    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
-    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
-    0x36197165},
-   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
-    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
-    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
-    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
-    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
-    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
-    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
-    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
-    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
-    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
-    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
-    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
-    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
-    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
-    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
-    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
-    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
-    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
-    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
-    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
-    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
-    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
-    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
-    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
-    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
-    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
-    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
-    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
-    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
-    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
-    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
-    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
-    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
-    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
-    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
-    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
-    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
-    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
-    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
-    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
-    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
-    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
-    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
-    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
-    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
-    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
-    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
-    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
-    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
-    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
-    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
-    0x1a3b93aa},
-   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
-    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
-    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
-    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
-    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
-    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
-    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
-    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
-    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
-    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
-    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
-    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
-    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
-    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
-    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
-    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
-    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
-    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
-    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
-    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
-    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
-    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
-    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
-    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
-    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
-    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
-    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
-    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
-    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
-    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
-    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
-    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
-    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
-    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
-    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
-    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
-    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
-    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
-    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
-    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
-    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
-    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
-    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
-    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
-    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
-    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
-    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
-    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
-    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
-    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
-    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
-    0xe147d714},
-   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
-    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
-    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
-    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
-    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
-    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
-    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
-    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
-    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
-    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
-    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
-    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
-    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
-    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
-    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
-    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
-    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
-    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
-    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
-    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
-    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
-    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
-    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
-    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
-    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
-    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
-    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
-    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
-    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
-    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
-    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
-    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
-    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
-    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
-    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
-    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
-    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
-    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
-    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
-    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
-    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
-    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
-    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
-    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
-    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
-    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
-    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
-    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
-    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
-    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
-    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
-    0x494f0c4b}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0x43147b17, 0x8628f62e, 0xc53c8d39, 0x0c51ec5d,
-    0x4f45974a, 0x8a791a73, 0xc96d6164, 0x18a2d8bb, 0x5bb6a3ac,
-    0x9e8a2e95, 0xdd9e5582, 0x14f334e6, 0x57e74ff1, 0x92dbc2c8,
-    0xd1cfb9df, 0x7142c0ac, 0x3256bbbb, 0xf76a3682, 0xb47e4d95,
-    0x7d132cf1, 0x3e0757e6, 0xfb3bdadf, 0xb82fa1c8, 0x69e01817,
-    0x2af46300, 0xefc8ee39, 0xacdc952e, 0x65b1f44a, 0x26a58f5d,
-    0xe3990264, 0xa08d7973, 0xa382f182, 0xe0968a95, 0x25aa07ac,
-    0x66be7cbb, 0xafd31ddf, 0xecc766c8, 0x29fbebf1, 0x6aef90e6,
-    0xbb202939, 0xf834522e, 0x3d08df17, 0x7e1ca400, 0xb771c564,
-    0xf465be73, 0x3159334a, 0x724d485d, 0xd2c0312e, 0x91d44a39,
-    0x54e8c700, 0x17fcbc17, 0xde91dd73, 0x9d85a664, 0x58b92b5d,
-    0x1bad504a, 0xca62e995, 0x89769282, 0x4c4a1fbb, 0x0f5e64ac,
-    0xc63305c8, 0x85277edf, 0x401bf3e6, 0x030f88f1, 0x070392de,
-    0x4417e9c9, 0x812b64f0, 0xc23f1fe7, 0x0b527e83, 0x48460594,
-    0x8d7a88ad, 0xce6ef3ba, 0x1fa14a65, 0x5cb53172, 0x9989bc4b,
-    0xda9dc75c, 0x13f0a638, 0x50e4dd2f, 0x95d85016, 0xd6cc2b01,
-    0x76415272, 0x35552965, 0xf069a45c, 0xb37ddf4b, 0x7a10be2f,
-    0x3904c538, 0xfc384801, 0xbf2c3316, 0x6ee38ac9, 0x2df7f1de,
-    0xe8cb7ce7, 0xabdf07f0, 0x62b26694, 0x21a61d83, 0xe49a90ba,
-    0xa78eebad, 0xa481635c, 0xe795184b, 0x22a99572, 0x61bdee65,
-    0xa8d08f01, 0xebc4f416, 0x2ef8792f, 0x6dec0238, 0xbc23bbe7,
-    0xff37c0f0, 0x3a0b4dc9, 0x791f36de, 0xb07257ba, 0xf3662cad,
-    0x365aa194, 0x754eda83, 0xd5c3a3f0, 0x96d7d8e7, 0x53eb55de,
-    0x10ff2ec9, 0xd9924fad, 0x9a8634ba, 0x5fbab983, 0x1caec294,
-    0xcd617b4b, 0x8e75005c, 0x4b498d65, 0x085df672, 0xc1309716,
-    0x8224ec01, 0x47186138, 0x040c1a2f, 0x4f005566, 0x0c142e71,
-    0xc928a348, 0x8a3cd85f, 0x4351b93b, 0x0045c22c, 0xc5794f15,
-    0x866d3402, 0x57a28ddd, 0x14b6f6ca, 0xd18a7bf3, 0x929e00e4,
-    0x5bf36180, 0x18e71a97, 0xdddb97ae, 0x9ecfecb9, 0x3e4295ca,
-    0x7d56eedd, 0xb86a63e4, 0xfb7e18f3, 0x32137997, 0x71070280,
-    0xb43b8fb9, 0xf72ff4ae, 0x26e04d71, 0x65f43666, 0xa0c8bb5f,
-    0xe3dcc048, 0x2ab1a12c, 0x69a5da3b, 0xac995702, 0xef8d2c15,
-    0xec82a4e4, 0xaf96dff3, 0x6aaa52ca, 0x29be29dd, 0xe0d348b9,
-    0xa3c733ae, 0x66fbbe97, 0x25efc580, 0xf4207c5f, 0xb7340748,
-    0x72088a71, 0x311cf166, 0xf8719002, 0xbb65eb15, 0x7e59662c,
-    0x3d4d1d3b, 0x9dc06448, 0xded41f5f, 0x1be89266, 0x58fce971,
-    0x91918815, 0xd285f302, 0x17b97e3b, 0x54ad052c, 0x8562bcf3,
-    0xc676c7e4, 0x034a4add, 0x405e31ca, 0x893350ae, 0xca272bb9,
-    0x0f1ba680, 0x4c0fdd97, 0x4803c7b8, 0x0b17bcaf, 0xce2b3196,
-    0x8d3f4a81, 0x44522be5, 0x074650f2, 0xc27addcb, 0x816ea6dc,
-    0x50a11f03, 0x13b56414, 0xd689e92d, 0x959d923a, 0x5cf0f35e,
-    0x1fe48849, 0xdad80570, 0x99cc7e67, 0x39410714, 0x7a557c03,
-    0xbf69f13a, 0xfc7d8a2d, 0x3510eb49, 0x7604905e, 0xb3381d67,
-    0xf02c6670, 0x21e3dfaf, 0x62f7a4b8, 0xa7cb2981, 0xe4df5296,
-    0x2db233f2, 0x6ea648e5, 0xab9ac5dc, 0xe88ebecb, 0xeb81363a,
-    0xa8954d2d, 0x6da9c014, 0x2ebdbb03, 0xe7d0da67, 0xa4c4a170,
-    0x61f82c49, 0x22ec575e, 0xf323ee81, 0xb0379596, 0x750b18af,
-    0x361f63b8, 0xff7202dc, 0xbc6679cb, 0x795af4f2, 0x3a4e8fe5,
-    0x9ac3f696, 0xd9d78d81, 0x1ceb00b8, 0x5fff7baf, 0x96921acb,
-    0xd58661dc, 0x10baece5, 0x53ae97f2, 0x82612e2d, 0xc175553a,
-    0x0449d803, 0x475da314, 0x8e30c270, 0xcd24b967, 0x0818345e,
-    0x4b0c4f49},
-   {0x00000000, 0x3e6bc2ef, 0x3dd0f504, 0x03bb37eb, 0x7aa0eb09,
-    0x44cb29e6, 0x47701e0d, 0x791bdce2, 0xf440d713, 0xca2b15fc,
-    0xc9902217, 0xf7fbe0f8, 0x8ee03c1a, 0xb08bfef5, 0xb330c91e,
-    0x8d5b0bf1, 0xe881ae27, 0xd6ea6cc8, 0xd5515b23, 0xeb3a99cc,
-    0x9221452e, 0xac4a87c1, 0xaff1b02a, 0x919a72c5, 0x1cc17934,
-    0x22aabbdb, 0x21118c30, 0x1f7a4edf, 0x6661923d, 0x580a50d2,
-    0x5bb16739, 0x65daa5d6, 0xd0035d4f, 0xee689fa0, 0xedd3a84b,
-    0xd3b86aa4, 0xaaa3b646, 0x94c874a9, 0x97734342, 0xa91881ad,
-    0x24438a5c, 0x1a2848b3, 0x19937f58, 0x27f8bdb7, 0x5ee36155,
-    0x6088a3ba, 0x63339451, 0x5d5856be, 0x3882f368, 0x06e93187,
-    0x0552066c, 0x3b39c483, 0x42221861, 0x7c49da8e, 0x7ff2ed65,
-    0x41992f8a, 0xccc2247b, 0xf2a9e694, 0xf112d17f, 0xcf791390,
-    0xb662cf72, 0x88090d9d, 0x8bb23a76, 0xb5d9f899, 0xa007ba9e,
-    0x9e6c7871, 0x9dd74f9a, 0xa3bc8d75, 0xdaa75197, 0xe4cc9378,
-    0xe777a493, 0xd91c667c, 0x54476d8d, 0x6a2caf62, 0x69979889,
-    0x57fc5a66, 0x2ee78684, 0x108c446b, 0x13377380, 0x2d5cb16f,
-    0x488614b9, 0x76edd656, 0x7556e1bd, 0x4b3d2352, 0x3226ffb0,
-    0x0c4d3d5f, 0x0ff60ab4, 0x319dc85b, 0xbcc6c3aa, 0x82ad0145,
-    0x811636ae, 0xbf7df441, 0xc66628a3, 0xf80dea4c, 0xfbb6dda7,
-    0xc5dd1f48, 0x7004e7d1, 0x4e6f253e, 0x4dd412d5, 0x73bfd03a,
-    0x0aa40cd8, 0x34cfce37, 0x3774f9dc, 0x091f3b33, 0x844430c2,
-    0xba2ff22d, 0xb994c5c6, 0x87ff0729, 0xfee4dbcb, 0xc08f1924,
-    0xc3342ecf, 0xfd5fec20, 0x988549f6, 0xa6ee8b19, 0xa555bcf2,
-    0x9b3e7e1d, 0xe225a2ff, 0xdc4e6010, 0xdff557fb, 0xe19e9514,
-    0x6cc59ee5, 0x52ae5c0a, 0x51156be1, 0x6f7ea90e, 0x166575ec,
-    0x280eb703, 0x2bb580e8, 0x15de4207, 0x010905e6, 0x3f62c709,
-    0x3cd9f0e2, 0x02b2320d, 0x7ba9eeef, 0x45c22c00, 0x46791beb,
-    0x7812d904, 0xf549d2f5, 0xcb22101a, 0xc89927f1, 0xf6f2e51e,
-    0x8fe939fc, 0xb182fb13, 0xb239ccf8, 0x8c520e17, 0xe988abc1,
-    0xd7e3692e, 0xd4585ec5, 0xea339c2a, 0x932840c8, 0xad438227,
-    0xaef8b5cc, 0x90937723, 0x1dc87cd2, 0x23a3be3d, 0x201889d6,
-    0x1e734b39, 0x676897db, 0x59035534, 0x5ab862df, 0x64d3a030,
-    0xd10a58a9, 0xef619a46, 0xecdaadad, 0xd2b16f42, 0xabaab3a0,
-    0x95c1714f, 0x967a46a4, 0xa811844b, 0x254a8fba, 0x1b214d55,
-    0x189a7abe, 0x26f1b851, 0x5fea64b3, 0x6181a65c, 0x623a91b7,
-    0x5c515358, 0x398bf68e, 0x07e03461, 0x045b038a, 0x3a30c165,
-    0x432b1d87, 0x7d40df68, 0x7efbe883, 0x40902a6c, 0xcdcb219d,
-    0xf3a0e372, 0xf01bd499, 0xce701676, 0xb76bca94, 0x8900087b,
-    0x8abb3f90, 0xb4d0fd7f, 0xa10ebf78, 0x9f657d97, 0x9cde4a7c,
-    0xa2b58893, 0xdbae5471, 0xe5c5969e, 0xe67ea175, 0xd815639a,
-    0x554e686b, 0x6b25aa84, 0x689e9d6f, 0x56f55f80, 0x2fee8362,
-    0x1185418d, 0x123e7666, 0x2c55b489, 0x498f115f, 0x77e4d3b0,
-    0x745fe45b, 0x4a3426b4, 0x332ffa56, 0x0d4438b9, 0x0eff0f52,
-    0x3094cdbd, 0xbdcfc64c, 0x83a404a3, 0x801f3348, 0xbe74f1a7,
-    0xc76f2d45, 0xf904efaa, 0xfabfd841, 0xc4d41aae, 0x710de237,
-    0x4f6620d8, 0x4cdd1733, 0x72b6d5dc, 0x0bad093e, 0x35c6cbd1,
-    0x367dfc3a, 0x08163ed5, 0x854d3524, 0xbb26f7cb, 0xb89dc020,
-    0x86f602cf, 0xffedde2d, 0xc1861cc2, 0xc23d2b29, 0xfc56e9c6,
-    0x998c4c10, 0xa7e78eff, 0xa45cb914, 0x9a377bfb, 0xe32ca719,
-    0xdd4765f6, 0xdefc521d, 0xe09790f2, 0x6dcc9b03, 0x53a759ec,
-    0x501c6e07, 0x6e77ace8, 0x176c700a, 0x2907b2e5, 0x2abc850e,
-    0x14d747e1},
-   {0x00000000, 0xc0df8ec1, 0xc1b96c58, 0x0166e299, 0x8273d9b0,
-    0x42ac5771, 0x43cab5e8, 0x83153b29, 0x45e1c3ba, 0x853e4d7b,
-    0x8458afe2, 0x44872123, 0xc7921a0a, 0x074d94cb, 0x062b7652,
-    0xc6f4f893, 0xcbc4f6ae, 0x0b1b786f, 0x0a7d9af6, 0xcaa21437,
-    0x49b72f1e, 0x8968a1df, 0x880e4346, 0x48d1cd87, 0x8e253514,
-    0x4efabbd5, 0x4f9c594c, 0x8f43d78d, 0x0c56eca4, 0xcc896265,
-    0xcdef80fc, 0x0d300e3d, 0xd78f9c86, 0x17501247, 0x1636f0de,
-    0xd6e97e1f, 0x55fc4536, 0x9523cbf7, 0x9445296e, 0x549aa7af,
-    0x926e5f3c, 0x52b1d1fd, 0x53d73364, 0x9308bda5, 0x101d868c,
-    0xd0c2084d, 0xd1a4ead4, 0x117b6415, 0x1c4b6a28, 0xdc94e4e9,
-    0xddf20670, 0x1d2d88b1, 0x9e38b398, 0x5ee73d59, 0x5f81dfc0,
-    0x9f5e5101, 0x59aaa992, 0x99752753, 0x9813c5ca, 0x58cc4b0b,
-    0xdbd97022, 0x1b06fee3, 0x1a601c7a, 0xdabf92bb, 0xef1948d6,
-    0x2fc6c617, 0x2ea0248e, 0xee7faa4f, 0x6d6a9166, 0xadb51fa7,
-    0xacd3fd3e, 0x6c0c73ff, 0xaaf88b6c, 0x6a2705ad, 0x6b41e734,
-    0xab9e69f5, 0x288b52dc, 0xe854dc1d, 0xe9323e84, 0x29edb045,
-    0x24ddbe78, 0xe40230b9, 0xe564d220, 0x25bb5ce1, 0xa6ae67c8,
-    0x6671e909, 0x67170b90, 0xa7c88551, 0x613c7dc2, 0xa1e3f303,
-    0xa085119a, 0x605a9f5b, 0xe34fa472, 0x23902ab3, 0x22f6c82a,
-    0xe22946eb, 0x3896d450, 0xf8495a91, 0xf92fb808, 0x39f036c9,
-    0xbae50de0, 0x7a3a8321, 0x7b5c61b8, 0xbb83ef79, 0x7d7717ea,
-    0xbda8992b, 0xbcce7bb2, 0x7c11f573, 0xff04ce5a, 0x3fdb409b,
-    0x3ebda202, 0xfe622cc3, 0xf35222fe, 0x338dac3f, 0x32eb4ea6,
-    0xf234c067, 0x7121fb4e, 0xb1fe758f, 0xb0989716, 0x704719d7,
-    0xb6b3e144, 0x766c6f85, 0x770a8d1c, 0xb7d503dd, 0x34c038f4,
-    0xf41fb635, 0xf57954ac, 0x35a6da6d, 0x9f35e177, 0x5fea6fb6,
-    0x5e8c8d2f, 0x9e5303ee, 0x1d4638c7, 0xdd99b606, 0xdcff549f,
-    0x1c20da5e, 0xdad422cd, 0x1a0bac0c, 0x1b6d4e95, 0xdbb2c054,
-    0x58a7fb7d, 0x987875bc, 0x991e9725, 0x59c119e4, 0x54f117d9,
-    0x942e9918, 0x95487b81, 0x5597f540, 0xd682ce69, 0x165d40a8,
-    0x173ba231, 0xd7e42cf0, 0x1110d463, 0xd1cf5aa2, 0xd0a9b83b,
-    0x107636fa, 0x93630dd3, 0x53bc8312, 0x52da618b, 0x9205ef4a,
-    0x48ba7df1, 0x8865f330, 0x890311a9, 0x49dc9f68, 0xcac9a441,
-    0x0a162a80, 0x0b70c819, 0xcbaf46d8, 0x0d5bbe4b, 0xcd84308a,
-    0xcce2d213, 0x0c3d5cd2, 0x8f2867fb, 0x4ff7e93a, 0x4e910ba3,
-    0x8e4e8562, 0x837e8b5f, 0x43a1059e, 0x42c7e707, 0x821869c6,
-    0x010d52ef, 0xc1d2dc2e, 0xc0b43eb7, 0x006bb076, 0xc69f48e5,
-    0x0640c624, 0x072624bd, 0xc7f9aa7c, 0x44ec9155, 0x84331f94,
-    0x8555fd0d, 0x458a73cc, 0x702ca9a1, 0xb0f32760, 0xb195c5f9,
-    0x714a4b38, 0xf25f7011, 0x3280fed0, 0x33e61c49, 0xf3399288,
-    0x35cd6a1b, 0xf512e4da, 0xf4740643, 0x34ab8882, 0xb7beb3ab,
-    0x77613d6a, 0x7607dff3, 0xb6d85132, 0xbbe85f0f, 0x7b37d1ce,
-    0x7a513357, 0xba8ebd96, 0x399b86bf, 0xf944087e, 0xf822eae7,
-    0x38fd6426, 0xfe099cb5, 0x3ed61274, 0x3fb0f0ed, 0xff6f7e2c,
-    0x7c7a4505, 0xbca5cbc4, 0xbdc3295d, 0x7d1ca79c, 0xa7a33527,
-    0x677cbbe6, 0x661a597f, 0xa6c5d7be, 0x25d0ec97, 0xe50f6256,
-    0xe46980cf, 0x24b60e0e, 0xe242f69d, 0x229d785c, 0x23fb9ac5,
-    0xe3241404, 0x60312f2d, 0xa0eea1ec, 0xa1884375, 0x6157cdb4,
-    0x6c67c389, 0xacb84d48, 0xaddeafd1, 0x6d012110, 0xee141a39,
-    0x2ecb94f8, 0x2fad7661, 0xef72f8a0, 0x29860033, 0xe9598ef2,
-    0xe83f6c6b, 0x28e0e2aa, 0xabf5d983, 0x6b2a5742, 0x6a4cb5db,
-    0xaa933b1a},
-   {0x00000000, 0x6f4ca59b, 0x9f9e3bec, 0xf0d29e77, 0x7f3b0603,
-    0x1077a398, 0xe0a53def, 0x8fe99874, 0xfe760c06, 0x913aa99d,
-    0x61e837ea, 0x0ea49271, 0x814d0a05, 0xee01af9e, 0x1ed331e9,
-    0x719f9472, 0xfced180c, 0x93a1bd97, 0x637323e0, 0x0c3f867b,
-    0x83d61e0f, 0xec9abb94, 0x1c4825e3, 0x73048078, 0x029b140a,
-    0x6dd7b191, 0x9d052fe6, 0xf2498a7d, 0x7da01209, 0x12ecb792,
-    0xe23e29e5, 0x8d728c7e, 0xf8db3118, 0x97979483, 0x67450af4,
-    0x0809af6f, 0x87e0371b, 0xe8ac9280, 0x187e0cf7, 0x7732a96c,
-    0x06ad3d1e, 0x69e19885, 0x993306f2, 0xf67fa369, 0x79963b1d,
-    0x16da9e86, 0xe60800f1, 0x8944a56a, 0x04362914, 0x6b7a8c8f,
-    0x9ba812f8, 0xf4e4b763, 0x7b0d2f17, 0x14418a8c, 0xe49314fb,
-    0x8bdfb160, 0xfa402512, 0x950c8089, 0x65de1efe, 0x0a92bb65,
-    0x857b2311, 0xea37868a, 0x1ae518fd, 0x75a9bd66, 0xf0b76330,
-    0x9ffbc6ab, 0x6f2958dc, 0x0065fd47, 0x8f8c6533, 0xe0c0c0a8,
-    0x10125edf, 0x7f5efb44, 0x0ec16f36, 0x618dcaad, 0x915f54da,
-    0xfe13f141, 0x71fa6935, 0x1eb6ccae, 0xee6452d9, 0x8128f742,
-    0x0c5a7b3c, 0x6316dea7, 0x93c440d0, 0xfc88e54b, 0x73617d3f,
-    0x1c2dd8a4, 0xecff46d3, 0x83b3e348, 0xf22c773a, 0x9d60d2a1,
-    0x6db24cd6, 0x02fee94d, 0x8d177139, 0xe25bd4a2, 0x12894ad5,
-    0x7dc5ef4e, 0x086c5228, 0x6720f7b3, 0x97f269c4, 0xf8becc5f,
-    0x7757542b, 0x181bf1b0, 0xe8c96fc7, 0x8785ca5c, 0xf61a5e2e,
-    0x9956fbb5, 0x698465c2, 0x06c8c059, 0x8921582d, 0xe66dfdb6,
-    0x16bf63c1, 0x79f3c65a, 0xf4814a24, 0x9bcdefbf, 0x6b1f71c8,
-    0x0453d453, 0x8bba4c27, 0xe4f6e9bc, 0x142477cb, 0x7b68d250,
-    0x0af74622, 0x65bbe3b9, 0x95697dce, 0xfa25d855, 0x75cc4021,
-    0x1a80e5ba, 0xea527bcd, 0x851ede56, 0xe06fc760, 0x8f2362fb,
-    0x7ff1fc8c, 0x10bd5917, 0x9f54c163, 0xf01864f8, 0x00cafa8f,
-    0x6f865f14, 0x1e19cb66, 0x71556efd, 0x8187f08a, 0xeecb5511,
-    0x6122cd65, 0x0e6e68fe, 0xfebcf689, 0x91f05312, 0x1c82df6c,
-    0x73ce7af7, 0x831ce480, 0xec50411b, 0x63b9d96f, 0x0cf57cf4,
-    0xfc27e283, 0x936b4718, 0xe2f4d36a, 0x8db876f1, 0x7d6ae886,
-    0x12264d1d, 0x9dcfd569, 0xf28370f2, 0x0251ee85, 0x6d1d4b1e,
-    0x18b4f678, 0x77f853e3, 0x872acd94, 0xe866680f, 0x678ff07b,
-    0x08c355e0, 0xf811cb97, 0x975d6e0c, 0xe6c2fa7e, 0x898e5fe5,
-    0x795cc192, 0x16106409, 0x99f9fc7d, 0xf6b559e6, 0x0667c791,
-    0x692b620a, 0xe459ee74, 0x8b154bef, 0x7bc7d598, 0x148b7003,
-    0x9b62e877, 0xf42e4dec, 0x04fcd39b, 0x6bb07600, 0x1a2fe272,
-    0x756347e9, 0x85b1d99e, 0xeafd7c05, 0x6514e471, 0x0a5841ea,
-    0xfa8adf9d, 0x95c67a06, 0x10d8a450, 0x7f9401cb, 0x8f469fbc,
-    0xe00a3a27, 0x6fe3a253, 0x00af07c8, 0xf07d99bf, 0x9f313c24,
-    0xeeaea856, 0x81e20dcd, 0x713093ba, 0x1e7c3621, 0x9195ae55,
-    0xfed90bce, 0x0e0b95b9, 0x61473022, 0xec35bc5c, 0x837919c7,
-    0x73ab87b0, 0x1ce7222b, 0x930eba5f, 0xfc421fc4, 0x0c9081b3,
-    0x63dc2428, 0x1243b05a, 0x7d0f15c1, 0x8ddd8bb6, 0xe2912e2d,
-    0x6d78b659, 0x023413c2, 0xf2e68db5, 0x9daa282e, 0xe8039548,
-    0x874f30d3, 0x779daea4, 0x18d10b3f, 0x9738934b, 0xf87436d0,
-    0x08a6a8a7, 0x67ea0d3c, 0x1675994e, 0x79393cd5, 0x89eba2a2,
-    0xe6a70739, 0x694e9f4d, 0x06023ad6, 0xf6d0a4a1, 0x999c013a,
-    0x14ee8d44, 0x7ba228df, 0x8b70b6a8, 0xe43c1333, 0x6bd58b47,
-    0x04992edc, 0xf44bb0ab, 0x9b071530, 0xea988142, 0x85d424d9,
-    0x7506baae, 0x1a4a1f35, 0x95a38741, 0xfaef22da, 0x0a3dbcad,
-    0x65711936}};
-
-#endif /* W */
-
-#endif /* N == 3 */
-#if N == 4
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xf1da05aa, 0x38c50d15, 0xc91f08bf, 0x718a1a2a,
-    0x80501f80, 0x494f173f, 0xb8951295, 0xe3143454, 0x12ce31fe,
-    0xdbd13941, 0x2a0b3ceb, 0x929e2e7e, 0x63442bd4, 0xaa5b236b,
-    0x5b8126c1, 0x1d596ee9, 0xec836b43, 0x259c63fc, 0xd4466656,
-    0x6cd374c3, 0x9d097169, 0x541679d6, 0xa5cc7c7c, 0xfe4d5abd,
-    0x0f975f17, 0xc68857a8, 0x37525202, 0x8fc74097, 0x7e1d453d,
-    0xb7024d82, 0x46d84828, 0x3ab2ddd2, 0xcb68d878, 0x0277d0c7,
-    0xf3add56d, 0x4b38c7f8, 0xbae2c252, 0x73fdcaed, 0x8227cf47,
-    0xd9a6e986, 0x287cec2c, 0xe163e493, 0x10b9e139, 0xa82cf3ac,
-    0x59f6f606, 0x90e9feb9, 0x6133fb13, 0x27ebb33b, 0xd631b691,
-    0x1f2ebe2e, 0xeef4bb84, 0x5661a911, 0xa7bbacbb, 0x6ea4a404,
-    0x9f7ea1ae, 0xc4ff876f, 0x352582c5, 0xfc3a8a7a, 0x0de08fd0,
-    0xb5759d45, 0x44af98ef, 0x8db09050, 0x7c6a95fa, 0x7565bba4,
-    0x84bfbe0e, 0x4da0b6b1, 0xbc7ab31b, 0x04efa18e, 0xf535a424,
-    0x3c2aac9b, 0xcdf0a931, 0x96718ff0, 0x67ab8a5a, 0xaeb482e5,
-    0x5f6e874f, 0xe7fb95da, 0x16219070, 0xdf3e98cf, 0x2ee49d65,
-    0x683cd54d, 0x99e6d0e7, 0x50f9d858, 0xa123ddf2, 0x19b6cf67,
-    0xe86ccacd, 0x2173c272, 0xd0a9c7d8, 0x8b28e119, 0x7af2e4b3,
-    0xb3edec0c, 0x4237e9a6, 0xfaa2fb33, 0x0b78fe99, 0xc267f626,
-    0x33bdf38c, 0x4fd76676, 0xbe0d63dc, 0x77126b63, 0x86c86ec9,
-    0x3e5d7c5c, 0xcf8779f6, 0x06987149, 0xf74274e3, 0xacc35222,
-    0x5d195788, 0x94065f37, 0x65dc5a9d, 0xdd494808, 0x2c934da2,
-    0xe58c451d, 0x145640b7, 0x528e089f, 0xa3540d35, 0x6a4b058a,
-    0x9b910020, 0x230412b5, 0xd2de171f, 0x1bc11fa0, 0xea1b1a0a,
-    0xb19a3ccb, 0x40403961, 0x895f31de, 0x78853474, 0xc01026e1,
-    0x31ca234b, 0xf8d52bf4, 0x090f2e5e, 0xeacb7748, 0x1b1172e2,
-    0xd20e7a5d, 0x23d47ff7, 0x9b416d62, 0x6a9b68c8, 0xa3846077,
-    0x525e65dd, 0x09df431c, 0xf80546b6, 0x311a4e09, 0xc0c04ba3,
-    0x78555936, 0x898f5c9c, 0x40905423, 0xb14a5189, 0xf79219a1,
-    0x06481c0b, 0xcf5714b4, 0x3e8d111e, 0x8618038b, 0x77c20621,
-    0xbedd0e9e, 0x4f070b34, 0x14862df5, 0xe55c285f, 0x2c4320e0,
-    0xdd99254a, 0x650c37df, 0x94d63275, 0x5dc93aca, 0xac133f60,
-    0xd079aa9a, 0x21a3af30, 0xe8bca78f, 0x1966a225, 0xa1f3b0b0,
-    0x5029b51a, 0x9936bda5, 0x68ecb80f, 0x336d9ece, 0xc2b79b64,
-    0x0ba893db, 0xfa729671, 0x42e784e4, 0xb33d814e, 0x7a2289f1,
-    0x8bf88c5b, 0xcd20c473, 0x3cfac1d9, 0xf5e5c966, 0x043fcccc,
-    0xbcaade59, 0x4d70dbf3, 0x846fd34c, 0x75b5d6e6, 0x2e34f027,
-    0xdfeef58d, 0x16f1fd32, 0xe72bf898, 0x5fbeea0d, 0xae64efa7,
-    0x677be718, 0x96a1e2b2, 0x9faeccec, 0x6e74c946, 0xa76bc1f9,
-    0x56b1c453, 0xee24d6c6, 0x1ffed36c, 0xd6e1dbd3, 0x273bde79,
-    0x7cbaf8b8, 0x8d60fd12, 0x447ff5ad, 0xb5a5f007, 0x0d30e292,
-    0xfceae738, 0x35f5ef87, 0xc42fea2d, 0x82f7a205, 0x732da7af,
-    0xba32af10, 0x4be8aaba, 0xf37db82f, 0x02a7bd85, 0xcbb8b53a,
-    0x3a62b090, 0x61e39651, 0x903993fb, 0x59269b44, 0xa8fc9eee,
-    0x10698c7b, 0xe1b389d1, 0x28ac816e, 0xd97684c4, 0xa51c113e,
-    0x54c61494, 0x9dd91c2b, 0x6c031981, 0xd4960b14, 0x254c0ebe,
-    0xec530601, 0x1d8903ab, 0x4608256a, 0xb7d220c0, 0x7ecd287f,
-    0x8f172dd5, 0x37823f40, 0xc6583aea, 0x0f473255, 0xfe9d37ff,
-    0xb8457fd7, 0x499f7a7d, 0x808072c2, 0x715a7768, 0xc9cf65fd,
-    0x38156057, 0xf10a68e8, 0x00d06d42, 0x5b514b83, 0xaa8b4e29,
-    0x63944696, 0x924e433c, 0x2adb51a9, 0xdb015403, 0x121e5cbc,
-    0xe3c45916},
-   {0x00000000, 0x0ee7e8d1, 0x1dcfd1a2, 0x13283973, 0x3b9fa344,
-    0x35784b95, 0x265072e6, 0x28b79a37, 0x773f4688, 0x79d8ae59,
-    0x6af0972a, 0x64177ffb, 0x4ca0e5cc, 0x42470d1d, 0x516f346e,
-    0x5f88dcbf, 0xee7e8d10, 0xe09965c1, 0xf3b15cb2, 0xfd56b463,
-    0xd5e12e54, 0xdb06c685, 0xc82efff6, 0xc6c91727, 0x9941cb98,
-    0x97a62349, 0x848e1a3a, 0x8a69f2eb, 0xa2de68dc, 0xac39800d,
-    0xbf11b97e, 0xb1f651af, 0x078c1c61, 0x096bf4b0, 0x1a43cdc3,
-    0x14a42512, 0x3c13bf25, 0x32f457f4, 0x21dc6e87, 0x2f3b8656,
-    0x70b35ae9, 0x7e54b238, 0x6d7c8b4b, 0x639b639a, 0x4b2cf9ad,
-    0x45cb117c, 0x56e3280f, 0x5804c0de, 0xe9f29171, 0xe71579a0,
-    0xf43d40d3, 0xfadaa802, 0xd26d3235, 0xdc8adae4, 0xcfa2e397,
-    0xc1450b46, 0x9ecdd7f9, 0x902a3f28, 0x8302065b, 0x8de5ee8a,
-    0xa55274bd, 0xabb59c6c, 0xb89da51f, 0xb67a4dce, 0x0f1838c2,
-    0x01ffd013, 0x12d7e960, 0x1c3001b1, 0x34879b86, 0x3a607357,
-    0x29484a24, 0x27afa2f5, 0x78277e4a, 0x76c0969b, 0x65e8afe8,
-    0x6b0f4739, 0x43b8dd0e, 0x4d5f35df, 0x5e770cac, 0x5090e47d,
-    0xe166b5d2, 0xef815d03, 0xfca96470, 0xf24e8ca1, 0xdaf91696,
-    0xd41efe47, 0xc736c734, 0xc9d12fe5, 0x9659f35a, 0x98be1b8b,
-    0x8b9622f8, 0x8571ca29, 0xadc6501e, 0xa321b8cf, 0xb00981bc,
-    0xbeee696d, 0x089424a3, 0x0673cc72, 0x155bf501, 0x1bbc1dd0,
-    0x330b87e7, 0x3dec6f36, 0x2ec45645, 0x2023be94, 0x7fab622b,
-    0x714c8afa, 0x6264b389, 0x6c835b58, 0x4434c16f, 0x4ad329be,
-    0x59fb10cd, 0x571cf81c, 0xe6eaa9b3, 0xe80d4162, 0xfb257811,
-    0xf5c290c0, 0xdd750af7, 0xd392e226, 0xc0badb55, 0xce5d3384,
-    0x91d5ef3b, 0x9f3207ea, 0x8c1a3e99, 0x82fdd648, 0xaa4a4c7f,
-    0xa4ada4ae, 0xb7859ddd, 0xb962750c, 0x1e307184, 0x10d79955,
-    0x03ffa026, 0x0d1848f7, 0x25afd2c0, 0x2b483a11, 0x38600362,
-    0x3687ebb3, 0x690f370c, 0x67e8dfdd, 0x74c0e6ae, 0x7a270e7f,
-    0x52909448, 0x5c777c99, 0x4f5f45ea, 0x41b8ad3b, 0xf04efc94,
-    0xfea91445, 0xed812d36, 0xe366c5e7, 0xcbd15fd0, 0xc536b701,
-    0xd61e8e72, 0xd8f966a3, 0x8771ba1c, 0x899652cd, 0x9abe6bbe,
-    0x9459836f, 0xbcee1958, 0xb209f189, 0xa121c8fa, 0xafc6202b,
-    0x19bc6de5, 0x175b8534, 0x0473bc47, 0x0a945496, 0x2223cea1,
-    0x2cc42670, 0x3fec1f03, 0x310bf7d2, 0x6e832b6d, 0x6064c3bc,
-    0x734cfacf, 0x7dab121e, 0x551c8829, 0x5bfb60f8, 0x48d3598b,
-    0x4634b15a, 0xf7c2e0f5, 0xf9250824, 0xea0d3157, 0xe4ead986,
-    0xcc5d43b1, 0xc2baab60, 0xd1929213, 0xdf757ac2, 0x80fda67d,
-    0x8e1a4eac, 0x9d3277df, 0x93d59f0e, 0xbb620539, 0xb585ede8,
-    0xa6add49b, 0xa84a3c4a, 0x11284946, 0x1fcfa197, 0x0ce798e4,
-    0x02007035, 0x2ab7ea02, 0x245002d3, 0x37783ba0, 0x399fd371,
-    0x66170fce, 0x68f0e71f, 0x7bd8de6c, 0x753f36bd, 0x5d88ac8a,
-    0x536f445b, 0x40477d28, 0x4ea095f9, 0xff56c456, 0xf1b12c87,
-    0xe29915f4, 0xec7efd25, 0xc4c96712, 0xca2e8fc3, 0xd906b6b0,
-    0xd7e15e61, 0x886982de, 0x868e6a0f, 0x95a6537c, 0x9b41bbad,
-    0xb3f6219a, 0xbd11c94b, 0xae39f038, 0xa0de18e9, 0x16a45527,
-    0x1843bdf6, 0x0b6b8485, 0x058c6c54, 0x2d3bf663, 0x23dc1eb2,
-    0x30f427c1, 0x3e13cf10, 0x619b13af, 0x6f7cfb7e, 0x7c54c20d,
-    0x72b32adc, 0x5a04b0eb, 0x54e3583a, 0x47cb6149, 0x492c8998,
-    0xf8dad837, 0xf63d30e6, 0xe5150995, 0xebf2e144, 0xc3457b73,
-    0xcda293a2, 0xde8aaad1, 0xd06d4200, 0x8fe59ebf, 0x8102766e,
-    0x922a4f1d, 0x9ccda7cc, 0xb47a3dfb, 0xba9dd52a, 0xa9b5ec59,
-    0xa7520488},
-   {0x00000000, 0x3c60e308, 0x78c1c610, 0x44a12518, 0xf1838c20,
-    0xcde36f28, 0x89424a30, 0xb522a938, 0x38761e01, 0x0416fd09,
-    0x40b7d811, 0x7cd73b19, 0xc9f59221, 0xf5957129, 0xb1345431,
-    0x8d54b739, 0x70ec3c02, 0x4c8cdf0a, 0x082dfa12, 0x344d191a,
-    0x816fb022, 0xbd0f532a, 0xf9ae7632, 0xc5ce953a, 0x489a2203,
-    0x74fac10b, 0x305be413, 0x0c3b071b, 0xb919ae23, 0x85794d2b,
-    0xc1d86833, 0xfdb88b3b, 0xe1d87804, 0xddb89b0c, 0x9919be14,
-    0xa5795d1c, 0x105bf424, 0x2c3b172c, 0x689a3234, 0x54fad13c,
-    0xd9ae6605, 0xe5ce850d, 0xa16fa015, 0x9d0f431d, 0x282dea25,
-    0x144d092d, 0x50ec2c35, 0x6c8ccf3d, 0x91344406, 0xad54a70e,
-    0xe9f58216, 0xd595611e, 0x60b7c826, 0x5cd72b2e, 0x18760e36,
-    0x2416ed3e, 0xa9425a07, 0x9522b90f, 0xd1839c17, 0xede37f1f,
-    0x58c1d627, 0x64a1352f, 0x20001037, 0x1c60f33f, 0x18c1f649,
-    0x24a11541, 0x60003059, 0x5c60d351, 0xe9427a69, 0xd5229961,
-    0x9183bc79, 0xade35f71, 0x20b7e848, 0x1cd70b40, 0x58762e58,
-    0x6416cd50, 0xd1346468, 0xed548760, 0xa9f5a278, 0x95954170,
-    0x682dca4b, 0x544d2943, 0x10ec0c5b, 0x2c8cef53, 0x99ae466b,
-    0xa5cea563, 0xe16f807b, 0xdd0f6373, 0x505bd44a, 0x6c3b3742,
-    0x289a125a, 0x14faf152, 0xa1d8586a, 0x9db8bb62, 0xd9199e7a,
-    0xe5797d72, 0xf9198e4d, 0xc5796d45, 0x81d8485d, 0xbdb8ab55,
-    0x089a026d, 0x34fae165, 0x705bc47d, 0x4c3b2775, 0xc16f904c,
-    0xfd0f7344, 0xb9ae565c, 0x85ceb554, 0x30ec1c6c, 0x0c8cff64,
-    0x482dda7c, 0x744d3974, 0x89f5b24f, 0xb5955147, 0xf134745f,
-    0xcd549757, 0x78763e6f, 0x4416dd67, 0x00b7f87f, 0x3cd71b77,
-    0xb183ac4e, 0x8de34f46, 0xc9426a5e, 0xf5228956, 0x4000206e,
-    0x7c60c366, 0x38c1e67e, 0x04a10576, 0x3183ec92, 0x0de30f9a,
-    0x49422a82, 0x7522c98a, 0xc00060b2, 0xfc6083ba, 0xb8c1a6a2,
-    0x84a145aa, 0x09f5f293, 0x3595119b, 0x71343483, 0x4d54d78b,
-    0xf8767eb3, 0xc4169dbb, 0x80b7b8a3, 0xbcd75bab, 0x416fd090,
-    0x7d0f3398, 0x39ae1680, 0x05cef588, 0xb0ec5cb0, 0x8c8cbfb8,
-    0xc82d9aa0, 0xf44d79a8, 0x7919ce91, 0x45792d99, 0x01d80881,
-    0x3db8eb89, 0x889a42b1, 0xb4faa1b9, 0xf05b84a1, 0xcc3b67a9,
-    0xd05b9496, 0xec3b779e, 0xa89a5286, 0x94fab18e, 0x21d818b6,
-    0x1db8fbbe, 0x5919dea6, 0x65793dae, 0xe82d8a97, 0xd44d699f,
-    0x90ec4c87, 0xac8caf8f, 0x19ae06b7, 0x25cee5bf, 0x616fc0a7,
-    0x5d0f23af, 0xa0b7a894, 0x9cd74b9c, 0xd8766e84, 0xe4168d8c,
-    0x513424b4, 0x6d54c7bc, 0x29f5e2a4, 0x159501ac, 0x98c1b695,
-    0xa4a1559d, 0xe0007085, 0xdc60938d, 0x69423ab5, 0x5522d9bd,
-    0x1183fca5, 0x2de31fad, 0x29421adb, 0x1522f9d3, 0x5183dccb,
-    0x6de33fc3, 0xd8c196fb, 0xe4a175f3, 0xa00050eb, 0x9c60b3e3,
-    0x113404da, 0x2d54e7d2, 0x69f5c2ca, 0x559521c2, 0xe0b788fa,
-    0xdcd76bf2, 0x98764eea, 0xa416ade2, 0x59ae26d9, 0x65cec5d1,
-    0x216fe0c9, 0x1d0f03c1, 0xa82daaf9, 0x944d49f1, 0xd0ec6ce9,
-    0xec8c8fe1, 0x61d838d8, 0x5db8dbd0, 0x1919fec8, 0x25791dc0,
-    0x905bb4f8, 0xac3b57f0, 0xe89a72e8, 0xd4fa91e0, 0xc89a62df,
-    0xf4fa81d7, 0xb05ba4cf, 0x8c3b47c7, 0x3919eeff, 0x05790df7,
-    0x41d828ef, 0x7db8cbe7, 0xf0ec7cde, 0xcc8c9fd6, 0x882dbace,
-    0xb44d59c6, 0x016ff0fe, 0x3d0f13f6, 0x79ae36ee, 0x45ced5e6,
-    0xb8765edd, 0x8416bdd5, 0xc0b798cd, 0xfcd77bc5, 0x49f5d2fd,
-    0x759531f5, 0x313414ed, 0x0d54f7e5, 0x800040dc, 0xbc60a3d4,
-    0xf8c186cc, 0xc4a165c4, 0x7183ccfc, 0x4de32ff4, 0x09420aec,
-    0x3522e9e4},
-   {0x00000000, 0x6307d924, 0xc60fb248, 0xa5086b6c, 0x576e62d1,
-    0x3469bbf5, 0x9161d099, 0xf26609bd, 0xaedcc5a2, 0xcddb1c86,
-    0x68d377ea, 0x0bd4aece, 0xf9b2a773, 0x9ab57e57, 0x3fbd153b,
-    0x5cbacc1f, 0x86c88d05, 0xe5cf5421, 0x40c73f4d, 0x23c0e669,
-    0xd1a6efd4, 0xb2a136f0, 0x17a95d9c, 0x74ae84b8, 0x281448a7,
-    0x4b139183, 0xee1bfaef, 0x8d1c23cb, 0x7f7a2a76, 0x1c7df352,
-    0xb975983e, 0xda72411a, 0xd6e01c4b, 0xb5e7c56f, 0x10efae03,
-    0x73e87727, 0x818e7e9a, 0xe289a7be, 0x4781ccd2, 0x248615f6,
-    0x783cd9e9, 0x1b3b00cd, 0xbe336ba1, 0xdd34b285, 0x2f52bb38,
-    0x4c55621c, 0xe95d0970, 0x8a5ad054, 0x5028914e, 0x332f486a,
-    0x96272306, 0xf520fa22, 0x0746f39f, 0x64412abb, 0xc14941d7,
-    0xa24e98f3, 0xfef454ec, 0x9df38dc8, 0x38fbe6a4, 0x5bfc3f80,
-    0xa99a363d, 0xca9def19, 0x6f958475, 0x0c925d51, 0x76b13ed7,
-    0x15b6e7f3, 0xb0be8c9f, 0xd3b955bb, 0x21df5c06, 0x42d88522,
-    0xe7d0ee4e, 0x84d7376a, 0xd86dfb75, 0xbb6a2251, 0x1e62493d,
-    0x7d659019, 0x8f0399a4, 0xec044080, 0x490c2bec, 0x2a0bf2c8,
-    0xf079b3d2, 0x937e6af6, 0x3676019a, 0x5571d8be, 0xa717d103,
-    0xc4100827, 0x6118634b, 0x021fba6f, 0x5ea57670, 0x3da2af54,
-    0x98aac438, 0xfbad1d1c, 0x09cb14a1, 0x6acccd85, 0xcfc4a6e9,
-    0xacc37fcd, 0xa051229c, 0xc356fbb8, 0x665e90d4, 0x055949f0,
-    0xf73f404d, 0x94389969, 0x3130f205, 0x52372b21, 0x0e8de73e,
-    0x6d8a3e1a, 0xc8825576, 0xab858c52, 0x59e385ef, 0x3ae45ccb,
-    0x9fec37a7, 0xfcebee83, 0x2699af99, 0x459e76bd, 0xe0961dd1,
-    0x8391c4f5, 0x71f7cd48, 0x12f0146c, 0xb7f87f00, 0xd4ffa624,
-    0x88456a3b, 0xeb42b31f, 0x4e4ad873, 0x2d4d0157, 0xdf2b08ea,
-    0xbc2cd1ce, 0x1924baa2, 0x7a236386, 0xed627dae, 0x8e65a48a,
-    0x2b6dcfe6, 0x486a16c2, 0xba0c1f7f, 0xd90bc65b, 0x7c03ad37,
-    0x1f047413, 0x43beb80c, 0x20b96128, 0x85b10a44, 0xe6b6d360,
-    0x14d0dadd, 0x77d703f9, 0xd2df6895, 0xb1d8b1b1, 0x6baaf0ab,
-    0x08ad298f, 0xada542e3, 0xcea29bc7, 0x3cc4927a, 0x5fc34b5e,
-    0xfacb2032, 0x99ccf916, 0xc5763509, 0xa671ec2d, 0x03798741,
-    0x607e5e65, 0x921857d8, 0xf11f8efc, 0x5417e590, 0x37103cb4,
-    0x3b8261e5, 0x5885b8c1, 0xfd8dd3ad, 0x9e8a0a89, 0x6cec0334,
-    0x0febda10, 0xaae3b17c, 0xc9e46858, 0x955ea447, 0xf6597d63,
-    0x5351160f, 0x3056cf2b, 0xc230c696, 0xa1371fb2, 0x043f74de,
-    0x6738adfa, 0xbd4aece0, 0xde4d35c4, 0x7b455ea8, 0x1842878c,
-    0xea248e31, 0x89235715, 0x2c2b3c79, 0x4f2ce55d, 0x13962942,
-    0x7091f066, 0xd5999b0a, 0xb69e422e, 0x44f84b93, 0x27ff92b7,
-    0x82f7f9db, 0xe1f020ff, 0x9bd34379, 0xf8d49a5d, 0x5ddcf131,
-    0x3edb2815, 0xccbd21a8, 0xafbaf88c, 0x0ab293e0, 0x69b54ac4,
-    0x350f86db, 0x56085fff, 0xf3003493, 0x9007edb7, 0x6261e40a,
-    0x01663d2e, 0xa46e5642, 0xc7698f66, 0x1d1bce7c, 0x7e1c1758,
-    0xdb147c34, 0xb813a510, 0x4a75acad, 0x29727589, 0x8c7a1ee5,
-    0xef7dc7c1, 0xb3c70bde, 0xd0c0d2fa, 0x75c8b996, 0x16cf60b2,
-    0xe4a9690f, 0x87aeb02b, 0x22a6db47, 0x41a10263, 0x4d335f32,
-    0x2e348616, 0x8b3ced7a, 0xe83b345e, 0x1a5d3de3, 0x795ae4c7,
-    0xdc528fab, 0xbf55568f, 0xe3ef9a90, 0x80e843b4, 0x25e028d8,
-    0x46e7f1fc, 0xb481f841, 0xd7862165, 0x728e4a09, 0x1189932d,
-    0xcbfbd237, 0xa8fc0b13, 0x0df4607f, 0x6ef3b95b, 0x9c95b0e6,
-    0xff9269c2, 0x5a9a02ae, 0x399ddb8a, 0x65271795, 0x0620ceb1,
-    0xa328a5dd, 0xc02f7cf9, 0x32497544, 0x514eac60, 0xf446c70c,
-    0x97411e28},
-   {0x00000000, 0x01b5fd1d, 0x036bfa3a, 0x02de0727, 0x06d7f474,
-    0x07620969, 0x05bc0e4e, 0x0409f353, 0x0dafe8e8, 0x0c1a15f5,
-    0x0ec412d2, 0x0f71efcf, 0x0b781c9c, 0x0acde181, 0x0813e6a6,
-    0x09a61bbb, 0x1b5fd1d0, 0x1aea2ccd, 0x18342bea, 0x1981d6f7,
-    0x1d8825a4, 0x1c3dd8b9, 0x1ee3df9e, 0x1f562283, 0x16f03938,
-    0x1745c425, 0x159bc302, 0x142e3e1f, 0x1027cd4c, 0x11923051,
-    0x134c3776, 0x12f9ca6b, 0x36bfa3a0, 0x370a5ebd, 0x35d4599a,
-    0x3461a487, 0x306857d4, 0x31ddaac9, 0x3303adee, 0x32b650f3,
-    0x3b104b48, 0x3aa5b655, 0x387bb172, 0x39ce4c6f, 0x3dc7bf3c,
-    0x3c724221, 0x3eac4506, 0x3f19b81b, 0x2de07270, 0x2c558f6d,
-    0x2e8b884a, 0x2f3e7557, 0x2b378604, 0x2a827b19, 0x285c7c3e,
-    0x29e98123, 0x204f9a98, 0x21fa6785, 0x232460a2, 0x22919dbf,
-    0x26986eec, 0x272d93f1, 0x25f394d6, 0x244669cb, 0x6d7f4740,
-    0x6ccaba5d, 0x6e14bd7a, 0x6fa14067, 0x6ba8b334, 0x6a1d4e29,
-    0x68c3490e, 0x6976b413, 0x60d0afa8, 0x616552b5, 0x63bb5592,
-    0x620ea88f, 0x66075bdc, 0x67b2a6c1, 0x656ca1e6, 0x64d95cfb,
-    0x76209690, 0x77956b8d, 0x754b6caa, 0x74fe91b7, 0x70f762e4,
-    0x71429ff9, 0x739c98de, 0x722965c3, 0x7b8f7e78, 0x7a3a8365,
-    0x78e48442, 0x7951795f, 0x7d588a0c, 0x7ced7711, 0x7e337036,
-    0x7f868d2b, 0x5bc0e4e0, 0x5a7519fd, 0x58ab1eda, 0x591ee3c7,
-    0x5d171094, 0x5ca2ed89, 0x5e7ceaae, 0x5fc917b3, 0x566f0c08,
-    0x57daf115, 0x5504f632, 0x54b10b2f, 0x50b8f87c, 0x510d0561,
-    0x53d30246, 0x5266ff5b, 0x409f3530, 0x412ac82d, 0x43f4cf0a,
-    0x42413217, 0x4648c144, 0x47fd3c59, 0x45233b7e, 0x4496c663,
-    0x4d30ddd8, 0x4c8520c5, 0x4e5b27e2, 0x4feedaff, 0x4be729ac,
-    0x4a52d4b1, 0x488cd396, 0x49392e8b, 0xdafe8e80, 0xdb4b739d,
-    0xd99574ba, 0xd82089a7, 0xdc297af4, 0xdd9c87e9, 0xdf4280ce,
-    0xdef77dd3, 0xd7516668, 0xd6e49b75, 0xd43a9c52, 0xd58f614f,
-    0xd186921c, 0xd0336f01, 0xd2ed6826, 0xd358953b, 0xc1a15f50,
-    0xc014a24d, 0xc2caa56a, 0xc37f5877, 0xc776ab24, 0xc6c35639,
-    0xc41d511e, 0xc5a8ac03, 0xcc0eb7b8, 0xcdbb4aa5, 0xcf654d82,
-    0xced0b09f, 0xcad943cc, 0xcb6cbed1, 0xc9b2b9f6, 0xc80744eb,
-    0xec412d20, 0xedf4d03d, 0xef2ad71a, 0xee9f2a07, 0xea96d954,
-    0xeb232449, 0xe9fd236e, 0xe848de73, 0xe1eec5c8, 0xe05b38d5,
-    0xe2853ff2, 0xe330c2ef, 0xe73931bc, 0xe68ccca1, 0xe452cb86,
-    0xe5e7369b, 0xf71efcf0, 0xf6ab01ed, 0xf47506ca, 0xf5c0fbd7,
-    0xf1c90884, 0xf07cf599, 0xf2a2f2be, 0xf3170fa3, 0xfab11418,
-    0xfb04e905, 0xf9daee22, 0xf86f133f, 0xfc66e06c, 0xfdd31d71,
-    0xff0d1a56, 0xfeb8e74b, 0xb781c9c0, 0xb63434dd, 0xb4ea33fa,
-    0xb55fcee7, 0xb1563db4, 0xb0e3c0a9, 0xb23dc78e, 0xb3883a93,
-    0xba2e2128, 0xbb9bdc35, 0xb945db12, 0xb8f0260f, 0xbcf9d55c,
-    0xbd4c2841, 0xbf922f66, 0xbe27d27b, 0xacde1810, 0xad6be50d,
-    0xafb5e22a, 0xae001f37, 0xaa09ec64, 0xabbc1179, 0xa962165e,
-    0xa8d7eb43, 0xa171f0f8, 0xa0c40de5, 0xa21a0ac2, 0xa3aff7df,
-    0xa7a6048c, 0xa613f991, 0xa4cdfeb6, 0xa57803ab, 0x813e6a60,
-    0x808b977d, 0x8255905a, 0x83e06d47, 0x87e99e14, 0x865c6309,
-    0x8482642e, 0x85379933, 0x8c918288, 0x8d247f95, 0x8ffa78b2,
-    0x8e4f85af, 0x8a4676fc, 0x8bf38be1, 0x892d8cc6, 0x889871db,
-    0x9a61bbb0, 0x9bd446ad, 0x990a418a, 0x98bfbc97, 0x9cb64fc4,
-    0x9d03b2d9, 0x9fddb5fe, 0x9e6848e3, 0x97ce5358, 0x967bae45,
-    0x94a5a962, 0x9510547f, 0x9119a72c, 0x90ac5a31, 0x92725d16,
-    0x93c7a00b},
-   {0x00000000, 0x6e8c1b41, 0xdd183682, 0xb3942dc3, 0x61416b45,
-    0x0fcd7004, 0xbc595dc7, 0xd2d54686, 0xc282d68a, 0xac0ecdcb,
-    0x1f9ae008, 0x7116fb49, 0xa3c3bdcf, 0xcd4fa68e, 0x7edb8b4d,
-    0x1057900c, 0x5e74ab55, 0x30f8b014, 0x836c9dd7, 0xede08696,
-    0x3f35c010, 0x51b9db51, 0xe22df692, 0x8ca1edd3, 0x9cf67ddf,
-    0xf27a669e, 0x41ee4b5d, 0x2f62501c, 0xfdb7169a, 0x933b0ddb,
-    0x20af2018, 0x4e233b59, 0xbce956aa, 0xd2654deb, 0x61f16028,
-    0x0f7d7b69, 0xdda83def, 0xb32426ae, 0x00b00b6d, 0x6e3c102c,
-    0x7e6b8020, 0x10e79b61, 0xa373b6a2, 0xcdffade3, 0x1f2aeb65,
-    0x71a6f024, 0xc232dde7, 0xacbec6a6, 0xe29dfdff, 0x8c11e6be,
-    0x3f85cb7d, 0x5109d03c, 0x83dc96ba, 0xed508dfb, 0x5ec4a038,
-    0x3048bb79, 0x201f2b75, 0x4e933034, 0xfd071df7, 0x938b06b6,
-    0x415e4030, 0x2fd25b71, 0x9c4676b2, 0xf2ca6df3, 0xa2a3ab15,
-    0xcc2fb054, 0x7fbb9d97, 0x113786d6, 0xc3e2c050, 0xad6edb11,
-    0x1efaf6d2, 0x7076ed93, 0x60217d9f, 0x0ead66de, 0xbd394b1d,
-    0xd3b5505c, 0x016016da, 0x6fec0d9b, 0xdc782058, 0xb2f43b19,
-    0xfcd70040, 0x925b1b01, 0x21cf36c2, 0x4f432d83, 0x9d966b05,
-    0xf31a7044, 0x408e5d87, 0x2e0246c6, 0x3e55d6ca, 0x50d9cd8b,
-    0xe34de048, 0x8dc1fb09, 0x5f14bd8f, 0x3198a6ce, 0x820c8b0d,
-    0xec80904c, 0x1e4afdbf, 0x70c6e6fe, 0xc352cb3d, 0xadded07c,
-    0x7f0b96fa, 0x11878dbb, 0xa213a078, 0xcc9fbb39, 0xdcc82b35,
-    0xb2443074, 0x01d01db7, 0x6f5c06f6, 0xbd894070, 0xd3055b31,
-    0x609176f2, 0x0e1d6db3, 0x403e56ea, 0x2eb24dab, 0x9d266068,
-    0xf3aa7b29, 0x217f3daf, 0x4ff326ee, 0xfc670b2d, 0x92eb106c,
-    0x82bc8060, 0xec309b21, 0x5fa4b6e2, 0x3128ada3, 0xe3fdeb25,
-    0x8d71f064, 0x3ee5dda7, 0x5069c6e6, 0x9e36506b, 0xf0ba4b2a,
-    0x432e66e9, 0x2da27da8, 0xff773b2e, 0x91fb206f, 0x226f0dac,
-    0x4ce316ed, 0x5cb486e1, 0x32389da0, 0x81acb063, 0xef20ab22,
-    0x3df5eda4, 0x5379f6e5, 0xe0eddb26, 0x8e61c067, 0xc042fb3e,
-    0xaecee07f, 0x1d5acdbc, 0x73d6d6fd, 0xa103907b, 0xcf8f8b3a,
-    0x7c1ba6f9, 0x1297bdb8, 0x02c02db4, 0x6c4c36f5, 0xdfd81b36,
-    0xb1540077, 0x638146f1, 0x0d0d5db0, 0xbe997073, 0xd0156b32,
-    0x22df06c1, 0x4c531d80, 0xffc73043, 0x914b2b02, 0x439e6d84,
-    0x2d1276c5, 0x9e865b06, 0xf00a4047, 0xe05dd04b, 0x8ed1cb0a,
-    0x3d45e6c9, 0x53c9fd88, 0x811cbb0e, 0xef90a04f, 0x5c048d8c,
-    0x328896cd, 0x7cabad94, 0x1227b6d5, 0xa1b39b16, 0xcf3f8057,
-    0x1deac6d1, 0x7366dd90, 0xc0f2f053, 0xae7eeb12, 0xbe297b1e,
-    0xd0a5605f, 0x63314d9c, 0x0dbd56dd, 0xdf68105b, 0xb1e40b1a,
-    0x027026d9, 0x6cfc3d98, 0x3c95fb7e, 0x5219e03f, 0xe18dcdfc,
-    0x8f01d6bd, 0x5dd4903b, 0x33588b7a, 0x80cca6b9, 0xee40bdf8,
-    0xfe172df4, 0x909b36b5, 0x230f1b76, 0x4d830037, 0x9f5646b1,
-    0xf1da5df0, 0x424e7033, 0x2cc26b72, 0x62e1502b, 0x0c6d4b6a,
-    0xbff966a9, 0xd1757de8, 0x03a03b6e, 0x6d2c202f, 0xdeb80dec,
-    0xb03416ad, 0xa06386a1, 0xceef9de0, 0x7d7bb023, 0x13f7ab62,
-    0xc122ede4, 0xafaef6a5, 0x1c3adb66, 0x72b6c027, 0x807cadd4,
-    0xeef0b695, 0x5d649b56, 0x33e88017, 0xe13dc691, 0x8fb1ddd0,
-    0x3c25f013, 0x52a9eb52, 0x42fe7b5e, 0x2c72601f, 0x9fe64ddc,
-    0xf16a569d, 0x23bf101b, 0x4d330b5a, 0xfea72699, 0x902b3dd8,
-    0xde080681, 0xb0841dc0, 0x03103003, 0x6d9c2b42, 0xbf496dc4,
-    0xd1c57685, 0x62515b46, 0x0cdd4007, 0x1c8ad00b, 0x7206cb4a,
-    0xc192e689, 0xaf1efdc8, 0x7dcbbb4e, 0x1347a00f, 0xa0d38dcc,
-    0xce5f968d},
-   {0x00000000, 0xe71da697, 0x154a4b6f, 0xf257edf8, 0x2a9496de,
-    0xcd893049, 0x3fdeddb1, 0xd8c37b26, 0x55292dbc, 0xb2348b2b,
-    0x406366d3, 0xa77ec044, 0x7fbdbb62, 0x98a01df5, 0x6af7f00d,
-    0x8dea569a, 0xaa525b78, 0x4d4ffdef, 0xbf181017, 0x5805b680,
-    0x80c6cda6, 0x67db6b31, 0x958c86c9, 0x7291205e, 0xff7b76c4,
-    0x1866d053, 0xea313dab, 0x0d2c9b3c, 0xd5efe01a, 0x32f2468d,
-    0xc0a5ab75, 0x27b80de2, 0x8fd5b0b1, 0x68c81626, 0x9a9ffbde,
-    0x7d825d49, 0xa541266f, 0x425c80f8, 0xb00b6d00, 0x5716cb97,
-    0xdafc9d0d, 0x3de13b9a, 0xcfb6d662, 0x28ab70f5, 0xf0680bd3,
-    0x1775ad44, 0xe52240bc, 0x023fe62b, 0x2587ebc9, 0xc29a4d5e,
-    0x30cda0a6, 0xd7d00631, 0x0f137d17, 0xe80edb80, 0x1a593678,
-    0xfd4490ef, 0x70aec675, 0x97b360e2, 0x65e48d1a, 0x82f92b8d,
-    0x5a3a50ab, 0xbd27f63c, 0x4f701bc4, 0xa86dbd53, 0xc4da6723,
-    0x23c7c1b4, 0xd1902c4c, 0x368d8adb, 0xee4ef1fd, 0x0953576a,
-    0xfb04ba92, 0x1c191c05, 0x91f34a9f, 0x76eeec08, 0x84b901f0,
-    0x63a4a767, 0xbb67dc41, 0x5c7a7ad6, 0xae2d972e, 0x493031b9,
-    0x6e883c5b, 0x89959acc, 0x7bc27734, 0x9cdfd1a3, 0x441caa85,
-    0xa3010c12, 0x5156e1ea, 0xb64b477d, 0x3ba111e7, 0xdcbcb770,
-    0x2eeb5a88, 0xc9f6fc1f, 0x11358739, 0xf62821ae, 0x047fcc56,
-    0xe3626ac1, 0x4b0fd792, 0xac127105, 0x5e459cfd, 0xb9583a6a,
-    0x619b414c, 0x8686e7db, 0x74d10a23, 0x93ccacb4, 0x1e26fa2e,
-    0xf93b5cb9, 0x0b6cb141, 0xec7117d6, 0x34b26cf0, 0xd3afca67,
-    0x21f8279f, 0xc6e58108, 0xe15d8cea, 0x06402a7d, 0xf417c785,
-    0x130a6112, 0xcbc91a34, 0x2cd4bca3, 0xde83515b, 0x399ef7cc,
-    0xb474a156, 0x536907c1, 0xa13eea39, 0x46234cae, 0x9ee03788,
-    0x79fd911f, 0x8baa7ce7, 0x6cb7da70, 0x52c5c807, 0xb5d86e90,
-    0x478f8368, 0xa09225ff, 0x78515ed9, 0x9f4cf84e, 0x6d1b15b6,
-    0x8a06b321, 0x07ece5bb, 0xe0f1432c, 0x12a6aed4, 0xf5bb0843,
-    0x2d787365, 0xca65d5f2, 0x3832380a, 0xdf2f9e9d, 0xf897937f,
-    0x1f8a35e8, 0xedddd810, 0x0ac07e87, 0xd20305a1, 0x351ea336,
-    0xc7494ece, 0x2054e859, 0xadbebec3, 0x4aa31854, 0xb8f4f5ac,
-    0x5fe9533b, 0x872a281d, 0x60378e8a, 0x92606372, 0x757dc5e5,
-    0xdd1078b6, 0x3a0dde21, 0xc85a33d9, 0x2f47954e, 0xf784ee68,
-    0x109948ff, 0xe2cea507, 0x05d30390, 0x8839550a, 0x6f24f39d,
-    0x9d731e65, 0x7a6eb8f2, 0xa2adc3d4, 0x45b06543, 0xb7e788bb,
-    0x50fa2e2c, 0x774223ce, 0x905f8559, 0x620868a1, 0x8515ce36,
-    0x5dd6b510, 0xbacb1387, 0x489cfe7f, 0xaf8158e8, 0x226b0e72,
-    0xc576a8e5, 0x3721451d, 0xd03ce38a, 0x08ff98ac, 0xefe23e3b,
-    0x1db5d3c3, 0xfaa87554, 0x961faf24, 0x710209b3, 0x8355e44b,
-    0x644842dc, 0xbc8b39fa, 0x5b969f6d, 0xa9c17295, 0x4edcd402,
-    0xc3368298, 0x242b240f, 0xd67cc9f7, 0x31616f60, 0xe9a21446,
-    0x0ebfb2d1, 0xfce85f29, 0x1bf5f9be, 0x3c4df45c, 0xdb5052cb,
-    0x2907bf33, 0xce1a19a4, 0x16d96282, 0xf1c4c415, 0x039329ed,
-    0xe48e8f7a, 0x6964d9e0, 0x8e797f77, 0x7c2e928f, 0x9b333418,
-    0x43f04f3e, 0xa4ede9a9, 0x56ba0451, 0xb1a7a2c6, 0x19ca1f95,
-    0xfed7b902, 0x0c8054fa, 0xeb9df26d, 0x335e894b, 0xd4432fdc,
-    0x2614c224, 0xc10964b3, 0x4ce33229, 0xabfe94be, 0x59a97946,
-    0xbeb4dfd1, 0x6677a4f7, 0x816a0260, 0x733def98, 0x9420490f,
-    0xb39844ed, 0x5485e27a, 0xa6d20f82, 0x41cfa915, 0x990cd233,
-    0x7e1174a4, 0x8c46995c, 0x6b5b3fcb, 0xe6b16951, 0x01accfc6,
-    0xf3fb223e, 0x14e684a9, 0xcc25ff8f, 0x2b385918, 0xd96fb4e0,
-    0x3e721277},
-   {0x00000000, 0xa58b900e, 0x9066265d, 0x35edb653, 0xfbbd4afb,
-    0x5e36daf5, 0x6bdb6ca6, 0xce50fca8, 0x2c0b93b7, 0x898003b9,
-    0xbc6db5ea, 0x19e625e4, 0xd7b6d94c, 0x723d4942, 0x47d0ff11,
-    0xe25b6f1f, 0x5817276e, 0xfd9cb760, 0xc8710133, 0x6dfa913d,
-    0xa3aa6d95, 0x0621fd9b, 0x33cc4bc8, 0x9647dbc6, 0x741cb4d9,
-    0xd19724d7, 0xe47a9284, 0x41f1028a, 0x8fa1fe22, 0x2a2a6e2c,
-    0x1fc7d87f, 0xba4c4871, 0xb02e4edc, 0x15a5ded2, 0x20486881,
-    0x85c3f88f, 0x4b930427, 0xee189429, 0xdbf5227a, 0x7e7eb274,
-    0x9c25dd6b, 0x39ae4d65, 0x0c43fb36, 0xa9c86b38, 0x67989790,
-    0xc213079e, 0xf7feb1cd, 0x527521c3, 0xe83969b2, 0x4db2f9bc,
-    0x785f4fef, 0xddd4dfe1, 0x13842349, 0xb60fb347, 0x83e20514,
-    0x2669951a, 0xc432fa05, 0x61b96a0b, 0x5454dc58, 0xf1df4c56,
-    0x3f8fb0fe, 0x9a0420f0, 0xafe996a3, 0x0a6206ad, 0xbb2d9bf9,
-    0x1ea60bf7, 0x2b4bbda4, 0x8ec02daa, 0x4090d102, 0xe51b410c,
-    0xd0f6f75f, 0x757d6751, 0x9726084e, 0x32ad9840, 0x07402e13,
-    0xa2cbbe1d, 0x6c9b42b5, 0xc910d2bb, 0xfcfd64e8, 0x5976f4e6,
-    0xe33abc97, 0x46b12c99, 0x735c9aca, 0xd6d70ac4, 0x1887f66c,
-    0xbd0c6662, 0x88e1d031, 0x2d6a403f, 0xcf312f20, 0x6ababf2e,
-    0x5f57097d, 0xfadc9973, 0x348c65db, 0x9107f5d5, 0xa4ea4386,
-    0x0161d388, 0x0b03d525, 0xae88452b, 0x9b65f378, 0x3eee6376,
-    0xf0be9fde, 0x55350fd0, 0x60d8b983, 0xc553298d, 0x27084692,
-    0x8283d69c, 0xb76e60cf, 0x12e5f0c1, 0xdcb50c69, 0x793e9c67,
-    0x4cd32a34, 0xe958ba3a, 0x5314f24b, 0xf69f6245, 0xc372d416,
-    0x66f94418, 0xa8a9b8b0, 0x0d2228be, 0x38cf9eed, 0x9d440ee3,
-    0x7f1f61fc, 0xda94f1f2, 0xef7947a1, 0x4af2d7af, 0x84a22b07,
-    0x2129bb09, 0x14c40d5a, 0xb14f9d54, 0xad2a31b3, 0x08a1a1bd,
-    0x3d4c17ee, 0x98c787e0, 0x56977b48, 0xf31ceb46, 0xc6f15d15,
-    0x637acd1b, 0x8121a204, 0x24aa320a, 0x11478459, 0xb4cc1457,
-    0x7a9ce8ff, 0xdf1778f1, 0xeafacea2, 0x4f715eac, 0xf53d16dd,
-    0x50b686d3, 0x655b3080, 0xc0d0a08e, 0x0e805c26, 0xab0bcc28,
-    0x9ee67a7b, 0x3b6dea75, 0xd936856a, 0x7cbd1564, 0x4950a337,
-    0xecdb3339, 0x228bcf91, 0x87005f9f, 0xb2ede9cc, 0x176679c2,
-    0x1d047f6f, 0xb88fef61, 0x8d625932, 0x28e9c93c, 0xe6b93594,
-    0x4332a59a, 0x76df13c9, 0xd35483c7, 0x310fecd8, 0x94847cd6,
-    0xa169ca85, 0x04e25a8b, 0xcab2a623, 0x6f39362d, 0x5ad4807e,
-    0xff5f1070, 0x45135801, 0xe098c80f, 0xd5757e5c, 0x70feee52,
-    0xbeae12fa, 0x1b2582f4, 0x2ec834a7, 0x8b43a4a9, 0x6918cbb6,
-    0xcc935bb8, 0xf97eedeb, 0x5cf57de5, 0x92a5814d, 0x372e1143,
-    0x02c3a710, 0xa748371e, 0x1607aa4a, 0xb38c3a44, 0x86618c17,
-    0x23ea1c19, 0xedbae0b1, 0x483170bf, 0x7ddcc6ec, 0xd85756e2,
-    0x3a0c39fd, 0x9f87a9f3, 0xaa6a1fa0, 0x0fe18fae, 0xc1b17306,
-    0x643ae308, 0x51d7555b, 0xf45cc555, 0x4e108d24, 0xeb9b1d2a,
-    0xde76ab79, 0x7bfd3b77, 0xb5adc7df, 0x102657d1, 0x25cbe182,
-    0x8040718c, 0x621b1e93, 0xc7908e9d, 0xf27d38ce, 0x57f6a8c0,
-    0x99a65468, 0x3c2dc466, 0x09c07235, 0xac4be23b, 0xa629e496,
-    0x03a27498, 0x364fc2cb, 0x93c452c5, 0x5d94ae6d, 0xf81f3e63,
-    0xcdf28830, 0x6879183e, 0x8a227721, 0x2fa9e72f, 0x1a44517c,
-    0xbfcfc172, 0x719f3dda, 0xd414add4, 0xe1f91b87, 0x44728b89,
-    0xfe3ec3f8, 0x5bb553f6, 0x6e58e5a5, 0xcbd375ab, 0x05838903,
-    0xa008190d, 0x95e5af5e, 0x306e3f50, 0xd235504f, 0x77bec041,
-    0x42537612, 0xe7d8e61c, 0x29881ab4, 0x8c038aba, 0xb9ee3ce9,
-    0x1c65ace7}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0x0e908ba500000000, 0x5d26669000000000,
-    0x53b6ed3500000000, 0xfb4abdfb00000000, 0xf5da365e00000000,
-    0xa66cdb6b00000000, 0xa8fc50ce00000000, 0xb7930b2c00000000,
-    0xb903808900000000, 0xeab56dbc00000000, 0xe425e61900000000,
-    0x4cd9b6d700000000, 0x42493d7200000000, 0x11ffd04700000000,
-    0x1f6f5be200000000, 0x6e27175800000000, 0x60b79cfd00000000,
-    0x330171c800000000, 0x3d91fa6d00000000, 0x956daaa300000000,
-    0x9bfd210600000000, 0xc84bcc3300000000, 0xc6db479600000000,
-    0xd9b41c7400000000, 0xd72497d100000000, 0x84927ae400000000,
-    0x8a02f14100000000, 0x22fea18f00000000, 0x2c6e2a2a00000000,
-    0x7fd8c71f00000000, 0x71484cba00000000, 0xdc4e2eb000000000,
-    0xd2dea51500000000, 0x8168482000000000, 0x8ff8c38500000000,
-    0x2704934b00000000, 0x299418ee00000000, 0x7a22f5db00000000,
-    0x74b27e7e00000000, 0x6bdd259c00000000, 0x654dae3900000000,
-    0x36fb430c00000000, 0x386bc8a900000000, 0x9097986700000000,
-    0x9e0713c200000000, 0xcdb1fef700000000, 0xc321755200000000,
-    0xb26939e800000000, 0xbcf9b24d00000000, 0xef4f5f7800000000,
-    0xe1dfd4dd00000000, 0x4923841300000000, 0x47b30fb600000000,
-    0x1405e28300000000, 0x1a95692600000000, 0x05fa32c400000000,
-    0x0b6ab96100000000, 0x58dc545400000000, 0x564cdff100000000,
-    0xfeb08f3f00000000, 0xf020049a00000000, 0xa396e9af00000000,
-    0xad06620a00000000, 0xf99b2dbb00000000, 0xf70ba61e00000000,
-    0xa4bd4b2b00000000, 0xaa2dc08e00000000, 0x02d1904000000000,
-    0x0c411be500000000, 0x5ff7f6d000000000, 0x51677d7500000000,
-    0x4e08269700000000, 0x4098ad3200000000, 0x132e400700000000,
-    0x1dbecba200000000, 0xb5429b6c00000000, 0xbbd210c900000000,
-    0xe864fdfc00000000, 0xe6f4765900000000, 0x97bc3ae300000000,
-    0x992cb14600000000, 0xca9a5c7300000000, 0xc40ad7d600000000,
-    0x6cf6871800000000, 0x62660cbd00000000, 0x31d0e18800000000,
-    0x3f406a2d00000000, 0x202f31cf00000000, 0x2ebfba6a00000000,
-    0x7d09575f00000000, 0x7399dcfa00000000, 0xdb658c3400000000,
-    0xd5f5079100000000, 0x8643eaa400000000, 0x88d3610100000000,
-    0x25d5030b00000000, 0x2b4588ae00000000, 0x78f3659b00000000,
-    0x7663ee3e00000000, 0xde9fbef000000000, 0xd00f355500000000,
-    0x83b9d86000000000, 0x8d2953c500000000, 0x9246082700000000,
-    0x9cd6838200000000, 0xcf606eb700000000, 0xc1f0e51200000000,
-    0x690cb5dc00000000, 0x679c3e7900000000, 0x342ad34c00000000,
-    0x3aba58e900000000, 0x4bf2145300000000, 0x45629ff600000000,
-    0x16d472c300000000, 0x1844f96600000000, 0xb0b8a9a800000000,
-    0xbe28220d00000000, 0xed9ecf3800000000, 0xe30e449d00000000,
-    0xfc611f7f00000000, 0xf2f194da00000000, 0xa14779ef00000000,
-    0xafd7f24a00000000, 0x072ba28400000000, 0x09bb292100000000,
-    0x5a0dc41400000000, 0x549d4fb100000000, 0xb3312aad00000000,
-    0xbda1a10800000000, 0xee174c3d00000000, 0xe087c79800000000,
-    0x487b975600000000, 0x46eb1cf300000000, 0x155df1c600000000,
-    0x1bcd7a6300000000, 0x04a2218100000000, 0x0a32aa2400000000,
-    0x5984471100000000, 0x5714ccb400000000, 0xffe89c7a00000000,
-    0xf17817df00000000, 0xa2cefaea00000000, 0xac5e714f00000000,
-    0xdd163df500000000, 0xd386b65000000000, 0x80305b6500000000,
-    0x8ea0d0c000000000, 0x265c800e00000000, 0x28cc0bab00000000,
-    0x7b7ae69e00000000, 0x75ea6d3b00000000, 0x6a8536d900000000,
-    0x6415bd7c00000000, 0x37a3504900000000, 0x3933dbec00000000,
-    0x91cf8b2200000000, 0x9f5f008700000000, 0xcce9edb200000000,
-    0xc279661700000000, 0x6f7f041d00000000, 0x61ef8fb800000000,
-    0x3259628d00000000, 0x3cc9e92800000000, 0x9435b9e600000000,
-    0x9aa5324300000000, 0xc913df7600000000, 0xc78354d300000000,
-    0xd8ec0f3100000000, 0xd67c849400000000, 0x85ca69a100000000,
-    0x8b5ae20400000000, 0x23a6b2ca00000000, 0x2d36396f00000000,
-    0x7e80d45a00000000, 0x70105fff00000000, 0x0158134500000000,
-    0x0fc898e000000000, 0x5c7e75d500000000, 0x52eefe7000000000,
-    0xfa12aebe00000000, 0xf482251b00000000, 0xa734c82e00000000,
-    0xa9a4438b00000000, 0xb6cb186900000000, 0xb85b93cc00000000,
-    0xebed7ef900000000, 0xe57df55c00000000, 0x4d81a59200000000,
-    0x43112e3700000000, 0x10a7c30200000000, 0x1e3748a700000000,
-    0x4aaa071600000000, 0x443a8cb300000000, 0x178c618600000000,
-    0x191cea2300000000, 0xb1e0baed00000000, 0xbf70314800000000,
-    0xecc6dc7d00000000, 0xe25657d800000000, 0xfd390c3a00000000,
-    0xf3a9879f00000000, 0xa01f6aaa00000000, 0xae8fe10f00000000,
-    0x0673b1c100000000, 0x08e33a6400000000, 0x5b55d75100000000,
-    0x55c55cf400000000, 0x248d104e00000000, 0x2a1d9beb00000000,
-    0x79ab76de00000000, 0x773bfd7b00000000, 0xdfc7adb500000000,
-    0xd157261000000000, 0x82e1cb2500000000, 0x8c71408000000000,
-    0x931e1b6200000000, 0x9d8e90c700000000, 0xce387df200000000,
-    0xc0a8f65700000000, 0x6854a69900000000, 0x66c42d3c00000000,
-    0x3572c00900000000, 0x3be24bac00000000, 0x96e429a600000000,
-    0x9874a20300000000, 0xcbc24f3600000000, 0xc552c49300000000,
-    0x6dae945d00000000, 0x633e1ff800000000, 0x3088f2cd00000000,
-    0x3e18796800000000, 0x2177228a00000000, 0x2fe7a92f00000000,
-    0x7c51441a00000000, 0x72c1cfbf00000000, 0xda3d9f7100000000,
-    0xd4ad14d400000000, 0x871bf9e100000000, 0x898b724400000000,
-    0xf8c33efe00000000, 0xf653b55b00000000, 0xa5e5586e00000000,
-    0xab75d3cb00000000, 0x0389830500000000, 0x0d1908a000000000,
-    0x5eafe59500000000, 0x503f6e3000000000, 0x4f5035d200000000,
-    0x41c0be7700000000, 0x1276534200000000, 0x1ce6d8e700000000,
-    0xb41a882900000000, 0xba8a038c00000000, 0xe93ceeb900000000,
-    0xe7ac651c00000000},
-   {0x0000000000000000, 0x97a61de700000000, 0x6f4b4a1500000000,
-    0xf8ed57f200000000, 0xde96942a00000000, 0x493089cd00000000,
-    0xb1ddde3f00000000, 0x267bc3d800000000, 0xbc2d295500000000,
-    0x2b8b34b200000000, 0xd366634000000000, 0x44c07ea700000000,
-    0x62bbbd7f00000000, 0xf51da09800000000, 0x0df0f76a00000000,
-    0x9a56ea8d00000000, 0x785b52aa00000000, 0xeffd4f4d00000000,
-    0x171018bf00000000, 0x80b6055800000000, 0xa6cdc68000000000,
-    0x316bdb6700000000, 0xc9868c9500000000, 0x5e20917200000000,
-    0xc4767bff00000000, 0x53d0661800000000, 0xab3d31ea00000000,
-    0x3c9b2c0d00000000, 0x1ae0efd500000000, 0x8d46f23200000000,
-    0x75aba5c000000000, 0xe20db82700000000, 0xb1b0d58f00000000,
-    0x2616c86800000000, 0xdefb9f9a00000000, 0x495d827d00000000,
-    0x6f2641a500000000, 0xf8805c4200000000, 0x006d0bb000000000,
-    0x97cb165700000000, 0x0d9dfcda00000000, 0x9a3be13d00000000,
-    0x62d6b6cf00000000, 0xf570ab2800000000, 0xd30b68f000000000,
-    0x44ad751700000000, 0xbc4022e500000000, 0x2be63f0200000000,
-    0xc9eb872500000000, 0x5e4d9ac200000000, 0xa6a0cd3000000000,
-    0x3106d0d700000000, 0x177d130f00000000, 0x80db0ee800000000,
-    0x7836591a00000000, 0xef9044fd00000000, 0x75c6ae7000000000,
-    0xe260b39700000000, 0x1a8de46500000000, 0x8d2bf98200000000,
-    0xab503a5a00000000, 0x3cf627bd00000000, 0xc41b704f00000000,
-    0x53bd6da800000000, 0x2367dac400000000, 0xb4c1c72300000000,
-    0x4c2c90d100000000, 0xdb8a8d3600000000, 0xfdf14eee00000000,
-    0x6a57530900000000, 0x92ba04fb00000000, 0x051c191c00000000,
-    0x9f4af39100000000, 0x08ecee7600000000, 0xf001b98400000000,
-    0x67a7a46300000000, 0x41dc67bb00000000, 0xd67a7a5c00000000,
-    0x2e972dae00000000, 0xb931304900000000, 0x5b3c886e00000000,
-    0xcc9a958900000000, 0x3477c27b00000000, 0xa3d1df9c00000000,
-    0x85aa1c4400000000, 0x120c01a300000000, 0xeae1565100000000,
-    0x7d474bb600000000, 0xe711a13b00000000, 0x70b7bcdc00000000,
-    0x885aeb2e00000000, 0x1ffcf6c900000000, 0x3987351100000000,
-    0xae2128f600000000, 0x56cc7f0400000000, 0xc16a62e300000000,
-    0x92d70f4b00000000, 0x057112ac00000000, 0xfd9c455e00000000,
-    0x6a3a58b900000000, 0x4c419b6100000000, 0xdbe7868600000000,
-    0x230ad17400000000, 0xb4accc9300000000, 0x2efa261e00000000,
-    0xb95c3bf900000000, 0x41b16c0b00000000, 0xd61771ec00000000,
-    0xf06cb23400000000, 0x67caafd300000000, 0x9f27f82100000000,
-    0x0881e5c600000000, 0xea8c5de100000000, 0x7d2a400600000000,
-    0x85c717f400000000, 0x12610a1300000000, 0x341ac9cb00000000,
-    0xa3bcd42c00000000, 0x5b5183de00000000, 0xccf79e3900000000,
-    0x56a174b400000000, 0xc107695300000000, 0x39ea3ea100000000,
-    0xae4c234600000000, 0x8837e09e00000000, 0x1f91fd7900000000,
-    0xe77caa8b00000000, 0x70dab76c00000000, 0x07c8c55200000000,
-    0x906ed8b500000000, 0x68838f4700000000, 0xff2592a000000000,
-    0xd95e517800000000, 0x4ef84c9f00000000, 0xb6151b6d00000000,
-    0x21b3068a00000000, 0xbbe5ec0700000000, 0x2c43f1e000000000,
-    0xd4aea61200000000, 0x4308bbf500000000, 0x6573782d00000000,
-    0xf2d565ca00000000, 0x0a38323800000000, 0x9d9e2fdf00000000,
-    0x7f9397f800000000, 0xe8358a1f00000000, 0x10d8dded00000000,
-    0x877ec00a00000000, 0xa10503d200000000, 0x36a31e3500000000,
-    0xce4e49c700000000, 0x59e8542000000000, 0xc3bebead00000000,
-    0x5418a34a00000000, 0xacf5f4b800000000, 0x3b53e95f00000000,
-    0x1d282a8700000000, 0x8a8e376000000000, 0x7263609200000000,
-    0xe5c57d7500000000, 0xb67810dd00000000, 0x21de0d3a00000000,
-    0xd9335ac800000000, 0x4e95472f00000000, 0x68ee84f700000000,
-    0xff48991000000000, 0x07a5cee200000000, 0x9003d30500000000,
-    0x0a55398800000000, 0x9df3246f00000000, 0x651e739d00000000,
-    0xf2b86e7a00000000, 0xd4c3ada200000000, 0x4365b04500000000,
-    0xbb88e7b700000000, 0x2c2efa5000000000, 0xce23427700000000,
-    0x59855f9000000000, 0xa168086200000000, 0x36ce158500000000,
-    0x10b5d65d00000000, 0x8713cbba00000000, 0x7ffe9c4800000000,
-    0xe85881af00000000, 0x720e6b2200000000, 0xe5a876c500000000,
-    0x1d45213700000000, 0x8ae33cd000000000, 0xac98ff0800000000,
-    0x3b3ee2ef00000000, 0xc3d3b51d00000000, 0x5475a8fa00000000,
-    0x24af1f9600000000, 0xb309027100000000, 0x4be4558300000000,
-    0xdc42486400000000, 0xfa398bbc00000000, 0x6d9f965b00000000,
-    0x9572c1a900000000, 0x02d4dc4e00000000, 0x988236c300000000,
-    0x0f242b2400000000, 0xf7c97cd600000000, 0x606f613100000000,
-    0x4614a2e900000000, 0xd1b2bf0e00000000, 0x295fe8fc00000000,
-    0xbef9f51b00000000, 0x5cf44d3c00000000, 0xcb5250db00000000,
-    0x33bf072900000000, 0xa4191ace00000000, 0x8262d91600000000,
-    0x15c4c4f100000000, 0xed29930300000000, 0x7a8f8ee400000000,
-    0xe0d9646900000000, 0x777f798e00000000, 0x8f922e7c00000000,
-    0x1834339b00000000, 0x3e4ff04300000000, 0xa9e9eda400000000,
-    0x5104ba5600000000, 0xc6a2a7b100000000, 0x951fca1900000000,
-    0x02b9d7fe00000000, 0xfa54800c00000000, 0x6df29deb00000000,
-    0x4b895e3300000000, 0xdc2f43d400000000, 0x24c2142600000000,
-    0xb36409c100000000, 0x2932e34c00000000, 0xbe94feab00000000,
-    0x4679a95900000000, 0xd1dfb4be00000000, 0xf7a4776600000000,
-    0x60026a8100000000, 0x98ef3d7300000000, 0x0f49209400000000,
-    0xed4498b300000000, 0x7ae2855400000000, 0x820fd2a600000000,
-    0x15a9cf4100000000, 0x33d20c9900000000, 0xa474117e00000000,
-    0x5c99468c00000000, 0xcb3f5b6b00000000, 0x5169b1e600000000,
-    0xc6cfac0100000000, 0x3e22fbf300000000, 0xa984e61400000000,
-    0x8fff25cc00000000, 0x1859382b00000000, 0xe0b46fd900000000,
-    0x7712723e00000000},
-   {0x0000000000000000, 0x411b8c6e00000000, 0x823618dd00000000,
-    0xc32d94b300000000, 0x456b416100000000, 0x0470cd0f00000000,
-    0xc75d59bc00000000, 0x8646d5d200000000, 0x8ad682c200000000,
-    0xcbcd0eac00000000, 0x08e09a1f00000000, 0x49fb167100000000,
-    0xcfbdc3a300000000, 0x8ea64fcd00000000, 0x4d8bdb7e00000000,
-    0x0c90571000000000, 0x55ab745e00000000, 0x14b0f83000000000,
-    0xd79d6c8300000000, 0x9686e0ed00000000, 0x10c0353f00000000,
-    0x51dbb95100000000, 0x92f62de200000000, 0xd3eda18c00000000,
-    0xdf7df69c00000000, 0x9e667af200000000, 0x5d4bee4100000000,
-    0x1c50622f00000000, 0x9a16b7fd00000000, 0xdb0d3b9300000000,
-    0x1820af2000000000, 0x593b234e00000000, 0xaa56e9bc00000000,
-    0xeb4d65d200000000, 0x2860f16100000000, 0x697b7d0f00000000,
-    0xef3da8dd00000000, 0xae2624b300000000, 0x6d0bb00000000000,
-    0x2c103c6e00000000, 0x20806b7e00000000, 0x619be71000000000,
-    0xa2b673a300000000, 0xe3adffcd00000000, 0x65eb2a1f00000000,
-    0x24f0a67100000000, 0xe7dd32c200000000, 0xa6c6beac00000000,
-    0xfffd9de200000000, 0xbee6118c00000000, 0x7dcb853f00000000,
-    0x3cd0095100000000, 0xba96dc8300000000, 0xfb8d50ed00000000,
-    0x38a0c45e00000000, 0x79bb483000000000, 0x752b1f2000000000,
-    0x3430934e00000000, 0xf71d07fd00000000, 0xb6068b9300000000,
-    0x30405e4100000000, 0x715bd22f00000000, 0xb276469c00000000,
-    0xf36dcaf200000000, 0x15aba3a200000000, 0x54b02fcc00000000,
-    0x979dbb7f00000000, 0xd686371100000000, 0x50c0e2c300000000,
-    0x11db6ead00000000, 0xd2f6fa1e00000000, 0x93ed767000000000,
-    0x9f7d216000000000, 0xde66ad0e00000000, 0x1d4b39bd00000000,
-    0x5c50b5d300000000, 0xda16600100000000, 0x9b0dec6f00000000,
-    0x582078dc00000000, 0x193bf4b200000000, 0x4000d7fc00000000,
-    0x011b5b9200000000, 0xc236cf2100000000, 0x832d434f00000000,
-    0x056b969d00000000, 0x44701af300000000, 0x875d8e4000000000,
-    0xc646022e00000000, 0xcad6553e00000000, 0x8bcdd95000000000,
-    0x48e04de300000000, 0x09fbc18d00000000, 0x8fbd145f00000000,
-    0xcea6983100000000, 0x0d8b0c8200000000, 0x4c9080ec00000000,
-    0xbffd4a1e00000000, 0xfee6c67000000000, 0x3dcb52c300000000,
-    0x7cd0dead00000000, 0xfa960b7f00000000, 0xbb8d871100000000,
-    0x78a013a200000000, 0x39bb9fcc00000000, 0x352bc8dc00000000,
-    0x743044b200000000, 0xb71dd00100000000, 0xf6065c6f00000000,
-    0x704089bd00000000, 0x315b05d300000000, 0xf276916000000000,
-    0xb36d1d0e00000000, 0xea563e4000000000, 0xab4db22e00000000,
-    0x6860269d00000000, 0x297baaf300000000, 0xaf3d7f2100000000,
-    0xee26f34f00000000, 0x2d0b67fc00000000, 0x6c10eb9200000000,
-    0x6080bc8200000000, 0x219b30ec00000000, 0xe2b6a45f00000000,
-    0xa3ad283100000000, 0x25ebfde300000000, 0x64f0718d00000000,
-    0xa7dde53e00000000, 0xe6c6695000000000, 0x6b50369e00000000,
-    0x2a4bbaf000000000, 0xe9662e4300000000, 0xa87da22d00000000,
-    0x2e3b77ff00000000, 0x6f20fb9100000000, 0xac0d6f2200000000,
-    0xed16e34c00000000, 0xe186b45c00000000, 0xa09d383200000000,
-    0x63b0ac8100000000, 0x22ab20ef00000000, 0xa4edf53d00000000,
-    0xe5f6795300000000, 0x26dbede000000000, 0x67c0618e00000000,
-    0x3efb42c000000000, 0x7fe0ceae00000000, 0xbccd5a1d00000000,
-    0xfdd6d67300000000, 0x7b9003a100000000, 0x3a8b8fcf00000000,
-    0xf9a61b7c00000000, 0xb8bd971200000000, 0xb42dc00200000000,
-    0xf5364c6c00000000, 0x361bd8df00000000, 0x770054b100000000,
-    0xf146816300000000, 0xb05d0d0d00000000, 0x737099be00000000,
-    0x326b15d000000000, 0xc106df2200000000, 0x801d534c00000000,
-    0x4330c7ff00000000, 0x022b4b9100000000, 0x846d9e4300000000,
-    0xc576122d00000000, 0x065b869e00000000, 0x47400af000000000,
-    0x4bd05de000000000, 0x0acbd18e00000000, 0xc9e6453d00000000,
-    0x88fdc95300000000, 0x0ebb1c8100000000, 0x4fa090ef00000000,
-    0x8c8d045c00000000, 0xcd96883200000000, 0x94adab7c00000000,
-    0xd5b6271200000000, 0x169bb3a100000000, 0x57803fcf00000000,
-    0xd1c6ea1d00000000, 0x90dd667300000000, 0x53f0f2c000000000,
-    0x12eb7eae00000000, 0x1e7b29be00000000, 0x5f60a5d000000000,
-    0x9c4d316300000000, 0xdd56bd0d00000000, 0x5b1068df00000000,
-    0x1a0be4b100000000, 0xd926700200000000, 0x983dfc6c00000000,
-    0x7efb953c00000000, 0x3fe0195200000000, 0xfccd8de100000000,
-    0xbdd6018f00000000, 0x3b90d45d00000000, 0x7a8b583300000000,
-    0xb9a6cc8000000000, 0xf8bd40ee00000000, 0xf42d17fe00000000,
-    0xb5369b9000000000, 0x761b0f2300000000, 0x3700834d00000000,
-    0xb146569f00000000, 0xf05ddaf100000000, 0x33704e4200000000,
-    0x726bc22c00000000, 0x2b50e16200000000, 0x6a4b6d0c00000000,
-    0xa966f9bf00000000, 0xe87d75d100000000, 0x6e3ba00300000000,
-    0x2f202c6d00000000, 0xec0db8de00000000, 0xad1634b000000000,
-    0xa18663a000000000, 0xe09defce00000000, 0x23b07b7d00000000,
-    0x62abf71300000000, 0xe4ed22c100000000, 0xa5f6aeaf00000000,
-    0x66db3a1c00000000, 0x27c0b67200000000, 0xd4ad7c8000000000,
-    0x95b6f0ee00000000, 0x569b645d00000000, 0x1780e83300000000,
-    0x91c63de100000000, 0xd0ddb18f00000000, 0x13f0253c00000000,
-    0x52eba95200000000, 0x5e7bfe4200000000, 0x1f60722c00000000,
-    0xdc4de69f00000000, 0x9d566af100000000, 0x1b10bf2300000000,
-    0x5a0b334d00000000, 0x9926a7fe00000000, 0xd83d2b9000000000,
-    0x810608de00000000, 0xc01d84b000000000, 0x0330100300000000,
-    0x422b9c6d00000000, 0xc46d49bf00000000, 0x8576c5d100000000,
-    0x465b516200000000, 0x0740dd0c00000000, 0x0bd08a1c00000000,
-    0x4acb067200000000, 0x89e692c100000000, 0xc8fd1eaf00000000,
-    0x4ebbcb7d00000000, 0x0fa0471300000000, 0xcc8dd3a000000000,
-    0x8d965fce00000000},
-   {0x0000000000000000, 0x1dfdb50100000000, 0x3afa6b0300000000,
-    0x2707de0200000000, 0x74f4d70600000000, 0x6909620700000000,
-    0x4e0ebc0500000000, 0x53f3090400000000, 0xe8e8af0d00000000,
-    0xf5151a0c00000000, 0xd212c40e00000000, 0xcfef710f00000000,
-    0x9c1c780b00000000, 0x81e1cd0a00000000, 0xa6e6130800000000,
-    0xbb1ba60900000000, 0xd0d15f1b00000000, 0xcd2cea1a00000000,
-    0xea2b341800000000, 0xf7d6811900000000, 0xa425881d00000000,
-    0xb9d83d1c00000000, 0x9edfe31e00000000, 0x8322561f00000000,
-    0x3839f01600000000, 0x25c4451700000000, 0x02c39b1500000000,
-    0x1f3e2e1400000000, 0x4ccd271000000000, 0x5130921100000000,
-    0x76374c1300000000, 0x6bcaf91200000000, 0xa0a3bf3600000000,
-    0xbd5e0a3700000000, 0x9a59d43500000000, 0x87a4613400000000,
-    0xd457683000000000, 0xc9aadd3100000000, 0xeead033300000000,
-    0xf350b63200000000, 0x484b103b00000000, 0x55b6a53a00000000,
-    0x72b17b3800000000, 0x6f4cce3900000000, 0x3cbfc73d00000000,
-    0x2142723c00000000, 0x0645ac3e00000000, 0x1bb8193f00000000,
-    0x7072e02d00000000, 0x6d8f552c00000000, 0x4a888b2e00000000,
-    0x57753e2f00000000, 0x0486372b00000000, 0x197b822a00000000,
-    0x3e7c5c2800000000, 0x2381e92900000000, 0x989a4f2000000000,
-    0x8567fa2100000000, 0xa260242300000000, 0xbf9d912200000000,
-    0xec6e982600000000, 0xf1932d2700000000, 0xd694f32500000000,
-    0xcb69462400000000, 0x40477f6d00000000, 0x5dbaca6c00000000,
-    0x7abd146e00000000, 0x6740a16f00000000, 0x34b3a86b00000000,
-    0x294e1d6a00000000, 0x0e49c36800000000, 0x13b4766900000000,
-    0xa8afd06000000000, 0xb552656100000000, 0x9255bb6300000000,
-    0x8fa80e6200000000, 0xdc5b076600000000, 0xc1a6b26700000000,
-    0xe6a16c6500000000, 0xfb5cd96400000000, 0x9096207600000000,
-    0x8d6b957700000000, 0xaa6c4b7500000000, 0xb791fe7400000000,
-    0xe462f77000000000, 0xf99f427100000000, 0xde989c7300000000,
-    0xc365297200000000, 0x787e8f7b00000000, 0x65833a7a00000000,
-    0x4284e47800000000, 0x5f79517900000000, 0x0c8a587d00000000,
-    0x1177ed7c00000000, 0x3670337e00000000, 0x2b8d867f00000000,
-    0xe0e4c05b00000000, 0xfd19755a00000000, 0xda1eab5800000000,
-    0xc7e31e5900000000, 0x9410175d00000000, 0x89eda25c00000000,
-    0xaeea7c5e00000000, 0xb317c95f00000000, 0x080c6f5600000000,
-    0x15f1da5700000000, 0x32f6045500000000, 0x2f0bb15400000000,
-    0x7cf8b85000000000, 0x61050d5100000000, 0x4602d35300000000,
-    0x5bff665200000000, 0x30359f4000000000, 0x2dc82a4100000000,
-    0x0acff44300000000, 0x1732414200000000, 0x44c1484600000000,
-    0x593cfd4700000000, 0x7e3b234500000000, 0x63c6964400000000,
-    0xd8dd304d00000000, 0xc520854c00000000, 0xe2275b4e00000000,
-    0xffdaee4f00000000, 0xac29e74b00000000, 0xb1d4524a00000000,
-    0x96d38c4800000000, 0x8b2e394900000000, 0x808efeda00000000,
-    0x9d734bdb00000000, 0xba7495d900000000, 0xa78920d800000000,
-    0xf47a29dc00000000, 0xe9879cdd00000000, 0xce8042df00000000,
-    0xd37df7de00000000, 0x686651d700000000, 0x759be4d600000000,
-    0x529c3ad400000000, 0x4f618fd500000000, 0x1c9286d100000000,
-    0x016f33d000000000, 0x2668edd200000000, 0x3b9558d300000000,
-    0x505fa1c100000000, 0x4da214c000000000, 0x6aa5cac200000000,
-    0x77587fc300000000, 0x24ab76c700000000, 0x3956c3c600000000,
-    0x1e511dc400000000, 0x03aca8c500000000, 0xb8b70ecc00000000,
-    0xa54abbcd00000000, 0x824d65cf00000000, 0x9fb0d0ce00000000,
-    0xcc43d9ca00000000, 0xd1be6ccb00000000, 0xf6b9b2c900000000,
-    0xeb4407c800000000, 0x202d41ec00000000, 0x3dd0f4ed00000000,
-    0x1ad72aef00000000, 0x072a9fee00000000, 0x54d996ea00000000,
-    0x492423eb00000000, 0x6e23fde900000000, 0x73de48e800000000,
-    0xc8c5eee100000000, 0xd5385be000000000, 0xf23f85e200000000,
-    0xefc230e300000000, 0xbc3139e700000000, 0xa1cc8ce600000000,
-    0x86cb52e400000000, 0x9b36e7e500000000, 0xf0fc1ef700000000,
-    0xed01abf600000000, 0xca0675f400000000, 0xd7fbc0f500000000,
-    0x8408c9f100000000, 0x99f57cf000000000, 0xbef2a2f200000000,
-    0xa30f17f300000000, 0x1814b1fa00000000, 0x05e904fb00000000,
-    0x22eedaf900000000, 0x3f136ff800000000, 0x6ce066fc00000000,
-    0x711dd3fd00000000, 0x561a0dff00000000, 0x4be7b8fe00000000,
-    0xc0c981b700000000, 0xdd3434b600000000, 0xfa33eab400000000,
-    0xe7ce5fb500000000, 0xb43d56b100000000, 0xa9c0e3b000000000,
-    0x8ec73db200000000, 0x933a88b300000000, 0x28212eba00000000,
-    0x35dc9bbb00000000, 0x12db45b900000000, 0x0f26f0b800000000,
-    0x5cd5f9bc00000000, 0x41284cbd00000000, 0x662f92bf00000000,
-    0x7bd227be00000000, 0x1018deac00000000, 0x0de56bad00000000,
-    0x2ae2b5af00000000, 0x371f00ae00000000, 0x64ec09aa00000000,
-    0x7911bcab00000000, 0x5e1662a900000000, 0x43ebd7a800000000,
-    0xf8f071a100000000, 0xe50dc4a000000000, 0xc20a1aa200000000,
-    0xdff7afa300000000, 0x8c04a6a700000000, 0x91f913a600000000,
-    0xb6fecda400000000, 0xab0378a500000000, 0x606a3e8100000000,
-    0x7d978b8000000000, 0x5a90558200000000, 0x476de08300000000,
-    0x149ee98700000000, 0x09635c8600000000, 0x2e64828400000000,
-    0x3399378500000000, 0x8882918c00000000, 0x957f248d00000000,
-    0xb278fa8f00000000, 0xaf854f8e00000000, 0xfc76468a00000000,
-    0xe18bf38b00000000, 0xc68c2d8900000000, 0xdb71988800000000,
-    0xb0bb619a00000000, 0xad46d49b00000000, 0x8a410a9900000000,
-    0x97bcbf9800000000, 0xc44fb69c00000000, 0xd9b2039d00000000,
-    0xfeb5dd9f00000000, 0xe348689e00000000, 0x5853ce9700000000,
-    0x45ae7b9600000000, 0x62a9a59400000000, 0x7f54109500000000,
-    0x2ca7199100000000, 0x315aac9000000000, 0x165d729200000000,
-    0x0ba0c79300000000},
-   {0x0000000000000000, 0x24d9076300000000, 0x48b20fc600000000,
-    0x6c6b08a500000000, 0xd1626e5700000000, 0xf5bb693400000000,
-    0x99d0619100000000, 0xbd0966f200000000, 0xa2c5dcae00000000,
-    0x861cdbcd00000000, 0xea77d36800000000, 0xceaed40b00000000,
-    0x73a7b2f900000000, 0x577eb59a00000000, 0x3b15bd3f00000000,
-    0x1fccba5c00000000, 0x058dc88600000000, 0x2154cfe500000000,
-    0x4d3fc74000000000, 0x69e6c02300000000, 0xd4efa6d100000000,
-    0xf036a1b200000000, 0x9c5da91700000000, 0xb884ae7400000000,
-    0xa748142800000000, 0x8391134b00000000, 0xeffa1bee00000000,
-    0xcb231c8d00000000, 0x762a7a7f00000000, 0x52f37d1c00000000,
-    0x3e9875b900000000, 0x1a4172da00000000, 0x4b1ce0d600000000,
-    0x6fc5e7b500000000, 0x03aeef1000000000, 0x2777e87300000000,
-    0x9a7e8e8100000000, 0xbea789e200000000, 0xd2cc814700000000,
-    0xf615862400000000, 0xe9d93c7800000000, 0xcd003b1b00000000,
-    0xa16b33be00000000, 0x85b234dd00000000, 0x38bb522f00000000,
-    0x1c62554c00000000, 0x70095de900000000, 0x54d05a8a00000000,
-    0x4e91285000000000, 0x6a482f3300000000, 0x0623279600000000,
-    0x22fa20f500000000, 0x9ff3460700000000, 0xbb2a416400000000,
-    0xd74149c100000000, 0xf3984ea200000000, 0xec54f4fe00000000,
-    0xc88df39d00000000, 0xa4e6fb3800000000, 0x803ffc5b00000000,
-    0x3d369aa900000000, 0x19ef9dca00000000, 0x7584956f00000000,
-    0x515d920c00000000, 0xd73eb17600000000, 0xf3e7b61500000000,
-    0x9f8cbeb000000000, 0xbb55b9d300000000, 0x065cdf2100000000,
-    0x2285d84200000000, 0x4eeed0e700000000, 0x6a37d78400000000,
-    0x75fb6dd800000000, 0x51226abb00000000, 0x3d49621e00000000,
-    0x1990657d00000000, 0xa499038f00000000, 0x804004ec00000000,
-    0xec2b0c4900000000, 0xc8f20b2a00000000, 0xd2b379f000000000,
-    0xf66a7e9300000000, 0x9a01763600000000, 0xbed8715500000000,
-    0x03d117a700000000, 0x270810c400000000, 0x4b63186100000000,
-    0x6fba1f0200000000, 0x7076a55e00000000, 0x54afa23d00000000,
-    0x38c4aa9800000000, 0x1c1dadfb00000000, 0xa114cb0900000000,
-    0x85cdcc6a00000000, 0xe9a6c4cf00000000, 0xcd7fc3ac00000000,
-    0x9c2251a000000000, 0xb8fb56c300000000, 0xd4905e6600000000,
-    0xf049590500000000, 0x4d403ff700000000, 0x6999389400000000,
-    0x05f2303100000000, 0x212b375200000000, 0x3ee78d0e00000000,
-    0x1a3e8a6d00000000, 0x765582c800000000, 0x528c85ab00000000,
-    0xef85e35900000000, 0xcb5ce43a00000000, 0xa737ec9f00000000,
-    0x83eeebfc00000000, 0x99af992600000000, 0xbd769e4500000000,
-    0xd11d96e000000000, 0xf5c4918300000000, 0x48cdf77100000000,
-    0x6c14f01200000000, 0x007ff8b700000000, 0x24a6ffd400000000,
-    0x3b6a458800000000, 0x1fb342eb00000000, 0x73d84a4e00000000,
-    0x57014d2d00000000, 0xea082bdf00000000, 0xced12cbc00000000,
-    0xa2ba241900000000, 0x8663237a00000000, 0xae7d62ed00000000,
-    0x8aa4658e00000000, 0xe6cf6d2b00000000, 0xc2166a4800000000,
-    0x7f1f0cba00000000, 0x5bc60bd900000000, 0x37ad037c00000000,
-    0x1374041f00000000, 0x0cb8be4300000000, 0x2861b92000000000,
-    0x440ab18500000000, 0x60d3b6e600000000, 0xdddad01400000000,
-    0xf903d77700000000, 0x9568dfd200000000, 0xb1b1d8b100000000,
-    0xabf0aa6b00000000, 0x8f29ad0800000000, 0xe342a5ad00000000,
-    0xc79ba2ce00000000, 0x7a92c43c00000000, 0x5e4bc35f00000000,
-    0x3220cbfa00000000, 0x16f9cc9900000000, 0x093576c500000000,
-    0x2dec71a600000000, 0x4187790300000000, 0x655e7e6000000000,
-    0xd857189200000000, 0xfc8e1ff100000000, 0x90e5175400000000,
-    0xb43c103700000000, 0xe561823b00000000, 0xc1b8855800000000,
-    0xadd38dfd00000000, 0x890a8a9e00000000, 0x3403ec6c00000000,
-    0x10daeb0f00000000, 0x7cb1e3aa00000000, 0x5868e4c900000000,
-    0x47a45e9500000000, 0x637d59f600000000, 0x0f16515300000000,
-    0x2bcf563000000000, 0x96c630c200000000, 0xb21f37a100000000,
-    0xde743f0400000000, 0xfaad386700000000, 0xe0ec4abd00000000,
-    0xc4354dde00000000, 0xa85e457b00000000, 0x8c87421800000000,
-    0x318e24ea00000000, 0x1557238900000000, 0x793c2b2c00000000,
-    0x5de52c4f00000000, 0x4229961300000000, 0x66f0917000000000,
-    0x0a9b99d500000000, 0x2e429eb600000000, 0x934bf84400000000,
-    0xb792ff2700000000, 0xdbf9f78200000000, 0xff20f0e100000000,
-    0x7943d39b00000000, 0x5d9ad4f800000000, 0x31f1dc5d00000000,
-    0x1528db3e00000000, 0xa821bdcc00000000, 0x8cf8baaf00000000,
-    0xe093b20a00000000, 0xc44ab56900000000, 0xdb860f3500000000,
-    0xff5f085600000000, 0x933400f300000000, 0xb7ed079000000000,
-    0x0ae4616200000000, 0x2e3d660100000000, 0x42566ea400000000,
-    0x668f69c700000000, 0x7cce1b1d00000000, 0x58171c7e00000000,
-    0x347c14db00000000, 0x10a513b800000000, 0xadac754a00000000,
-    0x8975722900000000, 0xe51e7a8c00000000, 0xc1c77def00000000,
-    0xde0bc7b300000000, 0xfad2c0d000000000, 0x96b9c87500000000,
-    0xb260cf1600000000, 0x0f69a9e400000000, 0x2bb0ae8700000000,
-    0x47dba62200000000, 0x6302a14100000000, 0x325f334d00000000,
-    0x1686342e00000000, 0x7aed3c8b00000000, 0x5e343be800000000,
-    0xe33d5d1a00000000, 0xc7e45a7900000000, 0xab8f52dc00000000,
-    0x8f5655bf00000000, 0x909aefe300000000, 0xb443e88000000000,
-    0xd828e02500000000, 0xfcf1e74600000000, 0x41f881b400000000,
-    0x652186d700000000, 0x094a8e7200000000, 0x2d93891100000000,
-    0x37d2fbcb00000000, 0x130bfca800000000, 0x7f60f40d00000000,
-    0x5bb9f36e00000000, 0xe6b0959c00000000, 0xc26992ff00000000,
-    0xae029a5a00000000, 0x8adb9d3900000000, 0x9517276500000000,
-    0xb1ce200600000000, 0xdda528a300000000, 0xf97c2fc000000000,
-    0x4475493200000000, 0x60ac4e5100000000, 0x0cc746f400000000,
-    0x281e419700000000},
-   {0x0000000000000000, 0x08e3603c00000000, 0x10c6c17800000000,
-    0x1825a14400000000, 0x208c83f100000000, 0x286fe3cd00000000,
-    0x304a428900000000, 0x38a922b500000000, 0x011e763800000000,
-    0x09fd160400000000, 0x11d8b74000000000, 0x193bd77c00000000,
-    0x2192f5c900000000, 0x297195f500000000, 0x315434b100000000,
-    0x39b7548d00000000, 0x023cec7000000000, 0x0adf8c4c00000000,
-    0x12fa2d0800000000, 0x1a194d3400000000, 0x22b06f8100000000,
-    0x2a530fbd00000000, 0x3276aef900000000, 0x3a95cec500000000,
-    0x03229a4800000000, 0x0bc1fa7400000000, 0x13e45b3000000000,
-    0x1b073b0c00000000, 0x23ae19b900000000, 0x2b4d798500000000,
-    0x3368d8c100000000, 0x3b8bb8fd00000000, 0x0478d8e100000000,
-    0x0c9bb8dd00000000, 0x14be199900000000, 0x1c5d79a500000000,
-    0x24f45b1000000000, 0x2c173b2c00000000, 0x34329a6800000000,
-    0x3cd1fa5400000000, 0x0566aed900000000, 0x0d85cee500000000,
-    0x15a06fa100000000, 0x1d430f9d00000000, 0x25ea2d2800000000,
-    0x2d094d1400000000, 0x352cec5000000000, 0x3dcf8c6c00000000,
-    0x0644349100000000, 0x0ea754ad00000000, 0x1682f5e900000000,
-    0x1e6195d500000000, 0x26c8b76000000000, 0x2e2bd75c00000000,
-    0x360e761800000000, 0x3eed162400000000, 0x075a42a900000000,
-    0x0fb9229500000000, 0x179c83d100000000, 0x1f7fe3ed00000000,
-    0x27d6c15800000000, 0x2f35a16400000000, 0x3710002000000000,
-    0x3ff3601c00000000, 0x49f6c11800000000, 0x4115a12400000000,
-    0x5930006000000000, 0x51d3605c00000000, 0x697a42e900000000,
-    0x619922d500000000, 0x79bc839100000000, 0x715fe3ad00000000,
-    0x48e8b72000000000, 0x400bd71c00000000, 0x582e765800000000,
-    0x50cd166400000000, 0x686434d100000000, 0x608754ed00000000,
-    0x78a2f5a900000000, 0x7041959500000000, 0x4bca2d6800000000,
-    0x43294d5400000000, 0x5b0cec1000000000, 0x53ef8c2c00000000,
-    0x6b46ae9900000000, 0x63a5cea500000000, 0x7b806fe100000000,
-    0x73630fdd00000000, 0x4ad45b5000000000, 0x42373b6c00000000,
-    0x5a129a2800000000, 0x52f1fa1400000000, 0x6a58d8a100000000,
-    0x62bbb89d00000000, 0x7a9e19d900000000, 0x727d79e500000000,
-    0x4d8e19f900000000, 0x456d79c500000000, 0x5d48d88100000000,
-    0x55abb8bd00000000, 0x6d029a0800000000, 0x65e1fa3400000000,
-    0x7dc45b7000000000, 0x75273b4c00000000, 0x4c906fc100000000,
-    0x44730ffd00000000, 0x5c56aeb900000000, 0x54b5ce8500000000,
-    0x6c1cec3000000000, 0x64ff8c0c00000000, 0x7cda2d4800000000,
-    0x74394d7400000000, 0x4fb2f58900000000, 0x475195b500000000,
-    0x5f7434f100000000, 0x579754cd00000000, 0x6f3e767800000000,
-    0x67dd164400000000, 0x7ff8b70000000000, 0x771bd73c00000000,
-    0x4eac83b100000000, 0x464fe38d00000000, 0x5e6a42c900000000,
-    0x568922f500000000, 0x6e20004000000000, 0x66c3607c00000000,
-    0x7ee6c13800000000, 0x7605a10400000000, 0x92ec833100000000,
-    0x9a0fe30d00000000, 0x822a424900000000, 0x8ac9227500000000,
-    0xb26000c000000000, 0xba8360fc00000000, 0xa2a6c1b800000000,
-    0xaa45a18400000000, 0x93f2f50900000000, 0x9b11953500000000,
-    0x8334347100000000, 0x8bd7544d00000000, 0xb37e76f800000000,
-    0xbb9d16c400000000, 0xa3b8b78000000000, 0xab5bd7bc00000000,
-    0x90d06f4100000000, 0x98330f7d00000000, 0x8016ae3900000000,
-    0x88f5ce0500000000, 0xb05cecb000000000, 0xb8bf8c8c00000000,
-    0xa09a2dc800000000, 0xa8794df400000000, 0x91ce197900000000,
-    0x992d794500000000, 0x8108d80100000000, 0x89ebb83d00000000,
-    0xb1429a8800000000, 0xb9a1fab400000000, 0xa1845bf000000000,
-    0xa9673bcc00000000, 0x96945bd000000000, 0x9e773bec00000000,
-    0x86529aa800000000, 0x8eb1fa9400000000, 0xb618d82100000000,
-    0xbefbb81d00000000, 0xa6de195900000000, 0xae3d796500000000,
-    0x978a2de800000000, 0x9f694dd400000000, 0x874cec9000000000,
-    0x8faf8cac00000000, 0xb706ae1900000000, 0xbfe5ce2500000000,
-    0xa7c06f6100000000, 0xaf230f5d00000000, 0x94a8b7a000000000,
-    0x9c4bd79c00000000, 0x846e76d800000000, 0x8c8d16e400000000,
-    0xb424345100000000, 0xbcc7546d00000000, 0xa4e2f52900000000,
-    0xac01951500000000, 0x95b6c19800000000, 0x9d55a1a400000000,
-    0x857000e000000000, 0x8d9360dc00000000, 0xb53a426900000000,
-    0xbdd9225500000000, 0xa5fc831100000000, 0xad1fe32d00000000,
-    0xdb1a422900000000, 0xd3f9221500000000, 0xcbdc835100000000,
-    0xc33fe36d00000000, 0xfb96c1d800000000, 0xf375a1e400000000,
-    0xeb5000a000000000, 0xe3b3609c00000000, 0xda04341100000000,
-    0xd2e7542d00000000, 0xcac2f56900000000, 0xc221955500000000,
-    0xfa88b7e000000000, 0xf26bd7dc00000000, 0xea4e769800000000,
-    0xe2ad16a400000000, 0xd926ae5900000000, 0xd1c5ce6500000000,
-    0xc9e06f2100000000, 0xc1030f1d00000000, 0xf9aa2da800000000,
-    0xf1494d9400000000, 0xe96cecd000000000, 0xe18f8cec00000000,
-    0xd838d86100000000, 0xd0dbb85d00000000, 0xc8fe191900000000,
-    0xc01d792500000000, 0xf8b45b9000000000, 0xf0573bac00000000,
-    0xe8729ae800000000, 0xe091fad400000000, 0xdf629ac800000000,
-    0xd781faf400000000, 0xcfa45bb000000000, 0xc7473b8c00000000,
-    0xffee193900000000, 0xf70d790500000000, 0xef28d84100000000,
-    0xe7cbb87d00000000, 0xde7cecf000000000, 0xd69f8ccc00000000,
-    0xceba2d8800000000, 0xc6594db400000000, 0xfef06f0100000000,
-    0xf6130f3d00000000, 0xee36ae7900000000, 0xe6d5ce4500000000,
-    0xdd5e76b800000000, 0xd5bd168400000000, 0xcd98b7c000000000,
-    0xc57bd7fc00000000, 0xfdd2f54900000000, 0xf531957500000000,
-    0xed14343100000000, 0xe5f7540d00000000, 0xdc40008000000000,
-    0xd4a360bc00000000, 0xcc86c1f800000000, 0xc465a1c400000000,
-    0xfccc837100000000, 0xf42fe34d00000000, 0xec0a420900000000,
-    0xe4e9223500000000},
-   {0x0000000000000000, 0xd1e8e70e00000000, 0xa2d1cf1d00000000,
-    0x7339281300000000, 0x44a39f3b00000000, 0x954b783500000000,
-    0xe672502600000000, 0x379ab72800000000, 0x88463f7700000000,
-    0x59aed87900000000, 0x2a97f06a00000000, 0xfb7f176400000000,
-    0xcce5a04c00000000, 0x1d0d474200000000, 0x6e346f5100000000,
-    0xbfdc885f00000000, 0x108d7eee00000000, 0xc16599e000000000,
-    0xb25cb1f300000000, 0x63b456fd00000000, 0x542ee1d500000000,
-    0x85c606db00000000, 0xf6ff2ec800000000, 0x2717c9c600000000,
-    0x98cb419900000000, 0x4923a69700000000, 0x3a1a8e8400000000,
-    0xebf2698a00000000, 0xdc68dea200000000, 0x0d8039ac00000000,
-    0x7eb911bf00000000, 0xaf51f6b100000000, 0x611c8c0700000000,
-    0xb0f46b0900000000, 0xc3cd431a00000000, 0x1225a41400000000,
-    0x25bf133c00000000, 0xf457f43200000000, 0x876edc2100000000,
-    0x56863b2f00000000, 0xe95ab37000000000, 0x38b2547e00000000,
-    0x4b8b7c6d00000000, 0x9a639b6300000000, 0xadf92c4b00000000,
-    0x7c11cb4500000000, 0x0f28e35600000000, 0xdec0045800000000,
-    0x7191f2e900000000, 0xa07915e700000000, 0xd3403df400000000,
-    0x02a8dafa00000000, 0x35326dd200000000, 0xe4da8adc00000000,
-    0x97e3a2cf00000000, 0x460b45c100000000, 0xf9d7cd9e00000000,
-    0x283f2a9000000000, 0x5b06028300000000, 0x8aeee58d00000000,
-    0xbd7452a500000000, 0x6c9cb5ab00000000, 0x1fa59db800000000,
-    0xce4d7ab600000000, 0xc238180f00000000, 0x13d0ff0100000000,
-    0x60e9d71200000000, 0xb101301c00000000, 0x869b873400000000,
-    0x5773603a00000000, 0x244a482900000000, 0xf5a2af2700000000,
-    0x4a7e277800000000, 0x9b96c07600000000, 0xe8afe86500000000,
-    0x39470f6b00000000, 0x0eddb84300000000, 0xdf355f4d00000000,
-    0xac0c775e00000000, 0x7de4905000000000, 0xd2b566e100000000,
-    0x035d81ef00000000, 0x7064a9fc00000000, 0xa18c4ef200000000,
-    0x9616f9da00000000, 0x47fe1ed400000000, 0x34c736c700000000,
-    0xe52fd1c900000000, 0x5af3599600000000, 0x8b1bbe9800000000,
-    0xf822968b00000000, 0x29ca718500000000, 0x1e50c6ad00000000,
-    0xcfb821a300000000, 0xbc8109b000000000, 0x6d69eebe00000000,
-    0xa324940800000000, 0x72cc730600000000, 0x01f55b1500000000,
-    0xd01dbc1b00000000, 0xe7870b3300000000, 0x366fec3d00000000,
-    0x4556c42e00000000, 0x94be232000000000, 0x2b62ab7f00000000,
-    0xfa8a4c7100000000, 0x89b3646200000000, 0x585b836c00000000,
-    0x6fc1344400000000, 0xbe29d34a00000000, 0xcd10fb5900000000,
-    0x1cf81c5700000000, 0xb3a9eae600000000, 0x62410de800000000,
-    0x117825fb00000000, 0xc090c2f500000000, 0xf70a75dd00000000,
-    0x26e292d300000000, 0x55dbbac000000000, 0x84335dce00000000,
-    0x3befd59100000000, 0xea07329f00000000, 0x993e1a8c00000000,
-    0x48d6fd8200000000, 0x7f4c4aaa00000000, 0xaea4ada400000000,
-    0xdd9d85b700000000, 0x0c7562b900000000, 0x8471301e00000000,
-    0x5599d71000000000, 0x26a0ff0300000000, 0xf748180d00000000,
-    0xc0d2af2500000000, 0x113a482b00000000, 0x6203603800000000,
-    0xb3eb873600000000, 0x0c370f6900000000, 0xdddfe86700000000,
-    0xaee6c07400000000, 0x7f0e277a00000000, 0x4894905200000000,
-    0x997c775c00000000, 0xea455f4f00000000, 0x3badb84100000000,
-    0x94fc4ef000000000, 0x4514a9fe00000000, 0x362d81ed00000000,
-    0xe7c566e300000000, 0xd05fd1cb00000000, 0x01b736c500000000,
-    0x728e1ed600000000, 0xa366f9d800000000, 0x1cba718700000000,
-    0xcd52968900000000, 0xbe6bbe9a00000000, 0x6f83599400000000,
-    0x5819eebc00000000, 0x89f109b200000000, 0xfac821a100000000,
-    0x2b20c6af00000000, 0xe56dbc1900000000, 0x34855b1700000000,
-    0x47bc730400000000, 0x9654940a00000000, 0xa1ce232200000000,
-    0x7026c42c00000000, 0x031fec3f00000000, 0xd2f70b3100000000,
-    0x6d2b836e00000000, 0xbcc3646000000000, 0xcffa4c7300000000,
-    0x1e12ab7d00000000, 0x29881c5500000000, 0xf860fb5b00000000,
-    0x8b59d34800000000, 0x5ab1344600000000, 0xf5e0c2f700000000,
-    0x240825f900000000, 0x57310dea00000000, 0x86d9eae400000000,
-    0xb1435dcc00000000, 0x60abbac200000000, 0x139292d100000000,
-    0xc27a75df00000000, 0x7da6fd8000000000, 0xac4e1a8e00000000,
-    0xdf77329d00000000, 0x0e9fd59300000000, 0x390562bb00000000,
-    0xe8ed85b500000000, 0x9bd4ada600000000, 0x4a3c4aa800000000,
-    0x4649281100000000, 0x97a1cf1f00000000, 0xe498e70c00000000,
-    0x3570000200000000, 0x02eab72a00000000, 0xd302502400000000,
-    0xa03b783700000000, 0x71d39f3900000000, 0xce0f176600000000,
-    0x1fe7f06800000000, 0x6cded87b00000000, 0xbd363f7500000000,
-    0x8aac885d00000000, 0x5b446f5300000000, 0x287d474000000000,
-    0xf995a04e00000000, 0x56c456ff00000000, 0x872cb1f100000000,
-    0xf41599e200000000, 0x25fd7eec00000000, 0x1267c9c400000000,
-    0xc38f2eca00000000, 0xb0b606d900000000, 0x615ee1d700000000,
-    0xde82698800000000, 0x0f6a8e8600000000, 0x7c53a69500000000,
-    0xadbb419b00000000, 0x9a21f6b300000000, 0x4bc911bd00000000,
-    0x38f039ae00000000, 0xe918dea000000000, 0x2755a41600000000,
-    0xf6bd431800000000, 0x85846b0b00000000, 0x546c8c0500000000,
-    0x63f63b2d00000000, 0xb21edc2300000000, 0xc127f43000000000,
-    0x10cf133e00000000, 0xaf139b6100000000, 0x7efb7c6f00000000,
-    0x0dc2547c00000000, 0xdc2ab37200000000, 0xebb0045a00000000,
-    0x3a58e35400000000, 0x4961cb4700000000, 0x98892c4900000000,
-    0x37d8daf800000000, 0xe6303df600000000, 0x950915e500000000,
-    0x44e1f2eb00000000, 0x737b45c300000000, 0xa293a2cd00000000,
-    0xd1aa8ade00000000, 0x00426dd000000000, 0xbf9ee58f00000000,
-    0x6e76028100000000, 0x1d4f2a9200000000, 0xcca7cd9c00000000,
-    0xfb3d7ab400000000, 0x2ad59dba00000000, 0x59ecb5a900000000,
-    0x880452a700000000},
-   {0x0000000000000000, 0xaa05daf100000000, 0x150dc53800000000,
-    0xbf081fc900000000, 0x2a1a8a7100000000, 0x801f508000000000,
-    0x3f174f4900000000, 0x951295b800000000, 0x543414e300000000,
-    0xfe31ce1200000000, 0x4139d1db00000000, 0xeb3c0b2a00000000,
-    0x7e2e9e9200000000, 0xd42b446300000000, 0x6b235baa00000000,
-    0xc126815b00000000, 0xe96e591d00000000, 0x436b83ec00000000,
-    0xfc639c2500000000, 0x566646d400000000, 0xc374d36c00000000,
-    0x6971099d00000000, 0xd679165400000000, 0x7c7ccca500000000,
-    0xbd5a4dfe00000000, 0x175f970f00000000, 0xa85788c600000000,
-    0x0252523700000000, 0x9740c78f00000000, 0x3d451d7e00000000,
-    0x824d02b700000000, 0x2848d84600000000, 0xd2ddb23a00000000,
-    0x78d868cb00000000, 0xc7d0770200000000, 0x6dd5adf300000000,
-    0xf8c7384b00000000, 0x52c2e2ba00000000, 0xedcafd7300000000,
-    0x47cf278200000000, 0x86e9a6d900000000, 0x2cec7c2800000000,
-    0x93e463e100000000, 0x39e1b91000000000, 0xacf32ca800000000,
-    0x06f6f65900000000, 0xb9fee99000000000, 0x13fb336100000000,
-    0x3bb3eb2700000000, 0x91b631d600000000, 0x2ebe2e1f00000000,
-    0x84bbf4ee00000000, 0x11a9615600000000, 0xbbacbba700000000,
-    0x04a4a46e00000000, 0xaea17e9f00000000, 0x6f87ffc400000000,
-    0xc582253500000000, 0x7a8a3afc00000000, 0xd08fe00d00000000,
-    0x459d75b500000000, 0xef98af4400000000, 0x5090b08d00000000,
-    0xfa956a7c00000000, 0xa4bb657500000000, 0x0ebebf8400000000,
-    0xb1b6a04d00000000, 0x1bb37abc00000000, 0x8ea1ef0400000000,
-    0x24a435f500000000, 0x9bac2a3c00000000, 0x31a9f0cd00000000,
-    0xf08f719600000000, 0x5a8aab6700000000, 0xe582b4ae00000000,
-    0x4f876e5f00000000, 0xda95fbe700000000, 0x7090211600000000,
-    0xcf983edf00000000, 0x659de42e00000000, 0x4dd53c6800000000,
-    0xe7d0e69900000000, 0x58d8f95000000000, 0xf2dd23a100000000,
-    0x67cfb61900000000, 0xcdca6ce800000000, 0x72c2732100000000,
-    0xd8c7a9d000000000, 0x19e1288b00000000, 0xb3e4f27a00000000,
-    0x0cecedb300000000, 0xa6e9374200000000, 0x33fba2fa00000000,
-    0x99fe780b00000000, 0x26f667c200000000, 0x8cf3bd3300000000,
-    0x7666d74f00000000, 0xdc630dbe00000000, 0x636b127700000000,
-    0xc96ec88600000000, 0x5c7c5d3e00000000, 0xf67987cf00000000,
-    0x4971980600000000, 0xe37442f700000000, 0x2252c3ac00000000,
-    0x8857195d00000000, 0x375f069400000000, 0x9d5adc6500000000,
-    0x084849dd00000000, 0xa24d932c00000000, 0x1d458ce500000000,
-    0xb740561400000000, 0x9f088e5200000000, 0x350d54a300000000,
-    0x8a054b6a00000000, 0x2000919b00000000, 0xb512042300000000,
-    0x1f17ded200000000, 0xa01fc11b00000000, 0x0a1a1bea00000000,
-    0xcb3c9ab100000000, 0x6139404000000000, 0xde315f8900000000,
-    0x7434857800000000, 0xe12610c000000000, 0x4b23ca3100000000,
-    0xf42bd5f800000000, 0x5e2e0f0900000000, 0x4877cbea00000000,
-    0xe272111b00000000, 0x5d7a0ed200000000, 0xf77fd42300000000,
-    0x626d419b00000000, 0xc8689b6a00000000, 0x776084a300000000,
-    0xdd655e5200000000, 0x1c43df0900000000, 0xb64605f800000000,
-    0x094e1a3100000000, 0xa34bc0c000000000, 0x3659557800000000,
-    0x9c5c8f8900000000, 0x2354904000000000, 0x89514ab100000000,
-    0xa11992f700000000, 0x0b1c480600000000, 0xb41457cf00000000,
-    0x1e118d3e00000000, 0x8b03188600000000, 0x2106c27700000000,
-    0x9e0eddbe00000000, 0x340b074f00000000, 0xf52d861400000000,
-    0x5f285ce500000000, 0xe020432c00000000, 0x4a2599dd00000000,
-    0xdf370c6500000000, 0x7532d69400000000, 0xca3ac95d00000000,
-    0x603f13ac00000000, 0x9aaa79d000000000, 0x30afa32100000000,
-    0x8fa7bce800000000, 0x25a2661900000000, 0xb0b0f3a100000000,
-    0x1ab5295000000000, 0xa5bd369900000000, 0x0fb8ec6800000000,
-    0xce9e6d3300000000, 0x649bb7c200000000, 0xdb93a80b00000000,
-    0x719672fa00000000, 0xe484e74200000000, 0x4e813db300000000,
-    0xf189227a00000000, 0x5b8cf88b00000000, 0x73c420cd00000000,
-    0xd9c1fa3c00000000, 0x66c9e5f500000000, 0xcccc3f0400000000,
-    0x59deaabc00000000, 0xf3db704d00000000, 0x4cd36f8400000000,
-    0xe6d6b57500000000, 0x27f0342e00000000, 0x8df5eedf00000000,
-    0x32fdf11600000000, 0x98f82be700000000, 0x0deabe5f00000000,
-    0xa7ef64ae00000000, 0x18e77b6700000000, 0xb2e2a19600000000,
-    0xecccae9f00000000, 0x46c9746e00000000, 0xf9c16ba700000000,
-    0x53c4b15600000000, 0xc6d624ee00000000, 0x6cd3fe1f00000000,
-    0xd3dbe1d600000000, 0x79de3b2700000000, 0xb8f8ba7c00000000,
-    0x12fd608d00000000, 0xadf57f4400000000, 0x07f0a5b500000000,
-    0x92e2300d00000000, 0x38e7eafc00000000, 0x87eff53500000000,
-    0x2dea2fc400000000, 0x05a2f78200000000, 0xafa72d7300000000,
-    0x10af32ba00000000, 0xbaaae84b00000000, 0x2fb87df300000000,
-    0x85bda70200000000, 0x3ab5b8cb00000000, 0x90b0623a00000000,
-    0x5196e36100000000, 0xfb93399000000000, 0x449b265900000000,
-    0xee9efca800000000, 0x7b8c691000000000, 0xd189b3e100000000,
-    0x6e81ac2800000000, 0xc48476d900000000, 0x3e111ca500000000,
-    0x9414c65400000000, 0x2b1cd99d00000000, 0x8119036c00000000,
-    0x140b96d400000000, 0xbe0e4c2500000000, 0x010653ec00000000,
-    0xab03891d00000000, 0x6a25084600000000, 0xc020d2b700000000,
-    0x7f28cd7e00000000, 0xd52d178f00000000, 0x403f823700000000,
-    0xea3a58c600000000, 0x5532470f00000000, 0xff379dfe00000000,
-    0xd77f45b800000000, 0x7d7a9f4900000000, 0xc272808000000000,
-    0x68775a7100000000, 0xfd65cfc900000000, 0x5760153800000000,
-    0xe8680af100000000, 0x426dd00000000000, 0x834b515b00000000,
-    0x294e8baa00000000, 0x9646946300000000, 0x3c434e9200000000,
-    0xa951db2a00000000, 0x035401db00000000, 0xbc5c1e1200000000,
-    0x1659c4e300000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
-    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
-    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
-    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
-    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
-    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
-    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
-    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
-    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
-    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
-    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
-    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
-    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
-    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
-    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
-    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
-    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
-    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
-    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
-    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
-    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
-    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
-    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
-    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
-    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
-    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
-    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
-    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
-    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
-    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
-    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
-    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
-    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
-    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
-    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
-    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
-    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
-    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
-    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
-    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
-    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
-    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
-    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
-    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
-    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
-    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
-    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
-    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
-    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
-    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
-    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
-    0x0d7139d7},
-   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
-    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
-    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
-    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
-    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
-    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
-    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
-    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
-    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
-    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
-    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
-    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
-    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
-    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
-    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
-    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
-    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
-    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
-    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
-    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
-    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
-    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
-    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
-    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
-    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
-    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
-    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
-    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
-    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
-    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
-    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
-    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
-    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
-    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
-    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
-    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
-    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
-    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
-    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
-    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
-    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
-    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
-    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
-    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
-    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
-    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
-    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
-    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
-    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
-    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
-    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
-    0x1c53e98a},
-   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
-    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
-    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
-    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
-    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
-    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
-    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
-    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
-    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
-    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
-    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
-    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
-    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
-    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
-    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
-    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
-    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
-    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
-    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
-    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
-    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
-    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
-    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
-    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
-    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
-    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
-    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
-    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
-    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
-    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
-    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
-    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
-    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
-    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
-    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
-    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
-    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
-    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
-    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
-    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
-    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
-    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
-    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
-    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
-    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
-    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
-    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
-    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
-    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
-    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
-    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
-    0x3f88e851},
-   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
-    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
-    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
-    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
-    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
-    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
-    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
-    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
-    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
-    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
-    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
-    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
-    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
-    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
-    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
-    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
-    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
-    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
-    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
-    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
-    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
-    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
-    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
-    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
-    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
-    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
-    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
-    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
-    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
-    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
-    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
-    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
-    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
-    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
-    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
-    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
-    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
-    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
-    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
-    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
-    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
-    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
-    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
-    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
-    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
-    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
-    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
-    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
-    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
-    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
-    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
-    0x3dee8ca6}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0x85d996dd, 0x4bb55c60, 0xce6ccabd, 0x966ab9c0,
-    0x13b32f1d, 0xdddfe5a0, 0x5806737d, 0x6dd3035a, 0xe80a9587,
-    0x26665f3a, 0xa3bfc9e7, 0xfbb9ba9a, 0x7e602c47, 0xb00ce6fa,
-    0x35d57027, 0xdaa607b4, 0x5f7f9169, 0x91135bd4, 0x14cacd09,
-    0x4cccbe74, 0xc91528a9, 0x0779e214, 0x82a074c9, 0xb77504ee,
-    0x32ac9233, 0xfcc0588e, 0x7919ce53, 0x211fbd2e, 0xa4c62bf3,
-    0x6aaae14e, 0xef737793, 0xf54b7eb3, 0x7092e86e, 0xbefe22d3,
-    0x3b27b40e, 0x6321c773, 0xe6f851ae, 0x28949b13, 0xad4d0dce,
-    0x98987de9, 0x1d41eb34, 0xd32d2189, 0x56f4b754, 0x0ef2c429,
-    0x8b2b52f4, 0x45479849, 0xc09e0e94, 0x2fed7907, 0xaa34efda,
-    0x64582567, 0xe181b3ba, 0xb987c0c7, 0x3c5e561a, 0xf2329ca7,
-    0x77eb0a7a, 0x423e7a5d, 0xc7e7ec80, 0x098b263d, 0x8c52b0e0,
-    0xd454c39d, 0x518d5540, 0x9fe19ffd, 0x1a380920, 0xab918dbd,
-    0x2e481b60, 0xe024d1dd, 0x65fd4700, 0x3dfb347d, 0xb822a2a0,
-    0x764e681d, 0xf397fec0, 0xc6428ee7, 0x439b183a, 0x8df7d287,
-    0x082e445a, 0x50283727, 0xd5f1a1fa, 0x1b9d6b47, 0x9e44fd9a,
-    0x71378a09, 0xf4ee1cd4, 0x3a82d669, 0xbf5b40b4, 0xe75d33c9,
-    0x6284a514, 0xace86fa9, 0x2931f974, 0x1ce48953, 0x993d1f8e,
-    0x5751d533, 0xd28843ee, 0x8a8e3093, 0x0f57a64e, 0xc13b6cf3,
-    0x44e2fa2e, 0x5edaf30e, 0xdb0365d3, 0x156faf6e, 0x90b639b3,
-    0xc8b04ace, 0x4d69dc13, 0x830516ae, 0x06dc8073, 0x3309f054,
-    0xb6d06689, 0x78bcac34, 0xfd653ae9, 0xa5634994, 0x20badf49,
-    0xeed615f4, 0x6b0f8329, 0x847cf4ba, 0x01a56267, 0xcfc9a8da,
-    0x4a103e07, 0x12164d7a, 0x97cfdba7, 0x59a3111a, 0xdc7a87c7,
-    0xe9aff7e0, 0x6c76613d, 0xa21aab80, 0x27c33d5d, 0x7fc54e20,
-    0xfa1cd8fd, 0x34701240, 0xb1a9849d, 0x17256aa0, 0x92fcfc7d,
-    0x5c9036c0, 0xd949a01d, 0x814fd360, 0x049645bd, 0xcafa8f00,
-    0x4f2319dd, 0x7af669fa, 0xff2fff27, 0x3143359a, 0xb49aa347,
-    0xec9cd03a, 0x694546e7, 0xa7298c5a, 0x22f01a87, 0xcd836d14,
-    0x485afbc9, 0x86363174, 0x03efa7a9, 0x5be9d4d4, 0xde304209,
-    0x105c88b4, 0x95851e69, 0xa0506e4e, 0x2589f893, 0xebe5322e,
-    0x6e3ca4f3, 0x363ad78e, 0xb3e34153, 0x7d8f8bee, 0xf8561d33,
-    0xe26e1413, 0x67b782ce, 0xa9db4873, 0x2c02deae, 0x7404add3,
-    0xf1dd3b0e, 0x3fb1f1b3, 0xba68676e, 0x8fbd1749, 0x0a648194,
-    0xc4084b29, 0x41d1ddf4, 0x19d7ae89, 0x9c0e3854, 0x5262f2e9,
-    0xd7bb6434, 0x38c813a7, 0xbd11857a, 0x737d4fc7, 0xf6a4d91a,
-    0xaea2aa67, 0x2b7b3cba, 0xe517f607, 0x60ce60da, 0x551b10fd,
-    0xd0c28620, 0x1eae4c9d, 0x9b77da40, 0xc371a93d, 0x46a83fe0,
-    0x88c4f55d, 0x0d1d6380, 0xbcb4e71d, 0x396d71c0, 0xf701bb7d,
-    0x72d82da0, 0x2ade5edd, 0xaf07c800, 0x616b02bd, 0xe4b29460,
-    0xd167e447, 0x54be729a, 0x9ad2b827, 0x1f0b2efa, 0x470d5d87,
-    0xc2d4cb5a, 0x0cb801e7, 0x8961973a, 0x6612e0a9, 0xe3cb7674,
-    0x2da7bcc9, 0xa87e2a14, 0xf0785969, 0x75a1cfb4, 0xbbcd0509,
-    0x3e1493d4, 0x0bc1e3f3, 0x8e18752e, 0x4074bf93, 0xc5ad294e,
-    0x9dab5a33, 0x1872ccee, 0xd61e0653, 0x53c7908e, 0x49ff99ae,
-    0xcc260f73, 0x024ac5ce, 0x87935313, 0xdf95206e, 0x5a4cb6b3,
-    0x94207c0e, 0x11f9ead3, 0x242c9af4, 0xa1f50c29, 0x6f99c694,
-    0xea405049, 0xb2462334, 0x379fb5e9, 0xf9f37f54, 0x7c2ae989,
-    0x93599e1a, 0x168008c7, 0xd8ecc27a, 0x5d3554a7, 0x053327da,
-    0x80eab107, 0x4e867bba, 0xcb5fed67, 0xfe8a9d40, 0x7b530b9d,
-    0xb53fc120, 0x30e657fd, 0x68e02480, 0xed39b25d, 0x235578e0,
-    0xa68cee3d},
-   {0x00000000, 0x76e10f9d, 0xadc46ee1, 0xdb25617c, 0x1b8fac19,
-    0x6d6ea384, 0xb64bc2f8, 0xc0aacd65, 0x361e5933, 0x40ff56ae,
-    0x9bda37d2, 0xed3b384f, 0x2d91f52a, 0x5b70fab7, 0x80559bcb,
-    0xf6b49456, 0x6c3cb266, 0x1addbdfb, 0xc1f8dc87, 0xb719d31a,
-    0x77b31e7f, 0x015211e2, 0xda77709e, 0xac967f03, 0x5a22eb55,
-    0x2cc3e4c8, 0xf7e685b4, 0x81078a29, 0x41ad474c, 0x374c48d1,
-    0xec6929ad, 0x9a882630, 0xd87864cd, 0xae996b50, 0x75bc0a2c,
-    0x035d05b1, 0xc3f7c8d4, 0xb516c749, 0x6e33a635, 0x18d2a9a8,
-    0xee663dfe, 0x98873263, 0x43a2531f, 0x35435c82, 0xf5e991e7,
-    0x83089e7a, 0x582dff06, 0x2eccf09b, 0xb444d6ab, 0xc2a5d936,
-    0x1980b84a, 0x6f61b7d7, 0xafcb7ab2, 0xd92a752f, 0x020f1453,
-    0x74ee1bce, 0x825a8f98, 0xf4bb8005, 0x2f9ee179, 0x597feee4,
-    0x99d52381, 0xef342c1c, 0x34114d60, 0x42f042fd, 0xf1f7b941,
-    0x8716b6dc, 0x5c33d7a0, 0x2ad2d83d, 0xea781558, 0x9c991ac5,
-    0x47bc7bb9, 0x315d7424, 0xc7e9e072, 0xb108efef, 0x6a2d8e93,
-    0x1ccc810e, 0xdc664c6b, 0xaa8743f6, 0x71a2228a, 0x07432d17,
-    0x9dcb0b27, 0xeb2a04ba, 0x300f65c6, 0x46ee6a5b, 0x8644a73e,
-    0xf0a5a8a3, 0x2b80c9df, 0x5d61c642, 0xabd55214, 0xdd345d89,
-    0x06113cf5, 0x70f03368, 0xb05afe0d, 0xc6bbf190, 0x1d9e90ec,
-    0x6b7f9f71, 0x298fdd8c, 0x5f6ed211, 0x844bb36d, 0xf2aabcf0,
-    0x32007195, 0x44e17e08, 0x9fc41f74, 0xe92510e9, 0x1f9184bf,
-    0x69708b22, 0xb255ea5e, 0xc4b4e5c3, 0x041e28a6, 0x72ff273b,
-    0xa9da4647, 0xdf3b49da, 0x45b36fea, 0x33526077, 0xe877010b,
-    0x9e960e96, 0x5e3cc3f3, 0x28ddcc6e, 0xf3f8ad12, 0x8519a28f,
-    0x73ad36d9, 0x054c3944, 0xde695838, 0xa88857a5, 0x68229ac0,
-    0x1ec3955d, 0xc5e6f421, 0xb307fbbc, 0xe2ef7383, 0x940e7c1e,
-    0x4f2b1d62, 0x39ca12ff, 0xf960df9a, 0x8f81d007, 0x54a4b17b,
-    0x2245bee6, 0xd4f12ab0, 0xa210252d, 0x79354451, 0x0fd44bcc,
-    0xcf7e86a9, 0xb99f8934, 0x62bae848, 0x145be7d5, 0x8ed3c1e5,
-    0xf832ce78, 0x2317af04, 0x55f6a099, 0x955c6dfc, 0xe3bd6261,
-    0x3898031d, 0x4e790c80, 0xb8cd98d6, 0xce2c974b, 0x1509f637,
-    0x63e8f9aa, 0xa34234cf, 0xd5a33b52, 0x0e865a2e, 0x786755b3,
-    0x3a97174e, 0x4c7618d3, 0x975379af, 0xe1b27632, 0x2118bb57,
-    0x57f9b4ca, 0x8cdcd5b6, 0xfa3dda2b, 0x0c894e7d, 0x7a6841e0,
-    0xa14d209c, 0xd7ac2f01, 0x1706e264, 0x61e7edf9, 0xbac28c85,
-    0xcc238318, 0x56aba528, 0x204aaab5, 0xfb6fcbc9, 0x8d8ec454,
-    0x4d240931, 0x3bc506ac, 0xe0e067d0, 0x9601684d, 0x60b5fc1b,
-    0x1654f386, 0xcd7192fa, 0xbb909d67, 0x7b3a5002, 0x0ddb5f9f,
-    0xd6fe3ee3, 0xa01f317e, 0x1318cac2, 0x65f9c55f, 0xbedca423,
-    0xc83dabbe, 0x089766db, 0x7e766946, 0xa553083a, 0xd3b207a7,
-    0x250693f1, 0x53e79c6c, 0x88c2fd10, 0xfe23f28d, 0x3e893fe8,
-    0x48683075, 0x934d5109, 0xe5ac5e94, 0x7f2478a4, 0x09c57739,
-    0xd2e01645, 0xa40119d8, 0x64abd4bd, 0x124adb20, 0xc96fba5c,
-    0xbf8eb5c1, 0x493a2197, 0x3fdb2e0a, 0xe4fe4f76, 0x921f40eb,
-    0x52b58d8e, 0x24548213, 0xff71e36f, 0x8990ecf2, 0xcb60ae0f,
-    0xbd81a192, 0x66a4c0ee, 0x1045cf73, 0xd0ef0216, 0xa60e0d8b,
-    0x7d2b6cf7, 0x0bca636a, 0xfd7ef73c, 0x8b9ff8a1, 0x50ba99dd,
-    0x265b9640, 0xe6f15b25, 0x901054b8, 0x4b3535c4, 0x3dd43a59,
-    0xa75c1c69, 0xd1bd13f4, 0x0a987288, 0x7c797d15, 0xbcd3b070,
-    0xca32bfed, 0x1117de91, 0x67f6d10c, 0x9142455a, 0xe7a34ac7,
-    0x3c862bbb, 0x4a672426, 0x8acde943, 0xfc2ce6de, 0x270987a2,
-    0x51e8883f},
-   {0x00000000, 0xe8dbfbb9, 0x91b186a8, 0x796a7d11, 0x63657c8a,
-    0x8bbe8733, 0xf2d4fa22, 0x1a0f019b, 0x87cc89cf, 0x6f177276,
-    0x167d0f67, 0xfea6f4de, 0xe4a9f545, 0x0c720efc, 0x751873ed,
-    0x9dc38854, 0x4f9f6244, 0xa74499fd, 0xde2ee4ec, 0x36f51f55,
-    0x2cfa1ece, 0xc421e577, 0xbd4b9866, 0x559063df, 0xc853eb8b,
-    0x20881032, 0x59e26d23, 0xb139969a, 0xab369701, 0x43ed6cb8,
-    0x3a8711a9, 0xd25cea10, 0x9e3ec588, 0x76e53e31, 0x0f8f4320,
-    0xe754b899, 0xfd5bb902, 0x158042bb, 0x6cea3faa, 0x8431c413,
-    0x19f24c47, 0xf129b7fe, 0x8843caef, 0x60983156, 0x7a9730cd,
-    0x924ccb74, 0xeb26b665, 0x03fd4ddc, 0xd1a1a7cc, 0x397a5c75,
-    0x40102164, 0xa8cbdadd, 0xb2c4db46, 0x5a1f20ff, 0x23755dee,
-    0xcbaea657, 0x566d2e03, 0xbeb6d5ba, 0xc7dca8ab, 0x2f075312,
-    0x35085289, 0xddd3a930, 0xa4b9d421, 0x4c622f98, 0x7d7bfbca,
-    0x95a00073, 0xecca7d62, 0x041186db, 0x1e1e8740, 0xf6c57cf9,
-    0x8faf01e8, 0x6774fa51, 0xfab77205, 0x126c89bc, 0x6b06f4ad,
-    0x83dd0f14, 0x99d20e8f, 0x7109f536, 0x08638827, 0xe0b8739e,
-    0x32e4998e, 0xda3f6237, 0xa3551f26, 0x4b8ee49f, 0x5181e504,
-    0xb95a1ebd, 0xc03063ac, 0x28eb9815, 0xb5281041, 0x5df3ebf8,
-    0x249996e9, 0xcc426d50, 0xd64d6ccb, 0x3e969772, 0x47fcea63,
-    0xaf2711da, 0xe3453e42, 0x0b9ec5fb, 0x72f4b8ea, 0x9a2f4353,
-    0x802042c8, 0x68fbb971, 0x1191c460, 0xf94a3fd9, 0x6489b78d,
-    0x8c524c34, 0xf5383125, 0x1de3ca9c, 0x07eccb07, 0xef3730be,
-    0x965d4daf, 0x7e86b616, 0xacda5c06, 0x4401a7bf, 0x3d6bdaae,
-    0xd5b02117, 0xcfbf208c, 0x2764db35, 0x5e0ea624, 0xb6d55d9d,
-    0x2b16d5c9, 0xc3cd2e70, 0xbaa75361, 0x527ca8d8, 0x4873a943,
-    0xa0a852fa, 0xd9c22feb, 0x3119d452, 0xbbf0874e, 0x532b7cf7,
-    0x2a4101e6, 0xc29afa5f, 0xd895fbc4, 0x304e007d, 0x49247d6c,
-    0xa1ff86d5, 0x3c3c0e81, 0xd4e7f538, 0xad8d8829, 0x45567390,
-    0x5f59720b, 0xb78289b2, 0xcee8f4a3, 0x26330f1a, 0xf46fe50a,
-    0x1cb41eb3, 0x65de63a2, 0x8d05981b, 0x970a9980, 0x7fd16239,
-    0x06bb1f28, 0xee60e491, 0x73a36cc5, 0x9b78977c, 0xe212ea6d,
-    0x0ac911d4, 0x10c6104f, 0xf81debf6, 0x817796e7, 0x69ac6d5e,
-    0x25ce42c6, 0xcd15b97f, 0xb47fc46e, 0x5ca43fd7, 0x46ab3e4c,
-    0xae70c5f5, 0xd71ab8e4, 0x3fc1435d, 0xa202cb09, 0x4ad930b0,
-    0x33b34da1, 0xdb68b618, 0xc167b783, 0x29bc4c3a, 0x50d6312b,
-    0xb80dca92, 0x6a512082, 0x828adb3b, 0xfbe0a62a, 0x133b5d93,
-    0x09345c08, 0xe1efa7b1, 0x9885daa0, 0x705e2119, 0xed9da94d,
-    0x054652f4, 0x7c2c2fe5, 0x94f7d45c, 0x8ef8d5c7, 0x66232e7e,
-    0x1f49536f, 0xf792a8d6, 0xc68b7c84, 0x2e50873d, 0x573afa2c,
-    0xbfe10195, 0xa5ee000e, 0x4d35fbb7, 0x345f86a6, 0xdc847d1f,
-    0x4147f54b, 0xa99c0ef2, 0xd0f673e3, 0x382d885a, 0x222289c1,
-    0xcaf97278, 0xb3930f69, 0x5b48f4d0, 0x89141ec0, 0x61cfe579,
-    0x18a59868, 0xf07e63d1, 0xea71624a, 0x02aa99f3, 0x7bc0e4e2,
-    0x931b1f5b, 0x0ed8970f, 0xe6036cb6, 0x9f6911a7, 0x77b2ea1e,
-    0x6dbdeb85, 0x8566103c, 0xfc0c6d2d, 0x14d79694, 0x58b5b90c,
-    0xb06e42b5, 0xc9043fa4, 0x21dfc41d, 0x3bd0c586, 0xd30b3e3f,
-    0xaa61432e, 0x42bab897, 0xdf7930c3, 0x37a2cb7a, 0x4ec8b66b,
-    0xa6134dd2, 0xbc1c4c49, 0x54c7b7f0, 0x2dadcae1, 0xc5763158,
-    0x172adb48, 0xfff120f1, 0x869b5de0, 0x6e40a659, 0x744fa7c2,
-    0x9c945c7b, 0xe5fe216a, 0x0d25dad3, 0x90e65287, 0x783da93e,
-    0x0157d42f, 0xe98c2f96, 0xf3832e0d, 0x1b58d5b4, 0x6232a8a5,
-    0x8ae9531c},
-   {0x00000000, 0x919168ae, 0x6325a087, 0xf2b4c829, 0x874c31d4,
-    0x16dd597a, 0xe4699153, 0x75f8f9fd, 0x4f9f1373, 0xde0e7bdd,
-    0x2cbab3f4, 0xbd2bdb5a, 0xc8d322a7, 0x59424a09, 0xabf68220,
-    0x3a67ea8e, 0x9e3e27e6, 0x0faf4f48, 0xfd1b8761, 0x6c8aefcf,
-    0x19721632, 0x88e37e9c, 0x7a57b6b5, 0xebc6de1b, 0xd1a13495,
-    0x40305c3b, 0xb2849412, 0x2315fcbc, 0x56ed0541, 0xc77c6def,
-    0x35c8a5c6, 0xa459cd68, 0x7d7b3f17, 0xecea57b9, 0x1e5e9f90,
-    0x8fcff73e, 0xfa370ec3, 0x6ba6666d, 0x9912ae44, 0x0883c6ea,
-    0x32e42c64, 0xa37544ca, 0x51c18ce3, 0xc050e44d, 0xb5a81db0,
-    0x2439751e, 0xd68dbd37, 0x471cd599, 0xe34518f1, 0x72d4705f,
-    0x8060b876, 0x11f1d0d8, 0x64092925, 0xf598418b, 0x072c89a2,
-    0x96bde10c, 0xacda0b82, 0x3d4b632c, 0xcfffab05, 0x5e6ec3ab,
-    0x2b963a56, 0xba0752f8, 0x48b39ad1, 0xd922f27f, 0xfaf67e2e,
-    0x6b671680, 0x99d3dea9, 0x0842b607, 0x7dba4ffa, 0xec2b2754,
-    0x1e9fef7d, 0x8f0e87d3, 0xb5696d5d, 0x24f805f3, 0xd64ccdda,
-    0x47dda574, 0x32255c89, 0xa3b43427, 0x5100fc0e, 0xc09194a0,
-    0x64c859c8, 0xf5593166, 0x07edf94f, 0x967c91e1, 0xe384681c,
-    0x721500b2, 0x80a1c89b, 0x1130a035, 0x2b574abb, 0xbac62215,
-    0x4872ea3c, 0xd9e38292, 0xac1b7b6f, 0x3d8a13c1, 0xcf3edbe8,
-    0x5eafb346, 0x878d4139, 0x161c2997, 0xe4a8e1be, 0x75398910,
-    0x00c170ed, 0x91501843, 0x63e4d06a, 0xf275b8c4, 0xc812524a,
-    0x59833ae4, 0xab37f2cd, 0x3aa69a63, 0x4f5e639e, 0xdecf0b30,
-    0x2c7bc319, 0xbdeaabb7, 0x19b366df, 0x88220e71, 0x7a96c658,
-    0xeb07aef6, 0x9eff570b, 0x0f6e3fa5, 0xfddaf78c, 0x6c4b9f22,
-    0x562c75ac, 0xc7bd1d02, 0x3509d52b, 0xa498bd85, 0xd1604478,
-    0x40f12cd6, 0xb245e4ff, 0x23d48c51, 0xf4edfd5c, 0x657c95f2,
-    0x97c85ddb, 0x06593575, 0x73a1cc88, 0xe230a426, 0x10846c0f,
-    0x811504a1, 0xbb72ee2f, 0x2ae38681, 0xd8574ea8, 0x49c62606,
-    0x3c3edffb, 0xadafb755, 0x5f1b7f7c, 0xce8a17d2, 0x6ad3daba,
-    0xfb42b214, 0x09f67a3d, 0x98671293, 0xed9feb6e, 0x7c0e83c0,
-    0x8eba4be9, 0x1f2b2347, 0x254cc9c9, 0xb4dda167, 0x4669694e,
-    0xd7f801e0, 0xa200f81d, 0x339190b3, 0xc125589a, 0x50b43034,
-    0x8996c24b, 0x1807aae5, 0xeab362cc, 0x7b220a62, 0x0edaf39f,
-    0x9f4b9b31, 0x6dff5318, 0xfc6e3bb6, 0xc609d138, 0x5798b996,
-    0xa52c71bf, 0x34bd1911, 0x4145e0ec, 0xd0d48842, 0x2260406b,
-    0xb3f128c5, 0x17a8e5ad, 0x86398d03, 0x748d452a, 0xe51c2d84,
-    0x90e4d479, 0x0175bcd7, 0xf3c174fe, 0x62501c50, 0x5837f6de,
-    0xc9a69e70, 0x3b125659, 0xaa833ef7, 0xdf7bc70a, 0x4eeaafa4,
-    0xbc5e678d, 0x2dcf0f23, 0x0e1b8372, 0x9f8aebdc, 0x6d3e23f5,
-    0xfcaf4b5b, 0x8957b2a6, 0x18c6da08, 0xea721221, 0x7be37a8f,
-    0x41849001, 0xd015f8af, 0x22a13086, 0xb3305828, 0xc6c8a1d5,
-    0x5759c97b, 0xa5ed0152, 0x347c69fc, 0x9025a494, 0x01b4cc3a,
-    0xf3000413, 0x62916cbd, 0x17699540, 0x86f8fdee, 0x744c35c7,
-    0xe5dd5d69, 0xdfbab7e7, 0x4e2bdf49, 0xbc9f1760, 0x2d0e7fce,
-    0x58f68633, 0xc967ee9d, 0x3bd326b4, 0xaa424e1a, 0x7360bc65,
-    0xe2f1d4cb, 0x10451ce2, 0x81d4744c, 0xf42c8db1, 0x65bde51f,
-    0x97092d36, 0x06984598, 0x3cffaf16, 0xad6ec7b8, 0x5fda0f91,
-    0xce4b673f, 0xbbb39ec2, 0x2a22f66c, 0xd8963e45, 0x490756eb,
-    0xed5e9b83, 0x7ccff32d, 0x8e7b3b04, 0x1fea53aa, 0x6a12aa57,
-    0xfb83c2f9, 0x09370ad0, 0x98a6627e, 0xa2c188f0, 0x3350e05e,
-    0xc1e42877, 0x507540d9, 0x258db924, 0xb41cd18a, 0x46a819a3,
-    0xd739710d}};
-
-#endif /* W */
-
-#endif /* N == 4 */
-#if N == 5
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0xaf449247, 0x85f822cf, 0x2abcb088, 0xd08143df,
-    0x7fc5d198, 0x55796110, 0xfa3df357, 0x7a7381ff, 0xd53713b8,
-    0xff8ba330, 0x50cf3177, 0xaaf2c220, 0x05b65067, 0x2f0ae0ef,
-    0x804e72a8, 0xf4e703fe, 0x5ba391b9, 0x711f2131, 0xde5bb376,
-    0x24664021, 0x8b22d266, 0xa19e62ee, 0x0edaf0a9, 0x8e948201,
-    0x21d01046, 0x0b6ca0ce, 0xa4283289, 0x5e15c1de, 0xf1515399,
-    0xdbede311, 0x74a97156, 0x32bf01bd, 0x9dfb93fa, 0xb7472372,
-    0x1803b135, 0xe23e4262, 0x4d7ad025, 0x67c660ad, 0xc882f2ea,
-    0x48cc8042, 0xe7881205, 0xcd34a28d, 0x627030ca, 0x984dc39d,
-    0x370951da, 0x1db5e152, 0xb2f17315, 0xc6580243, 0x691c9004,
-    0x43a0208c, 0xece4b2cb, 0x16d9419c, 0xb99dd3db, 0x93216353,
-    0x3c65f114, 0xbc2b83bc, 0x136f11fb, 0x39d3a173, 0x96973334,
-    0x6caac063, 0xc3ee5224, 0xe952e2ac, 0x461670eb, 0x657e037a,
-    0xca3a913d, 0xe08621b5, 0x4fc2b3f2, 0xb5ff40a5, 0x1abbd2e2,
-    0x3007626a, 0x9f43f02d, 0x1f0d8285, 0xb04910c2, 0x9af5a04a,
-    0x35b1320d, 0xcf8cc15a, 0x60c8531d, 0x4a74e395, 0xe53071d2,
-    0x91990084, 0x3edd92c3, 0x1461224b, 0xbb25b00c, 0x4118435b,
-    0xee5cd11c, 0xc4e06194, 0x6ba4f3d3, 0xebea817b, 0x44ae133c,
-    0x6e12a3b4, 0xc15631f3, 0x3b6bc2a4, 0x942f50e3, 0xbe93e06b,
-    0x11d7722c, 0x57c102c7, 0xf8859080, 0xd2392008, 0x7d7db24f,
-    0x87404118, 0x2804d35f, 0x02b863d7, 0xadfcf190, 0x2db28338,
-    0x82f6117f, 0xa84aa1f7, 0x070e33b0, 0xfd33c0e7, 0x527752a0,
-    0x78cbe228, 0xd78f706f, 0xa3260139, 0x0c62937e, 0x26de23f6,
-    0x899ab1b1, 0x73a742e6, 0xdce3d0a1, 0xf65f6029, 0x591bf26e,
-    0xd95580c6, 0x76111281, 0x5cada209, 0xf3e9304e, 0x09d4c319,
-    0xa690515e, 0x8c2ce1d6, 0x23687391, 0xcafc06f4, 0x65b894b3,
-    0x4f04243b, 0xe040b67c, 0x1a7d452b, 0xb539d76c, 0x9f8567e4,
-    0x30c1f5a3, 0xb08f870b, 0x1fcb154c, 0x3577a5c4, 0x9a333783,
-    0x600ec4d4, 0xcf4a5693, 0xe5f6e61b, 0x4ab2745c, 0x3e1b050a,
-    0x915f974d, 0xbbe327c5, 0x14a7b582, 0xee9a46d5, 0x41ded492,
-    0x6b62641a, 0xc426f65d, 0x446884f5, 0xeb2c16b2, 0xc190a63a,
-    0x6ed4347d, 0x94e9c72a, 0x3bad556d, 0x1111e5e5, 0xbe5577a2,
-    0xf8430749, 0x5707950e, 0x7dbb2586, 0xd2ffb7c1, 0x28c24496,
-    0x8786d6d1, 0xad3a6659, 0x027ef41e, 0x823086b6, 0x2d7414f1,
-    0x07c8a479, 0xa88c363e, 0x52b1c569, 0xfdf5572e, 0xd749e7a6,
-    0x780d75e1, 0x0ca404b7, 0xa3e096f0, 0x895c2678, 0x2618b43f,
-    0xdc254768, 0x7361d52f, 0x59dd65a7, 0xf699f7e0, 0x76d78548,
-    0xd993170f, 0xf32fa787, 0x5c6b35c0, 0xa656c697, 0x091254d0,
-    0x23aee458, 0x8cea761f, 0xaf82058e, 0x00c697c9, 0x2a7a2741,
-    0x853eb506, 0x7f034651, 0xd047d416, 0xfafb649e, 0x55bff6d9,
-    0xd5f18471, 0x7ab51636, 0x5009a6be, 0xff4d34f9, 0x0570c7ae,
-    0xaa3455e9, 0x8088e561, 0x2fcc7726, 0x5b650670, 0xf4219437,
-    0xde9d24bf, 0x71d9b6f8, 0x8be445af, 0x24a0d7e8, 0x0e1c6760,
-    0xa158f527, 0x2116878f, 0x8e5215c8, 0xa4eea540, 0x0baa3707,
-    0xf197c450, 0x5ed35617, 0x746fe69f, 0xdb2b74d8, 0x9d3d0433,
-    0x32799674, 0x18c526fc, 0xb781b4bb, 0x4dbc47ec, 0xe2f8d5ab,
-    0xc8446523, 0x6700f764, 0xe74e85cc, 0x480a178b, 0x62b6a703,
-    0xcdf23544, 0x37cfc613, 0x988b5454, 0xb237e4dc, 0x1d73769b,
-    0x69da07cd, 0xc69e958a, 0xec222502, 0x4366b745, 0xb95b4412,
-    0x161fd655, 0x3ca366dd, 0x93e7f49a, 0x13a98632, 0xbced1475,
-    0x9651a4fd, 0x391536ba, 0xc328c5ed, 0x6c6c57aa, 0x46d0e722,
-    0xe9947565},
-   {0x00000000, 0x4e890ba9, 0x9d121752, 0xd39b1cfb, 0xe15528e5,
-    0xafdc234c, 0x7c473fb7, 0x32ce341e, 0x19db578b, 0x57525c22,
-    0x84c940d9, 0xca404b70, 0xf88e7f6e, 0xb60774c7, 0x659c683c,
-    0x2b156395, 0x33b6af16, 0x7d3fa4bf, 0xaea4b844, 0xe02db3ed,
-    0xd2e387f3, 0x9c6a8c5a, 0x4ff190a1, 0x01789b08, 0x2a6df89d,
-    0x64e4f334, 0xb77fefcf, 0xf9f6e466, 0xcb38d078, 0x85b1dbd1,
-    0x562ac72a, 0x18a3cc83, 0x676d5e2c, 0x29e45585, 0xfa7f497e,
-    0xb4f642d7, 0x863876c9, 0xc8b17d60, 0x1b2a619b, 0x55a36a32,
-    0x7eb609a7, 0x303f020e, 0xe3a41ef5, 0xad2d155c, 0x9fe32142,
-    0xd16a2aeb, 0x02f13610, 0x4c783db9, 0x54dbf13a, 0x1a52fa93,
-    0xc9c9e668, 0x8740edc1, 0xb58ed9df, 0xfb07d276, 0x289cce8d,
-    0x6615c524, 0x4d00a6b1, 0x0389ad18, 0xd012b1e3, 0x9e9bba4a,
-    0xac558e54, 0xe2dc85fd, 0x31479906, 0x7fce92af, 0xcedabc58,
-    0x8053b7f1, 0x53c8ab0a, 0x1d41a0a3, 0x2f8f94bd, 0x61069f14,
-    0xb29d83ef, 0xfc148846, 0xd701ebd3, 0x9988e07a, 0x4a13fc81,
-    0x049af728, 0x3654c336, 0x78ddc89f, 0xab46d464, 0xe5cfdfcd,
-    0xfd6c134e, 0xb3e518e7, 0x607e041c, 0x2ef70fb5, 0x1c393bab,
-    0x52b03002, 0x812b2cf9, 0xcfa22750, 0xe4b744c5, 0xaa3e4f6c,
-    0x79a55397, 0x372c583e, 0x05e26c20, 0x4b6b6789, 0x98f07b72,
-    0xd67970db, 0xa9b7e274, 0xe73ee9dd, 0x34a5f526, 0x7a2cfe8f,
-    0x48e2ca91, 0x066bc138, 0xd5f0ddc3, 0x9b79d66a, 0xb06cb5ff,
-    0xfee5be56, 0x2d7ea2ad, 0x63f7a904, 0x51399d1a, 0x1fb096b3,
-    0xcc2b8a48, 0x82a281e1, 0x9a014d62, 0xd48846cb, 0x07135a30,
-    0x499a5199, 0x7b546587, 0x35dd6e2e, 0xe64672d5, 0xa8cf797c,
-    0x83da1ae9, 0xcd531140, 0x1ec80dbb, 0x50410612, 0x628f320c,
-    0x2c0639a5, 0xff9d255e, 0xb1142ef7, 0x46c47ef1, 0x084d7558,
-    0xdbd669a3, 0x955f620a, 0xa7915614, 0xe9185dbd, 0x3a834146,
-    0x740a4aef, 0x5f1f297a, 0x119622d3, 0xc20d3e28, 0x8c843581,
-    0xbe4a019f, 0xf0c30a36, 0x235816cd, 0x6dd11d64, 0x7572d1e7,
-    0x3bfbda4e, 0xe860c6b5, 0xa6e9cd1c, 0x9427f902, 0xdaaef2ab,
-    0x0935ee50, 0x47bce5f9, 0x6ca9866c, 0x22208dc5, 0xf1bb913e,
-    0xbf329a97, 0x8dfcae89, 0xc375a520, 0x10eeb9db, 0x5e67b272,
-    0x21a920dd, 0x6f202b74, 0xbcbb378f, 0xf2323c26, 0xc0fc0838,
-    0x8e750391, 0x5dee1f6a, 0x136714c3, 0x38727756, 0x76fb7cff,
-    0xa5606004, 0xebe96bad, 0xd9275fb3, 0x97ae541a, 0x443548e1,
-    0x0abc4348, 0x121f8fcb, 0x5c968462, 0x8f0d9899, 0xc1849330,
-    0xf34aa72e, 0xbdc3ac87, 0x6e58b07c, 0x20d1bbd5, 0x0bc4d840,
-    0x454dd3e9, 0x96d6cf12, 0xd85fc4bb, 0xea91f0a5, 0xa418fb0c,
-    0x7783e7f7, 0x390aec5e, 0x881ec2a9, 0xc697c900, 0x150cd5fb,
-    0x5b85de52, 0x694bea4c, 0x27c2e1e5, 0xf459fd1e, 0xbad0f6b7,
-    0x91c59522, 0xdf4c9e8b, 0x0cd78270, 0x425e89d9, 0x7090bdc7,
-    0x3e19b66e, 0xed82aa95, 0xa30ba13c, 0xbba86dbf, 0xf5216616,
-    0x26ba7aed, 0x68337144, 0x5afd455a, 0x14744ef3, 0xc7ef5208,
-    0x896659a1, 0xa2733a34, 0xecfa319d, 0x3f612d66, 0x71e826cf,
-    0x432612d1, 0x0daf1978, 0xde340583, 0x90bd0e2a, 0xef739c85,
-    0xa1fa972c, 0x72618bd7, 0x3ce8807e, 0x0e26b460, 0x40afbfc9,
-    0x9334a332, 0xddbda89b, 0xf6a8cb0e, 0xb821c0a7, 0x6bbadc5c,
-    0x2533d7f5, 0x17fde3eb, 0x5974e842, 0x8aeff4b9, 0xc466ff10,
-    0xdcc53393, 0x924c383a, 0x41d724c1, 0x0f5e2f68, 0x3d901b76,
-    0x731910df, 0xa0820c24, 0xee0b078d, 0xc51e6418, 0x8b976fb1,
-    0x580c734a, 0x168578e3, 0x244b4cfd, 0x6ac24754, 0xb9595baf,
-    0xf7d05006},
-   {0x00000000, 0x8d88fde2, 0xc060fd85, 0x4de80067, 0x5bb0fd4b,
-    0xd63800a9, 0x9bd000ce, 0x1658fd2c, 0xb761fa96, 0x3ae90774,
-    0x77010713, 0xfa89faf1, 0xecd107dd, 0x6159fa3f, 0x2cb1fa58,
-    0xa13907ba, 0xb5b2f36d, 0x383a0e8f, 0x75d20ee8, 0xf85af30a,
-    0xee020e26, 0x638af3c4, 0x2e62f3a3, 0xa3ea0e41, 0x02d309fb,
-    0x8f5bf419, 0xc2b3f47e, 0x4f3b099c, 0x5963f4b0, 0xd4eb0952,
-    0x99030935, 0x148bf4d7, 0xb014e09b, 0x3d9c1d79, 0x70741d1e,
-    0xfdfce0fc, 0xeba41dd0, 0x662ce032, 0x2bc4e055, 0xa64c1db7,
-    0x07751a0d, 0x8afde7ef, 0xc715e788, 0x4a9d1a6a, 0x5cc5e746,
-    0xd14d1aa4, 0x9ca51ac3, 0x112de721, 0x05a613f6, 0x882eee14,
-    0xc5c6ee73, 0x484e1391, 0x5e16eebd, 0xd39e135f, 0x9e761338,
-    0x13feeeda, 0xb2c7e960, 0x3f4f1482, 0x72a714e5, 0xff2fe907,
-    0xe977142b, 0x64ffe9c9, 0x2917e9ae, 0xa49f144c, 0xbb58c777,
-    0x36d03a95, 0x7b383af2, 0xf6b0c710, 0xe0e83a3c, 0x6d60c7de,
-    0x2088c7b9, 0xad003a5b, 0x0c393de1, 0x81b1c003, 0xcc59c064,
-    0x41d13d86, 0x5789c0aa, 0xda013d48, 0x97e93d2f, 0x1a61c0cd,
-    0x0eea341a, 0x8362c9f8, 0xce8ac99f, 0x4302347d, 0x555ac951,
-    0xd8d234b3, 0x953a34d4, 0x18b2c936, 0xb98bce8c, 0x3403336e,
-    0x79eb3309, 0xf463ceeb, 0xe23b33c7, 0x6fb3ce25, 0x225bce42,
-    0xafd333a0, 0x0b4c27ec, 0x86c4da0e, 0xcb2cda69, 0x46a4278b,
-    0x50fcdaa7, 0xdd742745, 0x909c2722, 0x1d14dac0, 0xbc2ddd7a,
-    0x31a52098, 0x7c4d20ff, 0xf1c5dd1d, 0xe79d2031, 0x6a15ddd3,
-    0x27fdddb4, 0xaa752056, 0xbefed481, 0x33762963, 0x7e9e2904,
-    0xf316d4e6, 0xe54e29ca, 0x68c6d428, 0x252ed44f, 0xa8a629ad,
-    0x099f2e17, 0x8417d3f5, 0xc9ffd392, 0x44772e70, 0x522fd35c,
-    0xdfa72ebe, 0x924f2ed9, 0x1fc7d33b, 0xadc088af, 0x2048754d,
-    0x6da0752a, 0xe02888c8, 0xf67075e4, 0x7bf88806, 0x36108861,
-    0xbb987583, 0x1aa17239, 0x97298fdb, 0xdac18fbc, 0x5749725e,
-    0x41118f72, 0xcc997290, 0x817172f7, 0x0cf98f15, 0x18727bc2,
-    0x95fa8620, 0xd8128647, 0x559a7ba5, 0x43c28689, 0xce4a7b6b,
-    0x83a27b0c, 0x0e2a86ee, 0xaf138154, 0x229b7cb6, 0x6f737cd1,
-    0xe2fb8133, 0xf4a37c1f, 0x792b81fd, 0x34c3819a, 0xb94b7c78,
-    0x1dd46834, 0x905c95d6, 0xddb495b1, 0x503c6853, 0x4664957f,
-    0xcbec689d, 0x860468fa, 0x0b8c9518, 0xaab592a2, 0x273d6f40,
-    0x6ad56f27, 0xe75d92c5, 0xf1056fe9, 0x7c8d920b, 0x3165926c,
-    0xbced6f8e, 0xa8669b59, 0x25ee66bb, 0x680666dc, 0xe58e9b3e,
-    0xf3d66612, 0x7e5e9bf0, 0x33b69b97, 0xbe3e6675, 0x1f0761cf,
-    0x928f9c2d, 0xdf679c4a, 0x52ef61a8, 0x44b79c84, 0xc93f6166,
-    0x84d76101, 0x095f9ce3, 0x16984fd8, 0x9b10b23a, 0xd6f8b25d,
-    0x5b704fbf, 0x4d28b293, 0xc0a04f71, 0x8d484f16, 0x00c0b2f4,
-    0xa1f9b54e, 0x2c7148ac, 0x619948cb, 0xec11b529, 0xfa494805,
-    0x77c1b5e7, 0x3a29b580, 0xb7a14862, 0xa32abcb5, 0x2ea24157,
-    0x634a4130, 0xeec2bcd2, 0xf89a41fe, 0x7512bc1c, 0x38fabc7b,
-    0xb5724199, 0x144b4623, 0x99c3bbc1, 0xd42bbba6, 0x59a34644,
-    0x4ffbbb68, 0xc273468a, 0x8f9b46ed, 0x0213bb0f, 0xa68caf43,
-    0x2b0452a1, 0x66ec52c6, 0xeb64af24, 0xfd3c5208, 0x70b4afea,
-    0x3d5caf8d, 0xb0d4526f, 0x11ed55d5, 0x9c65a837, 0xd18da850,
-    0x5c0555b2, 0x4a5da89e, 0xc7d5557c, 0x8a3d551b, 0x07b5a8f9,
-    0x133e5c2e, 0x9eb6a1cc, 0xd35ea1ab, 0x5ed65c49, 0x488ea165,
-    0xc5065c87, 0x88ee5ce0, 0x0566a102, 0xa45fa6b8, 0x29d75b5a,
-    0x643f5b3d, 0xe9b7a6df, 0xffef5bf3, 0x7267a611, 0x3f8fa676,
-    0xb2075b94},
-   {0x00000000, 0x80f0171f, 0xda91287f, 0x5a613f60, 0x6e5356bf,
-    0xeea341a0, 0xb4c27ec0, 0x343269df, 0xdca6ad7e, 0x5c56ba61,
-    0x06378501, 0x86c7921e, 0xb2f5fbc1, 0x3205ecde, 0x6864d3be,
-    0xe894c4a1, 0x623c5cbd, 0xe2cc4ba2, 0xb8ad74c2, 0x385d63dd,
-    0x0c6f0a02, 0x8c9f1d1d, 0xd6fe227d, 0x560e3562, 0xbe9af1c3,
-    0x3e6ae6dc, 0x640bd9bc, 0xe4fbcea3, 0xd0c9a77c, 0x5039b063,
-    0x0a588f03, 0x8aa8981c, 0xc478b97a, 0x4488ae65, 0x1ee99105,
-    0x9e19861a, 0xaa2befc5, 0x2adbf8da, 0x70bac7ba, 0xf04ad0a5,
-    0x18de1404, 0x982e031b, 0xc24f3c7b, 0x42bf2b64, 0x768d42bb,
-    0xf67d55a4, 0xac1c6ac4, 0x2cec7ddb, 0xa644e5c7, 0x26b4f2d8,
-    0x7cd5cdb8, 0xfc25daa7, 0xc817b378, 0x48e7a467, 0x12869b07,
-    0x92768c18, 0x7ae248b9, 0xfa125fa6, 0xa07360c6, 0x208377d9,
-    0x14b11e06, 0x94410919, 0xce203679, 0x4ed02166, 0x538074b5,
-    0xd37063aa, 0x89115cca, 0x09e14bd5, 0x3dd3220a, 0xbd233515,
-    0xe7420a75, 0x67b21d6a, 0x8f26d9cb, 0x0fd6ced4, 0x55b7f1b4,
-    0xd547e6ab, 0xe1758f74, 0x6185986b, 0x3be4a70b, 0xbb14b014,
-    0x31bc2808, 0xb14c3f17, 0xeb2d0077, 0x6bdd1768, 0x5fef7eb7,
-    0xdf1f69a8, 0x857e56c8, 0x058e41d7, 0xed1a8576, 0x6dea9269,
-    0x378bad09, 0xb77bba16, 0x8349d3c9, 0x03b9c4d6, 0x59d8fbb6,
-    0xd928eca9, 0x97f8cdcf, 0x1708dad0, 0x4d69e5b0, 0xcd99f2af,
-    0xf9ab9b70, 0x795b8c6f, 0x233ab30f, 0xa3caa410, 0x4b5e60b1,
-    0xcbae77ae, 0x91cf48ce, 0x113f5fd1, 0x250d360e, 0xa5fd2111,
-    0xff9c1e71, 0x7f6c096e, 0xf5c49172, 0x7534866d, 0x2f55b90d,
-    0xafa5ae12, 0x9b97c7cd, 0x1b67d0d2, 0x4106efb2, 0xc1f6f8ad,
-    0x29623c0c, 0xa9922b13, 0xf3f31473, 0x7303036c, 0x47316ab3,
-    0xc7c17dac, 0x9da042cc, 0x1d5055d3, 0xa700e96a, 0x27f0fe75,
-    0x7d91c115, 0xfd61d60a, 0xc953bfd5, 0x49a3a8ca, 0x13c297aa,
-    0x933280b5, 0x7ba64414, 0xfb56530b, 0xa1376c6b, 0x21c77b74,
-    0x15f512ab, 0x950505b4, 0xcf643ad4, 0x4f942dcb, 0xc53cb5d7,
-    0x45cca2c8, 0x1fad9da8, 0x9f5d8ab7, 0xab6fe368, 0x2b9ff477,
-    0x71fecb17, 0xf10edc08, 0x199a18a9, 0x996a0fb6, 0xc30b30d6,
-    0x43fb27c9, 0x77c94e16, 0xf7395909, 0xad586669, 0x2da87176,
-    0x63785010, 0xe388470f, 0xb9e9786f, 0x39196f70, 0x0d2b06af,
-    0x8ddb11b0, 0xd7ba2ed0, 0x574a39cf, 0xbfdefd6e, 0x3f2eea71,
-    0x654fd511, 0xe5bfc20e, 0xd18dabd1, 0x517dbcce, 0x0b1c83ae,
-    0x8bec94b1, 0x01440cad, 0x81b41bb2, 0xdbd524d2, 0x5b2533cd,
-    0x6f175a12, 0xefe74d0d, 0xb586726d, 0x35766572, 0xdde2a1d3,
-    0x5d12b6cc, 0x077389ac, 0x87839eb3, 0xb3b1f76c, 0x3341e073,
-    0x6920df13, 0xe9d0c80c, 0xf4809ddf, 0x74708ac0, 0x2e11b5a0,
-    0xaee1a2bf, 0x9ad3cb60, 0x1a23dc7f, 0x4042e31f, 0xc0b2f400,
-    0x282630a1, 0xa8d627be, 0xf2b718de, 0x72470fc1, 0x4675661e,
-    0xc6857101, 0x9ce44e61, 0x1c14597e, 0x96bcc162, 0x164cd67d,
-    0x4c2de91d, 0xccddfe02, 0xf8ef97dd, 0x781f80c2, 0x227ebfa2,
-    0xa28ea8bd, 0x4a1a6c1c, 0xcaea7b03, 0x908b4463, 0x107b537c,
-    0x24493aa3, 0xa4b92dbc, 0xfed812dc, 0x7e2805c3, 0x30f824a5,
-    0xb00833ba, 0xea690cda, 0x6a991bc5, 0x5eab721a, 0xde5b6505,
-    0x843a5a65, 0x04ca4d7a, 0xec5e89db, 0x6cae9ec4, 0x36cfa1a4,
-    0xb63fb6bb, 0x820ddf64, 0x02fdc87b, 0x589cf71b, 0xd86ce004,
-    0x52c47818, 0xd2346f07, 0x88555067, 0x08a54778, 0x3c972ea7,
-    0xbc6739b8, 0xe60606d8, 0x66f611c7, 0x8e62d566, 0x0e92c279,
-    0x54f3fd19, 0xd403ea06, 0xe03183d9, 0x60c194c6, 0x3aa0aba6,
-    0xba50bcb9},
-   {0x00000000, 0x9570d495, 0xf190af6b, 0x64e07bfe, 0x38505897,
-    0xad208c02, 0xc9c0f7fc, 0x5cb02369, 0x70a0b12e, 0xe5d065bb,
-    0x81301e45, 0x1440cad0, 0x48f0e9b9, 0xdd803d2c, 0xb96046d2,
-    0x2c109247, 0xe141625c, 0x7431b6c9, 0x10d1cd37, 0x85a119a2,
-    0xd9113acb, 0x4c61ee5e, 0x288195a0, 0xbdf14135, 0x91e1d372,
-    0x049107e7, 0x60717c19, 0xf501a88c, 0xa9b18be5, 0x3cc15f70,
-    0x5821248e, 0xcd51f01b, 0x19f3c2f9, 0x8c83166c, 0xe8636d92,
-    0x7d13b907, 0x21a39a6e, 0xb4d34efb, 0xd0333505, 0x4543e190,
-    0x695373d7, 0xfc23a742, 0x98c3dcbc, 0x0db30829, 0x51032b40,
-    0xc473ffd5, 0xa093842b, 0x35e350be, 0xf8b2a0a5, 0x6dc27430,
-    0x09220fce, 0x9c52db5b, 0xc0e2f832, 0x55922ca7, 0x31725759,
-    0xa40283cc, 0x8812118b, 0x1d62c51e, 0x7982bee0, 0xecf26a75,
-    0xb042491c, 0x25329d89, 0x41d2e677, 0xd4a232e2, 0x33e785f2,
-    0xa6975167, 0xc2772a99, 0x5707fe0c, 0x0bb7dd65, 0x9ec709f0,
-    0xfa27720e, 0x6f57a69b, 0x434734dc, 0xd637e049, 0xb2d79bb7,
-    0x27a74f22, 0x7b176c4b, 0xee67b8de, 0x8a87c320, 0x1ff717b5,
-    0xd2a6e7ae, 0x47d6333b, 0x233648c5, 0xb6469c50, 0xeaf6bf39,
-    0x7f866bac, 0x1b661052, 0x8e16c4c7, 0xa2065680, 0x37768215,
-    0x5396f9eb, 0xc6e62d7e, 0x9a560e17, 0x0f26da82, 0x6bc6a17c,
-    0xfeb675e9, 0x2a14470b, 0xbf64939e, 0xdb84e860, 0x4ef43cf5,
-    0x12441f9c, 0x8734cb09, 0xe3d4b0f7, 0x76a46462, 0x5ab4f625,
-    0xcfc422b0, 0xab24594e, 0x3e548ddb, 0x62e4aeb2, 0xf7947a27,
-    0x937401d9, 0x0604d54c, 0xcb552557, 0x5e25f1c2, 0x3ac58a3c,
-    0xafb55ea9, 0xf3057dc0, 0x6675a955, 0x0295d2ab, 0x97e5063e,
-    0xbbf59479, 0x2e8540ec, 0x4a653b12, 0xdf15ef87, 0x83a5ccee,
-    0x16d5187b, 0x72356385, 0xe745b710, 0x67cf0be4, 0xf2bfdf71,
-    0x965fa48f, 0x032f701a, 0x5f9f5373, 0xcaef87e6, 0xae0ffc18,
-    0x3b7f288d, 0x176fbaca, 0x821f6e5f, 0xe6ff15a1, 0x738fc134,
-    0x2f3fe25d, 0xba4f36c8, 0xdeaf4d36, 0x4bdf99a3, 0x868e69b8,
-    0x13febd2d, 0x771ec6d3, 0xe26e1246, 0xbede312f, 0x2baee5ba,
-    0x4f4e9e44, 0xda3e4ad1, 0xf62ed896, 0x635e0c03, 0x07be77fd,
-    0x92cea368, 0xce7e8001, 0x5b0e5494, 0x3fee2f6a, 0xaa9efbff,
-    0x7e3cc91d, 0xeb4c1d88, 0x8fac6676, 0x1adcb2e3, 0x466c918a,
-    0xd31c451f, 0xb7fc3ee1, 0x228cea74, 0x0e9c7833, 0x9becaca6,
-    0xff0cd758, 0x6a7c03cd, 0x36cc20a4, 0xa3bcf431, 0xc75c8fcf,
-    0x522c5b5a, 0x9f7dab41, 0x0a0d7fd4, 0x6eed042a, 0xfb9dd0bf,
-    0xa72df3d6, 0x325d2743, 0x56bd5cbd, 0xc3cd8828, 0xefdd1a6f,
-    0x7aadcefa, 0x1e4db504, 0x8b3d6191, 0xd78d42f8, 0x42fd966d,
-    0x261ded93, 0xb36d3906, 0x54288e16, 0xc1585a83, 0xa5b8217d,
-    0x30c8f5e8, 0x6c78d681, 0xf9080214, 0x9de879ea, 0x0898ad7f,
-    0x24883f38, 0xb1f8ebad, 0xd5189053, 0x406844c6, 0x1cd867af,
-    0x89a8b33a, 0xed48c8c4, 0x78381c51, 0xb569ec4a, 0x201938df,
-    0x44f94321, 0xd18997b4, 0x8d39b4dd, 0x18496048, 0x7ca91bb6,
-    0xe9d9cf23, 0xc5c95d64, 0x50b989f1, 0x3459f20f, 0xa129269a,
-    0xfd9905f3, 0x68e9d166, 0x0c09aa98, 0x99797e0d, 0x4ddb4cef,
-    0xd8ab987a, 0xbc4be384, 0x293b3711, 0x758b1478, 0xe0fbc0ed,
-    0x841bbb13, 0x116b6f86, 0x3d7bfdc1, 0xa80b2954, 0xcceb52aa,
-    0x599b863f, 0x052ba556, 0x905b71c3, 0xf4bb0a3d, 0x61cbdea8,
-    0xac9a2eb3, 0x39eafa26, 0x5d0a81d8, 0xc87a554d, 0x94ca7624,
-    0x01baa2b1, 0x655ad94f, 0xf02a0dda, 0xdc3a9f9d, 0x494a4b08,
-    0x2daa30f6, 0xb8dae463, 0xe46ac70a, 0x711a139f, 0x15fa6861,
-    0x808abcf4},
-   {0x00000000, 0xcf9e17c8, 0x444d29d1, 0x8bd33e19, 0x889a53a2,
-    0x4704446a, 0xccd77a73, 0x03496dbb, 0xca45a105, 0x05dbb6cd,
-    0x8e0888d4, 0x41969f1c, 0x42dff2a7, 0x8d41e56f, 0x0692db76,
-    0xc90cccbe, 0x4ffa444b, 0x80645383, 0x0bb76d9a, 0xc4297a52,
-    0xc76017e9, 0x08fe0021, 0x832d3e38, 0x4cb329f0, 0x85bfe54e,
-    0x4a21f286, 0xc1f2cc9f, 0x0e6cdb57, 0x0d25b6ec, 0xc2bba124,
-    0x49689f3d, 0x86f688f5, 0x9ff48896, 0x506a9f5e, 0xdbb9a147,
-    0x1427b68f, 0x176edb34, 0xd8f0ccfc, 0x5323f2e5, 0x9cbde52d,
-    0x55b12993, 0x9a2f3e5b, 0x11fc0042, 0xde62178a, 0xdd2b7a31,
-    0x12b56df9, 0x996653e0, 0x56f84428, 0xd00eccdd, 0x1f90db15,
-    0x9443e50c, 0x5bddf2c4, 0x58949f7f, 0x970a88b7, 0x1cd9b6ae,
-    0xd347a166, 0x1a4b6dd8, 0xd5d57a10, 0x5e064409, 0x919853c1,
-    0x92d13e7a, 0x5d4f29b2, 0xd69c17ab, 0x19020063, 0xe498176d,
-    0x2b0600a5, 0xa0d53ebc, 0x6f4b2974, 0x6c0244cf, 0xa39c5307,
-    0x284f6d1e, 0xe7d17ad6, 0x2eddb668, 0xe143a1a0, 0x6a909fb9,
-    0xa50e8871, 0xa647e5ca, 0x69d9f202, 0xe20acc1b, 0x2d94dbd3,
-    0xab625326, 0x64fc44ee, 0xef2f7af7, 0x20b16d3f, 0x23f80084,
-    0xec66174c, 0x67b52955, 0xa82b3e9d, 0x6127f223, 0xaeb9e5eb,
-    0x256adbf2, 0xeaf4cc3a, 0xe9bda181, 0x2623b649, 0xadf08850,
-    0x626e9f98, 0x7b6c9ffb, 0xb4f28833, 0x3f21b62a, 0xf0bfa1e2,
-    0xf3f6cc59, 0x3c68db91, 0xb7bbe588, 0x7825f240, 0xb1293efe,
-    0x7eb72936, 0xf564172f, 0x3afa00e7, 0x39b36d5c, 0xf62d7a94,
-    0x7dfe448d, 0xb2605345, 0x3496dbb0, 0xfb08cc78, 0x70dbf261,
-    0xbf45e5a9, 0xbc0c8812, 0x73929fda, 0xf841a1c3, 0x37dfb60b,
-    0xfed37ab5, 0x314d6d7d, 0xba9e5364, 0x750044ac, 0x76492917,
-    0xb9d73edf, 0x320400c6, 0xfd9a170e, 0x1241289b, 0xdddf3f53,
-    0x560c014a, 0x99921682, 0x9adb7b39, 0x55456cf1, 0xde9652e8,
-    0x11084520, 0xd804899e, 0x179a9e56, 0x9c49a04f, 0x53d7b787,
-    0x509eda3c, 0x9f00cdf4, 0x14d3f3ed, 0xdb4de425, 0x5dbb6cd0,
-    0x92257b18, 0x19f64501, 0xd66852c9, 0xd5213f72, 0x1abf28ba,
-    0x916c16a3, 0x5ef2016b, 0x97fecdd5, 0x5860da1d, 0xd3b3e404,
-    0x1c2df3cc, 0x1f649e77, 0xd0fa89bf, 0x5b29b7a6, 0x94b7a06e,
-    0x8db5a00d, 0x422bb7c5, 0xc9f889dc, 0x06669e14, 0x052ff3af,
-    0xcab1e467, 0x4162da7e, 0x8efccdb6, 0x47f00108, 0x886e16c0,
-    0x03bd28d9, 0xcc233f11, 0xcf6a52aa, 0x00f44562, 0x8b277b7b,
-    0x44b96cb3, 0xc24fe446, 0x0dd1f38e, 0x8602cd97, 0x499cda5f,
-    0x4ad5b7e4, 0x854ba02c, 0x0e989e35, 0xc10689fd, 0x080a4543,
-    0xc794528b, 0x4c476c92, 0x83d97b5a, 0x809016e1, 0x4f0e0129,
-    0xc4dd3f30, 0x0b4328f8, 0xf6d93ff6, 0x3947283e, 0xb2941627,
-    0x7d0a01ef, 0x7e436c54, 0xb1dd7b9c, 0x3a0e4585, 0xf590524d,
-    0x3c9c9ef3, 0xf302893b, 0x78d1b722, 0xb74fa0ea, 0xb406cd51,
-    0x7b98da99, 0xf04be480, 0x3fd5f348, 0xb9237bbd, 0x76bd6c75,
-    0xfd6e526c, 0x32f045a4, 0x31b9281f, 0xfe273fd7, 0x75f401ce,
-    0xba6a1606, 0x7366dab8, 0xbcf8cd70, 0x372bf369, 0xf8b5e4a1,
-    0xfbfc891a, 0x34629ed2, 0xbfb1a0cb, 0x702fb703, 0x692db760,
-    0xa6b3a0a8, 0x2d609eb1, 0xe2fe8979, 0xe1b7e4c2, 0x2e29f30a,
-    0xa5facd13, 0x6a64dadb, 0xa3681665, 0x6cf601ad, 0xe7253fb4,
-    0x28bb287c, 0x2bf245c7, 0xe46c520f, 0x6fbf6c16, 0xa0217bde,
-    0x26d7f32b, 0xe949e4e3, 0x629adafa, 0xad04cd32, 0xae4da089,
-    0x61d3b741, 0xea008958, 0x259e9e90, 0xec92522e, 0x230c45e6,
-    0xa8df7bff, 0x67416c37, 0x6408018c, 0xab961644, 0x2045285d,
-    0xefdb3f95},
-   {0x00000000, 0x24825136, 0x4904a26c, 0x6d86f35a, 0x920944d8,
-    0xb68b15ee, 0xdb0de6b4, 0xff8fb782, 0xff638ff1, 0xdbe1dec7,
-    0xb6672d9d, 0x92e57cab, 0x6d6acb29, 0x49e89a1f, 0x246e6945,
-    0x00ec3873, 0x25b619a3, 0x01344895, 0x6cb2bbcf, 0x4830eaf9,
-    0xb7bf5d7b, 0x933d0c4d, 0xfebbff17, 0xda39ae21, 0xdad59652,
-    0xfe57c764, 0x93d1343e, 0xb7536508, 0x48dcd28a, 0x6c5e83bc,
-    0x01d870e6, 0x255a21d0, 0x4b6c3346, 0x6fee6270, 0x0268912a,
-    0x26eac01c, 0xd965779e, 0xfde726a8, 0x9061d5f2, 0xb4e384c4,
-    0xb40fbcb7, 0x908ded81, 0xfd0b1edb, 0xd9894fed, 0x2606f86f,
-    0x0284a959, 0x6f025a03, 0x4b800b35, 0x6eda2ae5, 0x4a587bd3,
-    0x27de8889, 0x035cd9bf, 0xfcd36e3d, 0xd8513f0b, 0xb5d7cc51,
-    0x91559d67, 0x91b9a514, 0xb53bf422, 0xd8bd0778, 0xfc3f564e,
-    0x03b0e1cc, 0x2732b0fa, 0x4ab443a0, 0x6e361296, 0x96d8668c,
-    0xb25a37ba, 0xdfdcc4e0, 0xfb5e95d6, 0x04d12254, 0x20537362,
-    0x4dd58038, 0x6957d10e, 0x69bbe97d, 0x4d39b84b, 0x20bf4b11,
-    0x043d1a27, 0xfbb2ada5, 0xdf30fc93, 0xb2b60fc9, 0x96345eff,
-    0xb36e7f2f, 0x97ec2e19, 0xfa6add43, 0xdee88c75, 0x21673bf7,
-    0x05e56ac1, 0x6863999b, 0x4ce1c8ad, 0x4c0df0de, 0x688fa1e8,
-    0x050952b2, 0x218b0384, 0xde04b406, 0xfa86e530, 0x9700166a,
-    0xb382475c, 0xddb455ca, 0xf93604fc, 0x94b0f7a6, 0xb032a690,
-    0x4fbd1112, 0x6b3f4024, 0x06b9b37e, 0x223be248, 0x22d7da3b,
-    0x06558b0d, 0x6bd37857, 0x4f512961, 0xb0de9ee3, 0x945ccfd5,
-    0xf9da3c8f, 0xdd586db9, 0xf8024c69, 0xdc801d5f, 0xb106ee05,
-    0x9584bf33, 0x6a0b08b1, 0x4e895987, 0x230faadd, 0x078dfbeb,
-    0x0761c398, 0x23e392ae, 0x4e6561f4, 0x6ae730c2, 0x95688740,
-    0xb1ead676, 0xdc6c252c, 0xf8ee741a, 0xf6c1cb59, 0xd2439a6f,
-    0xbfc56935, 0x9b473803, 0x64c88f81, 0x404adeb7, 0x2dcc2ded,
-    0x094e7cdb, 0x09a244a8, 0x2d20159e, 0x40a6e6c4, 0x6424b7f2,
-    0x9bab0070, 0xbf295146, 0xd2afa21c, 0xf62df32a, 0xd377d2fa,
-    0xf7f583cc, 0x9a737096, 0xbef121a0, 0x417e9622, 0x65fcc714,
-    0x087a344e, 0x2cf86578, 0x2c145d0b, 0x08960c3d, 0x6510ff67,
-    0x4192ae51, 0xbe1d19d3, 0x9a9f48e5, 0xf719bbbf, 0xd39bea89,
-    0xbdadf81f, 0x992fa929, 0xf4a95a73, 0xd02b0b45, 0x2fa4bcc7,
-    0x0b26edf1, 0x66a01eab, 0x42224f9d, 0x42ce77ee, 0x664c26d8,
-    0x0bcad582, 0x2f4884b4, 0xd0c73336, 0xf4456200, 0x99c3915a,
-    0xbd41c06c, 0x981be1bc, 0xbc99b08a, 0xd11f43d0, 0xf59d12e6,
-    0x0a12a564, 0x2e90f452, 0x43160708, 0x6794563e, 0x67786e4d,
-    0x43fa3f7b, 0x2e7ccc21, 0x0afe9d17, 0xf5712a95, 0xd1f37ba3,
-    0xbc7588f9, 0x98f7d9cf, 0x6019add5, 0x449bfce3, 0x291d0fb9,
-    0x0d9f5e8f, 0xf210e90d, 0xd692b83b, 0xbb144b61, 0x9f961a57,
-    0x9f7a2224, 0xbbf87312, 0xd67e8048, 0xf2fcd17e, 0x0d7366fc,
-    0x29f137ca, 0x4477c490, 0x60f595a6, 0x45afb476, 0x612de540,
-    0x0cab161a, 0x2829472c, 0xd7a6f0ae, 0xf324a198, 0x9ea252c2,
-    0xba2003f4, 0xbacc3b87, 0x9e4e6ab1, 0xf3c899eb, 0xd74ac8dd,
-    0x28c57f5f, 0x0c472e69, 0x61c1dd33, 0x45438c05, 0x2b759e93,
-    0x0ff7cfa5, 0x62713cff, 0x46f36dc9, 0xb97cda4b, 0x9dfe8b7d,
-    0xf0787827, 0xd4fa2911, 0xd4161162, 0xf0944054, 0x9d12b30e,
-    0xb990e238, 0x461f55ba, 0x629d048c, 0x0f1bf7d6, 0x2b99a6e0,
-    0x0ec38730, 0x2a41d606, 0x47c7255c, 0x6345746a, 0x9ccac3e8,
-    0xb84892de, 0xd5ce6184, 0xf14c30b2, 0xf1a008c1, 0xd52259f7,
-    0xb8a4aaad, 0x9c26fb9b, 0x63a94c19, 0x472b1d2f, 0x2aadee75,
-    0x0e2fbf43},
-   {0x00000000, 0x36f290f3, 0x6de521e6, 0x5b17b115, 0xdbca43cc,
-    0xed38d33f, 0xb62f622a, 0x80ddf2d9, 0x6ce581d9, 0x5a17112a,
-    0x0100a03f, 0x37f230cc, 0xb72fc215, 0x81dd52e6, 0xdacae3f3,
-    0xec387300, 0xd9cb03b2, 0xef399341, 0xb42e2254, 0x82dcb2a7,
-    0x0201407e, 0x34f3d08d, 0x6fe46198, 0x5916f16b, 0xb52e826b,
-    0x83dc1298, 0xd8cba38d, 0xee39337e, 0x6ee4c1a7, 0x58165154,
-    0x0301e041, 0x35f370b2, 0x68e70125, 0x5e1591d6, 0x050220c3,
-    0x33f0b030, 0xb32d42e9, 0x85dfd21a, 0xdec8630f, 0xe83af3fc,
-    0x040280fc, 0x32f0100f, 0x69e7a11a, 0x5f1531e9, 0xdfc8c330,
-    0xe93a53c3, 0xb22de2d6, 0x84df7225, 0xb12c0297, 0x87de9264,
-    0xdcc92371, 0xea3bb382, 0x6ae6415b, 0x5c14d1a8, 0x070360bd,
-    0x31f1f04e, 0xddc9834e, 0xeb3b13bd, 0xb02ca2a8, 0x86de325b,
-    0x0603c082, 0x30f15071, 0x6be6e164, 0x5d147197, 0xd1ce024a,
-    0xe73c92b9, 0xbc2b23ac, 0x8ad9b35f, 0x0a044186, 0x3cf6d175,
-    0x67e16060, 0x5113f093, 0xbd2b8393, 0x8bd91360, 0xd0cea275,
-    0xe63c3286, 0x66e1c05f, 0x501350ac, 0x0b04e1b9, 0x3df6714a,
-    0x080501f8, 0x3ef7910b, 0x65e0201e, 0x5312b0ed, 0xd3cf4234,
-    0xe53dd2c7, 0xbe2a63d2, 0x88d8f321, 0x64e08021, 0x521210d2,
-    0x0905a1c7, 0x3ff73134, 0xbf2ac3ed, 0x89d8531e, 0xd2cfe20b,
-    0xe43d72f8, 0xb929036f, 0x8fdb939c, 0xd4cc2289, 0xe23eb27a,
-    0x62e340a3, 0x5411d050, 0x0f066145, 0x39f4f1b6, 0xd5cc82b6,
-    0xe33e1245, 0xb829a350, 0x8edb33a3, 0x0e06c17a, 0x38f45189,
-    0x63e3e09c, 0x5511706f, 0x60e200dd, 0x5610902e, 0x0d07213b,
-    0x3bf5b1c8, 0xbb284311, 0x8ddad3e2, 0xd6cd62f7, 0xe03ff204,
-    0x0c078104, 0x3af511f7, 0x61e2a0e2, 0x57103011, 0xd7cdc2c8,
-    0xe13f523b, 0xba28e32e, 0x8cda73dd, 0x78ed02d5, 0x4e1f9226,
-    0x15082333, 0x23fab3c0, 0xa3274119, 0x95d5d1ea, 0xcec260ff,
-    0xf830f00c, 0x1408830c, 0x22fa13ff, 0x79eda2ea, 0x4f1f3219,
-    0xcfc2c0c0, 0xf9305033, 0xa227e126, 0x94d571d5, 0xa1260167,
-    0x97d49194, 0xccc32081, 0xfa31b072, 0x7aec42ab, 0x4c1ed258,
-    0x1709634d, 0x21fbf3be, 0xcdc380be, 0xfb31104d, 0xa026a158,
-    0x96d431ab, 0x1609c372, 0x20fb5381, 0x7bece294, 0x4d1e7267,
-    0x100a03f0, 0x26f89303, 0x7def2216, 0x4b1db2e5, 0xcbc0403c,
-    0xfd32d0cf, 0xa62561da, 0x90d7f129, 0x7cef8229, 0x4a1d12da,
-    0x110aa3cf, 0x27f8333c, 0xa725c1e5, 0x91d75116, 0xcac0e003,
-    0xfc3270f0, 0xc9c10042, 0xff3390b1, 0xa42421a4, 0x92d6b157,
-    0x120b438e, 0x24f9d37d, 0x7fee6268, 0x491cf29b, 0xa524819b,
-    0x93d61168, 0xc8c1a07d, 0xfe33308e, 0x7eeec257, 0x481c52a4,
-    0x130be3b1, 0x25f97342, 0xa923009f, 0x9fd1906c, 0xc4c62179,
-    0xf234b18a, 0x72e94353, 0x441bd3a0, 0x1f0c62b5, 0x29fef246,
-    0xc5c68146, 0xf33411b5, 0xa823a0a0, 0x9ed13053, 0x1e0cc28a,
-    0x28fe5279, 0x73e9e36c, 0x451b739f, 0x70e8032d, 0x461a93de,
-    0x1d0d22cb, 0x2bffb238, 0xab2240e1, 0x9dd0d012, 0xc6c76107,
-    0xf035f1f4, 0x1c0d82f4, 0x2aff1207, 0x71e8a312, 0x471a33e1,
-    0xc7c7c138, 0xf13551cb, 0xaa22e0de, 0x9cd0702d, 0xc1c401ba,
-    0xf7369149, 0xac21205c, 0x9ad3b0af, 0x1a0e4276, 0x2cfcd285,
-    0x77eb6390, 0x4119f363, 0xad218063, 0x9bd31090, 0xc0c4a185,
-    0xf6363176, 0x76ebc3af, 0x4019535c, 0x1b0ee249, 0x2dfc72ba,
-    0x180f0208, 0x2efd92fb, 0x75ea23ee, 0x4318b31d, 0xc3c541c4,
-    0xf537d137, 0xae206022, 0x98d2f0d1, 0x74ea83d1, 0x42181322,
-    0x190fa237, 0x2ffd32c4, 0xaf20c01d, 0x99d250ee, 0xc2c5e1fb,
-    0xf4377108}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0xf390f23600000000, 0xe621e56d00000000,
-    0x15b1175b00000000, 0xcc43cadb00000000, 0x3fd338ed00000000,
-    0x2a622fb600000000, 0xd9f2dd8000000000, 0xd981e56c00000000,
-    0x2a11175a00000000, 0x3fa0000100000000, 0xcc30f23700000000,
-    0x15c22fb700000000, 0xe652dd8100000000, 0xf3e3cada00000000,
-    0x007338ec00000000, 0xb203cbd900000000, 0x419339ef00000000,
-    0x54222eb400000000, 0xa7b2dc8200000000, 0x7e40010200000000,
-    0x8dd0f33400000000, 0x9861e46f00000000, 0x6bf1165900000000,
-    0x6b822eb500000000, 0x9812dc8300000000, 0x8da3cbd800000000,
-    0x7e3339ee00000000, 0xa7c1e46e00000000, 0x5451165800000000,
-    0x41e0010300000000, 0xb270f33500000000, 0x2501e76800000000,
-    0xd691155e00000000, 0xc320020500000000, 0x30b0f03300000000,
-    0xe9422db300000000, 0x1ad2df8500000000, 0x0f63c8de00000000,
-    0xfcf33ae800000000, 0xfc80020400000000, 0x0f10f03200000000,
-    0x1aa1e76900000000, 0xe931155f00000000, 0x30c3c8df00000000,
-    0xc3533ae900000000, 0xd6e22db200000000, 0x2572df8400000000,
-    0x97022cb100000000, 0x6492de8700000000, 0x7123c9dc00000000,
-    0x82b33bea00000000, 0x5b41e66a00000000, 0xa8d1145c00000000,
-    0xbd60030700000000, 0x4ef0f13100000000, 0x4e83c9dd00000000,
-    0xbd133beb00000000, 0xa8a22cb000000000, 0x5b32de8600000000,
-    0x82c0030600000000, 0x7150f13000000000, 0x64e1e66b00000000,
-    0x9771145d00000000, 0x4a02ced100000000, 0xb9923ce700000000,
-    0xac232bbc00000000, 0x5fb3d98a00000000, 0x8641040a00000000,
-    0x75d1f63c00000000, 0x6060e16700000000, 0x93f0135100000000,
-    0x93832bbd00000000, 0x6013d98b00000000, 0x75a2ced000000000,
-    0x86323ce600000000, 0x5fc0e16600000000, 0xac50135000000000,
-    0xb9e1040b00000000, 0x4a71f63d00000000, 0xf801050800000000,
-    0x0b91f73e00000000, 0x1e20e06500000000, 0xedb0125300000000,
-    0x3442cfd300000000, 0xc7d23de500000000, 0xd2632abe00000000,
-    0x21f3d88800000000, 0x2180e06400000000, 0xd210125200000000,
-    0xc7a1050900000000, 0x3431f73f00000000, 0xedc32abf00000000,
-    0x1e53d88900000000, 0x0be2cfd200000000, 0xf8723de400000000,
-    0x6f0329b900000000, 0x9c93db8f00000000, 0x8922ccd400000000,
-    0x7ab23ee200000000, 0xa340e36200000000, 0x50d0115400000000,
-    0x4561060f00000000, 0xb6f1f43900000000, 0xb682ccd500000000,
-    0x45123ee300000000, 0x50a329b800000000, 0xa333db8e00000000,
-    0x7ac1060e00000000, 0x8951f43800000000, 0x9ce0e36300000000,
-    0x6f70115500000000, 0xdd00e26000000000, 0x2e90105600000000,
-    0x3b21070d00000000, 0xc8b1f53b00000000, 0x114328bb00000000,
-    0xe2d3da8d00000000, 0xf762cdd600000000, 0x04f23fe000000000,
-    0x0481070c00000000, 0xf711f53a00000000, 0xe2a0e26100000000,
-    0x1130105700000000, 0xc8c2cdd700000000, 0x3b523fe100000000,
-    0x2ee328ba00000000, 0xdd73da8c00000000, 0xd502ed7800000000,
-    0x26921f4e00000000, 0x3323081500000000, 0xc0b3fa2300000000,
-    0x194127a300000000, 0xead1d59500000000, 0xff60c2ce00000000,
-    0x0cf030f800000000, 0x0c83081400000000, 0xff13fa2200000000,
-    0xeaa2ed7900000000, 0x19321f4f00000000, 0xc0c0c2cf00000000,
-    0x335030f900000000, 0x26e127a200000000, 0xd571d59400000000,
-    0x670126a100000000, 0x9491d49700000000, 0x8120c3cc00000000,
-    0x72b031fa00000000, 0xab42ec7a00000000, 0x58d21e4c00000000,
-    0x4d63091700000000, 0xbef3fb2100000000, 0xbe80c3cd00000000,
-    0x4d1031fb00000000, 0x58a126a000000000, 0xab31d49600000000,
-    0x72c3091600000000, 0x8153fb2000000000, 0x94e2ec7b00000000,
-    0x67721e4d00000000, 0xf0030a1000000000, 0x0393f82600000000,
-    0x1622ef7d00000000, 0xe5b21d4b00000000, 0x3c40c0cb00000000,
-    0xcfd032fd00000000, 0xda6125a600000000, 0x29f1d79000000000,
-    0x2982ef7c00000000, 0xda121d4a00000000, 0xcfa30a1100000000,
-    0x3c33f82700000000, 0xe5c125a700000000, 0x1651d79100000000,
-    0x03e0c0ca00000000, 0xf07032fc00000000, 0x4200c1c900000000,
-    0xb19033ff00000000, 0xa42124a400000000, 0x57b1d69200000000,
-    0x8e430b1200000000, 0x7dd3f92400000000, 0x6862ee7f00000000,
-    0x9bf21c4900000000, 0x9b8124a500000000, 0x6811d69300000000,
-    0x7da0c1c800000000, 0x8e3033fe00000000, 0x57c2ee7e00000000,
-    0xa4521c4800000000, 0xb1e30b1300000000, 0x4273f92500000000,
-    0x9f0023a900000000, 0x6c90d19f00000000, 0x7921c6c400000000,
-    0x8ab134f200000000, 0x5343e97200000000, 0xa0d31b4400000000,
-    0xb5620c1f00000000, 0x46f2fe2900000000, 0x4681c6c500000000,
-    0xb51134f300000000, 0xa0a023a800000000, 0x5330d19e00000000,
-    0x8ac20c1e00000000, 0x7952fe2800000000, 0x6ce3e97300000000,
-    0x9f731b4500000000, 0x2d03e87000000000, 0xde931a4600000000,
-    0xcb220d1d00000000, 0x38b2ff2b00000000, 0xe14022ab00000000,
-    0x12d0d09d00000000, 0x0761c7c600000000, 0xf4f135f000000000,
-    0xf4820d1c00000000, 0x0712ff2a00000000, 0x12a3e87100000000,
-    0xe1331a4700000000, 0x38c1c7c700000000, 0xcb5135f100000000,
-    0xdee022aa00000000, 0x2d70d09c00000000, 0xba01c4c100000000,
-    0x499136f700000000, 0x5c2021ac00000000, 0xafb0d39a00000000,
-    0x76420e1a00000000, 0x85d2fc2c00000000, 0x9063eb7700000000,
-    0x63f3194100000000, 0x638021ad00000000, 0x9010d39b00000000,
-    0x85a1c4c000000000, 0x763136f600000000, 0xafc3eb7600000000,
-    0x5c53194000000000, 0x49e20e1b00000000, 0xba72fc2d00000000,
-    0x08020f1800000000, 0xfb92fd2e00000000, 0xee23ea7500000000,
-    0x1db3184300000000, 0xc441c5c300000000, 0x37d137f500000000,
-    0x226020ae00000000, 0xd1f0d29800000000, 0xd183ea7400000000,
-    0x2213184200000000, 0x37a20f1900000000, 0xc432fd2f00000000,
-    0x1dc020af00000000, 0xee50d29900000000, 0xfbe1c5c200000000,
-    0x087137f400000000},
-   {0x0000000000000000, 0x3651822400000000, 0x6ca2044900000000,
-    0x5af3866d00000000, 0xd844099200000000, 0xee158bb600000000,
-    0xb4e60ddb00000000, 0x82b78fff00000000, 0xf18f63ff00000000,
-    0xc7dee1db00000000, 0x9d2d67b600000000, 0xab7ce59200000000,
-    0x29cb6a6d00000000, 0x1f9ae84900000000, 0x45696e2400000000,
-    0x7338ec0000000000, 0xa319b62500000000, 0x9548340100000000,
-    0xcfbbb26c00000000, 0xf9ea304800000000, 0x7b5dbfb700000000,
-    0x4d0c3d9300000000, 0x17ffbbfe00000000, 0x21ae39da00000000,
-    0x5296d5da00000000, 0x64c757fe00000000, 0x3e34d19300000000,
-    0x086553b700000000, 0x8ad2dc4800000000, 0xbc835e6c00000000,
-    0xe670d80100000000, 0xd0215a2500000000, 0x46336c4b00000000,
-    0x7062ee6f00000000, 0x2a91680200000000, 0x1cc0ea2600000000,
-    0x9e7765d900000000, 0xa826e7fd00000000, 0xf2d5619000000000,
-    0xc484e3b400000000, 0xb7bc0fb400000000, 0x81ed8d9000000000,
-    0xdb1e0bfd00000000, 0xed4f89d900000000, 0x6ff8062600000000,
-    0x59a9840200000000, 0x035a026f00000000, 0x350b804b00000000,
-    0xe52ada6e00000000, 0xd37b584a00000000, 0x8988de2700000000,
-    0xbfd95c0300000000, 0x3d6ed3fc00000000, 0x0b3f51d800000000,
-    0x51ccd7b500000000, 0x679d559100000000, 0x14a5b99100000000,
-    0x22f43bb500000000, 0x7807bdd800000000, 0x4e563ffc00000000,
-    0xcce1b00300000000, 0xfab0322700000000, 0xa043b44a00000000,
-    0x9612366e00000000, 0x8c66d89600000000, 0xba375ab200000000,
-    0xe0c4dcdf00000000, 0xd6955efb00000000, 0x5422d10400000000,
-    0x6273532000000000, 0x3880d54d00000000, 0x0ed1576900000000,
-    0x7de9bb6900000000, 0x4bb8394d00000000, 0x114bbf2000000000,
-    0x271a3d0400000000, 0xa5adb2fb00000000, 0x93fc30df00000000,
-    0xc90fb6b200000000, 0xff5e349600000000, 0x2f7f6eb300000000,
-    0x192eec9700000000, 0x43dd6afa00000000, 0x758ce8de00000000,
-    0xf73b672100000000, 0xc16ae50500000000, 0x9b99636800000000,
-    0xadc8e14c00000000, 0xdef00d4c00000000, 0xe8a18f6800000000,
-    0xb252090500000000, 0x84038b2100000000, 0x06b404de00000000,
-    0x30e586fa00000000, 0x6a16009700000000, 0x5c4782b300000000,
-    0xca55b4dd00000000, 0xfc0436f900000000, 0xa6f7b09400000000,
-    0x90a632b000000000, 0x1211bd4f00000000, 0x24403f6b00000000,
-    0x7eb3b90600000000, 0x48e23b2200000000, 0x3bdad72200000000,
-    0x0d8b550600000000, 0x5778d36b00000000, 0x6129514f00000000,
-    0xe39edeb000000000, 0xd5cf5c9400000000, 0x8f3cdaf900000000,
-    0xb96d58dd00000000, 0x694c02f800000000, 0x5f1d80dc00000000,
-    0x05ee06b100000000, 0x33bf849500000000, 0xb1080b6a00000000,
-    0x8759894e00000000, 0xddaa0f2300000000, 0xebfb8d0700000000,
-    0x98c3610700000000, 0xae92e32300000000, 0xf461654e00000000,
-    0xc230e76a00000000, 0x4087689500000000, 0x76d6eab100000000,
-    0x2c256cdc00000000, 0x1a74eef800000000, 0x59cbc1f600000000,
-    0x6f9a43d200000000, 0x3569c5bf00000000, 0x0338479b00000000,
-    0x818fc86400000000, 0xb7de4a4000000000, 0xed2dcc2d00000000,
-    0xdb7c4e0900000000, 0xa844a20900000000, 0x9e15202d00000000,
-    0xc4e6a64000000000, 0xf2b7246400000000, 0x7000ab9b00000000,
-    0x465129bf00000000, 0x1ca2afd200000000, 0x2af32df600000000,
-    0xfad277d300000000, 0xcc83f5f700000000, 0x9670739a00000000,
-    0xa021f1be00000000, 0x22967e4100000000, 0x14c7fc6500000000,
-    0x4e347a0800000000, 0x7865f82c00000000, 0x0b5d142c00000000,
-    0x3d0c960800000000, 0x67ff106500000000, 0x51ae924100000000,
-    0xd3191dbe00000000, 0xe5489f9a00000000, 0xbfbb19f700000000,
-    0x89ea9bd300000000, 0x1ff8adbd00000000, 0x29a92f9900000000,
-    0x735aa9f400000000, 0x450b2bd000000000, 0xc7bca42f00000000,
-    0xf1ed260b00000000, 0xab1ea06600000000, 0x9d4f224200000000,
-    0xee77ce4200000000, 0xd8264c6600000000, 0x82d5ca0b00000000,
-    0xb484482f00000000, 0x3633c7d000000000, 0x006245f400000000,
-    0x5a91c39900000000, 0x6cc041bd00000000, 0xbce11b9800000000,
-    0x8ab099bc00000000, 0xd0431fd100000000, 0xe6129df500000000,
-    0x64a5120a00000000, 0x52f4902e00000000, 0x0807164300000000,
-    0x3e56946700000000, 0x4d6e786700000000, 0x7b3ffa4300000000,
-    0x21cc7c2e00000000, 0x179dfe0a00000000, 0x952a71f500000000,
-    0xa37bf3d100000000, 0xf98875bc00000000, 0xcfd9f79800000000,
-    0xd5ad196000000000, 0xe3fc9b4400000000, 0xb90f1d2900000000,
-    0x8f5e9f0d00000000, 0x0de910f200000000, 0x3bb892d600000000,
-    0x614b14bb00000000, 0x571a969f00000000, 0x24227a9f00000000,
-    0x1273f8bb00000000, 0x48807ed600000000, 0x7ed1fcf200000000,
-    0xfc66730d00000000, 0xca37f12900000000, 0x90c4774400000000,
-    0xa695f56000000000, 0x76b4af4500000000, 0x40e52d6100000000,
-    0x1a16ab0c00000000, 0x2c47292800000000, 0xaef0a6d700000000,
-    0x98a124f300000000, 0xc252a29e00000000, 0xf40320ba00000000,
-    0x873bccba00000000, 0xb16a4e9e00000000, 0xeb99c8f300000000,
-    0xddc84ad700000000, 0x5f7fc52800000000, 0x692e470c00000000,
-    0x33ddc16100000000, 0x058c434500000000, 0x939e752b00000000,
-    0xa5cff70f00000000, 0xff3c716200000000, 0xc96df34600000000,
-    0x4bda7cb900000000, 0x7d8bfe9d00000000, 0x277878f000000000,
-    0x1129fad400000000, 0x621116d400000000, 0x544094f000000000,
-    0x0eb3129d00000000, 0x38e290b900000000, 0xba551f4600000000,
-    0x8c049d6200000000, 0xd6f71b0f00000000, 0xe0a6992b00000000,
-    0x3087c30e00000000, 0x06d6412a00000000, 0x5c25c74700000000,
-    0x6a74456300000000, 0xe8c3ca9c00000000, 0xde9248b800000000,
-    0x8461ced500000000, 0xb2304cf100000000, 0xc108a0f100000000,
-    0xf75922d500000000, 0xadaaa4b800000000, 0x9bfb269c00000000,
-    0x194ca96300000000, 0x2f1d2b4700000000, 0x75eead2a00000000,
-    0x43bf2f0e00000000},
-   {0x0000000000000000, 0xc8179ecf00000000, 0xd1294d4400000000,
-    0x193ed38b00000000, 0xa2539a8800000000, 0x6a44044700000000,
-    0x737ad7cc00000000, 0xbb6d490300000000, 0x05a145ca00000000,
-    0xcdb6db0500000000, 0xd488088e00000000, 0x1c9f964100000000,
-    0xa7f2df4200000000, 0x6fe5418d00000000, 0x76db920600000000,
-    0xbecc0cc900000000, 0x4b44fa4f00000000, 0x8353648000000000,
-    0x9a6db70b00000000, 0x527a29c400000000, 0xe91760c700000000,
-    0x2100fe0800000000, 0x383e2d8300000000, 0xf029b34c00000000,
-    0x4ee5bf8500000000, 0x86f2214a00000000, 0x9fccf2c100000000,
-    0x57db6c0e00000000, 0xecb6250d00000000, 0x24a1bbc200000000,
-    0x3d9f684900000000, 0xf588f68600000000, 0x9688f49f00000000,
-    0x5e9f6a5000000000, 0x47a1b9db00000000, 0x8fb6271400000000,
-    0x34db6e1700000000, 0xfcccf0d800000000, 0xe5f2235300000000,
-    0x2de5bd9c00000000, 0x9329b15500000000, 0x5b3e2f9a00000000,
-    0x4200fc1100000000, 0x8a1762de00000000, 0x317a2bdd00000000,
-    0xf96db51200000000, 0xe053669900000000, 0x2844f85600000000,
-    0xddcc0ed000000000, 0x15db901f00000000, 0x0ce5439400000000,
-    0xc4f2dd5b00000000, 0x7f9f945800000000, 0xb7880a9700000000,
-    0xaeb6d91c00000000, 0x66a147d300000000, 0xd86d4b1a00000000,
-    0x107ad5d500000000, 0x0944065e00000000, 0xc153989100000000,
-    0x7a3ed19200000000, 0xb2294f5d00000000, 0xab179cd600000000,
-    0x6300021900000000, 0x6d1798e400000000, 0xa500062b00000000,
-    0xbc3ed5a000000000, 0x74294b6f00000000, 0xcf44026c00000000,
-    0x07539ca300000000, 0x1e6d4f2800000000, 0xd67ad1e700000000,
-    0x68b6dd2e00000000, 0xa0a143e100000000, 0xb99f906a00000000,
-    0x71880ea500000000, 0xcae547a600000000, 0x02f2d96900000000,
-    0x1bcc0ae200000000, 0xd3db942d00000000, 0x265362ab00000000,
-    0xee44fc6400000000, 0xf77a2fef00000000, 0x3f6db12000000000,
-    0x8400f82300000000, 0x4c1766ec00000000, 0x5529b56700000000,
-    0x9d3e2ba800000000, 0x23f2276100000000, 0xebe5b9ae00000000,
-    0xf2db6a2500000000, 0x3accf4ea00000000, 0x81a1bde900000000,
-    0x49b6232600000000, 0x5088f0ad00000000, 0x989f6e6200000000,
-    0xfb9f6c7b00000000, 0x3388f2b400000000, 0x2ab6213f00000000,
-    0xe2a1bff000000000, 0x59ccf6f300000000, 0x91db683c00000000,
-    0x88e5bbb700000000, 0x40f2257800000000, 0xfe3e29b100000000,
-    0x3629b77e00000000, 0x2f1764f500000000, 0xe700fa3a00000000,
-    0x5c6db33900000000, 0x947a2df600000000, 0x8d44fe7d00000000,
-    0x455360b200000000, 0xb0db963400000000, 0x78cc08fb00000000,
-    0x61f2db7000000000, 0xa9e545bf00000000, 0x12880cbc00000000,
-    0xda9f927300000000, 0xc3a141f800000000, 0x0bb6df3700000000,
-    0xb57ad3fe00000000, 0x7d6d4d3100000000, 0x64539eba00000000,
-    0xac44007500000000, 0x1729497600000000, 0xdf3ed7b900000000,
-    0xc600043200000000, 0x0e179afd00000000, 0x9b28411200000000,
-    0x533fdfdd00000000, 0x4a010c5600000000, 0x8216929900000000,
-    0x397bdb9a00000000, 0xf16c455500000000, 0xe85296de00000000,
-    0x2045081100000000, 0x9e8904d800000000, 0x569e9a1700000000,
-    0x4fa0499c00000000, 0x87b7d75300000000, 0x3cda9e5000000000,
-    0xf4cd009f00000000, 0xedf3d31400000000, 0x25e44ddb00000000,
-    0xd06cbb5d00000000, 0x187b259200000000, 0x0145f61900000000,
-    0xc95268d600000000, 0x723f21d500000000, 0xba28bf1a00000000,
-    0xa3166c9100000000, 0x6b01f25e00000000, 0xd5cdfe9700000000,
-    0x1dda605800000000, 0x04e4b3d300000000, 0xccf32d1c00000000,
-    0x779e641f00000000, 0xbf89fad000000000, 0xa6b7295b00000000,
-    0x6ea0b79400000000, 0x0da0b58d00000000, 0xc5b72b4200000000,
-    0xdc89f8c900000000, 0x149e660600000000, 0xaff32f0500000000,
-    0x67e4b1ca00000000, 0x7eda624100000000, 0xb6cdfc8e00000000,
-    0x0801f04700000000, 0xc0166e8800000000, 0xd928bd0300000000,
-    0x113f23cc00000000, 0xaa526acf00000000, 0x6245f40000000000,
-    0x7b7b278b00000000, 0xb36cb94400000000, 0x46e44fc200000000,
-    0x8ef3d10d00000000, 0x97cd028600000000, 0x5fda9c4900000000,
-    0xe4b7d54a00000000, 0x2ca04b8500000000, 0x359e980e00000000,
-    0xfd8906c100000000, 0x43450a0800000000, 0x8b5294c700000000,
-    0x926c474c00000000, 0x5a7bd98300000000, 0xe116908000000000,
-    0x29010e4f00000000, 0x303fddc400000000, 0xf828430b00000000,
-    0xf63fd9f600000000, 0x3e28473900000000, 0x271694b200000000,
-    0xef010a7d00000000, 0x546c437e00000000, 0x9c7bddb100000000,
-    0x85450e3a00000000, 0x4d5290f500000000, 0xf39e9c3c00000000,
-    0x3b8902f300000000, 0x22b7d17800000000, 0xeaa04fb700000000,
-    0x51cd06b400000000, 0x99da987b00000000, 0x80e44bf000000000,
-    0x48f3d53f00000000, 0xbd7b23b900000000, 0x756cbd7600000000,
-    0x6c526efd00000000, 0xa445f03200000000, 0x1f28b93100000000,
-    0xd73f27fe00000000, 0xce01f47500000000, 0x06166aba00000000,
-    0xb8da667300000000, 0x70cdf8bc00000000, 0x69f32b3700000000,
-    0xa1e4b5f800000000, 0x1a89fcfb00000000, 0xd29e623400000000,
-    0xcba0b1bf00000000, 0x03b72f7000000000, 0x60b72d6900000000,
-    0xa8a0b3a600000000, 0xb19e602d00000000, 0x7989fee200000000,
-    0xc2e4b7e100000000, 0x0af3292e00000000, 0x13cdfaa500000000,
-    0xdbda646a00000000, 0x651668a300000000, 0xad01f66c00000000,
-    0xb43f25e700000000, 0x7c28bb2800000000, 0xc745f22b00000000,
-    0x0f526ce400000000, 0x166cbf6f00000000, 0xde7b21a000000000,
-    0x2bf3d72600000000, 0xe3e449e900000000, 0xfada9a6200000000,
-    0x32cd04ad00000000, 0x89a04dae00000000, 0x41b7d36100000000,
-    0x588900ea00000000, 0x909e9e2500000000, 0x2e5292ec00000000,
-    0xe6450c2300000000, 0xff7bdfa800000000, 0x376c416700000000,
-    0x8c01086400000000, 0x441696ab00000000, 0x5d28452000000000,
-    0x953fdbef00000000},
-   {0x0000000000000000, 0x95d4709500000000, 0x6baf90f100000000,
-    0xfe7be06400000000, 0x9758503800000000, 0x028c20ad00000000,
-    0xfcf7c0c900000000, 0x6923b05c00000000, 0x2eb1a07000000000,
-    0xbb65d0e500000000, 0x451e308100000000, 0xd0ca401400000000,
-    0xb9e9f04800000000, 0x2c3d80dd00000000, 0xd24660b900000000,
-    0x4792102c00000000, 0x5c6241e100000000, 0xc9b6317400000000,
-    0x37cdd11000000000, 0xa219a18500000000, 0xcb3a11d900000000,
-    0x5eee614c00000000, 0xa095812800000000, 0x3541f1bd00000000,
-    0x72d3e19100000000, 0xe707910400000000, 0x197c716000000000,
-    0x8ca801f500000000, 0xe58bb1a900000000, 0x705fc13c00000000,
-    0x8e24215800000000, 0x1bf051cd00000000, 0xf9c2f31900000000,
-    0x6c16838c00000000, 0x926d63e800000000, 0x07b9137d00000000,
-    0x6e9aa32100000000, 0xfb4ed3b400000000, 0x053533d000000000,
-    0x90e1434500000000, 0xd773536900000000, 0x42a723fc00000000,
-    0xbcdcc39800000000, 0x2908b30d00000000, 0x402b035100000000,
-    0xd5ff73c400000000, 0x2b8493a000000000, 0xbe50e33500000000,
-    0xa5a0b2f800000000, 0x3074c26d00000000, 0xce0f220900000000,
-    0x5bdb529c00000000, 0x32f8e2c000000000, 0xa72c925500000000,
-    0x5957723100000000, 0xcc8302a400000000, 0x8b11128800000000,
-    0x1ec5621d00000000, 0xe0be827900000000, 0x756af2ec00000000,
-    0x1c4942b000000000, 0x899d322500000000, 0x77e6d24100000000,
-    0xe232a2d400000000, 0xf285e73300000000, 0x675197a600000000,
-    0x992a77c200000000, 0x0cfe075700000000, 0x65ddb70b00000000,
-    0xf009c79e00000000, 0x0e7227fa00000000, 0x9ba6576f00000000,
-    0xdc34474300000000, 0x49e037d600000000, 0xb79bd7b200000000,
-    0x224fa72700000000, 0x4b6c177b00000000, 0xdeb867ee00000000,
-    0x20c3878a00000000, 0xb517f71f00000000, 0xaee7a6d200000000,
-    0x3b33d64700000000, 0xc548362300000000, 0x509c46b600000000,
-    0x39bff6ea00000000, 0xac6b867f00000000, 0x5210661b00000000,
-    0xc7c4168e00000000, 0x805606a200000000, 0x1582763700000000,
-    0xebf9965300000000, 0x7e2de6c600000000, 0x170e569a00000000,
-    0x82da260f00000000, 0x7ca1c66b00000000, 0xe975b6fe00000000,
-    0x0b47142a00000000, 0x9e9364bf00000000, 0x60e884db00000000,
-    0xf53cf44e00000000, 0x9c1f441200000000, 0x09cb348700000000,
-    0xf7b0d4e300000000, 0x6264a47600000000, 0x25f6b45a00000000,
-    0xb022c4cf00000000, 0x4e5924ab00000000, 0xdb8d543e00000000,
-    0xb2aee46200000000, 0x277a94f700000000, 0xd901749300000000,
-    0x4cd5040600000000, 0x572555cb00000000, 0xc2f1255e00000000,
-    0x3c8ac53a00000000, 0xa95eb5af00000000, 0xc07d05f300000000,
-    0x55a9756600000000, 0xabd2950200000000, 0x3e06e59700000000,
-    0x7994f5bb00000000, 0xec40852e00000000, 0x123b654a00000000,
-    0x87ef15df00000000, 0xeecca58300000000, 0x7b18d51600000000,
-    0x8563357200000000, 0x10b745e700000000, 0xe40bcf6700000000,
-    0x71dfbff200000000, 0x8fa45f9600000000, 0x1a702f0300000000,
-    0x73539f5f00000000, 0xe687efca00000000, 0x18fc0fae00000000,
-    0x8d287f3b00000000, 0xcaba6f1700000000, 0x5f6e1f8200000000,
-    0xa115ffe600000000, 0x34c18f7300000000, 0x5de23f2f00000000,
-    0xc8364fba00000000, 0x364dafde00000000, 0xa399df4b00000000,
-    0xb8698e8600000000, 0x2dbdfe1300000000, 0xd3c61e7700000000,
-    0x46126ee200000000, 0x2f31debe00000000, 0xbae5ae2b00000000,
-    0x449e4e4f00000000, 0xd14a3eda00000000, 0x96d82ef600000000,
-    0x030c5e6300000000, 0xfd77be0700000000, 0x68a3ce9200000000,
-    0x01807ece00000000, 0x94540e5b00000000, 0x6a2fee3f00000000,
-    0xfffb9eaa00000000, 0x1dc93c7e00000000, 0x881d4ceb00000000,
-    0x7666ac8f00000000, 0xe3b2dc1a00000000, 0x8a916c4600000000,
-    0x1f451cd300000000, 0xe13efcb700000000, 0x74ea8c2200000000,
-    0x33789c0e00000000, 0xa6acec9b00000000, 0x58d70cff00000000,
-    0xcd037c6a00000000, 0xa420cc3600000000, 0x31f4bca300000000,
-    0xcf8f5cc700000000, 0x5a5b2c5200000000, 0x41ab7d9f00000000,
-    0xd47f0d0a00000000, 0x2a04ed6e00000000, 0xbfd09dfb00000000,
-    0xd6f32da700000000, 0x43275d3200000000, 0xbd5cbd5600000000,
-    0x2888cdc300000000, 0x6f1addef00000000, 0xfacead7a00000000,
-    0x04b54d1e00000000, 0x91613d8b00000000, 0xf8428dd700000000,
-    0x6d96fd4200000000, 0x93ed1d2600000000, 0x06396db300000000,
-    0x168e285400000000, 0x835a58c100000000, 0x7d21b8a500000000,
-    0xe8f5c83000000000, 0x81d6786c00000000, 0x140208f900000000,
-    0xea79e89d00000000, 0x7fad980800000000, 0x383f882400000000,
-    0xadebf8b100000000, 0x539018d500000000, 0xc644684000000000,
-    0xaf67d81c00000000, 0x3ab3a88900000000, 0xc4c848ed00000000,
-    0x511c387800000000, 0x4aec69b500000000, 0xdf38192000000000,
-    0x2143f94400000000, 0xb49789d100000000, 0xddb4398d00000000,
-    0x4860491800000000, 0xb61ba97c00000000, 0x23cfd9e900000000,
-    0x645dc9c500000000, 0xf189b95000000000, 0x0ff2593400000000,
-    0x9a2629a100000000, 0xf30599fd00000000, 0x66d1e96800000000,
-    0x98aa090c00000000, 0x0d7e799900000000, 0xef4cdb4d00000000,
-    0x7a98abd800000000, 0x84e34bbc00000000, 0x11373b2900000000,
-    0x78148b7500000000, 0xedc0fbe000000000, 0x13bb1b8400000000,
-    0x866f6b1100000000, 0xc1fd7b3d00000000, 0x54290ba800000000,
-    0xaa52ebcc00000000, 0x3f869b5900000000, 0x56a52b0500000000,
-    0xc3715b9000000000, 0x3d0abbf400000000, 0xa8decb6100000000,
-    0xb32e9aac00000000, 0x26faea3900000000, 0xd8810a5d00000000,
-    0x4d557ac800000000, 0x2476ca9400000000, 0xb1a2ba0100000000,
-    0x4fd95a6500000000, 0xda0d2af000000000, 0x9d9f3adc00000000,
-    0x084b4a4900000000, 0xf630aa2d00000000, 0x63e4dab800000000,
-    0x0ac76ae400000000, 0x9f131a7100000000, 0x6168fa1500000000,
-    0xf4bc8a8000000000},
-   {0x0000000000000000, 0x1f17f08000000000, 0x7f2891da00000000,
-    0x603f615a00000000, 0xbf56536e00000000, 0xa041a3ee00000000,
-    0xc07ec2b400000000, 0xdf69323400000000, 0x7eada6dc00000000,
-    0x61ba565c00000000, 0x0185370600000000, 0x1e92c78600000000,
-    0xc1fbf5b200000000, 0xdeec053200000000, 0xbed3646800000000,
-    0xa1c494e800000000, 0xbd5c3c6200000000, 0xa24bcce200000000,
-    0xc274adb800000000, 0xdd635d3800000000, 0x020a6f0c00000000,
-    0x1d1d9f8c00000000, 0x7d22fed600000000, 0x62350e5600000000,
-    0xc3f19abe00000000, 0xdce66a3e00000000, 0xbcd90b6400000000,
-    0xa3cefbe400000000, 0x7ca7c9d000000000, 0x63b0395000000000,
-    0x038f580a00000000, 0x1c98a88a00000000, 0x7ab978c400000000,
-    0x65ae884400000000, 0x0591e91e00000000, 0x1a86199e00000000,
-    0xc5ef2baa00000000, 0xdaf8db2a00000000, 0xbac7ba7000000000,
-    0xa5d04af000000000, 0x0414de1800000000, 0x1b032e9800000000,
-    0x7b3c4fc200000000, 0x642bbf4200000000, 0xbb428d7600000000,
-    0xa4557df600000000, 0xc46a1cac00000000, 0xdb7dec2c00000000,
-    0xc7e544a600000000, 0xd8f2b42600000000, 0xb8cdd57c00000000,
-    0xa7da25fc00000000, 0x78b317c800000000, 0x67a4e74800000000,
-    0x079b861200000000, 0x188c769200000000, 0xb948e27a00000000,
-    0xa65f12fa00000000, 0xc66073a000000000, 0xd977832000000000,
-    0x061eb11400000000, 0x1909419400000000, 0x793620ce00000000,
-    0x6621d04e00000000, 0xb574805300000000, 0xaa6370d300000000,
-    0xca5c118900000000, 0xd54be10900000000, 0x0a22d33d00000000,
-    0x153523bd00000000, 0x750a42e700000000, 0x6a1db26700000000,
-    0xcbd9268f00000000, 0xd4ced60f00000000, 0xb4f1b75500000000,
-    0xabe647d500000000, 0x748f75e100000000, 0x6b98856100000000,
-    0x0ba7e43b00000000, 0x14b014bb00000000, 0x0828bc3100000000,
-    0x173f4cb100000000, 0x77002deb00000000, 0x6817dd6b00000000,
-    0xb77eef5f00000000, 0xa8691fdf00000000, 0xc8567e8500000000,
-    0xd7418e0500000000, 0x76851aed00000000, 0x6992ea6d00000000,
-    0x09ad8b3700000000, 0x16ba7bb700000000, 0xc9d3498300000000,
-    0xd6c4b90300000000, 0xb6fbd85900000000, 0xa9ec28d900000000,
-    0xcfcdf89700000000, 0xd0da081700000000, 0xb0e5694d00000000,
-    0xaff299cd00000000, 0x709babf900000000, 0x6f8c5b7900000000,
-    0x0fb33a2300000000, 0x10a4caa300000000, 0xb1605e4b00000000,
-    0xae77aecb00000000, 0xce48cf9100000000, 0xd15f3f1100000000,
-    0x0e360d2500000000, 0x1121fda500000000, 0x711e9cff00000000,
-    0x6e096c7f00000000, 0x7291c4f500000000, 0x6d86347500000000,
-    0x0db9552f00000000, 0x12aea5af00000000, 0xcdc7979b00000000,
-    0xd2d0671b00000000, 0xb2ef064100000000, 0xadf8f6c100000000,
-    0x0c3c622900000000, 0x132b92a900000000, 0x7314f3f300000000,
-    0x6c03037300000000, 0xb36a314700000000, 0xac7dc1c700000000,
-    0xcc42a09d00000000, 0xd355501d00000000, 0x6ae900a700000000,
-    0x75fef02700000000, 0x15c1917d00000000, 0x0ad661fd00000000,
-    0xd5bf53c900000000, 0xcaa8a34900000000, 0xaa97c21300000000,
-    0xb580329300000000, 0x1444a67b00000000, 0x0b5356fb00000000,
-    0x6b6c37a100000000, 0x747bc72100000000, 0xab12f51500000000,
-    0xb405059500000000, 0xd43a64cf00000000, 0xcb2d944f00000000,
-    0xd7b53cc500000000, 0xc8a2cc4500000000, 0xa89dad1f00000000,
-    0xb78a5d9f00000000, 0x68e36fab00000000, 0x77f49f2b00000000,
-    0x17cbfe7100000000, 0x08dc0ef100000000, 0xa9189a1900000000,
-    0xb60f6a9900000000, 0xd6300bc300000000, 0xc927fb4300000000,
-    0x164ec97700000000, 0x095939f700000000, 0x696658ad00000000,
-    0x7671a82d00000000, 0x1050786300000000, 0x0f4788e300000000,
-    0x6f78e9b900000000, 0x706f193900000000, 0xaf062b0d00000000,
-    0xb011db8d00000000, 0xd02ebad700000000, 0xcf394a5700000000,
-    0x6efddebf00000000, 0x71ea2e3f00000000, 0x11d54f6500000000,
-    0x0ec2bfe500000000, 0xd1ab8dd100000000, 0xcebc7d5100000000,
-    0xae831c0b00000000, 0xb194ec8b00000000, 0xad0c440100000000,
-    0xb21bb48100000000, 0xd224d5db00000000, 0xcd33255b00000000,
-    0x125a176f00000000, 0x0d4de7ef00000000, 0x6d7286b500000000,
-    0x7265763500000000, 0xd3a1e2dd00000000, 0xccb6125d00000000,
-    0xac89730700000000, 0xb39e838700000000, 0x6cf7b1b300000000,
-    0x73e0413300000000, 0x13df206900000000, 0x0cc8d0e900000000,
-    0xdf9d80f400000000, 0xc08a707400000000, 0xa0b5112e00000000,
-    0xbfa2e1ae00000000, 0x60cbd39a00000000, 0x7fdc231a00000000,
-    0x1fe3424000000000, 0x00f4b2c000000000, 0xa130262800000000,
-    0xbe27d6a800000000, 0xde18b7f200000000, 0xc10f477200000000,
-    0x1e66754600000000, 0x017185c600000000, 0x614ee49c00000000,
-    0x7e59141c00000000, 0x62c1bc9600000000, 0x7dd64c1600000000,
-    0x1de92d4c00000000, 0x02feddcc00000000, 0xdd97eff800000000,
-    0xc2801f7800000000, 0xa2bf7e2200000000, 0xbda88ea200000000,
-    0x1c6c1a4a00000000, 0x037beaca00000000, 0x63448b9000000000,
-    0x7c537b1000000000, 0xa33a492400000000, 0xbc2db9a400000000,
-    0xdc12d8fe00000000, 0xc305287e00000000, 0xa524f83000000000,
-    0xba3308b000000000, 0xda0c69ea00000000, 0xc51b996a00000000,
-    0x1a72ab5e00000000, 0x05655bde00000000, 0x655a3a8400000000,
-    0x7a4dca0400000000, 0xdb895eec00000000, 0xc49eae6c00000000,
-    0xa4a1cf3600000000, 0xbbb63fb600000000, 0x64df0d8200000000,
-    0x7bc8fd0200000000, 0x1bf79c5800000000, 0x04e06cd800000000,
-    0x1878c45200000000, 0x076f34d200000000, 0x6750558800000000,
-    0x7847a50800000000, 0xa72e973c00000000, 0xb83967bc00000000,
-    0xd80606e600000000, 0xc711f66600000000, 0x66d5628e00000000,
-    0x79c2920e00000000, 0x19fdf35400000000, 0x06ea03d400000000,
-    0xd98331e000000000, 0xc694c16000000000, 0xa6aba03a00000000,
-    0xb9bc50ba00000000},
-   {0x0000000000000000, 0xe2fd888d00000000, 0x85fd60c000000000,
-    0x6700e84d00000000, 0x4bfdb05b00000000, 0xa90038d600000000,
-    0xce00d09b00000000, 0x2cfd581600000000, 0x96fa61b700000000,
-    0x7407e93a00000000, 0x1307017700000000, 0xf1fa89fa00000000,
-    0xdd07d1ec00000000, 0x3ffa596100000000, 0x58fab12c00000000,
-    0xba0739a100000000, 0x6df3b2b500000000, 0x8f0e3a3800000000,
-    0xe80ed27500000000, 0x0af35af800000000, 0x260e02ee00000000,
-    0xc4f38a6300000000, 0xa3f3622e00000000, 0x410eeaa300000000,
-    0xfb09d30200000000, 0x19f45b8f00000000, 0x7ef4b3c200000000,
-    0x9c093b4f00000000, 0xb0f4635900000000, 0x5209ebd400000000,
-    0x3509039900000000, 0xd7f48b1400000000, 0x9be014b000000000,
-    0x791d9c3d00000000, 0x1e1d747000000000, 0xfce0fcfd00000000,
-    0xd01da4eb00000000, 0x32e02c6600000000, 0x55e0c42b00000000,
-    0xb71d4ca600000000, 0x0d1a750700000000, 0xefe7fd8a00000000,
-    0x88e715c700000000, 0x6a1a9d4a00000000, 0x46e7c55c00000000,
-    0xa41a4dd100000000, 0xc31aa59c00000000, 0x21e72d1100000000,
-    0xf613a60500000000, 0x14ee2e8800000000, 0x73eec6c500000000,
-    0x91134e4800000000, 0xbdee165e00000000, 0x5f139ed300000000,
-    0x3813769e00000000, 0xdaeefe1300000000, 0x60e9c7b200000000,
-    0x82144f3f00000000, 0xe514a77200000000, 0x07e92fff00000000,
-    0x2b1477e900000000, 0xc9e9ff6400000000, 0xaee9172900000000,
-    0x4c149fa400000000, 0x77c758bb00000000, 0x953ad03600000000,
-    0xf23a387b00000000, 0x10c7b0f600000000, 0x3c3ae8e000000000,
-    0xdec7606d00000000, 0xb9c7882000000000, 0x5b3a00ad00000000,
-    0xe13d390c00000000, 0x03c0b18100000000, 0x64c059cc00000000,
-    0x863dd14100000000, 0xaac0895700000000, 0x483d01da00000000,
-    0x2f3de99700000000, 0xcdc0611a00000000, 0x1a34ea0e00000000,
-    0xf8c9628300000000, 0x9fc98ace00000000, 0x7d34024300000000,
-    0x51c95a5500000000, 0xb334d2d800000000, 0xd4343a9500000000,
-    0x36c9b21800000000, 0x8cce8bb900000000, 0x6e33033400000000,
-    0x0933eb7900000000, 0xebce63f400000000, 0xc7333be200000000,
-    0x25ceb36f00000000, 0x42ce5b2200000000, 0xa033d3af00000000,
-    0xec274c0b00000000, 0x0edac48600000000, 0x69da2ccb00000000,
-    0x8b27a44600000000, 0xa7dafc5000000000, 0x452774dd00000000,
-    0x22279c9000000000, 0xc0da141d00000000, 0x7add2dbc00000000,
-    0x9820a53100000000, 0xff204d7c00000000, 0x1dddc5f100000000,
-    0x31209de700000000, 0xd3dd156a00000000, 0xb4ddfd2700000000,
-    0x562075aa00000000, 0x81d4febe00000000, 0x6329763300000000,
-    0x04299e7e00000000, 0xe6d416f300000000, 0xca294ee500000000,
-    0x28d4c66800000000, 0x4fd42e2500000000, 0xad29a6a800000000,
-    0x172e9f0900000000, 0xf5d3178400000000, 0x92d3ffc900000000,
-    0x702e774400000000, 0x5cd32f5200000000, 0xbe2ea7df00000000,
-    0xd92e4f9200000000, 0x3bd3c71f00000000, 0xaf88c0ad00000000,
-    0x4d75482000000000, 0x2a75a06d00000000, 0xc88828e000000000,
-    0xe47570f600000000, 0x0688f87b00000000, 0x6188103600000000,
-    0x837598bb00000000, 0x3972a11a00000000, 0xdb8f299700000000,
-    0xbc8fc1da00000000, 0x5e72495700000000, 0x728f114100000000,
-    0x907299cc00000000, 0xf772718100000000, 0x158ff90c00000000,
-    0xc27b721800000000, 0x2086fa9500000000, 0x478612d800000000,
-    0xa57b9a5500000000, 0x8986c24300000000, 0x6b7b4ace00000000,
-    0x0c7ba28300000000, 0xee862a0e00000000, 0x548113af00000000,
-    0xb67c9b2200000000, 0xd17c736f00000000, 0x3381fbe200000000,
-    0x1f7ca3f400000000, 0xfd812b7900000000, 0x9a81c33400000000,
-    0x787c4bb900000000, 0x3468d41d00000000, 0xd6955c9000000000,
-    0xb195b4dd00000000, 0x53683c5000000000, 0x7f95644600000000,
-    0x9d68eccb00000000, 0xfa68048600000000, 0x18958c0b00000000,
-    0xa292b5aa00000000, 0x406f3d2700000000, 0x276fd56a00000000,
-    0xc5925de700000000, 0xe96f05f100000000, 0x0b928d7c00000000,
-    0x6c92653100000000, 0x8e6fedbc00000000, 0x599b66a800000000,
-    0xbb66ee2500000000, 0xdc66066800000000, 0x3e9b8ee500000000,
-    0x1266d6f300000000, 0xf09b5e7e00000000, 0x979bb63300000000,
-    0x75663ebe00000000, 0xcf61071f00000000, 0x2d9c8f9200000000,
-    0x4a9c67df00000000, 0xa861ef5200000000, 0x849cb74400000000,
-    0x66613fc900000000, 0x0161d78400000000, 0xe39c5f0900000000,
-    0xd84f981600000000, 0x3ab2109b00000000, 0x5db2f8d600000000,
-    0xbf4f705b00000000, 0x93b2284d00000000, 0x714fa0c000000000,
-    0x164f488d00000000, 0xf4b2c00000000000, 0x4eb5f9a100000000,
-    0xac48712c00000000, 0xcb48996100000000, 0x29b511ec00000000,
-    0x054849fa00000000, 0xe7b5c17700000000, 0x80b5293a00000000,
-    0x6248a1b700000000, 0xb5bc2aa300000000, 0x5741a22e00000000,
-    0x30414a6300000000, 0xd2bcc2ee00000000, 0xfe419af800000000,
-    0x1cbc127500000000, 0x7bbcfa3800000000, 0x994172b500000000,
-    0x23464b1400000000, 0xc1bbc39900000000, 0xa6bb2bd400000000,
-    0x4446a35900000000, 0x68bbfb4f00000000, 0x8a4673c200000000,
-    0xed469b8f00000000, 0x0fbb130200000000, 0x43af8ca600000000,
-    0xa152042b00000000, 0xc652ec6600000000, 0x24af64eb00000000,
-    0x08523cfd00000000, 0xeaafb47000000000, 0x8daf5c3d00000000,
-    0x6f52d4b000000000, 0xd555ed1100000000, 0x37a8659c00000000,
-    0x50a88dd100000000, 0xb255055c00000000, 0x9ea85d4a00000000,
-    0x7c55d5c700000000, 0x1b553d8a00000000, 0xf9a8b50700000000,
-    0x2e5c3e1300000000, 0xcca1b69e00000000, 0xaba15ed300000000,
-    0x495cd65e00000000, 0x65a18e4800000000, 0x875c06c500000000,
-    0xe05cee8800000000, 0x02a1660500000000, 0xb8a65fa400000000,
-    0x5a5bd72900000000, 0x3d5b3f6400000000, 0xdfa6b7e900000000,
-    0xf35befff00000000, 0x11a6677200000000, 0x76a68f3f00000000,
-    0x945b07b200000000},
-   {0x0000000000000000, 0xa90b894e00000000, 0x5217129d00000000,
-    0xfb1c9bd300000000, 0xe52855e100000000, 0x4c23dcaf00000000,
-    0xb73f477c00000000, 0x1e34ce3200000000, 0x8b57db1900000000,
-    0x225c525700000000, 0xd940c98400000000, 0x704b40ca00000000,
-    0x6e7f8ef800000000, 0xc77407b600000000, 0x3c689c6500000000,
-    0x9563152b00000000, 0x16afb63300000000, 0xbfa43f7d00000000,
-    0x44b8a4ae00000000, 0xedb32de000000000, 0xf387e3d200000000,
-    0x5a8c6a9c00000000, 0xa190f14f00000000, 0x089b780100000000,
-    0x9df86d2a00000000, 0x34f3e46400000000, 0xcfef7fb700000000,
-    0x66e4f6f900000000, 0x78d038cb00000000, 0xd1dbb18500000000,
-    0x2ac72a5600000000, 0x83cca31800000000, 0x2c5e6d6700000000,
-    0x8555e42900000000, 0x7e497ffa00000000, 0xd742f6b400000000,
-    0xc976388600000000, 0x607db1c800000000, 0x9b612a1b00000000,
-    0x326aa35500000000, 0xa709b67e00000000, 0x0e023f3000000000,
-    0xf51ea4e300000000, 0x5c152dad00000000, 0x4221e39f00000000,
-    0xeb2a6ad100000000, 0x1036f10200000000, 0xb93d784c00000000,
-    0x3af1db5400000000, 0x93fa521a00000000, 0x68e6c9c900000000,
-    0xc1ed408700000000, 0xdfd98eb500000000, 0x76d207fb00000000,
-    0x8dce9c2800000000, 0x24c5156600000000, 0xb1a6004d00000000,
-    0x18ad890300000000, 0xe3b112d000000000, 0x4aba9b9e00000000,
-    0x548e55ac00000000, 0xfd85dce200000000, 0x0699473100000000,
-    0xaf92ce7f00000000, 0x58bcdace00000000, 0xf1b7538000000000,
-    0x0aabc85300000000, 0xa3a0411d00000000, 0xbd948f2f00000000,
-    0x149f066100000000, 0xef839db200000000, 0x468814fc00000000,
-    0xd3eb01d700000000, 0x7ae0889900000000, 0x81fc134a00000000,
-    0x28f79a0400000000, 0x36c3543600000000, 0x9fc8dd7800000000,
-    0x64d446ab00000000, 0xcddfcfe500000000, 0x4e136cfd00000000,
-    0xe718e5b300000000, 0x1c047e6000000000, 0xb50ff72e00000000,
-    0xab3b391c00000000, 0x0230b05200000000, 0xf92c2b8100000000,
-    0x5027a2cf00000000, 0xc544b7e400000000, 0x6c4f3eaa00000000,
-    0x9753a57900000000, 0x3e582c3700000000, 0x206ce20500000000,
-    0x89676b4b00000000, 0x727bf09800000000, 0xdb7079d600000000,
-    0x74e2b7a900000000, 0xdde93ee700000000, 0x26f5a53400000000,
-    0x8ffe2c7a00000000, 0x91cae24800000000, 0x38c16b0600000000,
-    0xc3ddf0d500000000, 0x6ad6799b00000000, 0xffb56cb000000000,
-    0x56bee5fe00000000, 0xada27e2d00000000, 0x04a9f76300000000,
-    0x1a9d395100000000, 0xb396b01f00000000, 0x488a2bcc00000000,
-    0xe181a28200000000, 0x624d019a00000000, 0xcb4688d400000000,
-    0x305a130700000000, 0x99519a4900000000, 0x8765547b00000000,
-    0x2e6edd3500000000, 0xd57246e600000000, 0x7c79cfa800000000,
-    0xe91ada8300000000, 0x401153cd00000000, 0xbb0dc81e00000000,
-    0x1206415000000000, 0x0c328f6200000000, 0xa539062c00000000,
-    0x5e259dff00000000, 0xf72e14b100000000, 0xf17ec44600000000,
-    0x58754d0800000000, 0xa369d6db00000000, 0x0a625f9500000000,
-    0x145691a700000000, 0xbd5d18e900000000, 0x4641833a00000000,
-    0xef4a0a7400000000, 0x7a291f5f00000000, 0xd322961100000000,
-    0x283e0dc200000000, 0x8135848c00000000, 0x9f014abe00000000,
-    0x360ac3f000000000, 0xcd16582300000000, 0x641dd16d00000000,
-    0xe7d1727500000000, 0x4edafb3b00000000, 0xb5c660e800000000,
-    0x1ccde9a600000000, 0x02f9279400000000, 0xabf2aeda00000000,
-    0x50ee350900000000, 0xf9e5bc4700000000, 0x6c86a96c00000000,
-    0xc58d202200000000, 0x3e91bbf100000000, 0x979a32bf00000000,
-    0x89aefc8d00000000, 0x20a575c300000000, 0xdbb9ee1000000000,
-    0x72b2675e00000000, 0xdd20a92100000000, 0x742b206f00000000,
-    0x8f37bbbc00000000, 0x263c32f200000000, 0x3808fcc000000000,
-    0x9103758e00000000, 0x6a1fee5d00000000, 0xc314671300000000,
-    0x5677723800000000, 0xff7cfb7600000000, 0x046060a500000000,
-    0xad6be9eb00000000, 0xb35f27d900000000, 0x1a54ae9700000000,
-    0xe148354400000000, 0x4843bc0a00000000, 0xcb8f1f1200000000,
-    0x6284965c00000000, 0x99980d8f00000000, 0x309384c100000000,
-    0x2ea74af300000000, 0x87acc3bd00000000, 0x7cb0586e00000000,
-    0xd5bbd12000000000, 0x40d8c40b00000000, 0xe9d34d4500000000,
-    0x12cfd69600000000, 0xbbc45fd800000000, 0xa5f091ea00000000,
-    0x0cfb18a400000000, 0xf7e7837700000000, 0x5eec0a3900000000,
-    0xa9c21e8800000000, 0x00c997c600000000, 0xfbd50c1500000000,
-    0x52de855b00000000, 0x4cea4b6900000000, 0xe5e1c22700000000,
-    0x1efd59f400000000, 0xb7f6d0ba00000000, 0x2295c59100000000,
-    0x8b9e4cdf00000000, 0x7082d70c00000000, 0xd9895e4200000000,
-    0xc7bd907000000000, 0x6eb6193e00000000, 0x95aa82ed00000000,
-    0x3ca10ba300000000, 0xbf6da8bb00000000, 0x166621f500000000,
-    0xed7aba2600000000, 0x4471336800000000, 0x5a45fd5a00000000,
-    0xf34e741400000000, 0x0852efc700000000, 0xa159668900000000,
-    0x343a73a200000000, 0x9d31faec00000000, 0x662d613f00000000,
-    0xcf26e87100000000, 0xd112264300000000, 0x7819af0d00000000,
-    0x830534de00000000, 0x2a0ebd9000000000, 0x859c73ef00000000,
-    0x2c97faa100000000, 0xd78b617200000000, 0x7e80e83c00000000,
-    0x60b4260e00000000, 0xc9bfaf4000000000, 0x32a3349300000000,
-    0x9ba8bddd00000000, 0x0ecba8f600000000, 0xa7c021b800000000,
-    0x5cdcba6b00000000, 0xf5d7332500000000, 0xebe3fd1700000000,
-    0x42e8745900000000, 0xb9f4ef8a00000000, 0x10ff66c400000000,
-    0x9333c5dc00000000, 0x3a384c9200000000, 0xc124d74100000000,
-    0x682f5e0f00000000, 0x761b903d00000000, 0xdf10197300000000,
-    0x240c82a000000000, 0x8d070bee00000000, 0x18641ec500000000,
-    0xb16f978b00000000, 0x4a730c5800000000, 0xe378851600000000,
-    0xfd4c4b2400000000, 0x5447c26a00000000, 0xaf5b59b900000000,
-    0x0650d0f700000000},
-   {0x0000000000000000, 0x479244af00000000, 0xcf22f88500000000,
-    0x88b0bc2a00000000, 0xdf4381d000000000, 0x98d1c57f00000000,
-    0x1061795500000000, 0x57f33dfa00000000, 0xff81737a00000000,
-    0xb81337d500000000, 0x30a38bff00000000, 0x7731cf5000000000,
-    0x20c2f2aa00000000, 0x6750b60500000000, 0xefe00a2f00000000,
-    0xa8724e8000000000, 0xfe03e7f400000000, 0xb991a35b00000000,
-    0x31211f7100000000, 0x76b35bde00000000, 0x2140662400000000,
-    0x66d2228b00000000, 0xee629ea100000000, 0xa9f0da0e00000000,
-    0x0182948e00000000, 0x4610d02100000000, 0xcea06c0b00000000,
-    0x893228a400000000, 0xdec1155e00000000, 0x995351f100000000,
-    0x11e3eddb00000000, 0x5671a97400000000, 0xbd01bf3200000000,
-    0xfa93fb9d00000000, 0x722347b700000000, 0x35b1031800000000,
-    0x62423ee200000000, 0x25d07a4d00000000, 0xad60c66700000000,
-    0xeaf282c800000000, 0x4280cc4800000000, 0x051288e700000000,
-    0x8da234cd00000000, 0xca30706200000000, 0x9dc34d9800000000,
-    0xda51093700000000, 0x52e1b51d00000000, 0x1573f1b200000000,
-    0x430258c600000000, 0x04901c6900000000, 0x8c20a04300000000,
-    0xcbb2e4ec00000000, 0x9c41d91600000000, 0xdbd39db900000000,
-    0x5363219300000000, 0x14f1653c00000000, 0xbc832bbc00000000,
-    0xfb116f1300000000, 0x73a1d33900000000, 0x3433979600000000,
-    0x63c0aa6c00000000, 0x2452eec300000000, 0xace252e900000000,
-    0xeb70164600000000, 0x7a037e6500000000, 0x3d913aca00000000,
-    0xb52186e000000000, 0xf2b3c24f00000000, 0xa540ffb500000000,
-    0xe2d2bb1a00000000, 0x6a62073000000000, 0x2df0439f00000000,
-    0x85820d1f00000000, 0xc21049b000000000, 0x4aa0f59a00000000,
-    0x0d32b13500000000, 0x5ac18ccf00000000, 0x1d53c86000000000,
-    0x95e3744a00000000, 0xd27130e500000000, 0x8400999100000000,
-    0xc392dd3e00000000, 0x4b22611400000000, 0x0cb025bb00000000,
-    0x5b43184100000000, 0x1cd15cee00000000, 0x9461e0c400000000,
-    0xd3f3a46b00000000, 0x7b81eaeb00000000, 0x3c13ae4400000000,
-    0xb4a3126e00000000, 0xf33156c100000000, 0xa4c26b3b00000000,
-    0xe3502f9400000000, 0x6be093be00000000, 0x2c72d71100000000,
-    0xc702c15700000000, 0x809085f800000000, 0x082039d200000000,
-    0x4fb27d7d00000000, 0x1841408700000000, 0x5fd3042800000000,
-    0xd763b80200000000, 0x90f1fcad00000000, 0x3883b22d00000000,
-    0x7f11f68200000000, 0xf7a14aa800000000, 0xb0330e0700000000,
-    0xe7c033fd00000000, 0xa052775200000000, 0x28e2cb7800000000,
-    0x6f708fd700000000, 0x390126a300000000, 0x7e93620c00000000,
-    0xf623de2600000000, 0xb1b19a8900000000, 0xe642a77300000000,
-    0xa1d0e3dc00000000, 0x29605ff600000000, 0x6ef21b5900000000,
-    0xc68055d900000000, 0x8112117600000000, 0x09a2ad5c00000000,
-    0x4e30e9f300000000, 0x19c3d40900000000, 0x5e5190a600000000,
-    0xd6e12c8c00000000, 0x9173682300000000, 0xf406fcca00000000,
-    0xb394b86500000000, 0x3b24044f00000000, 0x7cb640e000000000,
-    0x2b457d1a00000000, 0x6cd739b500000000, 0xe467859f00000000,
-    0xa3f5c13000000000, 0x0b878fb000000000, 0x4c15cb1f00000000,
-    0xc4a5773500000000, 0x8337339a00000000, 0xd4c40e6000000000,
-    0x93564acf00000000, 0x1be6f6e500000000, 0x5c74b24a00000000,
-    0x0a051b3e00000000, 0x4d975f9100000000, 0xc527e3bb00000000,
-    0x82b5a71400000000, 0xd5469aee00000000, 0x92d4de4100000000,
-    0x1a64626b00000000, 0x5df626c400000000, 0xf584684400000000,
-    0xb2162ceb00000000, 0x3aa690c100000000, 0x7d34d46e00000000,
-    0x2ac7e99400000000, 0x6d55ad3b00000000, 0xe5e5111100000000,
-    0xa27755be00000000, 0x490743f800000000, 0x0e95075700000000,
-    0x8625bb7d00000000, 0xc1b7ffd200000000, 0x9644c22800000000,
-    0xd1d6868700000000, 0x59663aad00000000, 0x1ef47e0200000000,
-    0xb686308200000000, 0xf114742d00000000, 0x79a4c80700000000,
-    0x3e368ca800000000, 0x69c5b15200000000, 0x2e57f5fd00000000,
-    0xa6e749d700000000, 0xe1750d7800000000, 0xb704a40c00000000,
-    0xf096e0a300000000, 0x78265c8900000000, 0x3fb4182600000000,
-    0x684725dc00000000, 0x2fd5617300000000, 0xa765dd5900000000,
-    0xe0f799f600000000, 0x4885d77600000000, 0x0f1793d900000000,
-    0x87a72ff300000000, 0xc0356b5c00000000, 0x97c656a600000000,
-    0xd054120900000000, 0x58e4ae2300000000, 0x1f76ea8c00000000,
-    0x8e0582af00000000, 0xc997c60000000000, 0x41277a2a00000000,
-    0x06b53e8500000000, 0x5146037f00000000, 0x16d447d000000000,
-    0x9e64fbfa00000000, 0xd9f6bf5500000000, 0x7184f1d500000000,
-    0x3616b57a00000000, 0xbea6095000000000, 0xf9344dff00000000,
-    0xaec7700500000000, 0xe95534aa00000000, 0x61e5888000000000,
-    0x2677cc2f00000000, 0x7006655b00000000, 0x379421f400000000,
-    0xbf249dde00000000, 0xf8b6d97100000000, 0xaf45e48b00000000,
-    0xe8d7a02400000000, 0x60671c0e00000000, 0x27f558a100000000,
-    0x8f87162100000000, 0xc815528e00000000, 0x40a5eea400000000,
-    0x0737aa0b00000000, 0x50c497f100000000, 0x1756d35e00000000,
-    0x9fe66f7400000000, 0xd8742bdb00000000, 0x33043d9d00000000,
-    0x7496793200000000, 0xfc26c51800000000, 0xbbb481b700000000,
-    0xec47bc4d00000000, 0xabd5f8e200000000, 0x236544c800000000,
-    0x64f7006700000000, 0xcc854ee700000000, 0x8b170a4800000000,
-    0x03a7b66200000000, 0x4435f2cd00000000, 0x13c6cf3700000000,
-    0x54548b9800000000, 0xdce437b200000000, 0x9b76731d00000000,
-    0xcd07da6900000000, 0x8a959ec600000000, 0x022522ec00000000,
-    0x45b7664300000000, 0x12445bb900000000, 0x55d61f1600000000,
-    0xdd66a33c00000000, 0x9af4e79300000000, 0x3286a91300000000,
-    0x7514edbc00000000, 0xfda4519600000000, 0xba36153900000000,
-    0xedc528c300000000, 0xaa576c6c00000000, 0x22e7d04600000000,
-    0x657594e900000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
-    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
-    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
-    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
-    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
-    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
-    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
-    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
-    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
-    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
-    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
-    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
-    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
-    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
-    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
-    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
-    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
-    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
-    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
-    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
-    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
-    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
-    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
-    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
-    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
-    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
-    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
-    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
-    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
-    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
-    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
-    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
-    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
-    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
-    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
-    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
-    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
-    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
-    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
-    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
-    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
-    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
-    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
-    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
-    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
-    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
-    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
-    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
-    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
-    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
-    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
-    0xd8ac6b35},
-   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
-    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
-    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
-    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
-    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
-    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
-    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
-    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
-    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
-    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
-    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
-    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
-    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
-    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
-    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
-    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
-    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
-    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
-    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
-    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
-    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
-    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
-    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
-    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
-    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
-    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
-    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
-    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
-    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
-    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
-    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
-    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
-    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
-    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
-    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
-    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
-    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
-    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
-    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
-    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
-    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
-    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
-    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
-    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
-    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
-    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
-    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
-    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
-    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
-    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
-    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
-    0xa140efa8},
-   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
-    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
-    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
-    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
-    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
-    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
-    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
-    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
-    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
-    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
-    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
-    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
-    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
-    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
-    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
-    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
-    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
-    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
-    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
-    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
-    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
-    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
-    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
-    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
-    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
-    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
-    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
-    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
-    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
-    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
-    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
-    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
-    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
-    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
-    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
-    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
-    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
-    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
-    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
-    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
-    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
-    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
-    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
-    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
-    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
-    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
-    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
-    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
-    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
-    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
-    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
-    0x917cd6a1},
-   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
-    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
-    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
-    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
-    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
-    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
-    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
-    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
-    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
-    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
-    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
-    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
-    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
-    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
-    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
-    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
-    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
-    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
-    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
-    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
-    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
-    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
-    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
-    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
-    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
-    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
-    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
-    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
-    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
-    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
-    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
-    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
-    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
-    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
-    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
-    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
-    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
-    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
-    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
-    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
-    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
-    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
-    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
-    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
-    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
-    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
-    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
-    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
-    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
-    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
-    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
-    0x18ba364e}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0x43cba687, 0xc7903cd4, 0x845b9a53, 0xcf270873,
-    0x8cecaef4, 0x08b734a7, 0x4b7c9220, 0x9e4f10e6, 0xdd84b661,
-    0x59df2c32, 0x1a148ab5, 0x51681895, 0x12a3be12, 0x96f82441,
-    0xd53382c6, 0x7d995117, 0x3e52f790, 0xba096dc3, 0xf9c2cb44,
-    0xb2be5964, 0xf175ffe3, 0x752e65b0, 0x36e5c337, 0xe3d641f1,
-    0xa01de776, 0x24467d25, 0x678ddba2, 0x2cf14982, 0x6f3aef05,
-    0xeb617556, 0xa8aad3d1, 0xfa32a32e, 0xb9f905a9, 0x3da29ffa,
-    0x7e69397d, 0x3515ab5d, 0x76de0dda, 0xf2859789, 0xb14e310e,
-    0x647db3c8, 0x27b6154f, 0xa3ed8f1c, 0xe026299b, 0xab5abbbb,
-    0xe8911d3c, 0x6cca876f, 0x2f0121e8, 0x87abf239, 0xc46054be,
-    0x403bceed, 0x03f0686a, 0x488cfa4a, 0x0b475ccd, 0x8f1cc69e,
-    0xccd76019, 0x19e4e2df, 0x5a2f4458, 0xde74de0b, 0x9dbf788c,
-    0xd6c3eaac, 0x95084c2b, 0x1153d678, 0x529870ff, 0xf465465d,
-    0xb7aee0da, 0x33f57a89, 0x703edc0e, 0x3b424e2e, 0x7889e8a9,
-    0xfcd272fa, 0xbf19d47d, 0x6a2a56bb, 0x29e1f03c, 0xadba6a6f,
-    0xee71cce8, 0xa50d5ec8, 0xe6c6f84f, 0x629d621c, 0x2156c49b,
-    0x89fc174a, 0xca37b1cd, 0x4e6c2b9e, 0x0da78d19, 0x46db1f39,
-    0x0510b9be, 0x814b23ed, 0xc280856a, 0x17b307ac, 0x5478a12b,
-    0xd0233b78, 0x93e89dff, 0xd8940fdf, 0x9b5fa958, 0x1f04330b,
-    0x5ccf958c, 0x0e57e573, 0x4d9c43f4, 0xc9c7d9a7, 0x8a0c7f20,
-    0xc170ed00, 0x82bb4b87, 0x06e0d1d4, 0x452b7753, 0x9018f595,
-    0xd3d35312, 0x5788c941, 0x14436fc6, 0x5f3ffde6, 0x1cf45b61,
-    0x98afc132, 0xdb6467b5, 0x73ceb464, 0x300512e3, 0xb45e88b0,
-    0xf7952e37, 0xbce9bc17, 0xff221a90, 0x7b7980c3, 0x38b22644,
-    0xed81a482, 0xae4a0205, 0x2a119856, 0x69da3ed1, 0x22a6acf1,
-    0x616d0a76, 0xe5369025, 0xa6fd36a2, 0xe8cb8cba, 0xab002a3d,
-    0x2f5bb06e, 0x6c9016e9, 0x27ec84c9, 0x6427224e, 0xe07cb81d,
-    0xa3b71e9a, 0x76849c5c, 0x354f3adb, 0xb114a088, 0xf2df060f,
-    0xb9a3942f, 0xfa6832a8, 0x7e33a8fb, 0x3df80e7c, 0x9552ddad,
-    0xd6997b2a, 0x52c2e179, 0x110947fe, 0x5a75d5de, 0x19be7359,
-    0x9de5e90a, 0xde2e4f8d, 0x0b1dcd4b, 0x48d66bcc, 0xcc8df19f,
-    0x8f465718, 0xc43ac538, 0x87f163bf, 0x03aaf9ec, 0x40615f6b,
-    0x12f92f94, 0x51328913, 0xd5691340, 0x96a2b5c7, 0xddde27e7,
-    0x9e158160, 0x1a4e1b33, 0x5985bdb4, 0x8cb63f72, 0xcf7d99f5,
-    0x4b2603a6, 0x08eda521, 0x43913701, 0x005a9186, 0x84010bd5,
-    0xc7caad52, 0x6f607e83, 0x2cabd804, 0xa8f04257, 0xeb3be4d0,
-    0xa04776f0, 0xe38cd077, 0x67d74a24, 0x241ceca3, 0xf12f6e65,
-    0xb2e4c8e2, 0x36bf52b1, 0x7574f436, 0x3e086616, 0x7dc3c091,
-    0xf9985ac2, 0xba53fc45, 0x1caecae7, 0x5f656c60, 0xdb3ef633,
-    0x98f550b4, 0xd389c294, 0x90426413, 0x1419fe40, 0x57d258c7,
-    0x82e1da01, 0xc12a7c86, 0x4571e6d5, 0x06ba4052, 0x4dc6d272,
-    0x0e0d74f5, 0x8a56eea6, 0xc99d4821, 0x61379bf0, 0x22fc3d77,
-    0xa6a7a724, 0xe56c01a3, 0xae109383, 0xeddb3504, 0x6980af57,
-    0x2a4b09d0, 0xff788b16, 0xbcb32d91, 0x38e8b7c2, 0x7b231145,
-    0x305f8365, 0x739425e2, 0xf7cfbfb1, 0xb4041936, 0xe69c69c9,
-    0xa557cf4e, 0x210c551d, 0x62c7f39a, 0x29bb61ba, 0x6a70c73d,
-    0xee2b5d6e, 0xade0fbe9, 0x78d3792f, 0x3b18dfa8, 0xbf4345fb,
-    0xfc88e37c, 0xb7f4715c, 0xf43fd7db, 0x70644d88, 0x33afeb0f,
-    0x9b0538de, 0xd8ce9e59, 0x5c95040a, 0x1f5ea28d, 0x542230ad,
-    0x17e9962a, 0x93b20c79, 0xd079aafe, 0x054a2838, 0x46818ebf,
-    0xc2da14ec, 0x8111b26b, 0xca6d204b, 0x89a686cc, 0x0dfd1c9f,
-    0x4e36ba18},
-   {0x00000000, 0xe1b652ef, 0x836bd405, 0x62dd86ea, 0x06d7a80b,
-    0xe761fae4, 0x85bc7c0e, 0x640a2ee1, 0x0cae5117, 0xed1803f8,
-    0x8fc58512, 0x6e73d7fd, 0x0a79f91c, 0xebcfabf3, 0x89122d19,
-    0x68a47ff6, 0x185ca32e, 0xf9eaf1c1, 0x9b37772b, 0x7a8125c4,
-    0x1e8b0b25, 0xff3d59ca, 0x9de0df20, 0x7c568dcf, 0x14f2f239,
-    0xf544a0d6, 0x9799263c, 0x762f74d3, 0x12255a32, 0xf39308dd,
-    0x914e8e37, 0x70f8dcd8, 0x30b8465d, 0xd10e14b2, 0xb3d39258,
-    0x5265c0b7, 0x366fee56, 0xd7d9bcb9, 0xb5043a53, 0x54b268bc,
-    0x3c16174a, 0xdda045a5, 0xbf7dc34f, 0x5ecb91a0, 0x3ac1bf41,
-    0xdb77edae, 0xb9aa6b44, 0x581c39ab, 0x28e4e573, 0xc952b79c,
-    0xab8f3176, 0x4a396399, 0x2e334d78, 0xcf851f97, 0xad58997d,
-    0x4ceecb92, 0x244ab464, 0xc5fce68b, 0xa7216061, 0x4697328e,
-    0x229d1c6f, 0xc32b4e80, 0xa1f6c86a, 0x40409a85, 0x60708dba,
-    0x81c6df55, 0xe31b59bf, 0x02ad0b50, 0x66a725b1, 0x8711775e,
-    0xe5ccf1b4, 0x047aa35b, 0x6cdedcad, 0x8d688e42, 0xefb508a8,
-    0x0e035a47, 0x6a0974a6, 0x8bbf2649, 0xe962a0a3, 0x08d4f24c,
-    0x782c2e94, 0x999a7c7b, 0xfb47fa91, 0x1af1a87e, 0x7efb869f,
-    0x9f4dd470, 0xfd90529a, 0x1c260075, 0x74827f83, 0x95342d6c,
-    0xf7e9ab86, 0x165ff969, 0x7255d788, 0x93e38567, 0xf13e038d,
-    0x10885162, 0x50c8cbe7, 0xb17e9908, 0xd3a31fe2, 0x32154d0d,
-    0x561f63ec, 0xb7a93103, 0xd574b7e9, 0x34c2e506, 0x5c669af0,
-    0xbdd0c81f, 0xdf0d4ef5, 0x3ebb1c1a, 0x5ab132fb, 0xbb076014,
-    0xd9dae6fe, 0x386cb411, 0x489468c9, 0xa9223a26, 0xcbffbccc,
-    0x2a49ee23, 0x4e43c0c2, 0xaff5922d, 0xcd2814c7, 0x2c9e4628,
-    0x443a39de, 0xa58c6b31, 0xc751eddb, 0x26e7bf34, 0x42ed91d5,
-    0xa35bc33a, 0xc18645d0, 0x2030173f, 0x81e66bae, 0x60503941,
-    0x028dbfab, 0xe33bed44, 0x8731c3a5, 0x6687914a, 0x045a17a0,
-    0xe5ec454f, 0x8d483ab9, 0x6cfe6856, 0x0e23eebc, 0xef95bc53,
-    0x8b9f92b2, 0x6a29c05d, 0x08f446b7, 0xe9421458, 0x99bac880,
-    0x780c9a6f, 0x1ad11c85, 0xfb674e6a, 0x9f6d608b, 0x7edb3264,
-    0x1c06b48e, 0xfdb0e661, 0x95149997, 0x74a2cb78, 0x167f4d92,
-    0xf7c91f7d, 0x93c3319c, 0x72756373, 0x10a8e599, 0xf11eb776,
-    0xb15e2df3, 0x50e87f1c, 0x3235f9f6, 0xd383ab19, 0xb78985f8,
-    0x563fd717, 0x34e251fd, 0xd5540312, 0xbdf07ce4, 0x5c462e0b,
-    0x3e9ba8e1, 0xdf2dfa0e, 0xbb27d4ef, 0x5a918600, 0x384c00ea,
-    0xd9fa5205, 0xa9028edd, 0x48b4dc32, 0x2a695ad8, 0xcbdf0837,
-    0xafd526d6, 0x4e637439, 0x2cbef2d3, 0xcd08a03c, 0xa5acdfca,
-    0x441a8d25, 0x26c70bcf, 0xc7715920, 0xa37b77c1, 0x42cd252e,
-    0x2010a3c4, 0xc1a6f12b, 0xe196e614, 0x0020b4fb, 0x62fd3211,
-    0x834b60fe, 0xe7414e1f, 0x06f71cf0, 0x642a9a1a, 0x859cc8f5,
-    0xed38b703, 0x0c8ee5ec, 0x6e536306, 0x8fe531e9, 0xebef1f08,
-    0x0a594de7, 0x6884cb0d, 0x893299e2, 0xf9ca453a, 0x187c17d5,
-    0x7aa1913f, 0x9b17c3d0, 0xff1ded31, 0x1eabbfde, 0x7c763934,
-    0x9dc06bdb, 0xf564142d, 0x14d246c2, 0x760fc028, 0x97b992c7,
-    0xf3b3bc26, 0x1205eec9, 0x70d86823, 0x916e3acc, 0xd12ea049,
-    0x3098f2a6, 0x5245744c, 0xb3f326a3, 0xd7f90842, 0x364f5aad,
-    0x5492dc47, 0xb5248ea8, 0xdd80f15e, 0x3c36a3b1, 0x5eeb255b,
-    0xbf5d77b4, 0xdb575955, 0x3ae10bba, 0x583c8d50, 0xb98adfbf,
-    0xc9720367, 0x28c45188, 0x4a19d762, 0xabaf858d, 0xcfa5ab6c,
-    0x2e13f983, 0x4cce7f69, 0xad782d86, 0xc5dc5270, 0x246a009f,
-    0x46b78675, 0xa701d49a, 0xc30bfa7b, 0x22bda894, 0x40602e7e,
-    0xa1d67c91},
-   {0x00000000, 0x5880e2d7, 0xf106b474, 0xa98656a3, 0xe20d68e9,
-    0xba8d8a3e, 0x130bdc9d, 0x4b8b3e4a, 0x851da109, 0xdd9d43de,
-    0x741b157d, 0x2c9bf7aa, 0x6710c9e0, 0x3f902b37, 0x96167d94,
-    0xce969f43, 0x0a3b4213, 0x52bba0c4, 0xfb3df667, 0xa3bd14b0,
-    0xe8362afa, 0xb0b6c82d, 0x19309e8e, 0x41b07c59, 0x8f26e31a,
-    0xd7a601cd, 0x7e20576e, 0x26a0b5b9, 0x6d2b8bf3, 0x35ab6924,
-    0x9c2d3f87, 0xc4addd50, 0x14768426, 0x4cf666f1, 0xe5703052,
-    0xbdf0d285, 0xf67beccf, 0xaefb0e18, 0x077d58bb, 0x5ffdba6c,
-    0x916b252f, 0xc9ebc7f8, 0x606d915b, 0x38ed738c, 0x73664dc6,
-    0x2be6af11, 0x8260f9b2, 0xdae01b65, 0x1e4dc635, 0x46cd24e2,
-    0xef4b7241, 0xb7cb9096, 0xfc40aedc, 0xa4c04c0b, 0x0d461aa8,
-    0x55c6f87f, 0x9b50673c, 0xc3d085eb, 0x6a56d348, 0x32d6319f,
-    0x795d0fd5, 0x21dded02, 0x885bbba1, 0xd0db5976, 0x28ec084d,
-    0x706cea9a, 0xd9eabc39, 0x816a5eee, 0xcae160a4, 0x92618273,
-    0x3be7d4d0, 0x63673607, 0xadf1a944, 0xf5714b93, 0x5cf71d30,
-    0x0477ffe7, 0x4ffcc1ad, 0x177c237a, 0xbefa75d9, 0xe67a970e,
-    0x22d74a5e, 0x7a57a889, 0xd3d1fe2a, 0x8b511cfd, 0xc0da22b7,
-    0x985ac060, 0x31dc96c3, 0x695c7414, 0xa7caeb57, 0xff4a0980,
-    0x56cc5f23, 0x0e4cbdf4, 0x45c783be, 0x1d476169, 0xb4c137ca,
-    0xec41d51d, 0x3c9a8c6b, 0x641a6ebc, 0xcd9c381f, 0x951cdac8,
-    0xde97e482, 0x86170655, 0x2f9150f6, 0x7711b221, 0xb9872d62,
-    0xe107cfb5, 0x48819916, 0x10017bc1, 0x5b8a458b, 0x030aa75c,
-    0xaa8cf1ff, 0xf20c1328, 0x36a1ce78, 0x6e212caf, 0xc7a77a0c,
-    0x9f2798db, 0xd4aca691, 0x8c2c4446, 0x25aa12e5, 0x7d2af032,
-    0xb3bc6f71, 0xeb3c8da6, 0x42badb05, 0x1a3a39d2, 0x51b10798,
-    0x0931e54f, 0xa0b7b3ec, 0xf837513b, 0x50d8119a, 0x0858f34d,
-    0xa1dea5ee, 0xf95e4739, 0xb2d57973, 0xea559ba4, 0x43d3cd07,
-    0x1b532fd0, 0xd5c5b093, 0x8d455244, 0x24c304e7, 0x7c43e630,
-    0x37c8d87a, 0x6f483aad, 0xc6ce6c0e, 0x9e4e8ed9, 0x5ae35389,
-    0x0263b15e, 0xabe5e7fd, 0xf365052a, 0xb8ee3b60, 0xe06ed9b7,
-    0x49e88f14, 0x11686dc3, 0xdffef280, 0x877e1057, 0x2ef846f4,
-    0x7678a423, 0x3df39a69, 0x657378be, 0xccf52e1d, 0x9475ccca,
-    0x44ae95bc, 0x1c2e776b, 0xb5a821c8, 0xed28c31f, 0xa6a3fd55,
-    0xfe231f82, 0x57a54921, 0x0f25abf6, 0xc1b334b5, 0x9933d662,
-    0x30b580c1, 0x68356216, 0x23be5c5c, 0x7b3ebe8b, 0xd2b8e828,
-    0x8a380aff, 0x4e95d7af, 0x16153578, 0xbf9363db, 0xe713810c,
-    0xac98bf46, 0xf4185d91, 0x5d9e0b32, 0x051ee9e5, 0xcb8876a6,
-    0x93089471, 0x3a8ec2d2, 0x620e2005, 0x29851e4f, 0x7105fc98,
-    0xd883aa3b, 0x800348ec, 0x783419d7, 0x20b4fb00, 0x8932ada3,
-    0xd1b24f74, 0x9a39713e, 0xc2b993e9, 0x6b3fc54a, 0x33bf279d,
-    0xfd29b8de, 0xa5a95a09, 0x0c2f0caa, 0x54afee7d, 0x1f24d037,
-    0x47a432e0, 0xee226443, 0xb6a28694, 0x720f5bc4, 0x2a8fb913,
-    0x8309efb0, 0xdb890d67, 0x9002332d, 0xc882d1fa, 0x61048759,
-    0x3984658e, 0xf712facd, 0xaf92181a, 0x06144eb9, 0x5e94ac6e,
-    0x151f9224, 0x4d9f70f3, 0xe4192650, 0xbc99c487, 0x6c429df1,
-    0x34c27f26, 0x9d442985, 0xc5c4cb52, 0x8e4ff518, 0xd6cf17cf,
-    0x7f49416c, 0x27c9a3bb, 0xe95f3cf8, 0xb1dfde2f, 0x1859888c,
-    0x40d96a5b, 0x0b525411, 0x53d2b6c6, 0xfa54e065, 0xa2d402b2,
-    0x6679dfe2, 0x3ef93d35, 0x977f6b96, 0xcfff8941, 0x8474b70b,
-    0xdcf455dc, 0x7572037f, 0x2df2e1a8, 0xe3647eeb, 0xbbe49c3c,
-    0x1262ca9f, 0x4ae22848, 0x01691602, 0x59e9f4d5, 0xf06fa276,
-    0xa8ef40a1},
-   {0x00000000, 0x463b6765, 0x8c76ceca, 0xca4da9af, 0x59ebed4e,
-    0x1fd08a2b, 0xd59d2384, 0x93a644e1, 0xb2d6db9d, 0xf4edbcf8,
-    0x3ea01557, 0x789b7232, 0xeb3d36d3, 0xad0651b6, 0x674bf819,
-    0x21709f7c, 0x25abc6e0, 0x6390a185, 0xa9dd082a, 0xefe66f4f,
-    0x7c402bae, 0x3a7b4ccb, 0xf036e564, 0xb60d8201, 0x977d1d7d,
-    0xd1467a18, 0x1b0bd3b7, 0x5d30b4d2, 0xce96f033, 0x88ad9756,
-    0x42e03ef9, 0x04db599c, 0x0b50fc1a, 0x4d6b9b7f, 0x872632d0,
-    0xc11d55b5, 0x52bb1154, 0x14807631, 0xdecddf9e, 0x98f6b8fb,
-    0xb9862787, 0xffbd40e2, 0x35f0e94d, 0x73cb8e28, 0xe06dcac9,
-    0xa656adac, 0x6c1b0403, 0x2a206366, 0x2efb3afa, 0x68c05d9f,
-    0xa28df430, 0xe4b69355, 0x7710d7b4, 0x312bb0d1, 0xfb66197e,
-    0xbd5d7e1b, 0x9c2de167, 0xda168602, 0x105b2fad, 0x566048c8,
-    0xc5c60c29, 0x83fd6b4c, 0x49b0c2e3, 0x0f8ba586, 0x16a0f835,
-    0x509b9f50, 0x9ad636ff, 0xdced519a, 0x4f4b157b, 0x0970721e,
-    0xc33ddbb1, 0x8506bcd4, 0xa47623a8, 0xe24d44cd, 0x2800ed62,
-    0x6e3b8a07, 0xfd9dcee6, 0xbba6a983, 0x71eb002c, 0x37d06749,
-    0x330b3ed5, 0x753059b0, 0xbf7df01f, 0xf946977a, 0x6ae0d39b,
-    0x2cdbb4fe, 0xe6961d51, 0xa0ad7a34, 0x81dde548, 0xc7e6822d,
-    0x0dab2b82, 0x4b904ce7, 0xd8360806, 0x9e0d6f63, 0x5440c6cc,
-    0x127ba1a9, 0x1df0042f, 0x5bcb634a, 0x9186cae5, 0xd7bdad80,
-    0x441be961, 0x02208e04, 0xc86d27ab, 0x8e5640ce, 0xaf26dfb2,
-    0xe91db8d7, 0x23501178, 0x656b761d, 0xf6cd32fc, 0xb0f65599,
-    0x7abbfc36, 0x3c809b53, 0x385bc2cf, 0x7e60a5aa, 0xb42d0c05,
-    0xf2166b60, 0x61b02f81, 0x278b48e4, 0xedc6e14b, 0xabfd862e,
-    0x8a8d1952, 0xccb67e37, 0x06fbd798, 0x40c0b0fd, 0xd366f41c,
-    0x955d9379, 0x5f103ad6, 0x192b5db3, 0x2c40f16b, 0x6a7b960e,
-    0xa0363fa1, 0xe60d58c4, 0x75ab1c25, 0x33907b40, 0xf9ddd2ef,
-    0xbfe6b58a, 0x9e962af6, 0xd8ad4d93, 0x12e0e43c, 0x54db8359,
-    0xc77dc7b8, 0x8146a0dd, 0x4b0b0972, 0x0d306e17, 0x09eb378b,
-    0x4fd050ee, 0x859df941, 0xc3a69e24, 0x5000dac5, 0x163bbda0,
-    0xdc76140f, 0x9a4d736a, 0xbb3dec16, 0xfd068b73, 0x374b22dc,
-    0x717045b9, 0xe2d60158, 0xa4ed663d, 0x6ea0cf92, 0x289ba8f7,
-    0x27100d71, 0x612b6a14, 0xab66c3bb, 0xed5da4de, 0x7efbe03f,
-    0x38c0875a, 0xf28d2ef5, 0xb4b64990, 0x95c6d6ec, 0xd3fdb189,
-    0x19b01826, 0x5f8b7f43, 0xcc2d3ba2, 0x8a165cc7, 0x405bf568,
-    0x0660920d, 0x02bbcb91, 0x4480acf4, 0x8ecd055b, 0xc8f6623e,
-    0x5b5026df, 0x1d6b41ba, 0xd726e815, 0x911d8f70, 0xb06d100c,
-    0xf6567769, 0x3c1bdec6, 0x7a20b9a3, 0xe986fd42, 0xafbd9a27,
-    0x65f03388, 0x23cb54ed, 0x3ae0095e, 0x7cdb6e3b, 0xb696c794,
-    0xf0ada0f1, 0x630be410, 0x25308375, 0xef7d2ada, 0xa9464dbf,
-    0x8836d2c3, 0xce0db5a6, 0x04401c09, 0x427b7b6c, 0xd1dd3f8d,
-    0x97e658e8, 0x5dabf147, 0x1b909622, 0x1f4bcfbe, 0x5970a8db,
-    0x933d0174, 0xd5066611, 0x46a022f0, 0x009b4595, 0xcad6ec3a,
-    0x8ced8b5f, 0xad9d1423, 0xeba67346, 0x21ebdae9, 0x67d0bd8c,
-    0xf476f96d, 0xb24d9e08, 0x780037a7, 0x3e3b50c2, 0x31b0f544,
-    0x778b9221, 0xbdc63b8e, 0xfbfd5ceb, 0x685b180a, 0x2e607f6f,
-    0xe42dd6c0, 0xa216b1a5, 0x83662ed9, 0xc55d49bc, 0x0f10e013,
-    0x492b8776, 0xda8dc397, 0x9cb6a4f2, 0x56fb0d5d, 0x10c06a38,
-    0x141b33a4, 0x522054c1, 0x986dfd6e, 0xde569a0b, 0x4df0deea,
-    0x0bcbb98f, 0xc1861020, 0x87bd7745, 0xa6cde839, 0xe0f68f5c,
-    0x2abb26f3, 0x6c804196, 0xff260577, 0xb91d6212, 0x7350cbbd,
-    0x356bacd8}};
-
-#endif /* W */
-
-#endif /* N == 5 */
-#if N == 6
-
-#if W == 8
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0x3db1ecdc, 0x7b63d9b8, 0x46d23564, 0xf6c7b370,
-    0xcb765fac, 0x8da46ac8, 0xb0158614, 0x36fe60a1, 0x0b4f8c7d,
-    0x4d9db919, 0x702c55c5, 0xc039d3d1, 0xfd883f0d, 0xbb5a0a69,
-    0x86ebe6b5, 0x6dfcc142, 0x504d2d9e, 0x169f18fa, 0x2b2ef426,
-    0x9b3b7232, 0xa68a9eee, 0xe058ab8a, 0xdde94756, 0x5b02a1e3,
-    0x66b34d3f, 0x2061785b, 0x1dd09487, 0xadc51293, 0x9074fe4f,
-    0xd6a6cb2b, 0xeb1727f7, 0xdbf98284, 0xe6486e58, 0xa09a5b3c,
-    0x9d2bb7e0, 0x2d3e31f4, 0x108fdd28, 0x565de84c, 0x6bec0490,
-    0xed07e225, 0xd0b60ef9, 0x96643b9d, 0xabd5d741, 0x1bc05155,
-    0x2671bd89, 0x60a388ed, 0x5d126431, 0xb60543c6, 0x8bb4af1a,
-    0xcd669a7e, 0xf0d776a2, 0x40c2f0b6, 0x7d731c6a, 0x3ba1290e,
-    0x0610c5d2, 0x80fb2367, 0xbd4acfbb, 0xfb98fadf, 0xc6291603,
-    0x763c9017, 0x4b8d7ccb, 0x0d5f49af, 0x30eea573, 0x6c820349,
-    0x5133ef95, 0x17e1daf1, 0x2a50362d, 0x9a45b039, 0xa7f45ce5,
-    0xe1266981, 0xdc97855d, 0x5a7c63e8, 0x67cd8f34, 0x211fba50,
-    0x1cae568c, 0xacbbd098, 0x910a3c44, 0xd7d80920, 0xea69e5fc,
-    0x017ec20b, 0x3ccf2ed7, 0x7a1d1bb3, 0x47acf76f, 0xf7b9717b,
-    0xca089da7, 0x8cdaa8c3, 0xb16b441f, 0x3780a2aa, 0x0a314e76,
-    0x4ce37b12, 0x715297ce, 0xc14711da, 0xfcf6fd06, 0xba24c862,
-    0x879524be, 0xb77b81cd, 0x8aca6d11, 0xcc185875, 0xf1a9b4a9,
-    0x41bc32bd, 0x7c0dde61, 0x3adfeb05, 0x076e07d9, 0x8185e16c,
-    0xbc340db0, 0xfae638d4, 0xc757d408, 0x7742521c, 0x4af3bec0,
-    0x0c218ba4, 0x31906778, 0xda87408f, 0xe736ac53, 0xa1e49937,
-    0x9c5575eb, 0x2c40f3ff, 0x11f11f23, 0x57232a47, 0x6a92c69b,
-    0xec79202e, 0xd1c8ccf2, 0x971af996, 0xaaab154a, 0x1abe935e,
-    0x270f7f82, 0x61dd4ae6, 0x5c6ca63a, 0xd9040692, 0xe4b5ea4e,
-    0xa267df2a, 0x9fd633f6, 0x2fc3b5e2, 0x1272593e, 0x54a06c5a,
-    0x69118086, 0xeffa6633, 0xd24b8aef, 0x9499bf8b, 0xa9285357,
-    0x193dd543, 0x248c399f, 0x625e0cfb, 0x5fefe027, 0xb4f8c7d0,
-    0x89492b0c, 0xcf9b1e68, 0xf22af2b4, 0x423f74a0, 0x7f8e987c,
-    0x395cad18, 0x04ed41c4, 0x8206a771, 0xbfb74bad, 0xf9657ec9,
-    0xc4d49215, 0x74c11401, 0x4970f8dd, 0x0fa2cdb9, 0x32132165,
-    0x02fd8416, 0x3f4c68ca, 0x799e5dae, 0x442fb172, 0xf43a3766,
-    0xc98bdbba, 0x8f59eede, 0xb2e80202, 0x3403e4b7, 0x09b2086b,
-    0x4f603d0f, 0x72d1d1d3, 0xc2c457c7, 0xff75bb1b, 0xb9a78e7f,
-    0x841662a3, 0x6f014554, 0x52b0a988, 0x14629cec, 0x29d37030,
-    0x99c6f624, 0xa4771af8, 0xe2a52f9c, 0xdf14c340, 0x59ff25f5,
-    0x644ec929, 0x229cfc4d, 0x1f2d1091, 0xaf389685, 0x92897a59,
-    0xd45b4f3d, 0xe9eaa3e1, 0xb58605db, 0x8837e907, 0xcee5dc63,
-    0xf35430bf, 0x4341b6ab, 0x7ef05a77, 0x38226f13, 0x059383cf,
-    0x8378657a, 0xbec989a6, 0xf81bbcc2, 0xc5aa501e, 0x75bfd60a,
-    0x480e3ad6, 0x0edc0fb2, 0x336de36e, 0xd87ac499, 0xe5cb2845,
-    0xa3191d21, 0x9ea8f1fd, 0x2ebd77e9, 0x130c9b35, 0x55deae51,
-    0x686f428d, 0xee84a438, 0xd33548e4, 0x95e77d80, 0xa856915c,
-    0x18431748, 0x25f2fb94, 0x6320cef0, 0x5e91222c, 0x6e7f875f,
-    0x53ce6b83, 0x151c5ee7, 0x28adb23b, 0x98b8342f, 0xa509d8f3,
-    0xe3dbed97, 0xde6a014b, 0x5881e7fe, 0x65300b22, 0x23e23e46,
-    0x1e53d29a, 0xae46548e, 0x93f7b852, 0xd5258d36, 0xe89461ea,
-    0x0383461d, 0x3e32aac1, 0x78e09fa5, 0x45517379, 0xf544f56d,
-    0xc8f519b1, 0x8e272cd5, 0xb396c009, 0x357d26bc, 0x08ccca60,
-    0x4e1eff04, 0x73af13d8, 0xc3ba95cc, 0xfe0b7910, 0xb8d94c74,
-    0x8568a0a8},
-   {0x00000000, 0x69790b65, 0xd2f216ca, 0xbb8b1daf, 0x7e952bd5,
-    0x17ec20b0, 0xac673d1f, 0xc51e367a, 0xfd2a57aa, 0x94535ccf,
-    0x2fd84160, 0x46a14a05, 0x83bf7c7f, 0xeac6771a, 0x514d6ab5,
-    0x383461d0, 0x2125a915, 0x485ca270, 0xf3d7bfdf, 0x9aaeb4ba,
-    0x5fb082c0, 0x36c989a5, 0x8d42940a, 0xe43b9f6f, 0xdc0ffebf,
-    0xb576f5da, 0x0efde875, 0x6784e310, 0xa29ad56a, 0xcbe3de0f,
-    0x7068c3a0, 0x1911c8c5, 0x424b522a, 0x2b32594f, 0x90b944e0,
-    0xf9c04f85, 0x3cde79ff, 0x55a7729a, 0xee2c6f35, 0x87556450,
-    0xbf610580, 0xd6180ee5, 0x6d93134a, 0x04ea182f, 0xc1f42e55,
-    0xa88d2530, 0x1306389f, 0x7a7f33fa, 0x636efb3f, 0x0a17f05a,
-    0xb19cedf5, 0xd8e5e690, 0x1dfbd0ea, 0x7482db8f, 0xcf09c620,
-    0xa670cd45, 0x9e44ac95, 0xf73da7f0, 0x4cb6ba5f, 0x25cfb13a,
-    0xe0d18740, 0x89a88c25, 0x3223918a, 0x5b5a9aef, 0x8496a454,
-    0xedefaf31, 0x5664b29e, 0x3f1db9fb, 0xfa038f81, 0x937a84e4,
-    0x28f1994b, 0x4188922e, 0x79bcf3fe, 0x10c5f89b, 0xab4ee534,
-    0xc237ee51, 0x0729d82b, 0x6e50d34e, 0xd5dbcee1, 0xbca2c584,
-    0xa5b30d41, 0xccca0624, 0x77411b8b, 0x1e3810ee, 0xdb262694,
-    0xb25f2df1, 0x09d4305e, 0x60ad3b3b, 0x58995aeb, 0x31e0518e,
-    0x8a6b4c21, 0xe3124744, 0x260c713e, 0x4f757a5b, 0xf4fe67f4,
-    0x9d876c91, 0xc6ddf67e, 0xafa4fd1b, 0x142fe0b4, 0x7d56ebd1,
-    0xb848ddab, 0xd131d6ce, 0x6abacb61, 0x03c3c004, 0x3bf7a1d4,
-    0x528eaab1, 0xe905b71e, 0x807cbc7b, 0x45628a01, 0x2c1b8164,
-    0x97909ccb, 0xfee997ae, 0xe7f85f6b, 0x8e81540e, 0x350a49a1,
-    0x5c7342c4, 0x996d74be, 0xf0147fdb, 0x4b9f6274, 0x22e66911,
-    0x1ad208c1, 0x73ab03a4, 0xc8201e0b, 0xa159156e, 0x64472314,
-    0x0d3e2871, 0xb6b535de, 0xdfcc3ebb, 0xd25c4ee9, 0xbb25458c,
-    0x00ae5823, 0x69d75346, 0xacc9653c, 0xc5b06e59, 0x7e3b73f6,
-    0x17427893, 0x2f761943, 0x460f1226, 0xfd840f89, 0x94fd04ec,
-    0x51e33296, 0x389a39f3, 0x8311245c, 0xea682f39, 0xf379e7fc,
-    0x9a00ec99, 0x218bf136, 0x48f2fa53, 0x8deccc29, 0xe495c74c,
-    0x5f1edae3, 0x3667d186, 0x0e53b056, 0x672abb33, 0xdca1a69c,
-    0xb5d8adf9, 0x70c69b83, 0x19bf90e6, 0xa2348d49, 0xcb4d862c,
-    0x90171cc3, 0xf96e17a6, 0x42e50a09, 0x2b9c016c, 0xee823716,
-    0x87fb3c73, 0x3c7021dc, 0x55092ab9, 0x6d3d4b69, 0x0444400c,
-    0xbfcf5da3, 0xd6b656c6, 0x13a860bc, 0x7ad16bd9, 0xc15a7676,
-    0xa8237d13, 0xb132b5d6, 0xd84bbeb3, 0x63c0a31c, 0x0ab9a879,
-    0xcfa79e03, 0xa6de9566, 0x1d5588c9, 0x742c83ac, 0x4c18e27c,
-    0x2561e919, 0x9eeaf4b6, 0xf793ffd3, 0x328dc9a9, 0x5bf4c2cc,
-    0xe07fdf63, 0x8906d406, 0x56caeabd, 0x3fb3e1d8, 0x8438fc77,
-    0xed41f712, 0x285fc168, 0x4126ca0d, 0xfaadd7a2, 0x93d4dcc7,
-    0xabe0bd17, 0xc299b672, 0x7912abdd, 0x106ba0b8, 0xd57596c2,
-    0xbc0c9da7, 0x07878008, 0x6efe8b6d, 0x77ef43a8, 0x1e9648cd,
-    0xa51d5562, 0xcc645e07, 0x097a687d, 0x60036318, 0xdb887eb7,
-    0xb2f175d2, 0x8ac51402, 0xe3bc1f67, 0x583702c8, 0x314e09ad,
-    0xf4503fd7, 0x9d2934b2, 0x26a2291d, 0x4fdb2278, 0x1481b897,
-    0x7df8b3f2, 0xc673ae5d, 0xaf0aa538, 0x6a149342, 0x036d9827,
-    0xb8e68588, 0xd19f8eed, 0xe9abef3d, 0x80d2e458, 0x3b59f9f7,
-    0x5220f292, 0x973ec4e8, 0xfe47cf8d, 0x45ccd222, 0x2cb5d947,
-    0x35a41182, 0x5cdd1ae7, 0xe7560748, 0x8e2f0c2d, 0x4b313a57,
-    0x22483132, 0x99c32c9d, 0xf0ba27f8, 0xc88e4628, 0xa1f74d4d,
-    0x1a7c50e2, 0x73055b87, 0xb61b6dfd, 0xdf626698, 0x64e97b37,
-    0x0d907052},
-   {0x00000000, 0x7fc99b93, 0xff933726, 0x805aacb5, 0x2457680d,
-    0x5b9ef39e, 0xdbc45f2b, 0xa40dc4b8, 0x48aed01a, 0x37674b89,
-    0xb73de73c, 0xc8f47caf, 0x6cf9b817, 0x13302384, 0x936a8f31,
-    0xeca314a2, 0x915da034, 0xee943ba7, 0x6ece9712, 0x11070c81,
-    0xb50ac839, 0xcac353aa, 0x4a99ff1f, 0x3550648c, 0xd9f3702e,
-    0xa63aebbd, 0x26604708, 0x59a9dc9b, 0xfda41823, 0x826d83b0,
-    0x02372f05, 0x7dfeb496, 0xf9ca4629, 0x8603ddba, 0x0659710f,
-    0x7990ea9c, 0xdd9d2e24, 0xa254b5b7, 0x220e1902, 0x5dc78291,
-    0xb1649633, 0xcead0da0, 0x4ef7a115, 0x313e3a86, 0x9533fe3e,
-    0xeafa65ad, 0x6aa0c918, 0x1569528b, 0x6897e61d, 0x175e7d8e,
-    0x9704d13b, 0xe8cd4aa8, 0x4cc08e10, 0x33091583, 0xb353b936,
-    0xcc9a22a5, 0x20393607, 0x5ff0ad94, 0xdfaa0121, 0xa0639ab2,
-    0x046e5e0a, 0x7ba7c599, 0xfbfd692c, 0x8434f2bf, 0x28e58a13,
-    0x572c1180, 0xd776bd35, 0xa8bf26a6, 0x0cb2e21e, 0x737b798d,
-    0xf321d538, 0x8ce84eab, 0x604b5a09, 0x1f82c19a, 0x9fd86d2f,
-    0xe011f6bc, 0x441c3204, 0x3bd5a997, 0xbb8f0522, 0xc4469eb1,
-    0xb9b82a27, 0xc671b1b4, 0x462b1d01, 0x39e28692, 0x9def422a,
-    0xe226d9b9, 0x627c750c, 0x1db5ee9f, 0xf116fa3d, 0x8edf61ae,
-    0x0e85cd1b, 0x714c5688, 0xd5419230, 0xaa8809a3, 0x2ad2a516,
-    0x551b3e85, 0xd12fcc3a, 0xaee657a9, 0x2ebcfb1c, 0x5175608f,
-    0xf578a437, 0x8ab13fa4, 0x0aeb9311, 0x75220882, 0x99811c20,
-    0xe64887b3, 0x66122b06, 0x19dbb095, 0xbdd6742d, 0xc21fefbe,
-    0x4245430b, 0x3d8cd898, 0x40726c0e, 0x3fbbf79d, 0xbfe15b28,
-    0xc028c0bb, 0x64250403, 0x1bec9f90, 0x9bb63325, 0xe47fa8b6,
-    0x08dcbc14, 0x77152787, 0xf74f8b32, 0x888610a1, 0x2c8bd419,
-    0x53424f8a, 0xd318e33f, 0xacd178ac, 0x51cb1426, 0x2e028fb5,
-    0xae582300, 0xd191b893, 0x759c7c2b, 0x0a55e7b8, 0x8a0f4b0d,
-    0xf5c6d09e, 0x1965c43c, 0x66ac5faf, 0xe6f6f31a, 0x993f6889,
-    0x3d32ac31, 0x42fb37a2, 0xc2a19b17, 0xbd680084, 0xc096b412,
-    0xbf5f2f81, 0x3f058334, 0x40cc18a7, 0xe4c1dc1f, 0x9b08478c,
-    0x1b52eb39, 0x649b70aa, 0x88386408, 0xf7f1ff9b, 0x77ab532e,
-    0x0862c8bd, 0xac6f0c05, 0xd3a69796, 0x53fc3b23, 0x2c35a0b0,
-    0xa801520f, 0xd7c8c99c, 0x57926529, 0x285bfeba, 0x8c563a02,
-    0xf39fa191, 0x73c50d24, 0x0c0c96b7, 0xe0af8215, 0x9f661986,
-    0x1f3cb533, 0x60f52ea0, 0xc4f8ea18, 0xbb31718b, 0x3b6bdd3e,
-    0x44a246ad, 0x395cf23b, 0x469569a8, 0xc6cfc51d, 0xb9065e8e,
-    0x1d0b9a36, 0x62c201a5, 0xe298ad10, 0x9d513683, 0x71f22221,
-    0x0e3bb9b2, 0x8e611507, 0xf1a88e94, 0x55a54a2c, 0x2a6cd1bf,
-    0xaa367d0a, 0xd5ffe699, 0x792e9e35, 0x06e705a6, 0x86bda913,
-    0xf9743280, 0x5d79f638, 0x22b06dab, 0xa2eac11e, 0xdd235a8d,
-    0x31804e2f, 0x4e49d5bc, 0xce137909, 0xb1dae29a, 0x15d72622,
-    0x6a1ebdb1, 0xea441104, 0x958d8a97, 0xe8733e01, 0x97baa592,
-    0x17e00927, 0x682992b4, 0xcc24560c, 0xb3edcd9f, 0x33b7612a,
-    0x4c7efab9, 0xa0ddee1b, 0xdf147588, 0x5f4ed93d, 0x208742ae,
-    0x848a8616, 0xfb431d85, 0x7b19b130, 0x04d02aa3, 0x80e4d81c,
-    0xff2d438f, 0x7f77ef3a, 0x00be74a9, 0xa4b3b011, 0xdb7a2b82,
-    0x5b208737, 0x24e91ca4, 0xc84a0806, 0xb7839395, 0x37d93f20,
-    0x4810a4b3, 0xec1d600b, 0x93d4fb98, 0x138e572d, 0x6c47ccbe,
-    0x11b97828, 0x6e70e3bb, 0xee2a4f0e, 0x91e3d49d, 0x35ee1025,
-    0x4a278bb6, 0xca7d2703, 0xb5b4bc90, 0x5917a832, 0x26de33a1,
-    0xa6849f14, 0xd94d0487, 0x7d40c03f, 0x02895bac, 0x82d3f719,
-    0xfd1a6c8a},
-   {0x00000000, 0xa396284c, 0x9c5d56d9, 0x3fcb7e95, 0xe3cbabf3,
-    0x405d83bf, 0x7f96fd2a, 0xdc00d566, 0x1ce651a7, 0xbf7079eb,
-    0x80bb077e, 0x232d2f32, 0xff2dfa54, 0x5cbbd218, 0x6370ac8d,
-    0xc0e684c1, 0x39cca34e, 0x9a5a8b02, 0xa591f597, 0x0607dddb,
-    0xda0708bd, 0x799120f1, 0x465a5e64, 0xe5cc7628, 0x252af2e9,
-    0x86bcdaa5, 0xb977a430, 0x1ae18c7c, 0xc6e1591a, 0x65777156,
-    0x5abc0fc3, 0xf92a278f, 0x7399469c, 0xd00f6ed0, 0xefc41045,
-    0x4c523809, 0x9052ed6f, 0x33c4c523, 0x0c0fbbb6, 0xaf9993fa,
-    0x6f7f173b, 0xcce93f77, 0xf32241e2, 0x50b469ae, 0x8cb4bcc8,
-    0x2f229484, 0x10e9ea11, 0xb37fc25d, 0x4a55e5d2, 0xe9c3cd9e,
-    0xd608b30b, 0x759e9b47, 0xa99e4e21, 0x0a08666d, 0x35c318f8,
-    0x965530b4, 0x56b3b475, 0xf5259c39, 0xcaeee2ac, 0x6978cae0,
-    0xb5781f86, 0x16ee37ca, 0x2925495f, 0x8ab36113, 0xe7328d38,
-    0x44a4a574, 0x7b6fdbe1, 0xd8f9f3ad, 0x04f926cb, 0xa76f0e87,
-    0x98a47012, 0x3b32585e, 0xfbd4dc9f, 0x5842f4d3, 0x67898a46,
-    0xc41fa20a, 0x181f776c, 0xbb895f20, 0x844221b5, 0x27d409f9,
-    0xdefe2e76, 0x7d68063a, 0x42a378af, 0xe13550e3, 0x3d358585,
-    0x9ea3adc9, 0xa168d35c, 0x02fefb10, 0xc2187fd1, 0x618e579d,
-    0x5e452908, 0xfdd30144, 0x21d3d422, 0x8245fc6e, 0xbd8e82fb,
-    0x1e18aab7, 0x94abcba4, 0x373de3e8, 0x08f69d7d, 0xab60b531,
-    0x77606057, 0xd4f6481b, 0xeb3d368e, 0x48ab1ec2, 0x884d9a03,
-    0x2bdbb24f, 0x1410ccda, 0xb786e496, 0x6b8631f0, 0xc81019bc,
-    0xf7db6729, 0x544d4f65, 0xad6768ea, 0x0ef140a6, 0x313a3e33,
-    0x92ac167f, 0x4eacc319, 0xed3aeb55, 0xd2f195c0, 0x7167bd8c,
-    0xb181394d, 0x12171101, 0x2ddc6f94, 0x8e4a47d8, 0x524a92be,
-    0xf1dcbaf2, 0xce17c467, 0x6d81ec2b, 0x15141c31, 0xb682347d,
-    0x89494ae8, 0x2adf62a4, 0xf6dfb7c2, 0x55499f8e, 0x6a82e11b,
-    0xc914c957, 0x09f24d96, 0xaa6465da, 0x95af1b4f, 0x36393303,
-    0xea39e665, 0x49afce29, 0x7664b0bc, 0xd5f298f0, 0x2cd8bf7f,
-    0x8f4e9733, 0xb085e9a6, 0x1313c1ea, 0xcf13148c, 0x6c853cc0,
-    0x534e4255, 0xf0d86a19, 0x303eeed8, 0x93a8c694, 0xac63b801,
-    0x0ff5904d, 0xd3f5452b, 0x70636d67, 0x4fa813f2, 0xec3e3bbe,
-    0x668d5aad, 0xc51b72e1, 0xfad00c74, 0x59462438, 0x8546f15e,
-    0x26d0d912, 0x191ba787, 0xba8d8fcb, 0x7a6b0b0a, 0xd9fd2346,
-    0xe6365dd3, 0x45a0759f, 0x99a0a0f9, 0x3a3688b5, 0x05fdf620,
-    0xa66bde6c, 0x5f41f9e3, 0xfcd7d1af, 0xc31caf3a, 0x608a8776,
-    0xbc8a5210, 0x1f1c7a5c, 0x20d704c9, 0x83412c85, 0x43a7a844,
-    0xe0318008, 0xdffafe9d, 0x7c6cd6d1, 0xa06c03b7, 0x03fa2bfb,
-    0x3c31556e, 0x9fa77d22, 0xf2269109, 0x51b0b945, 0x6e7bc7d0,
-    0xcdedef9c, 0x11ed3afa, 0xb27b12b6, 0x8db06c23, 0x2e26446f,
-    0xeec0c0ae, 0x4d56e8e2, 0x729d9677, 0xd10bbe3b, 0x0d0b6b5d,
-    0xae9d4311, 0x91563d84, 0x32c015c8, 0xcbea3247, 0x687c1a0b,
-    0x57b7649e, 0xf4214cd2, 0x282199b4, 0x8bb7b1f8, 0xb47ccf6d,
-    0x17eae721, 0xd70c63e0, 0x749a4bac, 0x4b513539, 0xe8c71d75,
-    0x34c7c813, 0x9751e05f, 0xa89a9eca, 0x0b0cb686, 0x81bfd795,
-    0x2229ffd9, 0x1de2814c, 0xbe74a900, 0x62747c66, 0xc1e2542a,
-    0xfe292abf, 0x5dbf02f3, 0x9d598632, 0x3ecfae7e, 0x0104d0eb,
-    0xa292f8a7, 0x7e922dc1, 0xdd04058d, 0xe2cf7b18, 0x41595354,
-    0xb87374db, 0x1be55c97, 0x242e2202, 0x87b80a4e, 0x5bb8df28,
-    0xf82ef764, 0xc7e589f1, 0x6473a1bd, 0xa495257c, 0x07030d30,
-    0x38c873a5, 0x9b5e5be9, 0x475e8e8f, 0xe4c8a6c3, 0xdb03d856,
-    0x7895f01a},
-   {0x00000000, 0x2a283862, 0x545070c4, 0x7e7848a6, 0xa8a0e188,
-    0x8288d9ea, 0xfcf0914c, 0xd6d8a92e, 0x8a30c551, 0xa018fd33,
-    0xde60b595, 0xf4488df7, 0x229024d9, 0x08b81cbb, 0x76c0541d,
-    0x5ce86c7f, 0xcf108ce3, 0xe538b481, 0x9b40fc27, 0xb168c445,
-    0x67b06d6b, 0x4d985509, 0x33e01daf, 0x19c825cd, 0x452049b2,
-    0x6f0871d0, 0x11703976, 0x3b580114, 0xed80a83a, 0xc7a89058,
-    0xb9d0d8fe, 0x93f8e09c, 0x45501f87, 0x6f7827e5, 0x11006f43,
-    0x3b285721, 0xedf0fe0f, 0xc7d8c66d, 0xb9a08ecb, 0x9388b6a9,
-    0xcf60dad6, 0xe548e2b4, 0x9b30aa12, 0xb1189270, 0x67c03b5e,
-    0x4de8033c, 0x33904b9a, 0x19b873f8, 0x8a409364, 0xa068ab06,
-    0xde10e3a0, 0xf438dbc2, 0x22e072ec, 0x08c84a8e, 0x76b00228,
-    0x5c983a4a, 0x00705635, 0x2a586e57, 0x542026f1, 0x7e081e93,
-    0xa8d0b7bd, 0x82f88fdf, 0xfc80c779, 0xd6a8ff1b, 0x8aa03f0e,
-    0xa088076c, 0xdef04fca, 0xf4d877a8, 0x2200de86, 0x0828e6e4,
-    0x7650ae42, 0x5c789620, 0x0090fa5f, 0x2ab8c23d, 0x54c08a9b,
-    0x7ee8b2f9, 0xa8301bd7, 0x821823b5, 0xfc606b13, 0xd6485371,
-    0x45b0b3ed, 0x6f988b8f, 0x11e0c329, 0x3bc8fb4b, 0xed105265,
-    0xc7386a07, 0xb94022a1, 0x93681ac3, 0xcf8076bc, 0xe5a84ede,
-    0x9bd00678, 0xb1f83e1a, 0x67209734, 0x4d08af56, 0x3370e7f0,
-    0x1958df92, 0xcff02089, 0xe5d818eb, 0x9ba0504d, 0xb188682f,
-    0x6750c101, 0x4d78f963, 0x3300b1c5, 0x192889a7, 0x45c0e5d8,
-    0x6fe8ddba, 0x1190951c, 0x3bb8ad7e, 0xed600450, 0xc7483c32,
-    0xb9307494, 0x93184cf6, 0x00e0ac6a, 0x2ac89408, 0x54b0dcae,
-    0x7e98e4cc, 0xa8404de2, 0x82687580, 0xfc103d26, 0xd6380544,
-    0x8ad0693b, 0xa0f85159, 0xde8019ff, 0xf4a8219d, 0x227088b3,
-    0x0858b0d1, 0x7620f877, 0x5c08c015, 0xce31785d, 0xe419403f,
-    0x9a610899, 0xb04930fb, 0x669199d5, 0x4cb9a1b7, 0x32c1e911,
-    0x18e9d173, 0x4401bd0c, 0x6e29856e, 0x1051cdc8, 0x3a79f5aa,
-    0xeca15c84, 0xc68964e6, 0xb8f12c40, 0x92d91422, 0x0121f4be,
-    0x2b09ccdc, 0x5571847a, 0x7f59bc18, 0xa9811536, 0x83a92d54,
-    0xfdd165f2, 0xd7f95d90, 0x8b1131ef, 0xa139098d, 0xdf41412b,
-    0xf5697949, 0x23b1d067, 0x0999e805, 0x77e1a0a3, 0x5dc998c1,
-    0x8b6167da, 0xa1495fb8, 0xdf31171e, 0xf5192f7c, 0x23c18652,
-    0x09e9be30, 0x7791f696, 0x5db9cef4, 0x0151a28b, 0x2b799ae9,
-    0x5501d24f, 0x7f29ea2d, 0xa9f14303, 0x83d97b61, 0xfda133c7,
-    0xd7890ba5, 0x4471eb39, 0x6e59d35b, 0x10219bfd, 0x3a09a39f,
-    0xecd10ab1, 0xc6f932d3, 0xb8817a75, 0x92a94217, 0xce412e68,
-    0xe469160a, 0x9a115eac, 0xb03966ce, 0x66e1cfe0, 0x4cc9f782,
-    0x32b1bf24, 0x18998746, 0x44914753, 0x6eb97f31, 0x10c13797,
-    0x3ae90ff5, 0xec31a6db, 0xc6199eb9, 0xb861d61f, 0x9249ee7d,
-    0xcea18202, 0xe489ba60, 0x9af1f2c6, 0xb0d9caa4, 0x6601638a,
-    0x4c295be8, 0x3251134e, 0x18792b2c, 0x8b81cbb0, 0xa1a9f3d2,
-    0xdfd1bb74, 0xf5f98316, 0x23212a38, 0x0909125a, 0x77715afc,
-    0x5d59629e, 0x01b10ee1, 0x2b993683, 0x55e17e25, 0x7fc94647,
-    0xa911ef69, 0x8339d70b, 0xfd419fad, 0xd769a7cf, 0x01c158d4,
-    0x2be960b6, 0x55912810, 0x7fb91072, 0xa961b95c, 0x8349813e,
-    0xfd31c998, 0xd719f1fa, 0x8bf19d85, 0xa1d9a5e7, 0xdfa1ed41,
-    0xf589d523, 0x23517c0d, 0x0979446f, 0x77010cc9, 0x5d2934ab,
-    0xced1d437, 0xe4f9ec55, 0x9a81a4f3, 0xb0a99c91, 0x667135bf,
-    0x4c590ddd, 0x3221457b, 0x18097d19, 0x44e11166, 0x6ec92904,
-    0x10b161a2, 0x3a9959c0, 0xec41f0ee, 0xc669c88c, 0xb811802a,
-    0x9239b848},
-   {0x00000000, 0x4713f6fb, 0x8e27edf6, 0xc9341b0d, 0xc73eddad,
-    0x802d2b56, 0x4919305b, 0x0e0ac6a0, 0x550cbd1b, 0x121f4be0,
-    0xdb2b50ed, 0x9c38a616, 0x923260b6, 0xd521964d, 0x1c158d40,
-    0x5b067bbb, 0xaa197a36, 0xed0a8ccd, 0x243e97c0, 0x632d613b,
-    0x6d27a79b, 0x2a345160, 0xe3004a6d, 0xa413bc96, 0xff15c72d,
-    0xb80631d6, 0x71322adb, 0x3621dc20, 0x382b1a80, 0x7f38ec7b,
-    0xb60cf776, 0xf11f018d, 0x8f43f22d, 0xc85004d6, 0x01641fdb,
-    0x4677e920, 0x487d2f80, 0x0f6ed97b, 0xc65ac276, 0x8149348d,
-    0xda4f4f36, 0x9d5cb9cd, 0x5468a2c0, 0x137b543b, 0x1d71929b,
-    0x5a626460, 0x93567f6d, 0xd4458996, 0x255a881b, 0x62497ee0,
-    0xab7d65ed, 0xec6e9316, 0xe26455b6, 0xa577a34d, 0x6c43b840,
-    0x2b504ebb, 0x70563500, 0x3745c3fb, 0xfe71d8f6, 0xb9622e0d,
-    0xb768e8ad, 0xf07b1e56, 0x394f055b, 0x7e5cf3a0, 0xc5f6e21b,
-    0x82e514e0, 0x4bd10fed, 0x0cc2f916, 0x02c83fb6, 0x45dbc94d,
-    0x8cefd240, 0xcbfc24bb, 0x90fa5f00, 0xd7e9a9fb, 0x1eddb2f6,
-    0x59ce440d, 0x57c482ad, 0x10d77456, 0xd9e36f5b, 0x9ef099a0,
-    0x6fef982d, 0x28fc6ed6, 0xe1c875db, 0xa6db8320, 0xa8d14580,
-    0xefc2b37b, 0x26f6a876, 0x61e55e8d, 0x3ae32536, 0x7df0d3cd,
-    0xb4c4c8c0, 0xf3d73e3b, 0xfdddf89b, 0xbace0e60, 0x73fa156d,
-    0x34e9e396, 0x4ab51036, 0x0da6e6cd, 0xc492fdc0, 0x83810b3b,
-    0x8d8bcd9b, 0xca983b60, 0x03ac206d, 0x44bfd696, 0x1fb9ad2d,
-    0x58aa5bd6, 0x919e40db, 0xd68db620, 0xd8877080, 0x9f94867b,
-    0x56a09d76, 0x11b36b8d, 0xe0ac6a00, 0xa7bf9cfb, 0x6e8b87f6,
-    0x2998710d, 0x2792b7ad, 0x60814156, 0xa9b55a5b, 0xeea6aca0,
-    0xb5a0d71b, 0xf2b321e0, 0x3b873aed, 0x7c94cc16, 0x729e0ab6,
-    0x358dfc4d, 0xfcb9e740, 0xbbaa11bb, 0x509cc277, 0x178f348c,
-    0xdebb2f81, 0x99a8d97a, 0x97a21fda, 0xd0b1e921, 0x1985f22c,
-    0x5e9604d7, 0x05907f6c, 0x42838997, 0x8bb7929a, 0xcca46461,
-    0xc2aea2c1, 0x85bd543a, 0x4c894f37, 0x0b9ab9cc, 0xfa85b841,
-    0xbd964eba, 0x74a255b7, 0x33b1a34c, 0x3dbb65ec, 0x7aa89317,
-    0xb39c881a, 0xf48f7ee1, 0xaf89055a, 0xe89af3a1, 0x21aee8ac,
-    0x66bd1e57, 0x68b7d8f7, 0x2fa42e0c, 0xe6903501, 0xa183c3fa,
-    0xdfdf305a, 0x98ccc6a1, 0x51f8ddac, 0x16eb2b57, 0x18e1edf7,
-    0x5ff21b0c, 0x96c60001, 0xd1d5f6fa, 0x8ad38d41, 0xcdc07bba,
-    0x04f460b7, 0x43e7964c, 0x4ded50ec, 0x0afea617, 0xc3cabd1a,
-    0x84d94be1, 0x75c64a6c, 0x32d5bc97, 0xfbe1a79a, 0xbcf25161,
-    0xb2f897c1, 0xf5eb613a, 0x3cdf7a37, 0x7bcc8ccc, 0x20caf777,
-    0x67d9018c, 0xaeed1a81, 0xe9feec7a, 0xe7f42ada, 0xa0e7dc21,
-    0x69d3c72c, 0x2ec031d7, 0x956a206c, 0xd279d697, 0x1b4dcd9a,
-    0x5c5e3b61, 0x5254fdc1, 0x15470b3a, 0xdc731037, 0x9b60e6cc,
-    0xc0669d77, 0x87756b8c, 0x4e417081, 0x0952867a, 0x075840da,
-    0x404bb621, 0x897fad2c, 0xce6c5bd7, 0x3f735a5a, 0x7860aca1,
-    0xb154b7ac, 0xf6474157, 0xf84d87f7, 0xbf5e710c, 0x766a6a01,
-    0x31799cfa, 0x6a7fe741, 0x2d6c11ba, 0xe4580ab7, 0xa34bfc4c,
-    0xad413aec, 0xea52cc17, 0x2366d71a, 0x647521e1, 0x1a29d241,
-    0x5d3a24ba, 0x940e3fb7, 0xd31dc94c, 0xdd170fec, 0x9a04f917,
-    0x5330e21a, 0x142314e1, 0x4f256f5a, 0x083699a1, 0xc10282ac,
-    0x86117457, 0x881bb2f7, 0xcf08440c, 0x063c5f01, 0x412fa9fa,
-    0xb030a877, 0xf7235e8c, 0x3e174581, 0x7904b37a, 0x770e75da,
-    0x301d8321, 0xf929982c, 0xbe3a6ed7, 0xe53c156c, 0xa22fe397,
-    0x6b1bf89a, 0x2c080e61, 0x2202c8c1, 0x65113e3a, 0xac252537,
-    0xeb36d3cc},
-   {0x00000000, 0xa13984ee, 0x99020f9d, 0x383b8b73, 0xe975197b,
-    0x484c9d95, 0x707716e6, 0xd14e9208, 0x099b34b7, 0xa8a2b059,
-    0x90993b2a, 0x31a0bfc4, 0xe0ee2dcc, 0x41d7a922, 0x79ec2251,
-    0xd8d5a6bf, 0x1336696e, 0xb20fed80, 0x8a3466f3, 0x2b0de21d,
-    0xfa437015, 0x5b7af4fb, 0x63417f88, 0xc278fb66, 0x1aad5dd9,
-    0xbb94d937, 0x83af5244, 0x2296d6aa, 0xf3d844a2, 0x52e1c04c,
-    0x6ada4b3f, 0xcbe3cfd1, 0x266cd2dc, 0x87555632, 0xbf6edd41,
-    0x1e5759af, 0xcf19cba7, 0x6e204f49, 0x561bc43a, 0xf72240d4,
-    0x2ff7e66b, 0x8ece6285, 0xb6f5e9f6, 0x17cc6d18, 0xc682ff10,
-    0x67bb7bfe, 0x5f80f08d, 0xfeb97463, 0x355abbb2, 0x94633f5c,
-    0xac58b42f, 0x0d6130c1, 0xdc2fa2c9, 0x7d162627, 0x452dad54,
-    0xe41429ba, 0x3cc18f05, 0x9df80beb, 0xa5c38098, 0x04fa0476,
-    0xd5b4967e, 0x748d1290, 0x4cb699e3, 0xed8f1d0d, 0x4cd9a5b8,
-    0xede02156, 0xd5dbaa25, 0x74e22ecb, 0xa5acbcc3, 0x0495382d,
-    0x3caeb35e, 0x9d9737b0, 0x4542910f, 0xe47b15e1, 0xdc409e92,
-    0x7d791a7c, 0xac378874, 0x0d0e0c9a, 0x353587e9, 0x940c0307,
-    0x5fefccd6, 0xfed64838, 0xc6edc34b, 0x67d447a5, 0xb69ad5ad,
-    0x17a35143, 0x2f98da30, 0x8ea15ede, 0x5674f861, 0xf74d7c8f,
-    0xcf76f7fc, 0x6e4f7312, 0xbf01e11a, 0x1e3865f4, 0x2603ee87,
-    0x873a6a69, 0x6ab57764, 0xcb8cf38a, 0xf3b778f9, 0x528efc17,
-    0x83c06e1f, 0x22f9eaf1, 0x1ac26182, 0xbbfbe56c, 0x632e43d3,
-    0xc217c73d, 0xfa2c4c4e, 0x5b15c8a0, 0x8a5b5aa8, 0x2b62de46,
-    0x13595535, 0xb260d1db, 0x79831e0a, 0xd8ba9ae4, 0xe0811197,
-    0x41b89579, 0x90f60771, 0x31cf839f, 0x09f408ec, 0xa8cd8c02,
-    0x70182abd, 0xd121ae53, 0xe91a2520, 0x4823a1ce, 0x996d33c6,
-    0x3854b728, 0x006f3c5b, 0xa156b8b5, 0x99b34b70, 0x388acf9e,
-    0x00b144ed, 0xa188c003, 0x70c6520b, 0xd1ffd6e5, 0xe9c45d96,
-    0x48fdd978, 0x90287fc7, 0x3111fb29, 0x092a705a, 0xa813f4b4,
-    0x795d66bc, 0xd864e252, 0xe05f6921, 0x4166edcf, 0x8a85221e,
-    0x2bbca6f0, 0x13872d83, 0xb2bea96d, 0x63f03b65, 0xc2c9bf8b,
-    0xfaf234f8, 0x5bcbb016, 0x831e16a9, 0x22279247, 0x1a1c1934,
-    0xbb259dda, 0x6a6b0fd2, 0xcb528b3c, 0xf369004f, 0x525084a1,
-    0xbfdf99ac, 0x1ee61d42, 0x26dd9631, 0x87e412df, 0x56aa80d7,
-    0xf7930439, 0xcfa88f4a, 0x6e910ba4, 0xb644ad1b, 0x177d29f5,
-    0x2f46a286, 0x8e7f2668, 0x5f31b460, 0xfe08308e, 0xc633bbfd,
-    0x670a3f13, 0xace9f0c2, 0x0dd0742c, 0x35ebff5f, 0x94d27bb1,
-    0x459ce9b9, 0xe4a56d57, 0xdc9ee624, 0x7da762ca, 0xa572c475,
-    0x044b409b, 0x3c70cbe8, 0x9d494f06, 0x4c07dd0e, 0xed3e59e0,
-    0xd505d293, 0x743c567d, 0xd56aeec8, 0x74536a26, 0x4c68e155,
-    0xed5165bb, 0x3c1ff7b3, 0x9d26735d, 0xa51df82e, 0x04247cc0,
-    0xdcf1da7f, 0x7dc85e91, 0x45f3d5e2, 0xe4ca510c, 0x3584c304,
-    0x94bd47ea, 0xac86cc99, 0x0dbf4877, 0xc65c87a6, 0x67650348,
-    0x5f5e883b, 0xfe670cd5, 0x2f299edd, 0x8e101a33, 0xb62b9140,
-    0x171215ae, 0xcfc7b311, 0x6efe37ff, 0x56c5bc8c, 0xf7fc3862,
-    0x26b2aa6a, 0x878b2e84, 0xbfb0a5f7, 0x1e892119, 0xf3063c14,
-    0x523fb8fa, 0x6a043389, 0xcb3db767, 0x1a73256f, 0xbb4aa181,
-    0x83712af2, 0x2248ae1c, 0xfa9d08a3, 0x5ba48c4d, 0x639f073e,
-    0xc2a683d0, 0x13e811d8, 0xb2d19536, 0x8aea1e45, 0x2bd39aab,
-    0xe030557a, 0x4109d194, 0x79325ae7, 0xd80bde09, 0x09454c01,
-    0xa87cc8ef, 0x9047439c, 0x317ec772, 0xe9ab61cd, 0x4892e523,
-    0x70a96e50, 0xd190eabe, 0x00de78b6, 0xa1e7fc58, 0x99dc772b,
-    0x38e5f3c5},
-   {0x00000000, 0xe81790a1, 0x0b5e2703, 0xe349b7a2, 0x16bc4e06,
-    0xfeabdea7, 0x1de26905, 0xf5f5f9a4, 0x2d789c0c, 0xc56f0cad,
-    0x2626bb0f, 0xce312bae, 0x3bc4d20a, 0xd3d342ab, 0x309af509,
-    0xd88d65a8, 0x5af13818, 0xb2e6a8b9, 0x51af1f1b, 0xb9b88fba,
-    0x4c4d761e, 0xa45ae6bf, 0x4713511d, 0xaf04c1bc, 0x7789a414,
-    0x9f9e34b5, 0x7cd78317, 0x94c013b6, 0x6135ea12, 0x89227ab3,
-    0x6a6bcd11, 0x827c5db0, 0xb5e27030, 0x5df5e091, 0xbebc5733,
-    0x56abc792, 0xa35e3e36, 0x4b49ae97, 0xa8001935, 0x40178994,
-    0x989aec3c, 0x708d7c9d, 0x93c4cb3f, 0x7bd35b9e, 0x8e26a23a,
-    0x6631329b, 0x85788539, 0x6d6f1598, 0xef134828, 0x0704d889,
-    0xe44d6f2b, 0x0c5aff8a, 0xf9af062e, 0x11b8968f, 0xf2f1212d,
-    0x1ae6b18c, 0xc26bd424, 0x2a7c4485, 0xc935f327, 0x21226386,
-    0xd4d79a22, 0x3cc00a83, 0xdf89bd21, 0x379e2d80, 0xb0b5e621,
-    0x58a27680, 0xbbebc122, 0x53fc5183, 0xa609a827, 0x4e1e3886,
-    0xad578f24, 0x45401f85, 0x9dcd7a2d, 0x75daea8c, 0x96935d2e,
-    0x7e84cd8f, 0x8b71342b, 0x6366a48a, 0x802f1328, 0x68388389,
-    0xea44de39, 0x02534e98, 0xe11af93a, 0x090d699b, 0xfcf8903f,
-    0x14ef009e, 0xf7a6b73c, 0x1fb1279d, 0xc73c4235, 0x2f2bd294,
-    0xcc626536, 0x2475f597, 0xd1800c33, 0x39979c92, 0xdade2b30,
-    0x32c9bb91, 0x05579611, 0xed4006b0, 0x0e09b112, 0xe61e21b3,
-    0x13ebd817, 0xfbfc48b6, 0x18b5ff14, 0xf0a26fb5, 0x282f0a1d,
-    0xc0389abc, 0x23712d1e, 0xcb66bdbf, 0x3e93441b, 0xd684d4ba,
-    0x35cd6318, 0xdddaf3b9, 0x5fa6ae09, 0xb7b13ea8, 0x54f8890a,
-    0xbcef19ab, 0x491ae00f, 0xa10d70ae, 0x4244c70c, 0xaa5357ad,
-    0x72de3205, 0x9ac9a2a4, 0x79801506, 0x919785a7, 0x64627c03,
-    0x8c75eca2, 0x6f3c5b00, 0x872bcba1, 0xba1aca03, 0x520d5aa2,
-    0xb144ed00, 0x59537da1, 0xaca68405, 0x44b114a4, 0xa7f8a306,
-    0x4fef33a7, 0x9762560f, 0x7f75c6ae, 0x9c3c710c, 0x742be1ad,
-    0x81de1809, 0x69c988a8, 0x8a803f0a, 0x6297afab, 0xe0ebf21b,
-    0x08fc62ba, 0xebb5d518, 0x03a245b9, 0xf657bc1d, 0x1e402cbc,
-    0xfd099b1e, 0x151e0bbf, 0xcd936e17, 0x2584feb6, 0xc6cd4914,
-    0x2edad9b5, 0xdb2f2011, 0x3338b0b0, 0xd0710712, 0x386697b3,
-    0x0ff8ba33, 0xe7ef2a92, 0x04a69d30, 0xecb10d91, 0x1944f435,
-    0xf1536494, 0x121ad336, 0xfa0d4397, 0x2280263f, 0xca97b69e,
-    0x29de013c, 0xc1c9919d, 0x343c6839, 0xdc2bf898, 0x3f624f3a,
-    0xd775df9b, 0x5509822b, 0xbd1e128a, 0x5e57a528, 0xb6403589,
-    0x43b5cc2d, 0xaba25c8c, 0x48ebeb2e, 0xa0fc7b8f, 0x78711e27,
-    0x90668e86, 0x732f3924, 0x9b38a985, 0x6ecd5021, 0x86dac080,
-    0x65937722, 0x8d84e783, 0x0aaf2c22, 0xe2b8bc83, 0x01f10b21,
-    0xe9e69b80, 0x1c136224, 0xf404f285, 0x174d4527, 0xff5ad586,
-    0x27d7b02e, 0xcfc0208f, 0x2c89972d, 0xc49e078c, 0x316bfe28,
-    0xd97c6e89, 0x3a35d92b, 0xd222498a, 0x505e143a, 0xb849849b,
-    0x5b003339, 0xb317a398, 0x46e25a3c, 0xaef5ca9d, 0x4dbc7d3f,
-    0xa5abed9e, 0x7d268836, 0x95311897, 0x7678af35, 0x9e6f3f94,
-    0x6b9ac630, 0x838d5691, 0x60c4e133, 0x88d37192, 0xbf4d5c12,
-    0x575accb3, 0xb4137b11, 0x5c04ebb0, 0xa9f11214, 0x41e682b5,
-    0xa2af3517, 0x4ab8a5b6, 0x9235c01e, 0x7a2250bf, 0x996be71d,
-    0x717c77bc, 0x84898e18, 0x6c9e1eb9, 0x8fd7a91b, 0x67c039ba,
-    0xe5bc640a, 0x0dabf4ab, 0xeee24309, 0x06f5d3a8, 0xf3002a0c,
-    0x1b17baad, 0xf85e0d0f, 0x10499dae, 0xc8c4f806, 0x20d368a7,
-    0xc39adf05, 0x2b8d4fa4, 0xde78b600, 0x366f26a1, 0xd5269103,
-    0x3d3101a2}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x0000000000000000, 0xa19017e800000000, 0x03275e0b00000000,
-    0xa2b749e300000000, 0x064ebc1600000000, 0xa7deabfe00000000,
-    0x0569e21d00000000, 0xa4f9f5f500000000, 0x0c9c782d00000000,
-    0xad0c6fc500000000, 0x0fbb262600000000, 0xae2b31ce00000000,
-    0x0ad2c43b00000000, 0xab42d3d300000000, 0x09f59a3000000000,
-    0xa8658dd800000000, 0x1838f15a00000000, 0xb9a8e6b200000000,
-    0x1b1faf5100000000, 0xba8fb8b900000000, 0x1e764d4c00000000,
-    0xbfe65aa400000000, 0x1d51134700000000, 0xbcc104af00000000,
-    0x14a4897700000000, 0xb5349e9f00000000, 0x1783d77c00000000,
-    0xb613c09400000000, 0x12ea356100000000, 0xb37a228900000000,
-    0x11cd6b6a00000000, 0xb05d7c8200000000, 0x3070e2b500000000,
-    0x91e0f55d00000000, 0x3357bcbe00000000, 0x92c7ab5600000000,
-    0x363e5ea300000000, 0x97ae494b00000000, 0x351900a800000000,
-    0x9489174000000000, 0x3cec9a9800000000, 0x9d7c8d7000000000,
-    0x3fcbc49300000000, 0x9e5bd37b00000000, 0x3aa2268e00000000,
-    0x9b32316600000000, 0x3985788500000000, 0x98156f6d00000000,
-    0x284813ef00000000, 0x89d8040700000000, 0x2b6f4de400000000,
-    0x8aff5a0c00000000, 0x2e06aff900000000, 0x8f96b81100000000,
-    0x2d21f1f200000000, 0x8cb1e61a00000000, 0x24d46bc200000000,
-    0x85447c2a00000000, 0x27f335c900000000, 0x8663222100000000,
-    0x229ad7d400000000, 0x830ac03c00000000, 0x21bd89df00000000,
-    0x802d9e3700000000, 0x21e6b5b000000000, 0x8076a25800000000,
-    0x22c1ebbb00000000, 0x8351fc5300000000, 0x27a809a600000000,
-    0x86381e4e00000000, 0x248f57ad00000000, 0x851f404500000000,
-    0x2d7acd9d00000000, 0x8ceada7500000000, 0x2e5d939600000000,
-    0x8fcd847e00000000, 0x2b34718b00000000, 0x8aa4666300000000,
-    0x28132f8000000000, 0x8983386800000000, 0x39de44ea00000000,
-    0x984e530200000000, 0x3af91ae100000000, 0x9b690d0900000000,
-    0x3f90f8fc00000000, 0x9e00ef1400000000, 0x3cb7a6f700000000,
-    0x9d27b11f00000000, 0x35423cc700000000, 0x94d22b2f00000000,
-    0x366562cc00000000, 0x97f5752400000000, 0x330c80d100000000,
-    0x929c973900000000, 0x302bdeda00000000, 0x91bbc93200000000,
-    0x1196570500000000, 0xb00640ed00000000, 0x12b1090e00000000,
-    0xb3211ee600000000, 0x17d8eb1300000000, 0xb648fcfb00000000,
-    0x14ffb51800000000, 0xb56fa2f000000000, 0x1d0a2f2800000000,
-    0xbc9a38c000000000, 0x1e2d712300000000, 0xbfbd66cb00000000,
-    0x1b44933e00000000, 0xbad484d600000000, 0x1863cd3500000000,
-    0xb9f3dadd00000000, 0x09aea65f00000000, 0xa83eb1b700000000,
-    0x0a89f85400000000, 0xab19efbc00000000, 0x0fe01a4900000000,
-    0xae700da100000000, 0x0cc7444200000000, 0xad5753aa00000000,
-    0x0532de7200000000, 0xa4a2c99a00000000, 0x0615807900000000,
-    0xa785979100000000, 0x037c626400000000, 0xa2ec758c00000000,
-    0x005b3c6f00000000, 0xa1cb2b8700000000, 0x03ca1aba00000000,
-    0xa25a0d5200000000, 0x00ed44b100000000, 0xa17d535900000000,
-    0x0584a6ac00000000, 0xa414b14400000000, 0x06a3f8a700000000,
-    0xa733ef4f00000000, 0x0f56629700000000, 0xaec6757f00000000,
-    0x0c713c9c00000000, 0xade12b7400000000, 0x0918de8100000000,
-    0xa888c96900000000, 0x0a3f808a00000000, 0xabaf976200000000,
-    0x1bf2ebe000000000, 0xba62fc0800000000, 0x18d5b5eb00000000,
-    0xb945a20300000000, 0x1dbc57f600000000, 0xbc2c401e00000000,
-    0x1e9b09fd00000000, 0xbf0b1e1500000000, 0x176e93cd00000000,
-    0xb6fe842500000000, 0x1449cdc600000000, 0xb5d9da2e00000000,
-    0x11202fdb00000000, 0xb0b0383300000000, 0x120771d000000000,
-    0xb397663800000000, 0x33baf80f00000000, 0x922aefe700000000,
-    0x309da60400000000, 0x910db1ec00000000, 0x35f4441900000000,
-    0x946453f100000000, 0x36d31a1200000000, 0x97430dfa00000000,
-    0x3f26802200000000, 0x9eb697ca00000000, 0x3c01de2900000000,
-    0x9d91c9c100000000, 0x39683c3400000000, 0x98f82bdc00000000,
-    0x3a4f623f00000000, 0x9bdf75d700000000, 0x2b82095500000000,
-    0x8a121ebd00000000, 0x28a5575e00000000, 0x893540b600000000,
-    0x2dccb54300000000, 0x8c5ca2ab00000000, 0x2eebeb4800000000,
-    0x8f7bfca000000000, 0x271e717800000000, 0x868e669000000000,
-    0x24392f7300000000, 0x85a9389b00000000, 0x2150cd6e00000000,
-    0x80c0da8600000000, 0x2277936500000000, 0x83e7848d00000000,
-    0x222caf0a00000000, 0x83bcb8e200000000, 0x210bf10100000000,
-    0x809be6e900000000, 0x2462131c00000000, 0x85f204f400000000,
-    0x27454d1700000000, 0x86d55aff00000000, 0x2eb0d72700000000,
-    0x8f20c0cf00000000, 0x2d97892c00000000, 0x8c079ec400000000,
-    0x28fe6b3100000000, 0x896e7cd900000000, 0x2bd9353a00000000,
-    0x8a4922d200000000, 0x3a145e5000000000, 0x9b8449b800000000,
-    0x3933005b00000000, 0x98a317b300000000, 0x3c5ae24600000000,
-    0x9dcaf5ae00000000, 0x3f7dbc4d00000000, 0x9eedaba500000000,
-    0x3688267d00000000, 0x9718319500000000, 0x35af787600000000,
-    0x943f6f9e00000000, 0x30c69a6b00000000, 0x91568d8300000000,
-    0x33e1c46000000000, 0x9271d38800000000, 0x125c4dbf00000000,
-    0xb3cc5a5700000000, 0x117b13b400000000, 0xb0eb045c00000000,
-    0x1412f1a900000000, 0xb582e64100000000, 0x1735afa200000000,
-    0xb6a5b84a00000000, 0x1ec0359200000000, 0xbf50227a00000000,
-    0x1de76b9900000000, 0xbc777c7100000000, 0x188e898400000000,
-    0xb91e9e6c00000000, 0x1ba9d78f00000000, 0xba39c06700000000,
-    0x0a64bce500000000, 0xabf4ab0d00000000, 0x0943e2ee00000000,
-    0xa8d3f50600000000, 0x0c2a00f300000000, 0xadba171b00000000,
-    0x0f0d5ef800000000, 0xae9d491000000000, 0x06f8c4c800000000,
-    0xa768d32000000000, 0x05df9ac300000000, 0xa44f8d2b00000000,
-    0x00b678de00000000, 0xa1266f3600000000, 0x039126d500000000,
-    0xa201313d00000000},
-   {0x0000000000000000, 0xee8439a100000000, 0x9d0f029900000000,
-    0x738b3b3800000000, 0x7b1975e900000000, 0x959d4c4800000000,
-    0xe616777000000000, 0x08924ed100000000, 0xb7349b0900000000,
-    0x59b0a2a800000000, 0x2a3b999000000000, 0xc4bfa03100000000,
-    0xcc2deee000000000, 0x22a9d74100000000, 0x5122ec7900000000,
-    0xbfa6d5d800000000, 0x6e69361300000000, 0x80ed0fb200000000,
-    0xf366348a00000000, 0x1de20d2b00000000, 0x157043fa00000000,
-    0xfbf47a5b00000000, 0x887f416300000000, 0x66fb78c200000000,
-    0xd95dad1a00000000, 0x37d994bb00000000, 0x4452af8300000000,
-    0xaad6962200000000, 0xa244d8f300000000, 0x4cc0e15200000000,
-    0x3f4bda6a00000000, 0xd1cfe3cb00000000, 0xdcd26c2600000000,
-    0x3256558700000000, 0x41dd6ebf00000000, 0xaf59571e00000000,
-    0xa7cb19cf00000000, 0x494f206e00000000, 0x3ac41b5600000000,
-    0xd44022f700000000, 0x6be6f72f00000000, 0x8562ce8e00000000,
-    0xf6e9f5b600000000, 0x186dcc1700000000, 0x10ff82c600000000,
-    0xfe7bbb6700000000, 0x8df0805f00000000, 0x6374b9fe00000000,
-    0xb2bb5a3500000000, 0x5c3f639400000000, 0x2fb458ac00000000,
-    0xc130610d00000000, 0xc9a22fdc00000000, 0x2726167d00000000,
-    0x54ad2d4500000000, 0xba2914e400000000, 0x058fc13c00000000,
-    0xeb0bf89d00000000, 0x9880c3a500000000, 0x7604fa0400000000,
-    0x7e96b4d500000000, 0x90128d7400000000, 0xe399b64c00000000,
-    0x0d1d8fed00000000, 0xb8a5d94c00000000, 0x5621e0ed00000000,
-    0x25aadbd500000000, 0xcb2ee27400000000, 0xc3bcaca500000000,
-    0x2d38950400000000, 0x5eb3ae3c00000000, 0xb037979d00000000,
-    0x0f91424500000000, 0xe1157be400000000, 0x929e40dc00000000,
-    0x7c1a797d00000000, 0x748837ac00000000, 0x9a0c0e0d00000000,
-    0xe987353500000000, 0x07030c9400000000, 0xd6ccef5f00000000,
-    0x3848d6fe00000000, 0x4bc3edc600000000, 0xa547d46700000000,
-    0xadd59ab600000000, 0x4351a31700000000, 0x30da982f00000000,
-    0xde5ea18e00000000, 0x61f8745600000000, 0x8f7c4df700000000,
-    0xfcf776cf00000000, 0x12734f6e00000000, 0x1ae101bf00000000,
-    0xf465381e00000000, 0x87ee032600000000, 0x696a3a8700000000,
-    0x6477b56a00000000, 0x8af38ccb00000000, 0xf978b7f300000000,
-    0x17fc8e5200000000, 0x1f6ec08300000000, 0xf1eaf92200000000,
-    0x8261c21a00000000, 0x6ce5fbbb00000000, 0xd3432e6300000000,
-    0x3dc717c200000000, 0x4e4c2cfa00000000, 0xa0c8155b00000000,
-    0xa85a5b8a00000000, 0x46de622b00000000, 0x3555591300000000,
-    0xdbd160b200000000, 0x0a1e837900000000, 0xe49abad800000000,
-    0x971181e000000000, 0x7995b84100000000, 0x7107f69000000000,
-    0x9f83cf3100000000, 0xec08f40900000000, 0x028ccda800000000,
-    0xbd2a187000000000, 0x53ae21d100000000, 0x20251ae900000000,
-    0xcea1234800000000, 0xc6336d9900000000, 0x28b7543800000000,
-    0x5b3c6f0000000000, 0xb5b856a100000000, 0x704bb39900000000,
-    0x9ecf8a3800000000, 0xed44b10000000000, 0x03c088a100000000,
-    0x0b52c67000000000, 0xe5d6ffd100000000, 0x965dc4e900000000,
-    0x78d9fd4800000000, 0xc77f289000000000, 0x29fb113100000000,
-    0x5a702a0900000000, 0xb4f413a800000000, 0xbc665d7900000000,
-    0x52e264d800000000, 0x21695fe000000000, 0xcfed664100000000,
-    0x1e22858a00000000, 0xf0a6bc2b00000000, 0x832d871300000000,
-    0x6da9beb200000000, 0x653bf06300000000, 0x8bbfc9c200000000,
-    0xf834f2fa00000000, 0x16b0cb5b00000000, 0xa9161e8300000000,
-    0x4792272200000000, 0x34191c1a00000000, 0xda9d25bb00000000,
-    0xd20f6b6a00000000, 0x3c8b52cb00000000, 0x4f0069f300000000,
-    0xa184505200000000, 0xac99dfbf00000000, 0x421de61e00000000,
-    0x3196dd2600000000, 0xdf12e48700000000, 0xd780aa5600000000,
-    0x390493f700000000, 0x4a8fa8cf00000000, 0xa40b916e00000000,
-    0x1bad44b600000000, 0xf5297d1700000000, 0x86a2462f00000000,
-    0x68267f8e00000000, 0x60b4315f00000000, 0x8e3008fe00000000,
-    0xfdbb33c600000000, 0x133f0a6700000000, 0xc2f0e9ac00000000,
-    0x2c74d00d00000000, 0x5fffeb3500000000, 0xb17bd29400000000,
-    0xb9e99c4500000000, 0x576da5e400000000, 0x24e69edc00000000,
-    0xca62a77d00000000, 0x75c472a500000000, 0x9b404b0400000000,
-    0xe8cb703c00000000, 0x064f499d00000000, 0x0edd074c00000000,
-    0xe0593eed00000000, 0x93d205d500000000, 0x7d563c7400000000,
-    0xc8ee6ad500000000, 0x266a537400000000, 0x55e1684c00000000,
-    0xbb6551ed00000000, 0xb3f71f3c00000000, 0x5d73269d00000000,
-    0x2ef81da500000000, 0xc07c240400000000, 0x7fdaf1dc00000000,
-    0x915ec87d00000000, 0xe2d5f34500000000, 0x0c51cae400000000,
-    0x04c3843500000000, 0xea47bd9400000000, 0x99cc86ac00000000,
-    0x7748bf0d00000000, 0xa6875cc600000000, 0x4803656700000000,
-    0x3b885e5f00000000, 0xd50c67fe00000000, 0xdd9e292f00000000,
-    0x331a108e00000000, 0x40912bb600000000, 0xae15121700000000,
-    0x11b3c7cf00000000, 0xff37fe6e00000000, 0x8cbcc55600000000,
-    0x6238fcf700000000, 0x6aaab22600000000, 0x842e8b8700000000,
-    0xf7a5b0bf00000000, 0x1921891e00000000, 0x143c06f300000000,
-    0xfab83f5200000000, 0x8933046a00000000, 0x67b73dcb00000000,
-    0x6f25731a00000000, 0x81a14abb00000000, 0xf22a718300000000,
-    0x1cae482200000000, 0xa3089dfa00000000, 0x4d8ca45b00000000,
-    0x3e079f6300000000, 0xd083a6c200000000, 0xd811e81300000000,
-    0x3695d1b200000000, 0x451eea8a00000000, 0xab9ad32b00000000,
-    0x7a5530e000000000, 0x94d1094100000000, 0xe75a327900000000,
-    0x09de0bd800000000, 0x014c450900000000, 0xefc87ca800000000,
-    0x9c43479000000000, 0x72c77e3100000000, 0xcd61abe900000000,
-    0x23e5924800000000, 0x506ea97000000000, 0xbeea90d100000000,
-    0xb678de0000000000, 0x58fce7a100000000, 0x2b77dc9900000000,
-    0xc5f3e53800000000},
-   {0x0000000000000000, 0xfbf6134700000000, 0xf6ed278e00000000,
-    0x0d1b34c900000000, 0xaddd3ec700000000, 0x562b2d8000000000,
-    0x5b30194900000000, 0xa0c60a0e00000000, 0x1bbd0c5500000000,
-    0xe04b1f1200000000, 0xed502bdb00000000, 0x16a6389c00000000,
-    0xb660329200000000, 0x4d9621d500000000, 0x408d151c00000000,
-    0xbb7b065b00000000, 0x367a19aa00000000, 0xcd8c0aed00000000,
-    0xc0973e2400000000, 0x3b612d6300000000, 0x9ba7276d00000000,
-    0x6051342a00000000, 0x6d4a00e300000000, 0x96bc13a400000000,
-    0x2dc715ff00000000, 0xd63106b800000000, 0xdb2a327100000000,
-    0x20dc213600000000, 0x801a2b3800000000, 0x7bec387f00000000,
-    0x76f70cb600000000, 0x8d011ff100000000, 0x2df2438f00000000,
-    0xd60450c800000000, 0xdb1f640100000000, 0x20e9774600000000,
-    0x802f7d4800000000, 0x7bd96e0f00000000, 0x76c25ac600000000,
-    0x8d34498100000000, 0x364f4fda00000000, 0xcdb95c9d00000000,
-    0xc0a2685400000000, 0x3b547b1300000000, 0x9b92711d00000000,
-    0x6064625a00000000, 0x6d7f569300000000, 0x968945d400000000,
-    0x1b885a2500000000, 0xe07e496200000000, 0xed657dab00000000,
-    0x16936eec00000000, 0xb65564e200000000, 0x4da377a500000000,
-    0x40b8436c00000000, 0xbb4e502b00000000, 0x0035567000000000,
-    0xfbc3453700000000, 0xf6d871fe00000000, 0x0d2e62b900000000,
-    0xade868b700000000, 0x561e7bf000000000, 0x5b054f3900000000,
-    0xa0f35c7e00000000, 0x1be2f6c500000000, 0xe014e58200000000,
-    0xed0fd14b00000000, 0x16f9c20c00000000, 0xb63fc80200000000,
-    0x4dc9db4500000000, 0x40d2ef8c00000000, 0xbb24fccb00000000,
-    0x005ffa9000000000, 0xfba9e9d700000000, 0xf6b2dd1e00000000,
-    0x0d44ce5900000000, 0xad82c45700000000, 0x5674d71000000000,
-    0x5b6fe3d900000000, 0xa099f09e00000000, 0x2d98ef6f00000000,
-    0xd66efc2800000000, 0xdb75c8e100000000, 0x2083dba600000000,
-    0x8045d1a800000000, 0x7bb3c2ef00000000, 0x76a8f62600000000,
-    0x8d5ee56100000000, 0x3625e33a00000000, 0xcdd3f07d00000000,
-    0xc0c8c4b400000000, 0x3b3ed7f300000000, 0x9bf8ddfd00000000,
-    0x600eceba00000000, 0x6d15fa7300000000, 0x96e3e93400000000,
-    0x3610b54a00000000, 0xcde6a60d00000000, 0xc0fd92c400000000,
-    0x3b0b818300000000, 0x9bcd8b8d00000000, 0x603b98ca00000000,
-    0x6d20ac0300000000, 0x96d6bf4400000000, 0x2dadb91f00000000,
-    0xd65baa5800000000, 0xdb409e9100000000, 0x20b68dd600000000,
-    0x807087d800000000, 0x7b86949f00000000, 0x769da05600000000,
-    0x8d6bb31100000000, 0x006aace000000000, 0xfb9cbfa700000000,
-    0xf6878b6e00000000, 0x0d71982900000000, 0xadb7922700000000,
-    0x5641816000000000, 0x5b5ab5a900000000, 0xa0aca6ee00000000,
-    0x1bd7a0b500000000, 0xe021b3f200000000, 0xed3a873b00000000,
-    0x16cc947c00000000, 0xb60a9e7200000000, 0x4dfc8d3500000000,
-    0x40e7b9fc00000000, 0xbb11aabb00000000, 0x77c29c5000000000,
-    0x8c348f1700000000, 0x812fbbde00000000, 0x7ad9a89900000000,
-    0xda1fa29700000000, 0x21e9b1d000000000, 0x2cf2851900000000,
-    0xd704965e00000000, 0x6c7f900500000000, 0x9789834200000000,
-    0x9a92b78b00000000, 0x6164a4cc00000000, 0xc1a2aec200000000,
-    0x3a54bd8500000000, 0x374f894c00000000, 0xccb99a0b00000000,
-    0x41b885fa00000000, 0xba4e96bd00000000, 0xb755a27400000000,
-    0x4ca3b13300000000, 0xec65bb3d00000000, 0x1793a87a00000000,
-    0x1a889cb300000000, 0xe17e8ff400000000, 0x5a0589af00000000,
-    0xa1f39ae800000000, 0xace8ae2100000000, 0x571ebd6600000000,
-    0xf7d8b76800000000, 0x0c2ea42f00000000, 0x013590e600000000,
-    0xfac383a100000000, 0x5a30dfdf00000000, 0xa1c6cc9800000000,
-    0xacddf85100000000, 0x572beb1600000000, 0xf7ede11800000000,
-    0x0c1bf25f00000000, 0x0100c69600000000, 0xfaf6d5d100000000,
-    0x418dd38a00000000, 0xba7bc0cd00000000, 0xb760f40400000000,
-    0x4c96e74300000000, 0xec50ed4d00000000, 0x17a6fe0a00000000,
-    0x1abdcac300000000, 0xe14bd98400000000, 0x6c4ac67500000000,
-    0x97bcd53200000000, 0x9aa7e1fb00000000, 0x6151f2bc00000000,
-    0xc197f8b200000000, 0x3a61ebf500000000, 0x377adf3c00000000,
-    0xcc8ccc7b00000000, 0x77f7ca2000000000, 0x8c01d96700000000,
-    0x811aedae00000000, 0x7aecfee900000000, 0xda2af4e700000000,
-    0x21dce7a000000000, 0x2cc7d36900000000, 0xd731c02e00000000,
-    0x6c206a9500000000, 0x97d679d200000000, 0x9acd4d1b00000000,
-    0x613b5e5c00000000, 0xc1fd545200000000, 0x3a0b471500000000,
-    0x371073dc00000000, 0xcce6609b00000000, 0x779d66c000000000,
-    0x8c6b758700000000, 0x8170414e00000000, 0x7a86520900000000,
-    0xda40580700000000, 0x21b64b4000000000, 0x2cad7f8900000000,
-    0xd75b6cce00000000, 0x5a5a733f00000000, 0xa1ac607800000000,
-    0xacb754b100000000, 0x574147f600000000, 0xf7874df800000000,
-    0x0c715ebf00000000, 0x016a6a7600000000, 0xfa9c793100000000,
-    0x41e77f6a00000000, 0xba116c2d00000000, 0xb70a58e400000000,
-    0x4cfc4ba300000000, 0xec3a41ad00000000, 0x17cc52ea00000000,
-    0x1ad7662300000000, 0xe121756400000000, 0x41d2291a00000000,
-    0xba243a5d00000000, 0xb73f0e9400000000, 0x4cc91dd300000000,
-    0xec0f17dd00000000, 0x17f9049a00000000, 0x1ae2305300000000,
-    0xe114231400000000, 0x5a6f254f00000000, 0xa199360800000000,
-    0xac8202c100000000, 0x5774118600000000, 0xf7b21b8800000000,
-    0x0c4408cf00000000, 0x015f3c0600000000, 0xfaa92f4100000000,
-    0x77a830b000000000, 0x8c5e23f700000000, 0x8145173e00000000,
-    0x7ab3047900000000, 0xda750e7700000000, 0x21831d3000000000,
-    0x2c9829f900000000, 0xd76e3abe00000000, 0x6c153ce500000000,
-    0x97e32fa200000000, 0x9af81b6b00000000, 0x610e082c00000000,
-    0xc1c8022200000000, 0x3a3e116500000000, 0x372525ac00000000,
-    0xccd336eb00000000},
-   {0x0000000000000000, 0x6238282a00000000, 0xc470505400000000,
-    0xa648787e00000000, 0x88e1a0a800000000, 0xead9888200000000,
-    0x4c91f0fc00000000, 0x2ea9d8d600000000, 0x51c5308a00000000,
-    0x33fd18a000000000, 0x95b560de00000000, 0xf78d48f400000000,
-    0xd924902200000000, 0xbb1cb80800000000, 0x1d54c07600000000,
-    0x7f6ce85c00000000, 0xe38c10cf00000000, 0x81b438e500000000,
-    0x27fc409b00000000, 0x45c468b100000000, 0x6b6db06700000000,
-    0x0955984d00000000, 0xaf1de03300000000, 0xcd25c81900000000,
-    0xb249204500000000, 0xd071086f00000000, 0x7639701100000000,
-    0x1401583b00000000, 0x3aa880ed00000000, 0x5890a8c700000000,
-    0xfed8d0b900000000, 0x9ce0f89300000000, 0x871f504500000000,
-    0xe527786f00000000, 0x436f001100000000, 0x2157283b00000000,
-    0x0ffef0ed00000000, 0x6dc6d8c700000000, 0xcb8ea0b900000000,
-    0xa9b6889300000000, 0xd6da60cf00000000, 0xb4e248e500000000,
-    0x12aa309b00000000, 0x709218b100000000, 0x5e3bc06700000000,
-    0x3c03e84d00000000, 0x9a4b903300000000, 0xf873b81900000000,
-    0x6493408a00000000, 0x06ab68a000000000, 0xa0e310de00000000,
-    0xc2db38f400000000, 0xec72e02200000000, 0x8e4ac80800000000,
-    0x2802b07600000000, 0x4a3a985c00000000, 0x3556700000000000,
-    0x576e582a00000000, 0xf126205400000000, 0x931e087e00000000,
-    0xbdb7d0a800000000, 0xdf8ff88200000000, 0x79c780fc00000000,
-    0x1bffa8d600000000, 0x0e3fa08a00000000, 0x6c0788a000000000,
-    0xca4ff0de00000000, 0xa877d8f400000000, 0x86de002200000000,
-    0xe4e6280800000000, 0x42ae507600000000, 0x2096785c00000000,
-    0x5ffa900000000000, 0x3dc2b82a00000000, 0x9b8ac05400000000,
-    0xf9b2e87e00000000, 0xd71b30a800000000, 0xb523188200000000,
-    0x136b60fc00000000, 0x715348d600000000, 0xedb3b04500000000,
-    0x8f8b986f00000000, 0x29c3e01100000000, 0x4bfbc83b00000000,
-    0x655210ed00000000, 0x076a38c700000000, 0xa12240b900000000,
-    0xc31a689300000000, 0xbc7680cf00000000, 0xde4ea8e500000000,
-    0x7806d09b00000000, 0x1a3ef8b100000000, 0x3497206700000000,
-    0x56af084d00000000, 0xf0e7703300000000, 0x92df581900000000,
-    0x8920f0cf00000000, 0xeb18d8e500000000, 0x4d50a09b00000000,
-    0x2f6888b100000000, 0x01c1506700000000, 0x63f9784d00000000,
-    0xc5b1003300000000, 0xa789281900000000, 0xd8e5c04500000000,
-    0xbadde86f00000000, 0x1c95901100000000, 0x7eadb83b00000000,
-    0x500460ed00000000, 0x323c48c700000000, 0x947430b900000000,
-    0xf64c189300000000, 0x6aace00000000000, 0x0894c82a00000000,
-    0xaedcb05400000000, 0xcce4987e00000000, 0xe24d40a800000000,
-    0x8075688200000000, 0x263d10fc00000000, 0x440538d600000000,
-    0x3b69d08a00000000, 0x5951f8a000000000, 0xff1980de00000000,
-    0x9d21a8f400000000, 0xb388702200000000, 0xd1b0580800000000,
-    0x77f8207600000000, 0x15c0085c00000000, 0x5d7831ce00000000,
-    0x3f4019e400000000, 0x9908619a00000000, 0xfb3049b000000000,
-    0xd599916600000000, 0xb7a1b94c00000000, 0x11e9c13200000000,
-    0x73d1e91800000000, 0x0cbd014400000000, 0x6e85296e00000000,
-    0xc8cd511000000000, 0xaaf5793a00000000, 0x845ca1ec00000000,
-    0xe66489c600000000, 0x402cf1b800000000, 0x2214d99200000000,
-    0xbef4210100000000, 0xdccc092b00000000, 0x7a84715500000000,
-    0x18bc597f00000000, 0x361581a900000000, 0x542da98300000000,
-    0xf265d1fd00000000, 0x905df9d700000000, 0xef31118b00000000,
-    0x8d0939a100000000, 0x2b4141df00000000, 0x497969f500000000,
-    0x67d0b12300000000, 0x05e8990900000000, 0xa3a0e17700000000,
-    0xc198c95d00000000, 0xda67618b00000000, 0xb85f49a100000000,
-    0x1e1731df00000000, 0x7c2f19f500000000, 0x5286c12300000000,
-    0x30bee90900000000, 0x96f6917700000000, 0xf4ceb95d00000000,
-    0x8ba2510100000000, 0xe99a792b00000000, 0x4fd2015500000000,
-    0x2dea297f00000000, 0x0343f1a900000000, 0x617bd98300000000,
-    0xc733a1fd00000000, 0xa50b89d700000000, 0x39eb714400000000,
-    0x5bd3596e00000000, 0xfd9b211000000000, 0x9fa3093a00000000,
-    0xb10ad1ec00000000, 0xd332f9c600000000, 0x757a81b800000000,
-    0x1742a99200000000, 0x682e41ce00000000, 0x0a1669e400000000,
-    0xac5e119a00000000, 0xce6639b000000000, 0xe0cfe16600000000,
-    0x82f7c94c00000000, 0x24bfb13200000000, 0x4687991800000000,
-    0x5347914400000000, 0x317fb96e00000000, 0x9737c11000000000,
-    0xf50fe93a00000000, 0xdba631ec00000000, 0xb99e19c600000000,
-    0x1fd661b800000000, 0x7dee499200000000, 0x0282a1ce00000000,
-    0x60ba89e400000000, 0xc6f2f19a00000000, 0xa4cad9b000000000,
-    0x8a63016600000000, 0xe85b294c00000000, 0x4e13513200000000,
-    0x2c2b791800000000, 0xb0cb818b00000000, 0xd2f3a9a100000000,
-    0x74bbd1df00000000, 0x1683f9f500000000, 0x382a212300000000,
-    0x5a12090900000000, 0xfc5a717700000000, 0x9e62595d00000000,
-    0xe10eb10100000000, 0x8336992b00000000, 0x257ee15500000000,
-    0x4746c97f00000000, 0x69ef11a900000000, 0x0bd7398300000000,
-    0xad9f41fd00000000, 0xcfa769d700000000, 0xd458c10100000000,
-    0xb660e92b00000000, 0x1028915500000000, 0x7210b97f00000000,
-    0x5cb961a900000000, 0x3e81498300000000, 0x98c931fd00000000,
-    0xfaf119d700000000, 0x859df18b00000000, 0xe7a5d9a100000000,
-    0x41eda1df00000000, 0x23d589f500000000, 0x0d7c512300000000,
-    0x6f44790900000000, 0xc90c017700000000, 0xab34295d00000000,
-    0x37d4d1ce00000000, 0x55ecf9e400000000, 0xf3a4819a00000000,
-    0x919ca9b000000000, 0xbf35716600000000, 0xdd0d594c00000000,
-    0x7b45213200000000, 0x197d091800000000, 0x6611e14400000000,
-    0x0429c96e00000000, 0xa261b11000000000, 0xc059993a00000000,
-    0xeef041ec00000000, 0x8cc869c600000000, 0x2a8011b800000000,
-    0x48b8399200000000},
-   {0x0000000000000000, 0x4c2896a300000000, 0xd9565d9c00000000,
-    0x957ecb3f00000000, 0xf3abcbe300000000, 0xbf835d4000000000,
-    0x2afd967f00000000, 0x66d500dc00000000, 0xa751e61c00000000,
-    0xeb7970bf00000000, 0x7e07bb8000000000, 0x322f2d2300000000,
-    0x54fa2dff00000000, 0x18d2bb5c00000000, 0x8dac706300000000,
-    0xc184e6c000000000, 0x4ea3cc3900000000, 0x028b5a9a00000000,
-    0x97f591a500000000, 0xdbdd070600000000, 0xbd0807da00000000,
-    0xf120917900000000, 0x645e5a4600000000, 0x2876cce500000000,
-    0xe9f22a2500000000, 0xa5dabc8600000000, 0x30a477b900000000,
-    0x7c8ce11a00000000, 0x1a59e1c600000000, 0x5671776500000000,
-    0xc30fbc5a00000000, 0x8f272af900000000, 0x9c46997300000000,
-    0xd06e0fd000000000, 0x4510c4ef00000000, 0x0938524c00000000,
-    0x6fed529000000000, 0x23c5c43300000000, 0xb6bb0f0c00000000,
-    0xfa9399af00000000, 0x3b177f6f00000000, 0x773fe9cc00000000,
-    0xe24122f300000000, 0xae69b45000000000, 0xc8bcb48c00000000,
-    0x8494222f00000000, 0x11eae91000000000, 0x5dc27fb300000000,
-    0xd2e5554a00000000, 0x9ecdc3e900000000, 0x0bb308d600000000,
-    0x479b9e7500000000, 0x214e9ea900000000, 0x6d66080a00000000,
-    0xf818c33500000000, 0xb430559600000000, 0x75b4b35600000000,
-    0x399c25f500000000, 0xace2eeca00000000, 0xe0ca786900000000,
-    0x861f78b500000000, 0xca37ee1600000000, 0x5f49252900000000,
-    0x1361b38a00000000, 0x388d32e700000000, 0x74a5a44400000000,
-    0xe1db6f7b00000000, 0xadf3f9d800000000, 0xcb26f90400000000,
-    0x870e6fa700000000, 0x1270a49800000000, 0x5e58323b00000000,
-    0x9fdcd4fb00000000, 0xd3f4425800000000, 0x468a896700000000,
-    0x0aa21fc400000000, 0x6c771f1800000000, 0x205f89bb00000000,
-    0xb521428400000000, 0xf909d42700000000, 0x762efede00000000,
-    0x3a06687d00000000, 0xaf78a34200000000, 0xe35035e100000000,
-    0x8585353d00000000, 0xc9ada39e00000000, 0x5cd368a100000000,
-    0x10fbfe0200000000, 0xd17f18c200000000, 0x9d578e6100000000,
-    0x0829455e00000000, 0x4401d3fd00000000, 0x22d4d32100000000,
-    0x6efc458200000000, 0xfb828ebd00000000, 0xb7aa181e00000000,
-    0xa4cbab9400000000, 0xe8e33d3700000000, 0x7d9df60800000000,
-    0x31b560ab00000000, 0x5760607700000000, 0x1b48f6d400000000,
-    0x8e363deb00000000, 0xc21eab4800000000, 0x039a4d8800000000,
-    0x4fb2db2b00000000, 0xdacc101400000000, 0x96e486b700000000,
-    0xf031866b00000000, 0xbc1910c800000000, 0x2967dbf700000000,
-    0x654f4d5400000000, 0xea6867ad00000000, 0xa640f10e00000000,
-    0x333e3a3100000000, 0x7f16ac9200000000, 0x19c3ac4e00000000,
-    0x55eb3aed00000000, 0xc095f1d200000000, 0x8cbd677100000000,
-    0x4d3981b100000000, 0x0111171200000000, 0x946fdc2d00000000,
-    0xd8474a8e00000000, 0xbe924a5200000000, 0xf2badcf100000000,
-    0x67c417ce00000000, 0x2bec816d00000000, 0x311c141500000000,
-    0x7d3482b600000000, 0xe84a498900000000, 0xa462df2a00000000,
-    0xc2b7dff600000000, 0x8e9f495500000000, 0x1be1826a00000000,
-    0x57c914c900000000, 0x964df20900000000, 0xda6564aa00000000,
-    0x4f1baf9500000000, 0x0333393600000000, 0x65e639ea00000000,
-    0x29ceaf4900000000, 0xbcb0647600000000, 0xf098f2d500000000,
-    0x7fbfd82c00000000, 0x33974e8f00000000, 0xa6e985b000000000,
-    0xeac1131300000000, 0x8c1413cf00000000, 0xc03c856c00000000,
-    0x55424e5300000000, 0x196ad8f000000000, 0xd8ee3e3000000000,
-    0x94c6a89300000000, 0x01b863ac00000000, 0x4d90f50f00000000,
-    0x2b45f5d300000000, 0x676d637000000000, 0xf213a84f00000000,
-    0xbe3b3eec00000000, 0xad5a8d6600000000, 0xe1721bc500000000,
-    0x740cd0fa00000000, 0x3824465900000000, 0x5ef1468500000000,
-    0x12d9d02600000000, 0x87a71b1900000000, 0xcb8f8dba00000000,
-    0x0a0b6b7a00000000, 0x4623fdd900000000, 0xd35d36e600000000,
-    0x9f75a04500000000, 0xf9a0a09900000000, 0xb588363a00000000,
-    0x20f6fd0500000000, 0x6cde6ba600000000, 0xe3f9415f00000000,
-    0xafd1d7fc00000000, 0x3aaf1cc300000000, 0x76878a6000000000,
-    0x10528abc00000000, 0x5c7a1c1f00000000, 0xc904d72000000000,
-    0x852c418300000000, 0x44a8a74300000000, 0x088031e000000000,
-    0x9dfefadf00000000, 0xd1d66c7c00000000, 0xb7036ca000000000,
-    0xfb2bfa0300000000, 0x6e55313c00000000, 0x227da79f00000000,
-    0x099126f200000000, 0x45b9b05100000000, 0xd0c77b6e00000000,
-    0x9cefedcd00000000, 0xfa3aed1100000000, 0xb6127bb200000000,
-    0x236cb08d00000000, 0x6f44262e00000000, 0xaec0c0ee00000000,
-    0xe2e8564d00000000, 0x77969d7200000000, 0x3bbe0bd100000000,
-    0x5d6b0b0d00000000, 0x11439dae00000000, 0x843d569100000000,
-    0xc815c03200000000, 0x4732eacb00000000, 0x0b1a7c6800000000,
-    0x9e64b75700000000, 0xd24c21f400000000, 0xb499212800000000,
-    0xf8b1b78b00000000, 0x6dcf7cb400000000, 0x21e7ea1700000000,
-    0xe0630cd700000000, 0xac4b9a7400000000, 0x3935514b00000000,
-    0x751dc7e800000000, 0x13c8c73400000000, 0x5fe0519700000000,
-    0xca9e9aa800000000, 0x86b60c0b00000000, 0x95d7bf8100000000,
-    0xd9ff292200000000, 0x4c81e21d00000000, 0x00a974be00000000,
-    0x667c746200000000, 0x2a54e2c100000000, 0xbf2a29fe00000000,
-    0xf302bf5d00000000, 0x3286599d00000000, 0x7eaecf3e00000000,
-    0xebd0040100000000, 0xa7f892a200000000, 0xc12d927e00000000,
-    0x8d0504dd00000000, 0x187bcfe200000000, 0x5453594100000000,
-    0xdb7473b800000000, 0x975ce51b00000000, 0x02222e2400000000,
-    0x4e0ab88700000000, 0x28dfb85b00000000, 0x64f72ef800000000,
-    0xf189e5c700000000, 0xbda1736400000000, 0x7c2595a400000000,
-    0x300d030700000000, 0xa573c83800000000, 0xe95b5e9b00000000,
-    0x8f8e5e4700000000, 0xc3a6c8e400000000, 0x56d803db00000000,
-    0x1af0957800000000},
-   {0x0000000000000000, 0x939bc97f00000000, 0x263793ff00000000,
-    0xb5ac5a8000000000, 0x0d68572400000000, 0x9ef39e5b00000000,
-    0x2b5fc4db00000000, 0xb8c40da400000000, 0x1ad0ae4800000000,
-    0x894b673700000000, 0x3ce73db700000000, 0xaf7cf4c800000000,
-    0x17b8f96c00000000, 0x8423301300000000, 0x318f6a9300000000,
-    0xa214a3ec00000000, 0x34a05d9100000000, 0xa73b94ee00000000,
-    0x1297ce6e00000000, 0x810c071100000000, 0x39c80ab500000000,
-    0xaa53c3ca00000000, 0x1fff994a00000000, 0x8c64503500000000,
-    0x2e70f3d900000000, 0xbdeb3aa600000000, 0x0847602600000000,
-    0x9bdca95900000000, 0x2318a4fd00000000, 0xb0836d8200000000,
-    0x052f370200000000, 0x96b4fe7d00000000, 0x2946caf900000000,
-    0xbadd038600000000, 0x0f71590600000000, 0x9cea907900000000,
-    0x242e9ddd00000000, 0xb7b554a200000000, 0x02190e2200000000,
-    0x9182c75d00000000, 0x339664b100000000, 0xa00dadce00000000,
-    0x15a1f74e00000000, 0x863a3e3100000000, 0x3efe339500000000,
-    0xad65faea00000000, 0x18c9a06a00000000, 0x8b52691500000000,
-    0x1de6976800000000, 0x8e7d5e1700000000, 0x3bd1049700000000,
-    0xa84acde800000000, 0x108ec04c00000000, 0x8315093300000000,
-    0x36b953b300000000, 0xa5229acc00000000, 0x0736392000000000,
-    0x94adf05f00000000, 0x2101aadf00000000, 0xb29a63a000000000,
-    0x0a5e6e0400000000, 0x99c5a77b00000000, 0x2c69fdfb00000000,
-    0xbff2348400000000, 0x138ae52800000000, 0x80112c5700000000,
-    0x35bd76d700000000, 0xa626bfa800000000, 0x1ee2b20c00000000,
-    0x8d797b7300000000, 0x38d521f300000000, 0xab4ee88c00000000,
-    0x095a4b6000000000, 0x9ac1821f00000000, 0x2f6dd89f00000000,
-    0xbcf611e000000000, 0x04321c4400000000, 0x97a9d53b00000000,
-    0x22058fbb00000000, 0xb19e46c400000000, 0x272ab8b900000000,
-    0xb4b171c600000000, 0x011d2b4600000000, 0x9286e23900000000,
-    0x2a42ef9d00000000, 0xb9d926e200000000, 0x0c757c6200000000,
-    0x9feeb51d00000000, 0x3dfa16f100000000, 0xae61df8e00000000,
-    0x1bcd850e00000000, 0x88564c7100000000, 0x309241d500000000,
-    0xa30988aa00000000, 0x16a5d22a00000000, 0x853e1b5500000000,
-    0x3acc2fd100000000, 0xa957e6ae00000000, 0x1cfbbc2e00000000,
-    0x8f60755100000000, 0x37a478f500000000, 0xa43fb18a00000000,
-    0x1193eb0a00000000, 0x8208227500000000, 0x201c819900000000,
-    0xb38748e600000000, 0x062b126600000000, 0x95b0db1900000000,
-    0x2d74d6bd00000000, 0xbeef1fc200000000, 0x0b43454200000000,
-    0x98d88c3d00000000, 0x0e6c724000000000, 0x9df7bb3f00000000,
-    0x285be1bf00000000, 0xbbc028c000000000, 0x0304256400000000,
-    0x909fec1b00000000, 0x2533b69b00000000, 0xb6a87fe400000000,
-    0x14bcdc0800000000, 0x8727157700000000, 0x328b4ff700000000,
-    0xa110868800000000, 0x19d48b2c00000000, 0x8a4f425300000000,
-    0x3fe318d300000000, 0xac78d1ac00000000, 0x2614cb5100000000,
-    0xb58f022e00000000, 0x002358ae00000000, 0x93b891d100000000,
-    0x2b7c9c7500000000, 0xb8e7550a00000000, 0x0d4b0f8a00000000,
-    0x9ed0c6f500000000, 0x3cc4651900000000, 0xaf5fac6600000000,
-    0x1af3f6e600000000, 0x89683f9900000000, 0x31ac323d00000000,
-    0xa237fb4200000000, 0x179ba1c200000000, 0x840068bd00000000,
-    0x12b496c000000000, 0x812f5fbf00000000, 0x3483053f00000000,
-    0xa718cc4000000000, 0x1fdcc1e400000000, 0x8c47089b00000000,
-    0x39eb521b00000000, 0xaa709b6400000000, 0x0864388800000000,
-    0x9bfff1f700000000, 0x2e53ab7700000000, 0xbdc8620800000000,
-    0x050c6fac00000000, 0x9697a6d300000000, 0x233bfc5300000000,
-    0xb0a0352c00000000, 0x0f5201a800000000, 0x9cc9c8d700000000,
-    0x2965925700000000, 0xbafe5b2800000000, 0x023a568c00000000,
-    0x91a19ff300000000, 0x240dc57300000000, 0xb7960c0c00000000,
-    0x1582afe000000000, 0x8619669f00000000, 0x33b53c1f00000000,
-    0xa02ef56000000000, 0x18eaf8c400000000, 0x8b7131bb00000000,
-    0x3edd6b3b00000000, 0xad46a24400000000, 0x3bf25c3900000000,
-    0xa869954600000000, 0x1dc5cfc600000000, 0x8e5e06b900000000,
-    0x369a0b1d00000000, 0xa501c26200000000, 0x10ad98e200000000,
-    0x8336519d00000000, 0x2122f27100000000, 0xb2b93b0e00000000,
-    0x0715618e00000000, 0x948ea8f100000000, 0x2c4aa55500000000,
-    0xbfd16c2a00000000, 0x0a7d36aa00000000, 0x99e6ffd500000000,
-    0x359e2e7900000000, 0xa605e70600000000, 0x13a9bd8600000000,
-    0x803274f900000000, 0x38f6795d00000000, 0xab6db02200000000,
-    0x1ec1eaa200000000, 0x8d5a23dd00000000, 0x2f4e803100000000,
-    0xbcd5494e00000000, 0x097913ce00000000, 0x9ae2dab100000000,
-    0x2226d71500000000, 0xb1bd1e6a00000000, 0x041144ea00000000,
-    0x978a8d9500000000, 0x013e73e800000000, 0x92a5ba9700000000,
-    0x2709e01700000000, 0xb492296800000000, 0x0c5624cc00000000,
-    0x9fcdedb300000000, 0x2a61b73300000000, 0xb9fa7e4c00000000,
-    0x1beedda000000000, 0x887514df00000000, 0x3dd94e5f00000000,
-    0xae42872000000000, 0x16868a8400000000, 0x851d43fb00000000,
-    0x30b1197b00000000, 0xa32ad00400000000, 0x1cd8e48000000000,
-    0x8f432dff00000000, 0x3aef777f00000000, 0xa974be0000000000,
-    0x11b0b3a400000000, 0x822b7adb00000000, 0x3787205b00000000,
-    0xa41ce92400000000, 0x06084ac800000000, 0x959383b700000000,
-    0x203fd93700000000, 0xb3a4104800000000, 0x0b601dec00000000,
-    0x98fbd49300000000, 0x2d578e1300000000, 0xbecc476c00000000,
-    0x2878b91100000000, 0xbbe3706e00000000, 0x0e4f2aee00000000,
-    0x9dd4e39100000000, 0x2510ee3500000000, 0xb68b274a00000000,
-    0x03277dca00000000, 0x90bcb4b500000000, 0x32a8175900000000,
-    0xa133de2600000000, 0x149f84a600000000, 0x87044dd900000000,
-    0x3fc0407d00000000, 0xac5b890200000000, 0x19f7d38200000000,
-    0x8a6c1afd00000000},
-   {0x0000000000000000, 0x650b796900000000, 0xca16f2d200000000,
-    0xaf1d8bbb00000000, 0xd52b957e00000000, 0xb020ec1700000000,
-    0x1f3d67ac00000000, 0x7a361ec500000000, 0xaa572afd00000000,
-    0xcf5c539400000000, 0x6041d82f00000000, 0x054aa14600000000,
-    0x7f7cbf8300000000, 0x1a77c6ea00000000, 0xb56a4d5100000000,
-    0xd061343800000000, 0x15a9252100000000, 0x70a25c4800000000,
-    0xdfbfd7f300000000, 0xbab4ae9a00000000, 0xc082b05f00000000,
-    0xa589c93600000000, 0x0a94428d00000000, 0x6f9f3be400000000,
-    0xbffe0fdc00000000, 0xdaf576b500000000, 0x75e8fd0e00000000,
-    0x10e3846700000000, 0x6ad59aa200000000, 0x0fdee3cb00000000,
-    0xa0c3687000000000, 0xc5c8111900000000, 0x2a524b4200000000,
-    0x4f59322b00000000, 0xe044b99000000000, 0x854fc0f900000000,
-    0xff79de3c00000000, 0x9a72a75500000000, 0x356f2cee00000000,
-    0x5064558700000000, 0x800561bf00000000, 0xe50e18d600000000,
-    0x4a13936d00000000, 0x2f18ea0400000000, 0x552ef4c100000000,
-    0x30258da800000000, 0x9f38061300000000, 0xfa337f7a00000000,
-    0x3ffb6e6300000000, 0x5af0170a00000000, 0xf5ed9cb100000000,
-    0x90e6e5d800000000, 0xead0fb1d00000000, 0x8fdb827400000000,
-    0x20c609cf00000000, 0x45cd70a600000000, 0x95ac449e00000000,
-    0xf0a73df700000000, 0x5fbab64c00000000, 0x3ab1cf2500000000,
-    0x4087d1e000000000, 0x258ca88900000000, 0x8a91233200000000,
-    0xef9a5a5b00000000, 0x54a4968400000000, 0x31afefed00000000,
-    0x9eb2645600000000, 0xfbb91d3f00000000, 0x818f03fa00000000,
-    0xe4847a9300000000, 0x4b99f12800000000, 0x2e92884100000000,
-    0xfef3bc7900000000, 0x9bf8c51000000000, 0x34e54eab00000000,
-    0x51ee37c200000000, 0x2bd8290700000000, 0x4ed3506e00000000,
-    0xe1cedbd500000000, 0x84c5a2bc00000000, 0x410db3a500000000,
-    0x2406cacc00000000, 0x8b1b417700000000, 0xee10381e00000000,
-    0x942626db00000000, 0xf12d5fb200000000, 0x5e30d40900000000,
-    0x3b3bad6000000000, 0xeb5a995800000000, 0x8e51e03100000000,
-    0x214c6b8a00000000, 0x444712e300000000, 0x3e710c2600000000,
-    0x5b7a754f00000000, 0xf467fef400000000, 0x916c879d00000000,
-    0x7ef6ddc600000000, 0x1bfda4af00000000, 0xb4e02f1400000000,
-    0xd1eb567d00000000, 0xabdd48b800000000, 0xced631d100000000,
-    0x61cbba6a00000000, 0x04c0c30300000000, 0xd4a1f73b00000000,
-    0xb1aa8e5200000000, 0x1eb705e900000000, 0x7bbc7c8000000000,
-    0x018a624500000000, 0x64811b2c00000000, 0xcb9c909700000000,
-    0xae97e9fe00000000, 0x6b5ff8e700000000, 0x0e54818e00000000,
-    0xa1490a3500000000, 0xc442735c00000000, 0xbe746d9900000000,
-    0xdb7f14f000000000, 0x74629f4b00000000, 0x1169e62200000000,
-    0xc108d21a00000000, 0xa403ab7300000000, 0x0b1e20c800000000,
-    0x6e1559a100000000, 0x1423476400000000, 0x71283e0d00000000,
-    0xde35b5b600000000, 0xbb3eccdf00000000, 0xe94e5cd200000000,
-    0x8c4525bb00000000, 0x2358ae0000000000, 0x4653d76900000000,
-    0x3c65c9ac00000000, 0x596eb0c500000000, 0xf6733b7e00000000,
-    0x9378421700000000, 0x4319762f00000000, 0x26120f4600000000,
-    0x890f84fd00000000, 0xec04fd9400000000, 0x9632e35100000000,
-    0xf3399a3800000000, 0x5c24118300000000, 0x392f68ea00000000,
-    0xfce779f300000000, 0x99ec009a00000000, 0x36f18b2100000000,
-    0x53faf24800000000, 0x29ccec8d00000000, 0x4cc795e400000000,
-    0xe3da1e5f00000000, 0x86d1673600000000, 0x56b0530e00000000,
-    0x33bb2a6700000000, 0x9ca6a1dc00000000, 0xf9add8b500000000,
-    0x839bc67000000000, 0xe690bf1900000000, 0x498d34a200000000,
-    0x2c864dcb00000000, 0xc31c179000000000, 0xa6176ef900000000,
-    0x090ae54200000000, 0x6c019c2b00000000, 0x163782ee00000000,
-    0x733cfb8700000000, 0xdc21703c00000000, 0xb92a095500000000,
-    0x694b3d6d00000000, 0x0c40440400000000, 0xa35dcfbf00000000,
-    0xc656b6d600000000, 0xbc60a81300000000, 0xd96bd17a00000000,
-    0x76765ac100000000, 0x137d23a800000000, 0xd6b532b100000000,
-    0xb3be4bd800000000, 0x1ca3c06300000000, 0x79a8b90a00000000,
-    0x039ea7cf00000000, 0x6695dea600000000, 0xc988551d00000000,
-    0xac832c7400000000, 0x7ce2184c00000000, 0x19e9612500000000,
-    0xb6f4ea9e00000000, 0xd3ff93f700000000, 0xa9c98d3200000000,
-    0xccc2f45b00000000, 0x63df7fe000000000, 0x06d4068900000000,
-    0xbdeaca5600000000, 0xd8e1b33f00000000, 0x77fc388400000000,
-    0x12f741ed00000000, 0x68c15f2800000000, 0x0dca264100000000,
-    0xa2d7adfa00000000, 0xc7dcd49300000000, 0x17bde0ab00000000,
-    0x72b699c200000000, 0xddab127900000000, 0xb8a06b1000000000,
-    0xc29675d500000000, 0xa79d0cbc00000000, 0x0880870700000000,
-    0x6d8bfe6e00000000, 0xa843ef7700000000, 0xcd48961e00000000,
-    0x62551da500000000, 0x075e64cc00000000, 0x7d687a0900000000,
-    0x1863036000000000, 0xb77e88db00000000, 0xd275f1b200000000,
-    0x0214c58a00000000, 0x671fbce300000000, 0xc802375800000000,
-    0xad094e3100000000, 0xd73f50f400000000, 0xb234299d00000000,
-    0x1d29a22600000000, 0x7822db4f00000000, 0x97b8811400000000,
-    0xf2b3f87d00000000, 0x5dae73c600000000, 0x38a50aaf00000000,
-    0x4293146a00000000, 0x27986d0300000000, 0x8885e6b800000000,
-    0xed8e9fd100000000, 0x3defabe900000000, 0x58e4d28000000000,
-    0xf7f9593b00000000, 0x92f2205200000000, 0xe8c43e9700000000,
-    0x8dcf47fe00000000, 0x22d2cc4500000000, 0x47d9b52c00000000,
-    0x8211a43500000000, 0xe71add5c00000000, 0x480756e700000000,
-    0x2d0c2f8e00000000, 0x573a314b00000000, 0x3231482200000000,
-    0x9d2cc39900000000, 0xf827baf000000000, 0x28468ec800000000,
-    0x4d4df7a100000000, 0xe2507c1a00000000, 0x875b057300000000,
-    0xfd6d1bb600000000, 0x986662df00000000, 0x377be96400000000,
-    0x5270900d00000000},
-   {0x0000000000000000, 0xdcecb13d00000000, 0xb8d9637b00000000,
-    0x6435d24600000000, 0x70b3c7f600000000, 0xac5f76cb00000000,
-    0xc86aa48d00000000, 0x148615b000000000, 0xa160fe3600000000,
-    0x7d8c4f0b00000000, 0x19b99d4d00000000, 0xc5552c7000000000,
-    0xd1d339c000000000, 0x0d3f88fd00000000, 0x690a5abb00000000,
-    0xb5e6eb8600000000, 0x42c1fc6d00000000, 0x9e2d4d5000000000,
-    0xfa189f1600000000, 0x26f42e2b00000000, 0x32723b9b00000000,
-    0xee9e8aa600000000, 0x8aab58e000000000, 0x5647e9dd00000000,
-    0xe3a1025b00000000, 0x3f4db36600000000, 0x5b78612000000000,
-    0x8794d01d00000000, 0x9312c5ad00000000, 0x4ffe749000000000,
-    0x2bcba6d600000000, 0xf72717eb00000000, 0x8482f9db00000000,
-    0x586e48e600000000, 0x3c5b9aa000000000, 0xe0b72b9d00000000,
-    0xf4313e2d00000000, 0x28dd8f1000000000, 0x4ce85d5600000000,
-    0x9004ec6b00000000, 0x25e207ed00000000, 0xf90eb6d000000000,
-    0x9d3b649600000000, 0x41d7d5ab00000000, 0x5551c01b00000000,
-    0x89bd712600000000, 0xed88a36000000000, 0x3164125d00000000,
-    0xc64305b600000000, 0x1aafb48b00000000, 0x7e9a66cd00000000,
-    0xa276d7f000000000, 0xb6f0c24000000000, 0x6a1c737d00000000,
-    0x0e29a13b00000000, 0xd2c5100600000000, 0x6723fb8000000000,
-    0xbbcf4abd00000000, 0xdffa98fb00000000, 0x031629c600000000,
-    0x17903c7600000000, 0xcb7c8d4b00000000, 0xaf495f0d00000000,
-    0x73a5ee3000000000, 0x4903826c00000000, 0x95ef335100000000,
-    0xf1dae11700000000, 0x2d36502a00000000, 0x39b0459a00000000,
-    0xe55cf4a700000000, 0x816926e100000000, 0x5d8597dc00000000,
-    0xe8637c5a00000000, 0x348fcd6700000000, 0x50ba1f2100000000,
-    0x8c56ae1c00000000, 0x98d0bbac00000000, 0x443c0a9100000000,
-    0x2009d8d700000000, 0xfce569ea00000000, 0x0bc27e0100000000,
-    0xd72ecf3c00000000, 0xb31b1d7a00000000, 0x6ff7ac4700000000,
-    0x7b71b9f700000000, 0xa79d08ca00000000, 0xc3a8da8c00000000,
-    0x1f446bb100000000, 0xaaa2803700000000, 0x764e310a00000000,
-    0x127be34c00000000, 0xce97527100000000, 0xda1147c100000000,
-    0x06fdf6fc00000000, 0x62c824ba00000000, 0xbe24958700000000,
-    0xcd817bb700000000, 0x116dca8a00000000, 0x755818cc00000000,
-    0xa9b4a9f100000000, 0xbd32bc4100000000, 0x61de0d7c00000000,
-    0x05ebdf3a00000000, 0xd9076e0700000000, 0x6ce1858100000000,
-    0xb00d34bc00000000, 0xd438e6fa00000000, 0x08d457c700000000,
-    0x1c52427700000000, 0xc0bef34a00000000, 0xa48b210c00000000,
-    0x7867903100000000, 0x8f4087da00000000, 0x53ac36e700000000,
-    0x3799e4a100000000, 0xeb75559c00000000, 0xfff3402c00000000,
-    0x231ff11100000000, 0x472a235700000000, 0x9bc6926a00000000,
-    0x2e2079ec00000000, 0xf2ccc8d100000000, 0x96f91a9700000000,
-    0x4a15abaa00000000, 0x5e93be1a00000000, 0x827f0f2700000000,
-    0xe64add6100000000, 0x3aa66c5c00000000, 0x920604d900000000,
-    0x4eeab5e400000000, 0x2adf67a200000000, 0xf633d69f00000000,
-    0xe2b5c32f00000000, 0x3e59721200000000, 0x5a6ca05400000000,
-    0x8680116900000000, 0x3366faef00000000, 0xef8a4bd200000000,
-    0x8bbf999400000000, 0x575328a900000000, 0x43d53d1900000000,
-    0x9f398c2400000000, 0xfb0c5e6200000000, 0x27e0ef5f00000000,
-    0xd0c7f8b400000000, 0x0c2b498900000000, 0x681e9bcf00000000,
-    0xb4f22af200000000, 0xa0743f4200000000, 0x7c988e7f00000000,
-    0x18ad5c3900000000, 0xc441ed0400000000, 0x71a7068200000000,
-    0xad4bb7bf00000000, 0xc97e65f900000000, 0x1592d4c400000000,
-    0x0114c17400000000, 0xddf8704900000000, 0xb9cda20f00000000,
-    0x6521133200000000, 0x1684fd0200000000, 0xca684c3f00000000,
-    0xae5d9e7900000000, 0x72b12f4400000000, 0x66373af400000000,
-    0xbadb8bc900000000, 0xdeee598f00000000, 0x0202e8b200000000,
-    0xb7e4033400000000, 0x6b08b20900000000, 0x0f3d604f00000000,
-    0xd3d1d17200000000, 0xc757c4c200000000, 0x1bbb75ff00000000,
-    0x7f8ea7b900000000, 0xa362168400000000, 0x5445016f00000000,
-    0x88a9b05200000000, 0xec9c621400000000, 0x3070d32900000000,
-    0x24f6c69900000000, 0xf81a77a400000000, 0x9c2fa5e200000000,
-    0x40c314df00000000, 0xf525ff5900000000, 0x29c94e6400000000,
-    0x4dfc9c2200000000, 0x91102d1f00000000, 0x859638af00000000,
-    0x597a899200000000, 0x3d4f5bd400000000, 0xe1a3eae900000000,
-    0xdb0586b500000000, 0x07e9378800000000, 0x63dce5ce00000000,
-    0xbf3054f300000000, 0xabb6414300000000, 0x775af07e00000000,
-    0x136f223800000000, 0xcf83930500000000, 0x7a65788300000000,
-    0xa689c9be00000000, 0xc2bc1bf800000000, 0x1e50aac500000000,
-    0x0ad6bf7500000000, 0xd63a0e4800000000, 0xb20fdc0e00000000,
-    0x6ee36d3300000000, 0x99c47ad800000000, 0x4528cbe500000000,
-    0x211d19a300000000, 0xfdf1a89e00000000, 0xe977bd2e00000000,
-    0x359b0c1300000000, 0x51aede5500000000, 0x8d426f6800000000,
-    0x38a484ee00000000, 0xe44835d300000000, 0x807de79500000000,
-    0x5c9156a800000000, 0x4817431800000000, 0x94fbf22500000000,
-    0xf0ce206300000000, 0x2c22915e00000000, 0x5f877f6e00000000,
-    0x836bce5300000000, 0xe75e1c1500000000, 0x3bb2ad2800000000,
-    0x2f34b89800000000, 0xf3d809a500000000, 0x97eddbe300000000,
-    0x4b016ade00000000, 0xfee7815800000000, 0x220b306500000000,
-    0x463ee22300000000, 0x9ad2531e00000000, 0x8e5446ae00000000,
-    0x52b8f79300000000, 0x368d25d500000000, 0xea6194e800000000,
-    0x1d46830300000000, 0xc1aa323e00000000, 0xa59fe07800000000,
-    0x7973514500000000, 0x6df544f500000000, 0xb119f5c800000000,
-    0xd52c278e00000000, 0x09c096b300000000, 0xbc267d3500000000,
-    0x60cacc0800000000, 0x04ff1e4e00000000, 0xd813af7300000000,
-    0xcc95bac300000000, 0x10790bfe00000000, 0x744cd9b800000000,
-    0xa8a0688500000000}};
-
-#else /* W == 4 */
-
-static const uint32_t crc_braid_table[][256] = {
-   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
-    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
-    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
-    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
-    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
-    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
-    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
-    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
-    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
-    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
-    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
-    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
-    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
-    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
-    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
-    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
-    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
-    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
-    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
-    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
-    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
-    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
-    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
-    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
-    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
-    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
-    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
-    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
-    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
-    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
-    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
-    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
-    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
-    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
-    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
-    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
-    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
-    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
-    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
-    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
-    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
-    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
-    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
-    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
-    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
-    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
-    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
-    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
-    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
-    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
-    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
-    0x09cd8551},
-   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
-    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
-    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
-    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
-    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
-    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
-    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
-    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
-    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
-    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
-    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
-    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
-    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
-    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
-    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
-    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
-    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
-    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
-    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
-    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
-    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
-    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
-    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
-    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
-    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
-    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
-    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
-    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
-    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
-    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
-    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
-    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
-    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
-    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
-    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
-    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
-    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
-    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
-    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
-    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
-    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
-    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
-    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
-    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
-    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
-    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
-    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
-    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
-    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
-    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
-    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
-    0x7bc97a0c},
-   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
-    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
-    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
-    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
-    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
-    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
-    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
-    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
-    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
-    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
-    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
-    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
-    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
-    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
-    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
-    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
-    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
-    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
-    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
-    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
-    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
-    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
-    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
-    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
-    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
-    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
-    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
-    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
-    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
-    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
-    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
-    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
-    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
-    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
-    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
-    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
-    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
-    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
-    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
-    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
-    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
-    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
-    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
-    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
-    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
-    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
-    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
-    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
-    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
-    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
-    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
-    0x7851a2ca},
-   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
-    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
-    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
-    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
-    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
-    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
-    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
-    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
-    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
-    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
-    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
-    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
-    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
-    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
-    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
-    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
-    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
-    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
-    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
-    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
-    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
-    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
-    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
-    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
-    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
-    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
-    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
-    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
-    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
-    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
-    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
-    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
-    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
-    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
-    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
-    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
-    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
-    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
-    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
-    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
-    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
-    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
-    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
-    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
-    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
-    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
-    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
-    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
-    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
-    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
-    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
-    0x566b6848}};
-
-static const z_word_t crc_braid_big_table[][256] = {
-   {0x00000000, 0x9e83da9f, 0x7d01c4e4, 0xe3821e7b, 0xbb04f912,
-    0x2587238d, 0xc6053df6, 0x5886e769, 0x7609f225, 0xe88a28ba,
-    0x0b0836c1, 0x958bec5e, 0xcd0d0b37, 0x538ed1a8, 0xb00ccfd3,
-    0x2e8f154c, 0xec12e44b, 0x72913ed4, 0x911320af, 0x0f90fa30,
-    0x57161d59, 0xc995c7c6, 0x2a17d9bd, 0xb4940322, 0x9a1b166e,
-    0x0498ccf1, 0xe71ad28a, 0x79990815, 0x211fef7c, 0xbf9c35e3,
-    0x5c1e2b98, 0xc29df107, 0xd825c897, 0x46a61208, 0xa5240c73,
-    0x3ba7d6ec, 0x63213185, 0xfda2eb1a, 0x1e20f561, 0x80a32ffe,
-    0xae2c3ab2, 0x30afe02d, 0xd32dfe56, 0x4dae24c9, 0x1528c3a0,
-    0x8bab193f, 0x68290744, 0xf6aadddb, 0x34372cdc, 0xaab4f643,
-    0x4936e838, 0xd7b532a7, 0x8f33d5ce, 0x11b00f51, 0xf232112a,
-    0x6cb1cbb5, 0x423edef9, 0xdcbd0466, 0x3f3f1a1d, 0xa1bcc082,
-    0xf93a27eb, 0x67b9fd74, 0x843be30f, 0x1ab83990, 0xf14de1f4,
-    0x6fce3b6b, 0x8c4c2510, 0x12cfff8f, 0x4a4918e6, 0xd4cac279,
-    0x3748dc02, 0xa9cb069d, 0x874413d1, 0x19c7c94e, 0xfa45d735,
-    0x64c60daa, 0x3c40eac3, 0xa2c3305c, 0x41412e27, 0xdfc2f4b8,
-    0x1d5f05bf, 0x83dcdf20, 0x605ec15b, 0xfedd1bc4, 0xa65bfcad,
-    0x38d82632, 0xdb5a3849, 0x45d9e2d6, 0x6b56f79a, 0xf5d52d05,
-    0x1657337e, 0x88d4e9e1, 0xd0520e88, 0x4ed1d417, 0xad53ca6c,
-    0x33d010f3, 0x29682963, 0xb7ebf3fc, 0x5469ed87, 0xcaea3718,
-    0x926cd071, 0x0cef0aee, 0xef6d1495, 0x71eece0a, 0x5f61db46,
-    0xc1e201d9, 0x22601fa2, 0xbce3c53d, 0xe4652254, 0x7ae6f8cb,
-    0x9964e6b0, 0x07e73c2f, 0xc57acd28, 0x5bf917b7, 0xb87b09cc,
-    0x26f8d353, 0x7e7e343a, 0xe0fdeea5, 0x037ff0de, 0x9dfc2a41,
-    0xb3733f0d, 0x2df0e592, 0xce72fbe9, 0x50f12176, 0x0877c61f,
-    0x96f41c80, 0x757602fb, 0xebf5d864, 0xa39db332, 0x3d1e69ad,
-    0xde9c77d6, 0x401fad49, 0x18994a20, 0x861a90bf, 0x65988ec4,
-    0xfb1b545b, 0xd5944117, 0x4b179b88, 0xa89585f3, 0x36165f6c,
-    0x6e90b805, 0xf013629a, 0x13917ce1, 0x8d12a67e, 0x4f8f5779,
-    0xd10c8de6, 0x328e939d, 0xac0d4902, 0xf48bae6b, 0x6a0874f4,
-    0x898a6a8f, 0x1709b010, 0x3986a55c, 0xa7057fc3, 0x448761b8,
-    0xda04bb27, 0x82825c4e, 0x1c0186d1, 0xff8398aa, 0x61004235,
-    0x7bb87ba5, 0xe53ba13a, 0x06b9bf41, 0x983a65de, 0xc0bc82b7,
-    0x5e3f5828, 0xbdbd4653, 0x233e9ccc, 0x0db18980, 0x9332531f,
-    0x70b04d64, 0xee3397fb, 0xb6b57092, 0x2836aa0d, 0xcbb4b476,
-    0x55376ee9, 0x97aa9fee, 0x09294571, 0xeaab5b0a, 0x74288195,
-    0x2cae66fc, 0xb22dbc63, 0x51afa218, 0xcf2c7887, 0xe1a36dcb,
-    0x7f20b754, 0x9ca2a92f, 0x022173b0, 0x5aa794d9, 0xc4244e46,
-    0x27a6503d, 0xb9258aa2, 0x52d052c6, 0xcc538859, 0x2fd19622,
-    0xb1524cbd, 0xe9d4abd4, 0x7757714b, 0x94d56f30, 0x0a56b5af,
-    0x24d9a0e3, 0xba5a7a7c, 0x59d86407, 0xc75bbe98, 0x9fdd59f1,
-    0x015e836e, 0xe2dc9d15, 0x7c5f478a, 0xbec2b68d, 0x20416c12,
-    0xc3c37269, 0x5d40a8f6, 0x05c64f9f, 0x9b459500, 0x78c78b7b,
-    0xe64451e4, 0xc8cb44a8, 0x56489e37, 0xb5ca804c, 0x2b495ad3,
-    0x73cfbdba, 0xed4c6725, 0x0ece795e, 0x904da3c1, 0x8af59a51,
-    0x147640ce, 0xf7f45eb5, 0x6977842a, 0x31f16343, 0xaf72b9dc,
-    0x4cf0a7a7, 0xd2737d38, 0xfcfc6874, 0x627fb2eb, 0x81fdac90,
-    0x1f7e760f, 0x47f89166, 0xd97b4bf9, 0x3af95582, 0xa47a8f1d,
-    0x66e77e1a, 0xf864a485, 0x1be6bafe, 0x85656061, 0xdde38708,
-    0x43605d97, 0xa0e243ec, 0x3e619973, 0x10ee8c3f, 0x8e6d56a0,
-    0x6def48db, 0xf36c9244, 0xabea752d, 0x3569afb2, 0xd6ebb1c9,
-    0x48686b56},
-   {0x00000000, 0xc0642817, 0x80c9502e, 0x40ad7839, 0x0093a15c,
-    0xc0f7894b, 0x805af172, 0x403ed965, 0x002643b9, 0xc0426bae,
-    0x80ef1397, 0x408b3b80, 0x00b5e2e5, 0xc0d1caf2, 0x807cb2cb,
-    0x40189adc, 0x414af7a9, 0x812edfbe, 0xc183a787, 0x01e78f90,
-    0x41d956f5, 0x81bd7ee2, 0xc11006db, 0x01742ecc, 0x416cb410,
-    0x81089c07, 0xc1a5e43e, 0x01c1cc29, 0x41ff154c, 0x819b3d5b,
-    0xc1364562, 0x01526d75, 0xc3929f88, 0x03f6b79f, 0x435bcfa6,
-    0x833fe7b1, 0xc3013ed4, 0x036516c3, 0x43c86efa, 0x83ac46ed,
-    0xc3b4dc31, 0x03d0f426, 0x437d8c1f, 0x8319a408, 0xc3277d6d,
-    0x0343557a, 0x43ee2d43, 0x838a0554, 0x82d86821, 0x42bc4036,
-    0x0211380f, 0xc2751018, 0x824bc97d, 0x422fe16a, 0x02829953,
-    0xc2e6b144, 0x82fe2b98, 0x429a038f, 0x02377bb6, 0xc25353a1,
-    0x826d8ac4, 0x4209a2d3, 0x02a4daea, 0xc2c0f2fd, 0xc7234eca,
-    0x074766dd, 0x47ea1ee4, 0x878e36f3, 0xc7b0ef96, 0x07d4c781,
-    0x4779bfb8, 0x871d97af, 0xc7050d73, 0x07612564, 0x47cc5d5d,
-    0x87a8754a, 0xc796ac2f, 0x07f28438, 0x475ffc01, 0x873bd416,
-    0x8669b963, 0x460d9174, 0x06a0e94d, 0xc6c4c15a, 0x86fa183f,
-    0x469e3028, 0x06334811, 0xc6576006, 0x864ffada, 0x462bd2cd,
-    0x0686aaf4, 0xc6e282e3, 0x86dc5b86, 0x46b87391, 0x06150ba8,
-    0xc67123bf, 0x04b1d142, 0xc4d5f955, 0x8478816c, 0x441ca97b,
-    0x0422701e, 0xc4465809, 0x84eb2030, 0x448f0827, 0x049792fb,
-    0xc4f3baec, 0x845ec2d5, 0x443aeac2, 0x040433a7, 0xc4601bb0,
-    0x84cd6389, 0x44a94b9e, 0x45fb26eb, 0x859f0efc, 0xc53276c5,
-    0x05565ed2, 0x456887b7, 0x850cafa0, 0xc5a1d799, 0x05c5ff8e,
-    0x45dd6552, 0x85b94d45, 0xc514357c, 0x05701d6b, 0x454ec40e,
-    0x852aec19, 0xc5879420, 0x05e3bc37, 0xcf41ed4f, 0x0f25c558,
-    0x4f88bd61, 0x8fec9576, 0xcfd24c13, 0x0fb66404, 0x4f1b1c3d,
-    0x8f7f342a, 0xcf67aef6, 0x0f0386e1, 0x4faefed8, 0x8fcad6cf,
-    0xcff40faa, 0x0f9027bd, 0x4f3d5f84, 0x8f597793, 0x8e0b1ae6,
-    0x4e6f32f1, 0x0ec24ac8, 0xcea662df, 0x8e98bbba, 0x4efc93ad,
-    0x0e51eb94, 0xce35c383, 0x8e2d595f, 0x4e497148, 0x0ee40971,
-    0xce802166, 0x8ebef803, 0x4edad014, 0x0e77a82d, 0xce13803a,
-    0x0cd372c7, 0xccb75ad0, 0x8c1a22e9, 0x4c7e0afe, 0x0c40d39b,
-    0xcc24fb8c, 0x8c8983b5, 0x4cedaba2, 0x0cf5317e, 0xcc911969,
-    0x8c3c6150, 0x4c584947, 0x0c669022, 0xcc02b835, 0x8cafc00c,
-    0x4ccbe81b, 0x4d99856e, 0x8dfdad79, 0xcd50d540, 0x0d34fd57,
-    0x4d0a2432, 0x8d6e0c25, 0xcdc3741c, 0x0da75c0b, 0x4dbfc6d7,
-    0x8ddbeec0, 0xcd7696f9, 0x0d12beee, 0x4d2c678b, 0x8d484f9c,
-    0xcde537a5, 0x0d811fb2, 0x0862a385, 0xc8068b92, 0x88abf3ab,
-    0x48cfdbbc, 0x08f102d9, 0xc8952ace, 0x883852f7, 0x485c7ae0,
-    0x0844e03c, 0xc820c82b, 0x888db012, 0x48e99805, 0x08d74160,
-    0xc8b36977, 0x881e114e, 0x487a3959, 0x4928542c, 0x894c7c3b,
-    0xc9e10402, 0x09852c15, 0x49bbf570, 0x89dfdd67, 0xc972a55e,
-    0x09168d49, 0x490e1795, 0x896a3f82, 0xc9c747bb, 0x09a36fac,
-    0x499db6c9, 0x89f99ede, 0xc954e6e7, 0x0930cef0, 0xcbf03c0d,
-    0x0b94141a, 0x4b396c23, 0x8b5d4434, 0xcb639d51, 0x0b07b546,
-    0x4baacd7f, 0x8bcee568, 0xcbd67fb4, 0x0bb257a3, 0x4b1f2f9a,
-    0x8b7b078d, 0xcb45dee8, 0x0b21f6ff, 0x4b8c8ec6, 0x8be8a6d1,
-    0x8abacba4, 0x4adee3b3, 0x0a739b8a, 0xca17b39d, 0x8a296af8,
-    0x4a4d42ef, 0x0ae03ad6, 0xca8412c1, 0x8a9c881d, 0x4af8a00a,
-    0x0a55d833, 0xca31f024, 0x8a0f2941, 0x4a6b0156, 0x0ac6796f,
-    0xcaa25178},
-   {0x00000000, 0xd4ea739b, 0xe9d396ed, 0x3d39e576, 0x93a15c00,
-    0x474b2f9b, 0x7a72caed, 0xae98b976, 0x2643b900, 0xf2a9ca9b,
-    0xcf902fed, 0x1b7a5c76, 0xb5e2e500, 0x6108969b, 0x5c3173ed,
-    0x88db0076, 0x4c867201, 0x986c019a, 0xa555e4ec, 0x71bf9777,
-    0xdf272e01, 0x0bcd5d9a, 0x36f4b8ec, 0xe21ecb77, 0x6ac5cb01,
-    0xbe2fb89a, 0x83165dec, 0x57fc2e77, 0xf9649701, 0x2d8ee49a,
-    0x10b701ec, 0xc45d7277, 0x980ce502, 0x4ce69699, 0x71df73ef,
-    0xa5350074, 0x0badb902, 0xdf47ca99, 0xe27e2fef, 0x36945c74,
-    0xbe4f5c02, 0x6aa52f99, 0x579ccaef, 0x8376b974, 0x2dee0002,
-    0xf9047399, 0xc43d96ef, 0x10d7e574, 0xd48a9703, 0x0060e498,
-    0x3d5901ee, 0xe9b37275, 0x472bcb03, 0x93c1b898, 0xaef85dee,
-    0x7a122e75, 0xf2c92e03, 0x26235d98, 0x1b1ab8ee, 0xcff0cb75,
-    0x61687203, 0xb5820198, 0x88bbe4ee, 0x5c519775, 0x3019ca05,
-    0xe4f3b99e, 0xd9ca5ce8, 0x0d202f73, 0xa3b89605, 0x7752e59e,
-    0x4a6b00e8, 0x9e817373, 0x165a7305, 0xc2b0009e, 0xff89e5e8,
-    0x2b639673, 0x85fb2f05, 0x51115c9e, 0x6c28b9e8, 0xb8c2ca73,
-    0x7c9fb804, 0xa875cb9f, 0x954c2ee9, 0x41a65d72, 0xef3ee404,
-    0x3bd4979f, 0x06ed72e9, 0xd2070172, 0x5adc0104, 0x8e36729f,
-    0xb30f97e9, 0x67e5e472, 0xc97d5d04, 0x1d972e9f, 0x20aecbe9,
-    0xf444b872, 0xa8152f07, 0x7cff5c9c, 0x41c6b9ea, 0x952cca71,
-    0x3bb47307, 0xef5e009c, 0xd267e5ea, 0x068d9671, 0x8e569607,
-    0x5abce59c, 0x678500ea, 0xb36f7371, 0x1df7ca07, 0xc91db99c,
-    0xf4245cea, 0x20ce2f71, 0xe4935d06, 0x30792e9d, 0x0d40cbeb,
-    0xd9aab870, 0x77320106, 0xa3d8729d, 0x9ee197eb, 0x4a0be470,
-    0xc2d0e406, 0x163a979d, 0x2b0372eb, 0xffe90170, 0x5171b806,
-    0x859bcb9d, 0xb8a22eeb, 0x6c485d70, 0x6032940b, 0xb4d8e790,
-    0x89e102e6, 0x5d0b717d, 0xf393c80b, 0x2779bb90, 0x1a405ee6,
-    0xceaa2d7d, 0x46712d0b, 0x929b5e90, 0xafa2bbe6, 0x7b48c87d,
-    0xd5d0710b, 0x013a0290, 0x3c03e7e6, 0xe8e9947d, 0x2cb4e60a,
-    0xf85e9591, 0xc56770e7, 0x118d037c, 0xbf15ba0a, 0x6bffc991,
-    0x56c62ce7, 0x822c5f7c, 0x0af75f0a, 0xde1d2c91, 0xe324c9e7,
-    0x37ceba7c, 0x9956030a, 0x4dbc7091, 0x708595e7, 0xa46fe67c,
-    0xf83e7109, 0x2cd40292, 0x11ede7e4, 0xc507947f, 0x6b9f2d09,
-    0xbf755e92, 0x824cbbe4, 0x56a6c87f, 0xde7dc809, 0x0a97bb92,
-    0x37ae5ee4, 0xe3442d7f, 0x4ddc9409, 0x9936e792, 0xa40f02e4,
-    0x70e5717f, 0xb4b80308, 0x60527093, 0x5d6b95e5, 0x8981e67e,
-    0x27195f08, 0xf3f32c93, 0xcecac9e5, 0x1a20ba7e, 0x92fbba08,
-    0x4611c993, 0x7b282ce5, 0xafc25f7e, 0x015ae608, 0xd5b09593,
-    0xe88970e5, 0x3c63037e, 0x502b5e0e, 0x84c12d95, 0xb9f8c8e3,
-    0x6d12bb78, 0xc38a020e, 0x17607195, 0x2a5994e3, 0xfeb3e778,
-    0x7668e70e, 0xa2829495, 0x9fbb71e3, 0x4b510278, 0xe5c9bb0e,
-    0x3123c895, 0x0c1a2de3, 0xd8f05e78, 0x1cad2c0f, 0xc8475f94,
-    0xf57ebae2, 0x2194c979, 0x8f0c700f, 0x5be60394, 0x66dfe6e2,
-    0xb2359579, 0x3aee950f, 0xee04e694, 0xd33d03e2, 0x07d77079,
-    0xa94fc90f, 0x7da5ba94, 0x409c5fe2, 0x94762c79, 0xc827bb0c,
-    0x1ccdc897, 0x21f42de1, 0xf51e5e7a, 0x5b86e70c, 0x8f6c9497,
-    0xb25571e1, 0x66bf027a, 0xee64020c, 0x3a8e7197, 0x07b794e1,
-    0xd35de77a, 0x7dc55e0c, 0xa92f2d97, 0x9416c8e1, 0x40fcbb7a,
-    0x84a1c90d, 0x504bba96, 0x6d725fe0, 0xb9982c7b, 0x1700950d,
-    0xc3eae696, 0xfed303e0, 0x2a39707b, 0xa2e2700d, 0x76080396,
-    0x4b31e6e0, 0x9fdb957b, 0x31432c0d, 0xe5a95f96, 0xd890bae0,
-    0x0c7ac97b},
-   {0x00000000, 0x27652581, 0x0fcc3bd9, 0x28a91e58, 0x5f9e0669,
-    0x78fb23e8, 0x50523db0, 0x77371831, 0xbe3c0dd2, 0x99592853,
-    0xb1f0360b, 0x9695138a, 0xe1a20bbb, 0xc6c72e3a, 0xee6e3062,
-    0xc90b15e3, 0x3d7f6b7f, 0x1a1a4efe, 0x32b350a6, 0x15d67527,
-    0x62e16d16, 0x45844897, 0x6d2d56cf, 0x4a48734e, 0x834366ad,
-    0xa426432c, 0x8c8f5d74, 0xabea78f5, 0xdcdd60c4, 0xfbb84545,
-    0xd3115b1d, 0xf4747e9c, 0x7afed6fe, 0x5d9bf37f, 0x7532ed27,
-    0x5257c8a6, 0x2560d097, 0x0205f516, 0x2aaceb4e, 0x0dc9cecf,
-    0xc4c2db2c, 0xe3a7fead, 0xcb0ee0f5, 0xec6bc574, 0x9b5cdd45,
-    0xbc39f8c4, 0x9490e69c, 0xb3f5c31d, 0x4781bd81, 0x60e49800,
-    0x484d8658, 0x6f28a3d9, 0x181fbbe8, 0x3f7a9e69, 0x17d38031,
-    0x30b6a5b0, 0xf9bdb053, 0xded895d2, 0xf6718b8a, 0xd114ae0b,
-    0xa623b63a, 0x814693bb, 0xa9ef8de3, 0x8e8aa862, 0xb5fadc26,
-    0x929ff9a7, 0xba36e7ff, 0x9d53c27e, 0xea64da4f, 0xcd01ffce,
-    0xe5a8e196, 0xc2cdc417, 0x0bc6d1f4, 0x2ca3f475, 0x040aea2d,
-    0x236fcfac, 0x5458d79d, 0x733df21c, 0x5b94ec44, 0x7cf1c9c5,
-    0x8885b759, 0xafe092d8, 0x87498c80, 0xa02ca901, 0xd71bb130,
-    0xf07e94b1, 0xd8d78ae9, 0xffb2af68, 0x36b9ba8b, 0x11dc9f0a,
-    0x39758152, 0x1e10a4d3, 0x6927bce2, 0x4e429963, 0x66eb873b,
-    0x418ea2ba, 0xcf040ad8, 0xe8612f59, 0xc0c83101, 0xe7ad1480,
-    0x909a0cb1, 0xb7ff2930, 0x9f563768, 0xb83312e9, 0x7138070a,
-    0x565d228b, 0x7ef43cd3, 0x59911952, 0x2ea60163, 0x09c324e2,
-    0x216a3aba, 0x060f1f3b, 0xf27b61a7, 0xd51e4426, 0xfdb75a7e,
-    0xdad27fff, 0xade567ce, 0x8a80424f, 0xa2295c17, 0x854c7996,
-    0x4c476c75, 0x6b2249f4, 0x438b57ac, 0x64ee722d, 0x13d96a1c,
-    0x34bc4f9d, 0x1c1551c5, 0x3b707444, 0x6af5b94d, 0x4d909ccc,
-    0x65398294, 0x425ca715, 0x356bbf24, 0x120e9aa5, 0x3aa784fd,
-    0x1dc2a17c, 0xd4c9b49f, 0xf3ac911e, 0xdb058f46, 0xfc60aac7,
-    0x8b57b2f6, 0xac329777, 0x849b892f, 0xa3feacae, 0x578ad232,
-    0x70eff7b3, 0x5846e9eb, 0x7f23cc6a, 0x0814d45b, 0x2f71f1da,
-    0x07d8ef82, 0x20bdca03, 0xe9b6dfe0, 0xced3fa61, 0xe67ae439,
-    0xc11fc1b8, 0xb628d989, 0x914dfc08, 0xb9e4e250, 0x9e81c7d1,
-    0x100b6fb3, 0x376e4a32, 0x1fc7546a, 0x38a271eb, 0x4f9569da,
-    0x68f04c5b, 0x40595203, 0x673c7782, 0xae376261, 0x895247e0,
-    0xa1fb59b8, 0x869e7c39, 0xf1a96408, 0xd6cc4189, 0xfe655fd1,
-    0xd9007a50, 0x2d7404cc, 0x0a11214d, 0x22b83f15, 0x05dd1a94,
-    0x72ea02a5, 0x558f2724, 0x7d26397c, 0x5a431cfd, 0x9348091e,
-    0xb42d2c9f, 0x9c8432c7, 0xbbe11746, 0xccd60f77, 0xebb32af6,
-    0xc31a34ae, 0xe47f112f, 0xdf0f656b, 0xf86a40ea, 0xd0c35eb2,
-    0xf7a67b33, 0x80916302, 0xa7f44683, 0x8f5d58db, 0xa8387d5a,
-    0x613368b9, 0x46564d38, 0x6eff5360, 0x499a76e1, 0x3ead6ed0,
-    0x19c84b51, 0x31615509, 0x16047088, 0xe2700e14, 0xc5152b95,
-    0xedbc35cd, 0xcad9104c, 0xbdee087d, 0x9a8b2dfc, 0xb22233a4,
-    0x95471625, 0x5c4c03c6, 0x7b292647, 0x5380381f, 0x74e51d9e,
-    0x03d205af, 0x24b7202e, 0x0c1e3e76, 0x2b7b1bf7, 0xa5f1b395,
-    0x82949614, 0xaa3d884c, 0x8d58adcd, 0xfa6fb5fc, 0xdd0a907d,
-    0xf5a38e25, 0xd2c6aba4, 0x1bcdbe47, 0x3ca89bc6, 0x1401859e,
-    0x3364a01f, 0x4453b82e, 0x63369daf, 0x4b9f83f7, 0x6cfaa676,
-    0x988ed8ea, 0xbfebfd6b, 0x9742e333, 0xb027c6b2, 0xc710de83,
-    0xe075fb02, 0xc8dce55a, 0xefb9c0db, 0x26b2d538, 0x01d7f0b9,
-    0x297eeee1, 0x0e1bcb60, 0x792cd351, 0x5e49f6d0, 0x76e0e888,
-    0x5185cd09}};
-
-#endif /* W */
-
-#endif /* N == 6 */
-
-static const uint32_t x2n_table[] = {
-    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
-    0xedb88320, 0xb1e6b092, 0xa06a2517, 0xed627dae, 0x88d14467,
-    0xd7bbfe6a, 0xec447f11, 0x8e7ea170, 0x6427800e, 0x4d47bae0,
-    0x09fe548f, 0x83852d0f, 0x30362f1a, 0x7b5a9cc3, 0x31fec169,
-    0x9fec022a, 0x6c8dedc4, 0x15d6874d, 0x5fde7a4e, 0xbad90e37,
-    0x2e4e5eef, 0x4eaba214, 0xa8a472c0, 0x429a969e, 0x148d302a,
-    0xc40ba6d0, 0xc4e22c3c};
-
-#endif /* CRC32_BRAID_TBL_H_ */

crates/libz-sys/src/zlib-ng/crc32_fold.c

diff --git a/crates/libz-sys/src/zlib-ng/crc32_fold.c b/crates/libz-sys/src/zlib-ng/crc32_fold.c
deleted file mode 100644
index b3072e3..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_fold.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* crc32_fold.c -- crc32 folding interface
- * Copyright (C) 2021 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#include "zbuild.h"
-#include "functable.h"
-
-#include "crc32_fold.h"
-
-Z_INTERNAL uint32_t crc32_fold_reset_c(crc32_fold *crc) {
-    crc->value = CRC32_INITIAL_VALUE;
-    return crc->value;
-}
-
-Z_INTERNAL void crc32_fold_copy_c(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len) {
-    crc->value = functable.crc32(crc->value, src, len);
-    memcpy(dst, src, len);
-}
-
-Z_INTERNAL void crc32_fold_c(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc) {
-    /* Note: while this is basically the same thing as the vanilla CRC function, we still need
-     * a functable entry for it so that we can generically dispatch to this function with the
-     * same arguments for the versions that _do_ do a folding CRC but we don't want a copy. The
-     * init_crc is an unused argument in this context */
-    Z_UNUSED(init_crc);
-    crc->value = functable.crc32(crc->value, src, len);
-}
-
-Z_INTERNAL uint32_t crc32_fold_final_c(crc32_fold *crc) {
-    return crc->value;
-}

crates/libz-sys/src/zlib-ng/crc32_fold.h

diff --git a/crates/libz-sys/src/zlib-ng/crc32_fold.h b/crates/libz-sys/src/zlib-ng/crc32_fold.h
deleted file mode 100644
index ecfad45..0000000
--- a/crates/libz-sys/src/zlib-ng/crc32_fold.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* crc32_fold.h -- crc32 folding interface
- * Copyright (C) 2021 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#ifndef CRC32_FOLD_H_
-#define CRC32_FOLD_H_
-
-#define CRC32_FOLD_BUFFER_SIZE (16 * 5)
-/* sizeof(__m128i) * (4 folds & 1 partial fold) */
-
-typedef struct crc32_fold_s {
-    uint8_t fold[CRC32_FOLD_BUFFER_SIZE];
-    uint32_t value;
-} crc32_fold;
-
-Z_INTERNAL uint32_t crc32_fold_reset_c(crc32_fold *crc);
-Z_INTERNAL void     crc32_fold_copy_c(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len);
-Z_INTERNAL void     crc32_fold_c(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc);
-Z_INTERNAL uint32_t crc32_fold_final_c(crc32_fold *crc);
-
-#endif

crates/libz-sys/src/zlib-ng/deflate.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate.c b/crates/libz-sys/src/zlib-ng/deflate.c
deleted file mode 100644
index c2700f2..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate.c
+++ /dev/null
@@ -1,1402 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in https://tools.ietf.org/html/rfc1951
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-#include "zbuild.h"
-#include "cpu_features.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-const char PREFIX(deflate_copyright)[] = " deflate 1.2.11.f Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Architecture-specific hooks.
- */
-#ifdef S390_DFLTCC_DEFLATE
-#  include "arch/s390/dfltcc_deflate.h"
-#else
-/* Memory management for the deflate state. Useful for allocating arch-specific extension blocks. */
-#  define ZALLOC_DEFLATE_STATE(strm) ((deflate_state *)ZALLOC(strm, 1, sizeof(deflate_state)))
-#  define ZFREE_STATE(strm, addr) ZFREE(strm, addr)
-#  define ZCOPY_DEFLATE_STATE(dst, src) memcpy(dst, src, sizeof(deflate_state))
-/* Memory management for the window. Useful for allocation the aligned window. */
-#  define ZALLOC_WINDOW(strm, items, size) ZALLOC(strm, items, size)
-#  define TRY_FREE_WINDOW(strm, addr) TRY_FREE(strm, addr)
-/* Invoked at the beginning of deflateSetDictionary(). Useful for checking arch-specific window data. */
-#  define DEFLATE_SET_DICTIONARY_HOOK(strm, dict, dict_len) do {} while (0)
-/* Invoked at the beginning of deflateGetDictionary(). Useful for adjusting arch-specific window data. */
-#  define DEFLATE_GET_DICTIONARY_HOOK(strm, dict, dict_len) do {} while (0)
-/* Invoked at the end of deflateResetKeep(). Useful for initializing arch-specific extension blocks. */
-#  define DEFLATE_RESET_KEEP_HOOK(strm) do {} while (0)
-/* Invoked at the beginning of deflateParams(). Useful for updating arch-specific compression parameters. */
-#  define DEFLATE_PARAMS_HOOK(strm, level, strategy, hook_flush) do {} while (0)
-/* Returns whether the last deflate(flush) operation did everything it's supposed to do. */
-#  define DEFLATE_DONE(strm, flush) 1
-/* Adjusts the upper bound on compressed data length based on compression parameters and uncompressed data length.
- * Useful when arch-specific deflation code behaves differently than regular zlib-ng algorithms. */
-#  define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, sourceLen) do {} while (0)
-/* Returns whether an optimistic upper bound on compressed data length should *not* be used.
- * Useful when arch-specific deflation code behaves differently than regular zlib-ng algorithms. */
-#  define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) 0
-/* Invoked for each deflate() call. Useful for plugging arch-specific deflation code. */
-#  define DEFLATE_HOOK(strm, flush, bstate) 0
-/* Returns whether zlib-ng should compute a checksum. Set to 0 if arch-specific deflation code already does that. */
-#  define DEFLATE_NEED_CHECKSUM(strm) 1
-/* Returns whether reproducibility parameter can be set to a given value. */
-#  define DEFLATE_CAN_SET_REPRODUCIBLE(strm, reproducible) 1
-#endif
-
-/* ===========================================================================
- *  Function prototypes.
- */
-static int deflateStateCheck      (PREFIX3(stream) *strm);
-Z_INTERNAL block_state deflate_stored(deflate_state *s, int flush);
-Z_INTERNAL block_state deflate_fast  (deflate_state *s, int flush);
-Z_INTERNAL block_state deflate_quick (deflate_state *s, int flush);
-#ifndef NO_MEDIUM_STRATEGY
-Z_INTERNAL block_state deflate_medium(deflate_state *s, int flush);
-#endif
-Z_INTERNAL block_state deflate_slow  (deflate_state *s, int flush);
-Z_INTERNAL block_state deflate_rle   (deflate_state *s, int flush);
-Z_INTERNAL block_state deflate_huff  (deflate_state *s, int flush);
-static void lm_set_level         (deflate_state *s, int level);
-static void lm_init              (deflate_state *s);
-Z_INTERNAL unsigned read_buf  (PREFIX3(stream) *strm, unsigned char *buf, unsigned size);
-
-extern uint32_t update_hash_roll        (deflate_state *const s, uint32_t h, uint32_t val);
-extern void     insert_string_roll      (deflate_state *const s, uint32_t str, uint32_t count);
-extern Pos      quick_insert_string_roll(deflate_state *const s, uint32_t str);
-
-/* ===========================================================================
- * Local data
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-    uint16_t good_length; /* reduce lazy search above this match length */
-    uint16_t max_lazy;    /* do not perform lazy search above this match length */
-    uint16_t nice_length; /* quit search above this match length */
-    uint16_t max_chain;
-    compress_func func;
-} config;
-
-static const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-
-#ifdef NO_QUICK_STRATEGY
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-#else
-/* 1 */ {0,    0,  0,    0, deflate_quick},
-/* 2 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-#endif
-
-#ifdef NO_MEDIUM_STRATEGY
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-#else
-/* 3 */ {4,    6, 16,    6, deflate_medium},
-/* 4 */ {4,   12, 32,   24, deflate_medium},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_medium},
-/* 6 */ {8,   16, 128, 128, deflate_medium},
-#endif
-
-/* 7 */ {8,   32, 128,  256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-
-/* Note: the deflate() code requires max_lazy >= STD_MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
-
-
-/* ===========================================================================
- * Initialize the hash table. prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) do { \
-    memset((unsigned char *)s->head, 0, HASH_SIZE * sizeof(*s->head)); \
-  } while (0)
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateInit_)(PREFIX3(stream) *strm, int32_t level, const char *version, int32_t stream_size) {
-    return PREFIX(deflateInit2_)(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, version, stream_size);
-    /* Todo: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateInit2_)(PREFIX3(stream) *strm, int32_t level, int32_t method, int32_t windowBits,
-                           int32_t memLevel, int32_t strategy, const char *version, int32_t stream_size) {
-    uint32_t window_padding = 0;
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = PREFIX2(VERSION);
-
-    cpu_check_features();
-
-    if (version == NULL || version[0] != my_version[0] || stream_size != sizeof(PREFIX3(stream))) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == NULL)
-        return Z_STREAM_ERROR;
-
-    strm->msg = NULL;
-    if (strm->zalloc == NULL) {
-        strm->zalloc = zng_calloc;
-        strm->opaque = NULL;
-    }
-    if (strm->zfree == NULL)
-        strm->zfree = zng_cfree;
-
-    if (level == Z_DEFAULT_COMPRESSION)
-        level = 6;
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-#ifdef GZIP
-    } else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-#endif
-    }
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || windowBits < 8 ||
-        windowBits > 15 || level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED ||
-        (windowBits == 8 && wrap != 1)) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8)
-        windowBits = 9;  /* until 256-byte window bug fixed */
-
-    s = ZALLOC_DEFLATE_STATE(strm);
-    if (s == NULL)
-        return Z_MEM_ERROR;
-    strm->state = (struct internal_state *)s;
-    s->strm = strm;
-    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
-
-    s->wrap = wrap;
-    s->gzhead = NULL;
-    s->w_bits = (unsigned int)windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-#ifdef X86_PCLMULQDQ_CRC
-    window_padding = 8;
-#endif
-
-    s->window = (unsigned char *) ZALLOC_WINDOW(strm, s->w_size + window_padding, 2*sizeof(unsigned char));
-    s->prev   = (Pos *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    memset(s->prev, 0, s->w_size * sizeof(Pos));
-    s->head   = (Pos *)  ZALLOC(strm, HASH_SIZE, sizeof(Pos));
-
-    s->high_water = 0;      /* nothing written to s->window yet */
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    /* We overlay pending_buf and sym_buf. This works since the average size
-     * for length/distance pairs over any compressed block is assured to be 31
-     * bits or less.
-     *
-     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
-     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
-     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
-     * possible fixed-codes length/distance pair is then 31 bits total.
-     *
-     * sym_buf starts one-fourth of the way into pending_buf. So there are
-     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
-     * in sym_buf is three bytes -- two for the distance and one for the
-     * literal/length. As each symbol is consumed, the pointer to the next
-     * sym_buf value to read moves forward three bytes. From that symbol, up to
-     * 31 bits are written to pending_buf. The closest the written pending_buf
-     * bits gets to the next sym_buf symbol to read is just before the last
-     * code is written. At that time, 31*(n-2) bits have been written, just
-     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
-     * symbols are written.) The closest the writing gets to what is unread is
-     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
-     * can range from 128 to 32768.
-     *
-     * Therefore, at a minimum, there are 142 bits of space between what is
-     * written and what is read in the overlain buffers, so the symbols cannot
-     * be overwritten by the compressed data. That space is actually 139 bits,
-     * due to the three-bit fixed-code block header.
-     *
-     * That covers the case where either Z_FIXED is specified, forcing fixed
-     * codes, or when the use of fixed codes is chosen, because that choice
-     * results in a smaller compressed block than dynamic codes. That latter
-     * condition then assures that the above analysis also covers all dynamic
-     * blocks. A dynamic-code block will only be chosen to be emitted if it has
-     * fewer bits than a fixed-code block would for the same set of symbols.
-     * Therefore its average symbol length is assured to be less than 31. So
-     * the compressed data for a dynamic block also cannot overwrite the
-     * symbols from which it is being constructed.
-     */
-
-    s->pending_buf = (unsigned char *) ZALLOC(strm, s->lit_bufsize, 4);
-    s->pending_buf_size = s->lit_bufsize * 4;
-
-    if (s->window == NULL || s->prev == NULL || s->head == NULL || s->pending_buf == NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
-        PREFIX(deflateEnd)(strm);
-        return Z_MEM_ERROR;
-    }
-    s->sym_buf = s->pending_buf + s->lit_bufsize;
-    s->sym_end = (s->lit_bufsize - 1) * 3;
-    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-
-    s->level = level;
-    s->strategy = strategy;
-    s->block_open = 0;
-    s->reproducible = 0;
-
-    return PREFIX(deflateReset)(strm);
-}
-
-/* =========================================================================
- * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
- */
-static int deflateStateCheck (PREFIX3(stream) *strm) {
-    deflate_state *s;
-    if (strm == NULL || strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    s = strm->state;
-    if (s == NULL || s->strm != strm || (s->status != INIT_STATE &&
-#ifdef GZIP
-                                           s->status != GZIP_STATE &&
-#endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
-                                           s->status != BUSY_STATE &&
-                                           s->status != FINISH_STATE))
-        return 1;
-    return 0;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateSetDictionary)(PREFIX3(stream) *strm, const uint8_t *dictionary, uint32_t dictLength) {
-    deflate_state *s;
-    unsigned int str, n;
-    int wrap;
-    uint32_t avail;
-    const unsigned char *next;
-
-    if (deflateStateCheck(strm) || dictionary == NULL)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    wrap = s->wrap;
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
-        strm->adler = functable.adler32(strm->adler, dictionary, dictLength);
-    DEFLATE_SET_DICTIONARY_HOOK(strm, dictionary, dictLength);  /* hook for IBM Z DFLTCC */
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
-
-    /* if dictionary would fill window, just replace the history */
-    if (dictLength >= s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
-            CLEAR_HASH(s);
-            s->strstart = 0;
-            s->block_start = 0;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
-    }
-
-    /* insert dictionary into window and hash */
-    avail = strm->avail_in;
-    next = strm->next_in;
-    strm->avail_in = dictLength;
-    strm->next_in = (z_const unsigned char *)dictionary;
-    fill_window(s);
-    while (s->lookahead >= STD_MIN_MATCH) {
-        str = s->strstart;
-        n = s->lookahead - (STD_MIN_MATCH - 1);
-        functable.insert_string(s, str, n);
-        s->strstart = str + n;
-        s->lookahead = STD_MIN_MATCH - 1;
-        fill_window(s);
-    }
-    s->strstart += s->lookahead;
-    s->block_start = (int)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->prev_length = 0;
-    s->match_available = 0;
-    strm->next_in = (z_const unsigned char *)next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateGetDictionary)(PREFIX3(stream) *strm, uint8_t *dictionary, uint32_t *dictLength) {
-    deflate_state *s;
-    unsigned int len;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    DEFLATE_GET_DICTIONARY_HOOK(strm, dictionary, dictLength);  /* hook for IBM Z DFLTCC */
-    s = strm->state;
-    len = s->strstart + s->lookahead;
-    if (len > s->w_size)
-        len = s->w_size;
-    if (dictionary != NULL && len)
-        memcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
-    if (dictLength != NULL)
-        *dictLength = len;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateResetKeep)(PREFIX3(stream) *strm) {
-    deflate_state *s;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0)
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-
-    s->status =
-#ifdef GZIP
-        s->wrap == 2 ? GZIP_STATE :
-#endif
-        INIT_STATE;
-
-#ifdef GZIP
-    if (s->wrap == 2) {
-        strm->adler = functable.crc32_fold_reset(&s->crc_fold);
-    } else
-#endif
-        strm->adler = ADLER32_INITIAL_VALUE;
-    s->last_flush = -2;
-
-    zng_tr_init(s);
-
-    DEFLATE_RESET_KEEP_HOOK(strm);  /* hook for IBM Z DFLTCC */
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateReset)(PREFIX3(stream) *strm) {
-    int ret;
-
-    ret = PREFIX(deflateResetKeep)(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateSetHeader)(PREFIX3(stream) *strm, PREFIX(gz_headerp) head) {
-    if (deflateStateCheck(strm) || strm->state->wrap != 2)
-        return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflatePending)(PREFIX3(stream) *strm, uint32_t *pending, int32_t *bits) {
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    if (pending != NULL)
-        *pending = strm->state->pending;
-    if (bits != NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflatePrime)(PREFIX3(stream) *strm, int32_t bits, int32_t value) {
-    deflate_state *s;
-    uint64_t value64 = (uint64_t)value;
-    int32_t put;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    if (bits < 0 || bits > BIT_BUF_SIZE || bits > (int32_t)(sizeof(value) << 3) ||
-        s->sym_buf < s->pending_out + ((BIT_BUF_SIZE + 7) >> 3))
-        return Z_BUF_ERROR;
-    do {
-        put = BIT_BUF_SIZE - s->bi_valid;
-        put = MIN(put, bits);
-
-        if (s->bi_valid == 0)
-            s->bi_buf = value64;
-        else
-            s->bi_buf |= (value64 & ((UINT64_C(1) << put) - 1)) << s->bi_valid;
-        s->bi_valid += put;
-        zng_tr_flush_bits(s);
-        value64 >>= put;
-        bits -= put;
-    } while (bits);
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateParams)(PREFIX3(stream) *strm, int32_t level, int32_t strategy) {
-    deflate_state *s;
-    compress_func func;
-    int hook_flush = Z_NO_FLUSH;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-
-    if (level == Z_DEFAULT_COMPRESSION)
-        level = 6;
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED)
-        return Z_STREAM_ERROR;
-    DEFLATE_PARAMS_HOOK(strm, level, strategy, &hook_flush);  /* hook for IBM Z DFLTCC */
-    func = configuration_table[s->level].func;
-
-    if (((strategy != s->strategy || func != configuration_table[level].func) && s->last_flush != -2)
-        || hook_flush != Z_NO_FLUSH) {
-        /* Flush the last buffer. Use Z_BLOCK mode, unless the hook requests a "stronger" one. */
-        int flush = RANK(hook_flush) > RANK(Z_BLOCK) ? hook_flush : Z_BLOCK;
-        int err = PREFIX(deflate)(strm, flush);
-        if (err == Z_STREAM_ERROR)
-            return err;
-        if (strm->avail_in || ((int)s->strstart - s->block_start) + s->lookahead || !DEFLATE_DONE(strm, flush))
-            return Z_BUF_ERROR;
-    }
-    if (s->level != level) {
-        if (s->level == 0 && s->matches != 0) {
-            if (s->matches == 1) {
-                functable.slide_hash(s);
-            } else {
-                CLEAR_HASH(s);
-            }
-            s->matches = 0;
-        }
-
-        lm_set_level(s, level);
-    }
-    s->strategy = strategy;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateTune)(PREFIX3(stream) *strm, int32_t good_length, int32_t max_lazy, int32_t nice_length, int32_t max_chain) {
-    deflate_state *s;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = (unsigned int)good_length;
-    s->max_lazy_match = (unsigned int)max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = (unsigned int)max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-unsigned long Z_EXPORT PREFIX(deflateBound)(PREFIX3(stream) *strm, unsigned long sourceLen) {
-    deflate_state *s;
-    unsigned long complen, wraplen;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-    DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, sourceLen);  /* hook for IBM Z DFLTCC */
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (deflateStateCheck(strm))
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = ZLIB_WRAPLEN + (s->strstart ? 4 : 0);
-        break;
-#ifdef GZIP
-    case 2:                                 /* gzip wrapper */
-        wraplen = GZIP_WRAPLEN;
-        if (s->gzhead != NULL) {            /* user-supplied gzip header */
-            unsigned char *str;
-            if (s->gzhead->extra != NULL) {
-                wraplen += 2 + s->gzhead->extra_len;
-            }
-            str = s->gzhead->name;
-            if (str != NULL) {
-                do {
-                    wraplen++;
-                } while (*str++);
-            }
-            str = s->gzhead->comment;
-            if (str != NULL) {
-                do {
-                    wraplen++;
-                } while (*str++);
-            }
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-#endif
-    default:                                /* for compiler happiness */
-        wraplen = ZLIB_WRAPLEN;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (DEFLATE_NEED_CONSERVATIVE_BOUND(strm) ||  /* hook for IBM Z DFLTCC */
-            s->w_bits != 15 || HASH_BITS < 15)
-        return complen + wraplen;
-
-#ifndef NO_QUICK_STRATEGY
-    return sourceLen                       /* The source size itself */
-      + (sourceLen == 0 ? 1 : 0)           /* Always at least one byte for any input */
-      + (sourceLen < 9 ? 1 : 0)            /* One extra byte for lengths less than 9 */
-      + DEFLATE_QUICK_OVERHEAD(sourceLen)  /* Source encoding overhead, padded to next full byte */
-      + DEFLATE_BLOCK_OVERHEAD             /* Deflate block overhead bytes */
-      + wraplen;                           /* none, zlib or gzip wrapper */
-#else
-    return sourceLen + (sourceLen >> 4) + 7 + wraplen;
-#endif
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output, except for
- * some deflate_stored() output, goes through this function so some
- * applications may wish to modify it to avoid allocating a large
- * strm->next_out buffer and copying into it. (See also read_buf()).
- */
-Z_INTERNAL void PREFIX(flush_pending)(PREFIX3(stream) *strm) {
-    uint32_t len;
-    deflate_state *s = strm->state;
-
-    zng_tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out)
-        len = strm->avail_out;
-    if (len == 0)
-        return;
-
-    Tracev((stderr, "[FLUSH]"));
-    memcpy(strm->next_out, s->pending_out, len);
-    strm->next_out  += len;
-    s->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out -= len;
-    s->pending      -= len;
-    if (s->pending == 0)
-        s->pending_out = s->pending_buf;
-}
-
-/* ===========================================================================
- * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
- */
-#define HCRC_UPDATE(beg) \
-    do { \
-        if (s->gzhead->hcrc && s->pending > (beg)) \
-            strm->adler = PREFIX(crc32)(strm->adler, s->pending_buf + (beg), s->pending - (beg)); \
-    } while (0)
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflate)(PREFIX3(stream) *strm, int32_t flush) {
-    int32_t old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-
-    if (strm->next_out == NULL || (strm->avail_in != 0 && strm->next_in == NULL)
-        || (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        PREFIX(flush_pending)(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-        /* Make sure there is something to do and avoid duplicate consecutive
-         * flushes. For repeated and useless calls with Z_FINISH, we keep
-         * returning Z_STREAM_END instead of Z_BUF_ERROR.
-         */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0)   {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Write the header */
-    if (s->status == INIT_STATE && s->wrap == 0)
-        s->status = BUSY_STATE;
-    if (s->status == INIT_STATE) {
-        /* zlib header */
-        unsigned int header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        unsigned int level_flags;
-
-        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-            level_flags = 0;
-        else if (s->level < 6)
-            level_flags = 1;
-        else if (s->level == 6)
-            level_flags = 2;
-        else
-            level_flags = 3;
-        header |= (level_flags << 6);
-        if (s->strstart != 0)
-            header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        put_short_msb(s, (uint16_t)header);
-
-        /* Save the adler32 of the preset dictionary: */
-        if (s->strstart != 0)
-            put_uint32_msb(s, strm->adler);
-        strm->adler = ADLER32_INITIAL_VALUE;
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        PREFIX(flush_pending)(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#ifdef GZIP
-    if (s->status == GZIP_STATE) {
-        /* gzip header */
-        functable.crc32_fold_reset(&s->crc_fold);
-        put_byte(s, 31);
-        put_byte(s, 139);
-        put_byte(s, 8);
-        if (s->gzhead == NULL) {
-            put_uint32(s, 0);
-            put_byte(s, 0);
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? 4 : 0));
-            put_byte(s, OS_CODE);
-            s->status = BUSY_STATE;
-
-            /* Compression must start with an empty pending buffer */
-            PREFIX(flush_pending)(strm);
-            if (s->pending != 0) {
-                s->last_flush = -1;
-                return Z_OK;
-            }
-        } else {
-            put_byte(s, (s->gzhead->text ? 1 : 0) +
-                     (s->gzhead->hcrc ? 2 : 0) +
-                     (s->gzhead->extra == NULL ? 0 : 4) +
-                     (s->gzhead->name == NULL ? 0 : 8) +
-                     (s->gzhead->comment == NULL ? 0 : 16)
-                     );
-            put_uint32(s, s->gzhead->time);
-            put_byte(s, s->level == 9 ? 2 : (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? 4 : 0));
-            put_byte(s, s->gzhead->os & 0xff);
-            if (s->gzhead->extra != NULL)
-                put_short(s, (uint16_t)s->gzhead->extra_len);
-            if (s->gzhead->hcrc)
-                strm->adler = PREFIX(crc32)(strm->adler, s->pending_buf, s->pending);
-            s->gzindex = 0;
-            s->status = EXTRA_STATE;
-        }
-    }
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != NULL) {
-            uint32_t beg = s->pending;   /* start of bytes to update crc */
-            uint32_t left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
-
-            while (s->pending + left > s->pending_buf_size) {
-                uint32_t copy = s->pending_buf_size - s->pending;
-                memcpy(s->pending_buf + s->pending, s->gzhead->extra + s->gzindex, copy);
-                s->pending = s->pending_buf_size;
-                HCRC_UPDATE(beg);
-                s->gzindex += copy;
-                PREFIX(flush_pending)(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-                beg = 0;
-                left -= copy;
-            }
-            memcpy(s->pending_buf + s->pending, s->gzhead->extra + s->gzindex, left);
-            s->pending += left;
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != NULL) {
-            uint32_t beg = s->pending;   /* start of bytes to update crc */
-            unsigned char val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    PREFIX(flush_pending)(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != NULL) {
-            uint32_t beg = s->pending;  /* start of bytes to update crc */
-            unsigned char val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    PREFIX(flush_pending)(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-        }
-        s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size) {
-                PREFIX(flush_pending)(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-            }
-            put_short(s, (uint16_t)strm->adler);
-            functable.crc32_fold_reset(&s->crc_fold);
-        }
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        PREFIX(flush_pending)(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#endif
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 || (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = DEFLATE_HOOK(strm, flush, &bstate) ? bstate :  /* hook for IBM Z DFLTCC */
-                 s->level == 0 ? deflate_stored(s, flush) :
-                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                 (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                zng_tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                zng_tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0;
-                        s->insert = 0;
-                    }
-                }
-            }
-            PREFIX(flush_pending)(strm);
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-                return Z_OK;
-            }
-        }
-    }
-
-    if (flush != Z_FINISH)
-        return Z_OK;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        strm->adler = functable.crc32_fold_final(&s->crc_fold);
-
-        put_uint32(s, strm->adler);
-        put_uint32(s, (uint32_t)strm->total_in);
-    } else
-#endif
-    {
-        if (s->wrap == 1)
-            put_uint32_msb(s, strm->adler);
-    }
-    PREFIX(flush_pending)(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0)
-        s->wrap = -s->wrap; /* write the trailer only once! */
-    if (s->pending == 0) {
-        Assert(s->bi_valid == 0, "bi_buf not flushed");
-        return Z_STREAM_END;
-    }
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT PREFIX(deflateEnd)(PREFIX3(stream) *strm) {
-    int32_t status;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE_WINDOW(strm, strm->state->window);
-
-    ZFREE_STATE(strm, strm->state);
-    strm->state = NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- */
-int32_t Z_EXPORT PREFIX(deflateCopy)(PREFIX3(stream) *dest, PREFIX3(stream) *source) {
-    deflate_state *ds;
-    deflate_state *ss;
-    uint32_t window_padding = 0;
-
-    if (deflateStateCheck(source) || dest == NULL)
-        return Z_STREAM_ERROR;
-
-    ss = source->state;
-
-    memcpy((void *)dest, (void *)source, sizeof(PREFIX3(stream)));
-
-    ds = ZALLOC_DEFLATE_STATE(dest);
-    if (ds == NULL)
-        return Z_MEM_ERROR;
-    dest->state = (struct internal_state *) ds;
-    ZCOPY_DEFLATE_STATE(ds, ss);
-    ds->strm = dest;
-
-#ifdef X86_PCLMULQDQ_CRC
-    window_padding = 8;
-#endif
-
-    ds->window = (unsigned char *) ZALLOC_WINDOW(dest, ds->w_size + window_padding, 2*sizeof(unsigned char));
-    ds->prev   = (Pos *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Pos *)  ZALLOC(dest, HASH_SIZE, sizeof(Pos));
-    ds->pending_buf = (unsigned char *) ZALLOC(dest, ds->lit_bufsize, 4);
-
-    if (ds->window == NULL || ds->prev == NULL || ds->head == NULL || ds->pending_buf == NULL) {
-        PREFIX(deflateEnd)(dest);
-        return Z_MEM_ERROR;
-    }
-
-    memcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(unsigned char));
-    memcpy((void *)ds->prev, (void *)ss->prev, ds->w_size * sizeof(Pos));
-    memcpy((void *)ds->head, (void *)ss->head, HASH_SIZE * sizeof(Pos));
-    memcpy(ds->pending_buf, ss->pending_buf, ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-Z_INTERNAL unsigned read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size) {
-    uint32_t len = strm->avail_in;
-
-    len = MIN(len, size);
-    if (len == 0)
-        return 0;
-
-    strm->avail_in  -= len;
-
-    if (!DEFLATE_NEED_CHECKSUM(strm)) {
-        memcpy(buf, strm->next_in, len);
-#ifdef GZIP
-    } else if (strm->state->wrap == 2) {
-        functable.crc32_fold_copy(&strm->state->crc_fold, buf, strm->next_in, len);
-#endif
-    } else {
-        if (strm->state->wrap == 1)
-            strm->adler = functable.adler32_fold_copy(strm->adler, buf, strm->next_in, len);
-        else
-            memcpy(buf, strm->next_in, len);
-    }
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Set longest match variables based on level configuration
- */
-static void lm_set_level(deflate_state *s, int level) {
-    s->max_lazy_match   = configuration_table[level].max_lazy;
-    s->good_match       = configuration_table[level].good_length;
-    s->nice_match       = configuration_table[level].nice_length;
-    s->max_chain_length = configuration_table[level].max_chain;
-
-    /* Use rolling hash for deflate_slow algorithm with level 9. It allows us to
-     * properly lookup different hash chains to speed up longest_match search. Since hashing
-     * method changes depending on the level we cannot put this into functable. */
-    if (s->max_chain_length > 1024) {
-        s->update_hash = &update_hash_roll;
-        s->insert_string = &insert_string_roll;
-        s->quick_insert_string = &quick_insert_string_roll;
-    } else {
-        s->update_hash = functable.update_hash;
-        s->insert_string = functable.insert_string;
-        s->quick_insert_string = functable.quick_insert_string;
-    }
-
-    s->level = level;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-static void lm_init(deflate_state *s) {
-    s->window_size = 2 * s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    lm_set_level(s, s->level);
-
-    s->strstart = 0;
-    s->block_start = 0;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->prev_length = 0;
-    s->match_available = 0;
-    s->match_start = 0;
-    s->ins_h = 0;
-}
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-
-void Z_INTERNAL fill_window(deflate_state *s) {
-    unsigned n;
-    unsigned int more;    /* Amount of free space at the end of the window. */
-    unsigned int wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = s->window_size - s->lookahead - s->strstart;
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-            memcpy(s->window, s->window+wsize, (unsigned)wsize);
-            if (s->match_start >= wsize) {
-                s->match_start -= wsize;
-            } else {
-                s->match_start = 0;
-                s->prev_length = 0;
-            }
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (int)wsize;
-            if (s->insert > s->strstart)
-                s->insert = s->strstart;
-            functable.slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0)
-            break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= STD_MIN_MATCH) {
-            unsigned int str = s->strstart - s->insert;
-            if (UNLIKELY(s->max_chain_length > 1024)) {
-                s->ins_h = s->update_hash(s, s->window[str], s->window[str+1]);
-            } else if (str >= 1) {
-                s->quick_insert_string(s, str + 2 - STD_MIN_MATCH);
-            }
-            unsigned int count;
-            if (UNLIKELY(s->lookahead == 1)) {
-                count = s->insert - 1;
-            } else {
-                count = s->insert;
-            }
-            if (count > 0) {
-                s->insert_string(s, str, count);
-                s->insert -= count;
-            }
-        }
-        /* If the whole input has less than STD_MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to STD_MAX_MATCH since the longest match
-     * routines allow scanning to strstart + STD_MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        unsigned int curr = s->strstart + s->lookahead;
-        unsigned int init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            memset(s->window + curr, 0, init);
-            s->high_water = curr + init;
-        } else if (s->high_water < curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            memset(s->window + s->high_water, 0, init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((unsigned long)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
-#ifndef ZLIB_COMPAT
-/* =========================================================================
- * Checks whether buffer size is sufficient and whether this parameter is a duplicate.
- */
-static int32_t deflateSetParamPre(zng_deflate_param_value **out, size_t min_size, zng_deflate_param_value *param) {
-    int32_t buf_error = param->size < min_size;
-
-    if (*out != NULL) {
-        (*out)->status = Z_BUF_ERROR;
-        buf_error = 1;
-    }
-    *out = param;
-    return buf_error;
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT zng_deflateSetParams(zng_stream *strm, zng_deflate_param_value *params, size_t count) {
-    size_t i;
-    deflate_state *s;
-    zng_deflate_param_value *new_level = NULL;
-    zng_deflate_param_value *new_strategy = NULL;
-    zng_deflate_param_value *new_reproducible = NULL;
-    int param_buf_error;
-    int version_error = 0;
-    int buf_error = 0;
-    int stream_error = 0;
-    int ret;
-    int val;
-
-    /* Initialize the statuses. */
-    for (i = 0; i < count; i++)
-        params[i].status = Z_OK;
-
-    /* Check whether the stream state is consistent. */
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-
-    /* Check buffer sizes and detect duplicates. */
-    for (i = 0; i < count; i++) {
-        switch (params[i].param) {
-            case Z_DEFLATE_LEVEL:
-                param_buf_error = deflateSetParamPre(&new_level, sizeof(int), &params[i]);
-                break;
-            case Z_DEFLATE_STRATEGY:
-                param_buf_error = deflateSetParamPre(&new_strategy, sizeof(int), &params[i]);
-                break;
-            case Z_DEFLATE_REPRODUCIBLE:
-                param_buf_error = deflateSetParamPre(&new_reproducible, sizeof(int), &params[i]);
-                break;
-            default:
-                params[i].status = Z_VERSION_ERROR;
-                version_error = 1;
-                param_buf_error = 0;
-                break;
-        }
-        if (param_buf_error) {
-            params[i].status = Z_BUF_ERROR;
-            buf_error = 1;
-        }
-    }
-    /* Exit early if small buffers or duplicates are detected. */
-    if (buf_error)
-        return Z_BUF_ERROR;
-
-    /* Apply changes, remember if there were errors. */
-    if (new_level != NULL || new_strategy != NULL) {
-        ret = PREFIX(deflateParams)(strm, new_level == NULL ? s->level : *(int *)new_level->buf,
-                                    new_strategy == NULL ? s->strategy : *(int *)new_strategy->buf);
-        if (ret != Z_OK) {
-            if (new_level != NULL)
-                new_level->status = Z_STREAM_ERROR;
-            if (new_strategy != NULL)
-                new_strategy->status = Z_STREAM_ERROR;
-            stream_error = 1;
-        }
-    }
-    if (new_reproducible != NULL) {
-        val = *(int *)new_reproducible->buf;
-        if (DEFLATE_CAN_SET_REPRODUCIBLE(strm, val)) {
-            s->reproducible = val;
-        } else {
-            new_reproducible->status = Z_STREAM_ERROR;
-            stream_error = 1;
-        }
-    }
-
-    /* Report version errors only if there are no real errors. */
-    return stream_error ? Z_STREAM_ERROR : (version_error ? Z_VERSION_ERROR : Z_OK);
-}
-
-/* ========================================================================= */
-int32_t Z_EXPORT zng_deflateGetParams(zng_stream *strm, zng_deflate_param_value *params, size_t count) {
-    deflate_state *s;
-    size_t i;
-    int32_t buf_error = 0;
-    int32_t version_error = 0;
-
-    /* Initialize the statuses. */
-    for (i = 0; i < count; i++)
-        params[i].status = Z_OK;
-
-    /* Check whether the stream state is consistent. */
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-
-    for (i = 0; i < count; i++) {
-        switch (params[i].param) {
-            case Z_DEFLATE_LEVEL:
-                if (params[i].size < sizeof(int))
-                    params[i].status = Z_BUF_ERROR;
-                else
-                    *(int *)params[i].buf = s->level;
-                break;
-            case Z_DEFLATE_STRATEGY:
-                if (params[i].size < sizeof(int))
-                    params[i].status = Z_BUF_ERROR;
-                else
-                    *(int *)params[i].buf = s->strategy;
-                break;
-            case Z_DEFLATE_REPRODUCIBLE:
-                if (params[i].size < sizeof(int))
-                    params[i].status = Z_BUF_ERROR;
-                else
-                    *(int *)params[i].buf = s->reproducible;
-                break;
-            default:
-                params[i].status = Z_VERSION_ERROR;
-                version_error = 1;
-                break;
-        }
-        if (params[i].status == Z_BUF_ERROR)
-            buf_error = 1;
-    }
-    return buf_error ? Z_BUF_ERROR : (version_error ? Z_VERSION_ERROR : Z_OK);
-}
-#endif

crates/libz-sys/src/zlib-ng/deflate.h

diff --git a/crates/libz-sys/src/zlib-ng/deflate.h b/crates/libz-sys/src/zlib-ng/deflate.h
deleted file mode 100644
index 1b59c75..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate.h
+++ /dev/null
@@ -1,406 +0,0 @@
-#ifndef DEFLATE_H_
-#define DEFLATE_H_
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#include "zutil.h"
-#include "zendian.h"
-#include "adler32_fold.h"
-#include "crc32_fold.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define BIT_BUF_SIZE 64
-/* size of bit buffer in bi_buf */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
-#ifdef GZIP
-#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#endif
-#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
-#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
-#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
-#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
-#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
-#define FINISH_STATE 666    /* stream complete */
-/* Stream status */
-
-#define HASH_BITS    16u           /* log2(HASH_SIZE) */
-#ifndef HASH_SIZE
-#  define HASH_SIZE 65536u         /* number of elements in hash table */
-#endif
-#define HASH_MASK (HASH_SIZE - 1u) /* HASH_SIZE-1 */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        uint16_t  freq;       /* frequency count */
-        uint16_t  code;       /* bit string */
-    } fc;
-    union {
-        uint16_t  dad;        /* father node in Huffman tree */
-        uint16_t  len;        /* length of bit string */
-    } dl;
-} ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data                *dyn_tree;  /* the dynamic tree */
-    int                    max_code;   /* largest code with non zero frequency */
-    const static_tree_desc *stat_desc; /* the corresponding static tree */
-} tree_desc;
-
-typedef uint16_t Pos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables.
- */
-/* Type definitions for hash callbacks */
-typedef struct internal_state deflate_state;
-
-typedef uint32_t (* update_hash_cb)        (deflate_state *const s, uint32_t h, uint32_t val);
-typedef void     (* insert_string_cb)      (deflate_state *const s, uint32_t str, uint32_t count);
-typedef Pos      (* quick_insert_string_cb)(deflate_state *const s, uint32_t str);
-
-struct internal_state {
-    PREFIX3(stream)      *strm;            /* pointer back to this zlib stream */
-    unsigned char        *pending_buf;     /* output still pending */
-    unsigned char        *pending_out;     /* next pending byte to output to the stream */
-    uint32_t             pending_buf_size; /* size of pending_buf */
-    uint32_t             pending;          /* nb of bytes in the pending buffer */
-    int                  wrap;             /* bit 0 true for zlib, bit 1 true for gzip */
-    uint32_t             gzindex;          /* where in extra, name, or comment */
-    PREFIX(gz_headerp)   gzhead;           /* gzip header information to write */
-    int                  status;           /* as the name implies */
-    int                  last_flush;       /* value of flush param for previous deflate call */
-    int                  reproducible;     /* Whether reproducible compression results are required. */
-
-    int block_open;
-    /* Whether or not a block is currently open for the QUICK deflation scheme.
-     * This is set to 1 if there is an active block, or 0 if the block was just closed.
-     */
-
-                /* used by deflate.c: */
-
-    unsigned int  w_size;            /* LZ77 window size (32K by default) */
-    unsigned int  w_bits;            /* log2(w_size)  (8..16) */
-    unsigned int  w_mask;            /* w_size - 1 */
-    unsigned int  lookahead;         /* number of valid bytes ahead in window */
-
-    unsigned int high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
-    unsigned int window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    unsigned char *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-STD_MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    Pos *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Pos *head; /* Heads of the hash chains or 0. */
-
-    uint32_t ins_h; /* hash index of string to be inserted */
-
-    int block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    unsigned int match_length;       /* length of best match */
-    Pos          prev_match;         /* previous match */
-    int          match_available;    /* set if previous match exists */
-    unsigned int strstart;           /* start of string to insert */
-    unsigned int match_start;        /* start of matching string */
-
-    unsigned int prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    unsigned int max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this length.
-     * A higher limit improves compression ratio but degrades the speed.
-     */
-
-    unsigned int max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly smaller
-     * than this value. This mechanism is used only for compression levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    update_hash_cb          update_hash;
-    insert_string_cb        insert_string;
-    quick_insert_string_cb  quick_insert_string;
-    /* Hash function callbacks that can be configured depending on the deflate
-     * algorithm being used */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    unsigned int good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-    struct crc32_fold_s ALIGNED_(16) crc_fold;
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    uint16_t bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    unsigned char depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    unsigned int  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    unsigned char *sym_buf;       /* buffer for distances and literals/lengths */
-    unsigned int sym_next;        /* running index in sym_buf */
-    unsigned int sym_end;         /* symbol table full when sym_next reaches this */
-
-    unsigned long opt_len;        /* bit length of current block with optimal trees */
-    unsigned long static_len;     /* bit length of current block with static trees */
-    unsigned int matches;         /* number of string matches in current block */
-    unsigned int insert;          /* bytes at end of window left to insert */
-
-    /* compressed_len and bits_sent are only used if ZLIB_DEBUG is defined */
-    unsigned long compressed_len; /* total bit length of compressed file mod 2^32 */
-    unsigned long bits_sent;      /* bit length of compressed data sent mod 2^32 */
-
-    /* Reserved for future use and alignment purposes */
-    char *reserved_p;
-
-    uint64_t bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least significant bits). */
-
-    int32_t bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit are always zero. */
-
-    /* Reserved for future use and alignment purposes */
-    int32_t reserved[11];
-} ALIGNED_(8);
-
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) { \
-    s->pending_buf[s->pending++] = (unsigned char)(c); \
-}
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-static inline void put_short(deflate_state *s, uint16_t w) {
-#if BYTE_ORDER == BIG_ENDIAN
-    w = ZSWAP16(w);
-#endif
-    zmemcpy_2(&s->pending_buf[s->pending], &w);
-    s->pending += 2;
-}
-
-/* ===========================================================================
- * Output a short MSB first on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-static inline void put_short_msb(deflate_state *s, uint16_t w) {
-#if BYTE_ORDER == LITTLE_ENDIAN
-    w = ZSWAP16(w);
-#endif
-    zmemcpy_2(&s->pending_buf[s->pending], &w);
-    s->pending += 2;
-}
-
-/* ===========================================================================
- * Output a 32-bit unsigned int LSB first on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-static inline void put_uint32(deflate_state *s, uint32_t dw) {
-#if BYTE_ORDER == BIG_ENDIAN
-    dw = ZSWAP32(dw);
-#endif
-    zmemcpy_4(&s->pending_buf[s->pending], &dw);
-    s->pending += 4;
-}
-
-/* ===========================================================================
- * Output a 32-bit unsigned int MSB first on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-static inline void put_uint32_msb(deflate_state *s, uint32_t dw) {
-#if BYTE_ORDER == LITTLE_ENDIAN
-    dw = ZSWAP32(dw);
-#endif
-    zmemcpy_4(&s->pending_buf[s->pending], &dw);
-    s->pending += 4;
-}
-
-/* ===========================================================================
- * Output a 64-bit unsigned int LSB first on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-static inline void put_uint64(deflate_state *s, uint64_t lld) {
-#if BYTE_ORDER == BIG_ENDIAN
-    lld = ZSWAP64(lld);
-#endif
-    zmemcpy_8(&s->pending_buf[s->pending], &lld);
-    s->pending += 8;
-}
-
-#define MIN_LOOKAHEAD (STD_MAX_MATCH + STD_MIN_MATCH + 1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the STD_MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size - MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-#define WIN_INIT STD_MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
-
-void Z_INTERNAL fill_window(deflate_state *s);
-void Z_INTERNAL slide_hash_c(deflate_state *s);
-
-        /* in trees.c */
-void Z_INTERNAL zng_tr_init(deflate_state *s);
-void Z_INTERNAL zng_tr_flush_block(deflate_state *s, char *buf, uint32_t stored_len, int last);
-void Z_INTERNAL zng_tr_flush_bits(deflate_state *s);
-void Z_INTERNAL zng_tr_align(deflate_state *s);
-void Z_INTERNAL zng_tr_stored_block(deflate_state *s, char *buf, uint32_t stored_len, int last);
-uint16_t Z_INTERNAL PREFIX(bi_reverse)(unsigned code, int len);
-void Z_INTERNAL PREFIX(flush_pending)(PREFIX3(streamp) strm);
-#define d_code(dist) ((dist) < 256 ? zng_dist_code[dist] : zng_dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. zng_dist_code[256] and zng_dist_code[257] are never
- * used.
- */
-
-/* Bit buffer and compress bits calculation debugging */
-#ifdef ZLIB_DEBUG
-#  define cmpr_bits_add(s, len)     s->compressed_len += (len)
-#  define cmpr_bits_align(s)        s->compressed_len = (s->compressed_len + 7) & ~7L
-#  define sent_bits_add(s, bits)    s->bits_sent += (bits)
-#  define sent_bits_align(s)        s->bits_sent = (s->bits_sent + 7) & ~7L
-#else
-#  define cmpr_bits_add(s, len)     Z_UNUSED(len)
-#  define cmpr_bits_align(s)
-#  define sent_bits_add(s, bits)    Z_UNUSED(bits)
-#  define sent_bits_align(s)
-#endif
-
-#endif /* DEFLATE_H_ */

crates/libz-sys/src/zlib-ng/deflate_fast.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_fast.c b/crates/libz-sys/src/zlib-ng/deflate_fast.c
deleted file mode 100644
index c6e24e4..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_fast.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* deflate_fast.c -- compress data using the fast strategy of deflation algorithm
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-Z_INTERNAL block_state deflate_fast(deflate_state *s, int flush) {
-    Pos hash_head;        /* head of the hash chain */
-    int bflush = 0;       /* set if current block must be flushed */
-    int64_t dist;
-    uint32_t match_len = 0;
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need STD_MAX_MATCH bytes
-         * for the next match, plus WANT_MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (UNLIKELY(s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH)) {
-                return need_more;
-            }
-            if (UNLIKELY(s->lookahead == 0))
-                break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= WANT_MIN_MATCH) {
-            hash_head = functable.quick_insert_string(s, s->strstart);
-            dist = (int64_t)s->strstart - hash_head;
-
-            /* Find the longest match, discarding those <= prev_length.
-             * At this point we have always match length < WANT_MIN_MATCH
-             */
-            if (dist <= MAX_DIST(s) && dist > 0 && hash_head != 0) {
-                /* To simplify the code, we prevent matches with the string
-                 * of window index 0 (in particular we have to avoid a match
-                 * of the string with itself at the start of the input file).
-                 */
-                match_len = functable.longest_match(s, hash_head);
-                /* longest_match() sets match_start */
-            }
-        }
-
-        if (match_len >= WANT_MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, match_len);
-
-            bflush = zng_tr_tally_dist(s, s->strstart - s->match_start, match_len - STD_MIN_MATCH);
-
-            s->lookahead -= match_len;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-            if (match_len <= s->max_insert_length && s->lookahead >= WANT_MIN_MATCH) {
-                match_len--; /* string at strstart already in table */
-                s->strstart++;
-
-                functable.insert_string(s, s->strstart, match_len);
-                s->strstart += match_len;
-            } else {
-                s->strstart += match_len;
-                functable.quick_insert_string(s, s->strstart + 2 - STD_MIN_MATCH);
-
-                /* If lookahead < STD_MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-            match_len = 0;
-        } else {
-            /* No match, output a literal byte */
-            bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (UNLIKELY(bflush))
-            FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < (STD_MIN_MATCH - 1) ? s->strstart : (STD_MIN_MATCH - 1);
-    if (UNLIKELY(flush == Z_FINISH)) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (UNLIKELY(s->sym_next))
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib-ng/deflate_huff.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_huff.c b/crates/libz-sys/src/zlib-ng/deflate_huff.c
deleted file mode 100644
index 296201f..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_huff.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* deflate_huff.c -- compress data using huffman encoding only strategy
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-Z_INTERNAL block_state deflate_huff(deflate_state *s, int flush) {
-    int bflush = 0;         /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush)
-            FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->sym_next)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib-ng/deflate_medium.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_medium.c b/crates/libz-sys/src/zlib-ng/deflate_medium.c
deleted file mode 100644
index 1bb21c2..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_medium.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* deflate_medium.c -- The deflate_medium deflate strategy
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Authors:
- *  Arjan van de Ven    <arjan@linux.intel.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#ifndef NO_MEDIUM_STRATEGY
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-struct match {
-    uint16_t match_start;
-    uint16_t match_length;
-    uint16_t strstart;
-    uint16_t orgstart;
-};
-
-static int emit_match(deflate_state *s, struct match match) {
-    int bflush = 0;
-
-    /* matches that are not long enough we need to emit as literals */
-    if (match.match_length < WANT_MIN_MATCH) {
-        while (match.match_length) {
-            bflush += zng_tr_tally_lit(s, s->window[match.strstart]);
-            s->lookahead--;
-            match.strstart++;
-            match.match_length--;
-        }
-        return bflush;
-    }
-
-    check_match(s, match.strstart, match.match_start, match.match_length);
-
-    bflush += zng_tr_tally_dist(s, match.strstart - match.match_start, match.match_length - STD_MIN_MATCH);
-
-    s->lookahead -= match.match_length;
-    return bflush;
-}
-
-static void insert_match(deflate_state *s, struct match match) {
-    if (UNLIKELY(s->lookahead <= (unsigned int)(match.match_length + WANT_MIN_MATCH)))
-        return;
-
-    /* matches that are not long enough we need to emit as literals */
-    if (LIKELY(match.match_length < WANT_MIN_MATCH)) {
-        match.strstart++;
-        match.match_length--;
-        if (UNLIKELY(match.match_length > 0)) {
-            if (match.strstart >= match.orgstart) {
-                if (match.strstart + match.match_length - 1 >= match.orgstart) {
-                    functable.insert_string(s, match.strstart, match.match_length);
-                } else {
-                    functable.insert_string(s, match.strstart, match.orgstart - match.strstart + 1);
-                }
-                match.strstart += match.match_length;
-                match.match_length = 0;
-            }
-        }
-        return;
-    }
-
-    /* Insert new strings in the hash table only if the match length
-     * is not too large. This saves time but degrades compression.
-     */
-    if (match.match_length <= 16 * s->max_insert_length && s->lookahead >= WANT_MIN_MATCH) {
-        match.match_length--; /* string at strstart already in table */
-        match.strstart++;
-
-        if (LIKELY(match.strstart >= match.orgstart)) {
-            if (LIKELY(match.strstart + match.match_length - 1 >= match.orgstart)) {
-                functable.insert_string(s, match.strstart, match.match_length);
-            } else {
-                functable.insert_string(s, match.strstart, match.orgstart - match.strstart + 1);
-            }
-        } else if (match.orgstart < match.strstart + match.match_length) {
-            functable.insert_string(s, match.orgstart, match.strstart + match.match_length - match.orgstart);
-        }
-        match.strstart += match.match_length;
-        match.match_length = 0;
-    } else {
-        match.strstart += match.match_length;
-        match.match_length = 0;
-
-        if (match.strstart >= (STD_MIN_MATCH - 2))
-            functable.quick_insert_string(s, match.strstart + 2 - STD_MIN_MATCH);
-
-        /* If lookahead < WANT_MIN_MATCH, ins_h is garbage, but it does not
-         * matter since it will be recomputed at next deflate call.
-         */
-    }
-}
-
-static void fizzle_matches(deflate_state *s, struct match *current, struct match *next) {
-    Pos limit;
-    unsigned char *match, *orig;
-    int changed = 0;
-    struct match c, n;
-    /* step zero: sanity checks */
-
-    if (current->match_length <= 1)
-        return;
-
-    if (UNLIKELY(current->match_length > 1 + next->match_start))
-        return;
-
-    if (UNLIKELY(current->match_length > 1 + next->strstart))
-        return;
-
-    match = s->window - current->match_length + 1 + next->match_start;
-    orig  = s->window - current->match_length + 1 + next->strstart;
-
-    /* quick exit check.. if this fails then don't bother with anything else */
-    if (LIKELY(*match != *orig))
-        return;
-
-    c = *current;
-    n = *next;
-
-    /* step one: try to move the "next" match to the left as much as possible */
-    limit = next->strstart > MAX_DIST(s) ? next->strstart - (Pos)MAX_DIST(s) : 0;
-
-    match = s->window + n.match_start - 1;
-    orig = s->window + n.strstart - 1;
-
-    while (*match == *orig) {
-        if (UNLIKELY(c.match_length < 1))
-            break;
-        if (UNLIKELY(n.strstart <= limit))
-            break;
-        if (UNLIKELY(n.match_length >= 256))
-            break;
-        if (UNLIKELY(n.match_start <= 1))
-            break;
-
-        n.strstart--;
-        n.match_start--;
-        n.match_length++;
-        c.match_length--;
-        match--;
-        orig--;
-        changed++;
-    }
-
-    if (!changed)
-        return;
-
-    if (c.match_length <= 1 && n.match_length != 2) {
-        n.orgstart++;
-        *current = c;
-        *next = n;
-    } else {
-        return;
-    }
-}
-
-Z_INTERNAL block_state deflate_medium(deflate_state *s, int flush) {
-    /* Align the first struct to start on a new cacheline, this allows us to fit both structs in one cacheline */
-    ALIGNED_(16) struct match current_match;
-                 struct match next_match;
-
-    /* For levels below 5, don't check the next position for a better match */
-    int early_exit = s->level < 5;
-
-    memset(&current_match, 0, sizeof(struct match));
-    memset(&next_match, 0, sizeof(struct match));
-
-    for (;;) {
-        Pos hash_head = 0;    /* head of the hash chain */
-        int bflush = 0;       /* set if current block must be flushed */
-        int64_t dist;
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need STD_MAX_MATCH bytes
-         * for the next match, plus WANT_MIN_MATCH bytes to insert the
-         * string following the next current_match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (UNLIKELY(s->lookahead == 0))
-                break; /* flush the current block */
-            next_match.match_length = 0;
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-
-        /* If we already have a future match from a previous round, just use that */
-        if (!early_exit && next_match.match_length > 0) {
-            current_match = next_match;
-            next_match.match_length = 0;
-        } else {
-            hash_head = 0;
-            if (s->lookahead >= WANT_MIN_MATCH) {
-                hash_head = functable.quick_insert_string(s, s->strstart);
-            }
-
-            current_match.strstart = (uint16_t)s->strstart;
-            current_match.orgstart = current_match.strstart;
-
-            /* Find the longest match, discarding those <= prev_length.
-             * At this point we have always match_length < WANT_MIN_MATCH
-             */
-
-            dist = (int64_t)s->strstart - hash_head;
-            if (dist <= MAX_DIST(s) && dist > 0 && hash_head != 0) {
-                /* To simplify the code, we prevent matches with the string
-                 * of window index 0 (in particular we have to avoid a match
-                 * of the string with itself at the start of the input file).
-                 */
-                current_match.match_length = (uint16_t)functable.longest_match(s, hash_head);
-                current_match.match_start = (uint16_t)s->match_start;
-                if (UNLIKELY(current_match.match_length < WANT_MIN_MATCH))
-                    current_match.match_length = 1;
-                if (UNLIKELY(current_match.match_start >= current_match.strstart)) {
-                    /* this can happen due to some restarts */
-                    current_match.match_length = 1;
-                }
-            } else {
-                /* Set up the match to be a 1 byte literal */
-                current_match.match_start = 0;
-                current_match.match_length = 1;
-            }
-        }
-
-        insert_match(s, current_match);
-
-        /* now, look ahead one */
-        if (LIKELY(!early_exit && s->lookahead > MIN_LOOKAHEAD && (uint32_t)(current_match.strstart + current_match.match_length) < (s->window_size - MIN_LOOKAHEAD))) {
-            s->strstart = current_match.strstart + current_match.match_length;
-            hash_head = functable.quick_insert_string(s, s->strstart);
-
-            next_match.strstart = (uint16_t)s->strstart;
-            next_match.orgstart = next_match.strstart;
-
-            /* Find the longest match, discarding those <= prev_length.
-             * At this point we have always match_length < WANT_MIN_MATCH
-             */
-
-            dist = (int64_t)s->strstart - hash_head;
-            if (dist <= MAX_DIST(s) && dist > 0 && hash_head != 0) {
-                /* To simplify the code, we prevent matches with the string
-                 * of window index 0 (in particular we have to avoid a match
-                 * of the string with itself at the start of the input file).
-                 */
-                next_match.match_length = (uint16_t)functable.longest_match(s, hash_head);
-                next_match.match_start = (uint16_t)s->match_start;
-                if (UNLIKELY(next_match.match_start >= next_match.strstart)) {
-                    /* this can happen due to some restarts */
-                    next_match.match_length = 1;
-                }
-                if (next_match.match_length < WANT_MIN_MATCH)
-                    next_match.match_length = 1;
-                else
-                    fizzle_matches(s, &current_match, &next_match);
-            } else {
-                /* Set up the match to be a 1 byte literal */
-                next_match.match_start = 0;
-                next_match.match_length = 1;
-            }
-
-            s->strstart = current_match.strstart;
-        } else {
-            next_match.match_length = 0;
-        }
-
-        /* now emit the current match */
-        bflush = emit_match(s, current_match);
-
-        /* move the "cursor" forward */
-        s->strstart += current_match.match_length;
-
-        if (UNLIKELY(bflush))
-            FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < (STD_MIN_MATCH - 1) ? s->strstart : (STD_MIN_MATCH - 1);
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (UNLIKELY(s->sym_next))
-        FLUSH_BLOCK(s, 0);
-
-    return block_done;
-}
-#endif

crates/libz-sys/src/zlib-ng/deflate_p.h

diff --git a/crates/libz-sys/src/zlib-ng/deflate_p.h b/crates/libz-sys/src/zlib-ng/deflate_p.h
deleted file mode 100644
index af24681..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_p.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* deflate_p.h -- Private inline functions and macros shared with more than
- *                one deflate method
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#ifndef DEFLATE_P_H
-#define DEFLATE_P_H
-
-/* Forward declare common non-inlined functions declared in deflate.c */
-
-#ifdef ZLIB_DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-static inline void check_match(deflate_state *s, Pos start, Pos match, int length) {
-    /* check that the match length is valid*/
-    if (length < STD_MIN_MATCH || length > STD_MAX_MATCH) {
-        fprintf(stderr, " start %u, match %u, length %d\n", start, match, length);
-        z_error("invalid match length");
-    }
-    /* check that the match isn't at the same position as the start string */
-    if (match == start) {
-        fprintf(stderr, " start %u, match %u, length %d\n", start, match, length);
-        z_error("invalid match position");
-    }
-    /* check that the match is indeed a match */
-    if (memcmp(s->window + match, s->window + start, length) != 0) {
-        int32_t i = 0;
-        fprintf(stderr, " start %u, match %u, length %d\n", start, match, length);
-        do {
-            fprintf(stderr, "  %03d: match [%02x] start [%02x]\n", i++,
-                s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr, "\\[%u,%d]", start-match, length);
-        do {
-            putc(s->window[start++], stderr);
-        } while (--length != 0);
-    }
-}
-#else
-#define check_match(s, start, match, length)
-#endif
-
-Z_INTERNAL void PREFIX(flush_pending)(PREFIX3(stream) *strm);
-Z_INTERNAL unsigned read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size);
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-
-extern const unsigned char Z_INTERNAL zng_length_code[];
-extern const unsigned char Z_INTERNAL zng_dist_code[];
-
-static inline int zng_tr_tally_lit(deflate_state *s, unsigned char c) {
-    /* c is the unmatched char */
-    s->sym_buf[s->sym_next++] = 0;
-    s->sym_buf[s->sym_next++] = 0;
-    s->sym_buf[s->sym_next++] = c;
-    s->dyn_ltree[c].Freq++;
-    Tracevv((stderr, "%c", c));
-    Assert(c <= (STD_MAX_MATCH-STD_MIN_MATCH), "zng_tr_tally: bad literal");
-    return (s->sym_next == s->sym_end);
-}
-
-static inline int zng_tr_tally_dist(deflate_state *s, uint32_t dist, uint32_t len) {
-    /* dist: distance of matched string */
-    /* len: match length-STD_MIN_MATCH */
-    s->sym_buf[s->sym_next++] = (uint8_t)(dist);
-    s->sym_buf[s->sym_next++] = (uint8_t)(dist >> 8);
-    s->sym_buf[s->sym_next++] = (uint8_t)len;
-    s->matches++;
-    dist--;
-    Assert(dist < MAX_DIST(s) && (uint16_t)d_code(dist) < (uint16_t)D_CODES,
-        "zng_tr_tally: bad match");
-
-    s->dyn_ltree[zng_length_code[len]+LITERALS+1].Freq++;
-    s->dyn_dtree[d_code(dist)].Freq++;
-    return (s->sym_next == s->sym_end);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
-    zng_tr_flush_block(s, (s->block_start >= 0 ? \
-                   (char *)&s->window[(unsigned)s->block_start] : \
-                   NULL), \
-                   (uint32_t)((int)s->strstart - s->block_start), \
-                   (last)); \
-    s->block_start = (int)s->strstart; \
-    PREFIX(flush_pending)(s->strm); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-    FLUSH_BLOCK_ONLY(s, last); \
-    if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* Maximum stored block length in deflate format (not including header). */
-#define MAX_STORED 65535
-
-/* Compression function. Returns the block state after the call. */
-typedef block_state (*compress_func) (deflate_state *s, int flush);
-/* Match function. Returns the longest match. */
-typedef uint32_t    (*match_func)    (deflate_state *const s, Pos cur_match);
-
-#endif

crates/libz-sys/src/zlib-ng/deflate_quick.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_quick.c b/crates/libz-sys/src/zlib-ng/deflate_quick.c
deleted file mode 100644
index f7dfbe8..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_quick.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * The deflate_quick deflate strategy, designed to be used when cycles are
- * at a premium.
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Authors:
- *  Wajdi Feghali   <wajdi.k.feghali@intel.com>
- *  Jim Guilford    <james.guilford@intel.com>
- *  Vinodh Gopal    <vinodh.gopal@intel.com>
- *     Erdinc Ozturk   <erdinc.ozturk@intel.com>
- *  Jim Kukunas     <james.t.kukunas@linux.intel.com>
- *
- * Portions are Copyright (C) 2016 12Sided Technology, LLC.
- * Author:
- *  Phil Vachon     <pvachon@12sidedtech.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-#include "trees_emit.h"
-
-extern const ct_data static_ltree[L_CODES+2];
-extern const ct_data static_dtree[D_CODES];
-
-#define QUICK_START_BLOCK(s, last) { \
-    zng_tr_emit_tree(s, STATIC_TREES, last); \
-    s->block_open = 1 + (int)last; \
-    s->block_start = (int)s->strstart; \
-}
-
-#define QUICK_END_BLOCK(s, last) { \
-    if (s->block_open) { \
-        zng_tr_emit_end_block(s, static_ltree, last); \
-        s->block_open = 0; \
-        s->block_start = (int)s->strstart; \
-        PREFIX(flush_pending)(s->strm); \
-        if (s->strm->avail_out == 0) \
-            return (last) ? finish_started : need_more; \
-    } \
-}
-
-Z_INTERNAL block_state deflate_quick(deflate_state *s, int flush) {
-    Pos hash_head;
-    int64_t dist;
-    unsigned match_len, last;
-
-
-    last = (flush == Z_FINISH) ? 1 : 0;
-    if (UNLIKELY(last && s->block_open != 2)) {
-        /* Emit end of previous block */
-        QUICK_END_BLOCK(s, 0);
-        /* Emit start of last block */
-        QUICK_START_BLOCK(s, last);
-    } else if (UNLIKELY(s->block_open == 0 && s->lookahead > 0)) {
-        /* Start new block only when we have lookahead data, so that if no
-           input data is given an empty block will not be written */
-        QUICK_START_BLOCK(s, last);
-    }
-
-    for (;;) {
-        if (UNLIKELY(s->pending + ((BIT_BUF_SIZE + 7) >> 3) >= s->pending_buf_size)) {
-            PREFIX(flush_pending)(s->strm);
-            if (s->strm->avail_out == 0) {
-                return (last && s->strm->avail_in == 0 && s->bi_valid == 0 && s->block_open == 0) ? finish_started : need_more;
-            }
-        }
-
-        if (UNLIKELY(s->lookahead < MIN_LOOKAHEAD)) {
-            fill_window(s);
-            if (UNLIKELY(s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH)) {
-                return need_more;
-            }
-            if (UNLIKELY(s->lookahead == 0))
-                break;
-
-            if (UNLIKELY(s->block_open == 0)) {
-                /* Start new block when we have lookahead data, so that if no
-                   input data is given an empty block will not be written */
-                QUICK_START_BLOCK(s, last);
-            }
-        }
-
-        if (LIKELY(s->lookahead >= WANT_MIN_MATCH)) {
-            hash_head = functable.quick_insert_string(s, s->strstart);
-            dist = (int64_t)s->strstart - hash_head;
-
-            if (dist <= MAX_DIST(s) && dist > 0) {
-                const uint8_t *str_start = s->window + s->strstart;
-                const uint8_t *match_start = s->window + hash_head;
-
-                if (zmemcmp_2(str_start, match_start) == 0) {
-                    match_len = functable.compare256(str_start+2, match_start+2) + 2;
-
-                    if (match_len >= WANT_MIN_MATCH) {
-                        if (UNLIKELY(match_len > s->lookahead))
-                            match_len = s->lookahead;
-
-                        check_match(s, s->strstart, hash_head, match_len);
-
-                        zng_tr_emit_dist(s, static_ltree, static_dtree, match_len - STD_MIN_MATCH, (uint32_t)dist);
-                        s->lookahead -= match_len;
-                        s->strstart += match_len;
-                        continue;
-                    }
-                }
-            }
-        }
-
-        zng_tr_emit_lit(s, static_ltree, s->window[s->strstart]);
-        s->strstart++;
-        s->lookahead--;
-    }
-
-    s->insert = s->strstart < (STD_MIN_MATCH - 1) ? s->strstart : (STD_MIN_MATCH - 1);
-    if (UNLIKELY(last)) {
-        QUICK_END_BLOCK(s, 1);
-        return finish_done;
-    }
-
-    QUICK_END_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib-ng/deflate_rle.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_rle.c b/crates/libz-sys/src/zlib-ng/deflate_rle.c
deleted file mode 100644
index 9e669ec..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_rle.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* deflate_rle.c -- compress data using RLE strategy of deflation algorithm
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-Z_INTERNAL block_state deflate_rle(deflate_state *s, int flush) {
-    int bflush = 0;                 /* set if current block must be flushed */
-    unsigned int prev;              /* byte at distance one to match */
-    unsigned char *scan, *strend;   /* scan goes up to strend for length of run */
-    uint32_t match_len = 0;
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need STD_MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
-         */
-        if (s->lookahead <= STD_MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead <= STD_MAX_MATCH && flush == Z_NO_FLUSH)
-                return need_more;
-            if (s->lookahead == 0)
-                break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        if (s->lookahead >= STD_MIN_MATCH && s->strstart > 0) {
-            scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + STD_MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                match_len = STD_MAX_MATCH - (unsigned int)(strend - scan);
-                match_len = MIN(match_len, s->lookahead);
-            }
-            Assert(scan <= s->window + s->window_size - 1, "wild scan");
-        }
-
-        /* Emit match if have run of STD_MIN_MATCH or longer, else emit literal */
-        if (match_len >= STD_MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, match_len);
-
-            bflush = zng_tr_tally_dist(s, 1, match_len - STD_MIN_MATCH);
-
-            s->lookahead -= match_len;
-            s->strstart += match_len;
-            match_len = 0;
-        } else {
-            /* No match, output a literal byte */
-            bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush)
-            FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->sym_next)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib-ng/deflate_slow.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_slow.c b/crates/libz-sys/src/zlib-ng/deflate_slow.c
deleted file mode 100644
index 20fa0f3..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_slow.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* deflate_slow.c -- compress data using the slow strategy of deflation algorithm
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-/* ===========================================================================
- * Same as deflate_medium, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-Z_INTERNAL block_state deflate_slow(deflate_state *s, int flush) {
-    Pos hash_head;           /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-    int64_t dist;
-    uint32_t match_len;
-    match_func *longest_match;
-
-    if (s->max_chain_length <= 1024)
-        longest_match = &functable.longest_match;
-    else
-        longest_match = &functable.longest_match_slow;
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need STD_MAX_MATCH bytes
-         * for the next match, plus WANT_MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (UNLIKELY(s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH)) {
-                return need_more;
-            }
-            if (UNLIKELY(s->lookahead == 0))
-                break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = 0;
-        if (LIKELY(s->lookahead >= WANT_MIN_MATCH)) {
-            hash_head = s->quick_insert_string(s, s->strstart);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_match = (Pos)s->match_start;
-        match_len = STD_MIN_MATCH - 1;
-        dist = (int64_t)s->strstart - hash_head;
-
-        if (dist <= MAX_DIST(s) && dist > 0 && s->prev_length < s->max_lazy_match && hash_head != 0) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            match_len = (*longest_match)(s, hash_head);
-            /* longest_match() sets match_start */
-
-            if (match_len <= 5 && (s->strategy == Z_FILTERED)) {
-                /* If prev_match is also WANT_MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                match_len = STD_MIN_MATCH - 1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= STD_MIN_MATCH && match_len <= s->prev_length) {
-            unsigned int max_insert = s->strstart + s->lookahead - STD_MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            bflush = zng_tr_tally_dist(s, s->strstart -1 - s->prev_match, s->prev_length - STD_MIN_MATCH);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->prev_length -= 1;
-            s->lookahead -= s->prev_length;
-
-            unsigned int mov_fwd = s->prev_length - 1;
-            if (max_insert > s->strstart) {
-                unsigned int insert_cnt = mov_fwd;
-                if (UNLIKELY(insert_cnt > max_insert - s->strstart))
-                    insert_cnt = max_insert - s->strstart;
-                s->insert_string(s, s->strstart + 1, insert_cnt);
-            }
-            s->prev_length = 0;
-            s->match_available = 0;
-            s->strstart += mov_fwd + 1;
-
-            if (UNLIKELY(bflush))
-                FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            bflush = zng_tr_tally_lit(s, s->window[s->strstart-1]);
-            if (UNLIKELY(bflush))
-                FLUSH_BLOCK_ONLY(s, 0);
-            s->prev_length = match_len;
-            s->strstart++;
-            s->lookahead--;
-            if (UNLIKELY(s->strm->avail_out == 0))
-                return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->prev_length = match_len;
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert(flush != Z_NO_FLUSH, "no flush?");
-    if (UNLIKELY(s->match_available)) {
-        (void) zng_tr_tally_lit(s, s->window[s->strstart-1]);
-        s->match_available = 0;
-    }
-    s->insert = s->strstart < (STD_MIN_MATCH - 1) ? s->strstart : (STD_MIN_MATCH - 1);
-    if (UNLIKELY(flush == Z_FINISH)) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (UNLIKELY(s->sym_next))
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib-ng/deflate_stored.c

diff --git a/crates/libz-sys/src/zlib-ng/deflate_stored.c b/crates/libz-sys/src/zlib-ng/deflate_stored.c
deleted file mode 100644
index a9bc921..0000000
--- a/crates/libz-sys/src/zlib-ng/deflate_stored.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* deflate_stored.c -- store data without compression using deflation algorithm
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "deflate_p.h"
-#include "functable.h"
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- *
- * In case deflateParams() is used to later switch to a non-zero compression
- * level, s->matches (otherwise unused when storing) keeps track of the number
- * of hash table slides to perform. If s->matches is 1, then one hash table
- * slide will be done when switching. If s->matches is 2, the maximum value
- * allowed here, then the hash table will be cleared, since two or more slides
- * is the same as a clear.
- *
- * deflate_stored() is written to minimize the number of times an input byte is
- * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
- */
-Z_INTERNAL block_state deflate_stored(deflate_state *s, int flush) {
-    /* Smallest worthy block size when not flushing or finishing. By default
-     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
-     * large input and output buffers, the stored block size will be larger.
-     */
-    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
-
-    /* Copy as many min_block or larger stored blocks directly to next_out as
-     * possible. If flushing, copy the remaining available input to next_out as
-     * stored blocks, if there is enough space.
-     */
-    unsigned len, left, have, last = 0;
-    unsigned used = s->strm->avail_in;
-    do {
-        /* Set len to the maximum size block that we can copy directly with the
-         * available input data and output space. Set left to how much of that
-         * would be copied from what's left in the window.
-         */
-        len = MAX_STORED;       /* maximum deflate stored block length */
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        if (s->strm->avail_out < have)          /* need room for header */
-            break;
-            /* maximum stored block length that will fit in avail_out: */
-        have = s->strm->avail_out - have;
-        left = (int)s->strstart - s->block_start;    /* bytes left in window */
-        if (len > (unsigned long)left + s->strm->avail_in)
-            len = left + s->strm->avail_in;     /* limit len to the input */
-        len = MIN(len, have);                   /* limit len to the output */
-
-        /* If the stored block would be less than min_block in length, or if
-         * unable to copy all of the available input when flushing, then try
-         * copying to the window and the pending buffer instead. Also don't
-         * write an empty block when flushing -- deflate() does that.
-         */
-        if (len < min_block && ((len == 0 && flush != Z_FINISH) || flush == Z_NO_FLUSH || len != left + s->strm->avail_in))
-            break;
-
-        /* Make a dummy stored block in pending to get the header bytes,
-         * including any pending bits. This also updates the debugging counts.
-         */
-        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
-        zng_tr_stored_block(s, (char *)0, 0L, last);
-
-        /* Replace the lengths in the dummy stored block with len. */
-        s->pending -= 4;
-        put_short(s, (uint16_t)len);
-        put_short(s, (uint16_t)~len);
-
-        /* Write the stored block header bytes. */
-        PREFIX(flush_pending)(s->strm);
-
-        /* Update debugging counts for the data about to be copied. */
-        cmpr_bits_add(s, len << 3);
-        sent_bits_add(s, len << 3);
-
-        /* Copy uncompressed bytes from the window to next_out. */
-        if (left) {
-            left = MIN(left, len);
-            memcpy(s->strm->next_out, s->window + s->block_start, left);
-            s->strm->next_out += left;
-            s->strm->avail_out -= left;
-            s->strm->total_out += left;
-            s->block_start += (int)left;
-            len -= left;
-        }
-
-        /* Copy uncompressed bytes directly from next_in to next_out, updating
-         * the check value.
-         */
-        if (len) {
-            read_buf(s->strm, s->strm->next_out, len);
-            s->strm->next_out += len;
-            s->strm->avail_out -= len;
-            s->strm->total_out += len;
-        }
-    } while (last == 0);
-
-    /* Update the sliding window with the last s->w_size bytes of the copied
-     * data, or append all of the copied data to the existing window if less
-     * than s->w_size bytes were copied. Also update the number of bytes to
-     * insert in the hash tables, in the event that deflateParams() switches to
-     * a non-zero compression level.
-     */
-    used -= s->strm->avail_in;      /* number of input bytes directly copied */
-    if (used) {
-        /* If any input was used, then no unused input remains in the window,
-         * therefore s->block_start == s->strstart.
-         */
-        if (used >= s->w_size) {    /* supplant the previous history */
-            s->matches = 2;         /* clear hash */
-            memcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
-            s->strstart = s->w_size;
-            s->insert = s->strstart;
-        } else {
-            if (s->window_size - s->strstart <= used) {
-                /* Slide the window down. */
-                s->strstart -= s->w_size;
-                memcpy(s->window, s->window + s->w_size, s->strstart);
-                if (s->matches < 2)
-                    s->matches++;   /* add a pending slide_hash() */
-                s->insert = MIN(s->insert, s->strstart);
-            }
-            memcpy(s->window + s->strstart, s->strm->next_in - used, used);
-            s->strstart += used;
-            s->insert += MIN(used, s->w_size - s->insert);
-        }
-        s->block_start = (int)s->strstart;
-    }
-    s->high_water = MAX(s->high_water, s->strstart);
-
-    /* If the last block was written to next_out, then done. */
-    if (last)
-        return finish_done;
-
-    /* If flushing and all input has been consumed, then done. */
-    if (flush != Z_NO_FLUSH && flush != Z_FINISH && s->strm->avail_in == 0 && (int)s->strstart == s->block_start)
-        return block_done;
-
-    /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart;
-    if (s->strm->avail_in > have && s->block_start >= (int)s->w_size) {
-        /* Slide the window down. */
-        s->block_start -= (int)s->w_size;
-        s->strstart -= s->w_size;
-        memcpy(s->window, s->window + s->w_size, s->strstart);
-        if (s->matches < 2)
-            s->matches++;           /* add a pending slide_hash() */
-        have += s->w_size;          /* more space now */
-        s->insert = MIN(s->insert, s->strstart);
-    }
-
-    have = MIN(have, s->strm->avail_in);
-    if (have) {
-        read_buf(s->strm, s->window + s->strstart, have);
-        s->strstart += have;
-        s->insert += MIN(have, s->w_size - s->insert);
-    }
-    s->high_water = MAX(s->high_water, s->strstart);
-
-    /* There was not enough avail_out to write a complete worthy or flushed
-     * stored block to next_out. Write a stored block to pending instead, if we
-     * have enough input for a worthy block, or if flushing and there is enough
-     * room for the remaining input as a stored block in the pending buffer.
-     */
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        /* maximum stored block length that will fit in pending: */
-    have = MIN(s->pending_buf_size - have, MAX_STORED);
-    min_block = MIN(have, s->w_size);
-    left = (int)s->strstart - s->block_start;
-    if (left >= min_block || ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH && s->strm->avail_in == 0 && left <= have)) {
-        len = MIN(left, have);
-        last = flush == Z_FINISH && s->strm->avail_in == 0 && len == left ? 1 : 0;
-        zng_tr_stored_block(s, (char *)s->window + s->block_start, len, last);
-        s->block_start += (int)len;
-        PREFIX(flush_pending)(s->strm);
-    }
-
-    /* We've done all we can with the available input and output. */
-    return last ? finish_started : need_more;
-}

crates/libz-sys/src/zlib-ng/doc/algorithm.txt

diff --git a/crates/libz-sys/src/zlib-ng/doc/algorithm.txt b/crates/libz-sys/src/zlib-ng/doc/algorithm.txt
deleted file mode 100644
index acd099c..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/algorithm.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-1. Compression algorithm (deflate)
-
-The deflation algorithm used by gzip (also zip and zlib) is a variation of
-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
-the input data.  The second occurrence of a string is replaced by a
-pointer to the previous string, in the form of a pair (distance,
-length).  Distances are limited to 32K bytes, and lengths are limited
-to 258 bytes. When a string does not occur anywhere in the previous
-32K bytes, it is emitted as a sequence of literal bytes.  (In this
-description, `string' must be taken as an arbitrary sequence of bytes,
-and is not restricted to printable characters.)
-
-Literals or match lengths are compressed with one Huffman tree, and
-match distances are compressed with another tree. The trees are stored
-in a compact form at the start of each block. The blocks can have any
-size (except that the compressed data for one block must fit in
-available memory). A block is terminated when deflate() determines that
-it would be useful to start another block with fresh trees. (This is
-somewhat similar to the behavior of LZW-based _compress_.)
-
-Duplicated strings are found using a hash table. All input strings of
-length 3 are inserted in the hash table. A hash index is computed for
-the next 3 bytes. If the hash chain for this index is not empty, all
-strings in the chain are compared with the current input string, and
-the longest match is selected.
-
-The hash chains are searched starting with the most recent strings, to
-favor small distances and thus take advantage of the Huffman encoding.
-The hash chains are singly linked. There are no deletions from the
-hash chains, the algorithm simply discards matches that are too old.
-
-To avoid a worst-case situation, very long hash chains are arbitrarily
-truncated at a certain length, determined by a runtime option (level
-parameter of deflateInit). So deflate() does not always find the longest
-possible match but generally finds a match which is long enough.
-
-deflate() also defers the selection of matches with a lazy evaluation
-mechanism. After a match of length N has been found, deflate() searches for
-a longer match at the next input byte. If a longer match is found, the
-previous match is truncated to a length of one (thus producing a single
-literal byte) and the process of lazy evaluation begins again. Otherwise,
-the original match is kept, and the next match search is attempted only N
-steps later.
-
-The lazy match evaluation is also subject to a runtime parameter. If
-the current match is long enough, deflate() reduces the search for a longer
-match, thus speeding up the whole process. If compression ratio is more
-important than speed, deflate() attempts a complete second search even if
-the first match is already long enough.
-
-The lazy match evaluation is not performed for the fastest compression
-modes (level parameter 1 to 3). For these fast modes, new strings
-are inserted in the hash table only when no match was found, or
-when the match is not too long. This degrades the compression ratio
-but saves time since there are both fewer insertions and fewer searches.
-
-
-2. Decompression algorithm (inflate)
-
-2.1 Introduction
-
-The key question is how to represent a Huffman code (or any prefix code) so
-that you can decode fast.  The most important characteristic is that shorter
-codes are much more common than longer codes, so pay attention to decoding the
-short codes fast, and let the long codes take longer to decode.
-
-inflate() sets up a first level table that covers some number of bits of
-input less than the length of longest code.  It gets that many bits from the
-stream, and looks it up in the table.  The table will tell if the next
-code is that many bits or less and how many, and if it is, it will tell
-the value, else it will point to the next level table for which inflate()
-grabs more bits and tries to decode a longer code.
-
-How many bits to make the first lookup is a tradeoff between the time it
-takes to decode and the time it takes to build the table.  If building the
-table took no time (and if you had infinite memory), then there would only
-be a first level table to cover all the way to the longest code.  However,
-building the table ends up taking a lot longer for more bits since short
-codes are replicated many times in such a table.  What inflate() does is
-simply to make the number of bits in the first table a variable, and  then
-to set that variable for the maximum speed.
-
-For inflate, which has 286 possible codes for the literal/length tree, the size
-of the first table is nine bits.  Also the distance trees have 30 possible
-values, and the size of the first table is six bits.  Note that for each of
-those cases, the table ended up one bit longer than the ``average'' code
-length, i.e. the code length of an approximately flat code which would be a
-little more than eight bits for 286 symbols and a little less than five bits
-for 30 symbols.
-
-
-2.2 More details on the inflate table lookup
-
-Ok, you want to know what this cleverly obfuscated inflate tree actually
-looks like.  You are correct that it's not a Huffman tree.  It is simply a
-lookup table for the first, let's say, nine bits of a Huffman symbol.  The
-symbol could be as short as one bit or as long as 15 bits.  If a particular
-symbol is shorter than nine bits, then that symbol's translation is duplicated
-in all those entries that start with that symbol's bits.  For example, if the
-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a
-symbol is nine bits long, it appears in the table once.
-
-If the symbol is longer than nine bits, then that entry in the table points
-to another similar table for the remaining bits.  Again, there are duplicated
-entries as needed.  The idea is that most of the time the symbol will be short
-and there will only be one table look up.  (That's whole idea behind data
-compression in the first place.)  For the less frequent long symbols, there
-will be two lookups.  If you had a compression method with really long
-symbols, you could have as many levels of lookups as is efficient.  For
-inflate, two is enough.
-
-So a table entry either points to another table (in which case nine bits in
-the above example are gobbled), or it contains the translation for the symbol
-and the number of bits to gobble.  Then you start again with the next
-ungobbled bit.
-
-You may wonder: why not just have one lookup table for how ever many bits the
-longest symbol is?  The reason is that if you do that, you end up spending
-more time filling in duplicate symbol entries than you do actually decoding.
-At least for deflate's output that generates new trees every several 10's of
-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code
-would take too long if you're only decoding several thousand symbols.  At the
-other extreme, you could make a new table for every bit in the code.  In fact,
-that's essentially a Huffman tree.  But then you spend too much time
-traversing the tree while decoding, even for short symbols.
-
-So the number of bits for the first lookup table is a trade of the time to
-fill out the table vs. the time spent looking at the second level and above of
-the table.
-
-Here is an example, scaled down:
-
-The code being decoded, with 10 symbols, from 1 to 6 bits long:
-
-A: 0
-B: 10
-C: 1100
-D: 11010
-E: 11011
-F: 11100
-G: 11101
-H: 11110
-I: 111110
-J: 111111
-
-Let's make the first table three bits long (eight entries):
-
-000: A,1
-001: A,1
-010: A,1
-011: A,1
-100: B,2
-101: B,2
-110: -> table X (gobble 3 bits)
-111: -> table Y (gobble 3 bits)
-
-Each entry is what the bits decode as and how many bits that is, i.e. how
-many bits to gobble.  Or the entry points to another table, with the number of
-bits to gobble implicit in the size of the table.
-
-Table X is two bits long since the longest code starting with 110 is five bits
-long:
-
-00: C,1
-01: C,1
-10: D,2
-11: E,2
-
-Table Y is three bits long since the longest code starting with 111 is six
-bits long:
-
-000: F,2
-001: F,2
-010: G,2
-011: G,2
-100: H,2
-101: H,2
-110: I,3
-111: J,3
-
-So what we have here are three tables with a total of 20 entries that had to
-be constructed.  That's compared to 64 entries for a single table.  Or
-compared to 16 entries for a Huffman tree (six two entry tables and one four
-entry table).  Assuming that the code ideally represents the probability of
-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
-to one lookup for the single table, or 1.66 lookups per symbol for the
-Huffman tree.
-
-There, I think that gives you a picture of what's going on.  For inflate, the
-meaning of a particular symbol is often more than just a letter.  It can be a
-byte (a "literal"), or it can be either a length or a distance which
-indicates a base value and a number of bits to fetch after the code that is
-added to the base value.  Or it might be the special end-of-block code.  The
-data structures created in inftrees.c try to encode all that information
-compactly in the tables.
-
-
-Jean-loup Gailly        Mark Adler
-jloup@gzip.org          madler@alumni.caltech.edu
-
-
-References:
-
-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
-pp. 337-343.
-
-``DEFLATE Compressed Data Format Specification'' available in
-https://tools.ietf.org/html/rfc1951

crates/libz-sys/src/zlib-ng/doc/crc-doc.1.0.pdf

diff --git a/crates/libz-sys/src/zlib-ng/doc/crc-doc.1.0.pdf b/crates/libz-sys/src/zlib-ng/doc/crc-doc.1.0.pdf
deleted file mode 100644
index d6942ec..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/crc-doc.1.0.pdf
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/doc/rfc1950.txt

diff --git a/crates/libz-sys/src/zlib-ng/doc/rfc1950.txt b/crates/libz-sys/src/zlib-ng/doc/rfc1950.txt
deleted file mode 100644
index ce6428a..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/rfc1950.txt
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1950                           Aladdin Enterprises
-Category: Informational                                      J-L. Gailly
-                                                                Info-ZIP
-                                                                May 1996
-
-
-         ZLIB Compressed Data Format Specification version 3.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format.  The
-   data can be produced or consumed, even for an arbitrarily long
-   sequentially presented input data stream, using only an a priori
-   bounded amount of intermediate storage.  The format presently uses
-   the DEFLATE compression method but can be easily extended to use
-   other compression methods.  It can be implemented readily in a manner
-   not covered by patents.  This specification also defines the ADLER-32
-   checksum (an extension and improvement of the Fletcher checksum),
-   used for detection of data corruption, and provides an algorithm for
-   computing it.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 1]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 3
-      2.1. Overall conventions ....................................... 3
-      2.2. Data format ............................................... 4
-      2.3. Compliance ................................................ 7
-   3. References ..................................................... 7
-   4. Source code .................................................... 8
-   5. Security Considerations ........................................ 8
-   6. Acknowledgements ............................................... 8
-   7. Authors' Addresses ............................................. 8
-   8. Appendix: Rationale ............................................ 9
-   9. Appendix: Sample code ..........................................10
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence can
-            be used in data communications or similar structures such as
-            Unix filters;
-
-          * Can use a number of different compression methods;
-
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely.
-
-      The data format defined by this specification does not attempt to
-      allow random access to compressed data.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 2]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into zlib format and/or decompress data from zlib
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compressed data format that can be
-      used for in-memory compression of a sequence of arbitrary bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.) See below, for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      Version 3.1 was the first public release of this specification.
-      In version 3.2, some terminology was changed and the Adler-32
-      sample code was rewritten for clarity.  In version 3.3, the
-      support for a preset dictionary was introduced, and the
-      specification was converted to RFC style.
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 3]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the MOST-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0     1
-         +--------+--------+
-         |00000010|00001000|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + less significant byte = 8
-          + more significant byte = 2 x 256
-
-   2.2. Data format
-
-      A zlib stream has the following structure:
-
-           0   1
-         +---+---+
-         |CMF|FLG|   (more-->)
-         +---+---+
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 4]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      (if FLG.FDICT set)
-
-           0   1   2   3
-         +---+---+---+---+
-         |     DICTID    |   (more-->)
-         +---+---+---+---+
-
-         +=====================+---+---+---+---+
-         |...compressed data...|    ADLER32    |
-         +=====================+---+---+---+---+
-
-      Any data which may appear after ADLER32 are not part of the zlib
-      stream.
-
-      CMF (Compression Method and flags)
-         This byte is divided into a 4-bit compression method and a 4-
-         bit information field depending on the compression method.
-
-            bits 0 to 3  CM     Compression method
-            bits 4 to 7  CINFO  Compression info
-
-      CM (Compression method)
-         This identifies the compression method used in the file. CM = 8
-         denotes the "deflate" compression method with a window size up
-         to 32K.  This is the method used by gzip and PNG (see
-         references [1] and [2] in Chapter 3, below, for the reference
-         documents).  CM = 15 is reserved.  It might be used in a future
-         version of this specification to indicate the presence of an
-         extra field before the compressed data.
-
-      CINFO (Compression info)
-         For CM = 8, CINFO is the base-2 logarithm of the LZ77 window
-         size, minus eight (CINFO=7 indicates a 32K window size). Values
-         of CINFO above 7 are not allowed in this version of the
-         specification.  CINFO is not defined in this specification for
-         CM not equal to 8.
-
-      FLG (FLaGs)
-         This flag byte is divided as follows:
-
-            bits 0 to 4  FCHECK  (check bits for CMF and FLG)
-            bit  5       FDICT   (preset dictionary)
-            bits 6 to 7  FLEVEL  (compression level)
-
-         The FCHECK value must be such that CMF and FLG, when viewed as
-         a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG),
-         is a multiple of 31.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 5]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      FDICT (Preset dictionary)
-         If FDICT is set, a DICT dictionary identifier is present
-         immediately after the FLG byte. The dictionary is a sequence of
-         bytes which are initially fed to the compressor without
-         producing any compressed output. DICT is the Adler-32 checksum
-         of this sequence of bytes (see the definition of ADLER32
-         below).  The decompressor can use this identifier to determine
-         which dictionary has been used by the compressor.
-
-      FLEVEL (Compression level)
-         These flags are available for use by specific compression
-         methods.  The "deflate" method (CM = 8) sets these flags as
-         follows:
-
-            0 - compressor used fastest algorithm
-            1 - compressor used fast algorithm
-            2 - compressor used default algorithm
-            3 - compressor used maximum compression, slowest algorithm
-
-         The information in FLEVEL is not needed for decompression; it
-         is there to indicate if recompression might be worthwhile.
-
-      compressed data
-         For compression method 8, the compressed data is stored in the
-         deflate compressed data format as described in the document
-         "DEFLATE Compressed Data Format Specification" by L. Peter
-         Deutsch. (See reference [3] in Chapter 3, below)
-
-         Other compressed data formats are not specified in this version
-         of the zlib specification.
-
-      ADLER32 (Adler-32 checksum)
-         This contains a checksum value of the uncompressed data
-         (excluding any dictionary data) computed according to Adler-32
-         algorithm. This algorithm is a 32-bit extension and improvement
-         of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
-         standard. See references [4] and [5] in Chapter 3, below)
-
-         Adler-32 is composed of two sums accumulated per byte: s1 is
-         the sum of all bytes, s2 is the sum of all s1 values. Both sums
-         are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
-         Adler-32 checksum is stored as s2*65536 + s1 in most-
-         significant-byte first (network) order.
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 6]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   2.3. Compliance
-
-      A compliant compressor must produce streams with correct CMF, FLG
-      and ADLER32, but need not support preset dictionaries.  When the
-      zlib data format is used as part of another standard data format,
-      the compressor may use only preset dictionaries that are specified
-      by this other data format.  If this other format does not use the
-      preset dictionary feature, the compressor must not set the FDICT
-      flag.
-
-      A compliant decompressor must check CMF, FLG, and ADLER32, and
-      provide an error indication if any of these have incorrect values.
-      A compliant decompressor must give an error indication if CM is
-      not one of the values defined in this specification (only the
-      value 8 is permitted in this version), since another value could
-      indicate the presence of new features that would cause subsequent
-      data to be interpreted incorrectly.  A compliant decompressor must
-      give an error indication if FDICT is set and DICTID is not the
-      identifier of a known preset dictionary.  A decompressor may
-      ignore FLEVEL and still be compliant.  When the zlib data format
-      is being used as a part of another standard format, a compliant
-      decompressor must support all the preset dictionaries specified by
-      the other format. When the other format does not use the preset
-      dictionary feature, a compliant decompressor must reject any
-      stream in which the FDICT flag is set.
-
-3. References
-
-   [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [2] Thomas Boutell, "PNG (Portable Network Graphics) specification",
-       available in ftp://ftp.uu.net/graphics/png/documents/
-
-   [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Fletcher, J. G., "An Arithmetic Checksum for Serial
-       Transmissions," IEEE Transactions on Communications, Vol. COM-30,
-       No. 1, January 1982, pp. 247-252.
-
-   [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms,"
-       November, 1993, pp. 144, 145. (Available from
-       gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 7]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-4. Source code
-
-   Source code for a C language implementation of a "zlib" compliant
-   library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-5. Security Considerations
-
-   A decoder that fails to check the ADLER32 checksum value may be
-   subject to undetected data corruption.
-
-6. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly and Mark Adler designed the zlib format and wrote
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-7. Authors' Addresses
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-
-   Jean-Loup Gailly
-
-   EMail: <gzip@prep.ai.mit.edu>
-
-   Questions about the technical content of this specification can be
-   sent by email to
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 8]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-8. Appendix: Rationale
-
-   8.1. Preset dictionaries
-
-      A preset dictionary is specially useful to compress short input
-      sequences. The compressor can take advantage of the dictionary
-      context to encode the input in a more compact manner. The
-      decompressor can be initialized with the appropriate context by
-      virtually decompressing a compressed version of the dictionary
-      without producing any output. However for certain compression
-      algorithms such as the deflate algorithm this operation can be
-      achieved without actually performing any decompression.
-
-      The compressor and the decompressor must use exactly the same
-      dictionary. The dictionary may be fixed or may be chosen among a
-      certain number of predefined dictionaries, according to the kind
-      of input data. The decompressor can determine which dictionary has
-      been chosen by the compressor by checking the dictionary
-      identifier. This document does not specify the contents of
-      predefined dictionaries, since the optimal dictionaries are
-      application specific. Standard data formats using this feature of
-      the zlib specification must precisely define the allowed
-      dictionaries.
-
-   8.2. The Adler-32 algorithm
-
-      The Adler-32 algorithm is much faster than the CRC32 algorithm yet
-      still provides an extremely low probability of undetected errors.
-
-      The modulo on unsigned long accumulators can be delayed for 5552
-      bytes, so the modulo operation time is negligible.  If the bytes
-      are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
-      and order sensitive, unlike the first sum, which is just a
-      checksum.  That 65521 is prime is important to avoid a possible
-      large class of two-byte errors that leave the check unchanged.
-      (The Fletcher checksum uses 255, which is not prime and which also
-      makes the Fletcher check insensitive to single byte changes 0 <->
-      255.)
-
-      The sum s1 is initialized to 1 instead of zero to make the length
-      of the sequence part of s2, so that the length does not have to be
-      checked separately. (Any sequence of zeroes has a Fletcher
-      checksum of zero.)
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 9]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-9. Appendix: Sample code
-
-   The following C code computes the Adler-32 checksum of a data buffer.
-   It is written for clarity, not for speed.  The sample code is in the
-   ANSI C programming language. Non C users may find it easier to read
-   with these hints:
-
-      &      Bitwise AND operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero bit(s)
-             at the left.
-      <<     Bitwise left shift operator. Left shift inserts zero
-             bit(s) at the right.
-      ++     "n++" increments the variable n.
-      %      modulo operator: a % b is the remainder of a divided by b.
-
-      #define BASE 65521 /* largest prime smaller than 65536 */
-
-      /*
-         Update a running Adler-32 checksum with the bytes buf[0..len-1]
-       and return the updated checksum. The Adler-32 checksum should be
-       initialized to 1.
-
-       Usage example:
-
-         unsigned long adler = 1L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           adler = update_adler32(adler, buffer, length);
-         }
-         if (adler != original_adler) error();
-      */
-      unsigned long update_adler32(unsigned long adler,
-         unsigned char *buf, int len)
-      {
-        unsigned long s1 = adler & 0xffff;
-        unsigned long s2 = (adler >> 16) & 0xffff;
-        int n;
-
-        for (n = 0; n < len; n++) {
-          s1 = (s1 + buf[n]) % BASE;
-          s2 = (s2 + s1)     % BASE;
-        }
-        return (s2 << 16) + s1;
-      }
-
-      /* Return the adler32 of the bytes buf[0..len-1] */
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 10]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      unsigned long adler32(unsigned char *buf, int len)
-      {
-        return update_adler32(1L, buf, len);
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 11]
-

crates/libz-sys/src/zlib-ng/doc/rfc1951.txt

diff --git a/crates/libz-sys/src/zlib-ng/doc/rfc1951.txt b/crates/libz-sys/src/zlib-ng/doc/rfc1951.txt
deleted file mode 100644
index 403c8c7..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/rfc1951.txt
+++ /dev/null
@@ -1,955 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1951                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-        DEFLATE Compressed Data Format Specification version 1.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that
-   compresses data using a combination of the LZ77 algorithm and Huffman
-   coding, with efficiency comparable to the best currently available
-   general-purpose compression methods.  The data can be produced or
-   consumed, even for an arbitrarily long sequentially presented input
-   data stream, using only an a priori bounded amount of intermediate
-   storage.  The format can be implemented readily in a manner not
-   covered by patents.
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 4
-   2. Compressed representation overview ............................. 4
-   3. Detailed specification ......................................... 5
-      3.1. Overall conventions ....................................... 5
-          3.1.1. Packing into bytes .................................. 5
-      3.2. Compressed block format ................................... 6
-          3.2.1. Synopsis of prefix and Huffman coding ............... 6
-          3.2.2. Use of Huffman coding in the "deflate" format ....... 7
-          3.2.3. Details of block format ............................. 9
-          3.2.4. Non-compressed blocks (BTYPE=00) ................... 11
-          3.2.5. Compressed blocks (length and distance codes) ...... 11
-          3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12
-          3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13
-      3.3. Compliance ............................................... 14
-   4. Compression algorithm details ................................. 14
-   5. References .................................................... 16
-   6. Security Considerations ....................................... 16
-   7. Source code ................................................... 16
-   8. Acknowledgements .............................................. 16
-   9. Author's Address .............................................. 17
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence
-            can be used in data communications or similar structures
-            such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-      The data format defined by this specification does not attempt to:
-
-          * Allow random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well
-            as the best currently available specialized algorithms.
-
-      A simple counting argument shows that no lossless compression
-      algorithm can compress every possible input data set.  For the
-      format defined here, the worst case expansion is 5 bytes per 32K-
-      byte block, i.e., a size increase of 0.015% for large data sets.
-      English text usually compresses by a factor of 2.5 to 3;
-      executable files usually compress somewhat less; graphical data
-      such as raster images may compress much more.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into "deflate" format and/or decompress data from
-      "deflate" format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.  Familiarity with the technique of Huffman coding
-      is helpful but not required.
-
-   1.3. Scope
-
-      The specification specifies a method for representing a sequence
-      of bytes as a (usually shorter) sequence of bits, and a method for
-      packing the latter bit sequence into bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      Byte: 8 bits stored or transmitted as a unit (same as an octet).
-      For this specification, a byte is exactly 8 bits, even on machines
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-      which store a character on a number of bits different from eight.
-      See below, for the numbering of bits within a byte.
-
-      String: a sequence of arbitrary bytes.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the deflate format since
-      version 1.1 of this specification.  In version 1.2, some
-      terminology was changed.  Version 1.3 is a conversion of the
-      specification to RFC style.
-
-2. Compressed representation overview
-
-   A compressed data set consists of a series of blocks, corresponding
-   to successive blocks of input data.  The block sizes are arbitrary,
-   except that non-compressible blocks are limited to 65,535 bytes.
-
-   Each block is compressed using a combination of the LZ77 algorithm
-   and Huffman coding. The Huffman trees for each block are independent
-   of those for previous or subsequent blocks; the LZ77 algorithm may
-   use a reference to a duplicated string occurring in a previous block,
-   up to 32K input bytes before.
-
-   Each block consists of two parts: a pair of Huffman code trees that
-   describe the representation of the compressed data part, and a
-   compressed data part.  (The Huffman trees themselves are compressed
-   using Huffman encoding.)  The compressed data consists of a series of
-   elements of two types: literal bytes (of strings that have not been
-   detected as duplicated within the previous 32K input bytes), and
-   pointers to duplicated strings, where a pointer is represented as a
-   pair <length, backward distance>.  The representation used in the
-   "deflate" format limits distances to 32K bytes and lengths to 258
-   bytes, but does not limit the size of a block, except for
-   uncompressible blocks, which are limited as noted above.
-
-   Each type of value (literals, distances, and lengths) in the
-   compressed data is represented using a Huffman code, using one code
-   tree for literals and lengths and a separate code tree for distances.
-   The code trees for each block appear in a compact form just before
-   the compressed data for that block.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-3. Detailed specification
-
-   3.1. Overall conventions In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-      3.1.1. Packing into bytes
-
-         This document does not address the issue of the order in which
-         bits of a byte are transmitted on a bit-sequential medium,
-         since the final data format described here is byte- rather than
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         bit-oriented.  However, we describe the compressed block format
-         in below, as a sequence of data elements of various bit
-         lengths, not a sequence of bytes.  We must therefore specify
-         how to pack these data elements into bytes to form the final
-         compressed byte sequence:
-
-             * Data elements are packed into bytes in order of
-               increasing bit number within the byte, i.e., starting
-               with the least-significant bit of the byte.
-             * Data elements other than Huffman codes are packed
-               starting with the least-significant bit of the data
-               element.
-             * Huffman codes are packed starting with the most-
-               significant bit of the code.
-
-         In other words, if one were to print out the compressed data as
-         a sequence of bytes, starting with the first byte at the
-         *right* margin and proceeding to the *left*, with the most-
-         significant bit of each byte on the left as usual, one would be
-         able to parse the result from right to left, with fixed-width
-         elements in the correct MSB-to-LSB order and Huffman codes in
-         bit-reversed order (i.e., with the first bit of the code in the
-         relative LSB position).
-
-   3.2. Compressed block format
-
-      3.2.1. Synopsis of prefix and Huffman coding
-
-         Prefix coding represents symbols from an a priori known
-         alphabet by bit sequences (codes), one code for each symbol, in
-         a manner such that different symbols may be represented by bit
-         sequences of different lengths, but a parser can always parse
-         an encoded string unambiguously symbol-by-symbol.
-
-         We define a prefix code in terms of a binary tree in which the
-         two edges descending from each non-leaf node are labeled 0 and
-         1 and in which the leaf nodes correspond one-for-one with (are
-         labeled with) the symbols of the alphabet; then the code for a
-         symbol is the sequence of 0's and 1's on the edges leading from
-         the root to the leaf labeled with that symbol.  For example:
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                          /\              Symbol    Code
-                         0  1             ------    ----
-                        /    \                A      00
-                       /\     B               B       1
-                      0  1                    C     011
-                     /    \                   D     010
-                    A     /\
-                         0  1
-                        /    \
-                       D      C
-
-         A parser can decode the next symbol from an encoded input
-         stream by walking down the tree from the root, at each step
-         choosing the edge corresponding to the next input bit.
-
-         Given an alphabet with known symbol frequencies, the Huffman
-         algorithm allows the construction of an optimal prefix code
-         (one which represents strings with those symbol frequencies
-         using the fewest bits of any possible prefix codes for that
-         alphabet).  Such a code is called a Huffman code.  (See
-         reference [1] in Chapter 5, references for additional
-         information on Huffman codes.)
-
-         Note that in the "deflate" format, the Huffman codes for the
-         various alphabets must not exceed certain maximum code lengths.
-         This constraint complicates the algorithm for computing code
-         lengths from symbol frequencies.  Again, see Chapter 5,
-         references for details.
-
-      3.2.2. Use of Huffman coding in the "deflate" format
-
-         The Huffman codes used for each alphabet in the "deflate"
-         format have two additional rules:
-
-             * All codes of a given bit length have lexicographically
-               consecutive values, in the same order as the symbols
-               they represent;
-
-             * Shorter codes lexicographically precede longer codes.
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         We could recode the example above to follow this rule as
-         follows, assuming that the order of the alphabet is ABCD:
-
-            Symbol  Code
-            ------  ----
-            A       10
-            B       0
-            C       110
-            D       111
-
-         I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are
-         lexicographically consecutive.
-
-         Given this rule, we can define the Huffman code for an alphabet
-         just by giving the bit lengths of the codes for each symbol of
-         the alphabet in order; this is sufficient to determine the
-         actual codes.  In our example, the code is completely defined
-         by the sequence of bit lengths (2, 1, 3, 3).  The following
-         algorithm generates the codes as integers, intended to be read
-         from most- to least-significant bit.  The code lengths are
-         initially in tree[I].Len; the codes are produced in
-         tree[I].Code.
-
-         1)  Count the number of codes for each code length.  Let
-             bl_count[N] be the number of codes of length N, N >= 1.
-
-         2)  Find the numerical value of the smallest code for each
-             code length:
-
-                code = 0;
-                bl_count[0] = 0;
-                for (bits = 1; bits <= MAX_BITS; bits++) {
-                    code = (code + bl_count[bits-1]) << 1;
-                    next_code[bits] = code;
-                }
-
-         3)  Assign numerical values to all codes, using consecutive
-             values for all codes of the same length with the base
-             values determined at step 2. Codes that are never used
-             (which have a bit length of zero) must not be assigned a
-             value.
-
-                for (n = 0;  n <= max_code; n++) {
-                    len = tree[n].Len;
-                    if (len != 0) {
-                        tree[n].Code = next_code[len];
-                        next_code[len]++;
-                    }
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                }
-
-         Example:
-
-         Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3,
-         3, 2, 4, 4).  After step 1, we have:
-
-            N      bl_count[N]
-            -      -----------
-            2      1
-            3      5
-            4      2
-
-         Step 2 computes the following next_code values:
-
-            N      next_code[N]
-            -      ------------
-            1      0
-            2      0
-            3      2
-            4      14
-
-         Step 3 produces the following code values:
-
-            Symbol Length   Code
-            ------ ------   ----
-            A       3        010
-            B       3        011
-            C       3        100
-            D       3        101
-            E       3        110
-            F       2         00
-            G       4       1110
-            H       4       1111
-
-      3.2.3. Details of block format
-
-         Each block of compressed data begins with 3 header bits
-         containing the following data:
-
-            first bit       BFINAL
-            next 2 bits     BTYPE
-
-         Note that the header bits do not necessarily begin on a byte
-         boundary, since a block does not necessarily occupy an integral
-         number of bytes.
-
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         BFINAL is set if and only if this is the last block of the data
-         set.
-
-         BTYPE specifies how the data are compressed, as follows:
-
-            00 - no compression
-            01 - compressed with fixed Huffman codes
-            10 - compressed with dynamic Huffman codes
-            11 - reserved (error)
-
-         The only difference between the two compressed cases is how the
-         Huffman codes for the literal/length and distance alphabets are
-         defined.
-
-         In all cases, the decoding algorithm for the actual data is as
-         follows:
-
-            do
-               read block header from input stream.
-               if stored with no compression
-                  skip any remaining bits in current partially
-                     processed byte
-                  read LEN and NLEN (see next section)
-                  copy LEN bytes of data to output
-               otherwise
-                  if compressed with dynamic Huffman codes
-                     read representation of code trees (see
-                        subsection below)
-                  loop (until end of block code recognized)
-                     decode literal/length value from input stream
-                     if value < 256
-                        copy value (literal byte) to output stream
-                     otherwise
-                        if value = end of block (256)
-                           break from loop
-                        otherwise (value = 257..285)
-                           decode distance from input stream
-
-                           move backwards distance bytes in the output
-                           stream, and copy length bytes from this
-                           position to the output stream.
-                  end loop
-            while not last block
-
-         Note that a duplicated string reference may refer to a string
-         in a previous block; i.e., the backward distance may cross one
-         or more block boundaries.  However a distance cannot refer past
-         the beginning of the output stream.  (An application using a
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         preset dictionary might discard part of the output stream; a
-         distance can refer to that part of the output stream anyway)
-         Note also that the referenced string may overlap the current
-         position; for example, if the last 2 bytes decoded have values
-         X and Y, a string reference with <length = 5, distance = 2>
-         adds X,Y,X,Y,X to the output stream.
-
-         We now specify each compression method in turn.
-
-      3.2.4. Non-compressed blocks (BTYPE=00)
-
-         Any bits of input up to the next byte boundary are ignored.
-         The rest of the block consists of the following information:
-
-              0   1   2   3   4...
-            +---+---+---+---+================================+
-            |  LEN  | NLEN  |... LEN bytes of literal data...|
-            +---+---+---+---+================================+
-
-         LEN is the number of data bytes in the block.  NLEN is the
-         one's complement of LEN.
-
-      3.2.5. Compressed blocks (length and distance codes)
-
-         As noted above, encoded data blocks in the "deflate" format
-         consist of sequences of symbols drawn from three conceptually
-         distinct alphabets: either literal bytes, from the alphabet of
-         byte values (0..255), or <length, backward distance> pairs,
-         where the length is drawn from (3..258) and the distance is
-         drawn from (1..32,768).  In fact, the literal and length
-         alphabets are merged into a single alphabet (0..285), where
-         values 0..255 represent literal bytes, the value 256 indicates
-         end-of-block, and values 257..285 represent length codes
-         (possibly in conjunction with extra bits following the symbol
-         code) as follows:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                 Extra               Extra               Extra
-            Code Bits Length(s) Code Bits Lengths   Code Bits Length(s)
-            ---- ---- ------     ---- ---- -------   ---- ---- -------
-             257   0     3       267   1   15,16     277   4   67-82
-             258   0     4       268   1   17,18     278   4   83-98
-             259   0     5       269   2   19-22     279   4   99-114
-             260   0     6       270   2   23-26     280   4  115-130
-             261   0     7       271   2   27-30     281   5  131-162
-             262   0     8       272   2   31-34     282   5  163-194
-             263   0     9       273   3   35-42     283   5  195-226
-             264   0    10       274   3   43-50     284   5  227-257
-             265   1  11,12      275   3   51-58     285   0    258
-             266   1  13,14      276   3   59-66
-
-         The extra bits should be interpreted as a machine integer
-         stored with the most-significant bit first, e.g., bits 1110
-         represent the value 14.
-
-                  Extra           Extra               Extra
-             Code Bits Dist  Code Bits   Dist     Code Bits Distance
-             ---- ---- ----  ---- ----  ------    ---- ---- --------
-               0   0    1     10   4     33-48    20    9   1025-1536
-               1   0    2     11   4     49-64    21    9   1537-2048
-               2   0    3     12   5     65-96    22   10   2049-3072
-               3   0    4     13   5     97-128   23   10   3073-4096
-               4   1   5,6    14   6    129-192   24   11   4097-6144
-               5   1   7,8    15   6    193-256   25   11   6145-8192
-               6   2   9-12   16   7    257-384   26   12  8193-12288
-               7   2  13-16   17   7    385-512   27   12 12289-16384
-               8   3  17-24   18   8    513-768   28   13 16385-24576
-               9   3  25-32   19   8   769-1024   29   13 24577-32768
-
-      3.2.6. Compression with fixed Huffman codes (BTYPE=01)
-
-         The Huffman codes for the two alphabets are fixed, and are not
-         represented explicitly in the data.  The Huffman code lengths
-         for the literal/length alphabet are:
-
-                   Lit Value    Bits        Codes
-                   ---------    ----        -----
-                     0 - 143     8          00110000 through
-                                            10111111
-                   144 - 255     9          110010000 through
-                                            111111111
-                   256 - 279     7          0000000 through
-                                            0010111
-                   280 - 287     8          11000000 through
-                                            11000111
-
-
-
-Deutsch                      Informational                     [Page 12]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         The code lengths are sufficient to generate the actual codes,
-         as described above; we show the codes in the table for added
-         clarity.  Literal/length values 286-287 will never actually
-         occur in the compressed data, but participate in the code
-         construction.
-
-         Distance codes 0-31 are represented by (fixed-length) 5-bit
-         codes, with possible additional bits as shown in the table
-         shown in Paragraph 3.2.5, above.  Note that distance codes 30-
-         31 will never actually occur in the compressed data.
-
-      3.2.7. Compression with dynamic Huffman codes (BTYPE=10)
-
-         The Huffman codes for the two alphabets appear in the block
-         immediately after the header bits and before the actual
-         compressed data, first the literal/length code and then the
-         distance code.  Each code is defined by a sequence of code
-         lengths, as discussed in Paragraph 3.2.2, above.  For even
-         greater compactness, the code length sequences themselves are
-         compressed using a Huffman code.  The alphabet for code lengths
-         is as follows:
-
-               0 - 15: Represent code lengths of 0 - 15
-                   16: Copy the previous code length 3 - 6 times.
-                       The next 2 bits indicate repeat length
-                             (0 = 3, ... , 3 = 6)
-                          Example:  Codes 8, 16 (+2 bits 11),
-                                    16 (+2 bits 10) will expand to
-                                    12 code lengths of 8 (1 + 6 + 5)
-                   17: Repeat a code length of 0 for 3 - 10 times.
-                       (3 bits of length)
-                   18: Repeat a code length of 0 for 11 - 138 times
-                       (7 bits of length)
-
-         A code length of 0 indicates that the corresponding symbol in
-         the literal/length or distance alphabet will not occur in the
-         block, and should not participate in the Huffman code
-         construction algorithm given earlier.  If only one distance
-         code is used, it is encoded using one bit, not zero bits; in
-         this case there is a single code length of one, with one unused
-         code.  One distance code of zero bits means that there are no
-         distance codes used at all (the data is all literals).
-
-         We can now define the format of the block:
-
-               5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286)
-               5 Bits: HDIST, # of Distance codes - 1        (1 - 32)
-               4 Bits: HCLEN, # of Code Length codes - 4     (4 - 19)
-
-
-
-Deutsch                      Informational                     [Page 13]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-               (HCLEN + 4) x 3 bits: code lengths for the code length
-                  alphabet given just above, in the order: 16, 17, 18,
-                  0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-                  These code lengths are interpreted as 3-bit integers
-                  (0-7); as above, a code length of 0 means the
-                  corresponding symbol (literal/length or distance code
-                  length) is not used.
-
-               HLIT + 257 code lengths for the literal/length alphabet,
-                  encoded using the code length Huffman code
-
-               HDIST + 1 code lengths for the distance alphabet,
-                  encoded using the code length Huffman code
-
-               The actual compressed data of the block,
-                  encoded using the literal/length and distance Huffman
-                  codes
-
-               The literal/length symbol 256 (end of data),
-                  encoded using the literal/length Huffman code
-
-         The code length repeat codes can cross from HLIT + 257 to the
-         HDIST + 1 code lengths.  In other words, all code lengths form
-         a single sequence of HLIT + HDIST + 258 values.
-
-   3.3. Compliance
-
-      A compressor may limit further the ranges of values specified in
-      the previous section and still be compliant; for example, it may
-      limit the range of backward pointers to some value smaller than
-      32K.  Similarly, a compressor may limit the size of blocks so that
-      a compressible block fits in memory.
-
-      A compliant decompressor must accept the full range of possible
-      values defined in the previous section, and must accept blocks of
-      arbitrary size.
-
-4. Compression algorithm details
-
-   While it is the intent of this document to define the "deflate"
-   compressed data format without reference to any particular
-   compression algorithm, the format is related to the compressed
-   formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below);
-   since many variations of LZ77 are patented, it is strongly
-   recommended that the implementor of a compressor follow the general
-   algorithm presented here, which is known not to be patented per se.
-   The material in this section is not part of the definition of the
-
-
-
-Deutsch                      Informational                     [Page 14]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-   specification per se, and a compressor need not follow it in order to
-   be compliant.
-
-   The compressor terminates a block when it determines that starting a
-   new block with fresh trees would be useful, or when the block size
-   fills up the compressor's block buffer.
-
-   The compressor uses a chained hash table to find duplicated strings,
-   using a hash function that operates on 3-byte sequences.  At any
-   given point during compression, let XYZ be the next 3 input bytes to
-   be examined (not necessarily all different, of course).  First, the
-   compressor examines the hash chain for XYZ.  If the chain is empty,
-   the compressor simply writes out X as a literal byte and advances one
-   byte in the input.  If the hash chain is not empty, indicating that
-   the sequence XYZ (or, if we are unlucky, some other 3 bytes with the
-   same hash function value) has occurred recently, the compressor
-   compares all strings on the XYZ hash chain with the actual input data
-   sequence starting at the current point, and selects the longest
-   match.
-
-   The compressor searches the hash chains starting with the most recent
-   strings, to favor small distances and thus take advantage of the
-   Huffman encoding.  The hash chains are singly linked. There are no
-   deletions from the hash chains; the algorithm simply discards matches
-   that are too old.  To avoid a worst-case situation, very long hash
-   chains are arbitrarily truncated at a certain length, determined by a
-   run-time parameter.
-
-   To improve overall compression, the compressor optionally defers the
-   selection of matches ("lazy matching"): after a match of length N has
-   been found, the compressor searches for a longer match starting at
-   the next input byte.  If it finds a longer match, it truncates the
-   previous match to a length of one (thus producing a single literal
-   byte) and then emits the longer match.  Otherwise, it emits the
-   original match, and, as described above, advances N bytes before
-   continuing.
-
-   Run-time parameters also control this "lazy match" procedure.  If
-   compression ratio is most important, the compressor attempts a
-   complete second search regardless of the length of the first match.
-   In the normal case, if the current match is "long enough", the
-   compressor reduces the search for a longer match, thus speeding up
-   the process.  If speed is most important, the compressor inserts new
-   strings in the hash table only when no match was found, or when the
-   match is not "too long".  This degrades the compression ratio but
-   saves time since there are both fewer insertions and fewer searches.
-
-
-
-
-
-Deutsch                      Informational                     [Page 15]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-5. References
-
-   [1] Huffman, D. A., "A Method for the Construction of Minimum
-       Redundancy Codes", Proceedings of the Institute of Radio
-       Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101.
-
-   [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data
-       Compression", IEEE Transactions on Information Theory, Vol. 23,
-       No. 3, pp. 337-343.
-
-   [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources,
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources,
-       available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/
-
-   [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix
-       encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169.
-
-   [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes,"
-       Comm. ACM, 33,4, April 1990, pp. 449-459.
-
-6. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data.  See
-   reference [3], for example.
-
-7. Source code
-
-   Source code for a C language implementation of a "deflate" compliant
-   compressor and decompressor is available within the zlib package at
-   ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-8. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Phil Katz designed the deflate format.  Jean-Loup Gailly and Mark
-   Adler wrote the related software described in this specification.
-   Glenn Randers-Pehrson converted this document to RFC and HTML format.
-
-
-
-Deutsch                      Informational                     [Page 16]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-9. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 17]
-

crates/libz-sys/src/zlib-ng/doc/rfc1952.txt

diff --git a/crates/libz-sys/src/zlib-ng/doc/rfc1952.txt b/crates/libz-sys/src/zlib-ng/doc/rfc1952.txt
deleted file mode 100644
index 14c0c72..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/rfc1952.txt
+++ /dev/null
@@ -1,675 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1952                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-               GZIP file format specification version 4.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that is
-   compatible with the widely used GZIP utility.  The format includes a
-   cyclic redundancy check value for detecting data corruption.  The
-   format presently uses the DEFLATE method of compression but can be
-   easily extended to use other compression methods.  The format can be
-   implemented readily in a manner not covered by patents.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5. Definitions of terms and conventions used ................. 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 4
-      2.1. Overall conventions ....................................... 4
-      2.2. File format ............................................... 5
-      2.3. Member format ............................................. 5
-          2.3.1. Member header and trailer ........................... 6
-              2.3.1.1. Extra field ................................... 8
-              2.3.1.2. Compliance .................................... 9
-      3. References .................................................. 9
-      4. Security Considerations .................................... 10
-      5. Acknowledgements ........................................... 10
-      6. Author's Address ........................................... 10
-      7. Appendix: Jean-Loup Gailly's gzip utility .................. 11
-      8. Appendix: Sample CRC Code .................................. 11
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can compress or decompress a data stream (as opposed to a
-            randomly accessible file) to produce another data stream,
-            using only an a priori bounded amount of intermediate
-            storage, and hence can be used in data communications or
-            similar structures such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      The data format defined by this specification does not attempt to:
-
-          * Provide random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well as
-            the best currently available specialized algorithms.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into gzip format and/or decompress data from gzip
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compression method and a file format
-      (the latter assuming only that a file can store a sequence of
-      arbitrary bytes).  It does not specify any particular interface to
-      a file system or anything about character sets or encodings
-      (except for file names and comments, which are optional).
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any file that conforms to all the
-      specifications presented here; a compliant compressor must produce
-      files that conform to all the specifications presented here.  The
-      material in the appendices is not part of the specification per se
-      and is not relevant to compliance.
-
-   1.5. Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.)  See below for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the gzip format since
-      version 4.1 of this specification.  In version 4.2, some
-      terminology was changed, and the sample CRC code was rewritten for
-      clarity and to eliminate the requirement for the caller to do pre-
-      and post-conditioning.  Version 4.3 is a conversion of the
-      specification to RFC style.
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      This document does not address the issue of the order in which
-      bits of a byte are transmitted on a bit-sequential medium, since
-      the data format described here is byte- rather than bit-oriented.
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   2.2. File format
-
-      A gzip file consists of a series of "members" (compressed data
-      sets).  The format of each member is specified in the following
-      section.  The members simply appear one after another in the file,
-      with no additional information before, between, or after them.
-
-   2.3. Member format
-
-      Each member has the following structure:
-
-         +---+---+---+---+---+---+---+---+---+---+
-         |ID1|ID2|CM |FLG|     MTIME     |XFL|OS | (more-->)
-         +---+---+---+---+---+---+---+---+---+---+
-
-      (if FLG.FEXTRA set)
-
-         +---+---+=================================+
-         | XLEN  |...XLEN bytes of "extra field"...| (more-->)
-         +---+---+=================================+
-
-      (if FLG.FNAME set)
-
-         +=========================================+
-         |...original file name, zero-terminated...| (more-->)
-         +=========================================+
-
-      (if FLG.FCOMMENT set)
-
-         +===================================+
-         |...file comment, zero-terminated...| (more-->)
-         +===================================+
-
-      (if FLG.FHCRC set)
-
-         +---+---+
-         | CRC16 |
-         +---+---+
-
-         +=======================+
-         |...compressed blocks...| (more-->)
-         +=======================+
-
-           0   1   2   3   4   5   6   7
-         +---+---+---+---+---+---+---+---+
-         |     CRC32     |     ISIZE     |
-         +---+---+---+---+---+---+---+---+
-
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      2.3.1. Member header and trailer
-
-         ID1 (IDentification 1)
-         ID2 (IDentification 2)
-            These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139
-            (0x8b, \213), to identify the file as being in gzip format.
-
-         CM (Compression Method)
-            This identifies the compression method used in the file.  CM
-            = 0-7 are reserved.  CM = 8 denotes the "deflate"
-            compression method, which is the one customarily used by
-            gzip and which is documented elsewhere.
-
-         FLG (FLaGs)
-            This flag byte is divided into individual bits as follows:
-
-               bit 0   FTEXT
-               bit 1   FHCRC
-               bit 2   FEXTRA
-               bit 3   FNAME
-               bit 4   FCOMMENT
-               bit 5   reserved
-               bit 6   reserved
-               bit 7   reserved
-
-            If FTEXT is set, the file is probably ASCII text.  This is
-            an optional indication, which the compressor may set by
-            checking a small amount of the input data to see whether any
-            non-ASCII characters are present.  In case of doubt, FTEXT
-            is cleared, indicating binary data. For systems which have
-            different file formats for ascii text and binary data, the
-            decompressor can use FTEXT to choose the appropriate format.
-            We deliberately do not specify the algorithm used to set
-            this bit, since a compressor always has the option of
-            leaving it cleared and a decompressor always has the option
-            of ignoring it and letting some other program handle issues
-            of data conversion.
-
-            If FHCRC is set, a CRC16 for the gzip header is present,
-            immediately before the compressed data. The CRC16 consists
-            of the two least significant bytes of the CRC32 for all
-            bytes of the gzip header up to and not including the CRC16.
-            [The FHCRC bit was never set by versions of gzip up to
-            1.2.4, even though it was documented with a different
-            meaning in gzip 1.2.4.]
-
-            If FEXTRA is set, optional extra fields are present, as
-            described in a following section.
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            If FNAME is set, an original file name is present,
-            terminated by a zero byte.  The name must consist of ISO
-            8859-1 (LATIN-1) characters; on operating systems using
-            EBCDIC or any other character set for file names, the name
-            must be translated to the ISO LATIN-1 character set.  This
-            is the original name of the file being compressed, with any
-            directory components removed, and, if the file being
-            compressed is on a file system with case insensitive names,
-            forced to lower case. There is no original file name if the
-            data was compressed from a source other than a named file;
-            for example, if the source was stdin on a Unix system, there
-            is no file name.
-
-            If FCOMMENT is set, a zero-terminated file comment is
-            present.  This comment is not interpreted; it is only
-            intended for human consumption.  The comment must consist of
-            ISO 8859-1 (LATIN-1) characters.  Line breaks should be
-            denoted by a single line feed character (10 decimal).
-
-            Reserved FLG bits must be zero.
-
-         MTIME (Modification TIME)
-            This gives the most recent modification time of the original
-            file being compressed.  The time is in Unix format, i.e.,
-            seconds since 00:00:00 GMT, Jan.  1, 1970.  (Note that this
-            may cause problems for MS-DOS and other systems that use
-            local rather than Universal time.)  If the compressed data
-            did not come from a file, MTIME is set to the time at which
-            compression started.  MTIME = 0 means no time stamp is
-            available.
-
-         XFL (eXtra FLags)
-            These flags are available for use by specific compression
-            methods.  The "deflate" method (CM = 8) sets these flags as
-            follows:
-
-               XFL = 2 - compressor used maximum compression,
-                         slowest algorithm
-               XFL = 4 - compressor used fastest algorithm
-
-         OS (Operating System)
-            This identifies the type of file system on which compression
-            took place.  This may be useful in determining end-of-line
-            convention for text files.  The currently defined values are
-            as follows:
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-                 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32)
-                 1 - Amiga
-                 2 - VMS (or OpenVMS)
-                 3 - Unix
-                 4 - VM/CMS
-                 5 - Atari TOS
-                 6 - HPFS filesystem (OS/2, NT)
-                 7 - Macintosh
-                 8 - Z-System
-                 9 - CP/M
-                10 - TOPS-20
-                11 - NTFS filesystem (NT)
-                12 - QDOS
-                13 - Acorn RISCOS
-               255 - unknown
-
-         XLEN (eXtra LENgth)
-            If FLG.FEXTRA is set, this gives the length of the optional
-            extra field.  See below for details.
-
-         CRC32 (CRC-32)
-            This contains a Cyclic Redundancy Check value of the
-            uncompressed data computed according to CRC-32 algorithm
-            used in the ISO 3309 standard and in section 8.1.1.6.2 of
-            ITU-T recommendation V.42.  (See https://www.iso.org/ for
-            ordering ISO documents. See gopher://info.itu.ch for an
-            online version of ITU-T V.42.)
-
-         ISIZE (Input SIZE)
-            This contains the size of the original (uncompressed) input
-            data modulo 2^32.
-
-      2.3.1.1. Extra field
-
-         If the FLG.FEXTRA bit is set, an "extra field" is present in
-         the header, with total length XLEN bytes.  It consists of a
-         series of subfields, each of the form:
-
-            +---+---+---+---+==================================+
-            |SI1|SI2|  LEN  |... LEN bytes of subfield data ...|
-            +---+---+---+---+==================================+
-
-         SI1 and SI2 provide a subfield ID, typically two ASCII letters
-         with some mnemonic value.  Jean-Loup Gailly
-         <gzip@prep.ai.mit.edu> is maintaining a registry of subfield
-         IDs; please send him any subfield ID you wish to use.  Subfield
-         IDs with SI2 = 0 are reserved for future use.  The following
-         IDs are currently defined:
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            SI1         SI2         Data
-            ----------  ----------  ----
-            0x41 ('A')  0x70 ('P')  Apollo file type information
-
-         LEN gives the length of the subfield data, excluding the 4
-         initial bytes.
-
-      2.3.1.2. Compliance
-
-         A compliant compressor must produce files with correct ID1,
-         ID2, CM, CRC32, and ISIZE, but may set all the other fields in
-         the fixed-length part of the header to default values (255 for
-         OS, 0 for all others).  The compressor must set all reserved
-         bits to zero.
-
-         A compliant decompressor must check ID1, ID2, and CM, and
-         provide an error indication if any of these have incorrect
-         values.  It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC
-         at least so it can skip over the optional fields if they are
-         present.  It need not examine any other part of the header or
-         trailer; in particular, a decompressor may ignore FTEXT and OS
-         and always produce binary output, and still be compliant.  A
-         compliant decompressor must give an error indication if any
-         reserved bit is non-zero, since such a bit could indicate the
-         presence of a new field that would cause subsequent data to be
-         interpreted incorrectly.
-
-3. References
-
-   [1] "Information Processing - 8-bit single-byte coded graphic
-       character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987).
-       The ISO 8859-1 (Latin-1) character set is a superset of 7-bit
-       ASCII. Files defining this character set are available as
-       iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/
-
-   [2] ISO 3309
-
-   [3] ITU-T recommendation V.42
-
-   [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in
-       ftp://prep.ai.mit.edu/pub/gnu/
-
-   [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table
-       Look-Up", Communications of the ACM, 31(8), pp.1008-1013.
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal,
-       pp.118-133.
-
-   [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt,
-       describing the CRC concept.
-
-4. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data, such as by
-   setting and checking the CRC-32 check value.
-
-5. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler,
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-6. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-7. Appendix: Jean-Loup Gailly's gzip utility
-
-   The most widely used implementation of gzip compression, and the
-   original documentation on which this specification is based, were
-   created by Jean-Loup Gailly <gzip@prep.ai.mit.edu>.  Since this
-   implementation is a de facto standard, we mention some more of its
-   features here.  Again, the material in this section is not part of
-   the specification per se, and implementations need not follow it to
-   be compliant.
-
-   When compressing or decompressing a file, gzip preserves the
-   protection, ownership, and modification time attributes on the local
-   file system, since there is no provision for representing protection
-   attributes in the gzip file format itself.  Since the file format
-   includes a modification time, the gzip decompressor provides a
-   command line switch that assigns the modification time from the file,
-   rather than the local modification time of the compressed input, to
-   the decompressed output.
-
-8. Appendix: Sample CRC Code
-
-   The following sample code represents a practical implementation of
-   the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42
-   for a formal specification.)
-
-   The sample code is in the ANSI C programming language. Non C users
-   may find it easier to read with these hints:
-
-      &      Bitwise AND operator.
-      ^      Bitwise exclusive-OR operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero
-             bit(s) at the left.
-      !      Logical NOT operator.
-      ++     "n++" increments the variable n.
-      0xNNN  0x introduces a hexadecimal (base 16) constant.
-             Suffix L indicates a long value (at least 32 bits).
-
-      /* Table of CRCs of all 8-bit messages. */
-      unsigned long crc_table[256];
-
-      /* Flag: has the table been computed? Initially false. */
-      int crc_table_computed = 0;
-
-      /* Make the table for a fast CRC. */
-      void make_crc_table(void)
-      {
-        unsigned long c;
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-        int n, k;
-        for (n = 0; n < 256; n++) {
-          c = (unsigned long) n;
-          for (k = 0; k < 8; k++) {
-            if (c & 1) {
-              c = 0xedb88320L ^ (c >> 1);
-            } else {
-              c = c >> 1;
-            }
-          }
-          crc_table[n] = c;
-        }
-        crc_table_computed = 1;
-      }
-
-      /*
-         Update a running crc with the bytes buf[0..len-1] and return
-       the updated crc. The crc should be initialized to zero. Pre- and
-       post-conditioning (one's complement) is performed within this
-       function so it shouldn't be done by the caller. Usage example:
-
-         unsigned long crc = 0L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           crc = update_crc(crc, buffer, length);
-         }
-         if (crc != original_crc) error();
-      */
-      unsigned long update_crc(unsigned long crc,
-                      unsigned char *buf, int len)
-      {
-        unsigned long c = crc ^ 0xffffffffL;
-        int n;
-
-        if (!crc_table_computed)
-          make_crc_table();
-        for (n = 0; n < len; n++) {
-          c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-        }
-        return c ^ 0xffffffffL;
-      }
-
-      /* Return the CRC of the bytes buf[0..len-1]. */
-      unsigned long crc(unsigned char *buf, int len)
-      {
-        return update_crc(0L, buf, len);
-      }
-
-
-
-
-Deutsch                      Informational                     [Page 12]
-

crates/libz-sys/src/zlib-ng/doc/txtvsbin.txt

diff --git a/crates/libz-sys/src/zlib-ng/doc/txtvsbin.txt b/crates/libz-sys/src/zlib-ng/doc/txtvsbin.txt
deleted file mode 100644
index 3d0f063..0000000
--- a/crates/libz-sys/src/zlib-ng/doc/txtvsbin.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-A Fast Method for Identifying Plain Text Files
-==============================================
-
-
-Introduction
-------------
-
-Given a file coming from an unknown source, it is sometimes desirable
-to find out whether the format of that file is plain text.  Although
-this may appear like a simple task, a fully accurate detection of the
-file type requires heavy-duty semantic analysis on the file contents.
-It is, however, possible to obtain satisfactory results by employing
-various heuristics.
-
-Previous versions of PKZip and other zip-compatible compression tools
-were using a crude detection scheme: if more than 80% (4/5) of the bytes
-found in a certain buffer are within the range [7..127], the file is
-labeled as plain text, otherwise it is labeled as binary.  A prominent
-limitation of this scheme is the restriction to Latin-based alphabets.
-Other alphabets, like Greek, Cyrillic or Asian, make extensive use of
-the bytes within the range [128..255], and texts using these alphabets
-are most often misidentified by this scheme; in other words, the rate
-of false negatives is sometimes too high, which means that the recall
-is low.  Another weakness of this scheme is a reduced precision, due to
-the false positives that may occur when binary files containing large
-amounts of textual characters are misidentified as plain text.
-
-In this article we propose a new, simple detection scheme that features
-a much increased precision and a near-100% recall.  This scheme is
-designed to work on ASCII, Unicode and other ASCII-derived alphabets,
-and it handles single-byte encodings (ISO-8859, MacRoman, KOI8, etc.)
-and variable-sized encodings (ISO-2022, UTF-8, etc.).  Wider encodings
-(UCS-2/UTF-16 and UCS-4/UTF-32) are not handled, however.
-
-
-The Algorithm
--------------
-
-The algorithm works by dividing the set of bytecodes [0..255] into three
-categories:
-- The white list of textual bytecodes:
-  9 (TAB), 10 (LF), 13 (CR), 32 (SPACE) to 255.
-- The gray list of tolerated bytecodes:
-  7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB), 27 (ESC).
-- The black list of undesired, non-textual bytecodes:
-  0 (NUL) to 6, 14 to 31.
-
-If a file contains at least one byte that belongs to the white list and
-no byte that belongs to the black list, then the file is categorized as
-plain text; otherwise, it is categorized as binary.  (The boundary case,
-when the file is empty, automatically falls into the latter category.)
-
-
-Rationale
----------
-
-The idea behind this algorithm relies on two observations.
-
-The first observation is that, although the full range of 7-bit codes
-[0..127] is properly specified by the ASCII standard, most control
-characters in the range [0..31] are not used in practice.  The only
-widely-used, almost universally-portable control codes are 9 (TAB),
-10 (LF) and 13 (CR).  There are a few more control codes that are
-recognized on a reduced range of platforms and text viewers/editors:
-7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB) and 27 (ESC); but these
-codes are rarely (if ever) used alone, without being accompanied by
-some printable text.  Even the newer, portable text formats such as
-XML avoid using control characters outside the list mentioned here.
-
-The second observation is that most of the binary files tend to contain
-control characters, especially 0 (NUL).  Even though the older text
-detection schemes observe the presence of non-ASCII codes from the range
-[128..255], the precision rarely has to suffer if this upper range is
-labeled as textual, because the files that are genuinely binary tend to
-contain both control characters and codes from the upper range.  On the
-other hand, the upper range needs to be labeled as textual, because it
-is used by virtually all ASCII extensions.  In particular, this range is
-used for encoding non-Latin scripts.
-
-Since there is no counting involved, other than simply observing the
-presence or the absence of some byte values, the algorithm produces
-consistent results, regardless what alphabet encoding is being used.
-(If counting were involved, it could be possible to obtain different
-results on a text encoded, say, using ISO-8859-16 versus UTF-8.)
-
-There is an extra category of plain text files that are "polluted" with
-one or more black-listed codes, either by mistake or by peculiar design
-considerations.  In such cases, a scheme that tolerates a small fraction
-of black-listed codes would provide an increased recall (i.e. more true
-positives).  This, however, incurs a reduced precision overall, since
-false positives are more likely to appear in binary files that contain
-large chunks of textual data.  Furthermore, "polluted" plain text should
-be regarded as binary by general-purpose text detection schemes, because
-general-purpose text processing algorithms might not be applicable.
-Under this premise, it is safe to say that our detection method provides
-a near-100% recall.
-
-Experiments have been run on many files coming from various platforms
-and applications.  We tried plain text files, system logs, source code,
-formatted office documents, compiled object code, etc.  The results
-confirm the optimistic assumptions about the capabilities of this
-algorithm.
-
-
---
-Cosmin Truta
-Last updated: 2006-May-28

crates/libz-sys/src/zlib-ng/fallback_builtins.h

diff --git a/crates/libz-sys/src/zlib-ng/fallback_builtins.h b/crates/libz-sys/src/zlib-ng/fallback_builtins.h
deleted file mode 100644
index 6ab89c2..0000000
--- a/crates/libz-sys/src/zlib-ng/fallback_builtins.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef FALLBACK_BUILTINS_H
-#define FALLBACK_BUILTINS_H
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) ||  defined(_M_ARM) || defined(_M_ARM64)
-
-#include <intrin.h>
-#ifdef X86_FEATURES
-#  include "arch/x86/x86_features.h"
-#endif
-
-/* This is not a general purpose replacement for __builtin_ctz. The function expects that value is != 0
- * Because of that assumption trailing_zero is not initialized and the return value of _BitScanForward is not checked
- */
-static __forceinline unsigned long __builtin_ctz(uint32_t value) {
-#ifdef X86_FEATURES
-#  ifndef X86_NOCHECK_TZCNT
-    if (x86_cpu_has_tzcnt)
-#  endif
-        return _tzcnt_u32(value);
-#endif
-    unsigned long trailing_zero;
-    _BitScanForward(&trailing_zero, value);
-    return trailing_zero;
-}
-#define HAVE_BUILTIN_CTZ
-
-#ifdef _M_AMD64
-/* This is not a general purpose replacement for __builtin_ctzll. The function expects that value is != 0
- * Because of that assumption trailing_zero is not initialized and the return value of _BitScanForward64 is not checked
- */
-static __forceinline unsigned long long __builtin_ctzll(uint64_t value) {
-#ifdef X86_FEATURES
-#  ifndef X86_NOCHECK_TZCNT
-    if (x86_cpu_has_tzcnt)
-#  endif
-        return _tzcnt_u64(value);
-#endif
-    unsigned long trailing_zero;
-    _BitScanForward64(&trailing_zero, value);
-    return trailing_zero;
-}
-#define HAVE_BUILTIN_CTZLL
-#endif // Microsoft AMD64
-
-#endif // Microsoft AMD64/IA64/x86/ARM/ARM64 test
-#endif // _MSC_VER & !clang
-
-/* Unfortunately GCC didn't support these things until version 10.
- * Similarly, AppleClang didn't support them in Xcode 9.2 but did in 9.3.
- */
-#ifdef __AVX2__
-#include <immintrin.h>
-
-#if (!defined(__clang__) && defined(__GNUC__) && __GNUC__ < 10) \
-    || (defined(__apple_build_version__) && __apple_build_version__ < 9020039)
-static inline __m256i _mm256_zextsi128_si256(__m128i a) {
-    __m128i r;
-    __asm__ volatile ("vmovdqa %1,%0" : "=x" (r) : "x" (a));
-    return _mm256_castsi128_si256(r);
-}
-
-#ifdef __AVX512F__
-static inline __m512i _mm512_zextsi128_si512(__m128i a) {
-    __m128i r;
-    __asm__ volatile ("vmovdqa %1,%0" : "=x" (r) : "x" (a));
-    return _mm512_castsi128_si512(r);
-}
-#endif // __AVX512F__
-#endif // gcc/AppleClang version test
-
-#endif // __AVX2__
-
-#if defined(ARM_NEON_ADLER32) && !defined(__aarch64__)
-/* Compatibility shim for the _high family of functions */
-#define vmull_high_u8(a, b) vmull_u8(vget_high_u8(a), vget_high_u8(b))
-#define vmlal_high_u8(a, b, c) vmlal_u8(a, vget_high_u8(b), vget_high_u8(c))
-#define vmlal_high_u16(a, b, c) vmlal_u16(a, vget_high_u16(b), vget_high_u16(c))
-#define vaddw_high_u8(a, b) vaddw_u8(a, vget_high_u8(b))
-#endif
-
-#ifdef ARM_NEON_SLIDEHASH
-
-#define vqsubq_u16_x4_x1(out, a, b) do { \
-    out.val[0] = vqsubq_u16(a.val[0], b); \
-    out.val[1] = vqsubq_u16(a.val[1], b); \
-    out.val[2] = vqsubq_u16(a.val[2], b); \
-    out.val[3] = vqsubq_u16(a.val[3], b); \
-} while (0)
-
-/* Have to check for hard float ABI on GCC/clang, but not
- * on MSVC (we don't compile for the soft float ABI on windows)
- */
-#if !defined(ARM_NEON_HASLD4) && (defined(__ARM_FP) || defined(_MSC_VER))
-
-#ifdef _M_ARM64
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-
-static inline uint16x8x4_t vld1q_u16_x4(uint16_t *a) {
-    uint16x8x4_t ret = (uint16x8x4_t) {{
-                          vld1q_u16(a),
-                          vld1q_u16(a+8),
-                          vld1q_u16(a+16),
-                          vld1q_u16(a+24)}};
-    return ret;
-}
-
-static inline uint8x16x4_t vld1q_u8_x4(uint8_t *a) {
-    uint8x16x4_t ret = (uint8x16x4_t) {{
-                          vld1q_u8(a),
-                          vld1q_u8(a+16),
-                          vld1q_u8(a+32),
-                          vld1q_u8(a+48)}};
-    return ret;
-}
-
-static inline void vst1q_u16_x4(uint16_t *p, uint16x8x4_t a) {
-    vst1q_u16(p, a.val[0]);
-    vst1q_u16(p + 8, a.val[1]);
-    vst1q_u16(p + 16, a.val[2]);
-    vst1q_u16(p + 24, a.val[3]);
-}
-#endif // HASLD4 check and hard float
-#endif // ARM_NEON_SLIDEHASH
-
-#endif // include guard FALLBACK_BUILTINS_H

crates/libz-sys/src/zlib-ng/functable.c

diff --git a/crates/libz-sys/src/zlib-ng/functable.c b/crates/libz-sys/src/zlib-ng/functable.c
deleted file mode 100644
index dbb8256..0000000
--- a/crates/libz-sys/src/zlib-ng/functable.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/* functable.c -- Choose relevant optimized functions at runtime
- * Copyright (C) 2017 Hans Kristian Rosbach
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zendian.h"
-#include "crc32_braid_p.h"
-#include "deflate.h"
-#include "deflate_p.h"
-
-#include "functable.h"
-
-#include "cpu_features.h"
-
-Z_INTERNAL Z_TLS struct functable_s functable;
-
-/* stub functions */
-Z_INTERNAL uint32_t update_hash_stub(deflate_state *const s, uint32_t h, uint32_t val) {
-    // Initialize default
-
-    functable.update_hash = &update_hash_c;
-    cpu_check_features();
-
-#ifdef X86_SSE42_CRC_HASH
-    if (x86_cpu_has_sse42)
-        functable.update_hash = &update_hash_sse4;
-#elif defined(ARM_ACLE_CRC_HASH)
-    if (arm_cpu_has_crc32)
-        functable.update_hash = &update_hash_acle;
-#endif
-
-    return functable.update_hash(s, h, val);
-}
-
-Z_INTERNAL void insert_string_stub(deflate_state *const s, uint32_t str, uint32_t count) {
-    // Initialize default
-
-    functable.insert_string = &insert_string_c;
-    cpu_check_features();
-
-#ifdef X86_SSE42_CRC_HASH
-    if (x86_cpu_has_sse42)
-        functable.insert_string = &insert_string_sse4;
-#elif defined(ARM_ACLE_CRC_HASH)
-    if (arm_cpu_has_crc32)
-        functable.insert_string = &insert_string_acle;
-#endif
-
-    functable.insert_string(s, str, count);
-}
-
-Z_INTERNAL Pos quick_insert_string_stub(deflate_state *const s, const uint32_t str) {
-    functable.quick_insert_string = &quick_insert_string_c;
-
-#ifdef X86_SSE42_CRC_HASH
-    if (x86_cpu_has_sse42)
-        functable.quick_insert_string = &quick_insert_string_sse4;
-#elif defined(ARM_ACLE_CRC_HASH)
-    if (arm_cpu_has_crc32)
-        functable.quick_insert_string = &quick_insert_string_acle;
-#endif
-
-    return functable.quick_insert_string(s, str);
-}
-
-Z_INTERNAL void slide_hash_stub(deflate_state *s) {
-
-    functable.slide_hash = &slide_hash_c;
-    cpu_check_features();
-
-#ifdef X86_SSE2
-#  if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-#  endif
-        functable.slide_hash = &slide_hash_sse2;
-#elif defined(ARM_NEON_SLIDEHASH)
-#  ifndef ARM_NOCHECK_NEON
-    if (arm_cpu_has_neon)
-#  endif
-        functable.slide_hash = &slide_hash_neon;
-#endif
-#ifdef X86_AVX2
-    if (x86_cpu_has_avx2)
-        functable.slide_hash = &slide_hash_avx2;
-#endif
-#ifdef PPC_VMX_SLIDEHASH
-    if (power_cpu_has_altivec)
-        functable.slide_hash = &slide_hash_vmx;
-#endif
-#ifdef POWER8_VSX_SLIDEHASH
-    if (power_cpu_has_arch_2_07)
-        functable.slide_hash = &slide_hash_power8;
-#endif
-
-    functable.slide_hash(s);
-}
-
-Z_INTERNAL uint32_t longest_match_stub(deflate_state *const s, Pos cur_match) {
-
-#ifdef UNALIGNED_OK
-#  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-    functable.longest_match = &longest_match_unaligned_64;
-#  elif defined(HAVE_BUILTIN_CTZ)
-    functable.longest_match = &longest_match_unaligned_32;
-#  else
-    functable.longest_match = &longest_match_unaligned_16;
-#  endif
-#else
-    functable.longest_match = &longest_match_c;
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_sse2)
-        functable.longest_match = &longest_match_sse2;
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_avx2)
-        functable.longest_match = &longest_match_avx2;
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-    if (arm_cpu_has_neon)
-        functable.longest_match = &longest_match_neon;
-#endif
-#ifdef POWER9
-    if (power_cpu_has_arch_3_00)
-        functable.longest_match = &longest_match_power9;
-#endif
-
-    return functable.longest_match(s, cur_match);
-}
-
-Z_INTERNAL uint32_t longest_match_slow_stub(deflate_state *const s, Pos cur_match) {
-
-#ifdef UNALIGNED_OK
-#  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-    functable.longest_match_slow = &longest_match_slow_unaligned_64;
-#  elif defined(HAVE_BUILTIN_CTZ)
-    functable.longest_match_slow = &longest_match_slow_unaligned_32;
-#  else
-    functable.longest_match_slow = &longest_match_slow_unaligned_16;
-#  endif
-#else
-    functable.longest_match_slow = &longest_match_slow_c;
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_sse2)
-        functable.longest_match_slow = &longest_match_slow_sse2;
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_avx2)
-        functable.longest_match_slow = &longest_match_slow_avx2;
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-    if (arm_cpu_has_neon)
-        functable.longest_match_slow = &longest_match_slow_neon;
-#endif
-#ifdef POWER9
-    if (power_cpu_has_arch_3_00)
-        functable.longest_match_slow = &longest_match_slow_power9;
-#endif
-
-    return functable.longest_match_slow(s, cur_match);
-}
-
-Z_INTERNAL uint32_t adler32_stub(uint32_t adler, const unsigned char *buf, size_t len) {
-    // Initialize default
-    functable.adler32 = &adler32_c;
-    cpu_check_features();
-
-#ifdef ARM_NEON_ADLER32
-#  ifndef ARM_NOCHECK_NEON
-    if (arm_cpu_has_neon)
-#  endif
-        functable.adler32 = &adler32_neon;
-#endif
-#ifdef X86_SSSE3_ADLER32
-    if (x86_cpu_has_ssse3)
-        functable.adler32 = &adler32_ssse3;
-#endif
-#ifdef X86_AVX2_ADLER32
-    if (x86_cpu_has_avx2)
-        functable.adler32 = &adler32_avx2;
-#endif
-#ifdef X86_AVX512_ADLER32
-    if (x86_cpu_has_avx512)
-        functable.adler32 = &adler32_avx512;
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-    if (x86_cpu_has_avx512vnni) {
-        functable.adler32 = &adler32_avx512_vnni;
-    }
-#endif
-#ifdef PPC_VMX_ADLER32
-    if (power_cpu_has_altivec)
-        functable.adler32 = &adler32_vmx;
-#endif
-#ifdef POWER8_VSX_ADLER32
-    if (power_cpu_has_arch_2_07)
-        functable.adler32 = &adler32_power8;
-#endif
-
-    return functable.adler32(adler, buf, len);
-}
-
-Z_INTERNAL uint32_t adler32_fold_copy_stub(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-    functable.adler32_fold_copy = &adler32_fold_copy_c;
-#if (defined X86_SSE42_ADLER32)
-    if (x86_cpu_has_sse42)
-        functable.adler32_fold_copy = &adler32_fold_copy_sse42;
-#endif
-#ifdef X86_AVX2_ADLER32
-    if (x86_cpu_has_avx2)
-        functable.adler32_fold_copy = &adler32_fold_copy_avx2;
-#endif
-#ifdef X86_AVX512_ADLER32
-    if (x86_cpu_has_avx512)
-        functable.adler32_fold_copy = &adler32_fold_copy_avx512;
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-    if (x86_cpu_has_avx512vnni)
-        functable.adler32_fold_copy = &adler32_fold_copy_avx512_vnni;
-#endif
-    return functable.adler32_fold_copy(adler, dst, src, len);
-}
-
-Z_INTERNAL uint32_t crc32_fold_reset_stub(crc32_fold *crc) {
-    functable.crc32_fold_reset = &crc32_fold_reset_c;
-    cpu_check_features();
-#ifdef X86_PCLMULQDQ_CRC
-    if (x86_cpu_has_pclmulqdq)
-        functable.crc32_fold_reset = &crc32_fold_reset_pclmulqdq;
-#endif
-    return functable.crc32_fold_reset(crc);
-}
-
-Z_INTERNAL void crc32_fold_copy_stub(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len) {
-    functable.crc32_fold_copy = &crc32_fold_copy_c;
-    cpu_check_features();
-#ifdef X86_PCLMULQDQ_CRC
-    if (x86_cpu_has_pclmulqdq)
-        functable.crc32_fold_copy = &crc32_fold_copy_pclmulqdq;
-#endif
-    functable.crc32_fold_copy(crc, dst, src, len);
-}
-
-Z_INTERNAL void crc32_fold_stub(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc) {
-    functable.crc32_fold = &crc32_fold_c;
-    cpu_check_features();
-#ifdef X86_PCLMULQDQ_CRC
-    if (x86_cpu_has_pclmulqdq)
-        functable.crc32_fold = &crc32_fold_pclmulqdq;
-#endif
-    functable.crc32_fold(crc, src, len, init_crc);
-}
-
-Z_INTERNAL uint32_t crc32_fold_final_stub(crc32_fold *crc) {
-    functable.crc32_fold_final = &crc32_fold_final_c;
-    cpu_check_features();
-#ifdef X86_PCLMULQDQ_CRC
-    if (x86_cpu_has_pclmulqdq)
-        functable.crc32_fold_final = &crc32_fold_final_pclmulqdq;
-#endif
-    return functable.crc32_fold_final(crc);
-}
-
-Z_INTERNAL uint32_t chunksize_stub(void) {
-    // Initialize default
-    functable.chunksize = &chunksize_c;
-    cpu_check_features();
-
-#ifdef X86_SSE2_CHUNKSET
-# if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-# endif
-        functable.chunksize = &chunksize_sse2;
-#endif
-#ifdef X86_AVX_CHUNKSET
-    if (x86_cpu_has_avx2)
-        functable.chunksize = &chunksize_avx;
-#endif
-#ifdef ARM_NEON_CHUNKSET
-    if (arm_cpu_has_neon)
-        functable.chunksize = &chunksize_neon;
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-    if (power_cpu_has_arch_2_07)
-        functable.chunksize = &chunksize_power8;
-#endif
-
-    return functable.chunksize();
-}
-
-Z_INTERNAL uint8_t* chunkcopy_stub(uint8_t *out, uint8_t const *from, unsigned len) {
-    // Initialize default
-    functable.chunkcopy = &chunkcopy_c;
-
-#ifdef X86_SSE2_CHUNKSET
-# if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-# endif
-        functable.chunkcopy = &chunkcopy_sse2;
-#endif
-#ifdef X86_AVX_CHUNKSET
-    if (x86_cpu_has_avx2)
-        functable.chunkcopy = &chunkcopy_avx;
-#endif
-#ifdef ARM_NEON_CHUNKSET
-    if (arm_cpu_has_neon)
-        functable.chunkcopy = &chunkcopy_neon;
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-    if (power_cpu_has_arch_2_07)
-        functable.chunkcopy = &chunkcopy_power8;
-#endif
-
-    return functable.chunkcopy(out, from, len);
-}
-
-Z_INTERNAL uint8_t* chunkunroll_stub(uint8_t *out, unsigned *dist, unsigned *len) {
-    // Initialize default
-    functable.chunkunroll = &chunkunroll_c;
-
-#ifdef X86_SSE2_CHUNKSET
-# if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-# endif
-        functable.chunkunroll = &chunkunroll_sse2;
-#endif
-#ifdef X86_AVX_CHUNKSET
-    if (x86_cpu_has_avx2)
-        functable.chunkunroll = &chunkunroll_avx;
-#endif
-#ifdef ARM_NEON_CHUNKSET
-    if (arm_cpu_has_neon)
-        functable.chunkunroll = &chunkunroll_neon;
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-    if (power_cpu_has_arch_2_07)
-        functable.chunkunroll = &chunkunroll_power8;
-#endif
-
-    return functable.chunkunroll(out, dist, len);
-}
-
-Z_INTERNAL uint8_t* chunkmemset_stub(uint8_t *out, unsigned dist, unsigned len) {
-    // Initialize default
-    functable.chunkmemset = &chunkmemset_c;
-
-#ifdef X86_SSE2_CHUNKSET
-# if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-# endif
-        functable.chunkmemset = &chunkmemset_sse2;
-#endif
-#if defined(X86_SSE41) && defined(X86_SSE2)
-    if (x86_cpu_has_sse41)
-        functable.chunkmemset = &chunkmemset_sse41;
-#endif
-#ifdef X86_AVX_CHUNKSET
-    if (x86_cpu_has_avx2)
-        functable.chunkmemset = &chunkmemset_avx;
-#endif
-#ifdef ARM_NEON_CHUNKSET
-    if (arm_cpu_has_neon)
-        functable.chunkmemset = &chunkmemset_neon;
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-    if (power_cpu_has_arch_2_07)
-        functable.chunkmemset = &chunkmemset_power8;
-#endif
-
-
-    return functable.chunkmemset(out, dist, len);
-}
-
-Z_INTERNAL uint8_t* chunkmemset_safe_stub(uint8_t *out, unsigned dist, unsigned len, unsigned left) {
-    // Initialize default
-    functable.chunkmemset_safe = &chunkmemset_safe_c;
-
-#ifdef X86_SSE2_CHUNKSET
-# if !defined(__x86_64__) && !defined(_M_X64) && !defined(X86_NOCHECK_SSE2)
-    if (x86_cpu_has_sse2)
-# endif
-        functable.chunkmemset_safe = &chunkmemset_safe_sse2;
-#endif
-#if defined(X86_SSE41) && defined(X86_SSE2)
-    if (x86_cpu_has_sse41)
-        functable.chunkmemset_safe = &chunkmemset_safe_sse41;
-#endif
-#ifdef X86_AVX_CHUNKSET
-    if (x86_cpu_has_avx2)
-        functable.chunkmemset_safe = &chunkmemset_safe_avx;
-#endif
-#ifdef ARM_NEON_CHUNKSET
-    if (arm_cpu_has_neon)
-        functable.chunkmemset_safe = &chunkmemset_safe_neon;
-#endif
-#ifdef POWER8_VSX_CHUNKSET
-    if (power_cpu_has_arch_2_07)
-        functable.chunkmemset_safe = &chunkmemset_safe_power8;
-#endif
-
-    return functable.chunkmemset_safe(out, dist, len, left);
-}
-
-Z_INTERNAL uint32_t crc32_stub(uint32_t crc, const unsigned char *buf, uint64_t len) {
-    Assert(sizeof(uint64_t) >= sizeof(size_t),
-           "crc32_z takes size_t but internally we have a uint64_t len");
-
-    functable.crc32 = &crc32_braid;
-    cpu_check_features();
-#ifdef ARM_ACLE_CRC_HASH
-    if (arm_cpu_has_crc32)
-        functable.crc32 = &crc32_acle;
-#elif defined(POWER8_VSX_CRC32)
-    if (power_cpu_has_arch_2_07)
-        functable.crc32 = &crc32_power8;
-#elif defined(S390_CRC32_VX)
-    if (PREFIX(s390_cpu_has_vx))
-        functable.crc32 = &PREFIX(s390_crc32_vx);
-#elif defined(X86_PCLMULQDQ_CRC)
-    if (x86_cpu_has_pclmulqdq)
-        functable.crc32 = &crc32_pclmulqdq;
-#endif
-
-    return functable.crc32(crc, buf, len);
-}
-
-Z_INTERNAL uint32_t compare256_stub(const uint8_t *src0, const uint8_t *src1) {
-
-#ifdef UNALIGNED_OK
-#  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-    functable.compare256 = &compare256_unaligned_64;
-#  elif defined(HAVE_BUILTIN_CTZ)
-    functable.compare256 = &compare256_unaligned_32;
-#  else
-    functable.compare256 = &compare256_unaligned_16;
-#  endif
-#else
-    functable.compare256 = &compare256_c;
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_sse2)
-        functable.compare256 = &compare256_sse2;
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-    if (x86_cpu_has_avx2)
-        functable.compare256 = &compare256_avx2;
-#endif
-#ifdef POWER9
-    if (power_cpu_has_arch_3_00)
-        functable.compare256 = &compare256_power9;
-#endif
-
-    return functable.compare256(src0, src1);
-}
-
-/* functable init */
-Z_INTERNAL Z_TLS struct functable_s functable = {
-    adler32_stub,
-    adler32_fold_copy_stub,
-    crc32_stub,
-    crc32_fold_reset_stub,
-    crc32_fold_copy_stub,
-    crc32_fold_stub,
-    crc32_fold_final_stub,
-    compare256_stub,
-    chunksize_stub,
-    chunkcopy_stub,
-    chunkunroll_stub,
-    chunkmemset_stub,
-    chunkmemset_safe_stub,
-    insert_string_stub,
-    longest_match_stub,
-    longest_match_slow_stub,
-    quick_insert_string_stub,
-    slide_hash_stub,
-    update_hash_stub
-};

crates/libz-sys/src/zlib-ng/functable.h

diff --git a/crates/libz-sys/src/zlib-ng/functable.h b/crates/libz-sys/src/zlib-ng/functable.h
deleted file mode 100644
index da7726e..0000000
--- a/crates/libz-sys/src/zlib-ng/functable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* functable.h -- Struct containing function pointers to optimized functions
- * Copyright (C) 2017 Hans Kristian Rosbach
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef FUNCTABLE_H_
-#define FUNCTABLE_H_
-
-#include "deflate.h"
-#include "crc32_fold.h"
-#include "adler32_fold.h"
-
-struct functable_s {
-    uint32_t (* adler32)            (uint32_t adler, const unsigned char *buf, size_t len);
-    uint32_t (* adler32_fold_copy)  (uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
-    uint32_t (* crc32)              (uint32_t crc, const unsigned char *buf, uint64_t len);
-    uint32_t (* crc32_fold_reset)   (crc32_fold *crc);
-    void     (* crc32_fold_copy)    (crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len);
-    void     (* crc32_fold)         (crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc);
-    uint32_t (* crc32_fold_final)   (crc32_fold *crc);
-    uint32_t (* compare256)         (const uint8_t *src0, const uint8_t *src1);
-    uint32_t (* chunksize)          (void);
-    uint8_t* (* chunkcopy)          (uint8_t *out, uint8_t const *from, unsigned len);
-    uint8_t* (* chunkunroll)        (uint8_t *out, unsigned *dist, unsigned *len);
-    uint8_t* (* chunkmemset)        (uint8_t *out, unsigned dist, unsigned len);
-    uint8_t* (* chunkmemset_safe)   (uint8_t *out, unsigned dist, unsigned len, unsigned left);
-    void     (* insert_string)      (deflate_state *const s, uint32_t str, uint32_t count);
-    uint32_t (* longest_match)      (deflate_state *const s, Pos cur_match);
-    uint32_t (* longest_match_slow) (deflate_state *const s, Pos cur_match);
-    Pos      (* quick_insert_string)(deflate_state *const s, uint32_t str);
-    void     (* slide_hash)         (deflate_state *s);
-    uint32_t (* update_hash)        (deflate_state *const s, uint32_t h, uint32_t val);
-};
-
-Z_INTERNAL extern Z_TLS struct functable_s functable;
-
-#endif

crates/libz-sys/src/zlib-ng/gzguts.h

diff --git a/crates/libz-sys/src/zlib-ng/gzguts.h b/crates/libz-sys/src/zlib-ng/gzguts.h
deleted file mode 100644
index 7db7099..0000000
--- a/crates/libz-sys/src/zlib-ng/gzguts.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef GZGUTS_H_
-#define GZGUTS_H_
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef _LARGEFILE64_SOURCE
-#  ifndef _LARGEFILE_SOURCE
-#    define _LARGEFILE_SOURCE 1
-#  endif
-#  ifdef _FILE_OFFSET_BITS
-#    undef _FILE_OFFSET_BITS
-#  endif
-#endif
-
-#if defined(HAVE_VISIBILITY_INTERNAL)
-#  define Z_INTERNAL __attribute__((visibility ("internal")))
-#elif defined(HAVE_VISIBILITY_HIDDEN)
-#  define Z_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define Z_INTERNAL
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <fcntl.h>
-
-#if defined(ZLIB_COMPAT)
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#ifdef _WIN32
-#  include <stddef.h>
-#endif
-
-#if defined(_WIN32)
-#  include <io.h>
-#  define WIDECHAR
-#endif
-
-#ifdef WINAPI_FAMILY
-#  define open _open
-#  define read _read
-#  define write _write
-#  define close _close
-#endif
-
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#if !defined(STDC99) && !defined(__CYGWIN__) && !defined(__MINGW__) && defined(_WIN32)
-#  if !defined(vsnprintf)
-#    if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#       define vsnprintf _vsnprintf
-#    endif
-#  endif
-#endif
-
-/* unlike snprintf (which is required in C99), _snprintf does not guarantee
-   null termination of the result -- however this is only used in gzlib.c
-   where the result is assured to fit in the space provided */
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-/* get errno and strerror definition */
-#ifndef NO_STRERROR
-#  include <errno.h>
-#  define zstrerror() strerror(errno)
-#else
-#  define zstrerror() "stdio error (consult errno)"
-#endif
-
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-
-/* default i/o buffer size -- double this for output when reading (this and
-   twice this must be able to fit in an unsigned type) */
-#ifndef GZBUFSIZE
-#  define GZBUFSIZE 131072
-#endif
-
-/* gzip modes, also provide a little integrity check on the passed structure */
-#define GZ_NONE 0
-#define GZ_READ 7247
-#define GZ_WRITE 31153
-#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
-
-/* values for gz_state how */
-#define LOOK 0      /* look for a gzip header */
-#define COPY 1      /* copy input directly */
-#define GZIP 2      /* decompress a gzip stream */
-
-/* internal gzip file state data structure */
-typedef struct {
-        /* exposed contents for gzgetc() macro */
-    struct gzFile_s x;      /* "x" for exposed */
-                            /* x.have: number of bytes available at x.next */
-                            /* x.next: next output data to deliver or write */
-                            /* x.pos: current position in uncompressed data */
-        /* used for both reading and writing */
-    int mode;               /* see gzip modes above */
-    int fd;                 /* file descriptor */
-    char *path;             /* path or fd for error messages */
-    unsigned size;          /* buffer size, zero if not allocated yet */
-    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
-    unsigned char *in;      /* input buffer (double-sized when writing) */
-    unsigned char *out;     /* output buffer (double-sized when reading) */
-    int direct;             /* 0 if processing gzip, 1 if transparent */
-        /* just for reading */
-    int how;                /* 0: get header, 1: copy, 2: decompress */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
-    int eof;                /* true if end of input file reached */
-    int past;               /* true if read requested past end */
-        /* just for writing */
-    int level;              /* compression level */
-    int strategy;           /* compression strategy */
-    int reset;              /* true if a reset is pending after a Z_FINISH */
-        /* seek request */
-    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
-    int seek;               /* true if seek request pending */
-        /* error information */
-    int err;                /* error code */
-    char *msg;              /* error message */
-        /* zlib inflate or deflate stream */
-    PREFIX3(stream) strm;  /* stream structure in-place (not a pointer) */
-} gz_state;
-typedef gz_state *gz_statep;
-
-/* shared functions */
-void Z_INTERNAL gz_error(gz_state *, int, const char *);
-
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
-   value -- needed when comparing unsigned to z_off64_t, which is signed
-   (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-
-#endif /* GZGUTS_H_ */

crates/libz-sys/src/zlib-ng/gzlib.c

diff --git a/crates/libz-sys/src/zlib-ng/gzlib.c b/crates/libz-sys/src/zlib-ng/gzlib.c
deleted file mode 100644
index c192840..0000000
--- a/crates/libz-sys/src/zlib-ng/gzlib.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil_p.h"
-#include "gzguts.h"
-
-#if defined(_WIN32)
-#  define LSEEK _lseeki64
-#else
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define LSEEK lseek64
-#else
-#  define LSEEK lseek
-#endif
-#endif
-
-/* Local functions */
-static void gz_reset(gz_state *);
-static gzFile gz_open(const void *, int, const char *);
-
-/* Reset gzip file state */
-static void gz_reset(gz_state *state) {
-    state->x.have = 0;              /* no output data available */
-    if (state->mode == GZ_READ) {   /* for reading ... */
-        state->eof = 0;             /* not at end of file */
-        state->past = 0;            /* have not read past end yet */
-        state->how = LOOK;          /* look for gzip header */
-    }
-    else                            /* for writing ... */
-        state->reset = 0;           /* no deflateReset pending */
-    state->seek = 0;                /* no seek request pending */
-    gz_error(state, Z_OK, NULL);    /* clear error */
-    state->x.pos = 0;               /* no uncompressed data yet */
-    state->strm.avail_in = 0;       /* no input data yet */
-}
-
-/* Open a gzip file either by name or file descriptor. */
-static gzFile gz_open(const void *path, int fd, const char *mode) {
-    gz_state *state;
-    size_t len;
-    int oflag;
-#ifdef O_CLOEXEC
-    int cloexec = 0;
-#endif
-#ifdef O_EXCL
-    int exclusive = 0;
-#endif
-
-    /* check input */
-    if (path == NULL)
-        return NULL;
-
-    /* allocate gzFile structure to return */
-    state = (gz_state *)zng_alloc(sizeof(gz_state));
-    if (state == NULL)
-        return NULL;
-    state->size = 0;            /* no buffers allocated yet */
-    state->want = GZBUFSIZE;    /* requested buffer size */
-    state->msg = NULL;          /* no error message yet */
-
-    /* interpret mode */
-    state->mode = GZ_NONE;
-    state->level = Z_DEFAULT_COMPRESSION;
-    state->strategy = Z_DEFAULT_STRATEGY;
-    state->direct = 0;
-    while (*mode) {
-        if (*mode >= '0' && *mode <= '9') {
-            state->level = *mode - '0';
-        } else {
-            switch (*mode) {
-            case 'r':
-                state->mode = GZ_READ;
-                break;
-#ifndef NO_GZCOMPRESS
-            case 'w':
-                state->mode = GZ_WRITE;
-                break;
-            case 'a':
-                state->mode = GZ_APPEND;
-                break;
-#endif
-            case '+':       /* can't read and write at the same time */
-                zng_free(state);
-                return NULL;
-            case 'b':       /* ignore -- will request binary anyway */
-                break;
-#ifdef O_CLOEXEC
-            case 'e':
-                cloexec = 1;
-                break;
-#endif
-#ifdef O_EXCL
-            case 'x':
-                exclusive = 1;
-                break;
-#endif
-            case 'f':
-                state->strategy = Z_FILTERED;
-                break;
-            case 'h':
-                state->strategy = Z_HUFFMAN_ONLY;
-                break;
-            case 'R':
-                state->strategy = Z_RLE;
-                break;
-            case 'F':
-                state->strategy = Z_FIXED;
-                break;
-            case 'T':
-                state->direct = 1;
-                break;
-            default:        /* could consider as an error, but just ignore */
-                {}
-            }
-        }
-        mode++;
-    }
-
-    /* must provide an "r", "w", or "a" */
-    if (state->mode == GZ_NONE) {
-        zng_free(state);
-        return NULL;
-    }
-
-    /* can't force transparent read */
-    if (state->mode == GZ_READ) {
-        if (state->direct) {
-            zng_free(state);
-            return NULL;
-        }
-        state->direct = 1;      /* for empty file */
-    }
-
-    /* save the path name for error messages */
-#ifdef WIDECHAR
-    if (fd == -2) {
-        len = wcstombs(NULL, (const wchar_t *)path, 0);
-        if (len == (size_t)-1)
-            len = 0;
-    } else
-#endif
-        len = strlen((const char *)path);
-    state->path = (char *)malloc(len + 1);
-    if (state->path == NULL) {
-        zng_free(state);
-        return NULL;
-    }
-#ifdef WIDECHAR
-    if (fd == -2)
-        if (len) {
-            wcstombs(state->path, (const wchar_t *)path, len + 1);
-        } else {
-            *(state->path) = 0;
-        }
-    else
-#endif
-        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
-
-    /* compute the flags for open() */
-    oflag =
-#ifdef O_LARGEFILE
-        O_LARGEFILE |
-#endif
-#ifdef O_BINARY
-        O_BINARY |
-#endif
-#ifdef O_CLOEXEC
-        (cloexec ? O_CLOEXEC : 0) |
-#endif
-        (state->mode == GZ_READ ?
-         O_RDONLY :
-         (O_WRONLY | O_CREAT |
-#ifdef O_EXCL
-          (exclusive ? O_EXCL : 0) |
-#endif
-          (state->mode == GZ_WRITE ?
-           O_TRUNC :
-           O_APPEND)));
-
-    /* open the file with the appropriate flags (or just use fd) */
-    state->fd = fd > -1 ? fd : (
-#if defined(_WIN32)
-        fd == -2 ? _wopen((const wchar_t *)path, oflag, 0666) :
-#elif __CYGWIN__
-        fd == -2 ? open(state->path, oflag, 0666) :
-#endif
-        open((const char *)path, oflag, 0666));
-    if (state->fd == -1) {
-        free(state->path);
-        zng_free(state);
-        return NULL;
-    }
-    if (state->mode == GZ_APPEND) {
-        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
-        state->mode = GZ_WRITE;         /* simplify later checks */
-    }
-
-    /* save the current position for rewinding (only if reading) */
-    if (state->mode == GZ_READ) {
-        state->start = LSEEK(state->fd, 0, SEEK_CUR);
-        if (state->start == -1) state->start = 0;
-    }
-
-    /* initialize stream */
-    gz_reset(state);
-
-    /* return stream */
-    return (gzFile)state;
-}
-
-/* -- see zlib.h -- */
-gzFile Z_EXPORT PREFIX(gzopen)(const char *path, const char *mode) {
-    return gz_open(path, -1, mode);
-}
-
-#ifdef ZLIB_COMPAT
-gzFile Z_EXPORT PREFIX4(gzopen)(const char *path, const char *mode) {
-    return gz_open(path, -1, mode);
-}
-#endif
-
-/* -- see zlib.h -- */
-gzFile Z_EXPORT PREFIX(gzdopen)(int fd, const char *mode) {
-    char *path;         /* identifier for error messages */
-    gzFile gz;
-
-    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
-        return NULL;
-    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
-    gz = gz_open(path, fd, mode);
-    free(path);
-    return gz;
-}
-
-/* -- see zlib.h -- */
-#ifdef WIDECHAR
-gzFile Z_EXPORT PREFIX(gzopen_w)(const wchar_t *path, const char *mode) {
-    return gz_open(path, -2, mode);
-}
-#endif
-
-int Z_EXPORT PREFIX(gzclose)(gzFile file) {
-#ifndef NO_GZCOMPRESS
-    gz_state *state;
-
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_state *)file;
-
-    return state->mode == GZ_READ ? PREFIX(gzclose_r)(file) : PREFIX(gzclose_w)(file);
-#else
-    return PREFIX(gzclose_r)(file);
-#endif
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzbuffer)(gzFile file, unsigned size) {
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* make sure we haven't already allocated memory */
-    if (state->size != 0)
-        return -1;
-
-    /* check and set requested size */
-    if ((size << 1) < size)
-        return -1;              /* need to be able to double it */
-    if (size < 2)
-        size = 2;               /* need two bytes to check magic header */
-    state->want = size;
-    return 0;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzrewind)(gzFile file) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* back up and start over */
-    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
-        return -1;
-    gz_reset(state);
-    return 0;
-}
-
-/* -- see zlib.h -- */
-z_off64_t Z_EXPORT PREFIX4(gzseek)(gzFile file, z_off64_t offset, int whence) {
-    unsigned n;
-    z_off64_t ret;
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* check that there's no error */
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* can only seek from start or relative to current position */
-    if (whence != SEEK_SET && whence != SEEK_CUR)
-        return -1;
-
-    /* normalize offset to a SEEK_CUR specification */
-    if (whence == SEEK_SET)
-        offset -= state->x.pos;
-    else if (state->seek)
-        offset += state->skip;
-    state->seek = 0;
-
-    /* if within raw area while reading, just go there */
-    if (state->mode == GZ_READ && state->how == COPY && state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
-        if (ret == -1)
-            return -1;
-        state->x.have = 0;
-        state->eof = 0;
-        state->past = 0;
-        state->seek = 0;
-        gz_error(state, Z_OK, NULL);
-        state->strm.avail_in = 0;
-        state->x.pos += offset;
-        return state->x.pos;
-    }
-
-    /* calculate skip amount, rewinding if needed for back seek when reading */
-    if (offset < 0) {
-        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
-            return -1;
-        offset += state->x.pos;
-        if (offset < 0)                     /* before start of file! */
-            return -1;
-        if (PREFIX(gzrewind)(file) == -1)   /* rewind, then skip to offset */
-            return -1;
-    }
-
-    /* if reading, skip what's in output buffer (one less gzgetc() check) */
-    if (state->mode == GZ_READ) {
-        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ? (unsigned)offset : state->x.have;
-        state->x.have -= n;
-        state->x.next += n;
-        state->x.pos += n;
-        offset -= n;
-    }
-
-    /* request skip (if not zero) */
-    if (offset) {
-        state->seek = 1;
-        state->skip = offset;
-    }
-    return state->x.pos + offset;
-}
-
-/* -- see zlib.h -- */
-#ifdef ZLIB_COMPAT
-z_off_t Z_EXPORT PREFIX(gzseek)(gzFile file, z_off_t offset, int whence) {
-    z_off64_t ret;
-
-    ret = PREFIX4(gzseek)(file, (z_off64_t)offset, whence);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-#endif
-
-/* -- see zlib.h -- */
-z_off64_t Z_EXPORT PREFIX4(gztell)(gzFile file) {
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* return position */
-    return state->x.pos + (state->seek ? state->skip : 0);
-}
-
-/* -- see zlib.h -- */
-#ifdef ZLIB_COMPAT
-z_off_t Z_EXPORT PREFIX(gztell)(gzFile file) {
-
-    z_off64_t ret;
-
-    ret = PREFIX4(gztell)(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-#endif
-
-/* -- see zlib.h -- */
-z_off64_t Z_EXPORT PREFIX4(gzoffset)(gzFile file) {
-    z_off64_t offset;
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* compute and return effective offset in file */
-    offset = LSEEK(state->fd, 0, SEEK_CUR);
-    if (offset == -1)
-        return -1;
-    if (state->mode == GZ_READ)             /* reading */
-        offset -= state->strm.avail_in;     /* don't count buffered input */
-    return offset;
-}
-
-/* -- see zlib.h -- */
-#ifdef ZLIB_COMPAT
-z_off_t Z_EXPORT PREFIX(gzoffset)(gzFile file) {
-    z_off64_t ret;
-
-    ret = PREFIX4(gzoffset)(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-#endif
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzeof)(gzFile file) {
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return 0;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return 0;
-
-    /* return end-of-file state */
-    return state->mode == GZ_READ ? state->past : 0;
-}
-
-/* -- see zlib.h -- */
-const char * Z_EXPORT PREFIX(gzerror)(gzFile file, int *errnum) {
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return NULL;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return NULL;
-
-    /* return error information */
-    if (errnum != NULL)
-        *errnum = state->err;
-    return state->err == Z_MEM_ERROR ? "out of memory" : (state->msg == NULL ? "" : state->msg);
-}
-
-/* -- see zlib.h -- */
-void Z_EXPORT PREFIX(gzclearerr)(gzFile file) {
-    gz_state *state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return;
-    state = (gz_state *)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return;
-
-    /* clear error and end-of-file */
-    if (state->mode == GZ_READ) {
-        state->eof = 0;
-        state->past = 0;
-    }
-    gz_error(state, Z_OK, NULL);
-}
-
-/* Create an error message in allocated memory and set state->err and
-   state->msg accordingly.  Free any previous error message already there.  Do
-   not try to free or allocate space if the error is Z_MEM_ERROR (out of
-   memory).  Simply save the error message as a static string.  If there is an
-   allocation failure constructing the error message, then convert the error to
-   out of memory. */
-void Z_INTERNAL gz_error(gz_state *state, int err, const char *msg) {
-    /* free previously allocated message and clear */
-    if (state->msg != NULL) {
-        if (state->err != Z_MEM_ERROR)
-            free(state->msg);
-        state->msg = NULL;
-    }
-
-    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-    if (err != Z_OK && err != Z_BUF_ERROR)
-        state->x.have = 0;
-
-    /* set error code, and if no message, then done */
-    state->err = err;
-    if (msg == NULL)
-        return;
-
-    /* for an out of memory error, return literal string when requested */
-    if (err == Z_MEM_ERROR)
-        return;
-
-    /* construct error message with path */
-    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
-        state->err = Z_MEM_ERROR;
-        return;
-    }
-    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, "%s%s%s", state->path, ": ", msg);
-}

crates/libz-sys/src/zlib-ng/gzread.c.in

diff --git a/crates/libz-sys/src/zlib-ng/gzread.c.in b/crates/libz-sys/src/zlib-ng/gzread.c.in
deleted file mode 100644
index 3e1dc1d..0000000
--- a/crates/libz-sys/src/zlib-ng/gzread.c.in
+++ /dev/null
@@ -1,602 +0,0 @@
-/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil_p.h"
-#include "gzguts.h"
-
-/* Local functions */
-static int gz_load(gz_state *, unsigned char *, unsigned, unsigned *);
-static int gz_avail(gz_state *);
-static int gz_look(gz_state *);
-static int gz_decomp(gz_state *);
-static int gz_fetch(gz_state *);
-static int gz_skip(gz_state *, z_off64_t);
-static size_t gz_read(gz_state *, void *, size_t);
-
-/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
-   state->fd, and update state->eof, state->err, and state->msg as appropriate.
-   This function needs to loop on read(), since read() is not guaranteed to
-   read the number of bytes requested, depending on the type of descriptor. */
-static int gz_load(gz_state *state, unsigned char *buf, unsigned len, unsigned *have) {
-    ssize_t ret;
-
-    *have = 0;
-    do {
-        ret = read(state->fd, buf + *have, len - *have);
-        if (ret <= 0)
-            break;
-        *have += (unsigned)ret;
-    } while (*have < len);
-    if (ret < 0) {
-        gz_error(state, Z_ERRNO, zstrerror());
-        return -1;
-    }
-    if (ret == 0)
-        state->eof = 1;
-    return 0;
-}
-
-/* Load up input buffer and set eof flag if last data loaded -- return -1 on
-   error, 0 otherwise.  Note that the eof flag is set when the end of the input
-   file is reached, even though there may be unused data in the buffer.  Once
-   that data has been used, no more attempts will be made to read the file.
-   If strm->avail_in != 0, then the current data is moved to the beginning of
-   the input buffer, and then the remainder of the buffer is loaded with the
-   available data from the input file. */
-static int gz_avail(gz_state *state) {
-    unsigned got;
-    PREFIX3(stream) *strm = &(state->strm);
-
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-    if (state->eof == 0) {
-        if (strm->avail_in) {       /* copy what's there to the start */
-            unsigned char *p = state->in;
-            unsigned const char *q = strm->next_in;
-            unsigned n = strm->avail_in;
-            do {
-                *p++ = *q++;
-            } while (--n);
-        }
-        if (gz_load(state, state->in + strm->avail_in, state->size - strm->avail_in, &got) == -1)
-            return -1;
-        strm->avail_in += got;
-        strm->next_in = state->in;
-    }
-    return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
-   If this is the first time in, allocate required memory.  state->how will be
-   left unchanged if there is no more input data available, will be set to COPY
-   if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression.  If direct copying, then leftover input
-   data from the input buffer will be copied to the output buffer.  In that
-   case, all further file reads will be directly to either the output buffer or
-   a user buffer.  If decompressing, the inflate state will be initialized.
-   gz_look() will return 0 on success or -1 on failure. */
-static int gz_look(gz_state *state) {
-    PREFIX3(stream) *strm = &(state->strm);
-
-    /* allocate read buffers and inflate memory */
-    if (state->size == 0) {
-        /* allocate buffers */
-        state->in = (unsigned char *)zng_alloc(state->want);
-        state->out = (unsigned char *)zng_alloc(state->want << 1);
-        if (state->in == NULL || state->out == NULL) {
-            zng_free(state->out);
-            zng_free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        state->size = state->want;
-
-        /* allocate inflate memory */
-        state->strm.zalloc = NULL;
-        state->strm.zfree = NULL;
-        state->strm.opaque = NULL;
-        state->strm.avail_in = 0;
-        state->strm.next_in = NULL;
-        if (PREFIX(inflateInit2)(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
-            zng_free(state->out);
-            zng_free(state->in);
-            state->size = 0;
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-    }
-
-    /* get at least the magic bytes in the input buffer */
-    if (strm->avail_in < 2) {
-        if (gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0)
-            return 0;
-    }
-
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
-       a logical dilemma here when considering the case of a partially written
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell
-       whether this is a single-byte file, or just a partially written gzip
-       file -- for here we assume that if a gzip file is being written, then
-       the header will be written in a single operation, so that reading a
-       single byte is sufficient indication that it is not a gzip file) */
-    if (strm->avail_in > 1 &&
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
-        PREFIX(inflateReset)(strm);
-        state->how = GZIP;
-        state->direct = 0;
-        return 0;
-    }
-
-    /* no gzip header -- if we were decoding gzip before, then this is trailing
-       garbage.  Ignore the trailing garbage and finish. */
-    if (state->direct == 0) {
-        strm->avail_in = 0;
-        state->eof = 1;
-        state->x.have = 0;
-        return 0;
-    }
-
-    /* doing raw i/o, copy any leftover input to output -- this assumes that
-       the output buffer is larger than the input buffer, which also assures
-       space for gzungetc() */
-    state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
-    state->how = COPY;
-    state->direct = 1;
-    return 0;
-}
-
-/* Decompress from input to the provided next_out and avail_out in the state.
-   On return, state->x.have and state->x.next point to the just decompressed
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
-   on success, -1 on failure. */
-static int gz_decomp(gz_state *state) {
-    int ret = Z_OK;
-    unsigned had;
-    PREFIX3(stream) *strm = &(state->strm);
-
-    /* fill output buffer up to end of deflate stream */
-    had = strm->avail_out;
-    do {
-        /* get more input for inflate() */
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0) {
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
-            break;
-        }
-
-        /* decompress and handle errors */
-        ret = PREFIX(inflate)(strm, Z_NO_FLUSH);
-        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
-            gz_error(state, Z_STREAM_ERROR, "internal error: inflate stream corrupt");
-            return -1;
-        }
-        if (ret == Z_MEM_ERROR) {
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
-            gz_error(state, Z_DATA_ERROR, strm->msg == NULL ? "compressed data error" : strm->msg);
-            return -1;
-        }
-    } while (strm->avail_out && ret != Z_STREAM_END);
-
-    /* update available output */
-    state->x.have = had - strm->avail_out;
-    state->x.next = strm->next_out - state->x.have;
-
-    /* if the gzip stream completed successfully, look for another */
-    if (ret == Z_STREAM_END)
-        state->how = LOOK;
-
-    /* good decompression */
-    return 0;
-}
-
-/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
-   Data is either copied from the input file or decompressed from the input
-   file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for to determine whether to copy or decompress.  Returns -1 on error,
-   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
-   end of the input file has been reached and all data has been processed.  */
-static int gz_fetch(gz_state *state) {
-    PREFIX3(stream) *strm = &(state->strm);
-
-    do {
-        switch (state->how) {
-        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
-            if (gz_look(state) == -1)
-                return -1;
-            if (state->how == LOOK)
-                return 0;
-            break;
-        case COPY:      /* -> COPY */
-            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
-                    == -1)
-                return -1;
-            state->x.next = state->out;
-            return 0;
-        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
-            strm->avail_out = state->size << 1;
-            strm->next_out = state->out;
-            if (gz_decomp(state) == -1)
-                return -1;
-        }
-    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
-    return 0;
-}
-
-/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-static int gz_skip(gz_state *state, z_off64_t len) {
-    unsigned n;
-
-    /* skip over len bytes or reach end-of-file, whichever comes first */
-    while (len)
-        /* skip over whatever is in output buffer */
-        if (state->x.have) {
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
-                (unsigned)len : state->x.have;
-            state->x.have -= n;
-            state->x.next += n;
-            state->x.pos += n;
-            len -= n;
-        } else if (state->eof && state->strm.avail_in == 0) {
-            /* output buffer empty -- return if we're at the end of the input */
-            break;
-        } else {
-            /* need more data to skip -- load up output buffer */
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return -1;
-        }
-    return 0;
-}
-
-/* Read len bytes into buf from file, or less than len up to the end of the
-   input.  Return the number of bytes read.  If zero is returned, either the
-   end of file was reached, or there was an error.  state->err must be
-   consulted in that case to determine which. */
-static size_t gz_read(gz_state *state, void *buf, size_t len) {
-    size_t got;
-    unsigned n;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* get len bytes to buf, or less than len if at the end */
-    got = 0;
-    do {
-        /* set n to the maximum amount of len that fits in an unsigned int */
-        n = (unsigned)-1;
-        if (n > len)
-            n = (unsigned)len;
-
-        /* first just try copying data from the output buffer */
-        if (state->x.have) {
-            if (state->x.have < n)
-                n = state->x.have;
-            memcpy(buf, state->x.next, n);
-            state->x.next += n;
-            state->x.have -= n;
-        }
-
-        /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0) {
-            state->past = 1;        /* tried to read past end */
-            break;
-        }
-
-        /* need output data -- for small len or new stream load up our output
-           buffer */
-        else if (state->how == LOOK || n < (state->size << 1)) {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return 0;
-            continue;       /* no progress yet -- go back to copy above */
-            /* the copy above assures that we will leave with space in the
-               output buffer, allowing at least one gzungetc() to succeed */
-        }
-
-        /* large len -- read directly into user buffer */
-        else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
-                return 0;
-        }
-
-        /* large len -- decompress directly into user buffer */
-        else {  /* state->how == GZIP */
-            state->strm.avail_out = n;
-            state->strm.next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1)
-                return 0;
-            n = state->x.have;
-            state->x.have = 0;
-        }
-
-        /* update progress */
-        len -= n;
-        buf = (char *)buf + n;
-        got += n;
-        state->x.pos += n;
-    } while (len);
-
-    /* return number of bytes read into user buffer */
-    return got;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzread)(gzFile file, void *buf, unsigned len) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
-        return -1;
-    }
-
-    /* read len or fewer bytes to buf */
-    len = (unsigned)gz_read(state, buf, len);
-
-    /* check for an error */
-    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* return the number of bytes read (this is assured to fit in an int) */
-    return (int)len;
-}
-
-/* -- see zlib.h -- */
-size_t Z_EXPORT PREFIX(gzfread)(void *buf, size_t size, size_t nitems, gzFile file) {
-    size_t len;
-    gz_state *state;
-
-    /* Exit early if size is zero, also prevents potential division by zero */
-    if (size == 0)
-        return 0;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    if (size && SIZE_MAX / size < nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-    len = nitems * size;
-
-    /* read len or fewer bytes to buf, return the number of full items read */
-    return len ? gz_read(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-#undef @ZLIB_SYMBOL_PREFIX@gzgetc
-#undef @ZLIB_SYMBOL_PREFIX@zng_gzgetc
-int Z_EXPORT PREFIX(gzgetc)(gzFile file) {
-    unsigned char buf[1];
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ || (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* try output buffer (no need to check for skip request) */
-    if (state->x.have) {
-        state->x.have--;
-        state->x.pos++;
-        return *(state->x.next)++;
-    }
-
-    /* nothing there -- try gz_read() */
-    return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
-}
-
-int Z_EXPORT PREFIX(gzgetc_)(gzFile file) {
-    return PREFIX(gzgetc)(file);
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzungetc)(int c, gzFile file) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ || (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* can't push EOF */
-    if (c < 0)
-        return -1;
-
-    /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->x.have == 0) {
-        state->x.have = 1;
-        state->x.next = state->out + (state->size << 1) - 1;
-        state->x.next[0] = (unsigned char)c;
-        state->x.pos--;
-        state->past = 0;
-        return c;
-    }
-
-    /* if no room, give up (must have already done a gzungetc()) */
-    if (state->x.have == (state->size << 1)) {
-        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
-        return -1;
-    }
-
-    /* slide output data if needed and insert byte before existing data */
-    if (state->x.next == state->out) {
-        unsigned char *src = state->out + state->x.have;
-        unsigned char *dest = state->out + (state->size << 1);
-        while (src > state->out)
-            *--dest = *--src;
-        state->x.next = dest;
-    }
-    state->x.have++;
-    state->x.next--;
-    state->x.next[0] = (unsigned char)c;
-    state->x.pos--;
-    state->past = 0;
-    return c;
-}
-
-/* -- see zlib.h -- */
-char * Z_EXPORT PREFIX(gzgets)(gzFile file, char *buf, int len) {
-    unsigned left, n;
-    char *str;
-    unsigned char *eol;
-    gz_state *state;
-
-    /* check parameters and get internal structure */
-    if (file == NULL || buf == NULL || len < 1)
-        return NULL;
-    state = (gz_state *)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ || (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return NULL;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return NULL;
-    }
-
-    /* copy output bytes up to new line or len - 1, whichever comes first --
-       append a terminating zero to the string (we don't check for a zero in
-       the contents, let the user worry about that) */
-    str = buf;
-    left = (unsigned)len - 1;
-    if (left) {
-        do {
-            /* assure that something is in the output buffer */
-            if (state->x.have == 0 && gz_fetch(state) == -1)
-                return NULL;                /* error */
-            if (state->x.have == 0) {       /* end of file */
-                state->past = 1;            /* read past end */
-                break;                      /* return what we have */
-            }
-
-            /* look for end-of-line in current output buffer */
-            n = state->x.have > left ? left : state->x.have;
-            eol = (unsigned char *)memchr(state->x.next, '\n', n);
-            if (eol != NULL)
-                n = (unsigned)(eol - state->x.next) + 1;
-
-            /* copy through end-of-line, or remainder if not found */
-            memcpy(buf, state->x.next, n);
-            state->x.have -= n;
-            state->x.next += n;
-            state->x.pos += n;
-            left -= n;
-            buf += n;
-        } while (left && eol == NULL);
-    }
-
-    /* return terminated string, or if nothing, end of file */
-    if (buf == str)
-        return NULL;
-    buf[0] = 0;
-    return str;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzdirect)(gzFile file) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-
-    state = (gz_state *)file;
-
-    /* if the state is not known, but we can find out, then do so (this is
-       mainly for right after a gzopen() or gzdopen()) */
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
-        (void)gz_look(state);
-
-    /* return 1 if transparent, 0 if processing a gzip stream */
-    return state->direct;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzclose_r)(gzFile file) {
-    int ret, err;
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-
-    state = (gz_state *)file;
-
-    /* check that we're reading */
-    if (state->mode != GZ_READ)
-        return Z_STREAM_ERROR;
-
-    /* free memory and close file */
-    if (state->size) {
-        PREFIX(inflateEnd)(&(state->strm));
-        zng_free(state->out);
-        zng_free(state->in);
-    }
-    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    ret = close(state->fd);
-    zng_free(state);
-    return ret ? Z_ERRNO : err;
-}

crates/libz-sys/src/zlib-ng/gzwrite.c

diff --git a/crates/libz-sys/src/zlib-ng/gzwrite.c b/crates/libz-sys/src/zlib-ng/gzwrite.c
deleted file mode 100644
index b3e93e8..0000000
--- a/crates/libz-sys/src/zlib-ng/gzwrite.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil_p.h"
-#include <stdarg.h>
-#include "gzguts.h"
-
-/* Local functions */
-static int gz_init(gz_state *);
-static int gz_comp(gz_state *, int);
-static int gz_zero(gz_state *, z_off64_t);
-static size_t gz_write(gz_state *, void const *, size_t);
-
-/* Initialize state for writing a gzip file.  Mark initialization by setting
-   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
-   success. */
-static int gz_init(gz_state *state) {
-    int ret;
-    PREFIX3(stream) *strm = &(state->strm);
-
-    /* allocate input buffer (double size for gzprintf) */
-    state->in = (unsigned char *)zng_alloc(state->want << 1);
-    if (state->in == NULL) {
-        gz_error(state, Z_MEM_ERROR, "out of memory");
-        return -1;
-    }
-    memset(state->in, 0, state->want << 1);
-
-    /* only need output buffer and deflate state if compressing */
-    if (!state->direct) {
-        /* allocate output buffer */
-        state->out = (unsigned char *)zng_alloc(state->want);
-        if (state->out == NULL) {
-            zng_free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-
-        /* allocate deflate memory, set up for gzip compression */
-        strm->zalloc = NULL;
-        strm->zfree = NULL;
-        strm->opaque = NULL;
-        ret = PREFIX(deflateInit2)(strm, state->level, Z_DEFLATED, MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
-        if (ret != Z_OK) {
-            zng_free(state->out);
-            zng_free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        strm->next_in = NULL;
-    }
-
-    /* mark state as initialized */
-    state->size = state->want;
-
-    /* initialize write buffer if compressing */
-    if (!state->direct) {
-        strm->avail_out = state->size;
-        strm->next_out = state->out;
-        state->x.next = strm->next_out;
-    }
-    return 0;
-}
-
-/* Compress whatever is at avail_in and next_in and write to the output file.
-   Return -1 if there is an error writing to the output file or if gz_init()
-   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
-   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
-   reset to start a new gzip stream.  If gz->direct is true, then simply write
-   to the output file without compressing, and ignore flush. */
-static int gz_comp(gz_state *state, int flush) {
-    int ret;
-    ssize_t got;
-    unsigned have;
-    PREFIX3(stream) *strm = &(state->strm);
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return -1;
-
-    /* write directly if requested */
-    if (state->direct) {
-        got = write(state->fd, strm->next_in, strm->avail_in);
-        if (got < 0 || (unsigned)got != strm->avail_in) {
-            gz_error(state, Z_ERRNO, zstrerror());
-            return -1;
-        }
-        strm->avail_in = 0;
-        return 0;
-    }
-
-    /* check for a pending reset */
-    if (state->reset) {
-        /* don't start a new gzip member unless there is data to write */
-        if (strm->avail_in == 0)
-            return 0;
-        PREFIX(deflateReset)(strm);
-        state->reset = 0;
-    }
-
-    /* run deflate() on provided input until it produces no more output */
-    ret = Z_OK;
-    do {
-        /* write out current buffer contents if full, or if flushing, but if
-           doing Z_FINISH then don't write until we get to Z_STREAM_END */
-        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            have = (unsigned)(strm->next_out - state->x.next);
-            if (have && ((got = write(state->fd, state->x.next, (unsigned long)have)) < 0 || (unsigned)got != have)) {
-                gz_error(state, Z_ERRNO, zstrerror());
-                return -1;
-            }
-            if (strm->avail_out == 0) {
-                strm->avail_out = state->size;
-                strm->next_out = state->out;
-                state->x.next = state->out;
-            }
-            state->x.next = strm->next_out;
-        }
-
-        /* compress */
-        have = strm->avail_out;
-        ret = PREFIX(deflate)(strm, flush);
-        if (ret == Z_STREAM_ERROR) {
-            gz_error(state, Z_STREAM_ERROR, "internal error: deflate stream corrupt");
-            return -1;
-        }
-        have -= strm->avail_out;
-    } while (have);
-
-    /* if that completed a deflate stream, allow another to start */
-    if (flush == Z_FINISH)
-        state->reset = 1;
-    /* all done, no errors */
-    return 0;
-}
-
-/* Compress len zeros to output.  Return -1 on a write error or memory
-   allocation failure by gz_comp(), or 0 on success. */
-static int gz_zero(gz_state *state, z_off64_t len) {
-    int first;
-    unsigned n;
-    PREFIX3(stream) *strm = &(state->strm);
-
-    /* consume whatever's left in the input buffer */
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-        return -1;
-
-    /* compress len zeros (len guaranteed > 0) */
-    first = 1;
-    while (len) {
-        n = GT_OFF(state->size) || (z_off64_t)state->size > len ? (unsigned)len : state->size;
-        if (first) {
-            memset(state->in, 0, n);
-            first = 0;
-        }
-        strm->avail_in = n;
-        strm->next_in = state->in;
-        state->x.pos += n;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return -1;
-        len -= n;
-    }
-    return 0;
-}
-
-/* Write len bytes from buf to file.  Return the number of bytes written.  If
-   the returned value is less than len, then there was an error. */
-static size_t gz_write(gz_state *state, void const *buf, size_t len) {
-    size_t put = len;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return 0;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* for small len, copy to input buffer, otherwise compress directly */
-    if (len < state->size) {
-        /* copy to input buffer, compress when full */
-        do {
-            unsigned have, copy;
-
-            if (state->strm.avail_in == 0)
-                state->strm.next_in = state->in;
-            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
-                              state->in);
-            copy = state->size - have;
-            if (copy > len)
-                copy = (unsigned)len;
-            memcpy(state->in + have, buf, copy);
-            state->strm.avail_in += copy;
-            state->x.pos += copy;
-            buf = (const char *)buf + copy;
-            len -= copy;
-            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-        } while (len);
-    } else {
-        /* consume whatever's left in the input buffer */
-        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0;
-
-        /* directly compress user buffer to file */
-        state->strm.next_in = (z_const unsigned char *) buf;
-        do {
-            unsigned n = (unsigned)-1;
-            if (n > len)
-                n = (unsigned)len;
-            state->strm.avail_in = n;
-            state->x.pos += n;
-            if (gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-            len -= n;
-        } while (len);
-    }
-
-    /* input was all buffered or compressed */
-    return put;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzwrite)(gzFile file, void const *buf, unsigned len) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_state *)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-        return 0;
-    }
-
-    /* write len bytes from buf (the return value will fit in an int) */
-    return (int)gz_write(state, buf, len);
-}
-
-/* -- see zlib.h -- */
-size_t Z_EXPORT PREFIX(gzfwrite)(void const *buf, size_t size, size_t nitems, gzFile file) {
-    size_t len;
-    gz_state *state;
-
-    /* Exit early if size is zero, also prevents potential division by zero */
-    if (size == 0)
-        return 0;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_state *)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    len = nitems * size;
-    if (len / size != nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-
-    /* write len bytes to buf, return the number of full items written */
-    return len ? gz_write(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzputc)(gzFile file, int c) {
-    unsigned have;
-    unsigned char buf[1];
-    gz_state *state;
-    PREFIX3(stream) *strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* try writing to input buffer for speed (state->size == 0 if buffer not
-       initialized) */
-    if (state->size) {
-        if (strm->avail_in == 0)
-            strm->next_in = state->in;
-        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-        if (have < state->size) {
-            state->in[have] = (unsigned char)c;
-            strm->avail_in++;
-            state->x.pos++;
-            return c & 0xff;
-        }
-    }
-
-    /* no room in buffer or not initialized, use gz_write() */
-    buf[0] = (unsigned char)c;
-    if (gz_write(state, buf, 1) != 1)
-        return -1;
-    return c & 0xff;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzputs)(gzFile file, const char *s) {
-    size_t len, put;
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_state *)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* write string */
-    len = strlen(s);
-    if ((int)len < 0 || (unsigned)len != len) {
-        gz_error(state, Z_STREAM_ERROR, "string length does not fit in int");
-        return -1;
-    }
-    put = gz_write(state, s, len);
-    return put < len ? -1 : (int)len;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORTVA PREFIX(gzvprintf)(gzFile file, const char *format, va_list va) {
-    int len;
-    unsigned left;
-    char *next;
-    gz_state *state;
-    PREFIX3(stream) *strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_state *)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* make sure we have some buffer space */
-    if (state->size == 0 && gz_init(state) == -1)
-        return state->err;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
-    if (strm->avail_in == 0)
-        strm->next_in = state->in;
-    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
-    next[state->size - 1] = 0;
-    len = vsnprintf(next, state->size, format, va);
-
-    /* check that printf() results fit in buffer */
-    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, compress first half if past that */
-    strm->avail_in += (unsigned)len;
-    state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memmove(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
-    return len;
-}
-
-int Z_EXPORTVA PREFIX(gzprintf)(gzFile file, const char *format, ...) {
-    va_list va;
-    int ret;
-
-    va_start(va, format);
-    ret = PREFIX(gzvprintf)(file, format, va);
-    va_end(va);
-    return ret;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzflush)(gzFile file, int flush) {
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_state *)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* check flush parameter */
-    if (flush < 0 || flush > Z_FINISH)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* compress remaining data with requested flush */
-    (void)gz_comp(state, flush);
-    return state->err;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzsetparams)(gzFile file, int level, int strategy) {
-    gz_state *state;
-    PREFIX3(stream) *strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_state *)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* if no change is requested, then do nothing */
-    if (level == state->level && strategy == state->strategy)
-        return Z_OK;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* change compression parameters for subsequent input */
-    if (state->size) {
-        /* flush previous input with previous parameters before changing */
-        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
-            return state->err;
-        PREFIX(deflateParams)(strm, level, strategy);
-    }
-    state->level = level;
-    state->strategy = strategy;
-    return Z_OK;
-}
-
-/* -- see zlib.h -- */
-int Z_EXPORT PREFIX(gzclose_w)(gzFile file) {
-    int ret = Z_OK;
-    gz_state *state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_state *)file;
-
-    /* check that we're writing */
-    if (state->mode != GZ_WRITE)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            ret = state->err;
-    }
-
-    /* flush, free memory, and close file */
-    if (gz_comp(state, Z_FINISH) == -1)
-        ret = state->err;
-    if (state->size) {
-        if (!state->direct) {
-            (void)PREFIX(deflateEnd)(&(state->strm));
-            zng_free(state->out);
-        }
-        zng_free(state->in);
-    }
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    if (close(state->fd) == -1)
-        ret = Z_ERRNO;
-    zng_free(state);
-    return ret;
-}

crates/libz-sys/src/zlib-ng/infback.c

diff --git a/crates/libz-sys/src/zlib-ng/infback.c b/crates/libz-sys/src/zlib-ng/infback.c
deleted file mode 100644
index 5112a33..0000000
--- a/crates/libz-sys/src/zlib-ng/infback.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-#include "inflate_p.h"
-#include "functable.h"
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int32_t Z_EXPORT PREFIX(inflateBackInit_)(PREFIX3(stream) *strm, int32_t windowBits, uint8_t *window,
-                              const char *version, int32_t stream_size) {
-    struct inflate_state *state;
-
-    if (version == NULL || version[0] != PREFIX2(VERSION)[0] || stream_size != (int)(sizeof(PREFIX3(stream))))
-        return Z_VERSION_ERROR;
-    if (strm == NULL || window == NULL || windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = NULL;                   /* in case we return an error */
-    if (strm->zalloc == NULL) {
-        strm->zalloc = zng_calloc;
-        strm->opaque = NULL;
-    }
-    if (strm->zfree == NULL)
-        strm->zfree = zng_cfree;
-    state = ZALLOC_INFLATE_STATE(strm);
-    if (state == NULL)
-        return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state *)state;
-    state->dmax = 32768U;
-    state->wbits = (unsigned int)windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    state->chunksize = functable.chunksize();
-    return Z_OK;
-}
-
-/*
-   Private macros for inflateBack()
-   Look in inflate_p.h for macros shared with inflate()
-*/
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += ((unsigned)(*next++) << bits); \
-        bits += 8; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise, inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is NULL or the state was not initialized.
- */
-int32_t Z_EXPORT PREFIX(inflateBack)(PREFIX3(stream) *strm, in_func in, void *in_desc, out_func out, void *out_desc) {
-    struct inflate_state *state;
-    z_const unsigned char *next; /* next input */
-    unsigned char *put;          /* next output */
-    unsigned have, left;         /* available input and output */
-    uint32_t hold;               /* bit buffer */
-    unsigned bits;               /* bits in bit buffer */
-    unsigned copy;               /* number of stored or match bytes to copy */
-    unsigned char *from;         /* where to copy match bytes from */
-    code here;                   /* current decoding table entry */
-    code last;                   /* parent table entry */
-    unsigned len;                /* length to copy for repeats, bits to drop */
-    int32_t ret;                 /* return code */
-    static const uint16_t order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == NULL || strm->state == NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-
-    /* Reset the state */
-    strm->msg = NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n", state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n", state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n", state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                SET_BAD("invalid block type");
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                SET_BAD("invalid stored block lengths");
-                break;
-            }
-            state->length = (uint16_t)hold;
-            Tracev((stderr, "inflate:       stored length %u\n", state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                copy = MIN(copy, have);
-                copy = MIN(copy, left);
-                memcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                SET_BAD("too many length or distance symbols");
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-
-            /* get code length code lengths (not a typo) */
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (uint16_t)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code *)(state->next);
-            state->lenbits = 7;
-            ret = zng_inflate_table(CODES, state->lens, 19, &(state->next), &(state->lenbits), state->work);
-            if (ret) {
-                SET_BAD("invalid code lengths set");
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-
-            /* get length and distance code code lengths */
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if (here.bits <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                } else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            SET_BAD("invalid bit length repeat");
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    } else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    } else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        SET_BAD("invalid bit length repeat");
-                        break;
-                    }
-                    while (copy) {
-                        --copy;
-                        state->lens[state->have++] = (uint16_t)len;
-                    }
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD)
-                break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                SET_BAD("invalid code -- missing end-of-block");
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code *)(state->next);
-            state->lenbits = 9;
-            ret = zng_inflate_table(LENS, state->lens, state->nlen, &(state->next), &(state->lenbits), state->work);
-            if (ret) {
-                SET_BAD("invalid literal/lengths set");
-                break;
-            }
-            state->distcode = (const code *)(state->next);
-            state->distbits = 6;
-            ret = zng_inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                                &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                SET_BAD("invalid distances set");
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= INFLATE_FAST_MIN_HAVE &&
-                left >= INFLATE_FAST_MIN_LEFT) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                zng_inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if (here.bits <= bits)
-                    break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)last.bits + (unsigned)here.bits <= bits)
-                        break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            state->length = here.val;
-
-            /* process literal */
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                SET_BAD("invalid literal/length code");
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (here.op & 15);
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if (here.bits <= bits)
-                    break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)last.bits + (unsigned)here.bits <= bits)
-                        break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                SET_BAD("invalid distance code");
-                break;
-            }
-            state->offset = here.val;
-            state->extra = (here.op & 15);
-
-            /* get distance extra bits, if any */
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->wsize - (state->whave < state->wsize ? left : 0)) {
-                SET_BAD("invalid distance too far back");
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                } else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                copy = MIN(copy, state->length);
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int32_t Z_EXPORT PREFIX(inflateBackEnd)(PREFIX3(stream) *strm) {
-    if (strm == NULL || strm->state == NULL || strm->zfree == NULL)
-        return Z_STREAM_ERROR;
-    ZFREE_STATE(strm, strm->state);
-    strm->state = NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}

crates/libz-sys/src/zlib-ng/inffast.c

diff --git a/crates/libz-sys/src/zlib-ng/inffast.c b/crates/libz-sys/src/zlib-ng/inffast.c
deleted file mode 100644
index 3692331..0000000
--- a/crates/libz-sys/src/zlib-ng/inffast.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-#include "inflate_p.h"
-#include "functable.h"
-
-/* Load 64 bits from IN and place the bytes at offset BITS in the result. */
-static inline uint64_t load_64_bits(const unsigned char *in, unsigned bits) {
-    uint64_t chunk;
-    zmemcpy_8(&chunk, in);
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-    return chunk << bits;
-#else
-    return ZSWAP64(chunk) << bits;
-#endif
-}
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= INFLATE_FAST_MIN_HAVE
-        strm->avail_out >= INFLATE_FAST_MIN_LEFT
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - On some architectures, it can be significantly faster (e.g. up to 1.2x
-      faster on x86_64) to load from strm->next_in 64 bits, or 8 bytes, at a
-      time, so INFLATE_FAST_MIN_HAVE == 8.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void Z_INTERNAL zng_inflate_fast(PREFIX3(stream) *strm, unsigned long start) {
-    /* start: inflate()'s starting value for strm->avail_out */
-    struct inflate_state *state;
-    z_const unsigned char *in;  /* local strm->next_in */
-    const unsigned char *last;  /* have enough input while in < last */
-    unsigned char *out;         /* local strm->next_out */
-    unsigned char *beg;         /* inflate()'s initial strm->next_out */
-    unsigned char *end;         /* while out < end, enough space available */
-    unsigned char *safe;        /* can use chunkcopy provided out < safe */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char *window;      /* allocated sliding window, if wsize != 0 */
-
-    /* hold is a local copy of strm->hold. By default, hold satisfies the same
-       invariants that strm->hold does, namely that (hold >> bits) == 0. This
-       invariant is kept by loading bits into hold one byte at a time, like:
-
-       hold |= next_byte_of_input << bits; in++; bits += 8;
-
-       If we need to ensure that bits >= 15 then this code snippet is simply
-       repeated. Over one iteration of the outermost do/while loop, this
-       happens up to six times (48 bits of input), as described in the NOTES
-       above.
-
-       However, on some little endian architectures, it can be significantly
-       faster to load 64 bits once instead of 8 bits six times:
-
-       if (bits <= 16) {
-         hold |= next_8_bytes_of_input << bits; in += 6; bits += 48;
-       }
-
-       Unlike the simpler one byte load, shifting the next_8_bytes_of_input
-       by bits will overflow and lose those high bits, up to 2 bytes' worth.
-       The conservative estimate is therefore that we have read only 6 bytes
-       (48 bits). Again, as per the NOTES above, 48 bits is sufficient for the
-       rest of the iteration, and we will not need to load another 8 bytes.
-
-       Inside this function, we no longer satisfy (hold >> bits) == 0, but
-       this is not problematic, even if that overflow does not land on an 8 bit
-       byte boundary. Those excess bits will eventually shift down lower as the
-       Huffman decoder consumes input, and when new input bits need to be loaded
-       into the bits variable, the same input bits will be or'ed over those
-       existing bits. A bitwise or is idempotent: (a | b | b) equals (a | b).
-       Note that we therefore write that load operation as "hold |= etc" and not
-       "hold += etc".
-
-       Outside that loop, at the end of the function, hold is bitwise and'ed
-       with (1<<bits)-1 to drop those excess bits so that, on function exit, we
-       keep the invariant that (state->hold >> state->bits) == 0.
-    */
-    uint64_t hold;              /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const *lcode;          /* local strm->lencode */
-    code const *dcode;          /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    const code *here;           /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char *from;        /* where to copy match from */
-    unsigned extra_safe;        /* copy chunks safely in all cases */
-
-    /* copy state to local variables */
-    state = (struct inflate_state *)strm->state;
-    in = strm->next_in;
-    last = in + (strm->avail_in - (INFLATE_FAST_MIN_HAVE - 1));
-    out = strm->next_out;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - (INFLATE_FAST_MIN_LEFT - 1));
-    safe = out + strm->avail_out;
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    wnext = state->wnext;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* Detect if out and window point to the same memory allocation. In this instance it is
-       necessary to use safe chunk copy functions to prevent overwriting the window. If the
-       window is overwritten then future matches with far distances will fail to copy correctly. */
-    extra_safe = (wsize != 0 && out >= window && out + INFLATE_FAST_MIN_LEFT <= window + wsize);
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold |= load_64_bits(in, bits);
-            in += 6;
-            bits += 48;
-        }
-        here = lcode + (hold & lmask);
-      dolen:
-        DROPBITS(here->bits);
-        op = here->op;
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here->val));
-            *out++ = (unsigned char)(here->val);
-        } else if (op & 16) {                     /* length base */
-            len = here->val;
-            op &= 15;                           /* number of extra bits */
-            if (bits < op) {
-                hold |= load_64_bits(in, bits);
-                in += 6;
-                bits += 48;
-            }
-            len += BITS(op);
-            DROPBITS(op);
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold |= load_64_bits(in, bits);
-                in += 6;
-                bits += 48;
-            }
-            here = dcode + (hold & dmask);
-          dodist:
-            DROPBITS(here->bits);
-            op = here->op;
-            if (op & 16) {                      /* distance base */
-                dist = here->val;
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold |= load_64_bits(in, bits);
-                    in += 6;
-                    bits += 48;
-                }
-                dist += BITS(op);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    SET_BAD("invalid distance too far back");
-                    break;
-                }
-#endif
-                DROPBITS(op);
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        if (state->sane) {
-                            SET_BAD("invalid distance too far back");
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                *out++ = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            *out++ = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                *out++ = *from++;
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                    } else if (wnext >= op) {   /* contiguous in window */
-                        from += wnext - op;
-                    } else {                    /* wrap around window */
-                        op -= wnext;
-                        from += wsize - op;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            out = chunkcopy_safe(out, from, op, safe);
-                            from = window;      /* more from start of window */
-                            op = wnext;
-                            /* This (rare) case can create a situation where
-                               the first chunkcopy below must be checked.
-                             */
-                        }
-                    }
-                    if (op < len) {             /* still need some from output */
-                        len -= op;
-                        out = chunkcopy_safe(out, from, op, safe);
-                        out = functable.chunkunroll(out, &dist, &len);
-                        out = chunkcopy_safe(out, out - dist, len, safe);
-                    } else {
-                        out = chunkcopy_safe(out, from, len, safe);
-                    }
-                } else if (extra_safe) {
-                    /* Whole reference is in range of current output. */
-                    if (dist >= len || dist >= state->chunksize)
-                        out = chunkcopy_safe(out, out - dist, len, safe);
-                    else
-                        out = functable.chunkmemset_safe(out, dist, len, (unsigned)((safe - out) + 1));
-                } else {
-                    /* Whole reference is in range of current output.  No range checks are
-                       necessary because we start with room for at least 258 bytes of output,
-                       so unroll and roundoff operations can write beyond `out+len` so long
-                       as they stay within 258 bytes of `out`.
-                    */
-                    if (dist >= len || dist >= state->chunksize)
-                        out = functable.chunkcopy(out, out - dist, len);
-                    else
-                        out = functable.chunkmemset(out, dist, len);
-                }
-            } else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode + here->val + BITS(op);
-                goto dodist;
-            } else {
-                SET_BAD("invalid distance code");
-                break;
-            }
-        } else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode + here->val + BITS(op);
-            goto dolen;
-        } else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        } else {
-            SET_BAD("invalid literal/length code");
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (UINT64_C(1) << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in;
-    strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? (INFLATE_FAST_MIN_HAVE - 1) + (last - in)
-                                          : (INFLATE_FAST_MIN_HAVE - 1) - (in - last));
-    strm->avail_out = (unsigned)(out < end ? (INFLATE_FAST_MIN_LEFT - 1) + (end - out)
-                                           : (INFLATE_FAST_MIN_LEFT - 1) - (out - end));
-
-    Assert(bits <= 32, "Remaining bits greater than 32");
-    state->hold = (uint32_t)hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */

crates/libz-sys/src/zlib-ng/inffast.h

diff --git a/crates/libz-sys/src/zlib-ng/inffast.h b/crates/libz-sys/src/zlib-ng/inffast.h
deleted file mode 100644
index 179a65d..0000000
--- a/crates/libz-sys/src/zlib-ng/inffast.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef INFFAST_H_
-#define INFFAST_H_
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void Z_INTERNAL zng_inflate_fast(PREFIX3(stream) *strm, unsigned long start);
-
-#define INFLATE_FAST_MIN_HAVE 8
-#define INFLATE_FAST_MIN_LEFT 258
-
-#endif /* INFFAST_H_ */

crates/libz-sys/src/zlib-ng/inffixed_tbl.h

diff --git a/crates/libz-sys/src/zlib-ng/inffixed_tbl.h b/crates/libz-sys/src/zlib-ng/inffixed_tbl.h
deleted file mode 100644
index 7292fa0..0000000
--- a/crates/libz-sys/src/zlib-ng/inffixed_tbl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* inffixed_tbl.h -- table for decoding fixed codes
- * Generated automatically by makefixed().
- */
-
-/* WARNING: this file should *not* be used by applications.
- * It is part of the implementation of this library and is
- * subject to change. Applications should only use zlib.h.
- */
-
-static const code lenfix[512] = {
-    {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-    {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-    {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-    {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-    {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-    {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-    {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-    {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-    {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-    {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-    {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-    {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-    {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-    {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-    {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-    {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-    {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-    {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-    {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-    {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-    {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-    {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-    {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-    {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-    {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-    {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-    {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-    {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-    {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-    {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-    {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-    {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-    {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-    {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-    {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-    {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-    {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-    {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-    {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-    {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-    {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-    {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-    {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-    {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-    {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-    {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-    {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-    {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-    {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-    {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-    {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-    {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-    {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-    {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-    {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-    {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-    {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-    {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-    {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-    {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-    {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-    {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-    {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-    {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-    {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-    {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-    {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-    {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-    {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-    {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-    {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-    {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-    {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-    {0,9,255}
-};
-
-static const code distfix[32] = {
-    {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-    {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-    {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-    {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-    {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-    {22,5,193},{64,5,0}
-};

crates/libz-sys/src/zlib-ng/inflate.c

diff --git a/crates/libz-sys/src/zlib-ng/inflate.c b/crates/libz-sys/src/zlib-ng/inflate.c
deleted file mode 100644
index b9c3aa7..0000000
--- a/crates/libz-sys/src/zlib-ng/inflate.c
+++ /dev/null
@@ -1,1360 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "cpu_features.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-#include "inflate_p.h"
-#include "inffixed_tbl.h"
-#include "functable.h"
-
-/* function prototypes */
-static int inflateStateCheck(PREFIX3(stream) *strm);
-static int updatewindow(PREFIX3(stream) *strm, const uint8_t *end, uint32_t len, int32_t cksum);
-static uint32_t syncsearch(uint32_t *have, const unsigned char *buf, uint32_t len);
-
-static inline void inf_chksum_cpy(PREFIX3(stream) *strm, uint8_t *dst,
-                           const uint8_t *src, uint32_t copy) {
-    if (!copy) return;
-    struct inflate_state *state = (struct inflate_state*)strm->state;
-#ifdef GUNZIP
-    if (state->flags) {
-        functable.crc32_fold_copy(&state->crc_fold, dst, src, copy);
-    } else
-#endif
-    {
-        strm->adler = state->check = functable.adler32_fold_copy(state->check, dst, src, copy);
-    }
-}
-
-static inline void inf_chksum(PREFIX3(stream) *strm, const uint8_t *src, uint32_t len) {
-    struct inflate_state *state = (struct inflate_state*)strm->state;
-#ifdef GUNZIP
-    if (state->flags) {
-        functable.crc32_fold(&state->crc_fold, src, len, 0);
-    } else
-#endif
-    {
-        strm->adler = state->check = functable.adler32(state->check, src, len);
-    }
-}
-
-static int inflateStateCheck(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-    if (strm == NULL || strm->zalloc == NULL || strm->zfree == NULL)
-        return 1;
-    state = (struct inflate_state *)strm->state;
-    if (state == NULL || state->strm != strm || state->mode < HEAD || state->mode > SYNC)
-        return 1;
-    return 0;
-}
-
-int32_t Z_EXPORT PREFIX(inflateResetKeep)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
-    state->mode = HEAD;
-    state->check = ADLER32_INITIAL_VALUE;
-    state->last = 0;
-    state->havedict = 0;
-    state->flags = -1;
-    state->dmax = 32768U;
-    state->head = NULL;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
-    INFLATE_RESET_KEEP_HOOK(strm);  /* hook for IBM Z DFLTCC */
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int32_t Z_EXPORT PREFIX(inflateReset)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return PREFIX(inflateResetKeep)(strm);
-}
-
-int32_t Z_EXPORT PREFIX(inflateReset2)(PREFIX3(stream) *strm, int32_t windowBits) {
-    int wrap;
-    struct inflate_state *state;
-
-    /* get the state */
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    } else {
-        wrap = (windowBits >> 4) + 5;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE_WINDOW(strm, state->window);
-        state->window = NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return PREFIX(inflateReset)(strm);
-}
-
-int32_t Z_EXPORT PREFIX(inflateInit2_)(PREFIX3(stream) *strm, int32_t windowBits, const char *version, int32_t stream_size) {
-    int32_t ret;
-    struct inflate_state *state;
-
-    cpu_check_features();
-
-    if (version == NULL || version[0] != PREFIX2(VERSION)[0] || stream_size != (int)(sizeof(PREFIX3(stream))))
-        return Z_VERSION_ERROR;
-    if (strm == NULL)
-        return Z_STREAM_ERROR;
-    strm->msg = NULL;                   /* in case we return an error */
-    if (strm->zalloc == NULL) {
-        strm->zalloc = zng_calloc;
-        strm->opaque = NULL;
-    }
-    if (strm->zfree == NULL)
-        strm->zfree = zng_cfree;
-    state = ZALLOC_INFLATE_STATE(strm);
-    if (state == NULL)
-        return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state *)state;
-    state->strm = strm;
-    state->window = NULL;
-    state->mode = HEAD;     /* to pass state test in inflateReset2() */
-    state->chunksize = functable.chunksize();
-    ret = PREFIX(inflateReset2)(strm, windowBits);
-    if (ret != Z_OK) {
-        ZFREE_STATE(strm, state);
-        strm->state = NULL;
-    }
-    return ret;
-}
-
-int32_t Z_EXPORT PREFIX(inflateInit_)(PREFIX3(stream) *strm, const char *version, int32_t stream_size) {
-    return PREFIX(inflateInit2_)(strm, DEF_WBITS, version, stream_size);
-}
-
-int32_t Z_EXPORT PREFIX(inflatePrime)(PREFIX3(stream) *strm, int32_t bits, int32_t value) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    INFLATE_PRIME_HOOK(strm, bits, value);  /* hook for IBM Z DFLTCC */
-    state = (struct inflate_state *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + (unsigned int)bits > 32)
-        return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += (unsigned)value << state->bits;
-    state->bits += (unsigned int)bits;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  This returns fixed tables from inffixed_tbl.h.
- */
-
-void Z_INTERNAL fixedtables(struct inflate_state *state) {
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-int Z_INTERNAL PREFIX(inflate_ensure_window)(struct inflate_state *state) {
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == NULL) {
-        unsigned wsize = 1U << state->wbits;
-        state->window = (unsigned char *)ZALLOC_WINDOW(state->strm, wsize + state->chunksize, sizeof(unsigned char));
-        if (state->window == NULL)
-            return Z_MEM_ERROR;
-#ifdef Z_MEMORY_SANITIZER
-        /* This is _not_ to subvert the memory sanitizer but to instead unposion some
-           data we willingly and purposefully load uninitialized into vector registers
-           in order to safely read the last < chunksize bytes of the window. */
-        __msan_unpoison(state->window + wsize, state->chunksize);
-#endif
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->wnext = 0;
-        state->whave = 0;
-    }
-
-    return Z_OK;
-}
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-static int32_t updatewindow(PREFIX3(stream) *strm, const uint8_t *end, uint32_t len, int32_t cksum) {
-    struct inflate_state *state;
-    uint32_t dist;
-
-    state = (struct inflate_state *)strm->state;
-
-    if (PREFIX(inflate_ensure_window)(state)) return 1;
-
-    /* len state->wsize or less output bytes into the circular window */
-    if (len >= state->wsize) {
-        /* Only do this if the caller specifies to checksum bytes AND the platform requires
-         * it (s/390 being the primary exception to this. Also, for now, do the adler checksums
-         * if not a gzip based header. The inline adler checksums will come in the near future,
-         * possibly the next commit */
-        if (INFLATE_NEED_CHECKSUM(strm) && cksum) {
-            /* We have to split the checksum over non-copied and copied bytes */
-            if (len > state->wsize)
-                inf_chksum(strm, end - len, len - state->wsize);
-            inf_chksum_cpy(strm, state->window, end - state->wsize, state->wsize);
-        } else {
-            memcpy(state->window, end - state->wsize, state->wsize);
-        }
-
-        state->wnext = 0;
-        state->whave = state->wsize;
-    } else {
-        dist = state->wsize - state->wnext;
-        /* Only do this if the caller specifies to checksum bytes AND the platform requires
-         * We need to maintain the correct order here for the checksum */
-        dist = MIN(dist, len);
-        if (INFLATE_NEED_CHECKSUM(strm) && cksum) {
-            inf_chksum_cpy(strm, state->window + state->wnext, end - len, dist);
-        } else {
-            memcpy(state->window + state->wnext, end - len, dist);
-        }
-        len -= dist;
-        if (len) {
-            if (INFLATE_NEED_CHECKSUM(strm) && cksum) {
-                inf_chksum_cpy(strm, state->window, end - len, len);
-            } else {
-                memcpy(state->window, end - len, len);
-            }
-
-            state->wnext = len;
-            state->whave = state->wsize;
-        } else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize)
-                state->wnext = 0;
-            if (state->whave < state->wsize)
-                state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/*
-   Private macros for inflate()
-   Look in inflate_p.h for macros shared with inflateBack()
-*/
-
-/* Get a byte of input into the bit accumulator, or return from inflate() if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += ((unsigned)(*next++) << bits); \
-        bits += 8; \
-    } while (0)
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int32_t Z_EXPORT PREFIX(inflate)(PREFIX3(stream) *strm, int32_t flush) {
-    struct inflate_state *state;
-    const unsigned char *next;  /* next input */
-    unsigned char *put;         /* next output */
-    unsigned have, left;        /* available input and output */
-    uint32_t hold;              /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    uint32_t in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char *from;        /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int32_t ret;                /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const uint16_t order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (inflateStateCheck(strm) || strm->next_out == NULL ||
-        (strm->next_in == NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state *)strm->state;
-    if (state->mode == TYPE)      /* skip check */
-        state->mode = TYPEDO;
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                if (state->wbits == 0)
-                    state->wbits = 15;
-                state->check = CRC32_INITIAL_VALUE;
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            if (state->head != NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                SET_BAD("incorrect header check");
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                SET_BAD("unknown compression method");
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            if (len > 15 || len > state->wbits) {
-                SET_BAD("invalid window size");
-                break;
-            }
-            state->dmax = 1U << len;
-            state->flags = 0;               /* indicate zlib header */
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = ADLER32_INITIAL_VALUE;
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                SET_BAD("unknown compression method");
-                break;
-            }
-            if (state->flags & 0xe000) {
-                SET_BAD("unknown header flags set");
-                break;
-            }
-            if (state->head != NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != NULL)
-                state->head->time = hold;
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-
-        case OS:
-            NEEDBITS(16);
-            if (state->head != NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (uint16_t)hold;
-                if (state->head != NULL)
-                    state->head->extra_len = (uint16_t)hold;
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    CRC2(state->check, hold);
-                INITBITS();
-            } else if (state->head != NULL) {
-                state->head->extra = NULL;
-            }
-            state->mode = EXTRA;
-
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have)
-                    copy = have;
-                if (copy) {
-                    if (state->head != NULL && state->head->extra != NULL) {
-                        len = state->head->extra_len - state->length;
-                        memcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if ((state->flags & 0x0200) && (state->wrap & 4)) {
-                        state->check = PREFIX(crc32)(state->check, next, copy);
-                    }
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length)
-                    goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != NULL && state->head->name != NULL && state->length < state->head->name_max)
-                        state->head->name[state->length++] = (unsigned char)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = PREFIX(crc32)(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len)
-                    goto inf_leave;
-            } else if (state->head != NULL) {
-                state->head->name = NULL;
-            }
-            state->length = 0;
-            state->mode = COMMENT;
-
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != NULL && state->head->comment != NULL
-                        && state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = (unsigned char)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = PREFIX(crc32)(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len)
-                    goto inf_leave;
-            } else if (state->head != NULL) {
-                state->head->comment = NULL;
-            }
-            state->mode = HCRC;
-
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    SET_BAD("header crc mismatch");
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            /* compute crc32 checksum if not in raw mode */
-            if ((state->wrap & 4) && state->flags)
-                strm->adler = state->check = functable.crc32_fold_reset(&state->crc_fold);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = ADLER32_INITIAL_VALUE;
-            state->mode = TYPE;
-
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES)
-                goto inf_leave;
-
-        case TYPEDO:
-            /* determine and dispatch block type */
-            INFLATE_TYPEDO_HOOK(strm, flush);  /* hook for IBM Z DFLTCC */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n", state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n", state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n", state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                SET_BAD("invalid block type");
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                SET_BAD("invalid stored block lengths");
-                break;
-            }
-            state->length = (uint16_t)hold;
-            Tracev((stderr, "inflate:       stored length %u\n", state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES)
-                goto inf_leave;
-
-        case COPY_:
-            state->mode = COPY;
-
-        case COPY:
-            /* copy stored block from input to output */
-            copy = state->length;
-            if (copy) {
-                copy = MIN(copy, have);
-                copy = MIN(copy, left);
-                if (copy == 0)
-                    goto inf_leave;
-                memcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                SET_BAD("too many length or distance symbols");
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-
-        case LENLENS:
-            /* get code length code lengths (not a typo) */
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (uint16_t)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code *)(state->next);
-            state->lenbits = 7;
-            ret = zng_inflate_table(CODES, state->lens, 19, &(state->next), &(state->lenbits), state->work);
-            if (ret) {
-                SET_BAD("invalid code lengths set");
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-
-        case CODELENS:
-            /* get length and distance code code lengths */
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if (here.bits <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                } else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            SET_BAD("invalid bit length repeat");
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    } else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    } else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        SET_BAD("invalid bit length repeat");
-                        break;
-                    }
-                    while (copy) {
-                        --copy;
-                        state->lens[state->have++] = (uint16_t)len;
-                    }
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD)
-                break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                SET_BAD("invalid code -- missing end-of-block");
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code *)(state->next);
-            state->lenbits = 9;
-            ret = zng_inflate_table(LENS, state->lens, state->nlen, &(state->next), &(state->lenbits), state->work);
-            if (ret) {
-                SET_BAD("invalid literal/lengths set");
-                break;
-            }
-            state->distcode = (const code *)(state->next);
-            state->distbits = 6;
-            ret = zng_inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                SET_BAD("invalid distances set");
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES)
-                goto inf_leave;
-
-        case LEN_:
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= INFLATE_FAST_MIN_HAVE && left >= INFLATE_FAST_MIN_LEFT) {
-                RESTORE();
-                zng_inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if (here.bits <= bits)
-                    break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)last.bits + (unsigned)here.bits <= bits)
-                        break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = here.val;
-
-            /* process literal */
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                SET_BAD("invalid literal/length code");
-                break;
-            }
-
-            /* length code */
-            state->extra = (here.op & 15);
-            state->mode = LENEXT;
-
-        case LENEXT:
-            /* get extra bits, if any */
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-
-        case DIST:
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if (here.bits <= bits)
-                    break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)last.bits + (unsigned)here.bits <= bits)
-                        break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                SET_BAD("invalid distance code");
-                break;
-            }
-            state->offset = here.val;
-            state->extra = (here.op & 15);
-            state->mode = DISTEXT;
-
-        case DISTEXT:
-            /* get distance extra bits, if any */
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                SET_BAD("invalid distance too far back");
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-
-        case MATCH:
-            /* copy match from window to output */
-            if (left == 0)
-                goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        SET_BAD("invalid distance too far back");
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    copy = MIN(copy, state->length);
-                    copy = MIN(copy, left);
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0)
-                        state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                } else {
-                    from = state->window + (state->wnext - copy);
-                }
-                copy = MIN(copy, state->length);
-                copy = MIN(copy, left);
-
-                put = chunkcopy_safe(put, from, copy, put + left);
-            } else {
-                copy = MIN(state->length, left);
-
-                put = functable.chunkmemset_safe(put, state->offset, copy, left);
-            }
-            left -= copy;
-            state->length -= copy;
-            if (state->length == 0)
-                state->mode = LEN;
-            break;
-
-        case LIT:
-            if (left == 0)
-                goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-
-                /* compute crc32 checksum if not in raw mode */
-                if (INFLATE_NEED_CHECKSUM(strm) && state->wrap & 4) {
-                    if (out) {
-                        inf_chksum(strm, put - out, out);
-                    }
-#ifdef GUNZIP
-                    if (state->flags)
-                        strm->adler = state->check = functable.crc32_fold_final(&state->crc_fold);
-#endif
-                }
-                out = left;
-                if ((state->wrap & 4) && (
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     ZSWAP32(hold)) != state->check) {
-                    SET_BAD("incorrect data check");
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
-                    SET_BAD("incorrect length check");
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-
-        case DONE:
-            /* inflate stream terminated properly */
-            ret = Z_STREAM_END;
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        case MEM:
-            return Z_MEM_ERROR;
-
-        case SYNC:
-
-        default:                 /* can't happen, but makes compilers happy */
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (INFLATE_NEED_UPDATEWINDOW(strm) &&
-            (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-                 (state->mode < CHECK || flush != Z_FINISH)))) {
-        /* update sliding window with respective checksum if not in "raw" mode */
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out, state->wrap & 4)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-
-    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int32_t Z_EXPORT PREFIX(inflateEnd)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    if (state->window != NULL)
-        ZFREE_WINDOW(strm, state->window);
-    ZFREE_STATE(strm, strm->state);
-    strm->state = NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int32_t Z_EXPORT PREFIX(inflateGetDictionary)(PREFIX3(stream) *strm, uint8_t *dictionary, uint32_t *dictLength) {
-    struct inflate_state *state;
-
-    /* check state */
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-
-    /* copy dictionary */
-    if (state->whave && dictionary != NULL) {
-        memcpy(dictionary, state->window + state->wnext, state->whave - state->wnext);
-        memcpy(dictionary + state->whave - state->wnext, state->window, state->wnext);
-    }
-    if (dictLength != NULL)
-        *dictLength = state->whave;
-    return Z_OK;
-}
-
-int32_t Z_EXPORT PREFIX(inflateSetDictionary)(PREFIX3(stream) *strm, const uint8_t *dictionary, uint32_t dictLength) {
-    struct inflate_state *state;
-    unsigned long dictid;
-    int32_t ret;
-
-    /* check state */
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary identifier */
-    if (state->mode == DICT) {
-        dictid = functable.adler32(ADLER32_INITIAL_VALUE, dictionary, dictLength);
-        if (dictid != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window using updatewindow(), which will amend the
-       existing dictionary if appropriate */
-    ret = updatewindow(strm, dictionary + dictLength, dictLength, 0);
-    if (ret) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int32_t Z_EXPORT PREFIX(inflateGetHeader)(PREFIX3(stream) *strm, PREFIX(gz_headerp) head) {
-    struct inflate_state *state;
-
-    /* check state */
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    if ((state->wrap & 2) == 0)
-        return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-static uint32_t syncsearch(uint32_t *have, const uint8_t *buf, uint32_t len) {
-    uint32_t got, next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int32_t Z_EXPORT PREFIX(inflateSync)(PREFIX3(stream) *strm) {
-    unsigned len;               /* number of bytes to look at or looked at */
-    int flags;                  /* temporary to save header status */
-    size_t in, out;             /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state *state;
-
-    /* check parameters */
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8)
-        return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4)
-        return Z_DATA_ERROR;
-    if (state->flags == -1)
-        state->wrap = 0;    /* if no header yet, treat as raw */
-    else
-        state->wrap &= ~4;  /* no point in computing a check value now */
-    flags = state->flags;
-    in = strm->total_in;
-    out = strm->total_out;
-    PREFIX(inflateReset)(strm);
-    strm->total_in = (z_size_t)in;
-    strm->total_out = (z_size_t)out;
-    state->flags = flags;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int32_t Z_EXPORT PREFIX(inflateSyncPoint)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    INFLATE_SYNC_POINT_HOOK(strm);
-    state = (struct inflate_state *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int32_t Z_EXPORT PREFIX(inflateCopy)(PREFIX3(stream) *dest, PREFIX3(stream) *source) {
-    struct inflate_state *state;
-    struct inflate_state *copy;
-    unsigned char *window;
-    unsigned wsize;
-
-    /* check input */
-    if (inflateStateCheck(source) || dest == NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)source->state;
-
-    /* allocate space */
-    copy = ZALLOC_INFLATE_STATE(source);
-    if (copy == NULL)
-        return Z_MEM_ERROR;
-    window = NULL;
-    if (state->window != NULL) {
-        wsize = 1U << state->wbits;
-        window = (unsigned char *)ZALLOC_WINDOW(source, wsize, sizeof(unsigned char));
-        if (window == NULL) {
-            ZFREE_STATE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    memcpy((void *)dest, (void *)source, sizeof(PREFIX3(stream)));
-    ZCOPY_INFLATE_STATE(copy, state);
-    copy->strm = dest;
-    if (state->lencode >= state->codes && state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != NULL) {
-        wsize = 1U << state->wbits;
-        memcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state *)copy;
-    return Z_OK;
-}
-
-int32_t Z_EXPORT PREFIX(inflateUndermine)(PREFIX3(stream) *strm, int32_t subvert) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    state->sane = !subvert;
-    return Z_OK;
-#else
-    Z_UNUSED(subvert);
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-int32_t Z_EXPORT PREFIX(inflateValidate)(PREFIX3(stream) *strm, int32_t check) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state *)strm->state;
-    if (check && state->wrap)
-        state->wrap |= 4;
-    else
-        state->wrap &= ~4;
-    return Z_OK;
-}
-
-long Z_EXPORT PREFIX(inflateMark)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-
-    if (inflateStateCheck(strm))
-        return -65536;
-    INFLATE_MARK_HOOK(strm);  /* hook for IBM Z DFLTCC */
-    state = (struct inflate_state *)strm->state;
-    return (long)(((unsigned long)((long)state->back)) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
-
-unsigned long Z_EXPORT PREFIX(inflateCodesUsed)(PREFIX3(stream) *strm) {
-    struct inflate_state *state;
-    if (strm == NULL || strm->state == NULL)
-        return (unsigned long)-1;
-    state = (struct inflate_state *)strm->state;
-    return (unsigned long)(state->next - state->codes);
-}

crates/libz-sys/src/zlib-ng/inflate.h

diff --git a/crates/libz-sys/src/zlib-ng/inflate.h b/crates/libz-sys/src/zlib-ng/inflate.h
deleted file mode 100644
index 941e8b0..0000000
--- a/crates/libz-sys/src/zlib-ng/inflate.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#ifndef INFLATE_H_
-#define INFLATE_H_
-
-#include "adler32_fold.h"
-#include "crc32_fold.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and trailer decoding by inflate().
-   NO_GZIP would be used to avoid linking in the crc code when it is not needed.
-   For shared libraries, gzip decoding should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD = 16180,   /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
-    Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* State maintained between inflate() calls -- approximately 7K bytes, not
-   including the allocated sliding window, which is up to 32K bytes. */
-struct inflate_state {
-    PREFIX3(stream) *strm;             /* pointer back to this zlib stream */
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
-                                   bit 2 true to validate check value */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags, 0 if zlib, or
-                                   -1 if raw or no header yet */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    PREFIX(gz_headerp) head;    /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    uint32_t wsize;             /* window size or zero if not using window */
-    uint32_t whave;             /* valid bytes in the window */
-    uint32_t wnext;             /* window write index */
-    unsigned char *window;      /* allocated sliding window, if needed */
-
-    struct crc32_fold_s ALIGNED_(16) crc_fold;
-
-        /* bit accumulator */
-    uint32_t hold;              /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    uint32_t length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const *lencode;        /* starting table for length/literal codes */
-    code const *distcode;       /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    uint32_t have;              /* number of code lengths in lens[] */
-    code *next;                 /* next available space in codes[] */
-    uint16_t lens[320];         /* temporary storage for code lengths */
-    uint16_t work[288];         /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-    int sane;                   /* if false, allow invalid distance too far */
-    int back;                   /* bits back of last unprocessed length/lit */
-    unsigned was;               /* initial length of match */
-    uint32_t chunksize;         /* size of memory copying chunk */
-};
-
-int Z_INTERNAL PREFIX(inflate_ensure_window)(struct inflate_state *state);
-void Z_INTERNAL fixedtables(struct inflate_state *state);
-
-#endif /* INFLATE_H_ */

crates/libz-sys/src/zlib-ng/inflate_p.h

diff --git a/crates/libz-sys/src/zlib-ng/inflate_p.h b/crates/libz-sys/src/zlib-ng/inflate_p.h
deleted file mode 100644
index 65bbd44..0000000
--- a/crates/libz-sys/src/zlib-ng/inflate_p.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* inflate_p.h -- Private inline functions and macros shared with more than one deflate method
- *
- */
-
-#ifndef INFLATE_P_H
-#define INFLATE_P_H
-
-#include <stdlib.h>
-
-/* Architecture-specific hooks. */
-#ifdef S390_DFLTCC_INFLATE
-#  include "arch/s390/dfltcc_inflate.h"
-#else
-/* Memory management for the inflate state. Useful for allocating arch-specific extension blocks. */
-#  define ZALLOC_INFLATE_STATE(strm) ((struct inflate_state *)ZALLOC(strm, 1, sizeof(struct inflate_state)))
-#  define ZFREE_STATE(strm, addr) ZFREE(strm, addr)
-#  define ZCOPY_INFLATE_STATE(dst, src) memcpy(dst, src, sizeof(struct inflate_state))
-/* Memory management for the window. Useful for allocation the aligned window. */
-#  define ZALLOC_WINDOW(strm, items, size) ZALLOC(strm, items, size)
-#  define ZFREE_WINDOW(strm, addr) ZFREE(strm, addr)
-/* Invoked at the end of inflateResetKeep(). Useful for initializing arch-specific extension blocks. */
-#  define INFLATE_RESET_KEEP_HOOK(strm) do {} while (0)
-/* Invoked at the beginning of inflatePrime(). Useful for updating arch-specific buffers. */
-#  define INFLATE_PRIME_HOOK(strm, bits, value) do {} while (0)
-/* Invoked at the beginning of each block. Useful for plugging arch-specific inflation code. */
-#  define INFLATE_TYPEDO_HOOK(strm, flush) do {} while (0)
-/* Returns whether zlib-ng should compute a checksum. Set to 0 if arch-specific inflation code already does that. */
-#  define INFLATE_NEED_CHECKSUM(strm) 1
-/* Returns whether zlib-ng should update a window. Set to 0 if arch-specific inflation code already does that. */
-#  define INFLATE_NEED_UPDATEWINDOW(strm) 1
-/* Invoked at the beginning of inflateMark(). Useful for updating arch-specific pointers and offsets. */
-#  define INFLATE_MARK_HOOK(strm) do {} while (0)
-/* Invoked at the beginning of inflateSyncPoint(). Useful for performing arch-specific state checks. */
-#  define INFLATE_SYNC_POINT_HOOK(strm) do {} while (0)
-#endif
-
-/*
- *   Macros shared by inflate() and inflateBack()
- */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? PREFIX(crc32)(check, buf, len) : functable.adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) functable.adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = PREFIX(crc32)(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = PREFIX(crc32)(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = (z_const unsigned char *)next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Ensure that there is at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate()/inflateBack(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    (hold & ((1U << (unsigned)(n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-#endif
-
-/* Set mode=BAD and prepare error message */
-#define SET_BAD(errmsg) \
-    do { \
-        state->mode = BAD; \
-        strm->msg = (char *)errmsg; \
-    } while (0)
-
-/* Behave like chunkcopy, but avoid writing beyond of legal output. */
-static inline uint8_t* chunkcopy_safe(uint8_t *out, uint8_t *from, size_t len, uint8_t *safe) {
-    uint32_t safelen = (uint32_t)((safe - out) + 1);
-    len = MIN(len, safelen);
-    int32_t olap_src = from >= out && from < out + len;
-    int32_t olap_dst = out >= from && out < from + len;
-    size_t tocopy;
-
-    /* For all cases without overlap, memcpy is ideal */
-    if (!(olap_src || olap_dst)) {
-        memcpy(out, from, len);
-        return out + len;
-    }
-
-    /* We are emulating a self-modifying copy loop here. To do this in a way that doesn't produce undefined behavior,
-     * we have to get a bit clever. First if the overlap is such that src falls between dst and dst+len, we can do the
-     * initial bulk memcpy of the nonoverlapping region. Then, we can leverage the size of this to determine the safest
-     * atomic memcpy size we can pick such that we have non-overlapping regions. This effectively becomes a safe look
-     * behind or lookahead distance. */
-    size_t non_olap_size = llabs(from - out); // llabs vs labs for compatibility with windows
-
-    memcpy(out, from, non_olap_size);
-    out += non_olap_size;
-    from += non_olap_size;
-    len -= non_olap_size;
-
-    /* So this doesn't give use a worst case scenario of function calls in a loop,
-     * we want to instead break this down into copy blocks of fixed lengths */
-    while (len) {
-        tocopy = MIN(non_olap_size, len);
-        len -= tocopy;
-
-        while (tocopy >= 32) {
-            memcpy(out, from, 32);
-            out += 32;
-            from += 32;
-            tocopy -= 32;
-        }
-
-        if (tocopy >= 16) {
-            memcpy(out, from, 16);
-            out += 16;
-            from += 16;
-            tocopy -= 16;
-        }
-
-        if (tocopy >= 8) {
-            zmemcpy_8(out, from);
-            out += 8;
-            from += 8;
-            tocopy -= 8;
-        }
-
-        if (tocopy >= 4) {
-            zmemcpy_4(out, from);
-            out += 4;
-            from += 4;
-            tocopy -= 4;
-        }
-
-        if (tocopy >= 2) {
-            zmemcpy_2(out, from);
-            out += 2;
-            from += 2;
-            tocopy -= 2;
-        }
-
-        if (tocopy) {
-            *out++ = *from++;
-        }
-    }
-
-    return out;
-}

crates/libz-sys/src/zlib-ng/inftrees.c

diff --git a/crates/libz-sys/src/zlib-ng/inftrees.c b/crates/libz-sys/src/zlib-ng/inftrees.c
deleted file mode 100644
index eb82ff4..0000000
--- a/crates/libz-sys/src/zlib-ng/inftrees.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char PREFIX(inflate_copyright)[] = " inflate 1.2.11.f Copyright 1995-2016 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int Z_INTERNAL zng_inflate_table(codetype type, uint16_t *lens, unsigned codes,
-                                code * *table, unsigned *bits, uint16_t *work) {
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
-    code *next;                 /* next available space in table */
-    const uint16_t *base;       /* base value table to use */
-    const uint16_t *extra;      /* extra bits table to use */
-    unsigned match;             /* use base and extra for symbol >= match */
-    uint16_t count[MAXBITS+1];  /* number of codes of each length */
-    uint16_t offs[MAXBITS+1];   /* offsets in table for each length */
-    static const uint16_t lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const uint16_t lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
-    static const uint16_t dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const uint16_t dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    root = MIN(root, max);
-    if (UNLIKELY(max == 0)) {           /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (uint16_t)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min < max; min++)
-        if (count[min] != 0) break;
-    root = MAX(root, min);
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (uint16_t)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        match = 20;
-        break;
-    case LENS:
-        base = lbase;
-        extra = lext;
-        match = 257;
-        break;
-    default:    /* DISTS */
-        base = dbase;
-        extra = dext;
-        match = 0;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        here.bits = (unsigned char)(len - drop);
-        if (LIKELY(work[sym] >= match)) {
-            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.val = base[work[sym] - match];
-        } else if (work[sym] + 1U < match) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        } else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = here;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        } else {
-            huff = 0;
-        }
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max)
-                break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0)
-                    break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used > ENOUGH_LENS) || (type == DISTS && used > ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (uint16_t)(next - *table);
-        }
-    }
-
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
-       at most one remaining entry, since if the code is incomplete, the
-       maximum code length that was allowed to get this far is one bit) */
-    if (UNLIKELY(huff != 0)) {
-        here.op = (unsigned char)64;            /* invalid code marker */
-        here.bits = (unsigned char)(len - drop);
-        here.val = (uint16_t)0;
-        next[huff] = here;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}

crates/libz-sys/src/zlib-ng/inftrees.h

diff --git a/crates/libz-sys/src/zlib-ng/inftrees.h b/crates/libz-sys/src/zlib-ng/inftrees.h
deleted file mode 100644
index 031c2a1..0000000
--- a/crates/libz-sys/src/zlib-ng/inftrees.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef INFTREES_H_
-#define INFTREES_H_
-
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;         /* operation, extra bits, table bits */
-    unsigned char bits;       /* bits in this part of the code */
-    uint16_t val;             /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distributions.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-int Z_INTERNAL zng_inflate_table (codetype type, uint16_t *lens, unsigned codes,
-                                  code * *table, unsigned *bits, uint16_t *work);
-
-#endif /* INFTREES_H_ */

crates/libz-sys/src/zlib-ng/insert_string.c

diff --git a/crates/libz-sys/src/zlib-ng/insert_string.c b/crates/libz-sys/src/zlib-ng/insert_string.c
deleted file mode 100644
index cfe3983..0000000
--- a/crates/libz-sys/src/zlib-ng/insert_string.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* insert_string.c -- insert_string integer hash variant
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-
-#define HASH_SLIDE           16
-
-#define HASH_CALC(s, h, val) h = ((val * 2654435761U) >> HASH_SLIDE);
-#define HASH_CALC_VAR        h
-#define HASH_CALC_VAR_INIT   uint32_t h = 0
-
-#define UPDATE_HASH          update_hash_c
-#define INSERT_STRING        insert_string_c
-#define QUICK_INSERT_STRING  quick_insert_string_c
-
-#include "insert_string_tpl.h"

crates/libz-sys/src/zlib-ng/insert_string_roll.c

diff --git a/crates/libz-sys/src/zlib-ng/insert_string_roll.c b/crates/libz-sys/src/zlib-ng/insert_string_roll.c
deleted file mode 100644
index dfea347..0000000
--- a/crates/libz-sys/src/zlib-ng/insert_string_roll.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* insert_string_roll.c -- insert_string rolling hash variant
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-
-#define HASH_SLIDE           5
-
-#define HASH_CALC(s, h, val) h = ((h << HASH_SLIDE) ^ ((uint8_t)val))
-#define HASH_CALC_VAR        s->ins_h
-#define HASH_CALC_VAR_INIT
-#define HASH_CALC_READ       val = strstart[0]
-#define HASH_CALC_MASK       (32768u - 1u)
-#define HASH_CALC_OFFSET     (STD_MIN_MATCH-1)
-
-#define UPDATE_HASH          update_hash_roll
-#define INSERT_STRING        insert_string_roll
-#define QUICK_INSERT_STRING  quick_insert_string_roll
-
-#include "insert_string_tpl.h"

crates/libz-sys/src/zlib-ng/insert_string_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/insert_string_tpl.h b/crates/libz-sys/src/zlib-ng/insert_string_tpl.h
deleted file mode 100644
index 643a5e0..0000000
--- a/crates/libz-sys/src/zlib-ng/insert_string_tpl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef INSERT_STRING_H_
-#define INSERT_STRING_H_
-
-/* insert_string.h -- Private insert_string functions shared with more than
- *                    one insert string implementation
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Authors:
- *  Wajdi Feghali   <wajdi.k.feghali@intel.com>
- *  Jim Guilford    <james.guilford@intel.com>
- *  Vinodh Gopal    <vinodh.gopal@intel.com>
- *  Erdinc Ozturk   <erdinc.ozturk@intel.com>
- *  Jim Kukunas     <james.t.kukunas@linux.intel.com>
- *
- * Portions are Copyright (C) 2016 12Sided Technology, LLC.
- * Author:
- *  Phil Vachon     <pvachon@12sidedtech.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- */
-
-#ifndef HASH_CALC_OFFSET
-#  define HASH_CALC_OFFSET 0
-#endif
-#ifndef HASH_CALC_MASK
-#  define HASH_CALC_MASK HASH_MASK
-#endif
-#ifndef HASH_CALC_READ
-#  if BYTE_ORDER == LITTLE_ENDIAN
-#    define HASH_CALC_READ \
-        zmemcpy_4(&val, strstart);
-#  else
-#    define HASH_CALC_READ \
-        val  = ((uint32_t)(strstart[0])); \
-        val |= ((uint32_t)(strstart[1]) << 8); \
-        val |= ((uint32_t)(strstart[2]) << 16); \
-        val |= ((uint32_t)(strstart[3]) << 24);
-#  endif
-#endif
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-Z_INTERNAL uint32_t UPDATE_HASH(deflate_state *const s, uint32_t h, uint32_t val) {
-    (void)s;
-    HASH_CALC(s, h, val);
-    return h & HASH_CALC_MASK;
-}
-
-/* ===========================================================================
- * Quick insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- */
-Z_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, uint32_t str) {
-    Pos head;
-    uint8_t *strstart = s->window + str + HASH_CALC_OFFSET;
-    uint32_t val, hm;
-
-    HASH_CALC_VAR_INIT;
-    HASH_CALC_READ;
-    HASH_CALC(s, HASH_CALC_VAR, val);
-    HASH_CALC_VAR &= HASH_CALC_MASK;
-    hm = HASH_CALC_VAR;
-
-    head = s->head[hm];
-    if (LIKELY(head != str)) {
-        s->prev[str & s->w_mask] = head;
-        s->head[hm] = (Pos)str;
-    }
-    return head;
-}
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first STD_MIN_MATCH bytes of str are valid
- *    (except for the last STD_MIN_MATCH-1 bytes of the input file).
- */
-Z_INTERNAL void INSERT_STRING(deflate_state *const s, uint32_t str, uint32_t count) {
-    uint8_t *strstart = s->window + str + HASH_CALC_OFFSET;
-    uint8_t *strend = strstart + count;
-
-    for (Pos idx = (Pos)str; strstart < strend; idx++, strstart++) {
-        uint32_t val, hm;
-
-        HASH_CALC_VAR_INIT;
-        HASH_CALC_READ;
-        HASH_CALC(s, HASH_CALC_VAR, val);
-        HASH_CALC_VAR &= HASH_CALC_MASK;
-        hm = HASH_CALC_VAR;
-
-        Pos head = s->head[hm];
-        if (LIKELY(head != idx)) {
-            s->prev[idx & s->w_mask] = head;
-            s->head[hm] = idx;
-        }
-    }
-}
-#endif

crates/libz-sys/src/zlib-ng/match_tpl.h

diff --git a/crates/libz-sys/src/zlib-ng/match_tpl.h b/crates/libz-sys/src/zlib-ng/match_tpl.h
deleted file mode 100644
index 3fc71c1..0000000
--- a/crates/libz-sys/src/zlib-ng/match_tpl.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/* match_tpl.h -- find longest match template for compare256 variants
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Portions copyright (C) 2014-2021 Konstantin Nosov
- *  Fast-zlib optimized longest_match
- *  https://github.com/gildor2/fast_zlib
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "functable.h"
-
-#ifndef MATCH_TPL_H
-#define MATCH_TPL_H
-
-#define EARLY_EXIT_TRIGGER_LEVEL 5
-
-#endif
-
-/* Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is garbage.
- *
- * IN assertions: cur_match is the head of the hash chain for the current
- * string (strstart) and its distance is <= MAX_DIST, and prev_length >=1
- * OUT assertion: the match length is not greater than s->lookahead
- */
-Z_INTERNAL uint32_t LONGEST_MATCH(deflate_state *const s, Pos cur_match) {
-    unsigned int strstart = s->strstart;
-    const unsigned wmask = s->w_mask;
-    unsigned char *window = s->window;
-    unsigned char *scan = window + strstart;
-    Z_REGISTER unsigned char *mbase_start = window;
-    Z_REGISTER unsigned char *mbase_end;
-    const Pos *prev = s->prev;
-    Pos limit;
-#ifdef LONGEST_MATCH_SLOW
-    Pos limit_base;
-#else
-    int32_t early_exit;
-#endif
-    uint32_t chain_length, nice_match, best_len, offset;
-    uint32_t lookahead = s->lookahead;
-    Pos match_offset = 0;
-#ifdef UNALIGNED_OK
-    uint8_t scan_start[8];
-#endif
-    uint8_t scan_end[8];
-
-#define GOTO_NEXT_CHAIN \
-    if (--chain_length && (cur_match = prev[cur_match & wmask]) > limit) \
-        continue; \
-    return best_len;
-
-    /* The code is optimized for STD_MAX_MATCH-2 multiple of 16. */
-    Assert(STD_MAX_MATCH == 258, "Code too clever");
-
-    best_len = s->prev_length ? s->prev_length : STD_MIN_MATCH-1;
-
-    /* Calculate read offset which should only extend an extra byte
-     * to find the next best match length.
-     */
-    offset = best_len-1;
-#ifdef UNALIGNED_OK
-    if (best_len >= sizeof(uint32_t)) {
-        offset -= 2;
-#ifdef UNALIGNED64_OK
-        if (best_len >= sizeof(uint64_t))
-            offset -= 4;
-#endif
-    }
-#endif
-
-#ifdef UNALIGNED64_OK
-    zmemcpy_8(scan_start, scan);
-    zmemcpy_8(scan_end, scan+offset);
-#elif defined(UNALIGNED_OK)
-    zmemcpy_4(scan_start, scan);
-    zmemcpy_4(scan_end, scan+offset);
-#else
-    scan_end[0] = *(scan+offset);
-    scan_end[1] = *(scan+offset+1);
-#endif
-    mbase_end  = (mbase_start+offset);
-
-    /* Do not waste too much time if we already have a good match */
-    chain_length = s->max_chain_length;
-    if (best_len >= s->good_match)
-        chain_length >>= 2;
-    nice_match = (uint32_t)s->nice_match;
-
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0
-     */
-    limit = strstart > MAX_DIST(s) ? (Pos)(strstart - MAX_DIST(s)) : 0;
-#ifdef LONGEST_MATCH_SLOW
-    limit_base = limit;
-    if (best_len >= STD_MIN_MATCH) {
-        /* We're continuing search (lazy evaluation). */
-        uint32_t i, hash;
-        Pos pos;
-
-        /* Find a most distant chain starting from scan with index=1 (index=0 corresponds
-         * to cur_match). We cannot use s->prev[strstart+1,...] immediately, because
-         * these strings are not yet inserted into the hash table.
-         */
-        hash = s->update_hash(s, 0, scan[1]);
-        hash = s->update_hash(s, hash, scan[2]);
-
-        for (i = 3; i <= best_len; i++) {
-            hash = s->update_hash(s, hash, scan[i]);
-
-            /* If we're starting with best_len >= 3, we can use offset search. */
-            pos = s->head[hash];
-            if (pos < cur_match) {
-                match_offset = (Pos)(i - 2);
-                cur_match = pos;
-            }
-        }
-
-        /* Update offset-dependent variables */
-        limit = limit_base+match_offset;
-        if (cur_match <= limit)
-            goto break_matching;
-        mbase_start -= match_offset;
-        mbase_end -= match_offset;
-    }
-#else
-    early_exit = s->level < EARLY_EXIT_TRIGGER_LEVEL;
-#endif
-    Assert((unsigned long)strstart <= s->window_size - MIN_LOOKAHEAD, "need lookahead");
-    for (;;) {
-        if (cur_match >= strstart)
-            break;
-
-        /* Skip to next match if the match length cannot increase or if the match length is
-         * less than 2. Note that the checks below for insufficient lookahead only occur
-         * occasionally for performance reasons.
-         * Therefore uninitialized memory will be accessed and conditional jumps will be made
-         * that depend on those values. However the length of the match is limited to the
-         * lookahead, so the output of deflate is not affected by the uninitialized values.
-         */
-#ifdef UNALIGNED_OK
-        if (best_len < sizeof(uint32_t)) {
-            for (;;) {
-                if (zmemcmp_2(mbase_end+cur_match, scan_end) == 0 &&
-                    zmemcmp_2(mbase_start+cur_match, scan_start) == 0)
-                    break;
-                GOTO_NEXT_CHAIN;
-            }
-#  ifdef UNALIGNED64_OK
-        } else if (best_len >= sizeof(uint64_t)) {
-            for (;;) {
-                if (zmemcmp_8(mbase_end+cur_match, scan_end) == 0 &&
-                    zmemcmp_8(mbase_start+cur_match, scan_start) == 0)
-                    break;
-                GOTO_NEXT_CHAIN;
-            }
-#  endif
-        } else {
-            for (;;) {
-                if (zmemcmp_4(mbase_end+cur_match, scan_end) == 0 &&
-                    zmemcmp_4(mbase_start+cur_match, scan_start) == 0)
-                    break;
-                GOTO_NEXT_CHAIN;
-            }
-        }
-#else
-        for (;;) {
-            if (mbase_end[cur_match] == scan_end[0] && mbase_end[cur_match+1] == scan_end[1] &&
-                mbase_start[cur_match] == scan[0] && mbase_start[cur_match+1] == scan[1])
-                break;
-            GOTO_NEXT_CHAIN;
-        }
-#endif
-        uint32_t len = COMPARE256(scan+2, mbase_start+cur_match+2) + 2;
-        Assert(scan+len <= window+(unsigned)(s->window_size-1), "wild scan");
-
-        if (len > best_len) {
-            uint32_t match_start = cur_match - match_offset;
-            s->match_start = match_start;
-
-            /* Do not look for matches beyond the end of the input. */
-            if (len > lookahead)
-                return lookahead;
-            best_len = len;
-            if (best_len >= nice_match)
-                return best_len;
-
-            offset = best_len-1;
-#ifdef UNALIGNED_OK
-            if (best_len >= sizeof(uint32_t)) {
-                offset -= 2;
-#ifdef UNALIGNED64_OK
-                if (best_len >= sizeof(uint64_t))
-                    offset -= 4;
-#endif
-            }
-#endif
-
-#ifdef UNALIGNED64_OK
-            zmemcpy_8(scan_end, scan+offset);
-#elif defined(UNALIGNED_OK)
-            zmemcpy_4(scan_end, scan+offset);
-#else
-            scan_end[0] = *(scan+offset);
-            scan_end[1] = *(scan+offset+1);
-#endif
-
-#ifdef LONGEST_MATCH_SLOW
-            /* Look for a better string offset */
-            if (UNLIKELY(len > STD_MIN_MATCH && match_start + len < strstart)) {
-                Pos pos, next_pos;
-                uint32_t i, hash;
-                unsigned char *scan_endstr;
-
-                /* Go back to offset 0 */
-                cur_match -= match_offset;
-                match_offset = 0;
-                next_pos = cur_match;
-                for (i = 0; i <= len - STD_MIN_MATCH; i++) {
-                    pos = prev[(cur_match + i) & wmask];
-                    if (pos < next_pos) {
-                        /* Hash chain is more distant, use it */
-                        if (pos <= limit_base + i)
-                            goto break_matching;
-                        next_pos = pos;
-                        match_offset = (Pos)i;
-                    }
-                }
-                /* Switch cur_match to next_pos chain */
-                cur_match = next_pos;
-
-                /* Try hash head at len-(STD_MIN_MATCH-1) position to see if we could get
-                 * a better cur_match at the end of string. Using (STD_MIN_MATCH-1) lets
-                 * us include one more byte into hash - the byte which will be checked
-                 * in main loop now, and which allows to grow match by 1.
-                 */
-                scan_endstr = scan + len - (STD_MIN_MATCH+1);
-
-                hash = s->update_hash(s, 0, scan_endstr[0]);
-                hash = s->update_hash(s, hash, scan_endstr[1]);
-                hash = s->update_hash(s, hash, scan_endstr[2]);
-
-                pos = s->head[hash];
-                if (pos < cur_match) {
-                    match_offset = (Pos)(len - (STD_MIN_MATCH+1));
-                    if (pos <= limit_base + match_offset)
-                        goto break_matching;
-                    cur_match = pos;
-                }
-
-                /* Update offset-dependent variables */
-                limit = limit_base+match_offset;
-                mbase_start = window-match_offset;
-                mbase_end = (mbase_start+offset);
-                continue;
-            }
-#endif
-            mbase_end = (mbase_start+offset);
-        }
-#ifndef LONGEST_MATCH_SLOW
-        else if (UNLIKELY(early_exit)) {
-            /* The probability of finding a match later if we here is pretty low, so for
-             * performance it's best to outright stop here for the lower compression levels
-             */
-            break;
-        }
-#endif
-        GOTO_NEXT_CHAIN;
-    }
-    return best_len;
-
-#ifdef LONGEST_MATCH_SLOW
-break_matching:
-
-    if (best_len < s->lookahead)
-        return best_len;
-
-    return s->lookahead;
-#endif
-}
-
-#undef LONGEST_MATCH_SLOW
-#undef LONGEST_MATCH
-#undef COMPARE256

crates/libz-sys/src/zlib-ng/slide_hash.c

diff --git a/crates/libz-sys/src/zlib-ng/slide_hash.c b/crates/libz-sys/src/zlib-ng/slide_hash.c
deleted file mode 100644
index d25e710..0000000
--- a/crates/libz-sys/src/zlib-ng/slide_hash.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* slide_hash.c -- slide hash table C implementation
- *
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-
-/* ===========================================================================
- * Slide the hash table when sliding the window down (could be avoided with 32
- * bit values at the expense of memory usage). We slide even when level == 0 to
- * keep the hash table consistent if we switch back to level > 0 later.
- */
-static inline void slide_hash_c_chain(Pos *table, uint32_t entries, uint16_t wsize) {
-#ifdef NOT_TWEAK_COMPILER
-    table += entries;
-    do {
-        unsigned m;
-        m = *--table;
-        *table = (Pos)(m >= wsize ? m-wsize : 0);
-        /* If entries is not on any hash chain, prev[entries] is garbage but
-         * its value will never be used.
-         */
-    } while (--entries);
-#else
-    {
-    /* As of I make this change, gcc (4.8.*) isn't able to vectorize
-     * this hot loop using saturated-subtraction on x86-64 architecture.
-     * To avoid this defect, we can change the loop such that
-     *    o. the pointer advance forward, and
-     *    o. demote the variable 'm' to be local to the loop, and
-     *       choose type "Pos" (instead of 'unsigned int') for the
-     *       variable to avoid unnecessary zero-extension.
-     */
-        unsigned int i;
-        Pos *q = table;
-        for (i = 0; i < entries; i++) {
-            Pos m = *q;
-            Pos t = (Pos)wsize;
-            *q++ = (Pos)(m >= t ? m-t: 0);
-        }
-    }
-#endif /* NOT_TWEAK_COMPILER */
-}
-
-Z_INTERNAL void slide_hash_c(deflate_state *s) {
-    unsigned int wsize = s->w_size;
-
-    slide_hash_c_chain(s->head, HASH_SIZE, wsize);
-    slide_hash_c_chain(s->prev, wsize, wsize);
-}

crates/libz-sys/src/zlib-ng/test/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/CMakeLists.txt b/crates/libz-sys/src/zlib-ng/test/CMakeLists.txt
deleted file mode 100644
index 8b250ed..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CMakeLists.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-include(FetchContent)
-
-enable_language(CXX)
-
-# Google test requires at least C++11
-set(CMAKE_CXX_STANDARD 11)
-
-# Google test requires MSAN instrumented LLVM C++ libraries
-if(WITH_SANITIZER STREQUAL "Memory")
-    if(NOT DEFINED ENV{LLVM_BUILD_DIR})
-        message(FATAL_ERROR "MSAN instrumented C++ libraries required!")
-    endif()
-
-    # Must set include and compile options before fetching googletest
-    include_directories($ENV{LLVM_BUILD_DIR}/include $ENV{LLVM_BUILD_DIR}/include/c++/v1)
-    add_compile_options(-stdlib=libc++ -g)
-endif()
-
-# Prevent overriding the parent project's compiler/linker settings for Windows
-set(gtest_force_shared_crt ON CACHE BOOL
-    "Use shared (DLL) run-time lib even when Google Test is built as static lib." FORCE)
-# Disable pthreads for simplicity
-set(gtest_disable_pthreads ON CACHE BOOL
-    "Disable uses of pthreads in gtest." FORCE)
-
-# Allow specifying alternative Google test repository
-if(NOT DEFINED GTEST_REPOSITORY)
-    set(GTEST_REPOSITORY https://github.com/google/googletest.git)
-endif()
-if(NOT DEFINED GTEST_TAG)
-    # Use older version of Google test to support older versions of GCC
-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.3)
-        set(GTEST_TAG release-1.10.0)
-    else()
-        set(GTEST_TAG release-1.11.0)
-    endif()
-endif()
-
-# Fetch Google test source code from official repository
-FetchContent_Declare(googletest
-    GIT_REPOSITORY ${GTEST_REPOSITORY}
-    GIT_TAG ${GTEST_TAG})
-
-FetchContent_GetProperties(googletest)
-if(NOT googletest_POPULATED)
-    FetchContent_Populate(googletest)
-    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-set(TEST_SRCS
-    test_adler32.cc
-    test_aligned_alloc.cc
-    test_compare256.cc
-    test_compress.cc
-    test_compress_bound.cc
-    test_crc32.cc
-    test_cve-2003-0107.cc
-    test_deflate_bound.cc
-    test_deflate_copy.cc
-    test_deflate_dict.cc
-    test_deflate_hash_head_0.cc
-    test_deflate_header.cc
-    test_deflate_params.cc
-    test_deflate_pending.cc
-    test_deflate_prime.cc
-    test_deflate_quick_bi_valid.cc
-    test_deflate_quick_block_open.cc
-    test_deflate_tune.cc
-    test_dict.cc
-    test_inflate_adler32.cc
-    test_inflate_sync.cc
-    test_large_buffers.cc
-    test_small_buffers.cc
-    test_version.cc
-    )
-
-if(WITH_GZFILEOP)
-    list(APPEND TEST_SRCS test_gzio.cc)
-endif()
-
-add_executable(gtest_zlib test_main.cc ${TEST_SRCS})
-
-target_include_directories(gtest_zlib PRIVATE
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR})
-
-if(WITH_SANITIZER STREQUAL "Memory")
-    target_link_directories(gtest_zlib PRIVATE $ENV{LLVM_BUILD_DIR}/lib)
-    target_link_options(gtest_zlib PRIVATE
-        -stdlib=libc++
-        -lc++abi
-        -fsanitize=memory
-        -fsanitize-memory-track-origins)
-endif()
-
-target_link_libraries(gtest_zlib zlibstatic gtest)
-
-if(ZLIB_ENABLE_TESTS)
-    add_test(NAME gtest_zlib
-        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:gtest_zlib>)
-endif()

crates/libz-sys/src/zlib-ng/test/CVE-2002-0059/test.gz

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2002-0059/test.gz b/crates/libz-sys/src/zlib-ng/test/CVE-2002-0059/test.gz
deleted file mode 100644
index c5c3e18..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2002-0059/test.gz
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/CVE-2004-0797/test.gz

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2004-0797/test.gz b/crates/libz-sys/src/zlib-ng/test/CVE-2004-0797/test.gz
deleted file mode 100644
index 62dcf34..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2004-0797/test.gz
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/CVE-2005-1849/test.gz

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2005-1849/test.gz b/crates/libz-sys/src/zlib-ng/test/CVE-2005-1849/test.gz
deleted file mode 100644
index b28f278..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2005-1849/test.gz
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/CVE-2005-2096/test.gz

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2005-2096/test.gz b/crates/libz-sys/src/zlib-ng/test/CVE-2005-2096/test.gz
deleted file mode 100644
index 11590ae..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2005-2096/test.gz
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/default.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/default.txt b/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/default.txt
deleted file mode 100644
index 5edbff6..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/default.txt
+++ /dev/null
@@ -1 +0,0 @@
-OBXESYMXQLOTSVVWGIMGKKJOVTYKPPMYROFHSCXQPOFVHKBKAFYYAFTWCVOBPXWDSSFZCKBJOJUWPUQHKBNYZMCYEDEBXLAOREOASIEPAISNAZSXQKMWJSABFVSOXNKTGDCZKRSNBTWWGRNRZWGQEHKKQJGSGGFWJCETJVULWEJAQPAILMMQBVWJWMHWBSIOAXOQNEJYAQSPEOACRIFYOFHTBLZFSHOYGQFDGLLCDEHGPRAUFMANGCKZNZJBMEAEDDPZPJMMFEQGEUOHYFEQUKKHTOELBFUVDMNCEGPTLQYPDFTUGGOEUMUIAKAAZNXAEAKZREKXSZZAKFMHDZJFQDLLSILAMUHDQJTVMYIZWFEOPCKWVSXYDEOSGVWACWZNDDTOOYSFCOYHMCUSELFMSBJIUMPFOGDDJGHELQJSUAEEOWQEJMWRRBBAANVFEUMJZRQGDIWXOYXCZZLMDRHPJAYGUUJENSDDGBKDFRXMINPXRZJNAUPBIOAAKLMFUTZWAEWIBUTYOLPPNUWMFYJQIEMJYKVRNKRXGODFFRMMSKDBBKRJGUWOFMNKQPJLCCNDOTIWVGNWVIQINFPLJLEQRMNSVYFGNWMWYGKHBRSLPCCPHUNXIDKDGIELLDUIOXAJOZGIJVKGBJMGSCOHPRFVUPXJREGBMUXNSCBBRASVMNZHELWNHROPZGWIYMKESWGWNANICQTNICGQBJLAONQEEDEYUIGAOQCDTVBLSSACVCUAURKRLCYIHAYHZZCBVMLALYJKNVJTHYTFDDZVOQBUSDTPERXSTYJKCOGGFLBRQIARKTDBQHSFBBEEWYIEOOHUWKUGACNGZQMAHWPFJJOHMJGULPPXYTCIHIAVYTAHIZMBMYYZXBPLTRWNEDAALDOWVQLNFWZEVSDWQBBYHUYNOJYXVFQYGKSHGCRDPPRSVZWXECEXCWOYSBRWIBPZLHJKHWVTZYXEYGUWAXEUONCVLUGHLTCUTVSUQEVBRYYCIZESPFTGKDJKDQYNIXWZZYSCWIULGKVRJOLQNMWMKJKYOZGXFDUHXEFEFHUMHYKYINHXMINEEJAFYQLHEXBTTEBWGWEAWYODLKRFWATZYJXAFECXRPEDRKPJTJBHFQYFWLCYPMTASYYIHDGURAAUJYTKAMDUNZHXYGPHJVJPODIJAXYXONXEULMKEQRKUYAHLJLTVJUPMYUQSEMEKYCYBPNDDXRNZUQYHDBITAYHMBXSOETYJDWDAKRJGBIUSIUIKBQPSHOVDRCNSBUYDPAPAXBKHLIGEPMOUBYFXAMXDEASVXOUIMPVLCQQJRQNLIDVIRYOEXXIUASCSMSTQECGPPHPGDLJLCRJTWSHVOUNQNFTQEHOIQIUWTOFEIKBCWNLDYIJDUWPBIBBERKPKYYUWNIMOCMAUEVBLHBYLQEALQVTQYNTGASZMJWOPCUVKMJEZFKJZMCOORIKNUZQAPHVYTTSJUBBYFJJHTJRYCPRHVLZFPNXSSXXJDWDJQVSJVUKVWUYGPLBGUTBVLMNOFYUKIKIVBDCIKAKVEQIPBPQRLOSZXNIGIDKNGCLILUSTJXYFJZKRAJONNYAANNTWVDXYTIESYFRGQVIOLUBOHGNAGKAKZTRSYYIBADADFBHLJXDYPQKWAVHQGWZKKWUVAFWGXBEBNVPUDWCOMMSXJIVVLDHAWNUTQAPKVFGTYMOKTBDBQZTHHAWGRANXNAVWIOIPILFNUKUFVLNNLAFFPHBLFYMHYOZKABEYKKEDHYMBDIGAFUHTJOOIOWOLLKINJMOPYNNMBMRXNYZAHQYOTDNKWDIDBPSZJOEBQWPYHZZTHSFVJAQDFBJHBOBLOKJKIOEQTWPFSXZCKWWOXNEIDFXVWFPPEFTXLPHMFVPZYRKZVHHDWXVHCASKVDKHWNIUMJUEAAKSFYAGUUKLYGDVDPWMKIDQEUEDLZWQJLRSDMLSHKIOSDUQIDIAGIDEQZBUTVLPUFEXJCCJRGCFXNVXRRNSTWXCXEORNNMFJFJUMOWOSLUUYCOQKLTTUTVGSUCKXQGPHWFZOHALSARGDPDYOIFBXZCDEMHVNTDXTHZOZDOGCZYRXEWLWLPTMCTPCTYWJXNRGSYJDRCFIRRCLFSZMTVXMHASZQGVHHHFLGZKDGMGAHVNHXROKDARLQWIYXXRYTERPSEDVYETTARZTXOTUGAHTOHOOTMCJBZKNBBQHAECEJFUEQQYXNXWBAUIESPQGIOEABZTMSUIVNUIOFYGLSTUVHKPIVBBHAPSDEXZPPAFSLSJSKGEGKXQZGZYYYBFHEKOQUZEMBMTLXLLAJMEFEWLECDLUWLMQLNZDXGDHRMCOOTGWXKTDFKFGEJSLUEYWDGRAONPHKSKCTXQZCEYMQSUIWTNCQLAMABCIZAAOJCLGRBWRFCQKSTYSDDYOZOSEPYBBVEKIFDJOEVAAZBYYKHPKNNWKNIGMIBUDADWHVKSWCMSWBKQAHBNFMWKFPRSBAJMJCAFAENZBVDSYGEPAYDMDRJOUZCGHQNDAQQZHSBMLPWOFGNNODEZZZSJUOOOPBYSEJFZOSJQGTSUBQCOTVNAXIZFMVJUFWGDDJWRBHDUTNQOSYJEWTEZXOYUQXKOZSBYEQKHOAEUEUYOMJLRHGQKKCICCLNIKCMAXLJZEWOYSTVZWXDXSXWVEWJRTDDJIDEWOYXXKGKBHDEPXZFUPVYWJDHXJENZANIEAUIZBXRIZFHMVKOUHRKRUALDIQSAOLIBFSRNBNFZHAUSGGMYSXJROAPNFXOWSFWNRJCAEFJDNDCRQDEOACSMGQQSQIVVVPSTTEPWFLQGJFOXUKFEMTQTUZRNMUPLLQQPNYAIIOMGQETSURJIJDOVGGWQDIKSGZYSJCSVPETTGRKXOXPMRPEMCXAXDDQTVOWDUGPKRCKRRCBRBDEMASKWEPIRHBKGOFGUNVXQMTSKOLAYJKMAGDLLMOPHDAHXBDQMYMGVVREVFLEZPXEXXFORECDRSTSWXGRNRQPSAXXIZXOQPDLEBDHDAUOMAGPFWVMWCQLMXDXKSFAJZBLNQLLRYDBYPWDWXFCTGFHNJVKMYONKAAGXCALJCRHZWYODYFRXVGVIGYJIQMUOUYPGDHFVEUTZRLFILMZXFRXHNELGMKVNYKNITXYHGZDGYGLXJXBODBAIITGQNUJOKJTAUDJFRKLEVFWBARAXPOPPXXDAFZBWAYFAQICNUIRRVRZURUHGWMXELBHDGYVRNEFNEFSPZUNOTCUNGFOAWYCMKVCDTNPIHWLJLWXVORXFNSKJVRAHBJCFMQHVMLKAKBQPMGQYUEPHLQSZJBORIOJAPWJLHYBCXTMZPZUWJIZVRBOYWQIHRWXGYWQQZLTLNHZBSJLIBKJBQNNWSFLYVBYXUZFSGQZZYRPPKHYJCCYZBIEWATBDYLJLJGNCAUHLELJZVYRPJNFQIFLIGLEPQEVOVKASMSJZRUPZNQTWZJHXLVRBCNXKUXZCNQKHIJMBFPXNLPBPYUOWEIINXMUYGYRWPNQPBQPRFCBCIIKWKJWKQNRNZAFQCXUUZFPHBMQDSLYKQJKAJNAHBETGJPYAHMWHMNUJWMUHKZHPNPDZQEPDZZKGDQOUWIUPWSBPJQSBXAVFXJJUFTOCRKJGHKASOTJXBLQRKVOLJTOUUUYXQQNUSJCOILWWGYRJAZXXWCXAZFQITHUYREGZILSHQWSADJRTIVYTZSAGAXQHDZYZERPDHQOLOFAIWNLYACZRXKFKNOHQOFXFIKYWRRDPUFNTSBWQYGGQFNSRBPHBATAWCSVFANTUQIVFSEHGGELSJAUZFRBDEMBFXMFMOTENHPWKEVSIUOEPXPCKMSGDWWORTXBPTAOZPLNCKJUHEPBLCPRRXLGXUHKEKFIYXNJCYTNXMVEXNNAGESQWJGSFBCCQXLSXQJVVJUIZFNIUNAZCVCNUQWFPBCPRSLKIYLDOSOHOPABPMIVLSYIZKJHBCJXBTQHVEFIQHYEGYDMXWSNVWNGSAXBSDBCBDOFVNUFFVWGHHDBIGMNPFLGPGOGSUFYISQESRSSKCEKUTTUTNYYPLKSEYXIZGBPCQVRYGFKYVDYVKKIONENEULDVNMPKFKTAOBDKBCJBIWBKYLYESVCHCSCVVVWXLIMUDNWJQYJQJIGVGJXZQPUEGYTENAMCPDMAVXXOHZCNPWLKGRSQGCNXTPZNTWGFRDJIOSPAFNJHGUHXCDLWSWEHBXHOPAHBQMKECIGDGVGKRYRGLSIVCYQZAZJWGDJWIFUOBIHRENRDKEXQRJCSNMVTFQBJAIAKTPCBINZDYCRLPFSPCNQLDJYSQQWDNZNIEMYZCOIBALBGXXOLLRIVBDQUNXFLMGRIHDFDNCNCFBTKMOOQSLXSONNDFGNWGMAMGIHCDFZZFPAUCOBYJCOCHYVDKNDSOTVGMHSWHOQFCYXYIMFHJCVFCVJGATFWRYPYLEWTNFVTZDATIWNNRYQFTXDGQPPYQYOJJBYSJLADOODZYJIWPIWYQFTGFYESGCCOJFOSQWCQDULHBXAYFDJEJOLOBHTMGXGNFUUFMDIBXDYFVHLQDURYGCSHIYGYJHMJQUFIUBWAKDIFXQEUGYKIFMMSYKOMVNKCMTYXWIBEYNHQHNMYKSPSZTKPTDGMODMAXEHOABRZOSYYLHYWPIQQFMXODEYOAMXDWIFNLAVHTUHSCPJQGRMQNSIZQXNJEEFFVOYAZMQTPNBGKMXYFLYCXQVMXNITCYDMKNTBSNKPGOFRMAGENQZQEPUMRLHFIPOZSJDOBQYSHDETQCBBLXJAMHIPPHQIIBNCAOCVCOHQAPYCYEJBIVWSJVIOFZYAKFYEIXVDVIVAXJZQZKUOCGGBAHHPVOADXHBWEQRMVRBKOONFLPDCKKBFFIZJIKRYMEWWYATRBVIIKBUACMLRTONKOUXMZCGSSYFCYMNTBVIENZQXDTYNZGOKCRENDDTNZOQRXLDVZXLOTFOVYAZEEHKXRDGECGCGXNVMYOKKNIQPCPRWRAHKVPZSKRBMEAAFDAWXXHJUBOUOYQWPLZGTMWWYFBGBNUAQBSRHKNUGGYYJOZNEOWWYZBMREVSOVTWVLUDCJWQGJPFHPTDHFEQVJJIYARMBGCTSKXZQFGOXOXHMWBOHMEFKRWKJPOKUQRQLCHHPNWEPJFIAPSYAHXUPHYOAPABLLDFZOVSJFNNHVDPNWXPXFEYADEXFVRWKVBVCEOVMFIKPMABJUBGOGCDADYIEWZZZCANXEXMMFKHOWOMJRJTKBJPYRPHNKHPSQRJXJNQPORMUKIXNFRIXUGLECEJYZXSUFTROJJRAAHGUDXXSPKOTBUWJPMVUDQGBAPSQOWYDPVVEOISXLDKOPWANASRPSICRGBNHJQGPSFRPFOZYIRYEOFCQRZWCRYAARQBLEAJDQGQVIFGVCPFSEIBAUYXUXFQMNWFNLVYDFFDCVAISNQYGNCXLKXERSQKRJOFLTSOPRPQQONCVGVBLALFFJLSTSGNTHWHHBTNCFRQLWTGKPWIBWSUEVHWFHKAMBOQMZYGAZRAEJCFBEWEFLDGPMAKCQXCLFMBIVDECFIOOXPCTKCCJDZPECXVACPBOQVWNYAZGRIFJETXUABRDPOQOGZLWPLZETFWVYOZHYGSQVMNUMYIAPFCCJNQOVKZCEMMNFRLVTKDRUTDNAQXGPTWYGRCEOTQMLESJDAKGIZNSTADDAIMCUKZQLWYUPHWSQELFHEZOFGRBVUSOYZQMGJFBWWCGYBEFIHCCJKQOAFXAPJEMFJCVZAYESUKQVKHGHGJMTBRECBCLFMCIIBJPIWFRROVXDCPTTEUFOMAFJUHXLAHELLPYCVZDPHKTVGLRVVUXDKISXVAIYEXVWLSQPGKGPYXLXIYQSPYEQZZVHAVHSNASXOWRFMRSLNPUDTWYYPJRFGPJIGTZRTNXDLNAEKRBSZPMZHWPFPGLZVDTSAXANFKOPCNWSRWZMEBVUOCZEMLSYVDURZQUVRZOPKPJMRDQPBGLZCFADBWRWKABRGOMGKIOLZEAJHXIEIPINCETSTKEGEDYJNZBIWISBSDTZREGNOIXNYFQFPUBQLGWKHTJVSCTUHKYWZPSIIBJFKVQPPQCKIKNDEIRXHIBAPDDXYIBMWNUPOISTKFBXDELZFYBRVAMLLPQQXGMBMNBTJRCNCGGZMHIWKJNAFWYYCHEJVYVXPUWZHBWPKHMBJNGWWLXRRKPZHQLTPKGXLWZICJMFIVPRLSXVUOFLWNHFSZAUJTYFRTSPSDOEHFYFHTNZOLRTYIQJQSEEVREMWRKLEVXOGDQMQZQJWTHOYIGOJLJUFBSZJLHGYRRJSZRCNQRCNVBDRCOYENFVWULRBHOGLLRKWMFXEZKBZDMDKYKFJRIHGUZOHBFOPJLMWXECZVXYZPYAIKYDDVWAXCMPKOTEFMIRXDOFFQCNAUBGHGYVFOCONJWNXDMIANMLMJOIAHRPTVNYWLSQBBTNJLBAAQMTJXLXADGYLLMUZPCYFOGJGCJORRTGSRLDXYODWLVGHYBYLHCGPWWEYJPMSAQWNRNHPYLLHUJEZTRQYJVZEJFUQPVTIKFITRVXUODHQDNWOXVHXFWDVRLTKPJVKKEUMYFDOZJOSCHWQQTFKUFMFNQNDCRTVHSVOFPUOMVDEWGUASIKYZPJUGIDUDPTOVAYGMQWLGSUMCWOEKCGYOMZJNRVSUKJGYQBFZMUINTJFOQOVPHHJRNCSUPDAVMSSRCYMJGCGRRIKLAUTKOMWRNKOZETUTSKNRHXRNDOGXBGUGTIXOLEKKOTBAAYFPJHNWKUNMDFZUTRWTLWIBFJGMXMMZLHTJLWVVPAFGJVPKAPPIMTMTOBKXSXWOEWIWIIHPJGKDXCNSYUKAWUCBHJNYHIIDJZRPQPVPYIZZMUFCHOQGNXGAMHEULGHOTRFKFLRPAOYUQYSXLSVVHYXGBLSDOBBZRMXEQCBTNUOATVMYSTKGKQNEUUEWCWBNGWMWIEYDTLBVZHXDUUDXNHJRXOPSLPTTHSOGBGBDSNAJWCBJHZGIABQFONILLESWKMHLIDLBWIDWODZFFKCUHMPMBMYEJUGAIOECPPIYQGFNJCLAHJUQMNTHFJOFOJOTRJDXMGPJYFVDCHLCPRMYRRLMQHQJYQLWMBDYFFZZYWSVVTBFMHXHEAWXYSXTWBNEZKDOUIHUQADPIUKUJXZYHUUUFIGBQIHNLRXUOVMEUSILBUBWEBQRQFQMHOWCEUVUXNNJLNNKGSSEQQZNBDVJYWXLAGGHSBUUFAKMYKRHCATRTMTMNEQHNQWUOPNAWHOCGIEROSOMDJJCQQLSXZVZRVKUALQTFJUOQWMATSZTQBDINTLRDTMHGPIAUONZVDRSFOTAFDNWLUCSYCKAYVCAAYJOZPHPDNIJOGBOGTDLNXHYEJAEECJFZNDMEIDSMGEWTWWSKWSQYEDZFKSRNPQZTGNYRTQVWDBGKJYVAEJZWSQAHWNOHNDRHZAUYXWSAMCNPJBYLNPIPNIFGXQDGRZTQPXETWLZDZVKIQILLEIZDDFLAPQFYFHTUHZIOYZLIGTJMFDATODQNBIHQIOZUTQQGFDCSMSZAFKJFXXYTDGWDVMNLTBZCIDNWXWYXANDDGVPMWGCRHAQOVWPXHVWBQLSCXPPJDYQKLVDBWZBNATRXCPYBOHIGLREODDUVFWLRDSOXYICZPITCQXTJCYGNQPKZXGRHOEKOZTMAYZLUHUYPJKHHFTVSDKELBLVBFNULMMSIERUKEVLCMBRBBHOFGVFBIFFXSYKAMSVXDYUIOGBHLKNNXJTEWNDQJNRGJMKVPFRIJHKFRNTTDSPRECSOIFJUXSIEREFEIMXBMWSBGDJPVIUJUEPAQOOOQZGNZORAKQOVJKDAWSLXSJHQHUIASLQVJDWWXLNPVSWXOGMGUHLKOQUYMGTPKUUEEEHXZVMIBDQJSNRDDFZEOEMMOIJLEYDCDDXGPAYEMXDRXERZYPNHNWOLOTPCDDLLHQPLBHQDKTVJNMFGAWXDHAONUGAWQLTOQSCOMVAHYTYHXQVBKENQKNVOWAGEZVUVWVQKDQPERCLETOCMXIJXDMJRGCVAQUMWHDOUOQQAXOHBXJDRLYGEWUZTIMSTMUCZGOPEBSWIQGPGMTIEGWNGRQAUQQGSLVWKCZTZMOTUOVOCDYLPGZTMNVGHSAGHRGPVTEYZKBVUQNYTHTVMWIEMREKWBVRXLHEGZMHKIWOMOZFPXDPXXPOYFWRLUSBBFXRZWGXAIYYSQFEWQMWRHMYMLFFMBOGAZSDJRENVAQXGDCKMRQYQGWVIDECLOMNZYCCMRCLXWPUIWGNATOQZUYIRDXGCOGZIJRDBYBBNFMOEPYUUJYZJSGICOMXWBAUMEBJVWGTRDRYQGNONJZXSZDJLRAMLJLFTFZUVZZOEOLKFOGFODQBWYBRDMUKEFLKDUADCGKYTZUCVRUULXCXMKAZCBCUQLPAWCHHIFIPIXFZRJHATGQCRWCCMSDXRHASKDKACAVAPMYIYUEXZFJCRPMOTGZJLCFOHJMRRCADBGLMQTBZAMGGLIULVTBOKKZTXRODXTAZXQSXDHPVFFPFLMJKDJNQYGLGUNVIVUWJBCWDYASMCYPTPFZBVUCMUWAOYOUBZZTJEQNIZMPPEHRJPJJKAKHRNGIHUGRGZGRYCOIWXFDDHJKQHSOVNQLYZLABMFFWVQXBPNWNGYMYBLPTLLLFAPTNNBPLCKOIUBNPNCBHJIVUAVRENTTPRWXENQAOUPPEMSOIOLXMQFIAYVPLSCZLYDIOLZIUCBIBYNAWSOUQXDYZPQQHWAQLZCJSRDUUPEKFYWYEFXOHSILHHIJDERCNZEPHGODFOECPZONRLPCFKGUXNFOPVGSQCPWNMAVTPMGSPJRRFIHYXQAGJQWYBBBGTFAAODFFZKDGCEZTHQNZKXKQWFSJKIKTWBZWWRFYIOVWXXZYYMPLUJZETDXGJUASQTPZVBPYKHJLHSCONRZWBUZESWAOXWUMPORTJCQULFBHWIOUOPZIPLZRDCWOCQXHPKNHOYXHTKOFFVIZLGMJMKXQLYEURGMQZRCQGPPLUDLECVBNVBHAWBITJYAVUJKXPAKZDBJGMOFUVOYVAESRHLQVZRDOZPZDWJDWGNXBEQVIKHYIXRIANMIJARWDSAGDKQCYRGZZOFEGXDCMWCNYHDFPOYKSZIGNWIUBSAXPGPDRKERFWILYDILHHXGKKWEWCLLUQDODMHSAHQTOXPLMTTVXRIVIRTJRQFXQHTVREBIXOLZSFNUBXRFSQHSBFHUMMTNVCNRDCAQPSYKEUYHULCSKSYULEQYMQHHKELFXQIPWPEBNBCLVBYEBTQQAZKHWJGIHDVFZHDSHCZPHCWOKRWGSLGCOZEAYLTFJSEBTMOELSJXEGJGCOQPURSZOGOANVZVBTTGLPJYSNUSJUCACWAUTJIAIMIAHLMTVRYONFWCHRYGLSJITEVEFHCQQKLVXMVMAQNEKMKRFJIEUZAPKXDRTHBKEDMSCMNZHOSLFUTXUIDFPKOWRDRADBCWFDZSAJOYSLZMRFLOPUHMXOEECQDNRDPUXFQPOYAKWHIQWIFVNOOAQQHGUYVZRFCLYJYYTROCMSRKXLBHMCBACUNCYLMEWEHTUPFFRJEJAWKHYJUWBUQRKFMHOYSBSMZVIJNRUSEMSMXLPQAKAYVGCFARNHOHWTKINTCYLVNWRGALUZBIQQFMQGBXKAEUFDMVOTJLZGOGMIDGUUSACUMFMGFVDZIRWAWFXDBNJZJAOAMXFVBNMJBEJNMYVOJWLSBFISAKMCOVAKYHBPHHGLYSLZLHPDFCQRPFKUOXKFXZASEPZLMITPDIDENSDCGPFRQKGEZQNBMVWMDGUJMPHMPZAAMSAFRQGYAAGXGUGKMLVMZSSQSREGSOVWUXGQIQXNVIDJDHGSKNCWYOUOEWGVESAKGSMGBGEOZMIUYOPIAJXTBQNXEGCXMVHMOVNHLBFKQFNLOEKISQFNEKNDLGBIBAOEWNBALNSIKGZPWOMLAMTQZPCGLCTPDHFQBNXWFTAPXFRCKHHGLPXKDIXEWPYWOAIAHYJEVXCGFBVROFIVDABRSAHRXGALKMXWARMJZMNBFAMSNXOXOFYMFIXDLEUOBQEHZCXRZYJNEXRDHJZSWZMGAKWIGKYXGQFSEAXTXUWHOKWKINLVBVPTHQULCWKGWKJTWVWODZFFVMTJIATOYRHKRUDKVHJPJJDFJKICWFLEICXOKTGAYYLBWZONTDEEHFZYNPAAJHFOPZJNRWTEECVMRCQIJZPTQNEQDTNKLRPNUWYPFFDVEIWRGQFXUHIGRTZWLLAAGODSELKYMRIYAURIJSMJCCACPVAWMJVJHYNPHPDBSGSXPRNLFOMRPPPTPIMRQAZFEWPFTEDNIBANBUGMSCPJURJZSZBLFYLFDHVIJMLWOQRUOEIQSZYCBVEALSIZMSRNRSBJROLAYNVRHYBDPZQEUBXAJXIDJYRMGULISLPLHLTOONHKYRHRCYNYZFZXIVGMYXNFMKLVQNOYOIQISIUHUTUJIGAFKENBJWMCLGEZNTSMHNUFZLUCJTITIHAZFKXDAZBRUFQXWJEMPTDVLXBIXDPLBPHLZGEYYFVRLZBFOIPHNVVFOJZBGYMRYLMXHJQVDQSFWDNLRKBHHUXWHGRCCDPNVSCSVLXJLHARQZFNRKFHVNKATOKZNTIZSERSKNJMKFSIEMWLUXHRKDFGMOBALHUXOYJRSVAHZUFMZNDHTMYKKPCMIVWBENKTXEBRHJUGMRXHHRWVVCTRTIRQPILWKAMKGJIGMQRZJITFOVHLYGOFANJGQKSTVBCGBVJWRTDABQOUGNXOGBERVOHCPCXCOTREQHMLGLFRLFTDDADUJZZTZCBKATKUAPTRQUHGWFUILCISGGNLCBCAJGKXIXZQCCCJPKKVMNXEDCRANPMFFOKGSPDFAFQQCTEYVAUVUUENWWVQQGHGCHVDGSWPGBPPISWUPEDNODLWQXNSHYQAWJANXNKACXXTNGBJIHHZSBDIBHSGPZGTWXGQVPWEBCREOZPAFHNFANHLHVCYNZQMIOFOVSCHXXCQQSIZMXTBFCULNPCUGZMLWXSDAHRFENSWJVWXFCATCDXZKYQRHCNQDFGRDAGCYDIGPYWSSPTSJZOSCOXEBOWXNQXUGQBTUTSDKHEXNRKAWPLUVGWVPEBMGBQLMKHHNWRDOPCUZZGBNHBODDNLQOWRWFBMXDWYIXIXGGZWIYUKXWRIPBDCLQGKMHBHRSUJOYNBXOMVYQPLBLHEIHQAGKYXTADCVLXKGZXBAXLOXWBSLRMMMTPTXQRYFVFTHNKXDFYOEKCVMHINLNACPQNFHVPYMDSUHGTSWJVZHSMNXONFFYCEZUEGMLIBIUGTRMWQGVXUZCRUYAXCMTXCCGDHSTIREDATCUSTBHGAURHOPAYKCYHOVTVEYWPYGXBSVTQAFGBRNVEDMXDUTWXXFWUOSMBOKJEGSPSFRYBRXYFFCJVEMEYPKSHEXHUBRCHZTIPPTMIYKRDSUJGICXPGATHUNVMVKLEXEROYTRMYOGCQTMJWLSQMAWUUIQBDRNCCEMHWKKIVIEKCVBDEHKRZARARXLTVASSMHGDTTWDVYIJWITWJFILRABYGEOQPCHHFXXRFMOYKCPAQRPBOJJLADKVPDSMPTAXTMZJZQPMQOQBECGZDDKBRLDMBZZEBJAFXGXJNAZDEFBCAXBEFXPSETVGQXRZBGFMBGECCBDBAWRYIVJOQIRNGNYZIRFOPLESXVYVGHKRAZQWCQWIKPBYLFZBRFGFDLYNBYZRYDVUOUXECTBFFAUESCYLBFGYJEZOBVQQABDOOTQCNUNKZLVOHEUSOXZWKYSKZSPQNVPAHTMXLLBOUURUXLFMYWKQGTPHXUZJRUOTGEABCBCNZADCKOEIWZBWFUDMOLHAPQQNNARUOWZLADHNLDUPUADBBZACUPKDBXEFZOQEVWPJMLMYQWSFFHBYKSBMZXLMAAUAWFRWZGYUSDGCEGDFOWYPMWXIHVXKCLWEYXBVQSPMEQNIBBHQRKVLNKNQWEFAWUJSTMZTZYESSYIWLSHGCGRDSESWWIDWTOEXFFCYDLDNDNIEYLXZHIXFZSOQRBYSWLPVOWEEYMVDAGBZMAAAGMZSCMIQFOHJKCCAWJHAZXNIVBHIKKEKGUQIZPRLEXPCNJSTIQJOWUVRDIZTHFQCTHCWWMWYPMPMEIVFAUQOLINCKHXNBADPHNFVZOZWIQCYVUGVOMZTCJIRIPKVVZZPKQAZWCQNLPTAUVXJGKUOCJWUPPPHPAFQOTGJTFRFQVGOXHGBKQIPPAISJIZKBYNNPAXAGCMTXDYRYNQLMAEKYLORYHPJJNCHFSHSUMEOPJNCFYOLONJQAGOAYHQKZXKEQOHTHUTBRISEINMZZZULVLGSNVJUCLQVGPTHPNCKHNRJPPCVMGWZPTIOACQWKUTTUDUAMIJFOZHNGNZHFHYWUFJEJLIWORKAGEBYCQKWGIFOOSVRDRFRQTQUHSZQSCIJUAFZTBWXTIVUFBLDCAJWFBKEPTVVXPZGOHNNNNWYLLIDZHYJGWHCJUBWDLBSXUICEZKEVBCPQGWVIKLTHGVWVAAQXXMGCFTIUGNSJYAMOWAOYGTYVYZPPBEMGGGZZQBUIRELHZXTZSYMNHVXTOIJRYOUOMZNNHGXJJKFMCLTGGRCTEQSXWPZJPDECPUAMGXARWINTDXDDLSNHYQCGPSEDSNJITLKJLZRPAXGJOUMBVFMBRKEZYOEBETWXSZJYSQWFEQUDBPYNYSBRDJOKBFXXLXBNSSFZBJLEIICFMLFXTCOLAODHEAABUKRQHGYSEAZPWIJHZJUJMJIFVUZYBZKSJOFSOVQLYUEGDHVIUMAKLKQJQERNZLLYGEDQGDQCCFOKJWBUNGQNSWMLPFWTXVGAWJMQNBDLYIMXCXNAHUECCILVTXWEMPMXNZQDVYMUWOVPRDOHDHSYKTYEZPMOFKWIXFCGXWHANETZSTTISMGHOMDCTTZIXOOCFRLFLIAXNJWVIMQWEGEZUARCLNBETGINFONHNOEHERRJPRYNBMCSSIXVHCISSUXUXINVIKIMCZNPXBIYWNWQDEZTXDREVXEMAWUASQJISTRTDJMLSQGLQVAURUKZICWNBXQJXSNBZEYKPTPJWSYDCXFZVPBPPSRYUOQQQDNFRQOWVYPIMZPBQAOHTZMCUGJLNILKFTCXQIHQCXBNEKMBPUNULWCNYNMCSFTZZLWPCBUUGVEZYQYQADNHTDFUQWWLDQSBEUOJGLYBPNUMWCDPAAFMGMWFIVLDMXFQWCUGMTMXSGKZKHJGSKSHPHGSIFVQFDTCEBAEQBGCYXIKWJFNUSFOIPHVIVSDCKNPYEVPKWENBFHKYZYTEYULFTGUXCQERPDVDYRTGCOWLIWJMDJFDFHARDANOPOOOPJKPVALZSEYDVSABYLHLCLSQXBVDHVFSRHDKHKJWBGNLMVYKEEECQPPUWOEMPEXGYCQFNCDKMEGPBVUMEOMBEDMCQGSNDLHGMGDMTPSPYOHBZYNBBMPSOMAKEHVCSCEEENUFMTEDDKKCTOXTQVFQOJNSXOHWMMCNTOVFFXHHIBTOTRTBMJUXTAVBUKGCLCKTOJKAZYRHJCOXGGWGZQMJNGGTGFMEYFSYQPFGFOQHTCQBGIUZAJLJJTYLMVZUOJYCSJFOXIZKOJSSGIWSBYYTQOUJDDELVCWQZXHSCGASBZQZSIMTPJHBVGXVPYLDNGIPCUXFAJILVPXTTBCSIEPABVBETVRCXDSDGPETFEFGKYDPABNJIKLMBINGAQJVPDKSRFOWARGITJKRALJENOTDNOFQDRUSKYOUGSJZQFHJAYKFCYNJGWTMYPREHKDXGMBQEKTEMTEBYVXYGGLSBWGAKJBQFEORFLJFYMTJLPPATMOUVESREKJRLOZBOHQLDKLJRHBPBHXVMBTJJOITGXMXGAQDATETWKYIKXENGMAEAMHYXRPPXBIUCEMSKSGPTIWSQDXDLXTPGEZVLENCQKBOMJMQEZFVDSJOFGSFEFVZVUPXSRKWYPNNHUDQSMFFZUIKCWVHGZSWFLXGLXDFSPITBEXVPFOALBIMXCAVIZUNBHDMKVGGXUUXANWXSEGTGKVBWXXGHVFIVLVAGVSVJJLKGXEYXYRMPIKYEFGNQKRXQEBMBADMLSRNIWBCAISXVDZVQHPIPXQLSKXSWUMMMAJOUXWSOEFHXZUEWELFVKKKIJYPRWVYPIJMYBZBDZZMTIJRKUGEGASHZASEJPUEYQJHIRXFQAHEUGWYDPGCJCAGBCLQLPGAPHDNVVWKJHBCKXNVBOJGOESBJTTQWZXGMUHBRLHEQHXOQFJMNSRYWZURFQSBXFCOHRHJNIQQOIBRQUWQHEGWIGSCWQYSEYDVBFFFJXYCORRBRULIJZUQEXQUMLNOMTRWSHCRSVFQSVKKSKVTRRAHLLYKUKGQXZCJHTZAJQKRCYELVNGDPUACTERKRMHOREGYUMGLLIFEXTFYIUERCDVYDBJUMDDUHINQPYWOBHBDDPOTWPLDZPAVVZHPSEDESRDFVGRZETCMTGZFVGVVZCDZEUGYFSZZRPDBJVPARGTOCVPEQOVCMVOOJJUJCXBIBMNRDBAGOJBTHKZUAYPIRNFGNENKLQKJYHSFBPQCURRNZULGKXJTXWYOHUNXPPJWQLALYACFUVYEDAOOJBXRBYGGDQWIWXONWLCMMIGGJNOVIEMZKGBHOELIUDVIDZMXODEZGLVCAKKDKZELECPGUIMAWROODHLMFSSKDMOQCIQBQJWGQBFUCQLJUMRAKYBOEYVXCQTJMYCUZLOXQFPDWSRKKRUUVWUQOPZAUUMWZPSVQMCMLINZOXLFZNRJACEESVDVEBZZJPWNIJAIMKTBXRPSCPYVKTVDGLLRDZOGTRIJSGQLOREUZRQJHJBEVFNXTFQZROKSHJUKXVAVOYGMWAWBYWSBWHYUCDWBNHWHNSKOXSLRTSRFAJHEWVLVQSPDSIHHONIBSPYLZPXTQKLVSSCELGVJCUWIVTFENMPTFMZWXSCXXOIDADDUGDSNFQVAVAYIJZLNYKNNLCEIPKFZPIETWFXXZXSFCUBRTPAEOOEKMCXACVBDBFXPKLBRZNFTQSHEOCECHWESZZFXICIARIASHQQTLEENGCGBHHHXQDBUUBQYGGFGURYPWSMWUXXJHOPCXHSEJQHWNSMJBPYYVMUCSJEKAPFYPDMMSSFTTNYXTFQPYXJEPFEPSBODGVEKBZRXRQNODGBCSVEMWWYGQRTMYIVDFOIBBOCGLSFKIQGUDXNAHMVRDFPAJYDZNCHMDATHJRJXTWHTGBYUKTOPOSASGHTRZTTHPUNEMEFTWDOSBARKQPQDUEUXUZBTLESCECMEIONDSXHTHBKBZEXTHFPQMMNCCUERGPBXQHBKCLAWJMAXNEEHSANEBBVTUBXRAYFSKTSUBORMFOMOJGGCCGDSCNWSEKZFSKEPFNTDFGCDZHGBEFXOUTFTTLSBLEFFPZYMHCKLKKITSTXOUGTIDAUKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQIAOMZFTFSYWIZUVEWBYRASNEERBQQZRCLIMRCPFZBBEHYFKQQVIVEOZRJGVNGJMWYRXLUIUPNPOQXJPGXJHMLOKWIZYUGULZZOKEWWPGKOXAGBOUXMRMNJBDTOBSOBBNUQNAIOFBMNQPNSKTVKAUNPMXYDCGKNDXBVDFHJJSTTQKQDTTRLNAIFTUKMGHGBMMHHHQLLUKRAUINVQJMFIOGJTZXMGVCKYOUTKAWEPIXSGDZTCWIQSPZLORMQFERHAQDXTYGYDCXCHGCSQGWMCWRSHYNCCCNJCLINIULDINOSIABUZNGXZRYWVPPAUBAPUZUKCKNSXFTIMGPNVQKLGNHVCDAASZOMZVDKKDUMSZWJVKGODPMYYVZKQSQLUMFAIZWZJWTDVDLPDWYPXEMCEHSLGPGOPUPFPAFOKCUVRSPYCVKOUTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTKLHWESYRSIQHCINUULFSXARVWHNEWPDCXPAZFHVFQGRWZMPHKZQMKVVFKKREAPSFGJMPCPDGEKNNLVEVOWIDDHTJZDIYBMWOBOSWHFITNIUEVEGGXDZYRAIRWTHSECVCCZETCBXGFWSJPHFLCTUNESIKYZKJCTZFOMBMWYHTTXRZKSTVNHJCQJCQLPHFANJTGZXOJRGGMYHXKQVCLBAAKUPWGUWGXEAHQBGJRKABJEUQUKOUABOVZDUKHRRXSBCRCHDFDUXCRZCYCHAZCEGPJFUATVHUHTAFLKSHRYVNYBVXUFUFYXIVGRBRUWPZZRGGNAURWMPKFLCJUGYBJHHTJHCNZQVDVLMENSPFDGHRSQNMFGMUXGPUOIFDXOCFCZMSSDCSILMEYHDIRXQWTOEGSTNXEVSGJGMSTTPKRKAYXHJZCTBTJICBESEBVQXQLRTILEGHXKEIWURTWYLNBFRCNQZUMPVBDVJFNHXKWAKGQGJQMEFFOQDDCQGGMWARKVJROXMKTECKOYWNAXCIVQUUWQCTTZWIBBMTMZGDJAJFNDLVCSALFREYMTHUGQWFYXALWTTDBLDRDZUVWGHBVDAAIQSJGTOUYWTNNFGAGSPGVREBHWDRRNWOFHHQCANZCVDCSHJMBHWRNNJIZWEYFEOKLCVAXDEGHSEUYZHPTFECVAJSFUSFMCGQLMASXUPQYQSNYRSDZVWZUXCDNVVPGAUQRGCQFSQSDEBWTXZDHVDXJMMNIYAQYXEPJVDKPKQBSMWLATYCUWYSYOJZHUDSXTCSHTRACDQOQSNCYLMXJBYBBWKSNHYAYVRLCWFGAZSEVBIUJETIVGHEBDPXLVFWWTCKOUCOAOPMUIRPYZCULRWRCTZLCGMGREFOGJMULHHHQQIAOXVBGVBXZOLNVAPPKFFHXZMBVVEUSQHJOGBNVHUSEDNVMRKVJCOTBCWULBAJBEYUTCVVHYZCXFVDALNLZOARGOCWBFVUQKKSLEMJRKQIHULBCYTZQNRVSLSTQHZAZTZZRTBVXTTHBZJAXCGRVSCRJSEEOJQXFAEAJECDWVEHTBYEIQNMLILIEAAHWBXHQXEDOJKYNBBMTWQDMLFKRQRPACBSRLULLNLMKETFZJAIWHMUOMTZQUXRXYLQWUWZEVJWSVWUZXOHMHMKCHEOIGTJYCLBYPIWOXTHBWDDXMDCMSLPTAGECGNUPHOZBBMUSISZUBTASDXWBZHFNWSWHODJOGCSEUIPWFELWENSKIOZCQRTWINQWOXNSSJVFTGMXIGZDVRGQVODWEVFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGKZWYSJQYVIZZNDYTHHHAZQUQPKQQEJZDJOAPXOSMCBQMLGPUSNTWZOLTGHCBHVFMHHWMOIEWINCVJUCWMGOAPWLNFNOCDJRHJIWCMXOWKPLCATJMBKONEUJXGRSKQWTQWDUPCITOFMCIYVIIEEBCIKARCZHNVYHWQWPFHUPQWKDBHATSGTSDEHORZHLTZZUEMVPJUKSYCIDVSBPFIVDWUOZAARAZQXSQSWQEMKBDZPJLRRQPBRKJUJEICHUZOQUOGYWGUATEKLZAZIAQVWNHYHMXVZDYACNLBIHHETCMNNTCTPRIFYKHNFHGVPFWRYFLKHFGPEDNQORZSVRAXADBTTEVRJSTJJACPHYXIKSXMYFUHKYTDQCXQVBEBVGALWFKWNECWXZPYEUDORKJEYWHVGUGMOTVSZVSSVCRIPERIBYAAKWYLEVWULZHNHUKLVYKJBQXKGZFGRCJRQCATTSQWZCYLDBSZDNAWLHVHWQULGSVAWFGTXNBEHRBBKIXYBQKJGORBFDCDVNPVUJLTGRURLAYCNPPAPNQSIRJPTMAJJSUVLTPVDLKKPWOLEGHKMEZSBYHJSOYMZDJDYUUYDDPJSLVXFDQCTZUWAKYOYLKBBLVPHMWYGUDHPUNOIGSBYSMQUIGXSYHNGQTSUKBWTSYIUUBPGYTCEZLKZSNEXYFNPUKCWAOTVKEIKZEQDHPYMHRTKXEWKXYYYAXUYQIWCSHAGDITDDOQAUPJOJORXTNFKOSCZJRENDFRCXRBZIQPZWDDTYZAYPUINWXLYZXJDOEGHSNPEGVCCHVQXARJCGFWISPUHKFMMRYEEASNKZWXVJUPBZLLUEHNPCLAQWXBGQRBZCDHXBQZTUEPORJBQUPBDTIAWJTASIGTLUBSEOQNXAEMLNNAZIPCBUYSEWCIXLAYJUECBICMZWCNJBZVIMJYZTDTIUGIMCJVDGEGCONXVRQYYIQHUWQGGZBDFPKZYLXGTIOPRGTHCJJKYDPHFIWMZMOTCEGEBDNLWEYWBKYRBRHTEYOLZQTWBIWTHPKZJMPMBGYSBMPJXRPABBVANDBQCTZORWDALOJJNJZYJWUEPHZOVEGRAFHBCRETBBBAKQUTIJNDCIBGNTZOXPGLVBNWSWWMLGOVKOQUXFAXZAQMPPKDSLQBUATEXZRAOSDGOPNVFSPLSNKIECMNKKVYUAAEBGVFOFOATZCFMMDQAFYZTCZFCLWFUTDCPERAASRQVFREZNQXVWKQCAOFLOQMYLYUSMBDXGNHRXRWMUWVAGGHWHLJRGGEAGLXBKZRFXGDVJUFUGBHYRWHKVWOZJFRNZDZCSWZBQTXSDKDLJTSDXBOMUMRAFEBOCKLXOMATMUDBXOZYEVLWWEBBIBOSNBBBHIOPSNDOUDFOUYLOZQWJIOGFLKVZBOUPKIBJFCVNJJYWTUCZEMYJLQSBEPBYKUWFFURQZFKNHWROQLUSHRPNUHGIHQWEZXLYSSKGUTZYRHZCABLEEQXBJOLOJKFSYRCAJFFBCSWODYDVRMMQXRDQIKIEGLAWWVXNAVIUXWJFHBFWDJOICUKHNGPTLLPQYTBSFLOCJQVDHJRPIPBYOIOREUBRURYGLXOCCTZIAOVIXCMLOQLHZJMETCJSLONAGCECYXIXYVMPRWCIIATOULKAMNEKLJZWVZUMHUKJXTFLDSABAYZNGRLGAFGFUBHGXSJNPQVIKSKFASRJPAUFNWZTDIDBXTUSEJHYYRLPFVYLUEOWAWVTJYHXPPDEDUCUIEUROMPFXCAHYLAKPIXHJBINAMIYAFYZNJBWMTVEHDZCTQZQUTDASDXGEALLFLJIRJSGVUOBLVYDHBIMTNYLIARKTDGTLUMIGXQGTCXHHMADSQJAIMXICZQCHRMMJGUNIPMCBAFKOSKMWNGWPKKWKJTVIPTUAVTSFHJTJWTDGCTSBYWJGHGMAGGJHPDMKCMHGAOYJAAQWYCBMPKUEYHOAKTMSLJXCKDAJMHKNAPGCZLDPGZRJYTYYIBDQKKOQHNXDBNTBEVUDFZIQXWSBCNTIKVNKAIXOJWBDAWBHICWTWBIPCTBEEWQCQGZYRVAEEJSLNHPCOTNMBQBMZCMOUUIMJNGCICCSBPUPEUIEUBJMGXTJLAXXFZRFFYWLKBUSUPWYESFIOLVITJEWFFKLTQUJCPDOBPLKBGLRGESJKSYMDRODNIRJMLUWVGEBVFLKJAZMAVSVVVVTFJDARCGVTNNGLUKHQWSMQWVIEGQMYRSBDOCQSUVWWDYBARBOAPQNRNEPGDASZWTHFPEJKXKRMIRDSLASFPLPJYEJYREHMZCBZDNKRJFWHJAEFIELHRNILJBSHRFEEKZXVLVCJNXTDVEHPHHBLBPGFSOOQGWRBXSOIQCBJXRJRBJOLUSUYIMVLVCTHNZVFBRDLFXRSJOTBRZZSOWAFXNXTSEYMTNMQZQQMZKTKWSZZAMWMXBGGDSYREZNERXNBRDYBRHLPNDOWFHRPILOMPUZTZNDZMOUXNNXBHTCTPQUVHDMWUXHXETYDEAJPXKSWMDHQANCXRYDCVBPBQYOZLSLUPHFNKBTYQMQAZRWBJOFBOHCSJFHVMOSHMDJNQSWNAYAYZCEJJWACRBJMMPAFMRTSHIRKKQNMVBRQRNWQGQCTZSFXYQYRDCABSPZARQLKCILMAKGBSMTLDBIXTKWFNTLNCZCHGAQRQKGPZTVSKIBZJWKXYACGPXKEAYBMABWNURPOQBFLTSFLYWJGVPFHATKCBVEZQNLIJUQUARLFCGVRXIXZSHHQHDHGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMISGBOQKNDNJQVZUCPYUUIQXJSZAVIXNQNGIVQLSJJREJPHUQQYFXAKJKACWRFQBWBPLQJUYXHKIWJLFGVDGDSBDIVQRCOYZIQXZVYNQYRHEIYTKEBZIPIWHJTCHAAWXOCNFSOIIOFCFIEIDODTDJGFMCYBPZRBXMNSXAIVBQYOWOLUXSDXZGVJTRZIWZXQIOEBAWVPSAWPZNARJQLVFEOLOORFIGFQVEKPLCGIWCZOGSVLNGFLUFXQAHYUAONSXAVPEMPTZWIOHYBZSNGYVBWHMCGADBALGZBKGTSOQGSOSGACPXNNGRXFAZPLMBNNAFOOPMGICEPPFMGBQYNVQHLXBGHODWPHTWRAILPGVMBDOJSHQGGJUWGRVOTAANYDYGPBMDTHWDSTVJUCFXDHSJEKRDQEGYSRTRHYZQPKPDGIGCAMCLSPTEWOSYMRSSLSKJEKIMDSVCGBBSLOMGFYHJTBQWXRJKSPXEBSEZAIZSLIYFFIJHZEXEBYAVQPDRIWVNJFPHGUXTDZBRQDIBEQRDIKSNHLVKMAUYZBKERVDNWWHSDKFCCBQIDZLCMFXPQNMFYTMGKQSMULFQACVBTWXBIDEQSYCVLOFWMRRQJKCFQTHHMMDWYKUVTFZMNVXWNJUZFAAWMSLFDOAYZKXPCTSUYFBSWNKJQTCWJKNRMLHUTFBRPHOWVEMIAKBWFVESZNWPHSHGXQBTSAEGBRXMFBTTUAXCIBPISWQKSLZCPOLQKPSLVHENGNLDMNGYCHIFBPEDOJHAPMSJSIZUEPYUVAYKWFLOVMSKKYZBTLWUGINIQTWIWGWATLDOCEYAPYBHSISMXLMQGNDBOPMKDJAJYXVHLVKWDWINMDBIJYQEHUERVRXKUVPFEQZELXUEPFCKGWNVUIJXDQWMKCWNHDZMRPJJQQIHBUVJCZPBPAKDSEHNNKGPSNLCCUHSVJCJYKOIEFJSVPNWEUFDUUBMIKMZRWRDEIRNAHSRTTQKZGEUTJSUKVTAZLOVIVHQSVSGGQJSSFXEEEMPYRWGTCVBNZQVEEVDYUGFKFXJFOYCJDGPSXDLLGWVNBQFNWGAZJRLKKZHQESOVYLVOPPNIXNSEODDMMVAVZXQZEOMTIITKPFXOGTXZOVVENARVHJJYSUNXIHTJOKYWOTSVFYVGBWEDNFNUCAMSPAVZFFAALISTKEZXRBCTBGXFTBXWANNNTLCTYQQYWTQECOCQNMKIYASENDBVTILDAJNZLSRYSOCKVHFLZJKVBDHXKBVOSZIIAUAUWUNVOYCXWYQGUFSTVBMHLQQZCIVZMUFIALQDINRRXQVFEHQZVRLCBHUKOYYBTMRFXLTELHTKAOPUNZNYAUNCZOUKFVCUTHYKEXEXFYRVPSBSMSREEMBIEYVXULPUMIJQOQIMSWAYZKJYGVZRQMHMHVMIWDEUFPGKQUIRTZXJCSUAPQNAXHQCRUEFVYLUQMGAZMYSBJVNGQMQFYMDSJQZAGHAWYSMOWHGVNYCNCEBRADIJYCCPBFOJDCGEUVNOQTULFQZKWHDSUVHNMTUUQHQUUWLGZYXTBAKDUQXILCJJSASSHQHXUVJVVRLKJUEOUWBZLHDPXGIFQZWUACEKVFHXTQWQJUVJXUKUFSQGIXSMRKGDVJDQYQIBFJXSHGYJIZYHNBWLPUDTGGVSYYOFAKQDJINWKBAYGBKDKRVTXMTVKEYMUFKYOSHAITIDRHTOKNOJQQGZFTLLVYUNEGXNYKXOPZIFAMVYGPILRQVILSKGXMSLTYAUAGGHMSRXEMXDUZCHEVUXDVCDVAYXKEFRYZQCQXUWXHJKTXVYIPGCSXZTSCEHRFOGVEGRCSKLCNSCXHCOVQVKPILKBVRMAYGSEPDMIMNVWPMNUBNKITDKQTXBUMPZWPVYAXGDDNRHYJJTKYETYCTHIZZUZNSPEEHFGSXRRTQIKMYFKUQATOBVEPZRSTBNQWYPYGKSZDGMELRFTYXOGAIESGKUDWQWJTVJELSVCQGGCWKIKDFNHYUQJOVTWIWPQTVASNQMAUVCCRSFBLMKZIZLIOGRDZZYJAMBCMLACWLTWSXDQYTVRVQIVQPLQVHINOSRXUHMMAABWLJBEFTMFQLWDLDCJDXCLLSEMNKXXMXCELVRCHYAIFKTGNOQVJXHPBQRNLMUOGMWYUTUQQCELTWULVIWJMBGHVWSNLFCFSJMXICSZRPFUQMFFDXZEDMEQVJMBPZQNSBYIZUWUQCWPCRAUYUYKAYOBJPNPFYYFKUPYLHYZLCHGNWVFYGGVFZOBBACMNMVPSPIRIEDBKYKAPCRLULAQIOBGRBUOBPYETUBDEJUFZNMRCCQUEHPMRKFKPRKMQZUXDZABPGRJQWPBMDZCTGZAXTLVRBDDLOOQXVYMNWTRVEKHSIOXRRJEJXNCXJFXAQXQOAWEPUSCAYESKFCVSUGYJUMNSVXNYWUDYCCYZWBDUZIUVKCCWHVAMKZEUTYOPRRQHIILOICJJFFNQXLGJFJTKFIAMXBAVPLOWBZVXWWVRMFYFBCBEZTGRVYNJKUHMMCZYITPQIEPSBRPCZENVNEGFRXAHSRSENKGJQDAXRRBUADKZPYEBZCOHSSWGZMDDWIVMWKMJCOEHRFJKDMSSUMQZZLLPHBEFPHRBFFGBRTRXNIRYJVFVASEAUJUJDHNNQNNQMTDHGFWNQNUTNBGUPPMOUROMMAXPUQRJSYRYSGSPYLBVGKWXNDCQZRURGBSZOXEUBFSCFZGOCZJUVJDJFXDMLRQORZDRCCDHHWHBVEKCZLVICXSMKAMSBYWHLNHJYKIPCAVPRKZWTRTRBACHKSTANYJSBUXNSPGCZHRWFYKOYQDJBINSZCQCPYCJJLRLBFKZDKXXROLHCQFYWMCSHOLNVTMKZZHOJOWPFWUIWQNNSQXKUMTLJJRHYCZXCVHHGIVUGTDWPNNBGNPSAHFBHPKJLSBXOSHIBQTKBIWVPJNZQAFWWKXSTPYDQSQGWSPWBNXLZPMMJBRKJCRCXUTUGCKCHHENNEUJYAKZBLZPWWGGNVRQLGAIDBLMIEPHMZDDKNSLIESCVDHXTMSECJNSWZBVGFSLXAPQCJIPWHSWDXKRNNBCLYMVXYASQVQMSWOJYFEVFXPQVBKYLKBQGFQBTZDNJJIKDDGYGUBJADPAZOYFAQYVMNXLUQCBWUOQEEGQUPOBLGNJJZNZOMEFDHWHABNCADZJHJLZLKBBOJCDPSFIQLWAHWAVBFIVEBLJGHYWGAXROBTWEWMTIWTZHRRAAJOAZVJFMOPZVRXDZKZWVKSEYLANBPMKIFELYCMNOBHAAUDZGRUPEHVDPURVRPSIBVCGDVANGLLWNTSDDDKXFEJIBMUKFUPQTQHXOIGJUTFWHLRAIZQCEUZDGRJQQLVDAPSVUCADRSWYAZUYEMPIUIUSHCMNRAKTVYBWNEDIJICJANHXDNKSDUPKUOTKISWGOENVLPUUSKHHIMHXFZRWLNETNEYRXCLGDHYMXCRGBXUIXMDCFSIXDWDYNDXBGZNDHBRYJPXVQWVSRYUFMLNWEITYZFERACAEFCTJSVBLZIGLAEDPPZKWKSDRXNEZMMIHRXUHIENABWZZTJMISHXCZNGBBJEVCQGFNODVDDYQGTPCCCNFTWTQKEYZBXJYCMVUCSCTKWHDVOBQLEPMITFLHCZCJGPAQVKDWBQAJWUCEUCNCATXJDSUGAHYOLKEZMBMDSWHOUXPLFQMCDXONRADVKLCJXJSBUXHTIAMWDRRVKLDEKWPMAGTBNTKQFJNUAGUPCJQJOJICUCGGVDAWWWEBWVCVPWFVPDMKTSEDRYFEKYJKDWILIOINEZINFLEFSVLCCYVNLVCOBVCGZMLMVQDPSWQGWVPYSCEXALUMOOJBESGFIEGNIPUZPICIEYSAUFYVPJZOMXNPSSCNBOMUSRZWQJWIYNSPOERFOVRZILUIGVEAVGDXEGVATXQXZNRLZOFLACOJPFRMVIFCVFXCZVTDBTFCCMIQAQIZQWHEYBYRHGNLLEMQZRZAXGFUWJNOOYSSFYCCKYOYBLMKACMWZOVZKWIIHXADORGTSZGNXDVEIOMYSSWTXLNHFYWBAADLKMRYMFOUNIDRPRRCPKARTNVDRJHUZBGCOFVHATMAWILXJDHGQQXQOWBIZBBECQOPBTHFNGRQBDYMYBGKQXPZVNBSYTQNUWARJKPAVYTCVEIDNFNGXWFSDWEZPLDNOAEALDXYJZZPRYKXQIGVNHLVROALCSUCLQLWKDBDIANPWPIYSEXQDLUZFKHMODVRAPDGDYZIDQUAQMRYLYWTHDEAGGVUGSTOVHSCVVIIVEVVNCDNGPFIWHMDLZKRTAEXEZAUPUWOFRHAGFYYKESPUSESYQGZUWMXOUNTNISBGXPLRDURUNTRHLRDLRDCUOPJNCGBECPGUQVERCWUDSTHAKJPLEXHAKKVSYBSAFHTCJSGBWGSRBRMCBCOHBJXQBPLKRLJOVSGJXCOYHUOPSZZDBWEZINFVGWEONHUGMUDKKJYVJHQOHIBDVJMRTXJDIUEBNZKXYJJCZOGDATCFNUBTUOKOIPDAEPPLGDLKNUPEXYCRQMLNTVMTDQIYTLYZGNVNORDDPGZJYALPTUTVCDLMSVVSARMDMYTPTFVZJNLBJNOYFTGIAQERRWQBTPNWFICROJNCQYDJHTOZQLYDHDNTZZXGUWOUKGSKSBFBTVFHGCQXNEGRICJXTWSYHMLIFXHPKWSIQKXKMDFZBVAUKUOJBVSFVQXATTVLRIDYKLRWASMOFSKLEKYKCSJYZOWXNFHRPXDYJINELNAVTRCXNGEAVPVBSHOODPSLADYLPYHPIIUJTEIVJEQCSCYTIHCMWLBZRQWMSJLPYPAGMBNIGKCQUQZIDPQGNPHGHYDXZEXRLIEBNKKPXANRKZEHWNXDQVREMFJFWYTRHDLGKJONRPSACNLFSAJUSQMWVKPGHBSQJZNPEURDEBZWAODMTEMLFGZFZTRLXXTGCKWZCZFGRSKQHQJVECNHUIJSCXNOVSBIGSLXTXBIKNRMIFHSYAUMETSOBRVVNMOVEHUDDIRUAIKVETTCDOVJXRYHFDAQIAKODLSSUKHRKVGOAPIJMALIEIICODZQNJSWHYHYZPWMQGOCSPSSEAARJWGNIGRDCDJRTYRIHVYSVSMQQADMBDMJLVKOEDPDVRKSEHPOXBKXELETFCQOGGYERRZSVCSLXFJBKJTTXOSMCBVWUAXDSDYLEIZWIAJFIXGMSRLOOOSTJNNSXCQUPNXWKJUJULDKYTVSKPYCKUHLHBKURUKWRYTYNAFAHPNXFZQYPNUEKCNMDXRIZTHFZWYBEBRNLWXHEIHUETXCVODZWNSDRJGYEPXZOCCAVKTNHOOOXVARRMJPEVLCQFFSNXYKCHQOSPEFDWHNJHYSLAZFQTTQJGGGGKOKMKRJANSIRZYDCJNAJQAOTNXUMUCTEHPANJAIQCNCSDWBJUBFUOAKDUDXDRTECSBLMPFATBMLKUMJHWUZXXZGBABOJPBAGYLJFEOEFWLUZEZHMPAOYDBDSZDZHEJBBUTRUJSNHTPKXDJOVJTUYNDYGNIFEAHGTGDFKDJJNWOUGOINVEVYSEQAOCAOVRJQVKPFYAQZSXCPUSVQKGZOQMWASQXHUOIMSYQYFWDRNQEXWBNVFFMDHVFDTLGIZTZRKSFXPZKPUXSYHUZJNFFLSSOMARTZXQWIRRSOOZCKWTQYWRJIMSAYTKZYDPLMHRLESJREGZHZEEHMFERPPRONWZOJRZQGLUGAQKJLZJOLUUQUFNHNLYFZACEUUQMJKZVBQAKNPJTDIXDWCYXBMLHQUXZORTUBLMWFDFOPOXCPWRMMGVLEEMHUBCPQXLGWGJPDLDYIWBMDNGTKPTBNSBDCPVJXFFZZYHMKSCQRPRXABMOZYCJZRQXYRSMMRXXPOGPVNIMHITFGUHAZRYJKRDJFOXRQZQMPQZUNDRBCGNLKDRCNINAJHHAEAFYERFVCQDQXLEMIKVVBTPGGAWZPEGXUMSBVPMOYJZYEZZICYUNYYZSMGQHLNOYACBELDAJFOCISTZAQTWAUKSMBWKIKOTVTDFLDSTRKKEOKFFBJZINVGPHRZJYXDJEIWKFSJLGXYYJEZHKYGPCCHDCSSBETHIKPFIOJXQCFKBDIZZGOEFTBSVRRVBJTPUYVCBCRCKKTWRIPQMIWMMYGARUAGXKSUHZLMFRMMSIIFLYEZHMOYPRGHEHKEVHIKQGQNBAHIOJJGRYFVKONMGGYXSTZUNEOINSDVWIKJBHFNVNOCISHRGRVPWUFTHLRDTSLGYHMEWMXTRNQHRPTAHHWKWSXUBIYTFFXZEFDYTNPHEQLODYJXUJXJFEOXTXUEBULAMCMBGYGDOIUBAHAHVOKKSEGIMYWBVDYWATSXFQTKQYZMEWFWEWCFVVZUSGTNWAQOUKWHKZNBWPAQGXIPBYBGJEMUAOJFNAKTJPLQATBELXZLSFAZROEDQUXBTYRBCVGPXFPMFDAVPUYHFKHSSOIECHBNTASPKZEODIPCLPRXSYUPLACJNFMREFPAKZNXVRGSBDMJZFSBJOMYJQXHPDJAUKOGPDHRNFHJCBJRPMOOLAXOLRHXAKFJSANZRGNXSYJHSHDOWSUZKANMRRHDAINXIHPDENKROYGWVDRJVBRSVJVJWAUJXGPJWVBPBIKTZPMMXREPKOLVCHABTVPINFFGVPDUODKHDOEJUTLZYPEXPZNNGKYNLJIAHGODHFKGNHAKTHBCHXWPCURHGBUQCWBRTISQKNVHPEMMMVSKOKXRDPMMLYDIGUXGFJXLZXNDCSUMHLHLHWCOOYZBPAIUKADKSIQNKTDGPNXYBQPGYWLDXDCEKWFCYCVQIJKPNZAEANTSEVHCPIBWCKAQMUZDMQRMZITMPHKUNDHXXUKFMBHIAUVUFIJGGPAYXJRPCOWLVMVSPZXWNDSSXOQKTCVJYAUEVBBMTHWYLSWDOJTEGABUGTOIQPUKMJMALBZXXIJLVNRVRCJZQLTKCVLULPSYFYJOIBYFANLCOXNLQYJOFQZDFRYIOEQMJGIRLFXTIVXPKQRZUQOSDTUGBTVQSXATNXMAYGNHSOWELEIATWUTKJUAPHFQUMXAYPJKNCXKDEVRTVNDVKHUQEIGIEMWBQANSYWFWZODJQTAQZKWYFSGFGEUESFSAWKELFZKHWBCFWMJSCIYKXSBXYMQEDTGDNAKKFYGZXOTLMHSHMCSHZJPSBZPWFLIJHFUEYOBJGGLXZPIIYPKBZMXFFOUANUWHGTIFKIZPEQPFUFETZYAHVXKSIFBSIHJXUJXYPKLIVXWNLNXDBIJXATRKCJPCEYICDDMVYIUIXGFXGTZZCYCFUUCMVQRKNUMCBVLKODKHXOWXPPGFNPMVBHDEGDFDFFRPKQJXDWUHUUJAIPZVYMADSLEAUSSPVFRVQZLABDREWXJMACDARFYLQGJPBOXNCDPNNJNVAJJMPQHOEYPZMRITBKCUXAKACMADODKWUGHGMZOXEKXKMZBZNQFFVMLKRNMQWLZRKWYIZVYHSACKIEUHSMIPVJZTZDYPAAMBVDGDMPHCBSXZIPDUQXRIRPRBFSZKSLTEXPYUBMKTJHUBEUVSMCPKOBUKXNDLIHXDCRJVBXQVUIDMMOTDXGJVBDRJTJRQXZBRTJDOQHEUJVLGBXPJXIUVLWGCEPCLDIMHIANMUJWJMUVTAIICIDUWMJZLAAQGELUOFRTMBPJUVEBRNLERKQEDAXVAUFSZFLZIZSAWPGQNBRDVUBAVSCKWPRFFMJNVMHRUKXLRXDXQAYBNNBJYBJWYJKZSUDXMENYZREUHQTGFPAFSSCHVPQGEMFEJTAAANSYLAJEMJXAICCUPSRDYAQPACORKDOZLFZTJVJZEEMUTDRDMAWSFQKFYNEAXLEFBFLVLRRURDPHRTYAPYMQSKFIQRQQIPHPYJNCTEPQFVXQMKARRMLFJUWVCXLGCLINCSCNUYMJMSSDPTXWNHJZYMARNWSMBESIXKFFOSAYVUNMJGUQTJLRFVMIJNCCDSGJEXYTKAXICMAIAXAPCYYDHCWBLMSBASJYZSATOOBFUIHAUBGZKDGHUNJJHNOKQSJWSLQJTDMQMPRKCOXZPQBKXSPCGDFOISXDPOHGNLZSIPZZVYOGXMKQHNWIAJNEXRZWEAANWFAJEWXYVWKICBTCWVLKMOWUPNHULNYXILIPHZQVNUYJEHLBGVFDMFNGHCQXATSAPBWZEQKKNSROWFWNYIGMDDRRBADJEZPJYGKONBWWFJVTGXWBNPRWZBKCRMSTTBIRUOILVDKALHNWBDYINQWFHOCFVFBIIUTSPOGRYRBNFFUTSOLFZPITVXCZFVRXDAXNWGQCKQSEVBHXVGTYZAVNZCEPTKIDZXHSFCZQLRUNXXZRAXQNRJOKRPRRUWBKKIQJELOGTNYIVISVVUHFJLSGBKFSOCAKZBHPXLHVSTESSQNISMGBRZFURQSPSHHMMVBAMQXNKMTIOAQDUTICTSZZVJIORVOXYCFAXJWXLLPCDMASYDIUGUJTEXRBHCPWVQVBVDEIWEBJTOTKMOHPOZJJWTOBOMRZKYACGTPMTRPCIHIZZOETYUAGVMMPYZHWTCQSXDDMYCOFUZMMLXYUPNNALAYKXEKBAKTBNZFHDKDPPUSAAHSEZKXUOVWLAUKGDQGSOJBBAYUFWTJHQUCKKQLRSAZQXDCLAJCGELGCJCKHPILUFUHNSZUBBZMXPPXVGKPZMLPREAJKYPLXMJIWDSDSLUUHUHWVWPLKNTOTAGYVFZPFRIETKHPNJFUHRTIWGINJTLTRVZJUOKGNFCEBACMJRLIFGLZERSJHFJKBJJVVXTANNRTWBWHJGPLYQIGIPJSDFVLEAURLKQGWJZATGJHJXLNVHAHUYBDLVLFDMJOLTBPVBLTVVGJLQPVMOCNUMTTADFFABWDGAVLBNBVUSVADDZRMVUMYXLNFLMHWXQUOIKXUNVGXXSJRFICDHGNNRPOADHIVQVSKNPJQGVDYLIBZFELOGFZNHSHPZKWOOBTLJOIWJKGMMDTHFJWCOPGUZTIJVPTECJXTIPMPSFYONVXXUYNBLODBWBKHEXRHUDJRENIPEEEGMWWHEQNQVLYRNFXKMYMDPMEHRKBBLRALSREVVDEIVBEOWIHRNGBFEALKHGCCLUPINRJJNJHRMLLPLFRCXVMLATRKZGKYSSZZTUUHYZJCYOGZMBGRCEEVCUCYNYZUGAXPCQIIUDPYGFAMFXATUYAXKZCTFCSXCOHVWEHHORWFWVURHHBZPZIQHXKLZFWFMSMBOAMEGBXMOHLWYRADETOJMMCDHXIQLWVVMUNEPGRVAUZKEVDONIAUZIXKVHWJMGICGXTYYHFXIWDYJEXTFTELDAQVPPCLXPFFRTKWZSLLGZHUFNWMSIJIEQEMJZUFYUNBJWTFEJMHUVQJESUMNLYKIMSTTUQKDFWTRBHVPCZWTTQQOHPSZXHPQWARAWPSMURVUOIRSCHKHQIFVKLQYLJFUVNZSKVLQSBBCXIGQPDQIHPADAHFFNYNLOUDHYXYKPXEMRYCDZOFQDARJJUXAFWLDVCCRWLECVCPAHEUQRTJLJMIJJMXHQLYTIVFMRTJDPNYNTJPPESLJWJFSVKANKFZXVRAATUYPHTATXIZFSKAQBQSFKMQINHUXDWAXOTKMQBWWIOKOTVGLZYFEOICWPBITPCWQBGTYYTMKWIRRILOQCGOPLSGVPSADTCGFYPENZUJRHJTKPBHGQJJDGQRZGXHAPFTIPZOWWIZJLMDGIMFFYGWNFZGBCMBHPXAVFCZFBZXIJKOPJRLSOKTDKBQSHXSGYPNUMVJFWZUJGFCYJFVPMUZUZPHMVWRGMBWBFTNFCMYGOANRPOOIPJPYHODMDDZTBJKQMNSLFBYPRYYEPAHAFFSRBAOYKNRDIVUNBKHHFFVQFAOTPPETBTCNJXGKQHBQYQBKBFXZDXBDMHJATIIYNEXADIDOJJHCHUFEQVKHSBEAREUBCQBSDXGPVQKKNKJWROBPDEECYIMBZGAIJSERINSYOHWHIEZUOYEDCPAUFNTYYSFOLDYHKNVOGHURZLVZEFCWFLPCZDTBEQYXXDNAJKMTNRGVJZRWVUMGXTVQKZAPKNOLUOAYEUSACDASMCRLFWIZAGTPEJMYLHDEZFCTAARZGYPEMLVOOIZDOTYTNEJEOIMWTIZXGCKOFTWKEMOJCNJDMFAQNYXHJBAVREKDSCMAXVYHOQNGRSRRKXYBMMAFGFLLPCKXUVDKSBJAQOXOGVGVYONMSUIRLOBIPXHXGKICITRONWQEGNCXFWFKMREYWZBXDCEXEXGTXGYFLOOCZKMLLQBVLQVCXOQAEVNLTGNXJGYUDEEPLQJFVTJIRGCYGEPODNJRRCHSMBRHDGJDHQYLHIEDAYBGAHOKKSBFUNZEOSLKPZNSDHLJPSJSBAIICYBADNLZGOCZVAKRKCTAVDQFKRSVIXYMKSGMQGKOCPVPXCQGMXCVOGEWCAIMZNGOIPPRMIAOMEWEIBJBJPTPOREQUNLMOIGOBTOWIEUAMDMEDFDWCAANRQUQGXMZUNJIZPLPUJTPOKECFGQNVSDHWUHJSQWMYFWFGVIFMIPIAYCUTVJVWHDCRAWSNRXPCTAJZQZIIZTAXCVPRWLQWNFBVBNGJBUXGGXLUVWGAVOFOQTCDICONHCWYGFXSDWEGSZCNVJLLXYSQVJWYUGZWRQXACFMLALSNNJGZFIBCAIORHUKYBJPCOQPKCPTOUKMOLMJCGQUJRVLTSUWJSUIILGLSGWLLQGKFJJEVVUZWLDGVLVXSZXMSKTRIJLOTONFARWKIDCQCPXXZLUOYPWOHNUSJMUTAXMFZTELHQBSXKHKPUIXTEMCMKJACOZLPLATYZXIZNMURXMVWNSPQFUCDVDRYEZMIEBZYOABCTTKLGBDSCVWWAQMUJYTXZFFFMHHKEOEORNSDGYIQPLSIEFOMXRQBGEYTCVIQARRCQUSTARLGZEVIQVQDRVMMCIWQEEBCIWKNNXCGBPAEELMPCDQFMKFKAXVAGSKDPRXSZTXXQQQTGPLFLAUBOFMUGDIOZCEVABXEKOHUOYRNBXDOHIIUDDHQHDIHVVBOITYCNFFNULBWGLNZDKHNVAXMGDGDLSQRATNBKTBIOCXBPFTQRDLQGNNWUZFOYRRYJAPMQCQBXUWUBDVLICZJXVPHOHDYQENOMJGIPAYTBDYPMNNLBXGCAOXUNMFFPEVPFKUPGERNNDOZLFVKFCIBCPBUIMHOMCVVDKBVQIOVZQKBPMXABGNJGEPIVFIEDXYFXIDODKJZCXKNHVFQHUSFMJWXFBGRPDIPSMBVEOLMZGWNQLQUQIXKSKOOXTSPFJEDBMAXHDPKEFAMASMLUJBNUKLEYIXPJEKYFTEKNFJRQDYGCHVTKCSEQTRUHPBZPWTEBGWEKXISBPUHEAFAEPLLVVUIFCLZRTUPMIAJVUVLTHOTFPMZZHEMOFWCBPBUVUIWAZOIHJBFZRDXJSACARXYBGNXKHMSKUAMKEALQWTWLMLZTQHGPNYUFKBLFBOZEWEVSSDOBPFAPYNNEXVPZOKKUGSQYFIAEQJTYNLYOBQUDLQKZFVXQAJCCBVJWMPUUARURYPUQDCQOTOPBTTLLOEDPRWEKPPLKUEMCPBGDGJQOBXCSEVPYXUVNDZKVIUZLGJXDHOYQYDDIKSDZSLTWRDKTQMDSOHUWKFJPTEQUAULYGUBLSJRAJNEHSPLGUOORIZOMBTMYJUWBNJYBHNCPDKSKVENEMEAAACQPFLCPZVNOZSASBVDMAKTXATLKVXJCMONWIOSQEVQGXFMHRMGOXBFSUVOJMSXDJBKSWJGWDFWSBQSNLCZYWNWZEIMWXBEMGSIMNAQHVFXLDNQNSWNEARIQXRHGYGNYINFFTEKMTCBOUWZAHYKFYFMNDURMGBHNCPDHUWKFJPUARURYPXYBGNXKHLQUQIXKSQHUSFMJWXGDGDLSQRAATYZXIZNMURKTRIJLOTONFOGEWCAIMZNGOIRLOBIPXHXGKICIPAUFNTYYSFOLDYHFSKAQBQSFKMQINHUXCCRWLECVCPAHEUQRTJLJKBJJVVXTANNRTWBWHJGPLYQQSEVBHXVGTYZAVNZCEPTKIDZXHWFHOCFVFBIIUTSPOGRYRBNFFUTQJTDMQMPRKCOXZPQBKXSPCGDFOIPRFFMJNVMHRUKXLRXDXQAYBNNBJYLGBXPJXIUVLWGCEPCLDIMHIANMUJWOQHEUJVLGBXPJXIUVLWGCEPCLDIMHIASZKSLTEXPYUBMKTJHUBEUVSMCPKOBUKXNDLIHXDFSZKSLTEXPYUBMKTJHUBEUVSMCPKOBUKXNDLIHXDCAYPJKNCXKDEVRTVNDVKHUQEIGIEMWBQANSYWFWZODIJLVNRVRCJZQLTKCVLULPSYFYJOIBYFANLCOXNLQYJOHBNTASPKZEODIPCLPRXSYUPLACJNFMREFPAKZNXVRGSBDMSDVWIKJBHFNVNOCISHRGRVPWUFTHLRDTSLGYHMEWMXTRNQHRNSDVWIKJBHFNVNOCISHRGRVPWUFTHLRDTSLGYHMEWMXTRNQHRNVGPHRZJYXDJEIWKFSJLGXYYJEZHKYGPCCHDCSSBETHIKPFIOPQXLGWGJPDLDYIWBMDNGTKPTBNSBDCPVJXFFZZYHMKSCQRPRXABMMPFATBMLKUMJHWUZXXZGBABOJPBAGYLJFEOEFWLUZEZHMPAOYDBDSJWGNIGRDCDJRTYRIHVYSVSMQQADMBDMJLVKOEDPDVRKSEHPOXBKXEIYTLYZGNVNORDDPGZJYALPTUTVCDLMSVVSARMDMYTPTFVZJNLBJNOYFTCJSGBWGSRBRMCBCOHBJXQBPLKRLJOVSGJXCOYHUOPSZZDBWEZINFVGWNUWARJKPAVYTCVEIDNFNGXWFSDWEZPLDNOAEALDXYJZZPRYKXQIGVNHLGRQBDYMYBGKQXPZVNBSYTQNUWARJKPAVYTCVEIDNFNGXWFSDWEZPLDNOAERXNEZMMIHRXUHIENABWZZTJMISHXCZNGBBJEVCQGFNODVDDYQGTPCCCNFTDRXNEZMMIHRXUHIENABWZZTJMISHXCZNGBBJEVCQGFNODVDDYQGTPCCCNFTUKFUPQTQHXOIGJUTFWHLRAIZQCEUZDGRJQQLVDAPSVUCADRSWYAZUYEMPIUIIWJMBGHVWSNLFCFSJMXICSZRPFUQMFFDXZEDMEQVJMBPZQNSBYIZUWUQCWPCRAUYVIWJMBGHVWSNLFCFSJMXICSZRPFUQMFFDXZEDMEQVJMBPZQNSBYIZUWUQCWPCRAURCHYAIFKTGNOQVJXHPBQRNLMUOGMWYUTUQQCELTWULVIWJMBGHVWSNLFCFSJMXICSZRPFUQMFFBWLPUDTGGVSYYOFAKQDJINWKBAYGBKDKRVTXMTVKEYMUFKYOSHAITIDRHTOKNOJQQGZFTLLVYUNPHOWVEMIAKBWFVESZNWPHSHGXQBTSAEGBRXMFBTTUAXCIBPISWQKSLZCPOLQKPSLVHENGNLDMNGYZKXPCTSUYFBSWNKJQTCWJKNRMLHUTFBRPHOWVEMIAKBWFVESZNWPHSHGXQBTSAEGBRXMFBTTUAXCIBPSNGYVBWHMCGADBALGZBKGTSOQGSOSGACPXNNGRXFAZPLMBNNAFOOPMGICEPPFMGBQYNVQHLXBGHODWPHTWAWXOCNFSOIIOFCFIEIDODTDJGFMCYBPZRBXMNSXAIVBQYOWOLUXSDXZGVJTRZIWZXQIOEBAWVPSAWPZNARJQLQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMIHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMIBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMISGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMISHGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMISGDHGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXYNUISYONOEKXPDDKUFRMDKHIHTAHPJOWMISGBGVPFHATKCBVEZQNLIJUQUARLFCGVRXIXZSHHQHDHGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAOVWHQFXBFLTSFLYWJGVPFHATKCBVEZQNLIJUQUARLFCGVRXIXZSHHQHDHGBHQYQPLTNOKEZYGASUNTPKYXOTUNZMAGBUDKXIIAVLKJJLAVTNNGLUKHQWSMQWVIEGQMYRSBDOCQSUVWWDYBARBOAPQNRNEPGDASZWTHFPEJKXKRMIRDSLASFPLPJYEJYREHMZCBZDNKRJFWHJAEFAXXFZRFFYWLKBUSUPWYESFIOLVITJEWFFKLTQUJCPDOBPLKBGLRGESJKSYMDRODNIRJMLUWVGEBVFLKJAZMAVSVVVVTFJDARCGVTNNGUBJMGXTJLAXXFZRFFYWLKBUSUPWYESFIOLVITJEWFFKLTQUJCPDOBPLKBGLRGESJKSYMDRODNIRJMLUWVGEBVFLKJAZMAVSVVVVTFJDARCGVNPQVIKSKFASRJPAUFNWZTDIDBXTUSEJHYYRLPFVYLUEOWAWVTJYHXPPDEDUCUIEUROMPFXCAHYLAKPIXHJBINAMIYAFYZNJBWMTVEHDZCTQZBHGXSJNPQVIKSKFASRJPAUFNWZTDIDBXTUSEJHYYRLPFVYLUEOWAWVTJYHXPPDEDUCUIEUROMPFXCAHYLAKPIXHJBINAMIYAFYZNJBWMTVEHDZCUBHGXSJNPQVIKSKFASRJPAUFNWZTDIDBXTUSEJHYYRLPFVYLUEOWAWVTJYHXPPDEDUCUIEUROMPFXCAHYLAKPIXHJBINAMIYAFYZNJBWMTVEHDZCTMHUKJXTFLDSABAYZNGRLGAFGFUBHGXSJNPQVIKSKFASRJPAUFNWZTDIDBXTUSEJHYYRLPFVYLUEOWAWVTJYHXPPDEDUCUIEUROMPFXCAHYLAKPIXHJBICTZORWDALOJJNJZYJWUEPHZOVEGRAFHBCRETBBBAKQUTIJNDCIBGNTZOXPGLVBNWSWWMLGOVKOQUXFAXZAQMPPKDSLQBUATEXZRAOSDGOPNVFSPLSNKIWUOZAARAZQXSQSWQEMKBDZPJLRRQPBRKJUJEICHUZOQUOGYWGUATEKLZAZIAQVWNHYHMXVZDYACNLBIHHETCMNNTCTPRIFYKHNFHGVPFWRYFLKHFGPEDNZZNDYTHHHAZQUQPKQQEJZDJOAPXOSMCBQMLGPUSNTWZOLTGHCBHVFMHHWMOIEWINCVJUCWMGOAPWLNFNOCDJRHJIWCMXOWKPLCATJMBKONEUJXGRSKQWTQWDUMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLITMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHEYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHEFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHERFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGKZPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGKZFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGKVFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGKVODWEVFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHEQVODWEVFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGQVODWEVFPRFYQIRTMOYRDCMLVOGPGMYJERFQBGYNZTLAYSFNQSOQKSDHDUAYBIOGVLRNCYUFQOBUXGIZNKJQSMTUHMUOCOOASMHJXDSCYCBXUZGRTPKJJCSCCKEYKDOYORJMDOSNWTJVWUJKSYBQWLIMNVUIYDHHECPGCVVHYZCXFVDALNLZOARGOCWBFVUQKKSLEMJRKQIHULBCYTZQNRVSLSTQHZAZTZZRTBVXTTHBZJAXCGRVSCRJSEEOJQXFAEAJECDWVEHTBYEIQNMLILIEAAHWBXHQXEDOJKYNBBMTWQDMLFKRQRPACBSRLULLNLMKETFZJEBWTXZDHVDXJMMNIYAQYXEPJVDKPKQBSMWLATYCUWYSYOJZHUDSXTCSHTRACDQOQSNCYLMXJBYBBWKSNHYAYVRLCWFGAZSEVBIUJETIVGHEBDPXLVFWWTCKOUCOAOPMUIRPYZCULRWRCTZLCGMGREFOGJMULHHHQQIAOXVOKLCVAXDEGHSEUYZHPTFECVAJSFUSFMCGQLMASXUPQYQSNYRSDZVWZUXCDNVVPGAUQRGCQFSQSDEBWTXZDHVDXJMMNIYAQYXEPJVDKPKQBSMWLATYCUWYSYOJZHUDSXTCSHTRACDQOQSNCYLMXJBYBBWKSNHYAYVRLCWFGCQJCQLPHFANJTGZXOJRGGMYHXKQVCLBAAKUPWGUWGXEAHQBGJRKABJEUQUKOUABOVZDUKHRRXSBCRCHDFDUXCRZCYCHAZCEGPJFUATVHUHTAFLKSHRYVNYBVXUFUFYXIVGRBRUWPZZRGGNAURWMPKFLCJUGYBJHHTJHCNZQVDVLMJCQJCQLPHFANJTGZXOJRGGMYHXKQVCLBAAKUPWGUWGXEAHQBGJRKABJEUQUKOUABOVZDUKHRRXSBCRCHDFDUXCRZCYCHAZCEGPJFUATVHUHTAFLKSHRYVNYBVXUFUFYXIVGRBRUWPZZRGGNAURWMPKFLCJUGYBJHHTJHCNZQVDVLMENSPFDIYBMWOBOSWHFITNIUEVEGGXDZYRAIRWTHSECVCCZETCBXGFWSJPHFLCTUNESIKYZKJCTZFOMBMWYHTTXRZKSTVNHJCQJCQLPHFANJTGZXOJRGGMYHXKQVCLBAAKUPWGUWGXEAHQBGJRKABJEUQUKOUABOVZDUKHRRXSBCRCHDFDUXCRZCLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBRCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTUTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTOUTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTKOUTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTKLHVKOUTZAAXHUGBMWURCDKHFEEBLRVDUFOARAOFKXFESYNYRKSMLBUQYTCJSLHIHGMPTXAPLTINHRQXRLOSXQDEFLZEVHHSAGQBRNBPJEQVCKVOTUBGGOIRCWEEYQGCIPXJDFRZUPUTVXGMPSCOVBPUFYVPTEYXTRUHXARDSYTZTGDIHALCQZAIWRPDAYGNZDKMTIFEJHQTEMIYVARZJRWUDDXKMGUUQBWHZNWCJFCQTTKLHFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQUKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQIAUKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQIADAUKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQIIDAUKNXWFYRPHKDPWHACQGQFLCDTXXZKYDGDDPOBSWEMPAAVFCEXQJDCBOZIRSOWELVYEKWNGRMNGMOPFVVLVIOYDJJMWJGMZCMNGRPMLMNJLPZKFRVYSTRPQOPBKREYFDCIQJLQANHNOIUMHAJAEHAVGSMDSJRNGVPTRTFHWNXPZDOOLHYYMGALWNVZYKHPGFEZNGDGFUIEUNYQKEAICMFOYYLDRJQXCKQUILBITRHCUSQMCNSDDCLMYRQIAOM

crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/fixed.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/fixed.txt b/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/fixed.txt
deleted file mode 100644
index 5ccca24..0000000
--- a/crates/libz-sys/src/zlib-ng/test/CVE-2018-25032/fixed.txt
+++ /dev/null
@@ -1 +0,0 @@
-AAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAAUAAVAAWAAXAAYAAZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABTABUABVABWABXABYABZACBACCACDACEACFACGACHACIACJACKACLACMACNACOACPACQACRACSACTACUACVACWACXACYACZADBADCADDADEADFADGADHADIADJADKADLADMADNADOADPADQADRADSADTADUADVADWADXADYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESAETAEUAEVAEWAEXAEYAEZAFBAFCAFDAFEAFFAFGAFHAFIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAFXAFYAFZAGBAGCAGDAGEAGFAGGAGHAGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWAGXAGYAGZAHBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRAHSAHTAHUAHVAHWAHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIRAISAITAIUAIVAIWAIXAIYAIZAJBAJCAJDAJEAJFAJGAJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVAJWAJXAJYAJZAKBAKCAKDAKEAKFAKGAKHAKIAKJAKKAKLAKMAKNAKOAKPAKQAKRAKSAKTAKUAKVAKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQALRALSALTALUALVALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUAMVAMWAMXAMYAMZANBANCANDANEANFANGANHANIANJANKANLANMANNANOANPANQANRANSANTANUANVANWANXANYANZAOBAOCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOPAOQAORAOSAOTAOUAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAPPAPQAPRAPSAPTAPUAPVAPWAPXAPYAPZAQBAQCAQDAQEAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQTAQUAQVAQWAQXAQYAQZARBARCARDAREARFARGARHARIARJARKARLARMARNAROARPARQARRARSARTARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNASOASPASQASRASSASTASUASVASWASXASYASZATBATCATDATEATFATGATHATIATJATKATLATMATNATOATPATQATRATSATTATUATVATWATXATYATZAUBAUCAUDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAUSAUTAUUAUVAUWAUXAUYAUZAVBAVCAVDAVEAVFAVGAVHAVIAVJAVKAVLAVMAVNAVOAVPAVQAVRAVSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMAWNAWOAWPAWQAWRAWSAWTAWUAWVAWWAWXAWYAWZAXBAXCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAXRAXSAXTAXUAXVAXWAXXAXYAXZAYBAYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYQAYRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLAZMAZNAZOAZPAZQAZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBBLBBMBBNBBOBBPBBQBBRBBSBBTBBUBBVBBWBBXBBYBBZBCCBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCRBCSBCTBCUBCVBCWBCXBCYBCZBDCBDDBDEBDFBDGBDHBDIBDJBDKBDLBDMBDNBDOBDPBDQBDRBDSBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBEOBEPBEQBERBESBETBEUBEVBEWBEXBEYBEZBFCBFDBFEBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFTBFUBFVBFWBFXBFYBFZBGCBGDBGEBGFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBGUBGVBGWBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBHQBHRBHSBHTBHUBHVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQBIRBISBITBIUBIVBIWBIXBIYBIZBJCBJDBJEBJFBJGBJHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJWBJXBJYBJZBKCBKDBKEBKFBKGBKHBKIBKJBKKBKLBKMBKNBKOBKPBKQBKRBKSBKTBKUBKVBKWBKXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSBLTBLUBLVBLWBLXBLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBMYBMZBNCBNDBNEBNFBNGBNHBNIBNJBNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYBNZBOCBODBOEBOFBOGBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUBOVBOWBOXBOYBOZBPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPVBPWBPXBPYBPZBQCBQDBQEBQFBQGBQHBQIBQJBQKBQLBQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCBRDBREBRFBRGBRHBRIBRJBRKBRLBRMBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBRXBRYBRZBSCBSDBSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSXBSYBSZBTCBTDBTEBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEBUFBUGBUHBUIBUJBUKBULBUMBUNBUOBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVFBVGBVHBVIBVJBVKBVLBVMBVNBVOBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZBWCBWDBWEBWFBWGBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBXCBXDBXEBXFBXGBXHBXIBXJBXKBXLBXMBXNBXOBXPBXQBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYHBYIBYJBYKBYLBYMBYNBYOBYPBYQBYRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBZHBZIBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCECCFCCGCCHCCICCJCCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECDFCDGCDHCDICDJCDKCDLCDMCDNCDOCDPCDQCDRCDSCDTCDUCDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMCENCEOCEPCEQCERCESCETCEUCEVCEWCEXCEYCEZCFDCFECFFCFGCFHCFICFJCFKCFLCFMCFNCFOCFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGLCGMCGNCGOCGPCGQCGRCGSCGTCGUCGVCGWCGXCGYCGZCHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRCHSCHTCHUCHVCHWCHXCHYCHZCIDCIECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCITCIUCIVCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQCJRCJSCJTCJUCJVCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCKSCKTCKUCKVCKWCKXCKYCKZCLDCLECLFCLGCLHCLICLJCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLYCLZCMDCMECMFCMGCMHCMICMJCMKCMLCMMCMNCMOCMPCMQCMRCMSCMTCMUCMVCMWCMXCMYCMZCNDCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCNXCNYCNZCODCOECOFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPGCPHCPICPJCPKCPLCPMCPNCPOCPPCPQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQICQJCQKCQLCQMCQNCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECRFCRGCRHCRICRJCRKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGCSHCSICSJCSKCSLCSMCSNCSOCSPCSQCSRCSSCSTCSUCSVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCTNCTOCTPCTQCTRCTSCTTCTUCTVCTWCTXCTYCTZCUDCUECUFCUGCUHCUICUJCUKCULCUMCUNCUOCUPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLCVMCVNCVOCVPCVQCVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCWSCWTCWUCWVCWWCWXCWYCWZCXDCXECXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTCXUCXVCXWCXXCXYCXZCYDCYECYFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQCYRCYSCYTCYUCYVCYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZSCZTCZUCZVCZWCZXCZYCZZDDDEDDFDDGDDHDDIDDJDDKDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZDEEDEFDEGDEHDEIDEJDEKDELDEMDENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFEDFFDFGDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDGEDGFDGGDGHDGIDGJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDHFDHGDHHDHIDHJDHKDHLDHMDHNDHODHPDHQDHRDHSDHTDHUDHVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDIODIPDIQDIRDISDITDIUDIVDIWDIXDIYDIZDJEDJFDJGDJHDJIDJJDJKDJLDJMDJNDJODJPDJQDJRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKODKPDKQDKRDKSDKTDKUDKVDKWDKXDKYDKZDLEDLFDLGDLHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDLWDLXDLYDLZDMEDMFDMGDMHDMIDMJDMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYDMZDNEDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWDNXDNYDNZDOEDOFDOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZDPEDPFDPGDPHDPIDPJDPKDPLDPMDPNDPODPPDPQDPRDPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKDQLDQMDQNDQODQPDQQDQRDQSDQTDQUDQVDQWDQXDQYDQZDREDRFDRGDRHDRIDRJDRKDRLDRMDRNDRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSLDSMDSNDSODSPDSQDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSDTTDTUDTVDTWDTXDTYDTZDUEDUFDUGDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUVDUWDUXDUYDUZDVEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVTDVUDVVDVWDVXDVYDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDWWDWXDWYDWZDXEDXFDXGDXHDXIDXJDXKDXLDXMDXNDXODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYHDYIDYJDYKDYLDYMDYNDYODYPDYQDYRDYSDYTDYUDYVDYWDYXDYYDYZDZEDZFDZGDZHDZIDZJDZKDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIEEJEEKEELEEMEENEEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEFREFSEFTEFUEFVEFWEFXEFYEFZEGFEGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUEGVEGWEGXEGYEGZEHFEHGEHHEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTEHUEHVEHWEHXEHYEHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIXEIYEIZEJFEJGEJHEJIEJJEJKEJLEJMEJNEJOEJPEJQEJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKEKLEKMEKNEKOEKPEKQEKREKSEKTEKUEKVEKWEKXEKYEKZELFELGELHELIELJELKELLELMELNELOELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMNEMOEMPEMQEMREMSEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNENOENPENQENRENSENTENUENVENWENXENYENZEOFEOGEOHEOIEOJEOKEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZEPFEPGEPHEPIEPJEPKEPLEPMEPNEPOEPPEPQEPREPSEPTEPUEPVEPWEPXEPYEPZEQFEQGEQHEQIEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGERHERIERJERKERLERMERNEROERPERQERRERSERTERUERVERWERXERYERZESFESGESHESIESJESKESLESMESNESOESPESQESRESSESTESUESVESWESXESYESZETFETGETHETIETJETKETLETMETNETOETPETQETRETSETTETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREUSEUTEUUEUVEUWEUXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVEVWEVXEVYEVZEWFEWGEWHEWIEWJEWKEWLEWMEWNEWOEWPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEXJEXKEXLEXMEXNEXOEXPEXQEXREXSEXTEXUEXVEXWEXXEXYEXZEYFEYGEYHEYIEYJEYKEYLEYMEYNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLEZMEZNEZOEZPEZQEZREZSEZTEZUEZVEZWEZXEZYEZZFFFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUFFVFFWFFXFFYFFZFGGFGHFGIFGJFGKFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZFHGFHHFHIFHJFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZFIGFIHFIIFIJFIKFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJKFJLFJMFJNFJOFJPFJQFJRFJSFJTFJUFJVFJWFJXFJYFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKTFKUFKVFKWFKXFKYFKZFLGFLHFLIFLJFLKFLLFLMFLNFLOFLPFLQFLRFLSFLTFLUFLVFLWFLXFLYFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFMYFMZFNGFNHFNIFNJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFONFOOFOPFOQFORFOSFOTFOUFOVFOWFOXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFPSFPTFPUFPVFPWFPXFPYFPZFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQSFQTFQUFQVFQWFQXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWFRXFRYFRZFSGFSHFSIFSJFSKFSLFSMFSNFSOFSPFSQFSRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFTMFTNFTOFTPFTQFTRFTSFTTFTUFTVFTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFUOFUPFUQFURFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQFVRFVSFVTFVUFVVFVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRFWSFWTFWUFWVFWWFWXFWYFWZFXGFXHFXIFXJFXKFXLFXMFXNFXOFXPFXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKFYLFYMFYNFYOFYPFYQFYRFYSFYTFYUFYVFYWFYXFYYFYZFZGFZHFZIFZJFZKFZLFZMFZNFZOFZPFZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGGQGGRGGSGGTGGUGGVGGWGGXGGYGGZGHHGHIGHJGHKGHLGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIHGIIGIJGIKGILGIMGINGIOGIPGIQGIRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJNGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGKOGKPGKQGKRGKSGKTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLTGLUGLVGLWGLXGLYGLZGMHGMIGMJGMKGMLGMMGMNGMOGMPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGNLGNMGNNGNOGNPGNQGNRGNSGNTGNUGNVGNWGNXGNYGNZGOHGOIGOJGOKGOLGOMGONGOOGOPGOQGORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRGPSGPTGPUGPVGPWGPXGPYGPZGQHGQIGQJGQKGQLGQMGQNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGRJGRKGRLGRMGRNGROGRPGRQGRRGRSGRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOGSPGSQGSRGSSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPGTQGTRGTSGTTGTUGTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUVGUWGUXGUYGUZGVHGVIGVJGVKGVLGVMGVNGVOGVPGVQGVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMGWNGWOGWPGWQGWRGWSGWTGWUGWVGWWGWXGWYGWZGXHGXIGXJGXKGXLGXMGXNGXOGXPGXQGXRGXSGXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYTGYUGYVGYWGYXGYYGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZRGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHLHHMHHNHHOHHPHHQHHRHHSHHTHHUHHVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHISHITHIUHIVHIWHIXHIYHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJUHJVHJWHJXHJYHJZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIHLJHLKHLLHLMHLNHLOHLPHLQHLRHLSHLTHLUHLVHLWHLXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHMUHMVHMWHMXHMYHMZHNIHNJHNKHNLHNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHNXHNYHNZHOIHOJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKHPLHPMHPNHPOHPPHPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHQNHQOHQPHQQHQRHQSHQTHQUHQVHQWHQXHQYHQZHRIHRJHRKHRLHRMHRNHROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKHSLHSMHSNHSOHSPHSQHSRHSSHSTHSUHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMHTNHTOHTPHTQHTRHTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUTHUUHUVHUWHUXHUYHUZHVIHVJHVKHVLHVMHVNHVOHVPHVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMHWNHWOHWPHWQHWRHWSHWTHWUHWVHWWHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHXTHXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYVHYWHYXHYYHYZHZIHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJIIKIILIIMIINIIOIIPIIQIIRIISIITIIUIIVIIWIIXIIYIIZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJXIJYIJZIKJIKKIKLIKMIKNIKOIKPIKQIKRIKSIKTIKUIKVIKWIKXIKYIKZILJILKILLILMILNILOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQIMRIMSIMTIMUIMVIMWIMXIMYIMZINJINKINLINMINNINOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIOMIONIOOIOPIOQIORIOSIOTIOUIOVIOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTIPUIPVIPWIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWIQXIQYIQZIRJIRKIRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISNISOISPISQISRISSISTISUISVISWISXISYISZITJITKITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZIUJIUKIULIUMIUNIUOIUPIUQIURIUSIUTIUUIUVIUWIUXIUYIUZIVJIVKIVLIVMIVNIVOIVPIVQIVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWTIWUIWVIWWIWXIWYIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOIYPIYQIYRIYSIYTIYUIYVIYWIYXIYYIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZWIZXIZYIZZJJJKJJLJJMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJKKJKLJKMJKNJKOJKPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJLTJLUJLVJLWJLXJLYJLZJMKJMLJMMJMNJMOJMPJMQJMRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJNQJNRJNSJNTJNUJNVJNWJNXJNYJNZJOKJOLJOMJONJOOJOPJOQJORJOSJOTJOUJOVJOWJOXJOYJOZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJQNJQOJQPJQQJQRJQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRQJRRJRSJRTJRUJRVJRWJRXJRYJRZJSKJSLJSMJSNJSOJSPJSQJSRJSSJSTJSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJTTJTUJTVJTWJTXJTYJTZJUKJULJUMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJUXJUYJUZJVKJVLJVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWPJWQJWRJWSJWTJWUJWVJWWJWXJWYJWZJXKJXLJXMJXNJXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJYNJYOJYPJYQJYRJYSJYTJYUJYVJYWJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZUJZVJZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKLLKLMKLNKLOKLPKLQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKMTKMUKMVKMWKMXKMYKMZKNLKNMKNNKNOKNPKNQKNRKNSKNTKNUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKOUKOVKOWKOXKOYKOZKPLKPMKPNKPOKPPKPQKPRKPSKPTKPUKPVKPWKPXKPYKPZKQLKQMKQNKQOKQPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTKRUKRVKRWKRXKRYKRZKSLKSMKSNKSOKSPKSQKSRKSSKSTKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKTTKTUKTVKTWKTXKTYKTZKULKUMKUNKUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNKVOKVPKVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSKWTKWUKWVKWWKWXKWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYNKYOKYPKYQKYRKYSKYTKYUKYVKYWKYXKYYKYZKZLKZMKZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLNLLOLLPLLQLLRLLSLLTLLULLVLLWLLXLLYLLZLMMLMNLMOLMPLMQLMRLMSLMTLMULMVLMWLMXLMYLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLOQLORLOSLOTLOULOVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQRLQSLQTLQULQVLQWLQXLQYLQZLRMLRNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLSOLSPLSQLSRLSSLSTLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLTULTVLTWLTXLTYLTZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQLVRLVSLVTLVULVVLVWLVXLVYLVZLWMLWNLWOLWPLWQLWRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLXSLXTLXULXVLXWLXXLXYLXZLYMLYNLYOLYPLYQLYRLYSLYTLYULYVLYWLYXLYYLYZLZMLZNLZOLZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMVMMWMMXMMYMMZMNNMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYMOZMPNMPOMPPMPQMPRMPSMPTMPUMPVMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQXMQYMQZMRNMROMRPMRQMRRMRSMRTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSRMSSMSTMSUMSVMSWMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMUQMURMUSMUTMUUMUVMUWMUXMUYMUZMVNMVOMVPMVQMVRMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWTMWUMWVMWWMWXMWYMWZMXNMXOMXPMXQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYQMYRMYSMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZZNNNONNPNNQNNRNNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNOXNOYNOZNPONPPNPQNPRNPSNPTNPUNPVNPWNPXNPYNPZNQONQPNQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSNRTNRUNRVNRWNRXNRYNRZNSONSPNSQNSRNSSNSTNSUNSVNSWNSXNSYNSZNTONTPNTQNTRNTSNTTNTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVPNVQNVRNVSNVTNVUNVVNVWNVXNVYNVZNWONWPNWQNWRNWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUNXVNXWNXXNXYNXZNYONYPNYQNYRNYSNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZVNZWNZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOPTOPUOPVOPWOPXOPYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVORWORXORYORZOSPOSQOSROSSOSTOSUOSVOSWOSXOSYOSZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROUSOUTOUUOUVOUWOUXOUYOUZOVPOVQOVROVSOVTOVUOVVOVWOVXOVYOVZOWPOWQOWROWSOWTOWUOWVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSOYTOYUOYVOYWOYXOYYOYZOZPOZQOZROZSOZTOZUOZVOZWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQPQRPQSPQTPQUPQVPQWPQXPQYPQZPRQPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSVPSWPSXPSYPSZPTQPTRPTSPTTPTUPTVTABUABVABWABXABYABZACBACCACDACEACFACGACHACIACJACKACLACMACNACOACPACQACRACSACTACUACVACWACXACYACZADBADCADDADEADFADGADHADIADJADKADLADMADAAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAAUAAVAAWAAXAAYAAZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABHAFIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAFXAFYAFZAGBAGCAGDAGEAGFAGGAGHAGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWAGXAGYAGZAHNADOADPADQADRADSADTADUADVADWADXADYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESAETAEUAEVAEWAEXAEYAEZAFBAFCAFDAFEAFFAFGAFUAIVAIWAIXAIYAIZAJBAJCAJDAJEAJFAJGAJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVAJWAJXAJYAJZAKBAKCAKDAKEAKFAKGAKHAKIAKJAKKAKLAKMAKNAKBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRAHSAHTAHUAHVAHWAHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIRAISAITAIIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUAMVAMWAMXAMYAMZANBANCANDANEANFANGANHANIANJANKANLANMANNANOANPANQANRANSANTANUANVANWANXANYANZAOBAOOAKPAKQAKRAKSAKTAKUAKVAKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQALRALSALTALUALVALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMVAPWAPXAPYAPZAQBAQCAQDAQEAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQTAQUAQVAQWAQXAQYAQZARBARCARDAREARFARGARHARIARJARKARLARMARNAROARCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOPAOQAORAOSAOTAOUAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAPPAPQAPRAPSAPTAPUAPJATKATLATMATNATOATPATQATRATSATTATUATVATWATXATYATZAUBAUCAUDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAUSAUTAUUAUVAUWAUXAUYAUZAVBAVCAVPARQARRARSARTARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNASOASPASQASRASSASTASUASVASWASXASYASZATBATCATDATEATFATGATHATIATWAWXAWYAWZAXBAXCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAXRAXSAXTAXUAXVAXWAXXAXYAXZAYBAYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYDAVEAVFAVGAVHAVIAVJAVKAVLAVMAVNAVOAVPAVQAVRAVSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMAWNAWOAWPAWQAWRAWSAWTAWUAWVAWBLBBMBBNBBOBBPBBQBBRBBSBBTBBUBBVBBWBBXBBYBBZBCCBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCRBCSBCTBCUBCVBCWBCXBCYBCZBDCBDDBDEBDFBDGBQAYRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLAZMAZNAZOAZPAZQAZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBFDBFEBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFTBFUBFVBFWBFXBFYBFZBGCBGDBGEBGFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBGUBGVBGWBDHBDIBDJBDKBDLBDMBDNBDOBDPBDQBDRBDSBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBEOBEPBEQBERBESBETBEUBEVBEWBEXBEYBEZBFCBITBIUBIVBIWBIXBIYBIZBJCBJDBJEBJFBJGBJHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJWBJXBJYBJZBKCBKDBKEBKFBKGBKHBKIBKJBKKBKLBKMBKNBKOBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBHQBHRBHSBHTBHUBHVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQBIRBISBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBMYBMZBNCBNDBNEBNFBNGBNHBNIBNJBNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYBNZBOCBODBOEBOFBOGBKPBKQBKRBKSBKTBKUBKVBKWBKXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSBLTBLUBLVBLWBLXBLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBQDBQEBQFBQGBQHBQIBQJBQKBQLBQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCBRDBREBRFBRGBRHBRIBRJBRKBRLBRMBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUBOVBOWBOXBOYBOZBPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPVBPWBPXBPYBPZBQCBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEBUFBUGBUHBUIBUJBUKBULBUMBUNBUOBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVFBVGBVHBVIBVJBVKBVLBVMBVNBVOBRXBRYBRZBSCBSDBSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSXBSYBSZBTCBTDBTEBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBXLBXMBXNBXOBXPBXQBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYHBYIBYJBYKBYLBYMBYNBYOBYPBYQBYRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZBWCBWDBWEBWFBWGBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBXCBXDBXEBXFBXGBXHBXIBXJBXKBCDFCDGCDHCDICDJCDKCDLCDMCDNCDOCDPCDQCDRCDSCDTCDUCDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMCENCEOCEPCEQCERCESCETCEUCEVCEWCEXCEYCEZZHBZIBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCECCFCCGCCHCCICCJCCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECGYCGZCHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRCHSCHTCHUCHVCHWCHXCHYCHZCIDCIECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCITCIUCIVCFDCFECFFCFGCFHCFICFJCFKCFLCFMCFNCFOCFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGLCGMCGNCGOCGPCGQCGRCGSCGTCGUCGVCGWCGXCKUCKVCKWCKXCKYCKZCLDCLECLFCLGCLHCLICLJCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLYCLZCMDCMECMFCMGCMHCMICMJCMKCMLCMMCMNCMOCMPCMQCMRCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQCJRCJSCJTCJUCJVCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCKSCKTCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPGCPHCPICPJCPKCPLCPMCPNCPOCPPCPQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQICQJCQKCQLCQMCQNCMSCMTCMUCMVCMWCMXCMYCMZCNDCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCNXCNYCNZCODCOECOFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCSMCSNCSOCSPCSQCSRCSSCSTCSUCSVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCTNCTOCTPCTQCTRCTSCTTCTUCTVCTWCTXCTYCTZCUDCUECUFCUGCUHCUICUJCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECRFCRGCRHCRICRJCRKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGCSHCSICSJCSKCSLCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCWSCWTCWUCWVCWWCWXCWYCWZCXDCXECXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTCXUCXVCXWCXXCXYCXZCYDCYECYFCUKCULCUMCUNCUOCUPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLCVMCVNCVOCVPCVQCVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHEDDFDDGDDHDDIDDJDDKDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZDEEDEFDEGDEHDEIDEJDEKDELDEMDENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQCYRCYSCYTCYUCYVCYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZSCZTCZUCZVCZWCZXCZYCZZDDDEDHFDHGDHHDHIDHJDHKDHLDHMDHNDHODHPDHQDHRDHSDHTDHUDHVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDIODIPDIQDIRDISDITDIUDIVDIWDIXDIYDIZDJEDFFDFGDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDGEDGFDGGDGHDGIDGJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDLFDLGDLHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDLWDLXDLYDLZDMEDMFDMGDMHDMIDMJDMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYDMZDNEDJFDJGDJHDJIDJJDJKDJLDJMDJNDJODJPDJQDJRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKODKPDKQDKRDKSDKTDKUDKVDKWDKXDKYDKZDLEDPFDPGDPHDPIDPJDPKDPLDPMDPNDPODPPDPQDPRDPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKDQLDQMDQNDQODQPDQQDQRDQSDQTDQUDQVDQWDQXDQYDQZDREDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWDNXDNYDNZDOEDOFDOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZDPEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSDTTDTUDTVDTWDTXDTYDTZDUEDUFDUGDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUVDUWDUXDUYDUZDVEDRFDRGDRHDRIDRJDRKDRLDRMDRNDRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSLDSMDSNDSODSPDSQDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDXFDXGDXHDXIDXJDXKDXLDXMDXNDXODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYHDYIDYJDYKDYLDYMDYNDYODYPDYQDYRDYSDYTDYUDYVDYWDYXDYYDYZDZEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVTDVUDVVDVWDVXDVYDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDWWDWXDWYDWZDXFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEFREFSEFTEFUEFVEFWEFXEFYEFZEGFEGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUEGVEGWEGXEGYEGZEHFEHGEHHEEDZFDZGDZHDZIDZJDZKDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIEEJEEKEELEEMEENEEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEJKEJLEJMEJNEJOEJPEJQEJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKEKLEKMEKNEKOEKPEKQEKREKSEKTEKUEKVEKWEKXEKYEKZELFELGELHELIELJELKELLEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTEHUEHVEHWEHXEHYEHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIXEIYEIZEJFEJGEJHEJIEJJENOENPENQENRENSENTENUENVENWENXENYENZEOFEOGEOHEOIEOJEOKEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZEPFEPGEPHEPIEPJEPKEPLEPMEPNEPOEPPELMELNELOELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMNEMOEMPEMQEMREMSEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNERSERTERUERVERWERXERYERZESFESGESHESIESJESKESLESMESNESOESPESQESRESSESTESUESVESWESXESYESZETFETGETHETIETJETKETLETMETNETOETPETQETRETSETTEPQEPREPSEPTEPUEPVEPWEPXEPYEPZEQFEQGEQHEQIEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGERHERIERJERKERLERMERNEROERPERQERREVWEVXEVYEVZEWFEWGEWHEWIEWJEWKEWLEWMEWNEWOEWPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEXJEXKEXLEXMEXNEXOEXPEXQEXREXSEXTEXUEXVEXWEXXETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREUSEUTEUUEUVEUWEUXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVEFFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUFFVFFWFFXFFYFFZFGGFGHFGIFGJFGKFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZFHGFHHFHIFHJXYEXZEYFEYGEYHEYIEYJEYKEYLEYMEYNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLEZMEZNEZOEZPEZQEZREZSEZTEZUEZVEZWEZXEZYEZZFFJOFJPFJQFJRFJSFJTFJUFJVFJWFJXFJYFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKTFKUFKVFKWFKXFKYFKZFLGFLHFLIFLJFLKFLLFLMFLNFLOFLPFLQFLRFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZFIGFIHFIIFIJFIKFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJKFJLFJMFJNFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFONFOOFOPFOQFORFOSFOTFOUFOVFOWFOXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFPSFPTFPUFPVFPWFPXFPYFPZFLSFLTFLUFLVFLWFLXFLYFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFMYFMZFNGFNHFNIFNJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFSKFSLFSMFSNFSOFSPFSQFSRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFTMFTNFTOFTPFTQFTRFTSFTTFTUFTVFTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQSFQTFQUFQVFQWFQXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWFRXFRYFRZFSGFSHFSIFSJFWSFWTFWUFWVFWWFWXFWYFWZFXGFXHFXIFXJFXKFXLFXMFXNFXOFXPFXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKFYLFYMFYNFYOFYPFYQFYRFYSFYTFYUFYVFUOFUPFUQFURFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQFVRFVSFVTFVUFVVFVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRHGHIGHJGHKGHLGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIHGIIGIJGIKGILGIMGINGIOGIPGIQGIRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJFYWFYXFYYFYZFZGFZHFZIFZJFZKFZLFZMFZNFZOFZPFZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGGQGGRGGSGGTGGUGGVGGWGGXGGYGGZGHTGLUGLVGLWGLXGLYGLZGMHGMIGMJGMKGMLGMMGMNGMOGMPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGNLGNMGNNGNOGNPGNQGNRGNSGNTGNUGNVGNWGNXGNYGNNGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGKOGKPGKQGKRGKSGKTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLMGQNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGRJGRKGRLGRMGRNGROGRPGRQGRRGRSGRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOGSPGSQGSRGSZGOHGOIGOJGOKGOLGOMGONGOOGOPGOQGORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRGPSGPTGPUGPVGPWGPXGPYGPZGQHGQIGQJGQKGQLGQYGUZGVHGVIGVJGVKGVLGVMGVNGVOGVPGVQGVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMGWNGWOGWPGWQGWRGWSGWTGWUGWVGWWGWXGWYGWZGXHGXIGXJGXKGXSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPGTQGTRGTSGTTGTUGTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUVGUWGUXGURGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHLHHMHHNHHOHHPHHQHHRHHSHHTHHUHHVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHISHITHIUHIVHIWHIXHIYHLGXMGXNGXOGXPGXQGXRGXSGXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYTGYUGYVGYWGYXGYYGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZLPHLQHLRHLSHLTHLUHLVHLWHLXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHMUHMVHMWHMXHMYHMZHNIHNJHNKHNLHNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJUHJVHJWHJXHJYHJZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIHLJHLKHLLHLMHLNHLOHQNHQOHQPHQQHQRHQSHQTHQUHQVHQWHQXHQYHQZHRIHRJHRKHRLHRMHRNHROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKHSLHSMHSNHSOHSPHSQHSRHSSHSTHSUHNXHNYHNZHOIHOJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKHPLHPMHPNHPOHPPHPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHVLHVMHVNHVOHVPHVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMHWNHWOHWPHWQHWRHWSHWTHWUHWVHWWHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMHTNHTOHTPHTQHTRHTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUTHUUHUVHUWHUXHUYHUZHVIHVJHVKHIIKIILIIMIINIIOIIPIIQIIRIISIITIIUIIVIIWIIXIIYIIZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJXIJYIJZIKJIKKIKLIKMIKNIKOIKPIKQIKRIKSIKTXTHXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYVHYWHYXHYYHYZHZIHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJINNINOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIOMIONIOOIOPIOQIORIOSIOTIOUIOVIOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTIPUIPVIPWIKUIKVIKWIKXIKYIKZILJILKILLILMILNILOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQIMRIMSIMTIMUIMVIMWIMXIMYIMZINJINKINLINMISQISRISSISTISUISVISWISXISYISZITJITKITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZIUJIUKIULIUMIUNIUOIUPIUQIURIUSIUTIUUIUVIUWIUXIUYIUZIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWIQXIQYIQZIRJIRKIRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISNISOISPIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOIYPIYQIYRIYSIYTIYUIYVIYWIYXIYYIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZWIZXIZYIZZJJJKJJLJJIVJIVKIVLIVMIVNIVOIVPIVQIVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWTIWUIWVIWWIWXIWYIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSYJLZJMKJMLJMMJMNJMOJMPJMQJMRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJNQJNRJNSJNTJNUJNVJNWJNXJNYJNZJOKJOLJOMJONJOOJOPJOQJORJOSJOTJOMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJKKJKLJKMJKNJKOJKPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJLTJLUJLVJLWJLXJLQJRRJRSJRTJRUJRVJRWJRXJRYJRZJSKJSLJSMJSNJSOJSPJSQJSRJSSJSTJSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJTTJTUJTVJTWJTXJTYJTZJUKJULJUUJOVJOWJOXJOYJOZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJQNJQOJQPJQQJQRJQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRYJWZJXKJXLJXMJXNJXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJYNJYOJYPJYQJYRJYSJYTJYUJYVJYWJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJUXJUYJUZJVKJVLJVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWPJWQJWRJWSJWTJWUJWVJWWJWXJWMTKMUKMVKMWKMXKMYKMZKNLKNMKNNKNOKNPKNQKNRKNSKNTKNUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKOUKOVKOWKOXKOYKOZKPLKPMKPNKPOKPPKPQKPRKUJZVJZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKLLKLMKLNKLOKLPKLQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKSRKSSKSTKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKTTKTUKTVKTWKTXKTYKTZKULKUMKUNKUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNKVOKVPKPSKPTKPUKPVKPWKPXKPYKPZKQLKQMKQNKQOKQPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTKRUKRVKRWKRXKRYKRZKSLKSMKSNKSOKSPKSQKYPKYQKYRKYSKYTKYUKYVKYWKYXKYYKYZKZLKZMKZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLNLLOLLPLLQLLRLLSLLTLLULLVLLWLLXLLYLLZLMMLMNLMOLMPVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSKWTKWUKWVKWWKWXKWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYNKYOKLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQRLQSLQTLQULQVLQWLQXLQYLQZLRMLRNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLSOLSPLSQLSRLSSLSTLMQLMRLMSLMTLMULMVLMWLMXLMYLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLOQLORLOSLOTLOULOVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLVWLVXLVYLVZLWMLWNLWOLWPLWQLWRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLXSLXTLXULXVLXWLXXLXYLXZLYMLYNLYOLYPLYQLYRLYSLYTLYULYVLYWLYXLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLTULTVLTWLTXLTYLTZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQLVRLVSLVTLVULVVOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYMOZMPNMPOMPPMPQMPRMPSMPTMPUMPVMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQXMQYMQZMRNMROMRPMRQMRRMRSMRLYYLYZLZMLZNLZOLZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMVMMWMMXMMYMMZMNNMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOYMUZMVNMVOMVPMVQMVRMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWTMWUMWVMWWMWXMWYMWZMXNMXOMXPMXQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSRMSSMSTMSUMSVMSWMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMUQMURMUSMUTMUUMUVMUWMUXMUOXNOYNOZNPONPPNPQNPRNPSNPTNPUNPVNPWNPXNPYNPZNQONQPNQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSNRTNRUNRVNRWNRXNRYNRZNSONSPNSQNSRNSSNQMYRMYSMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZZNNNONNPNNQNNRNNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNWPNWQNWRNWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUNXVNXWNXXNXYNXZNYONYPNYQNYRNYSNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZVNZWNSTNSUNSVNSWNSXNSYNSZNTONTPNTQNTRNTSNTTNTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVPNVQNVRNVSNVTNVUNVVNVWNVXNVYNVZNWONORXORYORZOSPOSQOSROSSOSTOSUOSVOSWOSXOSYOSZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROUSOUTOUUOUVOUWOUXOUYOUZOVPOVQOVROVSOVTOVUOVVOVWZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOPTOPUOPVOPWOPXOPYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVORWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQPQRPQSPQTPQUPQVPQWPQXPQYPQZPRQPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSVPSWPSXPSYPSZPTOVXOVYOVZOWPOWQOWROWSOWTOWUOWVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSOYTOYUOYVOYWOYXOYYOYZOZPOZQOZROZSOZTOZUOZVOZWQPTRPTSPTTPTUPTV
\ No newline at end of file

crates/libz-sys/src/zlib-ng/test/GH-361/test.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/GH-361/test.txt b/crates/libz-sys/src/zlib-ng/test/GH-361/test.txt
deleted file mode 100644
index 2b10281..0000000
--- a/crates/libz-sys/src/zlib-ng/test/GH-361/test.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.....-.u..|u....-...!..A.#?)9.._B..F..|
-00000650  fa 13 88 89 2c 1f 81 0f  e4 e9 ce 39 a0 87 2e 2e  |....,......9....|
-00000660  a5 0c 08 9c ec fc 88 6d  16 02 0a a0 3d fc 36 29  |.......m....=.6)|
-00000670  8d f5 c3 ba 1d 07 f4 78  e1 a0 41 f9 89 15 a5 69  |.......x..A....
\ No newline at end of file

crates/libz-sys/src/zlib-ng/test/GH-364/test.bin

diff --git a/crates/libz-sys/src/zlib-ng/test/GH-364/test.bin b/crates/libz-sys/src/zlib-ng/test/GH-364/test.bin
deleted file mode 100644
index 1b1cb4d..0000000
--- a/crates/libz-sys/src/zlib-ng/test/GH-364/test.bin
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/GH-382/defneg3.dat

diff --git a/crates/libz-sys/src/zlib-ng/test/GH-382/defneg3.dat b/crates/libz-sys/src/zlib-ng/test/GH-382/defneg3.dat
deleted file mode 100644
index 5fa6a08..0000000
--- a/crates/libz-sys/src/zlib-ng/test/GH-382/defneg3.dat
+++ /dev/null
@@ -1 +0,0 @@
-o̙Ì?ÌOÌÃÌḩÌÕÌ>ÌÌÌà̝̹̘ÌÔÌEÌs̗̍Ì4̢̙̑Ì6ÌÌØÌæÌ\ÌÌÌ5̪̲̕ÌmÌ̖Ìç̺̜ÌÙ̧ÌÌíÌí̖ÌÌëÌmÌìÌÎ̵ÌGÌïÌOÌÛÌ ÌÃÌòÌÎÌô̄Ì;̔Ìý̒ÌÓÌÀÌ×Ì,ÌÑÌ¢ÌáÌAÌ9Ì»Ìæ̂ÌÂÌsÌý̼ÌÝÌÌ­ÌeÌòÌÝÌUÌuÌí̱ÌËÌwÌù̕ÌDÌß̋̽Ìt̞̣̹ÌöÌôÌOÌîÌí̅ÌpÌGÌìÌ°ÌÀÌ(ÌÌÌ̤Ì{̓ÌßÌïÌÕÌÌøÌÌMÌ#̝Ìí̵ÌdÌ·ÌIÌßÌhÌ_ÌpÌJÌÇÌ¢ÌÎÌ
ÌóÌêÌÁÌ;Ì<̘ÌZÌÈÌÑÌoÌW̄̿Ì}ÌáÌÌÌ:Ìá̧̻̕ÌeÌFÌtÌ(ÌEÌoÌàÌpÌÌ¢Ì(Ì;ÌþÌëÌóÌ!̹̹ÌÉÌ̜ÌîÌÖÌ4ÌÈÌ3Ìë̋ÌB̎ÌÆÌuÌPÌ6̓ÌþÌ&̦̳̕ÌÁÌðÌ»ÌÌÌTÌÀ̧ÌbÌÌÒÌÕÌëÌ{ÌÆÌ¡ÌÊÌNÌ9ÌÇÌÌBÌÑ
\ No newline at end of file

crates/libz-sys/src/zlib-ng/test/GH-751/test.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/GH-751/test.txt b/crates/libz-sys/src/zlib-ng/test/GH-751/test.txt
deleted file mode 100644
index ef2143e..0000000
--- a/crates/libz-sys/src/zlib-ng/test/GH-751/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc

crates/libz-sys/src/zlib-ng/test/GH-979/pigz-2.6.tar.gz

diff --git a/crates/libz-sys/src/zlib-ng/test/GH-979/pigz-2.6.tar.gz b/crates/libz-sys/src/zlib-ng/test/GH-979/pigz-2.6.tar.gz
deleted file mode 100644
index 0d76ef8..0000000
--- a/crates/libz-sys/src/zlib-ng/test/GH-979/pigz-2.6.tar.gz
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/Makefile.in

diff --git a/crates/libz-sys/src/zlib-ng/test/Makefile.in b/crates/libz-sys/src/zlib-ng/test/Makefile.in
deleted file mode 100644
index 4cd1399..0000000
--- a/crates/libz-sys/src/zlib-ng/test/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-# Copyright 2015, Daniel Axtens, IBM Corporation
-# zlib license, see zlib.h
-
-CC=
-CFLAGS=
-EXE=
-SRCDIR=
-SRCTOP=
-LIBNAME=
-TEST_LDFLAGS=-L.. ../$(LIBNAME).a
-
-QEMU_RUN=
-QEMU_VER:=$(shell command -v $(QEMU_RUN) --version 2> /dev/null)
-
-all: oldtests ghtests
-
-oldtests: #set by ../configure
-check_cross_dep:
-ifneq (,$(QEMU_RUN))
-ifeq (,$(QEMU_VER))
-	$(error "You need QEMU to run tests on non-native platform")
-endif
-endif
-
-ALL_SRC_FILES := $(wildcard ../*)
-
-teststatic: check_cross_dep
-	@TMPST=tmpst_$$$$; \
-	HELLOST=tmphellost_$$$$; \
-	if echo hello world | ${QEMU_RUN} ../minigzip$(EXE) > $$HELLOST && ${QEMU_RUN} ../minigzip$(EXE) -d < $$HELLOST && ${QEMU_RUN} ../example$(EXE) $$TMPST; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; exit 1; \
-	fi; \
-	rm -f $$TMPST $$HELLOST
-
-testshared: check_cross_dep
-	@LD_LIBRARY_PATH=`pwd`/..:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	LD_LIBRARYN32_PATH=`pwd`/..:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
-	DYLD_LIBRARY_PATH=`pwd`/..:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`/..:$(SHLIB_PATH) ; export SHLIB_PATH; \
-	TMPSH=tmpsh_$$$$; \
-	HELLOSH=tmphellosh_$$$$; \
-	if echo hello world | ${QEMU_RUN} ../minigzipsh$(EXE) > $$HELLOSH && ${QEMU_RUN} ../minigzipsh$(EXE) -d < $$HELLOSH && ${QEMU_RUN} ../examplesh$(EXE) $$TMPSH; then \
-	  echo '		*** zlib shared test OK ***'; \
-	else \
-	  echo '		*** zlib shared test FAILED ***'; exit 1; \
-	fi; \
-	rm -f $$TMPSH $$HELLOSH
-
-.PHONY: ghtests
-ghtests: testGH-361 testGH-364 testGH-751 testGH-1235
-
-.PHONY: testGH-361
-testGH-361:
-	$(QEMU_RUN) ../minigzip$(EXE) -4 <$(SRCDIR)/GH-361/test.txt >/dev/null
-
-switchlevels$(EXE): $(SRCDIR)/switchlevels.c
-	$(CC) $(CFLAGS) -I.. -I$(SRCTOP) -o $@ $< $(TEST_LDFLAGS)
-
-.PHONY: testGH-364
-testGH-364: switchlevels$(EXE)
-	$(QEMU_RUN) ./switchlevels$(EXE) 1 5 9 3 <$(SRCDIR)/GH-364/test.bin >/dev/null
-
-.PHONY: testGH-751
-testGH-751:
-	$(QEMU_RUN) ../minigzip$(EXE) <$(SRCDIR)/GH-751/test.txt | $(QEMU_RUN) ../minigzip$(EXE) -d >/dev/null
-
-gh1235$(EXE): $(SRCDIR)/gh1235.c
-	$(CC) $(CFLAGS) -I.. -I$(SRCTOP) -o $@ $< $(TEST_LDFLAGS)
-
-.PHONY: testGH-1235
-testGH-1235: gh1235$(EXE)
-	$(QEMU_RUN) ./gh1235$(EXE)
-
-clean:
-	rm -f *.o *.gcda *.gcno *.gcov
-	rm -f switchlevels$(EXE) gh1235$(EXE)
-
-distclean:
-	rm -f Makefile

crates/libz-sys/src/zlib-ng/test/README.md

diff --git a/crates/libz-sys/src/zlib-ng/test/README.md b/crates/libz-sys/src/zlib-ng/test/README.md
deleted file mode 100644
index d844ba5..0000000
--- a/crates/libz-sys/src/zlib-ng/test/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Contents
---------
-
-|Name|Description|
-|-|-|
-|[CVE-2003-0107](https://nvd.nist.gov/vuln/detail/CVE-2003-0107)|Buffer overflow in the gzprintf function, requires ZLIB_COMPAT|
-|[CVE-2002-0059](https://nvd.nist.gov/vuln/detail/CVE-2002-0059)|inflateEnd to release memory more than once|
-|[CVE-2004-0797](https://nvd.nist.gov/vuln/detail/CVE-2004-0797)|Error handling in inflate and inflateBack causes crash|
-|[CVE-2005-1849](https://nvd.nist.gov/vuln/detail/CVE-2005-1849)|inftrees.h bug causes crash|
-|[CVE-2005-2096](https://nvd.nist.gov/vuln/detail/CVE-2005-2096)|Buffer overflow when incomplete code description|
-|[CVE-2018-25032](https://nvd.nist.gov/vuln/detail/CVE-2018-25032)|Memory corruption when compressing if the input has many distant matches.|
-|[GH-361](https://github.com/zlib-ng/zlib-ng/issues/361)|Test case for overlapping matches|
-|[GH-364](https://github.com/zlib-ng/zlib-ng/issues/364)|Test case for switching compression levels|
-|[GH-382](https://github.com/zlib-ng/zlib-ng/issues/382)|Test case for deflateEnd returning -3 in deflate quick|
-
-Copying
--------
-
-Some of the files in _test_ are licensed differently:
-
- - test/data/fireworks.jpeg is Copyright 2013 Steinar H. Gunderson, and
-   is licensed under the Creative Commons Attribution 3.0 license
-   (CC-BY-3.0). See https://creativecommons.org/licenses/by/3.0/
-   for more information.
-
- - test/data/paper-100k.pdf is an excerpt (bytes 92160 to 194560) from the paper
-   “Combinatorial Modeling of Chromatin Features Quantitatively Predicts DNA
-   Replication Timing in _Drosophila_” by Federico Comoglio and Renato Paro,
-   which is licensed under the CC-BY license. See
-   https://www.ploscompbiol.org/static/license for more information.
-
- - test/data/lcet10.txt is from Project Gutenberg. It does not have expired
-   copyright, but is still in the public domain according to the license information.
-   (https://www.gutenberg.org/ebooks/53).
-
- - test/GH-382/defneg3.dat was the smallest file generated by Nathan Moinvaziri
-   that reproduced GH-382. It is licensed under the terms of the zlib license.

crates/libz-sys/src/zlib-ng/test/abi/ignore

diff --git a/crates/libz-sys/src/zlib-ng/test/abi/ignore b/crates/libz-sys/src/zlib-ng/test/abi/ignore
deleted file mode 100644
index dba3639..0000000
--- a/crates/libz-sys/src/zlib-ng/test/abi/ignore
+++ /dev/null
@@ -1,12 +0,0 @@
-# See https://sourceware.org/libabigail/manual/libabigail-concepts.html#suppression-specifications
-
-[suppress_type]
-  name = internal_state
-
-[suppress_type]
-  name_regexp = z_stream.*
-
-# Size varies with version number
-[suppress_variable]
-  name = zlibng_string
-

crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-arm-linux-gnueabihf.abi

diff --git a/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-arm-linux-gnueabihf.abi b/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-arm-linux-gnueabihf.abi
deleted file mode 100644
index 152a742..0000000
--- a/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-arm-linux-gnueabihf.abi
+++ /dev/null
@@ -1,119 +0,0 @@
-<abi-corpus path='btmp1/libz.so.1.2.11' architecture='elf-arm' soname='libz.so.1'>
-  <elf-needed>
-    <dependency name='libc.so.6'/>
-    <dependency name='ld-linux-armhf.so.3'/>
-  </elf-needed>
-  <elf-function-symbols>
-    <elf-symbol name='adler32' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_combine64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_combine' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_z' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compress2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compressBound' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_combine64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_combine' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_z' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateBound' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateCopy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateEnd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateGetDictionary' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateInit2_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateInit_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateParams' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflatePending' version='ZLIB_1.2.5.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflatePrime' version='ZLIB_1.2.0.8' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateReset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateResetKeep' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateSetDictionary' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateSetHeader' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateTune' version='ZLIB_1.2.2.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='get_crc_table' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzbuffer' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclearerr' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose_r' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose_w' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzdirect' version='ZLIB_1.2.2.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzdopen' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzeof' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzerror' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzflush' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzfread' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzfwrite' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgetc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgetc_' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgets' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzoffset64' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzoffset' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzopen' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzopen64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzprintf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzputc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzputs' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzread' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzrewind' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzseek' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzseek64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzsetparams' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gztell' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gztell64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzungetc' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzvprintf' version='ZLIB_1.2.7.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzwrite' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBack' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBackEnd' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBackInit_' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateCodesUsed' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateCopy' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateEnd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateGetDictionary' version='ZLIB_1.2.7.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateGetHeader' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateInit2_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateInit_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateMark' version='ZLIB_1.2.3.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflatePrime' version='ZLIB_1.2.2.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateReset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateReset2' version='ZLIB_1.2.3.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateResetKeep' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSetDictionary' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSync' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSyncPoint' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateUndermine' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateValidate' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='uncompress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='uncompress2' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zError' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibCompileFlags' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibVersion' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-  </elf-function-symbols>
-  <abi-instr version='1.0' address-size='32' path='src.d/trees.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
-    <typedef-decl name='uch' type-id='type-id-1' filepath='src.d/zutil.h' line='43' column='1' id='type-id-2'/>
-    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-3'/>
-
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='infinite' id='type-id-4'>
-      <subrange length='infinite' id='type-id-5'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-4' const='yes' id='type-id-6'/>
-    <var-decl name='_dist_code' type-id='type-id-6' visibility='default' filepath='src.d/deflate.h' line='323' column='1'/>
-    <var-decl name='_length_code' type-id='type-id-6' visibility='default' filepath='src.d/deflate.h' line='322' column='1'/>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='32' path='src.d/zutil.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <type-decl name='char' size-in-bits='8' id='type-id-7'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='32' id='type-id-8'/>
-    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-9'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-10'/>
-
-    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='320' id='type-id-11'>
-      <subrange length='10' type-id='type-id-10' id='type-id-12'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-13'/>
-    <var-decl name='z_errmsg' type-id='type-id-13' visibility='default' filepath='src.d/zutil.h' line='49' column='1'/>
-  </abi-instr>
-</abi-corpus>

crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-x86_64-linux-gnu.abi

diff --git a/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-x86_64-linux-gnu.abi b/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-x86_64-linux-gnu.abi
deleted file mode 100644
index 00a520c..0000000
--- a/crates/libz-sys/src/zlib-ng/test/abi/zlib-v1.2.11-x86_64-linux-gnu.abi
+++ /dev/null
@@ -1,1037 +0,0 @@
-<abi-corpus path='btmp1/libz.so.1.2.11' architecture='elf-amd-x86_64' soname='libz.so.1'>
-  <elf-needed>
-    <dependency name='libc.so.6'/>
-  </elf-needed>
-  <elf-function-symbols>
-    <elf-symbol name='adler32' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_combine64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_combine' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_z' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compress2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='compressBound' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_combine64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_combine' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_z' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateBound' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateCopy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateEnd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateGetDictionary' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateInit2_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateInit_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateParams' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflatePending' version='ZLIB_1.2.5.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflatePrime' version='ZLIB_1.2.0.8' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateReset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateResetKeep' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateSetDictionary' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateSetHeader' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='deflateTune' version='ZLIB_1.2.2.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='get_crc_table' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzbuffer' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclearerr' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose_r' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzclose_w' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzdirect' version='ZLIB_1.2.2.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzdopen' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzeof' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzerror' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzflush' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzfread' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzfwrite' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgetc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgetc_' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzgets' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzoffset64' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzoffset' version='ZLIB_1.2.3.5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzopen' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzopen64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzprintf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzputc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzputs' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzread' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzrewind' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzseek' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzseek64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzsetparams' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gztell' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gztell64' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzungetc' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzvprintf' version='ZLIB_1.2.7.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gzwrite' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBack' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBackEnd' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateBackInit_' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateCodesUsed' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateCopy' version='ZLIB_1.2.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateEnd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateGetDictionary' version='ZLIB_1.2.7.1' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateGetHeader' version='ZLIB_1.2.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateInit2_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateInit_' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateMark' version='ZLIB_1.2.3.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflatePrime' version='ZLIB_1.2.2.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateReset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateReset2' version='ZLIB_1.2.3.4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateResetKeep' version='ZLIB_1.2.5.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSetDictionary' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSync' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateSyncPoint' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateUndermine' version='ZLIB_1.2.3.3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='inflateValidate' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='uncompress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='uncompress2' version='ZLIB_1.2.9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zError' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibCompileFlags' version='ZLIB_1.2.0.2' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibVersion' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-  </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='src.d/adler32.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-1'/>
-    <typedef-decl name='uLong' type-id='type-id-1' filepath='./zconf.h' line='394' column='1' id='type-id-2'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-3'/>
-    <typedef-decl name='__off64_t' type-id='type-id-3' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='153' column='1' id='type-id-4'/>
-    <typedef-decl name='off64_t' type-id='type-id-4' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='92' column='1' id='type-id-5'/>
-    <function-decl name='adler32_combine64' mangled-name='adler32_combine64' filepath='src.d/adler32.c' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-2' name='adler1' filepath='src.d/adler32.c' line='181' column='1'/>
-      <parameter type-id='type-id-2' name='adler2' filepath='src.d/adler32.c' line='182' column='1'/>
-      <parameter type-id='type-id-5' name='len2' filepath='src.d/adler32.c' line='183' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <typedef-decl name='__off_t' type-id='type-id-3' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='152' column='1' id='type-id-6'/>
-    <typedef-decl name='off_t' type-id='type-id-6' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='85' column='1' id='type-id-7'/>
-    <function-decl name='adler32_combine' mangled-name='adler32_combine' filepath='src.d/adler32.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-2' name='adler1' filepath='src.d/adler32.c' line='173' column='1'/>
-      <parameter type-id='type-id-2' name='adler2' filepath='src.d/adler32.c' line='174' column='1'/>
-      <parameter type-id='type-id-7' name='len2' filepath='src.d/adler32.c' line='175' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-8'/>
-    <typedef-decl name='Byte' type-id='type-id-8' filepath='./zconf.h' line='391' column='1' id='type-id-9'/>
-    <typedef-decl name='Bytef' type-id='type-id-9' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-11'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-12'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-13'/>
-    <typedef-decl name='uInt' type-id='type-id-13' filepath='./zconf.h' line='393' column='1' id='type-id-14'/>
-    <function-decl name='adler32' mangled-name='adler32' filepath='src.d/adler32.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32'>
-      <parameter type-id='type-id-2' name='adler' filepath='src.d/adler32.c' line='135' column='1'/>
-      <parameter type-id='type-id-12' name='buf' filepath='src.d/adler32.c' line='136' column='1'/>
-      <parameter type-id='type-id-14' name='len' filepath='src.d/adler32.c' line='137' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <typedef-decl name='size_t' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-linux-gnu/9/include/stddef.h' line='209' column='1' id='type-id-15'/>
-    <typedef-decl name='z_size_t' type-id='type-id-15' filepath='./zconf.h' line='248' column='1' id='type-id-16'/>
-    <function-decl name='adler32_z' mangled-name='adler32_z' filepath='src.d/adler32.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-2' name='adler' filepath='src.d/adler32.c' line='64' column='1'/>
-      <parameter type-id='type-id-12' name='buf' filepath='src.d/adler32.c' line='65' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='src.d/adler32.c' line='66' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/crc32.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-2' name='adler1' filepath='src.d/adler32.c' line='181' column='1'/>
-      <parameter type-id='type-id-2' name='adler2' filepath='src.d/adler32.c' line='182' column='1'/>
-      <parameter type-id='type-id-5' name='len2' filepath='src.d/adler32.c' line='183' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-2' name='adler1' filepath='src.d/adler32.c' line='173' column='1'/>
-      <parameter type-id='type-id-2' name='adler2' filepath='src.d/adler32.c' line='174' column='1'/>
-      <parameter type-id='type-id-7' name='len2' filepath='src.d/adler32.c' line='175' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-1' name='crc' filepath='src.d/crc32.c' line='238' column='1'/>
-      <parameter type-id='type-id-18' name='buf' filepath='src.d/crc32.c' line='239' column='1'/>
-      <parameter type-id='type-id-14' name='len' filepath='src.d/crc32.c' line='240' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-1' name='crc' filepath='src.d/crc32.c' line='203' column='1'/>
-      <parameter type-id='type-id-18' name='buf' filepath='src.d/crc32.c' line='204' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='src.d/crc32.c' line='205' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <typedef-decl name='z_crc_t' type-id='type-id-13' filepath='./zconf.h' line='429' column='1' id='type-id-19'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-20'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-21'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
-      <return type-id='type-id-21'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/deflate.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <type-decl name='int' size-in-bits='32' id='type-id-22'/>
-    <class-decl name='z_stream_s' size-in-bits='896' is-struct='yes' visibility='default' filepath='src.d/zlib.h' line='86' column='1' id='type-id-23'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next_in' type-id='type-id-24' visibility='default' filepath='src.d/zlib.h' line='87' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='avail_in' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='88' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='total_in' type-id='type-id-2' visibility='default' filepath='src.d/zlib.h' line='89' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='next_out' type-id='type-id-24' visibility='default' filepath='src.d/zlib.h' line='91' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='avail_out' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='92' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='total_out' type-id='type-id-2' visibility='default' filepath='src.d/zlib.h' line='93' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='msg' type-id='type-id-25' visibility='default' filepath='src.d/zlib.h' line='95' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='state' type-id='type-id-26' visibility='default' filepath='src.d/zlib.h' line='96' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='zalloc' type-id='type-id-27' visibility='default' filepath='src.d/zlib.h' line='98' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='zfree' type-id='type-id-28' visibility='default' filepath='src.d/zlib.h' line='99' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='opaque' type-id='type-id-29' visibility='default' filepath='src.d/zlib.h' line='100' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='data_type' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='102' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='adler' type-id='type-id-2' visibility='default' filepath='src.d/zlib.h' line='104' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='reserved' type-id='type-id-2' visibility='default' filepath='src.d/zlib.h' line='105' column='1'/>
-      </data-member>
-    </class-decl>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-24'/>
-    <type-decl name='char' size-in-bits='8' id='type-id-30'/>
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-25'/>
-    <class-decl name='internal_state' size-in-bits='47616' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='100' column='1' id='type-id-31'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='strm' type-id='type-id-32' visibility='default' filepath='src.d/deflate.h' line='101' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='status' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='102' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pending_buf' type-id='type-id-24' visibility='default' filepath='src.d/deflate.h' line='103' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='pending_buf_size' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='104' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pending_out' type-id='type-id-24' visibility='default' filepath='src.d/deflate.h' line='105' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='pending' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='106' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='wrap' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='107' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gzhead' type-id='type-id-34' visibility='default' filepath='src.d/deflate.h' line='108' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gzindex' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='109' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='method' type-id='type-id-9' visibility='default' filepath='src.d/deflate.h' line='110' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='last_flush' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='111' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='w_size' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='115' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='w_bits' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='116' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='w_mask' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='117' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='window' type-id='type-id-24' visibility='default' filepath='src.d/deflate.h' line='119' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='window_size' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='129' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='prev' type-id='type-id-35' visibility='default' filepath='src.d/deflate.h' line='134' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='head' type-id='type-id-35' visibility='default' filepath='src.d/deflate.h' line='140' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='ins_h' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='142' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1056'>
-        <var-decl name='hash_size' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='143' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='hash_bits' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='144' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='hash_mask' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='145' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='hash_shift' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='147' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='block_start' type-id='type-id-3' visibility='default' filepath='src.d/deflate.h' line='154' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='match_length' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='159' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='prev_match' type-id='type-id-36' visibility='default' filepath='src.d/deflate.h' line='160' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='match_available' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='161' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='strstart' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='162' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='match_start' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='163' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1440'>
-        <var-decl name='lookahead' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='164' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='prev_length' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='166' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='max_chain_length' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='171' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='max_lazy_match' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='177' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='level' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='188' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='strategy' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='189' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='good_match' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='191' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='nice_match' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='194' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='dyn_ltree' type-id='type-id-37' visibility='default' filepath='src.d/deflate.h' line='198' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='20032'>
-        <var-decl name='dyn_dtree' type-id='type-id-38' visibility='default' filepath='src.d/deflate.h' line='199' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='21984'>
-        <var-decl name='bl_tree' type-id='type-id-39' visibility='default' filepath='src.d/deflate.h' line='200' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='23232'>
-        <var-decl name='l_desc' type-id='type-id-40' visibility='default' filepath='src.d/deflate.h' line='202' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='23424'>
-        <var-decl name='d_desc' type-id='type-id-40' visibility='default' filepath='src.d/deflate.h' line='203' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='23616'>
-        <var-decl name='bl_desc' type-id='type-id-40' visibility='default' filepath='src.d/deflate.h' line='204' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='23808'>
-        <var-decl name='bl_count' type-id='type-id-41' visibility='default' filepath='src.d/deflate.h' line='206' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='24064'>
-        <var-decl name='heap' type-id='type-id-42' visibility='default' filepath='src.d/deflate.h' line='209' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='42400'>
-        <var-decl name='heap_len' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='210' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='42432'>
-        <var-decl name='heap_max' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='211' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='42464'>
-        <var-decl name='depth' type-id='type-id-43' visibility='default' filepath='src.d/deflate.h' line='216' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47104'>
-        <var-decl name='l_buf' type-id='type-id-44' visibility='default' filepath='src.d/deflate.h' line='220' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47168'>
-        <var-decl name='lit_bufsize' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='222' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47200'>
-        <var-decl name='last_lit' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='242' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47232'>
-        <var-decl name='d_buf' type-id='type-id-45' visibility='default' filepath='src.d/deflate.h' line='244' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47296'>
-        <var-decl name='opt_len' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='250' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47360'>
-        <var-decl name='static_len' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='251' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47424'>
-        <var-decl name='matches' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='252' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47456'>
-        <var-decl name='insert' type-id='type-id-14' visibility='default' filepath='src.d/deflate.h' line='253' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47488'>
-        <var-decl name='bi_buf' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='260' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47520'>
-        <var-decl name='bi_valid' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='264' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='47552'>
-        <var-decl name='high_water' type-id='type-id-33' visibility='default' filepath='src.d/deflate.h' line='269' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='z_stream' type-id='type-id-23' filepath='src.d/zlib.h' line='106' column='1' id='type-id-47'/>
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
-    <typedef-decl name='z_streamp' type-id='type-id-48' filepath='src.d/zlib.h' line='108' column='1' id='type-id-32'/>
-    <typedef-decl name='ulg' type-id='type-id-1' filepath='src.d/zutil.h' line='47' column='1' id='type-id-33'/>
-    <class-decl name='gz_header_s' size-in-bits='640' is-struct='yes' visibility='default' filepath='src.d/zlib.h' line='114' column='1' id='type-id-49'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='text' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='115' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='time' type-id='type-id-2' visibility='default' filepath='src.d/zlib.h' line='116' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='xflags' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='117' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='os' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='118' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='extra' type-id='type-id-24' visibility='default' filepath='src.d/zlib.h' line='119' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='extra_len' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='120' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='extra_max' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='121' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='name' type-id='type-id-24' visibility='default' filepath='src.d/zlib.h' line='122' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='name_max' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='123' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='comment' type-id='type-id-24' visibility='default' filepath='src.d/zlib.h' line='124' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='comm_max' type-id='type-id-14' visibility='default' filepath='src.d/zlib.h' line='125' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='hcrc' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='126' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='done' type-id='type-id-22' visibility='default' filepath='src.d/zlib.h' line='127' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='gz_header' type-id='type-id-49' filepath='src.d/zlib.h' line='129' column='1' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-51'/>
-    <typedef-decl name='gz_headerp' type-id='type-id-51' filepath='src.d/zlib.h' line='131' column='1' id='type-id-34'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-52'/>
-    <typedef-decl name='ush' type-id='type-id-52' filepath='src.d/zutil.h' line='45' column='1' id='type-id-46'/>
-    <typedef-decl name='Pos' type-id='type-id-46' filepath='src.d/deflate.h' line='92' column='1' id='type-id-53'/>
-    <typedef-decl name='Posf' type-id='type-id-53' filepath='src.d/deflate.h' line='93' column='1' id='type-id-54'/>
-    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-35'/>
-    <typedef-decl name='IPos' type-id='type-id-13' filepath='src.d/deflate.h' line='94' column='1' id='type-id-36'/>
-    <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-55'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='fc' type-id='type-id-56' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='dl' type-id='type-id-57' visibility='default' filepath='src.d/deflate.h' line='76' column='1'/>
-      </data-member>
-    </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='src.d/deflate.h' line='69' column='1' id='type-id-56'>
-      <data-member access='private'>
-        <var-decl name='freq' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='70' column='1'/>
-      </data-member>
-      <data-member access='private'>
-        <var-decl name='code' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='71' column='1'/>
-      </data-member>
-    </union-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='src.d/deflate.h' line='73' column='1' id='type-id-57'>
-      <data-member access='private'>
-        <var-decl name='dad' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='private'>
-        <var-decl name='len' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='75' column='1'/>
-      </data-member>
-    </union-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='18336' id='type-id-37'>
-      <subrange length='573' type-id='type-id-1' id='type-id-58'/>
-
-    </array-type-def>
-
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='1952' id='type-id-38'>
-      <subrange length='61' type-id='type-id-1' id='type-id-59'/>
-
-    </array-type-def>
-
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='1248' id='type-id-39'>
-      <subrange length='39' type-id='type-id-1' id='type-id-60'/>
-
-    </array-type-def>
-    <class-decl name='tree_desc_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='86' column='1' id='type-id-40'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dyn_tree' type-id='type-id-61' visibility='default' filepath='src.d/deflate.h' line='87' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='max_code' type-id='type-id-22' visibility='default' filepath='src.d/deflate.h' line='88' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='stat_desc' type-id='type-id-62' visibility='default' filepath='src.d/deflate.h' line='89' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='ct_data' type-id='type-id-55' filepath='src.d/deflate.h' line='77' column='1' id='type-id-63'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-61'/>
-    <class-decl name='static_tree_desc_s' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-64'/>
-    <typedef-decl name='static_tree_desc' type-id='type-id-64' filepath='src.d/deflate.h' line='84' column='1' id='type-id-65'/>
-    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-66'/>
-    <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-62'/>
-
-    <array-type-def dimensions='1' type-id='type-id-46' size-in-bits='256' id='type-id-41'>
-      <subrange length='16' type-id='type-id-1' id='type-id-67'/>
-
-    </array-type-def>
-
-    <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='18336' id='type-id-42'>
-      <subrange length='573' type-id='type-id-1' id='type-id-58'/>
-
-    </array-type-def>
-    <typedef-decl name='uch' type-id='type-id-8' filepath='src.d/zutil.h' line='43' column='1' id='type-id-68'/>
-
-    <array-type-def dimensions='1' type-id='type-id-68' size-in-bits='4584' id='type-id-43'>
-      <subrange length='573' type-id='type-id-1' id='type-id-58'/>
-
-    </array-type-def>
-    <typedef-decl name='uchf' type-id='type-id-68' filepath='src.d/zutil.h' line='44' column='1' id='type-id-69'/>
-    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-44'/>
-    <typedef-decl name='ushf' type-id='type-id-46' filepath='src.d/zutil.h' line='46' column='1' id='type-id-70'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-45'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-26'/>
-    <type-decl name='void' id='type-id-71'/>
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-72'/>
-    <typedef-decl name='voidpf' type-id='type-id-72' filepath='./zconf.h' line='409' column='1' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-74'/>
-    <typedef-decl name='alloc_func' type-id='type-id-74' filepath='src.d/zlib.h' line='81' column='1' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-76'/>
-    <typedef-decl name='free_func' type-id='type-id-76' filepath='src.d/zlib.h' line='82' column='1' id='type-id-28'/>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-32' name='dest' filepath='src.d/deflate.c' line='1103' column='1'/>
-      <parameter type-id='type-id-32' name='source' filepath='src.d/deflate.c' line='1104' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1076' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='1077' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='764' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='765' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='653' column='1'/>
-      <parameter type-id='type-id-2' name='sourceLen' filepath='src.d/deflate.c' line='654' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='617' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='618' column='1'/>
-      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='619' column='1'/>
-      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='620' column='1'/>
-      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='621' column='1'/>
-      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='622' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='570' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='571' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='543' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='544' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='545' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-77'/>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-78'/>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='528' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='531' column='1'/>
-      <parameter type-id='type-id-77' name='pending' filepath='src.d/deflate.c' line='529' column='1'/>
-      <parameter type-id='type-id-78' name='bits' filepath='src.d/deflate.c' line='530' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='517' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='518' column='1'/>
-      <parameter type-id='type-id-34' name='head' filepath='src.d/deflate.c' line='519' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='1077' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='1077' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-79'/>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='446' column='1'/>
-      <parameter type-id='type-id-24' name='dictionary' filepath='src.d/deflate.c' line='447' column='1'/>
-      <parameter type-id='type-id-79' name='dictLength' filepath='src.d/deflate.c' line='448' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='377' column='1'/>
-      <parameter type-id='type-id-12' name='dictionary' filepath='src.d/deflate.c' line='378' column='1'/>
-      <parameter type-id='type-id-14' name='dictLength' filepath='src.d/deflate.c' line='379' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-80'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-81'/>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='243' column='1'/>
-      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='244' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-81' name='version' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='249' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/deflate.c' line='229' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='230' column='1'/>
-      <parameter type-id='type-id-81' name='version' filepath='src.d/deflate.c' line='231' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='232' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-73'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-14'/>
-      <return type-id='type-id-29'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-75'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-71'/>
-    </function-type>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/infback.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/infback.c' line='632' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-82'/>
-    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-85'/>
-    <typedef-decl name='in_func' type-id='type-id-85' filepath='src.d/zlib.h' line='1092' column='1' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-88'/>
-    <typedef-decl name='out_func' type-id='type-id-88' filepath='src.d/zlib.h' line='1094' column='1' id='type-id-89'/>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-86' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-72' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-89' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-72' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateBackInit_' mangled-name='inflateBackInit_' filepath='src.d/infback.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackInit_@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/infback.c' line='29' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/infback.c' line='30' column='1'/>
-      <parameter type-id='type-id-82' name='window' filepath='src.d/infback.c' line='31' column='1'/>
-      <parameter type-id='type-id-81' name='version' filepath='src.d/infback.c' line='32' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-87'>
-      <parameter type-id='type-id-72'/>
-      <parameter type-id='type-id-82'/>
-      <parameter type-id='type-id-13'/>
-      <return type-id='type-id-22'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-84'>
-      <parameter type-id='type-id-72'/>
-      <parameter type-id='type-id-83'/>
-      <return type-id='type-id-13'/>
-    </function-type>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/inflate.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1554' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1555' column='1'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1542' column='1'/>
-      <return type-id='type-id-3'/>
-    </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1527' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1528' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1508' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1527' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1528' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-32' name='dest' filepath='src.d/inflate.c' line='1462' column='1'/>
-      <parameter type-id='type-id-32' name='source' filepath='src.d/inflate.c' line='1463' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1452' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1401' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1350' column='1'/>
-      <parameter type-id='type-id-34' name='head' filepath='src.d/inflate.c' line='1351' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1315' column='1'/>
-      <parameter type-id='type-id-12' name='dictionary' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-14' name='dictLength' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1291' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1292' column='1'/>
-      <parameter type-id='type-id-24' name='dictionary' filepath='src.d/inflate.c' line='1293' column='1'/>
-      <parameter type-id='type-id-79' name='dictLength' filepath='src.d/inflate.c' line='1294' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1452' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='623' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='624' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='250' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='240' column='1'/>
-      <parameter type-id='type-id-81' name='version' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='242' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='196' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-81' name='version' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='199' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateReset2' mangled-name='inflateReset2' filepath='src.d/inflate.c' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateReset2@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='158' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='159' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateReset' mangled-name='inflateReset' filepath='src.d/inflate.c' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateReset'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1452' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='inflateResetKeep' mangled-name='inflateResetKeep' filepath='src.d/inflate.c' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-32' name='strm' filepath='src.d/inflate.c' line='1452' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/trees.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-68' const='yes' id='type-id-90'/>
-
-    <array-type-def dimensions='1' type-id='type-id-90' size-in-bits='infinite' id='type-id-91'>
-      <subrange length='infinite' id='type-id-92'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-91' const='yes' id='type-id-93'/>
-    <var-decl name='_dist_code' type-id='type-id-93' visibility='default' filepath='src.d/deflate.h' line='323' column='1'/>
-    <var-decl name='_length_code' type-id='type-id-93' visibility='default' filepath='src.d/deflate.h' line='322' column='1'/>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/zutil.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-25' const='yes' id='type-id-94'/>
-
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='640' id='type-id-95'>
-      <subrange length='10' type-id='type-id-1' id='type-id-96'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-97'/>
-    <var-decl name='z_errmsg' type-id='type-id-97' visibility='default' filepath='src.d/zutil.h' line='49' column='1'/>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
-      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
-      <return type-id='type-id-81'/>
-    </function-decl>
-    <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <function-decl name='zlibVersion' mangled-name='zlibVersion' filepath='src.d/zutil.c' line='27' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibVersion'>
-      <return type-id='type-id-81'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/compress.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='compressBound' mangled-name='compressBound' filepath='src.d/compress.c' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compressBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-2' name='sourceLen' filepath='src.d/compress.c' line='82' column='1'/>
-      <return type-id='type-id-2'/>
-    </function-decl>
-    <typedef-decl name='uLongf' type-id='type-id-2' filepath='./zconf.h' line='405' column='1' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
-    <function-decl name='compress' mangled-name='compress' filepath='src.d/compress.c' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress'>
-      <parameter type-id='type-id-24' name='dest' filepath='src.d/compress.c' line='69' column='1'/>
-      <parameter type-id='type-id-99' name='destLen' filepath='src.d/compress.c' line='70' column='1'/>
-      <parameter type-id='type-id-12' name='source' filepath='src.d/compress.c' line='71' column='1'/>
-      <parameter type-id='type-id-2' name='sourceLen' filepath='src.d/compress.c' line='72' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress2'>
-      <parameter type-id='type-id-24' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
-      <parameter type-id='type-id-99' name='destLen' filepath='src.d/compress.c' line='24' column='1'/>
-      <parameter type-id='type-id-12' name='source' filepath='src.d/compress.c' line='25' column='1'/>
-      <parameter type-id='type-id-2' name='sourceLen' filepath='src.d/compress.c' line='26' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/compress.c' line='27' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/uncompr.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='uncompress' mangled-name='uncompress' filepath='src.d/uncompr.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='uncompress'>
-      <parameter type-id='type-id-24' name='dest' filepath='src.d/compress.c' line='69' column='1'/>
-      <parameter type-id='type-id-99' name='destLen' filepath='src.d/compress.c' line='70' column='1'/>
-      <parameter type-id='type-id-12' name='source' filepath='src.d/compress.c' line='71' column='1'/>
-      <parameter type-id='type-id-2' name='sourceLen' filepath='src.d/compress.c' line='72' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-100'/>
-    <function-decl name='uncompress2' mangled-name='uncompress2' filepath='src.d/uncompr.c' line='27' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='uncompress2@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-24' name='dest' filepath='src.d/uncompr.c' line='28' column='1'/>
-      <parameter type-id='type-id-99' name='destLen' filepath='src.d/uncompr.c' line='29' column='1'/>
-      <parameter type-id='type-id-12' name='source' filepath='src.d/uncompr.c' line='30' column='1'/>
-      <parameter type-id='type-id-100' name='sourceLen' filepath='src.d/uncompr.c' line='31' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/gzclose.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='src.d/zlib.h' line='1817' column='1' id='type-id-101'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='have' type-id='type-id-13' visibility='default' filepath='src.d/zlib.h' line='1818' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-82' visibility='default' filepath='src.d/zlib.h' line='1819' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pos' type-id='type-id-5' visibility='default' filepath='src.d/zlib.h' line='1820' column='1'/>
-      </data-member>
-    </class-decl>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
-    <typedef-decl name='gzFile' type-id='type-id-102' filepath='src.d/zlib.h' line='1300' column='1' id='type-id-103'/>
-    <function-decl name='gzclose' mangled-name='gzclose' filepath='src.d/gzclose.c' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzclose'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzclose.c' line='12' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/gzlib.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='gzclearerr' mangled-name='gzclearerr' filepath='src.d/gzlib.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzclearerr@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='554' column='1'/>
-      <return type-id='type-id-71'/>
-    </function-decl>
-    <function-decl name='gzerror' mangled-name='gzerror' filepath='src.d/gzlib.c' line='532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzerror'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='533' column='1'/>
-      <parameter type-id='type-id-78' name='errnum' filepath='src.d/gzlib.c' line='534' column='1'/>
-      <return type-id='type-id-81'/>
-    </function-decl>
-    <function-decl name='gzeof' mangled-name='gzeof' filepath='src.d/gzlib.c' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzeof'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzclose.c' line='12' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzoffset' mangled-name='gzoffset' filepath='src.d/gzlib.c' line='505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzoffset@@ZLIB_1.2.3.5'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='506' column='1'/>
-      <return type-id='type-id-7'/>
-    </function-decl>
-    <function-decl name='gzoffset64' mangled-name='gzoffset64' filepath='src.d/gzlib.c' line='482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzoffset64@@ZLIB_1.2.3.5'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='483' column='1'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
-    <function-decl name='gztell' mangled-name='gztell' filepath='src.d/gzlib.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gztell'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='506' column='1'/>
-      <return type-id='type-id-7'/>
-    </function-decl>
-    <function-decl name='gztell64' mangled-name='gztell64' filepath='src.d/gzlib.c' line='455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gztell64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='456' column='1'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
-    <function-decl name='gzseek' mangled-name='gzseek' filepath='src.d/gzlib.c' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzseek'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='444' column='1'/>
-      <parameter type-id='type-id-7' name='offset' filepath='src.d/gzlib.c' line='445' column='1'/>
-      <parameter type-id='type-id-22' name='whence' filepath='src.d/gzlib.c' line='446' column='1'/>
-      <return type-id='type-id-7'/>
-    </function-decl>
-    <function-decl name='gzseek64' mangled-name='gzseek64' filepath='src.d/gzlib.c' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzseek64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='367' column='1'/>
-      <parameter type-id='type-id-5' name='offset' filepath='src.d/gzlib.c' line='368' column='1'/>
-      <parameter type-id='type-id-22' name='whence' filepath='src.d/gzlib.c' line='369' column='1'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
-    <function-decl name='gzrewind' mangled-name='gzrewind' filepath='src.d/gzlib.c' line='343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzrewind'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzclose.c' line='12' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzbuffer' mangled-name='gzbuffer' filepath='src.d/gzlib.c' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzbuffer@@ZLIB_1.2.3.5'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzlib.c' line='317' column='1'/>
-      <parameter type-id='type-id-13' name='size' filepath='src.d/gzlib.c' line='318' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzdopen' mangled-name='gzdopen' filepath='src.d/gzlib.c' line='286' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdopen'>
-      <parameter type-id='type-id-22' name='fd' filepath='src.d/gzlib.c' line='287' column='1'/>
-      <parameter type-id='type-id-81' name='mode' filepath='src.d/gzlib.c' line='288' column='1'/>
-      <return type-id='type-id-103'/>
-    </function-decl>
-    <function-decl name='gzopen64' mangled-name='gzopen64' filepath='src.d/gzlib.c' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzopen64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-81' name='path' filepath='src.d/gzlib.c' line='279' column='1'/>
-      <parameter type-id='type-id-81' name='mode' filepath='src.d/gzlib.c' line='280' column='1'/>
-      <return type-id='type-id-103'/>
-    </function-decl>
-    <function-decl name='gzopen' mangled-name='gzopen' filepath='src.d/gzlib.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzopen'>
-      <parameter type-id='type-id-81' name='path' filepath='src.d/gzlib.c' line='279' column='1'/>
-      <parameter type-id='type-id-81' name='mode' filepath='src.d/gzlib.c' line='280' column='1'/>
-      <return type-id='type-id-103'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/gzread.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='gzclose_r' mangled-name='gzclose_r' filepath='src.d/gzread.c' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzclose_r@@ZLIB_1.2.3.5'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='628' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzclose.c' line='12' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='543' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='544' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/gzread.c' line='545' column='1'/>
-      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='546' column='1'/>
-      <return type-id='type-id-25'/>
-    </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='484' column='1'/>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='485' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='477' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='628' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <typedef-decl name='voidp' type-id='type-id-72' filepath='./zconf.h' line='410' column='1' id='type-id-104'/>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-104' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-16' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-16' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
-      <return type-id='type-id-16'/>
-    </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-104' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-13' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src.d/gzwrite.c' comp-dir-path='/home/dank/src/zlib-ng/btmp1' language='LANG_C99'>
-    <function-decl name='gzclose_w' mangled-name='gzclose_w' filepath='src.d/gzwrite.c' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzclose_w@@ZLIB_1.2.3.5'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='628' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzsetparams' mangled-name='gzsetparams' filepath='src.d/gzwrite.c' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzsetparams'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='586' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/gzwrite.c' line='587' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/gzwrite.c' line='588' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzflush' mangled-name='gzflush' filepath='src.d/gzwrite.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzflush'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='554' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/gzwrite.c' line='555' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzprintf' mangled-name='gzprintf' filepath='src.d/gzwrite.c' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzprintf'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='451' column='1'/>
-      <parameter type-id='type-id-81' name='format' filepath='src.d/gzwrite.c' line='451' column='1'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-105'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-13' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-13' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-72' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-72' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
-    <function-decl name='gzvprintf' mangled-name='gzvprintf' filepath='src.d/gzwrite.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzvprintf@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='379' column='1'/>
-      <parameter type-id='type-id-81' name='format' filepath='src.d/gzwrite.c' line='379' column='1'/>
-      <parameter type-id='type-id-106' name='va' filepath='src.d/gzwrite.c' line='379' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzputs' mangled-name='gzputs' filepath='src.d/gzwrite.c' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzputs'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='353' column='1'/>
-      <parameter type-id='type-id-81' name='str' filepath='src.d/gzwrite.c' line='354' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gzputc' mangled-name='gzputc' filepath='src.d/gzwrite.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzputc'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='305' column='1'/>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzwrite.c' line='306' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <typedef-decl name='voidpc' type-id='type-id-72' filepath='./zconf.h' line='408' column='1' id='type-id-107'/>
-    <function-decl name='gzfwrite' mangled-name='gzfwrite' filepath='src.d/gzwrite.c' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfwrite@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-107' name='buf' filepath='src.d/gzwrite.c' line='275' column='1'/>
-      <parameter type-id='type-id-16' name='size' filepath='src.d/gzwrite.c' line='276' column='1'/>
-      <parameter type-id='type-id-16' name='nitems' filepath='src.d/gzwrite.c' line='277' column='1'/>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='278' column='1'/>
-      <return type-id='type-id-16'/>
-    </function-decl>
-    <function-decl name='gzwrite' mangled-name='gzwrite' filepath='src.d/gzwrite.c' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzwrite'>
-      <parameter type-id='type-id-103' name='file' filepath='src.d/gzwrite.c' line='247' column='1'/>
-      <parameter type-id='type-id-107' name='buf' filepath='src.d/gzwrite.c' line='248' column='1'/>
-      <parameter type-id='type-id-13' name='len' filepath='src.d/gzwrite.c' line='249' column='1'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-  </abi-instr>
-</abi-corpus>

crates/libz-sys/src/zlib-ng/test/abicheck.md

diff --git a/crates/libz-sys/src/zlib-ng/test/abicheck.md b/crates/libz-sys/src/zlib-ng/test/abicheck.md
deleted file mode 100644
index 57337f5..0000000
--- a/crates/libz-sys/src/zlib-ng/test/abicheck.md
+++ /dev/null
@@ -1,59 +0,0 @@
-ABI Compatibility test
-----------------------
-
-abicheck.sh uses libabigail to check ABI stability.
-It will abort if the current source
-tree has a change that breaks binary compatibility.
-
-This protects against the common scenario where:
-- an app is compiled against the current zlib-ng
-- the system package manager updates the zlib-ng shared library
-- the app now crashes because some symbol is
-  missing or some public structure or parameter
-  has changed type or size
-
-If run with --zlib-compat, it verifies that the
-current source tree generates a library that
-is ABI-compatible with the reference release
-of classic zlib.  This ensures that building
-zlib-ng with --zlib-compat does what it says on the tin.
-
-abicheck.sh is not perfect, but it can catch
-many common compatibility issues.
-
-Cached files test/abi/*.abi
----------------------------
-
-Comparing to the old version of zlib (or zlib-ng)
-means someone has to check out and build
-the previous source tree and extract its .abi
-using abidw.  This can be slow.
-
-If you don't mind the slowness, run abicheck.sh --refresh-if,
-and it will download and build the reference version
-and extract the .abi on the spot if needed.
-(FIXME: should this be the default?)
-
-On the next run, the reference .abi file will already be
-present, and that step will be skipped.
-It's stored in the tests/abi directory,
-in a file with the architecture and git hash in the name.
-
-If you're running continuous integration
-which clear out the source tree on each run,
-and you don't want your build machines
-constantly downloading and building the old
-version, you can check the .abi file into git.
-
-To make this easier, a helper script could be written to automatically build
-all the configurations tested by .github/workflows/abicheck.yml
-Then they could be checked into git en masse by a maintainer
-when a new platform is added or a new major version (which
-intentionally breaks backwards compatibility) is being prepared.
-
-Further reading
----------------
-
-- https://sourceware.org/libabigail/manual/
-- https://developers.redhat.com/blog/2014/10/23/comparing-abis-for-compatibility-with-libabigail-part-1/
-- https://developers.redhat.com/blog/2020/04/02/how-to-write-an-abi-compliance-checker-using-libabigail/

crates/libz-sys/src/zlib-ng/test/abicheck.sh

diff --git a/crates/libz-sys/src/zlib-ng/test/abicheck.sh b/crates/libz-sys/src/zlib-ng/test/abicheck.sh
deleted file mode 100755
index 4267aff..0000000
--- a/crates/libz-sys/src/zlib-ng/test/abicheck.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-set -ex
-TESTDIR="$(cd $(dirname "$0"); pwd)"
-
-usage() {
-    cat <<_EOF_
-Usage: $0 [--zlib-compat][--refresh][--refresh-if]
-
-Build shared library with -ggdb, then compare its ABI to the stable
-ABI, and abort if differences found.
-
-Options:
---zlib-compat  - check the ABI of the zlib-compatible flavor of zlib-ng.
---refresh      - build the reference library and extract its ABI rather than using a stored ABI file.
---refresh-if   - refresh only if ABI file not present.
-
-Obeys CHOST, CONFIGURE_ARGS, CFLAGS, and LDFLAGS.
-
-Requires libabigail (on Ubuntu, install package abigail-tools).
-_EOF_
-}
-
-# Print the multiarch tuple for the current (non-cross) machine,
-# or the empty string if unavailable.
-detect_chost() {
-    dpkg-architecture -qDEB_HOST_MULTIARCH ||
-     $CC -print-multiarch ||
-     $CC -print-search-dirs | sed 's/:/\n/g' | grep -E '^/lib/[^/]+$' | sed 's%.*/%%' ||
-     true
-}
-
-if ! test -f "configure"
-then
-  echo "Please run from top of source tree"
-  exit 1
-fi
-
-suffix="-ng"
-CONFIGURE_ARGS_NG="$CONFIGURE_ARGS"
-refresh=false
-refresh_if=false
-for arg
-do
-  case "$arg" in
-  --zlib-compat)
-    suffix=""
-    CONFIGURE_ARGS_NG="$CONFIGURE_ARGS_NG --zlib-compat"
-    ;;
-  --refresh)
-    refresh=true
-    ;;
-  --refresh-if)
-    refresh_if=true
-    ;;
-  --help)
-    usage
-    exit 0
-    ;;
-  *)
-    echo "Unknown arg '$arg'"
-    usage
-    exit 1
-    ;;
-  esac
-done
-
-# Choose reference repo and commit
-if test "$suffix" = ""
-then
-  # Reference is zlib 1.2.11
-  ABI_GIT_REPO=https://github.com/madler/zlib.git
-  ABI_GIT_COMMIT=v1.2.11
-else
-  # Reference should be the tag for zlib-ng 2.0
-  # but until that bright, shining day, use some
-  # random recent SHA.  Annoyingly, can't shorten it.
-  ABI_GIT_REPO=https://github.com/zlib-ng/zlib-ng.git
-  ABI_GIT_COMMIT=56ce27343bf295ae9457f8e3d38ec96d2f949a1c
-fi
-# FIXME: even when using a tag, check the hash.
-
-# Test compat build for ABI compatibility with zlib
-if test "$CHOST" = ""
-then
-  # Note: don't export CHOST here, as we don't want configure seeing it
-  # when it's just the name for the build machine.
-  # Leave it as a plain shell variable, not an environment variable.
-  CHOST=$(detect_chost)
-  # Support -m32 for non-cross builds.
-  case "$CFLAGS" in
-  *-m32*) M32="-m32";;
-  *) M32="";;
-  esac
-fi
-
-# Canonicalize CHOST to work around bug in original zlib's configure
-# (Don't export it if it wasn't already exported, else may cause
-# default compiler detection failure and shared library link error
-# when building both zlib and zlib-ng.
-# See https://github.com/zlib-ng/zlib-ng/issues/1219)
-CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST)
-
-if test "$CHOST" = ""
-then
-  echo "abicheck: SKIP, as we don't know CHOST"
-  exit 0
-fi
-
-ABIFILE="test/abi/zlib$suffix-$ABI_GIT_COMMIT-$CHOST$M32.abi"
-if ! $refresh && $refresh_if && ! test -f "$ABIFILE"
-then
-  refresh=true
-fi
-abidw --version
-
-if $refresh
-then
-  # Check out reference source
-  rm -rf btmp1
-  mkdir -p btmp1/src.d
-  cd btmp1/src.d
-  git init
-  git remote add origin $ABI_GIT_REPO
-  git fetch origin $ABI_GIT_COMMIT
-  git reset --hard FETCH_HEAD
-  cd ..
-  # Build unstripped, uninstalled, very debug shared library
-  CFLAGS="$CFLAGS -ggdb" src.d/configure $CONFIGURE_ARGS
-  make -j2
-  cd ..
-  # Find shared library, extract its abi
-  dylib1=$(find btmp1 -type f -name '*.dylib*' -print -o -type f -name '*.so.*' -print)
-  abidw $dylib1 > "$ABIFILE"
-  # Maintainers may wish to check $ABIFILE into git when a new
-  # target is added, or when a major release happens that is
-  # intended to change the ABI.  Alternately, this script could
-  # just always rebuild the reference source, and dispense with
-  # caching abi files in git (but that would slow builds down).
-fi
-
-if ! test -f "$ABIFILE"
-then
-  echo "abicheck: SKIP: $ABIFILE not found; rerun with --refresh or --refresh-if"
-  exit 1
-fi
-
-# Build unstripped, uninstalled, very debug shared library
-rm -rf btmp2
-mkdir btmp2
-cd btmp2
-CFLAGS="$CFLAGS -ggdb" ../configure $CONFIGURE_ARGS_NG
-make -j2
-cd ..
-# Find shared library, extract its abi
-dylib2=$(find btmp2 -type f -name '*.dylib*' -print -o -type f -name '*.so.*' -print)
-abidw $dylib2 > btmp2/zlib${suffix}-built.abi
-
-# Compare it to the reference
-# FIXME: use --no-added-syms for now, but we probably want to be more strict.
-if abidiff --no-added-syms --suppressions test/abi/ignore "$ABIFILE" btmp2/zlib${suffix}-built.abi
-then
-  echo "abicheck: PASS"
-else
-  echo "abicheck: FAIL"
-  exit 1
-fi

crates/libz-sys/src/zlib-ng/test/benchmarks/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/CMakeLists.txt b/crates/libz-sys/src/zlib-ng/test/benchmarks/CMakeLists.txt
deleted file mode 100644
index 19762fc..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-include(FetchContent)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
-enable_language(CXX)
-
-# Search for Google benchmark package
-find_package(benchmark QUIET)
-if(NOT benchmark_FOUND)
-    # Fetch google benchmark source code from official repository
-    set(BENCHMARK_ENABLE_TESTING OFF)
-    FetchContent_Declare(benchmark
-        GIT_REPOSITORY https://github.com/google/benchmark.git)
-    FetchContent_MakeAvailable(benchmark)
-    FetchContent_GetProperties(benchmark)
-
-    if(NOT benchmark_POPULATED)
-        FetchContent_Populate(benchmark)
-    endif()
-endif()
-
-add_executable(benchmark_zlib
-    benchmark_adler32.cc
-    benchmark_adler32_copy.cc
-    benchmark_compare256.cc
-    benchmark_crc32.cc
-    benchmark_main.cc
-    benchmark_slidehash.cc
-    )
-
-target_include_directories(benchmark_zlib PRIVATE
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
-    ${benchmark_SOURCE_DIR}/benchmark/include)
-
-target_link_libraries(benchmark_zlib zlibstatic benchmark::benchmark)
-if(WIN32)
-    target_link_libraries(benchmark_zlib shlwapi)
-endif()
-
-if(ZLIB_ENABLE_TESTS)
-    add_test(NAME benchmark_zlib
-        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:benchmark_zlib>)
-endif()
-
-if(WITH_BENCHMARK_APPS)
-    option(BUILD_ALT_BENCH "Link against alternative zlib implementation" OFF)
-
-    # Search for libpng package
-    find_package(PNG QUIET)
-
-    if(NOT PNG_FOUND)
-        FetchContent_Declare(PNG
-            GIT_REPOSITORY https://github.com/glennrp/libpng.git)
-        FetchContent_MakeAvailable(PNG)
-        FetchContent_GetProperties(PNG)
-
-        if(NOT PNG_POPULATED)
-            FetchContent_Populate(PNG)
-        endif()
-    endif()
-
-    set(BENCH_APP_SRCS 
-        benchmark_png_encode.cc
-        benchmark_png_decode.cc
-        benchmark_main.cc
-    )
-
-    add_executable(benchmark_zlib_apps ${BENCH_APP_SRCS})
-
-    if(DEFINED BUILD_ALT_BENCH)
-        set(ZLIB_ALT_LIB "libz.a" CACHE FILEPATH "Optional alternative zlib implementation (defaults to stock zlib)")
-        add_executable(benchmark_zlib_apps_alt ${BENCH_APP_SRCS})
-        target_link_libraries(benchmark_zlib_apps_alt libpng.a ${ZLIB_ALT_LIB} benchmark::benchmark)
-        target_compile_definitions(benchmark_zlib_apps_alt PRIVATE BUILD_ALT=1)
-        target_include_directories(benchmark_zlib_apps_alt PRIVATE
-            ${CMAKE_SOURCE_DIR}
-            ${CMAKE_BINARY_DIR}
-            ${PNG_INCLUDE_DIR}
-            ${benchmark_SOURCE_DIR}/benchmark/include)
-    endif()
-
-    target_include_directories(benchmark_zlib_apps PRIVATE
-        ${CMAKE_SOURCE_DIR}
-        ${CMAKE_BINARY_DIR}
-        ${PNG_INCLUDE_DIR}
-        ${benchmark_SOURCE_DIR}/benchmark/include)
-
-    # We need the static png library if we're statically linking to zlib,
-    # otherwise it will resolve these things in the system provided dynamic
-    # libraries (likely linked to stock zlib)
-    target_link_libraries(benchmark_zlib_apps libpng.a zlibstatic benchmark::benchmark)
-endif()

crates/libz-sys/src/zlib-ng/test/benchmarks/README.md

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/README.md b/crates/libz-sys/src/zlib-ng/test/benchmarks/README.md
deleted file mode 100644
index 5dce7f5..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-## Benchmarks
-These benchmarks are written using [Google Benchmark](https://github.com/google/benchmark).
-
-*Repetitions*
-
-To increase the number of times each benchmark iteration is run use:
-
-```
---benchmark_repetitions=20
-```
-
-*Filters*
-
-To filter out which benchmarks are performed use:
-
-```
---benchmark_filter="adler32*"
-```
-
-There are two different benchmarks, micro and macro.
-
-### Benchmark benchmark_zlib
-These are microbenchmarks intended to test lower level subfunctions of the library.
-
-Benchmarks include impelementations of:
-    - Adler32
-    - CRC
-    - 256 byte comparisons
-    - SIMD accelerated "slide hash" routine
-
-By default these benchmarks report things on the nanosecond scale and are small enough
-to measure very minute diferences.
-
-### Benchmark benchmark_zlib_apps
-These benchmarks measure applications of zlib as a whole.  Currently the only examples
-are PNG encoding and decoding. The PNG encode and decode tests leveraging procedurally
-generated and highly compressible image data.
-
-Additionally, a test called `png_decode_realistic` that will decode any RGB 8 BPP encoded
-set of PNGs in the working directory under a directory named "test_pngs" with files named
-{0..1}.png. If these images do not exist, they will error out and the benchmark will move
-on to the next set of benchmarks.
-
-*benchmark_zlib_apps_alt*
-
-The user can compile a comparison benchmark application linking to any zlib-compatible
-implementation of his or her choosing.

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32.cc
deleted file mode 100644
index b691c23..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/* benchmark_adler32.cc -- benchmark adler32 variants
- * Copyright (C) 2022 Nathan Moinvaziri, Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <benchmark/benchmark.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#define MAX_RANDOM_INTS (1024 * 1024)
-#define MAX_RANDOM_INTS_SIZE (MAX_RANDOM_INTS * sizeof(uint32_t))
-
-class adler32: public benchmark::Fixture {
-private:
-    uint32_t *random_ints;
-
-public:
-    void SetUp(const ::benchmark::State& state) {
-        /* Control the alignment so that we have the best case scenario for loads. With
-         * AVX512, unaligned loads can mean we're crossing a cacheline boundary at every load.
-         * And while this is a realistic scenario, it makes it difficult to compare benchmark
-         * to benchmark because one allocation could have been aligned perfectly for the loads
-         * while the subsequent one happened to not be. This is not to be advantageous to AVX512
-         * (indeed, all lesser SIMD implementations benefit from this aligned allocation), but to
-         * control the _consistency_ of the results */
-        random_ints = (uint32_t *)zng_alloc(MAX_RANDOM_INTS_SIZE);
-        assert(random_ints != NULL);
-
-        for (int32_t i = 0; i < MAX_RANDOM_INTS; i++) {
-            random_ints[i] = rand();
-        }
-    }
-
-    void Bench(benchmark::State& state, adler32_func adler32) {
-        uint32_t hash = 0;
-
-        for (auto _ : state) {
-            hash = adler32(hash, (const unsigned char *)random_ints, state.range(0));
-        }
-
-        benchmark::DoNotOptimize(hash);
-    }
-
-    void TearDown(const ::benchmark::State& state) {
-        zng_free(random_ints);
-    }
-};
-
-#define BENCHMARK_ADLER32(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(adler32, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, fptr); \
-    } \
-    BENCHMARK_REGISTER_F(adler32, name)->Range(2048, MAX_RANDOM_INTS_SIZE);
-
-BENCHMARK_ADLER32(c, adler32_c, 1);
-
-#ifdef ARM_NEON_ADLER32
-BENCHMARK_ADLER32(neon, adler32_neon, arm_cpu_has_neon);
-#endif
-
-#ifdef PPC_VMX_ADLER32
-BENCHMARK_ADLER32(vmx, adler32_vmx, power_cpu_has_altivec);
-#endif
-#ifdef POWER8_VSX_ADLER32
-BENCHMARK_ADLER32(power8, adler32_power8, power_cpu_has_arch_2_07);
-#endif
-
-#ifdef X86_SSSE3_ADLER32
-BENCHMARK_ADLER32(ssse3, adler32_ssse3, x86_cpu_has_ssse3);
-#endif
-#ifdef X86_AVX2_ADLER32
-BENCHMARK_ADLER32(avx2, adler32_avx2, x86_cpu_has_avx2);
-#endif
-#ifdef X86_AVX512_ADLER32
-BENCHMARK_ADLER32(avx512, adler32_avx512, x86_cpu_has_avx512);
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-BENCHMARK_ADLER32(avx512_vnni, adler32_avx512_vnni, x86_cpu_has_avx512vnni);
-#endif

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32_copy.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32_copy.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32_copy.cc
deleted file mode 100644
index fac4c7f..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_adler32_copy.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-/* benchmark_adler32_copy.cc -- benchmark adler32 (elided copy) variants
- * Copyright (C) 2022 Nathan Moinvaziri, Adam Stylinski
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-
-#include <benchmark/benchmark.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#define MAX_RANDOM_INTS (1024 * 1024)
-#define MAX_RANDOM_INTS_SIZE (MAX_RANDOM_INTS * sizeof(uint32_t))
-
-typedef uint32_t (*adler32_cpy_func)(uint32_t adler, unsigned char *dst, const unsigned char *buf, size_t len);
-
-class adler32_copy: public benchmark::Fixture {
-private:
-    uint32_t *random_ints_src;
-    uint32_t *random_ints_dst;
-
-public:
-    void SetUp(const ::benchmark::State& state) {
-        /* Control the alignment so that we have the best case scenario for loads. With
-         * AVX512, unaligned loads can mean we're crossing a cacheline boundary at every load.
-         * And while this is a realistic scenario, it makes it difficult to compare benchmark
-         * to benchmark because one allocation could have been aligned perfectly for the loads
-         * while the subsequent one happened to not be. This is not to be advantageous to AVX512
-         * (indeed, all lesser SIMD implementations benefit from this aligned allocation), but to
-         * control the _consistency_ of the results */
-        random_ints_src = (uint32_t *)zng_alloc(MAX_RANDOM_INTS_SIZE);
-        random_ints_dst = (uint32_t *)zng_alloc(MAX_RANDOM_INTS_SIZE);
-        assert(random_ints != NULL);
-
-        for (int32_t i = 0; i < MAX_RANDOM_INTS; i++) {
-            random_ints_src[i] = rand();
-        }
-    }
-
-    void Bench(benchmark::State& state, adler32_cpy_func adler32_func) {
-        uint32_t hash = 0;
-
-        for (auto _ : state) {
-            hash = adler32_func(hash, (unsigned char *)random_ints_dst,
-                                (const unsigned char*)random_ints_src, state.range(0));
-        }
-
-        benchmark::DoNotOptimize(hash);
-    }
-
-    void TearDown(const ::benchmark::State& state) {
-        zng_free(random_ints_src);
-        zng_free(random_ints_dst);
-    }
-};
-
-#define BENCHMARK_ADLER32_COPY(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(adler32_copy, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, fptr); \
-    } \
-    BENCHMARK_REGISTER_F(adler32_copy, name)->Range(8192, MAX_RANDOM_INTS_SIZE);
-
-#define BENCHMARK_ADLER32_BASELINE_COPY(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(adler32_copy, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, [](uint32_t init_sum, unsigned char *dst, \
-                        const unsigned char *buf, size_t len) -> uint32_t { \
-            memcpy(dst, buf, len); \
-            return fptr(init_sum, buf, len); \
-        }); \
-    } \
-    BENCHMARK_REGISTER_F(adler32_copy, name)->Range(8192, MAX_RANDOM_INTS_SIZE);
-
-BENCHMARK_ADLER32_BASELINE_COPY(c, adler32_c, 1);
-
-#ifdef ARM_NEON_ADLER32
-/* If we inline this copy for neon, the function would go here */
-//BENCHMARK_ADLER32_COPY(neon, adler32_neon, arm_cpu_has_neon);
-BENCHMARK_ADLER32_BASELINE_COPY(neon_copy_baseline, adler32_neon, arm_cpu_has_neon);
-#endif
-
-#ifdef PPC_VMX_ADLER32
-//BENCHMARK_ADLER32_COPY(vmx_inline_copy, adler32_fold_copy_vmx, power_cpu_has_altivec);
-BENCHMARK_ADLER32_BASELINE_COPY(vmx_copy_baseline, adler32_vmx, power_cpu_has_altivec);
-#endif
-#ifdef POWER8_VSX_ADLER32
-//BENCHMARK_ADLER32_COPY(power8_inline_copy, adler32_fold_copy_power8, power_cpu_has_arch_2_07);
-BENCHMARK_ADLER32_BASELINE_COPY(power8, adler32_power8, power_cpu_has_arch_2_07);
-#endif
-
-#ifdef X86_SSE42_ADLER32
-BENCHMARK_ADLER32_BASELINE_COPY(sse42_baseline, adler32_ssse3, x86_cpu_has_ssse3);
-BENCHMARK_ADLER32_COPY(sse42, adler32_fold_copy_sse42, x86_cpu_has_sse42);
-#endif
-#ifdef X86_AVX2_ADLER32
-BENCHMARK_ADLER32_BASELINE_COPY(avx2_baseline, adler32_avx2, x86_cpu_has_avx2);
-BENCHMARK_ADLER32_COPY(avx2, adler32_fold_copy_avx2, x86_cpu_has_avx2);
-#endif
-#ifdef X86_AVX512_ADLER32
-BENCHMARK_ADLER32_BASELINE_COPY(avx512_baseline, adler32_avx512, x86_cpu_has_avx512);
-BENCHMARK_ADLER32_COPY(avx512, adler32_fold_copy_avx512, x86_cpu_has_avx512);
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-BENCHMARK_ADLER32_BASELINE_COPY(avx512_vnni_baseline, adler32_avx512_vnni, x86_cpu_has_avx512vnni);
-BENCHMARK_ADLER32_COPY(avx512_vnni, adler32_fold_copy_avx512_vnni, x86_cpu_has_avx512vnni);
-#endif

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_compare256.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_compare256.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_compare256.cc
deleted file mode 100644
index 54459da..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_compare256.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/* benchmark_compare256.cc -- benchmark compare256 variants
- * Copyright (C) 2022 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-
-#include <benchmark/benchmark.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#define MAX_COMPARE_SIZE (256)
-
-class compare256: public benchmark::Fixture {
-private:
-    uint8_t *str1;
-    uint8_t *str2;
-
-public:
-    void SetUp(const ::benchmark::State& state) {
-        str1 = (uint8_t *)zng_alloc(MAX_COMPARE_SIZE);
-        assert(str1 != NULL);
-        memset(str1, 'a', MAX_COMPARE_SIZE);
-
-        str2 = (uint8_t *)zng_alloc(MAX_COMPARE_SIZE);
-        assert(str2 != NULL);
-        memset(str2, 'a', MAX_COMPARE_SIZE);
-    }
-
-    void Bench(benchmark::State& state, compare256_func compare256) {
-        int32_t match_len = (int32_t)state.range(0) - 1;
-        uint32_t len;
-
-        str2[match_len] = 0;
-        for (auto _ : state) {
-            len = compare256((const uint8_t *)str1, (const uint8_t *)str2);
-        }
-        str2[match_len] = 'a';
-
-        benchmark::DoNotOptimize(len);
-    }
-
-    void TearDown(const ::benchmark::State& state) {
-        zng_free(str1);
-        zng_free(str2);
-    }
-};
-
-#define BENCHMARK_COMPARE256(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(compare256, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, fptr); \
-    } \
-    BENCHMARK_REGISTER_F(compare256, name)->Range(1, MAX_COMPARE_SIZE);
-
-BENCHMARK_COMPARE256(c, compare256_c, 1);
-
-#ifdef UNALIGNED_OK
-BENCHMARK_COMPARE256(unaligned_16, compare256_unaligned_16, 1);
-#ifdef HAVE_BUILTIN_CTZ
-BENCHMARK_COMPARE256(unaligned_32, compare256_unaligned_32, 1);
-#endif
-#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-BENCHMARK_COMPARE256(unaligned_64, compare256_unaligned_64, 1);
-#endif
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-BENCHMARK_COMPARE256(sse2, compare256_sse2, x86_cpu_has_sse2);
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-BENCHMARK_COMPARE256(avx2, compare256_avx2, x86_cpu_has_avx2);
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-BENCHMARK_COMPARE256(neon, compare256_neon, arm_cpu_has_neon);
-#endif
-#ifdef POWER9
-BENCHMARK_COMPARE256(power9, compare256_power9, power_cpu_has_arch_3_00);
-#endif

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_crc32.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_crc32.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_crc32.cc
deleted file mode 100644
index c781c62..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_crc32.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* benchmark_crc32.cc -- benchmark crc32 variants
- * Copyright (C) 2022 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <benchmark/benchmark.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#define MAX_RANDOM_INTS (1024 * 1024)
-#define MAX_RANDOM_INTS_SIZE (MAX_RANDOM_INTS * sizeof(uint32_t))
-
-class crc32: public benchmark::Fixture {
-private:
-    uint32_t *random_ints;
-
-public:
-    void SetUp(const ::benchmark::State& state) {
-        random_ints = (uint32_t *)zng_alloc(MAX_RANDOM_INTS_SIZE);
-        assert(random_ints != NULL);
-
-        for (int32_t i = 0; i < MAX_RANDOM_INTS; i++) {
-            random_ints[i] = rand();
-        }
-    }
-
-    void Bench(benchmark::State& state, crc32_func crc32) {
-        uint32_t hash = 0;
-
-        for (auto _ : state) {
-            hash = crc32(hash, (const unsigned char *)random_ints, state.range(0));
-        }
-
-        benchmark::DoNotOptimize(hash);
-    }
-
-    void TearDown(const ::benchmark::State& state) {
-        zng_free(random_ints);
-    }
-};
-
-#define BENCHMARK_CRC32(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(crc32, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, fptr); \
-    } \
-    BENCHMARK_REGISTER_F(crc32, name)->Range(1, MAX_RANDOM_INTS_SIZE);
-
-BENCHMARK_CRC32(braid, crc32_braid, 1);
-
-#ifdef ARM_ACLE_CRC_HASH
-BENCHMARK_CRC32(acle, crc32_acle, arm_cpu_has_crc32);
-#elif defined(POWER8_VSX_CRC32)
-BENCHMARK_CRC32(power8, crc32_power8, power_cpu_has_arch_2_07);
-#elif defined(S390_CRC32_VX)
-BENCHMARK_CRC32(vx, PREFIX(s390_crc32_vx), PREFIX(s390_cpu_has_vx));
-#elif defined(X86_PCLMULQDQ_CRC)
-/* CRC32 fold does a memory copy while hashing */
-BENCHMARK_CRC32(pclmulqdq, crc32_pclmulqdq, x86_cpu_has_pclmulqdq);
-#endif

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_main.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_main.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_main.cc
deleted file mode 100644
index ee8b614..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_main.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-/* benchmark_main.cc -- benchmark suite main entry point
- * Copyright (C) 2022 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-
-#include <benchmark/benchmark.h>
-
-#ifndef BUILD_ALT
-extern "C" {
-#  include "zbuild.h"
-#  include "cpu_features.h"
-}
-#endif
-
-int main(int argc, char** argv) {
-#ifndef BUILD_ALT
-    cpu_check_features();
-#endif
-
-    ::benchmark::Initialize(&argc, argv);
-    ::benchmark::RunSpecifiedBenchmarks();
-
-    return EXIT_SUCCESS;
-}

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_decode.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_decode.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_decode.cc
deleted file mode 100644
index c037976..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_decode.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-#include <stdio.h>
-#include <benchmark/benchmark.h>
-#include "benchmark_png_shared.h"
-#include <assert.h>
-
-class png_decode: public benchmark::Fixture {
-protected:
-    png_dat inpng[10];
-
-    /* Backing this on the heap is a more realistic benchmark */
-    uint8_t *output_img_buf = NULL;
-
-public:
-    /* Let's make the vanilla version have something extremely compressible */
-    virtual void init_img(png_bytep img_bytes, size_t width, size_t height) {
-        init_compressible(img_bytes, width*height);
-    }
-
-    void SetUp(const ::benchmark::State& state) {
-        output_img_buf = (uint8_t*)malloc(IMWIDTH * IMHEIGHT * 3);
-        assert(output_img_buf != NULL);
-        init_img(output_img_buf, IMWIDTH, IMHEIGHT);
-
-        /* First we need to author the png bytes to be decoded */
-        for (int i = 0; i < 10; ++i) {
-            inpng[i] = {NULL, 0, 0};
-            encode_png(output_img_buf, &inpng[i], i, IMWIDTH, IMHEIGHT);
-        }
-    }
-
-    /* State in this circumstance will convey the compression level */
-    void Bench(benchmark::State &state) {
-        for (auto _ : state) {
-            int compress_lvl = state.range(0);
-            png_parse_dat in = { inpng[compress_lvl].buf };
-            uint32_t width, height;
-            decode_png(&in, (png_bytepp)&output_img_buf, IMWIDTH * IMHEIGHT * 3, width, height);
-        }
-    }
-
-    void TearDown(const ::benchmark::State &state) {
-        free(output_img_buf);
-        for (int i = 0; i < 10; ++i) {
-            free(inpng[i].buf);
-        }
-    }
-};
-
-class png_decode_realistic: public png_decode {
-private:
-    bool test_files_found = false;
-
-public:
-    void SetUp(const ::benchmark::State &state) {
-        output_img_buf = NULL;
-        output_img_buf = (uint8_t*)malloc(IMWIDTH * IMHEIGHT * 3);
-        /* Let's take all the images at different compression levels and jam their bytes into buffers */
-        char test_fname[25];
-        FILE *files[10];
-
-        /* Set all to NULL */
-        memset(files, 0, sizeof(FILE*));
-
-        for (size_t i = 0; i < 10; ++i) {
-            sprintf(test_fname, "test_pngs/%1lu.png", i);
-            FILE *in_img = fopen(test_fname, "r");
-            if (in_img == NULL) {
-                for (size_t j = 0; j < i; ++j) {
-                    if (files[j])
-                        fclose(files[j]);
-                }
-
-                /* For proper cleanup */
-                for (size_t j = i; j < 10; ++j) {
-                    inpng[i] = { NULL, 0, 0 };
-                }
-
-                return;
-            }
-            files[i] = in_img;
-        }
-
-        test_files_found = true;
-        /* Now that we've established we have all the png files, let's read all of their bytes into buffers */
-        for (size_t i = 0; i < 10; ++i) {
-            FILE *in_file = files[i];
-            fseek(in_file, 0, SEEK_END);
-            size_t num_bytes = ftell(in_file);
-            rewind(in_file);
-
-            uint8_t *raw_file = (uint8_t*)malloc(num_bytes);
-            if (raw_file == NULL)
-                abort();
-
-            inpng[i].buf = raw_file;
-            inpng[i].len = num_bytes;
-            inpng[i].buf_rem = 0;
-
-            size_t bytes_read = fread(raw_file, 1, num_bytes, in_file);
-            if (bytes_read != num_bytes) {
-                fprintf(stderr, "couldn't read all of the bytes for file test_pngs/%lu.png", i);
-                abort();
-            }
-
-            fclose(in_file);
-        }
-    }
-
-    void Bench(benchmark::State &state) {
-        if (!test_files_found) {
-            state.SkipWithError("Test imagery in test_pngs not found");
-        }
-
-        png_decode::Bench(state);
-    }
-};
-
-BENCHMARK_DEFINE_F(png_decode, png_decode)(benchmark::State &state) {
-    Bench(state);
-}
-BENCHMARK_REGISTER_F(png_decode, png_decode)->DenseRange(0, 9, 1)->Unit(benchmark::kMicrosecond);
-
-BENCHMARK_DEFINE_F(png_decode_realistic, png_decode_realistic)(benchmark::State &state) {
-    Bench(state);
-}
-BENCHMARK_REGISTER_F(png_decode_realistic, png_decode_realistic)->DenseRange(0, 9, 1)->Unit(benchmark::kMicrosecond);

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_encode.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_encode.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_encode.cc
deleted file mode 100644
index f1c597d..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_encode.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-#include <benchmark/benchmark.h>
-#include "benchmark_png_shared.h"
-
-#define IMWIDTH 1024
-#define IMHEIGHT 1024
-
-class png_encode: public benchmark::Fixture {
-private:
-    png_dat outpng;
-
-    /* Backing this on the heap is a more realistic benchmark */
-    uint8_t *input_img_buf = NULL;
-
-public:
-    /* Let's make the vanilla version have something extremely compressible */
-    virtual void init_img(png_bytep img_bytes, size_t width, size_t height) {
-        init_compressible(img_bytes, width * height);
-    }
-
-    void SetUp(const ::benchmark::State& state) {
-        input_img_buf = (uint8_t*)malloc(IMWIDTH * IMHEIGHT * 3);
-        outpng.buf = (uint8_t*)malloc(IMWIDTH * IMHEIGHT * 3);
-        /* Using malloc rather than zng_alloc so that we can call realloc.
-         * IMWIDTH * IMHEIGHT is likely to be more than enough bytes, though,
-         * given that a simple run length encoding already pretty much can
-         * reduce to this */
-        outpng.len = 0;
-        outpng.buf_rem = IMWIDTH * IMHEIGHT * 3;
-        assert(input_img_buf != NULL);
-        assert(outpng.buf != NULL);
-        init_img(input_img_buf, IMWIDTH, IMHEIGHT);
-    }
-
-    /* State in this circumstance will convey the compression level */
-    void Bench(benchmark::State &state) {
-        for (auto _ : state) {
-            encode_png((png_bytep)input_img_buf, &outpng, state.range(0), IMWIDTH, IMHEIGHT);
-            outpng.buf_rem = outpng.len;
-            outpng.len = 0;
-        }
-    }
-
-    void TearDown(const ::benchmark::State &state) {
-        free(input_img_buf);
-        free(outpng.buf);
-    }
-};
-
-BENCHMARK_DEFINE_F(png_encode, encode_compressible)(benchmark::State &state) {
-    Bench(state);
-}
-BENCHMARK_REGISTER_F(png_encode, encode_compressible)->DenseRange(0, 9, 1)->Unit(benchmark::kMicrosecond);

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_shared.h

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_shared.h b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_shared.h
deleted file mode 100644
index 926b4d9..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_png_shared.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#pragma once
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#define IMWIDTH 1024
-#define IMHEIGHT 1024
-
-extern "C" {
-#  include <png.h>
-}
-
-typedef struct _png_dat {
-    uint8_t *buf;
-    int64_t len;
-    size_t buf_rem;
-} png_dat;
-
-typedef struct _png_parse_dat {
-    uint8_t *cur_pos;
-} png_parse_dat;
-
-/* Write a customized write callback so that we write back to an in-memory buffer.
- * This allows the testing to not involve disk IO */
-static void png_write_cb(png_structp pngp, png_bytep data, png_size_t len) {
-    png_dat *dat = (png_dat*)png_get_io_ptr(pngp);
-    size_t curSize = dat->len + len;
-
-    /* realloc double the requested buffer size to prevent excessive reallocs */
-    if (dat->buf_rem < len) {
-        dat->buf = (uint8_t*)realloc(dat->buf, dat->len + dat->buf_rem + 2 * len);
-
-        if (!dat->buf) {
-            /* Pretty unlikely but we'll put it here just in case */
-            fprintf(stderr, "realloc failed, exiting\n");
-            exit(1);
-        }
-
-        dat->buf_rem += 2 * len;
-    }
-
-    memcpy(dat->buf + dat->len, data, len);
-    dat->len = curSize;
-    dat->buf_rem -= len;
-}
-
-static void init_compressible(png_bytep buf, size_t num_pix) {
-    /* It doesn't actually matter what we make this, but for
-     * the sake of a reasonable test image, let's make this
-     * be a stripe of R, G, & B, with no alpha channel */
-    int32_t i = 0;
-    int32_t red_stop = num_pix / 3;
-    int32_t blue_stop = 2 * num_pix / 3;
-    int32_t green_stop = num_pix;
-
-    for (int32_t x = 0; i < red_stop; x += 3, ++i) {
-       buf[x] = 255; 
-       buf[x + 1] = 0;
-       buf[x + 2] = 0; 
-    }
-
-    for (int32_t x = 3 * i; i < blue_stop; x+= 3, ++i) {
-       buf[x] = 0; 
-       buf[x + 1] = 255; 
-       buf[x + 2] = 0; 
-    }
-
-    for (int32_t x = 3 * i; i < green_stop; x += 3, ++i) {
-       buf[x] = 0; 
-       buf[x + 1] = 0; 
-       buf[x + 2] = 255; 
-    }
-}
-
-static inline void encode_png(png_bytep buf, png_dat *outpng, int32_t comp_level, uint32_t width, uint32_t height) {
-    png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-    /* Most of this error handling is _likely_ not necessary. Likewise it's likely
-     * a lot of this stuff can be done in the setup function to avoid measuring this
-     * fixed setup time, but for now we'll do it here */
-    if (!png) abort();
-
-    png_infop info  = png_create_info_struct(png);
-    if (!info) abort();
-
-    png_set_write_fn(png, outpng, png_write_cb, NULL);
-    png_bytep *png_row_ptrs = new png_bytep[height];
-    for (int i = 0; i < IMHEIGHT; ++i) {
-        png_row_ptrs[i] = (png_bytep)&buf[3*i*width];
-    }
-
-    png_set_IHDR(png, info, IMWIDTH, IMHEIGHT, 8, PNG_COLOR_TYPE_RGB,
-                 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-                 PNG_FILTER_TYPE_DEFAULT);
-
-    png_write_info(png, info);
-    png_set_compression_level(png, comp_level);
-    png_set_filter(png, 0, PNG_FILTER_NONE);
-    png_write_image(png, (png_bytepp)png_row_ptrs);
-    png_write_end(png, NULL);
-    png_destroy_write_struct(&png, &info);
-    delete[] png_row_ptrs;
-}
-
-static void read_from_pngdat(png_structp png, png_bytep out, png_size_t bytes_to_read) {
-    png_parse_dat *io = (png_parse_dat*)png_get_io_ptr(png);
-    memcpy(out, io->cur_pos, bytes_to_read);
-    io->cur_pos += bytes_to_read;
-}
-
-static inline int decode_png(png_parse_dat *dat, png_bytepp out_bytes, size_t in_size, uint32_t &width, uint32_t &height) {
-    png_structp png = NULL;
-    png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-    
-    if (!png) abort();
-    png_infop info = NULL;
-    info = png_create_info_struct(png);
-    if (!info) abort();
-
-    png_set_read_fn(png, dat, read_from_pngdat);
-    png_read_info(png, info);
-
-    int bit_depth = 0, color_type = -1;
-    png_get_IHDR(png, info, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
-
-    size_t im_size = width * height * bit_depth/8 * 3;
-    if (color_type != PNG_COLOR_TYPE_RGB) {
-        fprintf(stderr, "expected an 8 bpp RGB image\n");
-        abort();
-    } 
-
-    if (im_size > in_size) {
-       *out_bytes = (png_bytep)realloc(*out_bytes, im_size);
-    }
-
-    png_bytep *out_rows = new png_bytep[height];
-    for (size_t i = 0; i < height; ++i)
-        out_rows[i] = *out_bytes + (width*i*3);
-
-    png_read_rows(png, out_rows, NULL, height);
-    png_destroy_read_struct(&png, &info, NULL);
-    delete[] out_rows;
-
-    return im_size;
-}

crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_slidehash.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_slidehash.cc b/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_slidehash.cc
deleted file mode 100644
index 655820e..0000000
--- a/crates/libz-sys/src/zlib-ng/test/benchmarks/benchmark_slidehash.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/* benchmark_slidehash.cc -- benchmark slide_hash variants
- * Copyright (C) 2022 Adam Stylinski, Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <limits.h>
-
-#include <benchmark/benchmark.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "deflate.h"
-#  include "cpu_features.h"
-}
-
-#define MAX_RANDOM_INTS 32768
-
-class slide_hash: public benchmark::Fixture {
-private:
-    uint16_t *l0;
-    uint16_t *l1;
-    deflate_state *s_g;
-
-public:
-    void SetUp(const ::benchmark::State& state) {
-        l0 = (uint16_t *)zng_alloc(HASH_SIZE * sizeof(uint16_t));
-
-        for (int32_t i = 0; i < HASH_SIZE; i++) {
-            l0[i] = rand();
-        }
-
-        l1 = (uint16_t *)zng_alloc(MAX_RANDOM_INTS * sizeof(uint16_t));
-
-        for (int32_t i = 0; i < MAX_RANDOM_INTS; i++) {
-            l1[i] = rand();
-        }
-
-        deflate_state *s = (deflate_state*)malloc(sizeof(deflate_state));
-        s->head = l0;
-        s->prev = l1;
-        s_g = s;
-    }
-
-    void Bench(benchmark::State& state, slide_hash_func slide_hash) {
-        s_g->w_size = (uint32_t)state.range(0);
-
-        for (auto _ : state) {
-            slide_hash(s_g);
-            benchmark::DoNotOptimize(s_g);
-        }
-    }
-
-    void TearDown(const ::benchmark::State& state) {
-        zng_free(l0);
-        zng_free(l1);
-    }
-};
-
-#define BENCHMARK_SLIDEHASH(name, fptr, support_flag) \
-    BENCHMARK_DEFINE_F(slide_hash, name)(benchmark::State& state) { \
-        if (!support_flag) { \
-            state.SkipWithError("CPU does not support " #name); \
-        } \
-        Bench(state, fptr); \
-    } \
-    BENCHMARK_REGISTER_F(slide_hash, name)->RangeMultiplier(2)->Range(1024, MAX_RANDOM_INTS);
-
-BENCHMARK_SLIDEHASH(c, slide_hash_c, 1);
-
-#ifdef ARM_NEON_SLIDEHASH
-BENCHMARK_SLIDEHASH(neon, slide_hash_neon, arm_cpu_has_neon);
-#endif
-#ifdef POWER8_VSX_SLIDEHASH
-BENCHMARK_SLIDEHASH(power8, slide_hash_power8, power_cpu_has_arch_2_07);
-#endif
-#ifdef PPC_VMX_SLIDEHASH
-BENCHMARK_SLIDEHASH(vmx, slide_hash_vmx, power_cpu_has_altivec);
-#endif
-
-#ifdef X86_SSE2
-BENCHMARK_SLIDEHASH(sse2, slide_hash_sse2, x86_cpu_has_sse2);
-#endif
-#ifdef X86_AVX2
-BENCHMARK_SLIDEHASH(avx2, slide_hash_avx2, x86_cpu_has_avx2);
-#endif

crates/libz-sys/src/zlib-ng/test/data/fireworks.jpg

diff --git a/crates/libz-sys/src/zlib-ng/test/data/fireworks.jpg b/crates/libz-sys/src/zlib-ng/test/data/fireworks.jpg
deleted file mode 100644
index 078cf17..0000000
--- a/crates/libz-sys/src/zlib-ng/test/data/fireworks.jpg
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/data/lcet10.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/data/lcet10.txt b/crates/libz-sys/src/zlib-ng/test/data/lcet10.txt
deleted file mode 100644
index 1dbdfc5..0000000
--- a/crates/libz-sys/src/zlib-ng/test/data/lcet10.txt
+++ /dev/null
@@ -1,7519 +0,0 @@
-
-
-The Project Gutenberg Etext of LOC WORKSHOP ON ELECTRONIC TEXTS
-
-
-
-
-                      WORKSHOP ON ELECTRONIC TEXTS
-
-                               PROCEEDINGS
-
-
-
-                          Edited by James Daly
-
-
-
-
-
-
-
-                             9-10 June 1992
-
-
-                           Library of Congress
-                            Washington, D.C.
-
-
-
-    Supported by a Grant from the David and Lucile Packard Foundation
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                            TABLE OF CONTENTS
-
-
-Acknowledgements
-
-Introduction
-
-Proceedings
-   Welcome
-      Prosser Gifford and Carl Fleischhauer
-
-   Session I.  Content in a New Form:  Who Will Use It and What Will They Do?
-      James Daly (Moderator)
-      Avra Michelson, Overview
-      Susan H. Veccia, User Evaluation
-      Joanne Freeman, Beyond the Scholar
-         Discussion
-
-   Session II.  Show and Tell
-      Jacqueline Hess (Moderator)
-      Elli Mylonas, Perseus Project
-         Discussion
-      Eric M. Calaluca, Patrologia Latina Database
-      Carl Fleischhauer and Ricky Erway, American Memory
-         Discussion
-      Dorothy Twohig, The Papers of George Washington
-         Discussion
-      Maria L. Lebron, The Online Journal of Current Clinical Trials
-         Discussion
-      Lynne K. Personius, Cornell mathematics books
-         Discussion
-
-   Session III.  Distribution, Networks, and Networking:  
-                 Options for Dissemination
-      Robert G. Zich (Moderator)
-      Clifford A. Lynch
-         Discussion
-      Howard Besser
-         Discussion
-      Ronald L. Larsen
-      Edwin B. Brownrigg
-         Discussion
-
-   Session IV.  Image Capture, Text Capture, Overview of Text and
-                Image Storage Formats
-         William L. Hooton (Moderator)
-      A) Principal Methods for Image Capture of Text:  
-            direct scanning, use of microform
-         Anne R. Kenney
-         Pamela Q.J. Andre
-         Judith A. Zidar
-         Donald J. Waters
-            Discussion
-      B) Special Problems:  bound volumes, conservation,
-                            reproducing printed halftones
-         George Thoma
-         Carl Fleischhauer
-            Discussion
-      C) Image Standards and Implications for Preservation
-         Jean Baronas
-         Patricia Battin
-            Discussion
-      D) Text Conversion:  OCR vs. rekeying, standards of accuracy
-                           and use of imperfect texts, service bureaus
-         Michael Lesk
-         Ricky Erway
-         Judith A. Zidar
-            Discussion
-
-   Session V.  Approaches to Preparing Electronic Texts
-      Susan Hockey (Moderator)
-      Stuart Weibel
-         Discussion
-      C.M. Sperberg-McQueen
-         Discussion
-      Eric M. Calaluca
-         Discussion
-
-   Session VI.  Copyright Issues
-      Marybeth Peters
-
-   Session VII.  Conclusion
-      Prosser Gifford (Moderator)
-      General discussion
-
-Appendix I:  Program
-
-Appendix II:  Abstracts
-
-Appendix III:  Directory of Participants
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                            Acknowledgements
-
-I would like to thank Carl Fleischhauer and Prosser Gifford for the
-opportunity to learn about areas of human activity unknown to me a scant
-ten months ago, and the David and Lucile Packard Foundation for
-supporting that opportunity.  The help given by others is acknowledged on
-a separate page.
-
-                                                          19 October 1992
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                              INTRODUCTION
-
-The Workshop on Electronic Texts (1) drew together representatives of
-various projects and interest groups to compare ideas, beliefs,
-experiences, and, in particular, methods of placing and presenting
-historical textual materials in computerized form.  Most attendees gained
-much in insight and outlook from the event.  But the assembly did not
-form a new nation, or, to put it another way, the diversity of projects
-and interests was too great to draw the representatives into a cohesive,
-action-oriented body.(2)
-
-Everyone attending the Workshop shared an interest in preserving and
-providing access to historical texts.  But within this broad field the
-attendees represented a variety of formal, informal, figurative, and
-literal groups, with many individuals belonging to more than one.  These
-groups may be defined roughly according to the following topics or
-activities:
-
-* Imaging
-* Searchable coded texts
-* National and international computer networks
-* CD-ROM production and dissemination
-* Methods and technology for converting older paper materials into
-electronic form
-* Study of the use of digital materials by scholars and others
-
-This summary is arranged thematically and does not follow the actual
-sequence of presentations.
-
-NOTES:
-     (1)  In this document, the phrase electronic text is used to mean
-     any computerized reproduction or version of a document, book,
-     article, or manuscript (including images), and not merely a machine-
-     readable or machine-searchable text.
-
-     (2)  The Workshop was held at the Library of Congress on 9-10 June
-     1992, with funding from the David and Lucile Packard Foundation. 
-     The document that follows represents a summary of the presentations
-     made at the Workshop and was compiled by James DALY.  This
-     introduction was written by DALY and Carl FLEISCHHAUER.
-
-
-PRESERVATION AND IMAGING
-
-Preservation, as that term is used by archivists,(3) was most explicitly
-discussed in the context of imaging.  Anne KENNEY and Lynne PERSONIUS
-explained how the concept of a faithful copy and the user-friendliness of
-the traditional book have guided their project at Cornell University.(4) 
-Although interested in computerized dissemination, participants in the
-Cornell project are creating digital image sets of older books in the
-public domain as a source for a fresh paper facsimile or, in a future
-phase, microfilm.  The books returned to the library shelves are
-high-quality and useful replacements on acid-free paper that should last
-a long time.  To date, the Cornell project has placed little or no
-emphasis on creating searchable texts; one would not be surprised to find
-that the project participants view such texts as new editions, and thus
-not as faithful reproductions. 
-
-In her talk on preservation, Patricia BATTIN struck an ecumenical and
-flexible note as she endorsed the creation and dissemination of a variety
-of types of digital copies.  Do not be too narrow in defining what counts
-as a preservation element, BATTIN counseled; for the present, at least,
-digital copies made with preservation in mind cannot be as narrowly
-standardized as, say, microfilm copies with the same objective.  Setting
-standards precipitously can inhibit creativity, but delay can result in
-chaos, she advised.
-
-In part, BATTIN's position reflected the unsettled nature of image-format
-standards, and attendees could hear echoes of this unsettledness in the
-comments of various speakers.  For example, Jean BARONAS reviewed the
-status of several formal standards moving through committees of experts;
-and Clifford LYNCH encouraged the use of a new guideline for transmitting
-document images on Internet.  Testimony from participants in the National
-Agricultural Library's (NAL) Text Digitization Program and LC's American
-Memory project highlighted some of the challenges to the actual creation
-or interchange of images, including difficulties in converting
-preservation microfilm to digital form.  Donald WATERS reported on the
-progress of a master plan for a project at Yale University to convert
-books on microfilm to digital image sets, Project Open Book (POB).
-
-The Workshop offered rather less of an imaging practicum than planned,
-but "how-to" hints emerge at various points, for example, throughout
-KENNEY's presentation and in the discussion of arcana such as
-thresholding and dithering offered by George THOMA and FLEISCHHAUER.
-
-NOTES:
-     (3)  Although there is a sense in which any reproductions of
-     historical materials preserve the human record, specialists in the
-     field have developed particular guidelines for the creation of
-     acceptable preservation copies.
-
-     (4)  Titles and affiliations of presenters are given at the
-     beginning of their respective talks and in the Directory of
-     Participants (Appendix III).
-
-
-THE MACHINE-READABLE TEXT:  MARKUP AND USE
-
-The sections of the Workshop that dealt with machine-readable text tended
-to be more concerned with access and use than with preservation, at least
-in the narrow technical sense.  Michael SPERBERG-McQUEEN made a forceful
-presentation on the Text Encoding Initiative's (TEI) implementation of
-the Standard Generalized Markup Language (SGML).  His ideas were echoed
-by Susan HOCKEY, Elli MYLONAS, and Stuart WEIBEL.  While the
-presentations made by the TEI advocates contained no practicum, their
-discussion focused on the value of the finished product, what the
-European Community calls reusability, but what may also be termed
-durability.  They argued that marking up--that is, coding--a text in a
-well-conceived way will permit it to be moved from one computer
-environment to another, as well as to be used by various users.  Two
-kinds of markup were distinguished:  1) procedural markup, which
-describes the features of a text (e.g., dots on a page), and 2)
-descriptive markup, which describes the structure or elements of a
-document (e.g., chapters, paragraphs, and front matter).
-
-The TEI proponents emphasized the importance of texts to scholarship. 
-They explained how heavily coded (and thus analyzed and annotated) texts
-can underlie research, play a role in scholarly communication, and
-facilitate classroom teaching.  SPERBERG-McQUEEN reminded listeners that
-a written or printed item (e.g., a particular edition of a book) is
-merely a representation of the abstraction we call a text.  To concern
-ourselves with faithfully reproducing a printed instance of the text,
-SPERBERG-McQUEEN argued, is to concern ourselves with the representation
-of a representation ("images as simulacra for the text").  The TEI proponents'
-interest in images tends to focus on corollary materials for use in teaching,
-for example, photographs of the Acropolis to accompany a Greek text.
-
-By the end of the Workshop, SPERBERG-McQUEEN confessed to having been
-converted to a limited extent to the view that electronic images
-constitute a promising alternative to microfilming; indeed, an
-alternative probably superior to microfilming.  But he was not convinced
-that electronic images constitute a serious attempt to represent text in
-electronic form.  HOCKEY and MYLONAS also conceded that their experience
-at the Pierce Symposium the previous week at Georgetown University and
-the present conference at the Library of Congress had compelled them to
-reevaluate their perspective on the usefulness of text as images. 
-Attendees could see that the text and image advocates were in
-constructive tension, so to say.
-
-Three nonTEI presentations described approaches to preparing
-machine-readable text that are less rigorous and thus less expensive.  In
-the case of the Papers of George Washington, Dorothy TWOHIG explained
-that the digital version will provide a not-quite-perfect rendering of
-the transcribed text--some 135,000 documents, available for research
-during the decades while the perfect or print version is completed. 
-Members of the American Memory team and the staff of NAL's Text
-Digitization Program (see below) also outlined a middle ground concerning
-searchable texts.  In the case of American Memory, contractors produce
-texts with about 99-percent accuracy that serve as "browse" or
-"reference" versions of written or printed originals.  End users who need
-faithful copies or perfect renditions must refer to accompanying sets of
-digital facsimile images or consult copies of the originals in a nearby
-library or archive.  American Memory staff argued that the high cost of
-producing 100-percent accurate copies would prevent LC from offering
-access to large parts of its collections.
-
-
-THE MACHINE-READABLE TEXT:  METHODS OF CONVERSION
-
-Although the Workshop did not include a systematic examination of the
-methods for converting texts from paper (or from facsimile images) into
-machine-readable form, nevertheless, various speakers touched upon this
-matter.  For example, WEIBEL reported that OCLC has experimented with a
-merging of multiple optical character recognition systems that will
-reduce errors from an unacceptable rate of 5 characters out of every
-l,000 to an unacceptable rate of 2 characters out of every l,000.
-
-Pamela ANDRE presented an overview of NAL's Text Digitization Program and
-Judith ZIDAR discussed the technical details.  ZIDAR explained how NAL
-purchased hardware and software capable of performing optical character
-recognition (OCR) and text conversion and used its own staff to convert
-texts.  The process, ZIDAR said, required extensive editing and project
-staff found themselves considering alternatives, including rekeying
-and/or creating abstracts or summaries of texts.  NAL reckoned costs at
-$7 per page.  By way of contrast, Ricky ERWAY explained that American
-Memory had decided from the start to contract out conversion to external
-service bureaus.  The criteria used to select these contractors were cost
-and quality of results, as opposed to methods of conversion.  ERWAY noted
-that historical documents or books often do not lend themselves to OCR. 
-Bound materials represent a special problem.  In her experience, quality
-control--inspecting incoming materials, counting errors in samples--posed
-the most time-consuming aspect of contracting out conversion.  ERWAY
-reckoned American Memory's costs at $4 per page, but cautioned that fewer
-cost-elements had been included than in NAL's figure.
-
-
-OPTIONS FOR DISSEMINATION
-
-The topic of dissemination proper emerged at various points during the
-Workshop.  At the session devoted to national and international computer
-networks, LYNCH, Howard BESSER, Ronald LARSEN, and Edwin BROWNRIGG
-highlighted the virtues of Internet today and of the network that will
-evolve from Internet.  Listeners could discern in these narratives a
-vision of an information democracy in which millions of citizens freely
-find and use what they need.  LYNCH noted that a lack of standards
-inhibits disseminating multimedia on the network, a topic also discussed
-by BESSER.  LARSEN addressed the issues of network scalability and
-modularity and commented upon the difficulty of anticipating the effects
-of growth in orders of magnitude.  BROWNRIGG talked about the ability of
-packet radio to provide certain links in a network without the need for
-wiring.  However, the presenters also called attention to the
-shortcomings and incongruities of present-day computer networks.  For
-example:  1) Network use is growing dramatically, but much network
-traffic consists of personal communication (E-mail).  2) Large bodies of
-information are available, but a user's ability to search across their
-entirety is limited.  3) There are significant resources for science and
-technology, but few network sources provide content in the humanities. 
-4) Machine-readable texts are commonplace, but the capability of the
-system to deal with images (let alone other media formats) lags behind. 
-A glimpse of a multimedia future for networks, however, was provided by
-Maria LEBRON in her overview of the Online Journal of Current Clinical
-Trials (OJCCT), and the process of scholarly publishing on-line.   
-
-The contrasting form of the CD-ROM disk was never systematically
-analyzed, but attendees could glean an impression from several of the
-show-and-tell presentations.  The Perseus and American Memory examples
-demonstrated recently published disks, while the descriptions of the
-IBYCUS version of the Papers of George Washington and Chadwyck-Healey's
-Patrologia Latina Database (PLD) told of disks to come.  According to
-Eric CALALUCA, PLD's principal focus has been on converting Jacques-Paul
-Migne's definitive collection of Latin texts to machine-readable form. 
-Although everyone could share the network advocates' enthusiasm for an
-on-line future, the possibility of rolling up one's sleeves for a session
-with a CD-ROM containing both textual materials and a powerful retrieval
-engine made the disk seem an appealing vessel indeed.  The overall
-discussion suggested that the transition from CD-ROM to on-line networked
-access may prove far slower and more difficult than has been anticipated.
-
-
-WHO ARE THE USERS AND WHAT DO THEY DO?
-
-Although concerned with the technicalities of production, the Workshop
-never lost sight of the purposes and uses of electronic versions of
-textual materials.  As noted above, those interested in imaging discussed
-the problematical matter of digital preservation, while the TEI proponents
-described how machine-readable texts can be used in research.  This latter
-topic received thorough treatment in the paper read by Avra MICHELSON.
-She placed the phenomenon of electronic texts within the context of
-broader trends in information technology and scholarly communication.
-
-Among other things, MICHELSON described on-line conferences that
-represent a vigorous and important intellectual forum for certain
-disciplines.  Internet now carries more than 700 conferences, with about
-80 percent of these devoted to topics in the social sciences and the
-humanities.  Other scholars use on-line networks for "distance learning." 
-Meanwhile, there has been a tremendous growth in end-user computing;
-professors today are less likely than their predecessors to ask the
-campus computer center to process their data.  Electronic texts are one
-key to these sophisticated applications, MICHELSON reported, and more and
-more scholars in the humanities now work in an on-line environment. 
-Toward the end of the Workshop, Michael LESK presented a corollary to
-MICHELSON's talk, reporting the results of an experiment that compared
-the work of one group of chemistry students using traditional printed
-texts and two groups using electronic sources.  The experiment
-demonstrated that in the event one does not know what to read, one needs
-the electronic systems; the electronic systems hold no advantage at the
-moment if one knows what to read, but neither do they impose a penalty.
-
-DALY provided an anecdotal account of the revolutionizing impact of the
-new technology on his previous methods of research in the field of classics.
-His account, by extrapolation, served to illustrate in part the arguments
-made by MICHELSON concerning the positive effects of the sudden and radical
-transformation being wrought in the ways scholars work.
-
-Susan VECCIA and Joanne FREEMAN delineated the use of electronic
-materials outside the university.  The most interesting aspect of their
-use, FREEMAN said, could be seen as a paradox:  teachers in elementary
-and secondary schools requested access to primary source materials but,
-at the same time, found that "primariness" itself made these materials
-difficult for their students to use.
-
-
-OTHER TOPICS
-
-Marybeth PETERS reviewed copyright law in the United States and offered
-advice during a lively discussion of this subject.  But uncertainty
-remains concerning the price of copyright in a digital medium, because a
-solution remains to be worked out concerning management and synthesis of
-copyrighted and out-of-copyright pieces of a database.
-
-As moderator of the final session of the Workshop, Prosser GIFFORD directed
-discussion to future courses of action and the potential role of LC in
-advancing them.  Among the recommendations that emerged were the following:
-
-     * Workshop participants should 1) begin to think about working
-     with image material, but structure and digitize it in such a
-     way that at a later stage it can be interpreted into text, and
-     2) find a common way to build text and images together so that
-     they can be used jointly at some stage in the future, with
-     appropriate network support, because that is how users will want
-     to access these materials.  The Library might encourage attempts
-     to bring together people who are working on texts and images.
-
-     * A network version of American Memory should be developed or
-     consideration should be given to making the data in it
-     available to people interested in doing network multimedia. 
-     Given the current dearth of digital data that is appealing and
-     unencumbered by extremely complex rights problems, developing a
-     network version of American Memory could do much to help make
-     network multimedia a reality.
-
-     * Concerning the thorny issue of electronic deposit, LC should
-     initiate a catalytic process in terms of distributed
-     responsibility, that is, bring together the distributed
-     organizations and set up a study group to look at all the
-     issues related to electronic deposit and see where we as a
-     nation should move.  For example, LC might attempt to persuade
-     one major library in each state to deal with its state
-     equivalent publisher, which might produce a cooperative project
-     that would be equitably distributed around the country, and one
-     in which LC would be dealing with a minimal number of publishers
-     and minimal copyright problems.  LC must also deal with the
-     concept of on-line publishing, determining, among other things,
-     how serials such as OJCCT might be deposited for copyright.
-
-     * Since a number of projects are planning to carry out
-     preservation by creating digital images that will end up in
-     on-line or near-line storage at some institution, LC might play
-     a helpful role, at least in the near term, by accelerating how
-     to catalog that information into the Research Library Information
-     Network (RLIN) and then into OCLC, so that it would be accessible.
-     This would reduce the possibility of multiple institutions digitizing
-     the same work. 
-
-
-CONCLUSION
-
-The Workshop was valuable because it brought together partisans from
-various groups and provided an occasion to compare goals and methods. 
-The more committed partisans frequently communicate with others in their
-groups, but less often across group boundaries.  The Workshop was also
-valuable to attendees--including those involved with American Memory--who
-came less committed to particular approaches or concepts.  These
-attendees learned a great deal, and plan to select and employ elements of
-imaging, text-coding, and networked distribution that suit their
-respective projects and purposes.
-
-Still, reality rears its ugly head:  no breakthrough has been achieved. 
-On the imaging side, one confronts a proliferation of competing
-data-interchange standards and a lack of consensus on the role of digital
-facsimiles in preservation.  In the realm of machine-readable texts, one
-encounters a reasonably mature standard but methodological difficulties
-and high costs.  These latter problems, of course, represent a special
-impediment to the desire, as it is sometimes expressed in the popular
-press, "to put the [contents of the] Library of Congress on line."  In
-the words of one participant, there was "no solution to the economic
-problems--the projects that are out there are surviving, but it is going
-to be a lot of work to transform the information industry, and so far the
-investment to do that is not forthcoming" (LESK, per litteras).
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                               PROCEEDINGS
-
-
-WELCOME
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-GIFFORD * Origin of Workshop in current Librarian's desire to make LC's
-collections more widely available * Desiderata arising from the prospect
-of greater interconnectedness *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-After welcoming participants on behalf of the Library of Congress,
-American Memory (AM), and the National Demonstration Lab, Prosser
-GIFFORD, director for scholarly programs, Library of Congress, located
-the origin of the Workshop on Electronic Texts in a conversation he had
-had considerably more than a year ago with Carl FLEISCHHAUER concerning
-some of the issues faced by AM.  On the assumption that numerous other
-people were asking the same questions, the decision was made to bring
-together as many of these people as possible to ask the same questions
-together.  In a deeper sense, GIFFORD said, the origin of the Workshop
-lay in the desire of the current Librarian of Congress, James H. 
-Billington, to make the collections of the Library, especially those
-offering unique or unusual testimony on aspects of the American
-experience, available to a much wider circle of users than those few
-people who can come to Washington to use them.  This meant that the
-emphasis of AM, from the outset, has been on archival collections of the
-basic material, and on making these collections themselves available,
-rather than selected or heavily edited products.
-
-From AM's emphasis followed the questions with which the Workshop began: 
-who will use these materials, and in what form will they wish to use
-them.  But an even larger issue deserving mention, in GIFFORD's view, was
-the phenomenal growth in Internet connectivity.  He expressed the hope
-that the prospect of greater interconnectedness than ever before would
-lead to:  1) much more cooperative and mutually supportive endeavors; 2)
-development of systems of shared and distributed responsibilities to
-avoid duplication and to ensure accuracy and preservation of unique
-materials; and 3) agreement on the necessary standards and development of
-the appropriate directories and indices to make navigation
-straightforward among the varied resources that are, and increasingly
-will be, available.  In this connection, GIFFORD requested that
-participants reflect from the outset upon the sorts of outcomes they
-thought the Workshop might have.  Did those present constitute a group
-with sufficient common interests to propose a next step or next steps,
-and if so, what might those be?  They would return to these questions the
-following afternoon.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-FLEISCHHAUER * Core of Workshop concerns preparation and production of
-materials * Special challenge in conversion of textual materials *
-Quality versus quantity * Do the several groups represented share common
-interests? *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Carl FLEISCHHAUER, coordinator, American Memory, Library of Congress,
-emphasized that he would attempt to represent the people who perform some
-of the work of converting or preparing  materials and that the core of
-the Workshop had to do with preparation and production.  FLEISCHHAUER
-then drew a distinction between the long term, when many things would be
-available and connected in the ways that GIFFORD described, and the short
-term, in which AM not only has wrestled with the issue of what is the
-best course to pursue but also has faced a variety of technical
-challenges.
-
-FLEISCHHAUER remarked AM's endeavors to deal with a wide range of library
-formats, such as motion picture collections, sound-recording collections,
-and pictorial collections of various sorts, especially collections of
-photographs.  In the course of these efforts, AM kept coming back to
-textual materials--manuscripts or rare printed matter, bound materials,
-etc.  Text posed the greatest conversion challenge of all.  Thus, the
-genesis of the Workshop, which reflects the problems faced by AM.  These
-problems include physical problems.  For example, those in the library
-and archive business deal with collections made up of fragile and rare
-manuscript items, bound materials, especially the notoriously brittle
-bound materials of the late nineteenth century.  These are precious
-cultural artifacts, however, as well as interesting sources of
-information, and LC desires to retain and conserve them.  AM needs to
-handle things without damaging them.  Guillotining a book to run it
-through a sheet feeder must be avoided at all costs.
-
-Beyond physical problems, issues pertaining to quality arose.  For
-example, the desire to provide users with a searchable text is affected
-by the question of acceptable level of accuracy.  One hundred percent
-accuracy is tremendously expensive.  On the other hand, the output of
-optical character recognition (OCR) can be tremendously inaccurate. 
-Although AM has attempted to find a middle ground, uncertainty persists
-as to whether or not it has discovered the right solution.
-
-Questions of quality arose concerning images as well.  FLEISCHHAUER
-contrasted the extremely high level of quality of the digital images in
-the Cornell Xerox Project with AM's efforts to provide a browse-quality
-or access-quality image, as opposed to an archival or preservation image. 
-FLEISCHHAUER therefore welcomed the opportunity to compare notes.
-
-FLEISCHHAUER observed in passing that conversations he had had about
-networks have begun to signal that for various forms of media a
-determination may be made that there is a browse-quality item, or a
-distribution-and-access-quality item that may coexist in some systems
-with a higher quality archival item that would be inconvenient to send
-through the network because of its size.  FLEISCHHAUER referred, of
-course, to images more than to searchable text.
-
-As AM considered those questions, several conceptual issues arose:  ought
-AM occasionally to reproduce materials entirely through an image set, at
-other times, entirely through a text set, and in some cases, a mix? 
-There probably would be times when the historical authenticity of an
-artifact would require that its image be used.  An image might be
-desirable as a recourse for users if one could not provide 100-percent
-accurate text.  Again, AM wondered, as a practical matter, if a
-distinction could be drawn between rare printed matter that might exist
-in multiple collections--that is, in ten or fifteen libraries.  In such
-cases, the need for perfect reproduction would be less than for unique
-items.  Implicit in his remarks, FLEISCHHAUER conceded, was the admission
-that AM has been tilting strongly towards quantity and drawing back a
-little from perfect quality.  That is, it seemed to AM that society would
-be better served if more things were distributed by LC--even if they were
-not quite perfect--than if fewer things, perfectly represented, were
-distributed.  This was stated as a proposition to be tested, with
-responses to be gathered from users.
-
-In thinking about issues related to reproduction of materials and seeing
-other people engaged in parallel activities, AM deemed it useful to
-convene a conference.  Hence, the Workshop.  FLEISCHHAUER thereupon
-surveyed the several groups represented:  1) the world of images (image
-users and image makers); 2) the world of text and scholarship and, within
-this group, those concerned with language--FLEISCHHAUER confessed to finding
-delightful irony in the fact that some of the most advanced thinkers on
-computerized texts are those dealing with ancient Greek and Roman materials;
-3) the network world; and 4) the general world of library science, which
-includes people interested in preservation and cataloging.
-
-FLEISCHHAUER concluded his remarks with special thanks to the David and
-Lucile Packard Foundation for its support of the meeting, the American
-Memory group, the Office for Scholarly Programs, the National
-Demonstration Lab, and the Office of Special Events.  He expressed the
-hope that David Woodley Packard might be able to attend, noting that
-Packard's work and the work of the foundation had sponsored a number of
-projects in the text area.
-
-                                 ******
-
-SESSION I.  CONTENT IN A NEW FORM:   WHO WILL USE IT AND WHAT WILL THEY DO?
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DALY * Acknowledgements * A new Latin authors disk *  Effects of the new
-technology on previous methods of research *       
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Serving as moderator, James DALY acknowledged the generosity of all the
-presenters for giving of their time, counsel, and patience in planning
-the Workshop, as well as of members of the American Memory project and
-other Library of Congress staff, and the David and Lucile Packard
-Foundation and its executive director, Colburn S. Wilbur.
-
-DALY then recounted his visit in March to the Center for Electronic Texts
-in the Humanities (CETH) and the Department of Classics at Rutgers
-University, where an old friend, Lowell Edmunds, introduced him to the
-department's IBYCUS scholarly personal computer, and, in particular, the
-new Latin CD-ROM, containing, among other things, almost all classical
-Latin literary texts through A.D. 200.  Packard Humanities Institute
-(PHI), Los Altos, California, released this disk late in 1991, with a
-nominal triennial licensing fee.
-
-Playing with the disk for an hour or so at Rutgers brought home to DALY
-at once the revolutionizing impact of the new technology on his previous
-methods of research.  Had this disk been available two or three years
-earlier, DALY contended, when he was engaged in preparing a commentary on
-Book 10 of Virgil's Aeneid for Cambridge University Press, he would not
-have required a forty-eight-square-foot table on which to spread the
-numerous, most frequently consulted items, including some ten or twelve
-concordances to key Latin authors, an almost equal number of lexica to
-authors who lacked concordances, and where either lexica or concordances
-were lacking, numerous editions of authors antedating and postdating Virgil.
-
-Nor, when checking each of the average six to seven words contained in
-the Virgilian hexameter for its usage elsewhere in Virgil's works or
-other Latin authors, would DALY have had to maintain the laborious
-mechanical process of flipping through these concordances, lexica, and
-editions each time.  Nor would he have had to frequent as often the
-Milton S. Eisenhower Library at the Johns Hopkins University to consult
-the Thesaurus Linguae Latinae.  Instead of devoting countless hours, or
-the bulk of his research time, to gathering data concerning Virgil's use
-of words, DALY--now freed by PHI's Latin authors disk from the
-tyrannical, yet in some ways paradoxically happy scholarly drudgery--
-would have been able to devote that same bulk of time to analyzing and
-interpreting Virgilian verbal usage.
-
-Citing Theodore Brunner, Gregory Crane, Elli MYLONAS, and Avra MICHELSON,
-DALY argued that this reversal in his style of work, made possible by the
-new technology, would perhaps have resulted in better, more productive
-research.  Indeed, even in the course of his browsing the Latin authors
-disk at Rutgers, its powerful search, retrieval, and highlighting
-capabilities suggested to him several new avenues of research into
-Virgil's use of sound effects.  This anecdotal account, DALY maintained,
-may serve to illustrate in part the sudden and radical transformation
-being wrought in the ways scholars work.
-
-                                 ******
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-MICHELSON * Elements related to scholarship and technology * Electronic
-texts within the context of broader trends within information technology
-and scholarly communication * Evaluation of the prospects for the use of
-electronic texts * Relationship of electronic texts to processes of
-scholarly communication in humanities research * New exchange formats
-created by scholars * Projects initiated to increase scholarly access to
-converted text * Trend toward making electronic resources available
-through research and education networks * Changes taking place in
-scholarly communication among humanities scholars * Network-mediated
-scholarship transforming traditional scholarly practices * Key
-information technology trends affecting the conduct of scholarly
-communication over the next decade * The trend toward end-user computing
-* The trend toward greater connectivity * Effects of these trends * Key
-transformations taking place * Summary of principal arguments *
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Avra MICHELSON, Archival Research and Evaluation Staff, National Archives
-and Records Administration (NARA), argued that establishing who will use
-electronic texts and what they will use them for involves a consideration
-of both information technology and scholarship trends.  This
-consideration includes several elements related to scholarship and
-technology:  1) the key trends in information technology that are most
-relevant to scholarship; 2) the key trends in the use of currently
-available technology by scholars in the nonscientific community; and 3)
-the relationship between these two very distinct but interrelated trends. 
-The investment in understanding this relationship being made by
-information providers, technologists, and public policy developers, as
-well as by scholars themselves, seems to be pervasive and growing,
-MICHELSON contended.  She drew on collaborative work with Jeff Rothenberg
-on the scholarly use of technology.
-
-MICHELSON sought to place the phenomenon of electronic texts within the
-context of broader trends within information technology and scholarly
-communication.  She argued that electronic texts are of most use to
-researchers to the extent that the researchers' working context (i.e.,
-their relevant bibliographic sources, collegial feedback, analytic tools,
-notes, drafts, etc.), along with their field's primary and secondary
-sources, also is accessible in electronic form and can be integrated in
-ways that are unique to the on-line environment.
-
-Evaluation of the prospects for the use of electronic texts includes two
-elements:  1) an examination of the ways in which researchers currently
-are using electronic texts along with other electronic resources, and 2)
-an analysis of key information technology trends that are affecting the
-long-term conduct of scholarly communication.  MICHELSON limited her
-discussion of the use of electronic texts to the practices of humanists
-and noted that the scientific community was outside the panel's overview.
-
-MICHELSON examined the nature of the current relationship of electronic
-texts in particular, and electronic resources in general, to what she
-maintained were, essentially, five processes of scholarly communication
-in humanities research.  Researchers 1) identify sources, 2) communicate
-with their colleagues, 3) interpret and analyze data, 4) disseminate
-their research findings, and 5) prepare curricula to instruct the next
-generation of scholars and students.  This examination would produce a
-clearer understanding of the synergy among these five processes that
-fuels the tendency of the use of electronic resources for one process to
-stimulate its use for other processes of scholarly communication.
-
-For the first process of scholarly communication, the identification of
-sources, MICHELSON remarked the opportunity scholars now enjoy to
-supplement traditional word-of-mouth searches for sources among their
-colleagues with new forms of electronic searching.  So, for example,
-instead of having to visit the library, researchers are able to explore
-descriptions of holdings in their offices.  Furthermore, if their own
-institutions' holdings prove insufficient, scholars can access more than
-200 major American library catalogues over Internet, including the
-universities of California, Michigan, Pennsylvania, and Wisconsin. 
-Direct access to the bibliographic databases offers intellectual
-empowerment to scholars by presenting a comprehensive means of browsing
-through libraries from their homes and offices at their convenience.
-
-The second process of communication involves communication among
-scholars.  Beyond the most common methods of communication, scholars are
-using E-mail and a variety of new electronic communications formats
-derived from it for further academic interchange.  E-mail exchanges are
-growing at an astonishing rate, reportedly 15 percent a month.  They
-currently constitute approximately half the traffic on research and
-education networks.  Moreover, the global spread of E-mail has been so
-rapid that it is now possible for American scholars to use it to
-communicate with colleagues in close to 140 other countries.
-
-Other new exchange formats created by scholars and operating on Internet
-include more than 700 conferences, with about 80 percent of these devoted
-to topics in the social sciences and humanities.  The rate of growth of
-these scholarly electronic conferences also is astonishing.  From l990 to
-l991, 200 new conferences were identified on Internet.  From October 1991
-to June 1992, an additional 150 conferences in the social sciences and
-humanities were added to this directory of listings.  Scholars have
-established conferences in virtually every field, within every different
-discipline.  For example, there are currently close to 600 active social
-science and humanities  conferences on topics such as art and
-architecture, ethnomusicology, folklore, Japanese culture, medical
-education, and gifted and talented education.  The appeal to scholars of
-communicating through these conferences is that, unlike any other medium,
-electronic conferences today provide a forum for global communication
-with peers at the front end of the research process.
-
-Interpretation and analysis of sources constitutes the third process of
-scholarly communication that MICHELSON discussed in terms of texts and
-textual resources.  The methods used to analyze sources fall somewhere on
-a continuum from quantitative analysis to qualitative analysis. 
-Typically, evidence is culled and evaluated using methods drawn from both
-ends of this continuum.  At one end, quantitative analysis involves the
-use of mathematical processes such as a count of frequencies and
-distributions of occurrences or, on a higher level, regression analysis. 
-At the other end of the continuum, qualitative analysis typically
-involves nonmathematical processes oriented toward language
-interpretation or the building of theory.  Aspects of this work involve
-the processing--either manual or computational--of large and sometimes
-massive amounts of textual sources, although the use of nontextual
-sources as evidence, such as photographs, sound recordings, film footage,
-and artifacts, is significant as well.
-
-Scholars have discovered that many of the methods of interpretation and
-analysis that are related to both quantitative and qualitative methods
-are processes that can be performed by computers.  For example, computers
-can count.  They can count brush strokes used in a Rembrandt painting or
-perform regression analysis for understanding cause and effect.  By means
-of advanced technologies, computers can recognize patterns, analyze text,
-and model concepts.  Furthermore, computers can complete these processes
-faster with more sources and with greater precision than scholars who
-must rely on manual interpretation of data.  But if scholars are to use
-computers for these processes, source materials must be in a form
-amenable to computer-assisted analysis.  For this reason many scholars,
-once they have identified the sources that are key to their research, are
-converting them to machine-readable form.  Thus, a representative example
-of the numerous textual conversion projects organized by scholars around
-the world in recent years to support computational text analysis is the
-TLG, the Thesaurus Linguae Graecae.  This project is devoted to
-converting the extant ancient texts of classical Greece.  (Editor's note: 
-according to the TLG Newsletter of May l992, TLG was in use in thirty-two
-different countries.  This figure updates MICHELSON's previous count by one.)
-
-The scholars performing these conversions have been asked to recognize
-that the electronic sources they are converting for one use possess value
-for other research purposes as well.  As a result, during the past few
-years, humanities scholars have initiated a number of projects to
-increase scholarly access to converted text.  So, for example, the Text
-Encoding Initiative (TEI), about which more is said later in the program,
-was established as an effort by scholars to determine standard elements
-and methods for encoding machine-readable text for electronic exchange. 
-In a second effort to facilitate the sharing of converted text, scholars
-have created a new institution, the Center for Electronic Texts in the
-Humanities (CETH).  The center estimates that there are 8,000 series of
-source texts in the humanities that have been converted to
-machine-readable form worldwide.  CETH is undertaking an international
-search for converted text in the humanities, compiling it into an
-electronic library, and preparing bibliographic descriptions of the
-sources for the Research Libraries Information Network's (RLIN)
-machine-readable data file.  The library profession has begun to initiate
-large conversion projects as well, such as American Memory.
-
-While scholars have been making converted text available to one another,
-typically on disk or on CD-ROM, the clear trend is toward making these
-resources available through research and education networks.  Thus, the
-American and French Research on the Treasury of the French Language
-(ARTFL) and the Dante Project are already available on Internet. 
-MICHELSON summarized this section on interpretation and analysis by
-noting that:  1) increasing numbers of humanities scholars in the library
-community are recognizing the importance to the advancement of
-scholarship of retrospective conversion of source materials in the arts
-and humanities; and 2) there is a growing realization that making the
-sources available on research and education networks maximizes their
-usefulness for the analysis performed by humanities scholars.
-
-The fourth process of scholarly communication is dissemination of
-research findings, that is, publication.  Scholars are using existing
-research and education networks to engineer a new type of publication: 
-scholarly-controlled journals that are electronically produced and
-disseminated.  Although such journals are still emerging as a
-communication format, their number has grown, from approximately twelve
-to thirty-six during the past year (July 1991 to June 1992).  Most of
-these electronic scholarly journals are devoted to topics in the
-humanities.  As with network conferences, scholarly enthusiasm for these
-electronic journals stems from the medium's unique ability to advance
-scholarship in a way that no other medium can do by supporting global
-feedback and interchange, practically in real time, early in the research
-process.  Beyond scholarly journals, MICHELSON remarked the delivery of
-commercial full-text products, such as articles in professional journals,
-newsletters, magazines, wire services, and reference sources.  These are
-being delivered via on-line local library catalogues, especially through
-CD-ROMs.  Furthermore, according to MICHELSON, there is general optimism
-that the copyright and fees issues impeding the delivery of full text on
-existing research and education networks soon will be resolved.
-
-The final process of scholarly communication is curriculum development
-and instruction, and this involves the use of computer information
-technologies in two areas.  The first is the development of
-computer-oriented instructional tools, which includes simulations,
-multimedia applications, and computer tools that are used to assist in
-the analysis of sources in the classroom, etc.  The Perseus Project, a
-database that provides a multimedia curriculum on classical Greek
-civilization, is a good example of the way in which entire curricula are
-being recast using information technologies.  It is anticipated that the
-current difficulty in exchanging electronically computer-based
-instructional software, which in turn makes it difficult for one scholar
-to build upon the work of others, will be resolved before too long. 
-Stand-alone curricular applications that involve electronic text will be
-shareable through networks, reinforcing their significance as intellectual
-products as well as instructional tools.
-
-The second aspect of electronic learning involves the use of research and
-education networks for distance education programs.  Such programs
-interactively link teachers with students in geographically scattered
-locations and rely on the availability of electronic instructional
-resources.  Distance education programs are gaining wide appeal among
-state departments of education because of their demonstrated capacity to
-bring advanced specialized course work and an array of experts to many
-classrooms.  A recent report found that at least 32 states operated at
-least one statewide network for education in 1991, with networks under
-development in many of the remaining states.
-
-MICHELSON summarized this section by noting two striking changes taking
-place in scholarly communication among humanities scholars.  First is the
-extent to which electronic text in particular, and electronic resources
-in general, are being infused into each of the five processes described
-above.  As mentioned earlier, there is a certain synergy at work here. 
-The use of electronic resources for one process tends to stimulate its
-use for other processes, because the chief course of movement is toward a
-comprehensive on-line working context for humanities scholars that
-includes on-line availability of key bibliographies, scholarly feedback,
-sources, analytical tools, and publications.  MICHELSON noted further
-that the movement toward a comprehensive on-line working context for
-humanities scholars is not new.  In fact, it has been underway for more
-than forty years in the humanities, since Father Roberto Busa began
-developing an electronic concordance of the works of Saint Thomas Aquinas
-in 1949.  What we are witnessing today, MICHELSON contended, is not the
-beginning of this on-line transition but, for at least some humanities
-scholars, the turning point in the transition from a print to an
-electronic working context.  Coinciding with the on-line transition, the
-second striking change is the extent to which research and education
-networks are becoming the new medium of scholarly communication.  The
-existing Internet and the pending National Education and Research Network
-(NREN) represent the new meeting ground where scholars are going for
-bibliographic information, scholarly dialogue and feedback, the most
-current publications in their field, and high-level educational
-offerings.  Traditional scholarly practices are undergoing tremendous
-transformations as a result of the emergence and growing prominence of
-what is called network-mediated scholarship.
-
-MICHELSON next turned to the second element of the framework she proposed
-at the outset of her talk for evaluating the prospects for electronic
-text, namely the key information technology trends affecting the conduct
-of scholarly communication over the next decade:  1) end-user computing
-and 2) connectivity.
-
-End-user computing means that the person touching the keyboard, or
-performing computations, is the same as the person who initiates or
-consumes the computation.  The emergence of personal computers, along
-with a host of other forces, such as ubiquitous computing, advances in
-interface design, and the on-line transition, is prompting the consumers
-of computation to do their own computing, and is thus rendering obsolete
-the traditional distinction between end users and ultimate users.
-
-The trend toward end-user computing is significant to consideration of
-the prospects for electronic texts because it means that researchers are
-becoming more adept at doing their own computations and, thus, more
-competent in the use of electronic media.  By avoiding programmer
-intermediaries, computation is becoming central to the researcher's
-thought process.  This direct involvement in computing is changing the
-researcher's perspective on the nature of research itself, that is, the
-kinds of questions that can be posed, the analytical methodologies that
-can be used, the types and amount of sources that are appropriate for
-analyses, and the form in which findings are presented.  The trend toward
-end-user computing means that, increasingly, electronic media and
-computation are being infused into all processes of humanities
-scholarship, inspiring remarkable transformations in scholarly
-communication.
-
-The trend toward greater connectivity suggests that researchers are using
-computation increasingly in network environments.  Connectivity is
-important to scholarship because it erases the distance that separates
-students from teachers and scholars from their colleagues, while allowing
-users to access remote databases, share information in many different
-media, connect to their working context wherever they are, and
-collaborate in all phases of research.
-
-The combination of the trend toward end-user computing and the trend
-toward connectivity suggests that the scholarly use of electronic
-resources, already evident among some researchers, will soon become an
-established feature of scholarship.  The effects of these trends, along
-with ongoing changes in scholarly practices, point to a future in which
-humanities researchers will use computation and electronic communication
-to help them formulate ideas, access sources, perform research,
-collaborate with colleagues, seek peer review, publish and disseminate
-results, and engage in many other professional and educational activities.
-
-In summary, MICHELSON emphasized four points:  1) A portion of humanities
-scholars already consider electronic texts the preferred format for
-analysis and dissemination.  2) Scholars are using these electronic
-texts, in conjunction with other electronic resources, in all the
-processes of scholarly communication.  3) The humanities scholars'
-working context is in the process of changing from print technology to
-electronic technology, in many ways mirroring transformations that have
-occurred or are occurring within the scientific community.  4) These
-changes are occurring in conjunction with the development of a new
-communication medium:  research and education networks that are
-characterized by their capacity to advance scholarship in a wholly unique
-way.
-
-MICHELSON also reiterated her three principal arguments:  l) Electronic
-texts are best understood in terms of the relationship to other
-electronic resources and the growing prominence of network-mediated
-scholarship.  2) The prospects for electronic texts lie in their capacity
-to be integrated into the on-line network of electronic resources that
-comprise the new working context for scholars.  3) Retrospective conversion
-of portions of the scholarly record should be a key strategy as information
-providers respond to changes in scholarly communication practices.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-VECCIA * AM's evaluation project and public users of electronic resources
-* AM and its design * Site selection and evaluating the Macintosh
-implementation of AM * Characteristics of the six public libraries
-selected * Characteristics of AM's users in these libraries * Principal
-ways AM is being used *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Susan VECCIA, team leader, and Joanne FREEMAN, associate coordinator,
-American Memory, Library of Congress, gave a joint presentation.  First,
-by way of introduction, VECCIA explained her and FREEMAN's roles in
-American Memory (AM).  Serving principally as an observer, VECCIA has
-assisted with the evaluation project of AM, placing AM collections in a
-variety of different sites around the country and helping to organize and
-implement that project.  FREEMAN has been an associate coordinator of AM
-and has been involved principally with the interpretative materials,
-preparing some of the electronic exhibits and printed historical
-information that accompanies AM and that is requested by users.  VECCIA
-and FREEMAN shared anecdotal observations concerning AM with public users
-of electronic resources.  Notwithstanding a fairly structured evaluation
-in progress, both VECCIA and FREEMAN chose not to report on specifics in
-terms of numbers, etc., because they felt it was too early in the
-evaluation project to do so.
-
-AM is an electronic archive of primary source materials from the Library
-of Congress, selected collections representing a variety of formats--
-photographs, graphic arts, recorded sound, motion pictures, broadsides,
-and soon, pamphlets and books.  In terms of the design of this system,
-the interpretative exhibits have been kept separate from the primary
-resources, with good reason.  Accompanying this collection are printed
-documentation and user guides, as well as guides that FREEMAN prepared for
-teachers so that they may begin using the content of the system at once.
-
-VECCIA described the evaluation project before talking about the public
-users of AM, limiting her remarks to public libraries, because FREEMAN
-would talk more specifically about schools from kindergarten to twelfth
-grade (K-12).   Having started in spring 1991, the evaluation currently
-involves testing of the Macintosh implementation of AM.  Since the
-primary goal of this evaluation is to determine the most appropriate
-audience or audiences for AM, very different sites were selected.  This
-makes evaluation difficult because of the varying degrees of technology
-literacy among the sites.  AM is situated in forty-four locations, of
-which six are public libraries and sixteen are schools.  Represented
-among the schools are elementary, junior high, and high schools.
-District offices also are involved in the evaluation, which will
-conclude in summer 1993.
-
-VECCIA focused the remainder of her talk on the six public libraries, one
-of which doubles as a state library.  They represent a range of
-geographic areas and a range of demographic characteristics.  For
-example, three are located in urban settings, two in rural settings, and
-one in a suburban setting.  A range of technical expertise is to be found
-among these facilities as well.  For example, one is an "Apple library of
-the future," while two others are rural one-room libraries--in one, AM
-sits at the front desk next to a tractor manual.
-
-All public libraries have been extremely enthusiastic, supportive, and
-appreciative of the work that AM has been doing.  VECCIA characterized
-various users:  Most users in public libraries describe themselves as
-general readers; of the students who use AM in the public libraries,
-those in fourth grade and above seem most interested.  Public libraries
-in rural sites tend to attract retired people, who have been highly
-receptive to AM.  Users tend to fall into two additional categories: 
-people interested in the content and historical connotations of these
-primary resources, and those fascinated by the technology.  The format
-receiving the most comments has been motion pictures.  The adult users in
-public libraries are more comfortable with IBM computers, whereas young
-people seem comfortable with either IBM or Macintosh, although most of
-them seem to come from a Macintosh background.  This same tendency is
-found in the schools.
-
-What kinds of things do users do with AM?  In a public library there are
-two main goals or ways that AM is being used:  as an individual learning
-tool, and as a leisure activity.  Adult learning was one area that VECCIA
-would highlight as a possible application for a tool such as AM.  She
-described a patron of a rural public library who comes in every day on
-his lunch hour and literally reads AM, methodically going through the
-collection image by image.  At the end of his hour he makes an electronic
-bookmark, puts it in his pocket, and returns to work.  The next day he
-comes in and resumes where he left off.  Interestingly, this man had
-never been in the library before he used AM.  In another small, rural
-library, the coordinator reports that AM is a popular activity for some
-of the older, retired people in the community, who ordinarily would not
-use "those things,"--computers.  Another example of adult learning in
-public libraries is book groups, one of which, in particular, is using AM
-as part of its reading on industrialization, integration, and urbanization
-in the early 1900s.
-
-One library reports that a family is using AM to help educate their
-children.  In another instance, individuals from a local museum came in
-to use AM to prepare an exhibit on toys of the past.  These two examples
-emphasize the mission of the public library as a cultural institution,
-reaching out to people who do not have the same resources available to
-those who live in a metropolitan area or have access to a major library. 
-One rural library reports that junior high school students in large
-numbers came in one afternoon to use AM for entertainment.  A number of
-public libraries reported great interest among postcard collectors in the
-Detroit collection, which was essentially a collection of images used on
-postcards around the turn of the century.  Train buffs are similarly
-interested because that was a time of great interest in railroading. 
-People, it was found, relate to things that they know of firsthand.  For
-example, in both rural public libraries where AM was made available,
-observers reported that the older people with personal remembrances of
-the turn of the century were gravitating to the Detroit collection. 
-These examples served to underscore MICHELSON's observation re the
-integration of electronic tools and ideas--that people learn best when
-the material relates to something they know.
-
-VECCIA made the final point that in many cases AM serves as a
-public-relations tool for the public libraries that are testing it.  In
-one case, AM is being used as a vehicle to secure additional funding for
-the library.  In another case, AM has served as an inspiration to the
-staff of a major local public library in the South to think about ways to
-make its own collection of photographs more accessible to the public.
-
-                                  ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-FREEMAN * AM and archival electronic resources in a school environment *
-Questions concerning context * Questions concerning the electronic format
-itself * Computer anxiety * Access and availability of the system *
-Hardware * Strengths gained through the use of archival resources in
-schools *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Reiterating an observation made by VECCIA, that AM is an archival
-resource made up of primary materials with very little interpretation,
-FREEMAN stated that the project has attempted to bridge the gap between
-these bare primary materials and a school environment, and in that cause
-has created guided introductions to AM collections.  Loud demand from the
-educational community,  chiefly from teachers working with the upper
-grades of elementary school through high school, greeted the announcement
-that AM would be tested around the country.
-
-FREEMAN reported not only on what was learned about AM in a school
-environment, but also on several universal questions that were raised
-concerning archival electronic resources in schools.  She discussed
-several strengths of this type of material in a school environment as
-opposed to a highly structured resource that offers a limited number of
-paths to follow.
-
-FREEMAN first raised several questions about using AM in a school
-environment.  There is often some difficulty in developing a sense of
-what the system contains.  Many students sit down at a computer resource
-and assume that, because AM comes from the Library of Congress, all of
-American history is now at their fingertips.  As a result of that sort of
-mistaken judgment, some students are known to conclude that AM contains
-nothing of use to them when they look for one or two things and do not
-find them.  It is difficult to discover that middle ground where one has
-a sense of what the system contains.  Some students grope toward the idea
-of an archive, a new idea to them, since they have not previously
-experienced what it means to have access to a vast body of somewhat
-random information.
-
-Other questions raised by FREEMAN concerned the electronic format itself. 
-For instance, in a school environment it is often difficult both for
-teachers and students to gain a sense of what it is they are viewing. 
-They understand that it is a visual image, but they do not necessarily
-know that it is a postcard from the turn of the century, a panoramic
-photograph, or even machine-readable text of an eighteenth-century
-broadside, a twentieth-century printed book, or a nineteenth-century
-diary.  That distinction is often difficult for people in a school
-environment to grasp.  Because of that, it occasionally becomes difficult
-to draw conclusions from what one is viewing.
-
-FREEMAN also noted the obvious fear of the computer, which constitutes a
-difficulty in using an electronic resource.  Though students in general
-did not suffer from this anxiety, several older students feared that they
-were computer-illiterate, an assumption that became self-fulfilling when
-they searched for something but failed to find it.  FREEMAN said she
-believed that some teachers also fear computer resources, because they
-believe they lack complete control.  FREEMAN related the example of
-teachers shooing away students because it was not their time to use the
-system.  This was a case in which the situation had to be extremely
-structured so that the teachers would not feel that they had lost their
-grasp on what the system contained.
-
-A final question raised by FREEMAN concerned access and availability of
-the system.  She noted the occasional existence of a gap in communication
-between school librarians and teachers.  Often AM sits in a school
-library and the librarian is the person responsible for monitoring the
-system.  Teachers do not always take into their world new library
-resources about which the librarian is excited.  Indeed, at the sites
-where AM had been used most effectively within a library, the librarian
-was required to go to specific teachers and instruct them in its use.  As
-a result, several AM sites will have in-service sessions over a summer,
-in the hope that perhaps, with a more individualized link, teachers will
-be more likely to use the resource.
-
-A related issue in the school context concerned the number of
-workstations available at any one location.  Centralization of equipment
-at the district level, with teachers invited to download things and walk
-away with them, proved unsuccessful because the hours these offices were
-open were also school hours.
-
-Another issue was hardware.  As VECCIA observed, a range of sites exists,
-some technologically advanced and others essentially acquiring their
-first computer for the primary purpose of using it in conjunction with
-AM's testing.  Users at technologically sophisticated sites want even
-more sophisticated hardware, so that they can perform even more
-sophisticated tasks with the materials in AM.  But once they acquire a
-newer piece of hardware, they must learn how to use that also; at an
-unsophisticated site it takes an extremely long time simply to become
-accustomed to the computer, not to mention the program offered with the
-computer.  All of these small issues raise one large question, namely,
-are systems like AM truly rewarding in a school environment, or do they
-simply act as innovative toys that do little more than spark interest?
-
-FREEMAN contended that the evaluation project has revealed several strengths
-that were gained through the use of archival resources in schools, including:
-
-     * Psychic rewards from using AM as a vast, rich database, with
-     teachers assigning various projects to students--oral presentations,
-     written reports, a documentary, a turn-of-the-century newspaper--
-     projects that start with the materials in AM but are completed using
-     other resources; AM thus is used as a research tool in conjunction
-     with other electronic resources, as well as with books and items in
-     the library where the system is set up.
-
-     * Students are acquiring computer literacy in a humanities context.
-
-     * This sort of system is overcoming the isolation between disciplines
-     that often exists in schools.  For example, many English teachers are
-     requiring their students to write papers on historical topics
-     represented in AM.  Numerous teachers have reported that their
-     students are learning critical thinking skills using the system.
-
-     * On a broader level, AM is introducing primary materials, not only
-     to students but also to teachers, in an environment where often
-     simply none exist--an exciting thing for the students because it
-     helps them learn to conduct research, to interpret, and to draw
-     their own conclusions.  In learning to conduct research and what it
-     means, students are motivated to seek knowledge.  That relates to
-     another positive outcome--a high level of personal involvement of
-     students with the materials in this system and greater motivation to
-     conduct their own research and draw their own conclusions.
-
-     * Perhaps the most ironic strength of these kinds of archival
-     electronic resources is that many of the teachers AM interviewed
-     were desperate, it is no exaggeration to say, not only for primary
-     materials but for unstructured primary materials.  These would, they
-     thought, foster personally motivated research, exploration, and
-     excitement in their students.  Indeed, these materials have done
-     just that.  Ironically, however, this lack of structure produces
-     some of the confusion to which the newness of these kinds of
-     resources may also contribute.  The key to effective use of archival
-     products in a school environment is a clear, effective introduction
-     to the system and to what it contains. 
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Nothing known, quantitatively, about the number of
-humanities scholars who must see the original versus those who would
-settle for an edited transcript, or about the ways in which humanities
-scholars are using information technology * Firm conclusions concerning
-the manner and extent of the use of supporting materials in print
-provided by AM to await completion of evaluative study * A listener's
-reflections on additional applications of electronic texts * Role of
-electronic resources in teaching elementary research skills to students *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the discussion that followed the presentations by MICHELSON,
-VECCIA, and FREEMAN, additional points emerged.
-
-LESK asked if MICHELSON could give any quantitative estimate of the
-number of humanities scholars who must see or want to see the original,
-or the best possible version of the material, versus those who typically
-would settle for an edited transcript.  While unable to provide a figure,
-she offered her impressions as an archivist who has done some reference
-work and has discussed this issue with other archivists who perform
-reference, that those who use archives and those who use primary sources
-for what would be considered very high-level scholarly research, as
-opposed to, say, undergraduate papers, were few in number, especially
-given the public interest in using primary sources to conduct
-genealogical or avocational research and the kind of professional
-research done by people in private industry or the federal government. 
-More important in MICHELSON's view was that, quantitatively, nothing is
-known about the ways in which, for example, humanities scholars are using
-information technology.  No studies exist to offer guidance in creating
-strategies.  The most recent study was conducted in 1985 by the American
-Council of Learned Societies (ACLS), and what it showed was that 50
-percent of humanities scholars at that time were using computers.  That
-constitutes the extent of our knowledge.
-
-Concerning AM's strategy for orienting people toward the scope of
-electronic resources, FREEMAN could offer no hard conclusions at this
-point, because she and her colleagues were still waiting to see,
-particularly in the schools, what has been made of their efforts.  Within
-the system, however, AM has provided what are called electronic exhibits-
--such as introductions to time periods and materials--and these are
-intended to offer a student user a sense of what a broadside is  and what
-it might tell her or him.  But FREEMAN conceded that the project staff
-would have to talk with students next year, after teachers have had a
-summer to use the materials, and attempt to discover what the students
-were learning from the materials.  In addition, FREEMAN described
-supporting materials in print provided by AM at the request of local
-teachers during a meeting held at LC.  These included time lines,
-bibliographies, and other materials that could be reproduced on a
-photocopier in a classroom.  Teachers could walk away with and use these,
-and in this way gain a better understanding of the contents.  But again,
-reaching firm conclusions concerning the manner and extent of their use
-would have to wait until next year.
-
-As to the changes she saw occurring at the National Archives and Records
-Administration (NARA) as a result of the increasing emphasis on
-technology in scholarly research, MICHELSON stated that NARA at this
-point was absorbing the report by her and Jeff Rothenberg addressing
-strategies for the archival profession in general, although not for the
-National Archives specifically.  NARA is just beginning to establish its
-role and what it can do.  In terms of changes and initiatives that NARA
-can take, no clear response could be given at this time.
-
-GREENFIELD remarked two trends mentioned in the session.  Reflecting on
-DALY's opening comments on how he could have used a Latin collection of
-text in an electronic form, he said that at first he thought most scholars
-would be unwilling to do that.  But as he thought of that in terms of the
-original meaning of research--that is, having already mastered these texts,
-researching them for critical and comparative purposes--for the first time,
-the electronic format made a lot of sense.  GREENFIELD could envision
-growing numbers of scholars learning the new technologies for that very
-aspect of their scholarship and for convenience's sake.
-
-Listening to VECCIA and FREEMAN, GREENFIELD thought of an additional
-application of electronic texts.  He realized that AM could be used as a
-guide to lead someone to original sources.  Students cannot be expected
-to have mastered these sources, things they have never known about
-before.  Thus, AM is leading them, in theory, to a vast body of
-information and giving them a superficial overview of it, enabling them
-to select parts of it.  GREENFIELD asked if any evidence exists that this
-resource will indeed teach the new user, the K-12 students, how to do
-research.  Scholars already know how to do research and are applying
-these new tools.  But he wondered why students would go beyond picking
-out things that were most exciting to them.
-
-FREEMAN conceded the correctness of GREENFIELD's observation as applied
-to a school environment.  The risk is that a student would sit down at a
-system, play with it, find some things of interest, and then walk away. 
-But in the relatively controlled situation of a school library, much will
-depend on the instructions a teacher or a librarian gives a student.  She
-viewed the situation not as one of fine-tuning research skills but of
-involving students at a personal level in understanding and researching
-things.  Given the guidance one can receive at school, it then becomes
-possible to teach elementary research skills to students, which in fact
-one particular librarian said she was teaching her fifth graders. 
-FREEMAN concluded that introducing the idea of following one's own path
-of inquiry, which is essentially what research entails, involves more
-than teaching specific skills.  To these comments VECCIA added the
-observation that the individual teacher and the use of a creative
-resource, rather than AM itself, seemed to make the key difference.
-Some schools and some teachers are making excellent use of the nature
-of critical thinking and teaching skills, she said.
-
-Concurring with these remarks, DALY closed the session with the thought that
-the more that producers produced for teachers and for scholars to use with
-their students, the more successful their electronic products would prove.
-
-                                 ******
-
-SESSION II.  SHOW AND TELL
-
-Jacqueline HESS, director, National Demonstration Laboratory, served as
-moderator of the "show-and-tell" session.  She noted that a
-question-and-answer period would follow each presentation.
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-MYLONAS * Overview and content of Perseus * Perseus' primary materials
-exist in a system-independent, archival form * A concession * Textual
-aspects of Perseus * Tools to use with the Greek text * Prepared indices
-and full-text searches in Perseus * English-Greek word search leads to
-close study of words and concepts * Navigating Perseus by tracing down
-indices * Using the iconography to perform research *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Elli MYLONAS, managing editor, Perseus Project, Harvard University, first
-gave an overview of Perseus, a large, collaborative effort based at
-Harvard University but with contributors and collaborators located at
-numerous universities and colleges in the United States (e.g., Bowdoin,
-Maryland, Pomona, Chicago, Virginia).  Funded primarily by the
-Annenberg/CPB Project, with additional funding from Apple, Harvard, and
-the Packard Humanities Institute, among others, Perseus is a multimedia,
-hypertextual database for teaching and research on classical Greek
-civilization, which was released in February 1992 in version 1.0 and
-distributed by Yale University Press.
-
-Consisting entirely of primary materials, Perseus includes ancient Greek
-texts and translations of those texts; catalog entries--that is, museum
-catalog entries, not library catalog entries--on vases, sites, coins,
-sculpture, and archaeological objects; maps; and a dictionary, among
-other sources.  The number of objects and the objects for which catalog
-entries exist are accompanied by thousands of color images, which
-constitute a major feature of the database.  Perseus contains
-approximately 30 megabytes of text, an amount that will double in
-subsequent versions.  In addition to these primary materials, the Perseus
-Project has been building tools for using them, making access and
-navigation easier, the goal being to build part of the electronic
-environment discussed earlier in the morning in which students or
-scholars can work with their sources.
-
-The demonstration of Perseus will show only a fraction of the real work
-that has gone into it, because the project had to face the dilemma of
-what to enter when putting something into machine-readable form:  should
-one aim for very high quality or make concessions in order to get the
-material in?  Since Perseus decided to opt for very high quality, all of
-its primary materials exist in a system-independent--insofar as it is
-possible to be system-independent--archival form.  Deciding what that
-archival form would be and attaining it required much work and thought. 
-For example, all the texts are marked up in SGML, which will be made
-compatible with the guidelines of the Text Encoding Initiative (TEI) when
-they are issued.
-
-Drawings are postscript files, not meeting international standards, but
-at least designed to go across platforms.  Images, or rather the real
-archival forms, consist of the best available slides, which are being
-digitized.  Much of the catalog material exists in database form--a form
-that the average user could use, manipulate, and display on a personal
-computer, but only at great cost.  Thus, this is where the concession
-comes in:  All of this rich, well-marked-up information is stripped of
-much of its content; the images are converted into bit-maps and the text
-into small formatted chunks.  All this information can then be imported
-into HyperCard and run on a mid-range Macintosh, which is what Perseus
-users have.  This fact has made it possible for Perseus to attain wide
-use fairly rapidly.  Without those archival forms the HyperCard version
-being demonstrated could not be made easily, and the project could not
-have the potential to move to other forms and machines and software as
-they appear, none of which information is in Perseus on the CD.
-
-Of the numerous multimedia aspects of Perseus, MYLONAS focused on the
-textual.  Part of what makes Perseus such a pleasure to use, MYLONAS
-said, is this effort at seamless integration and the ability to move
-around both visual and textual material.  Perseus also made the decision
-not to attempt to interpret its material any more than one interprets by
-selecting.  But, MYLONAS emphasized, Perseus is not courseware:  No
-syllabus exists.  There is no effort to define how one teaches a topic
-using Perseus, although the project may eventually collect papers by
-people who have used it to teach.  Rather, Perseus aims to provide
-primary material in a kind of electronic library, an electronic sandbox,
-so to say, in which students and scholars who are working on this
-material can explore by themselves.  With that, MYLONAS demonstrated
-Perseus, beginning with the Perseus gateway, the first thing one sees
-upon opening Perseus--an effort in part to solve the contextualizing
-problem--which tells the user what the system contains.
-
-MYLONAS demonstrated only a very small portion, beginning with primary
-texts and running off the CD-ROM.  Having selected Aeschylus' Prometheus
-Bound, which was viewable in Greek and English pretty much in the same
-segments together, MYLONAS demonstrated tools to use with the Greek text,
-something not possible with a book:  looking up the dictionary entry form
-of an unfamiliar word in Greek after subjecting it to Perseus'
-morphological analysis for all the texts.  After finding out about a
-word, a user may then decide to see if it is used anywhere else in Greek. 
-Because vast amounts of indexing support all of the primary material, one
-can find out where else all forms of a particular Greek word appear--
-often not a trivial matter because Greek is highly inflected.  Further,
-since the story of Prometheus has to do with the origins of sacrifice, a
-user may wish to study and explore sacrifice in Greek literature; by
-typing sacrifice into a small window, a user goes to the English-Greek
-word list--something one cannot do without the computer (Perseus has
-indexed the definitions of its dictionary)--the string sacrifice appears
-in the definitions of these sixty-five words.  One may then find out
-where any of those words is used in the work(s) of a particular author. 
-The English definitions are not lemmatized.
-
-All of the indices driving this kind of usage were originally devised for
-speed, MYLONAS observed; in other words, all that kind of information--
-all forms of all words, where they exist, the dictionary form they belong
-to--were collected into databases, which will expedite searching.  Then
-it was discovered that one can do things searching in these databases
-that could not be done searching in the full texts.  Thus, although there
-are full-text searches in Perseus, much of the work is done behind the
-scenes, using prepared indices.  Re the indexing that is done behind the
-scenes, MYLONAS pointed out that without the SGML forms of the text, it
-could not be done effectively.  Much of this indexing is based on the
-structures that are made explicit by the SGML tagging.
-
-It was found that one of the things many of Perseus' non-Greek-reading
-users do is start from the dictionary and then move into the close study
-of words and concepts via this kind of English-Greek word search, by which
-means they might select a concept.  This exercise has been assigned to
-students in core courses at Harvard--to study a concept by looking for the
-English word in the dictionary, finding the Greek words, and then finding
-the words in the Greek but, of course, reading across in the English.
-That tells them a great deal about what a translation means as well.
-
-Should one also wish to see images that have to do with sacrifice, that
-person would go to the object key word search, which allows one to
-perform a similar kind of index retrieval on the database of
-archaeological objects.  Without words, pictures are useless; Perseus has
-not reached the point where it can do much with images that are not
-cataloged.  Thus, although it is possible in Perseus with text and images
-to navigate by knowing where one wants to end up--for example, a
-red-figure vase from the Boston Museum of Fine Arts--one can perform this
-kind of navigation very easily by tracing down indices.  MYLONAS
-illustrated several generic scenes of sacrifice on vases.  The features
-demonstrated derived from Perseus 1.0; version 2.0 will implement even
-better means of retrieval.
-
-MYLONAS closed by looking at one of the pictures and noting again that
-one can do a great deal of research using the iconography as well as the
-texts.  For instance, students in a core course at Harvard this year were
-highly interested in Greek concepts of foreigners and representations of
-non-Greeks.  So they performed a great deal of research, both with texts
-(e.g., Herodotus) and with iconography on vases and coins, on how the
-Greeks portrayed non-Greeks.  At the same time, art historians who study
-iconography were also interested, and were able to use this material.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Indexing and searchability of all English words in Perseus *
-Several features of Perseus 1.0 * Several levels of customization
-possible * Perseus used for general education * Perseus' effects on
-education * Contextual information in Perseus * Main challenge and
-emphasis of Perseus *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Several points emerged in the discussion that followed MYLONAS's presentation.
-
-Although MYLONAS had not demonstrated Perseus' ability to cross-search
-documents, she confirmed that all English words in Perseus are indexed
-and can be searched.  So, for example, sacrifice could have been searched
-in all texts, the historical essay, and all the catalogue entries with
-their descriptions--in short, in all of Perseus.
-
-Boolean logic is not in Perseus 1.0 but will be added to the next
-version, although an effort is being made not to restrict Perseus to a
-database in which one just performs searching, Boolean or otherwise.  It
-is possible to move laterally through the documents by selecting a word
-one is interested in and selecting an area of information one is
-interested in and trying to look that word up in that area.
-
-Since Perseus was developed in HyperCard, several levels of customization
-are possible.  Simple authoring tools exist that allow one to create
-annotated paths through the information, which are useful for note-taking
-and for guided tours for teaching purposes and for expository writing. 
-With a little more ingenuity it is possible to begin to add or substitute
-material in Perseus.
-
-Perseus has not been used so much for classics education as for general
-education, where it seemed to have an impact on the students in the core
-course at Harvard (a general required course that students must take in
-certain areas).  Students were able to use primary material much more.
-
-The Perseus Project has an evaluation team at the University of Maryland
-that has been documenting Perseus' effects on education.  Perseus is very
-popular, and anecdotal evidence indicates that it is having an effect at
-places other than Harvard, for example, test sites at Ball State
-University, Drury College, and numerous small places where opportunities
-to use vast amounts of primary data may not exist.  One documented effect
-is that archaeological, anthropological, and philological research is
-being done by the same person instead of by three different people.
-
-The contextual information in Perseus includes an overview essay, a
-fairly linear historical essay on the fifth century B.C. that provides
-links into the primary material (e.g., Herodotus, Thucydides, and
-Plutarch), via small gray underscoring (on the screen) of linked
-passages.  These are handmade links into other material.
-
-To different extents, most of the production work was done at Harvard,
-where the people and the equipment are located.  Much of the
-collaborative activity involved data collection and structuring, because
-the main challenge and the emphasis of Perseus is the gathering of
-primary material, that is, building a useful environment for studying
-classical Greece, collecting data, and making it useful. 
-Systems-building is definitely not the main concern.  Thus, much of the
-work has involved writing essays, collecting information, rewriting it,
-and tagging it.  That can be done off site.  The creative link for the
-overview essay as well as for both systems and data was collaborative,
-and was forged via E-mail and paper mail with professors at Pomona and
-Bowdoin.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-CALALUCA * PLD's principal focus and contribution to scholarship *
-Various questions preparatory to beginning the project * Basis for
-project * Basic rule in converting PLD * Concerning the images in PLD *
-Running PLD under a variety of retrieval software * Encoding the
-database a hard-fought issue * Various features demonstrated * Importance
-of user documentation * Limitations of the CD-ROM version *   
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Eric CALALUCA, vice president, Chadwyck-Healey, Inc., demonstrated a
-software interpretation of the Patrologia Latina Database (PLD).  PLD's
-principal focus from the beginning of the project about three-and-a-half
-years ago was on converting Migne's Latin series, and in the end,
-CALALUCA suggested, conversion of the text will be the major contribution
-to scholarship.  CALALUCA stressed that, as possibly the only private
-publishing organization at the Workshop, Chadwyck-Healey had sought no
-federal funds or national foundation support before embarking upon the
-project, but instead had relied upon a great deal of homework and
-marketing to accomplish the task of conversion.
-
-Ever since the possibilities of computer-searching have emerged, scholars
-in the field of late ancient and early medieval studies (philosophers,
-theologians, classicists, and those studying the history of natural law
-and the history of the legal development of Western civilization) have
-been longing for a fully searchable version of Western literature, for
-example, all the texts of Augustine and Bernard of Clairvaux and
-Boethius, not to mention all the secondary and tertiary authors.
-
-Various questions arose, CALALUCA said.  Should one convert Migne? 
-Should the database be encoded?  Is it necessary to do that?  How should
-it be delivered?  What about CD-ROM?  Since this is a transitional
-medium, why even bother to create software to run on a CD-ROM?  Since
-everybody knows people will be networking information, why go to the
-trouble--which is far greater with CD-ROM than with the production of
-magnetic data?  Finally, how does one make the data available?  Can many
-of the hurdles to using electronic information that some publishers have
-imposed upon databases be eliminated?
-
-The PLD project was based on the principle that computer-searching of
-texts is most effective when it is done with a large database.  Because
-PLD represented a collection that serves so many disciplines across so
-many periods, it was irresistible.
-
-The basic rule in converting PLD was to do no harm, to avoid the sins of
-intrusion in such a database:  no introduction of newer editions, no
-on-the-spot changes, no eradicating of all possible falsehoods from an
-edition.  Thus, PLD is not the final act in electronic publishing for
-this discipline, but simply the beginning.  The conversion of PLD has
-evoked numerous unanticipated questions:  How will information be used? 
-What about networking?  Can the rights of a database be protected? 
-Should one protect the rights of a database?  How can it be made
-available?
-
-Those converting PLD also tried to avoid the sins of omission, that is,
-excluding portions of the collections or whole sections.  What about the
-images?  PLD is full of images, some are extremely pious
-nineteenth-century representations of the Fathers, while others contain
-highly interesting elements.  The goal was to cover all the text of Migne
-(including notes, in Greek and in Hebrew, the latter of which, in
-particular, causes problems in creating a search structure), all the
-indices, and even the images, which are being scanned in separately
-searchable files.
-
-Several North American institutions that have placed acquisition requests
-for the PLD database have requested it in magnetic form without software,
-which means they are already running it without software, without
-anything demonstrated at the Workshop.
-
-What cannot practically be done is go back and reconvert and re-encode
-data, a time-consuming and extremely costly enterprise.  CALALUCA sees
-PLD as a database that can, and should, be run under a variety of
-retrieval software.  This will permit the widest possible searches. 
-Consequently, the need to produce a CD-ROM of PLD, as well as to develop
-software that could handle some 1.3 gigabyte of heavily encoded text,
-developed out of conversations with collection development and reference
-librarians who wanted software both compassionate enough for the
-pedestrian but also capable of incorporating the most detailed
-lexicographical studies that a user desires to conduct.  In the end, the
-encoding and conversion of the data will prove the most enduring
-testament to the value of the project.
-
-The encoding of the database was also a hard-fought issue:  Did the
-database need to be encoded? Were there normative structures for encoding
-humanist texts?  Should it be SGML?  What about the TEI--will it last,
-will it prove useful?  CALALUCA expressed some minor doubts as to whether
-a data bank can be fully TEI-conformant.  Every effort can be made, but
-in the end to be TEI-conformant means to accept the need to make some
-firm encoding decisions that can, indeed, be disputed.  The TEI points
-the publisher in a proper direction but does not presume to make all the
-decisions for him or her.  Essentially, the goal of encoding was to
-eliminate, as much as possible, the hindrances to information-networking,
-so that if an institution acquires a database, everybody associated with
-the institution can have access to it.
-
-CALALUCA demonstrated a portion of Volume 160, because it had the most
-anomalies in it.  The software was created by Electronic Book
-Technologies of Providence, RI, and is called Dynatext.  The software
-works only with SGML-coded data.
-
-Viewing a table of contents on the screen, the audience saw how Dynatext
-treats each element as a book and attempts to simplify movement through a
-volume.  Familiarity with the Patrologia in print (i.e., the text, its
-source, and the editions) will make the machine-readable versions highly
-useful.  (Software with a Windows application was sought for PLD,
-CALALUCA said, because this was the main trend for scholarly use.)
-
-CALALUCA also demonstrated how a user can perform a variety of searches
-and quickly move to any part of a volume; the look-up screen provides
-some basic, simple word-searching. 
-
-CALALUCA argued that one of the major difficulties is not the software. 
-Rather, in creating a product that will be used by scholars representing
-a broad spectrum of computer sophistication,  user documentation proves
-to be the most important service one can provide.
-
-CALALUCA next illustrated a truncated search under mysterium within ten
-words of virtus and how one would be able to find its contents throughout
-the entire database.  He said that the exciting thing about PLD is that
-many of the applications in the retrieval software being written for it
-will exceed the capabilities of the software employed now for the CD-ROM
-version.  The CD-ROM faces genuine limitations, in terms of speed and
-comprehensiveness, in the creation of a retrieval software to run it. 
-CALALUCA said he hoped that individual scholars will download the data,
-if they wish, to their personal computers, and have ready access to
-important texts on a constant basis, which they will be able to use in
-their research and from which they might even be able to publish.
-
-(CALALUCA explained that the blue numbers represented Migne's column numbers,
-which are the standard scholarly references.  Pulling up a note, he stated
-that these texts were heavily edited and the image files would appear simply
-as a note as well, so that one could quickly access an image.)
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-FLEISCHHAUER/ERWAY * Several problems with which AM is still wrestling *
-Various search and retrieval capabilities * Illustration of automatic
-stemming and a truncated search * AM's attempt to find ways to connect
-cataloging to the texts * AM's gravitation towards SGML * Striking a
-balance between quantity and quality * How AM furnishes users recourse to
-images * Conducting a search in a full-text environment * Macintosh and
-IBM prototypes of AM * Multimedia aspects of AM *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-A demonstration of American Memory by its coordinator, Carl FLEISCHHAUER,
-and Ricky ERWAY, associate coordinator, Library of Congress, concluded
-the morning session.  Beginning with a collection of broadsides from the
-Continental Congress and the Constitutional Convention, the only text
-collection in a presentable form at the time of the Workshop, FLEISCHHAUER
-highlighted several of the problems with which AM is still wrestling.
-(In its final form, the disk will contain two collections, not only the
-broadsides but also the full text with illustrations of a set of
-approximately 300 African-American pamphlets from the period 1870 to 1910.)
-
-As FREEMAN had explained earlier, AM has attempted to use a small amount
-of interpretation to introduce collections.  In the present case, the
-contractor, a company named Quick Source, in Silver Spring, MD., used
-software called Toolbook and put together a modestly interactive
-introduction to the collection.  Like the two preceding speakers,
-FLEISCHHAUER argued that the real asset was the underlying collection.
-
-FLEISCHHAUER proceeded to describe various search and retrieval
-capabilities while ERWAY worked the computer.  In this particular package
-the "go to" pull-down allowed the user in effect to jump out of Toolbook,
-where the interactive program was located, and enter the third-party
-software used by AM for this text collection, which is called Personal
-Librarian.  This was the Windows version of Personal Librarian, a
-software application put together by a company in Rockville, Md.
-
-Since the broadsides came from the Revolutionary War period, a search was
-conducted using the words British or war, with the default operator reset
-as or.  FLEISCHHAUER demonstrated both automatic stemming (which finds
-other forms of the same root) and a truncated search.  One of Personal
-Librarian's strongest features, the relevance ranking, was represented by
-a chart that indicated how often words being sought appeared in
-documents, with the one receiving the most "hits" obtaining the highest
-score.  The "hit list" that is supplied takes the relevance ranking into
-account, making the first hit, in effect, the one the software has
-selected as the most relevant example.
-
-While in the text of one of the broadside documents, FLEISCHHAUER
-remarked AM's attempt to find ways to connect cataloging to the texts,
-which it does in different ways in different manifestations.  In the case
-shown, the cataloging was pasted on:  AM took MARC records that were
-written as on-line records right into one of the Library's mainframe
-retrieval programs, pulled them out, and handed them off to the contractor,
-who massaged them somewhat to display them in the manner shown.  One of
-AM's questions is, Does the cataloguing normally performed in the mainframe
-work in this context, or had AM ought to think through adjustments?
-
-FLEISCHHAUER made the additional point that, as far as the text goes, AM
-has gravitated towards SGML (he pointed to the boldface in the upper part
-of the screen).  Although extremely limited in its ability to translate
-or interpret SGML, Personal Librarian will furnish both bold and italics
-on screen; a fairly easy thing to do, but it is one of the ways in which
-SGML is useful.
-
-Striking a balance between quantity and quality has been a major concern
-of AM, with accuracy being one of the places where project staff have
-felt that less than 100-percent accuracy was not unacceptable. 
-FLEISCHHAUER cited the example of the standard of the rekeying industry,
-namely 99.95 percent; as one service bureau informed him, to go from
-99.95 to 100 percent would double the cost.
-
-FLEISCHHAUER next demonstrated how AM furnishes users recourse to images,
-and at the same time recalled LESK's pointed question concerning the
-number of people who would look at those images and the number who would
-work only with the text.  If the implication of LESK's question was
-sound, FLEISCHHAUER said, it raised the stakes for text accuracy and
-reduced the value of the strategy for images.
-
-Contending that preservation is always a bugaboo, FLEISCHHAUER
-demonstrated several images derived from a scan of a preservation
-microfilm that AM had made.  He awarded a grade of C at best, perhaps a
-C minus or a C plus, for how well it worked out.  Indeed, the matter of
-learning if other people had better ideas about scanning in general, and,
-in particular, scanning from microfilm, was one of the factors that drove
-AM to attempt to think through the agenda for the Workshop.  Skew, for
-example, was one of the issues that AM in its ignorance had not reckoned
-would prove so difficult.
-
-Further, the handling of images of the sort shown, in a desktop computer
-environment, involved a considerable amount of zooming and scrolling. 
-Ultimately, AM staff feel that perhaps the paper copy that is printed out
-might be the most useful one, but they remain uncertain as to how much
-on-screen reading users will do.
-
-Returning to the text, FLEISCHHAUER asked viewers to imagine a person who
-might be conducting a search in a full-text environment.  With this
-scenario, he proceeded to illustrate other features of Personal Librarian
-that he considered helpful; for example, it provides the ability to
-notice words as one reads.  Clicking the "include" button on the bottom
-of the search window pops the words that have been highlighted into the
-search.  Thus, a user can refine the search as he or she reads,
-re-executing the search and continuing to find things in the quest for
-materials.  This software not only contains relevance ranking, Boolean
-operators, and truncation, it also permits one to perform word algebra,
-so to say, where one puts two or three words in parentheses and links
-them with one Boolean operator and then a couple of words in another set
-of parentheses and asks for things within so many words of others.
-
-Until they became acquainted recently with some of the work being done in
-classics, the AM staff had not realized that a large number of the
-projects that involve electronic texts were being done by people with a
-profound interest in language and linguistics.  Their search strategies
-and thinking are oriented to those fields, as is shown in particular by
-the Perseus example.  As amateur historians, the AM staff were thinking
-more of searching for concepts and ideas than for particular words. 
-Obviously, FLEISCHHAUER conceded, searching for concepts and ideas and
-searching for words may be two rather closely related things.
-
-While displaying several images, FLEISCHHAUER observed that the Macintosh
-prototype built by AM contains a greater diversity of formats.  Echoing a
-previous speaker, he said that it was easier to stitch things together in
-the Macintosh, though it tended to be a little more anemic in search and
-retrieval.  AM, therefore, increasingly has been investigating
-sophisticated retrieval engines in the IBM format.
-
-FLEISCHHAUER demonstrated several additional examples of the prototype
-interfaces:  One was AM's metaphor for the network future, in which a
-kind of reading-room graphic suggests how one would be able to go around
-to different materials.  AM contains a large number of photographs in
-analog video form worked up from a videodisc, which enable users to make
-copies to print or incorporate in digital documents.  A frame-grabber is
-built into the system, making it possible to bring an image into a window
-and digitize or print it out.
-
-FLEISCHHAUER next demonstrated sound recording, which included texts. 
-Recycled from a previous project, the collection included sixty 78-rpm
-phonograph records of political speeches that were made during and
-immediately after World War I.  These constituted approximately three
-hours of audio, as AM has digitized it, which occupy 150 megabytes on a
-CD.  Thus, they are considerably compressed.  From the catalogue card,
-FLEISCHHAUER proceeded to a transcript of a speech with the audio
-available and with highlighted text following it as it played.
-A photograph has been added and a transcription made.
-
-Considerable value has been added beyond what the Library of Congress
-normally would do in cataloguing a sound recording, which raises several
-questions for AM concerning where to draw lines about how much value it can
-afford to add and at what point, perhaps, this becomes more than AM could
-reasonably do or reasonably wish to do.  FLEISCHHAUER also demonstrated
-a motion picture.  As FREEMAN had reported earlier, the motion picture
-materials have proved the most popular, not surprisingly.  This says more
-about the medium, he thought, than about AM's presentation of it.
-
-Because AM's goal was to bring together things that could be used by
-historians or by people who were curious about history,
-turn-of-the-century footage seemed to represent the most appropriate
-collections from the Library of Congress in motion pictures. These were
-the very first films made by Thomas Edison's company and some others at
-that time.  The particular example illustrated was a Biograph film,
-brought in with a frame-grabber into a window.  A single videodisc
-contains about fifty titles and pieces of film from that period, all of
-New York City.  Taken together, AM believes, they provide an interesting
-documentary resource.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Using the frame-grabber in AM * Volume of material processed
-and to be processed * Purpose of AM within LC * Cataloguing and the
-nature of AM's material * SGML coding and the question of quality versus
-quantity *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the question-and-answer period that followed FLEISCHHAUER's
-presentation, several clarifications were made.
-
-AM is bringing in motion pictures from a videodisc.  The frame-grabber
-devices create a window on a computer screen, which permits users to
-digitize a single frame of the movie or one of the photographs.  It
-produces a crude, rough-and-ready image that high school students can
-incorporate into papers, and that has worked very nicely in this way.
-
-Commenting on FLEISCHHAUER's assertion that AM was looking more at
-searching ideas than words, MYLONAS argued that without words an idea
-does not exist.  FLEISCHHAUER conceded that he ought to have articulated
-his point more clearly.  MYLONAS stated that they were in fact both
-talking about the same thing.  By searching for words and by forcing
-people to focus on the word, the Perseus Project felt that they would get
-them to the idea.  The way one reviews results is tailored more to one
-kind of user than another.
-
-Concerning the total volume of material that has been processed in this
-way, AM at this point has in retrievable form seven or eight collections,
-all of them photographic.  In the Macintosh environment, for example,
-there probably are 35,000-40,000 photographs.  The sound recordings
-number sixty items.  The broadsides number about 300 items.  There are
-500 political cartoons in the form of drawings.  The motion pictures, as
-individual items, number sixty to seventy.
-
-AM also has a manuscript collection, the life history portion of one of
-the federal project series, which will contain 2,900 individual
-documents, all first-person narratives.  AM has in process about 350
-African-American pamphlets, or about 12,000 printed pages for the period
-1870-1910.  Also in the works are some 4,000 panoramic photographs.  AM
-has recycled a fair amount of the work done by LC's Prints and
-Photographs Division during the Library's optical disk pilot project in
-the 1980s.  For example, a special division of LC has tooled up and
-thought through all the ramifications of electronic presentation of
-photographs.  Indeed, they are wheeling them out in great barrel loads. 
-The purpose of AM within the Library, it is hoped, is to catalyze several
-of the other special collection divisions which have no particular
-experience with, in some cases, mixed feelings about, an activity such as
-AM.  Moreover, in many cases the divisions may be characterized as not
-only lacking experience in "electronifying" things but also in automated
-cataloguing.  MARC cataloguing as practiced in the United States is
-heavily weighted toward the description of monograph and serial
-materials, but is much thinner when one enters the world of manuscripts
-and things that are held in the Library's music collection and other
-units.  In response to a comment by LESK, that AM's material is very
-heavily photographic, and is so primarily because individual records have
-been made for each photograph, FLEISCHHAUER observed that an item-level
-catalog record exists, for example, for each photograph in the Detroit
-Publishing collection of 25,000 pictures.  In the case of the Federal
-Writers Project, for which nearly 3,000 documents exist, representing
-information from twenty-six different states, AM with the assistance of
-Karen STUART of the Manuscript Division will attempt to find some way not
-only to have a collection-level record but perhaps a MARC record for each
-state, which will then serve as an umbrella for the 100-200 documents
-that come under it.  But that drama remains to be enacted.  The AM staff
-is conservative and clings to cataloguing, though of course visitors tout
-artificial intelligence and neural networks in a manner that suggests that
-perhaps one need not have cataloguing or that much of it could be put aside.
-
-The matter of SGML coding, FLEISCHHAUER conceded, returned the discussion
-to the earlier treated question of quality versus quantity in the Library
-of Congress.  Of course, text conversion can be done with 100-percent
-accuracy, but it means that when one's holdings are as vast as LC's only
-a tiny amount will be exposed, whereas permitting lower levels of
-accuracy can lead to exposing or sharing larger amounts, but with the
-quality correspondingly impaired.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-TWOHIG * A contrary experience concerning electronic options * Volume of
-material in the Washington papers and a suggestion of David Packard *
-Implications of Packard's suggestion * Transcribing the documents for the
-CD-ROM * Accuracy of transcriptions * The CD-ROM edition of the Founding
-Fathers documents *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Finding encouragement in a comment of MICHELSON's from the morning
-session--that numerous people in the humanities were choosing electronic
-options to do their work--Dorothy TWOHIG, editor, The Papers of George
-Washington, opened her illustrated talk by noting that her experience
-with literary scholars and numerous people in editing was contrary to
-MICHELSON's.  TWOHIG emphasized literary scholars' complete ignorance of
-the technological options available to them or their reluctance or, in
-some cases, their downright hostility toward these options.
-
-After providing an overview of the five Founding Fathers projects
-(Jefferson at Princeton, Franklin at Yale, John Adams at the
-Massachusetts Historical Society, and Madison down the hall from her at
-the University of Virginia), TWOHIG observed that the Washington papers,
-like all of the projects, include both sides of the Washington
-correspondence and deal with some 135,000 documents to be published with
-extensive annotation in eighty to eighty-five volumes, a project that
-will not be completed until well into the next century.  Thus, it was
-with considerable enthusiasm several years ago that the Washington Papers
-Project (WPP) greeted David Packard's suggestion that the papers of the
-Founding Fathers could be published easily and inexpensively, and to the
-great benefit of American scholarship, via CD-ROM.
-
-In pragmatic terms, funding from the Packard Foundation would expedite
-the transcription of thousands of documents waiting to be put on disk in
-the WPP offices.  Further, since the costs of collecting, editing, and
-converting the Founding Fathers documents into letterpress editions were
-running into the millions of dollars, and the considerable staffs
-involved in all of these projects were devoting their careers to
-producing the work, the Packard Foundation's suggestion had a
-revolutionary aspect:  Transcriptions of the entire corpus of the
-Founding Fathers papers would be available on CD-ROM to public and
-college libraries, even high schools, at a fraction of the cost--
-$100-$150 for the annual license fee--to produce a limited university
-press run of 1,000 of each volume of the published papers at $45-$150 per
-printed volume.  Given the current budget crunch in educational systems
-and the corresponding constraints on librarians in smaller institutions
-who wish to add these volumes to their collections, producing the
-documents on CD-ROM would likely open a greatly expanded audience for the
-papers.  TWOHIG stressed, however, that development of the Founding
-Fathers CD-ROM is still in its infancy.  Serious software problems remain
-to be resolved before the material can be put into readable form.  
-
-Funding from the Packard Foundation resulted in a major push to
-transcribe the 75,000 or so documents of the Washington papers remaining
-to be transcribed onto computer disks.  Slides illustrated several of the
-problems encountered, for example, the present inability of CD-ROM to
-indicate the cross-outs (deleted material) in eighteenth century
-documents.  TWOHIG next described documents from various periods in the
-eighteenth century that have been transcribed in chronological order and
-delivered to the Packard offices in California, where they are converted
-to the CD-ROM, a process that is expected to consume five years to
-complete (that is, reckoning from David Packard's suggestion made several
-years ago, until about July 1994).  TWOHIG found an encouraging
-indication of the project's benefits in the ongoing use made by scholars
-of the search functions of the CD-ROM, particularly in reducing the time
-spent in manually turning the pages of the Washington papers.
-
-TWOHIG next furnished details concerning the accuracy of transcriptions. 
-For instance, the insertion of thousands of documents on the CD-ROM
-currently does not permit each document to be verified against the
-original manuscript several times as in the case of documents that appear
-in the published edition.  However, the transcriptions receive a cursory
-check for obvious typos, the misspellings of proper names, and other
-errors from the WPP CD-ROM editor.  Eventually, all documents that appear
-in the electronic version will be checked by project editors.  Although
-this process has met with opposition from some of the editors on the
-grounds that imperfect work may leave their offices, the advantages in
-making this material available as a research tool outweigh  fears about the
-misspelling of proper names and other relatively minor editorial matters.
-
-Completion of all five Founding Fathers projects (i.e., retrievability
-and searchability of all of the documents by proper names, alternate
-spellings, or varieties of subjects) will provide one of the richest
-sources of this size for the history of the United States in the latter
-part of the eighteenth century.  Further, publication on CD-ROM will
-allow editors to include even minutiae, such as laundry lists, not
-included in the printed volumes.
-
-It seems possible that the extensive annotation provided in the printed
-volumes eventually will be added to the CD-ROM edition, pending
-negotiations with the publishers of the papers.  At the moment, the
-Founding Fathers CD-ROM is accessible only on the IBYCUS, a computer
-developed out of the Thesaurus Linguae Graecae project and designed for
-the use of classical scholars.  There are perhaps 400 IBYCUS computers in
-the country, most of which are in university classics departments. 
-Ultimately, it is anticipated that the CD-ROM edition of the Founding
-Fathers documents will run on any IBM-compatible or Macintosh computer
-with a CD-ROM drive.  Numerous changes in the software will also occur
-before the project is completed.  (Editor's note: an IBYCUS was
-unavailable to demonstrate the CD-ROM.)
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Several additional features of WPP clarified *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Discussion following TWOHIG's presentation served to clarify several
-additional features, including (1) that the project's primary
-intellectual product consists in the electronic transcription of the
-material; (2) that the text transmitted to the CD-ROM people is not
-marked up; (3) that cataloging and subject-indexing of the material
-remain to be worked out (though at this point material can be retrieved
-by name); and (4) that because all the searching is done in the hardware,
-the IBYCUS is designed to read a CD-ROM which contains only sequential
-text files.  Technically, it then becomes very easy to read the material
-off and put it on another device.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-LEBRON * Overview of the history of the joint project between AAAS and
-OCLC * Several practices the on-line environment shares with traditional
-publishing on hard copy * Several technical and behavioral barriers to
-electronic publishing * How AAAS and OCLC arrived at the subject of
-clinical trials * Advantages of the electronic format and other features
-of OJCCT * An illustrated tour of the journal *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Maria LEBRON, managing editor, The Online Journal of Current Clinical
-Trials (OJCCT), presented an illustrated overview of the history of the
-joint project between the American Association for the Advancement of
-Science (AAAS) and the Online Computer Library Center, Inc. (OCLC).  The
-joint venture between AAAS and OCLC owes its beginning to a
-reorganization launched by the new chief executive officer at OCLC about
-three years ago and combines the strengths of these two disparate
-organizations.  In short, OJCCT represents the process of scholarly
-publishing on line.
-
-LEBRON next discussed several practices the on-line environment shares
-with traditional publishing on hard copy--for example, peer review of
-manuscripts--that are highly important in the academic world.  LEBRON
-noted in particular the implications of citation counts for tenure
-committees and grants committees.  In the traditional hard-copy
-environment, citation counts are readily demonstrable, whereas the
-on-line environment represents an ethereal medium to most academics.
-
-LEBRON remarked several technical and behavioral barriers to electronic
-publishing, for instance, the problems in transmission created by special
-characters or by complex graphics and halftones.  In addition, she noted
-economic limitations such as the storage costs of maintaining back issues
-and market or audience education.
-
-Manuscripts cannot be uploaded to OJCCT, LEBRON explained, because it is
-not a bulletin board or E-mail, forms of electronic transmission of
-information that have created an ambience clouding people's understanding
-of what the journal is attempting to do.  OJCCT, which publishes
-peer-reviewed medical articles dealing with the subject of clinical
-trials, includes text, tabular material, and graphics, although at this
-time it can transmit only line illustrations.
-
-Next, LEBRON described how AAAS and OCLC arrived at the subject of
-clinical trials:  It is 1) a highly statistical discipline that 2) does
-not require halftones but can satisfy the needs of its audience with line
-illustrations and graphic material, and 3) there is a need for the speedy
-dissemination of high-quality research results.  Clinical trials are
-research activities that involve the administration of a test treatment
-to some experimental unit in order to test its usefulness before it is
-made available to the general population.  LEBRON proceeded to give
-additional information on OJCCT concerning its editor-in-chief, editorial
-board, editorial content, and the types of articles it publishes
-(including peer-reviewed research reports and reviews), as well as
-features shared by other traditional hard-copy journals.
-
-Among the advantages of the electronic format are faster dissemination of
-information, including raw data, and the absence of space constraints
-because pages do not exist.  (This latter fact creates an interesting
-situation when it comes to citations.)  Nor are there any issues.  AAAS's
-capacity to download materials directly from the journal to a
-subscriber's printer, hard drive, or floppy disk helps ensure highly
-accurate transcription.  Other features of OJCCT include on-screen alerts
-that allow linkage of subsequently published documents to the original
-documents; on-line searching by subject, author, title, etc.; indexing of
-every single word that appears in an article; viewing access to an
-article by component (abstract, full text, or graphs); numbered
-paragraphs to replace page counts; publication in Science every thirty
-days of indexing of all articles published in the journal;
-typeset-quality screens; and Hypertext links that enable subscribers to
-bring up Medline abstracts directly without leaving the journal.
-
-After detailing the two primary ways to gain access to the journal,
-through the OCLC network and Compuserv if one desires graphics or through
-the Internet if just an ASCII file is desired, LEBRON illustrated the
-speedy editorial process and the coding of the document using SGML tags
-after it has been accepted for publication.  She also gave an illustrated
-tour of the journal, its search-and-retrieval capabilities in particular,
-but also including problems associated with scanning in illustrations,
-and the importance of on-screen alerts to the medical profession re
-retractions or corrections, or more frequently, editorials, letters to
-the editors, or follow-up reports.  She closed by inviting the audience
-to join AAAS on 1 July, when OJCCT was scheduled to go on-line.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Additional features of OJCCT *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-In the lengthy discussion that followed LEBRON's presentation, these
-points emerged:
-
-     * The SGML text can be tailored as users wish.
-
-     * All these articles have a fairly simple document definition.
-
-     * Document-type definitions (DTDs) were developed and given to OJCCT
-     for coding.
-
-     * No articles will be removed from the journal.  (Because there are
-     no back issues, there are no lost issues either.  Once a subscriber
-     logs onto the journal he or she has access not only to the currently
-     published materials, but retrospectively to everything that has been
-     published in it.  Thus the table of contents grows bigger.  The date
-     of publication serves to distinguish between currently published
-     materials and older materials.)
-
-     * The pricing system for the journal resembles that for most medical
-     journals:  for 1992, $95 for a year, plus telecommunications charges
-     (there are no connect time charges);    for 1993, $110 for the
-     entire year for single users, though the journal can be put on a
-     local area network (LAN).  However, only one person can access the
-     journal at a time.  Site licenses may come in the future.
-
-     * AAAS is working closely with colleagues at OCLC to display
-     mathematical equations on screen.
-
-     * Without compromising any steps in the editorial process, the
-     technology has reduced the time lag between when a manuscript is
-     originally submitted and the time it is accepted; the review process
-     does not differ greatly from the standard six-to-eight weeks
-     employed by many of the hard-copy journals.  The process still
-     depends on people.
-
-     * As far as a preservation copy is concerned, articles will be
-     maintained on the computer permanently and subscribers, as part of
-     their subscription, will receive a microfiche-quality archival copy
-     of everything published during that year; in addition, reprints can
-     be purchased in much the same way as in a hard-copy environment. 
-     Hard copies are prepared but are not the primary medium for the
-     dissemination of the information.
-
-     * Because OJCCT is not yet on line, it is difficult to know how many
-     people would simply browse through the journal on the screen as
-     opposed to downloading the whole thing and printing it out; a mix of
-     both types of users likely will result.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-PERSONIUS * Developments in technology over the past decade * The CLASS
-Project * Advantages for technology and for the CLASS Project *
-Developing a network application an underlying assumption of the project
-* Details of the scanning process * Print-on-demand copies of books *
-Future plans include development of a browsing tool *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Lynne PERSONIUS, assistant director, Cornell Information Technologies for
-Scholarly Information Services, Cornell University, first commented on
-the tremendous impact that developments in technology over the past ten
-years--networking, in particular--have had on the way information is
-handled, and how, in her own case, these developments have counterbalanced
-Cornell's relative geographical isolation.  Other significant technologies
-include scanners, which are much more sophisticated than they were ten years
-ago; mass storage and the dramatic savings that result from it in terms of
-both space and money relative to twenty or thirty years ago; new and
-improved printing technologies, which have greatly affected the distribution
-of information; and, of course, digital technologies, whose applicability to
-library preservation remains at issue.
-
-Given that context, PERSONIUS described the College Library Access and
-Storage System (CLASS) Project, a library preservation project,
-primarily, and what has been accomplished.  Directly funded by the
-Commission on Preservation and Access and by the Xerox Corporation, which
-has provided a significant amount of hardware, the CLASS Project has been
-working with a development team at Xerox to develop a software
-application tailored to library preservation requirements.  Within
-Cornell, participants in the project have been working jointly with both
-library and information technologies.  The focus of the project has been
-on reformatting and saving books that are in brittle condition. 
-PERSONIUS showed Workshop participants a brittle book, and described how
-such books were the result of developments in papermaking around the
-beginning of the Industrial Revolution.  The papermaking process was
-changed so that a significant amount of acid was introduced into the
-actual paper itself, which deteriorates as it sits on library shelves.
-
-One of the advantages for technology and for the CLASS Project is that
-the information in brittle books is mostly out of copyright and thus
-offers an opportunity to work with material that requires library
-preservation, and to create and work on an infrastructure to save the
-material.  Acknowledging the familiarity of those working in preservation
-with this information, PERSONIUS noted that several things are being
-done:  the primary preservation technology used today is photocopying of
-brittle material.  Saving the intellectual content of the material is the
-main goal.  With microfilm copy, the intellectual content is preserved on
-the assumption that in the future the image can be reformatted in any
-other way that then exists.
-
-An underlying assumption of the CLASS Project from the beginning was
-that it would develop a network application.  Project staff scan books
-at a workstation located in the library, near the brittle material.
-An image-server filing system is located at a distance from that
-workstation, and a printer is located in another building.  All of the
-materials digitized and stored on the image-filing system are cataloged
-in the on-line catalogue.  In fact, a record for each of these electronic
-books is stored in the RLIN database so that a record exists of what is
-in the digital library throughout standard catalogue procedures.  In the
-future, researchers working from their own workstations in their offices,
-or their networks, will have access--wherever they might be--through a
-request server being built into the new digital library.  A second
-assumption is that the preferred means of finding the material will be by
-looking through a catalogue.  PERSONIUS described the scanning process,
-which uses a prototype scanner being developed by Xerox and which scans a
-very high resolution image at great speed.  Another significant feature,
-because this is a preservation application, is the placing of the pages
-that fall apart one for one on the platen.  Ordinarily, a scanner could
-be used with some sort of a document feeder, but because of this
-application that is not feasible.  Further, because CLASS is a
-preservation application, after the paper replacement is made there, a
-very careful quality control check is performed.  An original book is
-compared to the printed copy and verification is made, before proceeding,
-that all of the image, all of the information, has been captured.  Then,
-a new library book is produced:  The printed images are rebound by a
-commercial binder and a new book is returned to the shelf. 
-Significantly, the books returned to the library shelves are beautiful
-and useful replacements on acid-free paper that should last a long time,
-in effect, the equivalent of preservation photocopies.  Thus, the project
-has a library of digital books.  In essence, CLASS is scanning and
-storing books as 600 dot-per-inch bit-mapped images, compressed using
-Group 4 CCITT (i.e., the French acronym for International Consultative
-Committee for Telegraph and Telephone) compression.  They are stored as
-TIFF files on an optical filing system that is composed of a database
-used for searching and locating the books and an optical jukebox that
-stores 64 twelve-inch platters.  A very-high-resolution printed copy of
-these books at 600 dots per inch is created, using a Xerox DocuTech
-printer to make the paper replacements on acid-free paper.
-
-PERSONIUS maintained that the CLASS Project presents an opportunity to
-introduce people to books as digital images by using a paper medium. 
-Books are returned to the shelves while people are also given the ability
-to print on demand--to make their own copies of books.  (PERSONIUS
-distributed copies of an engineering journal published by engineering
-students at Cornell around 1900 as an example of what a print-on-demand
-copy of material might be like.  This very cheap copy would be available
-to people to use for their own research purposes and would bridge the gap
-between an electronic work and the paper that readers like to have.) 
-PERSONIUS then attempted to illustrate a very early prototype of
-networked access to this digital library.  Xerox Corporation has
-developed a prototype of a view station that can send images across the
-network to be viewed.
-
-The particular library brought down for demonstration contained two
-mathematics books.  CLASS is developing and will spend the next year
-developing an application that allows people at workstations to browse
-the books.  Thus, CLASS is developing a browsing tool, on the assumption
-that users do not want to read an entire book from a workstation, but
-would prefer to be able to look through and decide if they would like to
-have a printed copy of it.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Re retrieval software * "Digital file copyright" * Scanning
-rate during production * Autosegmentation * Criteria employed in
-selecting books for scanning * Compression and decompression of images *
-OCR not precluded *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the question-and-answer period that followed her presentation,
-PERSONIUS made these additional points:
-
-     * Re retrieval software, Cornell is developing a Unix-based server
-     as well as clients for the server that support multiple platforms
-     (Macintosh, IBM and Sun workstations), in the hope that people from
-     any of those platforms will retrieve books; a further operating
-     assumption is that standard interfaces will be used as much as
-     possible, where standards can be put in place, because CLASS
-     considers this retrieval software a library application and would
-     like to be able to look at material not only at Cornell but at other
-     institutions.
-
-     * The phrase "digital file copyright by Cornell University" was
-     added at the advice of Cornell's legal staff with the caveat that it
-     probably would not hold up in court.  Cornell does not want people
-     to copy its books and sell them but would like to keep them
-     available for use in a library environment for library purposes.
-
-     * In production the scanner can scan about 300 pages per hour,
-     capturing 600 dots per inch.
-
-     * The Xerox software has filters to scan halftone material and avoid
-     the moire patterns that occur when halftone material is scanned. 
-     Xerox has been working on hardware and software that would enable
-     the scanner itself to recognize this situation and deal with it
-     appropriately--a kind of autosegmentation that would enable the
-     scanner to handle halftone material as well as text on a single page.
-
-     * The books subjected to the elaborate process described above were
-     selected because CLASS is a preservation project, with the first 500
-     books selected coming from Cornell's mathematics collection, because
-     they were still being heavily used and because, although they were
-     in need of preservation, the mathematics library and the mathematics
-     faculty were uncomfortable having them microfilmed.  (They wanted a
-     printed copy.)  Thus, these books became a logical choice for this
-     project.  Other books were chosen by the project's selection committees
-     for experiments with the technology, as well as to meet a demand or need.
-
-     * Images will be decompressed before they are sent over the line; at
-     this time they are compressed and sent to the image filing system
-     and then sent to the printer as compressed images; they are returned
-     to the workstation as compressed 600-dpi images and the workstation
-     decompresses and scales them for display--an inefficient way to
-     access the material though it works quite well for printing and
-     other purposes.
-
-     * CLASS is also decompressing on Macintosh and IBM, a slow process
-     right now.  Eventually, compression and decompression will take
-     place on an image conversion server.  Trade-offs will be made, based
-     on future performance testing, concerning where the file is
-     compressed and what resolution image is sent.
-
-     * OCR has not been precluded; images are being stored that have been
-     scanned at a high resolution, which presumably would suit them well
-     to an OCR process.  Because the material being scanned is about 100
-     years old and was printed with less-than-ideal technologies, very
-     early and preliminary tests have not produced good results.  But the
-     project is capturing an image that is of sufficient resolution to be
-     subjected to OCR in the future.  Moreover, the system architecture
-     and the system plan have a logical place to store an OCR image if it
-     has been captured.  But that is not being done now.
-
-                                 ******
-
-SESSION III.  DISTRIBUTION, NETWORKS, AND NETWORKING:  OPTIONS FOR
-DISSEMINATION
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-ZICH * Issues pertaining to CD-ROMs * Options for publishing in CD-ROM *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Robert ZICH, special assistant to the associate librarian for special
-projects, Library of Congress, and moderator of this session, first noted
-the blessed but somewhat awkward circumstance of having four very
-distinguished people representing networks and networking or at least
-leaning in that direction, while lacking anyone to speak from the
-strongest possible background in CD-ROMs.  ZICH expressed the hope that
-members of the audience would join the discussion.  He stressed the
-subtitle of this particular session, "Options for Dissemination," and,
-concerning CD-ROMs, the importance of determining when it would be wise
-to consider dissemination in CD-ROM versus networks.  A shopping list of
-issues pertaining to CD-ROMs included:  the grounds for selecting
-commercial publishers, and in-house publication where possible versus
-nonprofit or government publication.  A similar list for networks
-included:  determining when one should consider dissemination through a
-network, identifying the mechanisms or entities that exist to place items
-on networks, identifying the pool of existing networks, determining how a
-producer  would choose between networks, and identifying the elements of
-a business arrangement in a network.
-
-Options for publishing in CD-ROM:  an outside publisher versus
-self-publication.  If an outside publisher is used, it can be nonprofit,
-such as the Government Printing Office (GPO) or the National Technical
-Information Service (NTIS), in the case of government.  The pros and cons
-associated with employing an outside publisher are obvious.  Among the
-pros, there is no trouble getting accepted.  One pays the bill and, in
-effect, goes one's way.  Among the cons, when one pays an outside
-publisher to perform the work, that publisher will perform the work it is
-obliged to do, but perhaps without the production expertise and skill in
-marketing and dissemination that some would seek.  There is the body of
-commercial publishers that do possess that kind of expertise in
-distribution and marketing but that obviously are selective.  In
-self-publication, one exercises full control, but then one must handle
-matters such as distribution and marketing.  Such are some of the options
-for publishing in the case of CD-ROM.
-
-In the case of technical and design issues, which are also important,
-there are many matters which many at the Workshop already knew a good
-deal about:  retrieval system requirements and costs, what to do about
-images, the various capabilities and platforms, the trade-offs between
-cost and performance, concerns about local-area networkability,
-interoperability, etc.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-LYNCH * Creating networked information is different from using networks
-as an access or dissemination vehicle * Networked multimedia on a large
-scale does not yet work * Typical CD-ROM publication model a two-edged
-sword * Publishing information on a CD-ROM in the present world of
-immature standards * Contrast between CD-ROM and network pricing *
-Examples demonstrated earlier in the day as a set of insular information
-gems * Paramount need to link databases * Layering to become increasingly
-necessary * Project NEEDS and the issues of information reuse and active
-versus passive use * X-Windows as a way of differentiating between
-network access and networked information * Barriers to the distribution
-of networked multimedia information * Need for good, real-time delivery
-protocols * The question of presentation integrity in client-server
-computing in the academic world * Recommendations for producing multimedia
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Clifford LYNCH, director, Library Automation, University of California,
-opened his talk with the general observation that networked information
-constituted a difficult and elusive topic because it is something just
-starting to develop and not yet fully understood.  LYNCH contended that
-creating genuinely networked information was different from using
-networks as an access or dissemination vehicle and was more sophisticated
-and more subtle.  He invited the members of the audience to extrapolate,
-from what they heard about the preceding demonstration projects, to what
-sort of a world of electronics information--scholarly, archival,
-cultural, etc.--they wished to end up with ten or fifteen years from now. 
-LYNCH suggested that to extrapolate directly from these projects would
-produce unpleasant results.
-
-Putting the issue of CD-ROM in perspective before getting into
-generalities on networked information, LYNCH observed that those engaged
-in multimedia today who wish to ship a product, so to say, probably do
-not have much choice except to use CD-ROM:  networked multimedia on a
-large scale basically does not yet work because the technology does not
-exist.  For example, anybody who has tried moving images around over the
-Internet knows that this is an exciting touch-and-go process, a
-fascinating and fertile area for experimentation, research, and
-development, but not something that one can become deeply enthusiastic
-about committing to production systems at this time.
-
-This situation will change, LYNCH said.  He differentiated CD-ROM from
-the practices that have been followed up to now in distributing data on
-CD-ROM.  For LYNCH the problem with CD-ROM is not its portability or its
-slowness but the two-edged sword of having the retrieval application and
-the user interface inextricably bound up with the data, which is the
-typical CD-ROM publication model.  It is not a case of publishing data
-but of distributing a typically stand-alone, typically closed system,
-all--software, user interface, and data--on a little disk.  Hence, all
-the between-disk navigational issues as well as the impossibility in most
-cases of integrating data on one disk with that on another.  Most CD-ROM
-retrieval software does not network very gracefully at present.  However,
-in the present world of immature standards and lack of understanding of
-what network information is or what the ground rules are for creating or
-using it, publishing information on a CD-ROM does add value in a very
-real sense.
-
-LYNCH drew a contrast between CD-ROM and network pricing and in doing so
-highlighted something bizarre in information pricing.  A large
-institution such as the University of California has vendors who will
-offer to sell information on CD-ROM for a price per year in four digits,
-but for the same data (e.g., an abstracting and indexing database) on
-magnetic tape, regardless of how many people may use it concurrently,
-will quote a price in six digits.
-
-What is packaged with the CD-ROM in one sense adds value--a complete
-access system, not just raw, unrefined information--although it is not
-generally perceived that way.  This is because the access software,
-although it adds value, is viewed by some people, particularly in the
-university environment where there is a very heavy commitment to
-networking, as being developed in the wrong direction.
-
-Given that context, LYNCH described the examples demonstrated as a set of
-insular information gems--Perseus, for example, offers nicely linked
-information, but would be very difficult to integrate with other
-databases, that is, to link together seamlessly with other source files
-from other sources.  It resembles an island, and in this respect is
-similar to numerous stand-alone projects that are based on videodiscs,
-that is, on the single-workstation concept.
-
-As scholarship evolves in a network environment, the paramount need will
-be to link databases.  We must link personal databases to public
-databases, to group databases, in fairly seamless ways--which is
-extremely difficult in the environments under discussion with copies of
-databases proliferating all over the place.
-
-The notion of layering also struck LYNCH as lurking in several of the
-projects demonstrated.  Several databases in a sense constitute
-information archives without a significant amount of navigation built in. 
-Educators, critics, and others will want a layered structure--one that
-defines or links paths through the layers to allow users to reach
-specific points.  In LYNCH's view, layering will become increasingly
-necessary, and not just within a single resource but across resources
-(e.g., tracing mythology and cultural themes across several classics
-databases as well as a database of Renaissance culture).  This ability to
-organize resources, to build things out of multiple other things on the
-network or select pieces of it, represented for LYNCH one of the key
-aspects of network information.
-
-Contending that information reuse constituted another significant issue,
-LYNCH commended to the audience's attention Project NEEDS (i.e., National
-Engineering Education Delivery System).  This project's objective is to
-produce a database of engineering courseware as well as the components
-that can be used to develop new courseware.  In a number of the existing
-applications, LYNCH said, the issue of reuse (how much one can take apart
-and reuse in other applications) was not being well considered.  He also
-raised the issue of active versus passive use, one aspect of which  is
-how much information will be manipulated locally by users.  Most people,
-he argued, may do a little browsing and then will wish to print.  LYNCH
-was uncertain how these resources would be used by the vast majority of
-users in the network environment.
-
-LYNCH next said a few words about X-Windows as a way of differentiating
-between network access and networked information.  A number of the
-applications demonstrated at the Workshop could be rewritten to use X
-across the network, so that one could run them from any X-capable device-
--a workstation, an X terminal--and transact with a database across the
-network.  Although this opens up access a little, assuming one has enough
-network to handle it, it does not provide an interface to develop a
-program that conveniently integrates information from multiple databases. 
-X is a viewing technology that has limits.  In a real sense, it is just a
-graphical version of remote log-in across the network.  X-type applications
-represent only one step in the progression towards real access.
-
-LYNCH next discussed barriers to the distribution of networked multimedia
-information.  The heart of the problem is a lack of standards to provide
-the ability for computers to talk to each other, retrieve information,
-and shuffle it around fairly casually.  At the moment, little progress is
-being made on standards for networked information; for example, present
-standards do not cover images, digital voice, and digital video.  A
-useful tool kit of exchange formats for basic texts is only now being
-assembled.  The synchronization of content streams (i.e., synchronizing a
-voice track to a video track, establishing temporal relations between
-different components in a multimedia object) constitutes another issue
-for networked multimedia that is just beginning to receive attention.
-
-Underlying network protocols also need some work; good, real-time
-delivery protocols on the Internet do not yet exist.  In LYNCH's view,
-highly important in this context is the notion of networked digital
-object IDs, the ability of one object on the network to point to another
-object (or component thereof) on the network.  Serious bandwidth issues
-also exist.  LYNCH was uncertain if billion-bit-per-second networks would
-prove sufficient if numerous people ran video in parallel.
-
-LYNCH concluded by offering an issue for database creators to consider,
-as well as several comments about what might constitute good trial
-multimedia experiments.  In a networked information world the database
-builder or service builder (publisher) does not exercise the same
-extensive control over the integrity of the presentation; strange
-programs "munge" with one's data before the user sees it.  Serious
-thought must be given to what guarantees integrity of presentation.  Part
-of that is related to where one draws the boundaries around a networked
-information service.  This question of presentation integrity in
-client-server computing has not been stressed enough in the academic
-world, LYNCH argued, though commercial service providers deal with it
-regularly.
-
-Concerning multimedia, LYNCH observed that good multimedia at the moment
-is hideously expensive to produce.  He recommended producing multimedia
-with either very high sale value, or multimedia with a very long life
-span, or multimedia that will have a very broad usage base and whose
-costs therefore can be amortized among large numbers of users.  In this
-connection, historical and humanistically oriented material may be a good
-place to start, because it tends to have a longer life span than much of
-the scientific material, as well as a wider user base.  LYNCH noted, for
-example, that American Memory fits many of the criteria outlined.  He
-remarked the extensive discussion about bringing the Internet or the
-National Research and Education Network (NREN) into the K-12 environment
-as a way of helping the American educational system.
-
-LYNCH closed by noting that the kinds of applications demonstrated struck
-him as excellent justifications of broad-scale networking for K-12, but
-that at this time no "killer" application exists to mobilize the K-12
-community to obtain connectivity.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Dearth of genuinely interesting applications on the network
-a slow-changing situation * The issue of the integrity of presentation in
-a networked environment * Several reasons why CD-ROM software does not
-network *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the discussion period that followed LYNCH's presentation, several
-additional points were made.
-
-LYNCH reiterated even more strongly his contention that, historically,
-once one goes outside high-end science and the group of those who need
-access to supercomputers, there is a great dearth of genuinely
-interesting applications on the network.  He saw this situation changing
-slowly, with some of the scientific databases and scholarly discussion
-groups and electronic journals coming on as well as with the availability
-of Wide Area Information Servers (WAIS) and some of the databases that
-are being mounted there.  However, many of those things do not seem to
-have piqued great popular interest.  For instance, most high school
-students of LYNCH's acquaintance would not qualify as devotees of serious
-molecular biology.
-
-Concerning the issue of the integrity of presentation, LYNCH believed
-that a couple of information providers have laid down the law at least on
-certain things.  For example, his recollection was that the National
-Library of Medicine feels strongly that one needs to employ the
-identifier field if he or she is to mount a database commercially.  The
-problem with a real networked environment is that one does not know who
-is reformatting and reprocessing one's data when one enters a client
-server mode.  It becomes anybody's guess, for example, if the network
-uses a Z39.50 server, or what clients are doing with one's data.  A data
-provider can say that his contract will only permit clients to have
-access to his data after he vets them and their presentation and makes
-certain it suits him.  But LYNCH held out little expectation that the
-network marketplace would evolve in that way, because it required too
-much prior negotiation.
-
-CD-ROM software does not network for a variety of reasons, LYNCH said. 
-He speculated that CD-ROM publishers are not eager to have their products
-really hook into wide area networks, because they fear it will make their
-data suppliers nervous.  Moreover, until relatively recently, one had to
-be rather adroit to run a full TCP/IP stack plus applications on a
-PC-size machine, whereas nowadays it is becoming easier as PCs grow
-bigger and faster.  LYNCH also speculated that software providers had not
-heard from their customers until the last year or so, or had not heard
-from enough of their customers.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-BESSER * Implications of disseminating images on the network; planning
-the distribution of multimedia documents poses two critical
-implementation problems * Layered approach represents the way to deal
-with users' capabilities * Problems in platform design; file size and its
-implications for networking * Transmission of megabyte size images
-impractical * Compression and decompression at the user's end * Promising
-trends for compression * A disadvantage of using X-Windows * A project at
-the Smithsonian that mounts images on several networks *  
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Howard BESSER, School of Library and Information Science, University of
-Pittsburgh, spoke primarily about multimedia, focusing on images and the
-broad implications of disseminating them on the network.  He argued that
-planning the distribution of multimedia documents posed two critical
-implementation problems, which he framed in the form of two questions: 
-1) What platform will one use and what hardware and software will users
-have for viewing of the material?  and 2) How can one deliver a
-sufficiently robust set of information in an accessible format in a
-reasonable amount of time?  Depending on whether network or CD-ROM is the
-medium used, this question raises different issues of storage,
-compression, and transmission.
-
-Concerning the design of platforms (e.g., sound, gray scale, simple
-color, etc.) and the various capabilities users may have, BESSER
-maintained that a layered approach was the way to deal with users'
-capabilities.  A result would be that users with less powerful
-workstations would simply have less functionality.  He urged members of
-the audience to advocate standards and accompanying software that handle
-layered functionality across a wide variety of platforms.
-
-BESSER also addressed problems in platform design, namely, deciding how
-large a machine to design for situations when the largest number of users
-have the lowest level of the machine, and one desires higher
-functionality.  BESSER then proceeded to the question of file size and
-its implications for networking.  He discussed still images in the main. 
-For example, a digital color image that fills the screen of a standard
-mega-pel workstation (Sun or Next) will require one megabyte of storage
-for an eight-bit image or three megabytes of storage for a true color or
-twenty-four-bit image.  Lossless compression algorithms (that is,
-computational procedures in which no data is lost in the process of
-compressing [and decompressing] an image--the exact bit-representation is
-maintained) might bring storage down to a third of a megabyte per image,
-but not much further than that.  The question of size makes it difficult
-to fit an appropriately sized set of these images on a single disk or to
-transmit them quickly enough on a network.
-
-With these full screen mega-pel images that constitute a third of a
-megabyte, one gets 1,000-3,000 full-screen images on a one-gigabyte disk;
-a standard CD-ROM represents approximately 60 percent of that.  Storing
-images the size of a PC screen (just 8 bit color) increases storage
-capacity to 4,000-12,000 images per gigabyte; 60 percent of that gives
-one the size of a CD-ROM, which in turn creates a major problem.  One
-cannot have full-screen, full-color images with lossless compression; one
-must compress them or use a lower resolution.  For megabyte-size images,
-anything slower than a T-1 speed is impractical.  For example, on a
-fifty-six-kilobaud line, it takes three minutes to transfer a
-one-megabyte file, if it is not compressed; and this speed assumes ideal
-circumstances (no other user contending for network bandwidth).  Thus,
-questions of disk access, remote display, and current telephone
-connection speed make transmission of megabyte-size images impractical.
-
-BESSER then discussed ways to deal with these large images, for example,
-compression and decompression at the user's end.  In this connection, the
-issues of how much one is willing to lose in the compression process and
-what image quality one needs in the first place are unknown.  But what is
-known is that compression entails some loss of data.  BESSER urged that
-more studies be conducted on image quality in different situations, for
-example, what kind of images are needed for what kind of disciplines, and
-what kind of image quality is needed for a browsing tool, an intermediate
-viewing tool, and archiving.
-
-BESSER remarked two promising trends for compression:  from a technical
-perspective, algorithms that use what is called subjective redundancy
-employ principles from visual psycho-physics to identify and remove
-information from the image that the human eye cannot perceive; from an
-interchange and interoperability perspective, the JPEG (i.e., Joint
-Photographic Experts Group, an ISO standard) compression algorithms also
-offer promise.  These issues of compression and decompression, BESSER
-argued, resembled those raised earlier concerning the design of different
-platforms.  Gauging the capabilities of potential users constitutes a
-primary goal.  BESSER advocated layering or separating the images from
-the applications that retrieve and display them, to avoid tying them to
-particular software.
-
-BESSER detailed several lessons learned from his work at Berkeley with
-Imagequery, especially the advantages and disadvantages of using
-X-Windows.  In the latter category, for example, retrieval is tied
-directly to one's data, an intolerable situation in the long run on a
-networked system.  Finally, BESSER described a project of Jim Wallace at
-the Smithsonian Institution, who is mounting images in a extremely
-rudimentary way on the Compuserv and Genie networks and is preparing to
-mount them on America On Line.  Although the average user takes over
-thirty minutes to download these images (assuming a fairly fast modem),
-nevertheless, images have been downloaded 25,000 times.
-
-BESSER concluded his talk with several comments on the business
-arrangement between the Smithsonian and Compuserv.  He contended that not
-enough is known concerning the value of images.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Creating digitized photographic collections nearly
-impossible except with large organizations like museums * Need for study
-to determine quality of images users will tolerate *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the brief exchange between LESK and BESSER that followed, several
-clarifications emerged.
-
-LESK argued that the photographers were far ahead of BESSER:  It is
-almost impossible to create such digitized photographic collections
-except with large organizations like museums, because all the
-photographic agencies have been going crazy about this and will not sign
-licensing agreements on any sort of reasonable terms.  LESK had heard
-that National Geographic, for example, had tried to buy the right to use
-some image in some kind of educational production for $100 per image, but
-the photographers will not touch it.  They want accounting and payment
-for each use, which cannot be accomplished within the system.  BESSER
-responded that a consortium of photographers, headed by a former National
-Geographic photographer, had started assembling its own collection of
-electronic reproductions of images, with the money going back to the
-cooperative.
-
-LESK contended that BESSER was unnecessarily pessimistic about multimedia
-images, because people are accustomed to low-quality images, particularly
-from video.  BESSER urged the launching of a study to determine what
-users would tolerate, what they would feel comfortable with, and what
-absolutely is the highest quality they would ever need.  Conceding that
-he had adopted a dire tone in order to arouse people about the issue,
-BESSER closed on a sanguine note by saying that he would not be in this
-business if he did not think that things could be accomplished.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-LARSEN * Issues of scalability and modularity * Geometric growth of the
-Internet and the role played by layering * Basic functions sustaining
-this growth * A library's roles and functions in a network environment *
-Effects of implementation of the Z39.50 protocol for information
-retrieval on the library system * The trade-off between volumes of data
-and its potential usage * A snapshot of current trends *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Ronald LARSEN, associate director for information technology, University
-of Maryland at College Park, first addressed the issues of scalability
-and modularity.  He noted the difficulty of anticipating the effects of
-orders-of-magnitude growth, reflecting on the twenty years of experience
-with the Arpanet and Internet.  Recalling the day's demonstrations of
-CD-ROM and optical disk material, he went on to ask if the field has yet
-learned how to scale new systems to enable delivery and dissemination
-across large-scale networks.
-
-LARSEN focused on the geometric growth of the Internet from its inception
-circa 1969 to the present, and the adjustments required to respond to
-that rapid growth.  To illustrate the issue of scalability, LARSEN
-considered computer networks as including three generic components: 
-computers, network communication nodes, and communication media.  Each
-component scales (e.g., computers range from PCs to supercomputers;
-network nodes scale from interface cards in a PC through sophisticated
-routers and gateways; and communication media range from 2,400-baud
-dial-up facilities through 4.5-Mbps backbone links, and eventually to
-multigigabit-per-second communication lines), and architecturally, the
-components are organized to scale hierarchically from local area networks
-to international-scale networks.  Such growth is made possible by
-building layers of communication protocols, as BESSER pointed out.
-By layering both physically and logically, a sense of scalability is
-maintained from local area networks in offices, across campuses, through
-bridges, routers, campus backbones, fiber-optic links, etc., up into
-regional networks and ultimately into national and international
-networks.
-
-LARSEN then illustrated the geometric growth over a two-year period--
-through September 1991--of the number of networks that comprise the
-Internet.  This growth has been sustained largely by the availability of
-three basic functions:  electronic mail, file transfer (ftp), and remote
-log-on (telnet).  LARSEN also reviewed the growth in the kind of traffic
-that occurs on the network.  Network traffic reflects the joint contributions
-of a larger population of users and increasing use per user.  Today one sees
-serious applications involving moving images across the network--a rarity
-ten years ago.  LARSEN recalled and concurred with BESSER's main point
-that the interesting problems occur at the application level.
-
-LARSEN then illustrated a model of a library's roles and functions in a
-network environment.  He noted, in particular, the placement of on-line
-catalogues onto the network and patrons obtaining access to the library
-increasingly through local networks, campus networks, and the Internet. 
-LARSEN supported LYNCH's earlier suggestion that we need to address
-fundamental questions of networked information in order to build
-environments that scale in the information sense as well as in the
-physical sense.
-
-LARSEN supported the role of the library system as the access point into
-the nation's electronic collections.  Implementation of the Z39.50
-protocol for information retrieval would make such access practical and
-feasible.  For example, this would enable patrons in Maryland to search
-California libraries, or other libraries around the world that are
-conformant with Z39.50 in a manner that is familiar to University of
-Maryland patrons.  This client-server model also supports moving beyond
-secondary content into primary content.  (The notion of how one links
-from secondary content to primary content, LARSEN said, represents a
-fundamental problem that requires rigorous thought.)  After noting
-numerous network experiments in accessing full-text materials, including
-projects supporting the ordering of materials across the network, LARSEN
-revisited the issue of transmitting high-density, high-resolution color
-images across the network and the large amounts of bandwidth they
-require.  He went on to address the bandwidth and synchronization
-problems inherent in sending full-motion video across the network.
-
-LARSEN illustrated the trade-off between volumes of data in bytes or
-orders of magnitude and the potential usage of that data.  He discussed
-transmission rates (particularly, the time it takes to move various forms
-of information), and what one could do with a network supporting
-multigigabit-per-second transmission.  At the moment, the network
-environment includes a composite of data-transmission requirements,
-volumes and forms, going from steady to bursty (high-volume) and from
-very slow to very fast.  This aggregate must be considered in the design,
-construction, and operation of multigigabyte networks.
-
-LARSEN's objective is to use the networks and library systems now being
-constructed to increase access to resources wherever they exist, and
-thus, to evolve toward an on-line electronic virtual library.
-
-LARSEN concluded by offering a snapshot of current trends:  continuing
-geometric growth in network capacity and number of users; slower
-development of applications; and glacial development and adoption of
-standards.  The challenge is to design and develop each new application
-system with network access and scalability in mind.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-BROWNRIGG * Access to the Internet cannot be taken for granted * Packet
-radio and the development of MELVYL in 1980-81 in the Division of Library
-Automation at the University of California  *  Design criteria for packet
-radio * A demonstration project in San Diego and future plans * Spread
-spectrum * Frequencies at which the radios will run and plans to
-reimplement the WAIS server software in the public domain * Need for an
-infrastructure of radios that do not move around * 
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Edwin BROWNRIGG, executive director, Memex Research Institute, first
-polled the audience in order to seek out regular users of the Internet as
-well as those planning to use it some time in the future.  With nearly
-everybody in the room falling into one category or the other, BROWNRIGG
-made a point re access, namely that numerous individuals, especially those
-who use the Internet every day, take for granted their access to it, the
-speeds with which they are connected, and how well it all works. 
-However, as BROWNRIGG discovered between 1987 and 1989 in Australia,
-if one wants access to the Internet but cannot afford it or has some
-physical boundary that prevents her or him from gaining access, it can
-be extremely frustrating.  He suggested that because of economics and
-physical barriers we were beginning to create a world of haves and have-nots
-in the process of scholarly communication, even in the United States.
-
-BROWNRIGG detailed the development of MELVYL in academic year 1980-81 in
-the Division of Library Automation at the University of California, in
-order to underscore the issue of access to the system, which at the
-outset was extremely limited.  In short, the project needed to build a
-network, which at that time entailed use of satellite technology, that is,
-putting earth stations on campus and also acquiring some terrestrial links
-from the State of California's microwave system.  The installation of
-satellite links, however, did not solve the problem (which actually
-formed part of a larger problem involving politics and financial resources).
-For while the project team could get a signal onto a campus, it had no means
-of distributing the signal throughout the campus.  The solution involved
-adopting a recent development in wireless communication called packet radio,
-which combined the basic notion of packet-switching with radio.  The project
-used this technology to get the signal from a point on campus where it
-came down, an earth station for example, into the libraries, because it
-found that wiring the libraries, especially the older marble buildings,
-would cost $2,000-$5,000 per terminal.
-
-BROWNRIGG noted that, ten years ago, the project had neither the public
-policy nor the technology that would have allowed it to use packet radio
-in any meaningful way.  Since then much had changed.  He proceeded to
-detail research and development of the technology, how it is being
-deployed in California, and what direction he thought it would take.
-The design criteria are to produce a high-speed, one-time, low-cost,
-high-quality, secure, license-free device (packet radio) that one can
-plug in and play today, forget about it, and have access to the Internet. 
-By high speed, BROWNRIGG meant 1 megabyte and 1.5 megabytes.  Those units
-have been built, he continued, and are in the process of being
-type-certified by an independent underwriting laboratory so that they can
-be type-licensed by the Federal Communications Commission.  As is the
-case with citizens band, one will be able to purchase a unit and not have
-to worry about applying for a license.
-
-The basic idea, BROWNRIGG elaborated, is to take high-speed radio data
-transmission and create a backbone network that at certain strategic
-points in the network will "gateway" into a medium-speed packet radio
-(i.e., one that runs at 38.4 kilobytes), so that perhaps by 1994-1995
-people, like those in the audience for the price of a VCR could purchase
-a medium-speed radio for the office or home, have full network connectivity
-to the Internet, and partake of all its services, with no need for an FCC
-license and no regular bill from the local common carrier.  BROWNRIGG
-presented several details of a demonstration project currently taking
-place in San Diego and described plans, pending funding, to install a
-full-bore network in the San Francisco area.  This network will have 600
-nodes running at backbone speeds, and 100 of these nodes will be libraries,
-which in turn will be the gateway ports to the 38.4 kilobyte radios that
-will give coverage for the neighborhoods surrounding the libraries.
-
-BROWNRIGG next explained Part 15.247, a new rule within Title 47 of the
-Code of Federal Regulations enacted by the FCC in 1985.  This rule
-challenged the industry, which has only now risen to the occasion, to
-build a radio that would run at no more than one watt of output power and
-use a fairly exotic method of modulating the radio wave called spread
-spectrum.  Spread spectrum in fact permits the building of networks so
-that numerous data communications can occur simultaneously, without
-interfering with each other, within the same wide radio channel.
-
-BROWNRIGG explained that the frequencies at which the radios would run
-are very short wave signals.  They are well above standard microwave and
-radar.  With a radio wave that small, one watt becomes a tremendous punch
-per bit and thus makes transmission at reasonable speed possible.  In
-order to minimize the potential for congestion, the project is
-undertaking to reimplement software which has been available in the
-networking business and is taken for granted now, for example, TCP/IP,
-routing algorithms, bridges, and gateways.  In addition, the project
-plans to take the WAIS server software in the public domain and
-reimplement it so that one can have a WAIS server on a Mac instead of a
-Unix machine.  The Memex Research Institute believes that libraries, in
-particular, will want to use the WAIS servers with packet radio.  This
-project, which has a team of about twelve people, will run through 1993
-and will include the 100 libraries already mentioned as well as other
-professionals such as those in the medical profession, engineering, and
-law.  Thus, the need is to create an infrastructure of radios that do not
-move around, which, BROWNRIGG hopes, will solve a problem not only for
-libraries but for individuals who, by and large today, do not have access
-to the Internet from their homes and offices.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Project operating frequencies *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During a brief discussion period, which also concluded the day's
-proceedings, BROWNRIGG stated that the project was operating in four
-frequencies.  The slow speed is operating at 435 megahertz, and it would
-later go up to 920 megahertz.  With the high-speed frequency, the
-one-megabyte radios will run at 2.4 gigabits, and 1.5 will run at 5.7. 
-At 5.7, rain can be a factor, but it would have to be tropical rain,
-unlike what falls in most parts of the United States.
-
-                                 ******
-
-SESSION IV.  IMAGE CAPTURE, TEXT CAPTURE, OVERVIEW OF TEXT AND
-             IMAGE STORAGE FORMATS
-
-William HOOTON, vice president of operations, I-NET, moderated this session.
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-KENNEY * Factors influencing development of CXP * Advantages of using
-digital technology versus photocopy and microfilm * A primary goal of
-CXP; publishing challenges * Characteristics of copies printed * Quality
-of samples achieved in image capture * Several factors to be considered
-in choosing scanning * Emphasis of CXP on timely and cost-effective
-production of black-and-white printed facsimiles * Results of producing
-microfilm from digital files * Advantages of creating microfilm * Details
-concerning production * Costs * Role of digital technology in library
-preservation *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Anne KENNEY, associate director, Department of Preservation and
-Conservation, Cornell University, opened her talk by observing that the
-Cornell Xerox Project (CXP) has been guided by the assumption that the
-ability to produce printed facsimiles or to replace paper with paper
-would be important, at least for the present generation of users and
-equipment.  She described three factors that influenced development of
-the project:  1) Because the project has emphasized the preservation of
-deteriorating brittle books, the quality of what was produced had to be
-sufficiently high to return a paper replacement to the shelf.  CXP was
-only interested in using:  2) a system that was cost-effective, which
-meant that it had to be cost-competitive with the processes currently
-available, principally photocopy and microfilm, and 3) new or currently
-available product hardware and software.
-
-KENNEY described the advantages that using digital technology offers over
-both photocopy and microfilm:  1) The potential exists to create a higher
-quality reproduction of a deteriorating original than conventional
-light-lens technology.  2) Because a digital image is an encoded
-representation, it can be reproduced again and again with no resulting
-loss of quality, as opposed to the situation with light-lens processes,
-in which there is discernible difference between a second and a
-subsequent generation of an image.  3) A digital image can be manipulated
-in a number of ways to improve image capture; for example, Xerox has
-developed a windowing application that enables one to capture a page
-containing both text and illustrations in a manner that optimizes the
-reproduction of both.  (With light-lens technology, one must choose which
-to optimize, text or the illustration; in preservation microfilming, the
-current practice is to shoot an illustrated page twice, once to highlight
-the text and the second time to provide the best capture for the
-illustration.)  4) A digital image can also be edited, density levels
-adjusted to remove underlining and stains, and to increase legibility for
-faint documents.  5) On-screen inspection can take place at the time of
-initial setup and adjustments made prior to scanning, factors that
-substantially reduce the number of retakes required in quality control.
-
-A primary goal of CXP has been to evaluate the paper output printed on
-the Xerox DocuTech, a high-speed printer that produces 600-dpi pages from
-scanned images at a rate of 135 pages a minute.  KENNEY recounted several
-publishing challenges to represent faithful and legible reproductions of
-the originals that the 600-dpi copy for the most part successfully
-captured.  For example, many of the deteriorating volumes in the project
-were heavily illustrated with fine line drawings or halftones or came in
-languages such as Japanese, in which the buildup of characters comprised
-of varying strokes is difficult to reproduce at lower resolutions; a
-surprising number of them came with annotations and mathematical
-formulas, which it was critical to be able to duplicate exactly.
-
-KENNEY noted that 1) the copies are being printed on paper that meets the
-ANSI standards for performance, 2) the DocuTech printer meets the machine
-and toner requirements for proper adhesion of print to page, as described
-by the National Archives, and thus 3) paper product is considered to be
-the archival equivalent of preservation photocopy.
-
-KENNEY then discussed several samples of the quality achieved in the
-project that had been distributed in a handout, for example, a copy of a
-print-on-demand version of the 1911 Reed lecture on the steam turbine,
-which contains halftones, line drawings, and illustrations embedded in
-text; the first four loose pages in the volume compared the capture
-capabilities of scanning to photocopy for a standard test target, the
-IEEE standard 167A 1987 test chart.  In all instances scanning proved
-superior to photocopy, though only slightly more so in one.
-
-Conceding the simplistic nature of her review of the quality of scanning
-to photocopy, KENNEY described it as one representation of the kinds of
-settings that could be used with scanning capabilities on the equipment
-CXP uses.  KENNEY also pointed out that CXP investigated the quality
-achieved with binary scanning only, and noted the great promise in gray
-scale and color scanning, whose advantages and disadvantages need to be
-examined.  She argued further that scanning resolutions and file formats
-can represent a complex trade-off between the time it takes to capture
-material, file size, fidelity to the original, and on-screen display; and
-printing and equipment availability.  All these factors must be taken
-into consideration.
-
-CXP placed primary emphasis on the production in a timely and
-cost-effective manner of printed facsimiles that consisted largely of
-black-and-white text.  With binary scanning, large files may be
-compressed efficiently and in a lossless manner (i.e., no data is lost in
-the process of compressing [and decompressing] an image--the exact
-bit-representation is maintained) using Group 4 CCITT (i.e., the French
-acronym for International Consultative Committee for Telegraph and
-Telephone) compression.  CXP was getting compression ratios of about
-forty to one.  Gray-scale compression, which primarily uses JPEG, is much
-less economical and can represent a lossy compression (i.e., not
-lossless), so that as one compresses and decompresses, the illustration
-is subtly changed.  While binary files produce a high-quality printed
-version, it appears 1) that other combinations of spatial resolution with
-gray and/or color hold great promise as well, and 2) that gray scale can
-represent a tremendous advantage for on-screen viewing.  The quality
-associated with binary and gray scale also depends on the equipment used. 
-For instance, binary scanning produces a much better copy on a binary
-printer.
-
-Among CXP's findings concerning the production of microfilm from digital
-files, KENNEY reported that the digital files for the same Reed lecture
-were used to produce sample film using an electron beam recorder.  The
-resulting film was faithful to the image capture of the digital files,
-and while CXP felt that the text and image pages represented in the Reed
-lecture were superior to that of the light-lens film, the resolution
-readings for the 600 dpi were not as high as standard microfilming. 
-KENNEY argued that the standards defined for light-lens technology are
-not totally transferable to a digital environment.  Moreover, they are
-based on definition of quality for a preservation copy.  Although making
-this case will prove to be a long, uphill struggle, CXP plans to continue
-to investigate the issue over the course of the next year.
-
-KENNEY concluded this portion of her talk with a discussion of the
-advantages of creating film:  it can serve as a primary backup and as a
-preservation master to the digital file; it could then become the print
-or production master and service copies could be paper, film, optical
-disks, magnetic media, or on-screen display.
-
-Finally, KENNEY presented details re production:
-
-     * Development and testing of a moderately-high resolution production
-     scanning workstation represented a third goal of CXP; to date, 1,000
-     volumes have been scanned, or about 300,000 images.
-
-     * The resulting digital files are stored and used to produce
-     hard-copy replacements for the originals and additional prints on
-     demand; although the initial costs are high, scanning technology
-     offers an affordable means for reformatting brittle material.
-
-     * A technician in production mode can scan 300 pages per hour when
-     performing single-sheet scanning, which is a necessity when working
-     with truly brittle paper; this figure is expected to increase
-     significantly with subsequent iterations of the software from Xerox;
-     a three-month time-and-cost study of scanning found that the average
-     300-page book would take about an hour and forty minutes to scan
-     (this figure included the time for setup, which involves keying in
-     primary bibliographic data, going into quality control mode to
-     define page size, establishing front-to-back registration, and
-     scanning sample pages to identify a default range of settings for
-     the entire book--functions not dissimilar to those performed by
-     filmers or those preparing a book for photocopy).
-
-     * The final step in the scanning process involved rescans, which
-     happily were few and far between, representing well under 1 percent
-     of the total pages scanned.
-
-In addition to technician time, CXP costed out equipment, amortized over
-four years, the cost of storing and refreshing the digital files every
-four years, and the cost of printing and binding, book-cloth binding, a
-paper reproduction.  The total amounted to a little under $65 per single
-300-page volume, with 30 percent overhead included--a figure competitive
-with the prices currently charged by photocopy vendors.
-
-Of course, with scanning, in addition to the paper facsimile, one is left
-with a digital file from which subsequent copies of the book can be
-produced for a fraction of the cost of photocopy, with readers afforded
-choices in the form of these copies.
-
-KENNEY concluded that digital technology offers an electronic means for a
-library preservation effort to pay for itself.  If a brittle-book program
-included the means of disseminating reprints of books that are in demand
-by libraries and researchers alike, the initial investment in capture
-could be recovered and used to preserve additional but less popular
-books.  She disclosed that an economic model for a self-sustaining
-program could be developed for CXP's report to the Commission on
-Preservation and Access (CPA).
-
-KENNEY stressed that the focus of CXP has been on obtaining high quality
-in a production environment.  The use of digital technology is viewed as
-an affordable alternative to other reformatting options.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-ANDRE * Overview and history of NATDP * Various agricultural CD-ROM
-products created inhouse and by service bureaus * Pilot project on
-Internet transmission * Additional products in progress *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Pamela ANDRE, associate director for automation, National Agricultural
-Text Digitizing Program (NATDP), National Agricultural Library (NAL),
-presented an overview of NATDP, which has been underway at NAL the last
-four years, before Judith ZIDAR discussed the technical details.  ANDRE
-defined agricultural information as a broad range of material going from
-basic and applied research in the hard sciences to the one-page pamphlets
-that are distributed by the cooperative state extension services on such
-things as how to grow blueberries.
-
-NATDP began in late 1986 with a meeting of representatives from the
-land-grant library community to deal with the issue of electronic
-information.  NAL and forty-five of these libraries banded together to
-establish this project--to evaluate the technology for converting what
-were then source documents in paper form into electronic form, to provide
-access to that digital information, and then to distribute it. 
-Distributing that material to the community--the university community as
-well as the extension service community, potentially down to the county
-level--constituted the group's chief concern.
-
-Since January 1988 (when the microcomputer-based scanning system was
-installed at NAL), NATDP has done a variety of things, concerning which
-ZIDAR would provide further details.  For example, the first technology
-considered in the project's discussion phase was digital videodisc, which
-indicates how long ago it was conceived.
-
-Over the four years of this project, four separate CD-ROM products on
-four different agricultural topics were created, two at a
-scanning-and-OCR station installed at NAL, and two by service bureaus. 
-Thus, NATDP has gained comparative information in terms of those relative
-costs.  Each of these products contained the full ASCII text as well as
-page images of the material, or between 4,000 and 6,000 pages of material
-on these disks.  Topics included aquaculture, food, agriculture and
-science (i.e., international agriculture and research), acid rain, and
-Agent Orange, which was the final product distributed (approximately
-eighteen months before the Workshop).
-
-The third phase of NATDP focused on delivery mechanisms other than
-CD-ROM.  At the suggestion of Clifford LYNCH, who was a technical
-consultant to the project at this point, NATDP became involved with the
-Internet and initiated a project with the help of North Carolina State
-University, in which fourteen of the land-grant university libraries are
-transmitting digital images over the Internet in response to interlibrary
-loan requests--a topic for another meeting.  At this point, the pilot
-project had been completed for about a year and the final report would be
-available shortly after the Workshop.  In the meantime, the project's
-success had led to its extension.  (ANDRE noted that one of the first
-things done under the program title was to select a retrieval package to
-use with subsequent products; Windows Personal Librarian was the package
-of choice after a lengthy evaluation.)
-  
-Three additional products had been planned and were in progress:
-
-     1) An arrangement with the American Society of Agronomy--a
-     professional society that has published the Agronomy Journal since
-     about 1908--to scan and create bit-mapped images of its journal. 
-     ASA granted permission first to put and then to distribute this
-     material in electronic form, to hold it at NAL, and to use these
-     electronic images as a mechanism to deliver documents or print out
-     material for patrons, among other uses.  Effectively, NAL has the
-     right to use this material in support of its program. 
-     (Significantly, this arrangement offers a potential cooperative
-     model for working with other professional societies in agriculture
-     to try to do the same thing--put the journals of particular interest
-     to agriculture research into electronic form.)
-
-     2) An extension of the earlier product on aquaculture.
-
-     3) The George Washington Carver Papers--a joint project with
-     Tuskegee University to scan and convert from microfilm some 3,500
-     images of Carver's papers, letters, and drawings.
-
-It was anticipated that all of these products would appear no more than
-six months after the Workshop.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-ZIDAR * (A separate arena for scanning) * Steps in creating a database *
-Image capture, with and without performing OCR * Keying in tracking data
-* Scanning, with electronic and manual tracking * Adjustments during
-scanning process * Scanning resolutions * Compression * De-skewing and
-filtering * Image capture from microform:  the papers and letters of
-George Washington Carver * Equipment used for a scanning system * 
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Judith ZIDAR, coordinator, National Agricultural Text Digitizing Program
-(NATDP), National Agricultural Library (NAL), illustrated the technical
-details of NATDP, including her primary responsibility, scanning and
-creating databases on a topic and putting them on CD-ROM.
-
-(ZIDAR remarked a separate arena from the CD-ROM projects, although the
-processing of the material is nearly identical, in which NATDP is also
-scanning material and loading it on a Next microcomputer, which in turn
-is linked to NAL's integrated library system.  Thus, searches in NAL's
-bibliographic database will enable people to pull up actual page images
-and text for any documents that have been entered.)
-
-In accordance with the session's topic, ZIDAR focused her illustrated
-talk on image capture, offering a primer on the three main steps in the
-process:  1) assemble the printed publications; 2) design the database
-(database design occurs in the process of preparing the material for
-scanning; this step entails reviewing and organizing the material,
-defining the contents--what will constitute a record, what kinds of
-fields will be captured in terms of author, title, etc.); 3) perform a
-certain amount of markup on the paper publications.  NAL performs this
-task record by record, preparing work sheets or some other sort of
-tracking material and designing descriptors and other enhancements to be
-added to the data that will not be captured from the printed publication. 
-Part of this process also involves determining NATDP's file and directory
-structure:  NATDP attempts to avoid putting more than approximately 100
-images in a directory, because placing more than that on a CD-ROM would
-reduce the access speed.
-
-This up-front process takes approximately two weeks for a
-6,000-7,000-page database.  The next step is to capture the page images. 
-How long this process takes is determined by the decision whether or not
-to perform OCR.  Not performing OCR speeds the process, whereas text
-capture requires greater care because of the quality of the image:  it
-has to be straighter and allowance must be made for text on a page, not
-just for the capture of photographs.
-
-NATDP keys in tracking data, that is, a standard bibliographic record
-including the title of the book and the title of the chapter, which will
-later either become the access information or will be attached to the
-front of a full-text record so that it is searchable.
-
-Images are scanned from a bound or unbound publication, chiefly from
-bound publications in the case of NATDP, however, because often they are
-the only copies and the publications are returned to the shelves.  NATDP
-usually scans one record at a time, because its database tracking system
-tracks the document in that way and does not require further logical
-separating of the images.  After performing optical character
-recognition, NATDP moves the images off the hard disk and maintains a
-volume sheet.  Though the system tracks electronically, all the
-processing steps are also tracked manually with a log sheet.
-
-ZIDAR next illustrated the kinds of adjustments that one can make when
-scanning from paper and microfilm, for example, redoing images that need
-special handling, setting for dithering or gray scale, and adjusting for
-brightness or for the whole book at one time.
-
-NATDP is scanning at 300 dots per inch, a standard scanning resolution. 
-Though adequate for capturing text that is all of a standard size, 300
-dpi is unsuitable for any kind of photographic material or for very small
-text.  Many scanners allow for different image formats, TIFF, of course,
-being a de facto standard.  But if one intends to exchange images with
-other people, the ability to scan other image formats, even if they are
-less common, becomes highly desirable.
-
-CCITT Group 4 is the standard compression for normal black-and-white
-images, JPEG for gray scale or color.   ZIDAR recommended 1) using the
-standard compressions, particularly if one attempts to make material
-available and to allow users to download images and reuse them from
-CD-ROMs; and 2) maintaining the ability to output an uncompressed image,
-because in image exchange uncompressed images are more likely to be able
-to cross platforms.
-
-ZIDAR emphasized the importance of de-skewing and filtering as
-requirements on NATDP's upgraded system.  For instance, scanning bound
-books, particularly books published by the federal government whose pages
-are skewed, and trying to scan them straight if OCR is to be performed,
-is extremely time-consuming.  The same holds for filtering of
-poor-quality or older materials.
-
-ZIDAR described image capture from microform, using as an example three
-reels from a sixty-seven-reel set of the papers and letters of George
-Washington Carver that had been produced by Tuskegee University.  These
-resulted in approximately 3,500 images, which NATDP had had scanned by
-its service contractor, Science Applications International Corporation
-(SAIC).  NATDP also created bibliographic records for access.  (NATDP did
-not have such specialized equipment as a microfilm scanner.
-
-Unfortunately, the process of scanning from microfilm was not an
-unqualified success, ZIDAR reported:  because microfilm frame sizes vary,
-occasionally some frames were missed, which without spending much time
-and money could not be recaptured.
-
-OCR could not be performed from the scanned images of the frames.  The
-bleeding in the text simply output text, when OCR was run, that could not
-even be edited.  NATDP tested for negative versus positive images,
-landscape versus portrait orientation, and single- versus dual-page
-microfilm, none of which seemed to affect the quality of the image; but
-also on none of them could OCR be performed.
-
-In selecting the microfilm they would use, therefore, NATDP had other
-factors in mind.  ZIDAR noted two factors that influenced the quality of
-the images:  1) the inherent quality of the original and 2) the amount of
-size reduction on the pages.
-
-The Carver papers were selected because they are informative and visually
-interesting, treat a single subject, and are valuable in their own right. 
-The images were scanned and divided into logical records by SAIC, then
-delivered, and loaded onto NATDP's system, where bibliographic
-information taken directly from the images was added.  Scanning was
-completed in summer 1991 and by the end of summer 1992 the disk was
-scheduled to be published.
-
-Problems encountered during processing included the following:  Because
-the microfilm scanning had to be done in a batch, adjustment for
-individual page variations was not possible.  The frame size varied on
-account of the nature of the material, and therefore some of the frames
-were missed while others were just partial frames.  The only way to go
-back and capture this material was to print out the page with the
-microfilm reader from the missing frame and then scan it in from the
-page, which was extremely time-consuming.  The quality of the images
-scanned from the printout of the microfilm compared unfavorably with that
-of the original images captured directly from the microfilm.  The
-inability to perform OCR also was a major disappointment.  At the time,
-computer output microfilm was unavailable to test.
-
-The equipment used for a scanning system was the last topic addressed by
-ZIDAR.  The type of equipment that one would purchase for a scanning
-system included:  a microcomputer, at least a 386, but preferably a 486;
-a large hard disk, 380 megabyte at minimum; a multi-tasking operating
-system that allows one to run some things in batch in the background
-while scanning or doing text editing, for example, Unix or OS/2 and,
-theoretically, Windows; a high-speed scanner and scanning software that
-allows one to make the various adjustments mentioned earlier; a
-high-resolution monitor (150 dpi ); OCR software and hardware to perform
-text recognition; an optical disk subsystem on which to archive all the
-images as the processing is done; file management and tracking software.
-
-ZIDAR opined that the software one purchases was more important than the
-hardware and might also cost more than the hardware, but it was likely to
-prove critical to the success or failure of one's system.  In addition to
-a stand-alone scanning workstation for image capture, then, text capture
-requires one or two editing stations networked to this scanning station
-to perform editing.  Editing the text takes two or three times as long as
-capturing the images.
-
-Finally, ZIDAR stressed the importance of buying an open system that allows
-for more than one vendor, complies with standards, and can be upgraded.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-WATERS *Yale University Library's master plan to convert microfilm to
-digital imagery (POB) * The place of electronic tools in the library of
-the future * The uses of images and an image library * Primary input from
-preservation microfilm * Features distinguishing POB from CXP and key
-hypotheses guiding POB * Use of vendor selection process to facilitate
-organizational work * Criteria for selecting vendor * Finalists and
-results of process for Yale * Key factor distinguishing vendors *
-Components, design principles, and some estimated costs of POB * Role of
-preservation materials in developing imaging market * Factors affecting
-quality and cost * Factors affecting the usability of complex documents
-in image form * 
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Donald WATERS, head of the Systems Office, Yale University Library,
-reported on the progress of a master plan for a project at Yale to
-convert microfilm to digital imagery, Project Open Book (POB).  Stating
-that POB was in an advanced stage of planning, WATERS detailed, in
-particular, the process of selecting a vendor partner and several key
-issues under discussion as Yale prepares to move into the project itself. 
-He commented first on the vision that serves as the context of POB and
-then described its purpose and scope.
-
-WATERS sees the library of the future not necessarily as an electronic
-library but as a place that generates, preserves, and improves for its
-clients ready access to both intellectual and physical recorded
-knowledge.  Electronic tools must find a place in the library in the
-context of this vision.  Several roles for electronic tools include
-serving as:  indirect sources of electronic knowledge or as "finding"
-aids (the on-line catalogues, the article-level indices, registers for
-documents and archives); direct sources of recorded knowledge; full-text
-images; and various kinds of compound sources of recorded knowledge (the
-so-called compound documents of Hypertext, mixed text and image,
-mixed-text image format, and multimedia).
-
-POB is looking particularly at images and an image library, the uses to
-which images will be put (e.g., storage, printing, browsing, and then use
-as input for other processes), OCR as a subsequent process to image
-capture, or creating an image library, and also possibly generating
-microfilm.
-
-While input will come from a variety of sources, POB is considering
-especially input from preservation microfilm.  A possible outcome is that
-the film and paper which provide the input for the image library
-eventually may go off into remote storage, and that the image library may
-be the primary access tool.
-
-The purpose and scope of POB focus on imaging.  Though related to CXP,
-POB has two features which distinguish it:  1) scale--conversion of
-10,000 volumes into digital image form; and 2) source--conversion from
-microfilm.  Given these features, several key working hypotheses guide
-POB, including:  1) Since POB is using microfilm, it is not concerned with
-the image library as a preservation medium.  2) Digital imagery can improve
-access to recorded knowledge through printing and network distribution at
-a modest incremental cost of microfilm.  3) Capturing and storing documents
-in a digital image form is necessary to further improvements in access.
-(POB distinguishes between the imaging, digitizing process and OCR,
-which at this stage it does not plan to perform.)
-
-Currently in its first or organizational phase, POB found that it could
-use a vendor selection process to facilitate a good deal of the
-organizational work (e.g., creating a project team and advisory board,
-confirming the validity of the plan, establishing the cost of the project
-and a budget, selecting the materials to convert, and then raising the
-necessary funds).
-
-POB developed numerous selection criteria, including:  a firm committed
-to image-document management, the ability to serve as systems integrator
-in a large-scale project over several years, interest in developing the
-requisite software as a standard rather than a custom product, and a
-willingness to invest substantial resources in the project itself.
-
-Two vendors, DEC and Xerox, were selected as finalists in October 1991,
-and with the support of the Commission on Preservation and Access, each
-was commissioned to generate a detailed requirements analysis for the
-project and then to submit a formal proposal for the completion of the
-project, which included a budget and costs. The terms were that POB would
-pay the loser.  The results for Yale of involving a vendor included: 
-broad involvement of Yale staff across the board at a relatively low
-cost, which may have long-term significance in carrying out the project
-(twenty-five to thirty university people are engaged in POB); better
-understanding of the factors that affect corporate response to markets
-for imaging products; a competitive proposal; and a more sophisticated
-view of the imaging markets.
-
-The most important factor that distinguished the vendors under
-consideration was their identification with the customer.  The size and
-internal complexity of the company also was an important factor.  POB was
-looking at large companies that had substantial resources.  In the end,
-the process generated for Yale two competitive proposals, with Xerox's
-the clear winner.  WATERS then described the components of the proposal,
-the design principles, and some of the costs estimated for the process.
-
-Components are essentially four:  a conversion subsystem, a
-network-accessible storage subsystem for 10,000 books (and POB expects
-200 to 600 dpi storage), browsing stations distributed on the campus
-network, and network access to the image printers.
-
-Among the design principles, POB wanted conversion at the highest
-possible resolution.  Assuming TIFF files, TIFF files with Group 4
-compression, TCP/IP, and ethernet network on campus, POB wanted a
-client-server approach with image documents distributed to the
-workstations and made accessible through native workstation interfaces
-such as Windows.  POB also insisted on a phased approach to
-implementation:  1) a stand-alone, single-user, low-cost entry into the
-business with a workstation focused on conversion and allowing POB to
-explore user access; 2) movement into a higher-volume conversion with
-network-accessible storage and multiple access stations; and 3) a
-high-volume conversion, full-capacity storage, and multiple browsing
-stations distributed throughout the campus.
-
-The costs proposed for start-up assumed the existence of the Yale network
-and its two DocuTech image printers.  Other start-up costs are estimated
-at $1 million over the three phases.  At the end of the project, the annual
-operating costs estimated primarily for the software and hardware proposed
-come to about $60,000, but these exclude costs for labor needed in the
-conversion process, network and printer usage, and facilities management.
-
-Finally, the selection process produced for Yale a more sophisticated
-view of the imaging markets:  the management of complex documents in
-image form is not a preservation problem, not a library problem, but a
-general problem in a broad, general industry.  Preservation materials are
-useful for developing that market because of the qualities of the
-material.  For example, much of it is out of copyright.  The resolution
-of key issues such as the quality of scanning and image browsing also
-will affect development of that market.
-
-The technology is readily available but changing rapidly.  In this
-context of rapid change, several factors affect quality and cost, to
-which POB intends to pay particular attention, for example, the various
-levels of resolution that can be achieved.  POB believes it can bring
-resolution up to 600 dpi, but an interpolation process from 400 to 600 is
-more likely.  The variation quality in microfilm will prove to be a
-highly important factor.  POB may reexamine the standards used to film in
-the first place by looking at this process as a follow-on to microfilming.
-
-Other important factors include:  the techniques available to the
-operator for handling material, the ways of integrating quality control
-into the digitizing work flow, and a work flow that includes indexing and
-storage.  POB's requirement was to be able to deal with quality control
-at the point of scanning.  Thus, thanks to Xerox, POB anticipates having
-a mechanism which will allow it not only to scan in batch form, but to
-review the material as it goes through the scanner and control quality
-from the outset.
-
-The standards for measuring quality and costs depend greatly on the uses
-of the material, including subsequent OCR, storage, printing, and
-browsing.  But especially at issue for POB is the facility for browsing. 
-This facility, WATERS said, is perhaps the weakest aspect of imaging
-technology and the most in need of development.
-
-A variety of factors affect the usability of complex documents in image
-form, among them:  1) the ability of the system to handle the full range
-of document types, not just monographs but serials, multi-part
-monographs, and manuscripts; 2) the location of the database of record
-for bibliographic information about the image document, which POB wants
-to enter once and in the most useful place, the on-line catalog; 3) a
-document identifier for referencing the bibliographic information in one
-place and the images in another; 4) the technique for making the basic
-internal structure of the document accessible to the reader; and finally,
-5) the physical presentation on the CRT of those documents.  POB is ready
-to complete this phase now.  One last decision involves deciding which
-material to scan.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * TIFF files constitute de facto standard * NARA's experience
-with image conversion software and text conversion * RFC 1314 *
-Considerable flux concerning available hardware and software solutions *
-NAL through-put rate during scanning * Window management questions *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-In the question-and-answer period that followed WATERS's presentation,
-the following points emerged:
-
-     * ZIDAR's statement about using TIFF files as a standard meant de
-     facto standard.  This is what most people use and typically exchange
-     with other groups, across platforms, or even occasionally across
-     display software.
-
-     * HOLMES commented on the unsuccessful experience of NARA in
-     attempting to run image-conversion software or to exchange between
-     applications:  What are supposedly TIFF files go into other software
-     that is supposed to be able to accept TIFF but cannot recognize the
-     format and cannot deal with it, and thus renders the exchange
-     useless.  Re text conversion, he noted the different recognition
-     rates obtained by substituting the make and model of scanners in
-     NARA's recent test of an "intelligent" character-recognition product
-     for a new company.  In the selection of hardware and software,
-     HOLMES argued, software no longer constitutes the overriding factor
-     it did until about a year ago; rather it is perhaps important to
-     look at both now.
-
-     * Danny Cohen and Alan Katz of the University of Southern California
-     Information Sciences Institute began circulating as an Internet RFC
-     (RFC 1314) about a month ago a standard for a TIFF interchange
-     format for Internet distribution of monochrome bit-mapped images,
-     which LYNCH said he believed would be used as a de facto standard.
-
-     * FLEISCHHAUER's impression from hearing these reports and thinking
-     about AM's experience was that there is considerable flux concerning
-     available hardware and software solutions.  HOOTON agreed and
-     commented at the same time on ZIDAR's statement that the equipment
-     employed affects the results produced.  One cannot draw a complete
-     conclusion by saying it is difficult or impossible to perform OCR
-     from scanning microfilm, for example, with that device,  that set of
-     parameters, and system requirements, because numerous other people
-     are accomplishing just that, using other components, perhaps. 
-     HOOTON opined that both the hardware and the software were highly
-     important.  Most of the problems discussed today have been solved in
-     numerous different ways by other people.  Though it is good to be
-     cognizant of various experiences, this is not to say that it will
-     always be thus.
-
-     * At NAL, the through-put rate of the scanning process for paper,
-     page by page, performing OCR, ranges from 300 to 600 pages per day;
-     not performing OCR is considerably faster, although how much faster
-     is not known.  This is for scanning from bound books, which is much
-     slower.
-
-     * WATERS commented on window management questions:  DEC proposed an
-     X-Windows solution which was problematical for two reasons.  One was
-     POB's requirement to be able to manipulate images on the workstation
-     and bring them down to the workstation itself and the other was
-     network usage.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-THOMA * Illustration of deficiencies in scanning and storage process *
-Image quality in this process * Different costs entailed by better image
-quality * Techniques for overcoming various de-ficiencies:  fixed
-thresholding, dynamic thresholding, dithering, image merge * Page edge
-effects *   
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-George THOMA, chief, Communications Engineering Branch, National Library
-of Medicine (NLM), illustrated several of the deficiencies discussed by
-the previous speakers.  He introduced the topic of special problems by
-noting the advantages of electronic imaging.  For example, it is regenerable
-because it is a coded file, and real-time quality control is possible with
-electronic capture, whereas in photographic capture it is not.
-
-One of the difficulties discussed in the scanning and storage process was
-image quality which, without belaboring the obvious, means different
-things for maps, medical X-rays, or broadcast television.  In the case of
-documents, THOMA said, image quality boils down to legibility of the
-textual parts, and fidelity in the case of gray or color photo print-type
-material.  Legibility boils down to scan density, the standard in most
-cases being 300 dpi.  Increasing the resolution with scanners that
-perform 600 or 1200 dpi, however, comes at a cost.
-
-Better image quality entails at least four different kinds of costs:  1)
-equipment costs, because the CCD (i.e., charge-couple device) with
-greater number of elements costs more;  2) time costs that translate to
-the actual capture costs, because manual labor is involved (the time is
-also dependent on the fact that more data has to be moved around in the
-machine in the scanning or network devices that perform the scanning as
-well as the storage);  3) media costs, because at high resolutions larger
-files have to be stored; and 4) transmission costs, because there is just
-more data to be transmitted.
-
-But while resolution takes care of the issue of legibility in image
-quality, other deficiencies have to do with contrast and elements on the
-page scanned or the image that needed to be removed or clarified.  Thus,
-THOMA proceeded to illustrate various deficiencies, how they are
-manifested, and several techniques to overcome them.
-
-Fixed thresholding was the first technique described, suitable for
-black-and-white text, when the contrast does not vary over the page.  One
-can have many different threshold levels in scanning devices.  Thus,
-THOMA offered an example of extremely poor contrast, which resulted from
-the fact that the stock was a heavy red.  This is the sort of image that
-when microfilmed fails to provide any legibility whatsoever.  Fixed
-thresholding is the way to change the black-to-red contrast to the
-desired black-to-white contrast.
-
-Other examples included material that had been browned or yellowed by
-age.  This was also a case of contrast deficiency, and correction was
-done by fixed thresholding.  A final example boils down to the same
-thing, slight variability, but it is not significant.  Fixed thresholding
-solves this problem as well.  The microfilm equivalent is certainly legible,
-but it comes with dark areas.  Though THOMA did not have a slide of the
-microfilm in this case, he did show the reproduced electronic image.
-
-When one has variable contrast over a page or the lighting over the page
-area varies, especially in the case where a bound volume has light
-shining on it, the image must be processed by a dynamic thresholding
-scheme.  One scheme, dynamic averaging, allows the threshold level not to
-be fixed but to be recomputed for every pixel from the neighboring
-characteristics.  The neighbors of a pixel determine where the threshold
-should be set for that pixel.
-
-THOMA showed an example of a page that had been made deficient by a
-variety of techniques, including a burn mark, coffee stains, and a yellow
-marker.  Application of a fixed-thresholding scheme, THOMA argued, might
-take care of several deficiencies on the page but not all of them. 
-Performing the calculation for a dynamic threshold setting, however,
-removes most of the deficiencies so that at least the text is legible.
-
-Another problem is representing a gray level with black-and-white pixels
-by a process known as dithering or electronic screening.  But dithering
-does not provide good image quality for pure black-and-white textual
-material.  THOMA illustrated this point with examples. Although its
-suitability for photoprint is the reason for electronic screening or
-dithering, it cannot be used for every compound image.  In the document
-that was distributed by CXP, THOMA noticed that the dithered image of the
-IEEE test chart evinced some deterioration in the text.  He presented an
-extreme example of deterioration in the text in which compounded
-documents had to be set right by other techniques.  The technique
-illustrated by the present example was an image merge in which the page
-is scanned twice and the settings go from fixed threshold to the
-dithering matrix; the resulting images are merged to give the best
-results with each technique.
-
-THOMA illustrated how dithering is also used in nonphotographic or
-nonprint materials with an example of a grayish page from a medical text,
-which was reproduced to show all of the gray that appeared in the
-original.  Dithering provided a reproduction of all the gray in the
-original of another example from the same text.
-
-THOMA finally illustrated the problem of bordering, or page-edge,
-effects.  Books and bound volumes that are placed on a photocopy machine
-or a scanner produce page-edge effects that are undesirable for two
-reasons:  1) the aesthetics of the image; after all, if the image is to
-be preserved, one does not necessarily want to keep all of its
-deficiencies; 2) compression (with the bordering problem THOMA
-illustrated, the compression ratio deteriorated tremendously).  One way
-to eliminate this more serious problem is to have the operator at the
-point of scanning window the part of the image that is desirable and
-automatically turn all of the pixels out of that picture to white. 
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-FLEISCHHAUER * AM's experience with scanning bound materials * Dithering
-*
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Carl FLEISCHHAUER, coordinator, American Memory, Library of Congress,
-reported AM's experience with scanning bound materials, which he likened
-to the problems involved in using photocopying machines.  Very few
-devices in the industry offer book-edge scanning, let alone book cradles. 
-The problem may be unsolvable, FLEISCHHAUER said, because a large enough
-market does not exist for a preservation-quality scanner.  AM is using a
-Kurzweil scanner, which is a book-edge scanner now sold by Xerox.
-
-Devoting the remainder of his brief presentation to dithering,
-FLEISCHHAUER related AM's experience with a contractor who was using
-unsophisticated equipment and software to reduce moire patterns from
-printed halftones.  AM took the same image and used the dithering
-algorithm that forms part of the same Kurzweil Xerox scanner; it
-disguised moire patterns much more effectively.
-
-FLEISCHHAUER also observed that dithering produces a binary file which is
-useful for numerous purposes, for example, printing it on a laser printer
-without having to "re-halftone" it.  But it tends to defeat efficient
-compression, because the very thing that dithers to reduce moire patterns
-also tends to work against compression schemes.  AM thought the
-difference in image quality was worth it.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Relative use as a criterion for POB's selection of books to
-be converted into digital form *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the discussion period, WATERS noted that one of the criteria for
-selecting books among the 10,000 to be converted into digital image form
-would be how much relative use they would receive--a subject still
-requiring evaluation.  The challenge will be to understand whether
-coherent bodies of material will increase usage or whether POB should
-seek material that is being used, scan that, and make it more accessible. 
-POB might decide to digitize materials that are already heavily used, in
-order to make them more accessible and decrease wear on them.  Another
-approach would be to provide a large body of intellectually coherent
-material that may be used more in digital form than it is currently used
-in microfilm.  POB would seek material that was out of copyright.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-BARONAS * Origin and scope of AIIM * Types of documents produced in
-AIIM's standards program * Domain of AIIM's standardization work * AIIM's
-structure * TC 171 and MS23 * Electronic image management standards *
-Categories of EIM standardization where AIIM standards are being
-developed *  
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Jean BARONAS, senior manager, Department of Standards and Technology,
-Association for Information and Image Management (AIIM), described the
-not-for-profit association and the national and international programs
-for standardization in which AIIM is active.
-
-Accredited for twenty-five years as the nation's standards development
-organization for document image management, AIIM began life in a library
-community developing microfilm standards.  Today the association
-maintains both its library and business-image management standardization
-activities--and has moved into electronic image-management
-standardization (EIM).
-
-BARONAS defined the program's scope.  AIIM deals with:  1) the
-terminology of standards and of the technology it uses; 2) methods of
-measurement for the systems, as well as quality; 3) methodologies for
-users to evaluate and measure quality; 4) the features of apparatus used
-to manage and edit images; and 5) the procedures used to manage images.
-
-BARONAS noted that three types of documents are produced in the AIIM
-standards program:  the first two, accredited by the American National
-Standards Institute (ANSI), are standards and standard recommended
-practices.  Recommended practices differ from standards in that they
-contain more tutorial information.  A technical report is not an ANSI
-standard.  Because AIIM's policies and procedures for developing
-standards are approved by ANSI, its standards are labeled ANSI/AIIM,
-followed by the number and title of the standard.
-
-BARONAS then illustrated the domain of AIIM's standardization work.  For
-example, AIIM is the administrator of the U.S. Technical Advisory Group
-(TAG) to the International Standards Organization's (ISO) technical
-committee, TC l7l Micrographics and Optical Memories for Document and
-Image Recording, Storage, and Use.  AIIM officially works through ANSI in
-the international standardization process.
-
-BARONAS described AIIM's structure, including its board of directors, its
-standards board of twelve individuals active in the image-management
-industry, its strategic planning and legal admissibility task forces, and
-its National Standards Council, which is comprised of the members of a
-number of organizations who vote on every AIIM standard before it is
-published.  BARONAS pointed out that AIIM's liaisons deal with numerous
-other standards developers, including the optical disk community, office
-and publishing systems, image-codes-and-character set committees, and the
-National Information Standards Organization (NISO).
-
-BARONAS illustrated the procedures of TC l7l, which covers all aspects of
-image management.  When AIIM's national program has conceptualized a new
-project, it is usually submitted to the international level, so that the
-member countries of TC l7l can simultaneously work on the development of
-the standard or the technical report.  BARONAS also illustrated a classic
-microfilm standard, MS23, which deals with numerous imaging concepts that
-apply to electronic imaging.  Originally developed in the l970s, revised
-in the l980s, and revised again in l991, this standard is scheduled for
-another revision.  MS23 is an active standard whereby users may propose
-new density ranges and new methods of evaluating film images in the
-standard's revision.
-
-BARONAS detailed several electronic image-management standards, for
-instance, ANSI/AIIM MS44, a quality-control guideline for scanning 8.5"
-by 11" black-and-white office documents.  This standard is used with the
-IEEE fax image--a continuous tone photographic image with gray scales,
-text, and several continuous tone pictures--and AIIM test target number
-2, a representative document used in office document management.
-
-BARONAS next outlined the four categories of EIM standardization in which
-AIIM standards are being developed:  transfer and retrieval, evaluation,
-optical disc and document scanning applications, and design and
-conversion of documents.  She detailed several of the main projects of
-each:  1) in the category of image transfer and retrieval, a bi-level
-image transfer format, ANSI/AIIM MS53, which is a proposed standard that
-describes a file header for image transfer between unlike systems when
-the images are compressed using G3 and G4 compression; 2) the category of
-image evaluation, which includes the AIIM-proposed TR26 tutorial on image
-resolution (this technical report will treat the differences and
-similarities between classical or photographic and electronic imaging);
-3) design and conversion, which includes a proposed technical report
-called "Forms Design Optimization for EIM" (this report considers how
-general-purpose business forms can be best designed so that scanning is
-optimized; reprographic characteristics such as type, rules, background,
-tint, and color will likewise be treated in the technical report); 4)
-disk and document scanning applications includes a project a) on planning
-platters and disk management, b) on generating an application profile for
-EIM when images are stored and distributed on CD-ROM, and c) on
-evaluating SCSI2, and how a common command set can be generated for SCSI2
-so that document scanners are more easily integrated.  (ANSI/AIIM MS53
-will also apply to compressed images.)
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-BATTIN * The implications of standards for preservation * A major
-obstacle to successful cooperation * A hindrance to access in the digital
-environment * Standards a double-edged sword for those concerned with the
-preservation of the human record * Near-term prognosis for reliable
-archival standards * Preservation concerns for electronic media * Need
-for reconceptualizing our preservation principles * Standards in the real
-world and the politics of reproduction * Need to redefine the concept of
-archival and to begin to think in terms of life cycles * Cooperation and
-the La Guardia Eight * Concerns generated by discussions on the problems
-of preserving text and image * General principles to be adopted in a
-world without standards *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Patricia BATTIN, president, the Commission on Preservation and Access
-(CPA), addressed the implications of standards for preservation.  She
-listed several areas where the library profession and the analog world of
-the printed book had made enormous contributions over the past hundred
-years--for example, in bibliographic formats, binding standards, and, most
-important, in determining what constitutes longevity or archival quality.
-
-Although standards have lightened the preservation burden through the
-development of national and international collaborative programs,
-nevertheless, a pervasive mistrust of other people's standards remains a
-major obstacle to successful cooperation, BATTIN said.
-
-The zeal to achieve perfection, regardless of the cost, has hindered
-rather than facilitated access in some instances, and in the digital
-environment, where no real standards exist, has brought an ironically
-just reward.
-
-BATTIN argued that standards are a double-edged sword for those concerned
-with the preservation of the human record, that is, the provision of
-access to recorded knowledge in a multitude of media as far into the
-future as possible.  Standards are essential to facilitate
-interconnectivity and access, but, BATTIN said, as LYNCH pointed out
-yesterday, if set too soon they can hinder creativity, expansion of
-capability, and the broadening of access.  The characteristics of
-standards for digital imagery differ radically from those for analog
-imagery.  And the nature of digital technology implies continuing
-volatility and change.  To reiterate, precipitous standard-setting can
-inhibit creativity, but delayed standard-setting results in chaos.
-
-Since in BATTIN'S opinion the near-term prognosis for reliable archival
-standards, as defined by librarians in the analog world, is poor, two
-alternatives remain:  standing pat with the old technology, or
-reconceptualizing.
-
-Preservation concerns for electronic media fall into two general domains. 
-One is the continuing assurance of access to knowledge originally
-generated, stored, disseminated, and used in electronic form.  This
-domain contains several subdivisions, including 1) the closed,
-proprietary systems discussed the previous day, bundled information such
-as electronic journals and government agency records, and electronically
-produced or captured raw data; and 2) the application of digital
-technologies to the reformatting of materials originally published on a
-deteriorating analog medium such as acid paper or videotape.
-
-The preservation of electronic media requires a reconceptualizing of our
-preservation principles during a volatile, standardless transition which
-may last far longer than any of us envision today.  BATTIN urged the
-necessity of shifting focus from assessing, measuring, and setting
-standards for the permanence of the medium to the concept of managing
-continuing access to information stored on a variety of media and
-requiring a variety of ever-changing hardware and software for access--a
-fundamental shift for the library profession.
-
-BATTIN offered a primer on how to move forward with reasonable confidence
-in a world without standards.  Her comments fell roughly into two sections:
-1) standards in the real world and 2) the politics of reproduction.
-
-In regard to real-world standards, BATTIN argued the need to redefine the
-concept of archive and to begin to think in terms of life cycles.  In
-the past, the naive assumption that paper would last forever produced a
-cavalier attitude toward life cycles.  The transient nature of the
-electronic media has compelled people to recognize and accept upfront the
-concept of life cycles in place of permanency.
-
-Digital standards have to be developed and set in a cooperative context
-to ensure efficient exchange of information.  Moreover, during this
-transition period, greater flexibility concerning how concepts such as
-backup copies and archival copies in the CXP are defined is necessary,
-or the opportunity to move forward will be lost.
-
-In terms of cooperation, particularly in the university setting, BATTIN
-also argued the need to avoid going off in a hundred different
-directions.  The CPA has catalyzed a small group of universities called
-the La Guardia Eight--because La Guardia Airport is where meetings take
-place--Harvard, Yale, Cornell, Princeton, Penn State, Tennessee,
-Stanford, and USC, to develop a digital preservation consortium to look
-at all these issues and develop de facto standards as we move along,
-instead of waiting for something that is officially blessed.  Continuing
-to apply analog values and definitions of standards to the digital
-environment, BATTIN said, will effectively lead to forfeiture of the
-benefits of digital technology to research and scholarship.
-
-Under the second rubric, the politics of reproduction, BATTIN reiterated
-an oft-made argument concerning the electronic library, namely, that it
-is more difficult to transform than to create, and nowhere is that belief
-expressed more dramatically than in the conversion of brittle books to
-new media.  Preserving information published in electronic media involves
-making sure the information remains accessible and that digital
-information is not lost through reproduction.  In the analog world of
-photocopies and microfilm, the issue of fidelity to the original becomes
-paramount, as do issues of "Whose fidelity?" and "Whose original?"
-
-BATTIN elaborated these arguments with a few examples from a recent study
-conducted by the CPA on the problems of preserving text and image. 
-Discussions with scholars, librarians, and curators in a variety of
-disciplines dependent on text and image generated a variety of concerns,
-for example:  1) Copy what is, not what the technology is capable of. 
-This is very important for the history of ideas.  Scholars wish to know
-what the author saw and worked from.  And make available at the
-workstation the opportunity to erase all the defects and enhance the
-presentation.  2) The fidelity of reproduction--what is good enough, what
-can we afford, and the difference it makes--issues of subjective versus
-objective resolution.  3) The differences between primary and secondary
-users.  Restricting the definition of primary user to the one in whose
-discipline the material has been published runs one headlong into the
-reality that these printed books have had a host of other users from a
-host of other disciplines, who not only were looking for very different
-things, but who also shared values very different from those of the
-primary user.  4) The relationship of the standard of reproduction to new
-capabilities of scholarship--the browsing standard versus an archival
-standard.  How good must the archival standard be?  Can a distinction be
-drawn between potential users in setting standards for reproduction? 
-Archival storage, use copies, browsing copies--ought an attempt to set
-standards even be made?  5) Finally, costs.  How much are we prepared to
-pay to capture absolute fidelity?  What are the trade-offs between vastly
-enhanced access, degrees of fidelity, and costs?
-
-These standards, BATTIN concluded, serve to complicate further the
-reproduction process, and add to the long list of technical standards
-that are necessary to ensure widespread access.  Ways to articulate and
-analyze the costs that are attached to the different levels of standards
-must be found.
-
-Given the chaos concerning standards, which promises to linger for the
-foreseeable future, BATTIN urged adoption of the following general
-principles:
-
-     * Strive to understand the changing information requirements of
-     scholarly disciplines as more and more technology is integrated into
-     the process of research and scholarly communication in order to meet
-     future scholarly needs, not to build for the past.  Capture
-     deteriorating information at the highest affordable resolution, even
-     though the dissemination and display technologies will lag.
-
-     * Develop cooperative mechanisms to foster agreement on protocols
-     for document structure and other interchange mechanisms necessary
-     for widespread dissemination and use before official standards are
-     set.
-
-     * Accept that, in a transition period, de facto standards will have
-     to be developed.
-
-     * Capture information in a way that keeps all options open and
-     provides for total convertibility:  OCR, scanning of microfilm,
-     producing microfilm from scanned documents, etc.
-
-     * Work closely with the generators of information and the builders
-     of networks and databases to ensure that continuing accessibility is
-     a primary concern from the beginning.
-
-     * Piggyback on standards under development for the broad market, and
-     avoid library-specific standards; work with the vendors, in order to
-     take advantage of that which is being standardized for the rest of
-     the world.
-
-     * Concentrate efforts on managing permanence in the digital world,
-     rather than perfecting the longevity of a particular medium.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Additional comments on TIFF *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the brief discussion period that followed BATTIN's presentation,
-BARONAS explained that TIFF was not developed in collaboration with or
-under the auspices of AIIM.  TIFF is a company product, not a standard,
-is owned by two corporations, and is always changing.  BARONAS also
-observed that ANSI/AIIM MS53, a bi-level image file transfer format that
-allows unlike systems to exchange images, is compatible with TIFF as well
-as with DEC's architecture and IBM's MODCA/IOCA.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-HOOTON * Several questions to be considered in discussing text conversion
-*
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-HOOTON introduced the final topic, text conversion, by noting that it is
-becoming an increasingly important part of the imaging business.  Many
-people now realize that it enhances their system to be able to have more
-and more character data as part of their imaging system.  Re the issue of
-OCR versus rekeying, HOOTON posed several questions:  How does one get
-text into computer-readable form?  Does one use automated processes? 
-Does one attempt to eliminate the use of operators where possible? 
-Standards for accuracy, he said, are extremely important:  it makes a
-major difference in cost and time whether one sets as a standard 98.5
-percent acceptance or 99.5 percent.  He mentioned outsourcing as a
-possibility for converting text.  Finally, what one does with the image
-to prepare it for the recognition process is also important, he said,
-because such preparation changes how recognition is viewed, as well as
-facilitates recognition itself.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-LESK * Roles of participants in CORE * Data flow * The scanning process *
-The image interface * Results of experiments involving the use of
-electronic resources and traditional paper copies * Testing the issue of
-serendipity * Conclusions *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Michael LESK, executive director, Computer Science Research, Bell
-Communications Research, Inc. (Bellcore), discussed the Chemical Online
-Retrieval Experiment (CORE), a cooperative project involving Cornell
-University, OCLC, Bellcore, and the American Chemical Society (ACS).
-
-LESK spoke on 1) how the scanning was performed, including the unusual
-feature of page segmentation, and 2) the use made of the text and the
-image in experiments.
-
-Working with the chemistry journals (because ACS has been saving its
-typesetting tapes since the mid-1970s and thus has a significant back-run
-of the most important chemistry journals in the United States), CORE is
-attempting to create an automated chemical library.  Approximately a
-quarter of the pages by square inch are made up of images of
-quasi-pictorial material; dealing with the graphic components of the
-pages is extremely important.  LESK described the roles of participants
-in CORE:  1) ACS provides copyright permission, journals on paper,
-journals on microfilm, and some of the definitions of the files; 2) at
-Bellcore, LESK chiefly performs the data preparation, while Dennis Egan
-performs experiments on the users of chemical abstracts, and supplies the
-indexing and numerous magnetic tapes;  3) Cornell provides the site of the
-experiment; 4) OCLC develops retrieval software and other user interfaces.
-Various manufacturers and publishers have furnished other help.
-
-Concerning data flow, Bellcore receives microfilm and paper from ACS; the
-microfilm is scanned by outside vendors, while the paper is scanned
-inhouse on an Improvision scanner, twenty pages per minute at 300 dpi,
-which provides sufficient quality for all practical uses.  LESK would
-prefer to have more gray level, because one of the ACS journals prints on
-some colored pages, which creates a problem.
-
-Bellcore performs all this scanning, creates a page-image file, and also
-selects from the pages the graphics, to mix with the text file (which is
-discussed later in the Workshop).  The user is always searching the ASCII
-file, but she or he may see a display based on the ASCII or a display
-based on the images.
-
-LESK illustrated how the program performs page analysis, and the image
-interface.  (The user types several words, is presented with a list--
-usually of the titles of articles contained in an issue--that derives
-from the ASCII, clicks on an icon and receives an image that mirrors an
-ACS page.)  LESK also illustrated an alternative interface, based on text
-on the ASCII, the so-called SuperBook interface from Bellcore.
-
-LESK next presented the results of an experiment conducted by Dennis Egan
-and involving thirty-six students at Cornell, one third of them
-undergraduate chemistry majors, one third senior undergraduate chemistry
-majors, and one third graduate chemistry students.  A third of them
-received the paper journals, the traditional paper copies and chemical
-abstracts on paper.  A third received image displays of the pictures of
-the pages, and a third received the text display with pop-up graphics.
-
-The students were given several questions made up by some chemistry
-professors.  The questions fell into five classes, ranging from very easy
-to very difficult, and included questions designed to simulate browsing
-as well as a traditional information retrieval-type task.
-
-LESK furnished the following results.  In the straightforward question
-search--the question being, what is the phosphorus oxygen bond distance
-and hydroxy phosphate?--the students were told that they could take
-fifteen minutes and, then, if they wished, give up.  The students with
-paper took more than fifteen minutes on average, and yet most of them
-gave up.  The students with either electronic format, text or image,
-received good scores in reasonable time, hardly ever had to give up, and
-usually found the right answer.
-
-In the browsing study, the students were given a list of eight topics,
-told to imagine that an issue of the Journal of the American Chemical
-Society had just appeared on their desks, and were also told to flip
-through it and to find topics mentioned in the issue.  The average scores
-were about the same.  (The students were told to answer yes or no about
-whether or not particular topics appeared.)  The errors, however, were
-quite different.  The students with paper rarely said that something
-appeared when it had not.  But they often failed to find something
-actually mentioned in the issue.  The computer people found numerous
-things, but they also frequently said that a topic was mentioned when it
-was not.  (The reason, of course, was that they were performing word
-searches.  They were finding that words were mentioned and they were
-concluding that they had accomplished their task.)
-
-This question also contained a trick to test the issue of serendipity. 
-The students were given another list of eight topics and instructed,
-without taking a second look at the journal, to recall how many of this
-new list of eight topics were in this particular issue.  This was an
-attempt to see if they performed better at remembering what they were not
-looking for.  They all performed about the same, paper or electronics,
-about 62 percent accurate.  In short, LESK said, people were not very
-good when it came to serendipity, but they were no worse at it with
-computers than they were with paper.
-
-(LESK gave a parenthetical illustration of the learning curve of students
-who used SuperBook.)
-
-The students using the electronic systems started off worse than the ones
-using print, but by the third of the three sessions in the series had
-caught up to print.  As one might expect, electronics provide a much
-better means of finding what one wants to read; reading speeds, once the
-object of the search has been found, are about the same.
-
-Almost none of the students could perform the hard task--the analogous
-transformation.  (It would require the expertise of organic chemists to
-complete.)  But an interesting result was that the students using the text
-search performed terribly, while those using the image system did best.
-That the text search system is driven by text offers the explanation.
-Everything is focused on the text; to see the pictures, one must press
-on an icon.  Many students found the right article containing the answer
-to the question, but they did not click on the icon to bring up the right
-figure and see it.  They did not know that they had found the right place,
-and thus got it wrong.
-
-The short answer demonstrated by this experiment was that in the event
-one does not know what to read, one needs the electronic systems; the
-electronic systems hold no advantage at the moment if one knows what to
-read, but neither do they impose a penalty.
-
-LESK concluded by commenting that, on one hand, the image system was easy
-to use.  On the other hand, the text display system, which represented
-twenty man-years of work in programming and polishing, was not winning,
-because the text was not being read, just searched.  The much easier
-system is highly competitive as well as remarkably effective for the
-actual chemists.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-ERWAY * Most challenging aspect of working on AM * Assumptions guiding
-AM's approach * Testing different types of service bureaus * AM's
-requirement for 99.95 percent accuracy * Requirements for text-coding *
-Additional factors influencing AM's approach to coding * Results of AM's
-experience with rekeying * Other problems in dealing with service bureaus
-* Quality control the most time-consuming aspect of contracting out
-conversion * Long-term outlook uncertain *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-To Ricky ERWAY, associate coordinator, American Memory, Library of
-Congress, the constant variety of conversion projects taking place
-simultaneously represented perhaps the most challenging aspect of working
-on AM.  Thus, the challenge was not to find a solution for text
-conversion but a tool kit of solutions to apply to LC's varied
-collections that need to be converted.  ERWAY limited her remarks to the
-process of converting text to machine-readable form, and the variety of
-LC's text collections, for example, bound volumes, microfilm, and
-handwritten manuscripts.
-
-Two assumptions have guided AM's approach, ERWAY said:  1) A desire not
-to perform the conversion inhouse.  Because of the variety of formats and
-types of texts, to capitalize the equipment and have the talents and
-skills to operate them at LC would be extremely expensive.  Further, the
-natural inclination to upgrade to newer and better equipment each year
-made it reasonable for AM to focus on what it did best and seek external
-conversion services.  Using service bureaus also allowed AM to have
-several types of operations take place at the same time.  2) AM was not a
-technology project, but an effort to improve access to library
-collections.  Hence, whether text was converted using OCR or rekeying
-mattered little to AM.  What mattered were cost and accuracy of results.
-
-AM considered different types of service bureaus and selected three to
-perform several small tests in order to acquire a sense of the field. 
-The sample collections with which they worked included handwritten
-correspondence, typewritten manuscripts from the 1940s, and
-eighteenth-century printed broadsides on microfilm.  On none of these
-samples was OCR performed; they were all rekeyed.  AM had several special
-requirements for the three service bureaus it had engaged.  For instance,
-any errors in the original text were to be retained.  Working from bound
-volumes or anything that could not be sheet-fed also constituted a factor
-eliminating companies that would have performed OCR.
-
-AM requires 99.95 percent accuracy, which, though it sounds high, often
-means one or two errors per page.  The initial batch of test samples
-contained several handwritten materials for which AM did not require
-text-coding.  The results, ERWAY reported, were in all cases fairly
-comparable:  for the most part, all three service bureaus achieved 99.95
-percent accuracy.  AM was satisfied with the work but surprised at the cost.
-
-As AM began converting whole collections, it retained the requirement for
-99.95 percent accuracy and added requirements for text-coding.  AM needed
-to begin performing work more than three years ago before LC requirements
-for SGML applications had been established.  Since AM's goal was simply
-to retain any of the intellectual content represented by the formatting
-of the document (which would be lost if one performed a straight ASCII
-conversion), AM used "SGML-like" codes.  These codes resembled SGML tags
-but were used without the benefit of document-type definitions.  AM found
-that many service bureaus were not yet SGML-proficient.
-
-Additional factors influencing the approach AM took with respect to
-coding included:  1) the inability of any known microcomputer-based
-user-retrieval software to take advantage of SGML coding; and 2) the
-multiple inconsistencies in format of the older documents, which
-confirmed AM in its desire not to attempt to force the different formats
-to conform to a single document-type definition (DTD) and thus create the
-need for a separate DTD for each document. 
-
-The five text collections that AM has converted or is in the process of
-converting include a collection of eighteenth-century broadsides, a
-collection of pamphlets, two typescript document collections, and a
-collection of 150 books.
-
-ERWAY next reviewed the results of AM's experience with rekeying, noting
-again that because the bulk of AM's materials are historical, the quality
-of the text often does not lend itself to OCR.  While non-English
-speakers are less likely to guess or elaborate or correct typos in the
-original text, they are also less able to infer what we would; they also
-are nearly incapable of converting handwritten text.  Another
-disadvantage of working with overseas keyers is that they are much less
-likely to telephone with questions, especially on the coding, with the
-result that they develop their own rules as they encounter new
-situations.
-
-Government contracting procedures and time frames posed a major challenge
-to performing the conversion.  Many service bureaus are not accustomed to
-retaining the image, even if they perform OCR.  Thus, questions of image
-format and storage media were somewhat novel to many of them.  ERWAY also
-remarked other problems in dealing with service bureaus, for example,
-their inability to perform text conversion from the kind of microfilm
-that LC uses for preservation purposes.
-
-But quality control, in ERWAY's experience, was the most time-consuming
-aspect of contracting out conversion.  AM has been attempting to perform
-a 10-percent quality review, looking at either every tenth document or
-every tenth page to make certain that the service bureaus are maintaining
-99.95 percent accuracy.  But even if they are complying with the
-requirement for accuracy, finding errors produces a desire to correct
-them and, in turn, to clean up the whole collection, which defeats the
-purpose to some extent.  Even a double entry requires a
-character-by-character comparison to the original to meet the accuracy
-requirement.  LC is not accustomed to publish imperfect texts, which
-makes attempting to deal with the industry standard an emotionally
-fraught issue for AM.  As was mentioned in the previous day's discussion,
-going from 99.95 to 99.99 percent accuracy usually doubles costs and
-means a third keying or another complete run-through of the text.
-
-Although AM has learned much from its experiences with various collections
-and various service bureaus, ERWAY concluded pessimistically that no
-breakthrough has been achieved.   Incremental improvements have occurred
-in some of the OCR technology, some of the processes, and some of the
-standards acceptances, which, though they may lead to somewhat lower costs,
-do not offer much encouragement to many people who are anxiously awaiting
-the day that the entire contents of LC are available on-line.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-ZIDAR * Several answers to why one attempts to perform full-text
-conversion * Per page cost of performing OCR * Typical problems
-encountered during editing * Editing poor copy OCR vs. rekeying *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Judith ZIDAR, coordinator, National Agricultural Text Digitizing Program
-(NATDP), National Agricultural Library (NAL), offered several answers to
-the question of why one attempts to perform full-text conversion:  1)
-Text in an image can be read by a human but not by a computer, so of
-course it is not searchable and there is not much one can do with it.  2)
-Some material simply requires word-level access.  For instance, the legal
-profession insists on full-text access to its material; with taxonomic or
-geographic material, which entails numerous names, one virtually requires
-word-level access.  3) Full text permits rapid browsing and searching,
-something that cannot be achieved in an image with today's technology. 
-4) Text stored as ASCII and delivered in ASCII is standardized and highly
-portable.  5) People just want full-text searching, even those who do not
-know how to do it.  NAL, for the most part, is performing OCR at an
-actual cost per average-size page of approximately $7.  NAL scans the
-page to create the electronic image and passes it through the OCR device.
-
-ZIDAR next rehearsed several typical problems encountered during editing. 
-Praising the celerity of her student workers, ZIDAR observed that editing
-requires approximately five to ten minutes per page, assuming that there
-are no large tables to audit.  Confusion among the three characters I, 1, 
-and l, constitutes perhaps the most common problem encountered.  Zeroes
-and  O's also are  frequently confused.  Double M's create a particular
-problem, even on clean pages.  They are so wide in most fonts that they
-touch, and the system simply cannot tell where one letter ends and the
-other begins.  Complex page formats occasionally fail to columnate
-properly, which entails rescanning as though one were working with a
-single column, entering the ASCII, and decolumnating for better
-searching.  With proportionally spaced text, OCR can have difficulty
-discerning what is a space and what are merely spaces between letters, as
-opposed to spaces between words, and therefore will merge text or break
-up words where it should not.
-
-ZIDAR said that it can often take longer to edit a poor-copy OCR than to
-key it from scratch.  NAL has also experimented with partial editing of
-text, whereby project workers go into and clean up the format, removing
-stray characters but not running a spell-check.  NAL corrects typos in
-the title and authors' names, which provides a foothold for searching and
-browsing.  Even extremely poor-quality OCR (e.g., 60-percent accuracy)
-can still be searched, because numerous words are correct, while the
-important words are probably repeated often enough that they are likely
-to be found correct somewhere.  Librarians, however, cannot tolerate this
-situation, though end users seem more willing to use this text for
-searching, provided that NAL indicates that it is unedited.  ZIDAR
-concluded that rekeying of text may be the best route to take, in spite
-of numerous problems with quality control and cost.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Modifying an image before performing OCR * NAL's costs per
-page *AM's costs per page and experience with Federal Prison Industries *
-Elements comprising NATDP's costs per page * OCR and structured markup *
-Distinction between the structure of a document and its representation
-when put on the screen or printed *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-HOOTON prefaced the lengthy discussion that followed with several
-comments about modifying an image before one reaches the point of
-performing OCR.  For example, in regard to an application containing a
-significant amount of redundant data, such as form-type data, numerous
-companies today are working on various kinds of form renewal, prior to
-going through a recognition process, by using dropout colors.  Thus,
-acquiring access to form design or using electronic means are worth
-considering.  HOOTON also noted that conversion usually makes or breaks
-one's imaging system.  It is extremely important, extremely costly in
-terms of either capital investment or service, and determines the quality
-of the remainder of one's system, because it determines the character of
-the raw material used by the system.
-
-Concerning the four projects undertaken by NAL, two inside and two
-performed by outside contractors, ZIDAR revealed that an in-house service
-bureau executed the first at a cost between $8 and $10 per page for
-everything, including building of the database.  The project undertaken
-by the Consultative Group on International Agricultural Research (CGIAR)
-cost approximately $10 per page for the conversion, plus some expenses
-for the software and building of the database.  The Acid Rain Project--a
-two-disk set produced by the University of Vermont, consisting of
-Canadian publications on acid rain--cost $6.70 per page for everything,
-including keying of the text, which was double keyed, scanning of the
-images, and building of the database.  The in-house project offered
-considerable ease of convenience and greater control of the process.  On
-the other hand, the service bureaus know their job and perform it
-expeditiously, because they have more people.
-
-As a useful comparison, ERWAY revealed AM's costs as follows:  $0.75
-cents to $0.85 cents per thousand characters, with an average page
-containing 2,700 characters.  Requirements for coding and imaging
-increase the costs.  Thus, conversion of the text, including the coding,
-costs approximately $3 per page.  (This figure does not include the
-imaging and database-building included in the NAL costs.)  AM also
-enjoyed a happy experience with Federal Prison Industries, which
-precluded the necessity of going through the request-for-proposal process
-to award a contract, because it is another government agency.  The
-prisoners performed AM's rekeying just as well as other service bureaus
-and proved handy as well.  AM shipped them the books, which they would
-photocopy on a book-edge scanner.  They would perform the markup on
-photocopies, return the books as soon as they were done with them,
-perform the keying, and return the material to AM on WORM disks.
-
-ZIDAR detailed the elements that constitute the previously noted cost of
-approximately $7 per page.  Most significant is the editing, correction
-of errors, and spell-checkings, which though they may sound easy to
-perform require, in fact, a great deal of time.  Reformatting text also
-takes a while, but a significant amount of NAL's expenses are for equipment,
-which was extremely expensive when purchased because it was one of the few
-systems on the market.  The costs of equipment are being amortized over
-five years but are still quite high, nearly $2,000 per month.
-
-HOCKEY raised a general question concerning OCR and the amount of editing
-required (substantial in her experience) to generate the kind of
-structured markup necessary for manipulating the text on the computer or
-loading it into any retrieval system.  She wondered if the speakers could
-extend the previous question about the cost-benefit of adding or exerting
-structured markup.  ERWAY noted that several OCR systems retain italics,
-bolding, and other spatial formatting.  While the material may not be in
-the format desired, these systems possess the ability to remove the
-original materials quickly from the hands of the people performing the
-conversion, as well as to retain that information so that users can work
-with it.  HOCKEY rejoined that the current thinking on markup is that one
-should not say that something is italic or bold so much as why it is that
-way.  To be sure, one needs to know that something was italicized, but
-how can one get from one to the other?  One can map from the structure to
-the typographic representation.
-
-FLEISCHHAUER suggested that, given the 100 million items the Library
-holds, it may not be possible for LC to do more than report that a thing
-was in italics as opposed to why it was italics, although that may be
-desirable in some contexts.  Promising to talk a bit during the afternoon
-session about several experiments OCLC performed on automatic recognition
-of document elements, and which they hoped to extend, WEIBEL said that in
-fact one can recognize the major elements of a document with a fairly
-high degree of reliability, at least as good as OCR.  STEVENS drew a
-useful distinction between standard, generalized markup (i.e., defining
-for a document-type definition the structure of the document), and what
-he termed a style sheet, which had to do with italics, bolding, and other
-forms of emphasis.  Thus, two different components are at work, one being
-the structure of the document itself (its logic), and the other being its
-representation when it is put on the screen or printed.
-
-                                 ******
-
-SESSION V.  APPROACHES TO PREPARING ELECTRONIC TEXTS
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-HOCKEY * Text in ASCII and the representation of electronic text versus
-an image * The need to look at ways of using markup to assist retrieval *
-The need for an encoding format that will be reusable and multifunctional
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Susan HOCKEY, director, Center for Electronic Texts in the Humanities
-(CETH), Rutgers and Princeton Universities, announced that one talk
-(WEIBEL's) was moved into this session from the morning and that David
-Packard was unable to attend.  The session would attempt to focus more on
-what one can do with a text in ASCII and the representation of electronic
-text rather than just an image, what one can do with a computer that
-cannot be done with a book or an image.  It would be argued that one can
-do much more than just read a text, and from that starting point one can
-use markup and methods of preparing the text to take full advantage of
-the capability of the computer.  That would lead to a discussion of what
-the European Community calls REUSABILITY, what may better be termed
-DURABILITY, that is, how to prepare or make a text that will last a long
-time and that can be used for as many applications as possible, which
-would lead to issues of improving intellectual access.
-
-HOCKEY urged the need to look at ways of using markup to facilitate retrieval,
-not just for referencing or to help locate an item that is retrieved, but also to put markup tags in
-a text to help retrieve the thing sought either with linguistic tagging or
-interpretation.  HOCKEY also argued that little advancement had occurred in
-the software tools currently available for retrieving and searching text.
-She pressed the desideratum of going beyond Boolean searches and performing
-more sophisticated searching, which the insertion of more markup in the text
-would facilitate.  Thinking about electronic texts as opposed to images means
-considering material that will never appear in print form, or print will not
-be its primary form, that is, material which only appears in electronic form.
-HOCKEY alluded to the history and the need for markup and tagging and
-electronic text, which was developed through the use of computers in the
-humanities; as MICHELSON had observed, Father Busa had started in 1949
-to prepare the first-ever text on the computer.
-
-HOCKEY remarked several large projects, particularly in Europe, for the
-compilation of dictionaries, language studies, and language analysis, in
-which people have built up archives of text and have begun to recognize
-the need for an encoding format that will be reusable and multifunctional,
-that can be used not just to print the text, which may be assumed to be a
-byproduct of what one wants to do, but to structure it inside the computer
-so that it can be searched, built into a Hypertext system, etc.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-WEIBEL * OCLC's approach to preparing electronic text:  retroconversion,
-keying of texts, more automated ways of developing data * Project ADAPT
-and the CORE Project * Intelligent character recognition does not exist *
-Advantages of SGML * Data should be free of procedural markup;
-descriptive markup strongly advocated * OCLC's interface illustrated *
-Storage requirements and costs for putting a lot of information on line *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Stuart WEIBEL, senior research scientist, Online Computer Library Center,
-Inc. (OCLC), described OCLC's approach to preparing electronic text.  He
-argued that the electronic world into which we are moving must
-accommodate not only the future but the past as well, and to some degree
-even the present.  Thus, starting out at one end with retroconversion and
-keying of texts, one would like to move toward much more automated ways
-of developing data.
-
-For example, Project ADAPT had to do with automatically converting
-document images into a structured document database with OCR text as
-indexing and also a little bit of automatic formatting and tagging of
-that text.  The CORE project hosted by Cornell University, Bellcore,
-OCLC, the American Chemical Society, and Chemical Abstracts, constitutes
-WEIBEL's principal concern at the moment.  This project is an example of
-converting text for which one already has a machine-readable version into
-a format more suitable for electronic delivery and database searching. 
-(Since Michael LESK had previously described CORE, WEIBEL would say
-little concerning it.)  Borrowing a chemical phrase, de novo synthesis,
-WEIBEL cited the Online Journal of Current Clinical Trials as an example
-of de novo electronic publishing, that is, a form in which the primary
-form of the information is electronic.
-
-Project ADAPT, then, which OCLC completed a couple of years ago and in
-fact is about to resume, is a model in which one takes page images either
-in paper or microfilm and converts them automatically to a searchable
-electronic database, either on-line or local.  The operating assumption
-is that accepting some blemishes in the data, especially for
-retroconversion of materials, will make it possible to accomplish more. 
-Not enough money is available to support perfect conversion.
-
-WEIBEL related several steps taken to perform image preprocessing
-(processing on the image before performing optical character
-recognition), as well as image postprocessing.  He denied the existence
-of intelligent character recognition and asserted that what is wanted is
-page recognition, which is a long way off.  OCLC has experimented with
-merging of multiple optical character recognition systems that will
-reduce errors from an unacceptable rate of 5 characters out of every
-l,000 to an unacceptable rate of 2 characters out of every l,000, but it
-is not good enough.  It will never be perfect.
-
-Concerning the CORE Project, WEIBEL observed that Bellcore is taking the
-topography files, extracting the page images, and converting those
-topography files to SGML markup.  LESK hands that data off to OCLC, which
-builds that data into a Newton database, the same system that underlies
-the on-line system in virtually all of the reference products at OCLC. 
-The long-term goal is to make the systems interoperable so that not just
-Bellcore's system and OCLC's system can access this data, but other
-systems can as well, and the key to that is the Z39.50 common command
-language and the full-text extension.  Z39.50 is fine for MARC records,
-but is not enough to do it for full text (that is, make full texts
-interoperable).
-
-WEIBEL next outlined the critical role of SGML for a variety of purposes,
-for example, as noted by HOCKEY, in the world of extremely large
-databases, using highly structured data to perform field searches. 
-WEIBEL argued that by building the structure of the data in (i.e., the
-structure of the data originally on a printed page), it becomes easy to
-look at a journal article even if one cannot read the characters and know
-where the title or author is, or what the sections of that document would be.
-OCLC wants to make that structure explicit in the database, because it will
-be important for retrieval purposes.
-
-The second big advantage of SGML is that it gives one the ability to
-build structure into the database that can be used for display purposes
-without contaminating the data with instructions about how to format
-things.  The distinction lies between procedural markup, which tells one
-where to put dots on the page, and descriptive markup, which describes
-the elements of a document.
-
-WEIBEL believes that there should be no procedural markup in the data at
-all, that the data should be completely unsullied by information about
-italics or boldness.  That should be left up to the display device,
-whether that display device is a page printer or a screen display device. 
-By keeping one's database free of that kind of contamination, one can
-make decisions down the road, for example, reorganize the data in ways
-that are not cramped by built-in notions of what should be italic and
-what should be bold.  WEIBEL strongly advocated descriptive markup.  As
-an example, he illustrated the index structure in the CORE data.  With
-subsequent illustrated examples of markup, WEIBEL acknowledged the common
-complaint that SGML is hard to read in its native form, although markup
-decreases considerably once one gets into the body.  Without the markup,
-however, one would not have the structure in the data.  One can pass
-markup through a LaTeX processor and convert it relatively easily to a
-printed version of the document.
-
-WEIBEL next illustrated an extremely cluttered screen dump of OCLC's
-system, in order to show as much as possible the inherent capability on
-the screen.  (He noted parenthetically that he had become a supporter of
-X-Windows as a result of the progress of the CORE Project.)  WEIBEL also
-illustrated the two major parts of the interface:  l) a control box that
-allows one to generate lists of items, which resembles a small table of
-contents based on key words one wishes to search, and 2) a document
-viewer, which is a separate process in and of itself.  He demonstrated
-how to follow links through the electronic database simply by selecting
-the appropriate button and bringing them up.  He also noted problems that
-remain to be accommodated in the interface (e.g., as pointed out by LESK,
-what happens when users do not click on the icon for the figure).
-
-Given the constraints of time, WEIBEL omitted a large number of ancillary
-items in order to say a few words concerning storage requirements and
-what will be required to put a lot of things on line.  Since it is
-extremely expensive to reconvert all of this data, especially if it is
-just in paper form (and even if it is in electronic form in typesetting
-tapes), he advocated building journals electronically from the start.  In
-that case, if one only has text graphics and indexing (which is all that
-one needs with de novo electronic publishing, because there is no need to
-go back and look at bit-maps of pages), one can get 10,000 journals of
-full text, or almost 6 million pages per year.  These pages can be put in
-approximately 135 gigabytes of storage, which is not all that much,
-WEIBEL said.  For twenty years, something less than three terabytes would
-be required.  WEIBEL calculated the costs of storing this information as
-follows:  If a gigabyte costs approximately $1,000, then a terabyte costs
-approximately $1 million to buy in terms of hardware.  One also needs a
-building to put it in and a staff like OCLC to handle that information. 
-So, to support a terabyte, multiply by five, which gives $5 million per
-year for a supported terabyte of data.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Tapes saved by ACS are the typography files originally
-supporting publication of the journal * Cost of building tagged text into
-the database *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the question-and-answer period that followed WEIBEL's
-presentation, these clarifications emerged.  The tapes saved by the
-American Chemical Society are the typography files that originally
-supported the publication of the journal.  Although they are not tagged
-in SGML, they are tagged in very fine detail.  Every single sentence is
-marked, all the registry numbers, all the publications issues, dates, and
-volumes.  No cost figures on tagging material on a per-megabyte basis
-were available.  Because ACS's typesetting system runs from tagged text,
-there is no extra cost per article.  It was unknown what it costs ACS to
-keyboard the tagged text rather than just keyboard the text in the
-cheapest process.  In other words, since one intends to publish things
-and will need to build tagged text into a typography system in any case,
-if one does that in such a way that it can drive not only typography but
-an electronic system (which is what ACS intends to do--move to SGML
-publishing), the marginal cost is zero.  The marginal cost represents the
-cost of building tagged text into the database, which is small.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-SPERBERG-McQUEEN * Distinction between texts and computers * Implications
-of recognizing that all representation is encoding * Dealing with
-complicated representations of text entails the need for a grammar of
-documents * Variety of forms of formal grammars * Text as a bit-mapped
-image does not represent a serious attempt to represent text in
-electronic form * SGML, the TEI, document-type declarations, and the
-reusability and longevity of data * TEI conformance explicitly allows
-extension or modification of the TEI tag set * Administrative background
-of the TEI * Several design goals for the TEI tag set * An absolutely
-fixed requirement of the TEI Guidelines * Challenges the TEI has
-attempted to face * Good texts not beyond economic feasibility * The
-issue of reproducibility or processability * The issue of mages as
-simulacra for the text redux * One's model of text determines what one's
-software can do with a text and has economic consequences *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Prior to speaking about SGML and markup, Michael SPERBERG-McQUEEN, editor,
-Text Encoding Initiative (TEI), University of Illinois-Chicago, first drew
-a distinction between texts and computers:  Texts are abstract cultural
-and linguistic objects while computers are complicated physical devices,
-he said.  Abstract objects cannot be placed inside physical devices; with
-computers one can only represent text and act upon those representations.
-
-The recognition that all representation is encoding, SPERBERG-McQUEEN
-argued, leads to the recognition of two things:  1) The topic description
-for this session is slightly misleading, because there can be no discussion
-of pros and cons of text-coding unless what one means is pros and cons of
-working with text with computers.  2) No text can be represented in a
-computer without some sort of encoding; images are one way of encoding text,
-ASCII is another, SGML yet another.  There is no encoding without some
-information loss, that is, there is no perfect reproduction of a text that
-allows one to do away with the original.  Thus, the question becomes,
-What is the most useful representation of text for a serious work?
-This depends on what kind of serious work one is talking about.
-
-The projects demonstrated the previous day all involved highly complex
-information and fairly complex manipulation of the textual material.
-In order to use that complicated information, one has to calculate it
-slowly or manually and store the result.  It needs to be stored, therefore,
-as part of one's representation of the text.  Thus, one needs to store the
-structure in the text.  To deal with complicated representations of text,
-one needs somehow to control the complexity of the representation of a text;
-that means one needs a way of finding out whether a document and an
-electronic representation of a document is legal or not; and that
-means one needs a grammar of documents.
-
-SPERBERG-McQUEEN discussed the variety of forms of formal grammars,
-implicit and explicit, as applied to text, and their capabilities.  He
-argued that these grammars correspond to different models of text that
-different developers have.  For example, one implicit model of the text
-is that there is no internal structure, but just one thing after another,
-a few characters and then perhaps a start-title command, and then a few
-more characters and an end-title command.  SPERBERG-McQUEEN also
-distinguished several kinds of text that have a sort of hierarchical
-structure that is not very well defined, which, typically, corresponds
-to grammars that are not very well defined, as well as hierarchies that
-are very well defined (e.g., the Thesaurus Linguae Graecae) and extremely
-complicated things such as SGML, which handle strictly hierarchical data
-very nicely.
-
-SPERBERG-McQUEEN conceded that one other model not illustrated on his two
-displays was the model of text as a bit-mapped image, an image of a page,
-and confessed to having been converted to a limited extent by the
-Workshop to the view that electronic images constitute a promising,
-probably superior alternative to microfilming.  But he was not convinced
-that electronic images represent a serious attempt to represent text in
-electronic form.  Many of their problems stem from the fact that they are
-not direct attempts to represent the text but attempts to represent the
-page, thus making them representations of representations.
-
-In this situation of increasingly complicated textual information and the
-need to control that complexity in a useful way (which begs the question
-of the need for good textual grammars), one has the introduction of SGML. 
-With SGML, one can develop specific document-type declarations
-for specific text types or, as with the TEI, attempts to generate
-general document-type declarations that can handle all sorts of text.
-The TEI is an attempt to develop formats for text representation that
-will ensure the kind of reusability and longevity of data discussed earlier.
-It offers a way to stay alive in the state of permanent technological
-revolution.
-
-It has been a continuing challenge in the TEI to create document grammars
-that do some work in controlling the complexity of the textual object but
-also allowing one to represent the real text that one will find. 
-Fundamental to the notion of the TEI is that TEI conformance allows one
-the ability to extend or modify the TEI tag set so that it fits the text
-that one is attempting to represent.
-
-SPERBERG-McQUEEN next outlined the administrative background of the TEI. 
-The TEI is an international project to develop and disseminate guidelines
-for the encoding and interchange of machine-readable text.  It is
-sponsored by the Association for Computers in the Humanities, the
-Association for Computational Linguistics, and the Association for
-Literary and Linguistic Computing.  Representatives of numerous other
-professional societies sit on its advisory board.  The TEI has a number
-of affiliated projects that have provided assistance by testing drafts of
-the guidelines.
-
-Among the design goals for the TEI tag set, the scheme first of all must
-meet the needs of research, because the TEI came out of the research
-community, which did not feel adequately served by existing tag sets. 
-The tag set must be extensive as well as compatible with existing and
-emerging standards.  In 1990, version 1.0 of the Guidelines was released
-(SPERBERG-McQUEEN illustrated their contents).
-
-SPERBERG-McQUEEN noted that one problem besetting electronic text has
-been the lack of adequate internal or external documentation for many
-existing electronic texts.  The TEI guidelines as currently formulated
-contain few fixed requirements, but one of them is this:  There must
-always be a document header, an in-file SGML tag that provides
-1) a bibliographic description of the electronic object one is talking
-about (that is, who included it, when, what for, and under which title);
-and 2) the copy text from which it was derived, if any.  If there was
-no copy text or if the copy text is unknown, then one states as much.
-Version 2.0 of the Guidelines was scheduled to be completed in fall 1992
-and a revised third version is to be presented to the TEI advisory board
-for its endorsement this coming winter.  The TEI itself exists to provide
-a markup language, not a marked-up text.
-
-Among the challenges the TEI has attempted to face is the need for a
-markup language that will work for existing projects, that is, handle the
-level of markup that people are using now to tag only chapter, section,
-and paragraph divisions and not much else.  At the same time, such a
-language also will be able to scale up gracefully to handle the highly
-detailed markup which many people foresee as the future destination of
-much electronic text, and which is not the future destination but the
-present home of numerous electronic texts in specialized areas.
-
-SPERBERG-McQUEEN dismissed the lowest-common-denominator approach as
-unable to support the kind of applications that draw people who have
-never been in the public library regularly before, and make them come
-back.  He advocated more interesting text and more intelligent text. 
-Asserting that it is not beyond economic feasibility to have good texts,
-SPERBERG-McQUEEN noted that the TEI Guidelines listing 200-odd tags
-contains tags that one is expected to enter every time the relevant
-textual feature occurs.  It contains all the tags that people need now,
-and it is not expected that everyone will tag things in the same way.
-
-The question of how people will tag the text is in large part a function
-of their reaction to what SPERBERG-McQUEEN termed the issue of
-reproducibility.  What one needs to be able to reproduce are the things
-one wants to work with.  Perhaps a more useful concept than that of
-reproducibility or recoverability is that of processability, that is,
-what can one get from an electronic text without reading it again
-in the original.  He illustrated this contention with a page from
-Jan Comenius's bilingual Introduction to Latin.
-
-SPERBERG-McQUEEN returned at length to the issue of images as simulacra
-for the text, in order to reiterate his belief that in the long run more
-than images of pages of particular editions of the text are needed,
-because just as second-generation photocopies and second-generation
-microfilm degenerate, so second-generation representations tend to
-degenerate, and one tends to overstress some relatively trivial aspects
-of the text such as its layout on the page, which is not always
-significant, despite what the text critics might say, and slight other
-pieces of information such as the very important lexical ties between the
-English and Latin versions of Comenius's bilingual text, for example. 
-Moreover, in many crucial respects it is easy to fool oneself concerning
-what a scanned image of the text will accomplish.  For example, in order
-to study the transmission of texts, information concerning the text
-carrier is necessary, which scanned images simply do not always handle. 
-Further, even the high-quality materials being produced at Cornell use
-much of the information that one would need if studying those books as
-physical objects.  It is a choice that has been made.  It is an arguably
-justifiable choice, but one does not know what color those pen strokes in
-the margin are or whether there was a stain on the page, because it has
-been filtered out.  One does not know whether there were rips in the page
-because they do not show up, and on a couple of the marginal marks one
-loses half of the mark because the pen is very light and the scanner
-failed to pick it up, and so what is clearly a checkmark in the margin of
-the original becomes a little scoop in the margin of the facsimile. 
-Standard problems for facsimile editions, not new to electronics, but
-also true of light-lens photography, and are remarked here because it is
-important that we not fool ourselves that even if we produce a very nice
-image of this page with good contrast, we are not replacing the
-manuscript any more than microfilm has replaced the manuscript.
-
-The TEI comes from the research community, where its first allegiance
-lies, but it is not just an academic exercise.  It has relevance far
-beyond those who spend all of their time studying text, because one's
-model of text determines what one's software can do with a text.  Good
-models lead to good software.  Bad models lead to bad software.  That has
-economic consequences, and it is these economic consequences that have
-led the European Community to help support the TEI, and that will lead,
-SPERBERG-McQUEEN hoped, some software vendors to realize that if they
-provide software with a better model of the text they can make a killing.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Implications of different DTDs and tag sets * ODA versus SGML *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-During the discussion that followed, several additional points were made. 
-Neither AAP (i.e., Association of American Publishers) nor CALS (i.e.,
-Computer-aided Acquisition and Logistics Support) has a document-type
-definition for ancient Greek drama, although the TEI will be able to
-handle that.  Given this state of affairs and assuming that the
-technical-journal producers and the commercial vendors decide to use the
-other two types, then an institution like the Library of Congress, which
-might receive all of their publications, would have to be able to handle
-three different types of document definitions and tag sets and be able to
-distinguish among them.
-
-Office Document Architecture (ODA) has some advantages that flow from its
-tight focus on office documents and clear directions for implementation. 
-Much of the ODA standard is easier to read and clearer at first reading
-than the SGML standard, which is extremely general.  What that means is
-that if one wants to use graphics in TIFF and ODA, one is stuck, because
-ODA defines graphics formats while TIFF does not, whereas SGML says the
-world is not waiting for this work group to create another graphics format.
-What is needed is an ability to use whatever graphics format one wants.
-
-The TEI provides a socket that allows one to connect the SGML document to
-the graphics.  The notation that the graphics are in is clearly a choice
-that one needs to make based on her or his environment, and that is one
-advantage.  SGML is less megalomaniacal in attempting to define formats
-for all kinds of information, though more megalomaniacal in attempting to
-cover all sorts of documents.  The other advantage is that the model of
-text represented by SGML is simply an order of magnitude richer and more
-flexible than the model of text offered by ODA.  Both offer hierarchical
-structures, but SGML recognizes that the hierarchical model of the text
-that one is looking at may not have been in the minds of the designers,
-whereas ODA does not.
-
-ODA is not really aiming for the kind of document that the TEI wants to
-encompass.  The TEI can handle the kind of material ODA has, as well as a
-significantly broader range of material.  ODA seems to be very much
-focused on office documents, which is what it started out being called--
-office document architecture.
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-CALALUCA * Text-encoding from a publisher's perspective *
-Responsibilities of a publisher * Reproduction of Migne's Latin series
-whole and complete with SGML tags based on perceived need and expected
-use * Particular decisions arising from the general decision to produce
-and publish PLD *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-The final speaker in this session, Eric CALALUCA, vice president,
-Chadwyck-Healey, Inc., spoke from the perspective of a publisher re
-text-encoding, rather than as one qualified to discuss methods of
-encoding data, and observed that the presenters sitting in the room,
-whether they had chosen to or not, were acting as publishers:  making
-choices, gathering data, gathering information, and making assessments. 
-CALALUCA offered the hard-won conviction that in publishing very large
-text files (such as PLD), one cannot avoid making personal judgments of
-appropriateness and structure.
-
-In CALALUCA's view, encoding decisions stem from prior judgments.  Two
-notions have become axioms for him in the consideration of future sources
-for electronic publication:  1) electronic text publishing is as personal
-as any other kind of publishing, and questions of if and how to encode
-the data are simply a consequence of that prior decision;  2) all
-personal decisions are open to criticism, which is unavoidable.
-
-CALALUCA rehearsed his role as a publisher or, better, as an intermediary
-between what is viewed as a sound idea and the people who would make use
-of it.  Finding the specialist to advise in this process is the core of
-that function.  The publisher must monitor and hug the fine line between
-giving users what they want and suggesting what they might need.  One
-responsibility of a publisher is to represent the desires of scholars and
-research librarians as opposed to bullheadedly forcing them into areas
-they would not choose to enter.
-
-CALALUCA likened the questions being raised today about data structure
-and standards to the decisions faced by the Abbe Migne himself during
-production of the Patrologia series in the mid-nineteenth century. 
-Chadwyck-Healey's decision to reproduce Migne's Latin series whole and
-complete with SGML tags was also based upon a perceived need and an
-expected use.  In the same way that Migne's work came to be far more than
-a simple handbook for clerics, PLD is already far more than a database
-for theologians.  It is a bedrock source for the study of Western
-civilization, CALALUCA asserted.
-
-In regard to the decision to produce and publish PLD, the editorial board
-offered direct judgments on the question of appropriateness of these
-texts for conversion, their encoding and their distribution, and
-concluded that the best possible project was one that avoided overt
-intrusions or exclusions in so important a resource.  Thus, the general
-decision to transmit the original collection as clearly as possible with
-the widest possible avenues for use led to other decisions:  1) To encode
-the data or not, SGML or not, TEI or not.  Again, the expected user
-community asserted the need for normative tagging structures of important
-humanities texts, and the TEI seemed the most appropriate structure for
-that purpose.  Research librarians, who are trained to view the larger
-impact of electronic text sources on 80 or 90 or 100 doctoral
-disciplines, loudly approved the decision to include tagging.  They see
-what is coming better than the specialist who is completely focused on
-one edition of Ambrose's De Anima, and they also understand that the
-potential uses exceed present expectations.  2) What will be tagged and
-what will not.  Once again, the board realized that one must tag the
-obvious.  But in no way should one attempt to identify through encoding
-schemes every single discrete area of a text that might someday be
-searched.  That was another decision.  Searching by a column number, an
-author, a word, a volume, permitting combination searches, and tagging
-notations seemed logical choices as core elements.  3) How does one make
-the data available?  Tying it to a CD-ROM edition creates limitations,
-but a magnetic tape file that is very large, is accompanied by the
-encoding specifications, and that allows one to make local modifications
-also allows one to incorporate any changes one may desire within the
-bounds of private research, though exporting tag files from a CD-ROM
-could serve just as well.  Since no one on the board could possibly
-anticipate each and every way in which a scholar might choose to mine
-this data bank, it was decided to satisfy the basics and make some
-provisions for what might come.  4) Not to encode the database would rob
-it of the interchangeability and portability these important texts should
-accommodate.  For CALALUCA, the extensive options presented by full-text
-searching require care in text selection and strongly support encoding of
-data to facilitate the widest possible search strategies.  Better
-software can always be created, but summoning the resources, the people,
-and the energy to reconvert the text is another matter.
-
-PLD is being encoded, captured, and distributed, because to
-Chadwyck-Healey and the board it offers the widest possible array of
-future research applications that can be seen today.  CALALUCA concluded
-by urging the encoding of all important text sources in whatever way
-seems most appropriate and durable at the time, without blanching at the
-thought that one's work may require emendation in the future.  (Thus,
-Chadwyck-Healey produced a very large humanities text database before the
-final release of the TEI Guidelines.)
-
-                                 ******
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-DISCUSSION * Creating texts with markup advocated * Trends in encoding *
-The TEI and the issue of interchangeability of standards * A
-misconception concerning the TEI * Implications for an institution like
-LC in the event that a multiplicity of DTDs develops * Producing images
-as a first step towards possible conversion to full text through
-character recognition * The AAP tag sets as a common starting point and
-the need for caution *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-HOCKEY prefaced the discussion that followed with several comments in
-favor of creating texts with markup and on trends in encoding.  In the
-future, when many more texts are available for on-line searching, real
-problems in finding what is wanted will develop, if one is faced with
-millions of words of data.  It therefore becomes important to consider
-putting markup in texts to help searchers home in on the actual things
-they wish to retrieve.  Various approaches to refining retrieval methods
-toward this end include building on a computer version of a dictionary
-and letting the computer look up words in it to obtain more information
-about the semantic structure or semantic field of a word, its grammatical
-structure, and syntactic structure.
-
-HOCKEY commented on the present keen interest in the encoding world
-in creating:  1) machine-readable versions of dictionaries that can be
-initially tagged in SGML, which gives a structure to the dictionary entry;
-these entries can then be converted into a more rigid or otherwise
-different database structure inside the computer, which can be treated as
-a dynamic tool for searching mechanisms; 2) large bodies of text to study
-the language.  In order to incorporate more sophisticated mechanisms,
-more about how words behave needs to be known, which can be learned in
-part from information in dictionaries.  However, the last ten years have
-seen much interest in studying the structure of printed dictionaries
-converted into computer-readable form.  The information one derives about
-many words from those is only partial, one or two definitions of the
-common or the usual meaning of a word, and then numerous definitions of
-unusual usages.  If the computer is using a dictionary to help retrieve
-words in a text, it needs much more information about the common usages,
-because those are the ones that occur over and over again.  Hence the
-current interest in developing large bodies of text in computer-readable
-form in order to study the language.  Several projects are engaged in
-compiling, for example, 100 million words. HOCKEY described one with
-which she was associated briefly at Oxford University involving
-compilation of 100 million words of British English:  about 10 percent of
-that will contain detailed linguistic tagging encoded in SGML; it will
-have word class taggings, with words identified as nouns, verbs,
-adjectives, or other parts of speech.  This tagging can then be used by
-programs which will begin to learn a bit more about the structure of the
-language, and then, can go to tag more text.
-
-HOCKEY said that the more that is tagged accurately, the more one can
-refine the tagging process and thus the bigger body of text one can build
-up with linguistic tagging incorporated into it.  Hence, the more tagging
-or annotation there is in the text, the more one may begin to learn about
-language and the more it will help accomplish more intelligent OCR.  She
-recommended the development of software tools that will help one begin to
-understand more about a text, which can then be applied to scanning
-images of that text in that format and to using more intelligence to help
-one interpret or understand the text.
-
-HOCKEY posited the need to think about common methods of text-encoding
-for a long time to come, because building these large bodies of text is
-extremely expensive and will only be done once.
-
-In the more general discussion on approaches to encoding that followed,
-these points were made:
-
-BESSER identified the underlying problem with standards that all have to
-struggle with in adopting a standard, namely, the tension between a very
-highly defined standard that is very interchangeable but does not work
-for everyone because something is lacking, and a standard that is less
-defined, more open, more adaptable, but less interchangeable.  Contending
-that the way in which people use SGML is not sufficiently defined, BESSER
-wondered 1) if people resist the TEI because they think it is too defined
-in certain things they do not fit into, and 2) how progress with
-interchangeability can be made without frightening people away.
-
-SPERBERG-McQUEEN replied that the published drafts of the TEI had met
-with surprisingly little objection on the grounds that they do not allow
-one to handle X or Y or Z.  Particular concerns of the affiliated
-projects have led, in practice, to discussions of how extensions are to
-be made; the primary concern of any project has to be how it can be
-represented locally, thus making interchange secondary.  The TEI has
-received much criticism based on the notion that everything in it is
-required or even recommended, which, as it happens, is a misconception
-from the beginning,   because none of it is required and very little is
-actually actively recommended for all cases, except that one document
-one's source.
-
-SPERBERG-McQUEEN agreed with BESSER about this trade-off:  all the
-projects in a set of twenty TEI-conformant projects will not necessarily
-tag the material in the same way.  One result of the TEI will be that the
-easiest problems will be solved--those dealing with the external form of
-the information; but the problem that is hardest in interchange is that
-one is not encoding what another wants, and vice versa.  Thus, after
-the adoption of a common notation, the differences in the underlying
-conceptions of what is interesting about texts become more visible.
-The success of a standard like the TEI will lie in the ability of
-the recipient of interchanged texts to use some of what it contains
-and to add the information that was not encoded that one wants, in a
-layered way, so that texts can be gradually enriched and one does not
-have to put in everything all at once.  Hence, having a well-behaved
-markup scheme is important.
-
-STEVENS followed up on the paradoxical analogy that BESSER alluded to in
-the example of the MARC records, namely, the formats that are the same
-except that they are different.  STEVENS drew a parallel between
-document-type definitions and MARC records for books and serials and maps,
-where one has a tagging structure and there is a text-interchange. 
-STEVENS opined that the producers of the information will set the terms
-for the standard (i.e., develop document-type definitions for the users
-of their products), creating a situation that will be problematical for
-an institution like the Library of Congress, which will have to deal with
-the DTDs in the event that a multiplicity of them develops.  Thus,
-numerous people are seeking a standard but cannot find the tag set that
-will be acceptable to them and their clients.  SPERBERG-McQUEEN agreed
-with this view, and said that the situation was in a way worse:  attempting
-to unify arbitrary DTDs resembled attempting to unify a MARC record with a
-bibliographic record done according to the Prussian instructions. 
-According to STEVENS, this situation occurred very early in the process.
-
-WATERS recalled from early discussions on Project Open Book the concern
-of many people that merely by producing images, POB was not really
-enhancing intellectual access to the material.  Nevertheless, not wishing
-to overemphasize the opposition between imaging and full text, WATERS
-stated that POB views getting the images as a first step toward possibly
-converting to full text through character recognition, if the technology
-is appropriate.  WATERS also emphasized that encoding is involved even
-with a set of images.
-
-SPERBERG-McQUEEN agreed with WATERS that one can create an SGML document
-consisting wholly of images.  At first sight, organizing graphic images
-with an SGML document may not seem to offer great advantages, but the
-advantages of the scheme WATERS described would be precisely that
-ability to move into something that is more of a multimedia document:
-a combination of transcribed text and page images.  WEIBEL concurred in
-this judgment, offering evidence from Project ADAPT, where a page is
-divided into text elements and graphic elements, and in fact the text
-elements are organized by columns and lines.  These lines may be used as
-the basis for distributing documents in a network environment.  As one
-develops software intelligent enough to recognize what those elements
-are, it makes sense to apply SGML to an image initially, that may, in
-fact, ultimately become more and more text, either through OCR or edited
-OCR or even just through keying.  For WATERS, the labor of composing the
-document and saying this set of documents or this set of images belongs
-to this document constitutes a significant investment.
-
-WEIBEL also made the point that the AAP tag sets, while not excessively
-prescriptive, offer a common starting point; they do not define the
-structure of the documents, though.  They have some recommendations about
-DTDs one could use as examples, but they do just suggest tag sets.   For
-example, the CORE project attempts to use the AAP markup as much as
-possible, but there are clearly areas where structure must be added. 
-That in no way contradicts the use of AAP tag sets.
-
-SPERBERG-McQUEEN noted that the TEI prepared a long working paper early
-on about the AAP tag set and what it lacked that the TEI thought it
-needed, and a fairly long critique of the naming conventions, which has
-led to a very different style of naming in the TEI.  He stressed the
-importance of the opposition between prescriptive markup, the kind that a
-publisher or anybody can do when producing documents de novo, and
-descriptive markup, in which one has to take what the text carrier
-provides.  In these particular tag sets it is easy to overemphasize this
-opposition, because the AAP tag set is extremely flexible.  Even if one
-just used the DTDs, they allow almost anything to appear almost anywhere.
-
-                                 ******
-
-SESSION VI.  COPYRIGHT ISSUES
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-PETERS * Several cautions concerning copyright in an electronic
-environment * Review of copyright law in the United States * The notion
-of the public good and the desirability of incentives to promote it *
-What copyright protects * Works not protected by copyright * The rights
-of copyright holders * Publishers' concerns in today's electronic
-environment * Compulsory licenses * The price of copyright in a digital
-medium and the need for cooperation * Additional clarifications *  Rough
-justice oftentimes the outcome in numerous copyright matters * Copyright
-in an electronic society * Copyright law always only sets up the
-boundaries; anything can be changed by contract *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Marybeth PETERS, policy planning adviser to the Register of Copyrights,
-Library of Congress,   made several general comments and then opened the
-floor to discussion of subjects of interest to the audience.
-
-Having attended several sessions in an effort to gain a sense of what
-people did and where copyright would affect their lives, PETERS expressed
-the following cautions:
-
-     * If one takes and converts materials and puts them in new forms,
-     then, from a copyright point of view, one is creating something and
-     will receive some rights.
-
-     * However, if what one is converting already exists, a question
-     immediately arises about the status of the materials in question.
-
-     * Putting something in the public domain in the United States offers
-     some freedom from anxiety, but distributing it throughout the world
-     on a network is another matter, even if one has put it in the public
-     domain in the United States.  Re foreign laws, very frequently a
-     work can be in the public domain in the United States but protected
-     in other countries.  Thus, one must consider all of the places a
-     work may reach, lest one unwittingly become liable to being faced
-     with a suit for copyright infringement, or at least a letter
-     demanding discussion of what one is doing.
-
-PETERS reviewed copyright law in the United States.  The U.S.
-Constitution effectively states that Congress has the power to enact
-copyright laws for two purposes:  1) to encourage the creation and
-dissemination of intellectual works for the good of society as a whole;
-and, significantly, 2) to give creators and those who package and
-disseminate materials the economic rewards that are due them.
-
-Congress strives to strike a balance, which at times can become an
-emotional issue.  The United States has never accepted the notion of the
-natural right of an author so much as it has accepted the notion of the
-public good and the desirability of incentives to promote it.  This state
-of affairs, however, has created strains on the international level and
-is the reason for several of the differences in the laws that we have. 
-Today the United States protects almost every kind of work that can be
-called an expression of an author.  The standard for gaining copyright
-protection is simply originality.  This is a low standard and means that
-a work is not copied from something else, as well as shows a certain
-minimal amount of authorship.  One can also acquire copyright protection
-for making a new version of preexisting material, provided it manifests
-some spark of creativity.
-
-However, copyright does not protect ideas, methods, systems--only the way
-that one expresses those things.  Nor does copyright protect anything
-that is mechanical, anything that does not involve choice, or criteria
-concerning whether or not one should do a thing.  For example, the
-results of a process called declicking, in which one mechanically removes
-impure sounds from old recordings, are not copyrightable.  On the other
-hand, the choice to record a song digitally and to increase the sound of
-violins or to bring up the tympani constitutes the results of conversion
-that are copyrightable.  Moreover, if a work is protected by copyright in
-the United States, one generally needs the permission of the copyright
-owner to convert it.  Normally, who will own the new--that is, converted-
--material is a matter of contract.  In the absence of a contract, the
-person who creates the new material is the author and owner.  But people
-do not generally think about the copyright implications until after the
-fact.  PETERS stressed the need when dealing with copyrighted works to
-think about copyright in advance.  One's bargaining power is much greater
-up front than it is down the road.
-
-PETERS next discussed works not protected by copyright, for example, any
-work done by a federal employee as part of his or her official duties is
-in the public domain in the United States.  The issue is not wholly free
-of doubt concerning whether or not the work is in the public domain
-outside the United States.  Other materials in the public domain include: 
-any works published more than seventy-five years ago, and any work
-published in the United States more than twenty-eight years ago, whose
-copyright was not renewed.  In talking about the new technology and
-putting material in a digital form to send all over the world, PETERS
-cautioned, one must keep in mind that while the rights may not be an
-issue in the United States, they may be in different parts of the world,
-where most countries previously employed a copyright term of the life of
-the author plus fifty years.
-
-PETERS next reviewed the economics of copyright holding.  Simply,
-economic rights are the rights to control the reproduction of a work in
-any form.  They belong to the author, or in the case of a work made for
-hire, the employer.  The second right, which is critical to conversion,
-is the right to change a work.  The right to make new versions is perhaps
-one of the most significant rights of authors, particularly in an
-electronic world.  The third right is the right to publish the work and
-the right to disseminate it, something that everyone who deals in an
-electronic medium needs to know.  The basic rule is if a copy is sold,
-all rights of distribution are extinguished with the sale of that copy. 
-The key is that it must be sold.  A number of companies overcome this
-obstacle by leasing or renting their product.  These companies argue that
-if the material is rented or leased and not sold, they control the uses
-of a work.  The fourth right, and one very important in a digital world,
-is a right of public performance, which means the right to show the work
-sequentially.  For example, copyright owners control the showing of a
-CD-ROM product in a public place such as a public library.  The reverse
-side of public performance is something called the right of public
-display.  Moral rights also exist, which at the federal level apply only
-to very limited visual works of art, but in theory may apply under
-contract and other principles.  Moral rights may include the right of an
-author to have his or her name on a work, the right of attribution, and
-the right to object to distortion or mutilation--the right of integrity.
-
-The way copyright law is worded gives much latitude to activities such as
-preservation; to use of material for scholarly and research purposes when
-the user does not make multiple copies; and to the generation of
-facsimile copies of unpublished works by libraries for themselves and
-other libraries.  But the law does not allow anyone to become the
-distributor of the product for the entire world.  In today's electronic
-environment, publishers are extremely concerned that the entire world is
-networked and can obtain the information desired from a single copy in a
-single library.  Hence, if there is to be only one sale, which publishers
-may choose to live with, they will obtain their money in other ways, for
-example, from access and use.  Hence, the development of site licenses
-and other kinds of agreements to cover what publishers believe they
-should be compensated for.  Any solution that the United States takes
-today has to consider the international arena.
-
-Noting that the United States is a member of the Berne Convention and
-subscribes to its provisions, PETERS described the permissions process. 
-She also defined compulsory licenses.  A compulsory license, of which the
-United States has had a few, builds into the law the right to use a work
-subject to certain terms and conditions.  In the international arena,
-however, the ability to use compulsory licenses is extremely limited. 
-Thus, clearinghouses and other collectives comprise one option that has
-succeeded in providing for use of a work.  Often overlooked when one
-begins to use copyrighted material and put products together is how
-expensive the permissions process and managing it is.  According to
-PETERS, the price of copyright in a digital medium, whatever solution is
-worked out, will include managing and assembling the database.  She
-strongly recommended that publishers and librarians or people with
-various backgrounds cooperate to work out administratively feasible
-systems, in order to produce better results.
-
-In the lengthy question-and-answer period that followed PETERS's
-presentation, the following points emerged:
-
-     * The Copyright Office maintains that anything mechanical and
-     totally exhaustive probably is not protected.  In the event that
-     what an individual did in developing potentially copyrightable
-     material is not understood, the Copyright Office will ask about the
-     creative choices the applicant chose to make or not to make.  As a
-     practical matter, if one believes she or he has made enough of those
-     choices, that person has a right to assert a copyright and someone
-     else must assert that the work is not copyrightable.  The more
-     mechanical, the more automatic, a thing is, the less likely it is to
-     be copyrightable.
-
-     * Nearly all photographs are deemed to be copyrightable, but no one
-     worries about them much, because everyone is free to take the same
-     image.  Thus, a photographic copyright represents what is called a
-     "thin" copyright.  The photograph itself must be duplicated, in
-     order for copyright to be violated.
-
-     * The Copyright Office takes the position that X-rays are not
-     copyrightable because they are mechanical.  It  can be argued
-     whether or not image enhancement in scanning can be protected.  One
-     must exercise care with material created with public funds and
-     generally in the public domain.  An article written by a federal
-     employee, if written as part of official duties, is not
-     copyrightable.  However, control over a scientific article written
-     by a National Institutes of Health grantee (i.e., someone who
-     receives money from the U.S. government), depends on NIH policy.  If
-     the government agency has no policy (and that policy can be
-     contained in its regulations, the contract, or the grant), the
-     author retains copyright.  If a provision of the contract, grant, or
-     regulation states that there will be no copyright, then it does not
-     exist.  When a work is created, copyright automatically comes into
-     existence unless something exists that says it does not.
-
-     * An enhanced electronic copy of a print copy of an older reference
-     work in the public domain that does not contain copyrightable new
-     material is a purely mechanical rendition of the original work, and
-     is not copyrightable.
-
-     * Usually, when a work enters the public domain, nothing can remove
-     it.  For example, Congress recently passed into law the concept of
-     automatic renewal, which means that copyright on any work published
-     between l964 and l978 does not have to be renewed in order to
-     receive a seventy-five-year term.  But any work not renewed before
-     1964 is in the public domain.
-
-     * Concerning whether or not the United States keeps track of when
-     authors die, nothing was ever done, nor is anything being done at
-     the moment by the Copyright Office.
-
-     * Software that drives a mechanical process is itself copyrightable. 
-     If one changes platforms, the software itself has a copyright.  The
-     World Intellectual Property Organization will hold a symposium 28
-     March through 2 April l993, at Harvard University, on digital
-     technology, and will study this entire issue.  If one purchases a
-     computer software package, such as MacPaint, and creates something
-     new, one receives protection only for that which has been added.
-
-PETERS added that often in copyright matters, rough justice is the
-outcome, for example, in collective licensing, ASCAP (i.e., American
-Society of Composers, Authors, and Publishers), and BMI (i.e., Broadcast
-Music, Inc.), where it may seem that the big guys receive more than their
-due.  Of course, people ought not to copy a creative product without
-paying for it; there should be some compensation.  But the truth of the
-world, and it is not a great truth, is that the big guy gets played on
-the radio more frequently than the little guy, who has to do much more
-until he becomes a big guy.  That is true of every author, every
-composer, everyone, and, unfortunately, is part of life.
-
-Copyright always originates with the author, except in cases of works
-made for hire.  (Most software falls into this category.)  When an author
-sends his article to a journal, he has not relinquished copyright, though
-he retains the right to relinquish it.  The author receives absolutely
-everything.  The less prominent the author, the more leverage the
-publisher will have in contract negotiations.  In order to transfer the
-rights, the author must sign an agreement giving them away.
-
-In an electronic society, it is important to be able to license a writer
-and work out deals.  With regard to use of a work, it usually is much
-easier when a publisher holds the rights.  In an electronic era, a real
-problem arises when one is digitizing and making information available. 
-PETERS referred again to electronic licensing clearinghouses.  Copyright
-ought to remain with the author, but as one moves forward globally in the
-electronic arena, a middleman who can handle the various rights becomes
-increasingly necessary.
-
-The notion of copyright law is that it resides with the individual, but
-in an on-line environment, where a work can be adapted and tinkered with
-by many individuals, there is concern.  If changes are authorized and
-there is no agreement to the contrary, the person who changes a work owns
-the changes.  To put it another way, the person who acquires permission
-to change a work technically will become the author and the owner, unless
-some agreement to the contrary has been made.  It is typical for the
-original publisher to try to control all of the versions and all of the
-uses.  Copyright law always only sets up the boundaries.  Anything can be
-changed by contract.
-
-                                 ******
-
-SESSION VII.  CONCLUSION
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-GENERAL DISCUSSION * Two questions for discussion * Different emphases in
-the Workshop * Bringing the text and image partisans together *
-Desiderata in planning the long-term development of something * Questions
-surrounding the issue of electronic deposit * Discussion of electronic
-deposit as an allusion to the issue of standards * Need for a directory
-of preservation projects in digital form and for access to their
-digitized files * CETH's catalogue of machine-readable texts in the
-humanities * What constitutes a publication in the electronic world? *
-Need for LC to deal with the concept of on-line publishing * LC's Network
-Development Office  exploring the limits of MARC as a standard in terms
-of handling electronic information * Magnitude of the problem and the
-need for distributed responsibility in order to maintain and store
-electronic information * Workshop participants to be viewed as a starting
-point * Development of a network version of AM urged * A step toward AM's
-construction of some sort of apparatus for network access * A delicate
-and agonizing policy question for LC * Re the issue of electronic
-deposit, LC urged to initiate a catalytic process in terms of distributed
-responsibility * Suggestions for cooperative ventures * Commercial
-publishers' fears * Strategic questions for getting the image and text
-people to think through long-term cooperation * Clarification of the
-driving force behind both the Perseus and the Cornell Xerox projects *
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-In his role as moderator of the concluding session, GIFFORD raised two
-questions he believed would benefit from discussion:  1) Are there enough
-commonalities among those of us that have been here for two days so that
-we can see courses of action that should be taken in the future?  And, if
-so, what are they and who might take them?  2) Partly derivative from
-that, but obviously very dangerous to LC as host, do you see a role for
-the Library of Congress in all this?  Of course, the Library of Congress
-holds a rather special status in a number of these matters, because it is
-not perceived as a player with an economic stake in them, but are there
-roles that LC can play that can help advance us toward where we are heading?
-
-Describing himself as an uninformed observer of the technicalities of the
-last two days, GIFFORD detected three different emphases in the Workshop: 
-1) people who are very deeply committed to text; 2) people who are almost
-passionate about images; and 3) a few people who are very committed to
-what happens to the networks.  In other words, the new networking
-dimension, the accessibility of the processability, the portability of
-all this across the networks.  How do we pull those three together?
-
-Adding a question that reflected HOCKEY's comment that this was the
-fourth workshop she had attended in the previous thirty days, FLEISCHHAUER
-wondered to what extent this meeting had reinvented the wheel, or if it
-had contributed anything in the way of bringing together a different group
-of people from those who normally appear on the workshop circuit.
-
-HOCKEY confessed to being struck at this meeting and the one the
-Electronic Pierce Consortium organized the previous week that this was a
-coming together of people working on texts and not images.  Attempting to
-bring the two together is something we ought to be thinking about for the
-future:  How one can think about working with image material to begin
-with, but structuring it and digitizing it in such a way that at a later
-stage it can be interpreted into text, and find a common way of building
-text and images together so that they can be used jointly in the future,
-with the network support to begin there because that is how people will
-want to access it.
-
-In planning the long-term development of something, which is what is
-being done in electronic text, HOCKEY stressed the importance not only
-of discussing the technical aspects of how one does it but particularly
-of thinking about what the people who use the stuff will want to do.
-But conversely, there are numerous things that people start to do with
-electronic text or material that nobody ever thought of in the beginning.
-
-LESK, in response to the question concerning the role of the Library of
-Congress, remarked the often suggested desideratum of having electronic
-deposit:  Since everything is now computer-typeset, an entire decade of
-material that was machine-readable exists, but the publishers frequently
-did not save it; has LC taken any action to have its copyright deposit
-operation start collecting these machine-readable versions?  In the
-absence of PETERS, GIFFORD replied that the question was being
-actively considered but that that was only one dimension of the problem.
-Another dimension is the whole question of the integrity of the original
-electronic document.  It becomes highly important in science to prove
-authorship.  How will that be done?
-
-ERWAY explained that, under the old policy, to make a claim for a
-copyright for works that were published in electronic form, including
-software, one had to submit a paper copy of the first and last twenty
-pages of code--something that represented the work but did not include
-the entire work itself and had little value to anyone.  As a temporary
-measure, LC has claimed the right to demand electronic versions of
-electronic publications.  This measure entails a proactive role for the
-Library to say that it wants a particular electronic version.  Publishers
-then have perhaps a year to submit it.  But the real problem for LC is
-what to do with all this material in all these different formats.  Will
-the Library mount it?  How will it give people access to it?  How does LC
-keep track of the appropriate computers, software, and media?  The situation
-is so hard to control, ERWAY said, that it makes sense for each publishing
-house to maintain its own archive.  But LC cannot enforce that either.
-
-GIFFORD acknowledged LESK's suggestion that establishing a priority
-offered the solution, albeit a fairly complicated one.  But who maintains
-that register?, he asked.  GRABER noted that LC does attempt to collect a
-Macintosh version and the IBM-compatible version of software.  It does
-not collect other versions.  But while true for software, BYRUM observed,
-this reply does not speak to materials, that is, all the materials that
-were published that were on somebody's microcomputer or driver tapes
-at a publishing office across the country.  LC does well to acquire
-specific machine-readable products selectively that were intended to be
-machine-readable.  Materials that were in machine-readable form at one time,
-BYRUM said, would be beyond LC's capability at the moment, insofar as
-attempting to acquire, organize, and preserve them are concerned--and
-preservation would be the most important consideration.  In this
-connection, GIFFORD reiterated the need to work out some sense of
-distributive responsibility for a number of these issues, which
-inevitably will require significant cooperation and discussion.
-Nobody can do it all.
-
-LESK suggested that some publishers may look with favor on LC beginning
-to serve as a depository of tapes in an electronic manuscript standard. 
-Publishers may view this as a service that they did not have to perform
-and they might send in tapes.  However, SPERBERG-McQUEEN countered,
-although publishers have had equivalent services available to them for a
-long time, the electronic text archive has never turned away or been
-flooded with tapes and is forever sending feedback to the depositor. 
-Some publishers do send in tapes.
-
-ANDRE viewed this discussion as an allusion to the issue of standards. 
-She recommended that the AAP standard and the TEI, which has already been
-somewhat harmonized internationally and which also shares several
-compatibilities with the AAP, be harmonized to ensure sufficient
-compatibility in the software.  She drew the line at saying LC ought to
-be the locus or forum for such harmonization.
-
-Taking the group in a slightly different direction, but one where at
-least in the near term LC might play a helpful role, LYNCH remarked the
-plans of a number of projects to carry out preservation by creating
-digital images that will end up in on-line or near-line storage at some
-institution.   Presumably, LC will link this material somehow to its
-on-line catalog in most cases.  Thus, it is in a digital form.  LYNCH had
-the impression that many of these institutions would be willing to make
-those files accessible to other people outside the institution, provided
-that there is no copyright problem.  This desideratum will require
-propagating the knowledge that those digitized files exist, so that they
-can end up in other on-line catalogs.  Although uncertain about the
-mechanism for achieving this result, LYNCH said that it warranted
-scrutiny because it seemed to be connected to some of the basic issues of
-cataloging and distribution of records.  It would be  foolish, given the
-amount of work that all of us have to do and our meager resources, to
-discover multiple institutions digitizing the same work.  Re microforms,
-LYNCH said, we are in pretty good shape.
-
-BATTIN called this a big problem and noted that the Cornell people (who
-had already departed) were working on it.  At issue from the beginning
-was to learn how to catalog that information into RLIN and then into
-OCLC, so that it would be accessible.  That issue remains to be resolved. 
-LYNCH rejoined that putting it into OCLC or RLIN was helpful insofar as
-somebody who is thinking of performing preservation activity on that work
-could learn about it.  It is not necessarily helpful for institutions to
-make that available.  BATTIN opined that the idea was that it not only be
-for preservation purposes but for the convenience of people looking for
-this material.  She endorsed LYNCH's dictum that duplication of this
-effort was to be avoided by every means.
-
-HOCKEY informed the Workshop about one major current activity of CETH,
-namely a catalogue of machine-readable texts in the humanities.  Held on
-RLIN at present, the catalogue has been concentrated on ASCII as opposed
-to digitized images of text.  She is exploring ways to improve the
-catalogue and make it more widely available, and welcomed suggestions
-about these concerns.  CETH owns the records, which are not just
-restricted to RLIN, and can distribute them however it wishes.
-
-Taking up LESK's earlier question, BATTIN inquired whether LC, since it
-is accepting electronic files and designing a mechanism for dealing with
-that rather than putting books on shelves, would become responsible for
-the National Copyright Depository of Electronic Materials.  Of course
-that could not be accomplished overnight, but it would be something LC
-could plan for.  GIFFORD acknowledged that much thought was being devoted
-to that set of problems and returned the discussion to the issue raised
-by LYNCH--whether or not putting the kind of records that both BATTIN and
-HOCKEY have been talking about in RLIN is not a satisfactory solution. 
-It seemed to him that RLIN answered LYNCH's original point concerning
-some kind of directory for these kinds of materials.  In a situation
-where somebody is attempting to decide whether or not to scan this or
-film that or to learn whether or not someone has already done so, LYNCH
-suggested, RLIN is helpful, but it is not helpful in the case of a local,
-on-line catalogue.  Further, one would like to have her or his system be
-aware that that exists in digital form, so that one can present it to a
-patron, even though one did not digitize it, if it is out of copyright. 
-The only way to make those linkages would be to perform a tremendous
-amount of real-time look-up, which would be awkward at best, or
-periodically to yank the whole file from RLIN and match it against one's
-own stuff, which is a nuisance.
-
-But where, ERWAY inquired, does one stop including things that are
-available with Internet, for instance, in one's local catalogue?
-It almost seems that that is LC's means to acquire access to them.
-That represents LC's new form of library loan.  Perhaps LC's new on-line
-catalogue is an amalgamation of all these catalogues on line.  LYNCH
-conceded that perhaps that was true in the very long term, but was not
-applicable to scanning in the short term.  In his view, the totals cited
-by Yale, 10,000 books over perhaps a four-year period, and 1,000-1,500
-books from Cornell, were not big numbers, while searching all over
-creation for relatively rare occurrences will prove to be less efficient. 
-As GIFFORD wondered if this would not be a separable file on RLIN and
-could be requested from them, BATTIN interjected that it was easily
-accessible to an institution.  SEVERTSON pointed out that that file, cum
-enhancements, was available with reference information on CD-ROM, which
-makes it a little more available.
-
-In HOCKEY's view, the real question facing the Workshop is what to put in
-this catalogue, because that raises the question of what constitutes a
-publication in the electronic world.  (WEIBEL interjected that Eric Joule
-in OCLC's Office of Research is also wrestling with this particular
-problem, while GIFFORD thought it sounded fairly generic.)  HOCKEY
-contended that a majority of texts in the humanities are in the hands
-of either a small number of large research institutions or individuals
-and are not generally available for anyone else to access at all.
-She wondered if these texts ought to be catalogued.
-
-After argument proceeded back and forth for several minutes over why
-cataloguing might be a necessary service, LEBRON suggested that this
-issue involved the responsibility of a publisher.  The fact that someone
-has created something electronically and keeps it under his or her
-control does not constitute publication.  Publication implies
-dissemination.  While it would be important for a scholar to let other
-people know that this creation exists, in many respects this is no
-different from an unpublished manuscript.  That is what is being accessed
-in there, except that now one is not looking at it in the hard-copy but
-in the electronic environment.
-
-LEBRON expressed puzzlement at the variety of ways electronic publishing
-has been viewed.  Much of what has been discussed throughout these two
-days has concerned CD-ROM publishing, whereas in the on-line environment
-that she confronts, the constraints and challenges are very different. 
-Sooner or later LC will have to deal with the concept of on-line
-publishing.  Taking up the comment ERWAY made earlier about storing
-copies, LEBRON gave her own journal as an example.  How would she deposit
-OJCCT for copyright?, she asked, because the journal will exist in the
-mainframe at OCLC and people will be able to access it.  Here the
-situation is different, ownership versus access, and is something that
-arises with publication in the on-line environment, faster than is
-sometimes realized.  Lacking clear answers to all of these questions
-herself, LEBRON did not anticipate that LC would be able to take a role
-in helping to define some of them for quite a while.
-
-GREENFIELD observed that LC's Network Development Office is attempting,
-among other things, to explore the limits of MARC as a standard in terms
-of handling electronic information.  GREENFIELD also noted that Rebecca
-GUENTHER from that office gave a paper to the American Society for
-Information Science (ASIS) summarizing several of the discussion papers
-that were coming out of the Network Development Office.  GREENFIELD said
-he understood that that office had a list-server soliciting just the kind
-of feedback received today concerning the difficulties of identifying and
-cataloguing electronic information.  GREENFIELD hoped that everybody
-would be aware of that and somehow contribute to that conversation.
-
-Noting two of LC's roles, first, to act as a repository of record for
-material that is copyrighted in this country, and second, to make
-materials it holds available in some limited form to a clientele that
-goes beyond Congress, BESSER suggested that it was incumbent on LC to
-extend those responsibilities to all the things being published in
-electronic form.  This would mean eventually accepting electronic
-formats.  LC could require that at some point they be in a certain
-limited set of formats, and then develop mechanisms for allowing people
-to access those in the same way that other things are accessed.  This
-does not imply that they are on the network and available to everyone. 
-LC does that with most of its bibliographic records, BESSER said, which
-end up migrating to the utility (e.g., OCLC) or somewhere else.  But just
-as most of LC's books are available in some form through interlibrary
-loan or some other mechanism, so in the same way electronic formats ought
-to be available to others in some format, though with some copyright
-considerations.  BESSER was not suggesting that these mechanisms be
-established tomorrow, only that they seemed to fall within LC's purview,
-and that there should be long-range plans to establish them.
-
-Acknowledging that those from LC in the room agreed with BESSER
-concerning the need to confront difficult questions, GIFFORD underscored
-the magnitude of the problem of what to keep and what to select.  GIFFORD
-noted that LC currently receives some 31,000 items per day, not counting
-electronic materials, and argued for much more distributed responsibility
-in order to maintain and store electronic information.
-
-BESSER responded that the assembled group could be viewed as a starting
-point, whose initial operating premise could be helping to move in this
-direction and defining how LC could do so, for example, in areas of
-standardization or distribution of responsibility.
-
-FLEISCHHAUER added that AM was fully engaged, wrestling with some of the
-questions that pertain to the conversion of older historical materials,
-which would be one thing that the Library of Congress might do.  Several
-points mentioned by BESSER and several others on this question have a
-much greater impact on those who are concerned with cataloguing and the
-networking of bibliographic information, as well as preservation itself.
-
-Speaking directly to AM, which he considered was a largely uncopyrighted
-database, LYNCH urged development of a network version of AM, or
-consideration of making the data in it available to people interested in
-doing network multimedia.  On account of the current great shortage of
-digital data that is both appealing and unencumbered by complex rights
-problems, this course of action could have a significant effect on making
-network multimedia a reality.
-
-In this connection, FLEISCHHAUER reported on a fragmentary prototype in
-LC's Office of Information Technology Services that attempts to associate
-digital images of photographs with cataloguing information in ways that
-work within a local area network--a step, so to say, toward AM's
-construction of some sort of apparatus for access.  Further, AM has
-attempted to use standard data forms in order to help make that
-distinction between the access tools and the underlying data, and thus
-believes that the database is networkable.
-
-A delicate and agonizing policy question for LC, however, which comes
-back to resources and unfortunately has an impact on this, is to find
-some appropriate, honorable, and legal cost-recovery possibilities.  A
-certain skittishness concerning cost-recovery has made people unsure
-exactly what to do.  AM would be highly receptive to discussing further
-LYNCH's offer to test or demonstrate its database in a network
-environment, FLEISCHHAUER said.
-
-Returning the discussion to what she viewed as the vital issue of
-electronic deposit, BATTIN recommended that LC initiate a catalytic
-process in terms of distributed responsibility, that is, bring together
-the distributed organizations and set up a study group to look at all
-these issues and see where we as a nation should move.  The broader
-issues of how we deal with the management of electronic information will
-not disappear, but only grow worse.
-
-LESK took up this theme and suggested that LC attempt to persuade one
-major library in each state to deal with its state equivalent publisher,
-which might produce a cooperative project that would be equitably
-distributed around the country, and one in which LC would be dealing with
-a minimal number of publishers and minimal copyright problems.
-
-GRABER remarked the recent development in the scientific community of a
-willingness to use SGML and either deposit or interchange on a fairly
-standardized format.  He wondered if a similar movement was taking place
-in the humanities.  Although the National Library of Medicine found only
-a few publishers to cooperate in a like venture two or three years ago, a
-new effort might generate a much larger number willing to cooperate.
-
-KIMBALL recounted his unit's (Machine-Readable Collections Reading Room)
-troubles with the commercial publishers of electronic media in acquiring
-materials for LC's collections, in particular the publishers' fear that
-they would not be able to cover their costs and would lose control of
-their products, that LC would give them away or sell them and make
-profits from them.  He doubted that the publishing industry was prepared
-to move into this area at the moment, given its resistance to allowing LC
-to use its machine-readable materials as the Library would like.
-
-The copyright law now addresses compact disk as a medium, and LC can
-request one copy of that, or two copies if it is the only version, and
-can request copies of software, but that fails to address magazines or
-books or anything like that which is in machine-readable form.
-
-GIFFORD acknowledged the thorny nature of this issue, which he illustrated
-with the example of the cumbersome process involved in putting a copy of a
-scientific database on a LAN in LC's science reading room.  He also
-acknowledged that LC needs help and could enlist the energies and talents
-of Workshop participants in thinking through a number of these problems.
-
-GIFFORD returned the discussion to getting the image and text people to
-think through together where they want to go in the long term.  MYLONAS
-conceded that her experience at the Pierce Symposium the previous week at
-Georgetown University and this week at LC had forced her to reevaluate
-her perspective on the usefulness of text as images.  MYLONAS framed the
-issues in a series of questions:  How do we acquire machine-readable
-text?  Do we take pictures of it and perform OCR on it later?  Is it
-important to obtain very high-quality images and text, etc.? 
-FLEISCHHAUER agreed with MYLONAS's framing of strategic questions, adding
-that a large institution such as LC probably has to do all of those
-things at different times.  Thus, the trick is to exercise judgment.  The
-Workshop had added to his and AM's considerations in making those
-judgments.  Concerning future meetings or discussions, MYLONAS suggested
-that screening priorities would be helpful.
-
-WEIBEL opined that the diversity reflected in this group was a sign both
-of the health and of the immaturity of the field, and more time would
-have to pass before we convince one another concerning standards.
-
-An exchange between MYLONAS and BATTIN clarified the point that the
-driving force behind both the Perseus and the Cornell Xerox projects was
-the preservation of knowledge for the future, not simply for particular
-research use.  In the case of Perseus, MYLONAS said, the assumption was
-that the texts would not be entered again into electronically readable
-form.  SPERBERG-McQUEEN added that a scanned image would not serve as an
-archival copy for purposes of preservation in the case of, say, the Bill
-of Rights, in the sense that the scanned images are effectively the
-archival copies for the Cornell mathematics books.
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                          Appendix I:  PROGRAM
-
-
-
-                                WORKSHOP
-                                   ON
-                               ELECTRONIC
-                                  TEXTS
-
-
-
-                             9-10 June 1992
-
-                           Library of Congress
-                            Washington, D.C.
-
-
-
-    Supported by a Grant from the David and Lucile Packard Foundation
-
-
-Tuesday, 9 June 1992
-
-NATIONAL DEMONSTRATION LAB, ATRIUM, LIBRARY MADISON
-
-8:30 AM   Coffee and Danish, registration
-
-9:00 AM   Welcome
-
-          Prosser Gifford, Director for Scholarly Programs, and Carl
-             Fleischhauer, Coordinator, American Memory, Library of
-             Congress
-
-9:l5 AM   Session I.  Content in a New Form:  Who Will Use It and What
-          Will They Do?
-
-          Broad description of the range of electronic information. 
-          Characterization of who uses it and how it is or may be used. 
-          In addition to a look at scholarly uses, this session will
-          include a presentation on use by students (K-12 and college)
-          and the general public.
-
-          Moderator:  James Daly
-          Avra Michelson, Archival Research and Evaluation Staff,
-             National Archives and Records Administration (Overview)
-          Susan H. Veccia, Team Leader, American Memory, User Evaluation,
-             and
-          Joanne Freeman, Associate Coordinator, American Memory, Library
-             of Congress (Beyond the scholar)
-
-10:30-
-11:00 AM  Break
-
-11:00 AM  Session II.  Show and Tell.
-
-          Each presentation to consist of a fifteen-minute
-          statement/show; group discussion will follow lunch.
-
-          Moderator:  Jacqueline Hess, Director, National Demonstration
-             Lab
-
-            1.  A classics project, stressing texts and text retrieval
-                more than multimedia:  Perseus Project, Harvard
-                University
-                Elli Mylonas, Managing Editor
-
-            2.  Other humanities projects employing the emerging norms of
-                the Text Encoding Initiative (TEI):  Chadwyck-Healey's
-                The English Poetry Full Text Database and/or Patrologia
-                Latina Database
-                Eric M. Calaluca, Vice President, Chadwyck-Healey, Inc.
-
-            3.  American Memory
-                Carl Fleischhauer, Coordinator, and
-                Ricky Erway, Associate Coordinator, Library of Congress
-
-            4.  Founding Fathers example from Packard Humanities
-                Institute:  The Papers of George Washington, University
-                of Virginia
-                Dorothy Twohig, Managing Editor, and/or
-                David Woodley Packard
-
-            5.  An electronic medical journal offering graphics and
-                full-text searchability:  The Online Journal of Current
-                Clinical Trials, American Association for the Advancement
-                of Science
-                Maria L. Lebron, Managing Editor
-
-            6.  A project that offers facsimile images of pages but omits
-                searchable text:  Cornell math books
-                Lynne K. Personius, Assistant Director, Cornell
-                   Information Technologies for Scholarly Information
-                   Sources, Cornell University
-
-12:30 PM  Lunch  (Dining Room A, Library Madison 620.  Exhibits
-          available.)
-
-1:30 PM   Session II.  Show and Tell (Cont'd.).
-
-3:00-
-3:30 PM   Break
-
-3:30-
-5:30 PM   Session III.  Distribution, Networks, and Networking:  Options
-          for Dissemination.
-
-          Published disks:  University presses and public-sector
-             publishers, private-sector publishers
-          Computer networks
-
-          Moderator:  Robert G. Zich, Special Assistant to the Associate
-             Librarian for Special Projects, Library of Congress
-          Clifford A. Lynch, Director, Library Automation, University of
-             California
-          Howard Besser, School of Library and Information Science,
-             University of Pittsburgh
-          Ronald L. Larsen, Associate Director of Libraries for
-             Information Technology, University of Maryland at College
-             Park
-          Edwin B. Brownrigg, Executive Director, Memex Research
-             Institute
-
-6:30 PM   Reception  (Montpelier Room, Library Madison 619.)
-
-                                 ******
-
-Wednesday, 10 June 1992
-
-DINING ROOM A, LIBRARY MADISON 620
-
-8:30 AM   Coffee and Danish
-
-9:00 AM   Session IV.  Image Capture, Text Capture, Overview of Text and
-          Image Storage Formats.
-
-          Moderator:  William L. Hooton, Vice President of Operations,
-             I-NET
-
-          A) Principal Methods for Image Capture of Text:
-             Direct scanning
-             Use of microform
-
-          Anne R. Kenney, Assistant Director, Department of Preservation
-             and Conservation, Cornell University
-          Pamela Q.J. Andre, Associate Director, Automation, and
-          Judith A. Zidar, Coordinator, National Agricultural Text
-             Digitizing Program (NATDP), National Agricultural Library
-             (NAL)
-          Donald J. Waters, Head, Systems Office, Yale University Library
-
-          B) Special Problems:
-             Bound volumes
-             Conservation
-             Reproducing printed halftones
-
-          Carl Fleischhauer, Coordinator, American Memory, Library of
-             Congress
-          George Thoma, Chief, Communications Engineering Branch,
-             National Library of Medicine (NLM)
-
-10:30-
-11:00 AM  Break
-
-11:00 AM  Session IV.  Image Capture, Text Capture, Overview of Text and
-          Image Storage Formats (Cont'd.).
-
-          C) Image Standards and Implications for Preservation
-
-          Jean Baronas, Senior Manager, Department of Standards and
-             Technology, Association for Information and Image Management
-             (AIIM)
-          Patricia Battin, President, The Commission on Preservation and
-             Access (CPA)
-
-          D) Text Conversion:
-             OCR vs. rekeying
-             Standards of accuracy and use of imperfect texts
-             Service bureaus
-
-          Stuart Weibel, Senior Research Specialist, Online Computer
-             Library Center, Inc. (OCLC)
-          Michael Lesk, Executive Director, Computer Science Research,
-             Bellcore
-          Ricky Erway, Associate Coordinator, American Memory, Library of
-             Congress
-          Pamela Q.J. Andre, Associate Director, Automation, and
-          Judith A. Zidar, Coordinator, National Agricultural Text
-             Digitizing Program (NATDP), National Agricultural Library
-             (NAL)
-
-12:30-
-1:30 PM   Lunch
-
-1:30 PM   Session V.  Approaches to Preparing Electronic Texts.
-
-          Discussion of approaches to structuring text for the computer;
-          pros and cons of text coding, description of methods in
-          practice, and comparison of text-coding methods.
-
-          Moderator:  Susan Hockey, Director, Center for Electronic Texts
-             in the Humanities (CETH), Rutgers and Princeton Universities
-          David Woodley Packard
-          C.M. Sperberg-McQueen, Editor, Text Encoding Initiative (TEI),
-             University of Illinois-Chicago
-          Eric M. Calaluca, Vice President, Chadwyck-Healey, Inc.
-
-3:30-
-4:00 PM   Break
-
-4:00 PM   Session VI.  Copyright Issues.
-
-          Marybeth Peters, Policy Planning Adviser to the Register of
-             Copyrights, Library of Congress
-
-5:00 PM   Session VII. Conclusion.
-
-          General discussion.
-          What topics were omitted or given short shrift that anyone
-             would like to talk about now?
-          Is there a "group" here?  What should the group do next, if
-             anything?  What should the Library of Congress do next, if
-             anything?
-          Moderator:  Prosser Gifford, Director for Scholarly Programs,
-             Library of Congress
-
-6:00 PM   Adjourn
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                         Appendix II:  ABSTRACTS
-
-
-SESSION I
-
-Avra MICHELSON           Forecasting the Use of Electronic Texts by
-                         Social Sciences and Humanities Scholars
-
-This presentation explores the ways in which electronic texts are likely
-to be used by the non-scientific scholarly community.  Many of the
-remarks are drawn from a report the speaker coauthored with Jeff
-Rothenberg, a computer scientist at The RAND Corporation.
-
-The speaker assesses 1) current scholarly use of information technology
-and 2) the key trends in information technology most relevant to the
-research process, in order to predict how social sciences and humanities
-scholars are apt to use electronic texts.  In introducing the topic,
-current use of electronic texts is explored broadly within the context of
-scholarly communication.  From the perspective of scholarly
-communication, the work of humanities and social sciences scholars
-involves five processes:  1) identification of sources, 2) communication
-with colleagues, 3) interpretation and analysis of data, 4) dissemination
-of research findings, and 5) curriculum development and instruction.  The
-extent to which computation currently permeates aspects of scholarly
-communication represents a viable indicator of the prospects for
-electronic texts.
-
-The discussion of current practice is balanced by an analysis of key
-trends in the scholarly use of information technology.  These include the
-trends toward end-user computing and connectivity, which provide a
-framework for forecasting the use of electronic texts through this
-millennium.  The presentation concludes with a summary of the ways in
-which the nonscientific scholarly community can be expected to use
-electronic texts, and the implications of that use for information
-providers.
-
-Susan VECCIA and Joanne FREEMAN    Electronic Archives for the Public: 
-                                   Use of American Memory in Public and
-                                   School Libraries
-
-This joint discussion focuses on nonscholarly applications of electronic
-library materials, specifically addressing use of the Library of Congress
-American Memory (AM) program in a small number of public and school
-libraries throughout the United States.  AM consists of selected Library
-of Congress primary archival materials, stored on optical media
-(CD-ROM/videodisc), and presented with little or no editing.  Many
-collections are accompanied by electronic introductions and user's guides
-offering background information and historical context.  Collections
-represent a variety of formats including photographs, graphic arts,
-motion pictures, recorded sound, music, broadsides and manuscripts,
-books, and pamphlets.
-
-In 1991, the Library of Congress began a nationwide evaluation of AM in
-different types of institutions.  Test sites include public libraries,
-elementary and secondary school libraries, college and university
-libraries, state libraries, and special libraries.  Susan VECCIA and
-Joanne FREEMAN will discuss their observations on the use of AM by the
-nonscholarly community, using evidence gleaned from this ongoing
-evaluation effort.
-
-VECCIA will comment on the overall goals of the evaluation project, and
-the types of public and school libraries included in this study.  Her
-comments on nonscholarly use of AM will focus on the public library as a
-cultural and community institution, often bridging the gap between formal
-and informal education.  FREEMAN will discuss the use of AM in school
-libraries.  Use by students and teachers has revealed some broad
-questions about the use of electronic resources, as well as definite
-benefits gained by the "nonscholar."  Topics will include the problem of
-grasping content and context in an electronic environment, the stumbling
-blocks created by "new" technologies, and the unique skills and interests
-awakened through use of electronic resources.
-
-SESSION II
-
-Elli MYLONAS             The Perseus Project:  Interactive Sources and
-                         Studies in Classical Greece
-
-The Perseus Project (5) has just released Perseus 1.0, the first publicly
-available version of its hypertextual database of multimedia materials on
-classical Greece.  Perseus is designed to be used by a wide audience,
-comprised of readers at the student and scholar levels.  As such, it must
-be able to locate information using different strategies, and it must
-contain enough detail to serve the different needs of its users.  In
-addition, it must be delivered so that it is affordable to its target
-audience.  [These problems and the solutions we chose are described in
-Mylonas, "An Interface to Classical Greek Civilization," JASIS 43:2,
-March 1992.]
-
-In order to achieve its objective, the project staff decided to make a
-conscious separation between selecting and converting textual, database,
-and image data on the one hand, and putting it into a delivery system on
-the other.  That way, it is possible to create the electronic data
-without thinking about the restrictions of the delivery system.  We have
-made a great effort to choose system-independent formats for our data,
-and to put as much thought and work as possible into structuring it so
-that the translation from paper to electronic form will enhance the value
-of the data. [A discussion of these solutions as of two years ago is in
-Elli Mylonas, Gregory Crane, Kenneth Morrell, and D. Neel Smith, "The
-Perseus Project:  Data in the Electronic Age," in Accessing Antiquity: 
-The Computerization of Classical Databases, J. Solomon and T. Worthen
-(eds.),  University of Arizona Press, in press.]
-
-Much of the work on Perseus is focused on collecting and converting the
-data on which the project is based.  At the same time, it is necessary to
-provide means of access to the information, in order to make it usable,
-and them to investigate how it is used.  As we learn more about what
-students and scholars from different backgrounds do with Perseus, we can
-adjust our data collection, and also modify the system to accommodate
-them.  In creating a delivery system for general use, we have tried to
-avoid favoring any one type of use by allowing multiple forms of access
-to and navigation through the system.
-
-The way text is handled exemplifies some of these principles.  All text
-in Perseus is tagged using SGML, following the guidelines of the Text
-Encoding Initiative (TEI).  This markup is used to index the text, and
-process it so that it can be imported into HyperCard.  No SGML markup
-remains in the text that reaches the user, because currently it would be
-too expensive to create a system that acts on SGML in real time. 
-However, the regularity provided by SGML is essential for verifying the
-content of the texts, and greatly speeds all the processing performed on
-them.  The fact that the texts exist in SGML ensures that they will be
-relatively easy to port to different hardware and software, and so will
-outlast the current delivery platform.  Finally, the SGML markup
-incorporates existing canonical reference systems (chapter, verse, line,
-etc.); indexing and navigation are based on these features.  This ensures
-that the same canonical reference will always resolve to the same point
-within a text, and that all versions of our texts, regardless of delivery
-platform (even paper printouts) will function the same way.
-
-In order to provide tools for users, the text is processed by a
-morphological analyzer, and the results are stored in a database. 
-Together with the index, the Greek-English Lexicon, and the index of all
-the English words in the definitions of the lexicon, the morphological
-analyses comprise a set of linguistic tools that allow users of all
-levels to work with the textual information, and to accomplish different
-tasks.  For example, students who read no Greek may explore a concept as
-it appears in Greek texts by using the English-Greek index, and then
-looking up works in the texts and translations, or scholars may do
-detailed morphological studies of word use by using the morphological
-analyses of the texts.  Because these tools were not designed for any one
-use, the same tools and the same data can be used by both students and
-scholars.
-
-NOTES:
-     (5)  Perseus is based at Harvard University, with collaborators at
-     several other universities.  The project has been funded primarily
-     by the Annenberg/CPB Project, as well as by Harvard University,
-     Apple Computer, and others.  It is published by Yale University
-     Press.  Perseus runs on Macintosh computers, under the HyperCard
-     program.
-
-Eric CALALUCA
-
-Chadwyck-Healey embarked last year on two distinct yet related full-text
-humanities database projects.
-
-The English Poetry Full-Text Database and the Patrologia Latina Database
-represent new approaches to linguistic research resources.  The size and
-complexity of the projects present problems for electronic publishers,
-but surmountable ones if they remain abreast of the latest possibilities
-in data capture and retrieval software techniques.
-
-The issues which required address prior to the commencement of the
-projects were legion:
-
-     1.   Editorial selection (or exclusion) of materials in each
-          database
-
-     2.   Deciding whether or not to incorporate a normative encoding
-          structure into the databases?
-               A.  If one is selected, should it be SGML?
-               B.  If SGML, then the TEI?
-     
-     3.   Deliver as CD-ROM, magnetic tape, or both?
-
-     4.   Can one produce retrieval software advanced enough for the
-          postdoctoral linguist, yet accessible enough for unattended
-          general use?  Should one try?
-
-     5.   Re fair and liberal networking policies, what are the risks to
-          an electronic publisher?
-
-     6.   How does the emergence of national and international education
-          networks affect the use and viability of research projects
-          requiring high investment?  Do the new European Community
-          directives concerning database protection necessitate two
-          distinct publishing projects, one for North America and one for
-          overseas?
-
-From new notions of "scholarly fair use" to the future of optical media,
-virtually every issue related to electronic publishing was aired.  The
-result is two projects which have been constructed to provide the quality
-research resources with the fewest encumbrances to use by teachers and
-private scholars.
-
-Dorothy TWOHIG
-
-In spring 1988 the editors of the papers of George Washington, John
-Adams, Thomas Jefferson, James Madison, and Benjamin Franklin were
-approached by classics scholar David Packard on behalf of the Packard
-Humanities Foundation with a proposal to produce a CD-ROM edition of the
-complete papers of each of the Founding Fathers.  This electronic edition
-will supplement the published volumes, making the documents widely
-available to students and researchers at reasonable cost.  We estimate
-that our CD-ROM edition of Washington's Papers will be substantially
-completed within the next two years and ready for publication.  Within
-the next ten years or so, similar CD-ROM editions of the Franklin, Adams,
-Jefferson, and Madison papers also will be available.  At the Library of
-Congress's session on technology, I would like to discuss not only the
-experience of the Washington Papers in producing the CD-ROM edition, but
-the impact technology has had on these major editorial projects. 
-Already, we are editing our volumes with an eye to the material that will
-be readily available in the CD-ROM edition.  The completed electronic
-edition will provide immense possibilities for the searching of documents
-for information in a way never possible before.  The kind of technical
-innovations that are currently available and on the drawing board will
-soon revolutionize historical research and the production of historical
-documents.  Unfortunately, much of this new technology is not being used
-in the planning stages of historical projects, simply because many
-historians are aware only in the vaguest way of its existence.  At least
-two major new historical editing projects are considering microfilm
-editions, simply because they are not aware of the possibilities of
-electronic alternatives and the advantages of the new technology in terms
-of flexibility and research potential compared to microfilm.  In fact,
-too many of us in history and literature are still at the stage of
-struggling with our PCs.  There are many historical editorial projects in
-progress presently, and an equal number of literary projects.  While the
-two fields have somewhat different approaches to textual editing, there
-are ways in which electronic technology can be of service to both.
-
-Since few of the editors involved in the Founding Fathers CD-ROM editions
-are technical experts in any sense, I hope to point out in my discussion
-of our experience how many of these electronic innovations can be used
-successfully by scholars who are novices in the world of new technology. 
-One of the major concerns of the sponsors of the multitude of new
-scholarly editions is the limited audience reached by the published
-volumes.  Most of these editions are being published in small quantities
-and the publishers' price for them puts them out of the reach not only of
-individual scholars but of most public libraries and all but the largest
-educational institutions.  However, little attention is being given to
-ways in which technology can bypass conventional publication to make
-historical and literary documents more widely available.
-
-What attracted us most to the CD-ROM edition of The Papers of George
-Washington was the fact that David Packard's aim was to make a complete
-edition of all of the 135,000 documents we have collected available in an
-inexpensive format that would be placed in public libraries, small
-colleges, and even high schools.  This would provide an audience far
-beyond our present 1,000-copy, $45 published edition.  Since the CD-ROM
-edition will carry none of the explanatory annotation that appears in the
-published volumes, we also feel that the use of the CD-ROM will lead many
-researchers to seek out the published volumes.
-
-In addition to ignorance of new technical advances, I have found that too
-many editors--and historians and literary scholars--are resistant and
-even hostile to suggestions that electronic technology may enhance their
-work.  I intend to discuss some of the arguments traditionalists are
-advancing to resist technology, ranging from distrust of the speed with
-which it changes (we are already wondering what is out there that is
-better than CD-ROM) to suspicion of the technical language used to
-describe electronic developments.
-
-Maria LEBRON
-
-The Online Journal of Current Clinical Trials, a joint venture of the
-American Association for the Advancement of Science (AAAS) and the Online
-Computer Library Center, Inc. (OCLC), is the first peer-reviewed journal
-to provide full text, tabular material, and line illustrations on line. 
-This presentation will discuss the genesis and start-up period of the
-journal.  Topics of discussion will include historical overview,
-day-to-day management of the editorial peer review, and manuscript
-tagging and publication.  A demonstration of the journal and its features
-will accompany the presentation.
-
-Lynne PERSONIUS
-
-Cornell University Library, Cornell Information Technologies, and Xerox
-Corporation, with the support of the Commission on Preservation and
-Access, and Sun Microsystems, Inc., have been collaborating in a project
-to test a prototype system for recording brittle books as digital images
-and producing, on demand, high-quality archival paper replacements.  The
-project goes beyond that, however, to investigate some of the issues
-surrounding scanning, storing, retrieving, and providing access to
-digital images in a network environment.
-
-The Joint Study in Digital Preservation began in January 1990.  Xerox
-provided the College Library Access and Storage System (CLASS) software,
-a prototype 600-dots-per-inch (dpi) scanner, and the hardware necessary
-to support network printing on the DocuTech printer housed in Cornell's
-Computing and Communications Center (CCC).
-
-The Cornell staff using the hardware and software became an integral part
-of the development and testing process for enhancements to the CLASS
-software system.  The collaborative nature of this relationship is
-resulting in a system that is specifically tailored to the preservation
-application.
-
-A digital library of 1,000 volumes (or approximately 300,000 images) has
-been created and is stored on an optical jukebox that resides in CCC. 
-The library includes a collection of select mathematics monographs that
-provides mathematics faculty with an opportunity to use the electronic
-library.  The remaining volumes were chosen for the library to test the
-various capabilities of the scanning system.
-
-One project objective is to provide users of the Cornell library and the
-library staff with the ability to request facsimiles of digitized images
-or to retrieve the actual electronic image for browsing.  A prototype
-viewing workstation has been created by Xerox, with input into the design
-by a committee of Cornell librarians and computer professionals.  This
-will allow us to experiment with patron access to the images that make up
-the digital library.  The viewing station provides search, retrieval, and
-(ultimately) printing functions with enhancements to facilitate
-navigation through multiple documents.
-
-Cornell currently is working to extend access to the digital library to
-readers using workstations from their offices.  This year is devoted to
-the development of a network resident image conversion and delivery
-server, and client software that will support readers who use Apple
-Macintosh computers, IBM windows platforms, and Sun workstations. 
-Equipment for this development was provided by Sun Microsystems with
-support from the Commission on Preservation and Access.
-
-During the show-and-tell session of the Workshop on Electronic Texts, a
-prototype view station will be demonstrated.  In addition, a display of
-original library books that have been digitized will be available for
-review with associated printed copies for comparison.  The fifteen-minute
-overview of the project will include a slide presentation that
-constitutes a "tour" of the preservation digitizing process.
-
-The final network-connected version of the viewing station will provide
-library users with another mechanism for accessing the digital library,
-and will also provide the capability of viewing images directly.  This
-will not require special software, although a powerful computer with good
-graphics will be needed.
-
-The Joint Study in Digital Preservation has generated a great deal of
-interest in the library community.  Unfortunately, or perhaps
-fortunately, this project serves to raise a vast number of other issues
-surrounding the use of digital technology for the preservation and use of
-deteriorating library materials, which subsequent projects will need to
-examine.  Much work remains.
-
-SESSION III
-
-Howard BESSER                      Networking Multimedia Databases
-
-What do we have to consider in building and distributing databases of
-visual materials in a multi-user environment?  This presentation examines
-a variety of concerns that need to be addressed before a multimedia
-database can be set up in a networked environment.
-
-In the past it has not been feasible to implement databases of visual
-materials in shared-user environments because of technological barriers. 
-Each of the two basic models for multi-user multimedia databases has
-posed its own problem.  The analog multimedia storage model (represented
-by Project Athena's parallel analog and digital networks) has required an
-incredibly complex (and expensive) infrastructure.  The economies of
-scale that make multi-user setups cheaper per user served do not operate
-in an environment that requires a computer workstation, videodisc player,
-and two display devices for each user.
-
-The digital multimedia storage model has required vast amounts of storage
-space (as much as one gigabyte per thirty still images).  In the past the
-cost of such a large amount of storage space made this model a
-prohibitive choice as well.  But plunging storage costs are finally
-making this second alternative viable.
-
-If storage no longer poses such an impediment, what do we need to
-consider in building digitally stored multi-user databases of visual
-materials?  This presentation will examine the networking and
-telecommunication constraints that must be overcome before such databases
-can become commonplace and useful to a large number of people.
-
-The key problem is the vast size of multimedia documents, and how this
-affects not only storage but telecommunications transmission time. 
-Anything slower than T-1 speed is impractical for files of 1 megabyte or
-larger (which is likely to be small for a multimedia document).  For
-instance, even on a 56 Kb line it would take three minutes to transfer a
-1-megabyte file.  And these figures assume ideal circumstances, and do
-not take into consideration other users contending for network bandwidth,
-disk access time, or the time needed for remote display.  Current common
-telephone transmission rates would be completely impractical; few users
-would be willing to wait the hour necessary to transmit a single image at
-2400 baud.
-
-This necessitates compression, which itself raises a number of other
-issues.  In order to decrease file sizes significantly, we must employ
-lossy compression algorithms.  But how much quality can we afford to
-lose?  To date there has been only one significant study done of
-image-quality needs for a particular user group, and this study did not
-look at loss resulting from compression.  Only after identifying
-image-quality needs can we begin to address storage and network bandwidth
-needs.
-
-Experience with X-Windows-based applications (such as Imagequery, the
-University of California at Berkeley image database) demonstrates the
-utility of a client-server topology, but also points to the limitation of
-current software for a distributed environment.  For example,
-applications like Imagequery can incorporate compression, but current X
-implementations do not permit decompression at the end user's
-workstation.  Such decompression at the host computer alleviates storage
-capacity problems while doing nothing to address problems of
-telecommunications bandwidth.
-
-We need to examine the effects on network through-put of moving
-multimedia documents around on a network.  We need to examine various
-topologies that will help us avoid bottlenecks around servers and
-gateways.  Experience with applications such as these raise still broader
-questions. How closely is the multimedia document tied to the software
-for viewing it?  Can it be accessed and viewed from other applications? 
-Experience with the MARC format (and more recently with the Z39.50
-protocols) shows how useful it can be to store documents in a form in
-which they can be accessed by a variety of application software.
-
-Finally, from an intellectual-access standpoint, we need to address the
-issue of providing access to these multimedia documents in
-interdisciplinary environments.  We need to examine terminology and
-indexing strategies that will allow us to provide access to this material
-in a cross-disciplinary way.
-
-Ronald LARSEN            Directions in High-Performance Networking for
-                         Libraries
-
-The pace at which computing technology has advanced over the past forty
-years shows no sign of abating.  Roughly speaking, each five-year period
-has yielded an order-of-magnitude improvement in price and performance of
-computing equipment.  No fundamental hurdles are likely to prevent this
-pace from continuing for at least the next decade.  It is only in the
-past five years, though, that computing has become ubiquitous in
-libraries, affecting all staff and patrons, directly or indirectly.
-
-During these same five years, communications rates on the Internet, the
-principal academic computing network, have grown from 56 kbps to 1.5
-Mbps, and the NSFNet backbone is now running 45 Mbps.  Over the next five
-years, communication rates on the backbone are expected to exceed 1 Gbps. 
-Growth in both the population of network users and the volume of network
-traffic  has continued to grow geometrically, at rates approaching 15
-percent per month.  This flood of capacity and use, likened by some to
-"drinking from a firehose,"  creates immense opportunities and challenges
-for libraries.  Libraries must anticipate the future implications of this
-technology, participate in its development, and deploy it to ensure
-access to the world's information resources.
-
-The infrastructure for the information age is being put in place. 
-Libraries face strategic decisions about their role in the development,
-deployment, and use of this infrastructure.  The emerging infrastructure
-is much more than computers and communication lines.  It is more than the
-ability to compute at a remote site, send electronic mail to a peer
-across the country, or move a file from one library to another.  The next
-five years will witness substantial development of the information
-infrastructure of the network.
-
-In order to provide appropriate leadership, library professionals must
-have a fundamental understanding of and appreciation for computer
-networking, from local area networks to the National Research and
-Education Network (NREN).  This presentation addresses these
-fundamentals, and how they relate to libraries today and in the near
-future.
-
-Edwin BROWNRIGG               Electronic Library Visions and Realities
-
-The electronic library has been a vision desired by many--and rejected by
-some--since Vannevar Bush coined the term memex to describe an automated,
-intelligent, personal information system.  Variations on this vision have
-included Ted Nelson's Xanadau, Alan Kay's Dynabook, and Lancaster's
-"paperless library," with the most recent incarnation being the
-"Knowledge Navigator" described by John Scully of Apple.  But the reality
-of library service has been less visionary and the leap to the electronic
-library has eluded universities, publishers, and information technology
-files.
-
-The Memex Research Institute (MemRI), an independent, nonprofit research
-and development organization, has created an Electronic Library Program
-of shared research and development in order to make the collective vision
-more concrete.  The program is working toward the creation of large,
-indexed publicly available electronic image collections of published
-documents in academic, special, and public libraries.  This strategic
-plan is the result of the first stage of the program, which has been an
-investigation of the information technologies available to support such
-an effort, the economic parameters of electronic service compared to
-traditional library operations, and the business and political factors
-affecting the shift from print distribution to electronic networked
-access.
-
-The strategic plan envisions a combination of publicly searchable access
-databases, image (and text) document collections stored on network "file
-servers," local and remote network access, and an intellectual property
-management-control system.  This combination of technology and
-information content is defined in this plan as an E-library or E-library
-collection.  Some participating sponsors are already developing projects
-based on MemRI's recommended directions.
-
-The E-library strategy projected in this plan is a visionary one that can
-enable major changes and improvements in academic, public, and special
-library service.  This vision is, though, one that can be realized with
-today's technology.  At the same time, it will challenge the political
-and social structure within which libraries operate:  in academic
-libraries, the traditional emphasis on local collections, extending to
-accreditation issues; in public libraries, the potential of electronic
-branch and central libraries fully available to the public; and for
-special libraries, new opportunities for shared collections and networks.
-
-The environment in which this strategic plan has been developed is, at
-the moment, dominated by a sense of library limits.  The continued
-expansion and rapid growth of local academic library collections is now
-clearly at an end.  Corporate libraries, and even law libraries, are
-faced with operating within a difficult economic climate, as well as with
-very active competition from commercial information sources.  For
-example, public libraries may be seen as a desirable but not critical
-municipal service in a time when the budgets of safety and health
-agencies are being cut back.
-
-Further, libraries in general have a very high labor-to-cost ratio in
-their budgets, and labor costs are still increasing, notwithstanding
-automation investments.  It is difficult for libraries to obtain capital,
-startup, or seed funding for innovative activities, and those
-technology-intensive initiatives that offer the potential of decreased
-labor costs can provoke the opposition of library staff.
-
-However, libraries have achieved some considerable successes in the past
-two decades by improving both their service and their credibility within
-their organizations--and these positive changes have been accomplished
-mostly with judicious use of information technologies.  The advances in
-computing and information technology have been well-chronicled:  the
-continuing precipitous drop in computing costs, the growth of the
-Internet and private networks, and the explosive increase in publicly
-available information databases.
-
-For example, OCLC has become one of the largest computer network
-organizations in the world by creating a cooperative cataloging network
-of more than 6,000 libraries worldwide.  On-line public access catalogs
-now serve millions of users on more than 50,000 dedicated terminals in
-the United States alone.  The University of California MELVYL on-line
-catalog system has now expanded into an index database reference service
-and supports more than six million searches a year.  And, libraries have
-become the largest group of customers of CD-ROM publishing technology;
-more than 30,000 optical media publications such as those offered by
-InfoTrac and Silver Platter are subscribed to by U.S. libraries.
-
-This march of technology continues and in the next decade will result in
-further innovations that are extremely difficult to predict.  What is
-clear is that libraries can now go beyond automation of their order files
-and catalogs to automation of their collections themselves--and it is
-possible to circumvent the fiscal limitations that appear to obtain
-today.
-
-This Electronic Library Strategic Plan recommends a paradigm shift in
-library service, and demonstrates the steps necessary to provide improved
-library services with limited capacities and operating investments.
-
-SESSION IV-A
-
-Anne KENNEY
-
-The Cornell/Xerox Joint Study in Digital Preservation resulted in the
-recording of 1,000 brittle books as 600-dpi digital images and the
-production, on demand, of high-quality and archivally sound paper
-replacements.  The project, which was supported by the Commission on
-Preservation and Access, also investigated some of the issues surrounding
-scanning, storing, retrieving, and providing access to digital images in
-a network environment.
-
-Anne Kenney will focus on some of the issues surrounding direct scanning
-as identified in the Cornell Xerox Project.  Among those to be discussed
-are:  image versus text capture; indexing and access; image-capture
-capabilities; a comparison to photocopy and microfilm; production and
-cost analysis; storage formats, protocols, and standards; and the use of
-this scanning technology for preservation purposes.
-
-The 600-dpi digital images produced in the Cornell Xerox Project proved
-highly acceptable for creating paper replacements of deteriorating
-originals.  The 1,000 scanned volumes provided an array of image-capture
-challenges that are common to nineteenth-century printing techniques and
-embrittled material, and that defy the use of text-conversion processes. 
-These challenges include diminished contrast between text and background,
-fragile and deteriorated pages, uneven printing, elaborate type faces,
-faint and bold text adjacency, handwritten text and annotations, nonRoman
-languages, and a proliferation of illustrated material embedded in text. 
-The latter category included high-frequency and low-frequency halftones,
-continuous tone photographs, intricate mathematical drawings, maps,
-etchings, reverse-polarity drawings, and engravings.
-
-The Xerox prototype scanning system provided a number of important
-features for capturing this diverse material.  Technicians used multiple
-threshold settings, filters, line art and halftone definitions,
-autosegmentation, windowing, and software-editing programs to optimize
-image capture.  At the same time, this project focused on production. 
-The goal was to make scanning as affordable and acceptable as
-photocopying and microfilming for preservation reformatting.  A
-time-and-cost study conducted during the last three months of this
-project confirmed the economic viability of digital scanning, and these
-findings will be discussed here.
-
-From the outset, the Cornell Xerox Project was predicated on the use of
-nonproprietary standards and the use of common protocols when standards
-did not exist.  Digital files were created as TIFF images which were
-compressed prior to storage using Group 4 CCITT compression.  The Xerox
-software is MS DOS based and utilizes off-the shelf programs such as
-Microsoft Windows and Wang Image Wizard.  The digital library is designed
-to be hardware-independent and to provide interchangeability with other
-institutions through network connections.  Access to the digital files
-themselves is two-tiered:  Bibliographic records for the computer files
-are created in RLIN and Cornell's local system and access into the actual
-digital images comprising a book is provided through a document control
-structure and a networked image file-server, both of which will be
-described.
-
-The presentation will conclude with a discussion of some of the issues
-surrounding the use of this technology as a preservation tool (storage,
-refreshing, backup).
-
-Pamela ANDRE and Judith ZIDAR
-
-The National Agricultural Library (NAL) has had extensive experience with
-raster scanning of printed materials.  Since 1987, the Library has
-participated in the National Agricultural Text Digitizing Project (NATDP)
-a cooperative effort between NAL and forty-five land grant university
-libraries.  An overview of the project will be presented, giving its
-history and NAL's strategy for the future.
-
-An in-depth discussion of NATDP will follow, including a description of
-the scanning process, from the gathering of the printed materials to the
-archiving of the electronic pages.  The type of equipment required for a
-stand-alone scanning workstation and the importance of file management
-software will be discussed.  Issues concerning the images themselves will
-be addressed briefly, such as image format; black and white versus color;
-gray scale versus dithering; and resolution.
-
-Also described will be a study currently in progress by NAL to evaluate
-the usefulness of converting microfilm to electronic images in order to
-improve access.  With the cooperation of Tuskegee University, NAL has
-selected three reels of microfilm from a collection of sixty-seven reels
-containing the papers, letters, and drawings of George Washington Carver. 
-The three reels were converted into 3,500 electronic images using a
-specialized microfilm scanner.  The selection, filming, and indexing of
-this material will be discussed.
-
-Donald WATERS
-
-Project Open Book, the Yale University Library's effort to convert 10,
-000 books from microfilm to digital imagery, is currently in an advanced
-state of planning and organization.  The Yale Library has selected a
-major vendor to serve as a partner in the project and as systems
-integrator.  In its proposal, the successful vendor helped isolate areas
-of risk and uncertainty as well as key issues to be addressed during the
-life of the project.  The Yale Library is now poised to decide what
-material it will convert to digital image form and to seek funding,
-initially for the first phase and then for the entire project.
-
-The proposal that Yale accepted for the implementation of Project Open
-Book will provide at the end of three phases a conversion subsystem,
-browsing stations distributed on the campus network within the Yale
-Library, a subsystem for storing 10,000 books at 200 and 600 dots per
-inch, and network access to the image printers.  Pricing for the system
-implementation assumes the existence of Yale's campus ethernet network
-and its high-speed image printers, and includes other requisite hardware
-and software, as well as system integration services.  Proposed operating
-costs include hardware and software maintenance, but do not include
-estimates for the facilities management of the storage devices and image
-servers.
-
-Yale selected its vendor partner in a formal process, partly funded by
-the Commission for Preservation and Access.  Following a request for
-proposal, the Yale Library selected two vendors as finalists to work with
-Yale staff to generate a detailed analysis of requirements for Project
-Open Book.  Each vendor used the results of the requirements analysis to
-generate and submit a formal proposal for the entire project.  This
-competitive process not only enabled the Yale Library to select its
-primary vendor partner but also revealed much about the state of the
-imaging industry, about the varying, corporate commitments to the markets
-for imaging technology, and about the varying organizational dynamics
-through which major companies are responding to and seeking to develop
-these markets.
-
-Project Open Book is focused specifically on the conversion of images
-from microfilm to digital form.  The technology for scanning microfilm is
-readily available but is changing rapidly.  In its project requirements,
-the Yale Library emphasized features of the technology that affect the
-technical quality of digital image production and the costs of creating
-and storing the image library:  What levels of digital resolution can be
-achieved by scanning microfilm?  How does variation in the quality of
-microfilm, particularly in film produced to preservation standards,
-affect the quality of the digital images?  What technologies can an
-operator effectively and economically apply when scanning film to
-separate two-up images and to control for and correct image
-imperfections?  How can quality control best be integrated into
-digitizing work flow that includes document indexing and storage?
-
-The actual and expected uses of digital images--storage, browsing,
-printing, and OCR--help determine the standards for measuring their
-quality.  Browsing is especially important, but the facilities available
-for readers to browse image documents is perhaps the weakest aspect of
-imaging technology and most in need of development.  As it defined its
-requirements, the Yale Library concentrated on some fundamental aspects
-of usability for image documents:  Does the system have sufficient
-flexibility to handle the full range of document types, including
-monographs, multi-part and multivolume sets, and serials, as well as
-manuscript collections?  What conventions are necessary to identify a
-document uniquely for storage and retrieval?  Where is the database of
-record for storing bibliographic information about the image document? 
-How are basic internal structures of documents, such as pagination, made
-accessible to the reader?  How are the image documents physically
-presented on the screen to the reader?
-
-The Yale Library designed Project Open Book on the assumption that
-microfilm is more than adequate as a medium for preserving the content of
-deteriorated library materials.  As planning in the project has advanced,
-it is increasingly clear that the challenge of digital image technology
-and the key to the success of efforts like Project Open Book is to
-provide a means of both preserving and improving access to those
-deteriorated materials.
-
-SESSION IV-B
-
-George THOMA
-
-In the use of electronic imaging for document preservation, there are
-several issues to consider, such as:  ensuring adequate image quality,
-maintaining substantial conversion rates (through-put), providing unique
-identification for automated access and retrieval, and accommodating
-bound volumes and fragile material.
-
-To maintain high image quality, image processing functions are required
-to correct the deficiencies in the scanned image.  Some commercially
-available systems include these functions, while some do not.  The
-scanned raw image must be processed to correct contrast deficiencies--
-both poor overall contrast resulting from light print and/or dark
-background, and variable contrast resulting from stains and
-bleed-through.  Furthermore, the scan density must be adequate to allow
-legibility of print and sufficient fidelity in the pseudo-halftoned gray
-material.  Borders or page-edge effects must be removed for both
-compactibility and aesthetics.  Page skew must be corrected for aesthetic
-reasons and to enable accurate character recognition if desired. 
-Compound images consisting of both two-toned text and gray-scale
-illustrations must be processed appropriately to retain the quality of
-each.
-
-SESSION IV-C
-
-Jean BARONAS
-
-Standards publications being developed by scientists, engineers, and
-business managers in Association for Information and Image Management
-(AIIM) standards committees can be applied to electronic image management
-(EIM) processes including:  document (image) transfer, retrieval and
-evaluation; optical disk and document scanning; and document design and
-conversion.  When combined with EIM system planning and operations,
-standards can assist in generating image databases that are
-interchangeable among a variety of systems.  The applications of
-different approaches for image-tagging, indexing, compression, and
-transfer often cause uncertainty concerning EIM system compatibility,
-calibration, performance, and upward compatibility, until standard
-implementation parameters are established.  The AIIM standards that are
-being developed for these applications can be used to decrease the
-uncertainty, successfully integrate imaging processes, and promote "open
-systems."  AIIM is an accredited American National Standards Institute
-(ANSI) standards developer with more than twenty committees comprised of
-300 volunteers representing users, vendors, and manufacturers.  The
-standards publications that are developed in these committees have
-national acceptance and provide the basis for international harmonization
-in the development of new International Organization for Standardization
-(ISO) standards.
-
-This presentation describes the development of AIIM's EIM standards and a
-new effort at AIIM, a database on standards projects in a wide framework
-of imaging industries including capture, recording, processing,
-duplication, distribution, display, evaluation, and preservation.  The
-AIIM Imagery Database will cover imaging standards being developed by
-many organizations in many different countries.  It will contain
-standards publications' dates, origins, related national and
-international projects, status, key words, and abstracts.  The ANSI Image
-Technology Standards Board requested that such a database be established,
-as did the ISO/International Electrotechnical Commission Joint Task Force
-on Imagery.  AIIM will take on the leadership role for the database and
-coordinate its development with several standards developers.
-
-Patricia BATTIN
-
-     Characteristics of standards for digital imagery:
-
-          * Nature of digital technology implies continuing volatility.
-
-          * Precipitous standard-setting not possible and probably not
-          desirable.
-
-          * Standards are a complex issue involving the medium, the
-          hardware, the software, and the technical capacity for
-          reproductive fidelity and clarity.
-
-          * The prognosis for reliable archival standards (as defined by
-          librarians) in the foreseeable future is poor.
-
-     Significant potential and attractiveness of digital technology as a
-     preservation medium and access mechanism.
-
-     Productive use of digital imagery for preservation requires a
-     reconceptualizing of preservation principles in a volatile,
-     standardless world.
-
-     Concept of managing continuing access in the digital environment
-     rather than focusing on the permanence of the medium and long-term
-     archival standards developed for the analog world.
-
-     Transition period:  How long and what to do?
-
-          *  Redefine "archival."
-
-          *  Remove the burden of "archival copy" from paper artifacts.
-
-          *  Use digital technology for storage, develop management
-          strategies for refreshing medium, hardware and software.
-
-          *  Create acid-free paper copies for transition period backup
-          until we develop reliable procedures for ensuring continuing
-          access to digital files.
-
-SESSION IV-D
-
-Stuart WEIBEL            The Role of SGML Markup in the CORE Project (6)
-
-The emergence of high-speed telecommunications networks as a basic
-feature of the scholarly workplace is driving the demand for electronic
-document delivery.  Three distinct categories of electronic
-publishing/republishing are necessary to support access demands in this
-emerging environment:
-
-     1.)  Conversion of paper or microfilm archives to electronic format
-     2.)  Conversion of electronic files to formats tailored to
-          electronic retrieval and display
-     3.)  Primary electronic publishing (materials for which the
-          electronic version is the primary format)
-
-OCLC has experimental or product development activities in each of these
-areas.  Among the challenges that lie ahead is the integration of these
-three types of information stores in coherent distributed systems.
-
-The CORE (Chemistry Online Retrieval Experiment) Project is a model for
-the conversion of large text and graphics collections for which
-electronic typesetting files are available (category 2).  The American
-Chemical Society has made available computer typography files dating from
-1980 for its twenty journals.  This collection of some 250 journal-years
-is being converted to an electronic format that will be accessible
-through several end-user applications.
-
-The use of Standard Generalized Markup Language (SGML) offers the means
-to capture the structural richness of the original articles in a way that
-will support a variety of retrieval, navigation, and display options
-necessary to navigate effectively in very large text databases.
-
-An SGML document consists of text that is marked up with descriptive tags
-that specify the function of a given element within the document.  As a
-formal language construct, an SGML document can be parsed against a
-document-type definition (DTD) that unambiguously defines what elements
-are allowed and where in the document they can (or must) occur.  This
-formalized map of article structure allows the user interface design to
-be uncoupled from the underlying database system, an important step
-toward interoperability.  Demonstration of this separability is a part of
-the CORE project, wherein user interface designs born of very different
-philosophies will access the same database.
-
-NOTES:
-     (6)  The CORE project is a collaboration among Cornell University's
-     Mann Library, Bell Communications Research (Bellcore), the American
-     Chemical Society (ACS), the Chemical Abstracts Service (CAS), and
-     OCLC.
-
-Michael LESK                  The CORE Electronic Chemistry Library
-
-A major on-line file of chemical journal literature complete with
-graphics is being developed to test the usability of fully electronic
-access to documents, as a joint project of Cornell University, the
-American Chemical Society, the Chemical Abstracts Service, OCLC, and
-Bellcore (with additional support from Sun Microsystems, Springer-Verlag,
-DigitaI Equipment Corporation, Sony Corporation of America, and Apple
-Computers).  Our file contains the American Chemical Society's on-line
-journals, supplemented with the graphics from the paper publication.  The
-indexing of the articles from Chemical Abstracts Documents is available
-in both image and text format, and several different interfaces can be
-used.  Our goals are (1) to assess the effectiveness and acceptability of
-electronic access to primary journals as compared with paper, and (2) to
-identify the most desirable functions of the user interface to an
-electronic system of journals, including in particular a comparison of
-page-image display with ASCII display interfaces.  Early experiments with
-chemistry students on a variety of tasks suggest that searching tasks are
-completed much faster with any electronic system than with paper, but
-that for reading all versions of the articles are roughly equivalent.
-
-Pamela ANDRE and Judith ZIDAR
-
-Text conversion is far more expensive and time-consuming than image
-capture alone.  NAL's experience with optical character recognition (OCR)
-will be related and compared with the experience of having text rekeyed. 
-What factors affect OCR accuracy?  How accurate does full text have to be
-in order to be useful?  How do different users react to imperfect text? 
-These are questions that will be explored.  For many, a service bureau
-may be a better solution than performing the work inhouse; this will also
-be discussed.
-
-SESSION VI
-
-Marybeth PETERS
-
-Copyright law protects creative works.  Protection granted by the law to
-authors and disseminators of works includes the right to do or authorize
-the following:  reproduce the work, prepare derivative works, distribute
-the work to the public, and publicly perform or display the work.  In
-addition, copyright owners of sound recordings and computer programs have
-the right to control rental of their works.  These rights are not
-unlimited; there are a number of exceptions and limitations.
-
-An electronic environment places strains on the copyright system. 
-Copyright owners want to control uses of their work and be paid for any
-use; the public wants quick and easy access at little or no cost.  The
-marketplace is working in this area.  Contracts, guidelines on electronic
-use, and collective licensing are in use and being refined.
-
-Issues concerning the ability to change works without detection are more
-difficult to deal with.  Questions concerning the integrity of the work
-and the status of the changed version under the copyright law are to be
-addressed.  These are public policy issues which require informed
-dialogue.
-
-
-               ***   ***   ***   ******   ***   ***   ***
-
-
-                Appendix III:  DIRECTORY OF PARTICIPANTS
-                         
-
-PRESENTERS:
-
-     Pamela Q.J. Andre
-     Associate Director, Automation
-     National Agricultural Library
-     10301 Baltimore Boulevard
-     Beltsville, MD 20705-2351
-     Phone:  (301) 504-6813
-     Fax:  (301) 504-7473
-     E-mail:  INTERNET:  PANDRE@ASRR.ARSUSDA.GOV
-
-     Jean Baronas, Senior Manager
-     Department of Standards and Technology
-     Association for Information and Image Management (AIIM)
-     1100 Wayne Avenue, Suite 1100
-     Silver Spring, MD 20910
-     Phone:  (301) 587-8202
-     Fax:  (301) 587-2711
-     
-     Patricia Battin, President
-     The Commission on Preservation and Access
-     1400 16th Street, N.W.
-     Suite 740
-     Washington, DC 20036-2217
-     Phone:  (202) 939-3400
-     Fax:  (202) 939-3407
-     E-mail:  CPA@GWUVM.BITNET
-
-     Howard Besser
-     Centre Canadien d'Architecture
-     (Canadian Center for Architecture)
-     1920, rue Baile
-     Montreal, Quebec H3H 2S6
-     CANADA
-     Phone:  (514) 939-7001
-     Fax:  (514) 939-7020
-     E-mail:  howard@lis.pitt.edu
-
-     Edwin B. Brownrigg, Executive Director
-     Memex Research Institute
-     422 Bonita Avenue
-     Roseville, CA 95678
-     Phone:  (916) 784-2298
-     Fax:  (916) 786-7559
-     E-mail:  BITNET:  MEMEX@CALSTATE.2
-
-     Eric M. Calaluca, Vice President
-     Chadwyck-Healey, Inc.
-     1101 King Street
-     Alexandria, VA 223l4
-     Phone:  (800) 752-05l5
-     Fax:  (703) 683-7589
-
-     James Daly
-     4015 Deepwood Road
-     Baltimore, MD 21218-1404
-     Phone:  (410) 235-0763
-
-     Ricky Erway, Associate Coordinator
-     American Memory
-     Library of Congress
-     Phone:  (202) 707-6233
-     Fax:  (202) 707-3764
-
-     Carl Fleischhauer, Coordinator
-     American Memory
-     Library of Congress
-     Phone:  (202) 707-6233
-     Fax:  (202) 707-3764
-
-     Joanne Freeman
-     2000 Jefferson Park Avenue, No. 7
-     Charlottesville, VA  22903
-     
-     Prosser Gifford
-     Director for Scholarly Programs
-     Library of Congress
-     Phone:  (202) 707-1517
-     Fax:  (202) 707-9898
-     E-mail:  pgif@seq1.loc.gov
-
-     Jacqueline Hess, Director
-     National Demonstration Laboratory
-       for Interactive Information Technologies
-     Library of Congress
-     Phone:  (202) 707-4157
-     Fax:  (202) 707-2829
-     
-     Susan Hockey, Director
-     Center for Electronic Texts in the Humanities (CETH)
-     Alexander Library
-     Rutgers University
-     169 College Avenue
-     New Brunswick, NJ 08903
-     Phone:  (908) 932-1384
-     Fax:  (908) 932-1386
-     E-mail:  hockey@zodiac.rutgers.edu
-
-     William L. Hooton, Vice President
-     Business & Technical Development
-       Imaging & Information Systems Group
-     I-NET
-     6430 Rockledge Drive, Suite 400
-     Bethesda, MD 208l7
-     Phone:  (301) 564-6750
-     Fax:  (513) 564-6867
-
-     Anne R. Kenney, Associate Director
-     Department of Preservation and Conservation
-     701 Olin Library
-     Cornell University
-     Ithaca, NY 14853
-     Phone:  (607) 255-6875
-     Fax:  (607) 255-9346
-     E-mail:  LYDY@CORNELLA.BITNET
-
-     Ronald L. Larsen
-     Associate Director for Information Technology
-     University of Maryland at College Park
-     Room B0224, McKeldin Library
-     College Park, MD 20742-7011
-     Phone:  (301) 405-9194
-     Fax:  (301) 314-9865
-     E-mail:  rlarsen@libr.umd.edu
-
-     Maria L. Lebron, Managing Editor
-     The Online Journal of Current Clinical Trials
-     l333 H Street, N.W.
-     Washington, DC 20005
-     Phone:  (202) 326-6735
-     Fax:  (202) 842-2868
-     E-mail:  PUBSAAAS@GWUVM.BITNET
-
-     Michael Lesk, Executive Director
-     Computer Science Research
-     Bell Communications Research, Inc.
-     Rm 2A-385
-     445 South Street
-     Morristown, NJ 07960-l9l0     
-     Phone:  (201) 829-4070
-     Fax:  (201) 829-5981
-     E-mail:  lesk@bellcore.com (Internet) or bellcore!lesk (uucp)
-
-     Clifford A. Lynch
-     Director, Library Automation
-     University of California,
-        Office of the President
-     300 Lakeside Drive, 8th Floor
-     Oakland, CA 94612-3350
-     Phone:  (510) 987-0522
-     Fax:  (510) 839-3573
-     E-mail:  calur@uccmvsa
-
-     Avra Michelson
-     National Archives and Records Administration
-     NSZ Rm. 14N
-     7th & Pennsylvania, N.W.
-     Washington, D.C. 20408
-     Phone:  (202) 501-5544
-     Fax:  (202) 501-5533
-     E-mail:  tmi@cu.nih.gov
-     
-     Elli Mylonas, Managing Editor
-     Perseus Project
-     Department of the Classics
-     Harvard University
-     319 Boylston Hall
-     Cambridge, MA 02138
-     Phone:  (617) 495-9025, (617) 495-0456 (direct)
-     Fax:  (617) 496-8886
-     E-mail:  Elli@IKAROS.Harvard.EDU or elli@wjh12.harvard.edu
-
-     David Woodley Packard
-     Packard Humanities Institute
-     300 Second Street, Suite 201
-     Los Altos, CA 94002
-     Phone:  (415) 948-0150 (PHI)
-     Fax:  (415) 948-5793
-
-     Lynne K. Personius, Assistant Director
-     Cornell Information Technologies for
-      Scholarly Information Sources
-     502 Olin Library
-     Cornell University
-     Ithaca, NY 14853
-     Phone:  (607) 255-3393
-     Fax:  (607) 255-9346
-     E-mail:  JRN@CORNELLC.BITNET
-
-     Marybeth Peters
-     Policy Planning Adviser to the
-       Register of Copyrights
-     Library of Congress
-     Office LM 403
-     Phone:  (202) 707-8350
-     Fax:  (202) 707-8366
-
-     C. Michael Sperberg-McQueen
-     Editor, Text Encoding Initiative
-     Computer Center (M/C 135)
-     University of Illinois at Chicago
-     Box 6998
-     Chicago, IL 60680
-     Phone:  (312) 413-0317
-     Fax:  (312) 996-6834
-     E-mail:  u35395@uicvm..cc.uic.edu or u35395@uicvm.bitnet
-
-     George R. Thoma, Chief
-     Communications Engineering Branch
-     National Library of Medicine
-     8600 Rockville Pike
-     Bethesda, MD 20894
-     Phone:  (301) 496-4496
-     Fax:  (301) 402-0341
-     E-mail:  thoma@lhc.nlm.nih.gov
-
-     Dorothy Twohig, Editor
-     The Papers of George Washington
-     504 Alderman Library
-     University of Virginia
-     Charlottesville, VA 22903-2498
-     Phone:  (804) 924-0523
-     Fax:  (804) 924-4337
-
-     Susan H. Veccia, Team leader
-     American Memory, User Evaluation
-     Library of Congress
-     American Memory Evaluation Project
-     Phone:  (202) 707-9104
-     Fax:  (202) 707-3764
-     E-mail:  svec@seq1.loc.gov
-
-     Donald J. Waters, Head
-     Systems Office
-     Yale University Library
-     New Haven, CT 06520
-     Phone:  (203) 432-4889
-     Fax:  (203) 432-7231
-     E-mail:  DWATERS@YALEVM.BITNET or DWATERS@YALEVM.YCC.YALE.EDU
-
-     Stuart Weibel, Senior Research Scientist
-     OCLC
-     6565 Frantz Road
-     Dublin, OH 43017
-     Phone:  (614) 764-608l
-     Fax:  (614) 764-2344
-     E-mail:  INTERNET:  Stu@rsch.oclc.org
-
-     Robert G. Zich
-     Special Assistant to the Associate Librarian
-       for Special Projects
-     Library of Congress
-     Phone:  (202) 707-6233
-     Fax:  (202) 707-3764
-     E-mail:  rzic@seq1.loc.gov
-
-     Judith A. Zidar, Coordinator
-     National Agricultural Text Digitizing Program
-     Information Systems Division
-     National Agricultural Library
-     10301 Baltimore Boulevard
-     Beltsville, MD 20705-2351
-     Phone:  (301) 504-6813 or 504-5853
-     Fax:  (301) 504-7473
-     E-mail:  INTERNET:  JZIDAR@ASRR.ARSUSDA.GOV
-
-
-OBSERVERS:
-
-     Helen Aguera, Program Officer
-     Division of Research
-     Room 318
-     National Endowment for the Humanities
-     1100 Pennsylvania Avenue, N.W.
-     Washington, D.C. 20506
-     Phone:  (202) 786-0358
-     Fax:  (202) 786-0243
-
-     M. Ellyn Blanton, Deputy Director
-     National Demonstration Laboratory
-       for Interactive Information Technologies
-     Library of Congress
-     Phone:  (202) 707-4157
-     Fax:  (202) 707-2829
-
-     Charles M. Dollar
-     National Archives and Records Administration
-     NSZ Rm. 14N
-     7th & Pennsylvania, N.W.
-     Washington, DC 20408
-     Phone:  (202) 501-5532
-     Fax:  (202) 501-5512
-
-     Jeffrey Field, Deputy to the Director
-     Division of Preservation and Access
-     Room 802
-     National Endowment for the Humanities
-     1100 Pennsylvania Avenue, N.W.
-     Washington, DC 20506
-     Phone:  (202) 786-0570
-     Fax:  (202) 786-0243
-
-     Lorrin Garson
-     American Chemical Society
-     Research and Development Department
-     1155 16th Street, N.W.
-     Washington, D.C. 20036
-     Phone:  (202) 872-4541
-     Fax:  E-mail:  INTERNET:  LRG96@ACS.ORG
-
-     William M. Holmes, Jr.
-     National Archives and Records Administration
-     NSZ Rm. 14N
-     7th & Pennsylvania, N.W.
-     Washington, DC 20408
-     Phone:  (202) 501-5540
-     Fax:  (202) 501-5512
-     E-mail:  WHOLMES@AMERICAN.EDU
-
-     Sperling Martin
-     Information Resource Management
-     20030 Doolittle Street
-     Gaithersburg, MD 20879
-     Phone:  (301) 924-1803
-
-     Michael Neuman, Director
-     The Center for Text and Technology
-     Academic Computing Center
-     238 Reiss Science Building
-     Georgetown University
-     Washington, DC 20057
-     Phone:  (202) 687-6096
-     Fax:  (202) 687-6003
-     E-mail:  neuman@guvax.bitnet, neuman@guvax.georgetown.edu
-
-     Barbara Paulson, Program Officer
-     Division of Preservation and Access
-     Room 802
-     National Endowment for the Humanities
-     1100 Pennsylvania Avenue, N.W.
-     Washington, DC 20506
-     Phone:  (202) 786-0577
-     Fax:  (202) 786-0243
-     
-     Allen H. Renear
-     Senior Academic Planning Analyst
-     Brown University Computing and Information Services
-     115 Waterman Street
-     Campus Box 1885
-     Providence, R.I. 02912
-     Phone:  (401) 863-7312
-     Fax:  (401) 863-7329
-     E-mail:  BITNET:  Allen@BROWNVM or           
-     INTERNET:  Allen@brownvm.brown.edu
-
-     Susan M. Severtson, President
-     Chadwyck-Healey, Inc.
-     1101 King Street
-     Alexandria, VA 223l4
-     Phone:  (800) 752-05l5
-     Fax:  (703) 683-7589     
-
-     Frank Withrow
-     U.S. Department of Education
-     555 New Jersey Avenue, N.W.
-     Washington, DC 20208-5644
-     Phone:  (202) 219-2200
-     Fax:  (202) 219-2106
-
-
-(LC STAFF)
-     
-     Linda L. Arret
-     Machine-Readable Collections Reading Room LJ 132
-     (202) 707-1490
-
-     John D. Byrum, Jr.
-     Descriptive Cataloging Division LM 540
-     (202) 707-5194
-
-     Mary Jane Cavallo
-     Science and Technology Division LA 5210
-     (202) 707-1219
-
-     Susan Thea David
-     Congressional Research Service LM 226
-     (202) 707-7169
-
-     Robert Dierker
-     Senior Adviser for Multimedia Activities LM 608
-     (202) 707-6151
-
-     William W. Ellis
-     Associate Librarian for Science and Technology LM 611
-     (202) 707-6928
-
-     Ronald Gephart
-     Manuscript Division LM 102
-     (202) 707-5097
-
-     James Graber
-     Information Technology Services LM G51
-     (202) 707-9628
-
-     Rich Greenfield
-     American Memory LM 603
-     (202) 707-6233
-
-     Rebecca Guenther
-     Network Development LM 639
-     (202) 707-5092
-
-     Kenneth E. Harris
-     Preservation LM G21
-     (202) 707-5213
-
-     Staley Hitchcock
-     Manuscript Division LM 102
-     (202) 707-5383
-
-     Bohdan Kantor
-     Office of Special Projects LM 612
-     (202) 707-0180
-
-     John W. Kimball, Jr
-     Machine-Readable Collections Reading Room LJ 132
-     (202) 707-6560
-
-     Basil Manns
-     Information Technology Services LM G51
-     (202) 707-8345
-
-     Sally Hart McCallum
-     Network Development LM 639
-     (202) 707-6237
-
-     Dana J. Pratt
-     Publishing Office LM 602
-     (202) 707-6027
-
-     Jane Riefenhauser
-     American Memory LM 603
-     (202) 707-6233
-
-     William Z. Schenck
-     Collections Development LM 650
-     (202) 707-7706
-
-     Chandru J. Shahani
-     Preservation Research and Testing Office (R&T) LM G38
-     (202) 707-5607
-
-     William J. Sittig
-     Collections Development LM 650
-     (202) 707-7050
-
-     Paul Smith
-     Manuscript Division LM 102
-     (202) 707-5097
-
-     James L. Stevens
-     Information Technology Services LM G51
-     (202) 707-9688
-
-     Karen Stuart
-     Manuscript Division LM 130
-     (202) 707-5389
-
-     Tamara Swora
-     Preservation Microfilming Office LM G05
-     (202) 707-6293
-
-     Sarah Thomas
-     Collections Cataloging LM 642
-     (202) 707-5333
-
-
-                                   END
-      *************************************************************
-
-Note:  This file has been edited for use on computer networks.  This
-editing required the removal of diacritics, underlining, and fonts such
-as italics and bold.  
-
-kde 11/92
-
-[A few of the italics (when used for emphasis) were replaced by CAPS mh]
-
-*End of The Project Gutenberg Etext of LOC WORKSHOP ON ELECTRONIC ETEXTS
-

crates/libz-sys/src/zlib-ng/test/data/paper-100k.pdf

diff --git a/crates/libz-sys/src/zlib-ng/test/data/paper-100k.pdf b/crates/libz-sys/src/zlib-ng/test/data/paper-100k.pdf
deleted file mode 100644
index b3325e4..0000000
--- a/crates/libz-sys/src/zlib-ng/test/data/paper-100k.pdf
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib-ng/test/example.c

diff --git a/crates/libz-sys/src/zlib-ng/test/example.c b/crates/libz-sys/src/zlib-ng/test/example.c
deleted file mode 100644
index 33232de..0000000
--- a/crates/libz-sys/src/zlib-ng/test/example.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-#include "deflate.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <inttypes.h>
-
-#define TESTFILE "foo.gz"
-
-static const char hello[] = "hello, hello!";
-/* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- */
-
-static const char dictionary[] = "hello";
-static unsigned long dictId = 0; /* Adler32 value of the dictionary */
-
-/* Maximum dictionary size, according to inflateGetDictionary() description. */
-#define MAX_DICTIONARY_SIZE 32768
-
-
-void test_compress      (unsigned char *compr, z_size_t comprLen,unsigned char *uncompr, z_size_t uncomprLen);
-void test_gzio          (const char *fname, unsigned char *uncompr, z_size_t uncomprLen);
-void test_deflate       (unsigned char *compr, size_t comprLen);
-void test_inflate       (unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen);
-void test_large_deflate (unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen, int zng_params);
-void test_large_inflate (unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen);
-void test_flush         (unsigned char *compr, z_size_t *comprLen);
-void test_sync          (unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen);
-void test_dict_deflate  (unsigned char *compr, size_t comprLen);
-void test_dict_inflate  (unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen);
-int  main               (int argc, char *argv[]);
-
-
-static alloc_func zalloc = NULL;
-static free_func zfree = NULL;
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(const char *format, ...) {
-    va_list va;
-
-    va_start(va, format);
-    vfprintf(stderr, format, va);
-    va_end(va);
-
-    exit(1);
-}
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) \
-        error("%s error: %d\n", msg, err); \
-}
-
-/* ===========================================================================
- * Test compress() and uncompress()
- */
-void test_compress(unsigned char *compr, z_size_t comprLen, unsigned char *uncompr, z_size_t uncomprLen) {
-    int err;
-    size_t len = strlen(hello)+1;
-
-    err = PREFIX(compress)(compr, &comprLen, (const unsigned char*)hello, (z_size_t)len);
-    CHECK_ERR(err, "compress");
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = PREFIX(uncompress)(uncompr, &uncomprLen, compr, comprLen);
-    CHECK_ERR(err, "uncompress");
-
-    if (strcmp((char*)uncompr, hello))
-        error("bad uncompress\n");
-    else
-        printf("uncompress(): %s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test read/write of .gz files
- */
-void test_gzio(const char *fname, unsigned char *uncompr, z_size_t uncomprLen) {
-#ifdef NO_GZCOMPRESS
-    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
-#else
-    int err;
-    size_t read;
-    size_t len = strlen(hello)+1;
-    gzFile file;
-    z_off64_t pos;
-    z_off64_t comprLen;
-
-    /* Write gz file with test data */
-    file = PREFIX(gzopen)(fname, "wb");
-    if (file == NULL)
-        error("gzopen error\n");
-    /* Write hello, hello! using gzputs and gzprintf */
-    PREFIX(gzputc)(file, 'h');
-    if (PREFIX(gzputs)(file, "ello") != 4)
-        error("gzputs err: %s\n", PREFIX(gzerror)(file, &err));
-    if (PREFIX(gzprintf)(file, ", %s!", "hello") != 8)
-        error("gzprintf err: %s\n", PREFIX(gzerror)(file, &err));
-    /* Write string null-teriminator using gzseek */
-    if (PREFIX(gzseek)(file, 1L, SEEK_CUR) < 0)
-        error("gzseek error, gztell=%ld\n", (long)PREFIX(gztell)(file));
-    /* Write hello, hello! using gzfwrite using best compression level */
-    if (PREFIX(gzsetparams)(file, Z_BEST_COMPRESSION, Z_DEFAULT_STRATEGY) != Z_OK)
-        error("gzsetparams err: %s\n", PREFIX(gzerror)(file, &err));
-    if (PREFIX(gzfwrite)(hello, len, 1, file) == 0)
-        error("gzfwrite err: %s\n", PREFIX(gzerror)(file, &err));
-    /* Flush compressed bytes to file */
-    if (PREFIX(gzflush)(file, Z_SYNC_FLUSH) != Z_OK)
-        error("gzflush err: %s\n", PREFIX(gzerror)(file, &err));
-    comprLen = PREFIX(gzoffset)(file);
-    if (comprLen <= 0)
-        error("gzoffset err: %s\n", PREFIX(gzerror)(file, &err));
-    PREFIX(gzclose)(file);
-
-    /* Open gz file we previously wrote */
-    file = PREFIX(gzopen)(fname, "rb");
-    if (file == NULL)
-        error("gzopen error\n");
-
-    /* Read uncompressed data - hello, hello! string twice */
-    strcpy((char*)uncompr, "garbages");
-    if (PREFIX(gzread)(file, uncompr, (unsigned)uncomprLen) != (int)(len + len))
-        error("gzread err: %s\n", PREFIX(gzerror)(file, &err));
-    if (strcmp((char*)uncompr, hello))
-        error("bad gzread: %s\n", (char*)uncompr);
-    else
-        printf("gzread(): %s\n", (char*)uncompr);
-    /* Check position at the end of the gz file */
-    if (PREFIX(gzeof)(file) != 1)
-        error("gzeof err: not reporting end of stream\n");
-
-    /* Seek backwards mid-string and check char reading with gzgetc and gzungetc */
-    pos = PREFIX(gzseek)(file, -22L, SEEK_CUR);
-    if (pos != 6 || PREFIX(gztell)(file) != pos)
-        error("gzseek error, pos=%ld, gztell=%ld\n", (long)pos, (long)PREFIX(gztell)(file));
-    if (PREFIX(gzgetc)(file) != ' ')
-        error("gzgetc error\n");
-    if (PREFIX(gzungetc)(' ', file) != ' ')
-        error("gzungetc error\n");
-    /* Read first hello, hello! string with gzgets */
-    strcpy((char*)uncompr, "garbages");
-    PREFIX(gzgets)(file, (char*)uncompr, (int)uncomprLen);
-    if (strlen((char*)uncompr) != 7) /* " hello!" */
-        error("gzgets err after gzseek: %s\n", PREFIX(gzerror)(file, &err));
-    if (strcmp((char*)uncompr, hello + 6))
-        error("bad gzgets after gzseek\n");
-    else
-        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
-    /* Seek to second hello, hello! string */
-    pos = PREFIX(gzseek)(file, 14L, SEEK_SET);
-    if (pos != 14 || PREFIX(gztell)(file) != pos)
-        error("gzseek error, pos=%ld, gztell=%ld\n", (long)pos, (long)PREFIX(gztell)(file));
-    /* Check position not at end of file */
-    if (PREFIX(gzeof)(file) != 0)
-        error("gzeof err: reporting end of stream\n");
-    /* Read first hello, hello! string with gzfread */
-    strcpy((char*)uncompr, "garbages");
-    read = PREFIX(gzfread)(uncompr, uncomprLen, 1, file);
-    if (strcmp((const char *)uncompr, hello) != 0)
-        error("bad gzgets\n");
-    else
-        printf("gzgets(): %s\n", (char*)uncompr);
-    pos = PREFIX(gzoffset)(file);
-    if (pos < 0 || pos != (comprLen + 10))
-        error("gzoffset err: wrong offset at end\n");
-    /* Trigger an error and clear it with gzclearerr */
-    PREFIX(gzfread)(uncompr, (size_t)-1, (size_t)-1, file);
-    PREFIX(gzerror)(file, &err);
-    if (err == 0)
-        error("gzerror err: no error returned\n");
-    PREFIX(gzclearerr)(file);
-    PREFIX(gzerror)(file, &err);
-    if (err != 0)
-        error("gzclearerr err: not zero %d\n", err);
-
-    PREFIX(gzclose)(file);
-
-    if (PREFIX(gzclose)(NULL) != Z_STREAM_ERROR)
-        error("gzclose unexpected return when handle null\n");
-    Z_UNUSED(read);
-#endif
-}
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    size_t len = strlen(hello)+1;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-    c_stream.total_in = 0;
-    c_stream.total_out = 0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-    d_stream.total_in = 0;
-    d_stream.total_out = 0;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello))
-        error("bad inflate\n");
-    else
-        printf("inflate(): %s\n", (char *)uncompr);
-}
-
-static unsigned int diff;
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen, int zng_params) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-#ifndef ZLIB_COMPAT
-    int level = -1;
-    int strategy = -1;
-    zng_deflate_param_value params[2];
-
-    params[0].param = Z_DEFLATE_LEVEL;
-    params[0].buf = &level;
-    params[0].size = sizeof(level);
-
-    params[1].param = Z_DEFLATE_STRATEGY;
-    params[1].buf = &strategy;
-    params[1].size = sizeof(strategy);
-#endif
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_SPEED);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (unsigned int)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (unsigned int)uncomprLen;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-    if (c_stream.avail_in != 0)
-        error("deflate not greedy\n");
-
-    /* Feed in already compressed data and switch to no compression: */
-    if (zng_params) {
-#ifndef ZLIB_COMPAT
-        zng_deflateGetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-        if (level != Z_BEST_SPEED)
-            error("Expected compression level Z_BEST_SPEED, got %d\n", level);
-        if (strategy != Z_DEFAULT_STRATEGY)
-            error("Expected compression strategy Z_DEFAULT_STRATEGY, got %d\n", strategy);
-        level = Z_NO_COMPRESSION;
-        strategy = Z_DEFAULT_STRATEGY;
-        zng_deflateSetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-#else
-        error("test_large_deflate() called with zng_params=1 in compat mode\n");
-#endif
-    } else {
-        PREFIX(deflateParams)(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    }
-    c_stream.next_in = compr;
-    diff = (unsigned int)(c_stream.next_out - compr);
-    c_stream.avail_in = diff;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    /* Switch back to compressing mode: */
-    if (zng_params) {
-#ifndef ZLIB_COMPAT
-        level = -1;
-        strategy = -1;
-        zng_deflateGetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-        if (level != Z_NO_COMPRESSION)
-            error("Expected compression level Z_NO_COMPRESSION, got %d\n", level);
-        if (strategy != Z_DEFAULT_STRATEGY)
-            error("Expected compression strategy Z_DEFAULT_STRATEGY, got %d\n", strategy);
-        level = Z_BEST_COMPRESSION;
-        strategy = Z_FILTERED;
-        zng_deflateSetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-#else
-        error("test_large_deflate() called with zng_params=1 in compat mode\n");
-#endif
-    } else {
-        PREFIX(deflateParams)(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    }
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (unsigned int)uncomprLen;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END)
-        error("deflate should report Z_STREAM_END\n");
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (unsigned int)comprLen;
-    d_stream.total_in = 0;
-    d_stream.total_out = 0;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = (unsigned int)uncomprLen;
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2*uncomprLen + diff)
-        error("bad large inflate: %" PRIu64 "\n", (uint64_t)d_stream.total_out);
-    else
-        printf("large_inflate(): OK\n");
-}
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(unsigned char *compr, z_size_t *comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    unsigned int len = (unsigned int)strlen(hello)+1;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (unsigned int)*comprLen;
-    err = PREFIX(deflate)(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate");
-    }
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = (z_size_t)c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (unsigned int)uncomprLen;
-
-    err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (unsigned int)comprLen-2;   /* read all compressed data */
-    err = PREFIX(inflateSync)(&d_stream);           /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = PREFIX(inflate)(&d_stream, Z_FINISH);
-    if (err != Z_STREAM_END)
-        error("inflate should report Z_STREAM_END\n");
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    printf("after inflateSync(): hel%s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-    c_stream.adler = 0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = PREFIX(deflateSetDictionary)(&c_stream,
-                (const unsigned char*)dictionary, (int)sizeof(dictionary));
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    dictId = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (unsigned int)comprLen;
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (unsigned int)strlen(hello)+1;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END)
-        error("deflate should report Z_STREAM_END\n");
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    uint8_t check_dictionary[MAX_DICTIONARY_SIZE];
-    uint32_t check_dictionary_len = 0;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage garbage garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-    d_stream.adler = 0;
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (unsigned int)comprLen;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (unsigned int)uncomprLen;
-
-    for (;;) {
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        if (err == Z_NEED_DICT) {
-            if (d_stream.adler != dictId)
-                error("unexpected dictionary");
-            err = PREFIX(inflateSetDictionary)(&d_stream, (const unsigned char*)dictionary,
-                                       (int)sizeof(dictionary));
-        }
-        CHECK_ERR(err, "inflate with dict");
-    }
-    
-    err = PREFIX(inflateGetDictionary)(&d_stream, NULL, &check_dictionary_len);
-    CHECK_ERR(err, "inflateGetDictionary");
-#ifndef S390_DFLTCC_INFLATE
-    if (check_dictionary_len < sizeof(dictionary))
-        error("bad dictionary length\n");
-#endif
-    
-    err = PREFIX(inflateGetDictionary)(&d_stream, check_dictionary, &check_dictionary_len);
-    CHECK_ERR(err, "inflateGetDictionary");
-#ifndef S390_DFLTCC_INFLATE
-    if (memcmp(dictionary, check_dictionary, sizeof(dictionary)) != 0)
-        error("bad dictionary\n");
-#endif
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strncmp((char*)uncompr, hello, sizeof(hello)))
-        error("bad inflate with dict\n");
-    else
-        printf("inflate with dictionary: %s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflateBound() with small buffers
- */
-void test_deflate_bound(void) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    unsigned int len = (unsigned int)strlen(hello)+1;
-    int estimateLen = 0;
-    unsigned char *outBuf = NULL;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-    c_stream.avail_in = len;
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_out = 0;
-    c_stream.next_out = outBuf;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    /* calculate actual output length and update structure */
-    estimateLen = PREFIX(deflateBound)(&c_stream, len);
-    outBuf = malloc(estimateLen);
-
-    if (outBuf != NULL) {
-        /* update zlib configuration */
-        c_stream.avail_out = estimateLen;
-        c_stream.next_out = outBuf;
-
-        /* do the compression */
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) {
-            printf("deflateBound(): OK\n");
-        } else {
-            CHECK_ERR(err, "deflate");
-        }
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    free(outBuf);
-}
-
-/* ===========================================================================
- * Test deflateCopy() with small buffers
- */
-void test_deflate_copy(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream, c_stream_copy; /* compression stream */
-    int err;
-    size_t len = strlen(hello)+1;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflateCopy)(&c_stream_copy, &c_stream);
-    CHECK_ERR(err, "deflate_copy");
-
-    if (c_stream.state->status == c_stream_copy.state->status) {
-        printf("deflate_copy(): OK\n");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd original");
-
-    err = PREFIX(deflateEnd)(&c_stream_copy);
-    CHECK_ERR(err, "deflateEnd copy");
-}
-
-/* ===========================================================================
- * Test deflateGetDictionary() with small buffers
- */
-void test_deflate_get_dict(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    unsigned char *dictNew = NULL;
-    unsigned int *dictLen;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (unsigned int)strlen(hello)+1;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-
-    if (err != Z_STREAM_END)
-        error("deflate should report Z_STREAM_END\n");
-
-    dictNew = calloc(256, 1);
-    dictLen = (unsigned int *)calloc(4, 1);
-    err = PREFIX(deflateGetDictionary)(&c_stream, dictNew, dictLen);
-
-    CHECK_ERR(err, "deflateGetDictionary");
-    if (err == Z_OK) {
-        printf("deflateGetDictionary(): %s\n", dictNew);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    free(dictNew);
-    free(dictLen);
-}
-
-/* ===========================================================================
- * Test deflatePending() with small buffers
- */
-void test_deflate_pending(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    int *bits = calloc(256, 1);
-    unsigned *ped = calloc(256, 1);
-    size_t len = strlen(hello)+1;
-
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflatePending)(&c_stream, ped, bits);
-    CHECK_ERR(err, "deflatePending");
-
-    if (*bits >= 0 && *bits <= 7) {
-        printf("deflatePending(): OK\n");
-    } else {
-        printf("deflatePending(): error\n");
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    free(bits);
-    free(ped);
-}
-
-/* ===========================================================================
- * Test deflatePrime() wrapping gzip around deflate stream
- */
-void test_deflate_prime(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    PREFIX3(stream) d_stream; /* decompression stream */
-    int err;
-    size_t len = strlen(hello)+1;
-    uint32_t crc = 0;
-
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    /* Raw deflate windowBits is -15 */
-    err = PREFIX(deflateInit2)(&c_stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
-    CHECK_ERR(err, "deflateInit2");
-
-    /* Gzip magic number */
-    err = PREFIX(deflatePrime)(&c_stream, 16, 0x8b1f);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip compression method (deflate) */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 0x08);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip flags (one byte, using two odd bit calls) */
-    err = PREFIX(deflatePrime)(&c_stream, 3, 0x0);
-    CHECK_ERR(err, "deflatePrime");
-    err = PREFIX(deflatePrime)(&c_stream, 5, 0x0);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip modified time */
-    err = PREFIX(deflatePrime)(&c_stream, 32, 0x0);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip extra flags */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 0x0);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip operating system */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 255);
-    CHECK_ERR(err, "deflatePrime");
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (uint32_t)len;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uint32_t)comprLen;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END)
-        CHECK_ERR(err, "deflate");
-
-    /* Gzip uncompressed data crc32 */
-    crc = PREFIX(crc32)(0, (const uint8_t *)hello, (uint32_t)len);
-    err = PREFIX(deflatePrime)(&c_stream, 32, crc);
-    CHECK_ERR(err, "deflatePrime");
-    /* Gzip uncompressed data length */
-    err = PREFIX(deflatePrime)(&c_stream, 32, (uint32_t)len);
-    CHECK_ERR(err, "deflatePrime");
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uint32_t)c_stream.total_out;
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uint32_t)uncomprLen;
-    d_stream.total_in = 0;
-    d_stream.total_out = 0;
-
-    /* Inflate with gzip header */
-    err = PREFIX(inflateInit2)(&d_stream, MAX_WBITS + 32);
-    CHECK_ERR(err, "inflateInit");
-
-    err = PREFIX(inflate)(&d_stream, Z_FINISH);
-    if (err != Z_BUF_ERROR) {
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((const char *)uncompr, hello) != 0)
-        error("bad deflatePrime\n");
-    if (err == Z_OK)
-        printf("deflatePrime(): OK\n");
-}
-
-/* ===========================================================================
- * Test deflateSetHeader() with small buffers
- */
-void test_deflate_set_header(unsigned char *compr, size_t comprLen) {
-    PREFIX(gz_header) *head = calloc(1, sizeof(PREFIX(gz_header)));
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    size_t len = strlen(hello)+1;
-
-
-    if (head == NULL)
-        error("out of memory\n");
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    /* gzip */
-    err = PREFIX(deflateInit2)(&c_stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY);
-    CHECK_ERR(err, "deflateInit2");
-
-    head->text = 1;
-    head->comment = (uint8_t *)"comment";
-    head->name = (uint8_t *)"name";
-    head->hcrc = 1;
-    head->extra = (uint8_t *)"extra";
-    head->extra_len = (uint32_t)strlen((const char *)head->extra);
-
-    err = PREFIX(deflateSetHeader)(&c_stream, head);
-    CHECK_ERR(err, "deflateSetHeader");
-    if (err == Z_OK) {
-        printf("deflateSetHeader(): OK\n");
-    }
-    PREFIX(deflateBound)(&c_stream, (unsigned long)comprLen);
-
-    c_stream.next_in  = (unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    free(head);
-}
-
-/* ===========================================================================
- * Test deflateTune() with small buffers
- */
-void test_deflate_tune(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    int good_length = 3;
-    int max_lazy = 5;
-    int nice_length = 18;
-    int max_chain = 6;
-    size_t len = strlen(hello)+1;
-
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = PREFIX(deflateTune)(&c_stream,(uInt)good_length,(uInt)max_lazy,nice_length,(uInt)max_chain);
-    CHECK_ERR(err, "deflateTune");
-    if (err == Z_OK) {
-        printf("deflateTune(): OK\n");
-    }
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Usage:  example [output.gz  [input.gz]]
- */
-int main(int argc, char *argv[]) {
-    unsigned char *compr, *uncompr;
-    z_size_t comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
-    z_size_t uncomprLen = comprLen;
-    static const char* myVersion = PREFIX2(VERSION);
-
-    if (zVersion()[0] != myVersion[0]) {
-        fprintf(stderr, "incompatible zlib version\n");
-        exit(1);
-
-    } else if (strcmp(zVersion(), PREFIX2(VERSION)) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
-    }
-
-    printf("zlib-ng version %s = 0x%08lx, compile flags = 0x%lx\n",
-            ZLIBNG_VERSION, ZLIBNG_VERNUM, PREFIX(zlibCompileFlags)());
-
-    compr    = (unsigned char*)calloc((unsigned int)comprLen, 1);
-    uncompr  = (unsigned char*)calloc((unsigned int)uncomprLen, 1);
-    /* compr and uncompr are cleared to avoid reading uninitialized
-     * data and to ensure that uncompr compresses well.
-     */
-    if (compr == NULL || uncompr == NULL)
-        error("out of memory\n");
-
-    test_compress(compr, comprLen, uncompr, uncomprLen);
-
-    test_gzio((argc > 1 ? argv[1] : TESTFILE),
-              uncompr, uncomprLen);
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen, 0);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-#ifndef ZLIB_COMPAT
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen, 1);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-#endif
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-    comprLen = uncomprLen;
-
-    test_dict_deflate(compr, comprLen);
-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_deflate_bound();
-    test_deflate_copy(compr, comprLen);
-    test_deflate_get_dict(compr, comprLen);
-    test_deflate_set_header(compr, comprLen);
-    test_deflate_tune(compr, comprLen);
-    test_deflate_pending(compr, comprLen);
-    test_deflate_prime(compr, comprLen, uncompr, uncomprLen);
-
-    free(compr);
-    free(uncompr);
-
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/CMakeLists.txt b/crates/libz-sys/src/zlib-ng/test/fuzz/CMakeLists.txt
deleted file mode 100644
index c21f9c1..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-    enable_language(CXX)
-
-    if(DEFINED ENV{LIB_FUZZING_ENGINE})
-        set(FUZZING_ENGINE $ENV{LIB_FUZZING_ENGINE})
-        set(FUZZING_ENGINE_FOUND ON)
-    else()
-        find_library(FUZZING_ENGINE "FuzzingEngine")
-    endif()
-endif()
-
-set(FUZZERS
-    fuzzer_checksum
-    fuzzer_compress
-    fuzzer_example_small
-    fuzzer_example_large
-    fuzzer_example_flush
-    fuzzer_example_dict
-    )
-
-if(WITH_GZFILEOP)
-    list(APPEND FUZZERS fuzzer_minigzip)
-endif()
-
-foreach(FUZZER ${FUZZERS})
-    add_executable(${FUZZER} ${FUZZER}.c)
-
-    if(NOT FUZZING_ENGINE_FOUND)
-        target_sources(${FUZZER} PRIVATE standalone_fuzz_target_runner.c)
-    endif()
-
-    target_link_libraries(${FUZZER} zlibstatic)
-    if(FUZZING_ENGINE_FOUND)
-        target_link_libraries(${FUZZER} ${FUZZING_ENGINE})
-    endif()
-
-    if(ZLIB_ENABLE_TESTS)
-        file(GLOB FUZZER_TEST_FILES ${CMAKE_SOURCE_DIR}/*)
-        set(FUZZER_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${FUZZER}> ${FUZZER_TEST_FILES})
-        add_test(NAME ${FUZZER} COMMAND ${FUZZER_COMMAND})
-    endif()
-endforeach()

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_checksum.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_checksum.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_checksum.c
deleted file mode 100644
index cedd284..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_checksum.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataLen) {
-    uint32_t crc0 = PREFIX(crc32)(0L, NULL, 0);
-    uint32_t crc1 = crc0;
-    uint32_t crc2 = crc0;
-    uint32_t adler0 = PREFIX(adler32)(0L, NULL, 0);
-    uint32_t adler1 = adler0;
-    uint32_t adler2 = adler0;
-    uint32_t combine1, combine2;
-    /* Checksum with a buffer of size equal to the first byte in the input. */
-    uint32_t buffSize = data[0];
-    uint32_t offset = 0;
-    uint32_t op;
-
-    /* Discard inputs larger than 1Mb. */
-    static size_t kMaxSize = 1024 * 1024;
-    if (dataLen < 1 || dataLen > kMaxSize)
-        return 0;
-
-    /* Make sure the buffer has at least a byte. */
-    if (buffSize == 0)
-        ++buffSize;
-
-    /* CRC32 */
-    op = PREFIX(crc32_combine_gen)(buffSize);
-    for (offset = 0; offset + buffSize <= dataLen; offset += buffSize) {
-        uint32_t crc3 = PREFIX(crc32_z)(crc0, data + offset, buffSize);
-        uint32_t crc4 = PREFIX(crc32_combine_op)(crc1, crc3, op);
-        crc1 = PREFIX(crc32_z)(crc1, data + offset, buffSize);
-        assert(crc1 == crc4);
-        Z_UNUSED(crc1);
-        Z_UNUSED(crc4);
-    }
-    crc1 = PREFIX(crc32_z)(crc1, data + offset, dataLen % buffSize);
-
-    crc2 = PREFIX(crc32_z)(crc2, data, dataLen);
-
-    assert(crc1 == crc2);
-    Z_UNUSED(crc1);
-    Z_UNUSED(crc2);
-    combine1 = PREFIX(crc32_combine)(crc1, crc2, (z_off_t)dataLen);
-    combine2 = PREFIX(crc32_combine)(crc1, crc1, (z_off_t)dataLen);
-    assert(combine1 == combine2);
-
-    /* Fast CRC32 combine. */
-    op = PREFIX(crc32_combine_gen)((z_off_t)dataLen);
-    combine1 = PREFIX(crc32_combine_op)(crc1, crc2, op);
-    combine2 = PREFIX(crc32_combine_op)(crc2, crc1, op);
-    assert(combine1 == combine2);
-    combine1 = PREFIX(crc32_combine)(crc1, crc2, (z_off_t)dataLen);
-    combine2 = PREFIX(crc32_combine_op)(crc2, crc1, op);
-    assert(combine1 == combine2);
-
-    /* Adler32 */
-    for (offset = 0; offset + buffSize <= dataLen; offset += buffSize)
-        adler1 = PREFIX(adler32_z)(adler1, data + offset, buffSize);
-    adler1 = PREFIX(adler32_z)(adler1, data + offset, dataLen % buffSize);
-
-    adler2 = PREFIX(adler32_z)(adler2, data, dataLen);
-
-    assert(adler1 == adler2);
-    Z_UNUSED(adler1);
-    Z_UNUSED(adler2);
-    combine1 = PREFIX(adler32_combine)(adler1, adler2, (z_off_t)dataLen);
-    combine2 = PREFIX(adler32_combine)(adler1, adler1, (z_off_t)dataLen);
-    assert(combine1 == combine2);
-    Z_UNUSED(combine1);
-    Z_UNUSED(combine2);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_compress.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_compress.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_compress.c
deleted file mode 100644
index 71cdf99..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_compress.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-static const uint8_t *data;
-static size_t dataLen;
-
-static void check_compress_level(uint8_t *compr, z_size_t comprLen,
-                                 uint8_t *uncompr, z_size_t uncomprLen,
-                                 int level) {
-    PREFIX(compress2)(compr, &comprLen, data, dataLen, level);
-    PREFIX(uncompress)(uncompr, &uncomprLen, compr, comprLen);
-
-    /* Make sure compress + uncompress gives back the input data. */
-    assert(dataLen == uncomprLen);
-    assert(0 == memcmp(data, uncompr, dataLen));
-}
-
-#define put_byte(s, i, c) {s[i] = (unsigned char)(c);}
-
-static void write_zlib_header(uint8_t *s) {
-    unsigned level_flags = 0; /* compression level (0..3) */
-    unsigned w_bits = 8; /* window size log2(w_size) (8..16) */
-    unsigned int header = (Z_DEFLATED + ((w_bits-8)<<4)) << 8;
-    header |= (level_flags << 6);
-
-    header += 31 - (header % 31);
-
-    /* s is guaranteed to be longer than 2 bytes. */
-    put_byte(s, 0, (header >> 8));
-    put_byte(s, 1, (header & 0xff));
-}
-
-static void check_decompress(uint8_t *compr, size_t comprLen) {
-    /* We need to write a valid zlib header of size two bytes. Copy the input data
-       in a larger buffer. Do not modify the input data to avoid libFuzzer error:
-       fuzz target overwrites its const input. */
-    size_t copyLen = dataLen + 2;
-    uint8_t *copy = (uint8_t *)malloc(copyLen);
-    memcpy(copy + 2, data, dataLen);
-    write_zlib_header(copy);
-
-    PREFIX(uncompress)(compr, &comprLen, copy, copyLen);
-    free(copy);
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-    /* compressBound does not provide enough space for low compression levels. */
-    z_size_t comprLen = 100 + 2 * PREFIX(compressBound)(size);
-    z_size_t uncomprLen = (z_size_t)size;
-    uint8_t *compr, *uncompr;
-
-    /* Discard inputs larger than 1Mb. */
-    static size_t kMaxSize = 1024 * 1024;
-
-    if (size < 1 || size > kMaxSize)
-        return 0;
-
-    data = d;
-    dataLen = size;
-    compr = (uint8_t *)calloc(1, comprLen);
-    uncompr = (uint8_t *)calloc(1, uncomprLen);
-
-    check_compress_level(compr, comprLen, uncompr, uncomprLen, 1);
-    check_compress_level(compr, comprLen, uncompr, uncomprLen, 3);
-    check_compress_level(compr, comprLen, uncompr, uncomprLen, 6);
-    check_compress_level(compr, comprLen, uncompr, uncomprLen, 7);
-
-    check_decompress(compr, comprLen);
-
-    free(compr);
-    free(uncompr);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_dict.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_dict.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_dict.c
deleted file mode 100644
index 053a3e1..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_dict.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-static const uint8_t *data;
-static size_t dataLen;
-static alloc_func zalloc = NULL;
-static free_func zfree = NULL;
-static unsigned int dictionaryLen = 0;
-static unsigned long dictId; /* Adler32 value of the dictionary */
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(unsigned char **compr, size_t *comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    int level = data[0] % 11 - 1; /* [-1..9]
-      compression levels
-      #define Z_NO_COMPRESSION         0
-      #define Z_BEST_SPEED             1
-      #define Z_BEST_COMPRESSION       9
-      #define Z_DEFAULT_COMPRESSION  (-1) */
-
-    int method = Z_DEFLATED; /* The deflate compression method (the only one
-                                supported in this version) */
-    int windowBits = 8 + data[(dataLen > 1) ? 1:0] % 8; /* The windowBits parameter is the base
-      two logarithm of the window size (the size of the history buffer).  It
-      should be in the range 8..15 for this version of the library. */
-    int memLevel = 1 + data[(dataLen > 2) ? 2:0] % 9;   /* memLevel=1 uses minimum memory but is
-      slow and reduces compression ratio; memLevel=9 uses maximum memory for
-      optimal speed. */
-    int strategy = data[(dataLen > 3) ? 3:0] % 5;       /* [0..4]
-      #define Z_FILTERED            1
-      #define Z_HUFFMAN_ONLY        2
-      #define Z_RLE                 3
-      #define Z_FIXED               4
-      #define Z_DEFAULT_STRATEGY    0 */
-
-    /* deflate would fail for no-compression or for speed levels. */
-    if (level == 0 || level == 1)
-        level = -1;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit2)(&c_stream, level, method, windowBits, memLevel,
-                               strategy);
-    CHECK_ERR(err, "deflateInit");
-
-    err = PREFIX(deflateSetDictionary)(
-        &c_stream, (const unsigned char *)data, dictionaryLen);
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    /* deflateBound does not provide enough space for low compression levels. */
-    *comprLen = 100 + 2 * PREFIX(deflateBound)(&c_stream, (unsigned long)dataLen);
-    *compr = (uint8_t *)calloc(1, *comprLen);
-
-    dictId = c_stream.adler;
-    c_stream.next_out = *compr;
-    c_stream.avail_out = (unsigned int)(*comprLen);
-
-    c_stream.next_in = (z_const unsigned char *)data;
-    c_stream.avail_in = (uint32_t)dataLen;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate dict should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(unsigned char *compr, size_t comprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-    unsigned char *uncompr;
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in = compr;
-    d_stream.avail_in = (unsigned int)comprLen;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    uncompr = (uint8_t *)calloc(1, dataLen);
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (unsigned int)dataLen;
-
-    for (;;) {
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-            break;
-        if (err == Z_NEED_DICT) {
-            if (d_stream.adler != dictId) {
-                fprintf(stderr, "unexpected dictionary");
-                exit(1);
-            }
-            err = PREFIX(inflateSetDictionary)(
-                    &d_stream, (const unsigned char *)data, dictionaryLen);
-        }
-        CHECK_ERR(err, "inflate with dict");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (memcmp(uncompr, data, dataLen)) {
-        fprintf(stderr, "bad inflate with dict\n");
-        exit(1);
-    }
-
-    free(uncompr);
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-    size_t comprLen = 0;
-    uint8_t *compr;
-
-    /* Discard inputs larger than 100Kb. */
-    static size_t kMaxSize = 100 * 1024;
-
-    if (size < 1 || size > kMaxSize)
-        return 0;
-
-    data = d;
-    dataLen = size;
-
-    /* Set up the contents of the dictionary. The size of the dictionary is
-       intentionally selected to be of unusual size. To help cover more corner
-       cases, the size of the dictionary is read from the input data. */
-    dictionaryLen = data[0];
-    if (dictionaryLen > dataLen)
-        dictionaryLen = (unsigned int)dataLen;
-
-    test_dict_deflate(&compr, &comprLen);
-    test_dict_inflate(compr, comprLen);
-
-    free(compr);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_flush.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_flush.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_flush.c
deleted file mode 100644
index baa6988..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_flush.c
+++ /dev/null
@@ -1,119 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-static const uint8_t *data;
-static size_t dataLen;
-static alloc_func zalloc = NULL;
-static free_func zfree = NULL;
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(unsigned char *compr, z_size_t *comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    unsigned int len = (unsigned int)dataLen;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in = (z_const unsigned char *)data;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (unsigned int)*comprLen;
-    err = PREFIX(deflate)(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate flush 1");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate flush 2");
-    }
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = (z_size_t)c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (unsigned int)uncomprLen;
-
-    err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (unsigned int)comprLen - 2; /* read all compressed data */
-    err = PREFIX(inflateSync)(&d_stream); /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = PREFIX(inflate)(&d_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "inflate should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-    z_size_t comprLen = 100 + 2 * PREFIX(compressBound)(size);
-    z_size_t uncomprLen = (z_size_t)size;
-    uint8_t *compr, *uncompr;
-
-    /* Discard inputs larger than 1Mb. */
-    static size_t kMaxSize = 1024 * 1024;
-
-    // This test requires at least 3 bytes of input data.
-    if (size <= 3 || size > kMaxSize)
-        return 0;
-
-    data = d;
-    dataLen = size;
-    compr = (uint8_t *)calloc(1, comprLen);
-    uncompr = (uint8_t *)calloc(1, uncomprLen);
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-
-    free(compr);
-    free(uncompr);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_large.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_large.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_large.c
deleted file mode 100644
index 4114597..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_large.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-#include <inttypes.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-static const uint8_t *data;
-static size_t dataLen;
-static alloc_func zalloc = NULL;
-static free_func zfree = NULL;
-static unsigned int diff;
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (unsigned int)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (unsigned int)uncomprLen;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate large 1");
-    if (c_stream.avail_in != 0) {
-        fprintf(stderr, "deflate not greedy\n");
-        exit(1);
-    }
-
-    /* Feed in already compressed data and switch to no compression: */
-    PREFIX(deflateParams)(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    c_stream.next_in = compr;
-    diff = (unsigned int)(c_stream.next_out - compr);
-    c_stream.avail_in = diff;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate large 2");
-
-    /* Switch back to compressing mode: */
-    PREFIX(deflateParams)(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (unsigned int)uncomprLen;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate large 3");
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate large should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in = compr;
-    d_stream.avail_in = (unsigned int)comprLen;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr; /* discard the output */
-        d_stream.avail_out = (unsigned int)uncomprLen;
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-            break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2 * uncomprLen + diff) {
-        fprintf(stderr, "bad large inflate: %" PRIu64 "\n", (uint64_t)d_stream.total_out);
-        exit(1);
-    }
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-    size_t comprLen = 100 + 3 * size;
-    size_t uncomprLen = comprLen;
-    uint8_t *compr, *uncompr;
-
-    /* Discard inputs larger than 512Kb. */
-    static size_t kMaxSize = 512 * 1024;
-
-    if (size < 1 || size > kMaxSize)
-        return 0;
-
-    data = d;
-    dataLen = size;
-    compr = (uint8_t *)calloc(1, comprLen);
-    uncompr = (uint8_t *)calloc(1, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    free(compr);
-    free(uncompr);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_small.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_small.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_small.c
deleted file mode 100644
index e59c720..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_example_small.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-static const uint8_t *data;
-static size_t dataLen;
-static alloc_func zalloc = NULL;
-static free_func zfree = NULL;
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(unsigned char *compr, size_t comprLen) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    int err;
-    unsigned long len = (unsigned long)dataLen;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (void *)0;
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in = (z_const unsigned char *)data;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate small 1");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END)
-            break;
-        CHECK_ERR(err, "deflate small 2");
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
-    int err;
-    PREFIX3(stream) d_stream; /* decompression stream */
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (void *)0;
-
-    d_stream.next_in = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-            break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (memcmp(uncompr, data, dataLen)) {
-        fprintf(stderr, "bad inflate\n");
-        exit(1);
-    }
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-    size_t comprLen = PREFIX(compressBound)(size);
-    size_t uncomprLen = size;
-    uint8_t *compr, *uncompr;
-
-    /* Discard inputs larger than 1Mb. */
-    static size_t kMaxSize = 1024 * 1024;
-
-    if (size < 1 || size > kMaxSize)
-        return 0;
-
-    data = d;
-    dataLen = size;
-    compr = (uint8_t *)calloc(1, comprLen);
-    uncompr = (uint8_t *)calloc(1, uncomprLen);
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    free(compr);
-    free(uncompr);
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_minigzip.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_minigzip.c b/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_minigzip.c
deleted file mode 100644
index 819148d..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/fuzzer_minigzip.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing.
- */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-#include <stdio.h>
-#include <assert.h>
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
-#ifndef _WIN32 /* unlink already in stdio.h for Win32 */
-extern int unlink (const char *);
-#endif
-#endif
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN      16384        /* read buffer size */
-#define BUFLENW     (BUFLEN * 3) /* write buffer size */
-#define MAX_NAME_LEN 1024
-
-static const char *prog = "minigzip_fuzzer";
-
-void error            (const char *msg);
-void gz_compress      (FILE *in, gzFile out);
-#ifdef USE_MMAP
-int  gz_compress_mmap (FILE *in, gzFile out);
-#endif
-void gz_uncompress    (gzFile in, FILE *out);
-void file_compress    (char *file, char *mode);
-void file_uncompress  (char *file);
-int  main             (int argc, char *argv[]);
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(const char *msg) {
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(FILE *in, gzFile out) {
-    char buf[BUFLEN];
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    /* Clear out the contents of buf before reading from the file to avoid
-       MemorySanitizer: use-of-uninitialized-value warnings. */
-    memset(buf, 0, sizeof(buf));
-    for (;;) {
-        len = (int)fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (PREFIX(gzwrite)(out, buf, (unsigned)len) != len) error(PREFIX(gzerror)(out, &err));
-    }
-    fclose(in);
-    if (PREFIX(gzclose)(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(FILE *in, gzFile out) {
-    int len;
-    int err;
-    int ifd = fileno(in);
-    char *buf;      /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((void *)0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
-    if (buf == (char *)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = PREFIX(gzwrite)(out, (char *)buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(PREFIX(gzerror)(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (PREFIX(gzclose)(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(gzFile in, FILE *out) {
-    char buf[BUFLENW];
-    int len;
-    int err;
-
-    for (;;) {
-        len = PREFIX(gzread)(in, buf, sizeof(buf));
-        if (len < 0) error (PREFIX(gzerror)(in, &err));
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-            error("failed fwrite");
-        }
-    }
-    if (fclose(out)) error("failed fclose");
-
-    if (PREFIX(gzclose)(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(char *file, char *mode) {
-    char outfile[MAX_NAME_LEN];
-    FILE *in;
-    gzFile out;
-
-    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = PREFIX(gzopen)(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(char *file) {
-    char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE *out;
-    gzFile in;
-    size_t len = strlen(file);
-
-    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-    snprintf(buf, sizeof(buf), "%s", file);
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
-    }
-    in = PREFIX(gzopen)(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    unlink(infile);
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataLen) {
-    char *inFileName = "minigzip_fuzzer.out";
-    char *outFileName = "minigzip_fuzzer.out.gz";
-    char outmode[20];
-    FILE *in;
-    char buf[BUFLEN];
-    uint32_t offset = 0;
-
-    /* Discard inputs larger than 1Mb. */
-    static size_t kMaxSize = 1024 * 1024;
-    if (dataLen < 1 || dataLen > kMaxSize)
-        return 0;
-
-    in = fopen(inFileName, "wb");
-    if (fwrite(data, 1, (unsigned)dataLen, in) != dataLen)
-        error("failed fwrite");
-    if (fclose(in))
-        error("failed fclose");
-
-    memset(outmode, 0, sizeof(outmode));
-    snprintf(outmode, sizeof(outmode), "%s", "wb");
-
-    /* Compression level: [0..9]. */
-    outmode[2] = '0' + (data[0] % 10);
-
-    switch (data[dataLen-1] % 6) {
-    default:
-    case 0:
-        outmode[3] = 0;
-        break;
-    case 1:
-        /* compress with Z_FILTERED */
-        outmode[3] = 'f';
-        break;
-    case 2:
-        /* compress with Z_HUFFMAN_ONLY */
-        outmode[3] = 'h';
-        break;
-    case 3:
-        /* compress with Z_RLE */
-        outmode[3] = 'R';
-        break;
-    case 4:
-        /* compress with Z_FIXED */
-        outmode[3] = 'F';
-        break;
-    case 5:
-        /* direct */
-        outmode[3] = 'T';
-        break;
-    }
-
-    file_compress(inFileName, outmode);
-
-    /* gzopen does not support reading in direct mode */
-    if (outmode[3] == 'T')
-        inFileName = outFileName;
-    else
-        file_uncompress(outFileName);
-
-    /* Check that the uncompressed file matches the input data. */
-    in = fopen(inFileName, "rb");
-    if (in == NULL) {
-        perror(inFileName);
-        exit(1);
-    }
-
-    memset(buf, 0, sizeof(buf));
-    for (;;) {
-        int len = (int)fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0)
-            break;
-        assert(0 == memcmp(data + offset, buf, len));
-        offset += len;
-    }
-
-    if (fclose(in))
-        error("failed fclose");
-
-    /* This function must return 0. */
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/fuzz/standalone_fuzz_target_runner.c

diff --git a/crates/libz-sys/src/zlib-ng/test/fuzz/standalone_fuzz_target_runner.c b/crates/libz-sys/src/zlib-ng/test/fuzz/standalone_fuzz_target_runner.c
deleted file mode 100644
index 810a560..0000000
--- a/crates/libz-sys/src/zlib-ng/test/fuzz/standalone_fuzz_target_runner.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-
-#include "zbuild.h"
-
-extern int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size);
-
-int main(int argc, char **argv) {
-    int i;
-    fprintf(stderr, "StandaloneFuzzTargetMain: running %d inputs\n", argc - 1);
-
-    for (i = 1; i < argc; i++) {
-        size_t len, n_read, err;
-        unsigned char *buf;
-        FILE *f = fopen(argv[i], "rb+");
-        if (!f) {
-            /* Failed to open this file: it may be a directory. */
-            fprintf(stderr, "Skipping: %s\n", argv[i]);
-            continue;
-        }
-        fprintf(stderr, "Running: %s %s\n", argv[0], argv[i]);
-        fseek(f, 0, SEEK_END);
-        len = ftell(f);
-        fseek(f, 0, SEEK_SET);
-        buf = (unsigned char *)malloc(len);
-        n_read = fread(buf, 1, len, f);
-        assert(n_read == len);
-        LLVMFuzzerTestOneInput(buf, len);
-        free(buf);
-        err = fclose(f);
-        assert(err == 0);
-        Z_UNUSED(err);
-        fprintf(stderr, "Done:    %s: (%d bytes)\n", argv[i], (int)n_read);
-    }
-
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/gh1235.c

diff --git a/crates/libz-sys/src/zlib-ng/test/gh1235.c b/crates/libz-sys/src/zlib-ng/test/gh1235.c
deleted file mode 100644
index 472282d..0000000
--- a/crates/libz-sys/src/zlib-ng/test/gh1235.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include "zutil.h"
-
-int main(void) {
-    unsigned char plain[32];
-    unsigned char compressed[130];
-    PREFIX3(stream) strm;
-    int bound;
-    z_size_t bytes;
-
-    for (int i = 0; i <= 32; i++) {
-        memset(plain, 6, i);
-        memset(&strm, 0, sizeof(strm));
-        PREFIX(deflateInit2)(&strm, 0, 8, 31, 1, Z_DEFAULT_STRATEGY);
-        bound = PREFIX(deflateBound)(&strm, i);
-        strm.next_in = plain;
-        strm.next_out = compressed;
-        strm.avail_in = i;
-        strm.avail_out = sizeof(compressed);
-        if (PREFIX(deflate)(&strm, Z_FINISH) != Z_STREAM_END) return -1;
-        if (strm.avail_in != 0) return -1;
-        printf("bytes = %2i, deflateBound = %2i, total_out = %2zi\n", i, bound, strm.total_out);
-        if (bound < strm.total_out) return -1;
-        if (PREFIX(deflateEnd)(&strm) != Z_OK) return -1;
-    }
-    for (int i = 0; i <= 32; i++) {
-        bytes = sizeof(compressed);
-        for (int j = 0; j < i; j++) {
-            plain[j] = j;
-        }
-        bound = PREFIX(compressBound)(i);
-        if (PREFIX(compress2)(compressed, &bytes, plain, i, 1) != Z_OK) return -1;
-        printf("bytes = %2i, compressBound = %2i, total_out = %2zi\n", i, bound, (size_t)bytes);
-        if (bytes > bound) return -1;
-    }
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/infcover.c

diff --git a/crates/libz-sys/src/zlib-ng/test/infcover.c b/crates/libz-sys/src/zlib-ng/test/infcover.c
deleted file mode 100644
index 974185d..0000000
--- a/crates/libz-sys/src/zlib-ng/test/infcover.c
+++ /dev/null
@@ -1,676 +0,0 @@
-/* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* to use, do: ./configure --cover && make cover */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#undef NDEBUG
-#include <assert.h>
-#include <inttypes.h>
-
-/* get definition of internal structure so we can mess with it (see pull()),
-   and so we can call inflate_trees() (see cover5()) */
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-
-/* -- memory tracking routines -- */
-
-/*
-   These memory tracking routines are provided to zlib and track all of zlib's
-   allocations and deallocations, check for LIFO operations, keep a current
-   and high water mark of total bytes requested, optionally set a limit on the
-   total memory that can be allocated, and when done check for memory leaks.
-
-   They are used as follows:
-
-   PREFIX3(stream) strm;
-   mem_setup(&strm)         initializes the memory tracking and sets the
-                            zalloc, zfree, and opaque members of strm to use
-                            memory tracking for all zlib operations on strm
-   mem_limit(&strm, limit)  sets a limit on the total bytes requested -- a
-                            request that exceeds this limit will result in an
-                            allocation failure (returns NULL) -- setting the
-                            limit to zero means no limit, which is the default
-                            after mem_setup()
-   mem_used(&strm, "msg")   prints to stderr "msg" and the total bytes used
-   mem_high(&strm, "msg")   prints to stderr "msg" and the high water mark
-   mem_done(&strm, "msg")   ends memory tracking, releases all allocations
-                            for the tracking as well as leaked zlib blocks, if
-                            any.  If there was anything unusual, such as leaked
-                            blocks, non-FIFO frees, or frees of addresses not
-                            allocated, then "msg" and information about the
-                            problem is printed to stderr.  If everything is
-                            normal, nothing is printed. mem_done resets the
-                            strm members to NULL to use the default memory
-                            allocation routines on the next zlib initialization
-                            using strm.
- */
-
-/* these items are strung together in a linked list, one for each allocation */
-struct mem_item {
-    void *ptr;                  /* pointer to allocated memory */
-    size_t size;                /* requested size of allocation */
-    struct mem_item *next;      /* pointer to next item in list, or NULL */
-};
-
-/* this structure is at the root of the linked list, and tracks statistics */
-struct mem_zone {
-    struct mem_item *first;     /* pointer to first item in list, or NULL */
-    size_t total, highwater;    /* total allocations, and largest total */
-    size_t limit;               /* memory allocation limit, or 0 if no limit */
-    int notlifo, rogue;         /* counts of non-LIFO frees and rogue frees */
-};
-
-/* memory allocation routine to pass to zlib */
-static void *mem_alloc(void *mem, unsigned count, unsigned size) {
-    void *ptr;
-    struct mem_item *item;
-    struct mem_zone *zone = mem;
-    size_t len = count * (size_t)size;
-
-    /* induced allocation failure */
-    if (zone == NULL || (zone->limit && zone->total + len > zone->limit))
-        return NULL;
-
-    /* perform allocation using the standard library, fill memory with a
-       non-zero value to make sure that the code isn't depending on zeros */
-    ptr = malloc(len);
-    if (ptr == NULL)
-        return NULL;
-    memset(ptr, 0xa5, len);
-
-    /* create a new item for the list */
-    item = malloc(sizeof(struct mem_item));
-    if (item == NULL) {
-        free(ptr);
-        return NULL;
-    }
-    item->ptr = ptr;
-    item->size = len;
-
-    /* insert item at the beginning of the list */
-    item->next = zone->first;
-    zone->first = item;
-
-    /* update the statistics */
-    zone->total += item->size;
-    if (zone->total > zone->highwater)
-        zone->highwater = zone->total;
-
-    /* return the allocated memory */
-    return ptr;
-}
-
-/* memory free routine to pass to zlib */
-static void mem_free(void *mem, void *ptr) {
-    struct mem_item *item, *next;
-    struct mem_zone *zone = mem;
-
-    /* if no zone, just do a free */
-    if (zone == NULL) {
-        free(ptr);
-        return;
-    }
-
-    /* point next to the item that matches ptr, or NULL if not found -- remove
-       the item from the linked list if found */
-    next = zone->first;
-    if (next) {
-        if (next->ptr == ptr)
-            zone->first = next->next;   /* first one is it, remove from list */
-        else {
-            do {                        /* search the linked list */
-                item = next;
-                next = item->next;
-            } while (next != NULL && next->ptr != ptr);
-            if (next) {                 /* if found, remove from linked list */
-                item->next = next->next;
-                zone->notlifo++;        /* not a LIFO free */
-            }
-
-        }
-    }
-
-    /* if found, update the statistics and free the item */
-    if (next) {
-        zone->total -= next->size;
-        free(next);
-    }
-
-    /* if not found, update the rogue count */
-    else
-        zone->rogue++;
-
-    /* in any case, do the requested free with the standard library function */
-    free(ptr);
-}
-
-/* set up a controlled memory allocation space for monitoring, set the stream
-   parameters to the controlled routines, with opaque pointing to the space */
-static void mem_setup(PREFIX3(stream) *strm) {
-    struct mem_zone *zone;
-
-    zone = malloc(sizeof(struct mem_zone));
-    assert(zone != NULL);
-    zone->first = NULL;
-    zone->total = 0;
-    zone->highwater = 0;
-    zone->limit = 0;
-    zone->notlifo = 0;
-    zone->rogue = 0;
-    strm->opaque = zone;
-    strm->zalloc = mem_alloc;
-    strm->zfree = mem_free;
-}
-
-/* set a limit on the total memory allocation, or 0 to remove the limit */
-static void mem_limit(PREFIX3(stream) *strm, size_t limit) {
-    struct mem_zone *zone = strm->opaque;
-
-    zone->limit = limit;
-}
-
-/* show the current total requested allocations in bytes */
-static void mem_used(PREFIX3(stream) *strm, char *prefix) {
-    struct mem_zone *zone = strm->opaque;
-
-    fprintf(stderr, "%s: %" PRIu64 " allocated\n", prefix, (uint64_t)zone->total);
-}
-
-/* show the high water allocation in bytes */
-static void mem_high(PREFIX3(stream) *strm, char *prefix) {
-    struct mem_zone *zone = strm->opaque;
-
-    fprintf(stderr, "%s: %" PRIu64 " high water mark\n", prefix, (uint64_t)zone->highwater);
-}
-
-/* release the memory allocation zone -- if there are any surprises, notify */
-static void mem_done(PREFIX3(stream) *strm, char *prefix) {
-    int count = 0;
-    struct mem_item *item, *next;
-    struct mem_zone *zone = strm->opaque;
-
-    /* show high water mark */
-    mem_high(strm, prefix);
-
-    /* free leftover allocations and item structures, if any */
-    item = zone->first;
-    while (item != NULL) {
-        free(item->ptr);
-        next = item->next;
-        free(item);
-        item = next;
-        count++;
-    }
-
-    /* issue alerts about anything unexpected */
-    if (count || zone->total)
-        fprintf(stderr, "** %s: %" PRIu64 " bytes in %d blocks not freed\n",
-                prefix, (uint64_t)zone->total, count);
-    if (zone->notlifo)
-        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
-    if (zone->rogue)
-        fprintf(stderr, "** %s: %d frees not recognized\n",
-                prefix, zone->rogue);
-
-    /* free the zone and delete from the stream */
-    free(zone);
-    strm->opaque = NULL;
-    strm->zalloc = NULL;
-    strm->zfree = NULL;
-}
-
-/* -- inflate test routines -- */
-
-/* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
-   decodes liberally, in that hex digits can be adjacent, in which case two in
-   a row writes a byte.  Or they can be delimited by any non-hex character,
-   where the delimiters are ignored except when a single hex digit is followed
-   by a delimiter, where that single digit writes a byte.  The returned data is
-   allocated and must eventually be freed.  NULL is returned if out of memory.
-   If the length is not needed, then len can be NULL. */
-static unsigned char *h2b(const char *hex, unsigned *len) {
-    unsigned char *in, *re;
-    unsigned next, val;
-    size_t inlen;
-
-    inlen = (strlen(hex) + 1) >> 1;
-    assert(inlen != 0);     /* tell static analyzer we won't call malloc(0) */
-    in = malloc(inlen);
-    if (in == NULL)
-        return NULL;
-    next = 0;
-    val = 1;
-    do {
-        if (*hex >= '0' && *hex <= '9')
-            val = (val << 4) + *hex - '0';
-        else if (*hex >= 'A' && *hex <= 'F')
-            val = (val << 4) + *hex - 'A' + 10;
-        else if (*hex >= 'a' && *hex <= 'f')
-            val = (val << 4) + *hex - 'a' + 10;
-        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
-            val += 240;                 /* make it look like two digits */
-        if (val > 255) {                /* have two digits */
-            in[next++] = val & 0xff;    /* save the decoded byte */
-            val = 1;                    /* start over */
-        }
-    } while (*hex++);       /* go through the loop with the terminating null */
-    if (len != NULL)
-        *len = next;
-    assert(next != 0);      /* tell static analyzer we won't call realloc(in, 0) */
-    re = realloc(in, next);
-    return re == NULL ? in : re;
-}
-
-/* generic inflate() run, where hex is the hexadecimal input data, what is the
-   text to include in an error message, step is how much input data to feed
-   inflate() on each call, or zero to feed it all, win is the window bits
-   parameter to inflateInit2(), len is the size of the output buffer, and err
-   is the error code expected from the first inflate() call (the second
-   inflate() call is expected to return Z_STREAM_END).  If win is 47, then
-   header information is collected with inflateGetHeader().  If a zlib stream
-   is looking for a dictionary, then an empty dictionary is provided.
-   inflate() is run until all of the input data is consumed. */
-static void inf(char *hex, char *what, unsigned step, int win, unsigned len, int err) {
-    int ret;
-    unsigned have;
-    unsigned char *in, *out;
-    PREFIX3(stream) strm, copy;
-    PREFIX(gz_header) head;
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit2)(&strm, win);
-    if (ret != Z_OK) {
-        mem_done(&strm, what);
-        return;
-    }
-    out = malloc(len);                          assert(out != NULL);
-    if (win == 47) {
-        head.extra = out;
-        head.extra_max = len;
-        head.name = out;
-        head.name_max = len;
-        head.comment = out;
-        head.comm_max = len;
-        ret = PREFIX(inflateGetHeader)(&strm, &head);
-                                                assert(ret == Z_OK);
-    }
-    in = h2b(hex, &have);                       assert(in != NULL);
-    if (step == 0 || step > have)
-        step = have;
-    strm.avail_in = step;
-    have -= step;
-    strm.next_in = in;
-    do {
-        strm.avail_out = len;
-        strm.next_out = out;
-        ret = PREFIX(inflate)(&strm, Z_NO_FLUSH);
-                                                assert(err == 9 || ret == err);
-        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
-            break;
-        if (ret == Z_NEED_DICT) {
-            ret = PREFIX(inflateSetDictionary)(&strm, in, 1);
-                                                assert(ret == Z_DATA_ERROR);
-            mem_limit(&strm, 1);
-            ret = PREFIX(inflateSetDictionary)(&strm, out, 0);
-                                                assert(ret == Z_MEM_ERROR);
-            mem_limit(&strm, 0);
-            ((struct inflate_state *)strm.state)->mode = DICT;
-            ret = PREFIX(inflateSetDictionary)(&strm, out, 0);
-                                                assert(ret == Z_OK);
-            ret = PREFIX(inflate)(&strm, Z_NO_FLUSH);
-                                                assert(ret == Z_BUF_ERROR);
-        }
-        ret = PREFIX(inflateCopy)(&copy, &strm);
-                                                assert(ret == Z_OK);
-        ret = PREFIX(inflateEnd)(&copy);        assert(ret == Z_OK);
-        err = 9;                        /* don't care next time around */
-        have += strm.avail_in;
-        strm.avail_in = step > have ? have : step;
-        have -= strm.avail_in;
-    } while (strm.avail_in);
-    free(in);
-    free(out);
-    ret = PREFIX(inflateReset2)(&strm, -8);     assert(ret == Z_OK);
-    ret = PREFIX(inflateEnd)(&strm);            assert(ret == Z_OK);
-    mem_done(&strm, what);
-    Z_UNUSED(err);
-}
-
-/* cover all of the lines in inflate.c up to inflate() */
-static void cover_support(void) {
-    int ret;
-    PREFIX3(stream) strm;
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit)(&strm);           assert(ret == Z_OK);
-    mem_used(&strm, "inflate init");
-    ret = PREFIX(inflatePrime)(&strm, 5, 31);   assert(ret == Z_OK);
-    ret = PREFIX(inflatePrime)(&strm, -1, 0);   assert(ret == Z_OK);
-    ret = PREFIX(inflateSetDictionary)(&strm, NULL, 0);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateEnd)(&strm);            assert(ret == Z_OK);
-    mem_done(&strm, "prime");
-
-    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
-    inf("63 18 5", "force window replacement", 0, -8, 259, Z_OK);
-    inf("63 18 68 30 d0 0 0", "force split window update", 4, -8, 259, Z_OK);
-    inf("3 0", "use fixed blocks", 0, -15, 1, Z_STREAM_END);
-    inf("", "bad window size", 0, 1, 0, Z_STREAM_ERROR);
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit_)(&strm, &PREFIX2(VERSION)[1], (int)sizeof(PREFIX3(stream)));
-                                                assert(ret == Z_VERSION_ERROR);
-    mem_done(&strm, "wrong version");
-
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit)(&strm);           assert(ret == Z_OK);
-    ret = PREFIX(inflateEnd)(&strm);            assert(ret == Z_OK);
-    fputs("inflate built-in memory routines\n", stderr);
-    Z_UNUSED(ret);
-}
-
-/* cover all inflate() header and trailer cases and code after inflate() */
-static void cover_wrap(void) {
-    int ret;
-    PREFIX3(stream) strm, copy;
-    unsigned char dict[257];
-
-    ret = PREFIX(inflate)(NULL, 0);             assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateEnd)(NULL);             assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateCopy)(NULL, NULL);      assert(ret == Z_STREAM_ERROR);
-    fputs("inflate bad parameters\n", stderr);
-
-    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
-    inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
-    inf("77 85", "bad zlib method", 0, 15, 0, Z_DATA_ERROR);
-    inf("8 99", "set window size from header", 0, 0, 0, Z_OK);
-    inf("78 9c", "bad zlib window size", 0, 8, 0, Z_DATA_ERROR);
-    inf("78 9c 63 0 0 0 1 0 1", "check adler32", 0, 15, 1, Z_STREAM_END);
-    inf("1f 8b 8 1e 0 0 0 0 0 0 1 0 0 0 0 0 0", "bad header crc", 0, 47, 1,
-        Z_DATA_ERROR);
-    inf("1f 8b 8 2 0 0 0 0 0 0 1d 26 3 0 0 0 0 0 0 0 0 0", "check gzip length",
-        0, 47, 0, Z_STREAM_END);
-    inf("78 90", "bad zlib header check", 0, 47, 0, Z_DATA_ERROR);
-    inf("8 b8 0 0 0 1", "need dictionary", 0, 8, 0, Z_NEED_DICT);
-    inf("78 9c 63 0", "compute adler32", 0, 15, 1, Z_OK);
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit2)(&strm, -8);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x63";
-    strm.avail_out = 1;
-    strm.next_out = (void *)&ret;
-    mem_limit(&strm, 1);
-    ret = PREFIX(inflate)(&strm, Z_NO_FLUSH);   assert(ret == Z_MEM_ERROR);
-    ret = PREFIX(inflate)(&strm, Z_NO_FLUSH);   assert(ret == Z_MEM_ERROR);
-    mem_limit(&strm, 0);
-    memset(dict, 0, 257);
-    ret = PREFIX(inflateSetDictionary)(&strm, dict, 257);
-                                                assert(ret == Z_OK);
-    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
-    ret = PREFIX(inflatePrime)(&strm, 16, 0);   assert(ret == Z_OK);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x80";
-    ret = PREFIX(inflateSync)(&strm);           assert(ret == Z_DATA_ERROR);
-    ret = PREFIX(inflate)(&strm, Z_NO_FLUSH);   assert(ret == Z_STREAM_ERROR);
-    strm.avail_in = 4;
-    strm.next_in = (void *)"\0\0\xff\xff";
-    ret = PREFIX(inflateSync)(&strm);           assert(ret == Z_OK);
-    (void)PREFIX(inflateSyncPoint)(&strm);
-    ret = PREFIX(inflateCopy)(&copy, &strm);    assert(ret == Z_MEM_ERROR);
-    mem_limit(&strm, 0);
-    ret = PREFIX(inflateUndermine)(&strm, 1);
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    assert(ret == Z_OK);
-#else
-    assert(ret == Z_DATA_ERROR);
-#endif
-    (void)PREFIX(inflateMark)(&strm);
-    ret = PREFIX(inflateEnd)(&strm);            assert(ret == Z_OK);
-    mem_done(&strm, "miscellaneous, force memory errors");
-}
-
-/* input and output functions for inflateBack() */
-static unsigned pull(void *desc, z_const unsigned char **buf) {
-    static unsigned int next = 0;
-    static unsigned char dat[] = {0x63, 0, 2, 0};
-    struct inflate_state *state;
-
-    if (desc == NULL) {
-        next = 0;
-        return 0;   /* no input (already provided at next_in) */
-    }
-    state = (void *)((PREFIX3(stream) *)desc)->state;
-    if (state != NULL)
-        state->mode = SYNC;     /* force an otherwise impossible situation */
-    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
-}
-
-static int push(void *desc, unsigned char *buf, unsigned len) {
-    buf += len;
-    Z_UNUSED(buf);
-    return desc != NULL;        /* force error if desc not null */
-}
-
-/* cover inflateBack() up to common deflate data cases and after those */
-static void cover_back(void) {
-    int ret;
-    PREFIX3(stream) strm;
-    unsigned char win[32768];
-
-    ret = PREFIX(inflateBackInit_)(NULL, 0, win, 0, 0);
-                                                assert(ret == Z_VERSION_ERROR);
-    ret = PREFIX(inflateBackInit)(NULL, 0, win);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateBack)(NULL, NULL, NULL, NULL, NULL);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateBackEnd)(NULL);         assert(ret == Z_STREAM_ERROR);
-    fputs("inflateBack bad parameters\n", stderr);
-
-    mem_setup(&strm);
-    ret = PREFIX(inflateBackInit)(&strm, 15, win);
-                                                assert(ret == Z_OK);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x03";
-    ret = PREFIX(inflateBack)(&strm, pull, NULL, push, NULL);
-                                                assert(ret == Z_STREAM_END);
-        /* force output error */
-    strm.avail_in = 3;
-    strm.next_in = (void *)"\x63\x00";
-    ret = PREFIX(inflateBack)(&strm, pull, NULL, push, &strm);
-                                                assert(ret == Z_BUF_ERROR);
-        /* force mode error by mucking with state */
-    ret = PREFIX(inflateBack)(&strm, pull, &strm, push, NULL);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = PREFIX(inflateBackEnd)(&strm);        assert(ret == Z_OK);
-    mem_done(&strm, "inflateBack bad state");
-
-    ret = PREFIX(inflateBackInit)(&strm, 15, win);
-                                                assert(ret == Z_OK);
-    ret = PREFIX(inflateBackEnd)(&strm);        assert(ret == Z_OK);
-    fputs("inflateBack built-in memory routines\n", stderr);
-    Z_UNUSED(ret);
-}
-
-/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
-static int try(char *hex, char *id, int err) {
-    int ret;
-    unsigned len, size;
-    unsigned char *in, *out, *win;
-    char *prefix;
-    PREFIX3(stream) strm;
-
-    /* convert to hex */
-    in = h2b(hex, &len);
-    assert(in != NULL);
-
-    /* allocate work areas */
-    size = len << 3;
-    out = malloc(size);
-    assert(out != NULL);
-    win = malloc(32768);
-    assert(win != NULL);
-    prefix = malloc(strlen(id) + 6);
-    assert(prefix != NULL);
-
-    /* first with inflate */
-    strcpy(prefix, id);
-    strcat(prefix, "-late");
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = NULL;
-    ret = PREFIX(inflateInit2)(&strm, err < 0 ? 47 : -15);
-    assert(ret == Z_OK);
-    strm.avail_in = len;
-    strm.next_in = in;
-    do {
-        strm.avail_out = size;
-        strm.next_out = out;
-        ret = PREFIX(inflate)(&strm, Z_TREES);
-        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
-        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
-            break;
-    } while (strm.avail_in || strm.avail_out == 0);
-    if (err) {
-        assert(ret == Z_DATA_ERROR);
-        assert(strcmp(id, strm.msg) == 0);
-    }
-    PREFIX(inflateEnd)(&strm);
-    mem_done(&strm, prefix);
-
-    /* then with inflateBack */
-    if (err >= 0) {
-        strcpy(prefix, id);
-        strcat(prefix, "-back");
-        mem_setup(&strm);
-        ret = PREFIX(inflateBackInit)(&strm, 15, win);
-        assert(ret == Z_OK);
-        strm.avail_in = len;
-        strm.next_in = in;
-        ret = PREFIX(inflateBack)(&strm, pull, NULL, push, NULL);
-        assert(ret != Z_STREAM_ERROR);
-        if (err && ret != Z_BUF_ERROR) {
-            assert(ret == Z_DATA_ERROR);
-            assert(strcmp(id, strm.msg) == 0);
-        }
-        PREFIX(inflateBackEnd)(&strm);
-        mem_done(&strm, prefix);
-    }
-
-    /* clean up */
-    free(prefix);
-    free(win);
-    free(out);
-    free(in);
-    return ret;
-}
-
-/* cover deflate data cases in both inflate() and inflateBack() */
-static void cover_inflate(void) {
-    try("0 0 0 0 0", "invalid stored block lengths", 1);
-    try("3 0", "fixed", 0);
-    try("6", "invalid block type", 1);
-    try("1 1 0 fe ff 0", "stored", 0);
-    try("fc 0 0", "too many length or distance symbols", 1);
-    try("4 0 fe ff", "invalid code lengths set", 1);
-    try("4 0 24 49 0", "invalid bit length repeat", 1);
-    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
-    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
-    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
-        "invalid literal/lengths set", 1);
-    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
-    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
-    try("2 7e ff ff", "invalid distance code", 1);
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 0);
-#else
-    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
-#endif
-
-    /* also trailer mismatch just in inflate() */
-    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
-    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
-        "incorrect length check", -1);
-    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
-    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
-        "long code", 0);
-    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
-    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
-        "long distance and extra", 0);
-    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
-        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
-    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
-        Z_STREAM_END);
-    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
-}
-
-/* cover remaining lines in inftrees.c */
-static void cover_trees(void) {
-    int ret;
-    unsigned bits;
-    uint16_t lens[16], work[16];
-    code *next, table[ENOUGH_DISTS];
-
-    /* we need to call inflate_table() directly in order to manifest not-
-       enough errors, since zlib insures that enough is always enough */
-    for (bits = 0; bits < 15; bits++)
-        lens[bits] = (uint16_t)(bits + 1);
-    lens[15] = 15;
-    next = table;
-    bits = 15;
-    ret = zng_inflate_table(DISTS, lens, 16, &next, &bits, work);
-                                                assert(ret == 1);
-    next = table;
-    bits = 1;
-    ret = zng_inflate_table(DISTS, lens, 16, &next, &bits, work);
-                                                assert(ret == 1);
-    fputs("inflate_table not enough errors\n", stderr);
-    Z_UNUSED(ret);
-}
-
-/* cover remaining inffast.c decoding and window copying */
-static void cover_fast(void) {
-    inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
-        " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
-    inf("25 fd 81 b5 6d 59 b6 6a 49 ea af 35 6 34 eb 8c b9 f6 b9 1e ef 67 49"
-        " 50 fe ff ff 3f 0 0", "fast distance extra bits", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("3 7e 0 0 0 0 0", "fast invalid distance code", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("1b 7 0 0 0 0 0", "fast invalid literal/length code", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("d c7 1 ae eb 38 c 4 41 a0 87 72 de df fb 1f b8 36 b1 38 5d ff ff 0",
-        "fast 2nd level codes and too far back", 0, -8, 258, Z_DATA_ERROR);
-    inf("63 18 5 8c 10 8 0 0 0 0", "very common case", 0, -8, 259, Z_OK);
-    inf("63 60 60 18 c9 0 8 18 18 18 26 c0 28 0 29 0 0 0",
-        "contiguous and wrap around window", 6, -8, 259, Z_OK);
-    inf("63 0 3 0 0 0 0 0", "copy direct from output", 0, -8, 259,
-        Z_STREAM_END);
-}
-
-int main(void) {
-    fprintf(stderr, "%s\n", zVersion());
-    cover_support();
-    cover_wrap();
-    cover_back();
-    cover_inflate();
-    cover_trees();
-    cover_fast();
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/minideflate.c

diff --git a/crates/libz-sys/src/zlib-ng/test/minideflate.c b/crates/libz-sys/src/zlib-ng/test/minideflate.c
deleted file mode 100644
index 148a277..0000000
--- a/crates/libz-sys/src/zlib-ng/test/minideflate.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/* minideflate.c -- test deflate/inflate under specific conditions
- * Copyright (C) 2020 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "zbuild.h"
-#include "zutil.h"
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  include <string.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#  ifdef _MSC_VER
-#    define strcasecmp _stricmp
-#  endif
-#else
-#  include <strings.h>
-#  define SET_BINARY_MODE(file)
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-/* Default read/write i/o buffer size based on GZBUFSIZE */
-#define BUFSIZE 131072
-
-/* ===========================================================================
- * deflate() using specialized parameters
- */
-void deflate_params(FILE *fin, FILE *fout, int32_t read_buf_size, int32_t write_buf_size, int32_t level,
-    int32_t window_bits, int32_t mem_level, int32_t strategy, int32_t flush) {
-    PREFIX3(stream) c_stream; /* compression stream */
-    uint8_t *read_buf;
-    uint8_t *write_buf;
-    int32_t read;
-    int err;
-
-    read_buf = (uint8_t *)malloc(read_buf_size);
-    if (read_buf == NULL) {
-        fprintf(stderr, "failed to create read buffer (%d)\n", read_buf_size);
-        return;
-    }
-    write_buf = (uint8_t *)malloc(write_buf_size);
-    if (write_buf == NULL) {
-        fprintf(stderr, "failed to create write buffer (%d)\n", write_buf_size);
-        free(read_buf);
-        return;
-    }
-
-    c_stream.zalloc = NULL;
-    c_stream.zfree = NULL;
-    c_stream.opaque = (void *)0;
-    c_stream.total_in = 0;
-    c_stream.total_out = 0;
-    c_stream.next_out = write_buf;
-    c_stream.avail_out = write_buf_size;
-
-    err = PREFIX(deflateInit2)(&c_stream, level, Z_DEFLATED, window_bits, mem_level, strategy);
-    CHECK_ERR(err, "deflateInit2");
-
-    /* Process input using our read buffer and flush type,
-     * output to stdout only once write buffer is full */
-    do {
-        read = (int32_t)fread(read_buf, 1, read_buf_size, fin);
-        if (read <= 0)
-            break;
-
-        c_stream.next_in  = (z_const uint8_t *)read_buf;
-        c_stream.avail_in = read;
-
-        do {
-            err = PREFIX(deflate)(&c_stream, flush);
-            if (err == Z_STREAM_END) break;
-            CHECK_ERR(err, "deflate");
-
-            if (c_stream.next_out == write_buf + write_buf_size) {
-                fwrite(write_buf, 1, write_buf_size, fout);
-                c_stream.next_out = write_buf;
-                c_stream.avail_out = write_buf_size;
-            }
-        } while (c_stream.next_in < read_buf + read);
-    } while (err == Z_OK);
-
-    /* Finish the stream if necessary */
-    if (flush != Z_FINISH) {
-        c_stream.avail_in = 0;
-        do {
-            if (c_stream.next_out == write_buf + write_buf_size) {
-                fwrite(write_buf, 1, write_buf_size, fout);
-                c_stream.next_out = write_buf;
-                c_stream.avail_out = write_buf_size;
-            }
-
-            err = PREFIX(deflate)(&c_stream, Z_FINISH);
-            if (err == Z_STREAM_END) break;
-            CHECK_ERR(err, "deflate");
-        } while (1);
-    }
-
-    /* Output remaining data in write buffer */
-    if (c_stream.next_out != write_buf) {
-        fwrite(write_buf, 1, c_stream.next_out - write_buf, fout);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    free(read_buf);
-    free(write_buf);
-}
-
-/* ===========================================================================
- * inflate() using specialized parameters
- */
-void inflate_params(FILE *fin, FILE *fout, int32_t read_buf_size, int32_t write_buf_size, int32_t window_bits,
-    int32_t flush) {
-    PREFIX3(stream) d_stream; /* decompression stream */
-    uint8_t *read_buf;
-    uint8_t *write_buf;
-    int32_t read;
-    int err;
-
-
-    read_buf = (uint8_t *)malloc(read_buf_size);
-    if (read_buf == NULL) {
-        fprintf(stderr, "failed to create read buffer (%d)\n", read_buf_size);
-        return;
-    }
-    write_buf = (uint8_t *)malloc(write_buf_size);
-    if (write_buf == NULL) {
-        fprintf(stderr, "failed to create write buffer (%d)\n", write_buf_size);
-        free(read_buf);
-        return;
-    }
-
-    d_stream.zalloc = NULL;
-    d_stream.zfree = NULL;
-    d_stream.opaque = (void *)0;
-    d_stream.total_in = 0;
-    d_stream.total_out = 0;
-    d_stream.next_out = write_buf;
-    d_stream.avail_out = write_buf_size;
-
-    err = PREFIX(inflateInit2)(&d_stream, window_bits);
-    CHECK_ERR(err, "inflateInit2");
-
-    /* Process input using our read buffer and flush type,
-     * output to stdout only once write buffer is full */
-    do {
-        read = (int32_t)fread(read_buf, 1, read_buf_size, fin);
-        if (read <= 0)
-            break;
-
-        d_stream.next_in  = (z_const uint8_t *)read_buf;
-        d_stream.avail_in = read;
-
-        do {
-            err = PREFIX(inflate)(&d_stream, flush);
-            if (err == Z_STREAM_END) break;
-            CHECK_ERR(err, "inflate");
-
-            if (d_stream.next_out == write_buf + write_buf_size) {
-                fwrite(write_buf, 1, write_buf_size, fout);
-                d_stream.next_out = write_buf;
-                d_stream.avail_out = write_buf_size;
-            }
-        } while (d_stream.next_in < read_buf + read);
-    } while (err == Z_OK);
-
-    /* Finish the stream if necessary */
-    if (flush != Z_FINISH) {
-        d_stream.avail_in = 0;
-        do {
-            if (d_stream.next_out == write_buf + write_buf_size) {
-                fwrite(write_buf, 1, write_buf_size, fout);
-                d_stream.next_out = write_buf;
-                d_stream.avail_out = write_buf_size;
-            }
-
-            err = PREFIX(inflate)(&d_stream, Z_FINISH);
-            if (err == Z_STREAM_END) break;
-            CHECK_ERR(err, "inflate");
-        } while (1);
-    }
-
-    /* Output remaining data in write buffer */
-    if (d_stream.next_out != write_buf) {
-        fwrite(write_buf, 1, d_stream.next_out - write_buf, fout);
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    free(read_buf);
-    free(write_buf);
-}
-
-void show_help(void) {
-    printf("Usage: minideflate [-c][-d][-k] [-f|-h|-R|-F] [-m level] [-r/-t size] [-s flush] [-w bits] [-0 to -9] [input file]\n\n" \
-           "  -c : write to standard output\n" \
-           "  -d : decompress\n" \
-           "  -k : keep input file\n" \
-           "  -f : compress with Z_FILTERED\n" \
-           "  -h : compress with Z_HUFFMAN_ONLY\n" \
-           "  -R : compress with Z_RLE\n" \
-           "  -F : compress with Z_FIXED\n" \
-           "  -m : memory level (1 to 8)\n" \
-           "  -w : window bits..\n" \
-           "     :   -1 to -15 for raw deflate\n"
-           "     :    0 to  15 for deflate (adler32)\n"
-           "     :   16 to  31 for gzip (crc32)\n"
-           "  -s : flush type (0 to 5)\n" \
-           "  -r : read buffer size\n" \
-           "  -t : write buffer size\n" \
-           "  -0 to -9 : compression level\n\n");
-}
-
-int main(int argc, char **argv) {
-    int32_t i;
-    int32_t mem_level = DEF_MEM_LEVEL;
-    int32_t window_bits = INT32_MAX;
-    int32_t strategy = Z_DEFAULT_STRATEGY;
-    int32_t level = Z_DEFAULT_COMPRESSION;
-    int32_t read_buf_size = BUFSIZE;
-    int32_t write_buf_size = BUFSIZE;
-    int32_t flush = Z_NO_FLUSH;
-    uint8_t copyout = 0;
-    uint8_t uncompr = 0;
-    uint8_t keep = 0;
-    FILE *fin = stdin;
-    FILE *fout = stdout;
-
-
-    if (argc == 1) {
-        show_help();
-        return 64;   /* EX_USAGE */
-    }
-
-    for (i = 1; i < argc; i++) {
-        if ((strcmp(argv[i], "-m") == 0) && (i + 1 < argc))
-            mem_level = atoi(argv[++i]);
-        else if ((strcmp(argv[i], "-w") == 0) && (i + 1 < argc))
-            window_bits = atoi(argv[++i]);
-        else if ((strcmp(argv[i], "-r") == 0) && (i + 1 < argc))
-            read_buf_size = atoi(argv[++i]);
-        else if ((strcmp(argv[i], "-t") == 0) && (i + 1 < argc))
-            write_buf_size = atoi(argv[++i]);
-        else if ((strcmp(argv[i], "-s") == 0) && (i + 1 < argc))
-            flush = atoi(argv[++i]);
-        else if (strcmp(argv[i], "-c") == 0)
-            copyout = 1;
-        else if (strcmp(argv[i], "-d") == 0)
-            uncompr = 1;
-        else if (strcmp(argv[i], "-k") == 0)
-            keep = 1;
-        else if (strcmp(argv[i], "-f") == 0)
-            strategy = Z_FILTERED;
-        else if (strcmp(argv[i], "-F") == 0)
-            strategy = Z_FIXED;
-        else if (strcmp(argv[i], "-h") == 0)
-            strategy = Z_HUFFMAN_ONLY;
-        else if (strcmp(argv[i], "-R") == 0)
-            strategy = Z_RLE;
-        else if (argv[i][0] == '-' && argv[i][1] >= '0' && argv[i][1] <= '9' && argv[i][2] == 0)
-            level = argv[i][1] - '0';
-        else if (strcmp(argv[i], "--help") == 0) {
-            show_help();
-            return 0;
-        } else if (argv[i][0] == '-') {
-            show_help();
-            return 64;   /* EX_USAGE */
-        } else
-            break;
-    }
-
-    SET_BINARY_MODE(stdin);
-    SET_BINARY_MODE(stdout);
-
-    if (i != argc) {
-        fin = fopen(argv[i], "rb+");
-        if (fin == NULL) {
-            fprintf(stderr, "Failed to open file: %s\n", argv[i]);
-            exit(1);
-        }
-        if (!copyout) {
-            char *out_file = (char *)calloc(1, strlen(argv[i]) + 6);
-            if (out_file == NULL) {
-                fprintf(stderr, "Not enough memory\n");
-                exit(1);
-            }
-            strcat(out_file, argv[i]);
-            if (!uncompr) {
-                if (window_bits < 0) {
-                    strcat(out_file, ".zraw");
-                } else if (window_bits > MAX_WBITS) {
-                    strcat(out_file, ".gz");
-                } else {
-                    strcat(out_file, ".z");
-                }
-            } else {
-                char *out_ext = strrchr(out_file, '.');
-                if (out_ext != NULL) {
-                    if (strcasecmp(out_ext, ".zraw") == 0 && window_bits == INT32_MAX) {
-                        fprintf(stderr, "Must specify window bits for raw deflate stream\n");
-                        exit(1);
-                    }
-                    *out_ext = 0;
-                }
-            }
-            fout = fopen(out_file, "wb");
-            if (fout == NULL) {
-                fprintf(stderr, "Failed to open file: %s\n", out_file);
-                exit(1);
-            }
-            free(out_file);
-        }
-    }
-
-    if (window_bits == INT32_MAX) {
-        window_bits = MAX_WBITS;
-        /* Auto-detect wrapper for inflateInit */
-        if (uncompr)
-            window_bits += 32;
-    }
-
-    if (window_bits == INT32_MAX) {
-        window_bits = MAX_WBITS;
-        /* Auto-detect wrapper for inflateInit */
-        if (uncompr)
-            window_bits += 32;
-    }
-
-    if (uncompr) {
-        inflate_params(fin, fout, read_buf_size, write_buf_size, window_bits, flush);
-    } else {
-        deflate_params(fin, fout, read_buf_size, write_buf_size, level, window_bits, mem_level, strategy, flush);
-    }
-
-    if (fin != stdin) {
-        fclose(fin);
-        if (!copyout && !keep) {
-            unlink(argv[i]);
-        }
-    }
-    if (fout != stdout) {
-        fclose(fout);
-    }
-
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/minigzip.c

diff --git a/crates/libz-sys/src/zlib-ng/test/minigzip.c b/crates/libz-sys/src/zlib-ng/test/minigzip.c
deleted file mode 100644
index 34fc664..0000000
--- a/crates/libz-sys/src/zlib-ng/test/minigzip.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing.
- */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-#include <stdio.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
-#ifndef _WIN32 /* unlink already in stdio.h for Win32 */
-extern int unlink (const char *);
-#endif
-#endif
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#ifndef BUFLEN
-#  define BUFLEN     16384       /* read buffer size */
-#endif
-#define BUFLENW     (BUFLEN * 3) /* write buffer size */
-#define MAX_NAME_LEN 1024
-
-static char *prog;
-
-void error            (const char *msg);
-void gz_compress      (FILE *in, gzFile out);
-#ifdef USE_MMAP
-int  gz_compress_mmap (FILE *in, gzFile out);
-#endif
-void gz_uncompress    (gzFile in, FILE *out);
-void file_compress    (char *file, char *mode, int keep);
-void file_uncompress  (char *file, int keep);
-int  main             (int argc, char *argv[]);
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(const char *msg) {
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(FILE *in, gzFile out) {
-    char *buf;
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    buf = (char *)calloc(BUFLEN, 1);
-    if (buf == NULL) {
-        perror("out of memory");
-        exit(1);
-    }
-
-    for (;;) {
-        len = (int)fread(buf, 1, BUFLEN, in);
-        if (ferror(in)) {
-            free(buf);
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (PREFIX(gzwrite)(out, buf, (unsigned)len) != len) error(PREFIX(gzerror)(out, &err));
-    }
-    free(buf);
-    fclose(in);
-    if (PREFIX(gzclose)(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(FILE *in, gzFile out) {
-    int len;
-    int err;
-    int ifd = fileno(in);
-    char *buf;      /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((void *)0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
-    if (buf == (char *)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = PREFIX(gzwrite)(out, buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(PREFIX(gzerror)(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (PREFIX(gzclose)(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(gzFile in, FILE *out) {
-    char *buf = (char *)malloc(BUFLENW);
-    int len;
-    int err;
-
-    if (buf == NULL) error("out of memory");
-
-    for (;;) {
-        len = PREFIX(gzread)(in, buf, BUFLENW);
-        if (len < 0) {
-            free(buf);
-            error(PREFIX(gzerror)(in, &err));
-        }
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-            free(buf);
-            error("failed fwrite");
-        }
-    }
-    free(buf);
-    if (fclose(out)) error("failed fclose");
-
-    if (PREFIX(gzclose)(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(char *file, char *mode, int keep) {
-    char outfile[MAX_NAME_LEN];
-    FILE *in;
-    gzFile out;
-
-    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = PREFIX(gzopen)(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    if (!keep)
-        unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(char *file, int keep) {
-    char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE *out;
-    gzFile in;
-    size_t len = strlen(file);
-
-    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-    snprintf(buf, sizeof(buf), "%s", file);
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
-    }
-    in = PREFIX(gzopen)(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    if (!keep)
-        unlink(infile);
-}
-
-void show_help(void) {
-    printf("Usage: minigzip [-c] [-d] [-k] [-f|-h|-R|-F|-T] [-A] [-0 to -9] [files...]\n\n" \
-           "  -c : write to standard output\n" \
-           "  -d : decompress\n" \
-           "  -k : keep input files\n" \
-           "  -f : compress with Z_FILTERED\n" \
-           "  -h : compress with Z_HUFFMAN_ONLY\n" \
-           "  -R : compress with Z_RLE\n" \
-           "  -F : compress with Z_FIXED\n" \
-           "  -T : stored raw\n" \
-           "  -A : auto detect type\n" \
-           "  -0 to -9 : compression level\n\n");
-}
-
-int main(int argc, char *argv[]) {
-    int copyout = 0;
-    int uncompr = 0;
-    int keep = 0;
-    int i = 0;
-    gzFile file;
-    char *bname, outmode[20];
-    char *strategy = "";
-    char *level = "6";
-    char *type = "b";
-
-    prog = argv[i];
-    bname = strrchr(argv[i], '/');
-    if (bname)
-        bname++;
-    else
-        bname = argv[i];
-
-    if (!strcmp(bname, "gunzip"))
-        uncompr = 1;
-    else if (!strcmp(bname, "zcat"))
-        copyout = uncompr = 1;
-
-    for (i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "-c") == 0)
-            copyout = 1;
-        else if (strcmp(argv[i], "-d") == 0)
-            uncompr = 1;
-        else if (strcmp(argv[i], "-k") == 0)
-            keep = 1;
-        else if (strcmp(argv[i], "-A") == 0)
-            type = "";
-        else if (argv[i][0] == '-' && (argv[i][1] == 'f' || argv[i][1] == 'h' ||
-                 argv[i][1] == 'R' || argv[i][1] == 'F' || argv[i][1] == 'T') && argv[i][2] == 0)
-            strategy = argv[i] + 1;
-        else if (argv[i][0] == '-' && argv[i][1] >= '0' && argv[i][1] <= '9' && argv[i][2] == 0)
-            level = argv[i] + 1;
-        else if (strcmp(argv[i], "--help") == 0) {
-            show_help();
-            return 0;
-        } else if (argv[i][0] == '-') {
-            show_help();
-            return 64;   /* EX_USAGE */
-        } else {
-            break;
-        }
-    }
-
-    snprintf(outmode, sizeof(outmode), "w%s%s%s", type, strategy, level);
-
-    if (i == argc) {
-        SET_BINARY_MODE(stdin);
-        SET_BINARY_MODE(stdout);
-        if (uncompr) {
-            file = PREFIX(gzdopen)(fileno(stdin), "rb");
-            if (file == NULL) error("can't gzdopen stdin");
-            gz_uncompress(file, stdout);
-        } else {
-            file = PREFIX(gzdopen)(fileno(stdout), outmode);
-            if (file == NULL) error("can't gzdopen stdout");
-            gz_compress(stdin, file);
-        }
-    } else {
-        if (copyout) {
-            SET_BINARY_MODE(stdout);
-        }
-        do {
-            if (uncompr) {
-                if (copyout) {
-                    file = PREFIX(gzopen)(argv[i], "rb");
-                    if (file == NULL)
-                        fprintf(stderr, "%s: can't gzopen %s\n", prog, argv[i]);
-                    else
-                        gz_uncompress(file, stdout);
-                } else {
-                    file_uncompress(argv[i], keep);
-                }
-            } else {
-                if (copyout) {
-                    FILE * in = fopen(argv[i], "rb");
-
-                    if (in == NULL) {
-                        perror(argv[i]);
-                    } else {
-                        file = PREFIX(gzdopen)(fileno(stdout), outmode);
-                        if (file == NULL) error("can't gzdopen stdout");
-
-                        gz_compress(in, file);
-                    }
-
-                } else {
-                    file_compress(argv[i], outmode, keep);
-                }
-            }
-        } while (++i < argc);
-    }
-    return 0;
-}

crates/libz-sys/src/zlib-ng/test/pigz/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib-ng/test/pigz/CMakeLists.txt b/crates/libz-sys/src/zlib-ng/test/pigz/CMakeLists.txt
deleted file mode 100644
index 0d5bc86..0000000
--- a/crates/libz-sys/src/zlib-ng/test/pigz/CMakeLists.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-# CMakeLists.txt -- Build madler/pigz against zlib variant
-
-# Copyright (C) 2021 Nathan Moinvaziri
-# Licensed under the Zlib license, see LICENSE.md for details
-
-# By default pigz will be linked against the system zlib and
-# pthread libraries if installed.
-
-# For compilation on Windows download and use shim:
-#  https://github.com/zlib-ng/pigzbench/tree/master/pigz/win
-
-# Optional Variables
-#   WITH_CODE_COVERAGE  - Enable code coverage reporting
-#   WITH_THREADS        - Enable threading support
-#   PIGZ_ENABLE_TESTS   - Enable adding unit tests
-#   PIGZ_VERSION        - Set the version of pigz to build
-#   ZLIB_ROOT           - Path to the zlib source directory
-#   PTHREADS4W_ROOT     - Path to pthreads4w source directory on Windows.
-#                         If not specified then threading will be disabled.
-
-cmake_minimum_required(VERSION 3.11)
-
-include(CheckCCompilerFlag)
-include(FeatureSummary)
-include(FetchContent)
-
-include(../../cmake/detect-coverage.cmake)
-
-option(WITH_CODE_COVERAGE "Enable code coverage reporting" OFF)
-option(WITH_THREADS "Enable threading support" ON)
-option(PIGZ_ENABLE_TESTS "Build unit tests" ON)
-option(PIGZ_VERSION "Set the version of pigz to build" "")
-
-project(pigz LANGUAGES C)
-
-# Set code coverage compiler flags
-if(WITH_CODE_COVERAGE)
-    add_code_coverage()
-endif()
-
-# Compiler definitions
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    add_definitions(-fno-caret-diagnostics)
-elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5.0)
-        add_definitions(-Wno-unused-result)
-    endif()
-    if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8.0)
-        add_definitions(-fno-diagnostics-show-caret)
-    endif()
-elseif(WIN32)
-    add_definitions(-D_TIMESPEC_DEFINED)
-    if(MSVC)
-        add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    endif()
-endif()
-
-# Fetch pigz source code from official repository
-if(PIGZ_VERSION STREQUAL "")
-    set(PIGZ_TAG master)
-else()
-    set(PIGZ_TAG ${PIGZ_VERSION})
-endif()
-FetchContent_Declare(pigz
-    GIT_REPOSITORY https://github.com/madler/pigz.git
-    GIT_TAG ${PIGZ_TAG})
-FetchContent_MakeAvailable(pigz)
-FetchContent_GetProperties(pigz)
-
-if(NOT pigz_POPULATED)
-    FetchContent_Populate(pigz)
-endif()
-
-set(PIGZ_SRCS
-    ${pigz_SOURCE_DIR}/pigz.c
-    ${pigz_SOURCE_DIR}/try.c)
-
-set(PIGZ_HDRS
-    ${pigz_SOURCE_DIR}/try.h)
-
-add_executable(${PROJECT_NAME} ${PIGZ_SRCS} ${PIGZ_HDRS})
-add_definitions(-DNOZOPFLI)
-if(WIN32)
-    target_include_directories(${PROJECT_NAME} PRIVATE win)
-endif()
-
-# Find and link against pthreads or pthreads4w
-if(WITH_THREADS)
-    if(WIN32)
-        if(DEFINED PTHREADS4W_ROOT)
-            set(CLEANUP_STYLE VC)
-            set(PTHREADS4W_VERSION 3)
-
-            add_subdirectory(${PTHREADS4W_ROOT} ${PTHREADS4W_ROOT} EXCLUDE_FROM_ALL)
-            target_link_libraries(${PROJECT_NAME} pthreadVC3)
-            target_include_directories(${PROJECT_NAME} PRIVATE ${PTHREADS4W_ROOT})
-        else()
-            message(WARNING "Missing pthreads4w root directory")
-            set(WITH_THREADS OFF)
-        endif()
-    else()
-        find_package(Threads REQUIRED)
-        target_link_libraries(${PROJECT_NAME} Threads::Threads)
-        if(NOT APPLE)
-            target_link_libraries(${PROJECT_NAME} m)
-        endif()
-    endif()
-endif()
-
-# Disable threading support
-if(NOT WITH_THREADS)
-    add_definitions(-DNOTHREAD)
-else()
-    set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY SOURCES
-        ${pigz_SOURCE_DIR}/yarn.c
-        ${pigz_SOURCE_DIR}/yarn.h)
-endif()
-
-# Find and link against zlib
-if(NOT DEFINED ZLIB_ROOT)
-    find_package(Zlib REQUIRED)
-endif()
-
-set(ZLIB_COMPAT ON)
-set(ZLIB_ENABLE_TESTS OFF)
-
-add_subdirectory(${ZLIB_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/zlib EXCLUDE_FROM_ALL)
-
-if(NOT DEFINED BUILD_SHARED_LIBS OR NOT BUILD_SHARED_LIBS)
-    set(ZLIB_TARGET zlibstatic)
-else()
-    set(ZLIB_TARGET zlib)
-endif()
-
-target_include_directories(${PROJECT_NAME} PRIVATE ${ZLIB_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/zlib)
-target_link_libraries(${PROJECT_NAME} ${ZLIB_TARGET})
-
-if(NOT SKIP_INSTALL_BINARIES AND NOT SKIP_INSTALL_ALL)
-    install(TARGETS ${PROJECT_NAME} DESTINATION "bin")
-endif()
-
-# Add unit tests
-if(PIGZ_ENABLE_TESTS)
-    enable_testing()
-
-    set(PIGZ_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:pigz>)
-
-    macro(test_pigz name path)
-        # Construct compression arguments for pigz
-        set(compress_args -k -c)
-        foreach(extra_arg IN ITEMS "${ARGN}")
-            list(APPEND compress_args ${extra_arg})
-        endforeach()
-
-        # Create unique friendly string for test
-        string(REPLACE ";" "" arg_list "${ARGN}")
-        string(REPLACE " " "" arg_list "${arg_list}")
-        string(REPLACE "-" "" arg_list "${arg_list}")
-
-        set(test_id pigz-${name}-${arg_list})
-
-        if(NOT TEST ${test_id})
-            add_test(NAME ${test_id}
-                COMMAND ${CMAKE_COMMAND}
-                "-DTARGET=${PIGZ_COMMAND}"
-                "-DCOMPRESS_ARGS=${compress_args}"
-                "-DDECOMPRESS_ARGS=-d;-c"
-                -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/${path}
-                -DTEST_NAME=${test_id}
-                -P ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/test-compress.cmake)
-        endif()
-    endmacro()
-
-    set(TEST_CONFIGS
-        -U       # RLE compression
-        #-H      # Z_HUFFMAN_ONLY (broken in 2.6)
-        -0      # No compression
-        -1      # Deflate quick
-        -4      # Deflate medium (lazy matches)
-        -6      # Deflate medium
-        -9      # Deflate slow
-    )
-
-    file(GLOB_RECURSE TEST_FILE_PATHS
-        LIST_DIRECTORIES false
-        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../data/*)
-
-    foreach(TEST_FILE_PATH ${TEST_FILE_PATHS})
-        if("${TEST_FILE_PATH}" MATCHES ".gz$" OR "${TEST_FILE_PATH}" MATCHES ".out$" OR
-           "${TEST_FILE_PATH}" MATCHES "/.git/" OR "${TEST_FILE_PATH}" MATCHES ".md$")
-            continue()
-        endif()
-        foreach(TEST_CONFIG ${TEST_CONFIGS})
-            get_filename_component(TEST_NAME ${TEST_FILE_PATH} NAME)
-            if (TEST_NAME STREQUAL "")
-                continue()
-            endif()
-            test_pigz(${TEST_NAME} ${TEST_FILE_PATH} ${TEST_CONFIG})
-        endforeach()
-    endforeach()
-
-    set(GH979_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:pigz>
-        -d -k -f ${CMAKE_CURRENT_SOURCE_DIR}/../GH-979/pigz-2.6.tar.gz)
-    add_test(NAME GH-979 COMMAND ${GH979_COMMAND})
-endif()
-
-add_feature_info(WITH_CODE_COVERAGE WITH_CODE_COVERAGE "Enable code coverage reporting")
-add_feature_info(WITH_THREADS WITH_THREADS "Enable threading support")
-add_feature_info(PIGZ_ENABLE_TESTS PIGZ_ENABLE_TESTS "Build unit tests")
-
-FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)

crates/libz-sys/src/zlib-ng/test/pkgcheck.sh

diff --git a/crates/libz-sys/src/zlib-ng/test/pkgcheck.sh b/crates/libz-sys/src/zlib-ng/test/pkgcheck.sh
deleted file mode 100644
index 4c757df..0000000
--- a/crates/libz-sys/src/zlib-ng/test/pkgcheck.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/sh
-
-usage() {
-  cat <<"_EOF_"
-Usage: sh test/pkgcheck.sh [--zlib-compat]
-
-Verifies that the various build systems produce identical results on a Unixlike system.
-If --zlib-compat, tests with zlib compatible builds.
-
-To build the 32 bit version for the current 64 bit arch:
-
-$ sudo apt install ninja-build diffoscope gcc-multilib
-$ export CMAKE_ARGS="-DCMAKE_C_FLAGS=-m32" CFLAGS=-m32 LDFLAGS=-m32
-$ sh test/pkgcheck.sh
-
-To cross-build, install the appropriate qemu and gcc packages,
-and set the environment variables used by configure or cmake.
-On Ubuntu, for example (values taken from .github/workflows/pkgconf.yml):
-
-arm HF:
-$ sudo apt install ninja-build diffoscope qemu gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
-$ export CHOST=arm-linux-gnueabihf
-$ export CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=${CHOST}"
-
-aarch64:
-$ sudo apt install ninja-build diffoscope qemu gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-$ export CHOST=aarch64-linux-gnu
-$ export CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DCMAKE_C_COMPILER_TARGET=${CHOST}"
-
-ppc (32 bit big endian):
-$ sudo apt install ninja-build diffoscope qemu gcc-powerpc-linux-gnu libc6-dev-powerpc-cross
-$ export CHOST=powerpc-linux-gnu
-$ export CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake"
-
-ppc64le:
-$ sudo apt install ninja-build diffoscope qemu gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
-$ export CHOST=powerpc64le-linux-gnu
-$ export CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake"
-
-then:
-$ export CC=${CHOST}-gcc
-$ sh test/pkgcheck.sh [--zlib-compat]
-
-Note: on Mac, you may also need to do 'sudo xcode-select -r' to get cmake to match configure/make's behavior (i.e. omit -isysroot).
-_EOF_
-}
-
-set -ex
-
-# Caller can also set CMAKE_ARGS or CONFIGURE_ARGS if desired
-CMAKE_ARGS=${CMAKE_ARGS}
-CONFIGURE_ARGS=${CONFIGURE_ARGS}
-
-case "$1" in
---zlib-compat)
-  suffix=""
-  CMAKE_ARGS="$CMAKE_ARGS -DZLIB_COMPAT=ON"
-  CONFIGURE_ARGS="$CONFIGURE_ARGS --zlib-compat"
-  ;;
-"")
-  suffix="-ng"
-  ;;
-*)
-  echo "Unknown arg '$1'"
-  usage
-  exit 1
-  ;;
-esac
-
-if ! test -f "configure"
-then
-  echo "Please run from top of source tree"
-  exit 1
-fi
-
-# Tell GNU's ld etc. to use Jan 1 1970 when embedding timestamps
-# Probably only needed on older systems (ubuntu 14.04, BSD?)
-export SOURCE_DATE_EPOCH=0
-case $(uname) in
-Darwin)
-  # Tell Apple's ar etc. to use zero timestamps
-  export ZERO_AR_DATE=1
-  # What CPU are we running on, exactly?
-  sysctl -n machdep.cpu.brand_string
-  sysctl -n machdep.cpu.features
-  sysctl -n machdep.cpu.leaf7_features
-  sysctl -n machdep.cpu.extfeatures
-  ;;
-esac
-
-# Use same compiler for make and cmake builds
-if test "$CC"x = ""x
-then
-  if clang --version
-  then
-    export CC=clang
-  elif gcc --version
-  then
-    export CC=gcc
-  fi
-fi
-
-# New build system
-# Happens to delete top-level zconf.h
-# (which itself is a bug, https://github.com/madler/zlib/issues/162 )
-# which triggers another bug later in configure,
-# https://github.com/madler/zlib/issues/499
-rm -rf btmp2 pkgtmp2
-mkdir btmp2 pkgtmp2
-export DESTDIR=$(pwd)/pkgtmp2
-cd btmp2
-  cmake -G Ninja ${CMAKE_ARGS} ..
-  ninja -v
-  ninja install
-cd ..
-
-# Original build system
-rm -rf btmp1 pkgtmp1
-mkdir btmp1 pkgtmp1
-export DESTDIR=$(pwd)/pkgtmp1
-cd btmp1
-  case $(uname) in
-  Darwin)
-    export LDFLAGS="-Wl,-headerpad_max_install_names"
-    ;;
-  esac
-  ../configure $CONFIGURE_ARGS
-  make
-  make install
-cd ..
-
-repack_ar() {
-  if ! cmp --silent pkgtmp1/usr/local/lib/libz$suffix.a pkgtmp2/usr/local/lib/libz$suffix.a
-  then
-    echo "libz$suffix.a does not match.  Probably filenames differ (.o vs .c.o).  Unpacking and renaming..."
-    # Note: %% is posix shell syntax meaning "Remove Largest Suffix Pattern", see
-    # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02
-    cd pkgtmp1; ar x usr/local/lib/libz$suffix.a; rm usr/local/lib/libz$suffix.a; cd ..
-    cd pkgtmp2; ar x usr/local/lib/libz$suffix.a; rm usr/local/lib/libz$suffix.a; for a in *.c.o; do mv $a ${a%%.c.o}.o; done; cd ..
-    # Also, remove __.SYMDEF SORTED if present, as it has those funky .c.o names embedded in it.
-    rm -f pkgtmp[12]/__.SYMDEF\ SORTED
-  fi
-}
-
-case $(uname) in
-Darwin)
-  # Remove the build uuid.
-  dylib1=$(find pkgtmp1 -type f -name '*.dylib*')
-  dylib2=$(find pkgtmp2 -type f -name '*.dylib*')
-  strip -x -no_uuid "$dylib1"
-  strip -x -no_uuid "$dylib2"
-  ;;
-esac
-
-# The ar on newer systems defaults to -D (i.e. deterministic),
-# but FreeBSD 12.1, Debian 8, and Ubuntu 14.04 seem to not do that.
-# I had trouble passing -D safely to the ar inside CMakeLists.txt,
-# so punt and unpack the archive if needed before comparing.
-# Also, cmake uses different .o suffix anyway...
-repack_ar
-
-if diff -Nur pkgtmp1 pkgtmp2
-then
-  echo pkgcheck-cmake-bits-identical PASS
-else
-  echo pkgcheck-cmake-bits-identical FAIL
-  dylib1=$(find pkgtmp1 -type f -name '*.dylib*' -print -o -type f -name '*.so.*' -print)
-  dylib2=$(find pkgtmp2 -type f -name '*.dylib*' -print -o -type f -name '*.so.*' -print)
-  diffoscope $dylib1 $dylib2 | cat
-  exit 1
-fi
-
-rm -rf btmp1 btmp2 pkgtmp1 pkgtmp2
-
-# any failure would have caused an early exit already
-echo "pkgcheck: PASS"

crates/libz-sys/src/zlib-ng/test/switchlevels.c

diff --git a/crates/libz-sys/src/zlib-ng/test/switchlevels.c b/crates/libz-sys/src/zlib-ng/test/switchlevels.c
deleted file mode 100644
index a065dbc..0000000
--- a/crates/libz-sys/src/zlib-ng/test/switchlevels.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Compresses a user-specified number of chunks from stdin into stdout as a single gzip stream.
- * Each chunk is compressed with a user-specified level.
- */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-static int read_all(unsigned char *buf, size_t size) {
-    size_t total_read = 0;
-    while (total_read < size) {
-        size_t n_read = fread(buf + total_read, 1, size - total_read, stdin);
-        if (ferror(stdin)) {
-            perror("fread\n");
-            return 1;
-        }
-        if (n_read == 0) {
-            fprintf(stderr, "Premature EOF\n");
-            return 1;
-        }
-        total_read += n_read;
-    }
-    return 0;
-}
-
-static int write_all(unsigned char *buf, size_t size) {
-    size_t total_written = 0;
-    while (total_written < size) {
-        size_t n_written = fwrite(buf + total_written, 1, size - total_written, stdout);
-        if (ferror(stdout)) {
-            perror("fwrite\n");
-            return 1;
-        }
-        total_written += n_written;
-    }
-    return 0;
-}
-
-static int compress_chunk(PREFIX3(stream) *strm, int level, int size, int last) {
-    int ret = 1;
-    int err = 0;
-    unsigned long compsize;
-    unsigned char *buf;
-
-    if (size <= 0) {
-        fprintf(stderr, "compress_chunk() invalid size %d\n", size);
-        goto done;
-    }
-    if (level < 0 || level > 9) {
-        fprintf(stderr, "compress_chunk() invalid level %d\n", level);
-        goto done;
-    }
-
-    compsize = PREFIX(deflateBound)(strm, size);
-    buf = malloc(size + compsize);
-    if (buf == NULL) {
-        fprintf(stderr, "Out of memory\n");
-        goto done;
-    }
-    if (read_all(buf, size) != 0) {
-        goto free_buf;
-    }
-
-    /* Provide only output buffer to deflateParams(). It might need some space to flush the leftovers from the last
-     * deflate(), but we don't want it to compress anything new. */
-    strm->next_in = NULL;
-    strm->avail_in = 0;
-    strm->next_out = buf + size;
-    strm->avail_out = compsize;
-    err = PREFIX(deflateParams)(strm, level, Z_DEFAULT_STRATEGY);
-    if (err != Z_OK) {
-        fprintf(stderr, "deflateParams() failed with code %d\n", err);
-        goto free_buf;
-    }
-
-    /* Provide input buffer to deflate(). */
-    strm->next_in = buf;
-    strm->avail_in = size;
-    err = PREFIX(deflate)(strm, last ? Z_FINISH : Z_SYNC_FLUSH);
-    if ((!last && err != Z_OK) || (last && err != Z_STREAM_END)) {
-        fprintf(stderr, "deflate() failed with code %d\n", err);
-        goto free_buf;
-    }
-    if (strm->avail_in != 0) {
-        fprintf(stderr, "deflate() did not consume %d bytes of input\n", strm->avail_in);
-        goto free_buf;
-    }
-    if (write_all(buf + size, compsize - strm->avail_out) != 0) {
-        goto free_buf;
-    }
-    ret = 0;
-
-free_buf:
-    free(buf);
-done:
-    return ret;
-}
-
-void show_help(void)
-{
-    printf("Usage: switchlevels [-w bits] level1 size1 [level2 size2 ...]\n\n" \
-           "  -w : window bits (8 to 15 for gzip, -8 to -15 for zlib)\n\n");
-}
-
-int main(int argc, char **argv) {
-    int ret = EXIT_FAILURE;
-    int err = 0;
-    int size = 0;
-    int level = Z_DEFAULT_COMPRESSION;
-    int level_arg = 1;
-    int window_bits = MAX_WBITS + 16;
-    PREFIX3(stream) strm;
-
-
-    if ((argc == 1) || (argc == 2 && strcmp(argv[1], "--help") == 0)) {
-        show_help();
-        return 0;
-    }
-
-    SET_BINARY_MODE(stdin);
-    SET_BINARY_MODE(stdout);
-
-    memset(&strm, 0, sizeof(strm));
-
-    for (int i = 1; i < argc - 1; i++) {
-        if (strcmp(argv[i], "-w") == 0 && i+1 < argc) {
-            window_bits = atoi(argv[++i]);
-        } else {
-            level_arg = i;
-            level = atoi(argv[i]);
-            break;
-        }
-    }
-
-    err = PREFIX(deflateInit2)(&strm, level, Z_DEFLATED, window_bits, 8, Z_DEFAULT_STRATEGY);
-    if (err != Z_OK) {
-        fprintf(stderr, "deflateInit() failed with code %d\n", err);
-        goto done;
-    }
-
-    for (int i = level_arg; i < argc - 1; i += 2) {
-        level = atoi(argv[i]);
-        size = atoi(argv[i + 1]);
-        if (compress_chunk(&strm, level, size, i + 2 >= argc - 1) != 0) {
-            goto deflate_end;
-        }
-    }
-    ret = EXIT_SUCCESS;
-
-deflate_end:
-    PREFIX(deflateEnd)(&strm);
-done:
-    return ret;
-}

crates/libz-sys/src/zlib-ng/test/test_adler32.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_adler32.cc b/crates/libz-sys/src/zlib-ng/test/test_adler32.cc
deleted file mode 100644
index fa113da..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_adler32.cc
+++ /dev/null
@@ -1,389 +0,0 @@
-/* test_adler32.c -- unit test for adler32 in the zlib compression library
- * Copyright (C) 2020 IBM Corporation
- * Author: Rogerio Alves <rcardoso@linux.ibm.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "cpu_features.h"
-}
-
-#include <gtest/gtest.h>
-
-typedef struct {
-    uint32_t adler;
-    const uint8_t *buf;
-    uint32_t len;
-    uint32_t expect;
-} adler32_test;
-
-static const uint8_t long_string[5552] = {
-    'q','j','d','w','q','4','8','m','B','u','k','J','V','U','z','V','V','f','M','j','i','q','S','W','L','5','G','n','F','S','P','Q',
-    'Q','D','i','6','m','E','9','Z','a','A','P','h','9','d','r','b','5','t','X','U','U','L','w','q','e','k','E','H','6','W','7','k',
-    'A','x','N','Q','R','k','d','V','5','y','n','U','N','W','Q','Y','i','W','5','9','R','p','D','C','x','p','u','h','C','a','m','r',
-    'z','n','z','A','d','J','6','u','N','e','r','x','7','Q','3','v','V','h','H','S','H','S','f','K','f','e','E','T','9','J','f','K',
-    'w','t','x','J','2','y','7','B','x','X','X','p','G','b','T','g','3','k','U','6','E','Z','M','t','J','q','v','n','S','T','6','x',
-    '5','x','4','P','z','p','M','F','V','b','d','m','f','G','n','J','m','w','z','K','8','a','q','E','D','e','b','3','h','B','V','g',
-    'y','3','P','L','5','8','r','z','X','b','Q','g','H','7','L','c','Z','B','3','C','4','y','t','u','k','z','h','v','C','Y','p','p',
-    '8','H','v','5','X','w','4','L','R','V','V','4','U','C','8','4','T','E','a','N','Z','S','7','U','u','z','f','H','p','P','J','u',
-    'Y','Z','h','T','6','e','v','z','V','F','h','u','y','H','b','k','J','M','f','3','6','g','y','L','E','W','t','B','B','d','d','9',
-    'u','M','Z','k','F','G','f','h','q','k','5','k','f','r','M','7','c','M','7','y','n','u','8','b','d','7','Q','f','E','m','F','K',
-    'x','W','f','B','2','F','8','5','q','z','y','3','R','i','U','m','X','k','h','N','J','y','B','C','h','u','x','4','f','k','J','5',
-    '6','X','T','W','h','8','J','4','m','K','p','N','3','g','C','g','A','E','e','Z','x','A','P','2','E','4','t','Q','5','X','Y','j',
-    '6','m','b','h','G','a','v','6','t','v','6','C','M','G','P','u','B','C','A','V','b','2','9','d','2','c','5','a','b','X','w','V',
-    'G','6','a','7','c','8','G','6','K','U','Q','m','w','P','V','5','N','x','b','v','x','E','N','C','A','N','t','v','N','B','z','X',
-    'B','R','q','U','n','i','A','Q','d','m','a','D','7','Y','f','3','J','8','Y','m','w','Z','b','w','r','H','q','E','j','c','u','E',
-    'i','i','S','b','n','G','P','a','F','j','c','R','D','D','G','F','v','i','a','i','M','7','B','e','w','m','L','E','F','2','Y','4',
-    '4','7','Y','C','t','y','q','7','2','V','G','m','m','E','e','V','u','m','L','p','R','X','W','z','V','K','E','k','p','V','r','J',
-    'd','N','3','t','i','u','S','V','w','2','w','U','Q','3','F','q','4','h','q','k','B','7','R','X','B','F','Q','Z','b','b','4','E',
-    'K','v','T','B','w','k','V','C','x','d','K','g','N','S','u','k','p','9','z','w','c','y','U','M','V','E','2','Y','P','F','h','9',
-    'T','y','h','w','b','9','P','w','G','c','W','W','k','j','J','Q','N','B','U','G','6','9','U','b','v','a','N','9','N','C','G','n',
-    'x','R','6','9','Q','C','h','e','j','P','U','h','U','R','i','4','T','B','W','5','w','m','J','p','e','7','r','9','t','c','9','Z',
-    'j','p','r','F','C','e','U','P','x','T','A','N','7','6','a','i','y','e','w','F','C','X','H','Y','G','C','q','q','m','A','t','7',
-    'z','u','D','S','L','U','C','f','7','e','t','G','V','F','u','c','x','5','M','7','N','i','M','6','h','2','n','H','S','h','K','M',
-    'd','T','z','X','d','x','x','4','q','z','d','D','a','2','X','r','p','r','R','m','U','U','y','S','H','c','a','F','e','Z','a','U',
-    'P','9','V','J','e','q','j','Y','M','x','e','v','K','7','M','P','N','2','b','6','f','P','h','H','4','U','X','k','n','f','Q','M',
-    '9','9','a','J','N','e','w','y','f','F','P','p','a','F','Y','a','M','L','W','i','T','M','B','3','U','v','X','v','G','p','7','a',
-    'f','u','4','S','y','X','9','g','g','b','B','G','c','i','M','U','n','m','a','7','q','f','9','n','Q','2','V','L','6','e','T','R',
-    '2','4','9','d','6','Q','B','Y','q','2','4','9','G','Q','E','b','Y','5','u','2','T','Q','G','L','5','n','4','Y','2','y','G','F',
-    'j','c','8','M','G','L','e','3','a','N','v','A','A','W','t','R','S','2','i','D','R','8','j','d','Q','3','6','C','V','M','e','w',
-    'j','U','Z','w','M','4','b','m','8','J','P','Q','L','P','R','c','r','b','V','C','3','N','8','K','4','d','W','D','N','U','A','A',
-    '2','J','p','b','D','d','p','j','N','C','k','A','j','B','a','c','u','v','L','X','U','B','4','U','X','W','e','C','b','C','u','d',
-    'A','v','U','z','P','t','D','e','5','y','Y','c','x','K','4','7','j','e','e','D','M','5','K','B','Q','6','d','p','T','T','R','j',
-    'M','E','E','M','r','N','6','8','7','q','x','F','S','x','E','U','4','d','B','6','5','W','C','e','m','J','e','5','j','w','V','J',
-    'w','v','d','7','v','f','K','u','m','8','h','W','T','e','Q','j','M','8','R','Y','d','B','R','2','r','F','j','7','d','E','q','V',
-    'k','e','j','P','9','3','X','R','p','R','b','A','v','7','4','A','M','2','k','r','E','7','X','3','7','k','5','c','B','7','W','5',
-    'u','J','B','Q','R','2','V','7','h','Q','h','9','g','G','y','c','c','x','M','z','7','G','2','J','w','v','j','5','9','E','b','k',
-    'z','W','T','C','b','4','K','R','X','T','k','V','S','G','2','j','d','6','y','E','4','P','H','K','w','a','m','F','Z','x','9','j',
-    'i','2','d','X','u','a','4','a','M','z','8','p','p','z','g','t','H','5','Y','L','Q','c','R','F','m','E','n','G','X','d','f','7',
-    'x','8','j','g','J','z','D','S','a','S','h','y','5','h','Y','N','p','w','Y','W','h','E','N','v','8','Q','D','W','Z','k','f','e',
-    'r','Z','D','7','R','D','T','2','H','X','z','G','X','f','v','E','z','P','v','U','H','e','4','R','W','U','x','t','t','4','w','p',
-    'r','z','K','9','f','g','h','P','r','f','v','k','h','c','e','5','8','a','L','F','J','M','G','R','a','N','q','S','g','W','e','7',
-    'R','K','R','A','B','z','6','v','S','p','w','n','e','x','k','E','r','j','f','Y','x','8','9','z','e','T','6','E','G','v','9','f',
-    'D','A','N','v','y','U','7','D','M','2','E','5','W','G','6','b','9','q','g','Y','F','f','k','q','Q','E','x','Y','C','R','G','6',
-    'R','h','4','J','d','U','D','b','9','b','8','r','f','V','d','g','b','2','z','Z','d','m','X','v','j','Y','d','w','K','8','G','r',
-    'v','j','N','y','c','h','u','5','z','g','J','H','a','Z','b','z','G','C','r','P','f','y','P','6','F','P','h','7','9','w','7','y',
-    'R','3','n','E','h','G','D','4','m','Y','E','q','k','a','f','a','R','B','q','t','W','E','T','p','H','7','k','X','2','d','X','6',
-    'W','n','H','m','w','M','i','Y','M','E','F','5','R','p','p','y','c','b','q','R','9','Y','t','T','7','w','u','K','M','Q','z','n',
-    'P','7','g','x','6','R','4','x','N','v','w','M','6','j','K','v','7','a','Y','4','a','M','6','n','z','3','E','2','V','N','4','i',
-    'E','f','u','W','J','W','e','8','3','Q','e','a','F','P','c','3','P','k','i','z','d','q','m','q','M','a','d','8','D','3','F','M',
-    'e','d','E','j','z','V','e','d','z','H','D','J','8','X','g','E','i','u','c','7','A','w','S','J','2','A','e','8','r','q','C','m',
-    '9','9','a','g','2','y','y','P','M','e','8','3','T','r','m','8','j','v','r','p','M','Z','Y','g','a','9','2','d','H','B','m','9',
-    '4','6','a','Z','V','u','S','H','g','3','X','h','i','N','3','B','S','E','k','9','k','2','9','R','A','i','3','L','X','M','B','S',
-    '4','S','F','F','F','w','u','d','M','T','9','K','B','7','R','U','R','8','D','8','T','5','U','t','E','R','x','n','x','h','v','k',
-    'B','N','k','E','U','T','t','p','r','u','Z','h','t','E','4','i','P','z','f','z','q','M','p','f','A','K','2','D','t','j','f','c',
-    'Y','E','N','M','x','k','g','7','T','U','2','c','d','V','g','2','z','L','i','j','Y','q','b','T','A','y','v','a','t','N','5','t',
-    'Z','5','n','D','a','y','G','n','P','x','V','k','M','8','t','J','Z','G','g','5','9','R','h','P','P','J','N','X','p','G','J','p',
-    '2','y','A','v','d','G','U','z','3','V','M','y','q','U','N','M','Y','p','B','Z','U','h','j','q','z','q','x','w','7','d','J','Q',
-    'u','F','q','3','m','9','c','Q','W','d','6','7','b','V','M','7','P','j','r','k','9','h','R','z','m','b','i','B','u','E','L','9',
-    'k','v','h','h','W','2','K','e','M','U','Q','p','A','Q','Y','J','G','E','T','U','L','f','q','G','4','z','K','K','y','a','U','W',
-    'K','D','P','c','N','D','V','S','Y','6','T','p','R','y','y','J','a','T','J','W','Q','9','p','F','P','X','y','k','9','z','z','4',
-    'G','d','a','z','X','n','h','4','J','P','W','V','D','r','U','m','a','8','a','b','X','F','J','X','L','4','S','X','5','W','p','W',
-    'h','y','x','B','f','d','C','X','w','7','r','g','V','T','H','a','i','4','N','v','c','w','n','2','3','A','i','A','J','9','N','c',
-    'z','7','n','n','3','n','h','n','i','R','i','b','E','h','k','U','c','c','U','6','f','x','q','N','y','H','M','e','J','B','U','B',
-    'r','g','a','8','V','a','G','V','y','u','c','c','v','C','H','W','y','g','z','Q','2','4','k','S','m','f','e','G','H','v','Q','3',
-    'P','e','f','S','V','P','c','U','e','3','P','x','d','c','7','c','f','g','D','w','2','t','q','y','g','2','Q','V','4','K','a','Q',
-    'g','B','b','L','x','9','m','a','K','4','i','x','g','Q','M','9','W','N','2','w','p','v','2','k','B','y','9','k','A','c','f','Z',
-    'D','R','A','S','d','v','w','f','f','q','t','K','3','j','x','D','G','P','n','u','r','v','U','k','A','2','d','R','N','T','G','4',
-    'B','g','k','t','h','7','J','k','F','A','C','g','W','g','J','F','z','S','Q','c','v','M','b','D','e','H','Q','S','j','v','G','E',
-    'R','k','f','i','P','E','F','N','6','y','p','b','t','M','c','Q','B','7','g','w','J','7','3','d','V','E','m','z','6','6','P','P',
-    'd','i','r','J','H','D','H','J','r','b','n','v','z','W','e','u','g','B','u','Z','2','m','D','5','h','F','X','B','2','r','6','w',
-    'u','Y','4','N','X','K','a','v','V','3','j','B','r','r','C','c','w','R','g','S','8','V','b','F','2','N','M','c','K','8','Y','E',
-    'E','N','K','X','K','V','B','x','n','Q','p','a','q','f','k','t','z','Y','E','P','Z','y','n','a','c','B','V','a','x','b','d','X',
-    'r','d','8','P','H','F','v','r','V','5','g','J','w','6','i','h','d','d','p','J','c','c','Y','S','q','W','m','U','5','G','b','H',
-    'N','z','E','Z','K','E','y','M','c','G','i','d','w','Z','D','N','N','w','S','t','g','y','a','Y','b','H','e','M','N','f','Y','Y',
-    '7','a','9','b','M','U','k','a','V','k','C','n','a','k','U','H','A','M','i','v','k','t','a','d','i','3','F','d','5','2','A','p',
-    'U','c','J','U','R','h','G','d','A','Y','v','q','X','c','w','r','x','4','j','3','4','b','F','d','a','L','N','J','3','Z','g','6',
-    'W','Q','R','u','P','t','M','A','3','F','6','y','K','Y','G','2','t','v','u','p','w','b','G','S','K','5','p','4','d','E','w','6',
-    'g','t','V','4','b','2','n','b','Z','3','3','f','m','d','2','c','a','m','j','X','U','E','D','6','6','F','w','H','9','7','Z','Y',
-    'd','X','C','K','i','g','p','F','Y','n','2','b','F','4','R','u','V','k','f','d','J','i','a','b','X','H','7','v','K','a','Q','i',
-    'W','M','j','M','i','a','i','n','F','h','r','q','4','w','x','m','4','q','y','F','8','w','i','4','D','B','A','L','B','U','u','K',
-    'v','K','n','a','Q','i','e','k','v','Q','U','5','w','Q','c','r','A','6','M','w','y','g','n','e','v','K','7','W','u','2','y','f',
-    'Q','u','e','r','y','a','w','V','p','f','Q','z','C','u','i','i','9','S','P','q','L','r','C','H','S','3','E','p','8','S','m','Q',
-    'S','K','r','V','b','J','R','m','w','c','n','Q','N','Q','4','M','u','f','X','S','f','U','Z','x','U','4','j','K','4','G','z','X',
-    '7','Q','j','R','h','i','G','m','q','c','V','T','x','U','a','E','b','Q','q','E','i','F','K','7','K','i','R','J','5','Y','F','V',
-    'B','7','R','8','M','i','f','j','Z','w','j','b','B','u','p','N','Y','r','S','r','f','h','E','J','T','B','P','R','D','V','K','A',
-    'Z','A','R','j','z','f','B','i','Y','L','F','G','V','Y','w','R','C','P','G','m','9','7','C','5','e','y','w','N','K','N','a','Q',
-    'j','a','W','3','2','f','G','w','n','M','6','F','u','K','8','g','8','M','G','r','e','9','Z','z','y','2','G','U','k','G','6','m',
-    'A','D','4','n','b','8','a','q','S','m','S','6','5','R','5','D','5','S','B','g','X','T','8','Q','V','d','A','n','g','y','8','a',
-    'h','7','K','9','H','D','J','F','w','G','4','w','T','J','F','f','i','8','X','e','B','J','K','H','7','V','y','X','7','E','8','S',
-    'A','d','b','w','S','8','Y','a','J','d','j','E','V','J','T','E','U','R','5','7','V','M','E','v','D','3','z','5','r','k','z','v',
-    'e','m','A','7','P','8','j','X','E','f','Q','q','8','D','g','y','8','j','A','e','B','c','c','M','z','k','2','c','q','v','v','y',
-    'Q','y','h','g','p','v','M','m','m','C','G','D','k','8','u','T','n','Q','H','G','H','f','b','J','j','5','X','c','i','7','7','q',
-    'b','R','8','b','b','z','f','f','h','Y','Q','7','u','B','X','e','i','j','M','q','C','T','M','v','t','J','J','w','b','F','v','J',
-    'm','e','2','u','e','8','L','V','G','q','A','j','m','7','m','g','m','5','i','r','p','p','U','y','F','6','f','b','u','6','q','L',
-    'M','E','t','V','W','C','t','e','p','w','a','n','w','y','X','h','8','e','G','C','H','q','r','X','G','9','c','h','7','k','8','M',
-    'G','b','a','m','Y','Q','w','8','J','z','a','F','r','4','W','M','j','P','q','a','z','U','y','u','3','b','Z','f','Y','5','7','g',
-    'N','M','h','M','a','3','C','K','6','6','f','a','p','i','f','q','k','T','i','z','w','f','Z','c','H','L','X','g','6','m','g','r',
-    'w','Y','u','K','8','L','p','8','P','R','A','R','A','b','Z','V','a','x','V','c','G','A','H','t','Y','6','P','T','L','W','N','z',
-    'g','z','k','d','E','v','C','t','Z','M','Z','K','4','w','9','5','D','W','f','U','8','5','u','6','b','5','B','8','g','y','C','E',
-    'Q','z','e','9','p','N','S','P','D','D','f','x','k','Z','4','R','v','X','V','k','p','b','n','t','c','F','R','e','x','9','C','D',
-    'J','2','6','f','Z','D','w','J','R','j','j','9','b','w','N','N','p','R','f','Z','z','j','F','r','Q','e','F','x','f','t','V','V',
-    'A','y','J','G','W','Z','H','r','D','5','M','u','H','V','L','N','U','V','X','z','j','9','r','v','e','d','R','c','u','V','x','r',
-    'c','6','k','L','h','q','w','U','W','Q','g','G','F','C','t','E','a','D','h','x','9','5','P','R','Z','E','M','5','f','4','2','t',
-    'A','6','f','r','X','G','X','Y','B','8','G','E','n','B','v','x','f','M','R','f','B','z','Y','3','2','q','z','G','t','P','C','6',
-    '6','r','z','J','r','c','n','d','6','h','e','w','D','D','h','V','L','u','i','b','5','K','d','S','y','9','N','p','E','r','D','k',
-    'B','z','u','v','d','Q','p','K','5','m','J','r','b','Y','Z','7','p','M','J','F','E','q','x','f','E','K','U','U','4','f','a','6',
-    'g','5','a','q','D','U','8','F','y','R','a','P','5','5','x','z','6','V','T','P','D','m','y','7','U','5','C','A','7','Q','h','w',
-    'r','6','x','g','Q','i','b','K','F','p','B','X','Q','h','i','E','r','C','z','v','x','W','Q','6','p','6','b','M','K','V','x','u',
-    'k','d','R','S','k','Q','p','n','h','d','Q','Y','x','n','x','5','K','t','5','w','A','5','p','k','F','z','W','p','j','U','y','V',
-    'x','G','m','y','L','A','X','H','G','A','a','J','5','E','P','q','E','U','7','p','6','A','9','n','d','G','D','g','i','h','t','W',
-    'b','c','E','2','P','d','y','J','M','u','4','g','P','S','X','J','v','w','3','v','D','q','U','i','U','T','q','E','Y','5','2','t',
-    'b','j','P','2','j','D','9','y','i','B','5','Y','3','X','L','w','m','V','X','z','X','r','Z','d','H','L','A','H','k','R','X','5',
-    'i','L','m','q','3','p','a','G','P','j','g','h','R','P','Y','U','z','M','5','R','M','A','E','Q','V','c','w','r','4','M','S','k',
-    'N','D','i','R','R','x','t','q','T','i','u','N','K','R','x','Z','K','a','g','G','y','9','c','j','J','S','9','3','H','T','f','F',
-    'q','6','D','W','F','K','h','e','p','p','b','q','N','k','A','C','m','y','u','B','J','v','q','D','e','j','e','b','2','w','R','t',
-    'J','N','j','F','T','A','8','L','m','X','i','T','g','j','c','V','4','V','h','2','h','R','p','2','9','k','c','c','G','D','h','z',
-    't','i','h','t','W','R','n','Y','i','8','u','6','G','9','T','P','9','9','J','P','Y','R','h','X','K','z','h','L','W','r','C','U',
-    '2','L','T','k','2','m','6','W','L','P','T','Z','z','t','i','H','5','G','w','t','E','v','z','k','b','H','b','b','W','W','u','b',
-    'i','h','C','Q','n','H','N','u','5','u','K','X','r','M','W','U','3','Y','k','P','2','k','x','f','x','C','w','z','z','b','G','8',
-    'y','W','e','j','v','2','v','r','t','q','z','p','Y','d','w','6','Z','D','J','L','9','F','z','G','U','4','a','8','H','6','U','a',
-    'q','7','y','Q','J','v','m','D','P','S','j','q','v','t','n','t','g','j','3','t','8','f','K','K','7','b','W','d','F','i','N','K',
-    'a','R','V','V','V','v','m','A','Q','2','y','j','c','t','f','k','j','7','X','y','j','b','U','F','w','W','3','9','6','A','S','J',
-    'p','q','2','Z','7','L','p','b','7','b','5','i','p','r','r','h','P','M','h','j','c','y','e','u','h','B','d','9','9','u','f','d',
-    'g','u','p','w','u','9','S','c','L','U','g','A','y','V','F','V','6','D','D','X','i','V','m','u','Y','P','J','v','L','T','A','F',
-    'M','Q','H','Z','6','v','8','p','A','L','P','z','C','V','a','C','h','X','j','W','8','G','z','j','d','M','4','u','x','w','H','g',
-    'V','q','K','z','b','g','2','3','D','N','y','G','X','F','T','v','T','L','y','v','L','9','g','c','C','R','8','L','A','7','Y','N',
-    't','n','R','6','b','n','m','9','i','h','t','T','F','a','V','N','J','J','3','J','q','p','W','7','b','T','G','r','M','k','a','7',
-    'D','H','v','y','T','A','C','U','P','u','q','L','R','Y','4','q','h','y','f','F','J','x','K','7','N','B','v','3','a','Z','M','t',
-    'U','x','8','9','V','E','t','j','K','r','u','Y','Y','A','u','w','Y','2','y','Q','z','S','n','J','B','2','t','X','x','K','z','g',
-    '6','d','n','i','7','Z','N','F','Q','6','w','N','r','b','k','d','W','X','S','t','c','U','m','6','4','2','e','w','6','x','Z','a',
-    'Q','A','7','4','h','H','z','r','e','J','q','j','w','4','q','c','i','R','4','x','n','r','j','r','P','g','E','7','t','k','b','Z',
-    'r','A','b','d','g','i','G','V','D','E','U','L','b','J','U','q','2','S','K','m','A','U','L','k','Q','4','N','p','k','G','C','6',
-    'R','Z','B','y','B','B','j','y','x','L','d','h','L','G','6','x','H','z','T','5','d','Y','4','2','m','q','Q','y','H','6','c','N',
-    'u','m','U','v','i','Y','Z','7','4','L','K','F','b','v','2','Y','h','x','8','a','R','w','q','x','E','a','T','y','m','C','2','Q',
-    'U','T','D','Q','v','u','M','9','D','8','r','8','b','m','p','E','7','C','T','9','B','A','G','k','b','G','z','Z','G','L','N','k',
-    'h','3','k','J','e','f','d','x','F','8','W','K','7','T','6','h','H','V','C','h','P','u','H','e','v','w','z','P','K','r','D','G',
-    'X','Z','B','X','f','H','Q','4','e','D','y','W','Z','6','4','K','A','e','a','F','S','N','h','x','S','W','J','c','E','P','g','j',
-    'a','w','T','m','Z','X','E','P','Y','R','M','2','R','2','X','N','F','X','Y','W','x','z','p','J','g','n','D','4','i','p','6','N',
-    'r','9','G','k','E','h','T','h','U','h','x','B','Q','9','H','7','w','U','P','Q','d','G','6','q','p','j','j','v','C','a','X','J',
-    'N','G','Y','w','f','H','C','x','F','k','z','3','9','r','h','8','7','5','V','i','V','C','R','q','x','N','2','2','i','W','F','U',
-    '7','T','H','f','z','E','a','n','u','Q','t','U','Y','G','t','3','A','m','r','6','d','f','e','n','e','z','F','u','U','N','8','m',
-    'h','p','R','N','S','H','6','6','V','M','S','t','q','P','E','i','u','y','g','8','L','Q','Y','Y','G','e','W','W','C','G','y','b',
-    'y','t','u','P','R','P','5','m','N','K','B','Z','w','f','t','k','x','3','L','b','q','d','w','S','G','E','h','R','F','4','q','e',
-    '5','6','F','2','n','q','T','R','y','f','n','Y','h','2','F','u','x','M','i','i','h','w','G','C','Z','v','i','C','a','X','U','C',
-    'Y','8','d','h','R','x','V','n','v','G','i','D','a','U','p','U','a','e','b','F','w','P','d','X','n','K','h','9','H','r','b','g',
-    '2','f','m','X','k','m','q','6','n','5','b','G','H','d','R','9','D','U','c','r','Z','Y','W','S','Z','x','p','t','x','y','4','k',
-    'j','F','U','t','C','i','e','i','b','p','e','4','C','z','h','3','3','5','Q','P','n','G','i','A','8','c','Q','z','B','a','V','4',
-    '2','B','2','z','u','u','3','i','L','w','y','g','K','H','k','y','2','B','b','e','5','e','4','e','U','4','z','n','P','z','a','c',
-    'E','f','u','M','G','C','g','z','j','4','E','7','R','t','D','K','c','t','p','g','W','H','C','H','J','Q','J','c','F','5','4','W',
-    'K','7','j','h','A','T','K','z','t','S','f','f','j','C','c','8','n','7','c','T','U','R','Q','E','7','A','W','Z','z','K','5','j',
-    '2','H','k','a','j','g','g','W','w','4','T','A','9','J','U','e','S','N','P','K','d','k','L','Q','G','Z','e','W','i','H','u','j',
-    'C','z','4','E','2','v','5','L','u','9','Z','a','9','A','b','C','M','G','X','B','C','2','Y','Z','e','U','n','E','5','Y','n','y',
-    'F','h','H','p','9','j','Y','F','V','w','Y','r','8','Q','f','C','J','4','T','t','z','Q','N','M','e','7','4','3','y','E','M','m',
-    'b','S','c','h','w','a','X','E','d','E','z','t','h','9','k','p','A','k','K','H','x','q','K','Z','B','u','a','9','3','U','U','u',
-    '8','E','D','v','y','k','W','Y','X','k','r','R','D','X','n','Q','V','d','e','D','g','x','E','V','Y','w','k','m','K','r','H','D',
-    't','2','6','N','U','g','3','t','B','9','t','u','M','D','z','Y','K','z','K','r','V','5','i','e','p','M','d','t','w','6','a','f',
-    'f','W','k','L','i','g','M','V','M','Y','b','x','e','4','h','h','Y','g','w','Z','m','e','e','6','R','W','M','x','G','y','V','n',
-    '6','e','g','A','g','K','a','N','7','p','a','u','E','4','6','M','t','X','h','g','b','j','p','5','x','x','B','P','3','J','M','7',
-    'j','Z','P','y','e','Q','Z','e','t','j','3','t','F','V','x','m','b','b','B','y','J','L','L','9','3','R','a','5','j','S','V','t',
-    'e','2','6','m','H','w','r','w','r','6','Q','3','x','z','m','A','d','x','t','E','H','c','Z','x','c','P','j','r','u','U','W','k',
-    '6','g','X','g','n','f','n','7','H','M','B','t','v','6','v','x','g','M','f','e','2','w','m','y','d','H','S','q','c','K','U','H',
-    '2','X','h','d','p','Q','7','J','X','i','X','f','a','z','V','A','F','2','8','z','v','h','C','h','e','4','g','z','w','z','h','q',
-    'p','6','B','n','m','8','h','W','U','7','z','h','T','6','J','f','4','Z','n','Q','W','z','2','N','4','t','g','7','u','4','X','2',
-    'C','F','L','n','J','n','m','j','3','P','3','Y','e','J','R','A','H','e','R','D','z','7','u','X','Y','y','D','w','J','m','G','U',
-    'P','H','5','S','d','a','F','F','Y','c','M','f','3','3','L','v','V','B','U','C','A','d','N','H','Q','h','7','8','4','r','p','G',
-    'v','M','D','H','7','e','E','r','i','K','Q','i','B','D','M','Z','p','c','R','G','u','c','H','a','N','k','E','f','9','R','7','x',
-    '6','3','5','u','x','3','h','v','p','6','q','r','j','u','f','W','T','q','P','n','Y','L','B','6','U','w','P','2','T','W','R','g',
-    '2','3','3','e','N','V','a','j','b','e','4','T','u','J','u','u','F','B','D','G','H','x','x','k','5','G','e','3','4','B','m','L',
-    'S','b','i','t','T','p','M','D','Z','A','A','i','r','J','p','4','H','U','A','G','y','d','Q','5','U','R','F','8','q','a','S','H',
-    'n','5','z','9','g','3','u','R','H','m','G','m','b','p','c','L','Z','Y','u','m','i','K','A','Q','R','T','X','G','t','b','8','7',
-    '7','6','w','M','N','f','R','G','r','L','m','q','n','7','5','k','X','8','g','u','K','7','Y','w','K','q','U','e','W','A','r','i',
-    'Z','a','p','q','L','5','P','u','n','t','y','G','x','C','N','X','q','P','r','U','v','A','r','r','q','e','f','c','z','M','7','N',
-    '6','a','z','Z','a','t','f','p','4','v','J','Y','j','h','M','D','t','k','A','B','p','Q','A','y','x','X','7','p','S','8','m','M',
-    'y','K','B','A','5','2','7','b','y','R','K','q','A','u','3','J'};
-
-static const adler32_test tests[] = {
-   {0x1, (const uint8_t *)0x0, 0, 0x1},
-   {0x1, (const uint8_t *)"", 1, 0x10001},
-   {0x1, (const uint8_t *)"a", 1, 0x620062},
-   {0x1, (const uint8_t *)"abacus", 6, 0x8400270},
-   {0x1, (const uint8_t *)"backlog", 7, 0xb1f02d4},
-   {0x1, (const uint8_t *)"campfire", 8, 0xea10348},
-   {0x1, (const uint8_t *)"delta", 5, 0x61a020b},
-   {0x1, (const uint8_t *)"executable", 10, 0x16fa0423},
-   {0x1, (const uint8_t *)"file", 4, 0x41401a1},
-   {0x1, (const uint8_t *)"greatest", 8, 0xefa0360},
-   {0x1, (const uint8_t *)"inverter", 8, 0xf6f0370},
-   {0x1, (const uint8_t *)"jigsaw", 6, 0x8bd0286},
-   {0x1, (const uint8_t *)"karate", 6, 0x8a50279},
-   {0x1, (const uint8_t *)"landscape", 9, 0x126a03ac},
-   {0x1, (const uint8_t *)"machine", 7, 0xb5302d6},
-   {0x1, (const uint8_t *)"nanometer", 9, 0x12d803ca},
-   {0x1, (const uint8_t *)"oblivion", 8, 0xf220363},
-   {0x1, (const uint8_t *)"panama", 6, 0x8a1026f},
-   {0x1, (const uint8_t *)"quest", 5, 0x6970233},
-   {0x1, (const uint8_t *)"resource", 8, 0xf8d0369},
-   {0x1, (const uint8_t *)"secret", 6, 0x8d10287},
-   {0x1, (const uint8_t *)"ultimate", 8, 0xf8d0366},
-   {0x1, (const uint8_t *)"vector", 6, 0x8fb0294},
-   {0x1, (const uint8_t *)"walrus", 6, 0x918029f},
-   {0x1, (const uint8_t *)"xeno", 4, 0x45e01bb},
-   {0x1, (const uint8_t *)"yelling", 7, 0xbfe02f5},
-   {0x1, (const uint8_t *)"zero", 4, 0x46e01c1},
-   {0x1, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0x3eef064d},
-   {0x1, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0x425d065f},
-   {0x1, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0x4f1a073e},
-   {0x1, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x42290650},
-   {0x1, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0x43fd0690},
-   {0x1, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0x3f770609},
-   {0x1, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0x4c7c0703},
-   {0x1, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0x48ac06b7},
-   {0x1, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0x489a0698},
-   {0x1, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0x44a906e6},
-   {0x1, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0x4a29071c},
-   {0x1, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0x4a7706f9},
-   {0x1, (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0x4ce60769},
-   {0x1, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x48ae06e5},
-   {0x1, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x51d60750},
-   {0x1, (const uint8_t *)"70684206568419061514", 20, 0x2b100414},
-   {0x1, (const uint8_t *)"42015093765128581010", 20, 0x2a550405},
-   {0x1, (const uint8_t *)"88214814356148806939", 20, 0x2b450423},
-   {0x1, (const uint8_t *)"43472694284527343838", 20, 0x2b460421},
-   {0x1, (const uint8_t *)"49769333513942933689", 20, 0x2bc1042b},
-   {0x1, (const uint8_t *)"54979784887993251199", 20, 0x2ccd043d},
-   {0x1, (const uint8_t *)"58360544869206793220", 20, 0x2b68041a},
-   {0x1, (const uint8_t *)"27347953487840714234", 20, 0x2b84041d},
-   {0x1, (const uint8_t *)"07650690295365319082", 20, 0x2afa0417},
-   {0x1, (const uint8_t *)"42655507906821911703", 20, 0x2aff0412},
-   {0x1, (const uint8_t *)"29977409200786225655", 20, 0x2b8d0420},
-   {0x1, (const uint8_t *)"85181542907229116674", 20, 0x2b140419},
-   {0x1, (const uint8_t *)"87963594337989416799", 20, 0x2c8e043f},
-   {0x1, (const uint8_t *)"21395988329504168551", 20, 0x2b68041f},
-   {0x1, (const uint8_t *)"51991013580943379423", 20, 0x2af10417},
-   {0x1, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x7c9d0841},
-   {0x1, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0x71060751},
-   {0x1, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0x7095070a},
-   {0x1, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0x82530815},
-   {0x1, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0x61250661},
-   {0x1, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x642006a3},
-   {0x1, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0x674206cb},
-   {0x1, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x67670680},
-   {0x1, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0x7547070f},
-   {0x1, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0x69ea06ee},
-   {0x1, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0x1b01e92},
-   {0x1, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xfbdb1e96},
-   {0x1, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0x47a61ec8},
-   {0x1, (const uint8_t *)long_string, 5552, 0x8b81718f},
-   {0x7a30360d, (const uint8_t *)0x0, 0, 0x1},
-   {0x6fd767ee, (const uint8_t *)"", 1, 0xd7c567ee},
-   {0xefeb7589, (const uint8_t *)"a", 1, 0x65e475ea},
-   {0x61cf7e6b, (const uint8_t *)"abacus", 6, 0x60b880da},
-   {0xdc712e2,  (const uint8_t *)"backlog", 7, 0x9d0d15b5},
-   {0xad23c7fd, (const uint8_t *)"campfire", 8, 0xfbfecb44},
-   {0x85cb2317, (const uint8_t *)"delta", 5, 0x3b622521},
-   {0x9eed31b0, (const uint8_t *)"executable", 10, 0xa6db35d2},
-   {0xb94f34ca, (const uint8_t *)"file", 4, 0x9096366a},
-   {0xab058a2,  (const uint8_t *)"greatest", 8, 0xded05c01},
-   {0x5bff2b7a, (const uint8_t *)"inverter", 8, 0xc7452ee9},
-   {0x605c9a5f, (const uint8_t *)"jigsaw", 6, 0x7899ce4},
-   {0x51bdeea5, (const uint8_t *)"karate", 6, 0xf285f11d},
-   {0x85c21c79, (const uint8_t *)"landscape", 9, 0x98732024},
-   {0x97216f56, (const uint8_t *)"machine", 7, 0xadf4722b},
-   {0x18444af2, (const uint8_t *)"nanometer", 9, 0xcdb34ebb},
-   {0xbe6ce359, (const uint8_t *)"oblivion", 8, 0xe8b7e6bb},
-   {0x843071f1, (const uint8_t *)"panama", 6, 0x389e745f},
-   {0xf2480c60, (const uint8_t *)"quest", 5, 0x36c90e92},
-   {0x2d2feb3d, (const uint8_t *)"resource", 8, 0x9705eea5},
-   {0x7490310a, (const uint8_t *)"secret", 6, 0xa3a63390},
-   {0x97d247d4, (const uint8_t *)"ultimate", 8, 0xe6154b39},
-   {0x93cf7599, (const uint8_t *)"vector", 6, 0x5e87782c},
-   {0x73c84278, (const uint8_t *)"walrus", 6, 0xbc84516},
-   {0x228a87d1, (const uint8_t *)"xeno", 4, 0x4646898b},
-   {0xa7a048d0, (const uint8_t *)"yelling", 7, 0xb1654bc4},
-   {0x1f0ded40, (const uint8_t *)"zero", 4, 0xd8a4ef00},
-   {0xa804a62f, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0xe34eac7b},
-   {0x508fae6a, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0x33f2b4c8},
-   {0xe5adaf4f, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xe7b1b68c},
-   {0x67136a40, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0xf6a0708f},
-   {0xb00c4a10, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xbd8f509f},
-   {0x2e0c84b5, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0xcc298abd},
-   {0x81238d44, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0xd7809446},
-   {0xf853aa92, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0x9525b148},
-   {0x5a692325, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0x620029bc},
-   {0x3275b9f,  (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0x70916284},
-   {0x38371feb, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0xd52706},
-   {0xafc8bf62, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0xeeb4c65a},
-   {0x9b07db73, (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0xde3e2db},
-   {0xe75b214,  (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x4171b8f8},
-   {0x72d0fe6f, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0xa66a05cd},
-   {0xf857a4b1, (const uint8_t *)"70684206568419061514", 20, 0x1f9a8c4},
-   {0x54b8e14,  (const uint8_t *)"42015093765128581010", 20, 0x49c19218},
-   {0xd6aa5616, (const uint8_t *)"88214814356148806939", 20, 0xbbfc5a38},
-   {0x11e63098, (const uint8_t *)"43472694284527343838", 20, 0x93434b8},
-   {0xbe92385,  (const uint8_t *)"49769333513942933689", 20, 0xfe1827af},
-   {0x49511de0, (const uint8_t *)"54979784887993251199", 20, 0xcba8221c},
-   {0x3db13bc1, (const uint8_t *)"58360544869206793220", 20, 0x14643fda},
-   {0xbb899bea, (const uint8_t *)"27347953487840714234", 20, 0x1604a006},
-   {0xf6cd9436, (const uint8_t *)"07650690295365319082", 20, 0xb69f984c},
-   {0x9109e6c3, (const uint8_t *)"42655507906821911703", 20, 0xc43eead4},
-   {0x75770fc,  (const uint8_t *)"29977409200786225655", 20, 0x707751b},
-   {0x69b1d19b, (const uint8_t *)"85181542907229116674", 20, 0xf5bdd5b3},
-   {0xc6132975, (const uint8_t *)"87963594337989416799", 20, 0x2fed2db3},
-   {0xd58cb00c, (const uint8_t *)"21395988329504168551", 20, 0xc2a2b42a},
-   {0xb63b8caa, (const uint8_t *)"51991013580943379423", 20, 0xdf0590c0},
-   {0x8a45a2b8, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x1980aaf8},
-   {0xcbe95b78, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0xf58662c8},
-   {0x4ef8a54b, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0x1f65ac54},
-   {0x76ad267a, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0x7b792e8e},
-   {0x569e613c, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0x1d61679c},
-   {0x36aa61da, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x12ec687c},
-   {0xf67222df, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0x740329a9},
-   {0x74b34fd3, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x374c5652},
-   {0x351fd770, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xeadfde7e},
-   {0xc45aef77, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0x3fcbf664},
-   {0xd034ea71, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0x6b080911},
-   {0xdeadc0de, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0x355fdf73},
-   {0xba5eba11, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xb48bd8d8},
-   {0x7712aa45, (const uint8_t *)long_string, 5552, 0x7dc51be2},
-};
-
-class adler32_variant : public ::testing::TestWithParam<adler32_test> {
-public:
-    void hash(adler32_test param, adler32_func adler32) {
-        uint32_t adler = adler32((uint32_t)param.adler, param.buf, param.len);
-        EXPECT_EQ(adler, param.expect);
-    }
-};
-
-INSTANTIATE_TEST_SUITE_P(adler32, adler32_variant, testing::ValuesIn(tests));
-
-#define TEST_ADLER32(name, func, support_flag) \
-    TEST_P(adler32_variant, name) { \
-        if (!support_flag) { \
-            GTEST_SKIP(); \
-            return; \
-        } \
-        hash(GetParam(), func); \
-    }
-
-TEST_ADLER32(c, adler32_c, 1)
-
-#ifdef ARM_NEON_ADLER32
-TEST_ADLER32(neon, adler32_neon, arm_cpu_has_neon)
-#elif defined(POWER8_VSX_ADLER32)
-TEST_ADLER32(power8, adler32_power8, power_cpu_has_arch_2_07)
-#elif defined(PPC_VMX_ADLER32)
-TEST_ADLER32(vmx, adler32_vmx, power_cpu_has_altivec)
-#endif
-
-#ifdef X86_SSSE3_ADLER32
-TEST_ADLER32(ssse3, adler32_ssse3, x86_cpu_has_ssse3)
-#endif
-#ifdef X86_SSE41_ADLER32
-TEST_ADLER32(sse41, adler32_sse41, x86_cpu_has_sse41)
-#endif
-#ifdef X86_AVX2_ADLER32
-TEST_ADLER32(avx2, adler32_avx2, x86_cpu_has_avx2)
-#endif
-#ifdef X86_AVX512_ADLER32
-TEST_ADLER32(avx512, adler32_avx512, x86_cpu_has_avx512)
-#endif
-#ifdef X86_AVX512VNNI_ADLER32
-TEST_ADLER32(avx512_vnni, adler32_avx512_vnni, x86_cpu_has_avx512vnni)
-#endif

crates/libz-sys/src/zlib-ng/test/test_aligned_alloc.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_aligned_alloc.cc b/crates/libz-sys/src/zlib-ng/test/test_aligned_alloc.cc
deleted file mode 100644
index 259d474..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_aligned_alloc.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* test_aligned_alloc.cc - Test zng_alloc_aligned and zng_free_aligned */
-
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil.h"
-}
-
-#include <gtest/gtest.h>
-
-void *zng_calloc_unaligned(void *opaque, unsigned items, unsigned size) {
-    uint8_t *pointer = (uint8_t *)calloc(1, (items * size) + 2);
-    Z_UNUSED(opaque);
-    if (pointer == NULL)
-        return pointer;
-    /* Store whether or not our allocation is aligned */
-    *pointer = ((uint64_t)(intptr_t)pointer + 1) % 2 == 0;
-    pointer++;
-    if (*pointer) {
-        /* Return pointer that is off by one */
-        pointer++;
-    }
-    return (void *)pointer;
-}
-
-void zng_cfree_unaligned(void *opaque, void *ptr) {
-    uint8_t *pointer = (uint8_t *)ptr;
-    Z_UNUSED(opaque);
-    pointer--;
-    /* Get whether or not our original memory pointer was aligned */
-    if (*pointer) {
-        /* Return original aligned pointer to free() */
-        pointer--;
-    }
-    free(pointer);
-}
-
-TEST(zalloc, aligned_64) {
-    void *return_ptr = zng_alloc_aligned(zng_calloc_unaligned, 0, 1, 100, 64);
-    ASSERT_TRUE(return_ptr != NULL);
-    EXPECT_EQ((intptr_t)return_ptr % 64, 0);
-    zng_free_aligned(zng_cfree_unaligned, 0, return_ptr);
-}

crates/libz-sys/src/zlib-ng/test/test_compare256.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_compare256.cc b/crates/libz-sys/src/zlib-ng/test/test_compare256.cc
deleted file mode 100644
index 7c4dab9..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_compare256.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/* test_compare256.cc -- compare256 unit tests
- * Copyright (C) 2022 Nathan Moinvaziri
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#include <gtest/gtest.h>
-
-#define MAX_COMPARE_SIZE (256)
-
-/* Ensure that compare256 returns the correct match length */
-static inline void compare256_match_check(compare256_func compare256) {
-    int32_t match_len, i;
-    uint8_t *str1;
-    uint8_t *str2;
-
-    str1 = (uint8_t *)zng_alloc(MAX_COMPARE_SIZE);
-    ASSERT_TRUE(str1 != NULL);
-    memset(str1, 'a', MAX_COMPARE_SIZE);
-
-    str2 = (uint8_t *)zng_alloc(MAX_COMPARE_SIZE);
-    ASSERT_TRUE(str2 != NULL);
-    memset(str2, 'a', MAX_COMPARE_SIZE);
-
-    for (i = 0; i <= MAX_COMPARE_SIZE; i++) {
-        if (i < MAX_COMPARE_SIZE)
-            str2[i] = 0;
-
-        match_len = compare256(str1, str2);
-        EXPECT_EQ(match_len, i);
-
-        if (i < MAX_COMPARE_SIZE)
-            str2[i] = 'a';
-    }
-
-    zng_free(str1);
-    zng_free(str2);
-}
-
-#define TEST_COMPARE256(name, func, support_flag) \
-    TEST(compare256, name) { \
-        if (!support_flag) { \
-            GTEST_SKIP(); \
-            return; \
-        } \
-        compare256_match_check(func); \
-    }
-
-TEST_COMPARE256(c, compare256_c, 1)
-
-#ifdef UNALIGNED_OK
-TEST_COMPARE256(unaligned_16, compare256_unaligned_16, 1)
-#ifdef HAVE_BUILTIN_CTZ
-TEST_COMPARE256(unaligned_32, compare256_unaligned_32, 1)
-#endif
-#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
-TEST_COMPARE256(unaligned_64, compare256_unaligned_64, 1)
-#endif
-#endif
-#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
-TEST_COMPARE256(sse2, compare256_sse2, x86_cpu_has_sse2)
-#endif
-#if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
-TEST_COMPARE256(avx2, compare256_avx2, x86_cpu_has_avx2)
-#endif
-#if defined(ARM_NEON) && defined(HAVE_BUILTIN_CTZLL)
-TEST_COMPARE256(neon, compare256_neon, arm_cpu_has_neon)
-#endif
-#ifdef POWER9
-TEST_COMPARE256(power9, compare256_power9, power_cpu_has_arch_3_00)
-#endif

crates/libz-sys/src/zlib-ng/test/test_compress.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_compress.cc b/crates/libz-sys/src/zlib-ng/test/test_compress.cc
deleted file mode 100644
index 9885b33..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_compress.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* test_compress.cc - Test compress() and uncompress() using hello world string */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(compress, basic) {
-    uint8_t compr[128], uncompr[128];
-    z_size_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    int err;
-
-    err = PREFIX(compress)(compr, &compr_len, (const unsigned char *)hello, hello_len);
-    EXPECT_EQ(err, Z_OK);
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = PREFIX(uncompress)(uncompr, &uncompr_len, compr, compr_len);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_STREQ((char *)uncompr, (char *)hello);
-}

crates/libz-sys/src/zlib-ng/test/test_compress_bound.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_compress_bound.cc b/crates/libz-sys/src/zlib-ng/test/test_compress_bound.cc
deleted file mode 100644
index 2757fb2..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_compress_bound.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/* test_compress_bound.cc - Test compressBound() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-#define MAX_LENGTH (32)
-
-class compress_bound_variant : public testing::TestWithParam<z_size_t> {
-public:
-    void estimate(z_size_t level) {
-        z_size_t estimate_len = 0;
-        uint8_t *uncompressed = NULL;
-        uint8_t dest[128];
-        int err;
-
-        uncompressed = (uint8_t *)malloc(MAX_LENGTH);
-        ASSERT_TRUE(uncompressed != NULL);
-
-        /* buffer with values for worst case compression */
-        for (int32_t j = 0; j < MAX_LENGTH; j++) {
-            uncompressed[j] = (uint8_t)j;
-        }
-
-        for (z_size_t i = 0; i < MAX_LENGTH; i++) {
-            z_size_t dest_len = sizeof(dest);
-
-            /* calculate actual output length */
-            estimate_len = PREFIX(compressBound)(i);
-
-            err = PREFIX(compress2)(dest, &dest_len, uncompressed, i, level);
-            EXPECT_EQ(err, Z_OK);
-            EXPECT_GE(estimate_len, dest_len) <<
-                "level: " << level << "\n" <<
-                "length: " << i;
-        }
-
-        free(uncompressed);
-    }
-};
-
-TEST_P(compress_bound_variant, estimate) {
-    estimate(GetParam());
-}
-
-INSTANTIATE_TEST_SUITE_P(compress_bound, compress_bound_variant,
-    testing::Values(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));

crates/libz-sys/src/zlib-ng/test/test_crc32.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_crc32.cc b/crates/libz-sys/src/zlib-ng/test/test_crc32.cc
deleted file mode 100644
index 1d839d7..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_crc32.cc
+++ /dev/null
@@ -1,219 +0,0 @@
-/* test_crc32.cc -- crc32 unit test
- * Copyright (C) 2019-2021 IBM Corporation
- * Authors: Rogerio Alves    <rogealve@br.ibm.com>
- *          Matheus Castanho <msc@linux.ibm.com>
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-extern "C" {
-#  include "zbuild.h"
-#  include "zutil_p.h"
-#  include "cpu_features.h"
-}
-
-#include <gtest/gtest.h>
-
-typedef struct {
-    unsigned long crc;
-    const uint8_t *buf;
-    size_t len;
-    unsigned long expect;
-} crc32_test;
-
-static const crc32_test tests[] = {
-  {0x0, (const uint8_t *)0x0, 0, 0x0},
-  {0xffffffff, (const uint8_t *)0x0, 0, 0x0},
-  {0x0, (const uint8_t *)0x0, 255, 0x0}, /*  BZ 174799.  */
-  {0x0, (const uint8_t *)0x0, 256, 0x0},
-  {0x0, (const uint8_t *)0x0, 257, 0x0},
-  {0x0, (const uint8_t *)0x0, 32767, 0x0},
-  {0x0, (const uint8_t *)0x0, 32768, 0x0},
-  {0x0, (const uint8_t *)0x0, 32769, 0x0},
-  {0x0, (const uint8_t *)"", 0, 0x0},
-  {0xffffffff, (const uint8_t *)"", 0, 0xffffffff},
-  {0x0, (const uint8_t *)"abacus", 6, 0xc3d7115b},
-  {0x0, (const uint8_t *)"backlog", 7, 0x269205},
-  {0x0, (const uint8_t *)"campfire", 8, 0x22a515f8},
-  {0x0, (const uint8_t *)"delta", 5, 0x9643fed9},
-  {0x0, (const uint8_t *)"executable", 10, 0xd68eda01},
-  {0x0, (const uint8_t *)"file", 4, 0x8c9f3610},
-  {0x0, (const uint8_t *)"greatest", 8, 0xc1abd6cd},
-  {0x0, (const uint8_t *)"hello", 5, 0x3610a686},
-  {0x0, (const uint8_t *)"inverter", 8, 0xc9e962c9},
-  {0x0, (const uint8_t *)"jigsaw", 6, 0xce4e3f69},
-  {0x0, (const uint8_t *)"karate", 6, 0x890be0e2},
-  {0x0, (const uint8_t *)"landscape", 9, 0xc4e0330b},
-  {0x0, (const uint8_t *)"machine", 7, 0x1505df84},
-  {0x0, (const uint8_t *)"nanometer", 9, 0xd4e19f39},
-  {0x0, (const uint8_t *)"oblivion", 8, 0xdae9de77},
-  {0x0, (const uint8_t *)"panama", 6, 0x66b8979c},
-  {0x0, (const uint8_t *)"quest", 5, 0x4317f817},
-  {0x0, (const uint8_t *)"resource", 8, 0xbc91f416},
-  {0x0, (const uint8_t *)"secret", 6, 0x5ca2e8e5},
-  {0x0, (const uint8_t *)"test", 4, 0xd87f7e0c},
-  {0x0, (const uint8_t *)"ultimate", 8, 0x3fc79b0b},
-  {0x0, (const uint8_t *)"vector", 6, 0x1b6e485b},
-  {0x0, (const uint8_t *)"walrus", 6, 0xbe769b97},
-  {0x0, (const uint8_t *)"xeno", 4, 0xe7a06444},
-  {0x0, (const uint8_t *)"yelling", 7, 0xfe3944e5},
-  {0x0, (const uint8_t *)"zlib", 4, 0x73887d3a},
-  {0x0, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0xd487a5a1},
-  {0x0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0x61a0132e},
-  {0x0, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdf02f76},
-  {0x0, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x579b2b0a},
-  {0x0, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xf7d16e2d},
-  {0x0, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0x731788f5},
-  {0x0, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0x7112bb11},
-  {0x0, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xf32a0dac},
-  {0x0, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0x625437bb},
-  {0x0, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0x896930f9},
-  {0x0, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0x8579a37},
-  {0x0, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0x632aa8e0},
-  {0x0, (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0xc829af29},
-  {0x0, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x1b08b7e8},
-  {0x0, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x4e33b192},
-  {0x0, (const uint8_t *)"70684206568419061514", 20, 0x59a179f0},
-  {0x0, (const uint8_t *)"42015093765128581010", 20, 0xcd1013d7},
-  {0x0, (const uint8_t *)"88214814356148806939", 20, 0xab927546},
-  {0x0, (const uint8_t *)"43472694284527343838", 20, 0x11f3b20c},
-  {0x0, (const uint8_t *)"49769333513942933689", 20, 0xd562d4ca},
-  {0x0, (const uint8_t *)"54979784887993251199", 20, 0x233395f7},
-  {0x0, (const uint8_t *)"58360544869206793220", 20, 0x2d167fd5},
-  {0x0, (const uint8_t *)"27347953487840714234", 20, 0x8b5108ba},
-  {0x0, (const uint8_t *)"07650690295365319082", 20, 0xc46b3cd8},
-  {0x0, (const uint8_t *)"42655507906821911703", 20, 0xc10b2662},
-  {0x0, (const uint8_t *)"29977409200786225655", 20, 0xc9a0f9d2},
-  {0x0, (const uint8_t *)"85181542907229116674", 20, 0x9341357b},
-  {0x0, (const uint8_t *)"87963594337989416799", 20, 0xf0424937},
-  {0x0, (const uint8_t *)"21395988329504168551", 20, 0xd7c4c31f},
-  {0x0, (const uint8_t *)"51991013580943379423", 20, 0xf11edcc4},
-  {0x0, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x40795df4},
-  {0x0, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0xdd61a631},
-  {0x0, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xca907a99},
-  {0x0, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0xf652deac},
-  {0x0, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0xaf39a5a9},
-  {0x0, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x6bebb4cf},
-  {0x0, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0x76430bac},
-  {0x0, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x6c80c388},
-  {0x0, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xd54d977d},
-  {0x0, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0xe3966ad5},
-  {0x0, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xe7c71db9},
-  {0x0, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xeaa52777},
-  {0x0, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xcd472048},
-  {0x7a30360d, (const uint8_t *)"abacus", 6, 0xf8655a84},
-  {0x6fd767ee, (const uint8_t *)"backlog", 7, 0x1ed834b1},
-  {0xefeb7589, (const uint8_t *)"campfire", 8, 0x686cfca},
-  {0x61cf7e6b, (const uint8_t *)"delta", 5, 0x1554e4b1},
-  {0xdc712e2,  (const uint8_t *)"executable", 10, 0x761b4254},
-  {0xad23c7fd, (const uint8_t *)"file", 4, 0x7abdd09b},
-  {0x85cb2317, (const uint8_t *)"greatest", 8, 0x4ba91c6b},
-  {0x9eed31b0, (const uint8_t *)"inverter", 8, 0xd5e78ba5},
-  {0xb94f34ca, (const uint8_t *)"jigsaw", 6, 0x23649109},
-  {0xab058a2,  (const uint8_t *)"karate", 6, 0xc5591f41},
-  {0x5bff2b7a, (const uint8_t *)"landscape", 9, 0xf10eb644},
-  {0x605c9a5f, (const uint8_t *)"machine", 7, 0xbaa0a636},
-  {0x51bdeea5, (const uint8_t *)"nanometer", 9, 0x6af89afb},
-  {0x85c21c79, (const uint8_t *)"oblivion", 8, 0xecae222b},
-  {0x97216f56, (const uint8_t *)"panama", 6, 0x47dffac4},
-  {0x18444af2, (const uint8_t *)"quest", 5, 0x70c2fe36},
-  {0xbe6ce359, (const uint8_t *)"resource", 8, 0x1471d925},
-  {0x843071f1, (const uint8_t *)"secret", 6, 0x50c9a0db},
-  {0xf2480c60, (const uint8_t *)"ultimate", 8, 0xf973daf8},
-  {0x2d2feb3d, (const uint8_t *)"vector", 6, 0x344ac03d},
-  {0x7490310a, (const uint8_t *)"walrus", 6, 0x6d1408ef},
-  {0x97d247d4, (const uint8_t *)"xeno", 4, 0xe62670b5},
-  {0x93cf7599, (const uint8_t *)"yelling", 7, 0x1b36da38},
-  {0x73c84278, (const uint8_t *)"zlib", 4, 0x6432d127},
-  {0x228a87d1, (const uint8_t *)"4BJD7PocN1VqX0jXVpWB", 20, 0x997107d0},
-  {0xa7a048d0, (const uint8_t *)"F1rPWI7XvDs6nAIRx41l", 20, 0xdc567274},
-  {0x1f0ded40, (const uint8_t *)"ldhKlsVkPFOveXgkGtC2", 20, 0xdcc63870},
-  {0xa804a62f, (const uint8_t *)"5KKnGOOrs8BvJ35iKTOS", 20, 0x6926cffd},
-  {0x508fae6a, (const uint8_t *)"0l1tw7GOcem06Ddu7yn4", 20, 0xb52b38bc},
-  {0xe5adaf4f, (const uint8_t *)"MCr47CjPIn9R1IvE1Tm5", 20, 0xf83b8178},
-  {0x67136a40, (const uint8_t *)"UcixbzPKTIv0SvILHVdO", 20, 0xc5213070},
-  {0xb00c4a10, (const uint8_t *)"dGnAyAhRQDsWw0ESou24", 20, 0xbc7648b0},
-  {0x2e0c84b5, (const uint8_t *)"di0nvmY9UYMYDh0r45XT", 20, 0xd8123a72},
-  {0x81238d44, (const uint8_t *)"2XKDwHfAhFsV0RhbqtvH", 20, 0xd5ac5620},
-  {0xf853aa92, (const uint8_t *)"ZhrANFIiIvRnqClIVyeD", 20, 0xceae099d},
-  {0x5a692325, (const uint8_t *)"v7Q9ehzioTOVeDIZioT1", 20, 0xb07d2b24},
-  {0x3275b9f,  (const uint8_t *)"Yod5hEeKcYqyhfXbhxj2", 20, 0x24ce91df},
-  {0x38371feb, (const uint8_t *)"GehSWY2ay4uUKhehXYb0", 20, 0x707b3b30},
-  {0xafc8bf62, (const uint8_t *)"kwytJmq6UqpflV8Y8GoE", 20, 0x16abc6a9},
-  {0x9b07db73, (const uint8_t *)"70684206568419061514", 20, 0xae1fb7b7},
-  {0xe75b214,  (const uint8_t *)"42015093765128581010", 20, 0xd4eecd2d},
-  {0x72d0fe6f, (const uint8_t *)"88214814356148806939", 20, 0x4660ec7},
-  {0xf857a4b1, (const uint8_t *)"43472694284527343838", 20, 0xfd8afdf7},
-  {0x54b8e14,  (const uint8_t *)"49769333513942933689", 20, 0xc6d1b5f2},
-  {0xd6aa5616, (const uint8_t *)"54979784887993251199", 20, 0x32476461},
-  {0x11e63098, (const uint8_t *)"58360544869206793220", 20, 0xd917cf1a},
-  {0xbe92385,  (const uint8_t *)"27347953487840714234", 20, 0x4ad14a12},
-  {0x49511de0, (const uint8_t *)"07650690295365319082", 20, 0xe37b5c6c},
-  {0x3db13bc1, (const uint8_t *)"42655507906821911703", 20, 0x7cc497f1},
-  {0xbb899bea, (const uint8_t *)"29977409200786225655", 20, 0x99781bb2},
-  {0xf6cd9436, (const uint8_t *)"85181542907229116674", 20, 0x132256a1},
-  {0x9109e6c3, (const uint8_t *)"87963594337989416799", 20, 0xbfdb2c83},
-  {0x75770fc,  (const uint8_t *)"21395988329504168551", 20, 0x8d9d1e81},
-  {0x69b1d19b, (const uint8_t *)"51991013580943379423", 20, 0x7b6d4404},
-  {0xc6132975, (const uint8_t *)"*]+@!);({_$;}[_},?{?;(_?,=-][@", 30, 0x8619f010},
-  {0xd58cb00c, (const uint8_t *)"_@:_).&(#.[:[{[:)$++-($_;@[)}+", 30, 0x15746ac3},
-  {0xb63b8caa, (const uint8_t *)"&[!,[$_==}+.]@!;*(+},[;:)$;)-@", 30, 0xaccf812f},
-  {0x8a45a2b8, (const uint8_t *)"]{.[.+?+[[=;[?}_#&;[=)__$$:+=_", 30, 0x78af45de},
-  {0xcbe95b78, (const uint8_t *)"-%.)=/[@].:.(:,()$;=%@-$?]{%+%", 30, 0x25b06b59},
-  {0x4ef8a54b, (const uint8_t *)"+]#$(@&.=:,*];/.!]%/{:){:@(;)$", 30, 0x4ba0d08f},
-  {0x76ad267a, (const uint8_t *)")-._.:?[&:.=+}(*$/=!.${;(=$@!}", 30, 0xe26b6aac},
-  {0x569e613c, (const uint8_t *)":(_*&%/[[}+,?#$&*+#[([*-/#;%(]", 30, 0x7e2b0a66},
-  {0x36aa61da, (const uint8_t *)"{[#-;:$/{)(+[}#]/{&!%(@)%:@-$:", 30, 0xb3430dc7},
-  {0xf67222df, (const uint8_t *)"_{$*,}(&,@.)):=!/%(&(,,-?$}}}!", 30, 0x626c17a},
-  {0x74b34fd3, (const uint8_t *)"e$98KNzqaV)Y:2X?]77].{gKRD4G5{mHZk,Z)SpU%L3FSgv!Wb8MLAFdi{+fp)c,@8m6v)yXg@]HBDFk?.4&}g5_udE*JHCiH=aL", 100, 0xccf98060},
-  {0x351fd770, (const uint8_t *)"r*Fd}ef+5RJQ;+W=4jTR9)R*p!B;]Ed7tkrLi;88U7g@3v!5pk2X6D)vt,.@N8c]@yyEcKi[vwUu@.Ppm@C6%Mv*3Nw}Y,58_aH)", 100, 0xd8b95312},
-  {0xc45aef77, (const uint8_t *)"h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 100, 0xbb1c9912},
-  {0xc45aef77, (const uint8_t *)
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&"
-    "h{bcmdC+a;t+Cf{6Y_dFq-{X4Yu&7uNfVDh?q&_u.UWJU],-GiH7ADzb7-V.Q%4=+v!$L9W+T=bP]$_:]Vyg}A.ygD.r;h-D]m%&", 600, 0x888AFA5B}
-};
-
-class crc32_variant : public ::testing::TestWithParam<crc32_test> {
-public:
-    void hash(crc32_test param, crc32_func crc32) {
-        uint32_t crc = 0;
-        if (param.buf != NULL) {
-            if (param.len) {
-                crc = crc32(param.crc, param.buf, param.len);
-            } else {
-                crc = param.crc;
-            }
-        }
-        EXPECT_EQ(crc, param.expect);
-    }
-};
-
-INSTANTIATE_TEST_SUITE_P(crc32, crc32_variant, testing::ValuesIn(tests));
-
-#define TEST_CRC32(name, func, support_flag) \
-    TEST_P(crc32_variant, name) { \
-        if (!support_flag) { \
-            GTEST_SKIP(); \
-            return; \
-        } \
-        hash(GetParam(), func); \
-    }
-
-TEST_CRC32(braid, crc32_braid, 1)
-
-#ifdef ARM_ACLE_CRC_HASH
-TEST_CRC32(acle, crc32_acle, arm_cpu_has_crc32)
-#elif defined(POWER8_VSX_CRC32)
-TEST_CRC32(power8, crc32_power8, power_cpu_has_arch_2_07)
-#elif defined(S390_CRC32_VX)
-TEST_CRC32(vx, PREFIX(s390_crc32_vx), PREFIX(s390_cpu_has_vx))
-#elif defined(X86_PCLMULQDQ_CRC)
-TEST_CRC32(pclmulqdq, crc32_pclmulqdq, x86_cpu_has_pclmulqdq)
-#endif

crates/libz-sys/src/zlib-ng/test/test_cve-2003-0107.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_cve-2003-0107.cc b/crates/libz-sys/src/zlib-ng/test/test_cve-2003-0107.cc
deleted file mode 100644
index 9d9e5b0..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_cve-2003-0107.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// https://www.securityfocus.com/archive/1/312869 --- originally by Richard Kettlewell
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <gtest/gtest.h>
-
-#if !defined(_WIN32) && defined(ZLIB_COMPAT)
-TEST(gzip, cve_2003_0107) {
-    gzFile f;
-    int ret;
-
-    f = gzopen("/dev/null", "w");
-    EXPECT_TRUE(f != NULL);
-
-    ret = gzprintf(f, "%10240s", "");
-    printf("gzprintf -> %d\n", ret);
-    ret = gzclose(f);
-    printf("gzclose -> %d [%d]\n", ret, errno);
-}
-#endif

crates/libz-sys/src/zlib-ng/test/test_deflate_bound.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_bound.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_bound.cc
deleted file mode 100644
index 27020c6..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_bound.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/* test_deflate_bound.cc - Test deflateBound() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-#define MAX_LENGTH (32)
-
-typedef struct {
-    int32_t level;
-    int32_t window_size;
-    int32_t mem_level;
-} deflate_bound_test;
-
-static const deflate_bound_test tests[] = {
-    {0, MAX_WBITS + 16, 1},
-    {Z_BEST_SPEED, MAX_WBITS, MAX_MEM_LEVEL},
-    {Z_BEST_COMPRESSION, MAX_WBITS, MAX_MEM_LEVEL}
-};
-
-class deflate_bound_variant : public testing::TestWithParam<deflate_bound_test> {
-public:
-    void estimate(deflate_bound_test param) {
-        PREFIX3(stream) c_stream;
-        int estimate_len = 0;
-        uint8_t *uncompressed = NULL;
-        uint8_t *out_buf = NULL;
-        int err;
-
-        uncompressed = (uint8_t *)malloc(MAX_LENGTH);
-        ASSERT_TRUE(uncompressed != NULL);
-        memset(uncompressed, 'a', MAX_LENGTH);
-
-        for (int32_t i = 0; i < MAX_LENGTH; i++) {
-            memset(&c_stream, 0, sizeof(c_stream));
-
-            c_stream.avail_in = i;
-            c_stream.next_in = (z_const unsigned char *)uncompressed;
-            c_stream.avail_out = 0;
-            c_stream.next_out = out_buf;
-
-            err = PREFIX(deflateInit2)(&c_stream, param.level, Z_DEFLATED,
-                param.window_size, param.mem_level, Z_DEFAULT_STRATEGY);
-            EXPECT_EQ(err, Z_OK);
-
-            /* calculate actual output length and update structure */
-            estimate_len = PREFIX(deflateBound)(&c_stream, i);
-            out_buf = (uint8_t *)malloc(estimate_len);
-
-            if (out_buf != NULL) {
-                /* update zlib configuration */
-                c_stream.avail_out = estimate_len;
-                c_stream.next_out = out_buf;
-
-                /* do the compression */
-                err = PREFIX(deflate)(&c_stream, Z_FINISH);
-                EXPECT_EQ(err, Z_STREAM_END) <<
-                    "level: " << param.level << "\n" <<
-                    "window_size: " << param.window_size << "\n" <<
-                    "mem_level: " << param.mem_level << "\n" <<
-                    "length: " << i;
-
-                free(out_buf);
-            }
-
-            err = PREFIX(deflateEnd)(&c_stream);
-            EXPECT_EQ(err, Z_OK);
-        }
-
-        free(uncompressed);
-    }
-};
-
-TEST_P(deflate_bound_variant, estimate) {
-    estimate(GetParam());
-}
-
-INSTANTIATE_TEST_SUITE_P(deflate_bound, deflate_bound_variant, testing::ValuesIn(tests));

crates/libz-sys/src/zlib-ng/test/test_deflate_copy.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_copy.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_copy.cc
deleted file mode 100644
index 4adc9be..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_copy.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* test_deflate_copy.cc - Test deflateCopy() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "deflate.h"
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, copy) {
-    PREFIX3(stream) c_stream, c_stream_copy;
-    uint8_t compr[128];
-    z_size_t compr_len = sizeof(compr);
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&c_stream_copy, 0, sizeof(c_stream_copy));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != hello_len && c_stream.total_out < compr_len) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflateCopy)(&c_stream_copy, &c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_EQ(c_stream.state->status, c_stream_copy.state->status);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflateEnd)(&c_stream_copy);
-    EXPECT_EQ(err, Z_OK);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_dict.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_dict.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_dict.cc
deleted file mode 100644
index 7a060a8..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_dict.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* test_deflate_dict.cc - Test deflateGetDictionary() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, dictionary) {
-    PREFIX3(stream) c_stream;
-    uint8_t compr[128];
-    uint32_t compr_len = sizeof(compr);
-    uint8_t *dict_new = NULL;
-    uint32_t *dict_len;
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = compr_len;
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (uint32_t)hello_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    dict_new = (uint8_t *)calloc(256, 1);
-    ASSERT_TRUE(dict_new != NULL);
-    dict_len = (uint32_t *)calloc(4, 1);
-    ASSERT_TRUE(dict_len != NULL);
-
-    err = PREFIX(deflateGetDictionary)(&c_stream, dict_new, dict_len);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    free(dict_new);
-    free(dict_len);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_hash_head_0.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_hash_head_0.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_hash_head_0.cc
deleted file mode 100644
index 4a4e4b6..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_hash_head_0.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Generated by fuzzing - test hash_head == 0 handling. */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, hash_head_0) {
-    PREFIX3(stream) strm;
-    int err;
-
-    memset(&strm, 0, sizeof(strm));
-    err = PREFIX(deflateInit2)(&strm, 1, Z_DEFLATED, -15, 4, Z_HUFFMAN_ONLY);
-    EXPECT_EQ(err, Z_OK);
-
-    unsigned char next_in[9698];
-    memset(next_in, 0x30, sizeof(next_in));
-    next_in[8193] = 0x00;
-    next_in[8194] = 0x00;
-    next_in[8195] = 0x00;
-    next_in[8199] = 0x8a;
-    strm.next_in = next_in;
-    unsigned char next_out[21572];
-    strm.next_out = next_out;
-
-    strm.avail_in = 0;
-    strm.avail_out = 1348;
-    err = PREFIX(deflateParams(&strm, 3, Z_FILTERED));
-    EXPECT_EQ(err, Z_OK);
-
-    strm.avail_in = 6728;
-    strm.avail_out = 2696;
-    err = PREFIX(deflate(&strm, Z_SYNC_FLUSH));
-    EXPECT_EQ(err, Z_OK);
-
-    strm.avail_in = 15;
-    strm.avail_out = 1348;
-    err = PREFIX(deflateParams(&strm, 9, Z_FILTERED));
-    EXPECT_EQ(err, Z_OK);
-
-    strm.avail_in = 1453;
-    strm.avail_out = 1348;
-    err = PREFIX(deflate(&strm, Z_FULL_FLUSH));
-    EXPECT_EQ(err, Z_OK);
-
-    strm.avail_in = (uint32_t)(next_in + sizeof(next_in) - strm.next_in);
-    strm.avail_out = (uint32_t)(next_out + sizeof(next_out) - strm.next_out);
-    err = PREFIX(deflate)(&strm, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    uint32_t compressed_size = (uint32_t)(strm.next_out - next_out);
-
-    err = PREFIX(deflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-
-    memset(&strm, 0, sizeof(strm));
-    err = PREFIX(inflateInit2)(&strm, -15);
-    EXPECT_EQ(err, Z_OK);
-
-    strm.next_in = next_out;
-    strm.avail_in = compressed_size;
-    unsigned char uncompressed[sizeof(next_in)];
-    strm.next_out = uncompressed;
-    strm.avail_out = sizeof(uncompressed);
-
-    err = PREFIX(inflate)(&strm, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(inflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_TRUE(memcmp(uncompressed, next_in, sizeof(uncompressed)) == 0);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_header.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_header.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_header.cc
deleted file mode 100644
index 92f4612..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_header.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* test_deflate_header.cc - Test deflateSetHeader() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, header) {
-    PREFIX3(stream) c_stream;
-    PREFIX(gz_header) *head;
-    uint8_t compr[128];
-    z_size_t compr_len = sizeof(compr);
-    int err;
-
-    head = (PREFIX(gz_header) *)calloc(1, sizeof(PREFIX(gz_header)));
-    ASSERT_TRUE(head != NULL);
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    /* gzip */
-    err = PREFIX(deflateInit2)(&c_stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY);
-    EXPECT_EQ(err, Z_OK);
-
-    head->text = 1;
-    head->comment = (uint8_t *)"comment";
-    head->name = (uint8_t *)"name";
-    head->hcrc = 1;
-    head->extra = (uint8_t *)"extra";
-    head->extra_len = (uint32_t)strlen((const char *)head->extra);
-
-    err = PREFIX(deflateSetHeader)(&c_stream, head);
-    EXPECT_EQ(err, Z_OK);
-
-    PREFIX(deflateBound)(&c_stream, (unsigned long)compr_len);
-
-    c_stream.next_in  = (unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != hello_len && c_stream.total_out < compr_len) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    free(head);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_params.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_params.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_params.cc
deleted file mode 100644
index f5f5066..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_params.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* test_deflate_params.cc - Test deflate() with dynamic change of compression level */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <time.h>
-
-#include "deflate.h"
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-#define COMPR_BUFFER_SIZE (48 * 1024)
-#define UNCOMPR_BUFFER_SIZE (64 * 1024)
-#define UNCOMPR_RAND_SIZE (8 * 1024)
-
-TEST(deflate, params) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t *compr, *uncompr;
-    uint32_t compr_len, uncompr_len;
-    uint32_t diff;
-    int32_t i;
-    time_t now;
-    int err;
-#ifndef ZLIB_COMPAT
-    int level = -1;
-    int strategy = -1;
-    zng_deflate_param_value params[2];
-
-    params[0].param = Z_DEFLATE_LEVEL;
-    params[0].buf = &level;
-    params[0].size = sizeof(level);
-
-    params[1].param = Z_DEFLATE_STRATEGY;
-    params[1].buf = &strategy;
-    params[1].size = sizeof(strategy);
-#endif
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&d_stream, 0, sizeof(d_stream));
-
-    compr = (uint8_t *)calloc(1, COMPR_BUFFER_SIZE);
-    ASSERT_TRUE(compr != NULL);
-    uncompr = (uint8_t *)calloc(1, UNCOMPR_BUFFER_SIZE);
-    ASSERT_TRUE(uncompr != NULL);
-
-    compr_len = COMPR_BUFFER_SIZE;
-    uncompr_len = UNCOMPR_BUFFER_SIZE;
-
-    srand((unsigned)time(&now));
-    for (i = 0; i < UNCOMPR_RAND_SIZE; i++)
-        uncompr[i] = (uint8_t)(rand() % 256);
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_SPEED);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = compr_len;
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = uncompr_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-    EXPECT_EQ(c_stream.avail_in, 0);
-
-    /* Feed in already compressed data and switch to no compression: */
-#ifndef ZLIB_COMPAT
-    zng_deflateGetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-    EXPECT_EQ(level, Z_BEST_SPEED);
-    EXPECT_EQ(strategy, Z_DEFAULT_STRATEGY);
-
-    level = Z_NO_COMPRESSION;
-    strategy = Z_DEFAULT_STRATEGY;
-    zng_deflateSetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-#else
-    PREFIX(deflateParams)(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-#endif
-
-    c_stream.next_in = compr;
-    diff = (unsigned int)(c_stream.next_out - compr);
-    c_stream.avail_in = diff;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-
-    /* Switch back to compressing mode: */
-#ifndef ZLIB_COMPAT
-    level = -1;
-    strategy = -1;
-    zng_deflateGetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-    EXPECT_EQ(level, Z_NO_COMPRESSION);
-    EXPECT_EQ(strategy, Z_DEFAULT_STRATEGY);
-
-    level = Z_BEST_COMPRESSION;
-    strategy = Z_FILTERED;
-    zng_deflateSetParams(&c_stream, params, sizeof(params) / sizeof(params[0]));
-#else
-    PREFIX(deflateParams)(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-#endif
-
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (unsigned int)uncompr_len;
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (unsigned int)compr_len;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    do {
-        d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = uncompr_len;
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-            break;
-        EXPECT_EQ(err, Z_OK);
-    } while (err == Z_OK);
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_EQ(d_stream.total_out, (2 * uncompr_len) + diff);
-
-    free(compr);
-    free(uncompr);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_pending.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_pending.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_pending.cc
deleted file mode 100644
index b107dd4..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_pending.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* test_deflate_pending.cc - Test deflatePending() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, pending) {
-    PREFIX3(stream) c_stream;
-    uint8_t compr[128];
-    z_size_t compr_len = sizeof(compr);
-    int *bits;
-    unsigned *ped;
-    int err;
-
-
-    bits = (int *)calloc(256, 1);
-    ASSERT_TRUE(bits != NULL);
-    ped = (unsigned *)calloc(256, 1);
-    ASSERT_TRUE(ped != NULL);
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != hello_len && c_stream.total_out < compr_len) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflatePending)(&c_stream, ped, bits);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_GE(*bits, 0);
-    EXPECT_LE(*bits, 7);
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    free(bits);
-    free(ped);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_prime.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_prime.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_prime.cc
deleted file mode 100644
index 135a2d4..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_prime.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/* test_deflate_prime.cc - Test deflatePrime() wrapping gzip around deflate stream */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, prime) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t compr[128], uncompr[128];
-    z_size_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    uint32_t crc = 0;
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&d_stream, 0, sizeof(d_stream));
-
-    /* Raw deflate windowBits is -15 */
-    err = PREFIX(deflateInit2)(&c_stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
-    EXPECT_EQ(err, Z_OK);
-
-    /* Gzip magic number */
-    err = PREFIX(deflatePrime)(&c_stream, 16, 0x8b1f);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip compression method (deflate) */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 0x08);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip flags (one byte, using two odd bit calls) */
-    err = PREFIX(deflatePrime)(&c_stream, 3, 0x0);
-    EXPECT_EQ(err, Z_OK);
-    err = PREFIX(deflatePrime)(&c_stream, 5, 0x0);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip modified time */
-    err = PREFIX(deflatePrime)(&c_stream, 32, 0x0);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip extra flags */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 0x0);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip operating system */
-    err = PREFIX(deflatePrime)(&c_stream, 8, 255);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (uint32_t)hello_len;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uint32_t)compr_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    /* Gzip uncompressed data crc32 */
-    crc = PREFIX(crc32)(0, (const uint8_t *)hello, (uint32_t)hello_len);
-    err = PREFIX(deflatePrime)(&c_stream, 32, crc);
-    EXPECT_EQ(err, Z_OK);
-    /* Gzip uncompressed data length */
-    err = PREFIX(deflatePrime)(&c_stream, 32, (uint32_t)hello_len);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uint32_t)c_stream.total_out;
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uint32_t)uncompr_len;
-    d_stream.total_in = 0;
-    d_stream.total_out = 0;
-
-    /* Inflate with gzip header */
-    err = PREFIX(inflateInit2)(&d_stream, MAX_WBITS + 32);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(inflate)(&d_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_BUF_ERROR);
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_STREQ((char *)uncompr, hello);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_quick_bi_valid.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_bi_valid.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_bi_valid.cc
deleted file mode 100644
index 8ce4c22..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_bi_valid.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Generated by fuzzing - test bi_valid handling in deflate_quick(). */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate_quick, bi_valid) {
-    PREFIX3(stream) strm;
-    int err;
-
-    memset(&strm, 0, sizeof(strm));
-
-    err = PREFIX(deflateInit2)(&strm, 1, Z_DEFLATED, 31, 1, Z_FILTERED);
-    EXPECT_EQ(err, Z_OK);
-
-    z_const unsigned char next_in[554] = {
-        0x8d, 0xff, 0xff, 0xff, 0xa2, 0x00, 0x00, 0xff, 0x00, 0x15, 0x1b, 0x1b, 0xa2, 0xa2, 0xaf, 0xa2,
-        0xa2, 0x00, 0x00, 0x00, 0x02, 0x00, 0x1b, 0x3f, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0b,
-        0x00, 0xab, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x2b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x01, 0x1e, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x07, 0x01, 0x18, 0x00, 0x22, 0x00,
-        0x00, 0x00, 0xfd, 0x39, 0xff, 0x00, 0x00, 0x00, 0x1b, 0xfd, 0x3b, 0x00, 0x68, 0x00, 0x00, 0x01,
-        0xff, 0xff, 0xff, 0x57, 0xf8, 0x1e, 0x00, 0x00, 0xf2, 0xf2, 0xf2, 0xf2, 0xfa, 0xff, 0xff, 0xff,
-        0xff, 0x7e, 0x00, 0x00, 0x4a, 0x00, 0xc5, 0x00, 0x41, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-        0x00, 0x02, 0x01, 0x01, 0x00, 0xa2, 0x08, 0x00, 0x00, 0x00, 0x00, 0x27, 0x4a, 0x4a, 0x4a, 0x32,
-        0x00, 0xf9, 0xff, 0x00, 0x02, 0x9a, 0xff, 0x00, 0x00, 0x3f, 0x50, 0x00, 0x03, 0x00, 0x00, 0x00,
-        0x3d, 0x00, 0x08, 0x2f, 0x20, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x7a, 0x7a, 0x9e, 0xff, 0xff, 0x00, 0x1b, 0x1b, 0x04, 0x00, 0x1b, 0x1b,
-        0x1b, 0x1b, 0x00, 0x00, 0x00, 0xaf, 0xad, 0xaf, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x2e, 0xff,
-        0xff, 0x2e, 0xc1, 0x00, 0x10, 0x00, 0x00, 0x00, 0x06, 0x70, 0x00, 0x00, 0x00, 0xda, 0x67, 0x01,
-        0x47, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x00, 0x3f,
-        0x54, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x34, 0x3e, 0xc5, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x00, 0x0a, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x7a, 0x7a, 0x7a, 0x7a, 0x7a, 0x00, 0x00, 0x00, 0x40, 0x1b, 0x1b, 0x88, 0x1b, 0x1b,
-        0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1f, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
-        0x00, 0x04, 0x00, 0x00, 0x50, 0x3e, 0x7a, 0x7a, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x08, 0x87, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x01, 0x00, 0xff, 0x3d, 0x00, 0x11, 0x4d, 0x00, 0x00, 0x01, 0xd4, 0xd4, 0xd4, 0xd4, 0x2d, 0xd4,
-        0xd4, 0xff, 0xff, 0xff, 0xfa, 0x01, 0xd4, 0x00, 0xd4, 0x00, 0x00, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4,
-        0xd4, 0x1e, 0x1e, 0x1e, 0x1e, 0x00, 0x00, 0xfe, 0xf9, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x00,
-        0x16, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00,
-        0xff, 0x2b, 0x2b, 0x2b, 0x2b, 0x35, 0xd4, 0xd4, 0x47, 0x3f, 0xd4, 0xd4, 0xd6, 0xd4, 0xd4, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x32, 0x4a, 0x4a, 0x4a, 0x4a, 0x71, 0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b,
-        0x1f, 0x1b, 0x1b, 0x1b, 0x57, 0x57, 0x57, 0x57, 0x00, 0x00, 0x1b, 0x08, 0x2b, 0x16, 0xc3, 0x00,
-        0x00, 0x00, 0x29, 0x30, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x07, 0x00, 0x00, 0x01, 0x0b, 0xff,
-        0xff, 0xf5, 0xf5, 0xf5, 0x00, 0x00, 0xfe, 0xfa, 0x0f, 0x0f, 0x08, 0x00, 0xff, 0x00, 0x53, 0x3f,
-        0x00, 0x04, 0x5d, 0xa8, 0x2e, 0xff, 0xff, 0x00, 0x2f, 0x2f, 0x05, 0xff, 0xff, 0xff, 0x2f, 0x2f,
-        0x2f, 0x0a, 0x0a, 0x0a, 0x0a, 0x30, 0xff, 0xff, 0xff, 0xf0, 0x0a, 0x0a, 0x0a, 0x00, 0xff, 0x3f,
-        0x4f, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x71, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x71, 0x71, 0x00, 0x71, 0x71, 0x71, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
-        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x3f, 0x00, 0xfa, 0x71, 0x71, 0x71, 0x00, 0x00,
-        0x00, 0x01, 0x00, 0x00, 0x00, 0x71, 0x71, 0x71, 0x71, 0x71};
-    strm.next_in = next_in;
-    unsigned char next_out[1236];
-    strm.next_out = next_out;
-
-    strm.avail_in = 554;
-    strm.avail_out = 31;
-
-    err = PREFIX(deflate)(&strm, Z_FINISH);
-    EXPECT_EQ(err, Z_OK);
-
-    strm.avail_in = 0;
-    strm.avail_out = 498;
-    err = PREFIX(deflate)(&strm, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(deflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_quick_block_open.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_block_open.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_block_open.cc
deleted file mode 100644
index b8703ae..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_quick_block_open.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Generated by fuzzing - test block_open handling in deflate_quick(). */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate_quick, block_open) {
-    PREFIX3(stream) strm;
-    int err;
-
-    memset(&strm, 0, sizeof(strm));
-    err = PREFIX(deflateInit2)(&strm, 1, Z_DEFLATED, -15, 1, Z_FILTERED);
-    EXPECT_EQ(err, Z_OK);
-
-    z_const unsigned char next_in[495] =
-            "\x1d\x1d\x00\x00\x00\x4a\x4a\x4a\xaf\xaf\xaf\xaf\x4a\x4a\x4a\x4a"
-            "\x3f\x3e\xaf\xff\xff\xff\x11\xff\xff\xff\xff\xdf\x00\x00\x00\x01"
-            "\x3f\x7d\x00\x50\x00\x00\xc8\x01\x2b\x60\xc8\x00\x24\x06\xff\xff"
-            "\x4a\x4e\x4a\x7d\xc8\x01\xf1\x2b\x28\xb2\xb2\x60\x25\xc8\x06\x00"
-            "\x00\x00\x31\x00\x01\xb2\xb2\xb2\xff\xff\xfd\xb2\xb2\x40\xff\x7d"
-            "\x3b\x34\x3e\xff\xff\x4a\x4a\x01\xf1\xff\x02\xff\x3f\xff\x02\xff"
-            "\xff\xff\xbf\x0a\xff\x00\x01\x3f\xb3\xff\x26\x00\x00\x13\x00\xc8"
-            "\x3e\x3e\x3e\x4a\x76\x4a\x4a\x2e\x7d\x3e\x3e\x3e\x3e\x1d\x1d\x1d"
-            "\xfe\xea\xef\x80\x01\x00\x00\x40\x00\x00\xba\x00\x06\xfa\xb9\x11"
-            "\xbf\x98\xee\x45\x7e\x04\x00\xff\xff\xff\x67\xc3\xc3\xc3\xc3\x00"
-            "\x1d\x1d\xe1\xe3\x00\xc3\x1d\x98\x1d\x1d\x1d\x1d\x1d\x00\x00\x00"
-            "\x02\x00\x00\x00\xe8\x00\x00\x1d\x1d\x1d\xfa\x1e\x12\xff\xff\xff"
-            "\x00\x01\xa7\xff\xff\xff\x1d\x1d\x1d\x63\xff\xff\xff\x1f\x00\x00"
-            "\x10\x40\x00\x00\xad\xff\xff\x3f\x51\x00\xf8\xff\xff\x8a\x01\x05"
-            "\x00\x00\x03\x00\x00\xff\x00\x00\x00\x05\x40\x1f\x08\x0a\x00\xff"
-            "\xff\x01\x00\x12\x00\x00\x01\x00\x3f\x40\x1d\x1d\x1d\x1d\x1d\x1d"
-            "\x21\x00\x1d\x00\x00\x00\xe4\x00\x00\x00\x07\x00\x00\xe6\xe6\x34"
-            "\xe6\xe6\xe6\xe6\xff\x2b\xee\x1d\x1d\x1d\x93\x1d\x1d\x1d\xee\x2b"
-            "\xee\x01\x81\x1d\x00\x00\x58\x00\x00\x01\x14\x00\x1b\x00\x00\x2c"
-            "\x00\x00\x00\xdb\x00\x45\x7e\x00\x00\x00\xfb\xbd\x00\x06\x21\xd3"
-            "\x00\xff\xff\xff\xff\xff\x00\x49\x49\xc9\x49\x3d\x00\x34\x01\x00"
-            "\x00\x6a\x2b\x00\x00\x50\x40\xf0\xf0\xf0\xf0\xa3\xa3\xa3\xa3\xf0"
-            "\xf0\x06\xfa\xa9\x01\x10\xbf\x98\x9d\x2b\xee\x2d\x21\x01\xdb\x00"
-            "\x45\x10\x00\x00\x7e\x00\x00\xe7\x00\xff\xff\x00\xf6\x00\x00\x00"
-            "\xf9\x00\x00\x00\x11\x00\x00\x00\xe2\x00\x00\x00\x2d\x00\x00\x00"
-            "\x2f\x00\x3f\x54\x1d\x1d\x1d\x4c\x4c\x4c\x4c\x2a\x4c\x4c\x10\xff"
-            "\xff\x1a\x00\x00\x01\xff\x00\xff\xf9\x00\x3f\x53\xcc\xcc\xcc\xcc"
-            "\x6e\x00\x00\x01\xf8\xff\xff\xff\x49\x04\x2c\x01\x00\x1d\x00\x07"
-            "\x01\xff\x00\x00\x00\xf8\xff\x09\x00\x27\x00\x08\x21\x1c\x00\x00"
-            "\x00\x00\x1d\x05\x00\x00\x00\x2c\x53\x3f\x00\x01\x00\x00\xe6\xff"
-            "\xff\xff\x6a\x2b\xee\xe6\x6a\x2b\xee\x2b\xee\xee\x2b\xee";
-    strm.next_in = next_in;
-    unsigned char next_out[1116];
-    strm.next_out = next_out;
-
-    strm.avail_in = sizeof(next_in);
-    while (1) {
-        strm.avail_out = (uint32_t)(next_out + sizeof(next_out) - strm.next_out);
-        if (strm.avail_out > 38)
-            strm.avail_out = 38;
-        err = PREFIX(deflate)(&strm, Z_FINISH);
-        if (err == Z_STREAM_END)
-            break;
-        EXPECT_EQ(err, Z_OK);
-    }
-    uint32_t compressed_size = (uint32_t)(strm.next_out - next_out);
-
-    err = PREFIX(deflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-
-    memset(&strm, 0, sizeof(strm));
-    err = PREFIX(inflateInit2)(&strm, -15);
-    EXPECT_EQ(err, Z_OK);
-
-    strm.next_in = next_out;
-    strm.avail_in = compressed_size;
-    unsigned char uncompressed[sizeof(next_in)];
-    strm.next_out = uncompressed;
-    strm.avail_out = sizeof(uncompressed);
-
-    err = PREFIX(inflate)(&strm, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(inflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_TRUE(memcmp(uncompressed, next_in, sizeof(uncompressed)) == 0);
-}

crates/libz-sys/src/zlib-ng/test/test_deflate_tune.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_deflate_tune.cc b/crates/libz-sys/src/zlib-ng/test/test_deflate_tune.cc
deleted file mode 100644
index 9921ee6..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_deflate_tune.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* test_deflate_tune.cc - Test deflateTune() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, tune) {
-    PREFIX3(stream) c_stream;
-    uint8_t compr[128];
-    z_size_t compr_len = sizeof(compr);
-    int err;
-    int good_length = 3;
-    int max_lazy = 5;
-    int nice_length = 18;
-    int max_chain = 6;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflateTune)(&c_stream, good_length, max_lazy,nice_length, max_chain);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != hello_len && c_stream.total_out < compr_len) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-}

crates/libz-sys/src/zlib-ng/test/test_dict.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_dict.cc b/crates/libz-sys/src/zlib-ng/test/test_dict.cc
deleted file mode 100644
index af9662e..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_dict.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/* test_dict.cc - Test deflate() and inflate() with preset dictionary */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-/* Maximum dictionary size, according to inflateGetDictionary() description. */
-#define MAX_DICTIONARY_SIZE 32768
-
-static const char dictionary[] = "hello";
-
-TEST(dictionary, basic) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t compr[128], uncompr[128];
-    z_size_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    uint32_t dict_adler = 0;
-    uint8_t check_dict[MAX_DICTIONARY_SIZE];
-    uint32_t check_dict_len = 0;
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&d_stream, 0, sizeof(d_stream));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_BEST_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(deflateSetDictionary)(&c_stream,
-        (const unsigned char *)dictionary, (int)sizeof(dictionary));
-    EXPECT_EQ(err, Z_OK);
-
-    dict_adler = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uint32_t)compr_len;
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (uint32_t)hello_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    strcpy((char*)uncompr, "garbage garbage garbage");
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (unsigned int)compr_len;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (unsigned int)uncompr_len;
-
-    for (;;) {
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END)
-            break;
-        if (err == Z_NEED_DICT) {
-            EXPECT_EQ(d_stream.adler, dict_adler);
-            err = PREFIX(inflateSetDictionary)(&d_stream, (const unsigned char*)dictionary,
-                (uint32_t)sizeof(dictionary));
-            EXPECT_EQ(d_stream.adler, dict_adler);
-        }
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(inflateGetDictionary)(&d_stream, NULL, &check_dict_len);
-    EXPECT_EQ(err, Z_OK);
-#ifndef S390_DFLTCC_INFLATE
-    EXPECT_GE(check_dict_len, sizeof(dictionary));
-#endif
-
-    err = PREFIX(inflateGetDictionary)(&d_stream, check_dict, &check_dict_len);
-    EXPECT_EQ(err, Z_OK);
-#ifndef S390_DFLTCC_INFLATE
-    EXPECT_TRUE(memcmp(dictionary, check_dict, sizeof(dictionary)) == 0);
-#endif
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_TRUE(strncmp((char*)uncompr, hello, sizeof(hello)) == 0);
-}

crates/libz-sys/src/zlib-ng/test/test_gzio.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_gzio.cc b/crates/libz-sys/src/zlib-ng/test/test_gzio.cc
deleted file mode 100644
index 46baa02..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_gzio.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/* test_gzio.cc - Test read/write of .gz files */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-#define TESTFILE "foo.gz"
-
-TEST(gzip, readwrite) {
-#ifdef NO_GZCOMPRESS
-    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
-    GTEST_SKIP();
-#else
-    uint8_t compr[128], uncompr[128];
-    uint32_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    size_t read;
-    int64_t pos;
-    gzFile file;
-    int err;
-
-    /* Write gz file with test data */
-    file = PREFIX(gzopen)(TESTFILE, "wb");
-    ASSERT_TRUE(file != NULL);
-    /* Write hello, hello! using gzputs and gzprintf */
-    PREFIX(gzputc)(file, 'h');
-    EXPECT_EQ(PREFIX(gzputs)(file, "ello"), 4);
-    EXPECT_EQ(PREFIX(gzprintf)(file, ", %s!", "hello"), 8);
-    /* Write string null-teriminator using gzseek */
-    EXPECT_GE(PREFIX(gzseek)(file, 1L, SEEK_CUR), 0);
-    /* Write hello, hello! using gzfwrite using best compression level */
-    EXPECT_EQ(PREFIX(gzsetparams)(file, Z_BEST_COMPRESSION, Z_DEFAULT_STRATEGY), Z_OK);
-    EXPECT_NE(PREFIX(gzfwrite)(hello, hello_len, 1, file), 0);
-    /* Flush compressed bytes to file */
-    EXPECT_EQ(PREFIX(gzflush)(file, Z_SYNC_FLUSH), Z_OK);
-    compr_len = (uint32_t)PREFIX(gzoffset)(file);
-    EXPECT_GE(compr_len, 0UL);
-    PREFIX(gzclose)(file);
-
-    /* Open gz file we previously wrote */
-    file = PREFIX(gzopen)(TESTFILE, "rb");
-    ASSERT_TRUE(file != NULL);
-
-    /* Read uncompressed data - hello, hello! string twice */
-    strcpy((char*)uncompr, "garbages");
-    EXPECT_EQ(PREFIX(gzread)(file, uncompr, (unsigned)uncompr_len), (int)(hello_len + hello_len));
-    EXPECT_STREQ((char*)uncompr, hello);
-
-    /* Check position at the end of the gz file */
-    EXPECT_EQ(PREFIX(gzeof)(file), 1);
-
-    /* Seek backwards mid-string and check char reading with gzgetc and gzungetc */
-    pos = PREFIX(gzseek)(file, -22L, SEEK_CUR);
-    EXPECT_EQ(pos, 6);
-    EXPECT_EQ(PREFIX(gztell)(file), pos);
-    EXPECT_EQ(PREFIX(gzgetc)(file), ' ');
-    EXPECT_EQ(PREFIX(gzungetc)(' ', file), ' ');
-    /* Read first hello, hello! string with gzgets */
-    strcpy((char*)uncompr, "garbages");
-    PREFIX(gzgets)(file, (char*)uncompr, (int)uncompr_len);
-    EXPECT_EQ(strlen((char*)uncompr), 7); /* " hello!" */
-    EXPECT_STREQ((char*)uncompr, hello + 6);
-
-    /* Seek to second hello, hello! string */
-    pos = PREFIX(gzseek)(file, 14L, SEEK_SET);
-    EXPECT_EQ(pos, 14);
-    EXPECT_EQ(PREFIX(gztell)(file), pos);
-
-    /* Check position not at end of file */
-    EXPECT_EQ(PREFIX(gzeof)(file), 0);
-    /* Read first hello, hello! string with gzfread */
-    strcpy((char*)uncompr, "garbages");
-    read = PREFIX(gzfread)(uncompr, uncompr_len, 1, file);
-    EXPECT_STREQ((const char *)uncompr, hello);
-
-    pos = PREFIX(gzoffset)(file);
-    EXPECT_GE(pos, 0);
-    EXPECT_EQ(pos, (compr_len + 10));
-
-    /* Trigger an error and clear it with gzclearerr */
-    PREFIX(gzfread)(uncompr, (size_t)-1, (size_t)-1, file);
-    PREFIX(gzerror)(file, &err);
-    EXPECT_NE(err, 0);
-
-    PREFIX(gzclearerr)(file);
-    PREFIX(gzerror)(file, &err);
-    EXPECT_EQ(err, 0);
-
-    PREFIX(gzclose)(file);
-
-    EXPECT_EQ(PREFIX(gzclose)(NULL), Z_STREAM_ERROR);
-    Z_UNUSED(read);
-#endif
-}

crates/libz-sys/src/zlib-ng/test/test_inflate_adler32.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_inflate_adler32.cc b/crates/libz-sys/src/zlib-ng/test/test_inflate_adler32.cc
deleted file mode 100644
index e17cf6b..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_inflate_adler32.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* GH-1066 - inflate small amount of data and validate with adler32 checksum. */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-const char* original = "The quick brown fox jumped over the lazy dog";
-
-z_const unsigned char compressed[] = {
-    0x78, 0x9c, 0x0b, 0xc9, 0x48, 0x55, 0x28, 0x2c, 0xcd, 0x4c, 0xce, 0x56, 0x48,
-    0x2a, 0xca, 0x2f, 0xcf, 0x53, 0x48, 0xcb, 0xaf, 0x50, 0xc8, 0x2a, 0xcd, 0x2d,
-    0x48, 0x4d, 0x51, 0xc8, 0x2f, 0x4b, 0x2d, 0x52, 0x28, 0xc9, 0x48, 0x55, 0xc8,
-    0x49, 0xac, 0xaa, 0x54, 0x48, 0xc9, 0x4f, 0x07, 0x00, 0x6b, 0x93, 0x10, 0x30
-};
-
-TEST(inflate, adler32) {
-    unsigned char uncompressed[1024];
-    PREFIX3(stream) strm;
-
-    memset(&strm, 0, sizeof(strm));
-
-    int err = PREFIX(inflateInit2)(&strm, 32 + MAX_WBITS);
-    EXPECT_EQ(err, Z_OK);
-
-    strm.next_in = compressed;
-    strm.avail_in = sizeof(compressed);
-    strm.next_out = uncompressed;
-    strm.avail_out = sizeof(uncompressed);
-
-    err = PREFIX(inflate)(&strm, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(inflateEnd)(&strm);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_TRUE(memcmp(uncompressed, original, MIN(strm.total_out, strlen(original))) == 0);
-}

crates/libz-sys/src/zlib-ng/test/test_inflate_sync.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_inflate_sync.cc b/crates/libz-sys/src/zlib-ng/test/test_inflate_sync.cc
deleted file mode 100644
index a79d867..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_inflate_sync.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/* test_inflate_sync.cc - Test inflateSync using full flush deflate and corrupted data */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(inflate, sync) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t compr[128], uncompr[128];
-    z_size_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-
-    /* build compressed stream with full flush */
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (uint32_t)compr_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_FULL_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-
-    /* force an error in first compressed block */
-    compr[3]++;
-    c_stream.avail_in = hello_len-3;
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    compr_len = (z_size_t)c_stream.total_out;
-
-    memset(&d_stream, 0, sizeof(d_stream));
-    /* just read the zlib header */
-    d_stream.next_in = compr;
-    d_stream.avail_in = 2;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uint32_t)uncompr_len;
-
-    err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-
-    /* read all compressed data, but skip damaged part */
-    d_stream.avail_in = (uint32_t)compr_len-2;
-    err = PREFIX(inflateSync)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    err = PREFIX(inflate)(&d_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-}

crates/libz-sys/src/zlib-ng/test/test_large_buffers.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_large_buffers.cc b/crates/libz-sys/src/zlib-ng/test/test_large_buffers.cc
deleted file mode 100644
index 9bf1339..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_large_buffers.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* test_large_buffers.cc - Test deflate() and inflate() with large buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-#define COMPR_BUFFER_SIZE (48 * 1024)
-#define UNCOMPR_BUFFER_SIZE (32 * 1024)
-#define UNCOMPR_RAND_SIZE (8 * 1024)
-
-TEST(deflate, large_buffers) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t *compr, *uncompr;
-    uint32_t compr_len, uncompr_len;
-    int32_t i;
-    time_t now;
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&d_stream, 0, sizeof(d_stream));
-
-    compr = (uint8_t *)calloc(1, COMPR_BUFFER_SIZE);
-    ASSERT_TRUE(compr != NULL);
-    uncompr = (uint8_t *)calloc(1, UNCOMPR_BUFFER_SIZE);
-    ASSERT_TRUE(uncompr != NULL);
-
-    compr_len = COMPR_BUFFER_SIZE;
-    uncompr_len = UNCOMPR_BUFFER_SIZE;
-
-    srand((unsigned)time(&now));
-    for (i = 0; i < UNCOMPR_RAND_SIZE; i++)
-        uncompr[i] = (uint8_t)(rand() % 256);
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = compr_len;
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = uncompr_len;
-
-    err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-    EXPECT_EQ(err, Z_OK);
-    EXPECT_EQ(c_stream.avail_in, 0);
-
-    err = PREFIX(deflate)(&c_stream, Z_FINISH);
-    EXPECT_EQ(err, Z_STREAM_END);
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = compr_len;
-    d_stream.next_out = uncompr;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = uncompr_len;
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_EQ(d_stream.total_out, uncompr_len);
-
-    free(compr);
-    free(uncompr);
-}

crates/libz-sys/src/zlib-ng/test/test_main.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_main.cc b/crates/libz-sys/src/zlib-ng/test/test_main.cc
deleted file mode 100644
index c129db2..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_main.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-/* test_test.cc - Main entry point for test framework */
-
-#include <stdio.h>
-
-#include "gtest/gtest.h"
-
-extern "C" {
-#  include "zbuild.h"
-#  include "cpu_features.h"
-}
-
-GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from %s\n", __FILE__);
-  cpu_check_features();
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
\ No newline at end of file

crates/libz-sys/src/zlib-ng/test/test_shared.h

diff --git a/crates/libz-sys/src/zlib-ng/test/test_shared.h b/crates/libz-sys/src/zlib-ng/test/test_shared.h
deleted file mode 100644
index f942967..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_shared.h
+++ /dev/null
@@ -1,2 +0,0 @@
-static const char hello[] = "hello, hello!";
-static const int hello_len = sizeof(hello);

crates/libz-sys/src/zlib-ng/test/test_small_buffers.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_small_buffers.cc b/crates/libz-sys/src/zlib-ng/test/test_small_buffers.cc
deleted file mode 100644
index bb3449f..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_small_buffers.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* test_small_buffers.cc - Test deflate() and inflate() with small buffers */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(deflate, small_buffers) {
-    PREFIX3(stream) c_stream, d_stream;
-    uint8_t compr[128], uncompr[128];
-    z_size_t compr_len = sizeof(compr), uncompr_len = sizeof(uncompr);
-    int err;
-
-    memset(&c_stream, 0, sizeof(c_stream));
-    memset(&d_stream, 0, sizeof(d_stream));
-
-    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-    EXPECT_EQ(err, Z_OK);
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != hello_len && c_stream.total_out < compr_len) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(deflate)(&c_stream, Z_NO_FLUSH);
-        EXPECT_EQ(err, Z_OK);
-    }
-    /* Finish the stream, still forcing small buffers */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = PREFIX(deflate)(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(deflateEnd)(&c_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.next_in  = compr;
-    d_stream.next_out = uncompr;
-
-    err = PREFIX(inflateInit)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    while (d_stream.total_out < uncompr_len && d_stream.total_in < compr_len) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        EXPECT_EQ(err, Z_OK);
-    }
-
-    err = PREFIX(inflateEnd)(&d_stream);
-    EXPECT_EQ(err, Z_OK);
-
-    EXPECT_STREQ((char*)uncompr, hello);
-}

crates/libz-sys/src/zlib-ng/test/test_version.cc

diff --git a/crates/libz-sys/src/zlib-ng/test/test_version.cc b/crates/libz-sys/src/zlib-ng/test/test_version.cc
deleted file mode 100644
index fda8790..0000000
--- a/crates/libz-sys/src/zlib-ng/test/test_version.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* test_version.cc - Test zVersion() and zlibCompileFlags() */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "test_shared.h"
-
-#include <gtest/gtest.h>
-
-TEST(version, basic) {
-    static const char *my_version = PREFIX2(VERSION);
-
-    EXPECT_EQ(zVersion()[0], my_version[0]);
-    EXPECT_STREQ(zVersion(), PREFIX2(VERSION));
-
-    printf("zlib-ng version %s = 0x%08lx, compile flags = 0x%lx\n",
-            ZLIBNG_VERSION, ZLIBNG_VERNUM, PREFIX(zlibCompileFlags)());
-}

crates/libz-sys/src/zlib-ng/tools/config.sub

diff --git a/crates/libz-sys/src/zlib-ng/tools/config.sub b/crates/libz-sys/src/zlib-ng/tools/config.sub
deleted file mode 100755
index dba175a..0000000
--- a/crates/libz-sys/src/zlib-ng/tools/config.sub
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Canonicalize CHOST.
-# In particular, converts Debian multiarch tuples into GNU triplets.
-# See also
-#  https://wiki.debian.org/Multiarch/Tuples
-#  https://wiki.gentoo.org/wiki/CHOST
-# If you need an architecture not listed here, file a bug at github.com/zlib-ng/zlib-ng
-# and work around the problem by dropping libtool's much more comprehensive config.sub
-# on top of this file, see
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-case "$1" in
-*-*-linux-gnu*) echo $1;;
-i686-linux-gnu*|x86_64-linux-gnu*) echo $1 | sed 's/-linux-gnu/-pc-linux-gnu/';;
-*-linux-gnu*) echo $1 | sed 's/-linux-gnu/-unknown-linux-gnu/';;
-*) echo $1;;
-esac

crates/libz-sys/src/zlib-ng/tools/makecrct.c

diff --git a/crates/libz-sys/src/zlib-ng/tools/makecrct.c b/crates/libz-sys/src/zlib-ng/tools/makecrct.c
deleted file mode 100644
index bfc2b96..0000000
--- a/crates/libz-sys/src/zlib-ng/tools/makecrct.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* makecrct.c -- output crc32 tables
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
-*/
-
-#include <stdio.h>
-#include <inttypes.h>
-#include "zbuild.h"
-#include "zutil.h"
-
-/*
-    The crc32 table header file contains tables for both 32-bit and 64-bit
-    z_word_t's, and so requires a 64-bit type be available. In that case,
-    z_word_t must be defined to be 64-bits. This code then also generates
-    and writes out the tables for the case that z_word_t is 32 bits.
-*/
-
-#define W 8 /* Need a 64-bit integer type in order to generate crc32 tables. */
-
-#include "crc32_braid_p.h"
-
-static uint32_t crc_table[256];
-static z_word_t crc_big_table[256];
-
-static uint32_t crc_braid_table[W][256];
-static z_word_t crc_braid_big_table[W][256];
-static uint32_t x2n_table[32];
-
-#include "crc32_braid_comb_p.h"
-
-static void make_crc_table(void);
-static void print_crc_table(void);
-
-static void braid(uint32_t ltl[][256], z_word_t big[][256], int n, int w);
-
-static void write_table(const uint32_t *table, int k);
-static void write_table32hi(const z_word_t *table, int k);
-static void write_table64(const z_word_t *table, int k);
-
-/* ========================================================================= */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit. Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one. If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder. The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
-  (which is shifting right by one and adding x^32 mod p if the bit shifted out
-  is a one). We start with the highest power (least significant bit) of q and
-  repeat for all eight bits of q.
-
-  The table is simply the CRC of all possible eight bit values. This is all the
-  information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.
-*/
-static void make_crc_table() {
-    unsigned i, j, n;
-    uint32_t p;
-
-    /* initialize the CRC of bytes tables */
-    for (i = 0; i < 256; i++) {
-        p = i;
-        for (j = 0; j < 8; j++)
-            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
-        crc_table[i] = p;
-        crc_big_table[i] = ZSWAP64(p);
-    }
-
-    /* initialize the x^2^n mod p(x) table */
-    p = (uint32_t)1 << 30;         /* x^1 */
-    x2n_table[0] = p;
-    for (n = 1; n < 32; n++)
-        x2n_table[n] = p = multmodp(p, p);
-
-    /* initialize the braiding tables -- needs x2n_table[] */
-    braid(crc_braid_table, crc_braid_big_table, N, W);
-}
-
-/*
-  Generate the little and big-endian braid tables for the given n and z_word_t
-  size w. Each array must have room for w blocks of 256 elements.
- */
-static void braid(uint32_t ltl[][256], z_word_t big[][256], int n, int w) {
-    int k;
-    uint32_t i, p, q;
-    for (k = 0; k < w; k++) {
-        p = x2nmodp((n * w + 3 - k) << 3, 0);
-        ltl[k][0] = 0;
-        big[w - 1 - k][0] = 0;
-        for (i = 1; i < 256; i++) {
-            ltl[k][i] = q = multmodp(i << 24, p);
-            big[w - 1 - k][i] = ZSWAP64(q);
-        }
-    }
-}
-
-/*
-   Write the 32-bit values in table[0..k-1] to out, five per line in
-   hexadecimal separated by commas.
- */
-static void write_table(const uint32_t *table, int k) {
-    int n;
-
-    for (n = 0; n < k; n++)
-        printf("%s0x%08" PRIx32 "%s", n == 0 || n % 5 ? "" : "    ",
-                (uint32_t)(table[n]),
-                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
-}
-
-/*
-   Write the high 32-bits of each value in table[0..k-1] to out, five per line
-   in hexadecimal separated by commas.
- */
-static void write_table32hi(const z_word_t *table, int k) {
-    int n;
-
-    for (n = 0; n < k; n++)
-        printf("%s0x%08" PRIx32 "%s", n == 0 || n % 5 ? "" : "    ",
-                (uint32_t)(table[n] >> 32),
-                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
-}
-
-/*
-  Write the 64-bit values in table[0..k-1] to out, three per line in
-  hexadecimal separated by commas. This assumes that if there is a 64-bit
-  type, then there is also a long long integer type, and it is at least 64
-  bits. If not, then the type cast and format string can be adjusted
-  accordingly.
- */
-static void write_table64(const z_word_t *table, int k) {
-    int n;
-
-    for (n = 0; n < k; n++)
-        printf("%s0x%016" PRIx64 "%s", n == 0 || n % 3 ? "" : "    ",
-                (uint64_t)(table[n]),
-                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
-}
-
-static void print_crc_table(void) {
-    int k, n;
-    uint32_t ltl[8][256];
-    z_word_t big[8][256];
-
-    printf("#ifndef CRC32_BRAID_TBL_H_\n");
-    printf("#define CRC32_BRAID_TBL_H_\n\n");
-    printf("/* crc32_braid_tbl.h -- tables for braided CRC calculation\n");
-    printf(" * Generated automatically by makecrct.c\n */\n\n");
-
-    /* print little-endian CRC table */
-    printf("static const uint32_t crc_table[] = {\n");
-    printf("    ");
-    write_table(crc_table, 256);
-    printf("};\n\n");
-
-    /* print big-endian CRC table for 64-bit z_word_t */
-    printf("#ifdef W\n\n");
-    printf("#if W == 8\n\n");
-    printf("static const z_word_t crc_big_table[] = {\n");
-    printf("    ");
-    write_table64(crc_big_table, 256);
-    printf("};\n\n");
-
-    /* print big-endian CRC table for 32-bit z_word_t */
-    printf("#else /* W == 4 */\n\n");
-    printf("static const z_word_t crc_big_table[] = {\n");
-    printf("    ");
-    write_table32hi(crc_big_table, 256);
-    printf("};\n\n");
-    printf("#endif\n\n");
-    printf("#endif /* W */\n\n");
-
-    /* write out braid tables for each value of N */
-    for (n = 1; n <= 6; n++) {
-        printf("#if N == %d\n", n);
-
-        /* compute braid tables for this N and 64-bit word_t */
-        braid(ltl, big, n, 8);
-
-        /* write out braid tables for 64-bit z_word_t */
-        printf("\n");
-        printf("#if W == 8\n\n");
-        printf("static const uint32_t crc_braid_table[][256] = {\n");
-        for (k = 0; k < 8; k++) {
-            printf("   {");
-            write_table(ltl[k], 256);
-            printf("}%s", k < 7 ? ",\n" : "");
-        }
-        printf("};\n\n");
-        printf("static const z_word_t crc_braid_big_table[][256] = {\n");
-        for (k = 0; k < 8; k++) {
-            printf("   {");
-            write_table64(big[k], 256);
-            printf("}%s", k < 7 ? ",\n" : "");
-        }
-        printf("};\n");
-
-        /* compute braid tables for this N and 32-bit word_t */
-        braid(ltl, big, n, 4);
-
-        /* write out braid tables for 32-bit z_word_t */
-        printf("\n");
-        printf("#else /* W == 4 */\n\n");
-        printf("static const uint32_t crc_braid_table[][256] = {\n");
-        for (k = 0; k < 4; k++) {
-            printf("   {");
-            write_table(ltl[k], 256);
-            printf("}%s", k < 3 ? ",\n" : "");
-        }
-        printf("};\n\n");
-        printf("static const z_word_t crc_braid_big_table[][256] = {\n");
-        for (k = 0; k < 4; k++) {
-            printf("   {");
-            write_table32hi(big[k], 256);
-            printf("}%s", k < 3 ? ",\n" : "");
-        }
-        printf("};\n\n");
-        printf("#endif /* W */\n\n");
-
-        printf("#endif /* N == %d */\n", n);
-    }
-    printf("\n");
-
-    /* write out zeros operator table */
-    printf("static const uint32_t x2n_table[] = {\n");
-    printf("    ");
-    write_table(x2n_table, 32);
-    printf("};\n");
-
-    printf("\n");
-    printf("#endif /* CRC32_BRAID_TBL_H_ */\n");
-}
-
-// The output of this application can be piped out to recreate crc32 tables
-int main(int argc, char *argv[]) {
-    Z_UNUSED(argc);
-    Z_UNUSED(argv);
-
-    make_crc_table();
-    print_crc_table();
-    return 0;
-}

crates/libz-sys/src/zlib-ng/tools/makefixed.c

diff --git a/crates/libz-sys/src/zlib-ng/tools/makefixed.c b/crates/libz-sys/src/zlib-ng/tools/makefixed.c
deleted file mode 100644
index 7fe71e7..0000000
--- a/crates/libz-sys/src/zlib-ng/tools/makefixed.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <stdio.h>
-#include "zbuild.h"
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-
-// Build and return state with length and distance decoding tables and index sizes set to fixed code decoding.
-void Z_INTERNAL buildfixedtables(struct inflate_state *state) {
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    // build fixed huffman tables
-    unsigned sym, bits;
-    static code *next;
-
-    // literal/length table
-    sym = 0;
-    while (sym < 144) state->lens[sym++] = 8;
-    while (sym < 256) state->lens[sym++] = 9;
-    while (sym < 280) state->lens[sym++] = 7;
-    while (sym < 288) state->lens[sym++] = 8;
-    next = fixed;
-    lenfix = next;
-    bits = 9;
-    zng_inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-    // distance table
-    sym = 0;
-    while (sym < 32) state->lens[sym++] = 5;
-    distfix = next;
-    bits = 5;
-    zng_inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-
-//  Create fixed tables on the fly and write out a inffixed_tbl.h file that is #include'd above.
-//  makefixed() writes those tables to stdout, which would be piped to inffixed_tbl.h.
-void makefixed(void) {
-    unsigned low, size;
-    struct inflate_state state;
-
-    memset(&state, 0, sizeof(state));
-    buildfixedtables(&state);
-    puts("/* inffixed_tbl.h -- table for decoding fixed codes");
-    puts(" * Generated automatically by makefixed().");
-    puts(" */");
-    puts("");
-    puts("/* WARNING: this file should *not* be used by applications.");
-    puts(" * It is part of the implementation of this library and is");
-    puts(" * subject to change. Applications should only use zlib.h.");
-    puts(" */");
-    puts("");
-    size = 1U << 9;
-    printf("static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0)
-            printf("\n    ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-            state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size)
-            break;
-        putchar(',');
-    }
-    puts("\n};");
-    size = 1U << 5;
-    printf("\nstatic const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0)
-            printf("\n    ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, state.distcode[low].val);
-        if (++low == size)
-            break;
-        putchar(',');
-    }
-    puts("\n};");
-}
-
-// The output of this application can be piped out to recreate inffixed_tbl.h
-int main(void) {
-    makefixed();
-    return 0;
-}

crates/libz-sys/src/zlib-ng/tools/maketrees.c

diff --git a/crates/libz-sys/src/zlib-ng/tools/maketrees.c b/crates/libz-sys/src/zlib-ng/tools/maketrees.c
deleted file mode 100644
index 97688c7..0000000
--- a/crates/libz-sys/src/zlib-ng/tools/maketrees.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* maketrees.c -- output static huffman trees
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include "zbuild.h"
-#include "deflate.h"
-#include "trees.h"
-
-static ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see zng_tr_init).
- */
-
-static ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use 5 bits.)
- */
-
-static unsigned char dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances 3 .. 258,
- * the last 256 values correspond to the top 8 bits of the 15 bit distances.
- */
-
-static unsigned char length_code[STD_MAX_MATCH-STD_MIN_MATCH+1];
-/* length code for each normalized match length (0 == STD_MIN_MATCH) */
-
-static int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = STD_MIN_MATCH) */
-
-static int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-
-static void tr_static_init(void) {
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    uint16_t bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1 << extra_lbits[code]); n++) {
-            length_code[length++] = (unsigned char)code;
-        }
-    }
-    Assert(length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented in two different
-     * ways: code 284 + 5 bits or code 285, so we overwrite length_code[255] to use the best encoding:
-     */
-    length_code[length-1] = (unsigned char)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1 << extra_dbits[code]); n++) {
-            dist_code[dist++] = (unsigned char)code;
-        }
-    }
-    Assert(dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1 << (extra_dbits[code]-7)); n++) {
-            dist_code[256 + dist++] = (unsigned char)code;
-        }
-    }
-    Assert(dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++)
-        bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the tree construction
-     * to get a canonical Huffman tree (longest code all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = PREFIX(bi_reverse)((unsigned)n, 5);
-    }
-}
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-static void gen_trees_header() {
-    int i;
-
-    printf("#ifndef TREES_TBL_H_\n");
-    printf("#define TREES_TBL_H_\n\n");
-
-    printf("/* header created automatically with maketrees.c */\n\n");
-
-    printf("Z_INTERNAL const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        printf("{{%3u},{%u}}%s", static_ltree[i].Code, static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    printf("Z_INTERNAL const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        printf("{{%2u},{%u}}%s", static_dtree[i].Code, static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    printf("const unsigned char Z_INTERNAL zng_dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        printf("%2u%s", dist_code[i], SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    printf("const unsigned char Z_INTERNAL zng_length_code[STD_MAX_MATCH-STD_MIN_MATCH+1] = {\n");
-    for (i = 0; i < STD_MAX_MATCH-STD_MIN_MATCH+1; i++) {
-        printf("%2u%s", length_code[i], SEPARATOR(i, STD_MAX_MATCH-STD_MIN_MATCH, 20));
-    }
-
-    printf("Z_INTERNAL const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        printf("%d%s", base_length[i], SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    printf("Z_INTERNAL const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        printf("%5d%s", base_dist[i], SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    printf("#endif /* TREES_TBL_H_ */\n");
-}
-
-// The output of this application can be piped out to recreate trees.h
-int main(void) {
-    tr_static_init();
-    gen_trees_header();
-    return 0;
-}

crates/libz-sys/src/zlib-ng/trees.c

diff --git a/crates/libz-sys/src/zlib-ng/trees.c b/crates/libz-sys/src/zlib-ng/trees.c
deleted file mode 100644
index 7bc7007..0000000
--- a/crates/libz-sys/src/zlib-ng/trees.c
+++ /dev/null
@@ -1,818 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-#include "zbuild.h"
-#include "deflate.h"
-#include "trees.h"
-#include "trees_emit.h"
-#include "trees_tbl.h"
-
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree; /* static tree or NULL */
-    const int     *extra_bits;  /* extra bits for each code or NULL */
-    int            extra_base;  /* base index for extra_bits */
-    int            elems;       /* max number of elements in the tree */
-    unsigned int   max_length;  /* max bit length for the codes */
-};
-
-static const static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-static const static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-static const static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-static void init_block       (deflate_state *s);
-static void pqdownheap       (deflate_state *s, ct_data *tree, int k);
-static void gen_bitlen       (deflate_state *s, tree_desc *desc);
-static void build_tree       (deflate_state *s, tree_desc *desc);
-static void scan_tree        (deflate_state *s, ct_data *tree, int max_code);
-static void send_tree        (deflate_state *s, ct_data *tree, int max_code);
-static int  build_bl_tree    (deflate_state *s);
-static void send_all_trees   (deflate_state *s, int lcodes, int dcodes, int blcodes);
-static void compress_block   (deflate_state *s, const ct_data *ltree, const ct_data *dtree);
-static int  detect_data_type (deflate_state *s);
-static void bi_flush         (deflate_state *s);
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void Z_INTERNAL zng_tr_init(deflate_state *s) {
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-static void init_block(deflate_state *s) {
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++)
-        s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++)
-        s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++)
-        s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->sym_next = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-    (tree[n].Freq < tree[m].Freq || \
-    (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-static void pqdownheap(deflate_state *s, ct_data *tree, int k) {
-    /* tree: the tree to restore */
-    /* k: node to move down */
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len && smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth))
-            break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];
-        k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-static void gen_bitlen(deflate_state *s, tree_desc *desc) {
-    /* desc: the tree descriptor */
-    ct_data *tree           = desc->dyn_tree;
-    int max_code            = desc->max_code;
-    const ct_data *stree    = desc->stat_desc->static_tree;
-    const int *extra        = desc->stat_desc->extra_bits;
-    int base                = desc->stat_desc->extra_base;
-    unsigned int max_length = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    unsigned int bits;  /* bit length */
-    int xbits;          /* extra bits */
-    uint16_t f;         /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++)
-        s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1u;
-        if (bits > max_length){
-            bits = max_length;
-            overflow++;
-        }
-        tree[n].Len = (uint16_t)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) /* not a leaf node */
-            continue;
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base)
-            xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (unsigned long)f * (unsigned int)(bits + xbits);
-        if (stree)
-            s->static_len += (unsigned long)f * (unsigned int)(stree[n].Len + xbits);
-    }
-    if (overflow == 0)
-        return;
-
-    Tracev((stderr, "\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length - 1;
-        while (s->bl_count[bits] == 0)
-            bits--;
-        s->bl_count[bits]--;       /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2u; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code)
-                continue;
-            if (tree[m].Len != bits) {
-                Tracev((stderr, "code %d bits %d->%u\n", m, tree[m].Len, bits));
-                s->opt_len += (unsigned long)(bits * tree[m].Freq);
-                s->opt_len -= (unsigned long)(tree[m].Len * tree[m].Freq);
-                tree[m].Len = (uint16_t)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-Z_INTERNAL void gen_codes(ct_data *tree, int max_code, uint16_t *bl_count) {
-    /* tree: the tree to decorate */
-    /* max_code: largest code with non zero frequency */
-    /* bl_count: number of codes at each bit length */
-    uint16_t next_code[MAX_BITS+1];  /* next code value for each bit length */
-    unsigned int code = 0;           /* running code value */
-    int bits;                        /* bit index */
-    int n;                           /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (uint16_t)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert(code + bl_count[MAX_BITS]-1 == (1 << MAX_BITS)-1, "inconsistent bit counts");
-    Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0)
-            continue;
-        /* Now reverse the bits */
-        tree[n].Code = PREFIX(bi_reverse)(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr, "\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n & 0xff) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-static void build_tree(deflate_state *s, tree_desc *desc) {
-    /* desc: the tree descriptor */
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0;
-    s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--;
-        if (stree)
-            s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--)
-        pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (unsigned char)((s->depth[n] >= s->depth[m] ?
-                                          s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (uint16_t)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr, "\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-static void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
-    /* tree: the tree to be scanned */
-    /* max_code: and its largest code of non zero frequency */
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    uint16_t count = 0;        /* repeat count of the current code */
-    uint16_t max_count = 7;    /* max repeat count */
-    uint16_t min_count = 4;    /* min repeat count */
-
-    if (nextlen == 0)
-        max_count = 138, min_count = 3;
-
-    tree[max_code+1].Len = (uint16_t)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen;
-        nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen)
-                s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0;
-        prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-static void send_tree(deflate_state *s, ct_data *tree, int max_code) {
-    /* tree: the tree to be scanned */
-    /* max_code and its largest code of non zero frequency */
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0)
-        max_count = 138, min_count = 3;
-
-    // Temp local variables
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen;
-        nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do {
-                send_code(s, curlen, s->bl_tree, bi_buf, bi_valid);
-            } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree, bi_buf, bi_valid);
-                count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree, bi_buf, bi_valid);
-            send_bits(s, count-3, 2, bi_buf, bi_valid);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree, bi_buf, bi_valid);
-            send_bits(s, count-3, 3, bi_buf, bi_valid);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree, bi_buf, bi_valid);
-            send_bits(s, count-11, 7, bi_buf, bi_valid);
-        }
-        count = 0;
-        prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-
-    // Store back temp variables
-    s->bi_buf = bi_buf;
-    s->bi_valid = bi_valid;
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-static int build_bl_tree(deflate_state *s) {
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0)
-            break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((unsigned long)max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %lu, stat %lu", s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-static void send_all_trees(deflate_state *s, int lcodes, int dcodes, int blcodes) {
-    int rank;                    /* index in bl_order */
-
-    Assert(lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert(lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, "too many codes");
-
-    // Temp local variables
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5, bi_buf, bi_valid); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5, bi_buf, bi_valid);
-    send_bits(s, blcodes-4,  4, bi_buf, bi_valid); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2u ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3, bi_buf, bi_valid);
-    }
-    Tracev((stderr, "\nbl tree: sent %lu", s->bits_sent));
-
-    // Store back temp variables
-    s->bi_buf = bi_buf;
-    s->bi_valid = bi_valid;
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %lu", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %lu", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void Z_INTERNAL zng_tr_stored_block(deflate_state *s, char *buf, uint32_t stored_len, int last) {
-    /* buf: input block */
-    /* stored_len: length of input block */
-    /* last: one if this is the last block for a file */
-    zng_tr_emit_tree(s, STORED_BLOCK, last); /* send block type */
-    zng_tr_emit_align(s);                    /* align on byte boundary */
-    cmpr_bits_align(s);
-    put_short(s, (uint16_t)stored_len);
-    put_short(s, (uint16_t)~stored_len);
-    cmpr_bits_add(s, 32);
-    sent_bits_add(s, 32);
-    if (stored_len) {
-        memcpy(s->pending_buf + s->pending, (unsigned char *)buf, stored_len);
-        s->pending += stored_len;
-        cmpr_bits_add(s, stored_len << 3);
-        sent_bits_add(s, stored_len << 3);
-    }
-}
-
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void Z_INTERNAL zng_tr_flush_bits(deflate_state *s) {
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-void Z_INTERNAL zng_tr_align(deflate_state *s) {
-    zng_tr_emit_tree(s, STATIC_TREES, 0);
-    zng_tr_emit_end_block(s, static_ltree, 0);
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and write out the encoded block.
- */
-void Z_INTERNAL zng_tr_flush_block(deflate_state *s, char *buf, uint32_t stored_len, int last) {
-    /* buf: input block, or NULL if too old */
-    /* stored_len: length of input block */
-    /* last: one if this is the last block for a file */
-    unsigned long opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (UNLIKELY(s->sym_next == 0)) {
-        /* Emit an empty static tree block with no codes */
-        opt_lenb = static_lenb = 0;
-        s->static_len = 7;
-    } else if (s->level > 0) {
-        /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %lu, stat %lu", s->opt_len, s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %lu, stat %lu", s->opt_len, s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7) >> 3;
-        static_lenb = (s->static_len+3+7) >> 3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %u lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->sym_next / 3));
-
-        if (static_lenb <= opt_lenb)
-            opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != NULL, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-    if (stored_len+4 <= opt_lenb && buf != NULL) {
-        /* 4: two words for the lengths
-         * The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        zng_tr_stored_block(s, buf, stored_len, last);
-
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-        zng_tr_emit_tree(s, STATIC_TREES, last);
-        compress_block(s, (const ct_data *)static_ltree, (const ct_data *)static_dtree);
-        cmpr_bits_add(s, s->static_len);
-    } else {
-        zng_tr_emit_tree(s, DYN_TREES, last);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, max_blindex+1);
-        compress_block(s, (const ct_data *)s->dyn_ltree, (const ct_data *)s->dyn_dtree);
-        cmpr_bits_add(s, s->opt_len);
-    }
-    Assert(s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and unsigned long implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (last) {
-        zng_tr_emit_align(s);
-    }
-    Tracev((stderr, "\ncomprlen %lu(%lu) ", s->compressed_len>>3, s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-static void compress_block(deflate_state *s, const ct_data *ltree, const ct_data *dtree) {
-    /* ltree: literal tree */
-    /* dtree: distance tree */
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned sx = 0;    /* running index in sym_buf */
-
-    if (s->sym_next != 0) {
-        do {
-            dist = s->sym_buf[sx++] & 0xff;
-            dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
-            lc = s->sym_buf[sx++];
-            if (dist == 0) {
-                zng_emit_lit(s, ltree, lc);
-            } else {
-                zng_emit_dist(s, ltree, dtree, lc, dist);
-            } /* literal or match pair ? */
-
-            /* Check that the overlay between pending_buf and sym_buf is ok: */
-            Assert(s->pending < s->lit_bufsize + sx, "pending_buf overflow");
-        } while (sx < s->sym_next);
-    }
-
-    zng_emit_end_block(s, ltree, 0);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-static int detect_data_type(deflate_state *s) {
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-static void bi_flush(deflate_state *s) {
-    if (s->bi_valid == 64) {
-        put_uint64(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else {
-        if (s->bi_valid >= 32) {
-            put_uint32(s, (uint32_t)s->bi_buf);
-            s->bi_buf >>= 32;
-            s->bi_valid -= 32;
-        }
-        if (s->bi_valid >= 16) {
-            put_short(s, (uint16_t)s->bi_buf);
-            s->bi_buf >>= 16;
-            s->bi_valid -= 16;
-        }
-        if (s->bi_valid >= 8) {
-            put_byte(s, s->bi_buf);
-            s->bi_buf >>= 8;
-            s->bi_valid -= 8;
-        }
-    }
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code using bit manipulation
- */
-Z_INTERNAL uint16_t PREFIX(bi_reverse)(unsigned code, int len) {
-    /* code: the value to invert */
-    /* len: its bit length */
-    Assert(len >= 1 && len <= 15, "code length must be 1-15");
-#define bitrev8(b) \
-    (uint8_t)((((uint8_t)(b) * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32)
-    return (bitrev8(code >> 8) | (uint16_t)bitrev8(code) << 8) >> (16 - len);
-}

crates/libz-sys/src/zlib-ng/trees.h

diff --git a/crates/libz-sys/src/zlib-ng/trees.h b/crates/libz-sys/src/zlib-ng/trees.h
deleted file mode 100644
index e57f926..0000000
--- a/crates/libz-sys/src/zlib-ng/trees.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef TREES_H_
-#define TREES_H_
-
-/* Constants */
-
-#define DIST_CODE_LEN  512
-/* see definition of array dist_code in trees.c */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-static const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-    = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-static const int extra_dbits[D_CODES] /* extra bits for each distance code */
-    = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-static const int extra_blbits[BL_CODES] /* extra bits for each bit length code */
-    = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-static const unsigned char bl_order[BL_CODES]
-    = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
- /* The lengths of the bit length codes are sent in order of decreasing
-  * probability, to avoid transmitting the lengths for unused bit length codes.
-  */
-
-
-/* Function definitions */
-void gen_codes        (ct_data *tree, int max_code, uint16_t *bl_count);
-
-#endif

crates/libz-sys/src/zlib-ng/trees_emit.h

diff --git a/crates/libz-sys/src/zlib-ng/trees_emit.h b/crates/libz-sys/src/zlib-ng/trees_emit.h
deleted file mode 100644
index 922daae..0000000
--- a/crates/libz-sys/src/zlib-ng/trees_emit.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#ifndef TREES_EMIT_H_
-#define TREES_EMIT_H_
-
-#include "zbuild.h"
-#include "trees.h"
-
-#ifdef ZLIB_DEBUG
-#  include <ctype.h>
-#  include <inttypes.h>
-#endif
-
-
-/* trees.h */
-extern Z_INTERNAL const ct_data static_ltree[L_CODES+2];
-extern Z_INTERNAL const ct_data static_dtree[D_CODES];
-
-extern const unsigned char Z_INTERNAL zng_dist_code[DIST_CODE_LEN];
-extern const unsigned char Z_INTERNAL zng_length_code[STD_MAX_MATCH-STD_MIN_MATCH+1];
-
-extern Z_INTERNAL const int base_length[LENGTH_CODES];
-extern Z_INTERNAL const int base_dist[D_CODES];
-
-/* Bit buffer and deflate code stderr tracing */
-#ifdef ZLIB_DEBUG
-#  define send_bits_trace(s, value, length) { \
-        Tracevv((stderr, " l %2d v %4llx ", (int)(length), (long long)(value))); \
-        Assert(length > 0 && length <= BIT_BUF_SIZE, "invalid length"); \
-    }
-#  define send_code_trace(s, c) \
-    if (z_verbose > 2) { \
-        fprintf(stderr, "\ncd %3d ", (c)); \
-    }
-#else
-#  define send_bits_trace(s, value, length)
-#  define send_code_trace(s, c)
-#endif
-
-/* If not enough room in bi_buf, use (valid) bits from bi_buf and
- * (64 - bi_valid) bits from value, leaving (width - (64-bi_valid))
- * unused bits in value.
- */
-#define send_bits(s, t_val, t_len, bi_buf, bi_valid) {\
-    uint64_t val = (uint64_t)t_val;\
-    uint32_t len = (uint32_t)t_len;\
-    uint32_t total_bits = bi_valid + len;\
-    send_bits_trace(s, val, len);\
-    sent_bits_add(s, len);\
-    if (total_bits < BIT_BUF_SIZE) {\
-        bi_buf |= val << bi_valid;\
-        bi_valid = total_bits;\
-    } else if (bi_valid == BIT_BUF_SIZE) {\
-        put_uint64(s, bi_buf);\
-        bi_buf = val;\
-        bi_valid = len;\
-    } else {\
-        bi_buf |= val << bi_valid;\
-        put_uint64(s, bi_buf);\
-        bi_buf = val >> (BIT_BUF_SIZE - bi_valid);\
-        bi_valid = total_bits - BIT_BUF_SIZE;\
-    }\
-}
-
-/* Send a code of the given tree. c and tree must not have side effects */
-#ifdef ZLIB_DEBUG
-#  define send_code(s, c, tree, bi_buf, bi_valid) { \
-    send_code_trace(s, c); \
-    send_bits(s, tree[c].Code, tree[c].Len, bi_buf, bi_valid); \
-}
-#else
-#  define send_code(s, c, tree, bi_buf, bi_valid) \
-    send_bits(s, tree[c].Code, tree[c].Len, bi_buf, bi_valid)
-#endif
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-static void bi_windup(deflate_state *s) {
-    if (s->bi_valid > 56) {
-        put_uint64(s, s->bi_buf);
-    } else {
-        if (s->bi_valid > 24) {
-            put_uint32(s, (uint32_t)s->bi_buf);
-            s->bi_buf >>= 32;
-            s->bi_valid -= 32;
-        }
-        if (s->bi_valid > 8) {
-            put_short(s, (uint16_t)s->bi_buf);
-            s->bi_buf >>= 16;
-            s->bi_valid -= 16;
-        }
-        if (s->bi_valid > 0) {
-            put_byte(s, s->bi_buf);
-        }
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-}
-
-/* ===========================================================================
- * Emit literal code
- */
-static inline uint32_t zng_emit_lit(deflate_state *s, const ct_data *ltree, unsigned c) {
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-
-    send_code(s, c, ltree, bi_buf, bi_valid);
-
-    s->bi_valid = bi_valid;
-    s->bi_buf = bi_buf;
-
-    Tracecv(isgraph(c & 0xff), (stderr, " '%c' ", c));
-
-    return ltree[c].Len;
-}
-
-/* ===========================================================================
- * Emit match distance/length code
- */
-static inline uint32_t zng_emit_dist(deflate_state *s, const ct_data *ltree, const ct_data *dtree,
-    uint32_t lc, uint32_t dist) {
-    uint32_t c, extra;
-    uint8_t code;
-    uint64_t match_bits;
-    uint32_t match_bits_len;
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-
-    /* Send the length code, len is the match length - STD_MIN_MATCH */
-    code = zng_length_code[lc];
-    c = code+LITERALS+1;
-    Assert(c < L_CODES, "bad l_code");
-    send_code_trace(s, c);
-
-    match_bits = ltree[c].Code;
-    match_bits_len = ltree[c].Len;
-    extra = extra_lbits[code];
-    if (extra != 0) {
-        lc -= base_length[code];
-        match_bits |= ((uint64_t)lc << match_bits_len);
-        match_bits_len += extra;
-    }
-
-    dist--; /* dist is now the match distance - 1 */
-    code = d_code(dist);
-    Assert(code < D_CODES, "bad d_code");
-    send_code_trace(s, code);
-
-    /* Send the distance code */
-    match_bits |= ((uint64_t)dtree[code].Code << match_bits_len);
-    match_bits_len += dtree[code].Len;
-    extra = extra_dbits[code];
-    if (extra != 0) {
-        dist -= base_dist[code];
-        match_bits |= ((uint64_t)dist << match_bits_len);
-        match_bits_len += extra;
-    }
-
-    send_bits(s, match_bits, match_bits_len, bi_buf, bi_valid);
-
-    s->bi_valid = bi_valid;
-    s->bi_buf = bi_buf;
-
-    return match_bits_len;
-}
-
-/* ===========================================================================
- * Emit end block
- */
-static inline void zng_emit_end_block(deflate_state *s, const ct_data *ltree, const int last) {
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-    send_code(s, END_BLOCK, ltree, bi_buf, bi_valid);
-    s->bi_valid = bi_valid;
-    s->bi_buf = bi_buf;
-    Tracev((stderr, "\n+++ Emit End Block: Last: %u Pending: %u Total Out: %" PRIu64 "\n",
-        last, s->pending, (uint64_t)s->strm->total_out));
-    Z_UNUSED(last);
-}
-
-/* ===========================================================================
- * Emit literal and count bits
- */
-static inline void zng_tr_emit_lit(deflate_state *s, const ct_data *ltree, unsigned c) {
-    cmpr_bits_add(s, zng_emit_lit(s, ltree, c));
-}
-
-/* ===========================================================================
- * Emit match and count bits
- */
-static inline void zng_tr_emit_dist(deflate_state *s, const ct_data *ltree, const ct_data *dtree,
-    uint32_t lc, uint32_t dist) {
-    cmpr_bits_add(s, zng_emit_dist(s, ltree, dtree, lc, dist));
-}
-
-/* ===========================================================================
- * Emit start of block
- */
-static inline void zng_tr_emit_tree(deflate_state *s, int type, const int last) {
-    uint32_t bi_valid = s->bi_valid;
-    uint64_t bi_buf = s->bi_buf;
-    uint32_t header_bits = (type << 1) + last;
-    send_bits(s, header_bits, 3, bi_buf, bi_valid);
-    cmpr_bits_add(s, 3);
-    s->bi_valid = bi_valid;
-    s->bi_buf = bi_buf;
-    Tracev((stderr, "\n--- Emit Tree: Last: %u\n", last));
-}
-
-/* ===========================================================================
- * Align bit buffer on a byte boundary and count bits
- */
-static inline void zng_tr_emit_align(deflate_state *s) {
-    bi_windup(s); /* align on byte boundary */
-    sent_bits_align(s);
-}
-
-/* ===========================================================================
- * Emit an end block and align bit buffer if last block
- */
-static inline void zng_tr_emit_end_block(deflate_state *s, const ct_data *ltree, const int last) {
-    zng_emit_end_block(s, ltree, last);
-    cmpr_bits_add(s, 7);
-    if (last)
-        zng_tr_emit_align(s);
-}
-
-#endif

crates/libz-sys/src/zlib-ng/trees_tbl.h

diff --git a/crates/libz-sys/src/zlib-ng/trees_tbl.h b/crates/libz-sys/src/zlib-ng/trees_tbl.h
deleted file mode 100644
index a3912b7..0000000
--- a/crates/libz-sys/src/zlib-ng/trees_tbl.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef TREES_TBL_H_
-#define TREES_TBL_H_
-
-/* header created automatically with maketrees.c */
-
-Z_INTERNAL const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{8}}, {{140},{8}}, {{ 76},{8}}, {{204},{8}}, {{ 44},{8}},
-{{172},{8}}, {{108},{8}}, {{236},{8}}, {{ 28},{8}}, {{156},{8}},
-{{ 92},{8}}, {{220},{8}}, {{ 60},{8}}, {{188},{8}}, {{124},{8}},
-{{252},{8}}, {{  2},{8}}, {{130},{8}}, {{ 66},{8}}, {{194},{8}},
-{{ 34},{8}}, {{162},{8}}, {{ 98},{8}}, {{226},{8}}, {{ 18},{8}},
-{{146},{8}}, {{ 82},{8}}, {{210},{8}}, {{ 50},{8}}, {{178},{8}},
-{{114},{8}}, {{242},{8}}, {{ 10},{8}}, {{138},{8}}, {{ 74},{8}},
-{{202},{8}}, {{ 42},{8}}, {{170},{8}}, {{106},{8}}, {{234},{8}},
-{{ 26},{8}}, {{154},{8}}, {{ 90},{8}}, {{218},{8}}, {{ 58},{8}},
-{{186},{8}}, {{122},{8}}, {{250},{8}}, {{  6},{8}}, {{134},{8}},
-{{ 70},{8}}, {{198},{8}}, {{ 38},{8}}, {{166},{8}}, {{102},{8}},
-{{230},{8}}, {{ 22},{8}}, {{150},{8}}, {{ 86},{8}}, {{214},{8}},
-{{ 54},{8}}, {{182},{8}}, {{118},{8}}, {{246},{8}}, {{ 14},{8}},
-{{142},{8}}, {{ 78},{8}}, {{206},{8}}, {{ 46},{8}}, {{174},{8}},
-{{110},{8}}, {{238},{8}}, {{ 30},{8}}, {{158},{8}}, {{ 94},{8}},
-{{222},{8}}, {{ 62},{8}}, {{190},{8}}, {{126},{8}}, {{254},{8}},
-{{  1},{8}}, {{129},{8}}, {{ 65},{8}}, {{193},{8}}, {{ 33},{8}},
-{{161},{8}}, {{ 97},{8}}, {{225},{8}}, {{ 17},{8}}, {{145},{8}},
-{{ 81},{8}}, {{209},{8}}, {{ 49},{8}}, {{177},{8}}, {{113},{8}},
-{{241},{8}}, {{  9},{8}}, {{137},{8}}, {{ 73},{8}}, {{201},{8}},
-{{ 41},{8}}, {{169},{8}}, {{105},{8}}, {{233},{8}}, {{ 25},{8}},
-{{153},{8}}, {{ 89},{8}}, {{217},{8}}, {{ 57},{8}}, {{185},{8}},
-{{121},{8}}, {{249},{8}}, {{  5},{8}}, {{133},{8}}, {{ 69},{8}},
-{{197},{8}}, {{ 37},{8}}, {{165},{8}}, {{101},{8}}, {{229},{8}},
-{{ 21},{8}}, {{149},{8}}, {{ 85},{8}}, {{213},{8}}, {{ 53},{8}},
-{{181},{8}}, {{117},{8}}, {{245},{8}}, {{ 13},{8}}, {{141},{8}},
-{{ 77},{8}}, {{205},{8}}, {{ 45},{8}}, {{173},{8}}, {{109},{8}},
-{{237},{8}}, {{ 29},{8}}, {{157},{8}}, {{ 93},{8}}, {{221},{8}},
-{{ 61},{8}}, {{189},{8}}, {{125},{8}}, {{253},{8}}, {{ 19},{9}},
-{{275},{9}}, {{147},{9}}, {{403},{9}}, {{ 83},{9}}, {{339},{9}},
-{{211},{9}}, {{467},{9}}, {{ 51},{9}}, {{307},{9}}, {{179},{9}},
-{{435},{9}}, {{115},{9}}, {{371},{9}}, {{243},{9}}, {{499},{9}},
-{{ 11},{9}}, {{267},{9}}, {{139},{9}}, {{395},{9}}, {{ 75},{9}},
-{{331},{9}}, {{203},{9}}, {{459},{9}}, {{ 43},{9}}, {{299},{9}},
-{{171},{9}}, {{427},{9}}, {{107},{9}}, {{363},{9}}, {{235},{9}},
-{{491},{9}}, {{ 27},{9}}, {{283},{9}}, {{155},{9}}, {{411},{9}},
-{{ 91},{9}}, {{347},{9}}, {{219},{9}}, {{475},{9}}, {{ 59},{9}},
-{{315},{9}}, {{187},{9}}, {{443},{9}}, {{123},{9}}, {{379},{9}},
-{{251},{9}}, {{507},{9}}, {{  7},{9}}, {{263},{9}}, {{135},{9}},
-{{391},{9}}, {{ 71},{9}}, {{327},{9}}, {{199},{9}}, {{455},{9}},
-{{ 39},{9}}, {{295},{9}}, {{167},{9}}, {{423},{9}}, {{103},{9}},
-{{359},{9}}, {{231},{9}}, {{487},{9}}, {{ 23},{9}}, {{279},{9}},
-{{151},{9}}, {{407},{9}}, {{ 87},{9}}, {{343},{9}}, {{215},{9}},
-{{471},{9}}, {{ 55},{9}}, {{311},{9}}, {{183},{9}}, {{439},{9}},
-{{119},{9}}, {{375},{9}}, {{247},{9}}, {{503},{9}}, {{ 15},{9}},
-{{271},{9}}, {{143},{9}}, {{399},{9}}, {{ 79},{9}}, {{335},{9}},
-{{207},{9}}, {{463},{9}}, {{ 47},{9}}, {{303},{9}}, {{175},{9}},
-{{431},{9}}, {{111},{9}}, {{367},{9}}, {{239},{9}}, {{495},{9}},
-{{ 31},{9}}, {{287},{9}}, {{159},{9}}, {{415},{9}}, {{ 95},{9}},
-{{351},{9}}, {{223},{9}}, {{479},{9}}, {{ 63},{9}}, {{319},{9}},
-{{191},{9}}, {{447},{9}}, {{127},{9}}, {{383},{9}}, {{255},{9}},
-{{511},{9}}, {{  0},{7}}, {{ 64},{7}}, {{ 32},{7}}, {{ 96},{7}},
-{{ 16},{7}}, {{ 80},{7}}, {{ 48},{7}}, {{112},{7}}, {{  8},{7}},
-{{ 72},{7}}, {{ 40},{7}}, {{104},{7}}, {{ 24},{7}}, {{ 88},{7}},
-{{ 56},{7}}, {{120},{7}}, {{  4},{7}}, {{ 68},{7}}, {{ 36},{7}},
-{{100},{7}}, {{ 20},{7}}, {{ 84},{7}}, {{ 52},{7}}, {{116},{7}},
-{{  3},{8}}, {{131},{8}}, {{ 67},{8}}, {{195},{8}}, {{ 35},{8}},
-{{163},{8}}, {{ 99},{8}}, {{227},{8}}
-};
-
-Z_INTERNAL const ct_data static_dtree[D_CODES] = {
-{{ 0},{5}}, {{16},{5}}, {{ 8},{5}}, {{24},{5}}, {{ 4},{5}},
-{{20},{5}}, {{12},{5}}, {{28},{5}}, {{ 2},{5}}, {{18},{5}},
-{{10},{5}}, {{26},{5}}, {{ 6},{5}}, {{22},{5}}, {{14},{5}},
-{{30},{5}}, {{ 1},{5}}, {{17},{5}}, {{ 9},{5}}, {{25},{5}},
-{{ 5},{5}}, {{21},{5}}, {{13},{5}}, {{29},{5}}, {{ 3},{5}},
-{{19},{5}}, {{11},{5}}, {{27},{5}}, {{ 7},{5}}, {{23},{5}}
-};
-
-const unsigned char Z_INTERNAL zng_dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const unsigned char Z_INTERNAL zng_length_code[STD_MAX_MATCH-STD_MIN_MATCH+1] = {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-Z_INTERNAL const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-Z_INTERNAL const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
-#endif /* TREES_TBL_H_ */

crates/libz-sys/src/zlib-ng/uncompr.c

diff --git a/crates/libz-sys/src/zlib-ng/uncompr.c b/crates/libz-sys/src/zlib-ng/uncompr.c
deleted file mode 100644
index 54ed57f..0000000
--- a/crates/libz-sys/src/zlib-ng/uncompr.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  *sourceLen is
-   the byte length of the source buffer. Upon entry, *destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data. (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit,
-   *destLen is the size of the decompressed data and *sourceLen is the number
-   of source bytes consumed. Upon return, source + *sourceLen points to the
-   first unused input byte.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
-   Z_DATA_ERROR if the input data was corrupted, including if the input data is
-   an incomplete zlib stream.
-*/
-int Z_EXPORT PREFIX(uncompress2)(unsigned char *dest, z_size_t *destLen, const unsigned char *source, z_size_t *sourceLen) {
-    PREFIX3(stream) stream;
-    int err;
-    const unsigned int max = (unsigned int)-1;
-    z_size_t len, left;
-    unsigned char buf[1];    /* for detection of incomplete stream when *destLen == 0 */
-
-    len = *sourceLen;
-    if (*destLen) {
-        left = *destLen;
-        *destLen = 0;
-    } else {
-        left = 1;
-        dest = buf;
-    }
-
-    stream.next_in = (z_const unsigned char *)source;
-    stream.avail_in = 0;
-    stream.zalloc = NULL;
-    stream.zfree = NULL;
-    stream.opaque = NULL;
-
-    err = PREFIX(inflateInit)(&stream);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (unsigned long)max ? max : (unsigned int)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = len > (unsigned long)max ? max : (unsigned int)len;
-            len -= stream.avail_in;
-        }
-        err = PREFIX(inflate)(&stream, Z_NO_FLUSH);
-    } while (err == Z_OK);
-
-    *sourceLen -= len + stream.avail_in;
-    if (dest != buf)
-        *destLen = (z_size_t)stream.total_out;
-    else if (stream.total_out && err == Z_BUF_ERROR)
-        left = 1;
-
-    PREFIX(inflateEnd)(&stream);
-    return err == Z_STREAM_END ? Z_OK :
-           err == Z_NEED_DICT ? Z_DATA_ERROR  :
-           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
-           err;
-}
-
-int Z_EXPORT PREFIX(uncompress)(unsigned char *dest, z_size_t *destLen, const unsigned char *source, z_size_t sourceLen) {
-    return PREFIX(uncompress2)(dest, destLen, source, &sourceLen);
-}

crates/libz-sys/src/zlib-ng/win32/Makefile.a64

diff --git a/crates/libz-sys/src/zlib-ng/win32/Makefile.a64 b/crates/libz-sys/src/zlib-ng/win32/Makefile.a64
deleted file mode 100644
index efcb0a6..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/Makefile.a64
+++ /dev/null
@@ -1,248 +0,0 @@
-# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
-#
-# Usage:
-#   nmake -f win32/Makefile.a64                          (standard build)
-#   nmake -f win32/Makefile.a64 LOC=-DFOO                (nonstandard build)
-
-# The toplevel directory of the source tree.
-#
-TOP = .
-
-# optional build flags
-LOC =
-
-# variables
-STATICLIB = zlib.lib
-SHAREDLIB = zlib1.dll
-IMPLIB    = zdll.lib
-SYMBOL_PREFIX =
-
-CC = cl
-LD = link
-AR = lib
-RC = rc
-CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = \
-	-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
-	-D_CRT_SECURE_NO_DEPRECATE \
-	-D_CRT_NONSTDC_NO_DEPRECATE \
-	-DARM_NEON_HASLD4 \
-	-DARM_FEATURES \
-	#
-LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
-ARFLAGS = -nologo
-RCFLAGS = /dARM64 /r
-DEFFILE = zlib.def
-RCFILE = zlib1.rc
-RESFILE = zlib1.res
-WITH_GZFILEOP = yes
-ZLIB_COMPAT =
-SUFFIX =
-
-OBJS = \
-	adler32.obj \
-	adler32_fold.obj \
-	arm_features.obj \
-	chunkset.obj \
-	compare256.obj \
-	compress.obj \
-	cpu_features.obj \
-	crc32_braid.obj \
-	crc32_braid_comb.obj \
-	crc32_fold.obj \
-	deflate.obj \
-	deflate_fast.obj \
-	deflate_huff.obj \
-	deflate_quick.obj \
-	deflate_medium.obj \
-	deflate_rle.obj \
-	deflate_slow.obj \
-	deflate_stored.obj \
-	functable.obj \
-	infback.obj \
-	inflate.obj \
-	inftrees.obj \
-	inffast.obj \
-	insert_string.obj \
-	insert_string_roll.obj \
-	slide_hash.obj \
-	trees.obj \
-	uncompr.obj \
-	zutil.obj \
-	#
-!if "$(ZLIB_COMPAT)" != ""
-WITH_GZFILEOP = yes
-WFLAGS = $(WFLAGS) -DZLIB_COMPAT
-DEFFILE = zlibcompat.def
-!else
-STATICLIB = zlib-ng.lib
-SHAREDLIB = zlib-ng1.dll
-IMPLIB = zngdll.lib
-DEFFILE = zlib-ng.def
-RCFILE = zlib-ng1.rc
-RESFILE = zlib-ng1.res
-SUFFIX = -ng
-!endif
-
-!if "$(WITH_GZFILEOP)" != ""
-WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
-OBJS = $(OBJS) gzlib.obj gzread.obj gzwrite.obj
-!endif
-
-WFLAGS = $(WFLAGS) \
-	-DARM_ACLE_CRC_HASH \
-	-D__ARM_NEON__=1 \
-	-DARM_NEON \
-	-DARM_NEON_ADLER32 \
-	-DARM_NEON_CHUNKSET \
-	-DARM_NEON_SLIDEHASH \
-	-DARM_NOCHECK_NEON \
-	#
-OBJS = $(OBJS) crc32_acle.obj insert_string_acle.obj adler32_neon.obj chunkset_neon.obj compare256_neon.obj slide_hash_neon.obj
-
-# targets
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
-     example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-!if "$(SYMBOL_PREFIX)" != ""
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib_name_mangling$(SUFFIX).h.in zlib_name_mangling$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-!else
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling.h.empty
-	$(CP) $(TOP)\zlib_name_mangling.h.empty zlib_name_mangling$(SUFFIX).h
-!endif
-
-zlib$(SUFFIX).h: zlib$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib$(SUFFIX).h.in zlib$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-gzread.c: gzread.c.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\gzread.c.in gzread.c "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-zconf: $(TOP)/zconf$(SUFFIX).h.in $(TOP)/zlib$(SUFFIX).h $(TOP)/zlib_name_mangling$(SUFFIX).h
-	$(CP) $(TOP)\zconf$(SUFFIX).h.in $(TOP)\zconf$(SUFFIX).h
-
-$(TOP)/win32/$(DEFFILE): $(TOP)/win32/$(DEFFILE).in
-	cscript $(TOP)\win32\replace.vbs $(TOP)/win32/$(DEFFILE).in $(TOP)/win32/$(DEFFILE) "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-$(STATICLIB): zconf $(OBJS)
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): zconf $(TOP)/win32/$(DEFFILE) $(OBJS) $(RESFILE)
-	$(LD) $(LDFLAGS) -def:$(TOP)/win32/$(DEFFILE) -dll -implib:$(IMPLIB) \
-	  -out:$@ -base:0x55A4C0000 $(OBJS) $(RESFILE)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;2
-
-example.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-example_d.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip_d.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-{$(TOP)}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-gzlib2.obj: gzlib.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzlib2.obj gzlib.c
-
-gzread2.obj: gzread.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzread2.obj gzread.c
-
-gzwrite2.obj: gzwrite.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzwrite2.obj gzwrite.c
-
-{$(TOP)/arch/arm}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/test}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP $<
-
-$(TOP)/zconf$(SUFFIX).h: zconf
-
-SRCDIR = $(TOP)
-# Keep the dependences in sync with top-level Makefile.in
-adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-adler32_fold.obj: $(SRCDIR)/adler32_fold.c $(SRCDIR)/zbuild.h $(SRCDIR)/adler32_fold.h $(SRCDIR)/functable.h
-chunkset.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
-gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-cpu_features.obj: $(SRCDIR)/cpu_features.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-crc32_braid.obj: $(SRCDIR)/crc32_braid.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h
-crc32_braid_comb.obj: $(SRCDIR)/crc32_braid_comb.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h $(SRCDIR)/crc32_braid_comb_p.h
-crc32_fold.obj: $(SRCDIR)/crc32_fold.c $(SRCDIR)/zbuild.h
-deflate.obj: $(SRCDIR)/deflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_fast.obj: $(SRCDIR)/deflate_fast.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_huff.obj: $(SRCDIR)/deflate_huff.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_quick.obj: $(SRCDIR)/deflate_quick.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/trees_emit.h
-deflate_medium.obj: $(SRCDIR)/deflate_medium.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_rle.obj: $(SRCDIR)/deflate_rle.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_slow.obj: $(SRCDIR)/deflate_slow.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h
-inffast.obj: $(SRCDIR)/inffast.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h
-inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
-inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
-slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-slide_hash_neon.obj: $(SRCDIR)/arch/arm/slide_hash_neon.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
-zutil.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/zutil_p.h
-
-example.obj: $(TOP)/test/example.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-$(RESFILE): $(TOP)/win32/$(RCFILE)
-	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/$(RCFILE)
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	example_d
-	echo hello world | minigzip_d | minigzip_d -d
-
-
-# cleanup
-clean:
-	-del $(STATICLIB)
-	-del $(SHAREDLIB)
-	-del $(IMPLIB)
-	-del *.obj
-	-del *.res
-	-del *.exp
-	-del *.exe
-	-del *.pdb
-	-del *.manifest
-
-distclean: clean
-	-del zconf$(SUFFIX).h
-	-del zlib$(SUFFIX).h
-	-del zlib_name_mangling$(SUFFIX).h
-	-del $(TOP)\win32\zlib.def
-	-del $(TOP)\win32\zlibcompat.def
-	-del $(TOP)\win32\zlib-ng.def
-	-del gzread.c

crates/libz-sys/src/zlib-ng/win32/Makefile.arm

diff --git a/crates/libz-sys/src/zlib-ng/win32/Makefile.arm b/crates/libz-sys/src/zlib-ng/win32/Makefile.arm
deleted file mode 100644
index 34dff1a..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/Makefile.arm
+++ /dev/null
@@ -1,260 +0,0 @@
-# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
-#
-# Usage:
-#   nmake -f win32/Makefile.arm                          (standard build)
-#   nmake -f win32/Makefile.arm LOC=-DFOO                (nonstandard build)
-
-# The toplevel directory of the source tree.
-#
-TOP = .
-
-# optional build flags
-LOC =
-
-# variables
-STATICLIB = zlib.lib
-SHAREDLIB = zlib1.dll
-IMPLIB    = zdll.lib
-SYMBOL_PREFIX =
-
-CC = cl
-LD = link
-AR = lib
-RC = rc
-CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = \
-	-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
-	-D_CRT_SECURE_NO_DEPRECATE \
-	-D_CRT_NONSTDC_NO_DEPRECATE \
-	-DARM_FEATURES \
-	-DARM_NEON_HASLD4 \
-	#
-LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
-ARFLAGS = -nologo
-RCFLAGS = /dARM /r
-DEFFILE = zlib.def
-RCFILE = zlib1.rc
-RESFILE = zlib1.res
-WITH_GZFILEOP = yes
-ZLIB_COMPAT =
-WITH_ACLE =
-WITH_NEON =
-WITH_VFPV3 =
-NEON_ARCH = /arch:VFPv4
-SUFFIX =
-
-OBJS = \
-	adler32.obj \
-	adler32_fold.obj \
-	arm_features.obj \
-	chunkset.obj \
-	compare256.obj \
-	compress.obj \
-	cpu_features.obj \
-	crc32_braid.obj \
-	crc32_braid_comb.obj \
-	crc32_fold.obj \
-	deflate.obj \
-	deflate_fast.obj \
-	deflate_huff.obj \
-	deflate_medium.obj \
-	deflate_quick.obj \
-	deflate_rle.obj \
-	deflate_slow.obj \
-	deflate_stored.obj \
-	functable.obj \
-	infback.obj \
-	inflate.obj \
-	inftrees.obj \
-	inffast.obj \
-	insert_string.obj \
-	insert_string_roll.obj \
-	slide_hash.obj \
-	trees.obj \
-	uncompr.obj \
-	zutil.obj \
-	#
-!if "$(ZLIB_COMPAT)" != ""
-WITH_GZFILEOP = yes
-WFLAGS = $(WFLAGS) -DZLIB_COMPAT
-DEFFILE = zlibcompat.def
-!else
-STATICLIB = zlib-ng.lib
-SHAREDLIB = zlib-ng1.dll
-IMPLIB = zngdll.lib
-DEFFILE = zlib-ng.def
-RCFILE = zlib-ng1.rc
-RESFILE = zlib-ng1.res
-SUFFIX = -ng
-!endif
-
-!if "$(WITH_GZFILEOP)" != ""
-WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
-OBJS = $(OBJS) gzlib.obj gzread.obj gzwrite.obj
-!endif
-
-!if "$(WITH_ACLE)" != ""
-WFLAGS = $(WFLAGS) -DARM_ACLE_CRC_HASH
-OBJS = $(OBJS) crc32_acle.obj insert_string_acle.obj
-!endif
-!if "$(WITH_VFPV3)" != ""
-NEON_ARCH = /arch:VFPv3
-!endif
-!if "$(WITH_NEON)" != ""
-CFLAGS = $(CFLAGS) $(NEON_ARCH)
-WFLAGS = $(WFLAGS) \
-	-D__ARM_NEON__=1 \
-	-DARM_NEON \
-	-DARM_NEON_ADLER32 \
-	-DARM_NEON_CHUNKSET \
-	-DARM_NEON_SLIDEHASH \
-	-DARM_NOCHECK_NEON \
-	#
-OBJS = $(OBJS) adler32_neon.obj chunkset_neon.obj compare256_neon.obj slide_hash_neon.obj
-!endif
-
-# targets
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
-     example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-!if "$(SYMBOL_PREFIX)" != ""
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib_name_mangling$(SUFFIX).h.in zlib_name_mangling$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-!else
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling.h.empty
-	$(CP) $(TOP)\zlib_name_mangling.h.empty zlib_name_mangling$(SUFFIX).h
-!endif
-
-zlib$(SUFFIX).h: zlib$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib$(SUFFIX).h.in zlib$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-gzread.c: gzread.c.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\gzread.c.in gzread.c "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-zconf: $(TOP)/zconf$(SUFFIX).h.in $(TOP)/zlib$(SUFFIX).h $(TOP)/zlib_name_mangling$(SUFFIX).h
-	$(CP) $(TOP)\zconf$(SUFFIX).h.in $(TOP)\zconf$(SUFFIX).h
-
-$(TOP)/win32/$(DEFFILE): $(TOP)/win32/$(DEFFILE).in
-	cscript $(TOP)\win32\replace.vbs $(TOP)/win32/$(DEFFILE).in $(TOP)/win32/$(DEFFILE) "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-$(STATICLIB): zconf $(OBJS)
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): zconf $(TOP)/win32/$(DEFFILE) $(OBJS) $(RESFILE)
-	$(LD) $(LDFLAGS) -def:$(TOP)/win32/$(DEFFILE) -dll -implib:$(IMPLIB) \
-	  -out:$@ -base:0x5A4C0000 $(OBJS) $(RESFILE)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;2
-
-example.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-example_d.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip_d.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-{$(TOP)}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-gzlib2.obj: gzlib.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzlib2.obj gzlib.c
-
-gzread2.obj: gzread.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzread2.obj gzread.c
-
-gzwrite2.obj: gzwrite.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzwrite2.obj gzwrite.c
-
-{$(TOP)/arch/arm}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/test}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP $<
-
-$(TOP)/zconf$(SUFFIX).h: zconf
-
-SRCDIR = $(TOP)
-# Keep the dependences in sync with top-level Makefile.in
-adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-adler32_fold.obj: $(SRCDIR)/adler32_fold.c $(SRCDIR)/zbuild.h $(SRCDIR)/adler32_fold.h $(SRCDIR)/functable.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
-gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-chunkset.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-cpu_features.obj: $(SRCDIR)/cpu_features.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-crc32_braid.obj: $(SRCDIR)/crc32_braid.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h
-crc32_braid_comb.obj: $(SRCDIR)/crc32_braid_comb.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h $(SRCDIR)/crc32_braid_comb_p.h
-crc32_fold.obj: $(SRCDIR)/crc32_fold.c $(SRCDIR)/zbuild.h
-deflate.obj: $(SRCDIR)/deflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_fast.obj: $(SRCDIR)/deflate_fast.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_huff.obj: $(SRCDIR)/deflate_huff.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_medium.obj: $(SRCDIR)/deflate_medium.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_quick.obj: $(SRCDIR)/deflate_quick.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/trees_emit.h
-deflate_rle.obj: $(SRCDIR)/deflate_rle.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_slow.obj: $(SRCDIR)/deflate_slow.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h
-inffast.obj: $(SRCDIR)/inffast.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h
-inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
-inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
-slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
-zutil.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/zutil_p.h
-
-example.obj: $(TOP)/test/example.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-$(RESFILE): $(TOP)/win32/$(RCFILE)
-	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/$(RCFILE)
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	example_d
-	echo hello world | minigzip_d | minigzip_d -d
-
-
-# cleanup
-clean:
-	-del $(STATICLIB)
-	-del $(SHAREDLIB)
-	-del $(IMPLIB)
-	-del *.obj
-	-del *.res
-	-del *.exp
-	-del *.exe
-	-del *.pdb
-	-del *.manifest
-
-distclean: clean
-	-del zconf$(SUFFIX).h
-	-del zlib$(SUFFIX).h
-	-del zlib_name_mangling$(SUFFIX).h
-	-del $(TOP)\win32\zlib.def
-	-del $(TOP)\win32\zlibcompat.def
-	-del $(TOP)\win32\zlib-ng.def
-	-del gzread.c

crates/libz-sys/src/zlib-ng/win32/Makefile.msc

diff --git a/crates/libz-sys/src/zlib-ng/win32/Makefile.msc b/crates/libz-sys/src/zlib-ng/win32/Makefile.msc
deleted file mode 100644
index 445b673..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/Makefile.msc
+++ /dev/null
@@ -1,269 +0,0 @@
-# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
-#
-# Usage:
-#   nmake -f win32/Makefile.msc                          (standard build)
-#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
-
-# The toplevel directory of the source tree.
-#
-TOP = .
-
-# optional build flags
-LOC =
-
-# variables
-STATICLIB = zlib.lib
-SHAREDLIB = zlib1.dll
-IMPLIB    = zdll.lib
-SYMBOL_PREFIX =
-
-CC = cl
-LD = link
-AR = lib
-RC = rc
-CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = \
-	-D_CRT_SECURE_NO_DEPRECATE \
-	-D_CRT_NONSTDC_NO_DEPRECATE \
-	-DX86_FEATURES \
-	-DX86_PCLMULQDQ_CRC \
-	-DX86_SSE2 \
-	-DX86_SSE42_ADLER32 \
-	-DX86_SSE42_CRC_INTRIN \
-	-DX86_SSE42_CRC_HASH \
-	-DX86_SSSE3_ADLER32 \
-	-DX86_AVX2 \
-	-DX86_AVX2_ADLER32 \
-	-DX86_AVX_CHUNKSET \
-	-DX86_SSE2_CHUNKSET
-
-LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
-ARFLAGS = -nologo
-RCFLAGS = /dWIN32 /r
-DEFFILE = zlib.def
-RCFILE = zlib1.rc
-RESFILE = zlib1.res
-WITH_GZFILEOP = yes
-ZLIB_COMPAT =
-SUFFIX =
-
-OBJS = \
-	adler32.obj \
-	adler32_avx2.obj \
-	adler32_avx512.obj \
-	adler32_avx512_vnni.obj \
-	adler32_sse42.obj \
-	adler32_ssse3.obj \
-	adler32_fold.obj \
-	chunkset.obj \
-	chunkset_avx.obj \
-	chunkset_sse2.obj \
-	compare256.obj \
-	compare256_avx2.obj \
-	compare256_sse2.obj \
-	compress.obj \
-	cpu_features.obj \
-	crc32_braid.obj \
-	crc32_braid_comb.obj \
-	crc32_fold.obj \
-	crc32_fold_pclmulqdq.obj \
-	deflate.obj \
-	deflate_fast.obj \
-	deflate_huff.obj \
-	deflate_medium.obj \
-	deflate_quick.obj \
-	deflate_rle.obj \
-	deflate_slow.obj \
-	deflate_stored.obj \
-	functable.obj \
-	infback.obj \
-	inflate.obj \
-	inftrees.obj \
-	inffast.obj \
-	insert_string.obj \
-	insert_string_roll.obj \
-	insert_string_sse42.obj \
-	slide_hash.obj \
-	slide_hash_avx2.obj \
-	slide_hash_sse2.obj \
-	trees.obj \
-	uncompr.obj \
-	zutil.obj \
-	x86_features.obj \
-	#
-!if "$(ZLIB_COMPAT)" != ""
-WITH_GZFILEOP = yes
-WFLAGS = $(WFLAGS) -DZLIB_COMPAT
-DEFFILE = zlibcompat.def
-!else
-STATICLIB = zlib-ng.lib
-SHAREDLIB = zlib-ng1.dll
-IMPLIB = zngdll.lib
-DEFFILE = zlib-ng.def
-RCFILE = zlib-ng1.rc
-RESFILE = zlib-ng1.res
-SUFFIX = -ng
-!endif
-
-!if "$(WITH_GZFILEOP)" != ""
-WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
-OBJS = $(OBJS) gzlib.obj gzread.obj gzwrite.obj
-!endif
-
-# targets
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
-     example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-!if "$(SYMBOL_PREFIX)" != ""
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib_name_mangling$(SUFFIX).h.in zlib_name_mangling$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-!else
-zlib_name_mangling$(SUFFIX).h: zlib_name_mangling.h.empty
-	$(CP) $(TOP)\zlib_name_mangling.h.empty zlib_name_mangling$(SUFFIX).h
-!endif
-
-zlib$(SUFFIX).h: zlib$(SUFFIX).h.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\zlib$(SUFFIX).h.in zlib$(SUFFIX).h "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-gzread.c: gzread.c.in
-	cscript $(TOP)\win32\replace.vbs $(TOP)\gzread.c.in gzread.c "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-zconf: $(TOP)/zconf$(SUFFIX).h.in $(TOP)/zlib$(SUFFIX).h $(TOP)/zlib_name_mangling$(SUFFIX).h
-	$(CP) $(TOP)\zconf$(SUFFIX).h.in $(TOP)\zconf$(SUFFIX).h
-
-$(TOP)/win32/$(DEFFILE): $(TOP)/win32/$(DEFFILE).in
-	cscript $(TOP)\win32\replace.vbs $(TOP)/win32/$(DEFFILE).in $(TOP)/win32/$(DEFFILE) "@ZLIB_SYMBOL_PREFIX@" "$(SYMBOL_PREFIX)"
-
-$(STATICLIB): zconf $(OBJS)
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): zconf $(TOP)/win32/$(DEFFILE) $(OBJS) $(RESFILE)
-	$(LD) $(LDFLAGS) -def:$(TOP)/win32/$(DEFFILE) -dll -implib:$(IMPLIB) \
-	  -out:$@ $(OBJS) $(RESFILE)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;2
-
-example.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-example_d.exe: example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ example.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip_d.exe: minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj gzlib2.obj gzread2.obj gzwrite2.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-{$(TOP)}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-gzlib2.obj: gzlib.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzlib2.obj gzlib.c
-
-gzread2.obj: gzread.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzread2.obj gzread.c
-
-gzwrite2.obj: gzwrite.c
-	$(CC) -c $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP -Fogzwrite2.obj gzwrite.c
-
-{$(TOP)/arch/x86}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/test}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) -DWITH_GZFILEOP $<
-
-$(TOP)/zconf$(SUFFIX).h: zconf
-
-SRCDIR = $(TOP)
-# Keep the dependences in sync with top-level Makefile.in
-adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-adler32_avx2.obj: $(SRCDIR)/arch/x86/adler32_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/cpu_features.h $(SRCDIR)/adler32_p.h $(SRCDIR)/fallback_builtins.h
-adler32_avx512.obj: $(SRCDIR)/arch/x86/adler32_avx512.c $(SRCDIR)/zbuild.h $(SRCDIR)/cpu_features.h $(SRCDIR)/adler32_p.h $(SRCDIR)/arch/x86/adler32_avx512_p.h
-adler32_avx512_vnni.obj: $(SRCDIR)/arch/x86/adler32_avx512_vnni.c $(SRCDIR)/zbuild.h $(SRCDIR)/cpu_features.h $(SRCDIR)/adler32_p.h $(SRCDIR)/arch/x86/adler32_avx512_p.h
-adler32_sse42.obj: $(SRCDIR)/arch/x86/adler32_sse42.c $(SRCDIR)/zbuild.h $(SRCDIR)/cpu_features.h $(SRCDIR)/adler32_p.h $(SRCDIR)/adler32_fold.h \
-                   $(SRCDIR)/arch/x86/adler32_ssse3_p.h
-adler32_ssse3.obj: $(SRCDIR)/arch/x86/adler32_ssse3.c $(SRCDIR)/zbuild.h $(SRCDIR)/cpu_features.h $(SRCDIR)/adler32_p.h $(SRCDIR)/adler32_fold.h \
-                   $(SRCDIR)/arch/x86/adler32_ssse3_p.h
-adler32_fold.obj: $(SRCDIR)/adler32_fold.c $(SRCDIR)/zbuild.h $(SRCDIR)/adler32_fold.h $(SRCDIR)/functable.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
-gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
-compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-chunkset.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-chunkset_avx.obj: $(SRCDIR)/arch/x86/chunkset_avx.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-chunkset_sse2.obj: $(SRCDIR)/arch/x86/chunkset_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-cpu_features.obj: $(SRCDIR)/cpu_features.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-crc32_braid.obj: $(SRCDIR)/crc32_braid.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h
-crc32_braid_comb.obj: $(SRCDIR)/crc32_braid_comb.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h $(SRCDIR)/crc32_braid_comb_p.h
-crc32_fold.obj: $(SRCDIR)/crc32_fold.c $(SRCDIR)/zbuild.h
-crc32_fold_pclmulqdq.obj: $(SRCDIR)/arch/x86/crc32_fold_pclmulqdq.c $(SRCDIR)/crc32_fold.h $(SRCDIR)/zbuild.h
-deflate.obj: $(SRCDIR)/deflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_fast.obj: $(SRCDIR)/deflate_fast.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_huff.obj: $(SRCDIR)/deflate_huff.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_medium.obj: $(SRCDIR)/deflate_medium.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_quick.obj: $(SRCDIR)/deflate_quick.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/trees_emit.h
-deflate_rle.obj: $(SRCDIR)/deflate_rle.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_slow.obj: $(SRCDIR)/deflate_slow.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
-infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h
-inffast.obj: $(SRCDIR)/inffast.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h
-inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inffast.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
-inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
-slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-slide_hash_avx2.obj: $(SRCDIR)/arch/x86/slide_hash_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-slide_hash_sse2.obj: $(SRCDIR)/arch/x86/slide_hash_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
-trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
-zutil.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/zutil_p.h
-
-example.obj: $(TOP)/test/example.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zbuild.h $(TOP)/zlib$(SUFFIX).h
-
-$(RESFILE): $(TOP)/win32/$(RCFILE)
-	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/$(RCFILE)
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	example_d
-	echo hello world | minigzip_d | minigzip_d -d
-
-
-# cleanup
-clean:
-	-del $(STATICLIB)
-	-del $(SHAREDLIB)
-	-del $(IMPLIB)
-	-del *.obj
-	-del *.res
-	-del *.exp
-	-del *.exe
-	-del *.pdb
-	-del *.manifest
-
-distclean: clean
-	-del zconf$(SUFFIX).h
-	-del zlib$(SUFFIX).h
-	-del zlib_name_mangling$(SUFFIX).h
-	-del $(TOP)\win32\zlib.def
-	-del $(TOP)\win32\zlibcompat.def
-	-del $(TOP)\win32\zlib-ng.def
-	-del gzread.c

crates/libz-sys/src/zlib-ng/win32/replace.vbs

diff --git a/crates/libz-sys/src/zlib-ng/win32/replace.vbs b/crates/libz-sys/src/zlib-ng/win32/replace.vbs
deleted file mode 100644
index 6779971..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/replace.vbs
+++ /dev/null
@@ -1,15 +0,0 @@
-strInputFileName = Wscript.Arguments(0)
-strOutputFileName = Wscript.Arguments(1)
-strOldText = Wscript.Arguments(2)
-strNewText = Wscript.Arguments(3)
-
-Set objFSO = CreateObject("Scripting.FileSystemObject")
-Set objFile = objFSO.OpenTextFile(strInputFileName, 1)
-
-strText = objFile.ReadAll
-objFile.Close
-strNewText = Replace(strText, strOldText, strNewText)
-
-Set objFile = objFSO.OpenTextFile(strOutputFileName, 2, True)
-objFile.Write strNewText
-objFile.Close

crates/libz-sys/src/zlib-ng/win32/zlib-ng.def.in

diff --git a/crates/libz-sys/src/zlib-ng/win32/zlib-ng.def.in b/crates/libz-sys/src/zlib-ng/win32/zlib-ng.def.in
deleted file mode 100644
index 642acf7..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/zlib-ng.def.in
+++ /dev/null
@@ -1,60 +0,0 @@
-; zlib-ng data compression library
-EXPORTS
-; basic functions
-    @ZLIB_SYMBOL_PREFIX@zlibng_version
-    @ZLIB_SYMBOL_PREFIX@zng_deflate
-    @ZLIB_SYMBOL_PREFIX@zng_deflateEnd
-    @ZLIB_SYMBOL_PREFIX@zng_inflate
-    @ZLIB_SYMBOL_PREFIX@zng_inflateEnd
-; advanced functions
-    @ZLIB_SYMBOL_PREFIX@zng_deflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@zng_deflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@zng_deflateCopy
-    @ZLIB_SYMBOL_PREFIX@zng_deflateReset
-    @ZLIB_SYMBOL_PREFIX@zng_deflateParams
-    @ZLIB_SYMBOL_PREFIX@zng_deflateTune
-    @ZLIB_SYMBOL_PREFIX@zng_deflateBound
-    @ZLIB_SYMBOL_PREFIX@zng_deflatePending
-    @ZLIB_SYMBOL_PREFIX@zng_deflatePrime
-    @ZLIB_SYMBOL_PREFIX@zng_deflateSetHeader
-    @ZLIB_SYMBOL_PREFIX@zng_deflateSetParams
-    @ZLIB_SYMBOL_PREFIX@zng_deflateGetParams
-    @ZLIB_SYMBOL_PREFIX@zng_inflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@zng_inflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@zng_inflateSync
-    @ZLIB_SYMBOL_PREFIX@zng_inflateCopy
-    @ZLIB_SYMBOL_PREFIX@zng_inflateReset
-    @ZLIB_SYMBOL_PREFIX@zng_inflateReset2
-    @ZLIB_SYMBOL_PREFIX@zng_inflatePrime
-    @ZLIB_SYMBOL_PREFIX@zng_inflateMark
-    @ZLIB_SYMBOL_PREFIX@zng_inflateGetHeader
-    @ZLIB_SYMBOL_PREFIX@zng_inflateBack
-    @ZLIB_SYMBOL_PREFIX@zng_inflateBackEnd
-    @ZLIB_SYMBOL_PREFIX@zng_zlibCompileFlags
-; utility functions
-    @ZLIB_SYMBOL_PREFIX@zng_compress
-    @ZLIB_SYMBOL_PREFIX@zng_compress2
-    @ZLIB_SYMBOL_PREFIX@zng_compressBound
-    @ZLIB_SYMBOL_PREFIX@zng_uncompress
-    @ZLIB_SYMBOL_PREFIX@zng_uncompress2
-; checksum functions
-    @ZLIB_SYMBOL_PREFIX@zng_adler32
-    @ZLIB_SYMBOL_PREFIX@zng_adler32_z
-    @ZLIB_SYMBOL_PREFIX@zng_crc32
-    @ZLIB_SYMBOL_PREFIX@zng_crc32_z
-    @ZLIB_SYMBOL_PREFIX@zng_adler32_combine
-    @ZLIB_SYMBOL_PREFIX@zng_crc32_combine
-; various hacks, don't look :)
-    @ZLIB_SYMBOL_PREFIX@zng_deflateInit_
-    @ZLIB_SYMBOL_PREFIX@zng_deflateInit2_
-    @ZLIB_SYMBOL_PREFIX@zng_inflateInit_
-    @ZLIB_SYMBOL_PREFIX@zng_inflateInit2_
-    @ZLIB_SYMBOL_PREFIX@zng_inflateBackInit_
-    @ZLIB_SYMBOL_PREFIX@zng_zError
-    @ZLIB_SYMBOL_PREFIX@zng_inflateSyncPoint
-    @ZLIB_SYMBOL_PREFIX@zng_get_crc_table
-    @ZLIB_SYMBOL_PREFIX@zng_inflateUndermine
-    @ZLIB_SYMBOL_PREFIX@zng_inflateValidate
-    @ZLIB_SYMBOL_PREFIX@zng_inflateCodesUsed
-    @ZLIB_SYMBOL_PREFIX@zng_inflateResetKeep
-    @ZLIB_SYMBOL_PREFIX@zng_deflateResetKeep

crates/libz-sys/src/zlib-ng/win32/zlib-ng1.rc

diff --git a/crates/libz-sys/src/zlib-ng/win32/zlib-ng1.rc b/crates/libz-sys/src/zlib-ng/win32/zlib-ng1.rc
deleted file mode 100644
index f524131..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/zlib-ng1.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <winver.h>
-#include "zlib-ng.h"
-
-#ifdef GCC_WINDRES
-VS_VERSION_INFO		VERSIONINFO
-#else
-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
-  FILEVERSION		ZLIBNG_VER_MAJOR,ZLIBNG_VER_MINOR,ZLIBNG_VER_REVISION,0
-  PRODUCTVERSION	ZLIBNG_VER_MAJOR,ZLIBNG_VER_MINOR,ZLIBNG_VER_REVISION,0
-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS		1
-#else
-  FILEFLAGS		0
-#endif
-  FILEOS		VOS__WINDOWS32
-  FILETYPE		VFT_DLL
-  FILESUBTYPE		0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-    BEGIN
-      VALUE "FileDescription",	"zlib data compression library\0"
-      VALUE "FileVersion",	ZLIBNG_VERSION "\0"
-      VALUE "InternalName",	"zlib-ng1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
-      VALUE "OriginalFilename",	"zlib-ng1.dll\0"
-      VALUE "ProductName",	"zlib\0"
-      VALUE "ProductVersion",	ZLIBNG_VERSION "\0"
-      VALUE "Comments",		"For more information visit https://www.zlib.net/\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END

crates/libz-sys/src/zlib-ng/win32/zlib.def.in

diff --git a/crates/libz-sys/src/zlib-ng/win32/zlib.def.in b/crates/libz-sys/src/zlib-ng/win32/zlib.def.in
deleted file mode 100644
index 561a42f..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/zlib.def.in
+++ /dev/null
@@ -1,64 +0,0 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    @ZLIB_SYMBOL_PREFIX@zlibVersion
-    @ZLIB_SYMBOL_PREFIX@deflate
-    @ZLIB_SYMBOL_PREFIX@deflateEnd
-    @ZLIB_SYMBOL_PREFIX@inflate
-    @ZLIB_SYMBOL_PREFIX@inflateEnd
-; advanced functions
-    @ZLIB_SYMBOL_PREFIX@deflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@deflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@deflateCopy
-    @ZLIB_SYMBOL_PREFIX@deflateReset
-    @ZLIB_SYMBOL_PREFIX@deflateParams
-    @ZLIB_SYMBOL_PREFIX@deflateTune
-    @ZLIB_SYMBOL_PREFIX@deflateBound
-    @ZLIB_SYMBOL_PREFIX@deflatePending
-    @ZLIB_SYMBOL_PREFIX@deflatePrime
-    @ZLIB_SYMBOL_PREFIX@deflateSetHeader
-    @ZLIB_SYMBOL_PREFIX@inflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@inflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@inflateSync
-    @ZLIB_SYMBOL_PREFIX@inflateCopy
-    @ZLIB_SYMBOL_PREFIX@inflateReset
-    @ZLIB_SYMBOL_PREFIX@inflateReset2
-    @ZLIB_SYMBOL_PREFIX@inflatePrime
-    @ZLIB_SYMBOL_PREFIX@inflateMark
-    @ZLIB_SYMBOL_PREFIX@inflateGetHeader
-    @ZLIB_SYMBOL_PREFIX@inflateBack
-    @ZLIB_SYMBOL_PREFIX@inflateBackEnd
-    @ZLIB_SYMBOL_PREFIX@zlibCompileFlags
-; utility functions
-    @ZLIB_SYMBOL_PREFIX@compress
-    @ZLIB_SYMBOL_PREFIX@compress2
-    @ZLIB_SYMBOL_PREFIX@compressBound
-    @ZLIB_SYMBOL_PREFIX@uncompress
-    @ZLIB_SYMBOL_PREFIX@uncompress2
-; large file functions
-    @ZLIB_SYMBOL_PREFIX@adler32_combine64
-    @ZLIB_SYMBOL_PREFIX@crc32_combine64
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_gen64
-; checksum functions
-    @ZLIB_SYMBOL_PREFIX@adler32
-    @ZLIB_SYMBOL_PREFIX@adler32_z
-    @ZLIB_SYMBOL_PREFIX@crc32
-    @ZLIB_SYMBOL_PREFIX@crc32_z
-    @ZLIB_SYMBOL_PREFIX@adler32_combine
-    @ZLIB_SYMBOL_PREFIX@crc32_combine
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_gen
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_op
-; various hacks, don't look :)
-    @ZLIB_SYMBOL_PREFIX@deflateInit_
-    @ZLIB_SYMBOL_PREFIX@deflateInit2_
-    @ZLIB_SYMBOL_PREFIX@inflateInit_
-    @ZLIB_SYMBOL_PREFIX@inflateInit2_
-    @ZLIB_SYMBOL_PREFIX@inflateBackInit_
-    @ZLIB_SYMBOL_PREFIX@zError
-    @ZLIB_SYMBOL_PREFIX@inflateSyncPoint
-    @ZLIB_SYMBOL_PREFIX@get_crc_table
-    @ZLIB_SYMBOL_PREFIX@inflateUndermine
-    @ZLIB_SYMBOL_PREFIX@inflateValidate
-    @ZLIB_SYMBOL_PREFIX@inflateCodesUsed
-    @ZLIB_SYMBOL_PREFIX@inflateResetKeep
-    @ZLIB_SYMBOL_PREFIX@deflateResetKeep

crates/libz-sys/src/zlib-ng/win32/zlib1.rc

diff --git a/crates/libz-sys/src/zlib-ng/win32/zlib1.rc b/crates/libz-sys/src/zlib-ng/win32/zlib1.rc
deleted file mode 100644
index ee0b287..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/zlib1.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <winver.h>
-#include "zlib.h"
-
-#ifdef GCC_WINDRES
-VS_VERSION_INFO		VERSIONINFO
-#else
-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
-  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS		1
-#else
-  FILEFLAGS		0
-#endif
-  FILEOS		VOS__WINDOWS32
-  FILETYPE		VFT_DLL
-  FILESUBTYPE		0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-    BEGIN
-      VALUE "FileDescription",	"zlib data compression library\0"
-      VALUE "FileVersion",	ZLIB_VERSION "\0"
-      VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
-      VALUE "OriginalFilename",	"zlib1.dll\0"
-      VALUE "ProductName",	"zlib\0"
-      VALUE "ProductVersion",	ZLIB_VERSION "\0"
-      VALUE "Comments",		"For more information visit https://www.zlib.net/\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END

crates/libz-sys/src/zlib-ng/win32/zlibcompat.def.in

diff --git a/crates/libz-sys/src/zlib-ng/win32/zlibcompat.def.in b/crates/libz-sys/src/zlib-ng/win32/zlibcompat.def.in
deleted file mode 100644
index 52a713c..0000000
--- a/crates/libz-sys/src/zlib-ng/win32/zlibcompat.def.in
+++ /dev/null
@@ -1,97 +0,0 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    @ZLIB_SYMBOL_PREFIX@zlibVersion
-    @ZLIB_SYMBOL_PREFIX@deflate
-    @ZLIB_SYMBOL_PREFIX@deflateEnd
-    @ZLIB_SYMBOL_PREFIX@inflate
-    @ZLIB_SYMBOL_PREFIX@inflateEnd
-; advanced functions
-    @ZLIB_SYMBOL_PREFIX@deflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@deflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@deflateCopy
-    @ZLIB_SYMBOL_PREFIX@deflateReset
-    @ZLIB_SYMBOL_PREFIX@deflateParams
-    @ZLIB_SYMBOL_PREFIX@deflateTune
-    @ZLIB_SYMBOL_PREFIX@deflateBound
-    @ZLIB_SYMBOL_PREFIX@deflatePending
-    @ZLIB_SYMBOL_PREFIX@deflatePrime
-    @ZLIB_SYMBOL_PREFIX@deflateSetHeader
-    @ZLIB_SYMBOL_PREFIX@inflateSetDictionary
-    @ZLIB_SYMBOL_PREFIX@inflateGetDictionary
-    @ZLIB_SYMBOL_PREFIX@inflateSync
-    @ZLIB_SYMBOL_PREFIX@inflateCopy
-    @ZLIB_SYMBOL_PREFIX@inflateReset
-    @ZLIB_SYMBOL_PREFIX@inflateReset2
-    @ZLIB_SYMBOL_PREFIX@inflatePrime
-    @ZLIB_SYMBOL_PREFIX@inflateMark
-    @ZLIB_SYMBOL_PREFIX@inflateGetHeader
-    @ZLIB_SYMBOL_PREFIX@inflateBack
-    @ZLIB_SYMBOL_PREFIX@inflateBackEnd
-    @ZLIB_SYMBOL_PREFIX@zlibCompileFlags
-; utility functions
-    @ZLIB_SYMBOL_PREFIX@compress
-    @ZLIB_SYMBOL_PREFIX@compress2
-    @ZLIB_SYMBOL_PREFIX@compressBound
-    @ZLIB_SYMBOL_PREFIX@uncompress
-    @ZLIB_SYMBOL_PREFIX@uncompress2
-    @ZLIB_SYMBOL_PREFIX@gzopen
-    @ZLIB_SYMBOL_PREFIX@gzdopen
-    @ZLIB_SYMBOL_PREFIX@gzbuffer
-    @ZLIB_SYMBOL_PREFIX@gzsetparams
-    @ZLIB_SYMBOL_PREFIX@gzread
-    @ZLIB_SYMBOL_PREFIX@gzfread
-    @ZLIB_SYMBOL_PREFIX@gzwrite
-    @ZLIB_SYMBOL_PREFIX@gzfwrite
-    @ZLIB_SYMBOL_PREFIX@gzprintf
-    @ZLIB_SYMBOL_PREFIX@gzvprintf
-    @ZLIB_SYMBOL_PREFIX@gzputs
-    @ZLIB_SYMBOL_PREFIX@gzgets
-    @ZLIB_SYMBOL_PREFIX@gzputc
-    @ZLIB_SYMBOL_PREFIX@gzgetc
-    @ZLIB_SYMBOL_PREFIX@gzungetc
-    @ZLIB_SYMBOL_PREFIX@gzflush
-    @ZLIB_SYMBOL_PREFIX@gzseek
-    @ZLIB_SYMBOL_PREFIX@gzrewind
-    @ZLIB_SYMBOL_PREFIX@gztell
-    @ZLIB_SYMBOL_PREFIX@gzoffset
-    @ZLIB_SYMBOL_PREFIX@gzeof
-    @ZLIB_SYMBOL_PREFIX@gzdirect
-    @ZLIB_SYMBOL_PREFIX@gzclose
-    @ZLIB_SYMBOL_PREFIX@gzclose_r
-    @ZLIB_SYMBOL_PREFIX@gzclose_w
-    @ZLIB_SYMBOL_PREFIX@gzerror
-    @ZLIB_SYMBOL_PREFIX@gzclearerr
-; large file functions
-    @ZLIB_SYMBOL_PREFIX@gzopen64
-    @ZLIB_SYMBOL_PREFIX@gzseek64
-    @ZLIB_SYMBOL_PREFIX@gztell64
-    @ZLIB_SYMBOL_PREFIX@gzoffset64
-    @ZLIB_SYMBOL_PREFIX@adler32_combine64
-    @ZLIB_SYMBOL_PREFIX@crc32_combine64
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_gen64
-; checksum functions
-    @ZLIB_SYMBOL_PREFIX@adler32
-    @ZLIB_SYMBOL_PREFIX@adler32_z
-    @ZLIB_SYMBOL_PREFIX@crc32
-    @ZLIB_SYMBOL_PREFIX@crc32_z
-    @ZLIB_SYMBOL_PREFIX@adler32_combine
-    @ZLIB_SYMBOL_PREFIX@crc32_combine
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_gen
-    @ZLIB_SYMBOL_PREFIX@crc32_combine_op
-; various hacks, don't look :)
-    @ZLIB_SYMBOL_PREFIX@deflateInit_
-    @ZLIB_SYMBOL_PREFIX@deflateInit2_
-    @ZLIB_SYMBOL_PREFIX@inflateInit_
-    @ZLIB_SYMBOL_PREFIX@inflateInit2_
-    @ZLIB_SYMBOL_PREFIX@inflateBackInit_
-    @ZLIB_SYMBOL_PREFIX@gzgetc_
-    @ZLIB_SYMBOL_PREFIX@zError
-    @ZLIB_SYMBOL_PREFIX@inflateSyncPoint
-    @ZLIB_SYMBOL_PREFIX@get_crc_table
-    @ZLIB_SYMBOL_PREFIX@inflateUndermine
-    @ZLIB_SYMBOL_PREFIX@inflateValidate
-    @ZLIB_SYMBOL_PREFIX@inflateCodesUsed
-    @ZLIB_SYMBOL_PREFIX@inflateResetKeep
-    @ZLIB_SYMBOL_PREFIX@deflateResetKeep
-    @ZLIB_SYMBOL_PREFIX@gzopen_w

crates/libz-sys/src/zlib-ng/zbuild.h

diff --git a/crates/libz-sys/src/zlib-ng/zbuild.h b/crates/libz-sys/src/zlib-ng/zbuild.h
deleted file mode 100644
index 82374b1..0000000
--- a/crates/libz-sys/src/zlib-ng/zbuild.h
+++ /dev/null
@@ -1,256 +0,0 @@
-#ifndef _ZBUILD_H
-#define _ZBUILD_H
-
-#define _POSIX_SOURCE 1  /* fileno */
-#ifndef _POSIX_C_SOURCE
-#  define _POSIX_C_SOURCE 200112L /* snprintf, posix_memalign */
-#endif
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-/* Determine compiler version of C Standard */
-#ifdef __STDC_VERSION__
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#  if __STDC_VERSION__ >= 201112L
-#    ifndef STDC11
-#      define STDC11
-#    endif
-#  endif
-#endif
-
-/* Determine compiler support for TLS */
-#ifndef Z_TLS
-#  if defined(STDC11) && !defined(__STDC_NO_THREADS__)
-#    define Z_TLS _Thread_local
-#  elif defined(__GNUC__) || defined(__SUNPRO_C)
-#    define Z_TLS __thread
-#  elif defined(_WIN32) && (defined(_MSC_VER) || defined(__ICL))
-#    define Z_TLS __declspec(thread)
-#  else
-#    warning Unable to detect Thread Local Storage support.
-#    define Z_TLS
-#  endif
-#endif
-
-/* This has to be first include that defines any types */
-#if defined(_MSC_VER)
-#  if defined(_WIN64)
-    typedef __int64 ssize_t;
-#  else
-    typedef long ssize_t;
-#  endif
-#endif
-
-/* MS Visual Studio does not allow inline in C, only C++.
-   But it provides __inline instead, so use that. */
-#if defined(_MSC_VER) && !defined(inline) && !defined(__cplusplus)
-#  define inline __inline
-#endif
-
-#if defined(ZLIB_COMPAT)
-#  define PREFIX(x) x
-#  define PREFIX2(x) ZLIB_ ## x
-#  define PREFIX3(x) z_ ## x
-#  define PREFIX4(x) x ## 64
-#  define zVersion zlibVersion
-#  define z_size_t unsigned long
-#else
-#  define PREFIX(x) zng_ ## x
-#  define PREFIX2(x) ZLIBNG_ ## x
-#  define PREFIX3(x) zng_ ## x
-#  define PREFIX4(x) zng_ ## x
-#  define zVersion zlibng_version
-#  define z_size_t size_t
-#endif
-
-/* Minimum of a and b. */
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-/* Maximum of a and b. */
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-/* Ignore unused variable warning */
-#define Z_UNUSED(var) (void)(var)
-
-#if defined(HAVE_VISIBILITY_INTERNAL)
-#  define Z_INTERNAL __attribute__((visibility ("internal")))
-#elif defined(HAVE_VISIBILITY_HIDDEN)
-#  define Z_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define Z_INTERNAL
-#endif
-
-#ifndef __cplusplus
-#  define Z_REGISTER register
-#else
-#  define Z_REGISTER
-#endif
-
-/* Reverse the bytes in a value. Use compiler intrinsics when
-   possible to take advantage of hardware implementations. */
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#  include <stdlib.h>
-#  pragma intrinsic(_byteswap_ulong)
-#  define ZSWAP16(q) _byteswap_ushort(q)
-#  define ZSWAP32(q) _byteswap_ulong(q)
-#  define ZSWAP64(q) _byteswap_uint64(q)
-
-#elif defined(__clang__) || (defined(__GNUC__) && \
-        (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
-#  define ZSWAP16(q) __builtin_bswap16(q)
-#  define ZSWAP32(q) __builtin_bswap32(q)
-#  define ZSWAP64(q) __builtin_bswap64(q)
-
-#elif defined(__GNUC__) && (__GNUC__ >= 2) && defined(__linux__)
-#  include <byteswap.h>
-#  define ZSWAP16(q) bswap_16(q)
-#  define ZSWAP32(q) bswap_32(q)
-#  define ZSWAP64(q) bswap_64(q)
-
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#  include <sys/endian.h>
-#  define ZSWAP16(q) bswap16(q)
-#  define ZSWAP32(q) bswap32(q)
-#  define ZSWAP64(q) bswap64(q)
-#elif defined(__OpenBSD__)
-#  include <sys/endian.h>
-#  define ZSWAP16(q) swap16(q)
-#  define ZSWAP32(q) swap32(q)
-#  define ZSWAP64(q) swap64(q)
-#elif defined(__INTEL_COMPILER)
-/* ICC does not provide a two byte swap. */
-#  define ZSWAP16(q) ((((q) & 0xff) << 8) | (((q) & 0xff00) >> 8))
-#  define ZSWAP32(q) _bswap(q)
-#  define ZSWAP64(q) _bswap64(q)
-
-#else
-#  define ZSWAP16(q) ((((q) & 0xff) << 8) | (((q) & 0xff00) >> 8))
-#  define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-#  define ZSWAP64(q)                           \
-         (((q & 0xFF00000000000000u) >> 56u) | \
-          ((q & 0x00FF000000000000u) >> 40u) | \
-          ((q & 0x0000FF0000000000u) >> 24u) | \
-          ((q & 0x000000FF00000000u) >> 8u)  | \
-          ((q & 0x00000000FF000000u) << 8u)  | \
-          ((q & 0x0000000000FF0000u) << 24u) | \
-          ((q & 0x000000000000FF00u) << 40u) | \
-          ((q & 0x00000000000000FFu) << 56u))
-#endif
-
-/* Only enable likely/unlikely if the compiler is known to support it */
-#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined(__INTEL_COMPILER) || defined(__clang__)
-#  define LIKELY_NULL(x)        __builtin_expect((x) != 0, 0)
-#  define LIKELY(x)             __builtin_expect(!!(x), 1)
-#  define UNLIKELY(x)           __builtin_expect(!!(x), 0)
-#  define PREFETCH_L1(addr)     __builtin_prefetch(addr, 0, 3)
-#  define PREFETCH_L2(addr)     __builtin_prefetch(addr, 0, 2)
-#  define PREFETCH_RW(addr)     __builtin_prefetch(addr, 1, 2)
-#elif defined(__WIN__)
-#  include <xmmintrin.h>
-#  define LIKELY_NULL(x)        x
-#  define LIKELY(x)             x
-#  define UNLIKELY(x)           x
-#  define PREFETCH_L1(addr)     _mm_prefetch((char *) addr, _MM_HINT_T0)
-#  define PREFETCH_L2(addr)     _mm_prefetch((char *) addr, _MM_HINT_T1)
-#  define PREFETCH_RW(addr)     _mm_prefetch((char *) addr, _MM_HINT_T1)
-#else
-#  define LIKELY_NULL(x)        x
-#  define LIKELY(x)             x
-#  define UNLIKELY(x)           x
-#  define PREFETCH_L1(addr)     addr
-#  define PREFETCH_L2(addr)     addr
-#  define PREFETCH_RW(addr)     addr
-#endif /* (un)likely */
-
-#if defined(__clang__) || defined(__GNUC__)
-#  define ALIGNED_(x) __attribute__ ((aligned(x)))
-#elif defined(_MSC_VER)
-#  define ALIGNED_(x) __declspec(align(x))
-#endif
-
-/* Diagnostic functions */
-#ifdef ZLIB_DEBUG
-#  include <stdio.h>
-   extern int Z_INTERNAL z_verbose;
-   extern void Z_INTERNAL z_error(char *m);
-#  define Assert(cond, msg) {if (!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose >= 0) fprintf x;}
-#  define Tracev(x) {if (z_verbose > 0) fprintf x;}
-#  define Tracevv(x) {if (z_verbose > 1) fprintf x;}
-#  define Tracec(c, x) {if (z_verbose > 0 && (c)) fprintf x;}
-#  define Tracecv(c, x) {if (z_verbose > 1 && (c)) fprintf x;}
-#else
-#  define Assert(cond, msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c, x)
-#  define Tracecv(c, x)
-#endif
-
-#ifndef NO_UNALIGNED
-#  if defined(__x86_64__) || defined(_M_X64) || defined(__amd64__) || defined(_M_AMD64)
-#    define UNALIGNED_OK
-#    define UNALIGNED64_OK
-#  elif defined(__i386__) || defined(__i486__) || defined(__i586__) || \
-        defined(__i686__) || defined(_X86_) || defined(_M_IX86)
-#    define UNALIGNED_OK
-#  elif defined(__aarch64__) || defined(_M_ARM64)
-#    if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__)
-#      define UNALIGNED_OK
-#      define UNALIGNED64_OK
-#    endif
-#  elif defined(__arm__) || (_M_ARM >= 7)
-#    if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__)
-#      define UNALIGNED_OK
-#    endif
-#  elif defined(__powerpc64__) || defined(__ppc64__)
-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#      define UNALIGNED_OK
-#      define UNALIGNED64_OK
-#    endif
-#  endif
-#endif
-
-/* Force compiler to emit unaligned memory accesses if unaligned access is supported
-   on the architecture, otherwise don't assume unaligned access is supported. Older
-   compilers don't optimize memcpy and memcmp calls to unaligned access instructions
-   when it is supported on the architecture resulting in significant performance impact.
-   Newer compilers might optimize memcpy but not all optimize memcmp for all integer types. */
-#ifdef UNALIGNED_OK
-#  define zmemcpy_2(dest, src)    (*((uint16_t *)(dest)) = *((uint16_t *)(src)))
-#  define zmemcmp_2(str1, str2)   (*((uint16_t *)(str1)) != *((uint16_t *)(str2)))
-#  define zmemcpy_4(dest, src)    (*((uint32_t *)(dest)) = *((uint32_t *)(src)))
-#  define zmemcmp_4(str1, str2)   (*((uint32_t *)(str1)) != *((uint32_t *)(str2)))
-#  if defined(UNALIGNED64_OK) && (UINTPTR_MAX == UINT64_MAX)
-#    define zmemcpy_8(dest, src)  (*((uint64_t *)(dest)) = *((uint64_t *)(src)))
-#    define zmemcmp_8(str1, str2) (*((uint64_t *)(str1)) != *((uint64_t *)(str2)))
-#  else
-#    define zmemcpy_8(dest, src)  (((uint32_t *)(dest))[0] = ((uint32_t *)(src))[0], \
-                                   ((uint32_t *)(dest))[1] = ((uint32_t *)(src))[1])
-#    define zmemcmp_8(str1, str2) (((uint32_t *)(str1))[0] != ((uint32_t *)(str2))[0] || \
-                                   ((uint32_t *)(str1))[1] != ((uint32_t *)(str2))[1])
-#  endif
-#else
-#  define zmemcpy_2(dest, src)  memcpy(dest, src, 2)
-#  define zmemcmp_2(str1, str2) memcmp(str1, str2, 2)
-#  define zmemcpy_4(dest, src)  memcpy(dest, src, 4)
-#  define zmemcmp_4(str1, str2) memcmp(str1, str2, 4)
-#  define zmemcpy_8(dest, src)  memcpy(dest, src, 8)
-#  define zmemcmp_8(str1, str2) memcmp(str1, str2, 8)
-#endif
-
-#if defined(__has_feature)
-#  if __has_feature(memory_sanitizer)
-#    define Z_MEMORY_SANITIZER 1
-#    include <sanitizer/msan_interface.h>
-#  endif
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/zconf-ng.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zconf-ng.h.in b/crates/libz-sys/src/zlib-ng/zconf-ng.h.in
deleted file mode 100644
index 21629c7..0000000
--- a/crates/libz-sys/src/zlib-ng/zconf-ng.h.in
+++ /dev/null
@@ -1,171 +0,0 @@
-/* zconf-ng.h -- configuration of the zlib-ng compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ZCONFNG_H
-#define ZCONFNG_H
-
-#include "zlib_name_mangling-ng.h"
-
-#if !defined(_WIN32) && defined(__WIN32__)
-#  define _WIN32
-#endif
-
-/* Clang macro for detecting declspec support
- * https://clang.llvm.org/docs/LanguageExtensions.html#has-declspec-attribute
- */
-#ifndef __has_declspec_attribute
-#  define __has_declspec_attribute(x) 0
-#endif
-
-/* Always define z_const as const */
-#define z_const const
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  define MAX_MEM_LEVEL 9
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-/* Type declarations */
-
-#ifdef ZLIB_INTERNAL
-#  define Z_INTERNAL ZLIB_INTERNAL
-#endif
-
-/* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-#if defined(ZLIB_DLL) && (defined(_WIN32) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport)))
-#  ifdef Z_INTERNAL
-#    define Z_EXTERN extern __declspec(dllexport)
-#  else
-#    define Z_EXTERN extern __declspec(dllimport)
-#  endif
-#endif
-
-/* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-#if defined(ZLIB_WINAPI) && defined(_WIN32)
-#  include <windows.h>
-   /* No need for _export, use ZLIB.DEF instead. */
-   /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#  define Z_EXPORT WINAPI
-#  define Z_EXPORTVA WINAPIV
-#endif
-
-#ifndef Z_EXTERN
-#  define Z_EXTERN extern
-#endif
-#ifndef Z_EXPORT
-#  define Z_EXPORT
-#endif
-#ifndef Z_EXPORTVA
-#  define Z_EXPORTVA
-#endif
-
-/* Fallback for something that includes us. */
-typedef unsigned char Byte;
-typedef Byte Bytef;
-
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-typedef char  charf;
-typedef int   intf;
-typedef uInt  uIntf;
-typedef uLong uLongf;
-
-typedef void const *voidpc;
-typedef void       *voidpf;
-typedef void       *voidp;
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by configure/cmake/etc */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef NEED_PTRDIFF_T    /* may be set to #if 1 by configure/cmake/etc */
-typedef PTRDIFF_TYPE ptrdiff_t;
-#endif
-
-#include <sys/types.h>      /* for off_t */
-#include <stdarg.h>         /* for va_list */
-
-#include <stddef.h>         /* for wchar_t and NULL */
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#  ifndef z_off_t
-#    define z_off_t off_t
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && defined(WITH_GZFILEOP)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(__MSYS__)
-#    define z_off64_t _off64_t
-#  elif defined(_WIN32) && !defined(__GNUC__)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-#endif /* ZCONFNG_H */

crates/libz-sys/src/zlib-ng/zconf.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zconf.h.in b/crates/libz-sys/src/zlib-ng/zconf.h.in
deleted file mode 100644
index fef6bab..0000000
--- a/crates/libz-sys/src/zlib-ng/zconf.h.in
+++ /dev/null
@@ -1,191 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-#include "zlib_name_mangling.h"
-
-#if !defined(_WIN32) && defined(__WIN32__)
-#  define _WIN32
-#endif
-
-/* Clang macro for detecting declspec support
- * https://clang.llvm.org/docs/LanguageExtensions.html#has-declspec-attribute
- */
-#ifndef __has_declspec_attribute
-#  define __has_declspec_attribute(x) 0
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  define MAX_MEM_LEVEL 9
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-/* Type declarations */
-
-
-#ifndef OF /* function prototypes */
-#  define OF(args)  args
-#endif
-
-#ifdef ZLIB_INTERNAL
-#  define Z_INTERNAL ZLIB_INTERNAL
-#endif
-
-/* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-#if defined(ZLIB_DLL) && (defined(_WIN32) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport)))
-#  ifdef Z_INTERNAL
-#    define Z_EXTERN extern __declspec(dllexport)
-#  else
-#    define Z_EXTERN extern __declspec(dllimport)
-#  endif
-#endif
-
-/* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-#if defined(ZLIB_WINAPI) && defined(_WIN32)
-#  include <windows.h>
-   /* No need for _export, use ZLIB.DEF instead. */
-   /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#  define Z_EXPORT WINAPI
-#  define Z_EXPORTVA WINAPIV
-#endif
-
-#ifndef Z_EXTERN
-#  define Z_EXTERN extern
-#endif
-#ifndef Z_EXPORT
-#  define Z_EXPORT
-#endif
-#ifndef Z_EXPORTVA
-#  define Z_EXPORTVA
-#endif
-
-/* For backwards compatibility */
-
-#ifndef ZEXTERN
-#  define ZEXTERN Z_EXTERN
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT Z_EXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA Z_EXPORTVA
-#endif
-
-/* Fallback for something that includes us. */
-typedef unsigned char Byte;
-typedef Byte Bytef;
-
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-typedef char  charf;
-typedef int   intf;
-typedef uInt  uIntf;
-typedef uLong uLongf;
-
-typedef void const *voidpc;
-typedef void       *voidpf;
-typedef void       *voidp;
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by configure/cmake/etc */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef NEED_PTRDIFF_T    /* may be set to #if 1 by configure/cmake/etc */
-typedef PTRDIFF_TYPE ptrdiff_t;
-#endif
-
-#include <sys/types.h>      /* for off_t */
-#include <stdarg.h>         /* for va_list */
-
-#include <stddef.h>         /* for wchar_t and NULL */
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#  ifndef z_off_t
-#    define z_off_t off_t
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(__MSYS__)
-#    define z_off64_t _off64_t
-#  elif defined(_WIN32) && !defined(__GNUC__)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-#endif /* ZCONF_H */

crates/libz-sys/src/zlib-ng/zendian.h

diff --git a/crates/libz-sys/src/zlib-ng/zendian.h b/crates/libz-sys/src/zlib-ng/zendian.h
deleted file mode 100644
index 54718ed..0000000
--- a/crates/libz-sys/src/zlib-ng/zendian.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* zendian.h -- define BYTE_ORDER for endian tests
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ENDIAN_H_
-#define ENDIAN_H_
-
-/* First check whether the compiler knows the target __BYTE_ORDER__. */
-#if defined(__BYTE_ORDER__)
-#  if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#    if !defined(LITTLE_ENDIAN)
-#      define LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
-#    endif
-#    if !defined(BYTE_ORDER)
-#      define BYTE_ORDER LITTLE_ENDIAN
-#    endif
-#  elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#    if !defined(BIG_ENDIAN)
-#      define BIG_ENDIAN __ORDER_BIG_ENDIAN__
-#    endif
-#    if !defined(BYTE_ORDER)
-#      define BYTE_ORDER BIG_ENDIAN
-#    endif
-#  endif
-#elif defined(__MINGW32__)
-#  include <sys/param.h>
-#elif defined(_WIN32)
-#  define LITTLE_ENDIAN 1234
-#  define BIG_ENDIAN 4321
-#  if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined (_M_ARM) || defined (_M_ARM64)
-#    define BYTE_ORDER LITTLE_ENDIAN
-#  else
-#    error Unknown endianness!
-#  endif
-#elif defined(__linux__)
-#  include <endian.h>
-#elif defined(__APPLE__) || defined(__arm__) || defined(__aarch64__)
-#  include <machine/endian.h>
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-#  include <sys/endian.h>
-#elif defined(__sun) || defined(sun)
-#  include <sys/byteorder.h>
-#  if !defined(LITTLE_ENDIAN)
-#    define LITTLE_ENDIAN 4321
-#   endif
-#  if !defined(BIG_ENDIAN)
-#    define BIG_ENDIAN 1234
-#  endif
-#  if !defined(BYTE_ORDER)
-#    if defined(_BIG_ENDIAN)
-#      define BYTE_ORDER BIG_ENDIAN
-#    else
-#      define BYTE_ORDER LITTLE_ENDIAN
-#    endif
-#  endif
-#else
-#  include <endian.h>
-#endif
-
-#endif

crates/libz-sys/src/zlib-ng/zlib-ng.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zlib-ng.h.in b/crates/libz-sys/src/zlib-ng/zlib-ng.h.in
deleted file mode 100644
index c059cd0..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib-ng.h.in
+++ /dev/null
@@ -1,1903 +0,0 @@
-#ifndef ZNGLIB_H_
-#define ZNGLIB_H_
-/* zlib-ng.h -- interface of the 'zlib-ng' compression library, forked from zlib.
-
-  Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files https://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifdef ZLIB_H_
-#  error Include zlib-ng.h for zlib-ng API or zlib.h for zlib-compat API but not both
-#endif
-
-#ifndef RC_INVOKED
-#include "zconf-ng.h"
-
-#include <stdint.h>
-
-#ifndef ZCONFNG_H
-#  error Missing zconf-ng.h add binary output directory to include directories
-#endif
-#endif  /* RC_INVOKED */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIBNG_VERSION "2.1.0.devel"
-#define ZLIBNG_VERNUM 0x02010000L   /* MMNNRRMS: major minor revision status modified */
-#define ZLIBNG_VER_MAJOR 2
-#define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 0
-#define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
-#define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip and raw deflate streams in
-  memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in the case of corrupted input.
-*/
-
-typedef void *(*alloc_func) (void *opaque, unsigned int items, unsigned int size);
-typedef void  (*free_func)  (void *opaque, void *address);
-
-struct internal_state;
-
-typedef struct zng_stream_s {
-    const uint8_t         *next_in;   /* next input byte */
-    uint32_t              avail_in;   /* number of bytes available at next_in */
-    size_t                total_in;   /* total number of input bytes read so far */
-
-    uint8_t               *next_out;  /* next output byte will go here */
-    uint32_t              avail_out;  /* remaining free space at next_out */
-    size_t                total_out;  /* total number of bytes output so far */
-
-    const char            *msg;       /* last error message, NULL if no error */
-    struct internal_state *state;     /* not visible by applications */
-
-    alloc_func            zalloc;     /* used to allocate the internal state */
-    free_func             zfree;      /* used to free the internal state */
-    void                  *opaque;    /* private data object passed to zalloc and zfree */
-
-    int                   data_type;  /* best guess about the data type: binary or text
-                                         for deflate, or the decoding state for inflate */
-    uint32_t              adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    unsigned long         reserved;   /* reserved for future use */
-} zng_stream;
-
-typedef zng_stream *zng_streamp;  /* Obsolete type, retained for compatibility only */
-
-/*
-    gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct zng_gz_header_s {
-    int32_t         text;       /* true if compressed data believed to be text */
-    unsigned long   time;       /* modification time */
-    int32_t         xflags;     /* extra flags (not used when writing a gzip file) */
-    int32_t         os;         /* operating system */
-    uint8_t         *extra;     /* pointer to extra field or NULL if none */
-    uint32_t        extra_len;  /* extra field length (valid if extra != NULL) */
-    uint32_t        extra_max;  /* space at extra (only when reading header) */
-    uint8_t         *name;      /* pointer to zero-terminated file name or NULL */
-    uint32_t        name_max;   /* space at name (only when reading header) */
-    uint8_t         *comment;   /* pointer to zero-terminated comment or NULL */
-    uint32_t        comm_max;   /* space at comment (only when reading header) */
-    int32_t         hcrc;       /* true if there was or will be a header crc */
-    int32_t         done;       /* true when done reading gzip header (not used when writing a gzip file) */
-} zng_gz_header;
-
-typedef zng_gz_header *zng_gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
-   Z_NULL on entry to the initialization function, they are set to internal
-   routines that use the standard library functions malloc() and free().
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field for deflate() */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  NULL  /* for compatibility with zlib, was for initializing zalloc, zfree, opaque */
-
-
-                        /* basic functions */
-
-Z_EXTERN Z_EXPORT
-const char *zlibng_version(void);
-/* The application can compare zlibng_version and ZLIBNG_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib-ng.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-Z_EXTERN Z_EXPORT
-int zng_deflateInit(zng_stream *strm, int level);
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zng_version) is incompatible
-   with the version assumed by the caller (ZLIBNG_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflate(zng_stream *strm, int32_t flush);
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary.  Some output may be provided even if
-    flush is zero.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more output
-  in that case.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed
-  codes block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  function must be called again with Z_FINISH and more output space (updated
-  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  on the stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  compression is to be done in a single step.  In order to complete in one
-  call, avail_out must be at least the value returned by deflateBound (see
-  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  output space is provided, deflate will not return Z_STREAM_END, and it must
-  be called again as described above.
-
-    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).  If a gzip stream is being generated, then
-  strm->adler will be the CRC-32 checksum of the input read so far.  (See
-  deflateInit2 below.)
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  considered binary.  This field is only for information purposes and does not
-  affect the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL) or the state was inadvertently written over
-  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  deflate() can be called again with more input and more output space to
-  continue compressing.
-*/
-
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateEnd(zng_stream *strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-Z_EXTERN Z_EXPORT
-int zng_inflateInit(zng_stream *strm);
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provided input is not
-   read or consumed.  The allocation of a sliding window will be deferred to
-   the first call of inflate (if the decompression does not complete on the
-   first call).  If zalloc and zfree are set to NULL, inflateInit updates
-   them to use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression.
-   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   next_out, and avail_out are unused and unchanged.  The current
-   implementation of inflateInit() does not process any header information --
-   that is deferred until inflate() is called.
-*/
-
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflate(zng_stream *strm, int32_t flush);
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_in are updated
-    accordingly, and processing will resume at this point for the next call of
-    inflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  If the
-  caller of inflate() does not provide both available input and available
-  output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
-  uncompressed length, modulo 2^32.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value, in which case strm->msg points to a string with a more specific
-  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was NULL, or the state was inadvertently written over
-  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
-  if no progress is possible or if there was not enough room in the output
-  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is to be attempted.
-*/
-
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateEnd(zng_stream *strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-Z_EXTERN Z_EXPORT
-int zng_deflateInit2(zng_stream *strm, int  level, int  method, int  windowBits, int  memLevel, int  strategy);
-
-     This is another version of deflateInit with more compression options.  The
-   fields zalloc, zfree and opaque must be initialized before by the caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     For the current implementation of deflate(), a windowBits value of 8 (a
-   window size of 256 bytes) is not supported.  As a result, a request for 8
-   will result in 9 (a 512-byte window).  In that case, providing 8 to
-   inflateInit2() will result in an error when the zlib header with 9 is
-   checked against the initialization of inflate().  The remedy is to not use 8
-   with deflateInit2() with this initialization, or at least in that case use 9
-   with inflateInit2().
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute a check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to the appropriate value,
-   if the operating system was determined at compile time.  If a gzip stream is
-   being written, strm->adler is a CRC-32 instead of an Adler-32.
-
-     For raw deflate or gzip encoding, a request for a 256-byte window is
-   rejected as invalid, since only the zlib header provides a means of
-   transmitting the window size to the decompressor.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zng_version) is
-   incompatible with the version assumed by the caller (ZLIBNG_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateSetDictionary(zng_stream *strm, const uint8_t *dictionary, uint32_t dictLength);
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   Adler-32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateGetDictionary(zng_stream *strm, uint8_t *dictionary, uint32_t *dictLength);
-/*
-     Returns the sliding dictionary being maintained by deflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If deflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similarly, if dictLength is Z_NULL, then it is not set.
-
-     deflateGetDictionary() may return a length less than the window size, even
-   when more than the window size in input has been provided. It may return up
-   to 258 bytes less in that case, due to how zlib's implementation of deflate
-   manages the sliding window and lookahead for matches, where matches can be
-   up to 258 bytes long. If the application needs the last window-size bytes of
-   input, then that would need to be saved by the application outside of zlib.
-
-     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateCopy(zng_stream *dest, zng_stream *source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateReset(zng_stream *strm);
-/*
-     This function is equivalent to deflateEnd followed by deflateInit, but
-   does not free and reallocate the internal compression state.  The stream
-   will leave the compression level and any other attributes that may have been
-   set unchanged.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateParams(zng_stream *strm, int32_t level, int32_t strategy);
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression approach (which is a function of the level) or the
-   strategy is changed, and if there have been any deflate() calls since the
-   state was initialized or reset, then the input available so far is
-   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
-   There are three approaches for the compression levels 0, 1..3, and 4..9
-   respectively.  The new level and strategy will take effect at the next call
-   of deflate().
-
-     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   not have enough output space to complete, then the parameter change will not
-   take effect.  In this case, deflateParams() can be called again with the
-   same parameters and more output space to try again.
-
-     In order to assure a change in the parameters on the first try, the
-   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   request until strm.avail_out is not zero, before calling deflateParams().
-   Then no more input data should be provided before the deflateParams() call.
-   If this is done, the old level and strategy will be applied to the data
-   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
-
-     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
-   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
-   there was not enough output space to complete the compression of the
-   available input data before a change in the strategy or approach.  Note that
-   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
-   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
-   retried with more output space.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateTune(zng_stream *strm, int32_t good_length, int32_t max_lazy, int32_t nice_length, int32_t max_chain);
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-Z_EXTERN Z_EXPORT
-unsigned long zng_deflateBound(zng_stream *strm, unsigned long sourceLen);
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflatePending(zng_stream *strm, uint32_t *pending, int32_t *bits);
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflatePrime(zng_stream *strm, int32_t bits, int32_t value);
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateSetHeader(zng_stream *strm, zng_gz_headerp head);
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided zng_gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not NULL, name and comment are terminated with
-   a zero byte, and that if extra is not NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-Z_EXTERN Z_EXPORT
-int zng_inflateInit2(zng_stream *strm, int  windowBits);
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will *not* automatically decode concatenated gzip members.
-   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
-   would need to be reset to continue decoding a subsequent gzip member.  This
-   *must* be done if there is more data after a gzip member, in order for the
-   decompression to be compliant with the gzip standard (RFC 1952).
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateSetDictionary(zng_stream *strm, const uint8_t *dictionary, uint32_t dictLength);
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateGetDictionary(zng_stream *strm, uint8_t *dictionary, uint32_t *dictLength);
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   NULL, then only the dictionary length is returned, and nothing is copied.
-   Similarly, if dictLength is NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateSync(zng_stream *strm);
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateCopy(zng_stream *dest, zng_stream *source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateReset(zng_stream *strm);
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateReset2(zng_stream *strm, int32_t windowBits);
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.  If the window size is changed, then the
-   memory allocated for the window is freed, and the window will be reallocated
-   by inflate() if needed.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflatePrime(zng_stream *strm, int32_t bits, int32_t value);
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-long zng_inflateMark(zng_stream *strm);
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateGetHeader(zng_stream *strm, zng_gz_headerp head);
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided zng_gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not NULL and the respective field is not
-   present in the header, then that field is set to NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-Z_EXTERN Z_EXPORT
-int zng_inflateBackInit(zng_stream *strm, int windowBits, unsigned char *window);
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef uint32_t (*in_func) (void *, const uint8_t * *);
-typedef int32_t  (*out_func) (void *, uint8_t *, uint32_t);
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateBack(zng_stream *strm, in_func in, void *in_desc, out_func out, void *out_desc);
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects a zlib header and trailer around the
-   deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero -- buf is ignored in that
-   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   out() should return zero on success, or non-zero on failure.  If out()
-   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is NULL, then in() will be called
-   immediately for input.  If strm->next_in is not NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be NULL only if in() returned an error.  If
-   strm->next_in is not NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_inflateBackEnd(zng_stream *strm);
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-Z_EXTERN Z_EXPORT
-unsigned long zng_zlibCompileFlags(void);
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of unsigned int
-     3.2: size of unsigned long
-     5.4: size of void * (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed (not supported by zlib-ng)
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_compress(uint8_t *dest, size_t *destLen, const uint8_t *source, size_t sourceLen);
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.  compress() is equivalent to compress2() with a level
-   parameter of Z_DEFAULT_COMPRESSION.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_compress2(uint8_t *dest, size_t *destLen, const uint8_t *source, size_t sourceLen, int32_t level);
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-Z_EXTERN Z_EXPORT
-size_t zng_compressBound(size_t sourceLen);
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_uncompress(uint8_t *dest, size_t *destLen, const uint8_t *source, size_t sourceLen);
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed data.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-
-Z_EXTERN Z_EXPORT
-int32_t zng_uncompress2(uint8_t *dest, size_t *destLen, const uint8_t *source, size_t *sourceLen);
-/*
-     Same as uncompress, except that sourceLen is a pointer, where the
-   length of the source is *sourceLen.  On return, *sourceLen is the number of
-   source bytes consumed.
-*/
-
-
-#ifdef WITH_GZFILEOP
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-Z_EXTERN Z_EXPORT
-gzFile zng_gzopen(const char *path, const char *mode);
-/*
-     Open the gzip (.gz) file at path for reading and decompressing, or
-   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
-   but can also include a compression level ("wb9") or a strategy: 'f' for
-   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
-   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
-   as in "wb9F".  (See the description of deflateInit2 for more information
-   about the strategy parameter.)  'T' will request transparent writing or
-   appending with no compression and not using the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-Z_EXTERN Z_EXPORT
-gzFile zng_gzdopen(int fd, const char *mode);
-/*
-     Associate a gzFile with the file descriptor fd.  File descriptors are
-   obtained from calls like open, dup, creat, pipe or fileno (if the file has
-   been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzbuffer(gzFile file, uint32_t size);
-/*
-     Set the internal buffer size used by this library's functions for file to
-   size.  The default buffer size is 8192 bytes.  This function must be called
-   after gzopen() or gzdopen(), and before any other calls that read or write
-   the file.  The buffer memory allocation is always deferred to the first read
-   or write.  Three times that size in buffer space is allocated.  A larger
-   buffer size of, for example, 64K or 128K bytes will noticeably increase the
-   speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzsetparams(gzFile file, int32_t level, int32_t strategy);
-/*
-     Dynamically update the compression level and strategy for file.  See the
-   description of deflateInit2 for the meaning of these parameters. Previously
-   provided data is flushed before applying the parameter changes.
-
-     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing, Z_ERRNO if there is an error writing the flushed data,
-   or Z_MEM_ERROR if there is a memory allocation error.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzread(gzFile file, void *buf, uint32_t len);
-/*
-     Read and decompress up to len uncompressed bytes from file into buf.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.  If len is too large to fit in an int,
-   then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
-*/
-
-Z_EXTERN Z_EXPORT
-size_t zng_gzfread(void *buf, size_t size, size_t nitems, gzFile file);
-/*
-     Read and decompress up to nitems items of size size from file into buf,
-   otherwise operating as gzread() does.  This duplicates the interface of
-   stdio's fread(), with size_t request and return types.  If the library
-   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
-   is an unsigned integer type that can contain a pointer.
-
-     gzfread() returns the number of full items read of size size, or zero if
-   the end of the file was reached and a full item could not be read, or if
-   there was an error.  gzerror() must be consulted if zero is returned in
-   order to determine if there was an error.  If the multiplication of size and
-   nitems overflows, i.e. the product does not fit in a size_t, then nothing
-   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
-
-     In the event that the end of file is reached and only a partial item is
-   available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevertheless read into buf
-   and the end-of-file flag is set.  The length of the partial item read is not
-   provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, resetting and retrying on end-of-file, when size is not 1.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzwrite(gzFile file, void const *buf, uint32_t len);
-/*
-     Compress and write the len uncompressed bytes at buf to file. gzwrite
-   returns the number of uncompressed bytes written or 0 in case of error.
-*/
-
-Z_EXTERN Z_EXPORT
-size_t zng_gzfwrite(void const *buf, size_t size, size_t nitems, gzFile file);
-/*
-     Compress and write nitems items of size size from buf to file, duplicating
-   the interface of stdio's fwrite(), with size_t request and return types.
-
-     gzfwrite() returns the number of full items written of size size, or zero
-   if there was an error.  If the multiplication of size and nitems overflows,
-   i.e. the product does not fit in a size_t, then nothing is written, zero
-   is returned, and the error state is set to Z_STREAM_ERROR.
-*/
-
-Z_EXTERN Z_EXPORTVA
-int32_t zng_gzprintf(gzFile file, const char *format, ...);
-/*
-     Convert, format, compress, and write the arguments (...) to file under
-   control of the string format, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or a negative zlib error code in case
-   of error.  The number of uncompressed bytes written is limited to 8191, or
-   one less than the buffer size given to gzbuffer().  The caller should assure
-   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf(),
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzputs(gzFile file, const char *s);
-/*
-     Compress and write the given null-terminated string s to file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-Z_EXTERN Z_EXPORT
-char * zng_gzgets(gzFile file, char *buf, int32_t len);
-/*
-     Read and decompress bytes from file into buf, until len-1 characters are
-   read, or until a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  If any characters are read or if len
-   is one, the string is terminated with a null character.  If no characters
-   are read due to an end-of-file or len is less than one, then the buffer is
-   left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzputc(gzFile file, int32_t c);
-/*
-     Compress and write c, converted to an unsigned char, into file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzgetc(gzFile file);
-/*
-     Read and decompress one byte from file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzungetc(int32_t c, gzFile file);
-/*
-     Push c back onto the stream for file to be read as the first character on
-   the next read.  At least one character of push-back is always allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzflush(gzFile file, int32_t flush);
-/*
-     Flush all pending output to file.  The parameter flush is as in the
-   deflate() function.  The return value is the zlib error number (see function
-   gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatenated gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-Z_EXTERN Z_EXPORT
-z_off64_t zng_gzseek(gzFile file, z_off64_t offset, int whence);
-/*
-     Set the starting position to offset relative to whence for the next gzread
-   or gzwrite on file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzrewind(gzFile file);
-/*
-     Rewind file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
-*/
-
-Z_EXTERN Z_EXPORT
-z_off64_t zng_gztell(gzFile file);
-/*
-     Return the starting position for the next gzread or gzwrite on file.
-   This position represents a number of bytes in the uncompressed data stream,
-   and is zero when starting, even if appending or reading a gzip stream from
-   the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-Z_EXTERN Z_EXPORT
-z_off64_t zng_gzoffset(gzFile file);
-/*
-     Return the current compressed (actual) read or write offset of file.  This
-   offset includes the count of bytes that precede the gzip stream, for example
-   when appending or when using gzdopen() for reading.  When reading, the
-   offset does not include as yet unused buffered input.  This information can
-   be used for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzeof(gzFile file);
-/*
-     Return true (1) if the end-of-file indicator for file has been set while
-   reading, false (0) otherwise.  Note that the end-of-file indicator is set
-   only if the read tried to go past the end of the input, but came up short.
-   Therefore, just like feof(), gzeof() may return false even if there is no
-   more data to read, in the event that the last read request was for the exact
-   number of bytes remaining in the input file.  This will happen if the input
-   file size is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzdirect(gzFile file);
-/*
-     Return true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzclose(gzFile file);
-/*
-     Flush all pending output for file, if necessary, close file and
-   deallocate the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_gzclose_r(gzFile file);
-Z_EXTERN Z_EXPORT
-int32_t zng_gzclose_w(gzFile file);
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-Z_EXTERN Z_EXPORT
-const char * zng_gzerror(gzFile file, int32_t *errnum);
-/*
-     Return the error message for the last error which occurred on file.
-   errnum is set to zlib error number.  If an error occurred in the file system
-   and not in the compression library, errnum is set to Z_ERRNO and the
-   application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-Z_EXTERN Z_EXPORT
-void zng_gzclearerr(gzFile file);
-/*
-     Clear the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* WITH_GZFILEOP */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_adler32(uint32_t adler, const uint8_t *buf, uint32_t len);
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. An Adler-32 value is in the range of a 32-bit
-   unsigned integer. If buf is Z_NULL, this function returns the required
-   initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uint32_t adler = adler32(0L, NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_adler32_z(uint32_t adler, const uint8_t *buf, size_t len);
-/*
-     Same as adler32(), but with a size_t length.
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_adler32_combine(uint32_t adler1, uint32_t adler2, z_off64_t len2);
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_crc32(uint32_t crc, const uint8_t *buf, uint32_t len);
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
-   If buf is Z_NULL, this function returns the required initial value for the
-   crc. Pre- and post-conditioning (one's complement) is performed within this
-   function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uint32_t crc = crc32(0L, NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_crc32_z(uint32_t crc, const uint8_t *buf, size_t len);
-/*
-     Same as crc32(), but with a size_t length.
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_crc32_combine(uint32_t crc1, uint32_t crc2, z_off64_t len2);
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_crc32_combine_gen(z_off64_t len2);
-
-/*
-     Return the operator corresponding to length len2, to be used with
-   crc32_combine_op().
-*/
-
-Z_EXTERN Z_EXPORT
-uint32_t zng_crc32_combine_op(uint32_t crc1, uint32_t crc2, const uint32_t op);
-/*
-     Give the same result as crc32_combine(), using op in place of len2. op is
-   is generated from len2 by crc32_combine_gen(). This will be faster than
-   crc32_combine() if the generated op is used more than once.
-*/
-
-                        /* various hacks, don't look :) */
-
-/* zng_deflateInit and zng_inflateInit are macros to allow checking the zlib version
- * and the compiler's view of zng_stream:
- */
-Z_EXTERN Z_EXPORT int32_t zng_deflateInit_(zng_stream *strm, int32_t level, const char *version, int32_t stream_size);
-Z_EXTERN Z_EXPORT int32_t zng_inflateInit_(zng_stream *strm, const char *version, int32_t stream_size);
-Z_EXTERN Z_EXPORT int32_t zng_deflateInit2_(zng_stream *strm, int32_t  level, int32_t  method, int32_t windowBits, int32_t memLevel,
-                                         int32_t strategy, const char *version, int32_t stream_size);
-Z_EXTERN Z_EXPORT int32_t zng_inflateInit2_(zng_stream *strm, int32_t  windowBits, const char *version, int32_t stream_size);
-Z_EXTERN Z_EXPORT int32_t zng_inflateBackInit_(zng_stream *strm, int32_t windowBits, uint8_t *window,
-                                         const char *version, int32_t stream_size);
-
-#define @ZLIB_SYMBOL_PREFIX@zng_deflateInit(strm, level) zng_deflateInit_((strm), (level), ZLIBNG_VERSION, (int32_t)sizeof(zng_stream))
-#define @ZLIB_SYMBOL_PREFIX@zng_inflateInit(strm) zng_inflateInit_((strm), ZLIBNG_VERSION, (int32_t)sizeof(zng_stream))
-#define @ZLIB_SYMBOL_PREFIX@zng_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        zng_deflateInit2_((strm), (level), (method), (windowBits), (memLevel), \
-                     (strategy), ZLIBNG_VERSION, (int32_t)sizeof(zng_stream))
-#define @ZLIB_SYMBOL_PREFIX@zng_inflateInit2(strm, windowBits) zng_inflateInit2_((strm), (windowBits), ZLIBNG_VERSION, (int32_t)sizeof(zng_stream))
-#define @ZLIB_SYMBOL_PREFIX@zng_inflateBackInit(strm, windowBits, window) \
-                        zng_inflateBackInit_((strm), (windowBits), (window), ZLIBNG_VERSION, (int32_t)sizeof(zng_stream))
-
-#ifdef WITH_GZFILEOP
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-Z_EXTERN Z_EXPORT int32_t zng_gzgetc_(gzFile file);  /* backward compatibility */
-#  define @ZLIB_SYMBOL_PREFIX@zng_gzgetc(g) ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (@ZLIB_SYMBOL_PREFIX@zng_gzgetc)(g))
-
-#endif /* WITH_GZFILEOP */
-
-
-typedef enum {
-    Z_DEFLATE_LEVEL = 0,         /* compression level, represented as an int */
-    Z_DEFLATE_STRATEGY = 1,      /* compression strategy, represented as an int */
-    Z_DEFLATE_REPRODUCIBLE = 2,
-    /*
-         Whether reproducible compression results are required. Represented as an int, where 0 means that it is allowed
-       to trade reproducibility for e.g. improved performance or compression ratio, and non-0 means that
-       reproducibility is strictly required. Reproducibility is guaranteed only when using an identical zlib-ng build.
-       Default is 0.
-    */
-} zng_deflate_param;
-
-typedef struct {
-    zng_deflate_param param;  /* parameter ID */
-    void   *buf;              /* parameter value */
-    size_t  size;             /* parameter value size */
-    int32_t status;           /* result of the last set/get call */
-} zng_deflate_param_value;
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateSetParams(zng_stream *strm, zng_deflate_param_value *params, size_t count);
-/*
-     Sets the values of the given zlib-ng deflate stream parameters. All the buffers are copied internally, so the
-   caller still owns them after this function returns. Returns Z_OK if success.
-
-     If the size of at least one of the buffers is too small to hold the entire value of the corresponding parameter,
-   or if the same parameter is specified multiple times, Z_BUF_ERROR is returned. The caller may inspect status fields
-   in order to determine which of the parameters caused this error. No other changes are performed.
-
-     If the stream state is inconsistent or if at least one of the values cannot be updated, Z_STREAM_ERROR is
-   returned. The caller may inspect status fields in order to determine which of the parameters caused this error.
-   Parameters, whose status field is equal to Z_OK, have been applied successfully. If all status fields are not equal
-   to Z_STREAM_ERROR, then the error was caused by a stream state inconsistency.
-
-     If there are no other errors, but at least one parameter is not supported by the current zlib-ng version,
-   Z_VERSION_ERROR is returned. The caller may inspect status fields in order to determine which of the parameters
-   caused this error.
-*/
-
-Z_EXTERN Z_EXPORT
-int32_t zng_deflateGetParams(zng_stream *strm, zng_deflate_param_value *params, size_t count);
-/*
-     Copies the values of the given zlib-ng deflate stream parameters into the user-provided buffers. Returns Z_OK if
-   success, Z_VERSION_ERROR if at least one parameter is not supported by the current zlib-ng version, Z_STREAM_ERROR
-   if the stream state is inconsistent, and Z_BUF_ERROR if the size of at least one buffer is too small to hold the
-   entire value of the corresponding parameter.
-*/
-
-/* undocumented functions */
-Z_EXTERN Z_EXPORT const char *     zng_zError           (int32_t);
-Z_EXTERN Z_EXPORT int32_t          zng_inflateSyncPoint (zng_stream *);
-Z_EXTERN Z_EXPORT const uint32_t * zng_get_crc_table    (void);
-Z_EXTERN Z_EXPORT int32_t          zng_inflateUndermine (zng_stream *, int32_t);
-Z_EXTERN Z_EXPORT int32_t          zng_inflateValidate  (zng_stream *, int32_t);
-Z_EXTERN Z_EXPORT unsigned long    zng_inflateCodesUsed (zng_stream *);
-Z_EXTERN Z_EXPORT int32_t          zng_inflateResetKeep (zng_stream *);
-Z_EXTERN Z_EXPORT int32_t          zng_deflateResetKeep (zng_stream *);
-
-#ifdef WITH_GZFILEOP
-#  if defined(_WIN32)
-     Z_EXTERN Z_EXPORT gzFile zng_gzopen_w(const wchar_t *path, const char *mode);
-#  endif
-Z_EXTERN Z_EXPORTVA int32_t zng_gzvprintf(gzFile file, const char *format, va_list va);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZNGLIB_H_ */

crates/libz-sys/src/zlib-ng/zlib-ng.map

diff --git a/crates/libz-sys/src/zlib-ng/zlib-ng.map b/crates/libz-sys/src/zlib-ng/zlib-ng.map
deleted file mode 100644
index 461c256..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib-ng.map
+++ /dev/null
@@ -1,106 +0,0 @@
-ZLIB_NG_2.0.0 {
-  global:
-    zng_adler32;
-    zng_adler32_c;
-    zng_adler32_combine;
-    zng_adler32_z;
-    zng_compress;
-    zng_compress2;
-    zng_compressBound;
-    zng_crc32;
-    zng_crc32_combine;
-    zng_crc32_combine_gen;
-    zng_crc32_combine_op;
-    zng_crc32_z;
-    zng_deflate;
-    zng_deflateBound;
-    zng_deflateCopy;
-    zng_deflateEnd;
-    zng_deflateGetDictionary;
-    zng_deflateGetParams;
-    zng_deflateInit_;
-    zng_deflateInit2_;
-    zng_deflateParams;
-    zng_deflatePending;
-    zng_deflatePrime;
-    zng_deflateReset;
-    zng_deflateResetKeep;
-    zng_deflateSetDictionary;
-    zng_deflateSetHeader;
-    zng_deflateSetParams;
-    zng_deflateTune;
-    zng_get_crc_table;
-    zng_inflate;
-    zng_inflateBack;
-    zng_inflateBackEnd;
-    zng_inflateBackInit_;
-    zng_inflateCodesUsed;
-    zng_inflateCopy;
-    zng_inflateEnd;
-    zng_inflateGetDictionary;
-    zng_inflateGetHeader;
-    zng_inflateInit_;
-    zng_inflateInit2_;
-    zng_inflateMark;
-    zng_inflatePrime;
-    zng_inflateReset;
-    zng_inflateReset2;
-    zng_inflateResetKeep;
-    zng_inflateSetDictionary;
-    zng_inflateSync;
-    zng_inflateSyncPoint;
-    zng_inflateUndermine;
-    zng_inflateValidate;
-    zng_uncompress;
-    zng_uncompress2;
-    zng_zError;
-    zng_zlibCompileFlags;
-    zng_zlibng_string;
-    zng_version;
-  local:
-    zng_deflate_copyright;
-    zng_inflate_copyright;
-    zng_inflate_fast;
-    zng_inflate_table;
-    zng_zcalloc;
-    zng_zcfree;
-    zng_z_errmsg;
-    zng_gz_error;
-    _*;
-};
-
-ZLIB_NG_GZ_2.0.0 {
-  global:
-    zng_gzbuffer;
-    zng_gzclearerr;
-    zng_gzclose;
-    zng_gzclose_r;
-    zng_gzclose_w;
-    zng_gzdirect;
-    zng_gzdopen;
-    zng_gzeof;
-    zng_gzerror;
-    zng_gzflush;
-    zng_gzfread;
-    zng_gzfwrite;
-    zng_gzgetc;
-    zng_gzgetc_;
-    zng_gzgets;
-    zng_gzoffset;
-    zng_gzoffset64;
-    zng_gzopen;
-    zng_gzopen64;
-    zng_gzprintf;
-    zng_gzputc;
-    zng_gzputs;
-    zng_gzread;
-    zng_gzrewind;
-    zng_gzseek;
-    zng_gzseek64;
-    zng_gzsetparams;
-    zng_gztell;
-    zng_gztell64;
-    zng_gzungetc;
-    zng_gzvprintf;
-    zng_gzwrite;
-};

crates/libz-sys/src/zlib-ng/zlib.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zlib.h.in b/crates/libz-sys/src/zlib-ng/zlib.h.in
deleted file mode 100644
index 9de5e91..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib.h.in
+++ /dev/null
@@ -1,1855 +0,0 @@
-#ifndef ZLIB_H_
-#define ZLIB_H_
-/* zlib.h -- interface of the 'zlib-ng' compression library
-   Forked from and compatible with zlib 1.2.11
-
-  Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files https://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifdef ZNGLIB_H_
-#  error Include zlib-ng.h for zlib-ng API or zlib.h for zlib-compat API but not both
-#endif
-
-#ifndef RC_INVOKED
-#include "zconf.h"
-
-#include <stdint.h>
-#include <stdarg.h>
-
-#ifndef ZCONF_H
-#  error Missing zconf.h add binary output directory to include directories
-#endif
-#endif  /* RC_INVOKED */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIBNG_VERSION "2.1.0.devel"
-#define ZLIBNG_VERNUM 0x02010000L   /* MMNNRRMS: major minor revision status modified */
-#define ZLIBNG_VER_MAJOR 2
-#define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 0
-#define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
-#define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
-
-#define ZLIB_VERSION "1.2.11.zlib-ng"
-#define ZLIB_VERNUM 0x12bf
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip and raw deflate streams in
-  memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in the case of corrupted input.
-*/
-
-typedef void *(*alloc_func) (void *opaque, unsigned int items, unsigned int size);
-typedef void  (*free_func)  (void *opaque, void *address);
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const unsigned char *next_in;   /* next input byte */
-    uint32_t              avail_in;   /* number of bytes available at next_in */
-    unsigned long         total_in;   /* total number of input bytes read so far */
-
-    unsigned char         *next_out;  /* next output byte will go here */
-    uint32_t              avail_out;  /* remaining free space at next_out */
-    unsigned long         total_out;  /* total number of bytes output so far */
-
-    z_const char          *msg;       /* last error message, NULL if no error */
-    struct internal_state *state;     /* not visible by applications */
-
-    alloc_func            zalloc;     /* used to allocate the internal state */
-    free_func             zfree;      /* used to free the internal state */
-    void                  *opaque;    /* private data object passed to zalloc and zfree */
-
-    int                   data_type;  /* best guess about the data type: binary or text
-                                         for deflate, or the decoding state for inflate */
-    unsigned long         adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    unsigned long         reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream *z_streamp;  /* Obsolete type, retained for compatibility only */
-
-/*
-    gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int             text;       /* true if compressed data believed to be text */
-    unsigned long   time;       /* modification time */
-    int             xflags;     /* extra flags (not used when writing a gzip file) */
-    int             os;         /* operating system */
-    unsigned char   *extra;     /* pointer to extra field or NULL if none */
-    unsigned int    extra_len;  /* extra field length (valid if extra != NULL) */
-    unsigned int    extra_max;  /* space at extra (only when reading header) */
-    unsigned char   *name;      /* pointer to zero-terminated file name or NULL */
-    unsigned int    name_max;   /* space at name (only when reading header) */
-    unsigned char   *comment;   /* pointer to zero-terminated comment or NULL */
-    unsigned int    comm_max;   /* space at comment (only when reading header) */
-    int             hcrc;       /* true if there was or will be a header crc */
-    int             done;       /* true when done reading gzip header (not used when writing a gzip file) */
-} gz_header;
-
-typedef gz_header *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
-   Z_NULL on entry to the initialization function, they are set to internal
-   routines that use the standard library functions malloc() and free().
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field for deflate() */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  NULL  /* for compatibility with zlib, was for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-Z_EXTERN const char * Z_EXPORT zlibVersion(void);
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-Z_EXTERN int Z_EXPORT deflateInit (z_stream *strm, int level);
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-Z_EXTERN int Z_EXPORT deflate(z_stream *strm, int flush);
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary.  Some output may be provided even if
-    flush is zero.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more output
-  in that case.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed
-  codes block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  function must be called again with Z_FINISH and more output space (updated
-  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  on the stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  compression is to be done in a single step.  In order to complete in one
-  call, avail_out must be at least the value returned by deflateBound (see
-  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  output space is provided, deflate will not return Z_STREAM_END, and it must
-  be called again as described above.
-
-    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).  If a gzip stream is being generated, then
-  strm->adler will be the CRC-32 checksum of the input read so far.  (See
-  deflateInit2 below.)
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  considered binary.  This field is only for information purposes and does not
-  affect the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL) or the state was inadvertently written over
-  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  deflate() can be called again with more input and more output space to
-  continue compressing.
-*/
-
-
-Z_EXTERN int Z_EXPORT deflateEnd(z_stream *strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-Z_EXTERN int Z_EXPORT inflateInit (z_stream *strm);
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provided input is not
-   read or consumed.  The allocation of a sliding window will be deferred to
-   the first call of inflate (if the decompression does not complete on the
-   first call).  If zalloc and zfree are set to NULL, inflateInit updates
-   them to use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression.
-   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   next_out, and avail_out are unused and unchanged.  The current
-   implementation of inflateInit() does not process any header information --
-   that is deferred until inflate() is called.
-*/
-
-
-Z_EXTERN int Z_EXPORT inflate(z_stream *strm, int flush);
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_in are updated
-    accordingly, and processing will resume at this point for the next call of
-    inflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  If the
-  caller of inflate() does not provide both available input and available
-  output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
-  uncompressed length, modulo 2^32.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value, in which case strm->msg points to a string with a more specific
-  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was NULL, or the state was inadvertently written over
-  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
-  if no progress is possible or if there was not enough room in the output
-  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is to be attempted.
-*/
-
-
-Z_EXTERN int Z_EXPORT inflateEnd(z_stream *strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-Z_EXTERN int Z_EXPORT deflateInit2 (z_stream *strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy);
-
-     This is another version of deflateInit with more compression options.  The
-   fields zalloc, zfree and opaque must be initialized before by the caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     For the current implementation of deflate(), a windowBits value of 8 (a
-   window size of 256 bytes) is not supported.  As a result, a request for 8
-   will result in 9 (a 512-byte window).  In that case, providing 8 to
-   inflateInit2() will result in an error when the zlib header with 9 is
-   checked against the initialization of inflate().  The remedy is to not use 8
-   with deflateInit2() with this initialization, or at least in that case use 9
-   with inflateInit2().
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute a check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to the appropriate value,
-   if the operating system was determined at compile time.  If a gzip stream is
-   being written, strm->adler is a CRC-32 instead of an Adler-32.
-
-     For raw deflate or gzip encoding, a request for a 256-byte window is
-   rejected as invalid, since only the zlib header provides a means of
-   transmitting the window size to the decompressor.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-Z_EXTERN int Z_EXPORT deflateSetDictionary(z_stream *strm,
-                                             const unsigned char *dictionary,
-                                             unsigned int dictLength);
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   Adler-32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-Z_EXTERN int Z_EXPORT deflateGetDictionary (z_stream *strm, unsigned char *dictionary, unsigned int *dictLength);
-/*
-     Returns the sliding dictionary being maintained by deflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If deflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similarly, if dictLength is Z_NULL, then it is not set.
-
-     deflateGetDictionary() may return a length less than the window size, even
-   when more than the window size in input has been provided. It may return up
-   to 258 bytes less in that case, due to how zlib's implementation of deflate
-   manages the sliding window and lookahead for matches, where matches can be
-   up to 258 bytes long. If the application needs the last window-size bytes of
-   input, then that would need to be saved by the application outside of zlib.
-
-     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-Z_EXTERN int Z_EXPORT deflateCopy(z_stream *dest, z_stream *source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-Z_EXTERN int Z_EXPORT deflateReset(z_stream *strm);
-/*
-     This function is equivalent to deflateEnd followed by deflateInit, but
-   does not free and reallocate the internal compression state.  The stream
-   will leave the compression level and any other attributes that may have been
-   set unchanged.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-Z_EXTERN int Z_EXPORT deflateParams(z_stream *strm, int level, int strategy);
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression approach (which is a function of the level) or the
-   strategy is changed, and if there have been any deflate() calls since the
-   state was initialized or reset, then the input available so far is
-   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
-   There are three approaches for the compression levels 0, 1..3, and 4..9
-   respectively.  The new level and strategy will take effect at the next call
-   of deflate().
-
-     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   not have enough output space to complete, then the parameter change will not
-   take effect.  In this case, deflateParams() can be called again with the
-   same parameters and more output space to try again.
-
-     In order to assure a change in the parameters on the first try, the
-   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   request until strm.avail_out is not zero, before calling deflateParams().
-   Then no more input data should be provided before the deflateParams() call.
-   If this is done, the old level and strategy will be applied to the data
-   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
-
-     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
-   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
-   there was not enough output space to complete the compression of the
-   available input data before a change in the strategy or approach.  Note that
-   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
-   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
-   retried with more output space.
-*/
-
-Z_EXTERN int Z_EXPORT deflateTune(z_stream *strm, int good_length, int max_lazy, int nice_length, int max_chain);
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-Z_EXTERN unsigned long Z_EXPORT deflateBound(z_stream *strm, unsigned long sourceLen);
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-Z_EXTERN int Z_EXPORT deflatePending(z_stream *strm, uint32_t *pending, int *bits);
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-Z_EXTERN int Z_EXPORT deflatePrime(z_stream *strm, int bits, int value);
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-Z_EXTERN int Z_EXPORT deflateSetHeader(z_stream *strm, gz_headerp head);
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not NULL, name and comment are terminated with
-   a zero byte, and that if extra is not NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-Z_EXTERN int Z_EXPORT inflateInit2(z_stream *strm, int  windowBits);
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will *not* automatically decode concatenated gzip members.
-   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
-   would need to be reset to continue decoding a subsequent gzip member.  This
-   *must* be done if there is more data after a gzip member, in order for the
-   decompression to be compliant with the gzip standard (RFC 1952).
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-Z_EXTERN int Z_EXPORT inflateSetDictionary(z_stream *strm, const unsigned char *dictionary, unsigned int dictLength);
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-Z_EXTERN int Z_EXPORT inflateGetDictionary(z_stream *strm, unsigned char *dictionary, unsigned int *dictLength);
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   NULL, then only the dictionary length is returned, and nothing is copied.
-   Similarly, if dictLength is NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-Z_EXTERN int Z_EXPORT inflateSync(z_stream *strm);
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-Z_EXTERN int Z_EXPORT inflateCopy(z_stream *dest, z_stream *source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-Z_EXTERN int Z_EXPORT inflateReset(z_stream *strm);
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-Z_EXTERN int Z_EXPORT inflateReset2(z_stream *strm, int windowBits);
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.  If the window size is changed, then the
-   memory allocated for the window is freed, and the window will be reallocated
-   by inflate() if needed.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-Z_EXTERN int Z_EXPORT inflatePrime(z_stream *strm, int bits, int value);
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-Z_EXTERN long Z_EXPORT inflateMark(z_stream *strm);
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent.
-*/
-
-Z_EXTERN int Z_EXPORT inflateGetHeader(z_stream *strm, gz_headerp head);
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not NULL and the respective field is not
-   present in the header, then that field is set to NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-Z_EXTERN int Z_EXPORT inflateBackInit (z_stream *strm, int windowBits, unsigned char *window);
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef uint32_t (*in_func) (void *, z_const unsigned char * *);
-typedef int (*out_func) (void *, unsigned char *, uint32_t);
-
-Z_EXTERN int Z_EXPORT inflateBack(z_stream *strm, in_func in, void *in_desc, out_func out, void *out_desc);
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects a zlib header and trailer around the
-   deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero -- buf is ignored in that
-   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   out() should return zero on success, or non-zero on failure.  If out()
-   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is NULL, then in() will be called
-   immediately for input.  If strm->next_in is not NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be NULL only if in() returned an error.  If
-   strm->next_in is not NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-Z_EXTERN int Z_EXPORT inflateBackEnd(z_stream *strm);
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-Z_EXTERN unsigned long Z_EXPORT zlibCompileFlags(void);
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of unsigned int
-     3.2: size of unsigned long
-     5.4: size of void * (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed (not supported by zlib-ng)
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-Z_EXTERN int Z_EXPORT compress(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.  compress() is equivalent to compress2() with a level
-   parameter of Z_DEFAULT_COMPRESSION.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-Z_EXTERN int Z_EXPORT compress2(unsigned char *dest, unsigned long *destLen, const unsigned char *source,
-                              unsigned long sourceLen, int level);
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-Z_EXTERN unsigned long Z_EXPORT compressBound(unsigned long sourceLen);
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-Z_EXTERN int Z_EXPORT uncompress(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed data.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-
-Z_EXTERN int Z_EXPORT uncompress2 (unsigned char *dest,         unsigned long *destLen,
-                                 const unsigned char *source, unsigned long *sourceLen);
-/*
-     Same as uncompress, except that sourceLen is a pointer, where the
-   length of the source is *sourceLen.  On return, *sourceLen is the number of
-   source bytes consumed.
-*/
-
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-Z_EXTERN gzFile Z_EXPORT gzopen(const char *path, const char *mode);
-
-     Open the gzip (.gz) file at path for reading and decompressing, or
-   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
-   but can also include a compression level ("wb9") or a strategy: 'f' for
-   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
-   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
-   as in "wb9F".  (See the description of deflateInit2 for more information
-   about the strategy parameter.)  'T' will request transparent writing or
-   appending with no compression and not using the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-Z_EXTERN gzFile Z_EXPORT gzdopen(int fd, const char *mode);
-/*
-     Associate a gzFile with the file descriptor fd.  File descriptors are
-   obtained from calls like open, dup, creat, pipe or fileno (if the file has
-   been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-Z_EXTERN int Z_EXPORT gzbuffer(gzFile file, unsigned size);
-/*
-     Set the internal buffer size used by this library's functions for file to
-   size.  The default buffer size is 8192 bytes.  This function must be called
-   after gzopen() or gzdopen(), and before any other calls that read or write
-   the file.  The buffer memory allocation is always deferred to the first read
-   or write.  Three times that size in buffer space is allocated.  A larger
-   buffer size of, for example, 64K or 128K bytes will noticeably increase the
-   speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-Z_EXTERN int Z_EXPORT gzsetparams(gzFile file, int level, int strategy);
-/*
-     Dynamically update the compression level and strategy for file.  See the
-   description of deflateInit2 for the meaning of these parameters. Previously
-   provided data is flushed before applying the parameter changes.
-
-     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing, Z_ERRNO if there is an error writing the flushed data,
-   or Z_MEM_ERROR if there is a memory allocation error.
-*/
-
-Z_EXTERN int Z_EXPORT gzread(gzFile file, void *buf, unsigned len);
-/*
-     Read and decompress up to len uncompressed bytes from file into buf.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.  If len is too large to fit in an int,
-   then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
-*/
-
-Z_EXTERN size_t Z_EXPORT gzfread (void *buf, size_t size, size_t nitems, gzFile file);
-/*
-     Read and decompress up to nitems items of size size from file into buf,
-   otherwise operating as gzread() does.  This duplicates the interface of
-   stdio's fread(), with size_t request and return types.  If the library
-   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
-   is an unsigned integer type that can contain a pointer.
-
-     gzfread() returns the number of full items read of size size, or zero if
-   the end of the file was reached and a full item could not be read, or if
-   there was an error.  gzerror() must be consulted if zero is returned in
-   order to determine if there was an error.  If the multiplication of size and
-   nitems overflows, i.e. the product does not fit in a size_t, then nothing
-   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
-
-     In the event that the end of file is reached and only a partial item is
-   available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevertheless read into buf
-   and the end-of-file flag is set.  The length of the partial item read is not
-   provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, resetting and retrying on end-of-file, when size is not 1.
-*/
-
-Z_EXTERN int Z_EXPORT gzwrite(gzFile file, void const *buf, unsigned len);
-/*
-     Compress and write the len uncompressed bytes at buf to file. gzwrite
-   returns the number of uncompressed bytes written or 0 in case of error.
-*/
-
-Z_EXTERN size_t Z_EXPORT gzfwrite(void const *buf, size_t size, size_t nitems, gzFile file);
-/*
-     Compress and write nitems items of size size from buf to file, duplicating
-   the interface of stdio's fwrite(), with size_t request and return types.
-
-     gzfwrite() returns the number of full items written of size size, or zero
-   if there was an error.  If the multiplication of size and nitems overflows,
-   i.e. the product does not fit in a size_t, then nothing is written, zero
-   is returned, and the error state is set to Z_STREAM_ERROR.
-*/
-
-Z_EXTERN int Z_EXPORTVA gzprintf(gzFile file, const char *format, ...);
-/*
-     Convert, format, compress, and write the arguments (...) to file under
-   control of the string format, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or a negative zlib error code in case
-   of error.  The number of uncompressed bytes written is limited to 8191, or
-   one less than the buffer size given to gzbuffer().  The caller should assure
-   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf(),
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
-*/
-
-Z_EXTERN int Z_EXPORT gzputs(gzFile file, const char *s);
-/*
-     Compress and write the given null-terminated string s to file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-Z_EXTERN char * Z_EXPORT gzgets(gzFile file, char *buf, int len);
-/*
-     Read and decompress bytes from file into buf, until len-1 characters are
-   read, or until a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  If any characters are read or if len
-   is one, the string is terminated with a null character.  If no characters
-   are read due to an end-of-file or len is less than one, then the buffer is
-   left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-Z_EXTERN int Z_EXPORT gzputc(gzFile file, int c);
-/*
-     Compress and write c, converted to an unsigned char, into file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-Z_EXTERN int Z_EXPORT gzgetc(gzFile file);
-/*
-     Read and decompress one byte from file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-Z_EXTERN int Z_EXPORT gzungetc(int c, gzFile file);
-/*
-     Push c back onto the stream for file to be read as the first character on
-   the next read.  At least one character of push-back is always allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-Z_EXTERN int Z_EXPORT gzflush(gzFile file, int flush);
-/*
-     Flush all pending output to file.  The parameter flush is as in the
-   deflate() function.  The return value is the zlib error number (see function
-   gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatenated gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-Z_EXTERN z_off_t Z_EXPORT gzseek (gzFile file, z_off_t offset, int whence);
-
-     Set the starting position to offset relative to whence for the next gzread
-   or gzwrite on file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-Z_EXTERN int Z_EXPORT gzrewind(gzFile file);
-/*
-     Rewind file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
-*/
-
-/*
-Z_EXTERN z_off_t Z_EXPORT gztell(gzFile file);
-
-     Return the starting position for the next gzread or gzwrite on file.
-   This position represents a number of bytes in the uncompressed data stream,
-   and is zero when starting, even if appending or reading a gzip stream from
-   the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-Z_EXTERN z_off_t Z_EXPORT gzoffset(gzFile file);
-
-     Return the current compressed (actual) read or write offset of file.  This
-   offset includes the count of bytes that precede the gzip stream, for example
-   when appending or when using gzdopen() for reading.  When reading, the
-   offset does not include as yet unused buffered input.  This information can
-   be used for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-Z_EXTERN int Z_EXPORT gzeof(gzFile file);
-/*
-     Return true (1) if the end-of-file indicator for file has been set while
-   reading, false (0) otherwise.  Note that the end-of-file indicator is set
-   only if the read tried to go past the end of the input, but came up short.
-   Therefore, just like feof(), gzeof() may return false even if there is no
-   more data to read, in the event that the last read request was for the exact
-   number of bytes remaining in the input file.  This will happen if the input
-   file size is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-Z_EXTERN int Z_EXPORT gzdirect(gzFile file);
-/*
-     Return true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-Z_EXTERN int Z_EXPORT gzclose(gzFile file);
-/*
-     Flush all pending output for file, if necessary, close file and
-   deallocate the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-Z_EXTERN int Z_EXPORT gzclose_r(gzFile file);
-Z_EXTERN int Z_EXPORT gzclose_w(gzFile file);
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-Z_EXTERN const char * Z_EXPORT gzerror(gzFile file, int *errnum);
-/*
-     Return the error message for the last error which occurred on file.
-   errnum is set to zlib error number.  If an error occurred in the file system
-   and not in the compression library, errnum is set to Z_ERRNO and the
-   application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-Z_EXTERN void Z_EXPORT gzclearerr(gzFile file);
-/*
-     Clear the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-Z_EXTERN unsigned long Z_EXPORT adler32(unsigned long adler, const unsigned char *buf, unsigned int len);
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. An Adler-32 value is in the range of a 32-bit
-   unsigned integer. If buf is Z_NULL, this function returns the required
-   initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uint32_t adler = adler32(0L, NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-Z_EXTERN unsigned long Z_EXPORT adler32_z(unsigned long adler, const unsigned char *buf, size_t len);
-/*
-     Same as adler32(), but with a size_t length.
-*/
-
-/*
-Z_EXTERN unsigned long Z_EXPORT adler32_combine(unsigned long adler1, unsigned long adler2, z_off_t len2);
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-Z_EXTERN unsigned long Z_EXPORT crc32(unsigned long crc, const unsigned char *buf, unsigned int len);
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
-   If buf is Z_NULL, this function returns the required initial value for the
-   crc. Pre- and post-conditioning (one's complement) is performed within this
-   function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uint32_t crc = crc32(0L, NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-Z_EXTERN unsigned long Z_EXPORT crc32_z(unsigned long crc, const unsigned char *buf, size_t len);
-/*
-     Same as crc32(), but with a size_t length.
-*/
-
-/*
-Z_EXTERN unsigned long Z_EXPORT crc32_combine(unsigned long crc1, unsigned long crc2, z_off64_t len2);
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-/*
-Z_EXTERN unsigned long Z_EXPORT crc32_combine_gen(z_off_t len2);
-
-     Return the operator corresponding to length len2, to be used with
-   crc32_combine_op().
-*/
-
-Z_EXTERN unsigned long Z_EXPORT crc32_combine_op(unsigned long crc1, unsigned long crc2,
-                                                 const unsigned long op);
-/*
-     Give the same result as crc32_combine(), using op in place of len2. op is
-   is generated from len2 by crc32_combine_gen(). This will be faster than
-   crc32_combine() if the generated op is used more than once.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-Z_EXTERN int Z_EXPORT deflateInit_(z_stream *strm, int level, const char *version, int stream_size);
-Z_EXTERN int Z_EXPORT inflateInit_(z_stream *strm, const char *version, int stream_size);
-Z_EXTERN int Z_EXPORT deflateInit2_(z_stream *strm, int  level, int  method, int windowBits, int memLevel,
-                                   int strategy, const char *version, int stream_size);
-Z_EXTERN int Z_EXPORT inflateInit2_(z_stream *strm, int  windowBits, const char *version, int stream_size);
-Z_EXTERN int Z_EXPORT inflateBackInit_(z_stream *strm, int windowBits, unsigned char *window,
-                                      const char *version, int stream_size);
-#define @ZLIB_SYMBOL_PREFIX@deflateInit(strm, level) deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define @ZLIB_SYMBOL_PREFIX@inflateInit(strm) inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define @ZLIB_SYMBOL_PREFIX@deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm), (level), (method), (windowBits), (memLevel), \
-                     (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define @ZLIB_SYMBOL_PREFIX@inflateInit2(strm, windowBits) inflateInit2_((strm), (windowBits), ZLIB_VERSION, (int)sizeof(z_stream))
-#define @ZLIB_SYMBOL_PREFIX@inflateBackInit(strm, windowBits, window) \
-                        inflateBackInit_((strm), (windowBits), (window), ZLIB_VERSION, (int)sizeof(z_stream))
-
-
-#ifndef Z_SOLO
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-Z_EXTERN int Z_EXPORT gzgetc_(gzFile file);  /* backward compatibility */
-#  define @ZLIB_SYMBOL_PREFIX@gzgetc(g) ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (@ZLIB_SYMBOL_PREFIX@gzgetc)(g))
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   Z_EXTERN gzFile Z_EXPORT gzopen64(const char *, const char *);
-   Z_EXTERN z_off64_t Z_EXPORT gzseek64(gzFile, z_off64_t, int);
-   Z_EXTERN z_off64_t Z_EXPORT gztell64(gzFile);
-   Z_EXTERN z_off64_t Z_EXPORT gzoffset64(gzFile);
-   Z_EXTERN unsigned long Z_EXPORT adler32_combine64(unsigned long, unsigned long, z_off64_t);
-   Z_EXTERN unsigned long Z_EXPORT crc32_combine64(unsigned long, unsigned long, z_off64_t);
-   Z_EXTERN unsigned long Z_EXPORT crc32_combine_gen64(z_off64_t);
-#endif
-#endif
-
-#if !defined(Z_SOLO) && !defined(Z_INTERNAL) && defined(Z_WANT64)
-#    define @ZLIB_SYMBOL_PREFIX@gzopen @ZLIB_SYMBOL_PREFIX@gzopen64
-#    define @ZLIB_SYMBOL_PREFIX@gzseek @ZLIB_SYMBOL_PREFIX@gzseek64
-#    define @ZLIB_SYMBOL_PREFIX@gztell @ZLIB_SYMBOL_PREFIX@gztell64
-#    define @ZLIB_SYMBOL_PREFIX@gzoffset @ZLIB_SYMBOL_PREFIX@gzoffset64
-#    define @ZLIB_SYMBOL_PREFIX@adler32_combine @ZLIB_SYMBOL_PREFIX@adler32_combine64
-#    define @ZLIB_SYMBOL_PREFIX@crc32_combine @ZLIB_SYMBOL_PREFIX@crc32_combine64
-#    define @ZLIB_SYMBOL_PREFIX@crc32_combine_gen @ZLIB_SYMBOL_PREFIX@crc32_combine_gen64
-#  ifndef Z_LARGE64
-     Z_EXTERN gzFile Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzopen64(const char *, const char *);
-     Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzseek64(gzFile, z_off_t, int);
-     Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gztell64(gzFile);
-     Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzoffset64(gzFile);
-     Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@adler32_combine64(unsigned long, unsigned long, z_off_t);
-     Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@crc32_combine64(unsigned long, unsigned long, z_off_t);
-     Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@crc32_combine_gen64(z_off64_t);
-#  endif
-#else
-#  ifndef Z_SOLO
-   Z_EXTERN gzFile Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzopen(const char *, const char *);
-   Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzseek(gzFile, z_off_t, int);
-   Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gztell(gzFile);
-   Z_EXTERN z_off_t Z_EXPORT @ZLIB_SYMBOL_PREFIX@gzoffset(gzFile);
-#  endif
-   Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@adler32_combine(unsigned long, unsigned long, z_off_t);
-   Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@crc32_combine(unsigned long, unsigned long, z_off_t);
-   Z_EXTERN unsigned long Z_EXPORT @ZLIB_SYMBOL_PREFIX@crc32_combine_gen(z_off_t);
-#endif
-
-/* undocumented functions */
-Z_EXTERN const char     * Z_EXPORT zError           (int);
-Z_EXTERN int              Z_EXPORT inflateSyncPoint (z_stream *);
-Z_EXTERN const uint32_t * Z_EXPORT get_crc_table    (void);
-Z_EXTERN int              Z_EXPORT inflateUndermine (z_stream *, int);
-Z_EXTERN int              Z_EXPORT inflateValidate  (z_stream *, int);
-Z_EXTERN unsigned long    Z_EXPORT inflateCodesUsed (z_stream *);
-Z_EXTERN int              Z_EXPORT inflateResetKeep (z_stream *);
-Z_EXTERN int              Z_EXPORT deflateResetKeep (z_stream *);
-
-#ifndef Z_SOLO
-#if defined(_WIN32)
-    Z_EXTERN gzFile Z_EXPORT gzopen_w(const wchar_t *path, const char *mode);
-#endif
-Z_EXTERN int Z_EXPORTVA gzvprintf(gzFile file, const char *format, va_list va);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H_ */

crates/libz-sys/src/zlib-ng/zlib.map

diff --git a/crates/libz-sys/src/zlib-ng/zlib.map b/crates/libz-sys/src/zlib-ng/zlib.map
deleted file mode 100644
index fccc0e1..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib.map
+++ /dev/null
@@ -1,99 +0,0 @@
-ZLIB_1.2.0 {
-  global:
-    compressBound;
-    deflateBound;
-    inflateBack;
-    inflateBackEnd;
-    inflateBackInit_;
-    inflateCopy;
-  local:
-    deflate_copyright;
-    inflate_copyright;
-    inflate_fast;
-    inflate_table;
-    zcalloc;
-    zcfree;
-    z_errmsg;
-    gz_error;
-    _*;
-};
-
-ZLIB_1.2.0.2 {
-    gzclearerr;
-    gzungetc;
-    zlibCompileFlags;
-} ZLIB_1.2.0;
-
-ZLIB_1.2.0.8 {
-    deflatePrime;
-} ZLIB_1.2.0.2;
-
-ZLIB_1.2.2 {
-    adler32_combine;
-    crc32_combine;
-    deflateSetHeader;
-    inflateGetHeader;
-} ZLIB_1.2.0.8;
-
-ZLIB_1.2.2.3 {
-    deflateTune;
-    gzdirect;
-} ZLIB_1.2.2;
-
-ZLIB_1.2.2.4 {
-    inflatePrime;
-} ZLIB_1.2.2.3;
-
-ZLIB_1.2.3.3 {
-    adler32_combine64;
-    crc32_combine64;
-    gzopen64;
-    gzseek64;
-    gztell64;
-    inflateUndermine;
-} ZLIB_1.2.2.4;
-
-ZLIB_1.2.3.4 {
-    inflateReset2;
-    inflateMark;
-} ZLIB_1.2.3.3;
-
-ZLIB_1.2.3.5 {
-    gzbuffer;
-    gzoffset;
-    gzoffset64;
-    gzclose_r;
-    gzclose_w;
-} ZLIB_1.2.3.4;
-
-ZLIB_1.2.5.1 {
-    deflatePending;
-} ZLIB_1.2.3.5;
-
-ZLIB_1.2.5.2 {
-    deflateResetKeep;
-    gzgetc_;
-    inflateResetKeep;
-} ZLIB_1.2.5.1;
-
-ZLIB_1.2.7.1 {
-    inflateGetDictionary;
-    gzvprintf;
-} ZLIB_1.2.5.2;
-
-ZLIB_1.2.9 {
-    inflateCodesUsed;
-    inflateValidate;
-    uncompress2;
-    gzfread;
-    gzfwrite;
-    deflateGetDictionary;
-    adler32_z;
-    crc32_z;
-} ZLIB_1.2.7.1;
-
-ZLIB_1.2.12 {
-    crc32_combine_gen;
-    crc32_combine_gen64;
-    crc32_combine_op;
-} ZLIB_1.2.9;

crates/libz-sys/src/zlib-ng/zlib.pc.cmakein

diff --git a/crates/libz-sys/src/zlib-ng/zlib.pc.cmakein b/crates/libz-sys/src/zlib-ng/zlib.pc.cmakein
deleted file mode 100644
index 3d440ce..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib.pc.cmakein
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-symbol_prefix=@ZLIB_SYMBOL_PREFIX@
-libdir=@PC_LIB_INSTALL_DIR@
-sharedlibdir=${libdir}
-includedir=@PC_INC_INSTALL_DIR@
-
-Name: zlib@SUFFIX@
-Description: zlib-ng compression library
-Version: @ZLIB_FULL_VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@
-Cflags: -I${includedir}

crates/libz-sys/src/zlib-ng/zlib.pc.in

diff --git a/crates/libz-sys/src/zlib-ng/zlib.pc.in b/crates/libz-sys/src/zlib-ng/zlib.pc.in
deleted file mode 100644
index a0678fb..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-symbol_prefix=@symbol_prefix@
-libdir=@libdir@
-sharedlibdir=@sharedlibdir@
-includedir=@includedir@
-
-Name: zlib@SUFFIX@
-Description: zlib-ng compression library
-Version: @VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@
-Cflags: -I${includedir}

crates/libz-sys/src/zlib-ng/zlib_name_mangling-ng.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zlib_name_mangling-ng.h.in b/crates/libz-sys/src/zlib-ng/zlib_name_mangling-ng.h.in
deleted file mode 100644
index 78ab9e3..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib_name_mangling-ng.h.in
+++ /dev/null
@@ -1,175 +0,0 @@
-/* zlib_name_mangling.h has been automatically generated from
- * zlib_name_mangling.h.in because ZLIB_SYMBOL_PREFIX was set.
- */
-
-#ifndef ZLIB_NAME_MANGLING_H
-#define ZLIB_NAME_MANGLING_H
-
-/* all linked symbols and init macros */
-#define zng__dist_code            @ZLIB_SYMBOL_PREFIX@zng__dist_code
-#define zng__length_code          @ZLIB_SYMBOL_PREFIX@zng__length_code
-#define zng__tr_align             @ZLIB_SYMBOL_PREFIX@zng__tr_align
-#define zng__tr_flush_bits        @ZLIB_SYMBOL_PREFIX@zng__tr_flush_bits
-#define zng__tr_flush_block       @ZLIB_SYMBOL_PREFIX@zng__tr_flush_block
-#define zng__tr_init              @ZLIB_SYMBOL_PREFIX@zng__tr_init
-#define zng__tr_stored_block      @ZLIB_SYMBOL_PREFIX@zng__tr_stored_block
-#define zng__tr_tally             @ZLIB_SYMBOL_PREFIX@zng__tr_tally
-#define zng_adler32               @ZLIB_SYMBOL_PREFIX@zng_adler32
-#define zng_adler32_combine       @ZLIB_SYMBOL_PREFIX@zng_adler32_combine
-#define zng_adler32_combine64     @ZLIB_SYMBOL_PREFIX@zng_adler32_combine64
-#define zng_adler32_z             @ZLIB_SYMBOL_PREFIX@zng_adler32_z
-#ifndef Z_SOLO
-#  define zng_compress              @ZLIB_SYMBOL_PREFIX@zng_compress
-#  define zng_compress2             @ZLIB_SYMBOL_PREFIX@zng_compress2
-#  define zng_compressBound         @ZLIB_SYMBOL_PREFIX@zng_compressBound
-#endif
-#define zng_crc32                 @ZLIB_SYMBOL_PREFIX@zng_crc32
-#define zng_crc32_combine         @ZLIB_SYMBOL_PREFIX@zng_crc32_combine
-#define zng_crc32_combine64       @ZLIB_SYMBOL_PREFIX@zng_crc32_combine64
-#define zng_crc32_combine_gen     @ZLIB_SYMBOL_PREFIX@zng_crc32_combine_gen
-#define zng_crc32_combine_gen64   @ZLIB_SYMBOL_PREFIX@zng_crc32_combine_gen64
-#define zng_crc32_combine_op      @ZLIB_SYMBOL_PREFIX@zng_crc32_combine_op
-#define zng_crc32_z               @ZLIB_SYMBOL_PREFIX@zng_crc32_z
-#define zng_deflate               @ZLIB_SYMBOL_PREFIX@zng_deflate
-#define zng_deflateBound          @ZLIB_SYMBOL_PREFIX@zng_deflateBound
-#define zng_deflateCopy           @ZLIB_SYMBOL_PREFIX@zng_deflateCopy
-#define zng_deflateEnd            @ZLIB_SYMBOL_PREFIX@zng_deflateEnd
-#define zng_deflateGetDictionary  @ZLIB_SYMBOL_PREFIX@zng_deflateGetDictionary
-#define zng_deflateInit           @ZLIB_SYMBOL_PREFIX@zng_deflateInit
-#define zng_deflateInit2          @ZLIB_SYMBOL_PREFIX@zng_deflateInit2
-#define zng_deflateInit2_         @ZLIB_SYMBOL_PREFIX@zng_deflateInit2_
-#define zng_deflateInit_          @ZLIB_SYMBOL_PREFIX@zng_deflateInit_
-#define zng_deflateParams         @ZLIB_SYMBOL_PREFIX@zng_deflateParams
-#define zng_deflatePending        @ZLIB_SYMBOL_PREFIX@zng_deflatePending
-#define zng_deflatePrime          @ZLIB_SYMBOL_PREFIX@zng_deflatePrime
-#define zng_deflateReset          @ZLIB_SYMBOL_PREFIX@zng_deflateReset
-#define zng_deflateResetKeep      @ZLIB_SYMBOL_PREFIX@zng_deflateResetKeep
-#define zng_deflateSetDictionary  @ZLIB_SYMBOL_PREFIX@zng_deflateSetDictionary
-#define zng_deflateSetHeader      @ZLIB_SYMBOL_PREFIX@zng_deflateSetHeader
-#define zng_deflateTune           @ZLIB_SYMBOL_PREFIX@zng_deflateTune
-#define zng_deflate_copyright     @ZLIB_SYMBOL_PREFIX@zng_deflate_copyright
-#define zng_get_crc_table         @ZLIB_SYMBOL_PREFIX@zng_get_crc_table
-#ifndef Z_SOLO
-#  define zng_gz_error              @ZLIB_SYMBOL_PREFIX@zng_gz_error
-#  define zng_gz_strwinerror        @ZLIB_SYMBOL_PREFIX@zng_gz_strwinerror
-#  define zng_gzbuffer              @ZLIB_SYMBOL_PREFIX@zng_gzbuffer
-#  define zng_gzclearerr            @ZLIB_SYMBOL_PREFIX@zng_gzclearerr
-#  define zng_gzclose               @ZLIB_SYMBOL_PREFIX@zng_gzclose
-#  define zng_gzclose_r             @ZLIB_SYMBOL_PREFIX@zng_gzclose_r
-#  define zng_gzclose_w             @ZLIB_SYMBOL_PREFIX@zng_gzclose_w
-#  define zng_gzdirect              @ZLIB_SYMBOL_PREFIX@zng_gzdirect
-#  define zng_gzdopen               @ZLIB_SYMBOL_PREFIX@zng_gzdopen
-#  define zng_gzeof                 @ZLIB_SYMBOL_PREFIX@zng_gzeof
-#  define zng_gzerror               @ZLIB_SYMBOL_PREFIX@zng_gzerror
-#  define zng_gzflush               @ZLIB_SYMBOL_PREFIX@zng_gzflush
-#  define zng_gzfread               @ZLIB_SYMBOL_PREFIX@zng_gzfread
-#  define zng_gzfwrite              @ZLIB_SYMBOL_PREFIX@zng_gzfwrite
-#  define zng_gzgetc                @ZLIB_SYMBOL_PREFIX@zng_gzgetc
-#  define zng_gzgetc_               @ZLIB_SYMBOL_PREFIX@zng_gzgetc_
-#  define zng_gzgets                @ZLIB_SYMBOL_PREFIX@zng_gzgets
-#  define zng_gzoffset              @ZLIB_SYMBOL_PREFIX@zng_gzoffset
-#  define zng_gzoffset64            @ZLIB_SYMBOL_PREFIX@zng_gzoffset64
-#  define zng_gzopen                @ZLIB_SYMBOL_PREFIX@zng_gzopen
-#  define zng_gzopen64              @ZLIB_SYMBOL_PREFIX@zng_gzopen64
-#  ifdef _WIN32
-#    define zng_gzopen_w              @ZLIB_SYMBOL_PREFIX@zng_gzopen_w
-#  endif
-#  define zng_gzprintf              @ZLIB_SYMBOL_PREFIX@zng_gzprintf
-#  define zng_gzputc                @ZLIB_SYMBOL_PREFIX@zng_gzputc
-#  define zng_gzputs                @ZLIB_SYMBOL_PREFIX@zng_gzputs
-#  define zng_gzread                @ZLIB_SYMBOL_PREFIX@zng_gzread
-#  define zng_gzrewind              @ZLIB_SYMBOL_PREFIX@zng_gzrewind
-#  define zng_gzseek                @ZLIB_SYMBOL_PREFIX@zng_gzseek
-#  define zng_gzseek64              @ZLIB_SYMBOL_PREFIX@zng_gzseek64
-#  define zng_gzsetparams           @ZLIB_SYMBOL_PREFIX@zng_gzsetparams
-#  define zng_gztell                @ZLIB_SYMBOL_PREFIX@zng_gztell
-#  define zng_gztell64              @ZLIB_SYMBOL_PREFIX@zng_gztell64
-#  define zng_gzungetc              @ZLIB_SYMBOL_PREFIX@zng_gzungetc
-#  define zng_gzvprintf             @ZLIB_SYMBOL_PREFIX@zng_gzvprintf
-#  define zng_gzwrite               @ZLIB_SYMBOL_PREFIX@zng_gzwrite
-#endif
-#define zng_inflate               @ZLIB_SYMBOL_PREFIX@zng_inflate
-#define zng_inflateBack           @ZLIB_SYMBOL_PREFIX@zng_inflateBack
-#define zng_inflateBackEnd        @ZLIB_SYMBOL_PREFIX@zng_inflateBackEnd
-#define zng_inflateBackInit       @ZLIB_SYMBOL_PREFIX@zng_inflateBackInit
-#define zng_inflateBackInit_      @ZLIB_SYMBOL_PREFIX@zng_inflateBackInit_
-#define zng_inflateCodesUsed      @ZLIB_SYMBOL_PREFIX@zng_inflateCodesUsed
-#define zng_inflateCopy           @ZLIB_SYMBOL_PREFIX@zng_inflateCopy
-#define zng_inflateEnd            @ZLIB_SYMBOL_PREFIX@zng_inflateEnd
-#define zng_inflateGetDictionary  @ZLIB_SYMBOL_PREFIX@zng_inflateGetDictionary
-#define zng_inflateGetHeader      @ZLIB_SYMBOL_PREFIX@zng_inflateGetHeader
-#define zng_inflateInit           @ZLIB_SYMBOL_PREFIX@zng_inflateInit
-#define zng_inflateInit2          @ZLIB_SYMBOL_PREFIX@zng_inflateInit2
-#define zng_inflateInit2_         @ZLIB_SYMBOL_PREFIX@zng_inflateInit2_
-#define zng_inflateInit_          @ZLIB_SYMBOL_PREFIX@zng_inflateInit_
-#define zng_inflateMark           @ZLIB_SYMBOL_PREFIX@zng_inflateMark
-#define zng_inflatePrime          @ZLIB_SYMBOL_PREFIX@zng_inflatePrime
-#define zng_inflateReset          @ZLIB_SYMBOL_PREFIX@zng_inflateReset
-#define zng_inflateReset2         @ZLIB_SYMBOL_PREFIX@zng_inflateReset2
-#define zng_inflateResetKeep      @ZLIB_SYMBOL_PREFIX@zng_inflateResetKeep
-#define zng_inflateSetDictionary  @ZLIB_SYMBOL_PREFIX@zng_inflateSetDictionary
-#define zng_inflateSync           @ZLIB_SYMBOL_PREFIX@zng_inflateSync
-#define zng_inflateSyncPoint      @ZLIB_SYMBOL_PREFIX@zng_inflateSyncPoint
-#define zng_inflateUndermine      @ZLIB_SYMBOL_PREFIX@zng_inflateUndermine
-#define zng_inflateValidate       @ZLIB_SYMBOL_PREFIX@zng_inflateValidate
-#define zng_inflate_copyright     @ZLIB_SYMBOL_PREFIX@zng_inflate_copyright
-#define zng_inflate_fast          @ZLIB_SYMBOL_PREFIX@zng_inflate_fast
-#define zng_inflate_table         @ZLIB_SYMBOL_PREFIX@zng_inflate_table
-#ifndef Z_SOLO
-#  define zng_uncompress            @ZLIB_SYMBOL_PREFIX@zng_uncompress
-#  define zng_uncompress2           @ZLIB_SYMBOL_PREFIX@zng_uncompress2
-#endif
-#define zng_zError                @ZLIB_SYMBOL_PREFIX@zng_zError
-#ifndef Z_SOLO
-#  define zng_zcalloc               @ZLIB_SYMBOL_PREFIX@zng_zcalloc
-#  define zng_zcfree                @ZLIB_SYMBOL_PREFIX@zng_zcfree
-#endif
-#define zng_zlibCompileFlags      @ZLIB_SYMBOL_PREFIX@zng_zlibCompileFlags
-#define zng_zlibVersion           @ZLIB_SYMBOL_PREFIX@zng_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#define Byte                  @ZLIB_SYMBOL_PREFIX@Byte
-#define Bytef                 @ZLIB_SYMBOL_PREFIX@Bytef
-#define alloc_func            @ZLIB_SYMBOL_PREFIX@alloc_func
-#define charf                 @ZLIB_SYMBOL_PREFIX@charf
-#define free_func             @ZLIB_SYMBOL_PREFIX@free_func
-#ifndef Z_SOLO
-#  define gzFile                @ZLIB_SYMBOL_PREFIX@gzFile
-#endif
-#define gz_header             @ZLIB_SYMBOL_PREFIX@gz_header
-#define gz_headerp            @ZLIB_SYMBOL_PREFIX@gz_headerp
-#define in_func               @ZLIB_SYMBOL_PREFIX@in_func
-#define intf                  @ZLIB_SYMBOL_PREFIX@intf
-#define out_func              @ZLIB_SYMBOL_PREFIX@out_func
-#define uInt                  @ZLIB_SYMBOL_PREFIX@uInt
-#define uIntf                 @ZLIB_SYMBOL_PREFIX@uIntf
-#define uLong                 @ZLIB_SYMBOL_PREFIX@uLong
-#define uLongf                @ZLIB_SYMBOL_PREFIX@uLongf
-#define voidp                 @ZLIB_SYMBOL_PREFIX@voidp
-#define voidpc                @ZLIB_SYMBOL_PREFIX@voidpc
-#define voidpf                @ZLIB_SYMBOL_PREFIX@voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#define zng_gz_header_s           @ZLIB_SYMBOL_PREFIX@zng_gz_header_s
-#define internal_state            @ZLIB_SYMBOL_PREFIX@internal_state
-
-/* zlib-ng specific symbols */
-#define zng_deflate_param         @ZLIB_SYMBOL_PREFIX@zng_deflate_param
-#define zng_deflate_param_value   @ZLIB_SYMBOL_PREFIX@zng_deflate_param_value
-#define zng_deflateSetParams      @ZLIB_SYMBOL_PREFIX@zng_deflateSetParams
-#define zng_deflateGetParams      @ZLIB_SYMBOL_PREFIX@zng_deflateGetParams
-
-#define zlibng_version         @ZLIB_SYMBOL_PREFIX@zlibng_version
-#define zng_zError             @ZLIB_SYMBOL_PREFIX@zng_zError
-#define zng_inflateSyncPoint   @ZLIB_SYMBOL_PREFIX@zng_inflateSyncPoint
-#define zng_get_crc_table      @ZLIB_SYMBOL_PREFIX@zng_get_crc_table
-#define zng_inflateUndermine   @ZLIB_SYMBOL_PREFIX@zng_inflateUndermine
-#define zng_inflateValidate    @ZLIB_SYMBOL_PREFIX@zng_inflateValidate
-#define zng_inflateCodesUsed   @ZLIB_SYMBOL_PREFIX@zng_inflateCodesUsed
-#define zng_inflateResetKeep   @ZLIB_SYMBOL_PREFIX@zng_inflateResetKeep
-#define zng_deflateResetKeep   @ZLIB_SYMBOL_PREFIX@zng_deflateResetKeep
-
-#define zng_gzopen_w           @ZLIB_SYMBOL_PREFIX@zng_gzopen_w
-#define zng_gzvprintf          @ZLIB_SYMBOL_PREFIX@zng_gzvprintf
-
-#endif /* ZLIB_NAME_MANGLING_H */

crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.empty

diff --git a/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.empty b/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.empty
deleted file mode 100644
index b24cb83..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.empty
+++ /dev/null
@@ -1,8 +0,0 @@
-/* zlib_name_mangling.h has been automatically generated from
- * zlib_name_mangling.h.empty because ZLIB_SYMBOL_PREFIX was NOT set.
- */
-
-#ifndef ZLIB_NAME_MANGLING_H
-#define ZLIB_NAME_MANGLING_H
-
-#endif /* ZLIB_NAME_MANGLING_H */

crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.in

diff --git a/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.in b/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.in
deleted file mode 100644
index 5a1b2ce..0000000
--- a/crates/libz-sys/src/zlib-ng/zlib_name_mangling.h.in
+++ /dev/null
@@ -1,159 +0,0 @@
-/* zlib_name_mangling.h has been automatically generated from
- * zlib_name_mangling.h.in because ZLIB_SYMBOL_PREFIX was set.
- */
-
-#ifndef ZLIB_NAME_MANGLING_H
-#define ZLIB_NAME_MANGLING_H
-
-/* all linked symbols and init macros */
-#define _dist_code            @ZLIB_SYMBOL_PREFIX@_dist_code
-#define _length_code          @ZLIB_SYMBOL_PREFIX@_length_code
-#define _tr_align             @ZLIB_SYMBOL_PREFIX@_tr_align
-#define _tr_flush_bits        @ZLIB_SYMBOL_PREFIX@_tr_flush_bits
-#define _tr_flush_block       @ZLIB_SYMBOL_PREFIX@_tr_flush_block
-#define _tr_init              @ZLIB_SYMBOL_PREFIX@_tr_init
-#define _tr_stored_block      @ZLIB_SYMBOL_PREFIX@_tr_stored_block
-#define _tr_tally             @ZLIB_SYMBOL_PREFIX@_tr_tally
-#define adler32               @ZLIB_SYMBOL_PREFIX@adler32
-#define adler32_combine       @ZLIB_SYMBOL_PREFIX@adler32_combine
-#define adler32_combine64     @ZLIB_SYMBOL_PREFIX@adler32_combine64
-#define adler32_z             @ZLIB_SYMBOL_PREFIX@adler32_z
-#ifndef Z_SOLO
-#  define compress              @ZLIB_SYMBOL_PREFIX@compress
-#  define compress2             @ZLIB_SYMBOL_PREFIX@compress2
-#  define compressBound         @ZLIB_SYMBOL_PREFIX@compressBound
-#endif
-#define crc32                 @ZLIB_SYMBOL_PREFIX@crc32
-#define crc32_combine         @ZLIB_SYMBOL_PREFIX@crc32_combine
-#define crc32_combine64       @ZLIB_SYMBOL_PREFIX@crc32_combine64
-#define crc32_combine_gen     @ZLIB_SYMBOL_PREFIX@crc32_combine_gen
-#define crc32_combine_gen64   @ZLIB_SYMBOL_PREFIX@crc32_combine_gen64
-#define crc32_combine_op      @ZLIB_SYMBOL_PREFIX@crc32_combine_op
-#define crc32_z               @ZLIB_SYMBOL_PREFIX@crc32_z
-#define deflate               @ZLIB_SYMBOL_PREFIX@deflate
-#define deflateBound          @ZLIB_SYMBOL_PREFIX@deflateBound
-#define deflateCopy           @ZLIB_SYMBOL_PREFIX@deflateCopy
-#define deflateEnd            @ZLIB_SYMBOL_PREFIX@deflateEnd
-#define deflateGetDictionary  @ZLIB_SYMBOL_PREFIX@deflateGetDictionary
-#define deflateInit           @ZLIB_SYMBOL_PREFIX@deflateInit
-#define deflateInit2          @ZLIB_SYMBOL_PREFIX@deflateInit2
-#define deflateInit2_         @ZLIB_SYMBOL_PREFIX@deflateInit2_
-#define deflateInit_          @ZLIB_SYMBOL_PREFIX@deflateInit_
-#define deflateParams         @ZLIB_SYMBOL_PREFIX@deflateParams
-#define deflatePending        @ZLIB_SYMBOL_PREFIX@deflatePending
-#define deflatePrime          @ZLIB_SYMBOL_PREFIX@deflatePrime
-#define deflateReset          @ZLIB_SYMBOL_PREFIX@deflateReset
-#define deflateResetKeep      @ZLIB_SYMBOL_PREFIX@deflateResetKeep
-#define deflateSetDictionary  @ZLIB_SYMBOL_PREFIX@deflateSetDictionary
-#define deflateSetHeader      @ZLIB_SYMBOL_PREFIX@deflateSetHeader
-#define deflateTune           @ZLIB_SYMBOL_PREFIX@deflateTune
-#define deflate_copyright     @ZLIB_SYMBOL_PREFIX@deflate_copyright
-#define get_crc_table         @ZLIB_SYMBOL_PREFIX@get_crc_table
-#ifndef Z_SOLO
-#  define gz_error              @ZLIB_SYMBOL_PREFIX@gz_error
-#  define gz_strwinerror        @ZLIB_SYMBOL_PREFIX@gz_strwinerror
-#  define gzbuffer              @ZLIB_SYMBOL_PREFIX@gzbuffer
-#  define gzclearerr            @ZLIB_SYMBOL_PREFIX@gzclearerr
-#  define gzclose               @ZLIB_SYMBOL_PREFIX@gzclose
-#  define gzclose_r             @ZLIB_SYMBOL_PREFIX@gzclose_r
-#  define gzclose_w             @ZLIB_SYMBOL_PREFIX@gzclose_w
-#  define gzdirect              @ZLIB_SYMBOL_PREFIX@gzdirect
-#  define gzdopen               @ZLIB_SYMBOL_PREFIX@gzdopen
-#  define gzeof                 @ZLIB_SYMBOL_PREFIX@gzeof
-#  define gzerror               @ZLIB_SYMBOL_PREFIX@gzerror
-#  define gzflush               @ZLIB_SYMBOL_PREFIX@gzflush
-#  define gzfread               @ZLIB_SYMBOL_PREFIX@gzfread
-#  define gzfwrite              @ZLIB_SYMBOL_PREFIX@gzfwrite
-#  define gzgetc                @ZLIB_SYMBOL_PREFIX@gzgetc
-#  define gzgetc_               @ZLIB_SYMBOL_PREFIX@gzgetc_
-#  define gzgets                @ZLIB_SYMBOL_PREFIX@gzgets
-#  define gzoffset              @ZLIB_SYMBOL_PREFIX@gzoffset
-#  define gzoffset64            @ZLIB_SYMBOL_PREFIX@gzoffset64
-#  define gzopen                @ZLIB_SYMBOL_PREFIX@gzopen
-#  define gzopen64              @ZLIB_SYMBOL_PREFIX@gzopen64
-#  ifdef _WIN32
-#    define gzopen_w              @ZLIB_SYMBOL_PREFIX@gzopen_w
-#  endif
-#  define gzprintf              @ZLIB_SYMBOL_PREFIX@gzprintf
-#  define gzputc                @ZLIB_SYMBOL_PREFIX@gzputc
-#  define gzputs                @ZLIB_SYMBOL_PREFIX@gzputs
-#  define gzread                @ZLIB_SYMBOL_PREFIX@gzread
-#  define gzrewind              @ZLIB_SYMBOL_PREFIX@gzrewind
-#  define gzseek                @ZLIB_SYMBOL_PREFIX@gzseek
-#  define gzseek64              @ZLIB_SYMBOL_PREFIX@gzseek64
-#  define gzsetparams           @ZLIB_SYMBOL_PREFIX@gzsetparams
-#  define gztell                @ZLIB_SYMBOL_PREFIX@gztell
-#  define gztell64              @ZLIB_SYMBOL_PREFIX@gztell64
-#  define gzungetc              @ZLIB_SYMBOL_PREFIX@gzungetc
-#  define gzvprintf             @ZLIB_SYMBOL_PREFIX@gzvprintf
-#  define gzwrite               @ZLIB_SYMBOL_PREFIX@gzwrite
-#endif
-#define inflate               @ZLIB_SYMBOL_PREFIX@inflate
-#define inflateBack           @ZLIB_SYMBOL_PREFIX@inflateBack
-#define inflateBackEnd        @ZLIB_SYMBOL_PREFIX@inflateBackEnd
-#define inflateBackInit       @ZLIB_SYMBOL_PREFIX@inflateBackInit
-#define inflateBackInit_      @ZLIB_SYMBOL_PREFIX@inflateBackInit_
-#define inflateCodesUsed      @ZLIB_SYMBOL_PREFIX@inflateCodesUsed
-#define inflateCopy           @ZLIB_SYMBOL_PREFIX@inflateCopy
-#define inflateEnd            @ZLIB_SYMBOL_PREFIX@inflateEnd
-#define inflateGetDictionary  @ZLIB_SYMBOL_PREFIX@inflateGetDictionary
-#define inflateGetHeader      @ZLIB_SYMBOL_PREFIX@inflateGetHeader
-#define inflateInit           @ZLIB_SYMBOL_PREFIX@inflateInit
-#define inflateInit2          @ZLIB_SYMBOL_PREFIX@inflateInit2
-#define inflateInit2_         @ZLIB_SYMBOL_PREFIX@inflateInit2_
-#define inflateInit_          @ZLIB_SYMBOL_PREFIX@inflateInit_
-#define inflateMark           @ZLIB_SYMBOL_PREFIX@inflateMark
-#define inflatePrime          @ZLIB_SYMBOL_PREFIX@inflatePrime
-#define inflateReset          @ZLIB_SYMBOL_PREFIX@inflateReset
-#define inflateReset2         @ZLIB_SYMBOL_PREFIX@inflateReset2
-#define inflateResetKeep      @ZLIB_SYMBOL_PREFIX@inflateResetKeep
-#define inflateSetDictionary  @ZLIB_SYMBOL_PREFIX@inflateSetDictionary
-#define inflateSync           @ZLIB_SYMBOL_PREFIX@inflateSync
-#define inflateSyncPoint      @ZLIB_SYMBOL_PREFIX@inflateSyncPoint
-#define inflateUndermine      @ZLIB_SYMBOL_PREFIX@inflateUndermine
-#define inflateValidate       @ZLIB_SYMBOL_PREFIX@inflateValidate
-#define inflate_copyright     @ZLIB_SYMBOL_PREFIX@inflate_copyright
-#define inflate_fast          @ZLIB_SYMBOL_PREFIX@inflate_fast
-#define inflate_table         @ZLIB_SYMBOL_PREFIX@inflate_table
-#ifndef Z_SOLO
-#  define uncompress            @ZLIB_SYMBOL_PREFIX@uncompress
-#  define uncompress2           @ZLIB_SYMBOL_PREFIX@uncompress2
-#endif
-#define zError                @ZLIB_SYMBOL_PREFIX@zError
-#ifndef Z_SOLO
-#  define zcalloc               @ZLIB_SYMBOL_PREFIX@zcalloc
-#  define zcfree                @ZLIB_SYMBOL_PREFIX@zcfree
-#endif
-#define zlibCompileFlags      @ZLIB_SYMBOL_PREFIX@zlibCompileFlags
-#define zlibVersion           @ZLIB_SYMBOL_PREFIX@zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#define Byte                  @ZLIB_SYMBOL_PREFIX@Byte
-#define Bytef                 @ZLIB_SYMBOL_PREFIX@Bytef
-#define alloc_func            @ZLIB_SYMBOL_PREFIX@alloc_func
-#define charf                 @ZLIB_SYMBOL_PREFIX@charf
-#define free_func             @ZLIB_SYMBOL_PREFIX@free_func
-#ifndef Z_SOLO
-#  define gzFile                @ZLIB_SYMBOL_PREFIX@gzFile
-#endif
-#define gz_header             @ZLIB_SYMBOL_PREFIX@gz_header
-#define gz_headerp            @ZLIB_SYMBOL_PREFIX@gz_headerp
-#define in_func               @ZLIB_SYMBOL_PREFIX@in_func
-#define intf                  @ZLIB_SYMBOL_PREFIX@intf
-#define out_func              @ZLIB_SYMBOL_PREFIX@out_func
-#define uInt                  @ZLIB_SYMBOL_PREFIX@uInt
-#define uIntf                 @ZLIB_SYMBOL_PREFIX@uIntf
-#define uLong                 @ZLIB_SYMBOL_PREFIX@uLong
-#define uLongf                @ZLIB_SYMBOL_PREFIX@uLongf
-#define voidp                 @ZLIB_SYMBOL_PREFIX@voidp
-#define voidpc                @ZLIB_SYMBOL_PREFIX@voidpc
-#define voidpf                @ZLIB_SYMBOL_PREFIX@voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#define gz_header_s           @ZLIB_SYMBOL_PREFIX@gz_header_s
-#define internal_state        @ZLIB_SYMBOL_PREFIX@internal_state
-
-/* all zlib structs in zutil.h */
-#define z_errmsg              @ZLIB_SYMBOL_PREFIX@z_errmsg
-
-#endif /* ZLIB_NAME_MANGLING_H */

crates/libz-sys/src/zlib-ng/zutil.c

diff --git a/crates/libz-sys/src/zlib-ng/zutil.c b/crates/libz-sys/src/zlib-ng/zutil.c
deleted file mode 100644
index 5583578..0000000
--- a/crates/libz-sys/src/zlib-ng/zutil.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zbuild.h"
-#include "zutil_p.h"
-#include "zutil.h"
-
-z_const char * const PREFIX(z_errmsg)[10] = {
-    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
-    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
-    (z_const char *)"",                    /* Z_OK              0  */
-    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
-    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
-    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
-    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
-    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
-    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
-    (z_const char *)""
-};
-
-const char zlibng_string[] =
-    " zlib-ng 2.1.0.devel forked from zlib";
-
-#ifdef ZLIB_COMPAT
-const char * Z_EXPORT zlibVersion(void) {
-    return ZLIB_VERSION;
-}
-#endif
-
-const char * Z_EXPORT zlibng_version(void) {
-    return ZLIBNG_VERSION;
-}
-
-unsigned long Z_EXPORT PREFIX(zlibCompileFlags)(void) {
-    unsigned long flags;
-
-    flags = 0;
-    switch ((int)(sizeof(unsigned int))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch ((int)(sizeof(unsigned long))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch ((int)(sizeof(void *))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef ZLIB_DEBUG
-    flags += 1 << 8;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-    /* Bit 13 reserved for DYNAMIC_CRC_TABLE */
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-    return flags;
-}
-
-#ifdef ZLIB_DEBUG
-#  include <stdlib.h>
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int Z_INTERNAL z_verbose = verbose;
-
-void Z_INTERNAL z_error(char *m) {
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * Z_EXPORT PREFIX(zError)(int err) {
-    return ERR_MSG(err);
-}
-
-void Z_INTERNAL *zng_calloc(void *opaque, unsigned items, unsigned size) {
-    Z_UNUSED(opaque);
-    return zng_alloc((size_t)items * (size_t)size);
-}
-
-void Z_INTERNAL zng_cfree(void *opaque, void *ptr) {
-    Z_UNUSED(opaque);
-    zng_free(ptr);
-}
-
-/* Since we support custom memory allocators, some which might not align memory as we expect,
- * we have to ask for extra memory and return an aligned pointer. */
-void Z_INTERNAL *zng_alloc_aligned(zng_calloc_func zalloc, void *opaque, unsigned items, unsigned size, unsigned align) {
-    uintptr_t return_ptr, original_ptr;
-    uint32_t alloc_size, align_diff;
-    void *ptr;
-
-    /* If no custom calloc function used then call zlib-ng's aligned calloc */
-    if (zalloc == zng_calloc)
-        return zng_calloc(opaque, items, size);
-
-    /* Allocate enough memory for proper alignment and to store the original memory pointer */
-    alloc_size = sizeof(void *) + (items * size) + align;
-    ptr = zalloc(opaque, 1, alloc_size);
-    if (!ptr)
-        return NULL;
-
-    /* Calculate return pointer address with space enough to store original pointer */
-    align_diff = align - ((uintptr_t)ptr % align);
-    return_ptr = (uintptr_t)ptr + align_diff;
-    if (align_diff < sizeof(void *))
-        return_ptr += align;
-
-    /* Store the original pointer for free() */
-    original_ptr = return_ptr - sizeof(void *);
-    memcpy((void *)original_ptr, &ptr, sizeof(void *));
-
-    /* Return properly aligned pointer in allocation */
-    return (void *)return_ptr;
-}
-
-void Z_INTERNAL zng_free_aligned(zng_cfree_func zfree, void *opaque, void *ptr) {
-    /* If no custom cfree function used then call zlib-ng's aligned cfree */
-    if (zfree == zng_cfree) {
-        zng_cfree(opaque, ptr);
-        return;
-    }
-    if (!ptr)
-        return;
-
-    /* Calculate offset to original memory allocation pointer */
-    void *original_ptr = (void *)((uintptr_t)ptr - sizeof(void *));
-    void *free_ptr = *(void **)original_ptr;
-
-    /* Free original memory allocation */
-    zfree(opaque, free_ptr);
-}

crates/libz-sys/src/zlib-ng/zutil.h

diff --git a/crates/libz-sys/src/zlib-ng/zutil.h b/crates/libz-sys/src/zlib-ng/zutil.h
deleted file mode 100644
index f70eb4b..0000000
--- a/crates/libz-sys/src/zlib-ng/zutil.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef ZUTIL_H_
-#define ZUTIL_H_
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
-
-typedef unsigned char uch; /* Included for compatibility with external code only */
-typedef uint16_t ush;      /* Included for compatibility with external code only */
-typedef unsigned long ulg;
-
-extern z_const char * const PREFIX(z_errmsg)[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) PREFIX(z_errmsg)[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm, err) return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define STD_MIN_MATCH  3
-#define STD_MAX_MATCH  258
-/* The minimum and maximum match lengths mandated by the deflate standard */
-
-#define WANT_MIN_MATCH  4
-/* The minimum wanted match length, affects deflate_quick, deflate_fast, deflate_medium and deflate_slow  */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-#define ADLER32_INITIAL_VALUE 1 /* initial adler-32 hash value */
-#define CRC32_INITIAL_VALUE   0 /* initial crc-32 hash value */
-
-#define ZLIB_WRAPLEN 6      /* zlib format overhead */
-#define GZIP_WRAPLEN 18     /* gzip format overhead */
-
-#define DEFLATE_HEADER_BITS 3
-#define DEFLATE_EOBS_BITS   15
-#define DEFLATE_PAD_BITS    6
-#define DEFLATE_BLOCK_OVERHEAD ((DEFLATE_HEADER_BITS + DEFLATE_EOBS_BITS + DEFLATE_PAD_BITS) >> 3)
-/* deflate block overhead: 3 bits for block start + 15 bits for block end + padding to nearest byte */
-
-#define DEFLATE_QUICK_LIT_MAX_BITS 9
-#define DEFLATE_QUICK_OVERHEAD(x) ((x * (DEFLATE_QUICK_LIT_MAX_BITS - 8) + 7) >> 3)
-/* deflate_quick worst-case overhead: 9 bits per literal, round up to next byte (+7) */
-
-
-        /* target dependencies */
-
-#ifdef AMIGA
-#  define OS_CODE  1
-#endif
-
-#ifdef __370__
-#  if __TARGET_LIB__ < 0x20000000
-#    define OS_CODE 4
-#  elif __TARGET_LIB__ < 0x40000000
-#    define OS_CODE 11
-#  else
-#    define OS_CODE 8
-#  endif
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  5
-#endif
-
-#ifdef OS2
-#  define OS_CODE  6
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  7
-#endif
-
-#ifdef __acorn
-#  define OS_CODE 13
-#endif
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#  define OS_CODE  10
-#endif
-
-#ifdef __APPLE__
-#  define OS_CODE 19
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  3  /* assume Unix */
-#endif
-
-         /* memory allocation functions */
-
-void Z_INTERNAL *zng_calloc(void *opaque, unsigned items, unsigned size);
-void Z_INTERNAL   zng_cfree(void *opaque, void *ptr);
-
-typedef void *zng_calloc_func(void *opaque, unsigned items, unsigned size);
-typedef void  zng_cfree_func(void *opaque, void *ptr);
-
-void Z_INTERNAL *zng_alloc_aligned(zng_calloc_func zalloc, void *opaque, unsigned items, unsigned size, unsigned align);
-void Z_INTERNAL  zng_free_aligned(zng_cfree_func zfree, void *opaque, void *ptr);
-
-#define ZALLOC(strm, items, size) zng_alloc_aligned((strm)->zalloc, (strm)->opaque, (items), (size), 64)
-#define ZFREE(strm, addr)         zng_free_aligned((strm)->zfree, (strm)->opaque, (void *)(addr))
-
-#define TRY_FREE(s, p)            {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H_ */

crates/libz-sys/src/zlib-ng/zutil_p.h

diff --git a/crates/libz-sys/src/zlib-ng/zutil_p.h b/crates/libz-sys/src/zlib-ng/zutil_p.h
deleted file mode 100644
index fdfb443..0000000
--- a/crates/libz-sys/src/zlib-ng/zutil_p.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* zutil_p.h -- Private inline functions used internally in zlib-ng
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef ZUTIL_P_H
-#define ZUTIL_P_H
-
-#if defined(__APPLE__) || defined(HAVE_POSIX_MEMALIGN)
-#  include <stdlib.h>
-#elif defined(__FreeBSD__)
-#  include <stdlib.h>
-#  include <malloc_np.h>
-#else
-#  include <malloc.h>
-#endif
-
-/* Function to allocate 16 or 64-byte aligned memory */
-static inline void *zng_alloc(size_t size) {
-#ifdef HAVE_POSIX_MEMALIGN
-    void *ptr;
-    return posix_memalign(&ptr, 64, size) ? NULL : ptr;
-#elif defined(_WIN32)
-    return (void *)_aligned_malloc(size, 64);
-#elif defined(__APPLE__)
-    return (void *)malloc(size);     /* MacOS always aligns to 16 bytes */
-#else
-    return (void *)memalign(64, size);
-#endif
-}
-
-/* Function that can free aligned memory */
-static inline void zng_free(void *ptr) {
-#if defined(_WIN32)
-    _aligned_free(ptr);
-#else
-    free(ptr);
-#endif
-}
-
-#endif

crates/libz-sys/src/zlib/CMakeLists.txt

diff --git a/crates/libz-sys/src/zlib/CMakeLists.txt b/crates/libz-sys/src/zlib/CMakeLists.txt
deleted file mode 100644
index 0fe939d..0000000
--- a/crates/libz-sys/src/zlib/CMakeLists.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
-project(zlib C)
-
-set(VERSION "1.2.11")
-
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
-
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-
-include(CheckTypeSize)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckCSourceCompiles)
-enable_testing()
-
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h    HAVE_STDINT_H)
-check_include_file(stddef.h    HAVE_STDDEF_H)
-
-#
-# Check to see if we have large file support
-#
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
-if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-endif()
-if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-endif()
-if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-endif()
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-#
-# Check for fseeko
-#
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-endif()
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        message(STATUS "Renaming")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
-        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
-        message(STATUS "but CMake generates it automatically in the build directory.")
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
-  endif()
-endif()
-
-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-		${ZLIB_PC} @ONLY)
-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-
-#============================================================================
-# zlib
-#============================================================================
-
-set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-    zlib.h
-)
-set(ZLIB_PRIVATE_HDRS
-    crc32.h
-    deflate.h
-    gzguts.h
-    inffast.h
-    inffixed.h
-    inflate.h
-    inftrees.h
-    trees.h
-    zutil.h
-)
-set(ZLIB_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    deflate.c
-    gzclose.c
-    gzlib.c
-    gzread.c
-    gzwrite.c
-    inflate.c
-    infback.c
-    inftrees.c
-    inffast.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-if(NOT MINGW)
-    set(ZLIB_DLL_SRCS
-        win32/zlib1.rc # If present will override custom build rule below.
-    )
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
-if(MINGW)
-    # This gets us DLL resource information when compiling on MinGW.
-    if(NOT CMAKE_RC_COMPILER)
-        set(CMAKE_RC_COMPILER windres.exe)
-    endif()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND ${CMAKE_RC_COMPILER}
-                            -D GCC_WINDRES
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-endif(MINGW)
-
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
-
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
-     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-   endif()
-elseif(BUILD_SHARED_LIBS AND WIN32)
-    # Creates zlib1.dll when building shared library version
-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-endif()
-
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS zlib zlibstatic
-        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()

crates/libz-sys/src/zlib/ChangeLog

diff --git a/crates/libz-sys/src/zlib/ChangeLog b/crates/libz-sys/src/zlib/ChangeLog
deleted file mode 100644
index 30199a6..0000000
--- a/crates/libz-sys/src/zlib/ChangeLog
+++ /dev/null
@@ -1,1515 +0,0 @@
-
-                ChangeLog file for zlib
-
-Changes in 1.2.11 (15 Jan 2017)
-- Fix deflate stored bug when pulling last block from window
-- Permit immediate deflateParams changes before any deflate input
-
-Changes in 1.2.10 (2 Jan 2017)
-- Avoid warnings on snprintf() return value
-- Fix bug in deflate_stored() for zero-length input
-- Fix bug in gzwrite.c that produced corrupt gzip files
-- Remove files to be installed before copying them in Makefile.in
-- Add warnings when compiling with assembler code
-
-Changes in 1.2.9 (31 Dec 2016)
-- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
-- Improve contrib/blast to return unused bytes
-- Assure that gzoffset() is correct when appending
-- Improve compress() and uncompress() to support large lengths
-- Fix bug in test/example.c where error code not saved
-- Remedy Coverity warning [Randers-Pehrson]
-- Improve speed of gzprintf() in transparent mode
-- Fix inflateInit2() bug when windowBits is 16 or 32
-- Change DEBUG macro to ZLIB_DEBUG
-- Avoid uninitialized access by gzclose_w()
-- Allow building zlib outside of the source directory
-- Fix bug that accepted invalid zlib header when windowBits is zero
-- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
-- Loop on write() calls in gzwrite.c in case of non-blocking I/O
-- Add --warn (-w) option to ./configure for more compiler warnings
-- Reject a window size of 256 bytes if not using the zlib wrapper
-- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
-- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
-- Fix bugs in creating a very large gzip header
-- Add uncompress2() function, which returns the input size used
-- Assure that deflateParams() will not switch functions mid-block
-- Dramatically speed up deflation for level 0 (storing)
-- Add gzfread(), duplicating the interface of fread()
-- Add gzfwrite(), duplicating the interface of fwrite()
-- Add deflateGetDictionary() function
-- Use snprintf() for later versions of Microsoft C
-- Fix *Init macros to use z_ prefix when requested
-- Replace as400 with os400 for OS/400 support [Monnerat]
-- Add crc32_z() and adler32_z() functions with size_t lengths
-- Update Visual Studio project files [AraHaan]
-
-Changes in 1.2.8 (28 Apr 2013)
-- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
-- Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Roß]
-- Correct spelling error in zlib.h
-- Fix mixed line endings in contrib/vstudio
-
-Changes in 1.2.7.3 (13 Apr 2013)
-- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
-
-Changes in 1.2.7.2 (13 Apr 2013)
-- Change check for a four-byte type back to hexadecimal
-- Fix typo in win32/Makefile.msc
-- Add casts in gzwrite.c for pointer differences
-
-Changes in 1.2.7.1 (24 Mar 2013)
-- Replace use of unsafe string functions with snprintf if available
-- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
-- Fix gzgetc undefine when Z_PREFIX set [Turk]
-- Eliminate use of mktemp in Makefile (not always available)
-- Fix bug in 'F' mode for gzopen()
-- Add inflateGetDictionary() function
-- Correct comment in deflate.h
-- Use _snprintf for snprintf in Microsoft C
-- On Darwin, only use /usr/bin/libtool if libtool is not Apple
-- Delete "--version" file if created by "ar --version" [Richard G.]
-- Fix configure check for veracity of compiler error return codes
-- Fix CMake compilation of static lib for MSVC2010 x64
-- Remove unused variable in infback9.c
-- Fix argument checks in gzlog_compress() and gzlog_write()
-- Clean up the usage of z_const and respect const usage within zlib
-- Clean up examples/gzlog.[ch] comparisons of different types
-- Avoid shift equal to bits in type (caused endless loop)
-- Fix uninitialized value bug in gzputc() introduced by const patches
-- Fix memory allocation error in examples/zran.c [Nor]
-- Fix bug where gzopen(), gzclose() would write an empty file
-- Fix bug in gzclose() when gzwrite() runs out of memory
-- Check for input buffer malloc failure in examples/gzappend.c
-- Add note to contrib/blast to use binary mode in stdio
-- Fix comparisons of differently signed integers in contrib/blast
-- Check for invalid code length codes in contrib/puff
-- Fix serious but very rare decompression bug in inftrees.c
-- Update inflateBack() comments, since inflate() can be faster
-- Use underscored I/O function names for WINAPI_FAMILY
-- Add _tr_flush_bits to the external symbols prefixed by --zprefix
-- Add contrib/vstudio/vc10 pre-build step for static only
-- Quote --version-script argument in CMakeLists.txt
-- Don't specify --version-script on Apple platforms in CMakeLists.txt
-- Fix casting error in contrib/testzlib/testzlib.c
-- Fix types in contrib/minizip to match result of get_crc_table()
-- Simplify contrib/vstudio/vc10 with 'd' suffix
-- Add TOP support to win32/Makefile.msc
-- Suport i686 and amd64 assembler builds in CMakeLists.txt
-- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
-- Add vc11 and vc12 build files to contrib/vstudio
-- Add gzvprintf() as an undocumented function in zlib
-- Fix configure for Sun shell
-- Remove runtime check in configure for four-byte integer type
-- Add casts and consts to ease user conversion to C++
-- Add man pages for minizip and miniunzip
-- In Makefile uninstall, don't rm if preceding cd fails
-- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
-
-Changes in 1.2.7 (2 May 2012)
-- Replace use of memmove() with a simple copy for portability
-- Test for existence of strerror
-- Restore gzgetc_ for backward compatibility with 1.2.6
-- Fix build with non-GNU make on Solaris
-- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
-- Include unistd.h for Watcom C
-- Use __WATCOMC__ instead of __WATCOM__
-- Do not use the visibility attribute if NO_VIZ defined
-- Improve the detection of no hidden visibility attribute
-- Avoid using __int64 for gcc or solo compilation
-- Cast to char * in gzprintf to avoid warnings [Zinser]
-- Fix make_vms.com for VAX [Zinser]
-- Don't use library or built-in byte swaps
-- Simplify test and use of gcc hidden attribute
-- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
-- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
-- Fix bug in test/minigzip.c for configure --solo
-- Fix contrib/vstudio project link errors [Mohanathas]
-- Add ability to choose the builder in make_vms.com [Schweda]
-- Add DESTDIR support to mingw32 win32/Makefile.gcc
-- Fix comments in win32/Makefile.gcc for proper usage
-- Allow overriding the default install locations for cmake
-- Generate and install the pkg-config file with cmake
-- Build both a static and a shared version of zlib with cmake
-- Include version symbols for cmake builds
-- If using cmake with MSVC, add the source directory to the includes
-- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
-- Move obsolete emx makefile to old [Truta]
-- Allow the use of -Wundef when compiling or using zlib
-- Avoid the use of the -u option with mktemp
-- Improve inflate() documentation on the use of Z_FINISH
-- Recognize clang as gcc
-- Add gzopen_w() in Windows for wide character path names
-- Rename zconf.h in CMakeLists.txt to move it out of the way
-- Add source directory in CMakeLists.txt for building examples
-- Look in build directory for zlib.pc in CMakeLists.txt
-- Remove gzflags from zlibvc.def in vc9 and vc10
-- Fix contrib/minizip compilation in the MinGW environment
-- Update ./configure for Solaris, support --64 [Mooney]
-- Remove -R. from Solaris shared build (possible security issue)
-- Avoid race condition for parallel make (-j) running example
-- Fix type mismatch between get_crc_table() and crc_table
-- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
-- Fix the path to zlib.map in CMakeLists.txt
-- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
-- Add instructions to win32/Makefile.gcc for shared install [Torri]
-
-Changes in 1.2.6.1 (12 Feb 2012)
-- Avoid the use of the Objective-C reserved name "id"
-- Include io.h in gzguts.h for Microsoft compilers
-- Fix problem with ./configure --prefix and gzgetc macro
-- Include gz_header definition when compiling zlib solo
-- Put gzflags() functionality back in zutil.c
-- Avoid library header include in crc32.c for Z_SOLO
-- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
-- Minor cleanup in contrib/minizip/zip.c [Vollant]
-- Update make_vms.com [Zinser]
-- Remove unnecessary gzgetc_ function
-- Use optimized byte swap operations for Microsoft and GNU [Snyder]
-- Fix minor typo in zlib.h comments [Rzesniowiecki]
-
-Changes in 1.2.6 (29 Jan 2012)
-- Update the Pascal interface in contrib/pascal
-- Fix function numbers for gzgetc_ in zlibvc.def files
-- Fix configure.ac for contrib/minizip [Schiffer]
-- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
-- Have ./configure use the compiler return code for error indication
-- Fix CMakeLists.txt for cross compilation [McClure]
-- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
-- Fix compilation of contrib/minizip on FreeBSD [Marquez]
-- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
-- Include io.h for Turbo C / Borland C on all platforms [Truta]
-- Make version explicit in contrib/minizip/configure.ac [Bosmans]
-- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
-- Minor cleanup up contrib/minizip/unzip.c [Vollant]
-- Fix bug when compiling minizip with C++ [Vollant]
-- Protect for long name and extra fields in contrib/minizip [Vollant]
-- Avoid some warnings in contrib/minizip [Vollant]
-- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
-- Add missing libs to minizip linker command
-- Add support for VPATH builds in contrib/minizip
-- Add an --enable-demos option to contrib/minizip/configure
-- Add the generation of configure.log by ./configure
-- Exit when required parameters not provided to win32/Makefile.gcc
-- Have gzputc return the character written instead of the argument
-- Use the -m option on ldconfig for BSD systems [Tobias]
-- Correct in zlib.map when deflateResetKeep was added
-
-Changes in 1.2.5.3 (15 Jan 2012)
-- Restore gzgetc function for binary compatibility
-- Do not use _lseeki64 under Borland C++ [Truta]
-- Update win32/Makefile.msc to build test/*.c [Truta]
-- Remove old/visualc6 given CMakefile and other alternatives
-- Update AS400 build files and documentation [Monnerat]
-- Update win32/Makefile.gcc to build test/*.c [Truta]
-- Permit stronger flushes after Z_BLOCK flushes
-- Avoid extraneous empty blocks when doing empty flushes
-- Permit Z_NULL arguments to deflatePending
-- Allow deflatePrime() to insert bits in the middle of a stream
-- Remove second empty static block for Z_PARTIAL_FLUSH
-- Write out all of the available bits when using Z_BLOCK
-- Insert the first two strings in the hash table after a flush
-
-Changes in 1.2.5.2 (17 Dec 2011)
-- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
-- use relative symlinks for shared libs
-- Avoid searching past window for Z_RLE strategy
-- Assure that high-water mark initialization is always applied in deflate
-- Add assertions to fill_window() in deflate.c to match comments
-- Update python link in README
-- Correct spelling error in gzread.c
-- Fix bug in gzgets() for a concatenated empty gzip stream
-- Correct error in comment for gz_make()
-- Change gzread() and related to ignore junk after gzip streams
-- Allow gzread() and related to continue after gzclearerr()
-- Allow gzrewind() and gzseek() after a premature end-of-file
-- Simplify gzseek() now that raw after gzip is ignored
-- Change gzgetc() to a macro for speed (~40% speedup in testing)
-- Fix gzclose() to return the actual error last encountered
-- Always add large file support for windows
-- Include zconf.h for windows large file support
-- Include zconf.h.cmakein for windows large file support
-- Update zconf.h.cmakein on make distclean
-- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
-- Clarify how gzopen() appends in zlib.h comments
-- Correct documentation of gzdirect() since junk at end now ignored
-- Add a transparent write mode to gzopen() when 'T' is in the mode
-- Update python link in zlib man page
-- Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no library use
-- Add undocumented inflateResetKeep() function for CAB file decoding
-- Add --cover option to ./configure for gcc coverage testing
-- Add #define ZLIB_CONST option to use const in the z_stream interface
-- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
-- Note behavior of uncompress() to provide as much data as it can
-- Add files in contrib/minizip to aid in building libminizip
-- Split off AR options in Makefile.in and configure
-- Change ON macro to Z_ARG to avoid application conflicts
-- Facilitate compilation with Borland C++ for pragmas and vsnprintf
-- Include io.h for Turbo C / Borland C++
-- Move example.c and minigzip.c to test/
-- Simplify incomplete code table filling in inflate_table()
-- Remove code from inflate.c and infback.c that is impossible to execute
-- Test the inflate code with full coverage
-- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
-- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
-- Fix gzwrite.c to accommodate reduced memory zlib compilation
-- Have inflate() with Z_FINISH avoid the allocation of a window
-- Do not set strm->adler when doing raw inflate
-- Fix gzeof() to behave just like feof() when read is not past end of file
-- Fix bug in gzread.c when end-of-file is reached
-- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
-- Document gzread() capability to read concurrently written files
-- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
-
-Changes in 1.2.5.1 (10 Sep 2011)
-- Update FAQ entry on shared builds (#13)
-- Avoid symbolic argument to chmod in Makefile.in
-- Fix bug and add consts in contrib/puff [Oberhumer]
-- Update contrib/puff/zeros.raw test file to have all block types
-- Add full coverage test for puff in contrib/puff/Makefile
-- Fix static-only-build install in Makefile.in
-- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
-- Add libz.a dependency to shared in Makefile.in for parallel builds
-- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
-- Replace $(...) with `...` in configure for non-bash sh [Bowler]
-- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
-- Add solaris* to Linux* in configure to allow gcc use [Groffen]
-- Add *bsd* to Linux* case in configure [Bar-Lev]
-- Add inffast.obj to dependencies in win32/Makefile.msc
-- Correct spelling error in deflate.h [Kohler]
-- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
-- Add test to configure for GNU C looking for gcc in output of $cc -v
-- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
-- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
-- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
-- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
-- Make stronger test in zconf.h to include unistd.h for LFS
-- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
-- Fix zlib.h LFS support when Z_PREFIX used
-- Add updated as400 support (removed from old) [Monnerat]
-- Avoid deflate sensitivity to volatile input data
-- Avoid division in adler32_combine for NO_DIVIDE
-- Clarify the use of Z_FINISH with deflateBound() amount of space
-- Set binary for output file in puff.c
-- Use u4 type for crc_table to avoid conversion warnings
-- Apply casts in zlib.h to avoid conversion warnings
-- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
-- Improve inflateSync() documentation to note indeterminancy
-- Add deflatePending() function to return the amount of pending output
-- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
-- Add a check in configure for stdarg.h, use for gzprintf()
-- Check that pointers fit in ints when gzprint() compiled old style
-- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
-- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
-- Add debug records in assmebler code [Londer]
-- Update RFC references to use http://tools.ietf.org/html/... [Li]
-- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
-
-Changes in 1.2.5 (19 Apr 2010)
-- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
-- Default to libdir as sharedlibdir in configure [Nieder]
-- Update copyright dates on modified source files
-- Update trees.c to be able to generate modified trees.h
-- Exit configure for MinGW, suggesting win32/Makefile.gcc
-- Check for NULL path in gz_open [Homurlu]
-
-Changes in 1.2.4.5 (18 Apr 2010)
-- Set sharedlibdir in configure [Torok]
-- Set LDFLAGS in Makefile.in [Bar-Lev]
-- Avoid mkdir objs race condition in Makefile.in [Bowler]
-- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
-- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
-- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
-
-Changes in 1.2.4.4 (18 Apr 2010)
-- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
-- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
-- Try to use bash or ksh regardless of functionality of /bin/sh
-- Fix configure incompatibility with NetBSD sh
-- Remove attempt to run under bash or ksh since have better NetBSD fix
-- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
-- Add diagnostic messages when using CROSS_PREFIX in configure
-- Added --sharedlibdir option to configure [Weigelt]
-- Use hidden visibility attribute when available [Frysinger]
-
-Changes in 1.2.4.3 (10 Apr 2010)
-- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
-- Use CROSS_PREFIX for nm [Bar-Lev]
-- Assume _LARGEFILE64_SOURCE defined is equivalent to true
-- Avoid use of undefined symbols in #if with && and ||
-- Make *64 prototypes in gzguts.h consistent with functions
-- Add -shared load option for MinGW in configure [Bowler]
-- Move z_off64_t to public interface, use instead of off64_t
-- Remove ! from shell test in configure (not portable to Solaris)
-- Change +0 macro tests to -0 for possibly increased portability
-
-Changes in 1.2.4.2 (9 Apr 2010)
-- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
-- Really provide prototypes for *64 functions when building without LFS
-- Only define unlink() in minigzip.c if unistd.h not included
-- Update README to point to contrib/vstudio project files
-- Move projects/vc6 to old/ and remove projects/
-- Include stdlib.h in minigzip.c for setmode() definition under WinCE
-- Clean up assembler builds in win32/Makefile.msc [Rowe]
-- Include sys/types.h for Microsoft for off_t definition
-- Fix memory leak on error in gz_open()
-- Symbolize nm as $NM in configure [Weigelt]
-- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
-- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
-- Fix bug in gzeof() to take into account unused input data
-- Avoid initialization of structures with variables in puff.c
-- Updated win32/README-WIN32.txt [Rowe]
-
-Changes in 1.2.4.1 (28 Mar 2010)
-- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
-- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
-- Restore "for debugging" comment on sprintf() in gzlib.c
-- Remove fdopen for MVS from gzguts.h
-- Put new README-WIN32.txt in win32 [Rowe]
-- Add check for shell to configure and invoke another shell if needed
-- Fix big fat stinking bug in gzseek() on uncompressed files
-- Remove vestigial F_OPEN64 define in zutil.h
-- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
-- Avoid errors on non-LFS systems when applications define LFS macros
-- Set EXE to ".exe" in configure for MINGW [Kahle]
-- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
-- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
-- Add DLL install in win32/makefile.gcc [Bar-Lev]
-- Allow Linux* or linux* from uname in configure [Bar-Lev]
-- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
-- Add cross-compilation prefixes to configure [Bar-Lev]
-- Match type exactly in gz_load() invocation in gzread.c
-- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
-- Provide prototypes for *64 functions when building zlib without LFS
-- Don't use -lc when linking shared library on MinGW
-- Remove errno.h check in configure and vestigial errno code in zutil.h
-
-Changes in 1.2.4 (14 Mar 2010)
-- Fix VER3 extraction in configure for no fourth subversion
-- Update zlib.3, add docs to Makefile.in to make .pdf out of it
-- Add zlib.3.pdf to distribution
-- Don't set error code in gzerror() if passed pointer is NULL
-- Apply destination directory fixes to CMakeLists.txt [Lowman]
-- Move #cmakedefine's to a new zconf.in.cmakein
-- Restore zconf.h for builds that don't use configure or cmake
-- Add distclean to dummy Makefile for convenience
-- Update and improve INDEX, README, and FAQ
-- Update CMakeLists.txt for the return of zconf.h [Lowman]
-- Update contrib/vstudio/vc9 and vc10 [Vollant]
-- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
-- Apply license and readme changes to contrib/asm686 [Raiter]
-- Check file name lengths and add -c option in minigzip.c [Li]
-- Update contrib/amd64 and contrib/masmx86/ [Vollant]
-- Avoid use of "eof" parameter in trees.c to not shadow library variable
-- Update make_vms.com for removal of zlibdefs.h [Zinser]
-- Update assembler code and vstudio projects in contrib [Vollant]
-- Remove outdated assembler code contrib/masm686 and contrib/asm586
-- Remove old vc7 and vc8 from contrib/vstudio
-- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
-- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
-- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
-- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
-- Fix bug in void-returning vsprintf() case in gzwrite.c
-- Fix name change from inflate.h in contrib/inflate86/inffas86.c
-- Check if temporary file exists before removing in make_vms.com [Zinser]
-- Fix make install and uninstall for --static option
-- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
-- Update readme.txt in contrib/masmx64 and masmx86 to assemble
-
-Changes in 1.2.3.9 (21 Feb 2010)
-- Expunge gzio.c
-- Move as400 build information to old
-- Fix updates in contrib/minizip and contrib/vstudio
-- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
-- Delete zconf.h (made by configure) [Weigelt]
-- Change zconf.in.h to zconf.h.in per convention [Weigelt]
-- Check for NULL buf in gzgets()
-- Return empty string for gzgets() with len == 1 (like fgets())
-- Fix description of gzgets() in zlib.h for end-of-file, NULL return
-- Update minizip to 1.1 [Vollant]
-- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
-- Note in zlib.h that gzerror() should be used to distinguish from EOF
-- Remove use of snprintf() from gzlib.c
-- Fix bug in gzseek()
-- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
-- Fix zconf.h generation in CMakeLists.txt [Lowman]
-- Improve comments in zconf.h where modified by configure
-
-Changes in 1.2.3.8 (13 Feb 2010)
-- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
-- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
-- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
-- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
-- Fix missing error return in gzflush(), add zlib.h note
-- Add *64 functions to zlib.map [Levin]
-- Fix signed/unsigned comparison in gz_comp()
-- Use SFLAGS when testing shared linking in configure
-- Add --64 option to ./configure to use -m64 with gcc
-- Fix ./configure --help to correctly name options
-- Have make fail if a test fails [Levin]
-- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
-- Remove assembler object files from contrib
-
-Changes in 1.2.3.7 (24 Jan 2010)
-- Always gzopen() with O_LARGEFILE if available
-- Fix gzdirect() to work immediately after gzopen() or gzdopen()
-- Make gzdirect() more precise when the state changes while reading
-- Improve zlib.h documentation in many places
-- Catch memory allocation failure in gz_open()
-- Complete close operation if seek forward in gzclose_w() fails
-- Return Z_ERRNO from gzclose_r() if close() fails
-- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
-- Return zero for gzwrite() errors to match zlib.h description
-- Return -1 on gzputs() error to match zlib.h description
-- Add zconf.in.h to allow recovery from configure modification [Weigelt]
-- Fix static library permissions in Makefile.in [Weigelt]
-- Avoid warnings in configure tests that hide functionality [Weigelt]
-- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
-- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
-- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
-- Keep object files in subdirectories to reduce the clutter somewhat
-- Remove default Makefile and zlibdefs.h, add dummy Makefile
-- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
-- Remove zlibdefs.h completely -- modify zconf.h instead
-
-Changes in 1.2.3.6 (17 Jan 2010)
-- Avoid void * arithmetic in gzread.c and gzwrite.c
-- Make compilers happier with const char * for gz_error message
-- Avoid unused parameter warning in inflate.c
-- Avoid signed-unsigned comparison warning in inflate.c
-- Indent #pragma's for traditional C
-- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
-- Correct email address in configure for system options
-- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
-- Update zlib.map [Brown]
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
-- Apply various fixes to CMakeLists.txt [Lowman]
-- Add checks on len in gzread() and gzwrite()
-- Add error message for no more room for gzungetc()
-- Remove zlib version check in gzwrite()
-- Defer compression of gzprintf() result until need to
-- Use snprintf() in gzdopen() if available
-- Remove USE_MMAP configuration determination (only used by minigzip)
-- Remove examples/pigz.c (available separately)
-- Update examples/gun.c to 1.6
-
-Changes in 1.2.3.5 (8 Jan 2010)
-- Add space after #if in zutil.h for some compilers
-- Fix relatively harmless bug in deflate_fast() [Exarevsky]
-- Fix same problem in deflate_slow()
-- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
-- Add deflate_rle() for faster Z_RLE strategy run-length encoding
-- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
-- Change name of "write" variable in inffast.c to avoid library collisions
-- Fix premature EOF from gzread() in gzio.c [Brown]
-- Use zlib header window size if windowBits is 0 in inflateInit2()
-- Remove compressBound() call in deflate.c to avoid linking compress.o
-- Replace use of errno in gz* with functions, support WinCE [Alves]
-- Provide alternative to perror() in minigzip.c for WinCE [Alves]
-- Don't use _vsnprintf on later versions of MSVC [Lowman]
-- Add CMake build script and input file [Lowman]
-- Update contrib/minizip to 1.1 [Svensson, Vollant]
-- Moved nintendods directory from contrib to .
-- Replace gzio.c with a new set of routines with the same functionality
-- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
-- Update contrib/minizip to 1.1b
-- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
-
-Changes in 1.2.3.4 (21 Dec 2009)
-- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
-- Update comments in configure and Makefile.in for default --shared
-- Fix test -z's in configure [Marquess]
-- Build examplesh and minigzipsh when not testing
-- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
-- Import LDFLAGS from the environment in configure
-- Fix configure to populate SFLAGS with discovered CFLAGS options
-- Adapt make_vms.com to the new Makefile.in [Zinser]
-- Add zlib2ansi script for C++ compilation [Marquess]
-- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
-- Add AMD64 assembler code for longest match to contrib [Teterin]
-- Include options from $SFLAGS when doing $LDSHARED
-- Simplify 64-bit file support by introducing z_off64_t type
-- Make shared object files in objs directory to work around old Sun cc
-- Use only three-part version number for Darwin shared compiles
-- Add rc option to ar in Makefile.in for when ./configure not run
-- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
-- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
-- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
-- Rename Makefile.in targets allstatic to static and allshared to shared
-- Fix static and shared Makefile.in targets to be independent
-- Correct error return bug in gz_open() by setting state [Brown]
-- Put spaces before ;;'s in configure for better sh compatibility
-- Add pigz.c (parallel implementation of gzip) to examples/
-- Correct constant in crc32.c to UL [Leventhal]
-- Reject negative lengths in crc32_combine()
-- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
-- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
-- Correct typo in doc/algorithm.txt [Janik]
-- Fix bug in adler32_combine() [Zhu]
-- Catch missing-end-of-block-code error in all inflates and in puff
-    Assures that random input to inflate eventually results in an error
-- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
-- Update ENOUGH and its usage to reflect discovered bounds
-- Fix gzerror() error report on empty input file [Brown]
-- Add ush casts in trees.c to avoid pedantic runtime errors
-- Fix typo in zlib.h uncompress() description [Reiss]
-- Correct inflate() comments with regard to automatic header detection
-- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
-- Put new version of gzlog (2.0) in examples with interruption recovery
-- Add puff compile option to permit invalid distance-too-far streams
-- Add puff TEST command options, ability to read piped input
-- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
-  _LARGEFILE64_SOURCE not defined
-- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
-- Fix deflateSetDictionary() to use all 32K for output consistency
-- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
-- Clear bytes after deflate lookahead to avoid use of uninitialized data
-- Change a limit in inftrees.c to be more transparent to Coverity Prevent
-- Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling errors in zlib.h [Willem, Sobrado]
-- Allow Z_BLOCK for deflate() to force a new block
-- Allow negative bits in inflatePrime() to delete existing bit buffer
-- Add Z_TREES flush option to inflate() to return at end of trees
-- Add inflateMark() to return current state information for random access
-- Add Makefile for NintendoDS to contrib [Costa]
-- Add -w in configure compile tests to avoid spurious warnings [Beucler]
-- Fix typos in zlib.h comments for deflateSetDictionary()
-- Fix EOF detection in transparent gzread() [Maier]
-
-Changes in 1.2.3.3 (2 October 2006)
-- Make --shared the default for configure, add a --static option
-- Add compile option to permit invalid distance-too-far streams
-- Add inflateUndermine() function which is required to enable above
-- Remove use of "this" variable name for C++ compatibility [Marquess]
-- Add testing of shared library in make test, if shared library built
-- Use ftello() and fseeko() if available instead of ftell() and fseek()
-- Provide two versions of all functions that use the z_off_t type for
-  binary compatibility -- a normal version and a 64-bit offset version,
-  per the Large File Support Extension when _LARGEFILE64_SOURCE is
-  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
-  is defined to be 64
-- Add a --uname= option to configure to perhaps help with cross-compiling
-
-Changes in 1.2.3.2 (3 September 2006)
-- Turn off silly Borland warnings [Hay]
-- Use off64_t and define _LARGEFILE64_SOURCE when present
-- Fix missing dependency on inffixed.h in Makefile.in
-- Rig configure --shared to build both shared and static [Teredesai, Truta]
-- Remove zconf.in.h and instead create a new zlibdefs.h file
-- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
-- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
-
-Changes in 1.2.3.1 (16 August 2006)
-- Add watcom directory with OpenWatcom make files [Daniel]
-- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
-- Update make_vms.com [Zinser]
-- Use -fPIC for shared build in configure [Teredesai, Nicholson]
-- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
-- Add some FAQ entries about the contrib directory
-- Update the MVS question in the FAQ
-- Avoid extraneous reads after EOF in gzio.c [Brown]
-- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
-- Add comments to zlib.h about gzerror() usage [Brown]
-- Set extra flags in gzip header in gzopen() like deflate() does
-- Make configure options more compatible with double-dash conventions
-  [Weigelt]
-- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
-- Fix uninstall target in Makefile.in [Truta]
-- Add pkgconfig support [Weigelt]
-- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
-- Replace set_data_type() with a more accurate detect_data_type() in
-  trees.c, according to the txtvsbin.txt document [Truta]
-- Swap the order of #include <stdio.h> and #include "zlib.h" in
-  gzio.c, example.c and minigzip.c [Truta]
-- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
-  Truta] (where?)
-- Fix target "clean" from win32/Makefile.bor [Truta]
-- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
-- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
-- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
-- Enable browse info in the "Debug" and "ASM Debug" configurations in
-  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
-- Add pkgconfig support [Weigelt]
-- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
-  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
-- Add a document that explains the new text detection scheme to
-  doc/txtvsbin.txt [Truta]
-- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
-- Move algorithm.txt into doc/ [Truta]
-- Synchronize FAQ with website
-- Fix compressBound(), was low for some pathological cases [Fearnley]
-- Take into account wrapper variations in deflateBound()
-- Set examples/zpipe.c input and output to binary mode for Windows
-- Update examples/zlib_how.html with new zpipe.c (also web site)
-- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
-  that gcc became pickier in 4.0)
-- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
-  un-versioned, the patch adds versioning only for symbols introduced in
-  zlib-1.2.0 or later.  It also declares as local those symbols which are
-  not designed to be exported." [Levin]
-- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
-- Do not initialize global static by default in trees.c, add a response
-  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
-- Don't use strerror() in gzio.c under WinCE [Yakimov]
-- Don't use errno.h in zutil.h under WinCE [Yakimov]
-- Move arguments for AR to its usage to allow replacing ar [Marot]
-- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
-- Improve inflateInit() and inflateInit2() documentation
-- Fix structure size comment in inflate.h
-- Change configure help option from --h* to --help [Santos]
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-  compile
-- Fix some spelling errors in comments [Betts]
-- Correct inflateInit2() error return documentation in zlib.h
-- Add zran.c example of compressed data random access to examples
-  directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-- Add cast in trees.c t avoid a warning [Oberhumer]
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-- Update make_vms.com [Zinser]
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
-  discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX [Smith]
-- Add error return to gzread() for format or i/o error [Levin]
-- Use malloc.h for OS/2 [Necasek]
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c [Vollant]
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() [Heiner]
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h [Donais]
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip [Vollant]
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-- Add casts in crc32.c to avoid warnings [Oberhumer]
-- Add contrib/masmx64 [Vollant]
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-  avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments [Chang]
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com [Coghlan], update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure [Gilbert]
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-  and in contrib/inflate86/inffast.S [Truta, Anderson]
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-- Update projects/README.projects and projects/visualc6 [Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification [Peterson]
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-- Add contrib/dotzlib [Ravn]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update contrib/minizip [Vollant]
-- Move contrib/visual-basic.txt to old/ [Truta]
-- Fix assembler builds in projects/visualc6/ [Truta]
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-- Don't declare strerror() under VMS [Mozilla]
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada [Anisimkov]
-- Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
-- Fix gzio.c to not return error on empty files [Brown]
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
-  contrib/pascal/zlibpas.pas [Truta]
-- Update mkasm.bat in contrib/masmx86 [Truta]
-- Update contrib/untgz [Truta]
-- Add projects/README.projects [Truta]
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-- Add OS/2 to exe builds in configure [Poltorak]
-- Remove err dummy parameter in zlib.h [Kientzle]
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
-  dynamic blocks with only literals and no distance codes --
-  Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-- Support shared libraries on Hurd and KFreeBSD [Brown]
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
-    - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt [Truta]
-- Delete Turbo C comment in README [Truta]
-- Improve some indentation in zconf.h [Truta]
-- Fix infinite loop on bad input in configure script [Church]
-- Fix gzeof() for concatenated gzip files [Johnson]
-- Add example to contrib/visual-basic.txt [Michael B.]
-- Add -p to mkdir's in Makefile.in [vda]
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support [Monnerat]
-- Add a little Cygwin support [Wilson]
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # [Beebe]
-- Update contrib/untgz to 0.2 with various fixes [Truta]
-- Add build support for Amiga [Nikl]
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 [Vollant]
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-- Update POSTINC comment for 68060 [Nikl]
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-- Add pragma for fdopen on MVS [van Burik]
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
-    - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL [Truta]
-- INDEX update: add qnx entry, remove aix entry [Truta]
-- Install zlib.3 into mandir [Wilson]
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-- Update msdos and win32 scripts and makefiles [Truta]
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-- Add contrib/ada [Anisimkov]
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-- Add contrib/masm686 [Truta]
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-  [Truta, Vollant]
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-  and fix some method prototypes [Truta]
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-  [Truta]
-- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-- Fix file time handling in contrib/untgz; update makefiles [Truta]
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-  [Vollant]
-- Remove contrib/vstudio/vc15_16 [Vollant]
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-- Update README.contrib [Truta]
-- Invert the assignment order of match_head and s->prev[...] in
-  INSERT_STRING [Truta]
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-  [Truta]
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-- Fix prototype of syncsearch in inflate.c [Truta]
-- Introduce ASMINF macro to be enabled when using an ASM implementation
-  of inflate_fast [Truta]
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-- Modify test_gzio in example.c to take a single file name as a
-  parameter [Truta]
-- Exit the example.c program if gzopen fails [Truta]
-- Add type casts around strlen in example.c [Truta]
-- Remove casting to sizeof in minigzip.c; give a proper type
-  to the variable compared with SUFFIX_LEN [Truta]
-- Update definitions of STDC and STDC99 in zconf.h [Truta]
-- Synchronize zconf.h with the new Windows DLL interface [Truta]
-- Use SYS16BIT instead of __32BIT__ to distinguish between
-  16- and 32-bit platforms [Truta]
-- Use far memory allocators in small 16-bit memory models for
-  Turbo C [Truta]
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-  zlibCompileFlags [Truta]
-- Cygwin has vsnprintf [Wilson]
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation [Vollant]
-- Update contrib/minizip and contrib/vstudio [Vollant]
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h [Anisimkov]
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory [Bakker]
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
-  library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
-  special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines [Truta]
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments [Mai]
-- Remove #define ZLIB_DLL in zconf.h [Vollant]
-- Add zlib.3 [Rodgers]
-- Update RFC URL in deflate.c and algorithm.txt [Mai]
-- Add zlib_dll_FAQ.txt to contrib [Truta]
-- Add UL to some constants [Truta]
-- Update minizip and vstudio [Vollant]
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib [Schwardt]
-- Replace rewind() with fseek() for WinCE [Truta]
-- Improve setting of zlib format compression level flags
-    - Report 0 for huffman and rle strategies and for level == 0 or 1
-    - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time [Truta]
-- Allow TOO_FAR check to be turned off at compile time [Truta]
-- Add gzclearerr() function [Souza]
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding [Truta]
-    - When Z_RLE requested, restrict matches to distance one
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h [Vollant]
-    - Refine detection of Turbo C need for dummy returns
-    - Refine ZLIB_DLL compilation
-    - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
-  write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 [Anderson]
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-- Add msdos and win32 directories with makefiles [Truta]
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
-    - About 20% faster
-    - Does not allocate 32K window unless and until needed
-    - Automatically detects and decompresses gzip streams
-    - Raw inflate no longer needs an extra dummy byte at end
-    - Added inflateBack functions using a callback interface--even faster
-      than inflate, useful for file utilities (gzip, zip)
-    - Added inflateCopy() function to record state for random access on
-      externally generated deflate streams (e.g. in gzip files)
-    - More readable code (I hope)
-- New and improved crc32()
-    - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-  and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
-  return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-  is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
-    - Document raw deflate and inflate
-    - Update RFCs URL
-    - Point out that zlib and gzip formats are different
-    - Note that Z_BUF_ERROR is not fatal
-    - Document string limit for gzprintf() and possible buffer overflow
-    - Note requirement on avail_out when flushing
-    - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
-  This creates a security problem described in
-  http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
-  less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
-  of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean"  (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
-  . zutil.c, zutil.h: added "const" for zmem*
-  . Make_vms.com: fixed some typos
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-  . msdos/Makefile.*: use model-dependent name for the built zlib library
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-  See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
-  completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-  compression ratio on some files. This also allows inlining _tr_tally for
-  matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-  on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
-  them at run time (thanks to Ken Raeburn for this suggestion). To create
-  trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
-  Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
-  (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
-  inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
-   contrib/asm386/ by Gilles Vollant <info@winimage.com>
-        386 asm code replacing longest_match().
-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-        How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-  level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
-  (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"[0] (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-  bit, so the decompressor could decompress all the correct data but went
-  on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-  small and medium models; this makes the library incompatible with previous
-  versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
-  avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generate bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
-  and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-     (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
-  not completely flushed in rare occasions).
-- default window size is same for compression and decompression
-  (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
-  typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
-  was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
-  pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-  is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-  (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
-  TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-  not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-  if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
-  user-provided history buffer. This is supported only in deflateInit2
-  and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()

crates/libz-sys/src/zlib/FAQ

diff --git a/crates/libz-sys/src/zlib/FAQ b/crates/libz-sys/src/zlib/FAQ
deleted file mode 100644
index 99b7cf9..0000000
--- a/crates/libz-sys/src/zlib/FAQ
+++ /dev/null
@@ -1,368 +0,0 @@
-
-                Frequently Asked Questions about zlib
-
-
-If your question is not there, please check the zlib home page
-http://zlib.net/ which may have more recent information.
-The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
-
-
- 1. Is zlib Y2K-compliant?
-
-    Yes. zlib doesn't handle dates.
-
- 2. Where can I get a Windows DLL version?
-
-    The zlib sources can be compiled without change to produce a DLL.  See the
-    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
-    precompiled DLL are found in the zlib web site at http://zlib.net/ .
-
- 3. Where can I get a Visual Basic interface to zlib?
-
-    See
-        * http://marknelson.us/1997/01/01/zlib-engine/
-        * win32/DLL_FAQ.txt in the zlib distribution
-
- 4. compress() returns Z_BUF_ERROR.
-
-    Make sure that before the call of compress(), the length of the compressed
-    buffer is equal to the available size of the compressed buffer and not
-    zero.  For Visual Basic, check that this parameter is passed by reference
-    ("as any"), not by value ("as long").
-
- 5. deflate() or inflate() returns Z_BUF_ERROR.
-
-    Before making the call, make sure that avail_in and avail_out are not zero.
-    When setting the parameter flush equal to Z_FINISH, also make sure that
-    avail_out is big enough to allow processing all pending input.  Note that a
-    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
-    made with more input or output space.  A Z_BUF_ERROR may in fact be
-    unavoidable depending on how the functions are used, since it is not
-    possible to tell whether or not there is more output pending when
-    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
-    heavily annotated example.
-
- 6. Where's the zlib documentation (man pages, etc.)?
-
-    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
-    and test/minigzip.c, with more in examples/ .
-
- 7. Why don't you use GNU autoconf or libtool or ...?
-
-    Because we would like to keep zlib as a very small and simple package.
-    zlib is rather portable and doesn't need much configuration.
-
- 8. I found a bug in zlib.
-
-    Most of the time, such problems are due to an incorrect usage of zlib.
-    Please try to reproduce the problem with a small program and send the
-    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
-    data files without prior agreement.
-
- 9. Why do I get "undefined reference to gzputc"?
-
-    If "make test" produces something like
-
-       example.o(.text+0x154): undefined reference to `gzputc'
-
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
-    /usr/X11R6/lib. Remove any old versions, then do "make install".
-
-10. I need a Delphi interface to zlib.
-
-    See the contrib/delphi directory in the zlib distribution.
-
-11. Can zlib handle .zip archives?
-
-    Not by itself, no.  See the directory contrib/minizip in the zlib
-    distribution.
-
-12. Can zlib handle .Z files?
-
-    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
-    the code of uncompress on your own.
-
-13. How can I make a Unix shared library?
-
-    By default a shared (and a static) library is built for Unix.  So:
-
-    make distclean
-    ./configure
-    make
-
-14. How do I install a shared zlib library on Unix?
-
-    After the above, then:
-
-    make install
-
-    However, many flavors of Unix come with a shared zlib already installed.
-    Before going to the trouble of compiling a shared version of zlib and
-    trying to install it, you may want to check if it's already there!  If you
-    can #include <zlib.h>, it's there.  The -lz option will probably link to
-    it.  You can check the version at the top of zlib.h or with the
-    ZLIB_VERSION symbol defined in zlib.h .
-
-15. I have a question about OttoPDF.
-
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site: Joel Hainley, jhainley@myndkryme.com.
-
-16. Can zlib decode Flate data in an Adobe PDF file?
-
-    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
-    http://sourceforge.net/projects/acroformtool/ .
-
-17. Why am I getting this "register_frame_info not found" error on Solaris?
-
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
-    generates an error such as:
-
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
-        symbol __register_frame_info: referenced symbol not found
-
-    The symbol __register_frame_info is not part of zlib, it is generated by
-    the C compiler (cc or gcc).  You must recompile applications using zlib
-    which have this problem.  This problem is specific to Solaris.  See
-    http://www.sunfreeware.com for Solaris versions of zlib and applications
-    using zlib.
-
-18. Why does gzip give an error on a file I make with compress/deflate?
-
-    The compress and deflate functions produce data in the zlib format, which
-    is different and incompatible with the gzip format.  The gz* functions in
-    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
-    use the same compressed data format internally, but have different headers
-    and trailers around the compressed data.
-
-19. Ok, so why are there two different formats?
-
-    The gzip format was designed to retain the directory information about a
-    single file, such as the name and last modification date.  The zlib format
-    on the other hand was designed for in-memory and communication channel
-    applications, and has a much more compact header and trailer and uses a
-    faster integrity check than gzip.
-
-20. Well that's nice, but how do I make a gzip file in memory?
-
-    You can request that deflate write the gzip format instead of the zlib
-    format using deflateInit2().  You can also request that inflate decode the
-    gzip format using inflateInit2().  Read zlib.h for more details.
-
-21. Is zlib thread-safe?
-
-    Yes.  However any library routines that zlib uses and any application-
-    provided memory allocation routines must also be thread-safe.  zlib's gz*
-    functions use stdio library routines, and most of zlib's functions use the
-    library memory allocation routines by default.  zlib's *Init* functions
-    allow for the application to provide custom memory allocation routines.
-
-    Of course, you should only operate on any given zlib or gzip stream from a
-    single thread at a time.
-
-22. Can I use zlib in my commercial application?
-
-    Yes.  Please read the license in zlib.h.
-
-23. Is zlib under the GNU license?
-
-    No.  Please read the license in zlib.h.
-
-24. The license says that altered source versions must be "plainly marked". So
-    what exactly do I need to do to meet that requirement?
-
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
-    particular, the final version number needs to be changed to "f", and an
-    identification string should be appended to ZLIB_VERSION.  Version numbers
-    x.x.x.f are reserved for modifications to zlib by others than the zlib
-    maintainers.  For example, if the version of the base zlib you are altering
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
-    update the version strings in deflate.c and inftrees.c.
-
-    For altered source distributions, you should also note the origin and
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along
-    with the dates of the alterations.  The origin should include at least your
-    name (or your company's name), and an email address to contact for help or
-    issues with the library.
-
-    Note that distributing a compiled zlib library along with zlib.h and
-    zconf.h is also a source distribution, and so you should change
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
-    in zlib.h as you would for a full source distribution.
-
-25. Will zlib work on a big-endian or little-endian architecture, and can I
-    exchange compressed data between them?
-
-    Yes and yes.
-
-26. Will zlib work on a 64-bit machine?
-
-    Yes.  It has been tested on 64-bit machines, and has no dependence on any
-    data types being limited to 32-bits in length.  If you have any
-    difficulties, please provide a complete problem report to zlib@gzip.org
-
-27. Will zlib decompress data from the PKWare Data Compression Library?
-
-    No.  The PKWare DCL uses a completely different compressed data format than
-    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
-    directory for a possible solution to your problem.
-
-28. Can I access data randomly in a compressed stream?
-
-    No, not without some preparation.  If when compressing you periodically use
-    Z_FULL_FLUSH, carefully write all the pending data at those points, and
-    keep an index of those locations, then you can start decompression at those
-    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
-    can significantly degrade compression.  Alternatively, you can scan a
-    deflate stream once to generate an index, and then use that index for
-    random access.  See examples/zran.c .
-
-29. Does zlib work on MVS, OS/390, CICS, etc.?
-
-    It has in the past, but we have not heard of any recent evidence.  There
-    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
-    If you know of recent, successful applications of zlib on these operating
-    systems, please let us know.  Thanks.
-
-30. Is there some simpler, easier to read version of inflate I can look at to
-    understand the deflate format?
-
-    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
-    contrib/puff directory.
-
-31. Does zlib infringe on any patents?
-
-    As far as we know, no.  In fact, that was originally the whole point behind
-    zlib.  Look here for some more information:
-
-    http://www.gzip.org/#faq11
-
-32. Can zlib work with greater than 4 GB of data?
-
-    Yes.  inflate() and deflate() will process any amount of data correctly.
-    Each call of inflate() or deflate() is limited to input and output chunks
-    of the maximum value that can be stored in the compiler's "unsigned int"
-    type, but there is no limit to the number of chunks.  Note however that the
-    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
-    counters are provided as a convenience and are not used internally by
-    inflate() or deflate().  The application can easily set up its own counters
-    updated after each call of inflate() or deflate() to count beyond 4 GB.
-    compress() and uncompress() may be limited to 4 GB, since they operate in a
-    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
-    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
-
-    The word "may" appears several times above since there is a 4 GB limit only
-    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
-    64 bits, then the limit is 16 exabytes.
-
-33. Does zlib have any security vulnerabilities?
-
-    The only one that we are aware of is potentially in gzprintf().  If zlib is
-    compiled to use sprintf() or vsprintf(), then there is no protection
-    against a buffer overflow of an 8K string space (or other value as set by
-    gzbuffer()), other than the caller of gzprintf() assuring that the output
-    will not exceed 8K.  On the other hand, if zlib is compiled to use
-    snprintf() or vsnprintf(), which should normally be the case, then there is
-    no vulnerability.  The ./configure script will display warnings if an
-    insecure variation of sprintf() will be used by gzprintf().  Also the
-    zlibCompileFlags() function will return information on what variant of
-    sprintf() is used by gzprintf().
-
-    If you don't have snprintf() or vsnprintf() and would like one, you can
-    find a portable implementation here:
-
-        http://www.ijs.si/software/snprintf/
-
-    Note that you should be using the most recent version of zlib.  Versions
-    1.1.3 and before were subject to a double-free vulnerability, and versions
-    1.2.1 and 1.2.2 were subject to an access exception when decompressing
-    invalid compressed data.
-
-34. Is there a Java version of zlib?
-
-    Probably what you want is to use zlib in Java. zlib is already included
-    as part of the Java SDK in the java.util.zip package. If you really want
-    a version of zlib written in the Java language, look on the zlib home
-    page for links: http://zlib.net/ .
-
-35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pedantic. Can't you guys write proper code?
-
-    Many years ago, we gave up attempting to avoid warnings on every compiler
-    in the universe.  It just got to be a waste of time, and some compilers
-    were downright silly as well as contradicted each other.  So now, we simply
-    make sure that the code always works.
-
-36. Valgrind (or some similar memory access checker) says that deflate is
-    performing a conditional jump that depends on an uninitialized value.
-    Isn't that a bug?
-
-    No.  That is intentional for performance reasons, and the output of deflate
-    is not affected.  This only started showing up recently since zlib 1.2.x
-    uses malloc() by default for allocations, whereas earlier versions used
-    calloc(), which zeros out the allocated memory.  Even though the code was
-    correct, versions 1.2.4 and later was changed to not stimulate these
-    checkers.
-
-37. Will zlib read the (insert any ancient or arcane format here) compressed
-    data format?
-
-    Probably not. Look in the comp.compression FAQ for pointers to various
-    formats and associated software.
-
-38. How can I encrypt/decrypt zip files with zlib?
-
-    zlib doesn't support encryption.  The original PKZIP encryption is very
-    weak and can be broken with freely available programs.  To get strong
-    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
-    compression.  For PKZIP compatible "encryption", look at
-    http://www.info-zip.org/
-
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
-
-    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
-    probably have called the second one "zlib" instead to avoid confusion with
-    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
-    correctly points to the zlib specification in RFC 1950 for the "deflate"
-    transfer encoding, there have been reports of servers and browsers that
-    incorrectly produce or expect raw deflate data per the deflate
-    specification in RFC 1951, most notably Microsoft.  So even though the
-    "deflate" transfer encoding using the zlib format would be the more
-    efficient approach (and in fact exactly what the zlib format was designed
-    for), using the "gzip" transfer encoding is probably more reliable due to
-    an unfortunate choice of name on the part of the HTTP 1.1 authors.
-
-    Bottom line: use the gzip format for HTTP 1.1 encoding.
-
-40. Does zlib support the new "Deflate64" format introduced by PKWare?
-
-    No.  PKWare has apparently decided to keep that format proprietary, since
-    they have not documented it as they have previous compression formats.  In
-    any case, the compression improvements are so modest compared to other more
-    modern approaches, that it's not worth the effort to implement.
-
-41. I'm having a problem with the zip functions in zlib, can you help?
-
-    There are no zip functions in zlib.  You are probably using minizip by
-    Giles Vollant, which is found in the contrib directory of zlib.  It is not
-    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
-    files in there are not supported by the zlib authors.  You need to contact
-    the authors of the respective contribution for help.
-
-42. The match.asm code in contrib is under the GNU General Public License.
-    Since it's part of zlib, doesn't that mean that all of zlib falls under the
-    GNU GPL?
-
-    No.  The files in contrib are not part of zlib.  They were contributed by
-    other authors and are provided as a convenience to the user within the zlib
-    distribution.  Each item in contrib has its own license.
-
-43. Is zlib subject to export controls?  What is its ECCN?
-
-    zlib is not subject to export controls, and so is classified as EAR99.
-
-44. Can you please sign these lengthy legal documents and fax them back to us
-    so that we can use your software in our product?
-
-    No. Go away. Shoo.

crates/libz-sys/src/zlib/INDEX

diff --git a/crates/libz-sys/src/zlib/INDEX b/crates/libz-sys/src/zlib/INDEX
deleted file mode 100644
index 2ba0641..0000000
--- a/crates/libz-sys/src/zlib/INDEX
+++ /dev/null
@@ -1,68 +0,0 @@
-CMakeLists.txt  cmake build file
-ChangeLog       history of changes
-FAQ             Frequently Asked Questions about zlib
-INDEX           this file
-Makefile        dummy Makefile that tells you to ./configure
-Makefile.in     template for Unix Makefile
-README          guess what
-configure       configure script for Unix
-make_vms.com    makefile for VMS
-test/example.c  zlib usages examples for build testing
-test/minigzip.c minimal gzip-like functionality for build testing
-test/infcover.c inf*.c code coverage for build coverage testing
-treebuild.xml   XML description of source file dependencies
-zconf.h.cmakein zconf.h template for cmake
-zconf.h.in      zconf.h template for configure
-zlib.3          Man page for zlib
-zlib.3.pdf      Man page in PDF format
-zlib.map        Linux symbol information
-zlib.pc.in      Template for pkg-config descriptor
-zlib.pc.cmakein zlib.pc template for cmake
-zlib2ansi       perl script to convert source files for C++ compilation
-
-amiga/          makefiles for Amiga SAS C
-as400/          makefiles for AS/400
-doc/            documentation for formats and algorithms
-msdos/          makefiles for MSDOS
-nintendods/     makefile for Nintendo DS
-old/            makefiles for various architectures and zlib documentation
-                files that have not yet been updated for zlib 1.2.x
-qnx/            makefiles for QNX
-watcom/         makefiles for OpenWatcom
-win32/          makefiles for Windows
-
-                zlib public header files (required for library use):
-zconf.h
-zlib.h
-
-                private source files used to build the zlib library:
-adler32.c
-compress.c
-crc32.c
-crc32.h
-deflate.c
-deflate.h
-gzclose.c
-gzguts.h
-gzlib.c
-gzread.c
-gzwrite.c
-infback.c
-inffast.c
-inffast.h
-inffixed.h
-inflate.c
-inflate.h
-inftrees.c
-inftrees.h
-trees.c
-trees.h
-uncompr.c
-zutil.c
-zutil.h
-
-                source files for sample programs
-See examples/README.examples
-
-                unsupported contributions by third parties
-See contrib/README.contrib

crates/libz-sys/src/zlib/Makefile

diff --git a/crates/libz-sys/src/zlib/Makefile b/crates/libz-sys/src/zlib/Makefile
deleted file mode 100644
index 6bba86c..0000000
--- a/crates/libz-sys/src/zlib/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	-@echo "Please use ./configure first.  Thank you."
-
-distclean:
-	make -f Makefile.in distclean

crates/libz-sys/src/zlib/Makefile.in

diff --git a/crates/libz-sys/src/zlib/Makefile.in b/crates/libz-sys/src/zlib/Makefile.in
deleted file mode 100644
index 5a77949..0000000
--- a/crates/libz-sys/src/zlib/Makefile.in
+++ /dev/null
@@ -1,410 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#    ./configure; make test
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-
-# To use the asm code, type:
-#    cp contrib/asm?86/match.S ./match.S
-#    make LOC=-DASMV OBJA=match.o
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
-
-CC=cc
-
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-SFLAGS=-O
-LDFLAGS=
-TEST_LDFLAGS=-L. libz.a
-LDSHARED=$(CC)
-CPP=$(CC) -E
-
-STATICLIB=libz.a
-SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.11
-SHAREDLIBM=libz.so.1
-LIBS=$(STATICLIB) $(SHAREDLIBV)
-
-AR=ar
-ARFLAGS=rc
-RANLIB=ranlib
-LDCONFIG=ldconfig
-LDSHAREDLIBC=-lc
-TAR=tar
-SHELL=/bin/sh
-EXE=
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-sharedlibdir = ${libdir}
-includedir = ${prefix}/include
-mandir = ${prefix}/share/man
-man3dir = ${mandir}/man3
-pkgconfigdir = ${libdir}/pkgconfig
-SRCDIR=
-ZINC=
-ZINCOUT=-I.
-
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
-OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJC = $(OBJZ) $(OBJG)
-
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
-PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
-PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
-
-# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
-OBJA =
-PIC_OBJA =
-
-OBJS = $(OBJC) $(OBJA)
-
-PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
-
-all: static shared
-
-static: example$(EXE) minigzip$(EXE)
-
-shared: examplesh$(EXE) minigzipsh$(EXE)
-
-all64: example64$(EXE) minigzip64$(EXE)
-
-check: test
-
-test: all teststatic testshared
-
-teststatic: static
-	@TMPST=tmpst_$$; \
-	if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMPST
-
-testshared: shared
-	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
-	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
-	TMPSH=tmpsh_$$; \
-	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
-	  echo '		*** zlib shared test OK ***'; \
-	else \
-	  echo '		*** zlib shared test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMPSH
-
-test64: all64
-	@TMP64=tmp64_$$; \
-	if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
-	  echo '		*** zlib 64-bit test OK ***'; \
-	else \
-	  echo '		*** zlib 64-bit test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMP64
-
-infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
-
-infcover: infcover.o libz.a
-	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
-
-cover: infcover
-	rm -f *.gcda
-	./infcover
-	gcov inf*.c
-
-libz.a: $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
-example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
-
-minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
-
-example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
-
-minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
-
-
-adler32.o: $(SRCDIR)adler32.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
-
-crc32.o: $(SRCDIR)crc32.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
-
-deflate.o: $(SRCDIR)deflate.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
-
-infback.o: $(SRCDIR)infback.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
-
-inffast.o: $(SRCDIR)inffast.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
-
-inflate.o: $(SRCDIR)inflate.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
-
-inftrees.o: $(SRCDIR)inftrees.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
-
-trees.o: $(SRCDIR)trees.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
-
-zutil.o: $(SRCDIR)zutil.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
-
-compress.o: $(SRCDIR)compress.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
-
-uncompr.o: $(SRCDIR)uncompr.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
-
-gzclose.o: $(SRCDIR)gzclose.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
-
-gzlib.o: $(SRCDIR)gzlib.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
-
-gzread.o: $(SRCDIR)gzread.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
-
-gzwrite.o: $(SRCDIR)gzwrite.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
-
-
-adler32.lo: $(SRCDIR)adler32.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
-	-@mv objs/adler32.o $@
-
-crc32.lo: $(SRCDIR)crc32.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
-	-@mv objs/crc32.o $@
-
-deflate.lo: $(SRCDIR)deflate.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
-	-@mv objs/deflate.o $@
-
-infback.lo: $(SRCDIR)infback.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
-	-@mv objs/infback.o $@
-
-inffast.lo: $(SRCDIR)inffast.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
-	-@mv objs/inffast.o $@
-
-inflate.lo: $(SRCDIR)inflate.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
-	-@mv objs/inflate.o $@
-
-inftrees.lo: $(SRCDIR)inftrees.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
-	-@mv objs/inftrees.o $@
-
-trees.lo: $(SRCDIR)trees.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
-	-@mv objs/trees.o $@
-
-zutil.lo: $(SRCDIR)zutil.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
-	-@mv objs/zutil.o $@
-
-compress.lo: $(SRCDIR)compress.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
-	-@mv objs/compress.o $@
-
-uncompr.lo: $(SRCDIR)uncompr.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
-	-@mv objs/uncompr.o $@
-
-gzclose.lo: $(SRCDIR)gzclose.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
-	-@mv objs/gzclose.o $@
-
-gzlib.lo: $(SRCDIR)gzlib.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
-	-@mv objs/gzlib.o $@
-
-gzread.lo: $(SRCDIR)gzread.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
-	-@mv objs/gzread.o $@
-
-gzwrite.lo: $(SRCDIR)gzwrite.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
-	-@mv objs/gzwrite.o $@
-
-
-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
-	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-	ln -s $@ $(SHAREDLIB)
-	ln -s $@ $(SHAREDLIBM)
-	-@rmdir objs
-
-example$(EXE): example.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
-
-minigzip$(EXE): minigzip.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
-
-examplesh$(EXE): example.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-
-example64$(EXE): example64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
-
-minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
-
-install-libs: $(LIBS)
-	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
-	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
-	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
-	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
-	cp $(STATICLIB) $(DESTDIR)$(libdir)
-	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
-	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
-	-@if test -n "$(SHAREDLIBV)"; then \
-	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
-	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
-	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
-	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
-	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
-	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
-	fi
-	rm -f $(DESTDIR)$(man3dir)/zlib.3
-	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
-	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
-	rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
-	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
-	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
-# The ranlib in install is needed on NeXTSTEP which checks file times
-# ldconfig is for Linux
-
-install: install-libs
-	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
-	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
-	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-
-uninstall:
-	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
-	cd $(DESTDIR)$(libdir) && rm -f libz.a; \
-	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
-	fi
-	cd $(DESTDIR)$(man3dir) && rm -f zlib.3
-	cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
-
-docs: zlib.3.pdf
-
-zlib.3.pdf: $(SRCDIR)zlib.3
-	groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
-
-zconf.h.cmakein: $(SRCDIR)zconf.h.in
-	-@ TEMPFILE=zconfh_$$; \
-	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
-	sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
-	touch -r $(SRCDIR)zconf.h.in $@ &&\
-	rm $$TEMPFILE
-
-zconf: $(SRCDIR)zconf.h.in
-	cp -p $(SRCDIR)zconf.h.in zconf.h
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~ \
-	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
-	   example64$(EXE) minigzip64$(EXE) \
-	   infcover \
-	   libz.* foo.gz so_locations \
-	   _match.s maketree contrib/infback9/*.o
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
-
-maintainer-clean: distclean
-distclean: clean zconf zconf.h.cmakein docs
-	rm -f Makefile zlib.pc configure.log
-	-@rm -f .DS_Store
-	@if [ -f Makefile.in ]; then \
-	printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
-	printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
-	touch -r $(SRCDIR)Makefile.in Makefile ; fi
-	@if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi
-	@if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi
-
-tags:
-	etags $(SRCDIR)*.[ch]
-
-adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
-compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h
-crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
-deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
-inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
-inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
-trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
-
-adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
-compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h
-crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
-deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
-inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
-inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
-trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h

crates/libz-sys/src/zlib/README

diff --git a/crates/libz-sys/src/zlib/README b/crates/libz-sys/src/zlib/README
deleted file mode 100644
index 51106de..0000000
--- a/crates/libz-sys/src/zlib/README
+++ /dev/null
@@ -1,115 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.11 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-rfc1952 (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
-of the library is given in the file test/example.c which also tests that
-the library is working correctly.  Another example is given in the file
-test/minigzip.c.  The compression library itself is composed of all source
-files in the root directory.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use
-one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
-make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version.  The zlib home page is
-http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
-issue of Dr.  Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
-
-The changes made in version 1.2.11 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory contrib/ .
-
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://docs.python.org/library/zlib.html .
-
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz.  The deflate and
-  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-  people who reported problems and suggested various improvements in zlib; they
-  are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.

crates/libz-sys/src/zlib/adler32.c

diff --git a/crates/libz-sys/src/zlib/adler32.c b/crates/libz-sys/src/zlib/adler32.c
deleted file mode 100644
index d0be438..0000000
--- a/crates/libz-sys/src/zlib/adler32.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
-#define BASE 65521U     /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware --
-   try it both ways to see which is faster */
-#ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
-    do { \
-        CHOP(a); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD(a) \
-    do { \
-        CHOP(a); \
-        MOD28(a); \
-    } while (0)
-#  define MOD63(a) \
-    do { /* this assumes a is not negative */ \
-        z_off64_t tmp = a >> 32; \
-        a &= 0xffffffffL; \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
-#  define MOD63(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    return adler32_z(adler, buf, len);
-}
-
-/* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
-
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}

crates/libz-sys/src/zlib/amiga/Makefile.pup

diff --git a/crates/libz-sys/src/zlib/amiga/Makefile.pup b/crates/libz-sys/src/zlib/amiga/Makefile.pup
deleted file mode 100644
index 8940c12..0000000
--- a/crates/libz-sys/src/zlib/amiga/Makefile.pup
+++ /dev/null
@@ -1,69 +0,0 @@
-# Amiga powerUP (TM) Makefile
-# makefile for libpng and SAS C V6.58/7.00 PPC compiler
-# Copyright (C) 1998 by Andreas R. Kleinert
-
-LIBNAME	= libzip.a
-
-CC	= scppc
-CFLAGS	= NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \
-	  OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 NOVER
-AR	= ppc-amigaos-ar cr
-RANLIB	= ppc-amigaos-ranlib
-LD	= ppc-amigaos-ld -r
-LDFLAGS	= -o
-LDLIBS	= LIB:scppc.a LIB:end.o
-RM	= delete quiet
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example minigzip
-
-check: test
-test: all
-	example
-	echo hello world | minigzip | minigzip -d
-
-$(LIBNAME): $(OBJS)
-	$(AR) $@ $(OBJS)
-	-$(RANLIB) $@
-
-example: example.o $(LIBNAME)
-	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
-
-minigzip: minigzip.o $(LIBNAME)
-	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
-
-mostlyclean: clean
-clean:
-	$(RM) *.o example minigzip $(LIBNAME) foo.gz
-
-zip:
-	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
-	  descrip.mms *.[ch]
-
-tgz:
-	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h

crates/libz-sys/src/zlib/amiga/Makefile.sas

diff --git a/crates/libz-sys/src/zlib/amiga/Makefile.sas b/crates/libz-sys/src/zlib/amiga/Makefile.sas
deleted file mode 100644
index 749e291..0000000
--- a/crates/libz-sys/src/zlib/amiga/Makefile.sas
+++ /dev/null
@@ -1,68 +0,0 @@
-# SMakefile for zlib
-# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
-# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
-# Amiga, SAS/C 6.56 & Smake
-
-CC=sc
-CFLAGS=OPT
-#CFLAGS=OPT CPU=68030
-#CFLAGS=DEBUG=LINE
-LDFLAGS=LIB z.lib
-
-SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
-       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
-       DEF=POSTINC
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: SCOPTIONS example minigzip
-
-check: test
-test: all
-	example
-	echo hello world | minigzip | minigzip -d
-
-install: z.lib
-	copy clone zlib.h zconf.h INCLUDE:
-	copy clone z.lib LIB:
-
-z.lib: $(OBJS)
-	oml z.lib r $(OBJS)
-
-example: example.o z.lib
-	$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
-
-minigzip: minigzip.o z.lib
-	$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
-
-mostlyclean: clean
-clean:
-	-delete force quiet example minigzip *.o z.lib foo.gz *.lnk SCOPTIONS
-
-SCOPTIONS: Makefile.sas
-	copy to $@ <from <
-$(SCOPTIONS)
-<
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h

crates/libz-sys/src/zlib/compress.c

diff --git a/crates/libz-sys/src/zlib/compress.c b/crates/libz-sys/src/zlib/compress.c
deleted file mode 100644
index e2db404..0000000
--- a/crates/libz-sys/src/zlib/compress.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-    const uInt max = (uInt)-1;
-    uLong left;
-
-    left = *destLen;
-    *destLen = 0;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
-            sourceLen -= stream.avail_in;
-        }
-        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
-    } while (err == Z_OK);
-
-    *destLen = stream.total_out;
-    deflateEnd(&stream);
-    return err == Z_STREAM_END ? Z_OK : err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
-}

crates/libz-sys/src/zlib/configure

diff --git a/crates/libz-sys/src/zlib/configure b/crates/libz-sys/src/zlib/configure
deleted file mode 100755
index e974d1f..0000000
--- a/crates/libz-sys/src/zlib/configure
+++ /dev/null
@@ -1,921 +0,0 @@
-#!/bin/sh
-# configure script for zlib.
-#
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-#
-# To impose specific compiler or flags or install directory, use for example:
-#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
-# or for csh/tcsh users:
-#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
-
-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
-# If you have problems, try without defining CC and CFLAGS before reporting
-# an error.
-
-# start off configure.log
-echo -------------------- >> configure.log
-echo $0 $* >> configure.log
-date >> configure.log
-
-# get source directory
-SRCDIR=`dirname $0`
-if test $SRCDIR = "."; then
-    ZINC=""
-    ZINCOUT="-I."
-    SRCDIR=""
-else
-    ZINC='-include zconf.h'
-    ZINCOUT='-I. -I$(SRCDIR)'
-    SRCDIR="$SRCDIR/"
-fi
-
-# set command prefix for cross-compilation
-if [ -n "${CHOST}" ]; then
-    uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
-    CROSS_PREFIX="${CHOST}-"
-fi
-
-# destination name for static library
-STATICLIB=libz.a
-
-# extract zlib version numbers from zlib.h
-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
-VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
-
-# establish commands for library building
-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    AR=${AR-"${CROSS_PREFIX}ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-else
-    AR=${AR-"ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-fi
-ARFLAGS=${ARFLAGS-"rc"}
-if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
-    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
-else
-    RANLIB=${RANLIB-"ranlib"}
-fi
-if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    NM=${NM-"${CROSS_PREFIX}nm"}
-    test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log
-else
-    NM=${NM-"nm"}
-fi
-
-# set defaults before processing command line options
-LDCONFIG=${LDCONFIG-"ldconfig"}
-LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
-ARCHS=
-prefix=${prefix-/usr/local}
-exec_prefix=${exec_prefix-'${prefix}'}
-libdir=${libdir-'${exec_prefix}/lib'}
-sharedlibdir=${sharedlibdir-'${libdir}'}
-includedir=${includedir-'${prefix}/include'}
-mandir=${mandir-'${prefix}/share/man'}
-shared_ext='.so'
-shared=1
-solo=0
-cover=0
-zprefix=0
-zconst=0
-build64=0
-gcc=0
-warn=0
-debug=0
-old_cc="$CC"
-old_cflags="$CFLAGS"
-OBJC='$(OBJZ) $(OBJG)'
-PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
-
-# leave this script, optionally in a bad way
-leave()
-{
-  if test "$*" != "0"; then
-    echo "** $0 aborting." | tee -a configure.log
-  fi
-  rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version
-  echo -------------------- >> configure.log
-  echo >> configure.log
-  echo >> configure.log
-  exit $1
-}
-
-# process command line options
-while test $# -ge 1
-do
-case "$1" in
-    -h* | --help)
-      echo 'usage:' | tee -a configure.log
-      echo '  configure [--const] [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]' | tee -a configure.log
-      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
-      echo '    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
-        exit 0 ;;
-    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
-    --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
-    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
-    -p* | --prefix) prefix="$2"; shift; shift ;;
-    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
-    -l* | --libdir) libdir="$2"; shift; shift ;;
-    -i* | --includedir) includedir="$2"; shift; shift ;;
-    -s* | --shared | --enable-shared) shared=1; shift ;;
-    -t | --static) shared=0; shift ;;
-    --solo) solo=1; shift ;;
-    --cover) cover=1; shift ;;
-    -z* | --zprefix) zprefix=1; shift ;;
-    -6* | --64) build64=1; shift ;;
-    -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
-    --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
-    --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
-    -c* | --const) zconst=1; shift ;;
-    -w* | --warn) warn=1; shift ;;
-    -d* | --debug) debug=1; shift ;;
-    *)
-      echo "unknown option: $1" | tee -a configure.log
-      echo "$0 --help for help" | tee -a configure.log
-      leave 1;;
-    esac
-done
-
-# temporary file name
-test=ztest$$
-
-# put arguments in log, also put test file in log if used in arguments
-show()
-{
-  case "$*" in
-    *$test.c*)
-      echo === $test.c === >> configure.log
-      cat $test.c >> configure.log
-      echo === >> configure.log;;
-  esac
-  echo $* >> configure.log
-}
-
-# check for gcc vs. cc and set compile and link flags based on the system identified by uname
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-
-test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
-cc=${CC-${CROSS_PREFIX}gcc}
-cflags=${CFLAGS-"-O3"}
-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
-case "$cc" in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-case `$cc -v 2>&1` in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-
-show $cc -c $test.c
-if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
-  echo ... using gcc >> configure.log
-  CC="$cc"
-  CFLAGS="${CFLAGS--O3}"
-  SFLAGS="${CFLAGS--O3} -fPIC"
-  if test "$ARCHS"; then
-    CFLAGS="${CFLAGS} ${ARCHS}"
-    LDFLAGS="${LDFLAGS} ${ARCHS}"
-  fi
-  if test $build64 -eq 1; then
-    CFLAGS="${CFLAGS} -m64"
-    SFLAGS="${SFLAGS} -m64"
-  fi
-  if test "$warn" -eq 1; then
-    if test "$zconst" -eq 1; then
-      CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
-    else
-      CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
-    fi
-  fi
-  if test $debug -eq 1; then
-    CFLAGS="${CFLAGS} -DZLIB_DEBUG"
-    SFLAGS="${SFLAGS} -DZLIB_DEBUG"
-  fi
-  if test -z "$uname"; then
-    uname=`(uname -s || echo unknown) 2>/dev/null`
-  fi
-  case "$uname" in
-  Linux* | linux* | GNU | GNU/* | solaris*)
-        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
-  *BSD | *bsd* | DragonFly)
-        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
-        LDCONFIG="ldconfig -m" ;;
-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
-        EXE='.exe' ;;
-  MINGW* | mingw*)
-# temporary bypass
-        rm -f $test.[co] $test $test$shared_ext
-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
-        leave 1
-        LDSHARED=${LDSHARED-"$cc -shared"}
-        LDSHAREDLIBC=""
-        EXE='.exe' ;;
-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-         # (alain.bonnefoy@icbt.com)
-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
-  HP-UX*)
-         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
-         ia64)
-                 shared_ext='.so'
-                 SHAREDLIB='libz.so' ;;
-         *)
-                 shared_ext='.sl'
-                 SHAREDLIB='libz.sl' ;;
-         esac ;;
-  Darwin* | darwin*)
-             shared_ext='.dylib'
-             SHAREDLIB=libz$shared_ext
-             SHAREDLIBV=libz.$VER$shared_ext
-             SHAREDLIBM=libz.$VER1$shared_ext
-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
-             if libtool -V 2>&1 | grep Apple > /dev/null; then
-                 AR="libtool"
-             else
-                 AR="/usr/bin/libtool"
-             fi
-             ARFLAGS="-o" ;;
-  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
-  esac
-else
-  # find system name and corresponding cc options
-  CC=${CC-cc}
-  gcc=0
-  echo ... using $CC >> configure.log
-  if test -z "$uname"; then
-    uname=`(uname -sr || echo unknown) 2>/dev/null`
-  fi
-  case "$uname" in
-  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
-             CFLAGS=${CFLAGS-"-O"}
-#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
-             LDSHARED=${LDSHARED-"ld -b"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
-         ia64)
-             shared_ext='.so'
-             SHAREDLIB='libz.so' ;;
-         *)
-             shared_ext='.sl'
-             SHAREDLIB='libz.sl' ;;
-         esac ;;
-  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
-             CFLAGS=${CFLAGS-"-ansi -O2"}
-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
-  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
-             CFLAGS=${CFLAGS-"-O -std1"}
-             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
-             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
-  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
-             CFLAGS=${CFLAGS-"-O -std1"}
-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
-  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
-             CFLAGS=${CFLAGS-"-4 -O"}
-             LDSHARED=${LDSHARED-"cc"}
-             RANLIB=${RANLIB-"true"}
-             AR="cc"
-             ARFLAGS="-A" ;;
-  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
-             CFLAGS=${CFLAGS-"-O3"}
-             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
-  SunOS\ 5* | solaris*)
-         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
-         SFLAGS=${CFLAGS-"-fast -KPIC"}
-         CFLAGS=${CFLAGS-"-fast"}
-         if test $build64 -eq 1; then
-             # old versions of SunPRO/Workshop/Studio don't support -m64,
-             # but newer ones do.  Check for it.
-             flag64=`$CC -flags | egrep -- '^-m64'`
-             if test x"$flag64" != x"" ; then
-                 CFLAGS="${CFLAGS} -m64"
-                 SFLAGS="${SFLAGS} -m64"
-             else
-                 case `(uname -m || echo unknown) 2>/dev/null` in
-                   i86*)
-                     SFLAGS="$SFLAGS -xarch=amd64"
-                     CFLAGS="$CFLAGS -xarch=amd64" ;;
-                   *)
-                     SFLAGS="$SFLAGS -xarch=v9"
-                     CFLAGS="$CFLAGS -xarch=v9" ;;
-                 esac
-             fi
-         fi
-         if test -n "$ZINC"; then
-             ZINC='-I- -I. -I$(SRCDIR)'
-         fi
-         ;;
-  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
-             CFLAGS=${CFLAGS-"-O2"}
-             LDSHARED=${LDSHARED-"ld"} ;;
-  SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
-             CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
-             LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
-  UNIX_System_V\ 4.2.0)
-             SFLAGS=${CFLAGS-"-KPIC -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  UNIX_SV\ 4.2MP)
-             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  OpenUNIX\ 5)
-             SFLAGS=${CFLAGS-"-KPIC -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  AIX*)  # Courtesy of dbakker@arrayasolutions.com
-             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             LDSHARED=${LDSHARED-"xlc -G"} ;;
-  # send working options for other systems to zlib@gzip.org
-  *)         SFLAGS=${CFLAGS-"-O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -shared"} ;;
-  esac
-fi
-
-# destination names for shared library if not defined above
-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
-
-echo >> configure.log
-
-# define functions for testing compiler and library characteristics and logging the results
-
-cat > $test.c <<EOF
-#error error
-EOF
-if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
-  try()
-  {
-    show $*
-    test "`( $* ) 2>&1 | tee -a configure.log`" = ""
-  }
-  echo - using any output from compiler to indicate an error >> configure.log
-else
-  try()
-  {
-    show $*
-    ( $* ) >> configure.log 2>&1
-    ret=$?
-    if test $ret -ne 0; then
-      echo "(exit code "$ret")" >> configure.log
-    fi
-    return $ret
-  }
-fi
-
-tryboth()
-{
-  show $*
-  got=`( $* ) 2>&1`
-  ret=$?
-  printf %s "$got" >> configure.log
-  if test $ret -ne 0; then
-    return $ret
-  fi
-  test "$got" = ""
-}
-
-cat > $test.c << EOF
-int foo() { return 0; }
-EOF
-echo "Checking for obsessive-compulsive compiler options..." >> configure.log
-if try $CC -c $CFLAGS $test.c; then
-  :
-else
-  echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log
-  leave 1
-fi
-
-echo >> configure.log
-
-# see if shared library build supported
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-if test $shared -eq 1; then
-  echo Checking for shared library support... | tee -a configure.log
-  # we must test in two steps (cc then ld), required at least on SunOS 4.x
-  if try $CC -w -c $SFLAGS $test.c &&
-     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
-    echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
-  elif test -z "$old_cc" -a -z "$old_cflags"; then
-    echo No shared library support. | tee -a configure.log
-    shared=0;
-  else
-    echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
-    shared=0;
-  fi
-fi
-if test $shared -eq 0; then
-  LDSHARED="$CC"
-  ALL="static"
-  TEST="all teststatic"
-  SHAREDLIB=""
-  SHAREDLIBV=""
-  SHAREDLIBM=""
-  echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
-else
-  ALL="static shared"
-  TEST="all teststatic testshared"
-fi
-
-# check for underscores in external names for use by assembler code
-CPP=${CPP-"$CC -E"}
-case $CFLAGS in
-  *ASMV*)
-    echo >> configure.log
-    show "$NM $test.o | grep _hello"
-    if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
-      CPP="$CPP -DNO_UNDERLINE"
-      echo Checking for underline in external names... No. | tee -a configure.log
-    else
-      echo Checking for underline in external names... Yes. | tee -a configure.log
-    fi ;;
-esac
-
-echo >> configure.log
-
-# check for size_t
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdlib.h>
-size_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Checking for size_t... Yes." | tee -a configure.log
-  need_sizet=0
-else
-  echo "Checking for size_t... No." | tee -a configure.log
-  need_sizet=1
-fi
-
-echo >> configure.log
-
-# find the size_t integer type, if needed
-if test $need_sizet -eq 1; then
-  cat > $test.c <<EOF
-long long dummy = 0;
-EOF
-  if try $CC -c $CFLAGS $test.c; then
-    echo "Checking for long long... Yes." | tee -a configure.log
-    cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-    if (sizeof(void *) <= sizeof(int)) puts("int");
-    else if (sizeof(void *) <= sizeof(long)) puts("long");
-    else puts("z_longlong");
-    return 0;
-}
-EOF
-  else
-    echo "Checking for long long... No." | tee -a configure.log
-    cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-    if (sizeof(void *) <= sizeof(int)) puts("int");
-    else puts("long");
-    return 0;
-}
-EOF
-  fi
-  if try $CC $CFLAGS -o $test $test.c; then
-    sizet=`./$test`
-    echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
-  else
-    echo "Failed to find a pointer-size integer type." | tee -a configure.log
-    leave 1
-  fi
-fi
-
-if test $need_sizet -eq 1; then
-  CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
-  SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
-fi
-
-echo >> configure.log
-
-# check for large file support, and if none, check for fseeko()
-cat > $test.c <<EOF
-#include <sys/types.h>
-off64_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
-  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
-  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
-  ALL="${ALL} all64"
-  TEST="${TEST} test64"
-  echo "Checking for off64_t... Yes." | tee -a configure.log
-  echo "Checking for fseeko... Yes." | tee -a configure.log
-else
-  echo "Checking for off64_t... No." | tee -a configure.log
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-  fseeko(NULL, 0, 0);
-  return 0;
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for fseeko... Yes." | tee -a configure.log
-  else
-    CFLAGS="${CFLAGS} -DNO_FSEEKO"
-    SFLAGS="${SFLAGS} -DNO_FSEEKO"
-    echo "Checking for fseeko... No." | tee -a configure.log
-  fi
-fi
-
-echo >> configure.log
-
-# check for strerror() for use by gz* functions
-cat > $test.c <<EOF
-#include <string.h>
-#include <errno.h>
-int main() { return strlen(strerror(errno)); }
-EOF
-if try $CC $CFLAGS -o $test $test.c; then
-  echo "Checking for strerror... Yes." | tee -a configure.log
-else
-  CFLAGS="${CFLAGS} -DNO_STRERROR"
-  SFLAGS="${SFLAGS} -DNO_STRERROR"
-  echo "Checking for strerror... No." | tee -a configure.log
-fi
-
-# copy clean zconf.h for subsequent edits
-cp -p ${SRCDIR}zconf.h.in zconf.h
-
-echo >> configure.log
-
-# check for unistd.h and save result in zconf.h
-cat > $test.c <<EOF
-#include <unistd.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo "Checking for unistd.h... Yes." | tee -a configure.log
-else
-  echo "Checking for unistd.h... No." | tee -a configure.log
-fi
-
-echo >> configure.log
-
-# check for stdarg.h and save result in zconf.h
-cat > $test.c <<EOF
-#include <stdarg.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo "Checking for stdarg.h... Yes." | tee -a configure.log
-else
-  echo "Checking for stdarg.h... No." | tee -a configure.log
-fi
-
-# if the z_ prefix was requested, save that in zconf.h
-if test $zprefix -eq 1; then
-  sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo >> configure.log
-  echo "Using z_ prefix on all symbols." | tee -a configure.log
-fi
-
-# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
-if test $solo -eq 1; then
-  sed '/#define ZCONF_H/a\
-#define Z_SOLO
-
-' < zconf.h > zconf.temp.h
-  mv zconf.temp.h zconf.h
-OBJC='$(OBJZ)'
-PIC_OBJC='$(PIC_OBJZ)'
-fi
-
-# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
-if test $cover -eq 1; then
-  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
-  if test -n "$GCC_CLASSIC"; then
-    CC=$GCC_CLASSIC
-  fi
-fi
-
-echo >> configure.log
-
-# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions
-# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a
-# return value.  The most secure result is vsnprintf() with a return value.  snprintf() with a
-# return value is secure as well, but then gzprintf() will be limited to 20 arguments.
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-#include "zconf.h"
-int main()
-{
-#ifndef STDC
-  choke me
-#endif
-  return 0;
-}
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log
-
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return 0;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  int n;
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  n = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return n;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
-      SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
-      echo "Checking for return value of vsnprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  else
-    CFLAGS="$CFLAGS -DNO_vsnprintf"
-    SFLAGS="$SFLAGS -DNO_vsnprintf"
-    echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log
-    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log
-    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
-    echo "  vulnerabilities." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  int n;
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  n = vsprintf(buf, fmt, ap);
-  va_end(ap);
-  return n;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
-      SFLAGS="$SFLAGS -DHAS_vsprintf_void"
-      echo "Checking for return value of vsprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  fi
-else
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log
-
-  echo >> configure.log
-  cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  snprintf(buf, sizeof(buf), "%s", "foo");
-  return 0;
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  return snprintf(buf, sizeof(buf), "%s", "foo");
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of snprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_snprintf_void"
-      SFLAGS="$SFLAGS -DHAS_snprintf_void"
-      echo "Checking for return value of snprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  else
-    CFLAGS="$CFLAGS -DNO_snprintf"
-    SFLAGS="$SFLAGS -DNO_snprintf"
-    echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log
-    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log
-    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
-    echo "  vulnerabilities." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  return sprintf(buf, "%s", "foo");
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of sprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_sprintf_void"
-      SFLAGS="$SFLAGS -DHAS_sprintf_void"
-      echo "Checking for return value of sprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  fi
-fi
-
-# see if we can hide zlib internal symbols that are linked between separate source files
-if test "$gcc" -eq 1; then
-  echo >> configure.log
-  cat > $test.c <<EOF
-#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-int ZLIB_INTERNAL foo;
-int main()
-{
-  return 0;
-}
-EOF
-  if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_HIDDEN"
-    SFLAGS="$SFLAGS -DHAVE_HIDDEN"
-    echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
-  else
-    echo "Checking for attribute(visibility) support... No." | tee -a configure.log
-  fi
-fi
-
-# show the results in the log
-echo >> configure.log
-echo ALL = $ALL >> configure.log
-echo AR = $AR >> configure.log
-echo ARFLAGS = $ARFLAGS >> configure.log
-echo CC = $CC >> configure.log
-echo CFLAGS = $CFLAGS >> configure.log
-echo CPP = $CPP >> configure.log
-echo EXE = $EXE >> configure.log
-echo LDCONFIG = $LDCONFIG >> configure.log
-echo LDFLAGS = $LDFLAGS >> configure.log
-echo LDSHARED = $LDSHARED >> configure.log
-echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
-echo OBJC = $OBJC >> configure.log
-echo PIC_OBJC = $PIC_OBJC >> configure.log
-echo RANLIB = $RANLIB >> configure.log
-echo SFLAGS = $SFLAGS >> configure.log
-echo SHAREDLIB = $SHAREDLIB >> configure.log
-echo SHAREDLIBM = $SHAREDLIBM >> configure.log
-echo SHAREDLIBV = $SHAREDLIBV >> configure.log
-echo STATICLIB = $STATICLIB >> configure.log
-echo TEST = $TEST >> configure.log
-echo VER = $VER >> configure.log
-echo Z_U4 = $Z_U4 >> configure.log
-echo SRCDIR = $SRCDIR >> configure.log
-echo exec_prefix = $exec_prefix >> configure.log
-echo includedir = $includedir >> configure.log
-echo libdir = $libdir >> configure.log
-echo mandir = $mandir >> configure.log
-echo prefix = $prefix >> configure.log
-echo sharedlibdir = $sharedlibdir >> configure.log
-echo uname = $uname >> configure.log
-
-# udpate Makefile with the configure results
-sed < ${SRCDIR}Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^CPP *=/s#=.*#=$CPP#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^LDCONFIG *=/s#=.*#=$LDCONFIG#
-/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
-/^EXE *=/s#=.*#=$EXE#
-/^SRCDIR *=/s#=.*#=$SRCDIR#
-/^ZINC *=/s#=.*#=$ZINC#
-/^ZINCOUT *=/s#=.*#=$ZINCOUT#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^OBJC *=/s#=.*#= $OBJC#
-/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
-/^all: */s#:.*#: $ALL#
-/^test: */s#:.*#: $TEST#
-" > Makefile
-
-# create zlib.pc with the configure results
-sed < ${SRCDIR}zlib.pc.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^CPP *=/s#=.*#=$CPP#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-" | sed -e "
-s/\@VERSION\@/$VER/g;
-" > zlib.pc
-
-# done
-leave 0

crates/libz-sys/src/zlib/contrib/README.contrib

diff --git a/crates/libz-sys/src/zlib/contrib/README.contrib b/crates/libz-sys/src/zlib/contrib/README.contrib
deleted file mode 100644
index a411d5c..0000000
--- a/crates/libz-sys/src/zlib/contrib/README.contrib
+++ /dev/null
@@ -1,78 +0,0 @@
-All files under this contrib directory are UNSUPPORTED. There were
-provided by users of zlib and were not tested by the authors of zlib.
-Use at your own risk. Please contact the authors of the contributions
-for help about these, not the zlib authors. Thanks.
-
-
-ada/        by Dmitriy Anisimkov <anisimkov@yahoo.com>
-        Support for Ada
-        See http://zlib-ada.sourceforge.net/
-
-amd64/      by Mikhail Teterin <mi@ALDAN.algebra.com>
-        asm code for AMD64
-        See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
-
-asm686/     by Brian Raiter <breadbox@muppetlabs.com>
-        asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
-        See http://www.muppetlabs.com/~breadbox/software/assembly.html
-
-blast/      by Mark Adler <madler@alumni.caltech.edu>
-        Decompressor for output of PKWare Data Compression Library (DCL)
-
-delphi/     by Cosmin Truta <cosmint@cs.ubbcluj.ro>
-        Support for Delphi and C++ Builder
-
-dotzlib/    by Henrik Ravn <henrik@ravn.com>
-        Support for Microsoft .Net and Visual C++ .Net
-
-gcc_gvmat64/by Gilles Vollant <info@winimage.com>
-        GCC Version of x86 64-bit (AMD64 and Intel EM64t) code for x64
-        assembler to replace longest_match() and inflate_fast()
-
-infback9/   by Mark Adler <madler@alumni.caltech.edu>
-        Unsupported diffs to infback to decode the deflate64 format
-
-inflate86/  by Chris Anderson <christop@charm.net>
-        Tuned x86 gcc asm code to replace inflate_fast()
-
-iostream/   by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-
-iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-
-iostream3/  by Ludwig Schwardt <schwardt@sun.ac.za>
-            and Kevin Ruland <kevin@rodin.wustl.edu>
-        Yet another C++ I/O streams interface
-
-masmx64/    by Gilles Vollant <info@winimage.com>
-        x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
-        replace longest_match() and inflate_fast(),  also masm x86
-        64-bits translation of Chris Anderson inflate_fast()
-
-masmx86/    by Gilles Vollant <info@winimage.com>
-        x86 asm code to replace longest_match() and inflate_fast(),
-        for Visual C++ and MASM (32 bits).
-        Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
-
-minizip/    by Gilles Vollant <info@winimage.com>
-        Mini zip and unzip based on zlib
-        Includes Zip64 support by Mathias Svensson <mathias@result42.com>
-        See http://www.winimage.com/zLibDll/minizip.html
-
-pascal/     by Bob Dellaca <bobdl@xtra.co.nz> et al.
-        Support for Pascal
-
-puff/       by Mark Adler <madler@alumni.caltech.edu>
-        Small, low memory usage inflate.  Also serves to provide an
-        unambiguous description of the deflate format.
-
-testzlib/   by Gilles Vollant <info@winimage.com>
-        Example of the use of zlib
-
-untgz/      by Pedro A. Aranda Gutierrez <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-
-vstudio/    by Gilles Vollant <info@winimage.com>
-        Building a minizip-enhanced zlib with Microsoft Visual Studio
-        Includes vc11 from kreuzerkrieg and vc12 from davispuh

crates/libz-sys/src/zlib/contrib/ada/buffer_demo.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/buffer_demo.adb b/crates/libz-sys/src/zlib/contrib/ada/buffer_demo.adb
deleted file mode 100644
index 46b8638..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/buffer_demo.adb
+++ /dev/null
@@ -1,106 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
---
---  $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $
-
---  This demo program provided by Dr Steve Sangwine <sjs@essex.ac.uk>
---
---  Demonstration of a problem with Zlib-Ada (already fixed) when a buffer
---  of exactly the correct size is used for decompressed data, and the last
---  few bytes passed in to Zlib are checksum bytes.
-
---  This program compresses a string of text, and then decompresses the
---  compressed text into a buffer of the same size as the original text.
-
-with Ada.Streams; use Ada.Streams;
-with Ada.Text_IO;
-
-with ZLib; use ZLib;
-
-procedure Buffer_Demo is
-   EOL  : Character renames ASCII.LF;
-   Text : constant String
-     := "Four score and seven years ago our fathers brought forth," & EOL &
-        "upon this continent, a new nation, conceived in liberty," & EOL &
-        "and dedicated to the proposition that `all men are created equal'.";
-
-   Source : Stream_Element_Array (1 .. Text'Length);
-   for Source'Address use Text'Address;
-
-begin
-   Ada.Text_IO.Put (Text);
-   Ada.Text_IO.New_Line;
-   Ada.Text_IO.Put_Line
-     ("Uncompressed size : " & Positive'Image (Text'Length) & " bytes");
-
-   declare
-      Compressed_Data : Stream_Element_Array (1 .. Text'Length);
-      L               : Stream_Element_Offset;
-   begin
-      Compress : declare
-         Compressor : Filter_Type;
-         I : Stream_Element_Offset;
-      begin
-         Deflate_Init (Compressor);
-
-         --  Compress the whole of T at once.
-
-         Translate (Compressor, Source, I, Compressed_Data, L, Finish);
-         pragma Assert (I = Source'Last);
-
-         Close (Compressor);
-
-         Ada.Text_IO.Put_Line
-           ("Compressed size :   "
-            & Stream_Element_Offset'Image (L) & " bytes");
-      end Compress;
-
-      --  Now we decompress the data, passing short blocks of data to Zlib
-      --  (because this demonstrates the problem - the last block passed will
-      --  contain checksum information and there will be no output, only a
-      --  check inside Zlib that the checksum is correct).
-
-      Decompress : declare
-         Decompressor : Filter_Type;
-
-         Uncompressed_Data : Stream_Element_Array (1 .. Text'Length);
-
-         Block_Size : constant := 4;
-         --  This makes sure that the last block contains
-         --  only Adler checksum data.
-
-         P : Stream_Element_Offset := Compressed_Data'First - 1;
-         O : Stream_Element_Offset;
-      begin
-         Inflate_Init (Decompressor);
-
-         loop
-            Translate
-              (Decompressor,
-               Compressed_Data
-                 (P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)),
-               P,
-               Uncompressed_Data
-                 (Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last),
-               O,
-               No_Flush);
-
-               Ada.Text_IO.Put_Line
-                 ("Total in : " & Count'Image (Total_In (Decompressor)) &
-                  ", out : " & Count'Image (Total_Out (Decompressor)));
-
-               exit when P = L;
-         end loop;
-
-         Ada.Text_IO.New_Line;
-         Ada.Text_IO.Put_Line
-           ("Decompressed text matches original text : "
-             & Boolean'Image (Uncompressed_Data = Source));
-      end Decompress;
-   end;
-end Buffer_Demo;

crates/libz-sys/src/zlib/contrib/ada/mtest.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/mtest.adb b/crates/libz-sys/src/zlib/contrib/ada/mtest.adb
deleted file mode 100644
index c4dfd08..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/mtest.adb
+++ /dev/null
@@ -1,156 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
---  Continuous test for ZLib multithreading. If the test would fail
---  we should provide thread safe allocation routines for the Z_Stream.
---
---  $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $
-
-with ZLib;
-with Ada.Streams;
-with Ada.Numerics.Discrete_Random;
-with Ada.Text_IO;
-with Ada.Exceptions;
-with Ada.Task_Identification;
-
-procedure MTest is
-   use Ada.Streams;
-   use ZLib;
-
-   Stop : Boolean := False;
-
-   pragma Atomic (Stop);
-
-   subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
-
-   package Random_Elements is
-      new Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-   task type Test_Task;
-
-   task body Test_Task is
-      Buffer : Stream_Element_Array (1 .. 100_000);
-      Gen : Random_Elements.Generator;
-
-      Buffer_First  : Stream_Element_Offset;
-      Compare_First : Stream_Element_Offset;
-
-      Deflate : Filter_Type;
-      Inflate : Filter_Type;
-
-      procedure Further (Item : in Stream_Element_Array);
-
-      procedure Read_Buffer
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-
-      -------------
-      -- Further --
-      -------------
-
-      procedure Further (Item : in Stream_Element_Array) is
-
-         procedure Compare (Item : in Stream_Element_Array);
-
-         -------------
-         -- Compare --
-         -------------
-
-         procedure Compare (Item : in Stream_Element_Array) is
-            Next_First : Stream_Element_Offset := Compare_First + Item'Length;
-         begin
-            if Buffer (Compare_First .. Next_First - 1) /= Item then
-               raise Program_Error;
-            end if;
-
-            Compare_First := Next_First;
-         end Compare;
-
-         procedure Compare_Write is new ZLib.Write (Write => Compare);
-      begin
-         Compare_Write (Inflate, Item, No_Flush);
-      end Further;
-
-      -----------------
-      -- Read_Buffer --
-      -----------------
-
-      procedure Read_Buffer
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset)
-      is
-         Buff_Diff   : Stream_Element_Offset := Buffer'Last - Buffer_First;
-         Next_First : Stream_Element_Offset;
-      begin
-         if Item'Length <= Buff_Diff then
-            Last := Item'Last;
-
-            Next_First := Buffer_First + Item'Length;
-
-            Item := Buffer (Buffer_First .. Next_First - 1);
-
-            Buffer_First := Next_First;
-         else
-            Last := Item'First + Buff_Diff;
-            Item (Item'First .. Last) := Buffer (Buffer_First .. Buffer'Last);
-            Buffer_First := Buffer'Last + 1;
-         end if;
-      end Read_Buffer;
-
-      procedure Translate is new Generic_Translate
-                                   (Data_In  => Read_Buffer,
-                                    Data_Out => Further);
-
-   begin
-      Random_Elements.Reset (Gen);
-
-      Buffer := (others => 20);
-
-      Main : loop
-         for J in Buffer'Range loop
-            Buffer (J) := Random_Elements.Random (Gen);
-
-            Deflate_Init (Deflate);
-            Inflate_Init (Inflate);
-
-            Buffer_First  := Buffer'First;
-            Compare_First := Buffer'First;
-
-            Translate (Deflate);
-
-            if Compare_First /= Buffer'Last + 1 then
-               raise Program_Error;
-            end if;
-
-            Ada.Text_IO.Put_Line
-              (Ada.Task_Identification.Image
-                 (Ada.Task_Identification.Current_Task)
-               & Stream_Element_Offset'Image (J)
-               & ZLib.Count'Image (Total_Out (Deflate)));
-
-            Close (Deflate);
-            Close (Inflate);
-
-            exit Main when Stop;
-         end loop;
-      end loop Main;
-   exception
-      when E : others =>
-         Ada.Text_IO.Put_Line (Ada.Exceptions.Exception_Information (E));
-         Stop := True;
-   end Test_Task;
-
-   Test : array (1 .. 4) of Test_Task;
-
-   pragma Unreferenced (Test);
-
-   Dummy : Character;
-
-begin
-   Ada.Text_IO.Get_Immediate (Dummy);
-   Stop := True;
-end MTest;

crates/libz-sys/src/zlib/contrib/ada/read.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/read.adb b/crates/libz-sys/src/zlib/contrib/ada/read.adb
deleted file mode 100644
index 1f2efbf..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/read.adb
+++ /dev/null
@@ -1,156 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $
-
---  Test/demo program for the generic read interface.
-
-with Ada.Numerics.Discrete_Random;
-with Ada.Streams;
-with Ada.Text_IO;
-
-with ZLib;
-
-procedure Read is
-
-   use Ada.Streams;
-
-   ------------------------------------
-   --  Test configuration parameters --
-   ------------------------------------
-
-   File_Size   : Stream_Element_Offset := 100_000;
-
-   Continuous  : constant Boolean          := False;
-   --  If this constant is True, the test would be repeated again and again,
-   --  with increment File_Size for every iteration.
-
-   Header      : constant ZLib.Header_Type := ZLib.Default;
-   --  Do not use Header other than Default in ZLib versions 1.1.4 and older.
-
-   Init_Random : constant := 8;
-   --  We are using the same random sequence, in case of we catch bug,
-   --  so we would be able to reproduce it.
-
-   -- End --
-
-   Pack_Size : Stream_Element_Offset;
-   Offset    : Stream_Element_Offset;
-
-   Filter     : ZLib.Filter_Type;
-
-   subtype Visible_Symbols
-      is Stream_Element range 16#20# .. 16#7E#;
-
-   package Random_Elements is new
-      Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-   Gen : Random_Elements.Generator;
-   Period  : constant Stream_Element_Offset := 200;
-   --  Period constant variable for random generator not to be very random.
-   --  Bigger period, harder random.
-
-   Read_Buffer : Stream_Element_Array (1 .. 2048);
-   Read_First  : Stream_Element_Offset;
-   Read_Last   : Stream_Element_Offset;
-
-   procedure Reset;
-
-   procedure Read
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Read
-   --  reading data from the File_In.
-
-   procedure Read is new ZLib.Read
-                           (Read,
-                            Read_Buffer,
-                            Rest_First => Read_First,
-                            Rest_Last  => Read_Last);
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset) is
-   begin
-      Last := Stream_Element_Offset'Min
-               (Item'Last,
-                Item'First + File_Size - Offset);
-
-      for J in Item'First .. Last loop
-         if J < Item'First + Period then
-            Item (J) := Random_Elements.Random (Gen);
-         else
-            Item (J) := Item (J - Period);
-         end if;
-
-         Offset   := Offset + 1;
-      end loop;
-   end Read;
-
-   -----------
-   -- Reset --
-   -----------
-
-   procedure Reset is
-   begin
-      Random_Elements.Reset (Gen, Init_Random);
-      Pack_Size := 0;
-      Offset := 1;
-      Read_First := Read_Buffer'Last + 1;
-      Read_Last  := Read_Buffer'Last;
-   end Reset;
-
-begin
-   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
-
-   loop
-      for Level in ZLib.Compression_Level'Range loop
-
-         Ada.Text_IO.Put ("Level ="
-            & ZLib.Compression_Level'Image (Level));
-
-         --  Deflate using generic instantiation.
-
-         ZLib.Deflate_Init
-               (Filter,
-                Level,
-                Header => Header);
-
-         Reset;
-
-         Ada.Text_IO.Put
-           (Stream_Element_Offset'Image (File_Size) & " ->");
-
-         loop
-            declare
-               Buffer : Stream_Element_Array (1 .. 1024);
-               Last   : Stream_Element_Offset;
-            begin
-               Read (Filter, Buffer, Last);
-
-               Pack_Size := Pack_Size + Last - Buffer'First + 1;
-
-               exit when Last < Buffer'Last;
-            end;
-         end loop;
-
-         Ada.Text_IO.Put_Line (Stream_Element_Offset'Image (Pack_Size));
-
-         ZLib.Close (Filter);
-      end loop;
-
-      exit when not Continuous;
-
-      File_Size := File_Size + 1;
-   end loop;
-end Read;

crates/libz-sys/src/zlib/contrib/ada/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/ada/readme.txt b/crates/libz-sys/src/zlib/contrib/ada/readme.txt
deleted file mode 100644
index ce4d2ca..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/readme.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-                        ZLib for Ada thick binding (ZLib.Ada)
-                        Release 1.3
-
-ZLib.Ada is a thick binding interface to the popular ZLib data
-compression library, available at http://www.gzip.org/zlib/.
-It provides Ada-style access to the ZLib C library.
-
-
-        Here are the main changes since ZLib.Ada 1.2:
-
-- Attension: ZLib.Read generic routine have a initialization requirement
-  for Read_Last parameter now. It is a bit incompartible with previous version,
-  but extends functionality, we could use new parameters Allow_Read_Some and
-  Flush now.
-
-- Added Is_Open routines to ZLib and ZLib.Streams packages.
-
-- Add pragma Assert to check Stream_Element is 8 bit.
-
-- Fix extraction to buffer with exact known decompressed size. Error reported by
-  Steve Sangwine.
-
-- Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits
-  computers. Patch provided by Pascal Obry.
-
-- Add Status_Error exception definition.
-
-- Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit.
-
-
-        How to build ZLib.Ada under GNAT
-
-You should have the ZLib library already build on your computer, before
-building ZLib.Ada. Make the directory of ZLib.Ada sources current and
-issue the command:
-
-  gnatmake test -largs -L<directory where libz.a is> -lz
-
-Or use the GNAT project file build for GNAT 3.15 or later:
-
-  gnatmake -Pzlib.gpr -L<directory where libz.a is>
-
-
-        How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2
-
-1. Make a project with all *.ads and *.adb files from the distribution.
-2. Build the libz.a library from the ZLib C sources.
-3. Rename libz.a to z.lib.
-4. Add the library z.lib to the project.
-5. Add the libc.lib library from the ObjectAda distribution to the project.
-6. Build the executable using test.adb as a main procedure.
-
-
-        How to use ZLib.Ada
-
-The source files test.adb and read.adb are small demo programs that show
-the main functionality of ZLib.Ada.
-
-The routines from the package specifications are commented.
-
-
-Homepage: http://zlib-ada.sourceforge.net/
-Author: Dmitriy Anisimkov <anisimkov@yahoo.com>
-
-Contributors: Pascal Obry <pascal@obry.org>, Steve Sangwine <sjs@essex.ac.uk>

crates/libz-sys/src/zlib/contrib/ada/test.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/test.adb b/crates/libz-sys/src/zlib/contrib/ada/test.adb
deleted file mode 100644
index 90773ac..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/test.adb
+++ /dev/null
@@ -1,463 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: test.adb,v 1.17 2003/08/12 12:13:30 vagul Exp $
-
---  The program has a few aims.
---  1. Test ZLib.Ada95 thick binding functionality.
---  2. Show the example of use main functionality of the ZLib.Ada95 binding.
---  3. Build this program automatically compile all ZLib.Ada95 packages under
---     GNAT Ada95 compiler.
-
-with ZLib.Streams;
-with Ada.Streams.Stream_IO;
-with Ada.Numerics.Discrete_Random;
-
-with Ada.Text_IO;
-
-with Ada.Calendar;
-
-procedure Test is
-
-   use Ada.Streams;
-   use Stream_IO;
-
-   ------------------------------------
-   --  Test configuration parameters --
-   ------------------------------------
-
-   File_Size   : Count   := 100_000;
-   Continuous  : constant Boolean := False;
-
-   Header      : constant ZLib.Header_Type := ZLib.Default;
-                                              --  ZLib.None;
-                                              --  ZLib.Auto;
-                                              --  ZLib.GZip;
-   --  Do not use Header other then Default in ZLib versions 1.1.4
-   --  and older.
-
-   Strategy    : constant ZLib.Strategy_Type := ZLib.Default_Strategy;
-   Init_Random : constant := 10;
-
-   -- End --
-
-   In_File_Name  : constant String := "testzlib.in";
-   --  Name of the input file
-
-   Z_File_Name   : constant String := "testzlib.zlb";
-   --  Name of the compressed file.
-
-   Out_File_Name : constant String := "testzlib.out";
-   --  Name of the decompressed file.
-
-   File_In   : File_Type;
-   File_Out  : File_Type;
-   File_Back : File_Type;
-   File_Z    : ZLib.Streams.Stream_Type;
-
-   Filter : ZLib.Filter_Type;
-
-   Time_Stamp : Ada.Calendar.Time;
-
-   procedure Generate_File;
-   --  Generate file of spetsified size with some random data.
-   --  The random data is repeatable, for the good compression.
-
-   procedure Compare_Streams
-     (Left, Right : in out Root_Stream_Type'Class);
-   --  The procedure compearing data in 2 streams.
-   --  It is for compare data before and after compression/decompression.
-
-   procedure Compare_Files (Left, Right : String);
-   --  Compare files. Based on the Compare_Streams.
-
-   procedure Copy_Streams
-     (Source, Target : in out Root_Stream_Type'Class;
-      Buffer_Size    : in     Stream_Element_Offset := 1024);
-   --  Copying data from one stream to another. It is for test stream
-   --  interface of the library.
-
-   procedure Data_In
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Generic_Translate.
-   --  reading data from the File_In.
-
-   procedure Data_Out (Item : in Stream_Element_Array);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Generic_Translate.
-   --  writing data to the File_Out.
-
-   procedure Stamp;
-   --  Store the timestamp to the local variable.
-
-   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count);
-   --  Print the time statistic with the message.
-
-   procedure Translate is new ZLib.Generic_Translate
-                                (Data_In  => Data_In,
-                                 Data_Out => Data_Out);
-   --  This procedure is moving data from File_In to File_Out
-   --  with compression or decompression, depend on initialization of
-   --  Filter parameter.
-
-   -------------------
-   -- Compare_Files --
-   -------------------
-
-   procedure Compare_Files (Left, Right : String) is
-      Left_File, Right_File : File_Type;
-   begin
-      Open (Left_File, In_File, Left);
-      Open (Right_File, In_File, Right);
-      Compare_Streams (Stream (Left_File).all, Stream (Right_File).all);
-      Close (Left_File);
-      Close (Right_File);
-   end Compare_Files;
-
-   ---------------------
-   -- Compare_Streams --
-   ---------------------
-
-   procedure Compare_Streams
-     (Left, Right : in out Ada.Streams.Root_Stream_Type'Class)
-   is
-      Left_Buffer, Right_Buffer : Stream_Element_Array (0 .. 16#FFF#);
-      Left_Last, Right_Last : Stream_Element_Offset;
-   begin
-      loop
-         Read (Left, Left_Buffer, Left_Last);
-         Read (Right, Right_Buffer, Right_Last);
-
-         if Left_Last /= Right_Last then
-            Ada.Text_IO.Put_Line ("Compare error :"
-              & Stream_Element_Offset'Image (Left_Last)
-              & " /= "
-              & Stream_Element_Offset'Image (Right_Last));
-
-            raise Constraint_Error;
-
-         elsif Left_Buffer (0 .. Left_Last)
-               /= Right_Buffer (0 .. Right_Last)
-         then
-            Ada.Text_IO.Put_Line ("ERROR: IN and OUT files is not equal.");
-            raise Constraint_Error;
-
-         end if;
-
-         exit when Left_Last < Left_Buffer'Last;
-      end loop;
-   end Compare_Streams;
-
-   ------------------
-   -- Copy_Streams --
-   ------------------
-
-   procedure Copy_Streams
-     (Source, Target : in out Ada.Streams.Root_Stream_Type'Class;
-      Buffer_Size    : in     Stream_Element_Offset := 1024)
-   is
-      Buffer : Stream_Element_Array (1 .. Buffer_Size);
-      Last   : Stream_Element_Offset;
-   begin
-      loop
-         Read  (Source, Buffer, Last);
-         Write (Target, Buffer (1 .. Last));
-
-         exit when Last < Buffer'Last;
-      end loop;
-   end Copy_Streams;
-
-   -------------
-   -- Data_In --
-   -------------
-
-   procedure Data_In
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset) is
-   begin
-      Read (File_In, Item, Last);
-   end Data_In;
-
-   --------------
-   -- Data_Out --
-   --------------
-
-   procedure Data_Out (Item : in Stream_Element_Array) is
-   begin
-      Write (File_Out, Item);
-   end Data_Out;
-
-   -------------------
-   -- Generate_File --
-   -------------------
-
-   procedure Generate_File is
-      subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
-
-      package Random_Elements is
-         new Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-      Gen    : Random_Elements.Generator;
-      Buffer : Stream_Element_Array := (1 .. 77 => 16#20#) & 10;
-
-      Buffer_Count : constant Count := File_Size / Buffer'Length;
-      --  Number of same buffers in the packet.
-
-      Density : constant Count := 30; --  from 0 to Buffer'Length - 2;
-
-      procedure Fill_Buffer (J, D : in Count);
-      --  Change the part of the buffer.
-
-      -----------------
-      -- Fill_Buffer --
-      -----------------
-
-      procedure Fill_Buffer (J, D : in Count) is
-      begin
-         for K in 0 .. D loop
-            Buffer
-              (Stream_Element_Offset ((J + K) mod (Buffer'Length - 1) + 1))
-             := Random_Elements.Random (Gen);
-
-         end loop;
-      end Fill_Buffer;
-
-   begin
-      Random_Elements.Reset (Gen, Init_Random);
-
-      Create (File_In, Out_File, In_File_Name);
-
-      Fill_Buffer (1, Buffer'Length - 2);
-
-      for J in 1 .. Buffer_Count loop
-         Write (File_In, Buffer);
-
-         Fill_Buffer (J, Density);
-      end loop;
-
-      --  fill remain size.
-
-      Write
-        (File_In,
-         Buffer
-           (1 .. Stream_Element_Offset
-                   (File_Size - Buffer'Length * Buffer_Count)));
-
-      Flush (File_In);
-      Close (File_In);
-   end Generate_File;
-
-   ---------------------
-   -- Print_Statistic --
-   ---------------------
-
-   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count) is
-      use Ada.Calendar;
-      use Ada.Text_IO;
-
-      package Count_IO is new Integer_IO (ZLib.Count);
-
-      Curr_Dur : Duration := Clock - Time_Stamp;
-   begin
-      Put (Msg);
-
-      Set_Col (20);
-      Ada.Text_IO.Put ("size =");
-
-      Count_IO.Put
-        (Data_Size,
-         Width => Stream_IO.Count'Image (File_Size)'Length);
-
-      Put_Line (" duration =" & Duration'Image (Curr_Dur));
-   end Print_Statistic;
-
-   -----------
-   -- Stamp --
-   -----------
-
-   procedure Stamp is
-   begin
-      Time_Stamp := Ada.Calendar.Clock;
-   end Stamp;
-
-begin
-   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
-
-   loop
-      Generate_File;
-
-      for Level in ZLib.Compression_Level'Range loop
-
-         Ada.Text_IO.Put_Line ("Level ="
-            & ZLib.Compression_Level'Image (Level));
-
-         --  Test generic interface.
-         Open   (File_In, In_File, In_File_Name);
-         Create (File_Out, Out_File, Z_File_Name);
-
-         Stamp;
-
-         --  Deflate using generic instantiation.
-
-         ZLib.Deflate_Init
-               (Filter   => Filter,
-                Level    => Level,
-                Strategy => Strategy,
-                Header   => Header);
-
-         Translate (Filter);
-         Print_Statistic ("Generic compress", ZLib.Total_Out (Filter));
-         ZLib.Close (Filter);
-
-         Close (File_In);
-         Close (File_Out);
-
-         Open   (File_In, In_File, Z_File_Name);
-         Create (File_Out, Out_File, Out_File_Name);
-
-         Stamp;
-
-         --  Inflate using generic instantiation.
-
-         ZLib.Inflate_Init (Filter, Header => Header);
-
-         Translate (Filter);
-         Print_Statistic ("Generic decompress", ZLib.Total_Out (Filter));
-
-         ZLib.Close (Filter);
-
-         Close (File_In);
-         Close (File_Out);
-
-         Compare_Files (In_File_Name, Out_File_Name);
-
-         --  Test stream interface.
-
-         --  Compress to the back stream.
-
-         Open   (File_In, In_File, In_File_Name);
-         Create (File_Back, Out_File, Z_File_Name);
-
-         Stamp;
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.Out_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => True,
-            Level           => Level,
-            Strategy        => Strategy,
-            Header          => Header);
-
-         Copy_Streams
-           (Source => Stream (File_In).all,
-            Target => File_Z);
-
-         --  Flushing internal buffers to the back stream.
-
-         ZLib.Streams.Flush (File_Z, ZLib.Finish);
-
-         Print_Statistic ("Write compress",
-                          ZLib.Streams.Write_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-
-         Close (File_In);
-         Close (File_Back);
-
-         --  Compare reading from original file and from
-         --  decompression stream.
-
-         Open (File_In,   In_File, In_File_Name);
-         Open (File_Back, In_File, Z_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.In_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => True,
-            Header          => Header);
-
-         Stamp;
-         Compare_Streams (Stream (File_In).all, File_Z);
-
-         Print_Statistic ("Read decompress",
-                          ZLib.Streams.Read_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-         Close (File_In);
-         Close (File_Back);
-
-         --  Compress by reading from compression stream.
-
-         Open (File_Back, In_File, In_File_Name);
-         Create (File_Out, Out_File, Z_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.In_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => False,
-            Level           => Level,
-            Strategy        => Strategy,
-            Header          => Header);
-
-         Stamp;
-         Copy_Streams
-           (Source => File_Z,
-            Target => Stream (File_Out).all);
-
-         Print_Statistic ("Read compress",
-                          ZLib.Streams.Read_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-
-         Close (File_Out);
-         Close (File_Back);
-
-         --  Decompress to decompression stream.
-
-         Open   (File_In,   In_File, Z_File_Name);
-         Create (File_Back, Out_File, Out_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.Out_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => False,
-            Header          => Header);
-
-         Stamp;
-
-         Copy_Streams
-           (Source => Stream (File_In).all,
-            Target => File_Z);
-
-         Print_Statistic ("Write decompress",
-                          ZLib.Streams.Write_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-         Close (File_In);
-         Close (File_Back);
-
-         Compare_Files (In_File_Name, Out_File_Name);
-      end loop;
-
-      Ada.Text_IO.Put_Line (Count'Image (File_Size) & " Ok.");
-
-      exit when not Continuous;
-
-      File_Size := File_Size + 1;
-   end loop;
-end Test;

crates/libz-sys/src/zlib/contrib/ada/zlib-streams.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.adb b/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.adb
deleted file mode 100644
index b6497ba..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.adb
+++ /dev/null
@@ -1,225 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $
-
-with Ada.Unchecked_Deallocation;
-
-package body ZLib.Streams is
-
-   -----------
-   -- Close --
-   -----------
-
-   procedure Close (Stream : in out Stream_Type) is
-      procedure Free is new Ada.Unchecked_Deallocation
-         (Stream_Element_Array, Buffer_Access);
-   begin
-      if Stream.Mode = Out_Stream or Stream.Mode = Duplex then
-         --  We should flush the data written by the writer.
-
-         Flush (Stream, Finish);
-
-         Close (Stream.Writer);
-      end if;
-
-      if Stream.Mode = In_Stream or Stream.Mode = Duplex then
-         Close (Stream.Reader);
-         Free (Stream.Buffer);
-      end if;
-   end Close;
-
-   ------------
-   -- Create --
-   ------------
-
-   procedure Create
-     (Stream            :    out Stream_Type;
-      Mode              : in     Stream_Mode;
-      Back              : in     Stream_Access;
-      Back_Compressed   : in     Boolean;
-      Level             : in     Compression_Level := Default_Compression;
-      Strategy          : in     Strategy_Type     := Default_Strategy;
-      Header            : in     Header_Type       := Default;
-      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size;
-      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size)
-   is
-
-      subtype Buffer_Subtype is Stream_Element_Array (1 .. Read_Buffer_Size);
-
-      procedure Init_Filter
-         (Filter   : in out Filter_Type;
-          Compress : in     Boolean);
-
-      -----------------
-      -- Init_Filter --
-      -----------------
-
-      procedure Init_Filter
-         (Filter   : in out Filter_Type;
-          Compress : in     Boolean) is
-      begin
-         if Compress then
-            Deflate_Init
-              (Filter, Level, Strategy, Header => Header);
-         else
-            Inflate_Init (Filter, Header => Header);
-         end if;
-      end Init_Filter;
-
-   begin
-      Stream.Back := Back;
-      Stream.Mode := Mode;
-
-      if Mode = Out_Stream or Mode = Duplex then
-         Init_Filter (Stream.Writer, Back_Compressed);
-         Stream.Buffer_Size := Write_Buffer_Size;
-      else
-         Stream.Buffer_Size := 0;
-      end if;
-
-      if Mode = In_Stream or Mode = Duplex then
-         Init_Filter (Stream.Reader, not Back_Compressed);
-
-         Stream.Buffer     := new Buffer_Subtype;
-         Stream.Rest_First := Stream.Buffer'Last + 1;
-         Stream.Rest_Last  := Stream.Buffer'Last;
-      end if;
-   end Create;
-
-   -----------
-   -- Flush --
-   -----------
-
-   procedure Flush
-     (Stream : in out Stream_Type;
-      Mode   : in     Flush_Mode := Sync_Flush)
-   is
-      Buffer : Stream_Element_Array (1 .. Stream.Buffer_Size);
-      Last   : Stream_Element_Offset;
-   begin
-      loop
-         Flush (Stream.Writer, Buffer, Last, Mode);
-
-         Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last));
-
-         exit when Last < Buffer'Last;
-      end loop;
-   end Flush;
-
-   -------------
-   -- Is_Open --
-   -------------
-
-   function Is_Open (Stream : Stream_Type) return Boolean is
-   begin
-      return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer);
-   end Is_Open;
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Stream : in out Stream_Type;
-      Item   :    out Stream_Element_Array;
-      Last   :    out Stream_Element_Offset)
-   is
-
-      procedure Read
-        (Item : out Stream_Element_Array;
-         Last : out Stream_Element_Offset);
-
-      ----------
-      -- Read --
-      ----------
-
-      procedure Read
-        (Item : out Stream_Element_Array;
-         Last : out Stream_Element_Offset) is
-      begin
-         Ada.Streams.Read (Stream.Back.all, Item, Last);
-      end Read;
-
-      procedure Read is new ZLib.Read
-         (Read       => Read,
-          Buffer     => Stream.Buffer.all,
-          Rest_First => Stream.Rest_First,
-          Rest_Last  => Stream.Rest_Last);
-
-   begin
-      Read (Stream.Reader, Item, Last);
-   end Read;
-
-   -------------------
-   -- Read_Total_In --
-   -------------------
-
-   function Read_Total_In (Stream : in Stream_Type) return Count is
-   begin
-      return Total_In (Stream.Reader);
-   end Read_Total_In;
-
-   --------------------
-   -- Read_Total_Out --
-   --------------------
-
-   function Read_Total_Out (Stream : in Stream_Type) return Count is
-   begin
-      return Total_Out (Stream.Reader);
-   end Read_Total_Out;
-
-   -----------
-   -- Write --
-   -----------
-
-   procedure Write
-     (Stream : in out Stream_Type;
-      Item   : in     Stream_Element_Array)
-   is
-
-      procedure Write (Item : in Stream_Element_Array);
-
-      -----------
-      -- Write --
-      -----------
-
-      procedure Write (Item : in Stream_Element_Array) is
-      begin
-         Ada.Streams.Write (Stream.Back.all, Item);
-      end Write;
-
-      procedure Write is new ZLib.Write
-         (Write       => Write,
-          Buffer_Size => Stream.Buffer_Size);
-
-   begin
-      Write (Stream.Writer, Item, No_Flush);
-   end Write;
-
-   --------------------
-   -- Write_Total_In --
-   --------------------
-
-   function Write_Total_In (Stream : in Stream_Type) return Count is
-   begin
-      return Total_In (Stream.Writer);
-   end Write_Total_In;
-
-   ---------------------
-   -- Write_Total_Out --
-   ---------------------
-
-   function Write_Total_Out (Stream : in Stream_Type) return Count is
-   begin
-      return Total_Out (Stream.Writer);
-   end Write_Total_Out;
-
-end ZLib.Streams;

crates/libz-sys/src/zlib/contrib/ada/zlib-streams.ads

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.ads b/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.ads
deleted file mode 100644
index 8e26cd4..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib-streams.ads
+++ /dev/null
@@ -1,114 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $
-
-package ZLib.Streams is
-
-   type Stream_Mode is (In_Stream, Out_Stream, Duplex);
-
-   type Stream_Access is access all Ada.Streams.Root_Stream_Type'Class;
-
-   type Stream_Type is
-      new Ada.Streams.Root_Stream_Type with private;
-
-   procedure Read
-     (Stream : in out Stream_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset);
-
-   procedure Write
-     (Stream : in out Stream_Type;
-      Item   : in     Ada.Streams.Stream_Element_Array);
-
-   procedure Flush
-     (Stream : in out Stream_Type;
-      Mode   : in     Flush_Mode := Sync_Flush);
-   --  Flush the written data to the back stream,
-   --  all data placed to the compressor is flushing to the Back stream.
-   --  Should not be used until necessary, because it is decreasing
-   --  compression.
-
-   function Read_Total_In (Stream : in Stream_Type) return Count;
-   pragma Inline (Read_Total_In);
-   --  Return total number of bytes read from back stream so far.
-
-   function Read_Total_Out (Stream : in Stream_Type) return Count;
-   pragma Inline (Read_Total_Out);
-   --  Return total number of bytes read so far.
-
-   function Write_Total_In (Stream : in Stream_Type) return Count;
-   pragma Inline (Write_Total_In);
-   --  Return total number of bytes written so far.
-
-   function Write_Total_Out (Stream : in Stream_Type) return Count;
-   pragma Inline (Write_Total_Out);
-   --  Return total number of bytes written to the back stream.
-
-   procedure Create
-     (Stream            :    out Stream_Type;
-      Mode              : in     Stream_Mode;
-      Back              : in     Stream_Access;
-      Back_Compressed   : in     Boolean;
-      Level             : in     Compression_Level := Default_Compression;
-      Strategy          : in     Strategy_Type     := Default_Strategy;
-      Header            : in     Header_Type       := Default;
-      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size;
-      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size);
-   --  Create the Comression/Decompression stream.
-   --  If mode is In_Stream then Write operation is disabled.
-   --  If mode is Out_Stream then Read operation is disabled.
-
-   --  If Back_Compressed is true then
-   --  Data written to the Stream is compressing to the Back stream
-   --  and data read from the Stream is decompressed data from the Back stream.
-
-   --  If Back_Compressed is false then
-   --  Data written to the Stream is decompressing to the Back stream
-   --  and data read from the Stream is compressed data from the Back stream.
-
-   --  !!! When the Need_Header is False ZLib-Ada is using undocumented
-   --  ZLib 1.1.4 functionality to do not create/wait for ZLib headers.
-
-   function Is_Open (Stream : Stream_Type) return Boolean;
-
-   procedure Close (Stream : in out Stream_Type);
-
-private
-
-   use Ada.Streams;
-
-   type Buffer_Access is access all Stream_Element_Array;
-
-   type Stream_Type
-     is new Root_Stream_Type with
-   record
-      Mode       : Stream_Mode;
-
-      Buffer     : Buffer_Access;
-      Rest_First : Stream_Element_Offset;
-      Rest_Last  : Stream_Element_Offset;
-      --  Buffer for Read operation.
-      --  We need to have this buffer in the record
-      --  because not all read data from back stream
-      --  could be processed during the read operation.
-
-      Buffer_Size : Stream_Element_Offset;
-      --  Buffer size for write operation.
-      --  We do not need to have this buffer
-      --  in the record because all data could be
-      --  processed in the write operation.
-
-      Back       : Stream_Access;
-      Reader     : Filter_Type;
-      Writer     : Filter_Type;
-   end record;
-
-end ZLib.Streams;

crates/libz-sys/src/zlib/contrib/ada/zlib-thin.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.adb b/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.adb
deleted file mode 100644
index 0ca4a71..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.adb
+++ /dev/null
@@ -1,141 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $
-
-package body ZLib.Thin is
-
-   ZLIB_VERSION  : constant Chars_Ptr := zlibVersion;
-
-   Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit;
-
-   --------------
-   -- Avail_In --
-   --------------
-
-   function Avail_In (Strm : in Z_Stream) return UInt is
-   begin
-      return Strm.Avail_In;
-   end Avail_In;
-
-   ---------------
-   -- Avail_Out --
-   ---------------
-
-   function Avail_Out (Strm : in Z_Stream) return UInt is
-   begin
-      return Strm.Avail_Out;
-   end Avail_Out;
-
-   ------------------
-   -- Deflate_Init --
-   ------------------
-
-   function Deflate_Init
-     (strm       : Z_Streamp;
-      level      : Int;
-      method     : Int;
-      windowBits : Int;
-      memLevel   : Int;
-      strategy   : Int)
-      return       Int is
-   begin
-      return deflateInit2
-               (strm,
-                level,
-                method,
-                windowBits,
-                memLevel,
-                strategy,
-                ZLIB_VERSION,
-                Z_Stream_Size);
-   end Deflate_Init;
-
-   ------------------
-   -- Inflate_Init --
-   ------------------
-
-   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is
-   begin
-      return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size);
-   end Inflate_Init;
-
-   ------------------------
-   -- Last_Error_Message --
-   ------------------------
-
-   function Last_Error_Message (Strm : in Z_Stream) return String is
-      use Interfaces.C.Strings;
-   begin
-      if Strm.msg = Null_Ptr then
-         return "";
-      else
-         return Value (Strm.msg);
-      end if;
-   end Last_Error_Message;
-
-   ------------
-   -- Set_In --
-   ------------
-
-   procedure Set_In
-     (Strm   : in out Z_Stream;
-      Buffer : in     Voidp;
-      Size   : in     UInt) is
-   begin
-      Strm.Next_In  := Buffer;
-      Strm.Avail_In := Size;
-   end Set_In;
-
-   ------------------
-   -- Set_Mem_Func --
-   ------------------
-
-   procedure Set_Mem_Func
-     (Strm   : in out Z_Stream;
-      Opaque : in     Voidp;
-      Alloc  : in     alloc_func;
-      Free   : in     free_func) is
-   begin
-      Strm.opaque := Opaque;
-      Strm.zalloc := Alloc;
-      Strm.zfree  := Free;
-   end Set_Mem_Func;
-
-   -------------
-   -- Set_Out --
-   -------------
-
-   procedure Set_Out
-     (Strm   : in out Z_Stream;
-      Buffer : in     Voidp;
-      Size   : in     UInt) is
-   begin
-      Strm.Next_Out  := Buffer;
-      Strm.Avail_Out := Size;
-   end Set_Out;
-
-   --------------
-   -- Total_In --
-   --------------
-
-   function Total_In (Strm : in Z_Stream) return ULong is
-   begin
-      return Strm.Total_In;
-   end Total_In;
-
-   ---------------
-   -- Total_Out --
-   ---------------
-
-   function Total_Out (Strm : in Z_Stream) return ULong is
-   begin
-      return Strm.Total_Out;
-   end Total_Out;
-
-end ZLib.Thin;

crates/libz-sys/src/zlib/contrib/ada/zlib-thin.ads

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.ads b/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.ads
deleted file mode 100644
index 810173c..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib-thin.ads
+++ /dev/null
@@ -1,450 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $
-
-with Interfaces.C.Strings;
-
-with System;
-
-private package ZLib.Thin is
-
-   --  From zconf.h
-
-   MAX_MEM_LEVEL : constant := 9;         --  zconf.h:105
-                                          --  zconf.h:105
-   MAX_WBITS : constant := 15;      --  zconf.h:115
-                                    --  32K LZ77 window
-                                    --  zconf.h:115
-   SEEK_SET : constant := 8#0000#;  --  zconf.h:244
-                                    --  Seek from beginning of file.
-                                    --  zconf.h:244
-   SEEK_CUR : constant := 1;        --  zconf.h:245
-                                    --  Seek from current position.
-                                    --  zconf.h:245
-   SEEK_END : constant := 2;        --  zconf.h:246
-                                    --  Set file pointer to EOF plus "offset"
-                                    --  zconf.h:246
-
-   type Byte is new Interfaces.C.unsigned_char; --  8 bits
-                                                --  zconf.h:214
-   type UInt is new Interfaces.C.unsigned;      --  16 bits or more
-                                                --  zconf.h:216
-   type Int is new Interfaces.C.int;
-
-   type ULong is new Interfaces.C.unsigned_long;     --  32 bits or more
-                                                     --  zconf.h:217
-   subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr;
-
-   type ULong_Access is access ULong;
-   type Int_Access is access Int;
-
-   subtype Voidp is System.Address;            --  zconf.h:232
-
-   subtype Byte_Access is Voidp;
-
-   Nul : constant Voidp := System.Null_Address;
-   --  end from zconf
-
-   Z_NO_FLUSH : constant := 8#0000#;   --  zlib.h:125
-                                       --  zlib.h:125
-   Z_PARTIAL_FLUSH : constant := 1;       --  zlib.h:126
-                                          --  will be removed, use
-                                          --  Z_SYNC_FLUSH instead
-                                          --  zlib.h:126
-   Z_SYNC_FLUSH : constant := 2;       --  zlib.h:127
-                                       --  zlib.h:127
-   Z_FULL_FLUSH : constant := 3;       --  zlib.h:128
-                                       --  zlib.h:128
-   Z_FINISH : constant := 4;        --  zlib.h:129
-                                    --  zlib.h:129
-   Z_OK : constant := 8#0000#;   --  zlib.h:132
-                                 --  zlib.h:132
-   Z_STREAM_END : constant := 1;       --  zlib.h:133
-                                       --  zlib.h:133
-   Z_NEED_DICT : constant := 2;        --  zlib.h:134
-                                       --  zlib.h:134
-   Z_ERRNO : constant := -1;        --  zlib.h:135
-                                    --  zlib.h:135
-   Z_STREAM_ERROR : constant := -2;       --  zlib.h:136
-                                          --  zlib.h:136
-   Z_DATA_ERROR : constant := -3;      --  zlib.h:137
-                                       --  zlib.h:137
-   Z_MEM_ERROR : constant := -4;       --  zlib.h:138
-                                       --  zlib.h:138
-   Z_BUF_ERROR : constant := -5;       --  zlib.h:139
-                                       --  zlib.h:139
-   Z_VERSION_ERROR : constant := -6;      --  zlib.h:140
-                                          --  zlib.h:140
-   Z_NO_COMPRESSION : constant := 8#0000#;   --  zlib.h:145
-                                             --  zlib.h:145
-   Z_BEST_SPEED : constant := 1;       --  zlib.h:146
-                                       --  zlib.h:146
-   Z_BEST_COMPRESSION : constant := 9;       --  zlib.h:147
-                                             --  zlib.h:147
-   Z_DEFAULT_COMPRESSION : constant := -1;      --  zlib.h:148
-                                                --  zlib.h:148
-   Z_FILTERED : constant := 1;      --  zlib.h:151
-                                    --  zlib.h:151
-   Z_HUFFMAN_ONLY : constant := 2;        --  zlib.h:152
-                                          --  zlib.h:152
-   Z_DEFAULT_STRATEGY : constant := 8#0000#; --  zlib.h:153
-                                             --  zlib.h:153
-   Z_BINARY : constant := 8#0000#;  --  zlib.h:156
-                                    --  zlib.h:156
-   Z_ASCII : constant := 1;      --  zlib.h:157
-                                 --  zlib.h:157
-   Z_UNKNOWN : constant := 2;       --  zlib.h:158
-                                    --  zlib.h:158
-   Z_DEFLATED : constant := 8;      --  zlib.h:161
-                                    --  zlib.h:161
-   Z_NULL : constant := 8#0000#; --  zlib.h:164
-                                 --  for initializing zalloc, zfree, opaque
-                                 --  zlib.h:164
-   type gzFile is new Voidp;                  --  zlib.h:646
-
-   type Z_Stream is private;
-
-   type Z_Streamp is access all Z_Stream;     --  zlib.h:89
-
-   type alloc_func is access function
-     (Opaque : Voidp;
-      Items  : UInt;
-      Size   : UInt)
-      return Voidp; --  zlib.h:63
-
-   type free_func is access procedure (opaque : Voidp; address : Voidp);
-
-   function zlibVersion return Chars_Ptr;
-
-   function Deflate (strm : Z_Streamp; flush : Int) return Int;
-
-   function DeflateEnd (strm : Z_Streamp) return Int;
-
-   function Inflate (strm : Z_Streamp; flush : Int) return Int;
-
-   function InflateEnd (strm : Z_Streamp) return Int;
-
-   function deflateSetDictionary
-     (strm       : Z_Streamp;
-      dictionary : Byte_Access;
-      dictLength : UInt)
-      return       Int;
-
-   function deflateCopy (dest : Z_Streamp; source : Z_Streamp) return Int;
-   --  zlib.h:478
-
-   function deflateReset (strm : Z_Streamp) return Int; -- zlib.h:495
-
-   function deflateParams
-     (strm     : Z_Streamp;
-      level    : Int;
-      strategy : Int)
-      return     Int;       -- zlib.h:506
-
-   function inflateSetDictionary
-     (strm       : Z_Streamp;
-      dictionary : Byte_Access;
-      dictLength : UInt)
-      return       Int; --  zlib.h:548
-
-   function inflateSync (strm : Z_Streamp) return Int;  --  zlib.h:565
-
-   function inflateReset (strm : Z_Streamp) return Int; --  zlib.h:580
-
-   function compress
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong)
-      return      Int;           -- zlib.h:601
-
-   function compress2
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong;
-      level     : Int)
-      return      Int;          -- zlib.h:615
-
-   function uncompress
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong)
-      return      Int;
-
-   function gzopen (path : Chars_Ptr; mode : Chars_Ptr) return gzFile;
-
-   function gzdopen (fd : Int; mode : Chars_Ptr) return gzFile;
-
-   function gzsetparams
-     (file     : gzFile;
-      level    : Int;
-      strategy : Int)
-      return     Int;
-
-   function gzread
-     (file : gzFile;
-      buf  : Voidp;
-      len  : UInt)
-      return Int;
-
-   function gzwrite
-     (file : in gzFile;
-      buf  : in Voidp;
-      len  : in UInt)
-      return Int;
-
-   function gzprintf (file : in gzFile; format : in Chars_Ptr) return Int;
-
-   function gzputs (file : in gzFile; s : in Chars_Ptr) return Int;
-
-   function gzgets
-     (file : gzFile;
-      buf  : Chars_Ptr;
-      len  : Int)
-      return Chars_Ptr;
-
-   function gzputc (file : gzFile; char : Int) return Int;
-
-   function gzgetc (file : gzFile) return Int;
-
-   function gzflush (file : gzFile; flush : Int) return Int;
-
-   function gzseek
-     (file   : gzFile;
-      offset : Int;
-      whence : Int)
-      return   Int;
-
-   function gzrewind (file : gzFile) return Int;
-
-   function gztell (file : gzFile) return Int;
-
-   function gzeof (file : gzFile) return Int;
-
-   function gzclose (file : gzFile) return Int;
-
-   function gzerror (file : gzFile; errnum : Int_Access) return Chars_Ptr;
-
-   function adler32
-     (adler : ULong;
-      buf   : Byte_Access;
-      len   : UInt)
-      return  ULong;
-
-   function crc32
-     (crc  : ULong;
-      buf  : Byte_Access;
-      len  : UInt)
-      return ULong;
-
-   function deflateInit
-     (strm        : Z_Streamp;
-      level       : Int;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function deflateInit2
-     (strm        : Z_Streamp;
-      level       : Int;
-      method      : Int;
-      windowBits  : Int;
-      memLevel    : Int;
-      strategy    : Int;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function Deflate_Init
-     (strm       : Z_Streamp;
-      level      : Int;
-      method     : Int;
-      windowBits : Int;
-      memLevel   : Int;
-      strategy   : Int)
-      return       Int;
-   pragma Inline (Deflate_Init);
-
-   function inflateInit
-     (strm        : Z_Streamp;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function inflateInit2
-     (strm        : in Z_Streamp;
-      windowBits  : in Int;
-      version     : in Chars_Ptr;
-      stream_size : in Int)
-      return      Int;
-
-   function inflateBackInit
-     (strm        : in Z_Streamp;
-      windowBits  : in Int;
-      window      : in Byte_Access;
-      version     : in Chars_Ptr;
-      stream_size : in Int)
-      return      Int;
-   --  Size of window have to be 2**windowBits.
-
-   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int;
-   pragma Inline (Inflate_Init);
-
-   function zError (err : Int) return Chars_Ptr;
-
-   function inflateSyncPoint (z : Z_Streamp) return Int;
-
-   function get_crc_table return ULong_Access;
-
-   --  Interface to the available fields of the z_stream structure.
-   --  The application must update next_in and avail_in when avail_in has
-   --  dropped to zero. It must update next_out and avail_out when avail_out
-   --  has dropped to zero. The application must initialize zalloc, zfree and
-   --  opaque before calling the init function.
-
-   procedure Set_In
-     (Strm   : in out Z_Stream;
-      Buffer : in Voidp;
-      Size   : in UInt);
-   pragma Inline (Set_In);
-
-   procedure Set_Out
-     (Strm   : in out Z_Stream;
-      Buffer : in Voidp;
-      Size   : in UInt);
-   pragma Inline (Set_Out);
-
-   procedure Set_Mem_Func
-     (Strm   : in out Z_Stream;
-      Opaque : in Voidp;
-      Alloc  : in alloc_func;
-      Free   : in free_func);
-   pragma Inline (Set_Mem_Func);
-
-   function Last_Error_Message (Strm : in Z_Stream) return String;
-   pragma Inline (Last_Error_Message);
-
-   function Avail_Out (Strm : in Z_Stream) return UInt;
-   pragma Inline (Avail_Out);
-
-   function Avail_In (Strm : in Z_Stream) return UInt;
-   pragma Inline (Avail_In);
-
-   function Total_In (Strm : in Z_Stream) return ULong;
-   pragma Inline (Total_In);
-
-   function Total_Out (Strm : in Z_Stream) return ULong;
-   pragma Inline (Total_Out);
-
-   function inflateCopy
-     (dest   : in Z_Streamp;
-      Source : in Z_Streamp)
-      return Int;
-
-   function compressBound (Source_Len : in ULong) return ULong;
-
-   function deflateBound
-     (Strm       : in Z_Streamp;
-      Source_Len : in ULong)
-      return     ULong;
-
-   function gzungetc (C : in Int; File : in  gzFile) return Int;
-
-   function zlibCompileFlags return ULong;
-
-private
-
-   type Z_Stream is record            -- zlib.h:68
-      Next_In   : Voidp      := Nul;  -- next input byte
-      Avail_In  : UInt       := 0;    -- number of bytes available at next_in
-      Total_In  : ULong      := 0;    -- total nb of input bytes read so far
-      Next_Out  : Voidp      := Nul;  -- next output byte should be put there
-      Avail_Out : UInt       := 0;    -- remaining free space at next_out
-      Total_Out : ULong      := 0;    -- total nb of bytes output so far
-      msg       : Chars_Ptr;          -- last error message, NULL if no error
-      state     : Voidp;              -- not visible by applications
-      zalloc    : alloc_func := null; -- used to allocate the internal state
-      zfree     : free_func  := null; -- used to free the internal state
-      opaque    : Voidp;              -- private data object passed to
-                                      --  zalloc and zfree
-      data_type : Int;                -- best guess about the data type:
-                                      --  ascii or binary
-      adler     : ULong;              -- adler32 value of the uncompressed
-                                      --  data
-      reserved  : ULong;              -- reserved for future use
-   end record;
-
-   pragma Convention (C, Z_Stream);
-
-   pragma Import (C, zlibVersion, "zlibVersion");
-   pragma Import (C, Deflate, "deflate");
-   pragma Import (C, DeflateEnd, "deflateEnd");
-   pragma Import (C, Inflate, "inflate");
-   pragma Import (C, InflateEnd, "inflateEnd");
-   pragma Import (C, deflateSetDictionary, "deflateSetDictionary");
-   pragma Import (C, deflateCopy, "deflateCopy");
-   pragma Import (C, deflateReset, "deflateReset");
-   pragma Import (C, deflateParams, "deflateParams");
-   pragma Import (C, inflateSetDictionary, "inflateSetDictionary");
-   pragma Import (C, inflateSync, "inflateSync");
-   pragma Import (C, inflateReset, "inflateReset");
-   pragma Import (C, compress, "compress");
-   pragma Import (C, compress2, "compress2");
-   pragma Import (C, uncompress, "uncompress");
-   pragma Import (C, gzopen, "gzopen");
-   pragma Import (C, gzdopen, "gzdopen");
-   pragma Import (C, gzsetparams, "gzsetparams");
-   pragma Import (C, gzread, "gzread");
-   pragma Import (C, gzwrite, "gzwrite");
-   pragma Import (C, gzprintf, "gzprintf");
-   pragma Import (C, gzputs, "gzputs");
-   pragma Import (C, gzgets, "gzgets");
-   pragma Import (C, gzputc, "gzputc");
-   pragma Import (C, gzgetc, "gzgetc");
-   pragma Import (C, gzflush, "gzflush");
-   pragma Import (C, gzseek, "gzseek");
-   pragma Import (C, gzrewind, "gzrewind");
-   pragma Import (C, gztell, "gztell");
-   pragma Import (C, gzeof, "gzeof");
-   pragma Import (C, gzclose, "gzclose");
-   pragma Import (C, gzerror, "gzerror");
-   pragma Import (C, adler32, "adler32");
-   pragma Import (C, crc32, "crc32");
-   pragma Import (C, deflateInit, "deflateInit_");
-   pragma Import (C, inflateInit, "inflateInit_");
-   pragma Import (C, deflateInit2, "deflateInit2_");
-   pragma Import (C, inflateInit2, "inflateInit2_");
-   pragma Import (C, zError, "zError");
-   pragma Import (C, inflateSyncPoint, "inflateSyncPoint");
-   pragma Import (C, get_crc_table, "get_crc_table");
-
-   --  since zlib 1.2.0:
-
-   pragma Import (C, inflateCopy, "inflateCopy");
-   pragma Import (C, compressBound, "compressBound");
-   pragma Import (C, deflateBound, "deflateBound");
-   pragma Import (C, gzungetc, "gzungetc");
-   pragma Import (C, zlibCompileFlags, "zlibCompileFlags");
-
-   pragma Import (C, inflateBackInit, "inflateBackInit_");
-
-   --  I stopped binding the inflateBack routines, because realize that
-   --  it does not support zlib and gzip headers for now, and have no
-   --  symmetric deflateBack routines.
-   --  ZLib-Ada is symmetric regarding deflate/inflate data transformation
-   --  and has a similar generic callback interface for the
-   --  deflate/inflate transformation based on the regular Deflate/Inflate
-   --  routines.
-
-   --  pragma Import (C, inflateBack, "inflateBack");
-   --  pragma Import (C, inflateBackEnd, "inflateBackEnd");
-
-end ZLib.Thin;

crates/libz-sys/src/zlib/contrib/ada/zlib.adb

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib.adb b/crates/libz-sys/src/zlib/contrib/ada/zlib.adb
deleted file mode 100644
index 8b6fd68..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib.adb
+++ /dev/null
@@ -1,701 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $
-
-with Ada.Exceptions;
-with Ada.Unchecked_Conversion;
-with Ada.Unchecked_Deallocation;
-
-with Interfaces.C.Strings;
-
-with ZLib.Thin;
-
-package body ZLib is
-
-   use type Thin.Int;
-
-   type Z_Stream is new Thin.Z_Stream;
-
-   type Return_Code_Enum is
-      (OK,
-       STREAM_END,
-       NEED_DICT,
-       ERRNO,
-       STREAM_ERROR,
-       DATA_ERROR,
-       MEM_ERROR,
-       BUF_ERROR,
-       VERSION_ERROR);
-
-   type Flate_Step_Function is access
-     function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int;
-   pragma Convention (C, Flate_Step_Function);
-
-   type Flate_End_Function is access
-      function (Ctrm : in Thin.Z_Streamp) return Thin.Int;
-   pragma Convention (C, Flate_End_Function);
-
-   type Flate_Type is record
-      Step : Flate_Step_Function;
-      Done : Flate_End_Function;
-   end record;
-
-   subtype Footer_Array is Stream_Element_Array (1 .. 8);
-
-   Simple_GZip_Header : constant Stream_Element_Array (1 .. 10)
-     := (16#1f#, 16#8b#,                 --  Magic header
-         16#08#,                         --  Z_DEFLATED
-         16#00#,                         --  Flags
-         16#00#, 16#00#, 16#00#, 16#00#, --  Time
-         16#00#,                         --  XFlags
-         16#03#                          --  OS code
-        );
-   --  The simplest gzip header is not for informational, but just for
-   --  gzip format compatibility.
-   --  Note that some code below is using assumption
-   --  Simple_GZip_Header'Last > Footer_Array'Last, so do not make
-   --  Simple_GZip_Header'Last <= Footer_Array'Last.
-
-   Return_Code : constant array (Thin.Int range <>) of Return_Code_Enum
-     := (0 => OK,
-         1 => STREAM_END,
-         2 => NEED_DICT,
-        -1 => ERRNO,
-        -2 => STREAM_ERROR,
-        -3 => DATA_ERROR,
-        -4 => MEM_ERROR,
-        -5 => BUF_ERROR,
-        -6 => VERSION_ERROR);
-
-   Flate : constant array (Boolean) of Flate_Type
-     := (True  => (Step => Thin.Deflate'Access,
-                   Done => Thin.DeflateEnd'Access),
-         False => (Step => Thin.Inflate'Access,
-                   Done => Thin.InflateEnd'Access));
-
-   Flush_Finish : constant array (Boolean) of Flush_Mode
-     := (True => Finish, False => No_Flush);
-
-   procedure Raise_Error (Stream : in Z_Stream);
-   pragma Inline (Raise_Error);
-
-   procedure Raise_Error (Message : in String);
-   pragma Inline (Raise_Error);
-
-   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int);
-
-   procedure Free is new Ada.Unchecked_Deallocation
-      (Z_Stream, Z_Stream_Access);
-
-   function To_Thin_Access is new Ada.Unchecked_Conversion
-     (Z_Stream_Access, Thin.Z_Streamp);
-
-   procedure Translate_GZip
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  Separate translate routine for make gzip header.
-
-   procedure Translate_Auto
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  translate routine without additional headers.
-
-   -----------------
-   -- Check_Error --
-   -----------------
-
-   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is
-      use type Thin.Int;
-   begin
-      if Code /= Thin.Z_OK then
-         Raise_Error
-            (Return_Code_Enum'Image (Return_Code (Code))
-              & ": " & Last_Error_Message (Stream));
-      end if;
-   end Check_Error;
-
-   -----------
-   -- Close --
-   -----------
-
-   procedure Close
-     (Filter       : in out Filter_Type;
-      Ignore_Error : in     Boolean := False)
-   is
-      Code : Thin.Int;
-   begin
-      if not Ignore_Error and then not Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm));
-
-      if Ignore_Error or else Code = Thin.Z_OK then
-         Free (Filter.Strm);
-      else
-         declare
-            Error_Message : constant String
-              := Last_Error_Message (Filter.Strm.all);
-         begin
-            Free (Filter.Strm);
-            Ada.Exceptions.Raise_Exception
-               (ZLib_Error'Identity,
-                Return_Code_Enum'Image (Return_Code (Code))
-                  & ": " & Error_Message);
-         end;
-      end if;
-   end Close;
-
-   -----------
-   -- CRC32 --
-   -----------
-
-   function CRC32
-     (CRC  : in Unsigned_32;
-      Data : in Ada.Streams.Stream_Element_Array)
-      return Unsigned_32
-   is
-      use Thin;
-   begin
-      return Unsigned_32 (crc32 (ULong (CRC),
-                                 Data'Address,
-                                 Data'Length));
-   end CRC32;
-
-   procedure CRC32
-     (CRC  : in out Unsigned_32;
-      Data : in     Ada.Streams.Stream_Element_Array) is
-   begin
-      CRC := CRC32 (CRC, Data);
-   end CRC32;
-
-   ------------------
-   -- Deflate_Init --
-   ------------------
-
-   procedure Deflate_Init
-     (Filter       : in out Filter_Type;
-      Level        : in     Compression_Level  := Default_Compression;
-      Strategy     : in     Strategy_Type      := Default_Strategy;
-      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
-      Header       : in     Header_Type        := Default)
-   is
-      use type Thin.Int;
-      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
-   begin
-      if Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      --  We allow ZLib to make header only in case of default header type.
-      --  Otherwise we would either do header by ourselfs, or do not do
-      --  header at all.
-
-      if Header = None or else Header = GZip then
-         Win_Bits := -Win_Bits;
-      end if;
-
-      --  For the GZip CRC calculation and make headers.
-
-      if Header = GZip then
-         Filter.CRC    := 0;
-         Filter.Offset := Simple_GZip_Header'First;
-      else
-         Filter.Offset := Simple_GZip_Header'Last + 1;
-      end if;
-
-      Filter.Strm        := new Z_Stream;
-      Filter.Compression := True;
-      Filter.Stream_End  := False;
-      Filter.Header      := Header;
-
-      if Thin.Deflate_Init
-           (To_Thin_Access (Filter.Strm),
-            Level      => Thin.Int (Level),
-            method     => Thin.Int (Method),
-            windowBits => Win_Bits,
-            memLevel   => Thin.Int (Memory_Level),
-            strategy   => Thin.Int (Strategy)) /= Thin.Z_OK
-      then
-         Raise_Error (Filter.Strm.all);
-      end if;
-   end Deflate_Init;
-
-   -----------
-   -- Flush --
-   -----------
-
-   procedure Flush
-     (Filter    : in out Filter_Type;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      No_Data : Stream_Element_Array := (1 .. 0 => 0);
-      Last    : Stream_Element_Offset;
-   begin
-      Translate (Filter, No_Data, Last, Out_Data, Out_Last, Flush);
-   end Flush;
-
-   -----------------------
-   -- Generic_Translate --
-   -----------------------
-
-   procedure Generic_Translate
-     (Filter          : in out ZLib.Filter_Type;
-      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
-      Out_Buffer_Size : in     Integer := Default_Buffer_Size)
-   is
-      In_Buffer  : Stream_Element_Array
-                     (1 .. Stream_Element_Offset (In_Buffer_Size));
-      Out_Buffer : Stream_Element_Array
-                     (1 .. Stream_Element_Offset (Out_Buffer_Size));
-      Last       : Stream_Element_Offset;
-      In_Last    : Stream_Element_Offset;
-      In_First   : Stream_Element_Offset;
-      Out_Last   : Stream_Element_Offset;
-   begin
-      Main : loop
-         Data_In (In_Buffer, Last);
-
-         In_First := In_Buffer'First;
-
-         loop
-            Translate
-              (Filter   => Filter,
-               In_Data  => In_Buffer (In_First .. Last),
-               In_Last  => In_Last,
-               Out_Data => Out_Buffer,
-               Out_Last => Out_Last,
-               Flush    => Flush_Finish (Last < In_Buffer'First));
-
-            if Out_Buffer'First <= Out_Last then
-               Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last));
-            end if;
-
-            exit Main when Stream_End (Filter);
-
-            --  The end of in buffer.
-
-            exit when In_Last = Last;
-
-            In_First := In_Last + 1;
-         end loop;
-      end loop Main;
-
-   end Generic_Translate;
-
-   ------------------
-   -- Inflate_Init --
-   ------------------
-
-   procedure Inflate_Init
-     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
-      Header      : in     Header_Type      := Default)
-   is
-      use type Thin.Int;
-      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
-
-      procedure Check_Version;
-      --  Check the latest header types compatibility.
-
-      procedure Check_Version is
-      begin
-         if Version <= "1.1.4" then
-            Raise_Error
-              ("Inflate header type " & Header_Type'Image (Header)
-               & " incompatible with ZLib version " & Version);
-         end if;
-      end Check_Version;
-
-   begin
-      if Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      case Header is
-         when None =>
-            Check_Version;
-
-            --  Inflate data without headers determined
-            --  by negative Win_Bits.
-
-            Win_Bits := -Win_Bits;
-         when GZip =>
-            Check_Version;
-
-            --  Inflate gzip data defined by flag 16.
-
-            Win_Bits := Win_Bits + 16;
-         when Auto =>
-            Check_Version;
-
-            --  Inflate with automatic detection
-            --  of gzip or native header defined by flag 32.
-
-            Win_Bits := Win_Bits + 32;
-         when Default => null;
-      end case;
-
-      Filter.Strm        := new Z_Stream;
-      Filter.Compression := False;
-      Filter.Stream_End  := False;
-      Filter.Header      := Header;
-
-      if Thin.Inflate_Init
-         (To_Thin_Access (Filter.Strm), Win_Bits) /= Thin.Z_OK
-      then
-         Raise_Error (Filter.Strm.all);
-      end if;
-   end Inflate_Init;
-
-   -------------
-   -- Is_Open --
-   -------------
-
-   function Is_Open (Filter : in Filter_Type) return Boolean is
-   begin
-      return Filter.Strm /= null;
-   end Is_Open;
-
-   -----------------
-   -- Raise_Error --
-   -----------------
-
-   procedure Raise_Error (Message : in String) is
-   begin
-      Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message);
-   end Raise_Error;
-
-   procedure Raise_Error (Stream : in Z_Stream) is
-   begin
-      Raise_Error (Last_Error_Message (Stream));
-   end Raise_Error;
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Filter : in out Filter_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset;
-      Flush  : in     Flush_Mode := No_Flush)
-   is
-      In_Last    : Stream_Element_Offset;
-      Item_First : Ada.Streams.Stream_Element_Offset := Item'First;
-      V_Flush    : Flush_Mode := Flush;
-
-   begin
-      pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1);
-      pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last);
-
-      loop
-         if Rest_Last = Buffer'First - 1 then
-            V_Flush := Finish;
-
-         elsif Rest_First > Rest_Last then
-            Read (Buffer, Rest_Last);
-            Rest_First := Buffer'First;
-
-            if Rest_Last < Buffer'First then
-               V_Flush := Finish;
-            end if;
-         end if;
-
-         Translate
-           (Filter   => Filter,
-            In_Data  => Buffer (Rest_First .. Rest_Last),
-            In_Last  => In_Last,
-            Out_Data => Item (Item_First .. Item'Last),
-            Out_Last => Last,
-            Flush    => V_Flush);
-
-         Rest_First := In_Last + 1;
-
-         exit when Stream_End (Filter)
-           or else Last = Item'Last
-           or else (Last >= Item'First and then Allow_Read_Some);
-
-         Item_First := Last + 1;
-      end loop;
-   end Read;
-
-   ----------------
-   -- Stream_End --
-   ----------------
-
-   function Stream_End (Filter : in Filter_Type) return Boolean is
-   begin
-      if Filter.Header = GZip and Filter.Compression then
-         return Filter.Stream_End
-            and then Filter.Offset = Footer_Array'Last + 1;
-      else
-         return Filter.Stream_End;
-      end if;
-   end Stream_End;
-
-   --------------
-   -- Total_In --
-   --------------
-
-   function Total_In (Filter : in Filter_Type) return Count is
-   begin
-      return Count (Thin.Total_In (To_Thin_Access (Filter.Strm).all));
-   end Total_In;
-
-   ---------------
-   -- Total_Out --
-   ---------------
-
-   function Total_Out (Filter : in Filter_Type) return Count is
-   begin
-      return Count (Thin.Total_Out (To_Thin_Access (Filter.Strm).all));
-   end Total_Out;
-
-   ---------------
-   -- Translate --
-   ---------------
-
-   procedure Translate
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode) is
-   begin
-      if Filter.Header = GZip and then Filter.Compression then
-         Translate_GZip
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-      else
-         Translate_Auto
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-      end if;
-   end Translate;
-
-   --------------------
-   -- Translate_Auto --
-   --------------------
-
-   procedure Translate_Auto
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      use type Thin.Int;
-      Code : Thin.Int;
-
-   begin
-      if not Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      if Out_Data'Length = 0 and then In_Data'Length = 0 then
-         raise Constraint_Error;
-      end if;
-
-      Set_Out (Filter.Strm.all, Out_Data'Address, Out_Data'Length);
-      Set_In  (Filter.Strm.all, In_Data'Address, In_Data'Length);
-
-      Code := Flate (Filter.Compression).Step
-        (To_Thin_Access (Filter.Strm),
-         Thin.Int (Flush));
-
-      if Code = Thin.Z_STREAM_END then
-         Filter.Stream_End := True;
-      else
-         Check_Error (Filter.Strm.all, Code);
-      end if;
-
-      In_Last  := In_Data'Last
-         - Stream_Element_Offset (Avail_In (Filter.Strm.all));
-      Out_Last := Out_Data'Last
-         - Stream_Element_Offset (Avail_Out (Filter.Strm.all));
-   end Translate_Auto;
-
-   --------------------
-   -- Translate_GZip --
-   --------------------
-
-   procedure Translate_GZip
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      Out_First : Stream_Element_Offset;
-
-      procedure Add_Data (Data : in Stream_Element_Array);
-      --  Add data to stream from the Filter.Offset till necessary,
-      --  used for add gzip headr/footer.
-
-      procedure Put_32
-        (Item : in out Stream_Element_Array;
-         Data : in     Unsigned_32);
-      pragma Inline (Put_32);
-
-      --------------
-      -- Add_Data --
-      --------------
-
-      procedure Add_Data (Data : in Stream_Element_Array) is
-         Data_First : Stream_Element_Offset renames Filter.Offset;
-         Data_Last  : Stream_Element_Offset;
-         Data_Len   : Stream_Element_Offset; --  -1
-         Out_Len    : Stream_Element_Offset; --  -1
-      begin
-         Out_First := Out_Last + 1;
-
-         if Data_First > Data'Last then
-            return;
-         end if;
-
-         Data_Len  := Data'Last     - Data_First;
-         Out_Len   := Out_Data'Last - Out_First;
-
-         if Data_Len <= Out_Len then
-            Out_Last  := Out_First  + Data_Len;
-            Data_Last := Data'Last;
-         else
-            Out_Last  := Out_Data'Last;
-            Data_Last := Data_First + Out_Len;
-         end if;
-
-         Out_Data (Out_First .. Out_Last) := Data (Data_First .. Data_Last);
-
-         Data_First := Data_Last + 1;
-         Out_First  := Out_Last + 1;
-      end Add_Data;
-
-      ------------
-      -- Put_32 --
-      ------------
-
-      procedure Put_32
-        (Item : in out Stream_Element_Array;
-         Data : in     Unsigned_32)
-      is
-         D : Unsigned_32 := Data;
-      begin
-         for J in Item'First .. Item'First + 3 loop
-            Item (J) := Stream_Element (D and 16#FF#);
-            D := Shift_Right (D, 8);
-         end loop;
-      end Put_32;
-
-   begin
-      Out_Last := Out_Data'First - 1;
-
-      if not Filter.Stream_End then
-         Add_Data (Simple_GZip_Header);
-
-         Translate_Auto
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data (Out_First .. Out_Data'Last),
-            Out_Last => Out_Last,
-            Flush    => Flush);
-
-         CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last));
-      end if;
-
-      if Filter.Stream_End and then Out_Last <= Out_Data'Last then
-         --  This detection method would work only when
-         --  Simple_GZip_Header'Last > Footer_Array'Last
-
-         if Filter.Offset = Simple_GZip_Header'Last + 1 then
-            Filter.Offset := Footer_Array'First;
-         end if;
-
-         declare
-            Footer : Footer_Array;
-         begin
-            Put_32 (Footer, Filter.CRC);
-            Put_32 (Footer (Footer'First + 4 .. Footer'Last),
-                    Unsigned_32 (Total_In (Filter)));
-            Add_Data (Footer);
-         end;
-      end if;
-   end Translate_GZip;
-
-   -------------
-   -- Version --
-   -------------
-
-   function Version return String is
-   begin
-      return Interfaces.C.Strings.Value (Thin.zlibVersion);
-   end Version;
-
-   -----------
-   -- Write --
-   -----------
-
-   procedure Write
-     (Filter : in out Filter_Type;
-      Item   : in     Ada.Streams.Stream_Element_Array;
-      Flush  : in     Flush_Mode := No_Flush)
-   is
-      Buffer   : Stream_Element_Array (1 .. Buffer_Size);
-      In_Last  : Stream_Element_Offset;
-      Out_Last : Stream_Element_Offset;
-      In_First : Stream_Element_Offset := Item'First;
-   begin
-      if Item'Length = 0 and Flush = No_Flush then
-         return;
-      end if;
-
-      loop
-         Translate
-           (Filter   => Filter,
-            In_Data  => Item (In_First .. Item'Last),
-            In_Last  => In_Last,
-            Out_Data => Buffer,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-
-         if Out_Last >= Buffer'First then
-            Write (Buffer (1 .. Out_Last));
-         end if;
-
-         exit when In_Last = Item'Last or Stream_End (Filter);
-
-         In_First := In_Last + 1;
-      end loop;
-   end Write;
-
-end ZLib;

crates/libz-sys/src/zlib/contrib/ada/zlib.ads

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib.ads b/crates/libz-sys/src/zlib/contrib/ada/zlib.ads
deleted file mode 100644
index 79ffc40..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib.ads
+++ /dev/null
@@ -1,328 +0,0 @@
-------------------------------------------------------------------------------
---                      ZLib for Ada thick binding.                         --
---                                                                          --
---              Copyright (C) 2002-2004 Dmitriy Anisimkov                   --
---                                                                          --
---  This library is free software; you can redistribute it and/or modify    --
---  it under the terms of the GNU General Public License as published by    --
---  the Free Software Foundation; either version 2 of the License, or (at   --
---  your option) any later version.                                         --
---                                                                          --
---  This library is distributed in the hope that it will be useful, but     --
---  WITHOUT ANY WARRANTY; without even the implied warranty of              --
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       --
---  General Public License for more details.                                --
---                                                                          --
---  You should have received a copy of the GNU General Public License       --
---  along with this library; if not, write to the Free Software Foundation, --
---  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.          --
---                                                                          --
---  As a special exception, if other files instantiate generics from this   --
---  unit, or you link this unit with other files to produce an executable,  --
---  this  unit  does not  by itself cause  the resulting executable to be   --
---  covered by the GNU General Public License. This exception does not      --
---  however invalidate any other reasons why the executable file  might be  --
---  covered by the  GNU Public License.                                     --
-------------------------------------------------------------------------------
-
---  $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $
-
-with Ada.Streams;
-
-with Interfaces;
-
-package ZLib is
-
-   ZLib_Error   : exception;
-   Status_Error : exception;
-
-   type Compression_Level is new Integer range -1 .. 9;
-
-   type Flush_Mode is private;
-
-   type Compression_Method is private;
-
-   type Window_Bits_Type is new Integer range 8 .. 15;
-
-   type Memory_Level_Type is new Integer range 1 .. 9;
-
-   type Unsigned_32 is new Interfaces.Unsigned_32;
-
-   type Strategy_Type is private;
-
-   type Header_Type is (None, Auto, Default, GZip);
-   --  Header type usage have a some limitation for inflate.
-   --  See comment for Inflate_Init.
-
-   subtype Count is Ada.Streams.Stream_Element_Count;
-
-   Default_Memory_Level : constant Memory_Level_Type := 8;
-   Default_Window_Bits  : constant Window_Bits_Type  := 15;
-
-   ----------------------------------
-   -- Compression method constants --
-   ----------------------------------
-
-   Deflated : constant Compression_Method;
-   --  Only one method allowed in this ZLib version
-
-   ---------------------------------
-   -- Compression level constants --
-   ---------------------------------
-
-   No_Compression      : constant Compression_Level := 0;
-   Best_Speed          : constant Compression_Level := 1;
-   Best_Compression    : constant Compression_Level := 9;
-   Default_Compression : constant Compression_Level := -1;
-
-   --------------------------
-   -- Flush mode constants --
-   --------------------------
-
-   No_Flush      : constant Flush_Mode;
-   --  Regular way for compression, no flush
-
-   Partial_Flush : constant Flush_Mode;
-   --  Will be removed, use Z_SYNC_FLUSH instead
-
-   Sync_Flush    : constant Flush_Mode;
-   --  All pending output is flushed to the output buffer and the output
-   --  is aligned on a byte boundary, so that the decompressor can get all
-   --  input data available so far. (In particular avail_in is zero after the
-   --  call if enough output space has been provided  before the call.)
-   --  Flushing may degrade compression for some compression algorithms and so
-   --  it should be used only when necessary.
-
-   Block_Flush   : constant Flush_Mode;
-   --  Z_BLOCK requests that inflate() stop
-   --  if and when it get to the next deflate block boundary. When decoding the
-   --  zlib or gzip format, this will cause inflate() to return immediately
-   --  after the header and before the first block. When doing a raw inflate,
-   --  inflate() will go ahead and process the first block, and will return
-   --  when it gets to the end of that block, or when it runs out of data.
-
-   Full_Flush    : constant Flush_Mode;
-   --  All output is flushed as with SYNC_FLUSH, and the compression state
-   --  is reset so that decompression can restart from this point if previous
-   --  compressed data has been damaged or if random access is desired. Using
-   --  Full_Flush too often can seriously degrade the compression.
-
-   Finish        : constant Flush_Mode;
-   --  Just for tell the compressor that input data is complete.
-
-   ------------------------------------
-   -- Compression strategy constants --
-   ------------------------------------
-
-   --  RLE stategy could be used only in version 1.2.0 and later.
-
-   Filtered         : constant Strategy_Type;
-   Huffman_Only     : constant Strategy_Type;
-   RLE              : constant Strategy_Type;
-   Default_Strategy : constant Strategy_Type;
-
-   Default_Buffer_Size : constant := 4096;
-
-   type Filter_Type is tagged limited private;
-   --  The filter is for compression and for decompression.
-   --  The usage of the type is depend of its initialization.
-
-   function Version return String;
-   pragma Inline (Version);
-   --  Return string representation of the ZLib version.
-
-   procedure Deflate_Init
-     (Filter       : in out Filter_Type;
-      Level        : in     Compression_Level  := Default_Compression;
-      Strategy     : in     Strategy_Type      := Default_Strategy;
-      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
-      Header       : in     Header_Type        := Default);
-   --  Compressor initialization.
-   --  When Header parameter is Auto or Default, then default zlib header
-   --  would be provided for compressed data.
-   --  When Header is GZip, then gzip header would be set instead of
-   --  default header.
-   --  When Header is None, no header would be set for compressed data.
-
-   procedure Inflate_Init
-     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
-      Header      : in     Header_Type      := Default);
-   --  Decompressor initialization.
-   --  Default header type mean that ZLib default header is expecting in the
-   --  input compressed stream.
-   --  Header type None mean that no header is expecting in the input stream.
-   --  GZip header type mean that GZip header is expecting in the
-   --  input compressed stream.
-   --  Auto header type mean that header type (GZip or Native) would be
-   --  detected automatically in the input stream.
-   --  Note that header types parameter values None, GZip and Auto are
-   --  supported for inflate routine only in ZLib versions 1.2.0.2 and later.
-   --  Deflate_Init is supporting all header types.
-
-   function Is_Open (Filter : in Filter_Type) return Boolean;
-   pragma Inline (Is_Open);
-   --  Is the filter opened for compression or decompression.
-
-   procedure Close
-     (Filter       : in out Filter_Type;
-      Ignore_Error : in     Boolean := False);
-   --  Closing the compression or decompressor.
-   --  If stream is closing before the complete and Ignore_Error is False,
-   --  The exception would be raised.
-
-   generic
-      with procedure Data_In
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-      with procedure Data_Out
-        (Item : in Ada.Streams.Stream_Element_Array);
-   procedure Generic_Translate
-     (Filter          : in out Filter_Type;
-      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
-      Out_Buffer_Size : in     Integer := Default_Buffer_Size);
-   --  Compress/decompress data fetch from Data_In routine and pass the result
-   --  to the Data_Out routine. User should provide Data_In and Data_Out
-   --  for compression/decompression data flow.
-   --  Compression or decompression depend on Filter initialization.
-
-   function Total_In (Filter : in Filter_Type) return Count;
-   pragma Inline (Total_In);
-   --  Returns total number of input bytes read so far
-
-   function Total_Out (Filter : in Filter_Type) return Count;
-   pragma Inline (Total_Out);
-   --  Returns total number of bytes output so far
-
-   function CRC32
-     (CRC    : in Unsigned_32;
-      Data   : in Ada.Streams.Stream_Element_Array)
-      return Unsigned_32;
-   pragma Inline (CRC32);
-   --  Compute CRC32, it could be necessary for make gzip format
-
-   procedure CRC32
-     (CRC  : in out Unsigned_32;
-      Data : in     Ada.Streams.Stream_Element_Array);
-   pragma Inline (CRC32);
-   --  Compute CRC32, it could be necessary for make gzip format
-
-   -------------------------------------------------
-   --  Below is more complex low level routines.  --
-   -------------------------------------------------
-
-   procedure Translate
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  Compress/decompress the In_Data buffer and place the result into
-   --  Out_Data. In_Last is the index of last element from In_Data accepted by
-   --  the Filter. Out_Last is the last element of the received data from
-   --  Filter. To tell the filter that incoming data are complete put the
-   --  Flush parameter to Finish.
-
-   function Stream_End (Filter : in Filter_Type) return Boolean;
-   pragma Inline (Stream_End);
-   --  Return the true when the stream is complete.
-
-   procedure Flush
-     (Filter    : in out Filter_Type;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   pragma Inline (Flush);
-   --  Flushing the data from the compressor.
-
-   generic
-      with procedure Write
-        (Item : in Ada.Streams.Stream_Element_Array);
-      --  User should provide this routine for accept
-      --  compressed/decompressed data.
-
-      Buffer_Size : in Ada.Streams.Stream_Element_Offset
-         := Default_Buffer_Size;
-      --  Buffer size for Write user routine.
-
-   procedure Write
-     (Filter  : in out Filter_Type;
-      Item    : in     Ada.Streams.Stream_Element_Array;
-      Flush   : in     Flush_Mode := No_Flush);
-   --  Compress/Decompress data from Item to the generic parameter procedure
-   --  Write. Output buffer size could be set in Buffer_Size generic parameter.
-
-   generic
-      with procedure Read
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-      --  User should provide data for compression/decompression
-      --  thru this routine.
-
-      Buffer : in out Ada.Streams.Stream_Element_Array;
-      --  Buffer for keep remaining data from the previous
-      --  back read.
-
-      Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset;
-      --  Rest_First have to be initialized to Buffer'Last + 1
-      --  Rest_Last have to be initialized to Buffer'Last
-      --  before usage.
-
-      Allow_Read_Some : in Boolean := False;
-      --  Is it allowed to return Last < Item'Last before end of data.
-
-   procedure Read
-     (Filter : in out Filter_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset;
-      Flush  : in     Flush_Mode := No_Flush);
-   --  Compress/Decompress data from generic parameter procedure Read to the
-   --  Item. User should provide Buffer and initialized Rest_First, Rest_Last
-   --  indicators. If Allow_Read_Some is True, Read routines could return
-   --  Last < Item'Last only at end of stream.
-
-private
-
-   use Ada.Streams;
-
-   pragma Assert (Ada.Streams.Stream_Element'Size    =    8);
-   pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8);
-
-   type Flush_Mode is new Integer range 0 .. 5;
-
-   type Compression_Method is new Integer range 8 .. 8;
-
-   type Strategy_Type is new Integer range 0 .. 3;
-
-   No_Flush      : constant Flush_Mode := 0;
-   Partial_Flush : constant Flush_Mode := 1;
-   Sync_Flush    : constant Flush_Mode := 2;
-   Full_Flush    : constant Flush_Mode := 3;
-   Finish        : constant Flush_Mode := 4;
-   Block_Flush   : constant Flush_Mode := 5;
-
-   Filtered         : constant Strategy_Type := 1;
-   Huffman_Only     : constant Strategy_Type := 2;
-   RLE              : constant Strategy_Type := 3;
-   Default_Strategy : constant Strategy_Type := 0;
-
-   Deflated : constant Compression_Method := 8;
-
-   type Z_Stream;
-
-   type Z_Stream_Access is access all Z_Stream;
-
-   type Filter_Type is tagged limited record
-      Strm        : Z_Stream_Access;
-      Compression : Boolean;
-      Stream_End  : Boolean;
-      Header      : Header_Type;
-      CRC         : Unsigned_32;
-      Offset      : Stream_Element_Offset;
-      --  Offset for gzip header/footer output.
-   end record;
-
-end ZLib;

crates/libz-sys/src/zlib/contrib/ada/zlib.gpr

diff --git a/crates/libz-sys/src/zlib/contrib/ada/zlib.gpr b/crates/libz-sys/src/zlib/contrib/ada/zlib.gpr
deleted file mode 100644
index 296b22a..0000000
--- a/crates/libz-sys/src/zlib/contrib/ada/zlib.gpr
+++ /dev/null
@@ -1,20 +0,0 @@
-project Zlib is
-
-   for Languages use ("Ada");
-   for Source_Dirs use (".");
-   for Object_Dir use ".";
-   for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo");
-
-   package Compiler is
-      for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst");
-   end Compiler;
-
-   package Linker is
-      for Default_Switches ("ada") use ("-lz");
-   end Linker;
-
-   package Builder is
-      for Default_Switches ("ada") use ("-s", "-gnatQ");
-   end Builder;
-
-end Zlib;

crates/libz-sys/src/zlib/contrib/amd64/amd64-match.S

diff --git a/crates/libz-sys/src/zlib/contrib/amd64/amd64-match.S b/crates/libz-sys/src/zlib/contrib/amd64/amd64-match.S
deleted file mode 100644
index 81d4a1c..0000000
--- a/crates/libz-sys/src/zlib/contrib/amd64/amd64-match.S
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * match.S -- optimized version of longest_match()
- * based on the similar work by Gilles Vollant, and Brian Raiter, written 1998
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the BSD License. Use by owners of Che Guevarra
- * parafernalia is prohibited, where possible, and highly discouraged
- * elsewhere.
- */
-
-#ifndef NO_UNDERLINE
-#	define	match_init	_match_init
-#	define	longest_match	_longest_match
-#endif
-
-#define	scanend		ebx
-#define	scanendw	bx
-#define	chainlenwmask	edx /* high word: current chain len low word: s->wmask */
-#define	curmatch	rsi
-#define	curmatchd	esi
-#define	windowbestlen	r8
-#define	scanalign	r9
-#define	scanalignd	r9d
-#define	window		r10
-#define	bestlen		r11
-#define	bestlend	r11d
-#define	scanstart	r12d
-#define	scanstartw	r12w
-#define scan		r13
-#define nicematch	r14d
-#define	limit		r15
-#define	limitd		r15d
-#define prev		rcx
-
-/*
- * The 258 is a "magic number, not a parameter -- changing it
- * breaks the hell loose
- */
-#define	MAX_MATCH	(258)
-#define	MIN_MATCH	(3)
-#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
-#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
-
-/* stack frame offsets */
-#define	LocalVarsSize	(112)
-#define _chainlenwmask	( 8-LocalVarsSize)(%rsp)
-#define _windowbestlen	(16-LocalVarsSize)(%rsp)
-#define save_r14        (24-LocalVarsSize)(%rsp)
-#define save_rsi        (32-LocalVarsSize)(%rsp)
-#define save_rbx        (40-LocalVarsSize)(%rsp)
-#define save_r12        (56-LocalVarsSize)(%rsp)
-#define save_r13        (64-LocalVarsSize)(%rsp)
-#define save_r15        (80-LocalVarsSize)(%rsp)
-
-
-.globl	match_init, longest_match
-
-/*
- * On AMD64 the first argument of a function (in our case -- the pointer to
- * deflate_state structure) is passed in %rdi, hence our offsets below are
- * all off of that.
- */
-
-/* you can check the structure offset by running
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "deflate.h"
-
-void print_depl()
-{
-deflate_state ds;
-deflate_state *s=&ds;
-printf("size pointer=%u\n",(int)sizeof(void*));
-
-printf("#define dsWSize         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_size))-((char*)s)));
-printf("#define dsWMask         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_mask))-((char*)s)));
-printf("#define dsWindow        (%3u)(%%rdi)\n",(int)(((char*)&(s->window))-((char*)s)));
-printf("#define dsPrev          (%3u)(%%rdi)\n",(int)(((char*)&(s->prev))-((char*)s)));
-printf("#define dsMatchLen      (%3u)(%%rdi)\n",(int)(((char*)&(s->match_length))-((char*)s)));
-printf("#define dsPrevMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_match))-((char*)s)));
-printf("#define dsStrStart      (%3u)(%%rdi)\n",(int)(((char*)&(s->strstart))-((char*)s)));
-printf("#define dsMatchStart    (%3u)(%%rdi)\n",(int)(((char*)&(s->match_start))-((char*)s)));
-printf("#define dsLookahead     (%3u)(%%rdi)\n",(int)(((char*)&(s->lookahead))-((char*)s)));
-printf("#define dsPrevLen       (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_length))-((char*)s)));
-printf("#define dsMaxChainLen   (%3u)(%%rdi)\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
-printf("#define dsGoodMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->good_match))-((char*)s)));
-printf("#define dsNiceMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->nice_match))-((char*)s)));
-}
-
-*/
-
-
-/*
-  to compile for XCode 3.2 on MacOSX x86_64
-  - run "gcc -g -c -DXCODE_MAC_X64_STRUCTURE amd64-match.S"
- */
-
-
-#ifndef CURRENT_LINX_XCODE_MAC_X64_STRUCTURE
-#define dsWSize		( 68)(%rdi)
-#define dsWMask		( 76)(%rdi)
-#define dsWindow	( 80)(%rdi)
-#define dsPrev		( 96)(%rdi)
-#define dsMatchLen	(144)(%rdi)
-#define dsPrevMatch	(148)(%rdi)
-#define dsStrStart	(156)(%rdi)
-#define dsMatchStart	(160)(%rdi)
-#define dsLookahead	(164)(%rdi)
-#define dsPrevLen	(168)(%rdi)
-#define dsMaxChainLen	(172)(%rdi)
-#define dsGoodMatch	(188)(%rdi)
-#define dsNiceMatch	(192)(%rdi)
-
-#else 
-
-#ifndef STRUCT_OFFSET
-#	define STRUCT_OFFSET	(0)
-#endif
-
-
-#define dsWSize		( 56 + STRUCT_OFFSET)(%rdi)
-#define dsWMask		( 64 + STRUCT_OFFSET)(%rdi)
-#define dsWindow	( 72 + STRUCT_OFFSET)(%rdi)
-#define dsPrev		( 88 + STRUCT_OFFSET)(%rdi)
-#define dsMatchLen	(136 + STRUCT_OFFSET)(%rdi)
-#define dsPrevMatch	(140 + STRUCT_OFFSET)(%rdi)
-#define dsStrStart	(148 + STRUCT_OFFSET)(%rdi)
-#define dsMatchStart	(152 + STRUCT_OFFSET)(%rdi)
-#define dsLookahead	(156 + STRUCT_OFFSET)(%rdi)
-#define dsPrevLen	(160 + STRUCT_OFFSET)(%rdi)
-#define dsMaxChainLen	(164 + STRUCT_OFFSET)(%rdi)
-#define dsGoodMatch	(180 + STRUCT_OFFSET)(%rdi)
-#define dsNiceMatch	(184 + STRUCT_OFFSET)(%rdi)
-
-#endif
-
-
-
-
-.text
-
-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
-
-longest_match:
-/*
- * Retrieve the function arguments. %curmatch will hold cur_match
- * throughout the entire function (passed via rsi on amd64).
- * rdi will hold the pointer to the deflate_state (first arg on amd64)
- */
-		mov     %rsi, save_rsi
-		mov     %rbx, save_rbx
-		mov	%r12, save_r12
-		mov     %r13, save_r13
-		mov     %r14, save_r14
-		mov     %r15, save_r15
-
-/* uInt wmask = s->w_mask;						*/
-/* unsigned chain_length = s->max_chain_length;				*/
-/* if (s->prev_length >= s->good_match) {				*/
-/*     chain_length >>= 2;						*/
-/* }									*/
-
-		movl	dsPrevLen, %eax
-		movl	dsGoodMatch, %ebx
-		cmpl	%ebx, %eax
-		movl	dsWMask, %eax
-		movl	dsMaxChainLen, %chainlenwmask
-		jl	LastMatchGood
-		shrl	$2, %chainlenwmask
-LastMatchGood:
-
-/* chainlen is decremented once beforehand so that the function can	*/
-/* use the sign flag instead of the zero flag for the exit test.	*/
-/* It is then shifted into the high word, to make room for the wmask	*/
-/* value, which it will always accompany.				*/
-
-		decl	%chainlenwmask
-		shll	$16, %chainlenwmask
-		orl	%eax, %chainlenwmask
-
-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
-
-		movl	dsNiceMatch, %eax
-		movl	dsLookahead, %ebx
-		cmpl	%eax, %ebx
-		jl	LookaheadLess
-		movl	%eax, %ebx
-LookaheadLess:	movl	%ebx, %nicematch
-
-/* register Bytef *scan = s->window + s->strstart;			*/
-
-		mov	dsWindow, %window
-		movl	dsStrStart, %limitd
-		lea	(%limit, %window), %scan
-
-/* Determine how many bytes the scan ptr is off from being		*/
-/* dword-aligned.							*/
-
-		mov	%scan, %scanalign
-		negl	%scanalignd
-		andl	$3, %scanalignd
-
-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
-
-		movl	dsWSize, %eax
-		subl	$MIN_LOOKAHEAD, %eax
-		xorl	%ecx, %ecx
-		subl	%eax, %limitd
-		cmovng	%ecx, %limitd
-
-/* int best_len = s->prev_length;					*/
-
-		movl	dsPrevLen, %bestlend
-
-/* Store the sum of s->window + best_len in %windowbestlen locally, and in memory.	*/
-
-		lea	(%window, %bestlen), %windowbestlen
-		mov	%windowbestlen, _windowbestlen
-
-/* register ush scan_start = *(ushf*)scan;				*/
-/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
-/* Posf *prev = s->prev;						*/
-
-		movzwl	(%scan), %scanstart
-		movzwl	-1(%scan, %bestlen), %scanend
-		mov	dsPrev, %prev
-
-/* Jump into the main loop.						*/
-
-		movl	%chainlenwmask, _chainlenwmask
-		jmp	LoopEntry
-
-.balign 16
-
-/* do {
- *     match = s->window + cur_match;
- *     if (*(ushf*)(match+best_len-1) != scan_end ||
- *         *(ushf*)match != scan_start) continue;
- *     [...]
- * } while ((cur_match = prev[cur_match & wmask]) > limit
- *          && --chain_length != 0);
- *
- * Here is the inner loop of the function. The function will spend the
- * majority of its time in this loop, and majority of that time will
- * be spent in the first ten instructions.
- */
-LookupLoop:
-		andl	%chainlenwmask, %curmatchd
-		movzwl	(%prev, %curmatch, 2), %curmatchd
-		cmpl	%limitd, %curmatchd
-		jbe	LeaveNow
-		subl	$0x00010000, %chainlenwmask
-		js	LeaveNow
-LoopEntry:	cmpw	-1(%windowbestlen, %curmatch), %scanendw
-		jne	LookupLoop
-		cmpw	%scanstartw, (%window, %curmatch)
-		jne	LookupLoop
-
-/* Store the current value of chainlen.					*/
-		movl	%chainlenwmask, _chainlenwmask
-
-/* %scan is the string under scrutiny, and %prev to the string we	*/
-/* are hoping to match it up with. In actuality, %esi and %edi are	*/
-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
-/* initialized to -(MAX_MATCH_8 - scanalign).				*/
-
-		mov	$(-MAX_MATCH_8), %rdx
-		lea	(%curmatch, %window), %windowbestlen
-		lea	MAX_MATCH_8(%windowbestlen, %scanalign), %windowbestlen
-		lea	MAX_MATCH_8(%scan, %scanalign), %prev
-
-/* the prefetching below makes very little difference... */
-		prefetcht1	(%windowbestlen, %rdx)
-		prefetcht1	(%prev, %rdx)
-
-/*
- * Test the strings for equality, 8 bytes at a time. At the end,
- * adjust %rdx so that it is offset to the exact byte that mismatched.
- *
- * It should be confessed that this loop usually does not represent
- * much of the total running time. Replacing it with a more
- * straightforward "rep cmpsb" would not drastically degrade
- * performance -- unrolling it, for example, makes no difference.
- */
-
-#undef USE_SSE	/* works, but is 6-7% slower, than non-SSE... */
-
-LoopCmps:
-#ifdef USE_SSE
-		/* Preload the SSE registers */
-		movdqu	  (%windowbestlen, %rdx), %xmm1
-		movdqu	  (%prev, %rdx), %xmm2
-		pcmpeqb	%xmm2, %xmm1
-		movdqu	16(%windowbestlen, %rdx), %xmm3
-		movdqu	16(%prev, %rdx), %xmm4
-		pcmpeqb	%xmm4, %xmm3
-		movdqu	32(%windowbestlen, %rdx), %xmm5
-		movdqu	32(%prev, %rdx), %xmm6
-		pcmpeqb	%xmm6, %xmm5
-		movdqu	48(%windowbestlen, %rdx), %xmm7
-		movdqu	48(%prev, %rdx), %xmm8
-		pcmpeqb	%xmm8, %xmm7
-
-		/* Check the comparisions' results */
-		pmovmskb %xmm1, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		/* this is the only iteration of the loop with a possibility of having
-		   incremented rdx by 0x108 (each loop iteration add 16*4 = 0x40 
-		   and (0x40*4)+8=0x108 */
-		add	$8, %rdx
-		jz LenMaximum
-		add	$8, %rdx
-
-		
-		pmovmskb %xmm3, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		
-		add	$16, %rdx
-
-
-		pmovmskb %xmm5, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		add	$16, %rdx
-
-
-		pmovmskb %xmm7, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		add	$16, %rdx
-		
-		jmp	LoopCmps
-LeaveLoopCmps:	add	%rax, %rdx
-#else
-		mov	(%windowbestlen, %rdx), %rax
-		xor	(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps
-		
-		mov	8(%windowbestlen, %rdx), %rax
-		xor	8(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps8
-
-		mov	16(%windowbestlen, %rdx), %rax
-		xor	16(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps16
-				
-		add	$24, %rdx
-		jnz	LoopCmps
-		jmp	LenMaximum
-#	if 0
-/*
- * This three-liner is tantalizingly simple, but bsf is a slow instruction,
- * and the complicated alternative down below is quite a bit faster. Sad...
- */
-
-LeaveLoopCmps:	bsf	%rax, %rax /* find the first non-zero bit */
-		shrl	$3, %eax /* divide by 8 to get the byte */
-		add	%rax, %rdx
-#	else
-LeaveLoopCmps16:
-		add	$8, %rdx
-LeaveLoopCmps8:
-		add	$8, %rdx
-LeaveLoopCmps:	testl   $0xFFFFFFFF, %eax /* Check the first 4 bytes */
-		jnz     Check16
-		add     $4, %rdx
-		shr     $32, %rax
-Check16:        testw   $0xFFFF, %ax
-		jnz     LenLower
-		add	$2, %rdx
-		shrl	$16, %eax
-LenLower:	subb	$1, %al
-		adc	$0, %rdx
-#	endif
-#endif
-
-/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
-/* then automatically accept it as the best possible match and leave.	*/
-
-		lea	(%prev, %rdx), %rax
-		sub	%scan, %rax
-		cmpl	$MAX_MATCH, %eax
-		jge	LenMaximum
-
-/* If the length of the match is not longer than the best match we	*/
-/* have so far, then forget it and return to the lookup loop.		*/
-
-		cmpl	%bestlend, %eax
-		jg	LongerMatch
-		mov	_windowbestlen, %windowbestlen
-		mov	dsPrev, %prev
-		movl	_chainlenwmask, %edx
-		jmp	LookupLoop
-
-/*         s->match_start = cur_match;					*/
-/*         best_len = len;						*/
-/*         if (len >= nice_match) break;				*/
-/*         scan_end = *(ushf*)(scan+best_len-1);			*/
-
-LongerMatch:
-		movl	%eax, %bestlend
-		movl	%curmatchd, dsMatchStart
-		cmpl	%nicematch, %eax
-		jge	LeaveNow
-
-		lea	(%window, %bestlen), %windowbestlen
-		mov	%windowbestlen, _windowbestlen
-
-		movzwl	-1(%scan, %rax), %scanend
-		mov	dsPrev, %prev
-		movl	_chainlenwmask, %chainlenwmask
-		jmp	LookupLoop
-
-/* Accept the current string, with the maximum possible length.		*/
-
-LenMaximum:
-		movl	$MAX_MATCH, %bestlend
-		movl	%curmatchd, dsMatchStart
-
-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
-/* return s->lookahead;							*/
-
-LeaveNow:
-		movl	dsLookahead, %eax
-		cmpl	%eax, %bestlend
-		cmovngl	%bestlend, %eax
-LookaheadRet:
-
-/* Restore the registers and return from whence we came.			*/
-
-	mov	save_rsi, %rsi
-	mov	save_rbx, %rbx
-	mov	save_r12, %r12
-	mov	save_r13, %r13
-	mov	save_r14, %r14
-	mov	save_r15, %r15
-
-	ret
-
-match_init:	ret

crates/libz-sys/src/zlib/contrib/asm686/README.686

diff --git a/crates/libz-sys/src/zlib/contrib/asm686/README.686 b/crates/libz-sys/src/zlib/contrib/asm686/README.686
deleted file mode 100644
index a0bf3be..0000000
--- a/crates/libz-sys/src/zlib/contrib/asm686/README.686
+++ /dev/null
@@ -1,51 +0,0 @@
-This is a patched version of zlib, modified to use
-Pentium-Pro-optimized assembly code in the deflation algorithm. The
-files changed/added by this patch are:
-
-README.686
-match.S
-
-The speedup that this patch provides varies, depending on whether the
-compiler used to build the original version of zlib falls afoul of the
-PPro's speed traps. My own tests show a speedup of around 10-20% at
-the default compression level, and 20-30% using -9, against a version
-compiled using gcc 2.7.2.3. Your mileage may vary.
-
-Note that this code has been tailored for the PPro/PII in particular,
-and will not perform particuarly well on a Pentium.
-
-If you are using an assembler other than GNU as, you will have to
-translate match.S to use your assembler's syntax. (Have fun.)
-
-Brian Raiter
-breadbox@muppetlabs.com
-April, 1998
-
-
-Added for zlib 1.1.3:
-
-The patches come from
-http://www.muppetlabs.com/~breadbox/software/assembly.html
-
-To compile zlib with this asm file, copy match.S to the zlib directory
-then do:
-
-CFLAGS="-O3 -DASMV" ./configure
-make OBJA=match.o
-
-
-Update:
-
-I've been ignoring these assembly routines for years, believing that
-gcc's generated code had caught up with it sometime around gcc 2.95
-and the major rearchitecting of the Pentium 4. However, I recently
-learned that, despite what I believed, this code still has some life
-in it. On the Pentium 4 and AMD64 chips, it continues to run about 8%
-faster than the code produced by gcc 4.1.
-
-In acknowledgement of its continuing usefulness, I've altered the
-license to match that of the rest of zlib. Share and Enjoy!
-
-Brian Raiter
-breadbox@muppetlabs.com
-April, 2007

crates/libz-sys/src/zlib/contrib/asm686/match.S

diff --git a/crates/libz-sys/src/zlib/contrib/asm686/match.S b/crates/libz-sys/src/zlib/contrib/asm686/match.S
deleted file mode 100644
index fa42109..0000000
--- a/crates/libz-sys/src/zlib/contrib/asm686/match.S
+++ /dev/null
@@ -1,357 +0,0 @@
-/* match.S -- x86 assembly version of the zlib longest_match() function.
- * Optimized for the Intel 686 chips (PPro and later).
- *
- * Copyright (C) 1998, 2007 Brian Raiter <breadbox@muppetlabs.com>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the author be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-#ifndef NO_UNDERLINE
-#define	match_init	_match_init
-#define	longest_match	_longest_match
-#endif
-
-#define	MAX_MATCH	(258)
-#define	MIN_MATCH	(3)
-#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
-#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
-
-/* stack frame offsets */
-
-#define	chainlenwmask		0	/* high word: current chain len	*/
-					/* low word: s->wmask		*/
-#define	window			4	/* local copy of s->window	*/
-#define	windowbestlen		8	/* s->window + bestlen		*/
-#define	scanstart		16	/* first two bytes of string	*/
-#define	scanend			12	/* last two bytes of string	*/
-#define	scanalign		20	/* dword-misalignment of string	*/
-#define	nicematch		24	/* a good enough match size	*/
-#define	bestlen			28	/* size of best match so far	*/
-#define	scan			32	/* ptr to string wanting match	*/
-
-#define	LocalVarsSize		(36)
-/*	saved ebx		36 */
-/*	saved edi		40 */
-/*	saved esi		44 */
-/*	saved ebp		48 */
-/*	return address		52 */
-#define	deflatestate		56	/* the function arguments	*/
-#define	curmatch		60
-
-/* All the +zlib1222add offsets are due to the addition of fields
- *  in zlib in the deflate_state structure since the asm code was first written
- * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
- * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
- * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
- */
-
-#define zlib1222add		(8)
-
-#define	dsWSize			(36+zlib1222add)
-#define	dsWMask			(44+zlib1222add)
-#define	dsWindow		(48+zlib1222add)
-#define	dsPrev			(56+zlib1222add)
-#define	dsMatchLen		(88+zlib1222add)
-#define	dsPrevMatch		(92+zlib1222add)
-#define	dsStrStart		(100+zlib1222add)
-#define	dsMatchStart		(104+zlib1222add)
-#define	dsLookahead		(108+zlib1222add)
-#define	dsPrevLen		(112+zlib1222add)
-#define	dsMaxChainLen		(116+zlib1222add)
-#define	dsGoodMatch		(132+zlib1222add)
-#define	dsNiceMatch		(136+zlib1222add)
-
-
-.file "match.S"
-
-.globl	match_init, longest_match
-
-.text
-
-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
-.cfi_sections	.debug_frame
-
-longest_match:
-
-.cfi_startproc
-/* Save registers that the compiler may be using, and adjust %esp to	*/
-/* make room for our stack frame.					*/
-
-		pushl	%ebp
-		.cfi_def_cfa_offset 8
-		.cfi_offset ebp, -8
-		pushl	%edi
-		.cfi_def_cfa_offset 12
-		pushl	%esi
-		.cfi_def_cfa_offset 16
-		pushl	%ebx
-		.cfi_def_cfa_offset 20
-		subl	$LocalVarsSize, %esp
-		.cfi_def_cfa_offset LocalVarsSize+20
-
-/* Retrieve the function arguments. %ecx will hold cur_match		*/
-/* throughout the entire function. %edx will hold the pointer to the	*/
-/* deflate_state structure during the function's setup (before		*/
-/* entering the main loop).						*/
-
-		movl	deflatestate(%esp), %edx
-		movl	curmatch(%esp), %ecx
-
-/* uInt wmask = s->w_mask;						*/
-/* unsigned chain_length = s->max_chain_length;				*/
-/* if (s->prev_length >= s->good_match) {				*/
-/*     chain_length >>= 2;						*/
-/* }									*/
- 
-		movl	dsPrevLen(%edx), %eax
-		movl	dsGoodMatch(%edx), %ebx
-		cmpl	%ebx, %eax
-		movl	dsWMask(%edx), %eax
-		movl	dsMaxChainLen(%edx), %ebx
-		jl	LastMatchGood
-		shrl	$2, %ebx
-LastMatchGood:
-
-/* chainlen is decremented once beforehand so that the function can	*/
-/* use the sign flag instead of the zero flag for the exit test.	*/
-/* It is then shifted into the high word, to make room for the wmask	*/
-/* value, which it will always accompany.				*/
-
-		decl	%ebx
-		shll	$16, %ebx
-		orl	%eax, %ebx
-		movl	%ebx, chainlenwmask(%esp)
-
-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
-
-		movl	dsNiceMatch(%edx), %eax
-		movl	dsLookahead(%edx), %ebx
-		cmpl	%eax, %ebx
-		jl	LookaheadLess
-		movl	%eax, %ebx
-LookaheadLess:	movl	%ebx, nicematch(%esp)
-
-/* register Bytef *scan = s->window + s->strstart;			*/
-
-		movl	dsWindow(%edx), %esi
-		movl	%esi, window(%esp)
-		movl	dsStrStart(%edx), %ebp
-		lea	(%esi,%ebp), %edi
-		movl	%edi, scan(%esp)
-
-/* Determine how many bytes the scan ptr is off from being		*/
-/* dword-aligned.							*/
-
-		movl	%edi, %eax
-		negl	%eax
-		andl	$3, %eax
-		movl	%eax, scanalign(%esp)
-
-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
-
-		movl	dsWSize(%edx), %eax
-		subl	$MIN_LOOKAHEAD, %eax
-		subl	%eax, %ebp
-		jg	LimitPositive
-		xorl	%ebp, %ebp
-LimitPositive:
-
-/* int best_len = s->prev_length;					*/
-
-		movl	dsPrevLen(%edx), %eax
-		movl	%eax, bestlen(%esp)
-
-/* Store the sum of s->window + best_len in %esi locally, and in %esi.	*/
-
-		addl	%eax, %esi
-		movl	%esi, windowbestlen(%esp)
-
-/* register ush scan_start = *(ushf*)scan;				*/
-/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
-/* Posf *prev = s->prev;						*/
-
-		movzwl	(%edi), %ebx
-		movl	%ebx, scanstart(%esp)
-		movzwl	-1(%edi,%eax), %ebx
-		movl	%ebx, scanend(%esp)
-		movl	dsPrev(%edx), %edi
-
-/* Jump into the main loop.						*/
-
-		movl	chainlenwmask(%esp), %edx
-		jmp	LoopEntry
-
-.balign 16
-
-/* do {
- *     match = s->window + cur_match;
- *     if (*(ushf*)(match+best_len-1) != scan_end ||
- *         *(ushf*)match != scan_start) continue;
- *     [...]
- * } while ((cur_match = prev[cur_match & wmask]) > limit
- *          && --chain_length != 0);
- *
- * Here is the inner loop of the function. The function will spend the
- * majority of its time in this loop, and majority of that time will
- * be spent in the first ten instructions.
- *
- * Within this loop:
- * %ebx = scanend
- * %ecx = curmatch
- * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
- * %esi = windowbestlen - i.e., (window + bestlen)
- * %edi = prev
- * %ebp = limit
- */
-LookupLoop:
-		andl	%edx, %ecx
-		movzwl	(%edi,%ecx,2), %ecx
-		cmpl	%ebp, %ecx
-		jbe	LeaveNow
-		subl	$0x00010000, %edx
-		js	LeaveNow
-LoopEntry:	movzwl	-1(%esi,%ecx), %eax
-		cmpl	%ebx, %eax
-		jnz	LookupLoop
-		movl	window(%esp), %eax
-		movzwl	(%eax,%ecx), %eax
-		cmpl	scanstart(%esp), %eax
-		jnz	LookupLoop
-
-/* Store the current value of chainlen.					*/
-
-		movl	%edx, chainlenwmask(%esp)
-
-/* Point %edi to the string under scrutiny, and %esi to the string we	*/
-/* are hoping to match it up with. In actuality, %esi and %edi are	*/
-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
-/* initialized to -(MAX_MATCH_8 - scanalign).				*/
-
-		movl	window(%esp), %esi
-		movl	scan(%esp), %edi
-		addl	%ecx, %esi
-		movl	scanalign(%esp), %eax
-		movl	$(-MAX_MATCH_8), %edx
-		lea	MAX_MATCH_8(%edi,%eax), %edi
-		lea	MAX_MATCH_8(%esi,%eax), %esi
-
-/* Test the strings for equality, 8 bytes at a time. At the end,
- * adjust %edx so that it is offset to the exact byte that mismatched.
- *
- * We already know at this point that the first three bytes of the
- * strings match each other, and they can be safely passed over before
- * starting the compare loop. So what this code does is skip over 0-3
- * bytes, as much as necessary in order to dword-align the %edi
- * pointer. (%esi will still be misaligned three times out of four.)
- *
- * It should be confessed that this loop usually does not represent
- * much of the total running time. Replacing it with a more
- * straightforward "rep cmpsb" would not drastically degrade
- * performance.
- */
-LoopCmps:
-		movl	(%esi,%edx), %eax
-		xorl	(%edi,%edx), %eax
-		jnz	LeaveLoopCmps
-		movl	4(%esi,%edx), %eax
-		xorl	4(%edi,%edx), %eax
-		jnz	LeaveLoopCmps4
-		addl	$8, %edx
-		jnz	LoopCmps
-		jmp	LenMaximum
-LeaveLoopCmps4:	addl	$4, %edx
-LeaveLoopCmps:	testl	$0x0000FFFF, %eax
-		jnz	LenLower
-		addl	$2, %edx
-		shrl	$16, %eax
-LenLower:	subb	$1, %al
-		adcl	$0, %edx
-
-/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
-/* then automatically accept it as the best possible match and leave.	*/
-
-		lea	(%edi,%edx), %eax
-		movl	scan(%esp), %edi
-		subl	%edi, %eax
-		cmpl	$MAX_MATCH, %eax
-		jge	LenMaximum
-
-/* If the length of the match is not longer than the best match we	*/
-/* have so far, then forget it and return to the lookup loop.		*/
-
-		movl	deflatestate(%esp), %edx
-		movl	bestlen(%esp), %ebx
-		cmpl	%ebx, %eax
-		jg	LongerMatch
-		movl	windowbestlen(%esp), %esi
-		movl	dsPrev(%edx), %edi
-		movl	scanend(%esp), %ebx
-		movl	chainlenwmask(%esp), %edx
-		jmp	LookupLoop
-
-/*         s->match_start = cur_match;					*/
-/*         best_len = len;						*/
-/*         if (len >= nice_match) break;				*/
-/*         scan_end = *(ushf*)(scan+best_len-1);			*/
-
-LongerMatch:	movl	nicematch(%esp), %ebx
-		movl	%eax, bestlen(%esp)
-		movl	%ecx, dsMatchStart(%edx)
-		cmpl	%ebx, %eax
-		jge	LeaveNow
-		movl	window(%esp), %esi
-		addl	%eax, %esi
-		movl	%esi, windowbestlen(%esp)
-		movzwl	-1(%edi,%eax), %ebx
-		movl	dsPrev(%edx), %edi
-		movl	%ebx, scanend(%esp)
-		movl	chainlenwmask(%esp), %edx
-		jmp	LookupLoop
-
-/* Accept the current string, with the maximum possible length.		*/
-
-LenMaximum:	movl	deflatestate(%esp), %edx
-		movl	$MAX_MATCH, bestlen(%esp)
-		movl	%ecx, dsMatchStart(%edx)
-
-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
-/* return s->lookahead;							*/
-
-LeaveNow:
-		movl	deflatestate(%esp), %edx
-		movl	bestlen(%esp), %ebx
-		movl	dsLookahead(%edx), %eax
-		cmpl	%eax, %ebx
-		jg	LookaheadRet
-		movl	%ebx, %eax
-LookaheadRet:
-
-/* Restore the stack and return from whence we came.			*/
-
-		addl	$LocalVarsSize, %esp
-		.cfi_def_cfa_offset 20
-		popl	%ebx
-		.cfi_def_cfa_offset 16
-		popl	%esi
-		.cfi_def_cfa_offset 12
-		popl	%edi
-		.cfi_def_cfa_offset 8
-		popl	%ebp
-		.cfi_def_cfa_offset 4
-.cfi_endproc
-match_init:	ret

crates/libz-sys/src/zlib/contrib/blast/Makefile

diff --git a/crates/libz-sys/src/zlib/contrib/blast/Makefile b/crates/libz-sys/src/zlib/contrib/blast/Makefile
deleted file mode 100644
index 9be80ba..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-blast: blast.c blast.h
-	cc -DTEST -o blast blast.c
-
-test: blast
-	blast < test.pk | cmp - test.txt
-
-clean:
-	rm -f blast blast.o

crates/libz-sys/src/zlib/contrib/blast/README

diff --git a/crates/libz-sys/src/zlib/contrib/blast/README b/crates/libz-sys/src/zlib/contrib/blast/README
deleted file mode 100644
index e3a60b3..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Read blast.h for purpose and usage.
-
-Mark Adler
-madler@alumni.caltech.edu

crates/libz-sys/src/zlib/contrib/blast/blast.c

diff --git a/crates/libz-sys/src/zlib/contrib/blast/blast.c b/crates/libz-sys/src/zlib/contrib/blast/blast.c
deleted file mode 100644
index e6e6590..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/blast.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* blast.c
- * Copyright (C) 2003, 2012, 2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in blast.h
- * version 1.3, 24 Aug 2013
- *
- * blast.c decompresses data compressed by the PKWare Compression Library.
- * This function provides functionality similar to the explode() function of
- * the PKWare library, hence the name "blast".
- *
- * This decompressor is based on the excellent format description provided by
- * Ben Rudiak-Gould in comp.compression on August 13, 2001.  Interestingly, the
- * example Ben provided in the post is incorrect.  The distance 110001 should
- * instead be 111000.  When corrected, the example byte stream becomes:
- *
- *    00 04 82 24 25 8f 80 7f
- *
- * which decompresses to "AIAIAIAIAIAIA" (without the quotes).
- */
-
-/*
- * Change history:
- *
- * 1.0  12 Feb 2003     - First version
- * 1.1  16 Feb 2003     - Fixed distance check for > 4 GB uncompressed data
- * 1.2  24 Oct 2012     - Add note about using binary mode in stdio
- *                      - Fix comparisons of differently signed integers
- * 1.3  24 Aug 2013     - Return unused input from blast()
- *                      - Fix test code to correctly report unused input
- *                      - Enable the provision of initial input to blast()
- */
-
-#include <stddef.h>             /* for NULL */
-#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
-#include "blast.h"              /* prototype for blast() */
-
-#define local static            /* for local function definitions */
-#define MAXBITS 13              /* maximum code length */
-#define MAXWIN 4096             /* maximum window size */
-
-/* input and output state */
-struct state {
-    /* input state */
-    blast_in infun;             /* input function provided by user */
-    void *inhow;                /* opaque information passed to infun() */
-    unsigned char *in;          /* next input location */
-    unsigned left;              /* available input at in */
-    int bitbuf;                 /* bit buffer */
-    int bitcnt;                 /* number of bits in bit buffer */
-
-    /* input limit error return state for bits() and decode() */
-    jmp_buf env;
-
-    /* output state */
-    blast_out outfun;           /* output function provided by user */
-    void *outhow;               /* opaque information passed to outfun() */
-    unsigned next;              /* index of next write location in out[] */
-    int first;                  /* true to check distances (for first 4K) */
-    unsigned char out[MAXWIN];  /* output buffer and sliding window */
-};
-
-/*
- * Return need bits from the input stream.  This always leaves less than
- * eight bits in the buffer.  bits() works properly for need == 0.
- *
- * Format notes:
- *
- * - Bits are stored in bytes from the least significant bit to the most
- *   significant bit.  Therefore bits are dropped from the bottom of the bit
- *   buffer, using shift right, and new bytes are appended to the top of the
- *   bit buffer, using shift left.
- */
-local int bits(struct state *s, int need)
-{
-    int val;            /* bit accumulator */
-
-    /* load at least need bits into val */
-    val = s->bitbuf;
-    while (s->bitcnt < need) {
-        if (s->left == 0) {
-            s->left = s->infun(s->inhow, &(s->in));
-            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
-        }
-        val |= (int)(*(s->in)++) << s->bitcnt;          /* load eight bits */
-        s->left--;
-        s->bitcnt += 8;
-    }
-
-    /* drop need bits and update buffer, always zero to seven bits left */
-    s->bitbuf = val >> need;
-    s->bitcnt -= need;
-
-    /* return need bits, zeroing the bits above that */
-    return val & ((1 << need) - 1);
-}
-
-/*
- * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
- * each length, which for a canonical code are stepped through in order.
- * symbol[] are the symbol values in canonical order, where the number of
- * entries is the sum of the counts in count[].  The decoding process can be
- * seen in the function decode() below.
- */
-struct huffman {
-    short *count;       /* number of symbols of each length */
-    short *symbol;      /* canonically ordered symbols */
-};
-
-/*
- * Decode a code from the stream s using huffman table h.  Return the symbol or
- * a negative value if there is an error.  If all of the lengths are zero, i.e.
- * an empty code, or if the code is incomplete and an invalid code is received,
- * then -9 is returned after reading MAXBITS bits.
- *
- * Format notes:
- *
- * - The codes as stored in the compressed data are bit-reversed relative to
- *   a simple integer ordering of codes of the same lengths.  Hence below the
- *   bits are pulled from the compressed data one at a time and used to
- *   build the code value reversed from what is in the stream in order to
- *   permit simple integer comparisons for decoding.
- *
- * - The first code for the shortest length is all ones.  Subsequent codes of
- *   the same length are simply integer decrements of the previous code.  When
- *   moving up a length, a one bit is appended to the code.  For a complete
- *   code, the last code of the longest length will be all zeros.  To support
- *   this ordering, the bits pulled during decoding are inverted to apply the
- *   more "natural" ordering starting with all zeros and incrementing.
- */
-local int decode(struct state *s, struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-    int bitbuf;         /* bits from stream */
-    int left;           /* bits left in next or left to process */
-    short *next;        /* next number of codes */
-
-    bitbuf = s->bitbuf;
-    left = s->bitcnt;
-    code = first = index = 0;
-    len = 1;
-    next = h->count + 1;
-    while (1) {
-        while (left--) {
-            code |= (bitbuf & 1) ^ 1;   /* invert code */
-            bitbuf >>= 1;
-            count = *next++;
-            if (code < first + count) { /* if length len, return symbol */
-                s->bitbuf = bitbuf;
-                s->bitcnt = (s->bitcnt - len) & 7;
-                return h->symbol[index + (code - first)];
-            }
-            index += count;             /* else update for next length */
-            first += count;
-            first <<= 1;
-            code <<= 1;
-            len++;
-        }
-        left = (MAXBITS+1) - len;
-        if (left == 0) break;
-        if (s->left == 0) {
-            s->left = s->infun(s->inhow, &(s->in));
-            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
-        }
-        bitbuf = *(s->in)++;
-        s->left--;
-        if (left > 8) left = 8;
-    }
-    return -9;                          /* ran out of codes */
-}
-
-/*
- * Given a list of repeated code lengths rep[0..n-1], where each byte is a
- * count (high four bits + 1) and a code length (low four bits), generate the
- * list of code lengths.  This compaction reduces the size of the object code.
- * Then given the list of code lengths length[0..n-1] representing a canonical
- * Huffman code for n symbols, construct the tables required to decode those
- * codes.  Those tables are the number of codes of each length, and the symbols
- * sorted by length, retaining their original order within each length.  The
- * return value is zero for a complete code set, negative for an over-
- * subscribed code set, and positive for an incomplete code set.  The tables
- * can be used if the return value is zero or positive, but they cannot be used
- * if the return value is negative.  If the return value is zero, it is not
- * possible for decode() using that table to return an error--any stream of
- * enough bits will resolve to a symbol.  If the return value is positive, then
- * it is possible for decode() using that table to return an error for received
- * codes past the end of the incomplete lengths.
- */
-local int construct(struct huffman *h, const unsigned char *rep, int n)
-{
-    int symbol;         /* current symbol when stepping through length[] */
-    int len;            /* current length when stepping through h->count[] */
-    int left;           /* number of possible codes left of current length */
-    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
-    short length[256];  /* code lengths */
-
-    /* convert compact repeat counts into symbol bit length list */
-    symbol = 0;
-    do {
-        len = *rep++;
-        left = (len >> 4) + 1;
-        len &= 15;
-        do {
-            length[symbol++] = len;
-        } while (--left);
-    } while (--n);
-    n = symbol;
-
-    /* count number of codes of each length */
-    for (len = 0; len <= MAXBITS; len++)
-        h->count[len] = 0;
-    for (symbol = 0; symbol < n; symbol++)
-        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
-    if (h->count[0] == n)               /* no codes! */
-        return 0;                       /* complete, but decode() will fail */
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;                           /* one possible code of zero length */
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;                     /* one more bit, double codes left */
-        left -= h->count[len];          /* deduct count from possible codes */
-        if (left < 0) return left;      /* over-subscribed--return negative */
-    }                                   /* left > 0 means incomplete */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + h->count[len];
-
-    /*
-     * put symbols in table sorted by length, by symbol order within each
-     * length
-     */
-    for (symbol = 0; symbol < n; symbol++)
-        if (length[symbol] != 0)
-            h->symbol[offs[length[symbol]]++] = symbol;
-
-    /* return zero for complete set, positive for incomplete set */
-    return left;
-}
-
-/*
- * Decode PKWare Compression Library stream.
- *
- * Format notes:
- *
- * - First byte is 0 if literals are uncoded or 1 if they are coded.  Second
- *   byte is 4, 5, or 6 for the number of extra bits in the distance code.
- *   This is the base-2 logarithm of the dictionary size minus six.
- *
- * - Compressed data is a combination of literals and length/distance pairs
- *   terminated by an end code.  Literals are either Huffman coded or
- *   uncoded bytes.  A length/distance pair is a coded length followed by a
- *   coded distance to represent a string that occurs earlier in the
- *   uncompressed data that occurs again at the current location.
- *
- * - A bit preceding a literal or length/distance pair indicates which comes
- *   next, 0 for literals, 1 for length/distance.
- *
- * - If literals are uncoded, then the next eight bits are the literal, in the
- *   normal bit order in the stream, i.e. no bit-reversal is needed. Similarly,
- *   no bit reversal is needed for either the length extra bits or the distance
- *   extra bits.
- *
- * - Literal bytes are simply written to the output.  A length/distance pair is
- *   an instruction to copy previously uncompressed bytes to the output.  The
- *   copy is from distance bytes back in the output stream, copying for length
- *   bytes.
- *
- * - Distances pointing before the beginning of the output data are not
- *   permitted.
- *
- * - Overlapped copies, where the length is greater than the distance, are
- *   allowed and common.  For example, a distance of one and a length of 518
- *   simply copies the last byte 518 times.  A distance of four and a length of
- *   twelve copies the last four bytes three times.  A simple forward copy
- *   ignoring whether the length is greater than the distance or not implements
- *   this correctly.
- */
-local int decomp(struct state *s)
-{
-    int lit;            /* true if literals are coded */
-    int dict;           /* log2(dictionary size) - 6 */
-    int symbol;         /* decoded symbol, extra bits for distance */
-    int len;            /* length for copy */
-    unsigned dist;      /* distance for copy */
-    int copy;           /* copy counter */
-    unsigned char *from, *to;   /* copy pointers */
-    static int virgin = 1;                              /* build tables once */
-    static short litcnt[MAXBITS+1], litsym[256];        /* litcode memory */
-    static short lencnt[MAXBITS+1], lensym[16];         /* lencode memory */
-    static short distcnt[MAXBITS+1], distsym[64];       /* distcode memory */
-    static struct huffman litcode = {litcnt, litsym};   /* length code */
-    static struct huffman lencode = {lencnt, lensym};   /* length code */
-    static struct huffman distcode = {distcnt, distsym};/* distance code */
-        /* bit lengths of literal codes */
-    static const unsigned char litlen[] = {
-        11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8,
-        9, 7, 6, 7, 8, 7, 6, 55, 8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
-        7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
-        8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
-        44, 253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45,
-        44, 173};
-        /* bit lengths of length codes 0..15 */
-    static const unsigned char lenlen[] = {2, 35, 36, 53, 38, 23};
-        /* bit lengths of distance codes 0..63 */
-    static const unsigned char distlen[] = {2, 20, 53, 230, 247, 151, 248};
-    static const short base[16] = {     /* base for length codes */
-        3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264};
-    static const char extra[16] = {     /* extra bits for length codes */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-
-    /* set up decoding tables (once--might not be thread-safe) */
-    if (virgin) {
-        construct(&litcode, litlen, sizeof(litlen));
-        construct(&lencode, lenlen, sizeof(lenlen));
-        construct(&distcode, distlen, sizeof(distlen));
-        virgin = 0;
-    }
-
-    /* read header */
-    lit = bits(s, 8);
-    if (lit > 1) return -1;
-    dict = bits(s, 8);
-    if (dict < 4 || dict > 6) return -2;
-
-    /* decode literals and length/distance pairs */
-    do {
-        if (bits(s, 1)) {
-            /* get length */
-            symbol = decode(s, &lencode);
-            len = base[symbol] + bits(s, extra[symbol]);
-            if (len == 519) break;              /* end code */
-
-            /* get distance */
-            symbol = len == 2 ? 2 : dict;
-            dist = decode(s, &distcode) << symbol;
-            dist += bits(s, symbol);
-            dist++;
-            if (s->first && dist > s->next)
-                return -3;              /* distance too far back */
-
-            /* copy length bytes from distance bytes back */
-            do {
-                to = s->out + s->next;
-                from = to - dist;
-                copy = MAXWIN;
-                if (s->next < dist) {
-                    from += copy;
-                    copy = dist;
-                }
-                copy -= s->next;
-                if (copy > len) copy = len;
-                len -= copy;
-                s->next += copy;
-                do {
-                    *to++ = *from++;
-                } while (--copy);
-                if (s->next == MAXWIN) {
-                    if (s->outfun(s->outhow, s->out, s->next)) return 1;
-                    s->next = 0;
-                    s->first = 0;
-                }
-            } while (len != 0);
-        }
-        else {
-            /* get literal and write it */
-            symbol = lit ? decode(s, &litcode) : bits(s, 8);
-            s->out[s->next++] = symbol;
-            if (s->next == MAXWIN) {
-                if (s->outfun(s->outhow, s->out, s->next)) return 1;
-                s->next = 0;
-                s->first = 0;
-            }
-        }
-    } while (1);
-    return 0;
-}
-
-/* See comments in blast.h */
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
-          unsigned *left, unsigned char **in)
-{
-    struct state s;             /* input/output state */
-    int err;                    /* return value */
-
-    /* initialize input state */
-    s.infun = infun;
-    s.inhow = inhow;
-    if (left != NULL && *left) {
-        s.left = *left;
-        s.in = *in;
-    }
-    else
-        s.left = 0;
-    s.bitbuf = 0;
-    s.bitcnt = 0;
-
-    /* initialize output state */
-    s.outfun = outfun;
-    s.outhow = outhow;
-    s.next = 0;
-    s.first = 1;
-
-    /* return if bits() or decode() tries to read past available input */
-    if (setjmp(s.env) != 0)             /* if came back here via longjmp(), */
-        err = 2;                        /*  then skip decomp(), return error */
-    else
-        err = decomp(&s);               /* decompress */
-
-    /* return unused input */
-    if (left != NULL)
-        *left = s.left;
-    if (in != NULL)
-        *in = s.left ? s.in : NULL;
-
-    /* write any leftover output and update the error code if needed */
-    if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0)
-        err = 1;
-    return err;
-}
-
-#ifdef TEST
-/* Example of how to use blast() */
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CHUNK 16384
-
-local unsigned inf(void *how, unsigned char **buf)
-{
-    static unsigned char hold[CHUNK];
-
-    *buf = hold;
-    return fread(hold, 1, CHUNK, (FILE *)how);
-}
-
-local int outf(void *how, unsigned char *buf, unsigned len)
-{
-    return fwrite(buf, 1, len, (FILE *)how) != len;
-}
-
-/* Decompress a PKWare Compression Library stream from stdin to stdout */
-int main(void)
-{
-    int ret;
-    unsigned left;
-
-    /* decompress to stdout */
-    left = 0;
-    ret = blast(inf, stdin, outf, stdout, &left, NULL);
-    if (ret != 0)
-        fprintf(stderr, "blast error: %d\n", ret);
-
-    /* count any leftover bytes */
-    while (getchar() != EOF)
-        left++;
-    if (left)
-        fprintf(stderr, "blast warning: %u unused bytes of input\n", left);
-
-    /* return blast() error code */
-    return ret;
-}
-#endif

crates/libz-sys/src/zlib/contrib/blast/blast.h

diff --git a/crates/libz-sys/src/zlib/contrib/blast/blast.h b/crates/libz-sys/src/zlib/contrib/blast/blast.h
deleted file mode 100644
index 6cf65ed..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/blast.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* blast.h -- interface for blast.c
-  Copyright (C) 2003, 2012, 2013 Mark Adler
-  version 1.3, 24 Aug 2013
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-
-/*
- * blast() decompresses the PKWare Data Compression Library (DCL) compressed
- * format.  It provides the same functionality as the explode() function in
- * that library.  (Note: PKWare overused the "implode" verb, and the format
- * used by their library implode() function is completely different and
- * incompatible with the implode compression method supported by PKZIP.)
- *
- * The binary mode for stdio functions should be used to assure that the
- * compressed data is not corrupted when read or written.  For example:
- * fopen(..., "rb") and fopen(..., "wb").
- */
-
-
-typedef unsigned (*blast_in)(void *how, unsigned char **buf);
-typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len);
-/* Definitions for input/output functions passed to blast().  See below for
- * what the provided functions need to do.
- */
-
-
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
-          unsigned *left, unsigned char **in);
-/* Decompress input to output using the provided infun() and outfun() calls.
- * On success, the return value of blast() is zero.  If there is an error in
- * the source data, i.e. it is not in the proper format, then a negative value
- * is returned.  If there is not enough input available or there is not enough
- * output space, then a positive error is returned.
- *
- * The input function is invoked: len = infun(how, &buf), where buf is set by
- * infun() to point to the input buffer, and infun() returns the number of
- * available bytes there.  If infun() returns zero, then blast() returns with
- * an input error.  (blast() only asks for input if it needs it.)  inhow is for
- * use by the application to pass an input descriptor to infun(), if desired.
- *
- * If left and in are not NULL and *left is not zero when blast() is called,
- * then the *left bytes are *in are consumed for input before infun() is used.
- *
- * The output function is invoked: err = outfun(how, buf, len), where the bytes
- * to be written are buf[0..len-1].  If err is not zero, then blast() returns
- * with an output error.  outfun() is always called with len <= 4096.  outhow
- * is for use by the application to pass an output descriptor to outfun(), if
- * desired.
- *
- * If there is any unused input, *left is set to the number of bytes that were
- * read and *in points to them.  Otherwise *left is set to zero and *in is set
- * to NULL.  If left or in are NULL, then they are not set.
- *
- * The return codes are:
- *
- *   2:  ran out of input before completing decompression
- *   1:  output error before completing decompression
- *   0:  successful decompression
- *  -1:  literal flag not zero or one
- *  -2:  dictionary size not in 4..6
- *  -3:  distance is too far back
- *
- * At the bottom of blast.c is an example program that uses blast() that can be
- * compiled to produce a command-line decompression filter by defining TEST.
- */

crates/libz-sys/src/zlib/contrib/blast/test.pk

diff --git a/crates/libz-sys/src/zlib/contrib/blast/test.pk b/crates/libz-sys/src/zlib/contrib/blast/test.pk
deleted file mode 100644
index be10b2b..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/test.pk
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib/contrib/blast/test.txt

diff --git a/crates/libz-sys/src/zlib/contrib/blast/test.txt b/crates/libz-sys/src/zlib/contrib/blast/test.txt
deleted file mode 100644
index bfdf1c5..0000000
--- a/crates/libz-sys/src/zlib/contrib/blast/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-AIAIAIAIAIAIA
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/delphi/ZLib.pas

diff --git a/crates/libz-sys/src/zlib/contrib/delphi/ZLib.pas b/crates/libz-sys/src/zlib/contrib/delphi/ZLib.pas
deleted file mode 100644
index 060e199..0000000
--- a/crates/libz-sys/src/zlib/contrib/delphi/ZLib.pas
+++ /dev/null
@@ -1,557 +0,0 @@
-{*******************************************************}
-{                                                       }
-{       Borland Delphi Supplemental Components          }
-{       ZLIB Data Compression Interface Unit            }
-{                                                       }
-{       Copyright (c) 1997,99 Borland Corporation       }
-{                                                       }
-{*******************************************************}
-
-{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> }
-
-unit ZLib;
-
-interface
-
-uses SysUtils, Classes;
-
-type
-  TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
-  TFree = procedure (AppData, Block: Pointer); cdecl;
-
-  // Internal structure.  Ignore.
-  TZStreamRec = packed record
-    next_in: PChar;       // next input byte
-    avail_in: Integer;    // number of bytes available at next_in
-    total_in: Longint;    // total nb of input bytes read so far
-
-    next_out: PChar;      // next output byte should be put here
-    avail_out: Integer;   // remaining free space at next_out
-    total_out: Longint;   // total nb of bytes output so far
-
-    msg: PChar;           // last error message, NULL if no error
-    internal: Pointer;    // not visible by applications
-
-    zalloc: TAlloc;       // used to allocate the internal state
-    zfree: TFree;         // used to free the internal state
-    AppData: Pointer;     // private data object passed to zalloc and zfree
-
-    data_type: Integer;   // best guess about the data type: ascii or binary
-    adler: Longint;       // adler32 value of the uncompressed data
-    reserved: Longint;    // reserved for future use
-  end;
-
-  // Abstract ancestor class
-  TCustomZlibStream = class(TStream)
-  private
-    FStrm: TStream;
-    FStrmPos: Integer;
-    FOnProgress: TNotifyEvent;
-    FZRec: TZStreamRec;
-    FBuffer: array [Word] of Char;
-  protected
-    procedure Progress(Sender: TObject); dynamic;
-    property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
-    constructor Create(Strm: TStream);
-  end;
-
-{ TCompressionStream compresses data on the fly as data is written to it, and
-  stores the compressed data to another stream.
-
-  TCompressionStream is write-only and strictly sequential. Reading from the
-  stream will raise an exception. Using Seek to move the stream pointer
-  will raise an exception.
-
-  Output data is cached internally, written to the output stream only when
-  the internal output buffer is full.  All pending output data is flushed
-  when the stream is destroyed.
-
-  The Position property returns the number of uncompressed bytes of
-  data that have been written to the stream so far.
-
-  CompressionRate returns the on-the-fly percentage by which the original
-  data has been compressed:  (1 - (CompressedBytes / UncompressedBytes)) * 100
-  If raw data size = 100 and compressed data size = 25, the CompressionRate
-  is 75%
-
-  The OnProgress event is called each time the output buffer is filled and
-  written to the output stream.  This is useful for updating a progress
-  indicator when you are writing a large chunk of data to the compression
-  stream in a single call.}
-
-
-  TCompressionLevel = (clNone, clFastest, clDefault, clMax);
-
-  TCompressionStream = class(TCustomZlibStream)
-  private
-    function GetCompressionRate: Single;
-  public
-    constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
-    destructor Destroy; override;
-    function Read(var Buffer; Count: Longint): Longint; override;
-    function Write(const Buffer; Count: Longint): Longint; override;
-    function Seek(Offset: Longint; Origin: Word): Longint; override;
-    property CompressionRate: Single read GetCompressionRate;
-    property OnProgress;
-  end;
-
-{ TDecompressionStream decompresses data on the fly as data is read from it.
-
-  Compressed data comes from a separate source stream.  TDecompressionStream
-  is read-only and unidirectional; you can seek forward in the stream, but not
-  backwards.  The special case of setting the stream position to zero is
-  allowed.  Seeking forward decompresses data until the requested position in
-  the uncompressed data has been reached.  Seeking backwards, seeking relative
-  to the end of the stream, requesting the size of the stream, and writing to
-  the stream will raise an exception.
-
-  The Position property returns the number of bytes of uncompressed data that
-  have been read from the stream so far.
-
-  The OnProgress event is called each time the internal input buffer of
-  compressed data is exhausted and the next block is read from the input stream.
-  This is useful for updating a progress indicator when you are reading a
-  large chunk of data from the decompression stream in a single call.}
-
-  TDecompressionStream = class(TCustomZlibStream)
-  public
-    constructor Create(Source: TStream);
-    destructor Destroy; override;
-    function Read(var Buffer; Count: Longint): Longint; override;
-    function Write(const Buffer; Count: Longint): Longint; override;
-    function Seek(Offset: Longint; Origin: Word): Longint; override;
-    property OnProgress;
-  end;
-
-
-
-{ CompressBuf compresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
-       OutBytes = number of bytes in OutBuf   }
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
-                      out OutBuf: Pointer; out OutBytes: Integer);
-
-
-{ DecompressBuf decompresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-       OutEstimate = zero, or est. size of the decompressed data
-  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
-       OutBytes = number of bytes in OutBuf   }
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
- OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-
-{ DecompressToUserBuf decompresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-  Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
-       BufSize = number of bytes in OutBuf   }
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
-  const OutBuf: Pointer; BufSize: Integer);
-
-const
-  zlib_version = '1.2.11';
-
-type
-  EZlibError = class(Exception);
-  ECompressionError = class(EZlibError);
-  EDecompressionError = class(EZlibError);
-
-implementation
-
-uses ZLibConst;
-
-const
-  Z_NO_FLUSH      = 0;
-  Z_PARTIAL_FLUSH = 1;
-  Z_SYNC_FLUSH    = 2;
-  Z_FULL_FLUSH    = 3;
-  Z_FINISH        = 4;
-
-  Z_OK            = 0;
-  Z_STREAM_END    = 1;
-  Z_NEED_DICT     = 2;
-  Z_ERRNO         = (-1);
-  Z_STREAM_ERROR  = (-2);
-  Z_DATA_ERROR    = (-3);
-  Z_MEM_ERROR     = (-4);
-  Z_BUF_ERROR     = (-5);
-  Z_VERSION_ERROR = (-6);
-
-  Z_NO_COMPRESSION       =   0;
-  Z_BEST_SPEED           =   1;
-  Z_BEST_COMPRESSION     =   9;
-  Z_DEFAULT_COMPRESSION  = (-1);
-
-  Z_FILTERED            = 1;
-  Z_HUFFMAN_ONLY        = 2;
-  Z_RLE                 = 3;
-  Z_DEFAULT_STRATEGY    = 0;
-
-  Z_BINARY   = 0;
-  Z_ASCII    = 1;
-  Z_UNKNOWN  = 2;
-
-  Z_DEFLATED = 8;
-
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-procedure adler32; external;
-procedure compressBound; external;
-procedure crc32; external;
-procedure deflateInit2_; external;
-procedure deflateParams; external;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
-  Result := AllocMem(Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
-  FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
-  Move(source^, dest^, count);
-end;
-
-
-
-// deflate compresses data
-function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
-  recsize: Integer): Integer; external;
-function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function deflateEnd(var strm: TZStreamRec): Integer; external;
-
-// inflate decompresses data
-function inflateInit_(var strm: TZStreamRec; version: PChar;
-  recsize: Integer): Integer; external;
-function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function inflateEnd(var strm: TZStreamRec): Integer; external;
-function inflateReset(var strm: TZStreamRec): Integer; external;
-
-
-function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
-begin
-//  GetMem(Result, Items*Size);
-  Result := AllocMem(Items * Size);
-end;
-
-procedure zlibFreeMem(AppData, Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-{function zlibCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise EZlibError.Create('error');    //!!
-end;}
-
-function CCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise ECompressionError.Create('error'); //!!
-end;
-
-function DCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise EDecompressionError.Create('error');  //!!
-end;
-
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
-                      out OutBuf: Pointer; out OutBytes: Integer);
-var
-  strm: TZStreamRec;
-  P: Pointer;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
-  GetMem(OutBuf, OutBytes);
-  try
-    strm.next_in := InBuf;
-    strm.avail_in := InBytes;
-    strm.next_out := OutBuf;
-    strm.avail_out := OutBytes;
-    CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
-    try
-      while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
-      begin
-        P := OutBuf;
-        Inc(OutBytes, 256);
-        ReallocMem(OutBuf, OutBytes);
-        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
-        strm.avail_out := 256;
-      end;
-    finally
-      CCheck(deflateEnd(strm));
-    end;
-    ReallocMem(OutBuf, strm.total_out);
-    OutBytes := strm.total_out;
-  except
-    FreeMem(OutBuf);
-    raise
-  end;
-end;
-
-
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
-  OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-var
-  strm: TZStreamRec;
-  P: Pointer;
-  BufInc: Integer;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  BufInc := (InBytes + 255) and not 255;
-  if OutEstimate = 0 then
-    OutBytes := BufInc
-  else
-    OutBytes := OutEstimate;
-  GetMem(OutBuf, OutBytes);
-  try
-    strm.next_in := InBuf;
-    strm.avail_in := InBytes;
-    strm.next_out := OutBuf;
-    strm.avail_out := OutBytes;
-    DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
-    try
-      while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
-      begin
-        P := OutBuf;
-        Inc(OutBytes, BufInc);
-        ReallocMem(OutBuf, OutBytes);
-        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
-        strm.avail_out := BufInc;
-      end;
-    finally
-      DCheck(inflateEnd(strm));
-    end;
-    ReallocMem(OutBuf, strm.total_out);
-    OutBytes := strm.total_out;
-  except
-    FreeMem(OutBuf);
-    raise
-  end;
-end;
-
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
-  const OutBuf: Pointer; BufSize: Integer);
-var
-  strm: TZStreamRec;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  strm.next_in := InBuf;
-  strm.avail_in := InBytes;
-  strm.next_out := OutBuf;
-  strm.avail_out := BufSize;
-  DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
-  try
-    if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then
-      raise EZlibError.CreateRes(@sTargetBufferTooSmall);
-  finally
-    DCheck(inflateEnd(strm));
-  end;
-end;
-
-// TCustomZlibStream
-
-constructor TCustomZLibStream.Create(Strm: TStream);
-begin
-  inherited Create;
-  FStrm := Strm;
-  FStrmPos := Strm.Position;
-  FZRec.zalloc := zlibAllocMem;
-  FZRec.zfree := zlibFreeMem;
-end;
-
-procedure TCustomZLibStream.Progress(Sender: TObject);
-begin
-  if Assigned(FOnProgress) then FOnProgress(Sender);
-end;
-
-
-// TCompressionStream
-
-constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
-  Dest: TStream);
-const
-  Levels: array [TCompressionLevel] of ShortInt =
-    (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
-begin
-  inherited Create(Dest);
-  FZRec.next_out := FBuffer;
-  FZRec.avail_out := sizeof(FBuffer);
-  CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec)));
-end;
-
-destructor TCompressionStream.Destroy;
-begin
-  FZRec.next_in := nil;
-  FZRec.avail_in := 0;
-  try
-    if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-    while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
-      and (FZRec.avail_out = 0) do
-    begin
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
-      FZRec.next_out := FBuffer;
-      FZRec.avail_out := sizeof(FBuffer);
-    end;
-    if FZRec.avail_out < sizeof(FBuffer) then
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
-  finally
-    deflateEnd(FZRec);
-  end;
-  inherited Destroy;
-end;
-
-function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
-  raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
-  FZRec.next_in := @Buffer;
-  FZRec.avail_in := Count;
-  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-  while (FZRec.avail_in > 0) do
-  begin
-    CCheck(deflate(FZRec, 0));
-    if FZRec.avail_out = 0 then
-    begin
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
-      FZRec.next_out := FBuffer;
-      FZRec.avail_out := sizeof(FBuffer);
-      FStrmPos := FStrm.Position;
-      Progress(Self);
-    end;
-  end;
-  Result := Count;
-end;
-
-function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-begin
-  if (Offset = 0) and (Origin = soFromCurrent) then
-    Result := FZRec.total_in
-  else
-    raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.GetCompressionRate: Single;
-begin
-  if FZRec.total_in = 0 then
-    Result := 0
-  else
-    Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
-end;
-
-
-// TDecompressionStream
-
-constructor TDecompressionStream.Create(Source: TStream);
-begin
-  inherited Create(Source);
-  FZRec.next_in := FBuffer;
-  FZRec.avail_in := 0;
-  DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
-end;
-
-destructor TDecompressionStream.Destroy;
-begin
-  FStrm.Seek(-FZRec.avail_in, 1);
-  inflateEnd(FZRec);
-  inherited Destroy;
-end;
-
-function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
-  FZRec.next_out := @Buffer;
-  FZRec.avail_out := Count;
-  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-  while (FZRec.avail_out > 0) do
-  begin
-    if FZRec.avail_in = 0 then
-    begin
-      FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
-      if FZRec.avail_in = 0 then
-      begin
-        Result := Count - FZRec.avail_out;
-        Exit;
-      end;
-      FZRec.next_in := FBuffer;
-      FStrmPos := FStrm.Position;
-      Progress(Self);
-    end;
-    CCheck(inflate(FZRec, 0));
-  end;
-  Result := Count;
-end;
-
-function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
-  raise EDecompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-var
-  I: Integer;
-  Buf: array [0..4095] of Char;
-begin
-  if (Offset = 0) and (Origin = soFromBeginning) then
-  begin
-    DCheck(inflateReset(FZRec));
-    FZRec.next_in := FBuffer;
-    FZRec.avail_in := 0;
-    FStrm.Position := 0;
-    FStrmPos := 0;
-  end
-  else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
-          ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
-  begin
-    if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
-    if Offset > 0 then
-    begin
-      for I := 1 to Offset div sizeof(Buf) do
-        ReadBuffer(Buf, sizeof(Buf));
-      ReadBuffer(Buf, Offset mod sizeof(Buf));
-    end;
-  end
-  else
-    raise EDecompressionError.CreateRes(@sInvalidStreamOp);
-  Result := FZRec.total_out;
-end;
-
-
-end.

crates/libz-sys/src/zlib/contrib/delphi/ZLibConst.pas

diff --git a/crates/libz-sys/src/zlib/contrib/delphi/ZLibConst.pas b/crates/libz-sys/src/zlib/contrib/delphi/ZLibConst.pas
deleted file mode 100644
index cdfe136..0000000
--- a/crates/libz-sys/src/zlib/contrib/delphi/ZLibConst.pas
+++ /dev/null
@@ -1,11 +0,0 @@
-unit ZLibConst;
-
-interface
-
-resourcestring
-  sTargetBufferTooSmall = 'ZLib error: target buffer may be too small';
-  sInvalidStreamOp = 'Invalid stream operation';
-
-implementation
-
-end.

crates/libz-sys/src/zlib/contrib/delphi/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/delphi/readme.txt b/crates/libz-sys/src/zlib/contrib/delphi/readme.txt
deleted file mode 100644
index 2dc9a8b..0000000
--- a/crates/libz-sys/src/zlib/contrib/delphi/readme.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-
-Overview
-========
-
-This directory contains an update to the ZLib interface unit,
-distributed by Borland as a Delphi supplemental component.
-
-The original ZLib unit is Copyright (c) 1997,99 Borland Corp.,
-and is based on zlib version 1.0.4.  There are a series of bugs
-and security problems associated with that old zlib version, and
-we recommend the users to update their ZLib unit.
-
-
-Summary of modifications
-========================
-
-- Improved makefile, adapted to zlib version 1.2.1.
-
-- Some field types from TZStreamRec are changed from Integer to
-  Longint, for consistency with the zlib.h header, and for 64-bit
-  readiness.
-
-- The zlib_version constant is updated.
-
-- The new Z_RLE strategy has its corresponding symbolic constant.
-
-- The allocation and deallocation functions and function types
-  (TAlloc, TFree, zlibAllocMem and zlibFreeMem) are now cdecl,
-  and _malloc and _free are added as C RTL stubs.  As a result,
-  the original C sources of zlib can be compiled out of the box,
-  and linked to the ZLib unit.
-
-
-Suggestions for improvements
-============================
-
-Currently, the ZLib unit provides only a limited wrapper around
-the zlib library, and much of the original zlib functionality is
-missing.  Handling compressed file formats like ZIP/GZIP or PNG
-cannot be implemented without having this functionality.
-Applications that handle these formats are either using their own,
-duplicated code, or not using the ZLib unit at all.
-
-Here are a few suggestions:
-
-- Checksum class wrappers around adler32() and crc32(), similar
-  to the Java classes that implement the java.util.zip.Checksum
-  interface.
-
-- The ability to read and write raw deflate streams, without the
-  zlib stream header and trailer.  Raw deflate streams are used
-  in the ZIP file format.
-
-- The ability to read and write gzip streams, used in the GZIP
-  file format, and normally produced by the gzip program.
-
-- The ability to select a different compression strategy, useful
-  to PNG and MNG image compression, and to multimedia compression
-  in general.  Besides the compression level
-
-    TCompressionLevel = (clNone, clFastest, clDefault, clMax);
-
-  which, in fact, could have used the 'z' prefix and avoided
-  TColor-like symbols
-
-    TCompressionLevel = (zcNone, zcFastest, zcDefault, zcMax);
-
-  there could be a compression strategy
-
-    TCompressionStrategy = (zsDefault, zsFiltered, zsHuffmanOnly, zsRle);
-
-- ZIP and GZIP stream handling via TStreams.
-
-
---
-Cosmin Truta <cosmint@cs.ubbcluj.ro>

crates/libz-sys/src/zlib/contrib/delphi/zlibd32.mak

diff --git a/crates/libz-sys/src/zlib/contrib/delphi/zlibd32.mak b/crates/libz-sys/src/zlib/contrib/delphi/zlibd32.mak
deleted file mode 100644
index 9bb00b7..0000000
--- a/crates/libz-sys/src/zlib/contrib/delphi/zlibd32.mak
+++ /dev/null
@@ -1,99 +0,0 @@
-# Makefile for zlib
-# For use with Delphi and C++ Builder under Win32
-# Updated for zlib 1.2.x by Cosmin Truta
-
-# ------------ Borland C++ ------------
-
-# This project uses the Delphi (fastcall/register) calling convention:
-LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-CC = bcc32
-LD = bcc32
-AR = tlib
-# do not use "-pr" in CFLAGS
-CFLAGS = -a -d -k- -O2 $(LOC)
-LDFLAGS =
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
-

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.build

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.build b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.build
deleted file mode 100644
index 7f90d6b..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.build
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<project name="DotZLib" default="build" basedir="./DotZLib">

-	<description>A .Net wrapper library around ZLib1.dll</description>

-

-	<property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />

-	<property name="build.root" value="bin" />

-

-	<property name="debug" value="true" />

-	<property name="nunit" value="true" />

-

-	<property name="build.folder" value="${build.root}/debug/" if="${debug}" />

-	<property name="build.folder" value="${build.root}/release/" unless="${debug}" />

-

-	<target name="clean" description="Remove all generated files">

-		<delete dir="${build.root}" failonerror="false" />

-	</target>

-

-	<target name="build" description="compiles the source code">

-

-		<mkdir dir="${build.folder}" />

-		<csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">

-			<references basedir="${nunit.location}">

-				<includes if="${nunit}" name="nunit.framework.dll" />

-			</references>

-			<sources>

-				<includes name="*.cs" />

-				<excludes name="UnitTests.cs" unless="${nunit}" />

-			</sources>

-			<arg value="/d:nunit" if="${nunit}" />

-		</csc>

-	</target>

-

-</project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.chm

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.chm b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.chm
deleted file mode 100644
index f214a44..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.chm
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.sln

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.sln b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.sln
deleted file mode 100644
index ac45ca0..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET

-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET

-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET

-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
deleted file mode 100644
index 0491bfc..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-//

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-//

-[assembly: AssemblyTitle("DotZLib")]

-[assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("Henrik Ravn")]

-[assembly: AssemblyProduct("")]

-[assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-//

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers

-// by using the '*' as shown below:

-

-[assembly: AssemblyVersion("1.0.*")]

-

-//

-// In order to sign your assembly you must specify a key to use. Refer to the

-// Microsoft .NET Framework documentation for more information on assembly signing.

-//

-// Use the attributes below to control which key is used for signing.

-//

-// Notes:

-//   (*) If no key is specified, the assembly is not signed.

-//   (*) KeyName refers to a key that has been installed in the Crypto Service

-//       Provider (CSP) on your machine. KeyFile refers to a file which contains

-//       a key.

-//   (*) If the KeyFile and the KeyName values are both specified, the

-//       following processing occurs:

-//       (1) If the KeyName can be found in the CSP, that key is used.

-//       (2) If the KeyName does not exist and the KeyFile does exist, the key

-//           in the KeyFile is installed into the CSP and used.

-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

-//       When specifying the KeyFile, the location of the KeyFile should be

-//       relative to the project output directory which is

-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

-//       located in the project directory, you would specify the AssemblyKeyFile

-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

-//       documentation for more information on this.

-//

-[assembly: AssemblyDelaySign(false)]

-[assembly: AssemblyKeyFile("")]

-[assembly: AssemblyKeyName("")]

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
deleted file mode 100644
index 788b2fc..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Runtime.InteropServices;

-using System.Text;

-

-

-namespace DotZLib

-{

-    #region ChecksumGeneratorBase

-    /// <summary>

-    /// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s

-    /// </summary>

-    /// <example></example>

-    public abstract class ChecksumGeneratorBase : ChecksumGenerator

-    {

-        /// <summary>

-        /// The value of the current checksum

-        /// </summary>

-        protected uint _current;

-

-        /// <summary>

-        /// Initializes a new instance of the checksum generator base - the current checksum is

-        /// set to zero

-        /// </summary>

-        public ChecksumGeneratorBase()

-        {

-            _current = 0;

-        }

-

-        /// <summary>

-        /// Initializes a new instance of the checksum generator basewith a specified value

-        /// </summary>

-        /// <param name="initialValue">The value to set the current checksum to</param>

-        public ChecksumGeneratorBase(uint initialValue)

-        {

-            _current = initialValue;

-        }

-

-        /// <summary>

-        /// Resets the current checksum to zero

-        /// </summary>

-        public void Reset() { _current = 0; }

-

-        /// <summary>

-        /// Gets the current checksum value

-        /// </summary>

-        public uint Value { get { return _current; } }

-

-        /// <summary>

-        /// Updates the current checksum with part of an array of bytes

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        /// <param name="offset">Where in <c>data</c> to start updating</param>

-        /// <param name="count">The number of bytes from <c>data</c> to use</param>

-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>

-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.

-        /// This is therefore the only method a derived class has to implement</remarks>

-        public abstract void Update(byte[] data, int offset, int count);

-

-        /// <summary>

-        /// Updates the current checksum with an array of bytes.

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        public void Update(byte[] data)

-        {

-            Update(data, 0, data.Length);

-        }

-

-        /// <summary>

-        /// Updates the current checksum with the data from a string

-        /// </summary>

-        /// <param name="data">The string to update the checksum with</param>

-        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>

-        public void Update(string data)

-        {

-			Update(Encoding.UTF8.GetBytes(data));

-        }

-

-        /// <summary>

-        /// Updates the current checksum with the data from a string, using a specific encoding

-        /// </summary>

-        /// <param name="data">The string to update the checksum with</param>

-        /// <param name="encoding">The encoding to use</param>

-        public void Update(string data, Encoding encoding)

-        {

-            Update(encoding.GetBytes(data));

-        }

-

-    }

-    #endregion

-

-    #region CRC32

-    /// <summary>

-    /// Implements a CRC32 checksum generator

-    /// </summary>

-    public sealed class CRC32Checksum : ChecksumGeneratorBase

-    {

-        #region DLL imports

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern uint crc32(uint crc, int data, uint length);

-

-        #endregion

-

-        /// <summary>

-        /// Initializes a new instance of the CRC32 checksum generator

-        /// </summary>

-        public CRC32Checksum() : base() {}

-

-        /// <summary>

-        /// Initializes a new instance of the CRC32 checksum generator with a specified value

-        /// </summary>

-        /// <param name="initialValue">The value to set the current checksum to</param>

-        public CRC32Checksum(uint initialValue) : base(initialValue) {}

-

-        /// <summary>

-        /// Updates the current checksum with part of an array of bytes

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        /// <param name="offset">Where in <c>data</c> to start updating</param>

-        /// <param name="count">The number of bytes from <c>data</c> to use</param>

-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>

-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        public override void Update(byte[] data, int offset, int count)

-        {

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > data.Length) throw new ArgumentException();

-            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);

-            try

-            {

-                _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);

-            }

-            finally

-            {

-                hData.Free();

-            }

-        }

-

-    }

-    #endregion

-

-    #region Adler

-    /// <summary>

-    /// Implements a checksum generator that computes the Adler checksum on data

-    /// </summary>

-    public sealed class AdlerChecksum : ChecksumGeneratorBase

-    {

-        #region DLL imports

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern uint adler32(uint adler, int data, uint length);

-

-        #endregion

-

-        /// <summary>

-        /// Initializes a new instance of the Adler checksum generator

-        /// </summary>

-        public AdlerChecksum() : base() {}

-

-        /// <summary>

-        /// Initializes a new instance of the Adler checksum generator with a specified value

-        /// </summary>

-        /// <param name="initialValue">The value to set the current checksum to</param>

-        public AdlerChecksum(uint initialValue) : base(initialValue) {}

-

-        /// <summary>

-        /// Updates the current checksum with part of an array of bytes

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        /// <param name="offset">Where in <c>data</c> to start updating</param>

-        /// <param name="count">The number of bytes from <c>data</c> to use</param>

-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>

-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        public override void Update(byte[] data, int offset, int count)

-        {

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > data.Length) throw new ArgumentException();

-            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);

-            try

-            {

-                _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);

-            }

-            finally

-            {

-                hData.Free();

-            }

-        }

-

-    }

-    #endregion

-

-}
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
deleted file mode 100644
index c1cab3a..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Diagnostics;

-

-namespace DotZLib

-{

-

-	/// <summary>

-	/// This class implements a circular buffer

-	/// </summary>

-	internal class CircularBuffer

-	{

-        #region Private data

-        private int _capacity;

-        private int _head;

-        private int _tail;

-        private int _size;

-        private byte[] _buffer;

-        #endregion

-

-        public CircularBuffer(int capacity)

-        {

-            Debug.Assert( capacity > 0 );

-            _buffer = new byte[capacity];

-            _capacity = capacity;

-            _head = 0;

-            _tail = 0;

-            _size = 0;

-        }

-

-        public int Size { get { return _size; } }

-

-        public int Put(byte[] source, int offset, int count)

-        {

-            Debug.Assert( count > 0 );

-            int trueCount = Math.Min(count, _capacity - Size);

-            for (int i = 0; i < trueCount; ++i)

-                _buffer[(_tail+i) % _capacity] = source[offset+i];

-            _tail += trueCount;

-            _tail %= _capacity;

-            _size += trueCount;

-            return trueCount;

-        }

-

-        public bool Put(byte b)

-        {

-            if (Size == _capacity) // no room

-                return false;

-            _buffer[_tail++] = b;

-            _tail %= _capacity;

-            ++_size;

-            return true;

-        }

-

-        public int Get(byte[] destination, int offset, int count)

-        {

-            int trueCount = Math.Min(count,Size);

-            for (int i = 0; i < trueCount; ++i)

-                destination[offset + i] = _buffer[(_head+i) % _capacity];

-            _head += trueCount;

-            _head %= _capacity;

-            _size -= trueCount;

-            return trueCount;

-        }

-

-        public int Get()

-        {

-            if (Size == 0)

-                return -1;

-

-            int result = (int)_buffer[_head++ % _capacity];

-            --_size;

-            return result;

-        }

-

-    }

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CodecBase.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
deleted file mode 100644
index 42e6da3..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Runtime.InteropServices;

-

-namespace DotZLib

-{

-	/// <summary>

-	/// Implements the common functionality needed for all <see cref="Codec"/>s

-	/// </summary>

-	public abstract class CodecBase : Codec, IDisposable

-	{

-

-        #region Data members

-

-        /// <summary>

-        /// Instance of the internal zlib buffer structure that is

-        /// passed to all functions in the zlib dll

-        /// </summary>

-        internal ZStream _ztream = new ZStream();

-

-        /// <summary>

-        /// True if the object instance has been disposed, false otherwise

-        /// </summary>

-        protected bool _isDisposed = false;

-

-        /// <summary>

-        /// The size of the internal buffers

-        /// </summary>

-        protected const int kBufferSize = 16384;

-

-        private byte[] _outBuffer = new byte[kBufferSize];

-        private byte[] _inBuffer = new byte[kBufferSize];

-

-        private GCHandle _hInput;

-        private GCHandle _hOutput;

-

-        private uint _checksum = 0;

-

-        #endregion

-

-        /// <summary>

-        /// Initializes a new instance of the <c>CodeBase</c> class.

-        /// </summary>

-		public CodecBase()

-		{

-            try

-            {

-                _hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned);

-                _hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned);

-            }

-            catch (Exception)

-            {

-                CleanUp(false);

-                throw;

-            }

-        }

-

-

-        #region Codec Members

-

-        /// <summary>

-        /// Occurs when more processed data are available.

-        /// </summary>

-        public event DataAvailableHandler DataAvailable;

-

-        /// <summary>

-        /// Fires the <see cref="DataAvailable"/> event

-        /// </summary>

-        protected void OnDataAvailable()

-        {

-            if (_ztream.total_out > 0)

-            {

-                if (DataAvailable != null)

-                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out);

-                resetOutput();

-            }

-        }

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        public void Add(byte[] data)

-        {

-            Add(data,0,data.Length);

-        }

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>

-        /// <param name="count">The number of bytes to add</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        /// <remarks>This must be implemented by a derived class</remarks>

-        public abstract void Add(byte[] data, int offset, int count);

-

-        /// <summary>

-        /// Finishes up any pending data that needs to be processed and handled.

-        /// </summary>

-        /// <remarks>This must be implemented by a derived class</remarks>

-        public abstract void Finish();

-

-        /// <summary>

-        /// Gets the checksum of the data that has been added so far

-        /// </summary>

-        public uint Checksum { get { return _checksum; } }

-

-        #endregion

-

-        #region Destructor & IDisposable stuff

-

-        /// <summary>

-        /// Destroys this instance

-        /// </summary>

-        ~CodecBase()

-        {

-            CleanUp(false);

-        }

-

-        /// <summary>

-        /// Releases any unmanaged resources and calls the <see cref="CleanUp()"/> method of the derived class

-        /// </summary>

-        public void Dispose()

-        {

-            CleanUp(true);

-        }

-

-        /// <summary>

-        /// Performs any codec specific cleanup

-        /// </summary>

-        /// <remarks>This must be implemented by a derived class</remarks>

-        protected abstract void CleanUp();

-

-        // performs the release of the handles and calls the dereived CleanUp()

-        private void CleanUp(bool isDisposing)

-        {

-            if (!_isDisposed)

-            {

-                CleanUp();

-                if (_hInput.IsAllocated)

-                    _hInput.Free();

-                if (_hOutput.IsAllocated)

-                    _hOutput.Free();

-

-                _isDisposed = true;

-            }

-        }

-

-

-        #endregion

-

-        #region Helper methods

-

-        /// <summary>

-        /// Copies a number of bytes to the internal codec buffer - ready for proccesing

-        /// </summary>

-        /// <param name="data">The byte array that contains the data to copy</param>

-        /// <param name="startIndex">The index of the first byte to copy</param>

-        /// <param name="count">The number of bytes to copy from <c>data</c></param>

-        protected void copyInput(byte[] data, int startIndex, int count)

-        {

-            Array.Copy(data, startIndex, _inBuffer,0, count);

-            _ztream.next_in = _hInput.AddrOfPinnedObject();

-            _ztream.total_in = 0;

-            _ztream.avail_in = (uint)count;

-

-        }

-

-        /// <summary>

-        /// Resets the internal output buffers to a known state - ready for processing

-        /// </summary>

-        protected void resetOutput()

-        {

-            _ztream.total_out = 0;

-            _ztream.avail_out = kBufferSize;

-            _ztream.next_out = _hOutput.AddrOfPinnedObject();

-        }

-

-        /// <summary>

-        /// Updates the running checksum property

-        /// </summary>

-        /// <param name="newSum">The new checksum value</param>

-        protected void setChecksum(uint newSum)

-        {

-            _checksum = newSum;

-        }

-        #endregion

-

-    }

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Deflater.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Deflater.cs
deleted file mode 100644
index c247792..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Deflater.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Diagnostics;

-using System.Runtime.InteropServices;

-

-namespace DotZLib

-{

-

-    /// <summary>

-    /// Implements a data compressor, using the deflate algorithm in the ZLib dll

-    /// </summary>

-	public sealed class Deflater : CodecBase

-	{

-        #region Dll imports

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]

-        private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int deflate(ref ZStream sz, int flush);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int deflateReset(ref ZStream sz);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int deflateEnd(ref ZStream sz);

-        #endregion

-

-        /// <summary>

-        /// Constructs an new instance of the <c>Deflater</c>

-        /// </summary>

-        /// <param name="level">The compression level to use for this <c>Deflater</c></param>

-		public Deflater(CompressLevel level) : base()

-		{

-            int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream));

-            if (retval != 0)

-                throw new ZLibException(retval, "Could not initialize deflater");

-

-            resetOutput();

-		}

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>

-        /// <param name="count">The number of bytes to add</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        public override void Add(byte[] data, int offset, int count)

-        {

-            if (data == null) throw new ArgumentNullException();

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > data.Length) throw new ArgumentException();

-

-            int total = count;

-            int inputIndex = offset;

-            int err = 0;

-

-            while (err >= 0 && inputIndex < total)

-            {

-                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));

-                while (err >= 0 && _ztream.avail_in > 0)

-                {

-                    err = deflate(ref _ztream, (int)FlushTypes.None);

-                    if (err == 0)

-                        while (_ztream.avail_out == 0)

-                        {

-                            OnDataAvailable();

-                            err = deflate(ref _ztream, (int)FlushTypes.None);

-                        }

-                    inputIndex += (int)_ztream.total_in;

-                }

-            }

-            setChecksum( _ztream.adler );

-        }

-

-

-        /// <summary>

-        /// Finishes up any pending data that needs to be processed and handled.

-        /// </summary>

-        public override void Finish()

-        {

-            int err;

-            do

-            {

-                err = deflate(ref _ztream, (int)FlushTypes.Finish);

-                OnDataAvailable();

-            }

-            while (err == 0);

-            setChecksum( _ztream.adler );

-            deflateReset(ref _ztream);

-            resetOutput();

-        }

-

-        /// <summary>

-        /// Closes the internal zlib deflate stream

-        /// </summary>

-        protected override void CleanUp() { deflateEnd(ref _ztream); }

-

-    }

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
deleted file mode 100644
index be184b4..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.IO;

-using System.Runtime.InteropServices;

-using System.Text;

-

-

-namespace DotZLib

-{

-

-    #region Internal types

-

-    /// <summary>

-    /// Defines constants for the various flush types used with zlib

-    /// </summary>

-    internal enum FlushTypes

-    {

-        None,  Partial,  Sync,  Full,  Finish,  Block

-    }

-

-    #region ZStream structure

-    // internal mapping of the zlib zstream structure for marshalling

-    [StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)]

-    internal struct ZStream

-    {

-        public IntPtr next_in;

-        public uint avail_in;

-        public uint total_in;

-

-        public IntPtr next_out;

-        public uint avail_out;

-        public uint total_out;

-

-        [MarshalAs(UnmanagedType.LPStr)]

-        string msg;

-        uint state;

-

-        uint zalloc;

-        uint zfree;

-        uint opaque;

-

-        int data_type;

-        public uint adler;

-        uint reserved;

-    }

-

-    #endregion

-

-    #endregion

-

-    #region Public enums

-    /// <summary>

-    /// Defines constants for the available compression levels in zlib

-    /// </summary>

-    public enum CompressLevel : int

-    {

-        /// <summary>

-        /// The default compression level with a reasonable compromise between compression and speed

-        /// </summary>

-        Default = -1,

-        /// <summary>

-        /// No compression at all. The data are passed straight through.

-        /// </summary>

-        None = 0,

-        /// <summary>

-        /// The maximum compression rate available.

-        /// </summary>

-        Best = 9,

-        /// <summary>

-        /// The fastest available compression level.

-        /// </summary>

-        Fastest = 1

-    }

-    #endregion

-

-    #region Exception classes

-    /// <summary>

-    /// The exception that is thrown when an error occurs on the zlib dll

-    /// </summary>

-    public class ZLibException : ApplicationException

-    {

-        /// <summary>

-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified

-        /// error message and error code

-        /// </summary>

-        /// <param name="errorCode">The zlib error code that caused the exception</param>

-        /// <param name="msg">A message that (hopefully) describes the error</param>

-        public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg))

-        {

-        }

-

-        /// <summary>

-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified

-        /// error code

-        /// </summary>

-        /// <param name="errorCode">The zlib error code that caused the exception</param>

-        public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode))

-        {

-        }

-    }

-    #endregion

-

-    #region Interfaces

-

-    /// <summary>

-    /// Declares methods and properties that enables a running checksum to be calculated

-    /// </summary>

-    public interface ChecksumGenerator

-    {

-        /// <summary>

-        /// Gets the current value of the checksum

-        /// </summary>

-        uint Value { get; }

-

-        /// <summary>

-        /// Clears the current checksum to 0

-        /// </summary>

-        void Reset();

-

-        /// <summary>

-        /// Updates the current checksum with an array of bytes

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        void Update(byte[] data);

-

-        /// <summary>

-        /// Updates the current checksum with part of an array of bytes

-        /// </summary>

-        /// <param name="data">The data to update the checksum with</param>

-        /// <param name="offset">Where in <c>data</c> to start updating</param>

-        /// <param name="count">The number of bytes from <c>data</c> to use</param>

-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

-        /// <exception cref="ArgumentNullException"><c>data</c> is a null reference</exception>

-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        void Update(byte[] data, int offset, int count);

-

-        /// <summary>

-        /// Updates the current checksum with the data from a string

-        /// </summary>

-        /// <param name="data">The string to update the checksum with</param>

-        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>

-        void Update(string data);

-

-        /// <summary>

-        /// Updates the current checksum with the data from a string, using a specific encoding

-        /// </summary>

-        /// <param name="data">The string to update the checksum with</param>

-        /// <param name="encoding">The encoding to use</param>

-        void Update(string data, Encoding encoding);

-    }

-

-

-    /// <summary>

-    /// Represents the method that will be called from a codec when new data

-    /// are available.

-    /// </summary>

-    /// <paramref name="data">The byte array containing the processed data</paramref>

-    /// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref>

-    /// <paramref name="count">The number of processed bytes available</paramref>

-    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can.

-    /// You cannot assume that startIndex will be zero.

-    /// </remarks>

-    public delegate void DataAvailableHandler(byte[] data, int startIndex, int count);

-

-    /// <summary>

-    /// Declares methods and events for implementing compressors/decompressors

-    /// </summary>

-    public interface Codec

-    {

-        /// <summary>

-        /// Occurs when more processed data are available.

-        /// </summary>

-        event DataAvailableHandler DataAvailable;

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        void Add(byte[] data);

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>

-        /// <param name="count">The number of bytes to add</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        void Add(byte[] data, int offset, int count);

-

-        /// <summary>

-        /// Finishes up any pending data that needs to be processed and handled.

-        /// </summary>

-        void Finish();

-

-        /// <summary>

-        /// Gets the checksum of the data that has been added so far

-        /// </summary>

-        uint Checksum { get; }

-

-

-    }

-

-    #endregion

-

-    #region Classes

-    /// <summary>

-    /// Encapsulates general information about the ZLib library

-    /// </summary>

-    public class Info

-    {

-        #region DLL imports

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern uint zlibCompileFlags();

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern string zlibVersion();

-        #endregion

-

-        #region Private stuff

-        private uint _flags;

-

-        // helper function that unpacks a bitsize mask

-        private static int bitSize(uint bits)

-        {

-            switch (bits)

-            {

-                case 0: return 16;

-                case 1: return 32;

-                case 2: return 64;

-            }

-            return -1;

-        }

-        #endregion

-

-        /// <summary>

-        /// Constructs an instance of the <c>Info</c> class.

-        /// </summary>

-        public Info()

-        {

-            _flags = zlibCompileFlags();

-        }

-

-        /// <summary>

-        /// True if the library is compiled with debug info

-        /// </summary>

-        public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } }

-

-        /// <summary>

-        /// True if the library is compiled with assembly optimizations

-        /// </summary>

-        public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } }

-

-        /// <summary>

-        /// Gets the size of the unsigned int that was compiled into Zlib

-        /// </summary>

-        public int SizeOfUInt { get { return bitSize(_flags & 3); } }

-

-        /// <summary>

-        /// Gets the size of the unsigned long that was compiled into Zlib

-        /// </summary>

-        public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } }

-

-        /// <summary>

-        /// Gets the size of the pointers that were compiled into Zlib

-        /// </summary>

-        public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } }

-

-        /// <summary>

-        /// Gets the size of the z_off_t type that was compiled into Zlib

-        /// </summary>

-        public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } }

-

-        /// <summary>

-        /// Gets the version of ZLib as a string, e.g. "1.2.1"

-        /// </summary>

-        public static string Version { get { return zlibVersion(); } }

-    }

-

-    #endregion

-

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
deleted file mode 100644
index 71eeb85..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<VisualStudioProject>

-    <CSHARP

-        ProjectType = "Local"

-        ProductVersion = "7.10.3077"

-        SchemaVersion = "2.0"

-        ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"

-    >

-        <Build>

-            <Settings

-                ApplicationIcon = ""

-                AssemblyKeyContainerName = ""

-                AssemblyName = "DotZLib"

-                AssemblyOriginatorKeyFile = ""

-                DefaultClientScript = "JScript"

-                DefaultHTMLPageLayout = "Grid"

-                DefaultTargetSchema = "IE50"

-                DelaySign = "false"

-                OutputType = "Library"

-                PreBuildEvent = ""

-                PostBuildEvent = ""

-                RootNamespace = "DotZLib"

-                RunPostBuildEvent = "OnBuildSuccess"

-                StartupObject = ""

-            >

-                <Config

-                    Name = "Debug"

-                    AllowUnsafeBlocks = "false"

-                    BaseAddress = "285212672"

-                    CheckForOverflowUnderflow = "false"

-                    ConfigurationOverrideFile = ""

-                    DefineConstants = "DEBUG;TRACE"

-                    DocumentationFile = "docs\DotZLib.xml"

-                    DebugSymbols = "true"

-                    FileAlignment = "4096"

-                    IncrementalBuild = "false"

-                    NoStdLib = "false"

-                    NoWarn = "1591"

-                    Optimize = "false"

-                    OutputPath = "bin\Debug\"

-                    RegisterForComInterop = "false"

-                    RemoveIntegerChecks = "false"

-                    TreatWarningsAsErrors = "false"

-                    WarningLevel = "4"

-                />

-                <Config

-                    Name = "Release"

-                    AllowUnsafeBlocks = "false"

-                    BaseAddress = "285212672"

-                    CheckForOverflowUnderflow = "false"

-                    ConfigurationOverrideFile = ""

-                    DefineConstants = "TRACE"

-                    DocumentationFile = "docs\DotZLib.xml"

-                    DebugSymbols = "false"

-                    FileAlignment = "4096"

-                    IncrementalBuild = "false"

-                    NoStdLib = "false"

-                    NoWarn = ""

-                    Optimize = "true"

-                    OutputPath = "bin\Release\"

-                    RegisterForComInterop = "false"

-                    RemoveIntegerChecks = "false"

-                    TreatWarningsAsErrors = "false"

-                    WarningLevel = "4"

-                />

-            </Settings>

-            <References>

-                <Reference

-                    Name = "System"

-                    AssemblyName = "System"

-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"

-                />

-                <Reference

-                    Name = "System.Data"

-                    AssemblyName = "System.Data"

-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"

-                />

-                <Reference

-                    Name = "System.XML"

-                    AssemblyName = "System.Xml"

-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"

-                />

-                <Reference

-                    Name = "nunit.framework"

-                    AssemblyName = "nunit.framework"

-                    HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"

-                    AssemblyFolderKey = "hklm\dn\nunit.framework"

-                />

-            </References>

-        </Build>

-        <Files>

-            <Include>

-                <File

-                    RelPath = "AssemblyInfo.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "ChecksumImpl.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "CircularBuffer.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "CodecBase.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "Deflater.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "DotZLib.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "GZipStream.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "Inflater.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-                <File

-                    RelPath = "UnitTests.cs"

-                    SubType = "Code"

-                    BuildAction = "Compile"

-                />

-            </Include>

-        </Files>

-    </CSHARP>

-</VisualStudioProject>

-

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/GZipStream.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
deleted file mode 100644
index b161300..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.IO;

-using System.Runtime.InteropServices;

-

-namespace DotZLib

-{

-	/// <summary>

-	/// Implements a compressed <see cref="Stream"/>, in GZip (.gz) format.

-	/// </summary>

-	public class GZipStream : Stream, IDisposable

-	{

-        #region Dll Imports

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]

-        private static extern IntPtr gzopen(string name, string mode);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int gzclose(IntPtr gzFile);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int gzwrite(IntPtr gzFile, int data, int length);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int gzread(IntPtr gzFile, int data, int length);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int gzgetc(IntPtr gzFile);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int gzputc(IntPtr gzFile, int c);

-

-        #endregion

-

-        #region Private data

-        private IntPtr _gzFile;

-        private bool _isDisposed = false;

-        private bool _isWriting;

-        #endregion

-

-        #region Constructors

-        /// <summary>

-        /// Creates a new file as a writeable GZipStream

-        /// </summary>

-        /// <param name="fileName">The name of the compressed file to create</param>

-        /// <param name="level">The compression level to use when adding data</param>

-        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>

-		public GZipStream(string fileName, CompressLevel level)

-		{

-            _isWriting = true;

-            _gzFile = gzopen(fileName, String.Format("wb{0}", (int)level));

-            if (_gzFile == IntPtr.Zero)

-                throw new ZLibException(-1, "Could not open " + fileName);

-		}

-

-        /// <summary>

-        /// Opens an existing file as a readable GZipStream

-        /// </summary>

-        /// <param name="fileName">The name of the file to open</param>

-        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>

-        public GZipStream(string fileName)

-        {

-            _isWriting = false;

-            _gzFile = gzopen(fileName, "rb");

-            if (_gzFile == IntPtr.Zero)

-                throw new ZLibException(-1, "Could not open " + fileName);

-

-        }

-        #endregion

-

-        #region Access properties

-        /// <summary>

-        /// Returns true of this stream can be read from, false otherwise

-        /// </summary>

-        public override bool CanRead

-        {

-            get

-            {

-                return !_isWriting;

-            }

-        }

-

-

-        /// <summary>

-        /// Returns false.

-        /// </summary>

-        public override bool CanSeek

-        {

-            get

-            {

-                return false;

-            }

-        }

-

-        /// <summary>

-        /// Returns true if this tsream is writeable, false otherwise

-        /// </summary>

-        public override bool CanWrite

-        {

-            get

-            {

-                return _isWriting;

-            }

-        }

-        #endregion

-

-        #region Destructor & IDispose stuff

-

-        /// <summary>

-        /// Destroys this instance

-        /// </summary>

-        ~GZipStream()

-        {

-            cleanUp(false);

-        }

-

-        /// <summary>

-        /// Closes the external file handle

-        /// </summary>

-        public void Dispose()

-        {

-            cleanUp(true);

-        }

-

-        // Does the actual closing of the file handle.

-        private void cleanUp(bool isDisposing)

-        {

-            if (!_isDisposed)

-            {

-                gzclose(_gzFile);

-                _isDisposed = true;

-            }

-        }

-        #endregion

-

-        #region Basic reading and writing

-        /// <summary>

-        /// Attempts to read a number of bytes from the stream.

-        /// </summary>

-        /// <param name="buffer">The destination data buffer</param>

-        /// <param name="offset">The index of the first destination byte in <c>buffer</c></param>

-        /// <param name="count">The number of bytes requested</param>

-        /// <returns>The number of bytes read</returns>

-        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>

-        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>

-        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>

-        /// <exception cref="NotSupportedException">If this stream is not readable.</exception>

-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>

-        public override int Read(byte[] buffer, int offset, int count)

-        {

-            if (!CanRead) throw new NotSupportedException();

-            if (buffer == null) throw new ArgumentNullException();

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > buffer.Length) throw new ArgumentException();

-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");

-

-            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);

-            int result;

-            try

-            {

-                result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);

-                if (result < 0)

-                    throw new IOException();

-            }

-            finally

-            {

-                h.Free();

-            }

-            return result;

-        }

-

-        /// <summary>

-        /// Attempts to read a single byte from the stream.

-        /// </summary>

-        /// <returns>The byte that was read, or -1 in case of error or End-Of-File</returns>

-        public override int ReadByte()

-        {

-            if (!CanRead) throw new NotSupportedException();

-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");

-            return gzgetc(_gzFile);

-        }

-

-        /// <summary>

-        /// Writes a number of bytes to the stream

-        /// </summary>

-        /// <param name="buffer"></param>

-        /// <param name="offset"></param>

-        /// <param name="count"></param>

-        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>

-        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>

-        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>

-        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>

-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>

-        public override void Write(byte[] buffer, int offset, int count)

-        {

-            if (!CanWrite) throw new NotSupportedException();

-            if (buffer == null) throw new ArgumentNullException();

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > buffer.Length) throw new ArgumentException();

-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");

-

-            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);

-            try

-            {

-                int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);

-                if (result < 0)

-                    throw new IOException();

-            }

-            finally

-            {

-                h.Free();

-            }

-        }

-

-        /// <summary>

-        /// Writes a single byte to the stream

-        /// </summary>

-        /// <param name="value">The byte to add to the stream.</param>

-        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>

-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>

-        public override void WriteByte(byte value)

-        {

-            if (!CanWrite) throw new NotSupportedException();

-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");

-

-            int result = gzputc(_gzFile, (int)value);

-            if (result < 0)

-                throw new IOException();

-        }

-        #endregion

-

-        #region Position & length stuff

-        /// <summary>

-        /// Not supported.

-        /// </summary>

-        /// <param name="value"></param>

-        /// <exception cref="NotSupportedException">Always thrown</exception>

-        public override void SetLength(long value)

-        {

-            throw new NotSupportedException();

-        }

-

-        /// <summary>

-        ///  Not suppported.

-        /// </summary>

-        /// <param name="offset"></param>

-        /// <param name="origin"></param>

-        /// <returns></returns>

-        /// <exception cref="NotSupportedException">Always thrown</exception>

-        public override long Seek(long offset, SeekOrigin origin)

-        {

-            throw new NotSupportedException();

-        }

-

-        /// <summary>

-        /// Flushes the <c>GZipStream</c>.

-        /// </summary>

-        /// <remarks>In this implementation, this method does nothing. This is because excessive

-        /// flushing may degrade the achievable compression rates.</remarks>

-        public override void Flush()

-        {

-            // left empty on purpose

-        }

-

-        /// <summary>

-        /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.

-        /// </summary>

-        /// <remarks>In this implementation this property is not supported</remarks>

-        /// <exception cref="NotSupportedException">Always thrown</exception>

-        public override long Position

-        {

-            get

-            {

-                throw new NotSupportedException();

-            }

-            set

-            {

-                throw new NotSupportedException();

-            }

-        }

-

-        /// <summary>

-        /// Gets the size of the stream. Not suppported.

-        /// </summary>

-        /// <remarks>In this implementation this property is not supported</remarks>

-        /// <exception cref="NotSupportedException">Always thrown</exception>

-        public override long Length

-        {

-            get

-            {

-                throw new NotSupportedException();

-            }

-        }

-        #endregion

-    }

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Inflater.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Inflater.cs
deleted file mode 100644
index 8ed5451..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/Inflater.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Diagnostics;

-using System.Runtime.InteropServices;

-

-namespace DotZLib

-{

-

-    /// <summary>

-    /// Implements a data decompressor, using the inflate algorithm in the ZLib dll

-    /// </summary>

-    public class Inflater : CodecBase

-	{

-        #region Dll imports

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]

-        private static extern int inflateInit_(ref ZStream sz, string vs, int size);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int inflate(ref ZStream sz, int flush);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int inflateReset(ref ZStream sz);

-

-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]

-        private static extern int inflateEnd(ref ZStream sz);

-        #endregion

-

-        /// <summary>

-        /// Constructs an new instance of the <c>Inflater</c>

-        /// </summary>

-        public Inflater() : base()

-		{

-            int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream));

-            if (retval != 0)

-                throw new ZLibException(retval, "Could not initialize inflater");

-

-            resetOutput();

-        }

-

-

-        /// <summary>

-        /// Adds more data to the codec to be processed.

-        /// </summary>

-        /// <param name="data">Byte array containing the data to be added to the codec</param>

-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>

-        /// <param name="count">The number of bytes to add</param>

-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>

-        public override void Add(byte[] data, int offset, int count)

-        {

-            if (data == null) throw new ArgumentNullException();

-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();

-            if ((offset+count) > data.Length) throw new ArgumentException();

-

-            int total = count;

-            int inputIndex = offset;

-            int err = 0;

-

-            while (err >= 0 && inputIndex < total)

-            {

-                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));

-                err = inflate(ref _ztream, (int)FlushTypes.None);

-                if (err == 0)

-                    while (_ztream.avail_out == 0)

-                    {

-                        OnDataAvailable();

-                        err = inflate(ref _ztream, (int)FlushTypes.None);

-                    }

-

-                inputIndex += (int)_ztream.total_in;

-            }

-            setChecksum( _ztream.adler );

-        }

-

-

-        /// <summary>

-        /// Finishes up any pending data that needs to be processed and handled.

-        /// </summary>

-        public override void Finish()

-        {

-            int err;

-            do

-            {

-                err = inflate(ref _ztream, (int)FlushTypes.Finish);

-                OnDataAvailable();

-            }

-            while (err == 0);

-            setChecksum( _ztream.adler );

-            inflateReset(ref _ztream);

-            resetOutput();

-        }

-

-        /// <summary>

-        /// Closes the internal zlib inflate stream

-        /// </summary>

-        protected override void CleanUp() { inflateEnd(ref _ztream); }

-

-

-	}

-}

crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
deleted file mode 100644
index 44f7633..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-//

-// © Copyright Henrik Ravn 2004

-//

-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-//

-

-using System;

-using System.Collections;

-using System.IO;

-

-// uncomment the define below to include unit tests

-//#define nunit

-#if nunit

-using NUnit.Framework;

-

-// Unit tests for the DotZLib class library

-// ----------------------------------------

-//

-// Use this with NUnit 2 from http://www.nunit.org

-//

-

-namespace DotZLibTests

-{

-    using DotZLib;

-

-    // helper methods

-    internal class Utils

-    {

-        public static bool byteArrEqual( byte[] lhs, byte[] rhs )

-        {

-            if (lhs.Length != rhs.Length)

-                return false;

-            for (int i = lhs.Length-1; i >= 0; --i)

-                if (lhs[i] != rhs[i])

-                    return false;

-            return true;

-        }

-

-    }

-

-

-    [TestFixture]

-    public class CircBufferTests

-    {

-        #region Circular buffer tests

-        [Test]

-        public void SinglePutGet()

-        {

-            CircularBuffer buf = new CircularBuffer(10);

-            Assert.AreEqual( 0, buf.Size );

-            Assert.AreEqual( -1, buf.Get() );

-

-            Assert.IsTrue(buf.Put( 1 ));

-            Assert.AreEqual( 1, buf.Size );

-            Assert.AreEqual( 1, buf.Get() );

-            Assert.AreEqual( 0, buf.Size );

-            Assert.AreEqual( -1, buf.Get() );

-        }

-

-        [Test]

-        public void BlockPutGet()

-        {

-            CircularBuffer buf = new CircularBuffer(10);

-            byte[] arr = {1,2,3,4,5,6,7,8,9,10};

-            Assert.AreEqual( 10, buf.Put(arr,0,10) );

-            Assert.AreEqual( 10, buf.Size );

-            Assert.IsFalse( buf.Put(11) );

-            Assert.AreEqual( 1, buf.Get() );

-            Assert.IsTrue( buf.Put(11) );

-

-            byte[] arr2 = (byte[])arr.Clone();

-            Assert.AreEqual( 9, buf.Get(arr2,1,9) );

-            Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );

-        }

-

-        #endregion

-    }

-

-    [TestFixture]

-    public class ChecksumTests

-    {

-        #region CRC32 Tests

-        [Test]

-        public void CRC32_Null()

-        {

-            CRC32Checksum crc32 = new CRC32Checksum();

-            Assert.AreEqual( 0, crc32.Value );

-

-            crc32 = new CRC32Checksum(1);

-            Assert.AreEqual( 1, crc32.Value );

-

-            crc32 = new CRC32Checksum(556);

-            Assert.AreEqual( 556, crc32.Value );

-        }

-

-        [Test]

-        public void CRC32_Data()

-        {

-            CRC32Checksum crc32 = new CRC32Checksum();

-            byte[] data = { 1,2,3,4,5,6,7 };

-            crc32.Update(data);

-            Assert.AreEqual( 0x70e46888, crc32.Value  );

-

-            crc32 = new CRC32Checksum();

-            crc32.Update("penguin");

-            Assert.AreEqual( 0x0e5c1a120, crc32.Value );

-

-            crc32 = new CRC32Checksum(1);

-            crc32.Update("penguin");

-            Assert.AreEqual(0x43b6aa94, crc32.Value);

-

-        }

-        #endregion

-

-        #region Adler tests

-

-        [Test]

-        public void Adler_Null()

-        {

-            AdlerChecksum adler = new AdlerChecksum();

-            Assert.AreEqual(0, adler.Value);

-

-            adler = new AdlerChecksum(1);

-            Assert.AreEqual( 1, adler.Value );

-

-            adler = new AdlerChecksum(556);

-            Assert.AreEqual( 556, adler.Value );

-        }

-

-        [Test]

-        public void Adler_Data()

-        {

-            AdlerChecksum adler = new AdlerChecksum(1);

-            byte[] data = { 1,2,3,4,5,6,7 };

-            adler.Update(data);

-            Assert.AreEqual( 0x5b001d, adler.Value  );

-

-            adler = new AdlerChecksum();

-            adler.Update("penguin");

-            Assert.AreEqual(0x0bcf02f6, adler.Value );

-

-            adler = new AdlerChecksum(1);

-            adler.Update("penguin");

-            Assert.AreEqual(0x0bd602f7, adler.Value);

-

-        }

-        #endregion

-    }

-

-    [TestFixture]

-    public class InfoTests

-    {

-        #region Info tests

-        [Test]

-        public void Info_Version()

-        {

-            Info info = new Info();

-            Assert.AreEqual("1.2.11", Info.Version);

-            Assert.AreEqual(32, info.SizeOfUInt);

-            Assert.AreEqual(32, info.SizeOfULong);

-            Assert.AreEqual(32, info.SizeOfPointer);

-            Assert.AreEqual(32, info.SizeOfOffset);

-        }

-        #endregion

-    }

-

-    [TestFixture]

-    public class DeflateInflateTests

-    {

-        #region Deflate tests

-        [Test]

-        public void Deflate_Init()

-        {

-            using (Deflater def = new Deflater(CompressLevel.Default))

-            {

-            }

-        }

-

-        private ArrayList compressedData = new ArrayList();

-        private uint adler1;

-

-        private ArrayList uncompressedData = new ArrayList();

-        private uint adler2;

-

-        public void CDataAvail(byte[] data, int startIndex, int count)

-        {

-            for (int i = 0; i < count; ++i)

-                compressedData.Add(data[i+startIndex]);

-        }

-

-        [Test]

-        public void Deflate_Compress()

-        {

-            compressedData.Clear();

-

-            byte[] testData = new byte[35000];

-            for (int i = 0; i < testData.Length; ++i)

-                testData[i] = 5;

-

-            using (Deflater def = new Deflater((CompressLevel)5))

-            {

-                def.DataAvailable += new DataAvailableHandler(CDataAvail);

-                def.Add(testData);

-                def.Finish();

-                adler1 = def.Checksum;

-            }

-        }

-        #endregion

-

-        #region Inflate tests

-        [Test]

-        public void Inflate_Init()

-        {

-            using (Inflater inf = new Inflater())

-            {

-            }

-        }

-

-        private void DDataAvail(byte[] data, int startIndex, int count)

-        {

-            for (int i = 0; i < count; ++i)

-                uncompressedData.Add(data[i+startIndex]);

-        }

-

-        [Test]

-        public void Inflate_Expand()

-        {

-            uncompressedData.Clear();

-

-            using (Inflater inf = new Inflater())

-            {

-                inf.DataAvailable += new DataAvailableHandler(DDataAvail);

-                inf.Add((byte[])compressedData.ToArray(typeof(byte)));

-                inf.Finish();

-                adler2 = inf.Checksum;

-            }

-            Assert.AreEqual( adler1, adler2 );

-        }

-        #endregion

-    }

-

-    [TestFixture]

-    public class GZipStreamTests

-    {

-        #region GZipStream test

-        [Test]

-        public void GZipStream_WriteRead()

-        {

-            using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))

-            {

-                BinaryWriter writer = new BinaryWriter(gzOut);

-                writer.Write("hi there");

-                writer.Write(Math.PI);

-                writer.Write(42);

-            }

-

-            using (GZipStream gzIn = new GZipStream("gzstream.gz"))

-            {

-                BinaryReader reader = new BinaryReader(gzIn);

-                string s = reader.ReadString();

-                Assert.AreEqual("hi there",s);

-                double d = reader.ReadDouble();

-                Assert.AreEqual(Math.PI, d);

-                int i = reader.ReadInt32();

-                Assert.AreEqual(42,i);

-            }

-

-        }

-        #endregion

-	}

-}

-

-#endif

crates/libz-sys/src/zlib/contrib/dotzlib/LICENSE_1_0.txt

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/LICENSE_1_0.txt b/crates/libz-sys/src/zlib/contrib/dotzlib/LICENSE_1_0.txt
deleted file mode 100644
index 30aac2c..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/LICENSE_1_0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003

-

-Permission is hereby granted, free of charge, to any person or organization

-obtaining a copy of the software and accompanying documentation covered by

-this license (the "Software") to use, reproduce, display, distribute,

-execute, and transmit the Software, and to prepare derivative works of the

-Software, and to permit third-parties to whom the Software is furnished to

-do so, all subject to the following:

-

-The copyright notices in the Software and this entire statement, including

-the above license grant, this restriction and the following disclaimer,

-must be included in all copies of the Software, in whole or in part, and

-all derivative works of the Software, unless such copies or derivative

-works are solely in the form of machine-executable object code generated by

-a source language processor.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT

-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE

-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,

-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-DEALINGS IN THE SOFTWARE.
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/dotzlib/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/dotzlib/readme.txt b/crates/libz-sys/src/zlib/contrib/dotzlib/readme.txt
deleted file mode 100644
index b239572..0000000
--- a/crates/libz-sys/src/zlib/contrib/dotzlib/readme.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-This directory contains a .Net wrapper class library for the ZLib1.dll

-

-The wrapper includes support for inflating/deflating memory buffers,

-.Net streaming wrappers for the gz streams part of zlib, and wrappers

-for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples.

-

-Directory structure:

---------------------

-

-LICENSE_1_0.txt       - License file.

-readme.txt            - This file.

-DotZLib.chm           - Class library documentation

-DotZLib.build         - NAnt build file

-DotZLib.sln           - Microsoft Visual Studio 2003 solution file

-

-DotZLib\*.cs          - Source files for the class library

-

-Unit tests:

------------

-The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher.

-To include unit tests in the build, define nunit before building.

-

-

-Build instructions:

--------------------

-

-1. Using Visual Studio.Net 2003:

-   Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll)

-   will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on

-   you are building the release or debug version of the library. Check

-   DotZLib/UnitTests.cs for instructions on how to include unit tests in the

-   build.

-

-2. Using NAnt:

-   Open a command prompt with access to the build environment and run nant

-   in the same directory as the DotZLib.build file.

-   You can define 2 properties on the nant command-line to control the build:

-   debug={true|false} to toggle between release/debug builds (default=true).

-   nunit={true|false} to include or esclude unit tests (default=true).

-   Also the target clean will remove binaries.

-   Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release

-   or ./DotZLib/bin/debug, depending on whether you are building the release

-   or debug version of the library.

-

-   Examples:

-     nant -D:debug=false -D:nunit=false

-       will build a release mode version of the library without unit tests.

-     nant

-       will build a debug version of the library with unit tests

-     nant clean

-       will remove all previously built files.

-

-

----------------------------------

-Copyright (c) Henrik Ravn 2004

-

-Use, modification and distribution are subject to the Boost Software License, Version 1.0.

-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

crates/libz-sys/src/zlib/contrib/gcc_gvmat64/gvmat64.S

diff --git a/crates/libz-sys/src/zlib/contrib/gcc_gvmat64/gvmat64.S b/crates/libz-sys/src/zlib/contrib/gcc_gvmat64/gvmat64.S
deleted file mode 100644
index dd858dd..0000000
--- a/crates/libz-sys/src/zlib/contrib/gcc_gvmat64/gvmat64.S
+++ /dev/null
@@ -1,574 +0,0 @@
-/*

-;uInt longest_match_x64(

-;    deflate_state *s,

-;    IPos cur_match);                             // current match 

-

-; gvmat64.S -- Asm portion of the optimized longest_match for 32 bits x86_64

-;  (AMD64 on Athlon 64, Opteron, Phenom

-;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)

-; this file is translation from gvmat64.asm to GCC 4.x (for Linux, Mac XCode)

-; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.

-;

-; File written by Gilles Vollant, by converting to assembly the longest_match

-;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.

-;  and by taking inspiration on asm686 with masm, optimised assembly code

-;        from Brian Raiter, written 1998

-;

-;  This software is provided 'as-is', without any express or implied

-;  warranty.  In no event will the authors be held liable for any damages

-;  arising from the use of this software.

-;

-;  Permission is granted to anyone to use this software for any purpose,

-;  including commercial applications, and to alter it and redistribute it

-;  freely, subject to the following restrictions:

-;

-;  1. The origin of this software must not be misrepresented; you must not

-;     claim that you wrote the original software. If you use this software

-;     in a product, an acknowledgment in the product documentation would be

-;     appreciated but is not required.

-;  2. Altered source versions must be plainly marked as such, and must not be

-;     misrepresented as being the original software

-;  3. This notice may not be removed or altered from any source distribution.

-;

-;         http://www.zlib.net

-;         http://www.winimage.com/zLibDll

-;         http://www.muppetlabs.com/~breadbox/software/assembly.html

-;

-; to compile this file for zLib, I use option:

-;   gcc -c -arch x86_64 gvmat64.S

-

-

-;uInt longest_match(s, cur_match)

-;    deflate_state *s;

-;    IPos cur_match;                             // current match /

-;

-; with XCode for Mac, I had strange error with some jump on intel syntax

-; this is why BEFORE_JMP and AFTER_JMP are used

- */

-

-

-#define BEFORE_JMP .att_syntax

-#define AFTER_JMP .intel_syntax noprefix

-

-#ifndef NO_UNDERLINE

-#	define	match_init	_match_init

-#	define	longest_match	_longest_match

-#endif

-

-.intel_syntax noprefix

-

-.globl	match_init, longest_match

-.text

-longest_match:

-

-

-

-#define LocalVarsSize 96

-/*

-; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12

-; free register :  r14,r15

-; register can be saved : rsp

-*/

-

-#define chainlenwmask     (rsp + 8 - LocalVarsSize)

-#define nicematch         (rsp + 16 - LocalVarsSize)

-

-#define save_rdi        (rsp + 24 - LocalVarsSize)

-#define save_rsi        (rsp + 32 - LocalVarsSize)

-#define save_rbx        (rsp + 40 - LocalVarsSize)

-#define save_rbp        (rsp + 48 - LocalVarsSize)

-#define save_r12        (rsp + 56 - LocalVarsSize)

-#define save_r13        (rsp + 64 - LocalVarsSize)

-#define save_r14        (rsp + 72 - LocalVarsSize)

-#define save_r15        (rsp + 80 - LocalVarsSize)

-

-

-/*

-;  all the +4 offsets are due to the addition of pending_buf_size (in zlib

-;  in the deflate_state structure since the asm code was first written

-;  (if you compile with zlib 1.0.4 or older, remove the +4).

-;  Note : these value are good with a 8 bytes boundary pack structure

-*/

-

-#define    MAX_MATCH              258

-#define    MIN_MATCH              3

-#define    MIN_LOOKAHEAD          (MAX_MATCH+MIN_MATCH+1)

-

-/*

-;;; Offsets for fields in the deflate_state structure. These numbers

-;;; are calculated from the definition of deflate_state, with the

-;;; assumption that the compiler will dword-align the fields. (Thus,

-;;; changing the definition of deflate_state could easily cause this

-;;; program to crash horribly, without so much as a warning at

-;;; compile time. Sigh.)

-

-;  all the +zlib1222add offsets are due to the addition of fields

-;  in zlib in the deflate_state structure since the asm code was first written

-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").

-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

-*/

-

-

-

-/* you can check the structure offset by running

-

-#include <stdlib.h>

-#include <stdio.h>

-#include "deflate.h"

-

-void print_depl()

-{

-deflate_state ds;

-deflate_state *s=&ds;

-printf("size pointer=%u\n",(int)sizeof(void*));

-

-printf("#define dsWSize         %u\n",(int)(((char*)&(s->w_size))-((char*)s)));

-printf("#define dsWMask         %u\n",(int)(((char*)&(s->w_mask))-((char*)s)));

-printf("#define dsWindow        %u\n",(int)(((char*)&(s->window))-((char*)s)));

-printf("#define dsPrev          %u\n",(int)(((char*)&(s->prev))-((char*)s)));

-printf("#define dsMatchLen      %u\n",(int)(((char*)&(s->match_length))-((char*)s)));

-printf("#define dsPrevMatch     %u\n",(int)(((char*)&(s->prev_match))-((char*)s)));

-printf("#define dsStrStart      %u\n",(int)(((char*)&(s->strstart))-((char*)s)));

-printf("#define dsMatchStart    %u\n",(int)(((char*)&(s->match_start))-((char*)s)));

-printf("#define dsLookahead     %u\n",(int)(((char*)&(s->lookahead))-((char*)s)));

-printf("#define dsPrevLen       %u\n",(int)(((char*)&(s->prev_length))-((char*)s)));

-printf("#define dsMaxChainLen   %u\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));

-printf("#define dsGoodMatch     %u\n",(int)(((char*)&(s->good_match))-((char*)s)));

-printf("#define dsNiceMatch     %u\n",(int)(((char*)&(s->nice_match))-((char*)s)));

-}

-*/

-

-#define dsWSize          68

-#define dsWMask          76

-#define dsWindow         80

-#define dsPrev           96

-#define dsMatchLen       144

-#define dsPrevMatch      148

-#define dsStrStart       156

-#define dsMatchStart     160

-#define dsLookahead      164

-#define dsPrevLen        168

-#define dsMaxChainLen    172

-#define dsGoodMatch      188

-#define dsNiceMatch      192

-

-#define window_size      [ rcx + dsWSize]

-#define WMask            [ rcx + dsWMask]

-#define window_ad        [ rcx + dsWindow]

-#define prev_ad          [ rcx + dsPrev]

-#define strstart         [ rcx + dsStrStart]

-#define match_start      [ rcx + dsMatchStart]

-#define Lookahead        [ rcx + dsLookahead] //; 0ffffffffh on infozip

-#define prev_length      [ rcx + dsPrevLen]

-#define max_chain_length [ rcx + dsMaxChainLen]

-#define good_match       [ rcx + dsGoodMatch]

-#define nice_match       [ rcx + dsNiceMatch]

-

-/*

-; windows:

-; parameter 1 in rcx(deflate state s), param 2 in rdx (cur match)

-

-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and

-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp

-;

-; All registers must be preserved across the call, except for

-;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.

-

-;

-; gcc on macosx-linux:

-; see http://www.x86-64.org/documentation/abi-0.99.pdf

-; param 1 in rdi, param 2 in rsi

-; rbx, rsp, rbp, r12 to r15 must be preserved

-

-;;; Save registers that the compiler may be using, and adjust esp to

-;;; make room for our stack frame.

-

-

-;;; Retrieve the function arguments. r8d will hold cur_match

-;;; throughout the entire function. edx will hold the pointer to the

-;;; deflate_state structure during the function's setup (before

-;;; entering the main loop.

-

-; ms: parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)

-; mac: param 1 in rdi, param 2 rsi

-; this clear high 32 bits of r8, which can be garbage in both r8 and rdx

-*/

-        mov [save_rbx],rbx

-        mov [save_rbp],rbp

-

-

-        mov rcx,rdi

-

-        mov r8d,esi

-

-

-        mov [save_r12],r12

-        mov [save_r13],r13

-        mov [save_r14],r14

-        mov [save_r15],r15

-

-

-//;;; uInt wmask = s->w_mask;

-//;;; unsigned chain_length = s->max_chain_length;

-//;;; if (s->prev_length >= s->good_match) {

-//;;;     chain_length >>= 2;

-//;;; }

-

-

-        mov edi, prev_length

-        mov esi, good_match

-        mov eax, WMask

-        mov ebx, max_chain_length

-        cmp edi, esi

-        jl  LastMatchGood

-        shr ebx, 2

-LastMatchGood:

-

-//;;; chainlen is decremented once beforehand so that the function can

-//;;; use the sign flag instead of the zero flag for the exit test.

-//;;; It is then shifted into the high word, to make room for the wmask

-//;;; value, which it will always accompany.

-

-        dec ebx

-        shl ebx, 16

-        or  ebx, eax

-

-//;;; on zlib only

-//;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

-

-

-

-        mov eax, nice_match

-        mov [chainlenwmask], ebx

-        mov r10d, Lookahead

-        cmp r10d, eax

-        cmovnl r10d, eax

-        mov [nicematch],r10d

-

-

-

-//;;; register Bytef *scan = s->window + s->strstart;

-        mov r10, window_ad

-        mov ebp, strstart

-        lea r13, [r10 + rbp]

-

-//;;; Determine how many bytes the scan ptr is off from being

-//;;; dword-aligned.

-

-         mov r9,r13

-         neg r13

-         and r13,3

-

-//;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

-//;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;

-

-

-        mov eax, window_size

-        sub eax, MIN_LOOKAHEAD

-

-

-        xor edi,edi

-        sub ebp, eax

-

-        mov r11d, prev_length

-

-        cmovng ebp,edi

-

-//;;; int best_len = s->prev_length;

-

-

-//;;; Store the sum of s->window + best_len in esi locally, and in esi.

-

-       lea  rsi,[r10+r11]

-

-//;;; register ush scan_start = *(ushf*)scan;

-//;;; register ush scan_end   = *(ushf*)(scan+best_len-1);

-//;;; Posf *prev = s->prev;

-

-        movzx r12d,word ptr [r9]

-        movzx ebx, word ptr [r9 + r11 - 1]

-

-        mov rdi, prev_ad

-

-//;;; Jump into the main loop.

-

-        mov edx, [chainlenwmask]

-

-        cmp bx,word ptr [rsi + r8 - 1]

-        jz  LookupLoopIsZero

-				

-						

-						

-LookupLoop1:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-        jbe LeaveNow

-		

-		

-		

-        sub edx, 0x00010000

-		BEFORE_JMP

-        js  LeaveNow

-		AFTER_JMP

-

-LoopEntry1:

-        cmp bx,word ptr [rsi + r8 - 1]

-		BEFORE_JMP

-        jz  LookupLoopIsZero

-		AFTER_JMP

-

-LookupLoop2:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-		BEFORE_JMP

-        jbe LeaveNow

-		AFTER_JMP

-        sub edx, 0x00010000

-		BEFORE_JMP

-        js  LeaveNow

-		AFTER_JMP

-

-LoopEntry2:

-        cmp bx,word ptr [rsi + r8 - 1]

-		BEFORE_JMP

-        jz  LookupLoopIsZero

-		AFTER_JMP

-

-LookupLoop4:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-		BEFORE_JMP

-        jbe LeaveNow

-		AFTER_JMP

-        sub edx, 0x00010000

-		BEFORE_JMP

-        js  LeaveNow

-		AFTER_JMP

-

-LoopEntry4:

-

-        cmp bx,word ptr [rsi + r8 - 1]

-		BEFORE_JMP

-        jnz LookupLoop1

-        jmp LookupLoopIsZero

-		AFTER_JMP

-/*

-;;; do {

-;;;     match = s->window + cur_match;

-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||

-;;;         *(ushf*)match != scan_start) continue;

-;;;     [...]

-;;; } while ((cur_match = prev[cur_match & wmask]) > limit

-;;;          && --chain_length != 0);

-;;;

-;;; Here is the inner loop of the function. The function will spend the

-;;; majority of its time in this loop, and majority of that time will

-;;; be spent in the first ten instructions.

-;;;

-;;; Within this loop:

-;;; ebx = scanend

-;;; r8d = curmatch

-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)

-;;; esi = windowbestlen - i.e., (window + bestlen)

-;;; edi = prev

-;;; ebp = limit

-*/

-.balign 16

-LookupLoop:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-		BEFORE_JMP

-        jbe LeaveNow

-		AFTER_JMP

-        sub edx, 0x00010000

-		BEFORE_JMP

-        js  LeaveNow

-		AFTER_JMP

-

-LoopEntry:

-

-        cmp bx,word ptr [rsi + r8 - 1]

-		BEFORE_JMP

-        jnz LookupLoop1

-		AFTER_JMP

-LookupLoopIsZero:

-        cmp     r12w, word ptr [r10 + r8]

-		BEFORE_JMP

-        jnz LookupLoop1

-		AFTER_JMP

-

-

-//;;; Store the current value of chainlen.

-        mov [chainlenwmask], edx

-/*

-;;; Point edi to the string under scrutiny, and esi to the string we

-;;; are hoping to match it up with. In actuality, esi and edi are

-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is

-;;; initialized to -(MAX_MATCH_8 - scanalign).

-*/

-        lea rsi,[r8+r10]

-        mov rdx, 0xfffffffffffffef8 //; -(MAX_MATCH_8)

-        lea rsi, [rsi + r13 + 0x0108] //;MAX_MATCH_8]

-        lea rdi, [r9 + r13 + 0x0108] //;MAX_MATCH_8]

-

-        prefetcht1 [rsi+rdx]

-        prefetcht1 [rdi+rdx]

-

-/*

-;;; Test the strings for equality, 8 bytes at a time. At the end,

-;;; adjust rdx so that it is offset to the exact byte that mismatched.

-;;;

-;;; We already know at this point that the first three bytes of the

-;;; strings match each other, and they can be safely passed over before

-;;; starting the compare loop. So what this code does is skip over 0-3

-;;; bytes, as much as necessary in order to dword-align the edi

-;;; pointer. (rsi will still be misaligned three times out of four.)

-;;;

-;;; It should be confessed that this loop usually does not represent

-;;; much of the total running time. Replacing it with a more

-;;; straightforward "rep cmpsb" would not drastically degrade

-;;; performance.

-*/

-

-LoopCmps:

-        mov rax, [rsi + rdx]

-        xor rax, [rdi + rdx]

-        jnz LeaveLoopCmps

-

-        mov rax, [rsi + rdx + 8]

-        xor rax, [rdi + rdx + 8]

-        jnz LeaveLoopCmps8

-

-

-        mov rax, [rsi + rdx + 8+8]

-        xor rax, [rdi + rdx + 8+8]

-        jnz LeaveLoopCmps16

-

-        add rdx,8+8+8

-

-		BEFORE_JMP

-        jnz  LoopCmps

-        jmp  LenMaximum

-		AFTER_JMP

-		

-LeaveLoopCmps16: add rdx,8

-LeaveLoopCmps8: add rdx,8

-LeaveLoopCmps:

-

-        test    eax, 0x0000FFFF

-        jnz LenLower

-

-        test eax,0xffffffff

-

-        jnz LenLower32

-

-        add rdx,4

-        shr rax,32

-        or ax,ax

-		BEFORE_JMP

-        jnz LenLower

-		AFTER_JMP

-

-LenLower32:

-        shr eax,16

-        add rdx,2

-		

-LenLower:		

-        sub al, 1

-        adc rdx, 0

-//;;; Calculate the length of the match. If it is longer than MAX_MATCH,

-//;;; then automatically accept it as the best possible match and leave.

-

-        lea rax, [rdi + rdx]

-        sub rax, r9

-        cmp eax, MAX_MATCH

-		BEFORE_JMP

-        jge LenMaximum

-		AFTER_JMP

-/*

-;;; If the length of the match is not longer than the best match we

-;;; have so far, then forget it and return to the lookup loop.

-;///////////////////////////////////

-*/

-        cmp eax, r11d

-        jg  LongerMatch

-

-        lea rsi,[r10+r11]

-

-        mov rdi, prev_ad

-        mov edx, [chainlenwmask]

-		BEFORE_JMP

-        jmp LookupLoop

-		AFTER_JMP

-/*

-;;;         s->match_start = cur_match;

-;;;         best_len = len;

-;;;         if (len >= nice_match) break;

-;;;         scan_end = *(ushf*)(scan+best_len-1);

-*/

-LongerMatch:

-        mov r11d, eax

-        mov match_start, r8d

-        cmp eax, [nicematch]

-		BEFORE_JMP

-        jge LeaveNow

-		AFTER_JMP

-

-        lea rsi,[r10+rax]

-

-        movzx   ebx, word ptr [r9 + rax - 1]

-        mov rdi, prev_ad

-        mov edx, [chainlenwmask]

-		BEFORE_JMP

-        jmp LookupLoop

-		AFTER_JMP

-

-//;;; Accept the current string, with the maximum possible length.

-

-LenMaximum:

-        mov r11d,MAX_MATCH

-        mov match_start, r8d

-

-//;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

-//;;; return s->lookahead;

-

-LeaveNow:

-        mov eax, Lookahead

-        cmp r11d, eax

-        cmovng eax, r11d

-

-

-

-//;;; Restore the stack and return from whence we came.

-

-

-//        mov rsi,[save_rsi]

-//        mov rdi,[save_rdi]

-        mov rbx,[save_rbx]

-        mov rbp,[save_rbp]

-        mov r12,[save_r12]

-        mov r13,[save_r13]

-        mov r14,[save_r14]

-        mov r15,[save_r15]

-

-

-        ret 0

-//; please don't remove this string !

-//; Your can freely use gvmat64 in any free or commercial app

-//; but it is far better don't remove the string in the binary!

- //   db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0

-

-

-match_init:

-  ret 0

-

-

crates/libz-sys/src/zlib/contrib/infback9/README

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/README b/crates/libz-sys/src/zlib/contrib/infback9/README
deleted file mode 100644
index e75ed13..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/README
+++ /dev/null
@@ -1 +0,0 @@
-See infback9.h for what this is and how to use it.

crates/libz-sys/src/zlib/contrib/infback9/infback9.c

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/infback9.c b/crates/libz-sys/src/zlib/contrib/infback9/infback9.c
deleted file mode 100644
index 05fb3e3..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/infback9.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/* infback9.c -- inflate deflate64 data using a call-back interface
- * Copyright (C) 1995-2008 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "infback9.h"
-#include "inftree9.h"
-#include "inflate9.h"
-
-#define WSIZE 65536UL
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   window is a user-supplied window and output buffer that is 64K bytes.
- */
-int ZEXPORT inflateBack9Init_(strm, window, version, stream_size)
-z_stream FAR *strm;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (voidpf)state;
-    state->window = window;
-    return Z_OK;
-}
-
-/*
-   Build and output length and distance decoding tables for fixed code
-   decoding.
- */
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-void makefixed9(void)
-{
-    unsigned sym, bits, low, size;
-    code *next, *lenfix, *distfix;
-    struct inflate_state state;
-    code fixed[544];
-
-    /* literal/length table */
-    sym = 0;
-    while (sym < 144) state.lens[sym++] = 8;
-    while (sym < 256) state.lens[sym++] = 9;
-    while (sym < 280) state.lens[sym++] = 7;
-    while (sym < 288) state.lens[sym++] = 8;
-    next = fixed;
-    lenfix = next;
-    bits = 9;
-    inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work);
-
-    /* distance table */
-    sym = 0;
-    while (sym < 32) state.lens[sym++] = 5;
-    distfix = next;
-    bits = 5;
-    inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work);
-
-    /* write tables */
-    puts("    /* inffix9.h -- table for decoding deflate64 fixed codes");
-    puts("     * Generated automatically by makefixed9().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits,
-               lenfix[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 5) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits,
-               distfix[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/* Macros for inflateBack(): */
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n <= 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = window; \
-            left = WSIZE; \
-            wrap = 1; \
-            if (out(out_desc, put, (unsigned)left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc)
-z_stream FAR *strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have;              /* available input */
-    unsigned long left;         /* available output */
-    inflate_mode mode;          /* current inflate mode */
-    int lastblock;              /* true if processing last block */
-    int wrap;                   /* true if the window has wrapped */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned extra;             /* extra bits needed */
-    unsigned long length;       /* literal or length of data to copy */
-    unsigned long offset;       /* distance back to copy string from */
-    unsigned long copy;         /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-#include "inffix9.h"
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    mode = TYPE;
-    lastblock = 0;
-    wrap = 0;
-    window = state->window;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = window;
-    left = WSIZE;
-    lencode = Z_NULL;
-    distcode = Z_NULL;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (lastblock) {
-                BYTEBITS();
-                mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            lastblock = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                lencode = lenfix;
-                lenbits = 9;
-                distcode = distfix;
-                distbits = 5;
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = LEN;                     /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                mode = BAD;
-                break;
-            }
-            length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %lu\n",
-                    length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (length != 0) {
-                copy = length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-            if (state->nlen > 286) {
-                strm->msg = (char *)"too many length symbols";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            lencode = (code const FAR *)(state->next);
-            lenbits = 7;
-            ret = inflate_table9(CODES, state->lens, 19, &(state->next),
-                                &(lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = lencode[BITS(lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    NEEDBITS(here.bits);
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftree9.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            lencode = (code const FAR *)(state->next);
-            lenbits = 9;
-            ret = inflate_table9(LENS, state->lens, state->nlen,
-                            &(state->next), &(lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                mode = BAD;
-                break;
-            }
-            distcode = (code const FAR *)(state->next);
-            distbits = 6;
-            ret = inflate_table9(DISTS, state->lens + state->nlen,
-                            state->ndist, &(state->next), &(distbits),
-                            state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            mode = LEN;
-
-        case LEN:
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = lencode[BITS(lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(length);
-                left--;
-                mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            extra = (unsigned)(here.op) & 31;
-            if (extra != 0) {
-                NEEDBITS(extra);
-                length += BITS(extra);
-                DROPBITS(extra);
-            }
-            Tracevv((stderr, "inflate:         length %lu\n", length));
-
-            /* get distance code */
-            for (;;) {
-                here = distcode[BITS(distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                mode = BAD;
-                break;
-            }
-            offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            extra = (unsigned)(here.op) & 15;
-            if (extra != 0) {
-                NEEDBITS(extra);
-                offset += BITS(extra);
-                DROPBITS(extra);
-            }
-            if (offset > WSIZE - (wrap ? 0: left)) {
-                strm->msg = (char *)"invalid distance too far back";
-                mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %lu\n", offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = WSIZE - offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - offset;
-                    copy = left;
-                }
-                if (copy > length) copy = length;
-                length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < WSIZE) {
-                if (out(out_desc, window, (unsigned)(WSIZE - left)))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBack9End(strm)
-z_stream FAR *strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}

crates/libz-sys/src/zlib/contrib/infback9/infback9.h

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/infback9.h b/crates/libz-sys/src/zlib/contrib/infback9/infback9.h
deleted file mode 100644
index 1073c0a..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/infback9.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* infback9.h -- header for using inflateBack9 functions
- * Copyright (C) 2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * This header file and associated patches provide a decoder for PKWare's
- * undocumented deflate64 compression method (method 9).  Use with infback9.c,
- * inftree9.h, inftree9.c, and inffix9.h.  These patches are not supported.
- * This should be compiled with zlib, since it uses zutil.h and zutil.o.
- * This code has not yet been tested on 16-bit architectures.  See the
- * comments in zlib.h for inflateBack() usage.  These functions are used
- * identically, except that there is no windowBits parameter, and a 64K
- * window must be provided.  Also if int's are 16 bits, then a zero for
- * the third parameter of the "out" function actually means 65536UL.
- * zlib.h must be included before this header file.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm));
-ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define inflateBack9Init(strm, window) \
-        inflateBack9Init_((strm), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-#ifdef __cplusplus
-}
-#endif

crates/libz-sys/src/zlib/contrib/infback9/inffix9.h

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/inffix9.h b/crates/libz-sys/src/zlib/contrib/infback9/inffix9.h
deleted file mode 100644
index ee5671d..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/inffix9.h
+++ /dev/null
@@ -1,107 +0,0 @@
-    /* inffix9.h -- table for decoding deflate64 fixed codes
-     * Generated automatically by makefixed9().
-     */
-
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{132,8,115},{130,7,31},{0,8,112},
-        {0,8,48},{0,9,192},{128,7,10},{0,8,96},{0,8,32},{0,9,160},
-        {0,8,0},{0,8,128},{0,8,64},{0,9,224},{128,7,6},{0,8,88},
-        {0,8,24},{0,9,144},{131,7,59},{0,8,120},{0,8,56},{0,9,208},
-        {129,7,17},{0,8,104},{0,8,40},{0,9,176},{0,8,8},{0,8,136},
-        {0,8,72},{0,9,240},{128,7,4},{0,8,84},{0,8,20},{133,8,227},
-        {131,7,43},{0,8,116},{0,8,52},{0,9,200},{129,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},
-        {128,7,8},{0,8,92},{0,8,28},{0,9,152},{132,7,83},{0,8,124},
-        {0,8,60},{0,9,216},{130,7,23},{0,8,108},{0,8,44},{0,9,184},
-        {0,8,12},{0,8,140},{0,8,76},{0,9,248},{128,7,3},{0,8,82},
-        {0,8,18},{133,8,163},{131,7,35},{0,8,114},{0,8,50},{0,9,196},
-        {129,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},{0,8,130},
-        {0,8,66},{0,9,228},{128,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {132,7,67},{0,8,122},{0,8,58},{0,9,212},{130,7,19},{0,8,106},
-        {0,8,42},{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},
-        {128,7,5},{0,8,86},{0,8,22},{65,8,0},{131,7,51},{0,8,118},
-        {0,8,54},{0,9,204},{129,7,15},{0,8,102},{0,8,38},{0,9,172},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,236},{128,7,9},{0,8,94},
-        {0,8,30},{0,9,156},{132,7,99},{0,8,126},{0,8,62},{0,9,220},
-        {130,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{133,8,131},
-        {130,7,31},{0,8,113},{0,8,49},{0,9,194},{128,7,10},{0,8,97},
-        {0,8,33},{0,9,162},{0,8,1},{0,8,129},{0,8,65},{0,9,226},
-        {128,7,6},{0,8,89},{0,8,25},{0,9,146},{131,7,59},{0,8,121},
-        {0,8,57},{0,9,210},{129,7,17},{0,8,105},{0,8,41},{0,9,178},
-        {0,8,9},{0,8,137},{0,8,73},{0,9,242},{128,7,4},{0,8,85},
-        {0,8,21},{144,8,3},{131,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {129,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},
-        {0,8,69},{0,9,234},{128,7,8},{0,8,93},{0,8,29},{0,9,154},
-        {132,7,83},{0,8,125},{0,8,61},{0,9,218},{130,7,23},{0,8,109},
-        {0,8,45},{0,9,186},{0,8,13},{0,8,141},{0,8,77},{0,9,250},
-        {128,7,3},{0,8,83},{0,8,19},{133,8,195},{131,7,35},{0,8,115},
-        {0,8,51},{0,9,198},{129,7,11},{0,8,99},{0,8,35},{0,9,166},
-        {0,8,3},{0,8,131},{0,8,67},{0,9,230},{128,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{132,7,67},{0,8,123},{0,8,59},{0,9,214},
-        {130,7,19},{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},
-        {0,8,75},{0,9,246},{128,7,5},{0,8,87},{0,8,23},{77,8,0},
-        {131,7,51},{0,8,119},{0,8,55},{0,9,206},{129,7,15},{0,8,103},
-        {0,8,39},{0,9,174},{0,8,7},{0,8,135},{0,8,71},{0,9,238},
-        {128,7,9},{0,8,95},{0,8,31},{0,9,158},{132,7,99},{0,8,127},
-        {0,8,63},{0,9,222},{130,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},
-        {0,8,16},{132,8,115},{130,7,31},{0,8,112},{0,8,48},{0,9,193},
-        {128,7,10},{0,8,96},{0,8,32},{0,9,161},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,225},{128,7,6},{0,8,88},{0,8,24},{0,9,145},
-        {131,7,59},{0,8,120},{0,8,56},{0,9,209},{129,7,17},{0,8,104},
-        {0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},{0,9,241},
-        {128,7,4},{0,8,84},{0,8,20},{133,8,227},{131,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{129,7,13},{0,8,100},{0,8,36},{0,9,169},
-        {0,8,4},{0,8,132},{0,8,68},{0,9,233},{128,7,8},{0,8,92},
-        {0,8,28},{0,9,153},{132,7,83},{0,8,124},{0,8,60},{0,9,217},
-        {130,7,23},{0,8,108},{0,8,44},{0,9,185},{0,8,12},{0,8,140},
-        {0,8,76},{0,9,249},{128,7,3},{0,8,82},{0,8,18},{133,8,163},
-        {131,7,35},{0,8,114},{0,8,50},{0,9,197},{129,7,11},{0,8,98},
-        {0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {128,7,7},{0,8,90},{0,8,26},{0,9,149},{132,7,67},{0,8,122},
-        {0,8,58},{0,9,213},{130,7,19},{0,8,106},{0,8,42},{0,9,181},
-        {0,8,10},{0,8,138},{0,8,74},{0,9,245},{128,7,5},{0,8,86},
-        {0,8,22},{65,8,0},{131,7,51},{0,8,118},{0,8,54},{0,9,205},
-        {129,7,15},{0,8,102},{0,8,38},{0,9,173},{0,8,6},{0,8,134},
-        {0,8,70},{0,9,237},{128,7,9},{0,8,94},{0,8,30},{0,9,157},
-        {132,7,99},{0,8,126},{0,8,62},{0,9,221},{130,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},
-        {96,7,0},{0,8,81},{0,8,17},{133,8,131},{130,7,31},{0,8,113},
-        {0,8,49},{0,9,195},{128,7,10},{0,8,97},{0,8,33},{0,9,163},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,227},{128,7,6},{0,8,89},
-        {0,8,25},{0,9,147},{131,7,59},{0,8,121},{0,8,57},{0,9,211},
-        {129,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},{0,8,137},
-        {0,8,73},{0,9,243},{128,7,4},{0,8,85},{0,8,21},{144,8,3},
-        {131,7,43},{0,8,117},{0,8,53},{0,9,203},{129,7,13},{0,8,101},
-        {0,8,37},{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},
-        {128,7,8},{0,8,93},{0,8,29},{0,9,155},{132,7,83},{0,8,125},
-        {0,8,61},{0,9,219},{130,7,23},{0,8,109},{0,8,45},{0,9,187},
-        {0,8,13},{0,8,141},{0,8,77},{0,9,251},{128,7,3},{0,8,83},
-        {0,8,19},{133,8,195},{131,7,35},{0,8,115},{0,8,51},{0,9,199},
-        {129,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{128,7,7},{0,8,91},{0,8,27},{0,9,151},
-        {132,7,67},{0,8,123},{0,8,59},{0,9,215},{130,7,19},{0,8,107},
-        {0,8,43},{0,9,183},{0,8,11},{0,8,139},{0,8,75},{0,9,247},
-        {128,7,5},{0,8,87},{0,8,23},{77,8,0},{131,7,51},{0,8,119},
-        {0,8,55},{0,9,207},{129,7,15},{0,8,103},{0,8,39},{0,9,175},
-        {0,8,7},{0,8,135},{0,8,71},{0,9,239},{128,7,9},{0,8,95},
-        {0,8,31},{0,9,159},{132,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {130,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},
-        {0,8,79},{0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {128,5,1},{135,5,257},{131,5,17},{139,5,4097},{129,5,5},
-        {137,5,1025},{133,5,65},{141,5,16385},{128,5,3},{136,5,513},
-        {132,5,33},{140,5,8193},{130,5,9},{138,5,2049},{134,5,129},
-        {142,5,32769},{128,5,2},{135,5,385},{131,5,25},{139,5,6145},
-        {129,5,7},{137,5,1537},{133,5,97},{141,5,24577},{128,5,4},
-        {136,5,769},{132,5,49},{140,5,12289},{130,5,13},{138,5,3073},
-        {134,5,193},{142,5,49153}
-    };

crates/libz-sys/src/zlib/contrib/infback9/inflate9.h

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/inflate9.h b/crates/libz-sys/src/zlib/contrib/infback9/inflate9.h
deleted file mode 100644
index ee9a793..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/inflate9.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* inflate9.h -- internal inflate state definition
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-            LEN,        /* i: waiting for length/lit code */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD         /* got a data error -- remain here until reset */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to the BAD mode -- not shown for clarity)
-
-    Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or DONE
-            STORED -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
-                LEN -> LEN or TYPE
- */
-
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
-struct inflate_state {
-        /* sliding window */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-};

crates/libz-sys/src/zlib/contrib/infback9/inftree9.c

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/inftree9.c b/crates/libz-sys/src/zlib/contrib/infback9/inftree9.c
deleted file mode 100644
index 5f4a767..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/inftree9.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftree9.h"
-
-#define MAXBITS 15
-
-const char inflate9_copyright[] =
-   " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int inflate_table9(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
-        19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
-        131, 163, 195, 227, 3, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
-        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
-        65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
-        4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
-    static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
-        128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
-        133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,
-        139, 139, 140, 140, 141, 141, 142, 142};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) return -1;            /* no codes! */
-    for (min = 1; min <= MAXBITS; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftree9.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
-        (type == DISTS && used >= ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        this.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
-        }
-        else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = this;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += 1U << curr;
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used >= ENOUGH_LENS) ||
-                (type == DISTS && used >= ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            curr = root;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}

crates/libz-sys/src/zlib/contrib/infback9/inftree9.h

diff --git a/crates/libz-sys/src/zlib/contrib/infback9/inftree9.h b/crates/libz-sys/src/zlib/contrib/infback9/inftree9.h
deleted file mode 100644
index 5ab21f0..0000000
--- a/crates/libz-sys/src/zlib/contrib/infback9/inftree9.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* inftree9.h -- header to use inftree9.c
- * Copyright (C) 1995-2008 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    100eeeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1446, which is the sum of 852 for literal/length codes and 594 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 32 6 15" for distance codes returns 594.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in infback9.c.  If the root table size is changed,
-   then these maximum sizes would be need to be recalculated and updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 594
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table9() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-extern int inflate_table9 OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));

crates/libz-sys/src/zlib/contrib/inflate86/inffas86.c

diff --git a/crates/libz-sys/src/zlib/contrib/inflate86/inffas86.c b/crates/libz-sys/src/zlib/contrib/inflate86/inffas86.c
deleted file mode 100644
index 7292f67..0000000
--- a/crates/libz-sys/src/zlib/contrib/inflate86/inffas86.c
+++ /dev/null
@@ -1,1157 +0,0 @@
-/* inffas86.c is a hand tuned assembler version of
- *
- * inffast.c -- fast decoding
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
- * slightly quicker on x86 systems because, instead of using rep movsb to copy
- * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
- * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
- * from http://fedora.linux.duke.edu/fc1_x86_64
- * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
- * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
- * when decompressing mozilla-source-1.3.tar.gz.
- *
- * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
- * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
- * the moment.  I have successfully compiled and tested this code with gcc2.96,
- * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
- * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
- * enabled.  I will attempt to merge the MMX code into this version.  Newer
- * versions of this and inffast.S can be found at
- * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* Mark Adler's comments from inffast.c: */
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    struct inffast_ar {
-/* 64   32                               x86  x86_64 */
-/* ar offset                              register */
-/*  0    0 */ void *esp;                /* esp save */
-/*  8    4 */ void *ebp;                /* ebp save */
-/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
-/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
-/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
-/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
-/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
-/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
-/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
-/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
-/* 80   40 */ unsigned long hold;       /* edx rdx  local strm->hold */
-/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
-/* 92   48 */ unsigned wsize;           /*          window size */
-/* 96   52 */ unsigned write;           /*          window write index */
-/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
-/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
-/*108   64 */ unsigned len;             /*     r14  match length */
-/*112   68 */ unsigned dist;            /*     r15  match distance */
-/*116   72 */ unsigned status;          /*          set when state chng*/
-    } ar;
-
-#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
-#define PAD_AVAIL_IN 6
-#define PAD_AVAIL_OUT 258
-#else
-#define PAD_AVAIL_IN 5
-#define PAD_AVAIL_OUT 257
-#endif
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    ar.in = strm->next_in;
-    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
-    ar.out = strm->next_out;
-    ar.beg = ar.out - (start - strm->avail_out);
-    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
-    ar.wsize = state->wsize;
-    ar.write = state->wnext;
-    ar.window = state->window;
-    ar.hold = state->hold;
-    ar.bits = state->bits;
-    ar.lcode = state->lencode;
-    ar.dcode = state->distcode;
-    ar.lmask = (1U << state->lenbits) - 1;
-    ar.dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-
-    /* align in on 1/2 hold size boundary */
-    while (((unsigned long)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
-        ar.hold += (unsigned long)*ar.in++ << ar.bits;
-        ar.bits += 8;
-    }
-
-#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
-    __asm__ __volatile__ (
-"        leaq    %0, %%rax\n"
-"        movq    %%rbp, 8(%%rax)\n"       /* save regs rbp and rsp */
-"        movq    %%rsp, (%%rax)\n"
-"        movq    %%rax, %%rsp\n"          /* make rsp point to &ar */
-"        movq    16(%%rsp), %%rsi\n"      /* rsi  = in */
-"        movq    32(%%rsp), %%rdi\n"      /* rdi  = out */
-"        movq    24(%%rsp), %%r9\n"       /* r9   = last */
-"        movq    48(%%rsp), %%r10\n"      /* r10  = end */
-"        movq    64(%%rsp), %%rbp\n"      /* rbp  = lcode */
-"        movq    72(%%rsp), %%r11\n"      /* r11  = dcode */
-"        movq    80(%%rsp), %%rdx\n"      /* rdx  = hold */
-"        movl    88(%%rsp), %%ebx\n"      /* ebx  = bits */
-"        movl    100(%%rsp), %%r12d\n"    /* r12d = lmask */
-"        movl    104(%%rsp), %%r13d\n"    /* r13d = dmask */
-                                          /* r14d = len */
-                                          /* r15d = dist */
-"        cld\n"
-"        cmpq    %%rdi, %%r10\n"
-"        je      .L_one_time\n"           /* if only one decode left */
-"        cmpq    %%rsi, %%r9\n"
-"        je      .L_one_time\n"
-"        jmp     .L_do_loop\n"
-
-".L_one_time:\n"
-"        movq    %%r12, %%r8\n"           /* r8 = lmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_length_code_one_time\n"
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-"        jmp     .L_get_length_code_one_time\n"
-
-".align 32,0x90\n"
-".L_while_test:\n"
-"        cmpq    %%rdi, %%r10\n"
-"        jbe     .L_break_loop\n"
-"        cmpq    %%rsi, %%r9\n"
-"        jbe     .L_break_loop\n"
-
-".L_do_loop:\n"
-"        movq    %%r12, %%r8\n"           /* r8 = lmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_length_code\n"    /* if (32 < bits) */
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-
-".L_get_length_code:\n"
-"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
-"        movl    (%%rbp,%%r8,4), %%eax\n"  /* eax = lcode[hold & lmask] */
-
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        movq    %%r12, %%r8\n"            /* r8 = lmask */
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-
-".L_get_length_code_one_time:\n"
-"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
-"        movl    (%%rbp,%%r8,4), %%eax\n" /* eax = lcode[hold & lmask] */
-
-".L_dolen:\n"
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_length_base:\n"
-"        movl    %%eax, %%r14d\n"         /* len = this */
-"        shrl    $16, %%r14d\n"           /* len = this.val */
-"        movb    %%al, %%cl\n"
-
-"        testb   $16, %%al\n"
-"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_decode_distance\n"    /* if (!op) */
-
-".L_add_bits_to_len:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrq    %%cl, %%rdx\n"
-"        addl    %%eax, %%r14d\n"         /* len += hold & mask[op] */
-
-".L_decode_distance:\n"
-"        movq    %%r13, %%r8\n"           /* r8 = dmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_distance_code\n"  /* if (32 < bits) */
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-
-".L_get_distance_code:\n"
-"        andq    %%rdx, %%r8\n"           /* r8 &= hold */
-"        movl    (%%r11,%%r8,4), %%eax\n" /* eax = dcode[hold & dmask] */
-
-".L_dodist:\n"
-"        movl    %%eax, %%r15d\n"         /* dist = this */
-"        shrl    $16, %%r15d\n"           /* dist = this.val */
-"        movb    %%ah, %%cl\n"
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-"        movb    %%al, %%cl\n"            /* cl = this.op */
-
-"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
-"        jz      .L_test_for_second_level_dist\n"
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_check_dist_one\n"
-
-".L_add_bits_to_dist:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"                 /* (1 << op) - 1 */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrq    %%cl, %%rdx\n"
-"        addl    %%eax, %%r15d\n"         /* dist += hold & ((1 << op) - 1) */
-
-".L_check_window:\n"
-"        movq    %%rsi, %%r8\n"           /* save in so from can use it's reg */
-"        movq    %%rdi, %%rax\n"
-"        subq    40(%%rsp), %%rax\n"      /* nbytes = out - beg */
-
-"        cmpl    %%r15d, %%eax\n"
-"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
-
-"        movl    %%r14d, %%ecx\n"         /* ecx = len */
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"          /* from = out - dist */
-
-"        sarl    %%ecx\n"
-"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
-
-"        rep     movsw\n"
-"        movb    (%%rsi), %%al\n"
-"        movb    %%al, (%%rdi)\n"
-"        incq    %%rdi\n"
-
-"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
-"        jmp     .L_while_test\n"
-
-".L_copy_two:\n"
-"        rep     movsw\n"
-"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_check_dist_one:\n"
-"        cmpl    $1, %%r15d\n"            /* if dist 1, is a memset */
-"        jne     .L_check_window\n"
-"        cmpq    %%rdi, 40(%%rsp)\n"      /* if out == beg, outside window */
-"        je      .L_check_window\n"
-
-"        movl    %%r14d, %%ecx\n"         /* ecx = len */
-"        movb    -1(%%rdi), %%al\n"
-"        movb    %%al, %%ah\n"
-
-"        sarl    %%ecx\n"
-"        jnc     .L_set_two\n"
-"        movb    %%al, (%%rdi)\n"
-"        incq    %%rdi\n"
-
-".L_set_two:\n"
-"        rep     stosw\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_length:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%r14d, %%eax\n"        /* eax += len */
-"        movl    (%%rbp,%%rax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
-"        jmp     .L_dolen\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_dist:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%r15d, %%eax\n"        /* eax += dist */
-"        movl    (%%r11,%%rax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
-"        jmp     .L_dodist\n"
-
-".align 32,0x90\n"
-".L_clip_window:\n"
-"        movl    %%eax, %%ecx\n"         /* ecx = nbytes */
-"        movl    92(%%rsp), %%eax\n"     /* eax = wsize, prepare for dist cmp */
-"        negl    %%ecx\n"                /* nbytes = -nbytes */
-
-"        cmpl    %%r15d, %%eax\n"
-"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
-
-"        addl    %%r15d, %%ecx\n"         /* nbytes = dist - nbytes */
-"        cmpl    $0, 96(%%rsp)\n"
-"        jne     .L_wrap_around_window\n" /* if (write != 0) */
-
-"        movq    56(%%rsp), %%rsi\n"     /* from  = window */
-"        subl    %%ecx, %%eax\n"         /* eax  -= nbytes */
-"        addq    %%rax, %%rsi\n"         /* from += wsize - nbytes */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%r14d\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* eax -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = &out[ -dist ] */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_wrap_around_window:\n"
-"        movl    96(%%rsp), %%eax\n"     /* eax = write */
-"        cmpl    %%eax, %%ecx\n"
-"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
-
-"        movl    92(%%rsp), %%esi\n"     /* from  = wsize */
-"        addq    56(%%rsp), %%rsi\n"     /* from += window */
-"        addq    %%rax, %%rsi\n"         /* from += write */
-"        subq    %%rcx, %%rsi\n"         /* from -= nbytes */
-"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    56(%%rsp), %%rsi\n"     /* from = window */
-"        movl    96(%%rsp), %%ecx\n"     /* nbytes = write */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_contiguous_in_window:\n"
-"        movq    56(%%rsp), %%rsi\n"     /* rsi = window */
-"        addq    %%rax, %%rsi\n"
-"        subq    %%rcx, %%rsi\n"         /* from += write - nbytes */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
-
-".align 32,0x90\n"
-".L_do_copy:\n"
-"        movl    %%eax, %%ecx\n"         /* ecx = len */
-"        rep     movsb\n"
-
-"        movq    %%r8, %%rsi\n"          /* move in back to %esi, toss from */
-"        jmp     .L_while_test\n"
-
-".L_test_for_end_of_block:\n"
-"        testb   $32, %%al\n"
-"        jz      .L_invalid_literal_length_code\n"
-"        movl    $1, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_literal_length_code:\n"
-"        movl    $2, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_code:\n"
-"        movl    $3, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_too_far:\n"
-"        movl    $4, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_break_loop:\n"
-"        movl    $0, 116(%%rsp)\n"
-
-".L_break_loop_with_status:\n"
-/* put in, out, bits, and hold back into ar and pop esp */
-"        movq    %%rsi, 16(%%rsp)\n"     /* in */
-"        movq    %%rdi, 32(%%rsp)\n"     /* out */
-"        movl    %%ebx, 88(%%rsp)\n"     /* bits */
-"        movq    %%rdx, 80(%%rsp)\n"     /* hold */
-"        movq    (%%rsp), %%rax\n"       /* restore rbp and rsp */
-"        movq    8(%%rsp), %%rbp\n"
-"        movq    %%rax, %%rsp\n"
-          :
-          : "m" (ar)
-          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
-            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
-    );
-#elif ( defined( __GNUC__ ) || defined( __ICC ) ) && defined( __i386 )
-    __asm__ __volatile__ (
-"        leal    %0, %%eax\n"
-"        movl    %%esp, (%%eax)\n"        /* save esp, ebp */
-"        movl    %%ebp, 4(%%eax)\n"
-"        movl    %%eax, %%esp\n"
-"        movl    8(%%esp), %%esi\n"       /* esi = in */
-"        movl    16(%%esp), %%edi\n"      /* edi = out */
-"        movl    40(%%esp), %%edx\n"      /* edx = hold */
-"        movl    44(%%esp), %%ebx\n"      /* ebx = bits */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-
-"        cld\n"
-"        jmp     .L_do_loop\n"
-
-".align 32,0x90\n"
-".L_while_test:\n"
-"        cmpl    %%edi, 24(%%esp)\n"      /* out < end */
-"        jbe     .L_break_loop\n"
-"        cmpl    %%esi, 12(%%esp)\n"      /* in < last */
-"        jbe     .L_break_loop\n"
-
-".L_do_loop:\n"
-"        cmpb    $15, %%bl\n"
-"        ja      .L_get_length_code\n"    /* if (15 < bits) */
-
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
-
-".L_get_length_code:\n"
-"        movl    56(%%esp), %%eax\n"      /* eax = lmask */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[hold & lmask] */
-
-".L_dolen:\n"
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_length_base:\n"
-"        movl    %%eax, %%ecx\n"          /* len = this */
-"        shrl    $16, %%ecx\n"            /* len = this.val */
-"        movl    %%ecx, 64(%%esp)\n"      /* save len */
-"        movb    %%al, %%cl\n"
-
-"        testb   $16, %%al\n"
-"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_decode_distance\n"    /* if (!op) */
-"        cmpb    %%cl, %%bl\n"
-"        jae     .L_add_bits_to_len\n"    /* if (op <= bits) */
-
-"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
-"        movb    %%ch, %%cl\n"            /* move op back to ecx */
-
-".L_add_bits_to_len:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrl    %%cl, %%edx\n"
-"        addl    %%eax, 64(%%esp)\n"      /* len += hold & mask[op] */
-
-".L_decode_distance:\n"
-"        cmpb    $15, %%bl\n"
-"        ja      .L_get_distance_code\n"  /* if (15 < bits) */
-
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
-
-".L_get_distance_code:\n"
-"        movl    60(%%esp), %%eax\n"      /* eax = dmask */
-"        movl    36(%%esp), %%ecx\n"      /* ecx = dcode */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        movl    (%%ecx,%%eax,4), %%eax\n"/* eax = dcode[hold & dmask] */
-
-".L_dodist:\n"
-"        movl    %%eax, %%ebp\n"          /* dist = this */
-"        shrl    $16, %%ebp\n"            /* dist = this.val */
-"        movb    %%ah, %%cl\n"
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
-"        movb    %%al, %%cl\n"            /* cl = this.op */
-
-"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
-"        jz      .L_test_for_second_level_dist\n"
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_check_dist_one\n"
-"        cmpb    %%cl, %%bl\n"
-"        jae     .L_add_bits_to_dist\n"   /* if (op <= bits) 97.6% */
-
-"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
-"        movb    %%ch, %%cl\n"            /* move op back to ecx */
-
-".L_add_bits_to_dist:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"                 /* (1 << op) - 1 */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrl    %%cl, %%edx\n"
-"        addl    %%eax, %%ebp\n"          /* dist += hold & ((1 << op) - 1) */
-
-".L_check_window:\n"
-"        movl    %%esi, 8(%%esp)\n"       /* save in so from can use it's reg */
-"        movl    %%edi, %%eax\n"
-"        subl    20(%%esp), %%eax\n"      /* nbytes = out - beg */
-
-"        cmpl    %%ebp, %%eax\n"
-"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
-
-"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"          /* from = out - dist */
-
-"        sarl    %%ecx\n"
-"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
-
-"        rep     movsw\n"
-"        movb    (%%esi), %%al\n"
-"        movb    %%al, (%%edi)\n"
-"        incl    %%edi\n"
-
-"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".L_copy_two:\n"
-"        rep     movsw\n"
-"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_check_dist_one:\n"
-"        cmpl    $1, %%ebp\n"            /* if dist 1, is a memset */
-"        jne     .L_check_window\n"
-"        cmpl    %%edi, 20(%%esp)\n"
-"        je      .L_check_window\n"      /* out == beg, if outside window */
-
-"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
-"        movb    -1(%%edi), %%al\n"
-"        movb    %%al, %%ah\n"
-
-"        sarl    %%ecx\n"
-"        jnc     .L_set_two\n"
-"        movb    %%al, (%%edi)\n"
-"        incl    %%edi\n"
-
-".L_set_two:\n"
-"        rep     stosw\n"
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_length:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    64(%%esp), %%eax\n"     /* eax += len */
-"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
-"        jmp     .L_dolen\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_dist:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%ebp, %%eax\n"         /* eax += dist */
-"        movl    36(%%esp), %%ecx\n"     /* ecx = dcode */
-"        movl    (%%ecx,%%eax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
-"        jmp     .L_dodist\n"
-
-".align 32,0x90\n"
-".L_clip_window:\n"
-"        movl    %%eax, %%ecx\n"
-"        movl    48(%%esp), %%eax\n"     /* eax = wsize */
-"        negl    %%ecx\n"                /* nbytes = -nbytes */
-"        movl    28(%%esp), %%esi\n"     /* from = window */
-
-"        cmpl    %%ebp, %%eax\n"
-"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
-
-"        addl    %%ebp, %%ecx\n"         /* nbytes = dist - nbytes */
-"        cmpl    $0, 52(%%esp)\n"
-"        jne     .L_wrap_around_window\n" /* if (write != 0) */
-
-"        subl    %%ecx, %%eax\n"
-"        addl    %%eax, %%esi\n"         /* from += wsize - nbytes */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_wrap_around_window:\n"
-"        movl    52(%%esp), %%eax\n"     /* eax = write */
-"        cmpl    %%eax, %%ecx\n"
-"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
-
-"        addl    48(%%esp), %%esi\n"     /* from += wsize */
-"        addl    %%eax, %%esi\n"         /* from += write */
-"        subl    %%ecx, %%esi\n"         /* from -= nbytes */
-"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    28(%%esp), %%esi\n"     /* from = window */
-"        movl    52(%%esp), %%ecx\n"     /* nbytes = write */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_contiguous_in_window:\n"
-"        addl    %%eax, %%esi\n"
-"        subl    %%ecx, %%esi\n"         /* from += write - nbytes */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
-
-".align 32,0x90\n"
-".L_do_copy:\n"
-"        movl    %%eax, %%ecx\n"
-"        rep     movsb\n"
-
-"        movl    8(%%esp), %%esi\n"      /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"     /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".L_test_for_end_of_block:\n"
-"        testb   $32, %%al\n"
-"        jz      .L_invalid_literal_length_code\n"
-"        movl    $1, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_literal_length_code:\n"
-"        movl    $2, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_code:\n"
-"        movl    $3, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_too_far:\n"
-"        movl    8(%%esp), %%esi\n"
-"        movl    $4, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_break_loop:\n"
-"        movl    $0, 72(%%esp)\n"
-
-".L_break_loop_with_status:\n"
-/* put in, out, bits, and hold back into ar and pop esp */
-"        movl    %%esi, 8(%%esp)\n"      /* save in */
-"        movl    %%edi, 16(%%esp)\n"     /* save out */
-"        movl    %%ebx, 44(%%esp)\n"     /* save bits */
-"        movl    %%edx, 40(%%esp)\n"     /* save hold */
-"        movl    4(%%esp), %%ebp\n"      /* restore esp, ebp */
-"        movl    (%%esp), %%esp\n"
-          :
-          : "m" (ar)
-          : "memory", "%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi"
-    );
-#elif defined( _MSC_VER ) && ! defined( _M_AMD64 )
-    __asm {
-	lea	eax, ar
-	mov	[eax], esp         /* save esp, ebp */
-	mov	[eax+4], ebp
-	mov	esp, eax
-	mov	esi, [esp+8]       /* esi = in */
-	mov	edi, [esp+16]      /* edi = out */
-	mov	edx, [esp+40]      /* edx = hold */
-	mov	ebx, [esp+44]      /* ebx = bits */
-	mov	ebp, [esp+32]      /* ebp = lcode */
-
-	cld
-	jmp	L_do_loop
-
-ALIGN 4
-L_while_test:
-	cmp	[esp+24], edi
-	jbe	L_break_loop
-	cmp	[esp+12], esi
-	jbe	L_break_loop
-
-L_do_loop:
-	cmp	bl, 15
-	ja	L_get_length_code    /* if (15 < bits) */
-
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
-
-L_get_length_code:
-	mov	eax, [esp+56]      /* eax = lmask */
-	and	eax, edx          /* eax &= hold */
-	mov	eax, [ebp+eax*4] /* eax = lcode[hold & lmask] */
-
-L_dolen:
-	mov	cl, ah            /* cl = this.bits */
-	sub	bl, ah            /* bits -= this.bits */
-	shr	edx, cl           /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base /* if (op != 0) 45.7% */
-
-	shr	eax, 16            /* output this.val char */
-	stosb
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_length_base:
-	mov	ecx, eax          /* len = this */
-	shr	ecx, 16            /* len = this.val */
-	mov	[esp+64], ecx      /* save len */
-	mov	cl, al
-
-	test	al, 16
-	jz	L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
-	and	cl, 15             /* op &= 15 */
-	jz	L_decode_distance    /* if (!op) */
-	cmp	bl, cl
-	jae	L_add_bits_to_len    /* if (op <= bits) */
-
-	mov	ch, cl            /* stash op in ch, freeing cl */
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
-	mov	cl, ch            /* move op back to ecx */
-
-L_add_bits_to_len:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx          /* eax &= hold */
-	shr	edx, cl
-	add	[esp+64], eax      /* len += hold & mask[op] */
-
-L_decode_distance:
-	cmp	bl, 15
-	ja	L_get_distance_code  /* if (15 < bits) */
-
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
-
-L_get_distance_code:
-	mov	eax, [esp+60]      /* eax = dmask */
-	mov	ecx, [esp+36]      /* ecx = dcode */
-	and	eax, edx          /* eax &= hold */
-	mov	eax, [ecx+eax*4]/* eax = dcode[hold & dmask] */
-
-L_dodist:
-	mov	ebp, eax          /* dist = this */
-	shr	ebp, 16            /* dist = this.val */
-	mov	cl, ah
-	sub	bl, ah            /* bits -= this.bits */
-	shr	edx, cl           /* hold >>= this.bits */
-	mov	cl, al            /* cl = this.op */
-
-	test	al, 16             /* if ((op & 16) == 0) */
-	jz	L_test_for_second_level_dist
-	and	cl, 15             /* op &= 15 */
-	jz	L_check_dist_one
-	cmp	bl, cl
-	jae	L_add_bits_to_dist   /* if (op <= bits) 97.6% */
-
-	mov	ch, cl            /* stash op in ch, freeing cl */
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
-	mov	cl, ch            /* move op back to ecx */
-
-L_add_bits_to_dist:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax                 /* (1 << op) - 1 */
-	and	eax, edx          /* eax &= hold */
-	shr	edx, cl
-	add	ebp, eax          /* dist += hold & ((1 << op) - 1) */
-
-L_check_window:
-	mov	[esp+8], esi       /* save in so from can use it's reg */
-	mov	eax, edi
-	sub	eax, [esp+20]      /* nbytes = out - beg */
-
-	cmp	eax, ebp
-	jb	L_clip_window        /* if (dist > nbytes) 4.2% */
-
-	mov	ecx, [esp+64]      /* ecx = len */
-	mov	esi, edi
-	sub	esi, ebp          /* from = out - dist */
-
-	sar	ecx, 1
-	jnc	L_copy_two
-
-	rep     movsw
-	mov	al, [esi]
-	mov	[edi], al
-	inc	edi
-
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-L_copy_two:
-	rep     movsw
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp	ebp, 1            /* if dist 1, is a memset */
-	jne	L_check_window
-	cmp	[esp+20], edi
-	je	L_check_window    /* out == beg, if outside window */
-
-	mov	ecx, [esp+64]     /* ecx = len */
-	mov	al, [edi-1]
-	mov	ah, al
-
-	sar	ecx, 1
-	jnc	L_set_two
-	mov	[edi], al         /* memset out with from[-1] */
-	inc	edi
-
-L_set_two:
-	rep     stosw
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-	test	al, 64
-	jnz	L_test_for_end_of_block /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         /* eax &= hold */
-	add	eax, [esp+64]     /* eax += len */
-	mov	eax, [ebp+eax*4] /* eax = lcode[val+(hold&mask[op])]*/
-	jmp	L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-	test	al, 64
-	jnz	L_invalid_distance_code /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         /* eax &= hold */
-	add	eax, ebp         /* eax += dist */
-	mov	ecx, [esp+36]     /* ecx = dcode */
-	mov	eax, [ecx+eax*4] /* eax = dcode[val+(hold&mask[op])]*/
-	jmp	L_dodist
-
-ALIGN 4
-L_clip_window:
-	mov	ecx, eax
-	mov	eax, [esp+48]     /* eax = wsize */
-	neg	ecx                /* nbytes = -nbytes */
-	mov	esi, [esp+28]     /* from = window */
-
-	cmp	eax, ebp
-	jb	L_invalid_distance_too_far /* if (dist > wsize) */
-
-	add	ecx, ebp         /* nbytes = dist - nbytes */
-	cmp	dword ptr [esp+52], 0
-	jne	L_wrap_around_window /* if (write != 0) */
-
-	sub	eax, ecx
-	add	esi, eax         /* from += wsize - nbytes */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_wrap_around_window:
-	mov	eax, [esp+52]    /* eax = write */
-	cmp	ecx, eax
-	jbe	L_contiguous_in_window /* if (write >= nbytes) */
-
-	add	esi, [esp+48]    /* from += wsize */
-	add	esi, eax         /* from += write */
-	sub	esi, ecx         /* from -= nbytes */
-	sub	ecx, eax         /* nbytes -= write */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, [esp+28]     /* from = window */
-	mov	ecx, [esp+52]     /* nbytes = write */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_contiguous_in_window:
-	add	esi, eax
-	sub	esi, ecx         /* from += write - nbytes */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_do_copy:
-	mov	ecx, eax
-	rep     movsb
-
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-L_test_for_end_of_block:
-	test	al, 32
-	jz	L_invalid_literal_length_code
-	mov	dword ptr [esp+72], 1
-	jmp	L_break_loop_with_status
-
-L_invalid_literal_length_code:
-	mov	dword ptr [esp+72], 2
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_code:
-	mov	dword ptr [esp+72], 3
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_too_far:
-	mov	esi, [esp+4]
-	mov	dword ptr [esp+72], 4
-	jmp	L_break_loop_with_status
-
-L_break_loop:
-	mov	dword ptr [esp+72], 0
-
-L_break_loop_with_status:
-/* put in, out, bits, and hold back into ar and pop esp */
-	mov	[esp+8], esi     /* save in */
-	mov	[esp+16], edi    /* save out */
-	mov	[esp+44], ebx    /* save bits */
-	mov	[esp+40], edx    /* save hold */
-	mov	ebp, [esp+4]     /* restore esp, ebp */
-	mov	esp, [esp]
-    }
-#else
-#error "x86 architecture not defined"
-#endif
-
-    if (ar.status > 1) {
-        if (ar.status == 2)
-            strm->msg = "invalid literal/length code";
-        else if (ar.status == 3)
-            strm->msg = "invalid distance code";
-        else
-            strm->msg = "invalid distance too far back";
-        state->mode = BAD;
-    }
-    else if ( ar.status == 1 ) {
-        state->mode = TYPE;
-    }
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    ar.len = ar.bits >> 3;
-    ar.in -= ar.len;
-    ar.bits -= ar.len << 3;
-    ar.hold &= (1U << ar.bits) - 1;
-
-    /* update state and return */
-    strm->next_in = ar.in;
-    strm->next_out = ar.out;
-    strm->avail_in = (unsigned)(ar.in < ar.last ?
-                                PAD_AVAIL_IN + (ar.last - ar.in) :
-                                PAD_AVAIL_IN - (ar.in - ar.last));
-    strm->avail_out = (unsigned)(ar.out < ar.end ?
-                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
-                                 PAD_AVAIL_OUT - (ar.out - ar.end));
-    state->hold = ar.hold;
-    state->bits = ar.bits;
-    return;
-}
-

crates/libz-sys/src/zlib/contrib/inflate86/inffast.S

diff --git a/crates/libz-sys/src/zlib/contrib/inflate86/inffast.S b/crates/libz-sys/src/zlib/contrib/inflate86/inffast.S
deleted file mode 100644
index 2245a29..0000000
--- a/crates/libz-sys/src/zlib/contrib/inflate86/inffast.S
+++ /dev/null
@@ -1,1368 +0,0 @@
-/*
- * inffast.S is a hand tuned assembler version of:
- *
- * inffast.c -- fast decoding
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * This version (Jan-23-2003) of inflate_fast was coded and tested under
- * GNU/Linux on a pentium 3, using the gcc-3.2 compiler distribution.  On that
- * machine, I found that gzip style archives decompressed about 20% faster than
- * the gcc-3.2 -O3 -fomit-frame-pointer compiled version.  Your results will
- * depend on how large of a buffer is used for z_stream.next_in & next_out
- * (8K-32K worked best for my 256K cpu cache) and how much overhead there is in
- * stream processing I/O and crc32/addler32.  In my case, this routine used
- * 70% of the cpu time and crc32 used 20%.
- *
- * I am confident that this version will work in the general case, but I have
- * not tested a wide variety of datasets or a wide variety of platforms.
- *
- * Jan-24-2003 -- Added -DUSE_MMX define for slightly faster inflating.
- * It should be a runtime flag instead of compile time flag...
- *
- * Jan-26-2003 -- Added runtime check for MMX support with cpuid instruction.
- * With -DUSE_MMX, only MMX code is compiled.  With -DNO_MMX, only non-MMX code
- * is compiled.  Without either option, runtime detection is enabled.  Runtime
- * detection should work on all modern cpus and the recomended algorithm (flip
- * ID bit on eflags and then use the cpuid instruction) is used in many
- * multimedia applications.  Tested under win2k with gcc-2.95 and gas-2.12
- * distributed with cygwin3.  Compiling with gcc-2.95 -c inffast.S -o
- * inffast.obj generates a COFF object which can then be linked with MSVC++
- * compiled code.  Tested under FreeBSD 4.7 with gcc-2.95.
- *
- * Jan-28-2003 -- Tested Athlon XP... MMX mode is slower than no MMX (and
- * slower than compiler generated code).  Adjusted cpuid check to use the MMX
- * code only for Pentiums < P4 until I have more data on the P4.  Speed
- * improvment is only about 15% on the Athlon when compared with code generated
- * with MSVC++.  Not sure yet, but I think the P4 will also be slower using the
- * MMX mode because many of it's x86 ALU instructions execute in .5 cycles and
- * have less latency than MMX ops.  Added code to buffer the last 11 bytes of
- * the input stream since the MMX code grabs bits in chunks of 32, which
- * differs from the inffast.c algorithm.  I don't think there would have been
- * read overruns where a page boundary was crossed (a segfault), but there
- * could have been overruns when next_in ends on unaligned memory (unintialized
- * memory read).
- *
- * Mar-13-2003 -- P4 MMX is slightly slower than P4 NO_MMX.  I created a C
- * version of the non-MMX code so that it doesn't depend on zstrm and zstate
- * structure offsets which are hard coded in this file.  This was last tested
- * with zlib-1.2.0 which is currently in beta testing, newer versions of this
- * and inffas86.c can be found at http://www.eetbeetee.com/zlib/ and
- * http://www.charm.net/~christop/zlib/
- */
-
-
-/*
- * if you have underscore linking problems (_inflate_fast undefined), try
- * using -DGAS_COFF
- */
-#if ! defined( GAS_COFF ) && ! defined( GAS_ELF )
-
-#if defined( WIN32 ) || defined( __CYGWIN__ )
-#define GAS_COFF /* windows object format */
-#else
-#define GAS_ELF
-#endif
-
-#endif /* ! GAS_COFF && ! GAS_ELF */
-
-
-#if defined( GAS_COFF )
-
-/* coff externals have underscores */
-#define inflate_fast _inflate_fast
-#define inflate_fast_use_mmx _inflate_fast_use_mmx
-
-#endif /* GAS_COFF */
-
-
-.file "inffast.S"
-
-.globl inflate_fast
-
-.text
-.align 4,0
-.L_invalid_literal_length_code_msg:
-.string "invalid literal/length code"
-
-.align 4,0
-.L_invalid_distance_code_msg:
-.string "invalid distance code"
-
-.align 4,0
-.L_invalid_distance_too_far_msg:
-.string "invalid distance too far back"
-
-#if ! defined( NO_MMX )
-.align 4,0
-.L_mask: /* mask[N] = ( 1 << N ) - 1 */
-.long 0
-.long 1
-.long 3
-.long 7
-.long 15
-.long 31
-.long 63
-.long 127
-.long 255
-.long 511
-.long 1023
-.long 2047
-.long 4095
-.long 8191
-.long 16383
-.long 32767
-.long 65535
-.long 131071
-.long 262143
-.long 524287
-.long 1048575
-.long 2097151
-.long 4194303
-.long 8388607
-.long 16777215
-.long 33554431
-.long 67108863
-.long 134217727
-.long 268435455
-.long 536870911
-.long 1073741823
-.long 2147483647
-.long 4294967295
-#endif /* NO_MMX */
-
-.text
-
-/*
- * struct z_stream offsets, in zlib.h
- */
-#define next_in_strm   0   /* strm->next_in */
-#define avail_in_strm  4   /* strm->avail_in */
-#define next_out_strm  12  /* strm->next_out */
-#define avail_out_strm 16  /* strm->avail_out */
-#define msg_strm       24  /* strm->msg */
-#define state_strm     28  /* strm->state */
-
-/*
- * struct inflate_state offsets, in inflate.h
- */
-#define mode_state     0   /* state->mode */
-#define wsize_state    32  /* state->wsize */
-#define write_state    40  /* state->write */
-#define window_state   44  /* state->window */
-#define hold_state     48  /* state->hold */
-#define bits_state     52  /* state->bits */
-#define lencode_state  68  /* state->lencode */
-#define distcode_state 72  /* state->distcode */
-#define lenbits_state  76  /* state->lenbits */
-#define distbits_state 80  /* state->distbits */
-
-/*
- * inflate_fast's activation record
- */
-#define local_var_size 64 /* how much local space for vars */
-#define strm_sp        88 /* first arg: z_stream * (local_var_size + 24) */
-#define start_sp       92 /* second arg: unsigned int (local_var_size + 28) */
-
-/*
- * offsets for local vars on stack
- */
-#define out            60  /* unsigned char* */
-#define window         56  /* unsigned char* */
-#define wsize          52  /* unsigned int */
-#define write          48  /* unsigned int */
-#define in             44  /* unsigned char* */
-#define beg            40  /* unsigned char* */
-#define buf            28  /* char[ 12 ] */
-#define len            24  /* unsigned int */
-#define last           20  /* unsigned char* */
-#define end            16  /* unsigned char* */
-#define dcode          12  /* code* */
-#define lcode           8  /* code* */
-#define dmask           4  /* unsigned int */
-#define lmask           0  /* unsigned int */
-
-/*
- * typedef enum inflate_mode consts, in inflate.h
- */
-#define INFLATE_MODE_TYPE 11  /* state->mode flags enum-ed in inflate.h */
-#define INFLATE_MODE_BAD  26
-
-
-#if ! defined( USE_MMX ) && ! defined( NO_MMX )
-
-#define RUN_TIME_MMX
-
-#define CHECK_MMX    1
-#define DO_USE_MMX   2
-#define DONT_USE_MMX 3
-
-.globl inflate_fast_use_mmx
-
-.data
-
-.align 4,0
-inflate_fast_use_mmx: /* integer flag for run time control 1=check,2=mmx,3=no */
-.long CHECK_MMX
-
-#if defined( GAS_ELF )
-/* elf info */
-.type   inflate_fast_use_mmx,@object
-.size   inflate_fast_use_mmx,4
-#endif
-
-#endif /* RUN_TIME_MMX */
-
-#if defined( GAS_COFF )
-/* coff info: scl 2 = extern, type 32 = function */
-.def inflate_fast; .scl 2; .type 32; .endef
-#endif
-
-.text
-
-.align 32,0x90
-inflate_fast:
-        pushl   %edi
-        pushl   %esi
-        pushl   %ebp
-        pushl   %ebx
-        pushf   /* save eflags (strm_sp, state_sp assumes this is 32 bits) */
-        subl    $local_var_size, %esp
-        cld
-
-#define strm_r  %esi
-#define state_r %edi
-
-        movl    strm_sp(%esp), strm_r
-        movl    state_strm(strm_r), state_r
-
-        /* in = strm->next_in;
-         * out = strm->next_out;
-         * last = in + strm->avail_in - 11;
-         * beg = out - (start - strm->avail_out);
-         * end = out + (strm->avail_out - 257);
-         */
-        movl    avail_in_strm(strm_r), %edx
-        movl    next_in_strm(strm_r), %eax
-
-        addl    %eax, %edx      /* avail_in += next_in */
-        subl    $11, %edx       /* avail_in -= 11 */
-
-        movl    %eax, in(%esp)
-        movl    %edx, last(%esp)
-
-        movl    start_sp(%esp), %ebp
-        movl    avail_out_strm(strm_r), %ecx
-        movl    next_out_strm(strm_r), %ebx
-
-        subl    %ecx, %ebp      /* start -= avail_out */
-        negl    %ebp            /* start = -start */
-        addl    %ebx, %ebp      /* start += next_out */
-
-        subl    $257, %ecx      /* avail_out -= 257 */
-        addl    %ebx, %ecx      /* avail_out += out */
-
-        movl    %ebx, out(%esp)
-        movl    %ebp, beg(%esp)
-        movl    %ecx, end(%esp)
-
-        /* wsize = state->wsize;
-         * write = state->write;
-         * window = state->window;
-         * hold = state->hold;
-         * bits = state->bits;
-         * lcode = state->lencode;
-         * dcode = state->distcode;
-         * lmask = ( 1 << state->lenbits ) - 1;
-         * dmask = ( 1 << state->distbits ) - 1;
-         */
-
-        movl    lencode_state(state_r), %eax
-        movl    distcode_state(state_r), %ecx
-
-        movl    %eax, lcode(%esp)
-        movl    %ecx, dcode(%esp)
-
-        movl    $1, %eax
-        movl    lenbits_state(state_r), %ecx
-        shll    %cl, %eax
-        decl    %eax
-        movl    %eax, lmask(%esp)
-
-        movl    $1, %eax
-        movl    distbits_state(state_r), %ecx
-        shll    %cl, %eax
-        decl    %eax
-        movl    %eax, dmask(%esp)
-
-        movl    wsize_state(state_r), %eax
-        movl    write_state(state_r), %ecx
-        movl    window_state(state_r), %edx
-
-        movl    %eax, wsize(%esp)
-        movl    %ecx, write(%esp)
-        movl    %edx, window(%esp)
-
-        movl    hold_state(state_r), %ebp
-        movl    bits_state(state_r), %ebx
-
-#undef strm_r
-#undef state_r
-
-#define in_r       %esi
-#define from_r     %esi
-#define out_r      %edi
-
-        movl    in(%esp), in_r
-        movl    last(%esp), %ecx
-        cmpl    in_r, %ecx
-        ja      .L_align_long           /* if in < last */
-
-        addl    $11, %ecx               /* ecx = &in[ avail_in ] */
-        subl    in_r, %ecx              /* ecx = avail_in */
-        movl    $12, %eax
-        subl    %ecx, %eax              /* eax = 12 - avail_in */
-        leal    buf(%esp), %edi
-        rep     movsb                   /* memcpy( buf, in, avail_in ) */
-        movl    %eax, %ecx
-        xorl    %eax, %eax
-        rep     stosb         /* memset( &buf[ avail_in ], 0, 12 - avail_in ) */
-        leal    buf(%esp), in_r         /* in = buf */
-        movl    in_r, last(%esp)        /* last = in, do just one iteration */
-        jmp     .L_is_aligned
-
-        /* align in_r on long boundary */
-.L_align_long:
-        testl   $3, in_r
-        jz      .L_is_aligned
-        xorl    %eax, %eax
-        movb    (in_r), %al
-        incl    in_r
-        movl    %ebx, %ecx
-        addl    $8, %ebx
-        shll    %cl, %eax
-        orl     %eax, %ebp
-        jmp     .L_align_long
-
-.L_is_aligned:
-        movl    out(%esp), out_r
-
-#if defined( NO_MMX )
-        jmp     .L_do_loop
-#endif
-
-#if defined( USE_MMX )
-        jmp     .L_init_mmx
-#endif
-
-/*** Runtime MMX check ***/
-
-#if defined( RUN_TIME_MMX )
-.L_check_mmx:
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        je      .L_init_mmx
-        ja      .L_do_loop /* > 2 */
-
-        pushl   %eax
-        pushl   %ebx
-        pushl   %ecx
-        pushl   %edx
-        pushf
-        movl    (%esp), %eax      /* copy eflags to eax */
-        xorl    $0x200000, (%esp) /* try toggling ID bit of eflags (bit 21)
-                                   * to see if cpu supports cpuid...
-                                   * ID bit method not supported by NexGen but
-                                   * bios may load a cpuid instruction and
-                                   * cpuid may be disabled on Cyrix 5-6x86 */
-        popf
-        pushf
-        popl    %edx              /* copy new eflags to edx */
-        xorl    %eax, %edx        /* test if ID bit is flipped */
-        jz      .L_dont_use_mmx   /* not flipped if zero */
-        xorl    %eax, %eax
-        cpuid
-        cmpl    $0x756e6547, %ebx /* check for GenuineIntel in ebx,ecx,edx */
-        jne     .L_dont_use_mmx
-        cmpl    $0x6c65746e, %ecx
-        jne     .L_dont_use_mmx
-        cmpl    $0x49656e69, %edx
-        jne     .L_dont_use_mmx
-        movl    $1, %eax
-        cpuid                     /* get cpu features */
-        shrl    $8, %eax
-        andl    $15, %eax
-        cmpl    $6, %eax          /* check for Pentium family, is 0xf for P4 */
-        jne     .L_dont_use_mmx
-        testl   $0x800000, %edx   /* test if MMX feature is set (bit 23) */
-        jnz     .L_use_mmx
-        jmp     .L_dont_use_mmx
-.L_use_mmx:
-        movl    $DO_USE_MMX, inflate_fast_use_mmx
-        jmp     .L_check_mmx_pop
-.L_dont_use_mmx:
-        movl    $DONT_USE_MMX, inflate_fast_use_mmx
-.L_check_mmx_pop:
-        popl    %edx
-        popl    %ecx
-        popl    %ebx
-        popl    %eax
-        jmp     .L_check_mmx
-#endif
-
-
-/*** Non-MMX code ***/
-
-#if defined ( NO_MMX ) || defined( RUN_TIME_MMX )
-
-#define hold_r     %ebp
-#define bits_r     %bl
-#define bitslong_r %ebx
-
-.align 32,0x90
-.L_while_test:
-        /* while (in < last && out < end)
-         */
-        cmpl    out_r, end(%esp)
-        jbe     .L_break_loop           /* if (out >= end) */
-
-        cmpl    in_r, last(%esp)
-        jbe     .L_break_loop
-
-.L_do_loop:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *
-         * do {
-         *   if (bits < 15) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   this = lcode[hold & lmask]
-         */
-        cmpb    $15, bits_r
-        ja      .L_get_length_code      /* if (15 < bits) */
-
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-
-.L_get_length_code:
-        movl    lmask(%esp), %edx       /* edx = lmask */
-        movl    lcode(%esp), %ecx       /* ecx = lcode */
-        andl    hold_r, %edx            /* edx &= hold */
-        movl    (%ecx,%edx,4), %eax     /* eax = lcode[hold & lmask] */
-
-.L_dolen:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *
-         * dolen:
-         *    bits -= this.bits;
-         *    hold >>= this.bits
-         */
-        movb    %ah, %cl                /* cl = this.bits */
-        subb    %ah, bits_r             /* bits -= this.bits */
-        shrl    %cl, hold_r             /* hold >>= this.bits */
-
-        /* check if op is a literal
-         * if (op == 0) {
-         *    PUP(out) = this.val;
-         *  }
-         */
-        testb   %al, %al
-        jnz     .L_test_for_length_base /* if (op != 0) 45.7% */
-
-        shrl    $16, %eax               /* output this.val char */
-        stosb
-        jmp     .L_while_test
-
-.L_test_for_length_base:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = len
-         *
-         * else if (op & 16) {
-         *   len = this.val
-         *   op &= 15
-         *   if (op) {
-         *     if (op > bits) {
-         *       hold |= *((unsigned short *)in)++ << bits;
-         *       bits += 16
-         *     }
-         *     len += hold & mask[op];
-         *     bits -= op;
-         *     hold >>= op;
-         *   }
-         */
-#define len_r %edx
-        movl    %eax, len_r             /* len = this */
-        shrl    $16, len_r              /* len = this.val */
-        movb    %al, %cl
-
-        testb   $16, %al
-        jz      .L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
-        andb    $15, %cl                /* op &= 15 */
-        jz      .L_save_len             /* if (!op) */
-        cmpb    %cl, bits_r
-        jae     .L_add_bits_to_len      /* if (op <= bits) */
-
-        movb    %cl, %ch                /* stash op in ch, freeing cl */
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-        movb    %ch, %cl                /* move op back to ecx */
-
-.L_add_bits_to_len:
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        subb    %cl, bits_r
-        andl    hold_r, %eax            /* eax &= hold */
-        shrl    %cl, hold_r
-        addl    %eax, len_r             /* len += hold & mask[op] */
-
-.L_save_len:
-        movl    len_r, len(%esp)        /* save len */
-#undef  len_r
-
-.L_decode_distance:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *
-         *   if (bits < 15) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   this = dcode[hold & dmask];
-         * dodist:
-         *   bits -= this.bits;
-         *   hold >>= this.bits;
-         *   op = this.op;
-         */
-
-        cmpb    $15, bits_r
-        ja      .L_get_distance_code    /* if (15 < bits) */
-
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-
-.L_get_distance_code:
-        movl    dmask(%esp), %edx       /* edx = dmask */
-        movl    dcode(%esp), %ecx       /* ecx = dcode */
-        andl    hold_r, %edx            /* edx &= hold */
-        movl    (%ecx,%edx,4), %eax     /* eax = dcode[hold & dmask] */
-
-#define dist_r %edx
-.L_dodist:
-        movl    %eax, dist_r            /* dist = this */
-        shrl    $16, dist_r             /* dist = this.val */
-        movb    %ah, %cl
-        subb    %ah, bits_r             /* bits -= this.bits */
-        shrl    %cl, hold_r             /* hold >>= this.bits */
-
-        /* if (op & 16) {
-         *   dist = this.val
-         *   op &= 15
-         *   if (op > bits) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   dist += hold & mask[op];
-         *   bits -= op;
-         *   hold >>= op;
-         */
-        movb    %al, %cl                /* cl = this.op */
-
-        testb   $16, %al                /* if ((op & 16) == 0) */
-        jz      .L_test_for_second_level_dist
-        andb    $15, %cl                /* op &= 15 */
-        jz      .L_check_dist_one
-        cmpb    %cl, bits_r
-        jae     .L_add_bits_to_dist     /* if (op <= bits) 97.6% */
-
-        movb    %cl, %ch                /* stash op in ch, freeing cl */
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-        movb    %ch, %cl                /* move op back to ecx */
-
-.L_add_bits_to_dist:
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax                    /* (1 << op) - 1 */
-        subb    %cl, bits_r
-        andl    hold_r, %eax            /* eax &= hold */
-        shrl    %cl, hold_r
-        addl    %eax, dist_r            /* dist += hold & ((1 << op) - 1) */
-        jmp     .L_check_window
-
-.L_check_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes
-         *
-         * nbytes = out - beg;
-         * if (dist <= nbytes) {
-         *   from = out - dist;
-         *   do {
-         *     PUP(out) = PUP(from);
-         *   } while (--len > 0) {
-         * }
-         */
-
-        movl    in_r, in(%esp)          /* save in so from can use it's reg */
-        movl    out_r, %eax
-        subl    beg(%esp), %eax         /* nbytes = out - beg */
-
-        cmpl    dist_r, %eax
-        jb      .L_clip_window          /* if (dist > nbytes) 4.2% */
-
-        movl    len(%esp), %ecx
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-        subl    $3, %ecx
-        movb    (from_r), %al
-        movb    %al, (out_r)
-        movb    1(from_r), %al
-        movb    2(from_r), %dl
-        addl    $3, from_r
-        movb    %al, 1(out_r)
-        movb    %dl, 2(out_r)
-        addl    $3, out_r
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        jmp     .L_while_test
-
-.align 16,0x90
-.L_check_dist_one:
-        cmpl    $1, dist_r
-        jne     .L_check_window
-        cmpl    out_r, beg(%esp)
-        je      .L_check_window
-
-        decl    out_r
-        movl    len(%esp), %ecx
-        movb    (out_r), %al
-        subl    $3, %ecx
-
-        movb    %al, 1(out_r)
-        movb    %al, 2(out_r)
-        movb    %al, 3(out_r)
-        addl    $4, out_r
-        rep     stosb
-
-        jmp     .L_while_test
-
-.align 16,0x90
-.L_test_for_second_level_length:
-        /* else if ((op & 64) == 0) {
-         *   this = lcode[this.val + (hold & mask[op])];
-         * }
-         */
-        testb   $64, %al
-        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
-
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        andl    hold_r, %eax            /* eax &= hold */
-        addl    %edx, %eax              /* eax += this.val */
-        movl    lcode(%esp), %edx       /* edx = lcode */
-        movl    (%edx,%eax,4), %eax     /* eax = lcode[val + (hold&mask[op])] */
-        jmp     .L_dolen
-
-.align 16,0x90
-.L_test_for_second_level_dist:
-        /* else if ((op & 64) == 0) {
-         *   this = dcode[this.val + (hold & mask[op])];
-         * }
-         */
-        testb   $64, %al
-        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
-
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        andl    hold_r, %eax            /* eax &= hold */
-        addl    %edx, %eax              /* eax += this.val */
-        movl    dcode(%esp), %edx       /* edx = dcode */
-        movl    (%edx,%eax,4), %eax     /* eax = dcode[val + (hold&mask[op])] */
-        jmp     .L_dodist
-
-.align 16,0x90
-.L_clip_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes
-         *
-         * else {
-         *   if (dist > wsize) {
-         *     invalid distance
-         *   }
-         *   from = window;
-         *   nbytes = dist - nbytes;
-         *   if (write == 0) {
-         *     from += wsize - nbytes;
-         */
-#define nbytes_r %ecx
-        movl    %eax, nbytes_r
-        movl    wsize(%esp), %eax       /* prepare for dist compare */
-        negl    nbytes_r                /* nbytes = -nbytes */
-        movl    window(%esp), from_r    /* from = window */
-
-        cmpl    dist_r, %eax
-        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
-
-        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
-        cmpl    $0, write(%esp)
-        jne     .L_wrap_around_window   /* if (write != 0) */
-
-        subl    nbytes_r, %eax
-        addl    %eax, from_r            /* from += wsize - nbytes */
-
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = len
-         *
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = out - dist;
-         *     }
-         *   }
-         */
-#define len_r %eax
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-.L_wrap_around_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = write, %eax = len
-         *
-         *   else if (write < nbytes) {
-         *     from += wsize + write - nbytes;
-         *     nbytes -= write;
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = window;
-         *       nbytes = write;
-         *       if (nbytes < len) {
-         *         len -= nbytes;
-         *         do {
-         *           PUP(out) = PUP(from);
-         *         } while(--nbytes);
-         *         from = out - dist;
-         *       }
-         *     }
-         *   }
-         */
-#define write_r %eax
-        movl    write(%esp), write_r
-        cmpl    write_r, nbytes_r
-        jbe     .L_contiguous_in_window /* if (write >= nbytes) */
-
-        addl    wsize(%esp), from_r
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
-        subl    write_r, nbytes_r       /* nbytes -= write */
-#undef write_r
-
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    window(%esp), from_r    /* from = window */
-        movl    write(%esp), nbytes_r   /* nbytes = write */
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-.L_contiguous_in_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = write, %eax = len
-         *
-         *   else {
-         *     from += write - nbytes;
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = out - dist;
-         *     }
-         *   }
-         */
-#define write_r %eax
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += write - nbytes */
-#undef write_r
-
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-.L_do_copy1:
-        /* regs: %esi = from, %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *       %eax = len
-         *
-         *     while (len > 0) {
-         *       PUP(out) = PUP(from);
-         *       len--;
-         *     }
-         *   }
-         * } while (in < last && out < end);
-         */
-#undef nbytes_r
-#define in_r %esi
-        movl    len_r, %ecx
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        jmp     .L_while_test
-
-#undef len_r
-#undef dist_r
-
-#endif /* NO_MMX || RUN_TIME_MMX */
-
-
-/*** MMX code ***/
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-.align 32,0x90
-.L_init_mmx:
-        emms
-
-#undef  bits_r
-#undef  bitslong_r
-#define bitslong_r %ebp
-#define hold_mm    %mm0
-        movd    %ebp, hold_mm
-        movl    %ebx, bitslong_r
-
-#define used_mm   %mm1
-#define dmask2_mm %mm2
-#define lmask2_mm %mm3
-#define lmask_mm  %mm4
-#define dmask_mm  %mm5
-#define tmp_mm    %mm6
-
-        movd    lmask(%esp), lmask_mm
-        movq    lmask_mm, lmask2_mm
-        movd    dmask(%esp), dmask_mm
-        movq    dmask_mm, dmask2_mm
-        pxor    used_mm, used_mm
-        movl    lcode(%esp), %ebx       /* ebx = lcode */
-        jmp     .L_do_loop_mmx
-
-.align 32,0x90
-.L_while_test_mmx:
-        /* while (in < last && out < end)
-         */
-        cmpl    out_r, end(%esp)
-        jbe     .L_break_loop           /* if (out >= end) */
-
-        cmpl    in_r, last(%esp)
-        jbe     .L_break_loop
-
-.L_do_loop_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-
-        cmpl    $32, bitslong_r
-        ja      .L_get_length_code_mmx  /* if (32 < bits) */
-
-        movd    bitslong_r, tmp_mm
-        movd    (in_r), %mm7
-        addl    $4, in_r
-        psllq   tmp_mm, %mm7
-        addl    $32, bitslong_r
-        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
-
-.L_get_length_code_mmx:
-        pand    hold_mm, lmask_mm
-        movd    lmask_mm, %eax
-        movq    lmask2_mm, lmask_mm
-        movl    (%ebx,%eax,4), %eax     /* eax = lcode[hold & lmask] */
-
-.L_dolen_mmx:
-        movzbl  %ah, %ecx               /* ecx = this.bits */
-        movd    %ecx, used_mm
-        subl    %ecx, bitslong_r        /* bits -= this.bits */
-
-        testb   %al, %al
-        jnz     .L_test_for_length_base_mmx /* if (op != 0) 45.7% */
-
-        shrl    $16, %eax               /* output this.val char */
-        stosb
-        jmp     .L_while_test_mmx
-
-.L_test_for_length_base_mmx:
-#define len_r  %edx
-        movl    %eax, len_r             /* len = this */
-        shrl    $16, len_r              /* len = this.val */
-
-        testb   $16, %al
-        jz      .L_test_for_second_level_length_mmx /* if ((op & 16) == 0) 8% */
-        andl    $15, %eax               /* op &= 15 */
-        jz      .L_decode_distance_mmx  /* if (!op) */
-
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    %eax, used_mm
-        movd    hold_mm, %ecx
-        subl    %eax, bitslong_r
-        andl    .L_mask(,%eax,4), %ecx
-        addl    %ecx, len_r             /* len += hold & mask[op] */
-
-.L_decode_distance_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-
-        cmpl    $32, bitslong_r
-        ja      .L_get_dist_code_mmx    /* if (32 < bits) */
-
-        movd    bitslong_r, tmp_mm
-        movd    (in_r), %mm7
-        addl    $4, in_r
-        psllq   tmp_mm, %mm7
-        addl    $32, bitslong_r
-        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
-
-.L_get_dist_code_mmx:
-        movl    dcode(%esp), %ebx       /* ebx = dcode */
-        pand    hold_mm, dmask_mm
-        movd    dmask_mm, %eax
-        movq    dmask2_mm, dmask_mm
-        movl    (%ebx,%eax,4), %eax     /* eax = dcode[hold & lmask] */
-
-.L_dodist_mmx:
-#define dist_r %ebx
-        movzbl  %ah, %ecx               /* ecx = this.bits */
-        movl    %eax, dist_r
-        shrl    $16, dist_r             /* dist  = this.val */
-        subl    %ecx, bitslong_r        /* bits -= this.bits */
-        movd    %ecx, used_mm
-
-        testb   $16, %al                /* if ((op & 16) == 0) */
-        jz      .L_test_for_second_level_dist_mmx
-        andl    $15, %eax               /* op &= 15 */
-        jz      .L_check_dist_one_mmx
-
-.L_add_bits_to_dist_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    %eax, used_mm           /* save bit length of current op */
-        movd    hold_mm, %ecx           /* get the next bits on input stream */
-        subl    %eax, bitslong_r        /* bits -= op bits */
-        andl    .L_mask(,%eax,4), %ecx  /* ecx   = hold & mask[op] */
-        addl    %ecx, dist_r            /* dist += hold & mask[op] */
-
-.L_check_window_mmx:
-        movl    in_r, in(%esp)          /* save in so from can use it's reg */
-        movl    out_r, %eax
-        subl    beg(%esp), %eax         /* nbytes = out - beg */
-
-        cmpl    dist_r, %eax
-        jb      .L_clip_window_mmx      /* if (dist > nbytes) 4.2% */
-
-        movl    len_r, %ecx
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-        subl    $3, %ecx
-        movb    (from_r), %al
-        movb    %al, (out_r)
-        movb    1(from_r), %al
-        movb    2(from_r), %dl
-        addl    $3, from_r
-        movb    %al, 1(out_r)
-        movb    %dl, 2(out_r)
-        addl    $3, out_r
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-.align 16,0x90
-.L_check_dist_one_mmx:
-        cmpl    $1, dist_r
-        jne     .L_check_window_mmx
-        cmpl    out_r, beg(%esp)
-        je      .L_check_window_mmx
-
-        decl    out_r
-        movl    len_r, %ecx
-        movb    (out_r), %al
-        subl    $3, %ecx
-
-        movb    %al, 1(out_r)
-        movb    %al, 2(out_r)
-        movb    %al, 3(out_r)
-        addl    $4, out_r
-        rep     stosb
-
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-.align 16,0x90
-.L_test_for_second_level_length_mmx:
-        testb   $64, %al
-        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
-
-        andl    $15, %eax
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ecx
-        andl    .L_mask(,%eax,4), %ecx
-        addl    len_r, %ecx
-        movl    (%ebx,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
-        jmp     .L_dolen_mmx
-
-.align 16,0x90
-.L_test_for_second_level_dist_mmx:
-        testb   $64, %al
-        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
-
-        andl    $15, %eax
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ecx
-        andl    .L_mask(,%eax,4), %ecx
-        movl    dcode(%esp), %eax       /* ecx = dcode */
-        addl    dist_r, %ecx
-        movl    (%eax,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
-        jmp     .L_dodist_mmx
-
-.align 16,0x90
-.L_clip_window_mmx:
-#define nbytes_r %ecx
-        movl    %eax, nbytes_r
-        movl    wsize(%esp), %eax       /* prepare for dist compare */
-        negl    nbytes_r                /* nbytes = -nbytes */
-        movl    window(%esp), from_r    /* from = window */
-
-        cmpl    dist_r, %eax
-        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
-
-        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
-        cmpl    $0, write(%esp)
-        jne     .L_wrap_around_window_mmx /* if (write != 0) */
-
-        subl    nbytes_r, %eax
-        addl    %eax, from_r            /* from += wsize - nbytes */
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-.L_wrap_around_window_mmx:
-#define write_r %eax
-        movl    write(%esp), write_r
-        cmpl    write_r, nbytes_r
-        jbe     .L_contiguous_in_window_mmx /* if (write >= nbytes) */
-
-        addl    wsize(%esp), from_r
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
-        subl    write_r, nbytes_r       /* nbytes -= write */
-#undef write_r
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    window(%esp), from_r    /* from = window */
-        movl    write(%esp), nbytes_r   /* nbytes = write */
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-.L_contiguous_in_window_mmx:
-#define write_r %eax
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += write - nbytes */
-#undef write_r
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-.L_do_copy1_mmx:
-#undef nbytes_r
-#define in_r %esi
-        movl    len_r, %ecx
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-#undef hold_r
-#undef bitslong_r
-
-#endif /* USE_MMX || RUN_TIME_MMX */
-
-
-/*** USE_MMX, NO_MMX, and RUNTIME_MMX from here on ***/
-
-.L_invalid_distance_code:
-        /* else {
-         *   strm->msg = "invalid distance code";
-         *   state->mode = BAD;
-         * }
-         */
-        movl    $.L_invalid_distance_code_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_test_for_end_of_block:
-        /* else if (op & 32) {
-         *   state->mode = TYPE;
-         *   break;
-         * }
-         */
-        testb   $32, %al
-        jz      .L_invalid_literal_length_code  /* if ((op & 32) == 0) */
-
-        movl    $0, %ecx
-        movl    $INFLATE_MODE_TYPE, %edx
-        jmp     .L_update_stream_state
-
-.L_invalid_literal_length_code:
-        /* else {
-         *   strm->msg = "invalid literal/length code";
-         *   state->mode = BAD;
-         * }
-         */
-        movl    $.L_invalid_literal_length_code_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_invalid_distance_too_far:
-        /* strm->msg = "invalid distance too far back";
-         * state->mode = BAD;
-         */
-        movl    in(%esp), in_r          /* from_r has in's reg, put in back */
-        movl    $.L_invalid_distance_too_far_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_update_stream_state:
-        /* set strm->msg = %ecx, strm->state->mode = %edx */
-        movl    strm_sp(%esp), %eax
-        testl   %ecx, %ecx              /* if (msg != NULL) */
-        jz      .L_skip_msg
-        movl    %ecx, msg_strm(%eax)    /* strm->msg = msg */
-.L_skip_msg:
-        movl    state_strm(%eax), %eax  /* state = strm->state */
-        movl    %edx, mode_state(%eax)  /* state->mode = edx (BAD | TYPE) */
-        jmp     .L_break_loop
-
-.align 32,0x90
-.L_break_loop:
-
-/*
- * Regs:
- *
- * bits = %ebp when mmx, and in %ebx when non-mmx
- * hold = %hold_mm when mmx, and in %ebp when non-mmx
- * in   = %esi
- * out  = %edi
- */
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-#if defined( RUN_TIME_MMX )
-
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        jne     .L_update_next_in
-
-#endif /* RUN_TIME_MMX */
-
-        movl    %ebp, %ebx
-
-.L_update_next_in:
-
-#endif
-
-#define strm_r  %eax
-#define state_r %edx
-
-        /* len = bits >> 3;
-         * in -= len;
-         * bits -= len << 3;
-         * hold &= (1U << bits) - 1;
-         * state->hold = hold;
-         * state->bits = bits;
-         * strm->next_in = in;
-         * strm->next_out = out;
-         */
-        movl    strm_sp(%esp), strm_r
-        movl    %ebx, %ecx
-        movl    state_strm(strm_r), state_r
-        shrl    $3, %ecx
-        subl    %ecx, in_r
-        shll    $3, %ecx
-        subl    %ecx, %ebx
-        movl    out_r, next_out_strm(strm_r)
-        movl    %ebx, bits_state(state_r)
-        movl    %ebx, %ecx
-
-        leal    buf(%esp), %ebx
-        cmpl    %ebx, last(%esp)
-        jne     .L_buf_not_used         /* if buf != last */
-
-        subl    %ebx, in_r              /* in -= buf */
-        movl    next_in_strm(strm_r), %ebx
-        movl    %ebx, last(%esp)        /* last = strm->next_in */
-        addl    %ebx, in_r              /* in += strm->next_in */
-        movl    avail_in_strm(strm_r), %ebx
-        subl    $11, %ebx
-        addl    %ebx, last(%esp)    /* last = &strm->next_in[ avail_in - 11 ] */
-
-.L_buf_not_used:
-        movl    in_r, next_in_strm(strm_r)
-
-        movl    $1, %ebx
-        shll    %cl, %ebx
-        decl    %ebx
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-#if defined( RUN_TIME_MMX )
-
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        jne     .L_update_hold
-
-#endif /* RUN_TIME_MMX */
-
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ebp
-
-        emms
-
-.L_update_hold:
-
-#endif /* USE_MMX || RUN_TIME_MMX */
-
-        andl    %ebx, %ebp
-        movl    %ebp, hold_state(state_r)
-
-#define last_r %ebx
-
-        /* strm->avail_in = in < last ? 11 + (last - in) : 11 - (in - last) */
-        movl    last(%esp), last_r
-        cmpl    in_r, last_r
-        jbe     .L_last_is_smaller     /* if (in >= last) */
-
-        subl    in_r, last_r           /* last -= in */
-        addl    $11, last_r            /* last += 11 */
-        movl    last_r, avail_in_strm(strm_r)
-        jmp     .L_fixup_out
-.L_last_is_smaller:
-        subl    last_r, in_r           /* in -= last */
-        negl    in_r                   /* in = -in */
-        addl    $11, in_r              /* in += 11 */
-        movl    in_r, avail_in_strm(strm_r)
-
-#undef last_r
-#define end_r %ebx
-
-.L_fixup_out:
-        /* strm->avail_out = out < end ? 257 + (end - out) : 257 - (out - end)*/
-        movl    end(%esp), end_r
-        cmpl    out_r, end_r
-        jbe     .L_end_is_smaller      /* if (out >= end) */
-
-        subl    out_r, end_r           /* end -= out */
-        addl    $257, end_r            /* end += 257 */
-        movl    end_r, avail_out_strm(strm_r)
-        jmp     .L_done
-.L_end_is_smaller:
-        subl    end_r, out_r           /* out -= end */
-        negl    out_r                  /* out = -out */
-        addl    $257, out_r            /* out += 257 */
-        movl    out_r, avail_out_strm(strm_r)
-
-#undef end_r
-#undef strm_r
-#undef state_r
-
-.L_done:
-        addl    $local_var_size, %esp
-        popf
-        popl    %ebx
-        popl    %ebp
-        popl    %esi
-        popl    %edi
-        ret
-
-#if defined( GAS_ELF )
-/* elf info */
-.type inflate_fast,@function
-.size inflate_fast,.-inflate_fast
-#endif

crates/libz-sys/src/zlib/contrib/iostream/test.cpp

diff --git a/crates/libz-sys/src/zlib/contrib/iostream/test.cpp b/crates/libz-sys/src/zlib/contrib/iostream/test.cpp
deleted file mode 100644
index 7d265b3..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream/test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "zfstream.h"
-
-int main() {
-
-  // Construct a stream object with this filebuffer.  Anything sent
-  // to this stream will go to standard out.
-  gzofstream os( 1, ios::out );
-
-  // This text is getting compressed and sent to stdout.
-  // To prove this, run 'test | zcat'.
-  os << "Hello, Mommy" << endl;
-
-  os << setcompressionlevel( Z_NO_COMPRESSION );
-  os << "hello, hello, hi, ho!" << endl;
-
-  setcompressionlevel( os, Z_DEFAULT_COMPRESSION )
-    << "I'm compressing again" << endl;
-
-  os.close();
-
-  return 0;
-
-}

crates/libz-sys/src/zlib/contrib/iostream/zfstream.cpp

diff --git a/crates/libz-sys/src/zlib/contrib/iostream/zfstream.cpp b/crates/libz-sys/src/zlib/contrib/iostream/zfstream.cpp
deleted file mode 100644
index d0cd85f..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream/zfstream.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-
-#include "zfstream.h"
-
-gzfilebuf::gzfilebuf() :
-  file(NULL),
-  mode(0),
-  own_file_descriptor(0)
-{ }
-
-gzfilebuf::~gzfilebuf() {
-
-  sync();
-  if ( own_file_descriptor )
-    close();
-
-}
-
-gzfilebuf *gzfilebuf::open( const char *name,
-                            int io_mode ) {
-
-  if ( is_open() )
-    return NULL;
-
-  char char_mode[10];
-  char *p = char_mode;
-
-  if ( io_mode & ios::in ) {
-    mode = ios::in;
-    *p++ = 'r';
-  } else if ( io_mode & ios::app ) {
-    mode = ios::app;
-    *p++ = 'a';
-  } else {
-    mode = ios::out;
-    *p++ = 'w';
-  }
-
-  if ( io_mode & ios::binary ) {
-    mode |= ios::binary;
-    *p++ = 'b';
-  }
-
-  // Hard code the compression level
-  if ( io_mode & (ios::out|ios::app )) {
-    *p++ = '9';
-  }
-
-  // Put the end-of-string indicator
-  *p = '\0';
-
-  if ( (file = gzopen(name, char_mode)) == NULL )
-    return NULL;
-
-  own_file_descriptor = 1;
-
-  return this;
-
-}
-
-gzfilebuf *gzfilebuf::attach( int file_descriptor,
-                              int io_mode ) {
-
-  if ( is_open() )
-    return NULL;
-
-  char char_mode[10];
-  char *p = char_mode;
-
-  if ( io_mode & ios::in ) {
-    mode = ios::in;
-    *p++ = 'r';
-  } else if ( io_mode & ios::app ) {
-    mode = ios::app;
-    *p++ = 'a';
-  } else {
-    mode = ios::out;
-    *p++ = 'w';
-  }
-
-  if ( io_mode & ios::binary ) {
-    mode |= ios::binary;
-    *p++ = 'b';
-  }
-
-  // Hard code the compression level
-  if ( io_mode & (ios::out|ios::app )) {
-    *p++ = '9';
-  }
-
-  // Put the end-of-string indicator
-  *p = '\0';
-
-  if ( (file = gzdopen(file_descriptor, char_mode)) == NULL )
-    return NULL;
-
-  own_file_descriptor = 0;
-
-  return this;
-
-}
-
-gzfilebuf *gzfilebuf::close() {
-
-  if ( is_open() ) {
-
-    sync();
-    gzclose( file );
-    file = NULL;
-
-  }
-
-  return this;
-
-}
-
-int gzfilebuf::setcompressionlevel( int comp_level ) {
-
-  return gzsetparams(file, comp_level, -2);
-
-}
-
-int gzfilebuf::setcompressionstrategy( int comp_strategy ) {
-
-  return gzsetparams(file, -2, comp_strategy);
-
-}
-
-
-streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) {
-
-  return streampos(EOF);
-
-}
-
-int gzfilebuf::underflow() {
-
-  // If the file hasn't been opened for reading, error.
-  if ( !is_open() || !(mode & ios::in) )
-    return EOF;
-
-  // if a buffer doesn't exists, allocate one.
-  if ( !base() ) {
-
-    if ( (allocate()) == EOF )
-      return EOF;
-    setp(0,0);
-
-  } else {
-
-    if ( in_avail() )
-      return (unsigned char) *gptr();
-
-    if ( out_waiting() ) {
-      if ( flushbuf() == EOF )
-        return EOF;
-    }
-
-  }
-
-  // Attempt to fill the buffer.
-
-  int result = fillbuf();
-  if ( result == EOF ) {
-    // disable get area
-    setg(0,0,0);
-    return EOF;
-  }
-
-  return (unsigned char) *gptr();
-
-}
-
-int gzfilebuf::overflow( int c ) {
-
-  if ( !is_open() || !(mode & ios::out) )
-    return EOF;
-
-  if ( !base() ) {
-    if ( allocate() == EOF )
-      return EOF;
-    setg(0,0,0);
-  } else {
-    if (in_avail()) {
-        return EOF;
-    }
-    if (out_waiting()) {
-      if (flushbuf() == EOF)
-        return EOF;
-    }
-  }
-
-  int bl = blen();
-  setp( base(), base() + bl);
-
-  if ( c != EOF ) {
-
-    *pptr() = c;
-    pbump(1);
-
-  }
-
-  return 0;
-
-}
-
-int gzfilebuf::sync() {
-
-  if ( !is_open() )
-    return EOF;
-
-  if ( out_waiting() )
-    return flushbuf();
-
-  return 0;
-
-}
-
-int gzfilebuf::flushbuf() {
-
-  int n;
-  char *q;
-
-  q = pbase();
-  n = pptr() - q;
-
-  if ( gzwrite( file, q, n) < n )
-    return EOF;
-
-  setp(0,0);
-
-  return 0;
-
-}
-
-int gzfilebuf::fillbuf() {
-
-  int required;
-  char *p;
-
-  p = base();
-
-  required = blen();
-
-  int t = gzread( file, p, required );
-
-  if ( t <= 0) return EOF;
-
-  setg( base(), base(), base()+t);
-
-  return t;
-
-}
-
-gzfilestream_common::gzfilestream_common() :
-  ios( gzfilestream_common::rdbuf() )
-{ }
-
-gzfilestream_common::~gzfilestream_common()
-{ }
-
-void gzfilestream_common::attach( int fd, int io_mode ) {
-
-  if ( !buffer.attach( fd, io_mode) )
-    clear( ios::failbit | ios::badbit );
-  else
-    clear();
-
-}
-
-void gzfilestream_common::open( const char *name, int io_mode ) {
-
-  if ( !buffer.open( name, io_mode ) )
-    clear( ios::failbit | ios::badbit );
-  else
-    clear();
-
-}
-
-void gzfilestream_common::close() {
-
-  if ( !buffer.close() )
-    clear( ios::failbit | ios::badbit );
-
-}
-
-gzfilebuf *gzfilestream_common::rdbuf()
-{
-  return &buffer;
-}
-
-gzifstream::gzifstream() :
-  ios( gzfilestream_common::rdbuf() )
-{
-  clear( ios::badbit );
-}
-
-gzifstream::gzifstream( const char *name, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::open( name, io_mode );
-}
-
-gzifstream::gzifstream( int fd, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::attach( fd, io_mode );
-}
-
-gzifstream::~gzifstream() { }
-
-gzofstream::gzofstream() :
-  ios( gzfilestream_common::rdbuf() )
-{
-  clear( ios::badbit );
-}
-
-gzofstream::gzofstream( const char *name, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::open( name, io_mode );
-}
-
-gzofstream::gzofstream( int fd, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::attach( fd, io_mode );
-}
-
-gzofstream::~gzofstream() { }

crates/libz-sys/src/zlib/contrib/iostream/zfstream.h

diff --git a/crates/libz-sys/src/zlib/contrib/iostream/zfstream.h b/crates/libz-sys/src/zlib/contrib/iostream/zfstream.h
deleted file mode 100644
index ed79098..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream/zfstream.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-#ifndef zfstream_h
-#define zfstream_h
-
-#include <fstream.h>
-#include "zlib.h"
-
-class gzfilebuf : public streambuf {
-
-public:
-
-  gzfilebuf( );
-  virtual ~gzfilebuf();
-
-  gzfilebuf *open( const char *name, int io_mode );
-  gzfilebuf *attach( int file_descriptor, int io_mode );
-  gzfilebuf *close();
-
-  int setcompressionlevel( int comp_level );
-  int setcompressionstrategy( int comp_strategy );
-
-  inline int is_open() const { return (file !=NULL); }
-
-  virtual streampos seekoff( streamoff, ios::seek_dir, int );
-
-  virtual int sync();
-
-protected:
-
-  virtual int underflow();
-  virtual int overflow( int = EOF );
-
-private:
-
-  gzFile file;
-  short mode;
-  short own_file_descriptor;
-
-  int flushbuf();
-  int fillbuf();
-
-};
-
-class gzfilestream_common : virtual public ios {
-
-  friend class gzifstream;
-  friend class gzofstream;
-  friend gzofstream &setcompressionlevel( gzofstream &, int );
-  friend gzofstream &setcompressionstrategy( gzofstream &, int );
-
-public:
-  virtual ~gzfilestream_common();
-
-  void attach( int fd, int io_mode );
-  void open( const char *name, int io_mode );
-  void close();
-
-protected:
-  gzfilestream_common();
-
-private:
-  gzfilebuf *rdbuf();
-
-  gzfilebuf buffer;
-
-};
-
-class gzifstream : public gzfilestream_common, public istream {
-
-public:
-
-  gzifstream();
-  gzifstream( const char *name, int io_mode = ios::in );
-  gzifstream( int fd, int io_mode = ios::in );
-
-  virtual ~gzifstream();
-
-};
-
-class gzofstream : public gzfilestream_common, public ostream {
-
-public:
-
-  gzofstream();
-  gzofstream( const char *name, int io_mode = ios::out );
-  gzofstream( int fd, int io_mode = ios::out );
-
-  virtual ~gzofstream();
-
-};
-
-template<class T> class gzomanip {
-  friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &);
-public:
-  gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { }
-private:
-  gzofstream &(*func)(gzofstream &, T);
-  T val;
-};
-
-template<class T> gzofstream &operator<<(gzofstream &s, const gzomanip<T> &m)
-{
-  return (*m.func)(s, m.val);
-}
-
-inline gzofstream &setcompressionlevel( gzofstream &s, int l )
-{
-  (s.rdbuf())->setcompressionlevel(l);
-  return s;
-}
-
-inline gzofstream &setcompressionstrategy( gzofstream &s, int l )
-{
-  (s.rdbuf())->setcompressionstrategy(l);
-  return s;
-}
-
-inline gzomanip<int> setcompressionlevel(int l)
-{
-  return gzomanip<int>(&setcompressionlevel,l);
-}
-
-inline gzomanip<int> setcompressionstrategy(int l)
-{
-  return gzomanip<int>(&setcompressionstrategy,l);
-}
-
-#endif

crates/libz-sys/src/zlib/contrib/iostream2/zstream.h

diff --git a/crates/libz-sys/src/zlib/contrib/iostream2/zstream.h b/crates/libz-sys/src/zlib/contrib/iostream2/zstream.h
deleted file mode 100644
index 43d2332..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream2/zstream.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- *
- * Copyright (c) 1997
- * Christian Michelsen Research AS
- * Advanced Computing
- * Fantoftvegen 38, 5036 BERGEN, Norway
- * http://www.cmr.no
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Christian Michelsen Research AS makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef ZSTREAM__H
-#define ZSTREAM__H
-
-/*
- * zstream.h - C++ interface to the 'zlib' general purpose compression library
- * $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $
- */
-
-#include <strstream.h>
-#include <string.h>
-#include <stdio.h>
-#include "zlib.h"
-
-#if defined(_WIN32)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
-#endif
-
-class zstringlen {
-public:
-    zstringlen(class izstream&);
-    zstringlen(class ozstream&, const char*);
-    size_t value() const { return val.word; }
-private:
-    struct Val { unsigned char byte; size_t word; } val;
-};
-
-//  ----------------------------- izstream -----------------------------
-
-class izstream
-{
-    public:
-        izstream() : m_fp(0) {}
-        izstream(FILE* fp) : m_fp(0) { open(fp); }
-        izstream(const char* name) : m_fp(0) { open(name); }
-        ~izstream() { close(); }
-
-        /* Opens a gzip (.gz) file for reading.
-         * open() can be used to read a file which is not in gzip format;
-         * in this case read() will directly read from the file without
-         * decompression. errno can be checked to distinguish two error
-         * cases (if errno is zero, the zlib error is Z_MEM_ERROR).
-         */
-        void open(const char* name) {
-            if (m_fp) close();
-            m_fp = ::gzopen(name, "rb");
-        }
-
-        void open(FILE* fp) {
-            SET_BINARY_MODE(fp);
-            if (m_fp) close();
-            m_fp = ::gzdopen(fileno(fp), "rb");
-        }
-
-        /* Flushes all pending input if necessary, closes the compressed file
-         * and deallocates all the (de)compression state. The return value is
-         * the zlib error number (see function error() below).
-         */
-        int close() {
-            int r = ::gzclose(m_fp);
-            m_fp = 0; return r;
-        }
-
-        /* Binary read the given number of bytes from the compressed file.
-         */
-        int read(void* buf, size_t len) {
-            return ::gzread(m_fp, buf, len);
-        }
-
-        /* Returns the error message for the last error which occurred on the
-         * given compressed file. errnum is set to zlib error number. If an
-         * error occurred in the file system and not in the compression library,
-         * errnum is set to Z_ERRNO and the application may consult errno
-         * to get the exact error code.
-         */
-        const char* error(int* errnum) {
-            return ::gzerror(m_fp, errnum);
-        }
-
-        gzFile fp() { return m_fp; }
-
-    private:
-        gzFile m_fp;
-};
-
-/*
- * Binary read the given (array of) object(s) from the compressed file.
- * If the input file was not in gzip format, read() copies the objects number
- * of bytes into the buffer.
- * returns the number of uncompressed bytes actually read
- * (0 for end of file, -1 for error).
- */
-template <class T, class Items>
-inline int read(izstream& zs, T* x, Items items) {
-    return ::gzread(zs.fp(), x, items*sizeof(T));
-}
-
-/*
- * Binary input with the '>' operator.
- */
-template <class T>
-inline izstream& operator>(izstream& zs, T& x) {
-    ::gzread(zs.fp(), &x, sizeof(T));
-    return zs;
-}
-
-
-inline zstringlen::zstringlen(izstream& zs) {
-    zs > val.byte;
-    if (val.byte == 255) zs > val.word;
-    else val.word = val.byte;
-}
-
-/*
- * Read length of string + the string with the '>' operator.
- */
-inline izstream& operator>(izstream& zs, char* x) {
-    zstringlen len(zs);
-    ::gzread(zs.fp(), x, len.value());
-    x[len.value()] = '\0';
-    return zs;
-}
-
-inline char* read_string(izstream& zs) {
-    zstringlen len(zs);
-    char* x = new char[len.value()+1];
-    ::gzread(zs.fp(), x, len.value());
-    x[len.value()] = '\0';
-    return x;
-}
-
-// ----------------------------- ozstream -----------------------------
-
-class ozstream
-{
-    public:
-        ozstream() : m_fp(0), m_os(0) {
-        }
-        ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
-            : m_fp(0), m_os(0) {
-            open(fp, level);
-        }
-        ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
-            : m_fp(0), m_os(0) {
-            open(name, level);
-        }
-        ~ozstream() {
-            close();
-        }
-
-        /* Opens a gzip (.gz) file for writing.
-         * The compression level parameter should be in 0..9
-         * errno can be checked to distinguish two error cases
-         * (if errno is zero, the zlib error is Z_MEM_ERROR).
-         */
-        void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
-            char mode[4] = "wb\0";
-            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
-            if (m_fp) close();
-            m_fp = ::gzopen(name, mode);
-        }
-
-        /* open from a FILE pointer.
-         */
-        void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
-            SET_BINARY_MODE(fp);
-            char mode[4] = "wb\0";
-            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
-            if (m_fp) close();
-            m_fp = ::gzdopen(fileno(fp), mode);
-        }
-
-        /* Flushes all pending output if necessary, closes the compressed file
-         * and deallocates all the (de)compression state. The return value is
-         * the zlib error number (see function error() below).
-         */
-        int close() {
-            if (m_os) {
-                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
-                delete[] m_os->str(); delete m_os; m_os = 0;
-            }
-            int r = ::gzclose(m_fp); m_fp = 0; return r;
-        }
-
-        /* Binary write the given number of bytes into the compressed file.
-         */
-        int write(const void* buf, size_t len) {
-            return ::gzwrite(m_fp, (voidp) buf, len);
-        }
-
-        /* Flushes all pending output into the compressed file. The parameter
-         * _flush is as in the deflate() function. The return value is the zlib
-         * error number (see function gzerror below). flush() returns Z_OK if
-         * the flush_ parameter is Z_FINISH and all output could be flushed.
-         * flush() should be called only when strictly necessary because it can
-         * degrade compression.
-         */
-        int flush(int _flush) {
-            os_flush();
-            return ::gzflush(m_fp, _flush);
-        }
-
-        /* Returns the error message for the last error which occurred on the
-         * given compressed file. errnum is set to zlib error number. If an
-         * error occurred in the file system and not in the compression library,
-         * errnum is set to Z_ERRNO and the application may consult errno
-         * to get the exact error code.
-         */
-        const char* error(int* errnum) {
-            return ::gzerror(m_fp, errnum);
-        }
-
-        gzFile fp() { return m_fp; }
-
-        ostream& os() {
-            if (m_os == 0) m_os = new ostrstream;
-            return *m_os;
-        }
-
-        void os_flush() {
-            if (m_os && m_os->pcount()>0) {
-                ostrstream* oss = new ostrstream;
-                oss->fill(m_os->fill());
-                oss->flags(m_os->flags());
-                oss->precision(m_os->precision());
-                oss->width(m_os->width());
-                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
-                delete[] m_os->str(); delete m_os; m_os = oss;
-            }
-        }
-
-    private:
-        gzFile m_fp;
-        ostrstream* m_os;
-};
-
-/*
- * Binary write the given (array of) object(s) into the compressed file.
- * returns the number of uncompressed bytes actually written
- * (0 in case of error).
- */
-template <class T, class Items>
-inline int write(ozstream& zs, const T* x, Items items) {
-    return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
-}
-
-/*
- * Binary output with the '<' operator.
- */
-template <class T>
-inline ozstream& operator<(ozstream& zs, const T& x) {
-    ::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
-    return zs;
-}
-
-inline zstringlen::zstringlen(ozstream& zs, const char* x) {
-    val.byte = 255;  val.word = ::strlen(x);
-    if (val.word < 255) zs < (val.byte = val.word);
-    else zs < val;
-}
-
-/*
- * Write length of string + the string with the '<' operator.
- */
-inline ozstream& operator<(ozstream& zs, const char* x) {
-    zstringlen len(zs, x);
-    ::gzwrite(zs.fp(), (voidp) x, len.value());
-    return zs;
-}
-
-#ifdef _MSC_VER
-inline ozstream& operator<(ozstream& zs, char* const& x) {
-    return zs < (const char*) x;
-}
-#endif
-
-/*
- * Ascii write with the << operator;
- */
-template <class T>
-inline ostream& operator<<(ozstream& zs, const T& x) {
-    zs.os_flush();
-    return zs.os() << x;
-}
-
-#endif

crates/libz-sys/src/zlib/contrib/iostream2/zstream_test.cpp

diff --git a/crates/libz-sys/src/zlib/contrib/iostream2/zstream_test.cpp b/crates/libz-sys/src/zlib/contrib/iostream2/zstream_test.cpp
deleted file mode 100644
index 6273f62..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream2/zstream_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "zstream.h"
-#include <math.h>
-#include <stdlib.h>
-#include <iomanip.h>
-
-void main() {
-    char h[256] = "Hello";
-    char* g = "Goodbye";
-    ozstream out("temp.gz");
-    out < "This works well" < h < g;
-    out.close();
-
-    izstream in("temp.gz"); // read it back
-    char *x = read_string(in), *y = new char[256], z[256];
-    in > y > z;
-    in.close();
-    cout << x << endl << y << endl << z << endl;
-
-    out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
-    out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
-    out << z << endl << y << endl << x << endl;
-    out << 1.1234567890123456789 << endl;
-
-    delete[] x; delete[] y;
-}

crates/libz-sys/src/zlib/contrib/iostream3/README

diff --git a/crates/libz-sys/src/zlib/contrib/iostream3/README b/crates/libz-sys/src/zlib/contrib/iostream3/README
deleted file mode 100644
index f7b319a..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream3/README
+++ /dev/null
@@ -1,35 +0,0 @@
-These classes provide a C++ stream interface to the zlib library. It allows you
-to do things like:
-
-  gzofstream outf("blah.gz");
-  outf << "These go into the gzip file " << 123 << endl;
-
-It does this by deriving a specialized stream buffer for gzipped files, which is
-the way Stroustrup would have done it. :->
-
-The gzifstream and gzofstream classes were originally written by Kevin Ruland
-and made available in the zlib contrib/iostream directory. The older version still
-compiles under gcc 2.xx, but not under gcc 3.xx, which sparked the development of
-this version.
-
-The new classes are as standard-compliant as possible, closely following the
-approach of the standard library's fstream classes. It compiles under gcc versions
-3.2 and 3.3, but not under gcc 2.xx. This is mainly due to changes in the standard
-library naming scheme. The new version of gzifstream/gzofstream/gzfilebuf differs
-from the previous one in the following respects:
-- added showmanyc
-- added setbuf, with support for unbuffered output via setbuf(0,0)
-- a few bug fixes of stream behavior
-- gzipped output file opened with default compression level instead of maximum level
-- setcompressionlevel()/strategy() members replaced by single setcompression()
-
-The code is provided "as is", with the permission to use, copy, modify, distribute
-and sell it for any purpose without fee.
-
-Ludwig Schwardt
-<schwardt@sun.ac.za>
-
-DSP Lab
-Electrical & Electronic Engineering Department
-University of Stellenbosch
-South Africa

crates/libz-sys/src/zlib/contrib/iostream3/TODO

diff --git a/crates/libz-sys/src/zlib/contrib/iostream3/TODO b/crates/libz-sys/src/zlib/contrib/iostream3/TODO
deleted file mode 100644
index 7032f97..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream3/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-Possible upgrades to gzfilebuf:
-
-- The ability to do putback (e.g. putbackfail)
-
-- The ability to seek (zlib supports this, but could be slow/tricky)
-
-- Simultaneous read/write access (does it make sense?)
-
-- Support for ios_base::ate open mode
-
-- Locale support?
-
-- Check public interface to see which calls give problems
-  (due to dependence on library internals)
-
-- Override operator<<(ostream&, gzfilebuf*) to allow direct copying
-  of stream buffer to stream ( i.e. os << is.rdbuf(); )

crates/libz-sys/src/zlib/contrib/iostream3/test.cc

diff --git a/crates/libz-sys/src/zlib/contrib/iostream3/test.cc b/crates/libz-sys/src/zlib/contrib/iostream3/test.cc
deleted file mode 100644
index 9423533..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream3/test.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Test program for gzifstream and gzofstream
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- */
-
-#include "zfstream.h"
-#include <iostream>      // for cout
-
-int main() {
-
-  gzofstream outf;
-  gzifstream inf;
-  char buf[80];
-
-  outf.open("test1.txt.gz");
-  outf << "The quick brown fox sidestepped the lazy canine\n"
-       << 1.3 << "\nPlan " << 9 << std::endl;
-  outf.close();
-  std::cout << "Wrote the following message to 'test1.txt.gz' (check with zcat or zless):\n"
-            << "The quick brown fox sidestepped the lazy canine\n"
-            << 1.3 << "\nPlan " << 9 << std::endl;
-
-  std::cout << "\nReading 'test1.txt.gz' (buffered) produces:\n";
-  inf.open("test1.txt.gz");
-  while (inf.getline(buf,80,'\n')) {
-    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
-  }
-  inf.close();
-
-  outf.rdbuf()->pubsetbuf(0,0);
-  outf.open("test2.txt.gz");
-  outf << setcompression(Z_NO_COMPRESSION)
-       << "The quick brown fox sidestepped the lazy canine\n"
-       << 1.3 << "\nPlan " << 9 << std::endl;
-  outf.close();
-  std::cout << "\nWrote the same message to 'test2.txt.gz' in uncompressed form";
-
-  std::cout << "\nReading 'test2.txt.gz' (unbuffered) produces:\n";
-  inf.rdbuf()->pubsetbuf(0,0);
-  inf.open("test2.txt.gz");
-  while (inf.getline(buf,80,'\n')) {
-    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
-  }
-  inf.close();
-
-  return 0;
-
-}

crates/libz-sys/src/zlib/contrib/iostream3/zfstream.cc

diff --git a/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.cc b/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.cc
deleted file mode 100644
index 94eb933..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.cc
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * A C++ I/O streams interface to the zlib gz* functions
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- *
- * This version is standard-compliant and compatible with gcc 3.x.
- */
-
-#include "zfstream.h"
-#include <cstring>          // for strcpy, strcat, strlen (mode strings)
-#include <cstdio>           // for BUFSIZ
-
-// Internal buffer sizes (default and "unbuffered" versions)
-#define BIGBUFSIZE BUFSIZ
-#define SMALLBUFSIZE 1
-
-/*****************************************************************************/
-
-// Default constructor
-gzfilebuf::gzfilebuf()
-: file(NULL), io_mode(std::ios_base::openmode(0)), own_fd(false),
-  buffer(NULL), buffer_size(BIGBUFSIZE), own_buffer(true)
-{
-  // No buffers to start with
-  this->disable_buffer();
-}
-
-// Destructor
-gzfilebuf::~gzfilebuf()
-{
-  // Sync output buffer and close only if responsible for file
-  // (i.e. attached streams should be left open at this stage)
-  this->sync();
-  if (own_fd)
-    this->close();
-  // Make sure internal buffer is deallocated
-  this->disable_buffer();
-}
-
-// Set compression level and strategy
-int
-gzfilebuf::setcompression(int comp_level,
-                          int comp_strategy)
-{
-  return gzsetparams(file, comp_level, comp_strategy);
-}
-
-// Open gzipped file
-gzfilebuf*
-gzfilebuf::open(const char *name,
-                std::ios_base::openmode mode)
-{
-  // Fail if file already open
-  if (this->is_open())
-    return NULL;
-  // Don't support simultaneous read/write access (yet)
-  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
-    return NULL;
-
-  // Build mode string for gzopen and check it [27.8.1.3.2]
-  char char_mode[6] = "\0\0\0\0\0";
-  if (!this->open_mode(mode, char_mode))
-    return NULL;
-
-  // Attempt to open file
-  if ((file = gzopen(name, char_mode)) == NULL)
-    return NULL;
-
-  // On success, allocate internal buffer and set flags
-  this->enable_buffer();
-  io_mode = mode;
-  own_fd = true;
-  return this;
-}
-
-// Attach to gzipped file
-gzfilebuf*
-gzfilebuf::attach(int fd,
-                  std::ios_base::openmode mode)
-{
-  // Fail if file already open
-  if (this->is_open())
-    return NULL;
-  // Don't support simultaneous read/write access (yet)
-  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
-    return NULL;
-
-  // Build mode string for gzdopen and check it [27.8.1.3.2]
-  char char_mode[6] = "\0\0\0\0\0";
-  if (!this->open_mode(mode, char_mode))
-    return NULL;
-
-  // Attempt to attach to file
-  if ((file = gzdopen(fd, char_mode)) == NULL)
-    return NULL;
-
-  // On success, allocate internal buffer and set flags
-  this->enable_buffer();
-  io_mode = mode;
-  own_fd = false;
-  return this;
-}
-
-// Close gzipped file
-gzfilebuf*
-gzfilebuf::close()
-{
-  // Fail immediately if no file is open
-  if (!this->is_open())
-    return NULL;
-  // Assume success
-  gzfilebuf* retval = this;
-  // Attempt to sync and close gzipped file
-  if (this->sync() == -1)
-    retval = NULL;
-  if (gzclose(file) < 0)
-    retval = NULL;
-  // File is now gone anyway (postcondition [27.8.1.3.8])
-  file = NULL;
-  own_fd = false;
-  // Destroy internal buffer if it exists
-  this->disable_buffer();
-  return retval;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// Convert int open mode to mode string
-bool
-gzfilebuf::open_mode(std::ios_base::openmode mode,
-                     char* c_mode) const
-{
-  bool testb = mode & std::ios_base::binary;
-  bool testi = mode & std::ios_base::in;
-  bool testo = mode & std::ios_base::out;
-  bool testt = mode & std::ios_base::trunc;
-  bool testa = mode & std::ios_base::app;
-
-  // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hardcoded the compression level to maximum here...
-  // Double the time for less than 1% size improvement seems
-  // excessive though - keeping it at the default level
-  // To change back, just append "9" to the next three mode strings
-  if (!testi && testo && !testt && !testa)
-    strcpy(c_mode, "w");
-  if (!testi && testo && !testt && testa)
-    strcpy(c_mode, "a");
-  if (!testi && testo && testt && !testa)
-    strcpy(c_mode, "w");
-  if (testi && !testo && !testt && !testa)
-    strcpy(c_mode, "r");
-  // No read/write mode yet
-//  if (testi && testo && !testt && !testa)
-//    strcpy(c_mode, "r+");
-//  if (testi && testo && testt && !testa)
-//    strcpy(c_mode, "w+");
-
-  // Mode string should be empty for invalid combination of flags
-  if (strlen(c_mode) == 0)
-    return false;
-  if (testb)
-    strcat(c_mode, "b");
-  return true;
-}
-
-// Determine number of characters in internal get buffer
-std::streamsize
-gzfilebuf::showmanyc()
-{
-  // Calls to underflow will fail if file not opened for reading
-  if (!this->is_open() || !(io_mode & std::ios_base::in))
-    return -1;
-  // Make sure get area is in use
-  if (this->gptr() && (this->gptr() < this->egptr()))
-    return std::streamsize(this->egptr() - this->gptr());
-  else
-    return 0;
-}
-
-// Fill get area from gzipped file
-gzfilebuf::int_type
-gzfilebuf::underflow()
-{
-  // If something is left in the get area by chance, return it
-  // (this shouldn't normally happen, as underflow is only supposed
-  // to be called when gptr >= egptr, but it serves as error check)
-  if (this->gptr() && (this->gptr() < this->egptr()))
-    return traits_type::to_int_type(*(this->gptr()));
-
-  // If the file hasn't been opened for reading, produce error
-  if (!this->is_open() || !(io_mode & std::ios_base::in))
-    return traits_type::eof();
-
-  // Attempt to fill internal buffer from gzipped file
-  // (buffer must be guaranteed to exist...)
-  int bytes_read = gzread(file, buffer, buffer_size);
-  // Indicates error or EOF
-  if (bytes_read <= 0)
-  {
-    // Reset get area
-    this->setg(buffer, buffer, buffer);
-    return traits_type::eof();
-  }
-  // Make all bytes read from file available as get area
-  this->setg(buffer, buffer, buffer + bytes_read);
-
-  // Return next character in get area
-  return traits_type::to_int_type(*(this->gptr()));
-}
-
-// Write put area to gzipped file
-gzfilebuf::int_type
-gzfilebuf::overflow(int_type c)
-{
-  // Determine whether put area is in use
-  if (this->pbase())
-  {
-    // Double-check pointer range
-    if (this->pptr() > this->epptr() || this->pptr() < this->pbase())
-      return traits_type::eof();
-    // Add extra character to buffer if not EOF
-    if (!traits_type::eq_int_type(c, traits_type::eof()))
-    {
-      *(this->pptr()) = traits_type::to_char_type(c);
-      this->pbump(1);
-    }
-    // Number of characters to write to file
-    int bytes_to_write = this->pptr() - this->pbase();
-    // Overflow doesn't fail if nothing is to be written
-    if (bytes_to_write > 0)
-    {
-      // If the file hasn't been opened for writing, produce error
-      if (!this->is_open() || !(io_mode & std::ios_base::out))
-        return traits_type::eof();
-      // If gzipped file won't accept all bytes written to it, fail
-      if (gzwrite(file, this->pbase(), bytes_to_write) != bytes_to_write)
-        return traits_type::eof();
-      // Reset next pointer to point to pbase on success
-      this->pbump(-bytes_to_write);
-    }
-  }
-  // Write extra character to file if not EOF
-  else if (!traits_type::eq_int_type(c, traits_type::eof()))
-  {
-    // If the file hasn't been opened for writing, produce error
-    if (!this->is_open() || !(io_mode & std::ios_base::out))
-      return traits_type::eof();
-    // Impromptu char buffer (allows "unbuffered" output)
-    char_type last_char = traits_type::to_char_type(c);
-    // If gzipped file won't accept this character, fail
-    if (gzwrite(file, &last_char, 1) != 1)
-      return traits_type::eof();
-  }
-
-  // If you got here, you have succeeded (even if c was EOF)
-  // The return value should therefore be non-EOF
-  if (traits_type::eq_int_type(c, traits_type::eof()))
-    return traits_type::not_eof(c);
-  else
-    return c;
-}
-
-// Assign new buffer
-std::streambuf*
-gzfilebuf::setbuf(char_type* p,
-                  std::streamsize n)
-{
-  // First make sure stuff is sync'ed, for safety
-  if (this->sync() == -1)
-    return NULL;
-  // If buffering is turned off on purpose via setbuf(0,0), still allocate one...
-  // "Unbuffered" only really refers to put [27.8.1.4.10], while get needs at
-  // least a buffer of size 1 (very inefficient though, therefore make it bigger?)
-  // This follows from [27.5.2.4.3]/12 (gptr needs to point at something, it seems)
-  if (!p || !n)
-  {
-    // Replace existing buffer (if any) with small internal buffer
-    this->disable_buffer();
-    buffer = NULL;
-    buffer_size = 0;
-    own_buffer = true;
-    this->enable_buffer();
-  }
-  else
-  {
-    // Replace existing buffer (if any) with external buffer
-    this->disable_buffer();
-    buffer = p;
-    buffer_size = n;
-    own_buffer = false;
-    this->enable_buffer();
-  }
-  return this;
-}
-
-// Write put area to gzipped file (i.e. ensures that put area is empty)
-int
-gzfilebuf::sync()
-{
-  return traits_type::eq_int_type(this->overflow(), traits_type::eof()) ? -1 : 0;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// Allocate internal buffer
-void
-gzfilebuf::enable_buffer()
-{
-  // If internal buffer required, allocate one
-  if (own_buffer && !buffer)
-  {
-    // Check for buffered vs. "unbuffered"
-    if (buffer_size > 0)
-    {
-      // Allocate internal buffer
-      buffer = new char_type[buffer_size];
-      // Get area starts empty and will be expanded by underflow as need arises
-      this->setg(buffer, buffer, buffer);
-      // Setup entire internal buffer as put area.
-      // The one-past-end pointer actually points to the last element of the buffer,
-      // so that overflow(c) can safely add the extra character c to the sequence.
-      // These pointers remain in place for the duration of the buffer
-      this->setp(buffer, buffer + buffer_size - 1);
-    }
-    else
-    {
-      // Even in "unbuffered" case, (small?) get buffer is still required
-      buffer_size = SMALLBUFSIZE;
-      buffer = new char_type[buffer_size];
-      this->setg(buffer, buffer, buffer);
-      // "Unbuffered" means no put buffer
-      this->setp(0, 0);
-    }
-  }
-  else
-  {
-    // If buffer already allocated, reset buffer pointers just to make sure no
-    // stale chars are lying around
-    this->setg(buffer, buffer, buffer);
-    this->setp(buffer, buffer + buffer_size - 1);
-  }
-}
-
-// Destroy internal buffer
-void
-gzfilebuf::disable_buffer()
-{
-  // If internal buffer exists, deallocate it
-  if (own_buffer && buffer)
-  {
-    // Preserve unbuffered status by zeroing size
-    if (!this->pbase())
-      buffer_size = 0;
-    delete[] buffer;
-    buffer = NULL;
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-  }
-  else
-  {
-    // Reset buffer pointers to initial state if external buffer exists
-    this->setg(buffer, buffer, buffer);
-    if (buffer)
-      this->setp(buffer, buffer + buffer_size - 1);
-    else
-      this->setp(0, 0);
-  }
-}
-
-/*****************************************************************************/
-
-// Default constructor initializes stream buffer
-gzifstream::gzifstream()
-: std::istream(NULL), sb()
-{ this->init(&sb); }
-
-// Initialize stream buffer and open file
-gzifstream::gzifstream(const char* name,
-                       std::ios_base::openmode mode)
-: std::istream(NULL), sb()
-{
-  this->init(&sb);
-  this->open(name, mode);
-}
-
-// Initialize stream buffer and attach to file
-gzifstream::gzifstream(int fd,
-                       std::ios_base::openmode mode)
-: std::istream(NULL), sb()
-{
-  this->init(&sb);
-  this->attach(fd, mode);
-}
-
-// Open file and go into fail() state if unsuccessful
-void
-gzifstream::open(const char* name,
-                 std::ios_base::openmode mode)
-{
-  if (!sb.open(name, mode | std::ios_base::in))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Attach to file and go into fail() state if unsuccessful
-void
-gzifstream::attach(int fd,
-                   std::ios_base::openmode mode)
-{
-  if (!sb.attach(fd, mode | std::ios_base::in))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Close file
-void
-gzifstream::close()
-{
-  if (!sb.close())
-    this->setstate(std::ios_base::failbit);
-}
-
-/*****************************************************************************/
-
-// Default constructor initializes stream buffer
-gzofstream::gzofstream()
-: std::ostream(NULL), sb()
-{ this->init(&sb); }
-
-// Initialize stream buffer and open file
-gzofstream::gzofstream(const char* name,
-                       std::ios_base::openmode mode)
-: std::ostream(NULL), sb()
-{
-  this->init(&sb);
-  this->open(name, mode);
-}
-
-// Initialize stream buffer and attach to file
-gzofstream::gzofstream(int fd,
-                       std::ios_base::openmode mode)
-: std::ostream(NULL), sb()
-{
-  this->init(&sb);
-  this->attach(fd, mode);
-}
-
-// Open file and go into fail() state if unsuccessful
-void
-gzofstream::open(const char* name,
-                 std::ios_base::openmode mode)
-{
-  if (!sb.open(name, mode | std::ios_base::out))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Attach to file and go into fail() state if unsuccessful
-void
-gzofstream::attach(int fd,
-                   std::ios_base::openmode mode)
-{
-  if (!sb.attach(fd, mode | std::ios_base::out))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Close file
-void
-gzofstream::close()
-{
-  if (!sb.close())
-    this->setstate(std::ios_base::failbit);
-}

crates/libz-sys/src/zlib/contrib/iostream3/zfstream.h

diff --git a/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.h b/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.h
deleted file mode 100644
index 8574479..0000000
--- a/crates/libz-sys/src/zlib/contrib/iostream3/zfstream.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * A C++ I/O streams interface to the zlib gz* functions
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- *
- * This version is standard-compliant and compatible with gcc 3.x.
- */
-
-#ifndef ZFSTREAM_H
-#define ZFSTREAM_H
-
-#include <istream>  // not iostream, since we don't need cin/cout
-#include <ostream>
-#include "zlib.h"
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file stream buffer class.
- *
- *  This class implements basic_filebuf for gzipped files. It doesn't yet support
- *  seeking (allowed by zlib but slow/limited), putback and read/write access
- *  (tricky). Otherwise, it attempts to be a drop-in replacement for the standard
- *  file streambuf.
-*/
-class gzfilebuf : public std::streambuf
-{
-public:
-  //  Default constructor.
-  gzfilebuf();
-
-  //  Destructor.
-  virtual
-  ~gzfilebuf();
-
-  /**
-   *  @brief  Set compression level and strategy on the fly.
-   *  @param  comp_level  Compression level (see zlib.h for allowed values)
-   *  @param  comp_strategy  Compression strategy (see zlib.h for allowed values)
-   *  @return  Z_OK on success, Z_STREAM_ERROR otherwise.
-   *
-   *  Unfortunately, these parameters cannot be modified separately, as the
-   *  previous zfstream version assumed. Since the strategy is seldom changed,
-   *  it can default and setcompression(level) then becomes like the old
-   *  setcompressionlevel(level).
-  */
-  int
-  setcompression(int comp_level,
-                 int comp_strategy = Z_DEFAULT_STRATEGY);
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() const { return (file != NULL); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  open(const char* name,
-       std::ios_base::openmode mode);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  attach(int fd,
-         std::ios_base::openmode mode);
-
-  /**
-   *  @brief  Close gzipped file.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  close();
-
-protected:
-  /**
-   *  @brief  Convert ios open mode int to mode string used by zlib.
-   *  @return  True if valid mode flag combination.
-  */
-  bool
-  open_mode(std::ios_base::openmode mode,
-            char* c_mode) const;
-
-  /**
-   *  @brief  Number of characters available in stream buffer.
-   *  @return  Number of characters.
-   *
-   *  This indicates number of characters in get area of stream buffer.
-   *  These characters can be read without accessing the gzipped file.
-  */
-  virtual std::streamsize
-  showmanyc();
-
-  /**
-   *  @brief  Fill get area from gzipped file.
-   *  @return  First character in get area on success, EOF on error.
-   *
-   *  This actually reads characters from gzipped file to stream
-   *  buffer. Always buffered.
-  */
-  virtual int_type
-  underflow();
-
-  /**
-   *  @brief  Write put area to gzipped file.
-   *  @param  c  Extra character to add to buffer contents.
-   *  @return  Non-EOF on success, EOF on error.
-   *
-   *  This actually writes characters in stream buffer to
-   *  gzipped file. With unbuffered output this is done one
-   *  character at a time.
-  */
-  virtual int_type
-  overflow(int_type c = traits_type::eof());
-
-  /**
-   *  @brief  Installs external stream buffer.
-   *  @param  p  Pointer to char buffer.
-   *  @param  n  Size of external buffer.
-   *  @return  @c this on success, NULL on failure.
-   *
-   *  Call setbuf(0,0) to enable unbuffered output.
-  */
-  virtual std::streambuf*
-  setbuf(char_type* p,
-         std::streamsize n);
-
-  /**
-   *  @brief  Flush stream buffer to file.
-   *  @return  0 on success, -1 on error.
-   *
-   *  This calls underflow(EOF) to do the job.
-  */
-  virtual int
-  sync();
-
-//
-// Some future enhancements
-//
-//  virtual int_type uflow();
-//  virtual int_type pbackfail(int_type c = traits_type::eof());
-//  virtual pos_type
-//  seekoff(off_type off,
-//          std::ios_base::seekdir way,
-//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
-//  virtual pos_type
-//  seekpos(pos_type sp,
-//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
-
-private:
-  /**
-   *  @brief  Allocate internal buffer.
-   *
-   *  This function is safe to call multiple times. It will ensure
-   *  that a proper internal buffer exists if it is required. If the
-   *  buffer already exists or is external, the buffer pointers will be
-   *  reset to their original state.
-  */
-  void
-  enable_buffer();
-
-  /**
-   *  @brief  Destroy internal buffer.
-   *
-   *  This function is safe to call multiple times. It will ensure
-   *  that the internal buffer is deallocated if it exists. In any
-   *  case, it will also reset the buffer pointers.
-  */
-  void
-  disable_buffer();
-
-  /**
-   *  Underlying file pointer.
-  */
-  gzFile file;
-
-  /**
-   *  Mode in which file was opened.
-  */
-  std::ios_base::openmode io_mode;
-
-  /**
-   *  @brief  True if this object owns file descriptor.
-   *
-   *  This makes the class responsible for closing the file
-   *  upon destruction.
-  */
-  bool own_fd;
-
-  /**
-   *  @brief  Stream buffer.
-   *
-   *  For simplicity this remains allocated on the free store for the
-   *  entire life span of the gzfilebuf object, unless replaced by setbuf.
-  */
-  char_type* buffer;
-
-  /**
-   *  @brief  Stream buffer size.
-   *
-   *  Defaults to system default buffer size (typically 8192 bytes).
-   *  Modified by setbuf.
-  */
-  std::streamsize buffer_size;
-
-  /**
-   *  @brief  True if this object owns stream buffer.
-   *
-   *  This makes the class responsible for deleting the buffer
-   *  upon destruction.
-  */
-  bool own_buffer;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file input stream class.
- *
- *  This class implements ifstream for gzipped files. Seeking and putback
- *  is not supported yet.
-*/
-class gzifstream : public std::istream
-{
-public:
-  //  Default constructor
-  gzifstream();
-
-  /**
-   *  @brief  Construct stream on gzipped file to be opened.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-  */
-  explicit
-  gzifstream(const char* name,
-             std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Construct stream on already open gzipped file.
-   *  @param  fd    File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-  */
-  explicit
-  gzifstream(int fd,
-             std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  Obtain underlying stream buffer.
-  */
-  gzfilebuf*
-  rdbuf() const
-  { return const_cast<gzfilebuf*>(&sb); }
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() { return sb.is_open(); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-   *
-   *  Stream will be in state good() if file opens successfully;
-   *  otherwise in state fail(). This differs from the behavior of
-   *  ifstream, which never sets the state to good() and therefore
-   *  won't allow you to reuse the stream for a second file unless
-   *  you manually clear() the state. The choice is a matter of
-   *  convenience.
-  */
-  void
-  open(const char* name,
-       std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-   *
-   *  Stream will be in state good() if attach succeeded; otherwise
-   *  in state fail().
-  */
-  void
-  attach(int fd,
-         std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Close gzipped file.
-   *
-   *  Stream will be in state fail() if close failed.
-  */
-  void
-  close();
-
-private:
-  /**
-   *  Underlying stream buffer.
-  */
-  gzfilebuf sb;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file output stream class.
- *
- *  This class implements ofstream for gzipped files. Seeking and putback
- *  is not supported yet.
-*/
-class gzofstream : public std::ostream
-{
-public:
-  //  Default constructor
-  gzofstream();
-
-  /**
-   *  @brief  Construct stream on gzipped file to be opened.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-  */
-  explicit
-  gzofstream(const char* name,
-             std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Construct stream on already open gzipped file.
-   *  @param  fd    File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-  */
-  explicit
-  gzofstream(int fd,
-             std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  Obtain underlying stream buffer.
-  */
-  gzfilebuf*
-  rdbuf() const
-  { return const_cast<gzfilebuf*>(&sb); }
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() { return sb.is_open(); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-   *
-   *  Stream will be in state good() if file opens successfully;
-   *  otherwise in state fail(). This differs from the behavior of
-   *  ofstream, which never sets the state to good() and therefore
-   *  won't allow you to reuse the stream for a second file unless
-   *  you manually clear() the state. The choice is a matter of
-   *  convenience.
-  */
-  void
-  open(const char* name,
-       std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-   *
-   *  Stream will be in state good() if attach succeeded; otherwise
-   *  in state fail().
-  */
-  void
-  attach(int fd,
-         std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Close gzipped file.
-   *
-   *  Stream will be in state fail() if close failed.
-  */
-  void
-  close();
-
-private:
-  /**
-   *  Underlying stream buffer.
-  */
-  gzfilebuf sb;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file output stream manipulator class.
- *
- *  This class defines a two-argument manipulator for gzofstream. It is used
- *  as base for the setcompression(int,int) manipulator.
-*/
-template<typename T1, typename T2>
-  class gzomanip2
-  {
-  public:
-    // Allows insertor to peek at internals
-    template <typename Ta, typename Tb>
-      friend gzofstream&
-      operator<<(gzofstream&,
-                 const gzomanip2<Ta,Tb>&);
-
-    // Constructor
-    gzomanip2(gzofstream& (*f)(gzofstream&, T1, T2),
-              T1 v1,
-              T2 v2);
-  private:
-    // Underlying manipulator function
-    gzofstream&
-    (*func)(gzofstream&, T1, T2);
-
-    // Arguments for manipulator function
-    T1 val1;
-    T2 val2;
-  };
-
-/*****************************************************************************/
-
-// Manipulator function thunks through to stream buffer
-inline gzofstream&
-setcompression(gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY)
-{
-  (gzs.rdbuf())->setcompression(l, s);
-  return gzs;
-}
-
-// Manipulator constructor stores arguments
-template<typename T1, typename T2>
-  inline
-  gzomanip2<T1,T2>::gzomanip2(gzofstream &(*f)(gzofstream &, T1, T2),
-                              T1 v1,
-                              T2 v2)
-  : func(f), val1(v1), val2(v2)
-  { }
-
-// Insertor applies underlying manipulator function to stream
-template<typename T1, typename T2>
-  inline gzofstream&
-  operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
-  { return (*m.func)(s, m.val1, m.val2); }
-
-// Insert this onto stream to simplify setting of compression level
-inline gzomanip2<int,int>
-setcompression(int l, int s = Z_DEFAULT_STRATEGY)
-{ return gzomanip2<int,int>(&setcompression, l, s); }
-
-#endif // ZFSTREAM_H

crates/libz-sys/src/zlib/contrib/masmx64/bld_ml64.bat

diff --git a/crates/libz-sys/src/zlib/contrib/masmx64/bld_ml64.bat b/crates/libz-sys/src/zlib/contrib/masmx64/bld_ml64.bat
deleted file mode 100644
index 8f9343d..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx64/bld_ml64.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-ml64.exe /Flinffasx64 /c /Zi inffasx64.asm

-ml64.exe /Flgvmat64   /c /Zi gvmat64.asm

crates/libz-sys/src/zlib/contrib/masmx64/gvmat64.asm

diff --git a/crates/libz-sys/src/zlib/contrib/masmx64/gvmat64.asm b/crates/libz-sys/src/zlib/contrib/masmx64/gvmat64.asm
deleted file mode 100644
index 9879c28..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx64/gvmat64.asm
+++ /dev/null
@@ -1,553 +0,0 @@
-;uInt longest_match_x64(

-;    deflate_state *s,

-;    IPos cur_match);                             /* current match */

-

-; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86_64

-;  (AMD64 on Athlon 64, Opteron, Phenom

-;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)

-; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.

-;

-; File written by Gilles Vollant, by converting to assembly the longest_match

-;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.

-;

-;  and by taking inspiration on asm686 with masm, optimised assembly code

-;        from Brian Raiter, written 1998

-;

-;  This software is provided 'as-is', without any express or implied

-;  warranty.  In no event will the authors be held liable for any damages

-;  arising from the use of this software.

-;

-;  Permission is granted to anyone to use this software for any purpose,

-;  including commercial applications, and to alter it and redistribute it

-;  freely, subject to the following restrictions:

-;

-;  1. The origin of this software must not be misrepresented; you must not

-;     claim that you wrote the original software. If you use this software

-;     in a product, an acknowledgment in the product documentation would be

-;     appreciated but is not required.

-;  2. Altered source versions must be plainly marked as such, and must not be

-;     misrepresented as being the original software

-;  3. This notice may not be removed or altered from any source distribution.

-;

-;

-;

-;         http://www.zlib.net

-;         http://www.winimage.com/zLibDll

-;         http://www.muppetlabs.com/~breadbox/software/assembly.html

-;

-; to compile this file for infozip Zip, I use option:

-;   ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm

-;

-; to compile this file for zLib, I use option:

-;   ml64.exe /Flgvmat64 /c /Zi gvmat64.asm

-; Be carrefull to adapt zlib1222add below to your version of zLib

-;   (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change

-;    value of zlib1222add later)

-;

-; This file compile with Microsoft Macro Assembler (x64) for AMD64

-;

-;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK

-;

-;   (you can get Windows WDK with ml64 for AMD64 from

-;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)

-;

-

-

-;uInt longest_match(s, cur_match)

-;    deflate_state *s;

-;    IPos cur_match;                             /* current match */

-.code

-longest_match PROC

-

-

-;LocalVarsSize   equ 88

- LocalVarsSize   equ 72

-

-; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12

-; free register :  r14,r15

-; register can be saved : rsp

-

- chainlenwmask   equ  rsp + 8 - LocalVarsSize    ; high word: current chain len

-                                                 ; low word: s->wmask

-;window          equ  rsp + xx - LocalVarsSize   ; local copy of s->window ; stored in r10

-;windowbestlen   equ  rsp + xx - LocalVarsSize   ; s->window + bestlen , use r10+r11

-;scanstart       equ  rsp + xx - LocalVarsSize   ; first two bytes of string ; stored in r12w

-;scanend         equ  rsp + xx - LocalVarsSize   ; last two bytes of string use ebx

-;scanalign       equ  rsp + xx - LocalVarsSize   ; dword-misalignment of string r13

-;bestlen         equ  rsp + xx - LocalVarsSize   ; size of best match so far -> r11d

-;scan            equ  rsp + xx - LocalVarsSize   ; ptr to string wanting match -> r9

-IFDEF INFOZIP

-ELSE

- nicematch       equ  (rsp + 16 - LocalVarsSize) ; a good enough match size

-ENDIF

-

-save_rdi        equ  rsp + 24 - LocalVarsSize

-save_rsi        equ  rsp + 32 - LocalVarsSize

-save_rbx        equ  rsp + 40 - LocalVarsSize

-save_rbp        equ  rsp + 48 - LocalVarsSize

-save_r12        equ  rsp + 56 - LocalVarsSize

-save_r13        equ  rsp + 64 - LocalVarsSize

-;save_r14        equ  rsp + 72 - LocalVarsSize

-;save_r15        equ  rsp + 80 - LocalVarsSize

-

-

-; summary of register usage

-; scanend     ebx

-; scanendw    bx

-; chainlenwmask   edx

-; curmatch    rsi

-; curmatchd   esi

-; windowbestlen   r8

-; scanalign   r9

-; scanalignd  r9d

-; window      r10

-; bestlen     r11

-; bestlend    r11d

-; scanstart   r12d

-; scanstartw  r12w

-; scan        r13

-; nicematch   r14d

-; limit       r15

-; limitd      r15d

-; prev        rcx

-

-;  all the +4 offsets are due to the addition of pending_buf_size (in zlib

-;  in the deflate_state structure since the asm code was first written

-;  (if you compile with zlib 1.0.4 or older, remove the +4).

-;  Note : these value are good with a 8 bytes boundary pack structure

-

-

-    MAX_MATCH           equ     258

-    MIN_MATCH           equ     3

-    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)

-

-

-;;; Offsets for fields in the deflate_state structure. These numbers

-;;; are calculated from the definition of deflate_state, with the

-;;; assumption that the compiler will dword-align the fields. (Thus,

-;;; changing the definition of deflate_state could easily cause this

-;;; program to crash horribly, without so much as a warning at

-;;; compile time. Sigh.)

-

-;  all the +zlib1222add offsets are due to the addition of fields

-;  in zlib in the deflate_state structure since the asm code was first written

-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").

-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

-

-

-IFDEF INFOZIP

-

-_DATA   SEGMENT

-COMM    window_size:DWORD

-; WMask ; 7fff

-COMM    window:BYTE:010040H

-COMM    prev:WORD:08000H

-; MatchLen : unused

-; PrevMatch : unused

-COMM    strstart:DWORD

-COMM    match_start:DWORD

-; Lookahead : ignore

-COMM    prev_length:DWORD ; PrevLen

-COMM    max_chain_length:DWORD

-COMM    good_match:DWORD

-COMM    nice_match:DWORD

-prev_ad equ OFFSET prev

-window_ad equ OFFSET window

-nicematch equ nice_match

-_DATA ENDS

-WMask equ 07fffh

-

-ELSE

-

-  IFNDEF zlib1222add

-    zlib1222add equ 8

-  ENDIF

-dsWSize         equ 56+zlib1222add+(zlib1222add/2)

-dsWMask         equ 64+zlib1222add+(zlib1222add/2)

-dsWindow        equ 72+zlib1222add

-dsPrev          equ 88+zlib1222add

-dsMatchLen      equ 128+zlib1222add

-dsPrevMatch     equ 132+zlib1222add

-dsStrStart      equ 140+zlib1222add

-dsMatchStart    equ 144+zlib1222add

-dsLookahead     equ 148+zlib1222add

-dsPrevLen       equ 152+zlib1222add

-dsMaxChainLen   equ 156+zlib1222add

-dsGoodMatch     equ 172+zlib1222add

-dsNiceMatch     equ 176+zlib1222add

-

-window_size     equ [ rcx + dsWSize]

-WMask           equ [ rcx + dsWMask]

-window_ad       equ [ rcx + dsWindow]

-prev_ad         equ [ rcx + dsPrev]

-strstart        equ [ rcx + dsStrStart]

-match_start     equ [ rcx + dsMatchStart]

-Lookahead       equ [ rcx + dsLookahead] ; 0ffffffffh on infozip

-prev_length     equ [ rcx + dsPrevLen]

-max_chain_length equ [ rcx + dsMaxChainLen]

-good_match      equ [ rcx + dsGoodMatch]

-nice_match      equ [ rcx + dsNiceMatch]

-ENDIF

-

-; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)

-

-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and

-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp

-;

-; All registers must be preserved across the call, except for

-;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.

-

-

-

-;;; Save registers that the compiler may be using, and adjust esp to

-;;; make room for our stack frame.

-

-

-;;; Retrieve the function arguments. r8d will hold cur_match

-;;; throughout the entire function. edx will hold the pointer to the

-;;; deflate_state structure during the function's setup (before

-;;; entering the main loop.

-

-; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)

-

-; this clear high 32 bits of r8, which can be garbage in both r8 and rdx

-

-        mov [save_rdi],rdi

-        mov [save_rsi],rsi

-        mov [save_rbx],rbx

-        mov [save_rbp],rbp

-IFDEF INFOZIP

-        mov r8d,ecx

-ELSE

-        mov r8d,edx

-ENDIF

-        mov [save_r12],r12

-        mov [save_r13],r13

-;        mov [save_r14],r14

-;        mov [save_r15],r15

-

-

-;;; uInt wmask = s->w_mask;

-;;; unsigned chain_length = s->max_chain_length;

-;;; if (s->prev_length >= s->good_match) {

-;;;     chain_length >>= 2;

-;;; }

-

-        mov edi, prev_length

-        mov esi, good_match

-        mov eax, WMask

-        mov ebx, max_chain_length

-        cmp edi, esi

-        jl  LastMatchGood

-        shr ebx, 2

-LastMatchGood:

-

-;;; chainlen is decremented once beforehand so that the function can

-;;; use the sign flag instead of the zero flag for the exit test.

-;;; It is then shifted into the high word, to make room for the wmask

-;;; value, which it will always accompany.

-

-        dec ebx

-        shl ebx, 16

-        or  ebx, eax

-

-;;; on zlib only

-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

-

-IFDEF INFOZIP

-        mov [chainlenwmask], ebx

-; on infozip nice_match = [nice_match]

-ELSE

-        mov eax, nice_match

-        mov [chainlenwmask], ebx

-        mov r10d, Lookahead

-        cmp r10d, eax

-        cmovnl r10d, eax

-        mov [nicematch],r10d

-ENDIF

-

-;;; register Bytef *scan = s->window + s->strstart;

-        mov r10, window_ad

-        mov ebp, strstart

-        lea r13, [r10 + rbp]

-

-;;; Determine how many bytes the scan ptr is off from being

-;;; dword-aligned.

-

-         mov r9,r13

-         neg r13

-         and r13,3

-

-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

-;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;

-IFDEF INFOZIP

-        mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))

-ELSE

-        mov eax, window_size

-        sub eax, MIN_LOOKAHEAD

-ENDIF

-        xor edi,edi

-        sub ebp, eax

-

-        mov r11d, prev_length

-

-        cmovng ebp,edi

-

-;;; int best_len = s->prev_length;

-

-

-;;; Store the sum of s->window + best_len in esi locally, and in esi.

-

-       lea  rsi,[r10+r11]

-

-;;; register ush scan_start = *(ushf*)scan;

-;;; register ush scan_end   = *(ushf*)(scan+best_len-1);

-;;; Posf *prev = s->prev;

-

-        movzx r12d,word ptr [r9]

-        movzx ebx, word ptr [r9 + r11 - 1]

-

-        mov rdi, prev_ad

-

-;;; Jump into the main loop.

-

-        mov edx, [chainlenwmask]

-

-        cmp bx,word ptr [rsi + r8 - 1]

-        jz  LookupLoopIsZero

-

-LookupLoop1:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-        jbe LeaveNow

-        sub edx, 00010000h

-        js  LeaveNow

-

-LoopEntry1:

-        cmp bx,word ptr [rsi + r8 - 1]

-        jz  LookupLoopIsZero

-

-LookupLoop2:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-        jbe LeaveNow

-        sub edx, 00010000h

-        js  LeaveNow

-

-LoopEntry2:

-        cmp bx,word ptr [rsi + r8 - 1]

-        jz  LookupLoopIsZero

-

-LookupLoop4:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-        jbe LeaveNow

-        sub edx, 00010000h

-        js  LeaveNow

-

-LoopEntry4:

-

-        cmp bx,word ptr [rsi + r8 - 1]

-        jnz LookupLoop1

-        jmp LookupLoopIsZero

-

-

-;;; do {

-;;;     match = s->window + cur_match;

-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||

-;;;         *(ushf*)match != scan_start) continue;

-;;;     [...]

-;;; } while ((cur_match = prev[cur_match & wmask]) > limit

-;;;          && --chain_length != 0);

-;;;

-;;; Here is the inner loop of the function. The function will spend the

-;;; majority of its time in this loop, and majority of that time will

-;;; be spent in the first ten instructions.

-;;;

-;;; Within this loop:

-;;; ebx = scanend

-;;; r8d = curmatch

-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)

-;;; esi = windowbestlen - i.e., (window + bestlen)

-;;; edi = prev

-;;; ebp = limit

-

-LookupLoop:

-        and r8d, edx

-

-        movzx   r8d, word ptr [rdi + r8*2]

-        cmp r8d, ebp

-        jbe LeaveNow

-        sub edx, 00010000h

-        js  LeaveNow

-

-LoopEntry:

-

-        cmp bx,word ptr [rsi + r8 - 1]

-        jnz LookupLoop1

-LookupLoopIsZero:

-        cmp     r12w, word ptr [r10 + r8]

-        jnz LookupLoop1

-

-

-;;; Store the current value of chainlen.

-        mov [chainlenwmask], edx

-

-;;; Point edi to the string under scrutiny, and esi to the string we

-;;; are hoping to match it up with. In actuality, esi and edi are

-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is

-;;; initialized to -(MAX_MATCH_8 - scanalign).

-

-        lea rsi,[r8+r10]

-        mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8)

-        lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8]

-        lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8]

-

-        prefetcht1 [rsi+rdx]

-        prefetcht1 [rdi+rdx]

-

-

-;;; Test the strings for equality, 8 bytes at a time. At the end,

-;;; adjust rdx so that it is offset to the exact byte that mismatched.

-;;;

-;;; We already know at this point that the first three bytes of the

-;;; strings match each other, and they can be safely passed over before

-;;; starting the compare loop. So what this code does is skip over 0-3

-;;; bytes, as much as necessary in order to dword-align the edi

-;;; pointer. (rsi will still be misaligned three times out of four.)

-;;;

-;;; It should be confessed that this loop usually does not represent

-;;; much of the total running time. Replacing it with a more

-;;; straightforward "rep cmpsb" would not drastically degrade

-;;; performance.

-

-

-LoopCmps:

-        mov rax, [rsi + rdx]

-        xor rax, [rdi + rdx]

-        jnz LeaveLoopCmps

-

-        mov rax, [rsi + rdx + 8]

-        xor rax, [rdi + rdx + 8]

-        jnz LeaveLoopCmps8

-

-

-        mov rax, [rsi + rdx + 8+8]

-        xor rax, [rdi + rdx + 8+8]

-        jnz LeaveLoopCmps16

-

-        add rdx,8+8+8

-

-        jnz short LoopCmps

-        jmp short LenMaximum

-LeaveLoopCmps16: add rdx,8

-LeaveLoopCmps8: add rdx,8

-LeaveLoopCmps:

-

-        test    eax, 0000FFFFh

-        jnz LenLower

-

-        test eax,0ffffffffh

-

-        jnz LenLower32

-

-        add rdx,4

-        shr rax,32

-        or ax,ax

-        jnz LenLower

-

-LenLower32:

-        shr eax,16

-        add rdx,2

-LenLower:   sub al, 1

-        adc rdx, 0

-;;; Calculate the length of the match. If it is longer than MAX_MATCH,

-;;; then automatically accept it as the best possible match and leave.

-

-        lea rax, [rdi + rdx]

-        sub rax, r9

-        cmp eax, MAX_MATCH

-        jge LenMaximum

-

-;;; If the length of the match is not longer than the best match we

-;;; have so far, then forget it and return to the lookup loop.

-;///////////////////////////////////

-

-        cmp eax, r11d

-        jg  LongerMatch

-

-        lea rsi,[r10+r11]

-

-        mov rdi, prev_ad

-        mov edx, [chainlenwmask]

-        jmp LookupLoop

-

-;;;         s->match_start = cur_match;

-;;;         best_len = len;

-;;;         if (len >= nice_match) break;

-;;;         scan_end = *(ushf*)(scan+best_len-1);

-

-LongerMatch:

-        mov r11d, eax

-        mov match_start, r8d

-        cmp eax, [nicematch]

-        jge LeaveNow

-

-        lea rsi,[r10+rax]

-

-        movzx   ebx, word ptr [r9 + rax - 1]

-        mov rdi, prev_ad

-        mov edx, [chainlenwmask]

-        jmp LookupLoop

-

-;;; Accept the current string, with the maximum possible length.

-

-LenMaximum:

-        mov r11d,MAX_MATCH

-        mov match_start, r8d

-

-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

-;;; return s->lookahead;

-

-LeaveNow:

-IFDEF INFOZIP

-        mov eax,r11d

-ELSE

-        mov eax, Lookahead

-        cmp r11d, eax

-        cmovng eax, r11d

-ENDIF

-

-;;; Restore the stack and return from whence we came.

-

-

-        mov rsi,[save_rsi]

-        mov rdi,[save_rdi]

-        mov rbx,[save_rbx]

-        mov rbp,[save_rbp]

-        mov r12,[save_r12]

-        mov r13,[save_r13]

-;        mov r14,[save_r14]

-;        mov r15,[save_r15]

-

-

-        ret 0

-; please don't remove this string !

-; Your can freely use gvmat64 in any free or commercial app

-; but it is far better don't remove the string in the binary!

-    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0

-longest_match   ENDP

-

-match_init PROC

-  ret 0

-match_init ENDP

-

-

-END

crates/libz-sys/src/zlib/contrib/masmx64/inffas8664.c

diff --git a/crates/libz-sys/src/zlib/contrib/masmx64/inffas8664.c b/crates/libz-sys/src/zlib/contrib/masmx64/inffas8664.c
deleted file mode 100644
index e8af06f..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx64/inffas8664.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding

- * version for AMD64 on Windows using Microsoft C compiler

- *

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- *

- * Copyright (C) 2003 Chris Anderson <christop@charm.net>

- * Please use the copyright conditions above.

- *

- * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant

- *

- * inffas8664.c call function inffas8664fnc in inffasx64.asm

- *  inffasx64.asm is automatically convert from AMD64 portion of inffas86.c

- *

- * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also

- * slightly quicker on x86 systems because, instead of using rep movsb to copy

- * data, it uses rep movsw, which moves data in 2-byte chunks instead of single

- * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates

- * from http://fedora.linux.duke.edu/fc1_x86_64

- * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with

- * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,

- * when decompressing mozilla-source-1.3.tar.gz.

- *

- * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from

- * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at

- * the moment.  I have successfully compiled and tested this code with gcc2.96,

- * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S

- * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX

- * enabled.  I will attempt to merge the MMX code into this version.  Newer

- * versions of this and inffast.S can be found at

- * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/

- *

- */

-

-#include <stdio.h>

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-/* Mark Adler's comments from inffast.c: */

-

-/*

-   Decode literal, length, and distance codes and write out the resulting

-   literal and match bytes until either not enough input or output is

-   available, an end-of-block is encountered, or a data error is encountered.

-   When large enough input and output buffers are supplied to inflate(), for

-   example, a 16K input buffer and a 64K output buffer, more than 95% of the

-   inflate execution time is spent in this routine.

-

-   Entry assumptions:

-

-        state->mode == LEN

-        strm->avail_in >= 6

-        strm->avail_out >= 258

-        start >= strm->avail_out

-        state->bits < 8

-

-   On return, state->mode is one of:

-

-        LEN -- ran out of enough output space or enough available input

-        TYPE -- reached end of block code, inflate() to interpret next block

-        BAD -- error in block data

-

-   Notes:

-

-    - The maximum input bits used by a length/distance pair is 15 bits for the

-      length code, 5 bits for the length extra, 15 bits for the distance code,

-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.

-      Therefore if strm->avail_in >= 6, then there is enough input to avoid

-      checking for available input while decoding.

-

-    - The maximum bytes that a single length/distance pair can output is 258

-      bytes, which is the maximum length that can be coded.  inflate_fast()

-      requires strm->avail_out >= 258 for each loop to avoid checking for

-      output space.

- */

-

-

-

-    typedef struct inffast_ar {

-/* 64   32                               x86  x86_64 */

-/* ar offset                              register */

-/*  0    0 */ void *esp;                /* esp save */

-/*  8    4 */ void *ebp;                /* ebp save */

-/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */

-/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */

-/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */

-/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */

-/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */

-/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */

-/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */

-/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */

-/* 80   40 */ size_t /*unsigned long */hold;       /* edx rdx  local strm->hold */

-/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */

-/* 92   48 */ unsigned wsize;           /*          window size */

-/* 96   52 */ unsigned write;           /*          window write index */

-/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */

-/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */

-/*108   64 */ unsigned len;             /*     r14  match length */

-/*112   68 */ unsigned dist;            /*     r15  match distance */

-/*116   72 */ unsigned status;          /*          set when state chng*/

-    } type_ar;

-#ifdef ASMINF

-

-void inflate_fast(strm, start)

-z_streamp strm;

-unsigned start;         /* inflate()'s starting value for strm->avail_out */

-{

-    struct inflate_state FAR *state;

-    type_ar ar;

-    void inffas8664fnc(struct inffast_ar * par);

-

-

-

-#if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))

-#define PAD_AVAIL_IN 6

-#define PAD_AVAIL_OUT 258

-#else

-#define PAD_AVAIL_IN 5

-#define PAD_AVAIL_OUT 257

-#endif

-

-    /* copy state to local variables */

-    state = (struct inflate_state FAR *)strm->state;

-

-    ar.in = strm->next_in;

-    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);

-    ar.out = strm->next_out;

-    ar.beg = ar.out - (start - strm->avail_out);

-    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);

-    ar.wsize = state->wsize;

-    ar.write = state->wnext;

-    ar.window = state->window;

-    ar.hold = state->hold;

-    ar.bits = state->bits;

-    ar.lcode = state->lencode;

-    ar.dcode = state->distcode;

-    ar.lmask = (1U << state->lenbits) - 1;

-    ar.dmask = (1U << state->distbits) - 1;

-

-    /* decode literals and length/distances until end-of-block or not enough

-       input data or output space */

-

-    /* align in on 1/2 hold size boundary */

-    while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {

-        ar.hold += (unsigned long)*ar.in++ << ar.bits;

-        ar.bits += 8;

-    }

-

-    inffas8664fnc(&ar);

-

-    if (ar.status > 1) {

-        if (ar.status == 2)

-            strm->msg = "invalid literal/length code";

-        else if (ar.status == 3)

-            strm->msg = "invalid distance code";

-        else

-            strm->msg = "invalid distance too far back";

-        state->mode = BAD;

-    }

-    else if ( ar.status == 1 ) {

-        state->mode = TYPE;

-    }

-

-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */

-    ar.len = ar.bits >> 3;

-    ar.in -= ar.len;

-    ar.bits -= ar.len << 3;

-    ar.hold &= (1U << ar.bits) - 1;

-

-    /* update state and return */

-    strm->next_in = ar.in;

-    strm->next_out = ar.out;

-    strm->avail_in = (unsigned)(ar.in < ar.last ?

-                                PAD_AVAIL_IN + (ar.last - ar.in) :

-                                PAD_AVAIL_IN - (ar.in - ar.last));

-    strm->avail_out = (unsigned)(ar.out < ar.end ?

-                                 PAD_AVAIL_OUT + (ar.end - ar.out) :

-                                 PAD_AVAIL_OUT - (ar.out - ar.end));

-    state->hold = (unsigned long)ar.hold;

-    state->bits = ar.bits;

-    return;

-}

-

-#endif

crates/libz-sys/src/zlib/contrib/masmx64/inffasx64.asm

diff --git a/crates/libz-sys/src/zlib/contrib/masmx64/inffasx64.asm b/crates/libz-sys/src/zlib/contrib/masmx64/inffasx64.asm
deleted file mode 100644
index 60a8d89..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx64/inffasx64.asm
+++ /dev/null
@@ -1,396 +0,0 @@
-; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding

-; version for AMD64 on Windows using Microsoft C compiler

-;

-; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c

-; inffasx64.asm is called by inffas8664.c, which contain more info.

-

-

-; to compile this file, I use option

-;   ml64.exe /Flinffasx64 /c /Zi inffasx64.asm

-;   with Microsoft Macro Assembler (x64) for AMD64

-;

-

-; This file compile with Microsoft Macro Assembler (x64) for AMD64

-;

-;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK

-;

-;   (you can get Windows WDK with ml64 for AMD64 from

-;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)

-;

-

-

-.code

-inffas8664fnc PROC

-

-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and

-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp

-;

-; All registers must be preserved across the call, except for

-;   rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.

-

-

-	mov [rsp-8],rsi

-	mov [rsp-16],rdi

-	mov [rsp-24],r12

-	mov [rsp-32],r13

-	mov [rsp-40],r14

-	mov [rsp-48],r15

-	mov [rsp-56],rbx

-

-	mov rax,rcx

-

-	mov	[rax+8], rbp       ; /* save regs rbp and rsp */

-	mov	[rax], rsp

-

-	mov	rsp, rax          ; /* make rsp point to &ar */

-

-	mov	rsi, [rsp+16]      ; /* rsi  = in */

-	mov	rdi, [rsp+32]      ; /* rdi  = out */

-	mov	r9, [rsp+24]       ; /* r9   = last */

-	mov	r10, [rsp+48]      ; /* r10  = end */

-	mov	rbp, [rsp+64]      ; /* rbp  = lcode */

-	mov	r11, [rsp+72]      ; /* r11  = dcode */

-	mov	rdx, [rsp+80]      ; /* rdx  = hold */

-	mov	ebx, [rsp+88]      ; /* ebx  = bits */

-	mov	r12d, [rsp+100]    ; /* r12d = lmask */

-	mov	r13d, [rsp+104]    ; /* r13d = dmask */

-                                          ; /* r14d = len */

-                                          ; /* r15d = dist */

-

-

-	cld

-	cmp	r10, rdi

-	je	L_one_time           ; /* if only one decode left */

-	cmp	r9, rsi

-

-    jne L_do_loop

-

-

-L_one_time:

-	mov	r8, r12           ; /* r8 = lmask */

-	cmp	bl, 32

-	ja	L_get_length_code_one_time

-

-	lodsd                         ; /* eax = *(uint *)in++ */

-	mov	cl, bl            ; /* cl = bits, needs it for shifting */

-	add	bl, 32             ; /* bits += 32 */

-	shl	rax, cl

-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */

-	jmp	L_get_length_code_one_time

-

-ALIGN 4

-L_while_test:

-	cmp	r10, rdi

-	jbe	L_break_loop

-	cmp	r9, rsi

-	jbe	L_break_loop

-

-L_do_loop:

-	mov	r8, r12           ; /* r8 = lmask */

-	cmp	bl, 32

-	ja	L_get_length_code    ; /* if (32 < bits) */

-

-	lodsd                         ; /* eax = *(uint *)in++ */

-	mov	cl, bl            ; /* cl = bits, needs it for shifting */

-	add	bl, 32             ; /* bits += 32 */

-	shl	rax, cl

-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */

-

-L_get_length_code:

-	and	r8, rdx            ; /* r8 &= hold */

-	mov	eax, [rbp+r8*4]  ; /* eax = lcode[hold & lmask] */

-

-	mov	cl, ah            ; /* cl = this.bits */

-	sub	bl, ah            ; /* bits -= this.bits */

-	shr	rdx, cl           ; /* hold >>= this.bits */

-

-	test	al, al

-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */

-

-	mov	r8, r12            ; /* r8 = lmask */

-	shr	eax, 16            ; /* output this.val char */

-	stosb

-

-L_get_length_code_one_time:

-	and	r8, rdx            ; /* r8 &= hold */

-	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */

-

-L_dolen:

-	mov	cl, ah            ; /* cl = this.bits */

-	sub	bl, ah            ; /* bits -= this.bits */

-	shr	rdx, cl           ; /* hold >>= this.bits */

-

-	test	al, al

-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */

-

-	shr	eax, 16            ; /* output this.val char */

-	stosb

-	jmp	L_while_test

-

-ALIGN 4

-L_test_for_length_base:

-	mov	r14d, eax         ; /* len = this */

-	shr	r14d, 16           ; /* len = this.val */

-	mov	cl, al

-

-	test	al, 16

-	jz	L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */

-	and	cl, 15             ; /* op &= 15 */

-	jz	L_decode_distance    ; /* if (!op) */

-

-L_add_bits_to_len:

-	sub	bl, cl

-	xor	eax, eax

-	inc	eax

-	shl	eax, cl

-	dec	eax

-	and	eax, edx          ; /* eax &= hold */

-	shr	rdx, cl

-	add	r14d, eax         ; /* len += hold & mask[op] */

-

-L_decode_distance:

-	mov	r8, r13           ; /* r8 = dmask */

-	cmp	bl, 32

-	ja	L_get_distance_code  ; /* if (32 < bits) */

-

-	lodsd                         ; /* eax = *(uint *)in++ */

-	mov	cl, bl            ; /* cl = bits, needs it for shifting */

-	add	bl, 32             ; /* bits += 32 */

-	shl	rax, cl

-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */

-

-L_get_distance_code:

-	and	r8, rdx           ; /* r8 &= hold */

-	mov	eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */

-

-L_dodist:

-	mov	r15d, eax         ; /* dist = this */

-	shr	r15d, 16           ; /* dist = this.val */

-	mov	cl, ah

-	sub	bl, ah            ; /* bits -= this.bits */

-	shr	rdx, cl           ; /* hold >>= this.bits */

-	mov	cl, al            ; /* cl = this.op */

-

-	test	al, 16             ; /* if ((op & 16) == 0) */

-	jz	L_test_for_second_level_dist

-	and	cl, 15             ; /* op &= 15 */

-	jz	L_check_dist_one

-

-L_add_bits_to_dist:

-	sub	bl, cl

-	xor	eax, eax

-	inc	eax

-	shl	eax, cl

-	dec	eax                 ; /* (1 << op) - 1 */

-	and	eax, edx          ; /* eax &= hold */

-	shr	rdx, cl

-	add	r15d, eax         ; /* dist += hold & ((1 << op) - 1) */

-

-L_check_window:

-	mov	r8, rsi           ; /* save in so from can use it's reg */

-	mov	rax, rdi

-	sub	rax, [rsp+40]      ; /* nbytes = out - beg */

-

-	cmp	eax, r15d

-	jb	L_clip_window        ; /* if (dist > nbytes) 4.2% */

-

-	mov	ecx, r14d         ; /* ecx = len */

-	mov	rsi, rdi

-	sub	rsi, r15          ; /* from = out - dist */

-

-	sar	ecx, 1

-	jnc	L_copy_two           ; /* if len % 2 == 0 */

-

-	rep     movsw

-	mov	al, [rsi]

-	mov	[rdi], al

-	inc	rdi

-

-	mov	rsi, r8           ; /* move in back to %rsi, toss from */

-	jmp	L_while_test

-

-L_copy_two:

-	rep     movsw

-	mov	rsi, r8           ; /* move in back to %rsi, toss from */

-	jmp	L_while_test

-

-ALIGN 4

-L_check_dist_one:

-	cmp	r15d, 1            ; /* if dist 1, is a memset */

-	jne	L_check_window

-	cmp	[rsp+40], rdi      ; /* if out == beg, outside window */

-	je	L_check_window

-

-	mov	ecx, r14d         ; /* ecx = len */

-	mov	al, [rdi-1]

-	mov	ah, al

-

-	sar	ecx, 1

-	jnc	L_set_two

-	mov	[rdi], al

-	inc	rdi

-

-L_set_two:

-	rep     stosw

-	jmp	L_while_test

-

-ALIGN 4

-L_test_for_second_level_length:

-	test	al, 64

-	jnz	L_test_for_end_of_block ; /* if ((op & 64) != 0) */

-

-	xor	eax, eax

-	inc	eax

-	shl	eax, cl

-	dec	eax

-	and	eax, edx         ; /* eax &= hold */

-	add	eax, r14d        ; /* eax += len */

-	mov	eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/

-	jmp	L_dolen

-

-ALIGN 4

-L_test_for_second_level_dist:

-	test	al, 64

-	jnz	L_invalid_distance_code ; /* if ((op & 64) != 0) */

-

-	xor	eax, eax

-	inc	eax

-	shl	eax, cl

-	dec	eax

-	and	eax, edx         ; /* eax &= hold */

-	add	eax, r15d        ; /* eax += dist */

-	mov	eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/

-	jmp	L_dodist

-

-ALIGN 4

-L_clip_window:

-	mov	ecx, eax         ; /* ecx = nbytes */

-	mov	eax, [rsp+92]     ; /* eax = wsize, prepare for dist cmp */

-	neg	ecx                ; /* nbytes = -nbytes */

-

-	cmp	eax, r15d

-	jb	L_invalid_distance_too_far ; /* if (dist > wsize) */

-

-	add	ecx, r15d         ; /* nbytes = dist - nbytes */

-	cmp	dword ptr [rsp+96], 0

-	jne	L_wrap_around_window ; /* if (write != 0) */

-

-	mov	rsi, [rsp+56]     ; /* from  = window */

-	sub	eax, ecx         ; /* eax  -= nbytes */

-	add	rsi, rax         ; /* from += wsize - nbytes */

-

-	mov	eax, r14d        ; /* eax = len */

-	cmp	r14d, ecx

-	jbe	L_do_copy           ; /* if (nbytes >= len) */

-

-	sub	eax, ecx         ; /* eax -= nbytes */

-	rep     movsb

-	mov	rsi, rdi

-	sub	rsi, r15         ; /* from = &out[ -dist ] */

-	jmp	L_do_copy

-

-ALIGN 4

-L_wrap_around_window:

-	mov	eax, [rsp+96]     ; /* eax = write */

-	cmp	ecx, eax

-	jbe	L_contiguous_in_window ; /* if (write >= nbytes) */

-

-	mov	esi, [rsp+92]     ; /* from  = wsize */

-	add	rsi, [rsp+56]     ; /* from += window */

-	add	rsi, rax         ; /* from += write */

-	sub	rsi, rcx         ; /* from -= nbytes */

-	sub	ecx, eax         ; /* nbytes -= write */

-

-	mov	eax, r14d        ; /* eax = len */

-	cmp	eax, ecx

-	jbe	L_do_copy           ; /* if (nbytes >= len) */

-

-	sub	eax, ecx         ; /* len -= nbytes */

-	rep     movsb

-	mov	rsi, [rsp+56]     ; /* from = window */

-	mov	ecx, [rsp+96]     ; /* nbytes = write */

-	cmp	eax, ecx

-	jbe	L_do_copy           ; /* if (nbytes >= len) */

-

-	sub	eax, ecx         ; /* len -= nbytes */

-	rep     movsb

-	mov	rsi, rdi

-	sub	rsi, r15         ; /* from = out - dist */

-	jmp	L_do_copy

-

-ALIGN 4

-L_contiguous_in_window:

-	mov	rsi, [rsp+56]     ; /* rsi = window */

-	add	rsi, rax

-	sub	rsi, rcx         ; /* from += write - nbytes */

-

-	mov	eax, r14d        ; /* eax = len */

-	cmp	eax, ecx

-	jbe	L_do_copy           ; /* if (nbytes >= len) */

-

-	sub	eax, ecx         ; /* len -= nbytes */

-	rep     movsb

-	mov	rsi, rdi

-	sub	rsi, r15         ; /* from = out - dist */

-	jmp	L_do_copy           ; /* if (nbytes >= len) */

-

-ALIGN 4

-L_do_copy:

-	mov	ecx, eax         ; /* ecx = len */

-	rep     movsb

-

-	mov	rsi, r8          ; /* move in back to %esi, toss from */

-	jmp	L_while_test

-

-L_test_for_end_of_block:

-	test	al, 32

-	jz	L_invalid_literal_length_code

-	mov	dword ptr [rsp+116], 1

-	jmp	L_break_loop_with_status

-

-L_invalid_literal_length_code:

-	mov	dword ptr [rsp+116], 2

-	jmp	L_break_loop_with_status

-

-L_invalid_distance_code:

-	mov	dword ptr [rsp+116], 3

-	jmp	L_break_loop_with_status

-

-L_invalid_distance_too_far:

-	mov	dword ptr [rsp+116], 4

-	jmp	L_break_loop_with_status

-

-L_break_loop:

-	mov	dword ptr [rsp+116], 0

-

-L_break_loop_with_status:

-; /* put in, out, bits, and hold back into ar and pop esp */

-	mov	[rsp+16], rsi     ; /* in */

-	mov	[rsp+32], rdi     ; /* out */

-	mov	[rsp+88], ebx     ; /* bits */

-	mov	[rsp+80], rdx     ; /* hold */

-

-	mov	rax, [rsp]       ; /* restore rbp and rsp */

-	mov	rbp, [rsp+8]

-	mov	rsp, rax

-

-

-

-	mov rsi,[rsp-8]

-	mov rdi,[rsp-16]

-	mov r12,[rsp-24]

-	mov r13,[rsp-32]

-	mov r14,[rsp-40]

-	mov r15,[rsp-48]

-	mov rbx,[rsp-56]

-

-    ret 0

-;          :

-;          : "m" (ar)

-;          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",

-;            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"

-;    );

-

-inffas8664fnc 	ENDP

-;_TEXT	ENDS

-END

crates/libz-sys/src/zlib/contrib/masmx64/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/masmx64/readme.txt b/crates/libz-sys/src/zlib/contrib/masmx64/readme.txt
deleted file mode 100644
index 2da6733..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx64/readme.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Summary

--------

-This directory contains ASM implementations of the functions

-longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t),

-for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits.

-

-gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits

-   assembly optimized version from Jean-loup Gailly original longest_match function

-

-inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing

-   original function from Mark Adler

-

-Use instructions

-----------------

-Assemble the .asm files using MASM and put the object files into the zlib source

-directory.  You can also get object files here:

-

-     http://www.winimage.com/zLibDll/zlib124_masm_obj.zip

-

-define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,

-and inffasx64.obj and gvmat64.obj as object to link.

-

-

-Build instructions

-------------------

-run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)

-

-ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK

-

-You can get Windows 2003 server DDK with ml64 and cl for AMD64 from

-  http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)

crates/libz-sys/src/zlib/contrib/masmx86/bld_ml32.bat

diff --git a/crates/libz-sys/src/zlib/contrib/masmx86/bld_ml32.bat b/crates/libz-sys/src/zlib/contrib/masmx86/bld_ml32.bat
deleted file mode 100644
index e1b86bf..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx86/bld_ml32.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-ml /coff /Zi /c /Flmatch686.lst match686.asm

-ml /coff /Zi /c /Flinffas32.lst inffas32.asm

crates/libz-sys/src/zlib/contrib/masmx86/inffas32.asm

diff --git a/crates/libz-sys/src/zlib/contrib/masmx86/inffas32.asm b/crates/libz-sys/src/zlib/contrib/masmx86/inffas32.asm
deleted file mode 100644
index 03d20f8..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx86/inffas32.asm
+++ /dev/null
@@ -1,1080 +0,0 @@
-;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding

-; *

-; * inffas32.asm is derivated from inffas86.c, with translation of assembly code

-; *

-; * Copyright (C) 1995-2003 Mark Adler

-; * For conditions of distribution and use, see copyright notice in zlib.h

-; *

-; * Copyright (C) 2003 Chris Anderson <christop@charm.net>

-; * Please use the copyright conditions above.

-; *

-; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from

-; * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at

-; * the moment.  I have successfully compiled and tested this code with gcc2.96,

-; * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S

-; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX

-; * enabled.  I will attempt to merge the MMX code into this version.  Newer

-; * versions of this and inffast.S can be found at

-; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/

-; *

-; * 2005 : modification by Gilles Vollant

-; */

-; For Visual C++ 4.x and higher and ML 6.x and higher

-;   ml.exe is in directory \MASM611C of Win95 DDK

-;   ml.exe is also distributed in http://www.masm32.com/masmdl.htm

-;    and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/

-;

-;

-;   compile with command line option

-;   ml  /coff /Zi /c /Flinffas32.lst inffas32.asm

-

-;   if you define NO_GZIP (see inflate.h), compile with

-;   ml  /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm

-

-

-; zlib122sup is 0 fort zlib 1.2.2.1 and lower

-; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head

-;        in inflate_state in inflate.h)

-zlib1222sup      equ    8

-

-

-IFDEF GUNZIP

-  INFLATE_MODE_TYPE    equ 11

-  INFLATE_MODE_BAD     equ 26

-ELSE

-  IFNDEF NO_GUNZIP

-    INFLATE_MODE_TYPE    equ 11

-    INFLATE_MODE_BAD     equ 26

-  ELSE

-    INFLATE_MODE_TYPE    equ 3

-    INFLATE_MODE_BAD     equ 17

-  ENDIF

-ENDIF

-

-

-; 75 "inffast.S"

-;FILE "inffast.S"

-

-;;;GLOBAL _inflate_fast

-

-;;;SECTION .text

-

-

-

-	.586p

-	.mmx

-

-	name	inflate_fast_x86

-	.MODEL	FLAT

-

-_DATA			segment

-inflate_fast_use_mmx:

-	dd	1

-

-

-_TEXT			segment

-

-

-

-ALIGN 4

-	db	'Fast decoding Code from Chris Anderson'

-	db	0

-

-ALIGN 4

-invalid_literal_length_code_msg:

-	db	'invalid literal/length code'

-	db	0

-

-ALIGN 4

-invalid_distance_code_msg:

-	db	'invalid distance code'

-	db	0

-

-ALIGN 4

-invalid_distance_too_far_msg:

-	db	'invalid distance too far back'

-	db	0

-

-

-ALIGN 4

-inflate_fast_mask:

-dd	0

-dd	1

-dd	3

-dd	7

-dd	15

-dd	31

-dd	63

-dd	127

-dd	255

-dd	511

-dd	1023

-dd	2047

-dd	4095

-dd	8191

-dd	16383

-dd	32767

-dd	65535

-dd	131071

-dd	262143

-dd	524287

-dd	1048575

-dd	2097151

-dd	4194303

-dd	8388607

-dd	16777215

-dd	33554431

-dd	67108863

-dd	134217727

-dd	268435455

-dd	536870911

-dd	1073741823

-dd	2147483647

-dd	4294967295

-

-

-mode_state	 equ	0	;/* state->mode	*/

-wsize_state	 equ	(32+zlib1222sup)	;/* state->wsize */

-write_state	 equ	(36+4+zlib1222sup)	;/* state->write */

-window_state	 equ	(40+4+zlib1222sup)	;/* state->window */

-hold_state	 equ	(44+4+zlib1222sup)	;/* state->hold	*/

-bits_state	 equ	(48+4+zlib1222sup)	;/* state->bits	*/

-lencode_state	 equ	(64+4+zlib1222sup)	;/* state->lencode */

-distcode_state	 equ	(68+4+zlib1222sup)	;/* state->distcode */

-lenbits_state	 equ	(72+4+zlib1222sup)	;/* state->lenbits */

-distbits_state	 equ	(76+4+zlib1222sup)	;/* state->distbits */

-

-

-;;SECTION .text

-; 205 "inffast.S"

-;GLOBAL	inflate_fast_use_mmx

-

-;SECTION .data

-

-

-; GLOBAL inflate_fast_use_mmx:object

-;.size inflate_fast_use_mmx, 4

-; 226 "inffast.S"

-;SECTION .text

-

-ALIGN 4

-_inflate_fast proc near

-.FPO (16, 4, 0, 0, 1, 0)

-	push  edi

-	push  esi

-	push  ebp

-	push  ebx

-	pushfd

-	sub  esp,64

-	cld

-

-

-

-

-	mov  esi, [esp+88]

-	mov  edi, [esi+28]

-

-

-

-

-

-

-

-	mov  edx, [esi+4]

-	mov  eax, [esi+0]

-

-	add  edx,eax

-	sub  edx,11

-

-	mov  [esp+44],eax

-	mov  [esp+20],edx

-

-	mov  ebp, [esp+92]

-	mov  ecx, [esi+16]

-	mov  ebx, [esi+12]

-

-	sub  ebp,ecx

-	neg  ebp

-	add  ebp,ebx

-

-	sub  ecx,257

-	add  ecx,ebx

-

-	mov  [esp+60],ebx

-	mov  [esp+40],ebp

-	mov  [esp+16],ecx

-; 285 "inffast.S"

-	mov  eax, [edi+lencode_state]

-	mov  ecx, [edi+distcode_state]

-

-	mov  [esp+8],eax

-	mov  [esp+12],ecx

-

-	mov  eax,1

-	mov  ecx, [edi+lenbits_state]

-	shl  eax,cl

-	dec  eax

-	mov  [esp+0],eax

-

-	mov  eax,1

-	mov  ecx, [edi+distbits_state]

-	shl  eax,cl

-	dec  eax

-	mov  [esp+4],eax

-

-	mov  eax, [edi+wsize_state]

-	mov  ecx, [edi+write_state]

-	mov  edx, [edi+window_state]

-

-	mov  [esp+52],eax

-	mov  [esp+48],ecx

-	mov  [esp+56],edx

-

-	mov  ebp, [edi+hold_state]

-	mov  ebx, [edi+bits_state]

-; 321 "inffast.S"

-	mov  esi, [esp+44]

-	mov  ecx, [esp+20]

-	cmp  ecx,esi

-	ja   L_align_long

-

-	add  ecx,11

-	sub  ecx,esi

-	mov  eax,12

-	sub  eax,ecx

-	lea  edi, [esp+28]

-	rep movsb

-	mov  ecx,eax

-	xor  eax,eax

-	rep stosb

-	lea  esi, [esp+28]

-	mov  [esp+20],esi

-	jmp  L_is_aligned

-

-

-L_align_long:

-	test  esi,3

-	jz   L_is_aligned

-	xor  eax,eax

-	mov  al, [esi]

-	inc  esi

-	mov  ecx,ebx

-	add  ebx,8

-	shl  eax,cl

-	or  ebp,eax

-	jmp L_align_long

-

-L_is_aligned:

-	mov  edi, [esp+60]

-; 366 "inffast.S"

-L_check_mmx:

-	cmp  dword ptr [inflate_fast_use_mmx],2

-	je   L_init_mmx

-	ja   L_do_loop

-

-	push  eax

-	push  ebx

-	push  ecx

-	push  edx

-	pushfd

-	mov  eax, [esp]

-	xor  dword ptr [esp],0200000h

-

-

-

-

-	popfd

-	pushfd

-	pop  edx

-	xor  edx,eax

-	jz   L_dont_use_mmx

-	xor  eax,eax

-	cpuid

-	cmp  ebx,0756e6547h

-	jne  L_dont_use_mmx

-	cmp  ecx,06c65746eh

-	jne  L_dont_use_mmx

-	cmp  edx,049656e69h

-	jne  L_dont_use_mmx

-	mov  eax,1

-	cpuid

-	shr  eax,8

-	and  eax,15

-	cmp  eax,6

-	jne  L_dont_use_mmx

-	test  edx,0800000h

-	jnz  L_use_mmx

-	jmp  L_dont_use_mmx

-L_use_mmx:

-	mov  dword ptr [inflate_fast_use_mmx],2

-	jmp  L_check_mmx_pop

-L_dont_use_mmx:

-	mov  dword ptr [inflate_fast_use_mmx],3

-L_check_mmx_pop:

-	pop  edx

-	pop  ecx

-	pop  ebx

-	pop  eax

-	jmp  L_check_mmx

-; 426 "inffast.S"

-ALIGN 4

-L_do_loop:

-; 437 "inffast.S"

-	cmp  bl,15

-	ja   L_get_length_code

-

-	xor  eax,eax

-	lodsw

-	mov  cl,bl

-	add  bl,16

-	shl  eax,cl

-	or  ebp,eax

-

-L_get_length_code:

-	mov  edx, [esp+0]

-	mov  ecx, [esp+8]

-	and  edx,ebp

-	mov  eax, [ecx+edx*4]

-

-L_dolen:

-

-

-

-

-

-

-	mov  cl,ah

-	sub  bl,ah

-	shr  ebp,cl

-

-

-

-

-

-

-	test  al,al

-	jnz   L_test_for_length_base

-

-	shr  eax,16

-	stosb

-

-L_while_test:

-

-

-	cmp  [esp+16],edi

-	jbe  L_break_loop

-

-	cmp  [esp+20],esi

-	ja   L_do_loop

-	jmp  L_break_loop

-

-L_test_for_length_base:

-; 502 "inffast.S"

-	mov  edx,eax

-	shr  edx,16

-	mov  cl,al

-

-	test  al,16

-	jz   L_test_for_second_level_length

-	and  cl,15

-	jz   L_save_len

-	cmp  bl,cl

-	jae  L_add_bits_to_len

-

-	mov  ch,cl

-	xor  eax,eax

-	lodsw

-	mov  cl,bl

-	add  bl,16

-	shl  eax,cl

-	or  ebp,eax

-	mov  cl,ch

-

-L_add_bits_to_len:

-	mov  eax,1

-	shl  eax,cl

-	dec  eax

-	sub  bl,cl

-	and  eax,ebp

-	shr  ebp,cl

-	add  edx,eax

-

-L_save_len:

-	mov  [esp+24],edx

-

-

-L_decode_distance:

-; 549 "inffast.S"

-	cmp  bl,15

-	ja   L_get_distance_code

-

-	xor  eax,eax

-	lodsw

-	mov  cl,bl

-	add  bl,16

-	shl  eax,cl

-	or  ebp,eax

-

-L_get_distance_code:

-	mov  edx, [esp+4]

-	mov  ecx, [esp+12]

-	and  edx,ebp

-	mov  eax, [ecx+edx*4]

-

-

-L_dodist:

-	mov  edx,eax

-	shr  edx,16

-	mov  cl,ah

-	sub  bl,ah

-	shr  ebp,cl

-; 584 "inffast.S"

-	mov  cl,al

-

-	test  al,16

-	jz  L_test_for_second_level_dist

-	and  cl,15

-	jz  L_check_dist_one

-	cmp  bl,cl

-	jae  L_add_bits_to_dist

-

-	mov  ch,cl

-	xor  eax,eax

-	lodsw

-	mov  cl,bl

-	add  bl,16

-	shl  eax,cl

-	or  ebp,eax

-	mov  cl,ch

-

-L_add_bits_to_dist:

-	mov  eax,1

-	shl  eax,cl

-	dec  eax

-	sub  bl,cl

-	and  eax,ebp

-	shr  ebp,cl

-	add  edx,eax

-	jmp  L_check_window

-

-L_check_window:

-; 625 "inffast.S"

-	mov  [esp+44],esi

-	mov  eax,edi

-	sub  eax, [esp+40]

-

-	cmp  eax,edx

-	jb   L_clip_window

-

-	mov  ecx, [esp+24]

-	mov  esi,edi

-	sub  esi,edx

-

-	sub  ecx,3

-	mov  al, [esi]

-	mov  [edi],al

-	mov  al, [esi+1]

-	mov  dl, [esi+2]

-	add  esi,3

-	mov  [edi+1],al

-	mov  [edi+2],dl

-	add  edi,3

-	rep movsb

-

-	mov  esi, [esp+44]

-	jmp  L_while_test

-

-ALIGN 4

-L_check_dist_one:

-	cmp  edx,1

-	jne  L_check_window

-	cmp  [esp+40],edi

-	je  L_check_window

-

-	dec  edi

-	mov  ecx, [esp+24]

-	mov  al, [edi]

-	sub  ecx,3

-

-	mov  [edi+1],al

-	mov  [edi+2],al

-	mov  [edi+3],al

-	add  edi,4

-	rep stosb

-

-	jmp  L_while_test

-

-ALIGN 4

-L_test_for_second_level_length:

-

-

-

-

-	test  al,64

-	jnz   L_test_for_end_of_block

-

-	mov  eax,1

-	shl  eax,cl

-	dec  eax

-	and  eax,ebp

-	add  eax,edx

-	mov  edx, [esp+8]

-	mov  eax, [edx+eax*4]

-	jmp  L_dolen

-

-ALIGN 4

-L_test_for_second_level_dist:

-

-

-

-

-	test  al,64

-	jnz   L_invalid_distance_code

-

-	mov  eax,1

-	shl  eax,cl

-	dec  eax

-	and  eax,ebp

-	add  eax,edx

-	mov  edx, [esp+12]

-	mov  eax, [edx+eax*4]

-	jmp  L_dodist

-

-ALIGN 4

-L_clip_window:

-; 721 "inffast.S"

-	mov  ecx,eax

-	mov  eax, [esp+52]

-	neg  ecx

-	mov  esi, [esp+56]

-

-	cmp  eax,edx

-	jb   L_invalid_distance_too_far

-

-	add  ecx,edx

-	cmp  dword ptr [esp+48],0

-	jne  L_wrap_around_window

-

-	sub  eax,ecx

-	add  esi,eax

-; 749 "inffast.S"

-	mov  eax, [esp+24]

-	cmp  eax,ecx

-	jbe  L_do_copy1

-

-	sub  eax,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,edx

-	jmp  L_do_copy1

-

-	cmp  eax,ecx

-	jbe  L_do_copy1

-

-	sub  eax,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,edx

-	jmp  L_do_copy1

-

-L_wrap_around_window:

-; 793 "inffast.S"

-	mov  eax, [esp+48]

-	cmp  ecx,eax

-	jbe  L_contiguous_in_window

-

-	add  esi, [esp+52]

-	add  esi,eax

-	sub  esi,ecx

-	sub  ecx,eax

-

-

-	mov  eax, [esp+24]

-	cmp  eax,ecx

-	jbe  L_do_copy1

-

-	sub  eax,ecx

-	rep movsb

-	mov  esi, [esp+56]

-	mov  ecx, [esp+48]

-	cmp  eax,ecx

-	jbe  L_do_copy1

-

-	sub  eax,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,edx

-	jmp  L_do_copy1

-

-L_contiguous_in_window:

-; 836 "inffast.S"

-	add  esi,eax

-	sub  esi,ecx

-

-

-	mov  eax, [esp+24]

-	cmp  eax,ecx

-	jbe  L_do_copy1

-

-	sub  eax,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,edx

-

-L_do_copy1:

-; 862 "inffast.S"

-	mov  ecx,eax

-	rep movsb

-

-	mov  esi, [esp+44]

-	jmp  L_while_test

-; 878 "inffast.S"

-ALIGN 4

-L_init_mmx:

-	emms

-

-

-

-

-

-	movd mm0,ebp

-	mov  ebp,ebx

-; 896 "inffast.S"

-	movd mm4,dword ptr [esp+0]

-	movq mm3,mm4

-	movd mm5,dword ptr [esp+4]

-	movq mm2,mm5

-	pxor mm1,mm1

-	mov  ebx, [esp+8]

-	jmp  L_do_loop_mmx

-

-ALIGN 4

-L_do_loop_mmx:

-	psrlq mm0,mm1

-

-	cmp  ebp,32

-	ja  L_get_length_code_mmx

-

-	movd mm6,ebp

-	movd mm7,dword ptr [esi]

-	add  esi,4

-	psllq mm7,mm6

-	add  ebp,32

-	por mm0,mm7

-

-L_get_length_code_mmx:

-	pand mm4,mm0

-	movd eax,mm4

-	movq mm4,mm3

-	mov  eax, [ebx+eax*4]

-

-L_dolen_mmx:

-	movzx  ecx,ah

-	movd mm1,ecx

-	sub  ebp,ecx

-

-	test  al,al

-	jnz L_test_for_length_base_mmx

-

-	shr  eax,16

-	stosb

-

-L_while_test_mmx:

-

-

-	cmp  [esp+16],edi

-	jbe L_break_loop

-

-	cmp  [esp+20],esi

-	ja L_do_loop_mmx

-	jmp L_break_loop

-

-L_test_for_length_base_mmx:

-

-	mov  edx,eax

-	shr  edx,16

-

-	test  al,16

-	jz  L_test_for_second_level_length_mmx

-	and  eax,15

-	jz L_decode_distance_mmx

-

-	psrlq mm0,mm1

-	movd mm1,eax

-	movd ecx,mm0

-	sub  ebp,eax

-	and  ecx, [inflate_fast_mask+eax*4]

-	add  edx,ecx

-

-L_decode_distance_mmx:

-	psrlq mm0,mm1

-

-	cmp  ebp,32

-	ja L_get_dist_code_mmx

-

-	movd mm6,ebp

-	movd mm7,dword ptr [esi]

-	add  esi,4

-	psllq mm7,mm6

-	add  ebp,32

-	por mm0,mm7

-

-L_get_dist_code_mmx:

-	mov  ebx, [esp+12]

-	pand mm5,mm0

-	movd eax,mm5

-	movq mm5,mm2

-	mov  eax, [ebx+eax*4]

-

-L_dodist_mmx:

-

-	movzx  ecx,ah

-	mov  ebx,eax

-	shr  ebx,16

-	sub  ebp,ecx

-	movd mm1,ecx

-

-	test  al,16

-	jz L_test_for_second_level_dist_mmx

-	and  eax,15

-	jz L_check_dist_one_mmx

-

-L_add_bits_to_dist_mmx:

-	psrlq mm0,mm1

-	movd mm1,eax

-	movd ecx,mm0

-	sub  ebp,eax

-	and  ecx, [inflate_fast_mask+eax*4]

-	add  ebx,ecx

-

-L_check_window_mmx:

-	mov  [esp+44],esi

-	mov  eax,edi

-	sub  eax, [esp+40]

-

-	cmp  eax,ebx

-	jb L_clip_window_mmx

-

-	mov  ecx,edx

-	mov  esi,edi

-	sub  esi,ebx

-

-	sub  ecx,3

-	mov  al, [esi]

-	mov  [edi],al

-	mov  al, [esi+1]

-	mov  dl, [esi+2]

-	add  esi,3

-	mov  [edi+1],al

-	mov  [edi+2],dl

-	add  edi,3

-	rep movsb

-

-	mov  esi, [esp+44]

-	mov  ebx, [esp+8]

-	jmp  L_while_test_mmx

-

-ALIGN 4

-L_check_dist_one_mmx:

-	cmp  ebx,1

-	jne  L_check_window_mmx

-	cmp  [esp+40],edi

-	je   L_check_window_mmx

-

-	dec  edi

-	mov  ecx,edx

-	mov  al, [edi]

-	sub  ecx,3

-

-	mov  [edi+1],al

-	mov  [edi+2],al

-	mov  [edi+3],al

-	add  edi,4

-	rep stosb

-

-	mov  ebx, [esp+8]

-	jmp  L_while_test_mmx

-

-ALIGN 4

-L_test_for_second_level_length_mmx:

-	test  al,64

-	jnz L_test_for_end_of_block

-

-	and  eax,15

-	psrlq mm0,mm1

-	movd ecx,mm0

-	and  ecx, [inflate_fast_mask+eax*4]

-	add  ecx,edx

-	mov  eax, [ebx+ecx*4]

-	jmp L_dolen_mmx

-

-ALIGN 4

-L_test_for_second_level_dist_mmx:

-	test  al,64

-	jnz L_invalid_distance_code

-

-	and  eax,15

-	psrlq mm0,mm1

-	movd ecx,mm0

-	and  ecx, [inflate_fast_mask+eax*4]

-	mov  eax, [esp+12]

-	add  ecx,ebx

-	mov  eax, [eax+ecx*4]

-	jmp  L_dodist_mmx

-

-ALIGN 4

-L_clip_window_mmx:

-

-	mov  ecx,eax

-	mov  eax, [esp+52]

-	neg  ecx

-	mov  esi, [esp+56]

-

-	cmp  eax,ebx

-	jb  L_invalid_distance_too_far

-

-	add  ecx,ebx

-	cmp  dword ptr [esp+48],0

-	jne  L_wrap_around_window_mmx

-

-	sub  eax,ecx

-	add  esi,eax

-

-	cmp  edx,ecx

-	jbe  L_do_copy1_mmx

-

-	sub  edx,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,ebx

-	jmp  L_do_copy1_mmx

-

-	cmp  edx,ecx

-	jbe  L_do_copy1_mmx

-

-	sub  edx,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,ebx

-	jmp  L_do_copy1_mmx

-

-L_wrap_around_window_mmx:

-

-	mov  eax, [esp+48]

-	cmp  ecx,eax

-	jbe  L_contiguous_in_window_mmx

-

-	add  esi, [esp+52]

-	add  esi,eax

-	sub  esi,ecx

-	sub  ecx,eax

-

-

-	cmp  edx,ecx

-	jbe  L_do_copy1_mmx

-

-	sub  edx,ecx

-	rep movsb

-	mov  esi, [esp+56]

-	mov  ecx, [esp+48]

-	cmp  edx,ecx

-	jbe  L_do_copy1_mmx

-

-	sub  edx,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,ebx

-	jmp  L_do_copy1_mmx

-

-L_contiguous_in_window_mmx:

-

-	add  esi,eax

-	sub  esi,ecx

-

-

-	cmp  edx,ecx

-	jbe  L_do_copy1_mmx

-

-	sub  edx,ecx

-	rep movsb

-	mov  esi,edi

-	sub  esi,ebx

-

-L_do_copy1_mmx:

-

-

-	mov  ecx,edx

-	rep movsb

-

-	mov  esi, [esp+44]

-	mov  ebx, [esp+8]

-	jmp  L_while_test_mmx

-; 1174 "inffast.S"

-L_invalid_distance_code:

-

-

-

-

-

-	mov  ecx, invalid_distance_code_msg

-	mov  edx,INFLATE_MODE_BAD

-	jmp  L_update_stream_state

-

-L_test_for_end_of_block:

-

-

-

-

-

-	test  al,32

-	jz  L_invalid_literal_length_code

-

-	mov  ecx,0

-	mov  edx,INFLATE_MODE_TYPE

-	jmp  L_update_stream_state

-

-L_invalid_literal_length_code:

-

-

-

-

-

-	mov  ecx, invalid_literal_length_code_msg

-	mov  edx,INFLATE_MODE_BAD

-	jmp  L_update_stream_state

-

-L_invalid_distance_too_far:

-

-

-

-	mov  esi, [esp+44]

-	mov  ecx, invalid_distance_too_far_msg

-	mov  edx,INFLATE_MODE_BAD

-	jmp  L_update_stream_state

-

-L_update_stream_state:

-

-	mov  eax, [esp+88]

-	test  ecx,ecx

-	jz  L_skip_msg

-	mov  [eax+24],ecx

-L_skip_msg:

-	mov  eax, [eax+28]

-	mov  [eax+mode_state],edx

-	jmp  L_break_loop

-

-ALIGN 4

-L_break_loop:

-; 1243 "inffast.S"

-	cmp  dword ptr [inflate_fast_use_mmx],2

-	jne  L_update_next_in

-

-

-

-	mov  ebx,ebp

-

-L_update_next_in:

-; 1266 "inffast.S"

-	mov  eax, [esp+88]

-	mov  ecx,ebx

-	mov  edx, [eax+28]

-	shr  ecx,3

-	sub  esi,ecx

-	shl  ecx,3

-	sub  ebx,ecx

-	mov  [eax+12],edi

-	mov  [edx+bits_state],ebx

-	mov  ecx,ebx

-

-	lea  ebx, [esp+28]

-	cmp  [esp+20],ebx

-	jne  L_buf_not_used

-

-	sub  esi,ebx

-	mov  ebx, [eax+0]

-	mov  [esp+20],ebx

-	add  esi,ebx

-	mov  ebx, [eax+4]

-	sub  ebx,11

-	add  [esp+20],ebx

-

-L_buf_not_used:

-	mov  [eax+0],esi

-

-	mov  ebx,1

-	shl  ebx,cl

-	dec  ebx

-

-

-

-

-

-	cmp  dword ptr [inflate_fast_use_mmx],2

-	jne  L_update_hold

-

-

-

-	psrlq mm0,mm1

-	movd ebp,mm0

-

-	emms

-

-L_update_hold:

-

-

-

-	and  ebp,ebx

-	mov  [edx+hold_state],ebp

-

-

-

-

-	mov  ebx, [esp+20]

-	cmp  ebx,esi

-	jbe  L_last_is_smaller

-

-	sub  ebx,esi

-	add  ebx,11

-	mov  [eax+4],ebx

-	jmp  L_fixup_out

-L_last_is_smaller:

-	sub  esi,ebx

-	neg  esi

-	add  esi,11

-	mov  [eax+4],esi

-

-

-

-

-L_fixup_out:

-

-	mov  ebx, [esp+16]

-	cmp  ebx,edi

-	jbe  L_end_is_smaller

-

-	sub  ebx,edi

-	add  ebx,257

-	mov  [eax+16],ebx

-	jmp  L_done

-L_end_is_smaller:

-	sub  edi,ebx

-	neg  edi

-	add  edi,257

-	mov  [eax+16],edi

-

-

-

-

-

-L_done:

-	add  esp,64

-	popfd

-	pop  ebx

-	pop  ebp

-	pop  esi

-	pop  edi

-	ret

-_inflate_fast endp

-

-_TEXT	ends

-end

crates/libz-sys/src/zlib/contrib/masmx86/match686.asm

diff --git a/crates/libz-sys/src/zlib/contrib/masmx86/match686.asm b/crates/libz-sys/src/zlib/contrib/masmx86/match686.asm
deleted file mode 100644
index 3b09212..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx86/match686.asm
+++ /dev/null
@@ -1,479 +0,0 @@
-; match686.asm -- Asm portion of the optimized longest_match for 32 bits x86

-; Copyright (C) 1995-1996 Jean-loup Gailly, Brian Raiter and Gilles Vollant.

-; File written by Gilles Vollant, by converting match686.S from Brian Raiter

-; for MASM. This is as assembly version of longest_match

-;  from Jean-loup Gailly in deflate.c

-;

-;         http://www.zlib.net

-;         http://www.winimage.com/zLibDll

-;         http://www.muppetlabs.com/~breadbox/software/assembly.html

-;

-; For Visual C++ 4.x and higher and ML 6.x and higher

-;   ml.exe is distributed in

-;  http://www.microsoft.com/downloads/details.aspx?FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64

-;

-; this file contain two implementation of longest_match

-;

-;  this longest_match was written by Brian raiter (1998), optimized for Pentium Pro

-;   (and the faster known version of match_init on modern Core 2 Duo and AMD Phenom)

-;

-;  for using an assembly version of longest_match, you need define ASMV in project

-;

-;    compile the asm file running

-;           ml /coff /Zi /c /Flmatch686.lst match686.asm

-;    and do not include match686.obj in your project

-;

-; note: contrib of zLib 1.2.3 and earlier contained both a deprecated version for

-;  Pentium (prior Pentium Pro) and this version for Pentium Pro and modern processor

-;  with autoselect (with cpu detection code)

-;  if you want support the old pentium optimization, you can still use these version

-;

-; this file is not optimized for old pentium, but it compatible with all x86 32 bits

-; processor (starting 80386)

-;

-;

-; see below : zlib1222add must be adjuster if you use a zlib version < 1.2.2.2

-

-;uInt longest_match(s, cur_match)

-;    deflate_state *s;

-;    IPos cur_match;                             /* current match */

-

-    NbStack         equ     76

-    cur_match       equ     dword ptr[esp+NbStack-0]

-    str_s           equ     dword ptr[esp+NbStack-4]

-; 5 dword on top (ret,ebp,esi,edi,ebx)

-    adrret          equ     dword ptr[esp+NbStack-8]

-    pushebp         equ     dword ptr[esp+NbStack-12]

-    pushedi         equ     dword ptr[esp+NbStack-16]

-    pushesi         equ     dword ptr[esp+NbStack-20]

-    pushebx         equ     dword ptr[esp+NbStack-24]

-

-    chain_length    equ     dword ptr [esp+NbStack-28]

-    limit           equ     dword ptr [esp+NbStack-32]

-    best_len        equ     dword ptr [esp+NbStack-36]

-    window          equ     dword ptr [esp+NbStack-40]

-    prev            equ     dword ptr [esp+NbStack-44]

-    scan_start      equ      word ptr [esp+NbStack-48]

-    wmask           equ     dword ptr [esp+NbStack-52]

-    match_start_ptr equ     dword ptr [esp+NbStack-56]

-    nice_match      equ     dword ptr [esp+NbStack-60]

-    scan            equ     dword ptr [esp+NbStack-64]

-

-    windowlen       equ     dword ptr [esp+NbStack-68]

-    match_start     equ     dword ptr [esp+NbStack-72]

-    strend          equ     dword ptr [esp+NbStack-76]

-    NbStackAdd      equ     (NbStack-24)

-

-    .386p

-

-    name    gvmatch

-    .MODEL  FLAT

-

-

-

-;  all the +zlib1222add offsets are due to the addition of fields

-;  in zlib in the deflate_state structure since the asm code was first written

-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").

-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

-

-    zlib1222add         equ     8

-

-;  Note : these value are good with a 8 bytes boundary pack structure

-    dep_chain_length    equ     74h+zlib1222add

-    dep_window          equ     30h+zlib1222add

-    dep_strstart        equ     64h+zlib1222add

-    dep_prev_length     equ     70h+zlib1222add

-    dep_nice_match      equ     88h+zlib1222add

-    dep_w_size          equ     24h+zlib1222add

-    dep_prev            equ     38h+zlib1222add

-    dep_w_mask          equ     2ch+zlib1222add

-    dep_good_match      equ     84h+zlib1222add

-    dep_match_start     equ     68h+zlib1222add

-    dep_lookahead       equ     6ch+zlib1222add

-

-

-_TEXT                   segment

-

-IFDEF NOUNDERLINE

-            public  longest_match

-            public  match_init

-ELSE

-            public  _longest_match

-            public  _match_init

-ENDIF

-

-    MAX_MATCH           equ     258

-    MIN_MATCH           equ     3

-    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)

-

-

-

-MAX_MATCH       equ     258

-MIN_MATCH       equ     3

-MIN_LOOKAHEAD   equ     (MAX_MATCH + MIN_MATCH + 1)

-MAX_MATCH_8_     equ     ((MAX_MATCH + 7) AND 0FFF0h)

-

-

-;;; stack frame offsets

-

-chainlenwmask   equ  esp + 0    ; high word: current chain len

-                    ; low word: s->wmask

-window      equ  esp + 4    ; local copy of s->window

-windowbestlen   equ  esp + 8    ; s->window + bestlen

-scanstart   equ  esp + 16   ; first two bytes of string

-scanend     equ  esp + 12   ; last two bytes of string

-scanalign   equ  esp + 20   ; dword-misalignment of string

-nicematch   equ  esp + 24   ; a good enough match size

-bestlen     equ  esp + 28   ; size of best match so far

-scan        equ  esp + 32   ; ptr to string wanting match

-

-LocalVarsSize   equ 36

-;   saved ebx   byte esp + 36

-;   saved edi   byte esp + 40

-;   saved esi   byte esp + 44

-;   saved ebp   byte esp + 48

-;   return address  byte esp + 52

-deflatestate    equ  esp + 56   ; the function arguments

-curmatch    equ  esp + 60

-

-;;; Offsets for fields in the deflate_state structure. These numbers

-;;; are calculated from the definition of deflate_state, with the

-;;; assumption that the compiler will dword-align the fields. (Thus,

-;;; changing the definition of deflate_state could easily cause this

-;;; program to crash horribly, without so much as a warning at

-;;; compile time. Sigh.)

-

-dsWSize     equ 36+zlib1222add

-dsWMask     equ 44+zlib1222add

-dsWindow    equ 48+zlib1222add

-dsPrev      equ 56+zlib1222add

-dsMatchLen  equ 88+zlib1222add

-dsPrevMatch equ 92+zlib1222add

-dsStrStart  equ 100+zlib1222add

-dsMatchStart    equ 104+zlib1222add

-dsLookahead equ 108+zlib1222add

-dsPrevLen   equ 112+zlib1222add

-dsMaxChainLen   equ 116+zlib1222add

-dsGoodMatch equ 132+zlib1222add

-dsNiceMatch equ 136+zlib1222add

-

-

-;;; match686.asm -- Pentium-Pro-optimized version of longest_match()

-;;; Written for zlib 1.1.2

-;;; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>

-;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html

-;;;

-;;

-;;  This software is provided 'as-is', without any express or implied

-;;  warranty.  In no event will the authors be held liable for any damages

-;;  arising from the use of this software.

-;;

-;;  Permission is granted to anyone to use this software for any purpose,

-;;  including commercial applications, and to alter it and redistribute it

-;;  freely, subject to the following restrictions:

-;;

-;;  1. The origin of this software must not be misrepresented; you must not

-;;     claim that you wrote the original software. If you use this software

-;;     in a product, an acknowledgment in the product documentation would be

-;;     appreciated but is not required.

-;;  2. Altered source versions must be plainly marked as such, and must not be

-;;     misrepresented as being the original software

-;;  3. This notice may not be removed or altered from any source distribution.

-;;

-

-;GLOBAL _longest_match, _match_init

-

-

-;SECTION    .text

-

-;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch)

-

-;_longest_match:

-    IFDEF NOUNDERLINE

-    longest_match       proc near

-    ELSE

-    _longest_match      proc near

-    ENDIF

-.FPO (9, 4, 0, 0, 1, 0)

-

-;;; Save registers that the compiler may be using, and adjust esp to

-;;; make room for our stack frame.

-

-        push    ebp

-        push    edi

-        push    esi

-        push    ebx

-        sub esp, LocalVarsSize

-

-;;; Retrieve the function arguments. ecx will hold cur_match

-;;; throughout the entire function. edx will hold the pointer to the

-;;; deflate_state structure during the function's setup (before

-;;; entering the main loop.

-

-        mov edx, [deflatestate]

-        mov ecx, [curmatch]

-

-;;; uInt wmask = s->w_mask;

-;;; unsigned chain_length = s->max_chain_length;

-;;; if (s->prev_length >= s->good_match) {

-;;;     chain_length >>= 2;

-;;; }

-

-        mov eax, [edx + dsPrevLen]

-        mov ebx, [edx + dsGoodMatch]

-        cmp eax, ebx

-        mov eax, [edx + dsWMask]

-        mov ebx, [edx + dsMaxChainLen]

-        jl  LastMatchGood

-        shr ebx, 2

-LastMatchGood:

-

-;;; chainlen is decremented once beforehand so that the function can

-;;; use the sign flag instead of the zero flag for the exit test.

-;;; It is then shifted into the high word, to make room for the wmask

-;;; value, which it will always accompany.

-

-        dec ebx

-        shl ebx, 16

-        or  ebx, eax

-        mov [chainlenwmask], ebx

-

-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

-

-        mov eax, [edx + dsNiceMatch]

-        mov ebx, [edx + dsLookahead]

-        cmp ebx, eax

-        jl  LookaheadLess

-        mov ebx, eax

-LookaheadLess:  mov [nicematch], ebx

-

-;;; register Bytef *scan = s->window + s->strstart;

-

-        mov esi, [edx + dsWindow]

-        mov [window], esi

-        mov ebp, [edx + dsStrStart]

-        lea edi, [esi + ebp]

-        mov [scan], edi

-

-;;; Determine how many bytes the scan ptr is off from being

-;;; dword-aligned.

-

-        mov eax, edi

-        neg eax

-        and eax, 3

-        mov [scanalign], eax

-

-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

-;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;

-

-        mov eax, [edx + dsWSize]

-        sub eax, MIN_LOOKAHEAD

-        sub ebp, eax

-        jg  LimitPositive

-        xor ebp, ebp

-LimitPositive:

-

-;;; int best_len = s->prev_length;

-

-        mov eax, [edx + dsPrevLen]

-        mov [bestlen], eax

-

-;;; Store the sum of s->window + best_len in esi locally, and in esi.

-

-        add esi, eax

-        mov [windowbestlen], esi

-

-;;; register ush scan_start = *(ushf*)scan;

-;;; register ush scan_end   = *(ushf*)(scan+best_len-1);

-;;; Posf *prev = s->prev;

-

-        movzx   ebx, word ptr [edi]

-        mov [scanstart], ebx

-        movzx   ebx, word ptr [edi + eax - 1]

-        mov [scanend], ebx

-        mov edi, [edx + dsPrev]

-

-;;; Jump into the main loop.

-

-        mov edx, [chainlenwmask]

-        jmp short LoopEntry

-

-align 4

-

-;;; do {

-;;;     match = s->window + cur_match;

-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||

-;;;         *(ushf*)match != scan_start) continue;

-;;;     [...]

-;;; } while ((cur_match = prev[cur_match & wmask]) > limit

-;;;          && --chain_length != 0);

-;;;

-;;; Here is the inner loop of the function. The function will spend the

-;;; majority of its time in this loop, and majority of that time will

-;;; be spent in the first ten instructions.

-;;;

-;;; Within this loop:

-;;; ebx = scanend

-;;; ecx = curmatch

-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)

-;;; esi = windowbestlen - i.e., (window + bestlen)

-;;; edi = prev

-;;; ebp = limit

-

-LookupLoop:

-        and ecx, edx

-        movzx   ecx, word ptr [edi + ecx*2]

-        cmp ecx, ebp

-        jbe LeaveNow

-        sub edx, 00010000h

-        js  LeaveNow

-LoopEntry:  movzx   eax, word ptr [esi + ecx - 1]

-        cmp eax, ebx

-        jnz LookupLoop

-        mov eax, [window]

-        movzx   eax, word ptr [eax + ecx]

-        cmp eax, [scanstart]

-        jnz LookupLoop

-

-;;; Store the current value of chainlen.

-

-        mov [chainlenwmask], edx

-

-;;; Point edi to the string under scrutiny, and esi to the string we

-;;; are hoping to match it up with. In actuality, esi and edi are

-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is

-;;; initialized to -(MAX_MATCH_8 - scanalign).

-

-        mov esi, [window]

-        mov edi, [scan]

-        add esi, ecx

-        mov eax, [scanalign]

-        mov edx, 0fffffef8h; -(MAX_MATCH_8)

-        lea edi, [edi + eax + 0108h] ;MAX_MATCH_8]

-        lea esi, [esi + eax + 0108h] ;MAX_MATCH_8]

-

-;;; Test the strings for equality, 8 bytes at a time. At the end,

-;;; adjust edx so that it is offset to the exact byte that mismatched.

-;;;

-;;; We already know at this point that the first three bytes of the

-;;; strings match each other, and they can be safely passed over before

-;;; starting the compare loop. So what this code does is skip over 0-3

-;;; bytes, as much as necessary in order to dword-align the edi

-;;; pointer. (esi will still be misaligned three times out of four.)

-;;;

-;;; It should be confessed that this loop usually does not represent

-;;; much of the total running time. Replacing it with a more

-;;; straightforward "rep cmpsb" would not drastically degrade

-;;; performance.

-

-LoopCmps:

-        mov eax, [esi + edx]

-        xor eax, [edi + edx]

-        jnz LeaveLoopCmps

-        mov eax, [esi + edx + 4]

-        xor eax, [edi + edx + 4]

-        jnz LeaveLoopCmps4

-        add edx, 8

-        jnz LoopCmps

-        jmp short LenMaximum

-LeaveLoopCmps4: add edx, 4

-LeaveLoopCmps:  test    eax, 0000FFFFh

-        jnz LenLower

-        add edx,  2

-        shr eax, 16

-LenLower:   sub al, 1

-        adc edx, 0

-

-;;; Calculate the length of the match. If it is longer than MAX_MATCH,

-;;; then automatically accept it as the best possible match and leave.

-

-        lea eax, [edi + edx]

-        mov edi, [scan]

-        sub eax, edi

-        cmp eax, MAX_MATCH

-        jge LenMaximum

-

-;;; If the length of the match is not longer than the best match we

-;;; have so far, then forget it and return to the lookup loop.

-

-        mov edx, [deflatestate]

-        mov ebx, [bestlen]

-        cmp eax, ebx

-        jg  LongerMatch

-        mov esi, [windowbestlen]

-        mov edi, [edx + dsPrev]

-        mov ebx, [scanend]

-        mov edx, [chainlenwmask]

-        jmp LookupLoop

-

-;;;         s->match_start = cur_match;

-;;;         best_len = len;

-;;;         if (len >= nice_match) break;

-;;;         scan_end = *(ushf*)(scan+best_len-1);

-

-LongerMatch:    mov ebx, [nicematch]

-        mov [bestlen], eax

-        mov [edx + dsMatchStart], ecx

-        cmp eax, ebx

-        jge LeaveNow

-        mov esi, [window]

-        add esi, eax

-        mov [windowbestlen], esi

-        movzx   ebx, word ptr [edi + eax - 1]

-        mov edi, [edx + dsPrev]

-        mov [scanend], ebx

-        mov edx, [chainlenwmask]

-        jmp LookupLoop

-

-;;; Accept the current string, with the maximum possible length.

-

-LenMaximum: mov edx, [deflatestate]

-        mov dword ptr [bestlen], MAX_MATCH

-        mov [edx + dsMatchStart], ecx

-

-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

-;;; return s->lookahead;

-

-LeaveNow:

-        mov edx, [deflatestate]

-        mov ebx, [bestlen]

-        mov eax, [edx + dsLookahead]

-        cmp ebx, eax

-        jg  LookaheadRet

-        mov eax, ebx

-LookaheadRet:

-

-;;; Restore the stack and return from whence we came.

-

-        add esp, LocalVarsSize

-        pop ebx

-        pop esi

-        pop edi

-        pop ebp

-

-        ret

-; please don't remove this string !

-; Your can freely use match686 in any free or commercial app if you don't remove the string in the binary!

-    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah

-

-

-    IFDEF NOUNDERLINE

-    longest_match       endp

-    ELSE

-    _longest_match      endp

-    ENDIF

-

-    IFDEF NOUNDERLINE

-    match_init      proc near

-                    ret

-    match_init      endp

-    ELSE

-    _match_init     proc near

-                    ret

-    _match_init     endp

-    ENDIF

-

-

-_TEXT   ends

-end

crates/libz-sys/src/zlib/contrib/masmx86/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/masmx86/readme.txt b/crates/libz-sys/src/zlib/contrib/masmx86/readme.txt
deleted file mode 100644
index 3271f72..0000000
--- a/crates/libz-sys/src/zlib/contrib/masmx86/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-

-Summary

--------

-This directory contains ASM implementations of the functions

-longest_match() and inflate_fast().

-

-

-Use instructions

-----------------

-Assemble using MASM, and copy the object files into the zlib source

-directory, then run the appropriate makefile, as suggested below.  You can

-donwload MASM from here:

-

-    http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64

-

-You can also get objects files here:

-

-    http://www.winimage.com/zLibDll/zlib124_masm_obj.zip

-

-Build instructions

-------------------

-* With Microsoft C and MASM:

-nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj"

-

-* With Borland C and TASM:

-make -f win32/Makefile.bor LOCAL_ZLIB="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj" OBJPA="+match686c.obj+match686.obj+inffas32.obj"

-

crates/libz-sys/src/zlib/contrib/minizip/Makefile

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/Makefile b/crates/libz-sys/src/zlib/contrib/minizip/Makefile
deleted file mode 100644
index 84eaad2..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-CC=cc
-CFLAGS=-O -I../..
-
-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
-ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
-
-.c.o:
-	$(CC) -c $(CFLAGS) $*.c
-
-all: miniunz minizip
-
-miniunz:  $(UNZ_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
-
-minizip:  $(ZIP_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
-
-test:	miniunz minizip
-	./minizip test readme.txt
-	./miniunz -l test.zip
-	mv readme.txt readme.old
-	./miniunz test.zip
-
-clean:
-	/bin/rm -f *.o *~ minizip miniunz

crates/libz-sys/src/zlib/contrib/minizip/Makefile.am

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/Makefile.am b/crates/libz-sys/src/zlib/contrib/minizip/Makefile.am
deleted file mode 100644
index d343011..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-lib_LTLIBRARIES = libminizip.la
-
-if COND_DEMOS
-bin_PROGRAMS = miniunzip minizip
-endif
-
-zlib_top_srcdir = $(top_srcdir)/../..
-zlib_top_builddir = $(top_builddir)/../..
-
-AM_CPPFLAGS = -I$(zlib_top_srcdir)
-AM_LDFLAGS = -L$(zlib_top_builddir)
-
-if WIN32
-iowin32_src = iowin32.c
-iowin32_h = iowin32.h
-endif
-
-libminizip_la_SOURCES = \
-	ioapi.c \
-	mztools.c \
-	unzip.c \
-	zip.c \
-	${iowin32_src}
-
-libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
-
-minizip_includedir = $(includedir)/minizip
-minizip_include_HEADERS = \
-	crypt.h \
-	ioapi.h \
-	mztools.h \
-	unzip.h \
-	zip.h \
-	${iowin32_h}
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = minizip.pc
-
-EXTRA_PROGRAMS = miniunzip minizip
-
-miniunzip_SOURCES = miniunz.c
-miniunzip_LDADD = libminizip.la
-
-minizip_SOURCES = minizip.c
-minizip_LDADD = libminizip.la -lz

crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_Changes.txt

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_Changes.txt b/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_Changes.txt
deleted file mode 100644
index 13a1bd9..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_Changes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-MiniZip 1.1 was derrived from MiniZip at version 1.01f
-
-Change in 1.0 (Okt 2009)
- - **TODO - Add history**
-

crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_info.txt

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_info.txt b/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_info.txt
deleted file mode 100644
index 57d7152..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/MiniZip64_info.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
-
-Introduction
----------------------
-MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
-
-When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
-All possible work was done for compatibility.
-
-
-Background
----------------------
-When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 
-support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
-
-That was used as a starting point. And after that ZIP64 support was added to zip.c
-some refactoring and code cleanup was also done.
-
-
-Changed from MiniZip 1.0 to MiniZip 1.1
----------------------------------------
-* Added ZIP64 support for unzip ( by Even Rouault )
-* Added ZIP64 support for zip ( by Mathias Svensson )
-* Reverted some changed that Even Rouault did.
-* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
-* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
-* Added BZIP Compress method for zip
-* Did some refactoring and code cleanup
-
-
-Credits
-
- Gilles Vollant    - Original MiniZip author
- Even Rouault      - ZIP64 unzip Support
- Daniel Borca      - BZip Compression method support in unzip
- Mathias Svensson  - ZIP64 zip support
- Mathias Svensson  - BZip Compression method support in zip
-
- Resources
-
- ZipLayout   http://result42.com/projects/ZipFileLayout
-             Command line tool for Windows that shows the layout and information of the headers in a zip archive.
-             Used when debugging and validating the creation of zip files using MiniZip64
-
-
- ZIP App Note  http://www.pkware.com/documents/casestudies/APPNOTE.TXT
-               Zip File specification
-
-
-Notes.
- * To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
-
-License
-----------------------------------------------------------
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-----------------------------------------------------------
-

crates/libz-sys/src/zlib/contrib/minizip/configure.ac

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/configure.ac b/crates/libz-sys/src/zlib/contrib/minizip/configure.ac
deleted file mode 100644
index 5b11970..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
-AC_CONFIG_SRCDIR([minizip.c])
-AM_INIT_AUTOMAKE([foreign])
-LT_INIT
-
-AC_MSG_CHECKING([whether to build example programs])
-AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs]))
-AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes])
-if test "$enable_demos" = yes
-then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no])
-fi
-
-case "${host}" in
-	*-mingw* | mingw*)
-		WIN32="yes"
-		;;
-	*)
-		;;
-esac
-AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
-
-
-AC_SUBST([HAVE_UNISTD_H], [0])
-AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
-AC_CONFIG_FILES([Makefile minizip.pc])
-AC_OUTPUT

crates/libz-sys/src/zlib/contrib/minizip/crypt.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/crypt.h b/crates/libz-sys/src/zlib/contrib/minizip/crypt.h
deleted file mode 100644
index 1e9e820..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/crypt.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(const char* passwd,      /* password string */
-                     unsigned char* buf,      /* where to write header */
-                     int bufSize,
-                     unsigned long* pkeys,
-                     const z_crc_t* pcrc_32_tab,
-                     unsigned long crcForCrypting)
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif

crates/libz-sys/src/zlib/contrib/minizip/ioapi.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/ioapi.c b/crates/libz-sys/src/zlib/contrib/minizip/ioapi.c
deleted file mode 100644
index 7f5c191..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/ioapi.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
-        #define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-#include "ioapi.h"
-
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
-{
-    if (pfilefunc->zfile_func64.zopen64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
-    else
-    {
-        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
-    }
-}
-
-long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
-{
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
-    else
-    {
-        uLong offsetTruncated = (uLong)offset;
-        if (offsetTruncated != offset)
-            return -1;
-        else
-            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
-    }
-}
-
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
-{
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
-    else
-    {
-        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
-        if ((tell_uLong) == MAXU32)
-            return (ZPOS64_T)-1;
-        else
-            return tell_uLong;
-    }
-}
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
-{
-    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
-    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
-    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
-    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
-    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
-    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
-    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
-    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
-}
-
-
-
-static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
-static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
-static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
-static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
-static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
-
-static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = FOPEN_FUNC((const char*)filename, mode_fopen);
-    return file;
-}
-
-
-static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
-{
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
-{
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
-{
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-
-static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
-{
-    ZPOS64_T ret;
-    ret = FTELLO_FUNC((FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
-        ret = -1;
-    return ret;
-}
-
-static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-
-    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
-                        ret = -1;
-
-    return ret;
-}
-
-
-static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
-{
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
-{
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
-    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}

crates/libz-sys/src/zlib/contrib/minizip/ioapi.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/ioapi.h b/crates/libz-sys/src/zlib/contrib/minizip/ioapi.h
deleted file mode 100644
index 8dcbdb0..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/ioapi.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-
-    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
-    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
-               More if/def section may be needed to support other platforms
-    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
-                          (but you should use iowin32.c for windows instead)
-
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-
-  // Linux needs this to support file operation on files larger then 4+GB
-  // But might need better if/def to select just the platforms that needs them.
-
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zlib.h"
-
-#if defined(USE_FILE32API)
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
-#else
-#ifdef __FreeBSD__
-#define fopen64 fopen
-#define ftello64 ftello
-#define fseeko64 fseeko
-#endif
-#ifdef _MSC_VER
- #define fopen64 fopen
- #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
-  #define ftello64 _ftelli64
-  #define fseeko64 _fseeki64
- #else // old MSC
-  #define ftello64 ftell
-  #define fseeko64 fseek
- #endif
-#endif
-#endif
-
-/*
-#ifndef ZPOS64_T
-  #ifdef _WIN32
-                #define ZPOS64_T fpos_t
-  #else
-    #include <stdint.h>
-    #define ZPOS64_T uint64_t
-  #endif
-#endif
-*/
-
-#ifdef HAVE_MINIZIP64_CONF_H
-#include "mz64conf.h"
-#endif
-
-/* a type choosen by DEFINE */
-#ifdef HAVE_64BIT_INT_CUSTOM
-typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
-#else
-#ifdef HAS_STDINT_H
-#include "stdint.h"
-typedef uint64_t ZPOS64_T;
-#else
-
-/* Maximum unsigned 32-bit value used as placeholder for zip64 */
-#define MAXU32 0xffffffff
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 ZPOS64_T;
-#else
-typedef unsigned long long int ZPOS64_T;
-#endif
-#endif
-#endif
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
- #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-   #define ZCALLBACK CALLBACK
- #else
-   #define ZCALLBACK
- #endif
-#endif
-
-
-
-
-typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
-typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
-typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-
-
-/* here is the "old" 32 bits structure structure */
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
-
-typedef struct zlib_filefunc64_def_s
-{
-    open64_file_func    zopen64_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell64_file_func    ztell64_file;
-    seek64_file_func    zseek64_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc64_def;
-
-void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
-    zlib_filefunc64_def zfile_func64;
-    open_file_func      zopen32_file;
-    tell_file_func      ztell32_file;
-    seek_file_func      zseek32_file;
-} zlib_filefunc64_32_def;
-
-
-#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
-#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
-#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
-
-voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
-long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
-
-void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
-
-#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
-#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
-#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

crates/libz-sys/src/zlib/contrib/minizip/iowin32.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/iowin32.c b/crates/libz-sys/src/zlib/contrib/minizip/iowin32.c
deleted file mode 100644
index 274f39e..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/iowin32.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/* iowin32.c -- IO base function header for compress/uncompress .zip
-     Version 1.1, February 14h, 2010
-     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-     For more info read MiniZip_info.txt
-
-*/
-
-#include <stdlib.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-#include "iowin32.h"
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
-#endif
-
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-
-
-// see Include/shared/winapifamily.h in the Windows Kit
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
-#define IOWIN32_USING_WINRT_API 1
-#endif
-#endif
-
-voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
-uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
-long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
-int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
-
-typedef struct
-{
-    HANDLE hf;
-    int error;
-} WIN32FILE_IOWIN;
-
-
-static void win32_translate_open_mode(int mode,
-                                      DWORD* lpdwDesiredAccess,
-                                      DWORD* lpdwCreationDisposition,
-                                      DWORD* lpdwShareMode,
-                                      DWORD* lpdwFlagsAndAttributes)
-{
-    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
-
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-    {
-        *lpdwDesiredAccess = GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-        *lpdwShareMode = FILE_SHARE_READ;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = CREATE_ALWAYS;
-    }
-}
-
-static voidpf win32_build_iowin(HANDLE hFile)
-{
-    voidpf ret=NULL;
-
-    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
-    {
-        WIN32FILE_IOWIN w32fiow;
-        w32fiow.hf = hFile;
-        w32fiow.error = 0;
-        ret = malloc(sizeof(WIN32FILE_IOWIN));
-
-        if (ret==NULL)
-            CloseHandle(hFile);
-        else
-            *((WIN32FILE_IOWIN*)ret) = w32fiow;
-    }
-    return ret;
-}
-
-voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#endif
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#endif
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-
-    if (hFile != NULL)
-    {
-        if (!ReadFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-
-uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-
-    if (hFile != NULL)
-    {
-        if (!WriteFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
-{
-#ifdef IOWIN32_USING_WINRT_API
-    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
-#else
-    LONG lHigh = pos.HighPart;
-    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod);
-    BOOL fOk = TRUE;
-    if (dwNewPos == 0xFFFFFFFF)
-        if (GetLastError() != NO_ERROR)
-            fOk = FALSE;
-    if ((newPos != NULL) && (fOk))
-    {
-        newPos->LowPart = dwNewPos;
-        newPos->HighPart = lHigh;
-    }
-    return fOk;
-#endif
-}
-
-long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
-{
-    long ret=-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = 0;
-
-        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=(long)pos.LowPart;
-    }
-    return ret;
-}
-
-ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
-{
-    ZPOS64_T ret= (ZPOS64_T)-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-
-    if (hFile)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = 0;
-
-        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = (ZPOS64_T)-1;
-        }
-        else
-            ret=pos.QuadPart;
-    }
-    return ret;
-}
-
-
-long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
-{
-    DWORD dwMoveMethod=0xFFFFFFFF;
-    HANDLE hFile = NULL;
-
-    long ret=-1;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        dwMoveMethod = FILE_CURRENT;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        dwMoveMethod = FILE_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        dwMoveMethod = FILE_BEGIN;
-        break;
-    default: return -1;
-    }
-
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = offset;
-        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
-{
-    DWORD dwMoveMethod=0xFFFFFFFF;
-    HANDLE hFile = NULL;
-    long ret=-1;
-
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR :
-            dwMoveMethod = FILE_CURRENT;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END :
-            dwMoveMethod = FILE_END;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET :
-            dwMoveMethod = FILE_BEGIN;
-            break;
-        default: return -1;
-    }
-
-    if (hFile)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = offset;
-        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
-{
-    int ret=-1;
-
-    if (stream!=NULL)
-    {
-        HANDLE hFile;
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-        if (hFile != NULL)
-        {
-            CloseHandle(hFile);
-            ret=0;
-        }
-        free(stream);
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
-{
-    int ret=-1;
-    if (stream!=NULL)
-    {
-        ret = ((WIN32FILE_IOWIN*)stream) -> error;
-    }
-    return ret;
-}
-
-void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen_file = win32_open_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
-    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-
-void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-
-void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}

crates/libz-sys/src/zlib/contrib/minizip/iowin32.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/iowin32.h b/crates/libz-sys/src/zlib/contrib/minizip/iowin32.h
deleted file mode 100644
index 0ca0969..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/iowin32.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* iowin32.h -- IO base function header for compress/uncompress .zip
-     Version 1.1, February 14h, 2010
-     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#include <windows.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
-
-#ifdef __cplusplus
-}
-#endif

crates/libz-sys/src/zlib/contrib/minizip/make_vms.com

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/make_vms.com b/crates/libz-sys/src/zlib/contrib/minizip/make_vms.com
deleted file mode 100644
index 9ac13a9..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/make_vms.com
+++ /dev/null
@@ -1,25 +0,0 @@
-$ if f$search("ioapi.h_orig") .eqs. "" then copy ioapi.h ioapi.h_orig
-$ open/write zdef vmsdefs.h
-$ copy sys$input: zdef
-$ deck
-#define unix
-#define fill_zlib_filefunc64_32_def_from_filefunc32 fillzffunc64from
-#define Write_Zip64EndOfCentralDirectoryLocator Write_Zip64EoDLocator
-#define Write_Zip64EndOfCentralDirectoryRecord Write_Zip64EoDRecord
-#define Write_EndOfCentralDirectoryRecord Write_EoDRecord
-$ eod
-$ close zdef
-$ copy vmsdefs.h,ioapi.h_orig ioapi.h
-$ cc/include=[--]/prefix=all ioapi.c
-$ cc/include=[--]/prefix=all miniunz.c
-$ cc/include=[--]/prefix=all unzip.c
-$ cc/include=[--]/prefix=all minizip.c
-$ cc/include=[--]/prefix=all zip.c
-$ link miniunz,unzip,ioapi,[--]libz.olb/lib
-$ link minizip,zip,ioapi,[--]libz.olb/lib
-$ mcr []minizip test minizip_info.txt
-$ mcr []miniunz -l test.zip
-$ rename minizip_info.txt; minizip_info.txt_old
-$ mcr []miniunz test.zip
-$ delete test.zip;*
-$exit

crates/libz-sys/src/zlib/contrib/minizip/miniunz.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/miniunz.c b/crates/libz-sys/src/zlib/contrib/minizip/miniunz.c
deleted file mode 100644
index 3d65401..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/miniunz.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
-   miniunz.c
-   Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-*/
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-#endif
-
-#ifdef __APPLE__
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef _WIN32
-# include <direct.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <utime.h>
-#endif
-
-
-#include "unzip.h"
-
-#define CASESENSITIVITY (0)
-#define WRITEBUFFERSIZE (8192)
-#define MAXFILENAME (256)
-
-#ifdef _WIN32
-#define USEWIN32IOAPI
-#include "iowin32.h"
-#endif
-/*
-  mini unzip, demo of unzip package
-
-  usage :
-  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
-
-  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
-    if it exists
-*/
-
-
-/* change_file_date : change the date/time of a file
-    filename : the filename of the file where date/time must be modified
-    dosdate : the new date at the MSDos format (4 bytes)
-    tmu_date : the SAME new date at the tm_unz format */
-void change_file_date(filename,dosdate,tmu_date)
-    const char *filename;
-    uLong dosdate;
-    tm_unz tmu_date;
-{
-#ifdef _WIN32
-  HANDLE hFile;
-  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
-
-  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
-                      0,NULL,OPEN_EXISTING,0,NULL);
-  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
-  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
-  LocalFileTimeToFileTime(&ftLocal,&ftm);
-  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
-  CloseHandle(hFile);
-#else
-#ifdef unix || __APPLE__
-  struct utimbuf ut;
-  struct tm newdate;
-  newdate.tm_sec = tmu_date.tm_sec;
-  newdate.tm_min=tmu_date.tm_min;
-  newdate.tm_hour=tmu_date.tm_hour;
-  newdate.tm_mday=tmu_date.tm_mday;
-  newdate.tm_mon=tmu_date.tm_mon;
-  if (tmu_date.tm_year > 1900)
-      newdate.tm_year=tmu_date.tm_year - 1900;
-  else
-      newdate.tm_year=tmu_date.tm_year ;
-  newdate.tm_isdst=-1;
-
-  ut.actime=ut.modtime=mktime(&newdate);
-  utime(filename,&ut);
-#endif
-#endif
-}
-
-
-/* mymkdir and change_file_date are not 100 % portable
-   As I don't know well Unix, I wait feedback for the unix portion */
-
-int mymkdir(dirname)
-    const char* dirname;
-{
-    int ret=0;
-#ifdef _WIN32
-    ret = _mkdir(dirname);
-#elif unix
-    ret = mkdir (dirname,0775);
-#elif __APPLE__
-    ret = mkdir (dirname,0775);
-#endif
-    return ret;
-}
-
-int makedir (newdir)
-    char *newdir;
-{
-  char *buffer ;
-  char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
-    return 0;
-
-  buffer = (char*)malloc(len+1);
-        if (buffer==NULL)
-        {
-                printf("Error allocating memory\n");
-                return UNZ_INTERNALERROR;
-        }
-  strcpy(buffer,newdir);
-
-  if (buffer[len-1] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mymkdir(buffer) == 0)
-    {
-      free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
-        {
-          printf("couldn't create directory %s\n",buffer);
-          free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  free(buffer);
-  return 1;
-}
-
-void do_banner()
-{
-    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
-}
-
-void do_help()
-{
-    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
-           "  -e  Extract without pathname (junk paths)\n" \
-           "  -x  Extract with pathname\n" \
-           "  -v  list files\n" \
-           "  -l  list files\n" \
-           "  -d  directory to extract into\n" \
-           "  -o  overwrite files without prompting\n" \
-           "  -p  extract crypted file using password\n\n");
-}
-
-void Display64BitsSize(ZPOS64_T n, int size_char)
-{
-  /* to avoid compatibility problem , we do here the conversion */
-  char number[21];
-  int offset=19;
-  int pos_string = 19;
-  number[20]=0;
-  for (;;) {
-      number[offset]=(char)((n%10)+'0');
-      if (number[offset] != '0')
-          pos_string=offset;
-      n/=10;
-      if (offset==0)
-          break;
-      offset--;
-  }
-  {
-      int size_display_string = 19-pos_string;
-      while (size_char > size_display_string)
-      {
-          size_char--;
-          printf(" ");
-      }
-  }
-
-  printf("%s",&number[pos_string]);
-}
-
-int do_list(uf)
-    unzFile uf;
-{
-    uLong i;
-    unz_global_info64 gi;
-    int err;
-
-    err = unzGetGlobalInfo64(uf,&gi);
-    if (err!=UNZ_OK)
-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
-    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
-    for (i=0;i<gi.number_entry;i++)
-    {
-        char filename_inzip[256];
-        unz_file_info64 file_info;
-        uLong ratio=0;
-        const char *string_method;
-        char charCrypt=' ';
-        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-        if (err!=UNZ_OK)
-        {
-            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
-            break;
-        }
-        if (file_info.uncompressed_size>0)
-            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
-
-        /* display a '*' if the file is crypted */
-        if ((file_info.flag & 1) != 0)
-            charCrypt='*';
-
-        if (file_info.compression_method==0)
-            string_method="Stored";
-        else
-        if (file_info.compression_method==Z_DEFLATED)
-        {
-            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
-            if (iLevel==0)
-              string_method="Defl:N";
-            else if (iLevel==1)
-              string_method="Defl:X";
-            else if ((iLevel==2) || (iLevel==3))
-              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
-        }
-        else
-        if (file_info.compression_method==Z_BZIP2ED)
-        {
-              string_method="BZip2 ";
-        }
-        else
-            string_method="Unkn. ";
-
-        Display64BitsSize(file_info.uncompressed_size,7);
-        printf("  %6s%c",string_method,charCrypt);
-        Display64BitsSize(file_info.compressed_size,7);
-        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
-                ratio,
-                (uLong)file_info.tmu_date.tm_mon + 1,
-                (uLong)file_info.tmu_date.tm_mday,
-                (uLong)file_info.tmu_date.tm_year % 100,
-                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
-                (uLong)file_info.crc,filename_inzip);
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
-    unzFile uf;
-    const int* popt_extract_without_path;
-    int* popt_overwrite;
-    const char* password;
-{
-    char filename_inzip[256];
-    char* filename_withoutpath;
-    char* p;
-    int err=UNZ_OK;
-    FILE *fout=NULL;
-    void* buf;
-    uInt size_buf;
-
-    unz_file_info64 file_info;
-    uLong ratio=0;
-    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-
-    if (err!=UNZ_OK)
-    {
-        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
-        return err;
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return UNZ_INTERNALERROR;
-    }
-
-    p = filename_withoutpath = filename_inzip;
-    while ((*p) != '\0')
-    {
-        if (((*p)=='/') || ((*p)=='\\'))
-            filename_withoutpath = p+1;
-        p++;
-    }
-
-    if ((*filename_withoutpath)=='\0')
-    {
-        if ((*popt_extract_without_path)==0)
-        {
-            printf("creating directory: %s\n",filename_inzip);
-            mymkdir(filename_inzip);
-        }
-    }
-    else
-    {
-        const char* write_filename;
-        int skip=0;
-
-        if ((*popt_extract_without_path)==0)
-            write_filename = filename_inzip;
-        else
-            write_filename = filename_withoutpath;
-
-        err = unzOpenCurrentFilePassword(uf,password);
-        if (err!=UNZ_OK)
-        {
-            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
-        }
-
-        if (((*popt_overwrite)==0) && (err==UNZ_OK))
-        {
-            char rep=0;
-            FILE* ftestexist;
-            ftestexist = FOPEN_FUNC(write_filename,"rb");
-            if (ftestexist!=NULL)
-            {
-                fclose(ftestexist);
-                do
-                {
-                    char answer[128];
-                    int ret;
-
-                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
-                    ret = scanf("%1s",answer);
-                    if (ret != 1)
-                    {
-                       exit(EXIT_FAILURE);
-                    }
-                    rep = answer[0] ;
-                    if ((rep>='a') && (rep<='z'))
-                        rep -= 0x20;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-            }
-
-            if (rep == 'N')
-                skip = 1;
-
-            if (rep == 'A')
-                *popt_overwrite=1;
-        }
-
-        if ((skip==0) && (err==UNZ_OK))
-        {
-            fout=FOPEN_FUNC(write_filename,"wb");
-            /* some zipfile don't contain directory alone before file */
-            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
-                                (filename_withoutpath!=(char*)filename_inzip))
-            {
-                char c=*(filename_withoutpath-1);
-                *(filename_withoutpath-1)='\0';
-                makedir(write_filename);
-                *(filename_withoutpath-1)=c;
-                fout=FOPEN_FUNC(write_filename,"wb");
-            }
-
-            if (fout==NULL)
-            {
-                printf("error opening %s\n",write_filename);
-            }
-        }
-
-        if (fout!=NULL)
-        {
-            printf(" extracting: %s\n",write_filename);
-
-            do
-            {
-                err = unzReadCurrentFile(uf,buf,size_buf);
-                if (err<0)
-                {
-                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
-                    break;
-                }
-                if (err>0)
-                    if (fwrite(buf,err,1,fout)!=1)
-                    {
-                        printf("error in writing extracted file\n");
-                        err=UNZ_ERRNO;
-                        break;
-                    }
-            }
-            while (err>0);
-            if (fout)
-                    fclose(fout);
-
-            if (err==0)
-                change_file_date(write_filename,file_info.dosDate,
-                                 file_info.tmu_date);
-        }
-
-        if (err==UNZ_OK)
-        {
-            err = unzCloseCurrentFile (uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
-            }
-        }
-        else
-            unzCloseCurrentFile(uf); /* don't lose the error */
-    }
-
-    free(buf);
-    return err;
-}
-
-
-int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    uLong i;
-    unz_global_info64 gi;
-    int err;
-    FILE* fout=NULL;
-
-    err = unzGetGlobalInfo64(uf,&gi);
-    if (err!=UNZ_OK)
-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-
-    for (i=0;i<gi.number_entry;i++)
-    {
-        if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) != UNZ_OK)
-            break;
-
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    const char* filename;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    int err = UNZ_OK;
-    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
-    {
-        printf("file %s not found in the zipfile\n",filename);
-        return 2;
-    }
-
-    if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) == UNZ_OK)
-        return 0;
-    else
-        return 1;
-}
-
-
-int main(argc,argv)
-    int argc;
-    char *argv[];
-{
-    const char *zipfilename=NULL;
-    const char *filename_to_extract=NULL;
-    const char *password=NULL;
-    char filename_try[MAXFILENAME+16] = "";
-    int i;
-    int ret_value=0;
-    int opt_do_list=0;
-    int opt_do_extract=1;
-    int opt_do_extract_withoutpath=0;
-    int opt_overwrite=0;
-    int opt_extractdir=0;
-    const char *dirname=NULL;
-    unzFile uf=NULL;
-
-    do_banner();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='l') || (c=='L'))
-                        opt_do_list = 1;
-                    if ((c=='v') || (c=='V'))
-                        opt_do_list = 1;
-                    if ((c=='x') || (c=='X'))
-                        opt_do_extract = 1;
-                    if ((c=='e') || (c=='E'))
-                        opt_do_extract = opt_do_extract_withoutpath = 1;
-                    if ((c=='o') || (c=='O'))
-                        opt_overwrite=1;
-                    if ((c=='d') || (c=='D'))
-                    {
-                        opt_extractdir=1;
-                        dirname=argv[i+1];
-                    }
-
-                    if (((c=='p') || (c=='P')) && (i+1<argc))
-                    {
-                        password=argv[i+1];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilename == NULL)
-                    zipfilename = argv[i];
-                else if ((filename_to_extract==NULL) && (!opt_extractdir))
-                        filename_to_extract = argv[i] ;
-            }
-        }
-    }
-
-    if (zipfilename!=NULL)
-    {
-
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-#        endif
-
-        strncpy(filename_try, zipfilename,MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-#        ifdef USEWIN32IOAPI
-        fill_win32_filefunc64A(&ffunc);
-        uf = unzOpen2_64(zipfilename,&ffunc);
-#        else
-        uf = unzOpen64(zipfilename);
-#        endif
-        if (uf==NULL)
-        {
-            strcat(filename_try,".zip");
-#            ifdef USEWIN32IOAPI
-            uf = unzOpen2_64(filename_try,&ffunc);
-#            else
-            uf = unzOpen64(filename_try);
-#            endif
-        }
-    }
-
-    if (uf==NULL)
-    {
-        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
-        return 1;
-    }
-    printf("%s opened\n",filename_try);
-
-    if (opt_do_list==1)
-        ret_value = do_list(uf);
-    else if (opt_do_extract==1)
-    {
-#ifdef _WIN32
-        if (opt_extractdir && _chdir(dirname))
-#else
-        if (opt_extractdir && chdir(dirname))
-#endif
-        {
-          printf("Error changing into %s, aborting\n", dirname);
-          exit(-1);
-        }
-
-        if (filename_to_extract == NULL)
-            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
-        else
-            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
-    }
-
-    unzClose(uf);
-
-    return ret_value;
-}

crates/libz-sys/src/zlib/contrib/minizip/miniunzip.1

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/miniunzip.1 b/crates/libz-sys/src/zlib/contrib/minizip/miniunzip.1
deleted file mode 100644
index 111ac69..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/miniunzip.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH miniunzip 1 "Nov 7, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-miniunzip - uncompress and examine ZIP archives
-.SH SYNOPSIS
-.B miniunzip
-.RI [ -exvlo ]
-zipfile [ files_to_extract ] [-d tempdir]
-.SH DESCRIPTION
-.B minizip
-is a simple tool which allows the extraction of compressed file
-archives in the ZIP format used by the MS-DOS utility PKZIP.  It was
-written as a demonstration of the
-.IR zlib (3)
-library and therefore lack many of the features of the
-.IR unzip (1)
-program.
-.SH OPTIONS
-A number of options are supported.  With the exception of
-.BI \-d\  tempdir
-these must be supplied before any
-other arguments and are:
-.TP
-.BI \-l\ ,\ \-\-v
-List the files in the archive without extracting them.
-.TP
-.B \-o
-Overwrite files without prompting for confirmation.
-.TP
-.B \-x
-Extract files (default).
-.PP
-The
-.I zipfile
-argument is the name of the archive to process. The next argument can be used
-to specify a single file to extract from the archive.
-
-Lastly, the following option can be specified at the end of the command-line:
-.TP
-.BI \-d\  tempdir
-Extract the archive in the directory
-.I tempdir
-rather than the current directory.
-.SH SEE ALSO
-.BR minizip (1),
-.BR zlib (3),
-.BR unzip (1).
-.SH AUTHOR
-This program was written by Gilles Vollant.  This manual page was
-written by Mark Brown <broonie@sirena.org.uk>. The -d tempdir option
-was added by Dirk Eddelbuettel <edd@debian.org>.

crates/libz-sys/src/zlib/contrib/minizip/minizip.1

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/minizip.1 b/crates/libz-sys/src/zlib/contrib/minizip/minizip.1
deleted file mode 100644
index 1154484..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/minizip.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH minizip 1 "May 2, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-minizip - create ZIP archives
-.SH SYNOPSIS
-.B minizip
-.RI [ -o ]
-zipfile [ " files" ... ]
-.SH DESCRIPTION
-.B minizip
-is a simple tool which allows the creation of compressed file archives
-in the ZIP format used by the MS-DOS utility PKZIP.  It was written as
-a demonstration of the
-.IR zlib (3)
-library and therefore lack many of the features of the
-.IR zip (1)
-program.
-.SH OPTIONS
-The first argument supplied is the name of the ZIP archive to create or
-.RI -o
-in which case it is ignored and the second argument treated as the
-name of the ZIP file.  If the ZIP file already exists it will be
-overwritten.
-.PP
-Subsequent arguments specify a list of files to place in the ZIP
-archive.  If none are specified then an empty archive will be created.
-.SH SEE ALSO
-.BR miniunzip (1),
-.BR zlib (3),
-.BR zip (1).
-.SH AUTHOR
-This program was written by Gilles Vollant.  This manual page was
-written by Mark Brown <broonie@sirena.org.uk>.
-

crates/libz-sys/src/zlib/contrib/minizip/minizip.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/minizip.c b/crates/libz-sys/src/zlib/contrib/minizip/minizip.c
deleted file mode 100644
index 4288962..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/minizip.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
-   minizip.c
-   Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-*/
-
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-#endif
-
-#ifdef __APPLE__
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef _WIN32
-# include <direct.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <utime.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif
-
-#include "zip.h"
-
-#ifdef _WIN32
-        #define USEWIN32IOAPI
-        #include "iowin32.h"
-#endif
-
-
-
-#define WRITEBUFFERSIZE (16384)
-#define MAXFILENAME (256)
-
-#ifdef _WIN32
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-  int ret = 0;
-  {
-      FILETIME ftLocal;
-      HANDLE hFind;
-      WIN32_FIND_DATAA ff32;
-
-      hFind = FindFirstFileA(f,&ff32);
-      if (hFind != INVALID_HANDLE_VALUE)
-      {
-        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
-        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
-        FindClose(hFind);
-        ret = 1;
-      }
-  }
-  return ret;
-}
-#else
-#ifdef unix || __APPLE__
-uLong filetime(f, tmzip, dt)
-    char *f;               /* name of file to get info on */
-    tm_zip *tmzip;         /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-  int ret=0;
-  struct stat s;        /* results of stat() */
-  struct tm* filedate;
-  time_t tm_t=0;
-
-  if (strcmp(f,"-")!=0)
-  {
-    char name[MAXFILENAME+1];
-    int len = strlen(f);
-    if (len > MAXFILENAME)
-      len = MAXFILENAME;
-
-    strncpy(name, f,MAXFILENAME-1);
-    /* strncpy doesnt append the trailing NULL, of the string is too long. */
-    name[ MAXFILENAME ] = '\0';
-
-    if (name[len - 1] == '/')
-      name[len - 1] = '\0';
-    /* not all systems allow stat'ing a file with / appended */
-    if (stat(name,&s)==0)
-    {
-      tm_t = s.st_mtime;
-      ret = 1;
-    }
-  }
-  filedate = localtime(&tm_t);
-
-  tmzip->tm_sec  = filedate->tm_sec;
-  tmzip->tm_min  = filedate->tm_min;
-  tmzip->tm_hour = filedate->tm_hour;
-  tmzip->tm_mday = filedate->tm_mday;
-  tmzip->tm_mon  = filedate->tm_mon ;
-  tmzip->tm_year = filedate->tm_year;
-
-  return ret;
-}
-#else
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-    return 0;
-}
-#endif
-#endif
-
-
-
-
-int check_exist_file(filename)
-    const char* filename;
-{
-    FILE* ftestexist;
-    int ret = 1;
-    ftestexist = FOPEN_FUNC(filename,"rb");
-    if (ftestexist==NULL)
-        ret = 0;
-    else
-        fclose(ftestexist);
-    return ret;
-}
-
-void do_banner()
-{
-    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
-    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
-}
-
-void do_help()
-{
-    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
-           "  -o  Overwrite existing file.zip\n" \
-           "  -a  Append to existing file.zip\n" \
-           "  -0  Store only\n" \
-           "  -1  Compress faster\n" \
-           "  -9  Compress better\n\n" \
-           "  -j  exclude path. store only the file name.\n\n");
-}
-
-/* calculate the CRC32 of a file,
-   because to encrypt a file, we need known the CRC32 of the file before */
-int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
-{
-   unsigned long calculate_crc=0;
-   int err=ZIP_OK;
-   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
-
-   unsigned long size_read = 0;
-   unsigned long total_read = 0;
-   if (fin==NULL)
-   {
-       err = ZIP_ERRNO;
-   }
-
-    if (err == ZIP_OK)
-        do
-        {
-            err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
-            if (size_read < size_buf)
-                if (feof(fin)==0)
-            {
-                printf("error in reading %s\n",filenameinzip);
-                err = ZIP_ERRNO;
-            }
-
-            if (size_read>0)
-                calculate_crc = crc32(calculate_crc,buf,size_read);
-            total_read += size_read;
-
-        } while ((err == ZIP_OK) && (size_read>0));
-
-    if (fin)
-        fclose(fin);
-
-    *result_crc=calculate_crc;
-    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
-    return err;
-}
-
-int isLargeFile(const char* filename)
-{
-  int largeFile = 0;
-  ZPOS64_T pos = 0;
-  FILE* pFile = FOPEN_FUNC(filename, "rb");
-
-  if(pFile != NULL)
-  {
-    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
-    pos = FTELLO_FUNC(pFile);
-
-                printf("File : %s is %lld bytes\n", filename, pos);
-
-    if(pos >= 0xffffffff)
-     largeFile = 1;
-
-                fclose(pFile);
-  }
-
- return largeFile;
-}
-
-int main(argc,argv)
-    int argc;
-    char *argv[];
-{
-    int i;
-    int opt_overwrite=0;
-    int opt_compress_level=Z_DEFAULT_COMPRESSION;
-    int opt_exclude_path=0;
-    int zipfilenamearg = 0;
-    char filename_try[MAXFILENAME+16];
-    int zipok;
-    int err=0;
-    int size_buf=0;
-    void* buf=NULL;
-    const char* password=NULL;
-
-
-    do_banner();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='o') || (c=='O'))
-                        opt_overwrite = 1;
-                    if ((c=='a') || (c=='A'))
-                        opt_overwrite = 2;
-                    if ((c>='0') && (c<='9'))
-                        opt_compress_level = c-'0';
-                    if ((c=='j') || (c=='J'))
-                        opt_exclude_path = 1;
-
-                    if (((c=='p') || (c=='P')) && (i+1<argc))
-                    {
-                        password=argv[i+1];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilenamearg == 0)
-                {
-                    zipfilenamearg = i ;
-                }
-            }
-        }
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return ZIP_INTERNALERROR;
-    }
-
-    if (zipfilenamearg==0)
-    {
-        zipok=0;
-    }
-    else
-    {
-        int i,len;
-        int dot_found=0;
-
-        zipok = 1 ;
-        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-        len=(int)strlen(filename_try);
-        for (i=0;i<len;i++)
-            if (filename_try[i]=='.')
-                dot_found=1;
-
-        if (dot_found==0)
-            strcat(filename_try,".zip");
-
-        if (opt_overwrite==2)
-        {
-            /* if the file don't exist, we not append file */
-            if (check_exist_file(filename_try)==0)
-                opt_overwrite=1;
-        }
-        else
-        if (opt_overwrite==0)
-            if (check_exist_file(filename_try)!=0)
-            {
-                char rep=0;
-                do
-                {
-                    char answer[128];
-                    int ret;
-                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
-                    ret = scanf("%1s",answer);
-                    if (ret != 1)
-                    {
-                       exit(EXIT_FAILURE);
-                    }
-                    rep = answer[0] ;
-                    if ((rep>='a') && (rep<='z'))
-                        rep -= 0x20;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-                if (rep=='N')
-                    zipok = 0;
-                if (rep=='A')
-                    opt_overwrite = 2;
-            }
-    }
-
-    if (zipok==1)
-    {
-        zipFile zf;
-        int errclose;
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-        fill_win32_filefunc64A(&ffunc);
-        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
-#        else
-        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
-#        endif
-
-        if (zf == NULL)
-        {
-            printf("error opening %s\n",filename_try);
-            err= ZIP_ERRNO;
-        }
-        else
-            printf("creating %s\n",filename_try);
-
-        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
-        {
-            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
-                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
-                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
-                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
-                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
-                  (strlen(argv[i]) == 2)))
-            {
-                FILE * fin;
-                int size_read;
-                const char* filenameinzip = argv[i];
-                const char *savefilenameinzip;
-                zip_fileinfo zi;
-                unsigned long crcFile=0;
-                int zip64 = 0;
-
-                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
-                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
-                zi.dosDate = 0;
-                zi.internal_fa = 0;
-                zi.external_fa = 0;
-                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
-
-/*
-                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
-                                 NULL,0,NULL,0,NULL / * comment * /,
-                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                                 opt_compress_level);
-*/
-                if ((password != NULL) && (err==ZIP_OK))
-                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
-
-                zip64 = isLargeFile(filenameinzip);
-
-                                                         /* The path name saved, should not include a leading slash. */
-               /*if it did, windows/xp and dynazip couldn't read the zip file. */
-                 savefilenameinzip = filenameinzip;
-                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
-                 {
-                     savefilenameinzip++;
-                 }
-
-                 /*should the zip file contain any path at all?*/
-                 if( opt_exclude_path )
-                 {
-                     const char *tmpptr;
-                     const char *lastslash = 0;
-                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
-                     {
-                         if( *tmpptr == '\\' || *tmpptr == '/')
-                         {
-                             lastslash = tmpptr;
-                         }
-                     }
-                     if( lastslash != NULL )
-                     {
-                         savefilenameinzip = lastslash+1; // base filename follows last slash.
-                     }
-                 }
-
-                 /**/
-                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
-                                 NULL,0,NULL,0,NULL /* comment*/,
-                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                                 opt_compress_level,0,
-                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 password,crcFile, zip64);
-
-                if (err != ZIP_OK)
-                    printf("error in opening %s in zipfile\n",filenameinzip);
-                else
-                {
-                    fin = FOPEN_FUNC(filenameinzip,"rb");
-                    if (fin==NULL)
-                    {
-                        err=ZIP_ERRNO;
-                        printf("error in opening %s for reading\n",filenameinzip);
-                    }
-                }
-
-                if (err == ZIP_OK)
-                    do
-                    {
-                        err = ZIP_OK;
-                        size_read = (int)fread(buf,1,size_buf,fin);
-                        if (size_read < size_buf)
-                            if (feof(fin)==0)
-                        {
-                            printf("error in reading %s\n",filenameinzip);
-                            err = ZIP_ERRNO;
-                        }
-
-                        if (size_read>0)
-                        {
-                            err = zipWriteInFileInZip (zf,buf,size_read);
-                            if (err<0)
-                            {
-                                printf("error in writing %s in the zipfile\n",
-                                                 filenameinzip);
-                            }
-
-                        }
-                    } while ((err == ZIP_OK) && (size_read>0));
-
-                if (fin)
-                    fclose(fin);
-
-                if (err<0)
-                    err=ZIP_ERRNO;
-                else
-                {
-                    err = zipCloseFileInZip(zf);
-                    if (err!=ZIP_OK)
-                        printf("error in closing %s in the zipfile\n",
-                                    filenameinzip);
-                }
-            }
-        }
-        errclose = zipClose(zf,NULL);
-        if (errclose != ZIP_OK)
-            printf("error in closing %s\n",filename_try);
-    }
-    else
-    {
-       do_help();
-    }
-
-    free(buf);
-    return 0;
-}

crates/libz-sys/src/zlib/contrib/minizip/minizip.pc.in

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/minizip.pc.in b/crates/libz-sys/src/zlib/contrib/minizip/minizip.pc.in
deleted file mode 100644
index 69b5b7f..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/minizip.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/minizip
-
-Name: minizip
-Description: Minizip zip file manipulation library
-Requires:
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lminizip
-Libs.private: -lz
-Cflags: -I${includedir}

crates/libz-sys/src/zlib/contrib/minizip/mztools.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/mztools.c b/crates/libz-sys/src/zlib/contrib/minizip/mztools.c
deleted file mode 100644
index 96891c2..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/mztools.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-/* Code */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#define READ_8(adr)  ((unsigned char)*(adr))
-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
-
-#define WRITE_8(buff, n) do { \
-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
-} while(0)
-#define WRITE_16(buff, n) do { \
-  WRITE_8((unsigned char*)(buff), n); \
-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
-} while(0)
-#define WRITE_32(buff, n) do { \
-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
-} while(0)
-
-extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
-const char* file;
-const char* fileOut;
-const char* fileOutTmp;
-uLong* nRecovered;
-uLong* bytesRecovered;
-{
-  int err = Z_OK;
-  FILE* fpZip = fopen(file, "rb");
-  FILE* fpOut = fopen(fileOut, "wb");
-  FILE* fpOutCD = fopen(fileOutTmp, "wb");
-  if (fpZip != NULL &&  fpOut != NULL) {
-    int entries = 0;
-    uLong totalBytes = 0;
-    char header[30];
-    char filename[1024];
-    char extra[1024];
-    int offset = 0;
-    int offsetCD = 0;
-    while ( fread(header, 1, 30, fpZip) == 30 ) {
-      int currentOffset = offset;
-
-      /* File entry */
-      if (READ_32(header) == 0x04034b50) {
-        unsigned int version = READ_16(header + 4);
-        unsigned int gpflag = READ_16(header + 6);
-        unsigned int method = READ_16(header + 8);
-        unsigned int filetime = READ_16(header + 10);
-        unsigned int filedate = READ_16(header + 12);
-        unsigned int crc = READ_32(header + 14); /* crc */
-        unsigned int cpsize = READ_32(header + 18); /* compressed size */
-        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
-        unsigned int fnsize = READ_16(header + 26); /* file name length */
-        unsigned int extsize = READ_16(header + 28); /* extra field length */
-        filename[0] = extra[0] = '\0';
-
-        /* Header */
-        if (fwrite(header, 1, 30, fpOut) == 30) {
-          offset += 30;
-        } else {
-          err = Z_ERRNO;
-          break;
-        }
-
-        /* Filename */
-        if (fnsize > 0) {
-          if (fnsize < sizeof(filename)) {
-            if (fread(filename, 1, fnsize, fpZip) == fnsize) {
-                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
-                offset += fnsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_ERRNO;
-              break;
-            }
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        } else {
-          err = Z_STREAM_ERROR;
-          break;
-        }
-
-        /* Extra field */
-        if (extsize > 0) {
-          if (extsize < sizeof(extra)) {
-            if (fread(extra, 1, extsize, fpZip) == extsize) {
-              if (fwrite(extra, 1, extsize, fpOut) == extsize) {
-                offset += extsize;
-                } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_ERRNO;
-              break;
-            }
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-
-        /* Data */
-        {
-          int dataSize = cpsize;
-          if (dataSize == 0) {
-            dataSize = uncpsize;
-          }
-          if (dataSize > 0) {
-            char* data = malloc(dataSize);
-            if (data != NULL) {
-              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
-                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
-                  offset += dataSize;
-                  totalBytes += dataSize;
-                } else {
-                  err = Z_ERRNO;
-                }
-              } else {
-                err = Z_ERRNO;
-              }
-              free(data);
-              if (err != Z_OK) {
-                break;
-              }
-            } else {
-              err = Z_MEM_ERROR;
-              break;
-            }
-          }
-        }
-
-        /* Central directory entry */
-        {
-          char header[46];
-          char* comment = "";
-          int comsize = (int) strlen(comment);
-          WRITE_32(header, 0x02014b50);
-          WRITE_16(header + 4, version);
-          WRITE_16(header + 6, version);
-          WRITE_16(header + 8, gpflag);
-          WRITE_16(header + 10, method);
-          WRITE_16(header + 12, filetime);
-          WRITE_16(header + 14, filedate);
-          WRITE_32(header + 16, crc);
-          WRITE_32(header + 20, cpsize);
-          WRITE_32(header + 24, uncpsize);
-          WRITE_16(header + 28, fnsize);
-          WRITE_16(header + 30, extsize);
-          WRITE_16(header + 32, comsize);
-          WRITE_16(header + 34, 0);     /* disk # */
-          WRITE_16(header + 36, 0);     /* int attrb */
-          WRITE_32(header + 38, 0);     /* ext attrb */
-          WRITE_32(header + 42, currentOffset);
-          /* Header */
-          if (fwrite(header, 1, 46, fpOutCD) == 46) {
-            offsetCD += 46;
-
-            /* Filename */
-            if (fnsize > 0) {
-              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
-                offsetCD += fnsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_STREAM_ERROR;
-              break;
-            }
-
-            /* Extra field */
-            if (extsize > 0) {
-              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
-                offsetCD += extsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            }
-
-            /* Comment field */
-            if (comsize > 0) {
-              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
-                offsetCD += comsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            }
-
-
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-
-        /* Success */
-        entries++;
-
-      } else {
-        break;
-      }
-    }
-
-    /* Final central directory  */
-    {
-      int entriesZip = entries;
-      char header[22];
-      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
-      int comsize = (int) strlen(comment);
-      if (entriesZip > 0xffff) {
-        entriesZip = 0xffff;
-      }
-      WRITE_32(header, 0x06054b50);
-      WRITE_16(header + 4, 0);    /* disk # */
-      WRITE_16(header + 6, 0);    /* disk # */
-      WRITE_16(header + 8, entriesZip);   /* hack */
-      WRITE_16(header + 10, entriesZip);  /* hack */
-      WRITE_32(header + 12, offsetCD);    /* size of CD */
-      WRITE_32(header + 16, offset);      /* offset to CD */
-      WRITE_16(header + 20, comsize);     /* comment */
-
-      /* Header */
-      if (fwrite(header, 1, 22, fpOutCD) == 22) {
-
-        /* Comment field */
-        if (comsize > 0) {
-          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
-            err = Z_ERRNO;
-          }
-        }
-
-      } else {
-        err = Z_ERRNO;
-      }
-    }
-
-    /* Final merge (file + central directory) */
-    fclose(fpOutCD);
-    if (err == Z_OK) {
-      fpOutCD = fopen(fileOutTmp, "rb");
-      if (fpOutCD != NULL) {
-        int nRead;
-        char buffer[8192];
-        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
-          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-        fclose(fpOutCD);
-      }
-    }
-
-    /* Close */
-    fclose(fpZip);
-    fclose(fpOut);
-
-    /* Wipe temporary file */
-    (void)remove(fileOutTmp);
-
-    /* Number of recovered entries */
-    if (err == Z_OK) {
-      if (nRecovered != NULL) {
-        *nRecovered = entries;
-      }
-      if (bytesRecovered != NULL) {
-        *bytesRecovered = totalBytes;
-      }
-    }
-  } else {
-    err = Z_STREAM_ERROR;
-  }
-  return err;
-}

crates/libz-sys/src/zlib/contrib/minizip/mztools.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/mztools.h b/crates/libz-sys/src/zlib/contrib/minizip/mztools.h
deleted file mode 100644
index a49a426..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/mztools.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-#ifndef _zip_tools_H
-#define _zip_tools_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#include "unzip.h"
-
-/* Repair a ZIP file (missing central directory)
-   file: file to recover
-   fileOut: output file after recovery
-   fileOutTmp: temporary file name used for recovery
-*/
-extern int ZEXPORT unzRepair(const char* file,
-                             const char* fileOut,
-                             const char* fileOutTmp,
-                             uLong* nRecovered,
-                             uLong* bytesRecovered);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

crates/libz-sys/src/zlib/contrib/minizip/unzip.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/unzip.c b/crates/libz-sys/src/zlib/contrib/minizip/unzip.c
deleted file mode 100644
index bcfb941..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/unzip.c
+++ /dev/null
@@ -1,2125 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-
-  ------------------------------------------------------------------------------------
-  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-  compatibility with older software. The following is from the original crypt.c.
-  Code woven in by Terry Thorsen 1/2003.
-
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-
-        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
-
-        This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
-
-        ------------------------------------------------------------------------------------
-
-        Changes in unzip.c
-
-        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
-  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
-  2007-2008 - Even Rouault - Remove old C style function prototypes
-  2007-2008 - Even Rouault - Add unzip support for ZIP64
-
-        Copyright (C) 2007-2008 Even Rouault
-
-
-        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
-  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
-                                should only read the compressed/uncompressed size from the Zip64 format if
-                                the size from normal header was 0xFFFFFFFF
-  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
-        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
-                                Patch created by Daniel Borca
-
-  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
-
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info64_internal_s
-{
-    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
-} unz_file_info64_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
-    ZPOS64_T total_out_64;
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
-    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip64_read_info_s;
-
-
-/* unz64_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    int is64bitOpenFunction;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info64 gi;       /* public global information */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
-    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
-    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
-    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
-
-    ZPOS64_T size_central_dir;     /* size of the central directory  */
-    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
-    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-
-    int isZip64;
-
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-#    endif
-} unz64_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been successfully opened for reading.
-*/
-
-
-local int unz64local_getByte OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
-{
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unz64local_getShort OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                             voidpf filestream,
-                             uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    ZPOS64_T *pX));
-
-
-local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            ZPOS64_T *pX)
-{
-    ZPOS64_T x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (ZPOS64_T)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<24;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<32;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<40;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<48;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<56;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
-{
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
-                                                 const char*  fileName2,
-                                                 int iCaseSensitivity)
-
-{
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-
-
-/*
-  Locate the Central directory 64 of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                                      voidpf filestream)
-{
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
-    uLong uL;
-                ZPOS64_T relativeOffset;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    if (uPosFound == 0)
-        return 0;
-
-    /* Zip64 end of central directory locator */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
-
-    /* the signature, already checked */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-
-    /* number of the disk with the start of the zip64 end of  central directory */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-    if (uL != 0)
-        return 0;
-
-    /* relative offset of the zip64 end of central directory record */
-    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
-        return 0;
-
-    /* total number of disks */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-    if (uL != 1)
-        return 0;
-
-    /* Goto end of central directory record */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
-
-     /* the signature */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-
-    if (uL != 0x06064b50)
-        return 0;
-
-    return relativeOffset;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-local unzFile unzOpenInternal (const void *path,
-                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
-                               int is64bitOpenFunction)
-{
-    unz64_s us;
-    unz64_s *s;
-    ZPOS64_T central_pos;
-    uLong   uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    ZPOS64_T number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    us.z_filefunc.zseek32_file = NULL;
-    us.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
-    else
-        us.z_filefunc = *pzlib_filefunc64_32_def;
-    us.is64bitOpenFunction = is64bitOpenFunction;
-
-
-
-    us.filestream = ZOPEN64(us.z_filefunc,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
-    if (central_pos)
-    {
-        uLong uS;
-        ZPOS64_T uL64;
-
-        us.isZip64 = 1;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* size of zip64 end of central directory record */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version made by */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version needed to extract */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory on this disk */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* offset of start of central directory with respect to the
-          starting disk number */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        us.gi.size_comment = 0;
-    }
-    else
-    {
-        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
-        if (central_pos==0)
-            err=UNZ_ERRNO;
-
-        us.isZip64 = 0;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central dir on this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.gi.number_entry = uL;
-
-        /* total number of entries in the central dir */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        number_entry_CD = uL;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.size_central_dir = uL;
-
-        /* offset of start of central directory with respect to the
-            starting disk number */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.offset_central_dir = uL;
-
-        /* zipfile comment length */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-            err=UNZ_ERRNO;
-    }
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE64(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz64_s*)ALLOC(sizeof(unz64_s));
-    if( s != NULL)
-    {
-        *s=us;
-        unzGoToFirstFile((unzFile)s);
-    }
-    return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen2 (const char *path,
-                                        zlib_filefunc_def* pzlib_filefunc32_def)
-{
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
-    }
-    else
-        return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen2_64 (const void *path,
-                                     zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
-    }
-    else
-        return unzOpenInternal(path, NULL, 1);
-}
-
-extern unzFile ZEXPORT unzOpen (const char *path)
-{
-    return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen64 (const void *path)
-{
-    return unzOpenInternal(path, NULL, 1);
-}
-
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (unzFile file)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE64(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    /* to do : check if number_entry is not truncated */
-    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
-    pglobal_info32->size_comment = s->gi.size_comment;
-    return UNZ_OK;
-}
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
-{
-    ZPOS64_T uDate;
-    uDate = (ZPOS64_T)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unz64local_GetCurrentFileInfoInternal (unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize)
-{
-    unz64_s* s;
-    unz_file_info64 file_info;
-    unz_file_info64_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-    uLong uL;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (ZSEEK64(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.compressed_size = uL;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.uncompressed_size = uL;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-                // relative offset of local header
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info_internal.offset_curfile = uL;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-    // Read extrafield
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        ZPOS64_T uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-
-        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
-    }
-    else
-        lSeek += file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
-    {
-                                uLong acc = 0;
-
-        // since lSeek now points to after the extra field we need to move back
-        lSeek -= file_info.size_file_extra;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        while(acc < file_info.size_file_extra)
-        {
-            uLong headerId;
-                                                uLong dataSize;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            /* ZIP64 extra fields */
-            if (headerId == 0x0001)
-            {
-                                                        uLong uL;
-
-                                                                if(file_info.uncompressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                                                                                        err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.compressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                                                                                  err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info_internal.offset_curfile == MAXU32)
-                                                                {
-                                                                        /* Relative Header offset */
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.disk_num_start == MAXU32)
-                                                                {
-                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-            }
-            else
-            {
-                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
-                    err=UNZ_ERRNO;
-            }
-
-            acc += 2 + 2 + dataSize;
-        }
-    }
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
-                                          unz_file_info64 * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
-    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
-                                          unz_file_info * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
-    int err;
-    unz_file_info64 file_info64;
-    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-    if ((err==UNZ_OK) && (pfile_info != NULL))
-    {
-        pfile_info->version = file_info64.version;
-        pfile_info->version_needed = file_info64.version_needed;
-        pfile_info->flag = file_info64.flag;
-        pfile_info->compression_method = file_info64.compression_method;
-        pfile_info->dosDate = file_info64.dosDate;
-        pfile_info->crc = file_info64.crc;
-
-        pfile_info->size_filename = file_info64.size_filename;
-        pfile_info->size_file_extra = file_info64.size_file_extra;
-        pfile_info->size_file_comment = file_info64.size_file_comment;
-
-        pfile_info->disk_num_start = file_info64.disk_num_start;
-        pfile_info->internal_fa = file_info64.internal_fa;
-        pfile_info->external_fa = file_info64.external_fa;
-
-        pfile_info->tmu_date = file_info64.tmu_date,
-
-
-        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
-        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
-
-    }
-    return err;
-}
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (unzFile file)
-{
-    int err=UNZ_OK;
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (unzFile  file)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
-{
-    unz64_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info64 cur_file_infoSaved;
-    unz_file_info64_internal cur_file_info_internalSaved;
-    ZPOS64_T num_fileSaved;
-    ZPOS64_T pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo64(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   // offset in file
-    ZPOS64_T num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
-{
-    unz64_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
-    unz64_file_pos file_pos64;
-    int err = unzGetFilePos64(file,&file_pos64);
-    if (err==UNZ_OK)
-    {
-        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
-        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
-    }
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
-    unz64_file_pos file_pos64;
-    if (file_pos == NULL)
-        return UNZ_PARAMERROR;
-
-    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
-    file_pos64.num_of_file = file_pos->num_of_file;
-    return unzGoToFilePos64(file,&file_pos64);
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
-                                                    ZPOS64_T * poffset_local_extrafield,
-                                                    uInt  * psize_local_extrafield)
-{
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
-                                            int* level, int raw, const char* password)
-{
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->total_out_64=0;
-    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
-    {
-#ifdef HAVE_BZIP2
-      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
-      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
-      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->bstream.state = (voidpf)0;
-
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-#else
-      pfile_in_zip_read_info->raw=1;
-#endif
-    }
-    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = 0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-                s->encrypted = 0;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK64(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (unzFile file)
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
-{
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    s=(unz64_s*)file;
-    if (file==NULL)
-        return 0; //UNZ_PARAMERROR;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-    if (pfile_in_zip_read_info==NULL)
-        return 0; //UNZ_PARAMERROR;
-    return pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile;
-}
-
-/** Addition for GDAL : END */
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
-{
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-
-            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
-            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
-            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
-            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
-            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
-            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
-            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
-            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
-
-            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
-            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
-
-            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
-
-            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
-            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
-            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
-            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
-            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
-            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
-            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
-
-            if (err==BZ_STREAM_END)
-              return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=BZ_OK)
-              break;
-#endif
-        } // end Z_BZIP2ED
-        else
-        {
-            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            ZPOS64_T uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
-{
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return (ZPOS64_T)-1;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return (ZPOS64_T)-1;
-
-    return pfile_in_zip_read_info->total_out_64;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-Read extra field from the current file (opened by unzOpenCurrentFile)
-This is the local-header version of the extra field (sometimes, there is
-more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    ZPOS64_T size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (unzFile file)
-{
-    int err=UNZ_OK;
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-#ifdef HAVE_BZIP2
-    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
-        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
-#endif
-
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
-{
-    unz64_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return (int)UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
-{
-    unz64_s* s;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern uLong ZEXPORT unzGetOffset (unzFile file)
-{
-    ZPOS64_T offset64;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    offset64 = unzGetOffset64(file);
-    return (uLong)offset64;
-}
-
-extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
-{
-    return unzSetOffset64(file,pos);
-}

crates/libz-sys/src/zlib/contrib/minizip/unzip.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/unzip.h b/crates/libz-sys/src/zlib/contrib/minizip/unzip.h
deleted file mode 100644
index 2104e39..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/unzip.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------------
-
-        Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  ---------------------------------------------------------------------------------
-
-        Changes
-
-        See header of unzip64.c
-
-*/
-
-#ifndef _unz64_H
-#define _unz64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef  _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info64_s
-{
-    ZPOS64_T number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info64;
-
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info64_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
-    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info64;
-
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-extern unzFile ZEXPORT unzOpen64 OF((const void *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-     the "64" function take a const void* pointer, because the path is just the
-       value passed to the open64_file_func callback.
-     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
-       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
-       does not describe the reality
-*/
-
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
-                                    zlib_filefunc64_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unz64Open, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-
-extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
-                                        unz_global_info64 *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-typedef struct unz64_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
-    ZPOS64_T num_of_file;            /* # of file */
-} unz64_file_pos;
-
-extern int ZEXPORT unzGetFilePos64(
-    unzFile file,
-    unz64_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos64(
-    unzFile file,
-    const unz64_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
-                         unz_file_info64 *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
-
-/** Addition for GDAL : END */
-
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-
-extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz64_H */

crates/libz-sys/src/zlib/contrib/minizip/zip.c

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/zip.c b/crates/libz-sys/src/zlib/contrib/minizip/zip.c
deleted file mode 100644
index 44e88a9..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/zip.c
+++ /dev/null
@@ -1,2007 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
-   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
-   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
-   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
-                                 It is used when recreting zip archive with RAW when deleting items from a zip.
-                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
-   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
-   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY   (0x0) /* platform depedent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (64*1024) //(16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-
-// NOT sure that this work on ALL platform
-#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC    (0x04034b50)
-#define CENTRALHEADERMAGIC  (0x02014b50)
-#define ENDHEADERMAGIC      (0x06054b50)
-#define ZIP64ENDHEADERMAGIC      (0x6064b50)
-#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET  (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
-  struct linkedlist_datablock_internal_s* next_datablock;
-  uLong  avail_in_this_block;
-  uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignment */
-  unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
-    linkedlist_datablock_internal* first_block;
-    linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
-    z_stream stream;            /* zLib stream structure for inflate */
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    int  stream_initialised;    /* 1 is stream is initialised */
-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
-
-    ZPOS64_T pos_local_header;     /* offset of the local header of the file
-                                     currenty writing */
-    char* central_header;       /* central header data for the current file */
-    uLong size_centralExtra;
-    uLong size_centralheader;   /* size of the central header for cur file */
-    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
-    uLong flag;                 /* flag of the file currently writing */
-
-    int  method;                /* compression method of file currenty wr.*/
-    int  raw;                   /* 1 for directly writing raw data */
-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
-    uLong dosDate;
-    uLong crc32;
-    int  encrypt;
-    int  zip64;               /* Add ZIP64 extened information in the extra field */
-    ZPOS64_T pos_zip64extrainfo;
-    ZPOS64_T totalCompressedData;
-    ZPOS64_T totalUncompressedData;
-#ifndef NOCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-    int crypt_header_size;
-#endif
-} curfile64_info;
-
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    linkedlist_data central_dir;/* datablock with central dir in construction*/
-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile64_info ci;            /* info on the file curretly writing */
-
-    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
-    ZPOS64_T add_position_when_writing_offset;
-    ZPOS64_T number_entry;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    char *globalcomment;
-#endif
-
-} zip64_internal;
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
-    linkedlist_datablock_internal* ldi;
-    ldi = (linkedlist_datablock_internal*)
-                 ALLOC(sizeof(linkedlist_datablock_internal));
-    if (ldi!=NULL)
-    {
-        ldi->next_datablock = NULL ;
-        ldi->filled_in_this_block = 0 ;
-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
-    }
-    return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi)
-{
-    while (ldi!=NULL)
-    {
-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
-        TRYFREE(ldi);
-        ldi = ldinext;
-    }
-}
-
-local void init_linkedlist(linkedlist_data* ll)
-{
-    ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll)
-{
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
-{
-    linkedlist_datablock_internal* ldi;
-    const unsigned char* from_copy;
-
-    if (ll==NULL)
-        return ZIP_INTERNALERROR;
-
-    if (ll->last_block == NULL)
-    {
-        ll->first_block = ll->last_block = allocate_new_datablock();
-        if (ll->first_block == NULL)
-            return ZIP_INTERNALERROR;
-    }
-
-    ldi = ll->last_block;
-    from_copy = (unsigned char*)buf;
-
-    while (len>0)
-    {
-        uInt copy_this;
-        uInt i;
-        unsigned char* to_copy;
-
-        if (ldi->avail_in_this_block==0)
-        {
-            ldi->next_datablock = allocate_new_datablock();
-            if (ldi->next_datablock == NULL)
-                return ZIP_INTERNALERROR;
-            ldi = ldi->next_datablock ;
-            ll->last_block = ldi;
-        }
-
-        if (ldi->avail_in_this_block < len)
-            copy_this = (uInt)ldi->avail_in_this_block;
-        else
-            copy_this = (uInt)len;
-
-        to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
-        for (i=0;i<copy_this;i++)
-            *(to_copy+i)=*(from_copy+i);
-
-        ldi->filled_in_this_block += copy_this;
-        ldi->avail_in_this_block -= copy_this;
-        from_copy += copy_this ;
-        len -= copy_this;
-    }
-    return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
-   Inputs a long in LSB order to the given file
-   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
-*/
-
-local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
-local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
-{
-    unsigned char buf[8];
-    int n;
-    for (n = 0; n < nbByte; n++)
-    {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-    if (x != 0)
-      {     /* data overflow - hack for ZIP64 (X Roche) */
-      for (n = 0; n < nbByte; n++)
-        {
-          buf[n] = 0xff;
-        }
-      }
-
-    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
-        return ZIP_ERRNO;
-    else
-        return ZIP_OK;
-}
-
-local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
-local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
-{
-    unsigned char* buf=(unsigned char*)dest;
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-
-    if (x != 0)
-    {     /* data overflow - hack for ZIP64 */
-       for (n = 0; n < nbByte; n++)
-       {
-          buf[n] = 0xff;
-       }
-    }
-}
-
-/****************************************************************************/
-
-
-local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
-{
-    uLong year = (uLong)ptm->tm_year;
-    if (year>=1980)
-        year-=1980;
-    else if (year>=80)
-        year-=80;
-    return
-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
-
-local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
-{
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return ZIP_OK;
-    }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return ZIP_ERRNO;
-        else
-            return ZIP_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
-
-
-local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
-{
-  ZPOS64_T x;
-  int i = 0;
-  int err;
-
-  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x = (ZPOS64_T)i;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<8;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<16;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<24;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<32;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<40;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<48;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<56;
-
-  if (err==ZIP_OK)
-    *pX = x;
-  else
-    *pX = 0;
-
-  return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos ;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-      {
-        uPosFound = uReadPos+i;
-        break;
-      }
-
-      if (uPosFound!=0)
-        break;
-  }
-  TRYFREE(buf);
-  return uPosFound;
-}
-
-/*
-Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
-the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-  uLong uL;
-  ZPOS64_T relativeOffset;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-    {
-      // Signature "0x07064b50" Zip64 end of central directory locater
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-      {
-        uPosFound = uReadPos+i;
-        break;
-      }
-    }
-
-      if (uPosFound!=0)
-        break;
-  }
-
-  TRYFREE(buf);
-  if (uPosFound == 0)
-    return 0;
-
-  /* Zip64 end of central directory locator */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature, already checked */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  /* number of the disk with the start of the zip64 end of  central directory */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 0)
-    return 0;
-
-  /* relative offset of the zip64 end of central directory record */
-  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
-    return 0;
-
-  /* total number of disks */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 1)
-    return 0;
-
-  /* Goto Zip64 end of central directory record */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
-    return 0;
-
-  return relativeOffset;
-}
-
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
-{
-  int err=ZIP_OK;
-  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
-  ZPOS64_T size_central_dir;     /* size of the central directory  */
-  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
-  ZPOS64_T central_pos;
-  uLong uL;
-
-  uLong number_disk;          /* number of the current dist, used for
-                              spaning ZIP, unsupported, always 0*/
-  uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                              for spaning ZIP, unsupported, always 0*/
-  ZPOS64_T number_entry;
-  ZPOS64_T number_entry_CD;      /* total number of entries in
-                                the central dir
-                                (same than number_entry on nospan) */
-  uLong VersionMadeBy;
-  uLong VersionNeeded;
-  uLong size_comment;
-
-  int hasZIP64Record = 0;
-
-  // check first if we find a ZIP64 record
-  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
-  if(central_pos > 0)
-  {
-    hasZIP64Record = 1;
-  }
-  else if(central_pos == 0)
-  {
-    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
-  }
-
-/* disable to allow appending to empty ZIP archive
-        if (central_pos==0)
-            err=ZIP_ERRNO;
-*/
-
-  if(hasZIP64Record)
-  {
-    ZPOS64_T sizeEndOfCentralDirectory;
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* size of zip64 end of central directory record */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version made by */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version needed to extract */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory on this disk */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* offset of start of central directory with respect to the
-    starting disk number */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    // TODO..
-    // read the comment from the standard central header.
-    size_comment = 0;
-  }
-  else
-  {
-    // Read End of central Directory info
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    number_entry = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry = uL;
-
-    /* total number of entries in the central dir */
-    number_entry_CD = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry_CD = uL;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    size_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      size_central_dir = uL;
-
-    /* offset of start of central directory with respect to the starting disk number */
-    offset_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      offset_central_dir = uL;
-
-
-    /* zipfile global comment length */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
-      err=ZIP_ERRNO;
-  }
-
-  if ((central_pos<offset_central_dir+size_central_dir) &&
-    (err==ZIP_OK))
-    err=ZIP_BADZIPFILE;
-
-  if (err!=ZIP_OK)
-  {
-    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
-    return ZIP_ERRNO;
-  }
-
-  if (size_comment>0)
-  {
-    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
-    if (pziinit->globalcomment)
-    {
-      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
-      pziinit->globalcomment[size_comment]=0;
-    }
-  }
-
-  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
-  pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
-
-  {
-    ZPOS64_T size_central_dir_to_read = size_central_dir;
-    size_t buf_size = SIZEDATA_INDATABLOCK;
-    void* buf_read = (void*)ALLOC(buf_size);
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
-    {
-      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
-      if (read_this > size_central_dir_to_read)
-        read_this = size_central_dir_to_read;
-
-      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
-        err=ZIP_ERRNO;
-
-      if (err==ZIP_OK)
-        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
-
-      size_central_dir_to_read-=read_this;
-    }
-    TRYFREE(buf_read);
-  }
-  pziinit->begin_pos = byte_before_the_zipfile;
-  pziinit->number_entry = number_entry_CD;
-
-  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
-    err=ZIP_ERRNO;
-
-  return err;
-}
-
-
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
-{
-    zip64_internal ziinit;
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    ziinit.z_filefunc.zseek32_file = NULL;
-    ziinit.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
-    else
-        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
-
-    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
-                  pathname,
-                  (append == APPEND_STATUS_CREATE) ?
-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
-    if (ziinit.filestream == NULL)
-        return NULL;
-
-    if (append == APPEND_STATUS_CREATEAFTER)
-        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
-
-    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
-    ziinit.in_opened_file_inzip = 0;
-    ziinit.ci.stream_initialised = 0;
-    ziinit.number_entry = 0;
-    ziinit.add_position_when_writing_offset = 0;
-    init_linkedlist(&(ziinit.central_dir));
-
-
-
-    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
-    if (zi==NULL)
-    {
-        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
-        return NULL;
-    }
-
-    /* now we add file in a zipfile */
-#    ifndef NO_ADDFILEINEXISTINGZIP
-    ziinit.globalcomment = NULL;
-    if (append == APPEND_STATUS_ADDINZIP)
-    {
-      // Read and Cache Central Directory Records
-      err = LoadCentralDirectoryRecord(&ziinit);
-    }
-
-    if (globalcomment)
-    {
-      *globalcomment = ziinit.globalcomment;
-    }
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-    if (err != ZIP_OK)
-    {
-#    ifndef NO_ADDFILEINEXISTINGZIP
-        TRYFREE(ziinit.globalcomment);
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-        TRYFREE(zi);
-        return NULL;
-    }
-    else
-    {
-        *zi = ziinit;
-        return (zipFile)zi;
-    }
-}
-
-extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
-{
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-
-
-extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
-{
-    return zipOpen3((const void*)pathname,append,NULL,NULL);
-}
-
-extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
-{
-    return zipOpen3(pathname,append,NULL,NULL);
-}
-
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
-{
-  /* write the local header */
-  int err;
-  uInt size_filename = (uInt)strlen(filename);
-  uInt size_extrafield = size_extrafield_local;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
-
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
-  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
-  }
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
-  if(zi->ci.zip64)
-  {
-    size_extrafield += 20;
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
-
-  if ((err==ZIP_OK) && (size_filename > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
-      err = ZIP_ERRNO;
-  }
-
-  if ((err==ZIP_OK) && (size_extrafield_local > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
-      err = ZIP_ERRNO;
-  }
-
-
-  if ((err==ZIP_OK) && (zi->ci.zip64))
-  {
-      // write the Zip64 extended info
-      short HeaderID = 1;
-      short DataSize = 16;
-      ZPOS64_T CompressedSize = 0;
-      ZPOS64_T UncompressedSize = 0;
-
-      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
-      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
-  }
-
-  return err;
-}
-
-/*
- NOTE.
- When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
- before calling this function it can be done with zipRemoveExtraInfoBlock
-
- It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
- unnecessary allocations.
- */
-extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting,
-                                         uLong versionMadeBy, uLong flagBase, int zip64)
-{
-    zip64_internal* zi;
-    uInt size_filename;
-    uInt size_comment;
-    uInt i;
-    int err = ZIP_OK;
-
-#    ifdef NOCRYPT
-    (crcForCrypting);
-    if (password != NULL)
-        return ZIP_PARAMERROR;
-#    endif
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-#ifdef HAVE_BZIP2
-    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
-      return ZIP_PARAMERROR;
-#else
-    if ((method!=0) && (method!=Z_DEFLATED))
-      return ZIP_PARAMERROR;
-#endif
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-        if (err != ZIP_OK)
-            return err;
-    }
-
-    if (filename==NULL)
-        filename="-";
-
-    if (comment==NULL)
-        size_comment = 0;
-    else
-        size_comment = (uInt)strlen(comment);
-
-    size_filename = (uInt)strlen(filename);
-
-    if (zipfi == NULL)
-        zi->ci.dosDate = 0;
-    else
-    {
-        if (zipfi->dosDate != 0)
-            zi->ci.dosDate = zipfi->dosDate;
-        else
-          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
-    }
-
-    zi->ci.flag = flagBase;
-    if ((level==8) || (level==9))
-      zi->ci.flag |= 2;
-    if (level==2)
-      zi->ci.flag |= 4;
-    if (level==1)
-      zi->ci.flag |= 6;
-    if (password != NULL)
-      zi->ci.flag |= 1;
-
-    zi->ci.crc32 = 0;
-    zi->ci.method = method;
-    zi->ci.encrypt = 0;
-    zi->ci.stream_initialised = 0;
-    zi->ci.pos_in_buffered_data = 0;
-    zi->ci.raw = raw;
-    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
-    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
-
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
-
-    zi->ci.size_centralExtra = size_extrafield_global;
-    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
-    /* version info */
-    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
-
-    for (i=0;i<size_filename;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
-    for (i=0;i<size_extrafield_global;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
-              *(((const char*)extrafield_global)+i);
-
-    for (i=0;i<size_comment;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
-              size_extrafield_global+i) = *(comment+i);
-    if (zi->ci.central_header == NULL)
-        return ZIP_INTERNALERROR;
-
-    zi->ci.zip64 = zip64;
-    zi->ci.totalCompressedData = 0;
-    zi->ci.totalUncompressedData = 0;
-    zi->ci.pos_zip64extrainfo = 0;
-
-    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
-
-#ifdef HAVE_BZIP2
-    zi->ci.bstream.avail_in = (uInt)0;
-    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-    zi->ci.bstream.total_in_hi32 = 0;
-    zi->ci.bstream.total_in_lo32 = 0;
-    zi->ci.bstream.total_out_hi32 = 0;
-    zi->ci.bstream.total_out_lo32 = 0;
-#endif
-
-    zi->ci.stream.avail_in = (uInt)0;
-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.stream.next_out = zi->ci.buffered_data;
-    zi->ci.stream.total_in = 0;
-    zi->ci.stream.total_out = 0;
-    zi->ci.stream.data_type = Z_BINARY;
-
-#ifdef HAVE_BZIP2
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-#else
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-#endif
-    {
-        if(zi->ci.method == Z_DEFLATED)
-        {
-          zi->ci.stream.zalloc = (alloc_func)0;
-          zi->ci.stream.zfree = (free_func)0;
-          zi->ci.stream.opaque = (voidpf)0;
-
-          if (windowBits>0)
-              windowBits = -windowBits;
-
-          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
-
-          if (err==Z_OK)
-              zi->ci.stream_initialised = Z_DEFLATED;
-        }
-        else if(zi->ci.method == Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            // Init BZip stuff here
-          zi->ci.bstream.bzalloc = 0;
-          zi->ci.bstream.bzfree = 0;
-          zi->ci.bstream.opaque = (voidpf)0;
-
-          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
-          if(err == BZ_OK)
-            zi->ci.stream_initialised = Z_BZIP2ED;
-#endif
-        }
-
-    }
-
-#    ifndef NOCRYPT
-    zi->ci.crypt_header_size = 0;
-    if ((err==Z_OK) && (password != NULL))
-    {
-        unsigned char bufHead[RAND_HEAD_LEN];
-        unsigned int sizeHead;
-        zi->ci.encrypt = 1;
-        zi->ci.pcrc_32_tab = get_crc_table();
-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
-
-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
-        zi->ci.crypt_header_size = sizeHead;
-
-        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
-                err = ZIP_ERRNO;
-    }
-#    endif
-
-    if (err==Z_OK)
-        zi->in_opened_file_inzip = 1;
-    return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting,
-                                         uLong versionMadeBy, uLong flagBase)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void*extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void*extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-local int zip64FlushWriteBuffer(zip64_internal* zi)
-{
-    int err=ZIP_OK;
-
-    if (zi->ci.encrypt != 0)
-    {
-#ifndef NOCRYPT
-        uInt i;
-        int t;
-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
-#endif
-    }
-
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
-      err = ZIP_ERRNO;
-
-    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED)
-    {
-      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
-      zi->ci.bstream.total_in_lo32 = 0;
-      zi->ci.bstream.total_in_hi32 = 0;
-    }
-    else
-#endif
-    {
-      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
-      zi->ci.stream.total_in = 0;
-    }
-
-
-    zi->ci.pos_in_buffered_data = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
-{
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
-    {
-      zi->ci.bstream.next_in = (void*)buf;
-      zi->ci.bstream.avail_in = len;
-      err = BZ_RUN_OK;
-
-      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
-      {
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-
-
-        if(err != BZ_RUN_OK)
-          break;
-
-        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-        {
-          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
-//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
-          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
-
-          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
-        }
-      }
-
-      if(err == BZ_RUN_OK)
-        err = ZIP_OK;
-    }
-    else
-#endif
-    {
-      zi->ci.stream.next_in = (Bytef*)buf;
-      zi->ci.stream.avail_in = len;
-
-      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
-      {
-          if (zi->ci.stream.avail_out == 0)
-          {
-              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                  err = ZIP_ERRNO;
-              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-              zi->ci.stream.next_out = zi->ci.buffered_data;
-          }
-
-
-          if(err != ZIP_OK)
-              break;
-
-          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-          {
-              uLong uTotalOutBefore = zi->ci.stream.total_out;
-              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-              if(uTotalOutBefore > zi->ci.stream.total_out)
-              {
-                int bBreak = 0;
-                bBreak++;
-              }
-
-              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-          }
-          else
-          {
-              uInt copy_this,i;
-              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                  copy_this = zi->ci.stream.avail_in;
-              else
-                  copy_this = zi->ci.stream.avail_out;
-
-              for (i = 0; i < copy_this; i++)
-                  *(((char*)zi->ci.stream.next_out)+i) =
-                      *(((const char*)zi->ci.stream.next_in)+i);
-              {
-                  zi->ci.stream.avail_in -= copy_this;
-                  zi->ci.stream.avail_out-= copy_this;
-                  zi->ci.stream.next_in+= copy_this;
-                  zi->ci.stream.next_out+= copy_this;
-                  zi->ci.stream.total_in+= copy_this;
-                  zi->ci.stream.total_out+= copy_this;
-                  zi->ci.pos_in_buffered_data += copy_this;
-              }
-          }
-      }// while(...)
-    }
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
-{
-    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
-{
-    zip64_internal* zi;
-    ZPOS64_T compressed_size;
-    uLong invalidValue = 0xffffffff;
-    short datasize = 0;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-    zi->ci.stream.avail_in = 0;
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-                {
-                        while (err==ZIP_OK)
-                        {
-                                uLong uTotalOutBefore;
-                                if (zi->ci.stream.avail_out == 0)
-                                {
-                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                                                err = ZIP_ERRNO;
-                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-                                        zi->ci.stream.next_out = zi->ci.buffered_data;
-                                }
-                                uTotalOutBefore = zi->ci.stream.total_out;
-                                err=deflate(&zi->ci.stream,  Z_FINISH);
-                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-                        }
-                }
-    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-#ifdef HAVE_BZIP2
-      err = BZ_FINISH_OK;
-      while (err==BZ_FINISH_OK)
-      {
-        uLong uTotalOutBefore;
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
-        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
-        if(err == BZ_STREAM_END)
-          err = Z_STREAM_END;
-
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
-      }
-
-      if(err == BZ_FINISH_OK)
-        err = ZIP_OK;
-#endif
-    }
-
-    if (err==Z_STREAM_END)
-        err=ZIP_OK; /* this is normal */
-
-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-                {
-        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
-            err = ZIP_ERRNO;
-                }
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-    {
-        int tmp_err = deflateEnd(&zi->ci.stream);
-        if (err == ZIP_OK)
-            err = tmp_err;
-        zi->ci.stream_initialised = 0;
-    }
-#ifdef HAVE_BZIP2
-    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
-                        if (err==ZIP_OK)
-                                err = tmperr;
-                        zi->ci.stream_initialised = 0;
-    }
-#endif
-
-    if (!zi->ci.raw)
-    {
-        crc32 = (uLong)zi->ci.crc32;
-        uncompressed_size = zi->ci.totalUncompressedData;
-    }
-    compressed_size = zi->ci.totalCompressedData;
-
-#    ifndef NOCRYPT
-    compressed_size += zi->ci.crypt_header_size;
-#    endif
-
-    // update Current Item crc and sizes,
-    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
-    {
-      /*version Made by*/
-      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
-      /*version needed*/
-      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
-
-    }
-
-    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-
-
-    if(compressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
-
-    /// set internal file attributes field
-    if (zi->ci.stream.data_type == Z_ASCII)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-
-    if(uncompressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
-
-    // Add ZIP64 extra info field for uncompressed size
-    if(uncompressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for compressed size
-    if(compressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for relative offset to local file header of current file
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      datasize += 8;
-
-    if(datasize > 0)
-    {
-      char* p = NULL;
-
-      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
-      {
-        // we can not write more data to the buffer that we have room for.
-        return ZIP_BADZIPFILE;
-      }
-
-      p = zi->ci.central_header + zi->ci.size_centralheader;
-
-      // Add Extra Information Header for 'ZIP64 information'
-      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
-      p += 2;
-      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
-      p += 2;
-
-      if(uncompressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, uncompressed_size, 8);
-        p += 8;
-      }
-
-      if(compressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, compressed_size, 8);
-        p += 8;
-      }
-
-      if(zi->ci.pos_local_header >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
-        p += 8;
-      }
-
-      // Update how much extra free space we got in the memory buffer
-      // and increase the centralheader size so the new ZIP64 fields are included
-      // ( 4 below is the size of HeaderID and DataSize field )
-      zi->ci.size_centralExtraFree -= datasize + 4;
-      zi->ci.size_centralheader += datasize + 4;
-
-      // Update the extra info size field
-      zi->ci.size_centralExtra += datasize + 4;
-      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
-    }
-
-    if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
-
-    free(zi->ci.central_header);
-
-    if (err==ZIP_OK)
-    {
-        // Update the LocalFileHeader with the new values.
-
-        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-
-        if (err==ZIP_OK)
-            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
-        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
-        {
-          if(zi->ci.pos_zip64extrainfo > 0)
-          {
-            // Update the size in the ZIP64 extended field.
-            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
-              err = ZIP_ERRNO;
-
-            if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
-
-            if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
-          }
-          else
-              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
-        }
-        else
-        {
-          if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
-          if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
-        }
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-    }
-
-    zi->number_entry ++;
-    zi->in_opened_file_inzip = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip (zipFile file)
-{
-    return zipCloseFileInZipRaw (file,0,0);
-}
-
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
-{
-  int err = ZIP_OK;
-  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
-
-  /*num disks*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  /*relative offset*/
-    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
-
-  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
-
-    return err;
-}
-
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
-  int err = ZIP_OK;
-
-  uLong Zip64DataSize = 44;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
-
-  if (err==ZIP_OK) /* version made by */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* version needed */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
-  }
-  return err;
-}
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
-  int err = ZIP_OK;
-
-  /*signature*/
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-  {
-    {
-      if(zi->number_entry >= 0xFFFF)
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-      else
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-    }
-  }
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-  {
-    if(zi->number_entry >= 0xFFFF)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-  }
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff)
-    {
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
-    }
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
-  }
-
-   return err;
-}
-
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
-{
-  int err = ZIP_OK;
-  uInt size_global_comment = 0;
-
-  if(global_comment != NULL)
-    size_global_comment = (uInt)strlen(global_comment);
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
-  if (err == ZIP_OK && size_global_comment > 0)
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
-      err = ZIP_ERRNO;
-  }
-  return err;
-}
-
-extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
-{
-    zip64_internal* zi;
-    int err = 0;
-    uLong size_centraldir = 0;
-    ZPOS64_T centraldir_pos_inzip;
-    ZPOS64_T pos;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-    }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    if (global_comment==NULL)
-        global_comment = zi->globalcomment;
-#endif
-
-    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    if (err==ZIP_OK)
-    {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
-        while (ldi!=NULL)
-        {
-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-            {
-                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
-                    err = ZIP_ERRNO;
-            }
-
-            size_centraldir += ldi->filled_in_this_block;
-            ldi = ldi->next_datablock;
-        }
-    }
-    free_linkedlist(&(zi->central_dir));
-
-    pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
-    {
-      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
-      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
-    }
-
-    if (err==ZIP_OK)
-      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-    if(err == ZIP_OK)
-      err = Write_GlobalComment(zi, global_comment);
-
-    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
-        if (err == ZIP_OK)
-            err = ZIP_ERRNO;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    TRYFREE(zi->globalcomment);
-#endif
-    TRYFREE(zi);
-
-    return err;
-}
-
-extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
-{
-  char* p = pData;
-  int size = 0;
-  char* pNewHeader;
-  char* pTmp;
-  short header;
-  short dataSize;
-
-  int retVal = ZIP_OK;
-
-  if(pData == NULL || *dataLen < 4)
-    return ZIP_PARAMERROR;
-
-  pNewHeader = (char*)ALLOC(*dataLen);
-  pTmp = pNewHeader;
-
-  while(p < (pData + *dataLen))
-  {
-    header = *(short*)p;
-    dataSize = *(((short*)p)+1);
-
-    if( header == sHeader ) // Header found.
-    {
-      p += dataSize + 4; // skip it. do not copy to temp buffer
-    }
-    else
-    {
-      // Extra Info block should not be removed, So copy it to the temp buffer.
-      memcpy(pTmp, p, dataSize + 4);
-      p += dataSize + 4;
-      size += dataSize + 4;
-    }
-
-  }
-
-  if(size < *dataLen)
-  {
-    // clean old extra info block.
-    memset(pData,0, *dataLen);
-
-    // copy the new extra info block over the old
-    if(size > 0)
-      memcpy(pData, pNewHeader, size);
-
-    // set the new extra info size
-    *dataLen = size;
-
-    retVal = ZIP_OK;
-  }
-  else
-    retVal = ZIP_ERRNO;
-
-  TRYFREE(pNewHeader);
-
-  return retVal;
-}

crates/libz-sys/src/zlib/contrib/minizip/zip.h

diff --git a/crates/libz-sys/src/zlib/contrib/minizip/zip.h b/crates/libz-sys/src/zlib/contrib/minizip/zip.h
deleted file mode 100644
index 8aaebb6..0000000
--- a/crates/libz-sys/src/zlib/contrib/minizip/zip.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/* zip.h -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-        ---------------------------------------------------------------------------
-
-        Changes
-
-        See header of zip.h
-
-*/
-
-#ifndef _zip12_H
-#define _zip12_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define HAVE_BZIP2
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                          (0)
-#define ZIP_EOF                         (0)
-#define ZIP_ERRNO                       (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_BADZIPFILE                  (-103)
-#define ZIP_INTERNALERROR               (-104)
-
-#ifndef DEF_MEM_LEVEL
-#  if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#  else
-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#  endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-    tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE        (0)
-#define APPEND_STATUS_CREATEAFTER   (1)
-#define APPEND_STATUS_ADDINZIP      (2)
-
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
-extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
-/*
-  Create a zipfile.
-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
-       an Unix computer "zlib/zlib113.zip".
-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
-       will be created at the end of the file.
-         (useful if the file contain a self extractor code)
-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
-       add files in existing zip (be sure you don't add file that doesn't exist)
-     If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-       of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
-   If you want delete file into a zipfile, you must open a zipfile, and create another
-   Of couse, you can use RAW reading and writing to copy the file you did not want delte
-*/
-
-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc_def* pzlib_filefunc_def));
-
-extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc64_def* pzlib_filefunc_def));
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level));
-
-extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level,
-                       int zip64));
-
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
-                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
-
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw));
-
-
-extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int zip64));
-/*
-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting));
-
-extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            int zip64
-                                            ));
-
-/*
-  Same than zipOpenNewFileInZip2, except
-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
-    password : crypting password (NULL for no crypting)
-    crcForCrypting : crc of file to compress (needed for crypting)
- */
-
-extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            uLong versionMadeBy,
-                                            uLong flagBase
-                                            ));
-
-
-extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            uLong versionMadeBy,
-                                            uLong flagBase,
-                                            int zip64
-                                            ));
-/*
-  Same than zipOpenNewFileInZip4, except
-    versionMadeBy : value for Version made by field
-    flag : value for flag field (compression level info will be added)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
-                       const void* buf,
-                       unsigned len));
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
-                                            uLong uncompressed_size,
-                                            uLong crc32));
-
-extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
-                                            ZPOS64_T uncompressed_size,
-                                            uLong crc32));
-
-/*
-  Close the current file in the zipfile, for file opened with
-    parameter raw=1 in zipOpenNewFileInZip2
-  uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
-                const char* global_comment));
-/*
-  Close the zipfile
-*/
-
-
-extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
-/*
-  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
-
-  Remove extra information block from a extra information data for the local file header or central directory header
-
-  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
-
-  0x0001 is the signature header for the ZIP64 extra information blocks
-
-  usage.
-                        Remove ZIP64 Extra information from a central director extra field data
-              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
-
-                        Remove ZIP64 Extra information from a Local File Header extra field data
-        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip64_H */

crates/libz-sys/src/zlib/contrib/pascal/example.pas

diff --git a/crates/libz-sys/src/zlib/contrib/pascal/example.pas b/crates/libz-sys/src/zlib/contrib/pascal/example.pas
deleted file mode 100644
index 5518b36..0000000
--- a/crates/libz-sys/src/zlib/contrib/pascal/example.pas
+++ /dev/null
@@ -1,599 +0,0 @@
-(* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Pascal translation
- * Copyright (C) 1998 by Jacques Nomssi Nzali.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *
- * Adaptation to the zlibpas interface
- * Copyright (C) 2003 by Cosmin Truta.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *)
-
-program example;
-
-{$DEFINE TEST_COMPRESS}
-{DO NOT $DEFINE TEST_GZIO}
-{$DEFINE TEST_DEFLATE}
-{$DEFINE TEST_INFLATE}
-{$DEFINE TEST_FLUSH}
-{$DEFINE TEST_SYNC}
-{$DEFINE TEST_DICT}
-
-uses SysUtils, zlibpas;
-
-const TESTFILE = 'foo.gz';
-
-(* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- *)
-const hello: PChar = 'hello, hello!';
-
-const dictionary: PChar = 'hello';
-
-var dictId: LongInt; (* Adler32 value of the dictionary *)
-
-procedure CHECK_ERR(err: Integer; msg: String);
-begin
-  if err <> Z_OK then
-  begin
-    WriteLn(msg, ' error: ', err);
-    Halt(1);
-  end;
-end;
-
-procedure EXIT_ERR(const msg: String);
-begin
-  WriteLn('Error: ', msg);
-  Halt(1);
-end;
-
-(* ===========================================================================
- * Test compress and uncompress
- *)
-{$IFDEF TEST_COMPRESS}
-procedure test_compress(compr: Pointer; comprLen: LongInt;
-                        uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    len: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  err := compress(compr, comprLen, hello, len);
-  CHECK_ERR(err, 'compress');
-
-  StrCopy(PChar(uncompr), 'garbage');
-
-  err := uncompress(uncompr, uncomprLen, compr, comprLen);
-  CHECK_ERR(err, 'uncompress');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad uncompress')
-  else
-    WriteLn('uncompress(): ', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test read/write of .gz files
- *)
-{$IFDEF TEST_GZIO}
-procedure test_gzio(const fname: PChar; (* compressed file name *)
-                    uncompr: Pointer;
-                    uncomprLen: LongInt);
-var err: Integer;
-    len: Integer;
-    zfile: gzFile;
-    pos: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  zfile := gzopen(fname, 'wb');
-  if zfile = NIL then
-  begin
-    WriteLn('gzopen error');
-    Halt(1);
-  end;
-  gzputc(zfile, 'h');
-  if gzputs(zfile, 'ello') <> 4 then
-  begin
-    WriteLn('gzputs err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$IFDEF GZ_FORMAT_STRING}
-  if gzprintf(zfile, ', %s!', 'hello') <> 8 then
-  begin
-    WriteLn('gzprintf err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$ELSE}
-  if gzputs(zfile, ', hello!') <> 8 then
-  begin
-    WriteLn('gzputs err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$ENDIF}
-  gzseek(zfile, 1, SEEK_CUR); (* add one zero byte *)
-  gzclose(zfile);
-
-  zfile := gzopen(fname, 'rb');
-  if zfile = NIL then
-  begin
-    WriteLn('gzopen error');
-    Halt(1);
-  end;
-
-  StrCopy(PChar(uncompr), 'garbage');
-
-  if gzread(zfile, uncompr, uncomprLen) <> len then
-  begin
-    WriteLn('gzread err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  if StrComp(PChar(uncompr), hello) <> 0 then
-  begin
-    WriteLn('bad gzread: ', PChar(uncompr));
-    Halt(1);
-  end
-  else
-    WriteLn('gzread(): ', PChar(uncompr));
-
-  pos := gzseek(zfile, -8, SEEK_CUR);
-  if (pos <> 6) or (gztell(zfile) <> pos) then
-  begin
-    WriteLn('gzseek error, pos=', pos, ', gztell=', gztell(zfile));
-    Halt(1);
-  end;
-
-  if gzgetc(zfile) <> ' ' then
-  begin
-    WriteLn('gzgetc error');
-    Halt(1);
-  end;
-
-  if gzungetc(' ', zfile) <> ' ' then
-  begin
-    WriteLn('gzungetc error');
-    Halt(1);
-  end;
-
-  gzgets(zfile, PChar(uncompr), uncomprLen);
-  uncomprLen := StrLen(PChar(uncompr));
-  if uncomprLen <> 7 then (* " hello!" *)
-  begin
-    WriteLn('gzgets err after gzseek: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  if StrComp(PChar(uncompr), hello + 6) <> 0 then
-  begin
-    WriteLn('bad gzgets after gzseek');
-    Halt(1);
-  end
-  else
-    WriteLn('gzgets() after gzseek: ', PChar(uncompr));
-
-  gzclose(zfile);
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with small buffers
- *)
-{$IFDEF TEST_DEFLATE}
-procedure test_deflate(compr: Pointer; comprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-    len: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_in := hello;
-  c_stream.next_out := compr;
-
-  while (c_stream.total_in <> len) and
-        (c_stream.total_out < comprLen) do
-  begin
-    c_stream.avail_out := 1; { force small buffers }
-    c_stream.avail_in := 1;
-    err := deflate(c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, 'deflate');
-  end;
-
-  (* Finish the stream, still forcing small buffers: *)
-  while TRUE do
-  begin
-    c_stream.avail_out := 1;
-    err := deflate(c_stream, Z_FINISH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'deflate');
-  end;
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with small buffers
- *)
-{$IFDEF TEST_INFLATE}
-procedure test_inflate(compr: Pointer; comprLen : LongInt;
-                       uncompr: Pointer; uncomprLen : LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := 0;
-  d_stream.next_out := uncompr;
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  while (d_stream.total_out < uncomprLen) and
-        (d_stream.total_in < comprLen) do
-  begin
-    d_stream.avail_out := 1; (* force small buffers *)
-    d_stream.avail_in := 1;
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'inflate');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad inflate')
-  else
-    WriteLn('inflate(): ', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with large buffers and dynamic change of compression level
- *)
-{$IFDEF TEST_DEFLATE}
-procedure test_large_deflate(compr: Pointer; comprLen: LongInt;
-                             uncompr: Pointer; uncomprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-begin
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_BEST_SPEED);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_out := compr;
-  c_stream.avail_out := Integer(comprLen);
-
-  (* At this point, uncompr is still mostly zeroes, so it should compress
-   * very well:
-   *)
-  c_stream.next_in := uncompr;
-  c_stream.avail_in := Integer(uncomprLen);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-  if c_stream.avail_in <> 0 then
-    EXIT_ERR('deflate not greedy');
-
-  (* Feed in already compressed data and switch to no compression: *)
-  deflateParams(c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-  c_stream.next_in := compr;
-  c_stream.avail_in := Integer(comprLen div 2);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  (* Switch back to compressing mode: *)
-  deflateParams(c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-  c_stream.next_in := uncompr;
-  c_stream.avail_in := Integer(uncomprLen);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    EXIT_ERR('deflate should report Z_STREAM_END');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with large buffers
- *)
-{$IFDEF TEST_INFLATE}
-procedure test_large_inflate(compr: Pointer; comprLen: LongInt;
-                             uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := Integer(comprLen);
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  while TRUE do
-  begin
-    d_stream.next_out := uncompr;            (* discard the output *)
-    d_stream.avail_out := Integer(uncomprLen);
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'large inflate');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if d_stream.total_out <> 2 * uncomprLen + comprLen div 2 then
-  begin
-    WriteLn('bad large inflate: ', d_stream.total_out);
-    Halt(1);
-  end
-  else
-    WriteLn('large_inflate(): OK');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with full flush
- *)
-{$IFDEF TEST_FLUSH}
-procedure test_flush(compr: Pointer; var comprLen : LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-    len: Integer;
-begin
-  len := StrLen(hello)+1;
-
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_in := hello;
-  c_stream.next_out := compr;
-  c_stream.avail_in := 3;
-  c_stream.avail_out := Integer(comprLen);
-  err := deflate(c_stream, Z_FULL_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  Inc(PByteArray(compr)^[3]); (* force an error in first compressed block *)
-  c_stream.avail_in := len - 3;
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    CHECK_ERR(err, 'deflate');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-
-  comprLen := c_stream.total_out;
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflateSync()
- *)
-{$IFDEF TEST_SYNC}
-procedure test_sync(compr: Pointer; comprLen: LongInt;
-                    uncompr: Pointer; uncomprLen : LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := 2; (* just read the zlib header *)
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  d_stream.next_out := uncompr;
-  d_stream.avail_out := Integer(uncomprLen);
-
-  inflate(d_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'inflate');
-
-  d_stream.avail_in := Integer(comprLen-2);   (* read all compressed data *)
-  err := inflateSync(d_stream);               (* but skip the damaged part *)
-  CHECK_ERR(err, 'inflateSync');
-
-  err := inflate(d_stream, Z_FINISH);
-  if err <> Z_DATA_ERROR then
-    EXIT_ERR('inflate should report DATA_ERROR');
-    (* Because of incorrect adler32 *)
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  WriteLn('after inflateSync(): hel', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with preset dictionary
- *)
-{$IFDEF TEST_DICT}
-procedure test_dict_deflate(compr: Pointer; comprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-begin
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_BEST_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  err := deflateSetDictionary(c_stream, dictionary, StrLen(dictionary));
-  CHECK_ERR(err, 'deflateSetDictionary');
-
-  dictId := c_stream.adler;
-  c_stream.next_out := compr;
-  c_stream.avail_out := Integer(comprLen);
-
-  c_stream.next_in := hello;
-  c_stream.avail_in := StrLen(hello)+1;
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    EXIT_ERR('deflate should report Z_STREAM_END');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with a preset dictionary
- *)
-{$IFDEF TEST_DICT}
-procedure test_dict_inflate(compr: Pointer; comprLen: LongInt;
-                            uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := Integer(comprLen);
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  d_stream.next_out := uncompr;
-  d_stream.avail_out := Integer(uncomprLen);
-
-  while TRUE do
-  begin
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    if err = Z_NEED_DICT then
-    begin
-      if d_stream.adler <> dictId then
-        EXIT_ERR('unexpected dictionary');
-      err := inflateSetDictionary(d_stream, dictionary, StrLen(dictionary));
-    end;
-    CHECK_ERR(err, 'inflate with dict');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad inflate with dict')
-  else
-    WriteLn('inflate with dictionary: ', PChar(uncompr));
-end;
-{$ENDIF}
-
-var compr, uncompr: Pointer;
-    comprLen, uncomprLen: LongInt;
-
-begin
-  if zlibVersion^ <> ZLIB_VERSION[1] then
-    EXIT_ERR('Incompatible zlib version');
-
-  WriteLn('zlib version: ', zlibVersion);
-  WriteLn('zlib compile flags: ', Format('0x%x', [zlibCompileFlags]));
-
-  comprLen := 10000 * SizeOf(Integer); (* don't overflow on MSDOS *)
-  uncomprLen := comprLen;
-  GetMem(compr, comprLen);
-  GetMem(uncompr, uncomprLen);
-  if (compr = NIL) or (uncompr = NIL) then
-    EXIT_ERR('Out of memory');
-  (* compr and uncompr are cleared to avoid reading uninitialized
-   * data and to ensure that uncompr compresses well.
-   *)
-  FillChar(compr^, comprLen, 0);
-  FillChar(uncompr^, uncomprLen, 0);
-
-  {$IFDEF TEST_COMPRESS}
-  WriteLn('** Testing compress');
-  test_compress(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_GZIO}
-  WriteLn('** Testing gzio');
-  if ParamCount >= 1 then
-    test_gzio(ParamStr(1), uncompr, uncomprLen)
-  else
-    test_gzio(TESTFILE, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_DEFLATE}
-  WriteLn('** Testing deflate with small buffers');
-  test_deflate(compr, comprLen);
-  {$ENDIF}
-  {$IFDEF TEST_INFLATE}
-  WriteLn('** Testing inflate with small buffers');
-  test_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_DEFLATE}
-  WriteLn('** Testing deflate with large buffers');
-  test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-  {$IFDEF TEST_INFLATE}
-  WriteLn('** Testing inflate with large buffers');
-  test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_FLUSH}
-  WriteLn('** Testing deflate with full flush');
-  test_flush(compr, comprLen);
-  {$ENDIF}
-  {$IFDEF TEST_SYNC}
-  WriteLn('** Testing inflateSync');
-  test_sync(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-  comprLen := uncomprLen;
-
-  {$IFDEF TEST_DICT}
-  WriteLn('** Testing deflate and inflate with preset dictionary');
-  test_dict_deflate(compr, comprLen);
-  test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  FreeMem(compr, comprLen);
-  FreeMem(uncompr, uncomprLen);
-end.

crates/libz-sys/src/zlib/contrib/pascal/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/pascal/readme.txt b/crates/libz-sys/src/zlib/contrib/pascal/readme.txt
deleted file mode 100644
index 60e87c8..0000000
--- a/crates/libz-sys/src/zlib/contrib/pascal/readme.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-
-This directory contains a Pascal (Delphi, Kylix) interface to the
-zlib data compression library.
-
-
-Directory listing
-=================
-
-zlibd32.mak     makefile for Borland C++
-example.pas     usage example of zlib
-zlibpas.pas     the Pascal interface to zlib
-readme.txt      this file
-
-
-Compatibility notes
-===================
-
-- Although the name "zlib" would have been more normal for the
-  zlibpas unit, this name is already taken by Borland's ZLib unit.
-  This is somehow unfortunate, because that unit is not a genuine
-  interface to the full-fledged zlib functionality, but a suite of
-  class wrappers around zlib streams.  Other essential features,
-  such as checksums, are missing.
-  It would have been more appropriate for that unit to have a name
-  like "ZStreams", or something similar.
-
-- The C and zlib-supplied types int, uInt, long, uLong, etc. are
-  translated directly into Pascal types of similar sizes (Integer,
-  LongInt, etc.), to avoid namespace pollution.  In particular,
-  there is no conversion of unsigned int into a Pascal unsigned
-  integer.  The Word type is non-portable and has the same size
-  (16 bits) both in a 16-bit and in a 32-bit environment, unlike
-  Integer.  Even if there is a 32-bit Cardinal type, there is no
-  real need for unsigned int in zlib under a 32-bit environment.
-
-- Except for the callbacks, the zlib function interfaces are
-  assuming the calling convention normally used in Pascal
-  (__pascal for DOS and Windows16, __fastcall for Windows32).
-  Since the cdecl keyword is used, the old Turbo Pascal does
-  not work with this interface.
-
-- The gz* function interfaces are not translated, to avoid
-  interfacing problems with the C runtime library.  Besides,
-    gzprintf(gzFile file, const char *format, ...)
-  cannot be translated into Pascal.
-
-
-Legal issues
-============
-
-The zlibpas interface is:
-  Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler.
-  Copyright (C) 1998 by Bob Dellaca.
-  Copyright (C) 2003 by Cosmin Truta.
-
-The example program is:
-  Copyright (C) 1995-2003 by Jean-loup Gailly.
-  Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali.
-  Copyright (C) 2003 by Cosmin Truta.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-

crates/libz-sys/src/zlib/contrib/pascal/zlibd32.mak

diff --git a/crates/libz-sys/src/zlib/contrib/pascal/zlibd32.mak b/crates/libz-sys/src/zlib/contrib/pascal/zlibd32.mak
deleted file mode 100644
index 9bb00b7..0000000
--- a/crates/libz-sys/src/zlib/contrib/pascal/zlibd32.mak
+++ /dev/null
@@ -1,99 +0,0 @@
-# Makefile for zlib
-# For use with Delphi and C++ Builder under Win32
-# Updated for zlib 1.2.x by Cosmin Truta
-
-# ------------ Borland C++ ------------
-
-# This project uses the Delphi (fastcall/register) calling convention:
-LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-CC = bcc32
-LD = bcc32
-AR = tlib
-# do not use "-pr" in CFLAGS
-CFLAGS = -a -d -k- -O2 $(LOC)
-LDFLAGS =
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
-

crates/libz-sys/src/zlib/contrib/pascal/zlibpas.pas

diff --git a/crates/libz-sys/src/zlib/contrib/pascal/zlibpas.pas b/crates/libz-sys/src/zlib/contrib/pascal/zlibpas.pas
deleted file mode 100644
index a0dff11..0000000
--- a/crates/libz-sys/src/zlib/contrib/pascal/zlibpas.pas
+++ /dev/null
@@ -1,276 +0,0 @@
-(* zlibpas -- Pascal interface to the zlib data compression library
- *
- * Copyright (C) 2003 Cosmin Truta.
- * Derived from original sources by Bob Dellaca.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *)
-
-unit zlibpas;
-
-interface
-
-const
-  ZLIB_VERSION = '1.2.11';
-  ZLIB_VERNUM  = $12a0;
-
-type
-  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
-                 cdecl;
-  free_func  = procedure(opaque, address: Pointer);
-                 cdecl;
-
-  in_func    = function(opaque: Pointer; var buf: PByte): Integer;
-                 cdecl;
-  out_func   = function(opaque: Pointer; buf: PByte; size: Integer): Integer;
-                 cdecl;
-
-  z_streamp = ^z_stream;
-  z_stream = packed record
-    next_in: PChar;       (* next input byte *)
-    avail_in: Integer;    (* number of bytes available at next_in *)
-    total_in: LongInt;    (* total nb of input bytes read so far *)
-
-    next_out: PChar;      (* next output byte should be put there *)
-    avail_out: Integer;   (* remaining free space at next_out *)
-    total_out: LongInt;   (* total nb of bytes output so far *)
-
-    msg: PChar;           (* last error message, NULL if no error *)
-    state: Pointer;       (* not visible by applications *)
-
-    zalloc: alloc_func;   (* used to allocate the internal state *)
-    zfree: free_func;     (* used to free the internal state *)
-    opaque: Pointer;      (* private data object passed to zalloc and zfree *)
-
-    data_type: Integer;   (* best guess about the data type: ascii or binary *)
-    adler: LongInt;       (* adler32 value of the uncompressed data *)
-    reserved: LongInt;    (* reserved for future use *)
-  end;
-
-  gz_headerp = ^gz_header;
-  gz_header = packed record
-    text: Integer;        (* true if compressed data believed to be text *)
-    time: LongInt;        (* modification time *)
-    xflags: Integer;      (* extra flags (not used when writing a gzip file) *)
-    os: Integer;          (* operating system *)
-    extra: PChar;         (* pointer to extra field or Z_NULL if none *)
-    extra_len: Integer;   (* extra field length (valid if extra != Z_NULL) *)
-    extra_max: Integer;   (* space at extra (only when reading header) *)
-    name: PChar;          (* pointer to zero-terminated file name or Z_NULL *)
-    name_max: Integer;    (* space at name (only when reading header) *)
-    comment: PChar;       (* pointer to zero-terminated comment or Z_NULL *)
-    comm_max: Integer;    (* space at comment (only when reading header) *)
-    hcrc: Integer;        (* true if there was or will be a header crc *)
-    done: Integer;        (* true when done reading gzip header *)
-  end;
-
-(* constants *)
-const
-  Z_NO_FLUSH      = 0;
-  Z_PARTIAL_FLUSH = 1;
-  Z_SYNC_FLUSH    = 2;
-  Z_FULL_FLUSH    = 3;
-  Z_FINISH        = 4;
-  Z_BLOCK         = 5;
-  Z_TREES         = 6;
-
-  Z_OK            =  0;
-  Z_STREAM_END    =  1;
-  Z_NEED_DICT     =  2;
-  Z_ERRNO         = -1;
-  Z_STREAM_ERROR  = -2;
-  Z_DATA_ERROR    = -3;
-  Z_MEM_ERROR     = -4;
-  Z_BUF_ERROR     = -5;
-  Z_VERSION_ERROR = -6;
-
-  Z_NO_COMPRESSION       =  0;
-  Z_BEST_SPEED           =  1;
-  Z_BEST_COMPRESSION     =  9;
-  Z_DEFAULT_COMPRESSION  = -1;
-
-  Z_FILTERED            = 1;
-  Z_HUFFMAN_ONLY        = 2;
-  Z_RLE                 = 3;
-  Z_FIXED               = 4;
-  Z_DEFAULT_STRATEGY    = 0;
-
-  Z_BINARY   = 0;
-  Z_TEXT     = 1;
-  Z_ASCII    = 1;
-  Z_UNKNOWN  = 2;
-
-  Z_DEFLATED = 8;
-
-(* basic functions *)
-function zlibVersion: PChar;
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-function deflate(var strm: z_stream; flush: Integer): Integer;
-function deflateEnd(var strm: z_stream): Integer;
-function inflateInit(var strm: z_stream): Integer;
-function inflate(var strm: z_stream; flush: Integer): Integer;
-function inflateEnd(var strm: z_stream): Integer;
-
-(* advanced functions *)
-function deflateInit2(var strm: z_stream; level, method, windowBits,
-                      memLevel, strategy: Integer): Integer;
-function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function deflateCopy(var dest, source: z_stream): Integer;
-function deflateReset(var strm: z_stream): Integer;
-function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;
-function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer;
-function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;
-function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer;
-function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function deflateSetHeader(var strm: z_stream; head: gz_header): Integer;
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function inflateSync(var strm: z_stream): Integer;
-function inflateCopy(var dest, source: z_stream): Integer;
-function inflateReset(var strm: z_stream): Integer;
-function inflateReset2(var strm: z_stream; windowBits: Integer): Integer;
-function inflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function inflateMark(var strm: z_stream): LongInt;
-function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer;
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;
-                     out_fn: out_func; out_desc: Pointer): Integer;
-function inflateBackEnd(var strm: z_stream): Integer;
-function zlibCompileFlags: LongInt;
-
-(* utility functions *)
-function compress(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt): Integer;
-function compress2(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt;
-                  level: Integer): Integer;
-function compressBound(sourceLen: LongInt): LongInt;
-function uncompress(dest: PChar; var destLen: LongInt;
-                    const source: PChar; sourceLen: LongInt): Integer;
-
-(* checksum functions *)
-function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;
-function adler32_combine(adler1, adler2, len2: LongInt): LongInt;
-function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;
-function crc32_combine(crc1, crc2, len2: LongInt): LongInt;
-
-(* various hacks, don't look :) *)
-function deflateInit_(var strm: z_stream; level: Integer;
-                      const version: PChar; stream_size: Integer): Integer;
-function inflateInit_(var strm: z_stream; const version: PChar;
-                      stream_size: Integer): Integer;
-function deflateInit2_(var strm: z_stream;
-                       level, method, windowBits, memLevel, strategy: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateInit2_(var strm: z_stream; windowBits: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateBackInit_(var strm: z_stream;
-                          windowBits: Integer; window: PChar;
-                          const version: PChar; stream_size: Integer): Integer;
-
-
-implementation
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-function adler32; external;
-function adler32_combine; external;
-function compress; external;
-function compress2; external;
-function compressBound; external;
-function crc32; external;
-function crc32_combine; external;
-function deflate; external;
-function deflateBound; external;
-function deflateCopy; external;
-function deflateEnd; external;
-function deflateInit_; external;
-function deflateInit2_; external;
-function deflateParams; external;
-function deflatePending; external;
-function deflatePrime; external;
-function deflateReset; external;
-function deflateSetDictionary; external;
-function deflateSetHeader; external;
-function deflateTune; external;
-function inflate; external;
-function inflateBack; external;
-function inflateBackEnd; external;
-function inflateBackInit_; external;
-function inflateCopy; external;
-function inflateEnd; external;
-function inflateGetHeader; external;
-function inflateInit_; external;
-function inflateInit2_; external;
-function inflateMark; external;
-function inflatePrime; external;
-function inflateReset; external;
-function inflateReset2; external;
-function inflateSetDictionary; external;
-function inflateSync; external;
-function uncompress; external;
-function zlibCompileFlags; external;
-function zlibVersion; external;
-
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-begin
-  Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel,
-                      strategy: Integer): Integer;
-begin
-  Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                          ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit(var strm: z_stream): Integer;
-begin
-  Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-begin
-  Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-begin
-  Result := inflateBackInit_(strm, windowBits, window,
-                             ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
-  GetMem(Result, Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
-  FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
-  Move(source^, dest^, count);
-end;
-
-end.

crates/libz-sys/src/zlib/contrib/puff/Makefile

diff --git a/crates/libz-sys/src/zlib/contrib/puff/Makefile b/crates/libz-sys/src/zlib/contrib/puff/Makefile
deleted file mode 100644
index 0e2594c..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-CFLAGS=-O
-
-puff: puff.o pufftest.o
-
-puff.o: puff.h
-
-pufftest.o: puff.h
-
-test: puff
-	puff zeros.raw
-
-puft: puff.c puff.h pufftest.o
-	cc -fprofile-arcs -ftest-coverage -o puft puff.c pufftest.o
-
-# puff full coverage test (should say 100%)
-cov: puft
-	@rm -f *.gcov *.gcda
-	@puft -w zeros.raw 2>&1 | cat > /dev/null
-	@echo '04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '00 00 00 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 254
-	@echo '00 01 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '01 01 00 fe ff 0a' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
-	@echo '02 7e ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '02' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '04 80 49 92 24 49 92 24 71 ff ff 93 11 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 249
-	@echo '04 c0 81 08 00 00 00 00 20 7f eb 0b 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '0b 00 00' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
-	@echo '1a 07' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '0c c0 81 00 00 00 00 00 90 ff 6b 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 245
-	@puft -f zeros.raw 2>&1 | cat > /dev/null
-	@echo 'fc 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 253
-	@echo '04 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 252
-	@echo '04 00 24 49' | xxd -r -p | puft 2> /dev/null || test $$? -eq 251
-	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 84' | xxd -r -p | puft 2> /dev/null || test $$? -eq 248
-	@echo '04 00 24 e9 ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 250
-	@echo '04 00 24 e9 ff 6d' | xxd -r -p | puft 2> /dev/null || test $$? -eq 247
-	@gcov -n puff.c
-
-clean:
-	rm -f puff puft *.o *.gc*

crates/libz-sys/src/zlib/contrib/puff/README

diff --git a/crates/libz-sys/src/zlib/contrib/puff/README b/crates/libz-sys/src/zlib/contrib/puff/README
deleted file mode 100644
index bbc4cb5..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/README
+++ /dev/null
@@ -1,63 +0,0 @@
-Puff -- A Simple Inflate
-3 Mar 2003
-Mark Adler
-madler@alumni.caltech.edu
-
-What this is --
-
-puff.c provides the routine puff() to decompress the deflate data format.  It
-does so more slowly than zlib, but the code is about one-fifth the size of the
-inflate code in zlib, and written to be very easy to read.
-
-Why I wrote this --
-
-puff.c was written to document the deflate format unambiguously, by virtue of
-being working C code.  It is meant to supplement RFC 1951, which formally
-describes the deflate format.  I have received many questions on details of the
-deflate format, and I hope that reading this code will answer those questions.
-puff.c is heavily commented with details of the deflate format, especially
-those little nooks and cranies of the format that might not be obvious from a
-specification.
-
-puff.c may also be useful in applications where code size or memory usage is a
-very limited resource, and speed is not as important.
-
-How to use it --
-
-Well, most likely you should just be reading puff.c and using zlib for actual
-applications, but if you must ...
-
-Include puff.h in your code, which provides this prototype:
-
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         unsigned char *source,         /* pointer to source data pointer */
-         unsigned long *sourcelen);     /* amount of input available */
-
-Then you can call puff() to decompress a deflate stream that is in memory in
-its entirety at source, to a sufficiently sized block of memory for the
-decompressed data at dest.  puff() is the only external symbol in puff.c  The
-only C library functions that puff.c needs are setjmp() and longjmp(), which
-are used to simplify error checking in the code to improve readabilty.  puff.c
-does no memory allocation, and uses less than 2K bytes off of the stack.
-
-If destlen is not enough space for the uncompressed data, then inflate will
-return an error without writing more than destlen bytes.  Note that this means
-that in order to decompress the deflate data successfully, you need to know
-the size of the uncompressed data ahead of time.
-
-If needed, puff() can determine the size of the uncompressed data with no
-output space.  This is done by passing dest equal to (unsigned char *)0.  Then
-the initial value of *destlen is ignored and *destlen is set to the length of
-the uncompressed data.  So if the size of the uncompressed data is not known,
-then two passes of puff() can be used--first to determine the size, and second
-to do the actual inflation after allocating the appropriate memory.  Not
-pretty, but it works.  (This is one of the reasons you should be using zlib.)
-
-The deflate format is self-terminating.  If the deflate stream does not end
-in *sourcelen bytes, puff() will return an error without reading at or past
-endsource.
-
-On return, *sourcelen is updated to the amount of input data consumed, and
-*destlen is updated to the size of the uncompressed data.  See the comments
-in puff.c for the possible return codes for puff().

crates/libz-sys/src/zlib/contrib/puff/puff.c

diff --git a/crates/libz-sys/src/zlib/contrib/puff/puff.c b/crates/libz-sys/src/zlib/contrib/puff/puff.c
deleted file mode 100644
index c6c90d7..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/puff.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * puff.c
- * Copyright (C) 2002-2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in puff.h
- * version 2.3, 21 Jan 2013
- *
- * puff.c is a simple inflate written to be an unambiguous way to specify the
- * deflate format.  It is not written for speed but rather simplicity.  As a
- * side benefit, this code might actually be useful when small code is more
- * important than speed, such as bootstrap applications.  For typical deflate
- * data, zlib's inflate() is about four times as fast as puff().  zlib's
- * inflate compiles to around 20K on my machine, whereas puff.c compiles to
- * around 4K on my machine (a PowerPC using GNU cc).  If the faster decode()
- * function here is used, then puff() is only twice as slow as zlib's
- * inflate().
- *
- * All dynamically allocated memory comes from the stack.  The stack required
- * is less than 2K bytes.  This code is compatible with 16-bit int's and
- * assumes that long's are at least 32 bits.  puff.c uses the short data type,
- * assumed to be 16 bits, for arrays in order to conserve memory.  The code
- * works whether integers are stored big endian or little endian.
- *
- * In the comments below are "Format notes" that describe the inflate process
- * and document some of the less obvious aspects of the format.  This source
- * code is meant to supplement RFC 1951, which formally describes the deflate
- * format:
- *
- *    http://www.zlib.org/rfc-deflate.html
- */
-
-/*
- * Change history:
- *
- * 1.0  10 Feb 2002     - First version
- * 1.1  17 Feb 2002     - Clarifications of some comments and notes
- *                      - Update puff() dest and source pointers on negative
- *                        errors to facilitate debugging deflators
- *                      - Remove longest from struct huffman -- not needed
- *                      - Simplify offs[] index in construct()
- *                      - Add input size and checking, using longjmp() to
- *                        maintain easy readability
- *                      - Use short data type for large arrays
- *                      - Use pointers instead of long to specify source and
- *                        destination sizes to avoid arbitrary 4 GB limits
- * 1.2  17 Mar 2002     - Add faster version of decode(), doubles speed (!),
- *                        but leave simple version for readabilty
- *                      - Make sure invalid distances detected if pointers
- *                        are 16 bits
- *                      - Fix fixed codes table error
- *                      - Provide a scanning mode for determining size of
- *                        uncompressed data
- * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Gailly]
- *                      - Add a puff.h file for the interface
- *                      - Add braces in puff() for else do [Gailly]
- *                      - Use indexes instead of pointers for readability
- * 1.4  31 Mar 2002     - Simplify construct() code set check
- *                      - Fix some comments
- *                      - Add FIXLCODES #define
- * 1.5   6 Apr 2002     - Minor comment fixes
- * 1.6   7 Aug 2002     - Minor format changes
- * 1.7   3 Mar 2003     - Added test code for distribution
- *                      - Added zlib-like license
- * 1.8   9 Jan 2004     - Added some comments on no distance codes case
- * 1.9  21 Feb 2008     - Fix bug on 16-bit integer architectures [Pohland]
- *                      - Catch missing end-of-block symbol error
- * 2.0  25 Jul 2008     - Add #define to permit distance too far back
- *                      - Add option in TEST code for puff to write the data
- *                      - Add option in TEST code to skip input bytes
- *                      - Allow TEST code to read from piped stdin
- * 2.1   4 Apr 2010     - Avoid variable initialization for happier compilers
- *                      - Avoid unsigned comparisons for even happier compilers
- * 2.2  25 Apr 2010     - Fix bug in variable initializations [Oberhumer]
- *                      - Add const where appropriate [Oberhumer]
- *                      - Split if's and ?'s for coverage testing
- *                      - Break out test code to separate file
- *                      - Move NIL to puff.h
- *                      - Allow incomplete code only if single code length is 1
- *                      - Add full code coverage test to Makefile
- * 2.3  21 Jan 2013     - Check for invalid code length codes in dynamic blocks
- */
-
-#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
-#include "puff.h"               /* prototype for puff() */
-
-#define local static            /* for local function definitions */
-
-/*
- * Maximums for allocations and loops.  It is not useful to change these --
- * they are fixed by the deflate format.
- */
-#define MAXBITS 15              /* maximum bits in a code */
-#define MAXLCODES 286           /* maximum number of literal/length codes */
-#define MAXDCODES 30            /* maximum number of distance codes */
-#define MAXCODES (MAXLCODES+MAXDCODES)  /* maximum codes lengths to read */
-#define FIXLCODES 288           /* number of fixed literal/length codes */
-
-/* input and output state */
-struct state {
-    /* output state */
-    unsigned char *out;         /* output buffer */
-    unsigned long outlen;       /* available space at out */
-    unsigned long outcnt;       /* bytes written to out so far */
-
-    /* input state */
-    const unsigned char *in;    /* input buffer */
-    unsigned long inlen;        /* available input at in */
-    unsigned long incnt;        /* bytes read so far */
-    int bitbuf;                 /* bit buffer */
-    int bitcnt;                 /* number of bits in bit buffer */
-
-    /* input limit error return state for bits() and decode() */
-    jmp_buf env;
-};
-
-/*
- * Return need bits from the input stream.  This always leaves less than
- * eight bits in the buffer.  bits() works properly for need == 0.
- *
- * Format notes:
- *
- * - Bits are stored in bytes from the least significant bit to the most
- *   significant bit.  Therefore bits are dropped from the bottom of the bit
- *   buffer, using shift right, and new bytes are appended to the top of the
- *   bit buffer, using shift left.
- */
-local int bits(struct state *s, int need)
-{
-    long val;           /* bit accumulator (can use up to 20 bits) */
-
-    /* load at least need bits into val */
-    val = s->bitbuf;
-    while (s->bitcnt < need) {
-        if (s->incnt == s->inlen)
-            longjmp(s->env, 1);         /* out of input */
-        val |= (long)(s->in[s->incnt++]) << s->bitcnt;  /* load eight bits */
-        s->bitcnt += 8;
-    }
-
-    /* drop need bits and update buffer, always zero to seven bits left */
-    s->bitbuf = (int)(val >> need);
-    s->bitcnt -= need;
-
-    /* return need bits, zeroing the bits above that */
-    return (int)(val & ((1L << need) - 1));
-}
-
-/*
- * Process a stored block.
- *
- * Format notes:
- *
- * - After the two-bit stored block type (00), the stored block length and
- *   stored bytes are byte-aligned for fast copying.  Therefore any leftover
- *   bits in the byte that has the last bit of the type, as many as seven, are
- *   discarded.  The value of the discarded bits are not defined and should not
- *   be checked against any expectation.
- *
- * - The second inverted copy of the stored block length does not have to be
- *   checked, but it's probably a good idea to do so anyway.
- *
- * - A stored block can have zero length.  This is sometimes used to byte-align
- *   subsets of the compressed data for random access or partial recovery.
- */
-local int stored(struct state *s)
-{
-    unsigned len;       /* length of stored block */
-
-    /* discard leftover bits from current byte (assumes s->bitcnt < 8) */
-    s->bitbuf = 0;
-    s->bitcnt = 0;
-
-    /* get length and check against its one's complement */
-    if (s->incnt + 4 > s->inlen)
-        return 2;                               /* not enough input */
-    len = s->in[s->incnt++];
-    len |= s->in[s->incnt++] << 8;
-    if (s->in[s->incnt++] != (~len & 0xff) ||
-        s->in[s->incnt++] != ((~len >> 8) & 0xff))
-        return -2;                              /* didn't match complement! */
-
-    /* copy len bytes from in to out */
-    if (s->incnt + len > s->inlen)
-        return 2;                               /* not enough input */
-    if (s->out != NIL) {
-        if (s->outcnt + len > s->outlen)
-            return 1;                           /* not enough output space */
-        while (len--)
-            s->out[s->outcnt++] = s->in[s->incnt++];
-    }
-    else {                                      /* just scanning */
-        s->outcnt += len;
-        s->incnt += len;
-    }
-
-    /* done with a valid stored block */
-    return 0;
-}
-
-/*
- * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
- * each length, which for a canonical code are stepped through in order.
- * symbol[] are the symbol values in canonical order, where the number of
- * entries is the sum of the counts in count[].  The decoding process can be
- * seen in the function decode() below.
- */
-struct huffman {
-    short *count;       /* number of symbols of each length */
-    short *symbol;      /* canonically ordered symbols */
-};
-
-/*
- * Decode a code from the stream s using huffman table h.  Return the symbol or
- * a negative value if there is an error.  If all of the lengths are zero, i.e.
- * an empty code, or if the code is incomplete and an invalid code is received,
- * then -10 is returned after reading MAXBITS bits.
- *
- * Format notes:
- *
- * - The codes as stored in the compressed data are bit-reversed relative to
- *   a simple integer ordering of codes of the same lengths.  Hence below the
- *   bits are pulled from the compressed data one at a time and used to
- *   build the code value reversed from what is in the stream in order to
- *   permit simple integer comparisons for decoding.  A table-based decoding
- *   scheme (as used in zlib) does not need to do this reversal.
- *
- * - The first code for the shortest length is all zeros.  Subsequent codes of
- *   the same length are simply integer increments of the previous code.  When
- *   moving up a length, a zero bit is appended to the code.  For a complete
- *   code, the last code of the longest length will be all ones.
- *
- * - Incomplete codes are handled by this decoder, since they are permitted
- *   in the deflate format.  See the format notes for fixed() and dynamic().
- */
-#ifdef SLOW
-local int decode(struct state *s, const struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-
-    code = first = index = 0;
-    for (len = 1; len <= MAXBITS; len++) {
-        code |= bits(s, 1);             /* get next bit */
-        count = h->count[len];
-        if (code - count < first)       /* if length len, return symbol */
-            return h->symbol[index + (code - first)];
-        index += count;                 /* else update for next length */
-        first += count;
-        first <<= 1;
-        code <<= 1;
-    }
-    return -10;                         /* ran out of codes */
-}
-
-/*
- * A faster version of decode() for real applications of this code.   It's not
- * as readable, but it makes puff() twice as fast.  And it only makes the code
- * a few percent larger.
- */
-#else /* !SLOW */
-local int decode(struct state *s, const struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-    int bitbuf;         /* bits from stream */
-    int left;           /* bits left in next or left to process */
-    short *next;        /* next number of codes */
-
-    bitbuf = s->bitbuf;
-    left = s->bitcnt;
-    code = first = index = 0;
-    len = 1;
-    next = h->count + 1;
-    while (1) {
-        while (left--) {
-            code |= bitbuf & 1;
-            bitbuf >>= 1;
-            count = *next++;
-            if (code - count < first) { /* if length len, return symbol */
-                s->bitbuf = bitbuf;
-                s->bitcnt = (s->bitcnt - len) & 7;
-                return h->symbol[index + (code - first)];
-            }
-            index += count;             /* else update for next length */
-            first += count;
-            first <<= 1;
-            code <<= 1;
-            len++;
-        }
-        left = (MAXBITS+1) - len;
-        if (left == 0)
-            break;
-        if (s->incnt == s->inlen)
-            longjmp(s->env, 1);         /* out of input */
-        bitbuf = s->in[s->incnt++];
-        if (left > 8)
-            left = 8;
-    }
-    return -10;                         /* ran out of codes */
-}
-#endif /* SLOW */
-
-/*
- * Given the list of code lengths length[0..n-1] representing a canonical
- * Huffman code for n symbols, construct the tables required to decode those
- * codes.  Those tables are the number of codes of each length, and the symbols
- * sorted by length, retaining their original order within each length.  The
- * return value is zero for a complete code set, negative for an over-
- * subscribed code set, and positive for an incomplete code set.  The tables
- * can be used if the return value is zero or positive, but they cannot be used
- * if the return value is negative.  If the return value is zero, it is not
- * possible for decode() using that table to return an error--any stream of
- * enough bits will resolve to a symbol.  If the return value is positive, then
- * it is possible for decode() using that table to return an error for received
- * codes past the end of the incomplete lengths.
- *
- * Not used by decode(), but used for error checking, h->count[0] is the number
- * of the n symbols not in the code.  So n - h->count[0] is the number of
- * codes.  This is useful for checking for incomplete codes that have more than
- * one symbol, which is an error in a dynamic block.
- *
- * Assumption: for all i in 0..n-1, 0 <= length[i] <= MAXBITS
- * This is assured by the construction of the length arrays in dynamic() and
- * fixed() and is not verified by construct().
- *
- * Format notes:
- *
- * - Permitted and expected examples of incomplete codes are one of the fixed
- *   codes and any code with a single symbol which in deflate is coded as one
- *   bit instead of zero bits.  See the format notes for fixed() and dynamic().
- *
- * - Within a given code length, the symbols are kept in ascending order for
- *   the code bits definition.
- */
-local int construct(struct huffman *h, const short *length, int n)
-{
-    int symbol;         /* current symbol when stepping through length[] */
-    int len;            /* current length when stepping through h->count[] */
-    int left;           /* number of possible codes left of current length */
-    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
-
-    /* count number of codes of each length */
-    for (len = 0; len <= MAXBITS; len++)
-        h->count[len] = 0;
-    for (symbol = 0; symbol < n; symbol++)
-        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
-    if (h->count[0] == n)               /* no codes! */
-        return 0;                       /* complete, but decode() will fail */
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;                           /* one possible code of zero length */
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;                     /* one more bit, double codes left */
-        left -= h->count[len];          /* deduct count from possible codes */
-        if (left < 0)
-            return left;                /* over-subscribed--return negative */
-    }                                   /* left > 0 means incomplete */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + h->count[len];
-
-    /*
-     * put symbols in table sorted by length, by symbol order within each
-     * length
-     */
-    for (symbol = 0; symbol < n; symbol++)
-        if (length[symbol] != 0)
-            h->symbol[offs[length[symbol]]++] = symbol;
-
-    /* return zero for complete set, positive for incomplete set */
-    return left;
-}
-
-/*
- * Decode literal/length and distance codes until an end-of-block code.
- *
- * Format notes:
- *
- * - Compressed data that is after the block type if fixed or after the code
- *   description if dynamic is a combination of literals and length/distance
- *   pairs terminated by and end-of-block code.  Literals are simply Huffman
- *   coded bytes.  A length/distance pair is a coded length followed by a
- *   coded distance to represent a string that occurs earlier in the
- *   uncompressed data that occurs again at the current location.
- *
- * - Literals, lengths, and the end-of-block code are combined into a single
- *   code of up to 286 symbols.  They are 256 literals (0..255), 29 length
- *   symbols (257..285), and the end-of-block symbol (256).
- *
- * - There are 256 possible lengths (3..258), and so 29 symbols are not enough
- *   to represent all of those.  Lengths 3..10 and 258 are in fact represented
- *   by just a length symbol.  Lengths 11..257 are represented as a symbol and
- *   some number of extra bits that are added as an integer to the base length
- *   of the length symbol.  The number of extra bits is determined by the base
- *   length symbol.  These are in the static arrays below, lens[] for the base
- *   lengths and lext[] for the corresponding number of extra bits.
- *
- * - The reason that 258 gets its own symbol is that the longest length is used
- *   often in highly redundant files.  Note that 258 can also be coded as the
- *   base value 227 plus the maximum extra value of 31.  While a good deflate
- *   should never do this, it is not an error, and should be decoded properly.
- *
- * - If a length is decoded, including its extra bits if any, then it is
- *   followed a distance code.  There are up to 30 distance symbols.  Again
- *   there are many more possible distances (1..32768), so extra bits are added
- *   to a base value represented by the symbol.  The distances 1..4 get their
- *   own symbol, but the rest require extra bits.  The base distances and
- *   corresponding number of extra bits are below in the static arrays dist[]
- *   and dext[].
- *
- * - Literal bytes are simply written to the output.  A length/distance pair is
- *   an instruction to copy previously uncompressed bytes to the output.  The
- *   copy is from distance bytes back in the output stream, copying for length
- *   bytes.
- *
- * - Distances pointing before the beginning of the output data are not
- *   permitted.
- *
- * - Overlapped copies, where the length is greater than the distance, are
- *   allowed and common.  For example, a distance of one and a length of 258
- *   simply copies the last byte 258 times.  A distance of four and a length of
- *   twelve copies the last four bytes three times.  A simple forward copy
- *   ignoring whether the length is greater than the distance or not implements
- *   this correctly.  You should not use memcpy() since its behavior is not
- *   defined for overlapped arrays.  You should not use memmove() or bcopy()
- *   since though their behavior -is- defined for overlapping arrays, it is
- *   defined to do the wrong thing in this case.
- */
-local int codes(struct state *s,
-                const struct huffman *lencode,
-                const struct huffman *distcode)
-{
-    int symbol;         /* decoded symbol */
-    int len;            /* length for copy */
-    unsigned dist;      /* distance for copy */
-    static const short lens[29] = { /* Size base for length codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258};
-    static const short lext[29] = { /* Extra bits for length codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0};
-    static const short dists[30] = { /* Offset base for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-    static const short dext[30] = { /* Extra bits for distance codes 0..29 */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-    /* decode literals and length/distance pairs */
-    do {
-        symbol = decode(s, lencode);
-        if (symbol < 0)
-            return symbol;              /* invalid symbol */
-        if (symbol < 256) {             /* literal: symbol is the byte */
-            /* write out the literal */
-            if (s->out != NIL) {
-                if (s->outcnt == s->outlen)
-                    return 1;
-                s->out[s->outcnt] = symbol;
-            }
-            s->outcnt++;
-        }
-        else if (symbol > 256) {        /* length */
-            /* get and compute length */
-            symbol -= 257;
-            if (symbol >= 29)
-                return -10;             /* invalid fixed code */
-            len = lens[symbol] + bits(s, lext[symbol]);
-
-            /* get and check distance */
-            symbol = decode(s, distcode);
-            if (symbol < 0)
-                return symbol;          /* invalid symbol */
-            dist = dists[symbol] + bits(s, dext[symbol]);
-#ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-            if (dist > s->outcnt)
-                return -11;     /* distance too far back */
-#endif
-
-            /* copy length bytes from distance bytes back */
-            if (s->out != NIL) {
-                if (s->outcnt + len > s->outlen)
-                    return 1;
-                while (len--) {
-                    s->out[s->outcnt] =
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        dist > s->outcnt ?
-                            0 :
-#endif
-                            s->out[s->outcnt - dist];
-                    s->outcnt++;
-                }
-            }
-            else
-                s->outcnt += len;
-        }
-    } while (symbol != 256);            /* end of block symbol */
-
-    /* done with a valid fixed or dynamic block */
-    return 0;
-}
-
-/*
- * Process a fixed codes block.
- *
- * Format notes:
- *
- * - This block type can be useful for compressing small amounts of data for
- *   which the size of the code descriptions in a dynamic block exceeds the
- *   benefit of custom codes for that block.  For fixed codes, no bits are
- *   spent on code descriptions.  Instead the code lengths for literal/length
- *   codes and distance codes are fixed.  The specific lengths for each symbol
- *   can be seen in the "for" loops below.
- *
- * - The literal/length code is complete, but has two symbols that are invalid
- *   and should result in an error if received.  This cannot be implemented
- *   simply as an incomplete code since those two symbols are in the "middle"
- *   of the code.  They are eight bits long and the longest literal/length\
- *   code is nine bits.  Therefore the code must be constructed with those
- *   symbols, and the invalid symbols must be detected after decoding.
- *
- * - The fixed distance codes also have two invalid symbols that should result
- *   in an error if received.  Since all of the distance codes are the same
- *   length, this can be implemented as an incomplete code.  Then the invalid
- *   codes are detected while decoding.
- */
-local int fixed(struct state *s)
-{
-    static int virgin = 1;
-    static short lencnt[MAXBITS+1], lensym[FIXLCODES];
-    static short distcnt[MAXBITS+1], distsym[MAXDCODES];
-    static struct huffman lencode, distcode;
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        int symbol;
-        short lengths[FIXLCODES];
-
-        /* construct lencode and distcode */
-        lencode.count = lencnt;
-        lencode.symbol = lensym;
-        distcode.count = distcnt;
-        distcode.symbol = distsym;
-
-        /* literal/length table */
-        for (symbol = 0; symbol < 144; symbol++)
-            lengths[symbol] = 8;
-        for (; symbol < 256; symbol++)
-            lengths[symbol] = 9;
-        for (; symbol < 280; symbol++)
-            lengths[symbol] = 7;
-        for (; symbol < FIXLCODES; symbol++)
-            lengths[symbol] = 8;
-        construct(&lencode, lengths, FIXLCODES);
-
-        /* distance table */
-        for (symbol = 0; symbol < MAXDCODES; symbol++)
-            lengths[symbol] = 5;
-        construct(&distcode, lengths, MAXDCODES);
-
-        /* do this just once */
-        virgin = 0;
-    }
-
-    /* decode data until end-of-block code */
-    return codes(s, &lencode, &distcode);
-}
-
-/*
- * Process a dynamic codes block.
- *
- * Format notes:
- *
- * - A dynamic block starts with a description of the literal/length and
- *   distance codes for that block.  New dynamic blocks allow the compressor to
- *   rapidly adapt to changing data with new codes optimized for that data.
- *
- * - The codes used by the deflate format are "canonical", which means that
- *   the actual bits of the codes are generated in an unambiguous way simply
- *   from the number of bits in each code.  Therefore the code descriptions
- *   are simply a list of code lengths for each symbol.
- *
- * - The code lengths are stored in order for the symbols, so lengths are
- *   provided for each of the literal/length symbols, and for each of the
- *   distance symbols.
- *
- * - If a symbol is not used in the block, this is represented by a zero as
- *   as the code length.  This does not mean a zero-length code, but rather
- *   that no code should be created for this symbol.  There is no way in the
- *   deflate format to represent a zero-length code.
- *
- * - The maximum number of bits in a code is 15, so the possible lengths for
- *   any code are 1..15.
- *
- * - The fact that a length of zero is not permitted for a code has an
- *   interesting consequence.  Normally if only one symbol is used for a given
- *   code, then in fact that code could be represented with zero bits.  However
- *   in deflate, that code has to be at least one bit.  So for example, if
- *   only a single distance base symbol appears in a block, then it will be
- *   represented by a single code of length one, in particular one 0 bit.  This
- *   is an incomplete code, since if a 1 bit is received, it has no meaning,
- *   and should result in an error.  So incomplete distance codes of one symbol
- *   should be permitted, and the receipt of invalid codes should be handled.
- *
- * - It is also possible to have a single literal/length code, but that code
- *   must be the end-of-block code, since every dynamic block has one.  This
- *   is not the most efficient way to create an empty block (an empty fixed
- *   block is fewer bits), but it is allowed by the format.  So incomplete
- *   literal/length codes of one symbol should also be permitted.
- *
- * - If there are only literal codes and no lengths, then there are no distance
- *   codes.  This is represented by one distance code with zero bits.
- *
- * - The list of up to 286 length/literal lengths and up to 30 distance lengths
- *   are themselves compressed using Huffman codes and run-length encoding.  In
- *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
- *   that length, and the symbols 16, 17, and 18 are run-length instructions.
- *   Each of 16, 17, and 18 are follwed by extra bits to define the length of
- *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
- *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols
- *   are common, hence the special coding for zero lengths.
- *
- * - The symbols for 0..18 are Huffman coded, and so that code must be
- *   described first.  This is simply a sequence of up to 19 three-bit values
- *   representing no code (0) or the code length for that symbol (1..7).
- *
- * - A dynamic block starts with three fixed-size counts from which is computed
- *   the number of literal/length code lengths, the number of distance code
- *   lengths, and the number of code length code lengths (ok, you come up with
- *   a better name!) in the code descriptions.  For the literal/length and
- *   distance codes, lengths after those provided are considered zero, i.e. no
- *   code.  The code length code lengths are received in a permuted order (see
- *   the order[] array below) to make a short code length code length list more
- *   likely.  As it turns out, very short and very long codes are less likely
- *   to be seen in a dynamic code description, hence what may appear initially
- *   to be a peculiar ordering.
- *
- * - Given the number of literal/length code lengths (nlen) and distance code
- *   lengths (ndist), then they are treated as one long list of nlen + ndist
- *   code lengths.  Therefore run-length coding can and often does cross the
- *   boundary between the two sets of lengths.
- *
- * - So to summarize, the code description at the start of a dynamic block is
- *   three counts for the number of code lengths for the literal/length codes,
- *   the distance codes, and the code length codes.  This is followed by the
- *   code length code lengths, three bits each.  This is used to construct the
- *   code length code which is used to read the remainder of the lengths.  Then
- *   the literal/length code lengths and distance lengths are read as a single
- *   set of lengths using the code length codes.  Codes are constructed from
- *   the resulting two sets of lengths, and then finally you can start
- *   decoding actual compressed data in the block.
- *
- * - For reference, a "typical" size for the code description in a dynamic
- *   block is around 80 bytes.
- */
-local int dynamic(struct state *s)
-{
-    int nlen, ndist, ncode;             /* number of lengths in descriptor */
-    int index;                          /* index of lengths[] */
-    int err;                            /* construct() return value */
-    short lengths[MAXCODES];            /* descriptor code lengths */
-    short lencnt[MAXBITS+1], lensym[MAXLCODES];         /* lencode memory */
-    short distcnt[MAXBITS+1], distsym[MAXDCODES];       /* distcode memory */
-    struct huffman lencode, distcode;   /* length and distance codes */
-    static const short order[19] =      /* permutation of code length codes */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* construct lencode and distcode */
-    lencode.count = lencnt;
-    lencode.symbol = lensym;
-    distcode.count = distcnt;
-    distcode.symbol = distsym;
-
-    /* get number of lengths in each table, check lengths */
-    nlen = bits(s, 5) + 257;
-    ndist = bits(s, 5) + 1;
-    ncode = bits(s, 4) + 4;
-    if (nlen > MAXLCODES || ndist > MAXDCODES)
-        return -3;                      /* bad counts */
-
-    /* read code length code lengths (really), missing lengths are zero */
-    for (index = 0; index < ncode; index++)
-        lengths[order[index]] = bits(s, 3);
-    for (; index < 19; index++)
-        lengths[order[index]] = 0;
-
-    /* build huffman table for code lengths codes (use lencode temporarily) */
-    err = construct(&lencode, lengths, 19);
-    if (err != 0)               /* require complete code set here */
-        return -4;
-
-    /* read length/literal and distance code length tables */
-    index = 0;
-    while (index < nlen + ndist) {
-        int symbol;             /* decoded value */
-        int len;                /* last length to repeat */
-
-        symbol = decode(s, &lencode);
-        if (symbol < 0)
-            return symbol;          /* invalid symbol */
-        if (symbol < 16)                /* length in 0..15 */
-            lengths[index++] = symbol;
-        else {                          /* repeat instruction */
-            len = 0;                    /* assume repeating zeros */
-            if (symbol == 16) {         /* repeat last length 3..6 times */
-                if (index == 0)
-                    return -5;          /* no last length! */
-                len = lengths[index - 1];       /* last length */
-                symbol = 3 + bits(s, 2);
-            }
-            else if (symbol == 17)      /* repeat zero 3..10 times */
-                symbol = 3 + bits(s, 3);
-            else                        /* == 18, repeat zero 11..138 times */
-                symbol = 11 + bits(s, 7);
-            if (index + symbol > nlen + ndist)
-                return -6;              /* too many lengths! */
-            while (symbol--)            /* repeat last or zero symbol times */
-                lengths[index++] = len;
-        }
-    }
-
-    /* check for end-of-block code -- there better be one! */
-    if (lengths[256] == 0)
-        return -9;
-
-    /* build huffman table for literal/length codes */
-    err = construct(&lencode, lengths, nlen);
-    if (err && (err < 0 || nlen != lencode.count[0] + lencode.count[1]))
-        return -7;      /* incomplete code ok only for single length 1 code */
-
-    /* build huffman table for distance codes */
-    err = construct(&distcode, lengths + nlen, ndist);
-    if (err && (err < 0 || ndist != distcode.count[0] + distcode.count[1]))
-        return -8;      /* incomplete code ok only for single length 1 code */
-
-    /* decode data until end-of-block code */
-    return codes(s, &lencode, &distcode);
-}
-
-/*
- * Inflate source to dest.  On return, destlen and sourcelen are updated to the
- * size of the uncompressed data and the size of the deflate data respectively.
- * On success, the return value of puff() is zero.  If there is an error in the
- * source data, i.e. it is not in the deflate format, then a negative value is
- * returned.  If there is not enough input available or there is not enough
- * output space, then a positive error is returned.  In that case, destlen and
- * sourcelen are not updated to facilitate retrying from the beginning with the
- * provision of more input data or more output space.  In the case of invalid
- * inflate data (a negative error), the dest and source pointers are updated to
- * facilitate the debugging of deflators.
- *
- * puff() also has a mode to determine the size of the uncompressed output with
- * no output written.  For this dest must be (unsigned char *)0.  In this case,
- * the input value of *destlen is ignored, and on return *destlen is set to the
- * size of the uncompressed output.
- *
- * The return codes are:
- *
- *   2:  available inflate data did not terminate
- *   1:  output space exhausted before completing inflate
- *   0:  successful inflate
- *  -1:  invalid block type (type == 3)
- *  -2:  stored block length did not match one's complement
- *  -3:  dynamic block code description: too many length or distance codes
- *  -4:  dynamic block code description: code lengths codes incomplete
- *  -5:  dynamic block code description: repeat lengths with no first length
- *  -6:  dynamic block code description: repeat more than specified lengths
- *  -7:  dynamic block code description: invalid literal/length code lengths
- *  -8:  dynamic block code description: invalid distance code lengths
- *  -9:  dynamic block code description: missing end-of-block code
- * -10:  invalid literal/length or distance code in fixed or dynamic block
- * -11:  distance is too far back in fixed or dynamic block
- *
- * Format notes:
- *
- * - Three bits are read for each block to determine the kind of block and
- *   whether or not it is the last block.  Then the block is decoded and the
- *   process repeated if it was not the last block.
- *
- * - The leftover bits in the last byte of the deflate data after the last
- *   block (if it was a fixed or dynamic block) are undefined and have no
- *   expected values to check.
- */
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         const unsigned char *source,   /* pointer to source data pointer */
-         unsigned long *sourcelen)      /* amount of input available */
-{
-    struct state s;             /* input/output state */
-    int last, type;             /* block information */
-    int err;                    /* return value */
-
-    /* initialize output state */
-    s.out = dest;
-    s.outlen = *destlen;                /* ignored if dest is NIL */
-    s.outcnt = 0;
-
-    /* initialize input state */
-    s.in = source;
-    s.inlen = *sourcelen;
-    s.incnt = 0;
-    s.bitbuf = 0;
-    s.bitcnt = 0;
-
-    /* return if bits() or decode() tries to read past available input */
-    if (setjmp(s.env) != 0)             /* if came back here via longjmp() */
-        err = 2;                        /* then skip do-loop, return error */
-    else {
-        /* process blocks until last block or error */
-        do {
-            last = bits(&s, 1);         /* one if last block */
-            type = bits(&s, 2);         /* block type 0..3 */
-            err = type == 0 ?
-                    stored(&s) :
-                    (type == 1 ?
-                        fixed(&s) :
-                        (type == 2 ?
-                            dynamic(&s) :
-                            -1));       /* type == 3, invalid */
-            if (err != 0)
-                break;                  /* return with error */
-        } while (!last);
-    }
-
-    /* update the lengths and return */
-    if (err <= 0) {
-        *destlen = s.outcnt;
-        *sourcelen = s.incnt;
-    }
-    return err;
-}

crates/libz-sys/src/zlib/contrib/puff/puff.h

diff --git a/crates/libz-sys/src/zlib/contrib/puff/puff.h b/crates/libz-sys/src/zlib/contrib/puff/puff.h
deleted file mode 100644
index e23a245..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/puff.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* puff.h
-  Copyright (C) 2002-2013 Mark Adler, all rights reserved
-  version 2.3, 21 Jan 2013
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-
-/*
- * See puff.c for purpose and usage.
- */
-#ifndef NIL
-#  define NIL ((unsigned char *)0)      /* for no output option */
-#endif
-
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         const unsigned char *source,   /* pointer to source data pointer */
-         unsigned long *sourcelen);     /* amount of input available */

crates/libz-sys/src/zlib/contrib/puff/pufftest.c

diff --git a/crates/libz-sys/src/zlib/contrib/puff/pufftest.c b/crates/libz-sys/src/zlib/contrib/puff/pufftest.c
deleted file mode 100644
index 7764814..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/pufftest.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * pufftest.c
- * Copyright (C) 2002-2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in puff.h
- * version 2.3, 21 Jan 2013
- */
-
-/* Example of how to use puff().
-
-   Usage: puff [-w] [-f] [-nnn] file
-          ... | puff [-w] [-f] [-nnn]
-
-   where file is the input file with deflate data, nnn is the number of bytes
-   of input to skip before inflating (e.g. to skip a zlib or gzip header), and
-   -w is used to write the decompressed data to stdout.  -f is for coverage
-   testing, and causes pufftest to fail with not enough output space (-f does
-   a write like -w, so -w is not required). */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "puff.h"
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#define local static
-
-/* Return size times approximately the cube root of 2, keeping the result as 1,
-   3, or 5 times a power of 2 -- the result is always > size, until the result
-   is the maximum value of an unsigned long, where it remains.  This is useful
-   to keep reallocations less than ~33% over the actual data. */
-local size_t bythirds(size_t size)
-{
-    int n;
-    size_t m;
-
-    m = size;
-    for (n = 0; m; n++)
-        m >>= 1;
-    if (n < 3)
-        return size + 1;
-    n -= 3;
-    m = size >> n;
-    m += m == 6 ? 2 : 1;
-    m <<= n;
-    return m > size ? m : (size_t)(-1);
-}
-
-/* Read the input file *name, or stdin if name is NULL, into allocated memory.
-   Reallocate to larger buffers until the entire file is read in.  Return a
-   pointer to the allocated data, or NULL if there was a memory allocation
-   failure.  *len is the number of bytes of data read from the input file (even
-   if load() returns NULL).  If the input file was empty or could not be opened
-   or read, *len is zero. */
-local void *load(const char *name, size_t *len)
-{
-    size_t size;
-    void *buf, *swap;
-    FILE *in;
-
-    *len = 0;
-    buf = malloc(size = 4096);
-    if (buf == NULL)
-        return NULL;
-    in = name == NULL ? stdin : fopen(name, "rb");
-    if (in != NULL) {
-        for (;;) {
-            *len += fread((char *)buf + *len, 1, size - *len, in);
-            if (*len < size) break;
-            size = bythirds(size);
-            if (size == *len || (swap = realloc(buf, size)) == NULL) {
-                free(buf);
-                buf = NULL;
-                break;
-            }
-            buf = swap;
-        }
-        fclose(in);
-    }
-    return buf;
-}
-
-int main(int argc, char **argv)
-{
-    int ret, put = 0, fail = 0;
-    unsigned skip = 0;
-    char *arg, *name = NULL;
-    unsigned char *source = NULL, *dest;
-    size_t len = 0;
-    unsigned long sourcelen, destlen;
-
-    /* process arguments */
-    while (arg = *++argv, --argc)
-        if (arg[0] == '-') {
-            if (arg[1] == 'w' && arg[2] == 0)
-                put = 1;
-            else if (arg[1] == 'f' && arg[2] == 0)
-                fail = 1, put = 1;
-            else if (arg[1] >= '0' && arg[1] <= '9')
-                skip = (unsigned)atoi(arg + 1);
-            else {
-                fprintf(stderr, "invalid option %s\n", arg);
-                return 3;
-            }
-        }
-        else if (name != NULL) {
-            fprintf(stderr, "only one file name allowed\n");
-            return 3;
-        }
-        else
-            name = arg;
-    source = load(name, &len);
-    if (source == NULL) {
-        fprintf(stderr, "memory allocation failure\n");
-        return 4;
-    }
-    if (len == 0) {
-        fprintf(stderr, "could not read %s, or it was empty\n",
-                name == NULL ? "<stdin>" : name);
-        free(source);
-        return 3;
-    }
-    if (skip >= len) {
-        fprintf(stderr, "skip request of %d leaves no input\n", skip);
-        free(source);
-        return 3;
-    }
-
-    /* test inflate data with offset skip */
-    len -= skip;
-    sourcelen = (unsigned long)len;
-    ret = puff(NIL, &destlen, source + skip, &sourcelen);
-    if (ret)
-        fprintf(stderr, "puff() failed with return code %d\n", ret);
-    else {
-        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);
-        if (sourcelen < len) fprintf(stderr, "%lu compressed bytes unused\n",
-                                     len - sourcelen);
-    }
-
-    /* if requested, inflate again and write decompressd data to stdout */
-    if (put && ret == 0) {
-        if (fail)
-            destlen >>= 1;
-        dest = malloc(destlen);
-        if (dest == NULL) {
-            fprintf(stderr, "memory allocation failure\n");
-            free(source);
-            return 4;
-        }
-        puff(dest, &destlen, source + skip, &sourcelen);
-        SET_BINARY_MODE(stdout);
-        fwrite(dest, 1, destlen, stdout);
-        free(dest);
-    }
-
-    /* clean up */
-    free(source);
-    return ret;
-}

crates/libz-sys/src/zlib/contrib/puff/zeros.raw

diff --git a/crates/libz-sys/src/zlib/contrib/puff/zeros.raw b/crates/libz-sys/src/zlib/contrib/puff/zeros.raw
deleted file mode 100644
index 0a90e76..0000000
--- a/crates/libz-sys/src/zlib/contrib/puff/zeros.raw
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib/contrib/testzlib/testzlib.c

diff --git a/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.c b/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.c
deleted file mode 100644
index 5f659de..0000000
--- a/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.c
+++ /dev/null
@@ -1,275 +0,0 @@
-#include <stdio.h>

-#include <stdlib.h>

-#include <windows.h>

-

-#include "zlib.h"

-

-

-void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)

-{

-    R->HighPart = A.HighPart - B.HighPart;

-    if (A.LowPart >= B.LowPart)

-        R->LowPart = A.LowPart - B.LowPart;

-    else

-    {

-        R->LowPart = A.LowPart - B.LowPart;

-        R->HighPart --;

-    }

-}

-

-#ifdef _M_X64

-// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc

-unsigned __int64 __rdtsc(void);

-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)

-{

- //   printf("rdtsc = %I64x\n",__rdtsc());

-   pbeginTime64->QuadPart=__rdtsc();

-}

-

-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

-{

-    LARGE_INTEGER LIres;

-    unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));

-    LIres.QuadPart=res;

-   // printf("rdtsc = %I64x\n",__rdtsc());

-    return LIres;

-}

-#else

-#ifdef _M_IX86

-void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)

-{

-    DWORD dwEdx,dwEax;

-    _asm

-    {

-        rdtsc

-        mov dwEax,eax

-        mov dwEdx,edx

-    }

-    pbeginTime64->LowPart=dwEax;

-    pbeginTime64->HighPart=dwEdx;

-}

-

-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)

-{

-    myGetRDTSC32(pbeginTime64);

-}

-

-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

-{

-    LARGE_INTEGER LIres,endTime64;

-    myGetRDTSC32(&endTime64);

-

-    LIres.LowPart=LIres.HighPart=0;

-    MyDoMinus64(&LIres,endTime64,beginTime64);

-    return LIres;

-}

-#else

-void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)

-{

-}

-

-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)

-{

-}

-

-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

-{

-    LARGE_INTEGER lr;

-    lr.QuadPart=0;

-    return lr;

-}

-#endif

-#endif

-

-void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)

-{

-    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(pbeginTime64)))

-    {

-        pbeginTime64->LowPart = GetTickCount();

-        pbeginTime64->HighPart = 0;

-    }

-}

-

-DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

-{

-    LARGE_INTEGER endTime64,ticksPerSecond,ticks;

-    DWORDLONG ticksShifted,tickSecShifted;

-    DWORD dwLog=16+0;

-    DWORD dwRet;

-    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(&endTime64)))

-        dwRet = (GetTickCount() - beginTime64.LowPart)*1;

-    else

-    {

-        MyDoMinus64(&ticks,endTime64,beginTime64);

-        QueryPerformanceFrequency(&ticksPerSecond);

-

-

-        {

-            ticksShifted = Int64ShrlMod32(*(DWORDLONG*)&ticks,dwLog);

-            tickSecShifted = Int64ShrlMod32(*(DWORDLONG*)&ticksPerSecond,dwLog);

-

-        }

-

-        dwRet = (DWORD)((((DWORD)ticksShifted)*1000)/(DWORD)(tickSecShifted));

-        dwRet *=1;

-    }

-    return dwRet;

-}

-

-int ReadFileMemory(const char* filename,long* plFileSize,unsigned char** pFilePtr)

-{

-    FILE* stream;

-    unsigned char* ptr;

-    int retVal=1;

-    stream=fopen(filename, "rb");

-    if (stream==NULL)

-        return 0;

-

-    fseek(stream,0,SEEK_END);

-

-    *plFileSize=ftell(stream);

-    fseek(stream,0,SEEK_SET);

-    ptr=malloc((*plFileSize)+1);

-    if (ptr==NULL)

-        retVal=0;

-    else

-    {

-        if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize))

-            retVal=0;

-    }

-    fclose(stream);

-    *pFilePtr=ptr;

-    return retVal;

-}

-

-int main(int argc, char *argv[])

-{

-    int BlockSizeCompress=0x8000;

-    int BlockSizeUncompress=0x8000;

-    int cprLevel=Z_DEFAULT_COMPRESSION ;

-    long lFileSize;

-    unsigned char* FilePtr;

-    long lBufferSizeCpr;

-    long lBufferSizeUncpr;

-    long lCompressedSize=0;

-    unsigned char* CprPtr;

-    unsigned char* UncprPtr;

-    long lSizeCpr,lSizeUncpr;

-    DWORD dwGetTick,dwMsecQP;

-    LARGE_INTEGER li_qp,li_rdtsc,dwResRdtsc;

-

-    if (argc<=1)

-    {

-        printf("run TestZlib <File> [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n");

-        return 0;

-    }

-

-    if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0)

-    {

-        printf("error reading %s\n",argv[1]);

-        return 1;

-    }

-    else printf("file %s read, %u bytes\n",argv[1],lFileSize);

-

-    if (argc>=3)

-        BlockSizeCompress=atol(argv[2]);

-

-    if (argc>=4)

-        BlockSizeUncompress=atol(argv[3]);

-

-    if (argc>=5)

-        cprLevel=(int)atol(argv[4]);

-

-    lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200;

-    lBufferSizeUncpr = lBufferSizeCpr;

-

-    CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress);

-

-    BeginCountPerfCounter(&li_qp,TRUE);

-    dwGetTick=GetTickCount();

-    BeginCountRdtsc(&li_rdtsc);

-    {

-        z_stream zcpr;

-        int ret=Z_OK;

-        long lOrigToDo = lFileSize;

-        long lOrigDone = 0;

-        int step=0;

-        memset(&zcpr,0,sizeof(z_stream));

-        deflateInit(&zcpr,cprLevel);

-

-        zcpr.next_in = FilePtr;

-        zcpr.next_out = CprPtr;

-

-

-        do

-        {

-            long all_read_before = zcpr.total_in;

-            zcpr.avail_in = min(lOrigToDo,BlockSizeCompress);

-            zcpr.avail_out = BlockSizeCompress;

-            ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH);

-            lOrigDone += (zcpr.total_in-all_read_before);

-            lOrigToDo -= (zcpr.total_in-all_read_before);

-            step++;

-        } while (ret==Z_OK);

-

-        lSizeCpr=zcpr.total_out;

-        deflateEnd(&zcpr);

-        dwGetTick=GetTickCount()-dwGetTick;

-        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);

-        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);

-        printf("total compress size = %u, in %u step\n",lSizeCpr,step);

-        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);

-        printf("defcpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);

-        printf("defcpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);

-    }

-

-    CprPtr=(unsigned char*)realloc(CprPtr,lSizeCpr);

-    UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress);

-

-    BeginCountPerfCounter(&li_qp,TRUE);

-    dwGetTick=GetTickCount();

-    BeginCountRdtsc(&li_rdtsc);

-    {

-        z_stream zcpr;

-        int ret=Z_OK;

-        long lOrigToDo = lSizeCpr;

-        long lOrigDone = 0;

-        int step=0;

-        memset(&zcpr,0,sizeof(z_stream));

-        inflateInit(&zcpr);

-

-        zcpr.next_in = CprPtr;

-        zcpr.next_out = UncprPtr;

-

-

-        do

-        {

-            long all_read_before = zcpr.total_in;

-            zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress);

-            zcpr.avail_out = BlockSizeUncompress;

-            ret=inflate(&zcpr,Z_SYNC_FLUSH);

-            lOrigDone += (zcpr.total_in-all_read_before);

-            lOrigToDo -= (zcpr.total_in-all_read_before);

-            step++;

-        } while (ret==Z_OK);

-

-        lSizeUncpr=zcpr.total_out;

-        inflateEnd(&zcpr);

-        dwGetTick=GetTickCount()-dwGetTick;

-        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);

-        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);

-        printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step);

-        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);

-        printf("uncpr  time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);

-        printf("uncpr  result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);

-    }

-

-    if (lSizeUncpr==lFileSize)

-    {

-        if (memcmp(FilePtr,UncprPtr,lFileSize)==0)

-            printf("compare ok\n");

-

-    }

-

-    return 0;

-}

crates/libz-sys/src/zlib/contrib/testzlib/testzlib.txt

diff --git a/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.txt b/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.txt
deleted file mode 100644
index 62258f1..0000000
--- a/crates/libz-sys/src/zlib/contrib/testzlib/testzlib.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To build testzLib with Visual Studio 2005:

-

-copy to a directory file from :

-- root of zLib tree

-- contrib/testzlib

-- contrib/masmx86

-- contrib/masmx64

-- contrib/vstudio/vc7

-

-and open testzlib8.sln
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/untgz/Makefile

diff --git a/crates/libz-sys/src/zlib/contrib/untgz/Makefile b/crates/libz-sys/src/zlib/contrib/untgz/Makefile
deleted file mode 100644
index b54266f..0000000
--- a/crates/libz-sys/src/zlib/contrib/untgz/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-CC=cc
-CFLAGS=-g
-
-untgz: untgz.o ../../libz.a
-	$(CC) $(CFLAGS) -o untgz untgz.o -L../.. -lz
-
-untgz.o: untgz.c ../../zlib.h
-	$(CC) $(CFLAGS) -c -I../.. untgz.c
-
-../../libz.a:
-	cd ../..; ./configure; make
-
-clean:
-	rm -f untgz untgz.o *~

crates/libz-sys/src/zlib/contrib/untgz/Makefile.msc

diff --git a/crates/libz-sys/src/zlib/contrib/untgz/Makefile.msc b/crates/libz-sys/src/zlib/contrib/untgz/Makefile.msc
deleted file mode 100644
index 77b8602..0000000
--- a/crates/libz-sys/src/zlib/contrib/untgz/Makefile.msc
+++ /dev/null
@@ -1,17 +0,0 @@
-CC=cl
-CFLAGS=-MD
-
-untgz.exe: untgz.obj ..\..\zlib.lib
-	$(CC) $(CFLAGS) untgz.obj ..\..\zlib.lib
-
-untgz.obj: untgz.c ..\..\zlib.h
-	$(CC) $(CFLAGS) -c -I..\.. untgz.c
-
-..\..\zlib.lib:
-	cd ..\..
-	$(MAKE) -f win32\makefile.msc
-	cd contrib\untgz
-
-clean:
-	-del untgz.obj
-	-del untgz.exe

crates/libz-sys/src/zlib/contrib/untgz/untgz.c

diff --git a/crates/libz-sys/src/zlib/contrib/untgz/untgz.c b/crates/libz-sys/src/zlib/contrib/untgz/untgz.c
deleted file mode 100644
index 2c391e5..0000000
--- a/crates/libz-sys/src/zlib/contrib/untgz/untgz.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
- * untgz.c -- Display contents and extract files from a gzip'd TAR file
- *
- * written by Pedro A. Aranda Gutierrez <paag@tid.es>
- * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
- * various fixes by Cosmin Truta <cosmint@cs.ubbcluj.ro>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include "zlib.h"
-
-#ifdef unix
-#  include <unistd.h>
-#else
-#  include <direct.h>
-#  include <io.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
-#  ifndef F_OK
-#    define F_OK  0
-#  endif
-#  define mkdir(dirname,mode)   _mkdir(dirname)
-#  ifdef _MSC_VER
-#    define access(path,mode)   _access(path,mode)
-#    define chmod(path,mode)    _chmod(path,mode)
-#    define strdup(str)         _strdup(str)
-#  endif
-#else
-#  include <utime.h>
-#endif
-
-
-/* values used in typeflag field */
-
-#define REGTYPE  '0'            /* regular file */
-#define AREGTYPE '\0'           /* regular file */
-#define LNKTYPE  '1'            /* link */
-#define SYMTYPE  '2'            /* reserved */
-#define CHRTYPE  '3'            /* character special */
-#define BLKTYPE  '4'            /* block special */
-#define DIRTYPE  '5'            /* directory */
-#define FIFOTYPE '6'            /* FIFO special */
-#define CONTTYPE '7'            /* reserved */
-
-/* GNU tar extensions */
-
-#define GNUTYPE_DUMPDIR  'D'    /* file names from dumped directory */
-#define GNUTYPE_LONGLINK 'K'    /* long link name */
-#define GNUTYPE_LONGNAME 'L'    /* long file name */
-#define GNUTYPE_MULTIVOL 'M'    /* continuation of file from another volume */
-#define GNUTYPE_NAMES    'N'    /* file name that does not fit into main hdr */
-#define GNUTYPE_SPARSE   'S'    /* sparse file */
-#define GNUTYPE_VOLHDR   'V'    /* tape/volume header */
-
-
-/* tar header */
-
-#define BLOCKSIZE     512
-#define SHORTNAMESIZE 100
-
-struct tar_header
-{                               /* byte offset */
-  char name[100];               /*   0 */
-  char mode[8];                 /* 100 */
-  char uid[8];                  /* 108 */
-  char gid[8];                  /* 116 */
-  char size[12];                /* 124 */
-  char mtime[12];               /* 136 */
-  char chksum[8];               /* 148 */
-  char typeflag;                /* 156 */
-  char linkname[100];           /* 157 */
-  char magic[6];                /* 257 */
-  char version[2];              /* 263 */
-  char uname[32];               /* 265 */
-  char gname[32];               /* 297 */
-  char devmajor[8];             /* 329 */
-  char devminor[8];             /* 337 */
-  char prefix[155];             /* 345 */
-                                /* 500 */
-};
-
-union tar_buffer
-{
-  char               buffer[BLOCKSIZE];
-  struct tar_header  header;
-};
-
-struct attr_item
-{
-  struct attr_item  *next;
-  char              *fname;
-  int                mode;
-  time_t             time;
-};
-
-enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID };
-
-char *TGZfname          OF((const char *));
-void TGZnotfound        OF((const char *));
-
-int getoct              OF((char *, int));
-char *strtime           OF((time_t *));
-int setfiletime         OF((char *, time_t));
-void push_attr          OF((struct attr_item **, char *, int, time_t));
-void restore_attr       OF((struct attr_item **));
-
-int ExprMatch           OF((char *, char *));
-
-int makedir             OF((char *));
-int matchname           OF((int, int, char **, char *));
-
-void error              OF((const char *));
-int tar                 OF((gzFile, int, int, int, char **));
-
-void help               OF((int));
-int main                OF((int, char **));
-
-char *prog;
-
-const char *TGZsuffix[] = { "\0", ".tar", ".tar.gz", ".taz", ".tgz", NULL };
-
-/* return the file name of the TGZ archive */
-/* or NULL if it does not exist */
-
-char *TGZfname (const char *arcname)
-{
-  static char buffer[1024];
-  int origlen,i;
-
-  strcpy(buffer,arcname);
-  origlen = strlen(buffer);
-
-  for (i=0; TGZsuffix[i]; i++)
-    {
-       strcpy(buffer+origlen,TGZsuffix[i]);
-       if (access(buffer,F_OK) == 0)
-         return buffer;
-    }
-  return NULL;
-}
-
-
-/* error message for the filename */
-
-void TGZnotfound (const char *arcname)
-{
-  int i;
-
-  fprintf(stderr,"%s: Couldn't find ",prog);
-  for (i=0;TGZsuffix[i];i++)
-    fprintf(stderr,(TGZsuffix[i+1]) ? "%s%s, " : "or %s%s\n",
-            arcname,
-            TGZsuffix[i]);
-  exit(1);
-}
-
-
-/* convert octal digits to int */
-/* on error return -1 */
-
-int getoct (char *p,int width)
-{
-  int result = 0;
-  char c;
-
-  while (width--)
-    {
-      c = *p++;
-      if (c == 0)
-        break;
-      if (c == ' ')
-        continue;
-      if (c < '0' || c > '7')
-        return -1;
-      result = result * 8 + (c - '0');
-    }
-  return result;
-}
-
-
-/* convert time_t to string */
-/* use the "YYYY/MM/DD hh:mm:ss" format */
-
-char *strtime (time_t *t)
-{
-  struct tm   *local;
-  static char result[32];
-
-  local = localtime(t);
-  sprintf(result,"%4d/%02d/%02d %02d:%02d:%02d",
-          local->tm_year+1900, local->tm_mon+1, local->tm_mday,
-          local->tm_hour, local->tm_min, local->tm_sec);
-  return result;
-}
-
-
-/* set file time */
-
-int setfiletime (char *fname,time_t ftime)
-{
-#ifdef WIN32
-  static int isWinNT = -1;
-  SYSTEMTIME st;
-  FILETIME locft, modft;
-  struct tm *loctm;
-  HANDLE hFile;
-  int result;
-
-  loctm = localtime(&ftime);
-  if (loctm == NULL)
-    return -1;
-
-  st.wYear         = (WORD)loctm->tm_year + 1900;
-  st.wMonth        = (WORD)loctm->tm_mon + 1;
-  st.wDayOfWeek    = (WORD)loctm->tm_wday;
-  st.wDay          = (WORD)loctm->tm_mday;
-  st.wHour         = (WORD)loctm->tm_hour;
-  st.wMinute       = (WORD)loctm->tm_min;
-  st.wSecond       = (WORD)loctm->tm_sec;
-  st.wMilliseconds = 0;
-  if (!SystemTimeToFileTime(&st, &locft) ||
-      !LocalFileTimeToFileTime(&locft, &modft))
-    return -1;
-
-  if (isWinNT < 0)
-    isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
-  hFile = CreateFile(fname, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-                     (isWinNT ? FILE_FLAG_BACKUP_SEMANTICS : 0),
-                     NULL);
-  if (hFile == INVALID_HANDLE_VALUE)
-    return -1;
-  result = SetFileTime(hFile, NULL, NULL, &modft) ? 0 : -1;
-  CloseHandle(hFile);
-  return result;
-#else
-  struct utimbuf settime;
-
-  settime.actime = settime.modtime = ftime;
-  return utime(fname,&settime);
-#endif
-}
-
-
-/* push file attributes */
-
-void push_attr(struct attr_item **list,char *fname,int mode,time_t time)
-{
-  struct attr_item *item;
-
-  item = (struct attr_item *)malloc(sizeof(struct attr_item));
-  if (item == NULL)
-    error("Out of memory");
-  item->fname = strdup(fname);
-  item->mode  = mode;
-  item->time  = time;
-  item->next  = *list;
-  *list       = item;
-}
-
-
-/* restore file attributes */
-
-void restore_attr(struct attr_item **list)
-{
-  struct attr_item *item, *prev;
-
-  for (item = *list; item != NULL; )
-    {
-      setfiletime(item->fname,item->time);
-      chmod(item->fname,item->mode);
-      prev = item;
-      item = item->next;
-      free(prev);
-    }
-  *list = NULL;
-}
-
-
-/* match regular expression */
-
-#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
-
-int ExprMatch (char *string,char *expr)
-{
-  while (1)
-    {
-      if (ISSPECIAL(*expr))
-        {
-          if (*expr == '/')
-            {
-              if (*string != '\\' && *string != '/')
-                return 0;
-              string ++; expr++;
-            }
-          else if (*expr == '*')
-            {
-              if (*expr ++ == 0)
-                return 1;
-              while (*++string != *expr)
-                if (*string == 0)
-                  return 0;
-            }
-        }
-      else
-        {
-          if (*string != *expr)
-            return 0;
-          if (*expr++ == 0)
-            return 1;
-          string++;
-        }
-    }
-}
-
-
-/* recursive mkdir */
-/* abort on ENOENT; ignore other errors like "directory already exists" */
-/* return 1 if OK */
-/*        0 on error */
-
-int makedir (char *newdir)
-{
-  char *buffer = strdup(newdir);
-  char *p;
-  int  len = strlen(buffer);
-
-  if (len <= 0) {
-    free(buffer);
-    return 0;
-  }
-  if (buffer[len-1] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mkdir(buffer, 0755) == 0)
-    {
-      free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mkdir(buffer, 0755) == -1) && (errno == ENOENT))
-        {
-          fprintf(stderr,"%s: Couldn't create directory %s\n",prog,buffer);
-          free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  free(buffer);
-  return 1;
-}
-
-
-int matchname (int arg,int argc,char **argv,char *fname)
-{
-  if (arg == argc)      /* no arguments given (untgz tgzarchive) */
-    return 1;
-
-  while (arg < argc)
-    if (ExprMatch(fname,argv[arg++]))
-      return 1;
-
-  return 0; /* ignore this for the moment being */
-}
-
-
-/* tar file list or extract */
-
-int tar (gzFile in,int action,int arg,int argc,char **argv)
-{
-  union  tar_buffer buffer;
-  int    len;
-  int    err;
-  int    getheader = 1;
-  int    remaining = 0;
-  FILE   *outfile = NULL;
-  char   fname[BLOCKSIZE];
-  int    tarmode;
-  time_t tartime;
-  struct attr_item *attributes = NULL;
-
-  if (action == TGZ_LIST)
-    printf("    date      time     size                       file\n"
-           " ---------- -------- --------- -------------------------------------\n");
-  while (1)
-    {
-      len = gzread(in, &buffer, BLOCKSIZE);
-      if (len < 0)
-        error(gzerror(in, &err));
-      /*
-       * Always expect complete blocks to process
-       * the tar information.
-       */
-      if (len != BLOCKSIZE)
-        {
-          action = TGZ_INVALID; /* force error exit */
-          remaining = 0;        /* force I/O cleanup */
-        }
-
-      /*
-       * If we have to get a tar header
-       */
-      if (getheader >= 1)
-        {
-          /*
-           * if we met the end of the tar
-           * or the end-of-tar block,
-           * we are done
-           */
-          if (len == 0 || buffer.header.name[0] == 0)
-            break;
-
-          tarmode = getoct(buffer.header.mode,8);
-          tartime = (time_t)getoct(buffer.header.mtime,12);
-          if (tarmode == -1 || tartime == (time_t)-1)
-            {
-              buffer.header.name[0] = 0;
-              action = TGZ_INVALID;
-            }
-
-          if (getheader == 1)
-            {
-              strncpy(fname,buffer.header.name,SHORTNAMESIZE);
-              if (fname[SHORTNAMESIZE-1] != 0)
-                  fname[SHORTNAMESIZE] = 0;
-            }
-          else
-            {
-              /*
-               * The file name is longer than SHORTNAMESIZE
-               */
-              if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0)
-                  error("bad long name");
-              getheader = 1;
-            }
-
-          /*
-           * Act according to the type flag
-           */
-          switch (buffer.header.typeflag)
-            {
-            case DIRTYPE:
-              if (action == TGZ_LIST)
-                printf(" %s     <dir> %s\n",strtime(&tartime),fname);
-              if (action == TGZ_EXTRACT)
-                {
-                  makedir(fname);
-                  push_attr(&attributes,fname,tarmode,tartime);
-                }
-              break;
-            case REGTYPE:
-            case AREGTYPE:
-              remaining = getoct(buffer.header.size,12);
-              if (remaining == -1)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              if (action == TGZ_LIST)
-                printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
-              else if (action == TGZ_EXTRACT)
-                {
-                  if (matchname(arg,argc,argv,fname))
-                    {
-                      outfile = fopen(fname,"wb");
-                      if (outfile == NULL) {
-                        /* try creating directory */
-                        char *p = strrchr(fname, '/');
-                        if (p != NULL) {
-                          *p = '\0';
-                          makedir(fname);
-                          *p = '/';
-                          outfile = fopen(fname,"wb");
-                        }
-                      }
-                      if (outfile != NULL)
-                        printf("Extracting %s\n",fname);
-                      else
-                        fprintf(stderr, "%s: Couldn't create %s",prog,fname);
-                    }
-                  else
-                    outfile = NULL;
-                }
-              getheader = 0;
-              break;
-            case GNUTYPE_LONGLINK:
-            case GNUTYPE_LONGNAME:
-              remaining = getoct(buffer.header.size,12);
-              if (remaining < 0 || remaining >= BLOCKSIZE)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              len = gzread(in, fname, BLOCKSIZE);
-              if (len < 0)
-                error(gzerror(in, &err));
-              if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              getheader = 2;
-              break;
-            default:
-              if (action == TGZ_LIST)
-                printf(" %s     <---> %s\n",strtime(&tartime),fname);
-              break;
-            }
-        }
-      else
-        {
-          unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
-
-          if (outfile != NULL)
-            {
-              if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
-                {
-                  fprintf(stderr,
-                    "%s: Error writing %s -- skipping\n",prog,fname);
-                  fclose(outfile);
-                  outfile = NULL;
-                  remove(fname);
-                }
-            }
-          remaining -= bytes;
-        }
-
-      if (remaining == 0)
-        {
-          getheader = 1;
-          if (outfile != NULL)
-            {
-              fclose(outfile);
-              outfile = NULL;
-              if (action != TGZ_INVALID)
-                push_attr(&attributes,fname,tarmode,tartime);
-            }
-        }
-
-      /*
-       * Abandon if errors are found
-       */
-      if (action == TGZ_INVALID)
-        {
-          error("broken archive");
-          break;
-        }
-    }
-
-  /*
-   * Restore file modes and time stamps
-   */
-  restore_attr(&attributes);
-
-  if (gzclose(in) != Z_OK)
-    error("failed gzclose");
-
-  return 0;
-}
-
-
-/* ============================================================ */
-
-void help(int exitval)
-{
-  printf("untgz version 0.2.1\n"
-         "  using zlib version %s\n\n",
-         zlibVersion());
-  printf("Usage: untgz file.tgz            extract all files\n"
-         "       untgz file.tgz fname ...  extract selected files\n"
-         "       untgz -l file.tgz         list archive contents\n"
-         "       untgz -h                  display this help\n");
-  exit(exitval);
-}
-
-void error(const char *msg)
-{
-  fprintf(stderr, "%s: %s\n", prog, msg);
-  exit(1);
-}
-
-
-/* ============================================================ */
-
-#if defined(WIN32) && defined(__GNUC__)
-int _CRT_glob = 0;      /* disable argument globbing in MinGW */
-#endif
-
-int main(int argc,char **argv)
-{
-    int         action = TGZ_EXTRACT;
-    int         arg = 1;
-    char        *TGZfile;
-    gzFile      *f;
-
-    prog = strrchr(argv[0],'\\');
-    if (prog == NULL)
-      {
-        prog = strrchr(argv[0],'/');
-        if (prog == NULL)
-          {
-            prog = strrchr(argv[0],':');
-            if (prog == NULL)
-              prog = argv[0];
-            else
-              prog++;
-          }
-        else
-          prog++;
-      }
-    else
-      prog++;
-
-    if (argc == 1)
-      help(0);
-
-    if (strcmp(argv[arg],"-l") == 0)
-      {
-        action = TGZ_LIST;
-        if (argc == ++arg)
-          help(0);
-      }
-    else if (strcmp(argv[arg],"-h") == 0)
-      {
-        help(0);
-      }
-
-    if ((TGZfile = TGZfname(argv[arg])) == NULL)
-      TGZnotfound(argv[arg]);
-
-    ++arg;
-    if ((action == TGZ_LIST) && (arg != argc))
-      help(1);
-
-/*
- *  Process the TGZ file
- */
-    switch(action)
-      {
-      case TGZ_LIST:
-      case TGZ_EXTRACT:
-        f = gzopen(TGZfile,"rb");
-        if (f == NULL)
-          {
-            fprintf(stderr,"%s: Couldn't gzopen %s\n",prog,TGZfile);
-            return 1;
-          }
-        exit(tar(f, action, arg, argc, argv));
-      break;
-
-      default:
-        error("Unknown option");
-        exit(1);
-      }
-
-    return 0;
-}

crates/libz-sys/src/zlib/contrib/vstudio/readme.txt

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/readme.txt b/crates/libz-sys/src/zlib/contrib/vstudio/readme.txt
deleted file mode 100644
index f67eae8..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/readme.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Building instructions for the DLL versions of Zlib 1.2.11

-========================================================

-

-This directory contains projects that build zlib and minizip using

-Microsoft Visual C++ 9.0/10.0.

-

-You don't need to build these projects yourself. You can download the

-binaries from:

-  http://www.winimage.com/zLibDll

-

-More information can be found at this site.

-

-

-

-

-

-Build instructions for Visual Studio 2008 (32 bits or 64 bits)

---------------------------------------------------------------

-- Decompress current zlib, including all contrib/* files

-- Compile assembly code (with Visual Studio Command Prompt) by running:

-   bld_ml64.bat (in contrib\masmx64)

-   bld_ml32.bat (in contrib\masmx86)

-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008

-- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"

-

-Build instructions for Visual Studio 2010 (32 bits or 64 bits)

---------------------------------------------------------------

-- Decompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010

-

-Build instructions for Visual Studio 2012 (32 bits or 64 bits)

---------------------------------------------------------------

-- Decompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012

-

-Build instructions for Visual Studio 2013 (32 bits or 64 bits)

---------------------------------------------------------------

-- Decompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013

-

-Build instructions for Visual Studio 2015 (32 bits or 64 bits)

---------------------------------------------------------------

-- Decompress current zlib, including all contrib/* files

-- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015

-

-

-Important

----------

-- To use zlibwapi.dll in your application, you must define the

-  macro ZLIB_WINAPI when compiling your application's source files.

-

-

-Additional notes

-----------------

-- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built

-  by Gilles Vollant from the zlib 1.1.x sources, and distributed at

-    http://www.winimage.com/zLibDll

-  It uses the WINAPI calling convention for the exported functions, and

-  includes the minizip functionality. If your application needs that

-  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.

-

-- The new DLL was renamed because there exist several incompatible

-  versions of zlib.dll on the Internet.

-

-- There is also an official DLL build of zlib, named zlib1.dll. This one

-  is exporting the functions using the CDECL convention. See the file

-  win32\DLL_FAQ.txt found in this zlib distribution.

-

-- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol

-  has a slightly different effect. To avoid compatibility problems, do

-  not define it here.

-

-

-Gilles Vollant

-info@winimage.com

-

-Visual Studio 2013 and 2015 Projects from Sean Hunt

-seandhunt_7@yahoo.com

crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj
deleted file mode 100644
index 74e15c9..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\miniunz.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
deleted file mode 100644
index 0b2a3de..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\miniunz.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj
deleted file mode 100644
index 917e156..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\minizip.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
deleted file mode 100644
index dd73cd3..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\minizip.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj
deleted file mode 100644
index 9088d17..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

-    <RootNamespace>testzlib</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\testzlib\testzlib.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
deleted file mode 100644
index 249daa8..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\compress.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\crc32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\deflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\infback.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inftrees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\testzlib\testzlib.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\trees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\uncompr.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\zutil.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
deleted file mode 100644
index bcb08ff..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\testzlib\testzlib.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
deleted file mode 100644
index 53a8693..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\testzlib\testzlib.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlib.rc

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlib.rc b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlib.rc
deleted file mode 100644
index fee177a..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>

-

-#define IDR_VERSION1  1

-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION	 1, 2, 11, 0

-  PRODUCTVERSION 1, 2, 11, 0

-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

-  FILEFLAGS	0

-  FILEOS	VOS_DOS_WINDOWS32

-  FILETYPE	VFT_DLL

-  FILESUBTYPE	0	// not used

-BEGIN

-  BLOCK "StringFileInfo"

-  BEGIN

-    BLOCK "040904E4"

-    //language ID = U.S. English, char set = Windows, Multilingual

-

-    BEGIN

-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",	"1.2.11\0"

-      VALUE "InternalName",	"zlib\0"

-      VALUE "OriginalFilename",	"zlibwapi.dll\0"

-      VALUE "ProductName",	"ZLib.DLL\0"

-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"

-    END

-  END

-  BLOCK "VarFileInfo"

-  BEGIN

-    VALUE "Translation", 0x0409, 1252

-  END

-END

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
deleted file mode 100644
index b9f2bbe..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\gzclose.c" />

-    <ClCompile Include="..\..\..\gzlib.c" />

-    <ClCompile Include="..\..\..\gzread.c" />

-    <ClCompile Include="..\..\..\gzwrite.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\minizip\ioapi.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\minizip\unzip.c" />

-    <ClCompile Include="..\..\minizip\zip.c" />

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
deleted file mode 100644
index c8c7f7e..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\compress.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\crc32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\deflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzclose.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzlib.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzread.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzwrite.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\infback.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inftrees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\ioapi.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\trees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\uncompr.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\unzip.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\zip.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\zutil.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc">

-      <Filter>Source Files</Filter>

-    </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def">

-      <Filter>Source Files</Filter>

-    </None>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.def

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.def b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.def
deleted file mode 100644
index 54e683d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY

-; zlib data compression and ZIP file I/O library

-

-VERSION		1.2

-

-EXPORTS

-        adler32                                  @1

-        compress                                 @2

-        crc32                                    @3

-        deflate                                  @4

-        deflateCopy                              @5

-        deflateEnd                               @6

-        deflateInit2_                            @7

-        deflateInit_                             @8

-        deflateParams                            @9

-        deflateReset                             @10

-        deflateSetDictionary                     @11

-        gzclose                                  @12

-        gzdopen                                  @13

-        gzerror                                  @14

-        gzflush                                  @15

-        gzopen                                   @16

-        gzread                                   @17

-        gzwrite                                  @18

-        inflate                                  @19

-        inflateEnd                               @20

-        inflateInit2_                            @21

-        inflateInit_                             @22

-        inflateReset                             @23

-        inflateSetDictionary                     @24

-        inflateSync                              @25

-        uncompress                               @26

-        zlibVersion                              @27

-        gzprintf                                 @28

-        gzputc                                   @29

-        gzgetc                                   @30

-        gzseek                                   @31

-        gzrewind                                 @32

-        gztell                                   @33

-        gzeof                                    @34

-        gzsetparams                              @35

-        zError                                   @36

-        inflateSyncPoint                         @37

-        get_crc_table                            @38

-        compress2                                @39

-        gzputs                                   @40

-        gzgets                                   @41

-        inflateCopy                              @42

-        inflateBackInit_                         @43

-        inflateBack                              @44

-        inflateBackEnd                           @45

-        compressBound                            @46

-        deflateBound                             @47

-        gzclearerr                               @48

-        gzungetc                                 @49

-        zlibCompileFlags                         @50

-        deflatePrime                             @51

-        deflatePending                           @52

-

-        unzOpen                                  @61

-        unzClose                                 @62

-        unzGetGlobalInfo                         @63

-        unzGetCurrentFileInfo                    @64

-        unzGoToFirstFile                         @65

-        unzGoToNextFile                          @66

-        unzOpenCurrentFile                       @67

-        unzReadCurrentFile                       @68

-        unzOpenCurrentFile3                      @69

-        unztell                                  @70

-        unzeof                                   @71

-        unzCloseCurrentFile                      @72

-        unzGetGlobalComment                      @73

-        unzStringFileNameCompare                 @74

-        unzLocateFile                            @75

-        unzGetLocalExtrafield                    @76

-        unzOpen2                                 @77

-        unzOpenCurrentFile2                      @78

-        unzOpenCurrentFilePassword               @79

-

-        zipOpen                                  @80

-        zipOpenNewFileInZip                      @81

-        zipWriteInFileInZip                      @82

-        zipCloseFileInZip                        @83

-        zipClose                                 @84

-        zipOpenNewFileInZip2                     @86

-        zipCloseFileInZipRaw                     @87

-        zipOpen2                                 @88

-        zipOpenNewFileInZip3                     @89

-

-        unzGetFilePos                            @100

-        unzGoToFilePos                           @101

-

-        fill_win32_filefunc                      @110

-

-; zlibwapi v1.2.4 added:

-        fill_win32_filefunc64                   @111

-        fill_win32_filefunc64A                  @112

-        fill_win32_filefunc64W                  @113

-

-        unzOpen64                               @120

-        unzOpen2_64                             @121

-        unzGetGlobalInfo64                      @122

-        unzGetCurrentFileInfo64                 @124

-        unzGetCurrentFileZStreamPos64           @125

-        unztell64                               @126

-        unzGetFilePos64                         @127

-        unzGoToFilePos64                        @128

-

-        zipOpen64                               @130

-        zipOpen2_64                             @131

-        zipOpenNewFileInZip64                   @132

-        zipOpenNewFileInZip2_64                 @133

-        zipOpenNewFileInZip3_64                 @134

-        zipOpenNewFileInZip4_64                 @135

-        zipCloseFileInZipRaw64                  @136

-

-; zlib1 v1.2.4 added:

-        adler32_combine                         @140

-        crc32_combine                           @142

-        deflateSetHeader                        @144

-        deflateTune                             @145

-        gzbuffer                                @146

-        gzclose_r                               @147

-        gzclose_w                               @148

-        gzdirect                                @149

-        gzoffset                                @150

-        inflateGetHeader                        @156

-        inflateMark                             @157

-        inflatePrime                            @158

-        inflateReset2                           @159

-        inflateUndermine                        @160

-

-; zlib1 v1.2.6 added:

-        gzgetc_                                 @161

-        inflateResetKeep                        @163

-        deflateResetKeep                        @164

-

-; zlib1 v1.2.7 added:

-        gzopen_w                                @165

-

-; zlib1 v1.2.8 added:

-        inflateGetDictionary                    @166

-        gzvprintf                               @167

-

-; zlib1 v1.2.9 added:

-        inflateCodesUsed                        @168

-        inflateValidate                         @169

-        uncompress2                             @170

-        gzfread                                 @171

-        gzfwrite                                @172

-        deflateGetDictionary                    @173

-        adler32_z                               @174

-        crc32_z                                 @175

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.sln

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.sln b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.sln
deleted file mode 100644
index 6f6ffd5..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.sln
+++ /dev/null
@@ -1,135 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Itanium = Debug|Itanium

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Itanium = Release|Itanium

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium

-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32

-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
deleted file mode 100644
index 6ff9ddb..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapid</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapid</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\gzclose.c" />

-    <ClCompile Include="..\..\..\gzlib.c" />

-    <ClCompile Include="..\..\..\gzread.c" />

-    <ClCompile Include="..\..\..\gzwrite.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\minizip\ioapi.c" />

-    <ClCompile Include="..\..\minizip\iowin32.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\minizip\unzip.c">

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\zip.c">

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\deflate.h" />

-    <ClInclude Include="..\..\..\infblock.h" />

-    <ClInclude Include="..\..\..\infcodes.h" />

-    <ClInclude Include="..\..\..\inffast.h" />

-    <ClInclude Include="..\..\..\inftrees.h" />

-    <ClInclude Include="..\..\..\infutil.h" />

-    <ClInclude Include="..\..\..\zconf.h" />

-    <ClInclude Include="..\..\..\zlib.h" />

-    <ClInclude Include="..\..\..\zutil.h" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
deleted file mode 100644
index 180b71c..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier>

-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\compress.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\crc32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\deflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzclose.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzlib.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzread.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\gzwrite.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\infback.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inflate.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inftrees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\ioapi.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\iowin32.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\trees.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\uncompr.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\unzip.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\zip.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\zutil.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc">

-      <Filter>Source Files</Filter>

-    </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def">

-      <Filter>Source Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\deflate.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\infblock.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\infcodes.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\inffast.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\inftrees.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\infutil.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\zconf.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\zlib.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\zutil.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/miniunz.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/miniunz.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/miniunz.vcxproj
deleted file mode 100644
index 8f9f20b..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/miniunz.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\miniunz.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/minizip.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/minizip.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/minizip.vcxproj
deleted file mode 100644
index c93d9e6..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/minizip.vcxproj
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)minizip.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\minizip\minizip.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlib.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlib.vcxproj
deleted file mode 100644
index 6d55954..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

-    <RootNamespace>testzlib</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\testzlib\testzlib.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
deleted file mode 100644
index 9f20c78..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\testzlib\testzlib.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="zlibvc.vcxproj">

-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlib.rc

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlib.rc b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlib.rc
deleted file mode 100644
index fee177a..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>

-

-#define IDR_VERSION1  1

-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION	 1, 2, 11, 0

-  PRODUCTVERSION 1, 2, 11, 0

-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

-  FILEFLAGS	0

-  FILEOS	VOS_DOS_WINDOWS32

-  FILETYPE	VFT_DLL

-  FILESUBTYPE	0	// not used

-BEGIN

-  BLOCK "StringFileInfo"

-  BEGIN

-    BLOCK "040904E4"

-    //language ID = U.S. English, char set = Windows, Multilingual

-

-    BEGIN

-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",	"1.2.11\0"

-      VALUE "InternalName",	"zlib\0"

-      VALUE "OriginalFilename",	"zlibwapi.dll\0"

-      VALUE "ProductName",	"ZLib.DLL\0"

-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"

-    END

-  END

-  BLOCK "VarFileInfo"

-  BEGIN

-    VALUE "Translation", 0x0409, 1252

-  END

-END

crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibstat.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
deleted file mode 100644
index 806b76a..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Lib>

-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\gzclose.c" />

-    <ClCompile Include="..\..\..\gzlib.c" />

-    <ClCompile Include="..\..\..\gzread.c" />

-    <ClCompile Include="..\..\..\gzwrite.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\minizip\ioapi.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\minizip\unzip.c" />

-    <ClCompile Include="..\..\minizip\zip.c" />

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.def

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.def b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.def
deleted file mode 100644
index 54e683d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY

-; zlib data compression and ZIP file I/O library

-

-VERSION		1.2

-

-EXPORTS

-        adler32                                  @1

-        compress                                 @2

-        crc32                                    @3

-        deflate                                  @4

-        deflateCopy                              @5

-        deflateEnd                               @6

-        deflateInit2_                            @7

-        deflateInit_                             @8

-        deflateParams                            @9

-        deflateReset                             @10

-        deflateSetDictionary                     @11

-        gzclose                                  @12

-        gzdopen                                  @13

-        gzerror                                  @14

-        gzflush                                  @15

-        gzopen                                   @16

-        gzread                                   @17

-        gzwrite                                  @18

-        inflate                                  @19

-        inflateEnd                               @20

-        inflateInit2_                            @21

-        inflateInit_                             @22

-        inflateReset                             @23

-        inflateSetDictionary                     @24

-        inflateSync                              @25

-        uncompress                               @26

-        zlibVersion                              @27

-        gzprintf                                 @28

-        gzputc                                   @29

-        gzgetc                                   @30

-        gzseek                                   @31

-        gzrewind                                 @32

-        gztell                                   @33

-        gzeof                                    @34

-        gzsetparams                              @35

-        zError                                   @36

-        inflateSyncPoint                         @37

-        get_crc_table                            @38

-        compress2                                @39

-        gzputs                                   @40

-        gzgets                                   @41

-        inflateCopy                              @42

-        inflateBackInit_                         @43

-        inflateBack                              @44

-        inflateBackEnd                           @45

-        compressBound                            @46

-        deflateBound                             @47

-        gzclearerr                               @48

-        gzungetc                                 @49

-        zlibCompileFlags                         @50

-        deflatePrime                             @51

-        deflatePending                           @52

-

-        unzOpen                                  @61

-        unzClose                                 @62

-        unzGetGlobalInfo                         @63

-        unzGetCurrentFileInfo                    @64

-        unzGoToFirstFile                         @65

-        unzGoToNextFile                          @66

-        unzOpenCurrentFile                       @67

-        unzReadCurrentFile                       @68

-        unzOpenCurrentFile3                      @69

-        unztell                                  @70

-        unzeof                                   @71

-        unzCloseCurrentFile                      @72

-        unzGetGlobalComment                      @73

-        unzStringFileNameCompare                 @74

-        unzLocateFile                            @75

-        unzGetLocalExtrafield                    @76

-        unzOpen2                                 @77

-        unzOpenCurrentFile2                      @78

-        unzOpenCurrentFilePassword               @79

-

-        zipOpen                                  @80

-        zipOpenNewFileInZip                      @81

-        zipWriteInFileInZip                      @82

-        zipCloseFileInZip                        @83

-        zipClose                                 @84

-        zipOpenNewFileInZip2                     @86

-        zipCloseFileInZipRaw                     @87

-        zipOpen2                                 @88

-        zipOpenNewFileInZip3                     @89

-

-        unzGetFilePos                            @100

-        unzGoToFilePos                           @101

-

-        fill_win32_filefunc                      @110

-

-; zlibwapi v1.2.4 added:

-        fill_win32_filefunc64                   @111

-        fill_win32_filefunc64A                  @112

-        fill_win32_filefunc64W                  @113

-

-        unzOpen64                               @120

-        unzOpen2_64                             @121

-        unzGetGlobalInfo64                      @122

-        unzGetCurrentFileInfo64                 @124

-        unzGetCurrentFileZStreamPos64           @125

-        unztell64                               @126

-        unzGetFilePos64                         @127

-        unzGoToFilePos64                        @128

-

-        zipOpen64                               @130

-        zipOpen2_64                             @131

-        zipOpenNewFileInZip64                   @132

-        zipOpenNewFileInZip2_64                 @133

-        zipOpenNewFileInZip3_64                 @134

-        zipOpenNewFileInZip4_64                 @135

-        zipCloseFileInZipRaw64                  @136

-

-; zlib1 v1.2.4 added:

-        adler32_combine                         @140

-        crc32_combine                           @142

-        deflateSetHeader                        @144

-        deflateTune                             @145

-        gzbuffer                                @146

-        gzclose_r                               @147

-        gzclose_w                               @148

-        gzdirect                                @149

-        gzoffset                                @150

-        inflateGetHeader                        @156

-        inflateMark                             @157

-        inflatePrime                            @158

-        inflateReset2                           @159

-        inflateUndermine                        @160

-

-; zlib1 v1.2.6 added:

-        gzgetc_                                 @161

-        inflateResetKeep                        @163

-        deflateResetKeep                        @164

-

-; zlib1 v1.2.7 added:

-        gzopen_w                                @165

-

-; zlib1 v1.2.8 added:

-        inflateGetDictionary                    @166

-        gzvprintf                               @167

-

-; zlib1 v1.2.9 added:

-        inflateCodesUsed                        @168

-        inflateValidate                         @169

-        uncompress2                             @170

-        gzfread                                 @171

-        gzfwrite                                @172

-        deflateGetDictionary                    @173

-        adler32_z                               @174

-        crc32_z                                 @175

crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.sln

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.sln b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.sln
deleted file mode 100644
index 9fcbafd..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.sln
+++ /dev/null
@@ -1,117 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2012

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Itanium = Debug|Itanium

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Itanium = Release|Itanium

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium

-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32

-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
deleted file mode 100644
index c65b95f..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Itanium">

-      <Configuration>Debug</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

-      <Configuration>ReleaseWithoutAsm</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Itanium">

-      <Configuration>Release</Configuration>

-      <Platform>Itanium</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

-    <PlatformToolset>v110</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx86

-bld_ml32.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\contrib\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\masmx64

-bld_ml64.bat</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Itanium</TargetEnvironment>

-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>

-      </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

-      <AssemblerOutput>All</AssemblerOutput>

-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

-      <BrowseInformation>

-      </BrowseInformation>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x040c</Culture>

-    </ResourceCompile>

-    <Link>

-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

-      <TargetMachine>MachineIA64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\adler32.c" />

-    <ClCompile Include="..\..\..\compress.c" />

-    <ClCompile Include="..\..\..\crc32.c" />

-    <ClCompile Include="..\..\..\deflate.c" />

-    <ClCompile Include="..\..\..\gzclose.c" />

-    <ClCompile Include="..\..\..\gzlib.c" />

-    <ClCompile Include="..\..\..\gzread.c" />

-    <ClCompile Include="..\..\..\gzwrite.c" />

-    <ClCompile Include="..\..\..\infback.c" />

-    <ClCompile Include="..\..\masmx64\inffas8664.c">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="..\..\..\inffast.c" />

-    <ClCompile Include="..\..\..\inflate.c" />

-    <ClCompile Include="..\..\..\inftrees.c" />

-    <ClCompile Include="..\..\minizip\ioapi.c" />

-    <ClCompile Include="..\..\minizip\iowin32.c" />

-    <ClCompile Include="..\..\..\trees.c" />

-    <ClCompile Include="..\..\..\uncompr.c" />

-    <ClCompile Include="..\..\minizip\unzip.c">

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="..\..\minizip\zip.c">

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="..\..\..\zutil.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="zlib.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="zlibvc.def" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\deflate.h" />

-    <ClInclude Include="..\..\..\infblock.h" />

-    <ClInclude Include="..\..\..\infcodes.h" />

-    <ClInclude Include="..\..\..\inffast.h" />

-    <ClInclude Include="..\..\..\inftrees.h" />

-    <ClInclude Include="..\..\..\infutil.h" />

-    <ClInclude Include="..\..\..\zconf.h" />

-    <ClInclude Include="..\..\..\zlib.h" />

-    <ClInclude Include="..\..\..\zutil.h" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/miniunz.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/miniunz.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/miniunz.vcxproj
deleted file mode 100644
index d88ac7f..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/minizip.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/minizip.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/minizip.vcxproj
deleted file mode 100644
index f1f239c..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlib.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlib.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlib.vcxproj
deleted file mode 100644
index 64b2cbe..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj
deleted file mode 100644
index c66573a..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlib.rc

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlib.rc b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END

crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibstat.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibstat.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
deleted file mode 100644
index 3fdee7c..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.def

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.def b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.def
deleted file mode 100644
index 54e683d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY

-; zlib data compression and ZIP file I/O library

-

-VERSION		1.2

-

-EXPORTS

-        adler32                                  @1

-        compress                                 @2

-        crc32                                    @3

-        deflate                                  @4

-        deflateCopy                              @5

-        deflateEnd                               @6

-        deflateInit2_                            @7

-        deflateInit_                             @8

-        deflateParams                            @9

-        deflateReset                             @10

-        deflateSetDictionary                     @11

-        gzclose                                  @12

-        gzdopen                                  @13

-        gzerror                                  @14

-        gzflush                                  @15

-        gzopen                                   @16

-        gzread                                   @17

-        gzwrite                                  @18

-        inflate                                  @19

-        inflateEnd                               @20

-        inflateInit2_                            @21

-        inflateInit_                             @22

-        inflateReset                             @23

-        inflateSetDictionary                     @24

-        inflateSync                              @25

-        uncompress                               @26

-        zlibVersion                              @27

-        gzprintf                                 @28

-        gzputc                                   @29

-        gzgetc                                   @30

-        gzseek                                   @31

-        gzrewind                                 @32

-        gztell                                   @33

-        gzeof                                    @34

-        gzsetparams                              @35

-        zError                                   @36

-        inflateSyncPoint                         @37

-        get_crc_table                            @38

-        compress2                                @39

-        gzputs                                   @40

-        gzgets                                   @41

-        inflateCopy                              @42

-        inflateBackInit_                         @43

-        inflateBack                              @44

-        inflateBackEnd                           @45

-        compressBound                            @46

-        deflateBound                             @47

-        gzclearerr                               @48

-        gzungetc                                 @49

-        zlibCompileFlags                         @50

-        deflatePrime                             @51

-        deflatePending                           @52

-

-        unzOpen                                  @61

-        unzClose                                 @62

-        unzGetGlobalInfo                         @63

-        unzGetCurrentFileInfo                    @64

-        unzGoToFirstFile                         @65

-        unzGoToNextFile                          @66

-        unzOpenCurrentFile                       @67

-        unzReadCurrentFile                       @68

-        unzOpenCurrentFile3                      @69

-        unztell                                  @70

-        unzeof                                   @71

-        unzCloseCurrentFile                      @72

-        unzGetGlobalComment                      @73

-        unzStringFileNameCompare                 @74

-        unzLocateFile                            @75

-        unzGetLocalExtrafield                    @76

-        unzOpen2                                 @77

-        unzOpenCurrentFile2                      @78

-        unzOpenCurrentFilePassword               @79

-

-        zipOpen                                  @80

-        zipOpenNewFileInZip                      @81

-        zipWriteInFileInZip                      @82

-        zipCloseFileInZip                        @83

-        zipClose                                 @84

-        zipOpenNewFileInZip2                     @86

-        zipCloseFileInZipRaw                     @87

-        zipOpen2                                 @88

-        zipOpenNewFileInZip3                     @89

-

-        unzGetFilePos                            @100

-        unzGoToFilePos                           @101

-

-        fill_win32_filefunc                      @110

-

-; zlibwapi v1.2.4 added:

-        fill_win32_filefunc64                   @111

-        fill_win32_filefunc64A                  @112

-        fill_win32_filefunc64W                  @113

-

-        unzOpen64                               @120

-        unzOpen2_64                             @121

-        unzGetGlobalInfo64                      @122

-        unzGetCurrentFileInfo64                 @124

-        unzGetCurrentFileZStreamPos64           @125

-        unztell64                               @126

-        unzGetFilePos64                         @127

-        unzGoToFilePos64                        @128

-

-        zipOpen64                               @130

-        zipOpen2_64                             @131

-        zipOpenNewFileInZip64                   @132

-        zipOpenNewFileInZip2_64                 @133

-        zipOpenNewFileInZip3_64                 @134

-        zipOpenNewFileInZip4_64                 @135

-        zipCloseFileInZipRaw64                  @136

-

-; zlib1 v1.2.4 added:

-        adler32_combine                         @140

-        crc32_combine                           @142

-        deflateSetHeader                        @144

-        deflateTune                             @145

-        gzbuffer                                @146

-        gzclose_r                               @147

-        gzclose_w                               @148

-        gzdirect                                @149

-        gzoffset                                @150

-        inflateGetHeader                        @156

-        inflateMark                             @157

-        inflatePrime                            @158

-        inflateReset2                           @159

-        inflateUndermine                        @160

-

-; zlib1 v1.2.6 added:

-        gzgetc_                                 @161

-        inflateResetKeep                        @163

-        deflateResetKeep                        @164

-

-; zlib1 v1.2.7 added:

-        gzopen_w                                @165

-

-; zlib1 v1.2.8 added:

-        inflateGetDictionary                    @166

-        gzvprintf                               @167

-

-; zlib1 v1.2.9 added:

-        inflateCodesUsed                        @168

-        inflateValidate                         @169

-        uncompress2                             @170

-        gzfread                                 @171

-        gzfwrite                                @172

-        deflateGetDictionary                    @173

-        adler32_z                               @174

-        crc32_z                                 @175

crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.sln

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.sln b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.sln
deleted file mode 100644
index dcda229..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
deleted file mode 100644
index ab2b6c3..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/miniunz.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/miniunz.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/miniunz.vcxproj
deleted file mode 100644
index 9b5c075..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/minizip.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/minizip.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/minizip.vcxproj
deleted file mode 100644
index 968a410..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlib.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlib.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlib.vcxproj
deleted file mode 100644
index 2c37125..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj
deleted file mode 100644
index d87474d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlib.rc

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlib.rc b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlib.rc
deleted file mode 100644
index c4e4b01..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END

crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibstat.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibstat.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
deleted file mode 100644
index 3e4b986..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.def

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.def b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.def
deleted file mode 100644
index 54e683d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY

-; zlib data compression and ZIP file I/O library

-

-VERSION		1.2

-

-EXPORTS

-        adler32                                  @1

-        compress                                 @2

-        crc32                                    @3

-        deflate                                  @4

-        deflateCopy                              @5

-        deflateEnd                               @6

-        deflateInit2_                            @7

-        deflateInit_                             @8

-        deflateParams                            @9

-        deflateReset                             @10

-        deflateSetDictionary                     @11

-        gzclose                                  @12

-        gzdopen                                  @13

-        gzerror                                  @14

-        gzflush                                  @15

-        gzopen                                   @16

-        gzread                                   @17

-        gzwrite                                  @18

-        inflate                                  @19

-        inflateEnd                               @20

-        inflateInit2_                            @21

-        inflateInit_                             @22

-        inflateReset                             @23

-        inflateSetDictionary                     @24

-        inflateSync                              @25

-        uncompress                               @26

-        zlibVersion                              @27

-        gzprintf                                 @28

-        gzputc                                   @29

-        gzgetc                                   @30

-        gzseek                                   @31

-        gzrewind                                 @32

-        gztell                                   @33

-        gzeof                                    @34

-        gzsetparams                              @35

-        zError                                   @36

-        inflateSyncPoint                         @37

-        get_crc_table                            @38

-        compress2                                @39

-        gzputs                                   @40

-        gzgets                                   @41

-        inflateCopy                              @42

-        inflateBackInit_                         @43

-        inflateBack                              @44

-        inflateBackEnd                           @45

-        compressBound                            @46

-        deflateBound                             @47

-        gzclearerr                               @48

-        gzungetc                                 @49

-        zlibCompileFlags                         @50

-        deflatePrime                             @51

-        deflatePending                           @52

-

-        unzOpen                                  @61

-        unzClose                                 @62

-        unzGetGlobalInfo                         @63

-        unzGetCurrentFileInfo                    @64

-        unzGoToFirstFile                         @65

-        unzGoToNextFile                          @66

-        unzOpenCurrentFile                       @67

-        unzReadCurrentFile                       @68

-        unzOpenCurrentFile3                      @69

-        unztell                                  @70

-        unzeof                                   @71

-        unzCloseCurrentFile                      @72

-        unzGetGlobalComment                      @73

-        unzStringFileNameCompare                 @74

-        unzLocateFile                            @75

-        unzGetLocalExtrafield                    @76

-        unzOpen2                                 @77

-        unzOpenCurrentFile2                      @78

-        unzOpenCurrentFilePassword               @79

-

-        zipOpen                                  @80

-        zipOpenNewFileInZip                      @81

-        zipWriteInFileInZip                      @82

-        zipCloseFileInZip                        @83

-        zipClose                                 @84

-        zipOpenNewFileInZip2                     @86

-        zipCloseFileInZipRaw                     @87

-        zipOpen2                                 @88

-        zipOpenNewFileInZip3                     @89

-

-        unzGetFilePos                            @100

-        unzGoToFilePos                           @101

-

-        fill_win32_filefunc                      @110

-

-; zlibwapi v1.2.4 added:

-        fill_win32_filefunc64                   @111

-        fill_win32_filefunc64A                  @112

-        fill_win32_filefunc64W                  @113

-

-        unzOpen64                               @120

-        unzOpen2_64                             @121

-        unzGetGlobalInfo64                      @122

-        unzGetCurrentFileInfo64                 @124

-        unzGetCurrentFileZStreamPos64           @125

-        unztell64                               @126

-        unzGetFilePos64                         @127

-        unzGoToFilePos64                        @128

-

-        zipOpen64                               @130

-        zipOpen2_64                             @131

-        zipOpenNewFileInZip64                   @132

-        zipOpenNewFileInZip2_64                 @133

-        zipOpenNewFileInZip3_64                 @134

-        zipOpenNewFileInZip4_64                 @135

-        zipCloseFileInZipRaw64                  @136

-

-; zlib1 v1.2.4 added:

-        adler32_combine                         @140

-        crc32_combine                           @142

-        deflateSetHeader                        @144

-        deflateTune                             @145

-        gzbuffer                                @146

-        gzclose_r                               @147

-        gzclose_w                               @148

-        gzdirect                                @149

-        gzoffset                                @150

-        inflateGetHeader                        @156

-        inflateMark                             @157

-        inflatePrime                            @158

-        inflateReset2                           @159

-        inflateUndermine                        @160

-

-; zlib1 v1.2.6 added:

-        gzgetc_                                 @161

-        inflateResetKeep                        @163

-        deflateResetKeep                        @164

-

-; zlib1 v1.2.7 added:

-        gzopen_w                                @165

-

-; zlib1 v1.2.8 added:

-        inflateGetDictionary                    @166

-        gzvprintf                               @167

-

-; zlib1 v1.2.9 added:

-        inflateCodesUsed                        @168

-        inflateValidate                         @169

-        uncompress2                             @170

-        gzfread                                 @171

-        gzfwrite                                @172

-        deflateGetDictionary                    @173

-        adler32_z                               @174

-        crc32_z                                 @175

crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.sln

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.sln b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.sln
deleted file mode 100644
index 6f4a107..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.vcxproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
deleted file mode 100644
index f8f673c..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

crates/libz-sys/src/zlib/contrib/vstudio/vc9/miniunz.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/miniunz.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/miniunz.vcproj
deleted file mode 100644
index 7da32b9..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/miniunz.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="miniunz"

-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

-				SubSystem="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"

-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/miniunz.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

-			>

-			<File

-				RelativePath="..\..\minizip\miniunz.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/contrib/vstudio/vc9/minizip.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/minizip.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/minizip.vcproj
deleted file mode 100644
index e57e07d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/minizip.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="minizip"

-	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\MiniZip$(ConfigurationName)"

-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\MiniZip$(ConfigurationName)"

-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\$(ConfigurationName)"

-			IntermediateDirectory="x64\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\$(ConfigurationName)"

-			IntermediateDirectory="ia64\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"

-				SubSystem="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\$(ConfigurationName)"

-			IntermediateDirectory="x64\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\$(ConfigurationName)"

-			IntermediateDirectory="ia64\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/minizip.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

-			>

-			<File

-				RelativePath="..\..\minizip\minizip.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlib.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlib.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlib.vcproj
deleted file mode 100644
index 9cb0bf8..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlib.vcproj
+++ /dev/null
@@ -1,852 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="testzlib"

-	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-	RootNamespace="testzlib"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerOutput="4"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				AssemblerListingLocation="$(IntDir)\"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

-				GenerateManifest="false"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerOutput="4"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-				SubSystem="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Win32"

-			OutputDirectory="x86\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|x64"

-			OutputDirectory="x64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				AssemblerListingLocation="$(IntDir)\"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies=""

-				GenerateManifest="false"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Itanium"

-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				AssemblerListingLocation="$(IntDir)\"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

-				GenerateManifest="false"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"

-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\.."

-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

-			>

-			<File

-				RelativePath="..\..\..\adler32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\compress.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\crc32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\deflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infback.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\..\inffast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inftrees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\testzlib\testzlib.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\trees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\uncompr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zutil.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlibdll.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
deleted file mode 100644
index b1ddde0..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="TestZlibDll"

-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="2"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-				SubSystem="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="1"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				OmitFramePointers="true"

-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

-				StringPooling="true"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

-				OutputFile="$(OutDir)/testzlib.exe"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

-			>

-			<File

-				RelativePath="..\..\testzlib\testzlib.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlib.rc

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlib.rc b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlib.rc
deleted file mode 100644
index fee177a..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>

-

-#define IDR_VERSION1  1

-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION	 1, 2, 11, 0

-  PRODUCTVERSION 1, 2, 11, 0

-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

-  FILEFLAGS	0

-  FILEOS	VOS_DOS_WINDOWS32

-  FILETYPE	VFT_DLL

-  FILESUBTYPE	0	// not used

-BEGIN

-  BLOCK "StringFileInfo"

-  BEGIN

-    BLOCK "040904E4"

-    //language ID = U.S. English, char set = Windows, Multilingual

-

-    BEGIN

-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",	"1.2.11\0"

-      VALUE "InternalName",	"zlib\0"

-      VALUE "OriginalFilename",	"zlibwapi.dll\0"

-      VALUE "ProductName",	"ZLib.DLL\0"

-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"

-    END

-  END

-  BLOCK "VarFileInfo"

-  BEGIN

-    VALUE "Translation", 0x0409, 1252

-  END

-END

crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibstat.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibstat.vcproj
deleted file mode 100644
index 61c76c7..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibstat.vcproj
+++ /dev/null
@@ -1,835 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="zlibstat"

-	ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				ExceptionHandling="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				ExceptionHandling="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Win32"

-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|x64"

-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Itanium"

-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-			ConfigurationType="4"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="2"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-				OutputFile="$(OutDir)\zlibstat.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			>

-			<File

-				RelativePath="..\..\..\adler32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\compress.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\crc32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\deflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzclose.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzguts.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzlib.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzread.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzwrite.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infback.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\..\inffast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inftrees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\ioapi.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\trees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\uncompr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\unzip.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\zip.c"

-				>

-			</File>

-			<File

-				RelativePath=".\zlib.rc"

-				>

-			</File>

-			<File

-				RelativePath=".\zlibvc.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zutil.c"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.def

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.def b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.def
deleted file mode 100644
index 54e683d..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY

-; zlib data compression and ZIP file I/O library

-

-VERSION		1.2

-

-EXPORTS

-        adler32                                  @1

-        compress                                 @2

-        crc32                                    @3

-        deflate                                  @4

-        deflateCopy                              @5

-        deflateEnd                               @6

-        deflateInit2_                            @7

-        deflateInit_                             @8

-        deflateParams                            @9

-        deflateReset                             @10

-        deflateSetDictionary                     @11

-        gzclose                                  @12

-        gzdopen                                  @13

-        gzerror                                  @14

-        gzflush                                  @15

-        gzopen                                   @16

-        gzread                                   @17

-        gzwrite                                  @18

-        inflate                                  @19

-        inflateEnd                               @20

-        inflateInit2_                            @21

-        inflateInit_                             @22

-        inflateReset                             @23

-        inflateSetDictionary                     @24

-        inflateSync                              @25

-        uncompress                               @26

-        zlibVersion                              @27

-        gzprintf                                 @28

-        gzputc                                   @29

-        gzgetc                                   @30

-        gzseek                                   @31

-        gzrewind                                 @32

-        gztell                                   @33

-        gzeof                                    @34

-        gzsetparams                              @35

-        zError                                   @36

-        inflateSyncPoint                         @37

-        get_crc_table                            @38

-        compress2                                @39

-        gzputs                                   @40

-        gzgets                                   @41

-        inflateCopy                              @42

-        inflateBackInit_                         @43

-        inflateBack                              @44

-        inflateBackEnd                           @45

-        compressBound                            @46

-        deflateBound                             @47

-        gzclearerr                               @48

-        gzungetc                                 @49

-        zlibCompileFlags                         @50

-        deflatePrime                             @51

-        deflatePending                           @52

-

-        unzOpen                                  @61

-        unzClose                                 @62

-        unzGetGlobalInfo                         @63

-        unzGetCurrentFileInfo                    @64

-        unzGoToFirstFile                         @65

-        unzGoToNextFile                          @66

-        unzOpenCurrentFile                       @67

-        unzReadCurrentFile                       @68

-        unzOpenCurrentFile3                      @69

-        unztell                                  @70

-        unzeof                                   @71

-        unzCloseCurrentFile                      @72

-        unzGetGlobalComment                      @73

-        unzStringFileNameCompare                 @74

-        unzLocateFile                            @75

-        unzGetLocalExtrafield                    @76

-        unzOpen2                                 @77

-        unzOpenCurrentFile2                      @78

-        unzOpenCurrentFilePassword               @79

-

-        zipOpen                                  @80

-        zipOpenNewFileInZip                      @81

-        zipWriteInFileInZip                      @82

-        zipCloseFileInZip                        @83

-        zipClose                                 @84

-        zipOpenNewFileInZip2                     @86

-        zipCloseFileInZipRaw                     @87

-        zipOpen2                                 @88

-        zipOpenNewFileInZip3                     @89

-

-        unzGetFilePos                            @100

-        unzGoToFilePos                           @101

-

-        fill_win32_filefunc                      @110

-

-; zlibwapi v1.2.4 added:

-        fill_win32_filefunc64                   @111

-        fill_win32_filefunc64A                  @112

-        fill_win32_filefunc64W                  @113

-

-        unzOpen64                               @120

-        unzOpen2_64                             @121

-        unzGetGlobalInfo64                      @122

-        unzGetCurrentFileInfo64                 @124

-        unzGetCurrentFileZStreamPos64           @125

-        unztell64                               @126

-        unzGetFilePos64                         @127

-        unzGoToFilePos64                        @128

-

-        zipOpen64                               @130

-        zipOpen2_64                             @131

-        zipOpenNewFileInZip64                   @132

-        zipOpenNewFileInZip2_64                 @133

-        zipOpenNewFileInZip3_64                 @134

-        zipOpenNewFileInZip4_64                 @135

-        zipCloseFileInZipRaw64                  @136

-

-; zlib1 v1.2.4 added:

-        adler32_combine                         @140

-        crc32_combine                           @142

-        deflateSetHeader                        @144

-        deflateTune                             @145

-        gzbuffer                                @146

-        gzclose_r                               @147

-        gzclose_w                               @148

-        gzdirect                                @149

-        gzoffset                                @150

-        inflateGetHeader                        @156

-        inflateMark                             @157

-        inflatePrime                            @158

-        inflateReset2                           @159

-        inflateUndermine                        @160

-

-; zlib1 v1.2.6 added:

-        gzgetc_                                 @161

-        inflateResetKeep                        @163

-        deflateResetKeep                        @164

-

-; zlib1 v1.2.7 added:

-        gzopen_w                                @165

-

-; zlib1 v1.2.8 added:

-        inflateGetDictionary                    @166

-        gzvprintf                               @167

-

-; zlib1 v1.2.9 added:

-        inflateCodesUsed                        @168

-        inflateValidate                         @169

-        uncompress2                             @170

-        gzfread                                 @171

-        gzfwrite                                @172

-        deflateGetDictionary                    @173

-        adler32_z                               @174

-        crc32_z                                 @175

crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.sln

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.sln b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.sln
deleted file mode 100644
index b482967..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.sln
+++ /dev/null
@@ -1,144 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-	ProjectSection(ProjectDependencies) = postProject

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Itanium = Debug|Itanium

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Itanium = Release|Itanium

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium

-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32

-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.vcproj

diff --git a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.vcproj
deleted file mode 100644
index c9a8947..0000000
--- a/crates/libz-sys/src/zlib/contrib/vstudio/vc9/zlibvc.vcproj
+++ /dev/null
@@ -1,1156 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="zlibvc"

-	ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-	RootNamespace="zlibvc"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-		<Platform

-			Name="Itanium"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="3"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

-				ExceptionHandling="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Itanium"

-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="2"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

-				ExceptionHandling="0"

-				RuntimeLibrary="3"

-				BufferSecurityCheck="false"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Win32"

-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|x64"

-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="3"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="ReleaseWithoutAsm|Itanium"

-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="2"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="3"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Itanium"

-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-			ConfigurationType="2"

-			InheritedPropertySheets="UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="2"

-				TypeLibraryName="$(OutDir)/zlibvc.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-				AssemblerOutput="2"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(OutDir)\"

-				BrowseInformation="0"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)\zlibwapi.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				GenerateManifest="false"

-				IgnoreAllDefaultLibraries="false"

-				ModuleDefinitionFile=".\zlibvc.def"

-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)/zlibwapi.map"

-				SubSystem="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="$(OutDir)/zlibwapi.lib"

-				TargetMachine="5"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-			>

-			<File

-				RelativePath="..\..\..\adler32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\compress.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\crc32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\deflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzclose.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzguts.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzlib.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzread.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\gzwrite.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infback.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\masmx64\inffas8664.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="ReleaseWithoutAsm|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\..\inffast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inftrees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\ioapi.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\iowin32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\trees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\uncompr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\minizip\unzip.c"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\minizip\zip.c"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Itanium"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="ZLIB_INTERNAL"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\zlib.rc"

-				>

-			</File>

-			<File

-				RelativePath=".\zlibvc.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zutil.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;fi;fd"

-			>

-			<File

-				RelativePath="..\..\..\deflate.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infblock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infcodes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inffast.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\inftrees.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\infutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zconf.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zlib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\zutil.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

crates/libz-sys/src/zlib/crc32.c

diff --git a/crates/libz-sys/src/zlib/crc32.c b/crates/libz-sys/src/zlib/crc32.c
deleted file mode 100644
index 9580440..0000000
--- a/crates/libz-sys/src/zlib/crc32.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    return crc32_z(crc, buf, len);
-}
-
-#ifdef BYFOUR
-
-/*
-   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
-   integer pointer type. This violates the strict aliasing rule, where a
-   compiler can assume, for optimization purposes, that two pointers to
-   fundamentally different types won't ever point to the same memory. This can
-   manifest as a problem only if one of the pointers is written to. This code
-   only reads from those pointers. So long as this code remains isolated in
-   this compilation unit, there won't be a problem. For this reason, this code
-   should not be copied and pasted into a compilation unit in which other code
-   writes to the buffer that is passed to these routines.
- */
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}

crates/libz-sys/src/zlib/crc32.h

diff --git a/crates/libz-sys/src/zlib/crc32.h b/crates/libz-sys/src/zlib/crc32.h
deleted file mode 100644
index 9e0c778..0000000
--- a/crates/libz-sys/src/zlib/crc32.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};

crates/libz-sys/src/zlib/deflate.c

diff --git a/crates/libz-sys/src/zlib/deflate.c b/crates/libz-sys/src/zlib/deflate.c
deleted file mode 100644
index 1ec7614..0000000
--- a/crates/libz-sys/src/zlib/deflate.c
+++ /dev/null
@@ -1,2163 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
- *    characters, so that a running hash key can be computed from the previous
- *    key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to INSERT_STRING are made with consecutive input
- *    characters and the first MIN_MATCH bytes of str are valid (except for
- *    the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ===========================================================================
- * Slide the hash table when sliding the window down (could be avoided with 32
- * bit values at the expense of memory usage). We slide even when level == 0 to
- * keep the hash table consistent if we switch back to level > 0 later.
- */
-local void slide_hash(s)
-    deflate_state *s;
-{
-    unsigned n, m;
-    Posf *p;
-    uInt wsize = s->w_size;
-
-    n = s->hash_size;
-    p = &s->head[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-    } while (--n);
-    n = wsize;
-#ifndef FASTEST
-    p = &s->prev[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-        /* If n is not on any hash chain, prev[n] is garbage but
-         * its value will never be used.
-         */
-    } while (--n);
-#endif
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = (uInt)windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = (uInt)memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->high_water = 0;      /* nothing written to s->window yet */
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* =========================================================================
- * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
- */
-local int deflateStateCheck (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    s = strm->state;
-    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
-#ifdef GZIP
-                                           s->status != GZIP_STATE &&
-#endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
-                                           s->status != BUSY_STATE &&
-                                           s->status != FINISH_STATE))
-        return 1;
-    return 0;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt str, n;
-    int wrap;
-    unsigned avail;
-    z_const unsigned char *next;
-
-    if (deflateStateCheck(strm) || dictionary == Z_NULL)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    wrap = s->wrap;
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
-
-    /* if dictionary would fill window, just replace the history */
-    if (dictLength >= s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
-            CLEAR_HASH(s);
-            s->strstart = 0;
-            s->block_start = 0L;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
-    }
-
-    /* insert dictionary into window and hash */
-    avail = strm->avail_in;
-    next = strm->next_in;
-    strm->avail_in = dictLength;
-    strm->next_in = (z_const Bytef *)dictionary;
-    fill_window(s);
-    while (s->lookahead >= MIN_MATCH) {
-        str = s->strstart;
-        n = s->lookahead - (MIN_MATCH-1);
-        do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-            s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-            s->head[s->ins_h] = (Pos)str;
-            str++;
-        } while (--n);
-        s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
-        fill_window(s);
-    }
-    s->strstart += s->lookahead;
-    s->block_start = (long)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    strm->next_in = next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    Bytef *dictionary;
-    uInt  *dictLength;
-{
-    deflate_state *s;
-    uInt len;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    len = s->strstart + s->lookahead;
-    if (len > s->w_size)
-        len = s->w_size;
-    if (dictionary != Z_NULL && len)
-        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
-    if (dictLength != Z_NULL)
-        *dictLength = len;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status =
-#ifdef GZIP
-        s->wrap == 2 ? GZIP_STATE :
-#endif
-        s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    int ret;
-
-    ret = deflateResetKeep(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (deflateStateCheck(strm) || strm->state->wrap != 2)
-        return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
-    if (bits != Z_NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    deflate_state *s;
-    int put;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-        return Z_BUF_ERROR;
-    do {
-        put = Buf_size - s->bi_valid;
-        if (put > bits)
-            put = bits;
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-        s->bi_valid += put;
-        _tr_flush_bits(s);
-        value >>= put;
-        bits -= put;
-    } while (bits);
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
-        /* Flush the last buffer: */
-        int err = deflate(strm, Z_BLOCK);
-        if (err == Z_STREAM_ERROR)
-            return err;
-        if (strm->avail_out == 0)
-            return Z_BUF_ERROR;
-    }
-    if (s->level != level) {
-        if (s->level == 0 && s->matches != 0) {
-            if (s->matches == 1)
-                slide_hash(s);
-            else
-                CLEAR_HASH(s);
-            s->matches = 0;
-        }
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = (uInt)good_length;
-    s->max_lazy_match = (uInt)max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = (uInt)max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong complen, wraplen;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (deflateStateCheck(strm))
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-#ifdef GZIP
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            Bytef *str;
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-#endif
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
-
-    /* default settings: return tight bound for that case */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output, except for
- * some deflate_stored() output, goes through this function so some
- * applications may wish to modify it to avoid allocating a large
- * strm->next_out buffer and copying into it. (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len;
-    deflate_state *s = strm->state;
-
-    _tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, s->pending_out, len);
-    strm->next_out  += len;
-    s->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out -= len;
-    s->pending      -= len;
-    if (s->pending == 0) {
-        s->pending_out = s->pending_buf;
-    }
-}
-
-/* ===========================================================================
- * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
- */
-#define HCRC_UPDATE(beg) \
-    do { \
-        if (s->gzhead->hcrc && s->pending > (beg)) \
-            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
-                                s->pending - (beg)); \
-    } while (0)
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-        /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags;
-
-        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-            level_flags = 0;
-        else if (s->level < 6)
-            level_flags = 1;
-        else if (s->level == 6)
-            level_flags = 2;
-        else
-            level_flags = 3;
-        header |= (level_flags << 6);
-        if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        putShortMSB(s, header);
-
-        /* Save the adler32 of the preset dictionary: */
-        if (s->strstart != 0) {
-            putShortMSB(s, (uInt)(strm->adler >> 16));
-            putShortMSB(s, (uInt)(strm->adler & 0xffff));
-        }
-        strm->adler = adler32(0L, Z_NULL, 0);
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#ifdef GZIP
-    if (s->status == GZIP_STATE) {
-        /* gzip header */
-        strm->adler = crc32(0L, Z_NULL, 0);
-        put_byte(s, 31);
-        put_byte(s, 139);
-        put_byte(s, 8);
-        if (s->gzhead == Z_NULL) {
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, OS_CODE);
-            s->status = BUSY_STATE;
-
-            /* Compression must start with an empty pending buffer */
-            flush_pending(strm);
-            if (s->pending != 0) {
-                s->last_flush = -1;
-                return Z_OK;
-            }
-        }
-        else {
-            put_byte(s, (s->gzhead->text ? 1 : 0) +
-                     (s->gzhead->hcrc ? 2 : 0) +
-                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                     (s->gzhead->name == Z_NULL ? 0 : 8) +
-                     (s->gzhead->comment == Z_NULL ? 0 : 16)
-                     );
-            put_byte(s, (Byte)(s->gzhead->time & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, s->gzhead->os & 0xff);
-            if (s->gzhead->extra != Z_NULL) {
-                put_byte(s, s->gzhead->extra_len & 0xff);
-                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-            }
-            if (s->gzhead->hcrc)
-                strm->adler = crc32(strm->adler, s->pending_buf,
-                                    s->pending);
-            s->gzindex = 0;
-            s->status = EXTRA_STATE;
-        }
-    }
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
-            while (s->pending + left > s->pending_buf_size) {
-                uInt copy = s->pending_buf_size - s->pending;
-                zmemcpy(s->pending_buf + s->pending,
-                        s->gzhead->extra + s->gzindex, copy);
-                s->pending = s->pending_buf_size;
-                HCRC_UPDATE(beg);
-                s->gzindex += copy;
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-                beg = 0;
-                left -= copy;
-            }
-            zmemcpy(s->pending_buf + s->pending,
-                    s->gzhead->extra + s->gzindex, left);
-            s->pending += left;
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-        }
-        s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size) {
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-            }
-            put_byte(s, (Byte)(strm->adler & 0xff));
-            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-            strm->adler = crc32(0L, Z_NULL, 0);
-        }
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#endif
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = s->level == 0 ? deflate_stored(s, flush) :
-                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                 (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0L;
-                        s->insert = 0;
-                    }
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (deflateStateCheck(source) || dest == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local unsigned read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    zmemcpy(buf, strm->next_in, len);
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
-    }
-#endif
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                      /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = (int)s->prev_length;         /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-
-#else /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#endif /* FASTEST */
-
-#ifdef ZLIB_DEBUG
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* ZLIB_DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* Maximum stored block length in deflate format (not including header). */
-#define MAX_STORED 65535
-
-/* Minimum of a and b. */
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- *
- * In case deflateParams() is used to later switch to a non-zero compression
- * level, s->matches (otherwise unused when storing) keeps track of the number
- * of hash table slides to perform. If s->matches is 1, then one hash table
- * slide will be done when switching. If s->matches is 2, the maximum value
- * allowed here, then the hash table will be cleared, since two or more slides
- * is the same as a clear.
- *
- * deflate_stored() is written to minimize the number of times an input byte is
- * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Smallest worthy block size when not flushing or finishing. By default
-     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
-     * large input and output buffers, the stored block size will be larger.
-     */
-    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
-
-    /* Copy as many min_block or larger stored blocks directly to next_out as
-     * possible. If flushing, copy the remaining available input to next_out as
-     * stored blocks, if there is enough space.
-     */
-    unsigned len, left, have, last = 0;
-    unsigned used = s->strm->avail_in;
-    do {
-        /* Set len to the maximum size block that we can copy directly with the
-         * available input data and output space. Set left to how much of that
-         * would be copied from what's left in the window.
-         */
-        len = MAX_STORED;       /* maximum deflate stored block length */
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        if (s->strm->avail_out < have)          /* need room for header */
-            break;
-            /* maximum stored block length that will fit in avail_out: */
-        have = s->strm->avail_out - have;
-        left = s->strstart - s->block_start;    /* bytes left in window */
-        if (len > (ulg)left + s->strm->avail_in)
-            len = left + s->strm->avail_in;     /* limit len to the input */
-        if (len > have)
-            len = have;                         /* limit len to the output */
-
-        /* If the stored block would be less than min_block in length, or if
-         * unable to copy all of the available input when flushing, then try
-         * copying to the window and the pending buffer instead. Also don't
-         * write an empty block when flushing -- deflate() does that.
-         */
-        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
-                                flush == Z_NO_FLUSH ||
-                                len != left + s->strm->avail_in))
-            break;
-
-        /* Make a dummy stored block in pending to get the header bytes,
-         * including any pending bits. This also updates the debugging counts.
-         */
-        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
-        _tr_stored_block(s, (char *)0, 0L, last);
-
-        /* Replace the lengths in the dummy stored block with len. */
-        s->pending_buf[s->pending - 4] = len;
-        s->pending_buf[s->pending - 3] = len >> 8;
-        s->pending_buf[s->pending - 2] = ~len;
-        s->pending_buf[s->pending - 1] = ~len >> 8;
-
-        /* Write the stored block header bytes. */
-        flush_pending(s->strm);
-
-#ifdef ZLIB_DEBUG
-        /* Update debugging counts for the data about to be copied. */
-        s->compressed_len += len << 3;
-        s->bits_sent += len << 3;
-#endif
-
-        /* Copy uncompressed bytes from the window to next_out. */
-        if (left) {
-            if (left > len)
-                left = len;
-            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
-            s->strm->next_out += left;
-            s->strm->avail_out -= left;
-            s->strm->total_out += left;
-            s->block_start += left;
-            len -= left;
-        }
-
-        /* Copy uncompressed bytes directly from next_in to next_out, updating
-         * the check value.
-         */
-        if (len) {
-            read_buf(s->strm, s->strm->next_out, len);
-            s->strm->next_out += len;
-            s->strm->avail_out -= len;
-            s->strm->total_out += len;
-        }
-    } while (last == 0);
-
-    /* Update the sliding window with the last s->w_size bytes of the copied
-     * data, or append all of the copied data to the existing window if less
-     * than s->w_size bytes were copied. Also update the number of bytes to
-     * insert in the hash tables, in the event that deflateParams() switches to
-     * a non-zero compression level.
-     */
-    used -= s->strm->avail_in;      /* number of input bytes directly copied */
-    if (used) {
-        /* If any input was used, then no unused input remains in the window,
-         * therefore s->block_start == s->strstart.
-         */
-        if (used >= s->w_size) {    /* supplant the previous history */
-            s->matches = 2;         /* clear hash */
-            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
-            s->strstart = s->w_size;
-        }
-        else {
-            if (s->window_size - s->strstart <= used) {
-                /* Slide the window down. */
-                s->strstart -= s->w_size;
-                zmemcpy(s->window, s->window + s->w_size, s->strstart);
-                if (s->matches < 2)
-                    s->matches++;   /* add a pending slide_hash() */
-            }
-            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
-            s->strstart += used;
-        }
-        s->block_start = s->strstart;
-        s->insert += MIN(used, s->w_size - s->insert);
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* If the last block was written to next_out, then done. */
-    if (last)
-        return finish_done;
-
-    /* If flushing and all input has been consumed, then done. */
-    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
-        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
-        return block_done;
-
-    /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart - 1;
-    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
-        /* Slide the window down. */
-        s->block_start -= s->w_size;
-        s->strstart -= s->w_size;
-        zmemcpy(s->window, s->window + s->w_size, s->strstart);
-        if (s->matches < 2)
-            s->matches++;           /* add a pending slide_hash() */
-        have += s->w_size;          /* more space now */
-    }
-    if (have > s->strm->avail_in)
-        have = s->strm->avail_in;
-    if (have) {
-        read_buf(s->strm, s->window + s->strstart, have);
-        s->strstart += have;
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* There was not enough avail_out to write a complete worthy or flushed
-     * stored block to next_out. Write a stored block to pending instead, if we
-     * have enough input for a worthy block, or if flushing and there is enough
-     * room for the remaining input as a stored block in the pending buffer.
-     */
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        /* maximum stored block length that will fit in pending: */
-    have = MIN(s->pending_buf_size - have, MAX_STORED);
-    min_block = MIN(have, s->w_size);
-    left = s->strstart - s->block_start;
-    if (left >= min_block ||
-        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
-         s->strm->avail_in == 0 && left <= have)) {
-        len = MIN(left, have);
-        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
-               len == left ? 1 : 0;
-        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
-        s->block_start += len;
-        flush_pending(s->strm);
-    }
-
-    /* We've done all we can with the available input and output. */
-    return last ? finish_started : need_more;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;       /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;          /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-#endif /* FASTEST */
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-    uInt prev;              /* byte at distance one to match */
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
-         */
-        if (s->lookahead <= MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        s->match_length = 0;
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
-            scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                s->match_length = MAX_MATCH - (uInt)(strend - scan);
-                if (s->match_length > s->lookahead)
-                    s->match_length = s->lookahead;
-            }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-            s->strstart += s->match_length;
-            s->match_length = 0;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}

crates/libz-sys/src/zlib/deflate.h

diff --git a/crates/libz-sys/src/zlib/deflate.h b/crates/libz-sys/src/zlib/deflate.h
deleted file mode 100644
index 23ecdd3..0000000
--- a/crates/libz-sys/src/zlib/deflate.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define Buf_size 16
-/* size of bit buffer in bi_buf */
-
-#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
-#ifdef GZIP
-#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#endif
-#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
-#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
-#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
-#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
-#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
-#define FINISH_STATE 666    /* stream complete */
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    const static_tree_desc *stat_desc;  /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    ulg   pending;       /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp  gzhead;  /* gzip header information to write */
-    ulg   gzindex;       /* where in extra, name, or comment */
-    Byte  method;        /* can only be DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    uInt insert;        /* bytes at end of window left to insert */
-
-#ifdef ZLIB_DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-    ulg high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-#define WIN_INIT MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
-        /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef ZLIB_DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch ZLIB_INTERNAL _length_code[];
-  extern uch ZLIB_INTERNAL _dist_code[];
-#else
-  extern const uch ZLIB_INTERNAL _length_code[];
-  extern const uch ZLIB_INTERNAL _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (uch)(length); \
-    ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */

crates/libz-sys/src/zlib/doc/algorithm.txt

diff --git a/crates/libz-sys/src/zlib/doc/algorithm.txt b/crates/libz-sys/src/zlib/doc/algorithm.txt
deleted file mode 100644
index c97f495..0000000
--- a/crates/libz-sys/src/zlib/doc/algorithm.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-1. Compression algorithm (deflate)
-
-The deflation algorithm used by gzip (also zip and zlib) is a variation of
-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
-the input data.  The second occurrence of a string is replaced by a
-pointer to the previous string, in the form of a pair (distance,
-length).  Distances are limited to 32K bytes, and lengths are limited
-to 258 bytes. When a string does not occur anywhere in the previous
-32K bytes, it is emitted as a sequence of literal bytes.  (In this
-description, `string' must be taken as an arbitrary sequence of bytes,
-and is not restricted to printable characters.)
-
-Literals or match lengths are compressed with one Huffman tree, and
-match distances are compressed with another tree. The trees are stored
-in a compact form at the start of each block. The blocks can have any
-size (except that the compressed data for one block must fit in
-available memory). A block is terminated when deflate() determines that
-it would be useful to start another block with fresh trees. (This is
-somewhat similar to the behavior of LZW-based _compress_.)
-
-Duplicated strings are found using a hash table. All input strings of
-length 3 are inserted in the hash table. A hash index is computed for
-the next 3 bytes. If the hash chain for this index is not empty, all
-strings in the chain are compared with the current input string, and
-the longest match is selected.
-
-The hash chains are searched starting with the most recent strings, to
-favor small distances and thus take advantage of the Huffman encoding.
-The hash chains are singly linked. There are no deletions from the
-hash chains, the algorithm simply discards matches that are too old.
-
-To avoid a worst-case situation, very long hash chains are arbitrarily
-truncated at a certain length, determined by a runtime option (level
-parameter of deflateInit). So deflate() does not always find the longest
-possible match but generally finds a match which is long enough.
-
-deflate() also defers the selection of matches with a lazy evaluation
-mechanism. After a match of length N has been found, deflate() searches for
-a longer match at the next input byte. If a longer match is found, the
-previous match is truncated to a length of one (thus producing a single
-literal byte) and the process of lazy evaluation begins again. Otherwise,
-the original match is kept, and the next match search is attempted only N
-steps later.
-
-The lazy match evaluation is also subject to a runtime parameter. If
-the current match is long enough, deflate() reduces the search for a longer
-match, thus speeding up the whole process. If compression ratio is more
-important than speed, deflate() attempts a complete second search even if
-the first match is already long enough.
-
-The lazy match evaluation is not performed for the fastest compression
-modes (level parameter 1 to 3). For these fast modes, new strings
-are inserted in the hash table only when no match was found, or
-when the match is not too long. This degrades the compression ratio
-but saves time since there are both fewer insertions and fewer searches.
-
-
-2. Decompression algorithm (inflate)
-
-2.1 Introduction
-
-The key question is how to represent a Huffman code (or any prefix code) so
-that you can decode fast.  The most important characteristic is that shorter
-codes are much more common than longer codes, so pay attention to decoding the
-short codes fast, and let the long codes take longer to decode.
-
-inflate() sets up a first level table that covers some number of bits of
-input less than the length of longest code.  It gets that many bits from the
-stream, and looks it up in the table.  The table will tell if the next
-code is that many bits or less and how many, and if it is, it will tell
-the value, else it will point to the next level table for which inflate()
-grabs more bits and tries to decode a longer code.
-
-How many bits to make the first lookup is a tradeoff between the time it
-takes to decode and the time it takes to build the table.  If building the
-table took no time (and if you had infinite memory), then there would only
-be a first level table to cover all the way to the longest code.  However,
-building the table ends up taking a lot longer for more bits since short
-codes are replicated many times in such a table.  What inflate() does is
-simply to make the number of bits in the first table a variable, and  then
-to set that variable for the maximum speed.
-
-For inflate, which has 286 possible codes for the literal/length tree, the size
-of the first table is nine bits.  Also the distance trees have 30 possible
-values, and the size of the first table is six bits.  Note that for each of
-those cases, the table ended up one bit longer than the ``average'' code
-length, i.e. the code length of an approximately flat code which would be a
-little more than eight bits for 286 symbols and a little less than five bits
-for 30 symbols.
-
-
-2.2 More details on the inflate table lookup
-
-Ok, you want to know what this cleverly obfuscated inflate tree actually
-looks like.  You are correct that it's not a Huffman tree.  It is simply a
-lookup table for the first, let's say, nine bits of a Huffman symbol.  The
-symbol could be as short as one bit or as long as 15 bits.  If a particular
-symbol is shorter than nine bits, then that symbol's translation is duplicated
-in all those entries that start with that symbol's bits.  For example, if the
-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a
-symbol is nine bits long, it appears in the table once.
-
-If the symbol is longer than nine bits, then that entry in the table points
-to another similar table for the remaining bits.  Again, there are duplicated
-entries as needed.  The idea is that most of the time the symbol will be short
-and there will only be one table look up.  (That's whole idea behind data
-compression in the first place.)  For the less frequent long symbols, there
-will be two lookups.  If you had a compression method with really long
-symbols, you could have as many levels of lookups as is efficient.  For
-inflate, two is enough.
-
-So a table entry either points to another table (in which case nine bits in
-the above example are gobbled), or it contains the translation for the symbol
-and the number of bits to gobble.  Then you start again with the next
-ungobbled bit.
-
-You may wonder: why not just have one lookup table for how ever many bits the
-longest symbol is?  The reason is that if you do that, you end up spending
-more time filling in duplicate symbol entries than you do actually decoding.
-At least for deflate's output that generates new trees every several 10's of
-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code
-would take too long if you're only decoding several thousand symbols.  At the
-other extreme, you could make a new table for every bit in the code.  In fact,
-that's essentially a Huffman tree.  But then you spend too much time
-traversing the tree while decoding, even for short symbols.
-
-So the number of bits for the first lookup table is a trade of the time to
-fill out the table vs. the time spent looking at the second level and above of
-the table.
-
-Here is an example, scaled down:
-
-The code being decoded, with 10 symbols, from 1 to 6 bits long:
-
-A: 0
-B: 10
-C: 1100
-D: 11010
-E: 11011
-F: 11100
-G: 11101
-H: 11110
-I: 111110
-J: 111111
-
-Let's make the first table three bits long (eight entries):
-
-000: A,1
-001: A,1
-010: A,1
-011: A,1
-100: B,2
-101: B,2
-110: -> table X (gobble 3 bits)
-111: -> table Y (gobble 3 bits)
-
-Each entry is what the bits decode as and how many bits that is, i.e. how
-many bits to gobble.  Or the entry points to another table, with the number of
-bits to gobble implicit in the size of the table.
-
-Table X is two bits long since the longest code starting with 110 is five bits
-long:
-
-00: C,1
-01: C,1
-10: D,2
-11: E,2
-
-Table Y is three bits long since the longest code starting with 111 is six
-bits long:
-
-000: F,2
-001: F,2
-010: G,2
-011: G,2
-100: H,2
-101: H,2
-110: I,3
-111: J,3
-
-So what we have here are three tables with a total of 20 entries that had to
-be constructed.  That's compared to 64 entries for a single table.  Or
-compared to 16 entries for a Huffman tree (six two entry tables and one four
-entry table).  Assuming that the code ideally represents the probability of
-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
-to one lookup for the single table, or 1.66 lookups per symbol for the
-Huffman tree.
-
-There, I think that gives you a picture of what's going on.  For inflate, the
-meaning of a particular symbol is often more than just a letter.  It can be a
-byte (a "literal"), or it can be either a length or a distance which
-indicates a base value and a number of bits to fetch after the code that is
-added to the base value.  Or it might be the special end-of-block code.  The
-data structures created in inftrees.c try to encode all that information
-compactly in the tables.
-
-
-Jean-loup Gailly        Mark Adler
-jloup@gzip.org          madler@alumni.caltech.edu
-
-
-References:
-
-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
-pp. 337-343.
-
-``DEFLATE Compressed Data Format Specification'' available in
-http://tools.ietf.org/html/rfc1951

crates/libz-sys/src/zlib/doc/rfc1950.txt

diff --git a/crates/libz-sys/src/zlib/doc/rfc1950.txt b/crates/libz-sys/src/zlib/doc/rfc1950.txt
deleted file mode 100644
index ce6428a..0000000
--- a/crates/libz-sys/src/zlib/doc/rfc1950.txt
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1950                           Aladdin Enterprises
-Category: Informational                                      J-L. Gailly
-                                                                Info-ZIP
-                                                                May 1996
-
-
-         ZLIB Compressed Data Format Specification version 3.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format.  The
-   data can be produced or consumed, even for an arbitrarily long
-   sequentially presented input data stream, using only an a priori
-   bounded amount of intermediate storage.  The format presently uses
-   the DEFLATE compression method but can be easily extended to use
-   other compression methods.  It can be implemented readily in a manner
-   not covered by patents.  This specification also defines the ADLER-32
-   checksum (an extension and improvement of the Fletcher checksum),
-   used for detection of data corruption, and provides an algorithm for
-   computing it.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 1]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 3
-      2.1. Overall conventions ....................................... 3
-      2.2. Data format ............................................... 4
-      2.3. Compliance ................................................ 7
-   3. References ..................................................... 7
-   4. Source code .................................................... 8
-   5. Security Considerations ........................................ 8
-   6. Acknowledgements ............................................... 8
-   7. Authors' Addresses ............................................. 8
-   8. Appendix: Rationale ............................................ 9
-   9. Appendix: Sample code ..........................................10
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence can
-            be used in data communications or similar structures such as
-            Unix filters;
-
-          * Can use a number of different compression methods;
-
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely.
-
-      The data format defined by this specification does not attempt to
-      allow random access to compressed data.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 2]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into zlib format and/or decompress data from zlib
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compressed data format that can be
-      used for in-memory compression of a sequence of arbitrary bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.) See below, for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      Version 3.1 was the first public release of this specification.
-      In version 3.2, some terminology was changed and the Adler-32
-      sample code was rewritten for clarity.  In version 3.3, the
-      support for a preset dictionary was introduced, and the
-      specification was converted to RFC style.
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 3]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the MOST-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0     1
-         +--------+--------+
-         |00000010|00001000|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + less significant byte = 8
-          + more significant byte = 2 x 256
-
-   2.2. Data format
-
-      A zlib stream has the following structure:
-
-           0   1
-         +---+---+
-         |CMF|FLG|   (more-->)
-         +---+---+
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 4]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      (if FLG.FDICT set)
-
-           0   1   2   3
-         +---+---+---+---+
-         |     DICTID    |   (more-->)
-         +---+---+---+---+
-
-         +=====================+---+---+---+---+
-         |...compressed data...|    ADLER32    |
-         +=====================+---+---+---+---+
-
-      Any data which may appear after ADLER32 are not part of the zlib
-      stream.
-
-      CMF (Compression Method and flags)
-         This byte is divided into a 4-bit compression method and a 4-
-         bit information field depending on the compression method.
-
-            bits 0 to 3  CM     Compression method
-            bits 4 to 7  CINFO  Compression info
-
-      CM (Compression method)
-         This identifies the compression method used in the file. CM = 8
-         denotes the "deflate" compression method with a window size up
-         to 32K.  This is the method used by gzip and PNG (see
-         references [1] and [2] in Chapter 3, below, for the reference
-         documents).  CM = 15 is reserved.  It might be used in a future
-         version of this specification to indicate the presence of an
-         extra field before the compressed data.
-
-      CINFO (Compression info)
-         For CM = 8, CINFO is the base-2 logarithm of the LZ77 window
-         size, minus eight (CINFO=7 indicates a 32K window size). Values
-         of CINFO above 7 are not allowed in this version of the
-         specification.  CINFO is not defined in this specification for
-         CM not equal to 8.
-
-      FLG (FLaGs)
-         This flag byte is divided as follows:
-
-            bits 0 to 4  FCHECK  (check bits for CMF and FLG)
-            bit  5       FDICT   (preset dictionary)
-            bits 6 to 7  FLEVEL  (compression level)
-
-         The FCHECK value must be such that CMF and FLG, when viewed as
-         a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG),
-         is a multiple of 31.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 5]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      FDICT (Preset dictionary)
-         If FDICT is set, a DICT dictionary identifier is present
-         immediately after the FLG byte. The dictionary is a sequence of
-         bytes which are initially fed to the compressor without
-         producing any compressed output. DICT is the Adler-32 checksum
-         of this sequence of bytes (see the definition of ADLER32
-         below).  The decompressor can use this identifier to determine
-         which dictionary has been used by the compressor.
-
-      FLEVEL (Compression level)
-         These flags are available for use by specific compression
-         methods.  The "deflate" method (CM = 8) sets these flags as
-         follows:
-
-            0 - compressor used fastest algorithm
-            1 - compressor used fast algorithm
-            2 - compressor used default algorithm
-            3 - compressor used maximum compression, slowest algorithm
-
-         The information in FLEVEL is not needed for decompression; it
-         is there to indicate if recompression might be worthwhile.
-
-      compressed data
-         For compression method 8, the compressed data is stored in the
-         deflate compressed data format as described in the document
-         "DEFLATE Compressed Data Format Specification" by L. Peter
-         Deutsch. (See reference [3] in Chapter 3, below)
-
-         Other compressed data formats are not specified in this version
-         of the zlib specification.
-
-      ADLER32 (Adler-32 checksum)
-         This contains a checksum value of the uncompressed data
-         (excluding any dictionary data) computed according to Adler-32
-         algorithm. This algorithm is a 32-bit extension and improvement
-         of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
-         standard. See references [4] and [5] in Chapter 3, below)
-
-         Adler-32 is composed of two sums accumulated per byte: s1 is
-         the sum of all bytes, s2 is the sum of all s1 values. Both sums
-         are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
-         Adler-32 checksum is stored as s2*65536 + s1 in most-
-         significant-byte first (network) order.
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 6]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   2.3. Compliance
-
-      A compliant compressor must produce streams with correct CMF, FLG
-      and ADLER32, but need not support preset dictionaries.  When the
-      zlib data format is used as part of another standard data format,
-      the compressor may use only preset dictionaries that are specified
-      by this other data format.  If this other format does not use the
-      preset dictionary feature, the compressor must not set the FDICT
-      flag.
-
-      A compliant decompressor must check CMF, FLG, and ADLER32, and
-      provide an error indication if any of these have incorrect values.
-      A compliant decompressor must give an error indication if CM is
-      not one of the values defined in this specification (only the
-      value 8 is permitted in this version), since another value could
-      indicate the presence of new features that would cause subsequent
-      data to be interpreted incorrectly.  A compliant decompressor must
-      give an error indication if FDICT is set and DICTID is not the
-      identifier of a known preset dictionary.  A decompressor may
-      ignore FLEVEL and still be compliant.  When the zlib data format
-      is being used as a part of another standard format, a compliant
-      decompressor must support all the preset dictionaries specified by
-      the other format. When the other format does not use the preset
-      dictionary feature, a compliant decompressor must reject any
-      stream in which the FDICT flag is set.
-
-3. References
-
-   [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [2] Thomas Boutell, "PNG (Portable Network Graphics) specification",
-       available in ftp://ftp.uu.net/graphics/png/documents/
-
-   [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Fletcher, J. G., "An Arithmetic Checksum for Serial
-       Transmissions," IEEE Transactions on Communications, Vol. COM-30,
-       No. 1, January 1982, pp. 247-252.
-
-   [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms,"
-       November, 1993, pp. 144, 145. (Available from
-       gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 7]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-4. Source code
-
-   Source code for a C language implementation of a "zlib" compliant
-   library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-5. Security Considerations
-
-   A decoder that fails to check the ADLER32 checksum value may be
-   subject to undetected data corruption.
-
-6. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly and Mark Adler designed the zlib format and wrote
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-7. Authors' Addresses
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-
-   Jean-Loup Gailly
-
-   EMail: <gzip@prep.ai.mit.edu>
-
-   Questions about the technical content of this specification can be
-   sent by email to
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 8]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-8. Appendix: Rationale
-
-   8.1. Preset dictionaries
-
-      A preset dictionary is specially useful to compress short input
-      sequences. The compressor can take advantage of the dictionary
-      context to encode the input in a more compact manner. The
-      decompressor can be initialized with the appropriate context by
-      virtually decompressing a compressed version of the dictionary
-      without producing any output. However for certain compression
-      algorithms such as the deflate algorithm this operation can be
-      achieved without actually performing any decompression.
-
-      The compressor and the decompressor must use exactly the same
-      dictionary. The dictionary may be fixed or may be chosen among a
-      certain number of predefined dictionaries, according to the kind
-      of input data. The decompressor can determine which dictionary has
-      been chosen by the compressor by checking the dictionary
-      identifier. This document does not specify the contents of
-      predefined dictionaries, since the optimal dictionaries are
-      application specific. Standard data formats using this feature of
-      the zlib specification must precisely define the allowed
-      dictionaries.
-
-   8.2. The Adler-32 algorithm
-
-      The Adler-32 algorithm is much faster than the CRC32 algorithm yet
-      still provides an extremely low probability of undetected errors.
-
-      The modulo on unsigned long accumulators can be delayed for 5552
-      bytes, so the modulo operation time is negligible.  If the bytes
-      are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
-      and order sensitive, unlike the first sum, which is just a
-      checksum.  That 65521 is prime is important to avoid a possible
-      large class of two-byte errors that leave the check unchanged.
-      (The Fletcher checksum uses 255, which is not prime and which also
-      makes the Fletcher check insensitive to single byte changes 0 <->
-      255.)
-
-      The sum s1 is initialized to 1 instead of zero to make the length
-      of the sequence part of s2, so that the length does not have to be
-      checked separately. (Any sequence of zeroes has a Fletcher
-      checksum of zero.)
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 9]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-9. Appendix: Sample code
-
-   The following C code computes the Adler-32 checksum of a data buffer.
-   It is written for clarity, not for speed.  The sample code is in the
-   ANSI C programming language. Non C users may find it easier to read
-   with these hints:
-
-      &      Bitwise AND operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero bit(s)
-             at the left.
-      <<     Bitwise left shift operator. Left shift inserts zero
-             bit(s) at the right.
-      ++     "n++" increments the variable n.
-      %      modulo operator: a % b is the remainder of a divided by b.
-
-      #define BASE 65521 /* largest prime smaller than 65536 */
-
-      /*
-         Update a running Adler-32 checksum with the bytes buf[0..len-1]
-       and return the updated checksum. The Adler-32 checksum should be
-       initialized to 1.
-
-       Usage example:
-
-         unsigned long adler = 1L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           adler = update_adler32(adler, buffer, length);
-         }
-         if (adler != original_adler) error();
-      */
-      unsigned long update_adler32(unsigned long adler,
-         unsigned char *buf, int len)
-      {
-        unsigned long s1 = adler & 0xffff;
-        unsigned long s2 = (adler >> 16) & 0xffff;
-        int n;
-
-        for (n = 0; n < len; n++) {
-          s1 = (s1 + buf[n]) % BASE;
-          s2 = (s2 + s1)     % BASE;
-        }
-        return (s2 << 16) + s1;
-      }
-
-      /* Return the adler32 of the bytes buf[0..len-1] */
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 10]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      unsigned long adler32(unsigned char *buf, int len)
-      {
-        return update_adler32(1L, buf, len);
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 11]
-

crates/libz-sys/src/zlib/doc/rfc1951.txt

diff --git a/crates/libz-sys/src/zlib/doc/rfc1951.txt b/crates/libz-sys/src/zlib/doc/rfc1951.txt
deleted file mode 100644
index 403c8c7..0000000
--- a/crates/libz-sys/src/zlib/doc/rfc1951.txt
+++ /dev/null
@@ -1,955 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1951                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-        DEFLATE Compressed Data Format Specification version 1.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that
-   compresses data using a combination of the LZ77 algorithm and Huffman
-   coding, with efficiency comparable to the best currently available
-   general-purpose compression methods.  The data can be produced or
-   consumed, even for an arbitrarily long sequentially presented input
-   data stream, using only an a priori bounded amount of intermediate
-   storage.  The format can be implemented readily in a manner not
-   covered by patents.
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 4
-   2. Compressed representation overview ............................. 4
-   3. Detailed specification ......................................... 5
-      3.1. Overall conventions ....................................... 5
-          3.1.1. Packing into bytes .................................. 5
-      3.2. Compressed block format ................................... 6
-          3.2.1. Synopsis of prefix and Huffman coding ............... 6
-          3.2.2. Use of Huffman coding in the "deflate" format ....... 7
-          3.2.3. Details of block format ............................. 9
-          3.2.4. Non-compressed blocks (BTYPE=00) ................... 11
-          3.2.5. Compressed blocks (length and distance codes) ...... 11
-          3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12
-          3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13
-      3.3. Compliance ............................................... 14
-   4. Compression algorithm details ................................. 14
-   5. References .................................................... 16
-   6. Security Considerations ....................................... 16
-   7. Source code ................................................... 16
-   8. Acknowledgements .............................................. 16
-   9. Author's Address .............................................. 17
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence
-            can be used in data communications or similar structures
-            such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-      The data format defined by this specification does not attempt to:
-
-          * Allow random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well
-            as the best currently available specialized algorithms.
-
-      A simple counting argument shows that no lossless compression
-      algorithm can compress every possible input data set.  For the
-      format defined here, the worst case expansion is 5 bytes per 32K-
-      byte block, i.e., a size increase of 0.015% for large data sets.
-      English text usually compresses by a factor of 2.5 to 3;
-      executable files usually compress somewhat less; graphical data
-      such as raster images may compress much more.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into "deflate" format and/or decompress data from
-      "deflate" format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.  Familiarity with the technique of Huffman coding
-      is helpful but not required.
-
-   1.3. Scope
-
-      The specification specifies a method for representing a sequence
-      of bytes as a (usually shorter) sequence of bits, and a method for
-      packing the latter bit sequence into bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      Byte: 8 bits stored or transmitted as a unit (same as an octet).
-      For this specification, a byte is exactly 8 bits, even on machines
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-      which store a character on a number of bits different from eight.
-      See below, for the numbering of bits within a byte.
-
-      String: a sequence of arbitrary bytes.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the deflate format since
-      version 1.1 of this specification.  In version 1.2, some
-      terminology was changed.  Version 1.3 is a conversion of the
-      specification to RFC style.
-
-2. Compressed representation overview
-
-   A compressed data set consists of a series of blocks, corresponding
-   to successive blocks of input data.  The block sizes are arbitrary,
-   except that non-compressible blocks are limited to 65,535 bytes.
-
-   Each block is compressed using a combination of the LZ77 algorithm
-   and Huffman coding. The Huffman trees for each block are independent
-   of those for previous or subsequent blocks; the LZ77 algorithm may
-   use a reference to a duplicated string occurring in a previous block,
-   up to 32K input bytes before.
-
-   Each block consists of two parts: a pair of Huffman code trees that
-   describe the representation of the compressed data part, and a
-   compressed data part.  (The Huffman trees themselves are compressed
-   using Huffman encoding.)  The compressed data consists of a series of
-   elements of two types: literal bytes (of strings that have not been
-   detected as duplicated within the previous 32K input bytes), and
-   pointers to duplicated strings, where a pointer is represented as a
-   pair <length, backward distance>.  The representation used in the
-   "deflate" format limits distances to 32K bytes and lengths to 258
-   bytes, but does not limit the size of a block, except for
-   uncompressible blocks, which are limited as noted above.
-
-   Each type of value (literals, distances, and lengths) in the
-   compressed data is represented using a Huffman code, using one code
-   tree for literals and lengths and a separate code tree for distances.
-   The code trees for each block appear in a compact form just before
-   the compressed data for that block.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-3. Detailed specification
-
-   3.1. Overall conventions In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-      3.1.1. Packing into bytes
-
-         This document does not address the issue of the order in which
-         bits of a byte are transmitted on a bit-sequential medium,
-         since the final data format described here is byte- rather than
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         bit-oriented.  However, we describe the compressed block format
-         in below, as a sequence of data elements of various bit
-         lengths, not a sequence of bytes.  We must therefore specify
-         how to pack these data elements into bytes to form the final
-         compressed byte sequence:
-
-             * Data elements are packed into bytes in order of
-               increasing bit number within the byte, i.e., starting
-               with the least-significant bit of the byte.
-             * Data elements other than Huffman codes are packed
-               starting with the least-significant bit of the data
-               element.
-             * Huffman codes are packed starting with the most-
-               significant bit of the code.
-
-         In other words, if one were to print out the compressed data as
-         a sequence of bytes, starting with the first byte at the
-         *right* margin and proceeding to the *left*, with the most-
-         significant bit of each byte on the left as usual, one would be
-         able to parse the result from right to left, with fixed-width
-         elements in the correct MSB-to-LSB order and Huffman codes in
-         bit-reversed order (i.e., with the first bit of the code in the
-         relative LSB position).
-
-   3.2. Compressed block format
-
-      3.2.1. Synopsis of prefix and Huffman coding
-
-         Prefix coding represents symbols from an a priori known
-         alphabet by bit sequences (codes), one code for each symbol, in
-         a manner such that different symbols may be represented by bit
-         sequences of different lengths, but a parser can always parse
-         an encoded string unambiguously symbol-by-symbol.
-
-         We define a prefix code in terms of a binary tree in which the
-         two edges descending from each non-leaf node are labeled 0 and
-         1 and in which the leaf nodes correspond one-for-one with (are
-         labeled with) the symbols of the alphabet; then the code for a
-         symbol is the sequence of 0's and 1's on the edges leading from
-         the root to the leaf labeled with that symbol.  For example:
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                          /\              Symbol    Code
-                         0  1             ------    ----
-                        /    \                A      00
-                       /\     B               B       1
-                      0  1                    C     011
-                     /    \                   D     010
-                    A     /\
-                         0  1
-                        /    \
-                       D      C
-
-         A parser can decode the next symbol from an encoded input
-         stream by walking down the tree from the root, at each step
-         choosing the edge corresponding to the next input bit.
-
-         Given an alphabet with known symbol frequencies, the Huffman
-         algorithm allows the construction of an optimal prefix code
-         (one which represents strings with those symbol frequencies
-         using the fewest bits of any possible prefix codes for that
-         alphabet).  Such a code is called a Huffman code.  (See
-         reference [1] in Chapter 5, references for additional
-         information on Huffman codes.)
-
-         Note that in the "deflate" format, the Huffman codes for the
-         various alphabets must not exceed certain maximum code lengths.
-         This constraint complicates the algorithm for computing code
-         lengths from symbol frequencies.  Again, see Chapter 5,
-         references for details.
-
-      3.2.2. Use of Huffman coding in the "deflate" format
-
-         The Huffman codes used for each alphabet in the "deflate"
-         format have two additional rules:
-
-             * All codes of a given bit length have lexicographically
-               consecutive values, in the same order as the symbols
-               they represent;
-
-             * Shorter codes lexicographically precede longer codes.
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         We could recode the example above to follow this rule as
-         follows, assuming that the order of the alphabet is ABCD:
-
-            Symbol  Code
-            ------  ----
-            A       10
-            B       0
-            C       110
-            D       111
-
-         I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are
-         lexicographically consecutive.
-
-         Given this rule, we can define the Huffman code for an alphabet
-         just by giving the bit lengths of the codes for each symbol of
-         the alphabet in order; this is sufficient to determine the
-         actual codes.  In our example, the code is completely defined
-         by the sequence of bit lengths (2, 1, 3, 3).  The following
-         algorithm generates the codes as integers, intended to be read
-         from most- to least-significant bit.  The code lengths are
-         initially in tree[I].Len; the codes are produced in
-         tree[I].Code.
-
-         1)  Count the number of codes for each code length.  Let
-             bl_count[N] be the number of codes of length N, N >= 1.
-
-         2)  Find the numerical value of the smallest code for each
-             code length:
-
-                code = 0;
-                bl_count[0] = 0;
-                for (bits = 1; bits <= MAX_BITS; bits++) {
-                    code = (code + bl_count[bits-1]) << 1;
-                    next_code[bits] = code;
-                }
-
-         3)  Assign numerical values to all codes, using consecutive
-             values for all codes of the same length with the base
-             values determined at step 2. Codes that are never used
-             (which have a bit length of zero) must not be assigned a
-             value.
-
-                for (n = 0;  n <= max_code; n++) {
-                    len = tree[n].Len;
-                    if (len != 0) {
-                        tree[n].Code = next_code[len];
-                        next_code[len]++;
-                    }
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                }
-
-         Example:
-
-         Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3,
-         3, 2, 4, 4).  After step 1, we have:
-
-            N      bl_count[N]
-            -      -----------
-            2      1
-            3      5
-            4      2
-
-         Step 2 computes the following next_code values:
-
-            N      next_code[N]
-            -      ------------
-            1      0
-            2      0
-            3      2
-            4      14
-
-         Step 3 produces the following code values:
-
-            Symbol Length   Code
-            ------ ------   ----
-            A       3        010
-            B       3        011
-            C       3        100
-            D       3        101
-            E       3        110
-            F       2         00
-            G       4       1110
-            H       4       1111
-
-      3.2.3. Details of block format
-
-         Each block of compressed data begins with 3 header bits
-         containing the following data:
-
-            first bit       BFINAL
-            next 2 bits     BTYPE
-
-         Note that the header bits do not necessarily begin on a byte
-         boundary, since a block does not necessarily occupy an integral
-         number of bytes.
-
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         BFINAL is set if and only if this is the last block of the data
-         set.
-
-         BTYPE specifies how the data are compressed, as follows:
-
-            00 - no compression
-            01 - compressed with fixed Huffman codes
-            10 - compressed with dynamic Huffman codes
-            11 - reserved (error)
-
-         The only difference between the two compressed cases is how the
-         Huffman codes for the literal/length and distance alphabets are
-         defined.
-
-         In all cases, the decoding algorithm for the actual data is as
-         follows:
-
-            do
-               read block header from input stream.
-               if stored with no compression
-                  skip any remaining bits in current partially
-                     processed byte
-                  read LEN and NLEN (see next section)
-                  copy LEN bytes of data to output
-               otherwise
-                  if compressed with dynamic Huffman codes
-                     read representation of code trees (see
-                        subsection below)
-                  loop (until end of block code recognized)
-                     decode literal/length value from input stream
-                     if value < 256
-                        copy value (literal byte) to output stream
-                     otherwise
-                        if value = end of block (256)
-                           break from loop
-                        otherwise (value = 257..285)
-                           decode distance from input stream
-
-                           move backwards distance bytes in the output
-                           stream, and copy length bytes from this
-                           position to the output stream.
-                  end loop
-            while not last block
-
-         Note that a duplicated string reference may refer to a string
-         in a previous block; i.e., the backward distance may cross one
-         or more block boundaries.  However a distance cannot refer past
-         the beginning of the output stream.  (An application using a
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         preset dictionary might discard part of the output stream; a
-         distance can refer to that part of the output stream anyway)
-         Note also that the referenced string may overlap the current
-         position; for example, if the last 2 bytes decoded have values
-         X and Y, a string reference with <length = 5, distance = 2>
-         adds X,Y,X,Y,X to the output stream.
-
-         We now specify each compression method in turn.
-
-      3.2.4. Non-compressed blocks (BTYPE=00)
-
-         Any bits of input up to the next byte boundary are ignored.
-         The rest of the block consists of the following information:
-
-              0   1   2   3   4...
-            +---+---+---+---+================================+
-            |  LEN  | NLEN  |... LEN bytes of literal data...|
-            +---+---+---+---+================================+
-
-         LEN is the number of data bytes in the block.  NLEN is the
-         one's complement of LEN.
-
-      3.2.5. Compressed blocks (length and distance codes)
-
-         As noted above, encoded data blocks in the "deflate" format
-         consist of sequences of symbols drawn from three conceptually
-         distinct alphabets: either literal bytes, from the alphabet of
-         byte values (0..255), or <length, backward distance> pairs,
-         where the length is drawn from (3..258) and the distance is
-         drawn from (1..32,768).  In fact, the literal and length
-         alphabets are merged into a single alphabet (0..285), where
-         values 0..255 represent literal bytes, the value 256 indicates
-         end-of-block, and values 257..285 represent length codes
-         (possibly in conjunction with extra bits following the symbol
-         code) as follows:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                 Extra               Extra               Extra
-            Code Bits Length(s) Code Bits Lengths   Code Bits Length(s)
-            ---- ---- ------     ---- ---- -------   ---- ---- -------
-             257   0     3       267   1   15,16     277   4   67-82
-             258   0     4       268   1   17,18     278   4   83-98
-             259   0     5       269   2   19-22     279   4   99-114
-             260   0     6       270   2   23-26     280   4  115-130
-             261   0     7       271   2   27-30     281   5  131-162
-             262   0     8       272   2   31-34     282   5  163-194
-             263   0     9       273   3   35-42     283   5  195-226
-             264   0    10       274   3   43-50     284   5  227-257
-             265   1  11,12      275   3   51-58     285   0    258
-             266   1  13,14      276   3   59-66
-
-         The extra bits should be interpreted as a machine integer
-         stored with the most-significant bit first, e.g., bits 1110
-         represent the value 14.
-
-                  Extra           Extra               Extra
-             Code Bits Dist  Code Bits   Dist     Code Bits Distance
-             ---- ---- ----  ---- ----  ------    ---- ---- --------
-               0   0    1     10   4     33-48    20    9   1025-1536
-               1   0    2     11   4     49-64    21    9   1537-2048
-               2   0    3     12   5     65-96    22   10   2049-3072
-               3   0    4     13   5     97-128   23   10   3073-4096
-               4   1   5,6    14   6    129-192   24   11   4097-6144
-               5   1   7,8    15   6    193-256   25   11   6145-8192
-               6   2   9-12   16   7    257-384   26   12  8193-12288
-               7   2  13-16   17   7    385-512   27   12 12289-16384
-               8   3  17-24   18   8    513-768   28   13 16385-24576
-               9   3  25-32   19   8   769-1024   29   13 24577-32768
-
-      3.2.6. Compression with fixed Huffman codes (BTYPE=01)
-
-         The Huffman codes for the two alphabets are fixed, and are not
-         represented explicitly in the data.  The Huffman code lengths
-         for the literal/length alphabet are:
-
-                   Lit Value    Bits        Codes
-                   ---------    ----        -----
-                     0 - 143     8          00110000 through
-                                            10111111
-                   144 - 255     9          110010000 through
-                                            111111111
-                   256 - 279     7          0000000 through
-                                            0010111
-                   280 - 287     8          11000000 through
-                                            11000111
-
-
-
-Deutsch                      Informational                     [Page 12]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         The code lengths are sufficient to generate the actual codes,
-         as described above; we show the codes in the table for added
-         clarity.  Literal/length values 286-287 will never actually
-         occur in the compressed data, but participate in the code
-         construction.
-
-         Distance codes 0-31 are represented by (fixed-length) 5-bit
-         codes, with possible additional bits as shown in the table
-         shown in Paragraph 3.2.5, above.  Note that distance codes 30-
-         31 will never actually occur in the compressed data.
-
-      3.2.7. Compression with dynamic Huffman codes (BTYPE=10)
-
-         The Huffman codes for the two alphabets appear in the block
-         immediately after the header bits and before the actual
-         compressed data, first the literal/length code and then the
-         distance code.  Each code is defined by a sequence of code
-         lengths, as discussed in Paragraph 3.2.2, above.  For even
-         greater compactness, the code length sequences themselves are
-         compressed using a Huffman code.  The alphabet for code lengths
-         is as follows:
-
-               0 - 15: Represent code lengths of 0 - 15
-                   16: Copy the previous code length 3 - 6 times.
-                       The next 2 bits indicate repeat length
-                             (0 = 3, ... , 3 = 6)
-                          Example:  Codes 8, 16 (+2 bits 11),
-                                    16 (+2 bits 10) will expand to
-                                    12 code lengths of 8 (1 + 6 + 5)
-                   17: Repeat a code length of 0 for 3 - 10 times.
-                       (3 bits of length)
-                   18: Repeat a code length of 0 for 11 - 138 times
-                       (7 bits of length)
-
-         A code length of 0 indicates that the corresponding symbol in
-         the literal/length or distance alphabet will not occur in the
-         block, and should not participate in the Huffman code
-         construction algorithm given earlier.  If only one distance
-         code is used, it is encoded using one bit, not zero bits; in
-         this case there is a single code length of one, with one unused
-         code.  One distance code of zero bits means that there are no
-         distance codes used at all (the data is all literals).
-
-         We can now define the format of the block:
-
-               5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286)
-               5 Bits: HDIST, # of Distance codes - 1        (1 - 32)
-               4 Bits: HCLEN, # of Code Length codes - 4     (4 - 19)
-
-
-
-Deutsch                      Informational                     [Page 13]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-               (HCLEN + 4) x 3 bits: code lengths for the code length
-                  alphabet given just above, in the order: 16, 17, 18,
-                  0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-                  These code lengths are interpreted as 3-bit integers
-                  (0-7); as above, a code length of 0 means the
-                  corresponding symbol (literal/length or distance code
-                  length) is not used.
-
-               HLIT + 257 code lengths for the literal/length alphabet,
-                  encoded using the code length Huffman code
-
-               HDIST + 1 code lengths for the distance alphabet,
-                  encoded using the code length Huffman code
-
-               The actual compressed data of the block,
-                  encoded using the literal/length and distance Huffman
-                  codes
-
-               The literal/length symbol 256 (end of data),
-                  encoded using the literal/length Huffman code
-
-         The code length repeat codes can cross from HLIT + 257 to the
-         HDIST + 1 code lengths.  In other words, all code lengths form
-         a single sequence of HLIT + HDIST + 258 values.
-
-   3.3. Compliance
-
-      A compressor may limit further the ranges of values specified in
-      the previous section and still be compliant; for example, it may
-      limit the range of backward pointers to some value smaller than
-      32K.  Similarly, a compressor may limit the size of blocks so that
-      a compressible block fits in memory.
-
-      A compliant decompressor must accept the full range of possible
-      values defined in the previous section, and must accept blocks of
-      arbitrary size.
-
-4. Compression algorithm details
-
-   While it is the intent of this document to define the "deflate"
-   compressed data format without reference to any particular
-   compression algorithm, the format is related to the compressed
-   formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below);
-   since many variations of LZ77 are patented, it is strongly
-   recommended that the implementor of a compressor follow the general
-   algorithm presented here, which is known not to be patented per se.
-   The material in this section is not part of the definition of the
-
-
-
-Deutsch                      Informational                     [Page 14]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-   specification per se, and a compressor need not follow it in order to
-   be compliant.
-
-   The compressor terminates a block when it determines that starting a
-   new block with fresh trees would be useful, or when the block size
-   fills up the compressor's block buffer.
-
-   The compressor uses a chained hash table to find duplicated strings,
-   using a hash function that operates on 3-byte sequences.  At any
-   given point during compression, let XYZ be the next 3 input bytes to
-   be examined (not necessarily all different, of course).  First, the
-   compressor examines the hash chain for XYZ.  If the chain is empty,
-   the compressor simply writes out X as a literal byte and advances one
-   byte in the input.  If the hash chain is not empty, indicating that
-   the sequence XYZ (or, if we are unlucky, some other 3 bytes with the
-   same hash function value) has occurred recently, the compressor
-   compares all strings on the XYZ hash chain with the actual input data
-   sequence starting at the current point, and selects the longest
-   match.
-
-   The compressor searches the hash chains starting with the most recent
-   strings, to favor small distances and thus take advantage of the
-   Huffman encoding.  The hash chains are singly linked. There are no
-   deletions from the hash chains; the algorithm simply discards matches
-   that are too old.  To avoid a worst-case situation, very long hash
-   chains are arbitrarily truncated at a certain length, determined by a
-   run-time parameter.
-
-   To improve overall compression, the compressor optionally defers the
-   selection of matches ("lazy matching"): after a match of length N has
-   been found, the compressor searches for a longer match starting at
-   the next input byte.  If it finds a longer match, it truncates the
-   previous match to a length of one (thus producing a single literal
-   byte) and then emits the longer match.  Otherwise, it emits the
-   original match, and, as described above, advances N bytes before
-   continuing.
-
-   Run-time parameters also control this "lazy match" procedure.  If
-   compression ratio is most important, the compressor attempts a
-   complete second search regardless of the length of the first match.
-   In the normal case, if the current match is "long enough", the
-   compressor reduces the search for a longer match, thus speeding up
-   the process.  If speed is most important, the compressor inserts new
-   strings in the hash table only when no match was found, or when the
-   match is not "too long".  This degrades the compression ratio but
-   saves time since there are both fewer insertions and fewer searches.
-
-
-
-
-
-Deutsch                      Informational                     [Page 15]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-5. References
-
-   [1] Huffman, D. A., "A Method for the Construction of Minimum
-       Redundancy Codes", Proceedings of the Institute of Radio
-       Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101.
-
-   [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data
-       Compression", IEEE Transactions on Information Theory, Vol. 23,
-       No. 3, pp. 337-343.
-
-   [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources,
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources,
-       available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/
-
-   [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix
-       encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169.
-
-   [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes,"
-       Comm. ACM, 33,4, April 1990, pp. 449-459.
-
-6. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data.  See
-   reference [3], for example.
-
-7. Source code
-
-   Source code for a C language implementation of a "deflate" compliant
-   compressor and decompressor is available within the zlib package at
-   ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-8. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Phil Katz designed the deflate format.  Jean-Loup Gailly and Mark
-   Adler wrote the related software described in this specification.
-   Glenn Randers-Pehrson converted this document to RFC and HTML format.
-
-
-
-Deutsch                      Informational                     [Page 16]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-9. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 17]
-

crates/libz-sys/src/zlib/doc/rfc1952.txt

diff --git a/crates/libz-sys/src/zlib/doc/rfc1952.txt b/crates/libz-sys/src/zlib/doc/rfc1952.txt
deleted file mode 100644
index a8e51b4..0000000
--- a/crates/libz-sys/src/zlib/doc/rfc1952.txt
+++ /dev/null
@@ -1,675 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1952                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-               GZIP file format specification version 4.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that is
-   compatible with the widely used GZIP utility.  The format includes a
-   cyclic redundancy check value for detecting data corruption.  The
-   format presently uses the DEFLATE method of compression but can be
-   easily extended to use other compression methods.  The format can be
-   implemented readily in a manner not covered by patents.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5. Definitions of terms and conventions used ................. 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 4
-      2.1. Overall conventions ....................................... 4
-      2.2. File format ............................................... 5
-      2.3. Member format ............................................. 5
-          2.3.1. Member header and trailer ........................... 6
-              2.3.1.1. Extra field ................................... 8
-              2.3.1.2. Compliance .................................... 9
-      3. References .................................................. 9
-      4. Security Considerations .................................... 10
-      5. Acknowledgements ........................................... 10
-      6. Author's Address ........................................... 10
-      7. Appendix: Jean-Loup Gailly's gzip utility .................. 11
-      8. Appendix: Sample CRC Code .................................. 11
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can compress or decompress a data stream (as opposed to a
-            randomly accessible file) to produce another data stream,
-            using only an a priori bounded amount of intermediate
-            storage, and hence can be used in data communications or
-            similar structures such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      The data format defined by this specification does not attempt to:
-
-          * Provide random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well as
-            the best currently available specialized algorithms.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into gzip format and/or decompress data from gzip
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compression method and a file format
-      (the latter assuming only that a file can store a sequence of
-      arbitrary bytes).  It does not specify any particular interface to
-      a file system or anything about character sets or encodings
-      (except for file names and comments, which are optional).
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any file that conforms to all the
-      specifications presented here; a compliant compressor must produce
-      files that conform to all the specifications presented here.  The
-      material in the appendices is not part of the specification per se
-      and is not relevant to compliance.
-
-   1.5. Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.)  See below for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the gzip format since
-      version 4.1 of this specification.  In version 4.2, some
-      terminology was changed, and the sample CRC code was rewritten for
-      clarity and to eliminate the requirement for the caller to do pre-
-      and post-conditioning.  Version 4.3 is a conversion of the
-      specification to RFC style.
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      This document does not address the issue of the order in which
-      bits of a byte are transmitted on a bit-sequential medium, since
-      the data format described here is byte- rather than bit-oriented.
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   2.2. File format
-
-      A gzip file consists of a series of "members" (compressed data
-      sets).  The format of each member is specified in the following
-      section.  The members simply appear one after another in the file,
-      with no additional information before, between, or after them.
-
-   2.3. Member format
-
-      Each member has the following structure:
-
-         +---+---+---+---+---+---+---+---+---+---+
-         |ID1|ID2|CM |FLG|     MTIME     |XFL|OS | (more-->)
-         +---+---+---+---+---+---+---+---+---+---+
-
-      (if FLG.FEXTRA set)
-
-         +---+---+=================================+
-         | XLEN  |...XLEN bytes of "extra field"...| (more-->)
-         +---+---+=================================+
-
-      (if FLG.FNAME set)
-
-         +=========================================+
-         |...original file name, zero-terminated...| (more-->)
-         +=========================================+
-
-      (if FLG.FCOMMENT set)
-
-         +===================================+
-         |...file comment, zero-terminated...| (more-->)
-         +===================================+
-
-      (if FLG.FHCRC set)
-
-         +---+---+
-         | CRC16 |
-         +---+---+
-
-         +=======================+
-         |...compressed blocks...| (more-->)
-         +=======================+
-
-           0   1   2   3   4   5   6   7
-         +---+---+---+---+---+---+---+---+
-         |     CRC32     |     ISIZE     |
-         +---+---+---+---+---+---+---+---+
-
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      2.3.1. Member header and trailer
-
-         ID1 (IDentification 1)
-         ID2 (IDentification 2)
-            These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139
-            (0x8b, \213), to identify the file as being in gzip format.
-
-         CM (Compression Method)
-            This identifies the compression method used in the file.  CM
-            = 0-7 are reserved.  CM = 8 denotes the "deflate"
-            compression method, which is the one customarily used by
-            gzip and which is documented elsewhere.
-
-         FLG (FLaGs)
-            This flag byte is divided into individual bits as follows:
-
-               bit 0   FTEXT
-               bit 1   FHCRC
-               bit 2   FEXTRA
-               bit 3   FNAME
-               bit 4   FCOMMENT
-               bit 5   reserved
-               bit 6   reserved
-               bit 7   reserved
-
-            If FTEXT is set, the file is probably ASCII text.  This is
-            an optional indication, which the compressor may set by
-            checking a small amount of the input data to see whether any
-            non-ASCII characters are present.  In case of doubt, FTEXT
-            is cleared, indicating binary data. For systems which have
-            different file formats for ascii text and binary data, the
-            decompressor can use FTEXT to choose the appropriate format.
-            We deliberately do not specify the algorithm used to set
-            this bit, since a compressor always has the option of
-            leaving it cleared and a decompressor always has the option
-            of ignoring it and letting some other program handle issues
-            of data conversion.
-
-            If FHCRC is set, a CRC16 for the gzip header is present,
-            immediately before the compressed data. The CRC16 consists
-            of the two least significant bytes of the CRC32 for all
-            bytes of the gzip header up to and not including the CRC16.
-            [The FHCRC bit was never set by versions of gzip up to
-            1.2.4, even though it was documented with a different
-            meaning in gzip 1.2.4.]
-
-            If FEXTRA is set, optional extra fields are present, as
-            described in a following section.
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            If FNAME is set, an original file name is present,
-            terminated by a zero byte.  The name must consist of ISO
-            8859-1 (LATIN-1) characters; on operating systems using
-            EBCDIC or any other character set for file names, the name
-            must be translated to the ISO LATIN-1 character set.  This
-            is the original name of the file being compressed, with any
-            directory components removed, and, if the file being
-            compressed is on a file system with case insensitive names,
-            forced to lower case. There is no original file name if the
-            data was compressed from a source other than a named file;
-            for example, if the source was stdin on a Unix system, there
-            is no file name.
-
-            If FCOMMENT is set, a zero-terminated file comment is
-            present.  This comment is not interpreted; it is only
-            intended for human consumption.  The comment must consist of
-            ISO 8859-1 (LATIN-1) characters.  Line breaks should be
-            denoted by a single line feed character (10 decimal).
-
-            Reserved FLG bits must be zero.
-
-         MTIME (Modification TIME)
-            This gives the most recent modification time of the original
-            file being compressed.  The time is in Unix format, i.e.,
-            seconds since 00:00:00 GMT, Jan.  1, 1970.  (Note that this
-            may cause problems for MS-DOS and other systems that use
-            local rather than Universal time.)  If the compressed data
-            did not come from a file, MTIME is set to the time at which
-            compression started.  MTIME = 0 means no time stamp is
-            available.
-
-         XFL (eXtra FLags)
-            These flags are available for use by specific compression
-            methods.  The "deflate" method (CM = 8) sets these flags as
-            follows:
-
-               XFL = 2 - compressor used maximum compression,
-                         slowest algorithm
-               XFL = 4 - compressor used fastest algorithm
-
-         OS (Operating System)
-            This identifies the type of file system on which compression
-            took place.  This may be useful in determining end-of-line
-            convention for text files.  The currently defined values are
-            as follows:
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-                 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32)
-                 1 - Amiga
-                 2 - VMS (or OpenVMS)
-                 3 - Unix
-                 4 - VM/CMS
-                 5 - Atari TOS
-                 6 - HPFS filesystem (OS/2, NT)
-                 7 - Macintosh
-                 8 - Z-System
-                 9 - CP/M
-                10 - TOPS-20
-                11 - NTFS filesystem (NT)
-                12 - QDOS
-                13 - Acorn RISCOS
-               255 - unknown
-
-         XLEN (eXtra LENgth)
-            If FLG.FEXTRA is set, this gives the length of the optional
-            extra field.  See below for details.
-
-         CRC32 (CRC-32)
-            This contains a Cyclic Redundancy Check value of the
-            uncompressed data computed according to CRC-32 algorithm
-            used in the ISO 3309 standard and in section 8.1.1.6.2 of
-            ITU-T recommendation V.42.  (See http://www.iso.ch for
-            ordering ISO documents. See gopher://info.itu.ch for an
-            online version of ITU-T V.42.)
-
-         ISIZE (Input SIZE)
-            This contains the size of the original (uncompressed) input
-            data modulo 2^32.
-
-      2.3.1.1. Extra field
-
-         If the FLG.FEXTRA bit is set, an "extra field" is present in
-         the header, with total length XLEN bytes.  It consists of a
-         series of subfields, each of the form:
-
-            +---+---+---+---+==================================+
-            |SI1|SI2|  LEN  |... LEN bytes of subfield data ...|
-            +---+---+---+---+==================================+
-
-         SI1 and SI2 provide a subfield ID, typically two ASCII letters
-         with some mnemonic value.  Jean-Loup Gailly
-         <gzip@prep.ai.mit.edu> is maintaining a registry of subfield
-         IDs; please send him any subfield ID you wish to use.  Subfield
-         IDs with SI2 = 0 are reserved for future use.  The following
-         IDs are currently defined:
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            SI1         SI2         Data
-            ----------  ----------  ----
-            0x41 ('A')  0x70 ('P')  Apollo file type information
-
-         LEN gives the length of the subfield data, excluding the 4
-         initial bytes.
-
-      2.3.1.2. Compliance
-
-         A compliant compressor must produce files with correct ID1,
-         ID2, CM, CRC32, and ISIZE, but may set all the other fields in
-         the fixed-length part of the header to default values (255 for
-         OS, 0 for all others).  The compressor must set all reserved
-         bits to zero.
-
-         A compliant decompressor must check ID1, ID2, and CM, and
-         provide an error indication if any of these have incorrect
-         values.  It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC
-         at least so it can skip over the optional fields if they are
-         present.  It need not examine any other part of the header or
-         trailer; in particular, a decompressor may ignore FTEXT and OS
-         and always produce binary output, and still be compliant.  A
-         compliant decompressor must give an error indication if any
-         reserved bit is non-zero, since such a bit could indicate the
-         presence of a new field that would cause subsequent data to be
-         interpreted incorrectly.
-
-3. References
-
-   [1] "Information Processing - 8-bit single-byte coded graphic
-       character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987).
-       The ISO 8859-1 (Latin-1) character set is a superset of 7-bit
-       ASCII. Files defining this character set are available as
-       iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/
-
-   [2] ISO 3309
-
-   [3] ITU-T recommendation V.42
-
-   [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in
-       ftp://prep.ai.mit.edu/pub/gnu/
-
-   [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table
-       Look-Up", Communications of the ACM, 31(8), pp.1008-1013.
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal,
-       pp.118-133.
-
-   [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt,
-       describing the CRC concept.
-
-4. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data, such as by
-   setting and checking the CRC-32 check value.
-
-5. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler,
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-6. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-7. Appendix: Jean-Loup Gailly's gzip utility
-
-   The most widely used implementation of gzip compression, and the
-   original documentation on which this specification is based, were
-   created by Jean-Loup Gailly <gzip@prep.ai.mit.edu>.  Since this
-   implementation is a de facto standard, we mention some more of its
-   features here.  Again, the material in this section is not part of
-   the specification per se, and implementations need not follow it to
-   be compliant.
-
-   When compressing or decompressing a file, gzip preserves the
-   protection, ownership, and modification time attributes on the local
-   file system, since there is no provision for representing protection
-   attributes in the gzip file format itself.  Since the file format
-   includes a modification time, the gzip decompressor provides a
-   command line switch that assigns the modification time from the file,
-   rather than the local modification time of the compressed input, to
-   the decompressed output.
-
-8. Appendix: Sample CRC Code
-
-   The following sample code represents a practical implementation of
-   the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42
-   for a formal specification.)
-
-   The sample code is in the ANSI C programming language. Non C users
-   may find it easier to read with these hints:
-
-      &      Bitwise AND operator.
-      ^      Bitwise exclusive-OR operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero
-             bit(s) at the left.
-      !      Logical NOT operator.
-      ++     "n++" increments the variable n.
-      0xNNN  0x introduces a hexadecimal (base 16) constant.
-             Suffix L indicates a long value (at least 32 bits).
-
-      /* Table of CRCs of all 8-bit messages. */
-      unsigned long crc_table[256];
-
-      /* Flag: has the table been computed? Initially false. */
-      int crc_table_computed = 0;
-
-      /* Make the table for a fast CRC. */
-      void make_crc_table(void)
-      {
-        unsigned long c;
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-        int n, k;
-        for (n = 0; n < 256; n++) {
-          c = (unsigned long) n;
-          for (k = 0; k < 8; k++) {
-            if (c & 1) {
-              c = 0xedb88320L ^ (c >> 1);
-            } else {
-              c = c >> 1;
-            }
-          }
-          crc_table[n] = c;
-        }
-        crc_table_computed = 1;
-      }
-
-      /*
-         Update a running crc with the bytes buf[0..len-1] and return
-       the updated crc. The crc should be initialized to zero. Pre- and
-       post-conditioning (one's complement) is performed within this
-       function so it shouldn't be done by the caller. Usage example:
-
-         unsigned long crc = 0L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           crc = update_crc(crc, buffer, length);
-         }
-         if (crc != original_crc) error();
-      */
-      unsigned long update_crc(unsigned long crc,
-                      unsigned char *buf, int len)
-      {
-        unsigned long c = crc ^ 0xffffffffL;
-        int n;
-
-        if (!crc_table_computed)
-          make_crc_table();
-        for (n = 0; n < len; n++) {
-          c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-        }
-        return c ^ 0xffffffffL;
-      }
-
-      /* Return the CRC of the bytes buf[0..len-1]. */
-      unsigned long crc(unsigned char *buf, int len)
-      {
-        return update_crc(0L, buf, len);
-      }
-
-
-
-
-Deutsch                      Informational                     [Page 12]
-

crates/libz-sys/src/zlib/doc/txtvsbin.txt

diff --git a/crates/libz-sys/src/zlib/doc/txtvsbin.txt b/crates/libz-sys/src/zlib/doc/txtvsbin.txt
deleted file mode 100644
index 3d0f063..0000000
--- a/crates/libz-sys/src/zlib/doc/txtvsbin.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-A Fast Method for Identifying Plain Text Files
-==============================================
-
-
-Introduction
-------------
-
-Given a file coming from an unknown source, it is sometimes desirable
-to find out whether the format of that file is plain text.  Although
-this may appear like a simple task, a fully accurate detection of the
-file type requires heavy-duty semantic analysis on the file contents.
-It is, however, possible to obtain satisfactory results by employing
-various heuristics.
-
-Previous versions of PKZip and other zip-compatible compression tools
-were using a crude detection scheme: if more than 80% (4/5) of the bytes
-found in a certain buffer are within the range [7..127], the file is
-labeled as plain text, otherwise it is labeled as binary.  A prominent
-limitation of this scheme is the restriction to Latin-based alphabets.
-Other alphabets, like Greek, Cyrillic or Asian, make extensive use of
-the bytes within the range [128..255], and texts using these alphabets
-are most often misidentified by this scheme; in other words, the rate
-of false negatives is sometimes too high, which means that the recall
-is low.  Another weakness of this scheme is a reduced precision, due to
-the false positives that may occur when binary files containing large
-amounts of textual characters are misidentified as plain text.
-
-In this article we propose a new, simple detection scheme that features
-a much increased precision and a near-100% recall.  This scheme is
-designed to work on ASCII, Unicode and other ASCII-derived alphabets,
-and it handles single-byte encodings (ISO-8859, MacRoman, KOI8, etc.)
-and variable-sized encodings (ISO-2022, UTF-8, etc.).  Wider encodings
-(UCS-2/UTF-16 and UCS-4/UTF-32) are not handled, however.
-
-
-The Algorithm
--------------
-
-The algorithm works by dividing the set of bytecodes [0..255] into three
-categories:
-- The white list of textual bytecodes:
-  9 (TAB), 10 (LF), 13 (CR), 32 (SPACE) to 255.
-- The gray list of tolerated bytecodes:
-  7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB), 27 (ESC).
-- The black list of undesired, non-textual bytecodes:
-  0 (NUL) to 6, 14 to 31.
-
-If a file contains at least one byte that belongs to the white list and
-no byte that belongs to the black list, then the file is categorized as
-plain text; otherwise, it is categorized as binary.  (The boundary case,
-when the file is empty, automatically falls into the latter category.)
-
-
-Rationale
----------
-
-The idea behind this algorithm relies on two observations.
-
-The first observation is that, although the full range of 7-bit codes
-[0..127] is properly specified by the ASCII standard, most control
-characters in the range [0..31] are not used in practice.  The only
-widely-used, almost universally-portable control codes are 9 (TAB),
-10 (LF) and 13 (CR).  There are a few more control codes that are
-recognized on a reduced range of platforms and text viewers/editors:
-7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB) and 27 (ESC); but these
-codes are rarely (if ever) used alone, without being accompanied by
-some printable text.  Even the newer, portable text formats such as
-XML avoid using control characters outside the list mentioned here.
-
-The second observation is that most of the binary files tend to contain
-control characters, especially 0 (NUL).  Even though the older text
-detection schemes observe the presence of non-ASCII codes from the range
-[128..255], the precision rarely has to suffer if this upper range is
-labeled as textual, because the files that are genuinely binary tend to
-contain both control characters and codes from the upper range.  On the
-other hand, the upper range needs to be labeled as textual, because it
-is used by virtually all ASCII extensions.  In particular, this range is
-used for encoding non-Latin scripts.
-
-Since there is no counting involved, other than simply observing the
-presence or the absence of some byte values, the algorithm produces
-consistent results, regardless what alphabet encoding is being used.
-(If counting were involved, it could be possible to obtain different
-results on a text encoded, say, using ISO-8859-16 versus UTF-8.)
-
-There is an extra category of plain text files that are "polluted" with
-one or more black-listed codes, either by mistake or by peculiar design
-considerations.  In such cases, a scheme that tolerates a small fraction
-of black-listed codes would provide an increased recall (i.e. more true
-positives).  This, however, incurs a reduced precision overall, since
-false positives are more likely to appear in binary files that contain
-large chunks of textual data.  Furthermore, "polluted" plain text should
-be regarded as binary by general-purpose text detection schemes, because
-general-purpose text processing algorithms might not be applicable.
-Under this premise, it is safe to say that our detection method provides
-a near-100% recall.
-
-Experiments have been run on many files coming from various platforms
-and applications.  We tried plain text files, system logs, source code,
-formatted office documents, compiled object code, etc.  The results
-confirm the optimistic assumptions about the capabilities of this
-algorithm.
-
-
---
-Cosmin Truta
-Last updated: 2006-May-28

crates/libz-sys/src/zlib/examples/README.examples

diff --git a/crates/libz-sys/src/zlib/examples/README.examples b/crates/libz-sys/src/zlib/examples/README.examples
deleted file mode 100644
index 56a3171..0000000
--- a/crates/libz-sys/src/zlib/examples/README.examples
+++ /dev/null
@@ -1,49 +0,0 @@
-This directory contains examples of the use of zlib and other relevant
-programs and documentation.
-
-enough.c
-    calculation and justification of ENOUGH parameter in inftrees.h
-    - calculates the maximum table space used in inflate tree
-      construction over all possible Huffman codes
-
-fitblk.c
-    compress just enough input to nearly fill a requested output size
-    - zlib isn't designed to do this, but fitblk does it anyway
-
-gun.c
-    uncompress a gzip file
-    - illustrates the use of inflateBack() for high speed file-to-file
-      decompression using call-back functions
-    - is approximately twice as fast as gzip -d
-    - also provides Unix uncompress functionality, again twice as fast
-
-gzappend.c
-    append to a gzip file
-    - illustrates the use of the Z_BLOCK flush parameter for inflate()
-    - illustrates the use of deflatePrime() to start at any bit
-
-gzjoin.c
-    join gzip files without recalculating the crc or recompressing
-    - illustrates the use of the Z_BLOCK flush parameter for inflate()
-    - illustrates the use of crc32_combine()
-
-gzlog.c
-gzlog.h
-    efficiently and robustly maintain a message log file in gzip format
-    - illustrates use of raw deflate, Z_PARTIAL_FLUSH, deflatePrime(),
-      and deflateSetDictionary()
-    - illustrates use of a gzip header extra field
-
-zlib_how.html
-    painfully comprehensive description of zpipe.c (see below)
-    - describes in excruciating detail the use of deflate() and inflate()
-
-zpipe.c
-    reads and writes zlib streams from stdin to stdout
-    - illustrates the proper use of deflate() and inflate()
-    - deeply commented in zlib_how.html (see above)
-
-zran.c
-    index a zlib or gzip stream and randomly access it
-    - illustrates the use of Z_BLOCK, inflatePrime(), and
-      inflateSetDictionary() to provide random access

crates/libz-sys/src/zlib/examples/enough.c

diff --git a/crates/libz-sys/src/zlib/examples/enough.c b/crates/libz-sys/src/zlib/examples/enough.c
deleted file mode 100644
index b991144..0000000
--- a/crates/libz-sys/src/zlib/examples/enough.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/* enough.c -- determine the maximum size of inflate's Huffman code tables over
- * all possible valid and complete Huffman codes, subject to a length limit.
- * Copyright (C) 2007, 2008, 2012 Mark Adler
- * Version 1.4  18 August 2012  Mark Adler
- */
-
-/* Version history:
-   1.0   3 Jan 2007  First version (derived from codecount.c version 1.4)
-   1.1   4 Jan 2007  Use faster incremental table usage computation
-                     Prune examine() search on previously visited states
-   1.2   5 Jan 2007  Comments clean up
-                     As inflate does, decrease root for short codes
-                     Refuse cases where inflate would increase root
-   1.3  17 Feb 2008  Add argument for initial root table size
-                     Fix bug for initial root table size == max - 1
-                     Use a macro to compute the history index
-   1.4  18 Aug 2012  Avoid shifts more than bits in type (caused endless loop!)
-                     Clean up comparisons of different types
-                     Clean up code indentation
- */
-
-/*
-   Examine all possible Huffman codes for a given number of symbols and a
-   maximum code length in bits to determine the maximum table size for zilb's
-   inflate.  Only complete Huffman codes are counted.
-
-   Two codes are considered distinct if the vectors of the number of codes per
-   length are not identical.  So permutations of the symbol assignments result
-   in the same code for the counting, as do permutations of the assignments of
-   the bit values to the codes (i.e. only canonical codes are counted).
-
-   We build a code from shorter to longer lengths, determining how many symbols
-   are coded at each length.  At each step, we have how many symbols remain to
-   be coded, what the last code length used was, and how many bit patterns of
-   that length remain unused. Then we add one to the code length and double the
-   number of unused patterns to graduate to the next code length.  We then
-   assign all portions of the remaining symbols to that code length that
-   preserve the properties of a correct and eventually complete code.  Those
-   properties are: we cannot use more bit patterns than are available; and when
-   all the symbols are used, there are exactly zero possible bit patterns
-   remaining.
-
-   The inflate Huffman decoding algorithm uses two-level lookup tables for
-   speed.  There is a single first-level table to decode codes up to root bits
-   in length (root == 9 in the current inflate implementation).  The table
-   has 1 << root entries and is indexed by the next root bits of input.  Codes
-   shorter than root bits have replicated table entries, so that the correct
-   entry is pointed to regardless of the bits that follow the short code.  If
-   the code is longer than root bits, then the table entry points to a second-
-   level table.  The size of that table is determined by the longest code with
-   that root-bit prefix.  If that longest code has length len, then the table
-   has size 1 << (len - root), to index the remaining bits in that set of
-   codes.  Each subsequent root-bit prefix then has its own sub-table.  The
-   total number of table entries required by the code is calculated
-   incrementally as the number of codes at each bit length is populated.  When
-   all of the codes are shorter than root bits, then root is reduced to the
-   longest code length, resulting in a single, smaller, one-level table.
-
-   The inflate algorithm also provides for small values of root (relative to
-   the log2 of the number of symbols), where the shortest code has more bits
-   than root.  In that case, root is increased to the length of the shortest
-   code.  This program, by design, does not handle that case, so it is verified
-   that the number of symbols is less than 2^(root + 1).
-
-   In order to speed up the examination (by about ten orders of magnitude for
-   the default arguments), the intermediate states in the build-up of a code
-   are remembered and previously visited branches are pruned.  The memory
-   required for this will increase rapidly with the total number of symbols and
-   the maximum code length in bits.  However this is a very small price to pay
-   for the vast speedup.
-
-   First, all of the possible Huffman codes are counted, and reachable
-   intermediate states are noted by a non-zero count in a saved-results array.
-   Second, the intermediate states that lead to (root + 1) bit or longer codes
-   are used to look at all sub-codes from those junctures for their inflate
-   memory usage.  (The amount of memory used is not affected by the number of
-   codes of root bits or less in length.)  Third, the visited states in the
-   construction of those sub-codes and the associated calculation of the table
-   size is recalled in order to avoid recalculating from the same juncture.
-   Beginning the code examination at (root + 1) bit codes, which is enabled by
-   identifying the reachable nodes, accounts for about six of the orders of
-   magnitude of improvement for the default arguments.  About another four
-   orders of magnitude come from not revisiting previous states.  Out of
-   approximately 2x10^16 possible Huffman codes, only about 2x10^6 sub-codes
-   need to be examined to cover all of the possible table memory usage cases
-   for the default arguments of 286 symbols limited to 15-bit codes.
-
-   Note that an unsigned long long type is used for counting.  It is quite easy
-   to exceed the capacity of an eight-byte integer with a large number of
-   symbols and a large maximum code length, so multiple-precision arithmetic
-   would need to replace the unsigned long long arithmetic in that case.  This
-   program will abort if an overflow occurs.  The big_t type identifies where
-   the counting takes place.
-
-   An unsigned long long type is also used for calculating the number of
-   possible codes remaining at the maximum length.  This limits the maximum
-   code length to the number of bits in a long long minus the number of bits
-   needed to represent the symbols in a flat code.  The code_t type identifies
-   where the bit pattern counting takes place.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#define local static
-
-/* special data types */
-typedef unsigned long long big_t;   /* type for code counting */
-typedef unsigned long long code_t;  /* type for bit pattern counting */
-struct tab {                        /* type for been here check */
-    size_t len;         /* length of bit vector in char's */
-    char *vec;          /* allocated bit vector */
-};
-
-/* The array for saving results, num[], is indexed with this triplet:
-
-      syms: number of symbols remaining to code
-      left: number of available bit patterns at length len
-      len: number of bits in the codes currently being assigned
-
-   Those indices are constrained thusly when saving results:
-
-      syms: 3..totsym (totsym == total symbols to code)
-      left: 2..syms - 1, but only the evens (so syms == 8 -> 2, 4, 6)
-      len: 1..max - 1 (max == maximum code length in bits)
-
-   syms == 2 is not saved since that immediately leads to a single code.  left
-   must be even, since it represents the number of available bit patterns at
-   the current length, which is double the number at the previous length.
-   left ends at syms-1 since left == syms immediately results in a single code.
-   (left > sym is not allowed since that would result in an incomplete code.)
-   len is less than max, since the code completes immediately when len == max.
-
-   The offset into the array is calculated for the three indices with the
-   first one (syms) being outermost, and the last one (len) being innermost.
-   We build the array with length max-1 lists for the len index, with syms-3
-   of those for each symbol.  There are totsym-2 of those, with each one
-   varying in length as a function of sym.  See the calculation of index in
-   count() for the index, and the calculation of size in main() for the size
-   of the array.
-
-   For the deflate example of 286 symbols limited to 15-bit codes, the array
-   has 284,284 entries, taking up 2.17 MB for an 8-byte big_t.  More than
-   half of the space allocated for saved results is actually used -- not all
-   possible triplets are reached in the generation of valid Huffman codes.
- */
-
-/* The array for tracking visited states, done[], is itself indexed identically
-   to the num[] array as described above for the (syms, left, len) triplet.
-   Each element in the array is further indexed by the (mem, rem) doublet,
-   where mem is the amount of inflate table space used so far, and rem is the
-   remaining unused entries in the current inflate sub-table.  Each indexed
-   element is simply one bit indicating whether the state has been visited or
-   not.  Since the ranges for mem and rem are not known a priori, each bit
-   vector is of a variable size, and grows as needed to accommodate the visited
-   states.  mem and rem are used to calculate a single index in a triangular
-   array.  Since the range of mem is expected in the default case to be about
-   ten times larger than the range of rem, the array is skewed to reduce the
-   memory usage, with eight times the range for mem than for rem.  See the
-   calculations for offset and bit in beenhere() for the details.
-
-   For the deflate example of 286 symbols limited to 15-bit codes, the bit
-   vectors grow to total approximately 21 MB, in addition to the 4.3 MB done[]
-   array itself.
- */
-
-/* Globals to avoid propagating constants or constant pointers recursively */
-local int max;          /* maximum allowed bit length for the codes */
-local int root;         /* size of base code table in bits */
-local int large;        /* largest code table so far */
-local size_t size;      /* number of elements in num and done */
-local int *code;        /* number of symbols assigned to each bit length */
-local big_t *num;       /* saved results array for code counting */
-local struct tab *done; /* states already evaluated array */
-
-/* Index function for num[] and done[] */
-#define INDEX(i,j,k) (((size_t)((i-1)>>1)*((i-2)>>1)+(j>>1)-1)*(max-1)+k-1)
-
-/* Free allocated space.  Uses globals code, num, and done. */
-local void cleanup(void)
-{
-    size_t n;
-
-    if (done != NULL) {
-        for (n = 0; n < size; n++)
-            if (done[n].len)
-                free(done[n].vec);
-        free(done);
-    }
-    if (num != NULL)
-        free(num);
-    if (code != NULL)
-        free(code);
-}
-
-/* Return the number of possible Huffman codes using bit patterns of lengths
-   len through max inclusive, coding syms symbols, with left bit patterns of
-   length len unused -- return -1 if there is an overflow in the counting.
-   Keep a record of previous results in num to prevent repeating the same
-   calculation.  Uses the globals max and num. */
-local big_t count(int syms, int len, int left)
-{
-    big_t sum;          /* number of possible codes from this juncture */
-    big_t got;          /* value returned from count() */
-    int least;          /* least number of syms to use at this juncture */
-    int most;           /* most number of syms to use at this juncture */
-    int use;            /* number of bit patterns to use in next call */
-    size_t index;       /* index of this case in *num */
-
-    /* see if only one possible code */
-    if (syms == left)
-        return 1;
-
-    /* note and verify the expected state */
-    assert(syms > left && left > 0 && len < max);
-
-    /* see if we've done this one already */
-    index = INDEX(syms, left, len);
-    got = num[index];
-    if (got)
-        return got;         /* we have -- return the saved result */
-
-    /* we need to use at least this many bit patterns so that the code won't be
-       incomplete at the next length (more bit patterns than symbols) */
-    least = (left << 1) - syms;
-    if (least < 0)
-        least = 0;
-
-    /* we can use at most this many bit patterns, lest there not be enough
-       available for the remaining symbols at the maximum length (if there were
-       no limit to the code length, this would become: most = left - 1) */
-    most = (((code_t)left << (max - len)) - syms) /
-            (((code_t)1 << (max - len)) - 1);
-
-    /* count all possible codes from this juncture and add them up */
-    sum = 0;
-    for (use = least; use <= most; use++) {
-        got = count(syms - use, len + 1, (left - use) << 1);
-        sum += got;
-        if (got == (big_t)0 - 1 || sum < got)   /* overflow */
-            return (big_t)0 - 1;
-    }
-
-    /* verify that all recursive calls are productive */
-    assert(sum != 0);
-
-    /* save the result and return it */
-    num[index] = sum;
-    return sum;
-}
-
-/* Return true if we've been here before, set to true if not.  Set a bit in a
-   bit vector to indicate visiting this state.  Each (syms,len,left) state
-   has a variable size bit vector indexed by (mem,rem).  The bit vector is
-   lengthened if needed to allow setting the (mem,rem) bit. */
-local int beenhere(int syms, int len, int left, int mem, int rem)
-{
-    size_t index;       /* index for this state's bit vector */
-    size_t offset;      /* offset in this state's bit vector */
-    int bit;            /* mask for this state's bit */
-    size_t length;      /* length of the bit vector in bytes */
-    char *vector;       /* new or enlarged bit vector */
-
-    /* point to vector for (syms,left,len), bit in vector for (mem,rem) */
-    index = INDEX(syms, left, len);
-    mem -= 1 << root;
-    offset = (mem >> 3) + rem;
-    offset = ((offset * (offset + 1)) >> 1) + rem;
-    bit = 1 << (mem & 7);
-
-    /* see if we've been here */
-    length = done[index].len;
-    if (offset < length && (done[index].vec[offset] & bit) != 0)
-        return 1;       /* done this! */
-
-    /* we haven't been here before -- set the bit to show we have now */
-
-    /* see if we need to lengthen the vector in order to set the bit */
-    if (length <= offset) {
-        /* if we have one already, enlarge it, zero out the appended space */
-        if (length) {
-            do {
-                length <<= 1;
-            } while (length <= offset);
-            vector = realloc(done[index].vec, length);
-            if (vector != NULL)
-                memset(vector + done[index].len, 0, length - done[index].len);
-        }
-
-        /* otherwise we need to make a new vector and zero it out */
-        else {
-            length = 1 << (len - root);
-            while (length <= offset)
-                length <<= 1;
-            vector = calloc(length, sizeof(char));
-        }
-
-        /* in either case, bail if we can't get the memory */
-        if (vector == NULL) {
-            fputs("abort: unable to allocate enough memory\n", stderr);
-            cleanup();
-            exit(1);
-        }
-
-        /* install the new vector */
-        done[index].len = length;
-        done[index].vec = vector;
-    }
-
-    /* set the bit */
-    done[index].vec[offset] |= bit;
-    return 0;
-}
-
-/* Examine all possible codes from the given node (syms, len, left).  Compute
-   the amount of memory required to build inflate's decoding tables, where the
-   number of code structures used so far is mem, and the number remaining in
-   the current sub-table is rem.  Uses the globals max, code, root, large, and
-   done. */
-local void examine(int syms, int len, int left, int mem, int rem)
-{
-    int least;          /* least number of syms to use at this juncture */
-    int most;           /* most number of syms to use at this juncture */
-    int use;            /* number of bit patterns to use in next call */
-
-    /* see if we have a complete code */
-    if (syms == left) {
-        /* set the last code entry */
-        code[len] = left;
-
-        /* complete computation of memory used by this code */
-        while (rem < left) {
-            left -= rem;
-            rem = 1 << (len - root);
-            mem += rem;
-        }
-        assert(rem == left);
-
-        /* if this is a new maximum, show the entries used and the sub-code */
-        if (mem > large) {
-            large = mem;
-            printf("max %d: ", mem);
-            for (use = root + 1; use <= max; use++)
-                if (code[use])
-                    printf("%d[%d] ", code[use], use);
-            putchar('\n');
-            fflush(stdout);
-        }
-
-        /* remove entries as we drop back down in the recursion */
-        code[len] = 0;
-        return;
-    }
-
-    /* prune the tree if we can */
-    if (beenhere(syms, len, left, mem, rem))
-        return;
-
-    /* we need to use at least this many bit patterns so that the code won't be
-       incomplete at the next length (more bit patterns than symbols) */
-    least = (left << 1) - syms;
-    if (least < 0)
-        least = 0;
-
-    /* we can use at most this many bit patterns, lest there not be enough
-       available for the remaining symbols at the maximum length (if there were
-       no limit to the code length, this would become: most = left - 1) */
-    most = (((code_t)left << (max - len)) - syms) /
-            (((code_t)1 << (max - len)) - 1);
-
-    /* occupy least table spaces, creating new sub-tables as needed */
-    use = least;
-    while (rem < use) {
-        use -= rem;
-        rem = 1 << (len - root);
-        mem += rem;
-    }
-    rem -= use;
-
-    /* examine codes from here, updating table space as we go */
-    for (use = least; use <= most; use++) {
-        code[len] = use;
-        examine(syms - use, len + 1, (left - use) << 1,
-                mem + (rem ? 1 << (len - root) : 0), rem << 1);
-        if (rem == 0) {
-            rem = 1 << (len - root);
-            mem += rem;
-        }
-        rem--;
-    }
-
-    /* remove entries as we drop back down in the recursion */
-    code[len] = 0;
-}
-
-/* Look at all sub-codes starting with root + 1 bits.  Look at only the valid
-   intermediate code states (syms, left, len).  For each completed code,
-   calculate the amount of memory required by inflate to build the decoding
-   tables. Find the maximum amount of memory required and show the code that
-   requires that maximum.  Uses the globals max, root, and num. */
-local void enough(int syms)
-{
-    int n;              /* number of remaing symbols for this node */
-    int left;           /* number of unused bit patterns at this length */
-    size_t index;       /* index of this case in *num */
-
-    /* clear code */
-    for (n = 0; n <= max; n++)
-        code[n] = 0;
-
-    /* look at all (root + 1) bit and longer codes */
-    large = 1 << root;              /* base table */
-    if (root < max)                 /* otherwise, there's only a base table */
-        for (n = 3; n <= syms; n++)
-            for (left = 2; left < n; left += 2)
-            {
-                /* look at all reachable (root + 1) bit nodes, and the
-                   resulting codes (complete at root + 2 or more) */
-                index = INDEX(n, left, root + 1);
-                if (root + 1 < max && num[index])       /* reachable node */
-                    examine(n, root + 1, left, 1 << root, 0);
-
-                /* also look at root bit codes with completions at root + 1
-                   bits (not saved in num, since complete), just in case */
-                if (num[index - 1] && n <= left << 1)
-                    examine((n - left) << 1, root + 1, (n - left) << 1,
-                            1 << root, 0);
-            }
-
-    /* done */
-    printf("done: maximum of %d table entries\n", large);
-}
-
-/*
-   Examine and show the total number of possible Huffman codes for a given
-   maximum number of symbols, initial root table size, and maximum code length
-   in bits -- those are the command arguments in that order.  The default
-   values are 286, 9, and 15 respectively, for the deflate literal/length code.
-   The possible codes are counted for each number of coded symbols from two to
-   the maximum.  The counts for each of those and the total number of codes are
-   shown.  The maximum number of inflate table entires is then calculated
-   across all possible codes.  Each new maximum number of table entries and the
-   associated sub-code (starting at root + 1 == 10 bits) is shown.
-
-   To count and examine Huffman codes that are not length-limited, provide a
-   maximum length equal to the number of symbols minus one.
-
-   For the deflate literal/length code, use "enough".  For the deflate distance
-   code, use "enough 30 6".
-
-   This uses the %llu printf format to print big_t numbers, which assumes that
-   big_t is an unsigned long long.  If the big_t type is changed (for example
-   to a multiple precision type), the method of printing will also need to be
-   updated.
- */
-int main(int argc, char **argv)
-{
-    int syms;           /* total number of symbols to code */
-    int n;              /* number of symbols to code for this run */
-    big_t got;          /* return value of count() */
-    big_t sum;          /* accumulated number of codes over n */
-    code_t word;        /* for counting bits in code_t */
-
-    /* set up globals for cleanup() */
-    code = NULL;
-    num = NULL;
-    done = NULL;
-
-    /* get arguments -- default to the deflate literal/length code */
-    syms = 286;
-    root = 9;
-    max = 15;
-    if (argc > 1) {
-        syms = atoi(argv[1]);
-        if (argc > 2) {
-            root = atoi(argv[2]);
-            if (argc > 3)
-                max = atoi(argv[3]);
-        }
-    }
-    if (argc > 4 || syms < 2 || root < 1 || max < 1) {
-        fputs("invalid arguments, need: [sym >= 2 [root >= 1 [max >= 1]]]\n",
-              stderr);
-        return 1;
-    }
-
-    /* if not restricting the code length, the longest is syms - 1 */
-    if (max > syms - 1)
-        max = syms - 1;
-
-    /* determine the number of bits in a code_t */
-    for (n = 0, word = 1; word; n++, word <<= 1)
-        ;
-
-    /* make sure that the calculation of most will not overflow */
-    if (max > n || (code_t)(syms - 2) >= (((code_t)0 - 1) >> (max - 1))) {
-        fputs("abort: code length too long for internal types\n", stderr);
-        return 1;
-    }
-
-    /* reject impossible code requests */
-    if ((code_t)(syms - 1) > ((code_t)1 << max) - 1) {
-        fprintf(stderr, "%d symbols cannot be coded in %d bits\n",
-                syms, max);
-        return 1;
-    }
-
-    /* allocate code vector */
-    code = calloc(max + 1, sizeof(int));
-    if (code == NULL) {
-        fputs("abort: unable to allocate enough memory\n", stderr);
-        return 1;
-    }
-
-    /* determine size of saved results array, checking for overflows,
-       allocate and clear the array (set all to zero with calloc()) */
-    if (syms == 2)              /* iff max == 1 */
-        num = NULL;             /* won't be saving any results */
-    else {
-        size = syms >> 1;
-        if (size > ((size_t)0 - 1) / (n = (syms - 1) >> 1) ||
-                (size *= n, size > ((size_t)0 - 1) / (n = max - 1)) ||
-                (size *= n, size > ((size_t)0 - 1) / sizeof(big_t)) ||
-                (num = calloc(size, sizeof(big_t))) == NULL) {
-            fputs("abort: unable to allocate enough memory\n", stderr);
-            cleanup();
-            return 1;
-        }
-    }
-
-    /* count possible codes for all numbers of symbols, add up counts */
-    sum = 0;
-    for (n = 2; n <= syms; n++) {
-        got = count(n, 1, 2);
-        sum += got;
-        if (got == (big_t)0 - 1 || sum < got) {     /* overflow */
-            fputs("abort: can't count that high!\n", stderr);
-            cleanup();
-            return 1;
-        }
-        printf("%llu %d-codes\n", got, n);
-    }
-    printf("%llu total codes for 2 to %d symbols", sum, syms);
-    if (max < syms - 1)
-        printf(" (%d-bit length limit)\n", max);
-    else
-        puts(" (no length limit)");
-
-    /* allocate and clear done array for beenhere() */
-    if (syms == 2)
-        done = NULL;
-    else if (size > ((size_t)0 - 1) / sizeof(struct tab) ||
-             (done = calloc(size, sizeof(struct tab))) == NULL) {
-        fputs("abort: unable to allocate enough memory\n", stderr);
-        cleanup();
-        return 1;
-    }
-
-    /* find and show maximum inflate table usage */
-    if (root > max)                 /* reduce root to max length */
-        root = max;
-    if ((code_t)syms < ((code_t)1 << (root + 1)))
-        enough(syms);
-    else
-        puts("cannot handle minimum code lengths > root");
-
-    /* done */
-    cleanup();
-    return 0;
-}

crates/libz-sys/src/zlib/examples/fitblk.c

diff --git a/crates/libz-sys/src/zlib/examples/fitblk.c b/crates/libz-sys/src/zlib/examples/fitblk.c
deleted file mode 100644
index c61de5c..0000000
--- a/crates/libz-sys/src/zlib/examples/fitblk.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* fitblk.c: example of fitting compressed output to a specified size
-   Not copyrighted -- provided to the public domain
-   Version 1.1  25 November 2004  Mark Adler */
-
-/* Version history:
-   1.0  24 Nov 2004  First version
-   1.1  25 Nov 2004  Change deflateInit2() to deflateInit()
-                     Use fixed-size, stack-allocated raw buffers
-                     Simplify code moving compression to subroutines
-                     Use assert() for internal errors
-                     Add detailed description of approach
- */
-
-/* Approach to just fitting a requested compressed size:
-
-   fitblk performs three compression passes on a portion of the input
-   data in order to determine how much of that input will compress to
-   nearly the requested output block size.  The first pass generates
-   enough deflate blocks to produce output to fill the requested
-   output size plus a specfied excess amount (see the EXCESS define
-   below).  The last deflate block may go quite a bit past that, but
-   is discarded.  The second pass decompresses and recompresses just
-   the compressed data that fit in the requested plus excess sized
-   buffer.  The deflate process is terminated after that amount of
-   input, which is less than the amount consumed on the first pass.
-   The last deflate block of the result will be of a comparable size
-   to the final product, so that the header for that deflate block and
-   the compression ratio for that block will be about the same as in
-   the final product.  The third compression pass decompresses the
-   result of the second step, but only the compressed data up to the
-   requested size minus an amount to allow the compressed stream to
-   complete (see the MARGIN define below).  That will result in a
-   final compressed stream whose length is less than or equal to the
-   requested size.  Assuming sufficient input and a requested size
-   greater than a few hundred bytes, the shortfall will typically be
-   less than ten bytes.
-
-   If the input is short enough that the first compression completes
-   before filling the requested output size, then that compressed
-   stream is return with no recompression.
-
-   EXCESS is chosen to be just greater than the shortfall seen in a
-   two pass approach similar to the above.  That shortfall is due to
-   the last deflate block compressing more efficiently with a smaller
-   header on the second pass.  EXCESS is set to be large enough so
-   that there is enough uncompressed data for the second pass to fill
-   out the requested size, and small enough so that the final deflate
-   block of the second pass will be close in size to the final deflate
-   block of the third and final pass.  MARGIN is chosen to be just
-   large enough to assure that the final compression has enough room
-   to complete in all cases.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include "zlib.h"
-
-#define local static
-
-/* print nastygram and leave */
-local void quit(char *why)
-{
-    fprintf(stderr, "fitblk abort: %s\n", why);
-    exit(1);
-}
-
-#define RAWLEN 4096    /* intermediate uncompressed buffer size */
-
-/* compress from file to def until provided buffer is full or end of
-   input reached; return last deflate() return value, or Z_ERRNO if
-   there was read error on the file */
-local int partcompress(FILE *in, z_streamp def)
-{
-    int ret, flush;
-    unsigned char raw[RAWLEN];
-
-    flush = Z_NO_FLUSH;
-    do {
-        def->avail_in = fread(raw, 1, RAWLEN, in);
-        if (ferror(in))
-            return Z_ERRNO;
-        def->next_in = raw;
-        if (feof(in))
-            flush = Z_FINISH;
-        ret = deflate(def, flush);
-        assert(ret != Z_STREAM_ERROR);
-    } while (def->avail_out != 0 && flush == Z_NO_FLUSH);
-    return ret;
-}
-
-/* recompress from inf's input to def's output; the input for inf and
-   the output for def are set in those structures before calling;
-   return last deflate() return value, or Z_MEM_ERROR if inflate()
-   was not able to allocate enough memory when it needed to */
-local int recompress(z_streamp inf, z_streamp def)
-{
-    int ret, flush;
-    unsigned char raw[RAWLEN];
-
-    flush = Z_NO_FLUSH;
-    do {
-        /* decompress */
-        inf->avail_out = RAWLEN;
-        inf->next_out = raw;
-        ret = inflate(inf, Z_NO_FLUSH);
-        assert(ret != Z_STREAM_ERROR && ret != Z_DATA_ERROR &&
-               ret != Z_NEED_DICT);
-        if (ret == Z_MEM_ERROR)
-            return ret;
-
-        /* compress what was decompresed until done or no room */
-        def->avail_in = RAWLEN - inf->avail_out;
-        def->next_in = raw;
-        if (inf->avail_out != 0)
-            flush = Z_FINISH;
-        ret = deflate(def, flush);
-        assert(ret != Z_STREAM_ERROR);
-    } while (ret != Z_STREAM_END && def->avail_out != 0);
-    return ret;
-}
-
-#define EXCESS 256      /* empirically determined stream overage */
-#define MARGIN 8        /* amount to back off for completion */
-
-/* compress from stdin to fixed-size block on stdout */
-int main(int argc, char **argv)
-{
-    int ret;                /* return code */
-    unsigned size;          /* requested fixed output block size */
-    unsigned have;          /* bytes written by deflate() call */
-    unsigned char *blk;     /* intermediate and final stream */
-    unsigned char *tmp;     /* close to desired size stream */
-    z_stream def, inf;      /* zlib deflate and inflate states */
-
-    /* get requested output size */
-    if (argc != 2)
-        quit("need one argument: size of output block");
-    ret = strtol(argv[1], argv + 1, 10);
-    if (argv[1][0] != 0)
-        quit("argument must be a number");
-    if (ret < 8)            /* 8 is minimum zlib stream size */
-        quit("need positive size of 8 or greater");
-    size = (unsigned)ret;
-
-    /* allocate memory for buffers and compression engine */
-    blk = malloc(size + EXCESS);
-    def.zalloc = Z_NULL;
-    def.zfree = Z_NULL;
-    def.opaque = Z_NULL;
-    ret = deflateInit(&def, Z_DEFAULT_COMPRESSION);
-    if (ret != Z_OK || blk == NULL)
-        quit("out of memory");
-
-    /* compress from stdin until output full, or no more input */
-    def.avail_out = size + EXCESS;
-    def.next_out = blk;
-    ret = partcompress(stdin, &def);
-    if (ret == Z_ERRNO)
-        quit("error reading input");
-
-    /* if it all fit, then size was undersubscribed -- done! */
-    if (ret == Z_STREAM_END && def.avail_out >= EXCESS) {
-        /* write block to stdout */
-        have = size + EXCESS - def.avail_out;
-        if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))
-            quit("error writing output");
-
-        /* clean up and print results to stderr */
-        ret = deflateEnd(&def);
-        assert(ret != Z_STREAM_ERROR);
-        free(blk);
-        fprintf(stderr,
-                "%u bytes unused out of %u requested (all input)\n",
-                size - have, size);
-        return 0;
-    }
-
-    /* it didn't all fit -- set up for recompression */
-    inf.zalloc = Z_NULL;
-    inf.zfree = Z_NULL;
-    inf.opaque = Z_NULL;
-    inf.avail_in = 0;
-    inf.next_in = Z_NULL;
-    ret = inflateInit(&inf);
-    tmp = malloc(size + EXCESS);
-    if (ret != Z_OK || tmp == NULL)
-        quit("out of memory");
-    ret = deflateReset(&def);
-    assert(ret != Z_STREAM_ERROR);
-
-    /* do first recompression close to the right amount */
-    inf.avail_in = size + EXCESS;
-    inf.next_in = blk;
-    def.avail_out = size + EXCESS;
-    def.next_out = tmp;
-    ret = recompress(&inf, &def);
-    if (ret == Z_MEM_ERROR)
-        quit("out of memory");
-
-    /* set up for next reocmpression */
-    ret = inflateReset(&inf);
-    assert(ret != Z_STREAM_ERROR);
-    ret = deflateReset(&def);
-    assert(ret != Z_STREAM_ERROR);
-
-    /* do second and final recompression (third compression) */
-    inf.avail_in = size - MARGIN;   /* assure stream will complete */
-    inf.next_in = tmp;
-    def.avail_out = size;
-    def.next_out = blk;
-    ret = recompress(&inf, &def);
-    if (ret == Z_MEM_ERROR)
-        quit("out of memory");
-    assert(ret == Z_STREAM_END);    /* otherwise MARGIN too small */
-
-    /* done -- write block to stdout */
-    have = size - def.avail_out;
-    if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))
-        quit("error writing output");
-
-    /* clean up and print results to stderr */
-    free(tmp);
-    ret = inflateEnd(&inf);
-    assert(ret != Z_STREAM_ERROR);
-    ret = deflateEnd(&def);
-    assert(ret != Z_STREAM_ERROR);
-    free(blk);
-    fprintf(stderr,
-            "%u bytes unused out of %u requested (%lu input)\n",
-            size - have, size, def.total_in);
-    return 0;
-}

crates/libz-sys/src/zlib/examples/gun.c

diff --git a/crates/libz-sys/src/zlib/examples/gun.c b/crates/libz-sys/src/zlib/examples/gun.c
deleted file mode 100644
index be44fa5..0000000
--- a/crates/libz-sys/src/zlib/examples/gun.c
+++ /dev/null
@@ -1,702 +0,0 @@
-/* gun.c -- simple gunzip to give an example of the use of inflateBack()
- * Copyright (C) 2003, 2005, 2008, 2010, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
-   Version 1.7  12 August 2012  Mark Adler */
-
-/* Version history:
-   1.0  16 Feb 2003  First version for testing of inflateBack()
-   1.1  21 Feb 2005  Decompress concatenated gzip streams
-                     Remove use of "this" variable (C++ keyword)
-                     Fix return value for in()
-                     Improve allocation failure checking
-                     Add typecasting for void * structures
-                     Add -h option for command version and usage
-                     Add a bunch of comments
-   1.2  20 Mar 2005  Add Unix compress (LZW) decompression
-                     Copy file attributes from input file to output file
-   1.3  12 Jun 2005  Add casts for error messages [Oberhumer]
-   1.4   8 Dec 2006  LZW decompression speed improvements
-   1.5   9 Feb 2008  Avoid warning in latest version of gcc
-   1.6  17 Jan 2010  Avoid signed/unsigned comparison warnings
-   1.7  12 Aug 2012  Update for z_const usage in zlib 1.2.8
- */
-
-/*
-   gun [ -t ] [ name ... ]
-
-   decompresses the data in the named gzip files.  If no arguments are given,
-   gun will decompress from stdin to stdout.  The names must end in .gz, -gz,
-   .z, -z, _z, or .Z.  The uncompressed data will be written to a file name
-   with the suffix stripped.  On success, the original file is deleted.  On
-   failure, the output file is deleted.  For most failures, the command will
-   continue to process the remaining names on the command line.  A memory
-   allocation failure will abort the command.  If -t is specified, then the
-   listed files or stdin will be tested as gzip files for integrity (without
-   checking for a proper suffix), no output will be written, and no files
-   will be deleted.
-
-   Like gzip, gun allows concatenated gzip streams and will decompress them,
-   writing all of the uncompressed data to the output.  Unlike gzip, gun allows
-   an empty file on input, and will produce no error writing an empty output
-   file.
-
-   gun will also decompress files made by Unix compress, which uses LZW
-   compression.  These files are automatically detected by virtue of their
-   magic header bytes.  Since the end of Unix compress stream is marked by the
-   end-of-file, they cannot be concantenated.  If a Unix compress stream is
-   encountered in an input file, it is the last stream in that file.
-
-   Like gunzip and uncompress, the file attributes of the original compressed
-   file are maintained in the final uncompressed file, to the extent that the
-   user permissions allow it.
-
-   On my Mac OS X PowerPC G4, gun is almost twice as fast as gunzip (version
-   1.2.4) is on the same file, when gun is linked with zlib 1.2.2.  Also the
-   LZW decompression provided by gun is about twice as fast as the standard
-   Unix uncompress command.
- */
-
-/* external functions and related types and constants */
-#include <stdio.h>          /* fprintf() */
-#include <stdlib.h>         /* malloc(), free() */
-#include <string.h>         /* strerror(), strcmp(), strlen(), memcpy() */
-#include <errno.h>          /* errno */
-#include <fcntl.h>          /* open() */
-#include <unistd.h>         /* read(), write(), close(), chown(), unlink() */
-#include <sys/types.h>
-#include <sys/stat.h>       /* stat(), chmod() */
-#include <utime.h>          /* utime() */
-#include "zlib.h"           /* inflateBackInit(), inflateBack(), */
-                            /* inflateBackEnd(), crc32() */
-
-/* function declaration */
-#define local static
-
-/* buffer constants */
-#define SIZE 32768U         /* input and output buffer sizes */
-#define PIECE 16384         /* limits i/o chunks for 16-bit int case */
-
-/* structure for infback() to pass to input function in() -- it maintains the
-   input file and a buffer of size SIZE */
-struct ind {
-    int infile;
-    unsigned char *inbuf;
-};
-
-/* Load input buffer, assumed to be empty, and return bytes loaded and a
-   pointer to them.  read() is called until the buffer is full, or until it
-   returns end-of-file or error.  Return 0 on error. */
-local unsigned in(void *in_desc, z_const unsigned char **buf)
-{
-    int ret;
-    unsigned len;
-    unsigned char *next;
-    struct ind *me = (struct ind *)in_desc;
-
-    next = me->inbuf;
-    *buf = next;
-    len = 0;
-    do {
-        ret = PIECE;
-        if ((unsigned)ret > SIZE - len)
-            ret = (int)(SIZE - len);
-        ret = (int)read(me->infile, next, ret);
-        if (ret == -1) {
-            len = 0;
-            break;
-        }
-        next += ret;
-        len += ret;
-    } while (ret != 0 && len < SIZE);
-    return len;
-}
-
-/* structure for infback() to pass to output function out() -- it maintains the
-   output file, a running CRC-32 check on the output and the total number of
-   bytes output, both for checking against the gzip trailer.  (The length in
-   the gzip trailer is stored modulo 2^32, so it's ok if a long is 32 bits and
-   the output is greater than 4 GB.) */
-struct outd {
-    int outfile;
-    int check;                  /* true if checking crc and total */
-    unsigned long crc;
-    unsigned long total;
-};
-
-/* Write output buffer and update the CRC-32 and total bytes written.  write()
-   is called until all of the output is written or an error is encountered.
-   On success out() returns 0.  For a write failure, out() returns 1.  If the
-   output file descriptor is -1, then nothing is written.
- */
-local int out(void *out_desc, unsigned char *buf, unsigned len)
-{
-    int ret;
-    struct outd *me = (struct outd *)out_desc;
-
-    if (me->check) {
-        me->crc = crc32(me->crc, buf, len);
-        me->total += len;
-    }
-    if (me->outfile != -1)
-        do {
-            ret = PIECE;
-            if ((unsigned)ret > len)
-                ret = (int)len;
-            ret = (int)write(me->outfile, buf, ret);
-            if (ret == -1)
-                return 1;
-            buf += ret;
-            len -= ret;
-        } while (len != 0);
-    return 0;
-}
-
-/* next input byte macro for use inside lunpipe() and gunpipe() */
-#define NEXT() (have ? 0 : (have = in(indp, &next)), \
-                last = have ? (have--, (int)(*next++)) : -1)
-
-/* memory for gunpipe() and lunpipe() --
-   the first 256 entries of prefix[] and suffix[] are never used, could
-   have offset the index, but it's faster to waste the memory */
-unsigned char inbuf[SIZE];              /* input buffer */
-unsigned char outbuf[SIZE];             /* output buffer */
-unsigned short prefix[65536];           /* index to LZW prefix string */
-unsigned char suffix[65536];            /* one-character LZW suffix */
-unsigned char match[65280 + 2];         /* buffer for reversed match or gzip
-                                           32K sliding window */
-
-/* throw out what's left in the current bits byte buffer (this is a vestigial
-   aspect of the compressed data format derived from an implementation that
-   made use of a special VAX machine instruction!) */
-#define FLUSHCODE() \
-    do { \
-        left = 0; \
-        rem = 0; \
-        if (chunk > have) { \
-            chunk -= have; \
-            have = 0; \
-            if (NEXT() == -1) \
-                break; \
-            chunk--; \
-            if (chunk > have) { \
-                chunk = have = 0; \
-                break; \
-            } \
-        } \
-        have -= chunk; \
-        next += chunk; \
-        chunk = 0; \
-    } while (0)
-
-/* Decompress a compress (LZW) file from indp to outfile.  The compress magic
-   header (two bytes) has already been read and verified.  There are have bytes
-   of buffered input at next.  strm is used for passing error information back
-   to gunpipe().
-
-   lunpipe() will return Z_OK on success, Z_BUF_ERROR for an unexpected end of
-   file, read error, or write error (a write error indicated by strm->next_in
-   not equal to Z_NULL), or Z_DATA_ERROR for invalid input.
- */
-local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
-                  int outfile, z_stream *strm)
-{
-    int last;                   /* last byte read by NEXT(), or -1 if EOF */
-    unsigned chunk;             /* bytes left in current chunk */
-    int left;                   /* bits left in rem */
-    unsigned rem;               /* unused bits from input */
-    int bits;                   /* current bits per code */
-    unsigned code;              /* code, table traversal index */
-    unsigned mask;              /* mask for current bits codes */
-    int max;                    /* maximum bits per code for this stream */
-    unsigned flags;             /* compress flags, then block compress flag */
-    unsigned end;               /* last valid entry in prefix/suffix tables */
-    unsigned temp;              /* current code */
-    unsigned prev;              /* previous code */
-    unsigned final;             /* last character written for previous code */
-    unsigned stack;             /* next position for reversed string */
-    unsigned outcnt;            /* bytes in output buffer */
-    struct outd outd;           /* output structure */
-    unsigned char *p;
-
-    /* set up output */
-    outd.outfile = outfile;
-    outd.check = 0;
-
-    /* process remainder of compress header -- a flags byte */
-    flags = NEXT();
-    if (last == -1)
-        return Z_BUF_ERROR;
-    if (flags & 0x60) {
-        strm->msg = (char *)"unknown lzw flags set";
-        return Z_DATA_ERROR;
-    }
-    max = flags & 0x1f;
-    if (max < 9 || max > 16) {
-        strm->msg = (char *)"lzw bits out of range";
-        return Z_DATA_ERROR;
-    }
-    if (max == 9)                           /* 9 doesn't really mean 9 */
-        max = 10;
-    flags &= 0x80;                          /* true if block compress */
-
-    /* clear table */
-    bits = 9;
-    mask = 0x1ff;
-    end = flags ? 256 : 255;
-
-    /* set up: get first 9-bit code, which is the first decompressed byte, but
-       don't create a table entry until the next code */
-    if (NEXT() == -1)                       /* no compressed data is ok */
-        return Z_OK;
-    final = prev = (unsigned)last;          /* low 8 bits of code */
-    if (NEXT() == -1)                       /* missing a bit */
-        return Z_BUF_ERROR;
-    if (last & 1) {                         /* code must be < 256 */
-        strm->msg = (char *)"invalid lzw code";
-        return Z_DATA_ERROR;
-    }
-    rem = (unsigned)last >> 1;              /* remaining 7 bits */
-    left = 7;
-    chunk = bits - 2;                       /* 7 bytes left in this chunk */
-    outbuf[0] = (unsigned char)final;       /* write first decompressed byte */
-    outcnt = 1;
-
-    /* decode codes */
-    stack = 0;
-    for (;;) {
-        /* if the table will be full after this, increment the code size */
-        if (end >= mask && bits < max) {
-            FLUSHCODE();
-            bits++;
-            mask <<= 1;
-            mask++;
-        }
-
-        /* get a code of length bits */
-        if (chunk == 0)                     /* decrement chunk modulo bits */
-            chunk = bits;
-        code = rem;                         /* low bits of code */
-        if (NEXT() == -1) {                 /* EOF is end of compressed data */
-            /* write remaining buffered output */
-            if (outcnt && out(&outd, outbuf, outcnt)) {
-                strm->next_in = outbuf;     /* signal write error */
-                return Z_BUF_ERROR;
-            }
-            return Z_OK;
-        }
-        code += (unsigned)last << left;     /* middle (or high) bits of code */
-        left += 8;
-        chunk--;
-        if (bits > left) {                  /* need more bits */
-            if (NEXT() == -1)               /* can't end in middle of code */
-                return Z_BUF_ERROR;
-            code += (unsigned)last << left; /* high bits of code */
-            left += 8;
-            chunk--;
-        }
-        code &= mask;                       /* mask to current code length */
-        left -= bits;                       /* number of unused bits */
-        rem = (unsigned)last >> (8 - left); /* unused bits from last byte */
-
-        /* process clear code (256) */
-        if (code == 256 && flags) {
-            FLUSHCODE();
-            bits = 9;                       /* initialize bits and mask */
-            mask = 0x1ff;
-            end = 255;                      /* empty table */
-            continue;                       /* get next code */
-        }
-
-        /* special code to reuse last match */
-        temp = code;                        /* save the current code */
-        if (code > end) {
-            /* Be picky on the allowed code here, and make sure that the code
-               we drop through (prev) will be a valid index so that random
-               input does not cause an exception.  The code != end + 1 check is
-               empirically derived, and not checked in the original uncompress
-               code.  If this ever causes a problem, that check could be safely
-               removed.  Leaving this check in greatly improves gun's ability
-               to detect random or corrupted input after a compress header.
-               In any case, the prev > end check must be retained. */
-            if (code != end + 1 || prev > end) {
-                strm->msg = (char *)"invalid lzw code";
-                return Z_DATA_ERROR;
-            }
-            match[stack++] = (unsigned char)final;
-            code = prev;
-        }
-
-        /* walk through linked list to generate output in reverse order */
-        p = match + stack;
-        while (code >= 256) {
-            *p++ = suffix[code];
-            code = prefix[code];
-        }
-        stack = p - match;
-        match[stack++] = (unsigned char)code;
-        final = code;
-
-        /* link new table entry */
-        if (end < mask) {
-            end++;
-            prefix[end] = (unsigned short)prev;
-            suffix[end] = (unsigned char)final;
-        }
-
-        /* set previous code for next iteration */
-        prev = temp;
-
-        /* write output in forward order */
-        while (stack > SIZE - outcnt) {
-            while (outcnt < SIZE)
-                outbuf[outcnt++] = match[--stack];
-            if (out(&outd, outbuf, outcnt)) {
-                strm->next_in = outbuf; /* signal write error */
-                return Z_BUF_ERROR;
-            }
-            outcnt = 0;
-        }
-        p = match + stack;
-        do {
-            outbuf[outcnt++] = *--p;
-        } while (p > match);
-        stack = 0;
-
-        /* loop for next code with final and prev as the last match, rem and
-           left provide the first 0..7 bits of the next code, end is the last
-           valid table entry */
-    }
-}
-
-/* Decompress a gzip file from infile to outfile.  strm is assumed to have been
-   successfully initialized with inflateBackInit().  The input file may consist
-   of a series of gzip streams, in which case all of them will be decompressed
-   to the output file.  If outfile is -1, then the gzip stream(s) integrity is
-   checked and nothing is written.
-
-   The return value is a zlib error code: Z_MEM_ERROR if out of memory,
-   Z_DATA_ERROR if the header or the compressed data is invalid, or if the
-   trailer CRC-32 check or length doesn't match, Z_BUF_ERROR if the input ends
-   prematurely or a write error occurs, or Z_ERRNO if junk (not a another gzip
-   stream) follows a valid gzip stream.
- */
-local int gunpipe(z_stream *strm, int infile, int outfile)
-{
-    int ret, first, last;
-    unsigned have, flags, len;
-    z_const unsigned char *next = NULL;
-    struct ind ind, *indp;
-    struct outd outd;
-
-    /* setup input buffer */
-    ind.infile = infile;
-    ind.inbuf = inbuf;
-    indp = &ind;
-
-    /* decompress concatenated gzip streams */
-    have = 0;                               /* no input data read in yet */
-    first = 1;                              /* looking for first gzip header */
-    strm->next_in = Z_NULL;                 /* so Z_BUF_ERROR means EOF */
-    for (;;) {
-        /* look for the two magic header bytes for a gzip stream */
-        if (NEXT() == -1) {
-            ret = Z_OK;
-            break;                          /* empty gzip stream is ok */
-        }
-        if (last != 31 || (NEXT() != 139 && last != 157)) {
-            strm->msg = (char *)"incorrect header check";
-            ret = first ? Z_DATA_ERROR : Z_ERRNO;
-            break;                          /* not a gzip or compress header */
-        }
-        first = 0;                          /* next non-header is junk */
-
-        /* process a compress (LZW) file -- can't be concatenated after this */
-        if (last == 157) {
-            ret = lunpipe(have, next, indp, outfile, strm);
-            break;
-        }
-
-        /* process remainder of gzip header */
-        ret = Z_BUF_ERROR;
-        if (NEXT() != 8) {                  /* only deflate method allowed */
-            if (last == -1) break;
-            strm->msg = (char *)"unknown compression method";
-            ret = Z_DATA_ERROR;
-            break;
-        }
-        flags = NEXT();                     /* header flags */
-        NEXT();                             /* discard mod time, xflgs, os */
-        NEXT();
-        NEXT();
-        NEXT();
-        NEXT();
-        NEXT();
-        if (last == -1) break;
-        if (flags & 0xe0) {
-            strm->msg = (char *)"unknown header flags set";
-            ret = Z_DATA_ERROR;
-            break;
-        }
-        if (flags & 4) {                    /* extra field */
-            len = NEXT();
-            len += (unsigned)(NEXT()) << 8;
-            if (last == -1) break;
-            while (len > have) {
-                len -= have;
-                have = 0;
-                if (NEXT() == -1) break;
-                len--;
-            }
-            if (last == -1) break;
-            have -= len;
-            next += len;
-        }
-        if (flags & 8)                      /* file name */
-            while (NEXT() != 0 && last != -1)
-                ;
-        if (flags & 16)                     /* comment */
-            while (NEXT() != 0 && last != -1)
-                ;
-        if (flags & 2) {                    /* header crc */
-            NEXT();
-            NEXT();
-        }
-        if (last == -1) break;
-
-        /* set up output */
-        outd.outfile = outfile;
-        outd.check = 1;
-        outd.crc = crc32(0L, Z_NULL, 0);
-        outd.total = 0;
-
-        /* decompress data to output */
-        strm->next_in = next;
-        strm->avail_in = have;
-        ret = inflateBack(strm, in, indp, out, &outd);
-        if (ret != Z_STREAM_END) break;
-        next = strm->next_in;
-        have = strm->avail_in;
-        strm->next_in = Z_NULL;             /* so Z_BUF_ERROR means EOF */
-
-        /* check trailer */
-        ret = Z_BUF_ERROR;
-        if (NEXT() != (int)(outd.crc & 0xff) ||
-            NEXT() != (int)((outd.crc >> 8) & 0xff) ||
-            NEXT() != (int)((outd.crc >> 16) & 0xff) ||
-            NEXT() != (int)((outd.crc >> 24) & 0xff)) {
-            /* crc error */
-            if (last != -1) {
-                strm->msg = (char *)"incorrect data check";
-                ret = Z_DATA_ERROR;
-            }
-            break;
-        }
-        if (NEXT() != (int)(outd.total & 0xff) ||
-            NEXT() != (int)((outd.total >> 8) & 0xff) ||
-            NEXT() != (int)((outd.total >> 16) & 0xff) ||
-            NEXT() != (int)((outd.total >> 24) & 0xff)) {
-            /* length error */
-            if (last != -1) {
-                strm->msg = (char *)"incorrect length check";
-                ret = Z_DATA_ERROR;
-            }
-            break;
-        }
-
-        /* go back and look for another gzip stream */
-    }
-
-    /* clean up and return */
-    return ret;
-}
-
-/* Copy file attributes, from -> to, as best we can.  This is best effort, so
-   no errors are reported.  The mode bits, including suid, sgid, and the sticky
-   bit are copied (if allowed), the owner's user id and group id are copied
-   (again if allowed), and the access and modify times are copied. */
-local void copymeta(char *from, char *to)
-{
-    struct stat was;
-    struct utimbuf when;
-
-    /* get all of from's Unix meta data, return if not a regular file */
-    if (stat(from, &was) != 0 || (was.st_mode & S_IFMT) != S_IFREG)
-        return;
-
-    /* set to's mode bits, ignore errors */
-    (void)chmod(to, was.st_mode & 07777);
-
-    /* copy owner's user and group, ignore errors */
-    (void)chown(to, was.st_uid, was.st_gid);
-
-    /* copy access and modify times, ignore errors */
-    when.actime = was.st_atime;
-    when.modtime = was.st_mtime;
-    (void)utime(to, &when);
-}
-
-/* Decompress the file inname to the file outnname, of if test is true, just
-   decompress without writing and check the gzip trailer for integrity.  If
-   inname is NULL or an empty string, read from stdin.  If outname is NULL or
-   an empty string, write to stdout.  strm is a pre-initialized inflateBack
-   structure.  When appropriate, copy the file attributes from inname to
-   outname.
-
-   gunzip() returns 1 if there is an out-of-memory error or an unexpected
-   return code from gunpipe().  Otherwise it returns 0.
- */
-local int gunzip(z_stream *strm, char *inname, char *outname, int test)
-{
-    int ret;
-    int infile, outfile;
-
-    /* open files */
-    if (inname == NULL || *inname == 0) {
-        inname = "-";
-        infile = 0;     /* stdin */
-    }
-    else {
-        infile = open(inname, O_RDONLY, 0);
-        if (infile == -1) {
-            fprintf(stderr, "gun cannot open %s\n", inname);
-            return 0;
-        }
-    }
-    if (test)
-        outfile = -1;
-    else if (outname == NULL || *outname == 0) {
-        outname = "-";
-        outfile = 1;    /* stdout */
-    }
-    else {
-        outfile = open(outname, O_CREAT | O_TRUNC | O_WRONLY, 0666);
-        if (outfile == -1) {
-            close(infile);
-            fprintf(stderr, "gun cannot create %s\n", outname);
-            return 0;
-        }
-    }
-    errno = 0;
-
-    /* decompress */
-    ret = gunpipe(strm, infile, outfile);
-    if (outfile > 2) close(outfile);
-    if (infile > 2) close(infile);
-
-    /* interpret result */
-    switch (ret) {
-    case Z_OK:
-    case Z_ERRNO:
-        if (infile > 2 && outfile > 2) {
-            copymeta(inname, outname);          /* copy attributes */
-            unlink(inname);
-        }
-        if (ret == Z_ERRNO)
-            fprintf(stderr, "gun warning: trailing garbage ignored in %s\n",
-                    inname);
-        break;
-    case Z_DATA_ERROR:
-        if (outfile > 2) unlink(outname);
-        fprintf(stderr, "gun data error on %s: %s\n", inname, strm->msg);
-        break;
-    case Z_MEM_ERROR:
-        if (outfile > 2) unlink(outname);
-        fprintf(stderr, "gun out of memory error--aborting\n");
-        return 1;
-    case Z_BUF_ERROR:
-        if (outfile > 2) unlink(outname);
-        if (strm->next_in != Z_NULL) {
-            fprintf(stderr, "gun write error on %s: %s\n",
-                    outname, strerror(errno));
-        }
-        else if (errno) {
-            fprintf(stderr, "gun read error on %s: %s\n",
-                    inname, strerror(errno));
-        }
-        else {
-            fprintf(stderr, "gun unexpected end of file on %s\n",
-                    inname);
-        }
-        break;
-    default:
-        if (outfile > 2) unlink(outname);
-        fprintf(stderr, "gun internal error--aborting\n");
-        return 1;
-    }
-    return 0;
-}
-
-/* Process the gun command line arguments.  See the command syntax near the
-   beginning of this source file. */
-int main(int argc, char **argv)
-{
-    int ret, len, test;
-    char *outname;
-    unsigned char *window;
-    z_stream strm;
-
-    /* initialize inflateBack state for repeated use */
-    window = match;                         /* reuse LZW match buffer */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    ret = inflateBackInit(&strm, 15, window);
-    if (ret != Z_OK) {
-        fprintf(stderr, "gun out of memory error--aborting\n");
-        return 1;
-    }
-
-    /* decompress each file to the same name with the suffix removed */
-    argc--;
-    argv++;
-    test = 0;
-    if (argc && strcmp(*argv, "-h") == 0) {
-        fprintf(stderr, "gun 1.6 (17 Jan 2010)\n");
-        fprintf(stderr, "Copyright (C) 2003-2010 Mark Adler\n");
-        fprintf(stderr, "usage: gun [-t] [file1.gz [file2.Z ...]]\n");
-        return 0;
-    }
-    if (argc && strcmp(*argv, "-t") == 0) {
-        test = 1;
-        argc--;
-        argv++;
-    }
-    if (argc)
-        do {
-            if (test)
-                outname = NULL;
-            else {
-                len = (int)strlen(*argv);
-                if (strcmp(*argv + len - 3, ".gz") == 0 ||
-                    strcmp(*argv + len - 3, "-gz") == 0)
-                    len -= 3;
-                else if (strcmp(*argv + len - 2, ".z") == 0 ||
-                    strcmp(*argv + len - 2, "-z") == 0 ||
-                    strcmp(*argv + len - 2, "_z") == 0 ||
-                    strcmp(*argv + len - 2, ".Z") == 0)
-                    len -= 2;
-                else {
-                    fprintf(stderr, "gun error: no gz type on %s--skipping\n",
-                            *argv);
-                    continue;
-                }
-                outname = malloc(len + 1);
-                if (outname == NULL) {
-                    fprintf(stderr, "gun out of memory error--aborting\n");
-                    ret = 1;
-                    break;
-                }
-                memcpy(outname, *argv, len);
-                outname[len] = 0;
-            }
-            ret = gunzip(&strm, *argv, outname, test);
-            if (outname != NULL) free(outname);
-            if (ret) break;
-        } while (argv++, --argc);
-    else
-        ret = gunzip(&strm, NULL, NULL, test);
-
-    /* clean up */
-    inflateBackEnd(&strm);
-    return ret;
-}

crates/libz-sys/src/zlib/examples/gzappend.c

diff --git a/crates/libz-sys/src/zlib/examples/gzappend.c b/crates/libz-sys/src/zlib/examples/gzappend.c
deleted file mode 100644
index 662dec3..0000000
--- a/crates/libz-sys/src/zlib/examples/gzappend.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/* gzappend -- command to append to a gzip file
-
-  Copyright (C) 2003, 2012 Mark Adler, all rights reserved
-  version 1.2, 11 Oct 2012
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-/*
- * Change history:
- *
- * 1.0  19 Oct 2003     - First version
- * 1.1   4 Nov 2003     - Expand and clarify some comments and notes
- *                      - Add version and copyright to help
- *                      - Send help to stdout instead of stderr
- *                      - Add some preemptive typecasts
- *                      - Add L to constants in lseek() calls
- *                      - Remove some debugging information in error messages
- *                      - Use new data_type definition for zlib 1.2.1
- *                      - Simplfy and unify file operations
- *                      - Finish off gzip file in gztack()
- *                      - Use deflatePrime() instead of adding empty blocks
- *                      - Keep gzip file clean on appended file read errors
- *                      - Use in-place rotate instead of auxiliary buffer
- *                        (Why you ask?  Because it was fun to write!)
- * 1.2  11 Oct 2012     - Fix for proper z_const usage
- *                      - Check for input buffer malloc failure
- */
-
-/*
-   gzappend takes a gzip file and appends to it, compressing files from the
-   command line or data from stdin.  The gzip file is written to directly, to
-   avoid copying that file, in case it's large.  Note that this results in the
-   unfriendly behavior that if gzappend fails, the gzip file is corrupted.
-
-   This program was written to illustrate the use of the new Z_BLOCK option of
-   zlib 1.2.x's inflate() function.  This option returns from inflate() at each
-   block boundary to facilitate locating and modifying the last block bit at
-   the start of the final deflate block.  Also whether using Z_BLOCK or not,
-   another required feature of zlib 1.2.x is that inflate() now provides the
-   number of unusued bits in the last input byte used.  gzappend will not work
-   with versions of zlib earlier than 1.2.1.
-
-   gzappend first decompresses the gzip file internally, discarding all but
-   the last 32K of uncompressed data, and noting the location of the last block
-   bit and the number of unused bits in the last byte of the compressed data.
-   The gzip trailer containing the CRC-32 and length of the uncompressed data
-   is verified.  This trailer will be later overwritten.
-
-   Then the last block bit is cleared by seeking back in the file and rewriting
-   the byte that contains it.  Seeking forward, the last byte of the compressed
-   data is saved along with the number of unused bits to initialize deflate.
-
-   A deflate process is initialized, using the last 32K of the uncompressed
-   data from the gzip file to initialize the dictionary.  If the total
-   uncompressed data was less than 32K, then all of it is used to initialize
-   the dictionary.  The deflate output bit buffer is also initialized with the
-   last bits from the original deflate stream.  From here on, the data to
-   append is simply compressed using deflate, and written to the gzip file.
-   When that is complete, the new CRC-32 and uncompressed length are written
-   as the trailer of the gzip file.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "zlib.h"
-
-#define local static
-#define LGCHUNK 14
-#define CHUNK (1U << LGCHUNK)
-#define DSIZE 32768U
-
-/* print an error message and terminate with extreme prejudice */
-local void bye(char *msg1, char *msg2)
-{
-    fprintf(stderr, "gzappend error: %s%s\n", msg1, msg2);
-    exit(1);
-}
-
-/* return the greatest common divisor of a and b using Euclid's algorithm,
-   modified to be fast when one argument much greater than the other, and
-   coded to avoid unnecessary swapping */
-local unsigned gcd(unsigned a, unsigned b)
-{
-    unsigned c;
-
-    while (a && b)
-        if (a > b) {
-            c = b;
-            while (a - c >= c)
-                c <<= 1;
-            a -= c;
-        }
-        else {
-            c = a;
-            while (b - c >= c)
-                c <<= 1;
-            b -= c;
-        }
-    return a + b;
-}
-
-/* rotate list[0..len-1] left by rot positions, in place */
-local void rotate(unsigned char *list, unsigned len, unsigned rot)
-{
-    unsigned char tmp;
-    unsigned cycles;
-    unsigned char *start, *last, *to, *from;
-
-    /* normalize rot and handle degenerate cases */
-    if (len < 2) return;
-    if (rot >= len) rot %= len;
-    if (rot == 0) return;
-
-    /* pointer to last entry in list */
-    last = list + (len - 1);
-
-    /* do simple left shift by one */
-    if (rot == 1) {
-        tmp = *list;
-        memcpy(list, list + 1, len - 1);
-        *last = tmp;
-        return;
-    }
-
-    /* do simple right shift by one */
-    if (rot == len - 1) {
-        tmp = *last;
-        memmove(list + 1, list, len - 1);
-        *list = tmp;
-        return;
-    }
-
-    /* otherwise do rotate as a set of cycles in place */
-    cycles = gcd(len, rot);             /* number of cycles */
-    do {
-        start = from = list + cycles;   /* start index is arbitrary */
-        tmp = *from;                    /* save entry to be overwritten */
-        for (;;) {
-            to = from;                  /* next step in cycle */
-            from += rot;                /* go right rot positions */
-            if (from > last) from -= len;   /* (pointer better not wrap) */
-            if (from == start) break;   /* all but one shifted */
-            *to = *from;                /* shift left */
-        }
-        *to = tmp;                      /* complete the circle */
-    } while (--cycles);
-}
-
-/* structure for gzip file read operations */
-typedef struct {
-    int fd;                     /* file descriptor */
-    int size;                   /* 1 << size is bytes in buf */
-    unsigned left;              /* bytes available at next */
-    unsigned char *buf;         /* buffer */
-    z_const unsigned char *next;    /* next byte in buffer */
-    char *name;                 /* file name for error messages */
-} file;
-
-/* reload buffer */
-local int readin(file *in)
-{
-    int len;
-
-    len = read(in->fd, in->buf, 1 << in->size);
-    if (len == -1) bye("error reading ", in->name);
-    in->left = (unsigned)len;
-    in->next = in->buf;
-    return len;
-}
-
-/* read from file in, exit if end-of-file */
-local int readmore(file *in)
-{
-    if (readin(in) == 0) bye("unexpected end of ", in->name);
-    return 0;
-}
-
-#define read1(in) (in->left == 0 ? readmore(in) : 0, \
-                   in->left--, *(in->next)++)
-
-/* skip over n bytes of in */
-local void skip(file *in, unsigned n)
-{
-    unsigned bypass;
-
-    if (n > in->left) {
-        n -= in->left;
-        bypass = n & ~((1U << in->size) - 1);
-        if (bypass) {
-            if (lseek(in->fd, (off_t)bypass, SEEK_CUR) == -1)
-                bye("seeking ", in->name);
-            n -= bypass;
-        }
-        readmore(in);
-        if (n > in->left)
-            bye("unexpected end of ", in->name);
-    }
-    in->left -= n;
-    in->next += n;
-}
-
-/* read a four-byte unsigned integer, little-endian, from in */
-unsigned long read4(file *in)
-{
-    unsigned long val;
-
-    val = read1(in);
-    val += (unsigned)read1(in) << 8;
-    val += (unsigned long)read1(in) << 16;
-    val += (unsigned long)read1(in) << 24;
-    return val;
-}
-
-/* skip over gzip header */
-local void gzheader(file *in)
-{
-    int flags;
-    unsigned n;
-
-    if (read1(in) != 31 || read1(in) != 139) bye(in->name, " not a gzip file");
-    if (read1(in) != 8) bye("unknown compression method in", in->name);
-    flags = read1(in);
-    if (flags & 0xe0) bye("unknown header flags set in", in->name);
-    skip(in, 6);
-    if (flags & 4) {
-        n = read1(in);
-        n += (unsigned)(read1(in)) << 8;
-        skip(in, n);
-    }
-    if (flags & 8) while (read1(in) != 0) ;
-    if (flags & 16) while (read1(in) != 0) ;
-    if (flags & 2) skip(in, 2);
-}
-
-/* decompress gzip file "name", return strm with a deflate stream ready to
-   continue compression of the data in the gzip file, and return a file
-   descriptor pointing to where to write the compressed data -- the deflate
-   stream is initialized to compress using level "level" */
-local int gzscan(char *name, z_stream *strm, int level)
-{
-    int ret, lastbit, left, full;
-    unsigned have;
-    unsigned long crc, tot;
-    unsigned char *window;
-    off_t lastoff, end;
-    file gz;
-
-    /* open gzip file */
-    gz.name = name;
-    gz.fd = open(name, O_RDWR, 0);
-    if (gz.fd == -1) bye("cannot open ", name);
-    gz.buf = malloc(CHUNK);
-    if (gz.buf == NULL) bye("out of memory", "");
-    gz.size = LGCHUNK;
-    gz.left = 0;
-
-    /* skip gzip header */
-    gzheader(&gz);
-
-    /* prepare to decompress */
-    window = malloc(DSIZE);
-    if (window == NULL) bye("out of memory", "");
-    strm->zalloc = Z_NULL;
-    strm->zfree = Z_NULL;
-    strm->opaque = Z_NULL;
-    ret = inflateInit2(strm, -15);
-    if (ret != Z_OK) bye("out of memory", " or library mismatch");
-
-    /* decompress the deflate stream, saving append information */
-    lastbit = 0;
-    lastoff = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;
-    left = 0;
-    strm->avail_in = gz.left;
-    strm->next_in = gz.next;
-    crc = crc32(0L, Z_NULL, 0);
-    have = full = 0;
-    do {
-        /* if needed, get more input */
-        if (strm->avail_in == 0) {
-            readmore(&gz);
-            strm->avail_in = gz.left;
-            strm->next_in = gz.next;
-        }
-
-        /* set up output to next available section of sliding window */
-        strm->avail_out = DSIZE - have;
-        strm->next_out = window + have;
-
-        /* inflate and check for errors */
-        ret = inflate(strm, Z_BLOCK);
-        if (ret == Z_STREAM_ERROR) bye("internal stream error!", "");
-        if (ret == Z_MEM_ERROR) bye("out of memory", "");
-        if (ret == Z_DATA_ERROR)
-            bye("invalid compressed data--format violated in", name);
-
-        /* update crc and sliding window pointer */
-        crc = crc32(crc, window + have, DSIZE - have - strm->avail_out);
-        if (strm->avail_out)
-            have = DSIZE - strm->avail_out;
-        else {
-            have = 0;
-            full = 1;
-        }
-
-        /* process end of block */
-        if (strm->data_type & 128) {
-            if (strm->data_type & 64)
-                left = strm->data_type & 0x1f;
-            else {
-                lastbit = strm->data_type & 0x1f;
-                lastoff = lseek(gz.fd, 0L, SEEK_CUR) - strm->avail_in;
-            }
-        }
-    } while (ret != Z_STREAM_END);
-    inflateEnd(strm);
-    gz.left = strm->avail_in;
-    gz.next = strm->next_in;
-
-    /* save the location of the end of the compressed data */
-    end = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;
-
-    /* check gzip trailer and save total for deflate */
-    if (crc != read4(&gz))
-        bye("invalid compressed data--crc mismatch in ", name);
-    tot = strm->total_out;
-    if ((tot & 0xffffffffUL) != read4(&gz))
-        bye("invalid compressed data--length mismatch in", name);
-
-    /* if not at end of file, warn */
-    if (gz.left || readin(&gz))
-        fprintf(stderr,
-            "gzappend warning: junk at end of gzip file overwritten\n");
-
-    /* clear last block bit */
-    lseek(gz.fd, lastoff - (lastbit != 0), SEEK_SET);
-    if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);
-    *gz.buf = (unsigned char)(*gz.buf ^ (1 << ((8 - lastbit) & 7)));
-    lseek(gz.fd, -1L, SEEK_CUR);
-    if (write(gz.fd, gz.buf, 1) != 1) bye("writing after seek to ", name);
-
-    /* if window wrapped, build dictionary from window by rotating */
-    if (full) {
-        rotate(window, DSIZE, have);
-        have = DSIZE;
-    }
-
-    /* set up deflate stream with window, crc, total_in, and leftover bits */
-    ret = deflateInit2(strm, level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
-    if (ret != Z_OK) bye("out of memory", "");
-    deflateSetDictionary(strm, window, have);
-    strm->adler = crc;
-    strm->total_in = tot;
-    if (left) {
-        lseek(gz.fd, --end, SEEK_SET);
-        if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);
-        deflatePrime(strm, 8 - left, *gz.buf);
-    }
-    lseek(gz.fd, end, SEEK_SET);
-
-    /* clean up and return */
-    free(window);
-    free(gz.buf);
-    return gz.fd;
-}
-
-/* append file "name" to gzip file gd using deflate stream strm -- if last
-   is true, then finish off the deflate stream at the end */
-local void gztack(char *name, int gd, z_stream *strm, int last)
-{
-    int fd, len, ret;
-    unsigned left;
-    unsigned char *in, *out;
-
-    /* open file to compress and append */
-    fd = 0;
-    if (name != NULL) {
-        fd = open(name, O_RDONLY, 0);
-        if (fd == -1)
-            fprintf(stderr, "gzappend warning: %s not found, skipping ...\n",
-                    name);
-    }
-
-    /* allocate buffers */
-    in = malloc(CHUNK);
-    out = malloc(CHUNK);
-    if (in == NULL || out == NULL) bye("out of memory", "");
-
-    /* compress input file and append to gzip file */
-    do {
-        /* get more input */
-        len = read(fd, in, CHUNK);
-        if (len == -1) {
-            fprintf(stderr,
-                    "gzappend warning: error reading %s, skipping rest ...\n",
-                    name);
-            len = 0;
-        }
-        strm->avail_in = (unsigned)len;
-        strm->next_in = in;
-        if (len) strm->adler = crc32(strm->adler, in, (unsigned)len);
-
-        /* compress and write all available output */
-        do {
-            strm->avail_out = CHUNK;
-            strm->next_out = out;
-            ret = deflate(strm, last && len == 0 ? Z_FINISH : Z_NO_FLUSH);
-            left = CHUNK - strm->avail_out;
-            while (left) {
-                len = write(gd, out + CHUNK - strm->avail_out - left, left);
-                if (len == -1) bye("writing gzip file", "");
-                left -= (unsigned)len;
-            }
-        } while (strm->avail_out == 0 && ret != Z_STREAM_END);
-    } while (len != 0);
-
-    /* write trailer after last entry */
-    if (last) {
-        deflateEnd(strm);
-        out[0] = (unsigned char)(strm->adler);
-        out[1] = (unsigned char)(strm->adler >> 8);
-        out[2] = (unsigned char)(strm->adler >> 16);
-        out[3] = (unsigned char)(strm->adler >> 24);
-        out[4] = (unsigned char)(strm->total_in);
-        out[5] = (unsigned char)(strm->total_in >> 8);
-        out[6] = (unsigned char)(strm->total_in >> 16);
-        out[7] = (unsigned char)(strm->total_in >> 24);
-        len = 8;
-        do {
-            ret = write(gd, out + 8 - len, len);
-            if (ret == -1) bye("writing gzip file", "");
-            len -= ret;
-        } while (len);
-        close(gd);
-    }
-
-    /* clean up and return */
-    free(out);
-    free(in);
-    if (fd > 0) close(fd);
-}
-
-/* process the compression level option if present, scan the gzip file, and
-   append the specified files, or append the data from stdin if no other file
-   names are provided on the command line -- the gzip file must be writable
-   and seekable */
-int main(int argc, char **argv)
-{
-    int gd, level;
-    z_stream strm;
-
-    /* ignore command name */
-    argc--; argv++;
-
-    /* provide usage if no arguments */
-    if (*argv == NULL) {
-        printf(
-            "gzappend 1.2 (11 Oct 2012) Copyright (C) 2003, 2012 Mark Adler\n"
-               );
-        printf(
-            "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n");
-        return 0;
-    }
-
-    /* set compression level */
-    level = Z_DEFAULT_COMPRESSION;
-    if (argv[0][0] == '-') {
-        if (argv[0][1] < '0' || argv[0][1] > '9' || argv[0][2] != 0)
-            bye("invalid compression level", "");
-        level = argv[0][1] - '0';
-        if (*++argv == NULL) bye("no gzip file name after options", "");
-    }
-
-    /* prepare to append to gzip file */
-    gd = gzscan(*argv++, &strm, level);
-
-    /* append files on command line, or from stdin if none */
-    if (*argv == NULL)
-        gztack(NULL, gd, &strm, 1);
-    else
-        do {
-            gztack(*argv, gd, &strm, argv[1] == NULL);
-        } while (*++argv != NULL);
-    return 0;
-}

crates/libz-sys/src/zlib/examples/gzjoin.c

diff --git a/crates/libz-sys/src/zlib/examples/gzjoin.c b/crates/libz-sys/src/zlib/examples/gzjoin.c
deleted file mode 100644
index 89e8098..0000000
--- a/crates/libz-sys/src/zlib/examples/gzjoin.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* gzjoin -- command to join gzip files into one gzip file
-
-  Copyright (C) 2004, 2005, 2012 Mark Adler, all rights reserved
-  version 1.2, 14 Aug 2012
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-/*
- * Change history:
- *
- * 1.0  11 Dec 2004     - First version
- * 1.1  12 Jun 2005     - Changed ssize_t to long for portability
- * 1.2  14 Aug 2012     - Clean up for z_const usage
- */
-
-/*
-   gzjoin takes one or more gzip files on the command line and writes out a
-   single gzip file that will uncompress to the concatenation of the
-   uncompressed data from the individual gzip files.  gzjoin does this without
-   having to recompress any of the data and without having to calculate a new
-   crc32 for the concatenated uncompressed data.  gzjoin does however have to
-   decompress all of the input data in order to find the bits in the compressed
-   data that need to be modified to concatenate the streams.
-
-   gzjoin does not do an integrity check on the input gzip files other than
-   checking the gzip header and decompressing the compressed data.  They are
-   otherwise assumed to be complete and correct.
-
-   Each joint between gzip files removes at least 18 bytes of previous trailer
-   and subsequent header, and inserts an average of about three bytes to the
-   compressed data in order to connect the streams.  The output gzip file
-   has a minimal ten-byte gzip header with no file name or modification time.
-
-   This program was written to illustrate the use of the Z_BLOCK option of
-   inflate() and the crc32_combine() function.  gzjoin will not compile with
-   versions of zlib earlier than 1.2.3.
- */
-
-#include <stdio.h>      /* fputs(), fprintf(), fwrite(), putc() */
-#include <stdlib.h>     /* exit(), malloc(), free() */
-#include <fcntl.h>      /* open() */
-#include <unistd.h>     /* close(), read(), lseek() */
-#include "zlib.h"
-    /* crc32(), crc32_combine(), inflateInit2(), inflate(), inflateEnd() */
-
-#define local static
-
-/* exit with an error (return a value to allow use in an expression) */
-local int bail(char *why1, char *why2)
-{
-    fprintf(stderr, "gzjoin error: %s%s, output incomplete\n", why1, why2);
-    exit(1);
-    return 0;
-}
-
-/* -- simple buffered file input with access to the buffer -- */
-
-#define CHUNK 32768         /* must be a power of two and fit in unsigned */
-
-/* bin buffered input file type */
-typedef struct {
-    char *name;             /* name of file for error messages */
-    int fd;                 /* file descriptor */
-    unsigned left;          /* bytes remaining at next */
-    unsigned char *next;    /* next byte to read */
-    unsigned char *buf;     /* allocated buffer of length CHUNK */
-} bin;
-
-/* close a buffered file and free allocated memory */
-local void bclose(bin *in)
-{
-    if (in != NULL) {
-        if (in->fd != -1)
-            close(in->fd);
-        if (in->buf != NULL)
-            free(in->buf);
-        free(in);
-    }
-}
-
-/* open a buffered file for input, return a pointer to type bin, or NULL on
-   failure */
-local bin *bopen(char *name)
-{
-    bin *in;
-
-    in = malloc(sizeof(bin));
-    if (in == NULL)
-        return NULL;
-    in->buf = malloc(CHUNK);
-    in->fd = open(name, O_RDONLY, 0);
-    if (in->buf == NULL || in->fd == -1) {
-        bclose(in);
-        return NULL;
-    }
-    in->left = 0;
-    in->next = in->buf;
-    in->name = name;
-    return in;
-}
-
-/* load buffer from file, return -1 on read error, 0 or 1 on success, with
-   1 indicating that end-of-file was reached */
-local int bload(bin *in)
-{
-    long len;
-
-    if (in == NULL)
-        return -1;
-    if (in->left != 0)
-        return 0;
-    in->next = in->buf;
-    do {
-        len = (long)read(in->fd, in->buf + in->left, CHUNK - in->left);
-        if (len < 0)
-            return -1;
-        in->left += (unsigned)len;
-    } while (len != 0 && in->left < CHUNK);
-    return len == 0 ? 1 : 0;
-}
-
-/* get a byte from the file, bail if end of file */
-#define bget(in) (in->left ? 0 : bload(in), \
-                  in->left ? (in->left--, *(in->next)++) : \
-                    bail("unexpected end of file on ", in->name))
-
-/* get a four-byte little-endian unsigned integer from file */
-local unsigned long bget4(bin *in)
-{
-    unsigned long val;
-
-    val = bget(in);
-    val += (unsigned long)(bget(in)) << 8;
-    val += (unsigned long)(bget(in)) << 16;
-    val += (unsigned long)(bget(in)) << 24;
-    return val;
-}
-
-/* skip bytes in file */
-local void bskip(bin *in, unsigned skip)
-{
-    /* check pointer */
-    if (in == NULL)
-        return;
-
-    /* easy case -- skip bytes in buffer */
-    if (skip <= in->left) {
-        in->left -= skip;
-        in->next += skip;
-        return;
-    }
-
-    /* skip what's in buffer, discard buffer contents */
-    skip -= in->left;
-    in->left = 0;
-
-    /* seek past multiples of CHUNK bytes */
-    if (skip > CHUNK) {
-        unsigned left;
-
-        left = skip & (CHUNK - 1);
-        if (left == 0) {
-            /* exact number of chunks: seek all the way minus one byte to check
-               for end-of-file with a read */
-            lseek(in->fd, skip - 1, SEEK_CUR);
-            if (read(in->fd, in->buf, 1) != 1)
-                bail("unexpected end of file on ", in->name);
-            return;
-        }
-
-        /* skip the integral chunks, update skip with remainder */
-        lseek(in->fd, skip - left, SEEK_CUR);
-        skip = left;
-    }
-
-    /* read more input and skip remainder */
-    bload(in);
-    if (skip > in->left)
-        bail("unexpected end of file on ", in->name);
-    in->left -= skip;
-    in->next += skip;
-}
-
-/* -- end of buffered input functions -- */
-
-/* skip the gzip header from file in */
-local void gzhead(bin *in)
-{
-    int flags;
-
-    /* verify gzip magic header and compression method */
-    if (bget(in) != 0x1f || bget(in) != 0x8b || bget(in) != 8)
-        bail(in->name, " is not a valid gzip file");
-
-    /* get and verify flags */
-    flags = bget(in);
-    if ((flags & 0xe0) != 0)
-        bail("unknown reserved bits set in ", in->name);
-
-    /* skip modification time, extra flags, and os */
-    bskip(in, 6);
-
-    /* skip extra field if present */
-    if (flags & 4) {
-        unsigned len;
-
-        len = bget(in);
-        len += (unsigned)(bget(in)) << 8;
-        bskip(in, len);
-    }
-
-    /* skip file name if present */
-    if (flags & 8)
-        while (bget(in) != 0)
-            ;
-
-    /* skip comment if present */
-    if (flags & 16)
-        while (bget(in) != 0)
-            ;
-
-    /* skip header crc if present */
-    if (flags & 2)
-        bskip(in, 2);
-}
-
-/* write a four-byte little-endian unsigned integer to out */
-local void put4(unsigned long val, FILE *out)
-{
-    putc(val & 0xff, out);
-    putc((val >> 8) & 0xff, out);
-    putc((val >> 16) & 0xff, out);
-    putc((val >> 24) & 0xff, out);
-}
-
-/* Load up zlib stream from buffered input, bail if end of file */
-local void zpull(z_streamp strm, bin *in)
-{
-    if (in->left == 0)
-        bload(in);
-    if (in->left == 0)
-        bail("unexpected end of file on ", in->name);
-    strm->avail_in = in->left;
-    strm->next_in = in->next;
-}
-
-/* Write header for gzip file to out and initialize trailer. */
-local void gzinit(unsigned long *crc, unsigned long *tot, FILE *out)
-{
-    fwrite("\x1f\x8b\x08\0\0\0\0\0\0\xff", 1, 10, out);
-    *crc = crc32(0L, Z_NULL, 0);
-    *tot = 0;
-}
-
-/* Copy the compressed data from name, zeroing the last block bit of the last
-   block if clr is true, and adding empty blocks as needed to get to a byte
-   boundary.  If clr is false, then the last block becomes the last block of
-   the output, and the gzip trailer is written.  crc and tot maintains the
-   crc and length (modulo 2^32) of the output for the trailer.  The resulting
-   gzip file is written to out.  gzinit() must be called before the first call
-   of gzcopy() to write the gzip header and to initialize crc and tot. */
-local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,
-                  FILE *out)
-{
-    int ret;                /* return value from zlib functions */
-    int pos;                /* where the "last block" bit is in byte */
-    int last;               /* true if processing the last block */
-    bin *in;                /* buffered input file */
-    unsigned char *start;   /* start of compressed data in buffer */
-    unsigned char *junk;    /* buffer for uncompressed data -- discarded */
-    z_off_t len;            /* length of uncompressed data (support > 4 GB) */
-    z_stream strm;          /* zlib inflate stream */
-
-    /* open gzip file and skip header */
-    in = bopen(name);
-    if (in == NULL)
-        bail("could not open ", name);
-    gzhead(in);
-
-    /* allocate buffer for uncompressed data and initialize raw inflate
-       stream */
-    junk = malloc(CHUNK);
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, -15);
-    if (junk == NULL || ret != Z_OK)
-        bail("out of memory", "");
-
-    /* inflate and copy compressed data, clear last-block bit if requested */
-    len = 0;
-    zpull(&strm, in);
-    start = in->next;
-    last = start[0] & 1;
-    if (last && clr)
-        start[0] &= ~1;
-    strm.avail_out = 0;
-    for (;;) {
-        /* if input used and output done, write used input and get more */
-        if (strm.avail_in == 0 && strm.avail_out != 0) {
-            fwrite(start, 1, strm.next_in - start, out);
-            start = in->buf;
-            in->left = 0;
-            zpull(&strm, in);
-        }
-
-        /* decompress -- return early when end-of-block reached */
-        strm.avail_out = CHUNK;
-        strm.next_out = junk;
-        ret = inflate(&strm, Z_BLOCK);
-        switch (ret) {
-        case Z_MEM_ERROR:
-            bail("out of memory", "");
-        case Z_DATA_ERROR:
-            bail("invalid compressed data in ", in->name);
-        }
-
-        /* update length of uncompressed data */
-        len += CHUNK - strm.avail_out;
-
-        /* check for block boundary (only get this when block copied out) */
-        if (strm.data_type & 128) {
-            /* if that was the last block, then done */
-            if (last)
-                break;
-
-            /* number of unused bits in last byte */
-            pos = strm.data_type & 7;
-
-            /* find the next last-block bit */
-            if (pos != 0) {
-                /* next last-block bit is in last used byte */
-                pos = 0x100 >> pos;
-                last = strm.next_in[-1] & pos;
-                if (last && clr)
-                    in->buf[strm.next_in - in->buf - 1] &= ~pos;
-            }
-            else {
-                /* next last-block bit is in next unused byte */
-                if (strm.avail_in == 0) {
-                    /* don't have that byte yet -- get it */
-                    fwrite(start, 1, strm.next_in - start, out);
-                    start = in->buf;
-                    in->left = 0;
-                    zpull(&strm, in);
-                }
-                last = strm.next_in[0] & 1;
-                if (last && clr)
-                    in->buf[strm.next_in - in->buf] &= ~1;
-            }
-        }
-    }
-
-    /* update buffer with unused input */
-    in->left = strm.avail_in;
-    in->next = in->buf + (strm.next_in - in->buf);
-
-    /* copy used input, write empty blocks to get to byte boundary */
-    pos = strm.data_type & 7;
-    fwrite(start, 1, in->next - start - 1, out);
-    last = in->next[-1];
-    if (pos == 0 || !clr)
-        /* already at byte boundary, or last file: write last byte */
-        putc(last, out);
-    else {
-        /* append empty blocks to last byte */
-        last &= ((0x100 >> pos) - 1);       /* assure unused bits are zero */
-        if (pos & 1) {
-            /* odd -- append an empty stored block */
-            putc(last, out);
-            if (pos == 1)
-                putc(0, out);               /* two more bits in block header */
-            fwrite("\0\0\xff\xff", 1, 4, out);
-        }
-        else {
-            /* even -- append 1, 2, or 3 empty fixed blocks */
-            switch (pos) {
-            case 6:
-                putc(last | 8, out);
-                last = 0;
-            case 4:
-                putc(last | 0x20, out);
-                last = 0;
-            case 2:
-                putc(last | 0x80, out);
-                putc(0, out);
-            }
-        }
-    }
-
-    /* update crc and tot */
-    *crc = crc32_combine(*crc, bget4(in), len);
-    *tot += (unsigned long)len;
-
-    /* clean up */
-    inflateEnd(&strm);
-    free(junk);
-    bclose(in);
-
-    /* write trailer if this is the last gzip file */
-    if (!clr) {
-        put4(*crc, out);
-        put4(*tot, out);
-    }
-}
-
-/* join the gzip files on the command line, write result to stdout */
-int main(int argc, char **argv)
-{
-    unsigned long crc, tot;     /* running crc and total uncompressed length */
-
-    /* skip command name */
-    argc--;
-    argv++;
-
-    /* show usage if no arguments */
-    if (argc == 0) {
-        fputs("gzjoin usage: gzjoin f1.gz [f2.gz [f3.gz ...]] > fjoin.gz\n",
-              stderr);
-        return 0;
-    }
-
-    /* join gzip files on command line and write to stdout */
-    gzinit(&crc, &tot, stdout);
-    while (argc--)
-        gzcopy(*argv++, argc, &crc, &tot, stdout);
-
-    /* done */
-    return 0;
-}

crates/libz-sys/src/zlib/examples/gzlog.c

diff --git a/crates/libz-sys/src/zlib/examples/gzlog.c b/crates/libz-sys/src/zlib/examples/gzlog.c
deleted file mode 100644
index b8c2927..0000000
--- a/crates/libz-sys/src/zlib/examples/gzlog.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*
- * gzlog.c
- * Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved
- * For conditions of distribution and use, see copyright notice in gzlog.h
- * version 2.2, 14 Aug 2012
- */
-
-/*
-   gzlog provides a mechanism for frequently appending short strings to a gzip
-   file that is efficient both in execution time and compression ratio.  The
-   strategy is to write the short strings in an uncompressed form to the end of
-   the gzip file, only compressing when the amount of uncompressed data has
-   reached a given threshold.
-
-   gzlog also provides protection against interruptions in the process due to
-   system crashes.  The status of the operation is recorded in an extra field
-   in the gzip file, and is only updated once the gzip file is brought to a
-   valid state.  The last data to be appended or compressed is saved in an
-   auxiliary file, so that if the operation is interrupted, it can be completed
-   the next time an append operation is attempted.
-
-   gzlog maintains another auxiliary file with the last 32K of data from the
-   compressed portion, which is preloaded for the compression of the subsequent
-   data.  This minimizes the impact to the compression ratio of appending.
- */
-
-/*
-   Operations Concept:
-
-   Files (log name "foo"):
-   foo.gz -- gzip file with the complete log
-   foo.add -- last message to append or last data to compress
-   foo.dict -- dictionary of the last 32K of data for next compression
-   foo.temp -- temporary dictionary file for compression after this one
-   foo.lock -- lock file for reading and writing the other files
-   foo.repairs -- log file for log file recovery operations (not compressed)
-
-   gzip file structure:
-   - fixed-length (no file name) header with extra field (see below)
-   - compressed data ending initially with empty stored block
-   - uncompressed data filling out originally empty stored block and
-     subsequent stored blocks as needed (16K max each)
-   - gzip trailer
-   - no junk at end (no other gzip streams)
-
-   When appending data, the information in the first three items above plus the
-   foo.add file are sufficient to recover an interrupted append operation.  The
-   extra field has the necessary information to restore the start of the last
-   stored block and determine where to append the data in the foo.add file, as
-   well as the crc and length of the gzip data before the append operation.
-
-   The foo.add file is created before the gzip file is marked for append, and
-   deleted after the gzip file is marked as complete.  So if the append
-   operation is interrupted, the data to add will still be there.  If due to
-   some external force, the foo.add file gets deleted between when the append
-   operation was interrupted and when recovery is attempted, the gzip file will
-   still be restored, but without the appended data.
-
-   When compressing data, the information in the first two items above plus the
-   foo.add file are sufficient to recover an interrupted compress operation.
-   The extra field has the necessary information to find the end of the
-   compressed data, and contains both the crc and length of just the compressed
-   data and of the complete set of data including the contents of the foo.add
-   file.
-
-   Again, the foo.add file is maintained during the compress operation in case
-   of an interruption.  If in the unlikely event the foo.add file with the data
-   to be compressed is missing due to some external force, a gzip file with
-   just the previous compressed data will be reconstructed.  In this case, all
-   of the data that was to be compressed is lost (approximately one megabyte).
-   This will not occur if all that happened was an interruption of the compress
-   operation.
-
-   The third state that is marked is the replacement of the old dictionary with
-   the new dictionary after a compress operation.  Once compression is
-   complete, the gzip file is marked as being in the replace state.  This
-   completes the gzip file, so an interrupt after being so marked does not
-   result in recompression.  Then the dictionary file is replaced, and the gzip
-   file is marked as completed.  This state prevents the possibility of
-   restarting compression with the wrong dictionary file.
-
-   All three operations are wrapped by a lock/unlock procedure.  In order to
-   gain exclusive access to the log files, first a foo.lock file must be
-   exclusively created.  When all operations are complete, the lock is
-   released by deleting the foo.lock file.  If when attempting to create the
-   lock file, it already exists and the modify time of the lock file is more
-   than five minutes old (set by the PATIENCE define below), then the old
-   lock file is considered stale and deleted, and the exclusive creation of
-   the lock file is retried.  To assure that there are no false assessments
-   of the staleness of the lock file, the operations periodically touch the
-   lock file to update the modified date.
-
-   Following is the definition of the extra field with all of the information
-   required to enable the above append and compress operations and their
-   recovery if interrupted.  Multi-byte values are stored little endian
-   (consistent with the gzip format).  File pointers are eight bytes long.
-   The crc's and lengths for the gzip trailer are four bytes long.  (Note that
-   the length at the end of a gzip file is used for error checking only, and
-   for large files is actually the length modulo 2^32.)  The stored block
-   length is two bytes long.  The gzip extra field two-byte identification is
-   "ap" for append.  It is assumed that writing the extra field to the file is
-   an "atomic" operation.  That is, either all of the extra field is written
-   to the file, or none of it is, if the operation is interrupted right at the
-   point of updating the extra field.  This is a reasonable assumption, since
-   the extra field is within the first 52 bytes of the file, which is smaller
-   than any expected block size for a mass storage device (usually 512 bytes or
-   larger).
-
-   Extra field (35 bytes):
-   - Pointer to first stored block length -- this points to the two-byte length
-     of the first stored block, which is followed by the two-byte, one's
-     complement of that length.  The stored block length is preceded by the
-     three-bit header of the stored block, which is the actual start of the
-     stored block in the deflate format.  See the bit offset field below.
-   - Pointer to the last stored block length.  This is the same as above, but
-     for the last stored block of the uncompressed data in the gzip file.
-     Initially this is the same as the first stored block length pointer.
-     When the stored block gets to 16K (see the MAX_STORE define), then a new
-     stored block as added, at which point the last stored block length pointer
-     is different from the first stored block length pointer.  When they are
-     different, the first bit of the last stored block header is eight bits, or
-     one byte back from the block length.
-   - Compressed data crc and length.  This is the crc and length of the data
-     that is in the compressed portion of the deflate stream.  These are used
-     only in the event that the foo.add file containing the data to compress is
-     lost after a compress operation is interrupted.
-   - Total data crc and length.  This is the crc and length of all of the data
-     stored in the gzip file, compressed and uncompressed.  It is used to
-     reconstruct the gzip trailer when compressing, as well as when recovering
-     interrupted operations.
-   - Final stored block length.  This is used to quickly find where to append,
-     and allows the restoration of the original final stored block state when
-     an append operation is interrupted.
-   - First stored block start as the number of bits back from the final stored
-     block first length byte.  This value is in the range of 3..10, and is
-     stored as the low three bits of the final byte of the extra field after
-     subtracting three (0..7).  This allows the last-block bit of the stored
-     block header to be updated when a new stored block is added, for the case
-     when the first stored block and the last stored block are the same.  (When
-     they are different, the numbers of bits back is known to be eight.)  This
-     also allows for new compressed data to be appended to the old compressed
-     data in the compress operation, overwriting the previous first stored
-     block, or for the compressed data to be terminated and a valid gzip file
-     reconstructed on the off chance that a compression operation was
-     interrupted and the data to compress in the foo.add file was deleted.
-   - The operation in process.  This is the next two bits in the last byte (the
-     bits under the mask 0x18).  The are interpreted as 0: nothing in process,
-     1: append in process, 2: compress in process, 3: replace in process.
-   - The top three bits of the last byte in the extra field are reserved and
-     are currently set to zero.
-
-   Main procedure:
-   - Exclusively create the foo.lock file using the O_CREAT and O_EXCL modes of
-     the system open() call.  If the modify time of an existing lock file is
-     more than PATIENCE seconds old, then the lock file is deleted and the
-     exclusive create is retried.
-   - Load the extra field from the foo.gz file, and see if an operation was in
-     progress but not completed.  If so, apply the recovery procedure below.
-   - Perform the append procedure with the provided data.
-   - If the uncompressed data in the foo.gz file is 1MB or more, apply the
-     compress procedure.
-   - Delete the foo.lock file.
-
-   Append procedure:
-   - Put what to append in the foo.add file so that the operation can be
-     restarted if this procedure is interrupted.
-   - Mark the foo.gz extra field with the append operation in progress.
-   + Restore the original last-block bit and stored block length of the last
-     stored block from the information in the extra field, in case a previous
-     append operation was interrupted.
-   - Append the provided data to the last stored block, creating new stored
-     blocks as needed and updating the stored blocks last-block bits and
-     lengths.
-   - Update the crc and length with the new data, and write the gzip trailer.
-   - Write over the extra field (with a single write operation) with the new
-     pointers, lengths, and crc's, and mark the gzip file as not in process.
-     Though there is still a foo.add file, it will be ignored since nothing
-     is in process.  If a foo.add file is leftover from a previously
-     completed operation, it is truncated when writing new data to it.
-   - Delete the foo.add file.
-
-   Compress and replace procedures:
-   - Read all of the uncompressed data in the stored blocks in foo.gz and write
-     it to foo.add.  Also write foo.temp with the last 32K of that data to
-     provide a dictionary for the next invocation of this procedure.
-   - Rewrite the extra field marking foo.gz with a compression in process.
-   * If there is no data provided to compress (due to a missing foo.add file
-     when recovering), reconstruct and truncate the foo.gz file to contain
-     only the previous compressed data and proceed to the step after the next
-     one.  Otherwise ...
-   - Compress the data with the dictionary in foo.dict, and write to the
-     foo.gz file starting at the bit immediately following the last previously
-     compressed block.  If there is no foo.dict, proceed anyway with the
-     compression at slightly reduced efficiency.  (For the foo.dict file to be
-     missing requires some external failure beyond simply the interruption of
-     a compress operation.)  During this process, the foo.lock file is
-     periodically touched to assure that that file is not considered stale by
-     another process before we're done.  The deflation is terminated with a
-     non-last empty static block (10 bits long), that is then located and
-     written over by a last-bit-set empty stored block.
-   - Append the crc and length of the data in the gzip file (previously
-     calculated during the append operations).
-   - Write over the extra field with the updated stored block offsets, bits
-     back, crc's, and lengths, and mark foo.gz as in process for a replacement
-     of the dictionary.
-   @ Delete the foo.add file.
-   - Replace foo.dict with foo.temp.
-   - Write over the extra field, marking foo.gz as complete.
-
-   Recovery procedure:
-   - If not a replace recovery, read in the foo.add file, and provide that data
-     to the appropriate recovery below.  If there is no foo.add file, provide
-     a zero data length to the recovery.  In that case, the append recovery
-     restores the foo.gz to the previous compressed + uncompressed data state.
-     For the the compress recovery, a missing foo.add file results in foo.gz
-     being restored to the previous compressed-only data state.
-   - Append recovery:
-     - Pick up append at + step above
-   - Compress recovery:
-     - Pick up compress at * step above
-   - Replace recovery:
-     - Pick up compress at @ step above
-   - Log the repair with a date stamp in foo.repairs
- */
-
-#include <sys/types.h>
-#include <stdio.h>      /* rename, fopen, fprintf, fclose */
-#include <stdlib.h>     /* malloc, free */
-#include <string.h>     /* strlen, strrchr, strcpy, strncpy, strcmp */
-#include <fcntl.h>      /* open */
-#include <unistd.h>     /* lseek, read, write, close, unlink, sleep, */
-                        /* ftruncate, fsync */
-#include <errno.h>      /* errno */
-#include <time.h>       /* time, ctime */
-#include <sys/stat.h>   /* stat */
-#include <sys/time.h>   /* utimes */
-#include "zlib.h"       /* crc32 */
-
-#include "gzlog.h"      /* header for external access */
-
-#define local static
-typedef unsigned int uint;
-typedef unsigned long ulong;
-
-/* Macro for debugging to deterministically force recovery operations */
-#ifdef GZLOG_DEBUG
-    #include <setjmp.h>         /* longjmp */
-    jmp_buf gzlog_jump;         /* where to go back to */
-    int gzlog_bail = 0;         /* which point to bail at (1..8) */
-    int gzlog_count = -1;       /* number of times through to wait */
-#   define BAIL(n) do { if (n == gzlog_bail && gzlog_count-- == 0) \
-                            longjmp(gzlog_jump, gzlog_bail); } while (0)
-#else
-#   define BAIL(n)
-#endif
-
-/* how old the lock file can be in seconds before considering it stale */
-#define PATIENCE 300
-
-/* maximum stored block size in Kbytes -- must be in 1..63 */
-#define MAX_STORE 16
-
-/* number of stored Kbytes to trigger compression (must be >= 32 to allow
-   dictionary construction, and <= 204 * MAX_STORE, in order for >> 10 to
-   discard the stored block headers contribution of five bytes each) */
-#define TRIGGER 1024
-
-/* size of a deflate dictionary (this cannot be changed) */
-#define DICT 32768U
-
-/* values for the operation (2 bits) */
-#define NO_OP 0
-#define APPEND_OP 1
-#define COMPRESS_OP 2
-#define REPLACE_OP 3
-
-/* macros to extract little-endian integers from an unsigned byte buffer */
-#define PULL2(p) ((p)[0]+((uint)((p)[1])<<8))
-#define PULL4(p) (PULL2(p)+((ulong)PULL2(p+2)<<16))
-#define PULL8(p) (PULL4(p)+((off_t)PULL4(p+4)<<32))
-
-/* macros to store integers into a byte buffer in little-endian order */
-#define PUT2(p,a) do {(p)[0]=a;(p)[1]=(a)>>8;} while(0)
-#define PUT4(p,a) do {PUT2(p,a);PUT2(p+2,a>>16);} while(0)
-#define PUT8(p,a) do {PUT4(p,a);PUT4(p+4,a>>32);} while(0)
-
-/* internal structure for log information */
-#define LOGID "\106\035\172"    /* should be three non-zero characters */
-struct log {
-    char id[4];     /* contains LOGID to detect inadvertent overwrites */
-    int fd;         /* file descriptor for .gz file, opened read/write */
-    char *path;     /* allocated path, e.g. "/var/log/foo" or "foo" */
-    char *end;      /* end of path, for appending suffices such as ".gz" */
-    off_t first;    /* offset of first stored block first length byte */
-    int back;       /* location of first block id in bits back from first */
-    uint stored;    /* bytes currently in last stored block */
-    off_t last;     /* offset of last stored block first length byte */
-    ulong ccrc;     /* crc of compressed data */
-    ulong clen;     /* length (modulo 2^32) of compressed data */
-    ulong tcrc;     /* crc of total data */
-    ulong tlen;     /* length (modulo 2^32) of total data */
-    time_t lock;    /* last modify time of our lock file */
-};
-
-/* gzip header for gzlog */
-local unsigned char log_gzhead[] = {
-    0x1f, 0x8b,                 /* magic gzip id */
-    8,                          /* compression method is deflate */
-    4,                          /* there is an extra field (no file name) */
-    0, 0, 0, 0,                 /* no modification time provided */
-    0, 0xff,                    /* no extra flags, no OS specified */
-    39, 0, 'a', 'p', 35, 0      /* extra field with "ap" subfield */
-                                /* 35 is EXTRA, 39 is EXTRA + 4 */
-};
-
-#define HEAD sizeof(log_gzhead)     /* should be 16 */
-
-/* initial gzip extra field content (52 == HEAD + EXTRA + 1) */
-local unsigned char log_gzext[] = {
-    52, 0, 0, 0, 0, 0, 0, 0,    /* offset of first stored block length */
-    52, 0, 0, 0, 0, 0, 0, 0,    /* offset of last stored block length */
-    0, 0, 0, 0, 0, 0, 0, 0,     /* compressed data crc and length */
-    0, 0, 0, 0, 0, 0, 0, 0,     /* total data crc and length */
-    0, 0,                       /* final stored block data length */
-    5                           /* op is NO_OP, last bit 8 bits back */
-};
-
-#define EXTRA sizeof(log_gzext)     /* should be 35 */
-
-/* initial gzip data and trailer */
-local unsigned char log_gzbody[] = {
-    1, 0, 0, 0xff, 0xff,        /* empty stored block (last) */
-    0, 0, 0, 0,                 /* crc */
-    0, 0, 0, 0                  /* uncompressed length */
-};
-
-#define BODY sizeof(log_gzbody)
-
-/* Exclusively create foo.lock in order to negotiate exclusive access to the
-   foo.* files.  If the modify time of an existing lock file is greater than
-   PATIENCE seconds in the past, then consider the lock file to have been
-   abandoned, delete it, and try the exclusive create again.  Save the lock
-   file modify time for verification of ownership.  Return 0 on success, or -1
-   on failure, usually due to an access restriction or invalid path.  Note that
-   if stat() or unlink() fails, it may be due to another process noticing the
-   abandoned lock file a smidge sooner and deleting it, so those are not
-   flagged as an error. */
-local int log_lock(struct log *log)
-{
-    int fd;
-    struct stat st;
-
-    strcpy(log->end, ".lock");
-    while ((fd = open(log->path, O_CREAT | O_EXCL, 0644)) < 0) {
-        if (errno != EEXIST)
-            return -1;
-        if (stat(log->path, &st) == 0 && time(NULL) - st.st_mtime > PATIENCE) {
-            unlink(log->path);
-            continue;
-        }
-        sleep(2);       /* relinquish the CPU for two seconds while waiting */
-    }
-    close(fd);
-    if (stat(log->path, &st) == 0)
-        log->lock = st.st_mtime;
-    return 0;
-}
-
-/* Update the modify time of the lock file to now, in order to prevent another
-   task from thinking that the lock is stale.  Save the lock file modify time
-   for verification of ownership. */
-local void log_touch(struct log *log)
-{
-    struct stat st;
-
-    strcpy(log->end, ".lock");
-    utimes(log->path, NULL);
-    if (stat(log->path, &st) == 0)
-        log->lock = st.st_mtime;
-}
-
-/* Check the log file modify time against what is expected.  Return true if
-   this is not our lock.  If it is our lock, touch it to keep it. */
-local int log_check(struct log *log)
-{
-    struct stat st;
-
-    strcpy(log->end, ".lock");
-    if (stat(log->path, &st) || st.st_mtime != log->lock)
-        return 1;
-    log_touch(log);
-    return 0;
-}
-
-/* Unlock a previously acquired lock, but only if it's ours. */
-local void log_unlock(struct log *log)
-{
-    if (log_check(log))
-        return;
-    strcpy(log->end, ".lock");
-    unlink(log->path);
-    log->lock = 0;
-}
-
-/* Check the gzip header and read in the extra field, filling in the values in
-   the log structure.  Return op on success or -1 if the gzip header was not as
-   expected.  op is the current operation in progress last written to the extra
-   field.  This assumes that the gzip file has already been opened, with the
-   file descriptor log->fd. */
-local int log_head(struct log *log)
-{
-    int op;
-    unsigned char buf[HEAD + EXTRA];
-
-    if (lseek(log->fd, 0, SEEK_SET) < 0 ||
-        read(log->fd, buf, HEAD + EXTRA) != HEAD + EXTRA ||
-        memcmp(buf, log_gzhead, HEAD)) {
-        return -1;
-    }
-    log->first = PULL8(buf + HEAD);
-    log->last = PULL8(buf + HEAD + 8);
-    log->ccrc = PULL4(buf + HEAD + 16);
-    log->clen = PULL4(buf + HEAD + 20);
-    log->tcrc = PULL4(buf + HEAD + 24);
-    log->tlen = PULL4(buf + HEAD + 28);
-    log->stored = PULL2(buf + HEAD + 32);
-    log->back = 3 + (buf[HEAD + 34] & 7);
-    op = (buf[HEAD + 34] >> 3) & 3;
-    return op;
-}
-
-/* Write over the extra field contents, marking the operation as op.  Use fsync
-   to assure that the device is written to, and in the requested order.  This
-   operation, and only this operation, is assumed to be atomic in order to
-   assure that the log is recoverable in the event of an interruption at any
-   point in the process.  Return -1 if the write to foo.gz failed. */
-local int log_mark(struct log *log, int op)
-{
-    int ret;
-    unsigned char ext[EXTRA];
-
-    PUT8(ext, log->first);
-    PUT8(ext + 8, log->last);
-    PUT4(ext + 16, log->ccrc);
-    PUT4(ext + 20, log->clen);
-    PUT4(ext + 24, log->tcrc);
-    PUT4(ext + 28, log->tlen);
-    PUT2(ext + 32, log->stored);
-    ext[34] = log->back - 3 + (op << 3);
-    fsync(log->fd);
-    ret = lseek(log->fd, HEAD, SEEK_SET) < 0 ||
-          write(log->fd, ext, EXTRA) != EXTRA ? -1 : 0;
-    fsync(log->fd);
-    return ret;
-}
-
-/* Rewrite the last block header bits and subsequent zero bits to get to a byte
-   boundary, setting the last block bit if last is true, and then write the
-   remainder of the stored block header (length and one's complement).  Leave
-   the file pointer after the end of the last stored block data.  Return -1 if
-   there is a read or write failure on the foo.gz file */
-local int log_last(struct log *log, int last)
-{
-    int back, len, mask;
-    unsigned char buf[6];
-
-    /* determine the locations of the bytes and bits to modify */
-    back = log->last == log->first ? log->back : 8;
-    len = back > 8 ? 2 : 1;                 /* bytes back from log->last */
-    mask = 0x80 >> ((back - 1) & 7);        /* mask for block last-bit */
-
-    /* get the byte to modify (one or two back) into buf[0] -- don't need to
-       read the byte if the last-bit is eight bits back, since in that case
-       the entire byte will be modified */
-    buf[0] = 0;
-    if (back != 8 && (lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
-                      read(log->fd, buf, 1) != 1))
-        return -1;
-
-    /* change the last-bit of the last stored block as requested -- note
-       that all bits above the last-bit are set to zero, per the type bits
-       of a stored block being 00 and per the convention that the bits to
-       bring the stream to a byte boundary are also zeros */
-    buf[1] = 0;
-    buf[2 - len] = (*buf & (mask - 1)) + (last ? mask : 0);
-
-    /* write the modified stored block header and lengths, move the file
-       pointer to after the last stored block data */
-    PUT2(buf + 2, log->stored);
-    PUT2(buf + 4, log->stored ^ 0xffff);
-    return lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
-           write(log->fd, buf + 2 - len, len + 4) != len + 4 ||
-           lseek(log->fd, log->stored, SEEK_CUR) < 0 ? -1 : 0;
-}
-
-/* Append len bytes from data to the locked and open log file.  len may be zero
-   if recovering and no .add file was found.  In that case, the previous state
-   of the foo.gz file is restored.  The data is appended uncompressed in
-   deflate stored blocks.  Return -1 if there was an error reading or writing
-   the foo.gz file. */
-local int log_append(struct log *log, unsigned char *data, size_t len)
-{
-    uint put;
-    off_t end;
-    unsigned char buf[8];
-
-    /* set the last block last-bit and length, in case recovering an
-       interrupted append, then position the file pointer to append to the
-       block */
-    if (log_last(log, 1))
-        return -1;
-
-    /* append, adding stored blocks and updating the offset of the last stored
-       block as needed, and update the total crc and length */
-    while (len) {
-        /* append as much as we can to the last block */
-        put = (MAX_STORE << 10) - log->stored;
-        if (put > len)
-            put = (uint)len;
-        if (put) {
-            if (write(log->fd, data, put) != put)
-                return -1;
-            BAIL(1);
-            log->tcrc = crc32(log->tcrc, data, put);
-            log->tlen += put;
-            log->stored += put;
-            data += put;
-            len -= put;
-        }
-
-        /* if we need to, add a new empty stored block */
-        if (len) {
-            /* mark current block as not last */
-            if (log_last(log, 0))
-                return -1;
-
-            /* point to new, empty stored block */
-            log->last += 4 + log->stored + 1;
-            log->stored = 0;
-        }
-
-        /* mark last block as last, update its length */
-        if (log_last(log, 1))
-            return -1;
-        BAIL(2);
-    }
-
-    /* write the new crc and length trailer, and truncate just in case (could
-       be recovering from partial append with a missing foo.add file) */
-    PUT4(buf, log->tcrc);
-    PUT4(buf + 4, log->tlen);
-    if (write(log->fd, buf, 8) != 8 ||
-        (end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
-        return -1;
-
-    /* write the extra field, marking the log file as done, delete .add file */
-    if (log_mark(log, NO_OP))
-        return -1;
-    strcpy(log->end, ".add");
-    unlink(log->path);          /* ignore error, since may not exist */
-    return 0;
-}
-
-/* Replace the foo.dict file with the foo.temp file.  Also delete the foo.add
-   file, since the compress operation may have been interrupted before that was
-   done.  Returns 1 if memory could not be allocated, or -1 if reading or
-   writing foo.gz fails, or if the rename fails for some reason other than
-   foo.temp not existing.  foo.temp not existing is a permitted error, since
-   the replace operation may have been interrupted after the rename is done,
-   but before foo.gz is marked as complete. */
-local int log_replace(struct log *log)
-{
-    int ret;
-    char *dest;
-
-    /* delete foo.add file */
-    strcpy(log->end, ".add");
-    unlink(log->path);         /* ignore error, since may not exist */
-    BAIL(3);
-
-    /* rename foo.name to foo.dict, replacing foo.dict if it exists */
-    strcpy(log->end, ".dict");
-    dest = malloc(strlen(log->path) + 1);
-    if (dest == NULL)
-        return -2;
-    strcpy(dest, log->path);
-    strcpy(log->end, ".temp");
-    ret = rename(log->path, dest);
-    free(dest);
-    if (ret && errno != ENOENT)
-        return -1;
-    BAIL(4);
-
-    /* mark the foo.gz file as done */
-    return log_mark(log, NO_OP);
-}
-
-/* Compress the len bytes at data and append the compressed data to the
-   foo.gz deflate data immediately after the previous compressed data.  This
-   overwrites the previous uncompressed data, which was stored in foo.add
-   and is the data provided in data[0..len-1].  If this operation is
-   interrupted, it picks up at the start of this routine, with the foo.add
-   file read in again.  If there is no data to compress (len == 0), then we
-   simply terminate the foo.gz file after the previously compressed data,
-   appending a final empty stored block and the gzip trailer.  Return -1 if
-   reading or writing the log.gz file failed, or -2 if there was a memory
-   allocation failure. */
-local int log_compress(struct log *log, unsigned char *data, size_t len)
-{
-    int fd;
-    uint got, max;
-    ssize_t dict;
-    off_t end;
-    z_stream strm;
-    unsigned char buf[DICT];
-
-    /* compress and append compressed data */
-    if (len) {
-        /* set up for deflate, allocating memory */
-        strm.zalloc = Z_NULL;
-        strm.zfree = Z_NULL;
-        strm.opaque = Z_NULL;
-        if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8,
-                         Z_DEFAULT_STRATEGY) != Z_OK)
-            return -2;
-
-        /* read in dictionary (last 32K of data that was compressed) */
-        strcpy(log->end, ".dict");
-        fd = open(log->path, O_RDONLY, 0);
-        if (fd >= 0) {
-            dict = read(fd, buf, DICT);
-            close(fd);
-            if (dict < 0) {
-                deflateEnd(&strm);
-                return -1;
-            }
-            if (dict)
-                deflateSetDictionary(&strm, buf, (uint)dict);
-        }
-        log_touch(log);
-
-        /* prime deflate with last bits of previous block, position write
-           pointer to write those bits and overwrite what follows */
-        if (lseek(log->fd, log->first - (log->back > 8 ? 2 : 1),
-                SEEK_SET) < 0 ||
-            read(log->fd, buf, 1) != 1 || lseek(log->fd, -1, SEEK_CUR) < 0) {
-            deflateEnd(&strm);
-            return -1;
-        }
-        deflatePrime(&strm, (8 - log->back) & 7, *buf);
-
-        /* compress, finishing with a partial non-last empty static block */
-        strm.next_in = data;
-        max = (((uint)0 - 1) >> 1) + 1; /* in case int smaller than size_t */
-        do {
-            strm.avail_in = len > max ? max : (uint)len;
-            len -= strm.avail_in;
-            do {
-                strm.avail_out = DICT;
-                strm.next_out = buf;
-                deflate(&strm, len ? Z_NO_FLUSH : Z_PARTIAL_FLUSH);
-                got = DICT - strm.avail_out;
-                if (got && write(log->fd, buf, got) != got) {
-                    deflateEnd(&strm);
-                    return -1;
-                }
-                log_touch(log);
-            } while (strm.avail_out == 0);
-        } while (len);
-        deflateEnd(&strm);
-        BAIL(5);
-
-        /* find start of empty static block -- scanning backwards the first one
-           bit is the second bit of the block, if the last byte is zero, then
-           we know the byte before that has a one in the top bit, since an
-           empty static block is ten bits long */
-        if ((log->first = lseek(log->fd, -1, SEEK_CUR)) < 0 ||
-            read(log->fd, buf, 1) != 1)
-            return -1;
-        log->first++;
-        if (*buf) {
-            log->back = 1;
-            while ((*buf & ((uint)1 << (8 - log->back++))) == 0)
-                ;       /* guaranteed to terminate, since *buf != 0 */
-        }
-        else
-            log->back = 10;
-
-        /* update compressed crc and length */
-        log->ccrc = log->tcrc;
-        log->clen = log->tlen;
-    }
-    else {
-        /* no data to compress -- fix up existing gzip stream */
-        log->tcrc = log->ccrc;
-        log->tlen = log->clen;
-    }
-
-    /* complete and truncate gzip stream */
-    log->last = log->first;
-    log->stored = 0;
-    PUT4(buf, log->tcrc);
-    PUT4(buf + 4, log->tlen);
-    if (log_last(log, 1) || write(log->fd, buf, 8) != 8 ||
-        (end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
-        return -1;
-    BAIL(6);
-
-    /* mark as being in the replace operation */
-    if (log_mark(log, REPLACE_OP))
-        return -1;
-
-    /* execute the replace operation and mark the file as done */
-    return log_replace(log);
-}
-
-/* log a repair record to the .repairs file */
-local void log_log(struct log *log, int op, char *record)
-{
-    time_t now;
-    FILE *rec;
-
-    now = time(NULL);
-    strcpy(log->end, ".repairs");
-    rec = fopen(log->path, "a");
-    if (rec == NULL)
-        return;
-    fprintf(rec, "%.24s %s recovery: %s\n", ctime(&now), op == APPEND_OP ?
-            "append" : (op == COMPRESS_OP ? "compress" : "replace"), record);
-    fclose(rec);
-    return;
-}
-
-/* Recover the interrupted operation op.  First read foo.add for recovering an
-   append or compress operation.  Return -1 if there was an error reading or
-   writing foo.gz or reading an existing foo.add, or -2 if there was a memory
-   allocation failure. */
-local int log_recover(struct log *log, int op)
-{
-    int fd, ret = 0;
-    unsigned char *data = NULL;
-    size_t len = 0;
-    struct stat st;
-
-    /* log recovery */
-    log_log(log, op, "start");
-
-    /* load foo.add file if expected and present */
-    if (op == APPEND_OP || op == COMPRESS_OP) {
-        strcpy(log->end, ".add");
-        if (stat(log->path, &st) == 0 && st.st_size) {
-            len = (size_t)(st.st_size);
-            if ((off_t)len != st.st_size ||
-                    (data = malloc(st.st_size)) == NULL) {
-                log_log(log, op, "allocation failure");
-                return -2;
-            }
-            if ((fd = open(log->path, O_RDONLY, 0)) < 0) {
-                log_log(log, op, ".add file read failure");
-                return -1;
-            }
-            ret = (size_t)read(fd, data, len) != len;
-            close(fd);
-            if (ret) {
-                log_log(log, op, ".add file read failure");
-                return -1;
-            }
-            log_log(log, op, "loaded .add file");
-        }
-        else
-            log_log(log, op, "missing .add file!");
-    }
-
-    /* recover the interrupted operation */
-    switch (op) {
-    case APPEND_OP:
-        ret = log_append(log, data, len);
-        break;
-    case COMPRESS_OP:
-        ret = log_compress(log, data, len);
-        break;
-    case REPLACE_OP:
-        ret = log_replace(log);
-    }
-
-    /* log status */
-    log_log(log, op, ret ? "failure" : "complete");
-
-    /* clean up */
-    if (data != NULL)
-        free(data);
-    return ret;
-}
-
-/* Close the foo.gz file (if open) and release the lock. */
-local void log_close(struct log *log)
-{
-    if (log->fd >= 0)
-        close(log->fd);
-    log->fd = -1;
-    log_unlock(log);
-}
-
-/* Open foo.gz, verify the header, and load the extra field contents, after
-   first creating the foo.lock file to gain exclusive access to the foo.*
-   files.  If foo.gz does not exist or is empty, then write the initial header,
-   extra, and body content of an empty foo.gz log file.  If there is an error
-   creating the lock file due to access restrictions, or an error reading or
-   writing the foo.gz file, or if the foo.gz file is not a proper log file for
-   this object (e.g. not a gzip file or does not contain the expected extra
-   field), then return true.  If there is an error, the lock is released.
-   Otherwise, the lock is left in place. */
-local int log_open(struct log *log)
-{
-    int op;
-
-    /* release open file resource if left over -- can occur if lock lost
-       between gzlog_open() and gzlog_write() */
-    if (log->fd >= 0)
-        close(log->fd);
-    log->fd = -1;
-
-    /* negotiate exclusive access */
-    if (log_lock(log) < 0)
-        return -1;
-
-    /* open the log file, foo.gz */
-    strcpy(log->end, ".gz");
-    log->fd = open(log->path, O_RDWR | O_CREAT, 0644);
-    if (log->fd < 0) {
-        log_close(log);
-        return -1;
-    }
-
-    /* if new, initialize foo.gz with an empty log, delete old dictionary */
-    if (lseek(log->fd, 0, SEEK_END) == 0) {
-        if (write(log->fd, log_gzhead, HEAD) != HEAD ||
-            write(log->fd, log_gzext, EXTRA) != EXTRA ||
-            write(log->fd, log_gzbody, BODY) != BODY) {
-            log_close(log);
-            return -1;
-        }
-        strcpy(log->end, ".dict");
-        unlink(log->path);
-    }
-
-    /* verify log file and load extra field information */
-    if ((op = log_head(log)) < 0) {
-        log_close(log);
-        return -1;
-    }
-
-    /* check for interrupted process and if so, recover */
-    if (op != NO_OP && log_recover(log, op)) {
-        log_close(log);
-        return -1;
-    }
-
-    /* touch the lock file to prevent another process from grabbing it */
-    log_touch(log);
-    return 0;
-}
-
-/* See gzlog.h for the description of the external methods below */
-gzlog *gzlog_open(char *path)
-{
-    size_t n;
-    struct log *log;
-
-    /* check arguments */
-    if (path == NULL || *path == 0)
-        return NULL;
-
-    /* allocate and initialize log structure */
-    log = malloc(sizeof(struct log));
-    if (log == NULL)
-        return NULL;
-    strcpy(log->id, LOGID);
-    log->fd = -1;
-
-    /* save path and end of path for name construction */
-    n = strlen(path);
-    log->path = malloc(n + 9);              /* allow for ".repairs" */
-    if (log->path == NULL) {
-        free(log);
-        return NULL;
-    }
-    strcpy(log->path, path);
-    log->end = log->path + n;
-
-    /* gain exclusive access and verify log file -- may perform a
-       recovery operation if needed */
-    if (log_open(log)) {
-        free(log->path);
-        free(log);
-        return NULL;
-    }
-
-    /* return pointer to log structure */
-    return log;
-}
-
-/* gzlog_compress() return values:
-    0: all good
-   -1: file i/o error (usually access issue)
-   -2: memory allocation failure
-   -3: invalid log pointer argument */
-int gzlog_compress(gzlog *logd)
-{
-    int fd, ret;
-    uint block;
-    size_t len, next;
-    unsigned char *data, buf[5];
-    struct log *log = logd;
-
-    /* check arguments */
-    if (log == NULL || strcmp(log->id, LOGID))
-        return -3;
-
-    /* see if we lost the lock -- if so get it again and reload the extra
-       field information (it probably changed), recover last operation if
-       necessary */
-    if (log_check(log) && log_open(log))
-        return -1;
-
-    /* create space for uncompressed data */
-    len = ((size_t)(log->last - log->first) & ~(((size_t)1 << 10) - 1)) +
-          log->stored;
-    if ((data = malloc(len)) == NULL)
-        return -2;
-
-    /* do statement here is just a cheap trick for error handling */
-    do {
-        /* read in the uncompressed data */
-        if (lseek(log->fd, log->first - 1, SEEK_SET) < 0)
-            break;
-        next = 0;
-        while (next < len) {
-            if (read(log->fd, buf, 5) != 5)
-                break;
-            block = PULL2(buf + 1);
-            if (next + block > len ||
-                read(log->fd, (char *)data + next, block) != block)
-                break;
-            next += block;
-        }
-        if (lseek(log->fd, 0, SEEK_CUR) != log->last + 4 + log->stored)
-            break;
-        log_touch(log);
-
-        /* write the uncompressed data to the .add file */
-        strcpy(log->end, ".add");
-        fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-        if (fd < 0)
-            break;
-        ret = (size_t)write(fd, data, len) != len;
-        if (ret | close(fd))
-            break;
-        log_touch(log);
-
-        /* write the dictionary for the next compress to the .temp file */
-        strcpy(log->end, ".temp");
-        fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-        if (fd < 0)
-            break;
-        next = DICT > len ? len : DICT;
-        ret = (size_t)write(fd, (char *)data + len - next, next) != next;
-        if (ret | close(fd))
-            break;
-        log_touch(log);
-
-        /* roll back to compressed data, mark the compress in progress */
-        log->last = log->first;
-        log->stored = 0;
-        if (log_mark(log, COMPRESS_OP))
-            break;
-        BAIL(7);
-
-        /* compress and append the data (clears mark) */
-        ret = log_compress(log, data, len);
-        free(data);
-        return ret;
-    } while (0);
-
-    /* broke out of do above on i/o error */
-    free(data);
-    return -1;
-}
-
-/* gzlog_write() return values:
-    0: all good
-   -1: file i/o error (usually access issue)
-   -2: memory allocation failure
-   -3: invalid log pointer argument */
-int gzlog_write(gzlog *logd, void *data, size_t len)
-{
-    int fd, ret;
-    struct log *log = logd;
-
-    /* check arguments */
-    if (log == NULL || strcmp(log->id, LOGID))
-        return -3;
-    if (data == NULL || len <= 0)
-        return 0;
-
-    /* see if we lost the lock -- if so get it again and reload the extra
-       field information (it probably changed), recover last operation if
-       necessary */
-    if (log_check(log) && log_open(log))
-        return -1;
-
-    /* create and write .add file */
-    strcpy(log->end, ".add");
-    fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-    if (fd < 0)
-        return -1;
-    ret = (size_t)write(fd, data, len) != len;
-    if (ret | close(fd))
-        return -1;
-    log_touch(log);
-
-    /* mark log file with append in progress */
-    if (log_mark(log, APPEND_OP))
-        return -1;
-    BAIL(8);
-
-    /* append data (clears mark) */
-    if (log_append(log, data, len))
-        return -1;
-
-    /* check to see if it's time to compress -- if not, then done */
-    if (((log->last - log->first) >> 10) + (log->stored >> 10) < TRIGGER)
-        return 0;
-
-    /* time to compress */
-    return gzlog_compress(log);
-}
-
-/* gzlog_close() return values:
-    0: ok
-   -3: invalid log pointer argument */
-int gzlog_close(gzlog *logd)
-{
-    struct log *log = logd;
-
-    /* check arguments */
-    if (log == NULL || strcmp(log->id, LOGID))
-        return -3;
-
-    /* close the log file and release the lock */
-    log_close(log);
-
-    /* free structure and return */
-    if (log->path != NULL)
-        free(log->path);
-    strcpy(log->id, "bad");
-    free(log);
-    return 0;
-}

crates/libz-sys/src/zlib/examples/gzlog.h

diff --git a/crates/libz-sys/src/zlib/examples/gzlog.h b/crates/libz-sys/src/zlib/examples/gzlog.h
deleted file mode 100644
index 86f0cec..0000000
--- a/crates/libz-sys/src/zlib/examples/gzlog.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* gzlog.h
-  Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved
-  version 2.2, 14 Aug 2012
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-/* Version History:
-   1.0  26 Nov 2004  First version
-   2.0  25 Apr 2008  Complete redesign for recovery of interrupted operations
-                     Interface changed slightly in that now path is a prefix
-                     Compression now occurs as needed during gzlog_write()
-                     gzlog_write() now always leaves the log file as valid gzip
-   2.1   8 Jul 2012  Fix argument checks in gzlog_compress() and gzlog_write()
-   2.2  14 Aug 2012  Clean up signed comparisons
- */
-
-/*
-   The gzlog object allows writing short messages to a gzipped log file,
-   opening the log file locked for small bursts, and then closing it.  The log
-   object works by appending stored (uncompressed) data to the gzip file until
-   1 MB has been accumulated.  At that time, the stored data is compressed, and
-   replaces the uncompressed data in the file.  The log file is truncated to
-   its new size at that time.  After each write operation, the log file is a
-   valid gzip file that can decompressed to recover what was written.
-
-   The gzlog operations can be interupted at any point due to an application or
-   system crash, and the log file will be recovered the next time the log is
-   opened with gzlog_open().
- */
-
-#ifndef GZLOG_H
-#define GZLOG_H
-
-/* gzlog object type */
-typedef void gzlog;
-
-/* Open a gzlog object, creating the log file if it does not exist.  Return
-   NULL on error.  Note that gzlog_open() could take a while to complete if it
-   has to wait to verify that a lock is stale (possibly for five minutes), or
-   if there is significant contention with other instantiations of this object
-   when locking the resource.  path is the prefix of the file names created by
-   this object.  If path is "foo", then the log file will be "foo.gz", and
-   other auxiliary files will be created and destroyed during the process:
-   "foo.dict" for a compression dictionary, "foo.temp" for a temporary (next)
-   dictionary, "foo.add" for data being added or compressed, "foo.lock" for the
-   lock file, and "foo.repairs" to log recovery operations performed due to
-   interrupted gzlog operations.  A gzlog_open() followed by a gzlog_close()
-   will recover a previously interrupted operation, if any. */
-gzlog *gzlog_open(char *path);
-
-/* Write to a gzlog object.  Return zero on success, -1 if there is a file i/o
-   error on any of the gzlog files (this should not happen if gzlog_open()
-   succeeded, unless the device has run out of space or leftover auxiliary
-   files have permissions or ownership that prevent their use), -2 if there is
-   a memory allocation failure, or -3 if the log argument is invalid (e.g. if
-   it was not created by gzlog_open()).  This function will write data to the
-   file uncompressed, until 1 MB has been accumulated, at which time that data
-   will be compressed.  The log file will be a valid gzip file upon successful
-   return. */
-int gzlog_write(gzlog *log, void *data, size_t len);
-
-/* Force compression of any uncompressed data in the log.  This should be used
-   sparingly, if at all.  The main application would be when a log file will
-   not be appended to again.  If this is used to compress frequently while
-   appending, it will both significantly increase the execution time and
-   reduce the compression ratio.  The return codes are the same as for
-   gzlog_write(). */
-int gzlog_compress(gzlog *log);
-
-/* Close a gzlog object.  Return zero on success, -3 if the log argument is
-   invalid.  The log object is freed, and so cannot be referenced again. */
-int gzlog_close(gzlog *log);
-
-#endif

crates/libz-sys/src/zlib/examples/zlib_how.html

diff --git a/crates/libz-sys/src/zlib/examples/zlib_how.html b/crates/libz-sys/src/zlib/examples/zlib_how.html
deleted file mode 100644
index 444ff1c..0000000
--- a/crates/libz-sys/src/zlib/examples/zlib_how.html
+++ /dev/null
@@ -1,545 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-  "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>zlib Usage Example</title>
-<!--  Copyright (c) 2004, 2005 Mark Adler.  -->
-</head>
-<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#00A000">
-<h2 align="center"> zlib Usage Example </h2>
-We often get questions about how the <tt>deflate()</tt> and <tt>inflate()</tt> functions should be used.
-Users wonder when they should provide more input, when they should use more output,
-what to do with a <tt>Z_BUF_ERROR</tt>, how to make sure the process terminates properly, and
-so on.  So for those who have read <tt>zlib.h</tt> (a few times), and
-would like further edification, below is an annotated example in C of simple routines to compress and decompress
-from an input file to an output file using <tt>deflate()</tt> and <tt>inflate()</tt> respectively.  The
-annotations are interspersed between lines of the code.  So please read between the lines.
-We hope this helps explain some of the intricacies of <em>zlib</em>.
-<p>
-Without further adieu, here is the program <a href="zpipe.c"><tt>zpipe.c</tt></a>:
-<pre><b>
-/* zpipe.c: example of proper use of zlib's inflate() and deflate()
-   Not copyrighted -- provided to the public domain
-   Version 1.4  11 December 2005  Mark Adler */
-
-/* Version history:
-   1.0  30 Oct 2004  First version
-   1.1   8 Nov 2004  Add void casting for unused return values
-                     Use switch statement for inflate() return values
-   1.2   9 Nov 2004  Add assertions to document zlib guarantees
-   1.3   6 Apr 2005  Remove incorrect assertion in inf()
-   1.4  11 Dec 2005  Add hack to avoid MSDOS end-of-line conversions
-                     Avoid some compiler warnings for input and output buffers
- */
-</b></pre><!-- -->
-We now include the header files for the required definitions.  From
-<tt>stdio.h</tt> we use <tt>fopen()</tt>, <tt>fread()</tt>, <tt>fwrite()</tt>,
-<tt>feof()</tt>, <tt>ferror()</tt>, and <tt>fclose()</tt> for file i/o, and
-<tt>fputs()</tt> for error messages.  From <tt>string.h</tt> we use
-<tt>strcmp()</tt> for command line argument processing.
-From <tt>assert.h</tt> we use the <tt>assert()</tt> macro.
-From <tt>zlib.h</tt>
-we use the basic compression functions <tt>deflateInit()</tt>,
-<tt>deflate()</tt>, and <tt>deflateEnd()</tt>, and the basic decompression
-functions <tt>inflateInit()</tt>, <tt>inflate()</tt>, and
-<tt>inflateEnd()</tt>.
-<pre><b>
-#include &lt;stdio.h&gt;
-#include &lt;string.h&gt;
-#include &lt;assert.h&gt;
-#include "zlib.h"
-</b></pre><!-- -->
-This is an ugly hack required to avoid corruption of the input and output data on
-Windows/MS-DOS systems.  Without this, those systems would assume that the input and output
-files are text, and try to convert the end-of-line characters from one standard to
-another.  That would corrupt binary data, and in particular would render the compressed data unusable.
-This sets the input and output to binary which suppresses the end-of-line conversions.
-<tt>SET_BINARY_MODE()</tt> will be used later on <tt>stdin</tt> and <tt>stdout</tt>, at the beginning of <tt>main()</tt>.
-<pre><b>
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-#  include &lt;fcntl.h&gt;
-#  include &lt;io.h&gt;
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-</b></pre><!-- -->
-<tt>CHUNK</tt> is simply the buffer size for feeding data to and pulling data
-from the <em>zlib</em> routines.  Larger buffer sizes would be more efficient,
-especially for <tt>inflate()</tt>.  If the memory is available, buffers sizes
-on the order of 128K or 256K bytes should be used.
-<pre><b>
-#define CHUNK 16384
-</b></pre><!-- -->
-The <tt>def()</tt> routine compresses data from an input file to an output file.  The output data
-will be in the <em>zlib</em> format, which is different from the <em>gzip</em> or <em>zip</em>
-formats.  The <em>zlib</em> format has a very small header of only two bytes to identify it as
-a <em>zlib</em> stream and to provide decoding information, and a four-byte trailer with a fast
-check value to verify the integrity of the uncompressed data after decoding.
-<pre><b>
-/* Compress from file source to file dest until EOF on source.
-   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
-   allocated for processing, Z_STREAM_ERROR if an invalid compression
-   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
-   version of the library linked do not match, or Z_ERRNO if there is
-   an error reading or writing the files. */
-int def(FILE *source, FILE *dest, int level)
-{
-</b></pre>
-Here are the local variables for <tt>def()</tt>.  <tt>ret</tt> will be used for <em>zlib</em>
-return codes.  <tt>flush</tt> will keep track of the current flushing state for <tt>deflate()</tt>,
-which is either no flushing, or flush to completion after the end of the input file is reached.
-<tt>have</tt> is the amount of data returned from <tt>deflate()</tt>.  The <tt>strm</tt> structure
-is used to pass information to and from the <em>zlib</em> routines, and to maintain the
-<tt>deflate()</tt> state.  <tt>in</tt> and <tt>out</tt> are the input and output buffers for
-<tt>deflate()</tt>.
-<pre><b>
-    int ret, flush;
-    unsigned have;
-    z_stream strm;
-    unsigned char in[CHUNK];
-    unsigned char out[CHUNK];
-</b></pre><!-- -->
-The first thing we do is to initialize the <em>zlib</em> state for compression using
-<tt>deflateInit()</tt>.  This must be done before the first use of <tt>deflate()</tt>.
-The <tt>zalloc</tt>, <tt>zfree</tt>, and <tt>opaque</tt> fields in the <tt>strm</tt>
-structure must be initialized before calling <tt>deflateInit()</tt>.  Here they are
-set to the <em>zlib</em> constant <tt>Z_NULL</tt> to request that <em>zlib</em> use
-the default memory allocation routines.  An application may also choose to provide
-custom memory allocation routines here.  <tt>deflateInit()</tt> will allocate on the
-order of 256K bytes for the internal state.
-(See <a href="zlib_tech.html"><em>zlib Technical Details</em></a>.)
-<p>
-<tt>deflateInit()</tt> is called with a pointer to the structure to be initialized and
-the compression level, which is an integer in the range of -1 to 9.  Lower compression
-levels result in faster execution, but less compression.  Higher levels result in
-greater compression, but slower execution.  The <em>zlib</em> constant Z_DEFAULT_COMPRESSION,
-equal to -1,
-provides a good compromise between compression and speed and is equivalent to level 6.
-Level 0 actually does no compression at all, and in fact expands the data slightly to produce
-the <em>zlib</em> format (it is not a byte-for-byte copy of the input).
-More advanced applications of <em>zlib</em>
-may use <tt>deflateInit2()</tt> here instead.  Such an application may want to reduce how
-much memory will be used, at some price in compression.  Or it may need to request a
-<em>gzip</em> header and trailer instead of a <em>zlib</em> header and trailer, or raw
-encoding with no header or trailer at all.
-<p>
-We must check the return value of <tt>deflateInit()</tt> against the <em>zlib</em> constant
-<tt>Z_OK</tt> to make sure that it was able to
-allocate memory for the internal state, and that the provided arguments were valid.
-<tt>deflateInit()</tt> will also check that the version of <em>zlib</em> that the <tt>zlib.h</tt>
-file came from matches the version of <em>zlib</em> actually linked with the program.  This
-is especially important for environments in which <em>zlib</em> is a shared library.
-<p>
-Note that an application can initialize multiple, independent <em>zlib</em> streams, which can
-operate in parallel.  The state information maintained in the structure allows the <em>zlib</em>
-routines to be reentrant.
-<pre><b>
-    /* allocate deflate state */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    ret = deflateInit(&amp;strm, level);
-    if (ret != Z_OK)
-        return ret;
-</b></pre><!-- -->
-With the pleasantries out of the way, now we can get down to business.  The outer <tt>do</tt>-loop
-reads all of the input file and exits at the bottom of the loop once end-of-file is reached.
-This loop contains the only call of <tt>deflate()</tt>.  So we must make sure that all of the
-input data has been processed and that all of the output data has been generated and consumed
-before we fall out of the loop at the bottom.
-<pre><b>
-    /* compress until end of file */
-    do {
-</b></pre>
-We start off by reading data from the input file.  The number of bytes read is put directly
-into <tt>avail_in</tt>, and a pointer to those bytes is put into <tt>next_in</tt>.  We also
-check to see if end-of-file on the input has been reached.  If we are at the end of file, then <tt>flush</tt> is set to the
-<em>zlib</em> constant <tt>Z_FINISH</tt>, which is later passed to <tt>deflate()</tt> to
-indicate that this is the last chunk of input data to compress.  We need to use <tt>feof()</tt>
-to check for end-of-file as opposed to seeing if fewer than <tt>CHUNK</tt> bytes have been read.  The
-reason is that if the input file length is an exact multiple of <tt>CHUNK</tt>, we will miss
-the fact that we got to the end-of-file, and not know to tell <tt>deflate()</tt> to finish
-up the compressed stream.  If we are not yet at the end of the input, then the <em>zlib</em>
-constant <tt>Z_NO_FLUSH</tt> will be passed to <tt>deflate</tt> to indicate that we are still
-in the middle of the uncompressed data.
-<p>
-If there is an error in reading from the input file, the process is aborted with
-<tt>deflateEnd()</tt> being called to free the allocated <em>zlib</em> state before returning
-the error.  We wouldn't want a memory leak, now would we?  <tt>deflateEnd()</tt> can be called
-at any time after the state has been initialized.  Once that's done, <tt>deflateInit()</tt> (or
-<tt>deflateInit2()</tt>) would have to be called to start a new compression process.  There is
-no point here in checking the <tt>deflateEnd()</tt> return code.  The deallocation can't fail.
-<pre><b>
-        strm.avail_in = fread(in, 1, CHUNK, source);
-        if (ferror(source)) {
-            (void)deflateEnd(&amp;strm);
-            return Z_ERRNO;
-        }
-        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
-        strm.next_in = in;
-</b></pre><!-- -->
-The inner <tt>do</tt>-loop passes our chunk of input data to <tt>deflate()</tt>, and then
-keeps calling <tt>deflate()</tt> until it is done producing output.  Once there is no more
-new output, <tt>deflate()</tt> is guaranteed to have consumed all of the input, i.e.,
-<tt>avail_in</tt> will be zero.
-<pre><b>
-        /* run deflate() on input until output buffer not full, finish
-           compression if all of source has been read in */
-        do {
-</b></pre>
-Output space is provided to <tt>deflate()</tt> by setting <tt>avail_out</tt> to the number
-of available output bytes and <tt>next_out</tt> to a pointer to that space.
-<pre><b>
-            strm.avail_out = CHUNK;
-            strm.next_out = out;
-</b></pre>
-Now we call the compression engine itself, <tt>deflate()</tt>.  It takes as many of the
-<tt>avail_in</tt> bytes at <tt>next_in</tt> as it can process, and writes as many as
-<tt>avail_out</tt> bytes to <tt>next_out</tt>.  Those counters and pointers are then
-updated past the input data consumed and the output data written.  It is the amount of
-output space available that may limit how much input is consumed.
-Hence the inner loop to make sure that
-all of the input is consumed by providing more output space each time.  Since <tt>avail_in</tt>
-and <tt>next_in</tt> are updated by <tt>deflate()</tt>, we don't have to mess with those
-between <tt>deflate()</tt> calls until it's all used up.
-<p>
-The parameters to <tt>deflate()</tt> are a pointer to the <tt>strm</tt> structure containing
-the input and output information and the internal compression engine state, and a parameter
-indicating whether and how to flush data to the output.  Normally <tt>deflate</tt> will consume
-several K bytes of input data before producing any output (except for the header), in order
-to accumulate statistics on the data for optimum compression.  It will then put out a burst of
-compressed data, and proceed to consume more input before the next burst.  Eventually,
-<tt>deflate()</tt>
-must be told to terminate the stream, complete the compression with provided input data, and
-write out the trailer check value.  <tt>deflate()</tt> will continue to compress normally as long
-as the flush parameter is <tt>Z_NO_FLUSH</tt>.  Once the <tt>Z_FINISH</tt> parameter is provided,
-<tt>deflate()</tt> will begin to complete the compressed output stream.  However depending on how
-much output space is provided, <tt>deflate()</tt> may have to be called several times until it
-has provided the complete compressed stream, even after it has consumed all of the input.  The flush
-parameter must continue to be <tt>Z_FINISH</tt> for those subsequent calls.
-<p>
-There are other values of the flush parameter that are used in more advanced applications.  You can
-force <tt>deflate()</tt> to produce a burst of output that encodes all of the input data provided
-so far, even if it wouldn't have otherwise, for example to control data latency on a link with
-compressed data.  You can also ask that <tt>deflate()</tt> do that as well as erase any history up to
-that point so that what follows can be decompressed independently, for example for random access
-applications.  Both requests will degrade compression by an amount depending on how often such
-requests are made.
-<p>
-<tt>deflate()</tt> has a return value that can indicate errors, yet we do not check it here.  Why
-not?  Well, it turns out that <tt>deflate()</tt> can do no wrong here.  Let's go through
-<tt>deflate()</tt>'s return values and dispense with them one by one.  The possible values are
-<tt>Z_OK</tt>, <tt>Z_STREAM_END</tt>, <tt>Z_STREAM_ERROR</tt>, or <tt>Z_BUF_ERROR</tt>.  <tt>Z_OK</tt>
-is, well, ok.  <tt>Z_STREAM_END</tt> is also ok and will be returned for the last call of
-<tt>deflate()</tt>.  This is already guaranteed by calling <tt>deflate()</tt> with <tt>Z_FINISH</tt>
-until it has no more output.  <tt>Z_STREAM_ERROR</tt> is only possible if the stream is not
-initialized properly, but we did initialize it properly.  There is no harm in checking for
-<tt>Z_STREAM_ERROR</tt> here, for example to check for the possibility that some
-other part of the application inadvertently clobbered the memory containing the <em>zlib</em> state.
-<tt>Z_BUF_ERROR</tt> will be explained further below, but
-suffice it to say that this is simply an indication that <tt>deflate()</tt> could not consume
-more input or produce more output.  <tt>deflate()</tt> can be called again with more output space
-or more available input, which it will be in this code.
-<pre><b>
-            ret = deflate(&amp;strm, flush);    /* no bad return value */
-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
-</b></pre>
-Now we compute how much output <tt>deflate()</tt> provided on the last call, which is the
-difference between how much space was provided before the call, and how much output space
-is still available after the call.  Then that data, if any, is written to the output file.
-We can then reuse the output buffer for the next call of <tt>deflate()</tt>.  Again if there
-is a file i/o error, we call <tt>deflateEnd()</tt> before returning to avoid a memory leak.
-<pre><b>
-            have = CHUNK - strm.avail_out;
-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
-                (void)deflateEnd(&amp;strm);
-                return Z_ERRNO;
-            }
-</b></pre>
-The inner <tt>do</tt>-loop is repeated until the last <tt>deflate()</tt> call fails to fill the
-provided output buffer.  Then we know that <tt>deflate()</tt> has done as much as it can with
-the provided input, and that all of that input has been consumed.  We can then fall out of this
-loop and reuse the input buffer.
-<p>
-The way we tell that <tt>deflate()</tt> has no more output is by seeing that it did not fill
-the output buffer, leaving <tt>avail_out</tt> greater than zero.  However suppose that
-<tt>deflate()</tt> has no more output, but just so happened to exactly fill the output buffer!
-<tt>avail_out</tt> is zero, and we can't tell that <tt>deflate()</tt> has done all it can.
-As far as we know, <tt>deflate()</tt>
-has more output for us.  So we call it again.  But now <tt>deflate()</tt> produces no output
-at all, and <tt>avail_out</tt> remains unchanged as <tt>CHUNK</tt>.  That <tt>deflate()</tt> call
-wasn't able to do anything, either consume input or produce output, and so it returns
-<tt>Z_BUF_ERROR</tt>.  (See, I told you I'd cover this later.)  However this is not a problem at
-all.  Now we finally have the desired indication that <tt>deflate()</tt> is really done,
-and so we drop out of the inner loop to provide more input to <tt>deflate()</tt>.
-<p>
-With <tt>flush</tt> set to <tt>Z_FINISH</tt>, this final set of <tt>deflate()</tt> calls will
-complete the output stream.  Once that is done, subsequent calls of <tt>deflate()</tt> would return
-<tt>Z_STREAM_ERROR</tt> if the flush parameter is not <tt>Z_FINISH</tt>, and do no more processing
-until the state is reinitialized.
-<p>
-Some applications of <em>zlib</em> have two loops that call <tt>deflate()</tt>
-instead of the single inner loop we have here.  The first loop would call
-without flushing and feed all of the data to <tt>deflate()</tt>.  The second loop would call
-<tt>deflate()</tt> with no more
-data and the <tt>Z_FINISH</tt> parameter to complete the process.  As you can see from this
-example, that can be avoided by simply keeping track of the current flush state.
-<pre><b>
-        } while (strm.avail_out == 0);
-        assert(strm.avail_in == 0);     /* all input will be used */
-</b></pre><!-- -->
-Now we check to see if we have already processed all of the input file.  That information was
-saved in the <tt>flush</tt> variable, so we see if that was set to <tt>Z_FINISH</tt>.  If so,
-then we're done and we fall out of the outer loop.  We're guaranteed to get <tt>Z_STREAM_END</tt>
-from the last <tt>deflate()</tt> call, since we ran it until the last chunk of input was
-consumed and all of the output was generated.
-<pre><b>
-        /* done when last data in file processed */
-    } while (flush != Z_FINISH);
-    assert(ret == Z_STREAM_END);        /* stream will be complete */
-</b></pre><!-- -->
-The process is complete, but we still need to deallocate the state to avoid a memory leak
-(or rather more like a memory hemorrhage if you didn't do this).  Then
-finally we can return with a happy return value.
-<pre><b>
-    /* clean up and return */
-    (void)deflateEnd(&amp;strm);
-    return Z_OK;
-}
-</b></pre><!-- -->
-Now we do the same thing for decompression in the <tt>inf()</tt> routine. <tt>inf()</tt>
-decompresses what is hopefully a valid <em>zlib</em> stream from the input file and writes the
-uncompressed data to the output file.  Much of the discussion above for <tt>def()</tt>
-applies to <tt>inf()</tt> as well, so the discussion here will focus on the differences between
-the two.
-<pre><b>
-/* Decompress from file source to file dest until stream ends or EOF.
-   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
-   allocated for processing, Z_DATA_ERROR if the deflate data is
-   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
-   the version of the library linked do not match, or Z_ERRNO if there
-   is an error reading or writing the files. */
-int inf(FILE *source, FILE *dest)
-{
-</b></pre>
-The local variables have the same functionality as they do for <tt>def()</tt>.  The
-only difference is that there is no <tt>flush</tt> variable, since <tt>inflate()</tt>
-can tell from the <em>zlib</em> stream itself when the stream is complete.
-<pre><b>
-    int ret;
-    unsigned have;
-    z_stream strm;
-    unsigned char in[CHUNK];
-    unsigned char out[CHUNK];
-</b></pre><!-- -->
-The initialization of the state is the same, except that there is no compression level,
-of course, and two more elements of the structure are initialized.  <tt>avail_in</tt>
-and <tt>next_in</tt> must be initialized before calling <tt>inflateInit()</tt>.  This
-is because the application has the option to provide the start of the zlib stream in
-order for <tt>inflateInit()</tt> to have access to information about the compression
-method to aid in memory allocation.  In the current implementation of <em>zlib</em>
-(up through versions 1.2.x), the method-dependent memory allocations are deferred to the first call of
-<tt>inflate()</tt> anyway.  However those fields must be initialized since later versions
-of <em>zlib</em> that provide more compression methods may take advantage of this interface.
-In any case, no decompression is performed by <tt>inflateInit()</tt>, so the
-<tt>avail_out</tt> and <tt>next_out</tt> fields do not need to be initialized before calling.
-<p>
-Here <tt>avail_in</tt> is set to zero and <tt>next_in</tt> is set to <tt>Z_NULL</tt> to
-indicate that no input data is being provided.
-<pre><b>
-    /* allocate inflate state */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit(&amp;strm);
-    if (ret != Z_OK)
-        return ret;
-</b></pre><!-- -->
-The outer <tt>do</tt>-loop decompresses input until <tt>inflate()</tt> indicates
-that it has reached the end of the compressed data and has produced all of the uncompressed
-output.  This is in contrast to <tt>def()</tt> which processes all of the input file.
-If end-of-file is reached before the compressed data self-terminates, then the compressed
-data is incomplete and an error is returned.
-<pre><b>
-    /* decompress until deflate stream ends or end of file */
-    do {
-</b></pre>
-We read input data and set the <tt>strm</tt> structure accordingly.  If we've reached the
-end of the input file, then we leave the outer loop and report an error, since the
-compressed data is incomplete.  Note that we may read more data than is eventually consumed
-by <tt>inflate()</tt>, if the input file continues past the <em>zlib</em> stream.
-For applications where <em>zlib</em> streams are embedded in other data, this routine would
-need to be modified to return the unused data, or at least indicate how much of the input
-data was not used, so the application would know where to pick up after the <em>zlib</em> stream.
-<pre><b>
-        strm.avail_in = fread(in, 1, CHUNK, source);
-        if (ferror(source)) {
-            (void)inflateEnd(&amp;strm);
-            return Z_ERRNO;
-        }
-        if (strm.avail_in == 0)
-            break;
-        strm.next_in = in;
-</b></pre><!-- -->
-The inner <tt>do</tt>-loop has the same function it did in <tt>def()</tt>, which is to
-keep calling <tt>inflate()</tt> until has generated all of the output it can with the
-provided input.
-<pre><b>
-        /* run inflate() on input until output buffer not full */
-        do {
-</b></pre>
-Just like in <tt>def()</tt>, the same output space is provided for each call of <tt>inflate()</tt>.
-<pre><b>
-            strm.avail_out = CHUNK;
-            strm.next_out = out;
-</b></pre>
-Now we run the decompression engine itself.  There is no need to adjust the flush parameter, since
-the <em>zlib</em> format is self-terminating. The main difference here is that there are
-return values that we need to pay attention to.  <tt>Z_DATA_ERROR</tt>
-indicates that <tt>inflate()</tt> detected an error in the <em>zlib</em> compressed data format,
-which means that either the data is not a <em>zlib</em> stream to begin with, or that the data was
-corrupted somewhere along the way since it was compressed.  The other error to be processed is
-<tt>Z_MEM_ERROR</tt>, which can occur since memory allocation is deferred until <tt>inflate()</tt>
-needs it, unlike <tt>deflate()</tt>, whose memory is allocated at the start by <tt>deflateInit()</tt>.
-<p>
-Advanced applications may use
-<tt>deflateSetDictionary()</tt> to prime <tt>deflate()</tt> with a set of likely data to improve the
-first 32K or so of compression.  This is noted in the <em>zlib</em> header, so <tt>inflate()</tt>
-requests that that dictionary be provided before it can start to decompress.  Without the dictionary,
-correct decompression is not possible.  For this routine, we have no idea what the dictionary is,
-so the <tt>Z_NEED_DICT</tt> indication is converted to a <tt>Z_DATA_ERROR</tt>.
-<p>
-<tt>inflate()</tt> can also return <tt>Z_STREAM_ERROR</tt>, which should not be possible here,
-but could be checked for as noted above for <tt>def()</tt>.  <tt>Z_BUF_ERROR</tt> does not need to be
-checked for here, for the same reasons noted for <tt>def()</tt>.  <tt>Z_STREAM_END</tt> will be
-checked for later.
-<pre><b>
-            ret = inflate(&amp;strm, Z_NO_FLUSH);
-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
-            switch (ret) {
-            case Z_NEED_DICT:
-                ret = Z_DATA_ERROR;     /* and fall through */
-            case Z_DATA_ERROR:
-            case Z_MEM_ERROR:
-                (void)inflateEnd(&amp;strm);
-                return ret;
-            }
-</b></pre>
-The output of <tt>inflate()</tt> is handled identically to that of <tt>deflate()</tt>.
-<pre><b>
-            have = CHUNK - strm.avail_out;
-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
-                (void)inflateEnd(&amp;strm);
-                return Z_ERRNO;
-            }
-</b></pre>
-The inner <tt>do</tt>-loop ends when <tt>inflate()</tt> has no more output as indicated
-by not filling the output buffer, just as for <tt>deflate()</tt>.  In this case, we cannot
-assert that <tt>strm.avail_in</tt> will be zero, since the deflate stream may end before the file
-does.
-<pre><b>
-        } while (strm.avail_out == 0);
-</b></pre><!-- -->
-The outer <tt>do</tt>-loop ends when <tt>inflate()</tt> reports that it has reached the
-end of the input <em>zlib</em> stream, has completed the decompression and integrity
-check, and has provided all of the output.  This is indicated by the <tt>inflate()</tt>
-return value <tt>Z_STREAM_END</tt>.  The inner loop is guaranteed to leave <tt>ret</tt>
-equal to <tt>Z_STREAM_END</tt> if the last chunk of the input file read contained the end
-of the <em>zlib</em> stream.  So if the return value is not <tt>Z_STREAM_END</tt>, the
-loop continues to read more input.
-<pre><b>
-        /* done when inflate() says it's done */
-    } while (ret != Z_STREAM_END);
-</b></pre><!-- -->
-At this point, decompression successfully completed, or we broke out of the loop due to no
-more data being available from the input file.  If the last <tt>inflate()</tt> return value
-is not <tt>Z_STREAM_END</tt>, then the <em>zlib</em> stream was incomplete and a data error
-is returned.  Otherwise, we return with a happy return value.  Of course, <tt>inflateEnd()</tt>
-is called first to avoid a memory leak.
-<pre><b>
-    /* clean up and return */
-    (void)inflateEnd(&amp;strm);
-    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
-}
-</b></pre><!-- -->
-That ends the routines that directly use <em>zlib</em>.  The following routines make this
-a command-line program by running data through the above routines from <tt>stdin</tt> to
-<tt>stdout</tt>, and handling any errors reported by <tt>def()</tt> or <tt>inf()</tt>.
-<p>
-<tt>zerr()</tt> is used to interpret the possible error codes from <tt>def()</tt>
-and <tt>inf()</tt>, as detailed in their comments above, and print out an error message.
-Note that these are only a subset of the possible return values from <tt>deflate()</tt>
-and <tt>inflate()</tt>.
-<pre><b>
-/* report a zlib or i/o error */
-void zerr(int ret)
-{
-    fputs("zpipe: ", stderr);
-    switch (ret) {
-    case Z_ERRNO:
-        if (ferror(stdin))
-            fputs("error reading stdin\n", stderr);
-        if (ferror(stdout))
-            fputs("error writing stdout\n", stderr);
-        break;
-    case Z_STREAM_ERROR:
-        fputs("invalid compression level\n", stderr);
-        break;
-    case Z_DATA_ERROR:
-        fputs("invalid or incomplete deflate data\n", stderr);
-        break;
-    case Z_MEM_ERROR:
-        fputs("out of memory\n", stderr);
-        break;
-    case Z_VERSION_ERROR:
-        fputs("zlib version mismatch!\n", stderr);
-    }
-}
-</b></pre><!-- -->
-Here is the <tt>main()</tt> routine used to test <tt>def()</tt> and <tt>inf()</tt>.  The
-<tt>zpipe</tt> command is simply a compression pipe from <tt>stdin</tt> to <tt>stdout</tt>, if
-no arguments are given, or it is a decompression pipe if <tt>zpipe -d</tt> is used.  If any other
-arguments are provided, no compression or decompression is performed.  Instead a usage
-message is displayed.  Examples are <tt>zpipe < foo.txt > foo.txt.z</tt> to compress, and
-<tt>zpipe -d < foo.txt.z > foo.txt</tt> to decompress.
-<pre><b>
-/* compress or decompress from stdin to stdout */
-int main(int argc, char **argv)
-{
-    int ret;
-
-    /* avoid end-of-line conversions */
-    SET_BINARY_MODE(stdin);
-    SET_BINARY_MODE(stdout);
-
-    /* do compression if no arguments */
-    if (argc == 1) {
-        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
-        if (ret != Z_OK)
-            zerr(ret);
-        return ret;
-    }
-
-    /* do decompression if -d specified */
-    else if (argc == 2 &amp;&amp; strcmp(argv[1], "-d") == 0) {
-        ret = inf(stdin, stdout);
-        if (ret != Z_OK)
-            zerr(ret);
-        return ret;
-    }
-
-    /* otherwise, report usage */
-    else {
-        fputs("zpipe usage: zpipe [-d] &lt; source &gt; dest\n", stderr);
-        return 1;
-    }
-}
-</b></pre>
-<hr>
-<i>Copyright (c) 2004, 2005 by Mark Adler<br>Last modified 11 December 2005</i>
-</body>
-</html>

crates/libz-sys/src/zlib/examples/zpipe.c

diff --git a/crates/libz-sys/src/zlib/examples/zpipe.c b/crates/libz-sys/src/zlib/examples/zpipe.c
deleted file mode 100644
index 83535d1..0000000
--- a/crates/libz-sys/src/zlib/examples/zpipe.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/* zpipe.c: example of proper use of zlib's inflate() and deflate()
-   Not copyrighted -- provided to the public domain
-   Version 1.4  11 December 2005  Mark Adler */
-
-/* Version history:
-   1.0  30 Oct 2004  First version
-   1.1   8 Nov 2004  Add void casting for unused return values
-                     Use switch statement for inflate() return values
-   1.2   9 Nov 2004  Add assertions to document zlib guarantees
-   1.3   6 Apr 2005  Remove incorrect assertion in inf()
-   1.4  11 Dec 2005  Add hack to avoid MSDOS end-of-line conversions
-                     Avoid some compiler warnings for input and output buffers
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "zlib.h"
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#define CHUNK 16384
-
-/* Compress from file source to file dest until EOF on source.
-   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
-   allocated for processing, Z_STREAM_ERROR if an invalid compression
-   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
-   version of the library linked do not match, or Z_ERRNO if there is
-   an error reading or writing the files. */
-int def(FILE *source, FILE *dest, int level)
-{
-    int ret, flush;
-    unsigned have;
-    z_stream strm;
-    unsigned char in[CHUNK];
-    unsigned char out[CHUNK];
-
-    /* allocate deflate state */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    ret = deflateInit(&strm, level);
-    if (ret != Z_OK)
-        return ret;
-
-    /* compress until end of file */
-    do {
-        strm.avail_in = fread(in, 1, CHUNK, source);
-        if (ferror(source)) {
-            (void)deflateEnd(&strm);
-            return Z_ERRNO;
-        }
-        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
-        strm.next_in = in;
-
-        /* run deflate() on input until output buffer not full, finish
-           compression if all of source has been read in */
-        do {
-            strm.avail_out = CHUNK;
-            strm.next_out = out;
-            ret = deflate(&strm, flush);    /* no bad return value */
-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
-            have = CHUNK - strm.avail_out;
-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
-                (void)deflateEnd(&strm);
-                return Z_ERRNO;
-            }
-        } while (strm.avail_out == 0);
-        assert(strm.avail_in == 0);     /* all input will be used */
-
-        /* done when last data in file processed */
-    } while (flush != Z_FINISH);
-    assert(ret == Z_STREAM_END);        /* stream will be complete */
-
-    /* clean up and return */
-    (void)deflateEnd(&strm);
-    return Z_OK;
-}
-
-/* Decompress from file source to file dest until stream ends or EOF.
-   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
-   allocated for processing, Z_DATA_ERROR if the deflate data is
-   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
-   the version of the library linked do not match, or Z_ERRNO if there
-   is an error reading or writing the files. */
-int inf(FILE *source, FILE *dest)
-{
-    int ret;
-    unsigned have;
-    z_stream strm;
-    unsigned char in[CHUNK];
-    unsigned char out[CHUNK];
-
-    /* allocate inflate state */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit(&strm);
-    if (ret != Z_OK)
-        return ret;
-
-    /* decompress until deflate stream ends or end of file */
-    do {
-        strm.avail_in = fread(in, 1, CHUNK, source);
-        if (ferror(source)) {
-            (void)inflateEnd(&strm);
-            return Z_ERRNO;
-        }
-        if (strm.avail_in == 0)
-            break;
-        strm.next_in = in;
-
-        /* run inflate() on input until output buffer not full */
-        do {
-            strm.avail_out = CHUNK;
-            strm.next_out = out;
-            ret = inflate(&strm, Z_NO_FLUSH);
-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */
-            switch (ret) {
-            case Z_NEED_DICT:
-                ret = Z_DATA_ERROR;     /* and fall through */
-            case Z_DATA_ERROR:
-            case Z_MEM_ERROR:
-                (void)inflateEnd(&strm);
-                return ret;
-            }
-            have = CHUNK - strm.avail_out;
-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
-                (void)inflateEnd(&strm);
-                return Z_ERRNO;
-            }
-        } while (strm.avail_out == 0);
-
-        /* done when inflate() says it's done */
-    } while (ret != Z_STREAM_END);
-
-    /* clean up and return */
-    (void)inflateEnd(&strm);
-    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
-}
-
-/* report a zlib or i/o error */
-void zerr(int ret)
-{
-    fputs("zpipe: ", stderr);
-    switch (ret) {
-    case Z_ERRNO:
-        if (ferror(stdin))
-            fputs("error reading stdin\n", stderr);
-        if (ferror(stdout))
-            fputs("error writing stdout\n", stderr);
-        break;
-    case Z_STREAM_ERROR:
-        fputs("invalid compression level\n", stderr);
-        break;
-    case Z_DATA_ERROR:
-        fputs("invalid or incomplete deflate data\n", stderr);
-        break;
-    case Z_MEM_ERROR:
-        fputs("out of memory\n", stderr);
-        break;
-    case Z_VERSION_ERROR:
-        fputs("zlib version mismatch!\n", stderr);
-    }
-}
-
-/* compress or decompress from stdin to stdout */
-int main(int argc, char **argv)
-{
-    int ret;
-
-    /* avoid end-of-line conversions */
-    SET_BINARY_MODE(stdin);
-    SET_BINARY_MODE(stdout);
-
-    /* do compression if no arguments */
-    if (argc == 1) {
-        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
-        if (ret != Z_OK)
-            zerr(ret);
-        return ret;
-    }
-
-    /* do decompression if -d specified */
-    else if (argc == 2 && strcmp(argv[1], "-d") == 0) {
-        ret = inf(stdin, stdout);
-        if (ret != Z_OK)
-            zerr(ret);
-        return ret;
-    }
-
-    /* otherwise, report usage */
-    else {
-        fputs("zpipe usage: zpipe [-d] < source > dest\n", stderr);
-        return 1;
-    }
-}

crates/libz-sys/src/zlib/examples/zran.c

diff --git a/crates/libz-sys/src/zlib/examples/zran.c b/crates/libz-sys/src/zlib/examples/zran.c
deleted file mode 100644
index 4fec659..0000000
--- a/crates/libz-sys/src/zlib/examples/zran.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/* zran.c -- example of zlib/gzip stream indexing and random access
- * Copyright (C) 2005, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
-   Version 1.1  29 Sep 2012  Mark Adler */
-
-/* Version History:
- 1.0  29 May 2005  First version
- 1.1  29 Sep 2012  Fix memory reallocation error
- */
-
-/* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary()
-   for random access of a compressed file.  A file containing a zlib or gzip
-   stream is provided on the command line.  The compressed stream is decoded in
-   its entirety, and an index built with access points about every SPAN bytes
-   in the uncompressed output.  The compressed file is left open, and can then
-   be read randomly, having to decompress on the average SPAN/2 uncompressed
-   bytes before getting to the desired block of data.
-
-   An access point can be created at the start of any deflate block, by saving
-   the starting file offset and bit of that block, and the 32K bytes of
-   uncompressed data that precede that block.  Also the uncompressed offset of
-   that block is saved to provide a referece for locating a desired starting
-   point in the uncompressed stream.  build_index() works by decompressing the
-   input zlib or gzip stream a block at a time, and at the end of each block
-   deciding if enough uncompressed data has gone by to justify the creation of
-   a new access point.  If so, that point is saved in a data structure that
-   grows as needed to accommodate the points.
-
-   To use the index, an offset in the uncompressed data is provided, for which
-   the latest access point at or preceding that offset is located in the index.
-   The input file is positioned to the specified location in the index, and if
-   necessary the first few bits of the compressed data is read from the file.
-   inflate is initialized with those bits and the 32K of uncompressed data, and
-   the decompression then proceeds until the desired offset in the file is
-   reached.  Then the decompression continues to read the desired uncompressed
-   data from the file.
-
-   Another approach would be to generate the index on demand.  In that case,
-   requests for random access reads from the compressed data would try to use
-   the index, but if a read far enough past the end of the index is required,
-   then further index entries would be generated and added.
-
-   There is some fair bit of overhead to starting inflation for the random
-   access, mainly copying the 32K byte dictionary.  So if small pieces of the
-   file are being accessed, it would make sense to implement a cache to hold
-   some lookahead and avoid many calls to extract() for small lengths.
-
-   Another way to build an index would be to use inflateCopy().  That would
-   not be constrained to have access points at block boundaries, but requires
-   more memory per access point, and also cannot be saved to file due to the
-   use of pointers in the state.  The approach here allows for storage of the
-   index in a file.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-
-#define local static
-
-#define SPAN 1048576L       /* desired distance between access points */
-#define WINSIZE 32768U      /* sliding window size */
-#define CHUNK 16384         /* file input buffer size */
-
-/* access point entry */
-struct point {
-    off_t out;          /* corresponding offset in uncompressed data */
-    off_t in;           /* offset in input file of first full byte */
-    int bits;           /* number of bits (1-7) from byte at in - 1, or 0 */
-    unsigned char window[WINSIZE];  /* preceding 32K of uncompressed data */
-};
-
-/* access point list */
-struct access {
-    int have;           /* number of list entries filled in */
-    int size;           /* number of list entries allocated */
-    struct point *list; /* allocated list */
-};
-
-/* Deallocate an index built by build_index() */
-local void free_index(struct access *index)
-{
-    if (index != NULL) {
-        free(index->list);
-        free(index);
-    }
-}
-
-/* Add an entry to the access point list.  If out of memory, deallocate the
-   existing list and return NULL. */
-local struct access *addpoint(struct access *index, int bits,
-    off_t in, off_t out, unsigned left, unsigned char *window)
-{
-    struct point *next;
-
-    /* if list is empty, create it (start with eight points) */
-    if (index == NULL) {
-        index = malloc(sizeof(struct access));
-        if (index == NULL) return NULL;
-        index->list = malloc(sizeof(struct point) << 3);
-        if (index->list == NULL) {
-            free(index);
-            return NULL;
-        }
-        index->size = 8;
-        index->have = 0;
-    }
-
-    /* if list is full, make it bigger */
-    else if (index->have == index->size) {
-        index->size <<= 1;
-        next = realloc(index->list, sizeof(struct point) * index->size);
-        if (next == NULL) {
-            free_index(index);
-            return NULL;
-        }
-        index->list = next;
-    }
-
-    /* fill in entry and increment how many we have */
-    next = index->list + index->have;
-    next->bits = bits;
-    next->in = in;
-    next->out = out;
-    if (left)
-        memcpy(next->window, window + WINSIZE - left, left);
-    if (left < WINSIZE)
-        memcpy(next->window + left, window, WINSIZE - left);
-    index->have++;
-
-    /* return list, possibly reallocated */
-    return index;
-}
-
-/* Make one entire pass through the compressed stream and build an index, with
-   access points about every span bytes of uncompressed output -- span is
-   chosen to balance the speed of random access against the memory requirements
-   of the list, about 32K bytes per access point.  Note that data after the end
-   of the first zlib or gzip stream in the file is ignored.  build_index()
-   returns the number of access points on success (>= 1), Z_MEM_ERROR for out
-   of memory, Z_DATA_ERROR for an error in the input file, or Z_ERRNO for a
-   file read error.  On success, *built points to the resulting index. */
-local int build_index(FILE *in, off_t span, struct access **built)
-{
-    int ret;
-    off_t totin, totout;        /* our own total counters to avoid 4GB limit */
-    off_t last;                 /* totout value of last access point */
-    struct access *index;       /* access points being generated */
-    z_stream strm;
-    unsigned char input[CHUNK];
-    unsigned char window[WINSIZE];
-
-    /* initialize inflate */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, 47);      /* automatic zlib or gzip decoding */
-    if (ret != Z_OK)
-        return ret;
-
-    /* inflate the input, maintain a sliding window, and build an index -- this
-       also validates the integrity of the compressed data using the check
-       information at the end of the gzip or zlib stream */
-    totin = totout = last = 0;
-    index = NULL;               /* will be allocated by first addpoint() */
-    strm.avail_out = 0;
-    do {
-        /* get some compressed data from input file */
-        strm.avail_in = fread(input, 1, CHUNK, in);
-        if (ferror(in)) {
-            ret = Z_ERRNO;
-            goto build_index_error;
-        }
-        if (strm.avail_in == 0) {
-            ret = Z_DATA_ERROR;
-            goto build_index_error;
-        }
-        strm.next_in = input;
-
-        /* process all of that, or until end of stream */
-        do {
-            /* reset sliding window if necessary */
-            if (strm.avail_out == 0) {
-                strm.avail_out = WINSIZE;
-                strm.next_out = window;
-            }
-
-            /* inflate until out of input, output, or at end of block --
-               update the total input and output counters */
-            totin += strm.avail_in;
-            totout += strm.avail_out;
-            ret = inflate(&strm, Z_BLOCK);      /* return at end of block */
-            totin -= strm.avail_in;
-            totout -= strm.avail_out;
-            if (ret == Z_NEED_DICT)
-                ret = Z_DATA_ERROR;
-            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)
-                goto build_index_error;
-            if (ret == Z_STREAM_END)
-                break;
-
-            /* if at end of block, consider adding an index entry (note that if
-               data_type indicates an end-of-block, then all of the
-               uncompressed data from that block has been delivered, and none
-               of the compressed data after that block has been consumed,
-               except for up to seven bits) -- the totout == 0 provides an
-               entry point after the zlib or gzip header, and assures that the
-               index always has at least one access point; we avoid creating an
-               access point after the last block by checking bit 6 of data_type
-             */
-            if ((strm.data_type & 128) && !(strm.data_type & 64) &&
-                (totout == 0 || totout - last > span)) {
-                index = addpoint(index, strm.data_type & 7, totin,
-                                 totout, strm.avail_out, window);
-                if (index == NULL) {
-                    ret = Z_MEM_ERROR;
-                    goto build_index_error;
-                }
-                last = totout;
-            }
-        } while (strm.avail_in != 0);
-    } while (ret != Z_STREAM_END);
-
-    /* clean up and return index (release unused entries in list) */
-    (void)inflateEnd(&strm);
-    index->list = realloc(index->list, sizeof(struct point) * index->have);
-    index->size = index->have;
-    *built = index;
-    return index->size;
-
-    /* return error */
-  build_index_error:
-    (void)inflateEnd(&strm);
-    if (index != NULL)
-        free_index(index);
-    return ret;
-}
-
-/* Use the index to read len bytes from offset into buf, return bytes read or
-   negative for error (Z_DATA_ERROR or Z_MEM_ERROR).  If data is requested past
-   the end of the uncompressed data, then extract() will return a value less
-   than len, indicating how much as actually read into buf.  This function
-   should not return a data error unless the file was modified since the index
-   was generated.  extract() may also return Z_ERRNO if there is an error on
-   reading or seeking the input file. */
-local int extract(FILE *in, struct access *index, off_t offset,
-                  unsigned char *buf, int len)
-{
-    int ret, skip;
-    z_stream strm;
-    struct point *here;
-    unsigned char input[CHUNK];
-    unsigned char discard[WINSIZE];
-
-    /* proceed only if something reasonable to do */
-    if (len < 0)
-        return 0;
-
-    /* find where in stream to start */
-    here = index->list;
-    ret = index->have;
-    while (--ret && here[1].out <= offset)
-        here++;
-
-    /* initialize file and inflate state to start there */
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, -15);         /* raw inflate */
-    if (ret != Z_OK)
-        return ret;
-    ret = fseeko(in, here->in - (here->bits ? 1 : 0), SEEK_SET);
-    if (ret == -1)
-        goto extract_ret;
-    if (here->bits) {
-        ret = getc(in);
-        if (ret == -1) {
-            ret = ferror(in) ? Z_ERRNO : Z_DATA_ERROR;
-            goto extract_ret;
-        }
-        (void)inflatePrime(&strm, here->bits, ret >> (8 - here->bits));
-    }
-    (void)inflateSetDictionary(&strm, here->window, WINSIZE);
-
-    /* skip uncompressed bytes until offset reached, then satisfy request */
-    offset -= here->out;
-    strm.avail_in = 0;
-    skip = 1;                               /* while skipping to offset */
-    do {
-        /* define where to put uncompressed data, and how much */
-        if (offset == 0 && skip) {          /* at offset now */
-            strm.avail_out = len;
-            strm.next_out = buf;
-            skip = 0;                       /* only do this once */
-        }
-        if (offset > WINSIZE) {             /* skip WINSIZE bytes */
-            strm.avail_out = WINSIZE;
-            strm.next_out = discard;
-            offset -= WINSIZE;
-        }
-        else if (offset != 0) {             /* last skip */
-            strm.avail_out = (unsigned)offset;
-            strm.next_out = discard;
-            offset = 0;
-        }
-
-        /* uncompress until avail_out filled, or end of stream */
-        do {
-            if (strm.avail_in == 0) {
-                strm.avail_in = fread(input, 1, CHUNK, in);
-                if (ferror(in)) {
-                    ret = Z_ERRNO;
-                    goto extract_ret;
-                }
-                if (strm.avail_in == 0) {
-                    ret = Z_DATA_ERROR;
-                    goto extract_ret;
-                }
-                strm.next_in = input;
-            }
-            ret = inflate(&strm, Z_NO_FLUSH);       /* normal inflate */
-            if (ret == Z_NEED_DICT)
-                ret = Z_DATA_ERROR;
-            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)
-                goto extract_ret;
-            if (ret == Z_STREAM_END)
-                break;
-        } while (strm.avail_out != 0);
-
-        /* if reach end of stream, then don't keep trying to get more */
-        if (ret == Z_STREAM_END)
-            break;
-
-        /* do until offset reached and requested data read, or stream ends */
-    } while (skip);
-
-    /* compute number of uncompressed bytes read after offset */
-    ret = skip ? 0 : len - strm.avail_out;
-
-    /* clean up and return bytes read or error */
-  extract_ret:
-    (void)inflateEnd(&strm);
-    return ret;
-}
-
-/* Demonstrate the use of build_index() and extract() by processing the file
-   provided on the command line, and the extracting 16K from about 2/3rds of
-   the way through the uncompressed output, and writing that to stdout. */
-int main(int argc, char **argv)
-{
-    int len;
-    off_t offset;
-    FILE *in;
-    struct access *index = NULL;
-    unsigned char buf[CHUNK];
-
-    /* open input file */
-    if (argc != 2) {
-        fprintf(stderr, "usage: zran file.gz\n");
-        return 1;
-    }
-    in = fopen(argv[1], "rb");
-    if (in == NULL) {
-        fprintf(stderr, "zran: could not open %s for reading\n", argv[1]);
-        return 1;
-    }
-
-    /* build index */
-    len = build_index(in, SPAN, &index);
-    if (len < 0) {
-        fclose(in);
-        switch (len) {
-        case Z_MEM_ERROR:
-            fprintf(stderr, "zran: out of memory\n");
-            break;
-        case Z_DATA_ERROR:
-            fprintf(stderr, "zran: compressed data error in %s\n", argv[1]);
-            break;
-        case Z_ERRNO:
-            fprintf(stderr, "zran: read error on %s\n", argv[1]);
-            break;
-        default:
-            fprintf(stderr, "zran: error %d while building index\n", len);
-        }
-        return 1;
-    }
-    fprintf(stderr, "zran: built index with %d access points\n", len);
-
-    /* use index by reading some bytes from an arbitrary offset */
-    offset = (index->list[index->have - 1].out << 1) / 3;
-    len = extract(in, index, offset, buf, CHUNK);
-    if (len < 0)
-        fprintf(stderr, "zran: extraction failed: %s error\n",
-                len == Z_MEM_ERROR ? "out of memory" : "input corrupted");
-    else {
-        fwrite(buf, 1, len, stdout);
-        fprintf(stderr, "zran: extracted %d bytes at %llu\n", len, offset);
-    }
-
-    /* clean up and exit */
-    free_index(index);
-    fclose(in);
-    return 0;
-}

crates/libz-sys/src/zlib/gzclose.c

diff --git a/crates/libz-sys/src/zlib/gzclose.c b/crates/libz-sys/src/zlib/gzclose.c
deleted file mode 100644
index caeb99a..0000000
--- a/crates/libz-sys/src/zlib/gzclose.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* gzclose.c -- zlib gzclose() function
- * Copyright (C) 2004, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* gzclose() is in a separate file so that it is linked in only if it is used.
-   That way the other gzclose functions can be used instead to avoid linking in
-   unneeded compression or decompression routines. */
-int ZEXPORT gzclose(file)
-    gzFile file;
-{
-#ifndef NO_GZCOMPRESS
-    gz_statep state;
-
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
-#else
-    return gzclose_r(file);
-#endif
-}

crates/libz-sys/src/zlib/gzguts.h

diff --git a/crates/libz-sys/src/zlib/gzguts.h b/crates/libz-sys/src/zlib/gzguts.h
deleted file mode 100644
index 990a4d2..0000000
--- a/crates/libz-sys/src/zlib/gzguts.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef _LARGEFILE64_SOURCE
-#  ifndef _LARGEFILE_SOURCE
-#    define _LARGEFILE_SOURCE 1
-#  endif
-#  ifdef _FILE_OFFSET_BITS
-#    undef _FILE_OFFSET_BITS
-#  endif
-#endif
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include <stdio.h>
-#include "zlib.h"
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#  include <limits.h>
-#endif
-
-#ifndef _POSIX_SOURCE
-#  define _POSIX_SOURCE
-#endif
-#include <fcntl.h>
-
-#ifdef _WIN32
-#  include <stddef.h>
-#endif
-
-#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-#  include <io.h>
-#endif
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  define WIDECHAR
-#endif
-
-#ifdef WINAPI_FAMILY
-#  define open _open
-#  define read _read
-#  define write _write
-#  define close _close
-#endif
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-   but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#  ifdef VMS
-#    define NO_vsnprintf
-#  endif
-#  ifdef __OS400__
-#    define NO_vsnprintf
-#  endif
-#  ifdef __MVS__
-#    define NO_vsnprintf
-#  endif
-#endif
-
-/* unlike snprintf (which is required in C99), _snprintf does not guarantee
-   null termination of the result -- however this is only used in gzlib.c where
-   the result is assured to fit in the space provided */
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* since "static" is used to mean two completely different things in C, we
-   define "local" for the non-static meaning of "static", for readability
-   (compile with -Dlocal if your debugger can't find static symbols) */
-
-/* gz* functions always use library allocation functions */
-#ifndef STDC
-  extern voidp  malloc OF((uInt size));
-  extern void   free   OF((voidpf ptr));
-#endif
-
-/* get errno and strerror definition */
-#if defined UNDER_CE
-#  include <windows.h>
-#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
-#else
-#  ifndef NO_STRERROR
-#    include <errno.h>
-#    define zstrerror() strerror(errno)
-#  else
-#    define zstrerror() "stdio error (consult errno)"
-#  endif
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-#endif
-
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-
-/* default i/o buffer size -- double this for output when reading (this and
-   twice this must be able to fit in an unsigned type) */
-#define GZBUFSIZE 8192
-
-/* gzip modes, also provide a little integrity check on the passed structure */
-#define GZ_NONE 0
-#define GZ_READ 7247
-#define GZ_WRITE 31153
-#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
-
-/* values for gz_state how */
-#define LOOK 0      /* look for a gzip header */
-#define COPY 1      /* copy input directly */
-#define GZIP 2      /* decompress a gzip stream */
-
-/* internal gzip file state data structure */
-typedef struct {
-        /* exposed contents for gzgetc() macro */
-    struct gzFile_s x;      /* "x" for exposed */
-                            /* x.have: number of bytes available at x.next */
-                            /* x.next: next output data to deliver or write */
-                            /* x.pos: current position in uncompressed data */
-        /* used for both reading and writing */
-    int mode;               /* see gzip modes above */
-    int fd;                 /* file descriptor */
-    char *path;             /* path or fd for error messages */
-    unsigned size;          /* buffer size, zero if not allocated yet */
-    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
-    unsigned char *in;      /* input buffer (double-sized when writing) */
-    unsigned char *out;     /* output buffer (double-sized when reading) */
-    int direct;             /* 0 if processing gzip, 1 if transparent */
-        /* just for reading */
-    int how;                /* 0: get header, 1: copy, 2: decompress */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
-    int eof;                /* true if end of input file reached */
-    int past;               /* true if read requested past end */
-        /* just for writing */
-    int level;              /* compression level */
-    int strategy;           /* compression strategy */
-        /* seek request */
-    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
-    int seek;               /* true if seek request pending */
-        /* error information */
-    int err;                /* error code */
-    char *msg;              /* error message */
-        /* zlib inflate or deflate stream */
-    z_stream strm;          /* stream structure in-place (not a pointer) */
-} gz_state;
-typedef gz_state FAR *gz_statep;
-
-/* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
-#if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
-#endif
-
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
-   value -- needed when comparing unsigned to z_off64_t, which is signed
-   (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif

crates/libz-sys/src/zlib/gzlib.c

diff --git a/crates/libz-sys/src/zlib/gzlib.c b/crates/libz-sys/src/zlib/gzlib.c
deleted file mode 100644
index 4105e6a..0000000
--- a/crates/libz-sys/src/zlib/gzlib.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
-#  define LSEEK _lseeki64
-#else
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define LSEEK lseek64
-#else
-#  define LSEEK lseek
-#endif
-#endif
-
-/* Local functions */
-local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const void *, int, const char *));
-
-#if defined UNDER_CE
-
-/* Map the Windows error number in ERROR to a locale-dependent error message
-   string and return a pointer to it.  Typically, the values for ERROR come
-   from GetLastError.
-
-   The string pointed to shall not be modified by the application, but may be
-   overwritten by a subsequent call to gz_strwinerror
-
-   The gz_strwinerror function does not change the current setting of
-   GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
-     DWORD error;
-{
-    static char buf[1024];
-
-    wchar_t *msgbuf;
-    DWORD lasterr = GetLastError();
-    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
-        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-        NULL,
-        error,
-        0, /* Default language */
-        (LPVOID)&msgbuf,
-        0,
-        NULL);
-    if (chars != 0) {
-        /* If there is an \r\n appended, zap it.  */
-        if (chars >= 2
-            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
-            chars -= 2;
-            msgbuf[chars] = 0;
-        }
-
-        if (chars > sizeof (buf) - 1) {
-            chars = sizeof (buf) - 1;
-            msgbuf[chars] = 0;
-        }
-
-        wcstombs(buf, msgbuf, chars + 1);
-        LocalFree(msgbuf);
-    }
-    else {
-        sprintf(buf, "unknown win32 error (%ld)", error);
-    }
-
-    SetLastError(lasterr);
-    return buf;
-}
-
-#endif /* UNDER_CE */
-
-/* Reset gzip file state */
-local void gz_reset(state)
-    gz_statep state;
-{
-    state->x.have = 0;              /* no output data available */
-    if (state->mode == GZ_READ) {   /* for reading ... */
-        state->eof = 0;             /* not at end of file */
-        state->past = 0;            /* have not read past end yet */
-        state->how = LOOK;          /* look for gzip header */
-    }
-    state->seek = 0;                /* no seek request pending */
-    gz_error(state, Z_OK, NULL);    /* clear error */
-    state->x.pos = 0;               /* no uncompressed data yet */
-    state->strm.avail_in = 0;       /* no input data yet */
-}
-
-/* Open a gzip file either by name or file descriptor. */
-local gzFile gz_open(path, fd, mode)
-    const void *path;
-    int fd;
-    const char *mode;
-{
-    gz_statep state;
-    z_size_t len;
-    int oflag;
-#ifdef O_CLOEXEC
-    int cloexec = 0;
-#endif
-#ifdef O_EXCL
-    int exclusive = 0;
-#endif
-
-    /* check input */
-    if (path == NULL)
-        return NULL;
-
-    /* allocate gzFile structure to return */
-    state = (gz_statep)malloc(sizeof(gz_state));
-    if (state == NULL)
-        return NULL;
-    state->size = 0;            /* no buffers allocated yet */
-    state->want = GZBUFSIZE;    /* requested buffer size */
-    state->msg = NULL;          /* no error message yet */
-
-    /* interpret mode */
-    state->mode = GZ_NONE;
-    state->level = Z_DEFAULT_COMPRESSION;
-    state->strategy = Z_DEFAULT_STRATEGY;
-    state->direct = 0;
-    while (*mode) {
-        if (*mode >= '0' && *mode <= '9')
-            state->level = *mode - '0';
-        else
-            switch (*mode) {
-            case 'r':
-                state->mode = GZ_READ;
-                break;
-#ifndef NO_GZCOMPRESS
-            case 'w':
-                state->mode = GZ_WRITE;
-                break;
-            case 'a':
-                state->mode = GZ_APPEND;
-                break;
-#endif
-            case '+':       /* can't read and write at the same time */
-                free(state);
-                return NULL;
-            case 'b':       /* ignore -- will request binary anyway */
-                break;
-#ifdef O_CLOEXEC
-            case 'e':
-                cloexec = 1;
-                break;
-#endif
-#ifdef O_EXCL
-            case 'x':
-                exclusive = 1;
-                break;
-#endif
-            case 'f':
-                state->strategy = Z_FILTERED;
-                break;
-            case 'h':
-                state->strategy = Z_HUFFMAN_ONLY;
-                break;
-            case 'R':
-                state->strategy = Z_RLE;
-                break;
-            case 'F':
-                state->strategy = Z_FIXED;
-                break;
-            case 'T':
-                state->direct = 1;
-                break;
-            default:        /* could consider as an error, but just ignore */
-                ;
-            }
-        mode++;
-    }
-
-    /* must provide an "r", "w", or "a" */
-    if (state->mode == GZ_NONE) {
-        free(state);
-        return NULL;
-    }
-
-    /* can't force transparent read */
-    if (state->mode == GZ_READ) {
-        if (state->direct) {
-            free(state);
-            return NULL;
-        }
-        state->direct = 1;      /* for empty file */
-    }
-
-    /* save the path name for error messages */
-#ifdef WIDECHAR
-    if (fd == -2) {
-        len = wcstombs(NULL, path, 0);
-        if (len == (z_size_t)-1)
-            len = 0;
-    }
-    else
-#endif
-        len = strlen((const char *)path);
-    state->path = (char *)malloc(len + 1);
-    if (state->path == NULL) {
-        free(state);
-        return NULL;
-    }
-#ifdef WIDECHAR
-    if (fd == -2)
-        if (len)
-            wcstombs(state->path, path, len + 1);
-        else
-            *(state->path) = 0;
-    else
-#endif
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
-#else
-        strcpy(state->path, path);
-#endif
-
-    /* compute the flags for open() */
-    oflag =
-#ifdef O_LARGEFILE
-        O_LARGEFILE |
-#endif
-#ifdef O_BINARY
-        O_BINARY |
-#endif
-#ifdef O_CLOEXEC
-        (cloexec ? O_CLOEXEC : 0) |
-#endif
-        (state->mode == GZ_READ ?
-         O_RDONLY :
-         (O_WRONLY | O_CREAT |
-#ifdef O_EXCL
-          (exclusive ? O_EXCL : 0) |
-#endif
-          (state->mode == GZ_WRITE ?
-           O_TRUNC :
-           O_APPEND)));
-
-    /* open the file with the appropriate flags (or just use fd) */
-    state->fd = fd > -1 ? fd : (
-#ifdef WIDECHAR
-        fd == -2 ? _wopen(path, oflag, 0666) :
-#endif
-        open((const char *)path, oflag, 0666));
-    if (state->fd == -1) {
-        free(state->path);
-        free(state);
-        return NULL;
-    }
-    if (state->mode == GZ_APPEND) {
-        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
-        state->mode = GZ_WRITE;         /* simplify later checks */
-    }
-
-    /* save the current position for rewinding (only if reading) */
-    if (state->mode == GZ_READ) {
-        state->start = LSEEK(state->fd, 0, SEEK_CUR);
-        if (state->start == -1) state->start = 0;
-    }
-
-    /* initialize stream */
-    gz_reset(state);
-
-    /* return stream */
-    return (gzFile)state;
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen(path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen64(path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzdopen(fd, mode)
-    int fd;
-    const char *mode;
-{
-    char *path;         /* identifier for error messages */
-    gzFile gz;
-
-    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
-        return NULL;
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
-#else
-    sprintf(path, "<fd:%d>", fd);   /* for debugging */
-#endif
-    gz = gz_open(path, fd, mode);
-    free(path);
-    return gz;
-}
-
-/* -- see zlib.h -- */
-#ifdef WIDECHAR
-gzFile ZEXPORT gzopen_w(path, mode)
-    const wchar_t *path;
-    const char *mode;
-{
-    return gz_open(path, -2, mode);
-}
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzbuffer(file, size)
-    gzFile file;
-    unsigned size;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* make sure we haven't already allocated memory */
-    if (state->size != 0)
-        return -1;
-
-    /* check and set requested size */
-    if ((size << 1) < size)
-        return -1;              /* need to be able to double it */
-    if (size < 2)
-        size = 2;               /* need two bytes to check magic header */
-    state->want = size;
-    return 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzrewind(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* back up and start over */
-    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
-        return -1;
-    gz_reset(state);
-    return 0;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzseek64(file, offset, whence)
-    gzFile file;
-    z_off64_t offset;
-    int whence;
-{
-    unsigned n;
-    z_off64_t ret;
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* check that there's no error */
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* can only seek from start or relative to current position */
-    if (whence != SEEK_SET && whence != SEEK_CUR)
-        return -1;
-
-    /* normalize offset to a SEEK_CUR specification */
-    if (whence == SEEK_SET)
-        offset -= state->x.pos;
-    else if (state->seek)
-        offset += state->skip;
-    state->seek = 0;
-
-    /* if within raw area while reading, just go there */
-    if (state->mode == GZ_READ && state->how == COPY &&
-            state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
-        if (ret == -1)
-            return -1;
-        state->x.have = 0;
-        state->eof = 0;
-        state->past = 0;
-        state->seek = 0;
-        gz_error(state, Z_OK, NULL);
-        state->strm.avail_in = 0;
-        state->x.pos += offset;
-        return state->x.pos;
-    }
-
-    /* calculate skip amount, rewinding if needed for back seek when reading */
-    if (offset < 0) {
-        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
-            return -1;
-        offset += state->x.pos;
-        if (offset < 0)                     /* before start of file! */
-            return -1;
-        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
-            return -1;
-    }
-
-    /* if reading, skip what's in output buffer (one less gzgetc() check) */
-    if (state->mode == GZ_READ) {
-        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
-            (unsigned)offset : state->x.have;
-        state->x.have -= n;
-        state->x.next += n;
-        state->x.pos += n;
-        offset -= n;
-    }
-
-    /* request skip (if not zero) */
-    if (offset) {
-        state->seek = 1;
-        state->skip = offset;
-    }
-    return state->x.pos + offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzseek(file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    z_off64_t ret;
-
-    ret = gzseek64(file, (z_off64_t)offset, whence);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gztell64(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* return position */
-    return state->x.pos + (state->seek ? state->skip : 0);
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gztell(file)
-    gzFile file;
-{
-    z_off64_t ret;
-
-    ret = gztell64(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzoffset64(file)
-    gzFile file;
-{
-    z_off64_t offset;
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* compute and return effective offset in file */
-    offset = LSEEK(state->fd, 0, SEEK_CUR);
-    if (offset == -1)
-        return -1;
-    if (state->mode == GZ_READ)             /* reading */
-        offset -= state->strm.avail_in;     /* don't count buffered input */
-    return offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzoffset(file)
-    gzFile file;
-{
-    z_off64_t ret;
-
-    ret = gzoffset64(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzeof(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return 0;
-
-    /* return end-of-file state */
-    return state->mode == GZ_READ ? state->past : 0;
-}
-
-/* -- see zlib.h -- */
-const char * ZEXPORT gzerror(file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return NULL;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return NULL;
-
-    /* return error information */
-    if (errnum != NULL)
-        *errnum = state->err;
-    return state->err == Z_MEM_ERROR ? "out of memory" :
-                                       (state->msg == NULL ? "" : state->msg);
-}
-
-/* -- see zlib.h -- */
-void ZEXPORT gzclearerr(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return;
-
-    /* clear error and end-of-file */
-    if (state->mode == GZ_READ) {
-        state->eof = 0;
-        state->past = 0;
-    }
-    gz_error(state, Z_OK, NULL);
-}
-
-/* Create an error message in allocated memory and set state->err and
-   state->msg accordingly.  Free any previous error message already there.  Do
-   not try to free or allocate space if the error is Z_MEM_ERROR (out of
-   memory).  Simply save the error message as a static string.  If there is an
-   allocation failure constructing the error message, then convert the error to
-   out of memory. */
-void ZLIB_INTERNAL gz_error(state, err, msg)
-    gz_statep state;
-    int err;
-    const char *msg;
-{
-    /* free previously allocated message and clear */
-    if (state->msg != NULL) {
-        if (state->err != Z_MEM_ERROR)
-            free(state->msg);
-        state->msg = NULL;
-    }
-
-    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-    if (err != Z_OK && err != Z_BUF_ERROR)
-        state->x.have = 0;
-
-    /* set error code, and if no message, then done */
-    state->err = err;
-    if (msg == NULL)
-        return;
-
-    /* for an out of memory error, return literal string when requested */
-    if (err == Z_MEM_ERROR)
-        return;
-
-    /* construct error message with path */
-    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
-            NULL) {
-        state->err = Z_MEM_ERROR;
-        return;
-    }
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
-                   "%s%s%s", state->path, ": ", msg);
-#else
-    strcpy(state->msg, state->path);
-    strcat(state->msg, ": ");
-    strcat(state->msg, msg);
-#endif
-}
-
-#ifndef INT_MAX
-/* portably return maximum value for an int (when limits.h presumed not
-   available) -- we need to do this to cover cases where 2's complement not
-   used, since C standard permits 1's complement and sign-bit representations,
-   otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZLIB_INTERNAL gz_intmax()
-{
-    unsigned p, q;
-
-    p = 1;
-    do {
-        q = p;
-        p <<= 1;
-        p++;
-    } while (p > q);
-    return q >> 1;
-}
-#endif

crates/libz-sys/src/zlib/gzread.c

diff --git a/crates/libz-sys/src/zlib/gzread.c b/crates/libz-sys/src/zlib/gzread.c
deleted file mode 100644
index 956b91e..0000000
--- a/crates/libz-sys/src/zlib/gzread.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
-local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
-local int gz_skip OF((gz_statep, z_off64_t));
-local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
-
-/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
-   state->fd, and update state->eof, state->err, and state->msg as appropriate.
-   This function needs to loop on read(), since read() is not guaranteed to
-   read the number of bytes requested, depending on the type of descriptor. */
-local int gz_load(state, buf, len, have)
-    gz_statep state;
-    unsigned char *buf;
-    unsigned len;
-    unsigned *have;
-{
-    int ret;
-    unsigned get, max = ((unsigned)-1 >> 2) + 1;
-
-    *have = 0;
-    do {
-        get = len - *have;
-        if (get > max)
-            get = max;
-        ret = read(state->fd, buf + *have, get);
-        if (ret <= 0)
-            break;
-        *have += (unsigned)ret;
-    } while (*have < len);
-    if (ret < 0) {
-        gz_error(state, Z_ERRNO, zstrerror());
-        return -1;
-    }
-    if (ret == 0)
-        state->eof = 1;
-    return 0;
-}
-
-/* Load up input buffer and set eof flag if last data loaded -- return -1 on
-   error, 0 otherwise.  Note that the eof flag is set when the end of the input
-   file is reached, even though there may be unused data in the buffer.  Once
-   that data has been used, no more attempts will be made to read the file.
-   If strm->avail_in != 0, then the current data is moved to the beginning of
-   the input buffer, and then the remainder of the buffer is loaded with the
-   available data from the input file. */
-local int gz_avail(state)
-    gz_statep state;
-{
-    unsigned got;
-    z_streamp strm = &(state->strm);
-
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-    if (state->eof == 0) {
-        if (strm->avail_in) {       /* copy what's there to the start */
-            unsigned char *p = state->in;
-            unsigned const char *q = strm->next_in;
-            unsigned n = strm->avail_in;
-            do {
-                *p++ = *q++;
-            } while (--n);
-        }
-        if (gz_load(state, state->in + strm->avail_in,
-                    state->size - strm->avail_in, &got) == -1)
-            return -1;
-        strm->avail_in += got;
-        strm->next_in = state->in;
-    }
-    return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
-   If this is the first time in, allocate required memory.  state->how will be
-   left unchanged if there is no more input data available, will be set to COPY
-   if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression.  If direct copying, then leftover input
-   data from the input buffer will be copied to the output buffer.  In that
-   case, all further file reads will be directly to either the output buffer or
-   a user buffer.  If decompressing, the inflate state will be initialized.
-   gz_look() will return 0 on success or -1 on failure. */
-local int gz_look(state)
-    gz_statep state;
-{
-    z_streamp strm = &(state->strm);
-
-    /* allocate read buffers and inflate memory */
-    if (state->size == 0) {
-        /* allocate buffers */
-        state->in = (unsigned char *)malloc(state->want);
-        state->out = (unsigned char *)malloc(state->want << 1);
-        if (state->in == NULL || state->out == NULL) {
-            free(state->out);
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        state->size = state->want;
-
-        /* allocate inflate memory */
-        state->strm.zalloc = Z_NULL;
-        state->strm.zfree = Z_NULL;
-        state->strm.opaque = Z_NULL;
-        state->strm.avail_in = 0;
-        state->strm.next_in = Z_NULL;
-        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
-            free(state->out);
-            free(state->in);
-            state->size = 0;
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-    }
-
-    /* get at least the magic bytes in the input buffer */
-    if (strm->avail_in < 2) {
-        if (gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0)
-            return 0;
-    }
-
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
-       a logical dilemma here when considering the case of a partially written
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell
-       whether this is a single-byte file, or just a partially written gzip
-       file -- for here we assume that if a gzip file is being written, then
-       the header will be written in a single operation, so that reading a
-       single byte is sufficient indication that it is not a gzip file) */
-    if (strm->avail_in > 1 &&
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
-        inflateReset(strm);
-        state->how = GZIP;
-        state->direct = 0;
-        return 0;
-    }
-
-    /* no gzip header -- if we were decoding gzip before, then this is trailing
-       garbage.  Ignore the trailing garbage and finish. */
-    if (state->direct == 0) {
-        strm->avail_in = 0;
-        state->eof = 1;
-        state->x.have = 0;
-        return 0;
-    }
-
-    /* doing raw i/o, copy any leftover input to output -- this assumes that
-       the output buffer is larger than the input buffer, which also assures
-       space for gzungetc() */
-    state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
-    state->how = COPY;
-    state->direct = 1;
-    return 0;
-}
-
-/* Decompress from input to the provided next_out and avail_out in the state.
-   On return, state->x.have and state->x.next point to the just decompressed
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
-   on success, -1 on failure. */
-local int gz_decomp(state)
-    gz_statep state;
-{
-    int ret = Z_OK;
-    unsigned had;
-    z_streamp strm = &(state->strm);
-
-    /* fill output buffer up to end of deflate stream */
-    had = strm->avail_out;
-    do {
-        /* get more input for inflate() */
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0) {
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
-            break;
-        }
-
-        /* decompress and handle errors */
-        ret = inflate(strm, Z_NO_FLUSH);
-        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
-            gz_error(state, Z_STREAM_ERROR,
-                     "internal error: inflate stream corrupt");
-            return -1;
-        }
-        if (ret == Z_MEM_ERROR) {
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
-            gz_error(state, Z_DATA_ERROR,
-                     strm->msg == NULL ? "compressed data error" : strm->msg);
-            return -1;
-        }
-    } while (strm->avail_out && ret != Z_STREAM_END);
-
-    /* update available output */
-    state->x.have = had - strm->avail_out;
-    state->x.next = strm->next_out - state->x.have;
-
-    /* if the gzip stream completed successfully, look for another */
-    if (ret == Z_STREAM_END)
-        state->how = LOOK;
-
-    /* good decompression */
-    return 0;
-}
-
-/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
-   Data is either copied from the input file or decompressed from the input
-   file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for to determine whether to copy or decompress.  Returns -1 on error,
-   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
-   end of the input file has been reached and all data has been processed.  */
-local int gz_fetch(state)
-    gz_statep state;
-{
-    z_streamp strm = &(state->strm);
-
-    do {
-        switch(state->how) {
-        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
-            if (gz_look(state) == -1)
-                return -1;
-            if (state->how == LOOK)
-                return 0;
-            break;
-        case COPY:      /* -> COPY */
-            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
-                    == -1)
-                return -1;
-            state->x.next = state->out;
-            return 0;
-        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
-            strm->avail_out = state->size << 1;
-            strm->next_out = state->out;
-            if (gz_decomp(state) == -1)
-                return -1;
-        }
-    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
-    return 0;
-}
-
-/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-local int gz_skip(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
-    unsigned n;
-
-    /* skip over len bytes or reach end-of-file, whichever comes first */
-    while (len)
-        /* skip over whatever is in output buffer */
-        if (state->x.have) {
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
-                (unsigned)len : state->x.have;
-            state->x.have -= n;
-            state->x.next += n;
-            state->x.pos += n;
-            len -= n;
-        }
-
-        /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0)
-            break;
-
-        /* need more data to skip -- load up output buffer */
-        else {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return -1;
-        }
-    return 0;
-}
-
-/* Read len bytes into buf from file, or less than len up to the end of the
-   input.  Return the number of bytes read.  If zero is returned, either the
-   end of file was reached, or there was an error.  state->err must be
-   consulted in that case to determine which. */
-local z_size_t gz_read(state, buf, len)
-    gz_statep state;
-    voidp buf;
-    z_size_t len;
-{
-    z_size_t got;
-    unsigned n;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* get len bytes to buf, or less than len if at the end */
-    got = 0;
-    do {
-        /* set n to the maximum amount of len that fits in an unsigned int */
-        n = -1;
-        if (n > len)
-            n = len;
-
-        /* first just try copying data from the output buffer */
-        if (state->x.have) {
-            if (state->x.have < n)
-                n = state->x.have;
-            memcpy(buf, state->x.next, n);
-            state->x.next += n;
-            state->x.have -= n;
-        }
-
-        /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0) {
-            state->past = 1;        /* tried to read past end */
-            break;
-        }
-
-        /* need output data -- for small len or new stream load up our output
-           buffer */
-        else if (state->how == LOOK || n < (state->size << 1)) {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return 0;
-            continue;       /* no progress yet -- go back to copy above */
-            /* the copy above assures that we will leave with space in the
-               output buffer, allowing at least one gzungetc() to succeed */
-        }
-
-        /* large len -- read directly into user buffer */
-        else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
-                return 0;
-        }
-
-        /* large len -- decompress directly into user buffer */
-        else {  /* state->how == GZIP */
-            state->strm.avail_out = n;
-            state->strm.next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1)
-                return 0;
-            n = state->x.have;
-            state->x.have = 0;
-        }
-
-        /* update progress */
-        len -= n;
-        buf = (char *)buf + n;
-        got += n;
-        state->x.pos += n;
-    } while (len);
-
-    /* return number of bytes read into user buffer */
-    return got;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
-        return -1;
-    }
-
-    /* read len or fewer bytes to buf */
-    len = gz_read(state, buf, len);
-
-    /* check for an error */
-    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* return the number of bytes read (this is assured to fit in an int) */
-    return (int)len;
-}
-
-/* -- see zlib.h -- */
-z_size_t ZEXPORT gzfread(buf, size, nitems, file)
-    voidp buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    len = nitems * size;
-    if (size && len / size != nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-
-    /* read len or fewer bytes to buf, return the number of full items read */
-    return len ? gz_read(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#else
-#  undef gzgetc
-#endif
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    int ret;
-    unsigned char buf[1];
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* try output buffer (no need to check for skip request) */
-    if (state->x.have) {
-        state->x.have--;
-        state->x.pos++;
-        return *(state->x.next)++;
-    }
-
-    /* nothing there -- try gz_read() */
-    ret = gz_read(state, buf, 1);
-    return ret < 1 ? -1 : buf[0];
-}
-
-int ZEXPORT gzgetc_(file)
-gzFile file;
-{
-    return gzgetc(file);
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* can't push EOF */
-    if (c < 0)
-        return -1;
-
-    /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->x.have == 0) {
-        state->x.have = 1;
-        state->x.next = state->out + (state->size << 1) - 1;
-        state->x.next[0] = (unsigned char)c;
-        state->x.pos--;
-        state->past = 0;
-        return c;
-    }
-
-    /* if no room, give up (must have already done a gzungetc()) */
-    if (state->x.have == (state->size << 1)) {
-        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
-        return -1;
-    }
-
-    /* slide output data if needed and insert byte before existing data */
-    if (state->x.next == state->out) {
-        unsigned char *src = state->out + state->x.have;
-        unsigned char *dest = state->out + (state->size << 1);
-        while (src > state->out)
-            *--dest = *--src;
-        state->x.next = dest;
-    }
-    state->x.have++;
-    state->x.next--;
-    state->x.next[0] = (unsigned char)c;
-    state->x.pos--;
-    state->past = 0;
-    return c;
-}
-
-/* -- see zlib.h -- */
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    unsigned left, n;
-    char *str;
-    unsigned char *eol;
-    gz_statep state;
-
-    /* check parameters and get internal structure */
-    if (file == NULL || buf == NULL || len < 1)
-        return NULL;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return NULL;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return NULL;
-    }
-
-    /* copy output bytes up to new line or len - 1, whichever comes first --
-       append a terminating zero to the string (we don't check for a zero in
-       the contents, let the user worry about that) */
-    str = buf;
-    left = (unsigned)len - 1;
-    if (left) do {
-        /* assure that something is in the output buffer */
-        if (state->x.have == 0 && gz_fetch(state) == -1)
-            return NULL;                /* error */
-        if (state->x.have == 0) {       /* end of file */
-            state->past = 1;            /* read past end */
-            break;                      /* return what we have */
-        }
-
-        /* look for end-of-line in current output buffer */
-        n = state->x.have > left ? left : state->x.have;
-        eol = (unsigned char *)memchr(state->x.next, '\n', n);
-        if (eol != NULL)
-            n = (unsigned)(eol - state->x.next) + 1;
-
-        /* copy through end-of-line, or remainder if not found */
-        memcpy(buf, state->x.next, n);
-        state->x.have -= n;
-        state->x.next += n;
-        state->x.pos += n;
-        left -= n;
-        buf += n;
-    } while (left && eol == NULL);
-
-    /* return terminated string, or if nothing, end of file */
-    if (buf == str)
-        return NULL;
-    buf[0] = 0;
-    return str;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzdirect(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* if the state is not known, but we can find out, then do so (this is
-       mainly for right after a gzopen() or gzdopen()) */
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
-        (void)gz_look(state);
-
-    /* return 1 if transparent, 0 if processing a gzip stream */
-    return state->direct;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_r(file)
-    gzFile file;
-{
-    int ret, err;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're reading */
-    if (state->mode != GZ_READ)
-        return Z_STREAM_ERROR;
-
-    /* free memory and close file */
-    if (state->size) {
-        inflateEnd(&(state->strm));
-        free(state->out);
-        free(state->in);
-    }
-    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    ret = close(state->fd);
-    free(state);
-    return ret ? Z_ERRNO : err;
-}

crates/libz-sys/src/zlib/gzwrite.c

diff --git a/crates/libz-sys/src/zlib/gzwrite.c b/crates/libz-sys/src/zlib/gzwrite.c
deleted file mode 100644
index c7b5651..0000000
--- a/crates/libz-sys/src/zlib/gzwrite.c
+++ /dev/null
@@ -1,665 +0,0 @@
-/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_init OF((gz_statep));
-local int gz_comp OF((gz_statep, int));
-local int gz_zero OF((gz_statep, z_off64_t));
-local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
-
-/* Initialize state for writing a gzip file.  Mark initialization by setting
-   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
-   success. */
-local int gz_init(state)
-    gz_statep state;
-{
-    int ret;
-    z_streamp strm = &(state->strm);
-
-    /* allocate input buffer (double size for gzprintf) */
-    state->in = (unsigned char *)malloc(state->want << 1);
-    if (state->in == NULL) {
-        gz_error(state, Z_MEM_ERROR, "out of memory");
-        return -1;
-    }
-
-    /* only need output buffer and deflate state if compressing */
-    if (!state->direct) {
-        /* allocate output buffer */
-        state->out = (unsigned char *)malloc(state->want);
-        if (state->out == NULL) {
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-
-        /* allocate deflate memory, set up for gzip compression */
-        strm->zalloc = Z_NULL;
-        strm->zfree = Z_NULL;
-        strm->opaque = Z_NULL;
-        ret = deflateInit2(strm, state->level, Z_DEFLATED,
-                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
-        if (ret != Z_OK) {
-            free(state->out);
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        strm->next_in = NULL;
-    }
-
-    /* mark state as initialized */
-    state->size = state->want;
-
-    /* initialize write buffer if compressing */
-    if (!state->direct) {
-        strm->avail_out = state->size;
-        strm->next_out = state->out;
-        state->x.next = strm->next_out;
-    }
-    return 0;
-}
-
-/* Compress whatever is at avail_in and next_in and write to the output file.
-   Return -1 if there is an error writing to the output file or if gz_init()
-   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
-   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
-   reset to start a new gzip stream.  If gz->direct is true, then simply write
-   to the output file without compressing, and ignore flush. */
-local int gz_comp(state, flush)
-    gz_statep state;
-    int flush;
-{
-    int ret, writ;
-    unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
-    z_streamp strm = &(state->strm);
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return -1;
-
-    /* write directly if requested */
-    if (state->direct) {
-        while (strm->avail_in) {
-            put = strm->avail_in > max ? max : strm->avail_in;
-            writ = write(state->fd, strm->next_in, put);
-            if (writ < 0) {
-                gz_error(state, Z_ERRNO, zstrerror());
-                return -1;
-            }
-            strm->avail_in -= (unsigned)writ;
-            strm->next_in += writ;
-        }
-        return 0;
-    }
-
-    /* run deflate() on provided input until it produces no more output */
-    ret = Z_OK;
-    do {
-        /* write out current buffer contents if full, or if flushing, but if
-           doing Z_FINISH then don't write until we get to Z_STREAM_END */
-        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
-            (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            while (strm->next_out > state->x.next) {
-                put = strm->next_out - state->x.next > (int)max ? max :
-                      (unsigned)(strm->next_out - state->x.next);
-                writ = write(state->fd, state->x.next, put);
-                if (writ < 0) {
-                    gz_error(state, Z_ERRNO, zstrerror());
-                    return -1;
-                }
-                state->x.next += writ;
-            }
-            if (strm->avail_out == 0) {
-                strm->avail_out = state->size;
-                strm->next_out = state->out;
-                state->x.next = state->out;
-            }
-        }
-
-        /* compress */
-        have = strm->avail_out;
-        ret = deflate(strm, flush);
-        if (ret == Z_STREAM_ERROR) {
-            gz_error(state, Z_STREAM_ERROR,
-                      "internal error: deflate stream corrupt");
-            return -1;
-        }
-        have -= strm->avail_out;
-    } while (have);
-
-    /* if that completed a deflate stream, allow another to start */
-    if (flush == Z_FINISH)
-        deflateReset(strm);
-
-    /* all done, no errors */
-    return 0;
-}
-
-/* Compress len zeros to output.  Return -1 on a write error or memory
-   allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
-    int first;
-    unsigned n;
-    z_streamp strm = &(state->strm);
-
-    /* consume whatever's left in the input buffer */
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-        return -1;
-
-    /* compress len zeros (len guaranteed > 0) */
-    first = 1;
-    while (len) {
-        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
-            (unsigned)len : state->size;
-        if (first) {
-            memset(state->in, 0, n);
-            first = 0;
-        }
-        strm->avail_in = n;
-        strm->next_in = state->in;
-        state->x.pos += n;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return -1;
-        len -= n;
-    }
-    return 0;
-}
-
-/* Write len bytes from buf to file.  Return the number of bytes written.  If
-   the returned value is less than len, then there was an error. */
-local z_size_t gz_write(state, buf, len)
-    gz_statep state;
-    voidpc buf;
-    z_size_t len;
-{
-    z_size_t put = len;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return 0;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* for small len, copy to input buffer, otherwise compress directly */
-    if (len < state->size) {
-        /* copy to input buffer, compress when full */
-        do {
-            unsigned have, copy;
-
-            if (state->strm.avail_in == 0)
-                state->strm.next_in = state->in;
-            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
-                              state->in);
-            copy = state->size - have;
-            if (copy > len)
-                copy = len;
-            memcpy(state->in + have, buf, copy);
-            state->strm.avail_in += copy;
-            state->x.pos += copy;
-            buf = (const char *)buf + copy;
-            len -= copy;
-            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-        } while (len);
-    }
-    else {
-        /* consume whatever's left in the input buffer */
-        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0;
-
-        /* directly compress user buffer to file */
-        state->strm.next_in = (z_const Bytef *)buf;
-        do {
-            unsigned n = (unsigned)-1;
-            if (n > len)
-                n = len;
-            state->strm.avail_in = n;
-            state->x.pos += n;
-            if (gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-            len -= n;
-        } while (len);
-    }
-
-    /* input was all buffered or compressed */
-    return put;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-        return 0;
-    }
-
-    /* write len bytes from buf (the return value will fit in an int) */
-    return (int)gz_write(state, buf, len);
-}
-
-/* -- see zlib.h -- */
-z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
-    voidpc buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    len = nitems * size;
-    if (size && len / size != nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-
-    /* write len bytes to buf, return the number of full items written */
-    return len ? gz_write(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned have;
-    unsigned char buf[1];
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* try writing to input buffer for speed (state->size == 0 if buffer not
-       initialized) */
-    if (state->size) {
-        if (strm->avail_in == 0)
-            strm->next_in = state->in;
-        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-        if (have < state->size) {
-            state->in[have] = (unsigned char)c;
-            strm->avail_in++;
-            state->x.pos++;
-            return c & 0xff;
-        }
-    }
-
-    /* no room in buffer or not initialized, use gz_write() */
-    buf[0] = (unsigned char)c;
-    if (gz_write(state, buf, 1) != 1)
-        return -1;
-    return c & 0xff;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
-    gzFile file;
-    const char *str;
-{
-    int ret;
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* write string */
-    len = strlen(str);
-    ret = gz_write(state, str, len);
-    return ret == 0 && len != 0 ? -1 : ret;
-}
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#include <stdarg.h>
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
-{
-    int len;
-    unsigned left;
-    char *next;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* make sure we have some buffer space */
-    if (state->size == 0 && gz_init(state) == -1)
-        return state->err;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
-    if (strm->avail_in == 0)
-        strm->next_in = state->in;
-    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
-    next[state->size - 1] = 0;
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf(next, format, va);
-    for (len = 0; len < state->size; len++)
-        if (next[len] == 0) break;
-#  else
-    len = vsprintf(next, format, va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(next, state->size, format, va);
-    len = strlen(next);
-#  else
-    len = vsnprintf(next, state->size, format, va);
-#  endif
-#endif
-
-    /* check that printf() results fit in buffer */
-    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, compress first half if past that */
-    strm->avail_in += (unsigned)len;
-    state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memcpy(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
-    return len;
-}
-
-int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
-{
-    va_list va;
-    int ret;
-
-    va_start(va, format);
-    ret = gzvprintf(file, format, va);
-    va_end(va);
-    return ret;
-}
-
-#else /* !STDC && !Z_HAVE_STDARG_H */
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    unsigned len, left;
-    char *next;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that can really pass pointer in ints */
-    if (sizeof(int) != sizeof(void *))
-        return Z_STREAM_ERROR;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* make sure we have some buffer space */
-    if (state->size == 0 && gz_init(state) == -1)
-        return state->error;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->error;
-    }
-
-    /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
-    if (strm->avail_in == 0)
-        strm->next_in = state->in;
-    next = (char *)(strm->next_in + strm->avail_in);
-    next[state->size - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
-            a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < size; len++)
-        if (next[len] == 0)
-            break;
-#  else
-    len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
-                  a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-    snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
-             a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(next);
-#  else
-    len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                   a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-
-    /* check that printf() results fit in buffer */
-    if (len == 0 || len >= state->size || next[state->size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, compress first half if past that */
-    strm->avail_in += len;
-    state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memcpy(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
-    return (int)len;
-}
-
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
-    gzFile file;
-    int flush;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* check flush parameter */
-    if (flush < 0 || flush > Z_FINISH)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* compress remaining data with requested flush */
-    (void)gz_comp(state, flush);
-    return state->err;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzsetparams(file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* if no change is requested, then do nothing */
-    if (level == state->level && strategy == state->strategy)
-        return Z_OK;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* change compression parameters for subsequent input */
-    if (state->size) {
-        /* flush previous input with previous parameters before changing */
-        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
-            return state->err;
-        deflateParams(strm, level, strategy);
-    }
-    state->level = level;
-    state->strategy = strategy;
-    return Z_OK;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_w(file)
-    gzFile file;
-{
-    int ret = Z_OK;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're writing */
-    if (state->mode != GZ_WRITE)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            ret = state->err;
-    }
-
-    /* flush, free memory, and close file */
-    if (gz_comp(state, Z_FINISH) == -1)
-        ret = state->err;
-    if (state->size) {
-        if (!state->direct) {
-            (void)deflateEnd(&(state->strm));
-            free(state->out);
-        }
-        free(state->in);
-    }
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    if (close(state->fd) == -1)
-        ret = Z_ERRNO;
-    free(state);
-    return ret;
-}

crates/libz-sys/src/zlib/infback.c

diff --git a/crates/libz-sys/src/zlib/infback.c b/crates/libz-sys/src/zlib/infback.c
deleted file mode 100644
index 59679ec..0000000
--- a/crates/libz-sys/src/zlib/infback.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL ||
-        windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-    strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->dmax = 32768U;
-    state->wbits = (uInt)windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-/* Macros for inflateBack(): */
-
-/* Load returned state from inflate_fast() */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Set state from registers for inflate_fast() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            state->length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                if (copy > state->length) copy = state->length;
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}

crates/libz-sys/src/zlib/inffast.c

diff --git a/crates/libz-sys/src/zlib/inffast.c b/crates/libz-sys/src/zlib/inffast.c
deleted file mode 100644
index 0dbd1db..0000000
--- a/crates/libz-sys/src/zlib/inffast.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef ASMINF
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-#else
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *in;      /* local strm->next_in */
-    z_const unsigned char FAR *last;    /* have enough input while in < last */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    wnext = state->wnext;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-        }
-        here = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(here.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(here.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            *out++ = (unsigned char)(here.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-            }
-            here = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(here.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(here.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(*in++) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
-                            state->mode = BAD;
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                *out++ = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            *out++ = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                *out++ = *from++;
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (wnext < op) {      /* wrap around window */
-                        from += wsize + wnext - op;
-                        op -= wnext;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = window;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
-                                len -= op;
-                                do {
-                                    *out++ = *from++;
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += wnext - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    }
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in;
-    strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */

crates/libz-sys/src/zlib/inffast.h

diff --git a/crates/libz-sys/src/zlib/inffast.h b/crates/libz-sys/src/zlib/inffast.h
deleted file mode 100644
index e5c1aa4..0000000
--- a/crates/libz-sys/src/zlib/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));

crates/libz-sys/src/zlib/inffixed.h

diff --git a/crates/libz-sys/src/zlib/inffixed.h b/crates/libz-sys/src/zlib/inffixed.h
deleted file mode 100644
index d628327..0000000
--- a/crates/libz-sys/src/zlib/inffixed.h
+++ /dev/null
@@ -1,94 +0,0 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };

crates/libz-sys/src/zlib/inflate.c

diff --git a/crates/libz-sys/src/zlib/inflate.c b/crates/libz-sys/src/zlib/inflate.c
deleted file mode 100644
index ac333e8..0000000
--- a/crates/libz-sys/src/zlib/inflate.c
+++ /dev/null
@@ -1,1561 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state == Z_NULL || state->strm != strm ||
-        state->mode < HEAD || state->mode > SYNC)
-        return 1;
-    return 0;
-}
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return inflateResetKeep(strm);
-}
-
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
-    int wrap;
-    struct inflate_state FAR *state;
-
-    /* get the state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 5;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE(strm, state->window);
-        state->window = Z_NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    int ret;
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->strm = strm;
-    state->window = Z_NULL;
-    state->mode = HEAD;     /* to pass state test in inflateReset2() */
-    ret = inflateReset2(strm, windowBits);
-    if (ret != Z_OK) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-    }
-    return ret;
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += (unsigned)value << state->bits;
-    state->bits += (uInt)bits;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-               state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
-    struct inflate_state FAR *state;
-    unsigned dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->wnext = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, end - state->wsize, state->wsize);
-        state->wnext = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->wnext;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, end - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, end - copy, copy);
-            state->wnext = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize) state->wnext = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                if (state->wbits == 0)
-                    state->wbits = 15;
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            if (len > 15 || len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if ((state->flags & 0x0200) && (state->wrap & 4))
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->wnext - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if ((state->wrap & 4) && out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((state->wrap & 4) && (
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-            (state->mode < CHECK || flush != Z_FINISH)))
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if ((state->wrap & 4) && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) +
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* copy dictionary */
-    if (state->whave && dictionary != Z_NULL) {
-        zmemcpy(dictionary, state->window + state->wnext,
-                state->whave - state->wnext);
-        zmemcpy(dictionary + state->whave - state->wnext,
-                state->window, state->wnext);
-    }
-    if (dictLength != Z_NULL)
-        *dictLength = state->whave;
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long dictid;
-    int ret;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary identifier */
-    if (state->mode == DICT) {
-        dictid = adler32(0L, Z_NULL, 0);
-        dictid = adler32(dictid, dictionary, dictLength);
-        if (dictid != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window using updatewindow(), which will amend the
-       existing dictionary if appropriate */
-    ret = updatewindow(strm, dictionary + dictLength, dictLength);
-    if (ret) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (inflateStateCheck(source) || dest == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
-    copy->strm = dest;
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    state->sane = !subvert;
-    return Z_OK;
-#else
-    (void)subvert;
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-int ZEXPORT inflateValidate(strm, check)
-z_streamp strm;
-int check;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (check)
-        state->wrap |= 4;
-    else
-        state->wrap &= ~4;
-    return Z_OK;
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm))
-        return -(1L << 16);
-    state = (struct inflate_state FAR *)strm->state;
-    return (long)(((unsigned long)((long)state->back)) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
-
-unsigned long ZEXPORT inflateCodesUsed(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm)) return (unsigned long)-1;
-    state = (struct inflate_state FAR *)strm->state;
-    return (unsigned long)(state->next - state->codes);
-}

crates/libz-sys/src/zlib/inflate.h

diff --git a/crates/libz-sys/src/zlib/inflate.h b/crates/libz-sys/src/zlib/inflate.h
deleted file mode 100644
index a46cce6..0000000
--- a/crates/libz-sys/src/zlib/inflate.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD = 16180,   /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
-    Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* State maintained between inflate() calls -- approximately 7K bytes, not
-   including the allocated sliding window, which is up to 32K bytes. */
-struct inflate_state {
-    z_streamp strm;             /* pointer back to this zlib stream */
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
-                                   bit 2 true to validate check value */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    unsigned length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-    int sane;                   /* if false, allow invalid distance too far */
-    int back;                   /* bits back of last unprocessed length/lit */
-    unsigned was;               /* initial length of match */
-};

crates/libz-sys/src/zlib/inftrees.c

diff --git a/crates/libz-sys/src/zlib/inftrees.c b/crates/libz-sys/src/zlib/inftrees.c
deleted file mode 100644
index 2ea08fc..0000000
--- a/crates/libz-sys/src/zlib/inftrees.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    unsigned match;             /* use base and extra for symbol >= match */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (unsigned short)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min < max; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        match = 20;
-        break;
-    case LENS:
-        base = lbase;
-        extra = lext;
-        match = 257;
-        break;
-    default:    /* DISTS */
-        base = dbase;
-        extra = dext;
-        match = 0;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        here.bits = (unsigned char)(len - drop);
-        if (work[sym] + 1U < match) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        }
-        else if (work[sym] >= match) {
-            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.val = base[work[sym] - match];
-        }
-        else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = here;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used > ENOUGH_LENS) ||
-                (type == DISTS && used > ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
-       at most one remaining entry, since if the code is incomplete, the
-       maximum code length that was allowed to get this far is one bit) */
-    if (huff != 0) {
-        here.op = (unsigned char)64;            /* invalid code marker */
-        here.bits = (unsigned char)(len - drop);
-        here.val = (unsigned short)0;
-        next[huff] = here;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}

crates/libz-sys/src/zlib/inftrees.h

diff --git a/crates/libz-sys/src/zlib/inftrees.h b/crates/libz-sys/src/zlib/inftrees.h
deleted file mode 100644
index baa53a0..0000000
--- a/crates/libz-sys/src/zlib/inftrees.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));

crates/libz-sys/src/zlib/make_vms.com

diff --git a/crates/libz-sys/src/zlib/make_vms.com b/crates/libz-sys/src/zlib/make_vms.com
deleted file mode 100644
index 65e9d0c..0000000
--- a/crates/libz-sys/src/zlib/make_vms.com
+++ /dev/null
@@ -1,867 +0,0 @@
-$! make libz under VMS written by
-$! Martin P.J. Zinser
-$!
-$! In case of problems with the install you might contact me at
-$! zinser@zinser.no-ip.info(preferred) or
-$! martin.zinser@eurexchange.com (work)
-$!
-$! Make procedure history for Zlib
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20060120 First version to receive a number
-$! 0.02 20061008 Adapt to new Makefile.in
-$! 0.03 20091224 Add support for large file check
-$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
-$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
-$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
-$!               subdir path, update module search in makefile.in
-$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
-$!               shared image creation
-$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
-$!               image
-$! 0.09 20120305 SMS.  P1 sets builder ("MMK", "MMS", " " (built-in)).
-$!               "" -> automatic, preference: MMK, MMS, built-in.
-$!
-$ on error then goto err_exit
-$!
-$ true  = 1
-$ false = 0
-$ tmpnam = "temp_" + f$getjpi("","pid")
-$ tt = tmpnam + ".txt"
-$ tc = tmpnam + ".c"
-$ th = tmpnam + ".h"
-$ define/nolog tconfig 'th'
-$ its_decc = false
-$ its_vaxc = false
-$ its_gnuc = false
-$ s_case   = False
-$!
-$! Setup variables holding "config" information
-$!
-$ Make    = "''p1'"
-$ name     = "Zlib"
-$ version  = "?.?.?"
-$ v_string = "ZLIB_VERSION"
-$ v_file   = "zlib.h"
-$ ccopt   = "/include = []"
-$ lopts   = ""
-$ dnsrl   = ""
-$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
-$ conf_check_string = ""
-$ linkonly = false
-$ optfile  = name + ".opt"
-$ mapfile  = name + ".map"
-$ libdefs  = ""
-$ vax      = f$getsyi("HW_MODEL").lt.1024
-$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
-$ ia64     = f$getsyi("HW_MODEL").ge.4096
-$!
-$! 2012-03-05 SMS.
-$! Why is this needed?  And if it is needed, why not simply ".not. vax"?
-$!
-$!!! if axp .or. ia64 then  set proc/parse=extended
-$!
-$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
-$ mydef  = F$parse(whoami,,,"DEVICE")
-$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
-$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
-$!
-$! Check for MMK/MMS
-$!
-$ if (Make .eqs. "")
-$ then
-$   If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
-$   If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
-$ else
-$   Make = f$edit( Make, "trim")
-$ endif
-$!
-$ gosub find_version
-$!
-$  open/write topt tmp.opt
-$  open/write optf 'optfile'
-$!
-$ gosub check_opts
-$!
-$! Look for the compiler used
-$!
-$ gosub check_compiler
-$ close topt
-$ close optf
-$!
-$ if its_decc
-$ then
-$   ccopt = "/prefix=all" + ccopt
-$   if f$trnlnm("SYS") .eqs. ""
-$   then
-$     if axp
-$     then
-$       define sys sys$library:
-$     else
-$       ccopt = "/decc" + ccopt
-$       define sys decc$library_include:
-$     endif
-$   endif
-$!
-$! 2012-03-05 SMS.
-$! Why /NAMES = AS_IS?  Why not simply ".not. vax"?  And why not on VAX?
-$!
-$   if axp .or. ia64
-$   then
-$       ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
-$       s_case = true
-$   endif
-$ endif
-$ if its_vaxc .or. its_gnuc
-$ then
-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$ endif
-$!
-$! Build a fake configure input header
-$!
-$ open/write conf_hin config.hin
-$ write conf_hin "#undef _LARGEFILE64_SOURCE"
-$ close conf_hin
-$!
-$!
-$ i = 0
-$FIND_ACONF:
-$ fname = f$element(i,"#",aconf_in_file)
-$ if fname .eqs. "#" then goto AMISS_ERR
-$ if f$search(fname) .eqs. ""
-$ then
-$   i = i + 1
-$   goto find_aconf
-$ endif
-$ open/read/err=aconf_err aconf_in 'fname'
-$ open/write aconf zconf.h
-$ACONF_LOOP:
-$ read/end_of_file=aconf_exit aconf_in line
-$ work = f$edit(line, "compress,trim")
-$ if f$extract(0,6,work) .nes. "#undef"
-$ then
-$   if f$extract(0,12,work) .nes. "#cmakedefine"
-$   then
-$       write aconf line
-$   endif
-$ else
-$   cdef = f$element(1," ",work)
-$   gosub check_config
-$ endif
-$ goto aconf_loop
-$ACONF_EXIT:
-$ write aconf ""
-$ write aconf "/* VMS specifics added by make_vms.com: */"
-$ write aconf "#define VMS 1"
-$ write aconf "#include <unistd.h>"
-$ write aconf "#include <unixio.h>"
-$ write aconf "#ifdef _LARGEFILE"
-$ write aconf "# define off64_t __off64_t"
-$ write aconf "# define fopen64 fopen"
-$ write aconf "# define fseeko64 fseeko"
-$ write aconf "# define lseek64 lseek"
-$ write aconf "# define ftello64 ftell"
-$ write aconf "#endif"
-$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
-$ write aconf "# define HAVE_VSNPRINTF"
-$ write aconf "#endif"
-$ close aconf_in
-$ close aconf
-$ if f$search("''th'") .nes. "" then delete 'th';*
-$! Build the thing plain or with mms
-$!
-$ write sys$output "Compiling Zlib sources ..."
-$ if make.eqs.""
-$ then
-$   if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
-$   if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
-$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
-                adler32.c zlib.h zconf.h
-$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
-                compress.c zlib.h zconf.h
-$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
-                crc32.c zlib.h zconf.h
-$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
-                deflate.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
-                gzclose.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
-                gzlib.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
-                gzread.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
-                gzwrite.c zutil.h zlib.h zconf.h
-$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
-                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
-                inffast.c zutil.h zlib.h zconf.h inffast.h
-$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
-                inflate.c zutil.h zlib.h zconf.h infblock.h
-$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
-                inftrees.c zutil.h zlib.h zconf.h inftrees.h
-$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
-                trees.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
-                uncompr.c zlib.h zconf.h
-$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
-                zutil.c zutil.h zlib.h zconf.h
-$   write sys$output "Building Zlib ..."
-$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
-$   write sys$output "Building example..."
-$   CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" -
-                [.test]example.c zlib.h zconf.h
-$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
-$   write sys$output "Building minigzip..."
-$   CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" -
-              [.test]minigzip.c zlib.h zconf.h
-$   call make minigzip.exe -
-              "LINK minigzip,libz.olb/lib" -
-              minigzip.obj libz.olb
-$ else
-$   gosub crea_mms
-$   write sys$output "Make ''name' ''version' with ''Make' "
-$   'make'
-$ endif
-$!
-$! Create shareable image
-$!
-$ gosub crea_olist
-$ write sys$output "Creating libzshr.exe"
-$ call map_2_shopt 'mapfile' 'optfile'
-$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
-$ write sys$output "Zlib build completed"
-$ delete/nolog tmp.opt;*
-$ exit
-$AMISS_ERR:
-$ write sys$output "No source for config.hin found."
-$ write sys$output "Tried any of ''aconf_in_file'"
-$ goto err_exit
-$CC_ERR:
-$ write sys$output "C compiler required to build ''name'"
-$ goto err_exit
-$ERR_EXIT:
-$ set message/facil/ident/sever/text
-$ close/nolog optf
-$ close/nolog topt
-$ close/nolog aconf_in
-$ close/nolog aconf
-$ close/nolog out
-$ close/nolog min
-$ close/nolog mod
-$ close/nolog h_in
-$ write sys$output "Exiting..."
-$ exit 2
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 - P8  What it depends on
-$
-$ If F$Search(P1) .Eqs. "" Then Goto Makeit
-$ Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(0)
-$ write sys$output P2
-$ 'P2
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------
-$!
-$! Check command line options and set symbols accordingly
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20041206 First version to receive a number
-$! 0.02 20060126 Add new "HELP" target
-$ CHECK_OPTS:
-$ i = 1
-$ OPT_LOOP:
-$ if i .lt. 9
-$ then
-$   cparm = f$edit(p'i',"upcase")
-$!
-$! Check if parameter actually contains something
-$!
-$   if f$edit(cparm,"trim") .nes. ""
-$   then
-$     if cparm .eqs. "DEBUG"
-$     then
-$       ccopt = ccopt + "/noopt/deb"
-$       lopts = lopts + "/deb"
-$     endif
-$     if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
-$     then
-$       start = f$locate("=",cparm) + 1
-$       len   = f$length(cparm) - start
-$       ccopt = ccopt + f$extract(start,len,cparm)
-$       if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
-          then s_case = true
-$     endif
-$     if cparm .eqs. "LINK" then linkonly = true
-$     if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
-$     then
-$       start = f$locate("=",cparm) + 1
-$       len   = f$length(cparm) - start
-$       lopts = lopts + f$extract(start,len,cparm)
-$     endif
-$     if f$locate("CC=",cparm) .lt. f$length(cparm)
-$     then
-$       start  = f$locate("=",cparm) + 1
-$       len    = f$length(cparm) - start
-$       cc_com = f$extract(start,len,cparm)
-        if (cc_com .nes. "DECC") .and. -
-           (cc_com .nes. "VAXC") .and. -
-           (cc_com .nes. "GNUC")
-$       then
-$         write sys$output "Unsupported compiler choice ''cc_com' ignored"
-$         write sys$output "Use DECC, VAXC, or GNUC instead"
-$       else
-$         if cc_com .eqs. "DECC" then its_decc = true
-$         if cc_com .eqs. "VAXC" then its_vaxc = true
-$         if cc_com .eqs. "GNUC" then its_gnuc = true
-$       endif
-$     endif
-$     if f$locate("MAKE=",cparm) .lt. f$length(cparm)
-$     then
-$       start  = f$locate("=",cparm) + 1
-$       len    = f$length(cparm) - start
-$       mmks = f$extract(start,len,cparm)
-$       if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
-$       then
-$         make = mmks
-$       else
-$         write sys$output "Unsupported make choice ''mmks' ignored"
-$         write sys$output "Use MMK or MMS instead"
-$       endif
-$     endif
-$     if cparm .eqs. "HELP" then gosub bhelp
-$   endif
-$   i = i + 1
-$   goto opt_loop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Look for the compiler used
-$!
-$! Version history
-$! 0.01 20040223 First version to receive a number
-$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
-$! 0.03 20060202 Extend handling of GNU C
-$! 0.04 20090402 Compaq -> hp
-$CHECK_COMPILER:
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then
-$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
-$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
-$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
-$ endif
-$!
-$! Exit if no compiler available
-$!
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then goto CC_ERR
-$ else
-$   if its_decc
-$   then
-$     write sys$output "CC compiler check ... hp C"
-$     if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
-$     then
-$       dnrsl = f$trnlnm("decc$no_rooted_search_lists")
-$     endif
-$     define/nolog decc$no_rooted_search_lists 1
-$   else
-$     if its_vaxc then write sys$output "CC compiler check ... VAX C"
-$     if its_gnuc
-$     then
-$         write sys$output "CC compiler check ... GNU C"
-$         if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib"
-$         if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib"
-$         cc = "gcc"
-$     endif
-$     if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
-$     if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! If MMS/MMK are available dump out the descrip.mms if required
-$!
-$CREA_MMS:
-$ write sys$output "Creating descrip.mms..."
-$ create descrip.mms
-$ open/append out descrip.mms
-$ copy sys$input: out
-$ deck
-# descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser
-# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
-
-OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
-       gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
-       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
-       inftrees.obj, inffast.obj
-
-$ eod
-$ write out "CFLAGS=", ccopt
-$ write out "LOPTS=", lopts
-$ write out "all : example.exe minigzip.exe libz.olb"
-$ copy sys$input: out
-$ deck
-        @ write sys$output " Example applications available"
-
-libz.olb : libz.olb($(OBJS))
-	@ write sys$output " libz available"
-
-example.exe : example.obj libz.olb
-              link $(LOPTS) example,libz.olb/lib
-
-minigzip.exe : minigzip.obj libz.olb
-              link $(LOPTS) minigzip,libz.olb/lib
-
-clean :
-	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
-
-
-# Other dependencies.
-adler32.obj  : adler32.c zutil.h zlib.h zconf.h
-compress.obj : compress.c zlib.h zconf.h
-crc32.obj    : crc32.c zutil.h zlib.h zconf.h
-deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
-example.obj  : [.test]example.c zlib.h zconf.h
-gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
-gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
-gzread.obj   : gzread.c zutil.h zlib.h zconf.h
-gzwrite.obj  : gzwrite.c zutil.h zlib.h zconf.h
-inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
-inflate.obj  : inflate.c zutil.h zlib.h zconf.h
-inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
-minigzip.obj : [.test]minigzip.c zlib.h zconf.h
-trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
-uncompr.obj  : uncompr.c zlib.h zconf.h
-zutil.obj    : zutil.c zutil.h zlib.h zconf.h
-infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$ eod
-$ close out
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Read list of core library sources from makefile.in and create options
-$! needed to build shareable image
-$!
-$CREA_OLIST:
-$ open/read min makefile.in
-$ open/write mod modules.opt
-$ src_check_list = "OBJZ =#OBJG ="
-$MRLOOP:
-$ read/end=mrdone min rec
-$ i = 0
-$SRC_CHECK_LOOP:
-$ src_check = f$element(i, "#", src_check_list)
-$ i = i+1
-$ if src_check .eqs. "#" then goto mrloop
-$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
-$ rec = rec - src_check
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
-$MRSLOOP:
-$ read/end=mrdone min rec
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
-$MRDONE:
-$ close min
-$ close mod
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Take record extracted in crea_olist and split it into single filenames
-$!
-$EXTRA_FILNAM:
-$ myrec = f$edit(rec - "\", "trim,compress")
-$ i = 0
-$FELOOP:
-$ srcfil = f$element(i," ", myrec)
-$ if (srcfil .nes. " ")
-$ then
-$   write mod f$parse(srcfil,,,"NAME"), ".obj"
-$   i = i + 1
-$   goto feloop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Find current Zlib version number
-$!
-$FIND_VERSION:
-$ open/read h_in 'v_file'
-$hloop:
-$ read/end=hdone h_in rec
-$ rec = f$edit(rec,"TRIM")
-$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
-$ rec = f$edit(rec - "#", "TRIM")
-$ if f$element(0," ",rec) .nes. "define" then goto hloop
-$ if f$element(1," ",rec) .eqs. v_string
-$ then
-$   version = 'f$element(2," ",rec)'
-$   goto hdone
-$ endif
-$ goto hloop
-$hdone:
-$ close h_in
-$ return
-$!------------------------------------------------------------------------------
-$!
-$CHECK_CONFIG:
-$!
-$ in_ldef = f$locate(cdef,libdefs)
-$ if (in_ldef .lt. f$length(libdefs))
-$ then
-$   write aconf "#define ''cdef' 1"
-$   libdefs = f$extract(0,in_ldef,libdefs) + -
-              f$extract(in_ldef + f$length(cdef) + 1, -
-                        f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
-                        libdefs)
-$ else
-$   if (f$type('cdef') .eqs. "INTEGER")
-$   then
-$     write aconf "#define ''cdef' ", 'cdef'
-$   else
-$     if (f$type('cdef') .eqs. "STRING")
-$     then
-$       write aconf "#define ''cdef' ", """", '''cdef'', """"
-$     else
-$       gosub check_cc_def
-$     endif
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check if this is a define relating to the properties of the C/C++
-$! compiler
-$!
-$ CHECK_CC_DEF:
-$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
-$ then
-$   copy sys$input: 'tc'
-$   deck
-#include "tconfig"
-#define _LARGEFILE
-#include <stdio.h>
-
-int main(){
-FILE *fp;
-  fp = fopen("temp.txt","r");
-  fseeko(fp,1,SEEK_SET);
-  fclose(fp);
-}
-
-$   eod
-$   test_inv = false
-$   comm_h = false
-$   gosub cc_prop_check
-$   return
-$ endif
-$ write aconf "/* ", line, " */"
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler
-$!
-$! Version history
-$! 0.01 20031020 First version to receive a number
-$! 0.02 20031022 Added logic for defines with value
-$! 0.03 20040309 Make sure local config file gets not deleted
-$! 0.04 20041230 Also write include for configure run
-$! 0.05 20050103 Add processing of "comment defines"
-$CC_PROP_CHECK:
-$ cc_prop = true
-$ is_need = false
-$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
-$ if f$search(th) .eqs. "" then create 'th'
-$ set message/nofac/noident/nosever/notext
-$ on error then continue
-$ cc 'tmpnam'
-$ if .not. ($status)  then cc_prop = false
-$ on error then continue
-$! The headers might lie about the capabilities of the RTL
-$ link 'tmpnam',tmp.opt/opt
-$ if .not. ($status)  then cc_prop = false
-$ set message/fac/ident/sever/text
-$ on error then goto err_exit
-$ delete/nolog 'tmpnam'.*;*/exclude='th'
-$ if (cc_prop .and. .not. is_need) .or. -
-     (.not. cc_prop .and. is_need)
-$ then
-$   write sys$output "Checking for ''cdef'... yes"
-$   if f$type('cdef_val'_yes) .nes. ""
-$   then
-$     if f$type('cdef_val'_yes) .eqs. "INTEGER" -
-         then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
-$     if f$type('cdef_val'_yes) .eqs. "STRING" -
-         then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
-$   else
-$     call write_config f$fao("#define !AS 1",cdef)
-$   endif
-$   if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
-       (cdef .eqs. "_LARGEFILE64_SOURCE") then -
-      call write_config f$string("#define _LARGEFILE 1")
-$ else
-$   write sys$output "Checking for ''cdef'... no"
-$   if (comm_h)
-$   then
-      call write_config f$fao("/* !AS */",line)
-$   else
-$     if f$type('cdef_val'_no) .nes. ""
-$     then
-$       if f$type('cdef_val'_no) .eqs. "INTEGER" -
-           then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
-$       if f$type('cdef_val'_no) .eqs. "STRING" -
-           then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
-$     else
-$       call write_config f$fao("#undef !AS",cdef)
-$     endif
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler with multiple result values
-$!
-$! Version history
-$! 0.01 20040127 First version
-$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
-$CC_MPROP_CHECK:
-$ cc_prop = true
-$ i    = 1
-$ idel = 1
-$ MT_LOOP:
-$ if f$type(result_'i') .eqs. "STRING"
-$ then
-$   set message/nofac/noident/nosever/notext
-$   on error then continue
-$   cc 'tmpnam'_'i'
-$   if .not. ($status)  then cc_prop = false
-$   on error then continue
-$! The headers might lie about the capabilities of the RTL
-$   link 'tmpnam'_'i',tmp.opt/opt
-$   if .not. ($status)  then cc_prop = false
-$   set message/fac/ident/sever/text
-$   on error then goto err_exit
-$   delete/nolog 'tmpnam'_'i'.*;*
-$   if (cc_prop)
-$   then
-$     write sys$output "Checking for ''cdef'... ", mdef_'i'
-$     if f$type(mdef_'i') .eqs. "INTEGER" -
-         then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
-$     if f$type('cdef_val'_yes) .eqs. "STRING" -
-         then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
-$     goto msym_clean
-$   else
-$     i = i + 1
-$     goto mt_loop
-$   endif
-$ endif
-$ write sys$output "Checking for ''cdef'... no"
-$ call write_config f$fao("#undef !AS",cdef)
-$ MSYM_CLEAN:
-$ if (idel .le. msym_max)
-$ then
-$   delete/sym mdef_'idel'
-$   idel = idel + 1
-$   goto msym_clean
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Write configuration to both permanent and temporary config file
-$!
-$! Version history
-$! 0.01 20031029 First version to receive a number
-$!
-$WRITE_CONFIG: SUBROUTINE
-$  write aconf 'p1'
-$  open/append confh 'th'
-$  write confh 'p1'
-$  close confh
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------
-$!
-$! Analyze the project map file and create the symbol vector for a shareable
-$! image from it
-$!
-$! Version history
-$! 0.01 20120128 First version
-$! 0.02 20120226 Add pre-load logic
-$!
-$ MAP_2_SHOPT: Subroutine
-$!
-$ SAY := "WRITE_ SYS$OUTPUT"
-$!
-$ IF F$SEARCH("''P1'") .EQS. ""
-$ THEN
-$    SAY "MAP_2_SHOPT-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
-$    goto exit_m2s
-$ ENDIF
-$ IF "''P2'" .EQS. ""
-$ THEN
-$    SAY "MAP_2_SHOPT:  Error, no output file provided"
-$    goto exit_m2s
-$ ENDIF
-$!
-$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
-$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
-$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
-$ module4 = "inflateSync#uncompress#zlibVersion#compress"
-$ open/read map 'p1
-$ if axp .or. ia64
-$ then
-$     open/write aopt a.opt
-$     open/write bopt b.opt
-$     write aopt " CASE_SENSITIVE=YES"
-$     write bopt "SYMBOL_VECTOR= (-"
-$     mod_sym_num = 1
-$ MOD_SYM_LOOP:
-$     if f$type(module'mod_sym_num') .nes. ""
-$     then
-$         mod_in = 0
-$ MOD_SYM_IN:
-$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
-$         if shared_proc .nes. "#"
-$         then
-$             write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
-        		       f$edit(shared_proc,"upcase"),shared_proc)
-$             write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
-$             mod_in = mod_in + 1
-$             goto mod_sym_in
-$         endif
-$         mod_sym_num = mod_sym_num + 1
-$         goto mod_sym_loop
-$     endif
-$MAP_LOOP:
-$     read/end=map_end map line
-$     if (f$locate("{",line).lt. f$length(line)) .or. -
-         (f$locate("global:", line) .lt. f$length(line))
-$     then
-$         proc = true
-$         goto map_loop
-$     endif
-$     if f$locate("}",line).lt. f$length(line) then proc = false
-$     if f$locate("local:", line) .lt. f$length(line) then proc = false
-$     if proc
-$     then
-$         shared_proc = f$edit(line,"collapse")
-$         chop_semi = f$locate(";", shared_proc)
-$         if chop_semi .lt. f$length(shared_proc) then -
-              shared_proc = f$extract(0, chop_semi, shared_proc)
-$         write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
-        			 f$edit(shared_proc,"upcase"),shared_proc)
-$         write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
-$     endif
-$     goto map_loop
-$MAP_END:
-$     close/nolog aopt
-$     close/nolog bopt
-$     open/append libopt 'p2'
-$     open/read aopt a.opt
-$     open/read bopt b.opt
-$ALOOP:
-$     read/end=aloop_end aopt line
-$     write libopt line
-$     goto aloop
-$ALOOP_END:
-$     close/nolog aopt
-$     sv = ""
-$BLOOP:
-$     read/end=bloop_end bopt svn
-$     if (svn.nes."")
-$     then
-$        if (sv.nes."") then write libopt sv
-$        sv = svn
-$     endif
-$     goto bloop
-$BLOOP_END:
-$     write libopt f$extract(0,f$length(sv)-2,sv), "-"
-$     write libopt ")"
-$     close/nolog bopt
-$     delete/nolog/noconf a.opt;*,b.opt;*
-$ else
-$     if vax
-$     then
-$     open/append libopt 'p2'
-$     mod_sym_num = 1
-$ VMOD_SYM_LOOP:
-$     if f$type(module'mod_sym_num') .nes. ""
-$     then
-$         mod_in = 0
-$ VMOD_SYM_IN:
-$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
-$         if shared_proc .nes. "#"
-$         then
-$     	      write libopt f$fao("UNIVERSAL=!AS",-
-      	  			     f$edit(shared_proc,"upcase"))
-$             mod_in = mod_in + 1
-$             goto vmod_sym_in
-$         endif
-$         mod_sym_num = mod_sym_num + 1
-$         goto vmod_sym_loop
-$     endif
-$VMAP_LOOP:
-$     	  read/end=vmap_end map line
-$     	  if (f$locate("{",line).lt. f$length(line)) .or. -
-   	      (f$locate("global:", line) .lt. f$length(line))
-$     	  then
-$     	      proc = true
-$     	      goto vmap_loop
-$     	  endif
-$     	  if f$locate("}",line).lt. f$length(line) then proc = false
-$     	  if f$locate("local:", line) .lt. f$length(line) then proc = false
-$     	  if proc
-$     	  then
-$     	      shared_proc = f$edit(line,"collapse")
-$     	      chop_semi = f$locate(";", shared_proc)
-$     	      if chop_semi .lt. f$length(shared_proc) then -
-      	  	  shared_proc = f$extract(0, chop_semi, shared_proc)
-$     	      write libopt f$fao("UNIVERSAL=!AS",-
-      	  			     f$edit(shared_proc,"upcase"))
-$     	  endif
-$     	  goto vmap_loop
-$VMAP_END:
-$     else
-$         write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
-$         write sys$output "No options file created"
-$     endif
-$ endif
-$ EXIT_M2S:
-$ close/nolog map
-$ close/nolog libopt
-$ endsubroutine

crates/libz-sys/src/zlib/msdos/Makefile.bor

diff --git a/crates/libz-sys/src/zlib/msdos/Makefile.bor b/crates/libz-sys/src/zlib/msdos/Makefile.bor
deleted file mode 100644
index 3d12a2c..0000000
--- a/crates/libz-sys/src/zlib/msdos/Makefile.bor
+++ /dev/null
@@ -1,115 +0,0 @@
-# Makefile for zlib
-# Borland C++
-# Last updated: 15-Mar-2003
-
-# To use, do "make -fmakefile.bor"
-# To compile in small model, set below: MODEL=s
-
-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. For example:
-#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to the LOC macro below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------ Turbo C++, Borland C++ ------------
-
-#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
-#    to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-# type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
-CPU_TYP = 0
-
-# memory model: one of s, m, c, l (small, medium, compact, large)
-MODEL=l
-
-# replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
-CC=bcc
-LD=bcc
-AR=tlib
-
-# compiler flags
-# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
-CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
-
-LDFLAGS=-m$(MODEL) -f-
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del zlib_*.bak
-	-del foo.gz

crates/libz-sys/src/zlib/msdos/Makefile.dj2

diff --git a/crates/libz-sys/src/zlib/msdos/Makefile.dj2 b/crates/libz-sys/src/zlib/msdos/Makefile.dj2
deleted file mode 100644
index 59d2037..0000000
--- a/crates/libz-sys/src/zlib/msdos/Makefile.dj2
+++ /dev/null
@@ -1,104 +0,0 @@
-# Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.dj2;  make test -fmakefile.dj2
-#
-# To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
-#
-#    make install -fmakefile.dj2
-#
-# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
-# in the sample below if the pattern of the DJGPP distribution is to
-# be followed.  Remember that, while <sp>'es around <=> are ignored in
-# makefiles, they are *not* in batch files or in djgpp.env.
-# - - - - -
-# [make]
-# INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
-# LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
-# BUTT=-m486
-# - - - - -
-# Alternately, these variables may be defined below, overriding the values
-# in djgpp.env, as
-# INCLUDE_PATH=c:\usr\include
-# LIBRARY_PATH=c:\usr\lib
-
-CC=gcc
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lz
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=libz.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-OBJA =
-# to use the asm code: make OBJA=match.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-check: test
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-libz.a: $(OBJS) $(OBJA)
-	$(AR) $@ $(OBJS) $(OBJA)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
-
-.PHONY : uninstall clean
-
-install: $(INCL) $(LIBS)
-	-@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
-	-@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
-	$(INSTALL) zlib.h $(INCLUDE_PATH)
-	$(INSTALL) zconf.h $(INCLUDE_PATH)
-	$(INSTALL) libz.a $(LIBRARY_PATH)
-
-uninstall:
-	$(RM) $(INCLUDE_PATH)\zlib.h
-	$(RM) $(INCLUDE_PATH)\zconf.h
-	$(RM) $(LIBRARY_PATH)\libz.a
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) libz.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif

crates/libz-sys/src/zlib/msdos/Makefile.emx

diff --git a/crates/libz-sys/src/zlib/msdos/Makefile.emx b/crates/libz-sys/src/zlib/msdos/Makefile.emx
deleted file mode 100644
index e30f67b..0000000
--- a/crates/libz-sys/src/zlib/msdos/Makefile.emx
+++ /dev/null
@@ -1,69 +0,0 @@
-# Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.emx;  make test -fmakefile.emx
-#
-
-CC=gcc
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-	$(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) zlib.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif

crates/libz-sys/src/zlib/msdos/Makefile.msc

diff --git a/crates/libz-sys/src/zlib/msdos/Makefile.msc b/crates/libz-sys/src/zlib/msdos/Makefile.msc
deleted file mode 100644
index ae83786..0000000
--- a/crates/libz-sys/src/zlib/msdos/Makefile.msc
+++ /dev/null
@@ -1,112 +0,0 @@
-# Makefile for zlib
-# Microsoft C 5.1 or later
-# Last updated: 19-Mar-2003
-
-# To use, do "make makefile.msc"
-# To compile in small model, set below: MODEL=S
-
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to the LOC macro below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------- Microsoft C 5.1 and later -------------
-
-#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
-#    to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
-CPU_TYP = 0
-
-# Memory model: one of S, M, C, L (small, medium, compact, large)
-MODEL=L
-
-CC=cl
-CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
-#-Ox generates bad code with MSC 5.1
-LIB_CFLAGS=-Zl $(CFLAGS)
-
-LD=link
-LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
-# "/farcall/packcode" are only useful for `large code' memory models
-# but should be a "no-op" for small code models.
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-
-
-# targets
-all:  $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(LIB_CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	if exist $(ZLIB_LIB) del $(ZLIB_LIB)
-	lib $(ZLIB_LIB) $(OBJ1);
-	lib $(ZLIB_LIB) $(OBJ2);
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB);
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB);
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del *.map
-	-del zlib_*.bak
-	-del foo.gz

crates/libz-sys/src/zlib/msdos/Makefile.tc

diff --git a/crates/libz-sys/src/zlib/msdos/Makefile.tc b/crates/libz-sys/src/zlib/msdos/Makefile.tc
deleted file mode 100644
index 5aec82a..0000000
--- a/crates/libz-sys/src/zlib/msdos/Makefile.tc
+++ /dev/null
@@ -1,100 +0,0 @@
-# Makefile for zlib
-# Turbo C 2.01, Turbo C++ 1.01
-# Last updated: 15-Mar-2003
-
-# To use, do "make -fmakefile.tc"
-# To compile in small model, set below: MODEL=s
-
-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. For example:
-#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to CFLAGS below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------ Turbo C 2.01, Turbo C++ 1.01 ------------
-MODEL=l
-CC=tcc
-LD=tcc
-AR=tlib
-# CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-CFLAGS=-O2 -G -Z -m$(MODEL)
-LDFLAGS=-m$(MODEL) -f-
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del zlib_*.bak
-	-del foo.gz

crates/libz-sys/src/zlib/nintendods/Makefile

diff --git a/crates/libz-sys/src/zlib/nintendods/Makefile b/crates/libz-sys/src/zlib/nintendods/Makefile
deleted file mode 100644
index 21337d0..0000000
--- a/crates/libz-sys/src/zlib/nintendods/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
-
-include $(DEVKITARM)/ds_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(shell basename $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	../../
-DATA		:=	data
-INCLUDES	:=	include
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-mthumb -mthumb-interwork
-
-CFLAGS	:=	-Wall -O2\
-		-march=armv5te -mtune=arm946e-s \
-		-fomit-frame-pointer -ffast-math \
-		$(ARCH)
-
-CFLAGS	+=	$(INCLUDE) -DARM9
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions
-
-ASFLAGS	:=	$(ARCH) -march=armv5te -mtune=arm946e-s
-LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=	$(LIBNDS)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/lib/libz.a
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-			$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-	@[ -d $@ ] || mkdir -p include
-	@cp ../../*.h include
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-	
-$(BUILD): lib
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) lib
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT)	:	$(OFILES)
-
-#---------------------------------------------------------------------------------
-%.bin.o	:	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------

crates/libz-sys/src/zlib/nintendods/README

diff --git a/crates/libz-sys/src/zlib/nintendods/README b/crates/libz-sys/src/zlib/nintendods/README
deleted file mode 100644
index ba7a37d..0000000
--- a/crates/libz-sys/src/zlib/nintendods/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This Makefile requires devkitARM (http://www.devkitpro.org/category/devkitarm/) and works inside "contrib/nds". It is based on a devkitARM template.
-
-Eduardo Costa <eduardo.m.costa@gmail.com>
-January 3, 2009
-

crates/libz-sys/src/zlib/old/Makefile.emx

diff --git a/crates/libz-sys/src/zlib/old/Makefile.emx b/crates/libz-sys/src/zlib/old/Makefile.emx
deleted file mode 100644
index 612b037..0000000
--- a/crates/libz-sys/src/zlib/old/Makefile.emx
+++ /dev/null
@@ -1,69 +0,0 @@
-# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.emx;  make test -fmakefile.emx
-#
-
-CC=gcc -Zwin32
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
-       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-	$(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) zlib.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif

crates/libz-sys/src/zlib/old/Makefile.riscos

diff --git a/crates/libz-sys/src/zlib/old/Makefile.riscos b/crates/libz-sys/src/zlib/old/Makefile.riscos
deleted file mode 100644
index 57e29d3..0000000
--- a/crates/libz-sys/src/zlib/old/Makefile.riscos
+++ /dev/null
@@ -1,151 +0,0 @@
-# Project:   zlib_1_03
-# Patched for zlib 1.1.2 rw@shadow.org.uk 19980430
-# test works out-of-the-box, installs `somewhere' on demand
-
-# Toolflags:
-CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah
-C++flags = -c -depend !Depend -IC: -throwback
-Linkflags = -aif -c++ -o $@
-ObjAsmflags = -throwback -NoCache -depend !Depend
-CMHGflags =
-LibFileflags = -c -l -o $@
-Squeezeflags = -o $@
-
-# change the line below to where _you_ want the library installed.
-libdest = lib:zlib
-
-# Final targets:
-@.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
-        @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
-        @.o.uncompr @.o.zutil
-        LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
-        @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
-        @.o.trees @.o.uncompr @.o.zutil
-test:   @.minigzip @.example @.lib
-	@copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
-	@echo running tests: hang on.
-	@/@.minigzip -f -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -f -1 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -h -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -h -1 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -1 libc
-	@/@.minigzip -d libc-gz
-	@diff @.lib @.libc
-	@echo that should have reported '@.lib and @.libc identical' if you have diff.
-	@/@.example @.fred @.fred
-	@echo that will have given lots of hello!'s.
-
-@.minigzip:   @.o.minigzip @.lib C:o.Stubs
-        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs
-@.example:   @.o.example @.lib C:o.Stubs
-        Link $(Linkflags) @.o.example @.lib C:o.Stubs
-
-install: @.lib
-	cdir $(libdest)
-	cdir $(libdest).h
-	@copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV
-	@copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV
-	@copy @.lib $(libdest).lib  A~C~DF~L~N~P~Q~RS~TV
-	@echo okay, installed zlib in $(libdest)
-
-clean:; remove @.minigzip
-	remove @.example
-	remove @.libc
-	-wipe @.o.* F~r~cV
-	remove @.fred
-
-# User-editable dependencies:
-.c.o:
-        cc $(ccflags) -o $@ $<
-
-# Static dependencies:
-
-# Dynamic dependencies:
-o.example:	c.example
-o.example:	h.zlib
-o.example:	h.zconf
-o.minigzip:	c.minigzip
-o.minigzip:	h.zlib
-o.minigzip:	h.zconf
-o.adler32:	c.adler32
-o.adler32:	h.zlib
-o.adler32:	h.zconf
-o.compress:	c.compress
-o.compress:	h.zlib
-o.compress:	h.zconf
-o.crc32:	c.crc32
-o.crc32:	h.zlib
-o.crc32:	h.zconf
-o.deflate:	c.deflate
-o.deflate:	h.deflate
-o.deflate:	h.zutil
-o.deflate:	h.zlib
-o.deflate:	h.zconf
-o.gzio:	c.gzio
-o.gzio:	h.zutil
-o.gzio:	h.zlib
-o.gzio:	h.zconf
-o.infblock:	c.infblock
-o.infblock:	h.zutil
-o.infblock:	h.zlib
-o.infblock:	h.zconf
-o.infblock:	h.infblock
-o.infblock:	h.inftrees
-o.infblock:	h.infcodes
-o.infblock:	h.infutil
-o.infcodes:	c.infcodes
-o.infcodes:	h.zutil
-o.infcodes:	h.zlib
-o.infcodes:	h.zconf
-o.infcodes:	h.inftrees
-o.infcodes:	h.infblock
-o.infcodes:	h.infcodes
-o.infcodes:	h.infutil
-o.infcodes:	h.inffast
-o.inffast:	c.inffast
-o.inffast:	h.zutil
-o.inffast:	h.zlib
-o.inffast:	h.zconf
-o.inffast:	h.inftrees
-o.inffast:	h.infblock
-o.inffast:	h.infcodes
-o.inffast:	h.infutil
-o.inffast:	h.inffast
-o.inflate:	c.inflate
-o.inflate:	h.zutil
-o.inflate:	h.zlib
-o.inflate:	h.zconf
-o.inflate:	h.infblock
-o.inftrees:	c.inftrees
-o.inftrees:	h.zutil
-o.inftrees:	h.zlib
-o.inftrees:	h.zconf
-o.inftrees:	h.inftrees
-o.inftrees:	h.inffixed
-o.infutil:	c.infutil
-o.infutil:	h.zutil
-o.infutil:	h.zlib
-o.infutil:	h.zconf
-o.infutil:	h.infblock
-o.infutil:	h.inftrees
-o.infutil:	h.infcodes
-o.infutil:	h.infutil
-o.trees:	c.trees
-o.trees:	h.deflate
-o.trees:	h.zutil
-o.trees:	h.zlib
-o.trees:	h.zconf
-o.trees:	h.trees
-o.uncompr:	c.uncompr
-o.uncompr:	h.zlib
-o.uncompr:	h.zconf
-o.zutil:	c.zutil
-o.zutil:	h.zutil
-o.zutil:	h.zlib
-o.zutil:	h.zconf

crates/libz-sys/src/zlib/old/README

diff --git a/crates/libz-sys/src/zlib/old/README b/crates/libz-sys/src/zlib/old/README
deleted file mode 100644
index 800bf07..0000000
--- a/crates/libz-sys/src/zlib/old/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains files that have not been updated for zlib 1.2.x
-
-(Volunteers are encouraged to help clean this up.  Thanks.)

crates/libz-sys/src/zlib/old/descrip.mms

diff --git a/crates/libz-sys/src/zlib/old/descrip.mms b/crates/libz-sys/src/zlib/old/descrip.mms
deleted file mode 100644
index 7066da5..0000000
--- a/crates/libz-sys/src/zlib/old/descrip.mms
+++ /dev/null
@@ -1,48 +0,0 @@
-# descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser <m.zinser@gsi.de>
-
-cc_defs =
-c_deb =
-
-.ifdef __DECC__
-pref = /prefix=all
-.endif
-
-OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
-       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
-       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
-
-CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
-
-all : example.exe minigzip.exe
-        @ write sys$output " Example applications available"
-libz.olb : libz.olb($(OBJS))
-	@ write sys$output " libz available"
-
-example.exe : example.obj libz.olb
-              link example,libz.olb/lib
-
-minigzip.exe : minigzip.obj libz.olb
-              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
-
-clean :
-	delete *.obj;*,libz.olb;*
-
-
-# Other dependencies.
-adler32.obj : zutil.h zlib.h zconf.h
-compress.obj : zlib.h zconf.h
-crc32.obj : zutil.h zlib.h zconf.h
-deflate.obj : deflate.h zutil.h zlib.h zconf.h
-example.obj : zlib.h zconf.h
-gzio.obj : zutil.h zlib.h zconf.h
-infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
-inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-inflate.obj : zutil.h zlib.h zconf.h infblock.h
-inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
-infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
-minigzip.obj : zlib.h zconf.h
-trees.obj : deflate.h zutil.h zlib.h zconf.h
-uncompr.obj : zlib.h zconf.h
-zutil.obj : zutil.h zlib.h zconf.h

crates/libz-sys/src/zlib/old/os2/Makefile.os2

diff --git a/crates/libz-sys/src/zlib/old/os2/Makefile.os2 b/crates/libz-sys/src/zlib/old/os2/Makefile.os2
deleted file mode 100644
index bb426c0..0000000
--- a/crates/libz-sys/src/zlib/old/os2/Makefile.os2
+++ /dev/null
@@ -1,136 +0,0 @@
-# Makefile for zlib under OS/2 using GCC (PGCC)
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#   cp Makefile.os2 ..
-#   cd ..
-#   make -f Makefile.os2 test
-
-# This makefile will build a static library z.lib, a shared library
-# z.dll and a import library zdll.lib. You can use either z.lib or
-# zdll.lib by specifying either -lz or -lzdll on gcc's command line
-
-CC=gcc -Zomf -s
-
-CFLAGS=-O6 -Wall
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-#################### BUG WARNING: #####################
-## infcodes.c hits a bug in pgcc-1.0, so you have to use either
-## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem)
-## This bug is reportedly fixed in pgcc >1.0, but this was not tested
-CFLAGS+=-fno-force-mem
-
-LDFLAGS=-s -L. -lzdll -Zcrtdll
-LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll
-
-VER=1.1.0
-ZLIB=z.lib
-SHAREDLIB=z.dll
-SHAREDLIBIMP=zdll.lib
-LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
-
-AR=emxomfar cr
-IMPLIB=emximp
-RANLIB=echo
-TAR=tar
-SHELL=bash
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
-  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
-  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
-  contrib/asm386/*.asm contrib/asm386/*.c \
-  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
-  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
-  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
-
-all: example.exe minigzip.exe
-
-test: all
-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d || \
-	  echo '		*** minigzip test FAILED ***' ; \
-	if ./example; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; \
-	fi
-
-$(ZLIB): $(OBJS)
-	$(AR) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-$(SHAREDLIB): $(OBJS) os2/z.def
-	$(LDSHARED) -o $@ $^
-
-$(SHAREDLIBIMP): os2/z.def
-	$(IMPLIB) -o $@ $^
-
-example.exe: example.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-
-minigzip.exe: minigzip.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
-clean:
-	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
-
-distclean:	clean
-
-zip:
-	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	rm -f test.c ztest*.c
-	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-	zip -ul9 zlib$$v $(DISTFILES)
-	mv Makefile~ Makefile
-
-dist:
-	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	rm -f test.c ztest*.c
-	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-	rm -f $$d.tar.gz; \
-	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
-	files=""; \
-	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
-	cd ..; \
-	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
-	if test ! -d $$d; then rm -f $$d; fi
-	mv Makefile~ Makefile
-
-tags:
-	etags *.[ch]
-
-depend:
-	makedepend -- $(CFLAGS) -- *.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
-infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
-infcodes.o: zutil.h zlib.h zconf.h
-infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h
-inffast.o: infblock.h infcodes.h infutil.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h infblock.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h

crates/libz-sys/src/zlib/old/os2/zlib.def

diff --git a/crates/libz-sys/src/zlib/old/os2/zlib.def b/crates/libz-sys/src/zlib/old/os2/zlib.def
deleted file mode 100644
index 4c753f1..0000000
--- a/crates/libz-sys/src/zlib/old/os2/zlib.def
+++ /dev/null
@@ -1,51 +0,0 @@
-;
-; Slightly modified version of ../nt/zlib.dnt :-)
-;
-
-LIBRARY		Z
-DESCRIPTION	"Zlib compression library for OS/2"
-CODE		PRELOAD MOVEABLE DISCARDABLE
-DATA		PRELOAD MOVEABLE MULTIPLE
-
-EXPORTS
-    adler32
-    compress
-    crc32
-    deflate
-    deflateCopy
-    deflateEnd
-    deflateInit2_
-    deflateInit_
-    deflateParams
-    deflateReset
-    deflateSetDictionary
-    gzclose
-    gzdopen
-    gzerror
-    gzflush
-    gzopen
-    gzread
-    gzwrite
-    inflate
-    inflateEnd
-    inflateInit2_
-    inflateInit_
-    inflateReset
-    inflateSetDictionary
-    inflateSync
-    uncompress
-    zlibVersion
-    gzprintf
-    gzputc
-    gzgetc
-    gzseek
-    gzrewind
-    gztell
-    gzeof
-    gzsetparams
-    zError
-    inflateSyncPoint
-    get_crc_table
-    compress2
-    gzputs
-    gzgets

crates/libz-sys/src/zlib/old/visual-basic.txt

diff --git a/crates/libz-sys/src/zlib/old/visual-basic.txt b/crates/libz-sys/src/zlib/old/visual-basic.txt
deleted file mode 100644
index 57efe58..0000000
--- a/crates/libz-sys/src/zlib/old/visual-basic.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-See below some functions declarations for Visual Basic.
-
-Frequently Asked Question:
-
-Q: Each time I use the compress function I get the -5 error (not enough
-   room in the output buffer).
-
-A: Make sure that the length of the compressed buffer is passed by
-   reference ("as any"), not by value ("as long"). Also check that
-   before the call of compress this length is equal to the total size of
-   the compressed buffer and not zero.
-
-
-From: "Jon Caruana" <jon-net@usa.net>
-Subject: Re: How to port zlib declares to vb?
-Date: Mon, 28 Oct 1996 18:33:03 -0600
-
-Got the answer! (I haven't had time to check this but it's what I got, and
-looks correct):
-
-He has the following routines working:
-        compress
-        uncompress
-        gzopen
-        gzwrite
-        gzread
-        gzclose
-
-Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
-
-#If Win16 Then   'Use Win16 calls.
-Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
-        String, comprLen As Any, ByVal buf As String, ByVal buflen
-        As Long) As Integer
-Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
-        As String, uncomprLen As Any, ByVal compr As String, ByVal
-        lcompr As Long) As Integer
-Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
-        String, ByVal mode As String) As Long
-Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
-        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
-        As Integer
-Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
-        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
-        As Integer
-Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
-        Long) As Integer
-#Else
-Declare Function compress Lib "ZLIB32.DLL"
-        (ByVal compr As String, comprLen As Any, ByVal buf As
-        String, ByVal buflen As Long) As Integer
-Declare Function uncompress Lib "ZLIB32.DLL"
-        (ByVal uncompr As String, uncomprLen As Any, ByVal compr As
-        String, ByVal lcompr As Long) As Long
-Declare Function gzopen Lib "ZLIB32.DLL"
-        (ByVal file As String, ByVal mode As String) As Long
-Declare Function gzread Lib "ZLIB32.DLL"
-        (ByVal file As Long, ByVal uncompr As String, ByVal
-        uncomprLen As Long) As Long
-Declare Function gzwrite Lib "ZLIB32.DLL"
-        (ByVal file As Long, ByVal uncompr As String, ByVal
-        uncomprLen As Long) As Long
-Declare Function gzclose Lib "ZLIB32.DLL"
-        (ByVal file As Long) As Long
-#End If
-
--Jon Caruana
-jon-net@usa.net
-Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
-
-
-Here is another example from Michael <michael_borgsys@hotmail.com> that he
-says conforms to the VB guidelines, and that solves the problem of not
-knowing the uncompressed size by storing it at the end of the file:
-
-'Calling the functions:
-'bracket meaning: <parameter> [optional] {Range of possible values}
-'Call subCompressFile(<path with filename to compress> [, <path with
-filename to write to>, [level of compression {1..9}]])
-'Call subUncompressFile(<path with filename to compress>)
-
-Option Explicit
-Private lngpvtPcnSml As Long 'Stores value for 'lngPercentSmaller'
-Private Const SUCCESS As Long = 0
-Private Const strFilExt As String = ".cpr"
-Private Declare Function lngfncCpr Lib "zlib.dll" Alias "compress2" (ByRef
-dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long,
-ByVal level As Integer) As Long
-Private Declare Function lngfncUcp Lib "zlib.dll" Alias "uncompress" (ByRef
-dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long)
-As Long
-
-Public Sub subCompressFile(ByVal strargOriFilPth As String, Optional ByVal
-strargCprFilPth As String, Optional ByVal intLvl As Integer = 9)
-    Dim strCprPth As String
-    Dim lngOriSiz As Long
-    Dim lngCprSiz As Long
-    Dim bytaryOri() As Byte
-    Dim bytaryCpr() As Byte
-    lngOriSiz = FileLen(strargOriFilPth)
-    ReDim bytaryOri(lngOriSiz - 1)
-    Open strargOriFilPth For Binary Access Read As #1
-        Get #1, , bytaryOri()
-    Close #1
-    strCprPth = IIf(strargCprFilPth = "", strargOriFilPth, strargCprFilPth)
-'Select file path and name
-    strCprPth = strCprPth & IIf(Right(strCprPth, Len(strFilExt)) =
-strFilExt, "", strFilExt) 'Add file extension if not exists
-    lngCprSiz = (lngOriSiz * 1.01) + 12 'Compression needs temporary a bit
-more space then original file size
-    ReDim bytaryCpr(lngCprSiz - 1)
-    If lngfncCpr(bytaryCpr(0), lngCprSiz, bytaryOri(0), lngOriSiz, intLvl) =
-SUCCESS Then
-        lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
-        ReDim Preserve bytaryCpr(lngCprSiz - 1)
-        Open strCprPth For Binary Access Write As #1
-            Put #1, , bytaryCpr()
-            Put #1, , lngOriSiz 'Add the the original size value to the end
-(last 4 bytes)
-        Close #1
-    Else
-        MsgBox "Compression error"
-    End If
-    Erase bytaryCpr
-    Erase bytaryOri
-End Sub
-
-Public Sub subUncompressFile(ByVal strargFilPth As String)
-    Dim bytaryCpr() As Byte
-    Dim bytaryOri() As Byte
-    Dim lngOriSiz As Long
-    Dim lngCprSiz As Long
-    Dim strOriPth As String
-    lngCprSiz = FileLen(strargFilPth)
-    ReDim bytaryCpr(lngCprSiz - 1)
-    Open strargFilPth For Binary Access Read As #1
-        Get #1, , bytaryCpr()
-    Close #1
-    'Read the original file size value:
-    lngOriSiz = bytaryCpr(lngCprSiz - 1) * (2 ^ 24) _
-              + bytaryCpr(lngCprSiz - 2) * (2 ^ 16) _
-              + bytaryCpr(lngCprSiz - 3) * (2 ^ 8) _
-              + bytaryCpr(lngCprSiz - 4)
-    ReDim Preserve bytaryCpr(lngCprSiz - 5) 'Cut of the original size value
-    ReDim bytaryOri(lngOriSiz - 1)
-    If lngfncUcp(bytaryOri(0), lngOriSiz, bytaryCpr(0), lngCprSiz) = SUCCESS
-Then
-        strOriPth = Left(strargFilPth, Len(strargFilPth) - Len(strFilExt))
-        Open strOriPth For Binary Access Write As #1
-            Put #1, , bytaryOri()
-        Close #1
-    Else
-        MsgBox "Uncompression error"
-    End If
-    Erase bytaryCpr
-    Erase bytaryOri
-End Sub
-Public Property Get lngPercentSmaller() As Long
-    lngPercentSmaller = lngpvtPcnSml
-End Property

crates/libz-sys/src/zlib/os400/README400

diff --git a/crates/libz-sys/src/zlib/os400/README400 b/crates/libz-sys/src/zlib/os400/README400
deleted file mode 100644
index 4f98334..0000000
--- a/crates/libz-sys/src/zlib/os400/README400
+++ /dev/null
@@ -1,48 +0,0 @@
-        ZLIB version 1.2.11 for OS/400 installation instructions
-
-1) Download and unpack the zlib tarball to some IFS directory.
-   (i.e.: /path/to/the/zlib/ifs/source/directory)
-
-   If the installed IFS command suppors gzip format, this is straightforward,
-else you have to unpack first to some directory on a system supporting it,
-then move the whole directory to the IFS via the network (via SMB or FTP).
-
-2) Edit the configuration parameters in the compilation script.
-
-        EDTF STMF('/path/to/the/zlib/ifs/source/directory/os400/make.sh')
-
-Tune the parameters according to your needs if not matching the defaults.
-Save the file and exit after edition.
-
-3) Enter qshell, then work in the zlib OS/400 specific directory.
-
-        QSH
-        cd /path/to/the/zlib/ifs/source/directory/os400
-
-4) Compile and install
-
-        sh make.sh
-
-The script will:
-- create the libraries, objects and IFS directories for the zlib environment,
-- compile all modules,
-- create a service program,
-- create a static and a dynamic binding directory,
-- install header files for C/C++ and for ILE/RPG, both for compilation in
-  DB2 and IFS environments.
-
-That's all. 
-
-
-Notes:  For OS/400 ILE RPG programmers, a /copy member defining the ZLIB
-                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
-                In the ILE environment, the same definitions are available from
-                file zlib.inc located in the same IFS include directory as the
-                C/C++ header files.
-                Please read comments in this member for more information.
-
-        Remember that most foreign textual data are ASCII coded: this
-                implementation does not handle conversion from/to ASCII, so
-                text data code conversions must be done explicitely.
-
-        Mainly for the reason above, always open zipped files in binary mode.

crates/libz-sys/src/zlib/os400/bndsrc

diff --git a/crates/libz-sys/src/zlib/os400/bndsrc b/crates/libz-sys/src/zlib/os400/bndsrc
deleted file mode 100644
index 5e6e0a2..0000000
--- a/crates/libz-sys/src/zlib/os400/bndsrc
+++ /dev/null
@@ -1,119 +0,0 @@
-STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.1.3 entry points.                                    */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32")
-  EXPORT SYMBOL("compress")
-  EXPORT SYMBOL("compress2")
-  EXPORT SYMBOL("crc32")
-  EXPORT SYMBOL("get_crc_table")
-  EXPORT SYMBOL("deflate")
-  EXPORT SYMBOL("deflateEnd")
-  EXPORT SYMBOL("deflateSetDictionary")
-  EXPORT SYMBOL("deflateCopy")
-  EXPORT SYMBOL("deflateReset")
-  EXPORT SYMBOL("deflateParams")
-  EXPORT SYMBOL("deflatePrime")
-  EXPORT SYMBOL("deflateInit_")
-  EXPORT SYMBOL("deflateInit2_")
-  EXPORT SYMBOL("gzopen")
-  EXPORT SYMBOL("gzdopen")
-  EXPORT SYMBOL("gzsetparams")
-  EXPORT SYMBOL("gzread")
-  EXPORT SYMBOL("gzwrite")
-  EXPORT SYMBOL("gzprintf")
-  EXPORT SYMBOL("gzputs")
-  EXPORT SYMBOL("gzgets")
-  EXPORT SYMBOL("gzputc")
-  EXPORT SYMBOL("gzgetc")
-  EXPORT SYMBOL("gzflush")
-  EXPORT SYMBOL("gzseek")
-  EXPORT SYMBOL("gzrewind")
-  EXPORT SYMBOL("gztell")
-  EXPORT SYMBOL("gzeof")
-  EXPORT SYMBOL("gzclose")
-  EXPORT SYMBOL("gzerror")
-  EXPORT SYMBOL("inflate")
-  EXPORT SYMBOL("inflateEnd")
-  EXPORT SYMBOL("inflateSetDictionary")
-  EXPORT SYMBOL("inflateSync")
-  EXPORT SYMBOL("inflateReset")
-  EXPORT SYMBOL("inflateInit_")
-  EXPORT SYMBOL("inflateInit2_")
-  EXPORT SYMBOL("inflateSyncPoint")
-  EXPORT SYMBOL("uncompress")
-  EXPORT SYMBOL("zlibVersion")
-  EXPORT SYMBOL("zError")
-  EXPORT SYMBOL("z_errmsg")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.1 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("compressBound")
-  EXPORT SYMBOL("deflateBound")
-  EXPORT SYMBOL("deflatePending")
-  EXPORT SYMBOL("gzungetc")
-  EXPORT SYMBOL("gzclearerr")
-  EXPORT SYMBOL("inflateBack")
-  EXPORT SYMBOL("inflateBackEnd")
-  EXPORT SYMBOL("inflateBackInit_")
-  EXPORT SYMBOL("inflateCopy")
-  EXPORT SYMBOL("zlibCompileFlags")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.4 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32_combine")
-  EXPORT SYMBOL("adler32_combine64")
-  EXPORT SYMBOL("crc32_combine")
-  EXPORT SYMBOL("crc32_combine64")
-  EXPORT SYMBOL("deflateSetHeader")
-  EXPORT SYMBOL("deflateTune")
-  EXPORT SYMBOL("gzbuffer")
-  EXPORT SYMBOL("gzclose_r")
-  EXPORT SYMBOL("gzclose_w")
-  EXPORT SYMBOL("gzdirect")
-  EXPORT SYMBOL("gzoffset")
-  EXPORT SYMBOL("gzoffset64")
-  EXPORT SYMBOL("gzopen64")
-  EXPORT SYMBOL("gzseek64")
-  EXPORT SYMBOL("gztell64")
-  EXPORT SYMBOL("inflateGetHeader")
-  EXPORT SYMBOL("inflateMark")
-  EXPORT SYMBOL("inflatePrime")
-  EXPORT SYMBOL("inflateReset2")
-  EXPORT SYMBOL("inflateUndermine")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.6 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("deflateResetKeep")
-  EXPORT SYMBOL("gzgetc_")
-  EXPORT SYMBOL("inflateResetKeep")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.8 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("gzvprintf")
-  EXPORT SYMBOL("inflateGetDictionary")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.9 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32_z")
-  EXPORT SYMBOL("crc32_z")
-  EXPORT SYMBOL("deflateGetDictionary")
-  EXPORT SYMBOL("gzfread")
-  EXPORT SYMBOL("gzfwrite")
-  EXPORT SYMBOL("inflateCodesUsed")
-  EXPORT SYMBOL("inflateValidate")
-  EXPORT SYMBOL("uncompress2")
-
-ENDPGMEXP

crates/libz-sys/src/zlib/os400/make.sh

diff --git a/crates/libz-sys/src/zlib/os400/make.sh b/crates/libz-sys/src/zlib/os400/make.sh
deleted file mode 100644
index 19eec11..0000000
--- a/crates/libz-sys/src/zlib/os400/make.sh
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/bin/sh
-#
-#       ZLIB compilation script for the OS/400.
-#
-#
-#       This is a shell script since make is not a standard component of OS/400.
-
-
-################################################################################
-#
-#                       Tunable configuration parameters.
-#
-################################################################################
-
-TARGETLIB='ZLIB'                # Target OS/400 program library
-STATBNDDIR='ZLIB_A'             # Static binding directory.
-DYNBNDDIR='ZLIB'                # Dynamic binding directory.
-SRVPGM="ZLIB"                   # Service program.
-IFSDIR='/zlib'                  # IFS support base directory.
-TGTCCSID='500'                  # Target CCSID of objects
-DEBUG='*NONE'                   # Debug level
-OPTIMIZE='40'                   # Optimisation level
-OUTPUT='*NONE'                  # Compilation output option.
-TGTRLS='V6R1M0'                 # Target OS release
-
-export TARGETLIB STATBNDDIR DYNBNDDIR SRVPGM IFSDIR
-export TGTCCSID DEBUG OPTIMIZE OUTPUT TGTRLS
-
-
-################################################################################
-#
-#                       OS/400 specific definitions.
-#
-################################################################################
-
-LIBIFSNAME="/QSYS.LIB/${TARGETLIB}.LIB"
-
-
-################################################################################
-#
-#                               Procedures.
-#
-################################################################################
-
-#       action_needed dest [src]
-#
-#       dest is an object to build
-#       if specified, src is an object on which dest depends.
-#
-#       exit 0 (succeeds) if some action has to be taken, else 1.
-
-action_needed()
-
-{
-        [ ! -e "${1}" ] && return 0
-        [ "${2}" ] || return 1
-        [ "${1}" -ot "${2}" ] && return 0
-        return 1
-}
-
-
-#       make_module module_name source_name [additional_definitions]
-#
-#       Compile source name into module if needed.
-#       As side effect, append the module name to variable MODULES.
-#       Set LINK to "YES" if the module has been compiled.
-
-make_module()
-
-{
-    MODULES="${MODULES} ${1}"
-    MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
-    CSRC="`basename \"${2}\"`"
-
-    if action_needed "${MODIFSNAME}" "${2}"
-    then    :
-    elif [ ! "`sed -e \"/<source name=\\\"${CSRC}\\\">/,/<\\\\/source>/!d\" \
-      -e '/<depend /!d'                                                 \
-      -e 's/.* name=\"\\([^\"]*\\)\".*/\\1/' < \"${TOPDIR}/treebuild.xml\" |
-        while read HDR
-        do      if action_needed \"${MODIFSNAME}\" \"${IFSDIR}/include/${HDR}\"
-                then    echo recompile
-                        break
-                fi
-        done`" ]
-    then    return 0
-    fi
-
-    CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('${2}')"
-    CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)"
-    CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
-    CMD="${CMD} INCDIR('${IFSDIR}/include' ${INCLUDES})"
-    CMD="${CMD} TGTCCSID(${TGTCCSID}) TGTRLS(${TGTRLS})"
-    CMD="${CMD} OUTPUT(${OUTPUT})"
-    CMD="${CMD} OPTIMIZE(${OPTIMIZE})"
-    CMD="${CMD} DBGVIEW(${DEBUG})"
-    system "${CMD}"
-    LINK=YES
-}
-
-
-#       Determine DB2 object name from IFS name.
-
-db2_name()
-
-{
-        basename "${1}"                                                 |
-        tr 'a-z-' 'A-Z_'                                                |
-        sed -e 's/\..*//'                                               \
-            -e 's/^\(.\).*\(.........\)$/\1\2/'
-}
-
-
-#       Force enumeration types to be the same size as integers.
-
-copy_hfile()
-
-{
-        sed -e '1i\
-#pragma enum(int)\
-' "${@}" -e '$a\
-#pragma enum(pop)\
-'
-}
-
-
-################################################################################
-#
-#                             Script initialization.
-#
-################################################################################
-
-SCRIPTDIR=`dirname "${0}"`
-
-case "${SCRIPTDIR}" in
-/*)     ;;
-*)      SCRIPTDIR="`pwd`/${SCRIPTDIR}"
-esac
-
-while true
-do      case "${SCRIPTDIR}" in
-        */.)    SCRIPTDIR="${SCRIPTDIR%/.}";;
-        *)      break;;
-        esac
-done
-
-#  The script directory is supposed to be in ${TOPDIR}/os400.
-
-TOPDIR=`dirname "${SCRIPTDIR}"`
-export SCRIPTDIR TOPDIR
-cd "${TOPDIR}"
-
-
-#  Extract the version from the master compilation XML file.
-
-VERSION=`sed -e '/^<package /!d'                                        \
-            -e 's/^.* version="\([0-9.]*\)".*$/\1/' -e 'q'              \
-            < treebuild.xml`
-export VERSION
-
-################################################################################
-
-
-#       Create the OS/400 library if it does not exist.
-
-if action_needed "${LIBIFSNAME}"
-then    CMD="CRTLIB LIB(${TARGETLIB}) TEXT('ZLIB: Data compression API')"
-        system "${CMD}"
-fi
-
-
-#       Create the DOCS source file if it does not exist.
-
-if action_needed "${LIBIFSNAME}/DOCS.FILE"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/DOCS) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('Documentation texts')"
-        system "${CMD}"
-fi
-
-#       Copy some documentation files if needed.
-
-for TEXT in "${TOPDIR}/ChangeLog" "${TOPDIR}/FAQ"                       \
-    "${TOPDIR}/README" "${SCRIPTDIR}/README400"
-do      MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${TEXT}\"`.MBR"
-
-        if action_needed "${MEMBER}" "${TEXT}"
-        then    CMD="CPY OBJ('${TEXT}') TOOBJ('${MEMBER}') TOCCSID(${TGTCCSID})"
-                CMD="${CMD} DTAFMT(*TEXT) REPLACE(*YES)"
-                system "${CMD}"
-        fi
-done
-
-
-#       Create the OS/400 source program file for the C header files.
-
-SRCPF="${LIBIFSNAME}/H.FILE"
-
-if action_needed "${SRCPF}"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/H) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: C/C++ header files')"
-        system "${CMD}"
-fi
-
-
-#       Create the IFS directory for the C header files.
-
-if action_needed "${IFSDIR}/include"
-then    mkdir -p "${IFSDIR}/include"
-fi
-
-#       Copy the header files to DB2 library. Link from IFS include directory.
-
-for HFILE in "${TOPDIR}/"*.h
-do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"
-
-        if action_needed "${DEST}" "${HFILE}"
-        then    copy_hfile < "${HFILE}" > tmphdrfile
-
-                #       Need to translate to target CCSID.
-
-                CMD="CPY OBJ('`pwd`/tmphdrfile') TOOBJ('${DEST}')"
-                CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-                system "${CMD}"
-                # touch -r "${HFILE}" "${DEST}"
-                rm -f tmphdrfile
-        fi
-
-        IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
-
-        if action_needed "${IFSFILE}" "${DEST}"
-        then    rm -f "${IFSFILE}"
-                ln -s "${DEST}" "${IFSFILE}"
-        fi
-done
-
-
-#       Install the ILE/RPG header file.
-
-
-HFILE="${SCRIPTDIR}/zlib.inc"
-DEST="${SRCPF}/ZLIB.INC.MBR"
-
-if action_needed "${DEST}" "${HFILE}"
-then    CMD="CPY OBJ('${HFILE}') TOOBJ('${DEST}')"
-        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-        system "${CMD}"
-        # touch -r "${HFILE}" "${DEST}"
-fi
-
-IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
-
-if action_needed "${IFSFILE}" "${DEST}"
-then    rm -f "${IFSFILE}"
-        ln -s "${DEST}" "${IFSFILE}"
-fi
-
-
-#      Create and compile the identification source file.
-
-echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
-echo '#pragma comment(user, __DATE__)' >> os400.c
-echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
-make_module     OS400           os400.c
-LINK=                           # No need to rebuild service program yet.
-MODULES=
-
-
-#       Get source list.
-
-CSOURCES=`sed -e '/<source name="/!d'                                   \
-    -e 's/.* name="\([^"]*\)".*/\1/' < treebuild.xml`
-
-#       Compile the sources into modules.
-
-for SRC in ${CSOURCES}
-do      MODULE=`db2_name "${SRC}"`
-        make_module "${MODULE}" "${SRC}"
-done
-
-
-#       If needed, (re)create the static binding directory.
-
-if action_needed "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
-        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB static binding directory')"
-        system "${CMD}"
-
-        for MODULE in ${MODULES}
-        do      CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-                CMD="${CMD} OBJ((${TARGETLIB}/${MODULE} *MODULE))"
-                system "${CMD}"
-        done
-fi
-
-
-#       The exportation file for service program creation must be in a DB2
-#               source file, so make sure it exists.
-
-if action_needed "${LIBIFSNAME}/TOOLS.FILE"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/TOOLS) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: build tools')"
-        system "${CMD}"
-fi
-
-
-DEST="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
-
-if action_needed "${SCRIPTDIR}/bndsrc" "${DEST}"
-then    CMD="CPY OBJ('${SCRIPTDIR}/bndsrc') TOOBJ('${DEST}')"
-        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-        system "${CMD}"
-        # touch -r "${SCRIPTDIR}/bndsrc" "${DEST}"
-        LINK=YES
-fi
-
-
-#       Build the service program if needed.
-
-if action_needed "${LIBIFSNAME}/${SRVPGM}.SRVPGM"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    CMD="CRTSRVPGM SRVPGM(${TARGETLIB}/${SRVPGM})"
-        CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(BNDSRC)"
-        CMD="${CMD} MODULE(${TARGETLIB}/OS400)"
-        CMD="${CMD} BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB ${VERSION} dynamic library')"
-        CMD="${CMD} TGTRLS(${TGTRLS})"
-        system "${CMD}"
-        LINK=YES
-
-        #       Duplicate the service program for a versioned backup.
-
-        BACKUP=`echo "${SRVPGM}${VERSION}"                              |
-                sed -e 's/.*\(..........\)$/\1/' -e 's/\./_/g'`
-        BACKUP="`db2_name \"${BACKUP}\"`"
-        BKUPIFSNAME="${LIBIFSNAME}/${BACKUP}.SRVPGM"
-        rm -f "${BKUPIFSNAME}"
-        CMD="CRTDUPOBJ OBJ(${SRVPGM}) FROMLIB(${TARGETLIB})"
-        CMD="${CMD} OBJTYPE(*SRVPGM) NEWOBJ(${BACKUP})"
-        system "${CMD}"
-fi
-
-
-#       If needed, (re)create the dynamic binding directory.
-
-if action_needed "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
-        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB dynamic binding directory')"
-        system "${CMD}"
-        CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
-        CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"
-        system "${CMD}"
-fi

crates/libz-sys/src/zlib/os400/zlib.inc

diff --git a/crates/libz-sys/src/zlib/os400/zlib.inc b/crates/libz-sys/src/zlib/os400/zlib.inc
deleted file mode 100644
index c6aca2c..0000000
--- a/crates/libz-sys/src/zlib/os400/zlib.inc
+++ /dev/null
@@ -1,527 +0,0 @@
-      *  ZLIB.INC - Interface to the general purpose compression library
-      *
-      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.11
-      *
-      *
-      *  WARNING:
-      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
-      *         deflateInit2() and inflateBackInit() need to be called with
-      *         two additional arguments:
-      *         the package version string and the stream control structure.
-      *         size. This is needed because RPG lacks some macro feature.
-      *         Call these procedures as:
-      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
-      *
-      /if not defined(ZLIB_H_)
-      /define ZLIB_H_
-      *
-      **************************************************************************
-      *                               Constants
-      **************************************************************************
-      *
-      *  Versioning information.
-      *
-     D ZLIB_VERSION    C                   '1.2.11'
-     D ZLIB_VERNUM     C                   X'12a0'
-     D ZLIB_VER_MAJOR  C                   1
-     D ZLIB_VER_MINOR  C                   2
-     D ZLIB_VER_REVISION...
-     D                 C                   11
-     D ZLIB_VER_SUBREVISION...
-     D                 C                   0
-      *
-      *  Other equates.
-      *
-     D Z_NO_FLUSH      C                   0
-     D Z_PARTIAL_FLUSH...
-     D                 C                   1
-     D Z_SYNC_FLUSH    C                   2
-     D Z_FULL_FLUSH    C                   3
-     D Z_FINISH        C                   4
-     D Z_BLOCK         C                   5
-     D Z_TREES         C                   6
-      *
-     D Z_OK            C                   0
-     D Z_STREAM_END    C                   1
-     D Z_NEED_DICT     C                   2
-     D Z_ERRNO         C                   -1
-     D Z_STREAM_ERROR  C                   -2
-     D Z_DATA_ERROR    C                   -3
-     D Z_MEM_ERROR     C                   -4
-     D Z_BUF_ERROR     C                   -5
-     D Z_VERSION_ERROR C                   -6
-      *
-     D Z_NO_COMPRESSION...
-     D                 C                   0
-     D Z_BEST_SPEED    C                   1
-     D Z_BEST_COMPRESSION...
-     D                 C                   9
-     D Z_DEFAULT_COMPRESSION...
-     D                 C                   -1
-      *
-     D Z_FILTERED      C                   1
-     D Z_HUFFMAN_ONLY  C                   2
-     D Z_RLE           C                   3
-     D Z_DEFAULT_STRATEGY...
-     D                 C                   0
-      *
-     D Z_BINARY        C                   0
-     D Z_ASCII         C                   1
-     D Z_UNKNOWN       C                   2
-      *
-     D Z_DEFLATED      C                   8
-      *
-     D Z_NULL          C                   0
-      *
-      **************************************************************************
-      *                                 Types
-      **************************************************************************
-      *
-     D z_streamp       S               *                                        Stream struct ptr
-     D gzFile          S               *                                        File pointer
-     D gz_headerp      S               *
-     D z_off_t         S             10i 0                                      Stream offsets
-     D z_off64_t       S             20i 0                                      Stream offsets
-      *
-      **************************************************************************
-      *                               Structures
-      **************************************************************************
-      *
-      *  The GZIP encode/decode stream support structure.
-      *
-     D z_stream        DS                  align based(z_streamp)
-     D  zs_next_in                     *                                        Next input byte
-     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
-     D  zs_total_in                  10U 0                                      Total bytes read
-     D  zs_next_out                    *                                        Output buffer ptr
-     D  zs_avail_out                 10U 0                                      Room left @ next_out
-     D  zs_total_out                 10U 0                                      Total bytes written
-     D  zs_msg                         *                                        Last errmsg or null
-     D  zs_state                       *                                        Internal state
-     D  zs_zalloc                      *   procptr                              Int. state allocator
-     D  zs_free                        *   procptr                              Int. state dealloc.
-     D  zs_opaque                      *                                        Private alloc. data
-     D  zs_data_type                 10i 0                                      ASC/BIN best guess
-     D  zs_adler                     10u 0                                      Uncompr. adler32 val
-     D                               10U 0                                      Reserved
-     D                               10U 0                                      Ptr. alignment
-      *
-      **************************************************************************
-      *                     Utility function prototypes
-      **************************************************************************
-      *
-     D compress        PR            10I 0 extproc('compress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10u 0 value                                Source length
-      *
-     D compress2       PR            10I 0 extproc('compress2')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-     D  level                        10I 0 value                                Compression level
-      *
-     D compressBound   PR            10U 0 extproc('compressBound')
-     D  sourceLen                    10U 0 value
-      *
-     D uncompress      PR            10I 0 extproc('uncompress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-      *
-     D uncompress2     PR            10I 0 extproc('uncompress2')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0                                      Source length
-      *
-      /if not defined(LARGE_FILES)
-     D gzopen          PR                  extproc('gzopen')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /else
-     D gzopen          PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzopen64        PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /endif
-      *
-     D gzdopen         PR                  extproc('gzdopen')
-     D                                     like(gzFile)
-     D  fd                           10I 0 value                                File descriptor
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzbuffer        PR            10I 0 extproc('gzbuffer')
-     D  file                               value like(gzFile)                   File pointer
-     D  size                         10U 0 value
-      *
-     D gzsetparams     PR            10I 0 extproc('gzsetparams')
-     D  file                               value like(gzFile)                   File pointer
-     D  level                        10I 0 value
-     D  strategy                     10I 0 value
-      *
-     D gzread          PR            10I 0 extproc('gzread')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzfread          PR           20I 0 extproc('gzfread')
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  size                         20u 0 value                                Buffer length
-     D  nitems                       20u 0 value                                Buffer length
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzwrite         PR            10I 0 extproc('gzwrite')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    const options(*varsize)              Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzfwrite         PR           20I 0 extproc('gzfwrite')
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  size                         20u 0 value                                Buffer length
-     D  nitems                       20u 0 value                                Buffer length
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzputs          PR            10I 0 extproc('gzputs')
-     D  file                               value like(gzFile)                   File pointer
-     D  s                              *   value options(*string)               String to output
-      *
-     D gzgets          PR              *   extproc('gzgets')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Read buffer
-     D  len                          10i 0 value                                Buffer length
-      *
-     D gzputc          PR            10i 0 extproc('gzputc')
-     D  file                               value like(gzFile)                   File pointer
-     D  c                            10I 0 value                                Character to write
-      *
-     D gzgetc          PR            10i 0 extproc('gzgetc')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzgetc_         PR            10i 0 extproc('gzgetc_')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzungetc        PR            10i 0 extproc('gzungetc')
-     D  c                            10I 0 value                                Character to push
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzflush         PR            10i 0 extproc('gzflush')
-     D  file                               value like(gzFile)                   File pointer
-     D  flush                        10I 0 value                                Type of flush
-      *
-      /if not defined(LARGE_FILES)
-     D gzseek          PR                  extproc('gzseek')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      /else
-     D gzseek          PR                  extproc('gzseek64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      *
-     D gzseek64        PR                  extproc('gzseek64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off64_t)                Offset
-     D  whence                       10i 0 value                                Origin
-      /endif
-      *
-     D gzrewind        PR            10i 0 extproc('gzrewind')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      /if not defined(LARGE_FILES)
-     D gztell          PR                  extproc('gztell')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gztell          PR                  extproc('gztell64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gztell64        PR                  extproc('gztell64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-      /if not defined(LARGE_FILES)
-     D gzoffset        PR                  extproc('gzoffset')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gzoffset        PR                  extproc('gzoffset64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzoffset64      PR                  extproc('gzoffset64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-     D gzeof           PR            10i 0 extproc('gzeof')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzdirect        PR            10i 0 extproc('gzdirect')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_r       PR            10i 0 extproc('gzclose_r')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_w       PR            10i 0 extproc('gzclose_w')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose         PR            10i 0 extproc('gzclose')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzerror         PR              *   extproc('gzerror')                   Error string
-     D  file                               value like(gzFile)                   File pointer
-     D  errnum                       10I 0                                      Error code
-      *
-     D gzclearerr      PR                  extproc('gzclearerr')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      **************************************************************************
-      *                        Basic function prototypes
-      **************************************************************************
-      *
-     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
-      *
-     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflate         PR            10I 0 extproc('deflate')                   Compress data
-     D  strm                               like(z_stream)                       Compression stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflate         PR            10I 0 extproc('inflate')                   Expand data
-     D  strm                               like(z_stream)                       Expansion stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-      **************************************************************************
-      *                        Advanced function prototypes
-      **************************************************************************
-      *
-     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  method                       10I 0 value                                Compression method
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
-     D  strategy                     10I 0 value                                Compression strategy
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflateSetDictionary...
-     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Compression stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  strategy                     10I 0 value                                Compression strategy
-      *
-     D deflateTune     PR            10I 0 extproc('deflateTune')
-     D  strm                               like(z_stream)                       Compression stream
-     D  good                         10I 0 value
-     D  lazy                         10I 0 value
-     D  nice                         10I 0 value
-     D  chain                        10I 0 value
-      *
-     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  sourcelen                    10U 0 value                                Compression level
-      *
-     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  pending                      10U 0                                      Pending bytes
-     D  bits                         10I 0                                      Pending bits
-      *
-     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  bits                         10I 0 value                                # of bits to insert
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateSetDictionary...
-     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D inflateGetDictionary...
-     D                 PR            10I 0 extproc('inflateGetDictionary')      Get dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    options(*varsize)                    Dictionary bytes
-     D  dictLength                   10U 0                                      Dictionary length
-      *
-     D deflateGetDictionary...
-     D                 PR            10I 0 extproc('deflateGetDictionary')      Get dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    options(*varsize)                    Dictionary bytes
-     D  dictLength                   10U 0                                      Dictionary length
-      *
-     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateCopy     PR            10I 0 extproc('inflateCopy')
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-      *
-     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
-     D  strm                               like(z_stream)                       Expansion stream
-     D  bits                         10I 0 value                                Bit count
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateCodesUsed...
-                       PR            20U 0 extproc('inflateCodesUsed')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateValidate...
-                       PR            20U 0 extproc('inflateValidate')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  check                        10I 0 value
-      *
-     D inflateGetHeader...
-                       PR            10U 0 extproc('inflateGetHeader')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  head                               like(gz_headerp)
-      *
-     D deflateSetHeader...
-                       PR            10U 0 extproc('deflateSetHeader')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  head                               like(gz_headerp)
-      *
-     D inflateBackInit...
-     D                 PR            10I 0 extproc('inflateBackInit_')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-     D  window                    65535    options(*varsize)                    Buffer
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateBack     PR            10I 0 extproc('inflateBack')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  in                             *   value procptr                        Input function
-     D  in_desc                        *   value                                Input descriptor
-     D  out                            *   value procptr                        Output function
-     D  out_desc                       *   value                                Output descriptor
-      *
-     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D zlibCompileFlags...
-     D                 PR            10U 0 extproc('zlibCompileFlags')
-      *
-      **************************************************************************
-      *                        Checksum function prototypes
-      **************************************************************************
-      *
-     D adler32         PR            10U 0 extproc('adler32')                   New checksum
-     D  adler                        10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-     D adler32_combine...
-                       PR            10U 0 extproc('adler32_combine')           New checksum
-     D  adler1                       10U 0 value                                Old checksum
-     D  adler2                       10U 0 value                                Old checksum
-     D  len2                         20U 0 value                                Buffer length
-      *
-     D adler32_z       PR            10U 0 extproc('adler32_z')                 New checksum
-     D  adler                        10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          20U 0 value                                Buffer length
-      *
-     D crc32           PR            10U 0 extproc('crc32')                     New checksum
-     D  crc                          10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-     D crc32_combine...
-                       PR            10U 0 extproc('crc32_combine')             New checksum
-     D  crc1                         10U 0 value                                Old checksum
-     D  crc2                         10U 0 value                                Old checksum
-     D  len2                         20U 0 value                                Buffer length
-      *
-     D crc32_z         PR            10U 0 extproc('crc32_z')                   New checksum
-     D  crc                          10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          20U 0 value                                Buffer length
-      *
-      **************************************************************************
-      *                     Miscellaneous function prototypes
-      **************************************************************************
-      *
-     D zError          PR              *   extproc('zError')                    Error string
-     D  err                          10I 0 value                                Error code
-      *
-     D inflateSyncPoint...
-     D                 PR            10I 0 extproc('inflateSyncPoint')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
-      *
-     D inflateUndermine...
-     D                 PR            10I 0 extproc('inflateUndermine')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  arg                          10I 0 value                                Error code
-      *
-     D inflateResetKeep...
-     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D deflateResetKeep...
-     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-      /endif

crates/libz-sys/src/zlib/qnx/package.qpg

diff --git a/crates/libz-sys/src/zlib/qnx/package.qpg b/crates/libz-sys/src/zlib/qnx/package.qpg
deleted file mode 100644
index 31e8e90..0000000
--- a/crates/libz-sys/src/zlib/qnx/package.qpg
+++ /dev/null
@@ -1,141 +0,0 @@
-<QPG:Generation>
-   <QPG:Options>
-      <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
-      <QPG:Defaults type="qnx_package"/>
-      <QPG:Source></QPG:Source>
-      <QPG:Release number="+"/>
-      <QPG:Build></QPG:Build>
-      <QPG:FileSorting strip="yes"/>
-      <QPG:Package targets="combine"/>
-      <QPG:Repository generate="yes"/>
-      <QPG:FinalDir></QPG:FinalDir>
-      <QPG:Cleanup></QPG:Cleanup>
-   </QPG:Options>
-
-   <QPG:Responsible>
-      <QPG:Company></QPG:Company>
-      <QPG:Department></QPG:Department>
-      <QPG:Group></QPG:Group>
-      <QPG:Team></QPG:Team>
-      <QPG:Employee></QPG:Employee>
-      <QPG:EmailAddress></QPG:EmailAddress>
-   </QPG:Responsible>
-
-   <QPG:Values>
-      <QPG:Files>
-         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
-         <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" component="slib"/>
-      </QPG:Files>
-
-      <QPG:PackageFilter>
-         <QPM:PackageManifest>
-            <QPM:PackageDescription>
-               <QPM:PackageType>Library</QPM:PackageType>
-               <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
-               <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
-               <QPM:PackageRepository></QPM:PackageRepository>
-               <QPM:FileVersion>2.0</QPM:FileVersion>
-            </QPM:PackageDescription>
-
-            <QPM:ProductDescription>
-               <QPM:ProductName>zlib</QPM:ProductName>
-               <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
-               <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
-               <QPM:VendorName>Public</QPM:VendorName>
-               <QPM:VendorInstallName>public</QPM:VendorInstallName>
-               <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
-               <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
-               <QPM:VendorEmail></QPM:VendorEmail>
-               <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
-               <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
-               <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
-               <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
-               <QPM:ProductIconSmall></QPM:ProductIconSmall>
-               <QPM:ProductIconLarge></QPM:ProductIconLarge>
-               <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
-               <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
-               <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
-               <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
-            </QPM:ProductDescription>
-
-            <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.11</QPM:ReleaseVersion>
-               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
-               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
-               <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
-               <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
-               <QPM:ExcludeCountries>
-                  <QPM:Country></QPM:Country>
-               </QPM:ExcludeCountries>
-
-               <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
-            </QPM:ReleaseDescription>
-
-            <QPM:ContentDescription>
-               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
-               <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
-               <QPM:TargetOS>qnx6</QPM:TargetOS>
-               <QPM:HostOS>qnx6</QPM:HostOS>
-               <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
-               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
-            </QPM:ContentDescription>
-         </QPM:PackageManifest>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter proc="none" target="none">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationDependencies>
-               <QPM:ProductRequirements></QPM:ProductRequirements>
-            </QPM:ProductInstallationDependencies>
-
-            <QPM:ProductInstallationProcedure>
-               <QPM:Script xmlmultiple="true">
-                  <QPM:ScriptName></QPM:ScriptName>
-                  <QPM:ScriptType>Install</QPM:ScriptType>
-                  <QPM:ScriptTiming>Post</QPM:ScriptTiming>
-                  <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
-                  <QPM:ScriptResult>Ignore</QPM:ScriptResult>
-                  <QPM:ShortDescription></QPM:ShortDescription>
-                  <QPM:UseBinaries>No</QPM:UseBinaries>
-                  <QPM:Priority>Optional</QPM:Priority>
-               </QPM:Script>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter type="core" component="none">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationProcedure>
-	       <QPM:OrderDependency xmlmultiple="true">
-	          <QPM:Order>InstallOver</QPM:Order>
-	          <QPM:Product>zlib</QPM:Product>
-	       </QPM:OrderDependency>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter type="core" component="dev">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationProcedure>
-	       <QPM:OrderDependency xmlmultiple="true">
-	          <QPM:Order>InstallOver</QPM:Order>
-	          <QPM:Product>zlib-dev</QPM:Product>
-	       </QPM:OrderDependency>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-   </QPG:Values>
-</QPG:Generation>

crates/libz-sys/src/zlib/test/example.c

diff --git a/crates/libz-sys/src/zlib/test/example.c b/crates/libz-sys/src/zlib/test/example.c
deleted file mode 100644
index eee17ce..0000000
--- a/crates/libz-sys/src/zlib/test/example.c
+++ /dev/null
@@ -1,602 +0,0 @@
-/* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-#include <stdio.h>
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#if defined(VMS) || defined(RISCOS)
-#  define TESTFILE "foo-gz"
-#else
-#  define TESTFILE "foo.gz"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-static z_const char hello[] = "hello, hello!";
-/* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- */
-
-static const char dictionary[] = "hello";
-static uLong dictId;    /* Adler32 value of the dictionary */
-
-void test_deflate       OF((Byte *compr, uLong comprLen));
-void test_inflate       OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_flush         OF((Byte *compr, uLong *comprLen));
-void test_sync          OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_dict_deflate  OF((Byte *compr, uLong comprLen));
-void test_dict_inflate  OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-int  main               OF((int argc, char *argv[]));
-
-
-#ifdef Z_SOLO
-
-void *myalloc OF((void *, unsigned, unsigned));
-void myfree OF((void *, void *));
-
-void *myalloc(q, n, m)
-    void *q;
-    unsigned n, m;
-{
-    (void)q;
-    return calloc(n, m);
-}
-
-void myfree(void *q, void *p)
-{
-    (void)q;
-    free(p);
-}
-
-static alloc_func zalloc = myalloc;
-static free_func zfree = myfree;
-
-#else /* !Z_SOLO */
-
-static alloc_func zalloc = (alloc_func)0;
-static free_func zfree = (free_func)0;
-
-void test_compress      OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_gzio          OF((const char *fname,
-                            Byte *uncompr, uLong uncomprLen));
-
-/* ===========================================================================
- * Test compress() and uncompress()
- */
-void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    uLong len = (uLong)strlen(hello)+1;
-
-    err = compress(compr, &comprLen, (const Bytef*)hello, len);
-    CHECK_ERR(err, "compress");
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
-    CHECK_ERR(err, "uncompress");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad uncompress\n");
-        exit(1);
-    } else {
-        printf("uncompress(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test read/write of .gz files
- */
-void test_gzio(fname, uncompr, uncomprLen)
-    const char *fname; /* compressed file name */
-    Byte *uncompr;
-    uLong uncomprLen;
-{
-#ifdef NO_GZCOMPRESS
-    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
-#else
-    int err;
-    int len = (int)strlen(hello)+1;
-    gzFile file;
-    z_off_t pos;
-
-    file = gzopen(fname, "wb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-        exit(1);
-    }
-    gzputc(file, 'h');
-    if (gzputs(file, "ello") != 4) {
-        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (gzprintf(file, ", %s!", "hello") != 8) {
-        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
-    gzclose(file);
-
-    file = gzopen(fname, "rb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-        exit(1);
-    }
-    strcpy((char*)uncompr, "garbage");
-
-    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
-        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
-        exit(1);
-    } else {
-        printf("gzread(): %s\n", (char*)uncompr);
-    }
-
-    pos = gzseek(file, -8L, SEEK_CUR);
-    if (pos != 6 || gztell(file) != pos) {
-        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
-                (long)pos, (long)gztell(file));
-        exit(1);
-    }
-
-    if (gzgetc(file) != ' ') {
-        fprintf(stderr, "gzgetc error\n");
-        exit(1);
-    }
-
-    if (gzungetc(' ', file) != ' ') {
-        fprintf(stderr, "gzungetc error\n");
-        exit(1);
-    }
-
-    gzgets(file, (char*)uncompr, (int)uncomprLen);
-    if (strlen((char*)uncompr) != 7) { /* " hello!" */
-        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (strcmp((char*)uncompr, hello + 6)) {
-        fprintf(stderr, "bad gzgets after gzseek\n");
-        exit(1);
-    } else {
-        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
-    }
-
-    gzclose(file);
-#endif
-}
-
-#endif /* Z_SOLO */
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    uLong len = (uLong)strlen(hello)+1;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = deflate(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = deflate(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate\n");
-        exit(1);
-    } else {
-        printf("inflate(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_SPEED);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-    if (c_stream.avail_in != 0) {
-        fprintf(stderr, "deflate not greedy\n");
-        exit(1);
-    }
-
-    /* Feed in already compressed data and switch to no compression: */
-    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    c_stream.next_in = compr;
-    c_stream.avail_in = (uInt)comprLen/2;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    /* Switch back to compressing mode: */
-    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = (uInt)uncomprLen;
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
-        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
-        exit(1);
-    } else {
-        printf("large_inflate(): OK\n");
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(compr, comprLen)
-    Byte *compr;
-    uLong *comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    uInt len = (uInt)strlen(hello)+1;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (z_const unsigned char *)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (uInt)*comprLen;
-    err = deflate(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate");
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    err = inflate(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
-    err = inflateSync(&d_stream);           /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = inflate(&d_stream, Z_FINISH);
-    if (err != Z_DATA_ERROR) {
-        fprintf(stderr, "inflate should report DATA_ERROR\n");
-        /* Because of incorrect adler32 */
-        exit(1);
-    }
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    printf("after inflateSync(): hel%s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = zalloc;
-    c_stream.zfree = zfree;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = deflateSetDictionary(&c_stream,
-                (const Bytef*)dictionary, (int)sizeof(dictionary));
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    dictId = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    c_stream.next_in = (z_const unsigned char *)hello;
-    c_stream.avail_in = (uInt)strlen(hello)+1;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = zalloc;
-    d_stream.zfree = zfree;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    for (;;) {
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        if (err == Z_NEED_DICT) {
-            if (d_stream.adler != dictId) {
-                fprintf(stderr, "unexpected dictionary");
-                exit(1);
-            }
-            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
-                                       (int)sizeof(dictionary));
-        }
-        CHECK_ERR(err, "inflate with dict");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate with dict\n");
-        exit(1);
-    } else {
-        printf("inflate with dictionary: %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Usage:  example [output.gz  [input.gz]]
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    Byte *compr, *uncompr;
-    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
-    uLong uncomprLen = comprLen;
-    static const char* myVersion = ZLIB_VERSION;
-
-    if (zlibVersion()[0] != myVersion[0]) {
-        fprintf(stderr, "incompatible zlib version\n");
-        exit(1);
-
-    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
-    }
-
-    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
-            ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
-
-    compr    = (Byte*)calloc((uInt)comprLen, 1);
-    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
-    /* compr and uncompr are cleared to avoid reading uninitialized
-     * data and to ensure that uncompr compresses well.
-     */
-    if (compr == Z_NULL || uncompr == Z_NULL) {
-        printf("out of memory\n");
-        exit(1);
-    }
-
-#ifdef Z_SOLO
-    (void)argc;
-    (void)argv;
-#else
-    test_compress(compr, comprLen, uncompr, uncomprLen);
-
-    test_gzio((argc > 1 ? argv[1] : TESTFILE),
-              uncompr, uncomprLen);
-#endif
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-    comprLen = uncomprLen;
-
-    test_dict_deflate(compr, comprLen);
-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    free(compr);
-    free(uncompr);
-
-    return 0;
-}

crates/libz-sys/src/zlib/test/infcover.c

diff --git a/crates/libz-sys/src/zlib/test/infcover.c b/crates/libz-sys/src/zlib/test/infcover.c
deleted file mode 100644
index 2be0164..0000000
--- a/crates/libz-sys/src/zlib/test/infcover.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* to use, do: ./configure --cover && make cover */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include "zlib.h"
-
-/* get definition of internal structure so we can mess with it (see pull()),
-   and so we can call inflate_trees() (see cover5()) */
-#define ZLIB_INTERNAL
-#include "inftrees.h"
-#include "inflate.h"
-
-#define local static
-
-/* -- memory tracking routines -- */
-
-/*
-   These memory tracking routines are provided to zlib and track all of zlib's
-   allocations and deallocations, check for LIFO operations, keep a current
-   and high water mark of total bytes requested, optionally set a limit on the
-   total memory that can be allocated, and when done check for memory leaks.
-
-   They are used as follows:
-
-   z_stream strm;
-   mem_setup(&strm)         initializes the memory tracking and sets the
-                            zalloc, zfree, and opaque members of strm to use
-                            memory tracking for all zlib operations on strm
-   mem_limit(&strm, limit)  sets a limit on the total bytes requested -- a
-                            request that exceeds this limit will result in an
-                            allocation failure (returns NULL) -- setting the
-                            limit to zero means no limit, which is the default
-                            after mem_setup()
-   mem_used(&strm, "msg")   prints to stderr "msg" and the total bytes used
-   mem_high(&strm, "msg")   prints to stderr "msg" and the high water mark
-   mem_done(&strm, "msg")   ends memory tracking, releases all allocations
-                            for the tracking as well as leaked zlib blocks, if
-                            any.  If there was anything unusual, such as leaked
-                            blocks, non-FIFO frees, or frees of addresses not
-                            allocated, then "msg" and information about the
-                            problem is printed to stderr.  If everything is
-                            normal, nothing is printed. mem_done resets the
-                            strm members to Z_NULL to use the default memory
-                            allocation routines on the next zlib initialization
-                            using strm.
- */
-
-/* these items are strung together in a linked list, one for each allocation */
-struct mem_item {
-    void *ptr;                  /* pointer to allocated memory */
-    size_t size;                /* requested size of allocation */
-    struct mem_item *next;      /* pointer to next item in list, or NULL */
-};
-
-/* this structure is at the root of the linked list, and tracks statistics */
-struct mem_zone {
-    struct mem_item *first;     /* pointer to first item in list, or NULL */
-    size_t total, highwater;    /* total allocations, and largest total */
-    size_t limit;               /* memory allocation limit, or 0 if no limit */
-    int notlifo, rogue;         /* counts of non-LIFO frees and rogue frees */
-};
-
-/* memory allocation routine to pass to zlib */
-local void *mem_alloc(void *mem, unsigned count, unsigned size)
-{
-    void *ptr;
-    struct mem_item *item;
-    struct mem_zone *zone = mem;
-    size_t len = count * (size_t)size;
-
-    /* induced allocation failure */
-    if (zone == NULL || (zone->limit && zone->total + len > zone->limit))
-        return NULL;
-
-    /* perform allocation using the standard library, fill memory with a
-       non-zero value to make sure that the code isn't depending on zeros */
-    ptr = malloc(len);
-    if (ptr == NULL)
-        return NULL;
-    memset(ptr, 0xa5, len);
-
-    /* create a new item for the list */
-    item = malloc(sizeof(struct mem_item));
-    if (item == NULL) {
-        free(ptr);
-        return NULL;
-    }
-    item->ptr = ptr;
-    item->size = len;
-
-    /* insert item at the beginning of the list */
-    item->next = zone->first;
-    zone->first = item;
-
-    /* update the statistics */
-    zone->total += item->size;
-    if (zone->total > zone->highwater)
-        zone->highwater = zone->total;
-
-    /* return the allocated memory */
-    return ptr;
-}
-
-/* memory free routine to pass to zlib */
-local void mem_free(void *mem, void *ptr)
-{
-    struct mem_item *item, *next;
-    struct mem_zone *zone = mem;
-
-    /* if no zone, just do a free */
-    if (zone == NULL) {
-        free(ptr);
-        return;
-    }
-
-    /* point next to the item that matches ptr, or NULL if not found -- remove
-       the item from the linked list if found */
-    next = zone->first;
-    if (next) {
-        if (next->ptr == ptr)
-            zone->first = next->next;   /* first one is it, remove from list */
-        else {
-            do {                        /* search the linked list */
-                item = next;
-                next = item->next;
-            } while (next != NULL && next->ptr != ptr);
-            if (next) {                 /* if found, remove from linked list */
-                item->next = next->next;
-                zone->notlifo++;        /* not a LIFO free */
-            }
-
-        }
-    }
-
-    /* if found, update the statistics and free the item */
-    if (next) {
-        zone->total -= next->size;
-        free(next);
-    }
-
-    /* if not found, update the rogue count */
-    else
-        zone->rogue++;
-
-    /* in any case, do the requested free with the standard library function */
-    free(ptr);
-}
-
-/* set up a controlled memory allocation space for monitoring, set the stream
-   parameters to the controlled routines, with opaque pointing to the space */
-local void mem_setup(z_stream *strm)
-{
-    struct mem_zone *zone;
-
-    zone = malloc(sizeof(struct mem_zone));
-    assert(zone != NULL);
-    zone->first = NULL;
-    zone->total = 0;
-    zone->highwater = 0;
-    zone->limit = 0;
-    zone->notlifo = 0;
-    zone->rogue = 0;
-    strm->opaque = zone;
-    strm->zalloc = mem_alloc;
-    strm->zfree = mem_free;
-}
-
-/* set a limit on the total memory allocation, or 0 to remove the limit */
-local void mem_limit(z_stream *strm, size_t limit)
-{
-    struct mem_zone *zone = strm->opaque;
-
-    zone->limit = limit;
-}
-
-/* show the current total requested allocations in bytes */
-local void mem_used(z_stream *strm, char *prefix)
-{
-    struct mem_zone *zone = strm->opaque;
-
-    fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
-}
-
-/* show the high water allocation in bytes */
-local void mem_high(z_stream *strm, char *prefix)
-{
-    struct mem_zone *zone = strm->opaque;
-
-    fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
-}
-
-/* release the memory allocation zone -- if there are any surprises, notify */
-local void mem_done(z_stream *strm, char *prefix)
-{
-    int count = 0;
-    struct mem_item *item, *next;
-    struct mem_zone *zone = strm->opaque;
-
-    /* show high water mark */
-    mem_high(strm, prefix);
-
-    /* free leftover allocations and item structures, if any */
-    item = zone->first;
-    while (item != NULL) {
-        free(item->ptr);
-        next = item->next;
-        free(item);
-        item = next;
-        count++;
-    }
-
-    /* issue alerts about anything unexpected */
-    if (count || zone->total)
-        fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
-                prefix, zone->total, count);
-    if (zone->notlifo)
-        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
-    if (zone->rogue)
-        fprintf(stderr, "** %s: %d frees not recognized\n",
-                prefix, zone->rogue);
-
-    /* free the zone and delete from the stream */
-    free(zone);
-    strm->opaque = Z_NULL;
-    strm->zalloc = Z_NULL;
-    strm->zfree = Z_NULL;
-}
-
-/* -- inflate test routines -- */
-
-/* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
-   decodes liberally, in that hex digits can be adjacent, in which case two in
-   a row writes a byte.  Or they can be delimited by any non-hex character,
-   where the delimiters are ignored except when a single hex digit is followed
-   by a delimiter, where that single digit writes a byte.  The returned data is
-   allocated and must eventually be freed.  NULL is returned if out of memory.
-   If the length is not needed, then len can be NULL. */
-local unsigned char *h2b(const char *hex, unsigned *len)
-{
-    unsigned char *in, *re;
-    unsigned next, val;
-
-    in = malloc((strlen(hex) + 1) >> 1);
-    if (in == NULL)
-        return NULL;
-    next = 0;
-    val = 1;
-    do {
-        if (*hex >= '0' && *hex <= '9')
-            val = (val << 4) + *hex - '0';
-        else if (*hex >= 'A' && *hex <= 'F')
-            val = (val << 4) + *hex - 'A' + 10;
-        else if (*hex >= 'a' && *hex <= 'f')
-            val = (val << 4) + *hex - 'a' + 10;
-        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
-            val += 240;                 /* make it look like two digits */
-        if (val > 255) {                /* have two digits */
-            in[next++] = val & 0xff;    /* save the decoded byte */
-            val = 1;                    /* start over */
-        }
-    } while (*hex++);       /* go through the loop with the terminating null */
-    if (len != NULL)
-        *len = next;
-    re = realloc(in, next);
-    return re == NULL ? in : re;
-}
-
-/* generic inflate() run, where hex is the hexadecimal input data, what is the
-   text to include in an error message, step is how much input data to feed
-   inflate() on each call, or zero to feed it all, win is the window bits
-   parameter to inflateInit2(), len is the size of the output buffer, and err
-   is the error code expected from the first inflate() call (the second
-   inflate() call is expected to return Z_STREAM_END).  If win is 47, then
-   header information is collected with inflateGetHeader().  If a zlib stream
-   is looking for a dictionary, then an empty dictionary is provided.
-   inflate() is run until all of the input data is consumed. */
-local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
-               int err)
-{
-    int ret;
-    unsigned have;
-    unsigned char *in, *out;
-    z_stream strm, copy;
-    gz_header head;
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, win);
-    if (ret != Z_OK) {
-        mem_done(&strm, what);
-        return;
-    }
-    out = malloc(len);                          assert(out != NULL);
-    if (win == 47) {
-        head.extra = out;
-        head.extra_max = len;
-        head.name = out;
-        head.name_max = len;
-        head.comment = out;
-        head.comm_max = len;
-        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
-    }
-    in = h2b(hex, &have);                       assert(in != NULL);
-    if (step == 0 || step > have)
-        step = have;
-    strm.avail_in = step;
-    have -= step;
-    strm.next_in = in;
-    do {
-        strm.avail_out = len;
-        strm.next_out = out;
-        ret = inflate(&strm, Z_NO_FLUSH);       assert(err == 9 || ret == err);
-        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
-            break;
-        if (ret == Z_NEED_DICT) {
-            ret = inflateSetDictionary(&strm, in, 1);
-                                                assert(ret == Z_DATA_ERROR);
-            mem_limit(&strm, 1);
-            ret = inflateSetDictionary(&strm, out, 0);
-                                                assert(ret == Z_MEM_ERROR);
-            mem_limit(&strm, 0);
-            ((struct inflate_state *)strm.state)->mode = DICT;
-            ret = inflateSetDictionary(&strm, out, 0);
-                                                assert(ret == Z_OK);
-            ret = inflate(&strm, Z_NO_FLUSH);   assert(ret == Z_BUF_ERROR);
-        }
-        ret = inflateCopy(&copy, &strm);        assert(ret == Z_OK);
-        ret = inflateEnd(&copy);                assert(ret == Z_OK);
-        err = 9;                        /* don't care next time around */
-        have += strm.avail_in;
-        strm.avail_in = step > have ? have : step;
-        have -= strm.avail_in;
-    } while (strm.avail_in);
-    free(in);
-    free(out);
-    ret = inflateReset2(&strm, -8);             assert(ret == Z_OK);
-    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
-    mem_done(&strm, what);
-}
-
-/* cover all of the lines in inflate.c up to inflate() */
-local void cover_support(void)
-{
-    int ret;
-    z_stream strm;
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit(&strm);                   assert(ret == Z_OK);
-    mem_used(&strm, "inflate init");
-    ret = inflatePrime(&strm, 5, 31);           assert(ret == Z_OK);
-    ret = inflatePrime(&strm, -1, 0);           assert(ret == Z_OK);
-    ret = inflateSetDictionary(&strm, Z_NULL, 0);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
-    mem_done(&strm, "prime");
-
-    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
-    inf("63 18 5", "force window replacement", 0, -8, 259, Z_OK);
-    inf("63 18 68 30 d0 0 0", "force split window update", 4, -8, 259, Z_OK);
-    inf("3 0", "use fixed blocks", 0, -15, 1, Z_STREAM_END);
-    inf("", "bad window size", 0, 1, 0, Z_STREAM_ERROR);
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
-                                                assert(ret == Z_VERSION_ERROR);
-    mem_done(&strm, "wrong version");
-
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit(&strm);                   assert(ret == Z_OK);
-    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
-    fputs("inflate built-in memory routines\n", stderr);
-}
-
-/* cover all inflate() header and trailer cases and code after inflate() */
-local void cover_wrap(void)
-{
-    int ret;
-    z_stream strm, copy;
-    unsigned char dict[257];
-
-    ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
-    ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
-    ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
-    fputs("inflate bad parameters\n", stderr);
-
-    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
-    inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
-    inf("77 85", "bad zlib method", 0, 15, 0, Z_DATA_ERROR);
-    inf("8 99", "set window size from header", 0, 0, 0, Z_OK);
-    inf("78 9c", "bad zlib window size", 0, 8, 0, Z_DATA_ERROR);
-    inf("78 9c 63 0 0 0 1 0 1", "check adler32", 0, 15, 1, Z_STREAM_END);
-    inf("1f 8b 8 1e 0 0 0 0 0 0 1 0 0 0 0 0 0", "bad header crc", 0, 47, 1,
-        Z_DATA_ERROR);
-    inf("1f 8b 8 2 0 0 0 0 0 0 1d 26 3 0 0 0 0 0 0 0 0 0", "check gzip length",
-        0, 47, 0, Z_STREAM_END);
-    inf("78 90", "bad zlib header check", 0, 47, 0, Z_DATA_ERROR);
-    inf("8 b8 0 0 0 1", "need dictionary", 0, 8, 0, Z_NEED_DICT);
-    inf("78 9c 63 0", "compute adler32", 0, 15, 1, Z_OK);
-
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, -8);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x63";
-    strm.avail_out = 1;
-    strm.next_out = (void *)&ret;
-    mem_limit(&strm, 1);
-    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
-    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
-    mem_limit(&strm, 0);
-    memset(dict, 0, 257);
-    ret = inflateSetDictionary(&strm, dict, 257);
-                                                assert(ret == Z_OK);
-    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
-    ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x80";
-    ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
-    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
-    strm.avail_in = 4;
-    strm.next_in = (void *)"\0\0\xff\xff";
-    ret = inflateSync(&strm);                   assert(ret == Z_OK);
-    (void)inflateSyncPoint(&strm);
-    ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
-    mem_limit(&strm, 0);
-    ret = inflateUndermine(&strm, 1);           assert(ret == Z_DATA_ERROR);
-    (void)inflateMark(&strm);
-    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
-    mem_done(&strm, "miscellaneous, force memory errors");
-}
-
-/* input and output functions for inflateBack() */
-local unsigned pull(void *desc, unsigned char **buf)
-{
-    static unsigned int next = 0;
-    static unsigned char dat[] = {0x63, 0, 2, 0};
-    struct inflate_state *state;
-
-    if (desc == Z_NULL) {
-        next = 0;
-        return 0;   /* no input (already provided at next_in) */
-    }
-    state = (void *)((z_stream *)desc)->state;
-    if (state != Z_NULL)
-        state->mode = SYNC;     /* force an otherwise impossible situation */
-    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
-}
-
-local int push(void *desc, unsigned char *buf, unsigned len)
-{
-    buf += len;
-    return desc != Z_NULL;      /* force error if desc not null */
-}
-
-/* cover inflateBack() up to common deflate data cases and after those */
-local void cover_back(void)
-{
-    int ret;
-    z_stream strm;
-    unsigned char win[32768];
-
-    ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
-                                                assert(ret == Z_VERSION_ERROR);
-    ret = inflateBackInit(Z_NULL, 0, win);      assert(ret == Z_STREAM_ERROR);
-    ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
-    fputs("inflateBack bad parameters\n", stderr);
-
-    mem_setup(&strm);
-    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
-    strm.avail_in = 2;
-    strm.next_in = (void *)"\x03";
-    ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
-                                                assert(ret == Z_STREAM_END);
-        /* force output error */
-    strm.avail_in = 3;
-    strm.next_in = (void *)"\x63\x00";
-    ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
-                                                assert(ret == Z_BUF_ERROR);
-        /* force mode error by mucking with state */
-    ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
-                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
-    mem_done(&strm, "inflateBack bad state");
-
-    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
-    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
-    fputs("inflateBack built-in memory routines\n", stderr);
-}
-
-/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
-local int try(char *hex, char *id, int err)
-{
-    int ret;
-    unsigned len, size;
-    unsigned char *in, *out, *win;
-    char *prefix;
-    z_stream strm;
-
-    /* convert to hex */
-    in = h2b(hex, &len);
-    assert(in != NULL);
-
-    /* allocate work areas */
-    size = len << 3;
-    out = malloc(size);
-    assert(out != NULL);
-    win = malloc(32768);
-    assert(win != NULL);
-    prefix = malloc(strlen(id) + 6);
-    assert(prefix != NULL);
-
-    /* first with inflate */
-    strcpy(prefix, id);
-    strcat(prefix, "-late");
-    mem_setup(&strm);
-    strm.avail_in = 0;
-    strm.next_in = Z_NULL;
-    ret = inflateInit2(&strm, err < 0 ? 47 : -15);
-    assert(ret == Z_OK);
-    strm.avail_in = len;
-    strm.next_in = in;
-    do {
-        strm.avail_out = size;
-        strm.next_out = out;
-        ret = inflate(&strm, Z_TREES);
-        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
-        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
-            break;
-    } while (strm.avail_in || strm.avail_out == 0);
-    if (err) {
-        assert(ret == Z_DATA_ERROR);
-        assert(strcmp(id, strm.msg) == 0);
-    }
-    inflateEnd(&strm);
-    mem_done(&strm, prefix);
-
-    /* then with inflateBack */
-    if (err >= 0) {
-        strcpy(prefix, id);
-        strcat(prefix, "-back");
-        mem_setup(&strm);
-        ret = inflateBackInit(&strm, 15, win);
-        assert(ret == Z_OK);
-        strm.avail_in = len;
-        strm.next_in = in;
-        ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
-        assert(ret != Z_STREAM_ERROR);
-        if (err) {
-            assert(ret == Z_DATA_ERROR);
-            assert(strcmp(id, strm.msg) == 0);
-        }
-        inflateBackEnd(&strm);
-        mem_done(&strm, prefix);
-    }
-
-    /* clean up */
-    free(prefix);
-    free(win);
-    free(out);
-    free(in);
-    return ret;
-}
-
-/* cover deflate data cases in both inflate() and inflateBack() */
-local void cover_inflate(void)
-{
-    try("0 0 0 0 0", "invalid stored block lengths", 1);
-    try("3 0", "fixed", 0);
-    try("6", "invalid block type", 1);
-    try("1 1 0 fe ff 0", "stored", 0);
-    try("fc 0 0", "too many length or distance symbols", 1);
-    try("4 0 fe ff", "invalid code lengths set", 1);
-    try("4 0 24 49 0", "invalid bit length repeat", 1);
-    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
-    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
-    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
-        "invalid literal/lengths set", 1);
-    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
-    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
-    try("2 7e ff ff", "invalid distance code", 1);
-    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
-
-    /* also trailer mismatch just in inflate() */
-    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
-    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
-        "incorrect length check", -1);
-    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
-    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
-        "long code", 0);
-    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
-    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
-        "long distance and extra", 0);
-    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
-        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
-    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
-        Z_STREAM_END);
-    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
-}
-
-/* cover remaining lines in inftrees.c */
-local void cover_trees(void)
-{
-    int ret;
-    unsigned bits;
-    unsigned short lens[16], work[16];
-    code *next, table[ENOUGH_DISTS];
-
-    /* we need to call inflate_table() directly in order to manifest not-
-       enough errors, since zlib insures that enough is always enough */
-    for (bits = 0; bits < 15; bits++)
-        lens[bits] = (unsigned short)(bits + 1);
-    lens[15] = 15;
-    next = table;
-    bits = 15;
-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
-                                                assert(ret == 1);
-    next = table;
-    bits = 1;
-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
-                                                assert(ret == 1);
-    fputs("inflate_table not enough errors\n", stderr);
-}
-
-/* cover remaining inffast.c decoding and window copying */
-local void cover_fast(void)
-{
-    inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
-        " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
-    inf("25 fd 81 b5 6d 59 b6 6a 49 ea af 35 6 34 eb 8c b9 f6 b9 1e ef 67 49"
-        " 50 fe ff ff 3f 0 0", "fast distance extra bits", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("3 7e 0 0 0 0 0", "fast invalid distance code", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("1b 7 0 0 0 0 0", "fast invalid literal/length code", 0, -8, 258,
-        Z_DATA_ERROR);
-    inf("d c7 1 ae eb 38 c 4 41 a0 87 72 de df fb 1f b8 36 b1 38 5d ff ff 0",
-        "fast 2nd level codes and too far back", 0, -8, 258, Z_DATA_ERROR);
-    inf("63 18 5 8c 10 8 0 0 0 0", "very common case", 0, -8, 259, Z_OK);
-    inf("63 60 60 18 c9 0 8 18 18 18 26 c0 28 0 29 0 0 0",
-        "contiguous and wrap around window", 6, -8, 259, Z_OK);
-    inf("63 0 3 0 0 0 0 0", "copy direct from output", 0, -8, 259,
-        Z_STREAM_END);
-}
-
-int main(void)
-{
-    fprintf(stderr, "%s\n", zlibVersion());
-    cover_support();
-    cover_wrap();
-    cover_back();
-    cover_inflate();
-    cover_trees();
-    cover_fast();
-    return 0;
-}

crates/libz-sys/src/zlib/test/minigzip.c

diff --git a/crates/libz-sys/src/zlib/test/minigzip.c b/crates/libz-sys/src/zlib/test/minigzip.c
deleted file mode 100644
index e22fb08..0000000
--- a/crates/libz-sys/src/zlib/test/minigzip.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing. On MSDOS, use only on file names without extension
- * or in pipe mode.
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-#include <stdio.h>
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  ifdef UNDER_CE
-#    include <stdlib.h>
-#  endif
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
-#ifdef RISCOS
-#  define unlink remove
-#  define GZ_SUFFIX "-gz"
-#  define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#  include <unix.h> /* for fileno */
-#endif
-
-#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
-  extern int unlink OF((const char *));
-#endif
-#endif
-
-#if defined(UNDER_CE)
-#  include <windows.h>
-#  define perror(s) pwinerror(s)
-
-/* Map the Windows error number in ERROR to a locale-dependent error
-   message string and return a pointer to it.  Typically, the values
-   for ERROR come from GetLastError.
-
-   The string pointed to shall not be modified by the application,
-   but may be overwritten by a subsequent call to strwinerror
-
-   The strwinerror function does not change the current setting
-   of GetLastError.  */
-
-static char *strwinerror (error)
-     DWORD error;
-{
-    static char buf[1024];
-
-    wchar_t *msgbuf;
-    DWORD lasterr = GetLastError();
-    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
-        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-        NULL,
-        error,
-        0, /* Default language */
-        (LPVOID)&msgbuf,
-        0,
-        NULL);
-    if (chars != 0) {
-        /* If there is an \r\n appended, zap it.  */
-        if (chars >= 2
-            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
-            chars -= 2;
-            msgbuf[chars] = 0;
-        }
-
-        if (chars > sizeof (buf) - 1) {
-            chars = sizeof (buf) - 1;
-            msgbuf[chars] = 0;
-        }
-
-        wcstombs(buf, msgbuf, chars + 1);
-        LocalFree(msgbuf);
-    }
-    else {
-        sprintf(buf, "unknown win32 error (%ld)", error);
-    }
-
-    SetLastError(lasterr);
-    return buf;
-}
-
-static void pwinerror (s)
-    const char *s;
-{
-    if (s && *s)
-        fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
-    else
-        fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
-}
-
-#endif /* UNDER_CE */
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN      16384
-#define MAX_NAME_LEN 1024
-
-#ifdef MAXSEG_64K
-#  define local static
-   /* Needed for systems with limitation on stack size. */
-#else
-#  define local
-#endif
-
-#ifdef Z_SOLO
-/* for Z_SOLO, create simplified gz* functions using deflate and inflate */
-
-#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
-#  include <unistd.h>       /* for unlink() */
-#endif
-
-void *myalloc OF((void *, unsigned, unsigned));
-void myfree OF((void *, void *));
-
-void *myalloc(q, n, m)
-    void *q;
-    unsigned n, m;
-{
-    (void)q;
-    return calloc(n, m);
-}
-
-void myfree(q, p)
-    void *q, *p;
-{
-    (void)q;
-    free(p);
-}
-
-typedef struct gzFile_s {
-    FILE *file;
-    int write;
-    int err;
-    char *msg;
-    z_stream strm;
-} *gzFile;
-
-gzFile gzopen OF((const char *, const char *));
-gzFile gzdopen OF((int, const char *));
-gzFile gz_open OF((const char *, int, const char *));
-
-gzFile gzopen(path, mode)
-const char *path;
-const char *mode;
-{
-    return gz_open(path, -1, mode);
-}
-
-gzFile gzdopen(fd, mode)
-int fd;
-const char *mode;
-{
-    return gz_open(NULL, fd, mode);
-}
-
-gzFile gz_open(path, fd, mode)
-    const char *path;
-    int fd;
-    const char *mode;
-{
-    gzFile gz;
-    int ret;
-
-    gz = malloc(sizeof(struct gzFile_s));
-    if (gz == NULL)
-        return NULL;
-    gz->write = strchr(mode, 'w') != NULL;
-    gz->strm.zalloc = myalloc;
-    gz->strm.zfree = myfree;
-    gz->strm.opaque = Z_NULL;
-    if (gz->write)
-        ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
-    else {
-        gz->strm.next_in = 0;
-        gz->strm.avail_in = Z_NULL;
-        ret = inflateInit2(&(gz->strm), 15 + 16);
-    }
-    if (ret != Z_OK) {
-        free(gz);
-        return NULL;
-    }
-    gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
-                              fopen(path, gz->write ? "wb" : "rb");
-    if (gz->file == NULL) {
-        gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
-        free(gz);
-        return NULL;
-    }
-    gz->err = 0;
-    gz->msg = "";
-    return gz;
-}
-
-int gzwrite OF((gzFile, const void *, unsigned));
-
-int gzwrite(gz, buf, len)
-    gzFile gz;
-    const void *buf;
-    unsigned len;
-{
-    z_stream *strm;
-    unsigned char out[BUFLEN];
-
-    if (gz == NULL || !gz->write)
-        return 0;
-    strm = &(gz->strm);
-    strm->next_in = (void *)buf;
-    strm->avail_in = len;
-    do {
-        strm->next_out = out;
-        strm->avail_out = BUFLEN;
-        (void)deflate(strm, Z_NO_FLUSH);
-        fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
-    } while (strm->avail_out == 0);
-    return len;
-}
-
-int gzread OF((gzFile, void *, unsigned));
-
-int gzread(gz, buf, len)
-    gzFile gz;
-    void *buf;
-    unsigned len;
-{
-    int ret;
-    unsigned got;
-    unsigned char in[1];
-    z_stream *strm;
-
-    if (gz == NULL || gz->write)
-        return 0;
-    if (gz->err)
-        return 0;
-    strm = &(gz->strm);
-    strm->next_out = (void *)buf;
-    strm->avail_out = len;
-    do {
-        got = fread(in, 1, 1, gz->file);
-        if (got == 0)
-            break;
-        strm->next_in = in;
-        strm->avail_in = 1;
-        ret = inflate(strm, Z_NO_FLUSH);
-        if (ret == Z_DATA_ERROR) {
-            gz->err = Z_DATA_ERROR;
-            gz->msg = strm->msg;
-            return 0;
-        }
-        if (ret == Z_STREAM_END)
-            inflateReset(strm);
-    } while (strm->avail_out);
-    return len - strm->avail_out;
-}
-
-int gzclose OF((gzFile));
-
-int gzclose(gz)
-    gzFile gz;
-{
-    z_stream *strm;
-    unsigned char out[BUFLEN];
-
-    if (gz == NULL)
-        return Z_STREAM_ERROR;
-    strm = &(gz->strm);
-    if (gz->write) {
-        strm->next_in = Z_NULL;
-        strm->avail_in = 0;
-        do {
-            strm->next_out = out;
-            strm->avail_out = BUFLEN;
-            (void)deflate(strm, Z_FINISH);
-            fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
-        } while (strm->avail_out == 0);
-        deflateEnd(strm);
-    }
-    else
-        inflateEnd(strm);
-    fclose(gz->file);
-    free(gz);
-    return Z_OK;
-}
-
-const char *gzerror OF((gzFile, int *));
-
-const char *gzerror(gz, err)
-    gzFile gz;
-    int *err;
-{
-    *err = gz->err;
-    return gz->msg;
-}
-
-#endif
-
-static char *prog;
-
-void error            OF((const char *msg));
-void gz_compress      OF((FILE   *in, gzFile out));
-#ifdef USE_MMAP
-int  gz_compress_mmap OF((FILE   *in, gzFile out));
-#endif
-void gz_uncompress    OF((gzFile in, FILE   *out));
-void file_compress    OF((char  *file, char *mode));
-void file_uncompress  OF((char  *file));
-int  main             OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(msg)
-    const char *msg;
-{
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    for (;;) {
-        len = (int)fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
-    }
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    int len;
-    int err;
-    int ifd = fileno(in);
-    caddr_t buf;    /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
-    if (buf == (caddr_t)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(gzerror(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(in, out)
-    gzFile in;
-    FILE   *out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-    for (;;) {
-        len = gzread(in, buf, sizeof(buf));
-        if (len < 0) error (gzerror(in, &err));
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-            error("failed fwrite");
-        }
-    }
-    if (fclose(out)) error("failed fclose");
-
-    if (gzclose(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(file, mode)
-    char  *file;
-    char  *mode;
-{
-    local char outfile[MAX_NAME_LEN];
-    FILE  *in;
-    gzFile out;
-
-    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
-#else
-    strcpy(outfile, file);
-    strcat(outfile, GZ_SUFFIX);
-#endif
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = gzopen(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(file)
-    char  *file;
-{
-    local char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE  *out;
-    gzFile in;
-    unsigned len = strlen(file);
-
-    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
-        fprintf(stderr, "%s: filename too long\n", prog);
-        exit(1);
-    }
-
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    snprintf(buf, sizeof(buf), "%s", file);
-#else
-    strcpy(buf, file);
-#endif
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
-#else
-        strcat(infile, GZ_SUFFIX);
-#endif
-    }
-    in = gzopen(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    unlink(infile);
-}
-
-
-/* ===========================================================================
- * Usage:  minigzip [-c] [-d] [-f] [-h] [-r] [-1 to -9] [files...]
- *   -c : write to standard output
- *   -d : decompress
- *   -f : compress with Z_FILTERED
- *   -h : compress with Z_HUFFMAN_ONLY
- *   -r : compress with Z_RLE
- *   -1 to -9 : compression level
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    int copyout = 0;
-    int uncompr = 0;
-    gzFile file;
-    char *bname, outmode[20];
-
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    snprintf(outmode, sizeof(outmode), "%s", "wb6 ");
-#else
-    strcpy(outmode, "wb6 ");
-#endif
-
-    prog = argv[0];
-    bname = strrchr(argv[0], '/');
-    if (bname)
-      bname++;
-    else
-      bname = argv[0];
-    argc--, argv++;
-
-    if (!strcmp(bname, "gunzip"))
-      uncompr = 1;
-    else if (!strcmp(bname, "zcat"))
-      copyout = uncompr = 1;
-
-    while (argc > 0) {
-      if (strcmp(*argv, "-c") == 0)
-        copyout = 1;
-      else if (strcmp(*argv, "-d") == 0)
-        uncompr = 1;
-      else if (strcmp(*argv, "-f") == 0)
-        outmode[3] = 'f';
-      else if (strcmp(*argv, "-h") == 0)
-        outmode[3] = 'h';
-      else if (strcmp(*argv, "-r") == 0)
-        outmode[3] = 'R';
-      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
-               (*argv)[2] == 0)
-        outmode[2] = (*argv)[1];
-      else
-        break;
-      argc--, argv++;
-    }
-    if (outmode[3] == ' ')
-        outmode[3] = 0;
-    if (argc == 0) {
-        SET_BINARY_MODE(stdin);
-        SET_BINARY_MODE(stdout);
-        if (uncompr) {
-            file = gzdopen(fileno(stdin), "rb");
-            if (file == NULL) error("can't gzdopen stdin");
-            gz_uncompress(file, stdout);
-        } else {
-            file = gzdopen(fileno(stdout), outmode);
-            if (file == NULL) error("can't gzdopen stdout");
-            gz_compress(stdin, file);
-        }
-    } else {
-        if (copyout) {
-            SET_BINARY_MODE(stdout);
-        }
-        do {
-            if (uncompr) {
-                if (copyout) {
-                    file = gzopen(*argv, "rb");
-                    if (file == NULL)
-                        fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
-                    else
-                        gz_uncompress(file, stdout);
-                } else {
-                    file_uncompress(*argv);
-                }
-            } else {
-                if (copyout) {
-                    FILE * in = fopen(*argv, "rb");
-
-                    if (in == NULL) {
-                        perror(*argv);
-                    } else {
-                        file = gzdopen(fileno(stdout), outmode);
-                        if (file == NULL) error("can't gzdopen stdout");
-
-                        gz_compress(in, file);
-                    }
-
-                } else {
-                    file_compress(*argv, outmode);
-                }
-            }
-        } while (argv++, --argc);
-    }
-    return 0;
-}

crates/libz-sys/src/zlib/treebuild.xml

diff --git a/crates/libz-sys/src/zlib/treebuild.xml b/crates/libz-sys/src/zlib/treebuild.xml
deleted file mode 100644
index fd75525..0000000
--- a/crates/libz-sys/src/zlib/treebuild.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" ?>
-<package name="zlib" version="1.2.11">
-    <library name="zlib" dlversion="1.2.11" dlname="z">
-	<property name="description"> zip compression library </property>
-	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-
-	<!-- fixme: not implemented yet -->
-	<property name="compiler/c/inline" value="yes" />
-
-	<include-file name="zlib.h" scope="public" mode="644" />
-	<include-file name="zconf.h" scope="public" mode="644" />
-
-	<source name="adler32.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="compress.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="crc32.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="crc32.h" />
-	</source>
-	<source name="gzclose.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzlib.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzread.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzwrite.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="uncompr.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="deflate.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="deflate.h" />
-	</source>
-	<source name="trees.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="deflate.h" />
-	    <depend name="trees.h" />
-	</source>
-	<source name="zutil.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	</source>
-	<source name="inflate.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-	<source name="infback.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-	<source name="inftrees.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	</source>
-	<source name="inffast.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-    </library>
-</package>
-
-<!--
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-# OBJA =
-# to use the asm code: make OBJA=match.o
-#
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
--->

crates/libz-sys/src/zlib/trees.c

diff --git a/crates/libz-sys/src/zlib/trees.c b/crates/libz-sys/src/zlib/trees.c
deleted file mode 100644
index 50cf4b4..0000000
--- a/crates/libz-sys/src/zlib/trees.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef ZLIB_DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local const static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local const static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local const static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef ZLIB_DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* !ZLIB_DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !ZLIB_DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = (int)value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* ZLIB_DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-#ifdef NO_INIT_GLOBAL_POINTERS
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-#endif
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef ZLIB_DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
-        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Tracev((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-    bi_windup(s);        /* align on byte boundary */
-    put_short(s, (ush)stored_len);
-    put_short(s, (ush)~stored_len);
-    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
-    s->pending += stored_len;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-    s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
-#endif
-}
-
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef ZLIB_DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and write out the encoded block.
- */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, last);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (const ct_data *)static_ltree,
-                       (const ct_data *)static_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (const ct_data *)s->dyn_ltree,
-                       (const ct_data *)s->dyn_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (last) {
-        bi_windup(s);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}

crates/libz-sys/src/zlib/trees.h

diff --git a/crates/libz-sys/src/zlib/trees.h b/crates/libz-sys/src/zlib/trees.h
deleted file mode 100644
index d35639d..0000000
--- a/crates/libz-sys/src/zlib/trees.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-

crates/libz-sys/src/zlib/uncompr.c

diff --git a/crates/libz-sys/src/zlib/uncompr.c b/crates/libz-sys/src/zlib/uncompr.c
deleted file mode 100644
index f03a1a8..0000000
--- a/crates/libz-sys/src/zlib/uncompr.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  *sourceLen is
-   the byte length of the source buffer. Upon entry, *destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data. (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit,
-   *destLen is the size of the decompressed data and *sourceLen is the number
-   of source bytes consumed. Upon return, source + *sourceLen points to the
-   first unused input byte.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
-   Z_DATA_ERROR if the input data was corrupted, including if the input data is
-   an incomplete zlib stream.
-*/
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong *sourceLen;
-{
-    z_stream stream;
-    int err;
-    const uInt max = (uInt)-1;
-    uLong len, left;
-    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
-
-    len = *sourceLen;
-    if (*destLen) {
-        left = *destLen;
-        *destLen = 0;
-    }
-    else {
-        left = 1;
-        dest = buf;
-    }
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = 0;
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = len > (uLong)max ? max : (uInt)len;
-            len -= stream.avail_in;
-        }
-        err = inflate(&stream, Z_NO_FLUSH);
-    } while (err == Z_OK);
-
-    *sourceLen -= len + stream.avail_in;
-    if (dest != buf)
-        *destLen = stream.total_out;
-    else if (stream.total_out && err == Z_BUF_ERROR)
-        left = 1;
-
-    inflateEnd(&stream);
-    return err == Z_STREAM_END ? Z_OK :
-           err == Z_NEED_DICT ? Z_DATA_ERROR  :
-           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
-           err;
-}
-
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return uncompress2(dest, destLen, source, &sourceLen);
-}

crates/libz-sys/src/zlib/watcom/watcom_f.mak

diff --git a/crates/libz-sys/src/zlib/watcom/watcom_f.mak b/crates/libz-sys/src/zlib/watcom/watcom_f.mak
deleted file mode 100644
index 37f4d74..0000000
--- a/crates/libz-sys/src/zlib/watcom/watcom_f.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for zlib
-# OpenWatcom flat model
-# Last updated: 28-Dec-2005
-
-# To use, do "wmake -f watcom_f.mak"
-
-C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
-	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
-            infback.c  inffast.c  inflate.c inftrees.c   &
-            trees.c    uncompr.c  zutil.c
-
-OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
-	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
-            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
-            trees.obj    uncompr.obj  zutil.obj
-
-CC       = wcc386
-LINKER   = wcl386
-CFLAGS   = -zq -mf -3r -fp3 -s -bt=dos -oilrtfm -fr=nul -wx
-ZLIB_LIB = zlib_f.lib
-
-.C.OBJ:
-        $(CC) $(CFLAGS) $[@
-
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-$(ZLIB_LIB): $(OBJS)
-	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
-	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
-        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
-        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
-        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
-
-example.exe: $(ZLIB_LIB) example.obj
-	$(LINKER) -ldos32a -fe=example.exe example.obj $(ZLIB_LIB)
-
-minigzip.exe: $(ZLIB_LIB) minigzip.obj
-	$(LINKER) -ldos32a -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
-
-clean: .SYMBOLIC
-          del *.obj
-          del $(ZLIB_LIB)
-          @echo Cleaning done

crates/libz-sys/src/zlib/watcom/watcom_l.mak

diff --git a/crates/libz-sys/src/zlib/watcom/watcom_l.mak b/crates/libz-sys/src/zlib/watcom/watcom_l.mak
deleted file mode 100644
index 193eed7..0000000
--- a/crates/libz-sys/src/zlib/watcom/watcom_l.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for zlib
-# OpenWatcom large model
-# Last updated: 28-Dec-2005
-
-# To use, do "wmake -f watcom_l.mak"
-
-C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
-	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
-            infback.c  inffast.c  inflate.c inftrees.c   &
-            trees.c    uncompr.c  zutil.c
-
-OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
-	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
-            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
-            trees.obj    uncompr.obj  zutil.obj
-
-CC       = wcc
-LINKER   = wcl
-CFLAGS   = -zq -ml -s -bt=dos -oilrtfm -fr=nul -wx
-ZLIB_LIB = zlib_l.lib
-
-.C.OBJ:
-        $(CC) $(CFLAGS) $[@
-
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-$(ZLIB_LIB): $(OBJS)
-	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
-	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
-        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
-        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
-        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
-
-example.exe: $(ZLIB_LIB) example.obj
-	$(LINKER) -fe=example.exe example.obj $(ZLIB_LIB)
-
-minigzip.exe: $(ZLIB_LIB) minigzip.obj
-	$(LINKER) -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
-
-clean: .SYMBOLIC
-          del *.obj
-          del $(ZLIB_LIB)
-          @echo Cleaning done

crates/libz-sys/src/zlib/win32/DLL_FAQ.txt

diff --git a/crates/libz-sys/src/zlib/win32/DLL_FAQ.txt b/crates/libz-sys/src/zlib/win32/DLL_FAQ.txt
deleted file mode 100644
index 12c0090..0000000
--- a/crates/libz-sys/src/zlib/win32/DLL_FAQ.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-
-            Frequently Asked Questions about ZLIB1.DLL
-
-
-This document describes the design, the rationale, and the usage
-of the official DLL build of zlib, named ZLIB1.DLL.  If you have
-general questions about zlib, you should see the file "FAQ" found
-in the zlib distribution, or at the following location:
-  http://www.gzip.org/zlib/zlib_faq.html
-
-
- 1. What is ZLIB1.DLL, and how can I get it?
-
-  - ZLIB1.DLL is the official build of zlib as a DLL.
-    (Please remark the character '1' in the name.)
-
-    Pointers to a precompiled ZLIB1.DLL can be found in the zlib
-    web site at:
-      http://www.zlib.net/
-
-    Applications that link to ZLIB1.DLL can rely on the following
-    specification:
-
-    * The exported symbols are exclusively defined in the source
-      files "zlib.h" and "zlib.def", found in an official zlib
-      source distribution.
-    * The symbols are exported by name, not by ordinal.
-    * The exported names are undecorated.
-    * The calling convention of functions is "C" (CDECL).
-    * The ZLIB1.DLL binary is linked to MSVCRT.DLL.
-
-    The archive in which ZLIB1.DLL is bundled contains compiled
-    test programs that must run with a valid build of ZLIB1.DLL.
-    It is recommended to download the prebuilt DLL from the zlib
-    web site, instead of building it yourself, to avoid potential
-    incompatibilities that could be introduced by your compiler
-    and build settings.  If you do build the DLL yourself, please
-    make sure that it complies with all the above requirements,
-    and it runs with the precompiled test programs, bundled with
-    the original ZLIB1.DLL distribution.
-
-    If, for any reason, you need to build an incompatible DLL,
-    please use a different file name.
-
-
- 2. Why did you change the name of the DLL to ZLIB1.DLL?
-    What happened to the old ZLIB.DLL?
-
-  - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required
-    compilation settings that were incompatible to those used by
-    a static build.  The DLL settings were supposed to be enabled
-    by defining the macro ZLIB_DLL, before including "zlib.h".
-    Incorrect handling of this macro was silently accepted at
-    build time, resulting in two major problems:
-
-    * ZLIB_DLL was missing from the old makefile.  When building
-      the DLL, not all people added it to the build options.  In
-      consequence, incompatible incarnations of ZLIB.DLL started
-      to circulate around the net.
-
-    * When switching from using the static library to using the
-      DLL, applications had to define the ZLIB_DLL macro and
-      to recompile all the sources that contained calls to zlib
-      functions.  Failure to do so resulted in creating binaries
-      that were unable to run with the official ZLIB.DLL build.
-
-    The only possible solution that we could foresee was to make
-    a binary-incompatible change in the DLL interface, in order to
-    remove the dependency on the ZLIB_DLL macro, and to release
-    the new DLL under a different name.
-
-    We chose the name ZLIB1.DLL, where '1' indicates the major
-    zlib version number.  We hope that we will not have to break
-    the binary compatibility again, at least not as long as the
-    zlib-1.x series will last.
-
-    There is still a ZLIB_DLL macro, that can trigger a more
-    efficient build and use of the DLL, but compatibility no
-    longer dependents on it.
-
-
- 3. Can I build ZLIB.DLL from the new zlib sources, and replace
-    an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?
-
-  - In principle, you can do it by assigning calling convention
-    keywords to the macros ZEXPORT and ZEXPORTVA.  In practice,
-    it depends on what you mean by "an old ZLIB.DLL", because the
-    old DLL exists in several mutually-incompatible versions.
-    You have to find out first what kind of calling convention is
-    being used in your particular ZLIB.DLL build, and to use the
-    same one in the new build.  If you don't know what this is all
-    about, you might be better off if you would just leave the old
-    DLL intact.
-
-
- 4. Can I compile my application using the new zlib interface, and
-    link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or
-    earlier?
-
-  - The official answer is "no"; the real answer depends again on
-    what kind of ZLIB.DLL you have.  Even if you are lucky, this
-    course of action is unreliable.
-
-    If you rebuild your application and you intend to use a newer
-    version of zlib (post- 1.1.4), it is strongly recommended to
-    link it to the new ZLIB1.DLL.
-
-
- 5. Why are the zlib symbols exported by name, and not by ordinal?
-
-  - Although exporting symbols by ordinal is a little faster, it
-    is risky.  Any single glitch in the maintenance or use of the
-    DEF file that contains the ordinals can result in incompatible
-    builds and frustrating crashes.  Simply put, the benefits of
-    exporting symbols by ordinal do not justify the risks.
-
-    Technically, it should be possible to maintain ordinals in
-    the DEF file, and still export the symbols by name.  Ordinals
-    exist in every DLL, and even if the dynamic linking performed
-    at the DLL startup is searching for names, ordinals serve as
-    hints, for a faster name lookup.  However, if the DEF file
-    contains ordinals, the Microsoft linker automatically builds
-    an implib that will cause the executables linked to it to use
-    those ordinals, and not the names.  It is interesting to
-    notice that the GNU linker for Win32 does not suffer from this
-    problem.
-
-    It is possible to avoid the DEF file if the exported symbols
-    are accompanied by a "__declspec(dllexport)" attribute in the
-    source files.  You can do this in zlib by predefining the
-    ZLIB_DLL macro.
-
-
- 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling
-    convention.  Why not use the STDCALL convention?
-    STDCALL is the standard convention in Win32, and I need it in
-    my Visual Basic project!
-
-    (For readability, we use CDECL to refer to the convention
-     triggered by the "__cdecl" keyword, STDCALL to refer to
-     the convention triggered by "__stdcall", and FASTCALL to
-     refer to the convention triggered by "__fastcall".)
-
-  - Most of the native Windows API functions (without varargs) use
-    indeed the WINAPI convention (which translates to STDCALL in
-    Win32), but the standard C functions use CDECL.  If a user
-    application is intrinsically tied to the Windows API (e.g.
-    it calls native Windows API functions such as CreateFile()),
-    sometimes it makes sense to decorate its own functions with
-    WINAPI.  But if ANSI C or POSIX portability is a goal (e.g.
-    it calls standard C functions such as fopen()), it is not a
-    sound decision to request the inclusion of <windows.h>, or to
-    use non-ANSI constructs, for the sole purpose to make the user
-    functions STDCALL-able.
-
-    The functionality offered by zlib is not in the category of
-    "Windows functionality", but is more like "C functionality".
-
-    Technically, STDCALL is not bad; in fact, it is slightly
-    faster than CDECL, and it works with variable-argument
-    functions, just like CDECL.  It is unfortunate that, in spite
-    of using STDCALL in the Windows API, it is not the default
-    convention used by the C compilers that run under Windows.
-    The roots of the problem reside deep inside the unsafety of
-    the K&R-style function prototypes, where the argument types
-    are not specified; but that is another story for another day.
-
-    The remaining fact is that CDECL is the default convention.
-    Even if an explicit convention is hard-coded into the function
-    prototypes inside C headers, problems may appear.  The
-    necessity to expose the convention in users' callbacks is one
-    of these problems.
-
-    The calling convention issues are also important when using
-    zlib in other programming languages.  Some of them, like Ada
-    (GNAT) and Fortran (GNU G77), have C bindings implemented
-    initially on Unix, and relying on the C calling convention.
-    On the other hand, the pre- .NET versions of Microsoft Visual
-    Basic require STDCALL, while Borland Delphi prefers, although
-    it does not require, FASTCALL.
-
-    In fairness to all possible uses of zlib outside the C
-    programming language, we choose the default "C" convention.
-    Anyone interested in different bindings or conventions is
-    encouraged to maintain specialized projects.  The "contrib/"
-    directory from the zlib distribution already holds a couple
-    of foreign bindings, such as Ada, C++, and Delphi.
-
-
- 7. I need a DLL for my Visual Basic project.  What can I do?
-
-  - Define the ZLIB_WINAPI macro before including "zlib.h", when
-    building both the DLL and the user application (except that
-    you don't need to define anything when using the DLL in Visual
-    Basic).  The ZLIB_WINAPI macro will switch on the WINAPI
-    (STDCALL) convention.  The name of this DLL must be different
-    than the official ZLIB1.DLL.
-
-    Gilles Vollant has contributed a build named ZLIBWAPI.DLL,
-    with the ZLIB_WINAPI macro turned on, and with the minizip
-    functionality built in.  For more information, please read
-    the notes inside "contrib/vstudio/readme.txt", found in the
-    zlib distribution.
-
-
- 8. I need to use zlib in my Microsoft .NET project.  What can I
-    do?
-
-  - Henrik Ravn has contributed a .NET wrapper around zlib.  Look
-    into contrib/dotzlib/, inside the zlib distribution.
-
-
- 9. If my application uses ZLIB1.DLL, should I link it to
-    MSVCRT.DLL?  Why?
-
-  - It is not required, but it is recommended to link your
-    application to MSVCRT.DLL, if it uses ZLIB1.DLL.
-
-    The executables (.EXE, .DLL, etc.) that are involved in the
-    same process and are using the C run-time library (i.e. they
-    are calling standard C functions), must link to the same
-    library.  There are several libraries in the Win32 system:
-    CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc.
-    Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that
-    depend on it should also be linked to MSVCRT.DLL.
-
-
-10. Why are you saying that ZLIB1.DLL and my application should
-    be linked to the same C run-time (CRT) library?  I linked my
-    application and my DLLs to different C libraries (e.g. my
-    application to a static library, and my DLLs to MSVCRT.DLL),
-    and everything works fine.
-
-  - If a user library invokes only pure Win32 API (accessible via
-    <windows.h> and the related headers), its DLL build will work
-    in any context.  But if this library invokes standard C API,
-    things get more complicated.
-
-    There is a single Win32 library in a Win32 system.  Every
-    function in this library resides in a single DLL module, that
-    is safe to call from anywhere.  On the other hand, there are
-    multiple versions of the C library, and each of them has its
-    own separate internal state.  Standalone executables and user
-    DLLs that call standard C functions must link to a C run-time
-    (CRT) library, be it static or shared (DLL).  Intermixing
-    occurs when an executable (not necessarily standalone) and a
-    DLL are linked to different CRTs, and both are running in the
-    same process.
-
-    Intermixing multiple CRTs is possible, as long as their
-    internal states are kept intact.  The Microsoft Knowledge Base
-    articles KB94248 "HOWTO: Use the C Run-Time" and KB140584
-    "HOWTO: Link with the Correct C Run-Time (CRT) Library"
-    mention the potential problems raised by intermixing.
-
-    If intermixing works for you, it's because your application
-    and DLLs are avoiding the corruption of each of the CRTs'
-    internal states, maybe by careful design, or maybe by fortune.
-
-    Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such
-    as those provided by Borland, raises similar problems.
-
-
-11. Why are you linking ZLIB1.DLL to MSVCRT.DLL?
-
-  - MSVCRT.DLL exists on every Windows 95 with a new service pack
-    installed, or with Microsoft Internet Explorer 4 or later, and
-    on all other Windows 4.x or later (Windows 98, Windows NT 4,
-    or later).  It is freely distributable; if not present in the
-    system, it can be downloaded from Microsoft or from other
-    software provider for free.
-
-    The fact that MSVCRT.DLL does not exist on a virgin Windows 95
-    is not so problematic.  Windows 95 is scarcely found nowadays,
-    Microsoft ended its support a long time ago, and many recent
-    applications from various vendors, including Microsoft, do not
-    even run on it.  Furthermore, no serious user should run
-    Windows 95 without a proper update installed.
-
-
-12. Why are you not linking ZLIB1.DLL to
-    <<my favorite C run-time library>> ?
-
-  - We considered and abandoned the following alternatives:
-
-    * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or
-      LIBCMT.LIB) is not a good option.  People are using the DLL
-      mainly to save disk space.  If you are linking your program
-      to a static C library, you may as well consider linking zlib
-      in statically, too.
-
-    * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because
-      CRTDLL.DLL is present on every Win32 installation.
-      Unfortunately, it has a series of problems: it does not
-      work properly with Microsoft's C++ libraries, it does not
-      provide support for 64-bit file offsets, (and so on...),
-      and Microsoft discontinued its support a long time ago.
-
-    * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied
-      with the Microsoft .NET platform, and Visual C++ 7.0/7.1,
-      raises problems related to the status of ZLIB1.DLL as a
-      system component.  According to the Microsoft Knowledge Base
-      article KB326922 "INFO: Redistribution of the Shared C
-      Runtime Component in Visual C++ .NET", MSVCR70.DLL and
-      MSVCR71.DLL are not supposed to function as system DLLs,
-      because they may clash with MSVCRT.DLL.  Instead, the
-      application's installer is supposed to put these DLLs
-      (if needed) in the application's private directory.
-      If ZLIB1.DLL depends on a non-system runtime, it cannot
-      function as a redistributable system component.
-
-    * Linking ZLIB1.DLL to non-Microsoft runtimes, such as
-      Borland's, or Cygwin's, raises problems related to the
-      reliable presence of these runtimes on Win32 systems.
-      It's easier to let the DLL build of zlib up to the people
-      who distribute these runtimes, and who may proceed as
-      explained in the answer to Question 14.
-
-
-13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL,
-    how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0
-    (Visual Studio .NET) or newer?
-
-  - Due to the problems explained in the Microsoft Knowledge Base
-    article KB326922 (see the previous answer), the C runtime that
-    comes with the VC7 environment is no longer considered a
-    system component.  That is, it should not be assumed that this
-    runtime exists, or may be installed in a system directory.
-    Since ZLIB1.DLL is supposed to be a system component, it may
-    not depend on a non-system component.
-
-    In order to link ZLIB1.DLL and your application to MSVCRT.DLL
-    in VC7, you need the library of Visual C++ 6.0 or older.  If
-    you don't have this library at hand, it's probably best not to
-    use ZLIB1.DLL.
-
-    We are hoping that, in the future, Microsoft will provide a
-    way to build applications linked to a proper system runtime,
-    from the Visual C++ environment.  Until then, you have a
-    couple of alternatives, such as linking zlib in statically.
-    If your application requires dynamic linking, you may proceed
-    as explained in the answer to Question 14.
-
-
-14. I need to link my own DLL build to a CRT different than
-    MSVCRT.DLL.  What can I do?
-
-  - Feel free to rebuild the DLL from the zlib sources, and link
-    it the way you want.  You should, however, clearly state that
-    your build is unofficial.  You should give it a different file
-    name, and/or install it in a private directory that can be
-    accessed by your application only, and is not visible to the
-    others (i.e. it's neither in the PATH, nor in the SYSTEM or
-    SYSTEM32 directories).  Otherwise, your build may clash with
-    applications that link to the official build.
-
-    For example, in Cygwin, zlib is linked to the Cygwin runtime
-    CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
-
-
-15. May I include additional pieces of code that I find useful,
-    link them in ZLIB1.DLL, and export them?
-
-  - No.  A legitimate build of ZLIB1.DLL must not include code
-    that does not originate from the official zlib source code.
-    But you can make your own private DLL build, under a different
-    file name, as suggested in the previous answer.
-
-    For example, zlib is a part of the VCL library, distributed
-    with Borland Delphi and C++ Builder.  The DLL build of VCL
-    is a redistributable file, named VCLxx.DLL.
-
-
-16. May I remove some functionality out of ZLIB1.DLL, by enabling
-    macros like NO_GZCOMPRESS or NO_GZIP at compile time?
-
-  - No.  A legitimate build of ZLIB1.DLL must provide the complete
-    zlib functionality, as implemented in the official zlib source
-    code.  But you can make your own private DLL build, under a
-    different file name, as suggested in the previous answer.
-
-
-17. I made my own ZLIB1.DLL build.  Can I test it for compliance?
-
-  - We prefer that you download the official DLL from the zlib
-    web site.  If you need something peculiar from this DLL, you
-    can send your suggestion to the zlib mailing list.
-
-    However, in case you do rebuild the DLL yourself, you can run
-    it with the test programs found in the DLL distribution.
-    Running these test programs is not a guarantee of compliance,
-    but a failure can imply a detected problem.
-
-**
-
-This document is written and maintained by
-Cosmin Truta <cosmint@cs.ubbcluj.ro>

crates/libz-sys/src/zlib/win32/Makefile.bor

diff --git a/crates/libz-sys/src/zlib/win32/Makefile.bor b/crates/libz-sys/src/zlib/win32/Makefile.bor
deleted file mode 100644
index d152bbb..0000000
--- a/crates/libz-sys/src/zlib/win32/Makefile.bor
+++ /dev/null
@@ -1,110 +0,0 @@
-# Makefile for zlib
-# Borland C++ for Win32
-#
-# Usage:
-#  make -f win32/Makefile.bor
-#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
-
-# ------------ Borland C++ ------------
-
-# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
-# added to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-CC = bcc32
-AS = bcc32
-LD = bcc32
-AR = tlib
-CFLAGS  = -a -d -k- -O2 $(LOC)
-ASFLAGS = $(LOC)
-LDFLAGS = $(LOC)
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-#OBJA =
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-#OBJPA=
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $<
-
-.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-	$(AR) $(ZLIB_LIB) $(OBJPA)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del $(ZLIB_LIB)
-	-del *.obj
-	-del *.exe
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz

crates/libz-sys/src/zlib/win32/Makefile.gcc

diff --git a/crates/libz-sys/src/zlib/win32/Makefile.gcc b/crates/libz-sys/src/zlib/win32/Makefile.gcc
deleted file mode 100644
index 305be50..0000000
--- a/crates/libz-sys/src/zlib/win32/Makefile.gcc
+++ /dev/null
@@ -1,182 +0,0 @@
-# Makefile for zlib, derived from Makefile.dj2.
-# Modified for mingw32 by C. Spieler, 6/16/98.
-# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
-# Last updated: Mar 2012.
-# Tested under Cygwin and MinGW.
-
-# Copyright (C) 1995-2003 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type from the top level zlib directory:
-#
-#   make -fwin32/Makefile.gcc;  make test testdll -fwin32/Makefile.gcc
-#
-# To use the asm code, type:
-#   cp contrib/asm?86/match.S ./match.S
-#   make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
-#
-# To install libz.a, zconf.h and zlib.h in the system directories, type:
-#
-#   make install -fwin32/Makefile.gcc
-#
-# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
-#
-# To install the shared lib, append SHARED_MODE=1 to the make command :
-#
-#   make install -fwin32/Makefile.gcc SHARED_MODE=1
-
-# Note:
-# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
-# the DLL name should be changed from "zlib1.dll".
-
-STATICLIB = libz.a
-SHAREDLIB = zlib1.dll
-IMPLIB    = libz.dll.a
-
-#
-# Set to 1 if shared object needs to be installed
-#
-SHARED_MODE=0
-
-#LOC = -DASMV
-#LOC = -DZLIB_DEBUG -g
-
-PREFIX =
-CC = $(PREFIX)gcc
-CFLAGS = $(LOC) -O3 -Wall
-
-AS = $(CC)
-ASFLAGS = $(LOC) -Wall
-
-LD = $(CC)
-LDFLAGS = $(LOC)
-
-AR = $(PREFIX)ar
-ARFLAGS = rcs
-
-RC = $(PREFIX)windres
-RCFLAGS = --define GCC_WINDRES
-
-STRIP = $(PREFIX)strip
-
-CP = cp -fp
-# If GNU install is available, replace $(CP) with install.
-INSTALL = $(CP)
-RM = rm -f
-
-prefix ?= /usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
-       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-OBJA =
-
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-test: example.exe minigzip.exe
-	./example
-	echo hello world | ./minigzip | ./minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	./example_d
-	echo hello world | ./minigzip_d | ./minigzip_d -d
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-.S.o:
-	$(AS) $(ASFLAGS) -c -o $@ $<
-
-$(STATICLIB): $(OBJS) $(OBJA)
-	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
-	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(STRIP) $@
-
-example.exe: example.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
-	$(STRIP) $@
-
-minigzip.exe: minigzip.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
-	$(STRIP) $@
-
-example_d.exe: example.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
-	$(STRIP) $@
-
-minigzip_d.exe: minigzip.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
-	$(STRIP) $@
-
-example.o: test/example.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
-
-minigzip.o: test/minigzip.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
-
-zlibrc.o: win32/zlib1.rc
-	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
-
-.PHONY: install uninstall clean
-
-install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
-	@if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
-		echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
-		exit 1; \
-	fi
-	-@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
-	-@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
-	-if [ "$(SHARED_MODE)" = "1" ]; then \
-		mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
-		$(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
-		$(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
-	fi
-	-$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
-	-$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
-	-$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
-	sed \
-		-e 's|@prefix@|${prefix}|g' \
-		-e 's|@exec_prefix@|${exec_prefix}|g' \
-		-e 's|@libdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@includedir@|$(INCLUDE_PATH)|g' \
-		-e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \
-		zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
-
-uninstall:
-	-if [ "$(SHARED_MODE)" = "1" ]; then \
-		$(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
-		$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
-	fi
-	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
-	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
-	-$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
-
-clean:
-	-$(RM) $(STATICLIB)
-	-$(RM) $(SHAREDLIB)
-	-$(RM) $(IMPLIB)
-	-$(RM) *.o
-	-$(RM) *.exe
-	-$(RM) foo.gz
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h

crates/libz-sys/src/zlib/win32/Makefile.msc

diff --git a/crates/libz-sys/src/zlib/win32/Makefile.msc b/crates/libz-sys/src/zlib/win32/Makefile.msc
deleted file mode 100644
index 6831882..0000000
--- a/crates/libz-sys/src/zlib/win32/Makefile.msc
+++ /dev/null
@@ -1,163 +0,0 @@
-# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-#
-# Usage:
-#   nmake -f win32/Makefile.msc                          (standard build)
-#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
-#   nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
-#         OBJA="inffas32.obj match686.obj"               (use ASM code, x86)
-#   nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \
-#         OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"  (use ASM code, x64)
-
-# The toplevel directory of the source tree.
-#
-TOP = .
-
-# optional build flags
-LOC =
-
-# variables
-STATICLIB = zlib.lib
-SHAREDLIB = zlib1.dll
-IMPLIB    = zdll.lib
-
-CC = cl
-AS = ml
-LD = link
-AR = lib
-RC = rc
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-ASFLAGS = -coff -Zi $(LOC)
-LDFLAGS = -nologo -debug -incremental:no -opt:ref
-ARFLAGS = -nologo
-RCFLAGS = /dWIN32 /r
-
-OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
-       gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj
-OBJA =
-
-
-# targets
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
-     example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-$(STATICLIB): $(OBJS) $(OBJA)
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): $(TOP)/win32/zlib.def $(OBJS) $(OBJA) zlib1.res
-	$(LD) $(LDFLAGS) -def:$(TOP)/win32/zlib.def -dll -implib:$(IMPLIB) \
-	  -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;2
-
-example.exe: example.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) example.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip.exe: minigzip.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-example_d.exe: example.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip_d.exe: minigzip.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-{$(TOP)}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/test}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/contrib/masmx64}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/contrib/masmx64}.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-{$(TOP)/contrib/masmx86}.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-adler32.obj: $(TOP)/adler32.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-compress.obj: $(TOP)/compress.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-crc32.obj: $(TOP)/crc32.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/crc32.h
-
-deflate.obj: $(TOP)/deflate.c $(TOP)/deflate.h $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
-
-gzclose.obj: $(TOP)/gzclose.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzlib.obj: $(TOP)/gzlib.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzread.obj: $(TOP)/gzread.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzwrite.obj: $(TOP)/gzwrite.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-infback.obj: $(TOP)/infback.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h $(TOP)/inffixed.h
-
-inffast.obj: $(TOP)/inffast.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h
-
-inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h $(TOP)/inffixed.h
-
-inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h
-
-trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/deflate.h $(TOP)/trees.h
-
-uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-zutil.obj: $(TOP)/zutil.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
-
-gvmat64.obj: $(TOP)/contrib\masmx64\gvmat64.asm
-
-inffasx64.obj: $(TOP)/contrib\masmx64\inffasx64.asm
-
-inffas8664.obj: $(TOP)/contrib\masmx64\inffas8664.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h \
-		$(TOP)/inftrees.h $(TOP)/inflate.h $(TOP)/inffast.h
-
-inffas32.obj: $(TOP)/contrib\masmx86\inffas32.asm
-
-match686.obj: $(TOP)/contrib\masmx86\match686.asm
-
-example.obj: $(TOP)/test/example.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-zlib1.res: $(TOP)/win32/zlib1.rc
-	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/zlib1.rc
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	example_d
-	echo hello world | minigzip_d | minigzip_d -d
-
-
-# cleanup
-clean:
-	-del $(STATICLIB)
-	-del $(SHAREDLIB)
-	-del $(IMPLIB)
-	-del *.obj
-	-del *.res
-	-del *.exp
-	-del *.exe
-	-del *.pdb
-	-del *.manifest
-	-del foo.gz

crates/libz-sys/src/zlib/win32/README-WIN32.txt

diff --git a/crates/libz-sys/src/zlib/win32/README-WIN32.txt b/crates/libz-sys/src/zlib/win32/README-WIN32.txt
deleted file mode 100644
index df7ab7f..0000000
--- a/crates/libz-sys/src/zlib/win32/README-WIN32.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.11 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  Two compiled
-examples are distributed in this package, example and minigzip.  The example_d
-and minigzip_d flavors validate that the zlib1.dll file is working correctly.
-
-Questions about zlib should be sent to <zlib@gzip.org>.  The zlib home page
-is http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
-before asking for help.
-
-
-Manifest:
-
-The package zlib-1.2.11-win32-x86.zip will contain the following files:
-
-  README-WIN32.txt This document
-  ChangeLog        Changes since previous zlib packages
-  DLL_FAQ.txt      Frequently asked questions about zlib1.dll
-  zlib.3.pdf       Documentation of this library in Adobe Acrobat format
-
-  example.exe      A statically-bound example (using zlib.lib, not the dll)
-  example.pdb      Symbolic information for debugging example.exe
-
-  example_d.exe    A zlib1.dll bound example (using zdll.lib)
-  example_d.pdb    Symbolic information for debugging example_d.exe
-
-  minigzip.exe     A statically-bound test program (using zlib.lib, not the dll)
-  minigzip.pdb     Symbolic information for debugging minigzip.exe
-
-  minigzip_d.exe   A zlib1.dll bound test program (using zdll.lib)
-  minigzip_d.pdb   Symbolic information for debugging minigzip_d.exe
-
-  zlib.h           Install these files into the compilers' INCLUDE path to
-  zconf.h          compile programs which use zlib.lib or zdll.lib
-
-  zdll.lib         Install these files into the compilers' LIB path if linking
-  zdll.exp         a compiled program to the zlib1.dll binary
-
-  zlib.lib         Install these files into the compilers' LIB path to link zlib
-  zlib.pdb         into compiled programs, without zlib1.dll runtime dependency
-                   (zlib.pdb provides debugging info to the compile time linker)
-
-  zlib1.dll        Install this binary shared library into the system PATH, or
-                   the program's runtime directory (where the .exe resides)
-  zlib1.pdb        Install in the same directory as zlib1.dll, in order to debug
-                   an application crash using WinDbg or similar tools.
-
-All .pdb files above are entirely optional, but are very useful to a developer
-attempting to diagnose program misbehavior or a crash.  Many additional
-important files for developers can be found in the zlib127.zip source package
-available from http://zlib.net/ - review that package's README file for details.
-
-
-Acknowledgments:
-
-The deflate format used by zlib was defined by Phil Katz.  The deflate and
-zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-people who reported problems and suggested various improvements in zlib; they
-are too numerous to cite here.
-
-
-Copyright notice:
-
-  (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.

crates/libz-sys/src/zlib/win32/VisualC.txt

diff --git a/crates/libz-sys/src/zlib/win32/VisualC.txt b/crates/libz-sys/src/zlib/win32/VisualC.txt
deleted file mode 100644
index 1005b21..0000000
--- a/crates/libz-sys/src/zlib/win32/VisualC.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the contrib/vstudio/ directory.

crates/libz-sys/src/zlib/win32/zlib.def

diff --git a/crates/libz-sys/src/zlib/win32/zlib.def b/crates/libz-sys/src/zlib/win32/zlib.def
deleted file mode 100644
index 784b138..0000000
--- a/crates/libz-sys/src/zlib/win32/zlib.def
+++ /dev/null
@@ -1,94 +0,0 @@
-; zlib data compression library

-EXPORTS

-; basic functions

-    zlibVersion

-    deflate

-    deflateEnd

-    inflate

-    inflateEnd

-; advanced functions

-    deflateSetDictionary

-    deflateGetDictionary

-    deflateCopy

-    deflateReset

-    deflateParams

-    deflateTune

-    deflateBound

-    deflatePending

-    deflatePrime

-    deflateSetHeader

-    inflateSetDictionary

-    inflateGetDictionary

-    inflateSync

-    inflateCopy

-    inflateReset

-    inflateReset2

-    inflatePrime

-    inflateMark

-    inflateGetHeader

-    inflateBack

-    inflateBackEnd

-    zlibCompileFlags

-; utility functions

-    compress

-    compress2

-    compressBound

-    uncompress

-    uncompress2

-    gzopen

-    gzdopen

-    gzbuffer

-    gzsetparams

-    gzread

-    gzfread

-    gzwrite

-    gzfwrite

-    gzprintf

-    gzvprintf

-    gzputs

-    gzgets

-    gzputc

-    gzgetc

-    gzungetc

-    gzflush

-    gzseek

-    gzrewind

-    gztell

-    gzoffset

-    gzeof

-    gzdirect

-    gzclose

-    gzclose_r

-    gzclose_w

-    gzerror

-    gzclearerr

-; large file functions

-    gzopen64

-    gzseek64

-    gztell64

-    gzoffset64

-    adler32_combine64

-    crc32_combine64

-; checksum functions

-    adler32

-    adler32_z

-    crc32

-    crc32_z

-    adler32_combine

-    crc32_combine

-; various hacks, don't look :)

-    deflateInit_

-    deflateInit2_

-    inflateInit_

-    inflateInit2_

-    inflateBackInit_

-    gzgetc_

-    zError

-    inflateSyncPoint

-    get_crc_table

-    inflateUndermine

-    inflateValidate

-    inflateCodesUsed

-    inflateResetKeep

-    deflateResetKeep

-    gzopen_w

crates/libz-sys/src/zlib/win32/zlib1.rc

diff --git a/crates/libz-sys/src/zlib/win32/zlib1.rc b/crates/libz-sys/src/zlib/win32/zlib1.rc
deleted file mode 100644
index 234e641..0000000
--- a/crates/libz-sys/src/zlib/win32/zlib1.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <winver.h>
-#include "../zlib.h"
-
-#ifdef GCC_WINDRES
-VS_VERSION_INFO		VERSIONINFO
-#else
-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
-  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS		1
-#else
-  FILEFLAGS		0
-#endif
-  FILEOS		VOS__WINDOWS32
-  FILETYPE		VFT_DLL
-  FILESUBTYPE		0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-    BEGIN
-      VALUE "FileDescription",	"zlib data compression library\0"
-      VALUE "FileVersion",	ZLIB_VERSION "\0"
-      VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-      VALUE "OriginalFilename",	"zlib1.dll\0"
-      VALUE "ProductName",	"zlib\0"
-      VALUE "ProductVersion",	ZLIB_VERSION "\0"
-      VALUE "Comments",		"For more information visit http://www.zlib.net/\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END

crates/libz-sys/src/zlib/zconf.h

diff --git a/crates/libz-sys/src/zlib/zconf.h b/crates/libz-sys/src/zlib/zconf.h
deleted file mode 100644
index 5e1d68a..0000000
--- a/crates/libz-sys/src/zlib/zconf.h
+++ /dev/null
@@ -1,534 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

crates/libz-sys/src/zlib/zconf.h.cmakein

diff --git a/crates/libz-sys/src/zlib/zconf.h.cmakein b/crates/libz-sys/src/zlib/zconf.h.cmakein
deleted file mode 100644
index a7f24cc..0000000
--- a/crates/libz-sys/src/zlib/zconf.h.cmakein
+++ /dev/null
@@ -1,536 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-#cmakedefine Z_PREFIX
-#cmakedefine Z_HAVE_UNISTD_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

crates/libz-sys/src/zlib/zconf.h.in

diff --git a/crates/libz-sys/src/zlib/zconf.h.in b/crates/libz-sys/src/zlib/zconf.h.in
deleted file mode 100644
index 5e1d68a..0000000
--- a/crates/libz-sys/src/zlib/zconf.h.in
+++ /dev/null
@@ -1,534 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

crates/libz-sys/src/zlib/zlib.3

diff --git a/crates/libz-sys/src/zlib/zlib.3 b/crates/libz-sys/src/zlib/zlib.3
deleted file mode 100644
index bda4eb0..0000000
--- a/crates/libz-sys/src/zlib/zlib.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.TH ZLIB 3 "15 Jan 2017"
-.SH NAME
-zlib \- compression/decompression library
-.SH SYNOPSIS
-[see
-.I zlib.h
-for full description]
-.SH DESCRIPTION
-The
-.I zlib
-library is a general purpose data compression library.
-The code is thread safe, assuming that the standard library functions
-used are thread safe, such as memory allocation routines.
-It provides in-memory compression and decompression functions,
-including integrity checks of the uncompressed data.
-This version of the library supports only one compression method (deflation)
-but other algorithms may be added later
-with the same stream interface.
-.LP
-Compression can be done in a single step if the buffers are large enough
-or can be done by repeated calls of the compression function.
-In the latter case,
-the application must provide more input and/or consume the output
-(providing more output space) before each call.
-.LP
-The library also supports reading and writing files in
-.IR gzip (1)
-(.gz) format
-with an interface similar to that of stdio.
-.LP
-The library does not install any signal handler.
-The decoder checks the consistency of the compressed data,
-so the library should never crash even in the case of corrupted input.
-.LP
-All functions of the compression library are documented in the file
-.IR zlib.h .
-The distribution source includes examples of use of the library
-in the files
-.I test/example.c
-and
-.IR test/minigzip.c,
-as well as other examples in the
-.IR examples/
-directory.
-.LP
-Changes to this version are documented in the file
-.I ChangeLog
-that accompanies the source.
-.LP
-.I zlib
-is built in to many languages and operating systems, including but not limited to
-Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
-.LP
-An experimental package to read and write files in the .zip format,
-written on top of
-.I zlib
-by Gilles Vollant (info@winimage.com),
-is available at:
-.IP
-http://www.winimage.com/zLibDll/minizip.html
-and also in the
-.I contrib/minizip
-directory of the main
-.I zlib
-source distribution.
-.SH "SEE ALSO"
-The
-.I zlib
-web site can be found at:
-.IP
-http://zlib.net/
-.LP
-The data format used by the
-.I zlib
-library is described by RFC
-(Request for Comments) 1950 to 1952 in the files:
-.IP
-http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
-.br
-http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
-.br
-http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
-.LP
-Mark Nelson wrote an article about
-.I zlib
-for the Jan. 1997 issue of  Dr. Dobb's Journal;
-a copy of the article is available at:
-.IP
-http://marknelson.us/1997/01/01/zlib-engine/
-.SH "REPORTING PROBLEMS"
-Before reporting a problem,
-please check the
-.I zlib
-web site to verify that you have the latest version of
-.IR zlib ;
-otherwise,
-obtain the latest version and see if the problem still exists.
-Please read the
-.I zlib
-FAQ at:
-.IP
-http://zlib.net/zlib_faq.html
-.LP
-before asking for help.
-Send questions and/or comments to zlib@gzip.org,
-or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
-.SH AUTHORS AND LICENSE
-Version 1.2.11
-.LP
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-.LP
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-.LP
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-.LP
-.nr step 1 1
-.IP \n[step]. 3
-The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-.IP \n+[step].
-Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-.IP \n+[step].
-This notice may not be removed or altered from any source distribution.
-.LP
-Jean-loup Gailly        Mark Adler
-.br
-jloup@gzip.org          madler@alumni.caltech.edu
-.LP
-The deflate format used by
-.I zlib
-was defined by Phil Katz.
-The deflate and
-.I zlib
-specifications were written by L. Peter Deutsch.
-Thanks to all the people who reported problems and suggested various
-improvements in
-.IR zlib ;
-who are too numerous to cite here.
-.LP
-UNIX manual page by R. P. C. Rodgers,
-U.S. National Library of Medicine (rodgers@nlm.nih.gov).
-.\" end of man page

crates/libz-sys/src/zlib/zlib.3.pdf

diff --git a/crates/libz-sys/src/zlib/zlib.3.pdf b/crates/libz-sys/src/zlib/zlib.3.pdf
deleted file mode 100644
index 6fa519c..0000000
--- a/crates/libz-sys/src/zlib/zlib.3.pdf
+++ /dev/null
Binary files differ

crates/libz-sys/src/zlib/zlib.h

diff --git a/crates/libz-sys/src/zlib/zlib.h b/crates/libz-sys/src/zlib/zlib.h
deleted file mode 100644
index f09cdaf..0000000
--- a/crates/libz-sys/src/zlib/zlib.h
+++ /dev/null
@@ -1,1912 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.11, January 15th, 2017
-
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x12b0
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip and raw deflate streams in
-  memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in the case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte will go here */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text
-                           for deflate, or the decoding state for inflate */
-    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
-   Z_NULL on entry to the initialization function, they are set to internal
-   routines that use the standard library functions malloc() and free().
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field for deflate() */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary.  Some output may be provided even if
-    flush is zero.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
-  in that case.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed
-  codes block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  function must be called again with Z_FINISH and more output space (updated
-  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  on the stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  compression is to be done in a single step.  In order to complete in one
-  call, avail_out must be at least the value returned by deflateBound (see
-  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  output space is provided, deflate will not return Z_STREAM_END, and it must
-  be called again as described above.
-
-    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).  If a gzip stream is being generated, then
-  strm->adler will be the CRC-32 checksum of the input read so far.  (See
-  deflateInit2 below.)
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  considered binary.  This field is only for information purposes and does not
-  affect the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL or the state was inadvertently written over
-  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  deflate() can be called again with more input and more output space to
-  continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provided input is not
-   read or consumed.  The allocation of a sliding window will be deferred to
-   the first call of inflate (if the decompression does not complete on the
-   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   them to use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression.
-   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   next_out, and avail_out are unused and unchanged.  The current
-   implementation of inflateInit() does not process any header information --
-   that is deferred until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_in are updated
-    accordingly, and processing will resume at this point for the next call of
-    inflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  If the
-  caller of inflate() does not provide both available input and available
-  output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
-  uncompressed length, modulo 2^32.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value, in which case strm->msg points to a string with a more specific
-  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL, or the state was inadvertently written over
-  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
-  if no progress was possible or if there was not enough room in the output
-  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is to be attempted.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     For the current implementation of deflate(), a windowBits value of 8 (a
-   window size of 256 bytes) is not supported.  As a result, a request for 8
-   will result in 9 (a 512-byte window).  In that case, providing 8 to
-   inflateInit2() will result in an error when the zlib header with 9 is
-   checked against the initialization of inflate().  The remedy is to not use 8
-   with deflateInit2() with this initialization, or at least in that case use 9
-   with inflateInit2().
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute a check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to the appropriate value,
-   if the operating system was determined at compile time.  If a gzip stream is
-   being written, strm->adler is a CRC-32 instead of an Adler-32.
-
-     For raw deflate or gzip encoding, a request for a 256-byte window is
-   rejected as invalid, since only the zlib header provides a means of
-   transmitting the window size to the decompressor.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   Adler-32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by deflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If deflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     deflateGetDictionary() may return a length less than the window size, even
-   when more than the window size in input has been provided. It may return up
-   to 258 bytes less in that case, due to how zlib's implementation of deflate
-   manages the sliding window and lookahead for matches, where matches can be
-   up to 258 bytes long. If the application needs the last window-size bytes of
-   input, then that would need to be saved by the application outside of zlib.
-
-     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit, but
-   does not free and reallocate the internal compression state.  The stream
-   will leave the compression level and any other attributes that may have been
-   set unchanged.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
-
-     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   not have enough output space to complete, then the parameter change will not
-   take effect.  In this case, deflateParams() can be called again with the
-   same parameters and more output space to try again.
-
-     In order to assure a change in the parameters on the first try, the
-   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   request until strm.avail_out is not zero, before calling deflateParams().
-   Then no more input data should be provided before the deflateParams() call.
-   If this is done, the old level and strategy will be applied to the data
-   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
-
-     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
-   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
-   there was not enough output space to complete the compression of the
-   available input data before a change in the strategy or approach.  Note that
-   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
-   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
-   retried with more output space.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will not automatically decode concatenated gzip streams.
-   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
-   would need to be reset to continue decoding a subsequent gzip stream.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.  If the window size is changed, then the
-   memory allocated for the window is freed, and the window will be reallocated
-   by inflate() if needed.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects a zlib header and trailer around the
-   deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero -- buf is ignored in that
-   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   out() should return zero on success, or non-zero on failure.  If out()
-   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.  compress() is equivalent to compress2() with a level
-   parameter of Z_DEFAULT_COMPRESSION.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed data.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
-/*
-     Same as uncompress, except that sourceLen is a pointer, where the
-   length of the source is *sourceLen.  On return, *sourceLen is the number of
-   source bytes consumed.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Three times that size in buffer space is allocated.  A larger buffer
-   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.  Previously provided
-   data is flushed before the parameter change.
-
-     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing, Z_ERRNO if there is an error writing the flushed data,
-   or Z_MEM_ERROR if there is a memory allocation error.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.  If len is too large to fit in an int,
-   then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
-/*
-     Read up to nitems items of size size from file to buf, otherwise operating
-   as gzread() does.  This duplicates the interface of stdio's fread(), with
-   size_t request and return types.  If the library defines size_t, then
-   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
-   integer type that can contain a pointer.
-
-     gzfread() returns the number of full items read of size size, or zero if
-   the end of the file was reached and a full item could not be read, or if
-   there was an error.  gzerror() must be consulted if zero is returned in
-   order to determine if there was an error.  If the multiplication of size and
-   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
-   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
-
-     In the event that the end of file is reached and only a partial item is
-   available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
-   and the end-of-file flag is set.  The length of the partial item read is not
-   provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
-/*
-     gzfwrite() writes nitems items of size size from buf to file, duplicating
-   the interface of stdio's fwrite(), with size_t request and return types.  If
-   the library defines size_t, then z_size_t is identical to size_t.  If not,
-   then z_size_t is an unsigned integer type that can contain a pointer.
-
-     gzfwrite() returns the number of full items written of size size, or zero
-   if there was an error.  If the multiplication of size and nitems overflows,
-   i.e. the product does not fit in a z_size_t, then nothing is written, zero
-   is returned, and the error state is set to Z_STREAM_ERROR.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or a negative zlib error code in case
-   of error.  The number of uncompressed bytes written is limited to 8191, or
-   one less than the buffer size given to gzbuffer().  The caller should assure
-   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatenated gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
-/*
-     Same as adler32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
-                                  z_size_t len));
-/*
-     Same as crc32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#ifdef Z_PREFIX_SET
-#  define z_deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define z_inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#else
-#  define deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#endif
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */

crates/libz-sys/src/zlib/zlib.map

diff --git a/crates/libz-sys/src/zlib/zlib.map b/crates/libz-sys/src/zlib/zlib.map
deleted file mode 100644
index 40fa9db..0000000
--- a/crates/libz-sys/src/zlib/zlib.map
+++ /dev/null
@@ -1,94 +0,0 @@
-ZLIB_1.2.0 {

-  global:

-    compressBound;

-    deflateBound;

-    inflateBack;

-    inflateBackEnd;

-    inflateBackInit_;

-    inflateCopy;

-  local:

-    deflate_copyright;

-    inflate_copyright;

-    inflate_fast;

-    inflate_table;

-    zcalloc;

-    zcfree;

-    z_errmsg;

-    gz_error;

-    gz_intmax;

-    _*;

-};

-

-ZLIB_1.2.0.2 {

-    gzclearerr;

-    gzungetc;

-    zlibCompileFlags;

-} ZLIB_1.2.0;

-

-ZLIB_1.2.0.8 {

-    deflatePrime;

-} ZLIB_1.2.0.2;

-

-ZLIB_1.2.2 {

-    adler32_combine;

-    crc32_combine;

-    deflateSetHeader;

-    inflateGetHeader;

-} ZLIB_1.2.0.8;

-

-ZLIB_1.2.2.3 {

-    deflateTune;

-    gzdirect;

-} ZLIB_1.2.2;

-

-ZLIB_1.2.2.4 {

-    inflatePrime;

-} ZLIB_1.2.2.3;

-

-ZLIB_1.2.3.3 {

-    adler32_combine64;

-    crc32_combine64;

-    gzopen64;

-    gzseek64;

-    gztell64;

-    inflateUndermine;

-} ZLIB_1.2.2.4;

-

-ZLIB_1.2.3.4 {

-    inflateReset2;

-    inflateMark;

-} ZLIB_1.2.3.3;

-

-ZLIB_1.2.3.5 {

-    gzbuffer;

-    gzoffset;

-    gzoffset64;

-    gzclose_r;

-    gzclose_w;

-} ZLIB_1.2.3.4;

-

-ZLIB_1.2.5.1 {

-    deflatePending;

-} ZLIB_1.2.3.5;

-

-ZLIB_1.2.5.2 {

-    deflateResetKeep;

-    gzgetc_;

-    inflateResetKeep;

-} ZLIB_1.2.5.1;

-

-ZLIB_1.2.7.1 {

-    inflateGetDictionary;

-    gzvprintf;

-} ZLIB_1.2.5.2;

-

-ZLIB_1.2.9 {

-    inflateCodesUsed;

-    inflateValidate;

-    uncompress2;

-    gzfread;

-    gzfwrite;

-    deflateGetDictionary;

-    adler32_z;

-    crc32_z;

-} ZLIB_1.2.7.1;

crates/libz-sys/src/zlib/zlib.pc.cmakein

diff --git a/crates/libz-sys/src/zlib/zlib.pc.cmakein b/crates/libz-sys/src/zlib/zlib.pc.cmakein
deleted file mode 100644
index a5e6429..0000000
--- a/crates/libz-sys/src/zlib/zlib.pc.cmakein
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@INSTALL_LIB_DIR@
-sharedlibdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
-
-Name: zlib
-Description: zlib compression library
-Version: @VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}

crates/libz-sys/src/zlib/zlib.pc.in

diff --git a/crates/libz-sys/src/zlib/zlib.pc.in b/crates/libz-sys/src/zlib/zlib.pc.in
deleted file mode 100644
index 7e5acf9..0000000
--- a/crates/libz-sys/src/zlib/zlib.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-sharedlibdir=@sharedlibdir@
-includedir=@includedir@
-
-Name: zlib
-Description: zlib compression library
-Version: @VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}

crates/libz-sys/src/zlib/zlib2ansi

diff --git a/crates/libz-sys/src/zlib/zlib2ansi b/crates/libz-sys/src/zlib/zlib2ansi
deleted file mode 100755
index 15e3e16..0000000
--- a/crates/libz-sys/src/zlib/zlib2ansi
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/perl
-
-# Transform K&R C function definitions into ANSI equivalent.
-#
-# Author: Paul Marquess
-# Version: 1.0
-# Date: 3 October 2006
-
-# TODO
-#
-# Asumes no function pointer parameters. unless they are typedefed.
-# Assumes no literal strings that look like function definitions
-# Assumes functions start at the beginning of a line
-
-use strict;
-use warnings;
-
-local $/;
-$_ = <>;
-
-my $sp = qr{ \s* (?: /\* .*? \*/ )? \s* }x; # assume no nested comments
-
-my $d1    = qr{ $sp (?: [\w\*\s]+ $sp)* $sp \w+ $sp [\[\]\s]* $sp }x ;
-my $decl  = qr{ $sp (?: \w+ $sp )+ $d1 }xo ;
-my $dList = qr{ $sp $decl (?: $sp , $d1 )* $sp ; $sp }xo ;
-
-
-while (s/^
-            (                  # Start $1
-                (              #   Start $2
-                    .*?        #     Minimal eat content
-                    ( ^ \w [\w\s\*]+ )    #     $3 -- function name
-                    \s*        #     optional whitespace
-                )              # $2 - Matched up to before parameter list
-
-                \( \s*         # Literal "(" + optional whitespace
-                ( [^\)]+ )     # $4 - one or more anythings except ")"
-                \s* \)         # optional whitespace surrounding a Literal ")"
-
-                ( (?: $dList )+ ) # $5
-
-                $sp ^ {        # literal "{" at start of line
-            )                  # Remember to $1
-        //xsom
-      )
-{
-    my $all = $1 ;
-    my $prefix = $2;
-    my $param_list = $4 ;
-    my $params = $5;
-
-    StripComments($params);
-    StripComments($param_list);
-    $param_list =~ s/^\s+//;
-    $param_list =~ s/\s+$//;
-
-    my $i = 0 ;
-    my %pList = map { $_ => $i++ }
-                split /\s*,\s*/, $param_list;
-    my $pMatch = '(\b' . join('|', keys %pList) . '\b)\W*$' ;
-
-    my @params = split /\s*;\s*/, $params;
-    my @outParams = ();
-    foreach my $p (@params)
-    {
-        if ($p =~ /,/)
-        {
-            my @bits = split /\s*,\s*/, $p;
-            my $first = shift @bits;
-            $first =~ s/^\s*//;
-            push @outParams, $first;
-            $first =~ /^(\w+\s*)/;
-            my $type = $1 ;
-            push @outParams, map { $type . $_ } @bits;
-        }
-        else
-        {
-            $p =~ s/^\s+//;
-            push @outParams, $p;
-        }
-    }
-
-
-    my %tmp = map { /$pMatch/;  $_ => $pList{$1}  }
-              @outParams ;
-
-    @outParams = map  { "    $_" }
-                 sort { $tmp{$a} <=> $tmp{$b} }
-                 @outParams ;
-
-    print $prefix ;
-    print "(\n" . join(",\n", @outParams) . ")\n";
-    print "{" ;
-
-}
-
-# Output any trailing code.
-print ;
-exit 0;
-
-
-sub StripComments
-{
-
-  no warnings;
-
-  # Strip C & C++ coments
-  # From the perlfaq
-  $_[0] =~
-
-    s{
-       /\*         ##  Start of /* ... */ comment
-       [^*]*\*+    ##  Non-* followed by 1-or-more *'s
-       (
-         [^/*][^*]*\*+
-       )*          ##  0-or-more things which don't start with /
-                   ##    but do end with '*'
-       /           ##  End of /* ... */ comment
-
-     |         ##     OR  C++ Comment
-       //          ## Start of C++ comment //
-       [^\n]*      ## followed by 0-or-more non end of line characters
-
-     |         ##     OR  various things which aren't comments:
-
-       (
-         "           ##  Start of " ... " string
-         (
-           \\.           ##  Escaped char
-         |               ##    OR
-           [^"\\]        ##  Non "\
-         )*
-         "           ##  End of " ... " string
-
-       |         ##     OR
-
-         '           ##  Start of ' ... ' string
-         (
-           \\.           ##  Escaped char
-         |               ##    OR
-           [^'\\]        ##  Non '\
-         )*
-         '           ##  End of ' ... ' string
-
-       |         ##     OR
-
-         .           ##  Anything other char
-         [^/"'\\]*   ##  Chars which doesn't start a comment, string or escape
-       )
-     }{$2}gxs;
-
-}

crates/libz-sys/src/zlib/zutil.c

diff --git a/crates/libz-sys/src/zlib/zutil.c b/crates/libz-sys/src/zlib/zutil.c
deleted file mode 100644
index a76c6b0..0000000
--- a/crates/libz-sys/src/zlib/zutil.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-#ifndef Z_SOLO
-#  include "gzguts.h"
-#endif
-
-z_const char * const z_errmsg[10] = {
-    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
-    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
-    (z_const char *)"",                    /* Z_OK              0  */
-    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
-    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
-    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
-    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
-    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
-    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
-    (z_const char *)""
-};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch ((int)(sizeof(uInt))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch ((int)(sizeof(uLong))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch ((int)(sizeof(voidpf))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef ZLIB_DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#else
-    flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef ZLIB_DEBUG
-#include <stdlib.h>
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int ZLIB_INTERNAL z_verbose = verbose;
-
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifndef Z_SOLO
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf;
-    ulg bsize = (ulg)items*size;
-
-    (void)opaque;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-
-    (void)opaque;
-
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
-    (void)opaque;
-    return _halloc((long)items, size);
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    (void)opaque;
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    (void)opaque;
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    (void)opaque;
-    free(ptr);
-}
-
-#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */

crates/libz-sys/src/zlib/zutil.h

diff --git a/crates/libz-sys/src/zlib/zutil.h b/crates/libz-sys/src/zlib/zutil.h
deleted file mode 100644
index b079ea6..0000000
--- a/crates/libz-sys/src/zlib/zutil.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* since "static" is used to mean two completely different things in C, we
-   define "local" for the non-static meaning of "static", for readability
-   (compile with -Dlocal if your debugger can't find static symbols) */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  ifndef Z_SOLO
-#    if defined(__TURBOC__) || defined(__BORLANDC__)
-#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-         /* Allow compilation with ANSI keywords only enabled */
-         void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
-#      else
-#        include <alloc.h>
-#      endif
-#    else /* MSC or DJGPP */
-#      include <malloc.h>
-#    endif
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  1
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  2
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#ifdef __370__
-#  if __TARGET_LIB__ < 0x20000000
-#    define OS_CODE 4
-#  elif __TARGET_LIB__ < 0x40000000
-#    define OS_CODE 11
-#  else
-#    define OS_CODE 8
-#  endif
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  5
-#endif
-
-#ifdef OS2
-#  define OS_CODE  6
-#  if defined(M_I86) && !defined(Z_SOLO)
-#    include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  7
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __acorn
-#  define OS_CODE 13
-#endif
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-#  define OS_CODE  10
-#endif
-
-#ifdef _BEOS_
-#  define OS_CODE  16
-#endif
-
-#ifdef __TOS_OS400__
-#  define OS_CODE 18
-#endif
-
-#ifdef __APPLE__
-#  define OS_CODE 19
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && \
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  3     /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef ZLIB_DEBUG
-#  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-#ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-#endif
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-#endif /* ZUTIL_H */

crates/linkme-impl/.android-checksum.json

diff --git a/crates/linkme-impl/.android-checksum.json b/crates/linkme-impl/.android-checksum.json
index bc78619..d5f8799 100644
--- a/crates/linkme-impl/.android-checksum.json
+++ b/crates/linkme-impl/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"fb30a2f02145a37703657e6647d875b303ec9c8cdae68bdb59ac9d7f3aec1fbc","Android.bp":"1e59cf36557e1bc36e4d239a3bc3dd47be9bd3cc6b4a7d9a1a51bef3fed8b4c4","Cargo.toml":"e510fa36ebc3163f351b6a56a50bcf3bc1bc6661b0c6af73a63a10e38178d15b","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","METADATA":"6de1444179c7ca7703f44c28e5e656de1b7ab4c67ac7872673eb5b6178ecb4a3","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","patches/LICENSE.patch":"09cc706c0a547f25f23300db8ce6766c6c6ba9ab8038791dbec6fc710d76fa47","src/args.rs":"14bc47b5aa39d6dbfe5a1ae918f97de484120a9b0f41b21a95a0b6367dae1b9b","src/attr.rs":"32c11c13f51ef80810b5c742d2a3a3fd4f2e6d55ec47b79f99d87c0c02fe0d2c","src/declaration.rs":"1aa17725d63ecb2775b05d80a5b635df0b0919f959fa4dec242a7ca0bbdea4cb","src/element.rs":"3903faf1f3c6ce32508a7f58617facb6741d8d67635242d083666f24b83a50dd","src/hash.rs":"b5925e872cf52fd508c28d86f98c5ccff420536a94335b7bfd7fe19a4378ffe4","src/lib.rs":"870010296a06f37b6400daf3bb65d3e8038d29f37d1888b3b6a6ebcb54ab7fe4","src/linker.rs":"808eff7cad3a7442581625836c996dfb994aef250b452f1c66581946ba0729c4"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"747ba7b13a35cd9827a86a5a7932ad2e27397081c82378400592b4eaf5d7bf0a","Android.bp":"bbe3e16f376ab3b6c4812e305ae737f327a06cb7750515aa955cd50b97e44f22","Cargo.toml":"306e83437877ad04598faca66929bf605907f2b98812bcce5207667aebc90936","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","METADATA":"6d4f92154d216770256b80197d9831732382d0ade393c8f94ac0f925ad784bf4","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","build.rs":"f25cd4e235ca45167f433cf6f617b6f2b8e99217621f65b0d7f1dcf60914c36e","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","patches/LICENSE.patch":"09cc706c0a547f25f23300db8ce6766c6c6ba9ab8038791dbec6fc710d76fa47","src/args.rs":"14bc47b5aa39d6dbfe5a1ae918f97de484120a9b0f41b21a95a0b6367dae1b9b","src/attr.rs":"32c11c13f51ef80810b5c742d2a3a3fd4f2e6d55ec47b79f99d87c0c02fe0d2c","src/declaration.rs":"64113dc9324b222fc23d6f5c2333b2a656038bbaad5f584cb108356d853bbf29","src/element.rs":"e1073e447c89712d9db61a920a2dd34c74fea222351a7303cc210558fa75faff","src/hash.rs":"b5925e872cf52fd508c28d86f98c5ccff420536a94335b7bfd7fe19a4378ffe4","src/lib.rs":"35c50803a2b28ca1e2322f4e2a8e266d6eafd7e175e102e4cc8f558f085484c5","src/linker.rs":"e0ebf146b8cdbe781ba31f782e9775542e1ba6d5bce5764cb402cca96fbdbfc0","src/ty.rs":"78ca0c477687fb943c7bc2871131e1e7d245cc372038080b91196d03ec3ceacf"}}
\ No newline at end of file

crates/linkme-impl/.cargo-checksum.json

diff --git a/crates/linkme-impl/.cargo-checksum.json b/crates/linkme-impl/.cargo-checksum.json
index 37b0e54..858d97b 100644
--- a/crates/linkme-impl/.cargo-checksum.json
+++ b/crates/linkme-impl/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b16e64ad2d4bed491cca3a7bfdf4f2103135614678ddef178bfcd217571286d7","src/args.rs":"6844fd8ac6acd440fe2bad0dfc1688dd4c370125e248437f6a12a39c5b76380f","src/attr.rs":"8d86db80a3b97689cfee4227e3133516be87537fea706c4b72699216359c24a9","src/declaration.rs":"635f753351ea4415342bb14d94f5f05aa63867fe4e2538e57498ef2889aa3f74","src/element.rs":"ab34aeb5e2c88db91bf8f76d3c247fd0821326029bf074790a5d41bc0b5cfa27","src/hash.rs":"20a352e24890e36593c7d093fe75fe2aa850d72455c5ec90d6d14d519bf478d6","src/lib.rs":"32bdc6bf1680f2c42878a046e4164ffa068483260e8f4808db213e8983d96e76","src/linker.rs":"304a9ead78526ffc8f304d122ef715a2c484e6cdc7179e27838123b274cf5ec9"},"package":"279a77bf40c85a08513aca203635b96610ebf0e37a92cb0cee76e04da100a426"}
\ No newline at end of file
+{"files":{"Cargo.toml":"a14408e9c5255546249c5300f269794810ea2ed624ed5123bc341b97ef2280a7","build.rs":"ebfc0cf7ad1ddd283dd75d13d171c0fed99ddbda3c758d1306a424802e8d389b","src/args.rs":"6844fd8ac6acd440fe2bad0dfc1688dd4c370125e248437f6a12a39c5b76380f","src/attr.rs":"8d86db80a3b97689cfee4227e3133516be87537fea706c4b72699216359c24a9","src/declaration.rs":"4b476d169263641e36ad92332b29316779f730752b4d18fab38f6604d3bef45f","src/element.rs":"443bd5e8e606b3cca49fee4b2bc170d0836ce85f7d004cb92c25c262ad85207a","src/hash.rs":"20a352e24890e36593c7d093fe75fe2aa850d72455c5ec90d6d14d519bf478d6","src/lib.rs":"e137bd2ae9902998d5b454859795640fa6682786cdb50d79016aa99e4d85651c","src/linker.rs":"ed736994fb23af859341486c924677bc02d0b8cbee041b9f65f331549c35ef86","src/ty.rs":"f40aaf3a35496395382fa356dc45238dbee6e44f2236f64c0e03b3d31e7756a2"},"package":"edbe595006d355eaf9ae11db92707d4338cd2384d16866131cc1afdbdd35d8d9"}
\ No newline at end of file

crates/linkme-impl/Android.bp

diff --git a/crates/linkme-impl/Android.bp b/crates/linkme-impl/Android.bp
index 5062cb2..655d36f 100644
--- a/crates/linkme-impl/Android.bp
+++ b/crates/linkme-impl/Android.bp
@@ -17,7 +17,7 @@
     name: "liblinkme_impl",
     crate_name: "linkme_impl",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.10",
+    cargo_pkg_version: "0.3.31",
     crate_root: "src/lib.rs",
     edition: "2021",
     rustlibs: [

crates/linkme-impl/Cargo.toml

diff --git a/crates/linkme-impl/Cargo.toml b/crates/linkme-impl/Cargo.toml
index 72b23e6..0692d84 100644
--- a/crates/linkme-impl/Cargo.toml
+++ b/crates/linkme-impl/Cargo.toml
@@ -13,27 +13,37 @@
 edition = "2021"
 rust-version = "1.62"
 name = "linkme-impl"
-version = "0.3.10"
+version = "0.3.31"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
+build = "build.rs"
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Implementation detail of the linkme crate"
 documentation = "https://docs.rs/linkme"
+readme = false
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/linkme"
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--generate-link-to-definition"]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [lib]
+name = "linkme_impl"
+path = "src/lib.rs"
 proc-macro = true
 
 [dependencies.proc-macro2]
-version = "1.0.2"
+version = "1.0.74"
 
 [dependencies.quote]
-version = "1.0"
+version = "1.0.35"
 
 [dependencies.syn]
-version = "2.0"
+version = "2.0.46"
 
 [features]
 used_linker = []

crates/linkme-impl/METADATA

diff --git a/crates/linkme-impl/METADATA b/crates/linkme-impl/METADATA
index 2b0d17f..b04668d 100644
--- a/crates/linkme-impl/METADATA
+++ b/crates/linkme-impl/METADATA
@@ -1,17 +1,17 @@
 name: "linkme-impl"
 description: "Implementation detail of the linkme crate"
 third_party {
-  version: "0.3.10"
+  version: "0.3.31"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 6
-    day: 1
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/linkme-impl"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/linkme-impl/linkme-impl-0.3.10.crate"
-    version: "0.3.10"
+    value: "https://static.crates.io/crates/linkme-impl/linkme-impl-0.3.31.crate"
+    version: "0.3.31"
   }
 }

crates/linkme-impl/build.rs

diff --git a/crates/linkme-impl/build.rs b/crates/linkme-impl/build.rs
new file mode 100644
index 0000000..e6f6d2a
--- /dev/null
+++ b/crates/linkme-impl/build.rs
@@ -0,0 +1,36 @@
+use std::env;
+use std::process::Command;
+use std::str;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+
+    let rustc = match rustc_minor_version() {
+        Some(rustc) => rustc,
+        None => return,
+    };
+
+    if rustc >= 80 {
+        println!("cargo:rustc-check-cfg=cfg(exhaustive)");
+        println!("cargo:rustc-check-cfg=cfg(no_unsafe_attributes)");
+        println!("cargo:rustc-check-cfg=cfg(no_unsafe_extern_blocks)");
+    }
+
+    if rustc < 82 {
+        // https://blog.rust-lang.org/2024/10/17/Rust-1.82.0.html#unsafe-attributes
+        println!("cargo:rustc-cfg=no_unsafe_attributes");
+        // https://blog.rust-lang.org/2024/10/17/Rust-1.82.0.html#safe-items-with-unsafe-extern
+        println!("cargo:rustc-cfg=no_unsafe_extern_blocks");
+    }
+}
+
+fn rustc_minor_version() -> Option<u32> {
+    let rustc = env::var_os("RUSTC").unwrap();
+    let output = Command::new(rustc).arg("--version").output().ok()?;
+    let version = str::from_utf8(&output.stdout).ok()?;
+    let mut pieces = version.split('.');
+    if pieces.next() != Some("rustc 1") {
+        return None;
+    }
+    pieces.next()?.parse().ok()
+}

crates/linkme-impl/src/declaration.rs

diff --git a/crates/linkme-impl/src/declaration.rs b/crates/linkme-impl/src/declaration.rs
index 4d1d9e3..1c12c3b 100644
--- a/crates/linkme-impl/src/declaration.rs
+++ b/crates/linkme-impl/src/declaration.rs
@@ -1,11 +1,8 @@
-use crate::{attr, linker};
+use crate::{attr, linker, ty};
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::parse::{Parse, ParseStream, Result};
-use syn::{
-    bracketed, Attribute, Error, GenericArgument, Ident, Lifetime, PathArguments, Token, Type,
-    Visibility,
-};
+use syn::{bracketed, Attribute, Error, Ident, Token, Type, Visibility};
 
 struct Declaration {
     attrs: Vec<Attribute>,
@@ -29,11 +26,13 @@
         let ident: Ident = input.parse()?;
         input.parse::<Token![:]>()?;
         let ty: Type = input.parse()?;
-        input.parse::<Token![=]>()?;
 
-        let content;
-        bracketed!(content in input);
-        content.parse::<Token![..]>()?;
+        let eq_token: Option<Token![=]> = input.parse()?;
+        if eq_token.is_some() {
+            let content;
+            bracketed!(content in input);
+            content.parse::<Token![..]>()?;
+        }
 
         input.parse::<Token![;]>()?;
 
@@ -67,7 +66,7 @@
         Err(err) => return err.to_compile_error(),
     };
 
-    populate_static_lifetimes(&mut ty);
+    ty::populate_static_lifetimes(&mut ty);
 
     let used = if cfg!(feature = "used_linker") {
         quote!(#[used(linker)])
@@ -103,17 +102,34 @@
     let illumos_dupcheck_start = illumos_section_start.replacen("linkme", "linkm2", 1);
     let illumos_dupcheck_stop = illumos_section_stop.replacen("linkme", "linkm2", 1);
 
-    let freebsd_section = linker::freebsd::section(&ident);
-    let freebsd_section_start = linker::freebsd::section_start(&ident);
-    let freebsd_section_stop = linker::freebsd::section_stop(&ident);
-    let freebsd_dupcheck = freebsd_section.replacen("linkme", "linkm2", 1);
-    let freebsd_dupcheck_start = freebsd_section_start.replacen("linkme", "linkm2", 1);
-    let freebsd_dupcheck_stop = freebsd_section_stop.replacen("linkme", "linkm2", 1);
+    let bsd_section = linker::bsd::section(&ident);
+    let bsd_section_start = linker::bsd::section_start(&ident);
+    let bsd_section_stop = linker::bsd::section_stop(&ident);
+    let bsd_dupcheck = bsd_section.replacen("linkme", "linkm2", 1);
+    let bsd_dupcheck_start = bsd_section_start.replacen("linkme", "linkm2", 1);
+    let bsd_dupcheck_stop = bsd_section_stop.replacen("linkme", "linkm2", 1);
 
     let call_site = Span::call_site();
     let link_section_macro_str = format!("_linkme_macro_{}", ident);
     let link_section_macro = Ident::new(&link_section_macro_str, call_site);
 
+    let unsafe_extern = if cfg!(no_unsafe_extern_blocks) {
+        None
+    } else {
+        Some(Token![unsafe](call_site))
+    };
+
+    let (unsafe_attr, link_section_attr) = if cfg!(no_unsafe_attributes) {
+        // #[cfg_attr(all(), link_section = ...)]
+        (
+            Ident::new("cfg_attr", call_site),
+            quote!(all(), link_section),
+        )
+    } else {
+        // #[unsafe(link_section = ...)]
+        (Ident::new("unsafe", call_site), quote!(link_section))
+    };
+
     quote! {
         #(#attrs)*
         #vis static #ident: #linkme_path::DistributedSlice<#ty> = {
@@ -124,64 +140,76 @@
                 target_os = "ios",
                 target_os = "tvos",
                 target_os = "android",
+                target_os = "fuchsia",
                 target_os = "illumos",
                 target_os = "freebsd",
+                target_os = "openbsd",
+                target_os = "psp",
             ))]
-            extern "Rust" {
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_section_start)]
+            #unsafe_extern extern "Rust" {
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_section_start)]
                 #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_start)]
                 #[cfg_attr(target_os = "illumos", link_name = #illumos_section_start)]
-                #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_start)]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), link_name = #bsd_section_start)]
                 static LINKME_START: <#ty as #linkme_path::__private::Slice>::Element;
 
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_section_stop)]
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_section_stop)]
                 #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_stop)]
                 #[cfg_attr(target_os = "illumos", link_name = #illumos_section_stop)]
-                #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_stop)]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), link_name = #bsd_section_stop)]
                 static LINKME_STOP: <#ty as #linkme_path::__private::Slice>::Element;
 
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_dupcheck_start)]
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_dupcheck_start)]
                 #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_start)]
                 #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_start)]
-                #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_start)]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), link_name = #bsd_dupcheck_start)]
                 static DUPCHECK_START: #linkme_path::__private::usize;
 
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_dupcheck_stop)]
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_dupcheck_stop)]
                 #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_stop)]
                 #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_stop)]
-                #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_stop)]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), link_name = #bsd_dupcheck_stop)]
                 static DUPCHECK_STOP: #linkme_path::__private::usize;
             }
 
-            #[cfg(target_os = "windows")]
-            #[link_section = #windows_section_start]
+            #[cfg(any(target_os = "uefi", target_os = "windows"))]
+            #[#unsafe_attr(#link_section_attr = #windows_section_start)]
             static LINKME_START: [<#ty as #linkme_path::__private::Slice>::Element; 0] = [];
 
-            #[cfg(target_os = "windows")]
-            #[link_section = #windows_section_stop]
+            #[cfg(any(target_os = "uefi", target_os = "windows"))]
+            #[#unsafe_attr(#link_section_attr = #windows_section_stop)]
             static LINKME_STOP: [<#ty as #linkme_path::__private::Slice>::Element; 0] = [];
 
-            #[cfg(target_os = "windows")]
-            #[link_section = #windows_dupcheck_start]
+            #[cfg(any(target_os = "uefi", target_os = "windows"))]
+            #[#unsafe_attr(#link_section_attr = #windows_dupcheck_start)]
             static DUPCHECK_START: () = ();
 
-            #[cfg(target_os = "windows")]
-            #[link_section = #windows_dupcheck_stop]
+            #[cfg(any(target_os = "uefi", target_os = "windows"))]
+            #[#unsafe_attr(#link_section_attr = #windows_dupcheck_stop)]
             static DUPCHECK_STOP: () = ();
 
             #used
-            #[cfg(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "illumos", target_os = "freebsd"))]
-            #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_section)]
-            #[cfg_attr(target_os = "illumos", link_section = #illumos_section)]
-            #[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)]
+            #[cfg(any(
+                target_os = "none",
+                target_os = "linux",
+                target_os = "android",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "freebsd",
+                target_os = "openbsd",
+                target_os = "psp",
+            ))]
+            #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), #unsafe_attr(#link_section_attr = #linux_section))]
+            #[cfg_attr(target_os = "illumos", #unsafe_attr(#link_section_attr = #illumos_section))]
+            #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), #unsafe_attr(#link_section_attr = #bsd_section))]
             static mut LINKME_PLEASE: [<#ty as #linkme_path::__private::Slice>::Element; 0] = [];
 
             #used
-            #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_dupcheck)]
-            #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_dupcheck)]
-            #[cfg_attr(target_os = "windows", link_section = #windows_dupcheck)]
-            #[cfg_attr(target_os = "illumos", link_section = #illumos_dupcheck)]
-            #[cfg_attr(target_os = "freebsd", link_section = #freebsd_dupcheck)]
+            #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), #unsafe_attr(#link_section_attr = #linux_dupcheck))]
+            #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), #unsafe_attr(#link_section_attr = #macho_dupcheck))]
+            #[cfg_attr(any(target_os = "uefi", target_os = "windows"), #unsafe_attr(#link_section_attr = #windows_dupcheck))]
+            #[cfg_attr(target_os = "illumos", #unsafe_attr(#link_section_attr = #illumos_dupcheck))]
+            #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), #unsafe_attr(#link_section_attr = #bsd_dupcheck))]
             static DUPCHECK: #linkme_path::__private::usize = 1;
 
             #[cfg(not(any(
@@ -191,9 +219,13 @@
                 target_os = "ios",
                 target_os = "tvos",
                 target_os = "windows",
+                target_os = "uefi",
                 target_os = "android",
+                target_os = "fuchsia",
                 target_os = "illumos",
                 target_os = "freebsd",
+                target_os = "openbsd",
+                target_os = "psp",
             )))]
             #unsupported_platform
 
@@ -204,10 +236,10 @@
             unsafe {
                 #linkme_path::DistributedSlice::private_new(
                     #name,
-                    &LINKME_START,
-                    &LINKME_STOP,
-                    &DUPCHECK_START,
-                    &DUPCHECK_STOP,
+                    #linkme_path::__private::ptr::addr_of!(LINKME_START),
+                    #linkme_path::__private::ptr::addr_of!(LINKME_STOP),
+                    #linkme_path::__private::ptr::addr_of!(DUPCHECK_START),
+                    #linkme_path::__private::ptr::addr_of!(DUPCHECK_STOP),
                 )
             }
         };
@@ -225,7 +257,7 @@
                     #![linkme_macho_section = concat!(#macho_section, $key)]
                     #![linkme_windows_section = concat!(#windows_section, $key)]
                     #![linkme_illumos_section = concat!(#illumos_section, $key)]
-                    #![linkme_freebsd_section = concat!(#freebsd_section, $key)]
+                    #![linkme_bsd_section = concat!(#bsd_section, $key)]
                     $item
                 }
             };
@@ -234,24 +266,24 @@
                 #![linkme_macho_section = $macho_section:expr]
                 #![linkme_windows_section = $windows_section:expr]
                 #![linkme_illumos_section = $illumos_section:expr]
-                #![linkme_freebsd_section = $freebsd_section:expr]
+                #![linkme_bsd_section = $bsd_section:expr]
                 $item:item
             ) => {
                 #used
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = $linux_section)]
-                #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = $macho_section)]
-                #[cfg_attr(target_os = "windows", link_section = $windows_section)]
-                #[cfg_attr(target_os = "illumos", link_section = $illumos_section)]
-                #[cfg_attr(target_os = "freebsd", link_section = $freebsd_section)]
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), #unsafe_attr(#link_section_attr = $linux_section))]
+                #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), #unsafe_attr(#link_section_attr = $macho_section))]
+                #[cfg_attr(any(target_os = "uefi", target_os = "windows"), #unsafe_attr(#link_section_attr = $windows_section))]
+                #[cfg_attr(target_os = "illumos", #unsafe_attr(#link_section_attr = $illumos_section))]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), #unsafe_attr(#link_section_attr = $bsd_section))]
                 $item
             };
             ($item:item) => {
                 #used
-                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_section)]
-                #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_section)]
-                #[cfg_attr(target_os = "windows", link_section = #windows_section)]
-                #[cfg_attr(target_os = "illumos", link_section = #illumos_section)]
-                #[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)]
+                #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), #unsafe_attr(#link_section_attr = #linux_section))]
+                #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), #unsafe_attr(#link_section_attr = #macho_section))]
+                #[cfg_attr(any(target_os = "uefi", target_os = "windows"), #unsafe_attr(#link_section_attr = #windows_section))]
+                #[cfg_attr(target_os = "illumos", #unsafe_attr(#link_section_attr = #illumos_section))]
+                #[cfg_attr(any(target_os = "freebsd", target_os = "openbsd"), #unsafe_attr(#link_section_attr = #bsd_section))]
                 $item
             };
         }
@@ -260,43 +292,3 @@
         #vis use #link_section_macro as #ident;
     }
 }
-
-fn populate_static_lifetimes(ty: &mut Type) {
-    match ty {
-        Type::Array(ty) => populate_static_lifetimes(&mut ty.elem),
-        Type::Group(ty) => populate_static_lifetimes(&mut ty.elem),
-        Type::Paren(ty) => populate_static_lifetimes(&mut ty.elem),
-        Type::Path(ty) => {
-            if let Some(qself) = &mut ty.qself {
-                populate_static_lifetimes(&mut qself.ty);
-            }
-            for segment in &mut ty.path.segments {
-                if let PathArguments::AngleBracketed(segment) = &mut segment.arguments {
-                    for arg in &mut segment.args {
-                        if let GenericArgument::Type(arg) = arg {
-                            populate_static_lifetimes(arg);
-                        }
-                    }
-                }
-            }
-        }
-        Type::Ptr(ty) => populate_static_lifetimes(&mut ty.elem),
-        Type::Reference(ty) => {
-            if ty.lifetime.is_none() {
-                ty.lifetime = Some(Lifetime::new("'static", ty.and_token.span));
-            }
-            populate_static_lifetimes(&mut ty.elem);
-        }
-        Type::Slice(ty) => populate_static_lifetimes(&mut ty.elem),
-        Type::Tuple(ty) => ty.elems.iter_mut().for_each(populate_static_lifetimes),
-        Type::ImplTrait(_)
-        | Type::Infer(_)
-        | Type::Macro(_)
-        | Type::Never(_)
-        | Type::TraitObject(_)
-        | Type::BareFn(_)
-        | Type::Verbatim(_) => {}
-        #[cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
-        _ => unimplemented!("unknown Type"),
-    }
-}

crates/linkme-impl/src/element.rs

diff --git a/crates/linkme-impl/src/element.rs b/crates/linkme-impl/src/element.rs
index 7c85e30..18a3cc4 100644
--- a/crates/linkme-impl/src/element.rs
+++ b/crates/linkme-impl/src/element.rs
@@ -1,7 +1,6 @@
-use crate::attr;
+use crate::{attr, ty};
 use proc_macro2::{Span, TokenStream, TokenTree};
 use quote::{format_ident, quote, quote_spanned};
-use std::iter::FromIterator;
 use syn::parse::{Error, Parse, ParseStream, Result};
 use syn::punctuated::Punctuated;
 use syn::{
@@ -205,10 +204,12 @@
     let mut attrs = input.attrs;
     let vis = input.vis;
     let ident = input.ident;
-    let ty = input.ty;
+    let mut ty = input.ty;
     let expr = input.expr;
     let orig_item = input.orig_item;
 
+    ty::populate_static_lifetimes(&mut ty);
+
     let linkme_path = match attr::linkme_path(&mut attrs) {
         Ok(path) => path,
         Err(err) => return err.to_compile_error(),
@@ -216,8 +217,8 @@
 
     let sort_key = pos.into_iter().map(|pos| format!("{:04}", pos));
 
-    let new = quote_spanned!(input.start_span=> __new);
-    let uninit = quote_spanned!(input.end_span=> #new());
+    let factory = quote_spanned!(input.start_span=> __new);
+    let get = quote_spanned!(input.end_span=> #factory());
 
     quote! {
         #path ! {
@@ -227,9 +228,13 @@
             )*
             #(#attrs)*
             #vis static #ident : #ty = {
+                #[allow(clippy::no_effect_underscore_binding)]
                 unsafe fn __typecheck(_: #linkme_path::__private::Void) {
-                    let #new = #linkme_path::__private::value::<#ty>;
-                    #linkme_path::DistributedSlice::private_typecheck(#path, #uninit)
+                    #[allow(clippy::ref_option_ref)]
+                    let #factory = || -> fn() -> &'static #ty { || &#ident };
+                    unsafe {
+                        #linkme_path::DistributedSlice::private_typecheck(#path, #get);
+                    }
                 }
 
                 #expr

crates/linkme-impl/src/lib.rs

diff --git a/crates/linkme-impl/src/lib.rs b/crates/linkme-impl/src/lib.rs
index d08aba8..2b300c0 100644
--- a/crates/linkme-impl/src/lib.rs
+++ b/crates/linkme-impl/src/lib.rs
@@ -12,6 +12,7 @@
 mod element;
 mod hash;
 mod linker;
+mod ty;
 
 use crate::args::Args;
 use crate::hash::hash;

crates/linkme-impl/src/linker.rs

diff --git a/crates/linkme-impl/src/linker.rs b/crates/linkme-impl/src/linker.rs
index 75affe2..2d5aa12 100644
--- a/crates/linkme-impl/src/linker.rs
+++ b/crates/linkme-impl/src/linker.rs
@@ -14,7 +14,7 @@
     }
 }
 
-pub mod freebsd {
+pub mod bsd {
     use syn::Ident;
 
     pub fn section(ident: &Ident) -> String {

crates/linkme-impl/src/ty.rs

diff --git a/crates/linkme-impl/src/ty.rs b/crates/linkme-impl/src/ty.rs
new file mode 100644
index 0000000..60bd30a
--- /dev/null
+++ b/crates/linkme-impl/src/ty.rs
@@ -0,0 +1,42 @@
+use syn::{GenericArgument, Lifetime, PathArguments, Type};
+
+pub(crate) fn populate_static_lifetimes(ty: &mut Type) {
+    match ty {
+        #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+        Type::Array(ty) => populate_static_lifetimes(&mut ty.elem),
+        Type::Group(ty) => populate_static_lifetimes(&mut ty.elem),
+        Type::Paren(ty) => populate_static_lifetimes(&mut ty.elem),
+        Type::Path(ty) => {
+            if let Some(qself) = &mut ty.qself {
+                populate_static_lifetimes(&mut qself.ty);
+            }
+            for segment in &mut ty.path.segments {
+                if let PathArguments::AngleBracketed(segment) = &mut segment.arguments {
+                    for arg in &mut segment.args {
+                        if let GenericArgument::Type(arg) = arg {
+                            populate_static_lifetimes(arg);
+                        }
+                    }
+                }
+            }
+        }
+        Type::Ptr(ty) => populate_static_lifetimes(&mut ty.elem),
+        Type::Reference(ty) => {
+            if ty.lifetime.is_none() {
+                ty.lifetime = Some(Lifetime::new("'static", ty.and_token.span));
+            }
+            populate_static_lifetimes(&mut ty.elem);
+        }
+        Type::Slice(ty) => populate_static_lifetimes(&mut ty.elem),
+        Type::Tuple(ty) => ty.elems.iter_mut().for_each(populate_static_lifetimes),
+        Type::ImplTrait(_)
+        | Type::Infer(_)
+        | Type::Macro(_)
+        | Type::Never(_)
+        | Type::TraitObject(_)
+        | Type::BareFn(_)
+        | Type::Verbatim(_) => {}
+
+        _ => unimplemented!("unknown Type"),
+    }
+}

crates/linkme/.android-checksum.json

diff --git a/crates/linkme/.android-checksum.json b/crates/linkme/.android-checksum.json
index b7879c3..1d82f90 100644
--- a/crates/linkme/.android-checksum.json
+++ b/crates/linkme/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"ff828fe92039ba4f006c2a64653ee1fffa316c17709fc9ee1ad9d976a1a862f9","Android.bp":"0e5c69e0ed85d46d30207eac80943fb043be616cf4a260fcc6f9d213566efe73","Cargo.toml":"0ad35faa64eb49ae5d78650e71a61c4e28c28fc5f009446d594bdb6c01df6127","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"1dacbdfc3ad76a7354ecfd8c02d574b30196d014f24d02c49fa3efbe614ccb0b","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"1a25c9fda0a766bd789142fb4a9d92e77353db7259e3e886a34b3a854c1b947c","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","src/distributed_slice.rs":"e361d0cf0d131eafcf0659b9969359e2554346b8faba6aa0a2d519ff156fa0de","src/lib.rs":"0b7349459bbb16633e4a7ef3176dff7c3b3905350f0668bdf282b85bbb42a19e","src/private.rs":"a1128ca43b0446992b132a28b90e38c2a783e433766e462360bd3817a92332bf","tests/compiletest.rs":"8f2cbc080ae802a72afbc627b943e187f66bfe0214f7d989460badb57ddfbb8d","tests/custom_linkme_path.rs":"5c28bf190bf9564cb2c691341dc2279c7f63e695d38ddca777cd899eb6500c92","tests/distributed_slice.rs":"7687f345639867cbe384ba204b1d675e8adf53f72d03a0be809d60c160fd4aa9","tests/example.rs":"4e9443473aeb009d2266fbb8d9c303fb543ec67f14312d15e1d2c6aeb6690ee7","tests/fn_element.rs":"9aeb945b02ea4983636a9744861ff8abfa32c0f0d0dd3a51eb54f04842914fc1","tests/module/mod.rs":"be9c50e3819878ab4ff33f6e8adf503e9d18f7d77fef40e5b906a26705dbe93d","tests/module_2015.rs":"4d507fea5c9bcf7250d67e03da0d4f893bcece3ff533edd763d4ccb119969d53","tests/module_2021.rs":"80054a9ee8c1d06bcdaf08583466ef608a321b530aa07630c4b4892b8c76ac5f","tests/ui/bad_crate_path.rs":"3bede2477feb56279acd06008c87323a7bb6e3d754a42936c1b9ebabeab97fa8","tests/ui/bad_crate_path.stderr":"35d0d42344cd955d662298086903214e215de868e0c3fbe2389164400f6bb3b7","tests/ui/generic_fn.rs":"ed65aa4fdcbc569790f8ee7ce8bc898d6ab4712a20ea7069680485737b755dfa","tests/ui/generic_fn.stderr":"1a5b6d74d35a3f9d8de58dc338ab9ba7d4c2f43c17e420e146022799c3e84ed7","tests/ui/mismatched_types.rs":"891ad4bd815d1ebfcd7febb291240813b69a83907b86dcfdb6bf7567a95205e8","tests/ui/mismatched_types.stderr":"58497a5b30efd1d3f9a4f9adc452582515faa2643ae8e9e7e49bc80f14ffb1dd","tests/ui/mutable.rs":"63cf5c42266378257159250b3d66dced0c01090e336b79501313a7ef799a82bc","tests/ui/mutable.stderr":"773189ea5e6a07788ab2d515f46a93a93367214a088902caf7d37f1ccd34de50","tests/ui/unsupported_item.rs":"f560182db10acf7cdb3994116166c60d27ce616a5b6c8c9228ea39209f361327","tests/ui/unsupported_item.stderr":"ccaf4715155fd6669dab25718efbcc0a0c241408d972a67ae20459f4851c74c4","tests/ui/zerosized.rs":"0958f586d95d06cca5462c64c91f30ac10b37d747ff0c16f78768d3612745e5c","tests/ui/zerosized.stderr":"0baf74294d8988023f8c908841cf8bdd3b288590c319a240e1faef191f1122fb"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"21f48f30ff2bcdcd154673e0162166d6e5be6aba6aee4a09c29edd321e14eb62","Android.bp":"6db72639a0c260eaf2685e7f9b24708cd400f665ccff84e775cadb557481320f","Cargo.toml":"6126ddbf3c92b18ad2c238dbf2e4a27ba887b1cac0f40e3b8fc0e45b84500fe0","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"939e9d658f4eb716c18ac1f531e332c04aa6108df1a80dae0a629785abdf78d5","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"3ed710de606cf36723c4390ad979a4001c9bb30466897b561b1f9e69121b0351","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","src/distributed_slice.rs":"e7d45eecd466c158c20abcdf2a7e6d214c6b256eb7a7a85145ff35ac50de1654","src/lib.rs":"87c30e3a6f361617e065a870f1e67fdf33d591b7b65950f1ea545a44248088c5","src/private.rs":"86534a07ab4ab440f0559dd2e30ed11c86aa59882b4a5c6901a47f0620a0ce64","tests/compiletest.rs":"5876a4728abd95ed4ed3b78777fe95428d32a32730d7718f58001bdbd4d1e168","tests/custom_linkme_path.rs":"e5654dd57009463688456235deff2588ef0961016ac24fede5f1b1a9f2b6248e","tests/distributed_slice.rs":"8269fc15fb9c00629838ef8f647cb27cd0b3e48edc32181601e5877aea0bf613","tests/example.rs":"caf9d2c0d3eda94bca8c34e6f27dcc3ca83ea011185a4908d9c0bfc65b54be39","tests/fn_element.rs":"24d6514351d9b39d9e86fce4ff9f3d707d68c9bc65f19a1d0a1748ca6b7117b0","tests/module/mod.rs":"b5a84f0d8bba52e092aa8ba422eccf8556750e982f78e395dff0fec18d591d47","tests/module_2015.rs":"4d507fea5c9bcf7250d67e03da0d4f893bcece3ff533edd763d4ccb119969d53","tests/module_2021.rs":"80054a9ee8c1d06bcdaf08583466ef608a321b530aa07630c4b4892b8c76ac5f","tests/ui/attempted_coercion.rs":"986f5668062a143834f7e667bee36ffc24ba1bc70a1834d11084b3d537c3aba1","tests/ui/attempted_coercion.stderr":"e750de4022dcd582651c99684053b4b12e22e3c0528d9572df34a21e2b5a0988","tests/ui/bad_crate_path.rs":"5f2b43f8ee28631f9ce3d28847ee3d080ef6c797538829b7ea1eeb86ea559660","tests/ui/bad_crate_path.stderr":"2a7c6c247881dc83808397e3057738bdd4cc465eb0c917d593603585660a456f","tests/ui/generic_fn.rs":"11008ff7c4c085f7ae62ed6d592ffc050d9fa6cc74bfdb1a47ced5f6cb87138d","tests/ui/generic_fn.stderr":"1a5b6d74d35a3f9d8de58dc338ab9ba7d4c2f43c17e420e146022799c3e84ed7","tests/ui/mismatched_types.rs":"5f952c777838b515f0a096b6cca9ed307df0518f769bdc177549a75c2c101f0c","tests/ui/mismatched_types.stderr":"24637e5d728a9d892e00db93b0491d4d23260a6f1f0ac38e3313bd34501b0c58","tests/ui/mutable.rs":"ee87f2093b55d9de41e1d9934f529b33b72f7f4d0d3c14a65df346be96183c01","tests/ui/mutable.stderr":"daa9acd6fd3527081150820267e8432a40b4cf6a36371a52c56c4b6968f75b37","tests/ui/unsupported_item.rs":"23378fd486b711a8f3d07b619c9d652a5071f6a1960a99aee372ba95a37765fb","tests/ui/unsupported_item.stderr":"ccaf4715155fd6669dab25718efbcc0a0c241408d972a67ae20459f4851c74c4","tests/ui/zerosized.rs":"e4da6f91ce6d03d8a01a8a004295afe9a4385c43602309629b2990a5db6e12fa","tests/ui/zerosized.stderr":"d7d7fa31e99deff19e9b5a40ab199aab29f16fc3466857f48993291d85e83358","tests/win_status_access_violation.rs":"c68795b1d59d1980e6c0ba5b2e900346db642865d2b10ad4194a9cbdbb2b2b61","tests/win_status_illegal_instruction.rs":"cbb4795abddc60e3ce099cb9dcfdb0ba658a49ed5a6924853be4236538d70db8"}}
\ No newline at end of file

crates/linkme/.cargo-checksum.json

diff --git a/crates/linkme/.cargo-checksum.json b/crates/linkme/.cargo-checksum.json
index b2b9ba9..3601eb4 100644
--- a/crates/linkme/.cargo-checksum.json
+++ b/crates/linkme/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"92c63b759fe0a01287c4501d1bbdc82d8faa0879a510d3d5f5e2ca174dc83300","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"49b76b0377c7325c24fba25b3a8f728a27c05d33e846677a76ded4ab2261738a","src/distributed_slice.rs":"78f484ec672b0197e20cc0cb5ceda404ddc12c15d34d0e58a6f63530d5d32da7","src/lib.rs":"f09743ff9e09dfd28c1ca872db6a91a5692f617dcfdd1a343790d2e3409c2f12","src/private.rs":"c90b56249c735cb60573fd4107dd50c26fad785aacfeeedc89f312707cb3c80f","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/custom_linkme_path.rs":"6f7fabc02f2f414762d2eaf3a5a57fbfee53b38854afce37d37a45f520e49233","tests/distributed_slice.rs":"9f6c770642318db5577a51afbaeda5a8cef1de4afee2e7a64ad867fa4f999cc2","tests/example.rs":"37bde9e47524bfe3284f50c9cb6844701187421e6733f087de8f5d371f46ac4f","tests/fn_element.rs":"4188ab0b0eaa58b2360a089d54e7ec0ee1ee48c8fc0aef969f5a1404e12aa102","tests/module/mod.rs":"58acddc9d2ac6f10bec117c58877dfdb4e6a2eea6aae51c4e7e34377417eeeef","tests/module_2015.rs":"6b138d9f7b2a4b91b2b8f7cc4eee204e7ad27d33f4d87ef492ea316d759ad749","tests/module_2021.rs":"61120c3d8156b5af6ac84b47a8b2c4e6ce97b7a17ab3131af57a2fb3d8822564","tests/ui/bad_crate_path.rs":"23ae1110504210eedd2f1736dd78199ed09fed497cca6daf6b7ebafe2b814c3a","tests/ui/bad_crate_path.stderr":"11dd2a52cbaba6b2003f8cb28d95b052b4dbb7059bdb29e78dee0400f5db4a49","tests/ui/generic_fn.rs":"0a7a7cc9a7e09ef9ab46fc15608857463865db3d048019d5c74162defb138f71","tests/ui/generic_fn.stderr":"91cbdf3db736e14f366a78b614fb7ac8843ce2c6abe39fc8f878b3b22d1047ee","tests/ui/mismatched_types.rs":"26d6d3109ab2c0ff2b4eb5e020f29ead104203d1623cdb960e77fe5b1b491112","tests/ui/mismatched_types.stderr":"b0892d809de86f954ef6af2aef5a0fa0e1611fc5aa56ecd71d2a12eea165760c","tests/ui/mutable.rs":"8b2f351572a8ab328d8dd6a9b572772ab26b7e046aac251305783aaa09e4e7fb","tests/ui/mutable.stderr":"a73c5a6bf9831d2792376b3b5f66ce462e90cdf84dceb0acb92e29b49ee5523b","tests/ui/unsupported_item.rs":"6d16c3e3c45f246cbb16c9ae97941cf72e53719ad63f5997c31fcc8a3f3d4a83","tests/ui/unsupported_item.stderr":"f547648e6b400ccc905f85c975e6250e70ae7d9d7846921001a1155b9325629c","tests/ui/zerosized.rs":"c0f027d8a7fdd7b0b6948fb025ab54c9089f31c1d16025d6f6a6dbca4e82cb0f","tests/ui/zerosized.stderr":"26c030366a31962402ebbffa4992d4c4c0cd1adbfac75c4f407cd2eb49206d0e"},"package":"97f3302efc6ebb7b5f0810a1096dbbb44a536711a4576bc89264a8f9a1d634d8"}
\ No newline at end of file
+{"files":{"Cargo.toml":"4fc488b50b47163e4dec9ef371232ad139b0139fc6a021b708ffd40d85d32c5c","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"014fb852ef8262abd9a7732789d15ec6130a4d8156cafdc89b22c4e7094eebe7","src/distributed_slice.rs":"9e261cfee40990ba371750db4e93d4765e36cfff73f888f49712e577ee72bdef","src/lib.rs":"0976d91bb50601d14a87289dface275f98facfc1bfc8faf4978dc0f94aeaca4b","src/private.rs":"feb8bf28ca5c2a6adcf6e17db636c950df1d9d103ae3461dc8102c72c09ab534","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/custom_linkme_path.rs":"0a9a4b718007b45f59c15411952682b58a9d692ff0c603d2121c37e92b823cba","tests/distributed_slice.rs":"9cbc09a383f75e05c5d95d696d586069f04ec18916afc1131db7ec6c8e6178c7","tests/example.rs":"490725e38ccd8f9edb98b379e31bf851d269417c62fe912db4be334ca17e645f","tests/fn_element.rs":"3a1699565329936fb18f535ac095bd4213c2c1c694ecd4075216e78ad0c8038e","tests/module/mod.rs":"6062f06c02aae46c656dd8f6d739091a803dc04cf3c82f80977e17490854b0be","tests/module_2015.rs":"6b138d9f7b2a4b91b2b8f7cc4eee204e7ad27d33f4d87ef492ea316d759ad749","tests/module_2021.rs":"61120c3d8156b5af6ac84b47a8b2c4e6ce97b7a17ab3131af57a2fb3d8822564","tests/ui/attempted_coercion.rs":"b034d37e7947d1ae165a78a8b1477a79e18ba4e8d9d448c1780669df27a1db19","tests/ui/attempted_coercion.stderr":"c7c0eda9d6bcdf5fea84b5be9a1cd23e1dd5e68e145897e019938e59decb258c","tests/ui/bad_crate_path.rs":"e007cfd7cbb581d37543b15591cbac3f3519fa5e0b8d5ccf0ea86d535e06f9a9","tests/ui/bad_crate_path.stderr":"4aa9e15819624550ce063d63ba353c479559371a5a8afde2071d3fbc071058f7","tests/ui/generic_fn.rs":"d56cab278fa4f167f1ce6406e60c625c74b7eadfb7ac120c67185dac0b3702bc","tests/ui/generic_fn.stderr":"91cbdf3db736e14f366a78b614fb7ac8843ce2c6abe39fc8f878b3b22d1047ee","tests/ui/mismatched_types.rs":"81e804ef9ec34a17080b95dc8955731c0bd5fdb3c0450b20191c026652c9df42","tests/ui/mismatched_types.stderr":"7e4ee90525f5d9250b232296eb11056a2c525a3d7e226ad9a8da44f11eaaf8a3","tests/ui/mutable.rs":"b5621fa6a1562f83b868910cd89e3730fb8562a5fd0598fcbb7b934e3595ac8f","tests/ui/mutable.stderr":"e66c45648a1f94d0937f84cb7f21c5f37f165b98cbe600687d32cbda4df4338d","tests/ui/unsupported_item.rs":"f172d75ccaf2e54bf0533b590753c7dc993132b43ca2820d1f69574a7c4a4265","tests/ui/unsupported_item.stderr":"f547648e6b400ccc905f85c975e6250e70ae7d9d7846921001a1155b9325629c","tests/ui/zerosized.rs":"9f497d19d4e9d516c3cde52eb5ceab4f526c7e14c20d6b8da2e17ffec1f01244","tests/ui/zerosized.stderr":"763868918df1fd46d642cb6274b5b6a6235302acda44d895a6e666c9f6411a2f","tests/win_status_access_violation.rs":"715181a0d12d9150edf79313f515a83c24f7e08548df00c51dc3b2e17a2273b3","tests/win_status_illegal_instruction.rs":"bc697035e9aac3e68307408ccd7b7773c8230c410b4fd8d591f585a8da1bc2af"},"package":"566336154b9e58a4f055f6dd4cbab62c7dc0826ce3c0a04e63b2d2ecd784cdae"}
\ No newline at end of file

crates/linkme/Android.bp

diff --git a/crates/linkme/Android.bp b/crates/linkme/Android.bp
index a9cae47..5e05ffd 100644
--- a/crates/linkme/Android.bp
+++ b/crates/linkme/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "linkme",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.10",
+    cargo_pkg_version: "0.3.31",
     crate_root: "src/lib.rs",
     edition: "2021",
     proc_macros: ["liblinkme_impl"],

crates/linkme/Cargo.toml

diff --git a/crates/linkme/Cargo.toml b/crates/linkme/Cargo.toml
index 22b17d4..feee17f 100644
--- a/crates/linkme/Cargo.toml
+++ b/crates/linkme/Cargo.toml
@@ -13,8 +13,14 @@
 edition = "2021"
 rust-version = "1.62"
 name = "linkme"
-version = "0.3.10"
+version = "0.3.31"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
+build = false
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Safe cross-platform linker shenanigans"
 documentation = "https://docs.rs/linkme"
 readme = "README.md"
@@ -23,22 +29,59 @@
     "development-tools::build-utils",
     "development-tools::procedural-macro-helpers",
     "no-std",
+    "no-std::no-alloc",
 ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/linkme"
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--generate-link-to-definition"]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [lib]
+name = "linkme"
+path = "src/lib.rs"
 doc-scrape-examples = false
 
 [[test]]
+name = "compiletest"
+path = "tests/compiletest.rs"
+
+[[test]]
+name = "custom_linkme_path"
+path = "tests/custom_linkme_path.rs"
+
+[[test]]
+name = "distributed_slice"
+path = "tests/distributed_slice.rs"
+
+[[test]]
+name = "example"
+path = "tests/example.rs"
+
+[[test]]
+name = "fn_element"
+path = "tests/fn_element.rs"
+
+[[test]]
 name = "module_2015"
+path = "tests/module_2015.rs"
 edition = "2015"
 
+[[test]]
+name = "module_2021"
+path = "tests/module_2021.rs"
+
+[[test]]
+name = "win_status_access_violation"
+path = "tests/win_status_access_violation.rs"
+
+[[test]]
+name = "win_status_illegal_instruction"
+path = "tests/win_status_illegal_instruction.rs"
+
 [dependencies.linkme-impl]
-version = "=0.3.10"
+version = "=0.3.31"
 
 [dev-dependencies.once_cell]
 version = "1.16"
@@ -47,7 +90,7 @@
 version = "1.0"
 
 [dev-dependencies.trybuild]
-version = "1.0.66"
+version = "1.0.97"
 features = ["diff"]
 
 [features]

crates/linkme/METADATA

diff --git a/crates/linkme/METADATA b/crates/linkme/METADATA
index b10cbcc..674dd9b 100644
--- a/crates/linkme/METADATA
+++ b/crates/linkme/METADATA
@@ -1,17 +1,17 @@
 name: "linkme"
 description: "Safe cross-platform linker shenanigans"
 third_party {
-  version: "0.3.10"
+  version: "0.3.31"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 6
-    day: 1
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/linkme"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/linkme/linkme-0.3.10.crate"
-    version: "0.3.10"
+    value: "https://static.crates.io/crates/linkme/linkme-0.3.31.crate"
+    version: "0.3.31"
   }
 }

crates/linkme/README.md

diff --git a/crates/linkme/README.md b/crates/linkme/README.md
index de15c56..72d5f44 100644
--- a/crates/linkme/README.md
+++ b/crates/linkme/README.md
@@ -5,9 +5,9 @@
 [<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-linkme-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs" height="20">](https://docs.rs/linkme)
 [<img alt="build status" src="https://img.shields.io/github/actions/workflow/status/dtolnay/linkme/ci.yml?branch=master&style=for-the-badge" height="20">](https://github.com/dtolnay/linkme/actions?query=branch%3Amaster)
 
-| Component | Linux | macOS | Windows | FreeBSD | illumos | Other...<sup>†</sup> |
-|:---|:---:|:---:|:---:|:---:|:---:|:---:|
-| [Distributed slice] | 💚 | 💚 | 💚 | 💚 | 💚 | |
+| Component | Linux | macOS | Windows | FreeBSD | OpenBSD | illumos | Other...<sup>†</sup> |
+|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| [Distributed slice] | 💚 | 💚 | 💚 | 💚 | 💚 | 💚 | |
 
 <b><sup>†</sup></b> We welcome PRs adding support for any platforms not listed
 here.
@@ -37,14 +37,13 @@
 ### Declaration
 
 A static distributed slice is declared by writing `#[distributed_slice]` on a
-static item whose type is `[T]` for some type `T`. The initializer expression
-must be `[..]` to indicate that elements come from elsewhere.
+static item whose type is `[T]` for some type `T`.
 
 ```rust
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+pub static BENCHMARKS: [fn(&mut Bencher)];
 ```
 
 ### Elements
@@ -120,7 +119,7 @@
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+pub static BENCHMARKS: [fn(&mut Bencher)];
 
 // Equivalent to:
 //

crates/linkme/src/distributed_slice.rs

diff --git a/crates/linkme/src/distributed_slice.rs b/crates/linkme/src/distributed_slice.rs
index d283e6f..a799065 100644
--- a/crates/linkme/src/distributed_slice.rs
+++ b/crates/linkme/src/distributed_slice.rs
@@ -1,3 +1,4 @@
+use core::fmt::{self, Debug};
 use core::hint;
 use core::mem;
 use core::ops::Deref;
@@ -16,8 +17,7 @@
 /// ## Declaration
 ///
 /// A static distributed slice may be declared by writing `#[distributed_slice]`
-/// on a static item whose type is `[T]` for some type `T`. The initializer
-/// expression must be `[..]` to indicate that elements come from elsewhere.
+/// on a static item whose type is `[T]` for some type `T`.
 ///
 /// ```
 /// # #![cfg_attr(feature = "used_linker", feature(used_with_arg))]
@@ -27,7 +27,7 @@
 /// use linkme::distributed_slice;
 ///
 /// #[distributed_slice]
-/// pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+/// pub static BENCHMARKS: [fn(&mut Bencher)];
 /// ```
 ///
 /// The attribute rewrites the `[T]` type of the static into
@@ -54,7 +54,7 @@
 /// #     pub struct Bencher;
 /// #
 /// #     #[distributed_slice]
-/// #     pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+/// #     pub static BENCHMARKS: [fn(&mut Bencher)];
 /// # }
 /// #
 /// # use other_crate::Bencher;
@@ -81,7 +81,7 @@
 /// #     pub struct Bencher;
 /// #
 /// #     #[distributed_slice]
-/// #     pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+/// #     pub static BENCHMARKS: [fn(&mut Bencher)];
 /// # }
 /// #
 /// # use linkme::distributed_slice;
@@ -117,7 +117,7 @@
 /// use linkme::distributed_slice;
 ///
 /// #[distributed_slice]
-/// pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+/// pub static BENCHMARKS: [fn(&mut Bencher)];
 ///
 /// // Equivalent to:
 /// //
@@ -162,8 +162,11 @@
         target_os = "ios",
         target_os = "tvos",
         target_os = "android",
+        target_os = "fuchsia",
         target_os = "illumos",
-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "openbsd",
+        target_os = "psp",
     ))]
     pub const unsafe fn private_new(
         name: &'static str,
@@ -184,7 +187,7 @@
     }
 
     #[doc(hidden)]
-    #[cfg(target_os = "windows")]
+    #[cfg(any(target_os = "uefi", target_os = "windows"))]
     pub const unsafe fn private_new(
         name: &'static str,
         section_start: *const [T; 0],
@@ -211,12 +214,10 @@
 
     #[doc(hidden)]
     #[inline]
-    pub unsafe fn private_typecheck(self, element: T) {
-        mem::forget(element);
+    pub unsafe fn private_typecheck(self, get: fn() -> &'static T) {
+        let _ = get;
     }
-}
 
-impl<T> DistributedSlice<[T]> {
     /// Retrieve a contiguous slice containing all the elements linked into this
     /// program.
     ///
@@ -234,7 +235,7 @@
     /// use linkme::distributed_slice;
     ///
     /// #[distributed_slice]
-    /// static BENCHMARKS: [fn(&mut Bencher)] = [..];
+    /// static BENCHMARKS: [fn(&mut Bencher)];
     ///
     /// fn main() {
     ///     // Iterate the elements.
@@ -267,6 +268,14 @@
             // using the unsafe `private_new`.
             None => unsafe { hint::unreachable_unchecked() },
         };
+
+        // On Windows, the implementation involves growing a &[T; 0] to
+        // encompass elements that we have asked the linker to place immediately
+        // after that location. The compiler sees this as going "out of bounds"
+        // based on provenance, so we must conceal what is going on.
+        #[cfg(any(target_os = "uefi", target_os = "windows"))]
+        let start = hint::black_box(start);
+
         unsafe { slice::from_raw_parts(start, len) }
     }
 }
@@ -293,3 +302,12 @@
         self.static_slice().iter()
     }
 }
+
+impl<T> Debug for DistributedSlice<[T]>
+where
+    T: Debug + 'static,
+{
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        Debug::fmt(self.static_slice(), formatter)
+    }
+}

crates/linkme/src/lib.rs

diff --git a/crates/linkme/src/lib.rs b/crates/linkme/src/lib.rs
index b51331a..38444ff 100644
--- a/crates/linkme/src/lib.rs
+++ b/crates/linkme/src/lib.rs
@@ -12,9 +12,9 @@
 //!
 //! # Platform support
 //!
-//! | Component | Linux | macOS | Windows | FreeBSD | illumos | Other...<sup>†</sup> |
-//! |:---|:---:|:---:|:---:|:---:|:---:|:---:|
-//! | Distributed slice | 💚 | 💚 | 💚 | 💚 | 💚 | |
+//! | Component | Linux | macOS | Windows | FreeBSD | OpenBSD | illumos | Other...<sup>†</sup> |
+//! |:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+//! | Distributed slice | 💚 | 💚 | 💚 | 💚 | 💚 | 💚 | |
 //!
 //! <br>***<sup>†</sup>*** We welcome PRs adding support for any platforms not
 //! listed here.
@@ -32,8 +32,7 @@
 //! of the API. The basic idea is as follows.
 //!
 //! A static distributed slice is declared by writing `#[distributed_slice]` on
-//! a static item whose type is `[T]` for some type `T`. The initializer
-//! expression must be `[..]` to indicate that elements come from elsewhere.
+//! a static item whose type is `[T]` for some type `T`.
 //!
 //! ```
 //! # #![cfg_attr(feature = "used_linker", feature(used_with_arg))]
@@ -43,7 +42,7 @@
 //! use linkme::distributed_slice;
 //!
 //! #[distributed_slice]
-//! pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+//! pub static BENCHMARKS: [fn(&mut Bencher)];
 //! ```
 //!
 //! Slice elements may be registered into a distributed slice by a
@@ -60,7 +59,7 @@
 //! #     pub struct Bencher;
 //! #
 //! #     #[distributed_slice]
-//! #     pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+//! #     pub static BENCHMARKS: [fn(&mut Bencher)];
 //! # }
 //! #
 //! # use other_crate::Bencher;
@@ -86,7 +85,7 @@
 //! # struct Bencher;
 //! #
 //! # #[distributed_slice]
-//! # static BENCHMARKS: [fn(&mut Bencher)] = [..];
+//! # static BENCHMARKS: [fn(&mut Bencher)];
 //! #
 //! fn main() {
 //!     // Iterate the elements.
@@ -104,15 +103,46 @@
 //!     let len = BENCHMARKS.len();
 //! }
 //! ```
+//!
+//! <br>
+//!
+//! <details>
+//! <summary>Workaround for buggy IDEs</summary>
+//!
+//! JetBrains's Rust IDE uses an outdated Rust parser that treats distributed
+//! slice declarations as invalid syntax, despite being supported in stable
+//! rustc for over 3.5 years.
+//! See <https://youtrack.jetbrains.com/issue/RUST-12953>.
+//!
+//! If you hit this, you can work around it by adding a dummy initializer
+//! expression to the slice.
+//!
+//! ```
+//! # #![cfg_attr(feature = "used_linker", feature(used_with_arg))]
+//! #
+//! # use linkme::distributed_slice;
+//! #
+//! # struct Bencher;
+//! #
+//! #[distributed_slice]
+//! pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+//! #
+//! # const _: &str = stringify! {
+//!                                           ^^^^^^
+//! # };
+//! ```
+//! </details>
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/linkme/0.3.10")]
+#![doc(html_root_url = "https://docs.rs/linkme/0.3.31")]
+#![deny(unsafe_op_in_unsafe_fn)]
 #![allow(
     clippy::doc_markdown,
     clippy::empty_enum,
     clippy::expl_impl_clone_on_copy,
     clippy::manual_assert,
     clippy::missing_panics_doc,
+    clippy::missing_safety_doc,
     clippy::must_use_candidate,
     clippy::unused_self
 )]

crates/linkme/src/private.rs

diff --git a/crates/linkme/src/private.rs b/crates/linkme/src/private.rs
index 508ef4f..f9f859b 100644
--- a/crates/linkme/src/private.rs
+++ b/crates/linkme/src/private.rs
@@ -1,7 +1,13 @@
+#[doc(hidden)]
 pub use core::assert;
+#[doc(hidden)]
 pub use core::mem;
+#[doc(hidden)]
 pub use core::primitive::usize;
+#[doc(hidden)]
+pub use core::ptr;
 
+#[doc(hidden)]
 pub trait Slice {
     type Element;
 }
@@ -10,8 +16,5 @@
     type Element = T;
 }
 
+#[doc(hidden)]
 pub enum Void {}
-
-pub fn value<T>() -> T {
-    panic!()
-}

crates/linkme/tests/compiletest.rs

diff --git a/crates/linkme/tests/compiletest.rs b/crates/linkme/tests/compiletest.rs
index 7974a62..23a6a06 100644
--- a/crates/linkme/tests/compiletest.rs
+++ b/crates/linkme/tests/compiletest.rs
@@ -1,5 +1,5 @@
-#[rustversion::attr(not(nightly), ignore)]
-#[cfg_attr(miri, ignore)]
+#[rustversion::attr(not(nightly), ignore = "requires nightly")]
+#[cfg_attr(miri, ignore = "incompatible with miri")]
 #[test]
 fn ui() {
     let t = trybuild::TestCases::new();

crates/linkme/tests/custom_linkme_path.rs

diff --git a/crates/linkme/tests/custom_linkme_path.rs b/crates/linkme/tests/custom_linkme_path.rs
index daee74f..4c65700 100644
--- a/crates/linkme/tests/custom_linkme_path.rs
+++ b/crates/linkme/tests/custom_linkme_path.rs
@@ -7,7 +7,7 @@
 
     #[distributed_slice]
     #[linkme(crate = crate::link_me)]
-    pub static SLICE: [i32] = [..];
+    pub static SLICE: [i32];
 
     #[test]
     fn test_slice() {
@@ -16,7 +16,7 @@
 
     #[distributed_slice]
     #[linkme(crate = crate::link_me)]
-    pub static FUNCTIONS: [fn()] = [..];
+    pub static FUNCTIONS: [fn()];
 
     #[test]
     fn test_functions() {

crates/linkme/tests/distributed_slice.rs

diff --git a/crates/linkme/tests/distributed_slice.rs b/crates/linkme/tests/distributed_slice.rs
index f8ab487..225938a 100644
--- a/crates/linkme/tests/distributed_slice.rs
+++ b/crates/linkme/tests/distributed_slice.rs
@@ -1,10 +1,12 @@
 #![cfg_attr(feature = "used_linker", feature(used_with_arg))]
+#![allow(unknown_lints, non_local_definitions)] // FIXME
+#![deny(rust_2024_compatibility, unsafe_op_in_unsafe_fn)]
 
 use linkme::distributed_slice;
 use once_cell::sync::Lazy;
 
 #[distributed_slice]
-static SHENANIGANS: [i32] = [..];
+static SHENANIGANS: [i32];
 
 #[distributed_slice(SHENANIGANS)]
 static N: i32 = 9;
@@ -30,17 +32,17 @@
 #[test]
 fn test_empty() {
     #[distributed_slice]
-    static EMPTY: [i32] = [..];
+    static EMPTY: [i32];
 
     assert!(EMPTY.is_empty());
 }
 
 #[test]
 fn test_non_copy() {
-    struct NonCopy(i32);
+    pub struct NonCopy(#[allow(dead_code)] pub i32);
 
     #[distributed_slice]
-    static NONCOPY: [NonCopy] = [..];
+    static NONCOPY: [NonCopy];
 
     #[distributed_slice(NONCOPY)]
     static ELEMENT: NonCopy = NonCopy(9);
@@ -51,7 +53,7 @@
 #[test]
 fn test_interior_mutable() {
     #[distributed_slice]
-    static MUTABLE: [Lazy<i32>] = [..];
+    static MUTABLE: [Lazy<i32>];
 
     #[distributed_slice(MUTABLE)]
     static ELEMENT: Lazy<i32> = Lazy::new(|| -1);
@@ -63,10 +65,18 @@
 #[test]
 fn test_elided_lifetime() {
     #[distributed_slice]
-    pub static MYSLICE: [&str] = [..];
+    pub static MYSLICE: [&str];
 
     #[distributed_slice(MYSLICE)]
     static ELEMENT: &str = "...";
 
     assert!(!MYSLICE.is_empty());
+    assert_eq!(MYSLICE[0], "...");
+}
+
+#[test]
+fn test_legacy_syntax() {
+    // Rustc older than 1.43 requires an initializer expression.
+    #[distributed_slice]
+    pub static LEGACY: [&str] = [..];
 }

crates/linkme/tests/example.rs

diff --git a/crates/linkme/tests/example.rs b/crates/linkme/tests/example.rs
index bbe439b..5aadbe9 100644
--- a/crates/linkme/tests/example.rs
+++ b/crates/linkme/tests/example.rs
@@ -7,7 +7,7 @@
 pub struct Bencher;
 
 #[distributed_slice]
-pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+pub static BENCHMARKS: [fn(&mut Bencher)];
 
 #[distributed_slice(BENCHMARKS)]
 static BENCH_DESERIALIZE: fn(&mut Bencher) = bench_deserialize;

crates/linkme/tests/fn_element.rs

diff --git a/crates/linkme/tests/fn_element.rs b/crates/linkme/tests/fn_element.rs
index a80508f..9e76bf0 100644
--- a/crates/linkme/tests/fn_element.rs
+++ b/crates/linkme/tests/fn_element.rs
@@ -4,19 +4,19 @@
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static SLICE1: [fn()] = [..];
+pub static SLICE1: [fn()];
 
 #[distributed_slice(SLICE1)]
 fn foo() {}
 
 #[distributed_slice]
-pub static SLICE2: [for<'a, 'b> fn(&'a &'b ())] = [..];
+pub static SLICE2: [for<'a, 'b> fn(&'a &'b ())];
 
 #[distributed_slice(SLICE2)]
 fn bar<'a, 'b>(_: &'a &'b ()) {}
 
 #[distributed_slice]
-pub static SLICE3: [unsafe extern "C" fn() -> i32] = [..];
+pub static SLICE3: [unsafe extern "C" fn() -> i32];
 
 #[distributed_slice(SLICE3)]
 unsafe extern "C" fn baz() -> i32 {

crates/linkme/tests/module/mod.rs

diff --git a/crates/linkme/tests/module/mod.rs b/crates/linkme/tests/module/mod.rs
index 0fe3e5b..13136a0 100644
--- a/crates/linkme/tests/module/mod.rs
+++ b/crates/linkme/tests/module/mod.rs
@@ -2,7 +2,7 @@
     use linkme::distributed_slice;
 
     #[distributed_slice]
-    pub static SLICE: [i32] = [..];
+    pub static SLICE: [i32];
 
     #[test]
     fn test_mod_slice() {

crates/linkme/tests/ui/attempted_coercion.rs

diff --git a/crates/linkme/tests/ui/attempted_coercion.rs b/crates/linkme/tests/ui/attempted_coercion.rs
new file mode 100644
index 0000000..96a2511
--- /dev/null
+++ b/crates/linkme/tests/ui/attempted_coercion.rs
@@ -0,0 +1,11 @@
+#![cfg_attr(feature = "used_linker", feature(used_with_arg))]
+
+use linkme::distributed_slice;
+
+#[distributed_slice]
+pub static SLICE: [&'static str];
+
+#[distributed_slice(SLICE)]
+static ELEMENT: &&str = &"uhoh";
+
+fn main() {}

crates/linkme/tests/ui/attempted_coercion.stderr

diff --git a/crates/linkme/tests/ui/attempted_coercion.stderr b/crates/linkme/tests/ui/attempted_coercion.stderr
new file mode 100644
index 0000000..5936779
--- /dev/null
+++ b/crates/linkme/tests/ui/attempted_coercion.stderr
@@ -0,0 +1,15 @@
+error[E0308]: mismatched types
+ --> tests/ui/attempted_coercion.rs:9:17
+  |
+8 | #[distributed_slice(SLICE)]
+  | --------------------------- arguments to this function are incorrect
+9 | static ELEMENT: &&str = &"uhoh";
+  |                 ^^^^^ expected `str`, found `&'static str`
+  |
+  = note: expected fn pointer `fn() -> &'static &'static str`
+             found fn pointer `fn() -> &'static &'static &'static str`
+note: method defined here
+ --> src/distributed_slice.rs
+  |
+  |     pub unsafe fn private_typecheck(self, get: fn() -> &'static T) {
+  |                   ^^^^^^^^^^^^^^^^^

crates/linkme/tests/ui/bad_crate_path.rs

diff --git a/crates/linkme/tests/ui/bad_crate_path.rs b/crates/linkme/tests/ui/bad_crate_path.rs
index ce2e563..c3594f1 100644
--- a/crates/linkme/tests/ui/bad_crate_path.rs
+++ b/crates/linkme/tests/ui/bad_crate_path.rs
@@ -8,10 +8,10 @@
 
 #[distributed_slice]
 #[linkme(crate = path::to::missing)]
-pub static SLICE1: [&'static str] = [..];
+pub static SLICE1: [&'static str];
 
 #[distributed_slice]
-pub static SLICE2: [&'static str] = [..];
+pub static SLICE2: [&'static str];
 
 #[distributed_slice(SLICE2)]
 #[linkme(crate = path::to::missing)]

crates/linkme/tests/ui/bad_crate_path.stderr

diff --git a/crates/linkme/tests/ui/bad_crate_path.stderr b/crates/linkme/tests/ui/bad_crate_path.stderr
index a4e5cef..e6b5c93 100644
--- a/crates/linkme/tests/ui/bad_crate_path.stderr
+++ b/crates/linkme/tests/ui/bad_crate_path.stderr
@@ -5,12 +5,6 @@
    |                            ^^^^^^^ could not find `missing` in `to`
 
 error[E0433]: failed to resolve: could not find `missing` in `to`
-  --> tests/ui/bad_crate_path.rs:17:28
-   |
-17 | #[linkme(crate = path::to::missing)]
-   |                            ^^^^^^^ could not find `missing` in `to`
-
-error[E0433]: failed to resolve: could not find `missing` in `to`
   --> tests/ui/bad_crate_path.rs:10:28
    |
 10 | #[linkme(crate = path::to::missing)]
@@ -26,6 +20,12 @@
    |
 17 | #[linkme(crate = path::to::missing)]
    |                            ^^^^^^^ could not find `missing` in `to`
+
+error[E0433]: failed to resolve: could not find `missing` in `to`
+  --> tests/ui/bad_crate_path.rs:17:28
+   |
+17 | #[linkme(crate = path::to::missing)]
+   |                            ^^^^^^^ could not find `missing` in `to`
    |
 help: consider importing this struct
    |

crates/linkme/tests/ui/generic_fn.rs

diff --git a/crates/linkme/tests/ui/generic_fn.rs b/crates/linkme/tests/ui/generic_fn.rs
index cb9be03..beb74af 100644
--- a/crates/linkme/tests/ui/generic_fn.rs
+++ b/crates/linkme/tests/ui/generic_fn.rs
@@ -3,7 +3,7 @@
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static SLICES: [fn()] = [..];
+pub static SLICES: [fn()];
 
 #[distributed_slice(SLICES)]
 fn type_param<T>() {}

crates/linkme/tests/ui/mismatched_types.rs

diff --git a/crates/linkme/tests/ui/mismatched_types.rs b/crates/linkme/tests/ui/mismatched_types.rs
index 611c8a9..34bf059 100644
--- a/crates/linkme/tests/ui/mismatched_types.rs
+++ b/crates/linkme/tests/ui/mismatched_types.rs
@@ -5,7 +5,7 @@
 pub struct Bencher;
 
 #[distributed_slice]
-pub static BENCHMARKS: [fn(&mut Bencher)] = [..];
+pub static BENCHMARKS: [fn(&mut Bencher)];
 
 #[distributed_slice(BENCHMARKS)]
 static BENCH_WTF: usize = 999;

crates/linkme/tests/ui/mismatched_types.stderr

diff --git a/crates/linkme/tests/ui/mismatched_types.stderr b/crates/linkme/tests/ui/mismatched_types.stderr
index 643d1a1..3ce2fb0 100644
--- a/crates/linkme/tests/ui/mismatched_types.stderr
+++ b/crates/linkme/tests/ui/mismatched_types.stderr
@@ -6,12 +6,12 @@
 11 | static BENCH_WTF: usize = 999;
    |                   ^^^^^ expected fn pointer, found `usize`
    |
-   = note: expected fn pointer `for<'a> fn(&'a mut Bencher)`
-                    found type `usize`
+   = note: expected fn pointer `fn() -> &'static for<'a> fn(&'a mut Bencher)`
+              found fn pointer `fn() -> &'static usize`
 note: method defined here
   --> src/distributed_slice.rs
    |
-   |     pub unsafe fn private_typecheck(self, element: T) {
+   |     pub unsafe fn private_typecheck(self, get: fn() -> &'static T) {
    |                   ^^^^^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
@@ -22,10 +22,10 @@
 14 | fn wrong_bench_fn<'a>(_: &'a mut ()) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Bencher`, found `()`
    |
-   = note: expected fn pointer `for<'a> fn(&'a mut Bencher)`
-              found fn pointer `for<'a> fn(&'a mut ())`
+   = note: expected fn pointer `fn() -> &'static for<'a> fn(&'a mut Bencher)`
+              found fn pointer `fn() -> &'static for<'a> fn(&'a mut ())`
 note: method defined here
   --> src/distributed_slice.rs
    |
-   |     pub unsafe fn private_typecheck(self, element: T) {
+   |     pub unsafe fn private_typecheck(self, get: fn() -> &'static T) {
    |                   ^^^^^^^^^^^^^^^^^

crates/linkme/tests/ui/mutable.rs

diff --git a/crates/linkme/tests/ui/mutable.rs b/crates/linkme/tests/ui/mutable.rs
index 39db0d0..42abc8c 100644
--- a/crates/linkme/tests/ui/mutable.rs
+++ b/crates/linkme/tests/ui/mutable.rs
@@ -3,7 +3,7 @@
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static mut SLICE: [i32] = [..];
+pub static mut SLICE: [i32];
 
 #[distributed_slice(BENCHMARKS)]
 static mut ELEMENT: i32 = -1;

crates/linkme/tests/ui/mutable.stderr

diff --git a/crates/linkme/tests/ui/mutable.stderr b/crates/linkme/tests/ui/mutable.stderr
index c23e194..1403f9c 100644
--- a/crates/linkme/tests/ui/mutable.stderr
+++ b/crates/linkme/tests/ui/mutable.stderr
@@ -1,7 +1,7 @@
 error: static mut is not supported by distributed_slice
  --> tests/ui/mutable.rs:6:12
   |
-6 | pub static mut SLICE: [i32] = [..];
+6 | pub static mut SLICE: [i32];
   |            ^^^
 
 error: static mut is not supported by distributed_slice

crates/linkme/tests/ui/unsupported_item.rs

diff --git a/crates/linkme/tests/ui/unsupported_item.rs b/crates/linkme/tests/ui/unsupported_item.rs
index e218ce5..6890020 100644
--- a/crates/linkme/tests/ui/unsupported_item.rs
+++ b/crates/linkme/tests/ui/unsupported_item.rs
@@ -3,7 +3,7 @@
 use linkme::distributed_slice;
 
 #[distributed_slice]
-pub static SLICE: [&'static str] = [..];
+pub static SLICE: [&'static str];
 
 #[distributed_slice(SLICE)]
 extern crate std as _std;

crates/linkme/tests/ui/zerosized.rs

diff --git a/crates/linkme/tests/ui/zerosized.rs b/crates/linkme/tests/ui/zerosized.rs
index 3965cee..df488af 100644
--- a/crates/linkme/tests/ui/zerosized.rs
+++ b/crates/linkme/tests/ui/zerosized.rs
@@ -5,6 +5,6 @@
 pub struct Unit;
 
 #[distributed_slice]
-pub static ZEROSIZED: [Unit] = [..];
+pub static ZEROSIZED: [Unit];
 
 fn main() {}

crates/linkme/tests/ui/zerosized.stderr

diff --git a/crates/linkme/tests/ui/zerosized.stderr b/crates/linkme/tests/ui/zerosized.stderr
index 2443140..39f1556 100644
--- a/crates/linkme/tests/ui/zerosized.stderr
+++ b/crates/linkme/tests/ui/zerosized.stderr
@@ -2,6 +2,7 @@
  --> tests/ui/zerosized.rs:7:1
   |
 7 | #[distributed_slice]
-  | ^^^^^^^^^^^^^^^^^^^^ the evaluated program panicked at 'assertion failed: ::linkme::__private::mem::size_of::<<[Unit] as\n            ::linkme::__private::Slice>::Element>() > 0', $DIR/tests/ui/zerosized.rs:7:1
+  | ^^^^^^^^^^^^^^^^^^^^ the evaluated program panicked at 'assertion failed: ::linkme::__private::mem::size_of::<<[Unit] as
+            ::linkme::__private::Slice>::Element>() > 0', $DIR/tests/ui/zerosized.rs:7:1
   |
   = note: this error originates in the macro `::linkme::__private::assert` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/linkme/tests/win_status_access_violation.rs

diff --git a/crates/linkme/tests/win_status_access_violation.rs b/crates/linkme/tests/win_status_access_violation.rs
new file mode 100644
index 0000000..aea0387
--- /dev/null
+++ b/crates/linkme/tests/win_status_access_violation.rs
@@ -0,0 +1,29 @@
+#![cfg_attr(feature = "used_linker", feature(used_with_arg))]
+
+use linkme::distributed_slice;
+
+#[distributed_slice]
+static ITEMS: [&'static str];
+
+#[distributed_slice(ITEMS)]
+static ITEM1: &'static str = "item1";
+
+// Regression test for https://github.com/dtolnay/linkme/issues/67.
+//
+// Must be run with `--release`.
+#[test]
+fn win_status_access_violation() {
+    let mut last_address = None;
+    for item in ITEMS {
+        // Do some busy work to push the compiler into optimizing the code in a
+        // particularly "bad" way. This is derived from experimentation.
+        let address = item as *const &str as usize;
+        if let Some(last) = last_address {
+            assert_eq!(address - last, std::mem::size_of::<&str>());
+        }
+        last_address = Some(address);
+
+        // Should not cause STATUS_ACCESS_VIOLATION.
+        println!("{} {:?}", item.len(), item.as_bytes());
+    }
+}

crates/linkme/tests/win_status_illegal_instruction.rs

diff --git a/crates/linkme/tests/win_status_illegal_instruction.rs b/crates/linkme/tests/win_status_illegal_instruction.rs
new file mode 100644
index 0000000..b6a6799
--- /dev/null
+++ b/crates/linkme/tests/win_status_illegal_instruction.rs
@@ -0,0 +1,41 @@
+#![cfg_attr(feature = "used_linker", feature(used_with_arg))]
+
+use linkme::distributed_slice;
+
+pub struct Item {
+    pub name: &'static str,
+}
+
+impl Item {
+    #[inline(never)]
+    fn len(&self) -> usize {
+        self.name.len()
+    }
+}
+
+#[distributed_slice]
+static ITEMS: [Item];
+
+#[distributed_slice(ITEMS)]
+static ITEM1: Item = Item { name: "item1" };
+
+// Regression test for https://github.com/dtolnay/linkme/issues/67.
+//
+// Must be run with `--release`.
+#[test]
+fn win_status_illegal_instruction() {
+    let mut last_address = None;
+    for item in ITEMS {
+        // Do some busy work to push the compiler into optimizing the code in a
+        // particularly "bad" way. This is derived from experimentation.
+        let address = item as *const Item as usize;
+        if let Some(last) = last_address {
+            assert_eq!(address - last, std::mem::size_of::<Item>());
+        }
+        last_address = Some(address);
+        println!("{} {:?}", item.len(), item.name);
+
+        // Should not cause STATUS_ILLEGAL_INSTRUCTION.
+        assert_eq!(item.len(), 5);
+    }
+}

crates/log/.android-checksum.json

diff --git a/crates/log/.android-checksum.json b/crates/log/.android-checksum.json
index 9c7ea32..a558ed8 100644
--- a/crates/log/.android-checksum.json
+++ b/crates/log/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"829acc413b591dd5bb0c4fa13fd810a51743fba4ec8c83a69e54e778f520376d","Android.bp":"32d9d514ce92daf9be6993ea3f38c99c4189ec376e48380eec1f778fa3a1488b","CHANGELOG.md":"e1aaf90192488d54ff6a46a925cc0014efe2f7f7d3cd5452a597f19819898a58","Cargo.toml":"e32b19635a5e61b73c3e430e99d2e51ff144f1034cb748c0f77f305dc3ce2c01","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"16693a68efd65bc6a9df3448c8f7ee6745418c73faff4ec4d443648c04285fa4","METADATA":"e58b92f265fb435b57d03508bfb4db47e75e6d404e47ad4d0755d539d86f54cc","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"529a9a959ffd4366507a0ad5f05ae111601f91fb1a8f93c1826313a068b20af4","TEST_MAPPING":"0b1bb3633c893c6818637971ced42349d631558a5a0dd961dadf0851d2a7050b","android_impl.bp.fragment":"0e6ba30b8dfb5ac9264fc817ed88cb6be0aecc6cd6ca3529cab6c00e24e3cc1b","benches/value.rs":"384a0d275f1a51798fa50b8814eaffd04d82959c3d4fbb1a5396316ac19ea512","cargo_embargo.json":"58a279782543521e3d42a11f8103a9061bd98a558c55dc2bd83ff504313cea84","patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch":"d1d5b5125a828cf8228733bc862b4249fb1dd133cef67fb2eef911ca60c083d9","patches/rules.mk.diff":"b1903a2e732bd7be430fc3fa75a3a84ac71e7f8a009169b58ccba8bd495f047a","rules.mk":"5de4d2344b08632b2edd4888eb40c33f5f2df6acc02cf84d2d6984811d409e28","src/__private_api.rs":"0789ef184fa5395965506963763b0a51dfd0137a9ebef20af272acf51ef62d79","src/android_logger.rs":"2947d40a5ba367f82d6d16134f6500b5a640ca54f35e2ea1132cd7e6aabe05c0","src/kv/error.rs":"6a78c87679603250deb04078e12187e8c0f4bb201109de8b35d029d921ec4e14","src/kv/key.rs":"d57ff689a01542f8332861853408c6ab75cc074857a353f92d5f93e0caa9cdea","src/kv/mod.rs":"e00dd746c7a5af3d12e4f8bc3db10c1122b7d20fa84233b98085662e6e0851b1","src/kv/source.rs":"a0ea12425d42dd6d9f9850d66d02e26ea1d40dbe2cb4bfdfe8716f17d6cac3b2","src/kv/value.rs":"57b5fe671bd2080817823a34ac1c797305d64b07a950ea20ab930f22ebb827b2","src/lib.rs":"69c84c20c116e9dfb2be9c7b58f377cca27fb0c1e32910bd0fba6a3be803fb9b","src/macros.rs":"7f9931177a095ee937f6ef685de7b1acf925f2b99edd1dd52a1738291084b812","src/serde.rs":"9158d67bc97a52a1adb70043b62e461c453cd3df934be125314c5c143d136ec5","triagebot.toml":"26772e45fe413284e600760236cfd60cb726b7ae47fde22f2f9c474bd27ff8b0"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"f68944b3f60f392fbc0c12c427c0a68259baace4d96c658b875ad6f08c8047c7","Android.bp":"2aeb896749245e6b1564e235ee18108e3f5c7c65d9079b09961f7c06589aa468","CHANGELOG.md":"3548dee9b4e4bbd11ad6680f5c89293c9c21972b2bd27a41081011c03d97e63b","Cargo.toml":"9fa4a0bf4d1f95d48e533ce1a848d52b609a002070b58d5decc2ad95c5fe8f41","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"16693a68efd65bc6a9df3448c8f7ee6745418c73faff4ec4d443648c04285fa4","METADATA":"d8b41bd526a765e924fd33ca5788e597979d4b296249705294d6717856c40782","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"6ac60ad741da342e5268a81306dc526cdcfb6dc5a90e1a4cb3609bf61728842f","TEST_MAPPING":"0b1bb3633c893c6818637971ced42349d631558a5a0dd961dadf0851d2a7050b","android_impl.bp.fragment":"0e6ba30b8dfb5ac9264fc817ed88cb6be0aecc6cd6ca3529cab6c00e24e3cc1b","benches/value.rs":"384a0d275f1a51798fa50b8814eaffd04d82959c3d4fbb1a5396316ac19ea512","cargo_embargo.json":"58a279782543521e3d42a11f8103a9061bd98a558c55dc2bd83ff504313cea84","patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch":"d1d5b5125a828cf8228733bc862b4249fb1dd133cef67fb2eef911ca60c083d9","patches/rules.mk.diff":"b1903a2e732bd7be430fc3fa75a3a84ac71e7f8a009169b58ccba8bd495f047a","rules.mk":"5de4d2344b08632b2edd4888eb40c33f5f2df6acc02cf84d2d6984811d409e28","src/__private_api.rs":"0789ef184fa5395965506963763b0a51dfd0137a9ebef20af272acf51ef62d79","src/android_logger.rs":"2947d40a5ba367f82d6d16134f6500b5a640ca54f35e2ea1132cd7e6aabe05c0","src/kv/error.rs":"6a78c87679603250deb04078e12187e8c0f4bb201109de8b35d029d921ec4e14","src/kv/key.rs":"826900e7d97eacbf5a8e478faaf2a637ce6b2813a12ba998a3fa0ffdc1713a32","src/kv/mod.rs":"0d7204886b190af0e48e24d7bebb8367ae5b97b1ecd258aa60c2f3f0319a5086","src/kv/source.rs":"a0ea12425d42dd6d9f9850d66d02e26ea1d40dbe2cb4bfdfe8716f17d6cac3b2","src/kv/value.rs":"74d6caf29ab11d7dc95e7343bae30ce7ddbd2dbdc2b930272c477038d06187bc","src/lib.rs":"b0c88121245456890464b70a5bd0690f2f47c4b8824eda2d394a41a3309bed16","src/macros.rs":"7f9931177a095ee937f6ef685de7b1acf925f2b99edd1dd52a1738291084b812","src/serde.rs":"e3bd5e114c74855c6dfd5c9c0a803ca4daa89132c59ce5e4a6d95beba2e7e7f9","triagebot.toml":"26772e45fe413284e600760236cfd60cb726b7ae47fde22f2f9c474bd27ff8b0"}}
\ No newline at end of file

crates/log/.cargo-checksum.json

diff --git a/crates/log/.cargo-checksum.json b/crates/log/.cargo-checksum.json
index 42ea021..bec4164 100644
--- a/crates/log/.cargo-checksum.json
+++ b/crates/log/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"df7d7ea4256611dd5e3bf160e39bb3f8b665c6805ae47fdbf28acf9f77245ffd","Cargo.toml":"2161251dd0dfbea680a9d5fd762973e343fc5215794681c5ffd641faab9a4e4c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"a23bbe55ac94081711c081a63df10d324a8a26f4b836952cb3c45c9318a03152","benches/value.rs":"b613ff353d3cf0ef8cb98e4ca461ea929b8ba553fe299f2eb2942d77a5b1b6a0","src/__private_api.rs":"da677f1e29e3cb135c971247031bc0eb20324294ab5c1c74c5118f87e45518ae","src/kv/error.rs":"6dae12424164c33b93915f5e70bd6d99d616c969c8bfb543806721dd9b423981","src/kv/key.rs":"9439e91c3ab3f9574a6a11a0347c7b63fdf1652384a6b28411136e4373de2970","src/kv/mod.rs":"3521a5bcfd7f92dcfac6c3c948020d686fee696596c566333a27edbbcc8a4ea8","src/kv/source.rs":"73fbc180c824072d86f1f41f8c59c014db1d8988a86be38a9128d67d6aab06a5","src/kv/value.rs":"0aade52b8e3523a17d6114f8b664793862032a94ea1ee2a4f12a20dd729b92d4","src/lib.rs":"55c32130cd8b99cde2ea962a403cdade52d20e80088357ba2784ee53b2eb9a2c","src/macros.rs":"dfb98017d5f205fec632069ab857a18661d6d563cf5162eeef64d367cc3ad7f5","src/serde.rs":"35f520f62fdba0216ccee33e5b66ad8f81dee3af5b65b824f1816180c9350df5","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"aaf53a73b9699e3fd9b96bed7811be104fe7fa3e4404a88bf1052096992e014e","Cargo.toml":"117b873259249dd3aa75219cfa9b2696af367602333722e10b19043642d8b58d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"00eda7b9168a6cb515bdd3d31be65c1988f77d3443fd9e093161df15d328208e","benches/value.rs":"b613ff353d3cf0ef8cb98e4ca461ea929b8ba553fe299f2eb2942d77a5b1b6a0","src/__private_api.rs":"da677f1e29e3cb135c971247031bc0eb20324294ab5c1c74c5118f87e45518ae","src/kv/error.rs":"6dae12424164c33b93915f5e70bd6d99d616c969c8bfb543806721dd9b423981","src/kv/key.rs":"e63fd5b22b62f2bfacbd77fe0913c3667ed39de5eeb6d93292b77b1b1de4208a","src/kv/mod.rs":"9f4e230cd3b314ad2a7351193109d4e6ca043ed88c0948e6d64076782538b671","src/kv/source.rs":"73fbc180c824072d86f1f41f8c59c014db1d8988a86be38a9128d67d6aab06a5","src/kv/value.rs":"b52f71603e0fdbaa1e83676882aa690dfdb7f79950c8eb1205e0e5141bbce483","src/lib.rs":"254e0fe88301aebe218737bd40552ea730a3ea4a3483733b5741ca813b886eaf","src/macros.rs":"dfb98017d5f205fec632069ab857a18661d6d563cf5162eeef64d367cc3ad7f5","src/serde.rs":"1b261f9df7a97ace311e9ab9b6c951a17ff7e39227a352c7e09cb2731efd9a2f","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"}
\ No newline at end of file

crates/log/Android.bp

diff --git a/crates/log/Android.bp b/crates/log/Android.bp
index 852bf3b..2fe4ffd 100644
--- a/crates/log/Android.bp
+++ b/crates/log/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "log",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.4.22",
+    cargo_pkg_version: "0.4.25",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: ["std"],
@@ -48,7 +48,7 @@
     host_supported: true,
     crate_name: "log",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.4.22",
+    cargo_pkg_version: "0.4.25",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [
@@ -82,7 +82,7 @@
     host_supported: true,
     crate_name: "log",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.4.22",
+    cargo_pkg_version: "0.4.25",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [
@@ -115,7 +115,7 @@
     name: "liblog_rust_nostd",
     crate_name: "log",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.4.22",
+    cargo_pkg_version: "0.4.25",
     crate_root: "src/lib.rs",
     edition: "2021",
     apex_available: [

crates/log/CHANGELOG.md

diff --git a/crates/log/CHANGELOG.md b/crates/log/CHANGELOG.md
index 2c89834..6ade6b2 100644
--- a/crates/log/CHANGELOG.md
+++ b/crates/log/CHANGELOG.md
@@ -2,6 +2,46 @@
 
 ## [Unreleased]
 
+## [0.4.25] - 2025-01-14
+
+## What's Changed
+* Revert loosening of kv cargo features by @KodrAus in https://github.com/rust-lang/log/pull/662
+
+
+**Full Changelog**: https://github.com/rust-lang/log/compare/0.4.24...0.4.25
+
+## [0.4.24] - 2025-01-11
+
+## What's Changed
+* Fix up kv feature activation by @KodrAus in https://github.com/rust-lang/log/pull/659
+
+
+**Full Changelog**: https://github.com/rust-lang/log/compare/0.4.23...0.4.24
+
+## [0.4.23] - 2025-01-10 (yanked)
+
+## What's Changed
+* Fix some typos by @Kleinmarb in https://github.com/rust-lang/log/pull/637
+* Add logforth to implementation by @tisonkun in https://github.com/rust-lang/log/pull/638
+* Add `spdlog-rs` link to README by @SpriteOvO in https://github.com/rust-lang/log/pull/639
+* Add correct lifetime to kv::Value::to_borrowed_str by @stevenroose in https://github.com/rust-lang/log/pull/643
+* docs: Add logforth as an impl by @tisonkun in https://github.com/rust-lang/log/pull/642
+* Add clang_log implementation by @DDAN-17 in https://github.com/rust-lang/log/pull/646
+* Bind lifetimes of &str returned from Key by the lifetime of 'k rather than the lifetime of the Key struct by @gbbosak in https://github.com/rust-lang/log/pull/648
+* Fix up key lifetimes and add method to try get a borrowed key by @KodrAus in https://github.com/rust-lang/log/pull/653
+* Add Ftail implementation by @tjardoo in https://github.com/rust-lang/log/pull/652
+
+## New Contributors
+* @Kleinmarb made their first contribution in https://github.com/rust-lang/log/pull/637
+* @tisonkun made their first contribution in https://github.com/rust-lang/log/pull/638
+* @SpriteOvO made their first contribution in https://github.com/rust-lang/log/pull/639
+* @stevenroose made their first contribution in https://github.com/rust-lang/log/pull/643
+* @DDAN-17 made their first contribution in https://github.com/rust-lang/log/pull/646
+* @gbbosak made their first contribution in https://github.com/rust-lang/log/pull/648
+* @tjardoo made their first contribution in https://github.com/rust-lang/log/pull/652
+
+**Full Changelog**: https://github.com/rust-lang/log/compare/0.4.22...0.4.23
+
 ## [0.4.22] - 2024-06-27
 
 ## What's Changed
@@ -64,7 +104,7 @@
 
 ## [0.4.18] - 2023-05-28
 
-* fix markdown links (again) by @hellow554 in https://github.com/rust-lang/log/pull/513
+* fix Markdown links (again) by @hellow554 in https://github.com/rust-lang/log/pull/513
 * add cargo doc to workflow by @hellow554 in https://github.com/rust-lang/log/pull/515
 * Apply Clippy lints by @hellow554 in https://github.com/rust-lang/log/pull/516
 * Replace ad-hoc eq_ignore_ascii_case with slice::eq_ignore_ascii_case by @glandium in https://github.com/rust-lang/log/pull/519
@@ -99,7 +139,7 @@
 * Improvements to test coverage.
 * Improvements to documentation.
 * Add key-value support to the `log!` macros.
-* Tighten `kv_unstable` internal dependencies so they don't bump past their current alpha.
+* Tighten `kv_unstable` internal dependencies, so they don't bump past their current alpha.
 * Add a simple visit API to `kv_unstable`.
 * Support `NonZero*` integers as values in structured logging
 * Support static strings as keys in structured logging
@@ -149,7 +189,7 @@
 
 ### Fixed
 
-* Fixed the `log!` macros so they work in expression context (this regressed in `0.4.9`, which has been yanked).
+* Fixed the `log!` macros, so they work in expression context (this regressed in `0.4.9`, which has been yanked).
 
 ## [0.4.9] - 2019-12-12 (yanked)
 
@@ -260,7 +300,7 @@
 * The `logger` free function returns a reference to the logger implementation. This, along with the
     ability to construct `Record`s, makes it possible to bridge from another logging framework to
     this one without digging into the private internals of the crate. The standard `error!` `warn!`,
-    etc, macros now exclusively use the public API of the crate rather than "secret" internal APIs.
+    etc., macros now exclusively use the public API of the crate rather than "secret" internal APIs.
 * `Log::flush` has been added to allow crates to tell the logging implementation to ensure that all
     "in flight" log events have been persisted. This can be used, for example, just before an
     application exits to ensure that asynchronous log sinks finish their work.
@@ -298,7 +338,11 @@
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.21...HEAD
+[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.25...HEAD
+[0.4.25]: https://github.com/rust-lang/log/compare/0.4.24...0.4.25
+[0.4.24]: https://github.com/rust-lang/log/compare/0.4.23...0.4.24
+[0.4.23]: https://github.com/rust-lang/log/compare/0.4.22...0.4.23
+[0.4.22]: https://github.com/rust-lang/log/compare/0.4.21...0.4.22
 [0.4.21]: https://github.com/rust-lang/log/compare/0.4.20...0.4.21
 [0.4.20]: https://github.com/rust-lang-nursery/log/compare/0.4.19...0.4.20
 [0.4.19]: https://github.com/rust-lang-nursery/log/compare/0.4.18...0.4.19

crates/log/Cargo.toml

diff --git a/crates/log/Cargo.toml b/crates/log/Cargo.toml
index 313a005..a4aba7f 100644
--- a/crates/log/Cargo.toml
+++ b/crates/log/Cargo.toml
@@ -13,9 +13,15 @@
 edition = "2021"
 rust-version = "1.60.0"
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 authors = ["The Rust Project Developers"]
+build = false
 exclude = ["rfcs/**/*"]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 A lightweight logging facade for Rust
 """
@@ -35,15 +41,13 @@
     "kv_serde",
 ]
 
-[[test]]
-name = "integration"
-path = "tests/integration.rs"
-harness = false
+[lib]
+name = "log"
+path = "src/lib.rs"
 
-[[test]]
-name = "macros"
-path = "tests/macros.rs"
-harness = true
+[[bench]]
+name = "value"
+path = "benches/value.rs"
 
 [dependencies.serde]
 version = "1.0"

crates/log/METADATA

diff --git a/crates/log/METADATA b/crates/log/METADATA
index 36ec7a6..4d8a340 100644
--- a/crates/log/METADATA
+++ b/crates/log/METADATA
@@ -1,17 +1,17 @@
 name: "log"
 description: "A lightweight logging facade for Rust"
 third_party {
-  version: "0.4.22"
+  version: "0.4.25"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 11
-    day: 1
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/log"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/log/log-0.4.22.crate"
-    version: "0.4.22"
+    value: "https://static.crates.io/crates/log/log-0.4.25.crate"
+    version: "0.4.25"
   }
 }

crates/log/README.md

diff --git a/crates/log/README.md b/crates/log/README.md
index d4a08b1..f8b5449 100644
--- a/crates/log/README.md
+++ b/crates/log/README.md
@@ -71,9 +71,13 @@
     * [`call_logger`](https://docs.rs/call_logger/*/call_logger/)
     * [`std-logger`](https://docs.rs/std-logger/*/std_logger/)
     * [`structured-logger`](https://docs.rs/structured-logger/latest/structured_logger/)
+    * [`clang_log`](https://docs.rs/clang_log/latest/clang_log)
+    * [`ftail`](https://docs.rs/ftail/latest/ftail/)
 * Complex configurable frameworks:
     * [`log4rs`](https://docs.rs/log4rs/*/log4rs/)
+    * [`logforth`](https://docs.rs/logforth/*/logforth/)
     * [`fern`](https://docs.rs/fern/*/fern/)
+    * [`spdlog-rs`](https://docs.rs/spdlog-rs/*/spdlog/)
 * Adaptors for other facilities:
     * [`syslog`](https://docs.rs/syslog/*/syslog/)
     * [`systemd-journal-logger`](https://docs.rs/systemd-journal-logger/*/systemd_journal_logger/)

crates/log/src/kv/key.rs

diff --git a/crates/log/src/kv/key.rs b/crates/log/src/kv/key.rs
index 9a64b95..6e00a2c 100644
--- a/crates/log/src/kv/key.rs
+++ b/crates/log/src/kv/key.rs
@@ -35,6 +35,7 @@
 // If a new field (such as an optional index) is added to the key they must not affect comparison
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Key<'k> {
+    // NOTE: This may become `Cow<'k, str>`
     key: &'k str,
 }
 
@@ -45,9 +46,23 @@
     }
 
     /// Get a borrowed string from this key.
+    ///
+    /// The lifetime of the returned string is bound to the borrow of `self` rather
+    /// than to `'k`.
     pub fn as_str(&self) -> &str {
         self.key
     }
+
+    /// Try get a borrowed string for the lifetime `'k` from this key.
+    ///
+    /// If the key is a borrow of a longer lived string, this method will return `Some`.
+    /// If the key is internally buffered, this method will return `None`.
+    pub fn to_borrowed_str(&self) -> Option<&'k str> {
+        // NOTE: If the internals of `Key` support buffering this
+        // won't be unconditionally `Some` anymore. We want to keep
+        // this option open
+        Some(self.key)
+    }
 }
 
 impl<'k> fmt::Display for Key<'k> {
@@ -140,4 +155,9 @@
     fn key_from_string() {
         assert_eq!("a key", Key::from_str("a key").as_str());
     }
+
+    #[test]
+    fn key_to_borrowed() {
+        assert_eq!("a key", Key::from_str("a key").to_borrowed_str().unwrap());
+    }
 }

crates/log/src/kv/mod.rs

diff --git a/crates/log/src/kv/mod.rs b/crates/log/src/kv/mod.rs
index 1ccb825..8c71e07 100644
--- a/crates/log/src/kv/mod.rs
+++ b/crates/log/src/kv/mod.rs
@@ -29,7 +29,7 @@
 //! info!(a = 1; "Something of interest");
 //! ```
 //!
-//! Key-values support the same shorthand identifer syntax as `format_args`:
+//! Key-values support the same shorthand identifier syntax as `format_args`:
 //!
 //! ```
 //! # use log::info;

crates/log/src/kv/value.rs

diff --git a/crates/log/src/kv/value.rs b/crates/log/src/kv/value.rs
index 1511dd0..ef94298 100644
--- a/crates/log/src/kv/value.rs
+++ b/crates/log/src/kv/value.rs
@@ -101,7 +101,7 @@
 /// Values provide a number of ways to be serialized.
 ///
 /// For basic types the [`Value::visit`] method can be used to extract the
-/// underlying typed value. However this is limited in the amount of types
+/// underlying typed value. However, this is limited in the amount of types
 /// supported (see the [`VisitValue`] trait methods).
 ///
 /// For more complex types one of the following traits can be used:
@@ -373,14 +373,14 @@
 ];
 
 impl<'v> Value<'v> {
-    /// Try convert this value into an error.
+    /// Try to convert this value into an error.
     #[cfg(feature = "kv_std")]
     pub fn to_borrowed_error(&self) -> Option<&(dyn std::error::Error + 'static)> {
         self.inner.to_borrowed_error()
     }
 
-    /// Try convert this value into a borrowed string.
-    pub fn to_borrowed_str(&self) -> Option<&str> {
+    /// Try to convert this value into a borrowed string.
+    pub fn to_borrowed_str(&self) -> Option<&'v str> {
         self.inner.to_borrowed_str()
     }
 }
@@ -725,7 +725,7 @@
 
     1. Conversions should always produce the same results. If a conversion here returns `Some`, then
        the same `value_bag`-based conversion must also. Of particular note here are floats to ints; they're
-       based on the standard library's `TryInto` conversions, which need to be convert to `i32` or `u32`,
+       based on the standard library's `TryInto` conversions, which need to be converted to `i32` or `u32`,
        and then to `f64`.
     2. VisitValues should always be called in the same way. If a particular type of value calls `visit_i64`,
        then the same `value_bag`-based visitor must also.

crates/log/src/lib.rs

diff --git a/crates/log/src/lib.rs b/crates/log/src/lib.rs
index 799b88e..6b4604d 100644
--- a/crates/log/src/lib.rs
+++ b/crates/log/src/lib.rs
@@ -143,8 +143,11 @@
 //!     * [flexi_logger]
 //!     * [call_logger]
 //!     * [structured-logger]
+//!     * [clang_log]
+//!     * [ftail]
 //! * Complex configurable frameworks:
 //!     * [log4rs]
+//!     * [logforth]
 //!     * [fern]
 //! * Adaptors for other facilities:
 //!     * [syslog]
@@ -321,6 +324,7 @@
 //! [syslog]: https://docs.rs/syslog/*/syslog/
 //! [slog-stdlog]: https://docs.rs/slog-stdlog/*/slog_stdlog/
 //! [log4rs]: https://docs.rs/log4rs/*/log4rs/
+//! [logforth]: https://docs.rs/logforth/*/logforth/
 //! [fern]: https://docs.rs/fern/*/fern/
 //! [systemd-journal-logger]: https://docs.rs/systemd-journal-logger/*/systemd_journal_logger/
 //! [android_log]: https://docs.rs/android_log/*/android_log/
@@ -332,11 +336,13 @@
 //! [logcontrol-log]: https://docs.rs/logcontrol-log/*/logcontrol_log/
 //! [log_err]: https://docs.rs/log_err/*/log_err/
 //! [log-reload]: https://docs.rs/log-reload/*/log_reload/
+//! [clang_log]: https://docs.rs/clang_log/latest/clang_log
+//! [ftail]: https://docs.rs/ftail/latest/ftail
 
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/log/0.4.22"
+    html_root_url = "https://docs.rs/log/0.4.25"
 )]
 #![warn(missing_docs)]
 #![deny(missing_debug_implementations, unconditional_recursion)]

crates/log/src/serde.rs

diff --git a/crates/log/src/serde.rs b/crates/log/src/serde.rs
index 63bef7f..db73239 100644
--- a/crates/log/src/serde.rs
+++ b/crates/log/src/serde.rs
@@ -11,7 +11,7 @@
 use std::fmt;
 use std::str::{self, FromStr};
 
-// The Deserialize impls are handwritten to be case insensitive using FromStr.
+// The Deserialize impls are handwritten to be case-insensitive using FromStr.
 
 impl Serialize for Level {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -57,7 +57,7 @@
             where
                 E: Error,
             {
-                // Case insensitive.
+                // Case-insensitive.
                 FromStr::from_str(s).map_err(|_| Error::unknown_variant(s, &LOG_LEVEL_NAMES[1..]))
             }
 
@@ -152,7 +152,7 @@
             where
                 E: Error,
             {
-                // Case insensitive.
+                // Case-insensitive.
                 FromStr::from_str(s).map_err(|_| Error::unknown_variant(s, &LOG_LEVEL_NAMES))
             }
 

crates/pest_generator/.android-checksum.json

diff --git a/crates/pest_generator/.android-checksum.json b/crates/pest_generator/.android-checksum.json
index a31cbc9..9258c0b 100644
--- a/crates/pest_generator/.android-checksum.json
+++ b/crates/pest_generator/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"8711726461f3c9437e9eee9d36ed82d3974bc87116897dfed6a0cd2e83355291","Android.bp":"f7b74d3f7faa345bf489d5c4f04c0fe9f007794aa65863aa9c46b6506d86d8b9","Cargo.toml":"82a4dbe24b3fa489496018714d24c061558470c1a3caf5ac62d2b46c039c2cd1","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"d1f5f3b6e746328d97d9b50ac450a8cd127f547a0719e79efd26a5998431fa93","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","_README.md":"6b973bfc5a49b890c6c47d4705f7f6ae59ec30552d0c3fd0fccf77bb1c694157","cargo_embargo.json":"3ca1544e82177080d7388ff17069a5f1766ba92138a9e2c502c156a296f418d8","src/docs.rs":"fb624d5b414372276e70538ff7b9dfa79bdede5bbd9b4609a2b2456c428ae3e6","src/generator.rs":"f3f7e4a1a758d50d4d92062c754de222f3f16f7af0d49acc6e5847a25890004d","src/lib.rs":"8975d84fea527807a5ec8e9f88ce0790df86b1903175fb7cb51d1760d73a4727","src/macros.rs":"7bb24e482baae1b7f5a7845da000c2fb7a9417a802cdc27eb0de393efc73612c","tests/base.pest":"842b80623c38d4c5221105126135fc42fa7c8a9b631677d6f3013068370dc149","tests/test.pest":"84526a2b662665a3ed83baf588dbeaf8e92e1898b904d4c69f7c16d7b1c399ac"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"3ae08460988dbccb11757257a8b143f85c92286fdeda0c4d056fadeae4044337","Android.bp":"6649afc7911a5c155d85ee67c65c0a04cf71f59f87ca474a9c733d3d261b3656","Cargo.toml":"2cda83978ec6ff9cca0e36dd6b9ee88dfbf69589f73e219496e62fb585045f29","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"aa4e506347229c5caedc047f7b8382fa4aa66a05847478973ac57187985e082d","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","_README.md":"6b973bfc5a49b890c6c47d4705f7f6ae59ec30552d0c3fd0fccf77bb1c694157","cargo_embargo.json":"3ca1544e82177080d7388ff17069a5f1766ba92138a9e2c502c156a296f418d8","src/docs.rs":"bf0ca813afd16b6f3f4ae9bc6818f389bad0773249081895225b85bef2fea208","src/generator.rs":"c3df900c8448042d2011c08cf852480e8ff8a31c423c656f3df7500145be6d17","src/lib.rs":"7ff0e9dfe50cacb698a6b1c5e8e83d1b9aea42e9c367e4a515e1255a398245e1","src/macros.rs":"7bb24e482baae1b7f5a7845da000c2fb7a9417a802cdc27eb0de393efc73612c","src/parse_derive.rs":"b49de93f401c13928c662b0436ae7f4d08eb9af11139a6ee7b23fd400215c7eb","tests/base.pest":"842b80623c38d4c5221105126135fc42fa7c8a9b631677d6f3013068370dc149","tests/test.pest":"84526a2b662665a3ed83baf588dbeaf8e92e1898b904d4c69f7c16d7b1c399ac"}}
\ No newline at end of file

crates/pest_generator/.cargo-checksum.json

diff --git a/crates/pest_generator/.cargo-checksum.json b/crates/pest_generator/.cargo-checksum.json
index 141f902..37ccbe3 100644
--- a/crates/pest_generator/.cargo-checksum.json
+++ b/crates/pest_generator/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"2936f4743aacfebd9824fb7fd69f6b03204312bd41153c2dcdfafa42ad0b05c1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"bde746653575153be4ae26ce950963ced5034449e352e60cfd8825260c666c16","src/docs.rs":"041b2c24377955dfdb6c29991b1f1dd7d7191431d8e5eaa245325253b250f702","src/generator.rs":"21dea1774cbca7c03bc7283157c449f1acad6ac387078bbaa3fd0d5134a5e4ab","src/lib.rs":"034624c6d8ad89b365f81ab04ad96a3d67909ba3485008355f21429a42b5e02c","src/macros.rs":"897d9004449b1c219f17c079630a790f3de1a27f61bc6a03cd777a163a6a1fba","tests/base.pest":"30f6965031bc52937114f60233a327e41ccc43429ae41a8e40c7b7c8006c466f","tests/test.pest":"f3fea8154a9a26c773ab8392685039d0d84bd845587bb2d42b970946f7967ee8"},"package":"2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"}
\ No newline at end of file
+{"files":{"Cargo.toml":"7947cbefca45a6924315a1a3495beb7cb7bd6ff7602c7f7ebf7ce110656c3028","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"bde746653575153be4ae26ce950963ced5034449e352e60cfd8825260c666c16","src/docs.rs":"47a5eaeeaa17efbf0537bd931eb388caa7a30cfd8504af0a90af8facee32e264","src/generator.rs":"bba65552cdf4816b7315cea607ea534d795e1ec239f1ab378cd85ef97a3ca335","src/lib.rs":"c515d9b83cd11ca3b7d9aecc3493adeb0e4eb370c0b274c4bcd1be20a48ff482","src/macros.rs":"897d9004449b1c219f17c079630a790f3de1a27f61bc6a03cd777a163a6a1fba","src/parse_derive.rs":"44fd33409a368c740d98e4eafba49db2da584dff9cda33b3de640b532a974f12","tests/base.pest":"30f6965031bc52937114f60233a327e41ccc43429ae41a8e40c7b7c8006c466f","tests/test.pest":"f3fea8154a9a26c773ab8392685039d0d84bd845587bb2d42b970946f7967ee8"},"package":"7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"}
\ No newline at end of file

crates/pest_generator/Android.bp

diff --git a/crates/pest_generator/Android.bp b/crates/pest_generator/Android.bp
index 5e5de3f..4d94340 100644
--- a/crates/pest_generator/Android.bp
+++ b/crates/pest_generator/Android.bp
@@ -18,7 +18,7 @@
     host_cross_supported: false,
     crate_name: "pest_generator",
     cargo_env_compat: true,
-    cargo_pkg_version: "2.7.6",
+    cargo_pkg_version: "2.7.15",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [

crates/pest_generator/Cargo.toml

diff --git a/crates/pest_generator/Cargo.toml b/crates/pest_generator/Cargo.toml
index 85dabac..2c3305f 100644
--- a/crates/pest_generator/Cargo.toml
+++ b/crates/pest_generator/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.61"
 name = "pest_generator"
-version = "2.7.6"
+version = "2.7.15"
 authors = ["Dragoș Tiselice <dragostiselice@gmail.com>"]
 description = "pest code generator"
 homepage = "https://pest.rs/"
@@ -28,11 +28,11 @@
 repository = "https://github.com/pest-parser/pest"
 
 [dependencies.pest]
-version = "2.7.6"
+version = "2.7.15"
 default-features = false
 
 [dependencies.pest_meta]
-version = "2.7.6"
+version = "2.7.15"
 
 [dependencies.proc-macro2]
 version = "1.0"
@@ -45,6 +45,7 @@
 
 [features]
 default = ["std"]
+export-internal = []
 grammar-extras = ["pest_meta/grammar-extras"]
 not-bootstrap-in-src = ["pest_meta/not-bootstrap-in-src"]
 std = ["pest/std"]

crates/pest_generator/METADATA

diff --git a/crates/pest_generator/METADATA b/crates/pest_generator/METADATA
index 331a5f5..b64d063 100644
--- a/crates/pest_generator/METADATA
+++ b/crates/pest_generator/METADATA
@@ -1,17 +1,17 @@
 name: "pest_generator"
 description: "pest code generator"
 third_party {
-  version: "2.7.6"
+  version: "2.7.15"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 5
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/pest_generator"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/pest_generator/pest_generator-2.7.6.crate"
-    version: "2.7.6"
+    value: "https://static.crates.io/crates/pest_generator/pest_generator-2.7.15.crate"
+    version: "2.7.15"
   }
 }

crates/pest_generator/src/docs.rs

diff --git a/crates/pest_generator/src/docs.rs b/crates/pest_generator/src/docs.rs
index ccc82e7..22f4f31 100644
--- a/crates/pest_generator/src/docs.rs
+++ b/crates/pest_generator/src/docs.rs
@@ -1,9 +1,13 @@
+//! Type and helper to collect the gramamr and rule documentation.
+
 use pest::iterators::Pairs;
 use pest_meta::parser::Rule;
 use std::collections::HashMap;
 
+/// Abstraction for the grammer and rule doc.
 #[derive(Debug)]
-pub(crate) struct DocComment {
+pub struct DocComment {
+    /// The grammar documentation is defined at the beginning of a file with //!.
     pub grammar_doc: String,
 
     /// HashMap for store all doc_comments for rules.
@@ -33,7 +37,7 @@
 /// grammar_doc = "This is a grammar doc"
 /// line_docs = { "foo": "line doc 1\nline doc 2", "bar": "line doc 3" }
 /// ```
-pub(crate) fn consume(pairs: Pairs<'_, Rule>) -> DocComment {
+pub fn consume(pairs: Pairs<'_, Rule>) -> DocComment {
     let mut grammar_doc = String::new();
 
     let mut line_docs: HashMap<String, String> = HashMap::new();

crates/pest_generator/src/generator.rs

diff --git a/crates/pest_generator/src/generator.rs b/crates/pest_generator/src/generator.rs
index 7a527c5..fd48ec9 100644
--- a/crates/pest_generator/src/generator.rs
+++ b/crates/pest_generator/src/generator.rs
@@ -7,6 +7,8 @@
 // option. All files in the project carrying such notice may not be copied,
 // modified, or distributed except according to those terms.
 
+//! Helpers to generate the code for the Parser `derive``.
+
 use std::path::PathBuf;
 
 use proc_macro2::TokenStream;
@@ -18,9 +20,12 @@
 use pest_meta::optimizer::*;
 
 use crate::docs::DocComment;
-use crate::ParsedDerive;
+use crate::parse_derive::ParsedDerive;
 
-pub(crate) fn generate(
+/// Generates the corresponding parser based based on the processed macro input. If `include_grammar`
+/// is set to true, it'll generate an explicit "include_str" statement (done in pest_derive, but
+/// turned off in the local bootstrap).
+pub fn generate(
     parsed_derive: ParsedDerive,
     paths: Vec<PathBuf>,
     rules: Vec<OptimizedRule>,
@@ -218,10 +223,17 @@
     });
 
     let grammar_doc = &doc_comment.grammar_doc;
-    let mut result = quote! {
-        #[doc = #grammar_doc]
-        #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
-        #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+    let mut result = if grammar_doc.is_empty() {
+        quote! {
+            #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
+            #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+        }
+    } else {
+        quote! {
+            #[doc = #grammar_doc]
+            #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
+            #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+        }
     };
     if non_exhaustive {
         result.append_all(quote! {
@@ -566,12 +578,42 @@
             }
         }
         #[cfg(feature = "grammar-extras")]
-        OptimizedExpr::NodeTag(expr, tag) => {
-            let expr = generate_expr(*expr);
-            quote! {
-                #expr.and_then(|state| state.tag_node(#tag))
+        OptimizedExpr::NodeTag(expr, tag) => match *expr {
+            OptimizedExpr::Opt(expr) => {
+                let expr = generate_expr(*expr);
+                quote! {
+                    state.optional(|state| {
+                        #expr.and_then(|state| state.tag_node(#tag))
+                    })
+                }
             }
-        }
+            OptimizedExpr::Rep(expr) => {
+                let expr = generate_expr(*expr);
+                quote! {
+                    state.sequence(|state| {
+                        state.optional(|state| {
+                            #expr.and_then(|state| {
+                                state.repeat(|state| {
+                                    state.sequence(|state| {
+                                        super::hidden::skip(
+                                            state
+                                        ).and_then(|state| {
+                                            #expr.and_then(|state| state.tag_node(#tag))
+                                        })
+                                    })
+                                })
+                            }).and_then(|state| state.tag_node(#tag))
+                        })
+                    })
+                }
+            }
+            expr => {
+                let expr = generate_expr(expr);
+                quote! {
+                    #expr.and_then(|state| state.tag_node(#tag))
+                }
+            }
+        },
     }
 }
 
@@ -721,12 +763,32 @@
             }
         }
         #[cfg(feature = "grammar-extras")]
-        OptimizedExpr::NodeTag(expr, tag) => {
-            let expr = generate_expr_atomic(*expr);
-            quote! {
-                #expr.and_then(|state| state.tag_node(#tag))
+        OptimizedExpr::NodeTag(expr, tag) => match *expr {
+            OptimizedExpr::Opt(expr) => {
+                let expr = generate_expr_atomic(*expr);
+
+                quote! {
+                    state.optional(|state| {
+                        #expr.and_then(|state| state.tag_node(#tag))
+                    })
+                }
             }
-        }
+            OptimizedExpr::Rep(expr) => {
+                let expr = generate_expr_atomic(*expr);
+
+                quote! {
+                    state.repeat(|state| {
+                        #expr.and_then(|state| state.tag_node(#tag))
+                    })
+                }
+            }
+            expr => {
+                let expr = generate_expr_atomic(expr);
+                quote! {
+                    #expr.and_then(|state| state.tag_node(#tag))
+                }
+            }
+        },
     }
 }
 
@@ -811,6 +873,41 @@
     }
 
     #[test]
+    fn rule_empty_doc() {
+        let rules = vec![OptimizedRule {
+            name: "f".to_owned(),
+            ty: RuleType::Normal,
+            expr: OptimizedExpr::Ident("g".to_owned()),
+        }];
+
+        let mut line_docs = HashMap::new();
+        line_docs.insert("f".to_owned(), "This is rule comment".to_owned());
+
+        let doc_comment = &DocComment {
+            grammar_doc: "".to_owned(),
+            line_docs,
+        };
+
+        assert_eq!(
+            generate_enum(&rules, doc_comment, false, false).to_string(),
+            quote! {
+                #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
+                #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+                pub enum Rule {
+                    #[doc = "This is rule comment"]
+                    r#f
+                }
+                impl Rule {
+                    pub fn all_rules() -> &'static [Rule] {
+                        &[Rule::r#f]
+                    }
+                }
+            }
+            .to_string()
+        );
+    }
+
+    #[test]
     fn sequence() {
         let expr = OptimizedExpr::Seq(
             Box::new(OptimizedExpr::Str("a".to_owned())),

crates/pest_generator/src/lib.rs

diff --git a/crates/pest_generator/src/lib.rs b/crates/pest_generator/src/lib.rs
index cbd13ea..7277c75 100644
--- a/crates/pest_generator/src/lib.rs
+++ b/crates/pest_generator/src/lib.rs
@@ -26,14 +26,29 @@
 use std::io::{self, Read};
 use std::path::Path;
 
+use generator::generate;
 use proc_macro2::TokenStream;
-use syn::{Attribute, DeriveInput, Expr, ExprLit, Generics, Ident, Lit, Meta};
+use syn::DeriveInput;
 
 #[macro_use]
 mod macros;
+
+#[cfg(feature = "export-internal")]
+pub mod docs;
+#[cfg(not(feature = "export-internal"))]
 mod docs;
+
+#[cfg(feature = "export-internal")]
+pub mod generator;
+#[cfg(not(feature = "export-internal"))]
 mod generator;
 
+#[cfg(feature = "export-internal")]
+pub mod parse_derive;
+#[cfg(not(feature = "export-internal"))]
+mod parse_derive;
+
+use crate::parse_derive::{parse_derive, GrammarSource};
 use pest_meta::parser::{self, rename_meta_rule, Rule};
 use pest_meta::{optimizer, unwrap_or_report, validator};
 
@@ -44,6 +59,7 @@
     let ast: DeriveInput = syn::parse2(input).unwrap();
     let (parsed_derive, contents) = parse_derive(ast);
 
+    // Grammar presented in a view of a string.
     let mut data = String::new();
     let mut paths = vec![];
 
@@ -86,6 +102,7 @@
         }
     }
 
+    // `Rule::grammar_rules` is taken from meta/srd/parser.rs.
     let pairs = match parser::parse(Rule::grammar_rules, &data) {
         Ok(pairs) => pairs,
         Err(error) => panic!("error parsing \n{}", error.renamed_rules(rename_meta_rule)),
@@ -96,7 +113,7 @@
     let ast = unwrap_or_report(parser::consume_rules(pairs));
     let optimized = optimizer::optimize(ast);
 
-    generator::generate(
+    generate(
         parsed_derive,
         paths,
         optimized,
@@ -113,160 +130,8 @@
     Ok(string)
 }
 
-#[derive(Debug, PartialEq)]
-enum GrammarSource {
-    File(String),
-    Inline(String),
-}
-
-struct ParsedDerive {
-    pub(crate) name: Ident,
-    pub(crate) generics: Generics,
-    pub(crate) non_exhaustive: bool,
-}
-
-fn parse_derive(ast: DeriveInput) -> (ParsedDerive, Vec<GrammarSource>) {
-    let name = ast.ident;
-    let generics = ast.generics;
-
-    let grammar: Vec<&Attribute> = ast
-        .attrs
-        .iter()
-        .filter(|attr| {
-            let path = attr.meta.path();
-            path.is_ident("grammar") || path.is_ident("grammar_inline")
-        })
-        .collect();
-
-    if grammar.is_empty() {
-        panic!("a grammar file needs to be provided with the #[grammar = \"PATH\"] or #[grammar_inline = \"GRAMMAR CONTENTS\"] attribute");
-    }
-
-    let mut grammar_sources = Vec::with_capacity(grammar.len());
-    for attr in grammar {
-        grammar_sources.push(get_attribute(attr))
-    }
-
-    let non_exhaustive = ast
-        .attrs
-        .iter()
-        .any(|attr| attr.meta.path().is_ident("non_exhaustive"));
-
-    (
-        ParsedDerive {
-            name,
-            generics,
-            non_exhaustive,
-        },
-        grammar_sources,
-    )
-}
-
-fn get_attribute(attr: &Attribute) -> GrammarSource {
-    match &attr.meta {
-        Meta::NameValue(name_value) => match &name_value.value {
-            Expr::Lit(ExprLit {
-                lit: Lit::Str(string),
-                ..
-            }) => {
-                if name_value.path.is_ident("grammar") {
-                    GrammarSource::File(string.value())
-                } else {
-                    GrammarSource::Inline(string.value())
-                }
-            }
-            _ => panic!("grammar attribute must be a string"),
-        },
-        _ => panic!("grammar attribute must be of the form `grammar = \"...\"`"),
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use super::parse_derive;
-    use super::GrammarSource;
-
-    #[test]
-    fn derive_inline_file() {
-        let definition = "
-            #[other_attr]
-            #[grammar_inline = \"GRAMMAR\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (_, filenames) = parse_derive(ast);
-        assert_eq!(filenames, [GrammarSource::Inline("GRAMMAR".to_string())]);
-    }
-
-    #[test]
-    fn derive_ok() {
-        let definition = "
-            #[other_attr]
-            #[grammar = \"myfile.pest\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (parsed_derive, filenames) = parse_derive(ast);
-        assert_eq!(filenames, [GrammarSource::File("myfile.pest".to_string())]);
-        assert!(!parsed_derive.non_exhaustive);
-    }
-
-    #[test]
-    fn derive_multiple_grammars() {
-        let definition = "
-            #[other_attr]
-            #[grammar = \"myfile1.pest\"]
-            #[grammar = \"myfile2.pest\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (_, filenames) = parse_derive(ast);
-        assert_eq!(
-            filenames,
-            [
-                GrammarSource::File("myfile1.pest".to_string()),
-                GrammarSource::File("myfile2.pest".to_string())
-            ]
-        );
-    }
-
-    #[test]
-    fn derive_nonexhaustive() {
-        let definition = "
-            #[non_exhaustive]
-            #[grammar = \"myfile.pest\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (parsed_derive, filenames) = parse_derive(ast);
-        assert_eq!(filenames, [GrammarSource::File("myfile.pest".to_string())]);
-        assert!(parsed_derive.non_exhaustive);
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar attribute must be a string")]
-    fn derive_wrong_arg() {
-        let definition = "
-            #[other_attr]
-            #[grammar = 1]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        parse_derive(ast);
-    }
-
-    #[test]
-    #[should_panic(
-        expected = "a grammar file needs to be provided with the #[grammar = \"PATH\"] or #[grammar_inline = \"GRAMMAR CONTENTS\"] attribute"
-    )]
-    fn derive_no_grammar() {
-        let definition = "
-            #[other_attr]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        parse_derive(ast);
-    }
 
     #[doc = "Matches dar\n\nMatch dar description\n"]
     #[test]

crates/pest_generator/src/parse_derive.rs

diff --git a/crates/pest_generator/src/parse_derive.rs b/crates/pest_generator/src/parse_derive.rs
new file mode 100644
index 0000000..52374c2
--- /dev/null
+++ b/crates/pest_generator/src/parse_derive.rs
@@ -0,0 +1,172 @@
+// pest. The Elegant Parser
+// Copyright (c) 2018 Dragoș Tiselice
+//
+// Licensed under the Apache License, Version 2.0
+// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
+// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. All files in the project carrying such notice may not be copied,
+// modified, or distributed except according to those terms.
+
+//! Types and helpers to parse the input of the derive macro.
+
+use syn::{Attribute, DeriveInput, Expr, ExprLit, Generics, Ident, Lit, Meta};
+
+#[derive(Debug, PartialEq)]
+pub(crate) enum GrammarSource {
+    File(String),
+    Inline(String),
+}
+
+/// Parsed information of the derive and the attributes.
+pub struct ParsedDerive {
+    /// The identifier of the deriving struct, union, or enum.
+    pub name: Ident,
+    /// The generics of the deriving struct, union, or enum.
+    pub generics: Generics,
+    /// Indicates whether the 'non_exhaustive' attribute is added to the 'Rule' enum.
+    pub non_exhaustive: bool,
+}
+
+pub(crate) fn parse_derive(ast: DeriveInput) -> (ParsedDerive, Vec<GrammarSource>) {
+    let name = ast.ident;
+    let generics = ast.generics;
+
+    let grammar: Vec<&Attribute> = ast
+        .attrs
+        .iter()
+        .filter(|attr| {
+            let path = attr.meta.path();
+            path.is_ident("grammar") || path.is_ident("grammar_inline")
+        })
+        .collect();
+
+    if grammar.is_empty() {
+        panic!("a grammar file needs to be provided with the #[grammar = \"PATH\"] or #[grammar_inline = \"GRAMMAR CONTENTS\"] attribute");
+    }
+
+    let mut grammar_sources = Vec::with_capacity(grammar.len());
+    for attr in grammar {
+        grammar_sources.push(get_attribute(attr))
+    }
+
+    let non_exhaustive = ast
+        .attrs
+        .iter()
+        .any(|attr| attr.meta.path().is_ident("non_exhaustive"));
+
+    (
+        ParsedDerive {
+            name,
+            generics,
+            non_exhaustive,
+        },
+        grammar_sources,
+    )
+}
+
+fn get_attribute(attr: &Attribute) -> GrammarSource {
+    match &attr.meta {
+        Meta::NameValue(name_value) => match &name_value.value {
+            Expr::Lit(ExprLit {
+                lit: Lit::Str(string),
+                ..
+            }) => {
+                if name_value.path.is_ident("grammar") {
+                    GrammarSource::File(string.value())
+                } else {
+                    GrammarSource::Inline(string.value())
+                }
+            }
+            _ => panic!("grammar attribute must be a string"),
+        },
+        _ => panic!("grammar attribute must be of the form `grammar = \"...\"`"),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::parse_derive;
+    use super::GrammarSource;
+
+    #[test]
+    fn derive_inline_file() {
+        let definition = "
+            #[other_attr]
+            #[grammar_inline = \"GRAMMAR\"]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        let (_, filenames) = parse_derive(ast);
+        assert_eq!(filenames, [GrammarSource::Inline("GRAMMAR".to_string())]);
+    }
+
+    #[test]
+    fn derive_ok() {
+        let definition = "
+            #[other_attr]
+            #[grammar = \"myfile.pest\"]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        let (parsed_derive, filenames) = parse_derive(ast);
+        assert_eq!(filenames, [GrammarSource::File("myfile.pest".to_string())]);
+        assert!(!parsed_derive.non_exhaustive);
+    }
+
+    #[test]
+    fn derive_multiple_grammars() {
+        let definition = "
+            #[other_attr]
+            #[grammar = \"myfile1.pest\"]
+            #[grammar = \"myfile2.pest\"]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        let (_, filenames) = parse_derive(ast);
+        assert_eq!(
+            filenames,
+            [
+                GrammarSource::File("myfile1.pest".to_string()),
+                GrammarSource::File("myfile2.pest".to_string())
+            ]
+        );
+    }
+
+    #[test]
+    fn derive_nonexhaustive() {
+        let definition = "
+            #[non_exhaustive]
+            #[grammar = \"myfile.pest\"]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        let (parsed_derive, filenames) = parse_derive(ast);
+        assert_eq!(filenames, [GrammarSource::File("myfile.pest".to_string())]);
+        assert!(parsed_derive.non_exhaustive);
+    }
+
+    #[test]
+    #[should_panic(expected = "grammar attribute must be a string")]
+    fn derive_wrong_arg() {
+        let definition = "
+            #[other_attr]
+            #[grammar = 1]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        parse_derive(ast);
+    }
+
+    #[test]
+    #[should_panic(
+        expected = "a grammar file needs to be provided with the #[grammar = \"PATH\"] or #[grammar_inline = \"GRAMMAR CONTENTS\"] attribute"
+    )]
+    fn derive_no_grammar() {
+        let definition = "
+            #[other_attr]
+            pub struct MyParser<'a, T>;
+        ";
+        let ast = syn::parse_str(definition).unwrap();
+        parse_derive(ast);
+    }
+}

crates/pin-project-internal/.android-checksum.json

diff --git a/crates/pin-project-internal/.android-checksum.json b/crates/pin-project-internal/.android-checksum.json
index 48c545d..b11db02 100644
--- a/crates/pin-project-internal/.android-checksum.json
+++ b/crates/pin-project-internal/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"72357cc63191ee08a5b0618762ec8e8891ce388cae905fde83570c10f602cccc","Android.bp":"3533d3dd7e1d007b505a9373c39e98ca0cf0bd19d1f1e74697228e6018c5f00d","Cargo.toml":"024be39f9b133e5136089f6a76978396f18e9b8fde7c93b884b0457461c7ffbe","LICENSE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-APACHE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"1d74ba5ff73475c15592f18dcd2babc9557355d2385d420f7e8af42a2d5cf17f","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","TEST_MAPPING":"41fe943b979ce266ae7fc1df55149ddc11cbc7c5644d30182d11a108425021d0","cargo_embargo.json":"80e3af5ff1e9593338164130c83467447c80389394a58c3ef14791315d17439e","src/lib.rs":"ea8982b165e6aab19bb0b3c3d52bfc037804004a3a1dd1ed0fca828c147c4599","src/pin_project/args.rs":"3b38877c83ca01062994107aab2bbe3d1d1a76187582c2aec57217ed1ec7ec31","src/pin_project/attribute.rs":"0404ecc795315c9f86d08cb1c9621a1cf926edabab622530035f6ac162982eda","src/pin_project/derive.rs":"9b783607d297cc785d143ef99e10576c1da7589a19ffd06d985186849c31a1f0","src/pin_project/mod.rs":"01f6163c6ba46952480132371187b36d21485b5abf6e248378f4c604a597695b","src/pinned_drop.rs":"59dc074c679a8b34ba37c5b95fef42720be3361ba29fa07c7d6faa334967d471","src/utils.rs":"d253cb988f48cb986e8552da84019131af3e34038829ebc4e306a3a67f469193"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"ed8fc9686d5897aa34d55c8a30b09ed261e7cd5e0402225352ae172cd4645278","Android.bp":"b8087c576fe18444306d8a4d047f0eafad0f60621b7247f509f7e6e7a364c092","Cargo.toml":"12dca4958d418036cc6f7b74e3d6eda3072dbe6dd97e8d198b577cb5ffbd26f4","LICENSE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-APACHE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"c01c938d490481da3988cc1f7e48be3629e8a51468e9f6a95f4bef2fc63800db","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","TEST_MAPPING":"41fe943b979ce266ae7fc1df55149ddc11cbc7c5644d30182d11a108425021d0","cargo_embargo.json":"80e3af5ff1e9593338164130c83467447c80389394a58c3ef14791315d17439e","src/error.rs":"60b638a87addf641f4906be11b62a17116cde20b90c54392d7d4bc923c94de17","src/lib.rs":"cf6796491dad4753dc5689f3491909ca7aec9cae6ed1b9fad463ffe75c9b41a3","src/pin_project/args.rs":"e5b67ea2f75fb0e72a94b9c49dcd52c3594648d6a9f134b2d1b628faf3656255","src/pin_project/attribute.rs":"9ff2ee47a8b10ea81497f0b60157ca1252cd2a51530c3a27439f9b1c199104b5","src/pin_project/derive.rs":"2a5f4577effccb7c8f24dba04f060673b72010c4220f0a356cb3e3fd74bcc563","src/pin_project/mod.rs":"129a9f9e7e97452cc401fe2c917adf015c9c1b5d3197a376d0cbc00905628ecf","src/pinned_drop.rs":"b88105dad6ff320fbc2dd5f18553e4b22a1b9cd0ef2cf16bb54216a2145715fc","src/utils.rs":"ba9764d567c7d53e2f98ffd40e5432f19354d4d267f839853d9dbffae99a32ba"}}
\ No newline at end of file

crates/pin-project-internal/.cargo-checksum.json

diff --git a/crates/pin-project-internal/.cargo-checksum.json b/crates/pin-project-internal/.cargo-checksum.json
index 1b5977d..f3c66da 100644
--- a/crates/pin-project-internal/.cargo-checksum.json
+++ b/crates/pin-project-internal/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"5e768e7665606e603a7a85f9cc100a5898c94d3a12cd8e540d939e403c6c56eb","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/lib.rs":"19e5ab2e30ce5ca53e877826e4eadf7cb7311e72b568573be38ecc8c39556896","src/pin_project/args.rs":"68ded73aff6f7fa66b77581940b5e7ce4eaa71411c796668f165da863795cdf5","src/pin_project/attribute.rs":"0c18445c98a056e7cbf2b43b6442f3702ecece25686c4f4cecb96c76c3f9e22e","src/pin_project/derive.rs":"985efa8d4b87084ebe76fc4f0876ccf1a5c43c365bafee0992436f00a02e9109","src/pin_project/mod.rs":"83e6fc982a8c136811332512abc7d368e5d09b94f245de5d19490f835e85943a","src/pinned_drop.rs":"1d4cffdd4176a16c440a2a3a5039dfcf14ff42ef9e2aa7069134dfac8ba69658","src/utils.rs":"063cd0422c69afbbd0a0b532a46d463ead82c85637af55c6e2a72706a8f01eee"},"package":"4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"}
\ No newline at end of file
+{"files":{"Cargo.toml":"3ad69b309eac4c3d4777ee07b6d9edd434b07dd6f59dff87084c9275898c851c","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/error.rs":"5aaab68710be59753782cfbb81dd97d61fe2a2e1dace83dce42812d2a867681e","src/lib.rs":"a08d009a4da5a5acbf0f480565ff922e18f8a920bb89a1b7c1e0a7d2fa4f4de3","src/pin_project/args.rs":"a57bb3527fa1f8cd950f1a2471977fdbf885c07f8d4d75bec882f0786c95d1e5","src/pin_project/attribute.rs":"dad130b72abc3452277f68d915946045f4c809ea1115e974382814bf1a8e0ec0","src/pin_project/derive.rs":"ae89f175da94497fe309fecac354a656292bc30322be11bbd607ab445d618f81","src/pin_project/mod.rs":"cf033c5090a7002ab2c8c26876abb53ecaea5429fc40d984dbf8832150d18acd","src/pinned_drop.rs":"97795e2888b69d7f78a9fa64bbc4aa51aee6c8b5d5ecd37b58599ca24a3cde8b","src/utils.rs":"21b18168bf32587fe91ce802c266701854fee58d8a2d93ebbb143bdb72bdbb84"},"package":"d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"}
\ No newline at end of file

crates/pin-project-internal/Android.bp

diff --git a/crates/pin-project-internal/Android.bp b/crates/pin-project-internal/Android.bp
index 702a9b0..31a3ea5 100644
--- a/crates/pin-project-internal/Android.bp
+++ b/crates/pin-project-internal/Android.bp
@@ -17,7 +17,7 @@
     name: "libpin_project_internal",
     crate_name: "pin_project_internal",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.1.3",
+    cargo_pkg_version: "1.1.8",
     crate_root: "src/lib.rs",
     edition: "2021",
     rustlibs: [

crates/pin-project-internal/Cargo.toml

diff --git a/crates/pin-project-internal/Cargo.toml b/crates/pin-project-internal/Cargo.toml
index 1ab542e..6bbcbf9 100644
--- a/crates/pin-project-internal/Cargo.toml
+++ b/crates/pin-project-internal/Cargo.toml
@@ -13,10 +13,17 @@
 edition = "2021"
 rust-version = "1.56"
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.8"
+build = false
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 Implementation detail of the `pin-project` crate.
 """
+readme = false
 keywords = [
     "pin",
     "macros",
@@ -34,19 +41,147 @@
 targets = ["x86_64-unknown-linux-gnu"]
 
 [lib]
+name = "pin_project_internal"
+path = "src/lib.rs"
 proc-macro = true
 
 [dependencies.proc-macro2]
 version = "1.0.60"
 
 [dependencies.quote]
-version = "1"
+version = "1.0.25"
 
 [dependencies.syn]
 version = "2.0.1"
 features = [
+    "parsing",
+    "printing",
+    "clone-impls",
+    "proc-macro",
     "full",
     "visit-mut",
 ]
+default-features = false
 
 [dev-dependencies]
+
+[lints.clippy]
+all = "warn"
+as_ptr_cast_mut = "warn"
+as_underscore = "warn"
+default_union_representation = "warn"
+inline_asm_x86_att_syntax = "warn"
+pedantic = "warn"
+trailing_empty_array = "warn"
+transmute_undefined_repr = "warn"
+undocumented_unsafe_blocks = "warn"
+
+[lints.clippy.bool_assert_comparison]
+level = "allow"
+priority = 1
+
+[lints.clippy.borrow_as_ptr]
+level = "allow"
+priority = 1
+
+[lints.clippy.cast_lossless]
+level = "allow"
+priority = 1
+
+[lints.clippy.declare_interior_mutable_const]
+level = "allow"
+priority = 1
+
+[lints.clippy.doc_markdown]
+level = "allow"
+priority = 1
+
+[lints.clippy.float_cmp]
+level = "allow"
+priority = 1
+
+[lints.clippy.incompatible_msrv]
+level = "allow"
+priority = 1
+
+[lints.clippy.lint_groups_priority]
+level = "allow"
+priority = 1
+
+[lints.clippy.manual_assert]
+level = "allow"
+priority = 1
+
+[lints.clippy.manual_range_contains]
+level = "allow"
+priority = 1
+
+[lints.clippy.missing_errors_doc]
+level = "allow"
+priority = 1
+
+[lints.clippy.module_name_repetitions]
+level = "allow"
+priority = 1
+
+[lints.clippy.naive_bytecount]
+level = "allow"
+priority = 1
+
+[lints.clippy.nonminimal_bool]
+level = "allow"
+priority = 1
+
+[lints.clippy.range_plus_one]
+level = "allow"
+priority = 1
+
+[lints.clippy.similar_names]
+level = "allow"
+priority = 1
+
+[lints.clippy.single_match]
+level = "allow"
+priority = 1
+
+[lints.clippy.single_match_else]
+level = "allow"
+priority = 1
+
+[lints.clippy.struct_excessive_bools]
+level = "allow"
+priority = 1
+
+[lints.clippy.struct_field_names]
+level = "allow"
+priority = 1
+
+[lints.clippy.too_many_arguments]
+level = "allow"
+priority = 1
+
+[lints.clippy.too_many_lines]
+level = "allow"
+priority = 1
+
+[lints.clippy.type_complexity]
+level = "allow"
+priority = 1
+
+[lints.clippy.unreadable_literal]
+level = "allow"
+priority = 1
+
+[lints.rust]
+deprecated_safe = "warn"
+improper_ctypes = "warn"
+improper_ctypes_definitions = "warn"
+non_ascii_idents = "warn"
+rust_2018_idioms = "warn"
+single_use_lifetimes = "warn"
+unreachable_pub = "warn"
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+priority = 0
+check-cfg = []

crates/pin-project-internal/METADATA

diff --git a/crates/pin-project-internal/METADATA b/crates/pin-project-internal/METADATA
index 9e9bb4f..cb4009a 100644
--- a/crates/pin-project-internal/METADATA
+++ b/crates/pin-project-internal/METADATA
@@ -1,17 +1,17 @@
 name: "pin-project-internal"
 description: "Implementation detail of the `pin-project` crate."
 third_party {
-  version: "1.1.3"
+  version: "1.1.8"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 11
-    day: 14
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/pin-project-internal"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.1.3.crate"
-    version: "1.1.3"
+    value: "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.1.8.crate"
+    version: "1.1.8"
   }
 }

crates/pin-project-internal/src/error.rs

diff --git a/crates/pin-project-internal/src/error.rs b/crates/pin-project-internal/src/error.rs
new file mode 100644
index 0000000..107698e
--- /dev/null
+++ b/crates/pin-project-internal/src/error.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+macro_rules! format_err {
+    ($span:expr, $msg:expr $(,)?) => {
+        syn::Error::new_spanned(&$span as &dyn quote::ToTokens, &$msg as &dyn std::fmt::Display)
+    };
+    ($span:expr, $($tt:tt)*) => {
+        format_err!($span, format!($($tt)*))
+    };
+}
+
+macro_rules! bail {
+    ($($tt:tt)*) => {
+        return Err(format_err!($($tt)*))
+    };
+}

crates/pin-project-internal/src/lib.rs

diff --git a/crates/pin-project-internal/src/lib.rs b/crates/pin-project-internal/src/lib.rs
index 3eb3323..2a8796d 100644
--- a/crates/pin-project-internal/src/lib.rs
+++ b/crates/pin-project-internal/src/lib.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 //! Implementation detail of the `pin-project` crate. - **do not use directly**
 
 #![doc(test(
@@ -8,18 +10,10 @@
     )
 ))]
 #![forbid(unsafe_code)]
-#![warn(rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::pedantic)]
-#![allow(
-    clippy::needless_doctest_main,
-    clippy::similar_names,
-    clippy::single_match_else,
-    clippy::too_many_lines
-)]
+#![allow(clippy::needless_doctest_main)]
 
-// older compilers require explicit `extern crate`.
-#[allow(unused_extern_crates)]
-extern crate proc_macro;
+#[macro_use]
+mod error;
 
 #[macro_use]
 mod utils;
@@ -40,7 +34,7 @@
 ///
 /// And the following methods are implemented on the original type:
 ///
-/// ```rust
+/// ```
 /// # use std::pin::Pin;
 /// # type Projection<'a> = &'a ();
 /// # type ProjectionRef<'a> = &'a ();
@@ -54,7 +48,7 @@
 /// you can name the projection type returned from the method. This allows you
 /// to use pattern matching on the projected types.
 ///
-/// ```rust
+/// ```
 /// # use pin_project::pin_project;
 /// # use std::pin::Pin;
 /// #[pin_project(project = EnumProj)]
@@ -115,7 +109,7 @@
 ///
 ///    To enforce this, this attribute will generate code like this:
 ///
-///    ```rust
+///    ```
 ///    struct MyStruct {}
 ///    trait MyStructMustNotImplDrop {}
 ///    # #[allow(unknown_lints, drop_bounds)]
@@ -165,7 +159,7 @@
 ///
 /// `#[pin_project]` can be used on structs and enums.
 ///
-/// ```rust
+/// ```
 /// use std::pin::Pin;
 ///
 /// use pin_project::pin_project;
@@ -186,7 +180,7 @@
 /// }
 /// ```
 ///
-/// ```rust
+/// ```
 /// use std::pin::Pin;
 ///
 /// use pin_project::pin_project;
@@ -206,7 +200,7 @@
 /// To use `#[pin_project]` on enums, you need to name the projection type
 /// returned from the method.
 ///
-/// ```rust
+/// ```
 /// use std::pin::Pin;
 ///
 /// use pin_project::pin_project;
@@ -240,7 +234,7 @@
 /// and the `project_ref` method is not generated.
 /// (When `#[pin_project]` is used on structs, both methods are always generated.)
 ///
-/// ```rust,compile_fail,E0599
+/// ```compile_fail,E0599
 /// # use pin_project::pin_project;
 /// # use std::pin::Pin;
 /// #
@@ -263,7 +257,7 @@
 /// original [`Pin`] type, it needs to use [`.as_mut()`][`Pin::as_mut`] to avoid
 /// consuming the [`Pin`].
 ///
-/// ```rust
+/// ```
 /// use std::pin::Pin;
 ///
 /// use pin_project::pin_project;
@@ -288,7 +282,7 @@
 /// If you want to ensure that [`Unpin`] is not implemented, use the `!Unpin`
 /// argument to `#[pin_project]`.
 ///
-/// ```rust
+/// ```
 /// use pin_project::pin_project;
 ///
 /// #[pin_project(!Unpin)]
@@ -300,7 +294,7 @@
 /// This is equivalent to using `#[pin]` attribute for the [`PhantomPinned`]
 /// field.
 ///
-/// ```rust
+/// ```
 /// use std::marker::PhantomPinned;
 ///
 /// use pin_project::pin_project;
@@ -320,7 +314,7 @@
 /// If you want to implement [`Unpin`] manually, you must use the `UnsafeUnpin`
 /// argument to `#[pin_project]`.
 ///
-/// ```rust
+/// ```
 /// use pin_project::{pin_project, UnsafeUnpin};
 ///
 /// #[pin_project(UnsafeUnpin)]
@@ -359,7 +353,7 @@
 /// - `drop` method takes [`Pin`]`<&mut Self>`
 /// - Name of the trait is `PinnedDrop`.
 ///
-/// ```rust
+/// ```
 /// # use std::pin::Pin;
 /// pub trait PinnedDrop {
 ///     fn drop(self: Pin<&mut Self>);
@@ -375,7 +369,7 @@
 ///
 /// For example:
 ///
-/// ```rust
+/// ```
 /// use std::{fmt::Debug, pin::Pin};
 ///
 /// use pin_project::{pin_project, pinned_drop};
@@ -410,7 +404,7 @@
 /// equivalent to [`Pin::set`], except that the unpinned fields are moved and
 /// returned, instead of being dropped in-place.
 ///
-/// ```rust
+/// ```
 /// # use std::pin::Pin;
 /// # type ProjectionOwned = ();
 /// # trait Dox {
@@ -428,7 +422,7 @@
 ///
 /// For example:
 ///
-/// ```rust
+/// ```
 /// use std::{marker::PhantomData, pin::Pin};
 ///
 /// use pin_project::pin_project;
@@ -454,7 +448,7 @@
 /// destructuring the return type of the `project_replace` method, and work in exactly
 /// the same way as the `project` and `project_ref` arguments.
 ///
-/// ```rust
+/// ```
 /// use pin_project::pin_project;
 ///
 /// #[pin_project(project_replace = EnumProjOwn)]
@@ -480,7 +474,7 @@
 /// [`Pin::as_mut`]: core::pin::Pin::as_mut
 /// [`Pin::set`]: core::pin::Pin::set
 /// [`Pin`]: core::pin::Pin
-/// [`UnsafeUnpin`]: https://docs.rs/pin-project/1/pin_project/trait.UnsafeUnpin.html
+/// [`UnsafeUnpin`]: https://docs.rs/pin-project/latest/pin_project/trait.UnsafeUnpin.html
 /// [drop-guarantee]: core::pin#drop-guarantee
 /// [pin-projection]: core::pin#projections-and-structural-pinning
 /// [pinned-drop]: macro@pin_project#pinned_drop
@@ -503,7 +497,7 @@
 /// - `drop` method takes [`Pin`]`<&mut Self>`
 /// - Name of the trait is `PinnedDrop`.
 ///
-/// ```rust
+/// ```
 /// # use std::pin::Pin;
 /// pub trait PinnedDrop {
 ///     fn drop(self: Pin<&mut Self>);
@@ -519,7 +513,7 @@
 ///
 /// # Examples
 ///
-/// ```rust
+/// ```
 /// use std::pin::Pin;
 ///
 /// use pin_project::{pin_project, pinned_drop};
@@ -555,7 +549,7 @@
 /// macros and replacing them with private traits like the following,
 /// this crate prevent users from calling `PinnedDrop::drop` in safe code.
 ///
-/// ```rust
+/// ```
 /// # use std::pin::Pin;
 /// pub trait PinnedDrop {
 ///     unsafe fn drop(self: Pin<&mut Self>);

crates/pin-project-internal/src/pin_project/args.rs

diff --git a/crates/pin-project-internal/src/pin_project/args.rs b/crates/pin-project-internal/src/pin_project/args.rs
index 0c688a5..eba2cc6 100644
--- a/crates/pin-project-internal/src/pin_project/args.rs
+++ b/crates/pin-project-internal/src/pin_project/args.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::{

crates/pin-project-internal/src/pin_project/attribute.rs

diff --git a/crates/pin-project-internal/src/pin_project/attribute.rs b/crates/pin-project-internal/src/pin_project/attribute.rs
index 09cd8c7..7900f6c 100644
--- a/crates/pin-project-internal/src/pin_project/attribute.rs
+++ b/crates/pin-project-internal/src/pin_project/attribute.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{

crates/pin-project-internal/src/pin_project/derive.rs

diff --git a/crates/pin-project-internal/src/pin_project/derive.rs b/crates/pin-project-internal/src/pin_project/derive.rs
index bea17fe..206b00e 100644
--- a/crates/pin-project-internal/src/pin_project/derive.rs
+++ b/crates/pin-project-internal/src/pin_project/derive.rs
@@ -1,9 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use proc_macro2::{Delimiter, Group, Span, TokenStream};
 use quote::{format_ident, quote, quote_spanned, ToTokens};
 use syn::{
-    parse_quote, punctuated::Punctuated, token, visit_mut::VisitMut, Attribute, Data, DataEnum,
-    DeriveInput, Error, Field, Fields, FieldsNamed, FieldsUnnamed, Generics, Ident, Index,
-    Lifetime, LifetimeParam, Meta, Result, Token, Type, Variant, Visibility, WhereClause,
+    parse_quote, punctuated::Punctuated, token, visit_mut::VisitMut, Attribute, Error, Field,
+    Fields, FieldsNamed, FieldsUnnamed, Generics, Ident, Index, Item, Lifetime, LifetimeParam,
+    Meta, Result, Token, Type, Variant, Visibility, WhereClause,
 };
 
 use super::{
@@ -16,30 +18,31 @@
 };
 
 pub(super) fn parse_derive(input: TokenStream) -> Result<TokenStream> {
-    let mut input: DeriveInput = syn::parse2(input)?;
+    let mut input: Item = syn::parse2(input)?;
 
     let mut cx;
     let mut generate = GenerateTokens::default();
 
-    let ident = &input.ident;
-    let ty_generics = input.generics.split_for_impl().1;
-    let self_ty = parse_quote!(#ident #ty_generics);
-    let mut visitor = ReplaceReceiver(&self_ty);
-    visitor.visit_generics_mut(&mut input.generics);
-    visitor.visit_data_mut(&mut input.data);
-
-    match &input.data {
-        Data::Struct(data) => {
-            cx = Context::new(&input.attrs, &input.vis, ident, &mut input.generics, Struct)?;
-            parse_struct(&mut cx, &data.fields, &mut generate)?;
+    match &mut input {
+        Item::Struct(input) => {
+            let ident = &input.ident;
+            let ty_generics = input.generics.split_for_impl().1;
+            let self_ty = parse_quote!(#ident #ty_generics);
+            let mut visitor = ReplaceReceiver(&self_ty);
+            visitor.visit_item_struct_mut(input);
+            cx = Context::new(&input.attrs, &input.vis, &input.ident, &mut input.generics, Struct)?;
+            parse_struct(&mut cx, &input.fields, &mut generate)?;
         }
-        Data::Enum(data) => {
-            cx = Context::new(&input.attrs, &input.vis, ident, &mut input.generics, Enum)?;
-            parse_enum(&mut cx, data, &mut generate)?;
+        Item::Enum(input) => {
+            let ident = &input.ident;
+            let ty_generics = input.generics.split_for_impl().1;
+            let self_ty = parse_quote!(#ident #ty_generics);
+            let mut visitor = ReplaceReceiver(&self_ty);
+            visitor.visit_item_enum_mut(input);
+            cx = Context::new(&input.attrs, &input.vis, &input.ident, &mut input.generics, Enum)?;
+            parse_enum(&mut cx, input.brace_token, &input.variants, &mut generate)?;
         }
-        Data::Union(_) => {
-            bail!(input, "#[pin_project] attribute may only be used on structs or enums");
-        }
+        _ => bail!(input, "#[pin_project] attribute may only be used on structs or enums"),
     }
 
     Ok(generate.into_tokens(&cx))
@@ -83,11 +86,14 @@
             // - https://github.com/rust-lang/rust/issues/63281
             // - https://github.com/taiki-e/pin-project/pull/53#issuecomment-525906867
             // - https://github.com/taiki-e/pin-project/pull/70
-            #allowed_lints
-            #[allow(unused_qualifications)]
-            #[allow(clippy::semicolon_if_nothing_returned)]
-            #[allow(clippy::use_self)]
-            #[allow(clippy::used_underscore_binding)]
+            #[allow(
+                unused_qualifications,
+                #allowed_lints
+                clippy::needless_lifetimes,
+                clippy::semicolon_if_nothing_returned,
+                clippy::use_self,
+                clippy::used_underscore_binding
+            )]
             const _: () = {
                 #[allow(unused_extern_crates)]
                 extern crate pin_project as _pin_project;
@@ -103,50 +109,59 @@
 /// Returns attributes that should be applied to all generated code.
 fn global_allowed_lints() -> TokenStream {
     quote! {
-        #[allow(box_pointers)] // This lint warns use of the `Box` type.
-        #[allow(deprecated)]
-        #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-        #[allow(unreachable_pub)] // This lint warns `pub` field in private struct.
-        #[allow(unused_tuple_struct_fields)]
+        deprecated,
+        explicit_outlives_requirements, // https://github.com/rust-lang/rust/issues/60993
+        single_use_lifetimes, // https://github.com/rust-lang/rust/issues/55058
+        unreachable_pub, // This lint warns `pub` field in private struct.
+        unused_tuple_struct_fields,
         // This lint warns of `clippy::*` generated by external macros.
         // We allow this lint for compatibility with older compilers.
-        #[allow(clippy::unknown_clippy_lints)]
-        #[allow(clippy::pattern_type_mismatch)]
-        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
-        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
+        clippy::unknown_clippy_lints,
+        clippy::absolute_paths,
+        clippy::min_ident_chars,
+        clippy::pattern_type_mismatch,
+        clippy::pub_with_shorthand,
+        clippy::redundant_pub_crate, // This lint warns `pub(crate)` field in private struct.
+        clippy::single_char_lifetime_names,
+        clippy::type_repetition_in_bounds, // https://github.com/rust-lang/rust-clippy/issues/4326
     }
 }
 
 /// Returns attributes used on projected types.
 fn proj_allowed_lints(cx: &Context<'_>) -> (TokenStream, TokenStream, TokenStream) {
-    let large_enum_variant = if cx.kind == Enum {
-        Some(quote! {
-            #[allow(variant_size_differences)]
-            #[allow(clippy::large_enum_variant)]
-        })
-    } else {
-        None
-    };
     let global_allowed_lints = global_allowed_lints();
     let proj_mut_allowed_lints = if cx.project { Some(&global_allowed_lints) } else { None };
     let proj_mut = quote! {
-        #proj_mut_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`.
+        #[allow(
+            dead_code, // This lint warns unused fields/variants.
+            #proj_mut_allowed_lints
+            clippy::missing_docs_in_private_items,
+            clippy::mut_mut // This lint warns `&mut &mut <ty>`.
+        )]
     };
     let proj_ref_allowed_lints = if cx.project_ref { Some(&global_allowed_lints) } else { None };
     let proj_ref = quote! {
-        #proj_ref_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::ref_option_ref)] // This lint warns `&Option<&<ty>>`.
+        #[allow(
+            dead_code, // This lint warns unused fields/variants.
+            #proj_ref_allowed_lints
+            clippy::missing_docs_in_private_items,
+            clippy::ref_option_ref // This lint warns `&Option<&<ty>>`.
+        )]
     };
     let proj_own_allowed_lints =
         if cx.project_replace.ident().is_some() { Some(&global_allowed_lints) } else { None };
+    let variant_size_differences = if cx.kind == Enum {
+        Some(quote! { variant_size_differences, clippy::large_enum_variant, })
+    } else {
+        None
+    };
     let proj_own = quote! {
-        #proj_own_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #large_enum_variant
+        #[allow(
+            dead_code, // This lint warns unused fields/variants.
+            #proj_own_allowed_lints
+            #variant_size_differences
+            clippy::missing_docs_in_private_items
+        )]
     };
     (proj_mut, proj_ref, proj_own)
 }
@@ -230,7 +245,7 @@
                 where_clause,
             },
             orig: OriginalType { attrs, vis, ident, generics },
-            pinned_fields: Vec::new(),
+            pinned_fields: vec![],
         })
     }
 }
@@ -240,8 +255,7 @@
     Enum,
     Struct,
 }
-
-use TypeKind::{Enum, Struct};
+use self::TypeKind::{Enum, Struct};
 
 struct OriginalType<'a> {
     /// Attributes of the original type.
@@ -411,7 +425,8 @@
 
 fn parse_enum<'a>(
     cx: &mut Context<'a>,
-    DataEnum { brace_token, variants, .. }: &'a DataEnum,
+    brace_token: token::Brace,
+    variants: &'a Punctuated<Variant, Token![,]>,
     generate: &mut GenerateTokens,
 ) -> Result<()> {
     if let ProjReplace::Unnamed { span } = &cx.project_replace {
@@ -428,7 +443,7 @@
     // Do this first for a better error message.
     ensure_not_packed(&cx.orig, None)?;
 
-    validate_enum(*brace_token, variants)?;
+    validate_enum(brace_token, variants)?;
 
     let ProjectedVariants {
         proj_variants,
@@ -569,9 +584,7 @@
     let mut proj_move = TokenStream::new();
     let mut pinned_bindings = Vec::with_capacity(fields.len());
 
-    for (i, Field { attrs, vis, ident, colon_token, ty, mutability: _ }) in
-        fields.iter().enumerate()
-    {
+    for (i, Field { attrs, vis, ident, colon_token, ty, .. }) in fields.iter().enumerate() {
         let binding = ident.clone().unwrap_or_else(|| format_ident!("_{}", i));
         proj_pat.extend(quote!(#binding,));
         let lifetime = &cx.proj.lifetime;
@@ -687,7 +700,9 @@
 
             // Make the error message highlight `UnsafeUnpin` argument.
             proj_generics.make_where_clause().predicates.push(parse_quote_spanned! { span =>
-                _pin_project::__private::Wrapper<#lifetime, Self>: _pin_project::UnsafeUnpin
+                _pin_project::__private::PinnedFieldsOf<
+                    _pin_project::__private::Wrapper<#lifetime, Self>
+                >: _pin_project::UnsafeUnpin
             });
 
             let (impl_generics, _, where_clause) = proj_generics.split_for_impl();
@@ -705,13 +720,15 @@
             let orig_ident = cx.orig.ident;
             let lifetime = &cx.proj.lifetime;
 
+            // TODO: Using `<unsized type>: Sized` here allow emulating real negative_impls...
+            // https://github.com/taiki-e/pin-project/issues/340#issuecomment-2428002670
             proj_generics.make_where_clause().predicates.push(parse_quote! {
-                _pin_project::__private::Wrapper<
+                _pin_project::__private::PinnedFieldsOf<_pin_project::__private::Wrapper<
                     #lifetime, _pin_project::__private::PhantomPinned
-                >: _pin_project::__private::Unpin
+                >>: _pin_project::__private::Unpin
             });
 
-            let (proj_impl_generics, _, proj_where_clause) = proj_generics.split_for_impl();
+            let (impl_generics, _, where_clause) = proj_generics.split_for_impl();
             let ty_generics = cx.orig.generics.split_for_impl().1;
 
             // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
@@ -719,9 +736,8 @@
             let unsafety = <Token![unsafe]>::default();
             quote_spanned! { span =>
                 #[doc(hidden)]
-                impl #proj_impl_generics _pin_project::__private::Unpin
-                    for #orig_ident #ty_generics
-                #proj_where_clause
+                impl #impl_generics _pin_project::__private::Unpin for #orig_ident #ty_generics
+                #where_clause
                 {
                 }
 
@@ -732,15 +748,14 @@
                 // impl, they'll get a "conflicting implementations of trait" error when
                 // coherence checks are run.
                 #[doc(hidden)]
-                #unsafety impl #proj_impl_generics _pin_project::UnsafeUnpin
-                    for #orig_ident #ty_generics
-                #proj_where_clause
+                #unsafety impl #impl_generics _pin_project::UnsafeUnpin for #orig_ident #ty_generics
+                #where_clause
                 {
                 }
             }
         }
         UnpinImpl::Default => {
-            let mut full_where_clause = cx.orig.generics.where_clause.clone().unwrap();
+            let mut impl_where_clause = cx.orig.generics.where_clause.clone().unwrap();
 
             // Generate a field in our new struct for every
             // pinned field in the original type.
@@ -760,7 +775,7 @@
             // and lifetime used in the original struct. For type parameters,
             // we generate code like this:
             //
-            // ```rust
+            // ```
             // struct AlwaysUnpin<T: ?Sized>(PhantomData<T>) {}
             // impl<T: ?Sized> Unpin for AlwaysUnpin<T> {}
             //
@@ -783,11 +798,12 @@
             let lifetime = &cx.proj.lifetime;
             let type_params = cx.orig.generics.type_params().map(|t| &t.ident);
             let proj_generics = &cx.proj.generics;
-            let (proj_impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl();
-            let (_, ty_generics, where_clause) = cx.orig.generics.split_for_impl();
+            let (impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl();
+            let (_, ty_generics, ty_where_clause) = cx.orig.generics.split_for_impl();
 
-            full_where_clause.predicates.push(parse_quote! {
-                #struct_ident #proj_ty_generics: _pin_project::__private::Unpin
+            impl_where_clause.predicates.push(parse_quote! {
+                _pin_project::__private::PinnedFieldsOf<#struct_ident #proj_ty_generics>:
+                    _pin_project::__private::Unpin
             });
 
             quote! {
@@ -801,8 +817,8 @@
                 // `__UnpinStruct` type must also be public.
                 // However, we ensure that the user can never actually reference
                 // this 'public' type by creating this type in the inside of `const`.
-                #[allow(missing_debug_implementations)]
-                #vis struct #struct_ident #proj_generics #where_clause {
+                #[allow(missing_debug_implementations, unnameable_types)]
+                #vis struct #struct_ident #proj_generics #ty_where_clause {
                     __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
                         #lifetime, (#(_pin_project::__private::PhantomData<#type_params>),*)
                     >,
@@ -811,9 +827,8 @@
                     #(#lifetime_fields,)*
                 }
 
-                impl #proj_impl_generics _pin_project::__private::Unpin
-                    for #orig_ident #ty_generics
-                #full_where_clause
+                impl #impl_generics _pin_project::__private::Unpin for #orig_ident #ty_generics
+                #impl_where_clause
                 {
                 }
 
@@ -824,9 +839,8 @@
                 // impl, they'll get a "conflicting implementations of trait" error when
                 // coherence checks are run.
                 #[doc(hidden)]
-                unsafe impl #proj_impl_generics _pin_project::UnsafeUnpin
-                    for #orig_ident #ty_generics
-                #full_where_clause
+                unsafe impl #impl_generics _pin_project::UnsafeUnpin for #orig_ident #ty_generics
+                #impl_where_clause
                 {
                 }
             }
@@ -852,6 +866,7 @@
             impl #impl_generics _pin_project::__private::Drop for #ident #ty_generics
             #where_clause
             {
+                #[allow(clippy::missing_inline_in_public_items)]
                 fn drop(&mut self) {
                     #unsafety {
                         // Safety - we're in 'drop', so we know that 'self' will
@@ -885,7 +900,7 @@
         quote! {
             // There are two possible cases:
             // 1. The user type does not implement Drop. In this case,
-            // the first blanked impl will not apply to it. This code
+            // the first blanket impl will not apply to it. This code
             // will compile, as there is only one impl of MustNotImplDrop for the user type
             // 2. The user type does impl Drop. This will make the blanket impl applicable,
             // which will then conflict with the explicit MustNotImplDrop impl below.
@@ -969,14 +984,14 @@
     let mut project_replace = cx.project_replace.span().map(|span| {
         // It is enough to only set the span of the signature.
         let sig = quote_spanned! { span =>
-            #allow_dead_code
-            #[inline]
             #vis fn project_replace(
                 self: _pin_project::__private::Pin<&mut Self>,
                 __replacement: Self,
             ) -> #proj_own_ident #orig_ty_generics
         };
         quote! {
+            #allow_dead_code
+            #[inline]
             #sig {
                 unsafe {
                     let __self_ptr: *mut Self = self.get_unchecked_mut();
@@ -1059,7 +1074,7 @@
     // To ensure that it's impossible to use pin projections on a `#[repr(packed)]`
     // struct, we generate code like this:
     //
-    // ```rust
+    // ```
     // #[forbid(unaligned_references)]
     // fn assert_not_repr_packed(val: &MyStruct) {
     //     let _field_1 = &val.field_1;

crates/pin-project-internal/src/pin_project/mod.rs

diff --git a/crates/pin-project-internal/src/pin_project/mod.rs b/crates/pin-project-internal/src/pin_project/mod.rs
index 2dce78f..d5f41dc 100644
--- a/crates/pin-project-internal/src/pin_project/mod.rs
+++ b/crates/pin-project-internal/src/pin_project/mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 mod args;
 mod attribute;
 mod derive;

crates/pin-project-internal/src/pinned_drop.rs

diff --git a/crates/pin-project-internal/src/pinned_drop.rs b/crates/pin-project-internal/src/pinned_drop.rs
index d30ecbe..e845202 100644
--- a/crates/pin-project-internal/src/pinned_drop.rs
+++ b/crates/pin-project-internal/src/pinned_drop.rs
@@ -1,4 +1,6 @@
-use proc_macro2::TokenStream;
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote, ToTokens};
 use syn::{
     parse_quote, spanned::Spanned, token::Colon, visit_mut::VisitMut, Error, FnArg,
@@ -114,7 +116,7 @@
     const INVALID_ARGUMENT: &str = "method `drop` must take an argument `self: Pin<&mut Self>`";
 
     if sig.ident != "drop" {
-        bail!(sig.ident, "method `{}` is not a member of trait `PinnedDrop", sig.ident,);
+        bail!(sig.ident, "method `{}` is not a member of trait `PinnedDrop", sig.ident);
     }
 
     if let ReturnType::Type(_, ty) = &sig.output {
@@ -182,7 +184,7 @@
     item.attrs.push(parse_quote!(#[doc(hidden)]));
 
     let path = &mut item.trait_.as_mut().expect("unexpected inherent impl").1;
-    *path = parse_quote_spanned! { path.span() =>
+    *path = parse_quote_spanned! { Span::call_site().located_at(path.span()) =>
         ::pin_project::__private::PinnedDrop
     };
 
@@ -199,7 +201,7 @@
         drop_inner.sig.generics = item.generics.clone();
         let receiver = drop_inner.sig.receiver().expect("drop() should have a receiver").clone();
         let pat = Box::new(Pat::Ident(PatIdent {
-            attrs: Vec::new(),
+            attrs: vec![],
             by_ref: None,
             mutability: receiver.mutability,
             ident: Ident::new("__self", receiver.self_token.span()),
@@ -228,7 +230,10 @@
     };
 
     method.block.stmts = parse_quote! {
-        #[allow(clippy::needless_pass_by_value)] // This lint does not warn the receiver.
+        #[allow(
+            clippy::needless_pass_by_value, // This lint does not warn the receiver.
+            clippy::single_call_fn
+        )]
         #drop_inner
         __drop_inner(#self_token);
     };

crates/pin-project-internal/src/utils.rs

diff --git a/crates/pin-project-internal/src/utils.rs b/crates/pin-project-internal/src/utils.rs
index 55089cd..fdd9eb0 100644
--- a/crates/pin-project-internal/src/utils.rs
+++ b/crates/pin-project-internal/src/utils.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::mem;
 
 use proc_macro2::{Group, Spacing, Span, TokenStream, TokenTree};
@@ -15,21 +17,6 @@
 
 pub(crate) type Variants = Punctuated<Variant, Token![,]>;
 
-macro_rules! format_err {
-    ($span:expr, $msg:expr $(,)?) => {
-        syn::Error::new_spanned(&$span as &dyn quote::ToTokens, &$msg as &dyn std::fmt::Display)
-    };
-    ($span:expr, $($tt:tt)*) => {
-        format_err!($span, format!($($tt)*))
-    };
-}
-
-macro_rules! bail {
-    ($($tt:tt)*) => {
-        return Err(format_err!($($tt)*))
-    };
-}
-
 macro_rules! parse_quote_spanned {
     ($span:expr => $($tt:tt)*) => {
         syn::parse2(quote::quote_spanned!($span => $($tt)*)).unwrap_or_else(|e| panic!("{}", e))
@@ -49,7 +36,7 @@
 
     debug_assert!(lifetime_name.starts_with('\''));
 
-    let mut lifetimes = CollectLifetimes(Vec::new());
+    let mut lifetimes = CollectLifetimes(vec![]);
     lifetimes.visit_generics_mut(generics);
 
     while lifetimes.0.iter().any(|name| name.starts_with(&**lifetime_name)) {
@@ -118,7 +105,7 @@
         .collect()
 }
 
-// =================================================================================================
+// -----------------------------------------------------------------------------
 // extension traits
 
 pub(crate) trait SliceExt {
@@ -170,7 +157,7 @@
     }
 }
 
-// =================================================================================================
+// -----------------------------------------------------------------------------
 // visitors
 
 // Replace `self`/`Self` with `__self`/`self_ty`.
@@ -211,7 +198,7 @@
 
         path.leading_colon = Some(**path.segments.pairs().next().unwrap().punct().unwrap());
 
-        let segments = mem::replace(&mut path.segments, Punctuated::new());
+        let segments = mem::take(&mut path.segments);
         path.segments = segments.into_pairs().skip(1).collect();
     }
 
@@ -241,7 +228,7 @@
     }
 
     fn visit_token_stream(&self, tokens: &mut TokenStream) -> bool {
-        let mut out = Vec::new();
+        let mut out = vec![];
         let mut modified = false;
         let mut iter = tokens.clone().into_iter().peekable();
         while let Some(tt) = iter.next() {

crates/pin-project/.android-checksum.json

diff --git a/crates/pin-project/.android-checksum.json b/crates/pin-project/.android-checksum.json
index 9b180dc..b79ea5e 100644
--- a/crates/pin-project/.android-checksum.json
+++ b/crates/pin-project/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"a1143443b8a8d93618c94a47e4cb1b878b5564f8f35df2fe0c26fdc68001bfbb","Android.bp":"5c4d6265239eb006234007316a028a892a47e90caef0d4560e4f87388457f35b","CHANGELOG.md":"5d48280b367f70d3e7f16fa5b8a7328bcae7c08dc2c3bb95a55bd52030194119","Cargo.lock":"f92deee5e03a0f0ae7747c35f986e6c99a0b4188aa55f47bf206cce6ac40aea4","Cargo.toml":"98aa2f722ef25c2864710db99deb1ff5a57dbac4e32b0fba596e2f020dbf9a5b","LICENSE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-APACHE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"30eee2672ae16a114f2ddda2824104c4a4fc604d027cb37e899c4ca5c266eaf3","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","README.md":"94fffc378f2d32b14f9df6d4d7a51a4a90026dea627f3548e39d652e0b7c158f","TEST_MAPPING":"41fe943b979ce266ae7fc1df55149ddc11cbc7c5644d30182d11a108425021d0","cargo_embargo.json":"544abbb62553b71d416392b8af5ae7bdfa8e6260a5d9e9e51fd617c60558d53b","examples/README.md":"8451fa40f488e955424141d20d5b4cc8596f7222e7d06be89481636eaa05248e","examples/enum-default-expanded.rs":"57e154ce29af29fe4ec680c20ddbf2753203a2637252783d1c47cbc0265d68fc","examples/enum-default.rs":"fab601cf2e095c2d05d1907f35b4307d1273d21db1d068a4fef63e8de30fb9af","examples/not_unpin-expanded.rs":"811b8f757c9168eb7708fb2b2a9f0692ebe5c9178ae29dca47a059e6364bc3db","examples/not_unpin.rs":"adfa5b8910950f66feda7cd6adbaa41f24169f663a718ef86a4951addf1a7198","examples/pinned_drop-expanded.rs":"b341bff36d77d28d5f9931c0ad334ffac15c76b311fd840c0783d06014bf9693","examples/pinned_drop.rs":"3cdad1675a02497eb2064fc5b65592efebd580de52fe31ea0f2083589e86f108","examples/project_replace-expanded.rs":"3ea41d78cdf8472b4ab342e4c97e6dd9d3453bf1214ab360a4fe33ca2ea54441","examples/project_replace.rs":"71970744087b088674e5e27e9ce79f3b13c0280f5b068707870bed4c84facd6b","examples/struct-default-expanded.rs":"c317982be6a42fcfbcb8ebea6d0d332371f6fe7a9f239b404f8c29b8089b60b6","examples/struct-default.rs":"6f220fb77a56aa53135ec1b5018e14a5d9e89e7af39d9444cada01fabffbb233","examples/unsafe_unpin-expanded.rs":"aa22e8a231a0d048b50f18670c3aa1ba48059310b3649e3f71b01b936255173a","examples/unsafe_unpin.rs":"50c4857c67f97ccd5166a4db64b226ad211155ddbee4d786cb31c4225023167a","src/lib.rs":"68865b58b4fcefdf4239dd38a8abdf394122759871bc41a3629212d2e2f891c8","tests/auxiliary/mod.rs":"770fefb1b79ae838a8aed5206122a2789e7c489938cbf18bb02d2181d14bcc5d","tests/cfg.rs":"9095072ead4a17b8bf9d4b0c4773a807f5fc61a035c17dd99bc1c5bfd9bd92ca","tests/compiletest.rs":"c39104c9a03ae1acc7b5a1c237c07b71edb0dba43b0e67b7618051deb543d3f7","tests/drop_order.rs":"78defa79d795a5f34048760e7303b8b6c49ac54beb207c86d654a646eda0d9f5","tests/expand/default/enum.expanded.rs":"04976c8b4d8581b1afe2e6cf1f2180432836db607895f36c5d1a098e70ed37bc","tests/expand/default/enum.rs":"4eac8ad535d84425e9b894fec06faa573f4687d15700e139d569125980762bbd","tests/expand/default/struct.expanded.rs":"dc79124712d36add4af08d7102849a48f7a8d7d057bd2e5d586de106ff38a18e","tests/expand/default/struct.rs":"b4f253eb3952e5c923e1500d1102abda64dfebab59d2c414e7202dcd57b264d0","tests/expand/default/tuple_struct.expanded.rs":"666a6237c55607b04f22dd69ef9e50a778dd14db23407071edc24ed4d6eda784","tests/expand/default/tuple_struct.rs":"d67e9a96eefa374b5fc9c691750868baaf23902491307d76fd6cc23f0b5fff76","tests/expand/multifields/enum.expanded.rs":"524fd2089faa3d9d255fcae2362a77cafbaaf9afc5d08e56fbb399d0919be667","tests/expand/multifields/enum.rs":"42ee9f7da23bc031d51c2c0229115d4b3566e86d2fe21cf3ad497768db88a71b","tests/expand/multifields/struct.expanded.rs":"67747302a3b74f9bdb8b8962b3fa4d9a7bbfc1bdf5f98f6f817ffa0be5c4db8d","tests/expand/multifields/struct.rs":"e07ef6aaceaa8c131c8f7e718697137e3fabfe4c4b3a46ccb759d08a22d7eabd","tests/expand/multifields/tuple_struct.expanded.rs":"3ce5f06d345c46332f7696ee10a7f04521861a061cccd8f5afe580ca73df9f0a","tests/expand/multifields/tuple_struct.rs":"97ef43f41113560d5f359c9b64bf7863e16bd28b05e44344ca057280429dcdab","tests/expand/naming/enum-all.expanded.rs":"8de14a9749e751b09726f135e0411380f5d4b6bfdf9d0507ac2c6f6cfc21b96c","tests/expand/naming/enum-all.rs":"684e7c0eeac5954c94e751ba2cab867c20e6ce0b3a2c4d2026a952359fd9efc2","tests/expand/naming/enum-mut.expanded.rs":"4ca9ab1fbd05246fc59ec4abebde7dcbbc2d01087f7d3f5f33f01ebe60c91cc9","tests/expand/naming/enum-mut.rs":"4da4725a4be4dc8d4b1e14d82af31d329123959ee9139ac5bccf3123474c54e3","tests/expand/naming/enum-none.expanded.rs":"288388c18780093257551added3e57f9263d4e9afd9375a9710357db78d973a4","tests/expand/naming/enum-none.rs":"3df6c5e5df5ab7505f3f75bf679d780c537f3f9d840db0cbef7d60164622f5a9","tests/expand/naming/enum-own.expanded.rs":"32dbd2ffa02fed5985f4122d830213652ffcaff0a8a6615dbbc8ac40ae82629a","tests/expand/naming/enum-own.rs":"3cda3d93b763b60aed4f5cb70096cb35e287688cd919a2096af46f2d399042bb","tests/expand/naming/enum-ref.expanded.rs":"ad643d28bb13fa3afb41112e09cded0cca0cb0941dcf177fcf95d8cc51bcf4ac","tests/expand/naming/enum-ref.rs":"e0cd1fbee10fa9b81a858d0d39ae371b0b536f1f50dfc9c09c29142b73579971","tests/expand/naming/struct-all.expanded.rs":"f11af05f3119ebcf052ccf1a2a5782723412ae7acf5f6b9bdeed03c58896fbbf","tests/expand/naming/struct-all.rs":"ef49de3b76a612c52cbeef0c8703184b1e7bc3e41e20d1688e452eff9eabc1d3","tests/expand/naming/struct-mut.expanded.rs":"3b5a16db11b2ff7331e1aaa7b79231af2c4e74639058db4cecc7ebb22b73b616","tests/expand/naming/struct-mut.rs":"1616f8ad527921edc5077462d6f397d515c29ab2833c5c3728894d20c7ca6b36","tests/expand/naming/struct-none.expanded.rs":"dc79124712d36add4af08d7102849a48f7a8d7d057bd2e5d586de106ff38a18e","tests/expand/naming/struct-none.rs":"b4f253eb3952e5c923e1500d1102abda64dfebab59d2c414e7202dcd57b264d0","tests/expand/naming/struct-own.expanded.rs":"105c7645cc8cd32daa1cd5447d23def38fdca91720de32c1add64be2e8674009","tests/expand/naming/struct-own.rs":"82395864b162a8a9524c3f240070a677c3a55c3281eaef3bc930571e23c919ca","tests/expand/naming/struct-ref.expanded.rs":"ca6396d0ee369d1e4509e06de4708af0d0795380d743909ee676052178ef8dff","tests/expand/naming/struct-ref.rs":"e8fade84ebecf1c5df50b837c944e53d2e682c925f90e97c43ee198d4f87995b","tests/expand/naming/tuple_struct-all.expanded.rs":"e0351eb2df0ce6d6b7da77fedf387da0328834d6162f0f812e9b507bf6f4af3d","tests/expand/naming/tuple_struct-all.rs":"3804447a82d4c0c0deb91350179b3896930e3b48f92365a6403a12e64a647652","tests/expand/naming/tuple_struct-mut.expanded.rs":"609a94a5c8df8e0ee11eff3ef46185c70f197352e8c9f50bbbeea64c98c3948a","tests/expand/naming/tuple_struct-mut.rs":"a1aa523f1ba18336d592d4c80e08d4c32a0d7d0cedbbe45b83a6406e8109a5ca","tests/expand/naming/tuple_struct-none.expanded.rs":"666a6237c55607b04f22dd69ef9e50a778dd14db23407071edc24ed4d6eda784","tests/expand/naming/tuple_struct-none.rs":"d67e9a96eefa374b5fc9c691750868baaf23902491307d76fd6cc23f0b5fff76","tests/expand/naming/tuple_struct-own.expanded.rs":"0250f85edd6e7c857d86dc9cba61c7dbc1ba3177691368d4c8e09c0c0b2948d1","tests/expand/naming/tuple_struct-own.rs":"237700f682309946c10c0f9073e3bc25b60ccda2670a6384bee9c25f8b7a552b","tests/expand/naming/tuple_struct-ref.expanded.rs":"122dacdad393c5dda30feac1bf74de9570f3e798d4f31c312660016d93177325","tests/expand/naming/tuple_struct-ref.rs":"31af56362662d720ca94c5260ce748f4a7bc7629465336c61dc57c898ece2aa8","tests/expand/not_unpin/enum.expanded.rs":"ff35c7cfaf5d29f1bdd0f3678c4d03b5240fd886a0e7c509636c92b268fa50dd","tests/expand/not_unpin/enum.rs":"20df337deb0133ce24c498a9f28811d2b3101ad881971d590dcbca5759eca899","tests/expand/not_unpin/struct.expanded.rs":"b41dd6db0558c562bbc7ad635b69a266f1e7c543be3ccda4df120d672d18204e","tests/expand/not_unpin/struct.rs":"14cac841fbb554da39296276814f49a7abf615793ada9a6926f407298a5e5fd2","tests/expand/not_unpin/tuple_struct.expanded.rs":"f2ee0652618ec53f402dd976f8ba9a439b804c101c991e02e5e7e0d53b4a5f8a","tests/expand/not_unpin/tuple_struct.rs":"4c93a6d27abc5a86a839a777412c5bccb7e1e27e1873dd51167b021fad231b24","tests/expand/pinned_drop/enum.expanded.rs":"1614d9a6e0c88bf6827ded99eaf68ac6c3577c1301540965a1cee0352b2f1831","tests/expand/pinned_drop/enum.rs":"64fd737c74c8914d196002d58d332608b733e1a0591ed8e3fc98179ccb923d3f","tests/expand/pinned_drop/struct.expanded.rs":"20d64854a1932a838d202d86315c2bdf513782376b75f34c7275cd0fbe172188","tests/expand/pinned_drop/struct.rs":"b02c3065ac96a60cc75fbd7e12b60a4570d94212715ba5c48a4e6eac4b28742b","tests/expand/pinned_drop/tuple_struct.expanded.rs":"4fe362aad160e968fe7c9a03775bba0c3f7ac796b89d262698c6dc9698580903","tests/expand/pinned_drop/tuple_struct.rs":"201eb475416046b717468e779ba98a9f863f1c44b20c726fa09758ea4a2e782d","tests/expand/project_replace/enum.expanded.rs":"16701932c7639795488c2d1d931cda754854b0e887fe412e0b7c7957c4d1d536","tests/expand/project_replace/enum.rs":"34ac1633ec8c92b55b11a49c297bd961cbd80db931ccec6799c5c07fec6edbbc","tests/expand/project_replace/struct.expanded.rs":"f614b26ba218a6ed97b9bf22b17f34bf41d2456470e8b0ebafe896014f3bf611","tests/expand/project_replace/struct.rs":"0d67a4100ddebfbee78a2a3a667b3243d06ca27dd56d8b193ab2e2e805ed1b82","tests/expand/project_replace/tuple_struct.expanded.rs":"59037c9db227745539db8574ab9ffc00178aa48ba32abb12201f945879e64361","tests/expand/project_replace/tuple_struct.rs":"47317ab8b965351c3682641783267f1f0112d1f7bf067658dc60ca2be51d949c","tests/expand/pub/enum.expanded.rs":"12995dbe4d253a3e3f91d5185f158a80d6329fc502abcea3e4550447581fd10a","tests/expand/pub/enum.rs":"808b53dd5383e46c45b2d4fbcccd2a10b61f4db165fdf4b934997624db22106a","tests/expand/pub/struct.expanded.rs":"4cae01cc200989930f6e67a7d165448a60efa23fed5660e5eceec69c41fd4ac4","tests/expand/pub/struct.rs":"5281b8cb6d6a6c938668a0f8d8b71062e9df38e3193b7b4a34acd1e04e430b68","tests/expand/pub/tuple_struct.expanded.rs":"3da9d1dbbc87f113752e202ed1ff745a18906093878c2150597c35ad141d9e2c","tests/expand/pub/tuple_struct.rs":"07c2f4ac5c05f18ca8e9910873b1b7fd1bcb00bc3215f6d57b424e5ae1d0762e","tests/expand/unsafe_unpin/enum.expanded.rs":"6f0eb2c0fad6d1c099c66d5485badc27b8f405c4d6cbc3ca7596337025bc0a0e","tests/expand/unsafe_unpin/enum.rs":"0000e9baa52a811780f4117c749a2d6c0cb3a0b746d71e90a956bbeea008d753","tests/expand/unsafe_unpin/struct.expanded.rs":"08b7bb8e1479080f3c53a48c26c74a671ddf893fc9238cc44b145f77a65ba492","tests/expand/unsafe_unpin/struct.rs":"bece3509b8bce9077fb4575be78d801b2ca89a76b7d01acfe407180dd9e3f629","tests/expand/unsafe_unpin/tuple_struct.expanded.rs":"66194e2495c3af9a8326d253d64be44e850a2be6840336e835c3d03b1567fffc","tests/expand/unsafe_unpin/tuple_struct.rs":"711f065d883845c4063b5407d9341083d641c334136411431229bb143fa24703","tests/expandtest.rs":"69150fbb697050f55c64fd4aa2c48a028b8b6972af6660f985728b3fe4af339c","tests/include/basic-safe-part.rs":"cf0c5d062881785f5e6f43f233529bb7e00c6c40a79d9e6eadd840d02b127ee8","tests/include/basic.rs":"34d5238f02939359e2417a6d8b42dd849bdd6c07a424305d293ab65a9faa1610","tests/lint.rs":"924825a1aa1ce951061e75b780db449e01557ad1584828b3e196002cea34676c","tests/pin_project.rs":"32d752732b66c7e03df9bf343bac0b555c3ddbfb85bc22d799f3c66d13e0f81e","tests/pinned_drop.rs":"8b3f03be53b528e76e62eb73c10d3bf97cebb4e5b8b05fd315d173d9564d77e0","tests/proper_unpin.rs":"d6ff62f171955c1d16565484aeeca72466affd3e200cbce39b57feec5c059bd8","tests/repr_packed.rs":"4a9dc04940713a490e149a2c826655e98c5580cbdc37dd8cfcf70aadde9ce1a9","tests/ui/cfg/cfg_attr-resolve.rs":"74507e00a3b4363c38b06a871c2c40b32a424fe1d741b74bb75abb098c18be28","tests/ui/cfg/cfg_attr-resolve.stderr":"96a0aa6bb77987b14fcdc9b7bd7434d6a5acb6a89e01e4954022a06394641d7c","tests/ui/cfg/cfg_attr-type-mismatch.rs":"15efb9a6c540888980fc7b20da8db832506954907c2622f585a11c286eb19cf4","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"586cd9d0cdce4e01ed5d50f3273b290c3c8b7e8a817f26ae8cbe30e5c71812d4","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"286ab18aaae897a4b801842646cce3f7240dc0253d77f5a6112f61e49e221017","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"baae40b1651db15d15e58563316219ff3d762042adc57d27b4563b168e171d09","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"4284c2289caf64ba6e4c1f4221886cf3c4304463e4d5797313ef023c5ec0cf9a","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"f04ae9bd28cd2d74f668dfef30fc54d50f07f4936d19e14505c6eb7b8b6e6f3d","tests/ui/cfg/packed_sneaky.rs":"5a35e6575dfc3311a0deaf70b4d9a4e11b9e2e87af0f6fa9130afe1265fa7e77","tests/ui/cfg/packed_sneaky.stderr":"bdf2d443c26320589115c50bf20a7334eba8ee1ab137b3b47ff5c612cff9eeb6","tests/ui/cfg/unsupported.rs":"39202bd1c107e3544ad1abbf624e70cc01faa6f5150c4fbaa80fee78b990ee23","tests/ui/cfg/unsupported.stderr":"8187efdddaf486ba6c4e34b514baaf84d527bdbfbd55687b2f58bf8744229e3b","tests/ui/not_unpin/conflict-unpin.rs":"d52aaf3ef40b3104f75cafeeb66310b39f286350b64b646e27bb274e19ab69a1","tests/ui/not_unpin/conflict-unpin.stderr":"f858aec0a19c3bf4e3b3ed12858ef7616684ce4285561b719756536831e5d4da","tests/ui/not_unpin/impl-unsafe-unpin.rs":"bc50a134aa6bc66be6939273ad8f5f862fe31a44d6d49b0e982abfe714b15669","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"c5038a04a1cd31f0451366be5d8a92848c8ca769cb6e86e91f6bef7130bb5d32","tests/ui/pin_project/add-attr-to-struct.rs":"1229f429ad91042bc8427950b664aa50a925e60f08fc64e300ddc3c7913648ed","tests/ui/pin_project/add-attr-to-struct.stderr":"f6be8ecf926a28cc2d4e59e73425c8996f3ec7670e657abf2b6d319d7c626d87","tests/ui/pin_project/add-pinned-field.rs":"d9d4ff641b427be3b6b2a8f3fc6456166269371764945bd4a0c13da5d921854b","tests/ui/pin_project/add-pinned-field.stderr":"85ab52afd93c8d1206f5b9972403bddf2da0ece3f33fd5eb6ba8c7dd87b18201","tests/ui/pin_project/conflict-drop.rs":"9e6c6e704634d499185bf721ab6c51e65de1f36c6c44409b110f39455e25216c","tests/ui/pin_project/conflict-drop.stderr":"2d502b5935553806da1172fceaa885c44cfedb8315b27599c43785e6206d2564","tests/ui/pin_project/conflict-unpin.rs":"8e0ae74105f4313f02795272ddc118ae5a458d9ef788a9b0a3792bf62568fcd1","tests/ui/pin_project/conflict-unpin.stderr":"0f178576438a8334227467c25ff116f3df2caa136d8e63a77f258fe8fccbdf02","tests/ui/pin_project/impl-unsafe-unpin.rs":"c9e2b7cdc9b1505b7bff512e899a90f2d4da7d950ea6ef40d0bcc65d4019c0cb","tests/ui/pin_project/impl-unsafe-unpin.stderr":"131f31d8f392373bdbe9d947145b46ff8c7debaaea0f1750745ef3a3d7944e52","tests/ui/pin_project/import_unnamed.rs":"a0dbb25bd6667f81b07bde8fd99d761e2efff22775c6d463f90742d1fcee6258","tests/ui/pin_project/import_unnamed.stderr":"174489f6550b858301eec7a8f85d6f96baf45b3f256706e5d02831f9bbadfc97","tests/ui/pin_project/invalid.rs":"ed9354d538ddcb540c148c216369803c266ae37b170b5ca6d8cafb38f73b171e","tests/ui/pin_project/invalid.stderr":"0b69cf7314ec504bfd34a519779a187eb5caa38d63dd780c6898620c77828aef","tests/ui/pin_project/overlapping_unpin_struct.rs":"5545baecec3be183b6472d8d3f5a77663052ff54a4d986309685bd8405b04b34","tests/ui/pin_project/overlapping_unpin_struct.stderr":"56948b186704712cde8926bc2dd4ac71a1b6cc644d877c055b6cb052bd38acc7","tests/ui/pin_project/override-priv-mod.rs":"257499bdea54a177d48f791ee8286a1429b08b7bb4479bcf782edeb47f5617bd","tests/ui/pin_project/override-priv-mod.stderr":"8b6680200e7e79c3dc08f913350b812d6c56ed6350ef7304e25499b8dc875a6d","tests/ui/pin_project/packed-enum.rs":"9d3ab89646c82fa799efa39a75f009146bcb3712da2ec1e79b4a026fedd8f5da","tests/ui/pin_project/packed-enum.stderr":"438691045dd2689699433892b639b1d9be286b7a5f01a6a7975001f25f451647","tests/ui/pin_project/packed-name-value.rs":"b9714f6ba6fd5873a00438610853c3e9d5d2c9eaa8fffc1aa6e4a8eb1cf091d4","tests/ui/pin_project/packed-name-value.stderr":"23769b317fc88ba5b9e7fbaccaa5af041d5005be24f5c34b01e181b02e38bac5","tests/ui/pin_project/packed.rs":"da3e285c3a2354e3ab8adf87e1ca14cd6412ba9dbef8def4d014c5fb489427d2","tests/ui/pin_project/packed.stderr":"a3b85b5c54875a579029a0c342e6a5f4844e0c6b7d36abc455dabfc429c641f2","tests/ui/pin_project/packed_sneaky-1.rs":"3caea140333a72912e6f252375d4d2325986f2f516ee630941044e40816ef64a","tests/ui/pin_project/packed_sneaky-1.stderr":"709b3caa9305e106000f5131878469874f893c3f32d958b17d0eafcd8ead54b7","tests/ui/pin_project/packed_sneaky-2.rs":"b4c12cb780e1527a0499d1c2d7b5c02fe837e50f9ecee4940a6224fbb8e6f426","tests/ui/pin_project/packed_sneaky-2.stderr":"7b35c989b542f953e04f5a8ce871e11e65db6cc8fe0e757cfa2f577aa459dfde","tests/ui/pin_project/packed_sneaky-3.rs":"5064d6d887bf601faa37fa02375a1013d19238166127660a1e2aa1000d1ed1f4","tests/ui/pin_project/packed_sneaky-3.stderr":"65dad4659b787863f54799d72a3f1c74e584727992342fb0d53e983870c249e0","tests/ui/pin_project/packed_sneaky-4.rs":"34de127db7559ea70800c61aca6795492ab3e0721ffd28ace1d31504fee32871","tests/ui/pin_project/packed_sneaky-4.stderr":"c2ddf85d8bcb36cbad4ff2edb9f09ea4369d2b6dddaf029127943e29a52c1f40","tests/ui/pin_project/private_in_public-enum.rs":"676bdbf29579773b6b7095bb286f33f38ad7f11fdd5f074b6d62f2b85dc1fc50","tests/ui/pin_project/private_in_public-enum.stderr":"0feb70c950b91bc51c5f46635d07b2f5951b74b1982938677bb0e1bfc86df21c","tests/ui/pin_project/project_replace_unsized.rs":"a4379deabbc399f112e7fb738270798b24aa20f4e66375381a67bbc8c133cfea","tests/ui/pin_project/project_replace_unsized.stderr":"deb68e8d4a8dc7153c3515d1dc77921d21906452e65431f6ea3702fcdcc2704e","tests/ui/pin_project/project_replace_unsized_fn_params.rs":"bdc65bf0fad9f22fa3e492b6f9b326180683632f6497ccd24aea4ed23ebabfc4","tests/ui/pin_project/project_replace_unsized_fn_params.stderr":"ca4575efd480949a7acd6093304e5b74cc04e63c69065758da3bb7ecc3b12c32","tests/ui/pin_project/remove-attr-from-field.rs":"0e3e9c657c2e65e6a55c76385f24c52f4f57ac765eb83d736588e8b68b11a030","tests/ui/pin_project/remove-attr-from-field.stderr":"afa608f14c6a718353e7f506e1ce16989bffb77be38f8a843c35911f5354b1f1","tests/ui/pin_project/remove-attr-from-struct.rs":"156ed1fc029293dc9574ca9fb20f1df32e8431554ab188ad07ce84befbfdcd13","tests/ui/pin_project/remove-attr-from-struct.stderr":"8503017ad66014f7528a59ced029cadaf7c8418940850efbb329361f53ce26e6","tests/ui/pin_project/safe_packed_borrows.rs":"fbdf0969e537b79df4d9058585718004bfaa3f3711f6e721b3361b445d8cc56c","tests/ui/pin_project/safe_packed_borrows.stderr":"7b388718da74d7f12c2477d723c6d5d792ecbd9ea3bf538e47d5672761b91161","tests/ui/pin_project/unaligned_references.rs":"c97b7c9ef2ceb996a9b649fc55d5cd7bfad2d75479c88536ed83f4e2325a3167","tests/ui/pin_project/unaligned_references.stderr":"3e24a0d43a53ed8fe6628e64e426248162094d2340035803a9e502be839553aa","tests/ui/pin_project/unpin_sneaky.rs":"141a05241020fa19a191f3d8185971f02143d7e1cd6bbc1ba047d0f60575896a","tests/ui/pin_project/unpin_sneaky.stderr":"3c754697f5d059cd6dd56e86b88e1be3f4227162eff34de6ade0e897055ace4d","tests/ui/pin_project/visibility.rs":"692f19dc946452c1ead493c7007b9699cda3880224ebfb7a273b70dad7e853b3","tests/ui/pin_project/visibility.stderr":"c2395f2b01d7acfa2d7767ae7b5d726157b3ce30aacf97c3ccbe51cc7cedcd8d","tests/ui/pinned_drop/call-drop-inner.rs":"650a9ce5bb3ac683698022159b9d61467e93f96462f95f574436cd636778f025","tests/ui/pinned_drop/call-drop-inner.stderr":"d7143f3a5531f48fb2a8eb7be7a1accc1c68bdffa2871aec186b0bcbbcc28620","tests/ui/pinned_drop/conditional-drop-impl.rs":"2b2565a73bed6bcdff1eecc8485f5ee4a1751327bc1f79e8d602f6c25da7cbbc","tests/ui/pinned_drop/conditional-drop-impl.stderr":"56adee9db46230985ec6e5e785facd2a0847933a134d21b81c96a4b47edc617c","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"2cb7ba54a39df5a0a5313a7f780790eed8bc29cb808eb160c558b8a95b2737b3","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"62f60ef0c898589bc1f48856008149f63fabd7f67f4fedfbad4004f16bd8f6c7","tests/ui/pinned_drop/invalid-self.rs":"32241578edc380d73fc63e7758be479910281929db5e88e7c81b6e463026059a","tests/ui/pinned_drop/invalid-self.stderr":"83dbba93be334ddfca0dba0877b99e30b407707c66bf26ab99d04a19818543cf","tests/ui/pinned_drop/invalid.rs":"692e1cad7f04ba46d1e38b46b463976c7d6a092d48607add5f38921bcfbc9863","tests/ui/pinned_drop/invalid.stderr":"b41121e83dee8b4e60799acee53023dda996b24ce3acd18314db965a7db4c5f0","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"8a933c68c09b12cc9080957381c3fe8e67a07dc1dff389f1c300d72bad384d7a","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"a7e45aa46c8dda33a5f5fd0630e4b52f15a8450ddd10b0a671e5708d1d53761e","tests/ui/pinned_drop/self.rs":"3187cfd952fff39235b50cc3020de4950581cbf2aa93898cfffeedfabb74cfbc","tests/ui/pinned_drop/self.stderr":"069a3df3c40c25df68910098dfa966719cd0eb824daa9104d2058845e8f963fb","tests/ui/pinned_drop/unsafe-call.rs":"768ab2aba62b2e01447614f84e1f4c3ba5bcd3dcaea2a133e43a902e0c34e52e","tests/ui/pinned_drop/unsafe-call.stderr":"457cba20d6ac605ed014534595dd05a61a63eacf920c68336bb7a38a1f875321","tests/ui/unsafe_unpin/conflict-unpin.rs":"5469fe1f974f3b29892eaaf925bbb8fb2d4071228c125b3c328031a0acba3c12","tests/ui/unsafe_unpin/conflict-unpin.stderr":"d2842f52f894807fbe7956d2885f92111ff9a9f38b8a6c39d86a962ecfd1aa8f","tests/ui/unstable-features/README.md":"a6af0dbea166dafd465f3bd86f330b1d1ee512aa8ca61a7fcebaca5fdd19a891","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"3d1acb310aa24eb112284c4b06c9bbe5198236a105bcf418655d1aacf8eb0c2b","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"7743c2d0c93875e727cf69cbe9b5f35973d784f13837217cd3ecb2a774a1f3d7","tests/ui/unstable-features/marker_trait_attr.rs":"e3cd5f7f5d7f67b8a21e6f1faa5c54902585a4346b03403cbd2f1feaf297e429","tests/ui/unstable-features/marker_trait_attr.stderr":"920a25bb86c515d0b4d807e33001da18eed7a4e92472c4354907ba0b0138734b","tests/ui/unstable-features/negative_impls.rs":"d9e74c06f61b28b824a3030f79449656a0642d34a7632c549fb84511c26fd108","tests/ui/unstable-features/negative_impls.stderr":"1323e4a29c0e06bb07fd059499e21a465fb9cb31d7e8f9a779efb069c87f2be9","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"14baa724d55a018e73cf12ed3f9082923e252c14de4b0fa7aba68d5f6fb9f107","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"e5c3e7e1a8514e7026ce24b5dded3a1191720dccbe1b02fb46cf368bff0a595b","tests/ui/unstable-features/overlapping_marker_traits.rs":"bf517cef2f118a4fae483d64a5072d2575e688ee294c64e0ab74b11827299dc1","tests/ui/unstable-features/overlapping_marker_traits.stderr":"d89628f1ad60d793f4da348f5af4db297d6a3868175651675c7d2c8645edaa48","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"273358a6811251c31e9d7038d5b0b9d467abcd7d96a40315a69a886bee6e0867","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"3c49b79c70c3abb60902efddd6e1f19f3e805af21894ad8696a2026051e894e1","tests/ui/unstable-features/trivial_bounds.rs":"43d5f32352a738808603b0c4a08dcd857abf7102b3aef4ab005664c9f3220cb0","tests/ui/unstable-features/trivial_bounds.stderr":"426c6ee44da0e7f5365a690628fb65316fe403acc5d4a367f8110f891932c5a0","tests/unsafe_unpin.rs":"69ba6b42ffc9ec8de75c437ee512a8d1dda4261097310c09f416657de5a4a989"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"664ba17d295bd8320888bbf7dffb59631d6243903374e8279eb0bb4bda6fff44","Android.bp":"6dc6cd836d95255665257a03a31764c4a6b3507ba6ca9731a2a5949f37c5d46d","CHANGELOG.md":"3186090f083f4156c686344e726afd46b0d2402e2d2303f530989b65572398e1","Cargo.lock":"4304923f6fd5283e23b6f39482eb00bb8fead6d0d09dff017605fd04a302bb7a","Cargo.toml":"de0666e6e35587f39adc42e6e3dc805cbca27bcf8ae4ef7b48477be2a50fecc3","LICENSE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-APACHE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"dd25f90d41e420503a0e12a0f6b82d12479c811703dd5354562b7e304a18450c","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"83ecae571fc46eed7fa5cfb5e930b6b1dd0a6d79c24912fecacc955318987b3d","README.md":"c8b595cdcd22cf25e1669e3f69b5a726993d962008ecdaf714ca8104dec06aec","TEST_MAPPING":"41fe943b979ce266ae7fc1df55149ddc11cbc7c5644d30182d11a108425021d0","cargo_embargo.json":"544abbb62553b71d416392b8af5ae7bdfa8e6260a5d9e9e51fd617c60558d53b","examples/README.md":"e206042a10acd5844ee8486a68c0f3d7fe5c5ca46ad4e16c4786e792efb2c155","examples/enum-default-expanded.rs":"ced74ddbeaa55c1e034a81cc66028b9f6b85892148497f38a9d568031fe8b28b","examples/enum-default.rs":"851135afd9128951ad90f3a3699356f49264f39cc1809194bb675ae0f29fb153","examples/not_unpin-expanded.rs":"f8477a12a7ab16e6010280e1f50e93f48cee04367082fb186950491f52cee2c4","examples/not_unpin.rs":"7ef25dfa4d8baf9ed3e1fbe3fb01109818c8c2b0c58de5aea1cb26afbac16746","examples/pinned_drop-expanded.rs":"b16ffe75c8b5fb42a911926379d7974ddacfaeb12339f06c74a0df57c4aef049","examples/pinned_drop.rs":"a6ef90dc0070ac0c9a82108c3dc03d4c2d5f873e71f938672f965205cbd2290a","examples/project_replace-expanded.rs":"4ae5c7445d4cfd6c193c8b17eb74b64e034ea902b12e417348328dc7d5d2a345","examples/project_replace.rs":"fd026b15cdff895ad9ba13843d9d2b30163e8f811ecea1d46d5b64d27cec259e","examples/struct-default-expanded.rs":"d19add44271c614ad4b0d0e15923e6eee770dbc3aa2421bd6f0a87dff42015e0","examples/struct-default.rs":"e0275c5d5167cda495348ae6c5dc3426b544ff891cdde78a56873d27cf4503d8","examples/unsafe_unpin-expanded.rs":"1c3c3df6ef6aacf93e45fd5762e3793ed713b80ab33fc8fde6df58ac452dcb5d","examples/unsafe_unpin.rs":"30603523a3f0152525f03a22428d1cf1e8fc777098e448dffaa4364acbdfb1c7","src/lib.rs":"c15f348d729bce686ed1a33fae4411f5ee0f7b1e296976f26c33f1c704524418","tests/auxiliary/mod.rs":"b9123395fed2c3dadfa0305d42345a4bcb9cb67d3dfe9cbde23b381341829378","tests/cfg.rs":"f4a8dbfbee02abe6e67be188a78c4c7d8f5ef3adf2b7557b17d27b4a187ccf0f","tests/compiletest.rs":"5d782c030d298dfcb7f94c9df2549dcc54df4ef1a1bd8be034c767d13ac31310","tests/drop_order.rs":"7ab3007894cd60f45032d164fd5f3a0a1f066ae570a145d47e95cde81b988ca1","tests/expand/default/enum.expanded.rs":"31947516a8a9bbaa347a0cf27d84c56e79e80443f87be9570ea1bc82cc6e7055","tests/expand/default/enum.rs":"e491485303dcbd229ee5cb305bf43fccd388ae25de2d575f0b8646b2d0e1ee5a","tests/expand/default/struct.expanded.rs":"d7aad6e4721735a656834c511dd86d063dba008d7cb806d7d1cf6bae4b69fd18","tests/expand/default/struct.rs":"cd1e94e24c2d445fc39cfcd6dcc6b383504c64be3286402b251023324d021944","tests/expand/default/tuple_struct.expanded.rs":"1540d097190c0cdbf4ce6fdf60bd0433b900ba8744d17d3c72f57282c167c2a0","tests/expand/default/tuple_struct.rs":"ad29feaeb15576956bcfb6eeec4aead940632b9a0e8a9752e40b28dd1a4bc2fa","tests/expand/multifields/enum.expanded.rs":"a09625aeb62fd624deb41e2389bcaa2b53e423734cc79d0a64a24e20a0c7123b","tests/expand/multifields/enum.rs":"137ec6025d261a93edcc594844b4163facc5597825a72967e862b95b7c73f1f7","tests/expand/multifields/struct.expanded.rs":"01fa3cae934214bf7d5c1d9abbc44ecc8d5711addd063f052a5d82ec7b6be88e","tests/expand/multifields/struct.rs":"6c45dd72f1e3fb09a0eb75a96d95795c4b009603d8a51754ca6c837108507df7","tests/expand/multifields/tuple_struct.expanded.rs":"4add15111969812d5752f7b6fbba844b7747754f316c0b29c22b70639828ddf1","tests/expand/multifields/tuple_struct.rs":"5f7cf2411f9697375e8a7292f47a057df9cdc231f88133f0882a57f0e5c2fe65","tests/expand/naming/enum-all.expanded.rs":"a0578edaa0ab4d1329a3e3f7715d8ad712a0965c6f15aad693394aec7911f05d","tests/expand/naming/enum-all.rs":"d4a6f83c89cbb283dc3cdb28ea94122a6a730e6cf76a8b759572b79fbbaa14af","tests/expand/naming/enum-mut.expanded.rs":"885c03fcf434c41b07ec485980b8ccc93a237761e1d0135f6e8bd27edbd201fd","tests/expand/naming/enum-mut.rs":"4592e5dfdf27fd1bbe038cfa03db8946220a2cf6be06c68f7b52a90663a2d1c4","tests/expand/naming/enum-none.expanded.rs":"e2edec44f298f839bfefb3f86bab15be158ee60076e816110d8a7c4a4cf1971d","tests/expand/naming/enum-none.rs":"8359b234aee3a94e7b13b489bb15dbb990ca6375cb1dc1cefb3fdfdb04e8d337","tests/expand/naming/enum-own.expanded.rs":"075354b43bb296d04f1319c0736a419302c68e56383186a9fd58c1170a78db53","tests/expand/naming/enum-own.rs":"fdf3da7b3c96df6ff02cb4ad18929bba056fc554b93793a5298909c21a0bf043","tests/expand/naming/enum-ref.expanded.rs":"b1b6550431c14e97ee7354a51a1a01df90e85c7787df83edab99af82398d6d00","tests/expand/naming/enum-ref.rs":"8ac72026a35590b07f2ab295ea02ffd5f366a27c2df52c93d90dcf622e3307da","tests/expand/naming/struct-all.expanded.rs":"e3bd7957b250eb42079e6bc04dbbfd0caa18f2b08320607c9a80511d97a93ff0","tests/expand/naming/struct-all.rs":"52dda7203043aef805de328b4242931a1a56845ea3c8cdd4a75f9c7276c21a6e","tests/expand/naming/struct-mut.expanded.rs":"2ba18a48b11d5bcb66aaa571ec5c2d7786f8836cfc4e959bb43a6d1839bc6de6","tests/expand/naming/struct-mut.rs":"f47f1b24ef42a29d1073fcb3bafae5c444acf7bf732befc52f1c3b8acb865e27","tests/expand/naming/struct-none.expanded.rs":"d7aad6e4721735a656834c511dd86d063dba008d7cb806d7d1cf6bae4b69fd18","tests/expand/naming/struct-none.rs":"cd1e94e24c2d445fc39cfcd6dcc6b383504c64be3286402b251023324d021944","tests/expand/naming/struct-own.expanded.rs":"c977f7cb13d16687b9fbbfa249ebb3060fe9149563a8a70342845390da47e163","tests/expand/naming/struct-own.rs":"10c1e9abb52ae58c1381565ae6a4b3caa2738f002df03d1851f35a8dc108fd35","tests/expand/naming/struct-ref.expanded.rs":"a7dedfbc0e09301b9af158a76ee42d0a4c732696ac8ae138e9acb4ea83da9401","tests/expand/naming/struct-ref.rs":"3c5554e0b23c0e8403d34abca6d261dd9474ae4b5fdaccdadbdbb4ef50269a24","tests/expand/naming/tuple_struct-all.expanded.rs":"523d64b1e6839cf19330a40a02bf33f0dba1a7b248ecfe8b7ed7f00456df3c0e","tests/expand/naming/tuple_struct-all.rs":"7214728a1ca792c2076473ca77096c84350bbef03b6d1cc2806766fe1abd8095","tests/expand/naming/tuple_struct-mut.expanded.rs":"2d46da53a6c8fb33627853da9438441e674225d24fee38303fc0cf53d02a4c0a","tests/expand/naming/tuple_struct-mut.rs":"fb2a16253dfe8282c746c763e6be6e35447f97e04bbff9e64ad6680c46d515ce","tests/expand/naming/tuple_struct-none.expanded.rs":"1540d097190c0cdbf4ce6fdf60bd0433b900ba8744d17d3c72f57282c167c2a0","tests/expand/naming/tuple_struct-none.rs":"ad29feaeb15576956bcfb6eeec4aead940632b9a0e8a9752e40b28dd1a4bc2fa","tests/expand/naming/tuple_struct-own.expanded.rs":"bccc4250dc2ce435d648ee467cb18ba3594995d6f4361faf0a47c906bf2d6beb","tests/expand/naming/tuple_struct-own.rs":"2069542257d89b923707ee3ee17b4909a60197d00adb8cf6a4ca7d89dc93262d","tests/expand/naming/tuple_struct-ref.expanded.rs":"44180b43f151a1033501efc37a1a259e7e023b5917b70fb81d46028e71cb222b","tests/expand/naming/tuple_struct-ref.rs":"001473e71e296a630e433821c0bcd087fc24ce7b7f5a5008ad53864e658877c5","tests/expand/not_unpin/enum.expanded.rs":"2b18b3b11b6bcc585ab9baeafd02dfdd8dc8b6c7ffca7d4f97546290f2c903b9","tests/expand/not_unpin/enum.rs":"a8dc1e4f46e9156643cc61b1625ee162ef8392451c5b05bbe0364ab05b7e5d1a","tests/expand/not_unpin/struct.expanded.rs":"ec2f6cfcd92274c6fae9a7b64bc1711e237ff1741e1d790dbaa510abf17d3f2f","tests/expand/not_unpin/struct.rs":"a05cc177a214542c862e5813f52e669733b75b425e5c40aaa367e7f1bf150034","tests/expand/not_unpin/tuple_struct.expanded.rs":"d22e484c3b99c84257bb5bceb1b53c91c1112987d834ddd6a6bbebdaeb5fd0b8","tests/expand/not_unpin/tuple_struct.rs":"000189b96da0742260559f198a5c73f07c172a79bf83293c191f2712ac412d43","tests/expand/pinned_drop/enum.expanded.rs":"dd10544eab678f6701cf8a83aa1cb5ac96cdca3fc5394ab2252541fae4af3a46","tests/expand/pinned_drop/enum.rs":"4d7beb8f6f7363505924a5b5511831a323dba5d175f395077a6648fd909dc532","tests/expand/pinned_drop/struct.expanded.rs":"adc7c93777f0b8e2bc7bea1b304f461e52525cc5c6a6713eada41f1a731f671d","tests/expand/pinned_drop/struct.rs":"94f46d7ae9a8085aa9fc41430424dd3a47d342cdc20862007ab8157b3c6a06d9","tests/expand/pinned_drop/tuple_struct.expanded.rs":"135826d487b3eb88468098cee6426dfb814e9b494f669f2146d357fcd093cf53","tests/expand/pinned_drop/tuple_struct.rs":"fcf8744c0da22480985f8b4a0e7edfb45e3c77951e3385f733b8dfc37e9f3aa1","tests/expand/project_replace/enum.expanded.rs":"18db32ccac42f8fc23b8d6e586a9fd97db9d856c2b53824a2a32888dacafdcf1","tests/expand/project_replace/enum.rs":"1306c7a8a13bf899ef30b6d29de9c12c45aa63d0fb423d1e22faa1d8f3844379","tests/expand/project_replace/struct.expanded.rs":"c96f291b21df8a4db65f35c3b7ec55d7314c2bc244111df9cf1860cf260a4fda","tests/expand/project_replace/struct.rs":"c1a1cac6d2d3259822597db32d27f64828089066e9efe15191092f55d57764da","tests/expand/project_replace/tuple_struct.expanded.rs":"917fd567fe93e8ad9f8ccd299868f2b44c7e4872690e99fd57b1a274bef786ca","tests/expand/project_replace/tuple_struct.rs":"30e98fb94e669d9ff86245975e9dcadba2874704cea9260b749d500b983a9dac","tests/expand/pub/enum.expanded.rs":"e7fa2a7c0381adbea027f78f5478694589e659560c8fe473d65197f1f52f1a53","tests/expand/pub/enum.rs":"bc0302ebe94de598274ffdedf313046ad8614edc78aedbaf9d1484ffa1971e6d","tests/expand/pub/struct.expanded.rs":"0b136e09183b4621c16a81c1a0d001474341581a1f765e0291df740ba0b700c3","tests/expand/pub/struct.rs":"2cf0d78895b479ea288edcd72634de89a7181a78b8d43fcaa82b85110081b83e","tests/expand/pub/tuple_struct.expanded.rs":"3431437052f16a4a2d8a2e30555896e65b17584443effa5831cf95c48b8ca1b4","tests/expand/pub/tuple_struct.rs":"5cfc377bfadeb9c7e3e273d409647679b18b664fedde3a82f951254d325b7ff9","tests/expand/unsafe_unpin/enum.expanded.rs":"51334050e295aab594af37c3ebc3655456aeef40cde655e0e56a26d3cf6a1248","tests/expand/unsafe_unpin/enum.rs":"47ea2eee541741f2796ada21f6b3d191081c7cfad4ddfa626b3b6fbc4909f130","tests/expand/unsafe_unpin/struct.expanded.rs":"3183bff456d36f51e80ac5352510a2ed7543256b4da69109d56db3f298f87670","tests/expand/unsafe_unpin/struct.rs":"7681a3668d5b2ab662d85e10b50b13cd48ab08787fe8bd50f5667531693e6a7c","tests/expand/unsafe_unpin/tuple_struct.expanded.rs":"6e09b34d3542e97b4eb237008ed29794b3d39e3a0b0b0d09a07b2c326dc00110","tests/expand/unsafe_unpin/tuple_struct.rs":"5b19753b78aca8812ae227722d4ecd8370c608b43a2587e33b2638004aeb7240","tests/expandtest.rs":"887e324f6173b55f2ef70105aced9dedaf68888a7025f6375742dbc8640e9a86","tests/include/basic-safe-part.rs":"51f87b5a05dc5f4e97001ce960888fc60753bfe46f57915062ca582c9944e64c","tests/include/basic.rs":"79d34947b49deed8a4f95bddeedaf8f9ab9f5d9147a05f9d84c8e79442f22b34","tests/pin_project.rs":"7db61ed10d66eea3576b6b1e3027d6662bc4a053164cce8e7e80d7079bf65f2c","tests/pinned_drop.rs":"c412625c74e1f6a4a197e00b07d8bc2d9cc11b4e2f67313142f134de64d3106d","tests/proper_unpin.rs":"bf69749ed9853a107307fd84932ecf29d5dd24185a0f3901cefa816d0ae65725","tests/repr_packed.rs":"8654cc12e3501d7d44839433da0c16883a70c964aeb4e08f222b2de724473043","tests/run-pass/private_in_public-enum.rs":"3b3d0978078062c67bd61202a5698a6b444152fbbec78fe8b30536947e8452d7","tests/ui/cfg/cfg_attr-resolve.rs":"2f9c1ff41d6d84a4a20aaab0aecc9f5c009bf5322e6c12e5557d222d10a5c504","tests/ui/cfg/cfg_attr-resolve.stderr":"1466d86f1a51885844339682daafaceabfdb15897da5647408b57934ebd4e51d","tests/ui/cfg/cfg_attr-type-mismatch.rs":"688d5ac62ae16219ece34774f393ca5ac438e73aba69e210ee1b2a91ef0e63bd","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"f17869843b04d75f8c7fd63933bd2af7702d30fdab5b03f03853b240ad0547ad","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"1302f80e5f5a3d7654985322b040acc9b2f3f41187db554ea6c7bf1fcdb5e994","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"53f4de5d010606acea3ae83e8b03beb16012ed9b36745ad9387ac9ae2e497bf4","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"4187b397a793c26a17618f701df7813156105e56b86a8ef2cff60685831098f0","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"2b02e29a3716717c3fc24ff7a047a1ca46328e23cd2ca73455e4770e0f2db47c","tests/ui/cfg/packed_sneaky.rs":"d0ebf11708599ef05f6c269a685ac2d002286b34efb38108377bb71b53c90b24","tests/ui/cfg/packed_sneaky.stderr":"7f0bb145155bb1a3259ca82ba49b1f14b709602e9077caabd39043f0dea7efbd","tests/ui/cfg/unsupported.rs":"25a2333b391b3648a94a5220e4531b975a71ba110547b8a15aeb4684e88b64ef","tests/ui/cfg/unsupported.stderr":"3d30bbc50ff91d2665402ea0c17e85e507843f6277d7764645f2dea37c882cdc","tests/ui/not_unpin/conflict-unpin.rs":"a45f6cedf95246e5f17664d5133fb0e310c6ccf19e2f251920c2821366b12496","tests/ui/not_unpin/conflict-unpin.stderr":"5fd23982b386252f07c630057d35b519b2f67a141da341753c83e1ab4184cb85","tests/ui/not_unpin/impl-unsafe-unpin.rs":"de91385fe84540275be6a1fdaf53748455fc322f61d73b9f963a7c89ea961672","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"6760d853dbe2fda8a4fd7f337655fdf335af70f4de329ecb9f0d1c09a4d0b564","tests/ui/not_unpin/negative_impls_stable.rs":"24e5832f0bc12e9d54b34e0c292e978dfeab0cae405862dfcba721cc268ff709","tests/ui/not_unpin/negative_impls_stable.stderr":"78c9bffd0ebce4d7338cb85ab08b5a4c1ff8d418274c3bc82dfbfefb994a7a2b","tests/ui/pin_project/add-attr-to-struct.rs":"db0015ada1b2c6212792c6ba65d90b45b0f9d0fe842ac1f9bfa8fb4048e6279d","tests/ui/pin_project/add-attr-to-struct.stderr":"63231706008df27eb968a5785c9f76a639fcca25f09b756e5991014ff68a9cff","tests/ui/pin_project/add-pinned-field.rs":"297f48151a3c306f5426b1c9fbb8640fea77a9b512df4e68b84191322211eb9f","tests/ui/pin_project/add-pinned-field.stderr":"84d8eae1016a7a4e74bab8309738f5776ca2800e8235caf6810d180d6bb0f9c6","tests/ui/pin_project/conflict-drop.rs":"644cb486b1ee926b72c5a4d95e1d6f6a276e1e939532dd0b81728eacc3e1e96a","tests/ui/pin_project/conflict-drop.stderr":"fb2aa66d4dbd35557e748537715fdf288e1607c3794b7b9bc22a97a3054ad630","tests/ui/pin_project/conflict-unpin.rs":"5e50657e3b95734d745ef2b3cbc077bad42e917ea0212755c09769d249e3ce80","tests/ui/pin_project/conflict-unpin.stderr":"08d704ceb7d4149b331209babcc743f7028279518ea4ccb9954c59a448a1668c","tests/ui/pin_project/impl-unsafe-unpin.rs":"81907d29bb092464c9a26ad6428da907538eae2491583cccab311647414c8f1f","tests/ui/pin_project/impl-unsafe-unpin.stderr":"e012af86343d21e0e5910711a737c5232756cdd042bbf9eb3c492436e2c26957","tests/ui/pin_project/import_unnamed.rs":"602e39c1439500f7befd08489e3cdad1f9322b28622b5a2f65531ec9d6f4adf0","tests/ui/pin_project/import_unnamed.stderr":"5fde4e1cf325540c01c1344da37c04fcd6fb61c3df9cbdcd865ae8ac322d2307","tests/ui/pin_project/invalid.rs":"b04c0d2b9749974de01290d5b352c750185c7b4c89c3eccb013cf1c1cd336e85","tests/ui/pin_project/invalid.stderr":"28e802c455e972c4731b56e8bb6fcad379777e0ac1dead5aa39da80494fb1061","tests/ui/pin_project/negative_impls_stable.rs":"cf1d9529fff32b227d3aeda19ba47e7da43953c2a849dbacfb99ef669b2e87d6","tests/ui/pin_project/negative_impls_stable.stderr":"83f103cf40a699ef9f79ce3a30d4b2d3f8090560e9dcd3ca346868ea7c2765f7","tests/ui/pin_project/overlapping_unpin_struct.rs":"1f83380c9cee15a6e3eefeaa861d8c8fa034705846a02e39851edba71254de37","tests/ui/pin_project/overlapping_unpin_struct.stderr":"17b67bb8ce17dba28549ad3257af72f6d5987cc4beee1f3e51c85ba47e828246","tests/ui/pin_project/override-priv-mod.rs":"85285c506162ba59954c46d833c18a675040234bb51405509089bbfb6aee6eb2","tests/ui/pin_project/override-priv-mod.stderr":"60ada8c064ff7fab5c46be9eb763a374a07f0bcac1c7c7b0c68d7f8f21d101ed","tests/ui/pin_project/packed-enum.rs":"31f659bf1c18f394f0e863468342e0b03c8a2c806d7b404835bf9ec2aafc8d13","tests/ui/pin_project/packed-enum.stderr":"c5f0b743dd9a655d1888bae981e7c433797705ba54a1ad5abbd65ecd40dc8481","tests/ui/pin_project/packed-name-value.rs":"7ca8e5111d80f9a502ff5027259dd6031ba8db2c02ccbb5c4855c01e243a18fc","tests/ui/pin_project/packed-name-value.stderr":"0c4eeca42446f57010ad7ce77023163ea21e00d290936af90d27799dadab7da7","tests/ui/pin_project/packed.rs":"a9cc913f22a086ab3d984d0bae3d64f66a0742c031ecd27afae3d0af01e47fbb","tests/ui/pin_project/packed.stderr":"8db14779104063fda47188de09fe3b217984e0de46a31e9a2b9661d4dfffe241","tests/ui/pin_project/packed_sneaky-1.rs":"88d087ce802e115baca261a6c8b451643b3bf78000869361d9f56d3df98b8925","tests/ui/pin_project/packed_sneaky-1.stderr":"729fb8994386f45863d8e15c20afb0dd7c78e37fb1efb939d2b3fc8ab2e97eca","tests/ui/pin_project/packed_sneaky-2.rs":"c9a520247b04a6d347ce604e3b52da6c188636c8c5899a64ea1c2c6630da50c0","tests/ui/pin_project/packed_sneaky-2.stderr":"f8f93f714112a521cace50a353e9386eb76c5493d46be2048379426f149044a6","tests/ui/pin_project/packed_sneaky-3.rs":"e476daab3f07bac21edc5f9e4f367a0dc4a8766c77fe59425284db5a15d5cb52","tests/ui/pin_project/packed_sneaky-3.stderr":"43f3e3af97c8a72943f0dfa26b28c177f59791188b2d04dc3e8e1d044bc8b1dc","tests/ui/pin_project/packed_sneaky-4.rs":"ee000562021dc0b839cd4d2ab897934f6bef732a99fd5e97560612e99cf20e1e","tests/ui/pin_project/packed_sneaky-4.stderr":"f50bd26205f3539951deb4d99b47a73f9162ae68c6d510ea8bf0ccc9cc2ceae4","tests/ui/pin_project/project_replace_unsized.rs":"638e36811ca26aa7f7dcdc5323dbe3a78827802d25e8174c3f4b680ac8f3410b","tests/ui/pin_project/project_replace_unsized.stderr":"1b9a3101e262e187275200d2ae6b7f20d89ff0a7d1a7e3c604c5a6b776c7a651","tests/ui/pin_project/project_replace_unsized_fn_params.rs":"02a50b50e8b57fedcebdb7d8fe8c002a622d249617ce5b85ca1c353ec0b681f9","tests/ui/pin_project/project_replace_unsized_fn_params.stderr":"3790ae6c9e13acb413ef9166d47f1867fcad0c393653d0b4cfd05a2e8818fe7b","tests/ui/pin_project/remove-attr-from-field.rs":"de9ad40c86897229931550607c87a5a075f9745ea5ece4e83fc77f153eb5fb85","tests/ui/pin_project/remove-attr-from-field.stderr":"b609e2a34041712a4990dddf2482df63128ae25625ef2be3715265f6c3aff542","tests/ui/pin_project/remove-attr-from-struct.rs":"188987520e0e4657a46d0db704067f306b1487b2d9fa6cd849ea3a8020f17f1c","tests/ui/pin_project/remove-attr-from-struct.stderr":"db9a74c2fd6387d8bdd37df71d321481fa7f34c4eabae814649e9945331b8aac","tests/ui/pin_project/safe_packed_borrows.rs":"b73f4f02e1cd674e65621cc3671ae15d23eb6f6952f9c5a1244c18d5fcbd8a3d","tests/ui/pin_project/safe_packed_borrows.stderr":"0ea1e14796d35dfe66738d1b781b81eb4dc9db83f3e1bf437375ea54665c61ac","tests/ui/pin_project/unaligned_references.rs":"528d0b2a0fcbe3506bfeaa4d42828bd406bd3f268270ff81435ff4cf2fff6d89","tests/ui/pin_project/unaligned_references.stderr":"f6b650b67d45743a8d533643af1bac1454e6fdf22363a9dd0dc8e9d86c199252","tests/ui/pin_project/unpin_sneaky.rs":"7e2fd5647204f1161d7aebc93033f1b807727ebbf110698bd780243a7042e83a","tests/ui/pin_project/unpin_sneaky.stderr":"b2d75a0b4618762ae4843b1aa98448639a643a6bf7ba31ddd65b0865f31989ad","tests/ui/pin_project/visibility.rs":"c9676fe843e73ad93744a6480f1d81e7a2ce66d84b06380440a2e71dfe2ffa94","tests/ui/pin_project/visibility.stderr":"7122d0879ee74ae4d36956bdc2f4a13250bac0fbd2ddc0f7aaf4432bf758a55e","tests/ui/pinned_drop/call-drop-inner.rs":"7c06c75a3a553475f91f485d74c6e00803eabf5b0e6a3e685f76e24140d55b1e","tests/ui/pinned_drop/call-drop-inner.stderr":"b75c65d58d37f2abd8a38982ce18f49453498d526cb90fd66e74c2bb4761b089","tests/ui/pinned_drop/conditional-drop-impl.rs":"e60d801f02471fe24e5676bb22e057ebcc0a93efea4a89cb2b2ce111759e227b","tests/ui/pinned_drop/conditional-drop-impl.stderr":"ef4beab33c24b08b74e0196ef43fbf5c39101adb17e61aea51cc3b2318c7e2e0","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"2549e790e07a7b0f5581264ba697fc7a246c1656ed3a4721f9ee63c98790ba6a","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"53d1d9fd9bc6240eecba60b4272ad7ee8dcbbd9c6953574e06e0f50ee99d0c2a","tests/ui/pinned_drop/invalid-self.rs":"a54a4efe1d4d9ac21158b683d72c6d442d959d13ec932c4cb7ed2fdb7f51e073","tests/ui/pinned_drop/invalid-self.stderr":"608b54edf7b4de985a1d9b85941c3f3b40ef4ad31a72563c7b85e886996ac2f0","tests/ui/pinned_drop/invalid.rs":"b90d2b05ea80ff4c029012c30b882879012e4c06abbe81ff3cf805de7339cceb","tests/ui/pinned_drop/invalid.stderr":"e581390b813b796e2dfc6d50109ce44d3a189dfc64be142488518c86392c5f01","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"2290abc6c04c9a43f0ae373da8467312e9ebde49ac4494dc4b25d3d9ec77195f","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"47134930e65e57fef3b3090c7395f549a2f4fd359b7848678a31e40cc9990f39","tests/ui/pinned_drop/self.rs":"c9a62b391a2dbcaee18b97b16ba4ba5241c74524e6556373034be030ddcbc13c","tests/ui/pinned_drop/self.stderr":"4aca85c908795d8e43715b69c2067c6a7c716d0f6d7cf007b861c1be85b9b84f","tests/ui/pinned_drop/unsafe-call.rs":"37732ece3b744454ed3b9ff3ed1e03bd98f8b33be4cf1fff593cf7a8d3a142d0","tests/ui/pinned_drop/unsafe-call.stderr":"967c435a5e71ee5272913ea2f2ac203c8e56d5ae94060337d211d90815235d64","tests/ui/unsafe_unpin/conflict-unpin.rs":"e87731cde1aeed790de905a56535bc764dc926b26b2d3984b0270d93b005caee","tests/ui/unsafe_unpin/conflict-unpin.stderr":"13f98a5f0fd81d7ff66c2e9b83be39be95c150113966cdf84ae3ab01892c6adc","tests/ui/unsafe_unpin/negative_impls_stable.rs":"1ee461bd284039ced8f531b20fe3c13d461c272800e9a2d352451ea3fde3e478","tests/ui/unsafe_unpin/negative_impls_stable.stderr":"33b4c7aa12ef28078c2a62bf1a75756f5f4b579e0e1f991ee430d26b838107e3","tests/ui/unstable-features/README.md":"a6af0dbea166dafd465f3bd86f330b1d1ee512aa8ca61a7fcebaca5fdd19a891","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"f8d3410010b8c837b29ed5a6b7487dabddd5b34c123f8d8cfa59afb15528e2ae","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"835357866988caa6085f8eec88d708eb8b403fafd7a8c248b2d3cb97fba5fd76","tests/ui/unstable-features/marker_trait_attr.rs":"1231237edbe70eddc1c3948dd96a02cf6368fd72dce1ad30789374c098662959","tests/ui/unstable-features/marker_trait_attr.stderr":"1c76113541ed4327a29ac57553714f636a58308a69e7e68f4e630de402e55402","tests/ui/unstable-features/negative_impls.rs":"747ffa67c50f6821dadcdea54e1b04b3e2944c3e5752ae31b3e226bdcb478b0c","tests/ui/unstable-features/negative_impls.stderr":"7e52a83bacaed474c16d09bc896958300acc95dde167cb13cc93a52b0588cb4c","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"14568450d230a85785c1c1de6c936fe07879be16143f4b300e8a218230b41a86","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"e596a478f7561d97e080ed3cc4201c472c73a8479ebdc609540bba2a84e7e024","tests/ui/unstable-features/overlapping_marker_traits.rs":"08aac94bfe9f9ea14878fbc3db3b8825ba7619efed0dd4a1969085ac4caf86b0","tests/ui/unstable-features/overlapping_marker_traits.stderr":"48e4881853aac7a89ac37be90a5b895a749e76ce5a67db4396233665bbbce393","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"1fb507511c983157ca807b12de7ea734e3573cde40e4f8a532600aa3e5172482","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"b70788fc7d9b07e4ab2c30a7e3eff5076c00ef1c5c89f673ffc3fb5abc1c426d","tests/ui/unstable-features/trivial_bounds.rs":"534c8e6940bc2c0b9e646fd0d7092571a89f373d26cc6d812e49878af40578df","tests/ui/unstable-features/trivial_bounds.stderr":"88d63bd43a11d4f07e7b6fc9815c6c12e0da1dd732db4e0830619a510ab5c81e","tests/unsafe_unpin.rs":"b6ff41006c5ea40a41be7ac9ba58d52153249f7576d533dc938c115a6f4101b3"}}
\ No newline at end of file

crates/pin-project/.cargo-checksum.json

diff --git a/crates/pin-project/.cargo-checksum.json b/crates/pin-project/.cargo-checksum.json
index e4fb1ec..3cc3cb1 100644
--- a/crates/pin-project/.cargo-checksum.json
+++ b/crates/pin-project/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"01d47269fdc1c641ff4311ed92d7358741dadf80bb39f2ba89db27f5d641d2f9","Cargo.lock":"e49130f610bf3de0c8498a2e6aef6fc40cb4b8b914d618d9fe27e3368fd20514","Cargo.toml":"37234c90c423f08c93dcfdf1df92461a0158655e8e3a022664e4668396465df3","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"881afdc0098d23c7f4959d31a1f48177bb81d74625a03e8decfa57451629d54c","examples/README.md":"e04e4ad8c5518aaa839b1255f9aee47877ae223053f32d83db797f607b9422b6","examples/enum-default-expanded.rs":"92414c9b48f3e280ba10994a426629da799d125d764d1b3857676b21cb42dbbd","examples/enum-default.rs":"01e1d285ffbb87aa70950c0ec184b395f7faf0667a1fc874b4de509e3e3c8d5c","examples/not_unpin-expanded.rs":"19e944c6159b6a57a19a653adb7a30d27ddc098351bd311a91ada586eb8e6ee7","examples/not_unpin.rs":"3e43439c521089f7f58a411fb823827433c7476a0b41aecd26a6ce5f0c99e405","examples/pinned_drop-expanded.rs":"6b2bb25bcb3404d1b03276be4ae3f6c768a98b5e6675a33b24bf57bff9a9cfaa","examples/pinned_drop.rs":"8913e9b0b7851d470c3f15e40930af16c79f5ee8b4a947cac8235361b427db30","examples/project_replace-expanded.rs":"0b5adc4f83b3b56febc1a721f334b5bea26ec4aea407f35f4cce5cdde76ddd30","examples/project_replace.rs":"352d10d7a2db3de0101faedd04d69c24b9bb5021c768199a379c233886a3881c","examples/struct-default-expanded.rs":"2e290064aa48e001625f3badce5fda7e2fa7a8ce613cbe1788892b1230885895","examples/struct-default.rs":"eb60ea5412e83ac9eba96794b31772afe0798bef304b26bff65b6845638bb729","examples/unsafe_unpin-expanded.rs":"71d13e6bb284642d81520fce7adf5c1e9510451295c1806a3703dae481e64ee3","examples/unsafe_unpin.rs":"7da585f423999dcbe03289a72b14a29fed41a45a774de1af2fe93cb20aa8d426","src/lib.rs":"72c7bba16532193142134e4307bf63bfbb3b9e76c76c26424cbe2b58605257c3","tests/auxiliary/mod.rs":"7e263e987e09b77e384f734384a00a71c5b70230bb1b5376446ef003a8da9372","tests/cfg.rs":"de3ad3baf0715163d7b941bc988d67219e9c4dfb4c9068f1c60f5214649fa6ee","tests/compiletest.rs":"cd3977f3adc05369f825306218d8511289ef1398351c89f0f6aef96b3c128203","tests/drop_order.rs":"c099c11d236851eb4f27d4c14c1c19d61b32a236e5b2ce032a65265fccc25ba1","tests/expand/default/enum.expanded.rs":"e1ed1186d973286860ebc6898e46a2cd97166a13ad17c68a8a50ddfd4702f3ae","tests/expand/default/enum.rs":"e23fac8939fd21c96afaf4b10613a1b8fbfff655f76128902c2cbe8577c13d08","tests/expand/default/struct.expanded.rs":"a3577d962a10325dcaaf2eccb5e589013266553260cd8bd923264c022ddcfe41","tests/expand/default/struct.rs":"a0c95b1441b93b3ef346a47dc1e3d8113a6e1df90e577464d3f12a4e50654c4f","tests/expand/default/tuple_struct.expanded.rs":"c7f915c09ba8d268745618e68097a2040d46228f2b05c1740354805a9f6b455d","tests/expand/default/tuple_struct.rs":"1132f9700ef58079666f25173076a009c23c4f5e0ad80af80687a2e5958db6e9","tests/expand/multifields/enum.expanded.rs":"76ffa1ca4213228c43a2625e080d07aa04a992f6789052b646c7b9c639879f50","tests/expand/multifields/enum.rs":"a909ee4c44aef0d6959d46343a2927033acb665f6051f37e088367778af90c78","tests/expand/multifields/struct.expanded.rs":"3a57d0b3573841e914fbfe8ffedc600c57dccc8bc8f1d42daa8e341313adbe06","tests/expand/multifields/struct.rs":"9f99e89352d212e3d4ed9cd6be2741ea13658267de6b557bdc8302c4902c72a9","tests/expand/multifields/tuple_struct.expanded.rs":"7a65d27d0083168a7aa392463d2ea472fbc933a764ef93368edb304c5dbd486d","tests/expand/multifields/tuple_struct.rs":"9ec0b313d829717bf7d3484428136a3012a996dbd97d3ecc8a7b0ba682e5db0b","tests/expand/naming/enum-all.expanded.rs":"84932097a0c023a65337f57dbd18e5fda50a01cf213ed2f7dd2336e65e9c22d0","tests/expand/naming/enum-all.rs":"c46d8ff27879a26afb31d71df8ab69a871b2fd509ba90668cffaadafb7a54940","tests/expand/naming/enum-mut.expanded.rs":"5ff87796fbe96d12ddd13667796dc40f720147a27af0995c337810d25dcc0da7","tests/expand/naming/enum-mut.rs":"9df4e0e1fd8bec8ab471ef419be312c8e15158c7017e964a8337c3108f6c601b","tests/expand/naming/enum-none.expanded.rs":"28c0667e91a8c65fdc4fe1d80fb67398f95f47af19066e7a34ea8eb799497200","tests/expand/naming/enum-none.rs":"487f9469127b9375f53d6242062455eac38ccdaa30c168ed2ea755ad7287f02f","tests/expand/naming/enum-own.expanded.rs":"11668391ec68656d1c3a3316a0ad93853a0e8ea64d5ce0f2de205c66d51c14c4","tests/expand/naming/enum-own.rs":"5bb51375842f2956cceb685511cc34a099665439310f01a5cc02a1d4264897a6","tests/expand/naming/enum-ref.expanded.rs":"fc9527bcbb7707cf699d1721306bfd92a0c8c4f158b1ec5f5ef1618c6f5e0fc8","tests/expand/naming/enum-ref.rs":"3764e8471702f968e79f633a1a471974b7a726bcc09ce4443e0bce65194f8930","tests/expand/naming/struct-all.expanded.rs":"7f65e644aaf801570c8fac54595275d102391f4007eccb4c248721970b2b8d5a","tests/expand/naming/struct-all.rs":"a8d70a576ff5325b848d14dc8083d0967e1b3b4486fd061281484b95adade136","tests/expand/naming/struct-mut.expanded.rs":"1bd55f7e1b0218b4094db6ecbed0abfff7937281cebc0f2cad620abaa291b7a1","tests/expand/naming/struct-mut.rs":"e793dc13594ba2836881ab2580a73d73c40299af94e24a442f704e76552ce7fb","tests/expand/naming/struct-none.expanded.rs":"a3577d962a10325dcaaf2eccb5e589013266553260cd8bd923264c022ddcfe41","tests/expand/naming/struct-none.rs":"a0c95b1441b93b3ef346a47dc1e3d8113a6e1df90e577464d3f12a4e50654c4f","tests/expand/naming/struct-own.expanded.rs":"6e4c8a222fcc9d3dc10991c8033158c8a7f2a399146b9e6a1e0de7f15106b965","tests/expand/naming/struct-own.rs":"caa714f00757980ef60640a90cba289886293320524395a753b876e3050018e1","tests/expand/naming/struct-ref.expanded.rs":"96f39a4cfdedc85c8d43c9700bdc1ff6880024754215b513741071edd30ef0a0","tests/expand/naming/struct-ref.rs":"f0ce9bb2ebb0c501cce8eaa24c2657a87e58109d5bde8319e7b5d3c0bae4ad86","tests/expand/naming/tuple_struct-all.expanded.rs":"6bb2d8e8239d849836031bc7d8c6005e4f9c5deccadabb9bf872f7bdd9d814ae","tests/expand/naming/tuple_struct-all.rs":"a77e3d5d2409f9016bb8df7ca0387fa512d3383833c9591e64435b689d3710c7","tests/expand/naming/tuple_struct-mut.expanded.rs":"088257a925b4318237680f3fe4b5f1e259cbe29e8080aa856b3ba6de204eca2b","tests/expand/naming/tuple_struct-mut.rs":"06b87b86b6bed07ddfb96067772e9aaf9c1db2d3f871e248658593bd22c4a17c","tests/expand/naming/tuple_struct-none.expanded.rs":"c7f915c09ba8d268745618e68097a2040d46228f2b05c1740354805a9f6b455d","tests/expand/naming/tuple_struct-none.rs":"1132f9700ef58079666f25173076a009c23c4f5e0ad80af80687a2e5958db6e9","tests/expand/naming/tuple_struct-own.expanded.rs":"855271137c5a3d218eb466b3619a2216b4e54eacf2fba46dd530fbd3c07a462c","tests/expand/naming/tuple_struct-own.rs":"89ccd509482a95e74733c767b34f5d6bc8d4128cedc911834aa28aef08e7dc8e","tests/expand/naming/tuple_struct-ref.expanded.rs":"da280916ff79c15ab8173f723f89f494fad161f06e1ef0cede45bdecc1279385","tests/expand/naming/tuple_struct-ref.rs":"2718b96b3e2e6cdef7f8293719d8914e3fd81e92d272b90f019863fa19584a29","tests/expand/not_unpin/enum.expanded.rs":"4145ee18ebbd535d0e4d2b39d8b2f2a3ffcf9d45505aba6ff8d5819f61fca6ac","tests/expand/not_unpin/enum.rs":"60134857b6c3c2aca42e9eb2b4c6dbb9149701f115d0de30a2477395ce54fdfa","tests/expand/not_unpin/struct.expanded.rs":"ccd00941a0b0c83e39a3ea762f99d6471a06625ceecff0d3c3b5b44719a1a312","tests/expand/not_unpin/struct.rs":"bf7468f2b42284897648e2545cf0da92a576a748cd5b75893b85f03eb2a52ba4","tests/expand/not_unpin/tuple_struct.expanded.rs":"7c02f6e799f50fe63911c90302d2e4158c6e24f8f6a2fa113f467fac272bf727","tests/expand/not_unpin/tuple_struct.rs":"a3e2c2c484699087a570b1b247ce21bc40203fad889e7c0e9737d03c7ca4bd4e","tests/expand/pinned_drop/enum.expanded.rs":"ad060ff23ddff563859664e7b6b5073fc641b2925c7af1ccd5fdd4a4cc873c83","tests/expand/pinned_drop/enum.rs":"66f98ea8a567dcdeb58838df68fcba3594aea8a959826ff54fb4493fe06c4086","tests/expand/pinned_drop/struct.expanded.rs":"cacdc72e8905e29d8e75ac83771fa3834e0db4b075103f9675849bdc5a9f093e","tests/expand/pinned_drop/struct.rs":"44321ea6b494149e416d413185c2d23ed9d96982d1c4f378381b18e969abc16b","tests/expand/pinned_drop/tuple_struct.expanded.rs":"57d4e23e39c844501ceb77c66ac900f0aeb93b9002a8db565a95060152aceae8","tests/expand/pinned_drop/tuple_struct.rs":"e0532400f0bf77be198928c120e9efd9fd1b5d34f5fc9c902eb3b778c412a83d","tests/expand/project_replace/enum.expanded.rs":"1101df9623f1e39ee18c5680b1984782cbece4057b22a04240913a3a188a34b5","tests/expand/project_replace/enum.rs":"ce2f5ddff8efd37b1b0028172fde7ee7fba4eff7622c8747cd61591d81c0f503","tests/expand/project_replace/struct.expanded.rs":"553434b0f98d837d2eda601cb4dd625a8542051e9dd315ffa326daf668d2c01b","tests/expand/project_replace/struct.rs":"f8c2915e03b557b9f11a6ea63c971cfb19b09e3a9916ab304f0ce62626e35895","tests/expand/project_replace/tuple_struct.expanded.rs":"926022463a98ab6b15d6db0cf700944b91b18334c893257a4e8a8b3f4bc7ea71","tests/expand/project_replace/tuple_struct.rs":"8ca1cd1d5feadb23999d8f4e7307f91d1932fff7e8d38889d3889d6ba4d43430","tests/expand/pub/enum.expanded.rs":"3e806cc3d1425838145cddd2ea1eaca5bf9c681a48927fa05cf78775e866a94a","tests/expand/pub/enum.rs":"64ca05d529227157ba4cdce1c526d67d15f06108fd71f5955749d236c002471f","tests/expand/pub/struct.expanded.rs":"d3bf3689402229b59e4a68f87b2264773a5b2c2b13acddfe4d000781d571a052","tests/expand/pub/struct.rs":"379b8c4c01a3fc2aa3f020578a6dd836d455f4c48604e1dad91f631146b9e6ec","tests/expand/pub/tuple_struct.expanded.rs":"89f22d0407f72c0c80984c89b6fae023db6725dac7a733342246c899fb923877","tests/expand/pub/tuple_struct.rs":"77cc812220e956a2255ef129dec3b16d6973b7e8b1bc02a6f65bd9fa56040564","tests/expand/unsafe_unpin/enum.expanded.rs":"501c6b1ce279f90e305bffbca262c2912f6b112326e0a913df2c31530340310f","tests/expand/unsafe_unpin/enum.rs":"00fad3fed0f7d2d0eae56020726818ab91895d6eaed7c4c7cc5d497b5efa7cfd","tests/expand/unsafe_unpin/struct.expanded.rs":"9f1b3757695b80cda7a8c812dc546ebfa60a253251b474f7c209d034e248fcc4","tests/expand/unsafe_unpin/struct.rs":"a41bed68966abb874f31ad02a860e15a2714e2e459ef73475a908e71141e96f0","tests/expand/unsafe_unpin/tuple_struct.expanded.rs":"734051c9dbaec8e4ccdc37dd8922eb3223dc30d04c58fb4f6ae4514a8a26081d","tests/expand/unsafe_unpin/tuple_struct.rs":"bddd36be1795be2f445d7baec269ad8a5a2647b95af7f0b130331ab7a3c64baf","tests/expandtest.rs":"66bd80992a1696994ec2d14c3edc36350a0cb896d8081f1c0f8893ebeed72d03","tests/include/basic-safe-part.rs":"6fb5accb7476f85233ef919eedaff83c30015e186414589db6e44d614016ad3e","tests/include/basic.rs":"e030edc2573d8b365e9542e431f0c0af6d5ecf6fe9d84f13c7a8401f4c922895","tests/lint.rs":"ce200abc2b1dff5d72eacdabacd49b6ffe8ddfa8796eec82e69b464b1e449484","tests/pin_project.rs":"b795fef5a8f997505979a5c13be8b0be4b934a821c282d344b589efe55ab10d9","tests/pinned_drop.rs":"4061cb2ead2191ec6cf8acde51c4e6758762170bc59e58afa7731c721bf910f8","tests/proper_unpin.rs":"435b9c7243ab896c2546c1e402276e93ef38cd93de50cc7369f486fe22698a02","tests/repr_packed.rs":"f54a553a579dbce7f80f666f0228ec2dd2a80282ac5da5f715bb122e7e17712e","tests/ui/cfg/cfg_attr-resolve.rs":"bb924ea9ceb6579e80774ef7fee1bb99ae08efc7d909e8d1edff40c3c1adaa7f","tests/ui/cfg/cfg_attr-resolve.stderr":"720f806ac06d598753a6a90c95b942410413d8860f60a7251fbde3e1fa575934","tests/ui/cfg/cfg_attr-type-mismatch.rs":"25e8337f9fd5533799dd990df6e016d18e2a00468de3386aa7d45aa98e39a0f9","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"5cde5c01d5c602c4200a1add15642d72946c5dcc0046535c207bc7a475e74913","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"768762cf1831b9b09868404d9d7fd394ed30fb4495bd8388034ee9bf3823d11b","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"235ad4c1c784e9116c480502e813a0f0254f3b0e624c89712bafa56d43eaa2c4","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"229d91b2531ace7c1d644125b77ee044fc639e9b981aaede5fda6f5e38154a4d","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"dae8adcb5b6ac12be55da9f4d6d04c1a790907dc5ee23a16d86a2a370daf596a","tests/ui/cfg/packed_sneaky.rs":"785e77f597bfc0cdb7bebc040cf11b17b1e2aa727b0fc369b7fe073f8441cad0","tests/ui/cfg/packed_sneaky.stderr":"1674d0f108f91cc21f9009338bde1b343b65a68d81d6bb3b6aecd919846cc6e0","tests/ui/cfg/unsupported.rs":"45d6eddef59e67dfca3733450249632dd8135283cedafa663e7bfa2b232ca13e","tests/ui/cfg/unsupported.stderr":"72421d6c14eb7d4f7af7eea1e0701343df691985d1d58325e91412e749705d3f","tests/ui/not_unpin/conflict-unpin.rs":"5709b68bbf26c0b2b87ee7a0bbf83ae9e4f1bacd2266114114b4dcb8706d0080","tests/ui/not_unpin/conflict-unpin.stderr":"b2357ec463ea18ae82474218b2281e539890a74ed1e4263a2f1fa98098e217fc","tests/ui/not_unpin/impl-unsafe-unpin.rs":"088374540354c4052a2daf2e97cdf49fc54287e0d943bf34bbb70298d62e8c9b","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"3bb3f4b6b1ff747309f5ea494a18f1b9eb7610b89b051750282e1fba1633310c","tests/ui/pin_project/add-attr-to-struct.rs":"640b49214c7f3f2eae027165bad32c12cb63b00735b6ca3eb2037a4b69a8ad19","tests/ui/pin_project/add-attr-to-struct.stderr":"4f5eba0ddf8f6c20e76a0624095233ced75b9a713c6451fba0c7a37e80028dee","tests/ui/pin_project/add-pinned-field.rs":"791df5b427ba412fb25836569963e6a03ccacea9fcefa4bf3f789ee4de90762d","tests/ui/pin_project/add-pinned-field.stderr":"6af54b6a15b5d6c7cfd23d93cd514477d33f7775cb7dffadb45d249d343025ad","tests/ui/pin_project/conflict-drop.rs":"c97bedbed751436994fec33003dca06761cc2cbf9fcc832c120321aa8fc0be7b","tests/ui/pin_project/conflict-drop.stderr":"965dc2be7b88493b3df0fb61f9d9e65d0480ded5ab76dffe30dc517877547095","tests/ui/pin_project/conflict-unpin.rs":"9e3b06ce53d97ebd79620d729b525fac1c87c67ed44b91d05dd4c3d48be455e3","tests/ui/pin_project/conflict-unpin.stderr":"77ae4396ceb42548f52a84fb0e08f4d66eff81a2e9bbcfe11d59aa4ffff73c04","tests/ui/pin_project/impl-unsafe-unpin.rs":"d24d630abd82e08aea529d358bf998011ead0e939c82dca410160764fc24e06b","tests/ui/pin_project/impl-unsafe-unpin.stderr":"d96230802cc11ec32b6c31c86023972fa7038390da1e93e81bae4770dfd1cfd2","tests/ui/pin_project/import_unnamed.rs":"09fb23d22c044321f9bf3a526d16d694916adb7b5defeb6a353cdaff46df7efb","tests/ui/pin_project/import_unnamed.stderr":"2358b70ea4b4c797816cf3b47920f72e0eb7ad0ff11d9d7e8f9f0faed27cbd93","tests/ui/pin_project/invalid.rs":"ac237cc99cff8a273d84e87d26e4640a53afdfb7a7961b6dc8bfa53dd5d88aa5","tests/ui/pin_project/invalid.stderr":"46a9c8a8469c0be53b09d24062f06aff4d21c23541be2d8055a0c76f2180b277","tests/ui/pin_project/overlapping_unpin_struct.rs":"3f459dda0c01e36f989a1413b2a43f4d95f9ae2524653b61f0561acff28ad9a6","tests/ui/pin_project/overlapping_unpin_struct.stderr":"e89b9cfcdb9a8cf0e1042bf8d3d4a98d2cdecfe2a966f14ef62c61b0c82a5403","tests/ui/pin_project/override-priv-mod.rs":"b9f163f5ab76735bbd8406b46f7407929845a34a23e2892a935a178612ec5875","tests/ui/pin_project/override-priv-mod.stderr":"effec97131efb6628e8bbaf74c37fe5d7f9a735b4468e1d6e585bdd693ae98ed","tests/ui/pin_project/packed-enum.rs":"7784ff49119daa5ae562f0fa84fdf4e65fe8abaf62ecff7d2ead184748e16b9b","tests/ui/pin_project/packed-enum.stderr":"3c710e899c68e5db4707405546c9c81b819ba6d3bdb83d3578e34c1254fbf1e3","tests/ui/pin_project/packed-name-value.rs":"64cbf4ef3c01709d302f91d98e92c980f2858b14ddaf047646c4de57707541b1","tests/ui/pin_project/packed-name-value.stderr":"f8beabf2de5cdd913903eed642d886841ad14a719f562769f525c79a5df2fc76","tests/ui/pin_project/packed.rs":"7a66b7c2ca8253cfd6774a339d74400966e85c73ef59f54ad66d9f1b02ea5db7","tests/ui/pin_project/packed.stderr":"2b9e7a0818e21f958536738035452d760b9fbd3784d2034b1732d2c8d4b85812","tests/ui/pin_project/packed_sneaky-1.rs":"390dd0ad59668f80a6e86baed1015c02a429cecc92388f18c8deffb500508415","tests/ui/pin_project/packed_sneaky-1.stderr":"f01979f02e3a0956fc191550cfe364ea11a14afb15cc252e63127ab72f99f640","tests/ui/pin_project/packed_sneaky-2.rs":"f1601aa4f642ed4aaaab2dd2e0328b7af145be9a3a7460ad36339b47b4d7ce14","tests/ui/pin_project/packed_sneaky-2.stderr":"5df9f0c90032016856c4797f07c8e8c172ed0ded2c7078c404f80b5be675d33a","tests/ui/pin_project/packed_sneaky-3.rs":"d9ee3366b5e3849f3ec0d0bd62d365cff0c6e8f0eb3434d70fb84e62a1976eb2","tests/ui/pin_project/packed_sneaky-3.stderr":"596b17b96189fd8f38bf5c7f5ef5e01e54c1d4cc459a15a519687e61e4edca34","tests/ui/pin_project/packed_sneaky-4.rs":"5636ae9a7fc54ea6981897adc1e31afb5eaa1c1db6244f8357e79cf922e6f7a8","tests/ui/pin_project/packed_sneaky-4.stderr":"3aee1184b5fa175a6b5cdb1084bf170c27d0bfc8c564ae2847c3f23b9de09a6f","tests/ui/pin_project/private_in_public-enum.rs":"bb79b1bf0328bf652e561b4006c31f6a2d0cbe598912f264c4024a1b381d5400","tests/ui/pin_project/private_in_public-enum.stderr":"d951fb2b9b80ff07848723439da190cb91f776fbef0e27db025dcd24186f80aa","tests/ui/pin_project/project_replace_unsized.rs":"7c35e6c8ebf8337b6abf6a7fa7106bd519cebbe32d3f33b8865fa251820e0e5a","tests/ui/pin_project/project_replace_unsized.stderr":"7d3be0208cbec2d86833192579b8d51d876cd9461dc5e20e988767e9696d4e28","tests/ui/pin_project/project_replace_unsized_fn_params.rs":"db7c72e96119f245535627b887c1289b064dd657fbb524c0f6635287033b85e2","tests/ui/pin_project/project_replace_unsized_fn_params.stderr":"17095141eb2647a8484c429a5d3348ed7a42b35ff965e6dd73eb662ae8e6d868","tests/ui/pin_project/remove-attr-from-field.rs":"9faac7ca8220c7069b1a7b2f43420efd3d73377f0ac0558ef67cd5664a9c54c1","tests/ui/pin_project/remove-attr-from-field.stderr":"424cd345a7b4a0ec328c58f36eb3b31a88e6c1789a0226bd8d6c4c50fecc39a2","tests/ui/pin_project/remove-attr-from-struct.rs":"f47a6cfbb5a4fa5bb233c0427be255110749621bed7cfa7a8f45e80451aa8615","tests/ui/pin_project/remove-attr-from-struct.stderr":"2c1d7d214096afe2140921f56cb16e54110bec7ae77ee81726de94ec1bdf50a0","tests/ui/pin_project/safe_packed_borrows.rs":"2f398fe1f16a3fe5a5123f49705f7eb6157d47b8adabb8b80fad88bd61efc37c","tests/ui/pin_project/safe_packed_borrows.stderr":"c508f901bb9f1cc4055edb9aa6bbd5f333297f611d9df18acbc22076cd2f8abf","tests/ui/pin_project/unaligned_references.rs":"a01c34657405c717b0e2999460bd3332e39e6f8f715465f5fb9d517c0900f172","tests/ui/pin_project/unaligned_references.stderr":"cfa0f3500b7edb75eff2c6a87164c61531ed117aca61912bdecc45ba0eeff23c","tests/ui/pin_project/unpin_sneaky.rs":"8d49b2dcb1695b4ae26669de58dd6dc73bd836f3cd836078d6be2a0ac2cc56f3","tests/ui/pin_project/unpin_sneaky.stderr":"b31b54cb2be5a9cecd50c4489847ec83bb401daa63c2f5b6ebd4080efc95bd67","tests/ui/pin_project/visibility.rs":"4345aa1fd270a99e631510097ab7fea51aa7cbe15e155cf19f406c63735e3daa","tests/ui/pin_project/visibility.stderr":"9d56584accaad71c65e38823b0200b8ee229c027558f4461168c869ac53655b2","tests/ui/pinned_drop/call-drop-inner.rs":"a155a5b4cf7434ad6c2c4f217beb37b57edae74c5ae809627a50ea8d6ab5da50","tests/ui/pinned_drop/call-drop-inner.stderr":"ab9eb3a1924782a2e4c37e379fc5075aae1262ddd3fab7ebff18ac8d267be645","tests/ui/pinned_drop/conditional-drop-impl.rs":"5d4c147d48d87a306fa875e033c4962ecd9d7666e6859da5b22a34fd552f0fc6","tests/ui/pinned_drop/conditional-drop-impl.stderr":"f0d05bf22ae2016a186c6d5fa0ae940e0e2b8fce822f06344b73a7390cd047bd","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"9a6d08c98f1214d11aac8bbf67586130ad62d07d03f4ba6aae474fe30695b536","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"d45a218e8107ad11a59a75f30bbb2a018e153ecdead28880b09cf63f3d64f98f","tests/ui/pinned_drop/invalid-self.rs":"9c7e431b0808204d6a3bf3541668655cb72c76e8ebe8f4a04518d0c6dcdd1bd5","tests/ui/pinned_drop/invalid-self.stderr":"a2004c3f04e13bbc17446e751acb1b3985f5a6bfeb846e1b8a661951e40adb12","tests/ui/pinned_drop/invalid.rs":"1c0a596320d62adf3c138e67efa3236f2cfd598d5f249ed7b1d51d5b40d31587","tests/ui/pinned_drop/invalid.stderr":"a91c479bbc41a708f1ac19eb2b788dac8e204db4fe92f9c1e4be898d8a69bdcc","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"cc406f6ffa1998896931d33cfdab79466a1494750b55519f5a8ad7fe13e08657","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"0766091c9b7e88aa5b6b22a6a0ea04c3521681408dd7241aba762234f57021cd","tests/ui/pinned_drop/self.rs":"db7da7c136a16c34b0492dbaeed680cdf0a1bdeb186b2d4a1324dd11b43bbe2b","tests/ui/pinned_drop/self.stderr":"e0c56bcdcc4009311ef8a8fc0e214a56770c544b0dbd9867a578013ccc0c6873","tests/ui/pinned_drop/unsafe-call.rs":"2ecdfd7b658c0aeb85ff0feed8d6c1776a06166c287d3b8925f7fc4c699ee74a","tests/ui/pinned_drop/unsafe-call.stderr":"f7c304194f2517651571a9d1c94fc19b8e917bc772295f7b3c1758e1fe7386db","tests/ui/unsafe_unpin/conflict-unpin.rs":"a22831379eb1f2d597d5f8088130f7c91add5ec69bade962d555d1b49145f56a","tests/ui/unsafe_unpin/conflict-unpin.stderr":"069830217d50c954b6b0af8891386d2069ffbe7b0b72069cc1b92ee0c5bf9a54","tests/ui/unstable-features/README.md":"f9dcf95e9c68fe15345f493a3fb4f54726d36c76d1a5a1e2c9dfa25540d4b642","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"35596063ddbc8a289182c3a18d98d595583e6a0b2b3324d3eec4f416de06ea4b","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"cb4afbee9d7a3f4598a926efd2d30b26146e9766cba145d31e4ef6223539ece7","tests/ui/unstable-features/marker_trait_attr.rs":"f2a5275a5b80249d2a0e7a4e9e7d3f573ffd5f2a183dfced314e91a7d7945007","tests/ui/unstable-features/marker_trait_attr.stderr":"0b4b5faa7405a58a2ebc6faaa4cd697f913b99882c45d4d7d729bb0cb4f7d0be","tests/ui/unstable-features/negative_impls.rs":"b913f3d818cc4d91efe4b82dd08b72acff89b97d7e56a33d8106c93f1de6a81d","tests/ui/unstable-features/negative_impls.stderr":"aacad57752e05b1e5a8b09c9486bc9fb6f1875d1f061931197dd4352f1ff2898","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"dc6b854cc60ea03344f8ca3fa518a2bdc0b9aa69f2368162f4b6ad24d31bc4f0","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"14d39aeb6acbe06173240a7252adf97fefff519b0e65179bdfcd3c8b6f5e58a0","tests/ui/unstable-features/overlapping_marker_traits.rs":"8af0d8a5afe9dcaa02fa67b394d376f9933cc99361d68f64185769326700bf7c","tests/ui/unstable-features/overlapping_marker_traits.stderr":"a271b507c86b733430c2fe5973029d99128c908422b6161a9b7c7c2fccae3236","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"658aab9de2e52a54b9e4731faae6a87172b1b4b78f3853c9fd4b565066b74e64","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"2c31748846c992c8a68f586ec24fc89b1c630728d0f263ad4b200018ce3cd871","tests/ui/unstable-features/trivial_bounds.rs":"2bc3e4e17645c42b70c023caa3c5bb428addd2a8664465131e32864d31d3691d","tests/ui/unstable-features/trivial_bounds.stderr":"85ed625ee167cc7d7faffbfb006da5591f3d81a9df763d2cbc68523ea602f2fd","tests/unsafe_unpin.rs":"0367781e5109fa9a27347aebe45e633461e396bf883a06c5f809416030c79514"},"package":"fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"cd6bf8d77239cabd58b4d00789f556c4ccbca94ea47be06173ff60f12243e760","Cargo.lock":"a397ddcadb3310646500efa4e79bbc2e7aa1fa56229e93a38f48a2e9dda81f1e","Cargo.toml":"cdc3392c1074a4a50910b912f769761cdacd0496c3dd2480cdda11afac4f2056","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"8d2c53a18a6fcd05d35d04b5d8172ca8081f4fd0d12b8e16c718ee1a9359fff3","examples/README.md":"873366ab5ece507f55dac855c51f87776d5c35456d5e8c84f528587d836aaf5f","examples/enum-default-expanded.rs":"c9ccbaae3e8c9597a0c59974e899bb9e81472ad8accfe59242f34985ffe5a289","examples/enum-default.rs":"54e5c85b9f3cfc2bc484b1ad2e7766cd1603824d9ec392ad4907c496b4b78157","examples/not_unpin-expanded.rs":"1232f56104bf811443403c54e053e94a2a13cf4571ed38137b0f2bec464d4db3","examples/not_unpin.rs":"d4d9fd30bb9344ef1c8cc89fee86b50032a405bcc61f06cce926493f227be0f9","examples/pinned_drop-expanded.rs":"b9ff7fc4b641609671a82837fc3b252caa989bf8950cb231baeddd92569810be","examples/pinned_drop.rs":"b97945028f5767be6afe91810ab34e1a6a0092194c4986ffe3a60f08fb9dea1e","examples/project_replace-expanded.rs":"4eee31edfe97ddddf1468283c49a06f504cf42c92498f3a8e10f6d4a4ac9cf75","examples/project_replace.rs":"f91eab65f1211417cd08dcf5b845fa379fb92ce0af7b2639e5bc2fe0e26a7854","examples/struct-default-expanded.rs":"f911154b5a0cf9bcfdf21d9bfb1b3de47bb9e09e9f42592c1d04e731328fad7b","examples/struct-default.rs":"6b20a552077d0e5eae2d59ce8d0a945d80e7f4f29a845a262f4d15fbae7e327c","examples/unsafe_unpin-expanded.rs":"c4394430a3e3d5a0f12a87fd324b4cd369c6464d3793a62c8c20e52c2e94256a","examples/unsafe_unpin.rs":"078a0bc9f67513051afa26387c601b4b7528aeae344978de356863505df6a93f","src/lib.rs":"0df702f95ad8b212caf492f38fdab0455d3665e6c70eb523f7ed46759bf1842f","tests/auxiliary/mod.rs":"52a78b77be05c67737c56865fbce4477eaacc6482d6377af2a5822f05a2ce061","tests/cfg.rs":"93d1d2f1bd3aa47b80b28821f825c710fa94e3198d486fbc46945ab9347e2019","tests/compiletest.rs":"48cfd92c7271345d57a6c222a7a61e00449f38e6ba379130813c45b31a5589c9","tests/drop_order.rs":"0f1a624f97c80bc636e3a7bb4cfbcb9164b552cee59bf2726f4fd97ad280dc51","tests/expand/default/enum.expanded.rs":"77050429460eaa79bbaed18269ba16c4393b6c12cc1c435fb3cfbe21aec3d39e","tests/expand/default/enum.rs":"fea7593e953826dcad52fe1e22ada20271cd03dace13f2915ca06099a6673537","tests/expand/default/struct.expanded.rs":"100c9b6f48ff7a428c3664ba20780f7d04c16ed0712c7b9202d2146ee7585abf","tests/expand/default/struct.rs":"d484478550eeb44d386d30ac8327f48c42fca1a9cb7169c92ff06d884c674ab8","tests/expand/default/tuple_struct.expanded.rs":"fb54a8f6e56ebc394b558e3563ea01c53c9ef4f090a3b090f570b49c7819a6ef","tests/expand/default/tuple_struct.rs":"c1029993bc0f91a2f2aca19e2d641ad3fcc0905c6d45d6842787c1165cb781d3","tests/expand/multifields/enum.expanded.rs":"088b6ac44e7f9855fc9007aae8330709a85486afe1dfbea6a897aa1ef634063c","tests/expand/multifields/enum.rs":"812994180bf6f9b669d43d03ae2dfe120ad13965c811216c22c0c954f91fd381","tests/expand/multifields/struct.expanded.rs":"52b2514146faf3fbecdfabb83c74a88bd5e7bdaee8fe4e378fce1eca1e28feba","tests/expand/multifields/struct.rs":"d9e23319e51617fe25caa6be8984f8157a663b2eb3771e140078dd68fc9cf210","tests/expand/multifields/tuple_struct.expanded.rs":"673255997ec47f345d941bd918a434ba8fa93e329297272c73fd794428b3e19c","tests/expand/multifields/tuple_struct.rs":"112b2ac6d9dbbc12c5d20fb2274122267fcd27da39d7ee2bf9e314a90df1c5ea","tests/expand/naming/enum-all.expanded.rs":"1f58b7801b0b49b4b31c418576a9441e8eb3cef7f4a848a6dd7aa1e0f35c9d3a","tests/expand/naming/enum-all.rs":"09e82035f1a7d88699bc4a6ffb29eee9d57ef68c0465cd6cfacd27d938d8e235","tests/expand/naming/enum-mut.expanded.rs":"2e02896769f46ce8426f35aafe419686dfc37c5aba2e013aac8b2fcb5347390a","tests/expand/naming/enum-mut.rs":"3c56450fe41f8b9b5a887d2e84d8f3b922594aaf659338c23494e20df62cf6ad","tests/expand/naming/enum-none.expanded.rs":"cac87a732dcfcfaf7d1bcc8180f68f4270ce176bf933b013d9513f4554afdee7","tests/expand/naming/enum-none.rs":"615b4f2433caf8d6ec606e5d0133714d42fa21288b830809b5c678c4ff698aa1","tests/expand/naming/enum-own.expanded.rs":"06362827471d5a28d679e84f32ab7bdda1e255b231a08668d81db5c98fec2e8c","tests/expand/naming/enum-own.rs":"c19331d90c90d8e91bdb0e8d788a05a1ff4d66e7468b455f1da71548bfbf5576","tests/expand/naming/enum-ref.expanded.rs":"e9117830799e4270c16888cb075b96eaa7c3534b439f3e2c1ba58722c3a482cc","tests/expand/naming/enum-ref.rs":"9e09831c95da2cf70c1c81ada248811302719e8491ff00529e891f0e4d102b69","tests/expand/naming/struct-all.expanded.rs":"0800dee39633c8f782859e590e72ddf736df29d4706ac9604c5484135148e77a","tests/expand/naming/struct-all.rs":"5a2562f65a60ef7e72f65427e585c1a7f46574ebdfa5d89099e98a250e39e1f6","tests/expand/naming/struct-mut.expanded.rs":"3dbcac87af3fd15579a545a3dc5ff6367248f6918dffceef0295358fd6e74cd6","tests/expand/naming/struct-mut.rs":"9e384565fcc6c015435241a2eeccf5c54f7f18df8fbf9a6d3c7c40e23d19f247","tests/expand/naming/struct-none.expanded.rs":"100c9b6f48ff7a428c3664ba20780f7d04c16ed0712c7b9202d2146ee7585abf","tests/expand/naming/struct-none.rs":"d484478550eeb44d386d30ac8327f48c42fca1a9cb7169c92ff06d884c674ab8","tests/expand/naming/struct-own.expanded.rs":"9f60ba0f47d3bdca73ac92f18ece9466f2e9ecc52035007566b5ca17ab922c3e","tests/expand/naming/struct-own.rs":"13f22d6409b4eafef1a59f8ee576f119ef2109b300107388cf8ab7c6e0776ef6","tests/expand/naming/struct-ref.expanded.rs":"faebf6f3b3568c99558d01d4af8f2142782342c8fefd1a3afbbb727a171b3a90","tests/expand/naming/struct-ref.rs":"3c833f7484d7489da2f0e8215489dc0fce02f24983b5d2678fe1f31a813fa6ae","tests/expand/naming/tuple_struct-all.expanded.rs":"9ce847d6fcd65d0407cc74a1c378b3e32f5c641b9eb5f55bb3e546a0336fc62a","tests/expand/naming/tuple_struct-all.rs":"03acee5629d30626c96b0bb737d3ff440627e4f70459a330ab140fd8d317dd2e","tests/expand/naming/tuple_struct-mut.expanded.rs":"49070115fb3d31596af37e0679f955570e60a6ad1f9b4e5f0018d1cb959bd238","tests/expand/naming/tuple_struct-mut.rs":"b2c2c7c952158969c29b2f15a1d267471f9a0a161b53422f9b7286353e9aedd9","tests/expand/naming/tuple_struct-none.expanded.rs":"fb54a8f6e56ebc394b558e3563ea01c53c9ef4f090a3b090f570b49c7819a6ef","tests/expand/naming/tuple_struct-none.rs":"c1029993bc0f91a2f2aca19e2d641ad3fcc0905c6d45d6842787c1165cb781d3","tests/expand/naming/tuple_struct-own.expanded.rs":"b31bee3232fb1c6bb8e9cd8433d4a0a69077418a8d2e0401f5c8dcdbeb830879","tests/expand/naming/tuple_struct-own.rs":"cd2630848feaf66d006bb7745a2e00d77ee7915587dbc6501802af7be39a0526","tests/expand/naming/tuple_struct-ref.expanded.rs":"fc2532e961ecaf2ff978535c2ecff24eaf2a9f635a9bff9150835bc16ba952f7","tests/expand/naming/tuple_struct-ref.rs":"d65afb23f09f65a91fa7630a0948ebc1cfe80fb3a6aa3006cf742970af883a84","tests/expand/not_unpin/enum.expanded.rs":"4b35495a1ca07a98500bbd51037922795674c974e967482ee35fcbb884114784","tests/expand/not_unpin/enum.rs":"fa856ef755b1108cb43bc0d4e0fb9b9089554fee2f2006fe2459575da347b245","tests/expand/not_unpin/struct.expanded.rs":"92a603a2b319aa6069a7c39151e990e688bc934cca23c9b225966dcfcc0982ff","tests/expand/not_unpin/struct.rs":"f9b53d10483c916adddd051f14eb255f274b391ff1ea11ad5b910999b3dae3f1","tests/expand/not_unpin/tuple_struct.expanded.rs":"384f866389e825fef4db70a4f7eb8ef9aee3d69b1d1330bc284849239246bc0e","tests/expand/not_unpin/tuple_struct.rs":"8fc6236ba7c42c994d1b75df95e856f031183465e98803bca1b45030246e5c67","tests/expand/pinned_drop/enum.expanded.rs":"e4e34a9db83369e75109b983ac9a4eeed47da34ace7c43894170857168818f66","tests/expand/pinned_drop/enum.rs":"e750205f316480d8cfa54feb7ee3c895a96665bd26d4831ed4ac8b817283236f","tests/expand/pinned_drop/struct.expanded.rs":"e5be1b550128b54e6d4b3cfd77b8511bfde9d82676fa8afb69ce8b35fa611262","tests/expand/pinned_drop/struct.rs":"f0cba0d230f6a8c59471903621ccde37d42b8a01b2a973cbd3d296624f917e43","tests/expand/pinned_drop/tuple_struct.expanded.rs":"d996b344092f1f9caf47cc4ba645559487bff0ff6685e7c2b4e1a24bfe306055","tests/expand/pinned_drop/tuple_struct.rs":"6983058e035c2349747f7e5434d965c566d8b9572235ee2e9c62f34399b5c567","tests/expand/project_replace/enum.expanded.rs":"e856da1d6f182945aaca66a115503f6368fd2b8ce36b4a8392b6eebcdc119ed3","tests/expand/project_replace/enum.rs":"a73235f35b539f5720d2edeedfc05419515cb49a5c5f559bcc337b4da2cf11ac","tests/expand/project_replace/struct.expanded.rs":"103dca7f287ece09b5ff51e914bad6248776fc44e33fdf17270705be34239bcc","tests/expand/project_replace/struct.rs":"4daf891313fc6f2bdb9f5daadd1177701e7ea6e8340fde3670d2149bf88710e0","tests/expand/project_replace/tuple_struct.expanded.rs":"e3f8a1ce16f636a020ef01502873d6198c50dbc2e5c12dda2fbccbbd7172633c","tests/expand/project_replace/tuple_struct.rs":"2e4409687e2cb5b90f39c5740d5a4a94a660f1a7a62d7ef46b65c0bbdd88a5c3","tests/expand/pub/enum.expanded.rs":"6ec36132c0254061de3277418b5668555a75c4f7ecf69ffb7756ac4d3bce4bca","tests/expand/pub/enum.rs":"f3838d891e209aefc506d5b1b794a726c15673617230335f8ecda28357617c06","tests/expand/pub/struct.expanded.rs":"c860536161efab5416899ffb5a973c6490a26e1cfcd1cd33c74438606b2093b7","tests/expand/pub/struct.rs":"cdb61db4c8754c573f58aae94a78b8fd8cce89ab2dfe60e9388cf0c3c5d00299","tests/expand/pub/tuple_struct.expanded.rs":"3f2d56b197e18a955907ea6d5931488b4499dba3cad2c7f40571eb895c0fbf61","tests/expand/pub/tuple_struct.rs":"51fb87a1b5fd28cc3fd19646422e17366b38585b552e6b0578d1f3b668354fad","tests/expand/unsafe_unpin/enum.expanded.rs":"dc675b0ee024ac005269a72988124fbfc5b1c8bbd4ef2967545c9280a47ae318","tests/expand/unsafe_unpin/enum.rs":"4231500c8d825b5e0160d3231aee6e1168dbfb9c4ea3a22b5870c1ba11e6e75d","tests/expand/unsafe_unpin/struct.expanded.rs":"c83be1440d109cafa2fed4d8dbf98cc5ff9cb5f1dfa1147ddad009bc08c9a37f","tests/expand/unsafe_unpin/struct.rs":"297ebc73abdaeaa8cbb8008ee0f7b0900d6e66d73aedf638454153a19ab2810f","tests/expand/unsafe_unpin/tuple_struct.expanded.rs":"6f786149e1b027e6c44bebbb38e415011c7655d1597d3cb3e9807dd245a0dd1a","tests/expand/unsafe_unpin/tuple_struct.rs":"d6ec019d10f94a0b57985b53e016dd3523460d24ad7a868110488773f4180b7a","tests/expandtest.rs":"a4336ab879d79824ab3144ea385a7a00ba77604c3b6639ae53b6283850b421df","tests/include/basic-safe-part.rs":"9d481307aeeb553283e4831a4c36c770afcd644070cc189140716de96827936b","tests/include/basic.rs":"70b1fa73b6d23bfb1506a28f2e2a2857f8840d0a4526e4a61432c22abdbda66d","tests/pin_project.rs":"f9e11ef5a55af85dfe68998621d23d5112d5ba4a6b85ac260ae3f4b3bf0f09ee","tests/pinned_drop.rs":"d52d5f929d70b398d1e4fe0870b3229f1471400e7ea641c106f7abd06c916cb9","tests/proper_unpin.rs":"97bacb4a2d41de28c3b176d02bbdee5c1a5c7f7bc255d3cda90067feec301ff9","tests/repr_packed.rs":"fbe88bde14145bcb9f3a27460a4510fa1f72e1cc77fe559f87613e8c23613f83","tests/run-pass/private_in_public-enum.rs":"1f851d074f90dee903987361028a5beecead08eeaacf4c1fad951a10b3f90db3","tests/ui/cfg/cfg_attr-resolve.rs":"3adc24a57357908e4d2cc7c7026f3ac54023129edc5638afddf52d4899bf1160","tests/ui/cfg/cfg_attr-resolve.stderr":"a53125883d5d3a3afbb1c00e95075ab1f69e5a5b97fd9a2146e898725f8a40ae","tests/ui/cfg/cfg_attr-type-mismatch.rs":"89f597c834231ed7e235aabfe9e43020c8f31bb1018ae92d99732b460e1fbd85","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"50d502dc48a0109d4fac367806cb6fb8ccc91e89fbff9701a5b96030fa5751f2","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"c02754a8f68162f7b176291f0db2281017a760d4a6d8a883115248e91f6316b8","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"2b6fde98b5e03a58b52ca33b9e3cd67f04b31d03a8b82893fb1ce9ad9663ffb8","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"0e89520ee66ba3e82af9d1637bfca9fced3d5f0481ab142401a3da7fa756d1ce","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"b4cc84cb222c4d1830f5246a5c2171a642b9a04dd6e01d7fd42abb04e6f801f5","tests/ui/cfg/packed_sneaky.rs":"433307e3f91acd412c1a261b6a3018dd59ef8de57cef14f5e66a50183e2faaf7","tests/ui/cfg/packed_sneaky.stderr":"40e11cb5a2f19bc856cc201c57ee2d65a071855da8d1c2ae93aea7a53a8d88fe","tests/ui/cfg/unsupported.rs":"07aa5e7ec5bf3f0062b10904786677ee6b7b46c032b820c3387c53ccc2f6a180","tests/ui/cfg/unsupported.stderr":"86cd19ad8aaf1f5d2bc86e3ee206530445d09a2697fe2989ee750b578e78d29a","tests/ui/not_unpin/conflict-unpin.rs":"e05c462ad35da709c13d6bb0a4d32c693682f52fa3606f17c4e53641467c65ef","tests/ui/not_unpin/conflict-unpin.stderr":"eae1a3fd92b0aa8de8eaf6ff237ae9767ddaa95fde0a890cc4fde5f225bf0d23","tests/ui/not_unpin/impl-unsafe-unpin.rs":"ac610414614f37e980aea24a9d30bfb0f12cf9d2c3b01901bc7ab1151946cfd8","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"8ee1b42b74a0212d6d746a41ff2f14e00fc176aca29232eda1c6ded8c7b853d4","tests/ui/not_unpin/negative_impls_stable.rs":"2c80bb07c9fd24fb9963eae495cfa937504e683823828475fcc5224dc27c8b10","tests/ui/not_unpin/negative_impls_stable.stderr":"d5ead1b05130711a839b795c9f9b50e58c645c70af67ec9d537c4246860e0e40","tests/ui/pin_project/add-attr-to-struct.rs":"4d18b1e16084af38061d10be53a188a83780bdf32114f78e32f2dfb9983774d8","tests/ui/pin_project/add-attr-to-struct.stderr":"03e3c5a9bdc1caac687c0614b0cb763c6323c62d034f0c617a5e6f6b6a1f5e0d","tests/ui/pin_project/add-pinned-field.rs":"6b28a3685df4dc23e5c3fa416554876991499072f8a49cdb4e6014c08666d3ed","tests/ui/pin_project/add-pinned-field.stderr":"9f43cc45d6e080f9329b463e761557d42ce5abd30dc449c78d452f1710c99826","tests/ui/pin_project/conflict-drop.rs":"72cd28063e686d6a4eef4b2f32c244cc4411c8b21cf349910251dbb02087a6be","tests/ui/pin_project/conflict-drop.stderr":"eae6ed939901fa0f292278c209392a4f1d1d23ac24648b22e1cfa5767fea01e9","tests/ui/pin_project/conflict-unpin.rs":"018b4e01be009f7ccf0d6e59894de2dc74069b566a1d5c9091afc150fe2abc5a","tests/ui/pin_project/conflict-unpin.stderr":"64fd2ddfe5033bdc09fcfa97ea8147af070959903beffffd2a2b0bee6f93bf26","tests/ui/pin_project/impl-unsafe-unpin.rs":"3f8f499686b27d2345aabe246b181530d8a9675dd2c7de82f6c04a1bf6436f6c","tests/ui/pin_project/impl-unsafe-unpin.stderr":"5e281d7bf29ac8d7980010120b551d9375e24067f6c9ec1684477de2a05e439a","tests/ui/pin_project/import_unnamed.rs":"25f95d9b4c0afaf353639fd671a4c90fddc1912d59c40054b0c843d4dfd005a0","tests/ui/pin_project/import_unnamed.stderr":"6ef1c28a335160bc353da29fc3a428f7fe0119e1bbee3c2287bc7d4a456d12a6","tests/ui/pin_project/invalid.rs":"b593f1c37ef566017b96793c70fb32a12043531def06534fd4105a203e0d4388","tests/ui/pin_project/invalid.stderr":"1c0fe0b7bae2605f9107e2af3a83cbae533cbb063d363b8a97969ce76eb18a1d","tests/ui/pin_project/negative_impls_stable.rs":"2360c0ce848b4ad30b14a31f8eab8f7a20cc02cd1d72009504cd07645d99f35d","tests/ui/pin_project/negative_impls_stable.stderr":"f1ed5df727ddad2ecd9bfb3eeb37bc5109fb188efd14ca22c4291e01b337f7d5","tests/ui/pin_project/overlapping_unpin_struct.rs":"e2d50f0cd919fc3b604099a921d0690fcf540296b99888253c00bfb9c758617a","tests/ui/pin_project/overlapping_unpin_struct.stderr":"27c5cefe35d4ebfdb7b439224657deff8f3cf2a456d2b9ae1d5a539960591a4b","tests/ui/pin_project/override-priv-mod.rs":"26136f0329b61ef5c293cee5040393f1431f774e92b3e2c5f6486704d46e1257","tests/ui/pin_project/override-priv-mod.stderr":"75b93e2dcf6dd9d1843db9218f740f661814d886d6407a36d633cb82cad9a42f","tests/ui/pin_project/packed-enum.rs":"e667d9ea9e1627449d0ff1cda6e51f21f29b08f22200ce23e3bc21728dc7c763","tests/ui/pin_project/packed-enum.stderr":"492c1d8bc85313606fedded5e06ac3be4ec45d8f91d13b547fd622df94197812","tests/ui/pin_project/packed-name-value.rs":"733e0ebe0c001af7d7cc3a4a8385537af9fba1cb1c8edc169218ef9a293eba42","tests/ui/pin_project/packed-name-value.stderr":"2e19551069c1419ce2699e5437f313fc772fb9b58f4e6a899f27ea296e4eca7d","tests/ui/pin_project/packed.rs":"72869bd8313ed0168bd8cc0505665c1b17aa9d884aa7ffcd35dd7b5457584eba","tests/ui/pin_project/packed.stderr":"d9e7582c4f8db7b4458c47c1d3710fa2ca019c3305f62ce39879876accb2598e","tests/ui/pin_project/packed_sneaky-1.rs":"812af83b8693606bc938b48cb02b928c89d18ee842adeb0ad254334c715d4b92","tests/ui/pin_project/packed_sneaky-1.stderr":"3772d5f31afadbbf0158a5818245574296bfb311539904df0f1ddd4acc00f01b","tests/ui/pin_project/packed_sneaky-2.rs":"7588ed1c189ee8fbaa94ef6e4b5878faf0b172a32ea063d435dfc5c4bfd7f85c","tests/ui/pin_project/packed_sneaky-2.stderr":"d5614700eb8781d75bf0e4b70cefef167cc6826c516234171a97d6d84ec01b5e","tests/ui/pin_project/packed_sneaky-3.rs":"88309e53afec73a78e890b7cd47a09ca3bef8c570e36f8d90d7ba19ba47ff8a0","tests/ui/pin_project/packed_sneaky-3.stderr":"4d76371646017cfa2633e185c7fcb7ce5d0445802703baf38cb56d99ece74687","tests/ui/pin_project/packed_sneaky-4.rs":"5eb2300689f522c63db7c4fe3ea72cb2b84395a2c83991586ca087ed1dba269d","tests/ui/pin_project/packed_sneaky-4.stderr":"41bafcd4512c2df40b17def3706f34c98a2b79b6885e64caa0d590a6dc970261","tests/ui/pin_project/project_replace_unsized.rs":"b062243b50902cee1a1bf2f40e93fc18241bb74795a25cd9db35a46749a41d05","tests/ui/pin_project/project_replace_unsized.stderr":"13f01622230c7b1a0e5e43855fd4e0a06499fda44c80937d2142527457d83912","tests/ui/pin_project/project_replace_unsized_fn_params.rs":"6f108b224e5d3abcc6c939626851bf828d282f55df154900d308b400daed0ef6","tests/ui/pin_project/project_replace_unsized_fn_params.stderr":"0744def748dd99e7506c75fdae7ff9e7f9ea8de8ffc08c053ec9d65132c8f932","tests/ui/pin_project/remove-attr-from-field.rs":"58a601b30b92eaca40a7954bd653fa9fc4c01402b3c2d27b6c406327aaade719","tests/ui/pin_project/remove-attr-from-field.stderr":"aad4a79d62ca421b1201d6579f92c69406bec505a9fa5d07e46a16d7b2222add","tests/ui/pin_project/remove-attr-from-struct.rs":"4ad63d1b09f076a4f7999a508ccea85ca04002574fd3bcf67d9ccd2b64e69224","tests/ui/pin_project/remove-attr-from-struct.stderr":"79c6bab0491331adf694dda12edaf03e057570cbfed98ca85a11336a728b308f","tests/ui/pin_project/safe_packed_borrows.rs":"83709dc48e66dfc8a8750619128542c97f9c7e2326f245f724363e1c37053ff1","tests/ui/pin_project/safe_packed_borrows.stderr":"79774c6a5aa4d3e72f1e385951b067da2c78bf157f880d404115f8183d894256","tests/ui/pin_project/unaligned_references.rs":"af0701b6623bc14dfb9708d8006304910421ec6d84572862634fb6c0efccf6dd","tests/ui/pin_project/unaligned_references.stderr":"bfb559198ee9dccfbfd23c1ebee3b1bb6a606f705ceb076f9a6de74e30c71c0c","tests/ui/pin_project/unpin_sneaky.rs":"c261d4cf5d522a7b6366dd143e2c47dfb2f831dc63c3caa4ea8f14ce75dd6156","tests/ui/pin_project/unpin_sneaky.stderr":"31f8b9505bc2af56bece0d6293fc8f8f4af8ed227389035ad6ab268588271bc2","tests/ui/pin_project/visibility.rs":"8fa3c4c47362406e080bc16e2fd17c9f32dca6fab032b161d9e2d5dea0c9d9af","tests/ui/pin_project/visibility.stderr":"752f42fecd7bb98d70d7613cb4eaea60ecd06dea28821ee2e8c7bdbd09dc6316","tests/ui/pinned_drop/call-drop-inner.rs":"77449492550e5a6c749902b386af2ef9eea41e8d0a71597e0d38efb89881118c","tests/ui/pinned_drop/call-drop-inner.stderr":"d34803c33b22f98c00d24ad17f052fb0dc1112b899f58bcb1b1b3c87ccda270f","tests/ui/pinned_drop/conditional-drop-impl.rs":"f4e5898b2107db35ef7f1b01c0444ddc9e7688a99c186a3e8425440a78f8ef60","tests/ui/pinned_drop/conditional-drop-impl.stderr":"e0576237b8f62d0804a56a3c5a17bba4670363ed95030b20ff51f7031f722780","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"70a24449f32cef65acc9bfedd589c7a769820fa00ec2fefeefa98852efbe5e6b","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"676397b4402359c4b0a4d2d90784d6263e87c208789cc19eddbda88ff39a7cd8","tests/ui/pinned_drop/invalid-self.rs":"e94d8af8a838fe91671f3604eccd29990d9eeff5d02fb001642258313beb2659","tests/ui/pinned_drop/invalid-self.stderr":"ef516273c9bc94e9acff2ee362cb35cd9bc7dccbdb14be745c12b38074226f16","tests/ui/pinned_drop/invalid.rs":"f8dff25ea91e5ebab89f27e6e489c2e8ce835addbe412a41ce2394b53cc099ad","tests/ui/pinned_drop/invalid.stderr":"95f970b4cfb6a672571a001f53984c294783cdc75125efef22f4148f633ac332","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"e022ef71e0109b1436c6358ce2f06f0d84d46b7985aa1a2b29756cde96b9cf1f","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"42e849d6e20f3c40fb4062bb14110ad5066577f2b3d185712418432e5121e0ae","tests/ui/pinned_drop/self.rs":"6bf13a7f0cd8b1cb37a74ecf658529d2e4a3b25d971ed2cad87abd7b89e30a17","tests/ui/pinned_drop/self.stderr":"201cf605bc92800f4060b5b8ad76e9f96346bf5bfb98d0ed72ca3a520cd53b4b","tests/ui/pinned_drop/unsafe-call.rs":"ffda1decea5296ec880724e093e49a53ea7965776563d4d1f7fefbe0bfbe7caf","tests/ui/pinned_drop/unsafe-call.stderr":"00f41302bfbd1ae8d32ad16e7af6703c712404a930bdbc6e5a3fbb2b1d0e640b","tests/ui/unsafe_unpin/conflict-unpin.rs":"d14e428aceeab970cfe7842c91b0cc4618661576fef8ff397e1339c125cf2c6e","tests/ui/unsafe_unpin/conflict-unpin.stderr":"bbe1553ec88be73003e46e838529b550605826b507812baf1680d5320f8e207b","tests/ui/unsafe_unpin/negative_impls_stable.rs":"6f17a1f4393e0aad944bce0c6187c8afa3820f37f5cfa6ec67bb44074a77588a","tests/ui/unsafe_unpin/negative_impls_stable.stderr":"2bc867f430eb7014638a35c5fb0e7cc5c39d0536e20b130d1524ebed199ef03c","tests/ui/unstable-features/README.md":"f9dcf95e9c68fe15345f493a3fb4f54726d36c76d1a5a1e2c9dfa25540d4b642","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"0af988c3faad147e74c3f5a8f30af018d6d83c8b142260215ce84a5f09541b70","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"df5a97ce6dbcfee318e27a16a435af82266c0a6b403e32499d101257e40acf75","tests/ui/unstable-features/marker_trait_attr.rs":"8c1f95182a8dbc7fbdaf3a622dfc03064429c690048787a1049205e512368eaf","tests/ui/unstable-features/marker_trait_attr.stderr":"7718916bf5905d9e697b9755949ce64e322d70938e5b5711e57180eb6f41ec05","tests/ui/unstable-features/negative_impls.rs":"3a15268ce37fb4af8a1a783dcddf7698309c107fb8090a9e94a2325ec80dccc6","tests/ui/unstable-features/negative_impls.stderr":"cb8402ab5e9f360f98d3cbe8cf51c2dd594ccd513526595615fa074550a8e271","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"e5fae414bcaa6b1c3faa0c6afd058b1142b3048687d26798393031251c66c2d6","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"56bac510621eafcb5a60ca73c1b645ece8562496b7244efb10cbe4c284ae9c97","tests/ui/unstable-features/overlapping_marker_traits.rs":"acb5cc2704bc684b291204d792ddcb569ea7a549f740b0447b79c08f2fed642a","tests/ui/unstable-features/overlapping_marker_traits.stderr":"99db2981fbdaaaa2004cc30028255ca55afb6bda9ca12fb5996f0414c79ee8c3","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"dc3737d5745da045ac004dbfa9fb1270bcd0e3096c70a7a9a8a3356d3d6ad662","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"9a774d3db38e1403b548c43c9ac6bfe00f41f8619d3000a3594a64ba7a4d6ed3","tests/ui/unstable-features/trivial_bounds.rs":"ad8ba5daa9f8d168e9bf8006de8c8bcf4becc9806b1b54d65d6073f6cd007d7c","tests/ui/unstable-features/trivial_bounds.stderr":"7fbe6415d8e42ace37b1290be606eec94d6b4b3e21cec691113ffc85513e3803","tests/unsafe_unpin.rs":"05cc89ac3d51c77719560dc52caf0ddf673f4051234c54c36ad32c7933fef268"},"package":"1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"}
\ No newline at end of file

crates/pin-project/Android.bp

diff --git a/crates/pin-project/Android.bp b/crates/pin-project/Android.bp
index 34ac277..4020ed8 100644
--- a/crates/pin-project/Android.bp
+++ b/crates/pin-project/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "pin_project",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.1.3",
+    cargo_pkg_version: "1.1.8",
     crate_root: "src/lib.rs",
     edition: "2021",
     proc_macros: ["libpin_project_internal"],

crates/pin-project/CHANGELOG.md

diff --git a/crates/pin-project/CHANGELOG.md b/crates/pin-project/CHANGELOG.md
index ed5637e..b28dc23 100644
--- a/crates/pin-project/CHANGELOG.md
+++ b/crates/pin-project/CHANGELOG.md
@@ -4,12 +4,36 @@
 
 This project adheres to [Semantic Versioning](https://semver.org).
 
+Releases may yanked if there is a security bug, a soundness bug, or a regression.
+
 <!--
 Note: In this file, do not use the hard wrap in the middle of a sentence for compatibility with GitHub comment style markdown rendering.
 -->
 
 ## [Unreleased]
 
+## [1.1.8] - 2025-01-06
+
+- Suppress `unnameable_types`, `clippy::absolute_paths`, `clippy::min_ident_chars`, `clippy::pub_with_shorthand`, `clippy::single_call_fn`, `clippy::single_char_lifetime_names` lints in generated code.
+
+## [1.1.7] - 2024-10-24
+
+- Work around an issue on negative_impls that allows unsound overlapping `Unpin` implementations. ([#357](https://github.com/taiki-e/pin-project/pull/357))
+
+## [1.1.6] - 2024-10-05
+
+- Suppress `clippy::needless_lifetimes` lint in generated code.
+
+- Disable `derive` feature of `syn` dependency.
+
+## [1.1.5] - 2024-03-05
+
+- Suppress `unused_qualifications` lint in generated code.
+
+## [1.1.4] - 2024-01-25
+
+- Suppress `clippy::missing_docs_in_private_items` and `clippy::missing_inline_in_public_items` lints in generated code. ([#356](https://github.com/taiki-e/pin-project/pull/356), thanks @daxpedda)
+
 ## [1.1.3] - 2023-08-06
 
 - Hide documentation of the `Unpin` implementation for `!Unpin` option to work around [rustdoc issue](https://github.com/rust-lang/rust/issues/80481). ([#355](https://github.com/taiki-e/pin-project/pull/355), thanks @matheus-consoli)
@@ -696,7 +720,12 @@
 
 Initial release
 
-[Unreleased]: https://github.com/taiki-e/pin-project/compare/v1.1.3...HEAD
+[Unreleased]: https://github.com/taiki-e/pin-project/compare/v1.1.8...HEAD
+[1.1.8]: https://github.com/taiki-e/pin-project/compare/v1.1.7...v1.1.8
+[1.1.7]: https://github.com/taiki-e/pin-project/compare/v1.1.6...v1.1.7
+[1.1.6]: https://github.com/taiki-e/pin-project/compare/v1.1.5...v1.1.6
+[1.1.5]: https://github.com/taiki-e/pin-project/compare/v1.1.4...v1.1.5
+[1.1.4]: https://github.com/taiki-e/pin-project/compare/v1.1.3...v1.1.4
 [1.1.3]: https://github.com/taiki-e/pin-project/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/taiki-e/pin-project/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/taiki-e/pin-project/compare/v1.1.0...v1.1.1

crates/pin-project/Cargo.lock

diff --git a/crates/pin-project/Cargo.lock b/crates/pin-project/Cargo.lock
index b56bca1..b042494 100644
--- a/crates/pin-project/Cargo.lock
+++ b/crates/pin-project/Cargo.lock
@@ -3,145 +3,48 @@
 version = 3
 
 [[package]]
-name = "basic-toml"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "macrotest"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7489ae0986ce45414b7b3122c2e316661343ecf396b206e3e15f07c846616f10"
-dependencies = [
- "diff",
- "glob",
- "prettyplease",
- "serde",
- "serde_json",
- "syn 1.0.109",
- "toml",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.8"
 dependencies = [
- "macrotest",
  "pin-project-internal",
  "rustversion",
  "static_assertions",
- "trybuild",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "ryu"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-
-[[package]]
-name = "serde"
-version = "1.0.181"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.181"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.28",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "static_assertions"
@@ -151,9 +54,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -161,82 +64,7 @@
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "trybuild"
-version = "1.0.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b"
-dependencies = [
- "basic-toml",
- "glob",
- "once_cell",
- "serde",
- "serde_derive",
- "serde_json",
- "termcolor",
-]
-
-[[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"

crates/pin-project/Cargo.toml

diff --git a/crates/pin-project/Cargo.toml b/crates/pin-project/Cargo.toml
index 5a34ad6..feb25a7 100644
--- a/crates/pin-project/Cargo.toml
+++ b/crates/pin-project/Cargo.toml
@@ -13,12 +13,18 @@
 edition = "2021"
 rust-version = "1.56"
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.8"
+build = false
 exclude = [
     "/.*",
     "/tools",
     "/DEVELOPMENT.md",
 ]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 A crate for safe and ergonomic pin-projection.
 """
@@ -36,17 +42,103 @@
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/taiki-e/pin-project"
 
+[package.metadata.cargo_check_external_types]
+allowed_external_types = ["pin_project_internal::*"]
+
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [lib]
+name = "pin_project"
+path = "src/lib.rs"
 doc-scrape-examples = false
 
-[dependencies.pin-project-internal]
-version = "=1.1.3"
+[[example]]
+name = "enum-default"
+path = "examples/enum-default.rs"
 
-[dev-dependencies.macrotest]
-version = "1.0.9"
+[[example]]
+name = "enum-default-expanded"
+path = "examples/enum-default-expanded.rs"
+
+[[example]]
+name = "not_unpin"
+path = "examples/not_unpin.rs"
+
+[[example]]
+name = "not_unpin-expanded"
+path = "examples/not_unpin-expanded.rs"
+
+[[example]]
+name = "pinned_drop"
+path = "examples/pinned_drop.rs"
+
+[[example]]
+name = "pinned_drop-expanded"
+path = "examples/pinned_drop-expanded.rs"
+
+[[example]]
+name = "project_replace"
+path = "examples/project_replace.rs"
+
+[[example]]
+name = "project_replace-expanded"
+path = "examples/project_replace-expanded.rs"
+
+[[example]]
+name = "struct-default"
+path = "examples/struct-default.rs"
+
+[[example]]
+name = "struct-default-expanded"
+path = "examples/struct-default-expanded.rs"
+
+[[example]]
+name = "unsafe_unpin"
+path = "examples/unsafe_unpin.rs"
+
+[[example]]
+name = "unsafe_unpin-expanded"
+path = "examples/unsafe_unpin-expanded.rs"
+
+[[test]]
+name = "cfg"
+path = "tests/cfg.rs"
+
+[[test]]
+name = "compiletest"
+path = "tests/compiletest.rs"
+
+[[test]]
+name = "drop_order"
+path = "tests/drop_order.rs"
+
+[[test]]
+name = "expandtest"
+path = "tests/expandtest.rs"
+
+[[test]]
+name = "pin_project"
+path = "tests/pin_project.rs"
+
+[[test]]
+name = "pinned_drop"
+path = "tests/pinned_drop.rs"
+
+[[test]]
+name = "proper_unpin"
+path = "tests/proper_unpin.rs"
+
+[[test]]
+name = "repr_packed"
+path = "tests/repr_packed.rs"
+
+[[test]]
+name = "unsafe_unpin"
+path = "tests/unsafe_unpin.rs"
+
+[dependencies.pin-project-internal]
+version = "=1.1.8"
 
 [dev-dependencies.rustversion]
 version = "1"
@@ -54,5 +146,123 @@
 [dev-dependencies.static_assertions]
 version = "1"
 
-[dev-dependencies.trybuild]
-version = "1.0.67"
+[lints.clippy]
+all = "warn"
+as_ptr_cast_mut = "warn"
+as_underscore = "warn"
+default_union_representation = "warn"
+inline_asm_x86_att_syntax = "warn"
+pedantic = "warn"
+trailing_empty_array = "warn"
+transmute_undefined_repr = "warn"
+undocumented_unsafe_blocks = "warn"
+
+[lints.clippy.bool_assert_comparison]
+level = "allow"
+priority = 1
+
+[lints.clippy.borrow_as_ptr]
+level = "allow"
+priority = 1
+
+[lints.clippy.cast_lossless]
+level = "allow"
+priority = 1
+
+[lints.clippy.declare_interior_mutable_const]
+level = "allow"
+priority = 1
+
+[lints.clippy.doc_markdown]
+level = "allow"
+priority = 1
+
+[lints.clippy.float_cmp]
+level = "allow"
+priority = 1
+
+[lints.clippy.incompatible_msrv]
+level = "allow"
+priority = 1
+
+[lints.clippy.lint_groups_priority]
+level = "allow"
+priority = 1
+
+[lints.clippy.manual_assert]
+level = "allow"
+priority = 1
+
+[lints.clippy.manual_range_contains]
+level = "allow"
+priority = 1
+
+[lints.clippy.missing_errors_doc]
+level = "allow"
+priority = 1
+
+[lints.clippy.module_name_repetitions]
+level = "allow"
+priority = 1
+
+[lints.clippy.naive_bytecount]
+level = "allow"
+priority = 1
+
+[lints.clippy.nonminimal_bool]
+level = "allow"
+priority = 1
+
+[lints.clippy.range_plus_one]
+level = "allow"
+priority = 1
+
+[lints.clippy.similar_names]
+level = "allow"
+priority = 1
+
+[lints.clippy.single_match]
+level = "allow"
+priority = 1
+
+[lints.clippy.single_match_else]
+level = "allow"
+priority = 1
+
+[lints.clippy.struct_excessive_bools]
+level = "allow"
+priority = 1
+
+[lints.clippy.struct_field_names]
+level = "allow"
+priority = 1
+
+[lints.clippy.too_many_arguments]
+level = "allow"
+priority = 1
+
+[lints.clippy.too_many_lines]
+level = "allow"
+priority = 1
+
+[lints.clippy.type_complexity]
+level = "allow"
+priority = 1
+
+[lints.clippy.unreadable_literal]
+level = "allow"
+priority = 1
+
+[lints.rust]
+deprecated_safe = "warn"
+improper_ctypes = "warn"
+improper_ctypes_definitions = "warn"
+non_ascii_idents = "warn"
+rust_2018_idioms = "warn"
+single_use_lifetimes = "warn"
+unreachable_pub = "warn"
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+priority = 0
+check-cfg = []

crates/pin-project/METADATA

diff --git a/crates/pin-project/METADATA b/crates/pin-project/METADATA
index 5a25223..0b7e4c5 100644
--- a/crates/pin-project/METADATA
+++ b/crates/pin-project/METADATA
@@ -1,17 +1,17 @@
 name: "pin-project"
 description: "A crate for safe and ergonomic pin-projection."
 third_party {
-  version: "1.1.3"
+  version: "1.1.8"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2023
-    month: 11
-    day: 14
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/pin-project"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/pin-project/pin-project-1.1.3.crate"
-    version: "1.1.3"
+    value: "https://static.crates.io/crates/pin-project/pin-project-1.1.8.crate"
+    version: "1.1.8"
   }
 }

crates/pin-project/README.md

diff --git a/crates/pin-project/README.md b/crates/pin-project/README.md
index 8a98e04..e38a183 100644
--- a/crates/pin-project/README.md
+++ b/crates/pin-project/README.md
@@ -3,8 +3,8 @@
 [![crates.io](https://img.shields.io/crates/v/pin-project?style=flat-square&logo=rust)](https://crates.io/crates/pin-project)
 [![docs.rs](https://img.shields.io/badge/docs.rs-pin--project-blue?style=flat-square&logo=docs.rs)](https://docs.rs/pin-project)
 [![license](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue?style=flat-square)](#license)
-[![rustc](https://img.shields.io/badge/rustc-1.56+-blue?style=flat-square&logo=rust)](https://www.rust-lang.org)
-[![build status](https://img.shields.io/github/actions/workflow/status/taiki-e/pin-project/ci.yml?branch=main&style=flat-square&logo=github)](https://github.com/taiki-e/pin-project/actions)
+[![msrv](https://img.shields.io/badge/msrv-1.56-blue?style=flat-square&logo=rust)](https://www.rust-lang.org)
+[![github actions](https://img.shields.io/github/actions/workflow/status/taiki-e/pin-project/ci.yml?branch=main&style=flat-square&logo=github)](https://github.com/taiki-e/pin-project/actions)
 
 <!-- tidy:crate-doc:start -->
 A crate for safe and ergonomic [pin-projection].
@@ -18,8 +18,6 @@
 pin-project = "1"
 ```
 
-*Compiler support: requires rustc 1.56+*
-
 ## Examples
 
 [`#[pin_project]`][`pin_project`] attribute creates projection types
@@ -93,7 +91,7 @@
 
 <!-- tidy:crate-doc:end -->
 
-[`pin_project`]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html
+[`pin_project`]: https://docs.rs/pin-project/latest/pin_project/attr.pin_project.html
 
 ## License
 

crates/pin-project/examples/README.md

diff --git a/crates/pin-project/examples/README.md b/crates/pin-project/examples/README.md
index 0f30a7f..dea2a9e 100644
--- a/crates/pin-project/examples/README.md
+++ b/crates/pin-project/examples/README.md
@@ -1,38 +1,40 @@
 # Examples and generated code of each feature of pin-project
 
-### Basic usage of `#[pin_project]` on structs
+## Basic usage of `#[pin_project]` on structs
 
 - [example](struct-default.rs)
 - [generated code](struct-default-expanded.rs)
 
-### Basic usage of `#[pin_project]` on enums
+## Basic usage of `#[pin_project]` on enums
 
 - [example](enum-default.rs)
 - [generated code](enum-default-expanded.rs)
 
-### Manual implementation of `Unpin` by `UnsafeUnpin`
+## Manual implementation of `Unpin` by `UnsafeUnpin`
 
 - [example](unsafe_unpin.rs)
 - [generated code](unsafe_unpin-expanded.rs)
-- [`UnsafeUnpin` documentation](https://docs.rs/pin-project/1/pin_project/trait.UnsafeUnpin.html)
+- [`UnsafeUnpin` documentation](https://docs.rs/pin-project/latest/pin_project/trait.UnsafeUnpin.html)
 
-### Manual implementation of `Drop` by `#[pinned_drop]`
+## Manual implementation of `Drop` by `#[pinned_drop]`
 
 - [example](pinned_drop.rs)
 - [generated code](pinned_drop-expanded.rs)
-- [`#[pinned_drop]` documentation](https://docs.rs/pin-project/1/pin_project/attr.pinned_drop.html)
+- [`#[pinned_drop]` documentation](https://docs.rs/pin-project/latest/pin_project/attr.pinned_drop.html)
 
-### `project_replace()` method
+## `project_replace()` method
 
 - [example](project_replace.rs)
 - [generated code](project_replace-expanded.rs)
-- [`project_replace()` documentation](https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#project_replace-method)
+- [`project_replace()` documentation](https://docs.rs/pin-project/latest/pin_project/attr.pin_project.html#project_replace-method)
 
-### Ensure `!Unpin` by `#[pin_project(!Unpin)]`
+## Ensure `!Unpin` by `#[pin_project(!Unpin)]`
 
 - [example](not_unpin.rs)
 - [generated code](not_unpin-expanded.rs)
-- [`!Unpin` documentation](https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin)
+- [`!Unpin` documentation](https://docs.rs/pin-project/latest/pin_project/attr.pin_project.html#unpin)
+
+---
 
 Note: These generated code examples are the little simplified version of the
 actual generated code. See [expansion tests](../tests#expansion-tests-expand-expandtestrs) if you

crates/pin-project/examples/enum-default-expanded.rs

diff --git a/crates/pin-project/examples/enum-default-expanded.rs b/crates/pin-project/examples/enum-default-expanded.rs
index 459ca39..02b64f0 100644
--- a/crates/pin-project/examples/enum-default-expanded.rs
+++ b/crates/pin-project/examples/enum-default-expanded.rs
@@ -1,6 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./enum-default.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use pin_project::pin_project;
@@ -14,10 +16,15 @@
 // fn main() {}
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
 #![allow(
-    clippy::needless_lifetimes,
+    dead_code,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
     clippy::just_underscores_and_digits,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks,
     clippy::used_underscore_binding
 )]
 
@@ -70,13 +77,15 @@
         __field0: T,
     }
     impl<'pin, T, U> ::pin_project::__private::Unpin for Enum<T, U> where
-        __Enum<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Enum<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
     // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
     #[doc(hidden)]
     unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Enum<T, U> where
-        __Enum<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Enum<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
 

crates/pin-project/examples/enum-default.rs

diff --git a/crates/pin-project/examples/enum-default.rs b/crates/pin-project/examples/enum-default.rs
index bd3f2e6..e4f1d87 100644
--- a/crates/pin-project/examples/enum-default.rs
+++ b/crates/pin-project/examples/enum-default.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./enum-default-expanded.rs for generated code.
 
 #![allow(dead_code)]

crates/pin-project/examples/not_unpin-expanded.rs

diff --git a/crates/pin-project/examples/not_unpin-expanded.rs b/crates/pin-project/examples/not_unpin-expanded.rs
index 5700c12..c06c9c0 100644
--- a/crates/pin-project/examples/not_unpin-expanded.rs
+++ b/crates/pin-project/examples/not_unpin-expanded.rs
@@ -1,12 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./not_unpin.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use pin_project::pin_project;
 //
 // #[pin_project(!Unpin)]
-// pub struct Struct<T, U> {
+// struct Struct<T, U> {
 //     #[pin]
 //     pinned: T,
 //     unpinned: U,
@@ -18,27 +20,34 @@
 // }
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
+#![allow(
+    dead_code,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks
+)]
 
 use pin_project::pin_project;
 
 // #[pin_project(!Unpin)]
-pub struct Struct<T, U> {
+struct Struct<T, U> {
     // #[pin]
     pinned: T,
     unpinned: U,
 }
 
 const _: () = {
-    pub(crate) struct __StructProjection<'pin, T, U>
+    struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
     {
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    pub(crate) struct __StructProjectionRef<'pin, T, U>
+    struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
     {
@@ -47,7 +56,7 @@
     }
 
     impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
+        fn project<'pin>(
             self: ::pin_project::__private::Pin<&'pin mut Self>,
         ) -> __StructProjection<'pin, T, U> {
             unsafe {
@@ -58,7 +67,7 @@
                 }
             }
         }
-        pub(crate) fn project_ref<'pin>(
+        fn project_ref<'pin>(
             self: ::pin_project::__private::Pin<&'pin Self>,
         ) -> __StructProjectionRef<'pin, T, U> {
             unsafe {
@@ -86,9 +95,11 @@
     //
     // See https://github.com/taiki-e/pin-project/issues/102#issuecomment-540472282
     // for details.
+    #[doc(hidden)]
     impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>:
-            ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<
+            ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>,
+        >: ::pin_project::__private::Unpin
     {
     }
     // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
@@ -99,8 +110,9 @@
     // coherence checks are run.
     #[doc(hidden)]
     unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>:
-            ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<
+            ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>,
+        >: ::pin_project::__private::Unpin
     {
     }
 

crates/pin-project/examples/not_unpin.rs

diff --git a/crates/pin-project/examples/not_unpin.rs b/crates/pin-project/examples/not_unpin.rs
index 2ad72a8..f80cc76 100644
--- a/crates/pin-project/examples/not_unpin.rs
+++ b/crates/pin-project/examples/not_unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./not_unpin-expanded.rs for generated code.
 
 #![allow(dead_code)]
@@ -5,7 +7,7 @@
 use pin_project::pin_project;
 
 #[pin_project(!Unpin)]
-pub struct Struct<T, U> {
+struct Struct<T, U> {
     #[pin]
     pinned: T,
     unpinned: U,

crates/pin-project/examples/pinned_drop-expanded.rs

diff --git a/crates/pin-project/examples/pinned_drop-expanded.rs b/crates/pin-project/examples/pinned_drop-expanded.rs
index 82207b6..5263de6 100644
--- a/crates/pin-project/examples/pinned_drop-expanded.rs
+++ b/crates/pin-project/examples/pinned_drop-expanded.rs
@@ -1,6 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./pinned_drop.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use std::pin::Pin;
@@ -22,8 +24,17 @@
 // fn main() {}
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes, clippy::mut_mut)]
+#![allow(
+    dead_code,
+    single_use_lifetimes,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
+    clippy::mut_mut,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks
+)]
 
 use std::pin::Pin;
 
@@ -112,13 +123,15 @@
         __lifetime0: &'a (),
     }
     impl<'pin, 'a, T> ::pin_project::__private::Unpin for Struct<'a, T> where
-        __Struct<'pin, 'a, T>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, 'a, T>>:
+            ::pin_project::__private::Unpin
     {
     }
     // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
     #[doc(hidden)]
     unsafe impl<'pin, 'a, T> ::pin_project::UnsafeUnpin for Struct<'a, T> where
-        __Struct<'pin, 'a, T>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, 'a, T>>:
+            ::pin_project::__private::Unpin
     {
     }
 };

crates/pin-project/examples/pinned_drop.rs

diff --git a/crates/pin-project/examples/pinned_drop.rs b/crates/pin-project/examples/pinned_drop.rs
index 6fb8719..77d21a2 100644
--- a/crates/pin-project/examples/pinned_drop.rs
+++ b/crates/pin-project/examples/pinned_drop.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./pinned_drop-expanded.rs for generated code.
 
 #![allow(dead_code)]

crates/pin-project/examples/project_replace-expanded.rs

diff --git a/crates/pin-project/examples/project_replace-expanded.rs b/crates/pin-project/examples/project_replace-expanded.rs
index 445e570..ffcf818 100644
--- a/crates/pin-project/examples/project_replace-expanded.rs
+++ b/crates/pin-project/examples/project_replace-expanded.rs
@@ -1,6 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./struct-default.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use pin_project::pin_project;
@@ -15,8 +17,15 @@
 // fn main() {}
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
+#![allow(
+    dead_code,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks
+)]
 
 use pin_project::pin_project;
 
@@ -128,13 +137,15 @@
         __field0: T,
     }
     impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
     // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
     #[doc(hidden)]
     unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
 

crates/pin-project/examples/project_replace.rs

diff --git a/crates/pin-project/examples/project_replace.rs b/crates/pin-project/examples/project_replace.rs
index 99cec18..e5c34b7 100644
--- a/crates/pin-project/examples/project_replace.rs
+++ b/crates/pin-project/examples/project_replace.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./struct-default-expanded.rs for generated code.
 
 #![allow(dead_code)]

crates/pin-project/examples/struct-default-expanded.rs

diff --git a/crates/pin-project/examples/struct-default-expanded.rs b/crates/pin-project/examples/struct-default-expanded.rs
index d661099..01f2f7e 100644
--- a/crates/pin-project/examples/struct-default-expanded.rs
+++ b/crates/pin-project/examples/struct-default-expanded.rs
@@ -1,6 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./struct-default.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use pin_project::pin_project;
@@ -15,8 +17,15 @@
 // fn main() {}
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
+#![allow(
+    dead_code,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks
+)]
 
 use pin_project::pin_project;
 
@@ -90,7 +99,7 @@
     //
     // Basically this is equivalent to the following code:
     //
-    // ```rust
+    // ```
     // impl<T, U> Unpin for Struct<T, U> where T: Unpin {}
     // ```
     //
@@ -98,7 +107,7 @@
     // this would cause an E0446 (private type in public interface).
     //
     // When RFC 2145 is implemented (rust-lang/rust#48054),
-    // this will become a lint, rather then a hard error.
+    // this will become a lint, rather than a hard error.
     //
     // As a workaround for this, we generate a new struct, containing all of
     // the pinned fields from our #[pin_project] type. This struct is declared
@@ -120,7 +129,8 @@
         __field0: T,
     }
     impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
     // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
@@ -131,7 +141,8 @@
     // coherence checks are run.
     #[doc(hidden)]
     unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
+        ::pin_project::__private::PinnedFieldsOf<__Struct<'pin, T, U>>:
+            ::pin_project::__private::Unpin
     {
     }
 

crates/pin-project/examples/struct-default.rs

diff --git a/crates/pin-project/examples/struct-default.rs b/crates/pin-project/examples/struct-default.rs
index 46808a5..66d8a6e 100644
--- a/crates/pin-project/examples/struct-default.rs
+++ b/crates/pin-project/examples/struct-default.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./struct-default-expanded.rs for generated code.
 
 #![allow(dead_code)]

crates/pin-project/examples/unsafe_unpin-expanded.rs

diff --git a/crates/pin-project/examples/unsafe_unpin-expanded.rs b/crates/pin-project/examples/unsafe_unpin-expanded.rs
index e9c7abc..f4521fc 100644
--- a/crates/pin-project/examples/unsafe_unpin-expanded.rs
+++ b/crates/pin-project/examples/unsafe_unpin-expanded.rs
@@ -1,12 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Original code (./unsafe_unpin.rs):
 //
-// ```rust
+// ```
 // #![allow(dead_code)]
 //
 // use pin_project::{pin_project, UnsafeUnpin};
 //
 // #[pin_project(UnsafeUnpin)]
-// pub struct Struct<T, U> {
+// struct Struct<T, U> {
 //     #[pin]
 //     pinned: T,
 //     unpinned: U,
@@ -17,27 +19,34 @@
 // fn main() {}
 // ```
 
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
+#![allow(
+    dead_code,
+    unused_imports,
+    unused_parens,
+    unknown_lints,
+    renamed_and_removed_lints,
+    clippy::needless_lifetimes,
+    clippy::undocumented_unsafe_blocks
+)]
 
 use pin_project::{pin_project, UnsafeUnpin};
 
 // #[pin_project(UnsafeUnpin)]
-pub struct Struct<T, U> {
+struct Struct<T, U> {
     // #[pin]
     pinned: T,
     unpinned: U,
 }
 
 const _: () = {
-    pub(crate) struct __StructProjection<'pin, T, U>
+    struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
     {
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    pub(crate) struct __StructProjectionRef<'pin, T, U>
+    struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
     {
@@ -46,7 +55,7 @@
     }
 
     impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
+        fn project<'pin>(
             self: ::pin_project::__private::Pin<&'pin mut Self>,
         ) -> __StructProjection<'pin, T, U> {
             unsafe {
@@ -57,7 +66,7 @@
                 }
             }
         }
-        pub(crate) fn project_ref<'pin>(
+        fn project_ref<'pin>(
             self: ::pin_project::__private::Pin<&'pin Self>,
         ) -> __StructProjectionRef<'pin, T, U> {
             unsafe {
@@ -83,7 +92,8 @@
 
     // Implement `Unpin` via `UnsafeUnpin`.
     impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, Self>: ::pin_project::UnsafeUnpin
+        ::pin_project::__private::PinnedFieldsOf<::pin_project::__private::Wrapper<'pin, Self>>:
+            ::pin_project::UnsafeUnpin
     {
     }
 

crates/pin-project/examples/unsafe_unpin.rs

diff --git a/crates/pin-project/examples/unsafe_unpin.rs b/crates/pin-project/examples/unsafe_unpin.rs
index 5ec0cd2..66a08a9 100644
--- a/crates/pin-project/examples/unsafe_unpin.rs
+++ b/crates/pin-project/examples/unsafe_unpin.rs
@@ -1,11 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // See ./unsafe_unpin-expanded.rs for generated code.
 
-#![allow(dead_code)]
+#![allow(dead_code, clippy::undocumented_unsafe_blocks)]
 
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(UnsafeUnpin)]
-pub struct Struct<T, U> {
+struct Struct<T, U> {
     #[pin]
     pinned: T,
     unpinned: U,

crates/pin-project/src/lib.rs

diff --git a/crates/pin-project/src/lib.rs b/crates/pin-project/src/lib.rs
index aece45e..56a661a 100644
--- a/crates/pin-project/src/lib.rs
+++ b/crates/pin-project/src/lib.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 /*!
 <!-- tidy:crate-doc:start -->
 A crate for safe and ergonomic [pin-projection].
@@ -11,8 +13,6 @@
 pin-project = "1"
 ```
 
-*Compiler support: requires rustc 1.56+*
-
 ## Examples
 
 [`#[pin_project]`][`pin_project`] attribute creates projection types
@@ -95,27 +95,18 @@
         allow(dead_code, unused_variables)
     )
 ))]
+#![warn(unsafe_op_in_unsafe_fn)]
 #![warn(
+    // Lints that may help when writing public library.
+    missing_debug_implementations,
     missing_docs,
-    rust_2018_idioms,
-    single_use_lifetimes,
-    unreachable_pub,
-    unsafe_op_in_unsafe_fn
-)]
-#![warn(
-    clippy::pedantic,
-    // lints for public library
     clippy::alloc_instead_of_core,
     clippy::exhaustive_enums,
     clippy::exhaustive_structs,
+    clippy::impl_trait_in_params,
+    // clippy::missing_inline_in_public_items,
     clippy::std_instead_of_alloc,
     clippy::std_instead_of_core,
-    // lints that help writing unsafe code
-    clippy::as_ptr_cast_mut,
-    clippy::default_union_representation,
-    clippy::trailing_empty_array,
-    clippy::transmute_undefined_repr,
-    clippy::undocumented_unsafe_blocks,
 )]
 #![allow(clippy::needless_doctest_main)]
 
@@ -167,7 +158,7 @@
 /// An `UnsafeUnpin` impl which, in addition to requiring that structurally
 /// pinned fields be [`Unpin`], imposes an additional requirement:
 ///
-/// ```rust
+/// ```
 /// use pin_project::{pin_project, UnsafeUnpin};
 ///
 /// #[pin_project(UnsafeUnpin)]
@@ -188,6 +179,7 @@
 
 // Not public API.
 #[doc(hidden)]
+#[allow(missing_debug_implementations)]
 pub mod __private {
     use core::mem::ManuallyDrop;
     #[doc(hidden)]
@@ -236,7 +228,7 @@
     //
     // Supposed we have the following code:
     //
-    // ```rust
+    // ```
     // #[pin_project(UnsafeUnpin)]
     // struct MyStruct<T> {
     //     #[pin] field: T
@@ -258,7 +250,7 @@
     //
     // We now have code that looks like this:
     //
-    // ```rust
+    // ```
     // impl<T> Unpin for MyStruct<T> where Wrapper<MyStruct<T>>: UnsafeUnpin {} // generated by pin-project-internal
     // impl<T> Unpin for MyStruct<T> where T: Copy // written by the user
     // ```
@@ -282,30 +274,44 @@
     // Unpin), or provide an impl of `UnsafeUnpin`. It is impossible for them to
     // provide an impl of `Unpin`
     #[doc(hidden)]
+    #[allow(dead_code)]
     pub struct Wrapper<'a, T: ?Sized>(PhantomData<&'a ()>, T);
-
     // SAFETY: `T` implements UnsafeUnpin.
     unsafe impl<T: ?Sized + UnsafeUnpin> UnsafeUnpin for Wrapper<'_, T> {}
 
+    // Workaround for issue on unstable negative_impls feature that allows unsound overlapping Unpin
+    // implementations and rustc bug that leaks unstable negative_impls into stable.
+    // See https://github.com/taiki-e/pin-project/issues/340#issuecomment-2432146009 for details.
+    #[doc(hidden)]
+    pub type PinnedFieldsOf<T> =
+        <PinnedFieldsOfHelperStruct<T> as PinnedFieldsOfHelperTrait>::Actual;
+    // We cannot use <Option<T> as IntoIterator>::Item or similar since we should allow ?Sized in T.
+    #[doc(hidden)]
+    pub trait PinnedFieldsOfHelperTrait {
+        type Actual: ?Sized;
+    }
+    #[doc(hidden)]
+    pub struct PinnedFieldsOfHelperStruct<T: ?Sized>(T);
+    impl<T: ?Sized> PinnedFieldsOfHelperTrait for PinnedFieldsOfHelperStruct<T> {
+        type Actual = T;
+    }
+
     // This is an internal helper struct used by `pin-project-internal`.
     //
     // See https://github.com/taiki-e/pin-project/pull/53 for more details.
     #[doc(hidden)]
     pub struct AlwaysUnpin<'a, T>(PhantomData<&'a ()>, PhantomData<T>);
-
     impl<T> Unpin for AlwaysUnpin<'_, T> {}
 
     // This is an internal helper used to ensure a value is dropped.
     #[doc(hidden)]
     pub struct UnsafeDropInPlaceGuard<T: ?Sized>(*mut T);
-
     impl<T: ?Sized> UnsafeDropInPlaceGuard<T> {
         #[doc(hidden)]
         pub unsafe fn new(ptr: *mut T) -> Self {
             Self(ptr)
         }
     }
-
     impl<T: ?Sized> Drop for UnsafeDropInPlaceGuard<T> {
         fn drop(&mut self) {
             // SAFETY: the caller of `UnsafeDropInPlaceGuard::new` must guarantee
@@ -323,14 +329,12 @@
         target: *mut T,
         value: ManuallyDrop<T>,
     }
-
     impl<T> UnsafeOverwriteGuard<T> {
         #[doc(hidden)]
         pub unsafe fn new(target: *mut T, value: T) -> Self {
             Self { target, value: ManuallyDrop::new(value) }
         }
     }
-
     impl<T> Drop for UnsafeOverwriteGuard<T> {
         fn drop(&mut self) {
             // SAFETY: the caller of `UnsafeOverwriteGuard::new` must guarantee

crates/pin-project/tests/auxiliary/mod.rs

diff --git a/crates/pin-project/tests/auxiliary/mod.rs b/crates/pin-project/tests/auxiliary/mod.rs
index 1457099..4ccd0a8 100644
--- a/crates/pin-project/tests/auxiliary/mod.rs
+++ b/crates/pin-project/tests/auxiliary/mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![allow(dead_code, unused_macros)]
 
 macro_rules! assert_unpin {

crates/pin-project/tests/cfg.rs

diff --git a/crates/pin-project/tests/cfg.rs b/crates/pin-project/tests/cfg.rs
index 2f5387b..344ca63 100644
--- a/crates/pin-project/tests/cfg.rs
+++ b/crates/pin-project/tests/cfg.rs
@@ -1,5 +1,6 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+#![allow(dead_code, clippy::items_after_statements)]
 
 // Refs: https://doc.rust-lang.org/reference/attributes.html
 

crates/pin-project/tests/compiletest.rs

diff --git a/crates/pin-project/tests/compiletest.rs b/crates/pin-project/tests/compiletest.rs
index cb30f60..7ed69c8 100644
--- a/crates/pin-project/tests/compiletest.rs
+++ b/crates/pin-project/tests/compiletest.rs
@@ -1,16 +1,10 @@
-#![cfg(not(miri))]
-#![cfg(not(careful))]
-#![warn(rust_2018_idioms, single_use_lifetimes)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use std::env;
+#![cfg(not(miri))]
 
 #[rustversion::attr(not(nightly), ignore)]
 #[test]
 fn ui() {
-    if env::var_os("CI").is_none() {
-        env::set_var("TRYBUILD", "overwrite");
-    }
-
     let t = trybuild::TestCases::new();
     t.compile_fail("tests/ui/**/*.rs");
     t.pass("tests/run-pass/**/*.rs");

crates/pin-project/tests/drop_order.rs

diff --git a/crates/pin-project/tests/drop_order.rs b/crates/pin-project/tests/drop_order.rs
index f1e01fd..1786573 100644
--- a/crates/pin-project/tests/drop_order.rs
+++ b/crates/pin-project/tests/drop_order.rs
@@ -1,4 +1,4 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 // Refs: https://doc.rust-lang.org/reference/destructors.html
 

crates/pin-project/tests/expand/default/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/default/enum.expanded.rs b/crates/pin-project/tests/expand/default/enum.expanded.rs
index 599a5f9..c23e45b 100644
--- a/crates/pin-project/tests/expand/default/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/default/enum.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,18 +34,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -48,20 +60,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -114,7 +132,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -128,12 +146,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/default/enum.rs

diff --git a/crates/pin-project/tests/expand/default/enum.rs b/crates/pin-project/tests/expand/default/enum.rs
index ff05615..9fc23fd 100644
--- a/crates/pin-project/tests/expand/default/enum.rs
+++ b/crates/pin-project/tests/expand/default/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = EnumProj, project_ref = EnumProjRef)]

crates/pin-project/tests/expand/default/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/default/struct.expanded.rs b/crates/pin-project/tests/expand/default/struct.expanded.rs
index db3c948..5edd5fb 100644
--- a/crates/pin-project/tests/expand/default/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/default/struct.expanded.rs
@@ -5,25 +5,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -74,7 +78,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -87,12 +91,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/default/struct.rs

diff --git a/crates/pin-project/tests/expand/default/struct.rs b/crates/pin-project/tests/expand/default/struct.rs
index 474f0a1..6e9e135 100644
--- a/crates/pin-project/tests/expand/default/struct.rs
+++ b/crates/pin-project/tests/expand/default/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/default/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/default/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/default/tuple_struct.expanded.rs
index 6b962d6..ef95f0b 100644
--- a/crates/pin-project/tests/expand/default/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/default/tuple_struct.expanded.rs
@@ -1,33 +1,37 @@
 use pin_project::pin_project;
 #[pin(__private())]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -68,7 +72,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -81,12 +85,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/default/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/default/tuple_struct.rs b/crates/pin-project/tests/expand/default/tuple_struct.rs
index 398b14f..f0f8777 100644
--- a/crates/pin-project/tests/expand/default/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/default/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/multifields/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/multifields/enum.expanded.rs b/crates/pin-project/tests/expand/multifields/enum.expanded.rs
index 003f1c7..c7b868c 100644
--- a/crates/pin-project/tests/expand/multifields/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/multifields/enum.expanded.rs
@@ -11,18 +11,24 @@
     Tuple(#[pin] T, #[pin] T, U, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -41,18 +47,24 @@
     ),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -71,19 +83,25 @@
     ),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(variant_size_differences)]
-#[allow(clippy::large_enum_variant)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    variant_size_differences,
+    clippy::large_enum_variant,
+    clippy::missing_docs_in_private_items
+)]
 enum EnumProjOwn<T, U> {
     Struct {
         pinned1: ::pin_project::__private::PhantomData<T>,
@@ -99,20 +117,26 @@
     ),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -236,7 +260,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -252,12 +276,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/multifields/enum.rs

diff --git a/crates/pin-project/tests/expand/multifields/enum.rs b/crates/pin-project/tests/expand/multifields/enum.rs
index 754d48c..8838926 100644
--- a/crates/pin-project/tests/expand/multifields/enum.rs
+++ b/crates/pin-project/tests/expand/multifields/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]

crates/pin-project/tests/expand/multifields/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/multifields/struct.expanded.rs b/crates/pin-project/tests/expand/multifields/struct.expanded.rs
index c3e7a02..31cc548 100644
--- a/crates/pin-project/tests/expand/multifields/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/multifields/struct.expanded.rs
@@ -8,25 +8,30 @@
     unpinned1: U,
     unpinned2: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -36,8 +41,7 @@
         unpinned1: &'pin mut (U),
         unpinned2: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -47,7 +51,7 @@
         unpinned1: &'pin (U),
         unpinned2: &'pin (U),
     }
-    #[allow(dead_code)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items)]
     struct __StructProjectionOwned<T, U> {
         pinned1: ::pin_project::__private::PhantomData<T>,
         pinned2: ::pin_project::__private::PhantomData<T>,
@@ -125,7 +129,7 @@
         let _ = &this.unpinned1;
         let _ = &this.unpinned2;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -139,12 +143,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/multifields/struct.rs

diff --git a/crates/pin-project/tests/expand/multifields/struct.rs b/crates/pin-project/tests/expand/multifields/struct.rs
index 3b319bf..213aafb 100644
--- a/crates/pin-project/tests/expand/multifields/struct.rs
+++ b/crates/pin-project/tests/expand/multifields/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace)]

crates/pin-project/tests/expand/multifields/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/multifields/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/multifields/tuple_struct.expanded.rs
index 3931e09..36190ba 100644
--- a/crates/pin-project/tests/expand/multifields/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/multifields/tuple_struct.expanded.rs
@@ -1,25 +1,30 @@
 use pin_project::pin_project;
 #[pin(__private(project_replace))]
 struct TupleStruct<T, U>(#[pin] T, #[pin] T, U, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         ::pin_project::__private::Pin<&'pin mut (T)>,
@@ -28,8 +33,7 @@
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         ::pin_project::__private::Pin<&'pin (T)>,
@@ -38,7 +42,7 @@
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items)]
     struct __TupleStructProjectionOwned<T, U>(
         ::pin_project::__private::PhantomData<T>,
         ::pin_project::__private::PhantomData<T>,
@@ -115,7 +119,7 @@
         let _ = &this.2;
         let _ = &this.3;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -129,12 +133,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/multifields/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/multifields/tuple_struct.rs b/crates/pin-project/tests/expand/multifields/tuple_struct.rs
index bc92eee..44887ee 100644
--- a/crates/pin-project/tests/expand/multifields/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/multifields/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace)]

crates/pin-project/tests/expand/naming/enum-all.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-all.expanded.rs b/crates/pin-project/tests/expand/naming/enum-all.expanded.rs
index 8f7c8af..906782f 100644
--- a/crates/pin-project/tests/expand/naming/enum-all.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/enum-all.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum Proj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,18 +34,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum ProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -48,38 +60,50 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(variant_size_differences)]
-#[allow(clippy::large_enum_variant)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    variant_size_differences,
+    clippy::large_enum_variant,
+    clippy::missing_docs_in_private_items
+)]
 enum ProjOwn<T, U> {
     Struct { pinned: ::pin_project::__private::PhantomData<T>, unpinned: U },
     Tuple(::pin_project::__private::PhantomData<T>, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -174,7 +198,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -188,12 +212,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/enum-all.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-all.rs b/crates/pin-project/tests/expand/naming/enum-all.rs
index dd513e6..58e5818 100644
--- a/crates/pin-project/tests/expand/naming/enum-all.rs
+++ b/crates/pin-project/tests/expand/naming/enum-all.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj, project_ref = ProjRef, project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/enum-mut.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-mut.expanded.rs b/crates/pin-project/tests/expand/naming/enum-mut.expanded.rs
index d489e82..0937d9b 100644
--- a/crates/pin-project/tests/expand/naming/enum-mut.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/enum-mut.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum Proj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,20 +34,26 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -67,7 +79,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -81,12 +93,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/enum-mut.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-mut.rs b/crates/pin-project/tests/expand/naming/enum-mut.rs
index 818276f..3a8634e 100644
--- a/crates/pin-project/tests/expand/naming/enum-mut.rs
+++ b/crates/pin-project/tests/expand/naming/enum-mut.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj)]

crates/pin-project/tests/expand/naming/enum-none.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-none.expanded.rs b/crates/pin-project/tests/expand/naming/enum-none.expanded.rs
index 46477d1..d4a3e78 100644
--- a/crates/pin-project/tests/expand/naming/enum-none.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/enum-none.expanded.rs
@@ -5,25 +5,31 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
     impl<T, U> Enum<T, U> {}
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -37,12 +43,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/enum-none.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-none.rs b/crates/pin-project/tests/expand/naming/enum-none.rs
index a87438d..1391bcc 100644
--- a/crates/pin-project/tests/expand/naming/enum-none.rs
+++ b/crates/pin-project/tests/expand/naming/enum-none.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/naming/enum-own.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-own.expanded.rs b/crates/pin-project/tests/expand/naming/enum-own.expanded.rs
index 5fc0430..2506b7e 100644
--- a/crates/pin-project/tests/expand/naming/enum-own.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/enum-own.expanded.rs
@@ -5,38 +5,50 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(variant_size_differences)]
-#[allow(clippy::large_enum_variant)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    variant_size_differences,
+    clippy::large_enum_variant,
+    clippy::missing_docs_in_private_items
+)]
 enum ProjOwn<T, U> {
     Struct { pinned: ::pin_project::__private::PhantomData<T>, unpinned: U },
     Tuple(::pin_project::__private::PhantomData<T>, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -87,7 +99,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -101,12 +113,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/enum-own.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-own.rs b/crates/pin-project/tests/expand/naming/enum-own.rs
index cf88697..1a03aae 100644
--- a/crates/pin-project/tests/expand/naming/enum-own.rs
+++ b/crates/pin-project/tests/expand/naming/enum-own.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/enum-ref.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-ref.expanded.rs b/crates/pin-project/tests/expand/naming/enum-ref.expanded.rs
index 7a141c9..7bb927d 100644
--- a/crates/pin-project/tests/expand/naming/enum-ref.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/enum-ref.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum ProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -25,20 +31,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -68,7 +80,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -82,12 +94,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/enum-ref.rs

diff --git a/crates/pin-project/tests/expand/naming/enum-ref.rs b/crates/pin-project/tests/expand/naming/enum-ref.rs
index b1ff805..99cbff4 100644
--- a/crates/pin-project/tests/expand/naming/enum-ref.rs
+++ b/crates/pin-project/tests/expand/naming/enum-ref.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_ref = ProjRef)]

crates/pin-project/tests/expand/naming/struct-all.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-all.expanded.rs b/crates/pin-project/tests/expand/naming/struct-all.expanded.rs
index 36c1230..6bb64b6 100644
--- a/crates/pin-project/tests/expand/naming/struct-all.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/struct-all.expanded.rs
@@ -5,18 +5,24 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 struct Proj<'pin, T, U>
 where
     Struct<T, U>: 'pin,
@@ -24,18 +30,24 @@
     pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
     unpinned: &'pin mut (U),
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 struct ProjRef<'pin, T, U>
 where
     Struct<T, U>: 'pin,
@@ -43,35 +55,47 @@
     pinned: ::pin_project::__private::Pin<&'pin (T)>,
     unpinned: &'pin (U),
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items
+)]
 struct ProjOwn<T, U> {
     pinned: ::pin_project::__private::PhantomData<T>,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -134,7 +158,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -147,12 +171,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/struct-all.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-all.rs b/crates/pin-project/tests/expand/naming/struct-all.rs
index c229ba4..a766c4f 100644
--- a/crates/pin-project/tests/expand/naming/struct-all.rs
+++ b/crates/pin-project/tests/expand/naming/struct-all.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj, project_ref = ProjRef, project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/struct-mut.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-mut.expanded.rs b/crates/pin-project/tests/expand/naming/struct-mut.expanded.rs
index 7164072..116ce5d 100644
--- a/crates/pin-project/tests/expand/naming/struct-mut.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/struct-mut.expanded.rs
@@ -5,18 +5,24 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 struct Proj<'pin, T, U>
 where
     Struct<T, U>: 'pin,
@@ -24,25 +30,30 @@
     pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
     unpinned: &'pin mut (U),
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -84,7 +95,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -97,12 +108,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/struct-mut.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-mut.rs b/crates/pin-project/tests/expand/naming/struct-mut.rs
index 2f554d3..e79a73d 100644
--- a/crates/pin-project/tests/expand/naming/struct-mut.rs
+++ b/crates/pin-project/tests/expand/naming/struct-mut.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj)]

crates/pin-project/tests/expand/naming/struct-none.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-none.expanded.rs b/crates/pin-project/tests/expand/naming/struct-none.expanded.rs
index db3c948..5edd5fb 100644
--- a/crates/pin-project/tests/expand/naming/struct-none.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/struct-none.expanded.rs
@@ -5,25 +5,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -74,7 +78,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -87,12 +91,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/struct-none.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-none.rs b/crates/pin-project/tests/expand/naming/struct-none.rs
index 474f0a1..6e9e135 100644
--- a/crates/pin-project/tests/expand/naming/struct-none.rs
+++ b/crates/pin-project/tests/expand/naming/struct-none.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/naming/struct-own.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-own.expanded.rs b/crates/pin-project/tests/expand/naming/struct-own.expanded.rs
index b2f6079..31dde81 100644
--- a/crates/pin-project/tests/expand/naming/struct-own.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/struct-own.expanded.rs
@@ -5,40 +5,51 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items
+)]
 struct ProjOwn<T, U> {
     pinned: ::pin_project::__private::PhantomData<T>,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -46,8 +57,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -114,7 +124,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -127,12 +137,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/struct-own.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-own.rs b/crates/pin-project/tests/expand/naming/struct-own.rs
index 4924362..9c17157 100644
--- a/crates/pin-project/tests/expand/naming/struct-own.rs
+++ b/crates/pin-project/tests/expand/naming/struct-own.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/struct-ref.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-ref.expanded.rs b/crates/pin-project/tests/expand/naming/struct-ref.expanded.rs
index dea8383..c3a60e3 100644
--- a/crates/pin-project/tests/expand/naming/struct-ref.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/struct-ref.expanded.rs
@@ -5,18 +5,24 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 struct ProjRef<'pin, T, U>
 where
     Struct<T, U>: 'pin,
@@ -24,25 +30,30 @@
     pinned: ::pin_project::__private::Pin<&'pin (T)>,
     unpinned: &'pin (U),
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -84,7 +95,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -97,12 +108,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/struct-ref.rs

diff --git a/crates/pin-project/tests/expand/naming/struct-ref.rs b/crates/pin-project/tests/expand/naming/struct-ref.rs
index 4e29a16..db3b860 100644
--- a/crates/pin-project/tests/expand/naming/struct-ref.rs
+++ b/crates/pin-project/tests/expand/naming/struct-ref.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_ref = ProjRef)]

crates/pin-project/tests/expand/naming/tuple_struct-all.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-all.expanded.rs b/crates/pin-project/tests/expand/naming/tuple_struct-all.expanded.rs
index 441da9c..f55a455 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-all.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-all.expanded.rs
@@ -1,68 +1,92 @@
 use pin_project::pin_project;
 #[pin(__private(project = Proj, project_ref = ProjRef, project_replace = ProjOwn))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 struct Proj<'pin, T, U>(
     ::pin_project::__private::Pin<&'pin mut (T)>,
     &'pin mut (U),
 )
 where
     TupleStruct<T, U>: 'pin;
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 struct ProjRef<'pin, T, U>(
     ::pin_project::__private::Pin<&'pin (T)>,
     &'pin (U),
 )
 where
     TupleStruct<T, U>: 'pin;
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items
+)]
 struct ProjOwn<T, U>(::pin_project::__private::PhantomData<T>, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -119,7 +143,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -132,12 +156,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/tuple_struct-all.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-all.rs b/crates/pin-project/tests/expand/naming/tuple_struct-all.rs
index 0d95cb0..5731749 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-all.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-all.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj, project_ref = ProjRef, project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/tuple_struct-mut.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-mut.expanded.rs b/crates/pin-project/tests/expand/naming/tuple_struct-mut.expanded.rs
index 615019b..7d6ebef 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-mut.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-mut.expanded.rs
@@ -1,43 +1,54 @@
 use pin_project::pin_project;
 #[pin(__private(project = Proj))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 struct Proj<'pin, T, U>(
     ::pin_project::__private::Pin<&'pin mut (T)>,
     &'pin mut (U),
 )
 where
     TupleStruct<T, U>: 'pin;
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -75,7 +86,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -88,12 +99,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/tuple_struct-mut.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-mut.rs b/crates/pin-project/tests/expand/naming/tuple_struct-mut.rs
index e9779a6..b7e3413 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-mut.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-mut.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = Proj)]

crates/pin-project/tests/expand/naming/tuple_struct-none.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-none.expanded.rs b/crates/pin-project/tests/expand/naming/tuple_struct-none.expanded.rs
index 6b962d6..ef95f0b 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-none.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-none.expanded.rs
@@ -1,33 +1,37 @@
 use pin_project::pin_project;
 #[pin(__private())]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -68,7 +72,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -81,12 +85,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/tuple_struct-none.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-none.rs b/crates/pin-project/tests/expand/naming/tuple_struct-none.rs
index 398b14f..f0f8777 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-none.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-none.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/naming/tuple_struct-own.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-own.expanded.rs b/crates/pin-project/tests/expand/naming/tuple_struct-own.expanded.rs
index c85f05d..9c96435 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-own.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-own.expanded.rs
@@ -1,45 +1,55 @@
 use pin_project::pin_project;
 #[pin(__private(project_replace = ProjOwn))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items
+)]
 struct ProjOwn<T, U>(::pin_project::__private::PhantomData<T>, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -105,7 +115,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -118,12 +128,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/tuple_struct-own.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-own.rs b/crates/pin-project/tests/expand/naming/tuple_struct-own.rs
index a15ad40..45079a9 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-own.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-own.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace = ProjOwn)]

crates/pin-project/tests/expand/naming/tuple_struct-ref.expanded.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-ref.expanded.rs b/crates/pin-project/tests/expand/naming/tuple_struct-ref.expanded.rs
index 88c5550..fb73641 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-ref.expanded.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-ref.expanded.rs
@@ -1,43 +1,54 @@
 use pin_project::pin_project;
 #[pin(__private(project_ref = ProjRef))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 struct ProjRef<'pin, T, U>(
     ::pin_project::__private::Pin<&'pin (T)>,
     &'pin (U),
 )
 where
     TupleStruct<T, U>: 'pin;
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
@@ -75,7 +86,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -88,12 +99,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/naming/tuple_struct-ref.rs

diff --git a/crates/pin-project/tests/expand/naming/tuple_struct-ref.rs b/crates/pin-project/tests/expand/naming/tuple_struct-ref.rs
index cc61edf..21490f4 100644
--- a/crates/pin-project/tests/expand/naming/tuple_struct-ref.rs
+++ b/crates/pin-project/tests/expand/naming/tuple_struct-ref.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_ref = ProjRef)]

crates/pin-project/tests/expand/not_unpin/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/enum.expanded.rs b/crates/pin-project/tests/expand/not_unpin/enum.expanded.rs
index e60896c..7a5de87 100644
--- a/crates/pin-project/tests/expand/not_unpin/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/not_unpin/enum.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,18 +34,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -48,20 +60,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -117,17 +135,21 @@
     #[doc(hidden)]
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}

crates/pin-project/tests/expand/not_unpin/enum.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/enum.rs b/crates/pin-project/tests/expand/not_unpin/enum.rs
index ac0b3b8..77326bb 100644
--- a/crates/pin-project/tests/expand/not_unpin/enum.rs
+++ b/crates/pin-project/tests/expand/not_unpin/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(!Unpin, project = EnumProj, project_ref = EnumProjRef)]

crates/pin-project/tests/expand/not_unpin/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/struct.expanded.rs b/crates/pin-project/tests/expand/not_unpin/struct.expanded.rs
index 8d8bb1f..cd515cf 100644
--- a/crates/pin-project/tests/expand/not_unpin/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/not_unpin/struct.expanded.rs
@@ -5,25 +5,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -77,17 +81,21 @@
     #[doc(hidden)]
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}

crates/pin-project/tests/expand/not_unpin/struct.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/struct.rs b/crates/pin-project/tests/expand/not_unpin/struct.rs
index 233e6d4..dccd2cc 100644
--- a/crates/pin-project/tests/expand/not_unpin/struct.rs
+++ b/crates/pin-project/tests/expand/not_unpin/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(!Unpin)]

crates/pin-project/tests/expand/not_unpin/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/not_unpin/tuple_struct.expanded.rs
index 0b4b5d9..4f94f8e 100644
--- a/crates/pin-project/tests/expand/not_unpin/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/not_unpin/tuple_struct.expanded.rs
@@ -1,33 +1,37 @@
 use pin_project::pin_project;
 #[pin(__private(!Unpin))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -71,17 +75,21 @@
     #[doc(hidden)]
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        _pin_project::__private::Wrapper<
-            'pin,
-            _pin_project::__private::PhantomPinned,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<
+                'pin,
+                _pin_project::__private::PhantomPinned,
+            >,
         >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}

crates/pin-project/tests/expand/not_unpin/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/not_unpin/tuple_struct.rs b/crates/pin-project/tests/expand/not_unpin/tuple_struct.rs
index c8065db..b535141 100644
--- a/crates/pin-project/tests/expand/not_unpin/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/not_unpin/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(!Unpin)]

crates/pin-project/tests/expand/pinned_drop/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/enum.expanded.rs b/crates/pin-project/tests/expand/pinned_drop/enum.expanded.rs
index b1ed73c..2e7ba5f 100644
--- a/crates/pin-project/tests/expand/pinned_drop/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/enum.expanded.rs
@@ -6,18 +6,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -29,18 +35,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -49,20 +61,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -115,7 +133,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -129,14 +147,19 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     impl<T, U> _pin_project::__private::Drop for Enum<T, U> {
+        #[allow(clippy::missing_inline_in_public_items)]
         fn drop(&mut self) {
             unsafe {
                 let __pinned_self = _pin_project::__private::Pin::new_unchecked(self);
@@ -148,7 +171,7 @@
 #[doc(hidden)]
 impl<T, U> ::pin_project::__private::PinnedDrop for Enum<T, U> {
     unsafe fn drop(self: Pin<&mut Self>) {
-        #[allow(clippy::needless_pass_by_value)]
+        #[allow(clippy::needless_pass_by_value, clippy::single_call_fn)]
         fn __drop_inner<T, U>(__self: Pin<&mut Enum<T, U>>) {
             fn __drop_inner() {}
             let _ = __self;

crates/pin-project/tests/expand/pinned_drop/enum.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/enum.rs b/crates/pin-project/tests/expand/pinned_drop/enum.rs
index c162ef6..8241fa6 100644
--- a/crates/pin-project/tests/expand/pinned_drop/enum.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/expand/pinned_drop/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/struct.expanded.rs b/crates/pin-project/tests/expand/pinned_drop/struct.expanded.rs
index 27ee41b..0848666 100644
--- a/crates/pin-project/tests/expand/pinned_drop/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/struct.expanded.rs
@@ -6,25 +6,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -32,8 +37,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -75,7 +79,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -88,14 +92,19 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     impl<T, U> _pin_project::__private::Drop for Struct<T, U> {
+        #[allow(clippy::missing_inline_in_public_items)]
         fn drop(&mut self) {
             unsafe {
                 let __pinned_self = _pin_project::__private::Pin::new_unchecked(self);
@@ -107,7 +116,7 @@
 #[doc(hidden)]
 impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
     unsafe fn drop(self: Pin<&mut Self>) {
-        #[allow(clippy::needless_pass_by_value)]
+        #[allow(clippy::needless_pass_by_value, clippy::single_call_fn)]
         fn __drop_inner<T, U>(__self: Pin<&mut Struct<T, U>>) {
             fn __drop_inner() {}
             let _ = __self;

crates/pin-project/tests/expand/pinned_drop/struct.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/struct.rs b/crates/pin-project/tests/expand/pinned_drop/struct.rs
index 691d3cb..1e6bf57 100644
--- a/crates/pin-project/tests/expand/pinned_drop/struct.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/expand/pinned_drop/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/pinned_drop/tuple_struct.expanded.rs
index 83cd3b1..8a362ba 100644
--- a/crates/pin-project/tests/expand/pinned_drop/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/tuple_struct.expanded.rs
@@ -2,33 +2,37 @@
 use pin_project::{pin_project, pinned_drop};
 #[pin(__private(PinnedDrop))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -69,7 +73,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -82,14 +86,19 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     impl<T, U> _pin_project::__private::Drop for TupleStruct<T, U> {
+        #[allow(clippy::missing_inline_in_public_items)]
         fn drop(&mut self) {
             unsafe {
                 let __pinned_self = _pin_project::__private::Pin::new_unchecked(self);
@@ -101,7 +110,7 @@
 #[doc(hidden)]
 impl<T, U> ::pin_project::__private::PinnedDrop for TupleStruct<T, U> {
     unsafe fn drop(self: Pin<&mut Self>) {
-        #[allow(clippy::needless_pass_by_value)]
+        #[allow(clippy::needless_pass_by_value, clippy::single_call_fn)]
         fn __drop_inner<T, U>(__self: Pin<&mut TupleStruct<T, U>>) {
             fn __drop_inner() {}
             let _ = __self;

crates/pin-project/tests/expand/pinned_drop/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/pinned_drop/tuple_struct.rs b/crates/pin-project/tests/expand/pinned_drop/tuple_struct.rs
index 1f4917c..5b4d13b 100644
--- a/crates/pin-project/tests/expand/pinned_drop/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/pinned_drop/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/expand/project_replace/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/project_replace/enum.expanded.rs b/crates/pin-project/tests/expand/project_replace/enum.expanded.rs
index 230f6a9..4e9688b 100644
--- a/crates/pin-project/tests/expand/project_replace/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/project_replace/enum.expanded.rs
@@ -5,38 +5,50 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(variant_size_differences)]
-#[allow(clippy::large_enum_variant)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    variant_size_differences,
+    clippy::large_enum_variant,
+    clippy::missing_docs_in_private_items
+)]
 enum EnumProjOwn<T, U> {
     Struct { pinned: ::pin_project::__private::PhantomData<T>, unpinned: U },
     Tuple(::pin_project::__private::PhantomData<T>, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -87,7 +99,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -101,12 +113,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/project_replace/enum.rs

diff --git a/crates/pin-project/tests/expand/project_replace/enum.rs b/crates/pin-project/tests/expand/project_replace/enum.rs
index d737f64..c40f728 100644
--- a/crates/pin-project/tests/expand/project_replace/enum.rs
+++ b/crates/pin-project/tests/expand/project_replace/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace = EnumProjOwn)]

crates/pin-project/tests/expand/project_replace/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/project_replace/struct.expanded.rs b/crates/pin-project/tests/expand/project_replace/struct.expanded.rs
index 126640a..6e42035 100644
--- a/crates/pin-project/tests/expand/project_replace/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/project_replace/struct.expanded.rs
@@ -5,25 +5,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -40,7 +44,7 @@
         pinned: ::pin_project::__private::Pin<&'pin (T)>,
         unpinned: &'pin (U),
     }
-    #[allow(dead_code)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items)]
     struct __StructProjectionOwned<T, U> {
         pinned: ::pin_project::__private::PhantomData<T>,
         unpinned: U,
@@ -104,7 +108,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -117,12 +121,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/project_replace/struct.rs

diff --git a/crates/pin-project/tests/expand/project_replace/struct.rs b/crates/pin-project/tests/expand/project_replace/struct.rs
index 5865526..4ff984c 100644
--- a/crates/pin-project/tests/expand/project_replace/struct.rs
+++ b/crates/pin-project/tests/expand/project_replace/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace)]

crates/pin-project/tests/expand/project_replace/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/project_replace/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/project_replace/tuple_struct.expanded.rs
index fced02c..c5b9be5 100644
--- a/crates/pin-project/tests/expand/project_replace/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/project_replace/tuple_struct.expanded.rs
@@ -1,40 +1,44 @@
 use pin_project::pin_project;
 #[pin(__private(project_replace))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items)]
     struct __TupleStructProjectionOwned<T, U>(
         ::pin_project::__private::PhantomData<T>,
         U,
@@ -98,7 +102,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -111,12 +115,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/project_replace/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/project_replace/tuple_struct.rs b/crates/pin-project/tests/expand/project_replace/tuple_struct.rs
index c4d05f5..2437891 100644
--- a/crates/pin-project/tests/expand/project_replace/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/project_replace/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace)]

crates/pin-project/tests/expand/pub/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/pub/enum.expanded.rs b/crates/pin-project/tests/expand/pub/enum.expanded.rs
index 8c9eaec..58d3a42 100644
--- a/crates/pin-project/tests/expand/pub/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/pub/enum.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 pub(crate) enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,18 +34,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 pub(crate) enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -48,20 +60,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -114,7 +132,7 @@
             }
         }
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     pub struct __Enum<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -128,12 +146,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum<T, U>
     where
-        __Enum<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Enum<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/pub/enum.rs

diff --git a/crates/pin-project/tests/expand/pub/enum.rs b/crates/pin-project/tests/expand/pub/enum.rs
index 7c8577f..c12c4c0 100644
--- a/crates/pin-project/tests/expand/pub/enum.rs
+++ b/crates/pin-project/tests/expand/pub/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project = EnumProj, project_ref = EnumProjRef)]

crates/pin-project/tests/expand/pub/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/pub/struct.expanded.rs b/crates/pin-project/tests/expand/pub/struct.expanded.rs
index cfa93b6..b2216cc 100644
--- a/crates/pin-project/tests/expand/pub/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/pub/struct.expanded.rs
@@ -5,25 +5,30 @@
     pub pinned: T,
     pub unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     pub(crate) struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pub pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         pub unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     pub(crate) struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -74,7 +78,7 @@
         let _ = &this.pinned;
         let _ = &this.unpinned;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     pub struct __Struct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -87,12 +91,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct<T, U>
     where
-        __Struct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __Struct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/pub/struct.rs

diff --git a/crates/pin-project/tests/expand/pub/struct.rs b/crates/pin-project/tests/expand/pub/struct.rs
index f50d1e9..053debf 100644
--- a/crates/pin-project/tests/expand/pub/struct.rs
+++ b/crates/pin-project/tests/expand/pub/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/pub/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/pub/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/pub/tuple_struct.expanded.rs
index cf495a2..2f2633f 100644
--- a/crates/pin-project/tests/expand/pub/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/pub/tuple_struct.expanded.rs
@@ -1,33 +1,37 @@
 use pin_project::pin_project;
 #[pin(__private())]
 pub struct TupleStruct<T, U>(#[pin] pub T, pub U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     pub(crate) struct __TupleStructProjection<'pin, T, U>(
         pub ::pin_project::__private::Pin<&'pin mut (T)>,
         pub &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     pub(crate) struct __TupleStructProjectionRef<'pin, T, U>(
         pub ::pin_project::__private::Pin<&'pin (T)>,
         pub &'pin (U),
@@ -68,7 +72,7 @@
         let _ = &this.0;
         let _ = &this.1;
     }
-    #[allow(missing_debug_implementations)]
+    #[allow(missing_debug_implementations, unnameable_types)]
     pub struct __TupleStruct<'pin, T, U> {
         __pin_project_use_generics: _pin_project::__private::AlwaysUnpin<
             'pin,
@@ -81,12 +85,16 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     #[doc(hidden)]
     unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct<T, U>
     where
-        __TupleStruct<'pin, T, U>: _pin_project::__private::Unpin,
+        _pin_project::__private::PinnedFieldsOf<
+            __TupleStruct<'pin, T, U>,
+        >: _pin_project::__private::Unpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/pub/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/pub/tuple_struct.rs b/crates/pin-project/tests/expand/pub/tuple_struct.rs
index 5756aaf..3499720 100644
--- a/crates/pin-project/tests/expand/pub/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/pub/tuple_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/expand/unsafe_unpin/enum.expanded.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/enum.expanded.rs b/crates/pin-project/tests/expand/unsafe_unpin/enum.expanded.rs
index 2df2635..3917bc1 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/enum.expanded.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/enum.expanded.rs
@@ -5,18 +5,24 @@
     Tuple(#[pin] T, U),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::mut_mut)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::mut_mut
+)]
 enum EnumProj<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -28,18 +34,24 @@
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(dead_code)]
-#[allow(clippy::ref_option_ref)]
+#[allow(
+    dead_code,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::missing_docs_in_private_items,
+    clippy::ref_option_ref
+)]
 enum EnumProjRef<'pin, T, U>
 where
     Enum<T, U>: 'pin,
@@ -48,20 +60,26 @@
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
@@ -116,7 +134,9 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Enum<T, U>
     where
-        _pin_project::__private::Wrapper<'pin, Self>: _pin_project::UnsafeUnpin,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<'pin, Self>,
+        >: _pin_project::UnsafeUnpin,
     {}
     trait EnumMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/unsafe_unpin/enum.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/enum.rs b/crates/pin-project/tests/expand/unsafe_unpin/enum.rs
index d368d71..2e7b7b2 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/enum.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(UnsafeUnpin, project = EnumProj, project_ref = EnumProjRef)]

crates/pin-project/tests/expand/unsafe_unpin/struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/struct.expanded.rs b/crates/pin-project/tests/expand/unsafe_unpin/struct.expanded.rs
index 838d0d3..35ea5ec 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/struct.expanded.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/struct.expanded.rs
@@ -5,25 +5,30 @@
     pinned: T,
     unpinned: U,
 }
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __StructProjection<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -31,8 +36,7 @@
         pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
         unpinned: &'pin mut (U),
     }
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __StructProjectionRef<'pin, T, U>
     where
         Struct<T, U>: 'pin,
@@ -76,7 +80,9 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for Struct<T, U>
     where
-        _pin_project::__private::Wrapper<'pin, Self>: _pin_project::UnsafeUnpin,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<'pin, Self>,
+        >: _pin_project::UnsafeUnpin,
     {}
     trait StructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]

crates/pin-project/tests/expand/unsafe_unpin/struct.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/struct.rs b/crates/pin-project/tests/expand/unsafe_unpin/struct.rs
index b0851b1..4e73f78 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/struct.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(UnsafeUnpin)]

crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.expanded.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.expanded.rs b/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.expanded.rs
index af8ac00..889df85 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.expanded.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.expanded.rs
@@ -1,33 +1,37 @@
 use pin_project::{pin_project, UnsafeUnpin};
 #[pin(__private(UnsafeUnpin))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[allow(box_pointers)]
-#[allow(deprecated)]
-#[allow(explicit_outlives_requirements)]
-#[allow(single_use_lifetimes)]
-#[allow(unreachable_pub)]
-#[allow(unused_tuple_struct_fields)]
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::pattern_type_mismatch)]
-#[allow(clippy::redundant_pub_crate)]
-#[allow(clippy::type_repetition_in_bounds)]
-#[allow(unused_qualifications)]
-#[allow(clippy::semicolon_if_nothing_returned)]
-#[allow(clippy::use_self)]
-#[allow(clippy::used_underscore_binding)]
+#[allow(
+    unused_qualifications,
+    deprecated,
+    explicit_outlives_requirements,
+    single_use_lifetimes,
+    unreachable_pub,
+    unused_tuple_struct_fields,
+    clippy::unknown_clippy_lints,
+    clippy::absolute_paths,
+    clippy::min_ident_chars,
+    clippy::pattern_type_mismatch,
+    clippy::pub_with_shorthand,
+    clippy::redundant_pub_crate,
+    clippy::single_char_lifetime_names,
+    clippy::type_repetition_in_bounds,
+    clippy::needless_lifetimes,
+    clippy::semicolon_if_nothing_returned,
+    clippy::use_self,
+    clippy::used_underscore_binding
+)]
 const _: () = {
     #[allow(unused_extern_crates)]
     extern crate pin_project as _pin_project;
-    #[allow(dead_code)]
-    #[allow(clippy::mut_mut)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::mut_mut)]
     struct __TupleStructProjection<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin mut (T)>,
         &'pin mut (U),
     )
     where
         TupleStruct<T, U>: 'pin;
-    #[allow(dead_code)]
-    #[allow(clippy::ref_option_ref)]
+    #[allow(dead_code, clippy::missing_docs_in_private_items, clippy::ref_option_ref)]
     struct __TupleStructProjectionRef<'pin, T, U>(
         ::pin_project::__private::Pin<&'pin (T)>,
         &'pin (U),
@@ -70,7 +74,9 @@
     }
     impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct<T, U>
     where
-        _pin_project::__private::Wrapper<'pin, Self>: _pin_project::UnsafeUnpin,
+        _pin_project::__private::PinnedFieldsOf<
+            _pin_project::__private::Wrapper<'pin, Self>,
+        >: _pin_project::UnsafeUnpin,
     {}
     trait TupleStructMustNotImplDrop {}
     #[allow(clippy::drop_bounds, drop_bounds)]
@@ -81,5 +87,5 @@
         unsafe fn drop(self: _pin_project::__private::Pin<&mut Self>) {}
     }
 };
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
+unsafe impl<T: Unpin, U> UnsafeUnpin for TupleStruct<T, U> {}
 fn main() {}

crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.rs

diff --git a/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.rs b/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.rs
index 964617a..9113307 100644
--- a/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.rs
+++ b/crates/pin-project/tests/expand/unsafe_unpin/tuple_struct.rs
@@ -1,8 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(UnsafeUnpin)]
 struct TupleStruct<T, U>(#[pin] T, U);
 
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
+unsafe impl<T: Unpin, U> UnsafeUnpin for TupleStruct<T, U> {}
 
 fn main() {}

crates/pin-project/tests/expandtest.rs

diff --git a/crates/pin-project/tests/expandtest.rs b/crates/pin-project/tests/expandtest.rs
index 04a0666..832a0ea 100644
--- a/crates/pin-project/tests/expandtest.rs
+++ b/crates/pin-project/tests/expandtest.rs
@@ -1,44 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![cfg(not(miri))]
-#![cfg(not(careful))]
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use std::{
-    env,
-    process::{Command, ExitStatus, Stdio},
-};
-
-const PATH: &str = "tests/expand/**/*.rs";
 
 #[rustversion::attr(not(nightly), ignore)]
 #[test]
 fn expandtest() {
-    let is_ci = env::var_os("CI").is_some();
-    let cargo = &*env::var("CARGO").unwrap_or_else(|_| "cargo".into());
-    if !has_command(&[cargo, "expand"]) {
-        if is_ci {
-            panic!("expandtest requires cargo-expand");
-        }
-        return;
-    }
-
     let args = &["--all-features"];
-    if is_ci {
-        macrotest::expand_without_refresh_args(PATH, args);
-    } else {
-        env::set_var("MACROTEST", "overwrite");
-        macrotest::expand_args(PATH, args);
-    }
-}
-
-fn has_command(command: &[&str]) -> bool {
-    Command::new(command[0])
-        .args(&command[1..])
-        .arg("--version")
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .status()
-        .as_ref()
-        .map(ExitStatus::success)
-        .unwrap_or(false)
+    macrotest::expand_args("tests/expand/**/*.rs", args);
 }

crates/pin-project/tests/include/basic-safe-part.rs

diff --git a/crates/pin-project/tests/include/basic-safe-part.rs b/crates/pin-project/tests/include/basic-safe-part.rs
index 0b7c43e..7f216f6 100644
--- a/crates/pin-project/tests/include/basic-safe-part.rs
+++ b/crates/pin-project/tests/include/basic-safe-part.rs
@@ -1,125 +1,176 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // default #[pin_project], PinnedDrop, project_replace, !Unpin, and UnsafeUnpin without UnsafeUnpin impl are completely safe.
 
+/// Testing default struct.
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[::pin_project::pin_project]
 #[derive(Debug)]
 pub struct DefaultStruct<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing named struct.
 #[::pin_project::pin_project(
     project = DefaultStructNamedProj,
     project_ref = DefaultStructNamedProjRef,
 )]
 #[derive(Debug)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 pub struct DefaultStructNamed<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing default tuple struct.
 #[::pin_project::pin_project]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[derive(Debug)]
 pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
 
+/// Testing named tuple struct.
 #[::pin_project::pin_project(
     project = DefaultTupleStructNamedProj,
     project_ref = DefaultTupleStructNamedProjRef,
 )]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[derive(Debug)]
 pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
 
+/// Testing enum.
+#[allow(clippy::exhaustive_enums)] // for the type itself
 #[::pin_project::pin_project(
     project = DefaultEnumProj,
     project_ref = DefaultEnumProjRef,
 )]
 #[derive(Debug)]
 pub enum DefaultEnum<T, U> {
+    /// Struct variant.
     Struct {
+        /// Pinned field.
         #[pin]
         pinned: T,
+        /// Unpinned field.
         unpinned: U,
     },
+    /// Tuple variant.
     Tuple(#[pin] T, U),
+    /// Unit variant.
     Unit,
 }
 
+/// Testing pinned drop struct.
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[::pin_project::pin_project(PinnedDrop)]
 #[derive(Debug)]
 pub struct PinnedDropStruct<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
 #[::pin_project::pinned_drop]
 impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
+    #[allow(clippy::absolute_paths)]
     fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
 }
 
+/// Testing pinned drop tuple struct.
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[::pin_project::pin_project(PinnedDrop)]
 #[derive(Debug)]
 pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
 
 #[::pin_project::pinned_drop]
 impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
+    #[allow(clippy::absolute_paths)]
     fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
 }
 
+/// Testing pinned drop enum.
+#[allow(clippy::absolute_paths, clippy::exhaustive_enums)] // for the type itself
 #[::pin_project::pin_project(
     PinnedDrop,
     project = PinnedDropEnumProj,
     project_ref = PinnedDropEnumProjRef,
 )]
 #[derive(Debug)]
-pub enum PinnedDropEnum<T, U> {
+pub enum PinnedDropEnum<T: ::pin_project::__private::Unpin, U> {
+    /// Struct variant.
     Struct {
+        /// Pinned field.
         #[pin]
         pinned: T,
+        /// Unpinned field.
         unpinned: U,
     },
+    /// Tuple variant.
     Tuple(#[pin] T, U),
+    /// Unit variant.
     Unit,
 }
 
 #[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
+#[allow(clippy::absolute_paths)]
+impl<T: ::pin_project::__private::Unpin, U> PinnedDrop for PinnedDropEnum<T, U> {
     fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
 }
 
+/// Testing default struct with replace.
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[::pin_project::pin_project(project_replace)]
 #[derive(Debug)]
 pub struct ReplaceStruct<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing named struct with replace.
 #[::pin_project::pin_project(
     project = ReplaceStructNamedProj,
     project_ref = ReplaceStructNamedProjRef,
     project_replace = ReplaceStructNamedProjOwn,
 )]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[derive(Debug)]
 pub struct ReplaceStructNamed<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing default struct with replace.
 #[::pin_project::pin_project(project_replace)]
 #[derive(Debug)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
 
+/// Testing named struct with replace.
 #[::pin_project::pin_project(
     project = ReplaceTupleStructNamedProj,
     project_ref = ReplaceTupleStructNamedProjRef,
     project_replace = ReplaceTupleStructNamedProjOwn,
 )]
 #[derive(Debug)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
 
+/// Testing enum with replace.
+#[allow(clippy::exhaustive_enums)] // for the type itself
 #[::pin_project::pin_project(
     project = ReplaceEnumProj,
     project_ref = ReplaceEnumProjRef,
@@ -127,27 +178,40 @@
 )]
 #[derive(Debug)]
 pub enum ReplaceEnum<T, U> {
+    /// Struct variant.
     Struct {
+        /// Pinned field.
         #[pin]
         pinned: T,
+        /// Unpinned field.
         unpinned: U,
     },
+    /// Tuple variant.
     Tuple(#[pin] T, U),
+    /// Unit variant.
     Unit,
 }
 
+/// Testing struct with unsafe `Unpin`.
 #[::pin_project::pin_project(UnsafeUnpin)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[derive(Debug)]
 pub struct UnsafeUnpinStruct<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing tuple struct with unsafe `Unpin`.
 #[::pin_project::pin_project(UnsafeUnpin)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[derive(Debug)]
 pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
 
+/// Testing enum unsafe `Unpin`.
+#[allow(clippy::exhaustive_enums)] // for the type itself
 #[::pin_project::pin_project(
     UnsafeUnpin,
     project = UnsafeUnpinEnumProj,
@@ -155,27 +219,40 @@
 )]
 #[derive(Debug)]
 pub enum UnsafeUnpinEnum<T, U> {
+    /// Struct variant.
     Struct {
+        /// Pinned field.
         #[pin]
         pinned: T,
+        /// Unpinned field.
         unpinned: U,
     },
+    /// Tuple variant.
     Tuple(#[pin] T, U),
+    /// Unit variant.
     Unit,
 }
 
+/// Testing struct with `!Unpin`.
 #[::pin_project::pin_project(!Unpin)]
 #[derive(Debug)]
+#[allow(clippy::exhaustive_structs)] // for the type itself
 pub struct NotUnpinStruct<T, U> {
+    /// Pinned field.
     #[pin]
     pub pinned: T,
+    /// Unpinned field.
     pub unpinned: U,
 }
 
+/// Testing tuple struct with `!Unpin`.
+#[allow(clippy::exhaustive_structs)] // for the type itself
 #[::pin_project::pin_project(!Unpin)]
 #[derive(Debug)]
 pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
 
+/// Testing enum with `!Unpin`.
+#[allow(clippy::exhaustive_enums)] // for the type itself
 #[::pin_project::pin_project(
     !Unpin,
     project = NotUnpinEnumProj,
@@ -183,11 +260,16 @@
 )]
 #[derive(Debug)]
 pub enum NotUnpinEnum<T, U> {
+    /// Struct variant.
     Struct {
+        /// Pinned field.
         #[pin]
         pinned: T,
+        /// Unpinned field.
         unpinned: U,
     },
+    /// Tuple variant.
     Tuple(#[pin] T, U),
+    /// Unit variant.
     Unit,
 }

crates/pin-project/tests/include/basic.rs

diff --git a/crates/pin-project/tests/include/basic.rs b/crates/pin-project/tests/include/basic.rs
index 57cbaeb..a506cad 100644
--- a/crates/pin-project/tests/include/basic.rs
+++ b/crates/pin-project/tests/include/basic.rs
@@ -1,16 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 include!("basic-safe-part.rs");
 
-#[allow(clippy::undocumented_unsafe_blocks)]
+#[allow(unused_qualifications, clippy::absolute_paths, clippy::undocumented_unsafe_blocks)]
 unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
     ::pin_project::UnsafeUnpin for UnsafeUnpinStruct<T, U>
 {
 }
-#[allow(clippy::undocumented_unsafe_blocks)]
+#[allow(unused_qualifications, clippy::absolute_paths, clippy::undocumented_unsafe_blocks)]
 unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
     ::pin_project::UnsafeUnpin for UnsafeUnpinTupleStruct<T, U>
 {
 }
-#[allow(clippy::undocumented_unsafe_blocks)]
+#[allow(unused_qualifications, clippy::absolute_paths, clippy::undocumented_unsafe_blocks)]
 unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
     ::pin_project::UnsafeUnpin for UnsafeUnpinEnum<T, U>
 {

crates/pin-project/tests/lint.rs

diff --git a/crates/pin-project/tests/lint.rs b/crates/pin-project/tests/lint.rs
deleted file mode 100644
index d12cdd7..0000000
--- a/crates/pin-project/tests/lint.rs
+++ /dev/null
@@ -1,1203 +0,0 @@
-// Check interoperability with rustc and clippy lints.
-
-// for old compilers
-#![allow(unknown_lints)]
-#![warn(nonstandard_style, rust_2018_idioms, unused)]
-// Note: This does not guarantee compatibility with forbidding these lints in the future.
-// If rustc adds a new lint, we may not be able to keep this.
-#![forbid(future_incompatible, rust_2018_compatibility, rust_2021_compatibility)]
-// lints forbidden as a part of future_incompatible, rust_2018_compatibility, and rust_2021_compatibility are not included in the list below.
-// elided_lifetimes_in_paths, explicit_outlives_requirements, unused_extern_crates:  as a part of rust_2018_idioms
-// unsafe_op_in_unsafe_fn: requires Rust 1.52. and, we don't generate unsafe fn.
-// non_exhaustive_omitted_patterns, multiple_supertrait_upcastable: unstable
-// unstable_features: no way to generate #![feature(..)] by macros, expect for unstable inner attribute. and this lint is deprecated: https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html#unstable-features
-// unused_crate_dependencies, must_not_suspend: unrelated
-// unsafe_code: checked in forbid_unsafe module
-#![warn(
-    box_pointers,
-    deprecated_in_future,
-    fuzzy_provenance_casts,
-    invalid_reference_casting,
-    let_underscore_drop,
-    lossy_provenance_casts,
-    macro_use_extern_crate,
-    meta_variable_misuse,
-    missing_abi,
-    missing_copy_implementations,
-    missing_debug_implementations,
-    missing_docs,
-    non_ascii_idents,
-    noop_method_call,
-    private_bounds,
-    private_interfaces,
-    single_use_lifetimes,
-    trivial_casts,
-    trivial_numeric_casts,
-    // unnameable_types, // TODO
-    unreachable_pub,
-    unused_import_braces,
-    unused_lifetimes,
-    unused_qualifications,
-    unused_results,
-    unused_tuple_struct_fields,
-    variant_size_differences
-)]
-#![warn(clippy::all, clippy::pedantic, clippy::nursery, clippy::restriction)]
-#![allow(clippy::blanket_clippy_restriction_lints)] // this is a test, so enable all restriction lints intentionally.
-#![allow(
-    clippy::absolute_paths,
-    clippy::exhaustive_enums,
-    clippy::exhaustive_structs,
-    clippy::min_ident_chars,
-    clippy::pub_with_shorthand,
-    clippy::single_call_fn,
-    clippy::single_char_lifetime_names
-)] // TODO
-
-pub mod basic {
-    include!("include/basic.rs");
-
-    pub mod inside_macro {
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = DefaultStructNamedProj,
-                    project_ref = DefaultStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultTupleStructNamedProj,
-                    project_ref = DefaultTupleStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultEnumProj,
-                    project_ref = DefaultEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum DefaultEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(
-                    PinnedDrop,
-                    project = PinnedDropEnumProj,
-                    project_ref = PinnedDropEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum PinnedDropEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = ReplaceStructNamedProj,
-                    project_ref = ReplaceStructNamedProjRef,
-                    project_replace = ReplaceStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceTupleStructNamedProj,
-                    project_ref = ReplaceTupleStructNamedProjRef,
-                    project_replace = ReplaceTupleStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceEnumProj,
-                    project_ref = ReplaceEnumProjRef,
-                    project_replace = ReplaceEnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum ReplaceEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    UnsafeUnpin,
-                    project = UnsafeUnpinEnumProj,
-                    project_ref = UnsafeUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum UnsafeUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    !Unpin,
-                    project = NotUnpinEnumProj,
-                    project_ref = NotUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum NotUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[allow(clippy::undocumented_unsafe_blocks)]
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinStruct<T, U>
-                {
-                }
-                #[allow(clippy::undocumented_unsafe_blocks)]
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinTupleStruct<T, U>
-                {
-                }
-                #[allow(clippy::undocumented_unsafe_blocks)]
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinEnum<T, U>
-                {
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod forbid_unsafe {
-    #![forbid(unsafe_code)]
-
-    include!("include/basic-safe-part.rs");
-
-    pub mod inside_macro {
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = DefaultStructNamedProj,
-                    project_ref = DefaultStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultTupleStructNamedProj,
-                    project_ref = DefaultTupleStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultEnumProj,
-                    project_ref = DefaultEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum DefaultEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(
-                    PinnedDrop,
-                    project = PinnedDropEnumProj,
-                    project_ref = PinnedDropEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum PinnedDropEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = ReplaceStructNamedProj,
-                    project_ref = ReplaceStructNamedProjRef,
-                    project_replace = ReplaceStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceTupleStructNamedProj,
-                    project_ref = ReplaceTupleStructNamedProjRef,
-                    project_replace = ReplaceTupleStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceEnumProj,
-                    project_ref = ReplaceEnumProjRef,
-                    project_replace = ReplaceEnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum ReplaceEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    UnsafeUnpin,
-                    project = UnsafeUnpinEnumProj,
-                    project_ref = UnsafeUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum UnsafeUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    !Unpin,
-                    project = NotUnpinEnumProj,
-                    project_ref = NotUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum NotUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod box_pointers {
-    use pin_project::pin_project;
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct {
-        #[pin]
-        pub p: Box<isize>,
-        pub u: Box<isize>,
-    }
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct(#[pin] pub Box<isize>, pub Box<isize>);
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum {
-        Struct {
-            #[pin]
-            p: Box<isize>,
-            u: Box<isize>,
-        },
-        Tuple(#[pin] Box<isize>, Box<isize>),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct {
-                    #[pin]
-                    pub p: Box<isize>,
-                    pub u: Box<isize>,
-                }
-
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct(#[pin] pub Box<isize>, pub Box<isize>);
-
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum {
-                    Struct {
-                        #[pin]
-                        p: Box<isize>,
-                        u: Box<isize>,
-                    },
-                    Tuple(#[pin] Box<isize>, Box<isize>),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod deprecated {
-    use pin_project::pin_project;
-
-    #[allow(deprecated)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug, Clone, Copy)]
-    #[deprecated]
-    pub struct Struct {
-        #[deprecated]
-        #[pin]
-        pub p: (),
-        #[deprecated]
-        pub u: (),
-    }
-
-    #[allow(deprecated)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug, Clone, Copy)]
-    #[deprecated]
-    pub struct TupleStruct(
-        #[deprecated]
-        #[pin]
-        pub (),
-        #[deprecated] pub (),
-    );
-
-    #[allow(deprecated)] // for the type itself
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug, Clone, Copy)]
-    #[deprecated]
-    pub enum Enum {
-        #[deprecated]
-        Struct {
-            #[deprecated]
-            #[pin]
-            p: (),
-            #[deprecated]
-            u: (),
-        },
-        #[deprecated]
-        Tuple(
-            #[deprecated]
-            #[pin]
-            (),
-            #[deprecated] (),
-        ),
-        #[deprecated]
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(deprecated)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug, Clone, Copy)]
-                #[deprecated]
-                pub struct Struct {
-                    #[deprecated]
-                    #[pin]
-                    pub p: (),
-                    #[deprecated]
-                    pub u: (),
-                }
-
-                #[allow(deprecated)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug, Clone, Copy)]
-                #[deprecated]
-                pub struct TupleStruct(
-                    #[deprecated]
-                    #[pin]
-                    pub (),
-                    #[deprecated] pub (),
-                );
-
-                #[allow(deprecated)] // for the type itself
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug, Clone, Copy)]
-                #[deprecated]
-                pub enum Enum {
-                    #[deprecated]
-                    Struct {
-                        #[deprecated]
-                        #[pin]
-                        p: (),
-                        #[deprecated]
-                        u: (),
-                    },
-                    #[deprecated]
-                    Tuple(
-                        #[deprecated]
-                        #[pin]
-                        (),
-                        #[deprecated] (),
-                    ),
-                    #[deprecated]
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod explicit_outlives_requirements {
-    use pin_project::pin_project;
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<'a, T, U>
-    where
-        T: ?Sized,
-        U: ?Sized,
-    {
-        #[pin]
-        pub pinned: &'a mut T,
-        pub unpinned: &'a mut U,
-    }
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<'a, T, U>(#[pin] pub &'a mut T, pub &'a mut U)
-    where
-        T: ?Sized,
-        U: ?Sized;
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<'a, T, U>
-    where
-        T: ?Sized,
-        U: ?Sized,
-    {
-        Struct {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: &'a mut U,
-        },
-        Tuple(#[pin] &'a mut T, &'a mut U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<'a, T, U>
-                where
-                    T: ?Sized,
-                    U: ?Sized,
-                {
-                    #[pin]
-                    pub pinned: &'a mut T,
-                    pub unpinned: &'a mut U,
-                }
-
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<'a, T, U>(#[pin] pub &'a mut T, pub &'a mut U)
-                where
-                    T: ?Sized,
-                    U: ?Sized;
-
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<'a, T, U>
-                where
-                    T: ?Sized,
-                    U: ?Sized,
-                {
-                    Struct {
-                        #[pin]
-                        pinned: &'a mut T,
-                        unpinned: &'a mut U,
-                    },
-                    Tuple(#[pin] &'a mut T, &'a mut U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-pub mod single_use_lifetimes {
-    use pin_project::pin_project;
-
-    #[allow(unused_lifetimes)]
-    pub trait Trait<'a> {}
-
-    #[allow(unused_lifetimes)] // for the type itself
-    #[allow(single_use_lifetimes)] // for the type itself: https://github.com/rust-lang/rust/issues/55058
-    #[pin_project(project_replace)]
-    pub struct Hrtb<'pin___, T>
-    where
-        for<'pin> &'pin T: Unpin,
-        T: for<'pin> Trait<'pin>,
-        for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-    {
-        #[pin]
-        _f: &'pin___ mut T,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(unused_lifetimes)]
-                pub trait Trait<'a> {}
-
-                #[allow(unused_lifetimes)] // for the type itself
-                #[allow(single_use_lifetimes)] // for the type itself: https://github.com/rust-lang/rust/issues/55058
-                #[pin_project(project_replace)]
-                pub struct Hrtb<'pin___, T>
-                where
-                    for<'pin> &'pin T: Unpin,
-                    T: for<'pin> Trait<'pin>,
-                    for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-                {
-                    #[pin]
-                    _f: &'pin___ mut T,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod variant_size_differences {
-    use pin_project::pin_project;
-
-    #[allow(missing_debug_implementations, missing_copy_implementations)] // https://github.com/rust-lang/rust/pull/74060
-    #[allow(variant_size_differences)] // for the type itself
-    #[allow(clippy::large_enum_variant)] // for the type itself
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    pub enum Enum {
-        V1(u8),
-        V2([u8; 1024]),
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(missing_debug_implementations, missing_copy_implementations)] // https://github.com/rust-lang/rust/pull/74060
-                #[allow(variant_size_differences)] // for the type itself
-                #[allow(clippy::large_enum_variant)] // for the type itself
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                pub enum Enum {
-                    V1(u8),
-                    V2([u8; 1024]),
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod clippy_mut_mut {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<'a, T, U> {
-        #[pin]
-        pub pinned: &'a mut T,
-        pub unpinned: &'a mut U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<'a, T, U>(#[pin] &'a mut T, &'a mut U);
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<'a, T, U> {
-        Struct {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: &'a mut U,
-        },
-        Tuple(#[pin] &'a mut T, &'a mut U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<'a, T, U> {
-                    #[pin]
-                    pub pinned: &'a mut T,
-                    pub unpinned: &'a mut U,
-                }
-
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<'a, T, U>(#[pin] &'a mut T, &'a mut U);
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<'a, T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: &'a mut T,
-                        unpinned: &'a mut U,
-                    },
-                    Tuple(#[pin] &'a mut T, &'a mut U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-#[allow(unreachable_pub)]
-mod clippy_redundant_pub_crate {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    pub struct Struct<T, U> {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct TupleStruct<T, U>(#[pin] pub T, pub U);
-
-    #[allow(dead_code)]
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    pub enum Enum<T, U> {
-        Struct {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-        Tuple(#[pin] T, U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[allow(clippy::redundant_pub_crate)]
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                pub struct Struct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[pin_project(project_replace)]
-                pub struct TupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[allow(dead_code)]
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                pub enum Enum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-pub mod clippy_type_repetition_in_bounds {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    pub struct Struct<T, U>
-    where
-        Self: Sized,
-    {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct TupleStruct<T, U>(#[pin] T, U)
-    where
-        Self: Sized;
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    pub enum Enum<T, U>
-    where
-        Self: Sized,
-    {
-        Struct {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-        Tuple(#[pin] T, U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                pub struct Struct<T, U>
-                where
-                    Self: Sized,
-                {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[pin_project(project_replace)]
-                pub struct TupleStruct<T, U>(#[pin] T, U)
-                where
-                    Self: Sized;
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                pub enum Enum<T, U>
-                where
-                    Self: Sized,
-                {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-pub mod clippy_use_self {
-    use pin_project::pin_project;
-
-    pub trait Trait {
-        type Assoc;
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Generics<T: Trait<Assoc = Self>>
-    where
-        Self: Trait<Assoc = Self>,
-    {
-        _f: T,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        use super::Trait;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                pub struct Generics<T: Trait<Assoc = Self>>
-                where
-                    Self: Trait<Assoc = Self>,
-                {
-                    _f: T,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-pub mod clippy_used_underscore_binding {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    pub struct Struct<T, U> {
-        #[pin]
-        pub _pinned: T,
-        pub _unpinned: U,
-    }
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    pub enum Enum<T, U> {
-        Struct {
-            #[pin]
-            _pinned: T,
-            _unpinned: U,
-        },
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                pub struct Struct<T, U> {
-                    #[pin]
-                    pub _pinned: T,
-                    pub _unpinned: U,
-                }
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                pub enum Enum<T, U> {
-                    Struct {
-                        #[pin]
-                        _pinned: T,
-                        _unpinned: U,
-                    },
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(missing_debug_implementations)]
-pub mod clippy_ref_option_ref {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    pub struct Struct<'a> {
-        #[pin]
-        pub _pinned: Option<&'a ()>,
-        pub _unpinned: Option<&'a ()>,
-    }
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef)]
-    pub enum Enum<'a> {
-        Struct {
-            #[pin]
-            _pinned: Option<&'a ()>,
-            _unpinned: Option<&'a ()>,
-        },
-    }
-}

crates/pin-project/tests/pin_project.rs

diff --git a/crates/pin-project/tests/pin_project.rs b/crates/pin-project/tests/pin_project.rs
index cbc67ce..52a910f 100644
--- a/crates/pin-project/tests/pin_project.rs
+++ b/crates/pin-project/tests/pin_project.rs
@@ -1,5 +1,12 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+#![allow(
+    dead_code,
+    unreachable_pub,
+    clippy::items_after_statements,
+    clippy::no_effect_underscore_binding,
+    clippy::undocumented_unsafe_blocks
+)]
 
 #[macro_use]
 mod auxiliary;
@@ -335,7 +342,6 @@
 
     pub trait Trait<'a> {}
 
-    #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
     #[pin_project(project_replace)]
     pub struct Hrtb<'pin___, T>
     where
@@ -543,7 +549,7 @@
     }
 
     let mut x = Struct1 { f: 0_u8 };
-    let x: Pin<&mut Struct1<dyn core::fmt::Debug>> = Pin::new(&mut x as _);
+    let x: Pin<&mut Struct1<dyn core::fmt::Debug>> = Pin::new(&mut x);
     let _: &mut (dyn core::fmt::Debug) = x.project().f;
 
     #[pin_project]
@@ -553,7 +559,7 @@
     }
 
     let mut x = Struct2 { f: 0_u8 };
-    let x: Pin<&mut Struct2<dyn core::fmt::Debug + Unpin>> = Pin::new(&mut x as _);
+    let x: Pin<&mut Struct2<dyn core::fmt::Debug + Unpin>> = Pin::new(&mut x);
     let _: Pin<&mut (dyn core::fmt::Debug + Unpin)> = x.project().f;
 
     #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
@@ -711,7 +717,8 @@
     struct TupleStruct4(#[pin] dyn core::fmt::Debug + Send);
 }
 
-#[allow(clippy::trailing_empty_array)] // TODO: how do we handle this? Should propagate #[repr(...)] to ProjectionOwned?
+// TODO: how do we handle this? Should propagate #[repr(...)] to ProjectionOwned? The layout will be different from the original anyway due to PhantomData.
+#[allow(clippy::trailing_empty_array)]
 #[test]
 fn parse_self() {
     macro_rules! mac {

crates/pin-project/tests/pinned_drop.rs

diff --git a/crates/pin-project/tests/pinned_drop.rs b/crates/pin-project/tests/pinned_drop.rs
index c907cc2..9765db9 100644
--- a/crates/pin-project/tests/pinned_drop.rs
+++ b/crates/pin-project/tests/pinned_drop.rs
@@ -1,4 +1,4 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::pin::Pin;
 
@@ -7,7 +7,7 @@
 #[test]
 fn safe_project() {
     #[pin_project(PinnedDrop)]
-    pub struct Struct<'a> {
+    struct Struct<'a> {
         was_dropped: &'a mut bool,
         #[pin]
         field: u8,
@@ -28,7 +28,7 @@
 #[test]
 fn self_call() {
     #[pin_project(PinnedDrop)]
-    pub struct S<T>(T);
+    struct S<T>(T);
 
     trait Trait {
         fn self_ref(&self) {}
@@ -56,8 +56,8 @@
 #[test]
 fn self_ty() {
     #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        pub f: (),
+    struct Struct {
+        f: (),
     }
 
     #[pinned_drop]
@@ -78,7 +78,7 @@
     }
 
     #[pin_project(PinnedDrop)]
-    pub struct TupleStruct(());
+    struct TupleStruct(());
 
     #[pinned_drop]
     impl PinnedDrop for TupleStruct {
@@ -89,15 +89,15 @@
 
             // pat
             match *self {
-                Self(_) => {}
+                Self(()) => {}
             }
-            if let Self(_) = *self {}
-            let Self(_) = *self;
+            if let Self(()) = *self {}
+            let Self(()) = *self;
         }
     }
 
     #[pin_project(PinnedDrop, project = EnumProj, project_ref = EnumProjRef)]
-    pub enum Enum {
+    enum Enum {
         Struct { f: () },
         Tuple(()),
         Unit,
@@ -113,12 +113,10 @@
 
             // pat
             match *self {
-                Self::Struct { f: () } => {}
-                Self::Tuple(_) => {}
-                Self::Unit => {}
+                Self::Struct { f: () } | Self::Tuple(()) | Self::Unit => {}
             }
             if let Self::Struct { f: () } = *self {}
-            if let Self::Tuple(_) = *self {}
+            if let Self::Tuple(()) = *self {}
             if let Self::Unit = *self {}
         }
     }
@@ -133,14 +131,16 @@
     }
 
     #[pin_project(PinnedDrop)]
-    pub struct S(());
+    struct S(());
 
     #[pinned_drop]
     impl PinnedDrop for S {
         fn drop(self: Pin<&mut Self>) {
             mac!({
+                #[allow(dead_code)]
+                struct S(());
                 impl S {
-                    pub fn _f(self) -> Self {
+                    fn _f(self) -> Self {
                         self
                     }
                 }
@@ -153,7 +153,7 @@
 #[test]
 fn self_inside_macro_def() {
     #[pin_project(PinnedDrop)]
-    pub struct S(());
+    struct S(());
 
     #[pinned_drop]
     impl PinnedDrop for S {
@@ -193,7 +193,7 @@
     }
 
     #[pin_project(PinnedDrop)]
-    pub struct Struct<T: Send>
+    struct Struct<T: Send>
     where
         mac!(Self): Send,
     {
@@ -262,11 +262,11 @@
     mac!(1);
 }
 
-pub mod self_path {
+mod self_path {
     use super::*;
 
     #[pin_project(PinnedDrop)]
-    pub struct S<T: Unpin>(T);
+    struct S<T: Unpin>(T);
 
     fn f() {}
 

crates/pin-project/tests/proper_unpin.rs

diff --git a/crates/pin-project/tests/proper_unpin.rs b/crates/pin-project/tests/proper_unpin.rs
index 0ba3ce3..7e487a3 100644
--- a/crates/pin-project/tests/proper_unpin.rs
+++ b/crates/pin-project/tests/proper_unpin.rs
@@ -1,4 +1,5 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![allow(dead_code)]
 
 #[macro_use]

crates/pin-project/tests/repr_packed.rs

diff --git a/crates/pin-project/tests/repr_packed.rs b/crates/pin-project/tests/repr_packed.rs
index be7cab9..f20ffc9 100644
--- a/crates/pin-project/tests/repr_packed.rs
+++ b/crates/pin-project/tests/repr_packed.rs
@@ -1,4 +1,5 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // unaligned_references did not exist in older compilers and safe_packed_borrows was removed in the latest compilers.
 // https://github.com/rust-lang/rust/pull/82525
 #![allow(unknown_lints, renamed_and_removed_lints)]
@@ -37,7 +38,6 @@
         }
     }
 
-    #[allow(clippy::let_and_return)]
     let field_addr = {
         // We let this field drop by going out of scope,
         // rather than explicitly calling drop(foo).
@@ -45,8 +45,7 @@
         // into the 'drop' function, resulting in a different
         // address.
         let x = Struct { field: 27 };
-        let field_addr = &x.field as *const u8 as usize;
-        field_addr
+        &x.field as *const u8 as usize
     };
     assert_eq!(field_addr, FIELD_ADDR.with(Cell::get));
 }

crates/pin-project/tests/run-pass/private_in_public-enum.rs

diff --git a/crates/pin-project/tests/run-pass/private_in_public-enum.rs b/crates/pin-project/tests/run-pass/private_in_public-enum.rs
new file mode 100644
index 0000000..09c0975
--- /dev/null
+++ b/crates/pin-project/tests/run-pass/private_in_public-enum.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// Even if allows private_in_public, these are errors.
+
+#![allow(private_interfaces, dead_code)]
+
+pub enum PublicEnum {
+    V(PrivateEnum), //~ ERROR E0446
+}
+
+enum PrivateEnum {
+    V(u8),
+}
+
+mod foo {
+    pub(crate) enum CrateEnum {
+        V(PrivateEnum), //~ ERROR E0446
+    }
+
+    enum PrivateEnum {
+        V(u8),
+    }
+}
+
+fn main() {}

crates/pin-project/tests/ui/cfg/cfg_attr-resolve.rs

diff --git a/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.rs b/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.rs
index e36cc95..4739267 100644
--- a/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.rs
+++ b/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 #[cfg_attr(any(), pin_project::pin_project)]

crates/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr

diff --git a/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr b/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr
index 0393c14..71f9c29 100644
--- a/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr
+++ b/crates/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no method named `project` found for struct `Pin<&mut Foo<u8>>` in the current scope
-  --> tests/ui/cfg/cfg_attr-resolve.rs:10:30
+  --> tests/ui/cfg/cfg_attr-resolve.rs:12:30
    |
-10 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0599
+12 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0599
    |                              ^^^^^^^ method not found in `Pin<&mut Foo<u8>>`

crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs

diff --git a/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs b/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs
index 1b9664b..8c9037b 100644
--- a/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs
+++ b/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::pin_project;

crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr

diff --git a/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr b/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr
index 081504c..bb0e9e3 100644
--- a/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr
+++ b/crates/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
-  --> tests/ui/cfg/cfg_attr-type-mismatch.rs:20:27
+  --> tests/ui/cfg/cfg_attr-type-mismatch.rs:22:27
    |
-20 |     let _: Pin<&mut u8> = x.f; //~ ERROR E0308
+22 |     let _: Pin<&mut u8> = x.f; //~ ERROR E0308
    |            ------------   ^^^ expected `Pin<&mut u8>`, found `&mut u8`
    |            |
    |            expected due to this
@@ -10,9 +10,9 @@
            found mutable reference `&mut u8`
 
 error[E0308]: mismatched types
-  --> tests/ui/cfg/cfg_attr-type-mismatch.rs:24:22
+  --> tests/ui/cfg/cfg_attr-type-mismatch.rs:26:22
    |
-24 |     let _: &mut u8 = x.f; //~ ERROR E0308
+26 |     let _: &mut u8 = x.f; //~ ERROR E0308
    |            -------   ^^^ expected `&mut u8`, found `Pin<&mut u8>`
    |            |
    |            expected due to this
@@ -21,5 +21,5 @@
                          found struct `Pin<&mut u8>`
 help: consider mutably borrowing here
    |
-24 |     let _: &mut u8 = &mut x.f; //~ ERROR E0308
+26 |     let _: &mut u8 = &mut x.f; //~ ERROR E0308
    |                      ++++

crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs
index 7e19952..39d358c 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::hidden_repr;
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr
index 4f3acc3..a2c7811 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr
@@ -1,5 +1,5 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> tests/ui/cfg/packed_sneaky-span-issue-1.rs:5:15
+ --> tests/ui/cfg/packed_sneaky-span-issue-1.rs:7:15
   |
-5 | #[hidden_repr(packed)] //~ ERROR may not be used on #[repr(packed)] types
+7 | #[hidden_repr(packed)] //~ ERROR may not be used on #[repr(packed)] types
   |               ^^^^^^

crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs
index fcea76b..2051052 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::hidden_repr;
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr
index cc2795a..43f5c30 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr
@@ -1,5 +1,5 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> tests/ui/cfg/packed_sneaky-span-issue-2.rs:5:15
+ --> tests/ui/cfg/packed_sneaky-span-issue-2.rs:7:15
   |
-5 | #[hidden_repr(packed)] //~ ERROR may not be used on #[repr(packed)] types
+7 | #[hidden_repr(packed)] //~ ERROR may not be used on #[repr(packed)] types
   |               ^^^^^^

crates/pin-project/tests/ui/cfg/packed_sneaky.rs

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky.rs b/crates/pin-project/tests/ui/cfg/packed_sneaky.rs
index 0b01dc9..c03c3bc 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky.rs
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::hidden_repr_cfg_not_any;
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/cfg/packed_sneaky.stderr

diff --git a/crates/pin-project/tests/ui/cfg/packed_sneaky.stderr b/crates/pin-project/tests/ui/cfg/packed_sneaky.stderr
index a54c2ec..33b8766 100644
--- a/crates/pin-project/tests/ui/cfg/packed_sneaky.stderr
+++ b/crates/pin-project/tests/ui/cfg/packed_sneaky.stderr
@@ -1,5 +1,5 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> tests/ui/cfg/packed_sneaky.rs:6:27
+ --> tests/ui/cfg/packed_sneaky.rs:8:27
   |
-6 | #[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
+8 | #[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
   |                           ^^^^^^

crates/pin-project/tests/ui/cfg/unsupported.rs

diff --git a/crates/pin-project/tests/ui/cfg/unsupported.rs b/crates/pin-project/tests/ui/cfg/unsupported.rs
index b950d4b..0417db1 100644
--- a/crates/pin-project/tests/ui/cfg/unsupported.rs
+++ b/crates/pin-project/tests/ui/cfg/unsupported.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/ui/cfg/unsupported.stderr

diff --git a/crates/pin-project/tests/ui/cfg/unsupported.stderr b/crates/pin-project/tests/ui/cfg/unsupported.stderr
index e1c871c..c28cba0 100644
--- a/crates/pin-project/tests/ui/cfg/unsupported.stderr
+++ b/crates/pin-project/tests/ui/cfg/unsupported.stderr
@@ -1,11 +1,11 @@
 error: #[pin_project] attribute may not be used on structs with zero fields
- --> tests/ui/cfg/unsupported.rs:4:10
-  |
-4 |   struct S {
-  |  __________^
-5 | |     //~^ ERROR may not be used on structs with zero fields
-6 | |     #[cfg(any())]
-7 | |     #[pin]
-8 | |     f: u8,
-9 | | }
-  | |_^
+  --> tests/ui/cfg/unsupported.rs:6:10
+   |
+6  |   struct S {
+   |  __________^
+7  | |     //~^ ERROR may not be used on structs with zero fields
+8  | |     #[cfg(any())]
+9  | |     #[pin]
+10 | |     f: u8,
+11 | | }
+   | |_^

crates/pin-project/tests/ui/not_unpin/conflict-unpin.rs

diff --git a/crates/pin-project/tests/ui/not_unpin/conflict-unpin.rs b/crates/pin-project/tests/ui/not_unpin/conflict-unpin.rs
index 8985f37..c3f1b3d 100644
--- a/crates/pin-project/tests/ui/not_unpin/conflict-unpin.rs
+++ b/crates/pin-project/tests/ui/not_unpin/conflict-unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(!Unpin)] //~ ERROR E0119

crates/pin-project/tests/ui/not_unpin/conflict-unpin.stderr

diff --git a/crates/pin-project/tests/ui/not_unpin/conflict-unpin.stderr b/crates/pin-project/tests/ui/not_unpin/conflict-unpin.stderr
index 4bd72bb..dbd785a 100644
--- a/crates/pin-project/tests/ui/not_unpin/conflict-unpin.stderr
+++ b/crates/pin-project/tests/ui/not_unpin/conflict-unpin.stderr
@@ -1,26 +1,26 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<_, _>`
-  --> tests/ui/not_unpin/conflict-unpin.rs:3:15
+  --> tests/ui/not_unpin/conflict-unpin.rs:5:15
    |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
+5  | #[pin_project(!Unpin)] //~ ERROR E0119
    |               ^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | ------------------------------ first implementation here
+12 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
+   | --------------------------------------------- first implementation here
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Bar<_, _>`
-  --> tests/ui/not_unpin/conflict-unpin.rs:12:15
+  --> tests/ui/not_unpin/conflict-unpin.rs:14:15
    |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
+14 | #[pin_project(!Unpin)] //~ ERROR E0119
    |               ^^^^^^ conflicting implementation for `Bar<_, _>`
 ...
-19 | impl<T, U> Unpin for Bar<T, U> {}
+21 | impl<T, U> Unpin for Bar<T, U> {}
    | ------------------------------ first implementation here
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Baz<_, _>`
-  --> tests/ui/not_unpin/conflict-unpin.rs:21:15
+  --> tests/ui/not_unpin/conflict-unpin.rs:23:15
    |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
+23 | #[pin_project(!Unpin)] //~ ERROR E0119
    |               ^^^^^^ conflicting implementation for `Baz<_, _>`
 ...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
+30 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
    | -------------------------------------------- first implementation here

crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs

diff --git a/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs b/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs
index 2c078c7..69ba51f 100644
--- a/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs
+++ b/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(!Unpin)] //~ ERROR E0119

crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr

diff --git a/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr b/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr
index f116eac..f00aa5c 100644
--- a/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr
+++ b/crates/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr
@@ -1,32 +1,32 @@
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Foo<_, _>`
-  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:3:1
+  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:5:1
    |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
+5  | #[pin_project(!Unpin)] //~ ERROR E0119
    | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ------------------------------------------- first implementation here
+12 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
+   | ---------------------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Bar<_, _>`
-  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:12:1
+  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:14:1
    |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
+14 | #[pin_project(!Unpin)] //~ ERROR E0119
    | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
 ...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
+21 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
    | ------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Baz<_, _>`
-  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:21:1
+  --> tests/ui/not_unpin/impl-unsafe-unpin.rs:23:1
    |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
+23 | #[pin_project(!Unpin)] //~ ERROR E0119
    | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
 ...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
+30 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
    | --------------------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/not_unpin/negative_impls_stable.rs

diff --git a/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.rs b/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.rs
new file mode 100644
index 0000000..1a5b425
--- /dev/null
+++ b/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// https://github.com/taiki-e/pin-project/issues/340#issuecomment-2428002670
+
+#[pin_project::pin_project(!Unpin)]
+struct Foo<Pinned, Unpinned> {
+    #[pin]
+    pinned: Pinned,
+    unpinned: Unpinned,
+}
+
+struct MyPhantomPinned(::core::marker::PhantomPinned);
+impl Unpin for MyPhantomPinned where for<'cursed> str: Sized {}
+impl Unpin for Foo<MyPhantomPinned, ()> {}
+
+fn is_unpin<T: Unpin>() {}
+
+fn main() {
+    is_unpin::<Foo<MyPhantomPinned, ()>>()
+}

crates/pin-project/tests/ui/not_unpin/negative_impls_stable.stderr

diff --git a/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.stderr b/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.stderr
new file mode 100644
index 0000000..79e75fe
--- /dev/null
+++ b/crates/pin-project/tests/ui/not_unpin/negative_impls_stable.stderr
@@ -0,0 +1,8 @@
+error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhantomPinned, ()>`
+  --> tests/ui/not_unpin/negative_impls_stable.rs:5:28
+   |
+5  | #[pin_project::pin_project(!Unpin)]
+   |                            ^^^^^^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
+...
+14 | impl Unpin for Foo<MyPhantomPinned, ()> {}
+   | --------------------------------------- first implementation here

crates/pin-project/tests/ui/pin_project/add-attr-to-struct.rs

diff --git a/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.rs b/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.rs
index 32253d7..0983f6f 100644
--- a/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.rs
+++ b/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::marker::PhantomPinned;
 
 use auxiliary_macro::add_pin_attr;

crates/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr b/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr
index bb76c62..bd46825 100644
--- a/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr
+++ b/crates/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr
@@ -1,15 +1,15 @@
 error: expected attribute arguments in parentheses: `pin(...)`
- --> tests/ui/pin_project/add-attr-to-struct.rs:7:1
+ --> tests/ui/pin_project/add-attr-to-struct.rs:9:1
   |
-7 | #[add_pin_attr(struct)] //~ ERROR expected attribute arguments in parentheses
+9 | #[add_pin_attr(struct)] //~ ERROR expected attribute arguments in parentheses
   | ^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: this error originates in the attribute macro `add_pin_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: #[pin] attribute may only be used on fields of structs or variants
-  --> tests/ui/pin_project/add-attr-to-struct.rs:13:1
+  --> tests/ui/pin_project/add-attr-to-struct.rs:15:1
    |
-13 | #[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
+15 | #[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `add_pin_attr` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/add-pinned-field.rs

diff --git a/crates/pin-project/tests/ui/pin_project/add-pinned-field.rs b/crates/pin-project/tests/ui/pin_project/add-pinned-field.rs
index c415f9c..c047c11 100644
--- a/crates/pin-project/tests/ui/pin_project/add-pinned-field.rs
+++ b/crates/pin-project/tests/ui/pin_project/add-pinned-field.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::add_pinned_field;
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/pin_project/add-pinned-field.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/add-pinned-field.stderr b/crates/pin-project/tests/ui/pin_project/add-pinned-field.stderr
index a38329d..50e1f5c 100644
--- a/crates/pin-project/tests/ui/pin_project/add-pinned-field.stderr
+++ b/crates/pin-project/tests/ui/pin_project/add-pinned-field.stderr
@@ -1,54 +1,54 @@
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/add-pinned-field.rs:21:16
+  --> tests/ui/pin_project/add-pinned-field.rs:23:16
    |
-21 |     is_unpin::<Foo>(); //~ ERROR E0277
+23 |     is_unpin::<Foo>(); //~ ERROR E0277
    |                ^^^ within `__Foo<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `__Foo<'_>`
-  --> tests/ui/pin_project/add-pinned-field.rs:8:8
+  --> tests/ui/pin_project/add-pinned-field.rs:10:8
    |
-8  | struct Foo {
+10 | struct Foo {
    |        ^^^
 note: required for `Foo` to implement `Unpin`
-  --> tests/ui/pin_project/add-pinned-field.rs:6:1
+  --> tests/ui/pin_project/add-pinned-field.rs:8:1
    |
-6  | #[pin_project]
+8  | #[pin_project]
    | ^^^^^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
-7  | #[add_pinned_field]
-8  | struct Foo {
+9  | #[add_pinned_field]
+10 | struct Foo {
    |        ^^^
 note: required by a bound in `is_unpin`
-  --> tests/ui/pin_project/add-pinned-field.rs:4:16
+  --> tests/ui/pin_project/add-pinned-field.rs:6:16
    |
-4  | fn is_unpin<T: Unpin>() {}
+6  | fn is_unpin<T: Unpin>() {}
    |                ^^^^^ required by this bound in `is_unpin`
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/add-pinned-field.rs:22:16
+  --> tests/ui/pin_project/add-pinned-field.rs:24:16
    |
-22 |     is_unpin::<Bar>(); //~ ERROR E0277
+24 |     is_unpin::<Bar>(); //~ ERROR E0277
    |                ^^^ within `__Bar<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `__Bar<'_>`
-  --> tests/ui/pin_project/add-pinned-field.rs:15:8
+  --> tests/ui/pin_project/add-pinned-field.rs:17:8
    |
-15 | struct Bar {
+17 | struct Bar {
    |        ^^^
 note: required for `Bar` to implement `Unpin`
-  --> tests/ui/pin_project/add-pinned-field.rs:14:1
+  --> tests/ui/pin_project/add-pinned-field.rs:16:1
    |
-14 | #[pin_project]
+16 | #[pin_project]
    | ^^^^^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
-15 | struct Bar {
+17 | struct Bar {
    |        ^^^
 note: required by a bound in `is_unpin`
-  --> tests/ui/pin_project/add-pinned-field.rs:4:16
+  --> tests/ui/pin_project/add-pinned-field.rs:6:16
    |
-4  | fn is_unpin<T: Unpin>() {}
+6  | fn is_unpin<T: Unpin>() {}
    |                ^^^^^ required by this bound in `is_unpin`
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/conflict-drop.rs

diff --git a/crates/pin-project/tests/ui/pin_project/conflict-drop.rs b/crates/pin-project/tests/ui/pin_project/conflict-drop.rs
index 4fdb118..d0c0c2d 100644
--- a/crates/pin-project/tests/ui/pin_project/conflict-drop.rs
+++ b/crates/pin-project/tests/ui/pin_project/conflict-drop.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/ui/pin_project/conflict-drop.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/conflict-drop.stderr b/crates/pin-project/tests/ui/pin_project/conflict-drop.stderr
index 79d4ca7..c400f34 100644
--- a/crates/pin-project/tests/ui/pin_project/conflict-drop.stderr
+++ b/crates/pin-project/tests/ui/pin_project/conflict-drop.stderr
@@ -1,19 +1,19 @@
+error[E0119]: conflicting implementations of trait `Drop` for type `Bar<_, _>`
+  --> tests/ui/pin_project/conflict-drop.rs:18:15
+   |
+18 | #[pin_project(PinnedDrop)] //~ ERROR E0119
+   |               ^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
+...
+30 | impl<T, U> Drop for Bar<T, U> {
+   | ----------------------------- first implementation here
+
 error[E0119]: conflicting implementations of trait `FooMustNotImplDrop` for type `Foo<_, _>`
- --> tests/ui/pin_project/conflict-drop.rs:5:1
+ --> tests/ui/pin_project/conflict-drop.rs:7:1
   |
-5 | #[pin_project] //~ ERROR E0119
+7 | #[pin_project] //~ ERROR E0119
   | ^^^^^^^^^^^^^^
   | |
   | first implementation here
   | conflicting implementation for `Foo<_, _>`
   |
   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `Drop` for type `Bar<_, _>`
-  --> tests/ui/pin_project/conflict-drop.rs:16:15
-   |
-16 | #[pin_project(PinnedDrop)] //~ ERROR E0119
-   |               ^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-28 | impl<T, U> Drop for Bar<T, U> {
-   | ----------------------------- first implementation here

crates/pin-project/tests/ui/pin_project/conflict-unpin.rs

diff --git a/crates/pin-project/tests/ui/pin_project/conflict-unpin.rs b/crates/pin-project/tests/ui/pin_project/conflict-unpin.rs
index f58c45e..80efdb7 100644
--- a/crates/pin-project/tests/ui/pin_project/conflict-unpin.rs
+++ b/crates/pin-project/tests/ui/pin_project/conflict-unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 // The same implementation.

crates/pin-project/tests/ui/pin_project/conflict-unpin.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/conflict-unpin.stderr b/crates/pin-project/tests/ui/pin_project/conflict-unpin.stderr
index 0f26b68..b1dcf8d 100644
--- a/crates/pin-project/tests/ui/pin_project/conflict-unpin.stderr
+++ b/crates/pin-project/tests/ui/pin_project/conflict-unpin.stderr
@@ -1,32 +1,32 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<_, _>`
-  --> tests/ui/pin_project/conflict-unpin.rs:5:1
+  --> tests/ui/pin_project/conflict-unpin.rs:7:1
    |
-5  | #[pin_project] //~ ERROR E0119
+7  | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
-13 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   | ------------------------------ first implementation here
+15 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
+   | --------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Bar<_, _>`
-  --> tests/ui/pin_project/conflict-unpin.rs:17:1
+  --> tests/ui/pin_project/conflict-unpin.rs:19:1
    |
-17 | #[pin_project] //~ ERROR E0119
+19 | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
 ...
-25 | impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
+27 | impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
    | ------------------------------ first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Baz<_, _>`
-  --> tests/ui/pin_project/conflict-unpin.rs:27:1
+  --> tests/ui/pin_project/conflict-unpin.rs:29:1
    |
-27 | #[pin_project] //~ ERROR E0119
+29 | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
 ...
-35 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
+37 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
    | -------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs

diff --git a/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs b/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs
index 562c9b6..9f86a41 100644
--- a/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs
+++ b/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project] //~ ERROR E0119

crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr b/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr
index 7e66b9e..0901c97 100644
--- a/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr
+++ b/crates/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr
@@ -1,32 +1,32 @@
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Foo<_, _>`
-  --> tests/ui/pin_project/impl-unsafe-unpin.rs:3:1
+  --> tests/ui/pin_project/impl-unsafe-unpin.rs:5:1
    |
-3  | #[pin_project] //~ ERROR E0119
+5  | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ------------------------------------------- first implementation here
+12 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
+   | ---------------------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Bar<_, _>`
-  --> tests/ui/pin_project/impl-unsafe-unpin.rs:12:1
+  --> tests/ui/pin_project/impl-unsafe-unpin.rs:14:1
    |
-12 | #[pin_project] //~ ERROR E0119
+14 | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
 ...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
+21 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
    | ------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `UnsafeUnpin` for type `Baz<_, _>`
-  --> tests/ui/pin_project/impl-unsafe-unpin.rs:21:1
+  --> tests/ui/pin_project/impl-unsafe-unpin.rs:23:1
    |
-21 | #[pin_project] //~ ERROR E0119
+23 | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
 ...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
+30 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
    | --------------------------------------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/import_unnamed.rs

diff --git a/crates/pin-project/tests/ui/pin_project/import_unnamed.rs b/crates/pin-project/tests/ui/pin_project/import_unnamed.rs
index 7926e61..000d5b5 100644
--- a/crates/pin-project/tests/ui/pin_project/import_unnamed.rs
+++ b/crates/pin-project/tests/ui/pin_project/import_unnamed.rs
@@ -1,5 +1,7 @@
-/// Only named projected types can be imported.
-/// See visibility.rs for named projected types.
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// Only named projected types can be imported.
+// See visibility.rs for named projected types.
 
 mod pub_ {
     use pin_project::pin_project;

crates/pin-project/tests/ui/pin_project/import_unnamed.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/import_unnamed.stderr b/crates/pin-project/tests/ui/pin_project/import_unnamed.stderr
index 260a35a..9ca3486 100644
--- a/crates/pin-project/tests/ui/pin_project/import_unnamed.stderr
+++ b/crates/pin-project/tests/ui/pin_project/import_unnamed.stderr
@@ -1,29 +1,29 @@
 error[E0432]: unresolved import `crate::pub_::__DefaultProjection`
-  --> tests/ui/pin_project/import_unnamed.rs:16:9
+  --> tests/ui/pin_project/import_unnamed.rs:18:9
    |
-16 |     use crate::pub_::__DefaultProjection; //~ ERROR E0432
+18 |     use crate::pub_::__DefaultProjection; //~ ERROR E0432
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__DefaultProjection` in `pub_`
 
 error[E0432]: unresolved import `crate::pub_::__DefaultProjectionRef`
-  --> tests/ui/pin_project/import_unnamed.rs:18:9
+  --> tests/ui/pin_project/import_unnamed.rs:20:9
    |
-18 |     use crate::pub_::__DefaultProjectionRef; //~ ERROR E0432
+20 |     use crate::pub_::__DefaultProjectionRef; //~ ERROR E0432
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__DefaultProjectionRef` in `pub_`
 
 error[E0432]: unresolved import `crate::pub_::__ReplaceProjection`
-  --> tests/ui/pin_project/import_unnamed.rs:20:9
+  --> tests/ui/pin_project/import_unnamed.rs:22:9
    |
-20 |     use crate::pub_::__ReplaceProjection; //~ ERROR E0432
+22 |     use crate::pub_::__ReplaceProjection; //~ ERROR E0432
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjection` in `pub_`
 
 error[E0432]: unresolved import `crate::pub_::__ReplaceProjectionOwned`
-  --> tests/ui/pin_project/import_unnamed.rs:22:9
+  --> tests/ui/pin_project/import_unnamed.rs:24:9
    |
-22 |     use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0432
+24 |     use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0432
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjectionOwned` in `pub_`
 
 error[E0432]: unresolved import `crate::pub_::__ReplaceProjectionRef`
-  --> tests/ui/pin_project/import_unnamed.rs:24:9
+  --> tests/ui/pin_project/import_unnamed.rs:26:9
    |
-24 |     use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0432
+26 |     use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0432
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjectionRef` in `pub_`

crates/pin-project/tests/ui/pin_project/invalid.rs

diff --git a/crates/pin-project/tests/ui/pin_project/invalid.rs b/crates/pin-project/tests/ui/pin_project/invalid.rs
index a850c57..9867ce6 100644
--- a/crates/pin-project/tests/ui/pin_project/invalid.rs
+++ b/crates/pin-project/tests/ui/pin_project/invalid.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 mod pin_argument {
     use pin_project::pin_project;
 

crates/pin-project/tests/ui/pin_project/invalid.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/invalid.stderr b/crates/pin-project/tests/ui/pin_project/invalid.stderr
index ec5205f..01f1bf8 100644
--- a/crates/pin-project/tests/ui/pin_project/invalid.stderr
+++ b/crates/pin-project/tests/ui/pin_project/invalid.stderr
@@ -1,364 +1,364 @@
 error: unexpected token in attribute
- --> tests/ui/pin_project/invalid.rs:6:14
+ --> tests/ui/pin_project/invalid.rs:8:14
   |
-6 |         #[pin()] //~ ERROR unexpected token in attribute
+8 |         #[pin()] //~ ERROR unexpected token in attribute
   |              ^
 
 error: unexpected token in attribute
-  --> tests/ui/pin_project/invalid.rs:11:29
+  --> tests/ui/pin_project/invalid.rs:13:29
    |
-11 |     struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token in attribute
+13 |     struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token in attribute
    |                             ^
 
 error: unexpected token in attribute
-  --> tests/ui/pin_project/invalid.rs:15:16
+  --> tests/ui/pin_project/invalid.rs:17:16
    |
-15 |         V(#[pin(foo)] ()), //~ ERROR unexpected token in attribute
+17 |         V(#[pin(foo)] ()), //~ ERROR unexpected token in attribute
    |                ^
 
 error: unexpected token in attribute
-  --> tests/ui/pin_project/invalid.rs:21:18
+  --> tests/ui/pin_project/invalid.rs:23:18
    |
-21 |             #[pin(foo)] //~ ERROR unexpected token in attribute
+23 |             #[pin(foo)] //~ ERROR unexpected token in attribute
    |                  ^
 
 error: duplicate #[pin] attribute
-  --> tests/ui/pin_project/invalid.rs:33:9
+  --> tests/ui/pin_project/invalid.rs:35:9
    |
-33 |         #[pin] //~ ERROR duplicate #[pin] attribute
+35 |         #[pin] //~ ERROR duplicate #[pin] attribute
    |         ^^^^^^
 
 error: duplicate #[pin] attribute
-  --> tests/ui/pin_project/invalid.rs:40:9
+  --> tests/ui/pin_project/invalid.rs:42:9
    |
-40 |         #[pin]
+42 |         #[pin]
    |         ^^^^^^
 
 error: duplicate #[pin] attribute
-  --> tests/ui/pin_project/invalid.rs:49:13
+  --> tests/ui/pin_project/invalid.rs:51:13
    |
-49 |             #[pin]
+51 |             #[pin]
    |             ^^^^^^
 
 error: duplicate #[pin] attribute
-  --> tests/ui/pin_project/invalid.rs:59:13
+  --> tests/ui/pin_project/invalid.rs:61:13
    |
-59 |             #[pin] //~ ERROR duplicate #[pin] attribute
+61 |             #[pin] //~ ERROR duplicate #[pin] attribute
    |             ^^^^^^
 
 error: #[pin] attribute may only be used on fields of structs or variants
-  --> tests/ui/pin_project/invalid.rs:69:5
+  --> tests/ui/pin_project/invalid.rs:71:5
    |
-69 |     #[pin] //~ ERROR may only be used on fields of structs or variants
+71 |     #[pin] //~ ERROR may only be used on fields of structs or variants
    |     ^^^^^^
 
 error: #[pin] attribute may only be used on fields of structs or variants
-  --> tests/ui/pin_project/invalid.rs:77:9
+  --> tests/ui/pin_project/invalid.rs:79:9
    |
-77 |         #[pin] //~ ERROR may only be used on fields of structs or variants
+79 |         #[pin] //~ ERROR may only be used on fields of structs or variants
    |         ^^^^^^
 
 error: #[pin] attribute may only be used on fields of structs or variants
-  --> tests/ui/pin_project/invalid.rs:82:5
+  --> tests/ui/pin_project/invalid.rs:84:5
    |
-82 |     #[pin] //~ ERROR may only be used on fields of structs or variants
+84 |     #[pin] //~ ERROR may only be used on fields of structs or variants
    |     ^^^^^^
 
 error: `Replace` argument was removed, use `project_replace` argument instead
-  --> tests/ui/pin_project/invalid.rs:91:19
+  --> tests/ui/pin_project/invalid.rs:93:19
    |
-91 |     #[pin_project(Replace)] //~ ERROR `Replace` argument was removed, use `project_replace` argument instead
+93 |     #[pin_project(Replace)] //~ ERROR `Replace` argument was removed, use `project_replace` argument instead
    |                   ^^^^^^^
 
 error: expected identifier
-  --> tests/ui/pin_project/invalid.rs:94:31
+  --> tests/ui/pin_project/invalid.rs:96:31
    |
-94 |     #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
+96 |     #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
    |                               ^
 
 error: unexpected argument: Foo
-  --> tests/ui/pin_project/invalid.rs:97:19
+  --> tests/ui/pin_project/invalid.rs:99:19
    |
-97 |     #[pin_project(Foo)] //~ ERROR unexpected argument
+99 |     #[pin_project(Foo)] //~ ERROR unexpected argument
    |                   ^^^
 
 error: expected identifier
-   --> tests/ui/pin_project/invalid.rs:100:19
+   --> tests/ui/pin_project/invalid.rs:102:19
     |
-100 |     #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
+102 |     #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
     |                   ^
 
 error: expected `,`
-   --> tests/ui/pin_project/invalid.rs:106:30
+   --> tests/ui/pin_project/invalid.rs:108:30
     |
-106 |     #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
+108 |     #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
     |                              ^^^^^^^^^^
 
 error: duplicate `PinnedDrop` argument
-   --> tests/ui/pin_project/invalid.rs:109:31
+   --> tests/ui/pin_project/invalid.rs:111:31
     |
-109 |     #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
+111 |     #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
     |                               ^^^^^^^^^^
 
 error: duplicate `UnsafeUnpin` argument
-   --> tests/ui/pin_project/invalid.rs:112:32
+   --> tests/ui/pin_project/invalid.rs:114:32
     |
-112 |     #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
+114 |     #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
     |                                ^^^^^^^^^^^
 
 error: duplicate `!Unpin` argument
-   --> tests/ui/pin_project/invalid.rs:115:27
+   --> tests/ui/pin_project/invalid.rs:117:27
     |
-115 |     #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
+117 |     #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
     |                           ^^^^^^
 
 error: duplicate `UnsafeUnpin` argument
-   --> tests/ui/pin_project/invalid.rs:118:44
+   --> tests/ui/pin_project/invalid.rs:120:44
     |
-118 |     #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
+120 |     #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
     |                                            ^^^^^^^^^^^
 
 error: duplicate `PinnedDrop` argument
-   --> tests/ui/pin_project/invalid.rs:121:44
+   --> tests/ui/pin_project/invalid.rs:123:44
     |
-121 |     #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
+123 |     #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
     |                                            ^^^^^^^^^^
 
 error: duplicate `project` argument
-   --> tests/ui/pin_project/invalid.rs:124:32
+   --> tests/ui/pin_project/invalid.rs:126:32
     |
-124 |     #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
+126 |     #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
     |                                ^^^^^^^^^^^
 
 error: duplicate `project` argument
-   --> tests/ui/pin_project/invalid.rs:127:49
+   --> tests/ui/pin_project/invalid.rs:129:49
     |
-127 |     #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
+129 |     #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
     |                                                 ^^^^^^^^^^^
 
 error: duplicate `project_ref` argument
-   --> tests/ui/pin_project/invalid.rs:130:36
+   --> tests/ui/pin_project/invalid.rs:132:36
     |
-130 |     #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
+132 |     #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
     |                                    ^^^^^^^^^^^^^^^
 
 error: duplicate `project_replace` argument
-   --> tests/ui/pin_project/invalid.rs:133:40
+   --> tests/ui/pin_project/invalid.rs:135:40
     |
-133 |     #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
+135 |     #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
     |                                        ^^^^^^^^^^^^^^^^^^^
 
 error: duplicate `project_replace` argument
-   --> tests/ui/pin_project/invalid.rs:136:36
+   --> tests/ui/pin_project/invalid.rs:138:36
     |
-136 |     #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
+138 |     #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
     |                                    ^^^^^^^^^^^^^^^^^^^
 
 error: duplicate `project_replace` argument
-   --> tests/ui/pin_project/invalid.rs:139:40
+   --> tests/ui/pin_project/invalid.rs:141:40
     |
-139 |     #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
+141 |     #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
     |                                        ^^^^^^^^^^^^^^^
 
 error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> tests/ui/pin_project/invalid.rs:145:19
+   --> tests/ui/pin_project/invalid.rs:147:19
     |
-145 |     #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
+147 |     #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
     |                   ^^^^^^^^^^
 
 error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> tests/ui/pin_project/invalid.rs:148:49
+   --> tests/ui/pin_project/invalid.rs:150:49
     |
-148 |     #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
+150 |     #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
     |                                                 ^^^^^^^^^^
 
 error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> tests/ui/pin_project/invalid.rs:151:19
+   --> tests/ui/pin_project/invalid.rs:153:19
     |
-151 |     #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
+153 |     #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
     |                   ^^^^^^^^^^^
 
 error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> tests/ui/pin_project/invalid.rs:154:39
+   --> tests/ui/pin_project/invalid.rs:156:39
     |
-154 |     #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
+156 |     #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
     |                                       ^^^^^^^^^^^
 
 error: expected `!Unpin`, found `!`
-   --> tests/ui/pin_project/invalid.rs:157:19
+   --> tests/ui/pin_project/invalid.rs:159:19
     |
-157 |     #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
+159 |     #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
     |                   ^
 
 error: unexpected argument: Unpin
-   --> tests/ui/pin_project/invalid.rs:160:19
+   --> tests/ui/pin_project/invalid.rs:162:19
     |
-160 |     #[pin_project(Unpin)] //~ ERROR unexpected argument
+162 |     #[pin_project(Unpin)] //~ ERROR unexpected argument
     |                   ^^^^^
 
 error: expected `project = <identifier>`, found `project`
-   --> tests/ui/pin_project/invalid.rs:163:19
+   --> tests/ui/pin_project/invalid.rs:165:19
     |
-163 |     #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
+165 |     #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
     |                   ^^^^^^^
 
 error: expected `project = <identifier>`, found `project =`
-   --> tests/ui/pin_project/invalid.rs:166:19
+   --> tests/ui/pin_project/invalid.rs:168:19
     |
-166 |     #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
+168 |     #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
     |                   ^^^^^^^^^
 
 error: expected identifier
-   --> tests/ui/pin_project/invalid.rs:169:29
+   --> tests/ui/pin_project/invalid.rs:171:29
     |
-169 |     #[pin_project(project = !)] //~ ERROR expected identifier
+171 |     #[pin_project(project = !)] //~ ERROR expected identifier
     |                             ^
 
 error: expected `project_ref = <identifier>`, found `project_ref`
-   --> tests/ui/pin_project/invalid.rs:172:19
+   --> tests/ui/pin_project/invalid.rs:174:19
     |
-172 |     #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
+174 |     #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
     |                   ^^^^^^^^^^^
 
 error: expected `project_ref = <identifier>`, found `project_ref =`
-   --> tests/ui/pin_project/invalid.rs:175:19
+   --> tests/ui/pin_project/invalid.rs:177:19
     |
-175 |     #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
+177 |     #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
     |                   ^^^^^^^^^^^^^
 
 error: expected identifier
-   --> tests/ui/pin_project/invalid.rs:178:33
+   --> tests/ui/pin_project/invalid.rs:180:33
     |
-178 |     #[pin_project(project_ref = !)] //~ ERROR expected identifier
+180 |     #[pin_project(project_ref = !)] //~ ERROR expected identifier
     |                                 ^
 
 error: expected `project_replace = <identifier>`, found `project_replace =`
-   --> tests/ui/pin_project/invalid.rs:184:19
+   --> tests/ui/pin_project/invalid.rs:186:19
     |
-184 |     #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
+186 |     #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
     |                   ^^^^^^^^^^^^^^^^^
 
 error: expected identifier
-   --> tests/ui/pin_project/invalid.rs:187:37
+   --> tests/ui/pin_project/invalid.rs:189:37
     |
-187 |     #[pin_project(project_replace = !)] //~ ERROR expected identifier
+189 |     #[pin_project(project_replace = !)] //~ ERROR expected identifier
     |                                     ^
 
 error: `project_replace` argument requires a value when used on enums
-   --> tests/ui/pin_project/invalid.rs:190:19
+   --> tests/ui/pin_project/invalid.rs:192:19
     |
-190 |     #[pin_project(project_replace)] //~ ERROR `project_replace` argument requires a value when used on enums
+192 |     #[pin_project(project_replace)] //~ ERROR `project_replace` argument requires a value when used on enums
     |                   ^^^^^^^^^^^^^^^
 
 error: name `OrigAndProj` is the same as the original type name
-   --> tests/ui/pin_project/invalid.rs:199:29
+   --> tests/ui/pin_project/invalid.rs:201:29
     |
-199 |     #[pin_project(project = OrigAndProj)] //~ ERROR name `OrigAndProj` is the same as the original type name
+201 |     #[pin_project(project = OrigAndProj)] //~ ERROR name `OrigAndProj` is the same as the original type name
     |                             ^^^^^^^^^^^
 
 error: name `OrigAndProjRef` is the same as the original type name
-   --> tests/ui/pin_project/invalid.rs:202:33
+   --> tests/ui/pin_project/invalid.rs:204:33
     |
-202 |     #[pin_project(project_ref = OrigAndProjRef)] //~ ERROR name `OrigAndProjRef` is the same as the original type name
+204 |     #[pin_project(project_ref = OrigAndProjRef)] //~ ERROR name `OrigAndProjRef` is the same as the original type name
     |                                 ^^^^^^^^^^^^^^
 
 error: name `OrigAndProjOwn` is the same as the original type name
-   --> tests/ui/pin_project/invalid.rs:205:37
+   --> tests/ui/pin_project/invalid.rs:207:37
     |
-205 |     #[pin_project(project_replace = OrigAndProjOwn)] //~ ERROR name `OrigAndProjOwn` is the same as the original type name
+207 |     #[pin_project(project_replace = OrigAndProjOwn)] //~ ERROR name `OrigAndProjOwn` is the same as the original type name
     |                                     ^^^^^^^^^^^^^^
 
 error: name `A` is already specified by `project` argument
-   --> tests/ui/pin_project/invalid.rs:208:46
+   --> tests/ui/pin_project/invalid.rs:210:46
     |
-208 |     #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
+210 |     #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
     |                                              ^
 
 error: name `A` is already specified by `project` argument
-   --> tests/ui/pin_project/invalid.rs:211:50
+   --> tests/ui/pin_project/invalid.rs:213:50
     |
-211 |     #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
+213 |     #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
     |                                                  ^
 
 error: name `A` is already specified by `project_ref` argument
-   --> tests/ui/pin_project/invalid.rs:214:54
+   --> tests/ui/pin_project/invalid.rs:216:54
     |
-214 |     #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
+216 |     #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
     |                                                      ^
 
 error: duplicate #[pin_project] attribute
-   --> tests/ui/pin_project/invalid.rs:222:5
+   --> tests/ui/pin_project/invalid.rs:224:5
     |
-222 |     #[pin_project] //~ ERROR duplicate #[pin_project] attribute
+224 |     #[pin_project] //~ ERROR duplicate #[pin_project] attribute
     |     ^^^^^^^^^^^^^^
 
 error: #[pin_project] attribute may not be used on structs with zero fields
-   --> tests/ui/pin_project/invalid.rs:230:19
+   --> tests/ui/pin_project/invalid.rs:232:19
     |
-230 |     struct Struct {} //~ ERROR may not be used on structs with zero fields
+232 |     struct Struct {} //~ ERROR may not be used on structs with zero fields
     |                   ^^
 
 error: #[pin_project] attribute may not be used on structs with zero fields
-   --> tests/ui/pin_project/invalid.rs:233:23
+   --> tests/ui/pin_project/invalid.rs:235:23
     |
-233 |     struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
+235 |     struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
     |                       ^^
 
 error: #[pin_project] attribute may not be used on structs with zero fields
-   --> tests/ui/pin_project/invalid.rs:236:12
+   --> tests/ui/pin_project/invalid.rs:238:12
     |
-236 |     struct UnitStruct; //~ ERROR may not be used on structs with zero fields
+238 |     struct UnitStruct; //~ ERROR may not be used on structs with zero fields
     |            ^^^^^^^^^^
 
 error: #[pin_project] attribute may not be used on enums without variants
-   --> tests/ui/pin_project/invalid.rs:239:20
+   --> tests/ui/pin_project/invalid.rs:241:20
     |
-239 |     enum EnumEmpty {} //~ ERROR may not be used on enums without variants
+241 |     enum EnumEmpty {} //~ ERROR may not be used on enums without variants
     |                    ^^
 
 error: #[pin_project] attribute may not be used on enums with discriminants
-   --> tests/ui/pin_project/invalid.rs:243:13
+   --> tests/ui/pin_project/invalid.rs:245:13
     |
-243 |         V = 2, //~ ERROR may not be used on enums with discriminants
+245 |         V = 2, //~ ERROR may not be used on enums with discriminants
     |             ^
 
 error: #[pin_project] attribute may not be used on enums with zero fields
-   --> tests/ui/pin_project/invalid.rs:248:9
+   --> tests/ui/pin_project/invalid.rs:250:9
     |
-248 | /         Unit, //~ ERROR may not be used on enums with zero fields
-249 | |         Tuple(),
-250 | |         Struct {},
+250 | /         Unit, //~ ERROR may not be used on enums with zero fields
+251 | |         Tuple(),
+252 | |         Struct {},
     | |__________________^
 
 error: #[pin_project] attribute may only be used on structs or enums
-   --> tests/ui/pin_project/invalid.rs:254:5
+   --> tests/ui/pin_project/invalid.rs:256:5
     |
-254 | /     union Union {
-255 | |         //~^ ERROR may only be used on structs or enums
-256 | |         f: (),
-257 | |     }
+256 | /     union Union {
+257 | |         //~^ ERROR may only be used on structs or enums
+258 | |         f: (),
+259 | |     }
     | |_____^
 
 error: #[pin_project] attribute may only be used on structs or enums
-   --> tests/ui/pin_project/invalid.rs:260:5
+   --> tests/ui/pin_project/invalid.rs:262:5
     |
-260 |     impl Impl {} //~ ERROR may only be used on structs or enums
+262 |     impl Impl {} //~ ERROR may only be used on structs or enums
     |     ^^^^^^^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> tests/ui/pin_project/invalid.rs:268:12
+   --> tests/ui/pin_project/invalid.rs:270:12
     |
-268 |     #[repr(packed)]
+270 |     #[repr(packed)]
     |            ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> tests/ui/pin_project/invalid.rs:272:12
+   --> tests/ui/pin_project/invalid.rs:274:12
     |
-272 |     #[repr(packed)]
+274 |     #[repr(packed)]
     |            ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> tests/ui/pin_project/invalid.rs:276:12
+   --> tests/ui/pin_project/invalid.rs:278:12
     |
-276 |     #[repr(packed)]
+278 |     #[repr(packed)]
     |            ^^^^^^

crates/pin-project/tests/ui/pin_project/negative_impls_stable.rs

diff --git a/crates/pin-project/tests/ui/pin_project/negative_impls_stable.rs b/crates/pin-project/tests/ui/pin_project/negative_impls_stable.rs
new file mode 100644
index 0000000..85b81fb
--- /dev/null
+++ b/crates/pin-project/tests/ui/pin_project/negative_impls_stable.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// https://github.com/taiki-e/pin-project/issues/340#issuecomment-2428002670
+
+#[pin_project::pin_project]
+struct Foo<Pinned, Unpinned> {
+    #[pin]
+    pinned: Pinned,
+    unpinned: Unpinned,
+}
+
+struct MyPhantomPinned(::core::marker::PhantomPinned);
+impl Unpin for MyPhantomPinned where for<'cursed> str: Sized {}
+impl Unpin for Foo<MyPhantomPinned, ()> {}
+
+fn is_unpin<T: Unpin>() {}
+
+fn main() {
+    is_unpin::<Foo<MyPhantomPinned, ()>>()
+}

crates/pin-project/tests/ui/pin_project/negative_impls_stable.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/negative_impls_stable.stderr b/crates/pin-project/tests/ui/pin_project/negative_impls_stable.stderr
new file mode 100644
index 0000000..5703e37
--- /dev/null
+++ b/crates/pin-project/tests/ui/pin_project/negative_impls_stable.stderr
@@ -0,0 +1,10 @@
+error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhantomPinned, ()>`
+  --> tests/ui/pin_project/negative_impls_stable.rs:5:1
+   |
+5  | #[pin_project::pin_project]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
+...
+14 | impl Unpin for Foo<MyPhantomPinned, ()> {}
+   | --------------------------------------- first implementation here
+   |
+   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs

diff --git a/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs b/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs
index abfd5d1..a3c41ba 100644
--- a/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs
+++ b/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::marker::PhantomPinned;
 
 use pin_project::pin_project;

crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr b/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr
index b9efd72..40b9e3b 100644
--- a/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr
+++ b/crates/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr
@@ -1,26 +1,26 @@
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/overlapping_unpin_struct.rs:18:16
+  --> tests/ui/pin_project/overlapping_unpin_struct.rs:20:16
    |
-18 |     is_unpin::<S<PhantomPinned>>(); //~ ERROR E0277
+20 |     is_unpin::<S<PhantomPinned>>(); //~ ERROR E0277
    |                ^^^^^^^^^^^^^^^^ within `_::__S<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
-note: required because it appears within the type `__S<'_, PhantomPinned>`
-  --> tests/ui/pin_project/overlapping_unpin_struct.rs:6:8
+note: required because it appears within the type `_::__S<'_, PhantomPinned>`
+  --> tests/ui/pin_project/overlapping_unpin_struct.rs:8:8
    |
-6  | struct S<T> {
+8  | struct S<T> {
    |        ^
 note: required for `S<PhantomPinned>` to implement `Unpin`
-  --> tests/ui/pin_project/overlapping_unpin_struct.rs:5:1
+  --> tests/ui/pin_project/overlapping_unpin_struct.rs:7:1
    |
-5  | #[pin_project]
+7  | #[pin_project]
    | ^^^^^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
-6  | struct S<T> {
+8  | struct S<T> {
    |        ^^^^
 note: required by a bound in `is_unpin`
-  --> tests/ui/pin_project/overlapping_unpin_struct.rs:15:16
+  --> tests/ui/pin_project/overlapping_unpin_struct.rs:17:16
    |
-15 | fn is_unpin<T: Unpin>() {}
+17 | fn is_unpin<T: Unpin>() {}
    |                ^^^^^ required by this bound in `is_unpin`
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/override-priv-mod.rs

diff --git a/crates/pin-project/tests/ui/pin_project/override-priv-mod.rs b/crates/pin-project/tests/ui/pin_project/override-priv-mod.rs
index 68285d3..d3bf72c 100644
--- a/crates/pin-project/tests/ui/pin_project/override-priv-mod.rs
+++ b/crates/pin-project/tests/ui/pin_project/override-priv-mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // https://discord.com/channels/273534239310479360/512792629516173323/870075511009857617
 
 #![allow(hidden_glob_reexports)]

crates/pin-project/tests/ui/pin_project/override-priv-mod.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/override-priv-mod.stderr b/crates/pin-project/tests/ui/pin_project/override-priv-mod.stderr
index 2e76c0a..f281b73 100644
--- a/crates/pin-project/tests/ui/pin_project/override-priv-mod.stderr
+++ b/crates/pin-project/tests/ui/pin_project/override-priv-mod.stderr
@@ -1,7 +1,7 @@
 error[E0119]: conflicting implementations of trait `SMustNotImplDrop` for type `S`
-  --> tests/ui/pin_project/override-priv-mod.rs:16:1
+  --> tests/ui/pin_project/override-priv-mod.rs:18:1
    |
-16 | #[pin_project] //~ ERROR conflicting implementations of trait `_::FooMustNotImplDrop`
+18 | #[pin_project] //~ ERROR conflicting implementations of trait `_::FooMustNotImplDrop`
    | ^^^^^^^^^^^^^^
    | |
    | first implementation here

crates/pin-project/tests/ui/pin_project/packed-enum.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed-enum.rs b/crates/pin-project/tests/ui/pin_project/packed-enum.rs
index 023c08d..e53430a 100644
--- a/crates/pin-project/tests/ui/pin_project/packed-enum.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed-enum.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 // #[repr(packed)] cannot be apply on enums and will be rejected by rustc.

crates/pin-project/tests/ui/pin_project/packed-enum.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed-enum.stderr b/crates/pin-project/tests/ui/pin_project/packed-enum.stderr
index 1872211..6271edd 100644
--- a/crates/pin-project/tests/ui/pin_project/packed-enum.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed-enum.stderr
@@ -1,42 +1,42 @@
 error: #[repr(packed)] attribute should be applied to a struct or union
-  --> tests/ui/pin_project/packed-enum.rs:13:8
+  --> tests/ui/pin_project/packed-enum.rs:15:8
    |
-13 | #[repr(packed)] //~ ERROR E0517
+15 | #[repr(packed)] //~ ERROR E0517
    |        ^^^^^^
 
 error: #[repr(packed)] attribute should be applied to a struct or union
-  --> tests/ui/pin_project/packed-enum.rs:18:8
+  --> tests/ui/pin_project/packed-enum.rs:20:8
    |
-18 | #[repr(packed)] //~ ERROR E0517
+20 | #[repr(packed)] //~ ERROR E0517
    |        ^^^^^^
 
 error[E0517]: attribute should be applied to a struct or union
-  --> tests/ui/pin_project/packed-enum.rs:7:8
+  --> tests/ui/pin_project/packed-enum.rs:9:8
    |
-7  |   #[repr(packed)] //~ ERROR E0517
+9  |   #[repr(packed)] //~ ERROR E0517
    |          ^^^^^^
-8  | / enum E1 {
-9  | |     V(()),
-10 | | }
+10 | / enum E1 {
+11 | |     V(()),
+12 | | }
    | |_- not a struct or union
 
 error[E0517]: attribute should be applied to a struct or union
-  --> tests/ui/pin_project/packed-enum.rs:13:8
+  --> tests/ui/pin_project/packed-enum.rs:15:8
    |
-13 |   #[repr(packed)] //~ ERROR E0517
+15 |   #[repr(packed)] //~ ERROR E0517
    |          ^^^^^^
-14 | / enum E2 {
-15 | |     V(()),
-16 | | }
+16 | / enum E2 {
+17 | |     V(()),
+18 | | }
    | |_- not a struct or union
 
 error[E0517]: attribute should be applied to a struct or union
-  --> tests/ui/pin_project/packed-enum.rs:18:8
+  --> tests/ui/pin_project/packed-enum.rs:20:8
    |
-18 |   #[repr(packed)] //~ ERROR E0517
+20 |   #[repr(packed)] //~ ERROR E0517
    |          ^^^^^^
-19 |   #[pin_project]
-20 | / enum E3 {
-21 | |     V(()),
-22 | | }
+21 |   #[pin_project]
+22 | / enum E3 {
+23 | |     V(()),
+24 | | }
    | |_- not a struct or union

crates/pin-project/tests/ui/pin_project/packed-name-value.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed-name-value.rs b/crates/pin-project/tests/ui/pin_project/packed-name-value.rs
index dedc403..1fd8af0 100644
--- a/crates/pin-project/tests/ui/pin_project/packed-name-value.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed-name-value.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 // #[repr(packed = "")] is not valid format of #[repr(packed)] and will be

crates/pin-project/tests/ui/pin_project/packed-name-value.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed-name-value.stderr b/crates/pin-project/tests/ui/pin_project/packed-name-value.stderr
index d8b2194..c1633b6 100644
--- a/crates/pin-project/tests/ui/pin_project/packed-name-value.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed-name-value.stderr
@@ -1,23 +1,23 @@
 error: #[repr(packed)] attribute should not be name-value pair
-  --> tests/ui/pin_project/packed-name-value.rs:16:8
+  --> tests/ui/pin_project/packed-name-value.rs:18:8
    |
-16 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
+18 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
    |        ^^^^^^^^^^^
 
 error: #[repr(packed)] attribute should not be name-value pair
-  --> tests/ui/pin_project/packed-name-value.rs:21:8
+  --> tests/ui/pin_project/packed-name-value.rs:23:8
    |
-21 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
+23 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
    |        ^^^^^^^^^^^
 
 error[E0693]: incorrect `repr(packed)` attribute format
-  --> tests/ui/pin_project/packed-name-value.rs:16:8
+  --> tests/ui/pin_project/packed-name-value.rs:18:8
    |
-16 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
+18 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
    |        ^^^^^^^^^^^ help: use parentheses instead: `packed()`
 
 error[E0693]: incorrect `repr(packed)` attribute format
-  --> tests/ui/pin_project/packed-name-value.rs:21:8
+  --> tests/ui/pin_project/packed-name-value.rs:23:8
    |
-21 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
+23 | #[repr(packed = "")] //~ ERROR attribute should not be name-value pair
    |        ^^^^^^^^^^^ help: use parentheses instead: `packed()`

crates/pin-project/tests/ui/pin_project/packed.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed.rs b/crates/pin-project/tests/ui/pin_project/packed.rs
index dd3ebfd..f5e0c6f 100644
--- a/crates/pin-project/tests/ui/pin_project/packed.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/ui/pin_project/packed.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed.stderr b/crates/pin-project/tests/ui/pin_project/packed.stderr
index 25ea5f4..8f4d163 100644
--- a/crates/pin-project/tests/ui/pin_project/packed.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed.stderr
@@ -1,23 +1,23 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> tests/ui/pin_project/packed.rs:4:8
+ --> tests/ui/pin_project/packed.rs:6:8
   |
-4 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
+6 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
   |        ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed.rs:11:8
+  --> tests/ui/pin_project/packed.rs:13:8
    |
-11 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
+13 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
    |        ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed.rs:19:8
+  --> tests/ui/pin_project/packed.rs:21:8
    |
-19 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
+21 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
    |        ^^^^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed.rs:26:8
+  --> tests/ui/pin_project/packed.rs:28:8
    |
-26 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
+28 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
    |        ^^^^^^^^^

crates/pin-project/tests/ui/pin_project/packed_sneaky-1.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.rs b/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.rs
index 83a4612..a2c397b 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use auxiliary_macro::{hidden_repr, hidden_repr2};

crates/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr b/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr
index 0746e1a..5256dd6 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr
@@ -1,25 +1,25 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> tests/ui/pin_project/packed_sneaky-1.rs:7:15
+ --> tests/ui/pin_project/packed_sneaky-1.rs:9:15
   |
-7 | #[hidden_repr(packed)]
+9 | #[hidden_repr(packed)]
   |               ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed_sneaky-1.rs:13:1
+  --> tests/ui/pin_project/packed_sneaky-1.rs:15:1
    |
-13 | #[hidden_repr2]
+15 | #[hidden_repr2]
    | ^^^^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `hidden_repr2` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed_sneaky-1.rs:21:15
+  --> tests/ui/pin_project/packed_sneaky-1.rs:23:15
    |
-21 | #[hidden_repr(packed)]
+23 | #[hidden_repr(packed)]
    |               ^^^^^^
 
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed_sneaky-1.rs:30:15
+  --> tests/ui/pin_project/packed_sneaky-1.rs:32:15
    |
-30 | #[hidden_repr(packed)]
+32 | #[hidden_repr(packed)]
    |               ^^^^^^

crates/pin-project/tests/ui/pin_project/packed_sneaky-2.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.rs b/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.rs
index b098358..57c3d85 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::hidden_repr_macro;
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr b/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr
index d643052..88f80ce 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr
@@ -1,13 +1,12 @@
 error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> tests/ui/pin_project/packed_sneaky-2.rs:4:1
+  --> tests/ui/pin_project/packed_sneaky-2.rs:6:1
    |
-4  | / hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
-5  | |     #[pin_project]
-6  | |     struct B {
-7  | |         #[pin]
-8  | |         f: u32,
-9  | |     }
-10 | | }
+6  | / hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
+7  | |     #[pin_project]
+8  | |     struct B {
+9  | |         #[pin]
+...  |
+12 | | }
    | |_^
    |
    = note: this error originates in the macro `hidden_repr_macro` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/pin_project/packed_sneaky-3.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.rs b/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.rs
index d3f00f3..e1b57d0 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use auxiliary_macro::{hidden_repr_macro, HiddenRepr};
 use pin_project::pin_project;
 

crates/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr b/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr
index c181bb3..a33a2f1 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr
@@ -1,32 +1,32 @@
 error: expected item after attributes
- --> tests/ui/pin_project/packed_sneaky-3.rs:4:1
+ --> tests/ui/pin_project/packed_sneaky-3.rs:6:1
   |
-4 | hidden_repr_macro! {} //~ ERROR expected item after attributes
+6 | hidden_repr_macro! {} //~ ERROR expected item after attributes
   | ^^^^^^^^^^^^^^^^^^^^^
   |
   = note: this error originates in the macro `hidden_repr_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected item after attributes
-  --> tests/ui/pin_project/packed_sneaky-3.rs:13:9
+  --> tests/ui/pin_project/packed_sneaky-3.rs:15:9
    |
-13 |         #[repr(packed)] //~ ERROR expected item after attributes
+15 |         #[repr(packed)] //~ ERROR expected item after attributes
    |         ^^^^^^^^^^^^^^^
 ...
-17 | hidden_repr_macro2! {}
+19 | hidden_repr_macro2! {}
    | ---------------------- in this macro invocation
    |
    = note: this error originates in the macro `hidden_repr_macro2` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected item after attributes
-  --> tests/ui/pin_project/packed_sneaky-3.rs:24:10
+  --> tests/ui/pin_project/packed_sneaky-3.rs:26:10
    |
-24 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
+26 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
    |          ^^^^^^^^^^
    |
    = note: this error originates in the derive macro `HiddenRepr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: proc-macro derive produced unparsable tokens
-  --> tests/ui/pin_project/packed_sneaky-3.rs:24:10
+  --> tests/ui/pin_project/packed_sneaky-3.rs:26:10
    |
-24 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
+26 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
    |          ^^^^^^^^^^

crates/pin-project/tests/ui/pin_project/packed_sneaky-4.rs

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.rs b/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.rs
index 4f40907..b085e82 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.rs
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // https://github.com/taiki-e/pin-project/issues/342
 
 use auxiliary_macro::hidden_repr2;

crates/pin-project/tests/ui/pin_project/packed_sneaky-4.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.stderr b/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.stderr
index 2c24367..c11979c 100644
--- a/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.stderr
+++ b/crates/pin-project/tests/ui/pin_project/packed_sneaky-4.stderr
@@ -1,7 +1,7 @@
 error[E0793]: reference to packed field is unaligned
-  --> tests/ui/pin_project/packed_sneaky-4.rs:10:5
+  --> tests/ui/pin_project/packed_sneaky-4.rs:12:5
    |
-10 |     f: u32,
+12 |     f: u32,
    |     ^
    |
    = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses
@@ -9,9 +9,9 @@
    = help: copy the field contents to a local variable, or replace the reference with a raw pointer and use `read_unaligned`/`write_unaligned` (loads and stores via `*p` must be properly aligned even when using raw pointers)
 
 error[E0793]: reference to packed field is unaligned
- --> tests/ui/pin_project/packed_sneaky-4.rs:6:1
+ --> tests/ui/pin_project/packed_sneaky-4.rs:8:1
   |
-6 | #[pin_project] //~ ERROR reference to packed field is unaligned
+8 | #[pin_project] //~ ERROR reference to packed field is unaligned
   | ^^^^^^^^^^^^^^
   |
   = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses

crates/pin-project/tests/ui/pin_project/private_in_public-enum.rs

diff --git a/crates/pin-project/tests/ui/pin_project/private_in_public-enum.rs b/crates/pin-project/tests/ui/pin_project/private_in_public-enum.rs
deleted file mode 100644
index d55baeb..0000000
--- a/crates/pin-project/tests/ui/pin_project/private_in_public-enum.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Even if allows private_in_public, these are errors.
-
-#![allow(private_in_public, dead_code)]
-
-pub enum PublicEnum {
-    V(PrivateEnum), //~ ERROR E0446
-}
-
-enum PrivateEnum {
-    V(u8),
-}
-
-mod foo {
-    pub(crate) enum CrateEnum {
-        V(PrivateEnum), //~ ERROR E0446
-    }
-
-    enum PrivateEnum {
-        V(u8),
-    }
-}
-
-fn main() {}

crates/pin-project/tests/ui/pin_project/private_in_public-enum.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/private_in_public-enum.stderr b/crates/pin-project/tests/ui/pin_project/private_in_public-enum.stderr
deleted file mode 100644
index c93b265..0000000
--- a/crates/pin-project/tests/ui/pin_project/private_in_public-enum.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0446]: private type `PrivateEnum` in public interface
- --> tests/ui/pin_project/private_in_public-enum.rs:6:7
-  |
-6 |     V(PrivateEnum), //~ ERROR E0446
-  |       ^^^^^^^^^^^ can't leak private type
-...
-9 | enum PrivateEnum {
-  | ---------------- `PrivateEnum` declared as private
-
-error[E0446]: private type `foo::PrivateEnum` in public interface
-  --> tests/ui/pin_project/private_in_public-enum.rs:15:11
-   |
-15 |         V(PrivateEnum), //~ ERROR E0446
-   |           ^^^^^^^^^^^ can't leak private type
-...
-18 |     enum PrivateEnum {
-   |     ---------------- `foo::PrivateEnum` declared as private

crates/pin-project/tests/ui/pin_project/project_replace_unsized.rs

diff --git a/crates/pin-project/tests/ui/pin_project/project_replace_unsized.rs b/crates/pin-project/tests/ui/pin_project/project_replace_unsized.rs
index 20dde12..b51531b 100644
--- a/crates/pin-project/tests/ui/pin_project/project_replace_unsized.rs
+++ b/crates/pin-project/tests/ui/pin_project/project_replace_unsized.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(project_replace)] //~ ERROR E0277

crates/pin-project/tests/ui/pin_project/project_replace_unsized.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/project_replace_unsized.stderr b/crates/pin-project/tests/ui/pin_project/project_replace_unsized.stderr
index 7982dcc..87e0a6d 100644
--- a/crates/pin-project/tests/ui/pin_project/project_replace_unsized.stderr
+++ b/crates/pin-project/tests/ui/pin_project/project_replace_unsized.stderr
@@ -1,39 +1,39 @@
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized.rs:3:15
+ --> tests/ui/pin_project/project_replace_unsized.rs:5:15
   |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
+5 | #[pin_project(project_replace)] //~ ERROR E0277
   |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
+6 | struct Struct<T: ?Sized> {
   |               - this type parameter needs to be `Sized`
   |
 note: required because it appears within the type `Struct<T>`
- --> tests/ui/pin_project/project_replace_unsized.rs:4:8
+ --> tests/ui/pin_project/project_replace_unsized.rs:6:8
   |
-4 | struct Struct<T: ?Sized> {
+6 | struct Struct<T: ?Sized> {
   |        ^^^^^^
   = help: unsized fn params are gated as an unstable feature
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
   |
-4 - struct Struct<T: ?Sized> {
-4 + struct Struct<T> {
+6 - struct Struct<T: ?Sized> {
+6 + struct Struct<T> {
   |
 help: function arguments must have a statically known size, borrowed types always have a known size
   |
-3 | #[pin_project(&project_replace)] //~ ERROR E0277
+5 | #[pin_project(&project_replace)] //~ ERROR E0277
   |               +
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized.rs:3:1
+ --> tests/ui/pin_project/project_replace_unsized.rs:5:1
   |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
+5 | #[pin_project(project_replace)] //~ ERROR E0277
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
+6 | struct Struct<T: ?Sized> {
   |               - this type parameter needs to be `Sized`
   |
 note: required because it appears within the type `Struct<T>`
- --> tests/ui/pin_project/project_replace_unsized.rs:4:8
+ --> tests/ui/pin_project/project_replace_unsized.rs:6:8
   |
-4 | struct Struct<T: ?Sized> {
+6 | struct Struct<T: ?Sized> {
   |        ^^^^^^
 note: required by a bound in `UnsafeOverwriteGuard::<T>::new`
  --> src/lib.rs
@@ -45,80 +45,80 @@
   |                       --- required by a bound in this associated function
   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-    |
-4   - struct Struct<T: ?Sized> {
-4   + struct Struct<T> {
+  |
+6   - struct Struct<T: ?Sized> {
+6   + struct Struct<T> {
     |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized.rs:5:5
+ --> tests/ui/pin_project/project_replace_unsized.rs:7:5
   |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
+5 | #[pin_project(project_replace)] //~ ERROR E0277
   | ------------------------------- required by a bound introduced by this call
-4 | struct Struct<T: ?Sized> {
+6 | struct Struct<T: ?Sized> {
   |               - this type parameter needs to be `Sized`
-5 |     f: T,
+7 |     f: T,
   |     ^ doesn't have a size known at compile-time
   |
-note: required by a bound in `std::ptr::read`
+note: required by an implicit `Sized` bound in `std::ptr::read`
  --> $RUST/core/src/ptr/mod.rs
   |
   | pub const unsafe fn read<T>(src: *const T) -> T {
-  |                          ^ required by this bound in `read`
+  |                          ^ required by the implicit `Sized` requirement on this type parameter in `read`
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-     |
-4    - struct Struct<T: ?Sized> {
-4    + struct Struct<T> {
+  |
+6    - struct Struct<T: ?Sized> {
+6    + struct Struct<T> {
      |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized.rs:8:15
-  |
-8 | #[pin_project(project_replace)] //~ ERROR E0277
-  |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9 | struct TupleStruct<T: ?Sized>(T);
-  |                    - this type parameter needs to be `Sized`
-  |
+  --> tests/ui/pin_project/project_replace_unsized.rs:10:15
+   |
+10 | #[pin_project(project_replace)] //~ ERROR E0277
+   |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+11 | struct TupleStruct<T: ?Sized>(T);
+   |                    - this type parameter needs to be `Sized`
+   |
 note: required because it appears within the type `TupleStruct<T>`
- --> tests/ui/pin_project/project_replace_unsized.rs:9:8
-  |
-9 | struct TupleStruct<T: ?Sized>(T);
-  |        ^^^^^^^^^^^
-  = help: unsized fn params are gated as an unstable feature
+  --> tests/ui/pin_project/project_replace_unsized.rs:11:8
+   |
+11 | struct TupleStruct<T: ?Sized>(T);
+   |        ^^^^^^^^^^^
+   = help: unsized fn params are gated as an unstable feature
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-  |
-9 - struct TupleStruct<T: ?Sized>(T);
-9 + struct TupleStruct<T>(T);
-  |
+   |
+11 - struct TupleStruct<T: ?Sized>(T);
+11 + struct TupleStruct<T>(T);
+   |
 help: function arguments must have a statically known size, borrowed types always have a known size
-  |
-8 | #[pin_project(&project_replace)] //~ ERROR E0277
-  |               +
+   |
+10 | #[pin_project(&project_replace)] //~ ERROR E0277
+   |               +
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized.rs:8:1
-  |
-8 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9 | struct TupleStruct<T: ?Sized>(T);
-  |                    - this type parameter needs to be `Sized`
-  |
+  --> tests/ui/pin_project/project_replace_unsized.rs:10:1
+   |
+10 | #[pin_project(project_replace)] //~ ERROR E0277
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+11 | struct TupleStruct<T: ?Sized>(T);
+   |                    - this type parameter needs to be `Sized`
+   |
 note: required because it appears within the type `TupleStruct<T>`
- --> tests/ui/pin_project/project_replace_unsized.rs:9:8
-  |
-9 | struct TupleStruct<T: ?Sized>(T);
-  |        ^^^^^^^^^^^
+  --> tests/ui/pin_project/project_replace_unsized.rs:11:8
+   |
+11 | struct TupleStruct<T: ?Sized>(T);
+   |        ^^^^^^^^^^^
 note: required by a bound in `UnsafeOverwriteGuard::<T>::new`
- --> src/lib.rs
-  |
-  |     impl<T> UnsafeOverwriteGuard<T> {
-  |          ^ required by this bound in `UnsafeOverwriteGuard::<T>::new`
-  |         #[doc(hidden)]
-  |         pub unsafe fn new(target: *mut T, value: T) -> Self {
-  |                       --- required by a bound in this associated function
-  = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> src/lib.rs
+   |
+   |     impl<T> UnsafeOverwriteGuard<T> {
+   |          ^ required by this bound in `UnsafeOverwriteGuard::<T>::new`
+   |         #[doc(hidden)]
+   |         pub unsafe fn new(target: *mut T, value: T) -> Self {
+   |                       --- required by a bound in this associated function
+   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-    |
-9   - struct TupleStruct<T: ?Sized>(T);
-9   + struct TupleStruct<T>(T);
+   |
+11  - struct TupleStruct<T: ?Sized>(T);
+11  + struct TupleStruct<T>(T);
     |

crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs

diff --git a/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs b/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs
index e0fa25b..40b1d08 100644
--- a/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs
+++ b/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+#![allow(internal_features)]
 #![feature(unsized_fn_params)]
 
 use pin_project::pin_project;

crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr b/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
index e8e9c8c..2ce7403 100644
--- a/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
+++ b/crates/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
@@ -1,36 +1,36 @@
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:6:8
+ --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:9:8
   |
-6 | struct Struct<T: ?Sized> {
+9 | struct Struct<T: ?Sized> {
   |        ^^^^^^^-^^^^^^^^^
   |        |      |
   |        |      this type parameter needs to be `Sized`
   |        doesn't have a size known at compile-time
   |
 note: required because it appears within the type `__StructProjectionOwned<T>`
- --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:6:8
+ --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:9:8
   |
-6 | struct Struct<T: ?Sized> {
+9 | struct Struct<T: ?Sized> {
   |        ^^^^^^
   = note: the return type of a function must have a statically known size
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
   |
-6 - struct Struct<T: ?Sized> {
-6 + struct Struct<T> {
+9 - struct Struct<T: ?Sized> {
+9 + struct Struct<T> {
   |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:5:1
+ --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:8:1
   |
-5 | #[pin_project(project_replace)] //~ ERROR E0277
+8 | #[pin_project(project_replace)] //~ ERROR E0277
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-6 | struct Struct<T: ?Sized> {
+9 | struct Struct<T: ?Sized> {
   |               - this type parameter needs to be `Sized`
   |
 note: required because it appears within the type `Struct<T>`
- --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:6:8
+ --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:9:8
   |
-6 | struct Struct<T: ?Sized> {
+9 | struct Struct<T: ?Sized> {
   |        ^^^^^^
 note: required by a bound in `UnsafeOverwriteGuard::<T>::new`
  --> src/lib.rs
@@ -42,65 +42,65 @@
   |                       --- required by a bound in this associated function
   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-    |
-6   - struct Struct<T: ?Sized> {
-6   + struct Struct<T> {
+  |
+9   - struct Struct<T: ?Sized> {
+9   + struct Struct<T> {
     |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:7:5
-  |
-5 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ------------------------------- required by a bound introduced by this call
-6 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-7 |     f: T,
-  |     ^ doesn't have a size known at compile-time
-  |
-note: required by a bound in `std::ptr::read`
- --> $RUST/core/src/ptr/mod.rs
-  |
-  | pub const unsafe fn read<T>(src: *const T) -> T {
-  |                          ^ required by this bound in `read`
-help: consider removing the `?Sized` bound to make the type parameter `Sized`
-     |
-6    - struct Struct<T: ?Sized> {
-6    + struct Struct<T> {
-     |
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:11:8
+  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:10:5
    |
-11 | struct TupleStruct<T: ?Sized>(T);
+8  | #[pin_project(project_replace)] //~ ERROR E0277
+   | ------------------------------- required by a bound introduced by this call
+9  | struct Struct<T: ?Sized> {
+   |               - this type parameter needs to be `Sized`
+10 |     f: T,
+   |     ^ doesn't have a size known at compile-time
+   |
+note: required by an implicit `Sized` bound in `std::ptr::read`
+  --> $RUST/core/src/ptr/mod.rs
+   |
+   | pub const unsafe fn read<T>(src: *const T) -> T {
+   |                          ^ required by the implicit `Sized` requirement on this type parameter in `read`
+help: consider removing the `?Sized` bound to make the type parameter `Sized`
+   |
+9    - struct Struct<T: ?Sized> {
+9    + struct Struct<T> {
+     |
+
+error[E0277]: the size for values of type `T` cannot be known at compilation time
+  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:14:8
+   |
+14 | struct TupleStruct<T: ?Sized>(T);
    |        ^^^^^^^^^^^^-^^^^^^^^^
    |        |           |
    |        |           this type parameter needs to be `Sized`
    |        doesn't have a size known at compile-time
    |
 note: required because it appears within the type `__TupleStructProjectionOwned<T>`
-  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:11:8
+  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:14:8
    |
-11 | struct TupleStruct<T: ?Sized>(T);
+14 | struct TupleStruct<T: ?Sized>(T);
    |        ^^^^^^^^^^^
    = note: the return type of a function must have a statically known size
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
    |
-11 - struct TupleStruct<T: ?Sized>(T);
-11 + struct TupleStruct<T>(T);
+14 - struct TupleStruct<T: ?Sized>(T);
+14 + struct TupleStruct<T>(T);
    |
 
 error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:10:1
+  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:13:1
    |
-10 | #[pin_project(project_replace)] //~ ERROR E0277
+13 | #[pin_project(project_replace)] //~ ERROR E0277
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-11 | struct TupleStruct<T: ?Sized>(T);
+14 | struct TupleStruct<T: ?Sized>(T);
    |                    - this type parameter needs to be `Sized`
    |
 note: required because it appears within the type `TupleStruct<T>`
-  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:11:8
+  --> tests/ui/pin_project/project_replace_unsized_fn_params.rs:14:8
    |
-11 | struct TupleStruct<T: ?Sized>(T);
+14 | struct TupleStruct<T: ?Sized>(T);
    |        ^^^^^^^^^^^
 note: required by a bound in `UnsafeOverwriteGuard::<T>::new`
   --> src/lib.rs
@@ -112,7 +112,7 @@
    |                       --- required by a bound in this associated function
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider removing the `?Sized` bound to make the type parameter `Sized`
-    |
-11  - struct TupleStruct<T: ?Sized>(T);
-11  + struct TupleStruct<T>(T);
+   |
+14  - struct TupleStruct<T: ?Sized>(T);
+14  + struct TupleStruct<T>(T);
     |

crates/pin-project/tests/ui/pin_project/remove-attr-from-field.rs

diff --git a/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.rs b/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.rs
index fd14da3..ce1c6c8 100644
--- a/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.rs
+++ b/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{marker::PhantomPinned, pin::Pin};
 
 use auxiliary_macro::remove_attr;

crates/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr b/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr
index f693261..4420c08 100644
--- a/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr
+++ b/crates/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
-  --> tests/ui/pin_project/remove-attr-from-field.rs:28:38
+  --> tests/ui/pin_project/remove-attr-from-field.rs:30:38
    |
-28 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
+30 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
    |            -----------------------   ^^^ expected `Pin<&mut PhantomPinned>`, found `&mut PhantomPinned`
    |            |
    |            expected due to this
@@ -10,9 +10,9 @@
            found mutable reference `&mut PhantomPinned`
 
 error[E0308]: mismatched types
-  --> tests/ui/pin_project/remove-attr-from-field.rs:32:38
+  --> tests/ui/pin_project/remove-attr-from-field.rs:34:38
    |
-32 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
+34 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
    |            -----------------------   ^^^ expected `Pin<&mut PhantomPinned>`, found `&mut PhantomPinned`
    |            |
    |            expected due to this

crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs

diff --git a/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs b/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs
index cbe5aba..2f8865b 100644
--- a/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs
+++ b/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{marker::PhantomPinned, pin::Pin};
 
 use auxiliary_macro::remove_attr;

crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr b/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr
index 0b440dd..c05d845 100644
--- a/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr
+++ b/crates/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr
@@ -1,65 +1,65 @@
 error: #[pin_project] attribute has been removed
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:22:1
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:24:1
    |
-22 | #[pin_project] //~ ERROR has been removed
+24 | #[pin_project] //~ ERROR has been removed
    | ^^^^^^^^^^^^^^
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: cannot find attribute `pin` in this scope
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:18:7
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:20:7
    |
-18 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
+20 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
    |       ^^^
 
 error: cannot find attribute `pin` in this scope
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:11:7
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:13:7
    |
-11 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
+13 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
    |       ^^^
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:35:16
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:37:16
    |
-35 |     is_unpin::<A>(); //~ ERROR E0277
+37 |     is_unpin::<A>(); //~ ERROR E0277
    |                ^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `A`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:10:8
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:12:8
    |
-10 | struct A {
+12 | struct A {
    |        ^
 note: required by a bound in `is_unpin`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:6:16
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:8:16
    |
-6  | fn is_unpin<T: Unpin>() {}
+8  | fn is_unpin<T: Unpin>() {}
    |                ^^^^^ required by this bound in `is_unpin`
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:36:16
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:38:16
    |
-36 |     is_unpin::<B>(); //~ ERROR E0277
+38 |     is_unpin::<B>(); //~ ERROR E0277
    |                ^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `B`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:17:8
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:19:8
    |
-17 | struct B {
+19 | struct B {
    |        ^
 note: required by a bound in `is_unpin`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:6:16
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:8:16
    |
-6  | fn is_unpin<T: Unpin>() {}
+8  | fn is_unpin<T: Unpin>() {}
    |                ^^^^^ required by this bound in `is_unpin`
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:40:22
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:42:22
    |
-40 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
+42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
    |             -------- ^^^^^^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
    |             |
    |             required by a bound introduced by this call
@@ -67,29 +67,29 @@
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `A`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:10:8
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:12:8
    |
-10 | struct A {
+12 | struct A {
    |        ^
-note: required by a bound in `Pin::<P>::new`
+note: required by a bound in `Pin::<Ptr>::new`
   --> $RUST/core/src/pin.rs
    |
-   | impl<P: Deref<Target: Unpin>> Pin<P> {
-   |                       ^^^^^ required by this bound in `Pin::<P>::new`
+   | impl<Ptr: Deref<Target: Unpin>> Pin<Ptr> {
+   |                         ^^^^^ required by this bound in `Pin::<Ptr>::new`
 ...
-   |     pub const fn new(pointer: P) -> Pin<P> {
+   |     pub const fn new(pointer: Ptr) -> Pin<Ptr> {
    |                  --- required by a bound in this associated function
 
 error[E0599]: no method named `project` found for struct `Pin<&mut A>` in the current scope
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:40:30
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:42:30
    |
-40 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
+42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
    |                              ^^^^^^^ method not found in `Pin<&mut A>`
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:43:22
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:45:22
    |
-43 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
+45 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
    |             -------- ^^^^^^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
    |             |
    |             required by a bound introduced by this call
@@ -97,21 +97,21 @@
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `B`
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:17:8
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:19:8
    |
-17 | struct B {
+19 | struct B {
    |        ^
-note: required by a bound in `Pin::<P>::new`
+note: required by a bound in `Pin::<Ptr>::new`
   --> $RUST/core/src/pin.rs
    |
-   | impl<P: Deref<Target: Unpin>> Pin<P> {
-   |                       ^^^^^ required by this bound in `Pin::<P>::new`
+   | impl<Ptr: Deref<Target: Unpin>> Pin<Ptr> {
+   |                         ^^^^^ required by this bound in `Pin::<Ptr>::new`
 ...
-   |     pub const fn new(pointer: P) -> Pin<P> {
+   |     pub const fn new(pointer: Ptr) -> Pin<Ptr> {
    |                  --- required by a bound in this associated function
 
 error[E0599]: no method named `project` found for struct `Pin<&mut B>` in the current scope
-  --> tests/ui/pin_project/remove-attr-from-struct.rs:43:30
+  --> tests/ui/pin_project/remove-attr-from-struct.rs:45:30
    |
-43 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
+45 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
    |                              ^^^^^^^ method not found in `Pin<&mut B>`

crates/pin-project/tests/ui/pin_project/safe_packed_borrows.rs

diff --git a/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.rs b/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.rs
index 8ef144c..28c9202 100644
--- a/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.rs
+++ b/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![deny(renamed_and_removed_lints)]
 #![deny(safe_packed_borrows)] //~ ERROR has been renamed to `unaligned_references`
 

crates/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr b/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr
index 26e6f8d..c2db94b 100644
--- a/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr
+++ b/crates/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr
@@ -1,19 +1,19 @@
 error: lint `safe_packed_borrows` has been removed: converted into hard error, see issue #82523 <https://github.com/rust-lang/rust/issues/82523> for more information
- --> tests/ui/pin_project/safe_packed_borrows.rs:2:9
+ --> tests/ui/pin_project/safe_packed_borrows.rs:4:9
   |
-2 | #![deny(safe_packed_borrows)] //~ ERROR has been renamed to `unaligned_references`
+4 | #![deny(safe_packed_borrows)] //~ ERROR has been renamed to `unaligned_references`
   |         ^^^^^^^^^^^^^^^^^^^
   |
 note: the lint level is defined here
- --> tests/ui/pin_project/safe_packed_borrows.rs:1:9
+ --> tests/ui/pin_project/safe_packed_borrows.rs:3:9
   |
-1 | #![deny(renamed_and_removed_lints)]
+3 | #![deny(renamed_and_removed_lints)]
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0793]: reference to packed field is unaligned
-  --> tests/ui/pin_project/safe_packed_borrows.rs:21:13
+  --> tests/ui/pin_project/safe_packed_borrows.rs:23:13
    |
-21 |     let _ = &a.f;
+23 |     let _ = &a.f;
    |             ^^^^
    |
    = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses
@@ -21,9 +21,9 @@
    = help: copy the field contents to a local variable, or replace the reference with a raw pointer and use `read_unaligned`/`write_unaligned` (loads and stores via `*p` must be properly aligned even when using raw pointers)
 
 error[E0793]: reference to packed field is unaligned
-  --> tests/ui/pin_project/safe_packed_borrows.rs:24:13
+  --> tests/ui/pin_project/safe_packed_borrows.rs:26:13
    |
-24 |     let _ = &b.f;
+26 |     let _ = &b.f;
    |             ^^^^
    |
    = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses

crates/pin-project/tests/ui/pin_project/unaligned_references.rs

diff --git a/crates/pin-project/tests/ui/pin_project/unaligned_references.rs b/crates/pin-project/tests/ui/pin_project/unaligned_references.rs
index 5c7dc43..064e3ef 100644
--- a/crates/pin-project/tests/ui/pin_project/unaligned_references.rs
+++ b/crates/pin-project/tests/ui/pin_project/unaligned_references.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Refs: https://github.com/rust-lang/rust/issues/82523
 
 #[repr(packed)]

crates/pin-project/tests/ui/pin_project/unaligned_references.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/unaligned_references.stderr b/crates/pin-project/tests/ui/pin_project/unaligned_references.stderr
index 617f164..c9c9f78 100644
--- a/crates/pin-project/tests/ui/pin_project/unaligned_references.stderr
+++ b/crates/pin-project/tests/ui/pin_project/unaligned_references.stderr
@@ -1,7 +1,7 @@
 error[E0793]: reference to packed field is unaligned
-  --> tests/ui/pin_project/unaligned_references.rs:15:13
+  --> tests/ui/pin_project/unaligned_references.rs:17:13
    |
-15 |     let _ = &a.f; //~ ERROR reference to packed field is unaligned
+17 |     let _ = &a.f; //~ ERROR reference to packed field is unaligned
    |             ^^^^
    |
    = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses
@@ -9,9 +9,9 @@
    = help: copy the field contents to a local variable, or replace the reference with a raw pointer and use `read_unaligned`/`write_unaligned` (loads and stores via `*p` must be properly aligned even when using raw pointers)
 
 error[E0793]: reference to packed field is unaligned
-  --> tests/ui/pin_project/unaligned_references.rs:18:13
+  --> tests/ui/pin_project/unaligned_references.rs:20:13
    |
-18 |     let _ = &b.f; //~ ERROR reference to packed field is unaligned
+20 |     let _ = &b.f; //~ ERROR reference to packed field is unaligned
    |             ^^^^
    |
    = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses

crates/pin-project/tests/ui/pin_project/unpin_sneaky.rs

diff --git a/crates/pin-project/tests/ui/pin_project/unpin_sneaky.rs b/crates/pin-project/tests/ui/pin_project/unpin_sneaky.rs
index 3f5f32b..3a918f2 100644
--- a/crates/pin-project/tests/ui/pin_project/unpin_sneaky.rs
+++ b/crates/pin-project/tests/ui/pin_project/unpin_sneaky.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project]

crates/pin-project/tests/ui/pin_project/unpin_sneaky.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/unpin_sneaky.stderr b/crates/pin-project/tests/ui/pin_project/unpin_sneaky.stderr
index 82c2aa5..54cd8ca 100644
--- a/crates/pin-project/tests/ui/pin_project/unpin_sneaky.stderr
+++ b/crates/pin-project/tests/ui/pin_project/unpin_sneaky.stderr
@@ -1,5 +1,5 @@
 error[E0412]: cannot find type `__S` in this scope
- --> tests/ui/pin_project/unpin_sneaky.rs:9:16
-  |
-9 | impl Unpin for __S {} //~ ERROR E0412,E0321
-  |                ^^^ not found in this scope
+  --> tests/ui/pin_project/unpin_sneaky.rs:11:16
+   |
+11 | impl Unpin for __S {} //~ ERROR E0412,E0321
+   |                ^^^ not found in this scope

crates/pin-project/tests/ui/pin_project/visibility.rs

diff --git a/crates/pin-project/tests/ui/pin_project/visibility.rs b/crates/pin-project/tests/ui/pin_project/visibility.rs
index fdff5a6..fdbe91b 100644
--- a/crates/pin-project/tests/ui/pin_project/visibility.rs
+++ b/crates/pin-project/tests/ui/pin_project/visibility.rs
@@ -1,5 +1,9 @@
-/// Only named projected types can be imported.
-/// See import_unnamed.rs for unnamed projected types.
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// Only named projected types can be imported.
+// See import_unnamed.rs for unnamed projected types.
+
+#![allow(unused_imports)]
 
 mod pub_ {
     use pin_project::pin_project;
@@ -27,7 +31,6 @@
 }
 pub mod pub_use2 {
     // Ok
-    #[allow(unused_imports)]
     pub(crate) use crate::pub_::{DProj, DProjRef, RProj, RProjOwn, RProjRef};
 }
 
@@ -42,7 +45,6 @@
 }
 pub mod pub_crate_use {
     // Ok
-    #[allow(unused_imports)]
     pub(crate) use crate::pub_crate::{DProj, DProjRef, RProj, RProjOwn, RProjRef};
 }
 

crates/pin-project/tests/ui/pin_project/visibility.stderr

diff --git a/crates/pin-project/tests/ui/pin_project/visibility.stderr b/crates/pin-project/tests/ui/pin_project/visibility.stderr
index 4d1b722..57ccdf0 100644
--- a/crates/pin-project/tests/ui/pin_project/visibility.stderr
+++ b/crates/pin-project/tests/ui/pin_project/visibility.stderr
@@ -1,39 +1,39 @@
 error[E0365]: `DProj` is only public within the crate, and cannot be re-exported outside
-  --> tests/ui/pin_project/visibility.rs:15:13
+  --> tests/ui/pin_project/visibility.rs:19:13
    |
-15 |     pub use crate::pub_::DProj; //~ ERROR E0365
+19 |     pub use crate::pub_::DProj; //~ ERROR E0365
    |             ^^^^^^^^^^^^^^^^^^ re-export of crate public `DProj`
    |
    = note: consider declaring type or module `DProj` with `pub`
 
 error[E0365]: `DProjRef` is only public within the crate, and cannot be re-exported outside
-  --> tests/ui/pin_project/visibility.rs:17:13
+  --> tests/ui/pin_project/visibility.rs:21:13
    |
-17 |     pub use crate::pub_::DProjRef; //~ ERROR E0365
+21 |     pub use crate::pub_::DProjRef; //~ ERROR E0365
    |             ^^^^^^^^^^^^^^^^^^^^^ re-export of crate public `DProjRef`
    |
    = note: consider declaring type or module `DProjRef` with `pub`
 
 error[E0365]: `RProj` is only public within the crate, and cannot be re-exported outside
-  --> tests/ui/pin_project/visibility.rs:19:13
+  --> tests/ui/pin_project/visibility.rs:23:13
    |
-19 |     pub use crate::pub_::RProj; //~ ERROR E0365
+23 |     pub use crate::pub_::RProj; //~ ERROR E0365
    |             ^^^^^^^^^^^^^^^^^^ re-export of crate public `RProj`
    |
    = note: consider declaring type or module `RProj` with `pub`
 
 error[E0365]: `RProjOwn` is only public within the crate, and cannot be re-exported outside
-  --> tests/ui/pin_project/visibility.rs:21:13
+  --> tests/ui/pin_project/visibility.rs:25:13
    |
-21 |     pub use crate::pub_::RProjOwn; //~ ERROR E0365
+25 |     pub use crate::pub_::RProjOwn; //~ ERROR E0365
    |             ^^^^^^^^^^^^^^^^^^^^^ re-export of crate public `RProjOwn`
    |
    = note: consider declaring type or module `RProjOwn` with `pub`
 
 error[E0365]: `RProjRef` is only public within the crate, and cannot be re-exported outside
-  --> tests/ui/pin_project/visibility.rs:23:13
+  --> tests/ui/pin_project/visibility.rs:27:13
    |
-23 |     pub use crate::pub_::RProjRef; //~ ERROR E0365
+27 |     pub use crate::pub_::RProjRef; //~ ERROR E0365
    |             ^^^^^^^^^^^^^^^^^^^^^ re-export of crate public `RProjRef`
    |
    = note: consider declaring type or module `RProjRef` with `pub`

crates/pin-project/tests/ui/pinned_drop/call-drop-inner.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.rs b/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.rs
index 9f89942..29e15ef 100644
--- a/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr b/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr
index 277d50f..228202e 100644
--- a/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr
@@ -1,15 +1,17 @@
 error[E0061]: this function takes 0 arguments but 1 argument was supplied
-  --> tests/ui/pinned_drop/call-drop-inner.rs:13:9
+  --> tests/ui/pinned_drop/call-drop-inner.rs:15:9
    |
-13 |         __drop_inner(__self);
-   |         ^^^^^^^^^^^^ ------
-   |                      |
-   |                      unexpected argument of type `Pin<&mut Struct>`
-   |                      help: remove the extra argument
+15 |         __drop_inner(__self);
+   |         ^^^^^^^^^^^^ ------ unexpected argument of type `Pin<&mut Struct>`
    |
 note: function defined here
-  --> tests/ui/pinned_drop/call-drop-inner.rs:10:1
+  --> tests/ui/pinned_drop/call-drop-inner.rs:12:1
    |
-10 | #[pinned_drop]
+12 | #[pinned_drop]
    | ^^^^^^^^^^^^^^
    = note: this error originates in the attribute macro `pinned_drop` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: remove the extra argument
+   |
+15 -         __drop_inner(__self);
+15 +         __drop_inner();
+   |

crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs b/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs
index 23d756d..fb3b15d 100644
--- a/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr b/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr
index 837b1db..e265663 100644
--- a/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr
@@ -1,31 +1,34 @@
 error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented for does not
-  --> tests/ui/pinned_drop/conditional-drop-impl.rs:11:9
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:13:9
    |
-11 | impl<T: Unpin> Drop for DropImpl<T> {
+13 | impl<T: Unpin> Drop for DropImpl<T> {
    |         ^^^^^
    |
 note: the implementor must specify the same requirement
-  --> tests/ui/pinned_drop/conditional-drop-impl.rs:7:1
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:9:1
    |
-7  | struct DropImpl<T> {
+9  | struct DropImpl<T> {
    | ^^^^^^^^^^^^^^^^^^
 
 error[E0277]: `T` cannot be unpinned
-  --> tests/ui/pinned_drop/conditional-drop-impl.rs:16:15
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:18:15
    |
-16 | #[pin_project(PinnedDrop)] //~ ERROR E0277
+18 | #[pin_project(PinnedDrop)] //~ ERROR E0277
    |               ^^^^^^^^^^ the trait `Unpin` is not implemented for `T`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required for `PinnedDropImpl<T>` to implement `PinnedDrop`
-  --> tests/ui/pinned_drop/conditional-drop-impl.rs:23:16
+  --> tests/ui/pinned_drop/conditional-drop-impl.rs:25:16
    |
-23 | impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
+24 | #[pinned_drop]
+   | -------------- in this procedural macro expansion
+25 | impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
    |         -----  ^^^^^^^^^^     ^^^^^^^^^^^^^^^^^
    |         |
    |         unsatisfied trait bound introduced here
-help: consider restricting type parameter `T`
+   = note: this error originates in the attribute macro `pinned_drop` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider restricting type parameter `T` with trait `Unpin`
    |
-17 | struct PinnedDropImpl<T: std::marker::Unpin> {
+19 | struct PinnedDropImpl<T: std::marker::Unpin> {
    |                        ++++++++++++++++++++

crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs b/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs
index e31f46f..aea738a 100644
--- a/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(PinnedDrop)] //~ ERROR E0277

crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr b/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
index ef8a7bf..3e98a11 100644
--- a/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `Struct: PinnedDrop` is not satisfied
- --> tests/ui/pinned_drop/forget-pinned-drop-impl.rs:3:15
+ --> tests/ui/pinned_drop/forget-pinned-drop-impl.rs:5:15
   |
-3 | #[pin_project(PinnedDrop)] //~ ERROR E0277
+5 | #[pin_project(PinnedDrop)] //~ ERROR E0277
   |               ^^^^^^^^^^ the trait `PinnedDrop` is not implemented for `Struct`

crates/pin-project/tests/ui/pinned_drop/invalid-self.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/invalid-self.rs b/crates/pin-project/tests/ui/pinned_drop/invalid-self.rs
index 783167f..da22ff8 100644
--- a/crates/pin-project/tests/ui/pinned_drop/invalid-self.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/invalid-self.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // by-ref binding `ref (mut) self` and sub-patterns `@` are not allowed in receivers (rejected by rustc).
 
 use std::pin::Pin;

crates/pin-project/tests/ui/pinned_drop/invalid-self.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/invalid-self.stderr b/crates/pin-project/tests/ui/pinned_drop/invalid-self.stderr
index 464be5e..16d8725 100644
--- a/crates/pin-project/tests/ui/pinned_drop/invalid-self.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/invalid-self.stderr
@@ -1,25 +1,25 @@
 error: expected identifier, found keyword `self`
- --> tests/ui/pinned_drop/invalid-self.rs:8:26
-  |
-8 |     fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                          ^^^^ expected identifier, found keyword
+  --> tests/ui/pinned_drop/invalid-self.rs:10:26
+   |
+10 |     fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
+   |                          ^^^^ expected identifier, found keyword
 
 error: expected identifier, found keyword `self`
- --> tests/ui/pinned_drop/invalid-self.rs:9:34
-  |
-9 |     fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                                  ^^^^ expected identifier, found keyword
+  --> tests/ui/pinned_drop/invalid-self.rs:11:34
+   |
+11 |     fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
+   |                                  ^^^^ expected identifier, found keyword
 
 error: expected parameter name, found `@`
-  --> tests/ui/pinned_drop/invalid-self.rs:11:25
+  --> tests/ui/pinned_drop/invalid-self.rs:13:25
    |
-11 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
+13 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
    |                         ^ expected parameter name
 
 error: expected one of `)`, `,`, or `:`, found `@`
-  --> tests/ui/pinned_drop/invalid-self.rs:11:25
+  --> tests/ui/pinned_drop/invalid-self.rs:13:25
    |
-11 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
+13 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
    |                        -^ expected one of `)`, `,`, or `:`
    |                        |
    |                        help: missing `,`

crates/pin-project/tests/ui/pinned_drop/invalid.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/invalid.rs b/crates/pin-project/tests/ui/pinned_drop/invalid.rs
index b2c2526..de4f932 100644
--- a/crates/pin-project/tests/ui/pinned_drop/invalid.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/invalid.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 mod argument {
     use std::pin::Pin;
 

crates/pin-project/tests/ui/pinned_drop/invalid.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/invalid.stderr b/crates/pin-project/tests/ui/pinned_drop/invalid.stderr
index 264def0..258c728 100644
--- a/crates/pin-project/tests/ui/pinned_drop/invalid.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/invalid.stderr
@@ -1,143 +1,143 @@
 error: unexpected argument: `foo`
- --> tests/ui/pinned_drop/invalid.rs:9:19
-  |
-9 |     #[pinned_drop(foo)] //~ ERROR unexpected argument
-  |                   ^^^
+  --> tests/ui/pinned_drop/invalid.rs:11:19
+   |
+11 |     #[pinned_drop(foo)] //~ ERROR unexpected argument
+   |                   ^^^
 
 error: duplicate #[pinned_drop] attribute
-  --> tests/ui/pinned_drop/invalid.rs:30:5
+  --> tests/ui/pinned_drop/invalid.rs:32:5
    |
-30 |     #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
+32 |     #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
    |     ^^^^^^^^^^^^^^
 
 error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> tests/ui/pinned_drop/invalid.rs:43:10
+  --> tests/ui/pinned_drop/invalid.rs:45:10
    |
-43 |     impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
+45 |     impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
    |          ^^^^
 
 error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> tests/ui/pinned_drop/invalid.rs:49:10
+  --> tests/ui/pinned_drop/invalid.rs:51:10
    |
-49 |     impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
+51 |     impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
    |          ^^^^^^^^^^^^
 
 error: expected `impl`
-  --> tests/ui/pinned_drop/invalid.rs:52:5
+  --> tests/ui/pinned_drop/invalid.rs:54:5
    |
-52 |     fn func(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
+54 |     fn func(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
    |     ^^
 
 error: implementing the trait `PinnedDrop` is not unsafe
-  --> tests/ui/pinned_drop/invalid.rs:62:5
+  --> tests/ui/pinned_drop/invalid.rs:64:5
    |
-62 |     unsafe impl PinnedDrop for Impl {
+64 |     unsafe impl PinnedDrop for Impl {
    |     ^^^^^^
 
 error: implementing the method `drop` is not unsafe
-  --> tests/ui/pinned_drop/invalid.rs:72:9
+  --> tests/ui/pinned_drop/invalid.rs:74:9
    |
-72 |         unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
+74 |         unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
    |         ^^^^^^
 
 error: not all trait items implemented, missing: `drop`
-  --> tests/ui/pinned_drop/invalid.rs:83:5
+  --> tests/ui/pinned_drop/invalid.rs:85:5
    |
-83 |     impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
+85 |     impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: const `A` is not a member of trait `PinnedDrop`
-  --> tests/ui/pinned_drop/invalid.rs:90:9
+  --> tests/ui/pinned_drop/invalid.rs:92:9
    |
-90 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
+92 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
    |         ^^^^^^^^^^^^^^^^
 
 error: const `A` is not a member of trait `PinnedDrop`
-   --> tests/ui/pinned_drop/invalid.rs:100:9
+   --> tests/ui/pinned_drop/invalid.rs:102:9
     |
-100 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
+102 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
     |         ^^^^^^^^^^^^^^^^
 
 error: type `A` is not a member of trait `PinnedDrop`
-   --> tests/ui/pinned_drop/invalid.rs:108:9
+   --> tests/ui/pinned_drop/invalid.rs:110:9
     |
-108 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
+110 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
     |         ^^^^^^^^^^^^
 
 error: type `A` is not a member of trait `PinnedDrop`
-   --> tests/ui/pinned_drop/invalid.rs:118:9
+   --> tests/ui/pinned_drop/invalid.rs:120:9
     |
-118 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
+120 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
     |         ^^^^^^^^^^^^
 
 error: duplicate definitions with name `drop`
-   --> tests/ui/pinned_drop/invalid.rs:127:9
+   --> tests/ui/pinned_drop/invalid.rs:129:9
     |
-127 |         fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
+129 |         fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: method `drop` must return the unit type
-   --> tests/ui/pinned_drop/invalid.rs:149:42
+   --> tests/ui/pinned_drop/invalid.rs:151:42
     |
-149 |         fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
+151 |         fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
     |                                          ^^^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:157:16
+   --> tests/ui/pinned_drop/invalid.rs:159:16
     |
-157 |         fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+159 |         fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                ^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:165:17
+   --> tests/ui/pinned_drop/invalid.rs:167:17
     |
-165 |         fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+167 |         fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:173:17
+   --> tests/ui/pinned_drop/invalid.rs:175:17
     |
-173 |         fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+175 |         fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                 ^^^^^^^^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:181:17
+   --> tests/ui/pinned_drop/invalid.rs:183:17
     |
-181 |         fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+183 |         fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                 ^^^^^^^^^^^^^^^^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:189:17
+   --> tests/ui/pinned_drop/invalid.rs:191:17
     |
-189 |         fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+191 |         fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                 ^^^^^^^^^^^^^^^^
 
 error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> tests/ui/pinned_drop/invalid.rs:197:17
+   --> tests/ui/pinned_drop/invalid.rs:199:17
     |
-197 |         fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
+199 |         fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
     |                 ^^^^^^^^^^^^^^^^^^
 
 error: method `pinned_drop` is not a member of trait `PinnedDrop
-   --> tests/ui/pinned_drop/invalid.rs:205:12
+   --> tests/ui/pinned_drop/invalid.rs:207:12
     |
-205 |         fn pinned_drop(self: Pin<&mut Self>) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
+207 |         fn pinned_drop(self: Pin<&mut Self>) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
     |            ^^^^^^^^^^^
 
 error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> tests/ui/pinned_drop/invalid.rs:213:25
+   --> tests/ui/pinned_drop/invalid.rs:215:25
     |
-213 |     impl PinnedDrop for () {
+215 |     impl PinnedDrop for () {
     |                         ^^
 
 error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> tests/ui/pinned_drop/invalid.rs:219:25
+   --> tests/ui/pinned_drop/invalid.rs:221:25
     |
-219 |     impl PinnedDrop for &mut A {
+221 |     impl PinnedDrop for &mut A {
     |                         ^^^^^^
 
 error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> tests/ui/pinned_drop/invalid.rs:225:25
+   --> tests/ui/pinned_drop/invalid.rs:227:25
     |
-225 |     impl PinnedDrop for [A] {
+227 |     impl PinnedDrop for [A] {
     |                         ^^^

crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs b/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs
index 391f290..ac8872c 100644
--- a/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr b/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr
index a07ba99..81b5d7a 100644
--- a/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr
@@ -1,8 +1,8 @@
 error[E0119]: conflicting implementations of trait `PinnedDrop` for type `S`
-  --> tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs:12:1
+  --> tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs:14:1
    |
-5  | #[pin_project]
+7  | #[pin_project]
    | -------------- first implementation here
 ...
-12 | impl PinnedDrop for S {
+14 | impl PinnedDrop for S {
    | ^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `S`

crates/pin-project/tests/ui/pinned_drop/self.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/self.rs b/crates/pin-project/tests/ui/pinned_drop/self.rs
index ff63402..ae74d90 100644
--- a/crates/pin-project/tests/ui/pinned_drop/self.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/self.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 pub mod self_in_macro_def {
     use std::pin::Pin;
 

crates/pin-project/tests/ui/pinned_drop/self.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/self.stderr b/crates/pin-project/tests/ui/pinned_drop/self.stderr
index ad506a5..a604b50 100644
--- a/crates/pin-project/tests/ui/pinned_drop/self.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/self.stderr
@@ -1,42 +1,42 @@
 error: `self` parameter is only allowed in associated functions
-  --> tests/ui/pinned_drop/self.rs:18:26
+  --> tests/ui/pinned_drop/self.rs:20:26
    |
-18 |                     fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
+20 |                     fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
    |                          ^^^^ not semantically valid as function parameter
 ...
-21 |             t!();
+23 |             t!();
    |             ---- in this macro invocation
    |
    = note: associated functions are those in `impl` or `trait` definitions
    = note: this error originates in the macro `t` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0434]: can't capture dynamic environment in a fn item
-  --> tests/ui/pinned_drop/self.rs:16:29
+  --> tests/ui/pinned_drop/self.rs:18:29
    |
-16 |                     let _ = self; //~ ERROR E0434
+18 |                     let _ = self; //~ ERROR E0434
    |                             ^^^^
 ...
-21 |             t!();
+23 |             t!();
    |             ---- in this macro invocation
    |
    = help: use the `|| { ... }` closure form instead
    = note: this error originates in the macro `t` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0423]: expected value, found struct `S`
-  --> tests/ui/pinned_drop/self.rs:40:27
+  --> tests/ui/pinned_drop/self.rs:42:27
    |
-32 | /     pub struct S {
-33 | |         f: (),
-34 | |     }
+34 | /     pub struct S {
+35 | |         f: (),
+36 | |     }
    | |_____- `S` defined here
 ...
-40 |               let _: Self = Self; //~ ERROR E0423
+42 |               let _: Self = Self; //~ ERROR E0423
    |                             ^^^^ help: use struct literal syntax instead: `S { f: val }`
 
 error[E0308]: mismatched types
-  --> tests/ui/pinned_drop/self.rs:39:25
+  --> tests/ui/pinned_drop/self.rs:41:25
    |
-39 |             let _: () = self; //~ ERROR E0308
+41 |             let _: () = self; //~ ERROR E0308
    |                    --   ^^^^ expected `()`, found `Pin<&mut S>`
    |                    |
    |                    expected due to this
@@ -45,9 +45,9 @@
                  found struct `Pin<&mut self_span::S>`
 
 error[E0308]: mismatched types
-  --> tests/ui/pinned_drop/self.rs:52:25
+  --> tests/ui/pinned_drop/self.rs:54:25
    |
-52 |             let _: () = self; //~ ERROR E0308
+54 |             let _: () = self; //~ ERROR E0308
    |                    --   ^^^^ expected `()`, found `Pin<&mut E>`
    |                    |
    |                    expected due to this
@@ -56,7 +56,12 @@
                  found struct `Pin<&mut E>`
 
 error[E0533]: expected value, found struct variant `E::V`
-  --> tests/ui/pinned_drop/self.rs:53:27
+  --> tests/ui/pinned_drop/self.rs:55:27
    |
-53 |             let _: Self = Self::V; //~ ERROR E0533
+55 |             let _: Self = Self::V; //~ ERROR E0533
    |                           ^^^^^^^ not a value
+   |
+help: you might have meant to create a new value of the struct
+   |
+55 |             let _: Self = Self::V { f: /* value */ }; //~ ERROR E0533
+   |                                   ++++++++++++++++++

crates/pin-project/tests/ui/pinned_drop/unsafe-call.rs

diff --git a/crates/pin-project/tests/ui/pinned_drop/unsafe-call.rs b/crates/pin-project/tests/ui/pinned_drop/unsafe-call.rs
index 3ee2b56..0007202 100644
--- a/crates/pin-project/tests/ui/pinned_drop/unsafe-call.rs
+++ b/crates/pin-project/tests/ui/pinned_drop/unsafe-call.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::pin::Pin;
 
 use pin_project::{pin_project, pinned_drop};

crates/pin-project/tests/ui/pinned_drop/unsafe-call.stderr

diff --git a/crates/pin-project/tests/ui/pinned_drop/unsafe-call.stderr b/crates/pin-project/tests/ui/pinned_drop/unsafe-call.stderr
index 911a58e..f0aa44e 100644
--- a/crates/pin-project/tests/ui/pinned_drop/unsafe-call.stderr
+++ b/crates/pin-project/tests/ui/pinned_drop/unsafe-call.stderr
@@ -1,10 +1,10 @@
-error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
-  --> tests/ui/pinned_drop/unsafe-call.rs:14:9
+error[E0133]: call to unsafe function `Pin::<&'a mut T>::get_unchecked_mut` is unsafe and requires unsafe function or block
+  --> tests/ui/pinned_drop/unsafe-call.rs:16:9
    |
-11 | #[pinned_drop]
+13 | #[pinned_drop]
    | -------------- items do not inherit unsafety from separate enclosing items
 ...
-14 |         self.project().f.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
+16 |         self.project().f.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
    |
    = note: consult the function's documentation for information on how to avoid undefined behavior

crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs

diff --git a/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs b/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs
index ac9d1f8..a3c9008 100644
--- a/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs
+++ b/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use pin_project::pin_project;
 
 #[pin_project(UnsafeUnpin)] //~ ERROR E0119

crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr

diff --git a/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr b/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr
index cdf0d50..6838c5d 100644
--- a/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr
+++ b/crates/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr
@@ -1,32 +1,26 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<_, _>`
-  --> tests/ui/unsafe_unpin/conflict-unpin.rs:3:15
+  --> tests/ui/unsafe_unpin/conflict-unpin.rs:5:15
    |
-3  | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
+5  | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
    |               ^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
 ...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | ------------------------------ first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `_::_pin_project::UnsafeUnpin` for type `_::_pin_project::__private::Wrapper<'_, Foo<_, _>>` in future versions
+12 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
+   | --------------------------------------------- first implementation here
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Bar<_, _>`
-  --> tests/ui/unsafe_unpin/conflict-unpin.rs:12:15
+  --> tests/ui/unsafe_unpin/conflict-unpin.rs:14:15
    |
-12 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
+14 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
    |               ^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
 ...
-19 | impl<T, U> Unpin for Bar<T, U> {}
+21 | impl<T, U> Unpin for Bar<T, U> {}
    | ------------------------------ first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `_::_pin_project::UnsafeUnpin` for type `_::_pin_project::__private::Wrapper<'_, Bar<_, _>>` in future versions
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Baz<_, _>`
-  --> tests/ui/unsafe_unpin/conflict-unpin.rs:21:15
+  --> tests/ui/unsafe_unpin/conflict-unpin.rs:23:15
    |
-21 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
+23 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
    |               ^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
 ...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
+30 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
    | -------------------------------------------- first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `_::_pin_project::UnsafeUnpin` for type `_::_pin_project::__private::Wrapper<'_, Baz<_, _>>` in future versions

crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.rs

diff --git a/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.rs b/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.rs
new file mode 100644
index 0000000..88faacc
--- /dev/null
+++ b/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+// https://github.com/taiki-e/pin-project/issues/340#issuecomment-2428002670
+
+#[pin_project::pin_project(UnsafeUnpin)]
+struct Foo<Pinned, Unpinned> {
+    #[pin]
+    pinned: Pinned,
+    unpinned: Unpinned,
+}
+
+unsafe impl<Pinned: Unpin, Unpinned> pin_project::UnsafeUnpin for Foo<Pinned, Unpinned> {}
+
+struct MyPhantomPinned(::core::marker::PhantomPinned);
+impl Unpin for MyPhantomPinned where for<'cursed> str: Sized {}
+impl Unpin for Foo<MyPhantomPinned, ()> {}
+
+fn is_unpin<T: Unpin>() {}
+
+fn main() {
+    is_unpin::<Foo<MyPhantomPinned, ()>>()
+}

crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.stderr

diff --git a/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.stderr b/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.stderr
new file mode 100644
index 0000000..ac81ad6
--- /dev/null
+++ b/crates/pin-project/tests/ui/unsafe_unpin/negative_impls_stable.stderr
@@ -0,0 +1,8 @@
+error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhantomPinned, ()>`
+  --> tests/ui/unsafe_unpin/negative_impls_stable.rs:5:28
+   |
+5  | #[pin_project::pin_project(UnsafeUnpin)]
+   |                            ^^^^^^^^^^^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
+...
+16 | impl Unpin for Foo<MyPhantomPinned, ()> {}
+   | --------------------------------------- first implementation here

crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs
index 542250b..ca3422d 100644
--- a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs
+++ b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'marker_trait_attr.rs' at the same time.
 
 use std::marker::PhantomPinned;

crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr
index fcb9185..b9873ca 100644
--- a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr
@@ -1,10 +1,10 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Struct<_>`
-  --> tests/ui/unstable-features/marker_trait_attr-feature-gate.rs:7:1
+  --> tests/ui/unstable-features/marker_trait_attr-feature-gate.rs:9:1
    |
-7  | #[pin_project] //~ ERROR E0119
+9  | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
 ...
-14 | impl<T> Unpin for Struct<T> {}
+16 | impl<T> Unpin for Struct<T> {}
    | --------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/unstable-features/marker_trait_attr.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.rs b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.rs
index 9c8e664..ab00a4e 100644
--- a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.rs
+++ b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'marker_trait_attr-feature-gate.rs' at the same time.
 
 // marker_trait_attr

crates/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr
index 85949d5..e0ad021 100644
--- a/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr
@@ -1,10 +1,10 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Struct<_>`
-  --> tests/ui/unstable-features/marker_trait_attr.rs:13:1
+  --> tests/ui/unstable-features/marker_trait_attr.rs:15:1
    |
-13 | #[pin_project] //~ ERROR E0119
+15 | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
 ...
-20 | impl<T> Unpin for Struct<T> {}
+22 | impl<T> Unpin for Struct<T> {}
    | --------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/unstable-features/negative_impls.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/negative_impls.rs b/crates/pin-project/tests/ui/unstable-features/negative_impls.rs
index 9605642..db29d6c 100644
--- a/crates/pin-project/tests/ui/unstable-features/negative_impls.rs
+++ b/crates/pin-project/tests/ui/unstable-features/negative_impls.rs
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #![feature(negative_impls)]
-#![deny(suspicious_auto_trait_impls)]
 
 // https://rust-lang.zulipchat.com/#narrow/stream/213817-t-lang/topic/design.20meeting.3A.20backlog.20bonanza/near/269471299
 // https://github.com/taiki-e/pin-project/issues/340
@@ -8,7 +9,6 @@
 struct Foo<Pinned, Unpinned> {
     #[pin]
     pinned: Pinned,
-
     unpinned: Unpinned,
 }
 

crates/pin-project/tests/ui/unstable-features/negative_impls.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/negative_impls.stderr b/crates/pin-project/tests/ui/unstable-features/negative_impls.stderr
index 145716d..57f2d30 100644
--- a/crates/pin-project/tests/ui/unstable-features/negative_impls.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/negative_impls.stderr
@@ -1,19 +1,10 @@
-error: cross-crate traits with a default impl, like `Unpin`, should not be specialized
-  --> tests/ui/unstable-features/negative_impls.rs:17:1
-   |
-17 | impl Unpin for Foo<MyPhantomPinned, ()> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = warning: this will change its meaning in a future release!
-   = note: for more information, see issue #93367 <https://github.com/rust-lang/rust/issues/93367>
-   = note: `MyPhantomPinned` is not a generic parameter
-note: try using the same sequence of generic parameters as the struct definition
+error[E0119]: conflicting implementations of trait `Unpin` for type `Foo<MyPhantomPinned, ()>`
   --> tests/ui/unstable-features/negative_impls.rs:8:1
    |
-8  | struct Foo<Pinned, Unpinned> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-note: the lint level is defined here
-  --> tests/ui/unstable-features/negative_impls.rs:2:9
+8  | #[pin_project::pin_project]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<MyPhantomPinned, ()>`
+...
+17 | impl Unpin for Foo<MyPhantomPinned, ()> {}
+   | --------------------------------------- first implementation here
    |
-2  | #![deny(suspicious_auto_trait_impls)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs
index 012c870..8d479fa 100644
--- a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs
+++ b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'overlapping_marker_traits.rs' at the same time.
 
 use std::marker::PhantomPinned;

crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr
index 0783be0..da273fc 100644
--- a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr
@@ -1,10 +1,10 @@
 error[E0119]: conflicting implementations of trait `Unpin` for type `Struct<_>`
-  --> tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs:7:1
+  --> tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs:9:1
    |
-7  | #[pin_project] //~ ERROR E0119
+9  | #[pin_project] //~ ERROR E0119
    | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
 ...
-14 | impl<T> Unpin for Struct<T> {}
+16 | impl<T> Unpin for Struct<T> {}
    | --------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs
index 8dc27c1..2677e0a 100644
--- a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs
+++ b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'overlapping_marker_traits-feature-gate.rs' at the same time.
 
 // This feature could break the guarantee for Unpin provided by pin-project,

crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr
index 1c8e7e7..279484f 100644
--- a/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr
@@ -1,18 +1,18 @@
 error[E0557]: feature has been removed
-  --> tests/ui/unstable-features/overlapping_marker_traits.rs:11:12
+  --> tests/ui/unstable-features/overlapping_marker_traits.rs:13:12
    |
-11 | #![feature(overlapping_marker_traits)]
+13 | #![feature(overlapping_marker_traits)]
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^ feature has been removed
    |
    = note: removed in favor of `#![feature(marker_trait_attr)]`
 
 error[E0119]: conflicting implementations of trait `Unpin` for type `Struct<_>`
-  --> tests/ui/unstable-features/overlapping_marker_traits.rs:17:1
+  --> tests/ui/unstable-features/overlapping_marker_traits.rs:19:1
    |
-17 | #[pin_project]
+19 | #[pin_project]
    | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
 ...
-24 | impl<T> Unpin for Struct<T> {}
+26 | impl<T> Unpin for Struct<T> {}
    | --------------------------- first implementation here
    |
    = note: this error originates in the derive macro `::pin_project::__private::__PinProjectInternalDerive` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs b/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs
index f8467b0..e13f8df 100644
--- a/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs
+++ b/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'trivial_bounds.rs' at the same time.
 
 mod phantom_pinned {

crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr b/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr
index ccf1ae8..69ddca6 100644
--- a/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr
@@ -1,63 +1,75 @@
 error[E0277]: `PhantomPinned` cannot be unpinned
- --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:8:28
-  |
-8 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-  |                            ^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-  |
-  = note: consider using the `pin!` macro
-          consider using `Box::pin` if you need to access the pinned value outside of the current scope
-  = help: see issue #48214
-  = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:10:28
+   |
+10 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
+   |                            ^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
+   |
+   = note: consider using the `pin!` macro
+           consider using `Box::pin` if you need to access the pinned value outside of the current scope
+   = help: see issue #48214
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+   |
+5  + #![feature(trivial_bounds)]
+   |
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:16:28
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:18:28
    |
-16 |     impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
+18 |     impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required for `phantom_pinned::Wrapper<PhantomPinned>` to implement `Unpin`
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:12:13
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:14:13
    |
-12 |     impl<T> Unpin for Wrapper<T> where T: Unpin {}
+14 |     impl<T> Unpin for Wrapper<T> where T: Unpin {}
    |             ^^^^^     ^^^^^^^^^^          ----- unsatisfied trait bound introduced here
    = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+   |
+5  + #![feature(trivial_bounds)]
+   |
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:34:28
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:36:28
    |
-34 |     impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
+36 |     impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
    |                            ^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `Inner`
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:30:12
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:32:12
    |
-30 |     struct Inner(PhantomPinned);
+32 |     struct Inner(PhantomPinned);
    |            ^^^^^
    = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+   |
+5  + #![feature(trivial_bounds)]
+   |
 
 error[E0277]: `PhantomPinned` cannot be unpinned
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:42:28
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:44:28
    |
-42 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
+44 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
    |                            ^^^^^^^^^^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
    |
    = note: consider using the `pin!` macro
            consider using `Box::pin` if you need to access the pinned value outside of the current scope
 note: required because it appears within the type `Inner`
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:30:12
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:32:12
    |
-30 |     struct Inner(PhantomPinned);
+32 |     struct Inner(PhantomPinned);
    |            ^^^^^
 note: required for `inner::Wrapper<Inner>` to implement `Unpin`
-  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:38:13
+  --> tests/ui/unstable-features/trivial_bounds-feature-gate.rs:40:13
    |
-38 |     impl<T> Unpin for Wrapper<T> where T: Unpin {}
+40 |     impl<T> Unpin for Wrapper<T> where T: Unpin {}
    |             ^^^^^     ^^^^^^^^^^          ----- unsatisfied trait bound introduced here
    = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+   |
+5  + #![feature(trivial_bounds)]
+   |

crates/pin-project/tests/ui/unstable-features/trivial_bounds.rs

diff --git a/crates/pin-project/tests/ui/unstable-features/trivial_bounds.rs b/crates/pin-project/tests/ui/unstable-features/trivial_bounds.rs
index d98ef60..b4d377f 100644
--- a/crates/pin-project/tests/ui/unstable-features/trivial_bounds.rs
+++ b/crates/pin-project/tests/ui/unstable-features/trivial_bounds.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // Note: If you change this test, change 'trivial_bounds-feature-gate.rs' at the same time.
 
 // trivial_bounds

crates/pin-project/tests/ui/unstable-features/trivial_bounds.stderr

diff --git a/crates/pin-project/tests/ui/unstable-features/trivial_bounds.stderr b/crates/pin-project/tests/ui/unstable-features/trivial_bounds.stderr
index ab07a10..d5b0720 100644
--- a/crates/pin-project/tests/ui/unstable-features/trivial_bounds.stderr
+++ b/crates/pin-project/tests/ui/unstable-features/trivial_bounds.stderr
@@ -1,23 +1,23 @@
 error: trait bound PhantomPinned: Unpin does not depend on any type or lifetime parameters
-  --> tests/ui/unstable-features/trivial_bounds.rs:16:43
+  --> tests/ui/unstable-features/trivial_bounds.rs:18:43
    |
-16 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
+18 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
    |                                           ^^^^^
    |
 note: the lint level is defined here
-  --> tests/ui/unstable-features/trivial_bounds.rs:6:9
+  --> tests/ui/unstable-features/trivial_bounds.rs:8:9
    |
-6  | #![deny(trivial_bounds)]
+8  | #![deny(trivial_bounds)]
    |         ^^^^^^^^^^^^^^
 
 error: trait bound Inner: Unpin does not depend on any type or lifetime parameters
-  --> tests/ui/unstable-features/trivial_bounds.rs:20:35
+  --> tests/ui/unstable-features/trivial_bounds.rs:22:35
    |
-20 |     impl Unpin for B where Inner: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
+22 |     impl Unpin for B where Inner: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
    |                                   ^^^^^
 
 error: trait bound Wrapper<Inner>: Unpin does not depend on any type or lifetime parameters
-  --> tests/ui/unstable-features/trivial_bounds.rs:28:44
+  --> tests/ui/unstable-features/trivial_bounds.rs:30:44
    |
-28 |     impl Unpin for C where Wrapper<Inner>: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
+30 |     impl Unpin for C where Wrapper<Inner>: Unpin {} //~ ERROR Unpin does not depend on any type or lifetime parameters
    |                                            ^^^^^

crates/pin-project/tests/unsafe_unpin.rs

diff --git a/crates/pin-project/tests/unsafe_unpin.rs b/crates/pin-project/tests/unsafe_unpin.rs
index 72f40f9..329acf3 100644
--- a/crates/pin-project/tests/unsafe_unpin.rs
+++ b/crates/pin-project/tests/unsafe_unpin.rs
@@ -1,5 +1,6 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+#![allow(dead_code, clippy::undocumented_unsafe_blocks)]
 
 #[macro_use]
 mod auxiliary;
@@ -9,7 +10,7 @@
 use pin_project::{pin_project, UnsafeUnpin};
 
 #[pin_project(UnsafeUnpin)]
-pub struct Blah<T, U> {
+struct Blah<T, U> {
     f1: U,
     #[pin]
     f2: T,
@@ -41,7 +42,7 @@
 #[test]
 fn trivial_bounds() {
     #[pin_project(UnsafeUnpin)]
-    pub struct NotImplementUnsafeUnpin {
+    struct NotImplementUnsafeUnpin {
         #[pin]
         f: PhantomPinned,
     }

crates/plotters/.android-checksum.json

diff --git a/crates/plotters/.android-checksum.json b/crates/plotters/.android-checksum.json
index fc7579e..0473102 100644
--- a/crates/plotters/.android-checksum.json
+++ b/crates/plotters/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"3968dbca2d6b420f5ac4ad3030b43b3c4c82cbb14385c44bb834289d819fefb3","Android.bp":"19fdb3d434dd247804071b0bad2cc2df749abc803a22ff3f13b4afb16d93e9f3","Cargo.lock":"ac2d23710ae5ed7370f99bed6bd4a6e7932eed4d38e51ede704870a7d0190c0c","Cargo.toml":"6323ed91e19a1f9c57bdfd4f9d85124aae512cc370dc9f35d0314f9d8fd2125a","LICENSE":"1c9a706701fabb4345eddbdf9e1b9b60668d05f9df8e0ec9bf4b6e08a15c4e33","METADATA":"86d6bdcb6ca97db95a331592db8f125ad127b98a71d810a9f06cd97702e651e8","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"2d4a3d7185716d3dbbae2317498f3cd97b4a5bf2d3a07fa284041c2273315492","TEST_MAPPING":"5df47f5b5b7533d10aa6a3ecb9189615e716a8060f002faa2bf4c893c12f33f9","benches/benches/data.rs":"0bfcf2e2c7c376a0fa986abc2e71b9c78f8f8fd03bbab9cc0a9c15936b7a3083","benches/benches/mod.rs":"a57d9a364956c0ee9a52b2e99bb0a35dc78bd63f8657d7e486b47ec5a0e9cec6","benches/main.rs":"18a1afab41bdadf925679f34a11b0858ea2dbad1af2ad38dbfda238272adb8af","cargo_embargo.json":"99524d6d57989d4d543b34005291e66d1d1d4f57c059fa9c9aa4ac1b3f003ece","clippy.toml":"6ca80d8bb9a1d6bac1bb4221f9533b5285ba849e0e90d11c866ef556899d1b69","examples/3d-plot.rs":"daf39f69c225c30bccea7bb2f66f2ff4512d8996b537e8dfe6911cdbc2a5d369","examples/3d-plot2.rs":"a4bc84ac42bbc1a3485ee4b1a1bbfb69c59c68cea1999a0713243ea18accf32c","examples/README.md":"f11d8f334296d987ab480fd29ef72a63bbd2952f73b100d66bbf90dc5fcfcc1c","examples/animation.rs":"bf16dc699d46ebf98f6038cf3f3e0064bbb7864279b6eb5af84546f7ec58042f","examples/area-chart.rs":"d38e494f55a1793d256b3d1c9dc044ba5992f80c9ddd2ea563d03a4edda1deca","examples/blit-bitmap.rs":"c8d1345072e95441fd6fe0714394d492d59cf687667cab9d83a98d024add00a3","examples/boxplot.rs":"56d064372b60abfdf88cde0c38e848116f2aca98c37a09493b25e740e21dc935","examples/chart.rs":"d80c49abd7fa7e36b67ebe2c6b1c7987013e0ac43671ae3f27beb64552cd6a45","examples/colormaps.rs":"818d7e93c30fa790b46b8b1c87f0b2aec9e922ec9468694d7523b3f601a5e7a7","examples/console.rs":"2f55d02658d19fff1a484b9bcc50ca7a317205cb7c6caacdce1a347ec7e088b3","examples/customized_coord.rs":"d4f52703664ee9ee6b56fbc2d8d7f7be114359e2621c19368ed212b4b5b6e046","examples/errorbar.rs":"5d39eae0cce741a16ae1cfe3e3afe5af43c6df5ce6638ecd72cd7a08ba254dfc","examples/full_palette.rs":"b12317e1763e2ace5abc922885c66f2c8555f2233db2b29bc4ea5898d7f4a6a8","examples/histogram.rs":"2233f5026d09b718f629f32c8aebd9094d1eb19d99031cc87d069eddb1d6ae4a","examples/mandelbrot.rs":"1a64de71635da3be40cc4e0b7e7a65a424862604d4b290d10edc51a4521d64ed","examples/matshow.rs":"7f35571fc2a4135adf9629f0b97a33579f5566413ecc85f1197cd3af0e42dba6","examples/nested_coord.rs":"87a003101351d41015b1abd8a1e0b9e272a075904beedb3cfa7d2f3001f2aabd","examples/normal-dist.rs":"a9e9941ac7f6e66f3c9cfb462db12f706c8ebf0405171ea62d01f69db3c1bf91","examples/normal-dist2.rs":"157624b544639c99800f82e6f2e73272b61f3ac4f198e34bde2fefefa7c7b93f","examples/pie.rs":"c16e4af60c14da77ffb749a102357048a906f8c86e6757d9ddd6bd1a526c717b","examples/relative_size.rs":"f442155fe4aa80ee935b05e45460f2a94d93117111e268fcd363749afaff5033","examples/sierpinski.rs":"a315482b05e356840f3e2af91c0d800bf70c3b75d25b412f4afab0cec302df94","examples/slc-temp.rs":"f1956a5f92dc37b7e4ce8fcebcd87dc7b0a4c7512e02e7e650f117510db9cfbf","examples/snowflake.rs":"3ead313fa8c2e87be379504ce5a30eaad15a07359aa42b884178be5551f34984","examples/stock.rs":"8f48d6f813dd789b8b6ca4b5f914bc34b01ec4a125e0cce5b33ffdc59bd763dd","examples/tick_control.rs":"e7c3e144983bbf238d38914295793ae8046c7c91a8d26b6b39a2aeed50adad26","examples/two-scales.rs":"7b068e51162dce3068c8baeeb656860b1e5ecbb385483170b8ed39d9f5a2a088","src/chart/axes3d.rs":"304dc27bbc08005caa204179fb4e51879b4ec70e3c3eca94610f330f011f3a3d","src/chart/builder.rs":"3c9cb34cdcc5da90c1df7557139573dfdd295b2e966d55e76afdf3c7fcd9ef47","src/chart/context.rs":"67c5cb636889b5ab782d19a247c374c2e755558ee5fc1b20715d483b90bf47d2","src/chart/context/cartesian2d/draw_impl.rs":"e3446e46645e40606d1436a0810869bbf30ba4ebe61a05c1fb8efbd93c0668d7","src/chart/context/cartesian2d/mod.rs":"33cc666e5022f194248405612d7e47b1a3d2a637a7d584483b3a1d85761fc3f4","src/chart/context/cartesian3d/draw_impl.rs":"47a2b680b9651bc132d1d8c301a23a372e03535ea2a0b153309132e7b19c45b8","src/chart/context/cartesian3d/mod.rs":"ecf117b25464d478940c8d00a324ff0d32ff72cad1844b0453678d14a5d28f03","src/chart/dual_coord.rs":"a647eb4eb75995cfb2e5670dd054febed4bf06822ac78853c4c771ba7800b629","src/chart/mesh.rs":"a0de75a213a780f3f115696ded369e6f55e2aef955dd5620eae59b25877b3f77","src/chart/mod.rs":"b29cf6d1e950e1c54e93fdc06fa87b06eef04c4932859a0d9bfb7352002300e3","src/chart/series.rs":"c00abaab6fea1cfb0b14f09ff28dad3d300cb418b78bfa4159a222f2cc4ad2e2","src/chart/state.rs":"a3e55a9c2823e8966ce704f0e53c49e83d2c9c3a23beab7ce8b77fe82e4ddef8","src/coord/mod.rs":"15d62d7f75f4c5e5fb31a7e14bdb6d12aa2bea82fdf8043e15c6b74edb3205b8","src/coord/ranged1d/combinators/ckps.rs":"12bdf65810297450ddfe7881187a26537dfdddcfa726a0a3bfc6141cfca239eb","src/coord/ranged1d/combinators/group_by.rs":"c3c1ffeef1c258fb7b4535e33f4a800e6d7020e7982ca98592bcdeff026215fe","src/coord/ranged1d/combinators/linspace.rs":"e3100a3e50bb66eaf54f6ed75a2116de1d85af47add3974afc2d103e95b9c561","src/coord/ranged1d/combinators/logarithmic.rs":"cfca31c8973476ab5f49893fe8a5c5a20011fa19bda8d644e73d6f8c5131860e","src/coord/ranged1d/combinators/mod.rs":"d4fcafb601e1ac0a768ff1aa2f0bcc55d271faf6199abca9d9655ac7af52bfe7","src/coord/ranged1d/combinators/nested.rs":"c402a79bad7ba4ed910088fa47b76509ae1253cb15e8acc4e6a3c3e6627e4a47","src/coord/ranged1d/combinators/partial_axis.rs":"aa0e6b157ef7077786dfbfb5b84a036c65b2bd49ed3d10e91bba1009bb52b118","src/coord/ranged1d/discrete.rs":"df77ee7b97ecb15821ecb5c1102d588494f4fd5721149438e97256a6f767d5a7","src/coord/ranged1d/mod.rs":"fec06e4ac77bfd69ce7a0aa2177fd338ff3ff5e3f6590abdf50f5ca0a78101fd","src/coord/ranged1d/types/datetime.rs":"7300268802823579bf6e8d3429fa296932eee3e5a5bf18f7f3964e91e833677d","src/coord/ranged1d/types/mod.rs":"59b3ef1ea97fa3b234aec9e9b551c6b46bf4a2acb6b8100ba54cd6e76b1774a6","src/coord/ranged1d/types/numeric.rs":"7ebba4735bc86c2e010d6a1db8716406f700b608658fe3a3ac3a2adcff8d247b","src/coord/ranged1d/types/slice.rs":"75e0e0d7deab3bf6b1265d12435e28eadbb28c45f9eca0a268e648a536c05331","src/coord/ranged2d/cartesian.rs":"ed03bbb2425ca036a3cabf1759985377e2abfa2fc04584f99cbbb6571d977e4b","src/coord/ranged2d/mod.rs":"2ab4283d93cbb679ae8c30f10bf28a3251dd17b67856800a2369e6b21623feca","src/coord/ranged3d/cartesian3d.rs":"c099dbbeb48f17288831384f28103f0d26fe7e927f1fb9c3c9dd43a22d055e56","src/coord/ranged3d/mod.rs":"f08d10489ef8c70de8886e1c9d4fe15924aaa717addc418efed52721eeb5c775","src/coord/ranged3d/projection.rs":"d33e92113999b96e9b7fbba523eb5c63061cf7c2d7ec3b4227e051179176d6f5","src/coord/translate.rs":"409dd7f599c99f58f4a2b9cc6e7589d88801c23e15ef659fa6dbe1567bb362a0","src/data/data_range.rs":"97558c4fe82ae4f94c57b70f965e9e0ae226752a49506e1916919818a61f8b9f","src/data/float.rs":"05499ba3cea19a22c06be321c7b8800dcc3d78d593a4f7f6717e44ab15663c87","src/data/mod.rs":"fa53ebcfc36060d0766983e57b8852cd4fd79235b615f05e356c56fe9fc19371","src/data/quartiles.rs":"b0df4bf030de3fee79a72766f17ef4cce78ef89d21be804bf05b227b5191b4c5","src/drawing/area.rs":"965493609930acc2e19bbb5cbd64ed2a1eeeb7a15743fa0e998006a7beef9618","src/drawing/backend_impl/mocked.rs":"bcb8f8676b384c2f45196ac1af63282ca04082797c1a023334a94235df5a03d5","src/drawing/backend_impl/mod.rs":"b5f89c759b3e35a40cc9569bebdc7b5f4c5a430bdde10f446ee744b5baf2fa4c","src/drawing/mod.rs":"adc83e0df9c8528aef5edbbd5bcba1b772b93a25883f014a4ebfc0819b643abb","src/element/basic_shapes.rs":"b0e0a2cef889e2de2598ff4a523c5ef7086f88186991db84c66037232d3e808f","src/element/basic_shapes_3d.rs":"04c87e0d16db182cfeb31e54907a2d5db5d50ab0d01facd2233b9476ec6657e1","src/element/boxplot.rs":"4487bbd687ea072d8b6ae9418c9d08fbf66ad20b123d7ffc2a651774c7329ea8","src/element/candlestick.rs":"b37b86cda8e4f17eb8bf5f784fde619d5824c3c4dab170a576796e4ac46e1467","src/element/composable.rs":"6e1e8f36e5581d612e4b38afc55c3467a39494552988e108747e5992df43b1fd","src/element/dynelem.rs":"8811c375b2a27b7ddbb6de90d28b0395868a43a9ea563c929ee5a95d3b873f62","src/element/errorbar.rs":"555dd4c874f9bf7efa35a86261ba3158203fd1cbe3aa91b9c3e846bf42cd9afd","src/element/image.rs":"f4971e6a124e6e38e9666bf6ef09d2a574232f70f5abd997a35038eca906bf91","src/element/mod.rs":"6683135164147a59d17d1fe5139a80669607a33536f2c913f33076478863c9bd","src/element/pie.rs":"ed43b7e36d9086304df779c1323a235c8f0137915e17aedef8824c9a292aa61f","src/element/points.rs":"a1ec58fc38e1db3e2f2ee27e4297011bcca3179653679991f673cecc3d0f4136","src/element/text.rs":"76ba84bca1cccdc9f0becb5c7fcede6b9753d7e4608172013d6b30ba85ddb349","src/evcxr.rs":"fc0f6e2b98aaff339d68d45aa27246cd2636bb86fa74ea05a00aacf9efcae445","src/lib.rs":"3e9f1ea869984b358964fb2e85873bccf1e7244a0b26a36b869576493321bdbd","src/series/area_series.rs":"76233945f72ba07fa771cb9f94622cee3472df20f2e6d20d285713d0e50f8746","src/series/histogram.rs":"35b4d9656d6615fb82cb28637c011ff36f5c9bc33bc65c59cc32d3d853dfe95f","src/series/line_series.rs":"865e995ec706b08d451c5dbd7b6342eddc2f1bed5c38b3f9288ff19dd67a44aa","src/series/mod.rs":"c7148fbc52c8d3cddf61a03a51e35fe72cd441ad7ce98c636d9ec11f685f1dd3","src/series/point_series.rs":"54350ee56bcacccbac0b4904e9dd8cc7986e63ab3eeb16a8d1b6c7c86b1793da","src/series/surface.rs":"689c2b517d11b8c7d0ee3e55079abc1e2d93191be8ed853e2552ac803cf71ffc","src/style/color.rs":"392631ce5e4e6198366996654acb75485f24427643dcf1a5dbdf47ae2c02bcaa","src/style/colors/colormaps.rs":"9952ea976e30af72faa9197c2d98a651ece4634a5cf5b8b8aa268deb90c69289","src/style/colors/full_palette.rs":"69c168169c38007c0e3e088fa9673d3c617329f6c5cf19b47797c1dbcbf4a43e","src/style/colors/mod.rs":"729d10457501ad52544f06243324ee5d35d871a0105289b5d87d972f59ef820a","src/style/font/ab_glyph.rs":"86c25b12c11a52bc5736ebcea225e0b01090a0f191b0eb00a015230bcf9b52a3","src/style/font/font_desc.rs":"0fae261114798290a5a41caec3ad0c79b61e260d408f6110cb3d9e4922fe9cfc","src/style/font/mod.rs":"eab47f53d211dbe119cdc015eb2388205fa86557a2022a0435f9e083ad408461","src/style/font/naive.rs":"1db6dc0ffae787313cc4127827127f87eb263cfd2e51ee0ba9be3bb40f7c587c","src/style/font/ttf.rs":"afddf23b5395a9230da7b2d763598d984e976ad835b43c9df854cbd4c2bb96f5","src/style/font/web.rs":"94bbd5c91718af55233d8645eceb5e9bf47d1b18827968aa8af7eb0215ced938","src/style/mod.rs":"2709223723d5faab42b30d87778293df9ae83d100e978eeadbf633c2b08d5ac3","src/style/palette.rs":"4bdc0bae9c997e5864f2430779629e4f6d497ccd3d1be1fd35ada48ed0a0f35b","src/style/shape.rs":"03e5f4bd522ea4a38c620acae1f83cde0c93c1484314f3ead59e82877e36ce03","src/style/size.rs":"65bd59347bb3ba8eea51dd282c7961df4f466e6f6125a84f70a4a954afd8784c","src/style/text.rs":"b4398d4e3196212d052e718a4a6c861370f0570b27da033f6bc68acba468272d","src/test.rs":"6550b9135f235139deb8c18313370911f8e5332e62a3493cba612d96da65826b"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"03fb3490582b73627b8d0103170bac84ebad46201aac413290bf243a070464fa","Android.bp":"cdfd17eb823f95ebc239f42c2e833bafb84381260bc678ddbe6a4672ad53d03c","Cargo.lock":"fb92cec66d3dd5238e76c869429bda3e48d48ce7012a86b6314c95c886fa7a27","Cargo.toml":"f0d60165afe42478c5fb587f25ce62c1ab686ba6d8caeded9ef8bf846701485e","LICENSE":"1c9a706701fabb4345eddbdf9e1b9b60668d05f9df8e0ec9bf4b6e08a15c4e33","METADATA":"b43ef0d925ab6c42150f499607e5ed23666dbd13eb826b9d33575c7efa5051bf","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"2d4a3d7185716d3dbbae2317498f3cd97b4a5bf2d3a07fa284041c2273315492","TEST_MAPPING":"5df47f5b5b7533d10aa6a3ecb9189615e716a8060f002faa2bf4c893c12f33f9","benches/benches/data.rs":"0bfcf2e2c7c376a0fa986abc2e71b9c78f8f8fd03bbab9cc0a9c15936b7a3083","benches/benches/mod.rs":"a57d9a364956c0ee9a52b2e99bb0a35dc78bd63f8657d7e486b47ec5a0e9cec6","benches/main.rs":"18a1afab41bdadf925679f34a11b0858ea2dbad1af2ad38dbfda238272adb8af","blub.png":"89f98bd774820f66f507a37c7b3f66661bb21d123b85fc62c6196fbe99d1cd62","cargo_embargo.json":"99524d6d57989d4d543b34005291e66d1d1d4f57c059fa9c9aa4ac1b3f003ece","examples/3d-plot.rs":"8bb26602ba97f70cb7ff494e676475d967b906bb41659d8fcb0bb0cb4f24e393","examples/3d-plot2.rs":"8fa97a5ac7b0807e2340ddda48e1e7b7ce1a0a55b9f5101886394d830b7768ea","examples/README.md":"b36db335432f1547dbf722de1d9baaf4a493fba92d1c76c7f0d343ce8fe5874f","examples/animation.rs":"0e73ac7d22742ca36bfbc2d77aac5cdcd5fba729ee6f016081caf58042493a34","examples/area-chart.rs":"801a2d2ef9ee9c430acc07cad7bdf74682801c15167921c21b76a892180cdf5a","examples/blit-bitmap.rs":"4a00ee6544de5ae011505f1ed86583e63b669dd5629a41c6d28de8736824f79a","examples/boxplot.rs":"e9fe602429aa6f5af5e623ae5b90da75b5f08aace95d049f06a19abc78d98a82","examples/chart.rs":"c0499ad0c688ffeb7ac3a65523cce035f7a52fa0fb79933eaa9bc3ccc413c6f6","examples/colormaps.rs":"4937a290940f1d15ef04c3a087953a059840cf152896ac4fc10df120059c3102","examples/console.rs":"a3845a4231faed1eab933a5091e5b3ad481b2eb6ccfeee0b24467a6a574e1a11","examples/customized_coord.rs":"19d587d498214f082be7b43179725976358894863b37a3adf2c02c1060fd4493","examples/errorbar.rs":"90c7b5d9f687f22ce7cd54de5426af3461334e58bad05d2d19671b082aa9940a","examples/full_palette.rs":"e91d93062129421828d3e25da035259619d5076628535b293cac47a2b3a2698c","examples/histogram.rs":"78e6488dd6a9f6f33f8c61e6142b1802d0de1367dd5b493dd1b2e37834f685eb","examples/mandelbrot.rs":"9b122e062bf323d16e6782890951d8425df934d73bb72e863b21d5074024f62a","examples/matshow.rs":"abd82f0ef23ea46b95cd9f7338437767660078a3623b7d5cd473991c5ddd9056","examples/nested_coord.rs":"8ec5b3bbfcd8b6d77890aab3e5d632ef85e133702cb63ffd83d56726aeee38de","examples/normal-dist.rs":"7a5119b005d037364f8f43fdedf3e00630a08325f95cb0be3d4c162c5062c6fe","examples/normal-dist2.rs":"9657d967f191dd136972ebc86eb11e06faf5c9fa54f2c9bd1b56a9b9dc141648","examples/pie.rs":"e18e64470a2a0238acaf9fd28b38abdb2b3c15b16540316c8447960cf44a8872","examples/relative_size.rs":"ec2cf60671767fdfe787575007d4fcda7e895c62efca1a56edc6d914d9549218","examples/sierpinski.rs":"d88682654a6609f87f587025dfb02ccca357b0cf264da6d2960021f4a7583fbe","examples/slc-temp.rs":"836fdf77956af3cef08adaca6cb4d5cd4f1890e402424443206614f7dca15866","examples/snowflake.rs":"9f4d6e60e873675a2b21179bff1e40f97c0e4fc6c7ce84e01ff20c390ed3a97c","examples/stock.rs":"75e19c8a54cbefdea6e4b9366f8458da378110251f4763404665efca4543a6be","examples/tick_control.rs":"7080996accbeb8b4dc926682524c4af42bf48efc23a0e0ecd3c417bfa72ee0e5","examples/two-scales.rs":"f63736d51d56ea86fc445d0ecf7a20bc4932f282d72721b03718345af7c6d7aa","src/chart/axes3d.rs":"c41cbd867cfd206eca2f72de7d1ca7d4d4df33a06e21f120833b8ce8831ec78f","src/chart/builder.rs":"ba14586049a5cce7031a35f7d6fcbc3e1da96a63fe348a6b51e9b5f7881d8746","src/chart/context.rs":"11a1464060429b6980a342f56732532b9e60cd8a48138f5fe88d9a1300ef76bc","src/chart/context/cartesian2d/draw_impl.rs":"e3446e46645e40606d1436a0810869bbf30ba4ebe61a05c1fb8efbd93c0668d7","src/chart/context/cartesian2d/mod.rs":"33cc666e5022f194248405612d7e47b1a3d2a637a7d584483b3a1d85761fc3f4","src/chart/context/cartesian3d/draw_impl.rs":"47a2b680b9651bc132d1d8c301a23a372e03535ea2a0b153309132e7b19c45b8","src/chart/context/cartesian3d/mod.rs":"efc0eaebefab8202f3c402cd6ba30316db964a34af5dc3044fadb7bf323f0eda","src/chart/dual_coord.rs":"73bedb0c87de1a50638df7bb1e269dd889de1022883c7b6611c42817db3b7921","src/chart/mesh.rs":"a0de75a213a780f3f115696ded369e6f55e2aef955dd5620eae59b25877b3f77","src/chart/mod.rs":"b29cf6d1e950e1c54e93fdc06fa87b06eef04c4932859a0d9bfb7352002300e3","src/chart/series.rs":"ea8b7a932464987fc2c84e59152bd1e07d26213db28532a0c05642ea208772a0","src/chart/state.rs":"29e57931a64717dd37a25c6c96a0c1d80c6f224a4fb2f860afe2f85676c65e7a","src/coord/mod.rs":"d87301c080567f5723faf945ef04cf05fc722becaa46e854dc4819e8acd88c5c","src/coord/ranged1d/combinators/ckps.rs":"513a4b78e65a0b5921b29832525fd0fcf5f6912b0cc92aafff5621c402eeee28","src/coord/ranged1d/combinators/group_by.rs":"e1eec99c9231e79c0e7fa5e064b2909f19c3bc7b820189812ba0532a8045c289","src/coord/ranged1d/combinators/linspace.rs":"53defc10b64ac18380003933c61c18013422b055cc3d718f43f1d7be7f0a091c","src/coord/ranged1d/combinators/logarithmic.rs":"e907b4dd0d412f70bbcc3ceb32f4b76cf96954a3d4e4920e4d16b1cd2fafbe0a","src/coord/ranged1d/combinators/mod.rs":"d4fcafb601e1ac0a768ff1aa2f0bcc55d271faf6199abca9d9655ac7af52bfe7","src/coord/ranged1d/combinators/nested.rs":"c402a79bad7ba4ed910088fa47b76509ae1253cb15e8acc4e6a3c3e6627e4a47","src/coord/ranged1d/combinators/partial_axis.rs":"aa0e6b157ef7077786dfbfb5b84a036c65b2bd49ed3d10e91bba1009bb52b118","src/coord/ranged1d/discrete.rs":"71c5b18bfda7d935933437a439f4f7a1763d99c6efb2d3e053cd739cfd204794","src/coord/ranged1d/mod.rs":"5ba122225db5a2f2af840a6f72462034abd0463b6f92d031436979760d504385","src/coord/ranged1d/types/datetime.rs":"66bff3bba6fe2b5da9f961d3c5f37c8be49cbdaa7f5b9bb7eb15d22f67433cef","src/coord/ranged1d/types/mod.rs":"9fcf9728ca38db8469c406f9e64d37defe88714a52d9b3382ef18f10b5c5b172","src/coord/ranged1d/types/numeric.rs":"e13991d2c29c5a225cbb2545dc9c33838ae6ca658dd95b4df1456f0a082000f0","src/coord/ranged1d/types/slice.rs":"75e0e0d7deab3bf6b1265d12435e28eadbb28c45f9eca0a268e648a536c05331","src/coord/ranged2d/cartesian.rs":"b2f69bc811806db35a0c26f83182f5d585a36508149a5080bc668656739a946d","src/coord/ranged2d/mod.rs":"2ab4283d93cbb679ae8c30f10bf28a3251dd17b67856800a2369e6b21623feca","src/coord/ranged3d/cartesian3d.rs":"c099dbbeb48f17288831384f28103f0d26fe7e927f1fb9c3c9dd43a22d055e56","src/coord/ranged3d/mod.rs":"f08d10489ef8c70de8886e1c9d4fe15924aaa717addc418efed52721eeb5c775","src/coord/ranged3d/projection.rs":"d33e92113999b96e9b7fbba523eb5c63061cf7c2d7ec3b4227e051179176d6f5","src/coord/translate.rs":"409dd7f599c99f58f4a2b9cc6e7589d88801c23e15ef659fa6dbe1567bb362a0","src/data/data_range.rs":"563d86fc63c403be88e6d2ea1966cb964ed81e672cedecdaebc7574274d12414","src/data/float.rs":"05499ba3cea19a22c06be321c7b8800dcc3d78d593a4f7f6717e44ab15663c87","src/data/mod.rs":"fa53ebcfc36060d0766983e57b8852cd4fd79235b615f05e356c56fe9fc19371","src/data/quartiles.rs":"947ac9d5d1fffc08bc55fd4c84520954987c5db74e6907958ed5df810e15bf36","src/drawing/area.rs":"3c72e8a022acc8584057adc32bf4d81d670b8f7d29b0f0ca56b13bd962de2324","src/drawing/backend_impl/mocked.rs":"bcb8f8676b384c2f45196ac1af63282ca04082797c1a023334a94235df5a03d5","src/drawing/backend_impl/mod.rs":"b5f89c759b3e35a40cc9569bebdc7b5f4c5a430bdde10f446ee744b5baf2fa4c","src/drawing/mod.rs":"d21bf21dd5453a477731036a7a47482d6ead47f23a877ff68cba3f740e74bed2","src/element/basic_shapes.rs":"eeaef6aba6eb20f327e70fde59b1df9958a3c65592af2f48bc2cb9b48572d4ce","src/element/basic_shapes_3d.rs":"04c87e0d16db182cfeb31e54907a2d5db5d50ab0d01facd2233b9476ec6657e1","src/element/boxplot.rs":"4a1e80636480c2c403bcba3c3d3bfd0fb5df0ddd456e9ccf5fd7cef2824c9cf5","src/element/candlestick.rs":"b37b86cda8e4f17eb8bf5f784fde619d5824c3c4dab170a576796e4ac46e1467","src/element/composable.rs":"6e1e8f36e5581d612e4b38afc55c3467a39494552988e108747e5992df43b1fd","src/element/dynelem.rs":"8811c375b2a27b7ddbb6de90d28b0395868a43a9ea563c929ee5a95d3b873f62","src/element/errorbar.rs":"555dd4c874f9bf7efa35a86261ba3158203fd1cbe3aa91b9c3e846bf42cd9afd","src/element/image.rs":"ba99d9f0357e7b7c43d5c63aca299fba60687f61e8d39f2451b3d44c87845e5e","src/element/mod.rs":"d28aff5259b74b4807a1890763d77345ec369e154b83337ba85af88d9e23ad84","src/element/pie.rs":"130d00323d33be81bc0ffe0702f9a54d26c440c70f8c65d65342be67c103839d","src/element/points.rs":"a1ec58fc38e1db3e2f2ee27e4297011bcca3179653679991f673cecc3d0f4136","src/element/text.rs":"bea7233fa596ac8708c62061aa793fe2f91ed80649822522530598719ef93b97","src/evcxr.rs":"83d23c7342e8b23e0ca16cc4d4da87ff7dac1837e01c30bdca2ec2796766f462","src/lib.rs":"88fd8193d328f4f425158539e90a4e13724c512cf99d40aacc1bc6a9ad86cc96","src/series/area_series.rs":"76233945f72ba07fa771cb9f94622cee3472df20f2e6d20d285713d0e50f8746","src/series/histogram.rs":"cefc89a7a061a5f82f8e9173341aec4e59feeea706434dbe126ea221df6a07df","src/series/line_series.rs":"16aa9153b2887495f06864e3cff3a0449b01398146a3d4c65afab18015b0ef66","src/series/mod.rs":"4b88e9be691747ddd046e8c39b7217ca75b7d9ed93bb356fbaaeb5b73c50e435","src/series/point_series.rs":"54350ee56bcacccbac0b4904e9dd8cc7986e63ab3eeb16a8d1b6c7c86b1793da","src/series/surface.rs":"c83605843a4f0af655b0b37556ecb7381d317fddbf8cf4ef19495c0fc80293d4","src/style/color.rs":"94736096e3c372d6423b777facd659255307c683d9bf6e38f6db4e4b88d73088","src/style/colors/colormaps.rs":"04e6ebc63d83791c2548ee6b244fbb29aabc572ae396b06eb213cb76faa19bab","src/style/colors/full_palette.rs":"69c168169c38007c0e3e088fa9673d3c617329f6c5cf19b47797c1dbcbf4a43e","src/style/colors/mod.rs":"52eb79e5f9fa2c85fddffb4a45dd23ffc666305127aac7d526744184e7945ab4","src/style/font/ab_glyph.rs":"86c25b12c11a52bc5736ebcea225e0b01090a0f191b0eb00a015230bcf9b52a3","src/style/font/font_desc.rs":"0fae261114798290a5a41caec3ad0c79b61e260d408f6110cb3d9e4922fe9cfc","src/style/font/mod.rs":"eab47f53d211dbe119cdc015eb2388205fa86557a2022a0435f9e083ad408461","src/style/font/naive.rs":"1db6dc0ffae787313cc4127827127f87eb263cfd2e51ee0ba9be3bb40f7c587c","src/style/font/ttf.rs":"8d4bab36948e147c53e23cdbe273f940f488145f45d2c15b56c5f15e2d239396","src/style/font/web.rs":"2d1cb4a23c0d7321b5164aa36a21582ddfb503afa07939f96f87bef27863e8a7","src/style/mod.rs":"8768bcd39ac176d4f2126336bdf510d14016f5e40ced3fd1063c9bcd7ccede08","src/style/palette.rs":"4bdc0bae9c997e5864f2430779629e4f6d497ccd3d1be1fd35ada48ed0a0f35b","src/style/shape.rs":"fe4e7cd6bfff5ccde87a505bda175121c4b02e8115d2345d741c4abbc5e516d8","src/style/size.rs":"65bd59347bb3ba8eea51dd282c7961df4f466e6f6125a84f70a4a954afd8784c","src/style/text.rs":"b4398d4e3196212d052e718a4a6c861370f0570b27da033f6bc68acba468272d","src/test.rs":"6550b9135f235139deb8c18313370911f8e5332e62a3493cba612d96da65826b"}}
\ No newline at end of file

crates/plotters/.cargo-checksum.json

diff --git a/crates/plotters/.cargo-checksum.json b/crates/plotters/.cargo-checksum.json
index f10d800..6e1344a 100644
--- a/crates/plotters/.cargo-checksum.json
+++ b/crates/plotters/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"67bd9b8a10b177e4c585a2589df71ff89aea87ce26323ee21b00a2ecebdc2d6e","Cargo.toml":"5c016d28f430eb06ab7cdd24cd4d2e666db929e038beb2a9fb21d4a3751e1bc4","LICENSE":"1e881ecf2862d01e6e5bc2b861e46886d2a6fb01499c0c508a209a7271b13cf2","README.md":"dbcc210d7f4962499db6d4cfa18658e26d05ee700c962a811cac911f095e22fd","benches/benches/data.rs":"ee565bcc25fa39184db0792a23515ee2b226d630e6285cd12dcda3ddb2995501","benches/benches/mod.rs":"9a70c8cb5d5b3ae43dd43dfb8d60a346bd54d9d62462038e870a06fca4517d02","benches/main.rs":"0114d1bbc994f078cfbb6771a5834e5e104a26c8ffa081ae28e9de61a0ef0694","clippy.toml":"411cc9d76101033c506fa429c78180f8be88257ba9f30266b302363c9afb00f2","examples/3d-plot.rs":"76968c425e3675bd628edc16eb55fdfdd6a99ca926bd580732fbc94fe5128550","examples/3d-plot2.rs":"614e6b74b4439f77300d8374dea05448ddd0d53629b7a5fa806610c8c672409a","examples/README.md":"bf18dae91d0706d8d1267da2de8c728a8d32d01b143b0e5d491a21b0abe5290b","examples/animation.rs":"e23a612c33b0170c4a0c9cc9384a2149592f3e5770e87522b02296044e6c1acf","examples/area-chart.rs":"f954fecdae673ea71afd1734616e461303881e8f63339b62c317320ae98debba","examples/blit-bitmap.rs":"4be6c07c311224c14ef317dd91ce7d4c28c004ba111cd3d69315256d7ee662d6","examples/boxplot.rs":"4e330279a946b2ea19107e9c1fd26d31fe7661eac8e709f05dc95e2c963ba715","examples/chart.rs":"0e0cdcc8e58c1a32fb74e0466a17436c341c1003f98bbab40e7264020535edcb","examples/colormaps.rs":"1735af5bb568a04291c8dba1da70af708168be3ebe342b180abfad84d510126e","examples/console.rs":"67aab36d675c230abfd969609c033f781dc15ffac03c87959b3a08a799747f38","examples/customized_coord.rs":"b915454e5846263924c1c7bc25de86d2dde2bf2068536b236d300dc7bcc5b63a","examples/errorbar.rs":"3568ac7878752a04e03e97b78b45b65919bfcf6f411256362453be88fdd52187","examples/full_palette.rs":"f5a9d7174dd9f75cbc3c49fae84578227740c53955a18141099c38a9bbc38a64","examples/histogram.rs":"6e52c83983f19f2a72973d80fd468a51e1e122723b577c12c1d29b952f9d42f6","examples/mandelbrot.rs":"f8fdac7b156d77346f965af9b31da420cbdf84fc5a176ff456ab3fe1d866eadf","examples/matshow.rs":"c70c9403fa5fff84cd9394985d12c51005627439140084504328d46ec48d58fb","examples/nested_coord.rs":"94939893618f102912b23af23575922d33596e4020de56668d3c539f48e62d05","examples/normal-dist.rs":"d6bfc1e83068cb869916d9e494807f08286c3ea079962bad508e82a30823d32c","examples/normal-dist2.rs":"f6df7a69b23c24b669edebf6c116c1d4786f6dc8bce5df3e078b951732da2508","examples/pie.rs":"48ad7d49d9bfc401b44df04713c5e2a63fa444c9a75dc7ac89423387087c4989","examples/relative_size.rs":"456b8932bac0b9f265d98c55d25302aa29e410035554683a2100fa7d97653425","examples/sierpinski.rs":"519b31a62bdd8c3ba34ff9066ac72b9e94b39dae6f9a988eec4377f78f598378","examples/slc-temp.rs":"6af56c96687daaf4397cd4c0c7970e8dcb2936bb755a1d707e2bcc95e0d43b7a","examples/snowflake.rs":"7bfccf5824bffefb944b0f4156aa9fb96275c25eeb83a621615db3542bafcb37","examples/stock.rs":"f5bf468038380d0caf45f6fe3d3a5478ecbe35bf86effae5a970f95ca3878444","examples/tick_control.rs":"8bed1adb4c89cd6660691baed73c0b7b2ec68bb0dea4460fb017aaa3b40a747b","examples/two-scales.rs":"fff9d82bc2384ea7eda6ce50b8c55b46a2ba6467600e2a133325f6e6db94ad20","src/chart/axes3d.rs":"aca78a20166747c02d382e3d61c1f5707c080c1e19e51a06d532078ee6b51514","src/chart/builder.rs":"9c9432fc8e60401f2ab7157a61509397a9ab9c78f29f07b671f69545771580c1","src/chart/context.rs":"c05b89193ead37ddfed12902fd470979df2ac6664d30eaf6f68ad2456eb1ab3c","src/chart/context/cartesian2d/draw_impl.rs":"5c648fd3e6e9c43e469e4681f208a33c40bd60cc4bccaa0b0d4ef7d6cc37a903","src/chart/context/cartesian2d/mod.rs":"276262ab8f284ffa8174513631601b26e4836f7e77b3ff420075da079e6d2466","src/chart/context/cartesian3d/draw_impl.rs":"19b8c6ee6012a7a18a713394a3af1f56388d672051fa85d0e3a76aca8c8cbdd7","src/chart/context/cartesian3d/mod.rs":"d19191831ada5913903ac4306874cb8b3ee60f4db2d945dc4ac209443d585d11","src/chart/dual_coord.rs":"9c54b8f64305631f717b0027458d5553d74af8f77801db4fde0f4b9168a21686","src/chart/mesh.rs":"27ce1c614530aa76a2b1ce0f82c26ac10f4f914a07cdc1a9abefb285c7327e2b","src/chart/mod.rs":"c8856d1f40a99bcb5612625f2d0c05f0541730e0f966bed5e8e6bb98dbe0a230","src/chart/series.rs":"1edc4fa30fe67e8c2e53215096a2958fb3aae4ae1aab08d4839a1e94509a29aa","src/chart/state.rs":"7b85c21a0c4dd5cb664d4ca53e55624632b3c3063a8608cd596f0944b98d8372","src/coord/mod.rs":"e1b634aaaec3123f53879fca2b5e0ba5cc79dffa8a1c9ff267f8b4eb77e82e62","src/coord/ranged1d/combinators/ckps.rs":"570a479e1108d1aba51434a840a9d23d41b01876210ee690ac8b1402ef6fc39a","src/coord/ranged1d/combinators/group_by.rs":"7bb131582cfc6c435e7ab7213ad1b854cce6cf33893f2c75580651a59ce86ac5","src/coord/ranged1d/combinators/linspace.rs":"743d1ea2acc5a0e35eccc3be86e2c1ef6ab2cbbad76074ebce9b542c49061404","src/coord/ranged1d/combinators/logarithmic.rs":"d06f09ef29d43abf8b266281a34e8e37e8b49e0ef23ef187552027a0114df108","src/coord/ranged1d/combinators/mod.rs":"866be8da7f0d96ca25f2cdca8c1fe4c67cc695eb7dac8b499b03f62bd9490c9d","src/coord/ranged1d/combinators/nested.rs":"4c1437c85529e6a8fb1a00fc3e2c658de1683a69da8b988ac0e23e9323079131","src/coord/ranged1d/combinators/partial_axis.rs":"53622acc763437aa08b91ec5c3d58a891a08fcd3783fa79ed4e0c8cf3a7c74fe","src/coord/ranged1d/discrete.rs":"ad4d1cf4180db9d6694b945136bbea91afdba756b304317b4bab9188b1a534fb","src/coord/ranged1d/mod.rs":"af0ba484382cbf651930ed5e9f8625f98056289ad6aafbde903bc728f6ce4a69","src/coord/ranged1d/types/datetime.rs":"047f3aaa1d8d538c821eb892440e85ca2c6f20466dad94a6b9302ea542a42c10","src/coord/ranged1d/types/mod.rs":"c8ceee19ffcc1b971d4265507f9d6d7feeeab611fa8bb414ad1195982c1f0274","src/coord/ranged1d/types/numeric.rs":"034f620b6776dfd914538e0eee385aefbd641c770c4b51bfe5c79868f38df622","src/coord/ranged1d/types/slice.rs":"9a5b5bf911b43cbf888bac134dc9b6995f3c8690d18416c6e7bb122793d9cb2a","src/coord/ranged2d/cartesian.rs":"74f24f20eeb1e57af3c2dc0a2436891794fd7cde26cec1cf58ece76e0fd65d6b","src/coord/ranged2d/mod.rs":"8973be763af6d2652745c94648bb1bae66866938919121779b907e92d16e4916","src/coord/ranged3d/cartesian3d.rs":"70a54dc5441d8042d528f695df140c8a05c7d111f88c31415de99df2ce969ac9","src/coord/ranged3d/mod.rs":"32dc18d0e2b1c76f7946e746442551698814278ff58dcf12b8c6a787aa66fbc5","src/coord/ranged3d/projection.rs":"635aa97a050059035fe227a7a49bcec1c1c6b7b66a7a9ea3623b0c81c289c02d","src/coord/translate.rs":"9cf8c1a453e17468245e15258cb0c2e85a00e8ac0e9e58d489ee3e7f64fd5562","src/data/data_range.rs":"f6a92dd1318db98e3d4bb210d9860bcb035a917a01b768253116f12a36027e14","src/data/float.rs":"6882eb368b04fa8029f9d5c06f8068f4823f3688e93d582568887cfb48323acb","src/data/mod.rs":"01a20b9c818255f20bca6d126e92036c5edf847267f84ea14227316fde02a810","src/data/quartiles.rs":"3778d853821ff4d4c42aa4d13f3e7f4c388e6ae69b5ab0850edbda444ae49e0f","src/drawing/area.rs":"ead0b4c19e45893b4d593f36303e68efef8a46764615d82ece2cab99cba5337b","src/drawing/backend_impl/mocked.rs":"6a109adaab3ab4853dfb2107fe63eb36f27fddf8adae671e4474805bf6d71678","src/drawing/backend_impl/mod.rs":"fb1644e77c523165ce27335f87b112b5e15ca8676abdbeb4ed8b4adcef8f3c1d","src/drawing/mod.rs":"b9b8c7063216ff1cfb900052cf4e6755e52d6366f67f31d08417bc0516824f57","src/element/basic_shapes.rs":"778ab9b71b1ba98c0346105b9e3ffbeb84adfa47f90ab6bd594d1b1de4d8a666","src/element/basic_shapes_3d.rs":"2c04f453b1b0960c6d355d7d1154f66aae42df3370bbce5b9065b5cb30f6e9f0","src/element/boxplot.rs":"c7ddce762c7d3b12e8e819601c900363b301c9cade3e985dbd839b68f41d7010","src/element/candlestick.rs":"38c35a8711062e44dfc5ed38f9f1ef45f9d978fc7f0db0d3297fbe1a84480ae2","src/element/composable.rs":"4656f8d94290767096871eb06bad0c6992a0daf32f8a8f9600b64ae90cf45517","src/element/dynelem.rs":"951211ba906425f25e96510b8b45c6a0bb1212e9d1b7a045f9144d520c832c0d","src/element/errorbar.rs":"087d79a464221f00456a8372dc7f9c8cfb7b1d247540dcb28db781ef62b1ba38","src/element/image.rs":"32afe849ee1ef9ad4e485c682c93f12feb20d0df859ea6be09d5170d331f7f5f","src/element/mod.rs":"3c538115334a4c03edf40efd3f857e8ce4189b6e72e69abfd3bc2f57410dd899","src/element/pie.rs":"52f4225e26f50930248cecb91606312ec92702cf9d2c76973222f69ccae8ea76","src/element/points.rs":"bafb67d71c43b8959905fe3236274f1cb0defe5254cc267d34d222e11a6ded53","src/element/text.rs":"7a924d38f475579b1632a37950c71220f921330c1f3c649e6b84c73a2a80637a","src/evcxr.rs":"6541c64f65cd3be954816277e61ec82ff31d761dc0bcbb38721b774140ab3034","src/lib.rs":"d0d3a8417bf2e9d49c986e77f37691c7aa20719f9991705ba350544cdec2cfeb","src/series/area_series.rs":"85336f046bc5bd5ab18252ff91288057d6783f8ecf51e226f447646a16815cfa","src/series/histogram.rs":"62b35bfa9b9e541d8b5246b05f8a20ba5659a8f7daa138cb3ff294ce0ce7a2ae","src/series/line_series.rs":"a6ec63156b1166d3b136e0bf2370ea968c575a7c324cdba8a2cf72ac7ae417a5","src/series/mod.rs":"387d280583147ae79ad134199ac6ca7a0dbba46bba14fbf361eea7867e6a3263","src/series/point_series.rs":"cf056e06f1e740ea724d8bcadbe373cb49d93a02beef14064fe550e8ef1f3636","src/series/surface.rs":"001701ebf777eca631c9738db7e8262860f87686c5f3fd4f5c35c79babf37d97","src/style/color.rs":"6026e93bd93a84045e073340aca685167ad12067901169347e060a6139c02417","src/style/colors/colormaps.rs":"7b4b5ba3b093c1f2b7613a2a009f8929ea687777eb38c25943bc242a1e45d1f5","src/style/colors/full_palette.rs":"395e8b82f79156f24c459195aba417f9f8fbe8624405900c435bc2ed3f107c37","src/style/colors/mod.rs":"62d1a49f731d3131e35bf26faf37f83b02657ac44ffb38c7f6340a1f343c62b7","src/style/font/ab_glyph.rs":"dd6f95f555d81f21fb5d5a53e4831a3f770ed9a00104fdd9053d92eca3952dee","src/style/font/font_desc.rs":"b4e1741ac2f04578a6c787004914e1e323cd237824c56b6e499bf3b2a542dee4","src/style/font/mod.rs":"3d4541587bda333a580010d4346d9c97b9af3f3deddbae6d8ebfbc218dc49a1f","src/style/font/naive.rs":"7e48b31d788b76b7e1aa6924b05181f68ce7e5b24aa28dfd9d72dace0cab4202","src/style/font/ttf.rs":"1c4f5792ed2be5c6823dd9874e278832b913599c9d2a84df154ecfe7dc4c17d4","src/style/font/web.rs":"28f8c20d816a4b915682cfc671fdf6391956045e23f768443f80dc61dc0b2d01","src/style/mod.rs":"905d7cb885f74710a2d991540cc7e8cfa7fae78e9a7d159f5608794860dd337f","src/style/palette.rs":"a89c9739c62dd310ad4c70dee192558a5b37294b75747f084a1d2dacbd6e5224","src/style/shape.rs":"a7b729684f3121c88ebe597df2eea0c601b7ae8fa80b9d462adb82e7f99d6185","src/style/size.rs":"c570b18b04d1fcdbba847d20ec09e4086ba34e357495398cb0efb1045ee8912b","src/style/text.rs":"d35ff6b0a998584d52c983d8a21b3f2a9c2977961f41e40af5c25c42c8187e8a","src/test.rs":"09f7685d7c1daed2966a476be0eca093c8271bfb9664fad8166a89e7958d5736"},"package":"d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"}
\ No newline at end of file
+{"files":{"Cargo.lock":"0ad85191703ecdbe082b0c8b25f1ab945b29045c94e4f7b0a780cd5d7c6f612c","Cargo.toml":"946b91e449be5cbf58314e47d98d4aba4ebab6cb5c0f48e0a5ebbddd694989c3","LICENSE":"1e881ecf2862d01e6e5bc2b861e46886d2a6fb01499c0c508a209a7271b13cf2","README.md":"dbcc210d7f4962499db6d4cfa18658e26d05ee700c962a811cac911f095e22fd","benches/benches/data.rs":"ee565bcc25fa39184db0792a23515ee2b226d630e6285cd12dcda3ddb2995501","benches/benches/mod.rs":"9a70c8cb5d5b3ae43dd43dfb8d60a346bd54d9d62462038e870a06fca4517d02","benches/main.rs":"0114d1bbc994f078cfbb6771a5834e5e104a26c8ffa081ae28e9de61a0ef0694","blub.png":"59134b07954df7f6807c33193f71eab9a108d4655da26d544371797b16d92e33","examples/3d-plot.rs":"066b2d85eb5a0630fad15e728fc5a4d1ec2f68151a4a82e7b299921facd6b283","examples/3d-plot2.rs":"ae7556a727a1ba2fa688446927608a3bcd9574445f45f50276af69781cb94a81","examples/README.md":"543eca36acb4fedeef7e395fd7dc94d320d375a1e5d5a53715f75459bfc872bb","examples/animation.rs":"5795973c18e8c2f4682dbef01fe5b64abed65f1a33add5d7b59e5a284bbdff3a","examples/area-chart.rs":"ccb0d3cb9116d484303ab6798de21044cd9e8bbb3c1aa8a10f5df2bf414dc701","examples/blit-bitmap.rs":"94dec8aae59929028d651d4cccf52dde6f8a8eb7a52c8032ff5d201ee6dce334","examples/boxplot.rs":"4633930bdfcccb9be5e7d1be9d2953875b1b12d4cd0d611bbd194a0f996adb71","examples/chart.rs":"a1c40c46e127bf98e6895ecb2d088802277f911349016e8742d379c782868c84","examples/colormaps.rs":"312435ae2b525ca064534479c0fe9b5b49c8158293e385204e166858678c6b8f","examples/console.rs":"391886750a01bd3d144274fe9d3fe719800e2a63d54a430fd2bae7055f273265","examples/customized_coord.rs":"aeac24224abd85abdc88e1341ca2c4c0f118327770022c570820480609e79bd4","examples/errorbar.rs":"cfaf406037ac2339a0d2f0a3b0f8e75ba2e0b6cfd34d6c5eecf6dcf67ad58328","examples/full_palette.rs":"de655c7c1b63778d2da75e9c2224ef81c9ad78f09a74a7c09865daf0c5374c76","examples/histogram.rs":"3c9c3704680dabc47eaa2dafe801dc42a3c30711e67f2775e8810a1a3c45fbbc","examples/mandelbrot.rs":"452fc9182c8c0cdda44b4500970a47fe92a8dcf25b0e10890c37257bfac00b53","examples/matshow.rs":"a1bc4655cf91563d1a7f90af38b4db3e3496b62e741a87cc7911178b536e41ba","examples/nested_coord.rs":"ff0ecac6bf138cca20117a7ff842517b18bbb11d1b87162f8f285ccd5cd5d2c1","examples/normal-dist.rs":"3c5d1c60e9be1c8a2635c1026445223c3a916aeaf5fe7383c83ce86f8e3872cd","examples/normal-dist2.rs":"625e21b3a203790e8d66f9652d75fe905d7ec864d3e4d1095d479d7661202379","examples/pie.rs":"19824e16a95dd326f291529304e07c5ae667844dee14865803c84fccb8ade4b0","examples/relative_size.rs":"a86eb00c50645d12f5daece09b3c7d28578d016a66f40826c1a75929fedf5c38","examples/sierpinski.rs":"dec2707e42e1f8e8ccf33a9f5e7ef1f4009e255f08cc110fd6b1c598b61ebfa8","examples/slc-temp.rs":"705d8c0a65238424483427963faa62b95d8beedec8b1616449d7fcf9e8c62251","examples/snowflake.rs":"00436ce5cc396dcc2bda0740ec75f19abcda3938dbadf863101e3c11f3406b14","examples/stock.rs":"7eba28e68e67c23d5a84f5db1fb02b88144e6a216f31fac185824239c1427ebc","examples/tick_control.rs":"c7a7f0006de4417b826aabf0d156bd94608701feaf3cd59d3c2d00ab3e6d76ff","examples/two-scales.rs":"7142b599f85cff984be7dce5c500e33e1fe525c9cccf0da13d702685d87bd0dd","src/chart/axes3d.rs":"fbe14a085f1ced493fe55b435fe63a62814653200099fbac7dee2bbb0df09216","src/chart/builder.rs":"a9d93e9be96f7c78fe5727ccdebd0389ddbfe67413b5b75e4498282548468c53","src/chart/context.rs":"b9adcd2f1a3904deda2d7e0f1b9e40fa0ee425b8394ddf98b2e99d96a67430a1","src/chart/context/cartesian2d/draw_impl.rs":"5c648fd3e6e9c43e469e4681f208a33c40bd60cc4bccaa0b0d4ef7d6cc37a903","src/chart/context/cartesian2d/mod.rs":"276262ab8f284ffa8174513631601b26e4836f7e77b3ff420075da079e6d2466","src/chart/context/cartesian3d/draw_impl.rs":"19b8c6ee6012a7a18a713394a3af1f56388d672051fa85d0e3a76aca8c8cbdd7","src/chart/context/cartesian3d/mod.rs":"af31dd770a9b9737e73398ba4c9361ba5f42051b731bdaa9e5bdd0f9dc78dd4c","src/chart/dual_coord.rs":"bf1c234558d49e985c2f6a8e68e5a2589d8bdf5dd2b849495eb6925fe8ffcb21","src/chart/mesh.rs":"27ce1c614530aa76a2b1ce0f82c26ac10f4f914a07cdc1a9abefb285c7327e2b","src/chart/mod.rs":"c8856d1f40a99bcb5612625f2d0c05f0541730e0f966bed5e8e6bb98dbe0a230","src/chart/series.rs":"e498807180f894dc3e4ba2f66e1cb788959778b65ec14860916a225b72b120b5","src/chart/state.rs":"5f740e6ad9bf2c6beaa51bbbc2fdeac2eac89edc6864aec218a3f88a2e484b1f","src/coord/mod.rs":"61e938109848b8af780b4501fbfed67bf2fb3b1d0d0092e3405874ee271f2457","src/coord/ranged1d/combinators/ckps.rs":"9ca7f1d8c43c34775bf849713a1c9d739de25761c88c9cad96a7cdf81faea23b","src/coord/ranged1d/combinators/group_by.rs":"cf80c6c20ede45fcc283acb8db1dbea3168b49b69a90105f20848f1c97a1ea21","src/coord/ranged1d/combinators/linspace.rs":"178228b22e4ddb2ab7910332781cdfcfa7cebab1c3c6b40afee9ba19bbfe2fc1","src/coord/ranged1d/combinators/logarithmic.rs":"d78a1ce1995a4b221109b0805745064327009714bbcf7366837034efc55f5788","src/coord/ranged1d/combinators/mod.rs":"866be8da7f0d96ca25f2cdca8c1fe4c67cc695eb7dac8b499b03f62bd9490c9d","src/coord/ranged1d/combinators/nested.rs":"4c1437c85529e6a8fb1a00fc3e2c658de1683a69da8b988ac0e23e9323079131","src/coord/ranged1d/combinators/partial_axis.rs":"53622acc763437aa08b91ec5c3d58a891a08fcd3783fa79ed4e0c8cf3a7c74fe","src/coord/ranged1d/discrete.rs":"1b58c8905dc027baf80d676b04ac59f988ab949a38180ca6c0519b485a92b7b0","src/coord/ranged1d/mod.rs":"7e9c5b7f4203e066e416aa15b01b6453e49533ced91fa197a40f4afc3e284be1","src/coord/ranged1d/types/datetime.rs":"7aca528cd85ea3a5fc4b50750a39692734efa12e04285c36d9ee05c9d1ad66c7","src/coord/ranged1d/types/mod.rs":"c24293c1958dd84f519da0136cb8339aecf2bff2192170e618563cd364010f6e","src/coord/ranged1d/types/numeric.rs":"043d23b95772f9c8aa363c4a84cd110258e596c6375cc64d66d3da409df35c6a","src/coord/ranged1d/types/slice.rs":"9a5b5bf911b43cbf888bac134dc9b6995f3c8690d18416c6e7bb122793d9cb2a","src/coord/ranged2d/cartesian.rs":"a128004a4c784f615aec9066faebf02e53c6c384fe33328565237277dcc7e5f4","src/coord/ranged2d/mod.rs":"8973be763af6d2652745c94648bb1bae66866938919121779b907e92d16e4916","src/coord/ranged3d/cartesian3d.rs":"70a54dc5441d8042d528f695df140c8a05c7d111f88c31415de99df2ce969ac9","src/coord/ranged3d/mod.rs":"32dc18d0e2b1c76f7946e746442551698814278ff58dcf12b8c6a787aa66fbc5","src/coord/ranged3d/projection.rs":"635aa97a050059035fe227a7a49bcec1c1c6b7b66a7a9ea3623b0c81c289c02d","src/coord/translate.rs":"9cf8c1a453e17468245e15258cb0c2e85a00e8ac0e9e58d489ee3e7f64fd5562","src/data/data_range.rs":"4505539b631b94d74c3e344e3f8b85f3a148f44ccd73de9701242c281c9de898","src/data/float.rs":"6882eb368b04fa8029f9d5c06f8068f4823f3688e93d582568887cfb48323acb","src/data/mod.rs":"01a20b9c818255f20bca6d126e92036c5edf847267f84ea14227316fde02a810","src/data/quartiles.rs":"89a1faeb9a769515a8aed743b6984ff04548db513902fbf40529c9d3ea3902e3","src/drawing/area.rs":"a062f01f187e98feafbb360fff181bcf9b72ac1e260dd44d47e5e35b66b828d9","src/drawing/backend_impl/mocked.rs":"6a109adaab3ab4853dfb2107fe63eb36f27fddf8adae671e4474805bf6d71678","src/drawing/backend_impl/mod.rs":"fb1644e77c523165ce27335f87b112b5e15ca8676abdbeb4ed8b4adcef8f3c1d","src/drawing/mod.rs":"9864f1d2b61d0d02188a2590a6700ff692bd420a48714cb918f67d8a719d4ddb","src/element/basic_shapes.rs":"471c511eaee04cc8c75a711a2887f079501b5c1f467f8ab8ee9c5f5c17271575","src/element/basic_shapes_3d.rs":"2c04f453b1b0960c6d355d7d1154f66aae42df3370bbce5b9065b5cb30f6e9f0","src/element/boxplot.rs":"75989cc066d0c091bde6115cad7ee5b9ba3e08f009a88195749f28d02893b954","src/element/candlestick.rs":"38c35a8711062e44dfc5ed38f9f1ef45f9d978fc7f0db0d3297fbe1a84480ae2","src/element/composable.rs":"4656f8d94290767096871eb06bad0c6992a0daf32f8a8f9600b64ae90cf45517","src/element/dynelem.rs":"951211ba906425f25e96510b8b45c6a0bb1212e9d1b7a045f9144d520c832c0d","src/element/errorbar.rs":"087d79a464221f00456a8372dc7f9c8cfb7b1d247540dcb28db781ef62b1ba38","src/element/image.rs":"3ef52eea0548c17241b7c96881f08b8a4ef23c6b4679e57c2fdabda5888cc60b","src/element/mod.rs":"7aa89773c66b39e778e226359ab39fc930910b676817f7b6149fed60d01a0812","src/element/pie.rs":"73af166b1b63e797c29fbb85b104188d0537fe3f829d460ca0991310d867f1a1","src/element/points.rs":"bafb67d71c43b8959905fe3236274f1cb0defe5254cc267d34d222e11a6ded53","src/element/text.rs":"b821037a2d8521aafa1cd1d938a8874cd14cf4dbb4860958d4de917f441d6dd6","src/evcxr.rs":"9bb8ac8ff8c61c08603c5ed45ed37d82957835a2fabd0bbb56690f9f9d8997c7","src/lib.rs":"ad98e7d18807d4c0c2d36556590b34332f26db369e284394160ccbb75579792c","src/series/area_series.rs":"85336f046bc5bd5ab18252ff91288057d6783f8ecf51e226f447646a16815cfa","src/series/histogram.rs":"8af2e00deaee121b8d2991b034387ea16d26b8fc4f52d103d67a171b3d12b194","src/series/line_series.rs":"187b6bc5ccdb9f194ac158acf3d4ce64e87c41cd549a34b0330e08b69fac101c","src/series/mod.rs":"f2373ed2ba0a4a6377a893f63401f055ceedcf1aa0137e803e72e9c6d31e2b98","src/series/point_series.rs":"cf056e06f1e740ea724d8bcadbe373cb49d93a02beef14064fe550e8ef1f3636","src/series/surface.rs":"868d1ce80f2ad6e575629fa8ed9aeb842495d89ca3ccfea6360fd42d7a8f905f","src/style/color.rs":"7896f0b54135bd4afd3d3f1ae37c1409cf9928a4ab612e4d61ec47ee4204b525","src/style/colors/colormaps.rs":"82d48cce5c6e54232899f367a6a3ed38227ab28aa9ab946f2b86dc54b603b274","src/style/colors/full_palette.rs":"395e8b82f79156f24c459195aba417f9f8fbe8624405900c435bc2ed3f107c37","src/style/colors/mod.rs":"ced8ee75509b423b314b3724aee718939bf87c7dd0f7261177fd0ced1734c222","src/style/font/ab_glyph.rs":"dd6f95f555d81f21fb5d5a53e4831a3f770ed9a00104fdd9053d92eca3952dee","src/style/font/font_desc.rs":"b4e1741ac2f04578a6c787004914e1e323cd237824c56b6e499bf3b2a542dee4","src/style/font/mod.rs":"3d4541587bda333a580010d4346d9c97b9af3f3deddbae6d8ebfbc218dc49a1f","src/style/font/naive.rs":"7e48b31d788b76b7e1aa6924b05181f68ce7e5b24aa28dfd9d72dace0cab4202","src/style/font/ttf.rs":"232385d3f7e44ad9b64f0c31886ac2dbddf35668d30e336819f8f296be06eb58","src/style/font/web.rs":"b38d9a6570f3d1be7ba3aad60ad290f251019983c927cd1893a0dd7106e5a4cd","src/style/mod.rs":"da1e65599cc3508d82d1d7bb3d9e7df2ac588fb78813009d0df9c14459540782","src/style/palette.rs":"a89c9739c62dd310ad4c70dee192558a5b37294b75747f084a1d2dacbd6e5224","src/style/shape.rs":"c32ccce067a8f708053f3a21b1a4536c134b771e9ff48668097a1981a8201f4c","src/style/size.rs":"c570b18b04d1fcdbba847d20ec09e4086ba34e357495398cb0efb1045ee8912b","src/style/text.rs":"d35ff6b0a998584d52c983d8a21b3f2a9c2977961f41e40af5c25c42c8187e8a","src/test.rs":"09f7685d7c1daed2966a476be0eca093c8271bfb9664fad8166a89e7958d5736"},"package":"5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"}
\ No newline at end of file

crates/plotters/Android.bp

diff --git a/crates/plotters/Android.bp b/crates/plotters/Android.bp
index da2f4fd..af370e2 100644
--- a/crates/plotters/Android.bp
+++ b/crates/plotters/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "plotters",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.3.5",
+    cargo_pkg_version: "0.3.7",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [

crates/plotters/Cargo.lock

diff --git a/crates/plotters/Cargo.lock b/crates/plotters/Cargo.lock
index c4d7e98..c92720c 100644
--- a/crates/plotters/Cargo.lock
+++ b/crates/plotters/Cargo.lock
@@ -4,9 +4,9 @@
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.21"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -25,6 +25,21 @@
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
 name = "android-tzdata"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -46,21 +61,16 @@
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "anstyle"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -69,22 +79,28 @@
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "bumpalo"
-version = "3.13.0"
+name = "bitflags"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cast"
@@ -94,9 +110,12 @@
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -106,24 +125,23 @@
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "time",
  "wasm-bindgen",
- "winapi",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -132,15 +150,15 @@
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
  "half",
@@ -148,33 +166,28 @@
 
 [[package]]
 name = "clap"
-version = "3.2.25"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
- "bitflags",
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+dependencies = [
+ "anstyle",
  "clap_lex",
- "indexmap",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "color_quant"
@@ -193,16 +206,10 @@
 ]
 
 [[package]]
-name = "const-cstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
-
-[[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -210,17 +217,17 @@
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
  "foreign-types",
@@ -229,21 +236,20 @@
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
- "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "core-text"
-version = "19.2.0"
+version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
 dependencies = [
  "core-foundation",
  "core-graphics",
@@ -253,30 +259,30 @@
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
 dependencies = [
  "anes",
- "atty",
  "cast",
  "ciborium",
  "clap",
  "criterion-plot",
+ "is-terminal",
  "itertools",
- "lazy_static",
  "num-traits",
+ "once_cell",
  "oorandom",
- "plotters 0.3.4",
+ "plotters 0.3.6",
  "rayon",
  "regex",
  "serde",
@@ -297,67 +303,55 @@
 ]
 
 [[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "cfg-if",
+ "dirs-sys",
 ]
 
 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -371,9 +365,9 @@
 
 [[package]]
 name = "dwrote"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
+checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c"
 dependencies = [
  "lazy_static",
  "libc",
@@ -383,50 +377,50 @@
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
 name = "float-ord"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
 
 [[package]]
 name = "font-kit"
-version = "0.11.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5"
+checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "byteorder",
  "core-foundation",
  "core-graphics",
  "core-text",
- "dirs-next",
+ "dirs",
  "dwrote",
  "float-ord",
- "freetype",
+ "freetype-sys",
  "lazy_static",
  "libc",
  "log",
@@ -439,49 +433,51 @@
 
 [[package]]
 name = "foreign-types"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
+ "foreign-types-macros",
  "foreign-types-shared",
 ]
 
 [[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
+name = "foreign-types-macros"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "freetype"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
- "freetype-sys",
- "libc",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "freetype-sys"
-version = "0.13.1"
+name = "foreign-types-shared"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "freetype-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
 dependencies = [
- "cmake",
+ "cc",
  "libc",
  "pkg-config",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -496,46 +492,32 @@
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
- "libc",
+ "cfg-if",
+ "crunchy",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -549,27 +531,27 @@
 
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
  "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "is-terminal"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "autocfg",
- "hashbrown",
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -583,144 +565,139 @@
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
-version = "0.8.0"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-sys",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
-name = "memoffset"
-version = "0.9.0"
+name = "memchr"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minicov"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
 dependencies = [
- "autocfg",
+ "cc",
+ "walkdir",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "miniz_oxide"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "adler2",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
-]
-
-[[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.5.1"
+name = "option-ext"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.19.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
- "ttf-parser 0.19.0",
+ "ttf-parser 0.24.1",
 ]
 
 [[package]]
@@ -735,34 +712,24 @@
 
 [[package]]
 name = "pathfinder_simd"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff"
+checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2"
 dependencies = [
  "rustc_version",
 ]
 
 [[package]]
-name = "pest"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -773,7 +740,7 @@
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 dependencies = [
  "ab_glyph",
  "chrono",
@@ -795,7 +762,7 @@
  "serde",
  "serde_derive",
  "serde_json",
- "ttf-parser 0.17.1",
+ "ttf-parser 0.20.0",
  "wasm-bindgen",
  "wasm-bindgen-test",
  "web-sys",
@@ -803,15 +770,15 @@
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
 
 [[package]]
 name = "plotters-bitmap"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cebbe1f70205299abc69e8b295035bb52a6a70ee35474ad10011f0a4efb8543"
+checksum = "72ce181e3f6bf82d6c1dc569103ca7b1bd964c60ba03d7e6cdfbb3e3eb7f7405"
 dependencies = [
  "gif",
  "image",
@@ -820,9 +787,9 @@
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
 dependencies = [
  "image",
  "plotters-backend",
@@ -830,37 +797,40 @@
 
 [[package]]
 name = "png"
-version = "0.17.9"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -916,9 +886,9 @@
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -926,65 +896,68 @@
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rustc_version"
-version = "0.3.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -1002,43 +975,25 @@
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
 name = "semver"
-version = "0.11.0"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1047,26 +1002,33 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.97"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
-name = "simd-adler32"
-version = "0.3.5"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1074,25 +1036,19 @@
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
-[[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1100,17 +1056,6 @@
 ]
 
 [[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
 name = "tinytemplate"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1122,33 +1067,27 @@
 
 [[package]]
 name = "ttf-parser"
-version = "0.17.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "ttf-parser"
-version = "0.19.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -1156,31 +1095,26 @@
 
 [[package]]
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -1193,9 +1127,9 @@
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1205,9 +1139,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1215,9 +1149,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1228,18 +1162,19 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.37"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671"
+checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
+ "minicov",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1248,19 +1183,20 @@
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.37"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575"
+checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
 dependencies = [
  "proc-macro2",
  "quote",
+ "syn",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1268,9 +1204,9 @@
 
 [[package]]
 name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "winapi"
@@ -1290,11 +1226,11 @@
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1304,12 +1240,12 @@
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1318,65 +1254,147 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "wio"
@@ -1389,12 +1407,32 @@
 
 [[package]]
 name = "yeslogic-fontconfig-sys"
-version = "3.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386"
+checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd"
 dependencies = [
- "const-cstr",
  "dlib",
  "once_cell",
  "pkg-config",
 ]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

crates/plotters/Cargo.toml

diff --git a/crates/plotters/Cargo.toml b/crates/plotters/Cargo.toml
index 61b811e..530924a 100644
--- a/crates/plotters/Cargo.toml
+++ b/crates/plotters/Cargo.toml
@@ -12,12 +12,17 @@
 [package]
 edition = "2018"
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 authors = ["Hao Hou <haohou302@gmail.com>"]
+build = false
 exclude = [
     "doc-template",
     "plotters-doc-data",
 ]
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "A Rust drawing library focus on data plotting for both WASM and native applications"
 homepage = "https://plotters-rs.github.io/"
 readme = "README.md"
@@ -34,32 +39,147 @@
 license = "MIT"
 repository = "https://github.com/plotters-rs/plotters"
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = [
+    "--cfg",
+    "doc_cfg",
+]
+
+[lib]
+name = "plotters"
+path = "src/lib.rs"
+
+[[example]]
+name = "3d-plot"
+path = "examples/3d-plot.rs"
+
+[[example]]
+name = "3d-plot2"
+path = "examples/3d-plot2.rs"
+
+[[example]]
+name = "animation"
+path = "examples/animation.rs"
+
+[[example]]
+name = "area-chart"
+path = "examples/area-chart.rs"
+
+[[example]]
+name = "blit-bitmap"
+path = "examples/blit-bitmap.rs"
+
+[[example]]
+name = "boxplot"
+path = "examples/boxplot.rs"
+
+[[example]]
+name = "chart"
+path = "examples/chart.rs"
+
+[[example]]
+name = "colormaps"
+path = "examples/colormaps.rs"
+
+[[example]]
+name = "console"
+path = "examples/console.rs"
+
+[[example]]
+name = "customized_coord"
+path = "examples/customized_coord.rs"
+
+[[example]]
+name = "errorbar"
+path = "examples/errorbar.rs"
+
+[[example]]
+name = "full_palette"
+path = "examples/full_palette.rs"
+
+[[example]]
+name = "histogram"
+path = "examples/histogram.rs"
+
+[[example]]
+name = "mandelbrot"
+path = "examples/mandelbrot.rs"
+
+[[example]]
+name = "matshow"
+path = "examples/matshow.rs"
+
+[[example]]
+name = "nested_coord"
+path = "examples/nested_coord.rs"
+
+[[example]]
+name = "normal-dist"
+path = "examples/normal-dist.rs"
+
+[[example]]
+name = "normal-dist2"
+path = "examples/normal-dist2.rs"
+
+[[example]]
+name = "pie"
+path = "examples/pie.rs"
+
+[[example]]
+name = "relative_size"
+path = "examples/relative_size.rs"
+
+[[example]]
+name = "sierpinski"
+path = "examples/sierpinski.rs"
+
+[[example]]
+name = "slc-temp"
+path = "examples/slc-temp.rs"
+
+[[example]]
+name = "snowflake"
+path = "examples/snowflake.rs"
+
+[[example]]
+name = "stock"
+path = "examples/stock.rs"
+
+[[example]]
+name = "tick_control"
+path = "examples/tick_control.rs"
+
+[[example]]
+name = "two-scales"
+path = "examples/two-scales.rs"
+
 [[bench]]
 name = "benchmark"
 path = "benches/main.rs"
 harness = false
 
 [dependencies.chrono]
-version = "0.4.20"
+version = "0.4.32"
 optional = true
 
 [dependencies.num-traits]
 version = "0.2.14"
 
 [dependencies.plotters-backend]
-version = "0.3.5"
+version = "0.3.6"
 
 [dependencies.plotters-bitmap]
-version = "0.3.3"
+version = "0.3.6"
 optional = true
-default_features = false
+default-features = false
 
 [dependencies.plotters-svg]
-version = "0.3.5"
+version = "0.3.6"
 optional = true
 
 [dev-dependencies.criterion]
-version = "0.4.0"
+version = "0.5.1"
 
 [dev-dependencies.itertools]
 version = "0.10.0"
@@ -137,11 +257,11 @@
     "pathfinder_geometry",
 ]
 
-[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))".dependencies.wasm-bindgen]
-version = "0.2.62"
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies.wasm-bindgen]
+version = "0.2.89"
 
-[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))".dependencies.web-sys]
-version = "0.3.51"
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies.web-sys]
+version = "0.3.66"
 features = [
     "Document",
     "DomRect",
@@ -153,18 +273,18 @@
     "CanvasRenderingContext2d",
 ]
 
-[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))".dev-dependencies.wasm-bindgen-test]
-version = "0.3.24"
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dev-dependencies.wasm-bindgen-test]
+version = "0.3.39"
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.ab_glyph]
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.ab_glyph]
 version = "0.2.12"
 optional = true
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.font-kit]
-version = "0.11.0"
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.font-kit]
+version = "0.14.2"
 optional = true
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.image]
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.image]
 version = "0.24.3"
 features = [
     "jpeg",
@@ -174,27 +294,36 @@
 optional = true
 default-features = false
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.lazy_static]
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.lazy_static]
 version = "1.4.0"
 optional = true
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.once_cell]
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.once_cell]
 version = "1.8.0"
 optional = true
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.pathfinder_geometry]
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.pathfinder_geometry]
 version = "0.5.1"
 optional = true
 
-[target."cfg(not(all(target_arch = \"wasm32\", not(target_os = \"wasi\"))))".dependencies.ttf-parser]
-version = "0.17.0"
+[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"))))'.dependencies.ttf-parser]
+version = "0.20.0"
 optional = true
 
-[target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.rand]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand]
 version = "0.8.3"
 
-[target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.rand_distr]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand_distr]
 version = "0.4.0"
 
-[target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.rand_xorshift]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand_xorshift]
 version = "0.3.0"
+
+[lints.rust.deprecated]
+level = "allow"
+priority = 0
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+priority = 0
+check-cfg = ["cfg(doc_cfg)"]

crates/plotters/METADATA

diff --git a/crates/plotters/METADATA b/crates/plotters/METADATA
index 8313ab5..4daa117 100644
--- a/crates/plotters/METADATA
+++ b/crates/plotters/METADATA
@@ -1,17 +1,17 @@
 name: "plotters"
 description: "A Rust drawing library focus on data plotting for both WASM and native applications"
 third_party {
-  version: "0.3.5"
+  version: "0.3.7"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 5
+    year: 2025
+    month: 1
+    day: 14
   }
   homepage: "https://crates.io/crates/plotters"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/plotters/plotters-0.3.5.crate"
-    version: "0.3.5"
+    value: "https://static.crates.io/crates/plotters/plotters-0.3.7.crate"
+    version: "0.3.7"
   }
 }

crates/plotters/blub.png

diff --git a/crates/plotters/blub.png b/crates/plotters/blub.png
new file mode 100644
index 0000000..f65ee43
--- /dev/null
+++ b/crates/plotters/blub.png
@@ -0,0 +1,3 @@
+<svg width="800" height="600" viewBox="0 0 800 600" xmlns="http://www.w3.org/2000/svg">
+<line opacity="1" stroke="#000000" stroke-width="0" x1="338" y1="122" x2="365" y2="122"/>
+</svg>

crates/plotters/clippy.toml

diff --git a/crates/plotters/clippy.toml b/crates/plotters/clippy.toml
deleted file mode 100644
index 1785200..0000000
--- a/crates/plotters/clippy.toml
+++ /dev/null
@@ -1 +0,0 @@
-msrv = "1.56"
\ No newline at end of file

crates/plotters/examples/3d-plot.rs

diff --git a/crates/plotters/examples/3d-plot.rs b/crates/plotters/examples/3d-plot.rs
index af40cc2..7bfc6c3 100644
--- a/crates/plotters/examples/3d-plot.rs
+++ b/crates/plotters/examples/3d-plot.rs
@@ -1,5 +1,5 @@
 use plotters::prelude::*;
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot.svg";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let area = SVGBackend::new(OUT_FILE_NAME, (1024, 760)).into_drawing_area();
 
@@ -9,7 +9,7 @@
     let z_axis = (-3.0..3.0).step(0.1);
 
     let mut chart = ChartBuilder::on(&area)
-        .caption(format!("3D Plot Test"), ("sans", 20))
+        .caption("3D Plot Test", ("sans", 20))
         .build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
 
     chart.with_projection(|mut pb| {
@@ -44,12 +44,9 @@
             &BLACK,
         ))?
         .label("Line")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLACK));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLACK));
 
-    chart
-        .configure_series_labels()
-        .border_style(&BLACK)
-        .draw()?;
+    chart.configure_series_labels().border_style(BLACK).draw()?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function
     area.present().expect("Unable to write result to file, please make sure 'plotters-doc-data' dir exists under current dir");

crates/plotters/examples/3d-plot2.rs

diff --git a/crates/plotters/examples/3d-plot2.rs b/crates/plotters/examples/3d-plot2.rs
index b7138f2..d8feeb9 100644
--- a/crates/plotters/examples/3d-plot2.rs
+++ b/crates/plotters/examples/3d-plot2.rs
@@ -3,12 +3,12 @@
     const SDX: f64 = 0.1;
     const SDY: f64 = 0.1;
     const A: f64 = 5.0;
-    let x = x as f64 / 10.0;
-    let y = y as f64 / 10.0;
+    let x = x / 10.0;
+    let y = y / 10.0;
     A * (-x * x / 2.0 / SDX / SDX - y * y / 2.0 / SDY / SDY).exp()
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot2.gif";
+const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot2.gif";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::gif(OUT_FILE_NAME, (600, 400), 100)?.into_drawing_area();
 

crates/plotters/examples/README.md

diff --git a/crates/plotters/examples/README.md b/crates/plotters/examples/README.md
index b6dd166..3149df7 100644
--- a/crates/plotters/examples/README.md
+++ b/crates/plotters/examples/README.md
@@ -4,7 +4,7 @@
 
 To run any example, from within the repo, run `cargo run --example <example_name>` where `<example name>` is the name of the file without the `.rs` extension.
 
-All the examples assumes the directory [plotters-doc-data](https://github.com/38/plotters-doc-data) exists, otherwise those example crashs.
+All the examples assumes the directory [plotters-doc-data](https://github.com/38/plotters-doc-data) exists, otherwise those example crashes.
 
 The output of these example files are used to generate the [plotters-doc-data](https://github.com/38/plotters-doc-data) repo that populates the sample images in the main README.
 We also rely on the output of examples to detect potential layout changes.

crates/plotters/examples/animation.rs

diff --git a/crates/plotters/examples/animation.rs b/crates/plotters/examples/animation.rs
index dab7d45..b93cb81 100644
--- a/crates/plotters/examples/animation.rs
+++ b/crates/plotters/examples/animation.rs
@@ -17,7 +17,7 @@
     ret
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/animation.gif";
+const OUT_FILE_NAME: &str = "plotters-doc-data/animation.gif";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::gif(OUT_FILE_NAME, (800, 600), 1_000)?.into_drawing_area();
 
@@ -45,11 +45,11 @@
 
         chart.draw_series(std::iter::once(Polygon::new(
             snowflake_vertices.clone(),
-            &RED.mix(0.2),
+            RED.mix(0.2),
         )))?;
 
         snowflake_vertices.push(snowflake_vertices[0]);
-        chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, &RED)))?;
+        chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, RED)))?;
 
         root.present()?;
     }

crates/plotters/examples/area-chart.rs

diff --git a/crates/plotters/examples/area-chart.rs b/crates/plotters/examples/area-chart.rs
index 5b1a7a5..c6d78df 100644
--- a/crates/plotters/examples/area-chart.rs
+++ b/crates/plotters/examples/area-chart.rs
@@ -4,7 +4,7 @@
 use rand_distr::{Distribution, Normal};
 use rand_xorshift::XorShiftRng;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/area-chart.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/area-chart.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let data: Vec<_> = {
         let norm_dist = Normal::new(500.0, 100.0).unwrap();
@@ -38,9 +38,9 @@
         AreaSeries::new(
             (0..).zip(data.iter()).map(|(x, y)| (x, *y)),
             0.0,
-            &RED.mix(0.2),
+            RED.mix(0.2),
         )
-        .border_style(&RED),
+        .border_style(RED),
     )?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function

crates/plotters/examples/blit-bitmap.rs

diff --git a/crates/plotters/examples/blit-bitmap.rs b/crates/plotters/examples/blit-bitmap.rs
index 990b256..bcdcd17 100644
--- a/crates/plotters/examples/blit-bitmap.rs
+++ b/crates/plotters/examples/blit-bitmap.rs
@@ -5,7 +5,7 @@
 use std::fs::File;
 use std::io::BufReader;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/blit-bitmap.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/blit-bitmap.png";
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();

crates/plotters/examples/boxplot.rs

diff --git a/crates/plotters/examples/boxplot.rs b/crates/plotters/examples/boxplot.rs
index 6e46db4..7acda7a 100644
--- a/crates/plotters/examples/boxplot.rs
+++ b/crates/plotters/examples/boxplot.rs
@@ -21,7 +21,7 @@
     ds
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/boxplot.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/boxplot.svg";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = SVGBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
     root.fill(&WHITE)?;
@@ -40,7 +40,7 @@
     };
     let dataset: Vec<(String, String, Quartiles)> = ds
         .iter()
-        .map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(&v)))
+        .map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(v)))
         .collect();
 
     let host_list: Vec<_> = dataset
@@ -60,11 +60,7 @@
         entry.0.push((x.0.clone(), &x.2));
     }
 
-    let values: Vec<f32> = dataset
-        .iter()
-        .map(|x| x.2.values().to_vec())
-        .flatten()
-        .collect();
+    let values: Vec<f32> = dataset.iter().flat_map(|x| x.2.values().to_vec()).collect();
     let values_range = fitting_range(values.iter());
 
     let mut chart = ChartBuilder::on(&upper)
@@ -81,13 +77,13 @@
         .x_desc("Ping, ms")
         .y_desc("Host")
         .y_labels(host_list.len())
-        .light_line_style(&WHITE)
+        .light_line_style(WHITE)
         .draw()?;
 
     for (label, (values, style, offset)) in &series {
         chart
             .draw_series(values.iter().map(|x| {
-                Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), &x.1)
+                Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), x.1)
                     .width(20)
                     .whisker_width(0.5)
                     .style(style)
@@ -100,7 +96,7 @@
         .configure_series_labels()
         .position(SeriesLabelPosition::UpperRight)
         .background_style(WHITE.filled())
-        .border_style(&BLACK.mix(0.5))
+        .border_style(BLACK.mix(0.5))
         .legend_area_size(22)
         .draw()?;
 
@@ -120,7 +116,7 @@
             .iter()
             .chain(quartiles_b.values().iter()),
     );
-    let mut chart = ChartBuilder::on(&left)
+    let mut chart = ChartBuilder::on(left)
         .x_label_area_size(40)
         .y_label_area_size(40)
         .caption("Vertical Boxplot", ("sans-serif", 20))
@@ -129,19 +125,19 @@
             values_range.start - 10.0..values_range.end + 10.0,
         )?;
 
-    chart.configure_mesh().light_line_style(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_vertical(SegmentValue::CenterOf(&"a"), &quartiles_a),
         Boxplot::new_vertical(SegmentValue::CenterOf(&"b"), &quartiles_b),
     ])?;
 
-    let mut chart = ChartBuilder::on(&right)
+    let mut chart = ChartBuilder::on(right)
         .x_label_area_size(40)
         .y_label_area_size(40)
         .caption("Horizontal Boxplot", ("sans-serif", 20))
         .build_cartesian_2d(-30f32..90f32, 0..3)?;
 
-    chart.configure_mesh().light_line_style(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_horizontal(1, &quartiles_a),
         Boxplot::new_horizontal(2, &Quartiles::new(&[30])),

crates/plotters/examples/chart.rs

diff --git a/crates/plotters/examples/chart.rs b/crates/plotters/examples/chart.rs
index acdddc3..e121041 100644
--- a/crates/plotters/examples/chart.rs
+++ b/crates/plotters/examples/chart.rs
@@ -1,6 +1,6 @@
 use plotters::prelude::*;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/sample.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/sample.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root_area = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 
@@ -28,16 +28,16 @@
 
     cc.draw_series(LineSeries::new(x_axis.values().map(|x| (x, x.sin())), &RED))?
         .label("Sine")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &RED));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], RED));
 
     cc.draw_series(LineSeries::new(
         x_axis.values().map(|x| (x, x.cos())),
         &BLUE,
     ))?
     .label("Cosine")
-    .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLUE));
+    .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLUE));
 
-    cc.configure_series_labels().border_style(&BLACK).draw()?;
+    cc.configure_series_labels().border_style(BLACK).draw()?;
 
     /*
     // It's possible to use a existing pointing element
@@ -62,7 +62,7 @@
     let drawing_areas = lower.split_evenly((1, 2));
 
     for (drawing_area, idx) in drawing_areas.iter().zip(1..) {
-        let mut cc = ChartBuilder::on(&drawing_area)
+        let mut cc = ChartBuilder::on(drawing_area)
             .x_label_area_size(30)
             .y_label_area_size(30)
             .margin_right(20)

crates/plotters/examples/colormaps.rs

diff --git a/crates/plotters/examples/colormaps.rs b/crates/plotters/examples/colormaps.rs
index 4c8cc4d..3749e43 100644
--- a/crates/plotters/examples/colormaps.rs
+++ b/crates/plotters/examples/colormaps.rs
@@ -1,6 +1,6 @@
 use plotters::prelude::*;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/colormaps.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/colormaps.png";
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let colormaps_rgb: [(Box<dyn ColorMap<RGBColor>>, &str); 4] = [

crates/plotters/examples/console.rs

diff --git a/crates/plotters/examples/console.rs b/crates/plotters/examples/console.rs
index feba095..814fb5f 100644
--- a/crates/plotters/examples/console.rs
+++ b/crates/plotters/examples/console.rs
@@ -183,7 +183,7 @@
     Ok(())
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/console-example.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/console-example.png";
 fn main() -> Result<(), Box<dyn Error>> {
     draw_chart(TextDrawingBackend(vec![PixelState::Empty; 5000]).into_drawing_area())?;
     let b = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();

crates/plotters/examples/customized_coord.rs

diff --git a/crates/plotters/examples/customized_coord.rs b/crates/plotters/examples/customized_coord.rs
index cb3a18f..760373b 100644
--- a/crates/plotters/examples/customized_coord.rs
+++ b/crates/plotters/examples/customized_coord.rs
@@ -2,7 +2,7 @@
     coord::ranged1d::{KeyPointHint, NoDefaultFormatting, ValueFormatter},
     prelude::*,
 };
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/customized_coord.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/customized_coord.svg";
 
 struct CustomizedX(u32);
 

crates/plotters/examples/errorbar.rs

diff --git a/crates/plotters/examples/errorbar.rs b/crates/plotters/examples/errorbar.rs
index 75c5dbe..364ea89 100644
--- a/crates/plotters/examples/errorbar.rs
+++ b/crates/plotters/examples/errorbar.rs
@@ -8,7 +8,7 @@
 
 use num_traits::sign::Signed;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/errorbar.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/errorbar.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let data = generate_random_data();
     let down_sampled = down_sample(&data[..]);
@@ -29,7 +29,7 @@
     chart
         .draw_series(LineSeries::new(data, &GREEN.mix(0.3)))?
         .label("Raw Data")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &GREEN));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], GREEN));
 
     chart.draw_series(LineSeries::new(
         down_sampled.iter().map(|(x, _, y, _)| (*x, *y)),
@@ -43,7 +43,7 @@
             }),
         )?
         .label("Down-sampled")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLUE));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLUE));
 
     chart
         .configure_series_labels()

crates/plotters/examples/full_palette.rs

diff --git a/crates/plotters/examples/full_palette.rs b/crates/plotters/examples/full_palette.rs
index dbd0d42..b63ea73 100644
--- a/crates/plotters/examples/full_palette.rs
+++ b/crates/plotters/examples/full_palette.rs
@@ -1,6 +1,6 @@
 use plotters::prelude::*;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/full_palette.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/full_palette.png";
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (2000, 850)).into_drawing_area();

crates/plotters/examples/histogram.rs

diff --git a/crates/plotters/examples/histogram.rs b/crates/plotters/examples/histogram.rs
index 5cda05d..a56ce02 100644
--- a/crates/plotters/examples/histogram.rs
+++ b/crates/plotters/examples/histogram.rs
@@ -1,5 +1,5 @@
 use plotters::prelude::*;
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/histogram.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/histogram.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (640, 480)).into_drawing_area();
 
@@ -15,7 +15,7 @@
     chart
         .configure_mesh()
         .disable_x_mesh()
-        .bold_line_style(&WHITE.mix(0.3))
+        .bold_line_style(WHITE.mix(0.3))
         .y_desc("Count")
         .x_desc("Bucket")
         .axis_desc_style(("sans-serif", 15))

crates/plotters/examples/mandelbrot.rs

diff --git a/crates/plotters/examples/mandelbrot.rs b/crates/plotters/examples/mandelbrot.rs
index b0d5799..a03ae1c 100644
--- a/crates/plotters/examples/mandelbrot.rs
+++ b/crates/plotters/examples/mandelbrot.rs
@@ -1,7 +1,7 @@
 use plotters::prelude::*;
 use std::ops::Range;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/mandelbrot.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/mandelbrot.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (800, 600)).into_drawing_area();
 
@@ -51,7 +51,7 @@
         (real.end - real.start) / samples.0 as f64,
         (complex.end - complex.start) / samples.1 as f64,
     );
-    return (0..(samples.0 * samples.1)).map(move |k| {
+    (0..(samples.0 * samples.1)).map(move |k| {
         let c = (
             real.start + step.0 * (k % samples.0) as f64,
             complex.start + step.1 * (k / samples.0) as f64,
@@ -62,8 +62,8 @@
             z = (z.0 * z.0 - z.1 * z.1 + c.0, 2.0 * z.0 * z.1 + c.1);
             cnt += 1;
         }
-        return (c.0, c.1, cnt);
-    });
+        (c.0, c.1, cnt)
+    })
 }
 #[test]
 fn entry_point() {

crates/plotters/examples/matshow.rs

diff --git a/crates/plotters/examples/matshow.rs b/crates/plotters/examples/matshow.rs
index 30c71a7..09ce561 100644
--- a/crates/plotters/examples/matshow.rs
+++ b/crates/plotters/examples/matshow.rs
@@ -1,6 +1,6 @@
 use plotters::prelude::*;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/matshow.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/matshow.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 
@@ -11,7 +11,7 @@
         .margin(5)
         .top_x_label_area_size(40)
         .y_label_area_size(40)
-        .build_cartesian_2d(0i32..15i32, 15i32..0i32)?;
+        .build_cartesian_2d(0i32..15i32, 0i32..15i32)?;
 
     chart
         .configure_mesh()
@@ -35,8 +35,7 @@
         matrix
             .iter()
             .zip(0..)
-            .map(|(l, y)| l.iter().zip(0..).map(move |(v, x)| (x as i32, y as i32, v)))
-            .flatten()
+            .flat_map(|(l, y)| l.iter().zip(0..).map(move |(v, x)| (x, y, v)))
             .map(|(x, y, v)| {
                 Rectangle::new(
                     [(x, y), (x + 1, y + 1)],

crates/plotters/examples/nested_coord.rs

diff --git a/crates/plotters/examples/nested_coord.rs b/crates/plotters/examples/nested_coord.rs
index b700101..a3418fa 100644
--- a/crates/plotters/examples/nested_coord.rs
+++ b/crates/plotters/examples/nested_coord.rs
@@ -1,5 +1,5 @@
 use plotters::prelude::*;
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/nested_coord.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/nested_coord.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (640, 480)).into_drawing_area();
 

crates/plotters/examples/normal-dist.rs

diff --git a/crates/plotters/examples/normal-dist.rs b/crates/plotters/examples/normal-dist.rs
index be48786..e6cfdcd 100644
--- a/crates/plotters/examples/normal-dist.rs
+++ b/crates/plotters/examples/normal-dist.rs
@@ -4,7 +4,7 @@
 use rand_distr::{Distribution, Normal};
 use rand_xorshift::XorShiftRng;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/normal-dist.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/normal-dist.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 

crates/plotters/examples/normal-dist2.rs

diff --git a/crates/plotters/examples/normal-dist2.rs b/crates/plotters/examples/normal-dist2.rs
index 6c84ab3..f996312 100644
--- a/crates/plotters/examples/normal-dist2.rs
+++ b/crates/plotters/examples/normal-dist2.rs
@@ -6,7 +6,7 @@
 
 use num_traits::sign::Signed;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/normal-dist2.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/normal-dist2.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let sd = 0.60;
 

crates/plotters/examples/pie.rs

diff --git a/crates/plotters/examples/pie.rs b/crates/plotters/examples/pie.rs
index a950c02..7226e5a 100644
--- a/crates/plotters/examples/pie.rs
+++ b/crates/plotters/examples/pie.rs
@@ -1,6 +1,6 @@
 use plotters::{prelude::*, style::full_palette::ORANGE};
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/pie-chart.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/pie-chart.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root_area = BitMapBackend::new(&OUT_FILE_NAME, (950, 700)).into_drawing_area();
     root_area.fill(&WHITE).unwrap();

crates/plotters/examples/relative_size.rs

diff --git a/crates/plotters/examples/relative_size.rs b/crates/plotters/examples/relative_size.rs
index 66eaec1..e66bfee 100644
--- a/crates/plotters/examples/relative_size.rs
+++ b/crates/plotters/examples/relative_size.rs
@@ -28,7 +28,7 @@
     Ok(())
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/relative_size.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/relative_size.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 

crates/plotters/examples/sierpinski.rs

diff --git a/crates/plotters/examples/sierpinski.rs b/crates/plotters/examples/sierpinski.rs
index b9655bf..773d1b2 100644
--- a/crates/plotters/examples/sierpinski.rs
+++ b/crates/plotters/examples/sierpinski.rs
@@ -19,7 +19,7 @@
     Ok(())
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/sierpinski.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/sierpinski.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 

crates/plotters/examples/slc-temp.rs

diff --git a/crates/plotters/examples/slc-temp.rs b/crates/plotters/examples/slc-temp.rs
index 9d6e473..a774995 100644
--- a/crates/plotters/examples/slc-temp.rs
+++ b/crates/plotters/examples/slc-temp.rs
@@ -4,7 +4,7 @@
 
 use std::error::Error;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/slc-temp.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/slc-temp.png";
 fn main() -> Result<(), Box<dyn Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 

crates/plotters/examples/snowflake.rs

diff --git a/crates/plotters/examples/snowflake.rs b/crates/plotters/examples/snowflake.rs
index 6e52f25..f64a0d6 100644
--- a/crates/plotters/examples/snowflake.rs
+++ b/crates/plotters/examples/snowflake.rs
@@ -17,7 +17,7 @@
     ret
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/snowflake.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/snowflake.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
 
@@ -41,10 +41,10 @@
 
     chart.draw_series(std::iter::once(Polygon::new(
         snowflake_vertices.clone(),
-        &RED.mix(0.2),
+        RED.mix(0.2),
     )))?;
     snowflake_vertices.push(snowflake_vertices[0]);
-    chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, &RED)))?;
+    chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, RED)))?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function
     root.present().expect("Unable to write result to file, please make sure 'plotters-doc-data' dir exists under current dir");

crates/plotters/examples/stock.rs

diff --git a/crates/plotters/examples/stock.rs b/crates/plotters/examples/stock.rs
index 8e9416f..65defad 100644
--- a/crates/plotters/examples/stock.rs
+++ b/crates/plotters/examples/stock.rs
@@ -7,15 +7,15 @@
         .unwrap()
         .date()
 }
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/stock.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/stock.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let data = get_data();
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
     root.fill(&WHITE)?;
 
     let (to_date, from_date) = (
-        parse_time(&data[0].0) + Duration::days(1),
-        parse_time(&data[29].0) - Duration::days(1),
+        parse_time(data[0].0) + Duration::days(1),
+        parse_time(data[29].0) - Duration::days(1),
     );
 
     let mut chart = ChartBuilder::on(&root)
@@ -24,7 +24,7 @@
         .caption("MSFT Stock Price", ("sans-serif", 50.0).into_font())
         .build_cartesian_2d(from_date..to_date, 110f32..135f32)?;
 
-    chart.configure_mesh().light_line_style(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(WHITE).draw()?;
 
     chart.draw_series(
         data.iter().map(|x| {
@@ -40,38 +40,38 @@
 }
 
 fn get_data() -> Vec<(&'static str, f32, f32, f32, f32)> {
-    return vec![
-        ("2019-04-25", 130.0600, 131.3700, 128.8300, 129.1500),
-        ("2019-04-24", 125.7900, 125.8500, 124.5200, 125.0100),
-        ("2019-04-23", 124.1000, 125.5800, 123.8300, 125.4400),
-        ("2019-04-22", 122.6200, 124.0000, 122.5700, 123.7600),
-        ("2019-04-18", 122.1900, 123.5200, 121.3018, 123.3700),
-        ("2019-04-17", 121.2400, 121.8500, 120.5400, 121.7700),
-        ("2019-04-16", 121.6400, 121.6500, 120.1000, 120.7700),
-        ("2019-04-15", 120.9400, 121.5800, 120.5700, 121.0500),
-        ("2019-04-12", 120.6400, 120.9800, 120.3700, 120.9500),
-        ("2019-04-11", 120.5400, 120.8500, 119.9200, 120.3300),
-        ("2019-04-10", 119.7600, 120.3500, 119.5400, 120.1900),
-        ("2019-04-09", 118.6300, 119.5400, 118.5800, 119.2800),
-        ("2019-04-08", 119.8100, 120.0200, 118.6400, 119.9300),
-        ("2019-04-05", 119.3900, 120.2300, 119.3700, 119.8900),
-        ("2019-04-04", 120.1000, 120.2300, 118.3800, 119.3600),
-        ("2019-04-03", 119.8600, 120.4300, 119.1500, 119.9700),
-        ("2019-04-02", 119.0600, 119.4800, 118.5200, 119.1900),
-        ("2019-04-01", 118.9500, 119.1085, 118.1000, 119.0200),
-        ("2019-03-29", 118.0700, 118.3200, 116.9600, 117.9400),
-        ("2019-03-28", 117.4400, 117.5800, 116.1300, 116.9300),
-        ("2019-03-27", 117.8750, 118.2100, 115.5215, 116.7700),
-        ("2019-03-26", 118.6200, 118.7050, 116.8500, 117.9100),
-        ("2019-03-25", 116.5600, 118.0100, 116.3224, 117.6600),
-        ("2019-03-22", 119.5000, 119.5900, 117.0400, 117.0500),
-        ("2019-03-21", 117.1350, 120.8200, 117.0900, 120.2200),
-        ("2019-03-20", 117.3900, 118.7500, 116.7100, 117.5200),
-        ("2019-03-19", 118.0900, 118.4400, 116.9900, 117.6500),
-        ("2019-03-18", 116.1700, 117.6100, 116.0500, 117.5700),
-        ("2019-03-15", 115.3400, 117.2500, 114.5900, 115.9100),
-        ("2019-03-14", 114.5400, 115.2000, 114.3300, 114.5900),
-    ];
+    vec![
+        ("2019-04-25", 130.06, 131.37, 128.83, 129.15),
+        ("2019-04-24", 125.79, 125.85, 124.52, 125.01),
+        ("2019-04-23", 124.1, 125.58, 123.83, 125.44),
+        ("2019-04-22", 122.62, 124.0000, 122.57, 123.76),
+        ("2019-04-18", 122.19, 123.52, 121.3018, 123.37),
+        ("2019-04-17", 121.24, 121.85, 120.54, 121.77),
+        ("2019-04-16", 121.64, 121.65, 120.1, 120.77),
+        ("2019-04-15", 120.94, 121.58, 120.57, 121.05),
+        ("2019-04-12", 120.64, 120.98, 120.37, 120.95),
+        ("2019-04-11", 120.54, 120.85, 119.92, 120.33),
+        ("2019-04-10", 119.76, 120.35, 119.54, 120.19),
+        ("2019-04-09", 118.63, 119.54, 118.58, 119.28),
+        ("2019-04-08", 119.81, 120.02, 118.64, 119.93),
+        ("2019-04-05", 119.39, 120.23, 119.37, 119.89),
+        ("2019-04-04", 120.1, 120.23, 118.38, 119.36),
+        ("2019-04-03", 119.86, 120.43, 119.15, 119.97),
+        ("2019-04-02", 119.06, 119.48, 118.52, 119.19),
+        ("2019-04-01", 118.95, 119.1085, 118.1, 119.02),
+        ("2019-03-29", 118.07, 118.32, 116.96, 117.94),
+        ("2019-03-28", 117.44, 117.58, 116.13, 116.93),
+        ("2019-03-27", 117.875, 118.21, 115.5215, 116.77),
+        ("2019-03-26", 118.62, 118.705, 116.85, 117.91),
+        ("2019-03-25", 116.56, 118.01, 116.3224, 117.66),
+        ("2019-03-22", 119.5, 119.59, 117.04, 117.05),
+        ("2019-03-21", 117.135, 120.82, 117.09, 120.22),
+        ("2019-03-20", 117.39, 118.75, 116.71, 117.52),
+        ("2019-03-19", 118.09, 118.44, 116.99, 117.65),
+        ("2019-03-18", 116.17, 117.61, 116.05, 117.57),
+        ("2019-03-15", 115.34, 117.25, 114.59, 115.91),
+        ("2019-03-14", 114.54, 115.2, 114.33, 114.59),
+    ]
 }
 #[test]
 fn entry_point() {

crates/plotters/examples/tick_control.rs

diff --git a/crates/plotters/examples/tick_control.rs b/crates/plotters/examples/tick_control.rs
index b34fc88c..2f4ea34 100644
--- a/crates/plotters/examples/tick_control.rs
+++ b/crates/plotters/examples/tick_control.rs
@@ -16,7 +16,7 @@
     data: Vec<DailyData>,
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/tick_control.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/tick_control.svg";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = SVGBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
     root.fill(&WHITE)?;
@@ -72,10 +72,7 @@
             .legend(move |(x, y)| Rectangle::new([(x, y - 5), (x + 10, y + 5)], color.filled()));
     }
 
-    chart
-        .configure_series_labels()
-        .border_style(&BLACK)
-        .draw()?;
+    chart.configure_series_labels().border_style(BLACK).draw()?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function
     root.present().expect("Unable to write result to file, please make sure 'plotters-doc-data' dir exists under current dir");

crates/plotters/examples/two-scales.rs

diff --git a/crates/plotters/examples/two-scales.rs b/crates/plotters/examples/two-scales.rs
index 6e1dfa4..e50410f 100644
--- a/crates/plotters/examples/two-scales.rs
+++ b/crates/plotters/examples/two-scales.rs
@@ -1,6 +1,6 @@
 use plotters::prelude::*;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/twoscale.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/twoscale.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
     root.fill(&WHITE)?;
@@ -33,7 +33,7 @@
             &BLUE,
         ))?
         .label("y = 1.02^x^2")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLUE));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLUE));
 
     chart
         .draw_secondary_series(LineSeries::new(
@@ -41,11 +41,11 @@
             &RED,
         ))?
         .label("y = sin(2x)")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &RED));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], RED));
 
     chart
         .configure_series_labels()
-        .background_style(&RGBColor(128, 128, 128))
+        .background_style(RGBColor(128, 128, 128))
         .draw()?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function

crates/plotters/src/chart/axes3d.rs

diff --git a/crates/plotters/src/chart/axes3d.rs b/crates/plotters/src/chart/axes3d.rs
index 33d7de3..9431715 100644
--- a/crates/plotters/src/chart/axes3d.rs
+++ b/crates/plotters/src/chart/axes3d.rs
@@ -221,10 +221,10 @@
             tick_size,
             light_lines_limit: [10, 10, 10],
             n_labels: [10, 10, 10],
-            bold_line_style: Into::<ShapeStyle>::into(&BLACK.mix(0.2)),
-            light_line_style: Into::<ShapeStyle>::into(&TRANSPARENT),
-            axis_panel_style: Into::<ShapeStyle>::into(&BLACK.mix(0.1)),
-            axis_style: Into::<ShapeStyle>::into(&BLACK.mix(0.8)),
+            bold_line_style: Into::<ShapeStyle>::into(BLACK.mix(0.2)),
+            light_line_style: Into::<ShapeStyle>::into(TRANSPARENT),
+            axis_panel_style: Into::<ShapeStyle>::into(BLACK.mix(0.1)),
+            axis_style: Into::<ShapeStyle>::into(BLACK.mix(0.8)),
             label_style: ("sans-serif", (12).percent().max(12).in_pixels(&parent_size)).into(),
             format_x: &X::format,
             format_y: &Y::format,

crates/plotters/src/chart/builder.rs

diff --git a/crates/plotters/src/chart/builder.rs b/crates/plotters/src/chart/builder.rs
index cf804c6..41a4309 100644
--- a/crates/plotters/src/chart/builder.rs
+++ b/crates/plotters/src/chart/builder.rs
@@ -194,7 +194,7 @@
     Sets the size of the X label area at the bottom of the chart.
 
     - `size`: The desired size of the X label area in backend units (pixels).
-    If set to 0, the X label area is removed.
+      If set to 0, the X label area is removed.
 
     See [`ChartBuilder::on()`] for more information and examples.
     */
@@ -206,7 +206,7 @@
     Sets the size of the Y label area to the left of the chart.
 
     - `size`: The desired size of the Y label area in backend units (pixels).
-    If set to 0, the Y label area is removed.
+      If set to 0, the Y label area is removed.
 
     See [`ChartBuilder::on()`] for more information and examples.
     */
@@ -218,7 +218,7 @@
     Sets the size of the X label area at the top of the chart.
 
     - `size`: The desired size of the top X label area in backend units (pixels).
-    If set to 0, the top X label area is removed.
+      If set to 0, the top X label area is removed.
 
     See [`ChartBuilder::on()`] for more information and examples.
     */
@@ -230,7 +230,7 @@
     Sets the size of the Y label area to the right of the chart.
 
     - `size`: The desired size of the Y label area in backend units (pixels).
-    If set to 0, the Y label area to the right is removed.
+      If set to 0, the Y label area to the right is removed.
 
     See [`ChartBuilder::on()`] for more information and examples.
     */
@@ -243,7 +243,7 @@
 
     - `pos`: The position of the desired label area to adjust
     - `size`: The desired size of the label area in backend units (pixels).
-    If set to 0, the label area is removed.
+      If set to 0, the label area is removed.
 
     See [`ChartBuilder::on()`] for more information and examples.
     */
@@ -285,12 +285,12 @@
     #[deprecated(
         note = "`build_ranged` has been renamed to `build_cartesian_2d` and is to be removed in the future."
     )]
-    pub fn build_ranged<X: AsRangedCoord, Y: AsRangedCoord>(
+    pub fn build_ranged<'c, X: AsRangedCoord, Y: AsRangedCoord>(
         &mut self,
         x_spec: X,
         y_spec: Y,
     ) -> Result<
-        ChartContext<'a, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
+        ChartContext<'c, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
         DrawingAreaErrorKind<DB::ErrorType>,
     > {
         self.build_cartesian_2d(x_spec, y_spec)
@@ -306,12 +306,12 @@
     See [`ChartBuilder::on()`] and [`ChartContext::configure_mesh()`] for more information and examples.
     */
     #[allow(clippy::type_complexity)]
-    pub fn build_cartesian_2d<X: AsRangedCoord, Y: AsRangedCoord>(
+    pub fn build_cartesian_2d<'c, X: AsRangedCoord, Y: AsRangedCoord>(
         &mut self,
         x_spec: X,
         y_spec: Y,
     ) -> Result<
-        ChartContext<'a, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
+        ChartContext<'c, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
         DrawingAreaErrorKind<DB::ErrorType>,
     > {
         let mut label_areas = [None, None, None, None];
@@ -450,13 +450,13 @@
     See [`ChartBuilder::on()`] and [`ChartContext::configure_axes()`] for more information and examples.
     */
     #[allow(clippy::type_complexity)]
-    pub fn build_cartesian_3d<X: AsRangedCoord, Y: AsRangedCoord, Z: AsRangedCoord>(
+    pub fn build_cartesian_3d<'c, X: AsRangedCoord, Y: AsRangedCoord, Z: AsRangedCoord>(
         &mut self,
         x_spec: X,
         y_spec: Y,
         z_spec: Z,
     ) -> Result<
-        ChartContext<'a, DB, Cartesian3d<X::CoordDescType, Y::CoordDescType, Z::CoordDescType>>,
+        ChartContext<'c, DB, Cartesian3d<X::CoordDescType, Y::CoordDescType, Z::CoordDescType>>,
         DrawingAreaErrorKind<DB::ErrorType>,
     > {
         let mut drawing_area = DrawingArea::clone(self.root_area);
@@ -565,4 +565,27 @@
         chart.caption("This is a test case", ("serif", 10));
         assert_eq!(chart.title.as_ref().unwrap().1.font.get_name(), "serif");
     }
+
+    #[test]
+    fn test_zero_limit_with_log_scale() {
+        let drawing_area = create_mocked_drawing_area(640, 480, |_| {});
+
+        let mut chart = ChartBuilder::on(&drawing_area)
+            .build_cartesian_2d(0f32..10f32, (1e-6f32..1f32).log_scale())
+            .unwrap();
+
+        let data = vec![
+            (2f32, 1e-4f32),
+            (4f32, 1e-3f32),
+            (6f32, 1e-2f32),
+            (8f32, 1e-1f32),
+        ];
+
+        chart
+            .draw_series(
+                data.iter()
+                    .map(|&(x, y)| Rectangle::new([(x - 0.5, 0.0), (x + 0.5, y)], RED.filled())),
+            )
+            .unwrap();
+    }
 }

crates/plotters/src/chart/context.rs

diff --git a/crates/plotters/src/chart/context.rs b/crates/plotters/src/chart/context.rs
index ef91af1..c63ee3b 100644
--- a/crates/plotters/src/chart/context.rs
+++ b/crates/plotters/src/chart/context.rs
@@ -171,13 +171,13 @@
         let mut chart = cs.clone().restore(&drawing_area);
 
         chart
-            .draw_series(std::iter::once(Circle::new((5, 5), 5, &RED)))
+            .draw_series(std::iter::once(Circle::new((5, 5), 5, RED)))
             .expect("Drawing error");
         chart
-            .draw_secondary_series(std::iter::once(Circle::new((0.3, 0.8), 5, &GREEN)))
+            .draw_secondary_series(std::iter::once(Circle::new((0.3, 0.8), 5, GREEN)))
             .expect("Drawing error")
             .label("Test label")
-            .legend(|(x, y)| Rectangle::new([(x - 10, y - 5), (x, y + 5)], &GREEN));
+            .legend(|(x, y)| Rectangle::new([(x - 10, y - 5), (x, y + 5)], GREEN));
 
         chart
             .configure_series_labels()
@@ -215,7 +215,7 @@
         let mut chart = cs.clone().restore(&drawing_area);
 
         chart
-            .draw_series(std::iter::once(Circle::new((5, 5, 5), 5, &RED)))
+            .draw_series(std::iter::once(Circle::new((5, 5, 5), 5, RED)))
             .expect("Drawing error");
     }
 }

crates/plotters/src/chart/context/cartesian3d/mod.rs

diff --git a/crates/plotters/src/chart/context/cartesian3d/mod.rs b/crates/plotters/src/chart/context/cartesian3d/mod.rs
index ff28adf..43d74f3 100644
--- a/crates/plotters/src/chart/context/cartesian3d/mod.rs
+++ b/crates/plotters/src/chart/context/cartesian3d/mod.rs
@@ -106,9 +106,9 @@
     /// Override the 3D projection matrix. This function allows to override the default projection
     /// matrix.
     /// - `pf`: A function that takes the default projection matrix configuration and returns the
-    /// projection matrix. This function will allow you to adjust the pitch, yaw angle and the
-    /// centeral point of the projection, etc. You can also build a projection matrix which is not
-    /// relies on the default configuration as well.
+    ///   projection matrix. This function will allow you to adjust the pitch, yaw angle and the
+    ///   centeral point of the projection, etc. You can also build a projection matrix which is not
+    ///   relies on the default configuration as well.
     pub fn with_projection<P: FnOnce(ProjectionMatrixBuilder) -> ProjectionMatrix>(
         &mut self,
         pf: P,

crates/plotters/src/chart/dual_coord.rs

diff --git a/crates/plotters/src/chart/dual_coord.rs b/crates/plotters/src/chart/dual_coord.rs
index 434e347..048bea0 100644
--- a/crates/plotters/src/chart/dual_coord.rs
+++ b/crates/plotters/src/chart/dual_coord.rs
@@ -17,7 +17,7 @@
 use plotters_backend::{BackendCoord, DrawingBackend};
 
 /// The chart context that has two coordinate system attached.
-/// This situation is quite common, for example, we with two different coodinate system.
+/// This situation is quite common, for example, we with two different coordinate system.
 /// For instance this example <img src="https://plotters-rs.github.io/plotters-doc-data/twoscale.png"></img>
 /// This is done by attaching  a second coordinate system to ChartContext by method [ChartContext::set_secondary_coord](struct.ChartContext.html#method.set_secondary_coord).
 /// For instance of dual coordinate charts, see [this example](https://github.com/plotters-rs/plotters/blob/master/examples/two-scales.rs#L15).

crates/plotters/src/chart/series.rs

diff --git a/crates/plotters/src/chart/series.rs b/crates/plotters/src/chart/series.rs
index 4aecf6a..997f30d 100644
--- a/crates/plotters/src/chart/series.rs
+++ b/crates/plotters/src/chart/series.rs
@@ -72,6 +72,7 @@
 
 See [`ChartContext::configure_series_labels()`] for more information and examples.
 */
+#[derive(Debug, Clone, PartialEq)]
 pub enum SeriesLabelPosition {
     /// Places the series label at the upper left
     UpperLeft,
@@ -101,18 +102,14 @@
         (
             match self {
                 UpperLeft | MiddleLeft | LowerLeft => 5,
-                UpperMiddle | MiddleMiddle | LowerMiddle => {
-                    (area_dim.0 as i32 - label_dim.0 as i32) / 2
-                }
-                UpperRight | MiddleRight | LowerRight => area_dim.0 as i32 - label_dim.0 as i32 - 5,
+                UpperMiddle | MiddleMiddle | LowerMiddle => (area_dim.0 as i32 - label_dim.0) / 2,
+                UpperRight | MiddleRight | LowerRight => area_dim.0 as i32 - label_dim.0 - 5,
                 Coordinate(x, _) => *x,
             },
             match self {
                 UpperLeft | UpperMiddle | UpperRight => 5,
-                MiddleLeft | MiddleMiddle | MiddleRight => {
-                    (area_dim.1 as i32 - label_dim.1 as i32) / 2
-                }
-                LowerLeft | LowerMiddle | LowerRight => area_dim.1 as i32 - label_dim.1 as i32 - 5,
+                MiddleLeft | MiddleMiddle | MiddleRight => (area_dim.1 as i32 - label_dim.1) / 2,
+                LowerLeft | LowerMiddle | LowerRight => area_dim.1 as i32 - label_dim.1 - 5,
                 Coordinate(_, y) => *y,
             },
         )

crates/plotters/src/chart/state.rs

diff --git a/crates/plotters/src/chart/state.rs b/crates/plotters/src/chart/state.rs
index 1ce2f82..55c4056 100644
--- a/crates/plotters/src/chart/state.rs
+++ b/crates/plotters/src/chart/state.rs
@@ -50,7 +50,7 @@
 
 impl<'a, DB: DrawingBackend, CT: CoordTranslate> ChartContext<'a, DB, CT> {
     /// Convert a chart context into a chart state, by doing so, the chart context is consumed and
-    /// a saved chart state is created for later use. This is typically used in incrmental rendering. See documentation of `ChartState` for more detailed example.
+    /// a saved chart state is created for later use. This is typically used in incremental rendering. See documentation of `ChartState` for more detailed example.
     pub fn into_chart_state(self) -> ChartState<CT> {
         self.into()
     }

crates/plotters/src/coord/mod.rs

diff --git a/crates/plotters/src/coord/mod.rs b/crates/plotters/src/coord/mod.rs
index 574929d..b01fc69 100644
--- a/crates/plotters/src/coord/mod.rs
+++ b/crates/plotters/src/coord/mod.rs
@@ -1,7 +1,7 @@
 /*!
 
 One of the key features of Plotters is flexible coordinate system abstraction and this module
-provides all the abstraction used for the coordinate abstarction of Plotters.
+provides all the abstraction used for the coordinate abstraction of Plotters.
 
 Generally speaking, the coordinate system in Plotters is responsible for mapping logic data points into
 pixel based backend coordinate. This task is abstracted by a simple trait called

crates/plotters/src/coord/ranged1d/combinators/ckps.rs

diff --git a/crates/plotters/src/coord/ranged1d/combinators/ckps.rs b/crates/plotters/src/coord/ranged1d/combinators/ckps.rs
index 5e1ed72..402ffd8 100644
--- a/crates/plotters/src/coord/ranged1d/combinators/ckps.rs
+++ b/crates/plotters/src/coord/ranged1d/combinators/ckps.rs
@@ -11,7 +11,7 @@
 /// This decorator allows customized tick mark specifiied by vector.
 /// See [BindKeyPoints::with_key_points](trait.BindKeyPoints.html#tymethod.with_key_points)
 /// for details.
-/// Note: For any coordinate spec wrapped by this decorator, the maxium number of labels configured by
+/// Note: For any coordinate spec wrapped by this decorator, the maximum number of labels configured by
 /// MeshStyle will be ignored and the key point function will always returns the entire vector
 pub struct WithKeyPoints<Inner: Ranged> {
     inner: Inner,
@@ -122,7 +122,7 @@
 impl<T: AsRangedCoord> BindKeyPoints for T {}
 
 /// The coordinate decorator that allows customized keypoint algorithms.
-/// Normally, all the coordinate spec implements its own key point algorith
+/// Normally, all the coordinate spec implements its own key point algorithm
 /// But this decorator allows you override the pre-defined key point algorithm.
 ///
 /// To use this decorator, see [BindKeyPointMethod::with_key_point_func](trait.BindKeyPointMethod.html#tymethod.with_key_point_func)

crates/plotters/src/coord/ranged1d/combinators/group_by.rs

diff --git a/crates/plotters/src/coord/ranged1d/combinators/group_by.rs b/crates/plotters/src/coord/ranged1d/combinators/group_by.rs
index 5c0a4e5..28e72ee 100644
--- a/crates/plotters/src/coord/ranged1d/combinators/group_by.rs
+++ b/crates/plotters/src/coord/ranged1d/combinators/group_by.rs
@@ -82,16 +82,15 @@
         let idx_iter = (0..hint.bold_points()).map(|x| x * interval);
 
         if hint.weight().allow_light_points() && count < hint.bold_points() * 2 {
-            let outter_ticks = idx_iter;
-            let outter_tick_size = interval * self.1;
-            let inner_ticks_per_group = hint.max_num_points() / outter_ticks.len();
-            let inner_ticks =
-                (outter_tick_size + inner_ticks_per_group - 1) / inner_ticks_per_group;
-            let inner_ticks: Vec<_> = (0..(outter_tick_size / inner_ticks))
+            let outer_ticks = idx_iter;
+            let outer_tick_size = interval * self.1;
+            let inner_ticks_per_group = hint.max_num_points() / outer_ticks.len();
+            let inner_ticks = (outer_tick_size + inner_ticks_per_group - 1) / inner_ticks_per_group;
+            let inner_ticks: Vec<_> = (0..(outer_tick_size / inner_ticks))
                 .map(move |x| x * inner_ticks)
                 .collect();
             let size = self.0.size();
-            return outter_ticks
+            return outer_ticks
                 .flat_map(|base| inner_ticks.iter().map(move |&ofs| base * self.1 + ofs))
                 .take_while(|&idx| idx < size)
                 .map(|x| self.0.from_index(x).unwrap())

crates/plotters/src/coord/ranged1d/combinators/linspace.rs

diff --git a/crates/plotters/src/coord/ranged1d/combinators/linspace.rs b/crates/plotters/src/coord/ranged1d/combinators/linspace.rs
index 7f4ac86..14b5eba 100644
--- a/crates/plotters/src/coord/ranged1d/combinators/linspace.rs
+++ b/crates/plotters/src/coord/ranged1d/combinators/linspace.rs
@@ -152,7 +152,7 @@
     }
 }
 
-/// The coordinate combinator that transform a continous coordinate to a discrete coordinate
+/// The coordinate combinator that transform a continuous coordinate to a discrete coordinate
 /// to a discrete coordinate by a giving step.
 ///
 /// For example, range `0f32..100f32` is a continuous coordinate, thus this prevent us having a
@@ -315,7 +315,7 @@
     }
 
     fn from_index(&self, idx: usize) -> Option<T::ValueType> {
-        self.grid_value.get(idx).map(Clone::clone)
+        self.grid_value.get(idx).cloned()
     }
 }
 

crates/plotters/src/coord/ranged1d/combinators/logarithmic.rs

diff --git a/crates/plotters/src/coord/ranged1d/combinators/logarithmic.rs b/crates/plotters/src/coord/ranged1d/combinators/logarithmic.rs
index fee36f3..cd1dfd5 100644
--- a/crates/plotters/src/coord/ranged1d/combinators/logarithmic.rs
+++ b/crates/plotters/src/coord/ranged1d/combinators/logarithmic.rs
@@ -46,11 +46,14 @@
 impl_log_scalable!(i, u16);
 impl_log_scalable!(i, u32);
 impl_log_scalable!(i, u64);
+impl_log_scalable!(i, usize);
 
 impl_log_scalable!(i, i8);
 impl_log_scalable!(i, i16);
 impl_log_scalable!(i, i32);
 impl_log_scalable!(i, i64);
+impl_log_scalable!(i, i128);
+impl_log_scalable!(i, isize);
 
 impl_log_scalable!(f, f32);
 impl_log_scalable!(f, f64);
@@ -75,7 +78,7 @@
     }
 }
 
-/// The logarithmic coodinate decorator.
+/// The logarithmic coordinate decorator.
 /// This decorator is used to make the axis rendered as logarithmically.
 #[derive(Clone)]
 pub struct LogRangeExt<V: LogScalable> {
@@ -100,7 +103,7 @@
         self
     }
 
-    /// Set the base multipler
+    /// Set the base multiplier
     pub fn base(mut self, base: f64) -> Self {
         if self.base > 1.0 {
             self.base = base;
@@ -178,7 +181,7 @@
         let a = V::from_f64(fv + self.zero_point);
         let b = V::from_f64(self.zero_point);
 
-        (V::as_f64(&a) - V::as_f64(&b)).abs() < std::f64::EPSILON
+        (V::as_f64(&a) - V::as_f64(&b)).abs() < f64::EPSILON
     }
 }
 
@@ -253,7 +256,7 @@
     }
 }
 
-/// The logarithmic coodinate decorator.
+/// The logarithmic coordinate decorator.
 /// This decorator is used to make the axis rendered as logarithmically.
 #[deprecated(note = "LogRange is deprecated, use IntoLogRange trait method instead")]
 #[derive(Clone)]

crates/plotters/src/coord/ranged1d/discrete.rs

diff --git a/crates/plotters/src/coord/ranged1d/discrete.rs b/crates/plotters/src/coord/ranged1d/discrete.rs
index 074eece..8b5da4b 100644
--- a/crates/plotters/src/coord/ranged1d/discrete.rs
+++ b/crates/plotters/src/coord/ranged1d/discrete.rs
@@ -20,8 +20,8 @@
 
     /// Map a value to the index
     ///
-    /// Note: This function doesn't guareentee return None when the value is out of range.
-    /// The only way to confirm the value is in the range is to examing the return value isn't
+    /// Note: This function doesn't guarantee return None when the value is out of range.
+    /// The only way to confirm the value is in the range is to examining the return value isn't
     /// larger than self.size.
     ///
     /// - `value`: The value to map
@@ -30,11 +30,11 @@
 
     /// Reverse map the index to the value
     ///
-    /// Note: This function doesn't guareentee returning None when the index is out of range.
+    /// Note: This function doesn't guarantee returning None when the index is out of range.
     ///
     /// - `value`: The index to map
     /// - **returns** The value
-    // TODO: This doesn't follows rust's naming convention - however, this is a protential breaking
+    // TODO: This doesn't follows rust's naming convention - however, this is a potential breaking
     // change, so postpone the fix to the next major release
     #[allow(clippy::wrong_self_convention)]
     fn from_index(&self, index: usize) -> Option<Self::ValueType>;
@@ -87,13 +87,14 @@
 }
 
 /// A `SegmentedCoord` is a decorator on any discrete coordinate specification.
-/// This decorator will convert the discrete coordiante in two ways:
-/// - Add an extra dummy element after all the values in origianl discrete coordinate
-/// - Logically each value `v` from original coordinate system is mapped into an segment `[v, v+1)` where `v+1` denotes the sucessor of the `v`
+/// This decorator will convert the discrete coordinate in two ways:
+/// - Add an extra dummy element after all the values in original discrete coordinate
+/// - Logically each value `v` from original coordinate system is mapped into an segment `[v, v+1)` where `v+1` denotes the successor of the `v`
 /// - Introduce two types of values `SegmentValue::Exact(value)` which denotes the left end of value's segment and `SegmentValue::CenterOf(value)` which refers the center of the segment.
-/// This is used in histogram types, which uses a discrete coordinate as the buckets. The segmented coord always emits `CenterOf(value)` key points, thus it allows all the label and tick marks
-/// of the coordinate rendered in the middle of each segment.
-/// The coresponding trait [IntoSegmentedCoord](trait.IntoSegmentedCoord.html) is used to apply this decorator to coordinates.
+///   This is used in histogram types, which uses a discrete coordinate as the buckets.
+///   The segmented coord always emits `CenterOf(value)` key points, thus it allows all the label and tick marks
+///   of the coordinate rendered in the middle of each segment.
+///   The corresponding trait [IntoSegmentedCoord](trait.IntoSegmentedCoord.html) is used to apply this decorator to coordinates.
 #[derive(Clone)]
 pub struct SegmentedCoord<D: DiscreteRanged>(D);
 

crates/plotters/src/coord/ranged1d/mod.rs

diff --git a/crates/plotters/src/coord/ranged1d/mod.rs b/crates/plotters/src/coord/ranged1d/mod.rs
index 97664a2..1b2072c 100644
--- a/crates/plotters/src/coord/ranged1d/mod.rs
+++ b/crates/plotters/src/coord/ranged1d/mod.rs
@@ -61,7 +61,7 @@
 
 /// Since stable Rust doesn't have specialization, it's very hard to make our own trait that
 /// automatically implemented the value formatter. This trait uses as a marker indicates if we
-/// should automatically implement the default value formater based on it's `Debug` trait
+/// should automatically implement the default value formatter based on it's `Debug` trait
 pub trait DefaultValueFormatOption {}
 
 /// This makes the ranged coord uses the default `Debug` based formatting
@@ -115,7 +115,7 @@
 /// The trait for a hint provided to the key point algorithm used by the coordinate specs.
 /// The most important constraint is the `max_num_points` which means the algorithm could emit no more than specific number of key points
 /// `weight` is used to determine if this is used as a bold grid line or light grid line
-/// `bold_points` returns the max number of coresponding bold grid lines
+/// `bold_points` returns the max number of corresponding bold grid lines
 pub trait KeyPointHint {
     /// Returns the max number of key points
     fn max_num_points(&self) -> usize;
@@ -186,12 +186,12 @@
     /// This marker decides if Plotters default [ValueFormatter](trait.ValueFormatter.html) implementation should be used.
     /// This associated type can be one of the following two types:
     /// - [DefaultFormatting](struct.DefaultFormatting.html) will allow Plotters to automatically impl
-    /// the formatter based on `Debug` trait, if `Debug` trait is not impl for the `Self::Value`,
-    /// [ValueFormatter](trait.ValueFormatter.html) will not impl unless you impl it manually.
+    ///   the formatter based on `Debug` trait, if `Debug` trait is not impl for the `Self::Value`,
+    ///   [ValueFormatter](trait.ValueFormatter.html) will not impl unless you impl it manually.
     ///
     /// - [NoDefaultFormatting](struct.NoDefaultFormatting.html) Disable the automatic `Debug`
-    /// based value formatting. Thus you have to impl the
-    /// [ValueFormatter](trait.ValueFormatter.html) manually.
+    ///   based value formatting. Thus you have to impl the
+    ///   [ValueFormatter](trait.ValueFormatter.html) manually.
     ///
     type FormatOption: DefaultValueFormatOption;
 

crates/plotters/src/coord/ranged1d/types/datetime.rs

diff --git a/crates/plotters/src/coord/ranged1d/types/datetime.rs b/crates/plotters/src/coord/ranged1d/types/datetime.rs
index 0a532f8..3ab62d1 100644
--- a/crates/plotters/src/coord/ranged1d/types/datetime.rs
+++ b/crates/plotters/src/coord/ranged1d/types/datetime.rs
@@ -163,9 +163,11 @@
 
 impl TimeValue for NaiveDateTime {
     type DateType = NaiveDate;
+
     fn date_floor(&self) -> NaiveDate {
         self.date()
     }
+
     fn date_ceil(&self) -> NaiveDate {
         if self.time().num_seconds_from_midnight() > 0 {
             self.date() + Duration::days(1)
@@ -173,6 +175,7 @@
             self.date()
         }
     }
+
     fn earliest_after_date(date: NaiveDate) -> NaiveDateTime {
         date.and_hms(0, 0, 0)
     }
@@ -779,7 +782,7 @@
 
                 while current < self.1 {
                     ret.push(current);
-                    current = current + Duration::nanoseconds(period as i64);
+                    current += Duration::nanoseconds(period as i64);
                 }
 
                 return ret;
@@ -818,7 +821,7 @@
 
         while current < self.1 {
             ret.push(current);
-            current = current + Duration::days(i64::from(days_per_tick));
+            current += Duration::days(i64::from(days_per_tick));
         }
 
         ret
@@ -828,7 +831,7 @@
 #[allow(clippy::inconsistent_digit_grouping)]
 fn compute_period_per_point(total_ns: u64, max_points: usize, sub_daily: bool) -> Option<u64> {
     let min_ns_per_point = total_ns as f64 / max_points as f64;
-    let actual_ns_per_point: u64 = (10u64).pow((min_ns_per_point as f64).log10().floor() as u32);
+    let actual_ns_per_point: u64 = (10u64).pow(min_ns_per_point.log10().floor() as u32);
 
     fn determine_actual_ns_per_point(
         total_ns: u64,
@@ -850,7 +853,7 @@
 
     if actual_ns_per_point < 1_000_000_000 {
         Some(determine_actual_ns_per_point(
-            total_ns as u64,
+            total_ns,
             actual_ns_per_point,
             &[1, 2, 5],
             10,
@@ -858,7 +861,7 @@
         ))
     } else if actual_ns_per_point < 3600_000_000_000 {
         Some(determine_actual_ns_per_point(
-            total_ns as u64,
+            total_ns,
             1_000_000_000,
             &[1, 2, 5, 10, 15, 20, 30],
             60,
@@ -866,7 +869,7 @@
         ))
     } else if actual_ns_per_point < 3600_000_000_000 * 24 {
         Some(determine_actual_ns_per_point(
-            total_ns as u64,
+            total_ns,
             3600_000_000_000,
             &[1, 2, 4, 8, 12],
             24,
@@ -875,7 +878,7 @@
     } else if !sub_daily {
         if actual_ns_per_point < 3600_000_000_000 * 24 * 10 {
             Some(determine_actual_ns_per_point(
-                total_ns as u64,
+                total_ns,
                 3600_000_000_000 * 24,
                 &[1, 2, 5, 7],
                 10,
@@ -883,7 +886,7 @@
             ))
         } else {
             Some(determine_actual_ns_per_point(
-                total_ns as u64,
+                total_ns,
                 3600_000_000_000 * 24 * 10,
                 &[1, 2, 5],
                 10,
@@ -1115,7 +1118,7 @@
     #[test]
     fn test_datetime_nano_range() {
         let start = Utc.ymd(2019, 1, 1).and_hms(0, 0, 0);
-        let end = start.clone() + Duration::nanoseconds(100);
+        let end = start + Duration::nanoseconds(100);
         let coord: RangedDateTime<_> = (start..end).into();
 
         let kps = coord.key_points(50);

crates/plotters/src/coord/ranged1d/types/mod.rs

diff --git a/crates/plotters/src/coord/ranged1d/types/mod.rs b/crates/plotters/src/coord/ranged1d/types/mod.rs
index 5a5ca48..6a0fd86 100644
--- a/crates/plotters/src/coord/ranged1d/types/mod.rs
+++ b/crates/plotters/src/coord/ranged1d/types/mod.rs
@@ -1,6 +1,7 @@
 #[cfg(feature = "chrono")]
 mod datetime;
 #[cfg(feature = "chrono")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "chrono")))]
 pub use datetime::{
     IntoMonthly, IntoYearly, Monthly, RangedDate, RangedDateTime, RangedDuration, Yearly,
 };
@@ -8,7 +9,7 @@
 mod numeric;
 pub use numeric::{
     RangedCoordf32, RangedCoordf64, RangedCoordi128, RangedCoordi32, RangedCoordi64,
-    RangedCoordu128, RangedCoordu32, RangedCoordu64, RangedCoordusize,
+    RangedCoordisize, RangedCoordu128, RangedCoordu32, RangedCoordu64, RangedCoordusize,
 };
 
 mod slice;

crates/plotters/src/coord/ranged1d/types/numeric.rs

diff --git a/crates/plotters/src/coord/ranged1d/types/numeric.rs b/crates/plotters/src/coord/ranged1d/types/numeric.rs
index a4e7b2b..8a9ab2d 100644
--- a/crates/plotters/src/coord/ranged1d/types/numeric.rs
+++ b/crates/plotters/src/coord/ranged1d/types/numeric.rs
@@ -87,6 +87,14 @@
                     return limit.1;
                 }
 
+                if logic_length.is_infinite() {
+                    if logic_length.is_sign_positive() {
+                        return limit.1;
+                    } else {
+                        return limit.0;
+                    }
+                }
+
                 if actual_length > 0 {
                     return limit.0 + (actual_length as f64 * logic_length + 1e-3).floor() as i32;
                 } else {
@@ -117,7 +125,7 @@
 
             assert!(!(range.0.is_nan() || range.1.is_nan()));
 
-            if (range.0 - range.1).abs() < std::f64::EPSILON {
+            if (range.0 - range.1).abs() < f64::EPSILON {
                 return vec![range.0 as $type];
             }
 
@@ -133,7 +141,7 @@
                 } else {
                     a - (a / b).ceil() * b
                 };
-                if (ret - b).abs() < std::f64::EPSILON {
+                if (ret - b).abs() < f64::EPSILON {
                     0.0
                 } else {
                     ret
@@ -183,7 +191,7 @@
             let left_base = (left / value_granularity).floor() * value_granularity;
             let mut left_relative = left - left_base;
             let right = range.1 - rem_euclid(range.1, scale);
-            while (right - left_relative - left_base) >= -std::f64::EPSILON {
+            while (right - left_relative - left_base) >= -f64::EPSILON {
                 let new_left_relative =
                     (left_relative / value_granularity).round() * value_granularity;
                 if new_left_relative < 0.0 {
@@ -354,14 +362,14 @@
     fn test_key_points() {
         let kp = compute_i32_key_points((0, 999), 28);
 
-        assert!(kp.len() > 0);
+        assert!(!kp.is_empty());
         assert!(kp.len() <= 28);
 
         let kp = compute_f64_key_points((-1.2, 1.2), 1);
         assert!(kp.len() == 1);
 
         let kp = compute_f64_key_points((-1.2, 1.2), 0);
-        assert!(kp.len() == 0);
+        assert!(kp.is_empty());
     }
 
     #[test]
@@ -404,7 +412,7 @@
     fn test_small_coord() {
         let coord: RangedCoordf64 = (0.0..1e-25).into();
         let points = coord.key_points(10);
-        assert!(points.len() > 0);
+        assert!(!points.is_empty());
     }
 
     #[test]
@@ -414,7 +422,7 @@
     }
 
     #[test]
-    fn regession_test_issue_358_key_points_no_hang() {
+    fn regression_test_issue_358_key_points_no_hang() {
         let coord: RangedCoordf64 = (-200.0..801.0).into();
         let points = coord.key_points(500);
         assert!(points.len() <= 500);
@@ -448,6 +456,6 @@
     fn regression_test_issue_304_intmax_keypoint_no_panic() {
         let coord: RangedCoordu32 = (0..u32::MAX).into();
         let p = coord.key_points(10);
-        assert!(p.len() > 0 && p.len() <= 10);
+        assert!(!p.is_empty() && p.len() <= 10);
     }
 }

crates/plotters/src/coord/ranged2d/cartesian.rs

diff --git a/crates/plotters/src/coord/ranged2d/cartesian.rs b/crates/plotters/src/coord/ranged2d/cartesian.rs
index 5052a62..57d2240 100644
--- a/crates/plotters/src/coord/ranged2d/cartesian.rs
+++ b/crates/plotters/src/coord/ranged2d/cartesian.rs
@@ -2,9 +2,9 @@
  The 2-dimensional cartesian coordinate system.
 
  This module provides the 2D cartesian coordinate system, which is composed by two independent
- ranged 1D coordinate sepcification.
+ ranged 1D coordinate specification.
 
- This types of coordinate system is used by the chart constructed with [ChartBuilder::build_cartesian_2d](../../chart/ChartBuilder.html#method.build_cartesian_2d).
+ This type of coordinate system is used by the chart constructed with [ChartBuilder::build_cartesian_2d](../../chart/ChartBuilder.html#method.build_cartesian_2d).
 */
 
 use crate::coord::ranged1d::{KeyPointHint, Ranged, ReversibleRanged};

crates/plotters/src/data/data_range.rs

diff --git a/crates/plotters/src/data/data_range.rs b/crates/plotters/src/data/data_range.rs
index 445260b..3d42eec 100644
--- a/crates/plotters/src/data/data_range.rs
+++ b/crates/plotters/src/data/data_range.rs
@@ -16,9 +16,9 @@
 /// let range = fitting_range(&data);
 /// assert_eq!(range, std::ops::Range { start: -2, end: 14 });
 /// ```
-pub fn fitting_range<'a, T: 'a, I: IntoIterator<Item = &'a T>>(iter: I) -> Range<T>
+pub fn fitting_range<'a, T, I: IntoIterator<Item = &'a T>>(iter: I) -> Range<T>
 where
-    T: Zero + One + PartialOrd + Clone,
+    T: 'a + Zero + One + PartialOrd + Clone,
 {
     let (mut lb, mut ub) = (None, None);
 

crates/plotters/src/data/quartiles.rs

diff --git a/crates/plotters/src/data/quartiles.rs b/crates/plotters/src/data/quartiles.rs
index 054f51d..78613da 100644
--- a/crates/plotters/src/data/quartiles.rs
+++ b/crates/plotters/src/data/quartiles.rs
@@ -19,7 +19,7 @@
         assert!(0_f64 <= pct);
         let hundred = 100_f64;
         assert!(pct <= hundred);
-        if (pct - hundred).abs() < std::f64::EPSILON {
+        if (pct - hundred).abs() < f64::EPSILON {
             return s[s.len() - 1].into();
         }
         let length = (s.len() - 1) as f64;

crates/plotters/src/drawing/area.rs

diff --git a/crates/plotters/src/drawing/area.rs b/crates/plotters/src/drawing/area.rs
index 9519f37..e8981fe 100644
--- a/crates/plotters/src/drawing/area.rs
+++ b/crates/plotters/src/drawing/area.rs
@@ -113,9 +113,9 @@
 
 /// The abstraction of a drawing area. Plotters uses drawing area as the fundamental abstraction for the
 /// high level drawing API. The major functionality provided by the drawing area is
-///     1. Layout specification - Split the parent drawing area into sub-drawing-areas
-///     2. Coordinate Translation - Allows guest coordinate system attached and used for drawing.
-///     3. Element based drawing - drawing area provides the environment the element can be drawn onto it.
+/// 1. Layout specification - Split the parent drawing area into sub-drawing-areas
+/// 2. Coordinate Translation - Allows guest coordinate system attached and used for drawing.
+/// 3. Element based drawing - drawing area provides the environment the element can be drawn onto it.
 pub struct DrawingArea<DB: DrawingBackend, CT: CoordTranslate> {
     backend: Rc<RefCell<DB>>,
     rect: Rect,
@@ -258,12 +258,12 @@
 
     /// Compute the relative size based on the drawing area's height
     pub fn relative_to_height(&self, p: f64) -> f64 {
-        f64::from((self.rect.y1 - self.rect.y0).max(0)) * (p.min(1.0).max(0.0))
+        f64::from((self.rect.y1 - self.rect.y0).max(0)) * (p.clamp(0.0, 1.0))
     }
 
     /// Compute the relative size based on the drawing area's width
     pub fn relative_to_width(&self, p: f64) -> f64 {
-        f64::from((self.rect.x1 - self.rect.x0).max(0)) * (p.min(1.0).max(0.0))
+        f64::from((self.rect.x1 - self.rect.x0).max(0)) * (p.clamp(0.0, 1.0))
     }
 
     /// Get the pixel range of this area
@@ -548,7 +548,7 @@
         let drawing_area = create_mocked_drawing_area(1024, 768, |m| {
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, WHITE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (0, 0));
                 assert_eq!(d, (1024, 768));
             });
@@ -573,7 +573,7 @@
                     let colors = colors.clone();
                     m.check_draw_rect(move |c, _, f, u, d| {
                         assert_eq!(c, colors[col * 3 + row].to_rgba());
-                        assert_eq!(f, true);
+                        assert!(f);
                         assert_eq!(u, (300 * row as i32 + 2.min(row) as i32, 300 * col as i32));
                         assert_eq!(
                             d,
@@ -605,14 +605,14 @@
         let drawing_area = create_mocked_drawing_area(1024, 768, |m| {
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, RED.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (0, 0));
                 assert_eq!(d, (345, 768));
             });
 
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, BLUE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (345, 0));
                 assert_eq!(d, (1024, 768));
             });
@@ -633,14 +633,14 @@
         let drawing_area = create_mocked_drawing_area(1024, 768, |m| {
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, RED.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (0, 0));
                 assert_eq!(d, (1024, 345));
             });
 
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, BLUE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (0, 345));
                 assert_eq!(d, (1024, 768));
             });
@@ -658,7 +658,7 @@
 
     #[test]
     fn test_split_grid() {
-        let colors = vec![
+        let colors = [
             &RED, &BLUE, &YELLOW, &WHITE, &BLACK, &MAGENTA, &CYAN, &BLUE, &RED,
         ];
         let breaks: [i32; 5] = [100, 200, 300, 400, 500];
@@ -669,13 +669,13 @@
                     for row in 0..=nyb {
                         for col in 0..=nxb {
                             let get_bp = |full, limit, id| {
-                                (if id == 0 {
+                                if id == 0 {
                                     0
                                 } else if id > limit {
                                     full
                                 } else {
                                     breaks[id as usize - 1]
-                                }) as i32
+                                }
                             };
 
                             let expected_u = (get_bp(1024, nxb, col), get_bp(768, nyb, row));
@@ -686,7 +686,7 @@
 
                             m.check_draw_rect(move |c, _, f, u, d| {
                                 assert_eq!(c, expected_color.to_rgba());
-                                assert_eq!(f, true);
+                                assert!(f);
                                 assert_eq!(u, expected_u);
                                 assert_eq!(d, expected_d);
                             });
@@ -720,7 +720,7 @@
             });
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, WHITE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u.0, 0);
                 assert!(u.1 > 0);
                 assert_eq!(d, (1024, 768));
@@ -744,7 +744,7 @@
         let drawing_area = create_mocked_drawing_area(1024, 768, |m| {
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, WHITE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!(u, (3, 1));
                 assert_eq!(d, (1024 - 4, 768 - 2));
             });
@@ -795,7 +795,7 @@
         let drawing_area = create_mocked_drawing_area(1000, 1200, |m| {
             let mut counter = 0;
             m.check_draw_rect(move |c, _, f, u, d| {
-                assert_eq!(f, true);
+                assert!(f);
 
                 match counter {
                     0 => {

crates/plotters/src/drawing/mod.rs

diff --git a/crates/plotters/src/drawing/mod.rs b/crates/plotters/src/drawing/mod.rs
index 9e32d91..5c055fb 100644
--- a/crates/plotters/src/drawing/mod.rs
+++ b/crates/plotters/src/drawing/mod.rs
@@ -6,7 +6,7 @@
 It exposes a set of functions which allows basic shape, such as pixels, lines, rectangles, circles, to be drawn on the screen.
 The low-level API uses the pixel based coordinate.
 
-The high-level API is built on the top of high-level API. The `DrawingArea` type exposes the high-level drawing API to the remianing part
+The high-level API is built on the top of high-level API. The `DrawingArea` type exposes the high-level drawing API to the remaining part
 of Plotters. The basic drawing blocks are composable elements, which can be defined in logic coordinate. To learn more details
 about the [coordinate abstraction](../coord/index.html) and [element system](../element/index.html).
 */

crates/plotters/src/element/basic_shapes.rs

diff --git a/crates/plotters/src/element/basic_shapes.rs b/crates/plotters/src/element/basic_shapes.rs
index 7c0b9d4..c43af47 100644
--- a/crates/plotters/src/element/basic_shapes.rs
+++ b/crates/plotters/src/element/basic_shapes.rs
@@ -2,6 +2,16 @@
 use crate::style::{Color, ShapeStyle, SizeDesc};
 use plotters_backend::{BackendCoord, DrawingBackend, DrawingErrorKind};
 
+#[inline]
+fn to_i((x, y): (f32, f32)) -> (i32, i32) {
+    (x.round() as i32, y.round() as i32)
+}
+
+#[inline]
+fn to_f((x, y): (i32, i32)) -> (f32, f32) {
+    (x as f32, y as f32)
+}
+
 /**
 An element representing a single pixel.
 
@@ -64,7 +74,7 @@
             assert_eq!(b.draw_count, 1);
         });
     });
-    da.draw(&Pixel::new((150, 152), &RED))
+    da.draw(&Pixel::new((150, 152), RED))
         .expect("Drawing Failure");
 }
 
@@ -126,7 +136,255 @@
     });
     da.draw(&PathElement::new(
         vec![(100, 101), (105, 107), (150, 157)],
-        Into::<ShapeStyle>::into(&BLUE).stroke_width(5),
+        Into::<ShapeStyle>::into(BLUE).stroke_width(5),
+    ))
+    .expect("Drawing Failure");
+}
+
+/// An element of a series of connected lines in dash style.
+///
+/// It's similar to [`PathElement`] but has a dash style.
+pub struct DashedPathElement<I: Iterator + Clone, Size: SizeDesc> {
+    points: I,
+    size: Size,
+    spacing: Size,
+    style: ShapeStyle,
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc> DashedPathElement<I, Size> {
+    /// Create a new path
+    /// - `points`: The iterator of the points
+    /// - `size`: The dash size
+    /// - `spacing`: The dash-to-dash spacing (gap size)
+    /// - `style`: The shape style
+    /// - returns the created element
+    pub fn new<I0, S>(points: I0, size: Size, spacing: Size, style: S) -> Self
+    where
+        I0: IntoIterator<IntoIter = I>,
+        S: Into<ShapeStyle>,
+    {
+        Self {
+            points: points.into_iter(),
+            size,
+            spacing,
+            style: style.into(),
+        }
+    }
+}
+
+impl<'a, I: Iterator + Clone, Size: SizeDesc> PointCollection<'a, I::Item>
+    for &'a DashedPathElement<I, Size>
+{
+    type Point = I::Item;
+    type IntoIter = I;
+    fn point_iter(self) -> Self::IntoIter {
+        self.points.clone()
+    }
+}
+
+impl<I0: Iterator + Clone, Size: SizeDesc, DB: DrawingBackend> Drawable<DB>
+    for DashedPathElement<I0, Size>
+{
+    fn draw<I: Iterator<Item = BackendCoord>>(
+        &self,
+        mut points: I,
+        backend: &mut DB,
+        ps: (u32, u32),
+    ) -> Result<(), DrawingErrorKind<DB::ErrorType>> {
+        let mut start = match points.next() {
+            Some(c) => to_f(c),
+            None => return Ok(()),
+        };
+        let size = self.size.in_pixels(&ps).max(0) as f32;
+        if size == 0. {
+            return Ok(());
+        }
+        let spacing = self.spacing.in_pixels(&ps).max(0) as f32;
+        let mut dist = 0.;
+        let mut is_solid = true;
+        let mut queue = vec![to_i(start)];
+        for curr in points {
+            let end = to_f(curr);
+            // Loop for solid and spacing
+            while start != end {
+                let (dx, dy) = (end.0 - start.0, end.1 - start.1);
+                let d = dx.hypot(dy);
+                let size = if is_solid { size } else { spacing };
+                let left = size - dist;
+                // Set next point to `start`
+                if left < d {
+                    let t = left / d;
+                    start = (start.0 + dx * t, start.1 + dy * t);
+                    dist += left;
+                } else {
+                    start = end;
+                    dist += d;
+                }
+                // Draw if needed
+                if is_solid {
+                    queue.push(to_i(start));
+                }
+                if size <= dist {
+                    if is_solid {
+                        backend.draw_path(queue.drain(..), &self.style)?;
+                    } else {
+                        queue.push(to_i(start));
+                    }
+                    dist = 0.;
+                    is_solid = !is_solid;
+                }
+            }
+        }
+        if queue.len() > 1 {
+            backend.draw_path(queue, &self.style)?;
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn test_dashed_path_element() {
+    use crate::prelude::*;
+    let check_list = std::cell::RefCell::new(vec![
+        vec![(100, 100), (100, 103), (100, 105)],
+        vec![(100, 107), (100, 112)],
+        vec![(100, 114), (100, 119)],
+        vec![(100, 119), (100, 120)],
+    ]);
+    let da = crate::create_mocked_drawing_area(300, 300, |m| {
+        m.check_draw_path(move |c, s, path| {
+            assert_eq!(c, BLUE.to_rgba());
+            assert_eq!(s, 7);
+            assert_eq!(path, check_list.borrow_mut().remove(0));
+        });
+        m.drop_check(|b| {
+            assert_eq!(b.num_draw_path_call, 3);
+            assert_eq!(b.draw_count, 3);
+        });
+    });
+    da.draw(&DashedPathElement::new(
+        vec![(100, 100), (100, 103), (100, 120)],
+        5.,
+        2.,
+        BLUE.stroke_width(7),
+    ))
+    .expect("Drawing Failure");
+}
+
+/// An element of a series of connected lines in dot style for any markers.
+///
+/// It's similar to [`PathElement`] but use a marker function to draw markers with spacing.
+pub struct DottedPathElement<I: Iterator + Clone, Size: SizeDesc, Marker> {
+    points: I,
+    shift: Size,
+    spacing: Size,
+    func: Box<dyn Fn(BackendCoord) -> Marker>,
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc, Marker> DottedPathElement<I, Size, Marker> {
+    /// Create a new path
+    /// - `points`: The iterator of the points
+    /// - `shift`: The shift of the first marker
+    /// - `spacing`: The spacing between markers
+    /// - `func`: The marker function
+    /// - returns the created element
+    pub fn new<I0, F>(points: I0, shift: Size, spacing: Size, func: F) -> Self
+    where
+        I0: IntoIterator<IntoIter = I>,
+        F: Fn(BackendCoord) -> Marker + 'static,
+    {
+        Self {
+            points: points.into_iter(),
+            shift,
+            spacing,
+            func: Box::new(func),
+        }
+    }
+}
+
+impl<'a, I: Iterator + Clone, Size: SizeDesc, Marker> PointCollection<'a, I::Item>
+    for &'a DottedPathElement<I, Size, Marker>
+{
+    type Point = I::Item;
+    type IntoIter = I;
+    fn point_iter(self) -> Self::IntoIter {
+        self.points.clone()
+    }
+}
+
+impl<I0, Size, DB, Marker> Drawable<DB> for DottedPathElement<I0, Size, Marker>
+where
+    I0: Iterator + Clone,
+    Size: SizeDesc,
+    DB: DrawingBackend,
+    Marker: crate::element::IntoDynElement<'static, DB, BackendCoord>,
+{
+    fn draw<I: Iterator<Item = BackendCoord>>(
+        &self,
+        mut points: I,
+        backend: &mut DB,
+        ps: (u32, u32),
+    ) -> Result<(), DrawingErrorKind<DB::ErrorType>> {
+        let mut shift = self.shift.in_pixels(&ps).max(0) as f32;
+        let mut start = match points.next() {
+            Some(start_i) => {
+                // Draw the first marker if no shift
+                if shift == 0. {
+                    let mk = (self.func)(start_i).into_dyn();
+                    mk.draw(mk.point_iter().iter().copied(), backend, ps)?;
+                }
+                to_f(start_i)
+            }
+            None => return Ok(()),
+        };
+        let spacing = self.spacing.in_pixels(&ps).max(0) as f32;
+        let mut dist = 0.;
+        for curr in points {
+            let end = to_f(curr);
+            // Loop for spacing
+            while start != end {
+                let (dx, dy) = (end.0 - start.0, end.1 - start.1);
+                let d = dx.hypot(dy);
+                let spacing = if shift == 0. { spacing } else { shift };
+                let left = spacing - dist;
+                // Set next point to `start`
+                if left < d {
+                    let t = left / d;
+                    start = (start.0 + dx * t, start.1 + dy * t);
+                    dist += left;
+                } else {
+                    start = end;
+                    dist += d;
+                }
+                // Draw if needed
+                if spacing <= dist {
+                    let mk = (self.func)(to_i(start)).into_dyn();
+                    mk.draw(mk.point_iter().iter().copied(), backend, ps)?;
+                    shift = 0.;
+                    dist = 0.;
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn test_dotted_path_element() {
+    use crate::prelude::*;
+    let da = crate::create_mocked_drawing_area(300, 300, |m| {
+        m.drop_check(|b| {
+            assert_eq!(b.num_draw_path_call, 0);
+            assert_eq!(b.draw_count, 7);
+        });
+    });
+    da.draw(&DottedPathElement::new(
+        vec![(100, 100), (105, 105), (150, 150)],
+        5,
+        10,
+        |c| Circle::new(c, 5, Into::<ShapeStyle>::into(RED).filled()),
     ))
     .expect("Drawing Failure");
 }
@@ -160,6 +418,20 @@
         self.margin = (t, b, l, r);
         self
     }
+
+    /// Get the points of the rectangle
+    /// - returns the element points
+    pub fn get_points(&self) -> (&Coord, &Coord) {
+        (&self.points[0], &self.points[1])
+    }
+
+    /// Set the style of the rectangle
+    /// - `style`: The shape style
+    /// - returns a mut reference to the rectangle
+    pub fn set_style<S: Into<ShapeStyle>>(&mut self, style: S) -> &mut Self {
+        self.style = style.into();
+        self
+    }
 }
 
 impl<'a, Coord> PointCollection<'a, Coord> for &'a Rectangle<Coord> {
@@ -199,7 +471,7 @@
         let da = crate::create_mocked_drawing_area(300, 300, |m| {
             m.check_draw_rect(|c, s, f, u, d| {
                 assert_eq!(c, BLUE.to_rgba());
-                assert_eq!(f, false);
+                assert!(!f);
                 assert_eq!(s, 5);
                 assert_eq!([u, d], [(100, 101), (105, 107)]);
             });
@@ -219,7 +491,7 @@
         let da = crate::create_mocked_drawing_area(300, 300, |m| {
             m.check_draw_rect(|c, _, f, u, d| {
                 assert_eq!(c, BLUE.to_rgba());
-                assert_eq!(f, true);
+                assert!(f);
                 assert_eq!([u, d], [(100, 101), (105, 107)]);
             });
             m.drop_check(|b| {
@@ -284,7 +556,7 @@
     let da = crate::create_mocked_drawing_area(300, 300, |m| {
         m.check_draw_circle(|c, _, f, s, r| {
             assert_eq!(c, BLUE.to_rgba());
-            assert_eq!(f, false);
+            assert!(!f);
             assert_eq!(s, (150, 151));
             assert_eq!(r, 20);
         });
@@ -293,7 +565,7 @@
             assert_eq!(b.draw_count, 1);
         });
     });
-    da.draw(&Circle::new((150, 151), 20, &BLUE))
+    da.draw(&Circle::new((150, 151), 20, BLUE))
         .expect("Drawing Failure");
 }
 
@@ -353,6 +625,6 @@
         });
     });
 
-    da.draw(&Polygon::new(points.clone(), &BLUE))
+    da.draw(&Polygon::new(points.clone(), BLUE))
         .expect("Drawing Failure");
 }

crates/plotters/src/element/boxplot.rs

diff --git a/crates/plotters/src/element/boxplot.rs b/crates/plotters/src/element/boxplot.rs
index 2de2bd0..2ba20e3 100644
--- a/crates/plotters/src/element/boxplot.rs
+++ b/crates/plotters/src/element/boxplot.rs
@@ -74,7 +74,7 @@
     /// ```
     pub fn new_vertical(key: K, quartiles: &Quartiles) -> Self {
         Self {
-            style: Into::<ShapeStyle>::into(&BLACK),
+            style: Into::<ShapeStyle>::into(BLACK),
             width: DEFAULT_WIDTH,
             whisker_width: 1.0,
             offset: 0.0,
@@ -100,7 +100,7 @@
     /// ```
     pub fn new_horizontal(key: K, quartiles: &Quartiles) -> Self {
         Self {
-            style: Into::<ShapeStyle>::into(&BLACK),
+            style: Into::<ShapeStyle>::into(BLACK),
             width: DEFAULT_WIDTH,
             whisker_width: 1.0,
             offset: 0.0,

crates/plotters/src/element/image.rs

diff --git a/crates/plotters/src/element/image.rs b/crates/plotters/src/element/image.rs
index f50ce77..6c31c2d 100644
--- a/crates/plotters/src/element/image.rs
+++ b/crates/plotters/src/element/image.rs
@@ -89,7 +89,7 @@
     /// - `size`: The size of the bitmap
     /// - `buf`: The buffer to use
     /// - **returns**: The newly created image element, if the buffer isn't fit the image
-    /// dimension, this will returns an `None`.
+    ///   dimension, this will returns an `None`.
     pub fn with_owned_buffer(pos: Coord, size: (u32, u32), buf: Vec<u8>) -> Option<Self> {
         if buf.len() < (size.0 * size.1) as usize * P::PIXEL_SIZE {
             return None;
@@ -109,7 +109,7 @@
     /// - `size`: The size of the bitmap
     /// - `buf`: The buffer to use
     /// - **returns**: The newly created image element, if the buffer isn't fit the image
-    /// dimension, this will returns an `None`.
+    ///   dimension, this will returns an `None`.
     pub fn with_mut(pos: Coord, size: (u32, u32), buf: &'a mut [u8]) -> Option<Self> {
         if buf.len() < (size.0 * size.1) as usize * P::PIXEL_SIZE {
             return None;
@@ -123,14 +123,14 @@
         })
     }
 
-    /// Create a new bitmap element with a shared borrowed buffer. This means if we want to modifiy
+    /// Create a new bitmap element with a shared borrowed buffer. This means if we want to modify
     /// the content of the image, the buffer is automatically copied
     ///
     /// - `pos`: The left upper coordinate of the elelent
     /// - `size`: The size of the bitmap
     /// - `buf`: The buffer to use
     /// - **returns**: The newly created image element, if the buffer isn't fit the image
-    /// dimension, this will returns an `None`.
+    ///   dimension, this will returns an `None`.
     pub fn with_ref(pos: Coord, size: (u32, u32), buf: &'a [u8]) -> Option<Self> {
         if buf.len() < (size.0 * size.1) as usize * P::PIXEL_SIZE {
             return None;

crates/plotters/src/element/mod.rs

diff --git a/crates/plotters/src/element/mod.rs b/crates/plotters/src/element/mod.rs
index e279005..921b2c0 100644
--- a/crates/plotters/src/element/mod.rs
+++ b/crates/plotters/src/element/mod.rs
@@ -175,21 +175,25 @@
 #[cfg(feature = "candlestick")]
 mod candlestick;
 #[cfg(feature = "candlestick")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "candlestick")))]
 pub use candlestick::CandleStick;
 
 #[cfg(feature = "errorbar")]
 mod errorbar;
 #[cfg(feature = "errorbar")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "errorbar")))]
 pub use errorbar::{ErrorBar, ErrorBarOrientH, ErrorBarOrientV};
 
 #[cfg(feature = "boxplot")]
 mod boxplot;
 #[cfg(feature = "boxplot")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "boxplot")))]
 pub use boxplot::Boxplot;
 
 #[cfg(feature = "bitmap_backend")]
 mod image;
 #[cfg(feature = "bitmap_backend")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "bitmap_backend")))]
 pub use self::image::BitMapElement;
 
 mod dynelem;
@@ -214,7 +218,7 @@
 ///
 /// However,
 /// [Generic Associated Types](https://github.com/rust-lang/rfcs/blob/master/text/1598-generic_associated_types.md)
-/// is far away from stablize.
+/// is far away from stabilize.
 /// So currently we have the following workaround:
 ///
 /// Instead of implement the PointCollection trait on the element type itself, it implements on the

crates/plotters/src/element/pie.rs

diff --git a/crates/plotters/src/element/pie.rs b/crates/plotters/src/element/pie.rs
index 79fa927..964fe95 100644
--- a/crates/plotters/src/element/pie.rs
+++ b/crates/plotters/src/element/pie.rs
@@ -31,6 +31,7 @@
     label_style: TextStyle<'a>,
     label_offset: f64,
     percentage_style: Option<TextStyle<'a>>,
+    donut_hole: f64, // radius of the hole in case of a donut chart
 }
 
 impl<'a, Label: Display> Pie<'a, (i32, i32), Label> {
@@ -62,6 +63,7 @@
             label_style,
             label_offset: radius_5pct,
             percentage_style: None,
+            donut_hole: 0.0,
         }
     }
 
@@ -77,7 +79,7 @@
         self.start_radian = start_angle.to_radians();
     }
 
-    ///
+    /// Set the label style.
     pub fn label_style<T: Into<TextStyle<'a>>>(&mut self, label_style: T) {
         self.label_style = label_style.into();
     }
@@ -91,6 +93,15 @@
     pub fn percentages<T: Into<TextStyle<'a>>>(&mut self, label_style: T) {
         self.percentage_style = Some(label_style.into());
     }
+
+    /// Enables creating a donut chart with a hole of the specified radius.
+    ///
+    /// The passed value must be greater than zero and lower than the chart overall radius, otherwise it'll be ignored.
+    pub fn donut_hole(&mut self, hole_radius: f64) {
+        if hole_radius > 0.0 && hole_radius < *self.radius {
+            self.donut_hole = hole_radius;
+        }
+    }
 }
 
 impl<'a, DB: DrawingBackend, Label: Display> Drawable<DB> for Pie<'a, (i32, i32), Label> {
@@ -118,13 +129,19 @@
                 .get(index)
                 .ok_or_else(|| DrawingErrorKind::FontError(Box::new(PieError::LengthMismatch)))?;
             // start building wedge line against the previous edge
-            let mut points = vec![*self.center];
+            let mut points = if self.donut_hole == 0.0 {
+                vec![*self.center]
+            } else {
+                vec![]
+            };
             let ratio = slice / self.total;
             let theta_final = ratio * 2.0 * PI + offset_theta; // end radian for the wedge
 
             // calculate middle for labels before mutating offset
             let middle_theta = ratio * PI + offset_theta;
 
+            let slice_start = offset_theta;
+
             // calculate every fraction of radian for the wedge, offsetting for every iteration, clockwise
             //
             // a custom Range such as `for theta in offset_theta..=theta_final` would be more elegant
@@ -138,6 +155,19 @@
             // final point of the wedge may not fall exactly on a radian, so add it extra
             let final_coord = theta_to_ordinal_coord(*self.radius, theta_final, self.center);
             points.push(final_coord);
+
+            if self.donut_hole > 0.0 {
+                while offset_theta >= slice_start {
+                    let coord = theta_to_ordinal_coord(self.donut_hole, offset_theta, self.center);
+                    points.push(coord);
+                    offset_theta -= radian_increment;
+                }
+                // final point of the wedge may not fall exactly on a radian, so add it extra
+                let final_coord_inner =
+                    theta_to_ordinal_coord(self.donut_hole, slice_start, self.center);
+                points.push(final_coord_inner);
+            }
+
             // next wedge calculation will start from previous wedges's last radian
             offset_theta = theta_final;
 
@@ -163,8 +193,9 @@
                 let label_size = backend.estimate_text_size(&perc_label, percentage_style)?;
                 let text_x_mid = (label_size.0 as f64 / 2.0).round() as i32;
                 let text_y_mid = (label_size.1 as f64 / 2.0).round() as i32;
+                let perc_radius = (self.radius + self.donut_hole) / 2.0;
                 let perc_coord = theta_to_ordinal_coord(
-                    self.radius / 2.0,
+                    perc_radius,
                     middle_theta,
                     &(self.center.0 - text_x_mid, self.center.1 - text_y_mid),
                 );
@@ -230,7 +261,7 @@
         center.1 += 1;
         radius += 1.0;
         assert!(colors.get(0).is_none());
-        assert!(labels.get(0).is_none());
+        assert!(labels.first().is_none());
         assert_eq!(radius, 801.0);
     }
 }

crates/plotters/src/element/text.rs

diff --git a/crates/plotters/src/element/text.rs b/crates/plotters/src/element/text.rs
index ca813c7..9baa201 100644
--- a/crates/plotters/src/element/text.rs
+++ b/crates/plotters/src/element/text.rs
@@ -1,5 +1,4 @@
 use std::borrow::Borrow;
-use std::i32;
 
 use super::{Drawable, PointCollection};
 use crate::style::{FontDesc, FontResult, LayoutBox, TextStyle};
@@ -116,6 +115,10 @@
     }
 }
 
+// Rewrite of the layout function for multiline-text. It crashes when UTF-8 is used
+// instead of ASCII. Solution taken from:
+// https://stackoverflow.com/questions/68122526/splitting-a-utf-8-string-into-chunks
+// and modified for our purposes.
 fn layout_multiline_text<'a, F: FnMut(&'a str)>(
     text: &'a str,
     max_width: u32,
@@ -126,32 +129,61 @@
         if max_width == 0 || line.is_empty() {
             func(line);
         } else {
-            let mut remaining = &line[0..];
+            let mut indices = line.char_indices().map(|(idx, _)| idx).peekable();
 
-            while !remaining.is_empty() {
-                let mut left = 0;
-                while left < remaining.len() {
-                    let width = font.box_size(&remaining[0..=left]).unwrap_or((0, 0)).0 as i32;
+            let it = std::iter::from_fn(|| {
+                let start_idx = match indices.next() {
+                    Some(idx) => idx,
+                    None => return None,
+                };
 
+                // iterate over indices
+                for idx in indices.by_ref() {
+                    let substring = &line[start_idx..idx];
+                    let width = font.box_size(substring).unwrap_or((0, 0)).0 as i32;
                     if width > max_width as i32 {
                         break;
                     }
-                    left += 1;
                 }
 
-                if left == 0 {
-                    left += 1;
-                }
+                let end_idx = match indices.peek() {
+                    Some(idx) => *idx,
+                    None => line.bytes().len(),
+                };
 
-                let cur_line = &remaining[..left];
-                remaining = &remaining[left..];
+                Some(&line[start_idx..end_idx])
+            });
 
-                func(cur_line);
+            for chunk in it {
+                func(chunk);
             }
         }
     }
 }
 
+// Only run the test on Linux because the default font is different
+// on other platforms, causing different multiline splits.
+#[cfg(all(feature = "ttf", target_os = "linux"))]
+#[test]
+fn test_multi_layout() {
+    use plotters_backend::{FontFamily, FontStyle};
+
+    let font = FontDesc::new(FontFamily::SansSerif, 20 as f64, FontStyle::Bold);
+
+    layout_multiline_text("öäabcde", 40, font, |txt| {
+        println!("Got: {}", txt);
+        assert!(txt == "öäabc" || txt == "de");
+    });
+
+    let font = FontDesc::new(FontFamily::SansSerif, 20 as f64, FontStyle::Bold);
+    layout_multiline_text("öä", 100, font, |txt| {
+        // This does not divide the line, but still crashed in the previous implementation
+        // of layout_multiline_text. So this test should be reliable
+        println!("Got: {}", txt);
+        assert_eq!(txt, "öä")
+    });
+}
+
 impl<'a, T: Borrow<str>> MultiLineText<'a, BackendCoord, T> {
     /// Compute the line layout
     pub fn compute_line_layout(&self) -> FontResult<Vec<LayoutBox>> {

crates/plotters/src/evcxr.rs

diff --git a/crates/plotters/src/evcxr.rs b/crates/plotters/src/evcxr.rs
index 3438d34..9d7b966 100644
--- a/crates/plotters/src/evcxr.rs
+++ b/crates/plotters/src/evcxr.rs
@@ -2,8 +2,11 @@
 use crate::drawing::{DrawingArea, IntoDrawingArea};
 use plotters_backend::DrawingBackend;
 use plotters_svg::SVGBackend;
+use std::fs::File;
+use std::io::Write;
 
 #[cfg(feature = "evcxr_bitmap")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "evcxr_bitmap")))]
 use plotters_bitmap::BitMapBackend;
 
 /// The wrapper for the generated SVG
@@ -45,8 +48,27 @@
     SVGWrapper(buffer, "".to_string())
 }
 
+/// An evcxr figure that can save to the local file system and render in a notebook.
+pub fn evcxr_figure_with_saving<
+    Draw: FnOnce(DrawingArea<SVGBackend, Shift>) -> Result<(), Box<dyn std::error::Error>>,
+>(
+    filename: &str,
+    size: (u32, u32),
+    draw: Draw,
+) -> SVGWrapper {
+    let mut buffer = "".to_string();
+    let root = SVGBackend::with_string(&mut buffer, size).into_drawing_area();
+    draw(root).expect("Drawing failure");
+
+    let mut file = File::create(filename).expect("Unable to create file");
+    file.write_all(buffer.as_bytes())
+        .expect("Unable to write data");
+
+    SVGWrapper(buffer, "".to_string())
+}
 /// Start drawing an evcxr figure
 #[cfg(feature = "evcxr_bitmap")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "evcxr_bitmap")))]
 pub fn evcxr_bitmap_figure<
     Draw: FnOnce(DrawingArea<BitMapBackend, Shift>) -> Result<(), Box<dyn std::error::Error>>,
 >(
@@ -54,8 +76,9 @@
     draw: Draw,
 ) -> SVGWrapper {
     const PIXEL_SIZE: usize = 3;
-    let mut buf = Vec::new();
-    buf.resize((size.0 as usize) * (size.1 as usize) * PIXEL_SIZE, 0);
+
+    let mut buf = vec![0; (size.0 as usize) * (size.1 as usize) * PIXEL_SIZE];
+
     let root = BitMapBackend::with_buffer(&mut buf, size).into_drawing_area();
     draw(root).expect("Drawing failure");
     let mut buffer = "".to_string();

crates/plotters/src/lib.rs

diff --git a/crates/plotters/src/lib.rs b/crates/plotters/src/lib.rs
index 86a75d0..230c679 100644
--- a/crates/plotters/src/lib.rs
+++ b/crates/plotters/src/lib.rs
@@ -1,4 +1,6 @@
 #![warn(missing_docs)]
+#![allow(clippy::type_complexity)]
+#![cfg_attr(doc_cfg, feature(doc_cfg))]
 /*!
 
 # Plotters - A Rust drawing library focusing on data plotting for both WASM and native applications 🦀📈🚀
@@ -152,7 +154,7 @@
     </a>
     <div class="galleryText">
         The 1D Gaussian Distribution
-        <a href="https://github.com/plotters-rs/plotters/blob/master/plotters/examples/nomal-dist2.rs">[code]</a>
+        <a href="https://github.com/plotters-rs/plotters/blob/master/plotters/examples/normal-dist2.rs">[code]</a>
     </div>
 </div>
 
@@ -361,7 +363,7 @@
 The following code shows a minimal example of this.
 
 ```text
-:dep plotters = { version = "^0.3.5", default_features = false, features = ["evcxr", "all_series", "all_elements"] }
+:dep plotters = { version = "^0.3.6", default-features = false, features = ["evcxr", "all_series", "all_elements"] }
 extern crate plotters;
 use plotters::prelude::*;
 
@@ -419,19 +421,19 @@
 Rust is a perfect language for data visualization. Although there are many mature visualization libraries in many different languages, Rust is one of the best languages that fits the need.
 
 * **Easy to use** Rust has a very good iterator system built into the standard library. With the help of iterators,
-plotting in Rust can be as easy as most of the high-level programming languages. The Rust based plotting library
-can be very easy to use.
+  plotting in Rust can be as easy as most of the high-level programming languages. The Rust based plotting library
+  can be very easy to use.
 
 * **Fast** If you need to render a figure with trillions of data points,
-Rust is a good choice. Rust's performance allows you to combine the data processing step
-and rendering step into a single application. When plotting in high-level programming languages,
-e.g. Javascript or Python, data points must be down-sampled before feeding into the plotting
-program because of the performance considerations. Rust is fast enough to do the data processing and visualization
-within a single program. You can also integrate the
-figure rendering code into your application to handle a huge amount of data and visualize it in real-time.
+  Rust is a good choice. Rust's performance allows you to combine the data processing step
+  and rendering step into a single application. When plotting in high-level programming languages,
+  e.g. Javascript or Python, data points must be down-sampled before feeding into the plotting
+  program because of the performance considerations. Rust is fast enough to do the data processing and visualization
+  within a single program. You can also integrate the
+  figure rendering code into your application to handle a huge amount of data and visualize it in real-time.
 
 * **WebAssembly Support** Rust is one of the languages with the best WASM support. Plotting in Rust could be
-very useful for visualization on a web page and would have a huge performance improvement comparing to Javascript.
+  very useful for visualization on a web page and would have a huge performance improvement comparing to Javascript.
 
 ## Plotting on HTML5 canvas with WASM Backend
 
@@ -639,7 +641,7 @@
 
 ### Reducing Depending Libraries && Turning Off Backends
 Plotters now supports use features to control the backend dependencies. By default, `BitMapBackend` and `SVGBackend` are supported,
-use `default_features = false` in the dependency description in `Cargo.toml` and you can cherry-pick the backend implementations.
+use `default-features = false` in the dependency description in `Cargo.toml` and you can cherry-pick the backend implementations.
 
 - `svg` Enable the `SVGBackend`
 - `bitmap` Enable the `BitMapBackend`
@@ -648,16 +650,16 @@
 
 ```toml
 [dependencies]
-plotters = { git = "https://github.com/plotters-rs/plotters.git", default_features = false, features = ["svg"] }
+plotters = { git = "https://github.com/plotters-rs/plotters.git", default-features = false, features = ["svg"] }
 ```
 
 The library also allows consumers to make use of the [`Palette`](https://crates.io/crates/palette/) crate's color types by default.
-This behavior can also be turned off by setting `default_features = false`.
+This behavior can also be turned off by setting `default-features = false`.
 
 ### List of Features
 
 This is the full list of features that is defined by `Plotters` crate.
-Use `default_features = false` to disable those default enabled features,
+Use `default-features = false` to disable those default enabled features,
 and then you should be able to cherry-pick what features you want to include into `Plotters` crate.
 By doing so, you can minimize the number of dependencies down to only `itertools` and compile time is less than 6s.
 
@@ -796,14 +798,12 @@
 
 /// Evaluation Context for Rust. See [the evcxr crate](https://crates.io/crates/evcxr) for more information.
 #[cfg(feature = "evcxr")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "evcxr")))]
 pub mod evcxr;
 
 #[cfg(test)]
 pub use crate::drawing::{check_color, create_mocked_drawing_area};
 
-#[cfg(feature = "palette_ext")]
-pub use palette;
-
 /// The module imports the most commonly used types and modules in Plotters
 pub mod prelude {
     // Chart related types
@@ -825,6 +825,7 @@
     pub use crate::coord::combinators::LogRange;
 
     #[cfg(feature = "chrono")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "chrono")))]
     pub use crate::coord::types::{
         IntoMonthly, IntoYearly, RangedDate, RangedDateTime, RangedDuration,
     };
@@ -836,23 +837,30 @@
 
     // Series helpers
     #[cfg(feature = "area_series")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "area_series")))]
     pub use crate::series::AreaSeries;
     #[cfg(feature = "histogram")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "histogram")))]
     pub use crate::series::Histogram;
-    #[cfg(feature = "line_series")]
-    pub use crate::series::LineSeries;
     #[cfg(feature = "point_series")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "point_series")))]
     pub use crate::series::PointSeries;
     #[cfg(feature = "surface_series")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "surface_series")))]
     pub use crate::series::SurfaceSeries;
+    #[cfg(feature = "line_series")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "line_series")))]
+    pub use crate::series::{DashedLineSeries, DottedLineSeries, LineSeries};
 
     // Styles
     pub use crate::style::{BLACK, BLUE, CYAN, GREEN, MAGENTA, RED, TRANSPARENT, WHITE, YELLOW};
 
     #[cfg(feature = "full_palette")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "full_palette")))]
     pub use crate::style::full_palette;
 
     #[cfg(feature = "colormaps")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "colormaps")))]
     pub use crate::style::colors::colormaps::*;
 
     pub use crate::style::{
@@ -868,13 +876,17 @@
     };
 
     #[cfg(feature = "boxplot")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "boxplot")))]
     pub use crate::element::Boxplot;
     #[cfg(feature = "candlestick")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "candlestick")))]
     pub use crate::element::CandleStick;
     #[cfg(feature = "errorbar")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "errorbar")))]
     pub use crate::element::ErrorBar;
 
     #[cfg(feature = "bitmap_backend")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "bitmap_backend")))]
     pub use crate::element::BitMapElement;
 
     // Data
@@ -882,6 +894,7 @@
 
     // TODO: This should be deprecated and completely removed
     #[cfg(feature = "deprecated_items")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "deprecated_items")))]
     #[allow(deprecated)]
     pub use crate::element::Path;
 
@@ -893,13 +906,16 @@
         Result<T, crate::drawing::DrawingAreaErrorKind<D::ErrorType>>;
 
     #[cfg(feature = "evcxr")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "evcxr")))]
     pub use crate::evcxr::evcxr_figure;
 
     // Re-export tier 1 backends for backward compatibility
     #[cfg(feature = "bitmap_backend")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "bitmap_backend")))]
     pub use plotters_bitmap::BitMapBackend;
 
     #[cfg(feature = "svg_backend")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "svg_backend")))]
     pub use plotters_svg::SVGBackend;
 }
 
@@ -907,11 +923,13 @@
 pub mod backend {
     pub use plotters_backend::DrawingBackend;
     #[cfg(feature = "bitmap_backend")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "bitmap_backend")))]
     pub use plotters_bitmap::{
         bitmap_pixel::{BGRXPixel, PixelFormat, RGBPixel},
         BitMapBackend,
     };
     #[cfg(feature = "svg_backend")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "svg_backend")))]
     pub use plotters_svg::SVGBackend;
 }
 

crates/plotters/src/series/histogram.rs

diff --git a/crates/plotters/src/series/histogram.rs b/crates/plotters/src/series/histogram.rs
index 2d7d8f4..2574727 100644
--- a/crates/plotters/src/series/histogram.rs
+++ b/crates/plotters/src/series/histogram.rs
@@ -180,7 +180,7 @@
         let mut buffer = HashMap::<usize, A>::new();
         for (x, y) in iter.into_iter() {
             if let Some(x) = self.br.index_of(&x.into()) {
-                *buffer.entry(x).or_insert_with(Default::default) += y;
+                *buffer.entry(x).or_default() += y;
             }
         }
         self.iter = buffer.into_iter();

crates/plotters/src/series/line_series.rs

diff --git a/crates/plotters/src/series/line_series.rs b/crates/plotters/src/series/line_series.rs
index 448d029..913366a 100644
--- a/crates/plotters/src/series/line_series.rs
+++ b/crates/plotters/src/series/line_series.rs
@@ -1,6 +1,8 @@
-use crate::element::{Circle, DynElement, IntoDynElement, PathElement};
-use crate::style::ShapeStyle;
-use plotters_backend::DrawingBackend;
+use crate::element::{
+    Circle, DashedPathElement, DottedPathElement, DynElement, IntoDynElement, PathElement,
+};
+use crate::style::{ShapeStyle, SizeDesc};
+use plotters_backend::{BackendCoord, DrawingBackend};
 use std::marker::PhantomData;
 
 /**
@@ -84,6 +86,129 @@
     }
 }
 
+/// A dashed line series, map an iterable object to the dashed line element. Can be used to draw simple dashed and dotted lines.
+///
+/// If you want to use more complex shapes as points in the line, you can use `plotters::series::line_series::DottedLineSeries`.
+///
+/// # Examples
+///
+/// Dashed line:
+/// ```Rust
+/// chart_context
+///     .draw_series(DashedLineSeries::new(
+///         data_series,
+///         5, /* size = length of dash */
+///         10, /* spacing */
+///         ShapeStyle {
+///             color: BLACK.mix(1.0),
+///             filled: false,
+///             stroke_width: 1,
+///         },
+///     ))
+///     .unwrap();
+/// ```
+///
+/// Dotted line: (keep `size` and `stroke_width` the same to achieve dots)
+/// ```Rust
+/// chart_context
+///     .draw_series(DashedLineSeries::new(
+///         data_series,
+///         1, /* size = length of dash */
+///         4, /* spacing, best to keep this at least 1 larger than size */
+///         ShapeStyle {
+///             color: BLACK.mix(1.0),
+///             filled: false,
+///             stroke_width: 1,
+///         },
+///     ))
+///     .unwrap();
+/// ```
+pub struct DashedLineSeries<I: Iterator + Clone, Size: SizeDesc> {
+    points: I,
+    size: Size,
+    spacing: Size,
+    style: ShapeStyle,
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc> DashedLineSeries<I, Size> {
+    /// Create a new line series from
+    /// - `points`: The iterator of the points
+    /// - `size`: The dash size
+    /// - `spacing`: The dash-to-dash spacing (gap size)
+    /// - `style`: The shape style
+    /// - returns the created element
+    pub fn new<I0>(points: I0, size: Size, spacing: Size, style: ShapeStyle) -> Self
+    where
+        I0: IntoIterator<IntoIter = I>,
+    {
+        Self {
+            points: points.into_iter(),
+            size,
+            spacing,
+            style,
+        }
+    }
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc> IntoIterator for DashedLineSeries<I, Size> {
+    type Item = DashedPathElement<I, Size>;
+    type IntoIter = std::iter::Once<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        std::iter::once(DashedPathElement::new(
+            self.points,
+            self.size,
+            self.spacing,
+            self.style,
+        ))
+    }
+}
+
+/// A dotted line series, map an iterable object to the dotted line element.
+pub struct DottedLineSeries<I: Iterator + Clone, Size: SizeDesc, Marker> {
+    points: I,
+    shift: Size,
+    spacing: Size,
+    func: Box<dyn Fn(BackendCoord) -> Marker>,
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc, Marker> DottedLineSeries<I, Size, Marker> {
+    /// Create a new line series from
+    /// - `points`: The iterator of the points
+    /// - `shift`: The shift of the first marker
+    /// - `spacing`: The spacing between markers
+    /// - `func`: The marker function
+    /// - returns the created element
+    pub fn new<I0, F>(points: I0, shift: Size, spacing: Size, func: F) -> Self
+    where
+        I0: IntoIterator<IntoIter = I>,
+        F: Fn(BackendCoord) -> Marker + 'static,
+    {
+        Self {
+            points: points.into_iter(),
+            shift,
+            spacing,
+            func: Box::new(func),
+        }
+    }
+}
+
+impl<I: Iterator + Clone, Size: SizeDesc, Marker: 'static> IntoIterator
+    for DottedLineSeries<I, Size, Marker>
+{
+    type Item = DottedPathElement<I, Size, Marker>;
+    type IntoIter = std::iter::Once<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        std::iter::once(DottedPathElement::new(
+            self.points,
+            self.shift,
+            self.spacing,
+            self.func,
+        ))
+    }
+}
+
 #[cfg(test)]
 mod test {
     use crate::prelude::*;
@@ -94,7 +219,7 @@
             m.check_draw_path(|c, s, _path| {
                 assert_eq!(c, RED.to_rgba());
                 assert_eq!(s, 3);
-                // TODO when cleanup the backend coordinate defination, then we uncomment the
+                // TODO when cleanup the backend coordinate definition, then we uncomment the
                 // following check
                 //for i in 0..100 {
                 //    assert_eq!(path[i], (i as i32 * 2, 199 - i as i32 * 2));
@@ -102,8 +227,8 @@
             });
 
             m.drop_check(|b| {
-                assert_eq!(b.num_draw_path_call, 1);
-                assert_eq!(b.draw_count, 1);
+                assert_eq!(b.num_draw_path_call, 8);
+                assert_eq!(b.draw_count, 27);
             });
         });
 
@@ -114,8 +239,20 @@
         chart
             .draw_series(LineSeries::new(
                 (0..100).map(|x| (x, x)),
-                Into::<ShapeStyle>::into(&RED).stroke_width(3),
+                Into::<ShapeStyle>::into(RED).stroke_width(3),
             ))
             .expect("Drawing Error");
+        chart
+            .draw_series(DashedLineSeries::new(
+                (0..=50).map(|x| (0, x)),
+                10,
+                5,
+                Into::<ShapeStyle>::into(RED).stroke_width(3),
+            ))
+            .expect("Drawing Error");
+        let mk_f = |c| Circle::new(c, 3, Into::<ShapeStyle>::into(RED).filled());
+        chart
+            .draw_series(DottedLineSeries::new((0..=50).map(|x| (x, 0)), 5, 5, mk_f))
+            .expect("Drawing Error");
     }
 }

crates/plotters/src/series/mod.rs

diff --git a/crates/plotters/src/series/mod.rs b/crates/plotters/src/series/mod.rs
index a0c8f19..706bd21 100644
--- a/crates/plotters/src/series/mod.rs
+++ b/crates/plotters/src/series/mod.rs
@@ -22,12 +22,17 @@
 mod surface;
 
 #[cfg(feature = "area_series")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "area_series")))]
 pub use area_series::AreaSeries;
 #[cfg(feature = "histogram")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "histogram")))]
 pub use histogram::Histogram;
 #[cfg(feature = "line_series")]
-pub use line_series::LineSeries;
+#[cfg_attr(doc_cfg, doc(cfg(feature = "line_series")))]
+pub use line_series::{DashedLineSeries, DottedLineSeries, LineSeries};
 #[cfg(feature = "point_series")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "point_series")))]
 pub use point_series::PointSeries;
 #[cfg(feature = "surface_series")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "surface_series")))]
 pub use surface::SurfaceSeries;

crates/plotters/src/series/surface.rs

diff --git a/crates/plotters/src/series/surface.rs b/crates/plotters/src/series/surface.rs
index 2307e32..2621f4f 100644
--- a/crates/plotters/src/series/surface.rs
+++ b/crates/plotters/src/series/surface.rs
@@ -213,7 +213,7 @@
         } else {
             self.vidx_1 += 1;
             self.vidx_2 = 1;
-            if let (Some(b0), Some(b1)) = (self.free_var_2.get(0), self.free_var_2.get(1)) {
+            if let (Some(b0), Some(b1)) = (self.free_var_2.first(), self.free_var_2.get(1)) {
                 (b0, b1)
             } else {
                 return None;

crates/plotters/src/style/color.rs

diff --git a/crates/plotters/src/style/color.rs b/crates/plotters/src/style/color.rs
index 7e372cd..2a5fbf0 100644
--- a/crates/plotters/src/style/color.rs
+++ b/crates/plotters/src/style/color.rs
@@ -137,9 +137,9 @@
     #[allow(clippy::many_single_char_names)]
     fn to_backend_color(&self) -> BackendColor {
         let (h, s, l) = (
-            self.0.min(1.0).max(0.0),
-            self.1.min(1.0).max(0.0),
-            self.2.min(1.0).max(0.0),
+            self.0.clamp(0.0, 1.0),
+            self.1.clamp(0.0, 1.0),
+            self.2.clamp(0.0, 1.0),
         );
 
         if s == 0.0 {

crates/plotters/src/style/colors/colormaps.rs

diff --git a/crates/plotters/src/style/colors/colormaps.rs b/crates/plotters/src/style/colors/colormaps.rs
index 50430db..35ebddb 100644
--- a/crates/plotters/src/style/colors/colormaps.rs
+++ b/crates/plotters/src/style/colors/colormaps.rs
@@ -1,15 +1,13 @@
 use crate::style::{HSLColor, RGBAColor, RGBColor};
 
-use num_traits::{Float, FromPrimitive, ToPrimitive};
-
 /// Converts scalar values to colors.
 pub trait ColorMap<ColorType: crate::prelude::Color, FloatType = f32>
 where
-    FloatType: Float,
+    FloatType: num_traits::Float,
 {
     /// Takes a scalar value 0.0 <= h <= 1.0 and returns the corresponding color.
     /// Typically color-scales are named according to which color-type they return.
-    /// To use upper and lower bounds with ths function see [get_color_normalized](ColorMap::get_color_normalized).
+    /// To use upper and lower bounds with this function see [get_color_normalized](ColorMap::get_color_normalized).
     fn get_color(&self, h: FloatType) -> ColorType {
         self.get_color_normalized(h, FloatType::zero(), FloatType::one())
     }
@@ -47,6 +45,8 @@
     }
 }
 
+#[macro_export]
+#[doc(hidden)]
 macro_rules! calculate_new_color_value(
     ($relative_difference:expr, $colors:expr, $index_upper:expr, $index_lower:expr, RGBColor) => {
         RGBColor(
@@ -81,20 +81,34 @@
     };
 );
 
-fn calculate_relative_difference_index_lower_upper<
-    FloatType: Float + FromPrimitive + ToPrimitive,
+// Helper function to calculate the lower and upper index nearest to a provided float value.
+//
+// Used to obtain colors from a colorscale given a value h between 0.0 and 1.0.
+// It also returns the relative difference which can then be used to calculate a linear interpolation between the two nearest colors.
+// ```
+// # use plotters::prelude::*;
+// let r = calculate_relative_difference_index_lower_upper(1.2, 1.0, 3.0, 4);
+// let (relative_difference, lower_index, upper_index) = r;
+//
+// assert_eq!(relative_difference, 0.7000000000000001);
+// assert_eq!(lower_index, 0);
+// assert_eq!(upper_index, 1);
+// ```
+#[doc(hidden)]
+pub fn calculate_relative_difference_index_lower_upper<
+    FloatType: num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive,
 >(
     h: FloatType,
     min: FloatType,
     max: FloatType,
-    n_colors: usize,
+    n_steps: usize,
 ) -> (FloatType, usize, usize) {
     // Ensure that we do have a value in bounds
     let h = num_traits::clamp(h, min, max);
     // Next calculate a normalized value between 0.0 and 1.0
     let t = (h - min) / (max - min);
     let approximate_index =
-        t * (FloatType::from_usize(n_colors).unwrap() - FloatType::one()).max(FloatType::zero());
+        t * (FloatType::from_usize(n_steps).unwrap() - FloatType::one()).max(FloatType::zero());
     // Calculate which index are the two most nearest of the supplied value
     let index_lower = approximate_index.floor().to_usize().unwrap();
     let index_upper = approximate_index.ceil().to_usize().unwrap();
@@ -106,7 +120,7 @@
 macro_rules! implement_color_scale_for_derived_color_map{
     ($($color_type:ident),+) => {
         $(
-            impl<FloatType: Float + FromPrimitive + ToPrimitive> ColorMap<$color_type, FloatType> for DerivedColorMap<$color_type> {
+            impl<FloatType: num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive> ColorMap<$color_type, FloatType> for DerivedColorMap<$color_type> {
                 fn get_color_normalized(&self, h: FloatType, min: FloatType, max: FloatType) -> $color_type {
                     let (
                         relative_difference,
@@ -119,7 +133,7 @@
                         self.colors.len()
                     );
                     // Interpolate the final color linearly
-                    calculate_new_color_value!(
+                    $crate::calculate_new_color_value!(
                         relative_difference,
                         self.colors,
                         index_upper,
@@ -134,11 +148,30 @@
 
 implement_color_scale_for_derived_color_map! {RGBAColor, RGBColor, HSLColor}
 
+#[macro_export]
+#[doc(hidden)]
+// Counts the number of arguments which are separated by spaces
+//
+// This macro is used internally to determine the size of an array to hold all new colors.
+// ```
+// # use plotters::count;
+// let counted = count!{Plotting is fun};
+// assert_eq!(counted, 3);
+//
+// let counted2 = count!{0_usize was my favourite 1_f64 last century};
+// assert_eq!(counted2, 7);
+//
+// let new_array = ["Hello"; count!(Plotting is fun)];
+// assert_eq!(new_array, ["Hello"; 3]);
+// ```
 macro_rules! count {
     () => (0usize);
-    ($x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
+    ($x:tt $($xs:tt)* ) => (1usize + $crate::count!($($xs)*));
 }
 
+#[macro_export]
+#[doc(hidden)]
+/// Converts a given color identifier and a sequence of colors to an array of them.
 macro_rules! define_colors_from_list_of_values_or_directly{
     ($color_type:ident, $(($($color_value:expr),+)),+) => {
         [$($color_type($($color_value),+)),+]
@@ -148,9 +181,12 @@
     };
 }
 
+#[macro_export]
+#[doc(hidden)]
+/// Implements the [ColorMap] trait on a given color scale.
 macro_rules! implement_linear_interpolation_color_map {
     ($color_scale_name:ident, $color_type:ident) => {
-        impl<FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive>
+        impl<FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive>
             ColorMap<$color_type, FloatType> for $color_scale_name
         {
             fn get_color_normalized(
@@ -170,7 +206,7 @@
                     Self::COLORS.len()
                 );
                 // Interpolate the final color linearly
-                calculate_new_color_value!(
+                $crate::calculate_new_color_value!(
                     relative_difference,
                     Self::COLORS,
                     index_upper,
@@ -184,7 +220,7 @@
             #[doc = "Get color value from `"]
             #[doc = stringify!($color_scale_name)]
             #[doc = "` by supplying a parameter 0.0 <= h <= 1.0"]
-            pub fn get_color<FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive>(
+            pub fn get_color<FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive>(
                 h: FloatType,
             ) -> $color_type {
                 let color_scale = $color_scale_name {};
@@ -195,7 +231,7 @@
             #[doc = stringify!($color_scale_name)]
             #[doc = "` by supplying lower and upper bounds min, max and a parameter h where min <= h <= max"]
             pub fn get_color_normalized<
-                FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive,
+                FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive,
             >(
                 h: FloatType,
                 min: FloatType,
@@ -208,34 +244,57 @@
     };
 }
 
+#[doc(inline)]
+pub use crate::def_linear_colormap;
+
 #[macro_export]
-/// Macro to create a new colormap with evenly spaced colors at compile-time.
-macro_rules! define_linear_interpolation_color_map{
+#[doc(hidden)]
+/// Create a new colormap with evenly spaced colors and interpolates between them automatically.
+///
+/// This macro works by taking a identifier (name) for the colormap, the type of color to specify, a
+/// docstring and a list of colors and constructs an empty struct on which it implements the [ColorMap] trait.
+///
+/// ```
+/// use plotters::prelude::*;
+/// def_linear_colormap! {
+///     BlackWhite,
+///     RGBColor,
+///     "Simple chromatic colormap from black to white.",
+///     (  0,   0,   0),
+///     (255, 255,   255)
+/// }
+///
+/// assert_eq!(BlackWhite::get_color(0.0), RGBColor(0,0,0));
+/// ```
+///
+/// Hint: Some helper macros and functions have been deliberately hidden from end users.
+/// Look for them in the source code if you are interested.
+macro_rules! def_linear_colormap{
     ($color_scale_name:ident, $color_type:ident, $doc:expr, $(($($color_value:expr),+)),*) => {
         #[doc = $doc]
-        pub struct $color_scale_name {}
+        pub struct $color_scale_name;
 
         impl $color_scale_name {
             // const COLORS: [$color_type; $number_colors] = [$($color_type($($color_value),+)),+];
-            // const COLORS: [$color_type; count!($(($($color_value:expr),+))*)] = [$($color_type($($color_value),+)),+];
-            const COLORS: [$color_type; count!($(($($color_value:expr),+))*)] = define_colors_from_list_of_values_or_directly!{$color_type, $(($($color_value),+)),*};
+            // const COLORS: [$color_type; $crate::count!($(($($color_value:expr),+))*)] = [$($color_type($($color_value),+)),+];
+            const COLORS: [$color_type; $crate::count!($(($($color_value:expr),+))*)] = $crate::define_colors_from_list_of_values_or_directly!{$color_type, $(($($color_value),+)),*};
         }
 
-        implement_linear_interpolation_color_map!{$color_scale_name, $color_type}
+        $crate::implement_linear_interpolation_color_map!{$color_scale_name, $color_type}
     };
     ($color_scale_name:ident, $color_type:ident, $doc:expr, $($color_complete:tt),+) => {
         #[doc = $doc]
-        pub struct $color_scale_name {}
+        pub struct $color_scale_name;
 
         impl $color_scale_name {
-            const COLORS: [$color_type; count!($($color_complete)*)] = define_colors_from_list_of_values_or_directly!{$($color_complete),+};
+            const COLORS: [$color_type; $crate::count!($($color_complete)*)] = $crate::define_colors_from_list_of_values_or_directly!{$($color_complete),+};
         }
 
-        implement_linear_interpolation_color_map!{$color_scale_name, $color_type}
+        $crate::implement_linear_interpolation_color_map!{$color_scale_name, $color_type}
     }
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     ViridisRGBA,
     RGBAColor,
     "A colormap optimized for visually impaired people (RGBA format).
@@ -251,7 +310,7 @@
     (254, 232,  37, 1.0)
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     ViridisRGB,
     RGBColor,
     "A colormap optimized for visually impaired people (RGB Format).
@@ -267,7 +326,7 @@
     (254, 232,  37)
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     BlackWhite,
     RGBColor,
     "Simple chromatic colormap from black to white.",
@@ -275,7 +334,7 @@
     (255, 255,   255)
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     MandelbrotHSL,
     HSLColor,
     "Colormap created to replace the one used in the mandelbrot example.",
@@ -283,7 +342,7 @@
     (1.0, 1.0, 0.5)
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     VulcanoHSL,
     HSLColor,
     "A vulcanic colormap that display red/orange and black colors",
@@ -292,7 +351,7 @@
 }
 
 use super::full_palette::*;
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     Bone,
     RGBColor,
     "Dark colormap going from black over blue to white.",
@@ -301,7 +360,7 @@
     WHITE
 }
 
-define_linear_interpolation_color_map! {
+def_linear_colormap! {
     Copper,
     RGBColor,
     "Friendly black to brown colormap.",

crates/plotters/src/style/colors/mod.rs

diff --git a/crates/plotters/src/style/colors/mod.rs b/crates/plotters/src/style/colors/mod.rs
index 8aa09a7..aadee70 100644
--- a/crates/plotters/src/style/colors/mod.rs
+++ b/crates/plotters/src/style/colors/mod.rs
@@ -57,9 +57,11 @@
 define_color!(TRANSPARENT, 0, 0, 0, 0.0, "Transparent");
 
 #[cfg(feature = "colormaps")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "colormaps")))]
 /// Colormaps can be used to simply go from a scalar value to a color value which will be more/less
 /// intense corresponding to the value of the supplied scalar.
 /// These colormaps can also be defined by the user and be used with lower and upper bounds.
 pub mod colormaps;
 #[cfg(feature = "full_palette")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "full_palette")))]
 pub mod full_palette;

crates/plotters/src/style/font/ttf.rs

diff --git a/crates/plotters/src/style/font/ttf.rs b/crates/plotters/src/style/font/ttf.rs
index 345aae4..5d5a720 100644
--- a/crates/plotters/src/style/font/ttf.rs
+++ b/crates/plotters/src/style/font/ttf.rs
@@ -1,7 +1,6 @@
 use std::borrow::{Borrow, Cow};
 use std::cell::RefCell;
 use std::collections::HashMap;
-use std::i32;
 use std::sync::{Arc, RwLock};
 
 use lazy_static::lazy_static;
@@ -82,7 +81,9 @@
             _ => unreachable!(),
         };
         let face = unsafe {
-            std::mem::transmute::<_, Option<Face<'static>>>(ttf_parser::Face::parse(data, idx).ok())
+            std::mem::transmute::<Option<_>, Option<Face<'static>>>(
+                ttf_parser::Face::parse(data, idx).ok(),
+            )
         };
         Self { inner: font, face }
     }
@@ -124,7 +125,7 @@
         font_object_cache
             .borrow()
             .get(Borrow::<str>::borrow(&key))
-            .map(Clone::clone)
+            .cloned()
     }) {
         return Ok(font_object);
     }
@@ -132,12 +133,12 @@
     // Then we need to check if the data cache contains the font data
     let cache = DATA_CACHE.read().unwrap();
     if let Some(data) = cache.get(Borrow::<str>::borrow(&key)) {
-        return data.clone().map(|handle| {
+        data.clone().map(|handle| {
             handle
                 .load()
                 .map(FontExt::new)
                 .map_err(|e| FontError::FontLoadError(Arc::new(e)))
-        })?;
+        })??;
     }
     drop(cache);
 
@@ -266,8 +267,8 @@
                     .rasterize_glyph(
                         &mut canvas,
                         glyph_id,
-                        em as f32,
-                        Transform2F::from_translation(Vector2F::new(0.0, em as f32)),
+                        em,
+                        Transform2F::from_translation(Vector2F::new(0.0, em)),
                         HintingOptions::None,
                         RasterizationOptions::GrayscaleAa,
                     )
@@ -314,6 +315,6 @@
 
         // TODO: Check they are the same
 
-        return Ok(());
+        Ok(())
     }
 }

crates/plotters/src/style/font/web.rs

diff --git a/crates/plotters/src/style/font/web.rs b/crates/plotters/src/style/font/web.rs
index e70e7b1..7af9996 100644
--- a/crates/plotters/src/style/font/web.rs
+++ b/crates/plotters/src/style/font/web.rs
@@ -34,7 +34,7 @@
         let body = document.body().unwrap();
         let span = document.create_element("span").unwrap();
         span.set_text_content(Some(text));
-        span.set_attribute("style", &format!("display: inline-block; font-family:{}; font-size: {}px; position: fixed; top: 100%", self.0, size)).unwrap();
+        span.set_attribute("style", &format!("display: inline-block; font-family:{}; font-style:{}; font-size: {}px; position: fixed; top: 100%", self.0, self.1, size)).unwrap();
         let span = span.into();
         body.append_with_node_1(&span).unwrap();
         let elem = JsCast::dyn_into::<HtmlElement>(span).unwrap();

crates/plotters/src/style/mod.rs

diff --git a/crates/plotters/src/style/mod.rs b/crates/plotters/src/style/mod.rs
index 4daa0a8..90bed9f 100644
--- a/crates/plotters/src/style/mod.rs
+++ b/crates/plotters/src/style/mod.rs
@@ -15,6 +15,7 @@
 pub use colors::{BLACK, BLUE, CYAN, GREEN, MAGENTA, RED, TRANSPARENT, WHITE, YELLOW};
 
 #[cfg(feature = "full_palette")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "full_palette")))]
 pub use colors::full_palette;
 
 #[cfg(all(not(target_arch = "wasm32"), feature = "ab_glyph"))]

crates/plotters/src/style/shape.rs

diff --git a/crates/plotters/src/style/shape.rs b/crates/plotters/src/style/shape.rs
index 389cc75..97ac6b6 100644
--- a/crates/plotters/src/style/shape.rs
+++ b/crates/plotters/src/style/shape.rs
@@ -2,7 +2,7 @@
 use plotters_backend::{BackendColor, BackendStyle};
 
 /// Style for any shape
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub struct ShapeStyle {
     /// Specification of the color.
     pub color: RGBAColor,

crates/prettyplease/.android-checksum.json

diff --git a/crates/prettyplease/.android-checksum.json b/crates/prettyplease/.android-checksum.json
index 00205b2..0df1f50 100644
--- a/crates/prettyplease/.android-checksum.json
+++ b/crates/prettyplease/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"7ae9e7a781bba8e321bc4192826c5653545bb4b05a74de388147bcbde6e2163c","Android.bp":"af0d7dff9013da50fad4d4ae2a6a72b3edcf9e1fb1e642ca3d25f7f27413e2cf","Cargo.toml":"6f04fc844b204a1332d7af8c9fe5c82dae95bfa01698382a272a609933f468bc","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"ab3385c35023c2dee8d11dd63dd9a20099b563c2b891c541f33ffd17fb298444","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"6cd24eece6714dc53f7f9f979abdc9cae292e172340688029b4a6ef5ae91ae24","build.rs":"53df216257bb8fbdc2212e23f60cf6261007366a73e9dc390dde3dcbde3d6251","cargo_embargo.json":"0a3aea02264006cd539344c6021258d9fc7c2f88bbe7510b351f5e3485244e08","examples/input.rs":"c54e04743b9eb5665e7a2c0ea6cdd7d3a31fecec1258086b9268b8edf63c9bf7","examples/output.prettyplease.rs":"11211b3ec0b461c64494cec9f240eac5c60084d55a2f9048d41dcca66ebb6f02","examples/output.rustc.rs":"fe3e54f99bba0ad1aebace5e6a06cdf79548dac62524210064f1654a72968f96","examples/output.rustfmt.rs":"f5bcc4d1f873d76ce87834f9fa0d2e5c46042a6f0a2258b22ea4855a85e8b018","src/algorithm.rs":"0631caf6ac9fb58caf49dd2a321a096b21e6b7b4ee3b1e148a4b0e6529d59220","src/attr.rs":"fecce86077baf55f95f0c595579fb5ab1001aa27235a8ad48eaafe1a2aefd8a5","src/convenience.rs":"faae49b9678e3fa882f287594cac24d2544308dbd21a5762b396a174ceb975cd","src/data.rs":"dcb2d7eaa744b5d9190fc90d7cca25d64bff38dc57f746581d6097b79ca67d03","src/expr.rs":"ef67c23508873d9f33004fcb6b63d2163d8a0873a118d98576fea193dc6a5e05","src/file.rs":"359101ac28e7e39a275b9837053e6841765a48d022ea1482d8ef80e34d860d44","src/generics.rs":"73491a105c69318d01a6d090778d57102937f89fd9cd4cb8f2857c12a79e8dd5","src/item.rs":"c8f065dba1547b57c369e5b11956420d9e0979a6d5536225b370901a8160b7cc","src/iter.rs":"63d7cf3313d8ed3fa1637c5c01d80ab48b8a742538b71fd792604246822d4d9d","src/lib.rs":"bcce5af8455aa032e41a165cbe064b719b9289af13627057c89a6526066fd1cf","src/lifetime.rs":"b2f01d35e9faddd4a042dec30bb0f1668683ef11a9477e660e9eb4d480a08d61","src/lit.rs":"39cd69038e2143b16dad6007033015ef4c8e116b4af78e12937e916aa92b8376","src/mac.rs":"3df8a64cdb74ad433afe6a99f4d305bafbed0e7b2773f60fd7afaba91890a208","src/pat.rs":"d3ff013f425aa46d26d8c1c075c4bdd9e924f198125d5793d409941c31bf1ae9","src/path.rs":"c2c9a6f5fe868446427bb76ee17bbe14e6fb1fcd0d3d325fd3115f4057586638","src/ring.rs":"d2f765e033eea3aad1b8fd4351e8a3d32ff0c79be13a0104683d5fd38d0e131b","src/stmt.rs":"bce93e2b3af162871814b77ef1c350a4d0f71e423f74d1e5e93276dc39f1e23d","src/token.rs":"881884adcb68dcd01f6d66459c7f49df2f6f8019f0718d0a146d9c23ea375af5","src/ty.rs":"526800996453fd7068fc8f3e7e22a873f20bbcd89cd29f63e0cd32692b7559c1","tests/test.rs":"42b5f9d824aff128e6caf5df9602fe36b279b32d5debcaecf68969fbff09af4f"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"8754f5c95b4603c91b2fee04c7b22563bd3dac2e437fd8f33f861b95deda886d","Android.bp":"daa37880cfc6788215c9ac3b857bba421107f5dde60828f412396b57b64bddc5","Cargo.toml":"5ea38f196bfa1d0123a5f3129ff7cd7c2da6f9d1987c015d370236a0522722c3","LICENSE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-APACHE":"50f827348bfd5def2df4f30cb41264072cf9c180bd9ed698437e8d85b2482754","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"c6c17d8cdb6c025f663b86e078bd9350f16593db38063b9ff5708c981b48d2fd","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"6cd24eece6714dc53f7f9f979abdc9cae292e172340688029b4a6ef5ae91ae24","build.rs":"53df216257bb8fbdc2212e23f60cf6261007366a73e9dc390dde3dcbde3d6251","cargo_embargo.json":"0a3aea02264006cd539344c6021258d9fc7c2f88bbe7510b351f5e3485244e08","examples/input.rs":"c54e04743b9eb5665e7a2c0ea6cdd7d3a31fecec1258086b9268b8edf63c9bf7","examples/output.prettyplease.rs":"11211b3ec0b461c64494cec9f240eac5c60084d55a2f9048d41dcca66ebb6f02","examples/output.rustc.rs":"fe3e54f99bba0ad1aebace5e6a06cdf79548dac62524210064f1654a72968f96","examples/output.rustfmt.rs":"f5bcc4d1f873d76ce87834f9fa0d2e5c46042a6f0a2258b22ea4855a85e8b018","src/algorithm.rs":"b7ae58dedbca564ea449f02160084aa9a4f38a7b724afbdb19e81f7e524867ce","src/attr.rs":"dd3e5c4c2c4a65040f3b567c86405e823e8eb1f963aaa8b8a8547fc1de22ca31","src/classify.rs":"e17fd6644f59523bd6f7a198acf3645fd1a0930f5cbfebe5552918ea8841e38e","src/convenience.rs":"faae49b9678e3fa882f287594cac24d2544308dbd21a5762b396a174ceb975cd","src/data.rs":"25457e0091113479a29087a215dc22f32eb28c9f4e29fb43f8864f81d6b98bf3","src/expr.rs":"fe7d9645bc3f86c63a58bc72aeb69b4ad11bc0651cc37b4e4f6e3b5a20708275","src/file.rs":"359101ac28e7e39a275b9837053e6841765a48d022ea1482d8ef80e34d860d44","src/fixup.rs":"2f258a9d48fc6851ec32dc7bfc492f1187c2438fe3504b3a73ea0dfa91087d32","src/generics.rs":"eab714ff712509d0e2b23a635eb6ebabeb711d82b8e77350ace505180e5f60ef","src/item.rs":"21d89d8eb6376057bc3ffcfe7e0f18cb72803e1656fac5ec6919a93a85ef2939","src/iter.rs":"63d7cf3313d8ed3fa1637c5c01d80ab48b8a742538b71fd792604246822d4d9d","src/lib.rs":"c4700c7472d0a9eeb43c25f9f42187e75d203dd0d07416649c5d588ef64f721c","src/lifetime.rs":"b2f01d35e9faddd4a042dec30bb0f1668683ef11a9477e660e9eb4d480a08d61","src/lit.rs":"39cd69038e2143b16dad6007033015ef4c8e116b4af78e12937e916aa92b8376","src/mac.rs":"131791d63273f8ae09cbb301635f9e2cbee3f8b5dd89a55c376590b15b7de911","src/pat.rs":"40e2926be48bcdfd151e6de00880ad4aba6c7822db3eb340e3f12a6a50edae4b","src/path.rs":"68c7066f63d9eb570d0d5a613225f2948d0d547257ecd49ea29e7cf693587d24","src/precedence.rs":"939141754675dbb9bc6091123a847d62cf8493db0aa701686f833b0435d3fc40","src/ring.rs":"cd1a93144b2f76a6a47ad8847ddc90d9b3d13bf674243e774f7848d7baebbcd8","src/stmt.rs":"10372120c97c4f3840f7b494bf973c36c97625b68f60f178854726b622b5fc0d","src/token.rs":"881884adcb68dcd01f6d66459c7f49df2f6f8019f0718d0a146d9c23ea375af5","src/ty.rs":"e8d75df0fe6e83a50a288b6b0ffe2285d698810043e6ba6a59408b62ecb04383","tests/test.rs":"adf75b6cb0fe9c700ea366366e2b0b9a2e166983b4dfd5abe87c1bcc986cbdea","tests/test_precedence.rs":"64413a1314a13c027b8e5e6afbfcff4d3375f5db80131fffc7b341d89fb775a6"}}
\ No newline at end of file

crates/prettyplease/.cargo-checksum.json

diff --git a/crates/prettyplease/.cargo-checksum.json b/crates/prettyplease/.cargo-checksum.json
index 434d068..823e7b4 100644
--- a/crates/prettyplease/.cargo-checksum.json
+++ b/crates/prettyplease/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0e165ac6d5ca01781b9c1586f976e6abeedaa534f1ba0dc0adf607f9b30795e0","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"a7e6d152cdc6ea603077e50b8d55af374d9d21fd9f62d08a008588b17d785e6e","build.rs":"79a5b2d260aa97aeac7105fbfa00774982f825cd708c100ea96d01c39974bb88","examples/input.rs":"53350088f12a346a99034af41ef432dedcc9e5d581c5592d9aae3807c42656c1","examples/output.prettyplease.rs":"fa63c118daadb64c456ec5b8d5e46e5d7fabbbeb6a6e61a08eabc23360a18fbd","examples/output.rustc.rs":"0c66f8929fa40a2822d4ea1aec3d8b83db598aba043b17f3c1a6133f0d657135","examples/output.rustfmt.rs":"914a9aea1c51e097bfd80c9af4011811e6126c9df5fb0eac3d40b1203fba7c58","src/algorithm.rs":"7a4a7b62f5300aabf7fcff3cd8c8aaa3ae1e3d1dc717eea1e4797988ce0e18c7","src/attr.rs":"54e829ae468f22c8e2853d669515575f1444bfee026cfd9b19538f77caf10ab7","src/convenience.rs":"dd392b009b691d3587c7d8e3caeaacf450303c4223792b5f89c336358e371c39","src/data.rs":"9db6623d3ccc79b541a28bdc88875ad0036576689e085007eb362819f8e9a2d3","src/expr.rs":"45a30de0afdf8e0564c221ebcb4cf11e2d8948b5b85cc99d5d55d1293e65dea9","src/file.rs":"5689efa3c5959a6a0d8cfc2c13bf8a37ab0669e2b81dbded3f3c28884a88fca0","src/generics.rs":"14a01f0602c005939f0324ef5e6b6624f477a531552bc764447e08875fb2ebbb","src/item.rs":"6793b19d8be3dd7cb75a984370a771d0592b9c4548d294cf246424947a3c8535","src/iter.rs":"38b2cd3b38719c6024fb6b3aa739f6f8736c83193fd21e2365d4f6c27bc41666","src/lib.rs":"a6c8e3e455f6b2f5b0800213464076f8ac49fc64aeddd77f3e4f0f9dbf554b18","src/lifetime.rs":"6d420430168185b2da3409bc38a45f63cced9443915f04e6aec71367fc070dcf","src/lit.rs":"9ea6d25533e64df4ff01c084fa1c31ddf64fb3b159409eec7d80dbf281e5171e","src/mac.rs":"62911747c308187afc750b4bd4f8bd24ee825081043d78da68a001ea55ab5853","src/pat.rs":"d130b141a3fd8098913cb179efe6600a5f010a2719447ecb3d4fb29e9b546220","src/path.rs":"4d3f7caa0bfe821bdb9ad00ee1d7d61101aef8a5cbea35d565b6da6217feefca","src/ring.rs":"e23d133209b977e457b07b0cd93b3711d01f4172d7cfa4cf6a7247637390e606","src/stmt.rs":"763f617a5535f8e61593b0cb1c6c9f5caef032085671dbce509b691d94d39835","src/token.rs":"c288b1d81f2a35673d4ca1dd10d3386670b067460121df3038303e1ed73b41a7","src/ty.rs":"b5fa5f318c5e4593ed3eed4707e63dceaa62eea4ecdfba0f59bd946917ca3dbd","tests/test.rs":"04994ad0a37c43457390f11ade6ab74fc26c5e879b0a374f0b64acb530a0a496"},"package":"64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"}
\ No newline at end of file
+{"files":{"Cargo.toml":"06e68c5a91a65141eef6ddfbc87652ffa90a3ab71175b31021d61e6eb8e7b8e1","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"a7e6d152cdc6ea603077e50b8d55af374d9d21fd9f62d08a008588b17d785e6e","build.rs":"79a5b2d260aa97aeac7105fbfa00774982f825cd708c100ea96d01c39974bb88","examples/input.rs":"53350088f12a346a99034af41ef432dedcc9e5d581c5592d9aae3807c42656c1","examples/output.prettyplease.rs":"fa63c118daadb64c456ec5b8d5e46e5d7fabbbeb6a6e61a08eabc23360a18fbd","examples/output.rustc.rs":"0c66f8929fa40a2822d4ea1aec3d8b83db598aba043b17f3c1a6133f0d657135","examples/output.rustfmt.rs":"914a9aea1c51e097bfd80c9af4011811e6126c9df5fb0eac3d40b1203fba7c58","src/algorithm.rs":"bae517cd89743dd4bccb7cf7bf659c9e138d68cf4b06030446effb794811a36c","src/attr.rs":"c11f2ed0d16f2a7c1a0023f2fc5c81a074276ff399679b2814ab762edb8dd792","src/classify.rs":"2ce2d63ad9071aac10b1037e6382703736e0147d96b3ccf32a53182d12883f1b","src/convenience.rs":"dd392b009b691d3587c7d8e3caeaacf450303c4223792b5f89c336358e371c39","src/data.rs":"5bc2dce1cfa1aa5c1324ccdc2d76a6bd5df2382530c7e863d2bb50dea60cc4bc","src/expr.rs":"e99c5ef631cff8a0b0c2666deb35cd0c3eee2ee3585b113ff37cffe3b12435d4","src/file.rs":"5689efa3c5959a6a0d8cfc2c13bf8a37ab0669e2b81dbded3f3c28884a88fca0","src/fixup.rs":"ee279996cd5c57eb308a7e8529cd1f2999617426047df2e641a95ddc82ff44ce","src/generics.rs":"f10b95f4b011f5bf6510d3a77e38227716dccf0a8aeb8a8344e776be9f90f54e","src/item.rs":"4dc320bf73f4ca7d2c6741c31700b5150a02106bfe688969070aff53c2ce455a","src/iter.rs":"38b2cd3b38719c6024fb6b3aa739f6f8736c83193fd21e2365d4f6c27bc41666","src/lib.rs":"f92f24de5bc5231d107bf97c10d845f83e6c0ae922c8d33841f8c34d07c76130","src/lifetime.rs":"6d420430168185b2da3409bc38a45f63cced9443915f04e6aec71367fc070dcf","src/lit.rs":"9ea6d25533e64df4ff01c084fa1c31ddf64fb3b159409eec7d80dbf281e5171e","src/mac.rs":"36c62d1b721c6c56af799c55371ee43e9c446c4787ba1f69021b9cb6acda76b9","src/pat.rs":"8e53fd1b5382bb068210162bfab9921246093cfdd80dd93cd8627fcfdae39940","src/path.rs":"e73d83dc38f5c6c0c82f824da7eb090a16027f32fc40446b185580ee5e99be58","src/precedence.rs":"a8ce97ba0a25f442b5f238c64f078d70f4114b4b0f9df82764d533dd39a47abb","src/ring.rs":"517b1a02f8e0a9c1316830117daad1e30d17e1fcf6428c6b438c626aa43286ae","src/stmt.rs":"e17ab9647fed9daa4f5b2fbd007015128f2a7fc65686a988593444a37242f885","src/token.rs":"c288b1d81f2a35673d4ca1dd10d3386670b067460121df3038303e1ed73b41a7","src/ty.rs":"a1e3e5a08124673826948f97e70c11800081d2bca7f3aec12d84d0d00837290f","tests/test.rs":"c6f8c7830b7491fca1d56e41aa4acc6256b683a3556a48982f57ae62d38aaaa2","tests/test_precedence.rs":"de0c770b9a72e5eba8a52dcac0614d6db8ff5041ba601e1e67f113d68c9afd50"},"package":"6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"}
\ No newline at end of file

crates/prettyplease/Android.bp

diff --git a/crates/prettyplease/Android.bp b/crates/prettyplease/Android.bp
index 8e5fd1a..1e0bada 100644
--- a/crates/prettyplease/Android.bp
+++ b/crates/prettyplease/Android.bp
@@ -18,7 +18,7 @@
     host_cross_supported: false,
     crate_name: "prettyplease",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.2.25",
+    cargo_pkg_version: "0.2.29",
     crate_root: "src/lib.rs",
     edition: "2021",
     rustlibs: [

crates/prettyplease/Cargo.toml

diff --git a/crates/prettyplease/Cargo.toml b/crates/prettyplease/Cargo.toml
index b39c5e3..14dd304 100644
--- a/crates/prettyplease/Cargo.toml
+++ b/crates/prettyplease/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 name = "prettyplease"
-version = "0.2.25"
+version = "0.2.29"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 build = "build.rs"
 links = "prettyplease02"
@@ -38,6 +38,9 @@
 [package.metadata.playground]
 features = ["verbatim"]
 
+[features]
+verbatim = ["syn/parsing"]
+
 [lib]
 name = "prettyplease"
 path = "src/lib.rs"
@@ -47,12 +50,16 @@
 name = "test"
 path = "tests/test.rs"
 
+[[test]]
+name = "test_precedence"
+path = "tests/test_precedence.rs"
+
 [dependencies.proc-macro2]
 version = "1.0.80"
 default-features = false
 
 [dependencies.syn]
-version = "2.0.81"
+version = "2.0.96"
 features = ["full"]
 default-features = false
 
@@ -68,9 +75,12 @@
 default-features = false
 
 [dev-dependencies.syn]
-version = "2.0.81"
-features = ["parsing"]
+version = "2.0.96"
+features = [
+    "clone-impls",
+    "extra-traits",
+    "parsing",
+    "printing",
+    "visit-mut",
+]
 default-features = false
-
-[features]
-verbatim = ["syn/parsing"]

crates/prettyplease/METADATA

diff --git a/crates/prettyplease/METADATA b/crates/prettyplease/METADATA
index 13f0ff2..8344b06 100644
--- a/crates/prettyplease/METADATA
+++ b/crates/prettyplease/METADATA
@@ -1,17 +1,17 @@
 name: "prettyplease"
 description: "A minimal `syn` syntax tree pretty-printer"
 third_party {
-  version: "0.2.25"
+  version: "0.2.29"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 12
-    day: 20
+    year: 2025
+    month: 1
+    day: 14
   }
   homepage: "https://crates.io/crates/prettyplease"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/prettyplease/prettyplease-0.2.25.crate"
-    version: "0.2.25"
+    value: "https://static.crates.io/crates/prettyplease/prettyplease-0.2.29.crate"
+    version: "0.2.29"
   }
 }

crates/prettyplease/src/algorithm.rs

diff --git a/crates/prettyplease/src/algorithm.rs b/crates/prettyplease/src/algorithm.rs
index 6e2b961..ecb68c3 100644
--- a/crates/prettyplease/src/algorithm.rs
+++ b/crates/prettyplease/src/algorithm.rs
@@ -19,7 +19,7 @@
     pub offset: isize,
     pub blank_space: usize,
     pub pre_break: Option<char>,
-    pub post_break: Option<char>,
+    pub post_break: &'static str,
     pub no_break: Option<char>,
     pub if_nonempty: bool,
     pub never_break: bool,
@@ -211,9 +211,18 @@
         self.scan_end();
     }
 
+    pub fn ends_with(&self, ch: char) -> bool {
+        for i in self.buf.index_range().rev() {
+            if let Token::String(token) = &self.buf[i].token {
+                return token.ends_with(ch);
+            }
+        }
+        self.out.ends_with(ch)
+    }
+
     fn check_stream(&mut self) {
         while self.right_total - self.left_total > self.space {
-            if *self.scan_stack.front().unwrap() == self.buf.index_of_first() {
+            if *self.scan_stack.front().unwrap() == self.buf.index_range().start {
                 self.scan_stack.pop_front().unwrap();
                 self.buf.first_mut().size = SIZE_INFINITY;
             }
@@ -353,10 +362,10 @@
             let indent = self.indent as isize + token.offset;
             self.pending_indentation = usize::try_from(indent).unwrap();
             self.space = cmp::max(MARGIN - indent, MIN_SPACE);
-            if let Some(post_break) = token.post_break {
+            if !token.post_break.is_empty() {
                 self.print_indent();
-                self.out.push(post_break);
-                self.space -= post_break.len_utf8() as isize;
+                self.out.push_str(token.post_break);
+                self.space -= token.post_break.len() as isize;
             }
         }
     }

crates/prettyplease/src/attr.rs

diff --git a/crates/prettyplease/src/attr.rs b/crates/prettyplease/src/attr.rs
index 0388d66..d7c2250 100644
--- a/crates/prettyplease/src/attr.rs
+++ b/crates/prettyplease/src/attr.rs
@@ -1,4 +1,5 @@
 use crate::algorithm::Printer;
+use crate::fixup::FixupContext;
 use crate::path::PathKind;
 use crate::INDENT;
 use proc_macro2::{Delimiter, Group, TokenStream, TokenTree};
@@ -102,7 +103,7 @@
     fn meta_name_value(&mut self, meta: &MetaNameValue) {
         self.path(&meta.path, PathKind::Simple);
         self.word(" = ");
-        self.expr(&meta.value);
+        self.expr(&meta.value, FixupContext::NONE);
     }
 
     fn attr_tokens(&mut self, tokens: TokenStream) {

crates/prettyplease/src/classify.rs

diff --git a/crates/prettyplease/src/classify.rs b/crates/prettyplease/src/classify.rs
new file mode 100644
index 0000000..17648f6
--- /dev/null
+++ b/crates/prettyplease/src/classify.rs
@@ -0,0 +1,324 @@
+use proc_macro2::{Delimiter, TokenStream, TokenTree};
+use std::ops::ControlFlow;
+use syn::punctuated::Punctuated;
+use syn::{Expr, MacroDelimiter, Path, PathArguments, ReturnType, Token, Type, TypeParamBound};
+
+pub(crate) fn requires_semi_to_be_stmt(expr: &Expr) -> bool {
+    match expr {
+        Expr::Macro(expr) => !matches!(expr.mac.delimiter, MacroDelimiter::Brace(_)),
+        _ => requires_comma_to_be_match_arm(expr),
+    }
+}
+
+pub(crate) fn requires_comma_to_be_match_arm(mut expr: &Expr) -> bool {
+    loop {
+        match expr {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Expr::If(_)
+            | Expr::Match(_)
+            | Expr::Block(_) | Expr::Unsafe(_) // both under ExprKind::Block in rustc
+            | Expr::While(_)
+            | Expr::Loop(_)
+            | Expr::ForLoop(_)
+            | Expr::TryBlock(_)
+            | Expr::Const(_) => return false,
+
+            Expr::Array(_)
+            | Expr::Assign(_)
+            | Expr::Async(_)
+            | Expr::Await(_)
+            | Expr::Binary(_)
+            | Expr::Break(_)
+            | Expr::Call(_)
+            | Expr::Cast(_)
+            | Expr::Closure(_)
+            | Expr::Continue(_)
+            | Expr::Field(_)
+            | Expr::Index(_)
+            | Expr::Infer(_)
+            | Expr::Let(_)
+            | Expr::Lit(_)
+            | Expr::Macro(_)
+            | Expr::MethodCall(_)
+            | Expr::Paren(_)
+            | Expr::Path(_)
+            | Expr::Range(_)
+            | Expr::RawAddr(_)
+            | Expr::Reference(_)
+            | Expr::Repeat(_)
+            | Expr::Return(_)
+            | Expr::Struct(_)
+            | Expr::Try(_)
+            | Expr::Tuple(_)
+            | Expr::Unary(_)
+            | Expr::Yield(_)
+            | Expr::Verbatim(_) => return true,
+
+            Expr::Group(group) => expr = &group.expr,
+
+            _ => return true,
+        }
+    }
+}
+
+pub(crate) fn trailing_unparameterized_path(mut ty: &Type) -> bool {
+    loop {
+        match ty {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Type::BareFn(t) => match &t.output {
+                ReturnType::Default => return false,
+                ReturnType::Type(_, ret) => ty = ret,
+            },
+            Type::ImplTrait(t) => match last_type_in_bounds(&t.bounds) {
+                ControlFlow::Break(trailing_path) => return trailing_path,
+                ControlFlow::Continue(t) => ty = t,
+            },
+            Type::Path(t) => match last_type_in_path(&t.path) {
+                ControlFlow::Break(trailing_path) => return trailing_path,
+                ControlFlow::Continue(t) => ty = t,
+            },
+            Type::Ptr(t) => ty = &t.elem,
+            Type::Reference(t) => ty = &t.elem,
+            Type::TraitObject(t) => match last_type_in_bounds(&t.bounds) {
+                ControlFlow::Break(trailing_path) => return trailing_path,
+                ControlFlow::Continue(t) => ty = t,
+            },
+
+            Type::Array(_)
+            | Type::Group(_)
+            | Type::Infer(_)
+            | Type::Macro(_)
+            | Type::Never(_)
+            | Type::Paren(_)
+            | Type::Slice(_)
+            | Type::Tuple(_)
+            | Type::Verbatim(_) => return false,
+
+            _ => return false,
+        }
+    }
+
+    fn last_type_in_path(path: &Path) -> ControlFlow<bool, &Type> {
+        match &path.segments.last().unwrap().arguments {
+            PathArguments::None => ControlFlow::Break(true),
+            PathArguments::AngleBracketed(_) => ControlFlow::Break(false),
+            PathArguments::Parenthesized(arg) => match &arg.output {
+                ReturnType::Default => ControlFlow::Break(false),
+                ReturnType::Type(_, ret) => ControlFlow::Continue(ret),
+            },
+        }
+    }
+
+    fn last_type_in_bounds(
+        bounds: &Punctuated<TypeParamBound, Token![+]>,
+    ) -> ControlFlow<bool, &Type> {
+        match bounds.last().unwrap() {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            TypeParamBound::Trait(t) => last_type_in_path(&t.path),
+            TypeParamBound::Lifetime(_)
+            | TypeParamBound::PreciseCapture(_)
+            | TypeParamBound::Verbatim(_) => ControlFlow::Break(false),
+            _ => ControlFlow::Break(false),
+        }
+    }
+}
+
+/// Whether the expression's first token is the label of a loop/block.
+pub(crate) fn expr_leading_label(mut expr: &Expr) -> bool {
+    loop {
+        match expr {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Expr::Block(e) => return e.label.is_some(),
+            Expr::ForLoop(e) => return e.label.is_some(),
+            Expr::Loop(e) => return e.label.is_some(),
+            Expr::While(e) => return e.label.is_some(),
+
+            Expr::Assign(e) => expr = &e.left,
+            Expr::Await(e) => expr = &e.base,
+            Expr::Binary(e) => expr = &e.left,
+            Expr::Call(e) => expr = &e.func,
+            Expr::Cast(e) => expr = &e.expr,
+            Expr::Field(e) => expr = &e.base,
+            Expr::Index(e) => expr = &e.expr,
+            Expr::MethodCall(e) => expr = &e.receiver,
+            Expr::Range(e) => match &e.start {
+                Some(start) => expr = start,
+                None => return false,
+            },
+            Expr::Try(e) => expr = &e.expr,
+
+            Expr::Array(_)
+            | Expr::Async(_)
+            | Expr::Break(_)
+            | Expr::Closure(_)
+            | Expr::Const(_)
+            | Expr::Continue(_)
+            | Expr::If(_)
+            | Expr::Infer(_)
+            | Expr::Let(_)
+            | Expr::Lit(_)
+            | Expr::Macro(_)
+            | Expr::Match(_)
+            | Expr::Paren(_)
+            | Expr::Path(_)
+            | Expr::RawAddr(_)
+            | Expr::Reference(_)
+            | Expr::Repeat(_)
+            | Expr::Return(_)
+            | Expr::Struct(_)
+            | Expr::TryBlock(_)
+            | Expr::Tuple(_)
+            | Expr::Unary(_)
+            | Expr::Unsafe(_)
+            | Expr::Verbatim(_)
+            | Expr::Yield(_) => return false,
+
+            Expr::Group(e) => {
+                if !e.attrs.is_empty() {
+                    return false;
+                }
+                expr = &e.expr;
+            }
+
+            _ => return false,
+        }
+    }
+}
+
+/// Whether the expression's last token is `}`.
+pub(crate) fn expr_trailing_brace(mut expr: &Expr) -> bool {
+    loop {
+        match expr {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Expr::Async(_)
+            | Expr::Block(_)
+            | Expr::Const(_)
+            | Expr::ForLoop(_)
+            | Expr::If(_)
+            | Expr::Loop(_)
+            | Expr::Match(_)
+            | Expr::Struct(_)
+            | Expr::TryBlock(_)
+            | Expr::Unsafe(_)
+            | Expr::While(_) => return true,
+
+            Expr::Assign(e) => expr = &e.right,
+            Expr::Binary(e) => expr = &e.right,
+            Expr::Break(e) => match &e.expr {
+                Some(e) => expr = e,
+                None => return false,
+            },
+            Expr::Cast(e) => return type_trailing_brace(&e.ty),
+            Expr::Closure(e) => expr = &e.body,
+            Expr::Group(e) => expr = &e.expr,
+            Expr::Let(e) => expr = &e.expr,
+            Expr::Macro(e) => return matches!(e.mac.delimiter, MacroDelimiter::Brace(_)),
+            Expr::Range(e) => match &e.end {
+                Some(end) => expr = end,
+                None => return false,
+            },
+            Expr::RawAddr(e) => expr = &e.expr,
+            Expr::Reference(e) => expr = &e.expr,
+            Expr::Return(e) => match &e.expr {
+                Some(e) => expr = e,
+                None => return false,
+            },
+            Expr::Unary(e) => expr = &e.expr,
+            Expr::Verbatim(e) => return tokens_trailing_brace(e),
+            Expr::Yield(e) => match &e.expr {
+                Some(e) => expr = e,
+                None => return false,
+            },
+
+            Expr::Array(_)
+            | Expr::Await(_)
+            | Expr::Call(_)
+            | Expr::Continue(_)
+            | Expr::Field(_)
+            | Expr::Index(_)
+            | Expr::Infer(_)
+            | Expr::Lit(_)
+            | Expr::MethodCall(_)
+            | Expr::Paren(_)
+            | Expr::Path(_)
+            | Expr::Repeat(_)
+            | Expr::Try(_)
+            | Expr::Tuple(_) => return false,
+
+            _ => return false,
+        }
+    }
+
+    fn type_trailing_brace(mut ty: &Type) -> bool {
+        loop {
+            match ty {
+                #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+                Type::BareFn(t) => match &t.output {
+                    ReturnType::Default => return false,
+                    ReturnType::Type(_, ret) => ty = ret,
+                },
+                Type::ImplTrait(t) => match last_type_in_bounds(&t.bounds) {
+                    ControlFlow::Break(trailing_brace) => return trailing_brace,
+                    ControlFlow::Continue(t) => ty = t,
+                },
+                Type::Macro(t) => return matches!(t.mac.delimiter, MacroDelimiter::Brace(_)),
+                Type::Path(t) => match last_type_in_path(&t.path) {
+                    Some(t) => ty = t,
+                    None => return false,
+                },
+                Type::Ptr(t) => ty = &t.elem,
+                Type::Reference(t) => ty = &t.elem,
+                Type::TraitObject(t) => match last_type_in_bounds(&t.bounds) {
+                    ControlFlow::Break(trailing_brace) => return trailing_brace,
+                    ControlFlow::Continue(t) => ty = t,
+                },
+                Type::Verbatim(t) => return tokens_trailing_brace(t),
+
+                Type::Array(_)
+                | Type::Group(_)
+                | Type::Infer(_)
+                | Type::Never(_)
+                | Type::Paren(_)
+                | Type::Slice(_)
+                | Type::Tuple(_) => return false,
+
+                _ => return false,
+            }
+        }
+    }
+
+    fn last_type_in_path(path: &Path) -> Option<&Type> {
+        match &path.segments.last().unwrap().arguments {
+            PathArguments::None | PathArguments::AngleBracketed(_) => None,
+            PathArguments::Parenthesized(arg) => match &arg.output {
+                ReturnType::Default => None,
+                ReturnType::Type(_, ret) => Some(ret),
+            },
+        }
+    }
+
+    fn last_type_in_bounds(
+        bounds: &Punctuated<TypeParamBound, Token![+]>,
+    ) -> ControlFlow<bool, &Type> {
+        match bounds.last().unwrap() {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            TypeParamBound::Trait(t) => match last_type_in_path(&t.path) {
+                Some(t) => ControlFlow::Continue(t),
+                None => ControlFlow::Break(false),
+            },
+            TypeParamBound::Lifetime(_) | TypeParamBound::PreciseCapture(_) => {
+                ControlFlow::Break(false)
+            }
+            TypeParamBound::Verbatim(t) => ControlFlow::Break(tokens_trailing_brace(t)),
+            _ => ControlFlow::Break(false),
+        }
+    }
+
+    fn tokens_trailing_brace(tokens: &TokenStream) -> bool {
+        if let Some(TokenTree::Group(last)) = tokens.clone().into_iter().last() {
+            last.delimiter() == Delimiter::Brace
+        } else {
+            false
+        }
+    }
+}

crates/prettyplease/src/data.rs

diff --git a/crates/prettyplease/src/data.rs b/crates/prettyplease/src/data.rs
index d823ee3..3561a49 100644
--- a/crates/prettyplease/src/data.rs
+++ b/crates/prettyplease/src/data.rs
@@ -1,4 +1,5 @@
 use crate::algorithm::Printer;
+use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
 use crate::path::PathKind;
 use crate::INDENT;
@@ -31,7 +32,7 @@
         }
         if let Some((_eq_token, discriminant)) = &variant.discriminant {
             self.word(" = ");
-            self.expr(discriminant);
+            self.expr(discriminant, FixupContext::NONE);
         }
     }
 

crates/prettyplease/src/expr.rs

diff --git a/crates/prettyplease/src/expr.rs b/crates/prettyplease/src/expr.rs
index 52c9e5a..7b223b8 100644
--- a/crates/prettyplease/src/expr.rs
+++ b/crates/prettyplease/src/expr.rs
@@ -1,7 +1,10 @@
 use crate::algorithm::{BreakToken, Printer};
 use crate::attr;
+use crate::classify;
+use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
 use crate::path::PathKind;
+use crate::precedence::Precedence;
 use crate::stmt;
 use crate::INDENT;
 use proc_macro2::TokenStream;
@@ -17,94 +20,130 @@
 };
 
 impl Printer {
-    pub fn expr(&mut self, expr: &Expr) {
+    pub fn expr(&mut self, expr: &Expr, mut fixup: FixupContext) {
+        let needs_paren = fixup.parenthesize(expr);
+        if needs_paren {
+            self.word("(");
+            fixup = FixupContext::NONE;
+        }
+
         let beginning_of_line = false;
+
         match expr {
             #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
             Expr::Array(expr) => self.expr_array(expr),
-            Expr::Assign(expr) => self.expr_assign(expr),
+            Expr::Assign(expr) => self.expr_assign(expr, fixup),
             Expr::Async(expr) => self.expr_async(expr),
-            Expr::Await(expr) => self.expr_await(expr, beginning_of_line),
-            Expr::Binary(expr) => self.expr_binary(expr),
+            Expr::Await(expr) => self.expr_await(expr, beginning_of_line, fixup),
+            Expr::Binary(expr) => self.expr_binary(expr, fixup),
             Expr::Block(expr) => self.expr_block(expr),
-            Expr::Break(expr) => self.expr_break(expr),
-            Expr::Call(expr) => self.expr_call(expr, beginning_of_line),
-            Expr::Cast(expr) => self.expr_cast(expr),
-            Expr::Closure(expr) => self.expr_closure(expr),
+            Expr::Break(expr) => self.expr_break(expr, fixup),
+            Expr::Call(expr) => self.expr_call(expr, beginning_of_line, fixup),
+            Expr::Cast(expr) => self.expr_cast(expr, fixup),
+            Expr::Closure(expr) => self.expr_closure(expr, fixup),
             Expr::Const(expr) => self.expr_const(expr),
             Expr::Continue(expr) => self.expr_continue(expr),
-            Expr::Field(expr) => self.expr_field(expr, beginning_of_line),
+            Expr::Field(expr) => self.expr_field(expr, beginning_of_line, fixup),
             Expr::ForLoop(expr) => self.expr_for_loop(expr),
-            Expr::Group(expr) => self.expr_group(expr),
+            Expr::Group(expr) => self.expr_group(expr, fixup),
             Expr::If(expr) => self.expr_if(expr),
-            Expr::Index(expr) => self.expr_index(expr, beginning_of_line),
+            Expr::Index(expr) => self.expr_index(expr, beginning_of_line, fixup),
             Expr::Infer(expr) => self.expr_infer(expr),
-            Expr::Let(expr) => self.expr_let(expr),
+            Expr::Let(expr) => self.expr_let(expr, fixup),
             Expr::Lit(expr) => self.expr_lit(expr),
             Expr::Loop(expr) => self.expr_loop(expr),
             Expr::Macro(expr) => self.expr_macro(expr),
             Expr::Match(expr) => self.expr_match(expr),
-            Expr::MethodCall(expr) => self.expr_method_call(expr, beginning_of_line),
+            Expr::MethodCall(expr) => self.expr_method_call(expr, beginning_of_line, fixup),
             Expr::Paren(expr) => self.expr_paren(expr),
             Expr::Path(expr) => self.expr_path(expr),
-            Expr::Range(expr) => self.expr_range(expr),
-            Expr::RawAddr(expr) => self.expr_raw_addr(expr),
-            Expr::Reference(expr) => self.expr_reference(expr),
+            Expr::Range(expr) => self.expr_range(expr, fixup),
+            Expr::RawAddr(expr) => self.expr_raw_addr(expr, fixup),
+            Expr::Reference(expr) => self.expr_reference(expr, fixup),
             Expr::Repeat(expr) => self.expr_repeat(expr),
-            Expr::Return(expr) => self.expr_return(expr),
+            Expr::Return(expr) => self.expr_return(expr, fixup),
             Expr::Struct(expr) => self.expr_struct(expr),
-            Expr::Try(expr) => self.expr_try(expr, beginning_of_line),
+            Expr::Try(expr) => self.expr_try(expr, beginning_of_line, fixup),
             Expr::TryBlock(expr) => self.expr_try_block(expr),
             Expr::Tuple(expr) => self.expr_tuple(expr),
-            Expr::Unary(expr) => self.expr_unary(expr),
+            Expr::Unary(expr) => self.expr_unary(expr, fixup),
             Expr::Unsafe(expr) => self.expr_unsafe(expr),
-            Expr::Verbatim(expr) => self.expr_verbatim(expr),
+            Expr::Verbatim(expr) => self.expr_verbatim(expr, fixup),
             Expr::While(expr) => self.expr_while(expr),
-            Expr::Yield(expr) => self.expr_yield(expr),
+            Expr::Yield(expr) => self.expr_yield(expr, fixup),
             _ => unimplemented!("unknown Expr"),
         }
-    }
 
-    pub fn expr_beginning_of_line(&mut self, expr: &Expr, beginning_of_line: bool) {
-        match expr {
-            Expr::Await(expr) => self.expr_await(expr, beginning_of_line),
-            Expr::Field(expr) => self.expr_field(expr, beginning_of_line),
-            Expr::Index(expr) => self.expr_index(expr, beginning_of_line),
-            Expr::MethodCall(expr) => self.expr_method_call(expr, beginning_of_line),
-            Expr::Try(expr) => self.expr_try(expr, beginning_of_line),
-            _ => self.expr(expr),
-        }
-    }
-
-    fn subexpr(&mut self, expr: &Expr, beginning_of_line: bool) {
-        match expr {
-            Expr::Await(expr) => self.subexpr_await(expr, beginning_of_line),
-            Expr::Call(expr) => self.subexpr_call(expr),
-            Expr::Field(expr) => self.subexpr_field(expr, beginning_of_line),
-            Expr::Index(expr) => self.subexpr_index(expr, beginning_of_line),
-            Expr::MethodCall(expr) => {
-                let unindent_call_args = false;
-                self.subexpr_method_call(expr, beginning_of_line, unindent_call_args);
-            }
-            Expr::Try(expr) => self.subexpr_try(expr, beginning_of_line),
-            _ => {
-                self.cbox(-INDENT);
-                self.expr(expr);
-                self.end();
-            }
-        }
-    }
-
-    fn wrap_exterior_struct(&mut self, expr: &Expr) {
-        let needs_paren = contains_exterior_struct_lit(expr);
-        if needs_paren {
-            self.word("(");
-        }
-        self.cbox(0);
-        self.expr(expr);
         if needs_paren {
             self.word(")");
         }
+    }
+
+    pub fn expr_beginning_of_line(
+        &mut self,
+        expr: &Expr,
+        mut needs_paren: bool,
+        beginning_of_line: bool,
+        mut fixup: FixupContext,
+    ) {
+        needs_paren |= fixup.parenthesize(expr);
+        if needs_paren {
+            self.word("(");
+            fixup = FixupContext::NONE;
+        }
+
+        match expr {
+            Expr::Await(expr) => self.expr_await(expr, beginning_of_line, fixup),
+            Expr::Field(expr) => self.expr_field(expr, beginning_of_line, fixup),
+            Expr::Index(expr) => self.expr_index(expr, beginning_of_line, fixup),
+            Expr::MethodCall(expr) => self.expr_method_call(expr, beginning_of_line, fixup),
+            Expr::Try(expr) => self.expr_try(expr, beginning_of_line, fixup),
+            _ => self.expr(expr, fixup),
+        }
+
+        if needs_paren {
+            self.word(")");
+        }
+    }
+
+    fn prefix_subexpr(
+        &mut self,
+        expr: &Expr,
+        mut needs_paren: bool,
+        beginning_of_line: bool,
+        mut fixup: FixupContext,
+    ) {
+        needs_paren |= fixup.parenthesize(expr);
+        if needs_paren {
+            self.word("(");
+            fixup = FixupContext::NONE;
+        }
+
+        match expr {
+            Expr::Await(expr) => self.prefix_subexpr_await(expr, beginning_of_line, fixup),
+            Expr::Call(expr) => self.prefix_subexpr_call(expr, fixup),
+            Expr::Field(expr) => self.prefix_subexpr_field(expr, beginning_of_line, fixup),
+            Expr::Index(expr) => self.prefix_subexpr_index(expr, beginning_of_line, fixup),
+            Expr::MethodCall(expr) => {
+                let unindent_call_args = false;
+                self.prefix_subexpr_method_call(expr, beginning_of_line, unindent_call_args, fixup);
+            }
+            Expr::Try(expr) => self.prefix_subexpr_try(expr, beginning_of_line, fixup),
+            _ => {
+                self.cbox(-INDENT);
+                self.expr(expr, fixup);
+                self.end();
+            }
+        }
+
+        if needs_paren {
+            self.word(")");
+        }
+    }
+
+    fn expr_condition(&mut self, expr: &Expr) {
+        self.cbox(0);
+        self.expr(expr, FixupContext::new_condition());
         if needs_newline_if_wrap(expr) {
             self.space();
         } else {
@@ -113,13 +152,26 @@
         self.end();
     }
 
+    pub fn subexpr(&mut self, expr: &Expr, needs_paren: bool, mut fixup: FixupContext) {
+        if needs_paren {
+            self.word("(");
+            fixup = FixupContext::NONE;
+        }
+
+        self.expr(expr, fixup);
+
+        if needs_paren {
+            self.word(")");
+        }
+    }
+
     fn expr_array(&mut self, expr: &ExprArray) {
         self.outer_attrs(&expr.attrs);
         self.word("[");
         self.cbox(INDENT);
         self.zerobreak();
         for element in expr.elems.iter().delimited() {
-            self.expr(&element);
+            self.expr(&element, FixupContext::NONE);
             self.trailing_comma(element.is_last);
         }
         self.offset(-INDENT);
@@ -127,13 +179,21 @@
         self.word("]");
     }
 
-    fn expr_assign(&mut self, expr: &ExprAssign) {
+    fn expr_assign(&mut self, expr: &ExprAssign, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.left,
+            false,
+            false,
+            Precedence::Assign,
+        );
+        let right_fixup = fixup.rightmost_subexpression_fixup(false, false, Precedence::Assign);
+
         self.outer_attrs(&expr.attrs);
         self.ibox(0);
-        self.expr(&expr.left);
+        self.subexpr(&expr.left, left_prec <= Precedence::Range, left_fixup);
         self.word(" = ");
         self.neverbreak();
-        self.expr(&expr.right);
+        self.expr(&expr.right, right_fixup);
         self.end();
     }
 
@@ -148,29 +208,75 @@
         self.end();
     }
 
-    fn expr_await(&mut self, expr: &ExprAwait, beginning_of_line: bool) {
+    fn expr_await(&mut self, expr: &ExprAwait, beginning_of_line: bool, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.cbox(INDENT);
-        self.subexpr_await(expr, beginning_of_line);
+        self.prefix_subexpr_await(expr, beginning_of_line, fixup);
         self.end();
     }
 
-    fn subexpr_await(&mut self, expr: &ExprAwait, beginning_of_line: bool) {
-        self.subexpr(&expr.base, beginning_of_line);
-        self.zerobreak_unless_short_ident(beginning_of_line, &expr.base);
+    fn prefix_subexpr_await(
+        &mut self,
+        expr: &ExprAwait,
+        beginning_of_line: bool,
+        fixup: FixupContext,
+    ) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_dot(&expr.base);
+
+        self.prefix_subexpr(
+            &expr.base,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
+        if !(beginning_of_line && is_short_ident(&expr.base)) {
+            self.scan_break(BreakToken {
+                no_break: self.ends_with('.').then_some(' '),
+                ..BreakToken::default()
+            });
+        }
         self.word(".await");
     }
 
-    fn expr_binary(&mut self, expr: &ExprBinary) {
+    fn expr_binary(&mut self, expr: &ExprBinary, fixup: FixupContext) {
+        let binop_prec = Precedence::of_binop(&expr.op);
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.left,
+            match &expr.op {
+                BinOp::Sub(_)
+                | BinOp::Mul(_)
+                | BinOp::And(_)
+                | BinOp::Or(_)
+                | BinOp::BitAnd(_)
+                | BinOp::BitOr(_)
+                | BinOp::Shl(_)
+                | BinOp::Lt(_) => true,
+                _ => false,
+            },
+            match &expr.op {
+                BinOp::Shl(_) | BinOp::Lt(_) => true,
+                _ => false,
+            },
+            binop_prec,
+        );
+        let left_needs_group = match binop_prec {
+            Precedence::Assign => left_prec <= Precedence::Range,
+            Precedence::Compare => left_prec <= binop_prec,
+            _ => left_prec < binop_prec,
+        };
+        let right_fixup = fixup.rightmost_subexpression_fixup(false, false, binop_prec);
+        let right_needs_group = binop_prec != Precedence::Assign
+            && right_fixup.rightmost_subexpression_precedence(&expr.right) <= binop_prec;
+
         self.outer_attrs(&expr.attrs);
         self.ibox(INDENT);
         self.ibox(-INDENT);
-        self.expr(&expr.left);
+        self.subexpr(&expr.left, left_needs_group, left_fixup);
         self.end();
         self.space();
         self.binary_operator(&expr.op);
         self.nbsp();
-        self.expr(&expr.right);
+        self.subexpr(&expr.right, right_needs_group, right_fixup);
         self.end();
     }
 
@@ -184,7 +290,7 @@
         self.end();
     }
 
-    fn expr_break(&mut self, expr: &ExprBreak) {
+    fn expr_break(&mut self, expr: &ExprBreak, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.word("break");
         if let Some(lifetime) = &expr.label {
@@ -193,31 +299,62 @@
         }
         if let Some(value) = &expr.expr {
             self.nbsp();
-            self.expr(value);
+            self.subexpr(
+                value,
+                expr.label.is_none() && classify::expr_leading_label(value),
+                fixup.rightmost_subexpression_fixup(true, true, Precedence::Jump),
+            );
         }
     }
 
-    fn expr_call(&mut self, expr: &ExprCall, beginning_of_line: bool) {
+    fn expr_call(&mut self, expr: &ExprCall, beginning_of_line: bool, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.func,
+            true,
+            false,
+            Precedence::Unambiguous,
+        );
+        let needs_paren = if let Expr::Field(func) = &*expr.func {
+            matches!(func.member, Member::Named(_))
+        } else {
+            left_prec < Precedence::Unambiguous
+        };
+
         self.outer_attrs(&expr.attrs);
-        self.expr_beginning_of_line(&expr.func, beginning_of_line);
+        self.expr_beginning_of_line(&expr.func, needs_paren, beginning_of_line, left_fixup);
         self.word("(");
         self.call_args(&expr.args);
         self.word(")");
     }
 
-    fn subexpr_call(&mut self, expr: &ExprCall) {
+    fn prefix_subexpr_call(&mut self, expr: &ExprCall, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.func,
+            true,
+            false,
+            Precedence::Unambiguous,
+        );
+        let needs_paren = if let Expr::Field(func) = &*expr.func {
+            matches!(func.member, Member::Named(_))
+        } else {
+            left_prec < Precedence::Unambiguous
+        };
+
         let beginning_of_line = false;
-        self.subexpr(&expr.func, beginning_of_line);
+        self.prefix_subexpr(&expr.func, needs_paren, beginning_of_line, left_fixup);
         self.word("(");
         self.call_args(&expr.args);
         self.word(")");
     }
 
-    fn expr_cast(&mut self, expr: &ExprCast) {
+    fn expr_cast(&mut self, expr: &ExprCast, fixup: FixupContext) {
+        let (left_prec, left_fixup) =
+            fixup.leftmost_subexpression_with_operator(&expr.expr, false, false, Precedence::Cast);
+
         self.outer_attrs(&expr.attrs);
         self.ibox(INDENT);
         self.ibox(-INDENT);
-        self.expr(&expr.expr);
+        self.subexpr(&expr.expr, left_prec < Precedence::Cast, left_fixup);
         self.end();
         self.space();
         self.word("as ");
@@ -225,7 +362,7 @@
         self.end();
     }
 
-    fn expr_closure(&mut self, expr: &ExprClosure) {
+    fn expr_closure(&mut self, expr: &ExprClosure, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.ibox(0);
         if let Some(bound_lifetimes) = &expr.lifetimes {
@@ -275,16 +412,22 @@
                         pre_break: Some(if okay_to_brace { '{' } else { '(' }),
                         ..BreakToken::default()
                     });
-                    self.expr(&expr.body);
+                    self.expr(
+                        &expr.body,
+                        fixup.rightmost_subexpression_fixup(false, false, Precedence::Jump),
+                    );
                     self.scan_break(BreakToken {
                         offset: -INDENT,
-                        pre_break: (okay_to_brace && stmt::add_semi(&expr.body)).then(|| ';'),
-                        post_break: Some(if okay_to_brace { '}' } else { ')' }),
+                        pre_break: (okay_to_brace && stmt::add_semi(&expr.body)).then_some(';'),
+                        post_break: if okay_to_brace { "}" } else { ")" },
                         ..BreakToken::default()
                     });
                     self.end();
                 } else {
-                    self.expr(&expr.body);
+                    self.expr(
+                        &expr.body,
+                        fixup.rightmost_subexpression_fixup(false, false, Precedence::Jump),
+                    );
                 }
             }
             ReturnType::Type(_arrow, ty) => {
@@ -298,7 +441,17 @@
                 self.ty(ty);
                 self.nbsp();
                 self.neverbreak();
-                self.expr(&expr.body);
+                if matches!(&*expr.body, Expr::Block(body) if body.attrs.is_empty() && body.label.is_none())
+                {
+                    self.expr(
+                        &expr.body,
+                        fixup.rightmost_subexpression_fixup(false, false, Precedence::Jump),
+                    );
+                } else {
+                    self.cbox(INDENT);
+                    self.expr_as_small_block(&expr.body, 0);
+                    self.end();
+                }
             }
         }
         self.end();
@@ -321,16 +474,33 @@
         }
     }
 
-    fn expr_field(&mut self, expr: &ExprField, beginning_of_line: bool) {
+    fn expr_field(&mut self, expr: &ExprField, beginning_of_line: bool, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.cbox(INDENT);
-        self.subexpr_field(expr, beginning_of_line);
+        self.prefix_subexpr_field(expr, beginning_of_line, fixup);
         self.end();
     }
 
-    fn subexpr_field(&mut self, expr: &ExprField, beginning_of_line: bool) {
-        self.subexpr(&expr.base, beginning_of_line);
-        self.zerobreak_unless_short_ident(beginning_of_line, &expr.base);
+    fn prefix_subexpr_field(
+        &mut self,
+        expr: &ExprField,
+        beginning_of_line: bool,
+        fixup: FixupContext,
+    ) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_dot(&expr.base);
+
+        self.prefix_subexpr(
+            &expr.base,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
+        if !(beginning_of_line && is_short_ident(&expr.base)) {
+            self.scan_break(BreakToken {
+                no_break: self.ends_with('.').then_some(' '),
+                ..BreakToken::default()
+            });
+        }
         self.word(".");
         self.member(&expr.member);
     }
@@ -345,14 +515,14 @@
         self.pat(&expr.pat);
         self.word(" in ");
         self.neverbreak();
-        self.wrap_exterior_struct(&expr.expr);
+        self.expr_condition(&expr.expr);
         self.word("{");
         self.neverbreak();
         self.cbox(INDENT);
         self.hardbreak_if_nonempty();
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
         self.offset(-INDENT);
         self.end();
@@ -360,9 +530,9 @@
         self.end();
     }
 
-    fn expr_group(&mut self, expr: &ExprGroup) {
+    fn expr_group(&mut self, expr: &ExprGroup, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
-        self.expr(&expr.expr);
+        self.expr(&expr.expr, fixup);
     }
 
     fn expr_if(&mut self, expr: &ExprIf) {
@@ -370,7 +540,7 @@
         self.cbox(INDENT);
         self.word("if ");
         self.cbox(-INDENT);
-        self.wrap_exterior_struct(&expr.cond);
+        self.expr_condition(&expr.cond);
         self.end();
         if let Some((_else_token, else_branch)) = &expr.else_branch {
             let mut else_branch = &**else_branch;
@@ -381,7 +551,7 @@
                     Expr::If(expr) => {
                         self.word("if ");
                         self.cbox(-INDENT);
-                        self.wrap_exterior_struct(&expr.cond);
+                        self.expr_condition(&expr.cond);
                         self.end();
                         self.small_block(&expr.then_branch, &[]);
                         if let Some((_else_token, next)) = &expr.else_branch {
@@ -394,16 +564,7 @@
                     }
                     // If not one of the valid expressions to exist in an else
                     // clause, wrap in a block.
-                    other => {
-                        self.word("{");
-                        self.space();
-                        self.ibox(INDENT);
-                        self.expr(other);
-                        self.end();
-                        self.space();
-                        self.offset(-INDENT);
-                        self.word("}");
-                    }
+                    other => self.expr_as_small_block(other, INDENT),
                 }
                 break;
             }
@@ -412,8 +573,8 @@
         } else {
             self.word("{");
             self.hardbreak();
-            for stmt in &expr.then_branch.stmts {
-                self.stmt(stmt);
+            for stmt in expr.then_branch.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
             self.offset(-INDENT);
             self.word("}");
@@ -421,18 +582,47 @@
         self.end();
     }
 
-    fn expr_index(&mut self, expr: &ExprIndex, beginning_of_line: bool) {
+    fn expr_index(&mut self, expr: &ExprIndex, beginning_of_line: bool, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.expr,
+            true,
+            false,
+            Precedence::Unambiguous,
+        );
+
         self.outer_attrs(&expr.attrs);
-        self.expr_beginning_of_line(&expr.expr, beginning_of_line);
+        self.expr_beginning_of_line(
+            &expr.expr,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
         self.word("[");
-        self.expr(&expr.index);
+        self.expr(&expr.index, FixupContext::NONE);
         self.word("]");
     }
 
-    fn subexpr_index(&mut self, expr: &ExprIndex, beginning_of_line: bool) {
-        self.subexpr(&expr.expr, beginning_of_line);
+    fn prefix_subexpr_index(
+        &mut self,
+        expr: &ExprIndex,
+        beginning_of_line: bool,
+        fixup: FixupContext,
+    ) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_operator(
+            &expr.expr,
+            true,
+            false,
+            Precedence::Unambiguous,
+        );
+
+        self.prefix_subexpr(
+            &expr.expr,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
         self.word("[");
-        self.expr(&expr.index);
+        self.expr(&expr.index, FixupContext::NONE);
         self.word("]");
     }
 
@@ -441,7 +631,9 @@
         self.word("_");
     }
 
-    fn expr_let(&mut self, expr: &ExprLet) {
+    fn expr_let(&mut self, expr: &ExprLet, fixup: FixupContext) {
+        let (right_prec, right_fixup) = fixup.rightmost_subexpression(&expr.expr, Precedence::Let);
+
         self.outer_attrs(&expr.attrs);
         self.ibox(0);
         self.word("let ");
@@ -451,14 +643,7 @@
         self.word(" = ");
         self.neverbreak();
         self.ibox(0);
-        let needs_paren = contains_exterior_struct_lit(&expr.expr);
-        if needs_paren {
-            self.word("(");
-        }
-        self.expr(&expr.expr);
-        if needs_paren {
-            self.word(")");
-        }
+        self.subexpr(&expr.expr, right_prec < Precedence::Let, right_fixup);
         self.end();
         self.end();
     }
@@ -477,8 +662,8 @@
         self.cbox(INDENT);
         self.hardbreak_if_nonempty();
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
         self.offset(-INDENT);
         self.end();
@@ -495,7 +680,7 @@
         self.outer_attrs(&expr.attrs);
         self.ibox(0);
         self.word("match ");
-        self.wrap_exterior_struct(&expr.expr);
+        self.expr_condition(&expr.expr);
         self.word("{");
         self.neverbreak();
         self.cbox(INDENT);
@@ -511,22 +696,40 @@
         self.end();
     }
 
-    fn expr_method_call(&mut self, expr: &ExprMethodCall, beginning_of_line: bool) {
+    fn expr_method_call(
+        &mut self,
+        expr: &ExprMethodCall,
+        beginning_of_line: bool,
+        fixup: FixupContext,
+    ) {
         self.outer_attrs(&expr.attrs);
         self.cbox(INDENT);
         let unindent_call_args = beginning_of_line && is_short_ident(&expr.receiver);
-        self.subexpr_method_call(expr, beginning_of_line, unindent_call_args);
+        self.prefix_subexpr_method_call(expr, beginning_of_line, unindent_call_args, fixup);
         self.end();
     }
 
-    fn subexpr_method_call(
+    fn prefix_subexpr_method_call(
         &mut self,
         expr: &ExprMethodCall,
         beginning_of_line: bool,
         unindent_call_args: bool,
+        fixup: FixupContext,
     ) {
-        self.subexpr(&expr.receiver, beginning_of_line);
-        self.zerobreak_unless_short_ident(beginning_of_line, &expr.receiver);
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_dot(&expr.receiver);
+
+        self.prefix_subexpr(
+            &expr.receiver,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
+        if !(beginning_of_line && is_short_ident(&expr.receiver)) {
+            self.scan_break(BreakToken {
+                no_break: self.ends_with('.').then_some(' '),
+                ..BreakToken::default()
+            });
+        }
         self.word(".");
         self.ident(&expr.method);
         if let Some(turbofish) = &expr.turbofish {
@@ -542,7 +745,7 @@
     fn expr_paren(&mut self, expr: &ExprParen) {
         self.outer_attrs(&expr.attrs);
         self.word("(");
-        self.expr(&expr.expr);
+        self.expr(&expr.expr, FixupContext::NONE);
         self.word(")");
     }
 
@@ -551,52 +754,67 @@
         self.qpath(&expr.qself, &expr.path, PathKind::Expr);
     }
 
-    pub fn expr_range(&mut self, expr: &ExprRange) {
+    pub fn expr_range(&mut self, expr: &ExprRange, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         if let Some(start) = &expr.start {
-            self.expr(start);
+            let (left_prec, left_fixup) =
+                fixup.leftmost_subexpression_with_operator(start, true, false, Precedence::Range);
+            self.subexpr(start, left_prec <= Precedence::Range, left_fixup);
+        } else if self.ends_with('.') {
+            self.nbsp();
         }
         self.word(match expr.limits {
             RangeLimits::HalfOpen(_) => "..",
             RangeLimits::Closed(_) => "..=",
         });
         if let Some(end) = &expr.end {
-            self.expr(end);
+            let right_fixup = fixup.rightmost_subexpression_fixup(false, true, Precedence::Range);
+            let right_prec = right_fixup.rightmost_subexpression_precedence(end);
+            self.subexpr(end, right_prec <= Precedence::Range, right_fixup);
         }
     }
 
-    fn expr_raw_addr(&mut self, expr: &ExprRawAddr) {
+    fn expr_raw_addr(&mut self, expr: &ExprRawAddr, fixup: FixupContext) {
+        let (right_prec, right_fixup) =
+            fixup.rightmost_subexpression(&expr.expr, Precedence::Prefix);
+
         self.outer_attrs(&expr.attrs);
         self.word("&raw ");
         self.pointer_mutability(&expr.mutability);
         self.nbsp();
-        self.expr(&expr.expr);
+        self.subexpr(&expr.expr, right_prec < Precedence::Prefix, right_fixup);
     }
 
-    fn expr_reference(&mut self, expr: &ExprReference) {
+    fn expr_reference(&mut self, expr: &ExprReference, fixup: FixupContext) {
+        let (right_prec, right_fixup) =
+            fixup.rightmost_subexpression(&expr.expr, Precedence::Prefix);
+
         self.outer_attrs(&expr.attrs);
         self.word("&");
         if expr.mutability.is_some() {
             self.word("mut ");
         }
-        self.expr(&expr.expr);
+        self.subexpr(&expr.expr, right_prec < Precedence::Prefix, right_fixup);
     }
 
     fn expr_repeat(&mut self, expr: &ExprRepeat) {
         self.outer_attrs(&expr.attrs);
         self.word("[");
-        self.expr(&expr.expr);
+        self.expr(&expr.expr, FixupContext::NONE);
         self.word("; ");
-        self.expr(&expr.len);
+        self.expr(&expr.len, FixupContext::NONE);
         self.word("]");
     }
 
-    fn expr_return(&mut self, expr: &ExprReturn) {
+    fn expr_return(&mut self, expr: &ExprReturn, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.word("return");
         if let Some(value) = &expr.expr {
             self.nbsp();
-            self.expr(value);
+            self.expr(
+                value,
+                fixup.rightmost_subexpression_fixup(true, false, Precedence::Jump),
+            );
         }
     }
 
@@ -614,7 +832,7 @@
         }
         if let Some(rest) = &expr.rest {
             self.word("..");
-            self.expr(rest);
+            self.expr(rest, FixupContext::NONE);
             self.space();
         }
         self.offset(-INDENT);
@@ -622,14 +840,28 @@
         self.word("}");
     }
 
-    fn expr_try(&mut self, expr: &ExprTry, beginning_of_line: bool) {
+    fn expr_try(&mut self, expr: &ExprTry, beginning_of_line: bool, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_dot(&expr.expr);
+
         self.outer_attrs(&expr.attrs);
-        self.expr_beginning_of_line(&expr.expr, beginning_of_line);
+        self.expr_beginning_of_line(
+            &expr.expr,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
         self.word("?");
     }
 
-    fn subexpr_try(&mut self, expr: &ExprTry, beginning_of_line: bool) {
-        self.subexpr(&expr.expr, beginning_of_line);
+    fn prefix_subexpr_try(&mut self, expr: &ExprTry, beginning_of_line: bool, fixup: FixupContext) {
+        let (left_prec, left_fixup) = fixup.leftmost_subexpression_with_dot(&expr.expr);
+
+        self.prefix_subexpr(
+            &expr.expr,
+            left_prec < Precedence::Unambiguous,
+            beginning_of_line,
+            left_fixup,
+        );
         self.word("?");
     }
 
@@ -647,7 +879,7 @@
         self.cbox(INDENT);
         self.zerobreak();
         for elem in expr.elems.iter().delimited() {
-            self.expr(&elem);
+            self.expr(&elem, FixupContext::NONE);
             if expr.elems.len() == 1 {
                 self.word(",");
                 self.zerobreak();
@@ -660,10 +892,13 @@
         self.word(")");
     }
 
-    fn expr_unary(&mut self, expr: &ExprUnary) {
+    fn expr_unary(&mut self, expr: &ExprUnary, fixup: FixupContext) {
+        let (right_prec, right_fixup) =
+            fixup.rightmost_subexpression(&expr.expr, Precedence::Prefix);
+
         self.outer_attrs(&expr.attrs);
         self.unary_operator(&expr.op);
-        self.expr(&expr.expr);
+        self.subexpr(&expr.expr, right_prec < Precedence::Prefix, right_fixup);
     }
 
     fn expr_unsafe(&mut self, expr: &ExprUnsafe) {
@@ -675,14 +910,14 @@
     }
 
     #[cfg(not(feature = "verbatim"))]
-    fn expr_verbatim(&mut self, expr: &TokenStream) {
+    fn expr_verbatim(&mut self, expr: &TokenStream, _fixup: FixupContext) {
         if !expr.is_empty() {
             unimplemented!("Expr::Verbatim `{}`", expr);
         }
     }
 
     #[cfg(feature = "verbatim")]
-    fn expr_verbatim(&mut self, tokens: &TokenStream) {
+    fn expr_verbatim(&mut self, tokens: &TokenStream, fixup: FixupContext) {
         use syn::parse::discouraged::Speculative;
         use syn::parse::{Parse, ParseStream, Result};
         use syn::{parenthesized, Ident};
@@ -754,7 +989,10 @@
                 self.outer_attrs(&expr.attrs);
                 self.word("become");
                 self.nbsp();
-                self.expr(&expr.tail_call);
+                self.expr(
+                    &expr.tail_call,
+                    fixup.rightmost_subexpression_fixup(true, false, Precedence::Jump),
+                );
             }
             ExprVerbatim::Builtin(expr) => {
                 self.outer_attrs(&expr.attrs);
@@ -782,26 +1020,29 @@
             self.label(label);
         }
         self.word("while ");
-        self.wrap_exterior_struct(&expr.cond);
+        self.expr_condition(&expr.cond);
         self.word("{");
         self.neverbreak();
         self.cbox(INDENT);
         self.hardbreak_if_nonempty();
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
         self.offset(-INDENT);
         self.end();
         self.word("}");
     }
 
-    fn expr_yield(&mut self, expr: &ExprYield) {
+    fn expr_yield(&mut self, expr: &ExprYield, fixup: FixupContext) {
         self.outer_attrs(&expr.attrs);
         self.word("yield");
         if let Some(value) = &expr.expr {
             self.nbsp();
-            self.expr(value);
+            self.expr(
+                value,
+                fixup.rightmost_subexpression_fixup(true, false, Precedence::Jump),
+            );
         }
     }
 
@@ -816,7 +1057,7 @@
         if field_value.colon_token.is_some() {
             self.word(": ");
             self.ibox(0);
-            self.expr(&field_value.expr);
+            self.expr(&field_value.expr, FixupContext::NONE);
             self.end();
         }
     }
@@ -827,9 +1068,9 @@
         self.pat(&arm.pat);
         if let Some((_if_token, guard)) = &arm.guard {
             self.word(" if ");
-            self.expr(guard);
+            self.expr(guard, FixupContext::NONE);
         }
-        self.word(" =>");
+        self.word(" => ");
         let empty_block;
         let mut body = &*arm.body;
         while let Expr::Block(expr) = body {
@@ -856,7 +1097,6 @@
             }
         }
         if let Expr::Block(body) = body {
-            self.nbsp();
             if let Some(label) = &body.label {
                 self.label(label);
             }
@@ -865,45 +1105,44 @@
             self.cbox(INDENT);
             self.hardbreak_if_nonempty();
             self.inner_attrs(&body.attrs);
-            for stmt in &body.block.stmts {
-                self.stmt(stmt);
+            for stmt in body.block.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
             self.offset(-INDENT);
             self.end();
             self.word("}");
-            self.end();
         } else {
-            self.nbsp();
             self.neverbreak();
             self.cbox(INDENT);
+            let okay_to_brace = parseable_as_stmt(body);
             self.scan_break(BreakToken {
-                pre_break: Some('{'),
+                pre_break: Some(if okay_to_brace { '{' } else { '(' }),
                 ..BreakToken::default()
             });
-            self.expr_beginning_of_line(body, true);
+            self.expr_beginning_of_line(body, false, true, FixupContext::new_match_arm());
             self.scan_break(BreakToken {
                 offset: -INDENT,
-                pre_break: stmt::add_semi(body).then(|| ';'),
-                post_break: Some('}'),
-                no_break: requires_terminator(body).then(|| ','),
+                pre_break: (okay_to_brace && stmt::add_semi(body)).then_some(';'),
+                post_break: if okay_to_brace { "}" } else { ")," },
+                no_break: classify::requires_comma_to_be_match_arm(body).then_some(','),
                 ..BreakToken::default()
             });
             self.end();
-            self.end();
         }
+        self.end();
     }
 
     fn call_args(&mut self, args: &Punctuated<Expr, Token![,]>) {
         let mut iter = args.iter();
         match (iter.next(), iter.next()) {
             (Some(expr), None) if is_blocklike(expr) => {
-                self.expr(expr);
+                self.expr(expr, FixupContext::NONE);
             }
             _ => {
                 self.cbox(INDENT);
                 self.zerobreak();
                 for arg in args.iter().delimited() {
-                    self.expr(&arg);
+                    self.expr(&arg, FixupContext::NONE);
                     self.trailing_comma(arg.is_last);
                 }
                 self.offset(-INDENT);
@@ -920,13 +1159,13 @@
             match block.stmts.as_slice() {
                 [Stmt::Expr(expr, None)] if stmt::break_after(expr) => {
                     self.ibox(0);
-                    self.expr_beginning_of_line(expr, true);
+                    self.expr_beginning_of_line(expr, false, true, FixupContext::new_stmt());
                     self.end();
                     self.space();
                 }
                 _ => {
-                    for stmt in &block.stmts {
-                        self.stmt(stmt);
+                    for stmt in block.stmts.iter().delimited() {
+                        self.stmt(&stmt, stmt.is_last);
                     }
                 }
             }
@@ -935,6 +1174,17 @@
         self.word("}");
     }
 
+    pub fn expr_as_small_block(&mut self, expr: &Expr, indent: isize) {
+        self.word("{");
+        self.space();
+        self.ibox(indent);
+        self.expr_beginning_of_line(expr, false, true, FixupContext::new_stmt());
+        self.end();
+        self.space();
+        self.offset(-INDENT);
+        self.word("}");
+    }
+
     pub fn member(&mut self, member: &Member) {
         match member {
             Member::Named(ident) => self.ident(ident),
@@ -1001,123 +1251,6 @@
             PointerMutability::Mut(_) => self.word("mut"),
         }
     }
-
-    fn zerobreak_unless_short_ident(&mut self, beginning_of_line: bool, expr: &Expr) {
-        if beginning_of_line && is_short_ident(expr) {
-            return;
-        }
-        self.zerobreak();
-    }
-}
-
-fn requires_terminator(expr: &Expr) -> bool {
-    // see https://github.com/rust-lang/rust/blob/a266f1199/compiler/rustc_ast/src/util/classify.rs#L7-L26
-    match expr {
-        #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
-        Expr::If(_)
-        | Expr::Match(_)
-        | Expr::Block(_) | Expr::Unsafe(_) // both under ExprKind::Block in rustc
-        | Expr::While(_)
-        | Expr::Loop(_)
-        | Expr::ForLoop(_)
-        | Expr::TryBlock(_)
-        | Expr::Const(_) => false,
-
-        Expr::Array(_)
-        | Expr::Assign(_)
-        | Expr::Async(_)
-        | Expr::Await(_)
-        | Expr::Binary(_)
-        | Expr::Break(_)
-        | Expr::Call(_)
-        | Expr::Cast(_)
-        | Expr::Closure(_)
-        | Expr::Continue(_)
-        | Expr::Field(_)
-        | Expr::Group(_)
-        | Expr::Index(_)
-        | Expr::Infer(_)
-        | Expr::Let(_)
-        | Expr::Lit(_)
-        | Expr::Macro(_)
-        | Expr::MethodCall(_)
-        | Expr::Paren(_)
-        | Expr::Path(_)
-        | Expr::Range(_)
-        | Expr::RawAddr(_)
-        | Expr::Reference(_)
-        | Expr::Repeat(_)
-        | Expr::Return(_)
-        | Expr::Struct(_)
-        | Expr::Try(_)
-        | Expr::Tuple(_)
-        | Expr::Unary(_)
-        | Expr::Verbatim(_)
-        | Expr::Yield(_) => true,
-
-        _ => true,
-    }
-}
-
-// Expressions that syntactically contain an "exterior" struct literal i.e. not
-// surrounded by any parens or other delimiters. For example `X { y: 1 }`, `X {
-// y: 1 }.method()`, `foo == X { y: 1 }` and `X { y: 1 } == foo` all do, but `(X
-// { y: 1 }) == foo` does not.
-fn contains_exterior_struct_lit(expr: &Expr) -> bool {
-    match expr {
-        #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
-        Expr::Struct(_) => true,
-
-        Expr::Assign(ExprAssign { left, right, .. })
-        | Expr::Binary(ExprBinary { left, right, .. }) => {
-            // X { y: 1 } + X { y: 2 }
-            contains_exterior_struct_lit(left) || contains_exterior_struct_lit(right)
-        }
-
-        Expr::Await(ExprAwait { base: e, .. })
-        | Expr::Cast(ExprCast { expr: e, .. })
-        | Expr::Field(ExprField { base: e, .. })
-        | Expr::Group(ExprGroup { expr: e, .. })
-        | Expr::Index(ExprIndex { expr: e, .. })
-        | Expr::MethodCall(ExprMethodCall { receiver: e, .. })
-        | Expr::RawAddr(ExprRawAddr { expr: e, .. })
-        | Expr::Reference(ExprReference { expr: e, .. })
-        | Expr::Unary(ExprUnary { expr: e, .. }) => {
-            // &X { y: 1 }, X { y: 1 }.y
-            contains_exterior_struct_lit(e)
-        }
-
-        Expr::Array(_)
-        | Expr::Async(_)
-        | Expr::Block(_)
-        | Expr::Break(_)
-        | Expr::Call(_)
-        | Expr::Closure(_)
-        | Expr::Const(_)
-        | Expr::Continue(_)
-        | Expr::ForLoop(_)
-        | Expr::If(_)
-        | Expr::Infer(_)
-        | Expr::Let(_)
-        | Expr::Lit(_)
-        | Expr::Loop(_)
-        | Expr::Macro(_)
-        | Expr::Match(_)
-        | Expr::Paren(_)
-        | Expr::Path(_)
-        | Expr::Range(_)
-        | Expr::Repeat(_)
-        | Expr::Return(_)
-        | Expr::Try(_)
-        | Expr::TryBlock(_)
-        | Expr::Tuple(_)
-        | Expr::Unsafe(_)
-        | Expr::Verbatim(_)
-        | Expr::While(_)
-        | Expr::Yield(_) => false,
-
-        _ => false,
-    }
 }
 
 fn needs_newline_if_wrap(expr: &Expr) -> bool {
@@ -1208,7 +1341,6 @@
         | Expr::Continue(_)
         | Expr::Field(_)
         | Expr::ForLoop(_)
-        | Expr::Group(_)
         | Expr::If(_)
         | Expr::Index(_)
         | Expr::Infer(_)
@@ -1231,62 +1363,106 @@
         | Expr::While(_)
         | Expr::Yield(_) => false,
 
+        Expr::Group(e) => is_blocklike(&e.expr),
+
         _ => false,
     }
 }
 
+pub fn simple_block(expr: &Expr) -> Option<&ExprBlock> {
+    if let Expr::Block(expr) = expr {
+        if expr.attrs.is_empty() && expr.label.is_none() {
+            return Some(expr);
+        }
+    }
+    None
+}
+
 // Expressions for which `$expr` and `{ $expr }` mean the same thing.
 //
 // This is not the case for all expressions. For example `{} | x | x` has some
 // bitwise OR operators while `{ {} |x| x }` has a block followed by a closure.
-fn parseable_as_stmt(expr: &Expr) -> bool {
-    match expr {
-        #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
-        Expr::Array(_)
-        | Expr::Async(_)
-        | Expr::Block(_)
-        | Expr::Break(_)
-        | Expr::Closure(_)
-        | Expr::Const(_)
-        | Expr::Continue(_)
-        | Expr::ForLoop(_)
-        | Expr::If(_)
-        | Expr::Infer(_)
-        | Expr::Let(_)
-        | Expr::Lit(_)
-        | Expr::Loop(_)
-        | Expr::Macro(_)
-        | Expr::Match(_)
-        | Expr::Paren(_)
-        | Expr::Path(_)
-        | Expr::RawAddr(_)
-        | Expr::Reference(_)
-        | Expr::Repeat(_)
-        | Expr::Return(_)
-        | Expr::Struct(_)
-        | Expr::TryBlock(_)
-        | Expr::Tuple(_)
-        | Expr::Unary(_)
-        | Expr::Unsafe(_)
-        | Expr::Verbatim(_)
-        | Expr::While(_)
-        | Expr::Yield(_) => true,
+fn parseable_as_stmt(mut expr: &Expr) -> bool {
+    loop {
+        match expr {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Expr::Array(_)
+            | Expr::Async(_)
+            | Expr::Block(_)
+            | Expr::Break(_)
+            | Expr::Closure(_)
+            | Expr::Const(_)
+            | Expr::Continue(_)
+            | Expr::ForLoop(_)
+            | Expr::If(_)
+            | Expr::Infer(_)
+            | Expr::Lit(_)
+            | Expr::Loop(_)
+            | Expr::Macro(_)
+            | Expr::Match(_)
+            | Expr::Paren(_)
+            | Expr::Path(_)
+            | Expr::RawAddr(_)
+            | Expr::Reference(_)
+            | Expr::Repeat(_)
+            | Expr::Return(_)
+            | Expr::Struct(_)
+            | Expr::TryBlock(_)
+            | Expr::Tuple(_)
+            | Expr::Unary(_)
+            | Expr::Unsafe(_)
+            | Expr::Verbatim(_)
+            | Expr::While(_)
+            | Expr::Yield(_) => return true,
 
-        Expr::Assign(expr) => parseable_as_stmt(&expr.left),
-        Expr::Await(expr) => parseable_as_stmt(&expr.base),
-        Expr::Binary(expr) => requires_terminator(&expr.left) && parseable_as_stmt(&expr.left),
-        Expr::Call(expr) => requires_terminator(&expr.func) && parseable_as_stmt(&expr.func),
-        Expr::Cast(expr) => requires_terminator(&expr.expr) && parseable_as_stmt(&expr.expr),
-        Expr::Field(expr) => parseable_as_stmt(&expr.base),
-        Expr::Group(expr) => parseable_as_stmt(&expr.expr),
-        Expr::Index(expr) => requires_terminator(&expr.expr) && parseable_as_stmt(&expr.expr),
-        Expr::MethodCall(expr) => parseable_as_stmt(&expr.receiver),
-        Expr::Range(expr) => match &expr.start {
-            None => true,
-            Some(start) => requires_terminator(start) && parseable_as_stmt(start),
-        },
-        Expr::Try(expr) => parseable_as_stmt(&expr.expr),
+            Expr::Let(_) => return false,
 
-        _ => false,
+            Expr::Assign(e) => {
+                if !classify::requires_semi_to_be_stmt(&e.left) {
+                    return false;
+                }
+                expr = &e.left;
+            }
+            Expr::Await(e) => expr = &e.base,
+            Expr::Binary(e) => {
+                if !classify::requires_semi_to_be_stmt(&e.left) {
+                    return false;
+                }
+                expr = &e.left;
+            }
+            Expr::Call(e) => {
+                if !classify::requires_semi_to_be_stmt(&e.func) {
+                    return false;
+                }
+                expr = &e.func;
+            }
+            Expr::Cast(e) => {
+                if !classify::requires_semi_to_be_stmt(&e.expr) {
+                    return false;
+                }
+                expr = &e.expr;
+            }
+            Expr::Field(e) => expr = &e.base,
+            Expr::Group(e) => expr = &e.expr,
+            Expr::Index(e) => {
+                if !classify::requires_semi_to_be_stmt(&e.expr) {
+                    return false;
+                }
+                expr = &e.expr;
+            }
+            Expr::MethodCall(e) => expr = &e.receiver,
+            Expr::Range(e) => match &e.start {
+                None => return true,
+                Some(start) => {
+                    if !classify::requires_semi_to_be_stmt(start) {
+                        return false;
+                    }
+                    expr = start;
+                }
+            },
+            Expr::Try(e) => expr = &e.expr,
+
+            _ => return false,
+        }
     }
 }

crates/prettyplease/src/fixup.rs

diff --git a/crates/prettyplease/src/fixup.rs b/crates/prettyplease/src/fixup.rs
new file mode 100644
index 0000000..55d3623
--- /dev/null
+++ b/crates/prettyplease/src/fixup.rs
@@ -0,0 +1,673 @@
+use crate::classify;
+use crate::precedence::Precedence;
+use syn::{
+    Expr, ExprBreak, ExprRange, ExprRawAddr, ExprReference, ExprReturn, ExprUnary, ExprYield,
+};
+
+#[derive(Copy, Clone)]
+pub struct FixupContext {
+    previous_operator: Precedence,
+    next_operator: Precedence,
+
+    // Print expression such that it can be parsed back as a statement
+    // consisting of the original expression.
+    //
+    // The effect of this is for binary operators in statement position to set
+    // `leftmost_subexpression_in_stmt` when printing their left-hand operand.
+    //
+    //     (match x {}) - 1;  // match needs parens when LHS of binary operator
+    //
+    //     match x {};  // not when its own statement
+    //
+    stmt: bool,
+
+    // This is the difference between:
+    //
+    //     (match x {}) - 1;  // subexpression needs parens
+    //
+    //     let _ = match x {} - 1;  // no parens
+    //
+    // There are 3 distinguishable contexts in which `print_expr` might be
+    // called with the expression `$match` as its argument, where `$match`
+    // represents an expression of kind `ExprKind::Match`:
+    //
+    //   - stmt=false leftmost_subexpression_in_stmt=false
+    //
+    //     Example: `let _ = $match - 1;`
+    //
+    //     No parentheses required.
+    //
+    //   - stmt=false leftmost_subexpression_in_stmt=true
+    //
+    //     Example: `$match - 1;`
+    //
+    //     Must parenthesize `($match)`, otherwise parsing back the output as a
+    //     statement would terminate the statement after the closing brace of
+    //     the match, parsing `-1;` as a separate statement.
+    //
+    //   - stmt=true leftmost_subexpression_in_stmt=false
+    //
+    //     Example: `$match;`
+    //
+    //     No parentheses required.
+    leftmost_subexpression_in_stmt: bool,
+
+    // Print expression such that it can be parsed as a match arm.
+    //
+    // This is almost equivalent to `stmt`, but the grammar diverges a tiny bit
+    // between statements and match arms when it comes to braced macro calls.
+    // Macro calls with brace delimiter terminate a statement without a
+    // semicolon, but do not terminate a match-arm without comma.
+    //
+    //     m! {} - 1;  // two statements: a macro call followed by -1 literal
+    //
+    //     match () {
+    //         _ => m! {} - 1,  // binary subtraction operator
+    //     }
+    //
+    match_arm: bool,
+
+    // This is almost equivalent to `leftmost_subexpression_in_stmt`, other than
+    // for braced macro calls.
+    //
+    // If we have `m! {} - 1` as an expression, the leftmost subexpression
+    // `m! {}` will need to be parenthesized in the statement case but not the
+    // match-arm case.
+    //
+    //     (m! {}) - 1;  // subexpression needs parens
+    //
+    //     match () {
+    //         _ => m! {} - 1,  // no parens
+    //     }
+    //
+    leftmost_subexpression_in_match_arm: bool,
+
+    // This is the difference between:
+    //
+    //     if let _ = (Struct {}) {}  // needs parens
+    //
+    //     match () {
+    //         () if let _ = Struct {} => {}  // no parens
+    //     }
+    //
+    condition: bool,
+
+    // This is the difference between:
+    //
+    //     if break Struct {} == (break) {}  // needs parens
+    //
+    //     if break break == Struct {} {}  // no parens
+    //
+    rightmost_subexpression_in_condition: bool,
+
+    // This is the difference between:
+    //
+    //     if break ({ x }).field + 1 {}  needs parens
+    //
+    //     if break 1 + { x }.field {}  // no parens
+    //
+    leftmost_subexpression_in_optional_operand: bool,
+
+    // This is the difference between:
+    //
+    //     let _ = (return) - 1;  // without paren, this would return -1
+    //
+    //     let _ = return + 1;  // no paren because '+' cannot begin expr
+    //
+    next_operator_can_begin_expr: bool,
+
+    // This is the difference between:
+    //
+    //     let _ = 1 + return 1;  // no parens if rightmost subexpression
+    //
+    //     let _ = 1 + (return 1) + 1;  // needs parens
+    //
+    next_operator_can_continue_expr: bool,
+
+    // This is the difference between:
+    //
+    //     let _ = x as u8 + T;
+    //
+    //     let _ = (x as u8) < T;
+    //
+    // Without parens, the latter would want to parse `u8<T...` as a type.
+    next_operator_can_begin_generics: bool,
+}
+
+impl FixupContext {
+    /// The default amount of fixing is minimal fixing. Fixups should be turned
+    /// on in a targeted fashion where needed.
+    pub const NONE: Self = FixupContext {
+        previous_operator: Precedence::MIN,
+        next_operator: Precedence::MIN,
+        stmt: false,
+        leftmost_subexpression_in_stmt: false,
+        match_arm: false,
+        leftmost_subexpression_in_match_arm: false,
+        condition: false,
+        rightmost_subexpression_in_condition: false,
+        leftmost_subexpression_in_optional_operand: false,
+        next_operator_can_begin_expr: false,
+        next_operator_can_continue_expr: false,
+        next_operator_can_begin_generics: false,
+    };
+
+    /// Create the initial fixup for printing an expression in statement
+    /// position.
+    pub fn new_stmt() -> Self {
+        FixupContext {
+            stmt: true,
+            ..FixupContext::NONE
+        }
+    }
+
+    /// Create the initial fixup for printing an expression as the right-hand
+    /// side of a match arm.
+    pub fn new_match_arm() -> Self {
+        FixupContext {
+            match_arm: true,
+            ..FixupContext::NONE
+        }
+    }
+
+    /// Create the initial fixup for printing an expression as the "condition"
+    /// of an `if` or `while`. There are a few other positions which are
+    /// grammatically equivalent and also use this, such as the iterator
+    /// expression in `for` and the scrutinee in `match`.
+    pub fn new_condition() -> Self {
+        FixupContext {
+            condition: true,
+            rightmost_subexpression_in_condition: true,
+            ..FixupContext::NONE
+        }
+    }
+
+    /// Transform this fixup into the one that should apply when printing the
+    /// leftmost subexpression of the current expression.
+    ///
+    /// The leftmost subexpression is any subexpression that has the same first
+    /// token as the current expression, but has a different last token.
+    ///
+    /// For example in `$a + $b` and `$a.method()`, the subexpression `$a` is a
+    /// leftmost subexpression.
+    ///
+    /// Not every expression has a leftmost subexpression. For example neither
+    /// `-$a` nor `[$a]` have one.
+    pub fn leftmost_subexpression_with_operator(
+        self,
+        expr: &Expr,
+        next_operator_can_begin_expr: bool,
+        next_operator_can_begin_generics: bool,
+        precedence: Precedence,
+    ) -> (Precedence, Self) {
+        let fixup = FixupContext {
+            next_operator: precedence,
+            stmt: false,
+            leftmost_subexpression_in_stmt: self.stmt || self.leftmost_subexpression_in_stmt,
+            match_arm: false,
+            leftmost_subexpression_in_match_arm: self.match_arm
+                || self.leftmost_subexpression_in_match_arm,
+            rightmost_subexpression_in_condition: false,
+            next_operator_can_begin_expr,
+            next_operator_can_continue_expr: true,
+            next_operator_can_begin_generics,
+            ..self
+        };
+
+        (fixup.leftmost_subexpression_precedence(expr), fixup)
+    }
+
+    /// Transform this fixup into the one that should apply when printing a
+    /// leftmost subexpression followed by a `.` or `?` token, which confer
+    /// different statement boundary rules compared to other leftmost
+    /// subexpressions.
+    pub fn leftmost_subexpression_with_dot(self, expr: &Expr) -> (Precedence, Self) {
+        let fixup = FixupContext {
+            next_operator: Precedence::Unambiguous,
+            stmt: self.stmt || self.leftmost_subexpression_in_stmt,
+            leftmost_subexpression_in_stmt: false,
+            match_arm: self.match_arm || self.leftmost_subexpression_in_match_arm,
+            leftmost_subexpression_in_match_arm: false,
+            rightmost_subexpression_in_condition: false,
+            next_operator_can_begin_expr: false,
+            next_operator_can_continue_expr: true,
+            next_operator_can_begin_generics: false,
+            ..self
+        };
+
+        (fixup.leftmost_subexpression_precedence(expr), fixup)
+    }
+
+    fn leftmost_subexpression_precedence(self, expr: &Expr) -> Precedence {
+        if !self.next_operator_can_begin_expr || self.next_operator == Precedence::Range {
+            if let Scan::Bailout = scan_right(expr, self, Precedence::MIN, 0, 0) {
+                if scan_left(expr, self) {
+                    return Precedence::Unambiguous;
+                }
+            }
+        }
+
+        self.precedence(expr)
+    }
+
+    /// Transform this fixup into the one that should apply when printing the
+    /// rightmost subexpression of the current expression.
+    ///
+    /// The rightmost subexpression is any subexpression that has a different
+    /// first token than the current expression, but has the same last token.
+    ///
+    /// For example in `$a + $b` and `-$b`, the subexpression `$b` is a
+    /// rightmost subexpression.
+    ///
+    /// Not every expression has a rightmost subexpression. For example neither
+    /// `[$b]` nor `$a.f($b)` have one.
+    pub fn rightmost_subexpression(
+        self,
+        expr: &Expr,
+        precedence: Precedence,
+    ) -> (Precedence, Self) {
+        let fixup = self.rightmost_subexpression_fixup(false, false, precedence);
+        (fixup.rightmost_subexpression_precedence(expr), fixup)
+    }
+
+    pub fn rightmost_subexpression_fixup(
+        self,
+        reset_allow_struct: bool,
+        optional_operand: bool,
+        precedence: Precedence,
+    ) -> Self {
+        FixupContext {
+            previous_operator: precedence,
+            stmt: false,
+            leftmost_subexpression_in_stmt: false,
+            match_arm: false,
+            leftmost_subexpression_in_match_arm: false,
+            condition: self.condition && !reset_allow_struct,
+            leftmost_subexpression_in_optional_operand: self.condition && optional_operand,
+            ..self
+        }
+    }
+
+    pub fn rightmost_subexpression_precedence(self, expr: &Expr) -> Precedence {
+        let default_prec = self.precedence(expr);
+
+        if match self.previous_operator {
+            Precedence::Assign | Precedence::Let | Precedence::Prefix => {
+                default_prec < self.previous_operator
+            }
+            _ => default_prec <= self.previous_operator,
+        } && match self.next_operator {
+            Precedence::Range | Precedence::Or | Precedence::And => true,
+            _ => !self.next_operator_can_begin_expr,
+        } {
+            if let Scan::Bailout | Scan::Fail = scan_right(expr, self, self.previous_operator, 1, 0)
+            {
+                if scan_left(expr, self) {
+                    return Precedence::Prefix;
+                }
+            }
+        }
+
+        default_prec
+    }
+
+    /// Determine whether parentheses are needed around the given expression to
+    /// head off the early termination of a statement or condition.
+    pub fn parenthesize(self, expr: &Expr) -> bool {
+        (self.leftmost_subexpression_in_stmt && !classify::requires_semi_to_be_stmt(expr))
+            || ((self.stmt || self.leftmost_subexpression_in_stmt) && matches!(expr, Expr::Let(_)))
+            || (self.leftmost_subexpression_in_match_arm
+                && !classify::requires_comma_to_be_match_arm(expr))
+            || (self.condition && matches!(expr, Expr::Struct(_)))
+            || (self.rightmost_subexpression_in_condition
+                && matches!(
+                    expr,
+                    Expr::Return(ExprReturn { expr: None, .. })
+                        | Expr::Yield(ExprYield { expr: None, .. })
+                ))
+            || (self.rightmost_subexpression_in_condition
+                && !self.condition
+                && matches!(
+                    expr,
+                    Expr::Break(ExprBreak { expr: None, .. })
+                        | Expr::Path(_)
+                        | Expr::Range(ExprRange { end: None, .. })
+                ))
+            || (self.leftmost_subexpression_in_optional_operand
+                && matches!(expr, Expr::Block(expr) if expr.attrs.is_empty() && expr.label.is_none()))
+    }
+
+    /// Determines the effective precedence of a subexpression. Some expressions
+    /// have higher or lower precedence when adjacent to particular operators.
+    fn precedence(self, expr: &Expr) -> Precedence {
+        if self.next_operator_can_begin_expr {
+            // Decrease precedence of value-less jumps when followed by an
+            // operator that would otherwise get interpreted as beginning a
+            // value for the jump.
+            if let Expr::Break(ExprBreak { expr: None, .. })
+            | Expr::Return(ExprReturn { expr: None, .. })
+            | Expr::Yield(ExprYield { expr: None, .. }) = expr
+            {
+                return Precedence::Jump;
+            }
+        }
+
+        if !self.next_operator_can_continue_expr {
+            match expr {
+                // Increase precedence of expressions that extend to the end of
+                // current statement or group.
+                Expr::Break(_)
+                | Expr::Closure(_)
+                | Expr::Let(_)
+                | Expr::Return(_)
+                | Expr::Yield(_) => {
+                    return Precedence::Prefix;
+                }
+                Expr::Range(e) if e.start.is_none() => return Precedence::Prefix,
+                _ => {}
+            }
+        }
+
+        if self.next_operator_can_begin_generics {
+            if let Expr::Cast(cast) = expr {
+                if classify::trailing_unparameterized_path(&cast.ty) {
+                    return Precedence::MIN;
+                }
+            }
+        }
+
+        Precedence::of(expr)
+    }
+}
+
+#[derive(Copy, Clone, PartialEq)]
+enum Scan {
+    Fail,
+    Bailout,
+    Consume,
+}
+
+fn scan_left(expr: &Expr, fixup: FixupContext) -> bool {
+    match expr {
+        Expr::Assign(_) => fixup.previous_operator <= Precedence::Assign,
+        Expr::Binary(e) => match Precedence::of_binop(&e.op) {
+            Precedence::Assign => fixup.previous_operator <= Precedence::Assign,
+            binop_prec => fixup.previous_operator < binop_prec,
+        },
+        Expr::Cast(_) => fixup.previous_operator < Precedence::Cast,
+        Expr::Range(e) => e.start.is_none() || fixup.previous_operator < Precedence::Assign,
+        _ => true,
+    }
+}
+
+fn scan_right(
+    expr: &Expr,
+    fixup: FixupContext,
+    precedence: Precedence,
+    fail_offset: u8,
+    bailout_offset: u8,
+) -> Scan {
+    let consume_by_precedence = if match precedence {
+        Precedence::Assign | Precedence::Compare => precedence <= fixup.next_operator,
+        _ => precedence < fixup.next_operator,
+    } || fixup.next_operator == Precedence::MIN
+    {
+        Scan::Consume
+    } else {
+        Scan::Bailout
+    };
+    if fixup.parenthesize(expr) {
+        return consume_by_precedence;
+    }
+    match expr {
+        #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+        Expr::Assign(e) => {
+            if match fixup.next_operator {
+                Precedence::Unambiguous => fail_offset >= 2,
+                _ => bailout_offset >= 1,
+            } {
+                return Scan::Consume;
+            }
+            let right_fixup = fixup.rightmost_subexpression_fixup(false, false, Precedence::Assign);
+            let scan = scan_right(
+                &e.right,
+                right_fixup,
+                Precedence::Assign,
+                match fixup.next_operator {
+                    Precedence::Unambiguous => fail_offset,
+                    _ => 1,
+                },
+                1,
+            );
+            if let Scan::Bailout | Scan::Consume = scan {
+                Scan::Consume
+            } else if let Precedence::Unambiguous = fixup.next_operator {
+                Scan::Fail
+            } else {
+                Scan::Bailout
+            }
+        }
+        Expr::Binary(e) => {
+            if match fixup.next_operator {
+                Precedence::Unambiguous => {
+                    fail_offset >= 2
+                        && (consume_by_precedence == Scan::Consume || bailout_offset >= 1)
+                }
+                _ => bailout_offset >= 1,
+            } {
+                return Scan::Consume;
+            }
+            let binop_prec = Precedence::of_binop(&e.op);
+            if binop_prec == Precedence::Compare && fixup.next_operator == Precedence::Compare {
+                return Scan::Consume;
+            }
+            let right_fixup = fixup.rightmost_subexpression_fixup(false, false, binop_prec);
+            let scan = scan_right(
+                &e.right,
+                right_fixup,
+                binop_prec,
+                match fixup.next_operator {
+                    Precedence::Unambiguous => fail_offset,
+                    _ => 1,
+                },
+                consume_by_precedence as u8 - Scan::Bailout as u8,
+            );
+            match scan {
+                Scan::Fail => {}
+                Scan::Bailout => return consume_by_precedence,
+                Scan::Consume => return Scan::Consume,
+            }
+            let right_needs_group = binop_prec != Precedence::Assign
+                && right_fixup.rightmost_subexpression_precedence(&e.right) <= binop_prec;
+            if right_needs_group {
+                consume_by_precedence
+            } else if let (Scan::Fail, Precedence::Unambiguous) = (scan, fixup.next_operator) {
+                Scan::Fail
+            } else {
+                Scan::Bailout
+            }
+        }
+        Expr::RawAddr(ExprRawAddr { expr, .. })
+        | Expr::Reference(ExprReference { expr, .. })
+        | Expr::Unary(ExprUnary { expr, .. }) => {
+            if match fixup.next_operator {
+                Precedence::Unambiguous => {
+                    fail_offset >= 2
+                        && (consume_by_precedence == Scan::Consume || bailout_offset >= 1)
+                }
+                _ => bailout_offset >= 1,
+            } {
+                return Scan::Consume;
+            }
+            let right_fixup = fixup.rightmost_subexpression_fixup(false, false, Precedence::Prefix);
+            let scan = scan_right(
+                expr,
+                right_fixup,
+                precedence,
+                match fixup.next_operator {
+                    Precedence::Unambiguous => fail_offset,
+                    _ => 1,
+                },
+                consume_by_precedence as u8 - Scan::Bailout as u8,
+            );
+            match scan {
+                Scan::Fail => {}
+                Scan::Bailout => return consume_by_precedence,
+                Scan::Consume => return Scan::Consume,
+            }
+            if right_fixup.rightmost_subexpression_precedence(expr) < Precedence::Prefix {
+                consume_by_precedence
+            } else if let (Scan::Fail, Precedence::Unambiguous) = (scan, fixup.next_operator) {
+                Scan::Fail
+            } else {
+                Scan::Bailout
+            }
+        }
+        Expr::Range(e) => match &e.end {
+            Some(end) => {
+                if fail_offset >= 2 {
+                    return Scan::Consume;
+                }
+                let right_fixup =
+                    fixup.rightmost_subexpression_fixup(false, true, Precedence::Range);
+                let scan = scan_right(
+                    end,
+                    right_fixup,
+                    Precedence::Range,
+                    fail_offset,
+                    match fixup.next_operator {
+                        Precedence::Assign | Precedence::Range => 0,
+                        _ => 1,
+                    },
+                );
+                if match (scan, fixup.next_operator) {
+                    (Scan::Fail, _) => false,
+                    (Scan::Bailout, Precedence::Assign | Precedence::Range) => false,
+                    (Scan::Bailout | Scan::Consume, _) => true,
+                } {
+                    return Scan::Consume;
+                }
+                if right_fixup.rightmost_subexpression_precedence(end) <= Precedence::Range {
+                    Scan::Consume
+                } else {
+                    Scan::Fail
+                }
+            }
+            None => {
+                if fixup.next_operator_can_begin_expr {
+                    Scan::Consume
+                } else {
+                    Scan::Fail
+                }
+            }
+        },
+        Expr::Break(e) => match &e.expr {
+            Some(value) => {
+                if bailout_offset >= 1 || e.label.is_none() && classify::expr_leading_label(value) {
+                    return Scan::Consume;
+                }
+                let right_fixup = fixup.rightmost_subexpression_fixup(true, true, Precedence::Jump);
+                match scan_right(value, right_fixup, Precedence::Jump, 1, 1) {
+                    Scan::Fail => Scan::Bailout,
+                    Scan::Bailout | Scan::Consume => Scan::Consume,
+                }
+            }
+            None => match fixup.next_operator {
+                Precedence::Assign if precedence > Precedence::Assign => Scan::Fail,
+                _ => Scan::Consume,
+            },
+        },
+        Expr::Return(ExprReturn { expr, .. }) | Expr::Yield(ExprYield { expr, .. }) => match expr {
+            Some(e) => {
+                if bailout_offset >= 1 {
+                    return Scan::Consume;
+                }
+                let right_fixup =
+                    fixup.rightmost_subexpression_fixup(true, false, Precedence::Jump);
+                match scan_right(e, right_fixup, Precedence::Jump, 1, 1) {
+                    Scan::Fail => Scan::Bailout,
+                    Scan::Bailout | Scan::Consume => Scan::Consume,
+                }
+            }
+            None => match fixup.next_operator {
+                Precedence::Assign if precedence > Precedence::Assign => Scan::Fail,
+                _ => Scan::Consume,
+            },
+        },
+        Expr::Closure(_) => Scan::Consume,
+        Expr::Let(e) => {
+            if bailout_offset >= 1 {
+                return Scan::Consume;
+            }
+            let right_fixup = fixup.rightmost_subexpression_fixup(false, false, Precedence::Let);
+            let scan = scan_right(
+                &e.expr,
+                right_fixup,
+                Precedence::Let,
+                1,
+                if fixup.next_operator < Precedence::Let {
+                    0
+                } else {
+                    1
+                },
+            );
+            match scan {
+                Scan::Fail | Scan::Bailout if fixup.next_operator < Precedence::Let => {
+                    return Scan::Bailout;
+                }
+                Scan::Consume => return Scan::Consume,
+                _ => {}
+            }
+            if right_fixup.rightmost_subexpression_precedence(&e.expr) < Precedence::Let {
+                Scan::Consume
+            } else if let Scan::Fail = scan {
+                Scan::Bailout
+            } else {
+                Scan::Consume
+            }
+        }
+        Expr::Group(e) => scan_right(&e.expr, fixup, precedence, fail_offset, bailout_offset),
+        Expr::Array(_)
+        | Expr::Async(_)
+        | Expr::Await(_)
+        | Expr::Block(_)
+        | Expr::Call(_)
+        | Expr::Cast(_)
+        | Expr::Const(_)
+        | Expr::Continue(_)
+        | Expr::Field(_)
+        | Expr::ForLoop(_)
+        | Expr::If(_)
+        | Expr::Index(_)
+        | Expr::Infer(_)
+        | Expr::Lit(_)
+        | Expr::Loop(_)
+        | Expr::Macro(_)
+        | Expr::Match(_)
+        | Expr::MethodCall(_)
+        | Expr::Paren(_)
+        | Expr::Path(_)
+        | Expr::Repeat(_)
+        | Expr::Struct(_)
+        | Expr::Try(_)
+        | Expr::TryBlock(_)
+        | Expr::Tuple(_)
+        | Expr::Unsafe(_)
+        | Expr::Verbatim(_)
+        | Expr::While(_) => match fixup.next_operator {
+            Precedence::Assign | Precedence::Range if precedence == Precedence::Range => Scan::Fail,
+            _ if precedence == Precedence::Let && fixup.next_operator < Precedence::Let => {
+                Scan::Fail
+            }
+            _ => consume_by_precedence,
+        },
+
+        _ => match fixup.next_operator {
+            Precedence::Assign | Precedence::Range if precedence == Precedence::Range => Scan::Fail,
+            _ if precedence == Precedence::Let && fixup.next_operator < Precedence::Let => {
+                Scan::Fail
+            }
+            _ => consume_by_precedence,
+        },
+    }
+}

crates/prettyplease/src/generics.rs

diff --git a/crates/prettyplease/src/generics.rs b/crates/prettyplease/src/generics.rs
index 6145345..3f225b8 100644
--- a/crates/prettyplease/src/generics.rs
+++ b/crates/prettyplease/src/generics.rs
@@ -5,7 +5,7 @@
 use proc_macro2::TokenStream;
 use std::ptr;
 use syn::{
-    BoundLifetimes, CapturedParam, ConstParam, GenericParam, Generics, LifetimeParam,
+    BoundLifetimes, CapturedParam, ConstParam, Expr, GenericParam, Generics, LifetimeParam,
     PreciseCapture, PredicateLifetime, PredicateType, TraitBound, TraitBoundModifier, TypeParam,
     TypeParamBound, WhereClause, WherePredicate,
 };
@@ -209,7 +209,7 @@
         self.ty(&const_param.ty);
         if let Some(default) = &const_param.default {
             self.word(" = ");
-            self.expr(default);
+            self.const_argument(default);
         }
     }
 
@@ -357,4 +357,27 @@
             _ => unimplemented!("unknown CapturedParam"),
         }
     }
+
+    pub fn const_argument(&mut self, expr: &Expr) {
+        match expr {
+            #![cfg_attr(all(test, exhaustive), allow(non_exhaustive_omitted_patterns))]
+            Expr::Lit(expr) => self.expr_lit(expr),
+
+            Expr::Path(expr)
+                if expr.attrs.is_empty()
+                    && expr.qself.is_none()
+                    && expr.path.get_ident().is_some() =>
+            {
+                self.expr_path(expr);
+            }
+
+            Expr::Block(expr) => self.expr_block(expr),
+
+            _ => {
+                self.cbox(INDENT);
+                self.expr_as_small_block(expr, 0);
+                self.end();
+            }
+        }
+    }
 }

crates/prettyplease/src/item.rs

diff --git a/crates/prettyplease/src/item.rs b/crates/prettyplease/src/item.rs
index 8254429..4e9d95d 100644
--- a/crates/prettyplease/src/item.rs
+++ b/crates/prettyplease/src/item.rs
@@ -1,5 +1,7 @@
 use crate::algorithm::Printer;
+use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
+use crate::mac;
 use crate::path::PathKind;
 use crate::INDENT;
 use proc_macro2::TokenStream;
@@ -47,7 +49,7 @@
         self.ty(&item.ty);
         self.word(" = ");
         self.neverbreak();
-        self.expr(&item.expr);
+        self.expr(&item.expr, FixupContext::NONE);
         self.word(";");
         self.end();
         self.hardbreak();
@@ -100,8 +102,8 @@
         self.word("{");
         self.hardbreak_if_nonempty();
         self.inner_attrs(&item.attrs);
-        for stmt in &item.block.stmts {
-            self.stmt(stmt);
+        for stmt in item.block.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
         self.offset(-INDENT);
         self.end();
@@ -168,7 +170,7 @@
 
     fn item_macro(&mut self, item: &ItemMacro) {
         self.outer_attrs(&item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&item.mac.delimiter);
         self.mac(&item.mac, item.ident.as_ref(), semicolon);
         self.hardbreak();
     }
@@ -210,7 +212,7 @@
         self.ty(&item.ty);
         self.word(" = ");
         self.neverbreak();
-        self.expr(&item.expr);
+        self.expr(&item.expr, FixupContext::NONE);
         self.word(";");
         self.end();
         self.hardbreak();
@@ -836,7 +838,7 @@
 
     fn foreign_item_macro(&mut self, foreign_item: &ForeignItemMacro) {
         self.outer_attrs(&foreign_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&foreign_item.mac.delimiter);
         self.mac(&foreign_item.mac, None, semicolon);
         self.hardbreak();
     }
@@ -961,7 +963,7 @@
         if let Some((_eq_token, default)) = &trait_item.default {
             self.word(" = ");
             self.neverbreak();
-            self.expr(default);
+            self.expr(default, FixupContext::NONE);
         }
         self.word(";");
         self.end();
@@ -981,8 +983,8 @@
             self.word("{");
             self.hardbreak_if_nonempty();
             self.inner_attrs(&trait_item.attrs);
-            for stmt in &block.stmts {
-                self.stmt(stmt);
+            for stmt in block.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
             self.offset(-INDENT);
             self.end();
@@ -1023,7 +1025,7 @@
 
     fn trait_item_macro(&mut self, trait_item: &TraitItemMacro) {
         self.outer_attrs(&trait_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&trait_item.mac.delimiter);
         self.mac(&trait_item.mac, None, semicolon);
         self.hardbreak();
     }
@@ -1158,7 +1160,7 @@
         self.ty(&impl_item.ty);
         self.word(" = ");
         self.neverbreak();
-        self.expr(&impl_item.expr);
+        self.expr(&impl_item.expr, FixupContext::NONE);
         self.word(";");
         self.end();
         self.hardbreak();
@@ -1180,8 +1182,8 @@
         self.word("{");
         self.hardbreak_if_nonempty();
         self.inner_attrs(&impl_item.attrs);
-        for stmt in &impl_item.block.stmts {
-            self.stmt(stmt);
+        for stmt in impl_item.block.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
         self.offset(-INDENT);
         self.end();
@@ -1211,7 +1213,7 @@
 
     fn impl_item_macro(&mut self, impl_item: &ImplItemMacro) {
         self.outer_attrs(&impl_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&impl_item.mac.delimiter);
         self.mac(&impl_item.mac, None, semicolon);
         self.hardbreak();
     }
@@ -1421,6 +1423,7 @@
 #[cfg(feature = "verbatim")]
 mod verbatim {
     use crate::algorithm::Printer;
+    use crate::fixup::FixupContext;
     use crate::iter::IterDelimited;
     use crate::INDENT;
     use syn::ext::IdentExt;
@@ -1707,7 +1710,7 @@
                 self.word(" = ");
                 self.neverbreak();
                 self.ibox(-INDENT);
-                self.expr(value);
+                self.expr(value, FixupContext::NONE);
                 self.end();
             }
             self.where_clause_oneline_semi(&item.generics.where_clause);
@@ -1728,8 +1731,8 @@
                 self.word("{");
                 self.hardbreak_if_nonempty();
                 self.inner_attrs(&item.attrs);
-                for stmt in body {
-                    self.stmt(stmt);
+                for stmt in body.iter().delimited() {
+                    self.stmt(&stmt, stmt.is_last);
                 }
                 self.offset(-INDENT);
                 self.end();
@@ -1756,7 +1759,7 @@
             if let Some(expr) = &item.expr {
                 self.word(" = ");
                 self.neverbreak();
-                self.expr(expr);
+                self.expr(expr, FixupContext::NONE);
             }
             self.word(";");
             self.end();

crates/prettyplease/src/lib.rs

diff --git a/crates/prettyplease/src/lib.rs b/crates/prettyplease/src/lib.rs
index b970d8f..25f0250 100644
--- a/crates/prettyplease/src/lib.rs
+++ b/crates/prettyplease/src/lib.rs
@@ -320,8 +320,9 @@
 //! these situations with conditional punctuation tokens whose selection can be
 //! deferred and populated after it's known that the group is or is not broken.
 
-#![doc(html_root_url = "https://docs.rs/prettyplease/0.2.25")]
+#![doc(html_root_url = "https://docs.rs/prettyplease/0.2.29")]
 #![allow(
+    clippy::bool_to_int_with_if,
     clippy::cast_possible_wrap,
     clippy::cast_sign_loss,
     clippy::derive_partial_eq_without_eq,
@@ -336,6 +337,7 @@
     clippy::needless_pass_by_value,
     clippy::ref_option,
     clippy::similar_names,
+    clippy::struct_excessive_bools,
     clippy::too_many_lines,
     clippy::unused_self,
     clippy::vec_init_then_push
@@ -344,10 +346,12 @@
 
 mod algorithm;
 mod attr;
+mod classify;
 mod convenience;
 mod data;
 mod expr;
 mod file;
+mod fixup;
 mod generics;
 mod item;
 mod iter;
@@ -356,6 +360,7 @@
 mod mac;
 mod pat;
 mod path;
+mod precedence;
 mod ring;
 mod stmt;
 mod token;

crates/prettyplease/src/mac.rs

diff --git a/crates/prettyplease/src/mac.rs b/crates/prettyplease/src/mac.rs
index ebc56c7..230a8d4 100644
--- a/crates/prettyplease/src/mac.rs
+++ b/crates/prettyplease/src/mac.rs
@@ -41,10 +41,7 @@
         }
         self.word(close);
         if semicolon {
-            match mac.delimiter {
-                MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => self.word(";"),
-                MacroDelimiter::Brace(_) => {}
-            }
+            self.word(";");
         }
     }
 
@@ -179,6 +176,7 @@
                 (_, Token::Ident(ident)) if !is_keyword(ident) => {
                     (state != Dot && state != Colon2, Ident)
                 }
+                (_, Token::Literal(lit)) if lit.to_string().ends_with('.') => (state != Dot, Other),
                 (_, Token::Literal(_)) => (state != Dot, Ident),
                 (_, Token::Punct(',' | ';', _)) => (false, Other),
                 (_, Token::Punct('.', _)) if !matcher => (state != Ident && state != Delim, Dot),
@@ -211,6 +209,13 @@
     }
 }
 
+pub(crate) fn requires_semi(delimiter: &MacroDelimiter) -> bool {
+    match delimiter {
+        MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => true,
+        MacroDelimiter::Brace(_) => false,
+    }
+}
+
 fn is_keyword(ident: &Ident) -> bool {
     match ident.to_string().as_str() {
         "as" | "async" | "await" | "box" | "break" | "const" | "continue" | "crate" | "dyn"
@@ -224,6 +229,7 @@
 #[cfg(feature = "verbatim")]
 mod standard_library {
     use crate::algorithm::Printer;
+    use crate::fixup::FixupContext;
     use crate::iter::IterDelimited;
     use crate::path::PathKind;
     use crate::INDENT;
@@ -543,7 +549,7 @@
                     self.word("(");
                     self.cbox(INDENT);
                     self.zerobreak();
-                    self.expr(expr);
+                    self.expr(expr, FixupContext::NONE);
                     self.zerobreak();
                     self.offset(-INDENT);
                     self.end();
@@ -554,7 +560,7 @@
                     self.cbox(INDENT);
                     self.zerobreak();
                     for elem in exprs.iter().delimited() {
-                        self.expr(&elem);
+                        self.expr(&elem, FixupContext::NONE);
                         self.trailing_comma(elem.is_last);
                     }
                     self.offset(-INDENT);
@@ -570,14 +576,14 @@
                     self.word("(");
                     self.cbox(INDENT);
                     self.zerobreak();
-                    self.expr(&matches.expression);
+                    self.expr(&matches.expression, FixupContext::NONE);
                     self.word(",");
                     self.space();
                     self.pat(&matches.pattern);
                     if let Some(guard) = &matches.guard {
                         self.space();
                         self.word("if ");
-                        self.expr(guard);
+                        self.expr(guard, FixupContext::NONE);
                     }
                     self.zerobreak();
                     self.offset(-INDENT);
@@ -598,7 +604,7 @@
                         self.ty(&item.ty);
                         self.word(" = ");
                         self.neverbreak();
-                        self.expr(&item.init);
+                        self.expr(&item.init, FixupContext::NONE);
                         self.word(";");
                         self.end();
                         self.hardbreak();
@@ -613,7 +619,7 @@
                     self.cbox(INDENT);
                     self.zerobreak();
                     for elem in vec.iter().delimited() {
-                        self.expr(&elem);
+                        self.expr(&elem, FixupContext::NONE);
                         self.trailing_comma(elem.is_last);
                     }
                     self.offset(-INDENT);
@@ -624,10 +630,10 @@
                     self.word("[");
                     self.cbox(INDENT);
                     self.zerobreak();
-                    self.expr(elem);
+                    self.expr(elem, FixupContext::NONE);
                     self.word(";");
                     self.space();
-                    self.expr(n);
+                    self.expr(n, FixupContext::NONE);
                     self.zerobreak();
                     self.offset(-INDENT);
                     self.end();

crates/prettyplease/src/pat.rs

diff --git a/crates/prettyplease/src/pat.rs b/crates/prettyplease/src/pat.rs
index aa1806e..23a38cb 100644
--- a/crates/prettyplease/src/pat.rs
+++ b/crates/prettyplease/src/pat.rs
@@ -1,4 +1,5 @@
 use crate::algorithm::Printer;
+use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
 use crate::path::PathKind;
 use crate::INDENT;
@@ -19,7 +20,7 @@
             Pat::Or(pat) => self.pat_or(pat),
             Pat::Paren(pat) => self.pat_paren(pat),
             Pat::Path(pat) => self.expr_path(pat),
-            Pat::Range(pat) => self.expr_range(pat),
+            Pat::Range(pat) => self.expr_range(pat, FixupContext::NONE),
             Pat::Reference(pat) => self.pat_reference(pat),
             Pat::Rest(pat) => self.pat_rest(pat),
             Pat::Slice(pat) => self.pat_slice(pat),

crates/prettyplease/src/path.rs

diff --git a/crates/prettyplease/src/path.rs b/crates/prettyplease/src/path.rs
index 2ae94b3..44428cc 100644
--- a/crates/prettyplease/src/path.rs
+++ b/crates/prettyplease/src/path.rs
@@ -3,7 +3,7 @@
 use crate::INDENT;
 use std::ptr;
 use syn::{
-    AngleBracketedGenericArguments, AssocConst, AssocType, Constraint, Expr, GenericArgument,
+    AngleBracketedGenericArguments, AssocConst, AssocType, Constraint, GenericArgument,
     ParenthesizedGenericArguments, Path, PathArguments, PathSegment, QSelf,
 };
 
@@ -50,20 +50,7 @@
             #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
             GenericArgument::Lifetime(lifetime) => self.lifetime(lifetime),
             GenericArgument::Type(ty) => self.ty(ty),
-            GenericArgument::Const(expr) => {
-                match expr {
-                    #![cfg_attr(all(test, exhaustive), allow(non_exhaustive_omitted_patterns))]
-                    Expr::Lit(expr) => self.expr_lit(expr),
-                    Expr::Block(expr) => self.expr_block(expr),
-                    // ERROR CORRECTION: Add braces to make sure that the
-                    // generated code is valid.
-                    _ => {
-                        self.word("{");
-                        self.expr(expr);
-                        self.word("}");
-                    }
-                }
-            }
+            GenericArgument::Const(expr) => self.const_argument(expr),
             GenericArgument::AssocType(assoc) => self.assoc_type(assoc),
             GenericArgument::AssocConst(assoc) => self.assoc_const(assoc),
             GenericArgument::Constraint(constraint) => self.constraint(constraint),
@@ -136,7 +123,7 @@
             self.angle_bracketed_generic_arguments(generics, PathKind::Type);
         }
         self.word(" = ");
-        self.expr(&assoc.value);
+        self.const_argument(&assoc.value);
     }
 
     fn constraint(&mut self, constraint: &Constraint) {

crates/prettyplease/src/precedence.rs

diff --git a/crates/prettyplease/src/precedence.rs b/crates/prettyplease/src/precedence.rs
new file mode 100644
index 0000000..03117d5
--- /dev/null
+++ b/crates/prettyplease/src/precedence.rs
@@ -0,0 +1,148 @@
+use syn::{
+    AttrStyle, Attribute, BinOp, Expr, ExprArray, ExprAsync, ExprAwait, ExprBlock, ExprBreak,
+    ExprCall, ExprConst, ExprContinue, ExprField, ExprForLoop, ExprIf, ExprIndex, ExprInfer,
+    ExprLit, ExprLoop, ExprMacro, ExprMatch, ExprMethodCall, ExprParen, ExprPath, ExprRepeat,
+    ExprReturn, ExprStruct, ExprTry, ExprTryBlock, ExprTuple, ExprUnsafe, ExprWhile, ExprYield,
+    ReturnType,
+};
+
+// Reference: https://doc.rust-lang.org/reference/expressions.html#expression-precedence
+#[derive(Copy, Clone, PartialEq, PartialOrd)]
+pub enum Precedence {
+    // return, break, closures
+    Jump,
+    // = += -= *= /= %= &= |= ^= <<= >>=
+    Assign,
+    // .. ..=
+    Range,
+    // ||
+    Or,
+    // &&
+    And,
+    // let
+    Let,
+    // == != < > <= >=
+    Compare,
+    // |
+    BitOr,
+    // ^
+    BitXor,
+    // &
+    BitAnd,
+    // << >>
+    Shift,
+    // + -
+    Sum,
+    // * / %
+    Product,
+    // as
+    Cast,
+    // unary - * ! & &mut
+    Prefix,
+    // paths, loops, function calls, array indexing, field expressions, method calls
+    Unambiguous,
+}
+
+impl Precedence {
+    pub(crate) const MIN: Self = Precedence::Jump;
+
+    pub(crate) fn of_binop(op: &BinOp) -> Self {
+        match op {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            BinOp::Add(_) | BinOp::Sub(_) => Precedence::Sum,
+            BinOp::Mul(_) | BinOp::Div(_) | BinOp::Rem(_) => Precedence::Product,
+            BinOp::And(_) => Precedence::And,
+            BinOp::Or(_) => Precedence::Or,
+            BinOp::BitXor(_) => Precedence::BitXor,
+            BinOp::BitAnd(_) => Precedence::BitAnd,
+            BinOp::BitOr(_) => Precedence::BitOr,
+            BinOp::Shl(_) | BinOp::Shr(_) => Precedence::Shift,
+
+            BinOp::Eq(_)
+            | BinOp::Lt(_)
+            | BinOp::Le(_)
+            | BinOp::Ne(_)
+            | BinOp::Ge(_)
+            | BinOp::Gt(_) => Precedence::Compare,
+
+            BinOp::AddAssign(_)
+            | BinOp::SubAssign(_)
+            | BinOp::MulAssign(_)
+            | BinOp::DivAssign(_)
+            | BinOp::RemAssign(_)
+            | BinOp::BitXorAssign(_)
+            | BinOp::BitAndAssign(_)
+            | BinOp::BitOrAssign(_)
+            | BinOp::ShlAssign(_)
+            | BinOp::ShrAssign(_) => Precedence::Assign,
+
+            _ => Precedence::MIN,
+        }
+    }
+
+    pub(crate) fn of(e: &Expr) -> Self {
+        fn prefix_attrs(attrs: &[Attribute]) -> Precedence {
+            for attr in attrs {
+                if let AttrStyle::Outer = attr.style {
+                    return Precedence::Prefix;
+                }
+            }
+            Precedence::Unambiguous
+        }
+
+        match e {
+            #![cfg_attr(all(test, exhaustive), deny(non_exhaustive_omitted_patterns))]
+            Expr::Closure(e) => match e.output {
+                ReturnType::Default => Precedence::Jump,
+                ReturnType::Type(..) => prefix_attrs(&e.attrs),
+            },
+
+            Expr::Break(ExprBreak { expr, .. })
+            | Expr::Return(ExprReturn { expr, .. })
+            | Expr::Yield(ExprYield { expr, .. }) => match expr {
+                Some(_) => Precedence::Jump,
+                None => Precedence::Unambiguous,
+            },
+
+            Expr::Assign(_) => Precedence::Assign,
+            Expr::Range(_) => Precedence::Range,
+            Expr::Binary(e) => Precedence::of_binop(&e.op),
+            Expr::Let(_) => Precedence::Let,
+            Expr::Cast(_) => Precedence::Cast,
+            Expr::RawAddr(_) | Expr::Reference(_) | Expr::Unary(_) => Precedence::Prefix,
+
+            Expr::Array(ExprArray { attrs, .. })
+            | Expr::Async(ExprAsync { attrs, .. })
+            | Expr::Await(ExprAwait { attrs, .. })
+            | Expr::Block(ExprBlock { attrs, .. })
+            | Expr::Call(ExprCall { attrs, .. })
+            | Expr::Const(ExprConst { attrs, .. })
+            | Expr::Continue(ExprContinue { attrs, .. })
+            | Expr::Field(ExprField { attrs, .. })
+            | Expr::ForLoop(ExprForLoop { attrs, .. })
+            | Expr::If(ExprIf { attrs, .. })
+            | Expr::Index(ExprIndex { attrs, .. })
+            | Expr::Infer(ExprInfer { attrs, .. })
+            | Expr::Lit(ExprLit { attrs, .. })
+            | Expr::Loop(ExprLoop { attrs, .. })
+            | Expr::Macro(ExprMacro { attrs, .. })
+            | Expr::Match(ExprMatch { attrs, .. })
+            | Expr::MethodCall(ExprMethodCall { attrs, .. })
+            | Expr::Paren(ExprParen { attrs, .. })
+            | Expr::Path(ExprPath { attrs, .. })
+            | Expr::Repeat(ExprRepeat { attrs, .. })
+            | Expr::Struct(ExprStruct { attrs, .. })
+            | Expr::Try(ExprTry { attrs, .. })
+            | Expr::TryBlock(ExprTryBlock { attrs, .. })
+            | Expr::Tuple(ExprTuple { attrs, .. })
+            | Expr::Unsafe(ExprUnsafe { attrs, .. })
+            | Expr::While(ExprWhile { attrs, .. }) => prefix_attrs(attrs),
+
+            Expr::Group(e) => Precedence::of(&e.expr),
+
+            Expr::Verbatim(_) => Precedence::Unambiguous,
+
+            _ => Precedence::Unambiguous,
+        }
+    }
+}

crates/prettyplease/src/ring.rs

diff --git a/crates/prettyplease/src/ring.rs b/crates/prettyplease/src/ring.rs
index aff9258..882a988 100644
--- a/crates/prettyplease/src/ring.rs
+++ b/crates/prettyplease/src/ring.rs
@@ -1,5 +1,5 @@
 use std::collections::VecDeque;
-use std::ops::{Index, IndexMut};
+use std::ops::{Index, IndexMut, Range};
 
 pub struct RingBuffer<T> {
     data: VecDeque<T>,
@@ -33,8 +33,8 @@
         self.data.clear();
     }
 
-    pub fn index_of_first(&self) -> usize {
-        self.offset
+    pub fn index_range(&self) -> Range<usize> {
+        self.offset..self.offset + self.data.len()
     }
 
     pub fn first(&self) -> &T {

crates/prettyplease/src/stmt.rs

diff --git a/crates/prettyplease/src/stmt.rs b/crates/prettyplease/src/stmt.rs
index 2b97da6..ce58200 100644
--- a/crates/prettyplease/src/stmt.rs
+++ b/crates/prettyplease/src/stmt.rs
@@ -1,9 +1,13 @@
 use crate::algorithm::Printer;
+use crate::classify;
+use crate::expr;
+use crate::fixup::FixupContext;
+use crate::mac;
 use crate::INDENT;
 use syn::{BinOp, Expr, Stmt};
 
 impl Printer {
-    pub fn stmt(&mut self, stmt: &Stmt) {
+    pub fn stmt(&mut self, stmt: &Stmt, is_last: bool) {
         match stmt {
             Stmt::Local(local) => {
                 self.outer_attrs(&local.attrs);
@@ -13,32 +17,26 @@
                 if let Some(local_init) = &local.init {
                     self.word(" = ");
                     self.neverbreak();
-                    self.expr(&local_init.expr);
+                    self.subexpr(
+                        &local_init.expr,
+                        local_init.diverge.is_some()
+                            && classify::expr_trailing_brace(&local_init.expr),
+                        FixupContext::NONE,
+                    );
                     if let Some((_else, diverge)) = &local_init.diverge {
                         self.space();
                         self.word("else ");
                         self.end();
                         self.neverbreak();
-                        if let Expr::Block(expr) = diverge.as_ref() {
-                            self.cbox(INDENT);
+                        self.cbox(INDENT);
+                        if let Some(expr) = expr::simple_block(diverge) {
                             self.small_block(&expr.block, &[]);
-                            self.end();
                         } else {
-                            self.word("{");
-                            self.space();
-                            self.ibox(INDENT);
-                            self.expr(diverge);
-                            self.end();
-                            self.space();
-                            self.offset(-INDENT);
-                            self.word("}");
+                            self.expr_as_small_block(diverge, INDENT);
                         }
-                    } else {
-                        self.end();
                     }
-                } else {
-                    self.end();
                 }
+                self.end();
                 self.word(";");
                 self.hardbreak();
             }
@@ -46,14 +44,14 @@
             Stmt::Expr(expr, None) => {
                 if break_after(expr) {
                     self.ibox(0);
-                    self.expr_beginning_of_line(expr, true);
+                    self.expr_beginning_of_line(expr, false, true, FixupContext::new_stmt());
                     if add_semi(expr) {
                         self.word(";");
                     }
                     self.end();
                     self.hardbreak();
                 } else {
-                    self.expr_beginning_of_line(expr, true);
+                    self.expr_beginning_of_line(expr, false, true, FixupContext::new_stmt());
                 }
             }
             Stmt::Expr(expr, Some(_semi)) => {
@@ -63,7 +61,7 @@
                     }
                 }
                 self.ibox(0);
-                self.expr_beginning_of_line(expr, true);
+                self.expr_beginning_of_line(expr, false, true, FixupContext::new_stmt());
                 if !remove_semi(expr) {
                     self.word(";");
                 }
@@ -72,7 +70,8 @@
             }
             Stmt::Macro(stmt) => {
                 self.outer_attrs(&stmt.attrs);
-                let semicolon = true;
+                let semicolon = stmt.semi_token.is_some()
+                    || !is_last && mac::requires_semi(&stmt.mac.delimiter);
                 self.mac(&stmt.mac, None, semicolon);
                 self.hardbreak();
             }

crates/prettyplease/src/ty.rs

diff --git a/crates/prettyplease/src/ty.rs b/crates/prettyplease/src/ty.rs
index ec2cd0a..7f92821 100644
--- a/crates/prettyplease/src/ty.rs
+++ b/crates/prettyplease/src/ty.rs
@@ -1,4 +1,5 @@
 use crate::algorithm::Printer;
+use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
 use crate::path::PathKind;
 use crate::INDENT;
@@ -36,7 +37,7 @@
         self.word("[");
         self.ty(&ty.elem);
         self.word("; ");
-        self.expr(&ty.len);
+        self.expr(&ty.len, FixupContext::NONE);
         self.word("]");
     }
 

crates/prettyplease/tests/test.rs

diff --git a/crates/prettyplease/tests/test.rs b/crates/prettyplease/tests/test.rs
index 04004a7..aa6b849 100644
--- a/crates/prettyplease/tests/test.rs
+++ b/crates/prettyplease/tests/test.rs
@@ -20,7 +20,7 @@
         },
         indoc! {"
             fn main() {
-                if (Struct {} == Struct {}) {}
+                if (Struct {}) == (Struct {}) {}
             }
         "},
     );
@@ -39,17 +39,11 @@
                 }
             }
         },
-        // FIXME: no parens around `Struct {}` because anything until the `=>`
-        // is considered part of the match guard expression. Parsing of the
-        // expression is not terminated by `{` in that position.
-        //
-        // FIXME: the `true && false` needs parens. Otherwise the precedence is
-        // `(let _ = true) && false` which means something different.
         indoc! {"
             fn main() {
                 match () {
-                    () if let _ = (Struct {}) => {}
-                    () if let _ = true && false => {}
+                    () if let _ = Struct {} => {}
+                    () if let _ = (true && false) => {}
                 }
             }
         "},

crates/prettyplease/tests/test_precedence.rs

diff --git a/crates/prettyplease/tests/test_precedence.rs b/crates/prettyplease/tests/test_precedence.rs
new file mode 100644
index 0000000..f1eec23
--- /dev/null
+++ b/crates/prettyplease/tests/test_precedence.rs
@@ -0,0 +1,900 @@
+use proc_macro2::{Ident, Span, TokenStream};
+use quote::ToTokens as _;
+use std::mem;
+use std::process::ExitCode;
+use syn::punctuated::Punctuated;
+use syn::visit_mut::{self, VisitMut};
+use syn::{
+    token, AngleBracketedGenericArguments, Arm, BinOp, Block, Expr, ExprArray, ExprAssign,
+    ExprAsync, ExprAwait, ExprBinary, ExprBlock, ExprBreak, ExprCall, ExprCast, ExprClosure,
+    ExprConst, ExprContinue, ExprField, ExprForLoop, ExprIf, ExprIndex, ExprLet, ExprLit, ExprLoop,
+    ExprMacro, ExprMatch, ExprMethodCall, ExprPath, ExprRange, ExprRawAddr, ExprReference,
+    ExprReturn, ExprStruct, ExprTry, ExprTryBlock, ExprUnary, ExprUnsafe, ExprWhile, ExprYield,
+    File, GenericArgument, Generics, Item, ItemConst, Label, Lifetime, LifetimeParam, Lit, LitInt,
+    Macro, MacroDelimiter, Member, Pat, PatWild, Path, PathArguments, PathSegment,
+    PointerMutability, QSelf, RangeLimits, ReturnType, Stmt, StmtMacro, Token, Type, TypeInfer,
+    TypeParam, TypePath, UnOp, Visibility,
+};
+
+struct FlattenParens;
+
+impl VisitMut for FlattenParens {
+    fn visit_expr_mut(&mut self, e: &mut Expr) {
+        while let Expr::Paren(paren) = e {
+            *e = mem::replace(&mut *paren.expr, Expr::PLACEHOLDER);
+        }
+        visit_mut::visit_expr_mut(self, e);
+    }
+}
+
+struct AsIfPrinted;
+
+impl VisitMut for AsIfPrinted {
+    fn visit_generics_mut(&mut self, generics: &mut Generics) {
+        if generics.params.is_empty() {
+            generics.lt_token = None;
+            generics.gt_token = None;
+        }
+        if let Some(where_clause) = &generics.where_clause {
+            if where_clause.predicates.is_empty() {
+                generics.where_clause = None;
+            }
+        }
+        visit_mut::visit_generics_mut(self, generics);
+    }
+
+    fn visit_lifetime_param_mut(&mut self, param: &mut LifetimeParam) {
+        if param.bounds.is_empty() {
+            param.colon_token = None;
+        }
+        visit_mut::visit_lifetime_param_mut(self, param);
+    }
+
+    fn visit_stmt_mut(&mut self, stmt: &mut Stmt) {
+        if let Stmt::Expr(expr, semi) = stmt {
+            if let Expr::Macro(e) = expr {
+                if match e.mac.delimiter {
+                    MacroDelimiter::Brace(_) => true,
+                    MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => semi.is_some(),
+                } {
+                    let expr = match mem::replace(expr, Expr::PLACEHOLDER) {
+                        Expr::Macro(expr) => expr,
+                        _ => unreachable!(),
+                    };
+                    *stmt = Stmt::Macro(StmtMacro {
+                        attrs: expr.attrs,
+                        mac: expr.mac,
+                        semi_token: *semi,
+                    });
+                }
+            }
+        }
+        visit_mut::visit_stmt_mut(self, stmt);
+    }
+
+    fn visit_type_param_mut(&mut self, param: &mut TypeParam) {
+        if param.bounds.is_empty() {
+            param.colon_token = None;
+        }
+        visit_mut::visit_type_param_mut(self, param);
+    }
+}
+
+#[test]
+fn test_permutations() -> ExitCode {
+    fn iter(depth: usize, f: &mut dyn FnMut(Expr)) {
+        let span = Span::call_site();
+
+        // Expr::Path
+        f(Expr::Path(ExprPath {
+            // `x`
+            attrs: Vec::new(),
+            qself: None,
+            path: Path::from(Ident::new("x", span)),
+        }));
+        if false {
+            f(Expr::Path(ExprPath {
+                // `x::<T>`
+                attrs: Vec::new(),
+                qself: None,
+                path: Path {
+                    leading_colon: None,
+                    segments: Punctuated::from_iter([PathSegment {
+                        ident: Ident::new("x", span),
+                        arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
+                            colon2_token: Some(Token![::](span)),
+                            lt_token: Token![<](span),
+                            args: Punctuated::from_iter([GenericArgument::Type(Type::Path(
+                                TypePath {
+                                    qself: None,
+                                    path: Path::from(Ident::new("T", span)),
+                                },
+                            ))]),
+                            gt_token: Token![>](span),
+                        }),
+                    }]),
+                },
+            }));
+            f(Expr::Path(ExprPath {
+                // `<T as Trait>::CONST`
+                attrs: Vec::new(),
+                qself: Some(QSelf {
+                    lt_token: Token![<](span),
+                    ty: Box::new(Type::Path(TypePath {
+                        qself: None,
+                        path: Path::from(Ident::new("T", span)),
+                    })),
+                    position: 1,
+                    as_token: Some(Token![as](span)),
+                    gt_token: Token![>](span),
+                }),
+                path: Path {
+                    leading_colon: None,
+                    segments: Punctuated::from_iter([
+                        PathSegment::from(Ident::new("Trait", span)),
+                        PathSegment::from(Ident::new("CONST", span)),
+                    ]),
+                },
+            }));
+        }
+
+        let depth = match depth.checked_sub(1) {
+            Some(depth) => depth,
+            None => return,
+        };
+
+        // Expr::Assign
+        iter(depth, &mut |expr| {
+            iter(0, &mut |simple| {
+                f(Expr::Assign(ExprAssign {
+                    // `x = $expr`
+                    attrs: Vec::new(),
+                    left: Box::new(simple.clone()),
+                    eq_token: Token![=](span),
+                    right: Box::new(expr.clone()),
+                }));
+                f(Expr::Assign(ExprAssign {
+                    // `$expr = x`
+                    attrs: Vec::new(),
+                    left: Box::new(expr.clone()),
+                    eq_token: Token![=](span),
+                    right: Box::new(simple),
+                }));
+            });
+        });
+
+        // Expr::Binary
+        iter(depth, &mut |expr| {
+            iter(0, &mut |simple| {
+                for op in [
+                    BinOp::Add(Token![+](span)),
+                    //BinOp::Sub(Token![-](span)),
+                    //BinOp::Mul(Token![*](span)),
+                    //BinOp::Div(Token![/](span)),
+                    //BinOp::Rem(Token![%](span)),
+                    //BinOp::And(Token![&&](span)),
+                    //BinOp::Or(Token![||](span)),
+                    //BinOp::BitXor(Token![^](span)),
+                    //BinOp::BitAnd(Token![&](span)),
+                    //BinOp::BitOr(Token![|](span)),
+                    //BinOp::Shl(Token![<<](span)),
+                    //BinOp::Shr(Token![>>](span)),
+                    //BinOp::Eq(Token![==](span)),
+                    BinOp::Lt(Token![<](span)),
+                    //BinOp::Le(Token![<=](span)),
+                    //BinOp::Ne(Token![!=](span)),
+                    //BinOp::Ge(Token![>=](span)),
+                    //BinOp::Gt(Token![>](span)),
+                    BinOp::ShlAssign(Token![<<=](span)),
+                ] {
+                    f(Expr::Binary(ExprBinary {
+                        // `x + $expr`
+                        attrs: Vec::new(),
+                        left: Box::new(simple.clone()),
+                        op,
+                        right: Box::new(expr.clone()),
+                    }));
+                    f(Expr::Binary(ExprBinary {
+                        // `$expr + x`
+                        attrs: Vec::new(),
+                        left: Box::new(expr.clone()),
+                        op,
+                        right: Box::new(simple.clone()),
+                    }));
+                }
+            });
+        });
+
+        // Expr::Block
+        f(Expr::Block(ExprBlock {
+            // `{}`
+            attrs: Vec::new(),
+            label: None,
+            block: Block {
+                brace_token: token::Brace(span),
+                stmts: Vec::new(),
+            },
+        }));
+
+        // Expr::Break
+        f(Expr::Break(ExprBreak {
+            // `break`
+            attrs: Vec::new(),
+            break_token: Token![break](span),
+            label: None,
+            expr: None,
+        }));
+        iter(depth, &mut |expr| {
+            f(Expr::Break(ExprBreak {
+                // `break $expr`
+                attrs: Vec::new(),
+                break_token: Token![break](span),
+                label: None,
+                expr: Some(Box::new(expr)),
+            }));
+        });
+
+        // Expr::Call
+        iter(depth, &mut |expr| {
+            f(Expr::Call(ExprCall {
+                // `$expr()`
+                attrs: Vec::new(),
+                func: Box::new(expr),
+                paren_token: token::Paren(span),
+                args: Punctuated::new(),
+            }));
+        });
+
+        // Expr::Cast
+        iter(depth, &mut |expr| {
+            f(Expr::Cast(ExprCast {
+                // `$expr as T`
+                attrs: Vec::new(),
+                expr: Box::new(expr),
+                as_token: Token![as](span),
+                ty: Box::new(Type::Path(TypePath {
+                    qself: None,
+                    path: Path::from(Ident::new("T", span)),
+                })),
+            }));
+        });
+
+        // Expr::Closure
+        iter(depth, &mut |expr| {
+            f(Expr::Closure(ExprClosure {
+                // `|| $expr`
+                attrs: Vec::new(),
+                lifetimes: None,
+                constness: None,
+                movability: None,
+                asyncness: None,
+                capture: None,
+                or1_token: Token![|](span),
+                inputs: Punctuated::new(),
+                or2_token: Token![|](span),
+                output: ReturnType::Default,
+                body: Box::new(expr),
+            }));
+        });
+
+        // Expr::Field
+        iter(depth, &mut |expr| {
+            f(Expr::Field(ExprField {
+                // `$expr.field`
+                attrs: Vec::new(),
+                base: Box::new(expr),
+                dot_token: Token![.](span),
+                member: Member::Named(Ident::new("field", span)),
+            }));
+        });
+
+        // Expr::If
+        iter(depth, &mut |expr| {
+            f(Expr::If(ExprIf {
+                // `if $expr {}`
+                attrs: Vec::new(),
+                if_token: Token![if](span),
+                cond: Box::new(expr),
+                then_branch: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+                else_branch: None,
+            }));
+        });
+
+        // Expr::Let
+        iter(depth, &mut |expr| {
+            f(Expr::Let(ExprLet {
+                attrs: Vec::new(),
+                let_token: Token![let](span),
+                pat: Box::new(Pat::Wild(PatWild {
+                    attrs: Vec::new(),
+                    underscore_token: Token![_](span),
+                })),
+                eq_token: Token![=](span),
+                expr: Box::new(expr),
+            }));
+        });
+
+        // Expr::Range
+        f(Expr::Range(ExprRange {
+            // `..`
+            attrs: Vec::new(),
+            start: None,
+            limits: RangeLimits::HalfOpen(Token![..](span)),
+            end: None,
+        }));
+        iter(depth, &mut |expr| {
+            f(Expr::Range(ExprRange {
+                // `..$expr`
+                attrs: Vec::new(),
+                start: None,
+                limits: RangeLimits::HalfOpen(Token![..](span)),
+                end: Some(Box::new(expr.clone())),
+            }));
+            f(Expr::Range(ExprRange {
+                // `$expr..`
+                attrs: Vec::new(),
+                start: Some(Box::new(expr)),
+                limits: RangeLimits::HalfOpen(Token![..](span)),
+                end: None,
+            }));
+        });
+
+        // Expr::Reference
+        iter(depth, &mut |expr| {
+            f(Expr::Reference(ExprReference {
+                // `&$expr`
+                attrs: Vec::new(),
+                and_token: Token![&](span),
+                mutability: None,
+                expr: Box::new(expr),
+            }));
+        });
+
+        // Expr::Return
+        f(Expr::Return(ExprReturn {
+            // `return`
+            attrs: Vec::new(),
+            return_token: Token![return](span),
+            expr: None,
+        }));
+        iter(depth, &mut |expr| {
+            f(Expr::Return(ExprReturn {
+                // `return $expr`
+                attrs: Vec::new(),
+                return_token: Token![return](span),
+                expr: Some(Box::new(expr)),
+            }));
+        });
+
+        // Expr::Try
+        iter(depth, &mut |expr| {
+            f(Expr::Try(ExprTry {
+                // `$expr?`
+                attrs: Vec::new(),
+                expr: Box::new(expr),
+                question_token: Token![?](span),
+            }));
+        });
+
+        // Expr::Unary
+        iter(depth, &mut |expr| {
+            for op in [
+                UnOp::Deref(Token![*](span)),
+                //UnOp::Not(Token![!](span)),
+                //UnOp::Neg(Token![-](span)),
+            ] {
+                f(Expr::Unary(ExprUnary {
+                    // `*$expr`
+                    attrs: Vec::new(),
+                    op,
+                    expr: Box::new(expr.clone()),
+                }));
+            }
+        });
+
+        if false {
+            // Expr::Array
+            f(Expr::Array(ExprArray {
+                // `[]`
+                attrs: Vec::new(),
+                bracket_token: token::Bracket(span),
+                elems: Punctuated::new(),
+            }));
+
+            // Expr::Async
+            f(Expr::Async(ExprAsync {
+                // `async {}`
+                attrs: Vec::new(),
+                async_token: Token![async](span),
+                capture: None,
+                block: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+
+            // Expr::Await
+            iter(depth, &mut |expr| {
+                f(Expr::Await(ExprAwait {
+                    // `$expr.await`
+                    attrs: Vec::new(),
+                    base: Box::new(expr),
+                    dot_token: Token![.](span),
+                    await_token: Token![await](span),
+                }));
+            });
+
+            // Expr::Block
+            f(Expr::Block(ExprBlock {
+                // `'a: {}`
+                attrs: Vec::new(),
+                label: Some(Label {
+                    name: Lifetime::new("'a", span),
+                    colon_token: Token![:](span),
+                }),
+                block: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+            iter(depth, &mut |expr| {
+                f(Expr::Block(ExprBlock {
+                    // `{ $expr }`
+                    attrs: Vec::new(),
+                    label: None,
+                    block: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::from([Stmt::Expr(expr.clone(), None)]),
+                    },
+                }));
+                f(Expr::Block(ExprBlock {
+                    // `{ $expr; }`
+                    attrs: Vec::new(),
+                    label: None,
+                    block: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::from([Stmt::Expr(expr, Some(Token![;](span)))]),
+                    },
+                }));
+            });
+
+            // Expr::Break
+            f(Expr::Break(ExprBreak {
+                // `break 'a`
+                attrs: Vec::new(),
+                break_token: Token![break](span),
+                label: Some(Lifetime::new("'a", span)),
+                expr: None,
+            }));
+            iter(depth, &mut |expr| {
+                f(Expr::Break(ExprBreak {
+                    // `break 'a $expr`
+                    attrs: Vec::new(),
+                    break_token: Token![break](span),
+                    label: Some(Lifetime::new("'a", span)),
+                    expr: Some(Box::new(expr)),
+                }));
+            });
+
+            // Expr::Closure
+            f(Expr::Closure(ExprClosure {
+                // `|| -> T {}`
+                attrs: Vec::new(),
+                lifetimes: None,
+                constness: None,
+                movability: None,
+                asyncness: None,
+                capture: None,
+                or1_token: Token![|](span),
+                inputs: Punctuated::new(),
+                or2_token: Token![|](span),
+                output: ReturnType::Type(
+                    Token![->](span),
+                    Box::new(Type::Path(TypePath {
+                        qself: None,
+                        path: Path::from(Ident::new("T", span)),
+                    })),
+                ),
+                body: Box::new(Expr::Block(ExprBlock {
+                    attrs: Vec::new(),
+                    label: None,
+                    block: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::new(),
+                    },
+                })),
+            }));
+
+            // Expr::Const
+            f(Expr::Const(ExprConst {
+                // `const {}`
+                attrs: Vec::new(),
+                const_token: Token![const](span),
+                block: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+
+            // Expr::Continue
+            f(Expr::Continue(ExprContinue {
+                // `continue`
+                attrs: Vec::new(),
+                continue_token: Token![continue](span),
+                label: None,
+            }));
+            f(Expr::Continue(ExprContinue {
+                // `continue 'a`
+                attrs: Vec::new(),
+                continue_token: Token![continue](span),
+                label: Some(Lifetime::new("'a", span)),
+            }));
+
+            // Expr::ForLoop
+            iter(depth, &mut |expr| {
+                f(Expr::ForLoop(ExprForLoop {
+                    // `for _ in $expr {}`
+                    attrs: Vec::new(),
+                    label: None,
+                    for_token: Token![for](span),
+                    pat: Box::new(Pat::Wild(PatWild {
+                        attrs: Vec::new(),
+                        underscore_token: Token![_](span),
+                    })),
+                    in_token: Token![in](span),
+                    expr: Box::new(expr.clone()),
+                    body: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::new(),
+                    },
+                }));
+                f(Expr::ForLoop(ExprForLoop {
+                    // `'a: for _ in $expr {}`
+                    attrs: Vec::new(),
+                    label: Some(Label {
+                        name: Lifetime::new("'a", span),
+                        colon_token: Token![:](span),
+                    }),
+                    for_token: Token![for](span),
+                    pat: Box::new(Pat::Wild(PatWild {
+                        attrs: Vec::new(),
+                        underscore_token: Token![_](span),
+                    })),
+                    in_token: Token![in](span),
+                    expr: Box::new(expr),
+                    body: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::new(),
+                    },
+                }));
+            });
+
+            // Expr::Index
+            iter(depth, &mut |expr| {
+                f(Expr::Index(ExprIndex {
+                    // `$expr[0]`
+                    attrs: Vec::new(),
+                    expr: Box::new(expr),
+                    bracket_token: token::Bracket(span),
+                    index: Box::new(Expr::Lit(ExprLit {
+                        attrs: Vec::new(),
+                        lit: Lit::Int(LitInt::new("0", span)),
+                    })),
+                }));
+            });
+
+            // Expr::Loop
+            f(Expr::Loop(ExprLoop {
+                // `loop {}`
+                attrs: Vec::new(),
+                label: None,
+                loop_token: Token![loop](span),
+                body: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+            f(Expr::Loop(ExprLoop {
+                // `'a: loop {}`
+                attrs: Vec::new(),
+                label: Some(Label {
+                    name: Lifetime::new("'a", span),
+                    colon_token: Token![:](span),
+                }),
+                loop_token: Token![loop](span),
+                body: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+
+            // Expr::Macro
+            f(Expr::Macro(ExprMacro {
+                // `m!()`
+                attrs: Vec::new(),
+                mac: Macro {
+                    path: Path::from(Ident::new("m", span)),
+                    bang_token: Token![!](span),
+                    delimiter: MacroDelimiter::Paren(token::Paren(span)),
+                    tokens: TokenStream::new(),
+                },
+            }));
+            f(Expr::Macro(ExprMacro {
+                // `m! {}`
+                attrs: Vec::new(),
+                mac: Macro {
+                    path: Path::from(Ident::new("m", span)),
+                    bang_token: Token![!](span),
+                    delimiter: MacroDelimiter::Brace(token::Brace(span)),
+                    tokens: TokenStream::new(),
+                },
+            }));
+
+            // Expr::Match
+            iter(depth, &mut |expr| {
+                f(Expr::Match(ExprMatch {
+                    // `match $expr {}`
+                    attrs: Vec::new(),
+                    match_token: Token![match](span),
+                    expr: Box::new(expr.clone()),
+                    brace_token: token::Brace(span),
+                    arms: Vec::new(),
+                }));
+                f(Expr::Match(ExprMatch {
+                    // `match x { _ => $expr }`
+                    attrs: Vec::new(),
+                    match_token: Token![match](span),
+                    expr: Box::new(Expr::Path(ExprPath {
+                        attrs: Vec::new(),
+                        qself: None,
+                        path: Path::from(Ident::new("x", span)),
+                    })),
+                    brace_token: token::Brace(span),
+                    arms: Vec::from([Arm {
+                        attrs: Vec::new(),
+                        pat: Pat::Wild(PatWild {
+                            attrs: Vec::new(),
+                            underscore_token: Token![_](span),
+                        }),
+                        guard: None,
+                        fat_arrow_token: Token![=>](span),
+                        body: Box::new(expr.clone()),
+                        comma: None,
+                    }]),
+                }));
+                f(Expr::Match(ExprMatch {
+                    // `match x { _ if $expr => {} }`
+                    attrs: Vec::new(),
+                    match_token: Token![match](span),
+                    expr: Box::new(Expr::Path(ExprPath {
+                        attrs: Vec::new(),
+                        qself: None,
+                        path: Path::from(Ident::new("x", span)),
+                    })),
+                    brace_token: token::Brace(span),
+                    arms: Vec::from([Arm {
+                        attrs: Vec::new(),
+                        pat: Pat::Wild(PatWild {
+                            attrs: Vec::new(),
+                            underscore_token: Token![_](span),
+                        }),
+                        guard: Some((Token![if](span), Box::new(expr))),
+                        fat_arrow_token: Token![=>](span),
+                        body: Box::new(Expr::Block(ExprBlock {
+                            attrs: Vec::new(),
+                            label: None,
+                            block: Block {
+                                brace_token: token::Brace(span),
+                                stmts: Vec::new(),
+                            },
+                        })),
+                        comma: None,
+                    }]),
+                }));
+            });
+
+            // Expr::MethodCall
+            iter(depth, &mut |expr| {
+                f(Expr::MethodCall(ExprMethodCall {
+                    // `$expr.method()`
+                    attrs: Vec::new(),
+                    receiver: Box::new(expr.clone()),
+                    dot_token: Token![.](span),
+                    method: Ident::new("method", span),
+                    turbofish: None,
+                    paren_token: token::Paren(span),
+                    args: Punctuated::new(),
+                }));
+                f(Expr::MethodCall(ExprMethodCall {
+                    // `$expr.method::<T>()`
+                    attrs: Vec::new(),
+                    receiver: Box::new(expr),
+                    dot_token: Token![.](span),
+                    method: Ident::new("method", span),
+                    turbofish: Some(AngleBracketedGenericArguments {
+                        colon2_token: Some(Token![::](span)),
+                        lt_token: Token![<](span),
+                        args: Punctuated::from_iter([GenericArgument::Type(Type::Path(
+                            TypePath {
+                                qself: None,
+                                path: Path::from(Ident::new("T", span)),
+                            },
+                        ))]),
+                        gt_token: Token![>](span),
+                    }),
+                    paren_token: token::Paren(span),
+                    args: Punctuated::new(),
+                }));
+            });
+
+            // Expr::RawAddr
+            iter(depth, &mut |expr| {
+                f(Expr::RawAddr(ExprRawAddr {
+                    // `&raw const $expr`
+                    attrs: Vec::new(),
+                    and_token: Token![&](span),
+                    raw: Token![raw](span),
+                    mutability: PointerMutability::Const(Token![const](span)),
+                    expr: Box::new(expr),
+                }));
+            });
+
+            // Expr::Struct
+            f(Expr::Struct(ExprStruct {
+                // `Struct {}`
+                attrs: Vec::new(),
+                qself: None,
+                path: Path::from(Ident::new("Struct", span)),
+                brace_token: token::Brace(span),
+                fields: Punctuated::new(),
+                dot2_token: None,
+                rest: None,
+            }));
+
+            // Expr::TryBlock
+            f(Expr::TryBlock(ExprTryBlock {
+                // `try {}`
+                attrs: Vec::new(),
+                try_token: Token![try](span),
+                block: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+
+            // Expr::Unsafe
+            f(Expr::Unsafe(ExprUnsafe {
+                // `unsafe {}`
+                attrs: Vec::new(),
+                unsafe_token: Token![unsafe](span),
+                block: Block {
+                    brace_token: token::Brace(span),
+                    stmts: Vec::new(),
+                },
+            }));
+
+            // Expr::While
+            iter(depth, &mut |expr| {
+                f(Expr::While(ExprWhile {
+                    // `while $expr {}`
+                    attrs: Vec::new(),
+                    label: None,
+                    while_token: Token![while](span),
+                    cond: Box::new(expr.clone()),
+                    body: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::new(),
+                    },
+                }));
+                f(Expr::While(ExprWhile {
+                    // `'a: while $expr {}`
+                    attrs: Vec::new(),
+                    label: Some(Label {
+                        name: Lifetime::new("'a", span),
+                        colon_token: Token![:](span),
+                    }),
+                    while_token: Token![while](span),
+                    cond: Box::new(expr),
+                    body: Block {
+                        brace_token: token::Brace(span),
+                        stmts: Vec::new(),
+                    },
+                }));
+            });
+
+            // Expr::Yield
+            f(Expr::Yield(ExprYield {
+                // `yield`
+                attrs: Vec::new(),
+                yield_token: Token![yield](span),
+                expr: None,
+            }));
+            iter(depth, &mut |expr| {
+                f(Expr::Yield(ExprYield {
+                    // `yield $expr`
+                    attrs: Vec::new(),
+                    yield_token: Token![yield](span),
+                    expr: Some(Box::new(expr)),
+                }));
+            });
+        }
+    }
+
+    let mut failures = 0;
+    macro_rules! fail {
+        ($($message:tt)*) => {{
+            eprintln!($($message)*);
+            failures += 1;
+            return;
+        }};
+    }
+    let mut assert = |mut original: Expr| {
+        let span = Span::call_site();
+        // `const _: () = $expr;`
+        let pretty = prettyplease::unparse(&File {
+            shebang: None,
+            attrs: Vec::new(),
+            items: Vec::from([Item::Const(ItemConst {
+                attrs: Vec::new(),
+                vis: Visibility::Inherited,
+                const_token: Token![const](span),
+                ident: Ident::from(Token![_](span)),
+                generics: Generics::default(),
+                colon_token: Token![:](span),
+                ty: Box::new(Type::Infer(TypeInfer {
+                    underscore_token: Token![_](span),
+                })),
+                eq_token: Token![=](span),
+                expr: Box::new(original.clone()),
+                semi_token: Token![;](span),
+            })]),
+        });
+        let mut parsed = match syn::parse_file(&pretty) {
+            Ok(parsed) => parsed,
+            _ => fail!("failed to parse: {pretty}{original:#?}"),
+        };
+        let item = match parsed.items.as_mut_slice() {
+            [Item::Const(item)] => item,
+            _ => unreachable!(),
+        };
+        let mut parsed = mem::replace(&mut *item.expr, Expr::PLACEHOLDER);
+        AsIfPrinted.visit_expr_mut(&mut original);
+        FlattenParens.visit_expr_mut(&mut parsed);
+        if original != parsed {
+            fail!(
+                "before: {}\n{:#?}\nafter: {}\n{:#?}",
+                original.to_token_stream(),
+                original,
+                parsed.to_token_stream(),
+                parsed,
+            );
+        }
+        if pretty.contains("(||") {
+            // https://github.com/dtolnay/prettyplease/issues/99
+            return;
+        }
+        let no_paren = pretty.replace(['(', ')'], "");
+        if pretty != no_paren {
+            if let Ok(mut parsed2) = syn::parse_file(&no_paren) {
+                let item = match parsed2.items.as_mut_slice() {
+                    [Item::Const(item)] => item,
+                    _ => unreachable!(),
+                };
+                if original == *item.expr {
+                    fail!("redundant parens: {}", pretty);
+                }
+            }
+        }
+    };
+
+    iter(if cfg!(debug_assertions) { 3 } else { 4 }, &mut assert);
+    if failures > 0 {
+        eprintln!("FAILURES: {failures}");
+        ExitCode::FAILURE
+    } else {
+        ExitCode::SUCCESS
+    }
+}

crates/toml/.android-checksum.json

diff --git a/crates/toml/.android-checksum.json b/crates/toml/.android-checksum.json
index 2fa6ba0..244af8b 100644
--- a/crates/toml/.android-checksum.json
+++ b/crates/toml/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"ed1c18522ca0521813573494f165af5d269b35868ff6340b8826bed5a3e9de5c","Android.bp":"807148b0d8d65b5dc7f1055fbe6b3c1738863e3bda709369636f58a7e5dafc75","Cargo.lock":"e0ebe89b99a999b15f65db29d4729b6e5151ad717a2e248a6b6ca32a94b68d16","Cargo.toml":"1ec6907d38acbff1a663f08c4828d68f69142a044a2c0ba6cc4cd87ccb5444ae","LICENSE":"ca8c108c730bc014297428bf42afe28d87791ecc5e7c6302233ab041bc20815b","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"5fd1c52b74cf5b1f9989a53f3dfb31dae007b7bc54735769863113caf8f2ed22","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"88c1bcea6c3dc175ab2ef2e6b99ba78f98d9470a93f115f4f0da1205ef71428a","cargo_embargo.json":"239d8e8ee49ab8854b0c7e906cc1c6b0f2bdbd081cb19156345a353c69bf93ff","examples/decode.rs":"16df4cdb0d28f075eae95d480fa3bfcf4729b33720d77358133c181ea7b05939","examples/enum_external.rs":"1ccc93149e9157e04e964bb844aaa369aaf6e449208594f2b2df76d885f14be1","examples/toml2json.rs":"aec95608ef2ef5c655404e5ab27918dad3a94a251ab67c8a385a8ac8a3dad488","patches/LICENSE.patch":"67bfc7706d9a957a3b06ec11a323c95eb50826cec49c1749ed0fc3581bef2299","src/de.rs":"1c5bbd16e20d7817fd57b2a75a3b8821c3f18d09b9003ab72098b49ff1463e7b","src/edit.rs":"fa7d7c416425e41ead117721ded65aa202647acced6e4a0d2adb522184242068","src/fmt.rs":"24069082b6fab0cde8516df4e8fd40fdb4d88bda77a5cd7a4b32326a7cb6e99c","src/lib.rs":"98ff092c5c5efdb6de4105c827dc4e2e8cba2b11d925548cc9ba048b736a77fa","src/macros.rs":"8346a51d6490052ed75246d034aaf5b19141c89d35f25ee58014fc21b096e3d5","src/map.rs":"1fc8f234df86a651a88260635a38428c60efd7ab470f80fd58fdb879be7a4a5a","src/ser.rs":"2a96efc34e9d5338321252c3101bced8941015472b521475d11e68fc0d5631c4","src/table.rs":"faa6de32a49afa6dba904e7954d132a7ac14eaf14af2b96d507339c4654c9b53","src/value.rs":"92348270c77aba2a1debdbaaf538751edbd739b2816e5b5a6640248580d29ed4","tests/decoder.rs":"92dd7b7ecb62486ce629f642822dbfe58baa4c9884e80a711e475bc7b73e98e6","tests/decoder_compliance.rs":"a07e99d9d125a460a048d7340ce3c9214ac7d9c93f982c4f827bb0caafb26803","tests/encoder.rs":"1e538845c38f8731474a9b5339c03c1916d421043d622539e43942e2b815e1b0","tests/encoder_compliance.rs":"587f8a8a7faf3f81b6bbef4c6a5ecf723fcea0b82b706db7d3cdb8f251aef804","tests/testsuite/de_errors.rs":"8167099b34ea9fdbc24934dbc56f7c1634798c29108d8e9348524a0e29ac07f9","tests/testsuite/display.rs":"07f35baf286775b08070f3319eaa205368ff495b8d3af06c84a4d1049845273a","tests/testsuite/display_tricky.rs":"39d3c1182376517f575df3897bfdc4c9478d442c3d2ddf49c13a1a90ffedf611","tests/testsuite/enum_external_deserialize.rs":"49cdcebf6aa274745f3f7d6eeb35905d27948339a30d1dabd7d286e929f5ac74","tests/testsuite/float.rs":"c2bfceade5ee18e87bef6e20696b533bff3249441b4d3d2820c54d874542868c","tests/testsuite/formatting.rs":"39796affb2f0d5dc28b536b5eeea7800944e1cbbd1f20ab8a0fb01a9e541e484","tests/testsuite/macros.rs":"d02c01593fb379f42da155cbf26054061328feb485966207ead8329ad93b9552","tests/testsuite/main.rs":"b2b919ee6c39999e014793461677f5e3342f4352cfdccff871ca6e295ce62613","tests/testsuite/pretty.rs":"2a7dac71a9584e783b45444ba16310b4b016f96709bd8e21b04f97f35a9f1106","tests/testsuite/serde.rs":"baa8c35ed0bfaf295b719179dccf39092e1a58622986c594a4ad129e18d6944a","tests/testsuite/spanned.rs":"a064ba02c8e473d950429ad72cbafff62f70def9a01cbf3ada9e6f6266d80c83","tests/testsuite/spanned_impls.rs":"019aedd5e31d72edd1a1697b745f5c2fecf28a71204810a9a74f03b30c5662ac","tests/testsuite/tables_last.rs":"4774c76ed7569f9bc80ad0f84708ebc4f156a8c2c69c1722b155ecefb1fd235d"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"8d998aa2aafc5b97bac79ef3720ca2b3e8721cd907ce4e53ced21043862a9564","Android.bp":"11d60a1dbab17e9a52a211ab4236e1d0ab217aebb39c23537b6e5f707f5c483a","Cargo.lock":"a87a8d00b7e1d43b03ec61b564d77941567fbaa6c7a132c3b583f7681bc39911","Cargo.toml":"0537aaa2e1ea61c9491175c67884623158200fa33403bc7dd2aa92dd64cb7b58","LICENSE":"ca8c108c730bc014297428bf42afe28d87791ecc5e7c6302233ab041bc20815b","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"f4e9e6126788c7568fb074f760737bcba4f1352ae8f6c11a50a4d38892908f59","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"88c1bcea6c3dc175ab2ef2e6b99ba78f98d9470a93f115f4f0da1205ef71428a","cargo_embargo.json":"239d8e8ee49ab8854b0c7e906cc1c6b0f2bdbd081cb19156345a353c69bf93ff","examples/decode.rs":"16df4cdb0d28f075eae95d480fa3bfcf4729b33720d77358133c181ea7b05939","examples/enum_external.rs":"1ccc93149e9157e04e964bb844aaa369aaf6e449208594f2b2df76d885f14be1","examples/toml2json.rs":"7d8b8b1a41a7e6bdab780747c2b827a02279123a0660c692c75d1d8cb1478d81","patches/LICENSE.patch":"67bfc7706d9a957a3b06ec11a323c95eb50826cec49c1749ed0fc3581bef2299","src/de.rs":"c7422c2db6e13e2a6dc76e527a8dffef0c3509076c89a8323ca8e88a0025c05c","src/edit.rs":"fa7d7c416425e41ead117721ded65aa202647acced6e4a0d2adb522184242068","src/fmt.rs":"f2ebad7e60510f9c392f1d018af07e3c5a953106e0e826d9267f801a4de2876c","src/lib.rs":"a848ae0391d55ab2417788215df587a1df4e7504b5d924cc4839ca51951a6ef3","src/macros.rs":"7ca07c3aede6b376e5abc709bbb89dfe4559ae95efec1de0522736342d9d2ea8","src/map.rs":"4edddb4dbd3ab5ed59578ee5871b0b0cd32f3989c3123b64f6705b7990548abb","src/ser.rs":"d127e7d56281a28b919d1fef539a946ead205aa7a4b98087b00fc7e295cb2189","src/table.rs":"faa6de32a49afa6dba904e7954d132a7ac14eaf14af2b96d507339c4654c9b53","src/value.rs":"81466e4b3ac24cb848519da5028cd0526639ff5903b0b0e2db5f7df07d1f48f2","tests/decoder.rs":"04ec9cc023c26e03c4e3b09a45b1f1df5d2db74800558bbd6bdda675a5485af3","tests/decoder_compliance.rs":"a07e99d9d125a460a048d7340ce3c9214ac7d9c93f982c4f827bb0caafb26803","tests/encoder.rs":"8041caf86be24bfa88525aa042da7351c4b5309d7563f0c4a3802ddea32440b2","tests/encoder_compliance.rs":"587f8a8a7faf3f81b6bbef4c6a5ecf723fcea0b82b706db7d3cdb8f251aef804","tests/testsuite/de_errors.rs":"4c1507c90789ed16221183b8a2dadfedcd792496beb87a8559dfa182333fa14d","tests/testsuite/display.rs":"a408a3147cd33151de032f539c503e788815c6877629aaff4155683a19fbf50a","tests/testsuite/display_tricky.rs":"8fd273503b20fee0b647f6d6203db194e921b36dd14e7ea9b66a7932c0c52570","tests/testsuite/enum_external_deserialize.rs":"21db0f2a324b27ca1968f1e6da67323d244e173599c0d98ee5d7a9b63bfb0703","tests/testsuite/float.rs":"c2bfceade5ee18e87bef6e20696b533bff3249441b4d3d2820c54d874542868c","tests/testsuite/formatting.rs":"bde71ab906aa662548410f158a995865f21468568ef7778f101a5d4656f0f147","tests/testsuite/macros.rs":"0e2b6f9f91ae632b8c599fc6ee6d1310cf263c7b3eac45d749fced4d76312814","tests/testsuite/main.rs":"b2b919ee6c39999e014793461677f5e3342f4352cfdccff871ca6e295ce62613","tests/testsuite/pretty.rs":"5f14338143929d733c37e51c98cf9ae69325d23d64e830fc8b34f0e840a4883c","tests/testsuite/serde.rs":"47e86e84fe0b8eb2ca244e6279e9cba5bd1a6d2e1c71fc82aa5d9ce235706f0e","tests/testsuite/spanned.rs":"22601496dc92f9805bd61348bbff7b39e9bf5082b932230c2bb3838e08c8491e","tests/testsuite/spanned_impls.rs":"019aedd5e31d72edd1a1697b745f5c2fecf28a71204810a9a74f03b30c5662ac","tests/testsuite/tables_last.rs":"530915b4b0999eaa711036fc0004ed5fc54f9f441a312de7220507de4f111688"}}
\ No newline at end of file

crates/toml/.cargo-checksum.json

diff --git a/crates/toml/.cargo-checksum.json b/crates/toml/.cargo-checksum.json
index 5cf73e9..94e482f 100644
--- a/crates/toml/.cargo-checksum.json
+++ b/crates/toml/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"e9ac6868f92eaf3b5e08a5aee959fe88371579dfa2cd3b174767a697078ca874","Cargo.toml":"29bd75a7c5312f6925a1d1d23e926d348110f02cbf4d9a71e167b44bcbb4015f","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"a915ead738822da2d74b883c7519d8e558299286bb823e26c7fdece901c3267e","examples/decode.rs":"ebb019364720589b634fa47a3fc4c8ca7ae14c9a6df8c89cd086e421d442cd77","examples/enum_external.rs":"4878e249aa095264c7824fc7b6fd30f9b0ec6891b16fff734a0490d906e1abbe","examples/toml2json.rs":"f69cf930e7e16f57288c27a57de5bf8e4f991abb483114a6c226ac5a3bddef44","src/de.rs":"faf32d0e29f8140c1b62f175dffa3ac4ffbf13034b74222a9c26d0477cd2e2a3","src/edit.rs":"52f1959a6e5c177097372ea04439662262960f2eb41c2b9ef0ce9ce77ed43f60","src/fmt.rs":"eb19258f004a403da7fd310b30c8964bdf5867ecd145bf4fcba708af51cb378f","src/lib.rs":"21982e43114486005dd9a1d31b7e5da425b3fea0e724a437d89fe42d674b4696","src/macros.rs":"a2f320170bfc8e59e5dfda129bb953a15d8efc6b622c3894dce87db541ede413","src/map.rs":"7a1b97ee1a2ab3fa933d24497066191a6760d118e6e4c8ba42cc891e4668c177","src/ser.rs":"f9c91c2f70c42152531143ae231c6130e4ce930c97b378011e5595ea123ff31b","src/table.rs":"7402b17dbb8d956a321af74df6f62b3eed0b7e500b7faa22337633857bf20fa6","src/value.rs":"1fb23e59a61456a3ec5fa1727674b28eb1141e9e056cdeb794ec2647c4a55b71","tests/decoder.rs":"114e708adc1467c03212e52e2ffef42d08233ab74f69c553a6db73ddbb874414","tests/decoder_compliance.rs":"b0ed26b0762d8dfc23532efb724789366ca343f7354a76216b3fb426c6915e5a","tests/encoder.rs":"4c2430ad514fe64e28b89d0bd7ad7d299fbda8df903304ddcda704ce5db20382","tests/encoder_compliance.rs":"eeaa92f9cb4ee008830006e78277dfea9c041bc923a0ef5538d79aeb95f022c0","tests/testsuite/de_errors.rs":"1bc8521181f9fbe884db3313a8e8a044b4a1cf4b8956530a3cc8be9bcb5468f8","tests/testsuite/display.rs":"164de8f7108ce1055159a19884d23f770bd25cf0ead6b23f6ff4340931c7afc5","tests/testsuite/display_tricky.rs":"9806743d670e5cc46ee0ffda3f4c1f8ac63ee1e702250f07b7cd2098750d25d1","tests/testsuite/enum_external_deserialize.rs":"28b4705d904b58a973ef27c6cdc948f8d404105f98a55efa111cce9e7b4b1a67","tests/testsuite/float.rs":"6be604bb11adb315ad01fdf7117db620508d38caedaaea63e777d7ed2e5e4973","tests/testsuite/formatting.rs":"3b279ab1f24ebeb07537764107c42be9a84731ead1a88596785186777aafd1ee","tests/testsuite/macros.rs":"cf99ad3b191b68e044d0b01aa01ae959ed8b98ae466b9b0491bae1939af3832c","tests/testsuite/main.rs":"4e40c82147ccfc7094f2c4795b51b575c7d231a7da75814a08fd8e0c52d93f8b","tests/testsuite/pretty.rs":"e03df1f3ebe5bb98f6cc0888f0c6bcdcdb92c9c7ea2cd5acaa33ca751bf260e7","tests/testsuite/serde.rs":"a292fcdf4f2b9d1cd2d5476db770d8d5a15fdc990c0dada4a02e3515733cb5db","tests/testsuite/spanned.rs":"b7522afd8101ba5dd539118a43bccefef66fedef41926d9515f67590961ac7e3","tests/testsuite/spanned_impls.rs":"666c65679365451f67234d50bb3198ac52418ad7ef1dae6916faba78f92c9d02","tests/testsuite/tables_last.rs":"42271f9df94b28f36b934686d4a5c6196140a2975733d1344b6415cb9f1b92ed"},"package":"9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"}
\ No newline at end of file
+{"files":{"Cargo.lock":"f4b3b23a7222cc98e424c53c8b1c7db2542b4deece22b970b4041d83f5f226c7","Cargo.toml":"aaad74d52b869b6494de6a2ea5b9bda57ae06248a3adb67f2332a8b82758ca6d","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"a915ead738822da2d74b883c7519d8e558299286bb823e26c7fdece901c3267e","examples/decode.rs":"ebb019364720589b634fa47a3fc4c8ca7ae14c9a6df8c89cd086e421d442cd77","examples/enum_external.rs":"4878e249aa095264c7824fc7b6fd30f9b0ec6891b16fff734a0490d906e1abbe","examples/toml2json.rs":"ef8a783e525264faec4e6c6087a37c6310b606119a7a5785548e8981ea129ed2","src/de.rs":"bd3c1b35e5bdc796d1cbff1f2bdd4e6d4c3a4ef9f34c7dcb775ce8236e45b965","src/edit.rs":"52f1959a6e5c177097372ea04439662262960f2eb41c2b9ef0ce9ce77ed43f60","src/fmt.rs":"b6b14bcfaaf6a283d0bdc7b43d9d13c127cf94c9de41efb4a3a9e1eb02bdc799","src/lib.rs":"78c26d36a5c2b888470f8eaacede1841662edf372143b76af0283a1fc1f9f528","src/macros.rs":"a7214ed97b1c15391748a3d5b904b31963130ee19ecd6ed3dc705649737f3b29","src/map.rs":"18a0bf5677441514d0a9dbf29beeaf7f797f95a1ba566d845f2b90e3b14722c8","src/ser.rs":"b5cbb35af51ffb8975306e76df19ea64951bc97a28857d696aaeb2251cdcd93f","src/table.rs":"7402b17dbb8d956a321af74df6f62b3eed0b7e500b7faa22337633857bf20fa6","src/value.rs":"74c0596230bcf88483005a8907f875e32f5eab29d538cd78ad39031919884596","tests/decoder.rs":"3036f5963c8c547dc47121188a8b7ebaacb154025ca641f3281a3881bdcf7605","tests/decoder_compliance.rs":"b0ed26b0762d8dfc23532efb724789366ca343f7354a76216b3fb426c6915e5a","tests/encoder.rs":"06d4325dc35f4fd40571d8ae50fb86c0ca0bb216aa407497950d01097fdbf043","tests/encoder_compliance.rs":"eeaa92f9cb4ee008830006e78277dfea9c041bc923a0ef5538d79aeb95f022c0","tests/testsuite/de_errors.rs":"2ceb148f1f80ac42b88804dae7cca02c724010917570a08f484e5a7ccd922d95","tests/testsuite/display.rs":"1ae6faac1f1a9a53b14ce0c0bd2c16618d0e42afbf6f92d8107ca944c9abac57","tests/testsuite/display_tricky.rs":"e1b5007506e4f52eb73024c889b36f54694e9d955a737cd2e48a99657691fe21","tests/testsuite/enum_external_deserialize.rs":"4136d1c42dd4c255bb4d6b01e4072c6575a3a2f93d8da31aa18b954b321b3aa7","tests/testsuite/float.rs":"6be604bb11adb315ad01fdf7117db620508d38caedaaea63e777d7ed2e5e4973","tests/testsuite/formatting.rs":"58d469e194e34f04e526db62cebd381dd096115d81b98a4dcbe8d801fc250142","tests/testsuite/macros.rs":"31a083541fab24554fce1f8529f047af6f20f25a5ffa3e9a9b115f5a8ef23080","tests/testsuite/main.rs":"4e40c82147ccfc7094f2c4795b51b575c7d231a7da75814a08fd8e0c52d93f8b","tests/testsuite/pretty.rs":"596c42698dcd727d1111689d64bad925b7111c536a7e608c75e7b8d82c26b413","tests/testsuite/serde.rs":"84355f892999dc4105752a8835664b8e696830fe1793d81bad7dcfda745dfa3f","tests/testsuite/spanned.rs":"6008e2c9fd82e4df6f307f88bd1169b1c0413f75d0f3975fcce05ebdd9f6094a","tests/testsuite/spanned_impls.rs":"666c65679365451f67234d50bb3198ac52418ad7ef1dae6916faba78f92c9d02","tests/testsuite/tables_last.rs":"0fdc71c450d6187a2dfc2de84d213eb867db9673f84e655c2322f95615a41a87"},"package":"a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"}
\ No newline at end of file

crates/toml/Android.bp

diff --git a/crates/toml/Android.bp b/crates/toml/Android.bp
index 97ce950..560ad03 100644
--- a/crates/toml/Android.bp
+++ b/crates/toml/Android.bp
@@ -17,7 +17,7 @@
     name: "libtoml",
     crate_name: "toml",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.10",
+    cargo_pkg_version: "0.8.19",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [

crates/toml/Cargo.lock

diff --git a/crates/toml/Cargo.lock b/crates/toml/Cargo.lock
index 1cc97be..84fb9f5 100644
--- a/crates/toml/Cargo.lock
+++ b/crates/toml/Cargo.lock
@@ -4,88 +4,102 @@
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
- "anstyle-wincon",
+ "anstyle-wincon 1.0.2",
  "colorchoice",
  "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
-name = "anstyle"
-version = "1.0.0"
+name = "anstream"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon 3.0.3",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "anstyle-wincon"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
- "memchr",
+ "anstyle",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "cc"
-version = "1.0.73"
+name = "autocfg"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bstr"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+dependencies = [
+ "memchr",
+ "serde",
+]
 
 [[package]]
 name = "cfg-if"
@@ -95,147 +109,112 @@
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
- "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "clap"
-version = "4.0.32"
+version = "4.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
+checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
- "clap_lex",
- "is-terminal",
  "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e"
+dependencies = [
+ "anstream 0.3.2",
+ "anstyle",
+ "clap_lex",
  "strsim",
- "termcolor",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.0.21"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.105",
+ "syn",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "escape8259"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
+ "rustversion",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
 name = "globset"
-version = "0.4.9"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "ignore"
-version = "0.4.18"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
 dependencies = [
- "crossbeam-utils",
  "globset",
  "lazy_static",
  "log",
@@ -268,41 +247,39 @@
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.3"
+name = "is-terminal"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
+ "hermit-abi",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.7"
+name = "is_terminal_polyfill"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "b52b2de84ed0341893ce61ca1af04fa54eea0a764ecc38c6855cc5db84dc1927"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.48.0",
+ "is-terminal",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.3"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "lazy_static"
@@ -312,41 +289,33 @@
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libtest-mimic"
-version = "0.6.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa"
+checksum = "cc0bda45ed5b3a2904262c1bb91e526127aa70e7ef3758aba2ef93cf896b9b58"
 dependencies = [
  "clap",
+ "escape8259",
  "termcolor",
  "threadpool",
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
-
-[[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "normalize-line-endings"
@@ -355,93 +324,65 @@
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.105",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -450,29 +391,21 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
-name = "rustix"
-version = "0.37.7"
+name = "rustversion"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.45.0",
-]
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -485,29 +418,29 @@
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
  "itoa",
  "ryu",
@@ -516,26 +449,26 @@
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "similar"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 
 [[package]]
 name = "snapbox"
-version = "0.4.11"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835"
+checksum = "40e14d10e4c2b4331ac24c33baa5a03e1fbca81c045b285b53b2a612d28569fb"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
  "anstyle",
  "normalize-line-endings",
  "similar",
@@ -544,11 +477,11 @@
 
 [[package]]
 name = "snapbox-macros"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31"
+checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
 ]
 
 [[package]]
@@ -559,20 +492,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "2.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -581,19 +503,20 @@
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
@@ -608,7 +531,7 @@
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.19"
 dependencies = [
  "indexmap",
  "serde",
@@ -623,9 +546,9 @@
 
 [[package]]
 name = "toml-test"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec3892835fb31e181a87e1758275a64b0d7c6c9e9618aeb61a647bd487314c0"
+checksum = "f9e26681e9154ffb40044019b6bb374f6ed7fef1e367d3d314f0daf2b00faba9"
 dependencies = [
  "chrono",
  "ryu",
@@ -635,18 +558,18 @@
 
 [[package]]
 name = "toml-test-data"
-version = "1.8.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b5bad99e813ce8c67d1d67c9b9f37c8451933f45eae0ab2b3583975f1cc15d"
+checksum = "13bb6bf962107303ade738a8f729f4f92c29b2d84c0772cc376f7001602afa1a"
 dependencies = [
  "include_dir",
 ]
 
 [[package]]
 name = "toml-test-harness"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be4b8d761dee51b4694e9f1d622a1d7f9c135a8b8265459e16d09ac5b16a05d"
+checksum = "0ad65271b9325d4727b1afb346e2eb4cade8e998797682da4e73b7b6d902f2b2"
 dependencies = [
  "ignore",
  "libtest-mimic",
@@ -656,18 +579,18 @@
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.0"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8dc77def39ce6079c2d0c866cc20848f591b1898f153c9fe7c4f29e1154510b"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
@@ -678,9 +601,9 @@
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.4"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "utf8parse"
@@ -689,75 +612,22 @@
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -766,128 +636,144 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.5.0"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]

crates/toml/Cargo.toml

diff --git a/crates/toml/Cargo.toml b/crates/toml/Cargo.toml
index 77f028d..796cddf 100644
--- a/crates/toml/Cargo.toml
+++ b/crates/toml/Cargo.toml
@@ -11,10 +11,11 @@
 
 [package]
 edition = "2021"
-rust-version = "1.69"
+rust-version = "1.65"
 name = "toml"
-version = "0.8.10"
+version = "0.8.19"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+build = false
 include = [
     "build.rs",
     "src/**/*",
@@ -26,6 +27,10 @@
     "examples/**/*",
     "tests/**/*",
 ]
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 A native Rust encoder and decoder of TOML-formatted files and streams. Provides
 implementations of the standard Serialize/Deserialize traits for TOML data to
@@ -88,8 +93,13 @@
 [Unreleased]: https://github.com/toml-rs/toml/compare/{{tag_name}}...HEAD"""
 search = "<!-- next-url -->"
 
+[lib]
+name = "toml"
+path = "src/lib.rs"
+
 [[example]]
 name = "decode"
+path = "examples/decode.rs"
 required-features = [
     "parse",
     "display",
@@ -97,6 +107,7 @@
 
 [[example]]
 name = "enum_external"
+path = "examples/enum_external.rs"
 required-features = [
     "parse",
     "display",
@@ -104,19 +115,34 @@
 
 [[example]]
 name = "toml2json"
+path = "examples/toml2json.rs"
 required-features = [
     "parse",
     "display",
 ]
 
 [[test]]
+name = "decoder"
+path = "tests/decoder.rs"
+
+[[test]]
 name = "decoder_compliance"
+path = "tests/decoder_compliance.rs"
 harness = false
 
 [[test]]
+name = "encoder"
+path = "tests/encoder.rs"
+
+[[test]]
 name = "encoder_compliance"
+path = "tests/encoder_compliance.rs"
 harness = false
 
+[[test]]
+name = "testsuite"
+path = "tests/testsuite/main.rs"
+
 [dependencies.indexmap]
 version = "2.0.0"
 optional = true
@@ -125,31 +151,31 @@
 version = "1.0.145"
 
 [dependencies.serde_spanned]
-version = "0.6.5"
+version = "0.6.7"
 features = ["serde"]
 
 [dependencies.toml_datetime]
-version = "0.6.5"
+version = "0.6.8"
 features = ["serde"]
 
 [dependencies.toml_edit]
-version = "0.22.0"
+version = "0.22.20"
 features = ["serde"]
 optional = true
 default-features = false
 
 [dev-dependencies.serde]
-version = "1.0.160"
+version = "1.0.199"
 features = ["derive"]
 
 [dev-dependencies.serde_json]
-version = "1.0.96"
+version = "1.0.116"
 
 [dev-dependencies.snapbox]
-version = "0.4.11"
+version = "0.6.0"
 
 [dev-dependencies.toml-test-data]
-version = "1.8.0"
+version = "1.11.0"
 
 [dev-dependencies.toml-test-harness]
 version = "0.4.8"
@@ -168,3 +194,73 @@
     "toml_edit?/parse",
 ]
 preserve_order = ["indexmap"]
+
+[lints.clippy]
+bool_assert_comparison = "allow"
+branches_sharing_code = "allow"
+checked_conversions = "warn"
+collapsible_else_if = "allow"
+create_dir = "warn"
+dbg_macro = "warn"
+debug_assert_with_mut_call = "warn"
+doc_markdown = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+expl_impl_clone_on_copy = "warn"
+explicit_deref_methods = "warn"
+explicit_into_iter_loop = "warn"
+fallible_impl_from = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+float_cmp_const = "warn"
+fn_params_excessive_bools = "warn"
+from_iter_instead_of_collect = "warn"
+if_same_then_else = "allow"
+implicit_clone = "warn"
+imprecise_flops = "warn"
+inconsistent_struct_constructor = "warn"
+inefficient_to_string = "warn"
+infinite_loop = "warn"
+invalid_upcast_comparisons = "warn"
+large_digit_groups = "warn"
+large_stack_arrays = "warn"
+large_types_passed_by_value = "warn"
+let_and_return = "allow"
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+mem_forget = "warn"
+mutex_integer = "warn"
+needless_continue = "warn"
+needless_for_each = "warn"
+negative_feature_names = "warn"
+path_buf_push_overwrite = "warn"
+ptr_as_ptr = "warn"
+rc_mutex = "warn"
+redundant_feature_names = "warn"
+ref_option_ref = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+same_functions_in_if_condition = "warn"
+self_named_module_files = "warn"
+semicolon_if_nothing_returned = "warn"
+str_to_string = "warn"
+string_add = "warn"
+string_add_assign = "warn"
+string_lit_as_bytes = "warn"
+string_to_string = "warn"
+todo = "warn"
+trait_duplication_in_bounds = "warn"
+verbose_file_reads = "warn"
+wildcard_imports = "warn"
+zero_sized_map_values = "warn"
+
+[lints.rust]
+unreachable_pub = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+unused_lifetimes = "warn"
+unused_macro_rules = "warn"
+unused_qualifications = "warn"
+
+[lints.rust.rust_2018_idioms]
+level = "warn"
+priority = -1

crates/toml/METADATA

diff --git a/crates/toml/METADATA b/crates/toml/METADATA
index 9caed4b..0d6645f 100644
--- a/crates/toml/METADATA
+++ b/crates/toml/METADATA
@@ -1,17 +1,17 @@
 name: "toml"
 description: "()"
 third_party {
-  version: "0.8.10"
+  version: "0.8.19"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 7
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/toml"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/toml/toml-0.8.10.crate"
-    version: "0.8.10"
+    value: "https://static.crates.io/crates/toml/toml-0.8.19.crate"
+    version: "0.8.19"
   }
 }

crates/toml/examples/toml2json.rs

diff --git a/crates/toml/examples/toml2json.rs b/crates/toml/examples/toml2json.rs
index 3660611..56a912c 100644
--- a/crates/toml/examples/toml2json.rs
+++ b/crates/toml/examples/toml2json.rs
@@ -1,7 +1,4 @@
-#![deny(warnings)]
-
 use std::env;
-use std::fs::File;
 use std::io;
 use std::io::prelude::*;
 
@@ -10,15 +7,14 @@
 
 fn main() {
     let mut args = env::args();
-    let mut input = String::new();
-    if args.len() > 1 {
+    let input = if args.len() > 1 {
         let name = args.nth(1).unwrap();
-        File::open(name)
-            .and_then(|mut f| f.read_to_string(&mut input))
-            .unwrap();
+        std::fs::read_to_string(name).unwrap()
     } else {
+        let mut input = String::new();
         io::stdin().read_to_string(&mut input).unwrap();
-    }
+        input
+    };
 
     match input.parse() {
         Ok(toml) => {

crates/toml/src/de.rs

diff --git a/crates/toml/src/de.rs b/crates/toml/src/de.rs
index 9eb4c41..1a0929e 100644
--- a/crates/toml/src/de.rs
+++ b/crates/toml/src/de.rs
@@ -57,7 +57,7 @@
     }
 
     pub(crate) fn add_key(&mut self, key: String) {
-        self.inner.add_key(key)
+        self.inner.add_key(key);
     }
 
     /// What went wrong
@@ -113,10 +113,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let inner = self
-            .input
-            .parse::<toml_edit::de::Deserializer>()
-            .map_err(Error::new)?;
+        let inner = toml_edit::de::Deserializer::parse(self.input).map_err(Error::new)?;
         inner.deserialize_any(visitor).map_err(Error::new)
     }
 
@@ -126,10 +123,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let inner = self
-            .input
-            .parse::<toml_edit::de::Deserializer>()
-            .map_err(Error::new)?;
+        let inner = toml_edit::de::Deserializer::parse(self.input).map_err(Error::new)?;
         inner.deserialize_option(visitor).map_err(Error::new)
     }
 
@@ -141,10 +135,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let inner = self
-            .input
-            .parse::<toml_edit::de::Deserializer>()
-            .map_err(Error::new)?;
+        let inner = toml_edit::de::Deserializer::parse(self.input).map_err(Error::new)?;
         inner
             .deserialize_newtype_struct(name, visitor)
             .map_err(Error::new)
@@ -159,10 +150,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let inner = self
-            .input
-            .parse::<toml_edit::de::Deserializer>()
-            .map_err(Error::new)?;
+        let inner = toml_edit::de::Deserializer::parse(self.input).map_err(Error::new)?;
         inner
             .deserialize_struct(name, fields, visitor)
             .map_err(Error::new)
@@ -178,10 +166,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let inner = self
-            .input
-            .parse::<toml_edit::de::Deserializer>()
-            .map_err(Error::new)?;
+        let inner = toml_edit::de::Deserializer::parse(self.input).map_err(Error::new)?;
         inner
             .deserialize_enum(name, variants, visitor)
             .map_err(Error::new)

crates/toml/src/fmt.rs

diff --git a/crates/toml/src/fmt.rs b/crates/toml/src/fmt.rs
index 281cb59..650ba4d 100644
--- a/crates/toml/src/fmt.rs
+++ b/crates/toml/src/fmt.rs
@@ -5,7 +5,7 @@
 }
 
 impl toml_edit::visit_mut::VisitMut for DocumentFormatter {
-    fn visit_document_mut(&mut self, node: &mut toml_edit::Document) {
+    fn visit_document_mut(&mut self, node: &mut toml_edit::DocumentMut) {
         toml_edit::visit_mut::visit_document_mut(self, node);
     }
 

crates/toml/src/lib.rs

diff --git a/crates/toml/src/lib.rs b/crates/toml/src/lib.rs
index 61e6a4c..276e617 100644
--- a/crates/toml/src/lib.rs
+++ b/crates/toml/src/lib.rs
@@ -5,8 +5,6 @@
 //! ```toml
 //! [package]
 //! name = "toml"
-//! version = "0.4.2"
-//! authors = ["Alex Crichton <alex@alexcrichton.com>"]
 //!
 //! [dependencies]
 //! serde = "1.0"
@@ -140,14 +138,15 @@
 //! [`serde`]: https://serde.rs/
 //! [serde]: https://serde.rs/
 
-#![deny(missing_docs)]
-#![warn(rust_2018_idioms)]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 // Makes rustc abort compilation if there are any unsafe blocks in the crate.
 // Presence of this annotation is picked up by tools such as cargo-geiger
 // and lets them ensure that there is indeed no unsafe code as opposed to
 // something they couldn't detect (e.g. unsafe added via macro expansion, etc).
 #![forbid(unsafe_code)]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![warn(missing_docs)]
+#![warn(clippy::print_stderr)]
+#![warn(clippy::print_stdout)]
 
 pub mod map;
 pub mod value;

crates/toml/src/macros.rs

diff --git a/crates/toml/src/macros.rs b/crates/toml/src/macros.rs
index a295970..d993ca9 100644
--- a/crates/toml/src/macros.rs
+++ b/crates/toml/src/macros.rs
@@ -8,11 +8,6 @@
 /// let cargo_toml = toml::toml! {
 ///     [package]
 ///     name = "toml"
-///     version = "0.4.5"
-///     authors = ["Alex Crichton <alex@alexcrichton.com>"]
-///
-///     [badges]
-///     travis-ci = { repository = "alexcrichton/toml-rs" }
 ///
 ///     [dependencies]
 ///     serde = "1.0"

crates/toml/src/map.rs

diff --git a/crates/toml/src/map.rs b/crates/toml/src/map.rs
index bd720a7..f7d5c38 100644
--- a/crates/toml/src/map.rs
+++ b/crates/toml/src/map.rs
@@ -70,7 +70,7 @@
     /// Clears the map, removing all values.
     #[inline]
     pub fn clear(&mut self) {
-        self.map.clear()
+        self.map.clear();
     }
 
     /// Returns a reference to the value corresponding to the key.
@@ -78,10 +78,10 @@
     /// The key may be any borrowed form of the map's key type, but the ordering
     /// on the borrowed form *must* match the ordering on the key type.
     #[inline]
-    pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&Value>
+    pub fn get<Q>(&self, key: &Q) -> Option<&Value>
     where
         String: Borrow<Q>,
-        Q: Ord + Eq + Hash,
+        Q: Ord + Eq + Hash + ?Sized,
     {
         self.map.get(key)
     }
@@ -91,10 +91,10 @@
     /// The key may be any borrowed form of the map's key type, but the ordering
     /// on the borrowed form *must* match the ordering on the key type.
     #[inline]
-    pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
+    pub fn contains_key<Q>(&self, key: &Q) -> bool
     where
         String: Borrow<Q>,
-        Q: Ord + Eq + Hash,
+        Q: Ord + Eq + Hash + ?Sized,
     {
         self.map.contains_key(key)
     }
@@ -104,10 +104,10 @@
     /// The key may be any borrowed form of the map's key type, but the ordering
     /// on the borrowed form *must* match the ordering on the key type.
     #[inline]
-    pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut Value>
+    pub fn get_mut<Q>(&mut self, key: &Q) -> Option<&mut Value>
     where
         String: Borrow<Q>,
-        Q: Ord + Eq + Hash,
+        Q: Ord + Eq + Hash + ?Sized,
     {
         self.map.get_mut(key)
     }
@@ -130,10 +130,10 @@
     /// The key may be any borrowed form of the map's key type, but the ordering
     /// on the borrowed form *must* match the ordering on the key type.
     #[inline]
-    pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<Value>
+    pub fn remove<Q>(&mut self, key: &Q) -> Option<Value>
     where
         String: Borrow<Q>,
-        Q: Ord + Eq + Hash,
+        Q: Ord + Eq + Hash + ?Sized,
     {
         self.map.remove(key)
     }
@@ -241,10 +241,10 @@
 
 /// Access an element of this map. Panics if the given key is not present in the
 /// map.
-impl<'a, Q: ?Sized> ops::Index<&'a Q> for Map<String, Value>
+impl<'a, Q> ops::Index<&'a Q> for Map<String, Value>
 where
     String: Borrow<Q>,
-    Q: Ord + Eq + Hash,
+    Q: Ord + Eq + Hash + ?Sized,
 {
     type Output = Value;
 
@@ -255,10 +255,10 @@
 
 /// Mutably access an element of this map. Panics if the given key is not
 /// present in the map.
-impl<'a, Q: ?Sized> ops::IndexMut<&'a Q> for Map<String, Value>
+impl<'a, Q> ops::IndexMut<&'a Q> for Map<String, Value>
 where
     String: Borrow<Q>,
-    Q: Ord + Eq + Hash,
+    Q: Ord + Eq + Hash + ?Sized,
 {
     fn index_mut(&mut self, index: &Q) -> &mut Value {
         self.map.get_mut(index).expect("no entry found for key")
@@ -452,13 +452,13 @@
 
 impl<'a> VacantEntry<'a> {
     /// Gets a reference to the key that would be used when inserting a value
-    /// through the VacantEntry.
+    /// through the `VacantEntry`.
     #[inline]
     pub fn key(&self) -> &String {
         self.vacant.key()
     }
 
-    /// Sets the value of the entry with the VacantEntry's key, and returns a
+    /// Sets the value of the entry with the `VacantEntry`'s key, and returns a
     /// mutable reference to it.
     #[inline]
     pub fn insert(self, value: Value) -> &'a mut Value {
@@ -518,7 +518,7 @@
     }
 }
 
-/// An iterator over a toml::Map's entries.
+/// An iterator over a `toml::Map`'s entries.
 pub struct Iter<'a> {
     iter: IterImpl<'a>,
 }
@@ -543,7 +543,7 @@
     }
 }
 
-/// A mutable iterator over a toml::Map's entries.
+/// A mutable iterator over a `toml::Map`'s entries.
 pub struct IterMut<'a> {
     iter: IterMutImpl<'a>,
 }
@@ -568,7 +568,7 @@
     }
 }
 
-/// An owning iterator over a toml::Map's entries.
+/// An owning iterator over a `toml::Map`'s entries.
 pub struct IntoIter {
     iter: IntoIterImpl,
 }
@@ -582,7 +582,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-/// An iterator over a toml::Map's keys.
+/// An iterator over a `toml::Map`'s keys.
 pub struct Keys<'a> {
     iter: KeysImpl<'a>,
 }
@@ -596,7 +596,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-/// An iterator over a toml::Map's values.
+/// An iterator over a `toml::Map`'s values.
 pub struct Values<'a> {
     iter: ValuesImpl<'a>,
 }

crates/toml/src/ser.rs

diff --git a/crates/toml/src/ser.rs b/crates/toml/src/ser.rs
index f1ab24b..b64271a 100644
--- a/crates/toml/src/ser.rs
+++ b/crates/toml/src/ser.rs
@@ -43,9 +43,9 @@
 /// println!("{}", toml)
 /// ```
 #[cfg(feature = "display")]
-pub fn to_string<T: ?Sized>(value: &T) -> Result<String, Error>
+pub fn to_string<T>(value: &T) -> Result<String, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     let mut output = String::new();
     let serializer = Serializer::new(&mut output);
@@ -61,11 +61,11 @@
 /// To serialize TOML values, instead of documents, see [`ValueSerializer`].
 ///
 /// For greater customization, instead serialize to a
-/// [`toml_edit::Document`](https://docs.rs/toml_edit/latest/toml_edit/struct.Document.html).
+/// [`toml_edit::DocumentMut`](https://docs.rs/toml_edit/latest/toml_edit/struct.DocumentMut.html).
 #[cfg(feature = "display")]
-pub fn to_string_pretty<T: ?Sized>(value: &T) -> Result<String, Error>
+pub fn to_string_pretty<T>(value: &T) -> Result<String, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     let mut output = String::new();
     let serializer = Serializer::pretty(&mut output);
@@ -161,7 +161,7 @@
     /// Apply a default "pretty" policy to the document
     ///
     /// For greater customization, instead serialize to a
-    /// [`toml_edit::Document`](https://docs.rs/toml_edit/latest/toml_edit/struct.Document.html).
+    /// [`toml_edit::DocumentMut`](https://docs.rs/toml_edit/latest/toml_edit/struct.DocumentMut.html).
     pub fn pretty(dst: &'d mut String) -> Self {
         let mut ser = Serializer::new(dst);
         ser.settings.multiline_array = true;
@@ -301,9 +301,9 @@
         )
     }
 
-    fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_document(
             self.dst,
@@ -345,13 +345,9 @@
         )
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
-        self,
-        name: &'static str,
-        v: &T,
-    ) -> Result<Self::Ok, Self::Error>
+    fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_document(
             self.dst,
@@ -360,7 +356,7 @@
         )
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         name: &'static str,
         variant_index: u32,
@@ -368,7 +364,7 @@
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_document(
             self.dst,
@@ -617,9 +613,9 @@
         )
     }
 
-    fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_value(
             self.dst,
@@ -657,13 +653,9 @@
         )
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
-        self,
-        name: &'static str,
-        v: &T,
-    ) -> Result<Self::Ok, Self::Error>
+    fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_value(
             self.dst,
@@ -671,7 +663,7 @@
         )
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         name: &'static str,
         variant_index: u32,
@@ -679,7 +671,7 @@
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         write_value(
             self.dst,
@@ -750,11 +742,14 @@
 }
 
 #[cfg(feature = "display")]
-use internal::*;
+use internal::{
+    write_document, write_value, SerializeDocumentArray, SerializeDocumentTable,
+    SerializeValueArray, SerializeValueTable,
+};
 
 #[cfg(feature = "display")]
 mod internal {
-    use super::*;
+    use super::{Error, Serializer, ValueSerializer};
 
     use crate::fmt::DocumentFormatter;
 
@@ -782,9 +777,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_element(value).map_err(Error::wrap)
         }
@@ -798,9 +793,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_element(value).map_err(Error::wrap)
         }
@@ -814,9 +809,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(value).map_err(Error::wrap)
         }
@@ -830,9 +825,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(value).map_err(Error::wrap)
         }
@@ -866,16 +861,16 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
+        fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_key(input).map_err(Error::wrap)
         }
 
-        fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+        fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_value(value).map_err(Error::wrap)
         }
@@ -889,13 +884,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(
-            &mut self,
-            key: &'static str,
-            value: &T,
-        ) -> Result<(), Self::Error>
+        fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(key, value).map_err(Error::wrap)
         }
@@ -911,6 +902,7 @@
         value: Result<toml_edit::Value, crate::edit::ser::Error>,
     ) -> Result<(), Error> {
         use std::fmt::Write;
+        use toml_edit::visit_mut::VisitMut as _;
 
         let value = value.map_err(Error::wrap)?;
         let mut table = match toml_edit::Item::Value(value).into_table() {
@@ -920,10 +912,9 @@
             }
         };
 
-        use toml_edit::visit_mut::VisitMut as _;
         settings.visit_table_mut(&mut table);
 
-        let doc: toml_edit::Document = table.into();
+        let doc: toml_edit::DocumentMut = table.into();
         write!(dst, "{}", doc).unwrap();
 
         Ok(())
@@ -951,9 +942,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_element(value).map_err(Error::wrap)
         }
@@ -967,9 +958,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_element(value).map_err(Error::wrap)
         }
@@ -983,9 +974,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(value).map_err(Error::wrap)
         }
@@ -999,9 +990,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(value).map_err(Error::wrap)
         }
@@ -1033,16 +1024,16 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
+        fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_key(input).map_err(Error::wrap)
         }
 
-        fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+        fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_value(value).map_err(Error::wrap)
         }
@@ -1056,13 +1047,9 @@
         type Ok = ();
         type Error = Error;
 
-        fn serialize_field<T: ?Sized>(
-            &mut self,
-            key: &'static str,
-            value: &T,
-        ) -> Result<(), Self::Error>
+        fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
         where
-            T: serde::ser::Serialize,
+            T: serde::ser::Serialize + ?Sized,
         {
             self.inner.serialize_field(key, value).map_err(Error::wrap)
         }

crates/toml/src/value.rs

diff --git a/crates/toml/src/value.rs b/crates/toml/src/value.rs
index e6f832a..c689b38 100644
--- a/crates/toml/src/value.rs
+++ b/crates/toml/src/value.rs
@@ -248,7 +248,7 @@
 impl<'a> From<&'a str> for Value {
     #[inline]
     fn from(val: &'a str) -> Value {
-        Value::String(val.to_string())
+        Value::String(val.to_owned())
     }
 }
 
@@ -362,9 +362,9 @@
     }
 }
 
-impl<'s, T: ?Sized> Index for &'s T
+impl<'s, T> Index for &'s T
 where
-    T: Index,
+    T: Index + ?Sized,
 {
     fn index<'a>(&self, val: &'a Value) -> Option<&'a Value> {
         (**self).index(val)
@@ -465,7 +465,7 @@
             }
 
             fn visit_u64<E: de::Error>(self, value: u64) -> Result<Value, E> {
-                if value <= i64::max_value() as u64 {
+                if i64::try_from(value).is_ok() {
                     Ok(Value::Integer(value as i64))
                 } else {
                     Err(de::Error::custom("u64 value was too large"))
@@ -733,7 +733,7 @@
 
     fn variant_seed<V>(mut self, seed: V) -> Result<(V::Value, Self::Variant), Self::Error>
     where
-        V: serde::de::DeserializeSeed<'de>,
+        V: de::DeserializeSeed<'de>,
     {
         use de::Error;
         let (key, value) = match self.iter.next() {
@@ -764,7 +764,7 @@
     }
 }
 
-impl<'de> serde::de::VariantAccess<'de> for MapEnumDeserializer {
+impl<'de> de::VariantAccess<'de> for MapEnumDeserializer {
     type Error = crate::de::Error;
 
     fn unit_variant(self) -> Result<(), Self::Error> {
@@ -793,20 +793,20 @@
 
     fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value, Self::Error>
     where
-        T: serde::de::DeserializeSeed<'de>,
+        T: de::DeserializeSeed<'de>,
     {
         seed.deserialize(self.value.into_deserializer())
     }
 
     fn tuple_variant<V>(self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
     where
-        V: serde::de::Visitor<'de>,
+        V: de::Visitor<'de>,
     {
         use de::Error;
         match self.value {
             Value::Array(values) => {
                 if values.len() == len {
-                    serde::de::Deserializer::deserialize_seq(values.into_deserializer(), visitor)
+                    de::Deserializer::deserialize_seq(values.into_deserializer(), visitor)
                 } else {
                     Err(Error::custom(format!("expected tuple with length {}", len)))
                 }
@@ -826,10 +826,7 @@
                 let tuple_values = tuple_values?;
 
                 if tuple_values.len() == len {
-                    serde::de::Deserializer::deserialize_seq(
-                        tuple_values.into_deserializer(),
-                        visitor,
-                    )
+                    de::Deserializer::deserialize_seq(tuple_values.into_deserializer(), visitor)
                 } else {
                     Err(Error::custom(format!("expected tuple with length {}", len)))
                 }
@@ -847,9 +844,9 @@
         visitor: V,
     ) -> Result<V::Value, Self::Error>
     where
-        V: serde::de::Visitor<'de>,
+        V: de::Visitor<'de>,
     {
-        serde::de::Deserializer::deserialize_struct(
+        de::Deserializer::deserialize_struct(
             self.value.into_deserializer(),
             "", // TODO: this should be the variant name
             fields,
@@ -858,7 +855,7 @@
     }
 }
 
-impl<'de> de::IntoDeserializer<'de, crate::de::Error> for Value {
+impl<'de> IntoDeserializer<'de, crate::de::Error> for Value {
     type Deserializer = Self;
 
     fn into_deserializer(self) -> Self {
@@ -913,7 +910,7 @@
     }
 
     fn serialize_u64(self, value: u64) -> Result<Value, crate::ser::Error> {
-        if value <= i64::max_value() as u64 {
+        if i64::try_from(value).is_ok() {
             self.serialize_i64(value as i64)
         } else {
             Err(ser::Error::custom("u64 value was too large"))
@@ -964,18 +961,18 @@
         self.serialize_str(_variant)
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         value: &T,
     ) -> Result<Value, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -983,7 +980,7 @@
         value: &T,
     ) -> Result<Value, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         let value = value.serialize(ValueSerializer)?;
         let mut table = Table::new();
@@ -995,9 +992,9 @@
         Err(crate::ser::Error::unsupported_none())
     }
 
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Value, crate::ser::Error>
+    fn serialize_some<T>(self, value: &T) -> Result<Value, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
@@ -1145,18 +1142,18 @@
         Err(crate::ser::Error::unsupported_type(Some(name)))
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         value: &T,
     ) -> Result<Table, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -1164,7 +1161,7 @@
         value: &T,
     ) -> Result<Table, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         let value = value.serialize(ValueSerializer)?;
         let mut table = Table::new();
@@ -1176,9 +1173,9 @@
         Err(crate::ser::Error::unsupported_none())
     }
 
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Table, crate::ser::Error>
+    fn serialize_some<T>(self, value: &T) -> Result<Table, crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
@@ -1243,9 +1240,9 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         self.vec.push(Value::try_from(value)?);
         Ok(())
@@ -1260,9 +1257,9 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         ser::SerializeSeq::serialize_element(self, value)
     }
@@ -1276,9 +1273,9 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         ser::SerializeSeq::serialize_element(self, value)
     }
@@ -1292,9 +1289,9 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         ser::SerializeSeq::serialize_element(self, value)
     }
@@ -1313,9 +1310,9 @@
     type Ok = Table;
     type Error = crate::ser::Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), crate::ser::Error>
+    fn serialize_key<T>(&mut self, key: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         match Value::try_from(key)? {
             Value::String(s) => self.next_key = Some(s),
@@ -1324,9 +1321,9 @@
         Ok(())
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_value<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         let key = self.next_key.take();
         let key = key.expect("serialize_value called before serialize_key");
@@ -1351,13 +1348,9 @@
     type Ok = Table;
     type Error = crate::ser::Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), crate::ser::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         ser::SerializeMap::serialize_key(self, key)?;
         ser::SerializeMap::serialize_value(self, value)
@@ -1376,16 +1369,16 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), crate::ser::Error>
+    fn serialize_key<T>(&mut self, key: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         self.ser.serialize_key(key)
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), crate::ser::Error>
+    fn serialize_value<T>(&mut self, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         self.ser.serialize_value(value)
     }
@@ -1399,13 +1392,9 @@
     type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), crate::ser::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), crate::ser::Error>
     where
-        T: ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
         ser::SerializeMap::serialize_key(self, key)?;
         ser::SerializeMap::serialize_value(self, value)
@@ -1496,40 +1485,40 @@
     }
 }
 
-impl serde::ser::SerializeTupleVariant for ValueSerializeVariant<ValueSerializeVec> {
-    type Ok = crate::Value;
+impl ser::SerializeTupleVariant for ValueSerializeVariant<ValueSerializeVec> {
+    type Ok = Value;
     type Error = crate::ser::Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: ser::Serialize + ?Sized,
     {
-        serde::ser::SerializeSeq::serialize_element(&mut self.inner, value)
+        ser::SerializeSeq::serialize_element(&mut self.inner, value)
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let inner = serde::ser::SerializeSeq::end(self.inner)?;
+        let inner = ser::SerializeSeq::end(self.inner)?;
         let mut table = Table::new();
         table.insert(self.variant.to_owned(), inner);
         Ok(Value::Table(table))
     }
 }
 
-impl serde::ser::SerializeStructVariant for ValueSerializeVariant<ValueSerializeMap> {
-    type Ok = crate::Value;
+impl ser::SerializeStructVariant for ValueSerializeVariant<ValueSerializeMap> {
+    type Ok = Value;
     type Error = crate::ser::Error;
 
     #[inline]
     fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize + ?Sized,
+        T: ser::Serialize + ?Sized,
     {
-        serde::ser::SerializeStruct::serialize_field(&mut self.inner, key, value)
+        ser::SerializeStruct::serialize_field(&mut self.inner, key, value)
     }
 
     #[inline]
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let inner = serde::ser::SerializeStruct::end(self.inner)?;
+        let inner = ser::SerializeStruct::end(self.inner)?;
         let mut table = Table::new();
         table.insert(self.variant.to_owned(), inner);
         Ok(Value::Table(table))

crates/toml/tests/decoder.rs

diff --git a/crates/toml/tests/decoder.rs b/crates/toml/tests/decoder.rs
index 5af906f..399c1dd 100644
--- a/crates/toml/tests/decoder.rs
+++ b/crates/toml/tests/decoder.rs
@@ -1,7 +1,8 @@
 #![cfg(all(feature = "parse", feature = "display"))]
+#![allow(dead_code)]
 
 #[derive(Copy, Clone)]
-pub struct Decoder;
+pub(crate) struct Decoder;
 
 impl toml_test_harness::Decoder for Decoder {
     fn name(&self) -> &str {

crates/toml/tests/encoder.rs

diff --git a/crates/toml/tests/encoder.rs b/crates/toml/tests/encoder.rs
index e76a74a..2f7ceae 100644
--- a/crates/toml/tests/encoder.rs
+++ b/crates/toml/tests/encoder.rs
@@ -1,7 +1,8 @@
 #![cfg(all(feature = "parse", feature = "display"))]
+#![allow(dead_code)]
 
 #[derive(Copy, Clone)]
-pub struct Encoder;
+pub(crate) struct Encoder;
 
 impl toml_test_harness::Encoder for Encoder {
     fn name(&self) -> &str {

crates/toml/tests/testsuite/de_errors.rs

diff --git a/crates/toml/tests/testsuite/de_errors.rs b/crates/toml/tests/testsuite/de_errors.rs
index b3630bd..3600f98 100644
--- a/crates/toml/tests/testsuite/de_errors.rs
+++ b/crates/toml/tests/testsuite/de_errors.rs
@@ -1,11 +1,15 @@
-use serde::{de, Deserialize};
 use std::fmt;
 
+use serde::{de, Deserialize};
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
+
 macro_rules! bad {
     ($toml:expr, $ty:ty, $msg:expr) => {
         match toml::from_str::<$ty>($toml) {
             Ok(s) => panic!("parsed to: {:#?}", s),
-            Err(e) => snapbox::assert_eq($msg, e.to_string()),
+            Err(e) => assert_data_eq!(e.to_string(), $msg.raw()),
         }
     };
 }
@@ -29,7 +33,7 @@
     Uppercase(String),
 }
 
-impl<'de> de::Deserialize<'de> for CasedString {
+impl<'de> Deserialize<'de> for CasedString {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: de::Deserializer<'de>,
@@ -39,7 +43,7 @@
         impl<'de> de::Visitor<'de> for CasedStringVisitor {
             type Value = CasedString;
 
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
                 formatter.write_str("a string")
             }
 
@@ -50,9 +54,9 @@
                 if s.is_empty() {
                     Err(de::Error::invalid_length(0, &"a non-empty string"))
                 } else if s.chars().all(|x| x.is_ascii_lowercase()) {
-                    Ok(CasedString::Lowercase(s.to_string()))
+                    Ok(CasedString::Lowercase(s.to_owned()))
                 } else if s.chars().all(|x| x.is_ascii_uppercase()) {
-                    Ok(CasedString::Uppercase(s.to_string()))
+                    Ok(CasedString::Uppercase(s.to_owned()))
                 } else {
                     Err(de::Error::invalid_value(
                         de::Unexpected::Str(s),
@@ -83,13 +87,14 @@
                 # ^
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 2, column 19
   |
 2 |             p_a = ''
   |                   ^^
 invalid length 0, expected a non-empty string
-"
+
+"#]]
     );
 
     // Missing field in table.
@@ -99,13 +104,14 @@
           # ^
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 1, column 1
   |
 1 | 
   | ^
 missing field `p_b`
-"
+
+"#]]
     );
 
     // Invalid type in p_b.
@@ -116,13 +122,14 @@
                 # ^
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 3, column 19
   |
 3 |             p_b = 1
   |                   ^
 invalid type: integer `1`, expected a sequence
-"
+
+"#]]
     );
 
     // Sub-table in Vec is missing a field.
@@ -135,13 +142,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 17
   |
 4 |                 {c_a = 'a'}
   |                 ^^^^^^^^^^^
 missing field `c_b`
-"
+
+"#]]
     );
 
     // Sub-table in Vec has a field with a bad value.
@@ -154,13 +162,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 35
   |
 4 |                 {c_a = 'a', c_b = '*'}
   |                                   ^^^
-invalid value: string \"*\", expected all lowercase or all uppercase
-"
+invalid value: string "*", expected all lowercase or all uppercase
+
+"#]]
     );
 
     // Sub-table in Vec is missing a field.
@@ -174,13 +183,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 17
   |
 5 |                 {c_a = 'aa'}
   |                 ^^^^^^^^^^^^
 missing field `c_b`
-"
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec is missing a field.
@@ -195,13 +205,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 17
   |
 5 |                 {c_a = 'aa'},
   |                 ^^^^^^^^^^^^
 missing field `c_b`
-"
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec has a field with a bad value.
@@ -216,13 +227,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 36
   |
 5 |                 {c_a = 'aa', c_b = 1},
   |                                    ^
 invalid type: integer `1`, expected a string
-"
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec has an extra field.
@@ -238,13 +250,14 @@
             ]
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 42
   |
 5 |                 {c_a = 'aa', c_b = 'bb', c_d = 'd'},
   |                                          ^^^
 unknown field `c_d`, expected `c_a` or `c_b`
-"
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec is missing a field.
@@ -267,13 +280,14 @@
             c_b = 'bbbb'
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 6, column 13
   |
 6 |             [[p_b]]
-  |             ^^^^^^^^^^^^^^^^^^^
+  |             ^^^^^^^
 missing field `c_b`
-"
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec has a field with a bad value.
@@ -292,13 +306,14 @@
             c_b = 'bbb'
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 8, column 19
   |
 8 |             c_b = '*'
   |                   ^^^
-invalid value: string \"*\", expected all lowercase or all uppercase
-"
+invalid value: string "*", expected all lowercase or all uppercase
+
+"#]]
     );
 
     // Sub-table in the middle of a Vec has an extra field.
@@ -320,13 +335,14 @@
             c_b = 'bbbb'
         ",
         Parent<CasedString>,
-        "\
+        str![[r#"
 TOML parse error at line 8, column 13
   |
 8 |             c_d = 'dd' # unknown field
   |             ^^^
 unknown field `c_d`, expected `c_a` or `c_b`
-"
+
+"#]]
     );
 }
 
@@ -338,13 +354,14 @@
           # ^
         ",
         Parent<String>,
-        "\
+        str![[r#"
 TOML parse error at line 1, column 1
   |
 1 | 
   | ^
 missing field `p_b`
-"
+
+"#]]
     );
 
     bad!(
@@ -356,13 +373,14 @@
             ]
         ",
         Parent<String>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 17
   |
 4 |                 {c_a = ''}
   |                 ^^^^^^^^^^
 missing field `c_b`
-"
+
+"#]]
     );
 
     bad!(
@@ -374,13 +392,14 @@
             ]
         ",
         Parent<String>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 34
   |
 4 |                 {c_a = '', c_b = 1}
   |                                  ^
 invalid type: integer `1`, expected a string
-"
+
+"#]]
     );
 
     // FIXME: This location could be better.
@@ -393,13 +412,14 @@
             ]
         ",
         Parent<String>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 38
   |
 4 |                 {c_a = '', c_b = '', c_d = ''},
   |                                      ^^^
 unknown field `c_d`, expected `c_a` or `c_b`
-"
+
+"#]]
     );
 
     bad!(
@@ -411,13 +431,14 @@
             ]
         ",
         Parent<String>,
-        "\
+        str![[r#"
 TOML parse error at line 4, column 34
   |
 4 |                 {c_a = '', c_b = 1, c_d = ''},
   |                                  ^
 invalid type: integer `1`, expected a string
-"
+
+"#]]
     );
 }
 
@@ -431,13 +452,14 @@
          a = 2\r\n\
          ",
         toml::Value,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 1
   |
 5 | a = 2
   | ^
 duplicate key `a` in table `t2`
-"
+
+"#]]
     );
 
     // Should be the same as above.
@@ -449,12 +471,13 @@
          a = 2\n\
          ",
         toml::Value,
-        "\
+        str![[r#"
 TOML parse error at line 5, column 1
   |
 5 | a = 2
   | ^
 duplicate key `a` in table `t2`
-"
+
+"#]]
     );
 }

crates/toml/tests/testsuite/display.rs

diff --git a/crates/toml/tests/testsuite/display.rs b/crates/toml/tests/testsuite/display.rs
index 7430fac..a0e0cff 100644
--- a/crates/toml/tests/testsuite/display.rs
+++ b/crates/toml/tests/testsuite/display.rs
@@ -3,13 +3,13 @@
 
 macro_rules! map( ($($k:expr => $v:expr),*) => ({
     let mut _m = Map::new();
-    $(_m.insert($k.to_string(), $v);)*
+    $(_m.insert($k.to_owned(), $v);)*
     _m
 }) );
 
 #[test]
 fn simple_show() {
-    assert_eq!(String("foo".to_string()).to_string(), "\"foo\"");
+    assert_eq!(String("foo".to_owned()).to_string(), "\"foo\"");
     assert_eq!(Integer(10).to_string(), "10");
     assert_eq!(Float(10.0).to_string(), "10.0");
     assert_eq!(Float(2.4).to_string(), "2.4");
@@ -32,7 +32,7 @@
         map! {
              "test" => Integer(2),
              "test2" => Table(map! {
-                 "test" => String("wut".to_string())
+                 "test" => String("wut".to_owned())
              })
         }
         .to_string(),
@@ -45,7 +45,7 @@
         map! {
              "test" => Integer(2),
              "test2" => Table(map! {
-                 "test" => String("wut".to_string())
+                 "test" => String("wut".to_owned())
              })
         }
         .to_string(),
@@ -58,7 +58,7 @@
         map! {
              "test" => Integer(2),
              "test2" => Array(vec![Table(map! {
-                 "test" => String("wut".to_string())
+                 "test" => String("wut".to_owned())
              })])
         }
         .to_string(),
@@ -75,7 +75,7 @@
         }
         .to_string(),
         "\"foo.bar\" = 2\n\
-         \"foo\\\"bar\" = 2\n"
+         'foo\"bar' = 2\n"
     );
     assert_eq!(
         map! {
@@ -94,7 +94,7 @@
         "test" => Integer(2),
         "test2" => Array(vec![Table(map! {
             "test" => Array(vec![Array(vec![Integer(2), Integer(3)]),
-            Array(vec![String("foo".to_string()), String("bar".to_string())])])
+            Array(vec![String("foo".to_owned()), String("bar".to_owned())])])
         })])
     };
     assert_eq!(

crates/toml/tests/testsuite/display_tricky.rs

diff --git a/crates/toml/tests/testsuite/display_tricky.rs b/crates/toml/tests/testsuite/display_tricky.rs
index 379ae91..a75e00e 100644
--- a/crates/toml/tests/testsuite/display_tricky.rs
+++ b/crates/toml/tests/testsuite/display_tricky.rs
@@ -2,25 +2,25 @@
 use serde::Serialize;
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct Recipe {
-    pub name: String,
-    pub description: Option<String>,
+pub(crate) struct Recipe {
+    pub(crate) name: String,
+    pub(crate) description: Option<String>,
     #[serde(default)]
-    pub modules: Vec<Modules>,
+    pub(crate) modules: Vec<Modules>,
     #[serde(default)]
-    pub packages: Vec<Packages>,
+    pub(crate) packages: Vec<Packages>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct Modules {
-    pub name: String,
-    pub version: Option<String>,
+pub(crate) struct Modules {
+    pub(crate) name: String,
+    pub(crate) version: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct Packages {
-    pub name: String,
-    pub version: Option<String>,
+pub(crate) struct Packages {
+    pub(crate) name: String,
+    pub(crate) version: Option<String>,
 }
 
 #[test]

crates/toml/tests/testsuite/enum_external_deserialize.rs

diff --git a/crates/toml/tests/testsuite/enum_external_deserialize.rs b/crates/toml/tests/testsuite/enum_external_deserialize.rs
index 6e0c2f7..247a2c9 100644
--- a/crates/toml/tests/testsuite/enum_external_deserialize.rs
+++ b/crates/toml/tests/testsuite/enum_external_deserialize.rs
@@ -1,4 +1,7 @@
 use serde::Deserialize;
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
 
 #[derive(Debug, Deserialize, PartialEq)]
 struct OuterStruct {
@@ -33,63 +36,81 @@
 #[test]
 fn invalid_variant_returns_error_with_good_message_string() {
     let error = value_from_str::<TheEnum>("\"NonExistent\"").unwrap_err();
-    snapbox::assert_eq(
-        r#"unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
-"#,
+    assert_data_eq!(
         error.to_string(),
+        str![[r#"
+unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
+
+"#]]
+        .raw()
     );
 
     let error = toml::from_str::<Val>("val = \"NonExistent\"").unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 7
+    assert_data_eq!(
+        error.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 7
   |
 1 | val = "NonExistent"
   |       ^^^^^^^^^^^^^
 unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
-"#,
-        error.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
 #[test]
 fn invalid_variant_returns_error_with_good_message_inline_table() {
     let error = value_from_str::<TheEnum>("{ NonExistent = {} }").unwrap_err();
-    snapbox::assert_eq(
-        r#"unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
-"#,
+    assert_data_eq!(
         error.to_string(),
+        str![[r#"
+unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
+
+"#]]
+        .raw()
     );
 
     let error = toml::from_str::<Val>("val = { NonExistent = {} }").unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 9
+    assert_data_eq!(
+        error.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 9
   |
 1 | val = { NonExistent = {} }
   |         ^^^^^^^^^^^
 unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`
-"#,
-        error.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
 #[test]
 fn extra_field_returns_expected_empty_table_error() {
     let error = value_from_str::<TheEnum>("{ Plain = { extra_field = 404 } }").unwrap_err();
-    snapbox::assert_eq(
-        r#"expected empty table
-"#,
+    assert_data_eq!(
         error.to_string(),
+        str![[r#"
+expected empty table
+
+"#]]
+        .raw()
     );
 
     let error = toml::from_str::<Val>("val = { Plain = { extra_field = 404 } }").unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 17
+    assert_data_eq!(
+        error.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 17
   |
 1 | val = { Plain = { extra_field = 404 } }
   |                 ^^^^^^^^^^^^^^^^^^^^^
 expected empty table
-"#,
-        error.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
@@ -97,25 +118,29 @@
 fn extra_field_returns_expected_empty_table_error_struct_variant() {
     let error = value_from_str::<TheEnum>("{ Struct = { value = 123, extra_0 = 0, extra_1 = 1 } }")
         .unwrap_err();
-
-    snapbox::assert_eq(
-        r#"unexpected keys in table: extra_0, extra_1, available keys: value
-"#,
+    assert_data_eq!(
         error.to_string(),
+        str![[r#"
+unexpected keys in table: extra_0, extra_1, available keys: value
+
+"#]]
+        .raw()
     );
 
     let error =
         toml::from_str::<Val>("val = { Struct = { value = 123, extra_0 = 0, extra_1 = 1 } }")
             .unwrap_err();
-
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 33
+    assert_data_eq!(
+        error.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 33
   |
 1 | val = { Struct = { value = 123, extra_0 = 0, extra_1 = 1 } }
   |                                 ^^^^^^^
 unexpected keys in table: extra_0, extra_1, available keys: value
-"#,
-        error.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
@@ -189,12 +214,12 @@
     #[test]
     fn from_inline_table() {
         assert_eq!(
-            TheEnum::NewType("value".to_string()),
+            TheEnum::NewType("value".to_owned()),
             value_from_str(r#"{ NewType = "value" }"#).unwrap()
         );
         assert_eq!(
             Val {
-                val: TheEnum::NewType("value".to_string()),
+                val: TheEnum::NewType("value".to_owned()),
             },
             toml::from_str(r#"val = { NewType = "value" }"#).unwrap()
         );
@@ -203,12 +228,12 @@
     #[test]
     fn from_std_table() {
         assert_eq!(
-            TheEnum::NewType("value".to_string()),
+            TheEnum::NewType("value".to_owned()),
             toml::from_str(r#"NewType = "value""#).unwrap()
         );
         assert_eq!(
             Val {
-                val: TheEnum::NewType("value".to_string()),
+                val: TheEnum::NewType("value".to_owned()),
             },
             toml::from_str(
                 r#"[val]
@@ -283,7 +308,7 @@
                 enums: vec![
                     TheEnum::Plain,
                     TheEnum::Tuple(-123, true),
-                    TheEnum::NewType("value".to_string()),
+                    TheEnum::NewType("value".to_owned()),
                     TheEnum::Struct { value: -123 },
                 ]
             },
@@ -310,7 +335,7 @@
                 enums: vec![
                     TheEnum::Plain,
                     TheEnum::Tuple(-123, true),
-                    TheEnum::NewType("value".to_string()),
+                    TheEnum::NewType("value".to_owned()),
                     TheEnum::Struct { value: -123 },
                 ]
             },

crates/toml/tests/testsuite/formatting.rs

diff --git a/crates/toml/tests/testsuite/formatting.rs b/crates/toml/tests/testsuite/formatting.rs
index 8240d1d..195d60e 100644
--- a/crates/toml/tests/testsuite/formatting.rs
+++ b/crates/toml/tests/testsuite/formatting.rs
@@ -4,19 +4,19 @@
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 struct User {
-    pub name: String,
-    pub surname: String,
+    pub(crate) name: String,
+    pub(crate) surname: String,
 }
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 struct Users {
-    pub user: Vec<User>,
+    pub(crate) user: Vec<User>,
 }
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 struct TwoUsers {
-    pub user0: User,
-    pub user1: User,
+    pub(crate) user0: User,
+    pub(crate) user1: User,
 }
 
 #[test]
@@ -24,12 +24,12 @@
     assert!(!to_string(&Users {
         user: vec![
             User {
-                name: "John".to_string(),
-                surname: "Doe".to_string(),
+                name: "John".to_owned(),
+                surname: "Doe".to_owned(),
             },
             User {
-                name: "Jane".to_string(),
-                surname: "Dough".to_string(),
+                name: "Jane".to_owned(),
+                surname: "Dough".to_owned(),
             },
         ],
     })
@@ -41,12 +41,12 @@
 fn no_unnecessary_newlines_table() {
     assert!(!to_string(&TwoUsers {
         user0: User {
-            name: "John".to_string(),
-            surname: "Doe".to_string(),
+            name: "John".to_owned(),
+            surname: "Doe".to_owned(),
         },
         user1: User {
-            name: "Jane".to_string(),
-            surname: "Dough".to_string(),
+            name: "Jane".to_owned(),
+            surname: "Dough".to_owned(),
         },
     })
     .unwrap()

crates/toml/tests/testsuite/macros.rs

diff --git a/crates/toml/tests/testsuite/macros.rs b/crates/toml/tests/testsuite/macros.rs
index e002cd9..97e933d 100644
--- a/crates/toml/tests/testsuite/macros.rs
+++ b/crates/toml/tests/testsuite/macros.rs
@@ -8,7 +8,7 @@
         #[allow(unused_mut)]
         let mut table = toml::value::Table::new();
         $(
-            table.insert($key.to_string(), $value.into());
+            table.insert($key.to_owned(), $value.into());
         )*
         toml::Value::Table(table)
     }};

crates/toml/tests/testsuite/pretty.rs

diff --git a/crates/toml/tests/testsuite/pretty.rs b/crates/toml/tests/testsuite/pretty.rs
index 369888f..e8b9626 100644
--- a/crates/toml/tests/testsuite/pretty.rs
+++ b/crates/toml/tests/testsuite/pretty.rs
@@ -1,5 +1,6 @@
 use serde::ser::Serialize;
-use snapbox::assert_eq;
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
 
 const NO_PRETTY: &str = "\
 [example]
@@ -18,7 +19,7 @@
     let value: toml::Value = toml::from_str(toml).unwrap();
     let mut result = String::with_capacity(128);
     value.serialize(toml::Serializer::new(&mut result)).unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 const PRETTY_STD: &str = "\
@@ -44,7 +45,7 @@
     value
         .serialize(toml::Serializer::pretty(&mut result))
         .unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 const PRETTY_TRICKY: &str = r#"[example]
@@ -82,7 +83,7 @@
     value
         .serialize(toml::Serializer::pretty(&mut result))
         .unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 const PRETTY_TABLE_ARRAY: &str = r#"[[array]]
@@ -106,7 +107,7 @@
     value
         .serialize(toml::Serializer::pretty(&mut result))
         .unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 const TABLE_ARRAY: &str = r#"[[array]]
@@ -128,7 +129,7 @@
     let value: toml::Value = toml::from_str(toml).unwrap();
     let mut result = String::with_capacity(128);
     value.serialize(toml::Serializer::new(&mut result)).unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 const PRETTY_EMPTY_TABLE: &str = r#"[example]
@@ -140,7 +141,7 @@
     let value: toml::Value = toml::from_str(toml).unwrap();
     let mut result = String::with_capacity(128);
     value.serialize(toml::Serializer::new(&mut result)).unwrap();
-    assert_eq(toml, &result);
+    assert_data_eq!(&result, toml.raw());
 }
 
 #[test]
@@ -165,7 +166,7 @@
 
     #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, Eq, PartialEq)]
     #[serde(untagged, expecting = "expected a boolean or an integer")]
-    pub enum U32OrBool {
+    pub(crate) enum U32OrBool {
         U32(u32),
         Bool(bool),
     }
@@ -180,5 +181,5 @@
 
     let pkg: Package = toml::from_str(raw).unwrap();
     let pretty = toml::to_string_pretty(&pkg).unwrap();
-    assert_eq(raw, pretty);
+    assert_data_eq!(pretty, raw.raw());
 }

crates/toml/tests/testsuite/serde.rs

diff --git a/crates/toml/tests/testsuite/serde.rs b/crates/toml/tests/testsuite/serde.rs
index d7f8bc4..a2a63cd 100644
--- a/crates/toml/tests/testsuite/serde.rs
+++ b/crates/toml/tests/testsuite/serde.rs
@@ -1,8 +1,11 @@
+use std::collections::BTreeMap;
+
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
-use std::collections::BTreeMap;
-
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
 use toml::map::Map;
 use toml::Table;
 use toml::Value;
@@ -23,7 +26,10 @@
 
         // Through a string equivalent
         println!("to_string");
-        snapbox::assert_eq(t!(toml::to_string(&literal)), t!(toml::to_string(&toml)));
+        assert_data_eq!(
+            t!(toml::to_string(&toml)),
+            t!(toml::to_string(&literal)).raw()
+        );
         println!("literal, from_str(toml)");
         assert_eq!(literal, t!(toml::from_str(&t!(toml::to_string(&toml)))));
         println!("toml, from_str(literal)");
@@ -49,20 +55,20 @@
         println!("attempting parsing");
         match toml::from_str::<$ty>(&$toml.to_string()) {
             Ok(_) => panic!("successful"),
-            Err(e) => snapbox::assert_eq($msg_parse, e.to_string()),
+            Err(e) => assert_data_eq!(e.to_string(), $msg_parse.raw()),
         }
 
         println!("attempting toml decoding");
         match $toml.try_into::<$ty>() {
             Ok(_) => panic!("successful"),
-            Err(e) => snapbox::assert_eq($msg_decode, e.to_string()),
+            Err(e) => assert_data_eq!(e.to_string(), $msg_decode.raw()),
         }
     }};
 }
 
 macro_rules! map( ($($k:ident: $v:expr),*) => ({
     let mut _m = Map::new();
-    $(_m.insert(stringify!($k).to_string(), t!(Value::try_from($v)));)*
+    $(_m.insert(stringify!($k).to_owned(), t!(Value::try_from($v)));)*
     _m
 }) );
 
@@ -83,19 +89,19 @@
         a_b: isize,
     }
 
-    equivalent! {
-        Foo { a_b: 2 },
-        map! { a_b: Value::Integer(2)},
-    }
-
     #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
     struct Foo2 {
         #[serde(rename = "a-b")]
         a_b: isize,
     }
 
+    equivalent! {
+        Foo { a_b: 2 },
+        map! { a_b: Value::Integer(2)},
+    }
+
     let mut m = Map::new();
-    m.insert("a-b".to_string(), Value::Integer(2));
+    m.insert("a-b".to_owned(), Value::Integer(2));
     equivalent! {
         Foo2 { a_b: 2 },
         m,
@@ -115,11 +121,11 @@
     }
 
     equivalent! {
-        Foo { a: 2, b: Bar { a: "test".to_string() } },
+        Foo { a: 2, b: Bar { a: "test".to_owned() } },
         map! {
             a: Value::Integer(2),
             b: map! {
-                a: Value::String("test".to_string())
+                a: Value::String("test".to_owned())
             }
         },
     }
@@ -129,9 +135,9 @@
 fn application_decode_error() {
     #[derive(PartialEq, Debug)]
     struct Range10(usize);
-    impl<'de> serde::Deserialize<'de> for Range10 {
+    impl<'de> Deserialize<'de> for Range10 {
         fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Range10, D::Error> {
-            let x: usize = serde::Deserialize::deserialize(d)?;
+            let x: usize = Deserialize::deserialize(d)?;
             if x > 10 {
                 Err(serde::de::Error::custom("more than 10"))
             } else {
@@ -140,7 +146,7 @@
         }
     }
     let d_good = Value::Integer(5);
-    let d_bad1 = Value::String("not an isize".to_string());
+    let d_bad1 = Value::String("not an isize".to_owned());
     let d_bad2 = Value::Integer(11);
 
     assert_eq!(Range10(5), d_good.try_into().unwrap());
@@ -188,19 +194,19 @@
         Foo {
             a: Some(Box::new(Foo {
                 a: None,
-                b: Bar { a: "foo".to_string(), b: 4.5 },
+                b: Bar { a: "foo".to_owned(), b: 4.5 },
             })),
-            b: Bar { a: "bar".to_string(), b: 1.0 },
+            b: Bar { a: "bar".to_owned(), b: 1.0 },
         },
         map! {
             a: map! {
                 b: map! {
-                    a: Value::String("foo".to_string()),
+                    a: Value::String("foo".to_owned()),
                     b: Value::Float(4.5)
                 }
             },
             b: map! {
-                a: Value::String("bar".to_string()),
+                a: Value::String("bar".to_owned()),
                 b: Value::Float(1.0)
             }
         },
@@ -227,13 +233,13 @@
             },
             map: {
                 let mut m = BTreeMap::new();
-                m.insert("bar".to_string(), 4);
-                m.insert("foo".to_string(), 10);
+                m.insert("bar".to_owned(), 4);
+                m.insert("foo".to_owned(), 10);
                 m
             }
         },
         map! {
-            set: Value::Array(vec![Value::String("a".to_string())]),
+            set: Value::Array(vec![Value::String("a".to_owned())]),
             map: map! {
                 bar: Value::Integer(4),
                 foo: Value::Integer(10)
@@ -272,20 +278,6 @@
         bar: isize,
     }
 
-    error! {
-        Foo,
-        map! {
-            bar: Value::String("a".to_string())
-        },
-        r#"TOML parse error at line 1, column 7
-  |
-1 | bar = "a"
-  |       ^^^
-invalid type: string "a", expected isize
-"#,
-        "invalid type: string \"a\", expected isize\nin `bar`\n"
-    }
-
     #[derive(Deserialize)]
     #[allow(dead_code)]
     struct Bar {
@@ -293,19 +285,45 @@
     }
 
     error! {
+        Foo,
+        map! {
+            bar: Value::String("a".to_owned())
+        },
+        str![[r#"
+TOML parse error at line 1, column 7
+  |
+1 | bar = "a"
+  |       ^^^
+invalid type: string "a", expected isize
+
+"#]],
+        str![[r#"
+invalid type: string "a", expected isize
+in `bar`
+
+"#]]
+    }
+
+    error! {
         Bar,
         map! {
             foo: map! {
-                bar: Value::String("a".to_string())
+                bar: Value::String("a".to_owned())
             }
         },
-        r#"TOML parse error at line 2, column 7
+        str![[r#"
+TOML parse error at line 2, column 7
   |
 2 | bar = "a"
   |       ^^^
 invalid type: string "a", expected isize
-"#,
-        "invalid type: string \"a\", expected isize\nin `foo.bar`\n"
+
+"#]],
+        str![[r#"
+invalid type: string "a", expected isize
+in `foo.bar`
+
+"#]]
     }
 }
 
@@ -319,13 +337,18 @@
     error! {
         Foo,
         map! { },
-        r#"TOML parse error at line 1, column 1
+        str![[r#"
+TOML parse error at line 1, column 1
   |
 1 | 
   | ^
 missing field `bar`
-"#,
-        "missing field `bar`\n"
+
+"#]],
+        str![[r#"
+missing field `bar`
+
+"#]]
     }
 }
 
@@ -353,13 +376,13 @@
     }
 
     equivalent! {
-        Foo { a: E::Baz("foo".to_string()) },
-        map! { a: Value::String("foo".to_string()) },
+        Foo { a: E::Baz("foo".to_owned()) },
+        map! { a: Value::String("foo".to_owned()) },
     }
 
     equivalent! {
-        Foo { a: E::Last(Foo2 { test: "test".to_string() }) },
-        map! { a: map! { test: Value::String("test".to_string()) } },
+        Foo { a: E::Last(Foo2 { test: "test".to_owned() }) },
+        map! { a: map! { test: Value::String("test".to_owned()) } },
     }
 }
 
@@ -379,7 +402,7 @@
 
     equivalent! {
         Foo { a: Sort::Desc },
-        map! { a: Value::String("desc".to_string()) },
+        map! { a: Value::String("desc".to_owned()) },
     }
 }
 
@@ -402,14 +425,19 @@
             Enum::String("2".to_owned(), "2".to_owned()),
         ],
     };
-    let expected = "[[inner]]
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
+[[inner]]
 Int = [1, 1]
 
 [[inner]]
-String = [\"2\", \"2\"]
-";
-    let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+String = ["2", "2"]
+
+"#]]
+        .raw()
+    );
 
     equivalent! {
         Document {
@@ -452,7 +480,11 @@
             },
         ],
     };
-    let expected = "[[inner]]
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
+[[inner]]
 
 [inner.Int]
 first = 1
@@ -461,11 +493,12 @@
 [[inner]]
 
 [inner.String]
-first = \"2\"
-second = \"2\"
-";
-    let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+first = "2"
+second = "2"
+
+"#]]
+        .raw()
+    );
 
     equivalent! {
         Document {
@@ -566,10 +599,10 @@
 //     #[derive(Serialize, Deserialize, PartialEq, Debug)]
 //     struct Foo { a: BTreeMap<String, String> }
 //
-//     let v = Foo { a: map! { a, "foo".to_string() } };
+//     let v = Foo { a: map! { a, "foo".to_owned() } };
 //     let mut d = Decoder::new(Table(map! {
 //         a, Table(map! {
-//             a, Value::String("foo".to_string())
+//             a, Value::String("foo".to_owned())
 //         })
 //     }));
 //     assert_eq!(v, t!(Deserialize::deserialize(&mut d)));
@@ -582,9 +615,9 @@
 //     #[derive(Serialize, Deserialize, PartialEq, Debug)]
 //     struct Foo { a: Vec<String> }
 //
-//     let v = Foo { a: vec!["a".to_string()] };
+//     let v = Foo { a: vec!["a".to_owned()] };
 //     let mut d = Decoder::new(Table(map! {
-//         a, Array(vec![Value::String("a".to_string())])
+//         a, Array(vec![Value::String("a".to_owned())])
 //     }));
 //     assert_eq!(v, t!(Deserialize::deserialize(&mut d)));
 //
@@ -747,7 +780,7 @@
     #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Serialize, Deserialize)]
     struct NewType(String);
 
-    type CustomKeyMap = std::collections::BTreeMap<NewType, u32>;
+    type CustomKeyMap = BTreeMap<NewType, u32>;
 
     equivalent! {
         [
@@ -772,18 +805,18 @@
     let text = "[bar]\n\n[baz]\n\n[bazv]\na = \"foo\"\n\n[foo]\n";
     let value: BTreeMap<String, CanBeEmpty> = toml::from_str(text).unwrap();
     let mut expected: BTreeMap<String, CanBeEmpty> = BTreeMap::new();
-    expected.insert("bar".to_string(), CanBeEmpty::default());
-    expected.insert("baz".to_string(), CanBeEmpty::default());
+    expected.insert("bar".to_owned(), CanBeEmpty::default());
+    expected.insert("baz".to_owned(), CanBeEmpty::default());
     expected.insert(
-        "bazv".to_string(),
+        "bazv".to_owned(),
         CanBeEmpty {
-            a: Some("foo".to_string()),
+            a: Some("foo".to_owned()),
             b: None,
         },
     );
-    expected.insert("foo".to_string(), CanBeEmpty::default());
+    expected.insert("foo".to_owned(), CanBeEmpty::default());
     assert_eq!(value, expected);
-    snapbox::assert_eq(text, toml::to_string(&value).unwrap());
+    assert_data_eq!(toml::to_string(&value).unwrap(), text.raw());
 }
 
 #[test]
@@ -830,17 +863,17 @@
 
     equivalent! {
         map! {
-            obj: Object(vec!["foo".to_string()], vec![], vec!["bar".to_string(), "baz".to_string()])
+            obj: Object(vec!["foo".to_owned()], vec![], vec!["bar".to_owned(), "baz".to_owned()])
         },
         map! {
             obj: Value::Array(vec![
                 Value::Array(vec![
-                    Value::String("foo".to_string()),
+                    Value::String("foo".to_owned()),
                 ]),
                 Value::Array(vec![]),
                 Value::Array(vec![
-                    Value::String("bar".to_string()),
-                    Value::String("baz".to_string()),
+                    Value::String("bar".to_owned()),
+                    Value::String("baz".to_owned()),
                 ]),
             ])
         },
@@ -851,7 +884,7 @@
 fn json_interoperability() {
     #[derive(Serialize, Deserialize)]
     struct Foo {
-        any: toml::Value,
+        any: Value,
     }
 
     let _foo: Foo = serde_json::from_str(
@@ -884,7 +917,7 @@
 
     #[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
     #[serde(untagged, expecting = "expected a boolean or an integer")]
-    pub enum U32OrBool {
+    pub(crate) enum U32OrBool {
         U32(u32),
         Bool(bool),
     }
@@ -901,14 +934,16 @@
 "#,
     );
     let err = res.unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 8, column 9
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 8, column 9
   |
 8 | debug = 'a'
   |         ^^^
 expected a boolean or an integer
-"#,
-        err.to_string(),
+
+"#]]
     );
 
     let res: Result<Package, _> = toml::from_str(
@@ -923,14 +958,16 @@
 "#,
     );
     let err = res.unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 8, column 17
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 8, column 17
   |
 8 | dev = { debug = 'a' }
   |                 ^^^
 expected a boolean or an integer
-"#,
-        err.to_string(),
+
+"#]]
     );
 }
 
@@ -945,10 +982,12 @@
         name: "foo".to_owned(),
     };
     let raw = toml::to_string_pretty(&package).unwrap();
-    snapbox::assert_eq(
-        r#"name = "foo"
-"#,
+    assert_data_eq!(
         raw,
+        str![[r#"
+name = "foo"
+
+"#]]
     );
 }
 
@@ -970,11 +1009,13 @@
         },
     };
     let raw = toml::to_string_pretty(&package).unwrap();
-    snapbox::assert_eq(
-        r#"[package]
-name = "foo"
-"#,
+    assert_data_eq!(
         raw,
+        str![[r#"
+[package]
+name = "foo"
+
+"#]]
     );
 }
 
@@ -997,7 +1038,7 @@
 
     #[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
     #[serde(untagged, expecting = "expected a boolean or an integer")]
-    pub enum U32OrBool {
+    pub(crate) enum U32OrBool {
         U32(u32),
         Bool(bool),
     }
@@ -1010,11 +1051,13 @@
         },
     };
     let raw = toml::to_string_pretty(&package).unwrap();
-    snapbox::assert_eq(
-        r#"[profile.dev]
-debug = true
-"#,
+    assert_data_eq!(
         raw,
+        str![[r#"
+[profile.dev]
+debug = true
+
+"#]]
     );
 }
 
@@ -1046,7 +1089,7 @@
 
     #[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
     #[serde(untagged, expecting = "expected a boolean or an integer")]
-    pub enum U32OrBool {
+    pub(crate) enum U32OrBool {
         U32(u32),
         Bool(bool),
     }
@@ -1065,8 +1108,10 @@
         },
     };
     let raw = toml::to_string_pretty(&package).unwrap();
-    snapbox::assert_eq(
-        r#"cargo_features = []
+    assert_data_eq!(
+        raw,
+        str![[r#"
+cargo_features = []
 
 [package]
 name = "foo"
@@ -1075,8 +1120,8 @@
 
 [profile.dev]
 debug = true
-"#,
-        raw,
+
+"#]]
     );
 }
 
@@ -1102,9 +1147,12 @@
 
     let native = Foo { a_b: u64::MAX };
     let err = Table::try_from(native.clone()).unwrap_err();
-    snapbox::assert_eq("u64 value was too large", err.to_string());
+    assert_data_eq!(err.to_string(), str!["u64 value was too large"].raw());
     let err = toml::to_string(&native).unwrap_err();
-    snapbox::assert_eq("out-of-range value for u64 type", err.to_string());
+    assert_data_eq!(
+        err.to_string(),
+        str!["out-of-range value for u64 type"].raw()
+    );
 }
 
 #[test]
@@ -1150,7 +1198,7 @@
 fn unsupported_root_type() {
     let native = "value";
     let err = toml::to_string_pretty(&native).unwrap_err();
-    snapbox::assert_eq("unsupported rust type", err.to_string());
+    assert_data_eq!(err.to_string(), str!["unsupported rust type"].raw());
 }
 
 #[test]
@@ -1162,7 +1210,7 @@
 
     let native = Foo { unused: () };
     let err = toml::to_string_pretty(&native).unwrap_err();
-    snapbox::assert_eq("unsupported unit type", err.to_string());
+    assert_data_eq!(err.to_string(), str!["unsupported unit type"].raw());
 }
 
 #[test]
@@ -1174,6 +1222,7 @@
     }
 
     #[derive(Deserialize)]
+    #[allow(dead_code)]
     enum Compare {
         Gt(u32),
     }
@@ -1216,9 +1265,117 @@
 #[test]
 fn datetime_offset_issue_496() {
     let original = "value = 1911-01-01T10:11:12-00:36\n";
-    let toml = original.parse::<toml::Table>().unwrap();
+    let toml = original.parse::<Table>().unwrap();
     let output = toml.to_string();
-    snapbox::assert_eq(original, output);
+    assert_data_eq!(output, original.raw());
+}
+
+#[test]
+fn serialize_date() {
+    use toml::value::Date;
+
+    #[derive(Serialize)]
+    struct Document {
+        date: Date,
+    }
+
+    let input = Document {
+        date: Date {
+            year: 2024,
+            month: 1,
+            day: 1,
+        },
+    };
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
+date = 2024-01-01
+
+"#]]
+        .raw()
+    );
+}
+
+#[test]
+fn serialize_time() {
+    use toml::value::Time;
+
+    #[derive(Serialize)]
+    struct Document {
+        date: Time,
+    }
+
+    let input = Document {
+        date: Time {
+            hour: 5,
+            minute: 0,
+            second: 0,
+            nanosecond: 0,
+        },
+    };
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
+date = 05:00:00
+
+"#]]
+        .raw()
+    );
+}
+
+#[test]
+fn deserialize_date() {
+    use toml::value::Date;
+
+    #[derive(Debug, Deserialize)]
+    struct Document {
+        date: Date,
+    }
+
+    let document: Document = toml::from_str("date = 2024-01-01").unwrap();
+    assert_eq!(
+        document.date,
+        Date {
+            year: 2024,
+            month: 1,
+            day: 1
+        }
+    );
+
+    let err = toml::from_str::<Document>("date = 2024-01-01T05:00:00").unwrap_err();
+    assert_data_eq!(
+        err.message(),
+        str!["invalid type: local datetime, expected local date"]
+    );
+}
+
+#[test]
+fn deserialize_time() {
+    use toml::value::Time;
+
+    #[derive(Debug, Deserialize)]
+    struct Document {
+        time: Time,
+    }
+
+    let document: Document = toml::from_str("time = 05:00:00").unwrap();
+    assert_eq!(
+        document.time,
+        Time {
+            hour: 5,
+            minute: 0,
+            second: 0,
+            nanosecond: 0,
+        }
+    );
+
+    let err = toml::from_str::<Document>("time = 2024-01-01T05:00:00").unwrap_err();
+    assert_data_eq!(
+        err.message(),
+        str!["invalid type: local datetime, expected local time"]
+    );
 }
 
 #[test]
@@ -1231,15 +1388,21 @@
     let input = Document {
         values: vec![Some(1), Some(2), Some(3)],
     };
-    let expected = "values = [1, 2, 3]\n";
     let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+    assert_data_eq!(
+        raw,
+        str![[r#"
+values = [1, 2, 3]
+
+"#]]
+        .raw()
+    );
 
     let input = Document {
         values: vec![Some(1), None, Some(3)],
     };
     let err = toml::to_string(&input).unwrap_err();
-    snapbox::assert_eq("unsupported None value", err.to_string());
+    assert_data_eq!(err.to_string(), str!["unsupported None value"].raw());
 }
 
 #[test]
@@ -1262,7 +1425,10 @@
             OptionalField { x: 3, y: Some(7) },
         ],
     };
-    let expected = "\
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
 [[values]]
 x = 0
 y = 4
@@ -1274,9 +1440,10 @@
 [[values]]
 x = 3
 y = 7
-";
-    let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+
+"#]]
+        .raw()
+    );
 
     let input = Document {
         values: vec![
@@ -1285,7 +1452,10 @@
             OptionalField { x: 3, y: Some(7) },
         ],
     };
-    let expected = "\
+    let raw = toml::to_string(&input).unwrap();
+    assert_data_eq!(
+        raw,
+        str![[r#"
 [[values]]
 x = 0
 y = 4
@@ -1296,9 +1466,10 @@
 [[values]]
 x = 3
 y = 7
-";
-    let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+
+"#]]
+        .raw()
+    );
 }
 
 #[test]
@@ -1328,10 +1499,11 @@
             Choice::Optional(OptionalField { x: 3, y: Some(7) }),
         ],
     };
-    let expected = "values = [{ Optional = { x = 0, y = 4 } }, \"Empty\", { Optional = { x = 2, y = 5 } }, { Optional = { x = 3, y = 7 } }]
-";
     let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+    assert_data_eq!(raw, str![[r#"
+values = [{ Optional = { x = 0, y = 4 } }, "Empty", { Optional = { x = 2, y = 5 } }, { Optional = { x = 3, y = 7 } }]
+
+"#]].raw());
 
     let input = Document {
         values: vec![
@@ -1341,10 +1513,11 @@
             Choice::Optional(OptionalField { x: 3, y: Some(7) }),
         ],
     };
-    let expected = "values = [{ Optional = { x = 0, y = 4 } }, \"Empty\", { Optional = { x = 2 } }, { Optional = { x = 3, y = 7 } }]
-";
     let raw = toml::to_string(&input).unwrap();
-    snapbox::assert_eq(expected, raw);
+    assert_data_eq!(raw, str![[r#"
+values = [{ Optional = { x = 0, y = 4 } }, "Empty", { Optional = { x = 2 } }, { Optional = { x = 3, y = 7 } }]
+
+"#]].raw());
 }
 
 #[test]

crates/toml/tests/testsuite/spanned.rs

diff --git a/crates/toml/tests/testsuite/spanned.rs b/crates/toml/tests/testsuite/spanned.rs
index 760c73aa..daf7601 100644
--- a/crates/toml/tests/testsuite/spanned.rs
+++ b/crates/toml/tests/testsuite/spanned.rs
@@ -5,11 +5,14 @@
 use std::fmt::Debug;
 
 use serde::Deserialize;
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
 use toml::value::Datetime;
 use toml::Spanned;
 
 /// A set of good datetimes.
-pub fn good_datetimes() -> Vec<&'static str> {
+pub(crate) fn good_datetimes() -> Vec<&'static str> {
     vec![
         "1997-09-09T09:09:09Z",
         "1997-09-09T09:09:09+09:09",
@@ -248,14 +251,16 @@
 fake = 1"#,
     )
     .unwrap_err();
-    snapbox::assert_eq(
-        "\
+    assert_data_eq!(
+        error.to_string(),
+        str![[r#"
 TOML parse error at line 3, column 1
   |
 3 | fake = 1
   | ^^^^
 unknown field `fake`, expected `real`
-",
-        error.to_string(),
+
+"#]]
+        .raw()
     );
 }

crates/toml/tests/testsuite/tables_last.rs

diff --git a/crates/toml/tests/testsuite/tables_last.rs b/crates/toml/tests/testsuite/tables_last.rs
index b003557..d94f2b1 100644
--- a/crates/toml/tests/testsuite/tables_last.rs
+++ b/crates/toml/tests/testsuite/tables_last.rs
@@ -54,11 +54,11 @@
     }
 
     let comp1 = Component {
-        base: "b".to_string(),
+        base: "b".to_owned(),
         transform: (1.0, 0.0, 0.0, 1.0, 0.0, 0.0),
     };
     let comp2 = Component {
-        base: "c".to_string(),
+        base: "c".to_owned(),
         transform: (1.0, 0.0, 0.0, 1.0, 0.0, 0.0),
     };
     let components = vec![comp1, comp2];
@@ -68,40 +68,40 @@
             Point {
                 x: 3.0,
                 y: 4.0,
-                pt_type: "line".to_string(),
+                pt_type: "line".to_owned(),
             },
             Point {
                 x: 5.0,
                 y: 6.0,
-                pt_type: "line".to_string(),
+                pt_type: "line".to_owned(),
             },
         ],
         vec![
             Point {
                 x: 0.0,
                 y: 0.0,
-                pt_type: "move".to_string(),
+                pt_type: "move".to_owned(),
             },
             Point {
                 x: 7.0,
                 y: 9.0,
-                pt_type: "offcurve".to_string(),
+                pt_type: "offcurve".to_owned(),
             },
             Point {
                 x: 8.0,
                 y: 10.0,
-                pt_type: "offcurve".to_string(),
+                pt_type: "offcurve".to_owned(),
             },
             Point {
                 x: 11.0,
                 y: 12.0,
-                pt_type: "curve".to_string(),
+                pt_type: "curve".to_owned(),
             },
         ],
     ];
     let g1 = Glyph {
-        contours,
         components,
+        contours,
     };
 
     let s = toml::to_string_pretty(&g1).unwrap();
@@ -149,13 +149,13 @@
     }
     toml::to_string(&C {
         a: A {
-            a: "aa".to_string(),
-            b: "ab".to_string(),
+            a: "aa".to_owned(),
+            b: "ab".to_owned(),
         },
-        b: vec!["b".to_string()],
+        b: vec!["b".to_owned()],
         c: vec![B {
-            a: "cba".to_string(),
-            b: vec!["cbb".to_string()],
+            a: "cba".to_owned(),
+            b: vec!["cbb".to_owned()],
         }],
     })
     .unwrap();

crates/toml_edit/.android-checksum.json

diff --git a/crates/toml_edit/.android-checksum.json b/crates/toml_edit/.android-checksum.json
index 730d130..b7d1fa1 100644
--- a/crates/toml_edit/.android-checksum.json
+++ b/crates/toml_edit/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"329e35ecd896d09bda49eac82f30868b31f8f7db8731337fdffc55df47e0dd2e","Android.bp":"65b157f77aac862656a69a3847e9c2d904f456ece25092ef245f97cd404d5a3d","Cargo.lock":"96482e0c70a01d05cf76f1d99ae72605e092636d528f24ed6eb8d968c9703706","Cargo.toml":"6666bf68027e397ead9bace0003e838e5f839c29779345feae76e2e8b2e8ba8b","LICENSE":"7b1c7a1aa99d919e93ff9b6a265d75f2aefea4ae27147ab6dafd8513e64b8a9b","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"dc3920e8d39660b7311cece01b9af32dfe3f0adf30d0b9f76516d625ab9703cd","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"f45dac46b26743d4f8fe1358b5c4707f782eb6e487f8a9b8443ef774e9483b78","cargo_embargo.json":"397647bf02fb37ea9b3ec5313148fac22602f64f91ec8ee36cc82f1f0f58b793","examples/visit.rs":"4ae8ea719b969a91152fcd50800abf123e9d2f2048dd642dbad62081f510354c","patches/LICENSE.patch":"4ba5ca15afd2172bc25ec72dbac0b97c03f67beea425aa56194acd0472acf72f","src/array.rs":"c35c9cf032afa43b38f62f4a76e85eaf7ff16f3c556f5e03771380e6a41c4cb5","src/array_of_tables.rs":"65235b68cbc66098f4f2e04dbb96a1f3b756e9c931e7dccd33f63c056ea5da61","src/de/array.rs":"21c3db77683175e48df5167666b0968f80525da90dd7bd9873edf178111827e2","src/de/datetime.rs":"adcfa9c96a655face16212d4b9be0221723c5916dd4ba0b967c363273c6acf3b","src/de/key.rs":"aea799be51703266bf97b967abb77c171c91e37ea4f268ca5027bbf76382abc1","src/de/mod.rs":"f5725a351c9156fc39292979e7d875f30a8ecdb92a64c2c33a514afc0f25de9c","src/de/spanned.rs":"12f7f11ffae52d147dfd6b8e31837d28736cf88d44c93a8071eca736b26414b5","src/de/table.rs":"321a794b922ffe15ace56c9411131d088c85eb257a15923da7b3888492491504","src/de/table_enum.rs":"ad5e7916066904191bd278ed5b7013da7c7d0f50dbf243b9eda5c12129d1e8f5","src/de/value.rs":"31dab335e11ecd24fea2b4cad76bf276ac853b20bf5af59031fc27df85b15466","src/document.rs":"db2e7bda93ce2383207016ea41ab985108d83020c42eba526a898dc5d345a526","src/encode.rs":"918b36fe0d55f74613c92441e58cab3290543ea62c3ca30c75e0fbad58b8fbbe","src/error.rs":"61746a768e80db9af11a35e7586a5448bea9dd7d274cb7e19b920c726f1d3e80","src/index.rs":"73358e21f0cd9f9b96aa66160ebf5f851213c65e0d10aab9964c22b1175b44a6","src/inline_table.rs":"d816f7bfe3fbd4dd5206d789310f2d318673b6a634240be78d0e1abdd0519a73","src/internal_string.rs":"5311aef53babffa83f165f6abff62906743cb5f3fd49ad2a9871b524b35efc34","src/item.rs":"300a3c9d7f6f9875afc751f626f3da0166c63dc10b2f5481d8e70dbd8900350a","src/key.rs":"9407184017faf2d302551fa835c4fae118beaef938c15579c4f42c15ee052928","src/lib.rs":"b44a4895f15ea70055c5e018bcb9abc6bede2474e1cd9d0ad3d02f5ef450ade2","src/parser/array.rs":"bd193ac7a919fab17fc90c42a1fc18f4b6dabdcd4e228c9cfb037d4c40bc0baf","src/parser/datetime.rs":"2d5240cf5fcff04248b38047031512fa87b55d653f90f3c3d97c7c9e26308791","src/parser/document.rs":"c13e3e81248137ae34205ae344fe58b20f5a73b74f9fed8ec96dc16609825651","src/parser/error.rs":"e31e69f00dc9b642713886876573a0e55b438b20a1502481ea9ea26ccb14186a","src/parser/inline_table.rs":"f2a304861a9227ab41230154d6d22ba80f4b27deb0eab0a83881ca8c82f0a8b1","src/parser/key.rs":"196fb90f64f763495a295f196c8977396481ed524cdef5fb01fce17b27a03fb2","src/parser/mod.rs":"895db2d53480cdeee6ff9a05c4335dbd8749b554b5151f7d4565f29f4e1261e5","src/parser/numbers.rs":"879a8886d4b331b9c990b03379d60c56d851ad7e9a405a85f0fd704228ac24ba","src/parser/state.rs":"80dbeb5332631dbd514335101d90f20043424b6578f344f0220febc8c29c75ab","src/parser/strings.rs":"177996abf178e2a3a9a52f030360b6978fb694edfb74a3fdddf45e4c903aade8","src/parser/table.rs":"ebe15adb0b447c6590cde2a0726a35450b2bc24cd348b6c1199fdb4cdb434a0d","src/parser/trivia.rs":"834113d29709da90a3b4613c3745442e989ecce21eab70927374e496cbd34ba7","src/parser/value.rs":"6dd38eeaa08157d6c4aa9850ca5686b4112e59f60db3ffc801bc66378d367bac","src/raw_string.rs":"2f1edfcc331d953f6c37239afed6662a95f2fde3b9d60e5f9ec651d50232b33a","src/repr.rs":"29f13d204680430b97e7910ff2d739e48a8cd845d0ab9789bbe33f990bff3a6e","src/ser/array.rs":"c6e0e1d9b397ce3d4b9759e1b1641aadc37da00dccc45bffb9cd946c7beff544","src/ser/key.rs":"52b4d38748bef6e624764eeba7769af5be3eda1ad7be46073672e34478fefecc","src/ser/map.rs":"8305fefda54ce44bad5fc533791a1fa2b505200582c1b11c7b22a547c1d4662d","src/ser/mod.rs":"3ebafea1db5b436ae99e118bfae36c952d2f96fa8ca803d252c7df7f64d80182","src/ser/pretty.rs":"87228866743a55074d9b3d91bea68a654844621a34f81bd07beaaa652802dde0","src/ser/value.rs":"7773bdf799ab1f908ad12213c6175845ce21d36203de29817ae54a2736f1b05b","src/table.rs":"19d8877d0dd67217cfc318e1a721286b4a12727c823cf660eddad517188094af","src/value.rs":"e97a419a574c08a88728885568a07dd4c632a510895d8d6fcf088298d48c6ee7","src/visit.rs":"83e1fd0405d267883552d3cb8185bc116dc77ab1acdc8d32c8b8b4d604bc9066","src/visit_mut.rs":"00a45b66929c1561ab5b465688a0b970b066f7552dcd4b882b952b31c12fc80e","tests/decoder.rs":"0384e647759ed1e12f2f2c611d40fdcdc1d7f9a16d1fbf1f59372c3599f66034","tests/decoder_compliance.rs":"74c36d82d52205c3490844ef3df952e294aa92c6e9ee64dff231473072b78b1d","tests/encoder.rs":"8dabaa51a6c4e680c844630d2ace7a0fdffa607f8a306f661c3e7dec154f9b28","tests/encoder_compliance.rs":"1d9538ee077af51782213cc3484de5252b8700e242b832735c401fd6343623d6","tests/fixtures/invalid/array/array.stderr":"517c397c7afb8fe855fe9b86a253f620f761b5403fdbb08b219c893f096804c2","tests/fixtures/invalid/array/double-comma-1.stderr":"517c397c7afb8fe855fe9b86a253f620f761b5403fdbb08b219c893f096804c2","tests/fixtures/invalid/array/double-comma-2.stderr":"f8a4c678e4fa5bb4b2dc66064d113bd81beb5e5258046685f967feefa825e8a8","tests/fixtures/invalid/array/extend-defined-aot.stderr":"86cc5eb992fa9add3ad39766d6c6736d30dfd9c464cc516c45dec12bc1c8e8b0","tests/fixtures/invalid/array/extending-table.stderr":"9d666931632f0c02362f102e9edd86916a7de491a83d6dfc68a0c2f87b0794d6","tests/fixtures/invalid/array/missing-separator-1.stderr":"fb21970f88b6f5ede63891c6baf406cfcefea7d48c15c0b4670c71d97c61c3ce","tests/fixtures/invalid/array/missing-separator-2.stderr":"3a807ad6e94c3d70b62696bec39d7a1e558e5771d6c6484a80e89ffde6aa9540","tests/fixtures/invalid/array/no-close-1.stderr":"7c1689bf4779e193a475bc181b622e2dcaa2b02e2c9a052ba953c94d2e48b724","tests/fixtures/invalid/array/no-close-2.stderr":"e3421314255375d50d74e04b527adec9aa1b7cd9a8502120247785a34f0b7368","tests/fixtures/invalid/array/no-close-3.stderr":"ec1d919de5766216b887a34099b2117db7e3e3cfaccd8b295f44268d950df14e","tests/fixtures/invalid/array/no-close-4.stderr":"4372b71512f369cefea355dc044e04483c5f7943028ad5cc0d3514804d3ad18d","tests/fixtures/invalid/array/no-close-5.stderr":"87d9fcd6aae71e0542f70eb8ee2a509f024e66d0b10d03b2f7f697d76b2bb575","tests/fixtures/invalid/array/no-close-6.stderr":"9ae5dc0d71db715990ef8c7e8ded74643c4a451c5abb4c05fe1bd6eae61d20b9","tests/fixtures/invalid/array/no-close-7.stderr":"eae2afb173b6a4d58e65dc94782c1b5079588806396c6b5716fefe911643966a","tests/fixtures/invalid/array/no-close-8.stderr":"feba7ed79aaa5d7b92fca24d09ddfdc1a2198e84a51aa8a4a7578b75e945e002","tests/fixtures/invalid/array/no-close-table-1.stderr":"ff5517cc98a1e0918889defcf594a919f1c52ef508bcc4183114305f2df8cd77","tests/fixtures/invalid/array/no-close-table-2.stderr":"21751532b65a2db6064cee09f15f65d4773c34ed83b7269d09e2ac00e5859278","tests/fixtures/invalid/array/no-comma-1.stderr":"02a1e51cbf040add31472bd7c56723005c89c8b793ef59769cad78d36e4f3139","tests/fixtures/invalid/array/no-comma-2.stderr":"4dc26ed513ceb32d721c4e25a7a1918b9c61bc93d926bbab04975dc1a930fda3","tests/fixtures/invalid/array/no-comma-3.stderr":"f5441aa4804a2ce10fa621304def1c296b4b35bf6e7657a2926d364b9d3d4db9","tests/fixtures/invalid/array/only-comma-1.stderr":"b7d5fe39fb03327a5b55b940f524aa4dbb5548604fbc8786e1e4e502fbf6f16c","tests/fixtures/invalid/array/only-comma-2.stderr":"4a54ddd36885beb51fa70327ecfe81fd6dddc5f1f23ff85a61f30834577b4b2a","tests/fixtures/invalid/array/tables-1.stderr":"2a9ec07bfa4c818d204e8d49c621e13194cffc99c21a75533a8dd3b00ffcfdb2","tests/fixtures/invalid/array/tables-2.stderr":"e04375e46225e12956b22fb717615b6cf33f2064f12a9a6c93074f42adaa5374","tests/fixtures/invalid/array/text-after-array-entries.stderr":"320eb4e7f8ba560da84cac292a9d5de03534f6ca6ff6928e429ae8cd55ec4395","tests/fixtures/invalid/array/text-before-array-separator.stderr":"b37ba17334486b7b16d4b5bde308d2a8c7605429c389e3ec30b02cd975fcf441","tests/fixtures/invalid/array/text-in-array.stderr":"895f20e5d6f2748c16659edbdb4c6e91d84f29e45f8e72d380bb3205f6c9065a","tests/fixtures/invalid/bool/almost-false-with-extra.stderr":"9c06a48312aa0138684e37b8d4193e46ff1badf6ee3d2424d6c6e5f341db8a61","tests/fixtures/invalid/bool/almost-false.stderr":"d3c827c1c521f98b2242a7183c96b00682764889a46666a5dcfb6d0fa7a743c0","tests/fixtures/invalid/bool/almost-true-with-extra.stderr":"9db6045a6e3ba501874de810a16a35f9837647dbab22ea9d8c9d89a7494b983f","tests/fixtures/invalid/bool/almost-true.stderr":"2816a9e9637d3402750f7a35622d738abc83825d706fb4c19d8f007df2396bb8","tests/fixtures/invalid/bool/bool.stderr":"9c06a48312aa0138684e37b8d4193e46ff1badf6ee3d2424d6c6e5f341db8a61","tests/fixtures/invalid/bool/capitalized-false.stderr":"b7e9c3764103c257ceae4f0aeb714ae58917722cb6ac1a1fdb0cde6f9efe1c83","tests/fixtures/invalid/bool/capitalized-true.stderr":"ac46ab983618490106a1bd3263e0e34e54010a014a795184fb722d5ef49aab2d","tests/fixtures/invalid/bool/just-f.stderr":"d3f2bc776b3137f378be5acb9e10e745cd124178d836289fb1b7091ab12556fb","tests/fixtures/invalid/bool/just-t.stderr":"1f6c7ced5fd72596cde8daf3bd05a61c9f0a28bfb612b8b6b0b6de4630d1c0a0","tests/fixtures/invalid/bool/mixed-case-false.stderr":"7d57131577e1c018075c1a83347e80183aa1db1b6aee1027a11cb7f229b05d21","tests/fixtures/invalid/bool/mixed-case-true.stderr":"9cfe3868f18cecce20bc674593f15fe88cb6fb7361f54ffec1616e877f714cf2","tests/fixtures/invalid/bool/mixed-case.stderr":"34738e926e3e5ea99fc9860c0177463699e54b2c48fe11168a6c25bc173802ac","tests/fixtures/invalid/bool/starting-same-false.stderr":"620c142ae095c8da9aa1298a82a42ce1f0f13eda91c66e75e4c5b6f82bee0455","tests/fixtures/invalid/bool/starting-same-true.stderr":"8e1016111cd84601db76df8579ce7aab7fa7a0e013e66d3174cb8bbd80c4764f","tests/fixtures/invalid/bool/wrong-case-false.stderr":"ca86c0166b4992d0255e2c8f5ed2935d58c325965039006f1903c8ddaf549593","tests/fixtures/invalid/bool/wrong-case-true.stderr":"6264fc52c455d04e1f89d0d2726b4325066699595f6120ad4583802642cd6735","tests/fixtures/invalid/control/bare-cr.stderr":"be847ba07cd507752b8124ca13e8d012c666b81cee56be1309815c8d490470c1","tests/fixtures/invalid/control/bare-formfeed.stderr":"18a939f8d8459a4e3a2d9dee5756fa81b3f12a2179e685c35ecd25f4da9d8aef","tests/fixtures/invalid/control/bare-null.stderr":"cd58586e56fa9b00fa17be23dfd531dcf9eb5e10556464decd4b60fdc6eaf72f","tests/fixtures/invalid/control/bare-vertical-tab.stderr":"970f649f9575b1553da1382466eafe16413696203e7ddbaa99a0585a3f0ca157","tests/fixtures/invalid/control/comment-cr.stderr":"7e729bfc9b0c575521c39d763e8ab8f7baf94054e183e59cbe976d840a0f1c62","tests/fixtures/invalid/control/comment-del.stderr":"5c41d37aad38933267d8d8fe80d9600650627dbe3433b8ac876ca63bd086094b","tests/fixtures/invalid/control/comment-ff.stderr":"4a7eaa53d883dcab7f23b09d33794a687b5d0c7777ab172a0bd81f9503878762","tests/fixtures/invalid/control/comment-lf.stderr":"a24258d06bc41156b92ab14fac3793c85d706e74d5c280337c4ec0c4f80f92ff","tests/fixtures/invalid/control/comment-null.stderr":"afcf5791d6fde718cd6a2b514483d45d2355bf08f9fa392d75c7192bc390913e","tests/fixtures/invalid/control/comment-us.stderr":"280fbd7dc323d8841d5b9fa821f48061fc01a968bc1f5893fdac30fc17afaa3d","tests/fixtures/invalid/control/control.stderr":"07adf02cb547ed379a402121e4db738daa698358e53c2fa852c617fb766b41fc","tests/fixtures/invalid/control/multi-cr.stderr":"1b70b31b5c10eac9a52cad0b7739bbe5b9a74c9cce4ba105143c622a33164c14","tests/fixtures/invalid/control/multi-del.stderr":"6a7f52409dbf8b5bc1097fec2d1330310c97d78eb3ea2027f219b25e519ec270","tests/fixtures/invalid/control/multi-lf.stderr":"e723fdaf9e19aef9a0eee8a919e5986822c25ac1131e24422e9fabc0887ccc63","tests/fixtures/invalid/control/multi-null.stderr":"ab3e944c835a74ebab8c56c39c3ba6496e8d4d2b03f324a66e2e511ac8b7fd10","tests/fixtures/invalid/control/multi-us.stderr":"1df029e738c4cb78a68b360fc131fb6d9f5b93f78e292a27aaf4c40e8aa3d842","tests/fixtures/invalid/control/rawmulti-cd.stderr":"fbadd57208404b2116c9cc16f36b80e1ab08276d7838e17e4bd48a8df7e194d2","tests/fixtures/invalid/control/rawmulti-del.stderr":"ee50d46a73bfcd85f7b3b677d4148cf2390e5ea13b59a6bc81dacea3e049ab33","tests/fixtures/invalid/control/rawmulti-lf.stderr":"6cae2d709ae5ee6afc355322388d8b57d8e9674929d71af5b7761bab5d751cb9","tests/fixtures/invalid/control/rawmulti-null.stderr":"0efaa11fc391b16d27e1de09027171e8d379d3ffddd2489045ba10912ebccb89","tests/fixtures/invalid/control/rawmulti-us.stderr":"31a28ca07db60771f7787f8ef30fa160ce3715df28532bc9892ec15e380c36c1","tests/fixtures/invalid/control/rawstring-cr.stderr":"32819db35fde8ef9ee282557740c8b2dd077c0bcf421614fb06db18d732af57e","tests/fixtures/invalid/control/rawstring-del.stderr":"8a7828be56c7d941c6879698be4825fc1f9b75766898e782675d860581e7393e","tests/fixtures/invalid/control/rawstring-lf.stderr":"1d01b15b19024ce4c36866f025ed6adc4f3c3bac1a2b5fdf4ea79471dc5c9b49","tests/fixtures/invalid/control/rawstring-null.stderr":"245b39b3943e776fb5cb2d52497e0fb301420c36f7f5b47df9980aa05496ab5b","tests/fixtures/invalid/control/rawstring-us.stderr":"7fb0ed283f42d3b1cc3852698b6047c2975d2c780eebe14f65d2b3d11d9f0bad","tests/fixtures/invalid/control/string-bs.stderr":"0a12dfbbf6161d24f29d78679928a4e835d47558344773c2d585a2201bb043ad","tests/fixtures/invalid/control/string-cr.stderr":"cf5970ede487e7fd692baa45247d55df70b8207f8d67df6c2e55eb9d4ef9352b","tests/fixtures/invalid/control/string-del.stderr":"35c65f3ceb74b80d4a5d8109f61f099bdf640379dc9751fd7678447a33eaec78","tests/fixtures/invalid/control/string-lf.stderr":"ede4b6df958cac81b05525f25b1ac2c1435eae895f545dac57a553a7840fc8d7","tests/fixtures/invalid/control/string-null.stderr":"c30aa237809c03dee02d36a1fc4a02d6f184bd425bfc2accda6b3fa1bb55fe1a","tests/fixtures/invalid/control/string-us.stderr":"7d922c62bf118c23b85991935b8b4c7a113d39d0092d13d22be1e0ad7ed20a31","tests/fixtures/invalid/datetime/feb-29.stderr":"743e7bcaa21ce6a8e7f033b56de7a0f3e7dd54ea84bf293e044af4e192f693bf","tests/fixtures/invalid/datetime/feb-30.stderr":"744e980d51f19b89a203192eae4f88e5ecba71853e006ab1c52988818584507c","tests/fixtures/invalid/datetime/hour-over.stderr":"0aabf978f79acc6b4d0d3d6a9b05833aa65d418d71aa5cbbd71035797adc1b0e","tests/fixtures/invalid/datetime/mday-over.stderr":"76f70be6d3ca444339aa15f4e6243b784a4c414fde0cd932b20c182266276782","tests/fixtures/invalid/datetime/mday-under.stderr":"54456d2ec892deb33b596cd82d400bdc6777cd2b5c643e45556b9646057f7d55","tests/fixtures/invalid/datetime/minute-over.stderr":"ffa678092cb67d6848910218d9a5bd46f5a308b7bce2269b8b6e46c2ec019dd0","tests/fixtures/invalid/datetime/month-over.stderr":"906596048b7dbbae0630ec1216827a95ce562a09f98704595d27c3491cdfc7ee","tests/fixtures/invalid/datetime/month-under.stderr":"c073c25ef0a3aa10b1d29ac28df9c9207143ffd595680ff633400d076a76dde7","tests/fixtures/invalid/datetime/no-leads-month.stderr":"4f5066ed79bcd945215a57f55ef230f47dd64e2ec55438a7ee08bc3f7067e318","tests/fixtures/invalid/datetime/no-leads-with-milli.stderr":"ffce1f8e7bb51130705ebb7ba8e9ef007de9a9e7f33b476e4fefb15a030d2e1d","tests/fixtures/invalid/datetime/no-leads.stderr":"4f5066ed79bcd945215a57f55ef230f47dd64e2ec55438a7ee08bc3f7067e318","tests/fixtures/invalid/datetime/no-secs.stderr":"8c504dfaa1dfef25b78a8548509b3139f92e3e04bcb848a1e04f7529e169ad63","tests/fixtures/invalid/datetime/no-t.stderr":"ec4852cfa295ad2944101831bf40489e6c22b5a33fdb3faa5347e2d18c25c227","tests/fixtures/invalid/datetime/second-over.stderr":"ba720829aee7506625c354e5f53dbd6b67ec351061df1e32b49cb11ea69bf52e","tests/fixtures/invalid/datetime/time-no-leads.stderr":"5117ac62dd754a203f2fd6e5163a2ce352776bee513219252cec77c0ed71bbbb","tests/fixtures/invalid/datetime/y10k.stderr":"ac3db71c252bb0b2f0bdc8a9d734ca60289afecfb5a66309a895b54c7d8e61f7","tests/fixtures/invalid/encoding/bad-codepoint.stderr":"64244879fa48b9c4f2f7b219325d4c308772c032b7005edd2ee4d771b5448bc1","tests/fixtures/invalid/encoding/bad-utf8-at-end.stderr":"d55ab89a2f111bbfffd362928dbe3a1dafe7f8f37a04e1c56307efe4f4ea14d8","tests/fixtures/invalid/encoding/bad-utf8-in-comment.stderr":"52e5ea4555b208f3ce91debc99e01dacc6e706381fb274259730b0a82f041660","tests/fixtures/invalid/encoding/bad-utf8-in-multiline-literal.stderr":"e22a4a60afcbf41351abb9d4d61a4c5d6dce246f98fedbccd33557eea8596524","tests/fixtures/invalid/encoding/bad-utf8-in-multiline.stderr":"e22a4a60afcbf41351abb9d4d61a4c5d6dce246f98fedbccd33557eea8596524","tests/fixtures/invalid/encoding/bad-utf8-in-string-literal.stderr":"eea9032a7d46e496ff8f6d4a95344b4d7660adb0fc715f652aefea54ce72d85d","tests/fixtures/invalid/encoding/bad-utf8-in-string.stderr":"eea9032a7d46e496ff8f6d4a95344b4d7660adb0fc715f652aefea54ce72d85d","tests/fixtures/invalid/encoding/bom-not-at-start-1.stderr":"dc9eb6707b252b77ee0c30bc471a4bd58308b31bfc892e2fd5c3995458e41b97","tests/fixtures/invalid/encoding/bom-not-at-start-2.stderr":"6570c6feea522cf017c8dcdc1e4b76cfeef2092bc3b938af0140e171817a8311","tests/fixtures/invalid/encoding/utf16-bom.stderr":"d9c278ec8c5a422f4553180ea76dd223278acc0d0ecc5f725235db6b379e5b99","tests/fixtures/invalid/encoding/utf16-comment.stderr":"2f2c4ffa18d08721d707b7083706efe5394e9fdd3504791a52949d76b7442e67","tests/fixtures/invalid/encoding/utf16-key.stderr":"8a8465ae12c6f3065edc3b237b7066bc8cf03b95a22403c8c5a1b1a5f085dbad","tests/fixtures/invalid/float/double-point-1.stderr":"817b02c19d53f02107569e7ddf9b38334cd85edd0a452795baaf6d5c0ffbbf63","tests/fixtures/invalid/float/double-point-2.stderr":"8b5a07c41087342d5f8bfaa8998465dae954cad11d93f01f4ed4a5541694e7d4","tests/fixtures/invalid/float/exp-double-e-1.stderr":"657c856a8d474cec0d557f4a5401456966bc82c8061a092977f4ae0cb71fb04f","tests/fixtures/invalid/float/exp-double-e-2.stderr":"ad101779127abb35a6e35020a4818c1622ae5433208bad57f1daf113357f6ab9","tests/fixtures/invalid/float/exp-double-us.stderr":"e6e53e58b5deefc9e50e6eca91423881b682bcf8528bfa0386158aad9458ae74","tests/fixtures/invalid/float/exp-leading-us.stderr":"5e45eeabdcf142ebd5b5ee2b77e2520c5ae7e35e943034e12c84095f51a1141e","tests/fixtures/invalid/float/exp-point-1.stderr":"2d4202fc806e23ce05f8bb3e63e31d1b4874875b018f28bd2b59c8714aa70cd2","tests/fixtures/invalid/float/exp-point-2.stderr":"d85145654b358cb63f44ea754c88f29a073fe5f637d07b279a986ddc0c347df4","tests/fixtures/invalid/float/exp-point-3.stderr":"3fb7d6151b522057a2b15137daa916681220cf575dec560f084d3c9c2dae1f3c","tests/fixtures/invalid/float/exp-trailing-us-1.stderr":"71aef4dde4dc2371702025127b9802540765a0c0db6f96156bf6542c574b30b7","tests/fixtures/invalid/float/exp-trailing-us-2.stderr":"c63f97484c7c498b01fef93984beadb9311d884ce5b7856ab1301cc398ae9c4c","tests/fixtures/invalid/float/exp-trailing-us.stderr":"f5bbc5fdf2dd018c031ca5c79edd7f16a0da25676bed96ffc0682401497ef362","tests/fixtures/invalid/float/float.stderr":"511c7e989b6e4768f089634036848acc896439a06df83a97fbcb92ade1554e98","tests/fixtures/invalid/float/inf-capital.stderr":"d493ce9b11dae0dea40a2c8c7666125031d5323ab82bf1b8af997049d60072fa","tests/fixtures/invalid/float/inf-incomplete-1.stderr":"6090e21b98dc6df8e67962c8458ac773bf3dd4b78ae4f4453dfbe01657401a7c","tests/fixtures/invalid/float/inf-incomplete-2.stderr":"abc3855709f099a9023f0d3e305edb8c97570223f889431dad32e21e83747d6c","tests/fixtures/invalid/float/inf-incomplete-3.stderr":"9fb99f8ca91b9fecb86ce27e1b4fa6ca05a2d5c0ab039972d4d2a7dcf2c6228f","tests/fixtures/invalid/float/inf_underscore.stderr":"8e7202c508c9d6e35410e4ff89bee3a5db4a88367e69e210fd4ae4f9bf602286","tests/fixtures/invalid/float/leading-point-neg.stderr":"21e3e8ea4c817ca286b1ee6dd359c91b6e8ffcb376bed393e03a29e55d7a6a61","tests/fixtures/invalid/float/leading-point-plus.stderr":"ff0f7a8a5cdccfc7e6d3e6b1381643b759f5aeff5546bfd2fd4dd29f8f1b1551","tests/fixtures/invalid/float/leading-point.stderr":"5c7590482ac55bb0d11eb9e1291a80d8c891ed1949adfc64e81b75bc5f8c8b06","tests/fixtures/invalid/float/leading-us.stderr":"67ce463deceabfa0dd4eeebfa68d72eb53fd235455d6181b4c8597c6507e0ee7","tests/fixtures/invalid/float/leading-zero-neg.stderr":"16b6cf97171ec9f85a36e09a1ef39087eff3a0c441a9f9d96c43a9d0fdb5ee38","tests/fixtures/invalid/float/leading-zero-plus.stderr":"f08e1416644c743b3463342313f023982051e992756e9784229b1bcfc1e19aaf","tests/fixtures/invalid/float/leading-zero.stderr":"511c7e989b6e4768f089634036848acc896439a06df83a97fbcb92ade1554e98","tests/fixtures/invalid/float/nan-capital.stderr":"66fe63db08d9ee24e8a90f4e2b5f2c15fb3f35dfb7eb81ffe760f8957967370b","tests/fixtures/invalid/float/nan-incomplete-1.stderr":"138d0d28aa5e90b9fb344c743478c0b6be79492ecac856d71e239af5f6e1aa99","tests/fixtures/invalid/float/nan-incomplete-2.stderr":"31f200fbfc6e4c8d06f58960dd7349f650af86d22a1f0d6fd8c4df46bb4a0b3a","tests/fixtures/invalid/float/nan-incomplete-3.stderr":"3b16f8d82cdf18df21bba1e83d2aa33e175ab5a37fd5f3214b1be84a07acab10","tests/fixtures/invalid/float/nan_underscore.stderr":"4a30507eaf227e8c8e2bbda6d7b3cb4fdcf793216981d1f9302cb2b049e95d58","tests/fixtures/invalid/float/trailing-point-min.stderr":"0b5c7385ced699074d6042b5fa0ea9266ea64a191dd0e43466ca71a2ceaba76b","tests/fixtures/invalid/float/trailing-point-plus.stderr":"856edc036309660c223b1cac7c99d9d6b61bb4b49e592410c3f308fb0a678800","tests/fixtures/invalid/float/trailing-point.stderr":"5241f4525c36c1cde19d520aacdfb7db1bdea07710d2621d2a60ac7b1d1e70a9","tests/fixtures/invalid/float/trailing-us-exp-1.stderr":"42a7b0d43ef2b548c2199a4c9ade5b30c28b91a625d6bac6f57d721b4fff2848","tests/fixtures/invalid/float/trailing-us-exp-2.stderr":"13c1374bbf3f5e3c762b6246dc8ea1f5e619b3edd6d66a2e37ba51fe3ba0acca","tests/fixtures/invalid/float/trailing-us.stderr":"4103e29434d2c323c7461903cbe27dc0a5a70c9907d2d47ee31eaba3f4d51b2e","tests/fixtures/invalid/float/us-after-point.stderr":"2d0ef75d124b8ff10a48639d2f837a13cb18ae66891c9fc3709199ff724c1af3","tests/fixtures/invalid/float/us-before-point.stderr":"844c0d11f60522784f6f22f7f3d418c7e6f16cd96cafa55f542996974fd267c0","tests/fixtures/invalid/inline-table/bad-key-syntax.stderr":"9fe839d2c861b2026ffcbb37a7aaca3498df90f66da6d402d5ab96ff357de453","tests/fixtures/invalid/inline-table/double-comma.stderr":"67e92c9f776a5bd04f908a79c6f2e8c146ebb6072129ab7fbd9606ed8d56fc44","tests/fixtures/invalid/inline-table/duplicate-key-1.stderr":"3eded78c2d76205b8f516e180f8c8849d6ba34f04df72c5ffac319264d16f40f","tests/fixtures/invalid/inline-table/duplicate-key-2.stderr":"a166a188a3682704cf70153666734fe63ccc23075265d0d20ebfa25ba7a633fc","tests/fixtures/invalid/inline-table/duplicate-key-3.stderr":"3e4cad3fdeda14976a0e6193465ac7b0c052a075b55a4dabb95ec2a03d7ef532","tests/fixtures/invalid/inline-table/duplicate-key-4.stderr":"2ffe3212ff7d4dbdd7f41f0c0d037599d223c1876af8c9fa25770431abd7c6f7","tests/fixtures/invalid/inline-table/empty-1.stderr":"ee1624b0ebfc28edb9af042a4926d6b5b62fe7b6265544b158b577bfab1f0866","tests/fixtures/invalid/inline-table/empty-2.stderr":"70c376a4f2368d3586184e70110115525f35cfef2fd15bd2c0a9579a88868cd2","tests/fixtures/invalid/inline-table/empty-3.stderr":"fb05dcafd2b5e290ea8de8d0b8d9ad0fc58452d75c537e8482a2fa7fb714126c","tests/fixtures/invalid/inline-table/linebreak-1.stderr":"016daca1cf56861089265156af1ef41772ed0c5fad6848cbf8c8c91ddf748ade","tests/fixtures/invalid/inline-table/linebreak-2.stderr":"b259282b6bc1a9f9c96de41d2c5b0f27b9d8648ec8984aeb6760cc15ff5714d3","tests/fixtures/invalid/inline-table/linebreak-3.stderr":"59b34b9c76c57e02df83c8ce97b1f3e856026cbb33416d7335f287222e11ec35","tests/fixtures/invalid/inline-table/linebreak-4.stderr":"8a78e7240345fc8b850cd54d3f1c74187e4abcbc65b85e3b1da79ebf3e139d70","tests/fixtures/invalid/inline-table/no-close-1.stderr":"6da0e9a2d2d272d199745c704aea6bf317921d8ab005882a3de793e6ff87e863","tests/fixtures/invalid/inline-table/no-close-2.stderr":"eef11b2fc399ca9b7a397c5366a9b7a9021e783cb189d68fd5c29cc607a5f4ab","tests/fixtures/invalid/inline-table/no-comma-1.stderr":"d2a33a967d517c9690b90845347d26d8845c997ba4ed61c640a58cdf919d7c7c","tests/fixtures/invalid/inline-table/no-comma-2.stderr":"c4452ed96f19979b36019c568fd8c73e72db2711a87d17cc8f62362b88598b30","tests/fixtures/invalid/inline-table/overwrite-01.stderr":"4e47f343291068cb0164fa2d48be2c3257458ee7467cd60d664bfbb83713f2f9","tests/fixtures/invalid/inline-table/overwrite-02.stderr":"40718dec554fde10db86ab240f5071b35ba564503962938f7b9464341e7b27f1","tests/fixtures/invalid/inline-table/overwrite-03.stderr":"0318c1d4713cea361a857d382bc8b150dbb1ba8f8e613df472e936bab38485a9","tests/fixtures/invalid/inline-table/overwrite-04.stderr":"9e55cced7664c821c073937321880bf75150affa44d4363c774f5834bbac7470","tests/fixtures/invalid/inline-table/overwrite-05.stderr":"59a0ef41c6059994212244c16a8808b4ac721c710f1364639f7116d43a7a8b26","tests/fixtures/invalid/inline-table/overwrite-06.stderr":"c2a6060831445d4143254c6908468bb04cb5be501161028429467a2dbb68e235","tests/fixtures/invalid/inline-table/overwrite-07.stderr":"cbe9f4d1b428e658591e077790986a6589385474efd2ae9f488b6003715198ca","tests/fixtures/invalid/inline-table/overwrite-08.stderr":"d85341eff5c078131c65c801a259d0909921c541ea5a8eb75e752e5d174092f4","tests/fixtures/invalid/inline-table/overwrite-09.stderr":"99c73b045436b330b4f6570bc1a40726dec71a524e44f6b63a8c55ceec4e5f4a","tests/fixtures/invalid/inline-table/overwrite-10.stderr":"746d1cfde95d2c5fd748e4b95fb95383e014a00f73c03625f7ebefa52243e815","tests/fixtures/invalid/inline-table/trailing-comma.stderr":"079ea824e27cae66b32160b99d6fd75b38514960c440ef14274528fabacc98d3","tests/fixtures/invalid/integer/capital-bin.stderr":"9224535b369db24906be0bbbac4ffa80d1b570db8135ce7f58202956cf889857","tests/fixtures/invalid/integer/capital-hex.stderr":"ee731f89283c425e7c54cabd439651cc4926c1d721ee92ec809b123521ff7c91","tests/fixtures/invalid/integer/capital-oct.stderr":"52005625e8e51afa09a5163c9eaa010e09830727128d68a1e48fa600be6823e5","tests/fixtures/invalid/integer/double-sign-nex.stderr":"819ab532a90faab548580eb0a959199466acfcd04d29d77cd0af7acba509cb1c","tests/fixtures/invalid/integer/double-sign-plus.stderr":"94f6b7c5dbe458ebb1504b7672a36c9d115e17b0e629dcfe47360803c9cfa923","tests/fixtures/invalid/integer/double-us.stderr":"c9a377fc0417b12123e9cdc4b2fe69aade63e532e20e65f279d7b4460ad05e49","tests/fixtures/invalid/integer/incomplete-bin.stderr":"143b9a89feb99b5a420bdc6aeff919ebf6d53bc011f31afbee5b8677a8ac84bd","tests/fixtures/invalid/integer/incomplete-hex.stderr":"b246cd8117362f5451c60298a318d6f93233bf9959c73cdd7a6d590d226291c2","tests/fixtures/invalid/integer/incomplete-oct.stderr":"4cdbcf8ce0a743a9442321a15c01670109debeed6a9712a95d2cb95a9debc469","tests/fixtures/invalid/integer/integer.stderr":"1afca937abf7f267f8c8e9d2112309d1aa2dc90ee1e2d4328f5a30b19ab70941","tests/fixtures/invalid/integer/invalid-bin.stderr":"e94521b61ae2bee5032073007ddd027945723f8c7faf3b4523ba1f8e9604160e","tests/fixtures/invalid/integer/invalid-hex-1.stderr":"5873555438d114b5d1eb323cdf95a651bef7f95b4c1259d657fdeb993350a2be","tests/fixtures/invalid/integer/invalid-hex-2.stderr":"fac8c488203e501d3ff383313f8a1beebfc5ff5676eb6624ca9a774094105bdb","tests/fixtures/invalid/integer/invalid-hex.stderr":"521096bb5d0c10e420a452adb133eecee4e153809a3c29822e64569e4ecf2779","tests/fixtures/invalid/integer/invalid-oct.stderr":"cf940d8abf0a98dbf4b139089cb964964b30e6fbdf89d9a11bfe94b06bbb3547","tests/fixtures/invalid/integer/leading-us-bin.stderr":"34a6f856274435b07ed74ddcbfd0c471920b418858fc2685eacacf8b814d2222","tests/fixtures/invalid/integer/leading-us-hex.stderr":"a468c4d3ef104f5f575ef61e01a2889bd52112fe00917380d9fe094e7f1f0625","tests/fixtures/invalid/integer/leading-us-oct.stderr":"c6600b9cac7b6a935923b951b24051f2494fdc2d351c0f109f63da546a280315","tests/fixtures/invalid/integer/leading-us.stderr":"4c156a62e39d8404bcaea001ad347aa3366ad956899fb385492203d17da9b34e","tests/fixtures/invalid/integer/leading-zero-1.stderr":"1afca937abf7f267f8c8e9d2112309d1aa2dc90ee1e2d4328f5a30b19ab70941","tests/fixtures/invalid/integer/leading-zero-2.stderr":"4e4ce0d6714fb455def4a586c076072bc8d83b87f3b62122611b6e62df5fe532","tests/fixtures/invalid/integer/leading-zero-3.stderr":"d28a4f3b59454eb4a5756d9878b54c03a154aa3af32a9bc4b746fa8d4c842454","tests/fixtures/invalid/integer/leading-zero-sign-1.stderr":"b84ffda89f4797a517f8488b59ebd795fa42e59be7719b3883b2290c8f1060db","tests/fixtures/invalid/integer/leading-zero-sign-2.stderr":"3484e932794a500ed92322323032f7ca2c95fda1af3586fe3d9d5d0cdcdc41e3","tests/fixtures/invalid/integer/leading-zero-sign-3.stderr":"1f7afe7069d13990918c68a32ba46a9e17a305ced699c94cba72b01eec5aed93","tests/fixtures/invalid/integer/negative-bin.stderr":"b3825a06a49dc04be695629fb45ad33a6882ea73821c3c42db7dc9ebc878b5e8","tests/fixtures/invalid/integer/negative-hex.stderr":"f54b8ecd33db30a04ff9312f4b7a42d06ce8c276062a56bdf3773b10e267036c","tests/fixtures/invalid/integer/negative-oct.stderr":"12a30a960af847a2762336b6b0569d603c84dcb31a694bc93a136fa503c298e6","tests/fixtures/invalid/integer/positive-bin.stderr":"f4f91449d9863cfb107f4f174e12e64b01e676c36bab77a431078c9a0fda6e94","tests/fixtures/invalid/integer/positive-hex.stderr":"1ea707ef22ca30bd0ce9becdd4c6c3f04a65a79c153ec38875b4a8626c62dbf2","tests/fixtures/invalid/integer/positive-oct.stderr":"f033b6c19e3f1f04c69baa8ebc4156ac913be0428e85fd474a99d57298c23e75","tests/fixtures/invalid/integer/text-after-integer.stderr":"581885f158d84ac387b8bfb483d4bb0593e23bbf251a63a542ec81630ffd0bd5","tests/fixtures/invalid/integer/trailing-us-bin.stderr":"7e5928cd15695fa35403a024856f64cbbf7a056e8079f76d1923e38401086e41","tests/fixtures/invalid/integer/trailing-us-hex.stderr":"83d3672baed59c1b0ca8b27400b469cd18d2c0790ececd9d5dd72e283ceb4584","tests/fixtures/invalid/integer/trailing-us-oct.stderr":"e048d0b7900704573a076501b5fa48289dbaec4ebb279f10775ab0b8c5060dd6","tests/fixtures/invalid/integer/trailing-us.stderr":"9e46f25d350e02fa57100d87917d9e6a961907df89955c01bbd2bb473f807297","tests/fixtures/invalid/integer/us-after-bin.stderr":"e833ae217e60edfe08f5c76fbbd8ec2bf6de9b41b16905e474791f1b5bc4695f","tests/fixtures/invalid/integer/us-after-hex.stderr":"d5cd357750289db24ddba5d8278eef6073f591a05bb495096e8f6214626187e7","tests/fixtures/invalid/integer/us-after-oct.stderr":"7254481b53b8602413ede570876963fb6ea9c2699adb986ee17023cabf5916fb","tests/fixtures/invalid/key/after-array.stderr":"8489fa15adf8e674687aef4a8ef8acc10235ada0e7a3b2fa17aaeae9f9e02189","tests/fixtures/invalid/key/after-table.stderr":"d1856cc75dc16c95c045ae4c05982448e3c2680057cc1e08c09ebe68ffbb35c8","tests/fixtures/invalid/key/after-value.stderr":"00398c3f1305f387b9ff9f17dcc76061350a800e652e00ff2f3892993c42ea33","tests/fixtures/invalid/key/bare-invalid-character.stderr":"19220d575145a93b522e39f59ee63fe0418194fa2b80d9649916d4b8df556147","tests/fixtures/invalid/key/dotted-redefine-table-1.stderr":"169e40f3d1be87cf099a9e7c6e39175ec0fd701c933b427cefc300d2e854aa07","tests/fixtures/invalid/key/dotted-redefine-table-2.stderr":"72d632c3572aa914603d154152e10157d4db3d90db0da0eca88baf1416b3e29f","tests/fixtures/invalid/key/duplicate-keys-1.stderr":"f4207dea6f110318da0c9c71b3957c8182b133bda91911804a98bac71c025cc2","tests/fixtures/invalid/key/duplicate-keys-2.stderr":"a5e1fb5b90daf5b7e659ed76c82dd0ff6cf2a09e3578c98bdf907bc7801614ce","tests/fixtures/invalid/key/duplicate-keys-3.stderr":"c8d91fe50b91ad091430b9699aea28a42b7822373c43fa064900721df066d45c","tests/fixtures/invalid/key/duplicate-keys-4.stderr":"ad171657bb84292443753bdf9f2963cb268a45dee78ca4f39dd474b6698fb020","tests/fixtures/invalid/key/empty.stderr":"0da32834de6e29b7254260b51b5b26f1537111088f2dfcc7085cf717aa9c7b42","tests/fixtures/invalid/key/end-in-escape.stderr":"f8710ef2b803f053d1c2f85204f7d9beadc485c4a5525d1c17d8c8cc228c0eca","tests/fixtures/invalid/key/escape.stderr":"11c5f871342cd20a90270eb3cc47c06fb186e7493d27026f5936e78c0bd088b5","tests/fixtures/invalid/key/hash.stderr":"55122578bd7c090a641a0aaf980aebe3fd2c1fcf820da4d72408bfce527a5293","tests/fixtures/invalid/key/newline-1.stderr":"32c0795720a45125ff56a3e0a20ce62c2a2174fc02f44f2dd6620db15bc56547","tests/fixtures/invalid/key/newline-2.stderr":"f2d74552b3489eb7f89ec8f4cfb5084ac21ad338ef2a0d320a57c0eca30fe5bb","tests/fixtures/invalid/key/newline-3.stderr":"672d411c92fcfdb495b41a15e6cebf0e73d4484e6a0902772b9937f5ebf35c61","tests/fixtures/invalid/key/newline-4.stderr":"aa2b599e10e8a20bec1d1fe112ec90ccb5bed8d42e43dba8ccf0d5c18d4b131c","tests/fixtures/invalid/key/newline-5.stderr":"961866b075ab56f652c9661e900070b729ce5db2f57210e95f9c3955f5ba4b41","tests/fixtures/invalid/key/no-eol.stderr":"e8f14df57190fc8a0f4e704a38c42126aef0663f9315f84d23c371f0860a5a73","tests/fixtures/invalid/key/open-bracket.stderr":"330a1a96948b442437bd81f461e91e0b328e225abd304832b7d1660eebc77c5b","tests/fixtures/invalid/key/partial-quoted.stderr":"29dd53ef16e939b137da2c7d62c24aa2481bd44359a02578b77597296b25efc8","tests/fixtures/invalid/key/quoted-unclosed-1.stderr":"6b566ea67dd061ec05c6754bebdb583d93934412cdc6176bbd68d3bd403cca7a","tests/fixtures/invalid/key/quoted-unclosed-2.stderr":"396c4f9bd1ff398b439ae54b23452007e1e7518b38232b89b0f5b1b448e764cb","tests/fixtures/invalid/key/single-open-bracket.stderr":"52d8e13b39b9507ef37a65c0eb779e89ff7d00fd4a70245d44225a35200a6ae7","tests/fixtures/invalid/key/space.stderr":"9f3d6ed39f1a05ac99bedceb66c53835090182b47293bdfa0c080ac80285bbb0","tests/fixtures/invalid/key/special-character.stderr":"5fa9a11b46c2ccf749e3e4702c2000ec6b95abdb864eca0653943c669fb58040","tests/fixtures/invalid/key/start-bracket.stderr":"93a0e8ada8447d60ae738b4c0816d9087a84932dad2651505327ff37d3b12c86","tests/fixtures/invalid/key/start-dot.stderr":"25b23ad9a454746edcffc91b79eee11bdc9d9daf67640aa8d28594a98da3ddc1","tests/fixtures/invalid/key/two-equals-1.stderr":"f5398f176b3b1a3fac4cc7d68d1e595e2f1b60f92ebdd4f3f9bbe5d7191eef3e","tests/fixtures/invalid/key/two-equals-2.stderr":"099b5d50827299b921c3c1c00a2c804d580f67d06c2e5593660c6d6ad5900a66","tests/fixtures/invalid/key/two-equals-3.stderr":"b51c719bd0d8f585b4b017937e7d0df2ded58e3a37e2cc17cf9bf04277347a1b","tests/fixtures/invalid/key/without-value-1.stderr":"b1a087f97400f49a9bd6ba8bf44b3afbc3a0db6423d17b95fca5fc5be7a3a775","tests/fixtures/invalid/key/without-value-2.stderr":"cef84c2625e41ab3fda621f35d5e936a8d43bd292f3856f80cd2a148efc6d6b7","tests/fixtures/invalid/key/without-value-3.stderr":"295097c33c87dd153e607b3aaf648168678e6773e28ed0148d0b2e5144c1c0e7","tests/fixtures/invalid/key/without-value-4.stderr":"65173e2596ae1ac268c1f5a66fcb2e83be5663425aecf3fb3a99091b6fd40ea3","tests/fixtures/invalid/key/without-value-5.stderr":"9279c3cddcea9568abe57303cb5de41d8d1c71ac4ec991e1fd28651776314b57","tests/fixtures/invalid/key/without-value-6.stderr":"dfd20b35750e3a3cf1da7e8e1f20043235c0349cfd118bb12cf1a42165cc7ec5","tests/fixtures/invalid/key/without-value-7.stderr":"d0183883abf80ce86271bb0b8704637f93830cccb4c853f7834d132c9f153d4e","tests/fixtures/invalid/local-date/feb-29.stderr":"4c97e157ddaf9940d438560f34642ec4903609417905c02456ae386ade5573bc","tests/fixtures/invalid/local-date/feb-30.stderr":"1710668c24dd3aa9fde6e0f782eb880af872e4bb5a5186b281c8e6ed40e86dca","tests/fixtures/invalid/local-date/mday-over.stderr":"546af4611d7a589f4907bb085b74a5d74aab7505b613c448d8075aa9f14633d5","tests/fixtures/invalid/local-date/mday-under.stderr":"102c21e5b546a4a069c576d7ccc5a1bc259522e951fd7487e7ceb26f982bcc43","tests/fixtures/invalid/local-date/month-over.stderr":"4cac731d0f95392744498706c91b4940a30254d3910856da666bcdf1610c80fe","tests/fixtures/invalid/local-date/month-under.stderr":"df4ca9f526a23709fe9feb51b71b5ae3efac806a3fb337a40b626a27104b4124","tests/fixtures/invalid/local-date/no-leads-with-milli.stderr":"67e6de0c6025e5f498e0d5e0c7bdd2cd74a01cefe0a3992ad935b7b7f260fe93","tests/fixtures/invalid/local-date/no-leads.stderr":"d653403d2686bf1e56c21a120b7a6fdfd6e0f5bd231b14789259c23028e16dec","tests/fixtures/invalid/local-date/trailing-t.stderr":"9cf2e418427abe378484486356229b38f1db53842090a2d7d0637cad1a6b16c5","tests/fixtures/invalid/local-date/y10k.stderr":"ff9286e64bf70a2e35bed170d191349f0045fc8d6f184a183cbea693496e99e8","tests/fixtures/invalid/local-datetime/feb-29.stderr":"3fbdaad131492c5e7c85df1e90f73977a2f1236422b5fe86847fa000dbee7e5b","tests/fixtures/invalid/local-datetime/feb-30.stderr":"32e38bb349f6cde4e60534764f5839240313caeee12ddf4d97d4df404a6f3b01","tests/fixtures/invalid/local-datetime/hour-over.stderr":"0aefa752706aca82810109a94b9a5bbb8f50ebc4aa85bfb091466618c714c1f3","tests/fixtures/invalid/local-datetime/mday-over.stderr":"5873d8c67de9fd55e424aadcdb68d42842ccdee9f2e2e94e0bc42caea6635645","tests/fixtures/invalid/local-datetime/mday-under.stderr":"a1df2d77cf02f3cfe2a44daa946978aeff84db9ee033e61358e2610ef8acd3d3","tests/fixtures/invalid/local-datetime/minute-over.stderr":"1717bf680a89f59a66d5dae8dc98a17757b8973f70f869744ce6b496fa2c7c9d","tests/fixtures/invalid/local-datetime/month-over.stderr":"ffc05504137e79700f4c78955470e975bee840580cf10229202903a498e09858","tests/fixtures/invalid/local-datetime/month-under.stderr":"8e77bd4dad24e1d7e5c017702410cea56a085585e7d97425c55761b0246efde8","tests/fixtures/invalid/local-datetime/no-leads-with-milli.stderr":"88a35c260a65588d5ca0246c0f27f5e5e6fe8836777e5998c9f3c4bacca1c8f2","tests/fixtures/invalid/local-datetime/no-leads.stderr":"40795bab32c16aa63e609add7f809c7c22d2764d98700b3eb91c20e6eea156e8","tests/fixtures/invalid/local-datetime/no-secs.stderr":"f946633b31380b72df35d6a0e371f4eebca26332abac1c3d2841918461df30cd","tests/fixtures/invalid/local-datetime/no-t.stderr":"802e0bcf8a66b32fe9f2d0571808782bd37a6f1ff8c5e92368b5ad4c18d2218a","tests/fixtures/invalid/local-datetime/second-over.stderr":"7494350b21ac24f7f30c95f568412d7214a66dd9b04fbf454647f0972588a7fc","tests/fixtures/invalid/local-datetime/time-no-leads.stderr":"5117ac62dd754a203f2fd6e5163a2ce352776bee513219252cec77c0ed71bbbb","tests/fixtures/invalid/local-datetime/y10k.stderr":"66cdcfa2f4dbd5270936e531a1f3a9ac54a70dec246f3ef93b180911c201db1d","tests/fixtures/invalid/local-time/hour-over.stderr":"0f0507c0f3888330f1346e6a4c100c4bcbbc6549599cd39249fb59c7923b1801","tests/fixtures/invalid/local-time/minute-over.stderr":"052a762b6f62e21d59d145da3d242489990f99023681a4a645022af743a836be","tests/fixtures/invalid/local-time/no-secs.stderr":"db11e76aebb5c91f57869f1dd14ff7b0ab19b400eeb8b15936d0d82e4a8d0fe0","tests/fixtures/invalid/local-time/second-over.stderr":"18402b0e6cf205f466e3ec3d409daeeb77e355d41548f11bd3e3369240a282d8","tests/fixtures/invalid/local-time/time-no-leads-2.stderr":"2e446fcabdeeba0c118d1d49b89d7ad1271dd9eaf1ba109ee445c4f68ee96214","tests/fixtures/invalid/local-time/time-no-leads.stderr":"70094ae81f89871b0804839a5cea0f7591ab55b6c72c5d2867004cd4a0e0d86f","tests/fixtures/invalid/spec/inline-table-2-0.stderr":"41118ecf5033fdb7de4edaf1abf90e524bb50f8f3c44ef0a080be4ba1470b82d","tests/fixtures/invalid/spec/inline-table-3-0.stderr":"b7ea14eb8c6ba2cb126dc3947d00ce10a5403103a682e719ff51efebae6bb613","tests/fixtures/invalid/spec/key-value-pair-1.stderr":"d8b4149dc0ede93fe7c0d7d02a0df9d31fb2456b87ebeb532623bd6f825c2d23","tests/fixtures/invalid/spec/keys-2.stderr":"de2e84dc37ec53bc12ca585a9d2586404a920375bc201d7b2643fdcd537da691","tests/fixtures/invalid/spec/string-4-0.stderr":"c6dc77f81979a92cb5612b7f4b8e96d41bad9bf7a9a706bff5a05a6c65f76e86","tests/fixtures/invalid/spec/string-7-0.stderr":"3226561489c03d8fc983b0584d40f18629f46a425c5c7f34a4e984e164a4eb38","tests/fixtures/invalid/spec/table-9-0.stderr":"23b1d3b522e9fac974c4ea254df4798adf574be6dfc8ef1107438c502b3aca4e","tests/fixtures/invalid/spec/table-9-1.stderr":"f0164ed288eedfed3a6fecabf305a93050a6c3cc6a9397894633e4ac33b2c834","tests/fixtures/invalid/string/bad-byte-escape.stderr":"5807e3215b0def7410283291aeeb46514fa0a65d4326bff3669585e0222d5b2c","tests/fixtures/invalid/string/bad-concat.stderr":"176458d0d31d02a16e9856a80b1b9c4dc040b3ee3c83c8a678df9b1bd12c1e4b","tests/fixtures/invalid/string/bad-escape-1.stderr":"388e58e25fd5fc78b2465f1258c952f4850211b19e9fb65cc31a29774a19aabd","tests/fixtures/invalid/string/bad-escape-2.stderr":"51829779b7317fe753c54b53eb08fba669b16fc970fc29699a0a497aa95dc623","tests/fixtures/invalid/string/bad-escape-3.stderr":"8e5050c043061a991f6cf84be6b6e6ce468a35dd2ac50a3a4ce2ca1e1d5304e1","tests/fixtures/invalid/string/bad-hex-esc-1.stderr":"68446cc8fe418df4441e15118161a953cbeb22822d67c54b81c8f97aa48005f3","tests/fixtures/invalid/string/bad-hex-esc-2.stderr":"d7d979d0c5700548eae7a42c7e87253de0118b67a67ef6dbeb0598d574800099","tests/fixtures/invalid/string/bad-hex-esc-3.stderr":"fee92d2f9937e322423201b3099c7a246fabae85ccc23e990b602e1f5e181d9f","tests/fixtures/invalid/string/bad-hex-esc-4.stderr":"2c6f994aebcd9e644f469c84edb9d8ba6b6b094a949410935a590e8e6e6122ef","tests/fixtures/invalid/string/bad-hex-esc-5.stderr":"10f740ce3c36f4a8f7a1f8ab5c84e0fa5e4c3a88ebe534f79858781079139a96","tests/fixtures/invalid/string/bad-multiline.stderr":"a1ecdec206e87461bb4bb27ecd21a43da48d1d5bef6d8d746958d45219ce9dfd","tests/fixtures/invalid/string/bad-slash-escape.stderr":"7f3b917db5a8d87484f8b03680a2cd60288e549c5bca0c9e00c7e531d3e0405c","tests/fixtures/invalid/string/bad-uni-esc-1.stderr":"385be83541cc94367c9849619740c8d198b9c138f6f4916685cead90fabc3b9b","tests/fixtures/invalid/string/bad-uni-esc-2.stderr":"592fd536f48c1aa6c4c9b454c5cf5e1a7473860602ff2875430d4a7e676b6594","tests/fixtures/invalid/string/bad-uni-esc-3.stderr":"f6c284685af63ac02fee8e8ee641b03e90893a03001834625ca22482cae4d29a","tests/fixtures/invalid/string/bad-uni-esc-4.stderr":"1df7029bc305307943cc58417f98cca4c854deba8475b305675b2505d4d9b83f","tests/fixtures/invalid/string/bad-uni-esc-5.stderr":"6cfc8fee06b9770271b1241ba6025a470b1ca8cbb80a3dce7d6ee1b2c2f7f637","tests/fixtures/invalid/string/bad-uni-esc-6.stderr":"73d8f5132741c15286327111496d475807dcb638b34c10db20bb37d96910c209","tests/fixtures/invalid/string/bad-uni-esc-7.stderr":"c9c967322b827675040ad78cf4fa1c9890bb13a124a2274eb693622d5ec50420","tests/fixtures/invalid/string/basic-byte-escapes.stderr":"50d06255616038364b52a0a32113d96e8b87de8e5ffcef93c2c88d0af9b57670","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-1.stderr":"b26e80921025c1fb0dfe33c01460e5ac96791585ab8204db3e76c83ccd404afb","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-2.stderr":"c9f8c422be49fb11111623c4322c421b25bb9592fade95bc1cc2ed9c3c2bd93d","tests/fixtures/invalid/string/basic-multiline-quotes.stderr":"70de515fa0500fe6ba3b915d224653824ae4e213cf41d9b3465b536a0007c623","tests/fixtures/invalid/string/basic-multiline-unknown-escape.stderr":"2c104ecdfe88a89893d167ad41167108208d3aeb0c22c7d5193950ac2805af60","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-1.stderr":"82b7d85f48c58289c81d149814c591195f361e23875dc2a9767215bf077a148c","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-2.stderr":"9b28ddf18556e9adaf77319877189112aa8ac93464ecc09a8c5020c3c13b143a","tests/fixtures/invalid/string/basic-unknown-escape.stderr":"81ebb5efff40faa0b5161e4d92faac81aaf85c038987ca3d0ce7ff28f91f3cd5","tests/fixtures/invalid/string/literal-multiline-quotes-1.stderr":"6776f505f0a2a6a67e3e5fbfa6ca0b9ca2653a1a623d1fb3b463305ec872699f","tests/fixtures/invalid/string/literal-multiline-quotes-2.stderr":"e304eb9ed3f7a136c74a1c70fe73f5f75a169ea93aba2789e6441f84fbcfb03c","tests/fixtures/invalid/string/missing-quotes.stderr":"ae9dea4e735224472bfcdb61471def4877404a0a3680e41340b0495552ea8133","tests/fixtures/invalid/string/multiline-bad-escape-1.stderr":"7c5fc3bf00f17344781150281839f78228905d85e41895f4c6d5fb67c7ef0a2c","tests/fixtures/invalid/string/multiline-bad-escape-2.stderr":"c4f5464eced80eb93368ee62ec14c6c4c8160ec7e33000b5d7840f748306b2ea","tests/fixtures/invalid/string/multiline-bad-escape-3.stderr":"ad14d3d916a15353394638613d6d79da2e004e7e522c48edbd2ff45edbcb2685","tests/fixtures/invalid/string/multiline-bad-escape-4.stderr":"e0b254f4a49cde181f4d8d94e032299e1506a09e8bc5bd54590a04251d5978ab","tests/fixtures/invalid/string/multiline-escape-space-1.stderr":"addc40c648a77da6e8ee3d63e73e58331bc5f8cff6d4ba67bfe679db464de835","tests/fixtures/invalid/string/multiline-escape-space-2.stderr":"8e9cc938972808cdeb4e8d2f180e1ff856000eb52f3e77ed5149658c15296d75","tests/fixtures/invalid/string/multiline-lit-no-close-1.stderr":"5e57a18bec64d8ca2fd53473aff6f1cdc8e5c35209ecf84a9e9da8ef3865fcfb","tests/fixtures/invalid/string/multiline-lit-no-close-2.stderr":"40a6c9ece9e2b03c137283b825b6c0380e5778e1c76d20ed2f46647e3ea6b25d","tests/fixtures/invalid/string/multiline-lit-no-close-3.stderr":"cfefa000b457e225de66a0618b2d245c0887099cda67c6ced68612df58a50c49","tests/fixtures/invalid/string/multiline-lit-no-close-4.stderr":"12629cc0445ac282832bebf35e0bb2eb1e305a4a4c147f4103773501d56d3bae","tests/fixtures/invalid/string/multiline-no-close-1.stderr":"40f5d85746b8d297b1cc27bfcb95b8bd2a2a471f0b820bca0b3437c4ff6fecc2","tests/fixtures/invalid/string/multiline-no-close-2.stderr":"3c121acbcad1ef6821da5452f0e9223f75915be50ab11d69efa498cd2c9685a4","tests/fixtures/invalid/string/multiline-no-close-3.stderr":"9850d68e589fb8ebe7b1cbf9f27e4ac991d27b939a5be577df02aa9dae58207d","tests/fixtures/invalid/string/multiline-no-close-4.stderr":"dd0703ac4d584850805bb5a7afdb1e68db06fef1dbe2a93ba85b01ec76da6b9a","tests/fixtures/invalid/string/multiline-no-close-5.stderr":"c6874fe259394f8a14636182b4fb0f20009d678853fbf4f5c7e0e0d53fe0b789","tests/fixtures/invalid/string/multiline-quotes-1.stderr":"4d524fc6b34800ef6093894044763f1eba2b4fffc110b2558ad4f76249985651","tests/fixtures/invalid/string/no-close-1.stderr":"ee585c98fe640bd5a6edb8c5930358b1a7c9085d07e7fb318bc094e81dc6e1a5","tests/fixtures/invalid/string/no-close-2.stderr":"2284df23ebcab2f4a535e31726035f5cdda9d56190269a8189bd959fb806c636","tests/fixtures/invalid/string/no-close-3.stderr":"30cb3d9d517219b70c7d468207f0f4567d80b00330a943f482803980d8f65998","tests/fixtures/invalid/string/no-close-4.stderr":"4ff50513bc0249a3e503db5f255c1251bfdcdb764a6541d484f7e09bf4efbcab","tests/fixtures/invalid/string/string.stderr":"68446cc8fe418df4441e15118161a953cbeb22822d67c54b81c8f97aa48005f3","tests/fixtures/invalid/string/text-after-string.stderr":"a20980f6482cb204272c705c89ee6cc0987b44c5fb357466f05fe442754c1cc7","tests/fixtures/invalid/string/wrong-close.stderr":"6b376b179dd7022bea271e63e77f0afc15076cd4ad0c81bae6007fdc430072a4","tests/fixtures/invalid/table/append-to-array-with-dotted-keys.stderr":"76b544968f3a5771cd2f5efad26167ab5bdcbd8b067586ec0e602281ae5869dd","tests/fixtures/invalid/table/append-with-dotted-keys-1.stderr":"1379eea8bb3f62ddc212705a525cad262da23f16b03bd0626650c61c6811a680","tests/fixtures/invalid/table/append-with-dotted-keys-2.stderr":"7b0ce2aee2d44c234a14bab3fb339661f00b3e3bd39784f3ae7058f3a48fbdc7","tests/fixtures/invalid/table/array-empty.stderr":"e3cd186fd3a22b55fb7e18c6247f91c8da4b61396bde01ab970847aba933b80d","tests/fixtures/invalid/table/array-implicit.stderr":"dcff7e1489ff2a416a5945891c7007152ebbb8cd028baff4439ad2167a1f5976","tests/fixtures/invalid/table/array-no-close-1.stderr":"a816d34d85c8a0ced8cb9315723ea1483711a6f19f6e2e2c96a409d7d43c6fe0","tests/fixtures/invalid/table/array-no-close-2.stderr":"b07a23ed41ea508abc35fcaaad1b38d30705ad874e62ecfb6affbffb39ff4487","tests/fixtures/invalid/table/duplicate-key-dotted-array.stderr":"abfbf76b0555af439f38404ff1f4b2736a759f1bfca347f5eeb8a3754312e835","tests/fixtures/invalid/table/duplicate-key-dotted-table.stderr":"a55218213d972554ab52867926d6c108a308c009b8be13e05578cba1a8638f67","tests/fixtures/invalid/table/duplicate-key-dotted-table2.stderr":"ebabea3cc176fc9f85083f697fd9d6ef97d7230e369be4c504e78c00a82672de","tests/fixtures/invalid/table/duplicate-key-table.stderr":"58598e44d8ab8e8fcaa0f9ddbe2415013ade6965db761d99162312cde1e56fd8","tests/fixtures/invalid/table/duplicate-table-array.stderr":"4079ad8885e7fdd2a0674c31767efb16350ac5906ea5f71f980e06b804a515ba","tests/fixtures/invalid/table/duplicate-table-array2.stderr":"9b647eef2e77b8538ea32d0533b80c870fa4173f0a5b151399c84d7edde3f31a","tests/fixtures/invalid/table/duplicate.stderr":"f537ae526887a2288b943ec1b2d3ee31bf0c9193feaa27bb9e8c447e104ece6d","tests/fixtures/invalid/table/empty-implicit-table.stderr":"b331fd776de53639f8b6f9740f0922ca97aa3919ea365904829dbd61e39a58d4","tests/fixtures/invalid/table/empty.stderr":"bc6c1109c2dea2c69becd952c68f7ced16d983051a9a0b32af1868349e4f2f40","tests/fixtures/invalid/table/equals-sign.stderr":"93ab20fbe68fd87648a4ee58d8af26ea7224818f605fa4cdb2ec5aaad652d050","tests/fixtures/invalid/table/llbrace.stderr":"90b78fd64904ea772687d8fea6df07b684a6d278a47aab242eeace8547921a18","tests/fixtures/invalid/table/nested-brackets-close.stderr":"85435c519a813544af5e686cd89f0a7c2944ab30806ee6fc3632266a03801a51","tests/fixtures/invalid/table/nested-brackets-open.stderr":"2bbca8c47edf49cb4541d869ec198beb5167bd9ea1e40d7daa461f03c5554293","tests/fixtures/invalid/table/no-close-1.stderr":"6e1bbe0ba02c31cd687a9dc8fe0fde2ce1c0cda31aec651dff58f41d8aa7d62a","tests/fixtures/invalid/table/no-close-2.stderr":"3e35a0d431a1056285034b84870455d508ee26539d5a1ff460373507f081b813","tests/fixtures/invalid/table/no-close-3.stderr":"68ce4165d0133af527af7c56fd1af4e652af27cc221f1051a8073e7192a78a20","tests/fixtures/invalid/table/no-close-4.stderr":"52d8e13b39b9507ef37a65c0eb779e89ff7d00fd4a70245d44225a35200a6ae7","tests/fixtures/invalid/table/no-close-5.stderr":"7c3f3c078dbeffcf3b55d3ba811d89fbdd19c1d2ae62b290224003ad26863a00","tests/fixtures/invalid/table/overwrite-array-in-parent.stderr":"f4f94892b9268181ad4e5d64337ec3bd11d0b1a49add7a7c52a0a949f511e79e","tests/fixtures/invalid/table/overwrite-bool-with-array.stderr":"1773dc739ded58c66dadc101668fde5877ba018268dc3b124a4b788b0a0f1c68","tests/fixtures/invalid/table/overwrite-with-deep-table.stderr":"7e1c743c45e4919cab3d36cff96a2165f15cd749411d8c9e758c7ccb7d972893","tests/fixtures/invalid/table/redefine-1.stderr":"a8795ab0ce678bea6299751633e08747b862a46c8f4546094cd1e5f643715202","tests/fixtures/invalid/table/redefine-2.stderr":"dbd674695c75ab83513cf0207304e7ec84565d6dac607e8da85eb9cf41475806","tests/fixtures/invalid/table/redefine-3.stderr":"e161dd3883e7d38e558d296898b637a09ff287cf35a8d921577693fd3c7a2770","tests/fixtures/invalid/table/rrbrace.stderr":"412d28cdee519340465a0e764529acffd5947f566d8b87d69a1a9890845e3747","tests/fixtures/invalid/table/super-twice.stderr":"c9d37817b5e5afd36a2ef3f12190ccf512217e5fdbb78d075d873ca2d2a90f98","tests/fixtures/invalid/table/text-after-table.stderr":"accc6467f519ab738eaa646c255d527ae47c4958231db59b2a9ef16549dc2fbe","tests/fixtures/invalid/table/whitespace.stderr":"73d125e308a219ce5aba0d45ea17b6247eda746e76740f640066b891092efd16","tests/fixtures/invalid/table/with-pound.stderr":"eb3fd32c944de502852f2e7b453f3f56849e7fbdbe9060863f9d65e308bd7f2d","tests/invalid.rs":"ca167500621d70ada023990cf7df4acb329f3ef75964b4d7d818d7b43d82f4c9","tests/testsuite/convert.rs":"5fb95b3296e209ad317f47c9b6b989d432a425e2ec6178c0f22c122a7a0f782a","tests/testsuite/datetime.rs":"105b30cb4cf522c7ff955e8194cb9cd9cf6ec7fdaeb4f316d5504c4868d9c0d8","tests/testsuite/edit.rs":"2a61ae478fcd687b9259f50fc828f599e9eae69a429136cb58cc3af044d96464","tests/testsuite/float.rs":"cc59fbdff449f40727c3032cf9646e28abb420e6990556cbb5dd5cc71cdb910c","tests/testsuite/invalid.rs":"a5ed3dea64d13d9e65bf5166b344ae62fd1ee6a5ab55c4ade2bd48e7e6345db8","tests/testsuite/main.rs":"c85d415a8c20f47f383c051fe7cfe3324947844bee922d6135cabdf63ada8403","tests/testsuite/parse.rs":"2a78b47d13ad27ad728b6bceef1ed8d2c8fe2f695741a03c439aacadf1817f57","tests/testsuite/stackoverflow.rs":"6fd57f327d049e645536f66587c5a09a3b1db1a5775bba87fdd14f3152f771f8"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"f474e15b5e45cb030701e8bb2ee732bd71ed8afe82dfb90f21a51a2a2eb5a4bb","Android.bp":"cbbf49d65b7d5ac5998800f3b995be86cdc1769925411c8015c9dcb322e12a39","Cargo.lock":"f4d23b06ae3b1896c4dda9e6a8cf5d91ac7fd39c6bbbb011de5cd512a7f7aaf9","Cargo.toml":"da166bdd7496436389b616aa50eeb9ab89f53cf2da7c97a7c5d252ca3af06ef3","LICENSE":"7b1c7a1aa99d919e93ff9b6a265d75f2aefea4ae27147ab6dafd8513e64b8a9b","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"f796074e5e74904daaf2e8f75853978569d6982f9e67ce81d760747f81553e5c","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"f45dac46b26743d4f8fe1358b5c4707f782eb6e487f8a9b8443ef774e9483b78","cargo_embargo.json":"397647bf02fb37ea9b3ec5313148fac22602f64f91ec8ee36cc82f1f0f58b793","examples/visit.rs":"97b91b3931ea8a2096cfb5982ff97c6a3b71698c72698f73293bbfbaaece0e12","patches/LICENSE.patch":"4ba5ca15afd2172bc25ec72dbac0b97c03f67beea425aa56194acd0472acf72f","src/array.rs":"3782a701436c40e4babeaaf40602f6df8ef511294a98522400a1c57ee963d8f8","src/array_of_tables.rs":"ca1b69a942378075e7f5ab0ae09d27bcdb7e78c2c0bb0bbf07e7d5f837338078","src/de/array.rs":"3bed5da8060696518c5e2a3800c221ecdfe3e392350967caa2ee2aab1dd46bed","src/de/datetime.rs":"adcfa9c96a655face16212d4b9be0221723c5916dd4ba0b967c363273c6acf3b","src/de/key.rs":"59cb84b0d3c43fed624d67d3ca01afe042dbe3199d0247f47a6f93097473504e","src/de/mod.rs":"d99680ff57dd8328a782bfd17dbe77cf4d48e132ef59cdb6138e0e90ab5b1ea9","src/de/spanned.rs":"12f7f11ffae52d147dfd6b8e31837d28736cf88d44c93a8071eca736b26414b5","src/de/table.rs":"6993c09ca5885161a51f0802326a8f624b6889342a583bda4e4bada06e59b016","src/de/table_enum.rs":"ad5e7916066904191bd278ed5b7013da7c7d0f50dbf243b9eda5c12129d1e8f5","src/de/value.rs":"019b94c674129abd3348a043c8d7de775fda247debbe185729fff84700067fe1","src/document.rs":"154c96a0a4e80be5ecb9a50725f14d0dec03f59cead324a3e0569ab818e61333","src/encode.rs":"d02199bedb80ce24799db66d214e559fd796d9901bf398ef83b2c5fbf70b1711","src/error.rs":"0d30634003d0ec6c0fc2dca1d1a5cfda178dd9b0caecc162639050b700b3c27d","src/index.rs":"8b5a233305cca7d5c41e5e5cc4fd7be303b44092b55d7167a3fbe595959542a4","src/inline_table.rs":"c26f24ebcb34ffe86388a392147ad28af9c6cbf8e1b2fc504c2b191290f882ed","src/internal_string.rs":"3ccabfff6260df6beba70e9ce29e11e166a06efba0830c657e4d2cd762da6010","src/item.rs":"c43dbc652c4bddeabd9072257652d68f918718a8fc24be94fa988c0fd15c60d4","src/key.rs":"87bb3adaa47e3597fd1e3c37b933ecceec6a61837c3faef6f8109f78b2706119","src/lib.rs":"37bc2c6d236bd543114837a80afc6ffdcacf166e0956bb7a8c0fd35c8fd2f800","src/parser/array.rs":"6745c448bd2468ecc368f51751049fac82752c59d86048a22d8a9ffba00013d7","src/parser/datetime.rs":"ad2078bcc1b9b6c77aebffa1fbcc21401c4a66a95c3ac009a9f2f23aafbee958","src/parser/document.rs":"ea1ada09e7396b61dea578e2f704f1be226c44b7b9b704217ed70bb6fe7cbdce","src/parser/error.rs":"e31e69f00dc9b642713886876573a0e55b438b20a1502481ea9ea26ccb14186a","src/parser/inline_table.rs":"cddd4a09d132be2338aa16ea152c49493301b59554d31d619c9219f0f8beb28f","src/parser/key.rs":"c84b3746cbf7b87f193d28b6b442a0712d6a02274d1c759f7159f8e5102031ef","src/parser/mod.rs":"690f65d437860015d9e757bea1f2eeef15e5f658795623820c67f567a2286d37","src/parser/numbers.rs":"576989e6ad257aeb06463bc800688c39bf585c0cc91b8ae9e0f750a7d3c4e6a4","src/parser/state.rs":"ed8b07352b00f60cd31448adb6b48b7c69828130741928f143ea6fe04af3c938","src/parser/strings.rs":"680878e7170936e1b82d18a289ce13586bffbee0e6d6f4f937c71b996b0ef26d","src/parser/table.rs":"ebe15adb0b447c6590cde2a0726a35450b2bc24cd348b6c1199fdb4cdb434a0d","src/parser/trivia.rs":"b57f101165739ce924e04c47b8878730a12856ccbe3d889413c6cf395244e7f1","src/parser/value.rs":"bc446c4d15af7fff26910d47f60f3caf910af9cf422482e793d2bfdaa4b42d30","src/raw_string.rs":"bdfbe84a498220a6adb015f76609affad0fd352c719a3cb37ff131865b7ab738","src/repr.rs":"ab88409650b979454780d447de8a65aed5c798fd7a4434a5f772d8f83cf9b920","src/ser/array.rs":"ffd5a0e51e324a7defdb345bf625d583cd78f2e45eacd9e4023b638ffb67fd75","src/ser/key.rs":"3f03b4f13c3ec9f7f58d3be1f8ee7dbde9c99dfea143827aca4fffc0d577cd5f","src/ser/map.rs":"d166fc26f6e64bb8ec7076db5cdc50ee77844bc9f1148addbc6cec9da87fafcd","src/ser/mod.rs":"77ed3ed6ac0594e9bed647f00040b009a9802556b33d14824133d508ddfea238","src/ser/pretty.rs":"cee56f209185fd0b78ae4f044f6042bd7e7b7cc8604ca99af8f658d11b88d46c","src/ser/value.rs":"bcbdb731349298b278236fc97ff073a08644d431673be4604de2ba915cedec74","src/table.rs":"52a53f254ef49ac1b05381a3c842f048803b3953efe9970743745dcea664f932","src/value.rs":"b12985099a0542640f73200eaddd073c3024019607c950b00722522497ebae4e","src/visit.rs":"5e7a385a1e659563760e177c5dda97c4b33679df0286c59f43307e7e159c8e04","src/visit_mut.rs":"44b4ceb0e721b7438630ec3a6488619e8380342aee7314ccd1cb2593778a32a3","tests/decoder.rs":"f913f2422aa6924032bc8a6ab77df5954c20ba6c259930af24e83e27cb493f82","tests/decoder_compliance.rs":"74c36d82d52205c3490844ef3df952e294aa92c6e9ee64dff231473072b78b1d","tests/encoder.rs":"32421da7d726611006c2c7198e0da3944ad3b42d7b456a6ebdb894ff90f40280","tests/encoder_compliance.rs":"1d9538ee077af51782213cc3484de5252b8700e242b832735c401fd6343623d6","tests/fixtures/invalid/array/array.stderr":"517c397c7afb8fe855fe9b86a253f620f761b5403fdbb08b219c893f096804c2","tests/fixtures/invalid/array/double-comma-1.stderr":"517c397c7afb8fe855fe9b86a253f620f761b5403fdbb08b219c893f096804c2","tests/fixtures/invalid/array/double-comma-2.stderr":"f8a4c678e4fa5bb4b2dc66064d113bd81beb5e5258046685f967feefa825e8a8","tests/fixtures/invalid/array/extend-defined-aot.stderr":"86cc5eb992fa9add3ad39766d6c6736d30dfd9c464cc516c45dec12bc1c8e8b0","tests/fixtures/invalid/array/extending-table.stderr":"9d666931632f0c02362f102e9edd86916a7de491a83d6dfc68a0c2f87b0794d6","tests/fixtures/invalid/array/missing-separator-1.stderr":"fb21970f88b6f5ede63891c6baf406cfcefea7d48c15c0b4670c71d97c61c3ce","tests/fixtures/invalid/array/missing-separator-2.stderr":"3a807ad6e94c3d70b62696bec39d7a1e558e5771d6c6484a80e89ffde6aa9540","tests/fixtures/invalid/array/no-close-1.stderr":"7c1689bf4779e193a475bc181b622e2dcaa2b02e2c9a052ba953c94d2e48b724","tests/fixtures/invalid/array/no-close-2.stderr":"e3421314255375d50d74e04b527adec9aa1b7cd9a8502120247785a34f0b7368","tests/fixtures/invalid/array/no-close-3.stderr":"ec1d919de5766216b887a34099b2117db7e3e3cfaccd8b295f44268d950df14e","tests/fixtures/invalid/array/no-close-4.stderr":"4372b71512f369cefea355dc044e04483c5f7943028ad5cc0d3514804d3ad18d","tests/fixtures/invalid/array/no-close-5.stderr":"87d9fcd6aae71e0542f70eb8ee2a509f024e66d0b10d03b2f7f697d76b2bb575","tests/fixtures/invalid/array/no-close-6.stderr":"9ae5dc0d71db715990ef8c7e8ded74643c4a451c5abb4c05fe1bd6eae61d20b9","tests/fixtures/invalid/array/no-close-7.stderr":"eae2afb173b6a4d58e65dc94782c1b5079588806396c6b5716fefe911643966a","tests/fixtures/invalid/array/no-close-8.stderr":"feba7ed79aaa5d7b92fca24d09ddfdc1a2198e84a51aa8a4a7578b75e945e002","tests/fixtures/invalid/array/no-close-table-1.stderr":"ff5517cc98a1e0918889defcf594a919f1c52ef508bcc4183114305f2df8cd77","tests/fixtures/invalid/array/no-close-table-2.stderr":"21751532b65a2db6064cee09f15f65d4773c34ed83b7269d09e2ac00e5859278","tests/fixtures/invalid/array/no-comma-1.stderr":"02a1e51cbf040add31472bd7c56723005c89c8b793ef59769cad78d36e4f3139","tests/fixtures/invalid/array/no-comma-2.stderr":"4dc26ed513ceb32d721c4e25a7a1918b9c61bc93d926bbab04975dc1a930fda3","tests/fixtures/invalid/array/no-comma-3.stderr":"f5441aa4804a2ce10fa621304def1c296b4b35bf6e7657a2926d364b9d3d4db9","tests/fixtures/invalid/array/only-comma-1.stderr":"b7d5fe39fb03327a5b55b940f524aa4dbb5548604fbc8786e1e4e502fbf6f16c","tests/fixtures/invalid/array/only-comma-2.stderr":"4a54ddd36885beb51fa70327ecfe81fd6dddc5f1f23ff85a61f30834577b4b2a","tests/fixtures/invalid/array/tables-1.stderr":"2a9ec07bfa4c818d204e8d49c621e13194cffc99c21a75533a8dd3b00ffcfdb2","tests/fixtures/invalid/array/tables-2.stderr":"e04375e46225e12956b22fb717615b6cf33f2064f12a9a6c93074f42adaa5374","tests/fixtures/invalid/array/text-after-array-entries.stderr":"320eb4e7f8ba560da84cac292a9d5de03534f6ca6ff6928e429ae8cd55ec4395","tests/fixtures/invalid/array/text-before-array-separator.stderr":"b37ba17334486b7b16d4b5bde308d2a8c7605429c389e3ec30b02cd975fcf441","tests/fixtures/invalid/array/text-in-array.stderr":"895f20e5d6f2748c16659edbdb4c6e91d84f29e45f8e72d380bb3205f6c9065a","tests/fixtures/invalid/bool/almost-false-with-extra.stderr":"9c06a48312aa0138684e37b8d4193e46ff1badf6ee3d2424d6c6e5f341db8a61","tests/fixtures/invalid/bool/almost-false.stderr":"d3c827c1c521f98b2242a7183c96b00682764889a46666a5dcfb6d0fa7a743c0","tests/fixtures/invalid/bool/almost-true-with-extra.stderr":"9db6045a6e3ba501874de810a16a35f9837647dbab22ea9d8c9d89a7494b983f","tests/fixtures/invalid/bool/almost-true.stderr":"2816a9e9637d3402750f7a35622d738abc83825d706fb4c19d8f007df2396bb8","tests/fixtures/invalid/bool/bool.stderr":"9c06a48312aa0138684e37b8d4193e46ff1badf6ee3d2424d6c6e5f341db8a61","tests/fixtures/invalid/bool/capitalized-false.stderr":"b7e9c3764103c257ceae4f0aeb714ae58917722cb6ac1a1fdb0cde6f9efe1c83","tests/fixtures/invalid/bool/capitalized-true.stderr":"ac46ab983618490106a1bd3263e0e34e54010a014a795184fb722d5ef49aab2d","tests/fixtures/invalid/bool/just-f.stderr":"d3f2bc776b3137f378be5acb9e10e745cd124178d836289fb1b7091ab12556fb","tests/fixtures/invalid/bool/just-t.stderr":"1f6c7ced5fd72596cde8daf3bd05a61c9f0a28bfb612b8b6b0b6de4630d1c0a0","tests/fixtures/invalid/bool/mixed-case-false.stderr":"7d57131577e1c018075c1a83347e80183aa1db1b6aee1027a11cb7f229b05d21","tests/fixtures/invalid/bool/mixed-case-true.stderr":"9cfe3868f18cecce20bc674593f15fe88cb6fb7361f54ffec1616e877f714cf2","tests/fixtures/invalid/bool/mixed-case.stderr":"34738e926e3e5ea99fc9860c0177463699e54b2c48fe11168a6c25bc173802ac","tests/fixtures/invalid/bool/starting-same-false.stderr":"620c142ae095c8da9aa1298a82a42ce1f0f13eda91c66e75e4c5b6f82bee0455","tests/fixtures/invalid/bool/starting-same-true.stderr":"8e1016111cd84601db76df8579ce7aab7fa7a0e013e66d3174cb8bbd80c4764f","tests/fixtures/invalid/bool/wrong-case-false.stderr":"ca86c0166b4992d0255e2c8f5ed2935d58c325965039006f1903c8ddaf549593","tests/fixtures/invalid/bool/wrong-case-true.stderr":"6264fc52c455d04e1f89d0d2726b4325066699595f6120ad4583802642cd6735","tests/fixtures/invalid/control/bare-cr.stderr":"be847ba07cd507752b8124ca13e8d012c666b81cee56be1309815c8d490470c1","tests/fixtures/invalid/control/bare-formfeed.stderr":"18a939f8d8459a4e3a2d9dee5756fa81b3f12a2179e685c35ecd25f4da9d8aef","tests/fixtures/invalid/control/bare-null.stderr":"cd58586e56fa9b00fa17be23dfd531dcf9eb5e10556464decd4b60fdc6eaf72f","tests/fixtures/invalid/control/bare-vertical-tab.stderr":"970f649f9575b1553da1382466eafe16413696203e7ddbaa99a0585a3f0ca157","tests/fixtures/invalid/control/comment-cr.stderr":"7e729bfc9b0c575521c39d763e8ab8f7baf94054e183e59cbe976d840a0f1c62","tests/fixtures/invalid/control/comment-del.stderr":"5c41d37aad38933267d8d8fe80d9600650627dbe3433b8ac876ca63bd086094b","tests/fixtures/invalid/control/comment-ff.stderr":"4a7eaa53d883dcab7f23b09d33794a687b5d0c7777ab172a0bd81f9503878762","tests/fixtures/invalid/control/comment-lf.stderr":"a24258d06bc41156b92ab14fac3793c85d706e74d5c280337c4ec0c4f80f92ff","tests/fixtures/invalid/control/comment-null.stderr":"afcf5791d6fde718cd6a2b514483d45d2355bf08f9fa392d75c7192bc390913e","tests/fixtures/invalid/control/comment-us.stderr":"280fbd7dc323d8841d5b9fa821f48061fc01a968bc1f5893fdac30fc17afaa3d","tests/fixtures/invalid/control/control.stderr":"07adf02cb547ed379a402121e4db738daa698358e53c2fa852c617fb766b41fc","tests/fixtures/invalid/control/multi-cr.stderr":"1b70b31b5c10eac9a52cad0b7739bbe5b9a74c9cce4ba105143c622a33164c14","tests/fixtures/invalid/control/multi-del.stderr":"6a7f52409dbf8b5bc1097fec2d1330310c97d78eb3ea2027f219b25e519ec270","tests/fixtures/invalid/control/multi-lf.stderr":"e723fdaf9e19aef9a0eee8a919e5986822c25ac1131e24422e9fabc0887ccc63","tests/fixtures/invalid/control/multi-null.stderr":"ab3e944c835a74ebab8c56c39c3ba6496e8d4d2b03f324a66e2e511ac8b7fd10","tests/fixtures/invalid/control/multi-us.stderr":"1df029e738c4cb78a68b360fc131fb6d9f5b93f78e292a27aaf4c40e8aa3d842","tests/fixtures/invalid/control/rawmulti-cd.stderr":"fbadd57208404b2116c9cc16f36b80e1ab08276d7838e17e4bd48a8df7e194d2","tests/fixtures/invalid/control/rawmulti-del.stderr":"ee50d46a73bfcd85f7b3b677d4148cf2390e5ea13b59a6bc81dacea3e049ab33","tests/fixtures/invalid/control/rawmulti-lf.stderr":"6cae2d709ae5ee6afc355322388d8b57d8e9674929d71af5b7761bab5d751cb9","tests/fixtures/invalid/control/rawmulti-null.stderr":"0efaa11fc391b16d27e1de09027171e8d379d3ffddd2489045ba10912ebccb89","tests/fixtures/invalid/control/rawmulti-us.stderr":"31a28ca07db60771f7787f8ef30fa160ce3715df28532bc9892ec15e380c36c1","tests/fixtures/invalid/control/rawstring-cr.stderr":"32819db35fde8ef9ee282557740c8b2dd077c0bcf421614fb06db18d732af57e","tests/fixtures/invalid/control/rawstring-del.stderr":"8a7828be56c7d941c6879698be4825fc1f9b75766898e782675d860581e7393e","tests/fixtures/invalid/control/rawstring-lf.stderr":"1d01b15b19024ce4c36866f025ed6adc4f3c3bac1a2b5fdf4ea79471dc5c9b49","tests/fixtures/invalid/control/rawstring-null.stderr":"245b39b3943e776fb5cb2d52497e0fb301420c36f7f5b47df9980aa05496ab5b","tests/fixtures/invalid/control/rawstring-us.stderr":"7fb0ed283f42d3b1cc3852698b6047c2975d2c780eebe14f65d2b3d11d9f0bad","tests/fixtures/invalid/control/string-bs.stderr":"0a12dfbbf6161d24f29d78679928a4e835d47558344773c2d585a2201bb043ad","tests/fixtures/invalid/control/string-cr.stderr":"cf5970ede487e7fd692baa45247d55df70b8207f8d67df6c2e55eb9d4ef9352b","tests/fixtures/invalid/control/string-del.stderr":"35c65f3ceb74b80d4a5d8109f61f099bdf640379dc9751fd7678447a33eaec78","tests/fixtures/invalid/control/string-lf.stderr":"ede4b6df958cac81b05525f25b1ac2c1435eae895f545dac57a553a7840fc8d7","tests/fixtures/invalid/control/string-null.stderr":"c30aa237809c03dee02d36a1fc4a02d6f184bd425bfc2accda6b3fa1bb55fe1a","tests/fixtures/invalid/control/string-us.stderr":"7d922c62bf118c23b85991935b8b4c7a113d39d0092d13d22be1e0ad7ed20a31","tests/fixtures/invalid/datetime/feb-29.stderr":"743e7bcaa21ce6a8e7f033b56de7a0f3e7dd54ea84bf293e044af4e192f693bf","tests/fixtures/invalid/datetime/feb-30.stderr":"744e980d51f19b89a203192eae4f88e5ecba71853e006ab1c52988818584507c","tests/fixtures/invalid/datetime/hour-over.stderr":"0aabf978f79acc6b4d0d3d6a9b05833aa65d418d71aa5cbbd71035797adc1b0e","tests/fixtures/invalid/datetime/mday-over.stderr":"76f70be6d3ca444339aa15f4e6243b784a4c414fde0cd932b20c182266276782","tests/fixtures/invalid/datetime/mday-under.stderr":"54456d2ec892deb33b596cd82d400bdc6777cd2b5c643e45556b9646057f7d55","tests/fixtures/invalid/datetime/minute-over.stderr":"ffa678092cb67d6848910218d9a5bd46f5a308b7bce2269b8b6e46c2ec019dd0","tests/fixtures/invalid/datetime/month-over.stderr":"906596048b7dbbae0630ec1216827a95ce562a09f98704595d27c3491cdfc7ee","tests/fixtures/invalid/datetime/month-under.stderr":"c073c25ef0a3aa10b1d29ac28df9c9207143ffd595680ff633400d076a76dde7","tests/fixtures/invalid/datetime/no-leads-month.stderr":"4f5066ed79bcd945215a57f55ef230f47dd64e2ec55438a7ee08bc3f7067e318","tests/fixtures/invalid/datetime/no-leads-with-milli.stderr":"ffce1f8e7bb51130705ebb7ba8e9ef007de9a9e7f33b476e4fefb15a030d2e1d","tests/fixtures/invalid/datetime/no-leads.stderr":"4f5066ed79bcd945215a57f55ef230f47dd64e2ec55438a7ee08bc3f7067e318","tests/fixtures/invalid/datetime/no-secs.stderr":"8c504dfaa1dfef25b78a8548509b3139f92e3e04bcb848a1e04f7529e169ad63","tests/fixtures/invalid/datetime/no-t.stderr":"ec4852cfa295ad2944101831bf40489e6c22b5a33fdb3faa5347e2d18c25c227","tests/fixtures/invalid/datetime/offset-overflow-hour.stderr":"7a4250381a915c58e3aa81cb3afb59fc4163b7d25cee0a6625b615b4fe5e0fad","tests/fixtures/invalid/datetime/offset-overflow-minute.stderr":"6721e5fb29bb4ab20711eeb3fe42a6f1fad4b279075296c0a97124d75dac08af","tests/fixtures/invalid/datetime/second-over.stderr":"ba720829aee7506625c354e5f53dbd6b67ec351061df1e32b49cb11ea69bf52e","tests/fixtures/invalid/datetime/time-no-leads.stderr":"5117ac62dd754a203f2fd6e5163a2ce352776bee513219252cec77c0ed71bbbb","tests/fixtures/invalid/datetime/y10k.stderr":"ac3db71c252bb0b2f0bdc8a9d734ca60289afecfb5a66309a895b54c7d8e61f7","tests/fixtures/invalid/encoding/bad-codepoint.stderr":"64244879fa48b9c4f2f7b219325d4c308772c032b7005edd2ee4d771b5448bc1","tests/fixtures/invalid/encoding/bad-utf8-at-end.stderr":"d55ab89a2f111bbfffd362928dbe3a1dafe7f8f37a04e1c56307efe4f4ea14d8","tests/fixtures/invalid/encoding/bad-utf8-in-comment.stderr":"52e5ea4555b208f3ce91debc99e01dacc6e706381fb274259730b0a82f041660","tests/fixtures/invalid/encoding/bad-utf8-in-multiline-literal.stderr":"e22a4a60afcbf41351abb9d4d61a4c5d6dce246f98fedbccd33557eea8596524","tests/fixtures/invalid/encoding/bad-utf8-in-multiline.stderr":"e22a4a60afcbf41351abb9d4d61a4c5d6dce246f98fedbccd33557eea8596524","tests/fixtures/invalid/encoding/bad-utf8-in-string-literal.stderr":"eea9032a7d46e496ff8f6d4a95344b4d7660adb0fc715f652aefea54ce72d85d","tests/fixtures/invalid/encoding/bad-utf8-in-string.stderr":"eea9032a7d46e496ff8f6d4a95344b4d7660adb0fc715f652aefea54ce72d85d","tests/fixtures/invalid/encoding/bom-not-at-start-1.stderr":"dc9eb6707b252b77ee0c30bc471a4bd58308b31bfc892e2fd5c3995458e41b97","tests/fixtures/invalid/encoding/bom-not-at-start-2.stderr":"6570c6feea522cf017c8dcdc1e4b76cfeef2092bc3b938af0140e171817a8311","tests/fixtures/invalid/encoding/utf16-bom.stderr":"d9c278ec8c5a422f4553180ea76dd223278acc0d0ecc5f725235db6b379e5b99","tests/fixtures/invalid/encoding/utf16-comment.stderr":"2f2c4ffa18d08721d707b7083706efe5394e9fdd3504791a52949d76b7442e67","tests/fixtures/invalid/encoding/utf16-key.stderr":"8a8465ae12c6f3065edc3b237b7066bc8cf03b95a22403c8c5a1b1a5f085dbad","tests/fixtures/invalid/float/double-point-1.stderr":"817b02c19d53f02107569e7ddf9b38334cd85edd0a452795baaf6d5c0ffbbf63","tests/fixtures/invalid/float/double-point-2.stderr":"8b5a07c41087342d5f8bfaa8998465dae954cad11d93f01f4ed4a5541694e7d4","tests/fixtures/invalid/float/exp-double-e-1.stderr":"657c856a8d474cec0d557f4a5401456966bc82c8061a092977f4ae0cb71fb04f","tests/fixtures/invalid/float/exp-double-e-2.stderr":"ad101779127abb35a6e35020a4818c1622ae5433208bad57f1daf113357f6ab9","tests/fixtures/invalid/float/exp-double-us.stderr":"e6e53e58b5deefc9e50e6eca91423881b682bcf8528bfa0386158aad9458ae74","tests/fixtures/invalid/float/exp-leading-us.stderr":"5e45eeabdcf142ebd5b5ee2b77e2520c5ae7e35e943034e12c84095f51a1141e","tests/fixtures/invalid/float/exp-point-1.stderr":"2d4202fc806e23ce05f8bb3e63e31d1b4874875b018f28bd2b59c8714aa70cd2","tests/fixtures/invalid/float/exp-point-2.stderr":"d85145654b358cb63f44ea754c88f29a073fe5f637d07b279a986ddc0c347df4","tests/fixtures/invalid/float/exp-point-3.stderr":"3fb7d6151b522057a2b15137daa916681220cf575dec560f084d3c9c2dae1f3c","tests/fixtures/invalid/float/exp-trailing-us-1.stderr":"71aef4dde4dc2371702025127b9802540765a0c0db6f96156bf6542c574b30b7","tests/fixtures/invalid/float/exp-trailing-us-2.stderr":"c63f97484c7c498b01fef93984beadb9311d884ce5b7856ab1301cc398ae9c4c","tests/fixtures/invalid/float/exp-trailing-us.stderr":"f5bbc5fdf2dd018c031ca5c79edd7f16a0da25676bed96ffc0682401497ef362","tests/fixtures/invalid/float/float.stderr":"511c7e989b6e4768f089634036848acc896439a06df83a97fbcb92ade1554e98","tests/fixtures/invalid/float/inf-capital.stderr":"d493ce9b11dae0dea40a2c8c7666125031d5323ab82bf1b8af997049d60072fa","tests/fixtures/invalid/float/inf-incomplete-1.stderr":"6090e21b98dc6df8e67962c8458ac773bf3dd4b78ae4f4453dfbe01657401a7c","tests/fixtures/invalid/float/inf-incomplete-2.stderr":"abc3855709f099a9023f0d3e305edb8c97570223f889431dad32e21e83747d6c","tests/fixtures/invalid/float/inf-incomplete-3.stderr":"9fb99f8ca91b9fecb86ce27e1b4fa6ca05a2d5c0ab039972d4d2a7dcf2c6228f","tests/fixtures/invalid/float/inf_underscore.stderr":"8e7202c508c9d6e35410e4ff89bee3a5db4a88367e69e210fd4ae4f9bf602286","tests/fixtures/invalid/float/leading-point-neg.stderr":"21e3e8ea4c817ca286b1ee6dd359c91b6e8ffcb376bed393e03a29e55d7a6a61","tests/fixtures/invalid/float/leading-point-plus.stderr":"ff0f7a8a5cdccfc7e6d3e6b1381643b759f5aeff5546bfd2fd4dd29f8f1b1551","tests/fixtures/invalid/float/leading-point.stderr":"5c7590482ac55bb0d11eb9e1291a80d8c891ed1949adfc64e81b75bc5f8c8b06","tests/fixtures/invalid/float/leading-us.stderr":"67ce463deceabfa0dd4eeebfa68d72eb53fd235455d6181b4c8597c6507e0ee7","tests/fixtures/invalid/float/leading-zero-neg.stderr":"16b6cf97171ec9f85a36e09a1ef39087eff3a0c441a9f9d96c43a9d0fdb5ee38","tests/fixtures/invalid/float/leading-zero-plus.stderr":"f08e1416644c743b3463342313f023982051e992756e9784229b1bcfc1e19aaf","tests/fixtures/invalid/float/leading-zero.stderr":"511c7e989b6e4768f089634036848acc896439a06df83a97fbcb92ade1554e98","tests/fixtures/invalid/float/nan-capital.stderr":"66fe63db08d9ee24e8a90f4e2b5f2c15fb3f35dfb7eb81ffe760f8957967370b","tests/fixtures/invalid/float/nan-incomplete-1.stderr":"138d0d28aa5e90b9fb344c743478c0b6be79492ecac856d71e239af5f6e1aa99","tests/fixtures/invalid/float/nan-incomplete-2.stderr":"31f200fbfc6e4c8d06f58960dd7349f650af86d22a1f0d6fd8c4df46bb4a0b3a","tests/fixtures/invalid/float/nan-incomplete-3.stderr":"3b16f8d82cdf18df21bba1e83d2aa33e175ab5a37fd5f3214b1be84a07acab10","tests/fixtures/invalid/float/nan_underscore.stderr":"4a30507eaf227e8c8e2bbda6d7b3cb4fdcf793216981d1f9302cb2b049e95d58","tests/fixtures/invalid/float/trailing-point-min.stderr":"0b5c7385ced699074d6042b5fa0ea9266ea64a191dd0e43466ca71a2ceaba76b","tests/fixtures/invalid/float/trailing-point-plus.stderr":"856edc036309660c223b1cac7c99d9d6b61bb4b49e592410c3f308fb0a678800","tests/fixtures/invalid/float/trailing-point.stderr":"5241f4525c36c1cde19d520aacdfb7db1bdea07710d2621d2a60ac7b1d1e70a9","tests/fixtures/invalid/float/trailing-us-exp-1.stderr":"42a7b0d43ef2b548c2199a4c9ade5b30c28b91a625d6bac6f57d721b4fff2848","tests/fixtures/invalid/float/trailing-us-exp-2.stderr":"13c1374bbf3f5e3c762b6246dc8ea1f5e619b3edd6d66a2e37ba51fe3ba0acca","tests/fixtures/invalid/float/trailing-us.stderr":"4103e29434d2c323c7461903cbe27dc0a5a70c9907d2d47ee31eaba3f4d51b2e","tests/fixtures/invalid/float/us-after-point.stderr":"2d0ef75d124b8ff10a48639d2f837a13cb18ae66891c9fc3709199ff724c1af3","tests/fixtures/invalid/float/us-before-point.stderr":"844c0d11f60522784f6f22f7f3d418c7e6f16cd96cafa55f542996974fd267c0","tests/fixtures/invalid/inline-table/bad-key-syntax.stderr":"9fe839d2c861b2026ffcbb37a7aaca3498df90f66da6d402d5ab96ff357de453","tests/fixtures/invalid/inline-table/double-comma.stderr":"67e92c9f776a5bd04f908a79c6f2e8c146ebb6072129ab7fbd9606ed8d56fc44","tests/fixtures/invalid/inline-table/duplicate-key-1.stderr":"3eded78c2d76205b8f516e180f8c8849d6ba34f04df72c5ffac319264d16f40f","tests/fixtures/invalid/inline-table/duplicate-key-2.stderr":"a166a188a3682704cf70153666734fe63ccc23075265d0d20ebfa25ba7a633fc","tests/fixtures/invalid/inline-table/duplicate-key-3.stderr":"3e4cad3fdeda14976a0e6193465ac7b0c052a075b55a4dabb95ec2a03d7ef532","tests/fixtures/invalid/inline-table/duplicate-key-4.stderr":"2ffe3212ff7d4dbdd7f41f0c0d037599d223c1876af8c9fa25770431abd7c6f7","tests/fixtures/invalid/inline-table/empty-1.stderr":"ee1624b0ebfc28edb9af042a4926d6b5b62fe7b6265544b158b577bfab1f0866","tests/fixtures/invalid/inline-table/empty-2.stderr":"70c376a4f2368d3586184e70110115525f35cfef2fd15bd2c0a9579a88868cd2","tests/fixtures/invalid/inline-table/empty-3.stderr":"fb05dcafd2b5e290ea8de8d0b8d9ad0fc58452d75c537e8482a2fa7fb714126c","tests/fixtures/invalid/inline-table/linebreak-1.stderr":"016daca1cf56861089265156af1ef41772ed0c5fad6848cbf8c8c91ddf748ade","tests/fixtures/invalid/inline-table/linebreak-2.stderr":"b259282b6bc1a9f9c96de41d2c5b0f27b9d8648ec8984aeb6760cc15ff5714d3","tests/fixtures/invalid/inline-table/linebreak-3.stderr":"59b34b9c76c57e02df83c8ce97b1f3e856026cbb33416d7335f287222e11ec35","tests/fixtures/invalid/inline-table/linebreak-4.stderr":"8a78e7240345fc8b850cd54d3f1c74187e4abcbc65b85e3b1da79ebf3e139d70","tests/fixtures/invalid/inline-table/no-close-1.stderr":"6da0e9a2d2d272d199745c704aea6bf317921d8ab005882a3de793e6ff87e863","tests/fixtures/invalid/inline-table/no-close-2.stderr":"eef11b2fc399ca9b7a397c5366a9b7a9021e783cb189d68fd5c29cc607a5f4ab","tests/fixtures/invalid/inline-table/no-comma-1.stderr":"d2a33a967d517c9690b90845347d26d8845c997ba4ed61c640a58cdf919d7c7c","tests/fixtures/invalid/inline-table/no-comma-2.stderr":"c4452ed96f19979b36019c568fd8c73e72db2711a87d17cc8f62362b88598b30","tests/fixtures/invalid/inline-table/overwrite-01.stderr":"4e47f343291068cb0164fa2d48be2c3257458ee7467cd60d664bfbb83713f2f9","tests/fixtures/invalid/inline-table/overwrite-02.stderr":"40718dec554fde10db86ab240f5071b35ba564503962938f7b9464341e7b27f1","tests/fixtures/invalid/inline-table/overwrite-03.stderr":"0318c1d4713cea361a857d382bc8b150dbb1ba8f8e613df472e936bab38485a9","tests/fixtures/invalid/inline-table/overwrite-04.stderr":"9e55cced7664c821c073937321880bf75150affa44d4363c774f5834bbac7470","tests/fixtures/invalid/inline-table/overwrite-05.stderr":"59a0ef41c6059994212244c16a8808b4ac721c710f1364639f7116d43a7a8b26","tests/fixtures/invalid/inline-table/overwrite-06.stderr":"c2a6060831445d4143254c6908468bb04cb5be501161028429467a2dbb68e235","tests/fixtures/invalid/inline-table/overwrite-07.stderr":"cbe9f4d1b428e658591e077790986a6589385474efd2ae9f488b6003715198ca","tests/fixtures/invalid/inline-table/overwrite-08.stderr":"d85341eff5c078131c65c801a259d0909921c541ea5a8eb75e752e5d174092f4","tests/fixtures/invalid/inline-table/overwrite-09.stderr":"99c73b045436b330b4f6570bc1a40726dec71a524e44f6b63a8c55ceec4e5f4a","tests/fixtures/invalid/inline-table/overwrite-10.stderr":"746d1cfde95d2c5fd748e4b95fb95383e014a00f73c03625f7ebefa52243e815","tests/fixtures/invalid/inline-table/trailing-comma.stderr":"079ea824e27cae66b32160b99d6fd75b38514960c440ef14274528fabacc98d3","tests/fixtures/invalid/integer/capital-bin.stderr":"9224535b369db24906be0bbbac4ffa80d1b570db8135ce7f58202956cf889857","tests/fixtures/invalid/integer/capital-hex.stderr":"ee731f89283c425e7c54cabd439651cc4926c1d721ee92ec809b123521ff7c91","tests/fixtures/invalid/integer/capital-oct.stderr":"52005625e8e51afa09a5163c9eaa010e09830727128d68a1e48fa600be6823e5","tests/fixtures/invalid/integer/double-sign-nex.stderr":"819ab532a90faab548580eb0a959199466acfcd04d29d77cd0af7acba509cb1c","tests/fixtures/invalid/integer/double-sign-plus.stderr":"94f6b7c5dbe458ebb1504b7672a36c9d115e17b0e629dcfe47360803c9cfa923","tests/fixtures/invalid/integer/double-us.stderr":"c9a377fc0417b12123e9cdc4b2fe69aade63e532e20e65f279d7b4460ad05e49","tests/fixtures/invalid/integer/incomplete-bin.stderr":"143b9a89feb99b5a420bdc6aeff919ebf6d53bc011f31afbee5b8677a8ac84bd","tests/fixtures/invalid/integer/incomplete-hex.stderr":"b246cd8117362f5451c60298a318d6f93233bf9959c73cdd7a6d590d226291c2","tests/fixtures/invalid/integer/incomplete-oct.stderr":"4cdbcf8ce0a743a9442321a15c01670109debeed6a9712a95d2cb95a9debc469","tests/fixtures/invalid/integer/integer.stderr":"1afca937abf7f267f8c8e9d2112309d1aa2dc90ee1e2d4328f5a30b19ab70941","tests/fixtures/invalid/integer/invalid-bin.stderr":"e94521b61ae2bee5032073007ddd027945723f8c7faf3b4523ba1f8e9604160e","tests/fixtures/invalid/integer/invalid-hex-1.stderr":"5873555438d114b5d1eb323cdf95a651bef7f95b4c1259d657fdeb993350a2be","tests/fixtures/invalid/integer/invalid-hex-2.stderr":"fac8c488203e501d3ff383313f8a1beebfc5ff5676eb6624ca9a774094105bdb","tests/fixtures/invalid/integer/invalid-hex.stderr":"521096bb5d0c10e420a452adb133eecee4e153809a3c29822e64569e4ecf2779","tests/fixtures/invalid/integer/invalid-oct.stderr":"cf940d8abf0a98dbf4b139089cb964964b30e6fbdf89d9a11bfe94b06bbb3547","tests/fixtures/invalid/integer/leading-us-bin.stderr":"34a6f856274435b07ed74ddcbfd0c471920b418858fc2685eacacf8b814d2222","tests/fixtures/invalid/integer/leading-us-hex.stderr":"a468c4d3ef104f5f575ef61e01a2889bd52112fe00917380d9fe094e7f1f0625","tests/fixtures/invalid/integer/leading-us-oct.stderr":"c6600b9cac7b6a935923b951b24051f2494fdc2d351c0f109f63da546a280315","tests/fixtures/invalid/integer/leading-us.stderr":"4c156a62e39d8404bcaea001ad347aa3366ad956899fb385492203d17da9b34e","tests/fixtures/invalid/integer/leading-zero-1.stderr":"1afca937abf7f267f8c8e9d2112309d1aa2dc90ee1e2d4328f5a30b19ab70941","tests/fixtures/invalid/integer/leading-zero-2.stderr":"4e4ce0d6714fb455def4a586c076072bc8d83b87f3b62122611b6e62df5fe532","tests/fixtures/invalid/integer/leading-zero-3.stderr":"d28a4f3b59454eb4a5756d9878b54c03a154aa3af32a9bc4b746fa8d4c842454","tests/fixtures/invalid/integer/leading-zero-sign-1.stderr":"b84ffda89f4797a517f8488b59ebd795fa42e59be7719b3883b2290c8f1060db","tests/fixtures/invalid/integer/leading-zero-sign-2.stderr":"3484e932794a500ed92322323032f7ca2c95fda1af3586fe3d9d5d0cdcdc41e3","tests/fixtures/invalid/integer/leading-zero-sign-3.stderr":"1f7afe7069d13990918c68a32ba46a9e17a305ced699c94cba72b01eec5aed93","tests/fixtures/invalid/integer/negative-bin.stderr":"b3825a06a49dc04be695629fb45ad33a6882ea73821c3c42db7dc9ebc878b5e8","tests/fixtures/invalid/integer/negative-hex.stderr":"f54b8ecd33db30a04ff9312f4b7a42d06ce8c276062a56bdf3773b10e267036c","tests/fixtures/invalid/integer/negative-oct.stderr":"12a30a960af847a2762336b6b0569d603c84dcb31a694bc93a136fa503c298e6","tests/fixtures/invalid/integer/positive-bin.stderr":"f4f91449d9863cfb107f4f174e12e64b01e676c36bab77a431078c9a0fda6e94","tests/fixtures/invalid/integer/positive-hex.stderr":"1ea707ef22ca30bd0ce9becdd4c6c3f04a65a79c153ec38875b4a8626c62dbf2","tests/fixtures/invalid/integer/positive-oct.stderr":"f033b6c19e3f1f04c69baa8ebc4156ac913be0428e85fd474a99d57298c23e75","tests/fixtures/invalid/integer/text-after-integer.stderr":"581885f158d84ac387b8bfb483d4bb0593e23bbf251a63a542ec81630ffd0bd5","tests/fixtures/invalid/integer/trailing-us-bin.stderr":"7e5928cd15695fa35403a024856f64cbbf7a056e8079f76d1923e38401086e41","tests/fixtures/invalid/integer/trailing-us-hex.stderr":"83d3672baed59c1b0ca8b27400b469cd18d2c0790ececd9d5dd72e283ceb4584","tests/fixtures/invalid/integer/trailing-us-oct.stderr":"e048d0b7900704573a076501b5fa48289dbaec4ebb279f10775ab0b8c5060dd6","tests/fixtures/invalid/integer/trailing-us.stderr":"9e46f25d350e02fa57100d87917d9e6a961907df89955c01bbd2bb473f807297","tests/fixtures/invalid/integer/us-after-bin.stderr":"e833ae217e60edfe08f5c76fbbd8ec2bf6de9b41b16905e474791f1b5bc4695f","tests/fixtures/invalid/integer/us-after-hex.stderr":"d5cd357750289db24ddba5d8278eef6073f591a05bb495096e8f6214626187e7","tests/fixtures/invalid/integer/us-after-oct.stderr":"7254481b53b8602413ede570876963fb6ea9c2699adb986ee17023cabf5916fb","tests/fixtures/invalid/key/after-array.stderr":"8489fa15adf8e674687aef4a8ef8acc10235ada0e7a3b2fa17aaeae9f9e02189","tests/fixtures/invalid/key/after-table.stderr":"d1856cc75dc16c95c045ae4c05982448e3c2680057cc1e08c09ebe68ffbb35c8","tests/fixtures/invalid/key/after-value.stderr":"00398c3f1305f387b9ff9f17dcc76061350a800e652e00ff2f3892993c42ea33","tests/fixtures/invalid/key/bare-invalid-character.stderr":"19220d575145a93b522e39f59ee63fe0418194fa2b80d9649916d4b8df556147","tests/fixtures/invalid/key/dotted-redefine-table-1.stderr":"169e40f3d1be87cf099a9e7c6e39175ec0fd701c933b427cefc300d2e854aa07","tests/fixtures/invalid/key/dotted-redefine-table-2.stderr":"72d632c3572aa914603d154152e10157d4db3d90db0da0eca88baf1416b3e29f","tests/fixtures/invalid/key/duplicate-keys-1.stderr":"f4207dea6f110318da0c9c71b3957c8182b133bda91911804a98bac71c025cc2","tests/fixtures/invalid/key/duplicate-keys-2.stderr":"a5e1fb5b90daf5b7e659ed76c82dd0ff6cf2a09e3578c98bdf907bc7801614ce","tests/fixtures/invalid/key/duplicate-keys-3.stderr":"c8d91fe50b91ad091430b9699aea28a42b7822373c43fa064900721df066d45c","tests/fixtures/invalid/key/duplicate-keys-4.stderr":"ad171657bb84292443753bdf9f2963cb268a45dee78ca4f39dd474b6698fb020","tests/fixtures/invalid/key/empty.stderr":"0da32834de6e29b7254260b51b5b26f1537111088f2dfcc7085cf717aa9c7b42","tests/fixtures/invalid/key/end-in-escape.stderr":"f8710ef2b803f053d1c2f85204f7d9beadc485c4a5525d1c17d8c8cc228c0eca","tests/fixtures/invalid/key/escape.stderr":"11c5f871342cd20a90270eb3cc47c06fb186e7493d27026f5936e78c0bd088b5","tests/fixtures/invalid/key/hash.stderr":"55122578bd7c090a641a0aaf980aebe3fd2c1fcf820da4d72408bfce527a5293","tests/fixtures/invalid/key/newline-1.stderr":"32c0795720a45125ff56a3e0a20ce62c2a2174fc02f44f2dd6620db15bc56547","tests/fixtures/invalid/key/newline-2.stderr":"f2d74552b3489eb7f89ec8f4cfb5084ac21ad338ef2a0d320a57c0eca30fe5bb","tests/fixtures/invalid/key/newline-3.stderr":"672d411c92fcfdb495b41a15e6cebf0e73d4484e6a0902772b9937f5ebf35c61","tests/fixtures/invalid/key/newline-4.stderr":"aa2b599e10e8a20bec1d1fe112ec90ccb5bed8d42e43dba8ccf0d5c18d4b131c","tests/fixtures/invalid/key/newline-5.stderr":"961866b075ab56f652c9661e900070b729ce5db2f57210e95f9c3955f5ba4b41","tests/fixtures/invalid/key/no-eol.stderr":"e8f14df57190fc8a0f4e704a38c42126aef0663f9315f84d23c371f0860a5a73","tests/fixtures/invalid/key/open-bracket.stderr":"330a1a96948b442437bd81f461e91e0b328e225abd304832b7d1660eebc77c5b","tests/fixtures/invalid/key/partial-quoted.stderr":"29dd53ef16e939b137da2c7d62c24aa2481bd44359a02578b77597296b25efc8","tests/fixtures/invalid/key/quoted-unclosed-1.stderr":"6b566ea67dd061ec05c6754bebdb583d93934412cdc6176bbd68d3bd403cca7a","tests/fixtures/invalid/key/quoted-unclosed-2.stderr":"396c4f9bd1ff398b439ae54b23452007e1e7518b38232b89b0f5b1b448e764cb","tests/fixtures/invalid/key/single-open-bracket.stderr":"52d8e13b39b9507ef37a65c0eb779e89ff7d00fd4a70245d44225a35200a6ae7","tests/fixtures/invalid/key/space.stderr":"9f3d6ed39f1a05ac99bedceb66c53835090182b47293bdfa0c080ac80285bbb0","tests/fixtures/invalid/key/special-character.stderr":"68aa496dfd623d18af16fac5b1fbf5f74365fe0c05feb3e5d34bcbe47fb1472e","tests/fixtures/invalid/key/start-bracket.stderr":"93a0e8ada8447d60ae738b4c0816d9087a84932dad2651505327ff37d3b12c86","tests/fixtures/invalid/key/start-dot.stderr":"25b23ad9a454746edcffc91b79eee11bdc9d9daf67640aa8d28594a98da3ddc1","tests/fixtures/invalid/key/two-equals-1.stderr":"f5398f176b3b1a3fac4cc7d68d1e595e2f1b60f92ebdd4f3f9bbe5d7191eef3e","tests/fixtures/invalid/key/two-equals-2.stderr":"099b5d50827299b921c3c1c00a2c804d580f67d06c2e5593660c6d6ad5900a66","tests/fixtures/invalid/key/two-equals-3.stderr":"b51c719bd0d8f585b4b017937e7d0df2ded58e3a37e2cc17cf9bf04277347a1b","tests/fixtures/invalid/key/without-value-1.stderr":"b1a087f97400f49a9bd6ba8bf44b3afbc3a0db6423d17b95fca5fc5be7a3a775","tests/fixtures/invalid/key/without-value-2.stderr":"cef84c2625e41ab3fda621f35d5e936a8d43bd292f3856f80cd2a148efc6d6b7","tests/fixtures/invalid/key/without-value-3.stderr":"295097c33c87dd153e607b3aaf648168678e6773e28ed0148d0b2e5144c1c0e7","tests/fixtures/invalid/key/without-value-4.stderr":"65173e2596ae1ac268c1f5a66fcb2e83be5663425aecf3fb3a99091b6fd40ea3","tests/fixtures/invalid/key/without-value-5.stderr":"9279c3cddcea9568abe57303cb5de41d8d1c71ac4ec991e1fd28651776314b57","tests/fixtures/invalid/key/without-value-6.stderr":"dfd20b35750e3a3cf1da7e8e1f20043235c0349cfd118bb12cf1a42165cc7ec5","tests/fixtures/invalid/key/without-value-7.stderr":"d0183883abf80ce86271bb0b8704637f93830cccb4c853f7834d132c9f153d4e","tests/fixtures/invalid/local-date/feb-29.stderr":"4c97e157ddaf9940d438560f34642ec4903609417905c02456ae386ade5573bc","tests/fixtures/invalid/local-date/feb-30.stderr":"1710668c24dd3aa9fde6e0f782eb880af872e4bb5a5186b281c8e6ed40e86dca","tests/fixtures/invalid/local-date/mday-over.stderr":"546af4611d7a589f4907bb085b74a5d74aab7505b613c448d8075aa9f14633d5","tests/fixtures/invalid/local-date/mday-under.stderr":"102c21e5b546a4a069c576d7ccc5a1bc259522e951fd7487e7ceb26f982bcc43","tests/fixtures/invalid/local-date/month-over.stderr":"4cac731d0f95392744498706c91b4940a30254d3910856da666bcdf1610c80fe","tests/fixtures/invalid/local-date/month-under.stderr":"df4ca9f526a23709fe9feb51b71b5ae3efac806a3fb337a40b626a27104b4124","tests/fixtures/invalid/local-date/no-leads-with-milli.stderr":"67e6de0c6025e5f498e0d5e0c7bdd2cd74a01cefe0a3992ad935b7b7f260fe93","tests/fixtures/invalid/local-date/no-leads.stderr":"d653403d2686bf1e56c21a120b7a6fdfd6e0f5bd231b14789259c23028e16dec","tests/fixtures/invalid/local-date/trailing-t.stderr":"9cf2e418427abe378484486356229b38f1db53842090a2d7d0637cad1a6b16c5","tests/fixtures/invalid/local-date/y10k.stderr":"ff9286e64bf70a2e35bed170d191349f0045fc8d6f184a183cbea693496e99e8","tests/fixtures/invalid/local-datetime/feb-29.stderr":"3fbdaad131492c5e7c85df1e90f73977a2f1236422b5fe86847fa000dbee7e5b","tests/fixtures/invalid/local-datetime/feb-30.stderr":"32e38bb349f6cde4e60534764f5839240313caeee12ddf4d97d4df404a6f3b01","tests/fixtures/invalid/local-datetime/hour-over.stderr":"0aefa752706aca82810109a94b9a5bbb8f50ebc4aa85bfb091466618c714c1f3","tests/fixtures/invalid/local-datetime/mday-over.stderr":"5873d8c67de9fd55e424aadcdb68d42842ccdee9f2e2e94e0bc42caea6635645","tests/fixtures/invalid/local-datetime/mday-under.stderr":"a1df2d77cf02f3cfe2a44daa946978aeff84db9ee033e61358e2610ef8acd3d3","tests/fixtures/invalid/local-datetime/minute-over.stderr":"1717bf680a89f59a66d5dae8dc98a17757b8973f70f869744ce6b496fa2c7c9d","tests/fixtures/invalid/local-datetime/month-over.stderr":"ffc05504137e79700f4c78955470e975bee840580cf10229202903a498e09858","tests/fixtures/invalid/local-datetime/month-under.stderr":"8e77bd4dad24e1d7e5c017702410cea56a085585e7d97425c55761b0246efde8","tests/fixtures/invalid/local-datetime/no-leads-with-milli.stderr":"88a35c260a65588d5ca0246c0f27f5e5e6fe8836777e5998c9f3c4bacca1c8f2","tests/fixtures/invalid/local-datetime/no-leads.stderr":"40795bab32c16aa63e609add7f809c7c22d2764d98700b3eb91c20e6eea156e8","tests/fixtures/invalid/local-datetime/no-secs.stderr":"f946633b31380b72df35d6a0e371f4eebca26332abac1c3d2841918461df30cd","tests/fixtures/invalid/local-datetime/no-t.stderr":"802e0bcf8a66b32fe9f2d0571808782bd37a6f1ff8c5e92368b5ad4c18d2218a","tests/fixtures/invalid/local-datetime/second-over.stderr":"7494350b21ac24f7f30c95f568412d7214a66dd9b04fbf454647f0972588a7fc","tests/fixtures/invalid/local-datetime/time-no-leads.stderr":"5117ac62dd754a203f2fd6e5163a2ce352776bee513219252cec77c0ed71bbbb","tests/fixtures/invalid/local-datetime/y10k.stderr":"66cdcfa2f4dbd5270936e531a1f3a9ac54a70dec246f3ef93b180911c201db1d","tests/fixtures/invalid/local-time/hour-over.stderr":"0f0507c0f3888330f1346e6a4c100c4bcbbc6549599cd39249fb59c7923b1801","tests/fixtures/invalid/local-time/minute-over.stderr":"052a762b6f62e21d59d145da3d242489990f99023681a4a645022af743a836be","tests/fixtures/invalid/local-time/no-secs.stderr":"db11e76aebb5c91f57869f1dd14ff7b0ab19b400eeb8b15936d0d82e4a8d0fe0","tests/fixtures/invalid/local-time/second-over.stderr":"18402b0e6cf205f466e3ec3d409daeeb77e355d41548f11bd3e3369240a282d8","tests/fixtures/invalid/local-time/time-no-leads-2.stderr":"2e446fcabdeeba0c118d1d49b89d7ad1271dd9eaf1ba109ee445c4f68ee96214","tests/fixtures/invalid/local-time/time-no-leads.stderr":"70094ae81f89871b0804839a5cea0f7591ab55b6c72c5d2867004cd4a0e0d86f","tests/fixtures/invalid/spec/inline-table-2-0.stderr":"41118ecf5033fdb7de4edaf1abf90e524bb50f8f3c44ef0a080be4ba1470b82d","tests/fixtures/invalid/spec/inline-table-3-0.stderr":"b7ea14eb8c6ba2cb126dc3947d00ce10a5403103a682e719ff51efebae6bb613","tests/fixtures/invalid/spec/key-value-pair-1.stderr":"d8b4149dc0ede93fe7c0d7d02a0df9d31fb2456b87ebeb532623bd6f825c2d23","tests/fixtures/invalid/spec/keys-2.stderr":"de2e84dc37ec53bc12ca585a9d2586404a920375bc201d7b2643fdcd537da691","tests/fixtures/invalid/spec/string-4-0.stderr":"c6dc77f81979a92cb5612b7f4b8e96d41bad9bf7a9a706bff5a05a6c65f76e86","tests/fixtures/invalid/spec/string-7-0.stderr":"3226561489c03d8fc983b0584d40f18629f46a425c5c7f34a4e984e164a4eb38","tests/fixtures/invalid/spec/table-9-0.stderr":"23b1d3b522e9fac974c4ea254df4798adf574be6dfc8ef1107438c502b3aca4e","tests/fixtures/invalid/spec/table-9-1.stderr":"f0164ed288eedfed3a6fecabf305a93050a6c3cc6a9397894633e4ac33b2c834","tests/fixtures/invalid/string/bad-byte-escape.stderr":"5807e3215b0def7410283291aeeb46514fa0a65d4326bff3669585e0222d5b2c","tests/fixtures/invalid/string/bad-concat.stderr":"176458d0d31d02a16e9856a80b1b9c4dc040b3ee3c83c8a678df9b1bd12c1e4b","tests/fixtures/invalid/string/bad-escape-1.stderr":"388e58e25fd5fc78b2465f1258c952f4850211b19e9fb65cc31a29774a19aabd","tests/fixtures/invalid/string/bad-escape-2.stderr":"51829779b7317fe753c54b53eb08fba669b16fc970fc29699a0a497aa95dc623","tests/fixtures/invalid/string/bad-escape-3.stderr":"8e5050c043061a991f6cf84be6b6e6ce468a35dd2ac50a3a4ce2ca1e1d5304e1","tests/fixtures/invalid/string/bad-hex-esc-1.stderr":"68446cc8fe418df4441e15118161a953cbeb22822d67c54b81c8f97aa48005f3","tests/fixtures/invalid/string/bad-hex-esc-2.stderr":"d7d979d0c5700548eae7a42c7e87253de0118b67a67ef6dbeb0598d574800099","tests/fixtures/invalid/string/bad-hex-esc-3.stderr":"fee92d2f9937e322423201b3099c7a246fabae85ccc23e990b602e1f5e181d9f","tests/fixtures/invalid/string/bad-hex-esc-4.stderr":"2c6f994aebcd9e644f469c84edb9d8ba6b6b094a949410935a590e8e6e6122ef","tests/fixtures/invalid/string/bad-hex-esc-5.stderr":"10f740ce3c36f4a8f7a1f8ab5c84e0fa5e4c3a88ebe534f79858781079139a96","tests/fixtures/invalid/string/bad-multiline.stderr":"a1ecdec206e87461bb4bb27ecd21a43da48d1d5bef6d8d746958d45219ce9dfd","tests/fixtures/invalid/string/bad-slash-escape.stderr":"7f3b917db5a8d87484f8b03680a2cd60288e549c5bca0c9e00c7e531d3e0405c","tests/fixtures/invalid/string/bad-uni-esc-1.stderr":"385be83541cc94367c9849619740c8d198b9c138f6f4916685cead90fabc3b9b","tests/fixtures/invalid/string/bad-uni-esc-2.stderr":"592fd536f48c1aa6c4c9b454c5cf5e1a7473860602ff2875430d4a7e676b6594","tests/fixtures/invalid/string/bad-uni-esc-3.stderr":"f6c284685af63ac02fee8e8ee641b03e90893a03001834625ca22482cae4d29a","tests/fixtures/invalid/string/bad-uni-esc-4.stderr":"1df7029bc305307943cc58417f98cca4c854deba8475b305675b2505d4d9b83f","tests/fixtures/invalid/string/bad-uni-esc-5.stderr":"6cfc8fee06b9770271b1241ba6025a470b1ca8cbb80a3dce7d6ee1b2c2f7f637","tests/fixtures/invalid/string/bad-uni-esc-6.stderr":"73d8f5132741c15286327111496d475807dcb638b34c10db20bb37d96910c209","tests/fixtures/invalid/string/bad-uni-esc-7.stderr":"c9c967322b827675040ad78cf4fa1c9890bb13a124a2274eb693622d5ec50420","tests/fixtures/invalid/string/basic-byte-escapes.stderr":"50d06255616038364b52a0a32113d96e8b87de8e5ffcef93c2c88d0af9b57670","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-1.stderr":"b26e80921025c1fb0dfe33c01460e5ac96791585ab8204db3e76c83ccd404afb","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-2.stderr":"c9f8c422be49fb11111623c4322c421b25bb9592fade95bc1cc2ed9c3c2bd93d","tests/fixtures/invalid/string/basic-multiline-quotes.stderr":"70de515fa0500fe6ba3b915d224653824ae4e213cf41d9b3465b536a0007c623","tests/fixtures/invalid/string/basic-multiline-unknown-escape.stderr":"2c104ecdfe88a89893d167ad41167108208d3aeb0c22c7d5193950ac2805af60","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-1.stderr":"82b7d85f48c58289c81d149814c591195f361e23875dc2a9767215bf077a148c","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-2.stderr":"9b28ddf18556e9adaf77319877189112aa8ac93464ecc09a8c5020c3c13b143a","tests/fixtures/invalid/string/basic-unknown-escape.stderr":"81ebb5efff40faa0b5161e4d92faac81aaf85c038987ca3d0ce7ff28f91f3cd5","tests/fixtures/invalid/string/literal-multiline-quotes-1.stderr":"6776f505f0a2a6a67e3e5fbfa6ca0b9ca2653a1a623d1fb3b463305ec872699f","tests/fixtures/invalid/string/literal-multiline-quotes-2.stderr":"e304eb9ed3f7a136c74a1c70fe73f5f75a169ea93aba2789e6441f84fbcfb03c","tests/fixtures/invalid/string/missing-quotes.stderr":"ae9dea4e735224472bfcdb61471def4877404a0a3680e41340b0495552ea8133","tests/fixtures/invalid/string/multiline-bad-escape-1.stderr":"7c5fc3bf00f17344781150281839f78228905d85e41895f4c6d5fb67c7ef0a2c","tests/fixtures/invalid/string/multiline-bad-escape-2.stderr":"c4f5464eced80eb93368ee62ec14c6c4c8160ec7e33000b5d7840f748306b2ea","tests/fixtures/invalid/string/multiline-bad-escape-3.stderr":"ad14d3d916a15353394638613d6d79da2e004e7e522c48edbd2ff45edbcb2685","tests/fixtures/invalid/string/multiline-bad-escape-4.stderr":"e0b254f4a49cde181f4d8d94e032299e1506a09e8bc5bd54590a04251d5978ab","tests/fixtures/invalid/string/multiline-escape-space-1.stderr":"addc40c648a77da6e8ee3d63e73e58331bc5f8cff6d4ba67bfe679db464de835","tests/fixtures/invalid/string/multiline-escape-space-2.stderr":"8e9cc938972808cdeb4e8d2f180e1ff856000eb52f3e77ed5149658c15296d75","tests/fixtures/invalid/string/multiline-lit-no-close-1.stderr":"5e57a18bec64d8ca2fd53473aff6f1cdc8e5c35209ecf84a9e9da8ef3865fcfb","tests/fixtures/invalid/string/multiline-lit-no-close-2.stderr":"40a6c9ece9e2b03c137283b825b6c0380e5778e1c76d20ed2f46647e3ea6b25d","tests/fixtures/invalid/string/multiline-lit-no-close-3.stderr":"cfefa000b457e225de66a0618b2d245c0887099cda67c6ced68612df58a50c49","tests/fixtures/invalid/string/multiline-lit-no-close-4.stderr":"12629cc0445ac282832bebf35e0bb2eb1e305a4a4c147f4103773501d56d3bae","tests/fixtures/invalid/string/multiline-no-close-1.stderr":"40f5d85746b8d297b1cc27bfcb95b8bd2a2a471f0b820bca0b3437c4ff6fecc2","tests/fixtures/invalid/string/multiline-no-close-2.stderr":"3c121acbcad1ef6821da5452f0e9223f75915be50ab11d69efa498cd2c9685a4","tests/fixtures/invalid/string/multiline-no-close-3.stderr":"9850d68e589fb8ebe7b1cbf9f27e4ac991d27b939a5be577df02aa9dae58207d","tests/fixtures/invalid/string/multiline-no-close-4.stderr":"dd0703ac4d584850805bb5a7afdb1e68db06fef1dbe2a93ba85b01ec76da6b9a","tests/fixtures/invalid/string/multiline-no-close-5.stderr":"c6874fe259394f8a14636182b4fb0f20009d678853fbf4f5c7e0e0d53fe0b789","tests/fixtures/invalid/string/multiline-quotes-1.stderr":"4d524fc6b34800ef6093894044763f1eba2b4fffc110b2558ad4f76249985651","tests/fixtures/invalid/string/no-close-1.stderr":"ee585c98fe640bd5a6edb8c5930358b1a7c9085d07e7fb318bc094e81dc6e1a5","tests/fixtures/invalid/string/no-close-2.stderr":"2284df23ebcab2f4a535e31726035f5cdda9d56190269a8189bd959fb806c636","tests/fixtures/invalid/string/no-close-3.stderr":"30cb3d9d517219b70c7d468207f0f4567d80b00330a943f482803980d8f65998","tests/fixtures/invalid/string/no-close-4.stderr":"4ff50513bc0249a3e503db5f255c1251bfdcdb764a6541d484f7e09bf4efbcab","tests/fixtures/invalid/string/string.stderr":"68446cc8fe418df4441e15118161a953cbeb22822d67c54b81c8f97aa48005f3","tests/fixtures/invalid/string/text-after-string.stderr":"a20980f6482cb204272c705c89ee6cc0987b44c5fb357466f05fe442754c1cc7","tests/fixtures/invalid/string/wrong-close.stderr":"6b376b179dd7022bea271e63e77f0afc15076cd4ad0c81bae6007fdc430072a4","tests/fixtures/invalid/table/append-to-array-with-dotted-keys.stderr":"76b544968f3a5771cd2f5efad26167ab5bdcbd8b067586ec0e602281ae5869dd","tests/fixtures/invalid/table/append-with-dotted-keys-1.stderr":"1379eea8bb3f62ddc212705a525cad262da23f16b03bd0626650c61c6811a680","tests/fixtures/invalid/table/append-with-dotted-keys-2.stderr":"7b0ce2aee2d44c234a14bab3fb339661f00b3e3bd39784f3ae7058f3a48fbdc7","tests/fixtures/invalid/table/array-empty.stderr":"e3cd186fd3a22b55fb7e18c6247f91c8da4b61396bde01ab970847aba933b80d","tests/fixtures/invalid/table/array-implicit.stderr":"dcff7e1489ff2a416a5945891c7007152ebbb8cd028baff4439ad2167a1f5976","tests/fixtures/invalid/table/array-no-close-1.stderr":"a816d34d85c8a0ced8cb9315723ea1483711a6f19f6e2e2c96a409d7d43c6fe0","tests/fixtures/invalid/table/array-no-close-2.stderr":"b07a23ed41ea508abc35fcaaad1b38d30705ad874e62ecfb6affbffb39ff4487","tests/fixtures/invalid/table/duplicate-key-dotted-array.stderr":"abfbf76b0555af439f38404ff1f4b2736a759f1bfca347f5eeb8a3754312e835","tests/fixtures/invalid/table/duplicate-key-dotted-table.stderr":"a55218213d972554ab52867926d6c108a308c009b8be13e05578cba1a8638f67","tests/fixtures/invalid/table/duplicate-key-dotted-table2.stderr":"ebabea3cc176fc9f85083f697fd9d6ef97d7230e369be4c504e78c00a82672de","tests/fixtures/invalid/table/duplicate-key-table.stderr":"58598e44d8ab8e8fcaa0f9ddbe2415013ade6965db761d99162312cde1e56fd8","tests/fixtures/invalid/table/duplicate-table-array.stderr":"4079ad8885e7fdd2a0674c31767efb16350ac5906ea5f71f980e06b804a515ba","tests/fixtures/invalid/table/duplicate-table-array2.stderr":"9b647eef2e77b8538ea32d0533b80c870fa4173f0a5b151399c84d7edde3f31a","tests/fixtures/invalid/table/duplicate.stderr":"f537ae526887a2288b943ec1b2d3ee31bf0c9193feaa27bb9e8c447e104ece6d","tests/fixtures/invalid/table/empty-implicit-table.stderr":"b331fd776de53639f8b6f9740f0922ca97aa3919ea365904829dbd61e39a58d4","tests/fixtures/invalid/table/empty.stderr":"bc6c1109c2dea2c69becd952c68f7ced16d983051a9a0b32af1868349e4f2f40","tests/fixtures/invalid/table/equals-sign.stderr":"93ab20fbe68fd87648a4ee58d8af26ea7224818f605fa4cdb2ec5aaad652d050","tests/fixtures/invalid/table/llbrace.stderr":"90b78fd64904ea772687d8fea6df07b684a6d278a47aab242eeace8547921a18","tests/fixtures/invalid/table/nested-brackets-close.stderr":"85435c519a813544af5e686cd89f0a7c2944ab30806ee6fc3632266a03801a51","tests/fixtures/invalid/table/nested-brackets-open.stderr":"2bbca8c47edf49cb4541d869ec198beb5167bd9ea1e40d7daa461f03c5554293","tests/fixtures/invalid/table/no-close-1.stderr":"6e1bbe0ba02c31cd687a9dc8fe0fde2ce1c0cda31aec651dff58f41d8aa7d62a","tests/fixtures/invalid/table/no-close-2.stderr":"6e50b27f819a6769accee8b45850a2181932a8809fcdaf347c6d129ae6da307c","tests/fixtures/invalid/table/no-close-3.stderr":"68ce4165d0133af527af7c56fd1af4e652af27cc221f1051a8073e7192a78a20","tests/fixtures/invalid/table/no-close-4.stderr":"52d8e13b39b9507ef37a65c0eb779e89ff7d00fd4a70245d44225a35200a6ae7","tests/fixtures/invalid/table/no-close-5.stderr":"7c3f3c078dbeffcf3b55d3ba811d89fbdd19c1d2ae62b290224003ad26863a00","tests/fixtures/invalid/table/overwrite-array-in-parent.stderr":"f4f94892b9268181ad4e5d64337ec3bd11d0b1a49add7a7c52a0a949f511e79e","tests/fixtures/invalid/table/overwrite-bool-with-array.stderr":"1773dc739ded58c66dadc101668fde5877ba018268dc3b124a4b788b0a0f1c68","tests/fixtures/invalid/table/overwrite-with-deep-table.stderr":"7e1c743c45e4919cab3d36cff96a2165f15cd749411d8c9e758c7ccb7d972893","tests/fixtures/invalid/table/redefine-1.stderr":"a8795ab0ce678bea6299751633e08747b862a46c8f4546094cd1e5f643715202","tests/fixtures/invalid/table/redefine-2.stderr":"dbd674695c75ab83513cf0207304e7ec84565d6dac607e8da85eb9cf41475806","tests/fixtures/invalid/table/redefine-3.stderr":"e161dd3883e7d38e558d296898b637a09ff287cf35a8d921577693fd3c7a2770","tests/fixtures/invalid/table/rrbrace.stderr":"412d28cdee519340465a0e764529acffd5947f566d8b87d69a1a9890845e3747","tests/fixtures/invalid/table/super-twice.stderr":"c9d37817b5e5afd36a2ef3f12190ccf512217e5fdbb78d075d873ca2d2a90f98","tests/fixtures/invalid/table/text-after-table.stderr":"accc6467f519ab738eaa646c255d527ae47c4958231db59b2a9ef16549dc2fbe","tests/fixtures/invalid/table/whitespace.stderr":"73d125e308a219ce5aba0d45ea17b6247eda746e76740f640066b891092efd16","tests/fixtures/invalid/table/with-pound.stderr":"eb3fd32c944de502852f2e7b453f3f56849e7fbdbe9060863f9d65e308bd7f2d","tests/invalid.rs":"a8ca04aa4970cd310aaa01b97a55f78f84e6ccc0cae0974bb5e3b78056f5f437","tests/testsuite/convert.rs":"bb224d372b98c2c746c0ed127dd4c0289b1486b070b5d126939a412add34b461","tests/testsuite/datetime.rs":"62354b8e44466ecb63e0b64ab5e70212075cc42bc5ddf00d513004968f01c15e","tests/testsuite/edit.rs":"ea917588c1e2a331864f59340d4c385fc20156d551ead34438908d76522ed434","tests/testsuite/float.rs":"91b0be9a56c5b0ce7e54f7eda3ec72efbb33f855ebd49da660483bba3935586a","tests/testsuite/invalid.rs":"b2998cd7a30c8dc96f614e938edc9a7bf2eccf5662706994241294220319319a","tests/testsuite/main.rs":"c85d415a8c20f47f383c051fe7cfe3324947844bee922d6135cabdf63ada8403","tests/testsuite/parse.rs":"e3c19bc40167768cd50613ffef316c1ea31bdba3d9f52e997a0a84cc67d2ec19","tests/testsuite/stackoverflow.rs":"74df28497f99d467cb710eb5b3c48e77360747c7c21242e6a82c55389f0d92e1"}}
\ No newline at end of file

crates/toml_edit/.cargo-checksum.json

diff --git a/crates/toml_edit/.cargo-checksum.json b/crates/toml_edit/.cargo-checksum.json
index 03d4a27..3875464 100644
--- a/crates/toml_edit/.cargo-checksum.json
+++ b/crates/toml_edit/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"62838a7b98d7aad49051d982c6e4afc306a1313189d8bdc751386e0d10addfa2","Cargo.toml":"7f220fca5b096b55d92d569c4f835a863f2daa422bedf85e800fd362e80c3d81","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"39f3575e0849928f6f8fa4cfff6f44c96fff96dc1146d761830a87a6ad33cdbc","examples/visit.rs":"657756caba28aa87a8b10104aba704fd2365579c57a293bc572a8d72173ba174","src/array.rs":"0f0bf16d16a4af2257ff8c93f1e1ef4684509182c57b4f90dfbc67554e00d737","src/array_of_tables.rs":"7b87bfb27be3fcec86cbfbe974c65269b2a842f5cd54c6a842c9024db4aa229e","src/de/array.rs":"7969d28e98e366cd16c9ed74128404a147a2b787c54d0450594811a92d17b310","src/de/datetime.rs":"a29e76372fc382686c31ee93fd54c749ea3d775c8d4fcc2b2643f9464ea23730","src/de/key.rs":"0b4c60586421a0c7b64ce93d41717823d93aadb99ff360169f7e68ded8eee9e2","src/de/mod.rs":"6bcebc228026917a5fc51c497c0751707bc745c7be9919379ff2a1fbe9d311f8","src/de/spanned.rs":"5c959639bf4b3d19c6b18e625a57b28b311164bf7b191bbc4d30aa97b7239679","src/de/table.rs":"a56756925b474e9c9528b923be02b5ddd4a3193c3693dfd4d71dd4544732bb9c","src/de/table_enum.rs":"ad3aab5169d6ddb2e7cd50a4dced4ee2485b11388876474969137b12fe6ee1e0","src/de/value.rs":"ed366fde8ec410e0f0a9ffd6a7ffa53c932572a0d258f8d28c63917714bd1db9","src/document.rs":"d436cc039f2fd954f476d2fbc8860f3f8247a62caa11f2055346f23e30c277fb","src/encode.rs":"83c966f5818f7f927a6079c704713bc1cfb24d6e18a44190ee807ac6b4c5bdac","src/error.rs":"90beabbd868c03d1c79afb1ea93c0d5478840e0ba1f13d10216d043fd0ba9760","src/index.rs":"34ed0a4cc0cd55ce29885ed8123cc7c09c8ba3b9aa8d3b0b47554c1a41d31577","src/inline_table.rs":"07b7219a72ac929edd66f6126151fc6f43929dfce167333fa28344cc12f49245","src/internal_string.rs":"8c84f94363ed012eb7114c6b3f6b371155d0ce740ce44ec9d315aedf048c1d11","src/item.rs":"ff66fb037fa7cf1d055777fda19ec4febf6c45daf30035d7f10777e49e01a817","src/key.rs":"de34ad87cf7014ed9ecfdcaae6b20c2ea739c362926ec5e3bbc2facc567dda22","src/lib.rs":"ef1f214e1e7b6277b33ad3bd3b180dd33f8582c8f8fc91dc6bfb5ab80c66b690","src/parser/array.rs":"277cf3ca33688cb484843e2df9096e1fe076e6ee7e9132798284ce2a6d641475","src/parser/datetime.rs":"84d4d3c147466c9cfa21d40c64de25fb8bc5fbbd643f40f4a7ac50483f5a8c3e","src/parser/document.rs":"0b94e7e0bd53606949d66bb6854bf275bed399b869bbce18d6acbd65238de112","src/parser/error.rs":"025bce90fab50af89eaaa161f9116a577604632858a681cf8167904ddbfe354f","src/parser/inline_table.rs":"adc95b2c77ad256a56800deead8ef06002db6dbba60755563e445a344e1a836e","src/parser/key.rs":"69191a18ddf67a77f6e09a593ad03393cea642324124a32c0109debb16849992","src/parser/mod.rs":"a4bd31baa663a3ed5f43d210fe566941b9b42d86b7eb57f4138ae03a6ca3a3bf","src/parser/numbers.rs":"cdf43253a8e88260373a41dd5e89e0f693952e5aef010ea412d9daa5eb4d4f91","src/parser/state.rs":"20d0ff7aeea8eef888cd3a3b1aef47616c55dff77bb61d5258c493ca58351f33","src/parser/strings.rs":"82d73152c536b6254f7698c70c0bc29ef1b4c29877e8b86295ec88bd28fd31a3","src/parser/table.rs":"c716d82caed27229afb22e757cb14b2828356fc69d33ab94d8f43043f992cd2b","src/parser/trivia.rs":"f93ad3217f5cc5876ae9b4aa20b64d13bb3dc2e39fa941315f0cfaefb6c3efa3","src/parser/value.rs":"f221bc3c6479d6243bfda0b5a8ba545944d93fa86170cab2dd4319c75677ad01","src/raw_string.rs":"f26542a3a7325b29fe6b72c8facb865ebce42b270d2126dd1aad06b5ef0c57ae","src/repr.rs":"d259af1a8ab17312945d913be2a46e0701cc2a367cfc4e6bb7c0a55d8ef5f989","src/ser/array.rs":"5fb55303365bf6991f7af523931d1a046e88d3125c099317e12a7d4f592321a8","src/ser/key.rs":"9bad3bee90876c5c54aaa5caee92bfe30d79a100615902118b35b3ceb40b524e","src/ser/map.rs":"148423fba5b370335f832b2f6851adae29f4cf90dd05ace562e44cf2bf071aa2","src/ser/mod.rs":"49471b5e6e82fd95c9f87549e2c0f0f3105bc7c1c697ceb7481deb43ae96f31c","src/ser/pretty.rs":"9a9f6d43b2eab487de8af216b9950c93318c9ee6a91f4707ffa41e2ee492c902","src/ser/value.rs":"3bd14fc54ea343cbc04a5b74461aab0eb1043b558cbc58bd02a7d08bbc020ee2","src/table.rs":"614c3f669b3230f7a34b1768cd422b052f2bf17784dff0fdae66757b9d007fba","src/value.rs":"9a40f0931103665830713adfc8b39aa1aa3b5030220b86fb9d42080215e5e133","src/visit.rs":"b1dd699301d93c2a01558f44712b831bcdbd665066a7e0816590f82edae04a46","src/visit_mut.rs":"10d3de01225fe1181dc3c19992069e495299ee63514ace5f4ab058df8855bbf4","tests/decoder.rs":"8093389d542f50974d6a606321b0413941709ac2cbdef48934b60088bb21e3a3","tests/decoder_compliance.rs":"d804ef45b0498869d05ac5c1216dc29e94963b2ec4f814e867f0fe8b71e9c639","tests/encoder.rs":"c84dd8e14ade77a4d55f932418567196e188fe65d3957408b9ce07c2c27c4da0","tests/encoder_compliance.rs":"ca696031cb8f664728521da0370eb78e0351a5ac7134ad6cb12bc25f85757c97","tests/fixtures/invalid/array/array.stderr":"db4f1f06909589f9cb49d6657b6c39444e53b4ec8c4d3f0b9704ab5beaf68d2a","tests/fixtures/invalid/array/double-comma-1.stderr":"db4f1f06909589f9cb49d6657b6c39444e53b4ec8c4d3f0b9704ab5beaf68d2a","tests/fixtures/invalid/array/double-comma-2.stderr":"da4b8df6dbc2ef41b7b1b08b65a160ba37d07dec0c1ccf4184d6381a857b8762","tests/fixtures/invalid/array/extend-defined-aot.stderr":"a9dec506541bbdb96725d9f989572c10f29a52eb4e167fadea8929d7b6729b7b","tests/fixtures/invalid/array/extending-table.stderr":"a6c077cb49c41a9d10aca0bac6c571e570f0a772c6311d6a835f9cc46f4ab7cd","tests/fixtures/invalid/array/missing-separator-1.stderr":"98773b4d82cc32c0f8d1d8e6078109f7d9655b13d58e4b62fd22cef9f9ad725c","tests/fixtures/invalid/array/missing-separator-2.stderr":"eb38b2683f119d8b9b8c6b8ffd46da784112565ef1033febbe59469e14baea76","tests/fixtures/invalid/array/no-close-1.stderr":"a02ff4b3edf627873f0cb1f4242305f6a9a032b6f897fa13b8070c1a9ae85afe","tests/fixtures/invalid/array/no-close-2.stderr":"dfac1f12f502214388deecedf7a9720338ffd13b3184178410581e242ba8124b","tests/fixtures/invalid/array/no-close-3.stderr":"1930ad00952820805e208ebaf1ae3df243f492b6b2924bbfffbe458f31d89b29","tests/fixtures/invalid/array/no-close-4.stderr":"198293e991ab522435e383ef906f0594a0ea8126c792db934eba142369189e1c","tests/fixtures/invalid/array/no-close-5.stderr":"279aa5db5d92d3e729fe326321d2d217ff33db3c5e2bc2a5043909fc798c226e","tests/fixtures/invalid/array/no-close-6.stderr":"ccd74b7a7c01bb96a748c0e797f6207f0314d76520e4c1d1a9cde076e2284216","tests/fixtures/invalid/array/no-close-7.stderr":"9c6ab0c93fcf0c9ff7fdf8bc13f3b62864305509b80659c225a55641133abcf5","tests/fixtures/invalid/array/no-close-8.stderr":"c4b7fe79f9a354152c36e130af4862c47908cff3c84ba9be8bdbe76c35d9c6af","tests/fixtures/invalid/array/no-close-table-1.stderr":"545ad4381d5a007a6cd940a4523ae2f629617d298611c0898283a1c4783604cb","tests/fixtures/invalid/array/no-close-table-2.stderr":"5a2b4bf9026aa20c749551cd77458c5ffba008b5b235fa05fb7c756917018eb8","tests/fixtures/invalid/array/no-comma-1.stderr":"7d2f2923638cecc2f89e8ff1334a9da44fa7e137bea12d5019ef25f576f015af","tests/fixtures/invalid/array/no-comma-2.stderr":"d95a7a43534c632efa2502e3b5f8eedabf2f05ad6bfdd68e2f9fd3d8a22ba028","tests/fixtures/invalid/array/no-comma-3.stderr":"ae8ec653f564b247644854fecf59e097cc32e445aa4775aed8d18a207af5ec45","tests/fixtures/invalid/array/only-comma-1.stderr":"6f35677e711812007adc9a59341bc62bf2b7bcec80a456d19a2468ea8fd27b47","tests/fixtures/invalid/array/only-comma-2.stderr":"9d0017e6798574bd85810e64816ddfd08ccc36e25153006958fe023e2a007331","tests/fixtures/invalid/array/tables-1.stderr":"f105a34c2d87b61160881eeb09b7f54d244ba2a222d32fbfc755091939942247","tests/fixtures/invalid/array/tables-2.stderr":"77010599d1d61a34119a99acea7d84162d217df93bca01aed3ae73f1eb62dafe","tests/fixtures/invalid/array/text-after-array-entries.stderr":"391ee42f4fa3a7ec51ba1b90e69f1d9278c105426fe66ae1f80e65d7fb6ed379","tests/fixtures/invalid/array/text-before-array-separator.stderr":"7292ebcb8c9c8aaa4041279af5414de3e710977cac948988cdc8b0947223b62b","tests/fixtures/invalid/array/text-in-array.stderr":"0486e3ec5d299e39c61380a2ed8826d886edb730f6d9555a765e4314da7f5b68","tests/fixtures/invalid/bool/almost-false-with-extra.stderr":"d489307ba1d0a3dcd1bcff067437f0cde1521c6fddb1311bf396468521eabe81","tests/fixtures/invalid/bool/almost-false.stderr":"399829efe867bedbcef2ad2073df621f8297877180f71c6292209426da7b09dc","tests/fixtures/invalid/bool/almost-true-with-extra.stderr":"439c66bbdcdd335cb858f3cfc692fa3a78f7802591954909fb6807a62440d334","tests/fixtures/invalid/bool/almost-true.stderr":"3aed4e8704abc2099d8a881ee496a868c4745a0cfe7df781de613016543f4313","tests/fixtures/invalid/bool/bool.stderr":"d489307ba1d0a3dcd1bcff067437f0cde1521c6fddb1311bf396468521eabe81","tests/fixtures/invalid/bool/capitalized-false.stderr":"09c2b3b51460a52bc274c5d0b08024c76ea3dd7e067ef20765cc56d2a4f60087","tests/fixtures/invalid/bool/capitalized-true.stderr":"d0fa94dc8a4fb0f17550052fde5e10134e8ccbc84f1e90093446f1cb99f01a70","tests/fixtures/invalid/bool/just-f.stderr":"5f6a3a206bf49fb5eade446dc8f432037a4026f49beac01e453fd8c3610901b2","tests/fixtures/invalid/bool/just-t.stderr":"175bdb4ffa7259c5bc346fb088de8545e8e1d8254d1e2ac0d33c16b539e2270e","tests/fixtures/invalid/bool/mixed-case-false.stderr":"9de4d4b695614f3593abcb27a6f68ef5c578a96bec01472607c35cde28d48b10","tests/fixtures/invalid/bool/mixed-case-true.stderr":"45e314b026b819d568350bb62a39a2e5fd970acaf0a6591539d043abb9dee629","tests/fixtures/invalid/bool/mixed-case.stderr":"927b85ba3c3084e925cb8959c07d42f9f19f4ca8f84d7dd6babf15f1d9a1048f","tests/fixtures/invalid/bool/starting-same-false.stderr":"7e0f1f2d8ae538a5b156da19be0630d25e0d2dfa44bd97cdb125bf3e042df7d3","tests/fixtures/invalid/bool/starting-same-true.stderr":"bdf30c50dcc0ff8c928e753962f6dba7acc6f945a2958e0b03e690a126270ea0","tests/fixtures/invalid/bool/wrong-case-false.stderr":"811f36bc4df7755c3850b4e933e5436fb54183ac7fcf3599e8373d7545be1c2c","tests/fixtures/invalid/bool/wrong-case-true.stderr":"90520b03257419ec4a826b7f989e5aa74314a0aeeceaf6bf1873e867715495a6","tests/fixtures/invalid/control/bare-cr.stderr":"568eff61d56bb362866973d9a7a488831b8b08d02f4808538a04b22ebe10bf09","tests/fixtures/invalid/control/bare-formfeed.stderr":"86ebf66dcdf202fd832d91892b4b62eca65957198cca9567b10f3400997e9f90","tests/fixtures/invalid/control/bare-null.stderr":"e6bf2df7229c8632a1c7bce682914166520216c2d6c3ccd4c2e716dc700d5bca","tests/fixtures/invalid/control/bare-vertical-tab.stderr":"b85c55e64c58b85343482dadcd5d833fa771a79e1d0f13a24f4185a4d0d826d5","tests/fixtures/invalid/control/comment-cr.stderr":"3b334037fc70762903ebc2c3d0786554bb62d9f146dc801e07841ac7f8370e78","tests/fixtures/invalid/control/comment-del.stderr":"872065efcbcddffab0679160bbce0c8e2519ae7ccb8b4b667a8b78c4bd13522d","tests/fixtures/invalid/control/comment-ff.stderr":"bdcaf413adee168eaee3a7723b2939fe67e59914a834cbc559902eb94e4ca02b","tests/fixtures/invalid/control/comment-lf.stderr":"898787080f260e05ca20e6982ac4cce5572a6ed84a9244ce07a41f710db9a0cf","tests/fixtures/invalid/control/comment-null.stderr":"bcc48727ae370e45918682d6a17bc680b126d4792d4a33524c802f45cebc03d6","tests/fixtures/invalid/control/comment-us.stderr":"37d7a6c0a28989966af74530c2885bfc7ba6ddb31b58bce3f26543e34043b88c","tests/fixtures/invalid/control/control.stderr":"6ba75c9dbd0e03531f5a5ead2cb781a702d3600c76b2a4cf1bf7c02c1c9aca1a","tests/fixtures/invalid/control/multi-cr.stderr":"29fde9a540e77ed46dae0a227b666a9c102d5263cc5cac811e0e451bd403ad91","tests/fixtures/invalid/control/multi-del.stderr":"79f0d85f5b44a7dcad9d98adbef25b6ce54bb6dbf79ffcd3ea230a07144b4b82","tests/fixtures/invalid/control/multi-lf.stderr":"8c95b2a7b4e20dd8985e04b8da5fb9d7cbff37220a74fd3903f16f7ea7eaf39d","tests/fixtures/invalid/control/multi-null.stderr":"9fec8ad3ba45ddb96ad3b6a118b4fa648056e26a9128528b2c0a8fa3b01e741c","tests/fixtures/invalid/control/multi-us.stderr":"3a59d615cb91172936acdc42baa39e9faf3a2bb9e9078d9879a54826ffb6b20c","tests/fixtures/invalid/control/rawmulti-cd.stderr":"a71dce0ac9a79209ea173f3d656b2d663c685b47841b620cc89860fb68f0cf0b","tests/fixtures/invalid/control/rawmulti-del.stderr":"3b99e52cbec29c7b6b439bcf3cd58b85a72487e2f5af5e829dd6986b3414f49f","tests/fixtures/invalid/control/rawmulti-lf.stderr":"89fb9c7d02e39ff648cea46ec1086058016c5ef1deebc6f3b106664dc4d10eae","tests/fixtures/invalid/control/rawmulti-null.stderr":"84c04cc89a6bc716b6f7811142899014abdb0b49c4ea56bc163c19220b14c323","tests/fixtures/invalid/control/rawmulti-us.stderr":"ac53d1dcc96c3beb454f5474a23940f26c93705b76a10647c810f79facf4f6be","tests/fixtures/invalid/control/rawstring-cr.stderr":"fa8da523c3cc24384fda1dd6032607cdd380f45133ce7d6d2a1d3b8a3eb6a917","tests/fixtures/invalid/control/rawstring-del.stderr":"64378c4341fb92376e2fe8a70356411759b8659e151ed0ca744751c8b2d32155","tests/fixtures/invalid/control/rawstring-lf.stderr":"43f6431efef7ead5aa335958187d979d98dcced50cb82ccca19df34397278175","tests/fixtures/invalid/control/rawstring-null.stderr":"eafa2a63e9d12293b290405049457860a8fef70de56c4ba2f203e5f2c79a8634","tests/fixtures/invalid/control/rawstring-us.stderr":"d139a7ec7c4ff5358f6c56ea2f2e431646f5ae9bf3d927694a2aa3891637ecb0","tests/fixtures/invalid/control/string-bs.stderr":"ce6634df580f80e090749d31c178bed74b88718befea7788abe801acf4af10ae","tests/fixtures/invalid/control/string-cr.stderr":"a8dfbe00e976920a442f8f03bebeb31bbdb570a242e380b5a4c60d351614acf9","tests/fixtures/invalid/control/string-del.stderr":"bd862371b7a698647d4d68e5c3bad5c269bd8553f36d82301ffc62a4508334a4","tests/fixtures/invalid/control/string-lf.stderr":"18a1d0e1bcf6f99c80e95e94097f95722a65c2d8a415f9497b808b0bc135c12d","tests/fixtures/invalid/control/string-null.stderr":"fe34d284c478853bad94235aac1f37ac3c591f97e12990847b5da0b6c99bd47d","tests/fixtures/invalid/control/string-us.stderr":"06f7fce918057f567803f370e55e035896bb63a97eb0c0c39a680d6b927fead8","tests/fixtures/invalid/datetime/feb-29.stderr":"898cd0c4cd094247fa0825d02179d3b913cc9db4fbe634fa84c7a7d2cfb7b03e","tests/fixtures/invalid/datetime/feb-30.stderr":"0fb2c5f14857fe5edadbc93a78208c1c9ed900a18e3296613cc620e255c76e11","tests/fixtures/invalid/datetime/hour-over.stderr":"bd2220bdbaa96caf3d2aaff640620e4856bffb722a0e5be61dcb5283ffd08056","tests/fixtures/invalid/datetime/mday-over.stderr":"de9d27d65c68dd09da10c229167ce881dfe0ebda457badfe24b7598ae80c47a6","tests/fixtures/invalid/datetime/mday-under.stderr":"18daf3ce2a6a972476ccabcf92690a488e4f3be804dab8458da2aebad22a2c8c","tests/fixtures/invalid/datetime/minute-over.stderr":"a29009d3f7a6b1d9afad2420f223d6a6e02df8149577547837f5eeec4075bb9a","tests/fixtures/invalid/datetime/month-over.stderr":"37a203b22c3b2510541e413ff347447f9f3319a896ee005b96f65bc0d68150f4","tests/fixtures/invalid/datetime/month-under.stderr":"24c554595ca9a999a1d8e1ef7dc28b443f2f0ad6e17337ee157fb18bdcf678c1","tests/fixtures/invalid/datetime/no-leads-month.stderr":"2e20cb60a1ecee85b172d1402e4d8c425362e4db607706bd39494385dc6dc98e","tests/fixtures/invalid/datetime/no-leads-with-milli.stderr":"a35c496884e921aa086c1404bc812ff74f2bfd347a3ecd96640942be5555afbb","tests/fixtures/invalid/datetime/no-leads.stderr":"2e20cb60a1ecee85b172d1402e4d8c425362e4db607706bd39494385dc6dc98e","tests/fixtures/invalid/datetime/no-secs.stderr":"65871ee020e645e737c363b22cf43c160b295871cd4ac97a37d3ea46f60e3250","tests/fixtures/invalid/datetime/no-t.stderr":"ff50b85f6bc0d49000ec6f1303fda9b44bf934c2ede61743363411bbf6ebecbb","tests/fixtures/invalid/datetime/second-over.stderr":"0ed555a874efa08b711b5227501208758d87a01ad8360cf76c3dc8761807fac4","tests/fixtures/invalid/datetime/time-no-leads.stderr":"b3282cb32386dd84a35468f488be5a92dd3488e951f9dd2ea39057046386b73e","tests/fixtures/invalid/datetime/y10k.stderr":"6fbe45e2032a4b8a90fef144618ef6027edc00dee219d50c8b1493b6e38586a4","tests/fixtures/invalid/encoding/bad-codepoint.stderr":"1a816a8cdd5c2c9b8ae10431d981e22c3b307e30ef3d401ab62ac1012240be44","tests/fixtures/invalid/encoding/bad-utf8-at-end.stderr":"518dc443f0404d486b40bbbd152870276016795b05f3cc8a1de64a0e08fcdda2","tests/fixtures/invalid/encoding/bad-utf8-in-comment.stderr":"e0f252d14c18ea072c098834997db8e5f68b807bb0fa6d3d34e4042a5ea6fbb7","tests/fixtures/invalid/encoding/bad-utf8-in-multiline-literal.stderr":"2328a89cd9043de10ee656f4ea0dd5e6491fd8c0484ac36099c23161dd7a2625","tests/fixtures/invalid/encoding/bad-utf8-in-multiline.stderr":"2328a89cd9043de10ee656f4ea0dd5e6491fd8c0484ac36099c23161dd7a2625","tests/fixtures/invalid/encoding/bad-utf8-in-string-literal.stderr":"eefb00fee073933fbdb95d24a9e7050c281d4719d0cb970c2c06a71a86f108b3","tests/fixtures/invalid/encoding/bad-utf8-in-string.stderr":"eefb00fee073933fbdb95d24a9e7050c281d4719d0cb970c2c06a71a86f108b3","tests/fixtures/invalid/encoding/bom-not-at-start-1.stderr":"bd4e557b8b4586cdb39a8fde46f0bb214954f9f8ef37be46e2cc19823f6d6919","tests/fixtures/invalid/encoding/bom-not-at-start-2.stderr":"27003a498cb355011782dc21f01e15457490b78c472bb9ddb54147413c8f597e","tests/fixtures/invalid/encoding/utf16-bom.stderr":"a8800edcb8f6184b712da53e74bb787c39eb891073575acbae1ad575f15043cc","tests/fixtures/invalid/encoding/utf16-comment.stderr":"edb66c01034865f484ccf7921bfcec1efaa8599762cb9cd30c9c8103275bc4e6","tests/fixtures/invalid/encoding/utf16-key.stderr":"fb6a1d4cc571ff9d1c154f0a996d61d8f260d7e505318d02c0a03b38e2414e5e","tests/fixtures/invalid/float/double-point-1.stderr":"2917901dd186adc39cb5965faf388fa2babe577ef3bfcadd4919232868a727cf","tests/fixtures/invalid/float/double-point-2.stderr":"7eda489da0436d6f0f2268aa4005b422d215b4785af0c1696c8731908a563f17","tests/fixtures/invalid/float/exp-double-e-1.stderr":"e64082e328fcfbeff57e6801448c769b12bc8e879b77421b688b2e147e386713","tests/fixtures/invalid/float/exp-double-e-2.stderr":"5c45326ef7287ea16a9e08275222e281b5d61c9322f8764f6533707f9772e255","tests/fixtures/invalid/float/exp-double-us.stderr":"ebd30aa3f7cd3a0a5e79bbbde1beff209d24f4ab58eb5552c1baf0eb2194e97b","tests/fixtures/invalid/float/exp-leading-us.stderr":"19c8f676dd45a5db09bd5baba5c3e7b661e83099a340331ee6bb10defe679569","tests/fixtures/invalid/float/exp-point-1.stderr":"23e73e4e63db888546866967a1c0319a1db269f23ee9c277b298e9f2db88800e","tests/fixtures/invalid/float/exp-point-2.stderr":"633328e085fb04d6a79cdfb696f45a1836c3a8b6afafc4cd5e16d48465aa4613","tests/fixtures/invalid/float/exp-point-3.stderr":"b8b25bdb9b28cbe695134f00fdde85b5fa79b28408831356dc3a62650159a152","tests/fixtures/invalid/float/exp-trailing-us-1.stderr":"a73b4458debd1d0f750a6c5ade21b4046dfa2fa32b7573b0dec46f9400ed4f57","tests/fixtures/invalid/float/exp-trailing-us-2.stderr":"7a62522d55afc9bcc3ce5f11a9de8a62765803a99db4114ad6a2a5b777a302ab","tests/fixtures/invalid/float/exp-trailing-us.stderr":"aaae81eba820233944bb88920621dc9c1bbd0d1a1476c0376a38d0491a30c83e","tests/fixtures/invalid/float/float.stderr":"cc664d16849deec2ae7ebee6a3f46923bd5959075e282315c4f60461cdb13a0f","tests/fixtures/invalid/float/inf-capital.stderr":"1451a322f3be80529ebc091d231b682127e783a07cfffcce67f5b9bb4455c0c3","tests/fixtures/invalid/float/inf-incomplete-1.stderr":"38cd906dfee7f13b8cbdb27f3406ab0499fae3ae16f3c77bc7fc48d009595d93","tests/fixtures/invalid/float/inf-incomplete-2.stderr":"97a9ae1ff194a95b5be2abaf2cd8179ada832cdd9fad349efa9951e7ab92e435","tests/fixtures/invalid/float/inf-incomplete-3.stderr":"034bc609343ecf1e659d6250f719e5f93512e8140228e44e57b538765e58a1f7","tests/fixtures/invalid/float/inf_underscore.stderr":"621326dde26e5364c7af1b562fb651f4184d9b5fc9bc45edc12f52b588d506bc","tests/fixtures/invalid/float/leading-point-neg.stderr":"d19e28ba2f11069800df4dd1951025aa7f75425f7258e8caf4bbf6abe0e84bc9","tests/fixtures/invalid/float/leading-point-plus.stderr":"10750e9acccb17f0682db30fb175d083d06c822a4863d3d6b8ddb6c75b7b22ec","tests/fixtures/invalid/float/leading-point.stderr":"2545b7a615528595f5d53a7338403c83a8587e70600b1501225446e5f456c805","tests/fixtures/invalid/float/leading-us.stderr":"dc958138922097b2e1e3865c7818604b2249268af4acbe5cafe0ce8c68a90a86","tests/fixtures/invalid/float/leading-zero-neg.stderr":"d1fad35fa8d18f93ebfdf681d3476f02600e5c39cc942ca9bc36181476cbbe53","tests/fixtures/invalid/float/leading-zero-plus.stderr":"ad8ba7a7c12cb4b296cc0d43915106732e6a6a713aea67034587d1fc0c8093df","tests/fixtures/invalid/float/leading-zero.stderr":"cc664d16849deec2ae7ebee6a3f46923bd5959075e282315c4f60461cdb13a0f","tests/fixtures/invalid/float/nan-capital.stderr":"d0e9234b96d4e3591ca0190a785789f9bdcaaff01a111eb57db7bc458a2dd95d","tests/fixtures/invalid/float/nan-incomplete-1.stderr":"f4bee0b1c639bf800fc4dda38276142e715cd85ab6cc5e93ae2112ea63d7de89","tests/fixtures/invalid/float/nan-incomplete-2.stderr":"dc908ec577d29083bfd709fc4bdc2fa641d7fb2ba77a5d7441215680a8839d69","tests/fixtures/invalid/float/nan-incomplete-3.stderr":"abab5a41e0f2f1bad2d2050d0c913dfd8c15e50530d53ef8de327f106f564e02","tests/fixtures/invalid/float/nan_underscore.stderr":"25b67a7d6c743f673be7b409c9990de5de8b52a1d97c32e6f4e62f33147f1872","tests/fixtures/invalid/float/trailing-point-min.stderr":"69ad03ae81990d580a6d63bdd5ab594de00c0a16694c8671704c6243b4578b38","tests/fixtures/invalid/float/trailing-point-plus.stderr":"fba0bbad890020fe943e9f23644e81bf0bb7d114230fe16182e866fddcfc108b","tests/fixtures/invalid/float/trailing-point.stderr":"2f12b368fd94304ab0126ebb5888c519475f9ca28e9ca702c477cf0085ba9216","tests/fixtures/invalid/float/trailing-us-exp-1.stderr":"217939411cc9c99589d1ef0f3919c90ca2a562c0352063aae08ba2ae53c1208b","tests/fixtures/invalid/float/trailing-us-exp-2.stderr":"ecf0002a04040c8afcae7f4bb182c0322b4d00ab88bb53405e40c7938f2a9443","tests/fixtures/invalid/float/trailing-us.stderr":"506cb8051f1045ea1dc7f11865d58cbca0216502d273e1c10366c8be7cc9ab43","tests/fixtures/invalid/float/us-after-point.stderr":"fa9fb59f703b6770be3dc094c04eb2c4add8a7a7ab79d9fe508cfeee785404f1","tests/fixtures/invalid/float/us-before-point.stderr":"14e09a7a382e249e5143d1c81d6e4623408eb2d505e1e3f86c370a3a3bf6cd9e","tests/fixtures/invalid/inline-table/bad-key-syntax.stderr":"cc3565bdd7ce5752ed2e0aa6ca10e8a414d357a1f5630d7c759f8ffb709cc540","tests/fixtures/invalid/inline-table/double-comma.stderr":"2132a1c4d97fab140089818f990284333e22ef91d20a9f65e11d4dd15b1a701a","tests/fixtures/invalid/inline-table/duplicate-key-1.stderr":"72bea73b20005f15ced977aae70a1b0f3bbe3e35598231aca9a2303d770efdc3","tests/fixtures/invalid/inline-table/duplicate-key-2.stderr":"9b69c8521345fcc21886138d9dd0f20528c71712f3de3e565087adc916113a07","tests/fixtures/invalid/inline-table/duplicate-key-3.stderr":"675b84acec95eb5778a8d280881fd83cc3f741d0c0e2a21cd74fe1ab2b6bd710","tests/fixtures/invalid/inline-table/duplicate-key-4.stderr":"5ed3af9e2011f07a04572b2bcc1dd11dd57512dd35ff616e37051a34bd1f4a94","tests/fixtures/invalid/inline-table/empty-1.stderr":"604fef40337f04e5f37a52239d6509850aba95677a7a94ca8476a6c21b648a43","tests/fixtures/invalid/inline-table/empty-2.stderr":"870f189adbefaa6f05307d5b00748f1ae1c748d96105fabeb409c3c7d59126ca","tests/fixtures/invalid/inline-table/empty-3.stderr":"766b0f61a467c8db42514016a9a3812f678b054a124361bf7b7617cf2ae073db","tests/fixtures/invalid/inline-table/linebreak-1.stderr":"45b0611d37c1ece88bf6c88b3528adc3d73e0cd3e3b24dcf07ab151023a6f488","tests/fixtures/invalid/inline-table/linebreak-2.stderr":"f7672965326b44adaf0cb4796a087fbe779a8b17fbb458090a33375d0c54e5b4","tests/fixtures/invalid/inline-table/linebreak-3.stderr":"e8c70f0c91b15e701567e93d8df1cd3bec593696af05ec1d95e8f9e00ab20fa6","tests/fixtures/invalid/inline-table/linebreak-4.stderr":"3d31147f9e1ff5f94384e4df1675dfff2da6f076cb0a729771615f05b990be91","tests/fixtures/invalid/inline-table/no-close-1.stderr":"0bcaf312d65af22a37bdd8334821d95d4212dd43905fc945ec2c8ad3d465ae7a","tests/fixtures/invalid/inline-table/no-close-2.stderr":"4c6bfd3dd94611a3bc02fc609a738bc252dc38501e7ef6ff19543d757cc564e4","tests/fixtures/invalid/inline-table/no-comma-1.stderr":"9f1c85e0df72c7e7e011c26a0d5dd9dea8b7a5e18c3ba9a53ff4a20a9429dce9","tests/fixtures/invalid/inline-table/no-comma-2.stderr":"24a06e43a94ab041395eedb94c5bdb799ed7fbf6d930791756b0e3bd4a812943","tests/fixtures/invalid/inline-table/overwrite-01.stderr":"812d1bc74d07750048a521e513a565676e606d4fa1a32d2ebda7af8fa064d3ab","tests/fixtures/invalid/inline-table/overwrite-02.stderr":"bf95d34749254300f4179ed1314cc9cabd7c7b63fc2453fc7adbc7869b63be4a","tests/fixtures/invalid/inline-table/overwrite-03.stderr":"3e2c2ce66f1e4982aab428075105a39b2e9384f2dcf6da6d715017533416e149","tests/fixtures/invalid/inline-table/overwrite-04.stderr":"8aeb424d4ccee35ae17efba8acd65aba834192672cad73e8e1e6c3fe9f878826","tests/fixtures/invalid/inline-table/overwrite-05.stderr":"ff8facd04689f13ec53ee77bc9790d25e2d2eec50f4675788d70a2bf33a85e2e","tests/fixtures/invalid/inline-table/overwrite-06.stderr":"01be3b4e31d2c0aed381fc6599d5fd78d0757e9b76e66b087e4614e98f782db3","tests/fixtures/invalid/inline-table/overwrite-07.stderr":"52bac538099395ae15c5c8786f835dbab4748be0464951a25ae0f44aeea90125","tests/fixtures/invalid/inline-table/overwrite-08.stderr":"bbbc4b8959113590e9bc27526b56bae2e1223c88493836ea0a0df4209527a038","tests/fixtures/invalid/inline-table/overwrite-09.stderr":"1b084659999a2cf01ba8feab1d9d9232a307fae584e4277210cee69f53ef6cab","tests/fixtures/invalid/inline-table/overwrite-10.stderr":"229695997044ce82d3c3979904401a44838ae70103729b6ebba468cfb1beb154","tests/fixtures/invalid/inline-table/trailing-comma.stderr":"4791911dafd6602e2891d6ffc4d32ef8e9d0c1f8f6d37e84d440feb896d9cb88","tests/fixtures/invalid/integer/capital-bin.stderr":"fcfc8b0bddd36a641d3f5cc2ceee88554619fabf6874e11cdfdd147be8781881","tests/fixtures/invalid/integer/capital-hex.stderr":"c8e2d64f9659435a0387bb7e6447896eda253fef77e0214a4073fcffbac693a7","tests/fixtures/invalid/integer/capital-oct.stderr":"ec465fa25da212b0c9b6265ac8e9cd05c1fa07d614dafb3bc9b2ca74d6c2a7a7","tests/fixtures/invalid/integer/double-sign-nex.stderr":"8d57da526240c1cf73423b688442922ae291ff26e3c09f9c3b5b150e62e5cbaa","tests/fixtures/invalid/integer/double-sign-plus.stderr":"55896d9bd19637e124482966a12109a1a8351620ddc6f8d28553d70359f523f1","tests/fixtures/invalid/integer/double-us.stderr":"f14ed7bd3ad26b2203763fa953dd6e99212e50fb8e43a4eaeb115c1a7df4fc25","tests/fixtures/invalid/integer/incomplete-bin.stderr":"64168fc7ede87a10c12f82325fce644a7d9b9c3af55a313184175df7926845e3","tests/fixtures/invalid/integer/incomplete-hex.stderr":"ed2423540e288f4673bc68822a799bea04f571db5de56154e10360b03ab79553","tests/fixtures/invalid/integer/incomplete-oct.stderr":"9ed35e3078703a38996f20dc3e86477149564c8abd237c644bdf3a5ef26e3417","tests/fixtures/invalid/integer/integer.stderr":"ed5ef991b733b3d51700364da18bf58f1b7eb68053467afcbff22775b3b82788","tests/fixtures/invalid/integer/invalid-bin.stderr":"7248d47f2c7db309254a3a41af28bc1a6e96bfa95e0c8c94d607f65a1a30cee6","tests/fixtures/invalid/integer/invalid-hex-1.stderr":"ca2af571a835ca976727c823939f7cbd6d36f7d048464ba1f8f0bc6b6558cb57","tests/fixtures/invalid/integer/invalid-hex-2.stderr":"e2970d46eadb852d34a8407929972acf7ef131c3c44978af0e6dfe205a6e993a","tests/fixtures/invalid/integer/invalid-hex.stderr":"3976255c6fe35a1e29f0fed7324eee8420ababd0f6f1f7702908c3df47c88846","tests/fixtures/invalid/integer/invalid-oct.stderr":"9f6776e33887cb446a5590d8fe4e51c36747c634cd5e4efaa84f807d3ce244e0","tests/fixtures/invalid/integer/leading-us-bin.stderr":"0cb1db77dee877423738395a720e6ebbd5a545a3b22ce710ab669b5b1f7903f5","tests/fixtures/invalid/integer/leading-us-hex.stderr":"fec78f4fe4ad481fe9ea93465c8ef5bca8b98d0bba31b48b2990870b7aa5f44b","tests/fixtures/invalid/integer/leading-us-oct.stderr":"aad69bdd80f94e907bda03558a1302e54d58d8911fe2b564e93cb0ec48403b09","tests/fixtures/invalid/integer/leading-us.stderr":"3a265cc11f1b0d43d4b532a47776486ec7c7ea7afe70813ab00c5a37cf87a9df","tests/fixtures/invalid/integer/leading-zero-1.stderr":"ed5ef991b733b3d51700364da18bf58f1b7eb68053467afcbff22775b3b82788","tests/fixtures/invalid/integer/leading-zero-2.stderr":"5c70e7874256512c0ef6bb364497d4e10154e994056f2feb7c5c729016522091","tests/fixtures/invalid/integer/leading-zero-3.stderr":"fb2730feda6f669a3b8c4332f01369e52ce1b942807f1bf3d9762b1fea04aeac","tests/fixtures/invalid/integer/leading-zero-sign-1.stderr":"c9d2d992eea36c4fe228eb74741bd8d0ede1e354cad132b79462e7b502b37f95","tests/fixtures/invalid/integer/leading-zero-sign-2.stderr":"4248329b339020cc2ea586f2775a0b4f4cbe2ae3f0f75b935263363b8be5eaf5","tests/fixtures/invalid/integer/leading-zero-sign-3.stderr":"3b414808727d3a446efdfca0033525e17536f9b54104d8a9cb9278b054d213df","tests/fixtures/invalid/integer/negative-bin.stderr":"74aae673b861bd46544e4835fe7075e20158dd69e27f75c790d48a6006476c73","tests/fixtures/invalid/integer/negative-hex.stderr":"799bd8120f4cf2c36e7f65a5f9aa43a3ec87dd95dd3bf68501059da9f21f8c9e","tests/fixtures/invalid/integer/negative-oct.stderr":"017a6a24faf9dc1cde89f62b46435f8fca493e7b61f6fbd2b6d57f0f9e80da65","tests/fixtures/invalid/integer/positive-bin.stderr":"54d8a33743737f374480cd1235bf3f7e0847d252ef7e2bb1d447529cbc0f6692","tests/fixtures/invalid/integer/positive-hex.stderr":"3b21b23cc3dd6b213a19256f4ffb4bb36172de2f739f90bbea78636f7a50524b","tests/fixtures/invalid/integer/positive-oct.stderr":"f19faef5bbb7ed8351777bdededb1c523337f2aeeec82d967c19c36069790e11","tests/fixtures/invalid/integer/text-after-integer.stderr":"07a13ad4841a452eff00947234a4ebac4d209ea0294162888db35668648bb55d","tests/fixtures/invalid/integer/trailing-us-bin.stderr":"62da06cf06527b9e9cbeba6c5299ce6001d40592e9d007c8350090977f4d1b58","tests/fixtures/invalid/integer/trailing-us-hex.stderr":"1b290eada58a7202b1a9251afd8e0e72a4caa8ad5c85036d1050e7de8141e94d","tests/fixtures/invalid/integer/trailing-us-oct.stderr":"34e6f86ffb0099e6e1ba67deb51e36af62dfce4e7299b94503a219339bf16447","tests/fixtures/invalid/integer/trailing-us.stderr":"3ab49ee921eb772f5aa4eaf0fb3619b1dcd9a9db3f4ebbd9bc505581a985e753","tests/fixtures/invalid/integer/us-after-bin.stderr":"a94a87ebab3536899ce7c0c785f020b3a236c60d24c0bd7494628ca310c40768","tests/fixtures/invalid/integer/us-after-hex.stderr":"9009b187f615f06e3392eabd8ffa58311ed1c2b1cd76f8c5bd99671242f2e026","tests/fixtures/invalid/integer/us-after-oct.stderr":"05af70a21980416fbd602337f9af22a1c600a294635d10ef1ca1b2138338e712","tests/fixtures/invalid/key/after-array.stderr":"487d957b20226ac36e27d6efb1e3d24147284c9a5e10a0188427a1c940d31ef0","tests/fixtures/invalid/key/after-table.stderr":"f70e84770817f096fcc1b6195c6b0a79d25210c6930ce412a89646040ee3d713","tests/fixtures/invalid/key/after-value.stderr":"00d4d2d3ccd61f64a92df0ca575aeafcd96e91d053d835ca855973339ba458cf","tests/fixtures/invalid/key/bare-invalid-character.stderr":"b1f64d54a43017e6cc09755fa7ba477901721d23f9271ec658fc9362f46631b3","tests/fixtures/invalid/key/dotted-redefine-table-1.stderr":"59771f7163f28a3c81209f058b7b01d616fe5022e8ee7ffb395feb44129cafea","tests/fixtures/invalid/key/dotted-redefine-table-2.stderr":"564febb355d1556df42f428a046ac6fdc5dad49b2b736be5824b0c13fcd1fae9","tests/fixtures/invalid/key/duplicate-keys-1.stderr":"73407dfd58ba687026376cc491a42bdca3b6c94a1a85ed2a6884a7fd116acee1","tests/fixtures/invalid/key/duplicate-keys-2.stderr":"7c9dfef2ef19b1487b7592a267ab5ba21c8b833dfa9ec1c3151e369c2fdba26e","tests/fixtures/invalid/key/duplicate-keys-3.stderr":"5d84bb05a826ef44134351dbace41f3d771a2d7ff3777dbff4dda8c1fe18ad62","tests/fixtures/invalid/key/duplicate-keys-4.stderr":"522ae99c93599d13c0f1acc1fdb4f3d1787e83dd379f34f07ed5cf1f8e92cbf0","tests/fixtures/invalid/key/empty.stderr":"af6d3636ca73e5496c40d9c918c59b61fd86812db262649e5268094193873130","tests/fixtures/invalid/key/end-in-escape.stderr":"86b9c28ffc74797d35a89fee58853fa85bab9638b919138ccd5d8dd524dd204c","tests/fixtures/invalid/key/escape.stderr":"155aa9389f0eb28cac3b42974af7ea9e2eef8d96f084f08f9f75e960fc8ce8c7","tests/fixtures/invalid/key/hash.stderr":"85dd91b96aa4f81cc7922b02b411f25d9053bddd1e5b893c2a2ee9d0115a7cac","tests/fixtures/invalid/key/newline-1.stderr":"714aed0a140062f977ec85b9afa50f68448c67e806168e60b4f4554ab270b2b9","tests/fixtures/invalid/key/newline-2.stderr":"8bdeb90922617a8e943e0196b929e62a7e30baebabd49870f5c31adb77ff93a6","tests/fixtures/invalid/key/newline-3.stderr":"3862b1f006b761fcc0c97166b91a20d57ba74d4da39f2590b7b5bb2493a8090b","tests/fixtures/invalid/key/newline-4.stderr":"d625f2caaf01d53d72d6f1c3df0952fe3ca8c5f3b081503cb02b9994c088b733","tests/fixtures/invalid/key/newline-5.stderr":"6d811add45be91fa4debb461126613db9c605bf758a21490db0024ed3887ea4e","tests/fixtures/invalid/key/no-eol.stderr":"440ec927e94f0e520a0f256c865041f0478e1c82f3bb79323b7ddc36fc942edf","tests/fixtures/invalid/key/open-bracket.stderr":"3b36814373f51a8ea00a448d65bc514e8d99f5163b7dd8101df62bcd0a06e801","tests/fixtures/invalid/key/partial-quoted.stderr":"dc9059a014ed53071ed170b1e280923556dc09e0be2ae96cc8474e9da59fa378","tests/fixtures/invalid/key/quoted-unclosed-1.stderr":"6cdec8a7c5352a2f246273afaa923dfa81d4d2e68cca5b4f9a19193559b164c2","tests/fixtures/invalid/key/quoted-unclosed-2.stderr":"b4817e6f85a90fbb6adf049ba57c268f9888f1b42b3d62200c359606176170b1","tests/fixtures/invalid/key/single-open-bracket.stderr":"917c0203d1e45309fcff82ce33fdd2d989f630fb99290a40cb9e08a6f7ca0ef8","tests/fixtures/invalid/key/space.stderr":"3a5fa712d667890678873e3d4e4cabb084c67091c5ec6155355d5bd4229585dc","tests/fixtures/invalid/key/special-character.stderr":"a84c2f293c1e421a1c87050cb0211de80dbfe7a79939db0338fa35bf0c181ef2","tests/fixtures/invalid/key/start-bracket.stderr":"223d8a22bf34459cd9bcb993ae2a51ab3cc436674e3367e92f7d74e9f8710a45","tests/fixtures/invalid/key/start-dot.stderr":"f9366a1492ae24fd0721724b4039d2675e91219de564aff2826adefd83fac571","tests/fixtures/invalid/key/two-equals-1.stderr":"a0aae899cfa75df41104a4d3090a309fc7ebcd95bb5a944cf742f3d3fc9d4782","tests/fixtures/invalid/key/two-equals-2.stderr":"861826b9456ab3a74f63f5c555e13d959a3991dfa6ce126ae5ed14d43f7dcee1","tests/fixtures/invalid/key/two-equals-3.stderr":"71614864344e321ac5de238b7ef9d097c6d7f3ac3eee4118d96827b4b8bd6658","tests/fixtures/invalid/key/without-value-1.stderr":"16c2823a39a82c3c27e0959a691b7a95e3392d62195884697893d373b967b9c0","tests/fixtures/invalid/key/without-value-2.stderr":"d340f94f5d96f5730ab269db7ef27aca171d64e35af1181c474d75a7d11d6590","tests/fixtures/invalid/key/without-value-3.stderr":"3cf3072fe9206bfe6c682103d0414627a5a63db4c4a319cf37efeb5fe6b92007","tests/fixtures/invalid/key/without-value-4.stderr":"07132bec96e9a9a672bafdc3c448b7c596257245f8c3e2cae04641f9798644ec","tests/fixtures/invalid/key/without-value-5.stderr":"37dc02af5ab8a30161223d44ed05c99ba742a658598a1b94ff78ed09afd9b11b","tests/fixtures/invalid/key/without-value-6.stderr":"00b623259f9c58fdfbe6753978fe2a71653bed0dda5c4ce54cb2151e8f7a6a29","tests/fixtures/invalid/key/without-value-7.stderr":"5013036b7f53013f887f670c3a3ceca6358d89e6b83b27bea9aa4447fba083a4","tests/fixtures/invalid/local-date/feb-29.stderr":"49fc14bfe63430553b173e82b84fb964a8bd93eeaf8abb28ed94f92a061e0026","tests/fixtures/invalid/local-date/feb-30.stderr":"1ae91b3300919e07b64c5c5b6572be05dccba63854df52ed71a900d190a90900","tests/fixtures/invalid/local-date/mday-over.stderr":"851f565b0537d5f2d88829c62d632d7dc5841d9843a1244568ea7382d5b05857","tests/fixtures/invalid/local-date/mday-under.stderr":"34c1e1d9e5839a2a8ccfaecbf52b3f49e1a776cb17de9187c3e79cb618ac684f","tests/fixtures/invalid/local-date/month-over.stderr":"d6ec78690f874b4c99cde7e609775abdf4f00ba758216afee355f6baa2c7c010","tests/fixtures/invalid/local-date/month-under.stderr":"c6922666b726822f6ffeca857041eec16cf387f54d3b6d9c325935c1c116aa5c","tests/fixtures/invalid/local-date/no-leads-with-milli.stderr":"03ff73112eae42e69f54f80445582775309400ce7f179bd9d28043299d5da826","tests/fixtures/invalid/local-date/no-leads.stderr":"12d98e610ca2c2e04fff563f9ba2b12f5e53937df1ced544c8082fa4f64522e0","tests/fixtures/invalid/local-date/trailing-t.stderr":"87a15cd62bbe7cba2b942fe424c045ce30a12fe439a1b49587a5cc037ffa6b09","tests/fixtures/invalid/local-date/y10k.stderr":"7c5cef8b079e2e6adbb7c723a1e75f04ac1185975113e79ff6a6352e07908867","tests/fixtures/invalid/local-datetime/feb-29.stderr":"692c0e78fd9ee1e979dc32bed3ed9d3d10a4608090b4d242e379d40a9732c2ab","tests/fixtures/invalid/local-datetime/feb-30.stderr":"330e20a8e3d95195227c3e66861f013b70fc02010107c9d0a11085bd533b49cc","tests/fixtures/invalid/local-datetime/hour-over.stderr":"a095bf7be4a76d0c9362d5e4398d5783aa1545ec03f910a2c6a1709a3f60225c","tests/fixtures/invalid/local-datetime/mday-over.stderr":"cd707915cf15690dcc65868408f115bc90da19beae1fbd0a7fce8d02ce76300d","tests/fixtures/invalid/local-datetime/mday-under.stderr":"fd8ac4e2804d96d6b7f63eb1616096bdcc3ecc2b74d75c3fc4bd98f2f3af205b","tests/fixtures/invalid/local-datetime/minute-over.stderr":"95fef6b0821ffe465ea5ce27a4f1521a4309cc64ee03e2781e63ead3003cfc62","tests/fixtures/invalid/local-datetime/month-over.stderr":"f739e1cb0538ab5e3cd0923165d54bebe10a6cee1cd773129230d508af946901","tests/fixtures/invalid/local-datetime/month-under.stderr":"cc1749c4aaa0cec5e88a2cae52bf84da2e862b6d2dae2c46615eafa0b7f370bc","tests/fixtures/invalid/local-datetime/no-leads-with-milli.stderr":"d1d95c88dcbde166b3a89c562e87bb9dc7c7d4efb5aaf999f0c253b1109ffd2a","tests/fixtures/invalid/local-datetime/no-leads.stderr":"8be255d1f994769e4cb9fdc6b4b6d65ad2664348026e409026421be423150076","tests/fixtures/invalid/local-datetime/no-secs.stderr":"019be93baccb4283a186cfb846b8cd4c848a373319daf4955ab3bec451a7b730","tests/fixtures/invalid/local-datetime/no-t.stderr":"eca57151e4e310f22620f243582486fb3e5ade13e4d4a5fb4582252fd915ca04","tests/fixtures/invalid/local-datetime/second-over.stderr":"dad38092a29679601af7ae3b05960068fa0eec5a649858ab88aedaada6ffff00","tests/fixtures/invalid/local-datetime/time-no-leads.stderr":"b3282cb32386dd84a35468f488be5a92dd3488e951f9dd2ea39057046386b73e","tests/fixtures/invalid/local-datetime/y10k.stderr":"ebb06f456d5e909af5f41fffa29c3f42eea70d91a97769716da5c75de9f75ac0","tests/fixtures/invalid/local-time/hour-over.stderr":"e5aefc4baa094437e16b5a78c89df8469ac59d899433e1c0fcbf433344b3a4f9","tests/fixtures/invalid/local-time/minute-over.stderr":"b66ec93e63f27d0a4e63c0eb1fc2d3f8dbf2fc916e213192852b1b7ac0e21aa7","tests/fixtures/invalid/local-time/no-secs.stderr":"d9939a2e05d15375d4936c6ad7c4dbd13085e638573094f3a0befd9027c0a3ab","tests/fixtures/invalid/local-time/second-over.stderr":"f14b188fb85d8818ab953f2fa0d0b8de906dddc2f0e0ccf5ef68b3e81d619f20","tests/fixtures/invalid/local-time/time-no-leads-2.stderr":"f725d49ddb5af69b7285f071d68e3d8441d5e331adcfd8c025c1f3cbb68028a5","tests/fixtures/invalid/local-time/time-no-leads.stderr":"cf06f3847f3d14655a94d8cfd5a6984dc74115b1d3cdbee0662ef215738bbf65","tests/fixtures/invalid/spec/inline-table-2-0.stderr":"5ad1a938b1d1f0f3fdbd1871efdebfd30e136407ecdd9e2eff22150d00624b3f","tests/fixtures/invalid/spec/inline-table-3-0.stderr":"fcbc05e911b7db81bd918768fe98a51a7026fd476d616718cc417d2f08bcc1a1","tests/fixtures/invalid/spec/key-value-pair-1.stderr":"d5391142dfd56040840cf91b1e28e3c048229e3d9998534d41001cd6657f9bd6","tests/fixtures/invalid/spec/keys-2.stderr":"3c4ee6066fc75d2c1f1b325f618a01113694c318e330ff4f237e89127f332c87","tests/fixtures/invalid/spec/string-4-0.stderr":"910ee4b240159b828a7509c8dfb46507071a8d8636f3935a3914d6d91f315295","tests/fixtures/invalid/spec/string-7-0.stderr":"5128f0a930b3034e494a6bee4f384a587e9fd858b25f8cc529a488c94ee9670d","tests/fixtures/invalid/spec/table-9-0.stderr":"49dac70d337266f5c6b333fee468f279fed1bff62bfb4ec7436c8b6683ce0dd2","tests/fixtures/invalid/spec/table-9-1.stderr":"d9e071c70356c01b6537f876989ad2067e7773dd5eb24a298439d192dbad12d0","tests/fixtures/invalid/string/bad-byte-escape.stderr":"14f6ae446b3b8cb434267eba11c6ec5a1badef4f867169b173698cf9f1a29d95","tests/fixtures/invalid/string/bad-concat.stderr":"499219633467b9174471db40543ca188e2b906c470e511d2f701f5f5475d96be","tests/fixtures/invalid/string/bad-escape-1.stderr":"34a15ce7012217c62d31d5392038517c216f0cbfd5d75fb5f3c2bb07afd3f25c","tests/fixtures/invalid/string/bad-escape-2.stderr":"955aab40b16043c847d85d04e6adcd093c930dd8416d29c2ab5953c077eac6f4","tests/fixtures/invalid/string/bad-escape-3.stderr":"ef8302d7a6f9b8beb54478756a6069dfafc203f640a4afa2a58fbf13fdb35b8b","tests/fixtures/invalid/string/bad-hex-esc-1.stderr":"aea935cf1e17743356e6fb1059afed2d0ee5262906594782e5537a025398038e","tests/fixtures/invalid/string/bad-hex-esc-2.stderr":"deac5217cf80acc759e1b40c43f5f56431b276dc2c896aae5490d57583105e06","tests/fixtures/invalid/string/bad-hex-esc-3.stderr":"94ecf886427e8fe5daf1d8f932bf1887f2533b10bc1f57cb6de03ea28fef466f","tests/fixtures/invalid/string/bad-hex-esc-4.stderr":"382b011dd4070554ee875fde06703d8332ef6ad36f3619f3536b0a4997ee2745","tests/fixtures/invalid/string/bad-hex-esc-5.stderr":"a8a039fae822eda68591da28ff2a117b5d85e99d066e9126ebbb6426a1cad52d","tests/fixtures/invalid/string/bad-multiline.stderr":"141e5770190dd184bb1f64f6bb14fc017210bbd918ab5c8b7a3d80b86b21772b","tests/fixtures/invalid/string/bad-slash-escape.stderr":"d62f894ee166bddf84432507fb4ba56473c0a230fd88a3ccc2b199a72a34e613","tests/fixtures/invalid/string/bad-uni-esc-1.stderr":"b7d8a7f41600a6fc5cef5fd938fab31e1a516b5075bb5f6b22ee77e49bbeb195","tests/fixtures/invalid/string/bad-uni-esc-2.stderr":"5c23cec7a912ccba77180889e44dd84287fbbfdb170367146e9d633637124052","tests/fixtures/invalid/string/bad-uni-esc-3.stderr":"744574793d570b012ee2aa537405af14612183b769e425a04bd0c0ec6e14da7c","tests/fixtures/invalid/string/bad-uni-esc-4.stderr":"16543872b51db7ff6a87cdf1ae71917857e5118b90ceb3e0835525c9bd67d02d","tests/fixtures/invalid/string/bad-uni-esc-5.stderr":"f0ef02d2988680da67942d8599e7753f2e6c89a984643000a67ebf4c34722374","tests/fixtures/invalid/string/bad-uni-esc-6.stderr":"eff7b6dd907132aa9598dca52bf12d48be066a6a8d426ce95d5f4b344bfe8d98","tests/fixtures/invalid/string/bad-uni-esc-7.stderr":"24cd2f58919584c4dd12f0262933c8c0c6142a2b62c747d465ca1b9b4986093c","tests/fixtures/invalid/string/basic-byte-escapes.stderr":"b42fd0273c7438bf13ddea9552204bb9209cdcc8e4151311d2446185d2cd546a","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-1.stderr":"725cd4955987c3d6e736832281316d6c1a2446303e9a1dc78900cef4bb84ee64","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-2.stderr":"c6698fbdb95188d53bfdaa4a4f590d86a73aafcc321a5d9511ab43ce51be1c78","tests/fixtures/invalid/string/basic-multiline-quotes.stderr":"28177a49532f22aaffc9dc204592a2c5eca2fc20f8e208b7c7f589201e8b7de5","tests/fixtures/invalid/string/basic-multiline-unknown-escape.stderr":"a83406b30eb3ab2cebb0230d8d65d0b7583885138f2c070976ae61de2c8b17f3","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-1.stderr":"19af67599c6c2eef340c9fdb0ab2cc788928def50280af939247a1274447781f","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-2.stderr":"0e2e1a69358502ec17a07e4fc151b70e8a3b5123798cb38f98fe2d146515a84e","tests/fixtures/invalid/string/basic-unknown-escape.stderr":"1de467948fb18f61336350063701d9c5a6615054fe740a9be650f71f5ca4236b","tests/fixtures/invalid/string/literal-multiline-quotes-1.stderr":"249123229606aa8eedff1b5bdead5022daf470e47dbca639e32019d1d61dbcf9","tests/fixtures/invalid/string/literal-multiline-quotes-2.stderr":"d9784af1ff056a90bf531307749d53a5d24ffffbc0f4aada7fcee417a50d1615","tests/fixtures/invalid/string/missing-quotes.stderr":"462f24701d2c51d36b18d06b69be2f6eb36449b5f3ffbaa737fcbd2b2151ae4a","tests/fixtures/invalid/string/multiline-bad-escape-1.stderr":"18469c4d37d011b3f30ae17e3111b5e8a9526d593475e5d8d7a9b19461a40e8d","tests/fixtures/invalid/string/multiline-bad-escape-2.stderr":"d43896d3005c8470dc8149e2b74eb8825c6d9fedfe9f48125ad88a95c1dc3035","tests/fixtures/invalid/string/multiline-bad-escape-3.stderr":"92f732c6bcb922e25d2a001a389f93b596dd0e91109cbdcb651efa146309dc2a","tests/fixtures/invalid/string/multiline-bad-escape-4.stderr":"5e549045d08a76406f29c10433766f1c32aa69a169f3dc138103b4615c9979b1","tests/fixtures/invalid/string/multiline-escape-space-1.stderr":"94b451b6c03055186777a248cb216f95a1b2e29df25549f345d96bd0a4e63f1e","tests/fixtures/invalid/string/multiline-escape-space-2.stderr":"850d75a72e44e1ceeced7d65b810afa5b2935f3ab3efea0f3e147a06d82a6637","tests/fixtures/invalid/string/multiline-lit-no-close-1.stderr":"8e81ec582e75388024196cb5a64aaccc128c874be341fba01973c722e64a0d1b","tests/fixtures/invalid/string/multiline-lit-no-close-2.stderr":"9572aa98be504bab0172f612c40010d005577a6cd30f7fb3d25ea29c73e0489a","tests/fixtures/invalid/string/multiline-lit-no-close-3.stderr":"cc89579aa2201fc3bbe98693f822516557d950a9844e68ace4355991dd02478b","tests/fixtures/invalid/string/multiline-lit-no-close-4.stderr":"2310b339cc17b8aefce9ef0e2805c77d5cce3d70abe93373ebb8f986169afe00","tests/fixtures/invalid/string/multiline-no-close-1.stderr":"d5b9602d23b0cb023fbe3ae80d862fd60332475ba8863a1e977f17cb326a4548","tests/fixtures/invalid/string/multiline-no-close-2.stderr":"e500e99a44305b1e148b211e963478cf1554f8c9536d3108390cf41d5b2ce069","tests/fixtures/invalid/string/multiline-no-close-3.stderr":"efea30ada8d63f3071be499d63a82729b8f2c3d5f6155a1dca456e7d790f84be","tests/fixtures/invalid/string/multiline-no-close-4.stderr":"30ce703d6a38d97861b37d8539648734145e6ce45c39b2dc8b970b7b34557031","tests/fixtures/invalid/string/multiline-no-close-5.stderr":"a8b6610cb194104520cdc9fdd140192b6b1c738a3fe922a9f40c21b91f82487e","tests/fixtures/invalid/string/multiline-quotes-1.stderr":"046956658c0a73e665e7a6a2044ff83c8efb8cdd8c2ab153c163eb1e61068c56","tests/fixtures/invalid/string/no-close-1.stderr":"3ad8aff0932d98592b808fc6f44fa68a854097f8025e92c11af1acb6de3d3cc7","tests/fixtures/invalid/string/no-close-2.stderr":"3438330fa63c592f316342c9786696a2426df2838d60ee52889a9dc2527ce77c","tests/fixtures/invalid/string/no-close-3.stderr":"06e62924f3e7a0d290ab2a377e6a6b96c69bafee7170feb37331d6220e956e38","tests/fixtures/invalid/string/no-close-4.stderr":"e5cacd943fec6e10430242c95b42cdd55068cc053f5b40eff38e077a70d0109a","tests/fixtures/invalid/string/string.stderr":"aea935cf1e17743356e6fb1059afed2d0ee5262906594782e5537a025398038e","tests/fixtures/invalid/string/text-after-string.stderr":"1c1e4677be8d3dba0e7933b3ed1cbb6e0bcf6f600cf9a989a7b09c9424a4d0a7","tests/fixtures/invalid/string/wrong-close.stderr":"441f4f1b73c11c8dbf2f73cf9a7766f17a9517b3b9142e86736ed43eaec07f18","tests/fixtures/invalid/table/append-to-array-with-dotted-keys.stderr":"e16e10a17e38898bfff5b16887d9143fa5036669e83b75e84aa4ba4078b1a9a8","tests/fixtures/invalid/table/append-with-dotted-keys-1.stderr":"a67f1f152005295e0a1bb3dcaaa755edd05f19ac5316b8ad2eb4d45797e0f770","tests/fixtures/invalid/table/append-with-dotted-keys-2.stderr":"72d9ea8a90b4d9e5319c2bf951bdde6a87a205612e82ed5a09cea2b706bfde7f","tests/fixtures/invalid/table/array-empty.stderr":"e8a41c60adf7756361920816b6c4f44125a813c869b71fae2c98473e4da1b231","tests/fixtures/invalid/table/array-implicit.stderr":"7797ce41aab0567fc9d40e277cc32c12e1f16ffc0e73857fdb3bbf754246305f","tests/fixtures/invalid/table/array-no-close-1.stderr":"5f1e8703d59398f6595d21ed0abcc7dc3ce77943ad0f71eede9ad63ea2bcc7c1","tests/fixtures/invalid/table/array-no-close-2.stderr":"5adeffef5a1e1d63b6461f2a734a5b557bd3709e4fde903262be0452890623a6","tests/fixtures/invalid/table/duplicate-key-dotted-array.stderr":"9158eaf24fd4237fb87a6fb9be00e18ea935cb509a657bfe370cfa769e97cef6","tests/fixtures/invalid/table/duplicate-key-dotted-table.stderr":"ca58908463cbe2ec6b3de314237c178fee64245cc738c72a7b9e08bb3d02b2b0","tests/fixtures/invalid/table/duplicate-key-dotted-table2.stderr":"cb59f2ed324642de947f3cd9373ca111ec35104a5f33578f64c48084ce1a84f5","tests/fixtures/invalid/table/duplicate-key-table.stderr":"f4816522738b3e2ace87d1100a3d73e6a122d8dc67d05e0b35a1438e16a8952c","tests/fixtures/invalid/table/duplicate-table-array.stderr":"11d293e4b4f205fc98cd892f25a25f533cb922c963ecf095a932d2e9d550be4f","tests/fixtures/invalid/table/duplicate-table-array2.stderr":"fa9cd3b1212eed14ec56b66a16471ac2f7c0398d743982abb7c5cb4b5c7a5fe4","tests/fixtures/invalid/table/duplicate.stderr":"3e6d1b1a2f44d449e8cb0098e7c40ad1e755363b446f3821c399abfb26eb9939","tests/fixtures/invalid/table/empty-implicit-table.stderr":"cd3606ce97c5537d18146cd978403636a65fa703c83616da75b8cafa86e8fa24","tests/fixtures/invalid/table/empty.stderr":"4399e419abbcfbec93f5915e7fbdd11b6e462a4c066a29eacda159abfc588734","tests/fixtures/invalid/table/equals-sign.stderr":"472de6b908a03c99637b635a3a898ed956684ae422e1b4b135ec94986ea45f2d","tests/fixtures/invalid/table/llbrace.stderr":"db6bbee7ed15994398901c46ed4b40904897e71f5d972deb7904ccac49cd834e","tests/fixtures/invalid/table/nested-brackets-close.stderr":"e1dff60ea8f77dd1b8fae7d1d63c788c838c80560172d92377cc168f5cb5923a","tests/fixtures/invalid/table/nested-brackets-open.stderr":"bd58eb0630dc0c51ebc288258d360d707c8f43a5877ddc21e9420f8eb76a2f4c","tests/fixtures/invalid/table/no-close-1.stderr":"ae6326db737d2e259c051fbe3f5aa6ef7d7ec1bd47930ea78e09667a20100a72","tests/fixtures/invalid/table/no-close-2.stderr":"3b599c6d07071a40a0c3acf163f0b04655bb8953fe32bdcab5e68a527c3ab22e","tests/fixtures/invalid/table/no-close-3.stderr":"6bf7e2d30c735a55f595140af7c7f6be89b6faf868f4473ea39570fdb87d5823","tests/fixtures/invalid/table/no-close-4.stderr":"917c0203d1e45309fcff82ce33fdd2d989f630fb99290a40cb9e08a6f7ca0ef8","tests/fixtures/invalid/table/no-close-5.stderr":"c1a691a6fa9638b75010f37166c29a6e5a2da2e35bd9a321118d7ea384af2d77","tests/fixtures/invalid/table/overwrite-array-in-parent.stderr":"300782a740fff829dfe485a4a43426a53f82bb6afca63ef82fc07081c43d8707","tests/fixtures/invalid/table/overwrite-bool-with-array.stderr":"dcd33263a49a91ed583c3f53c6e86d6c5b8d493d841aea074a5a81f57cb5c152","tests/fixtures/invalid/table/overwrite-with-deep-table.stderr":"b128988d3a37f5857c41751847ed0d9590e4cbda66a55238f73c60d992749e41","tests/fixtures/invalid/table/redefine-1.stderr":"3e794bce5bb6ae9f603f50e3dc62d136701ec478078e8a8e99c94229778e24ca","tests/fixtures/invalid/table/redefine-2.stderr":"76a6fa1ea8d5da8a78aecb88c506dcf4e07906984baa8c9d1a363b2bebfa4281","tests/fixtures/invalid/table/redefine-3.stderr":"6ebf320d6d2117c189dd8d425303a66739a4813e4abef2d3184dc9ef5915d959","tests/fixtures/invalid/table/rrbrace.stderr":"342a5ff362c8b4c1e85a6442029291bd33165a3b36552794fcd5269249bf36a1","tests/fixtures/invalid/table/super-twice.stderr":"78b95be29fe54e92ebc82d8b35e0d59f5b9796f323b7434a49daf72d0f0be02e","tests/fixtures/invalid/table/text-after-table.stderr":"6dfaf1fc3199f0602fea52f7b1c65869eb2f8643b9e90dc1e718a183fb972485","tests/fixtures/invalid/table/whitespace.stderr":"fa48d4dc83f92e729dc25c6fc6a0c336014391b4bdb3392998f18141d2deb350","tests/fixtures/invalid/table/with-pound.stderr":"97dbd1ceb7f357bd98cc1caa9a602c638aaa5831237b7d63b18153acc64d3af4","tests/invalid.rs":"daa9034453fb7f10718020e36a07a19664eb852071995f17480c595cb44e2cdf","tests/testsuite/convert.rs":"9140d681dbb9370b975d5bc1cd4e9e640ac4023c6789edcae544e66657ad5fe9","tests/testsuite/datetime.rs":"105d95570d05e9ecbc30bfe7d081f9d63e2f36634e9124da012f467c6134549e","tests/testsuite/edit.rs":"752f5310c253b670645335a316b789a71368ab3aebdf77ca2bfb6bcccaedc355","tests/testsuite/float.rs":"3db8b466505990ff3de38666c810b15c036632322b18f8e9c7893477dff4d641","tests/testsuite/invalid.rs":"31789643e3419ab922f8258e5a0421e1648b64aa5b96d3e1fb79bae36abf286e","tests/testsuite/main.rs":"b78ad4077facdf0e31ef77355fb3deb70d8339befbdb9ef16abca3b05231556e","tests/testsuite/parse.rs":"5697ddf398f2bea3396fcd24d7a21d32819849319f9db8e6cae4e7bf81cdf4b9","tests/testsuite/stackoverflow.rs":"426d4e621bbafe62f8aba2e8c62e715929185d5eca4c5083b6427b601abc667a"},"package":"0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"}
\ No newline at end of file
+{"files":{"Cargo.lock":"be642c4bf3ae8e4abd5feae72679e62da62b717b01edd404275ba8c1d1055609","Cargo.toml":"458a5d1b70969ad5895ea9d012a0d46342bf2960a9f82ad5a4f94c2d1963f55b","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"39f3575e0849928f6f8fa4cfff6f44c96fff96dc1146d761830a87a6ad33cdbc","examples/visit.rs":"e4bc255d89b1c01484cc50d116c559b4a89702f6e1e3d68459486059100f2144","src/array.rs":"5bbd00b103fb5c86f183453713137bb47cfee6d03514a381b4d1b7cfcad98968","src/array_of_tables.rs":"6f2a385fcc2259589f0b0b906aba66204900f02b052bcf3cddc45c507df39930","src/de/array.rs":"6d7d3099253e1519428f3e5af3d11ad625098552b199089a52b49ab940f55012","src/de/datetime.rs":"a29e76372fc382686c31ee93fd54c749ea3d775c8d4fcc2b2643f9464ea23730","src/de/key.rs":"26f5622ca99dedd8ea7fbee87289867e2e6fcf7cc2a6d565c61360090dcf5781","src/de/mod.rs":"166ab1170d838682058d1f6df881e567f6ad377dc0930be5dc4ea0812661dcb5","src/de/spanned.rs":"5c959639bf4b3d19c6b18e625a57b28b311164bf7b191bbc4d30aa97b7239679","src/de/table.rs":"007724aee900fa5e8800b7c69bb8fc0b8340e500297683d1b58e3a9cf6bfeafb","src/de/table_enum.rs":"ad3aab5169d6ddb2e7cd50a4dced4ee2485b11388876474969137b12fe6ee1e0","src/de/value.rs":"f2fb48b171d992bb189e2cfdd24c94a06b10498b269b7cc5a1be236aa6d34b65","src/document.rs":"5151feeec71aa1239ab0da6a94fb98d67825b3c72300d919f9cb8b8fad424a76","src/encode.rs":"94a8ea60d54ab1c69a2d684032f8b6afb3b549c84cd306e08d44d129868ba7d6","src/error.rs":"1228ce6ac8940ec0df8ca060dd711d002ea6493defa3720248b900115cdb7eec","src/index.rs":"bbc4b8f153b5232052986c9ef56c1a455175ee3ac256d2c72ace6be3069d38d4","src/inline_table.rs":"33c82c23270f87f2227ce4839d604132c8c3d005de5c4944c38c8104dfe86c44","src/internal_string.rs":"3f94a77ba6268d07146afcc341aafb2c938002c07e1ac4469e2cf61b2918a408","src/item.rs":"9c1dbb98ff4b98345d87d2ef3032492c1023d2f8aa420ae7b42fce23a32fbdec","src/key.rs":"766f5d907b74a333b585f866a4e02e44c76fdee5e25bbbfa37a4a40f05a13fd0","src/lib.rs":"b8b0c40fef9c3e8a23dd6134fa247158ab178b634da75c73fcfbf860d76ce05c","src/parser/array.rs":"d171d5092c0360f5eda9b8758752b09703ef174cf2007dde721f0108d1a07395","src/parser/datetime.rs":"ff0b4537b4b54a0b8ea9a26dd862b0e3afac153ac474fc51201f325734ddee4d","src/parser/document.rs":"c60fdea632997cebf240701401a1d9e056476dbabbfdc73d89cbdd263834a838","src/parser/error.rs":"025bce90fab50af89eaaa161f9116a577604632858a681cf8167904ddbfe354f","src/parser/inline_table.rs":"68821e3c5480f37c1ffaecb3dd82a76bcca0136376072d9a73548dddcca030b7","src/parser/key.rs":"22ffcaefe9067b27d9a012501a159fa8498870bd5102a8e80f5af5f6fdb44bcd","src/parser/mod.rs":"e3a80862bc90b32ff324d7f9103be289749671287daa43420f87e907bc2eb1bf","src/parser/numbers.rs":"1423f0e54cca7ba99b0c53fdd9df749c0bad75ce079d8941b860e5d84a5a3189","src/parser/state.rs":"2f028bf33a5afe92017f4048064941443c23b0345e7147da72e02a4d29f228b4","src/parser/strings.rs":"91fa1302dfc9aafa353c27ff4aad6fd3cc9cc2f2d9ae666c334d484bd4643167","src/parser/table.rs":"c716d82caed27229afb22e757cb14b2828356fc69d33ab94d8f43043f992cd2b","src/parser/trivia.rs":"78596aec684ab245e74e5302d6f238373c665167bc7ff21bd72923690b5e5ec2","src/parser/value.rs":"7570a1a30573e7fa144471a89a4df9ade93ab8e58e02a70f52911965d89cc2d4","src/raw_string.rs":"472573c3404d8d384728fbc92afc6e95437042b8e6499ebc4336f6f342b235d8","src/repr.rs":"eb759c28befa01db48a27208aa8a506ef136dc9701be61e56d8b5524e6317faa","src/ser/array.rs":"fdd85c61c1007d041ad42556dcf9f63bd6142dec0f82ee211cd5b9f7b4a85f3e","src/ser/key.rs":"7bdf5988b33e11f2e8f1a7f8956d10a40e36cf92791dd469ed7c10b1ed37ffcc","src/ser/map.rs":"3dfe28babf7ed4ae367e7c4cbce76cddb38af11de3a136a88434e9585d3b82b0","src/ser/mod.rs":"56463b354aeffb7549539fd2baa4f6b33814ea3ab40c721cee7d8d536c0540ff","src/ser/pretty.rs":"dba1e10ef22c0b0c6b47cd10e0d36face0ab61d5c7e50d53c878ad3f82db7805","src/ser/value.rs":"d973bad722ba3c2968f699e25bb8fe2314739f94056062e4b85ae4a72f720b03","src/table.rs":"30c1773d6e509a8e8de3712f4d48578945f9ea8c299803140d96ed6b75c89e3c","src/value.rs":"3d95e7ccd9aafa171aa8f09b4e82b33eb1241592142e4d119e57a93c98af1348","src/visit.rs":"732d9970455c62dae0523949dd9bdd16e76c05ed9de57720ea4c62d70e7efb2b","src/visit_mut.rs":"77934daa4ec1df159fc72f13431b5a635e4bbce15267a82da4647aa860a1e37f","tests/decoder.rs":"23022ffba788500248181d0cd784dca93d2b7edfaf9e560a3c379308385d401f","tests/decoder_compliance.rs":"d804ef45b0498869d05ac5c1216dc29e94963b2ec4f814e867f0fe8b71e9c639","tests/encoder.rs":"7014e99e18b9cfd34b280bc55a7e6c618269e38e5e6d483477e53e7e99459a21","tests/encoder_compliance.rs":"ca696031cb8f664728521da0370eb78e0351a5ac7134ad6cb12bc25f85757c97","tests/fixtures/invalid/array/array.stderr":"db4f1f06909589f9cb49d6657b6c39444e53b4ec8c4d3f0b9704ab5beaf68d2a","tests/fixtures/invalid/array/double-comma-1.stderr":"db4f1f06909589f9cb49d6657b6c39444e53b4ec8c4d3f0b9704ab5beaf68d2a","tests/fixtures/invalid/array/double-comma-2.stderr":"da4b8df6dbc2ef41b7b1b08b65a160ba37d07dec0c1ccf4184d6381a857b8762","tests/fixtures/invalid/array/extend-defined-aot.stderr":"a9dec506541bbdb96725d9f989572c10f29a52eb4e167fadea8929d7b6729b7b","tests/fixtures/invalid/array/extending-table.stderr":"a6c077cb49c41a9d10aca0bac6c571e570f0a772c6311d6a835f9cc46f4ab7cd","tests/fixtures/invalid/array/missing-separator-1.stderr":"98773b4d82cc32c0f8d1d8e6078109f7d9655b13d58e4b62fd22cef9f9ad725c","tests/fixtures/invalid/array/missing-separator-2.stderr":"eb38b2683f119d8b9b8c6b8ffd46da784112565ef1033febbe59469e14baea76","tests/fixtures/invalid/array/no-close-1.stderr":"a02ff4b3edf627873f0cb1f4242305f6a9a032b6f897fa13b8070c1a9ae85afe","tests/fixtures/invalid/array/no-close-2.stderr":"dfac1f12f502214388deecedf7a9720338ffd13b3184178410581e242ba8124b","tests/fixtures/invalid/array/no-close-3.stderr":"1930ad00952820805e208ebaf1ae3df243f492b6b2924bbfffbe458f31d89b29","tests/fixtures/invalid/array/no-close-4.stderr":"198293e991ab522435e383ef906f0594a0ea8126c792db934eba142369189e1c","tests/fixtures/invalid/array/no-close-5.stderr":"279aa5db5d92d3e729fe326321d2d217ff33db3c5e2bc2a5043909fc798c226e","tests/fixtures/invalid/array/no-close-6.stderr":"ccd74b7a7c01bb96a748c0e797f6207f0314d76520e4c1d1a9cde076e2284216","tests/fixtures/invalid/array/no-close-7.stderr":"9c6ab0c93fcf0c9ff7fdf8bc13f3b62864305509b80659c225a55641133abcf5","tests/fixtures/invalid/array/no-close-8.stderr":"c4b7fe79f9a354152c36e130af4862c47908cff3c84ba9be8bdbe76c35d9c6af","tests/fixtures/invalid/array/no-close-table-1.stderr":"545ad4381d5a007a6cd940a4523ae2f629617d298611c0898283a1c4783604cb","tests/fixtures/invalid/array/no-close-table-2.stderr":"5a2b4bf9026aa20c749551cd77458c5ffba008b5b235fa05fb7c756917018eb8","tests/fixtures/invalid/array/no-comma-1.stderr":"7d2f2923638cecc2f89e8ff1334a9da44fa7e137bea12d5019ef25f576f015af","tests/fixtures/invalid/array/no-comma-2.stderr":"d95a7a43534c632efa2502e3b5f8eedabf2f05ad6bfdd68e2f9fd3d8a22ba028","tests/fixtures/invalid/array/no-comma-3.stderr":"ae8ec653f564b247644854fecf59e097cc32e445aa4775aed8d18a207af5ec45","tests/fixtures/invalid/array/only-comma-1.stderr":"6f35677e711812007adc9a59341bc62bf2b7bcec80a456d19a2468ea8fd27b47","tests/fixtures/invalid/array/only-comma-2.stderr":"9d0017e6798574bd85810e64816ddfd08ccc36e25153006958fe023e2a007331","tests/fixtures/invalid/array/tables-1.stderr":"f105a34c2d87b61160881eeb09b7f54d244ba2a222d32fbfc755091939942247","tests/fixtures/invalid/array/tables-2.stderr":"77010599d1d61a34119a99acea7d84162d217df93bca01aed3ae73f1eb62dafe","tests/fixtures/invalid/array/text-after-array-entries.stderr":"391ee42f4fa3a7ec51ba1b90e69f1d9278c105426fe66ae1f80e65d7fb6ed379","tests/fixtures/invalid/array/text-before-array-separator.stderr":"7292ebcb8c9c8aaa4041279af5414de3e710977cac948988cdc8b0947223b62b","tests/fixtures/invalid/array/text-in-array.stderr":"0486e3ec5d299e39c61380a2ed8826d886edb730f6d9555a765e4314da7f5b68","tests/fixtures/invalid/bool/almost-false-with-extra.stderr":"d489307ba1d0a3dcd1bcff067437f0cde1521c6fddb1311bf396468521eabe81","tests/fixtures/invalid/bool/almost-false.stderr":"399829efe867bedbcef2ad2073df621f8297877180f71c6292209426da7b09dc","tests/fixtures/invalid/bool/almost-true-with-extra.stderr":"439c66bbdcdd335cb858f3cfc692fa3a78f7802591954909fb6807a62440d334","tests/fixtures/invalid/bool/almost-true.stderr":"3aed4e8704abc2099d8a881ee496a868c4745a0cfe7df781de613016543f4313","tests/fixtures/invalid/bool/bool.stderr":"d489307ba1d0a3dcd1bcff067437f0cde1521c6fddb1311bf396468521eabe81","tests/fixtures/invalid/bool/capitalized-false.stderr":"09c2b3b51460a52bc274c5d0b08024c76ea3dd7e067ef20765cc56d2a4f60087","tests/fixtures/invalid/bool/capitalized-true.stderr":"d0fa94dc8a4fb0f17550052fde5e10134e8ccbc84f1e90093446f1cb99f01a70","tests/fixtures/invalid/bool/just-f.stderr":"5f6a3a206bf49fb5eade446dc8f432037a4026f49beac01e453fd8c3610901b2","tests/fixtures/invalid/bool/just-t.stderr":"175bdb4ffa7259c5bc346fb088de8545e8e1d8254d1e2ac0d33c16b539e2270e","tests/fixtures/invalid/bool/mixed-case-false.stderr":"9de4d4b695614f3593abcb27a6f68ef5c578a96bec01472607c35cde28d48b10","tests/fixtures/invalid/bool/mixed-case-true.stderr":"45e314b026b819d568350bb62a39a2e5fd970acaf0a6591539d043abb9dee629","tests/fixtures/invalid/bool/mixed-case.stderr":"927b85ba3c3084e925cb8959c07d42f9f19f4ca8f84d7dd6babf15f1d9a1048f","tests/fixtures/invalid/bool/starting-same-false.stderr":"7e0f1f2d8ae538a5b156da19be0630d25e0d2dfa44bd97cdb125bf3e042df7d3","tests/fixtures/invalid/bool/starting-same-true.stderr":"bdf30c50dcc0ff8c928e753962f6dba7acc6f945a2958e0b03e690a126270ea0","tests/fixtures/invalid/bool/wrong-case-false.stderr":"811f36bc4df7755c3850b4e933e5436fb54183ac7fcf3599e8373d7545be1c2c","tests/fixtures/invalid/bool/wrong-case-true.stderr":"90520b03257419ec4a826b7f989e5aa74314a0aeeceaf6bf1873e867715495a6","tests/fixtures/invalid/control/bare-cr.stderr":"568eff61d56bb362866973d9a7a488831b8b08d02f4808538a04b22ebe10bf09","tests/fixtures/invalid/control/bare-formfeed.stderr":"86ebf66dcdf202fd832d91892b4b62eca65957198cca9567b10f3400997e9f90","tests/fixtures/invalid/control/bare-null.stderr":"e6bf2df7229c8632a1c7bce682914166520216c2d6c3ccd4c2e716dc700d5bca","tests/fixtures/invalid/control/bare-vertical-tab.stderr":"b85c55e64c58b85343482dadcd5d833fa771a79e1d0f13a24f4185a4d0d826d5","tests/fixtures/invalid/control/comment-cr.stderr":"3b334037fc70762903ebc2c3d0786554bb62d9f146dc801e07841ac7f8370e78","tests/fixtures/invalid/control/comment-del.stderr":"872065efcbcddffab0679160bbce0c8e2519ae7ccb8b4b667a8b78c4bd13522d","tests/fixtures/invalid/control/comment-ff.stderr":"bdcaf413adee168eaee3a7723b2939fe67e59914a834cbc559902eb94e4ca02b","tests/fixtures/invalid/control/comment-lf.stderr":"898787080f260e05ca20e6982ac4cce5572a6ed84a9244ce07a41f710db9a0cf","tests/fixtures/invalid/control/comment-null.stderr":"bcc48727ae370e45918682d6a17bc680b126d4792d4a33524c802f45cebc03d6","tests/fixtures/invalid/control/comment-us.stderr":"37d7a6c0a28989966af74530c2885bfc7ba6ddb31b58bce3f26543e34043b88c","tests/fixtures/invalid/control/control.stderr":"6ba75c9dbd0e03531f5a5ead2cb781a702d3600c76b2a4cf1bf7c02c1c9aca1a","tests/fixtures/invalid/control/multi-cr.stderr":"29fde9a540e77ed46dae0a227b666a9c102d5263cc5cac811e0e451bd403ad91","tests/fixtures/invalid/control/multi-del.stderr":"79f0d85f5b44a7dcad9d98adbef25b6ce54bb6dbf79ffcd3ea230a07144b4b82","tests/fixtures/invalid/control/multi-lf.stderr":"8c95b2a7b4e20dd8985e04b8da5fb9d7cbff37220a74fd3903f16f7ea7eaf39d","tests/fixtures/invalid/control/multi-null.stderr":"9fec8ad3ba45ddb96ad3b6a118b4fa648056e26a9128528b2c0a8fa3b01e741c","tests/fixtures/invalid/control/multi-us.stderr":"3a59d615cb91172936acdc42baa39e9faf3a2bb9e9078d9879a54826ffb6b20c","tests/fixtures/invalid/control/rawmulti-cd.stderr":"a71dce0ac9a79209ea173f3d656b2d663c685b47841b620cc89860fb68f0cf0b","tests/fixtures/invalid/control/rawmulti-del.stderr":"3b99e52cbec29c7b6b439bcf3cd58b85a72487e2f5af5e829dd6986b3414f49f","tests/fixtures/invalid/control/rawmulti-lf.stderr":"89fb9c7d02e39ff648cea46ec1086058016c5ef1deebc6f3b106664dc4d10eae","tests/fixtures/invalid/control/rawmulti-null.stderr":"84c04cc89a6bc716b6f7811142899014abdb0b49c4ea56bc163c19220b14c323","tests/fixtures/invalid/control/rawmulti-us.stderr":"ac53d1dcc96c3beb454f5474a23940f26c93705b76a10647c810f79facf4f6be","tests/fixtures/invalid/control/rawstring-cr.stderr":"fa8da523c3cc24384fda1dd6032607cdd380f45133ce7d6d2a1d3b8a3eb6a917","tests/fixtures/invalid/control/rawstring-del.stderr":"64378c4341fb92376e2fe8a70356411759b8659e151ed0ca744751c8b2d32155","tests/fixtures/invalid/control/rawstring-lf.stderr":"43f6431efef7ead5aa335958187d979d98dcced50cb82ccca19df34397278175","tests/fixtures/invalid/control/rawstring-null.stderr":"eafa2a63e9d12293b290405049457860a8fef70de56c4ba2f203e5f2c79a8634","tests/fixtures/invalid/control/rawstring-us.stderr":"d139a7ec7c4ff5358f6c56ea2f2e431646f5ae9bf3d927694a2aa3891637ecb0","tests/fixtures/invalid/control/string-bs.stderr":"ce6634df580f80e090749d31c178bed74b88718befea7788abe801acf4af10ae","tests/fixtures/invalid/control/string-cr.stderr":"a8dfbe00e976920a442f8f03bebeb31bbdb570a242e380b5a4c60d351614acf9","tests/fixtures/invalid/control/string-del.stderr":"bd862371b7a698647d4d68e5c3bad5c269bd8553f36d82301ffc62a4508334a4","tests/fixtures/invalid/control/string-lf.stderr":"18a1d0e1bcf6f99c80e95e94097f95722a65c2d8a415f9497b808b0bc135c12d","tests/fixtures/invalid/control/string-null.stderr":"fe34d284c478853bad94235aac1f37ac3c591f97e12990847b5da0b6c99bd47d","tests/fixtures/invalid/control/string-us.stderr":"06f7fce918057f567803f370e55e035896bb63a97eb0c0c39a680d6b927fead8","tests/fixtures/invalid/datetime/feb-29.stderr":"898cd0c4cd094247fa0825d02179d3b913cc9db4fbe634fa84c7a7d2cfb7b03e","tests/fixtures/invalid/datetime/feb-30.stderr":"0fb2c5f14857fe5edadbc93a78208c1c9ed900a18e3296613cc620e255c76e11","tests/fixtures/invalid/datetime/hour-over.stderr":"bd2220bdbaa96caf3d2aaff640620e4856bffb722a0e5be61dcb5283ffd08056","tests/fixtures/invalid/datetime/mday-over.stderr":"de9d27d65c68dd09da10c229167ce881dfe0ebda457badfe24b7598ae80c47a6","tests/fixtures/invalid/datetime/mday-under.stderr":"18daf3ce2a6a972476ccabcf92690a488e4f3be804dab8458da2aebad22a2c8c","tests/fixtures/invalid/datetime/minute-over.stderr":"a29009d3f7a6b1d9afad2420f223d6a6e02df8149577547837f5eeec4075bb9a","tests/fixtures/invalid/datetime/month-over.stderr":"37a203b22c3b2510541e413ff347447f9f3319a896ee005b96f65bc0d68150f4","tests/fixtures/invalid/datetime/month-under.stderr":"24c554595ca9a999a1d8e1ef7dc28b443f2f0ad6e17337ee157fb18bdcf678c1","tests/fixtures/invalid/datetime/no-leads-month.stderr":"2e20cb60a1ecee85b172d1402e4d8c425362e4db607706bd39494385dc6dc98e","tests/fixtures/invalid/datetime/no-leads-with-milli.stderr":"a35c496884e921aa086c1404bc812ff74f2bfd347a3ecd96640942be5555afbb","tests/fixtures/invalid/datetime/no-leads.stderr":"2e20cb60a1ecee85b172d1402e4d8c425362e4db607706bd39494385dc6dc98e","tests/fixtures/invalid/datetime/no-secs.stderr":"65871ee020e645e737c363b22cf43c160b295871cd4ac97a37d3ea46f60e3250","tests/fixtures/invalid/datetime/no-t.stderr":"ff50b85f6bc0d49000ec6f1303fda9b44bf934c2ede61743363411bbf6ebecbb","tests/fixtures/invalid/datetime/offset-overflow-hour.stderr":"c6877bc38aef57bc1163bc8e982131cdf9d9e9f2edb08a80dd1aff61db36c5e8","tests/fixtures/invalid/datetime/offset-overflow-minute.stderr":"6f5d98afaeea22cd896aa80e16abfe93745e45ad489a4575787dc378ed52f33b","tests/fixtures/invalid/datetime/second-over.stderr":"0ed555a874efa08b711b5227501208758d87a01ad8360cf76c3dc8761807fac4","tests/fixtures/invalid/datetime/time-no-leads.stderr":"b3282cb32386dd84a35468f488be5a92dd3488e951f9dd2ea39057046386b73e","tests/fixtures/invalid/datetime/y10k.stderr":"6fbe45e2032a4b8a90fef144618ef6027edc00dee219d50c8b1493b6e38586a4","tests/fixtures/invalid/encoding/bad-codepoint.stderr":"1a816a8cdd5c2c9b8ae10431d981e22c3b307e30ef3d401ab62ac1012240be44","tests/fixtures/invalid/encoding/bad-utf8-at-end.stderr":"518dc443f0404d486b40bbbd152870276016795b05f3cc8a1de64a0e08fcdda2","tests/fixtures/invalid/encoding/bad-utf8-in-comment.stderr":"e0f252d14c18ea072c098834997db8e5f68b807bb0fa6d3d34e4042a5ea6fbb7","tests/fixtures/invalid/encoding/bad-utf8-in-multiline-literal.stderr":"2328a89cd9043de10ee656f4ea0dd5e6491fd8c0484ac36099c23161dd7a2625","tests/fixtures/invalid/encoding/bad-utf8-in-multiline.stderr":"2328a89cd9043de10ee656f4ea0dd5e6491fd8c0484ac36099c23161dd7a2625","tests/fixtures/invalid/encoding/bad-utf8-in-string-literal.stderr":"eefb00fee073933fbdb95d24a9e7050c281d4719d0cb970c2c06a71a86f108b3","tests/fixtures/invalid/encoding/bad-utf8-in-string.stderr":"eefb00fee073933fbdb95d24a9e7050c281d4719d0cb970c2c06a71a86f108b3","tests/fixtures/invalid/encoding/bom-not-at-start-1.stderr":"bd4e557b8b4586cdb39a8fde46f0bb214954f9f8ef37be46e2cc19823f6d6919","tests/fixtures/invalid/encoding/bom-not-at-start-2.stderr":"27003a498cb355011782dc21f01e15457490b78c472bb9ddb54147413c8f597e","tests/fixtures/invalid/encoding/utf16-bom.stderr":"a8800edcb8f6184b712da53e74bb787c39eb891073575acbae1ad575f15043cc","tests/fixtures/invalid/encoding/utf16-comment.stderr":"edb66c01034865f484ccf7921bfcec1efaa8599762cb9cd30c9c8103275bc4e6","tests/fixtures/invalid/encoding/utf16-key.stderr":"fb6a1d4cc571ff9d1c154f0a996d61d8f260d7e505318d02c0a03b38e2414e5e","tests/fixtures/invalid/float/double-point-1.stderr":"2917901dd186adc39cb5965faf388fa2babe577ef3bfcadd4919232868a727cf","tests/fixtures/invalid/float/double-point-2.stderr":"7eda489da0436d6f0f2268aa4005b422d215b4785af0c1696c8731908a563f17","tests/fixtures/invalid/float/exp-double-e-1.stderr":"e64082e328fcfbeff57e6801448c769b12bc8e879b77421b688b2e147e386713","tests/fixtures/invalid/float/exp-double-e-2.stderr":"5c45326ef7287ea16a9e08275222e281b5d61c9322f8764f6533707f9772e255","tests/fixtures/invalid/float/exp-double-us.stderr":"ebd30aa3f7cd3a0a5e79bbbde1beff209d24f4ab58eb5552c1baf0eb2194e97b","tests/fixtures/invalid/float/exp-leading-us.stderr":"19c8f676dd45a5db09bd5baba5c3e7b661e83099a340331ee6bb10defe679569","tests/fixtures/invalid/float/exp-point-1.stderr":"23e73e4e63db888546866967a1c0319a1db269f23ee9c277b298e9f2db88800e","tests/fixtures/invalid/float/exp-point-2.stderr":"633328e085fb04d6a79cdfb696f45a1836c3a8b6afafc4cd5e16d48465aa4613","tests/fixtures/invalid/float/exp-point-3.stderr":"b8b25bdb9b28cbe695134f00fdde85b5fa79b28408831356dc3a62650159a152","tests/fixtures/invalid/float/exp-trailing-us-1.stderr":"a73b4458debd1d0f750a6c5ade21b4046dfa2fa32b7573b0dec46f9400ed4f57","tests/fixtures/invalid/float/exp-trailing-us-2.stderr":"7a62522d55afc9bcc3ce5f11a9de8a62765803a99db4114ad6a2a5b777a302ab","tests/fixtures/invalid/float/exp-trailing-us.stderr":"aaae81eba820233944bb88920621dc9c1bbd0d1a1476c0376a38d0491a30c83e","tests/fixtures/invalid/float/float.stderr":"cc664d16849deec2ae7ebee6a3f46923bd5959075e282315c4f60461cdb13a0f","tests/fixtures/invalid/float/inf-capital.stderr":"1451a322f3be80529ebc091d231b682127e783a07cfffcce67f5b9bb4455c0c3","tests/fixtures/invalid/float/inf-incomplete-1.stderr":"38cd906dfee7f13b8cbdb27f3406ab0499fae3ae16f3c77bc7fc48d009595d93","tests/fixtures/invalid/float/inf-incomplete-2.stderr":"97a9ae1ff194a95b5be2abaf2cd8179ada832cdd9fad349efa9951e7ab92e435","tests/fixtures/invalid/float/inf-incomplete-3.stderr":"034bc609343ecf1e659d6250f719e5f93512e8140228e44e57b538765e58a1f7","tests/fixtures/invalid/float/inf_underscore.stderr":"621326dde26e5364c7af1b562fb651f4184d9b5fc9bc45edc12f52b588d506bc","tests/fixtures/invalid/float/leading-point-neg.stderr":"d19e28ba2f11069800df4dd1951025aa7f75425f7258e8caf4bbf6abe0e84bc9","tests/fixtures/invalid/float/leading-point-plus.stderr":"10750e9acccb17f0682db30fb175d083d06c822a4863d3d6b8ddb6c75b7b22ec","tests/fixtures/invalid/float/leading-point.stderr":"2545b7a615528595f5d53a7338403c83a8587e70600b1501225446e5f456c805","tests/fixtures/invalid/float/leading-us.stderr":"dc958138922097b2e1e3865c7818604b2249268af4acbe5cafe0ce8c68a90a86","tests/fixtures/invalid/float/leading-zero-neg.stderr":"d1fad35fa8d18f93ebfdf681d3476f02600e5c39cc942ca9bc36181476cbbe53","tests/fixtures/invalid/float/leading-zero-plus.stderr":"ad8ba7a7c12cb4b296cc0d43915106732e6a6a713aea67034587d1fc0c8093df","tests/fixtures/invalid/float/leading-zero.stderr":"cc664d16849deec2ae7ebee6a3f46923bd5959075e282315c4f60461cdb13a0f","tests/fixtures/invalid/float/nan-capital.stderr":"d0e9234b96d4e3591ca0190a785789f9bdcaaff01a111eb57db7bc458a2dd95d","tests/fixtures/invalid/float/nan-incomplete-1.stderr":"f4bee0b1c639bf800fc4dda38276142e715cd85ab6cc5e93ae2112ea63d7de89","tests/fixtures/invalid/float/nan-incomplete-2.stderr":"dc908ec577d29083bfd709fc4bdc2fa641d7fb2ba77a5d7441215680a8839d69","tests/fixtures/invalid/float/nan-incomplete-3.stderr":"abab5a41e0f2f1bad2d2050d0c913dfd8c15e50530d53ef8de327f106f564e02","tests/fixtures/invalid/float/nan_underscore.stderr":"25b67a7d6c743f673be7b409c9990de5de8b52a1d97c32e6f4e62f33147f1872","tests/fixtures/invalid/float/trailing-point-min.stderr":"69ad03ae81990d580a6d63bdd5ab594de00c0a16694c8671704c6243b4578b38","tests/fixtures/invalid/float/trailing-point-plus.stderr":"fba0bbad890020fe943e9f23644e81bf0bb7d114230fe16182e866fddcfc108b","tests/fixtures/invalid/float/trailing-point.stderr":"2f12b368fd94304ab0126ebb5888c519475f9ca28e9ca702c477cf0085ba9216","tests/fixtures/invalid/float/trailing-us-exp-1.stderr":"217939411cc9c99589d1ef0f3919c90ca2a562c0352063aae08ba2ae53c1208b","tests/fixtures/invalid/float/trailing-us-exp-2.stderr":"ecf0002a04040c8afcae7f4bb182c0322b4d00ab88bb53405e40c7938f2a9443","tests/fixtures/invalid/float/trailing-us.stderr":"506cb8051f1045ea1dc7f11865d58cbca0216502d273e1c10366c8be7cc9ab43","tests/fixtures/invalid/float/us-after-point.stderr":"fa9fb59f703b6770be3dc094c04eb2c4add8a7a7ab79d9fe508cfeee785404f1","tests/fixtures/invalid/float/us-before-point.stderr":"14e09a7a382e249e5143d1c81d6e4623408eb2d505e1e3f86c370a3a3bf6cd9e","tests/fixtures/invalid/inline-table/bad-key-syntax.stderr":"cc3565bdd7ce5752ed2e0aa6ca10e8a414d357a1f5630d7c759f8ffb709cc540","tests/fixtures/invalid/inline-table/double-comma.stderr":"2132a1c4d97fab140089818f990284333e22ef91d20a9f65e11d4dd15b1a701a","tests/fixtures/invalid/inline-table/duplicate-key-1.stderr":"72bea73b20005f15ced977aae70a1b0f3bbe3e35598231aca9a2303d770efdc3","tests/fixtures/invalid/inline-table/duplicate-key-2.stderr":"9b69c8521345fcc21886138d9dd0f20528c71712f3de3e565087adc916113a07","tests/fixtures/invalid/inline-table/duplicate-key-3.stderr":"675b84acec95eb5778a8d280881fd83cc3f741d0c0e2a21cd74fe1ab2b6bd710","tests/fixtures/invalid/inline-table/duplicate-key-4.stderr":"5ed3af9e2011f07a04572b2bcc1dd11dd57512dd35ff616e37051a34bd1f4a94","tests/fixtures/invalid/inline-table/empty-1.stderr":"604fef40337f04e5f37a52239d6509850aba95677a7a94ca8476a6c21b648a43","tests/fixtures/invalid/inline-table/empty-2.stderr":"870f189adbefaa6f05307d5b00748f1ae1c748d96105fabeb409c3c7d59126ca","tests/fixtures/invalid/inline-table/empty-3.stderr":"766b0f61a467c8db42514016a9a3812f678b054a124361bf7b7617cf2ae073db","tests/fixtures/invalid/inline-table/linebreak-1.stderr":"45b0611d37c1ece88bf6c88b3528adc3d73e0cd3e3b24dcf07ab151023a6f488","tests/fixtures/invalid/inline-table/linebreak-2.stderr":"f7672965326b44adaf0cb4796a087fbe779a8b17fbb458090a33375d0c54e5b4","tests/fixtures/invalid/inline-table/linebreak-3.stderr":"e8c70f0c91b15e701567e93d8df1cd3bec593696af05ec1d95e8f9e00ab20fa6","tests/fixtures/invalid/inline-table/linebreak-4.stderr":"3d31147f9e1ff5f94384e4df1675dfff2da6f076cb0a729771615f05b990be91","tests/fixtures/invalid/inline-table/no-close-1.stderr":"0bcaf312d65af22a37bdd8334821d95d4212dd43905fc945ec2c8ad3d465ae7a","tests/fixtures/invalid/inline-table/no-close-2.stderr":"4c6bfd3dd94611a3bc02fc609a738bc252dc38501e7ef6ff19543d757cc564e4","tests/fixtures/invalid/inline-table/no-comma-1.stderr":"9f1c85e0df72c7e7e011c26a0d5dd9dea8b7a5e18c3ba9a53ff4a20a9429dce9","tests/fixtures/invalid/inline-table/no-comma-2.stderr":"24a06e43a94ab041395eedb94c5bdb799ed7fbf6d930791756b0e3bd4a812943","tests/fixtures/invalid/inline-table/overwrite-01.stderr":"812d1bc74d07750048a521e513a565676e606d4fa1a32d2ebda7af8fa064d3ab","tests/fixtures/invalid/inline-table/overwrite-02.stderr":"bf95d34749254300f4179ed1314cc9cabd7c7b63fc2453fc7adbc7869b63be4a","tests/fixtures/invalid/inline-table/overwrite-03.stderr":"3e2c2ce66f1e4982aab428075105a39b2e9384f2dcf6da6d715017533416e149","tests/fixtures/invalid/inline-table/overwrite-04.stderr":"8aeb424d4ccee35ae17efba8acd65aba834192672cad73e8e1e6c3fe9f878826","tests/fixtures/invalid/inline-table/overwrite-05.stderr":"ff8facd04689f13ec53ee77bc9790d25e2d2eec50f4675788d70a2bf33a85e2e","tests/fixtures/invalid/inline-table/overwrite-06.stderr":"01be3b4e31d2c0aed381fc6599d5fd78d0757e9b76e66b087e4614e98f782db3","tests/fixtures/invalid/inline-table/overwrite-07.stderr":"52bac538099395ae15c5c8786f835dbab4748be0464951a25ae0f44aeea90125","tests/fixtures/invalid/inline-table/overwrite-08.stderr":"bbbc4b8959113590e9bc27526b56bae2e1223c88493836ea0a0df4209527a038","tests/fixtures/invalid/inline-table/overwrite-09.stderr":"1b084659999a2cf01ba8feab1d9d9232a307fae584e4277210cee69f53ef6cab","tests/fixtures/invalid/inline-table/overwrite-10.stderr":"229695997044ce82d3c3979904401a44838ae70103729b6ebba468cfb1beb154","tests/fixtures/invalid/inline-table/trailing-comma.stderr":"4791911dafd6602e2891d6ffc4d32ef8e9d0c1f8f6d37e84d440feb896d9cb88","tests/fixtures/invalid/integer/capital-bin.stderr":"fcfc8b0bddd36a641d3f5cc2ceee88554619fabf6874e11cdfdd147be8781881","tests/fixtures/invalid/integer/capital-hex.stderr":"c8e2d64f9659435a0387bb7e6447896eda253fef77e0214a4073fcffbac693a7","tests/fixtures/invalid/integer/capital-oct.stderr":"ec465fa25da212b0c9b6265ac8e9cd05c1fa07d614dafb3bc9b2ca74d6c2a7a7","tests/fixtures/invalid/integer/double-sign-nex.stderr":"8d57da526240c1cf73423b688442922ae291ff26e3c09f9c3b5b150e62e5cbaa","tests/fixtures/invalid/integer/double-sign-plus.stderr":"55896d9bd19637e124482966a12109a1a8351620ddc6f8d28553d70359f523f1","tests/fixtures/invalid/integer/double-us.stderr":"f14ed7bd3ad26b2203763fa953dd6e99212e50fb8e43a4eaeb115c1a7df4fc25","tests/fixtures/invalid/integer/incomplete-bin.stderr":"64168fc7ede87a10c12f82325fce644a7d9b9c3af55a313184175df7926845e3","tests/fixtures/invalid/integer/incomplete-hex.stderr":"ed2423540e288f4673bc68822a799bea04f571db5de56154e10360b03ab79553","tests/fixtures/invalid/integer/incomplete-oct.stderr":"9ed35e3078703a38996f20dc3e86477149564c8abd237c644bdf3a5ef26e3417","tests/fixtures/invalid/integer/integer.stderr":"ed5ef991b733b3d51700364da18bf58f1b7eb68053467afcbff22775b3b82788","tests/fixtures/invalid/integer/invalid-bin.stderr":"7248d47f2c7db309254a3a41af28bc1a6e96bfa95e0c8c94d607f65a1a30cee6","tests/fixtures/invalid/integer/invalid-hex-1.stderr":"ca2af571a835ca976727c823939f7cbd6d36f7d048464ba1f8f0bc6b6558cb57","tests/fixtures/invalid/integer/invalid-hex-2.stderr":"e2970d46eadb852d34a8407929972acf7ef131c3c44978af0e6dfe205a6e993a","tests/fixtures/invalid/integer/invalid-hex.stderr":"3976255c6fe35a1e29f0fed7324eee8420ababd0f6f1f7702908c3df47c88846","tests/fixtures/invalid/integer/invalid-oct.stderr":"9f6776e33887cb446a5590d8fe4e51c36747c634cd5e4efaa84f807d3ce244e0","tests/fixtures/invalid/integer/leading-us-bin.stderr":"0cb1db77dee877423738395a720e6ebbd5a545a3b22ce710ab669b5b1f7903f5","tests/fixtures/invalid/integer/leading-us-hex.stderr":"fec78f4fe4ad481fe9ea93465c8ef5bca8b98d0bba31b48b2990870b7aa5f44b","tests/fixtures/invalid/integer/leading-us-oct.stderr":"aad69bdd80f94e907bda03558a1302e54d58d8911fe2b564e93cb0ec48403b09","tests/fixtures/invalid/integer/leading-us.stderr":"3a265cc11f1b0d43d4b532a47776486ec7c7ea7afe70813ab00c5a37cf87a9df","tests/fixtures/invalid/integer/leading-zero-1.stderr":"ed5ef991b733b3d51700364da18bf58f1b7eb68053467afcbff22775b3b82788","tests/fixtures/invalid/integer/leading-zero-2.stderr":"5c70e7874256512c0ef6bb364497d4e10154e994056f2feb7c5c729016522091","tests/fixtures/invalid/integer/leading-zero-3.stderr":"fb2730feda6f669a3b8c4332f01369e52ce1b942807f1bf3d9762b1fea04aeac","tests/fixtures/invalid/integer/leading-zero-sign-1.stderr":"c9d2d992eea36c4fe228eb74741bd8d0ede1e354cad132b79462e7b502b37f95","tests/fixtures/invalid/integer/leading-zero-sign-2.stderr":"4248329b339020cc2ea586f2775a0b4f4cbe2ae3f0f75b935263363b8be5eaf5","tests/fixtures/invalid/integer/leading-zero-sign-3.stderr":"3b414808727d3a446efdfca0033525e17536f9b54104d8a9cb9278b054d213df","tests/fixtures/invalid/integer/negative-bin.stderr":"74aae673b861bd46544e4835fe7075e20158dd69e27f75c790d48a6006476c73","tests/fixtures/invalid/integer/negative-hex.stderr":"799bd8120f4cf2c36e7f65a5f9aa43a3ec87dd95dd3bf68501059da9f21f8c9e","tests/fixtures/invalid/integer/negative-oct.stderr":"017a6a24faf9dc1cde89f62b46435f8fca493e7b61f6fbd2b6d57f0f9e80da65","tests/fixtures/invalid/integer/positive-bin.stderr":"54d8a33743737f374480cd1235bf3f7e0847d252ef7e2bb1d447529cbc0f6692","tests/fixtures/invalid/integer/positive-hex.stderr":"3b21b23cc3dd6b213a19256f4ffb4bb36172de2f739f90bbea78636f7a50524b","tests/fixtures/invalid/integer/positive-oct.stderr":"f19faef5bbb7ed8351777bdededb1c523337f2aeeec82d967c19c36069790e11","tests/fixtures/invalid/integer/text-after-integer.stderr":"07a13ad4841a452eff00947234a4ebac4d209ea0294162888db35668648bb55d","tests/fixtures/invalid/integer/trailing-us-bin.stderr":"62da06cf06527b9e9cbeba6c5299ce6001d40592e9d007c8350090977f4d1b58","tests/fixtures/invalid/integer/trailing-us-hex.stderr":"1b290eada58a7202b1a9251afd8e0e72a4caa8ad5c85036d1050e7de8141e94d","tests/fixtures/invalid/integer/trailing-us-oct.stderr":"34e6f86ffb0099e6e1ba67deb51e36af62dfce4e7299b94503a219339bf16447","tests/fixtures/invalid/integer/trailing-us.stderr":"3ab49ee921eb772f5aa4eaf0fb3619b1dcd9a9db3f4ebbd9bc505581a985e753","tests/fixtures/invalid/integer/us-after-bin.stderr":"a94a87ebab3536899ce7c0c785f020b3a236c60d24c0bd7494628ca310c40768","tests/fixtures/invalid/integer/us-after-hex.stderr":"9009b187f615f06e3392eabd8ffa58311ed1c2b1cd76f8c5bd99671242f2e026","tests/fixtures/invalid/integer/us-after-oct.stderr":"05af70a21980416fbd602337f9af22a1c600a294635d10ef1ca1b2138338e712","tests/fixtures/invalid/key/after-array.stderr":"487d957b20226ac36e27d6efb1e3d24147284c9a5e10a0188427a1c940d31ef0","tests/fixtures/invalid/key/after-table.stderr":"f70e84770817f096fcc1b6195c6b0a79d25210c6930ce412a89646040ee3d713","tests/fixtures/invalid/key/after-value.stderr":"00d4d2d3ccd61f64a92df0ca575aeafcd96e91d053d835ca855973339ba458cf","tests/fixtures/invalid/key/bare-invalid-character.stderr":"b1f64d54a43017e6cc09755fa7ba477901721d23f9271ec658fc9362f46631b3","tests/fixtures/invalid/key/dotted-redefine-table-1.stderr":"59771f7163f28a3c81209f058b7b01d616fe5022e8ee7ffb395feb44129cafea","tests/fixtures/invalid/key/dotted-redefine-table-2.stderr":"564febb355d1556df42f428a046ac6fdc5dad49b2b736be5824b0c13fcd1fae9","tests/fixtures/invalid/key/duplicate-keys-1.stderr":"73407dfd58ba687026376cc491a42bdca3b6c94a1a85ed2a6884a7fd116acee1","tests/fixtures/invalid/key/duplicate-keys-2.stderr":"7c9dfef2ef19b1487b7592a267ab5ba21c8b833dfa9ec1c3151e369c2fdba26e","tests/fixtures/invalid/key/duplicate-keys-3.stderr":"5d84bb05a826ef44134351dbace41f3d771a2d7ff3777dbff4dda8c1fe18ad62","tests/fixtures/invalid/key/duplicate-keys-4.stderr":"522ae99c93599d13c0f1acc1fdb4f3d1787e83dd379f34f07ed5cf1f8e92cbf0","tests/fixtures/invalid/key/empty.stderr":"af6d3636ca73e5496c40d9c918c59b61fd86812db262649e5268094193873130","tests/fixtures/invalid/key/end-in-escape.stderr":"86b9c28ffc74797d35a89fee58853fa85bab9638b919138ccd5d8dd524dd204c","tests/fixtures/invalid/key/escape.stderr":"155aa9389f0eb28cac3b42974af7ea9e2eef8d96f084f08f9f75e960fc8ce8c7","tests/fixtures/invalid/key/hash.stderr":"85dd91b96aa4f81cc7922b02b411f25d9053bddd1e5b893c2a2ee9d0115a7cac","tests/fixtures/invalid/key/newline-1.stderr":"714aed0a140062f977ec85b9afa50f68448c67e806168e60b4f4554ab270b2b9","tests/fixtures/invalid/key/newline-2.stderr":"8bdeb90922617a8e943e0196b929e62a7e30baebabd49870f5c31adb77ff93a6","tests/fixtures/invalid/key/newline-3.stderr":"3862b1f006b761fcc0c97166b91a20d57ba74d4da39f2590b7b5bb2493a8090b","tests/fixtures/invalid/key/newline-4.stderr":"d625f2caaf01d53d72d6f1c3df0952fe3ca8c5f3b081503cb02b9994c088b733","tests/fixtures/invalid/key/newline-5.stderr":"6d811add45be91fa4debb461126613db9c605bf758a21490db0024ed3887ea4e","tests/fixtures/invalid/key/no-eol.stderr":"440ec927e94f0e520a0f256c865041f0478e1c82f3bb79323b7ddc36fc942edf","tests/fixtures/invalid/key/open-bracket.stderr":"3b36814373f51a8ea00a448d65bc514e8d99f5163b7dd8101df62bcd0a06e801","tests/fixtures/invalid/key/partial-quoted.stderr":"dc9059a014ed53071ed170b1e280923556dc09e0be2ae96cc8474e9da59fa378","tests/fixtures/invalid/key/quoted-unclosed-1.stderr":"6cdec8a7c5352a2f246273afaa923dfa81d4d2e68cca5b4f9a19193559b164c2","tests/fixtures/invalid/key/quoted-unclosed-2.stderr":"b4817e6f85a90fbb6adf049ba57c268f9888f1b42b3d62200c359606176170b1","tests/fixtures/invalid/key/single-open-bracket.stderr":"917c0203d1e45309fcff82ce33fdd2d989f630fb99290a40cb9e08a6f7ca0ef8","tests/fixtures/invalid/key/space.stderr":"3a5fa712d667890678873e3d4e4cabb084c67091c5ec6155355d5bd4229585dc","tests/fixtures/invalid/key/special-character.stderr":"4c50f72298f2fac70ee4538438dc9ca56c33efac1eed33a370bb7d045ccfb921","tests/fixtures/invalid/key/start-bracket.stderr":"223d8a22bf34459cd9bcb993ae2a51ab3cc436674e3367e92f7d74e9f8710a45","tests/fixtures/invalid/key/start-dot.stderr":"f9366a1492ae24fd0721724b4039d2675e91219de564aff2826adefd83fac571","tests/fixtures/invalid/key/two-equals-1.stderr":"a0aae899cfa75df41104a4d3090a309fc7ebcd95bb5a944cf742f3d3fc9d4782","tests/fixtures/invalid/key/two-equals-2.stderr":"861826b9456ab3a74f63f5c555e13d959a3991dfa6ce126ae5ed14d43f7dcee1","tests/fixtures/invalid/key/two-equals-3.stderr":"71614864344e321ac5de238b7ef9d097c6d7f3ac3eee4118d96827b4b8bd6658","tests/fixtures/invalid/key/without-value-1.stderr":"16c2823a39a82c3c27e0959a691b7a95e3392d62195884697893d373b967b9c0","tests/fixtures/invalid/key/without-value-2.stderr":"d340f94f5d96f5730ab269db7ef27aca171d64e35af1181c474d75a7d11d6590","tests/fixtures/invalid/key/without-value-3.stderr":"3cf3072fe9206bfe6c682103d0414627a5a63db4c4a319cf37efeb5fe6b92007","tests/fixtures/invalid/key/without-value-4.stderr":"07132bec96e9a9a672bafdc3c448b7c596257245f8c3e2cae04641f9798644ec","tests/fixtures/invalid/key/without-value-5.stderr":"37dc02af5ab8a30161223d44ed05c99ba742a658598a1b94ff78ed09afd9b11b","tests/fixtures/invalid/key/without-value-6.stderr":"00b623259f9c58fdfbe6753978fe2a71653bed0dda5c4ce54cb2151e8f7a6a29","tests/fixtures/invalid/key/without-value-7.stderr":"5013036b7f53013f887f670c3a3ceca6358d89e6b83b27bea9aa4447fba083a4","tests/fixtures/invalid/local-date/feb-29.stderr":"49fc14bfe63430553b173e82b84fb964a8bd93eeaf8abb28ed94f92a061e0026","tests/fixtures/invalid/local-date/feb-30.stderr":"1ae91b3300919e07b64c5c5b6572be05dccba63854df52ed71a900d190a90900","tests/fixtures/invalid/local-date/mday-over.stderr":"851f565b0537d5f2d88829c62d632d7dc5841d9843a1244568ea7382d5b05857","tests/fixtures/invalid/local-date/mday-under.stderr":"34c1e1d9e5839a2a8ccfaecbf52b3f49e1a776cb17de9187c3e79cb618ac684f","tests/fixtures/invalid/local-date/month-over.stderr":"d6ec78690f874b4c99cde7e609775abdf4f00ba758216afee355f6baa2c7c010","tests/fixtures/invalid/local-date/month-under.stderr":"c6922666b726822f6ffeca857041eec16cf387f54d3b6d9c325935c1c116aa5c","tests/fixtures/invalid/local-date/no-leads-with-milli.stderr":"03ff73112eae42e69f54f80445582775309400ce7f179bd9d28043299d5da826","tests/fixtures/invalid/local-date/no-leads.stderr":"12d98e610ca2c2e04fff563f9ba2b12f5e53937df1ced544c8082fa4f64522e0","tests/fixtures/invalid/local-date/trailing-t.stderr":"87a15cd62bbe7cba2b942fe424c045ce30a12fe439a1b49587a5cc037ffa6b09","tests/fixtures/invalid/local-date/y10k.stderr":"7c5cef8b079e2e6adbb7c723a1e75f04ac1185975113e79ff6a6352e07908867","tests/fixtures/invalid/local-datetime/feb-29.stderr":"692c0e78fd9ee1e979dc32bed3ed9d3d10a4608090b4d242e379d40a9732c2ab","tests/fixtures/invalid/local-datetime/feb-30.stderr":"330e20a8e3d95195227c3e66861f013b70fc02010107c9d0a11085bd533b49cc","tests/fixtures/invalid/local-datetime/hour-over.stderr":"a095bf7be4a76d0c9362d5e4398d5783aa1545ec03f910a2c6a1709a3f60225c","tests/fixtures/invalid/local-datetime/mday-over.stderr":"cd707915cf15690dcc65868408f115bc90da19beae1fbd0a7fce8d02ce76300d","tests/fixtures/invalid/local-datetime/mday-under.stderr":"fd8ac4e2804d96d6b7f63eb1616096bdcc3ecc2b74d75c3fc4bd98f2f3af205b","tests/fixtures/invalid/local-datetime/minute-over.stderr":"95fef6b0821ffe465ea5ce27a4f1521a4309cc64ee03e2781e63ead3003cfc62","tests/fixtures/invalid/local-datetime/month-over.stderr":"f739e1cb0538ab5e3cd0923165d54bebe10a6cee1cd773129230d508af946901","tests/fixtures/invalid/local-datetime/month-under.stderr":"cc1749c4aaa0cec5e88a2cae52bf84da2e862b6d2dae2c46615eafa0b7f370bc","tests/fixtures/invalid/local-datetime/no-leads-with-milli.stderr":"d1d95c88dcbde166b3a89c562e87bb9dc7c7d4efb5aaf999f0c253b1109ffd2a","tests/fixtures/invalid/local-datetime/no-leads.stderr":"8be255d1f994769e4cb9fdc6b4b6d65ad2664348026e409026421be423150076","tests/fixtures/invalid/local-datetime/no-secs.stderr":"019be93baccb4283a186cfb846b8cd4c848a373319daf4955ab3bec451a7b730","tests/fixtures/invalid/local-datetime/no-t.stderr":"eca57151e4e310f22620f243582486fb3e5ade13e4d4a5fb4582252fd915ca04","tests/fixtures/invalid/local-datetime/second-over.stderr":"dad38092a29679601af7ae3b05960068fa0eec5a649858ab88aedaada6ffff00","tests/fixtures/invalid/local-datetime/time-no-leads.stderr":"b3282cb32386dd84a35468f488be5a92dd3488e951f9dd2ea39057046386b73e","tests/fixtures/invalid/local-datetime/y10k.stderr":"ebb06f456d5e909af5f41fffa29c3f42eea70d91a97769716da5c75de9f75ac0","tests/fixtures/invalid/local-time/hour-over.stderr":"e5aefc4baa094437e16b5a78c89df8469ac59d899433e1c0fcbf433344b3a4f9","tests/fixtures/invalid/local-time/minute-over.stderr":"b66ec93e63f27d0a4e63c0eb1fc2d3f8dbf2fc916e213192852b1b7ac0e21aa7","tests/fixtures/invalid/local-time/no-secs.stderr":"d9939a2e05d15375d4936c6ad7c4dbd13085e638573094f3a0befd9027c0a3ab","tests/fixtures/invalid/local-time/second-over.stderr":"f14b188fb85d8818ab953f2fa0d0b8de906dddc2f0e0ccf5ef68b3e81d619f20","tests/fixtures/invalid/local-time/time-no-leads-2.stderr":"f725d49ddb5af69b7285f071d68e3d8441d5e331adcfd8c025c1f3cbb68028a5","tests/fixtures/invalid/local-time/time-no-leads.stderr":"cf06f3847f3d14655a94d8cfd5a6984dc74115b1d3cdbee0662ef215738bbf65","tests/fixtures/invalid/spec/inline-table-2-0.stderr":"5ad1a938b1d1f0f3fdbd1871efdebfd30e136407ecdd9e2eff22150d00624b3f","tests/fixtures/invalid/spec/inline-table-3-0.stderr":"fcbc05e911b7db81bd918768fe98a51a7026fd476d616718cc417d2f08bcc1a1","tests/fixtures/invalid/spec/key-value-pair-1.stderr":"d5391142dfd56040840cf91b1e28e3c048229e3d9998534d41001cd6657f9bd6","tests/fixtures/invalid/spec/keys-2.stderr":"3c4ee6066fc75d2c1f1b325f618a01113694c318e330ff4f237e89127f332c87","tests/fixtures/invalid/spec/string-4-0.stderr":"910ee4b240159b828a7509c8dfb46507071a8d8636f3935a3914d6d91f315295","tests/fixtures/invalid/spec/string-7-0.stderr":"5128f0a930b3034e494a6bee4f384a587e9fd858b25f8cc529a488c94ee9670d","tests/fixtures/invalid/spec/table-9-0.stderr":"49dac70d337266f5c6b333fee468f279fed1bff62bfb4ec7436c8b6683ce0dd2","tests/fixtures/invalid/spec/table-9-1.stderr":"d9e071c70356c01b6537f876989ad2067e7773dd5eb24a298439d192dbad12d0","tests/fixtures/invalid/string/bad-byte-escape.stderr":"14f6ae446b3b8cb434267eba11c6ec5a1badef4f867169b173698cf9f1a29d95","tests/fixtures/invalid/string/bad-concat.stderr":"499219633467b9174471db40543ca188e2b906c470e511d2f701f5f5475d96be","tests/fixtures/invalid/string/bad-escape-1.stderr":"34a15ce7012217c62d31d5392038517c216f0cbfd5d75fb5f3c2bb07afd3f25c","tests/fixtures/invalid/string/bad-escape-2.stderr":"955aab40b16043c847d85d04e6adcd093c930dd8416d29c2ab5953c077eac6f4","tests/fixtures/invalid/string/bad-escape-3.stderr":"ef8302d7a6f9b8beb54478756a6069dfafc203f640a4afa2a58fbf13fdb35b8b","tests/fixtures/invalid/string/bad-hex-esc-1.stderr":"aea935cf1e17743356e6fb1059afed2d0ee5262906594782e5537a025398038e","tests/fixtures/invalid/string/bad-hex-esc-2.stderr":"deac5217cf80acc759e1b40c43f5f56431b276dc2c896aae5490d57583105e06","tests/fixtures/invalid/string/bad-hex-esc-3.stderr":"94ecf886427e8fe5daf1d8f932bf1887f2533b10bc1f57cb6de03ea28fef466f","tests/fixtures/invalid/string/bad-hex-esc-4.stderr":"382b011dd4070554ee875fde06703d8332ef6ad36f3619f3536b0a4997ee2745","tests/fixtures/invalid/string/bad-hex-esc-5.stderr":"a8a039fae822eda68591da28ff2a117b5d85e99d066e9126ebbb6426a1cad52d","tests/fixtures/invalid/string/bad-multiline.stderr":"141e5770190dd184bb1f64f6bb14fc017210bbd918ab5c8b7a3d80b86b21772b","tests/fixtures/invalid/string/bad-slash-escape.stderr":"d62f894ee166bddf84432507fb4ba56473c0a230fd88a3ccc2b199a72a34e613","tests/fixtures/invalid/string/bad-uni-esc-1.stderr":"b7d8a7f41600a6fc5cef5fd938fab31e1a516b5075bb5f6b22ee77e49bbeb195","tests/fixtures/invalid/string/bad-uni-esc-2.stderr":"5c23cec7a912ccba77180889e44dd84287fbbfdb170367146e9d633637124052","tests/fixtures/invalid/string/bad-uni-esc-3.stderr":"744574793d570b012ee2aa537405af14612183b769e425a04bd0c0ec6e14da7c","tests/fixtures/invalid/string/bad-uni-esc-4.stderr":"16543872b51db7ff6a87cdf1ae71917857e5118b90ceb3e0835525c9bd67d02d","tests/fixtures/invalid/string/bad-uni-esc-5.stderr":"f0ef02d2988680da67942d8599e7753f2e6c89a984643000a67ebf4c34722374","tests/fixtures/invalid/string/bad-uni-esc-6.stderr":"eff7b6dd907132aa9598dca52bf12d48be066a6a8d426ce95d5f4b344bfe8d98","tests/fixtures/invalid/string/bad-uni-esc-7.stderr":"24cd2f58919584c4dd12f0262933c8c0c6142a2b62c747d465ca1b9b4986093c","tests/fixtures/invalid/string/basic-byte-escapes.stderr":"b42fd0273c7438bf13ddea9552204bb9209cdcc8e4151311d2446185d2cd546a","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-1.stderr":"725cd4955987c3d6e736832281316d6c1a2446303e9a1dc78900cef4bb84ee64","tests/fixtures/invalid/string/basic-multiline-out-of-range-unicode-escape-2.stderr":"c6698fbdb95188d53bfdaa4a4f590d86a73aafcc321a5d9511ab43ce51be1c78","tests/fixtures/invalid/string/basic-multiline-quotes.stderr":"28177a49532f22aaffc9dc204592a2c5eca2fc20f8e208b7c7f589201e8b7de5","tests/fixtures/invalid/string/basic-multiline-unknown-escape.stderr":"a83406b30eb3ab2cebb0230d8d65d0b7583885138f2c070976ae61de2c8b17f3","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-1.stderr":"19af67599c6c2eef340c9fdb0ab2cc788928def50280af939247a1274447781f","tests/fixtures/invalid/string/basic-out-of-range-unicode-escape-2.stderr":"0e2e1a69358502ec17a07e4fc151b70e8a3b5123798cb38f98fe2d146515a84e","tests/fixtures/invalid/string/basic-unknown-escape.stderr":"1de467948fb18f61336350063701d9c5a6615054fe740a9be650f71f5ca4236b","tests/fixtures/invalid/string/literal-multiline-quotes-1.stderr":"249123229606aa8eedff1b5bdead5022daf470e47dbca639e32019d1d61dbcf9","tests/fixtures/invalid/string/literal-multiline-quotes-2.stderr":"d9784af1ff056a90bf531307749d53a5d24ffffbc0f4aada7fcee417a50d1615","tests/fixtures/invalid/string/missing-quotes.stderr":"462f24701d2c51d36b18d06b69be2f6eb36449b5f3ffbaa737fcbd2b2151ae4a","tests/fixtures/invalid/string/multiline-bad-escape-1.stderr":"18469c4d37d011b3f30ae17e3111b5e8a9526d593475e5d8d7a9b19461a40e8d","tests/fixtures/invalid/string/multiline-bad-escape-2.stderr":"d43896d3005c8470dc8149e2b74eb8825c6d9fedfe9f48125ad88a95c1dc3035","tests/fixtures/invalid/string/multiline-bad-escape-3.stderr":"92f732c6bcb922e25d2a001a389f93b596dd0e91109cbdcb651efa146309dc2a","tests/fixtures/invalid/string/multiline-bad-escape-4.stderr":"5e549045d08a76406f29c10433766f1c32aa69a169f3dc138103b4615c9979b1","tests/fixtures/invalid/string/multiline-escape-space-1.stderr":"94b451b6c03055186777a248cb216f95a1b2e29df25549f345d96bd0a4e63f1e","tests/fixtures/invalid/string/multiline-escape-space-2.stderr":"850d75a72e44e1ceeced7d65b810afa5b2935f3ab3efea0f3e147a06d82a6637","tests/fixtures/invalid/string/multiline-lit-no-close-1.stderr":"8e81ec582e75388024196cb5a64aaccc128c874be341fba01973c722e64a0d1b","tests/fixtures/invalid/string/multiline-lit-no-close-2.stderr":"9572aa98be504bab0172f612c40010d005577a6cd30f7fb3d25ea29c73e0489a","tests/fixtures/invalid/string/multiline-lit-no-close-3.stderr":"cc89579aa2201fc3bbe98693f822516557d950a9844e68ace4355991dd02478b","tests/fixtures/invalid/string/multiline-lit-no-close-4.stderr":"2310b339cc17b8aefce9ef0e2805c77d5cce3d70abe93373ebb8f986169afe00","tests/fixtures/invalid/string/multiline-no-close-1.stderr":"d5b9602d23b0cb023fbe3ae80d862fd60332475ba8863a1e977f17cb326a4548","tests/fixtures/invalid/string/multiline-no-close-2.stderr":"e500e99a44305b1e148b211e963478cf1554f8c9536d3108390cf41d5b2ce069","tests/fixtures/invalid/string/multiline-no-close-3.stderr":"efea30ada8d63f3071be499d63a82729b8f2c3d5f6155a1dca456e7d790f84be","tests/fixtures/invalid/string/multiline-no-close-4.stderr":"30ce703d6a38d97861b37d8539648734145e6ce45c39b2dc8b970b7b34557031","tests/fixtures/invalid/string/multiline-no-close-5.stderr":"a8b6610cb194104520cdc9fdd140192b6b1c738a3fe922a9f40c21b91f82487e","tests/fixtures/invalid/string/multiline-quotes-1.stderr":"046956658c0a73e665e7a6a2044ff83c8efb8cdd8c2ab153c163eb1e61068c56","tests/fixtures/invalid/string/no-close-1.stderr":"3ad8aff0932d98592b808fc6f44fa68a854097f8025e92c11af1acb6de3d3cc7","tests/fixtures/invalid/string/no-close-2.stderr":"3438330fa63c592f316342c9786696a2426df2838d60ee52889a9dc2527ce77c","tests/fixtures/invalid/string/no-close-3.stderr":"06e62924f3e7a0d290ab2a377e6a6b96c69bafee7170feb37331d6220e956e38","tests/fixtures/invalid/string/no-close-4.stderr":"e5cacd943fec6e10430242c95b42cdd55068cc053f5b40eff38e077a70d0109a","tests/fixtures/invalid/string/string.stderr":"aea935cf1e17743356e6fb1059afed2d0ee5262906594782e5537a025398038e","tests/fixtures/invalid/string/text-after-string.stderr":"1c1e4677be8d3dba0e7933b3ed1cbb6e0bcf6f600cf9a989a7b09c9424a4d0a7","tests/fixtures/invalid/string/wrong-close.stderr":"441f4f1b73c11c8dbf2f73cf9a7766f17a9517b3b9142e86736ed43eaec07f18","tests/fixtures/invalid/table/append-to-array-with-dotted-keys.stderr":"e16e10a17e38898bfff5b16887d9143fa5036669e83b75e84aa4ba4078b1a9a8","tests/fixtures/invalid/table/append-with-dotted-keys-1.stderr":"a67f1f152005295e0a1bb3dcaaa755edd05f19ac5316b8ad2eb4d45797e0f770","tests/fixtures/invalid/table/append-with-dotted-keys-2.stderr":"72d9ea8a90b4d9e5319c2bf951bdde6a87a205612e82ed5a09cea2b706bfde7f","tests/fixtures/invalid/table/array-empty.stderr":"e8a41c60adf7756361920816b6c4f44125a813c869b71fae2c98473e4da1b231","tests/fixtures/invalid/table/array-implicit.stderr":"7797ce41aab0567fc9d40e277cc32c12e1f16ffc0e73857fdb3bbf754246305f","tests/fixtures/invalid/table/array-no-close-1.stderr":"5f1e8703d59398f6595d21ed0abcc7dc3ce77943ad0f71eede9ad63ea2bcc7c1","tests/fixtures/invalid/table/array-no-close-2.stderr":"5adeffef5a1e1d63b6461f2a734a5b557bd3709e4fde903262be0452890623a6","tests/fixtures/invalid/table/duplicate-key-dotted-array.stderr":"9158eaf24fd4237fb87a6fb9be00e18ea935cb509a657bfe370cfa769e97cef6","tests/fixtures/invalid/table/duplicate-key-dotted-table.stderr":"ca58908463cbe2ec6b3de314237c178fee64245cc738c72a7b9e08bb3d02b2b0","tests/fixtures/invalid/table/duplicate-key-dotted-table2.stderr":"cb59f2ed324642de947f3cd9373ca111ec35104a5f33578f64c48084ce1a84f5","tests/fixtures/invalid/table/duplicate-key-table.stderr":"f4816522738b3e2ace87d1100a3d73e6a122d8dc67d05e0b35a1438e16a8952c","tests/fixtures/invalid/table/duplicate-table-array.stderr":"11d293e4b4f205fc98cd892f25a25f533cb922c963ecf095a932d2e9d550be4f","tests/fixtures/invalid/table/duplicate-table-array2.stderr":"fa9cd3b1212eed14ec56b66a16471ac2f7c0398d743982abb7c5cb4b5c7a5fe4","tests/fixtures/invalid/table/duplicate.stderr":"3e6d1b1a2f44d449e8cb0098e7c40ad1e755363b446f3821c399abfb26eb9939","tests/fixtures/invalid/table/empty-implicit-table.stderr":"cd3606ce97c5537d18146cd978403636a65fa703c83616da75b8cafa86e8fa24","tests/fixtures/invalid/table/empty.stderr":"4399e419abbcfbec93f5915e7fbdd11b6e462a4c066a29eacda159abfc588734","tests/fixtures/invalid/table/equals-sign.stderr":"472de6b908a03c99637b635a3a898ed956684ae422e1b4b135ec94986ea45f2d","tests/fixtures/invalid/table/llbrace.stderr":"db6bbee7ed15994398901c46ed4b40904897e71f5d972deb7904ccac49cd834e","tests/fixtures/invalid/table/nested-brackets-close.stderr":"e1dff60ea8f77dd1b8fae7d1d63c788c838c80560172d92377cc168f5cb5923a","tests/fixtures/invalid/table/nested-brackets-open.stderr":"bd58eb0630dc0c51ebc288258d360d707c8f43a5877ddc21e9420f8eb76a2f4c","tests/fixtures/invalid/table/no-close-1.stderr":"ae6326db737d2e259c051fbe3f5aa6ef7d7ec1bd47930ea78e09667a20100a72","tests/fixtures/invalid/table/no-close-2.stderr":"4b26e3e14f79c37d8e4e4c6ca69ae62868b3f2f249fb8f57abdcb6b8132a553e","tests/fixtures/invalid/table/no-close-3.stderr":"6bf7e2d30c735a55f595140af7c7f6be89b6faf868f4473ea39570fdb87d5823","tests/fixtures/invalid/table/no-close-4.stderr":"917c0203d1e45309fcff82ce33fdd2d989f630fb99290a40cb9e08a6f7ca0ef8","tests/fixtures/invalid/table/no-close-5.stderr":"c1a691a6fa9638b75010f37166c29a6e5a2da2e35bd9a321118d7ea384af2d77","tests/fixtures/invalid/table/overwrite-array-in-parent.stderr":"300782a740fff829dfe485a4a43426a53f82bb6afca63ef82fc07081c43d8707","tests/fixtures/invalid/table/overwrite-bool-with-array.stderr":"dcd33263a49a91ed583c3f53c6e86d6c5b8d493d841aea074a5a81f57cb5c152","tests/fixtures/invalid/table/overwrite-with-deep-table.stderr":"b128988d3a37f5857c41751847ed0d9590e4cbda66a55238f73c60d992749e41","tests/fixtures/invalid/table/redefine-1.stderr":"3e794bce5bb6ae9f603f50e3dc62d136701ec478078e8a8e99c94229778e24ca","tests/fixtures/invalid/table/redefine-2.stderr":"76a6fa1ea8d5da8a78aecb88c506dcf4e07906984baa8c9d1a363b2bebfa4281","tests/fixtures/invalid/table/redefine-3.stderr":"6ebf320d6d2117c189dd8d425303a66739a4813e4abef2d3184dc9ef5915d959","tests/fixtures/invalid/table/rrbrace.stderr":"342a5ff362c8b4c1e85a6442029291bd33165a3b36552794fcd5269249bf36a1","tests/fixtures/invalid/table/super-twice.stderr":"78b95be29fe54e92ebc82d8b35e0d59f5b9796f323b7434a49daf72d0f0be02e","tests/fixtures/invalid/table/text-after-table.stderr":"6dfaf1fc3199f0602fea52f7b1c65869eb2f8643b9e90dc1e718a183fb972485","tests/fixtures/invalid/table/whitespace.stderr":"fa48d4dc83f92e729dc25c6fc6a0c336014391b4bdb3392998f18141d2deb350","tests/fixtures/invalid/table/with-pound.stderr":"97dbd1ceb7f357bd98cc1caa9a602c638aaa5831237b7d63b18153acc64d3af4","tests/invalid.rs":"3fc6ee10d5fbe44bfa105a52909955637b3ce8d587f23994ff8a47636680676f","tests/testsuite/convert.rs":"f27d5a28ae0bb918293d7542c2b2928cc9b5f2eae4a6909479f24e05ba4d63f6","tests/testsuite/datetime.rs":"6033aa2c78c5c71bd7025ad323ad48d1cde158fb27ae890136f3d0f4e52fb1dd","tests/testsuite/edit.rs":"59e1344044112396335c71cbf800be15e0ac993c0837036830e420a5cae00aef","tests/testsuite/float.rs":"4a572ec1ec6ed66c8010081dc550ec3d1bf24666fa787883b4f2f541b576c91d","tests/testsuite/invalid.rs":"90dbd8e2b14fdb571c8445f2c49973006dd9096ed3ce3caca40b1cf5947a980b","tests/testsuite/main.rs":"b78ad4077facdf0e31ef77355fb3deb70d8339befbdb9ef16abca3b05231556e","tests/testsuite/parse.rs":"3250ba996befd939ee34c8e1fb89812dd3a83bebc933ff4ba7dcdac883bf36dd","tests/testsuite/stackoverflow.rs":"4cf1fdb26c3fd4e88eed5f6d49e8be866e56f43f4f8bc85d547f9630391272e9"},"package":"583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"}
\ No newline at end of file

crates/toml_edit/Android.bp

diff --git a/crates/toml_edit/Android.bp b/crates/toml_edit/Android.bp
index ad28523..57335f5 100644
--- a/crates/toml_edit/Android.bp
+++ b/crates/toml_edit/Android.bp
@@ -17,7 +17,7 @@
     name: "libtoml_edit",
     crate_name: "toml_edit",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.22.4",
+    cargo_pkg_version: "0.22.20",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [

crates/toml_edit/Cargo.lock

diff --git a/crates/toml_edit/Cargo.lock b/crates/toml_edit/Cargo.lock
index 15a049c..4e2e80e 100644
--- a/crates/toml_edit/Cargo.lock
+++ b/crates/toml_edit/Cargo.lock
@@ -4,88 +4,123 @@
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
- "anstyle-wincon",
+ "anstyle-wincon 1.0.2",
  "colorchoice",
  "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
-name = "anstyle"
-version = "1.0.0"
+name = "anstream"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon 3.0.3",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "anstyle-wincon"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
- "memchr",
+ "anstyle",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "cc"
-version = "1.0.73"
+name = "autocfg"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bstr"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+dependencies = [
+ "memchr",
+ "serde",
+]
 
 [[package]]
 name = "cfg-if"
@@ -95,92 +130,74 @@
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
- "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "clap"
-version = "4.0.32"
+version = "4.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
+checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
- "clap_lex",
- "is-terminal",
  "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e"
+dependencies = [
+ "anstream 0.3.2",
+ "anstyle",
+ "clap_lex",
  "strsim",
- "termcolor",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.0.21"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.105",
+ "syn",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
- "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -193,58 +210,65 @@
 ]
 
 [[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "globset"
-version = "0.4.9"
+name = "getrandom"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "globset"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "ignore"
-version = "0.4.18"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
 dependencies = [
- "crossbeam-utils",
  "globset",
  "lazy_static",
  "log",
@@ -277,41 +301,39 @@
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.3"
+name = "is-terminal"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
+ "hermit-abi",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.7"
+name = "is_terminal_polyfill"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "b52b2de84ed0341893ce61ca1af04fa54eea0a764ecc38c6855cc5db84dc1927"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.48.0",
+ "is-terminal",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.3"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "kstring"
@@ -330,26 +352,21 @@
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libtest-mimic"
-version = "0.6.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa"
-dependencies = [
- "clap",
- "termcolor",
- "threadpool",
-]
-
-[[package]]
-name = "libtest-mimic"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0f4c6f44ecfd52e8b443f2ad18f2b996540135771561283c2352ce56a1c70b"
+checksum = "cc0bda45ed5b3a2904262c1bb91e526127aa70e7ef3758aba2ef93cf896b9b58"
 dependencies = [
  "clap",
  "escape8259",
@@ -359,24 +376,21 @@
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "normalize-line-endings"
@@ -385,93 +399,137 @@
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.3.0"
+name = "ppv-lite86"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.105",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.33"
+name = "proptest"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "regex"
-version = "1.6.0"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -480,35 +538,46 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rustix"
-version = "0.37.7"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -521,29 +590,29 @@
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
  "itoa",
  "ryu",
@@ -552,29 +621,27 @@
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "similar"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 
 [[package]]
 name = "snapbox"
-version = "0.4.11"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835"
+checksum = "40e14d10e4c2b4331ac24c33baa5a03e1fbca81c045b285b53b2a612d28569fb"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
  "anstyle",
- "ignore",
- "libtest-mimic 0.6.0",
  "normalize-line-endings",
  "similar",
  "snapbox-macros",
@@ -582,11 +649,11 @@
 
 [[package]]
 name = "snapbox-macros"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31"
+checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
 ]
 
 [[package]]
@@ -603,9 +670,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "2.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -613,31 +680,33 @@
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.41"
+name = "tempfile"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
@@ -652,9 +721,9 @@
 
 [[package]]
 name = "toml-test"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec3892835fb31e181a87e1758275a64b0d7c6c9e9618aeb61a647bd487314c0"
+checksum = "f9e26681e9154ffb40044019b6bb374f6ed7fef1e367d3d314f0daf2b00faba9"
 dependencies = [
  "chrono",
  "ryu",
@@ -664,41 +733,42 @@
 
 [[package]]
 name = "toml-test-data"
-version = "1.8.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b5bad99e813ce8c67d1d67c9b9f37c8451933f45eae0ab2b3583975f1cc15d"
+checksum = "13bb6bf962107303ade738a8f729f4f92c29b2d84c0772cc376f7001602afa1a"
 dependencies = [
  "include_dir",
 ]
 
 [[package]]
 name = "toml-test-harness"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be4b8d761dee51b4694e9f1d622a1d7f9c135a8b8265459e16d09ac5b16a05d"
+checksum = "0ad65271b9325d4727b1afb346e2eb4cade8e998797682da4e73b7b6d902f2b2"
 dependencies = [
  "ignore",
- "libtest-mimic 0.6.0",
+ "libtest-mimic",
  "toml-test",
  "toml-test-data",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.4"
+version = "0.22.20"
 dependencies = [
  "indexmap",
  "kstring",
- "libtest-mimic 0.7.0",
+ "libtest-mimic",
+ "proptest",
  "serde",
  "serde_json",
  "serde_spanned",
@@ -710,10 +780,16 @@
 ]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.4"
+name = "unarray"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "utf8parse"
@@ -722,75 +798,37 @@
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "wait-timeout"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -799,128 +837,144 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.5.0"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]

crates/toml_edit/Cargo.toml

diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml
index 2e27069..ac59843 100644
--- a/crates/toml_edit/Cargo.toml
+++ b/crates/toml_edit/Cargo.toml
@@ -11,13 +11,14 @@
 
 [package]
 edition = "2021"
-rust-version = "1.69"
+rust-version = "1.65"
 name = "toml_edit"
-version = "0.22.4"
+version = "0.22.20"
 authors = [
     "Andronik Ordian <write@reusable.software>",
     "Ed Page <eopage@gmail.com>",
 ]
+build = false
 include = [
     "build.rs",
     "src/**/*",
@@ -29,7 +30,10 @@
     "examples/**/*",
     "tests/**/*",
 ]
+autobins = false
+autoexamples = false
 autotests = false
+autobenches = false
 description = "Yet another format-preserving TOML parser."
 readme = "README.md"
 keywords = [
@@ -90,8 +94,13 @@
 [Unreleased]: https://github.com/toml-rs/toml/compare/{{tag_name}}...HEAD"""
 search = "<!-- next-url -->"
 
+[lib]
+name = "toml_edit"
+path = "src/lib.rs"
+
 [[example]]
 name = "visit"
+path = "examples/visit.rs"
 test = true
 required-features = [
     "parse",
@@ -99,19 +108,14 @@
 ]
 
 [[test]]
-name = "testsuite"
-required-features = [
-    "parse",
-    "display",
-]
-
-[[test]]
 name = "decoder_compliance"
+path = "tests/decoder_compliance.rs"
 harness = false
 required-features = ["parse"]
 
 [[test]]
 name = "encoder_compliance"
+path = "tests/encoder_compliance.rs"
 harness = false
 required-features = [
     "parse",
@@ -120,8 +124,20 @@
 
 [[test]]
 name = "invalid"
+path = "tests/invalid.rs"
 harness = false
-required-features = ["parse"]
+required-features = [
+    "parse",
+    "display",
+]
+
+[[test]]
+name = "testsuite"
+path = "tests/testsuite/main.rs"
+required-features = [
+    "parse",
+    "display",
+]
 
 [dependencies.indexmap]
 version = "2.0.0"
@@ -137,29 +153,31 @@
 optional = true
 
 [dependencies.serde_spanned]
-version = "0.6.5"
+version = "0.6.7"
 features = ["serde"]
 optional = true
 
 [dependencies.toml_datetime]
-version = "0.6.5"
+version = "0.6.8"
 
 [dependencies.winnow]
-version = "0.5.0"
+version = "0.6.18"
 optional = true
 
 [dev-dependencies.libtest-mimic]
-version = "0.7.0"
+version = "0.7.2"
+
+[dev-dependencies.proptest]
+version = "1.5.0"
 
 [dev-dependencies.serde_json]
-version = "1.0.96"
+version = "1.0.116"
 
 [dev-dependencies.snapbox]
-version = "0.4.11"
-features = ["harness"]
+version = "0.6.0"
 
 [dev-dependencies.toml-test-data]
-version = "1.8.0"
+version = "1.11.0"
 
 [dev-dependencies.toml-test-harness]
 version = "0.4.8"
@@ -178,3 +196,73 @@
     "dep:serde_spanned",
 ]
 unbounded = []
+
+[lints.clippy]
+bool_assert_comparison = "allow"
+branches_sharing_code = "allow"
+checked_conversions = "warn"
+collapsible_else_if = "allow"
+create_dir = "warn"
+dbg_macro = "warn"
+debug_assert_with_mut_call = "warn"
+doc_markdown = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+expl_impl_clone_on_copy = "warn"
+explicit_deref_methods = "warn"
+explicit_into_iter_loop = "warn"
+fallible_impl_from = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+float_cmp_const = "warn"
+fn_params_excessive_bools = "warn"
+from_iter_instead_of_collect = "warn"
+if_same_then_else = "allow"
+implicit_clone = "warn"
+imprecise_flops = "warn"
+inconsistent_struct_constructor = "warn"
+inefficient_to_string = "warn"
+infinite_loop = "warn"
+invalid_upcast_comparisons = "warn"
+large_digit_groups = "warn"
+large_stack_arrays = "warn"
+large_types_passed_by_value = "warn"
+let_and_return = "allow"
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+mem_forget = "warn"
+mutex_integer = "warn"
+needless_continue = "warn"
+needless_for_each = "warn"
+negative_feature_names = "warn"
+path_buf_push_overwrite = "warn"
+ptr_as_ptr = "warn"
+rc_mutex = "warn"
+redundant_feature_names = "warn"
+ref_option_ref = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+same_functions_in_if_condition = "warn"
+self_named_module_files = "warn"
+semicolon_if_nothing_returned = "warn"
+str_to_string = "warn"
+string_add = "warn"
+string_add_assign = "warn"
+string_lit_as_bytes = "warn"
+string_to_string = "warn"
+todo = "warn"
+trait_duplication_in_bounds = "warn"
+verbose_file_reads = "warn"
+wildcard_imports = "warn"
+zero_sized_map_values = "warn"
+
+[lints.rust]
+unreachable_pub = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+unused_lifetimes = "warn"
+unused_macro_rules = "warn"
+unused_qualifications = "warn"
+
+[lints.rust.rust_2018_idioms]
+level = "warn"
+priority = -1

crates/toml_edit/METADATA

diff --git a/crates/toml_edit/METADATA b/crates/toml_edit/METADATA
index ab7f1ff..80c7320 100644
--- a/crates/toml_edit/METADATA
+++ b/crates/toml_edit/METADATA
@@ -1,17 +1,17 @@
 name: "toml_edit"
 description: "Yet another format-preserving TOML parser."
 third_party {
-  version: "0.22.4"
+  version: "0.22.20"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 7
+    year: 2025
+    month: 1
+    day: 14
   }
   homepage: "https://crates.io/crates/toml_edit"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/toml_edit/toml_edit-0.22.4.crate"
-    version: "0.22.4"
+    value: "https://static.crates.io/crates/toml_edit/toml_edit-0.22.20.crate"
+    version: "0.22.20"
   }
 }

crates/toml_edit/examples/visit.rs

diff --git a/crates/toml_edit/examples/visit.rs b/crates/toml_edit/examples/visit.rs
index cd7f851..3f52334 100644
--- a/crates/toml_edit/examples/visit.rs
+++ b/crates/toml_edit/examples/visit.rs
@@ -1,9 +1,9 @@
 //! Example for how to use `VisitMut` to iterate over a table.
 
 use std::collections::BTreeSet;
-use toml_edit::visit::*;
-use toml_edit::visit_mut::*;
-use toml_edit::{Array, Document, InlineTable, Item, KeyMut, Table, Value};
+use toml_edit::visit::{visit_table_like_kv, Visit};
+use toml_edit::visit_mut::{visit_table_like_kv_mut, visit_table_mut, VisitMut};
+use toml_edit::{Array, DocumentMut, InlineTable, Item, KeyMut, Table, Value};
 
 /// This models the visit state for dependency keys in a `Cargo.toml`.
 ///
@@ -159,7 +159,7 @@
     }
 }
 
-/// This is the input provided to visit_mut_example.
+/// This is the input provided to `visit_mut_example`.
 static INPUT: &str = r#"
 [package]
 name = "my-package"
@@ -195,7 +195,7 @@
 version = "0.4"
 "#;
 
-/// This is the output produced by visit_mut_example.
+/// This is the output produced by `visit_mut_example`.
 #[cfg(test)]
 static VISIT_MUT_OUTPUT: &str = r#"
 [package]
@@ -223,7 +223,7 @@
 flate2 = { version = "0.4" }
 "#;
 
-fn visit_example(document: &Document) -> BTreeSet<&str> {
+fn visit_example(document: &DocumentMut) -> BTreeSet<&str> {
     let mut visitor = DependencyNameVisitor {
         state: VisitState::Root,
         names: BTreeSet::new(),
@@ -234,7 +234,7 @@
     visitor.names
 }
 
-fn visit_mut_example(document: &mut Document) {
+fn visit_mut_example(document: &mut DocumentMut) {
     let mut visitor = NormalizeDependencyTablesVisitor {
         state: VisitState::Root,
     };
@@ -243,7 +243,7 @@
 }
 
 fn main() {
-    let mut document: Document = INPUT.parse().expect("input is valid TOML");
+    let mut document: DocumentMut = INPUT.parse().expect("input is valid TOML");
 
     println!("** visit example");
     println!("{:?}", visit_example(&document));
@@ -256,7 +256,7 @@
 #[cfg(test)]
 #[test]
 fn visit_correct() {
-    let document: Document = INPUT.parse().expect("input is valid TOML");
+    let document: DocumentMut = INPUT.parse().expect("input is valid TOML");
 
     let names = visit_example(&document);
     let expected = vec![
@@ -277,7 +277,7 @@
 #[cfg(test)]
 #[test]
 fn visit_mut_correct() {
-    let mut document: Document = INPUT.parse().expect("input is valid TOML");
+    let mut document: DocumentMut = INPUT.parse().expect("input is valid TOML");
 
     visit_mut_example(&mut document);
     assert_eq!(format!("{}", document), VISIT_MUT_OUTPUT);

crates/toml_edit/src/array.rs

diff --git a/crates/toml_edit/src/array.rs b/crates/toml_edit/src/array.rs
index 377f676..3e69d5c 100644
--- a/crates/toml_edit/src/array.rs
+++ b/crates/toml_edit/src/array.rs
@@ -87,8 +87,10 @@
         &self.decor
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.span.clone()
     }
 
@@ -130,7 +132,7 @@
         self.values.len()
     }
 
-    /// Return true iff `self.len() == 0`.
+    /// Return true if `self.len() == 0`.
     ///
     /// # Examples
     ///
@@ -148,7 +150,7 @@
 
     /// Clears the array, removing all values. Keeps the allocated memory for reuse.
     pub fn clear(&mut self) {
-        self.values.clear()
+        self.values.clear();
     }
 
     /// Returns a reference to the value at the given index, or `None` if the index is out of
@@ -174,8 +176,8 @@
     /// ```
     pub fn push<V: Into<Value>>(&mut self, v: V) {
         self.value_op(v.into(), true, |items, value| {
-            items.push(Item::Value(value))
-        })
+            items.push(Item::Value(value));
+        });
     }
 
     /// Appends a new, already formatted value to the end of the array.
@@ -211,8 +213,8 @@
     /// ```
     pub fn insert<V: Into<Value>>(&mut self, index: usize, v: V) {
         self.value_op(v.into(), true, |items, value| {
-            items.insert(index, Item::Value(value))
-        })
+            items.insert(index, Item::Value(value));
+        });
     }
 
     /// Inserts an already formatted value at the given position within the array, shifting all
@@ -235,7 +237,7 @@
     /// # }
     /// ```
     pub fn insert_formatted(&mut self, index: usize, v: Value) {
-        self.values.insert(index, Item::Value(v))
+        self.values.insert(index, Item::Value(v));
     }
 
     /// Replaces the element at the given position within the array, preserving existing formatting.
@@ -350,7 +352,7 @@
                 (None, Some(_)) => std::cmp::Ordering::Less,
                 (Some(lhs), Some(rhs)) => compare(lhs, rhs),
             }
-        })
+        });
     }
 
     /// Sorts the array with a key extraction function.

crates/toml_edit/src/array_of_tables.rs

diff --git a/crates/toml_edit/src/array_of_tables.rs b/crates/toml_edit/src/array_of_tables.rs
index 2e602a2..b562f89 100644
--- a/crates/toml_edit/src/array_of_tables.rs
+++ b/crates/toml_edit/src/array_of_tables.rs
@@ -32,8 +32,10 @@
         a
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.span.clone()
     }
 
@@ -62,14 +64,14 @@
         self.values.len()
     }
 
-    /// Returns true iff `self.len() == 0`.
+    /// Returns true if `self.len() == 0`.
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
     /// Removes all the tables.
     pub fn clear(&mut self) {
-        self.values.clear()
+        self.values.clear();
     }
 
     /// Returns an optional reference to the table.

crates/toml_edit/src/de/array.rs

diff --git a/crates/toml_edit/src/de/array.rs b/crates/toml_edit/src/de/array.rs
index adc5401..eeedd7b 100644
--- a/crates/toml_edit/src/de/array.rs
+++ b/crates/toml_edit/src/de/array.rs
@@ -48,7 +48,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for ArrayDeserializer {
+impl<'de> serde::de::IntoDeserializer<'de, Error> for ArrayDeserializer {
     type Deserializer = Self;
 
     fn into_deserializer(self) -> Self::Deserializer {

crates/toml_edit/src/de/key.rs

diff --git a/crates/toml_edit/src/de/key.rs b/crates/toml_edit/src/de/key.rs
index a3b2825..d7ce30e 100644
--- a/crates/toml_edit/src/de/key.rs
+++ b/crates/toml_edit/src/de/key.rs
@@ -13,7 +13,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, Error> for KeyDeserializer {
+impl<'de> IntoDeserializer<'de, Error> for KeyDeserializer {
     type Deserializer = Self;
 
     fn into_deserializer(self) -> Self::Deserializer {
@@ -81,7 +81,7 @@
 }
 
 impl<'de> serde::de::EnumAccess<'de> for KeyDeserializer {
-    type Error = super::Error;
+    type Error = Error;
     type Variant = UnitOnly<Self::Error>;
 
     fn variant_seed<T>(self, seed: T) -> Result<(T::Value, Self::Variant), Self::Error>

crates/toml_edit/src/de/mod.rs

diff --git a/crates/toml_edit/src/de/mod.rs b/crates/toml_edit/src/de/mod.rs
index 9b8a2c7..391153f 100644
--- a/crates/toml_edit/src/de/mod.rs
+++ b/crates/toml_edit/src/de/mod.rs
@@ -16,7 +16,6 @@
 use datetime::DatetimeDeserializer;
 use key::KeyDeserializer;
 use spanned::SpannedDeserializer;
-use table::TableMapAccess;
 use table_enum::TableEnumDeserializer;
 
 pub use value::ValueDeserializer;
@@ -39,7 +38,7 @@
 
     /// Add key while unwinding
     pub fn add_key(&mut self, key: String) {
-        self.inner.add_key(key)
+        self.inner.add_key(key);
     }
 
     /// What went wrong
@@ -67,7 +66,7 @@
 }
 
 impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.inner.fmt(f)
     }
 }
@@ -86,17 +85,17 @@
 
 impl std::error::Error for Error {}
 
-/// Convert a value into `T`.
+/// Convert a TOML [documents][crate::DocumentMut] into `T`.
 #[cfg(feature = "parse")]
 pub fn from_str<T>(s: &'_ str) -> Result<T, Error>
 where
     T: DeserializeOwned,
 {
-    let de = s.parse::<Deserializer>()?;
+    let de = Deserializer::parse(s)?;
     T::deserialize(de)
 }
 
-/// Convert a value into `T`.
+/// Convert a TOML [documents][crate::DocumentMut] into `T`.
 #[cfg(feature = "parse")]
 pub fn from_slice<T>(s: &'_ [u8]) -> Result<T, Error>
 where
@@ -106,24 +105,51 @@
     from_str(s)
 }
 
-/// Convert a document into `T`.
-pub fn from_document<T>(d: crate::Document) -> Result<T, Error>
+/// Convert a [`DocumentMut`][crate::DocumentMut] into `T`.
+pub fn from_document<T>(d: impl Into<Deserializer>) -> Result<T, Error>
 where
     T: DeserializeOwned,
 {
-    let deserializer = Deserializer::new(d);
+    let deserializer = d.into();
     T::deserialize(deserializer)
 }
 
-/// Deserialization for TOML [documents][crate::Document].
-pub struct Deserializer {
-    input: crate::Document,
+/// Deserialization for TOML [documents][crate::DocumentMut].
+pub struct Deserializer<S = String> {
+    root: crate::Item,
+    raw: Option<S>,
 }
 
 impl Deserializer {
     /// Deserialization implementation for TOML.
-    pub fn new(input: crate::Document) -> Self {
-        Self { input }
+    #[deprecated(since = "0.22.6", note = "Replaced with `Deserializer::from`")]
+    pub fn new(input: crate::DocumentMut) -> Self {
+        Self::from(input)
+    }
+}
+
+#[cfg(feature = "parse")]
+impl<S: AsRef<str>> Deserializer<S> {
+    /// Parse a TOML document
+    pub fn parse(raw: S) -> Result<Self, Error> {
+        crate::ImDocument::parse(raw)
+            .map(Self::from)
+            .map_err(Into::into)
+    }
+}
+
+impl From<crate::DocumentMut> for Deserializer {
+    fn from(doc: crate::DocumentMut) -> Self {
+        let crate::DocumentMut { root, .. } = doc;
+        Self { root, raw: None }
+    }
+}
+
+impl<S> From<crate::ImDocument<S>> for Deserializer<S> {
+    fn from(doc: crate::ImDocument<S>) -> Self {
+        let crate::ImDocument { root, raw, .. } = doc;
+        let raw = Some(raw);
+        Self { root, raw }
     }
 }
 
@@ -133,27 +159,26 @@
 
     /// Parses a document from a &str
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let d = crate::parser::parse_document(s).map_err(Error::from)?;
-        Ok(Self::new(d))
+        let doc: crate::ImDocument<_> = s.parse().map_err(Error::from)?;
+        Ok(Deserializer::from(doc))
     }
 }
 
 // Note: this is wrapped by `toml::de::Deserializer` and any trait methods
 // implemented here need to be wrapped there
-impl<'de> serde::Deserializer<'de> for Deserializer {
+impl<'de, S: Into<String>> serde::Deserializer<'de> for Deserializer<S> {
     type Error = Error;
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: serde::de::Visitor<'de>,
     {
-        let original = self.input.original;
-        self.input
-            .root
+        let raw = self.raw;
+        self.root
             .into_deserializer()
             .deserialize_any(visitor)
             .map_err(|mut e: Self::Error| {
-                e.inner.set_original(original);
+                e.inner.set_raw(raw.map(|r| r.into()));
                 e
             })
     }
@@ -164,13 +189,12 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let original = self.input.original;
-        self.input
-            .root
+        let raw = self.raw;
+        self.root
             .into_deserializer()
             .deserialize_option(visitor)
             .map_err(|mut e: Self::Error| {
-                e.inner.set_original(original);
+                e.inner.set_raw(raw.map(|r| r.into()));
                 e
             })
     }
@@ -183,13 +207,12 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let original = self.input.original;
-        self.input
-            .root
+        let raw = self.raw;
+        self.root
             .into_deserializer()
             .deserialize_newtype_struct(name, visitor)
             .map_err(|mut e: Self::Error| {
-                e.inner.set_original(original);
+                e.inner.set_raw(raw.map(|r| r.into()));
                 e
             })
     }
@@ -203,13 +226,12 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let original = self.input.original;
-        self.input
-            .root
+        let raw = self.raw;
+        self.root
             .into_deserializer()
             .deserialize_struct(name, fields, visitor)
             .map_err(|mut e: Self::Error| {
-                e.inner.set_original(original);
+                e.inner.set_raw(raw.map(|r| r.into()));
                 e
             })
     }
@@ -224,13 +246,12 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        let original = self.input.original;
-        self.input
-            .root
+        let raw = self.raw;
+        self.root
             .into_deserializer()
             .deserialize_enum(name, variants, visitor)
             .map_err(|mut e: Self::Error| {
-                e.inner.set_original(original);
+                e.inner.set_raw(raw.map(|r| r.into()));
                 e
             })
     }
@@ -242,7 +263,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for Deserializer {
+impl<'de> serde::de::IntoDeserializer<'de, Error> for Deserializer {
     type Deserializer = Deserializer;
 
     fn into_deserializer(self) -> Self::Deserializer {
@@ -250,11 +271,19 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for crate::Document {
+impl<'de> serde::de::IntoDeserializer<'de, Error> for crate::DocumentMut {
     type Deserializer = Deserializer;
 
     fn into_deserializer(self) -> Self::Deserializer {
-        Deserializer::new(self)
+        Deserializer::from(self)
+    }
+}
+
+impl<'de> serde::de::IntoDeserializer<'de, Error> for crate::ImDocument<String> {
+    type Deserializer = Deserializer;
+
+    fn into_deserializer(self) -> Self::Deserializer {
+        Deserializer::from(self)
     }
 }
 

crates/toml_edit/src/de/table.rs

diff --git a/crates/toml_edit/src/de/table.rs b/crates/toml_edit/src/de/table.rs
index 33aa397..85adcc0 100644
--- a/crates/toml_edit/src/de/table.rs
+++ b/crates/toml_edit/src/de/table.rs
@@ -16,7 +16,7 @@
     where
         V: serde::de::Visitor<'de>,
     {
-        visitor.visit_map(crate::de::TableMapAccess::new(self))
+        visitor.visit_map(TableMapAccess::new(self))
     }
 
     // `None` is interpreted as a missing field so be sure to implement `Some`
@@ -68,17 +68,17 @@
         V: serde::de::Visitor<'de>,
     {
         if self.items.is_empty() {
-            Err(crate::de::Error::custom(
+            Err(Error::custom(
                 "wanted exactly 1 element, found 0 elements",
                 self.span,
             ))
         } else if self.items.len() != 1 {
-            Err(crate::de::Error::custom(
+            Err(Error::custom(
                 "wanted exactly 1 element, more than 1 element",
                 self.span,
             ))
         } else {
-            visitor.visit_enum(crate::de::TableMapAccess::new(self))
+            visitor.visit_enum(TableMapAccess::new(self))
         }
     }
 
@@ -89,7 +89,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for TableDeserializer {
+impl<'de> IntoDeserializer<'de, Error> for TableDeserializer {
     type Deserializer = TableDeserializer;
 
     fn into_deserializer(self) -> Self::Deserializer {

crates/toml_edit/src/de/value.rs

diff --git a/crates/toml_edit/src/de/value.rs b/crates/toml_edit/src/de/value.rs
index ba6ce6d..d7fb4a4 100644
--- a/crates/toml_edit/src/de/value.rs
+++ b/crates/toml_edit/src/de/value.rs
@@ -11,6 +11,8 @@
 /// # Example
 ///
 /// ```
+/// # #[cfg(feature = "parse")] {
+/// # #[cfg(feature = "display")] {
 /// use serde::Deserialize;
 ///
 /// #[derive(Deserialize)]
@@ -29,6 +31,8 @@
 /// let config = Config::deserialize(deserializer).unwrap();
 /// assert_eq!(config.title, "TOML Example");
 /// assert_eq!(config.owner.name, "Lisa");
+/// # }
+/// # }
 /// ```
 pub struct ValueDeserializer {
     input: crate::Item,
@@ -162,7 +166,7 @@
                     e.set_span(span);
                 }
                 e
-            })?
+            })?;
         }
 
         self.deserialize_any(visitor)
@@ -185,12 +189,12 @@
             }
             crate::Item::Value(crate::Value::InlineTable(v)) => {
                 if v.is_empty() {
-                    Err(crate::de::Error::custom(
+                    Err(Error::custom(
                         "wanted exactly 1 element, found 0 elements",
                         v.span(),
                     ))
                 } else if v.len() != 1 {
-                    Err(crate::de::Error::custom(
+                    Err(Error::custom(
                         "wanted exactly 1 element, more than 1 element",
                         v.span(),
                     ))
@@ -202,7 +206,7 @@
             crate::Item::Table(v) => v
                 .into_deserializer()
                 .deserialize_enum(name, variants, visitor),
-            e => Err(crate::de::Error::custom("wanted string or table", e.span())),
+            e => Err(Error::custom("wanted string or table", e.span())),
         }
         .map_err(|mut e: Self::Error| {
             if e.span().is_none() {
@@ -219,7 +223,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for ValueDeserializer {
+impl<'de> serde::de::IntoDeserializer<'de, Error> for ValueDeserializer {
     type Deserializer = Self;
 
     fn into_deserializer(self) -> Self::Deserializer {
@@ -227,7 +231,7 @@
     }
 }
 
-impl<'de> serde::de::IntoDeserializer<'de, crate::de::Error> for crate::Value {
+impl<'de> serde::de::IntoDeserializer<'de, Error> for crate::Value {
     type Deserializer = ValueDeserializer;
 
     fn into_deserializer(self) -> Self::Deserializer {

crates/toml_edit/src/document.rs

diff --git a/crates/toml_edit/src/document.rs b/crates/toml_edit/src/document.rs
index f20e61a..40edf76 100644
--- a/crates/toml_edit/src/document.rs
+++ b/crates/toml_edit/src/document.rs
@@ -3,17 +3,117 @@
 use crate::table::Iter;
 use crate::{Item, RawString, Table};
 
-/// Type representing a TOML document
+/// Type representing a parsed TOML document
 #[derive(Debug, Clone)]
-pub struct Document {
+pub struct ImDocument<S> {
     pub(crate) root: Item,
     // Trailing comments and whitespaces
     pub(crate) trailing: RawString,
-    pub(crate) original: Option<String>,
-    pub(crate) span: Option<std::ops::Range<usize>>,
+    pub(crate) raw: S,
 }
 
-impl Document {
+impl ImDocument<&'static str> {
+    /// Creates an empty document
+    pub fn new() -> Self {
+        Default::default()
+    }
+}
+
+#[cfg(feature = "parse")]
+impl<S: AsRef<str>> ImDocument<S> {
+    /// Parse a TOML document
+    pub fn parse(raw: S) -> Result<Self, crate::TomlError> {
+        crate::parser::parse_document(raw)
+    }
+}
+
+impl<S: AsRef<str>> ImDocument<S> {
+    /// # Panics
+    ///
+    /// If run on on a [`DocumentMut`] not generated by the parser
+    pub(crate) fn despan(&mut self) {
+        self.root.despan(self.raw.as_ref());
+        self.trailing.despan(self.raw.as_ref());
+    }
+}
+
+impl<S> ImDocument<S> {
+    /// Returns a reference to the root item.
+    pub fn as_item(&self) -> &Item {
+        &self.root
+    }
+
+    /// Returns a reference to the root table.
+    pub fn as_table(&self) -> &Table {
+        self.root.as_table().expect("root should always be a table")
+    }
+
+    /// Returns an iterator over the root table.
+    pub fn iter(&self) -> Iter<'_> {
+        self.as_table().iter()
+    }
+
+    /// Whitespace after last element
+    pub fn trailing(&self) -> &RawString {
+        &self.trailing
+    }
+}
+
+impl<S: AsRef<str>> ImDocument<S> {
+    /// Access the raw, unparsed document
+    pub fn raw(&self) -> &str {
+        self.raw.as_ref()
+    }
+}
+
+impl<S: AsRef<str>> ImDocument<S> {
+    /// Allow editing of the [`DocumentMut`]
+    pub fn into_mut(mut self) -> DocumentMut {
+        self.despan();
+        DocumentMut {
+            root: self.root,
+            trailing: self.trailing,
+        }
+    }
+}
+
+impl Default for ImDocument<&'static str> {
+    fn default() -> Self {
+        Self {
+            root: Item::Table(Table::with_pos(Some(0))),
+            trailing: Default::default(),
+            raw: "",
+        }
+    }
+}
+
+#[cfg(feature = "parse")]
+impl FromStr for ImDocument<String> {
+    type Err = crate::TomlError;
+
+    /// Parses a document from a &str
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::parse(s.to_owned())
+    }
+}
+
+impl<S> std::ops::Deref for ImDocument<S> {
+    type Target = Table;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_table()
+    }
+}
+
+/// Type representing a TOML document
+#[derive(Debug, Clone)]
+pub struct DocumentMut {
+    pub(crate) root: Item,
+    // Trailing comments and whitespaces
+    pub(crate) trailing: RawString,
+}
+
+impl DocumentMut {
     /// Creates an empty document
     pub fn new() -> Self {
         Default::default()
@@ -55,41 +155,29 @@
     pub fn trailing(&self) -> &RawString {
         &self.trailing
     }
-
-    /// # Panics
-    ///
-    /// If run on on a `Document` not generated by the parser
-    pub(crate) fn despan(&mut self) {
-        self.span = None;
-        self.root.despan(self.original.as_deref().unwrap());
-        self.trailing.despan(self.original.as_deref().unwrap());
-    }
 }
 
-impl Default for Document {
+impl Default for DocumentMut {
     fn default() -> Self {
         Self {
             root: Item::Table(Table::with_pos(Some(0))),
             trailing: Default::default(),
-            original: Default::default(),
-            span: Default::default(),
         }
     }
 }
 
 #[cfg(feature = "parse")]
-impl FromStr for Document {
+impl FromStr for DocumentMut {
     type Err = crate::TomlError;
 
     /// Parses a document from a &str
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut d = crate::parser::parse_document(s)?;
-        d.despan();
-        Ok(d)
+        let im = ImDocument::from_str(s)?;
+        Ok(im.into_mut())
     }
 }
 
-impl std::ops::Deref for Document {
+impl std::ops::Deref for DocumentMut {
     type Target = Table;
 
     fn deref(&self) -> &Self::Target {
@@ -97,13 +185,13 @@
     }
 }
 
-impl std::ops::DerefMut for Document {
+impl std::ops::DerefMut for DocumentMut {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.as_table_mut()
     }
 }
 
-impl From<Table> for Document {
+impl From<Table> for DocumentMut {
     fn from(root: Table) -> Self {
         Self {
             root: Item::Table(root),
@@ -111,3 +199,13 @@
         }
     }
 }
+
+#[test]
+#[cfg(feature = "parse")]
+#[cfg(feature = "display")]
+fn default_roundtrip() {
+    DocumentMut::default()
+        .to_string()
+        .parse::<DocumentMut>()
+        .unwrap();
+}

crates/toml_edit/src/encode.rs

diff --git a/crates/toml_edit/src/encode.rs b/crates/toml_edit/src/encode.rs
index 30b153a..b45f0e3 100644
--- a/crates/toml_edit/src/encode.rs
+++ b/crates/toml_edit/src/encode.rs
@@ -1,16 +1,18 @@
 use std::borrow::Cow;
 use std::fmt::{Display, Formatter, Result, Write};
 
-use toml_datetime::*;
+use toml_datetime::Datetime;
 
-use crate::document::Document;
 use crate::inline_table::DEFAULT_INLINE_KEY_DECOR;
 use crate::key::Key;
 use crate::repr::{Formatted, Repr, ValueRepr};
-use crate::table::{DEFAULT_KEY_DECOR, DEFAULT_KEY_PATH_DECOR, DEFAULT_TABLE_DECOR};
+use crate::table::{
+    DEFAULT_KEY_DECOR, DEFAULT_KEY_PATH_DECOR, DEFAULT_ROOT_DECOR, DEFAULT_TABLE_DECOR,
+};
 use crate::value::{
     DEFAULT_LEADING_VALUE_DECOR, DEFAULT_TRAILING_VALUE_DECOR, DEFAULT_VALUE_DECOR,
 };
+use crate::DocumentMut;
 use crate::{Array, InlineTable, Item, Table, Value};
 
 pub(crate) fn encode_key(this: &Key, buf: &mut dyn Write, input: Option<&str>) -> Result {
@@ -195,8 +197,11 @@
     }
 }
 
-impl Display for Document {
+impl Display for DocumentMut {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        let decor = self.decor();
+        decor.prefix_encode(f, None, DEFAULT_ROOT_DECOR.0)?;
+
         let mut path = Vec::new();
         let mut last_position = 0;
         let mut tables = Vec::new();
@@ -212,17 +217,10 @@
         tables.sort_by_key(|&(id, _, _, _)| id);
         let mut first_table = true;
         for (_, table, path, is_array) in tables {
-            visit_table(
-                f,
-                self.original.as_deref(),
-                table,
-                &path,
-                is_array,
-                &mut first_table,
-            )?;
+            visit_table(f, None, table, &path, is_array, &mut first_table)?;
         }
-        self.trailing()
-            .encode_with_default(f, self.original.as_deref(), "")
+        decor.suffix_encode(f, None, DEFAULT_ROOT_DECOR.1)?;
+        self.trailing().encode_with_default(f, None, "")
     }
 }
 
@@ -334,12 +332,7 @@
     style: Option<StringStyle>,
     literal: Option<bool>,
 ) -> Repr {
-    let (style, literal) = match (style, literal) {
-        (Some(style), Some(literal)) => (style, literal),
-        (_, Some(literal)) => (infer_style(value).0, literal),
-        (Some(style), _) => (style, infer_style(value).1),
-        (_, _) => infer_style(value),
-    };
+    let (style, literal) = infer_style(value, style, literal);
 
     let mut output = String::with_capacity(value.len() * 2);
     if literal {
@@ -355,7 +348,7 @@
                 '\u{a}' => match style {
                     StringStyle::NewlineTriple => output.push('\n'),
                     StringStyle::OnelineSingle => output.push_str("\\n"),
-                    _ => unreachable!(),
+                    StringStyle::OnelineTriple => unreachable!(),
                 },
                 '\u{c}' => output.push_str("\\f"),
                 '\u{d}' => output.push_str("\\r"),
@@ -417,7 +410,38 @@
     }
 }
 
-fn infer_style(value: &str) -> (StringStyle, bool) {
+fn infer_style(
+    value: &str,
+    style: Option<StringStyle>,
+    literal: Option<bool>,
+) -> (StringStyle, bool) {
+    match (style, literal) {
+        (Some(style), Some(literal)) => (style, literal),
+        (None, Some(literal)) => (infer_all_style(value).0, literal),
+        (Some(style), None) => {
+            let literal = infer_literal(value);
+            (style, literal)
+        }
+        (None, None) => infer_all_style(value),
+    }
+}
+
+fn infer_literal(value: &str) -> bool {
+    #[cfg(feature = "parse")]
+    {
+        use winnow::stream::ContainsToken as _;
+        (value.contains('"') | value.contains('\\'))
+            && value
+                .chars()
+                .all(|c| crate::parser::strings::LITERAL_CHAR.contains_token(c))
+    }
+    #[cfg(not(feature = "parse"))]
+    {
+        false
+    }
+}
+
+fn infer_all_style(value: &str) -> (StringStyle, bool) {
     // We need to determine:
     // - if we are a "multi-line" pretty (if there are \n)
     // - if ['''] appears if multi or ['] if single
@@ -443,10 +467,13 @@
                 if found_singles > max_found_singles {
                     max_found_singles = found_singles;
                 }
-                found_singles = 0
+                found_singles = 0;
             }
             match ch {
                 '\t' => {}
+                '"' => {
+                    prefer_literal = true;
+                }
                 '\\' => {
                     prefer_literal = true;
                 }
@@ -526,3 +553,45 @@
         Repr::new_unchecked(self.to_string())
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use proptest::prelude::*;
+
+    proptest! {
+        #[test]
+        #[cfg(feature = "parse")]
+        fn parseable_string(string in "\\PC*") {
+            let string = Value::from(string);
+            let encoded = string.to_string();
+            let _: Value = encoded.parse().unwrap_or_else(|err| {
+                panic!("error: {err}
+
+string:
+```
+{string}
+```
+")
+            });
+        }
+    }
+
+    proptest! {
+        #[test]
+        #[cfg(feature = "parse")]
+        fn parseable_key(string in "\\PC*") {
+            let string = Key::new(string);
+            let encoded = string.to_string();
+            let _: Key = encoded.parse().unwrap_or_else(|err| {
+                panic!("error: {err}
+
+string:
+```
+{string}
+```
+")
+            });
+        }
+    }
+}

crates/toml_edit/src/error.rs

diff --git a/crates/toml_edit/src/error.rs b/crates/toml_edit/src/error.rs
index a983019..57c21ef 100644
--- a/crates/toml_edit/src/error.rs
+++ b/crates/toml_edit/src/error.rs
@@ -5,7 +5,7 @@
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct TomlError {
     message: String,
-    original: Option<String>,
+    raw: Option<String>,
     keys: Vec<String>,
     span: Option<std::ops::Range<usize>>,
 }
@@ -17,35 +17,42 @@
             crate::parser::prelude::Input<'_>,
             winnow::error::ContextError,
         >,
-        mut original: crate::parser::prelude::Input<'_>,
+        mut raw: crate::parser::prelude::Input<'_>,
     ) -> Self {
         use winnow::stream::Stream;
 
-        let offset = error.offset();
-        let span = if offset == original.len() {
-            offset..offset
-        } else {
-            offset..(offset + 1)
-        };
-
         let message = error.inner().to_string();
-        let original = original.finish();
+        let raw = raw.finish();
+        let raw = String::from_utf8(raw.to_owned()).expect("original document was utf8");
+
+        let offset = error.offset();
+        let offset = (0..=offset)
+            .rev()
+            .find(|index| raw.is_char_boundary(*index))
+            .unwrap_or(0);
+
+        let mut indices = raw[offset..].char_indices();
+        indices.next();
+        let len = if let Some((index, _)) = indices.next() {
+            index
+        } else {
+            raw.len() - offset
+        };
+        let span = offset..(offset + len);
 
         Self {
             message,
-            original: Some(
-                String::from_utf8(original.to_owned()).expect("original document was utf8"),
-            ),
+            raw: Some(raw),
             keys: Vec::new(),
             span: Some(span),
         }
     }
 
-    #[cfg(feature = "serde")]
+    #[cfg(any(feature = "serde", feature = "parse"))]
     pub(crate) fn custom(message: String, span: Option<std::ops::Range<usize>>) -> Self {
         Self {
             message,
-            original: None,
+            raw: None,
             keys: Vec::new(),
             span,
         }
@@ -72,8 +79,8 @@
     }
 
     #[cfg(feature = "serde")]
-    pub(crate) fn set_original(&mut self, original: Option<String>) {
-        self.original = original;
+    pub(crate) fn set_raw(&mut self, raw: Option<String>) {
+        self.raw = raw;
     }
 }
 
@@ -92,14 +99,17 @@
 impl Display for TomlError {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let mut context = false;
-        if let (Some(original), Some(span)) = (&self.original, self.span()) {
+        if let (Some(raw), Some(span)) = (&self.raw, self.span()) {
             context = true;
 
-            let (line, column) = translate_position(original.as_bytes(), span.start);
+            let (line, column) = translate_position(raw.as_bytes(), span.start);
             let line_num = line + 1;
             let col_num = column + 1;
             let gutter = line_num.to_string().len();
-            let content = original.split('\n').nth(line).expect("valid line number");
+            let content = raw.split('\n').nth(line).expect("valid line number");
+            let highlight_len = span.end - span.start;
+            // Allow highlight to go one past the line
+            let highlight_len = highlight_len.min(content.len().saturating_sub(column));
 
             writeln!(
                 f,
@@ -127,7 +137,7 @@
             // The span will be empty at eof, so we need to make sure we always print at least
             // one `^`
             write!(f, "^")?;
-            for _ in (span.start + 1)..(span.end.min(span.start + content.len())) {
+            for _ in 1..highlight_len {
                 write!(f, "^")?;
             }
             writeln!(f)?;

crates/toml_edit/src/index.rs

diff --git a/crates/toml_edit/src/index.rs b/crates/toml_edit/src/index.rs
index 276db79..cdf646f 100644
--- a/crates/toml_edit/src/index.rs
+++ b/crates/toml_edit/src/index.rs
@@ -1,8 +1,8 @@
 use std::ops;
 
-use crate::document::Document;
 use crate::key::Key;
 use crate::table::TableKeyValue;
+use crate::DocumentMut;
 use crate::{value, InlineTable, InternalString, Item, Table, Value};
 
 // copied from
@@ -141,7 +141,7 @@
     }
 }
 
-impl<'s> ops::Index<&'s str> for Document {
+impl<'s> ops::Index<&'s str> for DocumentMut {
     type Output = Item;
 
     fn index(&self, key: &'s str) -> &Item {
@@ -149,7 +149,7 @@
     }
 }
 
-impl<'s> ops::IndexMut<&'s str> for Document {
+impl<'s> ops::IndexMut<&'s str> for DocumentMut {
     fn index_mut(&mut self, key: &'s str) -> &mut Item {
         self.root.index_mut(key)
     }

crates/toml_edit/src/inline_table.rs

diff --git a/crates/toml_edit/src/inline_table.rs b/crates/toml_edit/src/inline_table.rs
index 316637d..c0a58fe 100644
--- a/crates/toml_edit/src/inline_table.rs
+++ b/crates/toml_edit/src/inline_table.rs
@@ -148,8 +148,8 @@
     /// ```
     /// # #[cfg(feature = "parse")] {
     /// # #[cfg(feature = "display")] {
-    /// use toml_edit::Document;
-    /// let mut doc = "[a]\n[a.b]\n".parse::<Document>().expect("invalid toml");
+    /// use toml_edit::DocumentMut;
+    /// let mut doc = "[a]\n[a.b]\n".parse::<DocumentMut>().expect("invalid toml");
     ///
     /// doc["a"].as_table_mut().unwrap().set_implicit(true);
     /// assert_eq!(doc.to_string(), "[a.b]\n");
@@ -219,8 +219,10 @@
         &self.preamble
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.span.clone()
     }
 
@@ -261,14 +263,14 @@
         self.iter().count()
     }
 
-    /// Returns true iff the table is empty.
+    /// Returns true if the table is empty.
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
     /// Clears the table, removing all key-value pairs. Keeps the allocated memory for reuse.
     pub fn clear(&mut self) {
-        self.items.clear()
+        self.items.clear();
     }
 
     /// Gets the given key's corresponding entry in the Table for in-place manipulation.
@@ -352,7 +354,7 @@
         })
     }
 
-    /// Returns true iff the table contains given key.
+    /// Returns true if the table contains given key.
     pub fn contains_key(&self, key: &str) -> bool {
         if let Some(kv) = self.items.get(key) {
             kv.value.is_value()
@@ -566,13 +568,13 @@
         self.get_values()
     }
     fn fmt(&mut self) {
-        self.fmt()
+        self.fmt();
     }
     fn sort_values(&mut self) {
-        self.sort_values()
+        self.sort_values();
     }
     fn set_dotted(&mut self, yes: bool) {
-        self.set_dotted(yes)
+        self.set_dotted(yes);
     }
     fn is_dotted(&self) -> bool {
         self.is_dotted()
@@ -679,7 +681,7 @@
         self.entry.get_mut().value.as_value_mut().unwrap()
     }
 
-    /// Converts the OccupiedEntry into a mutable reference to the value in the entry
+    /// Converts the `OccupiedEntry` into a mutable reference to the value in the entry
     /// with a lifetime bound to the map itself
     pub fn into_mut(self) -> &'a mut Value {
         self.entry.into_mut().value.as_value_mut().unwrap()
@@ -720,7 +722,7 @@
         self.entry.key().as_str()
     }
 
-    /// Sets the value of the entry with the VacantEntry's key,
+    /// Sets the value of the entry with the `VacantEntry`'s key,
     /// and returns a mutable reference to it
     pub fn insert(self, value: Value) -> &'a mut Value {
         let entry = self.entry;

crates/toml_edit/src/internal_string.rs

diff --git a/crates/toml_edit/src/internal_string.rs b/crates/toml_edit/src/internal_string.rs
index d4347d2..ca4c185 100644
--- a/crates/toml_edit/src/internal_string.rs
+++ b/crates/toml_edit/src/internal_string.rs
@@ -5,9 +5,9 @@
 #[derive(Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct InternalString(Inner);
 
-#[cfg(feature = "kstring")]
+#[cfg(feature = "perf")]
 type Inner = kstring::KString;
-#[cfg(not(feature = "kstring"))]
+#[cfg(not(feature = "perf"))]
 type Inner = String;
 
 impl InternalString {
@@ -56,9 +56,9 @@
 impl From<&str> for InternalString {
     #[inline]
     fn from(s: &str) -> Self {
-        #[cfg(feature = "kstring")]
+        #[cfg(feature = "perf")]
         let inner = kstring::KString::from_ref(s);
-        #[cfg(not(feature = "kstring"))]
+        #[cfg(not(feature = "perf"))]
         let inner = String::from(s);
 
         InternalString(inner)

crates/toml_edit/src/item.rs

diff --git a/crates/toml_edit/src/item.rs b/crates/toml_edit/src/item.rs
index b58806e..601c235 100644
--- a/crates/toml_edit/src/item.rs
+++ b/crates/toml_edit/src/item.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use toml_datetime::*;
+use toml_datetime::Datetime;
 
 use crate::array_of_tables::ArrayOfTables;
 use crate::table::TableLike;
@@ -21,11 +21,11 @@
 }
 
 impl Item {
-    /// Sets `self` to the given item iff `self` is none and
+    /// Sets `self` to the given item if `self` is none and
     /// returns a mutable reference to `self`.
     pub fn or_insert(&mut self, item: Item) -> &mut Item {
         if self.is_none() {
-            *self = item
+            *self = item;
         }
         self
     }
@@ -167,29 +167,29 @@
     // Starting private because the name is unclear
     pub(crate) fn make_item(&mut self) {
         let other = std::mem::take(self);
-        let other = match other.into_table().map(crate::Item::Table) {
+        let other = match other.into_table().map(Item::Table) {
             Ok(i) => i,
             Err(i) => i,
         };
-        let other = match other.into_array_of_tables().map(crate::Item::ArrayOfTables) {
+        let other = match other.into_array_of_tables().map(Item::ArrayOfTables) {
             Ok(i) => i,
             Err(i) => i,
         };
         *self = other;
     }
-    /// Returns true iff `self` is a value.
+    /// Returns true if `self` is a value.
     pub fn is_value(&self) -> bool {
         self.as_value().is_some()
     }
-    /// Returns true iff `self` is a table.
+    /// Returns true if `self` is a table.
     pub fn is_table(&self) -> bool {
         self.as_table().is_some()
     }
-    /// Returns true iff `self` is an array of tables.
+    /// Returns true if `self` is an array of tables.
     pub fn is_array_of_tables(&self) -> bool {
         self.as_array_of_tables().is_some()
     }
-    /// Returns true iff `self` is `None`.
+    /// Returns true if `self` is `None`.
     pub fn is_none(&self) -> bool {
         matches!(*self, Item::None)
     }
@@ -201,7 +201,7 @@
         self.as_value().and_then(Value::as_integer)
     }
 
-    /// Returns true iff `self` is an integer.
+    /// Returns true if `self` is an integer.
     pub fn is_integer(&self) -> bool {
         self.as_integer().is_some()
     }
@@ -211,7 +211,7 @@
         self.as_value().and_then(Value::as_float)
     }
 
-    /// Returns true iff `self` is a float.
+    /// Returns true if `self` is a float.
     pub fn is_float(&self) -> bool {
         self.as_float().is_some()
     }
@@ -221,7 +221,7 @@
         self.as_value().and_then(Value::as_bool)
     }
 
-    /// Returns true iff `self` is a boolean.
+    /// Returns true if `self` is a boolean.
     pub fn is_bool(&self) -> bool {
         self.as_bool().is_some()
     }
@@ -231,7 +231,7 @@
         self.as_value().and_then(Value::as_str)
     }
 
-    /// Returns true iff `self` is a string.
+    /// Returns true if `self` is a string.
     pub fn is_str(&self) -> bool {
         self.as_str().is_some()
     }
@@ -241,7 +241,7 @@
         self.as_value().and_then(Value::as_datetime)
     }
 
-    /// Returns true iff `self` is a date-time.
+    /// Returns true if `self` is a date-time.
     pub fn is_datetime(&self) -> bool {
         self.as_datetime().is_some()
     }
@@ -256,7 +256,7 @@
         self.as_value_mut().and_then(Value::as_array_mut)
     }
 
-    /// Returns true iff `self` is an array.
+    /// Returns true if `self` is an array.
     pub fn is_array(&self) -> bool {
         self.as_array().is_some()
     }
@@ -271,7 +271,7 @@
         self.as_value_mut().and_then(Value::as_inline_table_mut)
     }
 
-    /// Returns true iff `self` is an inline table.
+    /// Returns true if `self` is an inline table.
     pub fn is_inline_table(&self) -> bool {
         self.as_inline_table().is_some()
     }
@@ -292,13 +292,15 @@
         }
     }
 
-    /// Returns true iff `self` is either a table, or an inline table.
+    /// Returns true if `self` is either a table, or an inline table.
     pub fn is_table_like(&self) -> bool {
         self.as_table_like().is_some()
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         match self {
             Item::None => None,
             Item::Value(v) => v.span(),
@@ -361,7 +363,7 @@
 /// # Examples
 /// ```rust
 /// # #[cfg(feature = "display")] {
-/// # use snapbox::assert_eq;
+/// # #[cfg(feature = "parse")] {
 /// # use toml_edit::*;
 /// let mut table = Table::default();
 /// let mut array = Array::default();
@@ -370,12 +372,13 @@
 /// table["key1"] = value("value1");
 /// table["key2"] = value(42);
 /// table["key3"] = value(array);
-/// assert_eq(table.to_string(),
+/// assert_eq!(table.to_string(),
 /// r#"key1 = "value1"
 /// key2 = 42
 /// key3 = ["hello", '\, world']
 /// "#);
 /// # }
+/// # }
 /// ```
 pub fn value<V: Into<Value>>(v: V) -> Item {
     Item::Value(v.into())
@@ -390,3 +393,10 @@
 pub fn array() -> Item {
     Item::ArrayOfTables(ArrayOfTables::new())
 }
+
+#[test]
+#[cfg(feature = "parse")]
+#[cfg(feature = "display")]
+fn string_roundtrip() {
+    value("hello").to_string().parse::<Item>().unwrap();
+}

crates/toml_edit/src/key.rs

diff --git a/crates/toml_edit/src/key.rs b/crates/toml_edit/src/key.rs
index 2f4c30a..15fdd4d 100644
--- a/crates/toml_edit/src/key.rs
+++ b/crates/toml_edit/src/key.rs
@@ -113,7 +113,10 @@
     }
 
     /// Returns the surrounding whitespace
-    #[deprecated(since = "0.21.1", note = "Replaced with `decor_mut`")]
+    #[deprecated(
+        since = "0.21.1",
+        note = "Replaced with `dotted_decor_mut`, `leaf_decor_mut"
+    )]
     pub fn decor_mut(&mut self) -> &mut Decor {
         self.leaf_decor_mut()
     }
@@ -129,7 +132,7 @@
     }
 
     /// Returns the surrounding whitespace
-    #[deprecated(since = "0.21.1", note = "Replaced with `decor`")]
+    #[deprecated(since = "0.21.1", note = "Replaced with `dotted_decor`, `leaf_decor")]
     pub fn decor(&self) -> &Decor {
         self.leaf_decor()
     }
@@ -144,9 +147,10 @@
         &self.dotted_decor
     }
 
-    /// Returns the location within the original document
-    #[cfg(feature = "serde")]
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.repr.as_ref().and_then(|r| r.span())
     }
 
@@ -154,7 +158,7 @@
         self.leaf_decor.despan(input);
         self.dotted_decor.despan(input);
         if let Some(repr) = &mut self.repr {
-            repr.despan(input)
+            repr.despan(input);
         }
     }
 
@@ -285,17 +289,13 @@
             crate::encode::to_string_repr(
                 key,
                 Some(crate::encode::StringStyle::OnelineSingle),
-                Some(false),
+                None,
             )
         }
     }
     #[cfg(not(feature = "parse"))]
     {
-        crate::encode::to_string_repr(
-            key,
-            Some(crate::encode::StringStyle::OnelineSingle),
-            Some(false),
-        )
+        crate::encode::to_string_repr(key, Some(crate::encode::StringStyle::OnelineSingle), None)
     }
 }
 
@@ -355,12 +355,15 @@
 
     /// Returns a raw representation.
     #[cfg(feature = "display")]
-    pub fn display_repr(&self) -> Cow<str> {
+    pub fn display_repr(&self) -> Cow<'_, str> {
         self.key.display_repr()
     }
 
     /// Returns the surrounding whitespace
-    #[deprecated(since = "0.21.1", note = "Replaced with `decor_mut`")]
+    #[deprecated(
+        since = "0.21.1",
+        note = "Replaced with `dotted_decor_mut`, `leaf_decor_mut"
+    )]
     pub fn decor_mut(&mut self) -> &mut Decor {
         #![allow(deprecated)]
         self.key.decor_mut()
@@ -377,7 +380,7 @@
     }
 
     /// Returns the surrounding whitespace
-    #[deprecated(since = "0.21.1", note = "Replaced with `decor`")]
+    #[deprecated(since = "0.21.1", note = "Replaced with `dotted_decor`, `leaf_decor")]
     pub fn decor(&self) -> &Decor {
         #![allow(deprecated)]
         self.key.decor()
@@ -395,7 +398,7 @@
 
     /// Auto formats the key.
     pub fn fmt(&mut self) {
-        self.key.fmt()
+        self.key.fmt();
     }
 }
 
@@ -434,3 +437,10 @@
         std::fmt::Display::fmt(&self.key, f)
     }
 }
+
+#[test]
+#[cfg(feature = "parse")]
+#[cfg(feature = "display")]
+fn string_roundtrip() {
+    Key::new("hello").to_string().parse::<Key>().unwrap();
+}

crates/toml_edit/src/lib.rs

diff --git a/crates/toml_edit/src/lib.rs b/crates/toml_edit/src/lib.rs
index 25e3d20..c47b902 100644
--- a/crates/toml_edit/src/lib.rs
+++ b/crates/toml_edit/src/lib.rs
@@ -1,8 +1,3 @@
-#![deny(missing_docs)]
-// https://github.com/Marwes/combine/issues/172
-#![recursion_limit = "256"]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-
 //! # `toml_edit`
 //!
 //! This crate allows you to parse and modify toml
@@ -16,13 +11,13 @@
 //! ```rust
 //! # #[cfg(feature = "parse")] {
 //! # #[cfg(feature = "display")] {
-//! use toml_edit::{Document, value};
+//! use toml_edit::{DocumentMut, value};
 //!
 //! let toml = r#"
 //! "hello" = 'toml!' # comment
 //! ['a'.b]
 //! "#;
-//! let mut doc = toml.parse::<Document>().expect("invalid doc");
+//! let mut doc = toml.parse::<DocumentMut>().expect("invalid doc");
 //! assert_eq!(doc.to_string(), toml);
 //! // let's add a new key/value pair inside a.b: c = {d = "hello"}
 //! doc["a"]["b"]["c"]["d"] = value("hello");
@@ -43,23 +38,27 @@
 //! By default, values are created with default formatting
 //! ```rust
 //! # #[cfg(feature = "display")] {
-//! let mut doc = toml_edit::Document::new();
+//! # #[cfg(feature = "parse")] {
+//! let mut doc = toml_edit::DocumentMut::new();
 //! doc["foo"] = toml_edit::value("bar");
 //! let expected = r#"foo = "bar"
 //! "#;
 //! assert_eq!(doc.to_string(), expected);
 //! # }
+//! # }
 //! ```
 //!
 //! You can choose a custom TOML representation by parsing the value.
 //! ```rust
 //! # #[cfg(feature = "display")] {
-//! let mut doc = toml_edit::Document::new();
+//! # #[cfg(feature = "parse")] {
+//! let mut doc = toml_edit::DocumentMut::new();
 //! doc["foo"] = "'bar'".parse::<toml_edit::Item>().unwrap();
 //! let expected = r#"foo = 'bar'
 //! "#;
 //! assert_eq!(doc.to_string(), expected);
 //! # }
+//! # }
 //! ```
 //!
 //! ## Limitations
@@ -70,6 +69,13 @@
 //!
 //! [`toml`]: https://docs.rs/toml/latest/toml/
 
+// https://github.com/Marwes/combine/issues/172
+#![recursion_limit = "256"]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![warn(missing_docs)]
+#![warn(clippy::print_stderr)]
+#![warn(clippy::print_stdout)]
+
 mod array;
 mod array_of_tables;
 mod document;
@@ -100,7 +106,11 @@
 pub use crate::array_of_tables::{
     ArrayOfTables, ArrayOfTablesIntoIter, ArrayOfTablesIter, ArrayOfTablesIterMut,
 };
-pub use crate::document::Document;
+/// Deprecated, replaced with [`DocumentMut`]
+#[deprecated(since = "0.22.6", note = "Replaced with `DocumentMut`")]
+pub type Document = DocumentMut;
+pub use crate::document::DocumentMut;
+pub use crate::document::ImDocument;
 pub use crate::error::TomlError;
 pub use crate::inline_table::{
     InlineEntry, InlineOccupiedEntry, InlineTable, InlineTableIntoIter, InlineTableIter,

crates/toml_edit/src/parser/array.rs

diff --git a/crates/toml_edit/src/parser/array.rs b/crates/toml_edit/src/parser/array.rs
index 0783191..d246c63 100644
--- a/crates/toml_edit/src/parser/array.rs
+++ b/crates/toml_edit/src/parser/array.rs
@@ -1,29 +1,31 @@
 use winnow::combinator::cut_err;
 use winnow::combinator::delimited;
 use winnow::combinator::opt;
-use winnow::combinator::separated1;
-use winnow::trace::trace;
+use winnow::combinator::peek;
+use winnow::combinator::separated;
+use winnow::combinator::trace;
 
 use crate::parser::trivia::ws_comment_newline;
 use crate::parser::value::value;
-use crate::{Array, Item, RawString, Value};
+use crate::{Array, Item, RawString};
 
 use crate::parser::prelude::*;
 
 // ;; Array
 
 // array = array-open array-values array-close
-pub(crate) fn array<'i>(check: RecursionCheck) -> impl Parser<Input<'i>, Array, ContextError> {
+pub(crate) fn array<'i>(input: &mut Input<'i>) -> PResult<Array> {
     trace("array", move |input: &mut Input<'i>| {
         delimited(
             ARRAY_OPEN,
-            cut_err(array_values(check)),
+            cut_err(array_values),
             cut_err(ARRAY_CLOSE)
                 .context(StrContext::Label("array"))
                 .context(StrContext::Expected(StrContextValue::CharLiteral(']'))),
         )
         .parse_next(input)
     })
+    .parse_next(input)
 }
 
 // note: we're omitting ws and newlines here, because
@@ -35,49 +37,33 @@
 // array-sep = ws %x2C ws  ; , Comma
 const ARRAY_SEP: u8 = b',';
 
-// note: this rule is modified
-// array-values = [ ( array-value array-sep array-values ) /
-//                  array-value / ws-comment-newline ]
-pub(crate) fn array_values<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, Array, ContextError> {
-    move |input: &mut Input<'i>| {
-        let check = check.recursing(input)?;
-        (
-            opt(
-                (separated1(array_value(check), ARRAY_SEP), opt(ARRAY_SEP)).map(
-                    |(v, trailing): (Vec<Value>, Option<u8>)| {
-                        (
-                            Array::with_vec(v.into_iter().map(Item::Value).collect()),
-                            trailing.is_some(),
-                        )
-                    },
-                ),
-            ),
-            ws_comment_newline.span(),
-        )
-            .try_map::<_, _, std::str::Utf8Error>(|(array, trailing)| {
-                let (mut array, comma) = array.unwrap_or_default();
-                array.set_trailing_comma(comma);
-                array.set_trailing(RawString::with_span(trailing));
-                Ok(array)
-            })
-            .parse_next(input)
+// array-values =  ws-comment-newline val ws-comment-newline array-sep array-values
+// array-values =/ ws-comment-newline val ws-comment-newline [ array-sep ]
+pub(crate) fn array_values(input: &mut Input<'_>) -> PResult<Array> {
+    if peek(opt(ARRAY_CLOSE)).parse_next(input)?.is_some() {
+        // Optimize for empty arrays, avoiding `value` from being expected to fail
+        return Ok(Array::new());
     }
+
+    let array = separated(0.., array_value, ARRAY_SEP).parse_next(input)?;
+    let mut array = Array::with_vec(array);
+    if !array.is_empty() {
+        let comma = opt(ARRAY_SEP).parse_next(input)?.is_some();
+        array.set_trailing_comma(comma);
+    }
+    let trailing = ws_comment_newline.span().parse_next(input)?;
+    array.set_trailing(RawString::with_span(trailing));
+
+    Ok(array)
 }
 
-pub(crate) fn array_value<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, Value, ContextError> {
-    move |input: &mut Input<'i>| {
-        (
-            ws_comment_newline.span(),
-            value(check),
-            ws_comment_newline.span(),
-        )
-            .map(|(ws1, v, ws2)| v.decorated(RawString::with_span(ws1), RawString::with_span(ws2)))
-            .parse_next(input)
-    }
+pub(crate) fn array_value(input: &mut Input<'_>) -> PResult<Item> {
+    let prefix = ws_comment_newline.span().parse_next(input)?;
+    let value = value.parse_next(input)?;
+    let suffix = ws_comment_newline.span().parse_next(input)?;
+    let value = value.decorated(RawString::with_span(prefix), RawString::with_span(suffix));
+    let value = Item::Value(value);
+    Ok(value)
 }
 
 #[cfg(test)]
@@ -125,7 +111,7 @@
         ];
         for input in inputs {
             dbg!(input);
-            let mut parsed = array(Default::default()).parse(new_input(input));
+            let mut parsed = array.parse(new_input(input));
             if let Ok(parsed) = &mut parsed {
                 parsed.despan(input);
             }
@@ -138,7 +124,7 @@
         let invalid_inputs = [r#"["#, r#"[,]"#, r#"[,2]"#, r#"[1e165,,]"#];
         for input in invalid_inputs {
             dbg!(input);
-            let mut parsed = array(Default::default()).parse(new_input(input));
+            let mut parsed = array.parse(new_input(input));
             if let Ok(parsed) = &mut parsed {
                 parsed.despan(input);
             }

crates/toml_edit/src/parser/datetime.rs

diff --git a/crates/toml_edit/src/parser/datetime.rs b/crates/toml_edit/src/parser/datetime.rs
index 945dc69..69c8d7f 100644
--- a/crates/toml_edit/src/parser/datetime.rs
+++ b/crates/toml_edit/src/parser/datetime.rs
@@ -4,15 +4,15 @@
 use crate::parser::prelude::*;
 use crate::parser::trivia::from_utf8_unchecked;
 
-use toml_datetime::*;
+use toml_datetime::{Date, Datetime, Offset, Time};
 use winnow::combinator::alt;
 use winnow::combinator::cut_err;
 use winnow::combinator::opt;
 use winnow::combinator::preceded;
+use winnow::combinator::trace;
 use winnow::stream::Stream as _;
 use winnow::token::one_of;
 use winnow::token::take_while;
-use winnow::trace::trace;
 
 // ;; Date and Time (as defined in RFC 3339)
 
@@ -73,7 +73,7 @@
         _ => 31,
     };
     if max_days_in_month < day {
-        input.reset(day_start);
+        input.reset(&day_start);
         return Err(winnow::error::ErrMode::from_external_error(
             input,
             winnow::error::ErrorKind::Verify,

crates/toml_edit/src/parser/document.rs

diff --git a/crates/toml_edit/src/parser/document.rs b/crates/toml_edit/src/parser/document.rs
index aa8fb11..bff40bf 100644
--- a/crates/toml_edit/src/parser/document.rs
+++ b/crates/toml_edit/src/parser/document.rs
@@ -5,11 +5,10 @@
 use winnow::combinator::opt;
 use winnow::combinator::peek;
 use winnow::combinator::repeat;
+use winnow::combinator::trace;
 use winnow::token::any;
 use winnow::token::one_of;
-use winnow::trace::trace;
 
-use crate::document::Document;
 use crate::key::Key;
 use crate::parser::inline_table::KEYVAL_SEP;
 use crate::parser::key::key;
@@ -30,31 +29,28 @@
 //                ( ws keyval ws [ comment ] ) /
 //                ( ws table ws [ comment ] ) /
 //                  ws )
-pub(crate) fn document(input: &mut Input<'_>) -> PResult<Document> {
-    let state = RefCell::new(ParseState::default());
-    let state_ref = &state;
-
-    let _o = (
-        // Remove BOM if present
-        opt(b"\xEF\xBB\xBF"),
-        parse_ws(state_ref),
-        repeat(0.., (
-            dispatch! {peek(any);
-                crate::parser::trivia::COMMENT_START_SYMBOL => cut_err(parse_comment(state_ref)),
-                crate::parser::table::STD_TABLE_OPEN => cut_err(table(state_ref)),
-                crate::parser::trivia::LF |
-                crate::parser::trivia::CR => parse_newline(state_ref),
-                _ => cut_err(keyval(state_ref)),
-            },
+pub(crate) fn document<'s, 'i>(
+    state_ref: &'s RefCell<ParseState>,
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
+        (
+            // Remove BOM if present
+            opt(b"\xEF\xBB\xBF"),
             parse_ws(state_ref),
-        ))
-        .map(|()| ()),
-        eof,
-    )
-        .parse_next(input)?;
-    state.into_inner().into_document().map_err(|err| {
-        winnow::error::ErrMode::from_external_error(input, winnow::error::ErrorKind::Verify, err)
-    })
+            repeat(0.., (
+                dispatch! {peek(any);
+                    crate::parser::trivia::COMMENT_START_SYMBOL => cut_err(parse_comment(state_ref)),
+                    crate::parser::table::STD_TABLE_OPEN => cut_err(table(state_ref)),
+                    crate::parser::trivia::LF |
+                    crate::parser::trivia::CR => parse_newline(state_ref),
+                    _ => cut_err(keyval(state_ref)),
+                },
+                parse_ws(state_ref),
+            ))
+            .map(|()| ()),
+            eof,
+        ).void().parse_next(i)
+    }
 }
 
 pub(crate) fn parse_comment<'s, 'i>(
@@ -113,7 +109,7 @@
                     .context(StrContext::Expected(StrContextValue::CharLiteral('='))),
                 (
                     ws.span(),
-                    value(RecursionCheck::default()),
+                    value,
                     line_trailing
                         .context(StrContext::Expected(StrContextValue::CharLiteral('\n')))
                         .context(StrContext::Expected(StrContextValue::CharLiteral('#'))),

crates/toml_edit/src/parser/inline_table.rs

diff --git a/crates/toml_edit/src/parser/inline_table.rs b/crates/toml_edit/src/parser/inline_table.rs
index c2e6619..bba5100 100644
--- a/crates/toml_edit/src/parser/inline_table.rs
+++ b/crates/toml_edit/src/parser/inline_table.rs
@@ -1,8 +1,8 @@
 use winnow::combinator::cut_err;
 use winnow::combinator::delimited;
-use winnow::combinator::separated0;
+use winnow::combinator::separated;
+use winnow::combinator::trace;
 use winnow::token::one_of;
-use winnow::trace::trace;
 
 use crate::key::Key;
 use crate::parser::error::CustomError;
@@ -18,19 +18,18 @@
 // ;; Inline Table
 
 // inline-table = inline-table-open inline-table-keyvals inline-table-close
-pub(crate) fn inline_table<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, InlineTable, ContextError> {
+pub(crate) fn inline_table<'i>(input: &mut Input<'i>) -> PResult<InlineTable> {
     trace("inline-table", move |input: &mut Input<'i>| {
         delimited(
             INLINE_TABLE_OPEN,
-            cut_err(inline_table_keyvals(check).try_map(|(kv, p)| table_from_pairs(kv, p))),
+            cut_err(inline_table_keyvals.try_map(|(kv, p)| table_from_pairs(kv, p))),
             cut_err(INLINE_TABLE_CLOSE)
                 .context(StrContext::Label("inline table"))
                 .context(StrContext::Expected(StrContextValue::CharLiteral('}'))),
         )
         .parse_next(input)
     })
+    .parse_next(input)
 }
 
 fn table_from_pairs(
@@ -118,50 +117,43 @@
 // ( key keyval-sep val inline-table-sep inline-table-keyvals-non-empty ) /
 // ( key keyval-sep val )
 
-fn inline_table_keyvals<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, (Vec<(Vec<Key>, TableKeyValue)>, RawString), ContextError> {
-    move |input: &mut Input<'i>| {
-        let check = check.recursing(input)?;
-        (
-            separated0(keyval(check), INLINE_TABLE_SEP),
-            ws.span().map(RawString::with_span),
-        )
-            .parse_next(input)
-    }
+fn inline_table_keyvals(
+    input: &mut Input<'_>,
+) -> PResult<(Vec<(Vec<Key>, TableKeyValue)>, RawString)> {
+    (
+        separated(0.., keyval, INLINE_TABLE_SEP),
+        ws.span().map(RawString::with_span),
+    )
+        .parse_next(input)
 }
 
-fn keyval<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, (Vec<Key>, TableKeyValue), ContextError> {
-    move |input: &mut Input<'i>| {
-        (
-            key,
-            cut_err((
-                one_of(KEYVAL_SEP)
-                    .context(StrContext::Expected(StrContextValue::CharLiteral('.')))
-                    .context(StrContext::Expected(StrContextValue::CharLiteral('='))),
-                (ws.span(), value(check), ws.span()),
-            )),
-        )
-            .map(|(key, (_, v))| {
-                let mut path = key;
-                let key = path.pop().expect("grammar ensures at least 1");
+fn keyval(input: &mut Input<'_>) -> PResult<(Vec<Key>, TableKeyValue)> {
+    (
+        key,
+        cut_err((
+            one_of(KEYVAL_SEP)
+                .context(StrContext::Expected(StrContextValue::CharLiteral('.')))
+                .context(StrContext::Expected(StrContextValue::CharLiteral('='))),
+            (ws.span(), value, ws.span()),
+        )),
+    )
+        .map(|(key, (_, v))| {
+            let mut path = key;
+            let key = path.pop().expect("grammar ensures at least 1");
 
-                let (pre, v, suf) = v;
-                let pre = RawString::with_span(pre);
-                let suf = RawString::with_span(suf);
-                let v = v.decorated(pre, suf);
-                (
-                    path,
-                    TableKeyValue {
-                        key,
-                        value: Item::Value(v),
-                    },
-                )
-            })
-            .parse_next(input)
-    }
+            let (pre, v, suf) = v;
+            let pre = RawString::with_span(pre);
+            let suf = RawString::with_span(suf);
+            let v = v.decorated(pre, suf);
+            (
+                path,
+                TableKeyValue {
+                    key,
+                    value: Item::Value(v),
+                },
+            )
+        })
+        .parse_next(input)
 }
 
 #[cfg(test)]
@@ -181,7 +173,7 @@
         ];
         for input in inputs {
             dbg!(input);
-            let mut parsed = inline_table(Default::default()).parse(new_input(input));
+            let mut parsed = inline_table.parse(new_input(input));
             if let Ok(parsed) = &mut parsed {
                 parsed.despan(input);
             }
@@ -194,7 +186,7 @@
         let invalid_inputs = [r#"{a = 1e165"#, r#"{ hello = "world", a = 2, hello = 1}"#];
         for input in invalid_inputs {
             dbg!(input);
-            let mut parsed = inline_table(Default::default()).parse(new_input(input));
+            let mut parsed = inline_table.parse(new_input(input));
             if let Ok(parsed) = &mut parsed {
                 parsed.despan(input);
             }

crates/toml_edit/src/parser/key.rs

diff --git a/crates/toml_edit/src/parser/key.rs b/crates/toml_edit/src/parser/key.rs
index e72b195..ee729fd 100644
--- a/crates/toml_edit/src/parser/key.rs
+++ b/crates/toml_edit/src/parser/key.rs
@@ -1,10 +1,10 @@
 use std::ops::RangeInclusive;
 
 use winnow::combinator::peek;
-use winnow::combinator::separated1;
+use winnow::combinator::separated;
+use winnow::combinator::trace;
 use winnow::token::any;
 use winnow::token::take_while;
-use winnow::trace::trace;
 
 use crate::key::Key;
 use crate::parser::error::CustomError;
@@ -20,7 +20,8 @@
 pub(crate) fn key(input: &mut Input<'_>) -> PResult<Vec<Key>> {
     let mut key_path = trace(
         "dotted-key",
-        separated1(
+        separated(
+            1..,
             (ws.span(), simple_key, ws.span()).map(|(pre, (raw, key), suffix)| {
                 Key::new(key)
                     .with_repr_unchecked(Repr::new_unchecked(raw))

crates/toml_edit/src/parser/mod.rs

diff --git a/crates/toml_edit/src/parser/mod.rs b/crates/toml_edit/src/parser/mod.rs
index e032202..1d5dbcf 100644
--- a/crates/toml_edit/src/parser/mod.rs
+++ b/crates/toml_edit/src/parser/mod.rs
@@ -1,5 +1,6 @@
 #![allow(clippy::type_complexity)]
 
+use std::cell::RefCell;
 pub(crate) mod array;
 pub(crate) mod datetime;
 pub(crate) mod document;
@@ -13,17 +14,21 @@
 pub(crate) mod trivia;
 pub(crate) mod value;
 
-pub use crate::error::TomlError;
+pub(crate) use crate::error::TomlError;
 
-pub(crate) fn parse_document(raw: &str) -> Result<crate::Document, TomlError> {
+pub(crate) fn parse_document<S: AsRef<str>>(raw: S) -> Result<crate::ImDocument<S>, TomlError> {
     use prelude::*;
 
-    let b = new_input(raw);
-    let mut doc = document::document
-        .parse(b)
+    let b = new_input(raw.as_ref());
+    let state = RefCell::new(state::ParseState::new());
+    let state_ref = &state;
+    document::document(state_ref)
+        .parse(b.clone())
         .map_err(|e| TomlError::new(e, b))?;
-    doc.span = Some(0..(raw.len()));
-    doc.original = Some(raw.to_owned());
+    let doc = state
+        .into_inner()
+        .into_document(raw)
+        .map_err(|e| TomlError::custom(e.to_string(), None))?;
     Ok(doc)
 }
 
@@ -31,7 +36,7 @@
     use prelude::*;
 
     let b = new_input(raw);
-    let result = key::simple_key.parse(b);
+    let result = key::simple_key.parse(b.clone());
     match result {
         Ok((raw, key)) => {
             Ok(crate::Key::new(key).with_repr_unchecked(crate::Repr::new_unchecked(raw)))
@@ -44,7 +49,7 @@
     use prelude::*;
 
     let b = new_input(raw);
-    let result = key::key.parse(b);
+    let result = key::key.parse(b.clone());
     match result {
         Ok(mut keys) => {
             for key in &mut keys {
@@ -60,7 +65,7 @@
     use prelude::*;
 
     let b = new_input(raw);
-    let parsed = value::value(RecursionCheck::default()).parse(b);
+    let parsed = value::value.parse(b.clone());
     match parsed {
         Ok(mut value) => {
             // Only take the repr and not decor, as its probably not intended
@@ -81,60 +86,68 @@
     pub(crate) use winnow::PResult;
     pub(crate) use winnow::Parser;
 
-    pub(crate) type Input<'b> = winnow::Located<&'b winnow::BStr>;
+    pub(crate) type Input<'b> = winnow::Stateful<winnow::Located<&'b winnow::BStr>, RecursionCheck>;
 
     pub(crate) fn new_input(s: &str) -> Input<'_> {
-        winnow::Located::new(winnow::BStr::new(s))
+        winnow::Stateful {
+            input: winnow::Located::new(winnow::BStr::new(s)),
+            state: Default::default(),
+        }
     }
 
-    #[cfg(not(feature = "unbounded"))]
-    #[derive(Copy, Clone, Debug, Default)]
+    #[derive(Clone, Debug, Default, PartialEq, Eq)]
     pub(crate) struct RecursionCheck {
+        #[cfg(not(feature = "unbounded"))]
         current: usize,
     }
 
     #[cfg(not(feature = "unbounded"))]
+    const LIMIT: usize = 80;
+
     impl RecursionCheck {
-        pub(crate) fn check_depth(depth: usize) -> Result<(), super::error::CustomError> {
-            if depth < 128 {
-                Ok(())
-            } else {
-                Err(super::error::CustomError::RecursionLimitExceeded)
+        pub(crate) fn check_depth(_depth: usize) -> Result<(), super::error::CustomError> {
+            #[cfg(not(feature = "unbounded"))]
+            if LIMIT <= _depth {
+                return Err(super::error::CustomError::RecursionLimitExceeded);
             }
+
+            Ok(())
         }
 
-        pub(crate) fn recursing(
-            mut self,
-            input: &mut Input<'_>,
-        ) -> Result<Self, winnow::error::ErrMode<ContextError>> {
-            self.current += 1;
-            if self.current < 128 {
-                Ok(self)
-            } else {
-                Err(winnow::error::ErrMode::from_external_error(
-                    input,
-                    winnow::error::ErrorKind::Eof,
-                    super::error::CustomError::RecursionLimitExceeded,
-                ))
+        fn enter(&mut self) -> Result<(), super::error::CustomError> {
+            #[cfg(not(feature = "unbounded"))]
+            {
+                self.current += 1;
+                if LIMIT <= self.current {
+                    return Err(super::error::CustomError::RecursionLimitExceeded);
+                }
+            }
+            Ok(())
+        }
+
+        fn exit(&mut self) {
+            #[cfg(not(feature = "unbounded"))]
+            {
+                self.current -= 1;
             }
         }
     }
 
-    #[cfg(feature = "unbounded")]
-    #[derive(Copy, Clone, Debug, Default)]
-    pub(crate) struct RecursionCheck {}
-
-    #[cfg(feature = "unbounded")]
-    impl RecursionCheck {
-        pub(crate) fn check_depth(_depth: usize) -> Result<(), super::error::CustomError> {
-            Ok(())
-        }
-
-        pub(crate) fn recursing(
-            self,
-            _input: &mut Input<'_>,
-        ) -> Result<Self, winnow::error::ErrMode<ContextError>> {
-            Ok(self)
+    pub(crate) fn check_recursion<'b, O>(
+        mut parser: impl Parser<Input<'b>, O, ContextError>,
+    ) -> impl Parser<Input<'b>, O, ContextError> {
+        move |input: &mut Input<'b>| {
+            input.state.enter().map_err(|err| {
+                winnow::error::ErrMode::from_external_error(
+                    input,
+                    winnow::error::ErrorKind::Eof,
+                    err,
+                )
+                .cut()
+            })?;
+            let result = parser.parse_next(input);
+            input.state.exit();
+            result
         }
     }
 }
@@ -144,6 +157,8 @@
 #[cfg(feature = "display")]
 mod test {
     use super::*;
+    use snapbox::assert_data_eq;
+    use snapbox::prelude::*;
 
     #[test]
     fn documents() {
@@ -207,10 +222,7 @@
         ];
         for input in documents {
             dbg!(input);
-            let mut parsed = parse_document(input);
-            if let Ok(parsed) = &mut parsed {
-                parsed.despan();
-            }
+            let parsed = parse_document(input).map(|d| d.into_mut());
             let doc = match parsed {
                 Ok(doc) => doc,
                 Err(err) => {
@@ -221,7 +233,7 @@
                 }
             };
 
-            snapbox::assert_eq(input, doc.to_string());
+            assert_data_eq!(doc.to_string(), input.raw());
         }
     }
 
@@ -235,10 +247,7 @@
 "];
         for input in parse_only {
             dbg!(input);
-            let mut parsed = parse_document(input);
-            if let Ok(parsed) = &mut parsed {
-                parsed.despan();
-            }
+            let parsed = parse_document(input).map(|d| d.into_mut());
             match parsed {
                 Ok(_) => (),
                 Err(err) => {
@@ -257,10 +266,7 @@
 $"#];
         for input in invalid_inputs {
             dbg!(input);
-            let mut parsed = parse_document(input);
-            if let Ok(parsed) = &mut parsed {
-                parsed.despan();
-            }
+            let parsed = parse_document(input).map(|d| d.into_mut());
             assert!(parsed.is_err(), "Input: {:?}", input);
         }
     }

crates/toml_edit/src/parser/numbers.rs

diff --git a/crates/toml_edit/src/parser/numbers.rs b/crates/toml_edit/src/parser/numbers.rs
index 9681526..2310f24 100644
--- a/crates/toml_edit/src/parser/numbers.rs
+++ b/crates/toml_edit/src/parser/numbers.rs
@@ -7,10 +7,9 @@
 use winnow::combinator::preceded;
 use winnow::combinator::repeat;
 use winnow::combinator::rest;
+use winnow::combinator::trace;
 use winnow::token::one_of;
-use winnow::token::tag;
 use winnow::token::take;
-use winnow::trace::trace;
 
 use crate::parser::prelude::*;
 use crate::parser::trivia::from_utf8_unchecked;
@@ -63,23 +62,23 @@
                     repeat(
                         0..,
                         alt((
-                            digit.value(()),
+                            digit.void(),
                             (
                                 one_of(b'_'),
                                 cut_err(digit).context(StrContext::Expected(
                                     StrContextValue::Description("digit"),
                                 )),
                             )
-                                .value(()),
+                                .void(),
                         )),
                     )
                     .map(|()| ()),
                 )
-                    .value(()),
-                digit.value(()),
+                    .void(),
+                digit.void(),
             )),
         )
-            .recognize()
+            .take()
             .map(|b: &[u8]| unsafe {
                 from_utf8_unchecked(b, "`digit` and `_` filter out non-ASCII")
             })
@@ -101,19 +100,19 @@
                 repeat(
                     0..,
                     alt((
-                        hexdig.value(()),
+                        hexdig.void(),
                         (
                             one_of(b'_'),
                             cut_err(hexdig).context(StrContext::Expected(
                                 StrContextValue::Description("digit"),
                             )),
                         )
-                            .value(()),
+                            .void(),
                     )),
                 )
                 .map(|()| ()),
             ))
-            .recognize(),
+            .take(),
         )
         .map(|b| unsafe { from_utf8_unchecked(b, "`hexdig` and `_` filter out non-ASCII") })
         .context(StrContext::Label("hexadecimal integer")),
@@ -134,19 +133,19 @@
                 repeat(
                     0..,
                     alt((
-                        one_of(DIGIT0_7).value(()),
+                        one_of(DIGIT0_7).void(),
                         (
                             one_of(b'_'),
                             cut_err(one_of(DIGIT0_7)).context(StrContext::Expected(
                                 StrContextValue::Description("digit"),
                             )),
                         )
-                            .value(()),
+                            .void(),
                     )),
                 )
                 .map(|()| ()),
             ))
-            .recognize(),
+            .take(),
         )
         .map(|b| unsafe { from_utf8_unchecked(b, "`DIGIT0_7` and `_` filter out non-ASCII") })
         .context(StrContext::Label("octal integer")),
@@ -168,19 +167,19 @@
                 repeat(
                     0..,
                     alt((
-                        one_of(DIGIT0_1).value(()),
+                        one_of(DIGIT0_1).void(),
                         (
                             one_of(b'_'),
                             cut_err(one_of(DIGIT0_1)).context(StrContext::Expected(
                                 StrContextValue::Description("digit"),
                             )),
                         )
-                            .value(()),
+                            .void(),
                     )),
                 )
                 .map(|()| ()),
             ))
-            .recognize(),
+            .take(),
         )
         .map(|b| unsafe { from_utf8_unchecked(b, "`DIGIT0_1` and `_` filter out non-ASCII") })
         .context(StrContext::Label("binary integer")),
@@ -215,7 +214,7 @@
         dec_int,
         alt((exp.void(), (frac.void(), opt(exp.void())).void())),
     )
-        .recognize()
+        .take()
         .map(|b: &[u8]| unsafe {
             from_utf8_unchecked(
                 b,
@@ -233,7 +232,7 @@
         cut_err(zero_prefixable_int)
             .context(StrContext::Expected(StrContextValue::Description("digit"))),
     )
-        .recognize()
+        .take()
         .map(|b: &[u8]| unsafe {
             from_utf8_unchecked(
                 b,
@@ -250,18 +249,18 @@
         repeat(
             0..,
             alt((
-                digit.value(()),
+                digit.void(),
                 (
                     one_of(b'_'),
                     cut_err(digit)
                         .context(StrContext::Expected(StrContextValue::Description("digit"))),
                 )
-                    .value(()),
+                    .void(),
             )),
         )
         .map(|()| ()),
     )
-        .recognize()
+        .take()
         .map(|b: &[u8]| unsafe { from_utf8_unchecked(b, "`digit` and `_` filter out non-ASCII") })
         .parse_next(input)
 }
@@ -274,7 +273,7 @@
         opt(one_of([b'+', b'-'])),
         cut_err(zero_prefixable_int),
     )
-        .recognize()
+        .take()
         .map(|b: &[u8]| unsafe {
             from_utf8_unchecked(
                 b,
@@ -296,12 +295,12 @@
 }
 // inf = %x69.6e.66  ; inf
 pub(crate) fn inf(input: &mut Input<'_>) -> PResult<f64> {
-    tag(INF).value(f64::INFINITY).parse_next(input)
+    INF.value(f64::INFINITY).parse_next(input)
 }
 const INF: &[u8] = b"inf";
 // nan = %x6e.61.6e  ; nan
 pub(crate) fn nan(input: &mut Input<'_>) -> PResult<f64> {
-    tag(NAN).value(f64::NAN.copysign(1.0)).parse_next(input)
+    NAN.value(f64::NAN.copysign(1.0)).parse_next(input)
 }
 const NAN: &[u8] = b"nan";
 
@@ -337,8 +336,8 @@
             ("0xF", 15),
             ("0o0_755", 493),
             ("0b1_0_1", 5),
-            (&std::i64::MIN.to_string()[..], std::i64::MIN),
-            (&std::i64::MAX.to_string()[..], std::i64::MAX),
+            (&i64::MIN.to_string()[..], i64::MIN),
+            (&i64::MAX.to_string()[..], i64::MAX),
         ];
         for &(input, expected) in &cases {
             dbg!(input);
@@ -362,7 +361,7 @@
         } else {
             dbg!(expected);
             dbg!(actual);
-            assert!((expected - actual).abs() < std::f64::EPSILON);
+            assert!((expected - actual).abs() < f64::EPSILON);
         }
     }
 
@@ -377,15 +376,15 @@
             ("-2E-2", -2E-2),
             ("6.626e-34", 6.626e-34),
             ("9_224_617.445_991_228_313", 9_224_617.445_991_227),
-            ("-1.7976931348623157e+308", std::f64::MIN),
-            ("1.7976931348623157e+308", std::f64::MAX),
+            ("-1.7976931348623157e+308", f64::MIN),
+            ("1.7976931348623157e+308", f64::MAX),
             ("nan", f64::NAN.copysign(1.0)),
             ("+nan", f64::NAN.copysign(1.0)),
             ("-nan", f64::NAN.copysign(-1.0)),
             ("inf", f64::INFINITY),
             ("+inf", f64::INFINITY),
             ("-inf", f64::NEG_INFINITY),
-            // ("1e+400", std::f64::INFINITY),
+            // ("1e+400", f64::INFINITY),
         ];
         for &(input, expected) in &cases {
             dbg!(input);

crates/toml_edit/src/parser/state.rs

diff --git a/crates/toml_edit/src/parser/state.rs b/crates/toml_edit/src/parser/state.rs
index 187dd5f..2513634 100644
--- a/crates/toml_edit/src/parser/state.rs
+++ b/crates/toml_edit/src/parser/state.rs
@@ -2,10 +2,10 @@
 use crate::parser::error::CustomError;
 use crate::repr::Decor;
 use crate::table::TableKeyValue;
-use crate::{ArrayOfTables, Document, InternalString, Item, RawString, Table};
+use crate::{ArrayOfTables, ImDocument, InternalString, Item, RawString, Table};
 
 pub(crate) struct ParseState {
-    document: Document,
+    root: Table,
     trailing: Option<std::ops::Range<usize>>,
     current_table_position: usize,
     current_table: Table,
@@ -14,11 +14,27 @@
 }
 
 impl ParseState {
-    pub(crate) fn into_document(mut self) -> Result<Document, CustomError> {
+    pub(crate) fn new() -> Self {
+        let mut root = Table::new();
+        root.span = Some(0..0);
+        Self {
+            root: Table::new(),
+            trailing: None,
+            current_table_position: 0,
+            current_table: root,
+            current_is_array: false,
+            current_table_path: Vec::new(),
+        }
+    }
+
+    pub(crate) fn into_document<S>(mut self, raw: S) -> Result<ImDocument<S>, CustomError> {
         self.finalize_table()?;
-        let trailing = self.trailing.map(RawString::with_span);
-        self.document.trailing = trailing.unwrap_or_default();
-        Ok(self.document)
+        let trailing = self.trailing.map(RawString::with_span).unwrap_or_default();
+        Ok(ImDocument {
+            root: Item::Table(self.root),
+            trailing,
+            raw,
+        })
     }
 
     pub(crate) fn on_ws(&mut self, span: std::ops::Range<usize>) {
@@ -100,7 +116,7 @@
         debug_assert!(self.current_table_path.is_empty());
 
         // Look up the table on start to ensure the duplicate_key error points to the right line
-        let root = self.document.as_table_mut();
+        let root = &mut self.root;
         let parent_table = Self::descend_path(root, &path[..path.len() - 1], false)?;
         let key = &path[path.len() - 1];
         let entry = parent_table
@@ -134,7 +150,7 @@
 
         // 1. Look up the table on start to ensure the duplicate_key error points to the right line
         // 2. Ensure any child tables from an implicit table are preserved
-        let root = self.document.as_table_mut();
+        let root = &mut self.root;
         let parent_table = Self::descend_path(root, &path[..path.len() - 1], false)?;
         let key = &path[path.len() - 1];
         if let Some(entry) = parent_table.remove(key.get()) {
@@ -163,7 +179,7 @@
         let mut table = std::mem::take(&mut self.current_table);
         let path = std::mem::take(&mut self.current_table_path);
 
-        let root = self.document.as_table_mut();
+        let root = &mut self.root;
         if path.is_empty() {
             assert!(root.is_empty());
             std::mem::swap(&mut table, root);
@@ -249,7 +265,7 @@
                     }
                     table = sweet_child_of_mine;
                 }
-                _ => unreachable!(),
+                Item::None => unreachable!(),
             }
         }
         Ok(table)
@@ -301,18 +317,3 @@
         Ok(())
     }
 }
-
-impl Default for ParseState {
-    fn default() -> Self {
-        let mut root = Table::new();
-        root.span = Some(0..0);
-        Self {
-            document: Document::new(),
-            trailing: None,
-            current_table_position: 0,
-            current_table: root,
-            current_is_array: false,
-            current_table_path: Vec::new(),
-        }
-    }
-}

crates/toml_edit/src/parser/strings.rs

diff --git a/crates/toml_edit/src/parser/strings.rs b/crates/toml_edit/src/parser/strings.rs
index 675b5c6..b1c41b9 100644
--- a/crates/toml_edit/src/parser/strings.rs
+++ b/crates/toml_edit/src/parser/strings.rs
@@ -5,21 +5,20 @@
 use winnow::combinator::alt;
 use winnow::combinator::cut_err;
 use winnow::combinator::delimited;
+use winnow::combinator::empty;
 use winnow::combinator::fail;
 use winnow::combinator::opt;
 use winnow::combinator::peek;
 use winnow::combinator::preceded;
 use winnow::combinator::repeat;
-use winnow::combinator::success;
 use winnow::combinator::terminated;
+use winnow::combinator::trace;
 use winnow::prelude::*;
 use winnow::stream::Stream;
 use winnow::token::any;
 use winnow::token::none_of;
 use winnow::token::one_of;
-use winnow::token::tag;
 use winnow::token::take_while;
-use winnow::trace::trace;
 
 use crate::parser::error::CustomError;
 use crate::parser::numbers::HEXDIG;
@@ -110,15 +109,15 @@
 // escape-seq-char =/ %x55 8HEXDIG ; UXXXXXXXX            U+XXXXXXXX
 fn escape_seq_char(input: &mut Input<'_>) -> PResult<char> {
     dispatch! {any;
-        b'b' => success('\u{8}'),
-        b'f' => success('\u{c}'),
-        b'n' => success('\n'),
-        b'r' => success('\r'),
-        b't' => success('\t'),
+        b'b' => empty.value('\u{8}'),
+        b'f' => empty.value('\u{c}'),
+        b'n' => empty.value('\n'),
+        b'r' => empty.value('\r'),
+        b't' => empty.value('\t'),
         b'u' => cut_err(hexescape::<4>).context(StrContext::Label("unicode 4-digit hex code")),
         b'U' => cut_err(hexescape::<8>).context(StrContext::Label("unicode 8-digit hex code")),
-        b'\\' => success('\\'),
-        b'"' => success('"'),
+        b'\\' => empty.value('\\'),
+        b'"' => empty.value('"'),
         _ => {
             cut_err(fail::<_, char, _>)
             .context(StrContext::Label("escape sequence"))
@@ -154,10 +153,10 @@
         "ml-basic-string",
         delimited(
             ML_BASIC_STRING_DELIM,
-            preceded(opt(newline), cut_err(ml_basic_body)),
-            cut_err(ML_BASIC_STRING_DELIM),
-        )
-        .context(StrContext::Label("multiline basic string")),
+            preceded(opt(newline), cut_err(ml_basic_body))
+                .context(StrContext::Label("multiline basic string")),
+            cut_err(ML_BASIC_STRING_DELIM).context(StrContext::Label("multiline basic string")),
+        ),
     )
     .parse_next(input)
 }
@@ -187,7 +186,7 @@
         }
     }
 
-    if let Some(qi) = opt(mlb_quotes(tag(ML_BASIC_STRING_DELIM).value(()))).parse_next(input)? {
+    if let Some(qi) = opt(mlb_quotes(ML_BASIC_STRING_DELIM.void())).parse_next(input)? {
         c.to_mut().push_str(qi);
     }
 
@@ -213,7 +212,7 @@
 
 // mlb-quotes = 1*2quotation-mark
 fn mlb_quotes<'i>(
-    mut term: impl winnow::Parser<Input<'i>, (), ContextError>,
+    mut term: impl Parser<Input<'i>, (), ContextError>,
 ) -> impl Parser<Input<'i>, &'i str, ContextError> {
     move |input: &mut Input<'i>| {
         let start = input.checkpoint();
@@ -223,7 +222,7 @@
 
         match res {
             Err(winnow::error::ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 terminated(b"\"", peek(term.by_ref()))
                     .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
                     .parse_next(input)
@@ -297,10 +296,10 @@
                 } else {
                     Cow::Borrowed(t)
                 }
-            })),
-            cut_err(ML_LITERAL_STRING_DELIM),
-        )
-        .context(StrContext::Label("multiline literal string")),
+            }))
+            .context(StrContext::Label("multiline literal string")),
+            cut_err(ML_LITERAL_STRING_DELIM).context(StrContext::Label("multiline literal string")),
+        ),
     )
     .parse_next(input)
 }
@@ -320,16 +319,16 @@
             ),
         )
         .map(|()| ()),
-        opt(mll_quotes(tag(ML_LITERAL_STRING_DELIM).value(()))),
+        opt(mll_quotes(ML_LITERAL_STRING_DELIM.void())),
     )
-        .recognize()
+        .take()
         .try_map(std::str::from_utf8)
         .parse_next(input)
 }
 
 // mll-content = mll-char / newline
 fn mll_content(input: &mut Input<'_>) -> PResult<u8> {
-    alt((one_of(MLL_CHAR), newline)).parse_next(input)
+    alt((one_of(MLL_CHAR), newline.value(b'\n'))).parse_next(input)
 }
 
 // mll-char = %x09 / %x20-26 / %x28-7E / non-ascii
@@ -342,7 +341,7 @@
 
 // mll-quotes = 1*2apostrophe
 fn mll_quotes<'i>(
-    mut term: impl winnow::Parser<Input<'i>, (), ContextError>,
+    mut term: impl Parser<Input<'i>, (), ContextError>,
 ) -> impl Parser<Input<'i>, &'i str, ContextError> {
     move |input: &mut Input<'i>| {
         let start = input.checkpoint();
@@ -352,7 +351,7 @@
 
         match res {
             Err(winnow::error::ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 terminated(b"'", peek(term.by_ref()))
                     .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
                     .parse_next(input)

crates/toml_edit/src/parser/trivia.rs

diff --git a/crates/toml_edit/src/parser/trivia.rs b/crates/toml_edit/src/parser/trivia.rs
index 4575fb1..5630bca 100644
--- a/crates/toml_edit/src/parser/trivia.rs
+++ b/crates/toml_edit/src/parser/trivia.rs
@@ -1,11 +1,16 @@
 use std::ops::RangeInclusive;
 
 use winnow::combinator::alt;
+use winnow::combinator::empty;
 use winnow::combinator::eof;
+use winnow::combinator::fail;
 use winnow::combinator::opt;
+use winnow::combinator::peek;
 use winnow::combinator::repeat;
 use winnow::combinator::terminated;
 use winnow::prelude::*;
+use winnow::stream::Stream as _;
+use winnow::token::any;
 use winnow::token::one_of;
 use winnow::token::take_while;
 
@@ -15,11 +20,13 @@
     bytes: &'b [u8],
     safety_justification: &'static str,
 ) -> &'b str {
-    if cfg!(debug_assertions) {
-        // Catch problems more quickly when testing
-        std::str::from_utf8(bytes).expect(safety_justification)
-    } else {
-        std::str::from_utf8_unchecked(bytes)
+    unsafe {
+        if cfg!(debug_assertions) {
+            // Catch problems more quickly when testing
+            std::str::from_utf8(bytes).expect(safety_justification)
+        } else {
+            std::str::from_utf8_unchecked(bytes)
+        }
     }
 }
 
@@ -48,69 +55,71 @@
 pub(crate) const COMMENT_START_SYMBOL: u8 = b'#';
 
 // comment = comment-start-symbol *non-eol
-pub(crate) fn comment<'i>(input: &mut Input<'i>) -> PResult<&'i [u8]> {
+pub(crate) fn comment(input: &mut Input<'_>) -> PResult<()> {
     (COMMENT_START_SYMBOL, take_while(0.., NON_EOL))
-        .recognize()
+        .void()
         .parse_next(input)
 }
 
 // newline = ( %x0A /              ; LF
 //             %x0D.0A )           ; CRLF
-pub(crate) fn newline(input: &mut Input<'_>) -> PResult<u8> {
-    alt((
-        one_of(LF).value(b'\n'),
-        (one_of(CR), one_of(LF)).value(b'\n'),
-    ))
+pub(crate) fn newline(input: &mut Input<'_>) -> PResult<()> {
+    dispatch! {any;
+        b'\n' => empty,
+        b'\r' => one_of(LF).void(),
+        _ => fail,
+    }
     .parse_next(input)
 }
 pub(crate) const LF: u8 = b'\n';
 pub(crate) const CR: u8 = b'\r';
 
 // ws-newline       = *( wschar / newline )
-pub(crate) fn ws_newline<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
+pub(crate) fn ws_newline(input: &mut Input<'_>) -> PResult<()> {
     repeat(
         0..,
         alt((newline.value(&b"\n"[..]), take_while(1.., WSCHAR))),
     )
     .map(|()| ())
-    .recognize()
-    .map(|b| unsafe { from_utf8_unchecked(b, "`is_wschar` and `newline` filters out on-ASCII") })
     .parse_next(input)
 }
 
 // ws-newlines      = newline *( wschar / newline )
-pub(crate) fn ws_newlines<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
-    (newline, ws_newline)
-        .recognize()
-        .map(|b| unsafe {
-            from_utf8_unchecked(b, "`is_wschar` and `newline` filters out on-ASCII")
-        })
-        .parse_next(input)
+pub(crate) fn ws_newlines(input: &mut Input<'_>) -> PResult<()> {
+    (newline, ws_newline).void().parse_next(input)
 }
 
 // note: this rule is not present in the original grammar
 // ws-comment-newline = *( ws-newline-nonempty / comment )
-pub(crate) fn ws_comment_newline<'i>(input: &mut Input<'i>) -> PResult<&'i [u8]> {
-    repeat(
-        0..,
-        alt((
-            repeat(
-                1..,
-                alt((take_while(1.., WSCHAR), newline.value(&b"\n"[..]))),
-            )
-            .map(|()| ()),
-            comment.value(()),
-        )),
-    )
-    .map(|()| ())
-    .recognize()
-    .parse_next(input)
+pub(crate) fn ws_comment_newline(input: &mut Input<'_>) -> PResult<()> {
+    let mut start = input.checkpoint();
+    loop {
+        let _ = ws.parse_next(input)?;
+
+        let next_token = opt(peek(any)).parse_next(input)?;
+        match next_token {
+            Some(b'#') => (comment, newline).void().parse_next(input)?,
+            Some(b'\n') => (newline).void().parse_next(input)?,
+            Some(b'\r') => (newline).void().parse_next(input)?,
+            _ => break,
+        }
+
+        let end = input.checkpoint();
+        if start == end {
+            break;
+        }
+        start = end;
+    }
+
+    Ok(())
 }
 
 // note: this rule is not present in the original grammar
 // line-ending = newline / eof
-pub(crate) fn line_ending<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
-    alt((newline.value("\n"), eof.value(""))).parse_next(input)
+pub(crate) fn line_ending(input: &mut Input<'_>) -> PResult<()> {
+    alt((newline.value("\n"), eof.value("")))
+        .void()
+        .parse_next(input)
 }
 
 // note: this rule is not present in the original grammar
@@ -149,7 +158,7 @@
         ];
         for input in inputs {
             dbg!(input);
-            let parsed = ws_comment_newline.parse(new_input(input));
+            let parsed = ws_comment_newline.take().parse(new_input(input));
             assert!(parsed.is_ok(), "{:?}", parsed);
             let parsed = parsed.unwrap();
             assert_eq!(parsed, input.as_bytes());

crates/toml_edit/src/parser/value.rs

diff --git a/crates/toml_edit/src/parser/value.rs b/crates/toml_edit/src/parser/value.rs
index 33300ec..93f2eef 100644
--- a/crates/toml_edit/src/parser/value.rs
+++ b/crates/toml_edit/src/parser/value.rs
@@ -10,66 +10,64 @@
 use crate::parser::prelude::*;
 use crate::parser::strings::string;
 use crate::repr::{Formatted, Repr};
-use crate::value as v;
 use crate::RawString;
 use crate::Value;
 
 // val = string / boolean / array / inline-table / date-time / float / integer
-pub(crate) fn value<'i>(check: RecursionCheck) -> impl Parser<Input<'i>, v::Value, ContextError> {
-    move |input: &mut Input<'i>| {
-        dispatch!{peek(any);
+pub(crate) fn value(input: &mut Input<'_>) -> PResult<Value> {
+    dispatch! {peek(any);
             crate::parser::strings::QUOTATION_MARK |
             crate::parser::strings::APOSTROPHE => string.map(|s| {
-                v::Value::String(Formatted::new(
+                Value::String(Formatted::new(
                     s.into_owned()
                 ))
             }),
-            crate::parser::array::ARRAY_OPEN => array(check).map(v::Value::Array),
-            crate::parser::inline_table::INLINE_TABLE_OPEN => inline_table(check).map(v::Value::InlineTable),
+            crate::parser::array::ARRAY_OPEN => check_recursion(array).map(Value::Array),
+            crate::parser::inline_table::INLINE_TABLE_OPEN => check_recursion(inline_table).map(Value::InlineTable),
             // Date/number starts
             b'+' | b'-' | b'0'..=b'9' => {
                 // Uncommon enough not to be worth optimizing at this time
                 alt((
                     date_time
-                        .map(v::Value::from),
+                        .map(Value::from),
                     float
-                        .map(v::Value::from),
+                        .map(Value::from),
                     integer
-                        .map(v::Value::from),
+                        .map(Value::from),
                 ))
             },
             // Report as if they were numbers because its most likely a typo
             b'_' => {
                     integer
-                        .map(v::Value::from)
+                        .map(Value::from)
                 .context(StrContext::Expected(StrContextValue::Description("leading digit")))
             },
             // Report as if they were numbers because its most likely a typo
             b'.' =>  {
                     float
-                        .map(v::Value::from)
+                        .map(Value::from)
                 .context(StrContext::Expected(StrContextValue::Description("leading digit")))
             },
             b't' => {
-                crate::parser::numbers::true_.map(v::Value::from)
+                crate::parser::numbers::true_.map(Value::from)
                     .context(StrContext::Label("string"))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('"')))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('\'')))
             },
             b'f' => {
-                crate::parser::numbers::false_.map(v::Value::from)
+                crate::parser::numbers::false_.map(Value::from)
                     .context(StrContext::Label("string"))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('"')))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('\'')))
             },
             b'i' => {
-                crate::parser::numbers::inf.map(v::Value::from)
+                crate::parser::numbers::inf.map(Value::from)
                     .context(StrContext::Label("string"))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('"')))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('\'')))
             },
             b'n' => {
-                crate::parser::numbers::nan.map(v::Value::from)
+                crate::parser::numbers::nan.map(Value::from)
                     .context(StrContext::Label("string"))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('"')))
                     .context(StrContext::Expected(StrContextValue::CharLiteral('\'')))
@@ -81,13 +79,12 @@
                     .context(StrContext::Expected(StrContextValue::CharLiteral('\'')))
             },
     }
-        .with_span()
-        .try_map(|(value, span)| apply_raw(value, span))
-        .parse_next(input)
-    }
+    .with_span()
+    .map(|(value, span)| apply_raw(value, span))
+    .parse_next(input)
 }
 
-fn apply_raw(mut val: Value, span: std::ops::Range<usize>) -> Result<Value, std::str::Utf8Error> {
+fn apply_raw(mut val: Value, span: std::ops::Range<usize>) -> Value {
     match val {
         Value::String(ref mut f) => {
             let raw = RawString::with_span(span);
@@ -117,7 +114,7 @@
         }
     };
     val.decorate("", "");
-    Ok(val)
+    val
 }
 
 #[cfg(test)]
@@ -147,7 +144,7 @@
         ];
         for input in inputs {
             dbg!(input);
-            let mut parsed = value(Default::default()).parse(new_input(input));
+            let mut parsed = value.parse(new_input(input));
             if let Ok(parsed) = &mut parsed {
                 parsed.despan(input);
             }

crates/toml_edit/src/raw_string.rs

diff --git a/crates/toml_edit/src/raw_string.rs b/crates/toml_edit/src/raw_string.rs
index 53714a1..0bde3b7 100644
--- a/crates/toml_edit/src/raw_string.rs
+++ b/crates/toml_edit/src/raw_string.rs
@@ -21,6 +21,8 @@
     }
 
     /// Access the underlying string
+    ///
+    /// This generally requires a [`DocumentMut`][crate::DocumentMut].
     pub fn as_str(&self) -> Option<&str> {
         match &self.0 {
             RawStringInner::Empty => Some(""),
@@ -29,6 +31,17 @@
         }
     }
 
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
+        match &self.0 {
+            RawStringInner::Empty => None,
+            RawStringInner::Explicit(_) => None,
+            RawStringInner::Spanned(span) => Some(span.clone()),
+        }
+    }
+
     pub(crate) fn to_str<'s>(&'s self, input: &'s str) -> &'s str {
         match &self.0 {
             RawStringInner::Empty => "",
@@ -59,15 +72,6 @@
         }
     }
 
-    /// Access the underlying span
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
-        match &self.0 {
-            RawStringInner::Empty => None,
-            RawStringInner::Explicit(_) => None,
-            RawStringInner::Spanned(span) => Some(span.clone()),
-        }
-    }
-
     pub(crate) fn despan(&mut self, input: &str) {
         match &self.0 {
             RawStringInner::Empty => {}
@@ -75,7 +79,7 @@
             RawStringInner::Spanned(span) => {
                 *self = Self::from(input.get(span.clone()).unwrap_or_else(|| {
                     panic!("span {:?} should be in input:\n```\n{}\n```", span, input)
-                }))
+                }));
             }
         }
     }

crates/toml_edit/src/repr.rs

diff --git a/crates/toml_edit/src/repr.rs b/crates/toml_edit/src/repr.rs
index ad41bbf..80d78c3 100644
--- a/crates/toml_edit/src/repr.rs
+++ b/crates/toml_edit/src/repr.rs
@@ -51,7 +51,7 @@
 
     /// Returns a raw representation.
     #[cfg(feature = "display")]
-    pub fn display_repr(&self) -> Cow<str> {
+    pub fn display_repr(&self) -> Cow<'_, str> {
         self.as_repr()
             .and_then(|r| r.as_raw().as_str())
             .map(Cow::Borrowed)
@@ -60,8 +60,10 @@
             })
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.repr.as_ref().and_then(|r| r.span())
     }
 
@@ -150,13 +152,15 @@
         &self.raw_value
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.raw_value.span()
     }
 
     pub(crate) fn despan(&mut self, input: &str) {
-        self.raw_value.despan(input)
+        self.raw_value.despan(input);
     }
 
     #[cfg(feature = "display")]

crates/toml_edit/src/ser/array.rs

diff --git a/crates/toml_edit/src/ser/array.rs b/crates/toml_edit/src/ser/array.rs
index 80eba8b..a42cc66 100644
--- a/crates/toml_edit/src/ser/array.rs
+++ b/crates/toml_edit/src/ser/array.rs
@@ -21,9 +21,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         let value = value.serialize(super::ValueSerializer {})?;
         self.values.push(crate::Item::Value(value));
@@ -39,9 +39,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         serde::ser::SerializeSeq::serialize_element(self, value)
     }
@@ -55,9 +55,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         serde::ser::SerializeSeq::serialize_element(self, value)
     }
@@ -71,9 +71,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         serde::ser::SerializeSeq::serialize_element(self, value)
     }

crates/toml_edit/src/ser/key.rs

diff --git a/crates/toml_edit/src/ser/key.rs b/crates/toml_edit/src/ser/key.rs
index d5e381b..3ba0840 100644
--- a/crates/toml_edit/src/ser/key.rs
+++ b/crates/toml_edit/src/ser/key.rs
@@ -75,9 +75,9 @@
         Err(Error::KeyNotString)
     }
 
-    fn serialize_some<T: ?Sized>(self, _value: &T) -> Result<InternalString, Self::Error>
+    fn serialize_some<T>(self, _value: &T) -> Result<InternalString, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         Err(Error::KeyNotString)
     }
@@ -99,18 +99,18 @@
         Ok(variant.into())
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         value: &T,
     ) -> Result<InternalString, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -118,7 +118,7 @@
         _value: &T,
     ) -> Result<InternalString, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         Err(Error::KeyNotString)
     }

crates/toml_edit/src/ser/map.rs

diff --git a/crates/toml_edit/src/ser/map.rs b/crates/toml_edit/src/ser/map.rs
index 47e56ba..4902902 100644
--- a/crates/toml_edit/src/ser/map.rs
+++ b/crates/toml_edit/src/ser/map.rs
@@ -24,9 +24,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
+    fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         match self {
             Self::Datetime(s) => s.serialize_key(input),
@@ -34,9 +34,9 @@
         }
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         match self {
             Self::Datetime(s) => s.serialize_value(value),
@@ -56,13 +56,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         match self {
             Self::Datetime(s) => s.serialize_field(key, value),
@@ -93,16 +89,16 @@
     type Ok = crate::Datetime;
     type Error = Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, _input: &T) -> Result<(), Self::Error>
+    fn serialize_key<T>(&mut self, _input: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         unreachable!("datetimes should only be serialized as structs, not maps")
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, _value: &T) -> Result<(), Self::Error>
+    fn serialize_value<T>(&mut self, _value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         unreachable!("datetimes should only be serialized as structs, not maps")
     }
@@ -116,13 +112,9 @@
     type Ok = crate::Datetime;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         if key == toml_datetime::__unstable::FIELD {
             self.value = Some(value.serialize(DatetimeFieldSerializer::default())?);
@@ -161,17 +153,17 @@
     type Ok = crate::InlineTable;
     type Error = Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
+    fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         self.key = Some(input.serialize(KeySerializer)?);
         Ok(())
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         let mut value_serializer = MapValueSerializer::new();
         let res = value.serialize(&mut value_serializer);
@@ -202,13 +194,9 @@
     type Ok = crate::InlineTable;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         let mut value_serializer = MapValueSerializer::new();
         let res = value.serialize(&mut value_serializer);
@@ -308,9 +296,9 @@
         Err(Error::DateInvalid)
     }
 
-    fn serialize_some<T: ?Sized>(self, _value: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, _value: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         Err(Error::DateInvalid)
     }
@@ -332,18 +320,18 @@
         Err(Error::DateInvalid)
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         _value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         Err(Error::DateInvalid)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -351,7 +339,7 @@
         _value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         Err(Error::DateInvalid)
     }
@@ -419,13 +407,13 @@
 impl serde::ser::Serializer for &mut MapValueSerializer {
     type Ok = crate::Value;
     type Error = Error;
-    type SerializeSeq = super::SerializeValueArray;
-    type SerializeTuple = super::SerializeValueArray;
-    type SerializeTupleStruct = super::SerializeValueArray;
-    type SerializeTupleVariant = super::SerializeTupleVariant;
-    type SerializeMap = super::SerializeMap;
-    type SerializeStruct = super::SerializeMap;
-    type SerializeStructVariant = super::SerializeStructVariant;
+    type SerializeSeq = SerializeValueArray;
+    type SerializeTuple = SerializeValueArray;
+    type SerializeTupleStruct = SerializeValueArray;
+    type SerializeTupleVariant = SerializeTupleVariant;
+    type SerializeMap = SerializeMap;
+    type SerializeStruct = SerializeMap;
+    type SerializeStructVariant = SerializeStructVariant;
 
     fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
         ValueSerializer::new().serialize_bool(v)
@@ -488,9 +476,9 @@
         Err(Error::UnsupportedNone)
     }
 
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         ValueSerializer::new().serialize_some(value)
     }
@@ -512,18 +500,18 @@
         ValueSerializer::new().serialize_unit_variant(name, variant_index, variant)
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         name: &'static str,
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         ValueSerializer::new().serialize_newtype_struct(name, value)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         name: &'static str,
         variant_index: u32,
@@ -531,7 +519,7 @@
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         ValueSerializer::new().serialize_newtype_variant(name, variant_index, variant, value)
     }
@@ -585,8 +573,8 @@
     }
 }
 
-pub type SerializeTupleVariant = SerializeVariant<SerializeValueArray>;
-pub type SerializeStructVariant = SerializeVariant<SerializeMap>;
+pub(crate) type SerializeTupleVariant = SerializeVariant<SerializeValueArray>;
+pub(crate) type SerializeStructVariant = SerializeVariant<SerializeMap>;
 
 pub struct SerializeVariant<T> {
     variant: &'static str,
@@ -615,9 +603,9 @@
     type Ok = crate::Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         serde::ser::SerializeSeq::serialize_element(&mut self.inner, value)
     }

crates/toml_edit/src/ser/mod.rs

diff --git a/crates/toml_edit/src/ser/mod.rs b/crates/toml_edit/src/ser/mod.rs
index ba31708..3cf00c3 100644
--- a/crates/toml_edit/src/ser/mod.rs
+++ b/crates/toml_edit/src/ser/mod.rs
@@ -51,7 +51,7 @@
 }
 
 impl std::fmt::Display for Error {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::UnsupportedType(Some(t)) => write!(formatter, "unsupported {t} type"),
             Self::UnsupportedType(None) => write!(formatter, "unsupported rust type"),
@@ -85,9 +85,9 @@
 /// fail, if `T` contains a map with non-string keys, or if `T` attempts to
 /// serialize an unsupported datatype such as an enum, tuple, or tuple struct.
 #[cfg(feature = "display")]
-pub fn to_vec<T: ?Sized>(value: &T) -> Result<Vec<u8>, Error>
+pub fn to_vec<T>(value: &T) -> Result<Vec<u8>, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     to_string(value).map(|e| e.into_bytes())
 }
@@ -129,9 +129,9 @@
 /// println!("{}", toml)
 /// ```
 #[cfg(feature = "display")]
-pub fn to_string<T: ?Sized>(value: &T) -> Result<String, Error>
+pub fn to_string<T>(value: &T) -> Result<String, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     to_document(value).map(|e| e.to_string())
 }
@@ -141,9 +141,9 @@
 /// This is identical to `to_string` except the output string has a more
 /// "pretty" output. See `ValueSerializer::pretty` for more details.
 #[cfg(feature = "display")]
-pub fn to_string_pretty<T: ?Sized>(value: &T) -> Result<String, Error>
+pub fn to_string_pretty<T>(value: &T) -> Result<String, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     let mut document = to_document(value)?;
     pretty::Pretty.visit_document_mut(&mut document);
@@ -153,9 +153,9 @@
 /// Serialize the given data structure into a TOML document.
 ///
 /// This would allow custom formatting to be applied, mixing with format preserving edits, etc.
-pub fn to_document<T: ?Sized>(value: &T) -> Result<crate::Document, Error>
+pub fn to_document<T>(value: &T) -> Result<crate::DocumentMut, Error>
 where
-    T: serde::ser::Serialize,
+    T: serde::ser::Serialize + ?Sized,
 {
     let value = value.serialize(ValueSerializer::new())?;
     let item = crate::Item::Value(value);

crates/toml_edit/src/ser/pretty.rs

diff --git a/crates/toml_edit/src/ser/pretty.rs b/crates/toml_edit/src/ser/pretty.rs
index 2c22f68..05552bf 100644
--- a/crates/toml_edit/src/ser/pretty.rs
+++ b/crates/toml_edit/src/ser/pretty.rs
@@ -1,7 +1,7 @@
 pub(crate) struct Pretty;
 
 impl crate::visit_mut::VisitMut for Pretty {
-    fn visit_document_mut(&mut self, node: &mut crate::Document) {
+    fn visit_document_mut(&mut self, node: &mut crate::DocumentMut) {
         crate::visit_mut::visit_document_mut(self, node);
     }
 

crates/toml_edit/src/ser/value.rs

diff --git a/crates/toml_edit/src/ser/value.rs b/crates/toml_edit/src/ser/value.rs
index 47a17a3..b67bd8a 100644
--- a/crates/toml_edit/src/ser/value.rs
+++ b/crates/toml_edit/src/ser/value.rs
@@ -13,6 +13,8 @@
 /// # Examples
 ///
 /// ```
+/// # #[cfg(feature = "parse")] {
+/// # #[cfg(feature = "display")] {
 /// use serde::Serialize;
 ///
 /// #[derive(Serialize)]
@@ -42,6 +44,8 @@
 ///     toml_edit::ser::ValueSerializer::new()
 /// ).unwrap();
 /// println!("{}", value)
+/// # }
+/// # }
 /// ```
 #[derive(Default)]
 #[non_exhaustive]
@@ -140,9 +144,9 @@
         Err(Error::UnsupportedNone)
     }
 
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
@@ -164,18 +168,18 @@
         self.serialize_str(variant)
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -183,7 +187,7 @@
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::ser::Serialize + ?Sized,
     {
         let value = value.serialize(self)?;
         let mut table = crate::InlineTable::new();

crates/toml_edit/src/table.rs

diff --git a/crates/toml_edit/src/table.rs b/crates/toml_edit/src/table.rs
index cc0d2b2..2863946 100644
--- a/crates/toml_edit/src/table.rs
+++ b/crates/toml_edit/src/table.rs
@@ -167,8 +167,8 @@
     /// ```
     /// # #[cfg(feature = "parse")] {
     /// # #[cfg(feature = "display")] {
-    /// use toml_edit::Document;
-    /// let mut doc = "[a]\n[a.b]\n".parse::<Document>().expect("invalid toml");
+    /// use toml_edit::DocumentMut;
+    /// let mut doc = "[a]\n[a.b]\n".parse::<DocumentMut>().expect("invalid toml");
     ///
     /// doc["a"].as_table_mut().unwrap().set_implicit(true);
     /// assert_eq!(doc.to_string(), "[a.b]\n");
@@ -194,12 +194,12 @@
         self.dotted
     }
 
-    /// Sets the position of the `Table` within the `Document`.
+    /// Sets the position of the `Table` within the [`DocumentMut`][crate::DocumentMut].
     pub fn set_position(&mut self, doc_position: usize) {
         self.doc_position = Some(doc_position);
     }
 
-    /// The position of the `Table` within the `Document`.
+    /// The position of the `Table` within the [`DocumentMut`][crate::DocumentMut].
     ///
     /// Returns `None` if the `Table` was created manually (i.e. not via parsing)
     /// in which case its position is set automatically.  This can be overridden with
@@ -242,8 +242,10 @@
         self.items.get(key).map(|kv| kv.key.leaf_decor())
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         self.span.clone()
     }
 
@@ -290,7 +292,7 @@
 
     /// Clears the table, removing all key-value pairs. Keeps the allocated memory for reuse.
     pub fn clear(&mut self) {
-        self.items.clear()
+        self.items.clear();
     }
 
     /// Gets the given key's corresponding entry in the Table for in-place manipulation.
@@ -502,6 +504,7 @@
 }
 
 // `key1 = value1`
+pub(crate) const DEFAULT_ROOT_DECOR: (&str, &str) = ("", "");
 pub(crate) const DEFAULT_KEY_DECOR: (&str, &str) = ("", " ");
 pub(crate) const DEFAULT_TABLE_DECOR: (&str, &str) = ("\n", "");
 pub(crate) const DEFAULT_KEY_PATH_DECOR: (&str, &str) = ("", "");
@@ -630,16 +633,16 @@
         self.get_values()
     }
     fn fmt(&mut self) {
-        self.fmt()
+        self.fmt();
     }
     fn sort_values(&mut self) {
-        self.sort_values()
+        self.sort_values();
     }
     fn is_dotted(&self) -> bool {
         self.is_dotted()
     }
     fn set_dotted(&mut self, yes: bool) {
-        self.set_dotted(yes)
+        self.set_dotted(yes);
     }
 
     fn key(&self, key: &str) -> Option<&'_ Key> {
@@ -740,7 +743,7 @@
         &mut self.entry.get_mut().value
     }
 
-    /// Converts the OccupiedEntry into a mutable reference to the value in the entry
+    /// Converts the `OccupiedEntry` into a mutable reference to the value in the entry
     /// with a lifetime bound to the map itself
     pub fn into_mut(self) -> &'a mut Item {
         &mut self.entry.into_mut().value
@@ -780,7 +783,7 @@
         self.entry.key().as_str()
     }
 
-    /// Sets the value of the entry with the VacantEntry's key,
+    /// Sets the value of the entry with the `VacantEntry`'s key,
     /// and returns a mutable reference to it
     pub fn insert(self, value: Item) -> &'a mut Item {
         let entry = self.entry;

crates/toml_edit/src/value.rs

diff --git a/crates/toml_edit/src/value.rs b/crates/toml_edit/src/value.rs
index f416434..02ee5e3 100644
--- a/crates/toml_edit/src/value.rs
+++ b/crates/toml_edit/src/value.rs
@@ -1,7 +1,7 @@
 use std::iter::FromIterator;
 use std::str::FromStr;
 
-use toml_datetime::*;
+use toml_datetime::{Date, Datetime, Time};
 
 use crate::key::Key;
 use crate::repr::{Decor, Formatted};
@@ -49,7 +49,7 @@
         }
     }
 
-    /// Returns true iff `self` is a string.
+    /// Returns true if `self` is a string.
     pub fn is_str(&self) -> bool {
         self.as_str().is_some()
     }
@@ -62,7 +62,7 @@
         }
     }
 
-    /// Returns true iff `self` is an integer.
+    /// Returns true if `self` is an integer.
     pub fn is_integer(&self) -> bool {
         self.as_integer().is_some()
     }
@@ -75,7 +75,7 @@
         }
     }
 
-    /// Returns true iff `self` is a float.
+    /// Returns true if `self` is a float.
     pub fn is_float(&self) -> bool {
         self.as_float().is_some()
     }
@@ -88,7 +88,7 @@
         }
     }
 
-    /// Returns true iff `self` is a boolean.
+    /// Returns true if `self` is a boolean.
     pub fn is_bool(&self) -> bool {
         self.as_bool().is_some()
     }
@@ -101,7 +101,7 @@
         }
     }
 
-    /// Returns true iff `self` is a date-time.
+    /// Returns true if `self` is a date-time.
     pub fn is_datetime(&self) -> bool {
         self.as_datetime().is_some()
     }
@@ -122,7 +122,7 @@
         }
     }
 
-    /// Returns true iff `self` is an array.
+    /// Returns true if `self` is an array.
     pub fn is_array(&self) -> bool {
         self.as_array().is_some()
     }
@@ -143,7 +143,7 @@
         }
     }
 
-    /// Returns true iff `self` is an inline table.
+    /// Returns true if `self` is an inline table.
     pub fn is_inline_table(&self) -> bool {
         self.as_inline_table().is_some()
     }
@@ -206,8 +206,10 @@
         *decor = Decor::new(prefix, suffix);
     }
 
-    /// Returns the location within the original document
-    pub(crate) fn span(&self) -> Option<std::ops::Range<usize>> {
+    /// The location within the original document
+    ///
+    /// This generally requires an [`ImDocument`][crate::ImDocument].
+    pub fn span(&self) -> Option<std::ops::Range<usize>> {
         match self {
             Value::String(f) => f.span(),
             Value::Integer(f) => f.span(),
@@ -371,8 +373,15 @@
 
     #[test]
     fn from_iter_formatting() {
-        let features = vec!["node".to_owned(), "mouth".to_owned()];
+        let features = ["node".to_owned(), "mouth".to_owned()];
         let features: Value = features.iter().cloned().collect();
         assert_eq!(features.to_string(), r#"["node", "mouth"]"#);
     }
 }
+
+#[test]
+#[cfg(feature = "parse")]
+#[cfg(feature = "display")]
+fn string_roundtrip() {
+    Value::from("hello").to_string().parse::<Value>().unwrap();
+}

crates/toml_edit/src/visit.rs

diff --git a/crates/toml_edit/src/visit.rs b/crates/toml_edit/src/visit.rs
index 6d7be0b..ee8c9f9 100644
--- a/crates/toml_edit/src/visit.rs
+++ b/crates/toml_edit/src/visit.rs
@@ -63,7 +63,7 @@
 //! the-force = { value = "surrounds-you" }
 //! "#;
 //!
-//! let mut document: Document = input.parse().unwrap();
+//! let mut document: DocumentMut = input.parse().unwrap();
 //! let mut visitor = StringCollector::default();
 //! visitor.visit_document(&document);
 //!
@@ -75,14 +75,15 @@
 //! [on GitHub](https://github.com/toml-rs/toml/blob/main/crates/toml_edit/examples/visit.rs).
 
 use crate::{
-    Array, ArrayOfTables, Datetime, Document, Formatted, InlineTable, Item, Table, TableLike, Value,
+    Array, ArrayOfTables, Datetime, DocumentMut, Formatted, InlineTable, Item, Table, TableLike,
+    Value,
 };
 
 /// Document tree traversal to mutate an exclusive borrow of a document tree in-place.
 ///
 /// See the [module documentation](self) for details.
 pub trait Visit<'doc> {
-    fn visit_document(&mut self, node: &'doc Document) {
+    fn visit_document(&mut self, node: &'doc DocumentMut) {
         visit_document(self, node);
     }
 
@@ -95,7 +96,7 @@
     }
 
     fn visit_inline_table(&mut self, node: &'doc InlineTable) {
-        visit_inline_table(self, node)
+        visit_inline_table(self, node);
     }
 
     fn visit_table_like(&mut self, node: &'doc dyn TableLike) {
@@ -119,7 +120,7 @@
     }
 
     fn visit_boolean(&mut self, node: &'doc Formatted<bool>) {
-        visit_boolean(self, node)
+        visit_boolean(self, node);
     }
 
     fn visit_datetime(&mut self, node: &'doc Formatted<Datetime>) {
@@ -127,19 +128,19 @@
     }
 
     fn visit_float(&mut self, node: &'doc Formatted<f64>) {
-        visit_float(self, node)
+        visit_float(self, node);
     }
 
     fn visit_integer(&mut self, node: &'doc Formatted<i64>) {
-        visit_integer(self, node)
+        visit_integer(self, node);
     }
 
     fn visit_string(&mut self, node: &'doc Formatted<String>) {
-        visit_string(self, node)
+        visit_string(self, node);
     }
 }
 
-pub fn visit_document<'doc, V>(v: &mut V, node: &'doc Document)
+pub fn visit_document<'doc, V>(v: &mut V, node: &'doc DocumentMut)
 where
     V: Visit<'doc> + ?Sized,
 {
@@ -162,14 +163,14 @@
 where
     V: Visit<'doc> + ?Sized,
 {
-    v.visit_table_like(node)
+    v.visit_table_like(node);
 }
 
 pub fn visit_inline_table<'doc, V>(v: &mut V, node: &'doc InlineTable)
 where
     V: Visit<'doc> + ?Sized,
 {
-    v.visit_table_like(node)
+    v.visit_table_like(node);
 }
 
 pub fn visit_table_like<'doc, V>(v: &mut V, node: &'doc dyn TableLike)
@@ -177,7 +178,7 @@
     V: Visit<'doc> + ?Sized,
 {
     for (key, item) in node.iter() {
-        v.visit_table_like_kv(key, item)
+        v.visit_table_like_kv(key, item);
     }
 }
 
@@ -185,7 +186,7 @@
 where
     V: Visit<'doc> + ?Sized,
 {
-    v.visit_item(node)
+    v.visit_item(node);
 }
 
 pub fn visit_array<'doc, V>(v: &mut V, node: &'doc Array)

crates/toml_edit/src/visit_mut.rs

diff --git a/crates/toml_edit/src/visit_mut.rs b/crates/toml_edit/src/visit_mut.rs
index c823cfb..ebaf1e5 100644
--- a/crates/toml_edit/src/visit_mut.rs
+++ b/crates/toml_edit/src/visit_mut.rs
@@ -72,7 +72,7 @@
 //! table = { apple = 4.5 }
 //! "#;
 //!
-//! let mut document: Document = input.parse().unwrap();
+//! let mut document: DocumentMut = input.parse().unwrap();
 //! let mut visitor = FloatToString;
 //! visitor.visit_document_mut(&mut document);
 //!
@@ -90,7 +90,7 @@
 //! [on GitHub](https://github.com/toml-rs/toml/blob/main/crates/toml_edit/examples/visit.rs).
 
 use crate::{
-    Array, ArrayOfTables, Datetime, Document, Formatted, InlineTable, Item, KeyMut, Table,
+    Array, ArrayOfTables, Datetime, DocumentMut, Formatted, InlineTable, Item, KeyMut, Table,
     TableLike, Value,
 };
 
@@ -98,7 +98,7 @@
 ///
 /// See the [module documentation](self) for details.
 pub trait VisitMut {
-    fn visit_document_mut(&mut self, node: &mut Document) {
+    fn visit_document_mut(&mut self, node: &mut DocumentMut) {
         visit_document_mut(self, node);
     }
 
@@ -111,7 +111,7 @@
     }
 
     fn visit_inline_table_mut(&mut self, node: &mut InlineTable) {
-        visit_inline_table_mut(self, node)
+        visit_inline_table_mut(self, node);
     }
 
     /// [`visit_table_mut`](Self::visit_table_mut) and
@@ -137,7 +137,7 @@
     }
 
     fn visit_boolean_mut(&mut self, node: &mut Formatted<bool>) {
-        visit_boolean_mut(self, node)
+        visit_boolean_mut(self, node);
     }
 
     fn visit_datetime_mut(&mut self, node: &mut Formatted<Datetime>) {
@@ -145,19 +145,19 @@
     }
 
     fn visit_float_mut(&mut self, node: &mut Formatted<f64>) {
-        visit_float_mut(self, node)
+        visit_float_mut(self, node);
     }
 
     fn visit_integer_mut(&mut self, node: &mut Formatted<i64>) {
-        visit_integer_mut(self, node)
+        visit_integer_mut(self, node);
     }
 
     fn visit_string_mut(&mut self, node: &mut Formatted<String>) {
-        visit_string_mut(self, node)
+        visit_string_mut(self, node);
     }
 }
 
-pub fn visit_document_mut<V>(v: &mut V, node: &mut Document)
+pub fn visit_document_mut<V>(v: &mut V, node: &mut DocumentMut)
 where
     V: VisitMut + ?Sized,
 {
@@ -203,7 +203,7 @@
 where
     V: VisitMut + ?Sized,
 {
-    v.visit_item_mut(node)
+    v.visit_item_mut(node);
 }
 
 pub fn visit_array_mut<V>(v: &mut V, node: &mut Array)

crates/toml_edit/tests/decoder.rs

diff --git a/crates/toml_edit/tests/decoder.rs b/crates/toml_edit/tests/decoder.rs
index 7306d45..f8cf02c 100644
--- a/crates/toml_edit/tests/decoder.rs
+++ b/crates/toml_edit/tests/decoder.rs
@@ -1,5 +1,5 @@
 #[derive(Copy, Clone)]
-pub struct Decoder;
+pub(crate) struct Decoder;
 
 impl toml_test_harness::Decoder for Decoder {
     fn name(&self) -> &str {
@@ -9,14 +9,14 @@
     fn decode(&self, data: &[u8]) -> Result<toml_test_harness::Decoded, toml_test_harness::Error> {
         let data = std::str::from_utf8(data).map_err(toml_test_harness::Error::new)?;
         let document = data
-            .parse::<toml_edit::Document>()
+            .parse::<toml_edit::DocumentMut>()
             .map_err(toml_test_harness::Error::new)?;
         document_to_decoded(&document)
     }
 }
 
 fn document_to_decoded(
-    value: &toml_edit::Document,
+    value: &toml_edit::DocumentMut,
 ) -> Result<toml_test_harness::Decoded, toml_test_harness::Error> {
     table_to_decoded(value)
 }

crates/toml_edit/tests/encoder.rs

diff --git a/crates/toml_edit/tests/encoder.rs b/crates/toml_edit/tests/encoder.rs
index 808a20c..e325aca 100644
--- a/crates/toml_edit/tests/encoder.rs
+++ b/crates/toml_edit/tests/encoder.rs
@@ -1,5 +1,5 @@
 #[derive(Copy, Clone)]
-pub struct Encoder;
+pub(crate) struct Encoder;
 
 impl toml_test_harness::Encoder for Encoder {
     fn name(&self) -> &str {
@@ -14,9 +14,9 @@
 
 fn decoded_to_document(
     decoded: &toml_test_harness::Decoded,
-) -> Result<toml_edit::Document, toml_test_harness::Error> {
+) -> Result<toml_edit::DocumentMut, toml_test_harness::Error> {
     let item = root_from_decoded(decoded)?;
-    let mut doc = toml_edit::Document::new();
+    let mut doc = toml_edit::DocumentMut::new();
     *doc = item;
     Ok(doc)
 }

crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-hour.stderr

diff --git a/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-hour.stderr b/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-hour.stderr
new file mode 100644
index 0000000..f2254c4
--- /dev/null
+++ b/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-hour.stderr
@@ -0,0 +1,6 @@
+TOML parse error at line 2, column 25
+  |
+2 | d = 1985-06-18 17:04:07+25:00
+  |                         ^
+invalid time offset
+value is out of range

crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-minute.stderr

diff --git a/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-minute.stderr b/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-minute.stderr
new file mode 100644
index 0000000..ce42d2e
--- /dev/null
+++ b/crates/toml_edit/tests/fixtures/invalid/datetime/offset-overflow-minute.stderr
@@ -0,0 +1,6 @@
+TOML parse error at line 3, column 28
+  |
+3 | d = 1985-06-18 17:04:07+12:61
+  |                            ^
+invalid time offset
+value is out of range

crates/toml_edit/tests/fixtures/invalid/key/special-character.stderr

diff --git a/crates/toml_edit/tests/fixtures/invalid/key/special-character.stderr b/crates/toml_edit/tests/fixtures/invalid/key/special-character.stderr
index 7ada2f2..10592cf 100644
--- a/crates/toml_edit/tests/fixtures/invalid/key/special-character.stderr
+++ b/crates/toml_edit/tests/fixtures/invalid/key/special-character.stderr
@@ -1,5 +1,5 @@
 TOML parse error at line 1, column 1
   |
 1 | μ = "greek small letter mu"
-  | ^
+  | ^^
 invalid key

crates/toml_edit/tests/fixtures/invalid/table/no-close-2.stderr

diff --git a/crates/toml_edit/tests/fixtures/invalid/table/no-close-2.stderr b/crates/toml_edit/tests/fixtures/invalid/table/no-close-2.stderr
index a7adf38..26fc787 100644
--- a/crates/toml_edit/tests/fixtures/invalid/table/no-close-2.stderr
+++ b/crates/toml_edit/tests/fixtures/invalid/table/no-close-2.stderr
@@ -1,6 +1,6 @@
 TOML parse error at line 1, column 25
   |
 1 | [closing-bracket.missingö
-  |                         ^
+  |                         ^^
 invalid table header
 expected `.`, `]`

crates/toml_edit/tests/invalid.rs

diff --git a/crates/toml_edit/tests/invalid.rs b/crates/toml_edit/tests/invalid.rs
index 9fff235..9bce553 100644
--- a/crates/toml_edit/tests/invalid.rs
+++ b/crates/toml_edit/tests/invalid.rs
@@ -1,4 +1,4 @@
-use toml_edit::Document;
+use toml_edit::DocumentMut;
 
 fn main() {
     let args = libtest_mimic::Arguments::from_args();
@@ -11,7 +11,7 @@
                     Ok(()) => "".to_owned(),
                     Err(err) => err,
                 };
-                snapbox::assert_eq_path(expect_path, err);
+                snapbox::assert_data_eq!(err, snapbox::Data::read_from(&expect_path, None).raw());
                 Ok(())
             })
         })
@@ -21,6 +21,6 @@
 
 fn run_case(input: &[u8]) -> Result<(), String> {
     let raw = std::str::from_utf8(input).map_err(|e| e.to_string())?;
-    let _ = raw.parse::<Document>().map_err(|e| e.to_string())?;
+    let _ = raw.parse::<DocumentMut>().map_err(|e| e.to_string())?;
     Ok(())
 }

crates/toml_edit/tests/testsuite/convert.rs

diff --git a/crates/toml_edit/tests/testsuite/convert.rs b/crates/toml_edit/tests/testsuite/convert.rs
index 98f9397..4e542a2 100644
--- a/crates/toml_edit/tests/testsuite/convert.rs
+++ b/crates/toml_edit/tests/testsuite/convert.rs
@@ -1,6 +1,8 @@
-use snapbox::assert_eq;
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
 
-use toml_edit::{Document, Item, Value};
+use toml_edit::{DocumentMut, Item, Value};
 
 #[test]
 fn table_into_inline() {
@@ -13,22 +15,23 @@
 [table.child]
 other = "world"
 "#;
-    let mut doc = toml.parse::<Document>().unwrap();
+    let mut doc = toml.parse::<DocumentMut>().unwrap();
 
     doc.get_mut("table").unwrap().make_value();
 
     let actual = doc.to_string();
     // `table=` is because we didn't re-format the table key, only the value
-    let expected = r#"table= { string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }
-"#;
-    assert_eq(expected, actual);
+    assert_data_eq!(actual, str![[r#"
+table= { string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }
+
+"#]].raw());
 }
 
 #[test]
 fn inline_table_to_table() {
     let toml = r#"table = { string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }
 "#;
-    let mut doc = toml.parse::<Document>().unwrap();
+    let mut doc = toml.parse::<DocumentMut>().unwrap();
 
     let t = doc.remove("table").unwrap();
     let t = match t {
@@ -39,13 +42,18 @@
     doc.insert("table", Item::Table(t));
 
     let actual = doc.to_string();
-    let expected = r#"[table]
+    assert_data_eq!(
+        actual,
+        str![[r#"
+[table]
 string = "value"
 array = [1, 2, 3]
 inline = { "1" = 1, "2" = 2 }
 child = { other = "world" }
-"#;
-    assert_eq(expected, actual);
+
+"#]]
+        .raw()
+    );
 }
 
 #[test]
@@ -67,13 +75,14 @@
 [table.child]
 other = "world"
 "#;
-    let mut doc = toml.parse::<Document>().unwrap();
+    let mut doc = toml.parse::<DocumentMut>().unwrap();
 
     doc.get_mut("table").unwrap().make_value();
 
     let actual = doc.to_string();
     // `table=` is because we didn't re-format the table key, only the value
-    let expected = r#"table= [{ string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }, { string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }]
-"#;
-    assert_eq(expected, actual);
+    assert_data_eq!(actual, str![[r#"
+table= [{ string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }, { string = "value", array = [1, 2, 3], inline = { "1" = 1, "2" = 2 }, child = { other = "world" } }]
+
+"#]].raw());
 }

crates/toml_edit/tests/testsuite/datetime.rs

diff --git a/crates/toml_edit/tests/testsuite/datetime.rs b/crates/toml_edit/tests/testsuite/datetime.rs
index 541f8ea..dba89ec 100644
--- a/crates/toml_edit/tests/testsuite/datetime.rs
+++ b/crates/toml_edit/tests/testsuite/datetime.rs
@@ -1,8 +1,12 @@
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
+
 macro_rules! bad {
     ($toml:expr, $msg:expr) => {
-        match $toml.parse::<toml_edit::Document>() {
+        match $toml.parse::<toml_edit::DocumentMut>() {
             Ok(s) => panic!("parsed to: {:#?}", s),
-            Err(e) => snapbox::assert_eq($msg, e.to_string()),
+            Err(e) => assert_data_eq!(e.to_string(), $msg.raw()),
         }
     };
 }
@@ -11,7 +15,7 @@
 fn times() {
     fn dogood(s: &str, serialized: &str) {
         let to_parse = format!("foo = {}", s);
-        let document = to_parse.parse::<toml_edit::Document>().unwrap();
+        let document = to_parse.parse::<toml_edit::DocumentMut>().unwrap();
         assert_eq!(
             document["foo"].as_datetime().unwrap().to_string(),
             serialized
@@ -43,214 +47,252 @@
 fn bad_times() {
     bad!(
         "foo = 199-09-09",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
 1 | foo = 199-09-09
   |          ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = 199709-09",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 13
   |
 1 | foo = 199709-09
   |             ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = 1997-9-09",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 12
   |
 1 | foo = 1997-9-09
   |            ^
 invalid date-time
-"
+
+"#]]
     );
     bad!(
         "foo = 1997-09-9",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 15
   |
 1 | foo = 1997-09-9
   |               ^
 invalid date-time
-"
+
+"#]]
     );
     bad!(
         "foo = 1997-09-0909:09:09",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 17
   |
 1 | foo = 1997-09-0909:09:09
   |                 ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 26
   |
 1 | foo = 1997-09-09T09:09:09.
   |                          ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = T",
-        r#"TOML parse error at line 1, column 7
+        str![[r#"
+TOML parse error at line 1, column 7
   |
 1 | foo = T
   |       ^
 invalid string
 expected `"`, `'`
-"#
+
+"#]]
     );
     bad!(
         "foo = T.",
-        r#"TOML parse error at line 1, column 7
+        str![[r#"
+TOML parse error at line 1, column 7
   |
 1 | foo = T.
   |       ^
 invalid string
 expected `"`, `'`
-"#
+
+"#]]
     );
     bad!(
         "foo = TZ",
-        r#"TOML parse error at line 1, column 7
+        str![[r#"
+TOML parse error at line 1, column 7
   |
 1 | foo = TZ
   |       ^
 invalid string
 expected `"`, `'`
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09+",
-        r#"TOML parse error at line 1, column 30
+        str![[r#"
+TOML parse error at line 1, column 30
   |
 1 | foo = 1997-09-09T09:09:09.09+
   |                              ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09+09",
-        r#"TOML parse error at line 1, column 32
+        str![[r#"
+TOML parse error at line 1, column 32
   |
 1 | foo = 1997-09-09T09:09:09.09+09
   |                                ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09+09:9",
-        r#"TOML parse error at line 1, column 33
+        str![[r#"
+TOML parse error at line 1, column 33
   |
 1 | foo = 1997-09-09T09:09:09.09+09:9
   |                                 ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09+0909",
-        r#"TOML parse error at line 1, column 32
+        str![[r#"
+TOML parse error at line 1, column 32
   |
 1 | foo = 1997-09-09T09:09:09.09+0909
   |                                ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09-",
-        r#"TOML parse error at line 1, column 30
+        str![[r#"
+TOML parse error at line 1, column 30
   |
 1 | foo = 1997-09-09T09:09:09.09-
   |                              ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09-09",
-        r#"TOML parse error at line 1, column 32
+        str![[r#"
+TOML parse error at line 1, column 32
   |
 1 | foo = 1997-09-09T09:09:09.09-09
   |                                ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09-09:9",
-        r#"TOML parse error at line 1, column 33
+        str![[r#"
+TOML parse error at line 1, column 33
   |
 1 | foo = 1997-09-09T09:09:09.09-09:9
   |                                 ^
 invalid time offset
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T09:09:09.09-0909",
-        r#"TOML parse error at line 1, column 32
+        str![[r#"
+TOML parse error at line 1, column 32
   |
 1 | foo = 1997-09-09T09:09:09.09-0909
   |                                ^
 invalid time offset
-"#
+
+"#]]
     );
 
     bad!(
         "foo = 1997-00-09T09:09:09.09Z",
-        r#"TOML parse error at line 1, column 12
+        str![[r#"
+TOML parse error at line 1, column 12
   |
 1 | foo = 1997-00-09T09:09:09.09Z
   |            ^
 invalid date-time
 value is out of range
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-00T09:09:09.09Z",
-        r#"TOML parse error at line 1, column 15
+        str![[r#"
+TOML parse error at line 1, column 15
   |
 1 | foo = 1997-09-00T09:09:09.09Z
   |               ^
 invalid date-time
 value is out of range
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T30:09:09.09Z",
-        r#"TOML parse error at line 1, column 17
+        str![[r#"
+TOML parse error at line 1, column 17
   |
 1 | foo = 1997-09-09T30:09:09.09Z
   |                 ^
 expected newline, `#`
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T12:69:09.09Z",
-        r#"TOML parse error at line 1, column 21
+        str![[r#"
+TOML parse error at line 1, column 21
   |
 1 | foo = 1997-09-09T12:69:09.09Z
   |                     ^
 invalid date-time
 value is out of range
-"#
+
+"#]]
     );
     bad!(
         "foo = 1997-09-09T12:09:69.09Z",
-        r#"TOML parse error at line 1, column 24
+        str![[r#"
+TOML parse error at line 1, column 24
   |
 1 | foo = 1997-09-09T12:09:69.09Z
   |                        ^
 invalid date-time
 value is out of range
-"#
+
+"#]]
     );
 }

crates/toml_edit/tests/testsuite/edit.rs

diff --git a/crates/toml_edit/tests/testsuite/edit.rs b/crates/toml_edit/tests/testsuite/edit.rs
index 94c20d4..01d9ef0 100644
--- a/crates/toml_edit/tests/testsuite/edit.rs
+++ b/crates/toml_edit/tests/testsuite/edit.rs
@@ -1,8 +1,9 @@
-use std::fmt;
 use std::iter::FromIterator;
 
-use snapbox::assert_eq;
-use toml_edit::{array, table, value, Document, Item, Key, Table, Value};
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
+use toml_edit::{array, table, value, DocumentMut, Item, Key, Table, Value};
 
 macro_rules! parse_key {
     ($s:expr) => {{
@@ -19,25 +20,12 @@
     }};
 }
 
-// Copied from https://github.com/colin-kiegel/rust-pretty-assertions/issues/24
-/// Wrapper around string slice that makes debug output `{:?}` to print string same way as `{}`.
-/// Used in different `assert*!` macros in combination with `pretty_assertions` crate to make
-/// test failures to show nice diffs.
-#[derive(PartialEq, Eq)]
-struct PrettyString<'a>(pub &'a str);
-/// Make diff to display string as multi-line string
-impl<'a> fmt::Debug for PrettyString<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.0)
-    }
-}
-
 struct Test {
-    doc: Document,
+    doc: DocumentMut,
 }
 
 fn given(input: &str) -> Test {
-    let doc = input.parse::<Document>();
+    let doc = input.parse::<DocumentMut>();
     assert!(doc.is_ok());
     Test { doc: doc.unwrap() }
 }
@@ -53,12 +41,112 @@
         }
         self
     }
-
-    #[track_caller]
-    fn produces_display(&self, expected: &str) -> &Self {
-        assert_eq(expected, self.doc.to_string());
+    fn running_on_doc<F>(&mut self, func: F) -> &mut Self
+    where
+        F: Fn(&mut DocumentMut),
+    {
+        {
+            func(&mut self.doc);
+        }
         self
     }
+
+    #[track_caller]
+    fn produces_display(&self, expected: snapbox::data::Inline) -> &Self {
+        assert_data_eq!(self.doc.to_string(), expected.raw());
+        self
+    }
+}
+
+#[test]
+fn test_add_root_decor() {
+    given(
+        r#"[package]
+name = "hello"
+version = "1.0.0"
+
+[[bin]]
+name = "world"
+path = "src/bin/world/main.rs"
+
+[dependencies]
+nom = "4.0" # future is here
+
+[[bin]]
+name = "delete me please"
+path = "src/bin/dmp/main.rs""#,
+    )
+    .running_on_doc(|document| {
+        document.decor_mut().set_prefix("# Some Header\n\n");
+        document.decor_mut().set_suffix("# Some Footer");
+        document.set_trailing("\n\ntrailing...");
+    })
+    .produces_display(str![[r#"
+# Some Header
+
+[package]
+name = "hello"
+version = "1.0.0"
+
+[[bin]]
+name = "world"
+path = "src/bin/world/main.rs"
+
+[dependencies]
+nom = "4.0" # future is here
+
+[[bin]]
+name = "delete me please"
+path = "src/bin/dmp/main.rs"
+# Some Footer
+
+trailing...
+"#]]);
+}
+
+/// Tests that default decor is None for both suffix and prefix and that this means empty strings
+#[test]
+fn test_no_root_decor() {
+    given(
+        r#"[package]
+name = "hello"
+version = "1.0.0"
+
+[[bin]]
+name = "world"
+path = "src/bin/world/main.rs"
+
+[dependencies]
+nom = "4.0" # future is here
+
+[[bin]]
+name = "delete me please"
+path = "src/bin/dmp/main.rs""#,
+    )
+    .running_on_doc(|document| {
+        assert!(document.decor().prefix().is_none());
+        assert!(document.decor().suffix().is_none());
+        document.set_trailing("\n\ntrailing...");
+    })
+    .produces_display(str![[r#"
+[package]
+name = "hello"
+version = "1.0.0"
+
+[[bin]]
+name = "world"
+path = "src/bin/world/main.rs"
+
+[dependencies]
+nom = "4.0" # future is here
+
+[[bin]]
+name = "delete me please"
+path = "src/bin/dmp/main.rs"
+
+
+trailing...
+"#]]);
 }
 
 // insertion
@@ -79,8 +167,8 @@
         root["servers"]["beta"]["ip"] = value("10.0.0.2");
         root["servers"]["beta"]["dc"] = value("eqdc10");
     })
-    .produces_display(
-        r#"[servers]
+    .produces_display(str![[r#"
+[servers]
 
         [servers.alpha]
         ip = "10.0.0.1"
@@ -91,8 +179,8 @@
 dc = "eqdc10"
 
         [other.table]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -108,8 +196,8 @@
     .running(|root| {
         root["dependencies"]["newthing"] = table();
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [package]
         [dependencies]
         [[example]]
@@ -117,18 +205,22 @@
 
 [dependencies.newthing]
         [dev-dependencies]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
 fn test_inserting_tables_from_different_parsed_docs() {
     given("[a]")
         .running(|root| {
-            let other = "[b]".parse::<Document>().unwrap();
+            let other = "[b]".parse::<DocumentMut>().unwrap();
             root["b"] = other["b"].clone();
         })
-        .produces_display("[a]\n[b]\n");
+        .produces_display(str![[r#"
+[a]
+[b]
+
+"#]]);
 }
 #[test]
 fn test_insert_nonleaf_table() {
@@ -142,8 +234,8 @@
         root["servers"]["alpha"]["ip"] = value("10.0.0.1");
         root["servers"]["alpha"]["dc"] = value("eqdc10");
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [other.table]
 
 [servers]
@@ -151,8 +243,8 @@
 [servers.alpha]
 ip = "10.0.0.1"
 dc = "eqdc10"
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -173,8 +265,8 @@
         }
         array.push(Table::new());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [package]
         title = "withoutarray"
 
@@ -182,8 +274,8 @@
 hello = "world"
 
 [[bin]]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -197,15 +289,45 @@
         root["tbl"]["key2"] = value(42);
         root["tbl"]["key3"] = value(8.1415926);
     })
-    .produces_display(
-        r#"[tbl]
+    .produces_display(str![[r#"
+[tbl]
 key1 = "value1"
 key2 = 42
 key3 = 8.1415926
 
         [tbl.son]
-"#,
-    );
+
+"#]]);
+}
+
+#[test]
+fn test_insert_key_with_quotes() {
+    given(
+        r#"
+        [package]
+        name = "foo"
+
+        [target]
+        "#,
+    )
+    .running(|root| {
+        root["target"]["cfg(target_os = \"linux\")"] = table();
+        root["target"]["cfg(target_os = \"linux\")"]["dependencies"] = table();
+        root["target"]["cfg(target_os = \"linux\")"]["dependencies"]["name"] = value("dep");
+    })
+    .produces_display(str![[r#"
+
+        [package]
+        name = "foo"
+
+        [target]
+
+[target.'cfg(target_os = "linux")']
+
+[target.'cfg(target_os = "linux")'.dependencies]
+name = "dep"
+        
+"#]]);
 }
 
 // removal
@@ -230,15 +352,15 @@
         let servers = as_table!(servers);
         assert!(servers.remove("alpha").is_some());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [servers]
 
         [servers.beta]
         ip = "10.0.0.2"
         dc = "eqdc10"
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -281,8 +403,8 @@
     .running(|root| {
         assert!(root.remove("a").is_some());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         title = "not relevant"
         # comment 2
         [b] # comment 2.1
@@ -292,8 +414,7 @@
            [some.other.table]
 
 
-    "#,
-    );
+    "#]]);
 }
 
 #[test]
@@ -323,8 +444,8 @@
         dmp.remove(1);
         assert_eq!(dmp.len(), 1);
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [package]
         name = "hello"
         version = "1.0.0"
@@ -335,8 +456,8 @@
 
         [dependencies]
         nom = "4.0" # future is here
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -361,16 +482,16 @@
     .running(|root| {
         assert!(root.remove("bin").is_some());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [package]
         name = "hello"
         version = "1.0.0"
 
         [dependencies]
         nom = "4.0" # future is here
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -390,14 +511,14 @@
         let value = value.as_value().unwrap();
         assert!(value.is_str());
         let value = value.as_str().unwrap();
-        assert_eq(value, "1.0.0");
+        assert_data_eq!(value, str!["1.0.0"].raw());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         name = "hello"
         documentation = "https://docs.rs/hello"
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -419,7 +540,7 @@
         let value = value.as_value().unwrap();
         assert_eq!(value.as_integer(), Some(1));
     })
-    .produces_display(r#""#);
+    .produces_display(str![]);
 }
 
 // values
@@ -443,8 +564,8 @@
         let a = as_table!(a);
         a.sort_values();
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [a.z]
 
         [a]
@@ -454,8 +575,8 @@
         c = 3
 
         [a.y]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -479,8 +600,8 @@
         // before 'a'.
         a.sort_values_by(|k1, _, k2, _| k1.display_repr().cmp(&k2.display_repr()));
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [a.z]
 
         [a]
@@ -490,8 +611,8 @@
         b = 2 # as well as this
 
         [a.y]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -509,18 +630,18 @@
                 let tab = as_table!(table);
                 tab.set_position(0);
                 let (_, segmented) = tab.iter_mut().next().unwrap();
-                as_table!(segmented).set_position(5)
+                as_table!(segmented).set_position(5);
             }
         }
     })
-    .produces_display(
-        r#"        [dependencies]
+    .produces_display(str![[r#"
+        [dependencies]
 
         [package]
         [dev-dependencies]
         [dependencies.opencl]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -535,18 +656,18 @@
     )
     .running(|root| {
         for (_, table) in root.iter_mut() {
-            as_table!(table).set_position(0)
+            as_table!(table).set_position(0);
         }
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         [package]
         [dependencies]
         [dev-dependencies]
         [dependencies.opencl]
         a=""
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -561,18 +682,18 @@
     )
     .running(|root| {
         for (_, table) in root.iter_mut() {
-            as_table!(table).set_position(usize::MAX)
+            as_table!(table).set_position(usize::MAX);
         }
     })
-    .produces_display(
-        r#"        [dependencies.opencl]
+    .produces_display(str![[r#"
+        [dependencies.opencl]
         a=""
 
         [package]
         [dependencies]
         [dev-dependencies]
-"#,
-    );
+
+"#]]);
 }
 
 macro_rules! as_array {
@@ -623,14 +744,14 @@
         );
         dbg!(root);
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         a = [1, 2, 3, 4]
         b = ["hello", "beep",   "zoink"   ,
 "world"
 ,  "yikes"]
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -654,12 +775,12 @@
         assert!(b.remove(0).is_str());
         assert!(b.is_empty());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         a = [1, 2, 3]
         b = []
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -680,11 +801,10 @@
             }
         }
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
     a = [1, "2", 3.0]
-    "#,
-    );
+    "#]]);
 }
 
 macro_rules! as_inline_table {
@@ -718,14 +838,14 @@
         assert!(b.is_empty());
         b.get_or_insert("hello", "world");
         assert_eq!(b.len(), 1);
-        b.fmt()
+        b.fmt();
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         a = { a = 2, c = 3, b = 42 }
         b = { hello = "world" }
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -749,12 +869,12 @@
         assert!(b.remove("hello").is_some());
         assert!(b.is_empty());
     })
-    .produces_display(
-        r#"
+    .produces_display(str![[r#"
+
         a = {a=2, b = 42}
         b = {}
-"#,
-    );
+
+"#]]);
 }
 
 #[test]
@@ -828,11 +948,11 @@
                 .set_dotted(true);
             root["nixpkgs"]["src"]["git"] = value("https://github.com/nixos/nixpkgs");
         })
-        .produces_display(
-            r#"[nixpkgs]
+        .produces_display(str![[r#"
+[nixpkgs]
 src.git = "https://github.com/nixos/nixpkgs"
-"#,
-        );
+
+"#]]);
 }
 
 #[test]
@@ -847,11 +967,11 @@
                 .unwrap()
                 .set_dotted(true);
         })
-        .produces_display(
-            r#"[nixpkgs]
+        .produces_display(str![[r#"
+[nixpkgs]
 src.git = "https://github.com/nixos/nixpkgs"
-"#,
-        );
+
+"#]]);
 }
 
 #[test]

crates/toml_edit/tests/testsuite/float.rs

diff --git a/crates/toml_edit/tests/testsuite/float.rs b/crates/toml_edit/tests/testsuite/float.rs
index 34e792e..20da23f 100644
--- a/crates/toml_edit/tests/testsuite/float.rs
+++ b/crates/toml_edit/tests/testsuite/float.rs
@@ -1,4 +1,4 @@
-use toml_edit::Document;
+use toml_edit::DocumentMut;
 
 macro_rules! float_inf_tests {
     ($ty:ty) => {{
@@ -18,7 +18,7 @@
             sf8 = -0.0
         ";
 
-        let document = document.parse::<Document>().unwrap();
+        let document = document.parse::<DocumentMut>().unwrap();
         let float = |k| document[k].as_float().unwrap();
 
         assert!(float("sf1").is_infinite());
@@ -40,7 +40,7 @@
         assert_eq!(float("sf8"), 0.0);
         assert!(float("sf8").is_sign_negative());
 
-        let mut document = Document::new();
+        let mut document = DocumentMut::new();
         document["sf4"] = toml_edit::value(f64::NAN.copysign(1.0));
         document["sf6"] = toml_edit::value(f64::NAN.copysign(-1.0));
         assert_eq!(

crates/toml_edit/tests/testsuite/invalid.rs

diff --git a/crates/toml_edit/tests/testsuite/invalid.rs b/crates/toml_edit/tests/testsuite/invalid.rs
index cb13b4e..b685ff9 100644
--- a/crates/toml_edit/tests/testsuite/invalid.rs
+++ b/crates/toml_edit/tests/testsuite/invalid.rs
@@ -1,45 +1,58 @@
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
+
 #[test]
 fn incomplete_inline_table_issue_296() {
-    let err = "native = {".parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 11
+    let err = "native = {".parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 11
   |
 1 | native = {
   |           ^
 invalid inline table
 expected `}`
-"#,
-        err.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
 #[test]
 fn bare_value_disallowed_issue_293() {
-    let err = "value=zzz".parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 7
+    let err = "value=zzz".parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 7
   |
 1 | value=zzz
   |       ^
 invalid string
 expected `"`, `'`
-"#,
-        err.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
 #[test]
 fn bare_value_in_array_disallowed_issue_293() {
-    let err = "value=[zzz]".parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 1, column 8
+    let err = "value=[zzz]".parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 1, column 8
   |
 1 | value=[zzz]
   |        ^
 invalid array
 expected `]`
-"#,
-        err.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
@@ -55,157 +68,235 @@
 [dependencies]
 rand = \"0.3.14\"
 "
-    .parse::<toml_edit::Document>()
+    .parse::<toml_edit::DocumentMut>()
     .unwrap_err();
-    snapbox::assert_eq(
-        r#"TOML parse error at line 8, column 1
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
+TOML parse error at line 8, column 1
   |
 8 | [dependencies]
   | ^
 invalid table header
 duplicate key `dependencies` in document root
-"#,
-        err.to_string(),
+
+"#]]
+        .raw()
     );
 }
 
 #[test]
 fn bad() {
     let toml_input = "a = 01";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = 01
   |      ^
 expected newline, `#`
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = 1__1";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 1__1
   |       ^
 invalid integer
 expected digit
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = 1_";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 1_
   |       ^
 invalid integer
 expected digit
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "''";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | ''
   |   ^
 expected `.`, `=`
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = 9e99999";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 5
   |
 1 | a = 9e99999
   |     ^
 invalid floating-point number
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = \"\u{7f}\"";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = \"\u{7f}\"
+1 | a = ""
   |      ^
 invalid basic string
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = '\u{7f}'";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = '\u{7f}'
+1 | a = ''
   |      ^
 invalid literal string
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = -0x1";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = -0x1
   |       ^
 expected newline, `#`
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = 0x-1";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 0x-1
   |       ^
 invalid hexadecimal integer
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     // Dotted keys.
     let toml_input = "a.b.c = 1
          a.b = 2
         ";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 2, column 10
   |
 2 |          a.b = 2
   |          ^
 duplicate key `b` in document root
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = 1
          a.b = 2";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 2, column 10
   |
 2 |          a.b = 2
   |          ^
 dotted key `a` attempted to extend non-table type (integer)
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
 
     let toml_input = "a = {k1 = 1, k1.name = \"joe\"}";
-    let expected_err = "\
+    let err = toml_input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    assert_data_eq!(
+        err.to_string(),
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = {k1 = 1, k1.name = \"joe\"}
+1 | a = {k1 = 1, k1.name = "joe"}
   |      ^
 dotted key `k1` attempted to extend non-table type (integer)
-";
-    let err = toml_input.parse::<toml_edit::Document>().unwrap_err();
-    snapbox::assert_eq(expected_err, err.to_string());
+
+"#]]
+        .raw()
+    );
+}
+
+#[test]
+fn emoji_error_span() {
+    let input = "😀";
+    let err = input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    dbg!(err.span());
+    let actual = &input[err.span().unwrap()];
+    assert_eq!(actual, input);
+}
+
+#[test]
+fn text_error_span() {
+    let input = "asdf";
+    let err = input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    dbg!(err.span());
+    let actual = &input[err.span().unwrap()];
+    assert_eq!(actual, "");
+}
+
+#[test]
+fn fuzzed_68144_error_span() {
+    let input = "\"\\ᾂr\"";
+    let err = input.parse::<toml_edit::DocumentMut>().unwrap_err();
+    dbg!(err.span());
+    let actual = &input[err.span().unwrap()];
+    assert_eq!(actual, "ᾂ");
 }

crates/toml_edit/tests/testsuite/parse.rs

diff --git a/crates/toml_edit/tests/testsuite/parse.rs b/crates/toml_edit/tests/testsuite/parse.rs
index f22b61d..092d3c3 100644
--- a/crates/toml_edit/tests/testsuite/parse.rs
+++ b/crates/toml_edit/tests/testsuite/parse.rs
@@ -1,5 +1,7 @@
-use snapbox::assert_eq;
-use toml_edit::{Document, Key, Value};
+use snapbox::assert_data_eq;
+use snapbox::prelude::*;
+use snapbox::str;
+use toml_edit::{DocumentMut, Key, Value};
 
 macro_rules! parse {
     ($s:expr, $ty:ty) => {{
@@ -81,24 +83,26 @@
 [a."b".c.e]
 [a.b.c.d]
 "#;
-    let expected = r#"
+    let expected = str![[r#"
+
 [a]
 [a.'b'.c]
 [a.'b'.c.e]
 [a.'b'.c.d]
-"#;
-    let doc = toml.parse::<Document>();
+
+"#]];
+    let doc = toml.parse::<DocumentMut>();
     assert!(doc.is_ok());
     let doc = doc.unwrap();
 
-    assert_eq(expected, doc.to_string());
+    assert_data_eq!(doc.to_string(), expected.raw());
 }
 
 macro_rules! bad {
     ($toml:expr, $msg:expr) => {
-        match $toml.parse::<Document>() {
+        match $toml.parse::<DocumentMut>() {
             Ok(s) => panic!("parsed to: {:#?}", s),
-            Err(e) => snapbox::assert_eq($msg, e.to_string()),
+            Err(e) => assert_data_eq!(e.to_string(), $msg.raw()),
         }
     };
 }
@@ -123,7 +127,7 @@
      contents are never required to be entirely resident in memory all at once.\r\n\
      \"\"\"\
      "
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
 }
 
@@ -163,7 +167,7 @@
 is preserved.
 '''
 "#
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     assert_eq!(table["bar"].as_str(), Some("\0"));
     assert_eq!(table["key1"].as_str(), Some("One\nTwo"));
@@ -216,7 +220,7 @@
 [foo.bar]
 #...
 "#
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     table["foo"][0]["bar"].as_table().unwrap();
     table["foo"][1]["bar"].as_table().unwrap();
@@ -226,7 +230,7 @@
 fn empty_table() {
     let table = r#"
 [foo]"#
-        .parse::<Document>()
+        .parse::<DocumentMut>()
         .unwrap();
     table["foo"].as_table().unwrap();
 }
@@ -239,9 +243,9 @@
 
 [package.metadata.release.pre-release-replacements]
 "#;
-    let document = input.parse::<Document>().unwrap();
+    let document = input.parse::<DocumentMut>().unwrap();
     let actual = document.to_string();
-    assert_eq(input, actual);
+    assert_data_eq!(actual, input.raw());
 }
 
 #[test]
@@ -266,7 +270,7 @@
 [[fruit.variety]]
 name = "plantain"
 "#
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     assert_eq!(table["fruit"][0]["name"].as_str(), Some("apple"));
     assert_eq!(table["fruit"][0]["physical"]["color"].as_str(), Some("red"));
@@ -293,93 +297,99 @@
 fn stray_cr() {
     bad!(
         "\r",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 1
   |
-1 | \r
+1 | 
   | ^
 
-"
+
+"#]]
     );
     bad!(
         "a = [ \r ]",
-        "\
-TOML parse error at line 1, column 7
+        str![[r#"
+TOML parse error at line 1, column 8
   |
-1 | a = [ \r
+1 | a = [ 
  ]
-  |       ^
-invalid array
-expected `]`
-"
+  |        ^
+
+
+"#]]
     );
     bad!(
         "a = \"\"\"\r\"\"\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
-1 | a = \"\"\"\r
-\"\"\"
+1 | a = """
+"""
   |        ^
 invalid multiline basic string
-"
+
+"#]]
     );
     bad!(
         "a = \"\"\"\\  \r  \"\"\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
-1 | a = \"\"\"\\  \r
-  \"\"\"
+1 | a = """\  
+  """
   |          ^
 invalid escape sequence
-expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\\`, `\"`
-"
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`
+
+"#]]
     );
     bad!(
         "a = '''\r'''",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
-1 | a = '''\r
+1 | a = '''
 '''
   |        ^
 invalid multiline literal string
-"
+
+"#]]
     );
     bad!(
         "a = '\r'",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = '\r
+1 | a = '
 '
   |      ^
 invalid literal string
-"
+
+"#]]
     );
     bad!(
         "a = \"\r\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = \"\r
-\"
+1 | a = "
+"
   |      ^
 invalid basic string
-"
+
+"#]]
     );
 }
 
 #[test]
 fn blank_literal_string() {
-    let table = "foo = ''".parse::<Document>().unwrap();
+    let table = "foo = ''".parse::<DocumentMut>().unwrap();
     assert_eq!(table["foo"].as_str(), Some(""));
 }
 
 #[test]
 fn many_blank() {
-    let table = "foo = \"\"\"\n\n\n\"\"\"".parse::<Document>().unwrap();
+    let table = "foo = \"\"\"\n\n\n\"\"\"".parse::<DocumentMut>().unwrap();
     assert_eq!(table["foo"].as_str(), Some("\n\n"));
 }
 
@@ -389,7 +399,7 @@
         foo = \"\"\"\\\r\n\"\"\"
         bar = \"\"\"\\\r\n   \r\n   \r\n   a\"\"\"
     "
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     assert_eq!(table["foo"].as_str(), Some(""));
     assert_eq!(table["bar"].as_str(), Some("a"));
@@ -399,23 +409,25 @@
 fn string_no_newline() {
     bad!(
         "a = \"\n\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
-1 | a = \"
+1 | a = "
   |      ^
 invalid basic string
-"
+
+"#]]
     );
     bad!(
         "a = '\n'",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = '
   |      ^
 invalid literal string
-"
+
+"#]]
     );
 }
 
@@ -423,83 +435,91 @@
 fn bad_leading_zeros() {
     bad!(
         "a = 00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = 00
   |      ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = -00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = -00
   |       ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = +00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = +00
   |       ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = 00.0",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = 00.0
   |      ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = -00.0",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = -00.0
   |       ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = +00.0",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = +00.0
   |       ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "a = 9223372036854775808",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 5
   |
 1 | a = 9223372036854775808
   |     ^
 number too large to fit in target type
-"
+
+"#]]
     );
     bad!(
         "a = -9223372036854775809",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 5
   |
 1 | a = -9223372036854775809
   |     ^
 number too small to fit in target type
-"
+
+"#]]
     );
 }
 
@@ -507,76 +527,83 @@
 fn bad_floats() {
     bad!(
         "a = 0.",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 0.
   |       ^
 invalid floating-point number
 expected digit
-"
+
+"#]]
     );
     bad!(
         "a = 0.e",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 0.e
   |       ^
 invalid floating-point number
 expected digit
-"
+
+"#]]
     );
     bad!(
         "a = 0.E",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | a = 0.E
   |       ^
 invalid floating-point number
 expected digit
-"
+
+"#]]
     );
     bad!(
         "a = 0.0E",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 9
   |
 1 | a = 0.0E
   |         ^
 invalid floating-point number
-"
+
+"#]]
     );
     bad!(
         "a = 0.0e",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 9
   |
 1 | a = 0.0e
   |         ^
 invalid floating-point number
-"
+
+"#]]
     );
     bad!(
         "a = 0.0e-",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
 1 | a = 0.0e-
   |          ^
 invalid floating-point number
-"
+
+"#]]
     );
     bad!(
         "a = 0.0e+",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
 1 | a = 0.0e+
   |          ^
 invalid floating-point number
-"
+
+"#]]
     );
 }
 
@@ -586,7 +613,7 @@
         ($actual:expr, $expected:expr) => {{
             let f = format!("foo = {}", $actual);
             println!("{}", f);
-            let a = f.parse::<Document>().unwrap();
+            let a = f.parse::<DocumentMut>().unwrap();
             assert_eq!(a["foo"].as_float().unwrap(), $expected);
         }};
     }
@@ -621,7 +648,7 @@
         \"character encoding\" = \"value\"
         'ʎǝʞ' = \"value\"
     "
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     let _ = &a["foo"];
     let _ = &a["-"];
@@ -640,114 +667,126 @@
 fn bad_keys() {
     bad!(
         "key\n=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | key
   |    ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "key=\n3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 5
   |
 1 | key=
   |     ^
 invalid string
-expected `\"`, `'`
-"
+expected `"`, `'`
+
+"#]]
     );
     bad!(
         "key|=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | key|=3
   |    ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 1
   |
 1 | =3
   | ^
 invalid key
-"
+
+"#]]
     );
     bad!(
         "\"\"|=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
-1 | \"\"|=3
+1 | ""|=3
   |   ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "\"\n\"|=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
-1 | \"
+1 | "
   |  ^
 invalid basic string
-"
+
+"#]]
     );
     bad!(
         "\"\r\"|=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
-1 | \"\r\"|=3
+1 | "
+"|=3
   |  ^
 invalid basic string
-"
+
+"#]]
     );
     bad!(
         "''''''=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | ''''''=3
   |   ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "\"\"\"\"\"\"=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
-1 | \"\"\"\"\"\"=3
+1 | """"""=3
   |   ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "'''key'''=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | '''key'''=3
   |   ^
 expected `.`, `=`
-"
+
+"#]]
     );
     bad!(
         "\"\"\"key\"\"\"=3",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
-1 | \"\"\"key\"\"\"=3
+1 | """key"""=3
   |   ^
 expected `.`, `=`
-"
+
+"#]]
     );
 }
 
@@ -755,139 +794,152 @@
 fn bad_table_names() {
     bad!(
         "[]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
 1 | []
   |  ^
 invalid key
-"
+
+"#]]
     );
     bad!(
         "[.]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
 1 | [.]
   |  ^
 invalid key
-"
+
+"#]]
     );
     bad!(
         "[a.]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | [a.]
   |   ^
 invalid table header
 expected `.`, `]`
-"
+
+"#]]
     );
     bad!(
         "[!]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
 1 | [!]
   |  ^
 invalid key
-"
+
+"#]]
     );
     bad!(
         "[\"\n\"]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
-1 | [\"
+1 | ["
   |   ^
 invalid basic string
-"
+
+"#]]
     );
     bad!(
         "[a.b]\n[a.\"b\"]",
-        "\
+        str![[r#"
 TOML parse error at line 2, column 1
   |
-2 | [a.\"b\"]
+2 | [a."b"]
   | ^
 invalid table header
 duplicate key `b` in table `a`
-"
+
+"#]]
     );
     bad!(
         "[']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | [']
   |    ^
 invalid literal string
-"
+
+"#]]
     );
     bad!(
         "[''']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | [''']
   |    ^
 invalid table header
 expected `.`, `]`
-"
+
+"#]]
     );
     bad!(
         "['''''']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | ['''''']
   |    ^
 invalid table header
 expected `.`, `]`
-"
+
+"#]]
     );
     bad!(
         "['''foo''']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | ['''foo''']
   |    ^
 invalid table header
 expected `.`, `]`
-"
+
+"#]]
     );
     bad!(
         "[\"\"\"bar\"\"\"]",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
-1 | [\"\"\"bar\"\"\"]
+1 | ["""bar"""]
   |    ^
 invalid table header
 expected `.`, `]`
-"
+
+"#]]
     );
     bad!(
         "['\n']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | ['
   |   ^
 invalid literal string
-"
+
+"#]]
     );
     bad!(
         "['\r\n']",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 3
   |
 1 | ['
   |   ^
 invalid literal string
-"
+
+"#]]
     );
 }
 
@@ -901,7 +953,7 @@
         ['a.a']
         ['\"\"']
     "
-    .parse::<Document>()
+    .parse::<DocumentMut>()
     .unwrap();
     println!("{:?}", a);
     let _ = &a["a"]["b"];
@@ -915,82 +967,88 @@
 fn invalid_bare_numeral() {
     bad!(
         "4",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 2
   |
 1 | 4
   |  ^
 expected `.`, `=`
-"
+
+"#]]
     );
 }
 
 #[test]
 fn inline_tables() {
-    "a = {}".parse::<Document>().unwrap();
-    "a = {b=1}".parse::<Document>().unwrap();
-    "a = {   b   =   1    }".parse::<Document>().unwrap();
-    "a = {a=1,b=2}".parse::<Document>().unwrap();
-    "a = {a=1,b=2,c={}}".parse::<Document>().unwrap();
+    "a = {}".parse::<DocumentMut>().unwrap();
+    "a = {b=1}".parse::<DocumentMut>().unwrap();
+    "a = {   b   =   1    }".parse::<DocumentMut>().unwrap();
+    "a = {a=1,b=2}".parse::<DocumentMut>().unwrap();
+    "a = {a=1,b=2,c={}}".parse::<DocumentMut>().unwrap();
 
     bad!(
         "a = {a=1,}",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 9
   |
 1 | a = {a=1,}
   |         ^
 invalid inline table
 expected `}`
-"
+
+"#]]
     );
     bad!(
         "a = {,}",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = {,}
   |      ^
 invalid inline table
 expected `}`
-"
+
+"#]]
     );
     bad!(
         "a = {a=1,a=1}",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = {a=1,a=1}
   |      ^
 duplicate key `a`
-"
+
+"#]]
     );
     bad!(
         "a = {\n}",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = {
   |      ^
 invalid inline table
 expected `}`
-"
+
+"#]]
     );
     bad!(
         "a = {",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 6
   |
 1 | a = {
   |      ^
 invalid inline table
 expected `}`
-"
+
+"#]]
     );
 
-    "a = {a=[\n]}".parse::<Document>().unwrap();
-    "a = {\"a\"=[\n]}".parse::<Document>().unwrap();
-    "a = [\n{},\n{},\n]".parse::<Document>().unwrap();
+    "a = {a=[\n]}".parse::<DocumentMut>().unwrap();
+    "a = {\"a\"=[\n]}".parse::<DocumentMut>().unwrap();
+    "a = [\n{},\n{},\n]".parse::<DocumentMut>().unwrap();
 }
 
 #[test]
@@ -998,7 +1056,7 @@
     macro_rules! t {
         ($actual:expr, $expected:expr) => {{
             let f = format!("foo = {}", $actual);
-            let table = f.parse::<Document>().unwrap();
+            let table = f.parse::<DocumentMut>().unwrap();
             assert_eq!(table["foo"].as_integer().unwrap(), $expected);
         }};
     }
@@ -1014,45 +1072,49 @@
 fn bad_underscores() {
     bad!(
         "foo = 0_",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
 1 | foo = 0_
   |        ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = 0__0",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
 1 | foo = 0__0
   |        ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = __0",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | foo = __0
   |       ^
 invalid integer
 expected leading digit
-"
+
+"#]]
     );
     bad!(
         "foo = 1_0_",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 11
   |
 1 | foo = 1_0_
   |           ^
 invalid integer
 expected digit
-"
+
+"#]]
     );
 }
 
@@ -1060,14 +1122,15 @@
 fn bad_unicode_codepoint() {
     bad!(
         "foo = \"\\uD800\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
-1 | foo = \"\\uD800\"
+1 | foo = "\uD800"
   |          ^
 invalid unicode 4-digit hex code
 value is out of range
-"
+
+"#]]
     );
 }
 
@@ -1075,50 +1138,54 @@
 fn bad_strings() {
     bad!(
         "foo = \"\\uxx\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
-1 | foo = \"\\uxx\"
+1 | foo = "\uxx"
   |          ^
 invalid unicode 4-digit hex code
-"
+
+"#]]
     );
     bad!(
         "foo = \"\\u\"",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 10
   |
-1 | foo = \"\\u\"
+1 | foo = "\u"
   |          ^
 invalid unicode 4-digit hex code
-"
+
+"#]]
     );
     bad!(
         "foo = \"\\",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
-1 | foo = \"\\
+1 | foo = "\
   |        ^
 invalid basic string
-"
+
+"#]]
     );
     bad!(
         "foo = '",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 8
   |
 1 | foo = '
   |        ^
 invalid literal string
-"
+
+"#]]
     );
 }
 
 #[test]
 fn empty_string() {
     assert_eq!(
-        "foo = \"\"".parse::<Document>().unwrap()["foo"]
+        "foo = \"\"".parse::<DocumentMut>().unwrap()["foo"]
             .as_str()
             .unwrap(),
         ""
@@ -1127,53 +1194,57 @@
 
 #[test]
 fn booleans() {
-    let table = "foo = true".parse::<Document>().unwrap();
+    let table = "foo = true".parse::<DocumentMut>().unwrap();
     assert_eq!(table["foo"].as_bool(), Some(true));
 
-    let table = "foo = false".parse::<Document>().unwrap();
+    let table = "foo = false".parse::<DocumentMut>().unwrap();
     assert_eq!(table["foo"].as_bool(), Some(false));
 
     bad!(
         "foo = true2",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 11
   |
 1 | foo = true2
   |           ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = false2",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 12
   |
 1 | foo = false2
   |            ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = t1",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | foo = t1
   |       ^
 invalid string
-expected `\"`, `'`
-"
+expected `"`, `'`
+
+"#]]
     );
     bad!(
         "foo = f2",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 7
   |
 1 | foo = f2
   |       ^
 invalid string
-expected `\"`, `'`
-"
+expected `"`, `'`
+
+"#]]
     );
 }
 
@@ -1185,56 +1256,60 @@
         [[a]]
         b = 5
         ",
-        "\
+        str![[r#"
 TOML parse error at line 3, column 9
   |
 3 |         [[a]]
   |         ^
 invalid table header
 duplicate key `a` in document root
-"
+
+"#]]
     );
     bad!(
         "
         a = 1
         [a.b]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 3, column 9
   |
 3 |         [a.b]
   |         ^
 invalid table header
 dotted key `a` attempted to extend non-table type (integer)
-"
+
+"#]]
     );
     bad!(
         "
         a = []
         [a.b]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 3, column 9
   |
 3 |         [a.b]
   |         ^
 invalid table header
 dotted key `a` attempted to extend non-table type (array)
-"
+
+"#]]
     );
     bad!(
         "
         a = []
         [[a.b]]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 3, column 9
   |
 3 |         [[a.b]]
   |         ^
 invalid table header
 dotted key `a` attempted to extend non-table type (array)
-"
+
+"#]]
     );
     bad!(
         "
@@ -1243,14 +1318,15 @@
         [a.b]
         c = 2
         ",
-        "\
+        str![[r#"
 TOML parse error at line 4, column 9
   |
 4 |         [a.b]
   |         ^
 invalid table header
 duplicate key `b` in table `a`
-"
+
+"#]]
     );
 }
 
@@ -1264,14 +1340,15 @@
         foo=\"bar\"
         [a]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 6, column 9
   |
 6 |         [a]
   |         ^
 invalid table header
 duplicate key `a` in document root
-"
+
+"#]]
     );
     bad!(
         "
@@ -1280,14 +1357,15 @@
         b = { foo = \"bar\" }
         [a]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 5, column 9
   |
 5 |         [a]
   |         ^
 invalid table header
 duplicate key `a` in document root
-"
+
+"#]]
     );
     bad!(
         "
@@ -1295,14 +1373,15 @@
         b = {}
         [a.b]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 4, column 9
   |
 4 |         [a.b]
   |         ^
 invalid table header
 duplicate key `b` in table `a`
-"
+
+"#]]
     );
 
     bad!(
@@ -1311,14 +1390,15 @@
         b = {}
         [a]
         ",
-        "\
+        str![[r#"
 TOML parse error at line 4, column 9
   |
 4 |         [a]
   |         ^
 invalid table header
 duplicate key `a` in document root
-"
+
+"#]]
     );
 }
 
@@ -1327,7 +1407,7 @@
     macro_rules! t {
         ($actual:expr) => {{
             let f = format!("foo = {}", $actual);
-            let toml = f.parse::<Document>().expect(&format!("failed: {}", f));
+            let toml = f.parse::<DocumentMut>().expect(&format!("failed: {}", f));
             assert_eq!(toml["foo"].as_datetime().unwrap().to_string(), $actual);
         }};
     }
@@ -1338,53 +1418,58 @@
     t!("2016-09-09T09:09:09.123456789-02:00");
     bad!(
         "foo = 2016-09-09T09:09:09.Z",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 26
   |
 1 | foo = 2016-09-09T09:09:09.Z
   |                          ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         "foo = 2016-9-09T09:09:09Z",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 12
   |
 1 | foo = 2016-9-09T09:09:09Z
   |            ^
 invalid date-time
-"
+
+"#]]
     );
     bad!(
         "foo = 2016-09-09T09:09:09+2:00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 27
   |
 1 | foo = 2016-09-09T09:09:09+2:00
   |                           ^
 invalid time offset
-"
+
+"#]]
     );
     bad!(
         "foo = 2016-09-09T09:09:09-2:00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 27
   |
 1 | foo = 2016-09-09T09:09:09-2:00
   |                           ^
 invalid time offset
-"
+
+"#]]
     );
     bad!(
         "foo = 2016-09-09T09:09:09Z-2:00",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 27
   |
 1 | foo = 2016-09-09T09:09:09Z-2:00
   |                           ^
 expected newline, `#`
-"
+
+"#]]
     );
 }
 
@@ -1392,24 +1477,27 @@
 fn require_newline_after_value() {
     bad!(
         "0=0r=false",
-        "\
+        str![[r#"
 TOML parse error at line 1, column 4
   |
 1 | 0=0r=false
   |    ^
 expected newline, `#`
-"
+
+"#]]
     );
     bad!(
         r#"
 0=""o=""m=""r=""00="0"q="""0"""e="""0"""
 "#,
-        r#"TOML parse error at line 2, column 5
+        str![[r#"
+TOML parse error at line 2, column 5
   |
 2 | 0=""o=""m=""r=""00="0"q="""0"""e="""0"""
   |     ^
 expected newline, `#`
-"#
+
+"#]]
     );
     bad!(
         r#"
@@ -1418,45 +1506,53 @@
 0="0"[[0000l0]]
 0="0"l="0"
 "#,
-        r#"TOML parse error at line 3, column 6
+        str![[r#"
+TOML parse error at line 3, column 6
   |
 3 | 0="0"[[0000l0]]
   |      ^
 expected newline, `#`
-"#
+
+"#]]
     );
     bad!(
         r#"
 0=[0]00=[0,0,0]t=["0","0","0"]s=[1000-00-00T00:00:00Z,2000-00-00T00:00:00Z]
 "#,
-        r#"TOML parse error at line 2, column 6
+        str![[r#"
+TOML parse error at line 2, column 6
   |
 2 | 0=[0]00=[0,0,0]t=["0","0","0"]s=[1000-00-00T00:00:00Z,2000-00-00T00:00:00Z]
   |      ^
 expected newline, `#`
-"#
+
+"#]]
     );
     bad!(
         r#"
 0=0r0=0r=false
 "#,
-        r#"TOML parse error at line 2, column 4
+        str![[r#"
+TOML parse error at line 2, column 4
   |
 2 | 0=0r0=0r=false
   |    ^
 expected newline, `#`
-"#
+
+"#]]
     );
     bad!(
         r#"
 0=0r0=0r=falsefal=false
 "#,
-        r#"TOML parse error at line 2, column 4
+        str![[r#"
+TOML parse error at line 2, column 4
   |
 2 | 0=0r0=0r=falsefal=false
   |    ^
 expected newline, `#`
-"#
+
+"#]]
     );
 }
 
@@ -1471,14 +1567,14 @@
 p.a=4
 [p.o]
 "#;
-    let document = input.parse::<Document>().unwrap();
+    let document = input.parse::<DocumentMut>().unwrap();
     let actual = document.to_string();
-    assert_eq(input, actual);
+    assert_data_eq!(actual, input.raw());
 }
 
 #[test]
 fn despan_keys() {
-    let mut doc = r#"aaaaaa = 1"#.parse::<Document>().unwrap();
+    let mut doc = r#"aaaaaa = 1"#.parse::<DocumentMut>().unwrap();
     let key = "bbb".parse::<Key>().unwrap();
     let table = doc.as_table_mut();
     table.insert_formatted(
@@ -1503,8 +1599,260 @@
 "###;
     let expected = input;
 
-    let manifest: toml_edit::Document = input.parse().unwrap();
+    let manifest: DocumentMut = input.parse().unwrap();
     let actual = manifest.to_string();
 
-    assert_eq(expected, actual);
+    assert_data_eq!(actual, expected.raw());
+}
+
+#[test]
+fn string_repr_roundtrip() {
+    assert_string_repr_roundtrip(r#""""#, str![[r#""""#]]);
+    assert_string_repr_roundtrip(r#""a""#, str![[r#""a""#]]);
+
+    assert_string_repr_roundtrip(r#""tab \t tab""#, str![[r#""tab /t tab""#]]);
+    assert_string_repr_roundtrip(r#""lf \n lf""#, str![[r#""lf /n lf""#]]);
+    assert_string_repr_roundtrip(r#""crlf \r\n crlf""#, str![[r#""crlf /r/n crlf""#]]);
+    assert_string_repr_roundtrip(r#""bell \b bell""#, str![[r#""bell /b bell""#]]);
+    assert_string_repr_roundtrip(r#""feed \f feed""#, str![[r#""feed /f feed""#]]);
+    assert_string_repr_roundtrip(
+        r#""backslash \\ backslash""#,
+        str![[r#""backslash // backslash""#]],
+    );
+
+    assert_string_repr_roundtrip(r#""squote ' squote""#, str![[r#""squote ' squote""#]]);
+    assert_string_repr_roundtrip(
+        r#""triple squote ''' triple squote""#,
+        str![[r#""triple squote ''' triple squote""#]],
+    );
+    assert_string_repr_roundtrip(r#""end squote '""#, str![[r#""end squote '""#]]);
+
+    assert_string_repr_roundtrip(r#""quote \" quote""#, str![[r#""quote /" quote""#]]);
+    assert_string_repr_roundtrip(
+        r#""triple quote \"\"\" triple quote""#,
+        str![[r#""triple quote /"/"/" triple quote""#]],
+    );
+    assert_string_repr_roundtrip(r#""end quote \"""#, str![[r#""end quote /"""#]]);
+    assert_string_repr_roundtrip(
+        r#""quoted \"content\" quoted""#,
+        str![[r#""quoted /"content/" quoted""#]],
+    );
+    assert_string_repr_roundtrip(
+        r#""squoted 'content' squoted""#,
+        str![[r#""squoted 'content' squoted""#]],
+    );
+    assert_string_repr_roundtrip(
+        r#""mixed quoted \"start\" 'end'' mixed quote""#,
+        str![[r#""mixed quoted /"start/" 'end'' mixed quote""#]],
+    );
+}
+
+#[track_caller]
+fn assert_string_repr_roundtrip(input: &str, expected: impl IntoData) {
+    let value: Value = input.parse().unwrap();
+    let actual = value.to_string();
+    let _: Value = actual.parse().unwrap_or_else(|_err| {
+        panic!(
+            "invalid `Value`:
+```
+{actual}
+```
+"
+        )
+    });
+    let expected = expected.into_data();
+    assert_data_eq!(actual, expected);
+}
+
+#[test]
+fn string_value_roundtrip() {
+    assert_string_value_roundtrip(r#""""#, str![[r#""""#]]);
+    assert_string_value_roundtrip(r#""a""#, str![[r#""a""#]]);
+
+    assert_string_value_roundtrip(r#""tab \t tab""#, str![[r#""tab /t tab""#]]);
+    assert_string_value_roundtrip(
+        r#""lf \n lf""#,
+        str![[r#"
+"""
+lf 
+ lf"""
+"#]],
+    );
+    assert_string_value_roundtrip(
+        r#""crlf \r\n crlf""#,
+        str![[r#"
+"""
+crlf /r
+ crlf"""
+"#]],
+    );
+    assert_string_value_roundtrip(r#""bell \b bell""#, str![[r#""bell /b bell""#]]);
+    assert_string_value_roundtrip(r#""feed \f feed""#, str![[r#""feed /f feed""#]]);
+    assert_string_value_roundtrip(
+        r#""backslash \\ backslash""#,
+        str!["'backslash / backslash'"],
+    );
+
+    assert_string_value_roundtrip(r#""squote ' squote""#, str![[r#""squote ' squote""#]]);
+    assert_string_value_roundtrip(
+        r#""triple squote ''' triple squote""#,
+        str![[r#""triple squote ''' triple squote""#]],
+    );
+    assert_string_value_roundtrip(r#""end squote '""#, str![[r#""end squote '""#]]);
+
+    assert_string_value_roundtrip(r#""quote \" quote""#, str![[r#"'quote " quote'"#]]);
+    assert_string_value_roundtrip(
+        r#""triple quote \"\"\" triple quote""#,
+        str![[r#"'triple quote """ triple quote'"#]],
+    );
+    assert_string_value_roundtrip(r#""end quote \"""#, str![[r#"'end quote "'"#]]);
+    assert_string_value_roundtrip(
+        r#""quoted \"content\" quoted""#,
+        str![[r#"'quoted "content" quoted'"#]],
+    );
+    assert_string_value_roundtrip(
+        r#""squoted 'content' squoted""#,
+        str![[r#""squoted 'content' squoted""#]],
+    );
+    assert_string_value_roundtrip(
+        r#""mixed quoted \"start\" 'end'' mixed quote""#,
+        str![[r#"'''mixed quoted "start" 'end'' mixed quote'''"#]],
+    );
+}
+
+#[track_caller]
+fn assert_string_value_roundtrip(input: &str, expected: impl IntoData) {
+    let value: Value = input.parse().unwrap();
+    let value = Value::from(value.as_str().unwrap()); // Remove repr
+    let actual = value.to_string();
+    let _: Value = actual.parse().unwrap_or_else(|_err| {
+        panic!(
+            "invalid `Value`:
+```
+{actual}
+```
+"
+        )
+    });
+    let expected = expected.into_data();
+    assert_data_eq!(actual, expected);
+}
+
+#[test]
+fn key_repr_roundtrip() {
+    assert_key_repr_roundtrip(r#""""#, str![[r#""""#]]);
+    assert_key_repr_roundtrip(r#""a""#, str![[r#""a""#]]);
+
+    assert_key_repr_roundtrip(r#""tab \t tab""#, str![[r#""tab /t tab""#]]);
+    assert_key_repr_roundtrip(r#""lf \n lf""#, str![[r#""lf /n lf""#]]);
+    assert_key_repr_roundtrip(r#""crlf \r\n crlf""#, str![[r#""crlf /r/n crlf""#]]);
+    assert_key_repr_roundtrip(r#""bell \b bell""#, str![[r#""bell /b bell""#]]);
+    assert_key_repr_roundtrip(r#""feed \f feed""#, str![[r#""feed /f feed""#]]);
+    assert_key_repr_roundtrip(
+        r#""backslash \\ backslash""#,
+        str![[r#""backslash // backslash""#]],
+    );
+
+    assert_key_repr_roundtrip(r#""squote ' squote""#, str![[r#""squote ' squote""#]]);
+    assert_key_repr_roundtrip(
+        r#""triple squote ''' triple squote""#,
+        str![[r#""triple squote ''' triple squote""#]],
+    );
+    assert_key_repr_roundtrip(r#""end squote '""#, str![[r#""end squote '""#]]);
+
+    assert_key_repr_roundtrip(r#""quote \" quote""#, str![[r#""quote /" quote""#]]);
+    assert_key_repr_roundtrip(
+        r#""triple quote \"\"\" triple quote""#,
+        str![[r#""triple quote /"/"/" triple quote""#]],
+    );
+    assert_key_repr_roundtrip(r#""end quote \"""#, str![[r#""end quote /"""#]]);
+    assert_key_repr_roundtrip(
+        r#""quoted \"content\" quoted""#,
+        str![[r#""quoted /"content/" quoted""#]],
+    );
+    assert_key_repr_roundtrip(
+        r#""squoted 'content' squoted""#,
+        str![[r#""squoted 'content' squoted""#]],
+    );
+    assert_key_repr_roundtrip(
+        r#""mixed quoted \"start\" 'end'' mixed quote""#,
+        str![[r#""mixed quoted /"start/" 'end'' mixed quote""#]],
+    );
+}
+
+#[track_caller]
+fn assert_key_repr_roundtrip(input: &str, expected: impl IntoData) {
+    let value: Key = input.parse().unwrap();
+    let actual = value.to_string();
+    let _: Key = actual.parse().unwrap_or_else(|_err| {
+        panic!(
+            "invalid `Key`:
+```
+{actual}
+```
+"
+        )
+    });
+    let expected = expected.into_data();
+    assert_data_eq!(actual, expected);
+}
+
+#[test]
+fn key_value_roundtrip() {
+    assert_key_value_roundtrip(r#""""#, str![[r#""""#]]);
+    assert_key_value_roundtrip(r#""a""#, str!["a"]);
+
+    assert_key_value_roundtrip(r#""tab \t tab""#, str![[r#""tab /t tab""#]]);
+    assert_key_value_roundtrip(r#""lf \n lf""#, str![[r#""lf /n lf""#]]);
+    assert_key_value_roundtrip(r#""crlf \r\n crlf""#, str![[r#""crlf /r/n crlf""#]]);
+    assert_key_value_roundtrip(r#""bell \b bell""#, str![[r#""bell /b bell""#]]);
+    assert_key_value_roundtrip(r#""feed \f feed""#, str![[r#""feed /f feed""#]]);
+    assert_key_value_roundtrip(
+        r#""backslash \\ backslash""#,
+        str!["'backslash / backslash'"],
+    );
+
+    assert_key_value_roundtrip(r#""squote ' squote""#, str![[r#""squote ' squote""#]]);
+    assert_key_value_roundtrip(
+        r#""triple squote ''' triple squote""#,
+        str![[r#""triple squote ''' triple squote""#]],
+    );
+    assert_key_value_roundtrip(r#""end squote '""#, str![[r#""end squote '""#]]);
+
+    assert_key_value_roundtrip(r#""quote \" quote""#, str![[r#"'quote " quote'"#]]);
+    assert_key_value_roundtrip(
+        r#""triple quote \"\"\" triple quote""#,
+        str![[r#"'triple quote """ triple quote'"#]],
+    );
+    assert_key_value_roundtrip(r#""end quote \"""#, str![[r#"'end quote "'"#]]);
+    assert_key_value_roundtrip(
+        r#""quoted \"content\" quoted""#,
+        str![[r#"'quoted "content" quoted'"#]],
+    );
+    assert_key_value_roundtrip(
+        r#""squoted 'content' squoted""#,
+        str![[r#""squoted 'content' squoted""#]],
+    );
+    assert_key_value_roundtrip(
+        r#""mixed quoted \"start\" 'end'' mixed quote""#,
+        str![[r#""mixed quoted /"start/" 'end'' mixed quote""#]],
+    );
+}
+
+#[track_caller]
+fn assert_key_value_roundtrip(input: &str, expected: impl IntoData) {
+    let value: Key = input.parse().unwrap();
+    let value = Key::new(value.get()); // Remove repr
+    let actual = value.to_string();
+    let _: Key = actual.parse().unwrap_or_else(|_err| {
+        panic!(
+            "invalid `Key`:
+```
+{actual}
+```
+"
+        )
+    });
+    let expected = expected.into_data();
+    assert_data_eq!(actual, expected);
 }

crates/toml_edit/tests/testsuite/stackoverflow.rs

diff --git a/crates/toml_edit/tests/testsuite/stackoverflow.rs b/crates/toml_edit/tests/testsuite/stackoverflow.rs
index de4c722..2e6d246 100644
--- a/crates/toml_edit/tests/testsuite/stackoverflow.rs
+++ b/crates/toml_edit/tests/testsuite/stackoverflow.rs
@@ -4,7 +4,7 @@
     let depths = [(1, true), (20, true), (300, false)];
     for (depth, is_ok) in depths {
         let input = format!("x={}{}", &"[".repeat(depth), &"]".repeat(depth));
-        let document = input.parse::<toml_edit::Document>();
+        let document = input.parse::<toml_edit::DocumentMut>();
         assert_eq!(document.is_ok(), is_ok, "depth: {}", depth);
     }
 }
@@ -15,7 +15,7 @@
     let depths = [(1, true), (20, true), (300, false)];
     for (depth, is_ok) in depths {
         let input = format!("x={}true{}", &"{ x = ".repeat(depth), &"}".repeat(depth));
-        let document = input.parse::<toml_edit::Document>();
+        let document = input.parse::<toml_edit::DocumentMut>();
         assert_eq!(document.is_ok(), is_ok, "depth: {}", depth);
     }
 }
@@ -26,7 +26,7 @@
     let depths = [(1, true), (20, true), (300, false)];
     for (depth, is_ok) in depths {
         let input = format!("[x{}]", &".x".repeat(depth));
-        let document = input.parse::<toml_edit::Document>();
+        let document = input.parse::<toml_edit::DocumentMut>();
         assert_eq!(document.is_ok(), is_ok, "depth: {}", depth);
     }
 }
@@ -37,7 +37,7 @@
     let depths = [(1, true), (20, true), (300, false)];
     for (depth, is_ok) in depths {
         let input = format!("x{} = true", &".x".repeat(depth));
-        let document = input.parse::<toml_edit::Document>();
+        let document = input.parse::<toml_edit::DocumentMut>();
         assert_eq!(document.is_ok(), is_ok, "depth: {}", depth);
     }
 }
@@ -48,7 +48,7 @@
     let depths = [(1, true), (20, true), (300, false)];
     for (depth, is_ok) in depths {
         let input = format!("x = {{ x{} = true }}", &".x".repeat(depth));
-        let document = input.parse::<toml_edit::Document>();
+        let document = input.parse::<toml_edit::DocumentMut>();
         assert_eq!(document.is_ok(), is_ok, "depth: {}", depth);
     }
 }

crates/tracing/.android-checksum.json

diff --git a/crates/tracing/.android-checksum.json b/crates/tracing/.android-checksum.json
index bbf0610..2e0a0d1 100644
--- a/crates/tracing/.android-checksum.json
+++ b/crates/tracing/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"f5dcc41dbbff7b7ee26a24c1cea3af9771aa19422f002b83fb4a75c1a143719d","Android.bp":"89c7bdc670500be6da0cdb45715b9cf25477c9145a612d1442b04ae0590f2486","CHANGELOG.md":"83d1f01bedb24102a630698ad8f37fd98622096411c31c2f8e9706e782da3d28","Cargo.toml":"6745f850b0f32e4484d3b37d4b0740c7cb841b42ecd5e35b394be8e8d06d3b3c","LICENSE":"81b5afff24bf73e7d6660ff9e03a493ba57f494dad837134a654b3945a3199d7","METADATA":"aa5d42841b8ef7e87b526623309bab410c964d5e17d1ba5061a86af968b49a1b","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"2ea85e52967c6009ec9b14a38915c227bddbc4f20c451741d058c00a2472a346","benches/baseline.rs":"c7a2ecdb72fea8f9161ec12f3f8bb4a3108ab65dada9101431124cd383930e96","benches/dispatch_get_clone.rs":"7f9b901641eaf78c3b691036e84b25a6fdd2cfb4dbe0d6cf1939b3f872aad155","benches/dispatch_get_ref.rs":"d0a7adaf237e585a9e850f207d32bf358b91cf2702e9c17084d189e1ed4eda5c","benches/empty_span.rs":"eb214ec80a601dd7deec54109a9921bdc76e91d788412a8dd626cc55ba8a982d","benches/enter_span.rs":"424baadd508d8cbb3df4cd828f0d3b98e17cf29d897df42b6e30d71e3ab3239e","benches/event.rs":"f4e6a10225e162693cc30017bab847b647ce78bf403898bd2c1d9bcca48c3cb4","benches/shared.rs":"ffa86d1edea3b645a52eb8c519bb25c1868aae8da34c1c5ae88da559cdf94a57","benches/span_fields.rs":"3f8dabb263a914e00be25f907d6759b3a9f6516fb8a882893a3184df940e514b","benches/span_no_fields.rs":"d30b7664b9a9b100c77b68fb8584aca093fa4b41d69b53b37dccbea366e1c60a","benches/span_repeated.rs":"11db6c7f458e3e83e997fdcd22113d68d3016ba0c53e02b610600def434a3cc5","cargo_embargo.json":"862f3402e4541b7985c935104f2a607ee0fb5c0501c620611f8b47377a90b50d","src/dispatcher.rs":"6428903c6b66fe0f4f7105791f09d588c35cbe00ec864c0dd064c478eca900be","src/field.rs":"b7ea1a84b3fc4103a8f787bb400146ef71cab5f689e087ac961ab7dd1fada005","src/instrument.rs":"7f2528c2fcbeeb21c51a8af695583293e96af59a02a3c3b9406aa2f874b320e9","src/level_filters.rs":"e051513fc7f2a5a4e56c4fe86ceda80cb0395a5ccba6e49dc95b1aca2f612579","src/lib.rs":"8ecad32048ffe0f42853b6812dcdcd685a074db9e7ead55dbaa465d9b4b2ccaa","src/macros.rs":"c4784cd867c8e85c45a285dd00ad5fda5d4add11f8186692eae232133fabbf1b","src/span.rs":"28cb2843b76911e93017da4e969af8916602b5e450006154cd7c736295963a88","src/stdlib.rs":"db6b63e680c9285e1b30a5234c6b14a1e53f2ad4c41aa5fb582da33f07229af6","src/subscriber.rs":"a60aa85e9d41203ae2c68a1e11d5b3361f905ac1892ac56142159c3f87a02537","tests/enabled.rs":"087c65298c599c433db41c1e501d254d5a9c7e735f48a304131b1eadf80bbe4e","tests/event.rs":"22429e5a08cab80a82b4077438341ca333f5e296d665f221800513dcdb019cd4","tests/filter_caching_is_lexically_scoped.rs":"dc6b5cf37a3a9871a9744bb822087b5b94dd835c0472ef5f9b5a649b66779a4b","tests/filters_are_not_reevaluated_for_the_same_span.rs":"605efca02f1940b31927a4a388a21b76b5e834ac91ccf4943e5be17c9a170e7d","tests/filters_are_reevaluated_for_different_call_sites.rs":"5ff455da8ca7c08cb003bb24db43f781fd38010a45923aa9bdddb6f829beca72","tests/filters_dont_leak.rs":"09b12fa51c0d6f033d000b63215040b3e71c4351cc9ec08c81af0db414c106d5","tests/future_send.rs":"b88303ec21941a99db4ac7b8cfa1713c902df76ff3758ca3cc0a57807d76c3e5","tests/instrument.rs":"c0c70bb12415e49863c22ec1353ddd061cff5138c86978b99e8089d082588359","tests/macro_imports.rs":"21e2a293e400251273988178aad6ff0598fc5e7b5d76c8f0365777757438cc45","tests/macros.rs":"2a0f6868edaa84037fc0bba4ef7cb2d69abf9b477286068b4285a8b9ab6fee17","tests/macros_incompatible_concat.rs":"8ea190ebcc2b48ee079da79a4c9307925d161b4ae23cb49176de3da76dae80be","tests/max_level_hint.rs":"8e4a8c350e8a3bbbef459a6a4b79c09efa6f93064480830cf610ae8053fb749f","tests/multiple_max_level_hints.rs":"ed06f9924a612c72696319bb0845948c571760063e311008b4be559930169820","tests/no_subscriber.rs":"06ff5c207971a4b902489d87c76df6a9c353cc67760d47e8a459173ca3b9f96f","tests/register_callsite_deadlock.rs":"6e4915c321e9d50e54d556592e54c76d8d9b89e8e8f99f5b3856d30cadf60357","tests/scoped_clobbers_default.rs":"564b1ba437bdd22315d6597403540a884ef90e5227060f7925f50cd5e7b2b0f9","tests/span.rs":"97666a8561bb7fc0a02ab82db9b7481ee80f863b9f467a5e5f891b13137e8de0","tests/subscriber.rs":"95b0a92b1edf37e8c6af766bfc4833824df52f06d987ff3f0facefafa07dcb84"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"a903fa50d9ea75ee3f6cbb423c42244fca6f245c1c54907e4b4fca9f7a5a01ae","Android.bp":"139dd9b29e4b69e211f786e6733e66aa4a7045b530da1fd1567160ee2972b6ec","CHANGELOG.md":"3820ece64599fecff28ebf27bfd4544a160f20b292dd01746d8c10322eb15916","Cargo.toml":"0a98a9bce5b8d7b0159b9a46dfa400e8b2ab38f64fd1e0932ac3547f89293990","LICENSE":"81b5afff24bf73e7d6660ff9e03a493ba57f494dad837134a654b3945a3199d7","METADATA":"08635ba5c4060353da6c5d872356b506d1991f28a04aea7da9ab21622735d897","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"56830f1adde979de325afc5c6e63eb8587820e5d9914c978923d250bad2c74f3","benches/baseline.rs":"c7a2ecdb72fea8f9161ec12f3f8bb4a3108ab65dada9101431124cd383930e96","benches/dispatch_get_clone.rs":"7f9b901641eaf78c3b691036e84b25a6fdd2cfb4dbe0d6cf1939b3f872aad155","benches/dispatch_get_ref.rs":"d0a7adaf237e585a9e850f207d32bf358b91cf2702e9c17084d189e1ed4eda5c","benches/empty_span.rs":"eb214ec80a601dd7deec54109a9921bdc76e91d788412a8dd626cc55ba8a982d","benches/enter_span.rs":"424baadd508d8cbb3df4cd828f0d3b98e17cf29d897df42b6e30d71e3ab3239e","benches/event.rs":"f4e6a10225e162693cc30017bab847b647ce78bf403898bd2c1d9bcca48c3cb4","benches/shared.rs":"ffa86d1edea3b645a52eb8c519bb25c1868aae8da34c1c5ae88da559cdf94a57","benches/span_fields.rs":"3f8dabb263a914e00be25f907d6759b3a9f6516fb8a882893a3184df940e514b","benches/span_no_fields.rs":"d30b7664b9a9b100c77b68fb8584aca093fa4b41d69b53b37dccbea366e1c60a","benches/span_repeated.rs":"11db6c7f458e3e83e997fdcd22113d68d3016ba0c53e02b610600def434a3cc5","cargo_embargo.json":"862f3402e4541b7985c935104f2a607ee0fb5c0501c620611f8b47377a90b50d","src/dispatcher.rs":"6428903c6b66fe0f4f7105791f09d588c35cbe00ec864c0dd064c478eca900be","src/field.rs":"b7ea1a84b3fc4103a8f787bb400146ef71cab5f689e087ac961ab7dd1fada005","src/instrument.rs":"7f2528c2fcbeeb21c51a8af695583293e96af59a02a3c3b9406aa2f874b320e9","src/level_filters.rs":"e051513fc7f2a5a4e56c4fe86ceda80cb0395a5ccba6e49dc95b1aca2f612579","src/lib.rs":"9238b7ec3e6da493e23713ed2d2bfdd02debe22f35253a43115aa6912b96a54d","src/macros.rs":"95caf438e46177f16ec14c862aecac58067e2d486a6fd4ebaea96f3be251805d","src/span.rs":"2cecd85243746c1157055ca72759dd27918be9a708c3db15288ff21c2077e581","src/stdlib.rs":"db6b63e680c9285e1b30a5234c6b14a1e53f2ad4c41aa5fb582da33f07229af6","src/subscriber.rs":"a60aa85e9d41203ae2c68a1e11d5b3361f905ac1892ac56142159c3f87a02537","tests/enabled.rs":"68fd024e00f9e352ae6fd2e1a1b78326aa9497d354ed39da07cfb1fb762fc4ff","tests/event.rs":"082473fa3cf9985044cb051618ffa2dc2ee69a0d0423b7ff7d5ab35999efb18e","tests/filter_caching_is_lexically_scoped.rs":"dc6b5cf37a3a9871a9744bb822087b5b94dd835c0472ef5f9b5a649b66779a4b","tests/filters_are_not_reevaluated_for_the_same_span.rs":"605efca02f1940b31927a4a388a21b76b5e834ac91ccf4943e5be17c9a170e7d","tests/filters_are_reevaluated_for_different_call_sites.rs":"5ff455da8ca7c08cb003bb24db43f781fd38010a45923aa9bdddb6f829beca72","tests/filters_dont_leak.rs":"09b12fa51c0d6f033d000b63215040b3e71c4351cc9ec08c81af0db414c106d5","tests/future_send.rs":"b88303ec21941a99db4ac7b8cfa1713c902df76ff3758ca3cc0a57807d76c3e5","tests/instrument.rs":"e03a0219fdab3e8d079217131d46dcc9dacb63f8a8d80a3f1ffc3bf86d32460c","tests/macro_imports.rs":"21e2a293e400251273988178aad6ff0598fc5e7b5d76c8f0365777757438cc45","tests/macros.rs":"2ab4495fab861baad4aa18879ccc38d0c6be22d52aa20a62be6787fe4630d22a","tests/macros_incompatible_concat.rs":"8ea190ebcc2b48ee079da79a4c9307925d161b4ae23cb49176de3da76dae80be","tests/max_level_hint.rs":"8e4a8c350e8a3bbbef459a6a4b79c09efa6f93064480830cf610ae8053fb749f","tests/missed_register_callsite.rs":"ce18308700d928cf0db5572c6456fa240e48ac8692c300d1ce6af89ab1fd398f","tests/multiple_max_level_hints.rs":"ed06f9924a612c72696319bb0845948c571760063e311008b4be559930169820","tests/no_subscriber.rs":"06ff5c207971a4b902489d87c76df6a9c353cc67760d47e8a459173ca3b9f96f","tests/register_callsite_deadlock.rs":"6e4915c321e9d50e54d556592e54c76d8d9b89e8e8f99f5b3856d30cadf60357","tests/scoped_clobbers_default.rs":"d2facc4119bcfc11c3f2d190263f377058ce2888e02456c1c1a6a4df1eb20b4d","tests/span.rs":"dedcc71df91790f3835945d3a051f021db11e2d4382a0c1491be909116e9aec9","tests/subscriber.rs":"be0f5ae5bc923a62c73eb01908ff9aa614ff98fa5f5e770f349bd2fc44a18893"}}
\ No newline at end of file

crates/tracing/.cargo-checksum.json

diff --git a/crates/tracing/.cargo-checksum.json b/crates/tracing/.cargo-checksum.json
index 92c7ecf..a22e4ee 100644
--- a/crates/tracing/.cargo-checksum.json
+++ b/crates/tracing/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"8f2a5e3f70b90ef91e724b0089f511f6ce95cc6afaf1da30d3d486e30935c520","Cargo.toml":"e8262bfd368f8b9c2f902db368a71da88f446584167392a2611b8eb08e411175","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"baed1881843d68618241ccc57e2120993f6eb67c0e1987115b6855f7d328def3","benches/baseline.rs":"43a3e31b6c33dba2e6328052301b707b212487b83f0dcffc843061a9c48a2319","benches/dispatch_get_clone.rs":"866239abeb74a82440741c948a4e7e0a44e92e8cc87319ec57e3b057c9e8f5dd","benches/dispatch_get_ref.rs":"dd2803259a6784c256304e676bbce05de233e4c8451ac85863787213343e9be7","benches/empty_span.rs":"9f51cf376414ea751b2f50c357f2435a545d606118286f5b8b89f185e28aad8c","benches/enter_span.rs":"4410ec73d277e7b54e9f306c00ff3b79a150d1832966b7fc29984c8e3ad8d57c","benches/event.rs":"98de3c82ed18abe0a3cbe6eda9a4f9deec2b69bca42c3aac11dea4b608b85a67","benches/shared.rs":"2623311af7d153685064e664a5903d03e7dc3179754c324f3a76f29f060515e6","benches/span_fields.rs":"9166cd43ef2783e5419dd61ea57a02e48e8cc38aa1b357e9b79fa581929b60d8","benches/span_no_fields.rs":"79cc4befacf27d7ce728246087c4f06a6066f913e831d9043caeb7941f0193f6","benches/span_repeated.rs":"e4b3c99a7a9fc15d9042b8db399a56cf647b4eebd26f29d95325bb057b68330b","src/dispatcher.rs":"a8732392ffe56b1178f8fd3d6e6e02d40b51475c38bb4600abd9cd170df1bf6c","src/field.rs":"fe6c2eb36f92880254a707a465f873ca84510d93f06614b9b36ba20b48bf209d","src/instrument.rs":"034b1c7e46ab2fae331ea215a3d1b1a2211ef6b18d7e7113523e3ef5bf3ca9bb","src/level_filters.rs":"92aca5797a59b2f3c34adfb896260400c2602456eec0fe9c7d49204df37ff699","src/lib.rs":"54a1168ed65d746ce1cc6668a78931131af2afc7e0530391dcffcaa58a9f7971","src/macros.rs":"6ffcbea4b4b402b46e9e074f0808fb755b59ce2bb1c97aa4acdfdb31bb26bf4c","src/span.rs":"4efa37a8fc7604fcc3547eac488122c13bcb28e136f46381082480e0036217a0","src/stdlib.rs":"248514a9bae6106e436358aee44c92abf8e7f79022895c4a25136ddef211d198","src/subscriber.rs":"8933d8766439f929c0a98a0863d20aff37b221314b3825edd9058be511149968","tests/enabled.rs":"a80fd3c70be439b0d1d2509b46a2b9ca31748aab4341f67d0fa721f32c6a65a1","tests/event.rs":"d3c6d688fc1938516770a9fb486252bbe8e95f24b37097a2291e7119b6e78373","tests/filter_caching_is_lexically_scoped.rs":"5487a37db5fbdf3d57020ab1f01185d928c45d967d99d723ffc434540459d8dc","tests/filters_are_not_reevaluated_for_the_same_span.rs":"251abbc000dddd298448958a1f0e5be71da527ac6c1a368d57837c83a5467329","tests/filters_are_reevaluated_for_different_call_sites.rs":"e0fdd8e930c043674702831b4d96f331e63aba824576bbac50b3f53bb0241cc7","tests/filters_dont_leak.rs":"6c41d3209cf2a37a1656a8314399777022ceec556e44f5417f1f5a4cd24eb43a","tests/future_send.rs":"3e9c9193219d12e342c18bbedb2f6ec940334202feb3cffba91601d6001b8575","tests/instrument.rs":"e46cf30db3ff0174e4e0885720b97531c56cbe7d05bb4580e38790f272856b56","tests/macro_imports.rs":"d5de857162185d4a2384f3cb644bfcf76c7f5c1a3b5f72bfa0d2620ac6e3873c","tests/macros.rs":"acb6987a37be2035cde28c8a6b3cecbdbffffafebe6c007712cd145afbd1beb8","tests/macros_incompatible_concat.rs":"5f3bcbb65e4ae39db1cfc2def62fc913c20bab0fb769c8f731504e2615585ee5","tests/max_level_hint.rs":"39576a958df3ea215c49154ff72c3dd14c8b3be3fcdb849e7dd847c8c9fd09e2","tests/multiple_max_level_hints.rs":"28ead97a8424358a0632547dae987ddbddc5bb69cdcd996d20feb49a7f3ddc69","tests/no_subscriber.rs":"ca42d0d4a20eb3b4e0a342b5e0090c7ada8b5a157f3cddb7b5d051238cdc1202","tests/register_callsite_deadlock.rs":"c0b3142543e7a10065c7583a8ee0b6bc978ea4f3979599651101c5a28966e7c8","tests/scoped_clobbers_default.rs":"5fd48ff207df64b0e2ee443de75da0d8bd3b0817c6d9b003b0b00157ec244d7b","tests/span.rs":"2a5a8c666c8a2b51a1a1222e6046a1067690f039d15ef8b56d0e83bffa76f78d","tests/subscriber.rs":"ed3c02e8a75c6e4fc187a024fde6319e6d1ea95c993eda3fd9d559fd41fe7cce"},"package":"c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"e41336be068976091df56bff671d38042286b776bbeb087f4bf6f4e85631cb81","Cargo.toml":"6c23bca19dcda69692ad102f2c395d5f098635cdcd27091c467837251827522f","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"0293821b9246c4b1a74211b74f2ce9655951931b8411eb365dced29a4ef46af5","benches/baseline.rs":"43a3e31b6c33dba2e6328052301b707b212487b83f0dcffc843061a9c48a2319","benches/dispatch_get_clone.rs":"866239abeb74a82440741c948a4e7e0a44e92e8cc87319ec57e3b057c9e8f5dd","benches/dispatch_get_ref.rs":"dd2803259a6784c256304e676bbce05de233e4c8451ac85863787213343e9be7","benches/empty_span.rs":"9f51cf376414ea751b2f50c357f2435a545d606118286f5b8b89f185e28aad8c","benches/enter_span.rs":"4410ec73d277e7b54e9f306c00ff3b79a150d1832966b7fc29984c8e3ad8d57c","benches/event.rs":"98de3c82ed18abe0a3cbe6eda9a4f9deec2b69bca42c3aac11dea4b608b85a67","benches/shared.rs":"2623311af7d153685064e664a5903d03e7dc3179754c324f3a76f29f060515e6","benches/span_fields.rs":"9166cd43ef2783e5419dd61ea57a02e48e8cc38aa1b357e9b79fa581929b60d8","benches/span_no_fields.rs":"79cc4befacf27d7ce728246087c4f06a6066f913e831d9043caeb7941f0193f6","benches/span_repeated.rs":"e4b3c99a7a9fc15d9042b8db399a56cf647b4eebd26f29d95325bb057b68330b","src/dispatcher.rs":"a8732392ffe56b1178f8fd3d6e6e02d40b51475c38bb4600abd9cd170df1bf6c","src/field.rs":"fe6c2eb36f92880254a707a465f873ca84510d93f06614b9b36ba20b48bf209d","src/instrument.rs":"034b1c7e46ab2fae331ea215a3d1b1a2211ef6b18d7e7113523e3ef5bf3ca9bb","src/level_filters.rs":"92aca5797a59b2f3c34adfb896260400c2602456eec0fe9c7d49204df37ff699","src/lib.rs":"7a934a9dcec4f847c2b1534f49417dba2068050af017a857e12b660ac06f9a6f","src/macros.rs":"ba1df10032f8832536dfdd43e567dc0e260d8679fea30ccf68061bc58f9e1cce","src/span.rs":"8c5cce0ab990960c5e7bc0dd99dd9eefde6d8d2477e98c39f17dffa9170c4185","src/stdlib.rs":"248514a9bae6106e436358aee44c92abf8e7f79022895c4a25136ddef211d198","src/subscriber.rs":"8933d8766439f929c0a98a0863d20aff37b221314b3825edd9058be511149968","tests/enabled.rs":"e19d039cf0e984918838aaab9d8b3ca5a1eea9d01a54a264a70184b440a9e880","tests/event.rs":"f51b286c1224346f96f38bee6bed9c4eac5e6405f269e90b770ebfb370820fa1","tests/filter_caching_is_lexically_scoped.rs":"5487a37db5fbdf3d57020ab1f01185d928c45d967d99d723ffc434540459d8dc","tests/filters_are_not_reevaluated_for_the_same_span.rs":"251abbc000dddd298448958a1f0e5be71da527ac6c1a368d57837c83a5467329","tests/filters_are_reevaluated_for_different_call_sites.rs":"e0fdd8e930c043674702831b4d96f331e63aba824576bbac50b3f53bb0241cc7","tests/filters_dont_leak.rs":"6c41d3209cf2a37a1656a8314399777022ceec556e44f5417f1f5a4cd24eb43a","tests/future_send.rs":"3e9c9193219d12e342c18bbedb2f6ec940334202feb3cffba91601d6001b8575","tests/instrument.rs":"a3ee726247d897ad2af8123e6d44abce1a43a72ccbc3fd479257f810d8cbbbb2","tests/macro_imports.rs":"d5de857162185d4a2384f3cb644bfcf76c7f5c1a3b5f72bfa0d2620ac6e3873c","tests/macros.rs":"71474339414ff573471de125f2d369da8caffbfe47fa2e9a18f2e87de20d2a79","tests/macros_incompatible_concat.rs":"5f3bcbb65e4ae39db1cfc2def62fc913c20bab0fb769c8f731504e2615585ee5","tests/max_level_hint.rs":"39576a958df3ea215c49154ff72c3dd14c8b3be3fcdb849e7dd847c8c9fd09e2","tests/missed_register_callsite.rs":"3211f0f030c9baf6333abf709d6520ced25619ee82cdf88a4e6ba8e1aff12296","tests/multiple_max_level_hints.rs":"28ead97a8424358a0632547dae987ddbddc5bb69cdcd996d20feb49a7f3ddc69","tests/no_subscriber.rs":"ca42d0d4a20eb3b4e0a342b5e0090c7ada8b5a157f3cddb7b5d051238cdc1202","tests/register_callsite_deadlock.rs":"c0b3142543e7a10065c7583a8ee0b6bc978ea4f3979599651101c5a28966e7c8","tests/scoped_clobbers_default.rs":"a7615615d176fb2a4b877c48d2aa7a75fca436d997d9672b56cc2c30177f889b","tests/span.rs":"91995aa0f59b09a6230ec146abcafce5710e6657159e4b6f47a56fb6ec76be8c","tests/subscriber.rs":"2da999bedb978bab019a70ccc9fdd43b062ec2e383af1e7c5b780df23adc219b"},"package":"784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"}
\ No newline at end of file

crates/tracing/Android.bp

diff --git a/crates/tracing/Android.bp b/crates/tracing/Android.bp
index 0e003d3..145d826 100644
--- a/crates/tracing/Android.bp
+++ b/crates/tracing/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "tracing",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.1.40",
+    cargo_pkg_version: "0.1.41",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [
@@ -46,7 +46,7 @@
     host_supported: true,
     crate_name: "tracing",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.1.40",
+    cargo_pkg_version: "0.1.41",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [

crates/tracing/CHANGELOG.md

diff --git a/crates/tracing/CHANGELOG.md b/crates/tracing/CHANGELOG.md
index db1668b..0c9f5f4 100644
--- a/crates/tracing/CHANGELOG.md
+++ b/crates/tracing/CHANGELOG.md
@@ -1,4 +1,57 @@
-# 0.1.40
+# 0.1.41 (November 27, 2024)
+
+[ [crates.io][crate-0.1.41] ] | [ [docs.rs][docs-0.1.41] ]
+
+This release updates the `tracing-core` dependency to [v0.1.33][core-0.1.33] and
+the `tracing-attributes` dependency to [v0.1.28][attrs-0.1.28].
+
+### Added
+
+- **core**: Add index API for `Field` ([#2820])
+- **core**: Allow `&[u8]` to be recorded as event/span field ([#2954])
+
+### Changed
+
+- Bump MSRV to 1.63 ([#2793])
+- **core**: Use const `thread_local`s when possible ([#2838])
+
+### Fixed
+
+- Removed core imports in macros ([#2762])
+- **attributes**: Added missing RecordTypes for instrument ([#2781])
+- **attributes**: Change order of async and unsafe modifier ([#2864])
+- Fix missing field prefixes ([#2878])
+- **attributes**: Extract match scrutinee ([#2880])
+- Fix non-simple macro usage without message ([#2879])
+- Fix event macros with constant field names in the first position ([#2883])
+- Allow field path segments to be keywords ([#2925])
+- **core**: Fix missed `register_callsite` error ([#2938])
+- **attributes**: Support const values for `target` and `name` ([#2941])
+- Prefix macro calls with ::core to avoid clashing with local macros ([#3024])
+
+[#2762]: https://github.com/tokio-rs/tracing/pull/2762
+[#2781]: https://github.com/tokio-rs/tracing/pull/2781
+[#2793]: https://github.com/tokio-rs/tracing/pull/2793
+[#2820]: https://github.com/tokio-rs/tracing/pull/2820
+[#2838]: https://github.com/tokio-rs/tracing/pull/2838
+[#2864]: https://github.com/tokio-rs/tracing/pull/2864
+[#2878]: https://github.com/tokio-rs/tracing/pull/2878
+[#2879]: https://github.com/tokio-rs/tracing/pull/2879
+[#2880]: https://github.com/tokio-rs/tracing/pull/2880
+[#2883]: https://github.com/tokio-rs/tracing/pull/2883
+[#2925]: https://github.com/tokio-rs/tracing/pull/2925
+[#2938]: https://github.com/tokio-rs/tracing/pull/2938
+[#2941]: https://github.com/tokio-rs/tracing/pull/2941
+[#2954]: https://github.com/tokio-rs/tracing/pull/2954
+[#3024]: https://github.com/tokio-rs/tracing/pull/3024
+[attrs-0.1.28]:
+    https://github.com/tokio-rs/tracing/releases/tag/tracing-attributes-0.1.28
+[core-0.1.33]:
+    https://github.com/tokio-rs/tracing/releases/tag/tracing-core-0.1.33
+[docs-0.1.41]: https://docs.rs/tracing/0.1.41/tracing/
+[crate-0.1.41]: https://crates.io/crates/tracing/0.1.41
+
+# 0.1.40 (October 19, 2023)
 
 This release fixes a potential stack use-after-free in the
 `Instrument::into_inner` method. Only uses of this method are affected by this
@@ -651,7 +704,7 @@
   filtering, improving performance when a span or event is disabled by a
   `static_max_level_XXX` feature flag (#868) 
 - `LevelFilter` is now a re-export of the `tracing_core::LevelFilter` type, it
-  can now be used interchangably with the versions in `tracing-core` and
+  can now be used interchangeably with the versions in `tracing-core` and
   `tracing-subscriber` (#853)
 - Significant performance improvements when comparing `LevelFilter`s and
   `Level`s (#853)

crates/tracing/Cargo.toml

diff --git a/crates/tracing/Cargo.toml b/crates/tracing/Cargo.toml
index 1143cd6..e71eb5f 100644
--- a/crates/tracing/Cargo.toml
+++ b/crates/tracing/Cargo.toml
@@ -11,13 +11,18 @@
 
 [package]
 edition = "2018"
-rust-version = "1.56.0"
+rust-version = "1.63.0"
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 authors = [
     "Eliza Weisman <eliza@buoyant.io>",
     "Tokio Contributors <team@tokio.rs>",
 ]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 Application-level tracing for Rust.
 """
@@ -37,6 +42,7 @@
 ]
 license = "MIT"
 repository = "https://github.com/tokio-rs/tracing"
+resolver = "2"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -51,40 +57,133 @@
     "tracing_unstable",
 ]
 
+[lib]
+name = "tracing"
+path = "src/lib.rs"
+
+[[test]]
+name = "enabled"
+path = "tests/enabled.rs"
+
+[[test]]
+name = "event"
+path = "tests/event.rs"
+
+[[test]]
+name = "filter_caching_is_lexically_scoped"
+path = "tests/filter_caching_is_lexically_scoped.rs"
+
+[[test]]
+name = "filters_are_not_reevaluated_for_the_same_span"
+path = "tests/filters_are_not_reevaluated_for_the_same_span.rs"
+
+[[test]]
+name = "filters_are_reevaluated_for_different_call_sites"
+path = "tests/filters_are_reevaluated_for_different_call_sites.rs"
+
+[[test]]
+name = "filters_dont_leak"
+path = "tests/filters_dont_leak.rs"
+
+[[test]]
+name = "future_send"
+path = "tests/future_send.rs"
+
+[[test]]
+name = "instrument"
+path = "tests/instrument.rs"
+
+[[test]]
+name = "macro_imports"
+path = "tests/macro_imports.rs"
+
+[[test]]
+name = "macros"
+path = "tests/macros.rs"
+
+[[test]]
+name = "macros_incompatible_concat"
+path = "tests/macros_incompatible_concat.rs"
+
+[[test]]
+name = "max_level_hint"
+path = "tests/max_level_hint.rs"
+
+[[test]]
+name = "missed_register_callsite"
+path = "tests/missed_register_callsite.rs"
+
+[[test]]
+name = "multiple_max_level_hints"
+path = "tests/multiple_max_level_hints.rs"
+
+[[test]]
+name = "no_subscriber"
+path = "tests/no_subscriber.rs"
+
+[[test]]
+name = "register_callsite_deadlock"
+path = "tests/register_callsite_deadlock.rs"
+
+[[test]]
+name = "scoped_clobbers_default"
+path = "tests/scoped_clobbers_default.rs"
+
+[[test]]
+name = "span"
+path = "tests/span.rs"
+
+[[test]]
+name = "subscriber"
+path = "tests/subscriber.rs"
+
 [[bench]]
 name = "baseline"
+path = "benches/baseline.rs"
 harness = false
 
 [[bench]]
 name = "dispatch_get_clone"
+path = "benches/dispatch_get_clone.rs"
 harness = false
 
 [[bench]]
 name = "dispatch_get_ref"
+path = "benches/dispatch_get_ref.rs"
 harness = false
 
 [[bench]]
 name = "empty_span"
+path = "benches/empty_span.rs"
 harness = false
 
 [[bench]]
 name = "enter_span"
+path = "benches/enter_span.rs"
 harness = false
 
 [[bench]]
 name = "event"
+path = "benches/event.rs"
 harness = false
 
 [[bench]]
+name = "shared"
+path = "benches/shared.rs"
+
+[[bench]]
 name = "span_fields"
+path = "benches/span_fields.rs"
 harness = false
 
 [[bench]]
 name = "span_no_fields"
+path = "benches/span_no_fields.rs"
 harness = false
 
 [[bench]]
 name = "span_repeated"
+path = "benches/span_repeated.rs"
 harness = false
 
 [dependencies.log]
@@ -95,20 +194,20 @@
 version = "0.2.9"
 
 [dependencies.tracing-attributes]
-version = "0.1.27"
+version = "0.1.28"
 optional = true
 
 [dependencies.tracing-core]
-version = "0.1.32"
+version = "0.1.33"
 default-features = false
 
 [dev-dependencies.criterion]
 version = "0.3.6"
-default_features = false
+default-features = false
 
 [dev-dependencies.futures]
 version = "0.3.21"
-default_features = false
+default-features = false
 
 [dev-dependencies.log]
 version = "0.4.17"
@@ -136,8 +235,16 @@
 std = ["tracing-core/std"]
 valuable = ["tracing-core/valuable"]
 
-[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
-version = "^0.3"
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies.wasm-bindgen-test]
+version = "0.3.38"
 
 [badges.maintenance]
 status = "actively-developed"
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+priority = 0
+check-cfg = [
+    "cfg(flaky_tests)",
+    "cfg(tracing_unstable)",
+]

crates/tracing/METADATA

diff --git a/crates/tracing/METADATA b/crates/tracing/METADATA
index 8990ac4..3cc6f0c 100644
--- a/crates/tracing/METADATA
+++ b/crates/tracing/METADATA
@@ -1,17 +1,17 @@
 name: "tracing"
 description: "A scoped, structured logging and diagnostics system."
 third_party {
-  version: "0.1.40"
+  version: "0.1.41"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 6
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/tracing"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/tracing/tracing-0.1.40.crate"
-    version: "0.1.40"
+    value: "https://static.crates.io/crates/tracing/tracing-0.1.41.crate"
+    version: "0.1.41"
   }
 }

crates/tracing/README.md

diff --git a/crates/tracing/README.md b/crates/tracing/README.md
index a42636f..0bd4208 100644
--- a/crates/tracing/README.md
+++ b/crates/tracing/README.md
@@ -47,7 +47,7 @@
 The `tracing` crate provides the APIs necessary for instrumenting libraries
 and applications to emit trace data.
 
-*Compiler support: [requires `rustc` 1.56+][msrv]*
+*Compiler support: [requires `rustc` 1.63+][msrv]*
 
 [msrv]: #supported-rust-versions
 
@@ -145,7 +145,7 @@
 
 // the `#[tracing::instrument]` attribute creates and enters a span
 // every time the instrumented function is called. The span is named after the
-// the function or method. Paramaters passed to the function are recorded as fields.
+// the function or method. Parameters passed to the function are recorded as fields.
 #[tracing::instrument]
 pub fn shave(yak: usize) -> Result<(), Box<dyn Error + 'static>> {
     // this creates an event at the DEBUG level with two fields:
@@ -185,7 +185,7 @@
 
         if let Err(ref error) = res {
             // Like spans, events can also use the field initialization shorthand.
-            // In this instance, `yak` is the field being initalized.
+            // In this instance, `yak` is the field being initialized.
             error!(yak, error = error.as_ref(), "failed to shave yak!");
         } else {
             yaks_shaved += 1;
@@ -250,7 +250,7 @@
 is as long as the future's.
 
 The second, and preferred, option is through the
-[`#[instrument]`](https://docs.rs/tracing/0.1.38/tracing/attr.instrument.html)
+[`#[instrument]`](https://docs.rs/tracing/0.1.41/tracing/attr.instrument.html)
 attribute:
 
 ```rust
@@ -297,7 +297,7 @@
 // Dropping the span will close it, indicating that it has ended.
 ```
 
-The [`#[instrument]`](https://docs.rs/tracing/0.1.38/tracing/attr.instrument.html) attribute macro
+The [`#[instrument]`](https://docs.rs/tracing/0.1.41/tracing/attr.instrument.html) attribute macro
 can reduce some of this boilerplate:
 
 ```rust
@@ -397,6 +397,7 @@
 - [`sentry-tracing`] provides a layer for reporting events and traces to [Sentry].
 - [`tracing-loki`] provides a layer for shipping logs to [Grafana Loki].
 - [`tracing-logfmt`] provides a layer that formats events and spans into the logfmt format.
+- [`json-subscriber`] provides a layer for emitting JSON logs. The output can be customized much more than with [`FmtSubscriber`]'s JSON output.
 
 If you're the maintainer of a `tracing` ecosystem crate not listed above,
 please let us know! We'd love to add your project to the list!
@@ -428,6 +429,7 @@
 [`tracing-loki`]: https://crates.io/crates/tracing-loki
 [Grafana Loki]: https://grafana.com/oss/loki/
 [`tracing-logfmt`]: https://crates.io/crates/tracing-logfmt
+[`json-subscriber`]: https://crates.io/crates/json-subscriber
 
 **Note:** that some of the ecosystem crates are currently unreleased and
 undergoing active development. They may be less stable than `tracing` and
@@ -445,7 +447,7 @@
 ## Supported Rust Versions
 
 Tracing is built against the latest stable release. The minimum supported
-version is 1.56. The current Tracing version is not guaranteed to build on Rust
+version is 1.63. The current Tracing version is not guaranteed to build on Rust
 versions earlier than the minimum supported version.
 
 Tracing follows the same compiler support policies as the rest of the Tokio

crates/tracing/src/lib.rs

diff --git a/crates/tracing/src/lib.rs b/crates/tracing/src/lib.rs
index 258cbe5..8b6c7f0 100644
--- a/crates/tracing/src/lib.rs
+++ b/crates/tracing/src/lib.rs
@@ -19,7 +19,7 @@
 //! The `tracing` crate provides the APIs necessary for instrumenting libraries
 //! and applications to emit trace data.
 //!
-//! *Compiler support: [requires `rustc` 1.56+][msrv]*
+//! *Compiler support: [requires `rustc` 1.63+][msrv]*
 //!
 //! [msrv]: #supported-rust-versions
 //! # Core Concepts
@@ -173,7 +173,7 @@
 //! For functions which don't have built-in tracing support and can't have
 //! the `#[instrument]` attribute applied (such as from an external crate),
 //! the [`Span` struct][`Span`] has a [`in_scope()` method][`in_scope`]
-//! which can be used to easily wrap synchonous code in a span.
+//! which can be used to easily wrap synchronous code in a span.
 //!
 //! For example:
 //! ```rust
@@ -756,6 +756,7 @@
 //!  - [`reqwest-tracing`] provides a middleware to trace [`reqwest`] HTTP requests.
 //!  - [`tracing-cloudwatch`] provides a layer that sends events to AWS CloudWatch Logs.
 //!  - [`clippy-tracing`] provides a tool to add, remove and check for `tracing::instrument`.
+//!  - [`json-subscriber`] provides a subscriber for emitting JSON logs. The output can be customized much more than with [`tracing-subscriber`]'s JSON output.
 //!
 //! If you're the maintainer of a `tracing` ecosystem crate not listed above,
 //! please let us know! We'd love to add your project to the list!
@@ -799,6 +800,7 @@
 //! [`reqwest`]: https://crates.io/crates/reqwest
 //! [`tracing-cloudwatch`]: https://crates.io/crates/tracing-cloudwatch
 //! [`clippy-tracing`]: https://crates.io/crates/clippy-tracing
+//! [`json-subscriber`]: https://crates.io/crates/json-subscriber
 //!
 //! <pre class="ignore" style="white-space:normal;font:inherit;">
 //!     <strong>Note</strong>: Some of these ecosystem crates are currently
@@ -871,7 +873,7 @@
 //! ## Supported Rust Versions
 //!
 //! Tracing is built against the latest stable release. The minimum supported
-//! version is 1.56. The current Tracing version is not guaranteed to build on
+//! version is 1.63. The current Tracing version is not guaranteed to build on
 //! Rust versions earlier than the minimum supported version.
 //!
 //! Tracing follows the same compiler support policies as the rest of the Tokio
@@ -929,7 +931,8 @@
     overflowing_literals,
     path_statements,
     patterns_in_fns_without_body,
-    private_in_public,
+    private_interfaces,
+    private_bounds,
     unconditional_recursion,
     unused,
     unused_allocation,
@@ -984,7 +987,10 @@
 pub mod __macro_support {
     pub use crate::callsite::Callsite;
     use crate::{subscriber::Interest, Metadata};
-    pub use core::concat;
+    // Re-export the `core` functions that are used in macros. This allows
+    // a crate to be named `core` and avoid name clashes.
+    // See here: https://github.com/tokio-rs/tracing/issues/2761
+    pub use core::{concat, file, format_args, iter::Iterator, line, option::Option};
 
     /// Callsite implementation used by macro-generated code.
     ///

crates/tracing/src/macros.rs

diff --git a/crates/tracing/src/macros.rs b/crates/tracing/src/macros.rs
index dba49d1..156334a 100644
--- a/crates/tracing/src/macros.rs
+++ b/crates/tracing/src/macros.rs
@@ -627,7 +627,7 @@
             target: $target,
             parent: $parent,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -678,7 +678,7 @@
             name: $name,
             target: $target,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (name: $name:expr, target: $target:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -694,9 +694,9 @@
         static __CALLSITE: $crate::callsite::DefaultCallsite = $crate::callsite2! {
             name: $crate::__macro_support::concat!(
                 "event ",
-                file!(),
+                $crate::__macro_support::file!(),
                 ":",
-                line!()
+                $crate::__macro_support::line!()
             ),
             kind: $crate::metadata::Kind::EVENT,
             target: $target,
@@ -736,7 +736,7 @@
             target: $target,
             parent: $parent,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (target: $target:expr, parent: $parent:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -789,7 +789,7 @@
             name: $name,
             parent: $parent,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (name: $name:expr, parent: $parent:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -839,7 +839,7 @@
         $crate::event!(
             name: $name,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (name: $name:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -855,9 +855,9 @@
         static __CALLSITE: $crate::callsite::DefaultCallsite = $crate::callsite2! {
             name: $crate::__macro_support::concat!(
                 "event ",
-                file!(),
+                $crate::__macro_support::file!(),
                 ":",
-                line!()
+                $crate::__macro_support::line!()
             ),
             kind: $crate::metadata::Kind::EVENT,
             target: $target,
@@ -894,7 +894,7 @@
         $crate::event!(
             target: $target,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (target: $target:expr, $lvl:expr, $($k:ident).+ = $($fields:tt)* ) => (
@@ -910,7 +910,7 @@
             target: module_path!(),
             parent: $parent,
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     (parent: $parent:expr, $lvl:expr, $($k:ident).+ = $($field:tt)*) => (
@@ -970,7 +970,7 @@
         $crate::event!(
             target: module_path!(),
             $lvl,
-            { message = ::core::format_args!($($arg)+), $($fields)* }
+            { message = $crate::__macro_support::format_args!($($arg)+), $($fields)* }
         )
     );
     ( $lvl:expr, { $($fields:tt)* }, $($arg:tt)+ ) => (
@@ -1117,15 +1117,15 @@
 /// in false positives or false negatives include:
 ///
 /// - If a subscriber is using a filter which may enable a span or event based
-/// on field names, but `enabled!` is invoked without listing field names,
-/// `enabled!` may return a false negative if a specific field name would
-/// cause the subscriber to enable something that would otherwise be disabled.
+///   on field names, but `enabled!` is invoked without listing field names,
+///   `enabled!` may return a false negative if a specific field name would
+///   cause the subscriber to enable something that would otherwise be disabled.
 /// - If a subscriber is using a filter which enables or disables specific events by
-/// file path and line number,  a particular event may be enabled/disabled
-/// even if an `enabled!` invocation with the same level, target, and fields
-/// indicated otherwise.
+///   file path and line number,  a particular event may be enabled/disabled
+///   even if an `enabled!` invocation with the same level, target, and fields
+///   indicated otherwise.
 /// - The subscriber can choose to enable _only_ spans or _only_ events, which `enabled`
-/// will not reflect.
+///   will not reflect.
 ///
 /// `enabled!()` requires a [level](crate::Level) argument, an optional `target:`
 /// argument, and an optional set of field names. If the fields are not provided,
@@ -1188,9 +1188,9 @@
             static __CALLSITE: $crate::callsite::DefaultCallsite = $crate::callsite2! {
                 name: $crate::__macro_support::concat!(
                     "enabled ",
-                    file!(),
+                    $crate::__macro_support::file!(),
                     ":",
-                    line!()
+                    $crate::__macro_support::line!()
                 ),
                 kind: $kind.hint(),
                 target: $target,
@@ -1305,14 +1305,14 @@
     (name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1322,14 +1322,14 @@
     (name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::TRACE, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::TRACE, {}, $($arg)+)
@@ -1339,14 +1339,14 @@
     (target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)* })
     );
     (target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1356,14 +1356,14 @@
     (name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)* })
     );
     (name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1547,7 +1547,6 @@
         $crate::event!(
             target: module_path!(),
             $crate::Level::TRACE,
-            {},
             $($arg)+
         )
     );
@@ -1582,14 +1581,14 @@
     (name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1599,14 +1598,14 @@
     (name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1616,14 +1615,14 @@
     (target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)* })
     );
     (target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1633,14 +1632,14 @@
     (name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)* })
     );
     (name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1824,7 +1823,6 @@
         $crate::event!(
             target: module_path!(),
             $crate::Level::DEBUG,
-            {},
             $($arg)+
         )
     );
@@ -1870,14 +1868,14 @@
     (name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -1887,14 +1885,14 @@
     (name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::INFO, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::INFO, {}, $($arg)+)
@@ -1904,14 +1902,14 @@
     (target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)* })
     );
     (target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -1921,14 +1919,14 @@
     (name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)* })
     );
     (name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -2112,7 +2110,6 @@
         $crate::event!(
             target: module_path!(),
             $crate::Level::INFO,
-            {},
             $($arg)+
         )
     );
@@ -2151,14 +2148,14 @@
     (name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2168,14 +2165,14 @@
     (name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::WARN, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::WARN, {}, $($arg)+)
@@ -2185,14 +2182,14 @@
     (target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)* })
     );
     (target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2202,14 +2199,14 @@
     (name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)* })
     );
     (name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2393,7 +2390,6 @@
         $crate::event!(
             target: module_path!(),
             $crate::Level::WARN,
-            {},
             $($arg)+
         )
     );
@@ -2428,14 +2424,14 @@
     (name: $name:expr, target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)
@@ -2445,14 +2441,14 @@
     (name: $name:expr, target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, target: $target, $crate::Level::ERROR, { %$($k).+ $($field)* })
     );
     (name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, target: $target, $crate::Level::ERROR, {}, $($arg)+)
@@ -2462,14 +2458,14 @@
     (target: $target:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)* })
     );
     (target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)
@@ -2479,14 +2475,14 @@
     (name: $name:expr, parent: $parent:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($field)* }, $($arg)*)
     );
-    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)* })
     );
-    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)* })
     );
     (name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
         $crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)
@@ -2670,7 +2666,6 @@
         $crate::event!(
             target: module_path!(),
             $crate::Level::ERROR,
-            {},
             $($arg)+
         )
     );
@@ -2802,79 +2797,79 @@
     // };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$val) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$val) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$val as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$($k).+ as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$($k).+ as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$($k).+) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$($k).+) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$($k).+) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$($k).+) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$val) as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$val) as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$val as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$($k).+ as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$($k).+ as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$($k).+) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$($k).+) as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$($k).+) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$($k).+) as &dyn Value)) },
             $next,
         )
     };
@@ -2882,40 +2877,40 @@
     // Handle literal names
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$val) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$val) as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr, $($rest:tt)*) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$val as &dyn Value)) },
             $next,
             $($rest)*
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&debug(&$val) as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&display(&$val) as &dyn Value)) },
             $next,
         )
     };
     (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr) => {
         $crate::valueset!(
-            @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
+            @ { $($out),*, (&$next, $crate::__macro_support::Option::Some(&$val as &dyn Value)) },
             $next,
         )
     };
@@ -2963,7 +2958,7 @@
 
     // Remainder is unparsable, but exists --- must be format args!
     (@ { $(,)* $($out:expr),* }, $next:expr, $($rest:tt)+) => {
-        $crate::valueset!(@ { (&$next, ::core::option::Option::Some(&::core::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
+        $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
     };
 
     // === entry ===
@@ -2974,7 +2969,7 @@
             let mut iter = $fields.iter();
             $fields.value_set($crate::valueset!(
                 @ { },
-                ::core::iter::Iterator::next(&mut iter).expect("FieldSet corrupted (this is a bug)"),
+                $crate::__macro_support::Iterator::next(&mut iter).expect("FieldSet corrupted (this is a bug)"),
                 $($kvs)+
             ))
         }
@@ -3041,7 +3036,7 @@
         $crate::fieldset!(@ { $($out),*, $k } $($rest)*)
     };
 
-    // Remainder is unparseable, but exists --- must be format args!
+    // Remainder is unparsable, but exists --- must be format args!
     (@ { $(,)* $($out:expr),* } $($rest:tt)+) => {
         $crate::fieldset!(@ { "message", $($out),*, })
     };
@@ -3071,8 +3066,8 @@
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __tracing_stringify {
-    ($s:expr) => {
-        stringify!($s)
+    ($($t:tt)*) => {
+        stringify!($($t)*)
     };
 }
 

crates/tracing/src/span.rs

diff --git a/crates/tracing/src/span.rs b/crates/tracing/src/span.rs
index 3c235dc..8085391 100644
--- a/crates/tracing/src/span.rs
+++ b/crates/tracing/src/span.rs
@@ -1104,20 +1104,14 @@
 
     /// Returns a [`Field`][super::field::Field] for the field with the
     /// given `name`, if one exists,
-    pub fn field<Q: ?Sized>(&self, field: &Q) -> Option<field::Field>
-    where
-        Q: field::AsField,
-    {
+    pub fn field<Q: field::AsField + ?Sized>(&self, field: &Q) -> Option<field::Field> {
         self.metadata().and_then(|meta| field.as_field(meta))
     }
 
     /// Returns true if this `Span` has a field for the given
     /// [`Field`][super::field::Field] or field name.
     #[inline]
-    pub fn has_field<Q: ?Sized>(&self, field: &Q) -> bool
-    where
-        Q: field::AsField,
-    {
+    pub fn has_field<Q: field::AsField + ?Sized>(&self, field: &Q) -> bool {
         self.field(field).is_some()
     }
 
@@ -1191,11 +1185,11 @@
     ///
     /// [`field::Empty`]: super::field::Empty
     /// [`Metadata`]: super::Metadata
-    pub fn record<Q: ?Sized, V>(&self, field: &Q, value: V) -> &Self
-    where
-        Q: field::AsField,
-        V: field::Value,
-    {
+    pub fn record<Q: field::AsField + ?Sized, V: field::Value>(
+        &self,
+        field: &Q,
+        value: V,
+    ) -> &Self {
         if let Some(meta) = self.meta {
             if let Some(field) = field.as_field(meta) {
                 self.record_all(
@@ -1607,14 +1601,6 @@
 mod test {
     use super::*;
 
-    trait AssertSend: Send {}
-    impl AssertSend for Span {}
-
-    trait AssertSync: Sync {}
-    impl AssertSync for Span {}
-    impl AssertSync for Entered<'_> {}
-    impl AssertSync for EnteredSpan {}
-
     #[test]
     fn test_record_backwards_compat() {
         Span::current().record("some-key", "some text");

crates/tracing/tests/enabled.rs

diff --git a/crates/tracing/tests/enabled.rs b/crates/tracing/tests/enabled.rs
index 5a45963..e00b319 100644
--- a/crates/tracing/tests/enabled.rs
+++ b/crates/tracing/tests/enabled.rs
@@ -43,7 +43,7 @@
 
     let _guard = tracing::subscriber::set_default(subscriber);
 
-    // Ensure that the `_event` and `_span` alternatives work corretly
+    // Ensure that the `_event` and `_span` alternatives work correctly
     assert!(!tracing::event_enabled!(Level::TRACE));
     assert!(tracing::event_enabled!(Level::DEBUG));
     assert!(tracing::span_enabled!(Level::TRACE));

crates/tracing/tests/event.rs

diff --git a/crates/tracing/tests/event.rs b/crates/tracing/tests/event.rs
index 0be7c0b..25b5bbe 100644
--- a/crates/tracing/tests/event.rs
+++ b/crates/tracing/tests/event.rs
@@ -86,7 +86,7 @@
                     .and(
                         expect::field("question").with_value(&"life, the universe, and everything"),
                     )
-                    .and(field::msg(format_args!(
+                    .and(expect::msg(format_args!(
                         "hello from my event! tricky? {:?}!",
                         true
                     )))
@@ -115,7 +115,7 @@
                     .and(
                         expect::field("question").with_value(&"life, the universe, and everything"),
                     )
-                    .and(field::msg(format_args!("hello from my event")))
+                    .and(expect::msg(format_args!("hello from my event")))
                     .only(),
             ),
         )
@@ -338,7 +338,7 @@
 fn explicit_child() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(expect::span().named("foo"))
-        .event(expect::event().with_explicit_parent(Some("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
         .only()
         .run_with_handle();
 
@@ -355,11 +355,11 @@
 fn explicit_child_at_levels() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(expect::span().named("foo"))
-        .event(expect::event().with_explicit_parent(Some("foo")))
-        .event(expect::event().with_explicit_parent(Some("foo")))
-        .event(expect::event().with_explicit_parent(Some("foo")))
-        .event(expect::event().with_explicit_parent(Some("foo")))
-        .event(expect::event().with_explicit_parent(Some("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
+        .event(expect::event().with_ancestry(expect::has_explicit_parent("foo")))
         .only()
         .run_with_handle();
 
@@ -527,6 +527,12 @@
     let (subscriber, handle) = subscriber::mock()
         .event(expect_event())
         .event(expect_event())
+        .event(expect_event())
+        .event(expect_event())
+        .event(expect_event())
+        .event(expect_event())
+        .event(expect_event())
+        .event(expect_event())
         .only()
         .run_with_handle();
 
@@ -548,7 +554,67 @@
             },
             "quux"
         );
+        tracing::info!(
+            { std::convert::identity(FOO) } = "bar",
+            { "constant string" } = "also works",
+            foo.bar = "baz",
+            "quux"
+        );
+        tracing::info!(
+            {
+                { std::convert::identity(FOO) } = "bar",
+                { "constant string" } = "also works",
+                foo.bar = "baz",
+            },
+            "quux"
+        );
+        tracing::event!(
+            Level::INFO,
+            { std::convert::identity(FOO) } = "bar",
+            { "constant string" } = "also works",
+            foo.bar = "baz",
+            "{}",
+            "quux"
+        );
+        tracing::event!(
+            Level::INFO,
+            {
+                { std::convert::identity(FOO) } = "bar",
+                { "constant string" } = "also works",
+                foo.bar = "baz",
+            },
+            "{}",
+            "quux"
+        );
+        tracing::info!(
+            { std::convert::identity(FOO) } = "bar",
+            { "constant string" } = "also works",
+            foo.bar = "baz",
+            "{}",
+            "quux"
+        );
+        tracing::info!(
+            {
+                { std::convert::identity(FOO) } = "bar",
+                { "constant string" } = "also works",
+                foo.bar = "baz",
+            },
+            "{}",
+            "quux"
+        );
     });
 
     handle.assert_finished();
 }
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
+fn keyword_ident_in_field_name() {
+    let (subscriber, handle) = subscriber::mock()
+        .event(expect::event().with_fields(expect::field("crate").with_value(&"tracing")))
+        .only()
+        .run_with_handle();
+
+    with_default(subscriber, || error!(crate = "tracing", "message"));
+    handle.assert_finished();
+}

crates/tracing/tests/instrument.rs

diff --git a/crates/tracing/tests/instrument.rs b/crates/tracing/tests/instrument.rs
index 5247249..eb7e9ed 100644
--- a/crates/tracing/tests/instrument.rs
+++ b/crates/tracing/tests/instrument.rs
@@ -21,6 +21,7 @@
         }
     }
 
+    #[allow(dead_code)] // Field not used, but logs on `Drop`
     struct Fut(Option<AssertSpanOnDrop>);
 
     impl Future for Fut {
@@ -34,13 +35,21 @@
 
     let subscriber = subscriber::mock()
         .enter(expect::span().named("foo"))
-        .event(expect::event().at_level(Level::INFO))
+        .event(
+            expect::event()
+                .with_ancestry(expect::has_contextual_parent("foo"))
+                .at_level(Level::INFO),
+        )
         .exit(expect::span().named("foo"))
         .enter(expect::span().named("foo"))
         .exit(expect::span().named("foo"))
         .drop_span(expect::span().named("foo"))
         .enter(expect::span().named("bar"))
-        .event(expect::event().at_level(Level::INFO))
+        .event(
+            expect::event()
+                .with_ancestry(expect::has_contextual_parent("bar"))
+                .at_level(Level::INFO),
+        )
         .exit(expect::span().named("bar"))
         .drop_span(expect::span().named("bar"))
         .only()

crates/tracing/tests/macros.rs

diff --git a/crates/tracing/tests/macros.rs b/crates/tracing/tests/macros.rs
index 81b929d..a072389 100644
--- a/crates/tracing/tests/macros.rs
+++ b/crates/tracing/tests/macros.rs
@@ -5,15 +5,21 @@
 #[cfg(target_arch = "wasm32")]
 extern crate wasm_bindgen_test;
 
-// TODO: remove this once https://github.com/tokio-rs/tracing/pull/2675#issuecomment-1667628907 is resolved
-#[cfg(target_arch = "wasm32")]
-use ::core::option::Option::None;
-
 use tracing::{
     callsite, debug, debug_span, enabled, error, error_span, event, event_enabled, info, info_span,
     span, span_enabled, trace, trace_span, warn, warn_span, Level,
 };
 
+/// A type that implements `Display` and `Debug`, but not `Value`.
+#[derive(Debug)]
+struct DisplayDebug;
+
+impl ::std::fmt::Display for DisplayDebug {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        ::std::write!(f, "Foo")
+    }
+}
+
 // Tests that macros work across various invocation syntax.
 //
 // These are quite repetitive, and _could_ be generated by a macro. However,
@@ -549,12 +555,15 @@
     trace!(foo = ?3, bar.baz = %2, quux = false);
     trace!(foo = 3, bar.baz = 2, quux = false);
     trace!(foo = 3, bar.baz = 3,);
+    trace!("foo" = 3, bar.baz = 3,);
+    trace!(foo = 3, "bar.baz" = 3,);
     trace!("foo");
     trace!("foo: {}", 3);
     trace!(foo = ?3, bar.baz = %2, quux = false, "hello world {:?}", 42);
     trace!(foo = 3, bar.baz = 2, quux = false, "hello world {:?}", 42);
     trace!(foo = 3, bar.baz = 3, "hello world {:?}", 42,);
     trace!({ foo = 3, bar.baz = 80 }, "quux");
+    trace!({ "foo" = 3, "bar.baz" = 80 }, "quux");
     trace!({ foo = 2, bar.baz = 79 }, "quux {:?}", true);
     trace!({ foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
     trace!({ foo = 2, bar.baz = 78 }, "quux");
@@ -573,6 +582,9 @@
     trace!(?foo);
     trace!(%foo);
     trace!(foo);
+    trace!("foo" = ?foo);
+    trace!("foo" = %foo);
+    trace!("foo" = foo);
     trace!(name: "foo", ?foo);
     trace!(name: "foo", %foo);
     trace!(name: "foo", foo);
@@ -585,6 +597,22 @@
     trace!(target: "foo_events", ?foo, true, "message");
     trace!(target: "foo_events", %foo, true, "message");
     trace!(target: "foo_events", foo, true, "message");
+    trace!(name: "foo", target: "foo_events", ?foo);
+    trace!(name: "foo", target: "foo_events", %foo);
+    trace!(name: "foo", target: "foo_events", foo);
+    let foo = DisplayDebug;
+    trace!(?foo);
+    trace!(%foo);
+    trace!(name: "foo", ?foo);
+    trace!(name: "foo", %foo);
+    trace!(name: "foo", ?foo, true, "message");
+    trace!(name: "foo", %foo, true, "message");
+    trace!(target: "foo_events", ?foo);
+    trace!(target: "foo_events", %foo);
+    trace!(target: "foo_events", ?foo, true, "message");
+    trace!(target: "foo_events", %foo, true, "message");
+    trace!(name: "foo", target: "foo_events", ?foo, true, "message");
+    trace!(name: "foo", target: "foo_events", %foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -593,12 +621,15 @@
     debug!(foo = ?3, bar.baz = %2, quux = false);
     debug!(foo = 3, bar.baz = 2, quux = false);
     debug!(foo = 3, bar.baz = 3,);
+    debug!("foo" = 3, bar.baz = 3,);
+    debug!(foo = 3, "bar.baz" = 3,);
     debug!("foo");
     debug!("foo: {}", 3);
     debug!(foo = ?3, bar.baz = %2, quux = false, "hello world {:?}", 42);
     debug!(foo = 3, bar.baz = 2, quux = false, "hello world {:?}", 42);
     debug!(foo = 3, bar.baz = 3, "hello world {:?}", 42,);
     debug!({ foo = 3, bar.baz = 80 }, "quux");
+    debug!({ "foo" = 3, "bar.baz" = 80 }, "quux");
     debug!({ foo = 2, bar.baz = 79 }, "quux {:?}", true);
     debug!({ foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
     debug!({ foo = 2, bar.baz = 78 }, "quux");
@@ -617,6 +648,9 @@
     debug!(?foo);
     debug!(%foo);
     debug!(foo);
+    debug!("foo" = ?foo);
+    debug!("foo" = %foo);
+    debug!("foo" = foo);
     debug!(name: "foo", ?foo);
     debug!(name: "foo", %foo);
     debug!(name: "foo", foo);
@@ -629,6 +663,22 @@
     debug!(target: "foo_events", ?foo, true, "message");
     debug!(target: "foo_events", %foo, true, "message");
     debug!(target: "foo_events", foo, true, "message");
+    debug!(name: "foo", target: "foo_events", ?foo);
+    debug!(name: "foo", target: "foo_events", %foo);
+    debug!(name: "foo", target: "foo_events", foo);
+    let foo = DisplayDebug;
+    debug!(?foo);
+    debug!(%foo);
+    debug!(name: "foo", ?foo);
+    debug!(name: "foo", %foo);
+    debug!(name: "foo", ?foo, true, "message");
+    debug!(name: "foo", %foo, true, "message");
+    debug!(target: "foo_events", ?foo);
+    debug!(target: "foo_events", %foo);
+    debug!(target: "foo_events", ?foo, true, "message");
+    debug!(target: "foo_events", %foo, true, "message");
+    debug!(name: "foo", target: "foo_events", ?foo, true, "message");
+    debug!(name: "foo", target: "foo_events", %foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -637,12 +687,15 @@
     info!(foo = ?3, bar.baz = %2, quux = false);
     info!(foo = 3, bar.baz = 2, quux = false);
     info!(foo = 3, bar.baz = 3,);
+    info!("foo" = 3, bar.baz = 3,);
+    info!(foo = 3, "bar.baz" = 3,);
     info!("foo");
     info!("foo: {}", 3);
     info!(foo = ?3, bar.baz = %2, quux = false, "hello world {:?}", 42);
     info!(foo = 3, bar.baz = 2, quux = false, "hello world {:?}", 42);
     info!(foo = 3, bar.baz = 3, "hello world {:?}", 42,);
     info!({ foo = 3, bar.baz = 80 }, "quux");
+    info!({ "foo" = 3, "bar.baz" = 80 }, "quux");
     info!({ foo = 2, bar.baz = 79 }, "quux {:?}", true);
     info!({ foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
     info!({ foo = 2, bar.baz = 78 }, "quux");
@@ -661,6 +714,9 @@
     info!(?foo);
     info!(%foo);
     info!(foo);
+    info!("foo" = ?foo);
+    info!("foo" = %foo);
+    info!("foo" = foo);
     info!(name: "foo", ?foo);
     info!(name: "foo", %foo);
     info!(name: "foo", foo);
@@ -673,6 +729,22 @@
     info!(target: "foo_events", ?foo, true, "message");
     info!(target: "foo_events", %foo, true, "message");
     info!(target: "foo_events", foo, true, "message");
+    info!(name: "foo", target: "foo_events", ?foo);
+    info!(name: "foo", target: "foo_events", %foo);
+    info!(name: "foo", target: "foo_events", foo);
+    let foo = DisplayDebug;
+    info!(?foo);
+    info!(%foo);
+    info!(name: "foo", ?foo);
+    info!(name: "foo", %foo);
+    info!(name: "foo", ?foo, true, "message");
+    info!(name: "foo", %foo, true, "message");
+    info!(target: "foo_events", ?foo);
+    info!(target: "foo_events", %foo);
+    info!(target: "foo_events", ?foo, true, "message");
+    info!(target: "foo_events", %foo, true, "message");
+    info!(name: "foo", target: "foo_events", ?foo, true, "message");
+    info!(name: "foo", target: "foo_events", %foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -681,12 +753,15 @@
     warn!(foo = ?3, bar.baz = %2, quux = false);
     warn!(foo = 3, bar.baz = 2, quux = false);
     warn!(foo = 3, bar.baz = 3,);
+    warn!("foo" = 3, bar.baz = 3,);
+    warn!(foo = 3, "bar.baz" = 3,);
     warn!("foo");
     warn!("foo: {}", 3);
     warn!(foo = ?3, bar.baz = %2, quux = false, "hello world {:?}", 42);
     warn!(foo = 3, bar.baz = 2, quux = false, "hello world {:?}", 42);
     warn!(foo = 3, bar.baz = 3, "hello world {:?}", 42,);
     warn!({ foo = 3, bar.baz = 80 }, "quux");
+    warn!({ "foo" = 3, "bar.baz" = 80 }, "quux");
     warn!({ foo = 2, bar.baz = 79 }, "quux {:?}", true);
     warn!({ foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
     warn!({ foo = 2, bar.baz = 78 }, "quux");
@@ -705,6 +780,9 @@
     warn!(?foo);
     warn!(%foo);
     warn!(foo);
+    warn!("foo" = ?foo);
+    warn!("foo" = %foo);
+    warn!("foo" = foo);
     warn!(name: "foo", ?foo);
     warn!(name: "foo", %foo);
     warn!(name: "foo", foo);
@@ -717,6 +795,22 @@
     warn!(target: "foo_events", ?foo, true, "message");
     warn!(target: "foo_events", %foo, true, "message");
     warn!(target: "foo_events", foo, true, "message");
+    warn!(name: "foo", target: "foo_events", ?foo);
+    warn!(name: "foo", target: "foo_events", %foo);
+    warn!(name: "foo", target: "foo_events", foo);
+    let foo = DisplayDebug;
+    warn!(?foo);
+    warn!(%foo);
+    warn!(name: "foo", ?foo);
+    warn!(name: "foo", %foo);
+    warn!(name: "foo", ?foo, true, "message");
+    warn!(name: "foo", %foo, true, "message");
+    warn!(target: "foo_events", ?foo);
+    warn!(target: "foo_events", %foo);
+    warn!(target: "foo_events", ?foo, true, "message");
+    warn!(target: "foo_events", %foo, true, "message");
+    warn!(name: "foo", target: "foo_events", ?foo, true, "message");
+    warn!(name: "foo", target: "foo_events", %foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -725,15 +819,18 @@
     error!(foo = ?3, bar.baz = %2, quux = false);
     error!(foo = 3, bar.baz = 2, quux = false);
     error!(foo = 3, bar.baz = 3,);
+    error!("foo" = 3, bar.baz = 3,);
+    error!(foo = 3, "bar.baz" = 3,);
     error!("foo");
     error!("foo: {}", 3);
     error!(foo = ?3, bar.baz = %2, quux = false, "hello world {:?}", 42);
     error!(foo = 3, bar.baz = 2, quux = false, "hello world {:?}", 42);
     error!(foo = 3, bar.baz = 3, "hello world {:?}", 42,);
     error!({ foo = 3, bar.baz = 80 }, "quux");
+    error!({ "foo" = 3, "bar.baz" = 80 }, "quux");
     error!({ foo = 2, bar.baz = 79 }, "quux {:?}", true);
     error!({ foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
-    error!({ foo = 2, bar.baz = 78, }, "quux");
+    error!({ foo = 2, bar.baz = 78 }, "quux");
     error!({ foo = ?2, bar.baz = %78 }, "quux");
     error!(name: "foo", foo = 3, bar.baz = 2, quux = false);
     error!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
@@ -749,6 +846,9 @@
     error!(?foo);
     error!(%foo);
     error!(foo);
+    error!("foo" = ?foo);
+    error!("foo" = %foo);
+    error!("foo" = foo);
     error!(name: "foo", ?foo);
     error!(name: "foo", %foo);
     error!(name: "foo", foo);
@@ -761,6 +861,22 @@
     error!(target: "foo_events", ?foo, true, "message");
     error!(target: "foo_events", %foo, true, "message");
     error!(target: "foo_events", foo, true, "message");
+    error!(name: "foo", target: "foo_events", ?foo);
+    error!(name: "foo", target: "foo_events", %foo);
+    error!(name: "foo", target: "foo_events", foo);
+    let foo = DisplayDebug;
+    error!(?foo);
+    error!(%foo);
+    error!(name: "foo", ?foo);
+    error!(name: "foo", %foo);
+    error!(name: "foo", ?foo, true, "message");
+    error!(name: "foo", %foo, true, "message");
+    error!(target: "foo_events", ?foo);
+    error!(target: "foo_events", %foo);
+    error!(target: "foo_events", ?foo, true, "message");
+    error!(target: "foo_events", %foo, true, "message");
+    error!(name: "foo", target: "foo_events", ?foo, true, "message");
+    error!(name: "foo", target: "foo_events", %foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]

crates/tracing/tests/missed_register_callsite.rs

diff --git a/crates/tracing/tests/missed_register_callsite.rs b/crates/tracing/tests/missed_register_callsite.rs
new file mode 100644
index 0000000..d14db12
--- /dev/null
+++ b/crates/tracing/tests/missed_register_callsite.rs
@@ -0,0 +1,109 @@
+use std::{
+    ptr,
+    sync::atomic::{AtomicPtr, Ordering},
+    thread::{self, JoinHandle},
+    time::Duration,
+};
+
+use tracing::Subscriber;
+use tracing_core::{span, Metadata};
+
+struct TestSubscriber {
+    creator_thread: String,
+    sleep: Duration,
+    callsite: AtomicPtr<Metadata<'static>>,
+}
+
+impl TestSubscriber {
+    fn new(sleep_micros: u64) -> Self {
+        let creator_thread = thread::current()
+            .name()
+            .unwrap_or("<unknown thread>")
+            .to_owned();
+        Self {
+            creator_thread,
+            sleep: Duration::from_micros(sleep_micros),
+            callsite: AtomicPtr::new(ptr::null_mut()),
+        }
+    }
+}
+
+impl Subscriber for TestSubscriber {
+    fn register_callsite(&self, metadata: &'static Metadata<'static>) -> tracing_core::Interest {
+        if !self.sleep.is_zero() {
+            thread::sleep(self.sleep);
+        }
+
+        self.callsite
+            .store(metadata as *const _ as *mut _, Ordering::SeqCst);
+        println!(
+            "{creator} from {thread:?}: register_callsite: {callsite:#?}",
+            creator = self.creator_thread,
+            callsite = metadata as *const _,
+            thread = thread::current().name(),
+        );
+        tracing_core::Interest::always()
+    }
+
+    fn event(&self, event: &tracing_core::Event<'_>) {
+        let stored_callsite = self.callsite.load(Ordering::SeqCst);
+        let event_callsite: *mut Metadata<'static> = event.metadata() as *const _ as *mut _;
+
+        println!(
+            "{creator} from {thread:?}: event (with callsite): {event_callsite:#?} (stored callsite: {stored_callsite:#?})",
+            creator = self.creator_thread,
+            thread = thread::current().name(),
+        );
+
+        // This assert is the actual test.
+        assert_eq!(
+            stored_callsite, event_callsite,
+            "stored callsite: {stored_callsite:#?} does not match event \
+            callsite: {event_callsite:#?}. Was `event` called before \
+            `register_callsite`?"
+        );
+    }
+
+    fn enabled(&self, _metadata: &Metadata<'_>) -> bool {
+        true
+    }
+    fn new_span(&self, _span: &span::Attributes<'_>) -> span::Id {
+        span::Id::from_u64(0)
+    }
+    fn record(&self, _span: &span::Id, _values: &span::Record<'_>) {}
+    fn record_follows_from(&self, _span: &span::Id, _follows: &span::Id) {}
+    fn enter(&self, _span: &tracing_core::span::Id) {}
+    fn exit(&self, _span: &tracing_core::span::Id) {}
+}
+
+fn subscriber_thread(idx: usize, register_sleep_micros: u64) -> JoinHandle<()> {
+    thread::Builder::new()
+        .name(format!("subscriber-{idx}"))
+        .spawn(move || {
+            // We use a sleep to ensure the starting order of the 2 threads.
+            let subscriber = TestSubscriber::new(register_sleep_micros);
+            let _subscriber_guard = tracing::subscriber::set_default(subscriber);
+
+            tracing::info!("event-from-{idx}", idx = idx);
+
+            // Wait a bit for everything to end (we don't want to remove the subscriber
+            // immediately because that will mix up the test).
+            thread::sleep(Duration::from_millis(100));
+        })
+        .expect("failed to spawn thread")
+}
+
+#[test]
+fn event_before_register() {
+    let subscriber_1_register_sleep_micros = 100;
+    let subscriber_2_register_sleep_micros = 0;
+
+    let jh1 = subscriber_thread(1, subscriber_1_register_sleep_micros);
+
+    // This delay ensures that the event!() in the first thread is executed first.
+    thread::sleep(Duration::from_micros(50));
+    let jh2 = subscriber_thread(2, subscriber_2_register_sleep_micros);
+
+    jh1.join().expect("failed to join thread");
+    jh2.join().expect("failed to join thread");
+}

crates/tracing/tests/scoped_clobbers_default.rs

diff --git a/crates/tracing/tests/scoped_clobbers_default.rs b/crates/tracing/tests/scoped_clobbers_default.rs
index dfd6fc9..41bb138 100644
--- a/crates/tracing/tests/scoped_clobbers_default.rs
+++ b/crates/tracing/tests/scoped_clobbers_default.rs
@@ -1,18 +1,18 @@
 #![cfg(feature = "std")]
-use tracing_mock::*;
+use tracing_mock::{expect, subscriber};
 
 #[test]
 fn scoped_clobbers_global() {
     // Reproduces https://github.com/tokio-rs/tracing/issues/2050
 
     let (scoped, scoped_handle) = subscriber::mock()
-        .event(event::msg("before global"))
-        .event(event::msg("before drop"))
+        .event(expect::event().with_fields(expect::msg("before global")))
+        .event(expect::event().with_fields(expect::msg("before drop")))
         .only()
         .run_with_handle();
 
     let (global, global_handle) = subscriber::mock()
-        .event(event::msg("after drop"))
+        .event(expect::event().with_fields(expect::msg("after drop")))
         .only()
         .run_with_handle();
 

crates/tracing/tests/span.rs

diff --git a/crates/tracing/tests/span.rs b/crates/tracing/tests/span.rs
index 09f1be8..9f4e5c4 100644
--- a/crates/tracing/tests/span.rs
+++ b/crates/tracing/tests/span.rs
@@ -6,6 +6,7 @@
 use std::thread;
 
 use tracing::{
+    error_span,
     field::{debug, display},
     subscriber::with_default,
     Level, Span,
@@ -342,7 +343,7 @@
 fn moved_field() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&display("hello from my span"))
                     .only(),
@@ -373,7 +374,7 @@
         .new_span(
             expect::span()
                 .named("foo")
-                .with_field(expect::field("fields.bar").with_value(&true).only()),
+                .with_fields(expect::field("fields.bar").with_value(&true).only()),
         )
         .only()
         .run_with_handle();
@@ -389,7 +390,7 @@
 fn borrowed_field() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&display("hello from my span"))
                     .only(),
@@ -432,7 +433,7 @@
     };
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("x")
                     .with_value(&debug(3.234))
                     .and(expect::field("y").with_value(&debug(-1.223)))
@@ -442,7 +443,7 @@
         .new_span(
             expect::span()
                 .named("bar")
-                .with_field(expect::field("position").with_value(&debug(&pos)).only()),
+                .with_fields(expect::field("position").with_value(&debug(&pos)).only()),
         )
         .run_with_handle();
 
@@ -465,7 +466,7 @@
 fn float_values() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("x")
                     .with_value(&3.234)
                     .and(expect::field("y").with_value(&-1.223))
@@ -492,7 +493,7 @@
         .new_span(
             expect::span()
                 .named("foo")
-                .with_field(expect::field("bar").with_value(&5)
+                .with_fields(expect::field("bar").with_value(&5)
                 .and(expect::field("baz").with_value).only()),
         )
         .record(
@@ -549,7 +550,7 @@
 fn record_new_value_for_field() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&5)
                     .and(expect::field("baz").with_value(&false))
@@ -580,7 +581,7 @@
 fn record_new_values_for_fields() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&4)
                     .and(expect::field("baz").with_value(&false))
@@ -635,7 +636,11 @@
 #[test]
 fn explicit_root_span_is_root() {
     let (subscriber, handle) = subscriber::mock()
-        .new_span(expect::span().named("foo").with_explicit_parent(None))
+        .new_span(
+            expect::span()
+                .named("foo")
+                .with_ancestry(expect::is_explicit_root()),
+        )
         .only()
         .run_with_handle();
 
@@ -652,7 +657,11 @@
     let (subscriber, handle) = subscriber::mock()
         .new_span(expect::span().named("foo"))
         .enter(expect::span().named("foo"))
-        .new_span(expect::span().named("bar").with_explicit_parent(None))
+        .new_span(
+            expect::span()
+                .named("bar")
+                .with_ancestry(expect::is_explicit_root()),
+        )
         .exit(expect::span().named("foo"))
         .only()
         .run_with_handle();
@@ -674,7 +683,7 @@
         .new_span(
             expect::span()
                 .named("bar")
-                .with_explicit_parent(Some("foo")),
+                .with_ancestry(expect::has_explicit_parent("foo")),
         )
         .only()
         .run_with_handle();
@@ -692,11 +701,31 @@
 fn explicit_child_at_levels() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(expect::span().named("foo"))
-        .new_span(expect::span().named("a").with_explicit_parent(Some("foo")))
-        .new_span(expect::span().named("b").with_explicit_parent(Some("foo")))
-        .new_span(expect::span().named("c").with_explicit_parent(Some("foo")))
-        .new_span(expect::span().named("d").with_explicit_parent(Some("foo")))
-        .new_span(expect::span().named("e").with_explicit_parent(Some("foo")))
+        .new_span(
+            expect::span()
+                .named("a")
+                .with_ancestry(expect::has_explicit_parent("foo")),
+        )
+        .new_span(
+            expect::span()
+                .named("b")
+                .with_ancestry(expect::has_explicit_parent("foo")),
+        )
+        .new_span(
+            expect::span()
+                .named("c")
+                .with_ancestry(expect::has_explicit_parent("foo")),
+        )
+        .new_span(
+            expect::span()
+                .named("d")
+                .with_ancestry(expect::has_explicit_parent("foo")),
+        )
+        .new_span(
+            expect::span()
+                .named("e")
+                .with_ancestry(expect::has_explicit_parent("foo")),
+        )
         .only()
         .run_with_handle();
 
@@ -722,7 +751,7 @@
         .new_span(
             expect::span()
                 .named("baz")
-                .with_explicit_parent(Some("foo")),
+                .with_ancestry(expect::has_explicit_parent("foo")),
         )
         .exit(expect::span().named("bar"))
         .only()
@@ -741,7 +770,11 @@
 #[test]
 fn contextual_root() {
     let (subscriber, handle) = subscriber::mock()
-        .new_span(expect::span().named("foo").with_contextual_parent(None))
+        .new_span(
+            expect::span()
+                .named("foo")
+                .with_ancestry(expect::is_contextual_root()),
+        )
         .only()
         .run_with_handle();
 
@@ -761,7 +794,7 @@
         .new_span(
             expect::span()
                 .named("bar")
-                .with_contextual_parent(Some("foo")),
+                .with_ancestry(expect::has_contextual_parent("foo")),
         )
         .exit(expect::span().named("foo"))
         .only()
@@ -781,7 +814,7 @@
 fn display_shorthand() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("my_span").with_field(
+            expect::span().named("my_span").with_fields(
                 expect::field("my_field")
                     .with_value(&display("hello world"))
                     .only(),
@@ -801,7 +834,7 @@
 fn debug_shorthand() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("my_span").with_field(
+            expect::span().named("my_span").with_fields(
                 expect::field("my_field")
                     .with_value(&debug("hello world"))
                     .only(),
@@ -821,7 +854,7 @@
 fn both_shorthands() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("my_span").with_field(
+            expect::span().named("my_span").with_fields(
                 expect::field("display_field")
                     .with_value(&display("hello world"))
                     .and(expect::field("debug_field").with_value(&debug("hello world")))
@@ -842,7 +875,7 @@
 fn constant_field_name() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("my_span").with_field(
+            expect::span().named("my_span").with_fields(
                 expect::field("foo")
                     .with_value(&"bar")
                     .and(expect::field("constant string").with_value(&"also works"))
@@ -866,3 +899,20 @@
 
     handle.assert_finished();
 }
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
+fn keyword_ident_in_field_name_span_macro() {
+    #[derive(Debug)]
+    struct Foo;
+
+    let (subscriber, handle) = subscriber::mock()
+        .new_span(expect::span().with_fields(expect::field("self").with_value(&debug(Foo)).only()))
+        .only()
+        .run_with_handle();
+
+    with_default(subscriber, || {
+        error_span!("span", self = ?Foo);
+    });
+    handle.assert_finished();
+}

crates/tracing/tests/subscriber.rs

diff --git a/crates/tracing/tests/subscriber.rs b/crates/tracing/tests/subscriber.rs
index f676efe..1b98628 100644
--- a/crates/tracing/tests/subscriber.rs
+++ b/crates/tracing/tests/subscriber.rs
@@ -60,7 +60,7 @@
 fn boxed_subscriber() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&display("hello from my span"))
                     .only(),
@@ -93,7 +93,7 @@
 
     let (subscriber, handle) = subscriber::mock()
         .new_span(
-            expect::span().named("foo").with_field(
+            expect::span().named("foo").with_fields(
                 expect::field("bar")
                     .with_value(&display("hello from my span"))
                     .only(),

crates/unicode-width/.android-checksum.json

diff --git a/crates/unicode-width/.android-checksum.json b/crates/unicode-width/.android-checksum.json
index 8f5ab1e..10cc959 100644
--- a/crates/unicode-width/.android-checksum.json
+++ b/crates/unicode-width/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"cd01eed07d5c5c70542650b73b85be2ba24cae7e4a476546f333d394705149d4","Android.bp":"d6eab693271de9bc72833de5ef885b37bcbbf98c71a499bba5d77b77c0ce253c","COPYRIGHT":"ab4c8a47ea97e53eb239f5454701fbf35c618d980af54cfe659793662b2a1ebd","Cargo.toml":"b0c9781e2a6211f614da38604ba417a8965c8252707d92e6e987b50762978b00","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"8ff981830ebf3fe518679fabc276f8aade7e253f47946d0d8df0dd30f83d96f5","METADATA":"cd3537789660ca4718ad6551b6153462e6b5628eb645aaa874eb824248ade402","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","README.md":"c58d1149e7d43af78c9b8880e4db4a6054dc206cefe7a7a3cbb0ddf9dda840cd","TEST_MAPPING":"368cbc275d5c38a75491369719657516ca1b6635f8a914ed481a9ec063d1dc2c","cargo_embargo.json":"84459a3d28b2de537000617d709682791207b299a562af849851183686bc30fe","scripts/unicode.py":"085732df59d6be8ca6eab0029ba594495138a932484cd184d33ef95c321a44e2","src/lib.rs":"755dce91e71c1814649c8d8374e510512a6b7dac69681d074f81c17f33ac801c","src/tables.rs":"8a9795298d1a031ace4be3ba78d9879da1512ce6fc8229dde12cb22545413cac","src/tests.rs":"1d329819963742c34123225f9d8d4d1483c7f8258c6d3e1ae2f17a17fe0a5af1"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"8e3de79aede94fea16efd285eae4b73ac34bcdb596e05e50cd255dd47675a143","Android.bp":"cc28bddc721b0cc6eb8b2c192fa5dbc85fd71edf61b2e88c0e555ad5514a5e8c","COPYRIGHT":"ab4c8a47ea97e53eb239f5454701fbf35c618d980af54cfe659793662b2a1ebd","Cargo.toml":"3429fa23367d8e29c709a0aabe1fb18c1bb80612db9a1ef585156f3f8cc29d50","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"8ff981830ebf3fe518679fabc276f8aade7e253f47946d0d8df0dd30f83d96f5","METADATA":"7d1c3abdb74949d730d12adfb04ee54974fe621c8f50c14b25bd26b387b99757","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","NOTICE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","README.md":"1a904e49fb4a2398c64528b291872775352286f62be026a071827f266d55cbcf","TEST_MAPPING":"368cbc275d5c38a75491369719657516ca1b6635f8a914ed481a9ec063d1dc2c","benches/benches.rs":"d48c520608bf761120af28e5aa91520fcbc3fc45a7defe7cd35e671fc67bc913","cargo_embargo.json":"e35f70a87f8cbf6318a380d6c4228142aff731c4f6137f4f3cebbdb2c259795c","scripts/unicode.py":"432f2fc902e270597267ccee9a53959f6a939c5626d822b6b8717387d5714285","src/lib.rs":"51493ace5866fac830607c2b06528c7649c277d9ff7557caa8fb640d83390026","src/tables.rs":"91569fec1e0748594a2569959020fa9d241904ced4c1f7705d9057e2af062332","tests/emoji-test.txt":"749bf24573e3f2611cadfd7ecec727dc3e9bce7f3d96ce7fff1a970e0a31dc65","tests/tests.rs":"59c61b342185d5245b0142e4d3eeac7c01d114a841818e5842e96bb8f25794e6"}}
\ No newline at end of file

crates/unicode-width/.cargo-checksum.json

diff --git a/crates/unicode-width/.cargo-checksum.json b/crates/unicode-width/.cargo-checksum.json
index c1608bd..32b4257 100644
--- a/crates/unicode-width/.cargo-checksum.json
+++ b/crates/unicode-width/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"09233bddd9dcdd71355ad523e7293bc8764bb96f891e8968bea9b8aaf86ed314","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"8a041a4305fb318f5c2cb284046f8480796521d0e829023b0441b5e8469490eb","scripts/unicode.py":"d7884ff41ca9c54cbe97a8f9c909b0a8cd74bc8e6190b0c89bf3001a38d9d763","src/lib.rs":"baa30ab3913bde7d8e766a2fbccfda96f06dd499bebda899249fc7495d5ad6f7","src/tables.rs":"7201dff937e3b0f61f4fcad9cfb230fb0c44bb9082301e566351b95d7525605e","src/tests.rs":"ff9f331210861ba78040f119a0f6ccfacf5b2ca1ebee430784de0858fad01860"},"package":"e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"}
\ No newline at end of file
+{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"58a703b95d64c5cf5e84edb838fc5b3e426b7dcf54092bb5ffa4c88eb566b6ed","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"bb05cb954f8897cfd99a9d7b73ed41bf3991ec44fe6e1f500b91e51ae3892f4c","benches/benches.rs":"4cfb510cd83882f31eacc974c65acd2b6a0ce659aadf300de921e659ace7d587","scripts/unicode.py":"c905efbb53328aad971fa784027eee6403a04a2c04b1509d117b191bcbb6128f","src/lib.rs":"af71fa2d16706a1f15c9d3807829d8308c11ed4d974263ccf5a37d21a8c33982","src/tables.rs":"54753db78d67856fd202b4b072772c8c8a3f3297332a4f7bd77c84966946ea79","tests/emoji-test.txt":"d876ee249aa28eaa76cfa6dfaa702847a8d13b062aa488d465d0395ee8137ed9","tests/tests.rs":"eb5482283df9aaaaa090b2bbbc52e59779ed7da75d1254a64725f3df897c4804"},"package":"1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"}
\ No newline at end of file

crates/unicode-width/Android.bp

diff --git a/crates/unicode-width/Android.bp b/crates/unicode-width/Android.bp
index 5401a6f..5f02a28 100644
--- a/crates/unicode-width/Android.bp
+++ b/crates/unicode-width/Android.bp
@@ -18,10 +18,13 @@
     host_supported: true,
     crate_name: "unicode_width",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.1.11",
+    cargo_pkg_version: "0.2.0",
     crate_root: "src/lib.rs",
-    edition: "2015",
-    features: ["default"],
+    edition: "2021",
+    features: [
+        "cjk",
+        "default",
+    ],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -35,13 +38,37 @@
     host_supported: true,
     crate_name: "unicode_width",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.1.11",
+    cargo_pkg_version: "0.2.0",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2015",
-    features: ["default"],
+    edition: "2021",
+    features: [
+        "cjk",
+        "default",
+    ],
+}
+
+rust_test {
+    name: "unicode-width_test_tests_tests",
+    host_supported: true,
+    crate_name: "tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
+    crate_root: "tests/tests.rs",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2021",
+    features: [
+        "cjk",
+        "default",
+    ],
+    rustlibs: ["libunicode_width"],
+    data: ["tests/emoji-test.txt"],
 }

crates/unicode-width/Cargo.toml

diff --git a/crates/unicode-width/Cargo.toml b/crates/unicode-width/Cargo.toml
index 6dcfacd..35e1557 100644
--- a/crates/unicode-width/Cargo.toml
+++ b/crates/unicode-width/Cargo.toml
@@ -10,31 +10,51 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
+edition = "2021"
 name = "unicode-width"
-version = "0.1.11"
+version = "0.2.0"
 authors = [
     "kwantam <kwantam@gmail.com>",
     "Manish Goregaokar <manishsmail@gmail.com>",
 ]
-exclude = [
-    "target/*",
-    "Cargo.lock",
-]
+build = false
+exclude = ["/.github/*"]
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 Determine displayed width of `char` and `str` types
 according to Unicode Standard Annex #11 rules.
 """
 homepage = "https://github.com/unicode-rs/unicode-width"
-documentation = "https://unicode-rs.github.io/unicode-width"
 readme = "README.md"
 keywords = [
     "text",
     "width",
     "unicode",
 ]
-license = "MIT/Apache-2.0"
+categories = [
+    "command-line-interface",
+    "internationalization",
+    "no-std::no-alloc",
+    "text-processing",
+]
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/unicode-rs/unicode-width"
 
+[lib]
+name = "unicode_width"
+path = "src/lib.rs"
+
+[[test]]
+name = "tests"
+path = "tests/tests.rs"
+
+[[bench]]
+name = "benches"
+path = "benches/benches.rs"
+
 [dependencies.compiler_builtins]
 version = "0.1"
 optional = true
@@ -50,8 +70,8 @@
 package = "rustc-std-workspace-std"
 
 [features]
-bench = []
-default = []
+cjk = []
+default = ["cjk"]
 no_std = []
 rustc-dep-of-std = [
     "std",

crates/unicode-width/METADATA

diff --git a/crates/unicode-width/METADATA b/crates/unicode-width/METADATA
index 46ae386..2c5e878 100644
--- a/crates/unicode-width/METADATA
+++ b/crates/unicode-width/METADATA
@@ -1,17 +1,17 @@
 name: "unicode-width"
 description: "Determine displayed width of `char` and `str` types according to Unicode Standard Annex #11 rules."
 third_party {
-  version: "0.1.11"
+  version: "0.2.0"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 5
+    year: 2025
+    month: 1
+    day: 15
   }
   homepage: "https://crates.io/crates/unicode-width"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate"
-    version: "0.1.11"
+    value: "https://static.crates.io/crates/unicode-width/unicode-width-0.2.0.crate"
+    version: "0.2.0"
   }
 }

crates/unicode-width/README.md

diff --git a/crates/unicode-width/README.md b/crates/unicode-width/README.md
index 595e163..4ce085e 100644
--- a/crates/unicode-width/README.md
+++ b/crates/unicode-width/README.md
@@ -1,22 +1,22 @@
-# unicode-width
+# `unicode-width`
 
-Determine displayed width of `char` and `str` types according to
-[Unicode Standard Annex #11][UAX11] rules.
+[![Build status](https://github.com/unicode-rs/unicode-width/actions/workflows/rust.yml/badge.svg)](https://github.com/unicode-rs/unicode-width/actions/workflows/rust.yml)
+[![crates.io version](https://img.shields.io/crates/v/unicode-width)](https://crates.io/crates/unicode-width)
+[![Docs status](https://img.shields.io/docsrs/unicode-width)](https://docs.rs/unicode-width/)
+
+Determine displayed width of `char` and `str` types according to [Unicode Standard Annex #11][UAX11]
+and other portions of the Unicode standard.
+
+This crate is `#![no_std]`.
 
 [UAX11]: http://www.unicode.org/reports/tr11/
 
-[![Build Status](https://travis-ci.org/unicode-rs/unicode-width.svg)](https://travis-ci.org/unicode-rs/unicode-width)
-
-[Documentation](https://unicode-rs.github.io/unicode-width/unicode_width/index.html)
-
 ```rust
-extern crate unicode_width;
-
 use unicode_width::UnicodeWidthStr;
 
 fn main() {
     let teststr = "Ｈｅｌｌｏ, ｗｏｒｌｄ!";
-    let width = UnicodeWidthStr::width(teststr);
+    let width = teststr.width();
     println!("{}", teststr);
     println!("The above string is {} columns wide.", width);
     let width = teststr.width_cjk();
@@ -25,27 +25,26 @@
 ```
 
 **NOTE:** The computed width values may not match the actual rendered column
-width. For example, the woman scientist emoji comprises of a woman emoji, a
-zero-width joiner and a microscope emoji.
+width. For example, many Brahmic scripts like Devanagari have complex rendering rules
+which this crate does not currently handle (and will never fully handle, because
+the exact rendering depends on the font):
 
 ```rust
 extern crate unicode_width;
 use unicode_width::UnicodeWidthStr;
 
 fn main() {
-    assert_eq!(UnicodeWidthStr::width("👩"), 2); // Woman
-    assert_eq!(UnicodeWidthStr::width("🔬"), 2); // Microscope
-    assert_eq!(UnicodeWidthStr::width("👩‍🔬"), 4); // Woman scientist
+    assert_eq!("क".width(), 1); // Devanagari letter Ka
+    assert_eq!("ष".width(), 1); // Devanagari letter Ssa
+    assert_eq!("क्ष".width(), 2); // Ka + Virama + Ssa
 }
 ```
 
-See [Unicode Standard Annex #11][UAX11] for precise details on what is and isn't
-covered by this crate.
-
-## features
-
-unicode-width does not depend on libstd, so it can be used in crates
-with the `#![no_std]` attribute.
+Additionally, [defective combining character sequences](https://unicode.org/glossary/#defective_combining_character_sequence)
+and nonstandard [Korean jamo](https://unicode.org/glossary/#jamo) sequences may
+be rendered with a different width than what this crate says. (This is not an
+exhaustive list.) For a list of what this crate *does* handle, see
+[docs.rs](https://docs.rs/unicode-width/latest/unicode_width/#rules-for-determining-width).
 
 ## crates.io
 
@@ -54,5 +53,18 @@
 
 ```toml
 [dependencies]
-unicode-width = "0.1.7"
+unicode-width = "0.1.11"
 ```
+
+
+## Changelog
+
+
+### 0.2.0
+
+ - Treat `\n` as width 1 (#60)
+ - Treat ambiguous `Modifier_Letter`s as narrow (#63)
+ - Support `Grapheme_Cluster_Break=Prepend` (#62)
+ - Support lots of ligatures (#53)
+
+Note: If you are using `unicode-width` for linebreaking, the change treating `\n` as width 1 _may cause behavior changes_. It is recommended that in such cases you feed already-line segmented text to `unicode-width`. In other words, please apply higher level control character based line breaking protocols before feeding text to `unicode-width`. Relying on any character producing a stable width in this crate is likely the sign of a bug.

crates/unicode-width/benches/benches.rs

diff --git a/crates/unicode-width/benches/benches.rs b/crates/unicode-width/benches/benches.rs
new file mode 100644
index 0000000..44aaee6
--- /dev/null
+++ b/crates/unicode-width/benches/benches.rs
@@ -0,0 +1,114 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+#![feature(test)]
+
+extern crate test;
+
+use std::iter;
+
+use test::Bencher;
+
+use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
+
+#[bench]
+fn cargo(b: &mut Bencher) {
+    let string = iter::repeat('a').take(4096).collect::<String>();
+
+    b.iter(|| {
+        for c in string.chars() {
+            test::black_box(UnicodeWidthChar::width(c));
+        }
+    });
+}
+
+#[bench]
+#[allow(deprecated)]
+fn stdlib(b: &mut Bencher) {
+    let string = iter::repeat('a').take(4096).collect::<String>();
+
+    b.iter(|| {
+        for c in string.chars() {
+            test::black_box(c.width());
+        }
+    });
+}
+
+#[bench]
+fn simple_if(b: &mut Bencher) {
+    let string = iter::repeat('a').take(4096).collect::<String>();
+
+    b.iter(|| {
+        for c in string.chars() {
+            test::black_box(simple_width_if(c));
+        }
+    });
+}
+
+#[bench]
+fn simple_match(b: &mut Bencher) {
+    let string = iter::repeat('a').take(4096).collect::<String>();
+
+    b.iter(|| {
+        for c in string.chars() {
+            test::black_box(simple_width_match(c));
+        }
+    });
+}
+
+#[inline]
+fn simple_width_if(c: char) -> Option<usize> {
+    let cu = c as u32;
+    if cu < 127 {
+        if cu > 31 {
+            Some(1)
+        } else if cu == 0 {
+            Some(0)
+        } else {
+            None
+        }
+    } else {
+        UnicodeWidthChar::width(c)
+    }
+}
+
+#[inline]
+fn simple_width_match(c: char) -> Option<usize> {
+    match c as u32 {
+        cu if cu == 0 => Some(0),
+        cu if cu < 0x20 => None,
+        cu if cu < 0x7f => Some(1),
+        _ => UnicodeWidthChar::width(c),
+    }
+}
+
+#[bench]
+fn enwik8(b: &mut Bencher) {
+    // To benchmark, download & unzip `enwik8` from https://data.deepai.org/enwik8.zip
+    let data_path = "bench_data/enwik8";
+    let string = std::fs::read_to_string(data_path).unwrap_or_default();
+    b.iter(|| test::black_box(UnicodeWidthStr::width(string.as_str())));
+}
+
+#[bench]
+fn jawiki(b: &mut Bencher) {
+    // To benchmark, download & extract `jawiki-20220501-pages-articles-multistream-index.txt` from
+    // https://dumps.wikimedia.org/jawiki/20220501/jawiki-20220501-pages-articles-multistream-index.txt.bz2
+    let data_path = "bench_data/jawiki-20220501-pages-articles-multistream-index.txt";
+    let string = std::fs::read_to_string(data_path).unwrap_or_default();
+    b.iter(|| test::black_box(UnicodeWidthStr::width(string.as_str())));
+}
+
+#[bench]
+fn emoji(b: &mut Bencher) {
+    // To benchmark, download emoji-style.txt from https://www.unicode.org/emoji/charts/emoji-style.txt
+    let data_path = "bench_data/emoji-style.txt";
+    let string = std::fs::read_to_string(data_path).unwrap_or_default();
+    b.iter(|| test::black_box(UnicodeWidthStr::width(string.as_str())));
+}

crates/unicode-width/cargo_embargo.json

diff --git a/crates/unicode-width/cargo_embargo.json b/crates/unicode-width/cargo_embargo.json
index c8842d1..d1ef02b 100644
--- a/crates/unicode-width/cargo_embargo.json
+++ b/crates/unicode-width/cargo_embargo.json
@@ -1,4 +1,11 @@
 {
   "run_cargo": false,
-  "tests": true
+  "tests": true,
+  "package": {
+    "unicode-width": {
+      "test_data": {
+        "tests/tests.rs": ["tests/emoji-test.txt"]
+      }
+    }
+  }
 }

crates/unicode-width/scripts/unicode.py

diff --git a/crates/unicode-width/scripts/unicode.py b/crates/unicode-width/scripts/unicode.py
index a6d58c5..aa0d86b 100755
--- a/crates/unicode-width/scripts/unicode.py
+++ b/crates/unicode-width/scripts/unicode.py
@@ -11,18 +11,35 @@
 # except according to those terms.
 
 # This script uses the following Unicode tables:
+#
+# - DerivedCoreProperties.txt
 # - EastAsianWidth.txt
+# - HangulSyllableType.txt
+# - NormalizationTest.txt (for tests only)
+# - PropList.txt
 # - ReadMe.txt
 # - UnicodeData.txt
+# - auxiliary/GraphemeBreakProperty.txt
+# - emoji/emoji-data.txt
+# - emoji/emoji-variation-sequences.txt
+# - extracted/DerivedGeneralCategory.txt
 #
 # Since this should not require frequent updates, we just store this
 # out-of-line and check the generated module into git.
 
 import enum
 import math
+import operator
 import os
 import re
 import sys
+import urllib.request
+from collections import defaultdict
+from itertools import batched
+from typing import Callable, Iterable
+
+UNICODE_VERSION = "15.1.0"
+"""The version of the Unicode data files to download."""
 
 NUM_CODEPOINTS = 0x110000
 """An upper bound for which `range(0, NUM_CODEPOINTS)` contains Unicode's codespace."""
@@ -43,50 +60,84 @@
     """Each offset is a single byte (u8)."""
 
 
-TABLE_CFGS = [
-    (13, MAX_CODEPOINT_BITS, OffsetType.U8),
-    (6, 13, OffsetType.U8),
-    (0, 6, OffsetType.U2),
-]
-"""Represents the format of each level of the multi-level lookup table.
-A level's entry is of the form `(low_bit, cap_bit, offset_type)`.
-This means that every sub-table in that level is indexed by bits `low_bit..cap_bit` of the
-codepoint and those tables offsets are stored according to `offset_type`.
+MODULE_PATH = "../src/tables.rs"
+"""The path of the emitted Rust module (relative to the working directory)"""
 
-If this is edited, you must ensure that `emit_module` reflects your changes."""
-
-MODULE_FILENAME = "tables.rs"
-"""The filename of the emitted Rust module (will be created in the working directory)"""
+TABLE_SPLITS = [7, 13]
+"""The splits between the bits of the codepoint used to index each subtable.
+Adjust these values to change the sizes of the subtables"""
 
 Codepoint = int
 BitPos = int
 
 
-def fetch_open(filename: str):
+def fetch_open(filename: str, local_prefix: str = "", emoji: bool = False):
     """Opens `filename` and return its corresponding file object. If `filename` isn't on disk,
-    fetches it from `http://www.unicode.org/Public/UNIDATA/`. Exits with code 1 on failure."""
-    if not os.path.exists(os.path.basename(filename)):
-        os.system(f"curl -O http://www.unicode.org/Public/UNIDATA/{filename}")
+    fetches it from `https://www.unicode.org/Public/`. Exits with code 1 on failure.
+    """
+    basename = os.path.basename(filename)
+    localname = os.path.join(local_prefix, basename)
+    if not os.path.exists(localname):
+        if emoji:
+            prefix = f"emoji/{UNICODE_VERSION[:-2]}"
+        else:
+            prefix = f"{UNICODE_VERSION}/ucd"
+        urllib.request.urlretrieve(
+            f"https://www.unicode.org/Public/{prefix}/{filename}",
+            localname,
+        )
     try:
-        return open(filename, encoding="utf-8")
+        return open(localname, encoding="utf-8")
     except OSError:
-        sys.stderr.write(f"cannot load {filename}")
+        sys.stderr.write(f"cannot load {localname}")
         sys.exit(1)
 
 
-def load_unicode_version() -> "tuple[int, int, int]":
+def load_unicode_version() -> tuple[int, int, int]:
     """Returns the current Unicode version by fetching and processing `ReadMe.txt`."""
     with fetch_open("ReadMe.txt") as readme:
         pattern = r"for Version (\d+)\.(\d+)\.(\d+) of the Unicode"
-        return tuple(map(int, re.search(pattern, readme.read()).groups()))
+        return tuple(map(int, re.search(pattern, readme.read()).groups()))  # type: ignore
 
 
-class EffectiveWidth(enum.IntEnum):
-    """Represents the width of a Unicode character. All East Asian Width classes resolve into
-    either `EffectiveWidth.NARROW`, `EffectiveWidth.WIDE`, or `EffectiveWidth.AMBIGUOUS`."""
+def load_property(filename: str, pattern: str, action: Callable[[int], None]):
+    with fetch_open(filename) as properties:
+        single = re.compile(rf"^([0-9A-F]+)\s*;\s*{pattern}\s+")
+        multiple = re.compile(rf"^([0-9A-F]+)\.\.([0-9A-F]+)\s*;\s*{pattern}\s+")
 
-    ZERO = 0
-    """ Zero columns wide. """
+        for line in properties.readlines():
+            raw_data = None  # (low, high)
+            if match := single.match(line):
+                raw_data = (match.group(1), match.group(1))
+            elif match := multiple.match(line):
+                raw_data = (match.group(1), match.group(2))
+            else:
+                continue
+            low = int(raw_data[0], 16)
+            high = int(raw_data[1], 16)
+            for cp in range(low, high + 1):
+                action(cp)
+
+
+def to_sorted_ranges(iter: Iterable[Codepoint]) -> list[tuple[Codepoint, Codepoint]]:
+    "Creates a sorted list of ranges from an iterable of codepoints"
+    lst = [c for c in iter]
+    lst.sort()
+    ret = []
+    for cp in lst:
+        if len(ret) > 0 and ret[-1][1] == cp - 1:
+            ret[-1] = (ret[-1][0], cp)
+        else:
+            ret.append((cp, cp))
+    return ret
+
+
+class EastAsianWidth(enum.IntEnum):
+    """Represents the width of a Unicode character according to UAX 16.
+    All East Asian Width classes resolve into either
+    `EffectiveWidth.NARROW`, `EffectiveWidth.WIDE`, or `EffectiveWidth.AMBIGUOUS`.
+    """
+
     NARROW = 1
     """ One column wide. """
     WIDE = 2
@@ -95,7 +146,243 @@
     """ Two columns wide in a CJK context. One column wide in all other contexts. """
 
 
-def load_east_asian_widths() -> "list[EffectiveWidth]":
+class CharWidthInTable(enum.IntEnum):
+    """Represents the width of a Unicode character
+    as stored in the tables."""
+
+    ZERO = 0
+    ONE = 1
+    TWO = 2
+    SPECIAL = 3
+
+
+class WidthState(enum.IntEnum):
+    """
+    Width calculation proceeds according to a state machine.
+    We iterate over the characters of the string from back to front;
+    the next character encountered determines the transition to take.
+
+    The integer values of these variants have special meaning:
+    - Top bit: whether this is Vs16
+    - 2nd from top: whether this is Vs15
+    - 3rd bit from top: whether this is transparent to emoji/text presentation
+      (if set, should also set 4th)
+    - 4th bit: whether to set top bit on emoji presentation.
+      If this is set but 3rd is not, the width mode is related to zwj sequences
+    - 5th from top: whether this is unaffected by ligature-transparent
+    - 6th bit: if 4th is set but this one is not, then this is a ZWJ ligature state
+      where no ZWJ has been encountered yet; encountering one flips this on"""
+
+    # BASIC WIDTHS
+
+    ZERO = 0x1_0000
+    "Zero columns wide."
+
+    NARROW = 0x1_0001
+    "One column wide."
+
+    WIDE = 0x1_0002
+    "Two columns wide."
+
+    THREE = 0x1_0003
+    "Three columns wide."
+
+    # \r\n
+    LINE_FEED = 0b0000_0000_0000_0001
+    "\\n (CRLF has width 1)"
+
+    # EMOJI
+
+    # Emoji skintone modifiers
+    EMOJI_MODIFIER = 0b0000_0000_0000_0010
+    "`Emoji_Modifier`"
+
+    # Emoji ZWJ sequences
+
+    REGIONAL_INDICATOR = 0b0000_0000_0000_0011
+    "`Regional_Indicator`"
+
+    SEVERAL_REGIONAL_INDICATOR = 0b0000_0000_0000_0100
+    "At least two `Regional_Indicator`in sequence"
+
+    EMOJI_PRESENTATION = 0b0000_0000_0000_0101
+    "`Emoji_Presentation`"
+
+    ZWJ_EMOJI_PRESENTATION = 0b0001_0000_0000_0110
+    "\\u200D `Emoji_Presentation`"
+
+    VS16_ZWJ_EMOJI_PRESENTATION = 0b1001_0000_0000_0110
+    "\\uFE0F \\u200D `Emoji_Presentation`"
+
+    KEYCAP_ZWJ_EMOJI_PRESENTATION = 0b0001_0000_0000_0111
+    "\\u20E3 \\u200D `Emoji_Presentation`"
+
+    VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION = 0b1001_0000_0000_0111
+    "\\uFE0F \\u20E3 \\u200D `Emoji_Presentation`"
+
+    REGIONAL_INDICATOR_ZWJ_PRESENTATION = 0b0000_0000_0000_1001
+    "`Regional_Indicator` \\u200D `Emoji_Presentation`"
+
+    EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION = 0b0000_0000_0000_1010
+    "(`Regional_Indicator` `Regional_Indicator`)+ \\u200D `Emoji_Presentation`"
+
+    ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION = 0b0000_0000_0000_1011
+    "(`Regional_Indicator` `Regional_Indicator`)+ `Regional_Indicator` \\u200D `Emoji_Presentation`"
+
+    TAG_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_0000
+    "\\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_D1_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_0001
+    "\\uE0030..=\\uE0039 \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_D2_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_0010
+    "(\\uE0030..=\\uE0039){2} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_D3_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_0011
+    "(\\uE0030..=\\uE0039){3} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A1_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1001
+    "\\uE0061..=\\uE007A \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A2_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1010
+    "(\\uE0061..=\\uE007A){2} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A3_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1011
+    "(\\uE0061..=\\uE007A){3} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A4_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1100
+    "(\\uE0061..=\\uE007A){4} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A5_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1101
+    "(\\uE0061..=\\uE007A){35} \\uE007F \\u200D `Emoji_Presentation`"
+
+    TAG_A6_END_ZWJ_EMOJI_PRESENTATION = 0b0000_0000_0001_1110
+    "(\\uE0061..=\\uE007A){6} \\uE007F \\u200D `Emoji_Presentation`"
+
+    # VARIATION SELECTORS
+
+    # Text presentation sequences (not CJK)
+    VARIATION_SELECTOR_15 = 0b0100_0000_0000_0000
+    "\\uFE0E (text presentation sequences)"
+
+    # Emoji presentation sequences
+    VARIATION_SELECTOR_16 = 0b1000_0000_0000_0000
+    "\\uFE0F (emoji presentation sequences)"
+
+    # ARABIC LAM ALEF
+
+    JOINING_GROUP_ALEF = 0b0011_0000_1111_1111
+    "Joining_Group=Alef (Arabic Lam-Alef ligature)"
+
+    # COMBINING SOLIDUS (CJK only)
+
+    COMBINING_LONG_SOLIDUS_OVERLAY = 0b0011_1100_1111_1111
+    "\\u0338 (CJK only, makes <, =, > width 2)"
+
+    # SOLIDUS + ALEF (solidus is Joining_Type=Transparent)
+    SOLIDUS_OVERLAY_ALEF = 0b0011_1000_1111_1111
+    "\\u0338 followed by Joining_Group=Alef"
+
+    # SCRIPT ZWJ LIGATURES
+
+    # Hebrew alef lamed
+
+    HEBREW_LETTER_LAMED = 0b0011_1000_0000_0000
+    "\\u05DC (Alef-ZWJ-Lamed ligature)"
+
+    ZWJ_HEBREW_LETTER_LAMED = 0b0011_1100_0000_0000
+    "\\u200D\\u05DC (Alef-ZWJ-Lamed ligature)"
+
+    # Buginese <a -i> ya
+
+    BUGINESE_LETTER_YA = 0b0011_1000_0000_0001
+    "\\u1A10 (<a, -i> + ya ligature)"
+
+    ZWJ_BUGINESE_LETTER_YA = 0b0011_1100_0000_0001
+    "\\u200D\\u1A10 (<a, -i> + ya ligature)"
+
+    BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA = 0b0011_1100_0000_0010
+    "\\u1A17\\u200D\\u1A10 (<a, -i> + ya ligature)"
+
+    # Tifinagh bi-consonants
+
+    TIFINAGH_CONSONANT = 0b0011_1000_0000_0011
+    "\\u2D31..=\\u2D65 or \\u2D6F (joined by ZWJ or \\u2D7F TIFINAGH CONSONANT JOINER)"
+
+    ZWJ_TIFINAGH_CONSONANT = 0b0011_1100_0000_0011
+    "ZWJ then \\u2D31..=\\u2D65 or \\u2D6F"
+
+    TIFINAGH_JOINER_CONSONANT = 0b0011_1100_0000_0100
+    "\\u2D7F then \\u2D31..=\\u2D65 or \\u2D6F"
+
+    # Lisu tone letters
+    LISU_TONE_LETTER_MYA_NA_JEU = 0b0011_1100_0000_0101
+    "\\uA4FC or \\uA4FD (https://www.unicode.org/versions/Unicode15.0.0/ch18.pdf#G42078)"
+
+    # Old Turkic orkhon ec - orkhon i
+
+    OLD_TURKIC_LETTER_ORKHON_I = 0b0011_1000_0000_0110
+    "\\u10C03 (ORKHON EC-ZWJ-ORKHON I ligature)"
+
+    ZWJ_OLD_TURKIC_LETTER_ORKHON_I = 0b0011_1100_0000_0110
+    "\\u10C03 (ORKHON EC-ZWJ-ORKHON I ligature)"
+
+    # Khmer coeng signs
+
+    KHMER_COENG_ELIGIBLE_LETTER = 0b0011_1100_0000_0111
+    "\\u1780..=\\u17A2 | \\u17A7 | \\u17AB | \\u17AC | \\u17AF"
+
+    def table_width(self) -> CharWidthInTable:
+        "The width of a character as stored in the lookup tables."
+        match self:
+            case WidthState.ZERO:
+                return CharWidthInTable.ZERO
+            case WidthState.NARROW:
+                return CharWidthInTable.ONE
+            case WidthState.WIDE:
+                return CharWidthInTable.TWO
+            case _:
+                return CharWidthInTable.SPECIAL
+
+    def is_carried(self) -> bool:
+        "Whether this corresponds to a non-default `WidthInfo`."
+        return int(self) <= 0xFFFF
+
+    def width_alone(self) -> int:
+        "The width of a character with this type when it appears alone."
+        match self:
+            case (
+                WidthState.ZERO
+                | WidthState.COMBINING_LONG_SOLIDUS_OVERLAY
+                | WidthState.VARIATION_SELECTOR_15
+                | WidthState.VARIATION_SELECTOR_16
+            ):
+                return 0
+            case (
+                WidthState.WIDE
+                | WidthState.EMOJI_MODIFIER
+                | WidthState.EMOJI_PRESENTATION
+            ):
+                return 2
+            case WidthState.THREE:
+                return 3
+            case _:
+                return 1
+
+    def is_cjk_only(self) -> bool:
+        return self in [
+            WidthState.COMBINING_LONG_SOLIDUS_OVERLAY,
+            WidthState.SOLIDUS_OVERLAY_ALEF,
+        ]
+
+    def is_non_cjk_only(self) -> bool:
+        return self == WidthState.VARIATION_SELECTOR_15
+
+
+assert len(set([v.value for v in WidthState])) == len([v.value for v in WidthState])
+
+
+def load_east_asian_widths() -> list[EastAsianWidth]:
     """Return a list of effective widths, indexed by codepoint.
     Widths are determined by fetching and parsing `EastAsianWidth.txt`.
 
@@ -103,17 +390,18 @@
 
     `Wide` and `Fullwidth` characters are assigned `EffectiveWidth.WIDE`.
 
-    `Ambiguous` chracters are assigned `EffectiveWidth.AMBIGUOUS`."""
+    `Ambiguous` characters are assigned `EffectiveWidth.AMBIGUOUS`."""
+
     with fetch_open("EastAsianWidth.txt") as eaw:
         # matches a width assignment for a single codepoint, i.e. "1F336;N  # ..."
-        single = re.compile(r"^([0-9A-F]+)\s+;\s+(\w+) +# (\w+)")
+        single = re.compile(r"^([0-9A-F]+)\s*;\s*(\w+) +# (\w+)")
         # matches a width assignment for a range of codepoints, i.e. "3001..3003;W  # ..."
-        multiple = re.compile(r"^([0-9A-F]+)\.\.([0-9A-F]+)\s+;\s+(\w+) +# (\w+)")
+        multiple = re.compile(r"^([0-9A-F]+)\.\.([0-9A-F]+)\s*;\s*(\w+) +# (\w+)")
         # map between width category code and condensed width
         width_codes = {
-            **{c: EffectiveWidth.NARROW for c in ["N", "Na", "H"]},
-            **{c: EffectiveWidth.WIDE for c in ["W", "F"]},
-            "A": EffectiveWidth.AMBIGUOUS,
+            **{c: EastAsianWidth.NARROW for c in ["N", "Na", "H"]},
+            **{c: EastAsianWidth.WIDE for c in ["W", "F"]},
+            "A": EastAsianWidth.AMBIGUOUS,
         }
 
         width_map = []
@@ -134,61 +422,381 @@
             while current <= high:
                 # Some codepoints don't fall into any of the ranges in EastAsianWidth.txt.
                 # All such codepoints are implicitly given Neural width (resolves to narrow)
-                width_map.append(EffectiveWidth.NARROW if current < low else width)
+                width_map.append(EastAsianWidth.NARROW if current < low else width)
                 current += 1
 
         while len(width_map) < NUM_CODEPOINTS:
             # Catch any leftover codepoints and assign them implicit Neutral/narrow width.
-            width_map.append(EffectiveWidth.NARROW)
+            width_map.append(EastAsianWidth.NARROW)
 
-        return width_map
+    # Ambiguous `Letter`s and `Modifier_Symbol`s are narrow
+    load_property(
+        "extracted/DerivedGeneralCategory.txt",
+        r"(:?Lu|Ll|Lt|Lm|Lo|Sk)",
+        lambda cp: (
+            operator.setitem(width_map, cp, EastAsianWidth.NARROW)
+            if width_map[cp] == EastAsianWidth.AMBIGUOUS
+            else None
+        ),
+    )
+
+    # GREEK ANO TELEIA: NFC decomposes to U+00B7 MIDDLE DOT
+    width_map[0x0387] = EastAsianWidth.AMBIGUOUS
+
+    # Canonical equivalence for symbols with stroke
+    with fetch_open("UnicodeData.txt") as udata:
+        single = re.compile(r"([0-9A-Z]+);.*?;.*?;.*?;.*?;([0-9A-Z]+) 0338;")
+        for line in udata.readlines():
+            if match := single.match(line):
+                composed = int(match.group(1), 16)
+                decomposed = int(match.group(2), 16)
+                if width_map[decomposed] == EastAsianWidth.AMBIGUOUS:
+                    width_map[composed] = EastAsianWidth.AMBIGUOUS
+
+    return width_map
 
 
-def load_zero_widths() -> "list[bool]":
+def load_zero_widths() -> list[bool]:
     """Returns a list `l` where `l[c]` is true if codepoint `c` is considered a zero-width
-    character. `c` is considered a zero-width character if `c` is in general categories
-    `Cc`, `Cf`, `Mn`, or `Me` (determined by fetching and processing `UnicodeData.txt`)."""
-    with fetch_open("UnicodeData.txt") as categories:
-        zw_map = []
-        current = 0
-        for line in categories.readlines():
-            if len(raw_data := line.split(";")) != 15:
-                continue
-            [codepoint, name, cat_code] = [
-                int(raw_data[0], 16),
-                raw_data[1],
-                raw_data[2],
-            ]
-            zero_width = cat_code in ["Cc", "Cf", "Mn", "Me"]
+    character. `c` is considered a zero-width character if
 
-            assert current <= codepoint
-            while current <= codepoint:
-                if name.endswith(", Last>") or current == codepoint:
-                    # if name ends with Last, we backfill the width value to all codepoints since
-                    # the previous codepoint (aka the start of the range)
-                    zw_map.append(zero_width)
-                else:
-                    # unassigned characters are implicitly given Neutral width, which is nonzero
-                    zw_map.append(False)
-                current += 1
+    - it has the `Default_Ignorable_Code_Point` property (determined from `DerivedCoreProperties.txt`),
+    - or if it has the `Grapheme_Extend` property (determined from `DerivedCoreProperties.txt`),
+    - or if it one of eight characters that should be `Grapheme_Extend` but aren't due to a Unicode spec bug,
+    - or if it has a `Hangul_Syllable_Type` of `Vowel_Jamo` or `Trailing_Jamo` (determined from `HangulSyllableType.txt`).
+    """
 
-        while len(zw_map) < NUM_CODEPOINTS:
-            # Catch any leftover codepoints. They must be unassigned (so nonzero width)
-            zw_map.append(False)
+    zw_map = [False] * NUM_CODEPOINTS
 
-        return zw_map
+    # `Default_Ignorable_Code_Point`s also have 0 width:
+    # https://www.unicode.org/faq/unsup_char.html#3
+    # https://www.unicode.org/versions/Unicode15.1.0/ch05.pdf#G40095
+    #
+    # `Grapheme_Extend` includes characters with general category `Mn` or `Me`,
+    # as well as a few `Mc` characters that need to be included so that
+    # canonically equivalent sequences have the same width.
+    load_property(
+        "DerivedCoreProperties.txt",
+        r"(?:Default_Ignorable_Code_Point|Grapheme_Extend)",
+        lambda cp: operator.setitem(zw_map, cp, True),
+    )
+
+    # Unicode spec bug: these should be `Grapheme_Cluster_Break=Extend`,
+    # as they canonically decompose to two characters with this property,
+    # but they aren't.
+    for c in [0x0CC0, 0x0CC7, 0x0CC8, 0x0CCA, 0x0CCB, 0x1B3B, 0x1B3D, 0x1B43]:
+        zw_map[c] = True
+
+    # Treat `Hangul_Syllable_Type`s of `Vowel_Jamo` and `Trailing_Jamo`
+    # as zero-width. This matches the behavior of glibc `wcwidth`.
+    #
+    # Decomposed Hangul characters consist of 3 parts: a `Leading_Jamo`,
+    # a `Vowel_Jamo`, and an optional `Trailing_Jamo`. Together these combine
+    # into a single wide grapheme. So we treat vowel and trailing jamo as
+    # 0-width, such that only the width of the leading jamo is counted
+    # and the resulting grapheme has width 2.
+    #
+    # (See the Unicode Standard sections 3.12 and 18.6 for more on Hangul)
+    load_property(
+        "HangulSyllableType.txt",
+        r"(?:V|T)",
+        lambda cp: operator.setitem(zw_map, cp, True),
+    )
+
+    # Syriac abbreviation mark:
+    # Zero-width `Prepended_Concatenation_Mark`
+    zw_map[0x070F] = True
+
+    # Some Arabic Prepended_Concatenation_Mark`s
+    # https://www.unicode.org/versions/Unicode15.0.0/ch09.pdf#G27820
+    zw_map[0x0605] = True
+    zw_map[0x0890] = True
+    zw_map[0x0891] = True
+    zw_map[0x08E2] = True
+
+    # `[:Grapheme_Cluster_Break=Prepend:]-[:Prepended_Concatenation_Mark:]`
+    gcb_prepend = set()
+    load_property(
+        "auxiliary/GraphemeBreakProperty.txt",
+        "Prepend",
+        lambda cp: gcb_prepend.add(cp),
+    )
+    load_property(
+        "PropList.txt",
+        "Prepended_Concatenation_Mark",
+        lambda cp: gcb_prepend.remove(cp),
+    )
+    for cp in gcb_prepend:
+        zw_map[cp] = True
+
+    # HANGUL CHOSEONG FILLER
+    # U+115F is a `Default_Ignorable_Code_Point`, and therefore would normally have
+    # zero width. However, the expected usage is to combine it with vowel or trailing jamo
+    # (which are considered 0-width on their own) to form a composed Hangul syllable with
+    # width 2. Therefore, we treat it as having width 2.
+    zw_map[0x115F] = False
+
+    # TIFINAGH CONSONANT JOINER
+    # (invisible only when used to join two Tifinagh consonants
+    zw_map[0x2D7F] = False
+
+    # DEVANAGARI CARET
+    # https://www.unicode.org/versions/Unicode15.0.0/ch12.pdf#G667447
+    zw_map[0xA8FA] = True
+
+    return zw_map
+
+
+def load_width_maps() -> tuple[list[WidthState], list[WidthState]]:
+    """Load complete width table, including characters needing special handling.
+    (Returns 2 tables, one for East Asian and one for not.)"""
+
+    eaws = load_east_asian_widths()
+    zws = load_zero_widths()
+
+    not_ea = []
+    ea = []
+
+    for eaw, zw in zip(eaws, zws):
+        if zw:
+            not_ea.append(WidthState.ZERO)
+            ea.append(WidthState.ZERO)
+        else:
+            if eaw == EastAsianWidth.WIDE:
+                not_ea.append(WidthState.WIDE)
+            else:
+                not_ea.append(WidthState.NARROW)
+
+            if eaw == EastAsianWidth.NARROW:
+                ea.append(WidthState.NARROW)
+            else:
+                ea.append(WidthState.WIDE)
+
+    # Joining_Group=Alef (Arabic Lam-Alef ligature)
+    alef_joining = []
+    load_property(
+        "extracted/DerivedJoiningGroup.txt",
+        "Alef",
+        lambda cp: alef_joining.append(cp),
+    )
+
+    # Regional indicators
+    regional_indicators = []
+    load_property(
+        "PropList.txt",
+        "Regional_Indicator",
+        lambda cp: regional_indicators.append(cp),
+    )
+
+    # Emoji modifiers
+    emoji_modifiers = []
+    load_property(
+        "emoji/emoji-data.txt",
+        "Emoji_Modifier",
+        lambda cp: emoji_modifiers.append(cp),
+    )
+
+    # Default emoji presentation (for ZWJ sequences)
+    emoji_presentation = []
+    load_property(
+        "emoji/emoji-data.txt",
+        "Emoji_Presentation",
+        lambda cp: emoji_presentation.append(cp),
+    )
+
+    for cps, width in [
+        ([0x0A], WidthState.LINE_FEED),
+        ([0x05DC], WidthState.HEBREW_LETTER_LAMED),
+        (alef_joining, WidthState.JOINING_GROUP_ALEF),
+        (range(0x1780, 0x1783), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (range(0x1784, 0x1788), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (range(0x1789, 0x178D), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (range(0x178E, 0x1794), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (range(0x1795, 0x1799), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (range(0x179B, 0x179E), WidthState.KHMER_COENG_ELIGIBLE_LETTER),
+        (
+            [0x17A0, 0x17A2, 0x17A7, 0x17AB, 0x17AC, 0x17AF],
+            WidthState.KHMER_COENG_ELIGIBLE_LETTER,
+        ),
+        ([0x17A4], WidthState.WIDE),
+        ([0x17D8], WidthState.THREE),
+        ([0x1A10], WidthState.BUGINESE_LETTER_YA),
+        (range(0x2D31, 0x2D66), WidthState.TIFINAGH_CONSONANT),
+        ([0x2D6F], WidthState.TIFINAGH_CONSONANT),
+        ([0xA4FC], WidthState.LISU_TONE_LETTER_MYA_NA_JEU),
+        ([0xA4FD], WidthState.LISU_TONE_LETTER_MYA_NA_JEU),
+        ([0xFE0F], WidthState.VARIATION_SELECTOR_16),
+        ([0x10C03], WidthState.OLD_TURKIC_LETTER_ORKHON_I),
+        (emoji_presentation, WidthState.EMOJI_PRESENTATION),
+        (emoji_modifiers, WidthState.EMOJI_MODIFIER),
+        (regional_indicators, WidthState.REGIONAL_INDICATOR),
+    ]:
+        for cp in cps:
+            not_ea[cp] = width
+            ea[cp] = width
+
+    # East-Asian only
+    ea[0x0338] = WidthState.COMBINING_LONG_SOLIDUS_OVERLAY
+
+    # Not East Asian only
+    not_ea[0xFE0E] = WidthState.VARIATION_SELECTOR_15
+
+    return (not_ea, ea)
+
+
+def load_joining_group_lam() -> list[tuple[Codepoint, Codepoint]]:
+    "Returns a list of character ranges with Joining_Group=Lam"
+    lam_joining = []
+    load_property(
+        "extracted/DerivedJoiningGroup.txt",
+        "Lam",
+        lambda cp: lam_joining.append(cp),
+    )
+
+    return to_sorted_ranges(lam_joining)
+
+
+def load_non_transparent_zero_widths(
+    width_map: list[WidthState],
+) -> list[tuple[Codepoint, Codepoint]]:
+    "Returns a list of characters with zero width but not 'Joining_Type=Transparent'"
+
+    zero_widths = set()
+    for cp, width in enumerate(width_map):
+        if width.width_alone() == 0:
+            zero_widths.add(cp)
+    transparent = set()
+    load_property(
+        "extracted/DerivedJoiningType.txt",
+        "T",
+        lambda cp: transparent.add(cp),
+    )
+
+    return to_sorted_ranges(zero_widths - transparent)
+
+
+def load_ligature_transparent() -> list[tuple[Codepoint, Codepoint]]:
+    """Returns a list of character ranges corresponding to all combining marks that are also
+    `Default_Ignorable_Code_Point`s, plus ZWJ. This is the set of characters that won't interrupt
+    a ligature."""
+    default_ignorables = set()
+    load_property(
+        "DerivedCoreProperties.txt",
+        "Default_Ignorable_Code_Point",
+        lambda cp: default_ignorables.add(cp),
+    )
+
+    combining_marks = set()
+    load_property(
+        "extracted/DerivedGeneralCategory.txt",
+        "(?:Mc|Mn|Me)",
+        lambda cp: combining_marks.add(cp),
+    )
+
+    default_ignorable_combinings = default_ignorables.intersection(combining_marks)
+    default_ignorable_combinings.add(0x200D)  # ZWJ
+
+    return to_sorted_ranges(default_ignorable_combinings)
+
+
+def load_solidus_transparent(
+    ligature_transparents: list[tuple[Codepoint, Codepoint]],
+    cjk_width_map: list[WidthState],
+) -> list[tuple[Codepoint, Codepoint]]:
+    """Characters expanding to a canonical combining class above 1, plus `ligature_transparent`s from above.
+    Ranges matching ones in `ligature_transparent` exactly are excluded (for compression), so it needs to bechecked also.
+    """
+
+    ccc_above_1 = set()
+    load_property(
+        "extracted/DerivedCombiningClass.txt",
+        "(?:[2-9]|(?:[1-9][0-9]+))",
+        lambda cp: ccc_above_1.add(cp),
+    )
+
+    for lo, hi in ligature_transparents:
+        for cp in range(lo, hi + 1):
+            ccc_above_1.add(cp)
+
+    num_chars = len(ccc_above_1)
+
+    # Recursive decompositions
+    while True:
+        with fetch_open("UnicodeData.txt") as udata:
+            single = re.compile(r"([0-9A-Z]+);.*?;.*?;.*?;.*?;([0-9A-F ]+);")
+            for line in udata.readlines():
+                if match := single.match(line):
+                    composed = int(match.group(1), 16)
+                    decomposed = [int(c, 16) for c in match.group(2).split(" ")]
+                    if all([c in ccc_above_1 for c in decomposed]):
+                        ccc_above_1.add(composed)
+        if len(ccc_above_1) == num_chars:
+            break
+        else:
+            num_chars = len(ccc_above_1)
+
+    for cp in ccc_above_1:
+        if cp != 0xFE0F:
+            assert (
+                cjk_width_map[cp].table_width() != CharWidthInTable.SPECIAL
+            ), f"U+{cp:X}"
+
+    sorted = to_sorted_ranges(ccc_above_1)
+    return list(filter(lambda range: range not in ligature_transparents, sorted))
+
+
+def load_normalization_tests() -> list[tuple[str, str, str, str, str]]:
+    def parse_codepoints(cps: str) -> str:
+        return "".join(map(lambda cp: chr(int(cp, 16)), cps.split(" ")))
+
+    with fetch_open("NormalizationTest.txt") as normtests:
+        ret = []
+        single = re.compile(
+            r"^([0-9A-F ]+);([0-9A-F ]+);([0-9A-F ]+);([0-9A-F ]+);([0-9A-F ]+);"
+        )
+        for line in normtests.readlines():
+            if match := single.match(line):
+                ret.append(
+                    (
+                        parse_codepoints(match.group(1)),
+                        parse_codepoints(match.group(2)),
+                        parse_codepoints(match.group(3)),
+                        parse_codepoints(match.group(4)),
+                        parse_codepoints(match.group(5)),
+                    )
+                )
+        return ret
+
+
+def make_special_ranges(
+    width_map: list[WidthState],
+) -> list[tuple[tuple[Codepoint, Codepoint], WidthState]]:
+    "Assign ranges of characters to their special behavior (used in match)"
+    ret = []
+    can_merge_with_prev = False
+    for cp, width in enumerate(width_map):
+        if width == WidthState.EMOJI_PRESENTATION:
+            can_merge_with_prev = False
+        elif width.table_width() == CharWidthInTable.SPECIAL:
+            if can_merge_with_prev and ret[-1][1] == width:
+                ret[-1] = ((ret[-1][0][0], cp), width)
+            else:
+                ret.append(((cp, cp), width))
+                can_merge_with_prev = True
+    return ret
 
 
 class Bucket:
     """A bucket contains a group of codepoints and an ordered width list. If one bucket's width
-    list overlaps with another's width list, those buckets can be merged via `try_extend`."""
+    list overlaps with another's width list, those buckets can be merged via `try_extend`.
+    """
 
     def __init__(self):
         """Creates an empty bucket."""
         self.entry_set = set()
         self.widths = []
 
-    def append(self, codepoint: Codepoint, width: EffectiveWidth):
+    def append(self, codepoint: Codepoint, width: CharWidthInTable):
         """Adds a codepoint/width pair to the bucket, and appends `width` to the width list."""
         self.entry_set.add((codepoint, width))
         self.widths.append(width)
@@ -206,13 +814,13 @@
         self.widths = more
         return True
 
-    def entries(self) -> "list[tuple[Codepoint, EffectiveWidth]]":
+    def entries(self) -> list[tuple[Codepoint, CharWidthInTable]]:
         """Return a list of the codepoint/width pairs in this bucket, sorted by codepoint."""
         result = list(self.entry_set)
         result.sort()
         return result
 
-    def width(self) -> "EffectiveWidth":
+    def width(self) -> CharWidthInTable | None:
         """If all codepoints in this bucket have the same width, return that width; otherwise,
         return `None`."""
         if len(self.widths) == 0:
@@ -224,15 +832,17 @@
         return potential_width
 
 
-def make_buckets(entries, low_bit: BitPos, cap_bit: BitPos) -> "list[Bucket]":
+def make_buckets(
+    entries: Iterable[tuple[int, CharWidthInTable]], low_bit: BitPos, cap_bit: BitPos
+) -> list[Bucket]:
     """Partitions the `(Codepoint, EffectiveWidth)` tuples in `entries` into `Bucket`s. All
     codepoints with identical bits from `low_bit` to `cap_bit` (exclusive) are placed in the
     same bucket. Returns a list of the buckets in increasing order of those bits."""
     num_bits = cap_bit - low_bit
     assert num_bits > 0
-    buckets = [Bucket() for _ in range(0, 2 ** num_bits)]
+    buckets = [Bucket() for _ in range(0, 2**num_bits)]
     mask = (1 << num_bits) - 1
-    for (codepoint, width) in entries:
+    for codepoint, width in entries:
         buckets[(codepoint >> low_bit) & mask].append(codepoint, width)
     return buckets
 
@@ -252,24 +862,55 @@
     discard the buckets and convert the entries into `EffectiveWidth` values."""
 
     def __init__(
-        self, entry_groups, low_bit: BitPos, cap_bit: BitPos, offset_type: OffsetType
+        self,
+        name: str,
+        entry_groups: Iterable[Iterable[tuple[int, CharWidthInTable]]],
+        secondary_entry_groups: Iterable[Iterable[tuple[int, CharWidthInTable]]],
+        low_bit: BitPos,
+        cap_bit: BitPos,
+        offset_type: OffsetType,
+        align: int,
+        bytes_per_row: int | None = None,
+        starting_indexed: list[Bucket] = [],
+        cfged: bool = False,
     ):
         """Create a lookup table with a sub-table for each `(Codepoint, EffectiveWidth)` iterator
         in `entry_groups`. Each sub-table is indexed by codepoint bits in `low_bit..cap_bit`,
         and each table entry is represented in the format specified by  `offset_type`. Asserts
         that this table is actually representable with `offset_type`."""
+        starting_indexed_len = len(starting_indexed)
+        self.name = name
         self.low_bit = low_bit
         self.cap_bit = cap_bit
         self.offset_type = offset_type
-        self.entries = []
-        self.indexed = []
+        self.entries: list[int] = []
+        self.indexed: list[Bucket] = list(starting_indexed)
+        self.align = align
+        self.bytes_per_row = bytes_per_row
+        self.cfged = cfged
 
-        buckets = []
+        buckets: list[Bucket] = []
         for entries in entry_groups:
             buckets.extend(make_buckets(entries, self.low_bit, self.cap_bit))
 
         for bucket in buckets:
-            for (i, existing) in enumerate(self.indexed):
+            for i, existing in enumerate(self.indexed):
+                if existing.try_extend(bucket):
+                    self.entries.append(i)
+                    break
+            else:
+                self.entries.append(len(self.indexed))
+                self.indexed.append(bucket)
+
+        self.primary_len = len(self.entries)
+        self.primary_bucket_len = len(self.indexed)
+
+        buckets = []
+        for entries in secondary_entry_groups:
+            buckets.extend(make_buckets(entries, self.low_bit, self.cap_bit))
+
+        for bucket in buckets:
+            for i, existing in enumerate(self.indexed):
                 if existing.try_extend(bucket):
                     self.entries.append(i)
                     break
@@ -278,20 +919,24 @@
                 self.indexed.append(bucket)
 
         # Validate offset type
+        max_index = 1 << int(self.offset_type)
         for index in self.entries:
-            assert index < (1 << int(self.offset_type))
+            assert index < max_index, f"{index} <= {max_index}"
+
+        self.indexed = self.indexed[starting_indexed_len:]
 
     def indices_to_widths(self):
         """Destructively converts the indices in this table to the `EffectiveWidth` values of
-        their buckets. Assumes that no bucket contains codepoints with different widths."""
-        self.entries = list(map(lambda i: int(self.indexed[i].width()), self.entries))
+        their buckets. Assumes that no bucket contains codepoints with different widths.
+        """
+        self.entries = list(map(lambda i: int(self.indexed[i].width()), self.entries))  # type: ignore
         del self.indexed
 
     def buckets(self):
         """Returns an iterator over this table's buckets."""
         return self.indexed
 
-    def to_bytes(self) -> "list[int]":
+    def to_bytes(self) -> list[int]:
         """Returns this table's entries as a list of bytes. The bytes are formatted according to
         the `OffsetType` which the table was created with, converting any `EffectiveWidth` entries
         to their enum variant's integer value. For example, with `OffsetType.U2`, each byte will
@@ -307,26 +952,583 @@
 
 
 def make_tables(
-    table_cfgs: "list[tuple[BitPos, BitPos, OffsetType]]", entries
-) -> "list[Table]":
+    width_map: list[WidthState],
+    cjk_width_map: list[WidthState],
+) -> list[Table]:
     """Creates a table for each configuration in `table_cfgs`, with the first config corresponding
     to the top-level lookup table, the second config corresponding to the second-level lookup
     table, and so forth. `entries` is an iterator over the `(Codepoint, EffectiveWidth)` pairs
     to include in the top-level table."""
-    tables = []
-    entry_groups = [entries]
-    for (low_bit, cap_bit, offset_type) in table_cfgs:
-        table = Table(entry_groups, low_bit, cap_bit, offset_type)
-        entry_groups = map(lambda bucket: bucket.entries(), table.buckets())
-        tables.append(table)
-    return tables
+
+    entries = enumerate([w.table_width() for w in width_map])
+    cjk_entries = enumerate([w.table_width() for w in cjk_width_map])
+
+    root_table = Table(
+        "WIDTH_ROOT",
+        [entries],
+        [],
+        TABLE_SPLITS[1],
+        MAX_CODEPOINT_BITS,
+        OffsetType.U8,
+        128,
+    )
+
+    cjk_root_table = Table(
+        "WIDTH_ROOT_CJK",
+        [cjk_entries],
+        [],
+        TABLE_SPLITS[1],
+        MAX_CODEPOINT_BITS,
+        OffsetType.U8,
+        128,
+        starting_indexed=root_table.indexed,
+        cfged=True,
+    )
+
+    middle_table = Table(
+        "WIDTH_MIDDLE",
+        map(lambda bucket: bucket.entries(), root_table.buckets()),
+        map(lambda bucket: bucket.entries(), cjk_root_table.buckets()),
+        TABLE_SPLITS[0],
+        TABLE_SPLITS[1],
+        OffsetType.U8,
+        2 ** (TABLE_SPLITS[1] - TABLE_SPLITS[0]),
+        bytes_per_row=2 ** (TABLE_SPLITS[1] - TABLE_SPLITS[0]),
+    )
+
+    leaves_table = Table(
+        "WIDTH_LEAVES",
+        map(
+            lambda bucket: bucket.entries(),
+            middle_table.buckets()[: middle_table.primary_bucket_len],
+        ),
+        map(
+            lambda bucket: bucket.entries(),
+            middle_table.buckets()[middle_table.primary_bucket_len :],
+        ),
+        0,
+        TABLE_SPLITS[0],
+        OffsetType.U2,
+        2 ** (TABLE_SPLITS[0] - 2),
+        bytes_per_row=2 ** (TABLE_SPLITS[0] - 2),
+    )
+
+    return [root_table, cjk_root_table, middle_table, leaves_table]
+
+
+def load_emoji_presentation_sequences() -> list[Codepoint]:
+    """Outputs a list of cpodepoints, corresponding to all the valid characters for starting
+    an emoji presentation sequence."""
+
+    with fetch_open("emoji/emoji-variation-sequences.txt") as sequences:
+        # Match all emoji presentation sequences
+        # (one codepoint followed by U+FE0F, and labeled "emoji style")
+        sequence = re.compile(r"^([0-9A-F]+)\s+FE0F\s*;\s*emoji style")
+        codepoints = []
+        for line in sequences.readlines():
+            if match := sequence.match(line):
+                cp = int(match.group(1), 16)
+                codepoints.append(cp)
+    return codepoints
+
+
+def load_text_presentation_sequences() -> list[Codepoint]:
+    """Outputs a list of codepoints, corresponding to all the valid characters
+    whose widths change with a text presentation sequence."""
+
+    text_presentation_seq_codepoints = set()
+    with fetch_open("emoji/emoji-variation-sequences.txt") as sequences:
+        # Match all text presentation sequences
+        # (one codepoint followed by U+FE0E, and labeled "text style")
+        sequence = re.compile(r"^([0-9A-F]+)\s+FE0E\s*;\s*text style")
+        for line in sequences.readlines():
+            if match := sequence.match(line):
+                cp = int(match.group(1), 16)
+                text_presentation_seq_codepoints.add(cp)
+
+    default_emoji_codepoints = set()
+
+    load_property(
+        "emoji/emoji-data.txt",
+        "Emoji_Presentation",
+        lambda cp: default_emoji_codepoints.add(cp),
+    )
+
+    codepoints = []
+    for cp in text_presentation_seq_codepoints.intersection(default_emoji_codepoints):
+        # "Enclosed Ideographic Supplement" block;
+        # wide even in text presentation
+        if not cp in range(0x1F200, 0x1F300):
+            codepoints.append(cp)
+
+    codepoints.sort()
+    return codepoints
+
+
+def load_emoji_modifier_bases() -> list[Codepoint]:
+    """Outputs a list of codepoints, corresponding to all the valid characters
+    whose widths change with a text presentation sequence."""
+
+    ret = []
+    load_property(
+        "emoji/emoji-data.txt",
+        "Emoji_Modifier_Base",
+        lambda cp: ret.append(cp),
+    )
+    ret.sort()
+    return ret
+
+
+def make_presentation_sequence_table(
+    seqs: list[Codepoint],
+    lsb: int = 10,
+) -> tuple[list[tuple[int, int]], list[list[int]]]:
+    """Generates 2-level lookup table for whether a codepoint might start an emoji variation sequence.
+    The first level is a match on all but the 10 LSB, the second level is a 1024-bit bitmap for those 10 LSB.
+    """
+
+    prefixes_dict = defaultdict(set)
+    for cp in seqs:
+        prefixes_dict[cp >> lsb].add(cp & (2**lsb - 1))
+
+    msbs: list[int] = list(prefixes_dict.keys())
+
+    leaves: list[list[int]] = []
+    for cps in prefixes_dict.values():
+        leaf = [0] * (2 ** (lsb - 3))
+        for cp in cps:
+            idx_in_leaf, bit_shift = divmod(cp, 8)
+            leaf[idx_in_leaf] |= 1 << bit_shift
+        leaves.append(leaf)
+
+    indexes = [(msb, index) for (index, msb) in enumerate(msbs)]
+
+    # Cull duplicate leaves
+    i = 0
+    while i < len(leaves):
+        first_idx = leaves.index(leaves[i])
+        if first_idx == i:
+            i += 1
+        else:
+            for j in range(0, len(indexes)):
+                if indexes[j][1] == i:
+                    indexes[j] = (indexes[j][0], first_idx)
+                elif indexes[j][1] > i:
+                    indexes[j] = (indexes[j][0], indexes[j][1] - 1)
+
+            leaves.pop(i)
+
+    return (indexes, leaves)
+
+
+def make_ranges_table(
+    seqs: list[Codepoint],
+) -> tuple[list[tuple[int, int]], list[list[tuple[int, int]]]]:
+    """Generates 2-level lookup table for a binary property of a codepoint.
+    First level is all but the last byte, second level is ranges for last byte
+    """
+
+    prefixes_dict = defaultdict(list)
+    for cp in seqs:
+        prefixes_dict[cp >> 8].append(cp & 0xFF)
+
+    msbs: list[int] = list(prefixes_dict.keys())
+
+    leaves: list[list[tuple[int, int]]] = []
+    for cps in prefixes_dict.values():
+        leaf = []
+        for cp in cps:
+            if len(leaf) > 0 and leaf[-1][1] == cp - 1:
+                leaf[-1] = (leaf[-1][0], cp)
+            else:
+                leaf.append((cp, cp))
+        leaves.append(leaf)
+
+    indexes = [(msb, index) for (index, msb) in enumerate(msbs)]
+
+    # Cull duplicate leaves
+    i = 0
+    while i < len(leaves):
+        first_idx = leaves.index(leaves[i])
+        if first_idx == i:
+            i += 1
+        else:
+            for j in range(0, len(indexes)):
+                if indexes[j][1] == i:
+                    indexes[j] = (indexes[j][0], first_idx)
+                elif indexes[j][1] > i:
+                    indexes[j] = (indexes[j][0], indexes[j][1] - 1)
+
+            leaves.pop(i)
+
+    return (indexes, leaves)
+
+
+def lookup_fns(
+    is_cjk: bool,
+    special_ranges: list[tuple[tuple[Codepoint, Codepoint], WidthState]],
+    joining_group_lam: list[tuple[Codepoint, Codepoint]],
+) -> str:
+    if is_cjk:
+        cfg = '#[cfg(feature = "cjk")]\n'
+        cjk_lo = "_cjk"
+        cjk_cap = "_CJK"
+        ambig = "wide"
+    else:
+        cfg = ""
+        cjk_lo = ""
+        cjk_cap = ""
+        ambig = "narrow"
+    s = f"""
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
+/// consulting a multi-level lookup table.
+///
+/// # Maintenance
+/// The tables themselves are autogenerated but this function is hardcoded. You should have
+/// nothing to worry about if you re-run `unicode.py` (for example, when updating Unicode.)
+/// However, if you change the *actual structure* of the lookup tables (perhaps by editing the
+/// `make_tables` function in `unicode.py`) you must ensure that this code reflects those changes.
+{cfg}#[inline]
+fn lookup_width{cjk_lo}(c: char) -> (u8, WidthInfo) {{
+    let cp = c as usize;
+
+    let t1_offset = WIDTH_ROOT{cjk_cap}.0[cp >> {TABLE_SPLITS[1]}];
+
+    // Each sub-table in WIDTH_MIDDLE is 7 bits, and each stored entry is a byte,
+    // so each sub-table is 128 bytes in size.
+    // (Sub-tables are selected using the computed offset from the previous table.)
+    let t2_offset = WIDTH_MIDDLE.0[usize::from(t1_offset)][cp >> {TABLE_SPLITS[0]} & 0x{(2 ** (TABLE_SPLITS[1] - TABLE_SPLITS[0]) - 1):X}];
+
+    // Each sub-table in WIDTH_LEAVES is 6 bits, but each stored entry is 2 bits.
+    // This is accomplished by packing four stored entries into one byte.
+    // So each sub-table is 2**(7-2) == 32 bytes in size.
+    // Since this is the last table, each entry represents an encoded width.
+    let packed_widths = WIDTH_LEAVES.0[usize::from(t2_offset)][cp >> 2 & 0x{(2 ** (TABLE_SPLITS[0] - 2) - 1):X}];
+
+    // Extract the packed width
+    let width = packed_widths >> (2 * (cp & 0b11)) & 0b11;
+
+    if width < 3 {{
+        (width, WidthInfo::DEFAULT)
+    }} else {{
+        match c {{
+"""
+
+    for (lo, hi), width in special_ranges:
+        s += f"            '\\u{{{lo:X}}}'"
+        if hi != lo:
+            s += f"..='\\u{{{hi:X}}}'"
+        if width.is_carried():
+            width_info = width.name
+        else:
+            width_info = "DEFAULT"
+        s += f" => ({width.width_alone()}, WidthInfo::{width_info}),\n"
+
+    s += f"""            _ => (2, WidthInfo::EMOJI_PRESENTATION),
+        }}
+    }}
+}}
+
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`, or
+/// `None` if `c` is a control character.
+/// Ambiguous width characters are treated as {ambig}.
+{cfg}#[inline]
+pub fn single_char_width{cjk_lo}(c: char) -> Option<usize> {{
+    if c < '\\u{{7F}}' {{
+        if c >= '\\u{{20}}' {{
+            // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
+            Some(1)
+        }} else {{
+            // U+0000 to U+0020 (exclusive) are control codes
+            None
+        }}
+    }} else if c >= '\\u{{A0}}' {{
+        // No characters >= U+00A0 are control codes, so we can consult the lookup tables
+        Some(lookup_width{cjk_lo}(c).0.into())
+    }} else {{
+        // U+007F to U+00A0 (exclusive) are control codes
+        None
+    }}
+}}
+
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`.
+/// Ambiguous width characters are treated as {ambig}.
+{cfg}#[inline]
+fn width_in_str{cjk_lo}(c: char, mut next_info: WidthInfo) -> (i8, WidthInfo) {{
+    if next_info.is_emoji_presentation() {{
+        if starts_emoji_presentation_seq(c) {{
+            let width = if next_info.is_zwj_emoji_presentation() {{
+                0
+            }} else {{
+                2
+            }};
+            return (width, WidthInfo::EMOJI_PRESENTATION);
+        }} else {{
+            next_info = next_info.unset_emoji_presentation();
+        }}
+    }}"""
+
+    if is_cjk:
+        s += """
+    if (matches!(
+        next_info,
+        WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY | WidthInfo::SOLIDUS_OVERLAY_ALEF
+    ) && matches!(c, '<' | '=' | '>'))
+    {
+        return (2, WidthInfo::DEFAULT);
+    }"""
+
+    s += """
+    if c <= '\\u{A0}' {
+        match c {
+            '\\n' => (1, WidthInfo::LINE_FEED),
+            '\\r' if next_info == WidthInfo::LINE_FEED => (0, WidthInfo::DEFAULT),
+            _ => (1, WidthInfo::DEFAULT),
+        }
+    } else {
+        // Fast path
+        if next_info != WidthInfo::DEFAULT {
+            if c == '\\u{FE0F}' {
+                return (0, next_info.set_emoji_presentation());
+            }"""
+
+    if not is_cjk:
+        s += """
+            if c == '\\u{FE0E}' {
+                return (0, next_info.set_text_presentation());
+            }
+            if next_info.is_text_presentation() {
+                if starts_non_ideographic_text_presentation_seq(c) {
+                    return (1, WidthInfo::DEFAULT);
+                } else {
+                    next_info = next_info.unset_text_presentation();
+                }
+            }"""
+
+    s += """
+            if next_info.is_ligature_transparent() {
+                if c == '\\u{200D}' {
+                    return (0, next_info.set_zwj_bit());
+                } else if is_ligature_transparent(c) {
+                    return (0, next_info);
+                }
+            }
+
+            match (next_info, c) {"""
+    if is_cjk:
+        s += """
+                (WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY, _) if is_solidus_transparent(c) => {
+                    return (
+                        lookup_width_cjk(c).0 as i8,
+                        WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY,
+                    );
+                }
+                (WidthInfo::JOINING_GROUP_ALEF, '\\u{0338}') => {
+                    return (0, WidthInfo::SOLIDUS_OVERLAY_ALEF);
+                }
+                // Arabic Lam-Alef ligature
+                (
+                    WidthInfo::JOINING_GROUP_ALEF | WidthInfo::SOLIDUS_OVERLAY_ALEF,
+                    """
+    else:
+        s += """
+                // Arabic Lam-Alef ligature
+                (
+                    WidthInfo::JOINING_GROUP_ALEF,
+                    """
+
+    tail = False
+    for lo, hi in joining_group_lam:
+        if tail:
+            s += " | "
+        tail = True
+        s += f"'\\u{{{lo:X}}}'"
+        if hi != lo:
+            s += f"..='\\u{{{hi:X}}}'"
+    s += """,
+                ) => return (0, WidthInfo::DEFAULT),
+                (WidthInfo::JOINING_GROUP_ALEF, _) if is_transparent_zero_width(c) => {
+                    return (0, WidthInfo::JOINING_GROUP_ALEF);
+                }
+
+                // Hebrew Alef-ZWJ-Lamed ligature
+                (WidthInfo::ZWJ_HEBREW_LETTER_LAMED, '\\u{05D0}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Khmer coeng signs
+                (WidthInfo::KHMER_COENG_ELIGIBLE_LETTER, '\\u{17D2}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Buginese <a, -i> ZWJ ya ligature
+                (WidthInfo::ZWJ_BUGINESE_LETTER_YA, '\\u{1A17}') => {
+                    return (0, WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA)
+                }
+                (WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA, '\\u{1A15}') => {
+                    return (0, WidthInfo::DEFAULT)
+                }
+
+                // Tifinagh bi-consonants
+                (WidthInfo::TIFINAGH_CONSONANT | WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\\u{2D7F}') => {
+                    return (1, WidthInfo::TIFINAGH_JOINER_CONSONANT);
+                }
+                (WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\\u{2D31}'..='\\u{2D65}' | '\\u{2D6F}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+                (WidthInfo::TIFINAGH_JOINER_CONSONANT, '\\u{2D31}'..='\\u{2D65}' | '\\u{2D6F}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Lisu tone letter combinations
+                (WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU, '\\u{A4F8}'..='\\u{A4FB}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Old Turkic ligature
+                (WidthInfo::ZWJ_OLD_TURKIC_LETTER_ORKHON_I, '\\u{10C32}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }"""
+
+    s += f"""
+                // Emoji modifier
+                (WidthInfo::EMOJI_MODIFIER, _) if is_emoji_modifier_base(c) => {{
+                    return (0, WidthInfo::EMOJI_PRESENTATION);
+                }}
+
+                // Regional indicator
+                (
+                    WidthInfo::REGIONAL_INDICATOR | WidthInfo::SEVERAL_REGIONAL_INDICATOR,
+                    '\\u{{1F1E6}}'..='\\u{{1F1FF}}',
+                ) => return (1, WidthInfo::SEVERAL_REGIONAL_INDICATOR),
+
+                // ZWJ emoji
+                (
+                    WidthInfo::EMOJI_PRESENTATION
+                    | WidthInfo::SEVERAL_REGIONAL_INDICATOR
+                    | WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::EMOJI_MODIFIER,
+                    '\\u{{200D}}',
+                ) => return (0, WidthInfo::ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\\u{{20E3}}') => {{
+                    return (0, WidthInfo::KEYCAP_ZWJ_EMOJI_PRESENTATION);
+                }}
+                (WidthInfo::VS16_ZWJ_EMOJI_PRESENTATION, _) if starts_emoji_presentation_seq(c) => {{
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION, '0'..='9' | '#' | '*') => {{
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\\u{{1F1E6}}'..='\\u{{1F1FF}}') => {{
+                    return (1, WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION);
+                }}
+                (
+                    WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\\u{{1F1E6}}'..='\\u{{1F1FF}}',
+                ) => return (-1, WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (
+                    WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\\u{{1F1E6}}'..='\\u{{1F1FF}}',
+                ) => return (3, WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\\u{{1F3FB}}'..='\\u{{1F3FF}}') => {{
+                    return (0, WidthInfo::EMOJI_MODIFIER);
+                }}
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\\u{{E007F}}') => {{
+                    return (0, WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION);
+                }}
+                (WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION);
+                }}
+                (WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION)
+                }}
+                (WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0061}}'..='\\u{{E007A}}') => {{
+                    return (0, WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION)
+                }}
+                (
+                    WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION,
+                    '\\u{{E0030}}'..='\\u{{E0039}}',
+                ) => return (0, WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0030}}'..='\\u{{E0039}}') => {{
+                    return (0, WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION);
+                }}
+                (WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION, '\\u{{E0030}}'..='\\u{{E0039}}') => {{
+                    return (0, WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION);
+                }}
+                (
+                    WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION,
+                    '\\u{{1F3F4}}',
+                ) => return (0, WidthInfo::EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, _)
+                    if lookup_width{cjk_lo}(c).1 == WidthInfo::EMOJI_PRESENTATION =>
+                {{
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }}
+
+                // Fallback
+                _ => {{}}
+            }}
+        }}
+
+        let ret = lookup_width{cjk_lo}(c);
+        (ret.0 as i8, ret.1)
+    }}
+}}
+
+{cfg}#[inline]
+pub fn str_width{cjk_lo}(s: &str) -> usize {{
+    s.chars()
+        .rfold(
+            (0, WidthInfo::DEFAULT),
+            |(sum, next_info), c| -> (usize, WidthInfo) {{
+                let (add, info) = width_in_str{cjk_lo}(c, next_info);
+                (sum.wrapping_add_signed(isize::from(add)), info)
+            }},
+        )
+        .0
+}}
+"""
+
+    return s
 
 
 def emit_module(
-    out_name: str, unicode_version: "tuple[int, int, int]", tables: "list[Table]"
+    out_name: str,
+    unicode_version: tuple[int, int, int],
+    tables: list[Table],
+    special_ranges: list[tuple[tuple[Codepoint, Codepoint], WidthState]],
+    special_ranges_cjk: list[tuple[tuple[Codepoint, Codepoint], WidthState]],
+    emoji_presentation_table: tuple[list[tuple[int, int]], list[list[int]]],
+    text_presentation_table: tuple[list[tuple[int, int]], list[list[tuple[int, int]]]],
+    emoji_modifier_table: tuple[list[tuple[int, int]], list[list[tuple[int, int]]]],
+    joining_group_lam: list[tuple[Codepoint, Codepoint]],
+    non_transparent_zero_widths: list[tuple[Codepoint, Codepoint]],
+    ligature_transparent: list[tuple[Codepoint, Codepoint]],
+    solidus_transparent: list[tuple[Codepoint, Codepoint]],
+    normalization_tests: list[tuple[str, str, str, str, str]],
 ):
     """Outputs a Rust module to `out_name` using table data from `tables`.
-    If `TABLE_CFGS` is edited, you may need to edit the included code for `lookup_width`."""
+    If `TABLE_CFGS` is edited, you may need to edit the included code for `lookup_width`.
+    """
     if os.path.exists(out_name):
         os.remove(out_name)
     with open(out_name, "w", newline="\n", encoding="utf-8") as module:
@@ -342,164 +1544,610 @@
 // except according to those terms.
 
 // NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+
+use core::cmp::Ordering;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct WidthInfo(u16);
+
+impl WidthInfo {
+    /// No special handling necessary
+    const DEFAULT: Self = Self(0);
 """
         )
+
+        for variant in WidthState:
+            if variant.is_carried():
+                if variant.is_cjk_only():
+                    module.write('    #[cfg(feature = "cjk")]\n')
+                module.write(
+                    f"    const {variant.name}: Self = Self(0b{variant.value:016b});\n"
+                )
+
         module.write(
             f"""
+    /// Whether this width mode is ligature_transparent
+    /// (has 5th MSB set.)
+    fn is_ligature_transparent(self) -> bool {{
+        (self.0 & 0b0000_1000_0000_0000) == 0b0000_1000_0000_0000
+    }}
+
+    /// Sets 6th MSB.
+    fn set_zwj_bit(self) -> Self {{
+        Self(self.0 | 0b0000_0100_0000_0000)
+    }}
+
+    /// Has top bit set
+    fn is_emoji_presentation(self) -> bool {{
+        (self.0 & 0b1000_0000_0000_0000) == 0b1000_0000_0000_0000
+    }}
+
+    /// Has top bit set
+    fn is_zwj_emoji_presentation(self) -> bool {{
+        (self.0 & 0b1011_0000_0000_0000) == 0b1001_0000_0000_0000
+    }}
+
+    /// Set top bit
+    fn set_emoji_presentation(self) -> Self {{
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000
+            || (self.0 & 0b1001_0000_0000_0000) == 0b0001_0000_0000_0000
+        {{
+            Self(self.0 | 0b1000_0000_0000_0000)
+        }} else {{
+            Self::VARIATION_SELECTOR_16
+        }}
+    }}
+
+    /// Clear top bit
+    fn unset_emoji_presentation(self) -> Self {{
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000 {{
+            Self(self.0 & 0b0111_1111_1111_1111)
+        }} else {{
+            Self::DEFAULT
+        }}
+    }}
+
+    /// Has 2nd bit set
+    fn is_text_presentation(self) -> bool {{
+        (self.0 & 0b0100_0000_0000_0000) == 0b0100_0000_0000_0000
+    }}
+
+    /// Set 2nd bit
+    fn set_text_presentation(self) -> Self {{
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000 {{
+            Self(self.0 | 0b0100_0000_0000_0000)
+        }} else {{
+            Self(0b0100_0000_0000_0000)
+        }}
+    }}
+
+    /// Clear 2nd bit
+    fn unset_text_presentation(self) -> Self {{
+        Self(self.0 & 0b1011_1111_1111_1111)
+    }}
+}}
+
 /// The version of [Unicode](http://www.unicode.org/)
 /// that this version of unicode-width is based on.
 pub const UNICODE_VERSION: (u8, u8, u8) = {unicode_version};
 """
         )
 
+        module.write(lookup_fns(False, special_ranges, joining_group_lam))
+        module.write(lookup_fns(True, special_ranges_cjk, joining_group_lam))
+
+        emoji_presentation_idx, emoji_presentation_leaves = emoji_presentation_table
+        text_presentation_idx, text_presentation_leaves = text_presentation_table
+        emoji_modifier_idx, emoji_modifier_leaves = emoji_modifier_table
+
         module.write(
             """
-pub mod charwidth {
-    use core::option::Option::{self, None, Some};
-
-    /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
-    /// consulting a multi-level lookup table.
-    /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
-    /// they're treated as single width.
-    ///
-    /// # Maintenance
-    /// The tables themselves are autogenerated but this function is hardcoded. You should have
-    /// nothing to worry about if you re-run `unicode.py` (for example, when updating Unicode.)
-    /// However, if you change the *actual structure* of the lookup tables (perhaps by editing the
-    /// `TABLE_CFGS` global in `unicode.py`) you must ensure that this code reflects those changes.
-    #[inline]
-    fn lookup_width(c: char, is_cjk: bool) -> usize {
-        let cp = c as usize;
-
-        let t1_offset = TABLES_0[cp >> 13 & 0xFF];
-
-        // Each sub-table in TABLES_1 is 7 bits, and each stored entry is a byte,
-        // so each sub-table is 128 bytes in size.
-        // (Sub-tables are selected using the computed offset from the previous table.)
-        let t2_offset = TABLES_1[128 * usize::from(t1_offset) + (cp >> 6 & 0x7F)];
-
-        // Each sub-table in TABLES_2 is 6 bits, but each stored entry is 2 bits.
-        // This is accomplished by packing four stored entries into one byte.
-        // So each sub-table is 2**(6-2) == 16 bytes in size.
-        // Since this is the last table, each entry represents an encoded width.
-        let packed_widths = TABLES_2[16 * usize::from(t2_offset) + (cp >> 2 & 0xF)];
-
-        // Extract the packed width
-        let width = packed_widths >> (2 * (cp & 0b11)) & 0b11;
-
-        // A width of 3 signifies that the codepoint is ambiguous width.
-        if width == 3 {
-            if is_cjk {
-                2
-            } else {
-                1
-            }
-        } else {
-            width.into()
-        }
+/// Whether this character is a zero-width character with
+/// `Joining_Type=Transparent`. Used by the Alef-Lamed ligatures.
+/// See also [`is_ligature_transparent`], a near-subset of this (only ZWJ is excepted)
+/// which is transparent for non-Arabic ligatures.
+fn is_transparent_zero_width(c: char) -> bool {
+    if lookup_width(c).0 != 0 {
+        // Not zero-width
+        false
+    } else {
+        let cp: u32 = c.into();
+        NON_TRANSPARENT_ZERO_WIDTHS
+            .binary_search_by(|&(lo, hi)| {
+                let lo = u32::from_le_bytes([lo[0], lo[1], lo[2], 0]);
+                let hi = u32::from_le_bytes([hi[0], hi[1], hi[2], 0]);
+                if cp < lo {
+                    Ordering::Greater
+                } else if cp > hi {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            })
+            .is_err()
     }
+}
+
+/// Whether this character is a default-ignorable combining mark
+/// or ZWJ. These characters won't interrupt non-Arabic ligatures.
+fn is_ligature_transparent(c: char) -> bool {
+    matches!(c, """
+        )
+
+        tail = False
+        for lo, hi in ligature_transparent:
+            if tail:
+                module.write(" | ")
+            tail = True
+            module.write(f"'\\u{{{lo:X}}}'")
+            if hi != lo:
+                module.write(f"..='\\u{{{hi:X}}}'")
+
+        module.write(
+            """)
+}
+
+/// Whether this character is transparent wrt the effect of
+/// U+0338 COMBINING LONG SOLIDUS OVERLAY
+/// on its base character.
+#[cfg(feature = "cjk")]
+fn is_solidus_transparent(c: char) -> bool {
+    let cp: u32 = c.into();
+    is_ligature_transparent(c)
+        || SOLIDUS_TRANSPARENT
+            .binary_search_by(|&(lo, hi)| {
+                let lo = u32::from_le_bytes([lo[0], lo[1], lo[2], 0]);
+                let hi = u32::from_le_bytes([hi[0], hi[1], hi[2], 0]);
+                if cp < lo {
+                    Ordering::Greater
+                } else if cp > hi {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            })
+            .is_ok()
+}
+
+/// Whether this character forms an [emoji presentation sequence]
+/// (https://www.unicode.org/reports/tr51/#def_emoji_presentation_sequence)
+/// when followed by `'\\u{FEOF}'`.
+/// Emoji presentation sequences are considered to have width 2.
+#[inline]
+pub fn starts_emoji_presentation_seq(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 10 LSB
+    let top_bits = cp >> 10;
+    let idx_of_leaf: usize = match top_bits {
 """
         )
 
+        for msbs, i in emoji_presentation_idx:
+            module.write(f"        0x{msbs:X} => {i},\n")
+
         module.write(
-            """
-    /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`, or
-    /// `None` if `c` is a control character other than `'\\x00'`.
-    /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
-    /// they're treated as single width.
-    #[inline]
-    pub fn width(c: char, is_cjk: bool) -> Option<usize> {
-        if c < '\\u{7F}' {
-            if c >= '\\u{20}' {
-                // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
-                Some(1)
-            } else if c == '\\0' {
-                // U+0000 *is* a control code, but it's special-cased
-                Some(0)
-            } else {
-                // U+0001 to U+0020 (exclusive) are control codes
-                None
-            }
-        } else if c >= '\\u{A0}' {
-            // No characters >= U+00A0 are control codes, so we can consult the lookup tables
-            Some(lookup_width(c, is_cjk))
+            """        _ => return false,
+    };
+    // Extract the 3-9th (0-indexed) least significant bits of `cp`,
+    // and use them to index into `leaf_row`.
+    let idx_within_leaf = usize::try_from((cp >> 3) & 0x7F).unwrap();
+    let leaf_byte = EMOJI_PRESENTATION_LEAVES.0[idx_of_leaf][idx_within_leaf];
+    // Use the 3 LSB of `cp` to index into `leaf_byte`.
+    ((leaf_byte >> (cp & 7)) & 1) == 1
+}
+
+/// Returns `true` if `c` has default emoji presentation, but forms a [text presentation sequence]
+/// (https://www.unicode.org/reports/tr51/#def_text_presentation_sequence)
+/// when followed by `'\\u{FEOE}'`, and is not ideographic.
+/// Such sequences are considered to have width 1.
+#[inline]
+pub fn starts_non_ideographic_text_presentation_seq(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 8 LSB
+    let top_bits = cp >> 8;
+    let leaf: &[(u8, u8)] = match top_bits {
+"""
+        )
+
+        for msbs, i in text_presentation_idx:
+            module.write(f"        0x{msbs:X} => &TEXT_PRESENTATION_LEAF_{i},\n")
+
+        module.write(
+            """        _ => return false,
+    };
+
+    let bottom_bits = (cp & 0xFF) as u8;
+    leaf.binary_search_by(|&(lo, hi)| {
+        if bottom_bits < lo {
+            Ordering::Greater
+        } else if bottom_bits > hi {
+            Ordering::Less
         } else {
-            // U+007F to U+00A0 (exclusive) are control codes
-            None
+            Ordering::Equal
         }
-    }
+    })
+    .is_ok()
+}
+
+/// Returns `true` if `c` is an `Emoji_Modifier_Base`.
+#[inline]
+pub fn is_emoji_modifier_base(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 8 LSB
+    let top_bits = cp >> 8;
+    let leaf: &[(u8, u8)] = match top_bits {
+"""
+        )
+
+        for msbs, i in emoji_modifier_idx:
+            module.write(f"        0x{msbs:X} => &EMOJI_MODIFIER_LEAF_{i},\n")
+
+        module.write(
+            """        _ => return false,
+    };
+
+    let bottom_bits = (cp & 0xFF) as u8;
+    leaf.binary_search_by(|&(lo, hi)| {
+        if bottom_bits < lo {
+            Ordering::Greater
+        } else if bottom_bits > hi {
+            Ordering::Less
+        } else {
+            Ordering::Equal
+        }
+    })
+    .is_ok()
+}
+
+#[repr(align(32))]
+struct Align32<T>(T);
+
+#[repr(align(64))]
+struct Align64<T>(T);
+
+#[repr(align(128))]
+struct Align128<T>(T);
 """
         )
 
         subtable_count = 1
-        for (i, table) in enumerate(tables):
+        for i, table in enumerate(tables):
             new_subtable_count = len(table.buckets())
             if i == len(tables) - 1:
                 table.indices_to_widths()  # for the last table, indices == widths
             byte_array = table.to_bytes()
+
+            if table.bytes_per_row is None:
+                module.write(
+                    f"/// Autogenerated. {subtable_count} sub-table(s). Consult [`lookup_width`] for layout info.)\n"
+                )
+                if table.cfged:
+                    module.write('#[cfg(feature = "cjk")]\n')
+                module.write(
+                    f"static {table.name}: Align{table.align}<[u8; {len(byte_array)}]> = Align{table.align}(["
+                )
+                for j, byte in enumerate(byte_array):
+                    # Add line breaks for every 15th entry (chosen to match what rustfmt does)
+                    if j % 16 == 0:
+                        module.write("\n   ")
+                    module.write(f" 0x{byte:02X},")
+                module.write("\n")
+            else:
+                num_rows = len(byte_array) // table.bytes_per_row
+                num_primary_rows = (
+                    table.primary_len
+                    // (8 // int(table.offset_type))
+                    // table.bytes_per_row
+                )
+                module.write(
+                    f"""
+#[cfg(feature = "cjk")]
+const {table.name}_LEN: usize = {num_rows};
+#[cfg(not(feature = "cjk"))]
+const {table.name}_LEN: usize = {num_primary_rows};
+/// Autogenerated. {subtable_count} sub-table(s). Consult [`lookup_width`] for layout info.
+static {table.name}: Align{table.align}<[[u8; {table.bytes_per_row}]; {table.name}_LEN]> = Align{table.align}([\n"""
+                )
+                for row_num in range(0, num_rows):
+                    if row_num >= num_primary_rows:
+                        module.write('    #[cfg(feature = "cjk")]\n')
+                    module.write("    [\n")
+                    row = byte_array[
+                        row_num
+                        * table.bytes_per_row : (row_num + 1)
+                        * table.bytes_per_row
+                    ]
+                    for subrow in batched(row, 15):
+                        module.write("       ")
+                        for entry in subrow:
+                            module.write(f" 0x{entry:02X},")
+                        module.write("\n")
+                    module.write("    ],\n")
+            module.write("]);\n")
+            subtable_count = new_subtable_count
+
+        # non transparent zero width table
+
+        module.write(
+            f"""
+/// Sorted list of codepoint ranges (inclusive)
+/// that are zero-width but not `Joining_Type=Transparent`
+/// FIXME: can we get better compression?
+static NON_TRANSPARENT_ZERO_WIDTHS: [([u8; 3], [u8; 3]); {len(non_transparent_zero_widths)}] = [
+"""
+        )
+
+        for lo, hi in non_transparent_zero_widths:
+            module.write(
+                f"    ([0x{lo & 0xFF:02X}, 0x{lo >> 8 & 0xFF:02X}, 0x{lo >> 16:02X}], [0x{hi & 0xFF:02X}, 0x{hi >> 8 & 0xFF:02X}, 0x{hi >> 16:02X}]),\n"
+            )
+
+        # solidus transparent table
+
+        module.write(
+            f"""];
+
+/// Sorted list of codepoint ranges (inclusive)
+/// that don't affect how the combining solidus applies
+/// (mostly ccc > 1).
+/// FIXME: can we get better compression?
+#[cfg(feature = "cjk")]
+static SOLIDUS_TRANSPARENT: [([u8; 3], [u8; 3]); {len(solidus_transparent)}] = [
+"""
+        )
+
+        for lo, hi in solidus_transparent:
+            module.write(
+                f"    ([0x{lo & 0xFF:02X}, 0x{lo >> 8 & 0xFF:02X}, 0x{lo >> 16:02X}], [0x{hi & 0xFF:02X}, 0x{hi >> 8 & 0xFF:02X}, 0x{hi >> 16:02X}]),\n"
+            )
+
+        # emoji table
+
+        module.write(
+            f"""];
+
+/// Array of 1024-bit bitmaps. Index into the correct bitmap with the 10 LSB of your codepoint
+/// to get whether it can start an emoji presentation sequence.
+static EMOJI_PRESENTATION_LEAVES: Align128<[[u8; 128]; {len(emoji_presentation_leaves)}]> = Align128([
+"""
+        )
+        for leaf in emoji_presentation_leaves:
+            module.write("    [\n")
+            for row in batched(leaf, 15):
+                module.write("       ")
+                for entry in row:
+                    module.write(f" 0x{entry:02X},")
+                module.write("\n")
+            module.write("    ],\n")
+
+        module.write("]);\n")
+
+        # text table
+
+        for leaf_idx, leaf in enumerate(text_presentation_leaves):
             module.write(
                 f"""
-    /// Autogenerated. {subtable_count} sub-table(s). Consult [`lookup_width`] for layout info.
-    static TABLES_{i}: [u8; {len(byte_array)}] = ["""
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_{leaf_idx}: [(u8, u8); {len(leaf)}] = [
+"""
             )
-            for (j, byte) in enumerate(byte_array):
-                # Add line breaks for every 15th entry (chosen to match what rustfmt does)
-                if j % 15 == 0:
-                    module.write("\n       ")
-                module.write(f" 0x{byte:02X},")
-            module.write("\n    ];\n")
-            subtable_count = new_subtable_count
-        module.write("}\n")
+            for lo, hi in leaf:
+                module.write(f"    (0x{lo:02X}, 0x{hi:02X}),\n")
+            module.write(f"];\n")
+
+        # emoji modifier table
+
+        for leaf_idx, leaf in enumerate(emoji_modifier_leaves):
+            module.write(
+                f"""
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_{leaf_idx}: [(u8, u8); {len(leaf)}] = [
+"""
+            )
+            for lo, hi in leaf:
+                module.write(f"    (0x{lo:02X}, 0x{hi:02X}),\n")
+            module.write(f"];\n")
+
+        test_width_variants = []
+        test_width_variants_cjk = []
+        for variant in WidthState:
+            if variant.is_carried():
+                if not variant.is_cjk_only():
+                    test_width_variants.append(variant)
+                if not variant.is_non_cjk_only():
+                    test_width_variants_cjk.append(variant)
+
+        module.write(
+            f"""
+#[cfg(test)]
+mod tests {{
+    use super::*;
+
+    fn str_width_test(s: &str, init: WidthInfo) -> isize {{
+        s.chars()
+            .rfold((0, init), |(sum, next_info), c| -> (isize, WidthInfo) {{
+                let (add, info) = width_in_str(c, next_info);
+                (sum.checked_add(isize::from(add)).unwrap(), info)
+            }})
+            .0
+    }}
+
+    #[cfg(feature = "cjk")]
+    fn str_width_test_cjk(s: &str, init: WidthInfo) -> isize {{
+        s.chars()
+            .rfold((0, init), |(sum, next_info), c| -> (isize, WidthInfo) {{
+                let (add, info) = width_in_str_cjk(c, next_info);
+                (sum.checked_add(isize::from(add)).unwrap(), info)
+            }})
+            .0
+    }}
+
+    #[test]
+    fn test_normalization() {{
+        for &(orig, nfc, nfd, nfkc, nfkd) in &NORMALIZATION_TEST {{
+            for init in NORMALIZATION_TEST_WIDTHS {{
+                assert_eq!(
+                    str_width_test(orig, init),
+                    str_width_test(nfc, init),
+                    "width of X = {{orig:?}} differs from toNFC(X) = {{nfc:?}} with mode {{init:X?}}",
+                );
+                assert_eq!(
+                    str_width_test(orig, init),
+                    str_width_test(nfd, init),
+                    "width of X = {{orig:?}} differs from toNFD(X) = {{nfd:?}} with mode {{init:X?}}",
+                );
+                assert_eq!(
+                    str_width_test(nfkc, init),
+                    str_width_test(nfkd, init),
+                    "width of toNFKC(X) = {{nfkc:?}} differs from toNFKD(X) = {{nfkd:?}} with mode {{init:X?}}",
+                );
+            }}
+
+            #[cfg(feature = "cjk")]
+            for init in NORMALIZATION_TEST_WIDTHS_CJK {{
+                assert_eq!(
+                    str_width_test_cjk(orig, init),
+                    str_width_test_cjk(nfc, init),
+                    "CJK width of X = {{orig:?}} differs from toNFC(X) = {{nfc:?}} with mode {{init:X?}}",
+                );
+                assert_eq!(
+                    str_width_test_cjk(orig, init),
+                    str_width_test_cjk(nfd, init),
+                    "CJK width of X = {{orig:?}} differs from toNFD(X) = {{nfd:?}} with mode {{init:X?}}",
+                );
+                assert_eq!(
+                    str_width_test_cjk(nfkc, init),
+                    str_width_test_cjk(nfkd, init),
+                    "CJK width of toNFKC(X) = {{nfkc:?}} differs from toNFKD(X) = {{nfkd:?}} with mode {{init:?}}",
+                );
+            }}
+        }}
+    }}
+
+    static NORMALIZATION_TEST_WIDTHS: [WidthInfo; {len(test_width_variants) + 1}] = [
+        WidthInfo::DEFAULT,\n"""
+        )
+
+        for variant in WidthState:
+            if variant.is_carried() and not variant.is_cjk_only():
+                module.write(f"        WidthInfo::{variant.name},\n")
+
+        module.write(
+            f"""    ];
+
+    #[cfg(feature = "cjk")]
+    static NORMALIZATION_TEST_WIDTHS_CJK: [WidthInfo; {len(test_width_variants_cjk) + 1}] = [
+        WidthInfo::DEFAULT,\n"""
+        )
+
+        for variant in WidthState:
+            if variant.is_carried() and not variant.is_non_cjk_only():
+                module.write(f"        WidthInfo::{variant.name},\n")
+
+        module.write(
+            f"""    ];
+
+    #[rustfmt::skip]
+    static NORMALIZATION_TEST: [(&str, &str, &str, &str, &str); {len(normalization_tests)}] = [\n"""
+        )
+        for orig, nfc, nfd, nfkc, nfkd in normalization_tests:
+            module.write(
+                f'        (r#"{orig}"#, r#"{nfc}"#, r#"{nfd}"#, r#"{nfkc}"#, r#"{nfkd}"#),\n'
+            )
+
+        module.write("    ];\n}\n")
 
 
-def main(module_filename: str):
+def main(module_path: str):
     """Obtain character data from the latest version of Unicode, transform it into a multi-level
     lookup table for character width, and write a Rust module utilizing that table to
     `module_filename`.
 
-    We obey the following rules in decreasing order of importance:
-    - The soft hyphen (`U+00AD`) is single-width.
-    - Hangul Jamo medial vowels & final consonants (`U+1160..=U+11FF`) are zero-width.
-    - All codepoints in general categories `Cc`, `Cf`, `Mn`, and `Me` are zero-width.
-    - All codepoints with an East Asian Width of `Ambigous` are ambiguous-width.
-    - All codepoints with an East Asian Width of `Wide` or `Fullwidth` are double-width.
-    - All other codepoints (including unassigned codepoints and codepoints with an East Asian Width
-    of `Neutral`, `Narrow`, or `Halfwidth`) are single-width.
-
-    These rules are based off of Markus Kuhn's free `wcwidth()` implementation:
-    http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c"""
+    See `lib.rs` for documentation of the exact width rules.
+    """
     version = load_unicode_version()
     print(f"Generating module for Unicode {version[0]}.{version[1]}.{version[2]}")
 
-    eaw_map = load_east_asian_widths()
-    zw_map = load_zero_widths()
+    (width_map, cjk_width_map) = load_width_maps()
 
-    # Characters marked as zero-width in zw_map should be zero-width in the final map
-    width_map = list(
-        map(lambda x: EffectiveWidth.ZERO if x[1] else x[0], zip(eaw_map, zw_map))
-    )
+    tables = make_tables(width_map, cjk_width_map)
 
-    # Override for soft hyphen
-    width_map[0x00AD] = EffectiveWidth.NARROW
+    special_ranges = make_special_ranges(width_map)
+    cjk_special_ranges = make_special_ranges(cjk_width_map)
 
-    # Override for Hangul Jamo medial vowels & final consonants
-    for i in range(0x1160, 0x11FF + 1):
-        width_map[i] = EffectiveWidth.ZERO
+    emoji_presentations = load_emoji_presentation_sequences()
+    emoji_presentation_table = make_presentation_sequence_table(emoji_presentations)
 
-    tables = make_tables(TABLE_CFGS, enumerate(width_map))
+    text_presentations = load_text_presentation_sequences()
+    text_presentation_table = make_ranges_table(text_presentations)
+
+    emoji_modifier_bases = load_emoji_modifier_bases()
+    emoji_modifier_table = make_ranges_table(emoji_modifier_bases)
+
+    joining_group_lam = load_joining_group_lam()
+    non_transparent_zero_widths = load_non_transparent_zero_widths(width_map)
+    ligature_transparent = load_ligature_transparent()
+    solidus_transparent = load_solidus_transparent(ligature_transparent, cjk_width_map)
+
+    normalization_tests = load_normalization_tests()
+
+    fetch_open("emoji-test.txt", "../tests", emoji=True)
 
     print("------------------------")
     total_size = 0
-    for (i, table) in enumerate(tables):
+    for i, table in enumerate(tables):
         size_bytes = len(table.to_bytes())
-        print(f"Table {i} Size: {size_bytes} bytes")
+        print(f"Table {i} size: {size_bytes} bytes")
         total_size += size_bytes
-    print("------------------------")
-    print(f"  Total Size: {total_size} bytes")
 
-    emit_module(module_filename, version, tables)
-    print(f'Wrote to "{module_filename}"')
+    for s, table in [
+        ("Emoji presentation", emoji_presentation_table),
+    ]:
+        index_size = len(table[0]) * (math.ceil(math.log(table[0][-1][0], 256)) + 8)
+        print(f"{s} index size: {index_size} bytes")
+        total_size += index_size
+        leaves_size = len(table[1]) * len(table[1][0])
+        print(f"{s} leaves size: {leaves_size} bytes")
+        total_size += leaves_size
+
+    for s, table in [
+        ("Text presentation", text_presentation_table),
+        ("Emoji modifier", emoji_modifier_table),
+    ]:
+        index_size = len(table[0]) * (math.ceil(math.log(table[0][-1][0], 256)) + 16)
+        print(f"{s} index size: {index_size} bytes")
+        total_size += index_size
+        leaves_size = 2 * sum(map(len, table[1]))
+        print(f"{s} leaves size: {leaves_size} bytes")
+        total_size += leaves_size
+
+    for s, table in [
+        ("Non transparent zero width", non_transparent_zero_widths),
+        ("Solidus transparent", solidus_transparent),
+    ]:
+        table_size = 6 * len(table)
+        print(f"{s} table size: {table_size} bytes")
+        total_size += table_size
+    print("------------------------")
+    print(f"  Total size: {total_size} bytes")
+
+    emit_module(
+        out_name=module_path,
+        unicode_version=version,
+        tables=tables,
+        special_ranges=special_ranges,
+        special_ranges_cjk=cjk_special_ranges,
+        emoji_presentation_table=emoji_presentation_table,
+        text_presentation_table=text_presentation_table,
+        emoji_modifier_table=emoji_modifier_table,
+        joining_group_lam=joining_group_lam,
+        non_transparent_zero_widths=non_transparent_zero_widths,
+        ligature_transparent=ligature_transparent,
+        solidus_transparent=solidus_transparent,
+        normalization_tests=normalization_tests,
+    )
+    print(f'Wrote to "{module_path}"')
 
 
 if __name__ == "__main__":
-    main(MODULE_FILENAME)
+    main(MODULE_PATH)

crates/unicode-width/src/lib.rs

diff --git a/crates/unicode-width/src/lib.rs b/crates/unicode-width/src/lib.rs
index fac45fc..71b5d70 100644
--- a/crates/unicode-width/src/lib.rs
+++ b/crates/unicode-width/src/lib.rs
@@ -10,64 +10,189 @@
 
 //! Determine displayed width of `char` and `str` types according to
 //! [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
-//! rules.
+//! and other portions of the Unicode standard.
+//! See the [Rules for determining width](#rules-for-determining-width) section
+//! for the exact rules.
+//!
+//! This crate is `#![no_std]`.
 //!
 //! ```rust
-//! extern crate unicode_width;
-//!
 //! use unicode_width::UnicodeWidthStr;
 //!
-//! fn main() {
-//!     let teststr = "Ｈｅｌｌｏ, ｗｏｒｌｄ!";
-//!     let width = UnicodeWidthStr::width(teststr);
-//!     println!("{}", teststr);
-//!     println!("The above string is {} columns wide.", width);
-//!     let width = teststr.width_cjk();
-//!     println!("The above string is {} columns wide (CJK).", width);
-//! }
+//! let teststr = "Ｈｅｌｌｏ, ｗｏｒｌｄ!";
+//! let width = UnicodeWidthStr::width(teststr);
+//! println!("{}", teststr);
+//! println!("The above string is {} columns wide.", width);
 //! ```
 //!
-//! # features
+//! # `"cjk"` feature flag
 //!
-//! unicode-width supports a `no_std` feature. This eliminates dependence
-//! on std, and instead uses equivalent functions from core.
+//! This crate has one Cargo feature flag, `"cjk"`
+//! (enabled by default).
+//! It enables the [`UnicodeWidthChar::width_cjk`]
+//! and [`UnicodeWidthStr::width_cjk`],
+//! which perform an alternate width calculation
+//! more suited to CJK contexts. The flag also unseals the
+//! [`UnicodeWidthChar`] and [`UnicodeWidthStr`] traits.
 //!
-//! # crates.io
+//! Disabling the flag (with `no_default_features` in `Cargo.toml`)
+//! will reduce the amount of static data needed by the crate.
 //!
-//! You can use this package in your project by adding the following
-//! to your `Cargo.toml`:
+//! ```rust
+//! use unicode_width::UnicodeWidthStr;
 //!
-//! ```toml
-//! [dependencies]
-//! unicode-width = "0.1.5"
+//! let teststr = "“𘀀”";
+//! assert_eq!(teststr.width(), 4);
+//!
+//! #[cfg(feature = "cjk")]
+//! assert_eq!(teststr.width_cjk(), 6);
 //! ```
+//!
+//! # Rules for determining width
+//!
+//! This crate currently uses the following rules to determine the width of a
+//! character or string, in order of decreasing precedence. These may be tweaked in the future.
+//!
+//! 1. In the following cases, the width of a string differs from the sum of the widths of its constituent characters:
+//!    - The sequence `"\r\n"` has width 1.
+//!    - Emoji-specific ligatures:
+//!      - Well-formed, fully-qualified [emoji ZWJ sequences] have width 2.
+//!      - [Emoji modifier sequences] have width 2.
+//!      - [Emoji presentation sequences] have width 2.
+//!      - Outside of an East Asian context, [text presentation sequences] have width 1 if their base character:
+//!        - Has the [`Emoji_Presentation`] property, and
+//!        - Is not in the [Enclosed Ideographic Supplement] block.
+//!    - Script-specific ligatures:
+//!      - For all the following ligatures, the insertion of any number of [default-ignorable][`Default_Ignorable_Code_Point`]
+//!        [combining marks] anywhere in the sequence will not change the total width. In addition, for all non-Arabic
+//!        ligatures, the insertion of any number of [`'\u{200D}'` ZERO WIDTH JOINER](https://www.unicode.org/versions/Unicode15.0.0/ch23.pdf#G23126)s
+//!        will not affect the width.
+//!      - **[Arabic]**: A character sequence consisting of one character with [`Joining_Group`]`=Lam`,
+//!        followed by any number of characters with [`Joining_Type`]`=Transparent`, followed by one character
+//!        with [`Joining_Group`]`=Alef`, has total width 1. For example: `لا`‎, `لآ`‎, `ڸا`‎, `لٟٞأ`
+//!      - **[Buginese]**: `"\u{1A15}\u{1A17}\u{200D}\u{1A10}"` (<a, -i> ya, `ᨕᨗ‍ᨐ`) has total width 1.
+//!      - **[Hebrew]**: `"א\u{200D}ל"` (Alef-Lamed, `א‍ל`) has total width 1.
+//!      - **[Khmer]**: Coeng signs consisting of `'\u{17D2}'` followed by a character in
+//!        `'\u{1780}'..='\u{1782}' | '\u{1784}'..='\u{1787}' | '\u{1789}'..='\u{178C}' | '\u{178E}'..='\u{1793}' | '\u{1795}'..='\u{1798}' | '\u{179B}'..='\u{179D}' | '\u{17A0}' | '\u{17A2}'  | '\u{17A7}' | '\u{17AB}'..='\u{17AC}' | '\u{17AF}'`
+//!        have width 0.
+//!      - **[Lisu]**: Tone letter combinations consisting of a character in the range `'\u{A4F8}'..='\u{A4FB}'`
+//!        followed by a character in the range `'\u{A4FC}'..='\u{A4FD}'` have width 1. For example: `ꓹꓼ`
+//!      - **[Old Turkic]**: `"\u{10C32}\u{200D}\u{10C03}"` (`𐰲‍𐰃`) has total width 1.
+//!      - **[Tifinagh]**: A sequence of a Tifinagh consonant in the range `'\u{2D31}'..='\u{2D65}' | '\u{2D6F}'`, followed by either
+//!        [`'\u{2D7F}'` TIFINAGH CONSONANT JOINER] or `'\u{200D}'`, followed by another Tifinangh consonant, has total width 1.
+//!        For example: `ⵏ⵿ⴾ`
+//!    - In an East Asian context only, `<`, `=`, or `>` have width 2 when followed by [`'\u{0338}'` COMBINING LONG SOLIDUS OVERLAY].
+//!      The two characters may be separated by any number of characters whose canonical decompositions consist only of characters meeting
+//!      one of the following requirements:
+//!      - Has [`Canonical_Combining_Class`] greater than 1, or
+//!      - Is a [default-ignorable][`Default_Ignorable_Code_Point`] [combining mark][combining marks].
+//! 2. In all other cases, the width of the string equals the sum of its character widths:
+//!    1. [`'\u{2D7F}'` TIFINAGH CONSONANT JOINER] has width 1 (outside of the ligatures described previously).
+//!    2. [`'\u{115F}'` HANGUL CHOSEONG FILLER](https://util.unicode.org/UnicodeJsps/character.jsp?a=115F) and
+//!       [`'\u{17A4}'` KHMER INDEPENDENT VOWEL QAA](https://util.unicode.org/UnicodeJsps/character.jsp?a=17A4) have width 2.
+//!    3. [`'\u{17D8}'` KHMER SIGN BEYYAL](https://util.unicode.org/UnicodeJsps/character.jsp?a=17D8) has width 3.
+//!    4. The following have width 0:
+//!       - [Characters](https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BDefault_Ignorable_Code_Point%7D)
+//!         with the [`Default_Ignorable_Code_Point`] property.
+//!       - [Characters](https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BGrapheme_Extend%7D)
+//!         with the [`Grapheme_Extend`] property.
+//!       - The following 8 characters, all of which have NFD decompositions consisting of two [`Grapheme_Extend`] characters:
+//!         - [`'\u{0CC0}'` KANNADA VOWEL SIGN II](https://util.unicode.org/UnicodeJsps/character.jsp?a=0CC0),
+//!         - [`'\u{0CC7}'` KANNADA VOWEL SIGN EE](https://util.unicode.org/UnicodeJsps/character.jsp?a=0CC7),
+//!         - [`'\u{0CC8}'` KANNADA VOWEL SIGN AI](https://util.unicode.org/UnicodeJsps/character.jsp?a=0CC8),
+//!         - [`'\u{0CCA}'` KANNADA VOWEL SIGN O](https://util.unicode.org/UnicodeJsps/character.jsp?a=0CCA),
+//!         - [`'\u{0CCB}'` KANNADA VOWEL SIGN OO](https://util.unicode.org/UnicodeJsps/character.jsp?a=0CCB),
+//!         - [`'\u{1B3B}'` BALINESE VOWEL SIGN RA REPA TEDUNG](https://util.unicode.org/UnicodeJsps/character.jsp?a=1B3B),
+//!         - [`'\u{1B3D}'` BALINESE VOWEL SIGN LA LENGA TEDUNG](https://util.unicode.org/UnicodeJsps/character.jsp?a=1B3D), and
+//!         - [`'\u{1B43}'` BALINESE VOWEL SIGN PEPET TEDUNG](https://util.unicode.org/UnicodeJsps/character.jsp?a=1B43).
+//!       - [Characters](https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BHangul_Syllable_Type%3DV%7D%5Cp%7BHangul_Syllable_Type%3DT%7D)
+//!         with a [`Hangul_Syllable_Type`] of `Vowel_Jamo` (`V`) or `Trailing_Jamo` (`T`).
+//!       - The following [`Prepended_Concatenation_Mark`]s:
+//!         - [`'\u{0605}'` NUMBER MARK ABOVE](https://util.unicode.org/UnicodeJsps/character.jsp?a=0605),
+//!         - [`'\u{070F}'` SYRIAC ABBREVIATION MARK](https://util.unicode.org/UnicodeJsps/character.jsp?a=070F),
+//!         - [`'\u{0890}'` POUND MARK ABOVE](https://util.unicode.org/UnicodeJsps/character.jsp?a=0890),
+//!         - [`'\u{0891}'` PIASTRE MARK ABOVE](https://util.unicode.org/UnicodeJsps/character.jsp?a=0891), and
+//!         - [`'\u{08E2}'` DISPUTED END OF AYAH](https://util.unicode.org/UnicodeJsps/character.jsp?a=08E2).
+//!       - [Characters](https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BGrapheme_Cluster_Break%3DPrepend%7D-%5Cp%7BPrepended_Concatenation_Mark%7D)
+//!         with the [`Grapheme_Extend=Prepend`] property, that are not also [`Prepended_Concatenation_Mark`]s.
+//!       - [`'\u{A8FA}'` DEVANAGARI CARET](https://util.unicode.org/UnicodeJsps/character.jsp?a=A8FA).
+//!    5. [Characters](https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BEast_Asian_Width%3DF%7D%5Cp%7BEast_Asian_Width%3DW%7D)
+//!       with an [`East_Asian_Width`] of [`Fullwidth`] or [`Wide`] have width 2.
+//!    6. Characters fulfilling all of the following conditions have width 2 in an East Asian context, and width 1 otherwise:
+//!       - Has an [`East_Asian_Width`] of [`Ambiguous`], or
+//!         has a canonical decomposition to an [`Ambiguous`] character followed by [`'\u{0338}'` COMBINING LONG SOLIDUS OVERLAY], or
+//!         is [`'\u{0387}'` GREEK ANO TELEIA](https://util.unicode.org/UnicodeJsps/character.jsp?a=0387), and
+//!       - Does not have a [`General_Category`] of `Letter` or `Modifier_Symbol`.
+//!    7. All other characters have width 1.
+//!
+//! [`'\u{0338}'` COMBINING LONG SOLIDUS OVERLAY]: https://util.unicode.org/UnicodeJsps/character.jsp?a=0338
+//! [`'\u{2D7F}'` TIFINAGH CONSONANT JOINER]: https://util.unicode.org/UnicodeJsps/character.jsp?a=2D7F
+//!
+//! [`Canonical_Combining_Class`]: https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G50313
+//! [`Default_Ignorable_Code_Point`]: https://www.unicode.org/versions/Unicode15.0.0/ch05.pdf#G40095
+//! [`East_Asian_Width`]: https://www.unicode.org/reports/tr11/#ED1
+//! [`Emoji_Presentation`]: https://unicode.org/reports/tr51/#def_emoji_presentation
+//! [`General_Category`]: https://www.unicode.org/versions/Unicode15.0.0/ch04.pdf#G124142
+//! [`Grapheme_Extend=Prepend`]: https://www.unicode.org/reports/tr29/#Prepend
+//! [`Grapheme_Extend`]: https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G52443
+//! [`Hangul_Syllable_Type`]: https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G45593
+//! [`Joining_Group`]: https://www.unicode.org/versions/Unicode14.0.0/ch09.pdf#G36862
+//! [`Joining_Type`]: http://www.unicode.org/versions/Unicode15.0.0/ch09.pdf#G50009
+//! [`Prepended_Concatenation_Mark`]: https://www.unicode.org/versions/Unicode15.0.0/ch23.pdf#G37908
+//! [`Script`]: https://www.unicode.org/reports/tr24/#Script
+//!
+//! [`Fullwidth`]: https://www.unicode.org/reports/tr11/#ED2
+//! [`Wide`]: https://www.unicode.org/reports/tr11/#ED4
+//! [`Ambiguous`]: https://www.unicode.org/reports/tr11/#ED6
+//!
+//! [combining marks]: https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G30602
+//!
+//! [emoji ZWJ sequences]: https://www.unicode.org/reports/tr51/#def_emoji_sequence
+//! [Emoji modifier sequences]: https://www.unicode.org/reports/tr51/#def_emoji_modifier_sequence
+//! [Emoji presentation sequences]: https://unicode.org/reports/tr51/#def_emoji_presentation_sequence
+//! [text presentation sequences]: https://unicode.org/reports/tr51/#def_text_presentation_sequence
+//!
+//! [Enclosed Ideographic Supplement]: https://unicode.org/charts/nameslist/n_1F200.html
+//!
+//! [Arabic]: https://www.unicode.org/versions/Unicode15.0.0/ch09.pdf#G7480
+//! [Buginese]: https://www.unicode.org/versions/Unicode15.0.0/ch17.pdf#G26743
+//! [Hebrew]: https://www.unicode.org/versions/Unicode15.0.0/ch09.pdf#G6528
+//! [Khmer]: https://www.unicode.org/versions/Unicode15.0.0/ch16.pdf#G64642
+//! [Lisu]: https://www.unicode.org/versions/Unicode15.0.0/ch18.pdf#G44587
+//! [Old Turkic]: https://www.unicode.org/versions/Unicode15.0.0/ch14.pdf#G41975
+//! [Tifinagh]: http://www.unicode.org/versions/Unicode15.0.0/ch19.pdf#G43184
+//!
+//!
+//! ## Canonical equivalence
+//!
+//! Canonically equivalent strings are assigned the same width (CJK and non-CJK).
 
-#![deny(missing_docs, unsafe_code)]
-#![doc(html_logo_url = "https://unicode-rs.github.io/unicode-rs_sm.png",
-       html_favicon_url = "https://unicode-rs.github.io/unicode-rs_sm.png")]
-
-#![cfg_attr(feature = "bench", feature(test))]
+#![forbid(unsafe_code)]
+#![deny(missing_docs)]
+#![doc(
+    html_logo_url = "https://unicode-rs.github.io/unicode-rs_sm.png",
+    html_favicon_url = "https://unicode-rs.github.io/unicode-rs_sm.png"
+)]
 #![no_std]
 
-#[cfg(test)]
-#[macro_use]
-extern crate std;
-
-#[cfg(feature = "bench")]
-extern crate test;
-
-use tables::charwidth as cw;
 pub use tables::UNICODE_VERSION;
 
 mod tables;
 
-#[cfg(test)]
-mod tests;
+mod private {
+    pub trait Sealed {}
+    #[cfg(not(feature = "cjk"))]
+    impl Sealed for char {}
+    #[cfg(not(feature = "cjk"))]
+    impl Sealed for str {}
+    #[cfg(feature = "cjk")]
+    impl<T: ?Sized> Sealed for T {}
+}
 
 /// Methods for determining displayed width of Unicode characters.
-pub trait UnicodeWidthChar {
+pub trait UnicodeWidthChar: private::Sealed {
     /// Returns the character's displayed width in columns, or `None` if the
-    /// character is a control character other than `'\x00'`.
+    /// character is a control character.
     ///
     /// This function treats characters in the Ambiguous category according
     /// to [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
@@ -76,54 +201,58 @@
     fn width(self) -> Option<usize>;
 
     /// Returns the character's displayed width in columns, or `None` if the
-    /// character is a control character other than `'\x00'`.
+    /// character is a control character.
     ///
     /// This function treats characters in the Ambiguous category according
     /// to [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
     /// as 2 columns wide. This is consistent with the recommendations for
     /// CJK contexts.
+    #[cfg(feature = "cjk")]
     fn width_cjk(self) -> Option<usize>;
 }
 
 impl UnicodeWidthChar for char {
     #[inline]
-    fn width(self) -> Option<usize> { cw::width(self, false) }
+    fn width(self) -> Option<usize> {
+        tables::single_char_width(self)
+    }
 
+    #[cfg(feature = "cjk")]
     #[inline]
-    fn width_cjk(self) -> Option<usize> { cw::width(self, true) }
+    fn width_cjk(self) -> Option<usize> {
+        tables::single_char_width_cjk(self)
+    }
 }
 
 /// Methods for determining displayed width of Unicode strings.
-pub trait UnicodeWidthStr {
+pub trait UnicodeWidthStr: private::Sealed {
     /// Returns the string's displayed width in columns.
     ///
-    /// Control characters are treated as having zero width.
-    ///
     /// This function treats characters in the Ambiguous category according
     /// to [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
     /// as 1 column wide. This is consistent with the recommendations for
     /// non-CJK contexts, or when the context cannot be reliably determined.
-    fn width<'a>(&'a self) -> usize;
+    fn width(&self) -> usize;
 
     /// Returns the string's displayed width in columns.
     ///
-    /// Control characters are treated as having zero width.
-    ///
     /// This function treats characters in the Ambiguous category according
     /// to [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
     /// as 2 column wide. This is consistent with the recommendations for
     /// CJK contexts.
-    fn width_cjk<'a>(&'a self) -> usize;
+    #[cfg(feature = "cjk")]
+    fn width_cjk(&self) -> usize;
 }
 
 impl UnicodeWidthStr for str {
     #[inline]
     fn width(&self) -> usize {
-        self.chars().map(|c| cw::width(c, false).unwrap_or(0)).sum()
+        tables::str_width(self)
     }
 
+    #[cfg(feature = "cjk")]
     #[inline]
     fn width_cjk(&self) -> usize {
-        self.chars().map(|c| cw::width(c, true).unwrap_or(0)).sum()
+        tables::str_width_cjk(self)
     }
 }

crates/unicode-width/src/tables.rs

diff --git a/crates/unicode-width/src/tables.rs b/crates/unicode-width/src/tables.rs
index 791d7a8..fa632d6 100644
--- a/crates/unicode-width/src/tables.rs
+++ b/crates/unicode-width/src/tables.rs
@@ -10,531 +10,21747 @@
 
 // NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
 
+use core::cmp::Ordering;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct WidthInfo(u16);
+
+impl WidthInfo {
+    /// No special handling necessary
+    const DEFAULT: Self = Self(0);
+    const LINE_FEED: Self = Self(0b0000000000000001);
+    const EMOJI_MODIFIER: Self = Self(0b0000000000000010);
+    const REGIONAL_INDICATOR: Self = Self(0b0000000000000011);
+    const SEVERAL_REGIONAL_INDICATOR: Self = Self(0b0000000000000100);
+    const EMOJI_PRESENTATION: Self = Self(0b0000000000000101);
+    const ZWJ_EMOJI_PRESENTATION: Self = Self(0b0001000000000110);
+    const VS16_ZWJ_EMOJI_PRESENTATION: Self = Self(0b1001000000000110);
+    const KEYCAP_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0001000000000111);
+    const VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION: Self = Self(0b1001000000000111);
+    const REGIONAL_INDICATOR_ZWJ_PRESENTATION: Self = Self(0b0000000000001001);
+    const EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION: Self = Self(0b0000000000001010);
+    const ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION: Self = Self(0b0000000000001011);
+    const TAG_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000010000);
+    const TAG_D1_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000010001);
+    const TAG_D2_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000010010);
+    const TAG_D3_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000010011);
+    const TAG_A1_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011001);
+    const TAG_A2_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011010);
+    const TAG_A3_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011011);
+    const TAG_A4_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011100);
+    const TAG_A5_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011101);
+    const TAG_A6_END_ZWJ_EMOJI_PRESENTATION: Self = Self(0b0000000000011110);
+    const VARIATION_SELECTOR_15: Self = Self(0b0100000000000000);
+    const VARIATION_SELECTOR_16: Self = Self(0b1000000000000000);
+    const JOINING_GROUP_ALEF: Self = Self(0b0011000011111111);
+    #[cfg(feature = "cjk")]
+    const COMBINING_LONG_SOLIDUS_OVERLAY: Self = Self(0b0011110011111111);
+    #[cfg(feature = "cjk")]
+    const SOLIDUS_OVERLAY_ALEF: Self = Self(0b0011100011111111);
+    const HEBREW_LETTER_LAMED: Self = Self(0b0011100000000000);
+    const ZWJ_HEBREW_LETTER_LAMED: Self = Self(0b0011110000000000);
+    const BUGINESE_LETTER_YA: Self = Self(0b0011100000000001);
+    const ZWJ_BUGINESE_LETTER_YA: Self = Self(0b0011110000000001);
+    const BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA: Self = Self(0b0011110000000010);
+    const TIFINAGH_CONSONANT: Self = Self(0b0011100000000011);
+    const ZWJ_TIFINAGH_CONSONANT: Self = Self(0b0011110000000011);
+    const TIFINAGH_JOINER_CONSONANT: Self = Self(0b0011110000000100);
+    const LISU_TONE_LETTER_MYA_NA_JEU: Self = Self(0b0011110000000101);
+    const OLD_TURKIC_LETTER_ORKHON_I: Self = Self(0b0011100000000110);
+    const ZWJ_OLD_TURKIC_LETTER_ORKHON_I: Self = Self(0b0011110000000110);
+    const KHMER_COENG_ELIGIBLE_LETTER: Self = Self(0b0011110000000111);
+
+    /// Whether this width mode is ligature_transparent
+    /// (has 5th MSB set.)
+    fn is_ligature_transparent(self) -> bool {
+        (self.0 & 0b0000_1000_0000_0000) == 0b0000_1000_0000_0000
+    }
+
+    /// Sets 6th MSB.
+    fn set_zwj_bit(self) -> Self {
+        Self(self.0 | 0b0000_0100_0000_0000)
+    }
+
+    /// Has top bit set
+    fn is_emoji_presentation(self) -> bool {
+        (self.0 & 0b1000_0000_0000_0000) == 0b1000_0000_0000_0000
+    }
+
+    /// Has top bit set
+    fn is_zwj_emoji_presentation(self) -> bool {
+        (self.0 & 0b1011_0000_0000_0000) == 0b1001_0000_0000_0000
+    }
+
+    /// Set top bit
+    fn set_emoji_presentation(self) -> Self {
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000
+            || (self.0 & 0b1001_0000_0000_0000) == 0b0001_0000_0000_0000
+        {
+            Self(self.0 | 0b1000_0000_0000_0000)
+        } else {
+            Self::VARIATION_SELECTOR_16
+        }
+    }
+
+    /// Clear top bit
+    fn unset_emoji_presentation(self) -> Self {
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000 {
+            Self(self.0 & 0b0111_1111_1111_1111)
+        } else {
+            Self::DEFAULT
+        }
+    }
+
+    /// Has 2nd bit set
+    fn is_text_presentation(self) -> bool {
+        (self.0 & 0b0100_0000_0000_0000) == 0b0100_0000_0000_0000
+    }
+
+    /// Set 2nd bit
+    fn set_text_presentation(self) -> Self {
+        if (self.0 & 0b0010_0000_0000_0000) == 0b0010_0000_0000_0000 {
+            Self(self.0 | 0b0100_0000_0000_0000)
+        } else {
+            Self(0b0100_0000_0000_0000)
+        }
+    }
+
+    /// Clear 2nd bit
+    fn unset_text_presentation(self) -> Self {
+        Self(self.0 & 0b1011_1111_1111_1111)
+    }
+}
+
 /// The version of [Unicode](http://www.unicode.org/)
 /// that this version of unicode-width is based on.
 pub const UNICODE_VERSION: (u8, u8, u8) = (15, 1, 0);
 
-pub mod charwidth {
-    use core::option::Option::{self, None, Some};
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
+/// consulting a multi-level lookup table.
+///
+/// # Maintenance
+/// The tables themselves are autogenerated but this function is hardcoded. You should have
+/// nothing to worry about if you re-run `unicode.py` (for example, when updating Unicode.)
+/// However, if you change the *actual structure* of the lookup tables (perhaps by editing the
+/// `make_tables` function in `unicode.py`) you must ensure that this code reflects those changes.
+#[inline]
+fn lookup_width(c: char) -> (u8, WidthInfo) {
+    let cp = c as usize;
 
-    /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
-    /// consulting a multi-level lookup table.
-    /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
-    /// they're treated as single width.
-    ///
-    /// # Maintenance
-    /// The tables themselves are autogenerated but this function is hardcoded. You should have
-    /// nothing to worry about if you re-run `unicode.py` (for example, when updating Unicode.)
-    /// However, if you change the *actual structure* of the lookup tables (perhaps by editing the
-    /// `TABLE_CFGS` global in `unicode.py`) you must ensure that this code reflects those changes.
-    #[inline]
-    fn lookup_width(c: char, is_cjk: bool) -> usize {
-        let cp = c as usize;
+    let t1_offset = WIDTH_ROOT.0[cp >> 13];
 
-        let t1_offset = TABLES_0[cp >> 13 & 0xFF];
+    // Each sub-table in WIDTH_MIDDLE is 7 bits, and each stored entry is a byte,
+    // so each sub-table is 128 bytes in size.
+    // (Sub-tables are selected using the computed offset from the previous table.)
+    let t2_offset = WIDTH_MIDDLE.0[usize::from(t1_offset)][cp >> 7 & 0x3F];
 
-        // Each sub-table in TABLES_1 is 7 bits, and each stored entry is a byte,
-        // so each sub-table is 128 bytes in size.
-        // (Sub-tables are selected using the computed offset from the previous table.)
-        let t2_offset = TABLES_1[128 * usize::from(t1_offset) + (cp >> 6 & 0x7F)];
+    // Each sub-table in WIDTH_LEAVES is 6 bits, but each stored entry is 2 bits.
+    // This is accomplished by packing four stored entries into one byte.
+    // So each sub-table is 2**(7-2) == 32 bytes in size.
+    // Since this is the last table, each entry represents an encoded width.
+    let packed_widths = WIDTH_LEAVES.0[usize::from(t2_offset)][cp >> 2 & 0x1F];
 
-        // Each sub-table in TABLES_2 is 6 bits, but each stored entry is 2 bits.
-        // This is accomplished by packing four stored entries into one byte.
-        // So each sub-table is 2**(6-2) == 16 bytes in size.
-        // Since this is the last table, each entry represents an encoded width.
-        let packed_widths = TABLES_2[16 * usize::from(t2_offset) + (cp >> 2 & 0xF)];
+    // Extract the packed width
+    let width = packed_widths >> (2 * (cp & 0b11)) & 0b11;
 
-        // Extract the packed width
-        let width = packed_widths >> (2 * (cp & 0b11)) & 0b11;
-
-        // A width of 3 signifies that the codepoint is ambiguous width.
-        if width == 3 {
-            if is_cjk {
-                2
-            } else {
-                1
-            }
-        } else {
-            width.into()
+    if width < 3 {
+        (width, WidthInfo::DEFAULT)
+    } else {
+        match c {
+            '\u{A}' => (1, WidthInfo::LINE_FEED),
+            '\u{5DC}' => (1, WidthInfo::HEBREW_LETTER_LAMED),
+            '\u{622}'..='\u{882}' => (1, WidthInfo::JOINING_GROUP_ALEF),
+            '\u{1780}'..='\u{17AF}' => (1, WidthInfo::KHMER_COENG_ELIGIBLE_LETTER),
+            '\u{17D8}' => (3, WidthInfo::DEFAULT),
+            '\u{1A10}' => (1, WidthInfo::BUGINESE_LETTER_YA),
+            '\u{2D31}'..='\u{2D6F}' => (1, WidthInfo::TIFINAGH_CONSONANT),
+            '\u{A4FC}'..='\u{A4FD}' => (1, WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU),
+            '\u{FE0E}' => (0, WidthInfo::VARIATION_SELECTOR_15),
+            '\u{FE0F}' => (0, WidthInfo::VARIATION_SELECTOR_16),
+            '\u{10C03}' => (1, WidthInfo::OLD_TURKIC_LETTER_ORKHON_I),
+            '\u{1F1E6}'..='\u{1F1FF}' => (1, WidthInfo::REGIONAL_INDICATOR),
+            '\u{1F3FB}'..='\u{1F3FF}' => (2, WidthInfo::EMOJI_MODIFIER),
+            _ => (2, WidthInfo::EMOJI_PRESENTATION),
         }
     }
+}
 
-    /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`, or
-    /// `None` if `c` is a control character other than `'\x00'`.
-    /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
-    /// they're treated as single width.
-    #[inline]
-    pub fn width(c: char, is_cjk: bool) -> Option<usize> {
-        if c < '\u{7F}' {
-            if c >= '\u{20}' {
-                // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
-                Some(1)
-            } else if c == '\0' {
-                // U+0000 *is* a control code, but it's special-cased
-                Some(0)
-            } else {
-                // U+0001 to U+0020 (exclusive) are control codes
-                None
-            }
-        } else if c >= '\u{A0}' {
-            // No characters >= U+00A0 are control codes, so we can consult the lookup tables
-            Some(lookup_width(c, is_cjk))
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`, or
+/// `None` if `c` is a control character.
+/// Ambiguous width characters are treated as narrow.
+#[inline]
+pub fn single_char_width(c: char) -> Option<usize> {
+    if c < '\u{7F}' {
+        if c >= '\u{20}' {
+            // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
+            Some(1)
         } else {
-            // U+007F to U+00A0 (exclusive) are control codes
+            // U+0000 to U+0020 (exclusive) are control codes
             None
         }
+    } else if c >= '\u{A0}' {
+        // No characters >= U+00A0 are control codes, so we can consult the lookup tables
+        Some(lookup_width(c).0.into())
+    } else {
+        // U+007F to U+00A0 (exclusive) are control codes
+        None
     }
+}
 
-    /// Autogenerated. 1 sub-table(s). Consult [`lookup_width`] for layout info.
-    static TABLES_0: [u8; 256] = [
-        0x00, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
-        0x0E, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x0F, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x10, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-        0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-        0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00,
-    ];
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`.
+/// Ambiguous width characters are treated as narrow.
+#[inline]
+fn width_in_str(c: char, mut next_info: WidthInfo) -> (i8, WidthInfo) {
+    if next_info.is_emoji_presentation() {
+        if starts_emoji_presentation_seq(c) {
+            let width = if next_info.is_zwj_emoji_presentation() {
+                0
+            } else {
+                2
+            };
+            return (width, WidthInfo::EMOJI_PRESENTATION);
+        } else {
+            next_info = next_info.unset_emoji_presentation();
+        }
+    }
+    if c <= '\u{A0}' {
+        match c {
+            '\n' => (1, WidthInfo::LINE_FEED),
+            '\r' if next_info == WidthInfo::LINE_FEED => (0, WidthInfo::DEFAULT),
+            _ => (1, WidthInfo::DEFAULT),
+        }
+    } else {
+        // Fast path
+        if next_info != WidthInfo::DEFAULT {
+            if c == '\u{FE0F}' {
+                return (0, next_info.set_emoji_presentation());
+            }
+            if c == '\u{FE0E}' {
+                return (0, next_info.set_text_presentation());
+            }
+            if next_info.is_text_presentation() {
+                if starts_non_ideographic_text_presentation_seq(c) {
+                    return (1, WidthInfo::DEFAULT);
+                } else {
+                    next_info = next_info.unset_text_presentation();
+                }
+            }
+            if next_info.is_ligature_transparent() {
+                if c == '\u{200D}' {
+                    return (0, next_info.set_zwj_bit());
+                } else if is_ligature_transparent(c) {
+                    return (0, next_info);
+                }
+            }
 
-    /// Autogenerated. 19 sub-table(s). Consult [`lookup_width`] for layout info.
-    static TABLES_1: [u8; 2432] = [
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x06, 0x08, 0x06, 0x09, 0x0A, 0x0B, 0x0C,
-        0x0D, 0x0E, 0x0F, 0x10, 0x06, 0x06, 0x06, 0x11, 0x12, 0x13, 0x14, 0x06, 0x15, 0x16, 0x17,
-        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x22, 0x24, 0x25,
-        0x26, 0x27, 0x28, 0x29, 0x2A, 0x25, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
-        0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x06, 0x3B, 0x3C, 0x0A, 0x0A, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x3D, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x06, 0x43, 0x06, 0x44, 0x06, 0x06, 0x06, 0x45,
-        0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x06, 0x06, 0x4E, 0x06, 0x06, 0x06, 0x0A,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
-        0x56, 0x57, 0x58, 0x59, 0x06, 0x5A, 0x06, 0x06, 0x5B, 0x06, 0x5C, 0x5D, 0x5E, 0x5D, 0x5F,
-        0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x69, 0x6A, 0x06, 0x06, 0x06, 0x06, 0x06, 0x6B,
-        0x06, 0x01, 0x06, 0x6C, 0x06, 0x06, 0x6D, 0x6E, 0x3B, 0x3B, 0x3B, 0x6F, 0x70, 0x71, 0x72,
-        0x3B, 0x73, 0x3B, 0x74, 0x75, 0x76, 0x77, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x06, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x78, 0x79, 0x06, 0x06, 0x06, 0x06, 0x06, 0x7A, 0x7B, 0x7C,
-        0x06, 0x06, 0x06, 0x06, 0x7D, 0x06, 0x06, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
-        0x86, 0x06, 0x06, 0x06, 0x87, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x88,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x89, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x8A, 0x8B, 0x06, 0x01, 0x71, 0x8C, 0x06, 0x8D, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x8E, 0x06, 0x06, 0x06, 0x8F, 0x06, 0x90, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x91, 0x06, 0x06, 0x92, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x93, 0x06, 0x06, 0x06, 0x06, 0x06, 0x94, 0x95, 0x06, 0x96, 0x97, 0x06,
-        0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0x2E, 0x06, 0xA1, 0x2C, 0xA2, 0x06,
-        0x06, 0xA3, 0xA4, 0xA5, 0xA6, 0x06, 0x06, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0x06, 0xAC, 0x06,
-        0x06, 0x06, 0xAD, 0x06, 0x06, 0x06, 0xAE, 0xAF, 0x06, 0xB0, 0xB1, 0xB2, 0xB3, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0xB4, 0x06, 0xB5, 0x06, 0xB6, 0xB7, 0xB8, 0x06, 0x06, 0x06, 0x06, 0xB9,
-        0xBA, 0xBB, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x47, 0xBC, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0xBD, 0xBE, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xBF, 0xC0, 0xC1, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0xC2,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0xC3, 0xC4, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xC5, 0x3B, 0x3B, 0x3B, 0x3B, 0xC6,
-        0xC7, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0xC8, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0xC9, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xCA,
-        0xCB, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xCC, 0xCD, 0x06, 0x06, 0xCE, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xCF, 0xD0,
-        0xD1, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xD2, 0x06, 0xBF, 0x06, 0xBE, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0xD3, 0xD4, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xD4, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xD5, 0x06, 0xD6,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xD7, 0x06, 0x06, 0xD8,
-        0xD9, 0xDA, 0xDB, 0x06, 0xDC, 0xDD, 0x06, 0x06, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0x3B,
-        0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0x3B, 0xE9, 0x3B, 0xEA, 0x06, 0x06, 0x06, 0xEB, 0x06, 0x06,
-        0x06, 0x06, 0xEC, 0xED, 0x3B, 0x3B, 0x06, 0xEE, 0xEF, 0xF0, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B,
-        0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0xE5, 0xF1, 0x0A, 0x06, 0x06, 0x0A, 0x0A, 0x0A,
-        0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D, 0x5D,
-        0x5D, 0xF2,
-    ];
+            match (next_info, c) {
+                // Arabic Lam-Alef ligature
+                (
+                    WidthInfo::JOINING_GROUP_ALEF,
+                    '\u{644}' | '\u{6B5}'..='\u{6B8}' | '\u{76A}' | '\u{8A6}' | '\u{8C7}',
+                ) => return (0, WidthInfo::DEFAULT),
+                (WidthInfo::JOINING_GROUP_ALEF, _) if is_transparent_zero_width(c) => {
+                    return (0, WidthInfo::JOINING_GROUP_ALEF);
+                }
 
-    /// Autogenerated. 243 sub-table(s). Consult [`lookup_width`] for layout info.
-    static TABLES_2: [u8; 3888] = [
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+                // Hebrew Alef-ZWJ-Lamed ligature
+                (WidthInfo::ZWJ_HEBREW_LETTER_LAMED, '\u{05D0}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Khmer coeng signs
+                (WidthInfo::KHMER_COENG_ELIGIBLE_LETTER, '\u{17D2}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Buginese <a, -i> ZWJ ya ligature
+                (WidthInfo::ZWJ_BUGINESE_LETTER_YA, '\u{1A17}') => {
+                    return (0, WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA)
+                }
+                (WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA, '\u{1A15}') => {
+                    return (0, WidthInfo::DEFAULT)
+                }
+
+                // Tifinagh bi-consonants
+                (WidthInfo::TIFINAGH_CONSONANT | WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\u{2D7F}') => {
+                    return (1, WidthInfo::TIFINAGH_JOINER_CONSONANT);
+                }
+                (WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\u{2D31}'..='\u{2D65}' | '\u{2D6F}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+                (WidthInfo::TIFINAGH_JOINER_CONSONANT, '\u{2D31}'..='\u{2D65}' | '\u{2D6F}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Lisu tone letter combinations
+                (WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU, '\u{A4F8}'..='\u{A4FB}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Old Turkic ligature
+                (WidthInfo::ZWJ_OLD_TURKIC_LETTER_ORKHON_I, '\u{10C32}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+                // Emoji modifier
+                (WidthInfo::EMOJI_MODIFIER, _) if is_emoji_modifier_base(c) => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION);
+                }
+
+                // Regional indicator
+                (
+                    WidthInfo::REGIONAL_INDICATOR | WidthInfo::SEVERAL_REGIONAL_INDICATOR,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (1, WidthInfo::SEVERAL_REGIONAL_INDICATOR),
+
+                // ZWJ emoji
+                (
+                    WidthInfo::EMOJI_PRESENTATION
+                    | WidthInfo::SEVERAL_REGIONAL_INDICATOR
+                    | WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::EMOJI_MODIFIER,
+                    '\u{200D}',
+                ) => return (0, WidthInfo::ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{20E3}') => {
+                    return (0, WidthInfo::KEYCAP_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::VS16_ZWJ_EMOJI_PRESENTATION, _) if starts_emoji_presentation_seq(c) => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+                (WidthInfo::VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION, '0'..='9' | '#' | '*') => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{1F1E6}'..='\u{1F1FF}') => {
+                    return (1, WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION);
+                }
+                (
+                    WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (-1, WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (
+                    WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (3, WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{1F3FB}'..='\u{1F3FF}') => {
+                    return (0, WidthInfo::EMOJI_MODIFIER);
+                }
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{E007F}') => {
+                    return (0, WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (
+                    WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION,
+                    '\u{E0030}'..='\u{E0039}',
+                ) => return (0, WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION, '\u{E0030}'..='\u{E0039}') => {
+                    return (0, WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION, '\u{E0030}'..='\u{E0039}') => {
+                    return (0, WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (
+                    WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION,
+                    '\u{1F3F4}',
+                ) => return (0, WidthInfo::EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, _)
+                    if lookup_width(c).1 == WidthInfo::EMOJI_PRESENTATION =>
+                {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+
+                // Fallback
+                _ => {}
+            }
+        }
+
+        let ret = lookup_width(c);
+        (ret.0 as i8, ret.1)
+    }
+}
+
+#[inline]
+pub fn str_width(s: &str) -> usize {
+    s.chars()
+        .rfold(
+            (0, WidthInfo::DEFAULT),
+            |(sum, next_info), c| -> (usize, WidthInfo) {
+                let (add, info) = width_in_str(c, next_info);
+                (sum.wrapping_add_signed(isize::from(add)), info)
+            },
+        )
+        .0
+}
+
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
+/// consulting a multi-level lookup table.
+///
+/// # Maintenance
+/// The tables themselves are autogenerated but this function is hardcoded. You should have
+/// nothing to worry about if you re-run `unicode.py` (for example, when updating Unicode.)
+/// However, if you change the *actual structure* of the lookup tables (perhaps by editing the
+/// `make_tables` function in `unicode.py`) you must ensure that this code reflects those changes.
+#[cfg(feature = "cjk")]
+#[inline]
+fn lookup_width_cjk(c: char) -> (u8, WidthInfo) {
+    let cp = c as usize;
+
+    let t1_offset = WIDTH_ROOT_CJK.0[cp >> 13];
+
+    // Each sub-table in WIDTH_MIDDLE is 7 bits, and each stored entry is a byte,
+    // so each sub-table is 128 bytes in size.
+    // (Sub-tables are selected using the computed offset from the previous table.)
+    let t2_offset = WIDTH_MIDDLE.0[usize::from(t1_offset)][cp >> 7 & 0x3F];
+
+    // Each sub-table in WIDTH_LEAVES is 6 bits, but each stored entry is 2 bits.
+    // This is accomplished by packing four stored entries into one byte.
+    // So each sub-table is 2**(7-2) == 32 bytes in size.
+    // Since this is the last table, each entry represents an encoded width.
+    let packed_widths = WIDTH_LEAVES.0[usize::from(t2_offset)][cp >> 2 & 0x1F];
+
+    // Extract the packed width
+    let width = packed_widths >> (2 * (cp & 0b11)) & 0b11;
+
+    if width < 3 {
+        (width, WidthInfo::DEFAULT)
+    } else {
+        match c {
+            '\u{A}' => (1, WidthInfo::LINE_FEED),
+            '\u{338}' => (0, WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY),
+            '\u{5DC}' => (1, WidthInfo::HEBREW_LETTER_LAMED),
+            '\u{622}'..='\u{882}' => (1, WidthInfo::JOINING_GROUP_ALEF),
+            '\u{1780}'..='\u{17AF}' => (1, WidthInfo::KHMER_COENG_ELIGIBLE_LETTER),
+            '\u{17D8}' => (3, WidthInfo::DEFAULT),
+            '\u{1A10}' => (1, WidthInfo::BUGINESE_LETTER_YA),
+            '\u{2D31}'..='\u{2D6F}' => (1, WidthInfo::TIFINAGH_CONSONANT),
+            '\u{A4FC}'..='\u{A4FD}' => (1, WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU),
+            '\u{FE0F}' => (0, WidthInfo::VARIATION_SELECTOR_16),
+            '\u{10C03}' => (1, WidthInfo::OLD_TURKIC_LETTER_ORKHON_I),
+            '\u{1F1E6}'..='\u{1F1FF}' => (1, WidthInfo::REGIONAL_INDICATOR),
+            '\u{1F3FB}'..='\u{1F3FF}' => (2, WidthInfo::EMOJI_MODIFIER),
+            _ => (2, WidthInfo::EMOJI_PRESENTATION),
+        }
+    }
+}
+
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`, or
+/// `None` if `c` is a control character.
+/// Ambiguous width characters are treated as wide.
+#[cfg(feature = "cjk")]
+#[inline]
+pub fn single_char_width_cjk(c: char) -> Option<usize> {
+    if c < '\u{7F}' {
+        if c >= '\u{20}' {
+            // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
+            Some(1)
+        } else {
+            // U+0000 to U+0020 (exclusive) are control codes
+            None
+        }
+    } else if c >= '\u{A0}' {
+        // No characters >= U+00A0 are control codes, so we can consult the lookup tables
+        Some(lookup_width_cjk(c).0.into())
+    } else {
+        // U+007F to U+00A0 (exclusive) are control codes
+        None
+    }
+}
+
+/// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c`.
+/// Ambiguous width characters are treated as wide.
+#[cfg(feature = "cjk")]
+#[inline]
+fn width_in_str_cjk(c: char, mut next_info: WidthInfo) -> (i8, WidthInfo) {
+    if next_info.is_emoji_presentation() {
+        if starts_emoji_presentation_seq(c) {
+            let width = if next_info.is_zwj_emoji_presentation() {
+                0
+            } else {
+                2
+            };
+            return (width, WidthInfo::EMOJI_PRESENTATION);
+        } else {
+            next_info = next_info.unset_emoji_presentation();
+        }
+    }
+    if (matches!(
+        next_info,
+        WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY | WidthInfo::SOLIDUS_OVERLAY_ALEF
+    ) && matches!(c, '<' | '=' | '>'))
+    {
+        return (2, WidthInfo::DEFAULT);
+    }
+    if c <= '\u{A0}' {
+        match c {
+            '\n' => (1, WidthInfo::LINE_FEED),
+            '\r' if next_info == WidthInfo::LINE_FEED => (0, WidthInfo::DEFAULT),
+            _ => (1, WidthInfo::DEFAULT),
+        }
+    } else {
+        // Fast path
+        if next_info != WidthInfo::DEFAULT {
+            if c == '\u{FE0F}' {
+                return (0, next_info.set_emoji_presentation());
+            }
+            if next_info.is_ligature_transparent() {
+                if c == '\u{200D}' {
+                    return (0, next_info.set_zwj_bit());
+                } else if is_ligature_transparent(c) {
+                    return (0, next_info);
+                }
+            }
+
+            match (next_info, c) {
+                (WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY, _) if is_solidus_transparent(c) => {
+                    return (
+                        lookup_width_cjk(c).0 as i8,
+                        WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY,
+                    );
+                }
+                (WidthInfo::JOINING_GROUP_ALEF, '\u{0338}') => {
+                    return (0, WidthInfo::SOLIDUS_OVERLAY_ALEF);
+                }
+                // Arabic Lam-Alef ligature
+                (
+                    WidthInfo::JOINING_GROUP_ALEF | WidthInfo::SOLIDUS_OVERLAY_ALEF,
+                    '\u{644}' | '\u{6B5}'..='\u{6B8}' | '\u{76A}' | '\u{8A6}' | '\u{8C7}',
+                ) => return (0, WidthInfo::DEFAULT),
+                (WidthInfo::JOINING_GROUP_ALEF, _) if is_transparent_zero_width(c) => {
+                    return (0, WidthInfo::JOINING_GROUP_ALEF);
+                }
+
+                // Hebrew Alef-ZWJ-Lamed ligature
+                (WidthInfo::ZWJ_HEBREW_LETTER_LAMED, '\u{05D0}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Khmer coeng signs
+                (WidthInfo::KHMER_COENG_ELIGIBLE_LETTER, '\u{17D2}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Buginese <a, -i> ZWJ ya ligature
+                (WidthInfo::ZWJ_BUGINESE_LETTER_YA, '\u{1A17}') => {
+                    return (0, WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA)
+                }
+                (WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA, '\u{1A15}') => {
+                    return (0, WidthInfo::DEFAULT)
+                }
+
+                // Tifinagh bi-consonants
+                (WidthInfo::TIFINAGH_CONSONANT | WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\u{2D7F}') => {
+                    return (1, WidthInfo::TIFINAGH_JOINER_CONSONANT);
+                }
+                (WidthInfo::ZWJ_TIFINAGH_CONSONANT, '\u{2D31}'..='\u{2D65}' | '\u{2D6F}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+                (WidthInfo::TIFINAGH_JOINER_CONSONANT, '\u{2D31}'..='\u{2D65}' | '\u{2D6F}') => {
+                    return (-1, WidthInfo::DEFAULT);
+                }
+
+                // Lisu tone letter combinations
+                (WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU, '\u{A4F8}'..='\u{A4FB}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+
+                // Old Turkic ligature
+                (WidthInfo::ZWJ_OLD_TURKIC_LETTER_ORKHON_I, '\u{10C32}') => {
+                    return (0, WidthInfo::DEFAULT);
+                }
+                // Emoji modifier
+                (WidthInfo::EMOJI_MODIFIER, _) if is_emoji_modifier_base(c) => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION);
+                }
+
+                // Regional indicator
+                (
+                    WidthInfo::REGIONAL_INDICATOR | WidthInfo::SEVERAL_REGIONAL_INDICATOR,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (1, WidthInfo::SEVERAL_REGIONAL_INDICATOR),
+
+                // ZWJ emoji
+                (
+                    WidthInfo::EMOJI_PRESENTATION
+                    | WidthInfo::SEVERAL_REGIONAL_INDICATOR
+                    | WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::EMOJI_MODIFIER,
+                    '\u{200D}',
+                ) => return (0, WidthInfo::ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{20E3}') => {
+                    return (0, WidthInfo::KEYCAP_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::VS16_ZWJ_EMOJI_PRESENTATION, _) if starts_emoji_presentation_seq(c) => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+                (WidthInfo::VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION, '0'..='9' | '#' | '*') => {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{1F1E6}'..='\u{1F1FF}') => {
+                    return (1, WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION);
+                }
+                (
+                    WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION
+                    | WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (-1, WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (
+                    WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+                    '\u{1F1E6}'..='\u{1F1FF}',
+                ) => return (3, WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{1F3FB}'..='\u{1F3FF}') => {
+                    return (0, WidthInfo::EMOJI_MODIFIER);
+                }
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, '\u{E007F}') => {
+                    return (0, WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION, '\u{E0061}'..='\u{E007A}') => {
+                    return (0, WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION)
+                }
+                (
+                    WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION,
+                    '\u{E0030}'..='\u{E0039}',
+                ) => return (0, WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION),
+                (WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION, '\u{E0030}'..='\u{E0039}') => {
+                    return (0, WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION, '\u{E0030}'..='\u{E0039}') => {
+                    return (0, WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION);
+                }
+                (
+                    WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION
+                    | WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION,
+                    '\u{1F3F4}',
+                ) => return (0, WidthInfo::EMOJI_PRESENTATION),
+                (WidthInfo::ZWJ_EMOJI_PRESENTATION, _)
+                    if lookup_width_cjk(c).1 == WidthInfo::EMOJI_PRESENTATION =>
+                {
+                    return (0, WidthInfo::EMOJI_PRESENTATION)
+                }
+
+                // Fallback
+                _ => {}
+            }
+        }
+
+        let ret = lookup_width_cjk(c);
+        (ret.0 as i8, ret.1)
+    }
+}
+
+#[cfg(feature = "cjk")]
+#[inline]
+pub fn str_width_cjk(s: &str) -> usize {
+    s.chars()
+        .rfold(
+            (0, WidthInfo::DEFAULT),
+            |(sum, next_info), c| -> (usize, WidthInfo) {
+                let (add, info) = width_in_str_cjk(c, next_info);
+                (sum.wrapping_add_signed(isize::from(add)), info)
+            },
+        )
+        .0
+}
+
+/// Whether this character is a zero-width character with
+/// `Joining_Type=Transparent`. Used by the Alef-Lamed ligatures.
+/// See also [`is_ligature_transparent`], a near-subset of this (only ZWJ is excepted)
+/// which is transparent for non-Arabic ligatures.
+fn is_transparent_zero_width(c: char) -> bool {
+    if lookup_width(c).0 != 0 {
+        // Not zero-width
+        false
+    } else {
+        let cp: u32 = c.into();
+        NON_TRANSPARENT_ZERO_WIDTHS
+            .binary_search_by(|&(lo, hi)| {
+                let lo = u32::from_le_bytes([lo[0], lo[1], lo[2], 0]);
+                let hi = u32::from_le_bytes([hi[0], hi[1], hi[2], 0]);
+                if cp < lo {
+                    Ordering::Greater
+                } else if cp > hi {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            })
+            .is_err()
+    }
+}
+
+/// Whether this character is a default-ignorable combining mark
+/// or ZWJ. These characters won't interrupt non-Arabic ligatures.
+fn is_ligature_transparent(c: char) -> bool {
+    matches!(c, '\u{34F}' | '\u{17B4}'..='\u{17B5}' | '\u{180B}'..='\u{180D}' | '\u{180F}' | '\u{200D}' | '\u{FE00}'..='\u{FE0F}' | '\u{E0100}'..='\u{E01EF}')
+}
+
+/// Whether this character is transparent wrt the effect of
+/// U+0338 COMBINING LONG SOLIDUS OVERLAY
+/// on its base character.
+#[cfg(feature = "cjk")]
+fn is_solidus_transparent(c: char) -> bool {
+    let cp: u32 = c.into();
+    is_ligature_transparent(c)
+        || SOLIDUS_TRANSPARENT
+            .binary_search_by(|&(lo, hi)| {
+                let lo = u32::from_le_bytes([lo[0], lo[1], lo[2], 0]);
+                let hi = u32::from_le_bytes([hi[0], hi[1], hi[2], 0]);
+                if cp < lo {
+                    Ordering::Greater
+                } else if cp > hi {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            })
+            .is_ok()
+}
+
+/// Whether this character forms an [emoji presentation sequence]
+/// (https://www.unicode.org/reports/tr51/#def_emoji_presentation_sequence)
+/// when followed by `'\u{FEOF}'`.
+/// Emoji presentation sequences are considered to have width 2.
+#[inline]
+pub fn starts_emoji_presentation_seq(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 10 LSB
+    let top_bits = cp >> 10;
+    let idx_of_leaf: usize = match top_bits {
+        0x0 => 0,
+        0x8 => 1,
+        0x9 => 2,
+        0xA => 3,
+        0xC => 4,
+        0x7C => 5,
+        0x7D => 6,
+        _ => return false,
+    };
+    // Extract the 3-9th (0-indexed) least significant bits of `cp`,
+    // and use them to index into `leaf_row`.
+    let idx_within_leaf = usize::try_from((cp >> 3) & 0x7F).unwrap();
+    let leaf_byte = EMOJI_PRESENTATION_LEAVES.0[idx_of_leaf][idx_within_leaf];
+    // Use the 3 LSB of `cp` to index into `leaf_byte`.
+    ((leaf_byte >> (cp & 7)) & 1) == 1
+}
+
+/// Returns `true` if `c` has default emoji presentation, but forms a [text presentation sequence]
+/// (https://www.unicode.org/reports/tr51/#def_text_presentation_sequence)
+/// when followed by `'\u{FEOE}'`, and is not ideographic.
+/// Such sequences are considered to have width 1.
+#[inline]
+pub fn starts_non_ideographic_text_presentation_seq(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 8 LSB
+    let top_bits = cp >> 8;
+    let leaf: &[(u8, u8)] = match top_bits {
+        0x23 => &TEXT_PRESENTATION_LEAF_0,
+        0x25 => &TEXT_PRESENTATION_LEAF_1,
+        0x26 => &TEXT_PRESENTATION_LEAF_2,
+        0x27 => &TEXT_PRESENTATION_LEAF_3,
+        0x2B => &TEXT_PRESENTATION_LEAF_4,
+        0x1F0 => &TEXT_PRESENTATION_LEAF_5,
+        0x1F3 => &TEXT_PRESENTATION_LEAF_6,
+        0x1F4 => &TEXT_PRESENTATION_LEAF_7,
+        0x1F5 => &TEXT_PRESENTATION_LEAF_8,
+        0x1F6 => &TEXT_PRESENTATION_LEAF_9,
+        _ => return false,
+    };
+
+    let bottom_bits = (cp & 0xFF) as u8;
+    leaf.binary_search_by(|&(lo, hi)| {
+        if bottom_bits < lo {
+            Ordering::Greater
+        } else if bottom_bits > hi {
+            Ordering::Less
+        } else {
+            Ordering::Equal
+        }
+    })
+    .is_ok()
+}
+
+/// Returns `true` if `c` is an `Emoji_Modifier_Base`.
+#[inline]
+pub fn is_emoji_modifier_base(c: char) -> bool {
+    let cp: u32 = c.into();
+    // First level of lookup uses all but 8 LSB
+    let top_bits = cp >> 8;
+    let leaf: &[(u8, u8)] = match top_bits {
+        0x26 => &EMOJI_MODIFIER_LEAF_0,
+        0x27 => &EMOJI_MODIFIER_LEAF_1,
+        0x1F3 => &EMOJI_MODIFIER_LEAF_2,
+        0x1F4 => &EMOJI_MODIFIER_LEAF_3,
+        0x1F5 => &EMOJI_MODIFIER_LEAF_4,
+        0x1F6 => &EMOJI_MODIFIER_LEAF_5,
+        0x1F9 => &EMOJI_MODIFIER_LEAF_6,
+        0x1FA => &EMOJI_MODIFIER_LEAF_7,
+        _ => return false,
+    };
+
+    let bottom_bits = (cp & 0xFF) as u8;
+    leaf.binary_search_by(|&(lo, hi)| {
+        if bottom_bits < lo {
+            Ordering::Greater
+        } else if bottom_bits > hi {
+            Ordering::Less
+        } else {
+            Ordering::Equal
+        }
+    })
+    .is_ok()
+}
+
+#[repr(align(32))]
+struct Align32<T>(T);
+
+#[repr(align(64))]
+struct Align64<T>(T);
+
+#[repr(align(128))]
+struct Align128<T>(T);
+/// Autogenerated. 1 sub-table(s). Consult [`lookup_width`] for layout info.)
+static WIDTH_ROOT: Align128<[u8; 256]> = Align128([
+    0x00, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x10, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+]);
+/// Autogenerated. 17 sub-table(s). Consult [`lookup_width`] for layout info.)
+#[cfg(feature = "cjk")]
+static WIDTH_ROOT_CJK: Align128<[u8; 256]> = Align128([
+    0x11, 0x12, 0x02, 0x03, 0x03, 0x04, 0x05, 0x13, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x14,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+    0x10, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+]);
+
+#[cfg(feature = "cjk")]
+const WIDTH_MIDDLE_LEN: usize = 21;
+#[cfg(not(feature = "cjk"))]
+const WIDTH_MIDDLE_LEN: usize = 17;
+/// Autogenerated. 4 sub-table(s). Consult [`lookup_width`] for layout info.
+static WIDTH_MIDDLE: Align64<[[u8; 64]; WIDTH_MIDDLE_LEN]> = Align64([
+    [
+        0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x02, 0x05, 0x06, 0x07, 0x08,
+        0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x02, 0x02, 0x1E, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x02, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x02, 0x2A,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x2B, 0x2C, 0x02, 0x02, 0x02, 0x02, 0x2D, 0x2E, 0x02, 0x02, 0x02, 0x2F, 0x30, 0x31, 0x32,
+        0x33, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x34, 0x02, 0x02, 0x35, 0x36, 0x37, 0x02, 0x38,
+        0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x40, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x41, 0x02, 0x02, 0x42, 0x43, 0x02,
+        0x02, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x02, 0x4A, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x4B, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x39, 0x39, 0x39, 0x39, 0x4C, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x4D, 0x4E, 0x4F, 0x50,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x51, 0x02, 0x52, 0x53, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x54, 0x55, 0x02, 0x02, 0x56, 0x02, 0x57, 0x02, 0x02, 0x58,
+        0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x02, 0x62, 0x63, 0x02, 0x64, 0x65,
+        0x66, 0x67, 0x02, 0x68, 0x02, 0x69, 0x6A, 0x6B, 0x6C, 0x02, 0x02, 0x6D, 0x6E, 0x6F, 0x70,
+        0x02, 0x71, 0x72, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x73, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x74, 0x75, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x76, 0x77, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x78, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x79, 0x7A, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x7B, 0x39, 0x39, 0x7C, 0x39, 0x39, 0x7D, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x7E, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x7F, 0x02, 0x02, 0x02, 0x80, 0x81, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x83, 0x84, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x85, 0x86, 0x75, 0x02, 0x02, 0x87, 0x02, 0x02, 0x02, 0x88, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x89, 0x8A, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x8B, 0x8C, 0x02, 0x8D, 0x8E, 0x02, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+        0x96, 0x02, 0x97, 0x02, 0x02, 0x98, 0x99, 0x9A, 0x9B, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x9C,
+    ],
+    [
+        0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D,
+        0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D,
+        0x1D, 0x1D, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x00, 0x9D, 0x02, 0x02, 0x02, 0x02, 0x9E, 0x9F, 0x02, 0x04, 0x02, 0x05, 0x06, 0x07, 0x08,
+        0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x02, 0x02, 0x1E, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x02, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x02, 0x2A,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0x2E, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD,
+        0x33, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0xAE, 0x02, 0x02, 0x35, 0x36, 0x37, 0x02, 0x38,
+        0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0xAF, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
+        0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x4C, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0xB0, 0x4E, 0x4F, 0xB1,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x85, 0x86, 0x75, 0x02, 0x02, 0x87, 0x02, 0x02, 0x02, 0x88, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x89, 0x8A, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x8B, 0x8C, 0xB2, 0xB3, 0x8E, 0x02, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+        0x96, 0x02, 0x97, 0x02, 0x02, 0x98, 0x99, 0x9A, 0x9B, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02,
+    ],
+]);
+
+#[cfg(feature = "cjk")]
+const WIDTH_LEAVES_LEN: usize = 180;
+#[cfg(not(feature = "cjk"))]
+const WIDTH_LEAVES_LEN: usize = 157;
+/// Autogenerated. 180 sub-table(s). Consult [`lookup_width`] for layout info.
+static WIDTH_LEAVES: Align32<[[u8; 32]; WIDTH_LEAVES_LEN]> = Align32([
+    [
+        0x55, 0x55, 0x75, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xD7, 0x77, 0x75, 0xFF,
-        0xF7, 0x7F, 0xFF, 0x55, 0x75, 0x55, 0x55, 0x57, 0xD5, 0x57, 0xF5, 0x5F, 0x75, 0x7F, 0x5F,
-        0xF7, 0xD5, 0x7F, 0x77, 0x5D, 0x55, 0x55, 0x55, 0xDD, 0x55, 0xD5, 0x55, 0x55, 0xF5, 0xD5,
-        0x55, 0xFD, 0x55, 0x57, 0xD5, 0x7F, 0x57, 0xFF, 0x5D, 0xF5, 0x55, 0x55, 0x55, 0x55, 0xF5,
-        0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x75, 0x77, 0x77, 0x77, 0x57,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5D, 0x55, 0x55,
-        0x55, 0x5D, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD7, 0xFD, 0x5D, 0x57, 0x55,
-        0xFF, 0xDD, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0xFD, 0xFF, 0xFF, 0xFF, 0xDF, 0xFF, 0x5F, 0x55, 0xFD, 0xFF, 0xFF, 0xFF, 0xDF, 0xFF,
-        0x5F, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5D,
-        0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0x5D, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x15, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x10, 0x41, 0x10, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x00, 0x50, 0x55, 0x55, 0x00, 0x00, 0x40, 0x54, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55,
-        0x55, 0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x10, 0x00,
-        0x14, 0x04, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x51, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x05, 0x10, 0x00, 0x00, 0x01, 0x01, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x50, 0x55, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x15, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x10, 0x41, 0x10, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x51, 0x55, 0x55, 0x00, 0x00, 0x40, 0x54, 0xF5, 0xDD, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0xFC, 0x5D,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x14, 0x00, 0x14, 0x04, 0x50, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x15, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD5, 0x57,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x54, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x55,
+        0x55, 0x51,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x10, 0x00, 0x00, 0x01, 0x01, 0x50, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+    [
+        0x7F, 0x55, 0x55, 0x55, 0x50, 0x55, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
         0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45,
         0x54, 0x01, 0x00, 0x54, 0x51, 0x01, 0x00, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x54, 0x01, 0x54, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x45, 0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x54, 0x41, 0x15, 0x14, 0x50, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x50, 0x51, 0x55, 0x55, 0x01, 0x10, 0x54, 0x51, 0x55, 0x55, 0x55, 0x55, 0x05,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x14, 0x01, 0x54, 0x55, 0x51, 0x55, 0x41, 0x55,
-        0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x55, 0x55, 0x51, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x54, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x04, 0x54, 0x05, 0x04,
-        0x50, 0x55, 0x41, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45,
-        0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x54,
-        0x01, 0x54, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x05, 0x44, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x44, 0x01, 0x54, 0x55, 0x51, 0x55, 0x15, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x45,
+    ],
+    [
+        0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x54, 0x41, 0x15, 0x14, 0x50, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x51,
+        0x55, 0x55,
+    ],
+    [
+        0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x54, 0x01, 0x10, 0x54, 0x51, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x05, 0x00,
+    ],
+    [
+        0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x04, 0x01, 0x54, 0x55, 0x51, 0x55, 0x01, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x45, 0x54, 0x55, 0x55, 0x51, 0x55, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x54, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x04, 0x54, 0x05, 0x04, 0x50, 0x55, 0x41, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x14, 0x44, 0x05, 0x04, 0x50, 0x55, 0x41, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15,
+        0x44, 0x01, 0x54, 0x55, 0x41, 0x55, 0x15, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x45, 0x15, 0x05, 0x44, 0x55, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x00, 0x40,
+        0x55, 0x55, 0x15, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x00, 0x00,
+        0x54, 0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x11, 0x51,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00,
+        0x00, 0x40,
+    ],
+    [
+        0x00, 0x04, 0x55, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x54, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x04, 0x00, 0x41,
+        0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x05, 0x54, 0x55, 0x55, 0x55, 0x01, 0x54,
+        0x55, 0x55,
+    ],
+    [
+        0x45, 0x41, 0x55, 0x51, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x51, 0x00, 0x40, 0x55, 0x55, 0x15, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x51, 0x00, 0x00, 0x54, 0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x11, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00, 0x40, 0x00, 0x04, 0x55, 0x01, 0x00, 0x00,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x45, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x04, 0x00, 0x41, 0x41, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x50, 0x05, 0x54, 0x55, 0x55, 0x55, 0x01, 0x54, 0x55, 0x55, 0x45, 0x41,
-        0x55, 0x51, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA,
+        0x55, 0x55,
+    ],
+    [
         0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x10, 0x00, 0x50, 0x55, 0x45, 0x01, 0x00, 0x00, 0x55, 0x55, 0x51, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x40, 0x15, 0x54, 0x55, 0x45, 0x55, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15,
-        0x14, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x45, 0x00, 0x40, 0x44, 0x01, 0x00, 0x54, 0x15, 0x00, 0x00, 0x14, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x04, 0x40, 0x54, 0x45,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x55, 0x55, 0x55,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x05, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x7F, 0xFF, 0xFD, 0xF7, 0xFF, 0xFD, 0xD7, 0x5F, 0x77, 0xD6, 0xD5, 0xD7, 0x55, 0x10, 0x00,
+        0x50, 0x55, 0x45, 0x01, 0x00, 0x00, 0x55, 0x57, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x15, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40, 0x15, 0x54, 0x55, 0x45, 0x55, 0x01,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x57, 0x15, 0x14, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x00, 0x40, 0x44, 0x01, 0x00, 0x54, 0x15, 0x00,
+        0x00, 0x14,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00,
+        0x50, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x50, 0x10, 0x50, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x50, 0x11, 0x50, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00,
-        0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40, 0x00, 0x00, 0x00, 0x04, 0x00, 0x54, 0x51,
-        0x55, 0x54, 0x50, 0x55, 0x55, 0x55, 0x15, 0x00, 0xD7, 0x7F, 0x5F, 0x5F, 0x7F, 0xFF, 0x05,
-        0x40, 0xF7, 0x5D, 0xD5, 0x75, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x04,
-        0x00, 0x00, 0x55, 0x57, 0x55, 0xD5, 0xFD, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0xD5, 0x5D, 0x5D, 0x55, 0xD5, 0x75, 0x55,
-        0x55, 0x7D, 0x75, 0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD5, 0x57,
-        0xD5, 0x7F, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0x5F, 0x55, 0x55, 0x55, 0x5D, 0x55, 0xFF,
-        0xFF, 0x5F, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5F, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x75, 0x57, 0x55, 0x55, 0x55, 0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xF7, 0xD5, 0xD7,
-        0xD5, 0x5D, 0x5D, 0x75, 0xFD, 0xD7, 0xDD, 0xFF, 0x77, 0x55, 0xFF, 0x55, 0x5F, 0x55, 0x55,
-        0x57, 0x57, 0x75, 0x55, 0x55, 0x55, 0x5F, 0xFF, 0xF5, 0xF5, 0x55, 0x55, 0x55, 0x55, 0xF5,
-        0xF5, 0x55, 0x55, 0x55, 0x5D, 0x5D, 0x55, 0x55, 0x5D, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD5,
-        0x55, 0x55, 0x55, 0x55, 0x75, 0x55, 0xA5, 0x55, 0x55, 0x55, 0x69, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xA9, 0x56, 0x96, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x5F, 0x55, 0x55, 0xDF,
-        0xFF, 0x5F, 0x55, 0xF5, 0xF5, 0x55, 0x5F, 0x5F, 0xF5, 0xD7, 0xF5, 0x5F, 0x55, 0x55, 0x55,
-        0xF5, 0x5F, 0x55, 0xD5, 0x55, 0x55, 0x55, 0x69, 0x55, 0x7D, 0x5D, 0xF5, 0x55, 0x5A, 0x55,
-        0x77, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x77, 0x55, 0xAA, 0xAA, 0xAA, 0x55,
-        0x55, 0x55, 0xDF, 0xDF, 0x7F, 0xDF, 0x55, 0x55, 0x55, 0x95, 0x55, 0x55, 0x55, 0x55, 0x95,
-        0x55, 0x55, 0xF5, 0x59, 0x55, 0xA5, 0x55, 0x55, 0x55, 0x55, 0xE9, 0x55, 0xFA, 0xFF, 0xEF,
-        0xFF, 0xFE, 0xFF, 0xFF, 0xDF, 0x55, 0xEF, 0xFF, 0xAF, 0xFB, 0xEF, 0xFB, 0x55, 0x59, 0xA5,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56, 0x55, 0x55, 0x55, 0x55, 0x5D, 0x55, 0x55,
-        0x55, 0x66, 0x95, 0x9A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xF5, 0xFF, 0xFF, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0xA9, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56, 0x55, 0x55, 0x95,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x95, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x56, 0xF9, 0x5F, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x50,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x9A, 0xAA, 0xAA, 0xAA, 0xAA,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x05, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x40, 0x00, 0x00, 0x00, 0x04, 0x00, 0x54, 0x51, 0x55, 0x54,
+        0x50, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
+        0x55, 0x55, 0x15, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x40, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xF5, 0x55, 0x55, 0x55, 0x69, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFD, 0x57, 0xD7, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x7D,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x5F, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0xD5,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0xD5, 0x55, 0x55, 0x55, 0x5D, 0x55, 0xF5, 0x55, 0x55, 0x55, 0x55,
+        0x7D, 0x55, 0x5F, 0x55, 0x75, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x75, 0x55, 0xF5, 0x5D,
+        0x75, 0x5D,
+    ],
+    [
+        0x55, 0x5D, 0xF5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x77, 0xD5, 0xDF, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0xFD, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x55, 0x55,
+        0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x5D, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x50, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFD, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x5F, 0x55, 0xD5, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x9A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0x0A, 0xA0, 0xAA, 0xAA, 0xAA, 0x6A, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A,
-        0x81, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0xA9, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A,
         0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x95, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xFF, 0xFF, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x0A, 0x00, 0xAA, 0xAA, 0xAA,
+        0x6A, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0x81, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0x55, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x95, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0xAA, 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
         0xAA, 0xAA, 0x6A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x40,
-        0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x5F,
+    ],
+    [
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x50, 0x55, 0x55, 0x55, 0x45, 0x45, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41,
-        0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00,
-        0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x05, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x50, 0x55, 0x55,
-        0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x05, 0x50, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x40, 0x41, 0x41, 0x55, 0x55, 0x15, 0x55, 0x55,
-        0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x04, 0x14, 0x54, 0x05, 0x51,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x45, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x54, 0x51, 0x55, 0x55, 0x55,
-        0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0x5A, 0x55, 0x00, 0x00, 0x00, 0x00,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA,
-        0x6A, 0x55, 0x55, 0x55, 0x55, 0x01, 0x5D, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x40, 0x55, 0x01, 0x41, 0x55, 0x00, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40, 0x15, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01,
-        0x55, 0x05, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x05, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x14, 0x54, 0x55, 0x15, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x15, 0x40, 0x41, 0x51, 0x45, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x15, 0x00, 0x01, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x15, 0x55, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x14, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x40, 0x00,
+        0x00, 0x50,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x45, 0x45, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x55, 0x54, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x50, 0x04, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x15, 0x15, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x54, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x05,
-        0x44, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x44,
-        0x15, 0x04, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55,
+        0x45, 0x15,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x50, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x15, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0x56,
+    ],
+    [
+        0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x05, 0x50,
+        0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x40, 0x41, 0x41, 0x55,
+        0x55, 0x15, 0x55, 0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x54,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x04, 0x14, 0x54,
+        0x05, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x45,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x51, 0x54, 0x51, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x00, 0x00, 0x00, 0xF0, 0xAA, 0xAA, 0x5A, 0x55, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x15,
+    ],
+    [
+        0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0x6A, 0x55, 0x55, 0x00, 0x00,
+        0x54, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x51,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05,
-        0x50, 0x55, 0x10, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55,
+        0x40, 0x55,
+    ],
+    [
+        0x01, 0x41, 0x55, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40,
+        0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x15, 0x00, 0x40, 0x11, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x15, 0x51, 0x00, 0x10, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01,
-        0x05, 0x10, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x44, 0x15, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x00, 0x05, 0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x40,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x14, 0x40, 0x55, 0x15,
-        0x55, 0x55, 0x01, 0x40, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x05, 0x00, 0x00, 0x40, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x54, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x01,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x05, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x05, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00,
+        0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x14, 0x54,
+        0x55, 0x15,
+    ],
+    [
+        0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x40, 0x41,
+        0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x01, 0x00, 0x54, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00,
+        0x40, 0x05, 0x55, 0x01, 0x14, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x50, 0x04, 0x55,
+        0x45, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x15, 0x00, 0x40, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15,
+        0x44, 0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x55, 0x55, 0x55, 0x05, 0x00, 0x54, 0x00, 0x54,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00,
+        0x00, 0x05, 0x44, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x14, 0x00, 0x44,
+        0x11, 0x04, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x05, 0x50, 0x55,
+        0x10, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x40,
+        0x11, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x51, 0x00, 0x10, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x05, 0x10, 0x00, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x41,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x55, 0x15,
+        0x04, 0x11, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x05, 0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x01, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x04,
+        0x40, 0x55, 0x15, 0x55, 0x55, 0x01, 0x40, 0x01, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x00, 0x00, 0x00, 0x00, 0x40, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x40, 0x00,
-        0x10, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x41,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01,
-        0x40, 0x45, 0x10, 0x00, 0x10, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x50, 0x11, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x10, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x41, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x15, 0x54, 0x55, 0x55, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x05, 0x40, 0x55, 0x44, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x15, 0x00, 0x00, 0x00, 0x50, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x40, 0x45,
+        0x10, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x50, 0x11, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15,
+        0x55, 0x55,
+    ],
+    [
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x15, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0x54, 0x55, 0x55, 0x5A, 0x55, 0x55, 0x55, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0xAA, 0xAA, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA,
-        0xA9, 0xAA, 0x69, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0x55, 0x55, 0x55,
-        0x65, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x6A, 0x59, 0x55, 0x55, 0x55, 0xAA, 0x55,
-        0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x00,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x54,
+        0x55, 0x55,
+    ],
+    [
+        0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x40,
+        0x55, 0x44, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x15, 0x50, 0x55, 0x15, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x50, 0x55, 0x55, 0x55, 0x55, 0x05, 0x54, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x51, 0x55, 0x55, 0x55,
-        0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x01, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x54, 0x15, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x54,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x40, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x15, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0x54, 0x55, 0x55, 0x5A, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0x55, 0x55,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xAA, 0xAA, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xA9,
+        0xAA, 0x69,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0x55, 0x55, 0x55, 0x65, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x6A, 0x59, 0x55, 0x55, 0x55, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x41, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x11, 0x50, 0x05, 0x00, 0x00,
+        0x00, 0x00,
+    ],
+    [
+        0x40, 0x01, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x50, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x05, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x15,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x51,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x01, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
         0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x10, 0x04, 0x40, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x45, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x95, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0x7F, 0x55, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0x5F, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xAB, 0xAA,
-        0xEA, 0xFF, 0xFF, 0xFF, 0xFF, 0x57, 0x55, 0x55, 0x55, 0x55, 0x6A, 0x55, 0x55, 0x55, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0xAA, 0xAA, 0x56, 0x55,
-        0x5A, 0x55, 0x55, 0x55, 0xAA, 0x5A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x55, 0x55, 0xA9, 0xAA, 0x9A, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA6, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0x6A, 0x95, 0xAA, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x56, 0xAA,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x75, 0xFD, 0xFF, 0x7F, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+    [
+        0x6E, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xBA, 0xAA, 0xAA, 0xAA, 0xAA, 0xEA, 0xFA, 0xBF, 0xBF,
+        0x55, 0xAA, 0xAA, 0x56, 0x55, 0x5F, 0x55, 0x55, 0x55, 0xAA, 0x5A, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x57, 0x55, 0x55, 0xFD, 0xFF, 0xDF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xF7,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0x7F, 0xD5, 0xFF, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0x57, 0x57,
+        0xFF, 0xFF,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x7F, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xD7,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x5F, 0x55, 0x55, 0xD5, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0x55,
+        0x75, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x7D, 0x55, 0x55, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0xD5, 0xFF,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0x5F, 0x55, 0x57, 0x7F, 0xFD, 0x55, 0xFF, 0x55, 0x55, 0xD5, 0x57, 0x55, 0xFF,
+        0xFF, 0x57,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0x55, 0x57, 0x55,
+        0x55, 0x55,
+    ],
+    [
+        0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,
+        0xFF, 0xFF, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+    [
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF,
+        0xFF, 0x57,
+    ],
+    [
+        0xFF, 0xFF, 0x57, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xDF, 0xFF, 0x5F, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0x57, 0x55, 0xFF, 0xFF,
+        0x57, 0x55,
+    ],
+    [
         0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0x6A, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
         0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0x96, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0x55, 0x95, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-        0x55, 0x55, 0x55, 0x55, 0x65, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x69, 0x55, 0x55, 0x55,
-        0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x95, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0x5A, 0x55, 0x56, 0x6A, 0xA9,
-        0x55, 0xAA, 0x55, 0x55, 0x95, 0x56, 0x55, 0xAA, 0xAA, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0x55, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0x9A, 0xAA,
-        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55,
-        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0x56, 0xAA,
-        0xAA, 0x56, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x9A,
-        0xAA, 0x5A, 0x55, 0xA5, 0xAA, 0xAA, 0xAA, 0x55, 0xAA, 0xAA, 0x56, 0x55, 0xAA, 0xAA, 0x56,
-        0x55, 0x51, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0x5F,
+        0xAA, 0x5A,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x59, 0x96, 0x55, 0x61, 0xAA, 0xA5, 0x59,
+        0xAA, 0x55, 0x55, 0x55, 0x55, 0x55, 0x95, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x95,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x95, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x15, 0x00, 0x96, 0x6A, 0x5A, 0x5A, 0x6A, 0xAA, 0x05, 0x40, 0xA6, 0x59, 0x95,
+        0x65, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x55, 0x56,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xA9, 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x95, 0x59, 0x59, 0x55, 0x55, 0x65, 0x55, 0x55, 0x69, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x95, 0x56, 0x95, 0x6A, 0xAA, 0xAA, 0xAA, 0x55, 0xAA, 0xAA,
+        0x5A, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x59, 0x55, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0x65, 0x55, 0x55, 0x5A,
+        0x55, 0x55, 0x55, 0x55, 0xA5, 0x65, 0x56, 0x55, 0x55, 0x55, 0x95, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xA6, 0x96, 0x9A, 0x96, 0x59, 0x59, 0x65, 0xA9, 0x96, 0xAA, 0xAA, 0x66, 0x55, 0xAA, 0x55,
+        0x5A, 0x59, 0x55, 0x5A, 0x56, 0x65, 0x55, 0x55, 0x55, 0x6A, 0xAA, 0xA5, 0xA5, 0x5A, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xA5, 0xAA, 0x5A, 0x55, 0x55, 0x59, 0x59, 0x55, 0x55, 0x59, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x95, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0x65, 0x55, 0xF5, 0x55, 0x55, 0x55, 0x69, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x9A, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xA5, 0x5A, 0x55, 0x55, 0x9A, 0xAA, 0x5A, 0x55, 0xA5, 0xA5, 0x55,
+        0x5A, 0x5A, 0xA5, 0x96, 0xA5, 0x5A, 0x55, 0x55, 0x55, 0xA5, 0x5A, 0x55, 0x95, 0x55, 0x55,
+        0x55, 0x7D,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x69, 0x59, 0xA5, 0x55, 0x5F, 0x55, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x66, 0x55, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0x55, 0x9A, 0x9A, 0x6A, 0x9A, 0x55, 0x55,
+        0x55, 0xD5,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0xD5, 0x55, 0x55, 0xA5, 0x5D, 0x55, 0xF5, 0x55, 0x55, 0x55, 0x55,
+        0xBD, 0x55, 0xAF, 0xAA, 0xBA, 0xAA, 0xAB, 0xAA, 0xAA, 0x9A, 0x55, 0xBA, 0xAA, 0xFA, 0xAE,
+        0xBA, 0xAE,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x5D, 0xF5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55,
+        0x59, 0x55, 0x55, 0x55, 0x77, 0xD5, 0xDF, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xA5,
+        0xAA, 0xAA,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xD5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0xAD, 0x5A, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x00, 0x00, 0x00, 0xC0, 0xAA, 0xAA, 0x5A, 0x55, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0xAA, 0xAA, 0x6A, 0xAA, 0x55, 0x55, 0x55,
+        0x55, 0x55,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xAA, 0x6A, 0x55, 0x55, 0x00, 0x00,
+        0x54, 0x59,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0x6A, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0xAA, 0xAA, 0xAA,
+        0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x5A, 0x55, 0xAA, 0xAA,
+        0xAA, 0xAA,
+    ],
+    #[cfg(feature = "cjk")]
+    [
+        0xAA, 0xAA, 0xAA, 0xBA, 0xFE, 0xFF, 0xBF, 0xAA, 0xAA, 0xAA, 0xAA, 0x56, 0x55, 0x55, 0x55,
+        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF,
+    ],
+]);
+
+/// Sorted list of codepoint ranges (inclusive)
+/// that are zero-width but not `Joining_Type=Transparent`
+/// FIXME: can we get better compression?
+static NON_TRANSPARENT_ZERO_WIDTHS: [([u8; 3], [u8; 3]); 53] = [
+    ([0x05, 0x06, 0x00], [0x05, 0x06, 0x00]),
+    ([0x90, 0x08, 0x00], [0x91, 0x08, 0x00]),
+    ([0xE2, 0x08, 0x00], [0xE2, 0x08, 0x00]),
+    ([0xBE, 0x09, 0x00], [0xBE, 0x09, 0x00]),
+    ([0xD7, 0x09, 0x00], [0xD7, 0x09, 0x00]),
+    ([0x3E, 0x0B, 0x00], [0x3E, 0x0B, 0x00]),
+    ([0x57, 0x0B, 0x00], [0x57, 0x0B, 0x00]),
+    ([0xBE, 0x0B, 0x00], [0xBE, 0x0B, 0x00]),
+    ([0xD7, 0x0B, 0x00], [0xD7, 0x0B, 0x00]),
+    ([0xC0, 0x0C, 0x00], [0xC0, 0x0C, 0x00]),
+    ([0xC2, 0x0C, 0x00], [0xC2, 0x0C, 0x00]),
+    ([0xC7, 0x0C, 0x00], [0xC8, 0x0C, 0x00]),
+    ([0xCA, 0x0C, 0x00], [0xCB, 0x0C, 0x00]),
+    ([0xD5, 0x0C, 0x00], [0xD6, 0x0C, 0x00]),
+    ([0x3E, 0x0D, 0x00], [0x3E, 0x0D, 0x00]),
+    ([0x4E, 0x0D, 0x00], [0x4E, 0x0D, 0x00]),
+    ([0x57, 0x0D, 0x00], [0x57, 0x0D, 0x00]),
+    ([0xCF, 0x0D, 0x00], [0xCF, 0x0D, 0x00]),
+    ([0xDF, 0x0D, 0x00], [0xDF, 0x0D, 0x00]),
+    ([0x60, 0x11, 0x00], [0xFF, 0x11, 0x00]),
+    ([0x0E, 0x18, 0x00], [0x0E, 0x18, 0x00]),
+    ([0x35, 0x1B, 0x00], [0x35, 0x1B, 0x00]),
+    ([0x3B, 0x1B, 0x00], [0x3B, 0x1B, 0x00]),
+    ([0x3D, 0x1B, 0x00], [0x3D, 0x1B, 0x00]),
+    ([0x43, 0x1B, 0x00], [0x43, 0x1B, 0x00]),
+    ([0x0C, 0x20, 0x00], [0x0D, 0x20, 0x00]),
+    ([0x65, 0x20, 0x00], [0x69, 0x20, 0x00]),
+    ([0x2E, 0x30, 0x00], [0x2F, 0x30, 0x00]),
+    ([0x64, 0x31, 0x00], [0x64, 0x31, 0x00]),
+    ([0xFA, 0xA8, 0x00], [0xFA, 0xA8, 0x00]),
+    ([0xB0, 0xD7, 0x00], [0xC6, 0xD7, 0x00]),
+    ([0xCB, 0xD7, 0x00], [0xFB, 0xD7, 0x00]),
+    ([0x9E, 0xFF, 0x00], [0xA0, 0xFF, 0x00]),
+    ([0xF0, 0xFF, 0x00], [0xF8, 0xFF, 0x00]),
+    ([0xC2, 0x11, 0x01], [0xC3, 0x11, 0x01]),
+    ([0x3E, 0x13, 0x01], [0x3E, 0x13, 0x01]),
+    ([0x57, 0x13, 0x01], [0x57, 0x13, 0x01]),
+    ([0xB0, 0x14, 0x01], [0xB0, 0x14, 0x01]),
+    ([0xBD, 0x14, 0x01], [0xBD, 0x14, 0x01]),
+    ([0xAF, 0x15, 0x01], [0xAF, 0x15, 0x01]),
+    ([0x30, 0x19, 0x01], [0x30, 0x19, 0x01]),
+    ([0x3F, 0x19, 0x01], [0x3F, 0x19, 0x01]),
+    ([0x41, 0x19, 0x01], [0x41, 0x19, 0x01]),
+    ([0x3A, 0x1A, 0x01], [0x3A, 0x1A, 0x01]),
+    ([0x84, 0x1A, 0x01], [0x89, 0x1A, 0x01]),
+    ([0x46, 0x1D, 0x01], [0x46, 0x1D, 0x01]),
+    ([0x02, 0x1F, 0x01], [0x02, 0x1F, 0x01]),
+    ([0x65, 0xD1, 0x01], [0x65, 0xD1, 0x01]),
+    ([0x6E, 0xD1, 0x01], [0x72, 0xD1, 0x01]),
+    ([0x00, 0x00, 0x0E], [0x00, 0x00, 0x0E]),
+    ([0x02, 0x00, 0x0E], [0x1F, 0x00, 0x0E]),
+    ([0x80, 0x00, 0x0E], [0xFF, 0x00, 0x0E]),
+    ([0xF0, 0x01, 0x0E], [0xFF, 0x0F, 0x0E]),
+];
+
+/// Sorted list of codepoint ranges (inclusive)
+/// that don't affect how the combining solidus applies
+/// (mostly ccc > 1).
+/// FIXME: can we get better compression?
+#[cfg(feature = "cjk")]
+static SOLIDUS_TRANSPARENT: [([u8; 3], [u8; 3]); 198] = [
+    ([0x00, 0x03, 0x00], [0x33, 0x03, 0x00]),
+    ([0x39, 0x03, 0x00], [0x6F, 0x03, 0x00]),
+    ([0x83, 0x04, 0x00], [0x87, 0x04, 0x00]),
+    ([0x91, 0x05, 0x00], [0xBD, 0x05, 0x00]),
+    ([0xBF, 0x05, 0x00], [0xBF, 0x05, 0x00]),
+    ([0xC1, 0x05, 0x00], [0xC2, 0x05, 0x00]),
+    ([0xC4, 0x05, 0x00], [0xC5, 0x05, 0x00]),
+    ([0xC7, 0x05, 0x00], [0xC7, 0x05, 0x00]),
+    ([0x10, 0x06, 0x00], [0x1A, 0x06, 0x00]),
+    ([0x4B, 0x06, 0x00], [0x5F, 0x06, 0x00]),
+    ([0x70, 0x06, 0x00], [0x70, 0x06, 0x00]),
+    ([0xD6, 0x06, 0x00], [0xDC, 0x06, 0x00]),
+    ([0xDF, 0x06, 0x00], [0xE4, 0x06, 0x00]),
+    ([0xE7, 0x06, 0x00], [0xE8, 0x06, 0x00]),
+    ([0xEA, 0x06, 0x00], [0xED, 0x06, 0x00]),
+    ([0x11, 0x07, 0x00], [0x11, 0x07, 0x00]),
+    ([0x30, 0x07, 0x00], [0x4A, 0x07, 0x00]),
+    ([0xEB, 0x07, 0x00], [0xF3, 0x07, 0x00]),
+    ([0xFD, 0x07, 0x00], [0xFD, 0x07, 0x00]),
+    ([0x16, 0x08, 0x00], [0x19, 0x08, 0x00]),
+    ([0x1B, 0x08, 0x00], [0x23, 0x08, 0x00]),
+    ([0x25, 0x08, 0x00], [0x27, 0x08, 0x00]),
+    ([0x29, 0x08, 0x00], [0x2D, 0x08, 0x00]),
+    ([0x59, 0x08, 0x00], [0x5B, 0x08, 0x00]),
+    ([0x98, 0x08, 0x00], [0x9F, 0x08, 0x00]),
+    ([0xCA, 0x08, 0x00], [0xE1, 0x08, 0x00]),
+    ([0xE3, 0x08, 0x00], [0xFF, 0x08, 0x00]),
+    ([0x3C, 0x09, 0x00], [0x3C, 0x09, 0x00]),
+    ([0x4D, 0x09, 0x00], [0x4D, 0x09, 0x00]),
+    ([0x51, 0x09, 0x00], [0x54, 0x09, 0x00]),
+    ([0xBC, 0x09, 0x00], [0xBC, 0x09, 0x00]),
+    ([0xCD, 0x09, 0x00], [0xCD, 0x09, 0x00]),
+    ([0xFE, 0x09, 0x00], [0xFE, 0x09, 0x00]),
+    ([0x3C, 0x0A, 0x00], [0x3C, 0x0A, 0x00]),
+    ([0x4D, 0x0A, 0x00], [0x4D, 0x0A, 0x00]),
+    ([0xBC, 0x0A, 0x00], [0xBC, 0x0A, 0x00]),
+    ([0xCD, 0x0A, 0x00], [0xCD, 0x0A, 0x00]),
+    ([0x3C, 0x0B, 0x00], [0x3C, 0x0B, 0x00]),
+    ([0x4D, 0x0B, 0x00], [0x4D, 0x0B, 0x00]),
+    ([0xCD, 0x0B, 0x00], [0xCD, 0x0B, 0x00]),
+    ([0x3C, 0x0C, 0x00], [0x3C, 0x0C, 0x00]),
+    ([0x4D, 0x0C, 0x00], [0x4D, 0x0C, 0x00]),
+    ([0x55, 0x0C, 0x00], [0x56, 0x0C, 0x00]),
+    ([0xBC, 0x0C, 0x00], [0xBC, 0x0C, 0x00]),
+    ([0xCD, 0x0C, 0x00], [0xCD, 0x0C, 0x00]),
+    ([0x3B, 0x0D, 0x00], [0x3C, 0x0D, 0x00]),
+    ([0x4D, 0x0D, 0x00], [0x4D, 0x0D, 0x00]),
+    ([0xCA, 0x0D, 0x00], [0xCA, 0x0D, 0x00]),
+    ([0x38, 0x0E, 0x00], [0x3A, 0x0E, 0x00]),
+    ([0x48, 0x0E, 0x00], [0x4B, 0x0E, 0x00]),
+    ([0xB8, 0x0E, 0x00], [0xBA, 0x0E, 0x00]),
+    ([0xC8, 0x0E, 0x00], [0xCB, 0x0E, 0x00]),
+    ([0x18, 0x0F, 0x00], [0x19, 0x0F, 0x00]),
+    ([0x35, 0x0F, 0x00], [0x35, 0x0F, 0x00]),
+    ([0x37, 0x0F, 0x00], [0x37, 0x0F, 0x00]),
+    ([0x39, 0x0F, 0x00], [0x39, 0x0F, 0x00]),
+    ([0x71, 0x0F, 0x00], [0x75, 0x0F, 0x00]),
+    ([0x7A, 0x0F, 0x00], [0x7D, 0x0F, 0x00]),
+    ([0x80, 0x0F, 0x00], [0x84, 0x0F, 0x00]),
+    ([0x86, 0x0F, 0x00], [0x87, 0x0F, 0x00]),
+    ([0xC6, 0x0F, 0x00], [0xC6, 0x0F, 0x00]),
+    ([0x37, 0x10, 0x00], [0x37, 0x10, 0x00]),
+    ([0x39, 0x10, 0x00], [0x3A, 0x10, 0x00]),
+    ([0x8D, 0x10, 0x00], [0x8D, 0x10, 0x00]),
+    ([0x5D, 0x13, 0x00], [0x5F, 0x13, 0x00]),
+    ([0x14, 0x17, 0x00], [0x15, 0x17, 0x00]),
+    ([0x34, 0x17, 0x00], [0x34, 0x17, 0x00]),
+    ([0xD2, 0x17, 0x00], [0xD2, 0x17, 0x00]),
+    ([0xDD, 0x17, 0x00], [0xDD, 0x17, 0x00]),
+    ([0xA9, 0x18, 0x00], [0xA9, 0x18, 0x00]),
+    ([0x39, 0x19, 0x00], [0x3B, 0x19, 0x00]),
+    ([0x17, 0x1A, 0x00], [0x18, 0x1A, 0x00]),
+    ([0x60, 0x1A, 0x00], [0x60, 0x1A, 0x00]),
+    ([0x75, 0x1A, 0x00], [0x7C, 0x1A, 0x00]),
+    ([0x7F, 0x1A, 0x00], [0x7F, 0x1A, 0x00]),
+    ([0xB0, 0x1A, 0x00], [0xBD, 0x1A, 0x00]),
+    ([0xBF, 0x1A, 0x00], [0xCE, 0x1A, 0x00]),
+    ([0x34, 0x1B, 0x00], [0x34, 0x1B, 0x00]),
+    ([0x44, 0x1B, 0x00], [0x44, 0x1B, 0x00]),
+    ([0x6B, 0x1B, 0x00], [0x73, 0x1B, 0x00]),
+    ([0xAA, 0x1B, 0x00], [0xAB, 0x1B, 0x00]),
+    ([0xE6, 0x1B, 0x00], [0xE6, 0x1B, 0x00]),
+    ([0xF2, 0x1B, 0x00], [0xF3, 0x1B, 0x00]),
+    ([0x37, 0x1C, 0x00], [0x37, 0x1C, 0x00]),
+    ([0xD0, 0x1C, 0x00], [0xD2, 0x1C, 0x00]),
+    ([0xD5, 0x1C, 0x00], [0xE0, 0x1C, 0x00]),
+    ([0xED, 0x1C, 0x00], [0xED, 0x1C, 0x00]),
+    ([0xF4, 0x1C, 0x00], [0xF4, 0x1C, 0x00]),
+    ([0xF8, 0x1C, 0x00], [0xF9, 0x1C, 0x00]),
+    ([0xC0, 0x1D, 0x00], [0xFF, 0x1D, 0x00]),
+    ([0xD0, 0x20, 0x00], [0xD1, 0x20, 0x00]),
+    ([0xD4, 0x20, 0x00], [0xD7, 0x20, 0x00]),
+    ([0xDB, 0x20, 0x00], [0xDC, 0x20, 0x00]),
+    ([0xE1, 0x20, 0x00], [0xE1, 0x20, 0x00]),
+    ([0xE7, 0x20, 0x00], [0xE9, 0x20, 0x00]),
+    ([0xEC, 0x20, 0x00], [0xF0, 0x20, 0x00]),
+    ([0xEF, 0x2C, 0x00], [0xF1, 0x2C, 0x00]),
+    ([0x7F, 0x2D, 0x00], [0x7F, 0x2D, 0x00]),
+    ([0xE0, 0x2D, 0x00], [0xFF, 0x2D, 0x00]),
+    ([0x2A, 0x30, 0x00], [0x2F, 0x30, 0x00]),
+    ([0x99, 0x30, 0x00], [0x9A, 0x30, 0x00]),
+    ([0x6F, 0xA6, 0x00], [0x6F, 0xA6, 0x00]),
+    ([0x74, 0xA6, 0x00], [0x7D, 0xA6, 0x00]),
+    ([0x9E, 0xA6, 0x00], [0x9F, 0xA6, 0x00]),
+    ([0xF0, 0xA6, 0x00], [0xF1, 0xA6, 0x00]),
+    ([0x06, 0xA8, 0x00], [0x06, 0xA8, 0x00]),
+    ([0x2C, 0xA8, 0x00], [0x2C, 0xA8, 0x00]),
+    ([0xC4, 0xA8, 0x00], [0xC4, 0xA8, 0x00]),
+    ([0xE0, 0xA8, 0x00], [0xF1, 0xA8, 0x00]),
+    ([0x2B, 0xA9, 0x00], [0x2D, 0xA9, 0x00]),
+    ([0x53, 0xA9, 0x00], [0x53, 0xA9, 0x00]),
+    ([0xB3, 0xA9, 0x00], [0xB3, 0xA9, 0x00]),
+    ([0xC0, 0xA9, 0x00], [0xC0, 0xA9, 0x00]),
+    ([0xB0, 0xAA, 0x00], [0xB0, 0xAA, 0x00]),
+    ([0xB2, 0xAA, 0x00], [0xB4, 0xAA, 0x00]),
+    ([0xB7, 0xAA, 0x00], [0xB8, 0xAA, 0x00]),
+    ([0xBE, 0xAA, 0x00], [0xBF, 0xAA, 0x00]),
+    ([0xC1, 0xAA, 0x00], [0xC1, 0xAA, 0x00]),
+    ([0xF6, 0xAA, 0x00], [0xF6, 0xAA, 0x00]),
+    ([0xED, 0xAB, 0x00], [0xED, 0xAB, 0x00]),
+    ([0x1E, 0xFB, 0x00], [0x1E, 0xFB, 0x00]),
+    ([0x20, 0xFE, 0x00], [0x2F, 0xFE, 0x00]),
+    ([0x1B, 0x01, 0x01], [0x1B, 0x01, 0x01]),
+    ([0x6B, 0x01, 0x01], [0x6B, 0x01, 0x01]),
+    ([0xFD, 0x01, 0x01], [0xFD, 0x01, 0x01]),
+    ([0xE0, 0x02, 0x01], [0xE0, 0x02, 0x01]),
+    ([0xF5, 0x02, 0x01], [0xF5, 0x02, 0x01]),
+    ([0x76, 0x03, 0x01], [0x7A, 0x03, 0x01]),
+    ([0xD4, 0x09, 0x01], [0xD4, 0x09, 0x01]),
+    ([0x0D, 0x0A, 0x01], [0x0D, 0x0A, 0x01]),
+    ([0x0F, 0x0A, 0x01], [0x0F, 0x0A, 0x01]),
+    ([0x38, 0x0A, 0x01], [0x38, 0x0A, 0x01]),
+    ([0x3A, 0x0A, 0x01], [0x3A, 0x0A, 0x01]),
+    ([0x3F, 0x0A, 0x01], [0x3F, 0x0A, 0x01]),
+    ([0xE5, 0x0A, 0x01], [0xE6, 0x0A, 0x01]),
+    ([0x24, 0x0D, 0x01], [0x27, 0x0D, 0x01]),
+    ([0x74, 0x0E, 0x01], [0x74, 0x0E, 0x01]),
+    ([0xAB, 0x0E, 0x01], [0xAC, 0x0E, 0x01]),
+    ([0xFD, 0x0E, 0x01], [0xFF, 0x0E, 0x01]),
+    ([0x46, 0x0F, 0x01], [0x50, 0x0F, 0x01]),
+    ([0x82, 0x0F, 0x01], [0x85, 0x0F, 0x01]),
+    ([0x46, 0x10, 0x01], [0x46, 0x10, 0x01]),
+    ([0x70, 0x10, 0x01], [0x70, 0x10, 0x01]),
+    ([0x7F, 0x10, 0x01], [0x7F, 0x10, 0x01]),
+    ([0xB9, 0x10, 0x01], [0xBA, 0x10, 0x01]),
+    ([0x00, 0x11, 0x01], [0x02, 0x11, 0x01]),
+    ([0x33, 0x11, 0x01], [0x34, 0x11, 0x01]),
+    ([0x73, 0x11, 0x01], [0x73, 0x11, 0x01]),
+    ([0xC0, 0x11, 0x01], [0xC0, 0x11, 0x01]),
+    ([0xCA, 0x11, 0x01], [0xCA, 0x11, 0x01]),
+    ([0x35, 0x12, 0x01], [0x36, 0x12, 0x01]),
+    ([0xE9, 0x12, 0x01], [0xEA, 0x12, 0x01]),
+    ([0x3B, 0x13, 0x01], [0x3C, 0x13, 0x01]),
+    ([0x4D, 0x13, 0x01], [0x4D, 0x13, 0x01]),
+    ([0x66, 0x13, 0x01], [0x6C, 0x13, 0x01]),
+    ([0x70, 0x13, 0x01], [0x74, 0x13, 0x01]),
+    ([0x42, 0x14, 0x01], [0x42, 0x14, 0x01]),
+    ([0x46, 0x14, 0x01], [0x46, 0x14, 0x01]),
+    ([0x5E, 0x14, 0x01], [0x5E, 0x14, 0x01]),
+    ([0xC2, 0x14, 0x01], [0xC3, 0x14, 0x01]),
+    ([0xBF, 0x15, 0x01], [0xC0, 0x15, 0x01]),
+    ([0x3F, 0x16, 0x01], [0x3F, 0x16, 0x01]),
+    ([0xB6, 0x16, 0x01], [0xB7, 0x16, 0x01]),
+    ([0x2B, 0x17, 0x01], [0x2B, 0x17, 0x01]),
+    ([0x39, 0x18, 0x01], [0x3A, 0x18, 0x01]),
+    ([0x3D, 0x19, 0x01], [0x3E, 0x19, 0x01]),
+    ([0x43, 0x19, 0x01], [0x43, 0x19, 0x01]),
+    ([0xE0, 0x19, 0x01], [0xE0, 0x19, 0x01]),
+    ([0x34, 0x1A, 0x01], [0x34, 0x1A, 0x01]),
+    ([0x47, 0x1A, 0x01], [0x47, 0x1A, 0x01]),
+    ([0x99, 0x1A, 0x01], [0x99, 0x1A, 0x01]),
+    ([0x3F, 0x1C, 0x01], [0x3F, 0x1C, 0x01]),
+    ([0x42, 0x1D, 0x01], [0x42, 0x1D, 0x01]),
+    ([0x44, 0x1D, 0x01], [0x45, 0x1D, 0x01]),
+    ([0x97, 0x1D, 0x01], [0x97, 0x1D, 0x01]),
+    ([0x41, 0x1F, 0x01], [0x42, 0x1F, 0x01]),
+    ([0x30, 0x6B, 0x01], [0x36, 0x6B, 0x01]),
+    ([0xF0, 0x6F, 0x01], [0xF1, 0x6F, 0x01]),
+    ([0x65, 0xD1, 0x01], [0x66, 0xD1, 0x01]),
+    ([0x6D, 0xD1, 0x01], [0x72, 0xD1, 0x01]),
+    ([0x7B, 0xD1, 0x01], [0x82, 0xD1, 0x01]),
+    ([0x85, 0xD1, 0x01], [0x8B, 0xD1, 0x01]),
+    ([0xAA, 0xD1, 0x01], [0xAD, 0xD1, 0x01]),
+    ([0x42, 0xD2, 0x01], [0x44, 0xD2, 0x01]),
+    ([0x00, 0xE0, 0x01], [0x06, 0xE0, 0x01]),
+    ([0x08, 0xE0, 0x01], [0x18, 0xE0, 0x01]),
+    ([0x1B, 0xE0, 0x01], [0x21, 0xE0, 0x01]),
+    ([0x23, 0xE0, 0x01], [0x24, 0xE0, 0x01]),
+    ([0x26, 0xE0, 0x01], [0x2A, 0xE0, 0x01]),
+    ([0x8F, 0xE0, 0x01], [0x8F, 0xE0, 0x01]),
+    ([0x30, 0xE1, 0x01], [0x36, 0xE1, 0x01]),
+    ([0xAE, 0xE2, 0x01], [0xAE, 0xE2, 0x01]),
+    ([0xEC, 0xE2, 0x01], [0xEF, 0xE2, 0x01]),
+    ([0xEC, 0xE4, 0x01], [0xEF, 0xE4, 0x01]),
+    ([0xD0, 0xE8, 0x01], [0xD6, 0xE8, 0x01]),
+    ([0x44, 0xE9, 0x01], [0x4A, 0xE9, 0x01]),
+    ([0x85, 0xEC, 0x01], [0x85, 0xEC, 0x01]),
+    ([0x15, 0xED, 0x01], [0x15, 0xED, 0x01]),
+];
+
+/// Array of 1024-bit bitmaps. Index into the correct bitmap with the 10 LSB of your codepoint
+/// to get whether it can start an emoji presentation sequence.
+static EMOJI_PRESENTATION_LEAVES: Align128<[[u8; 128]; 7]> = Align128([
+    [
+        0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x00, 0x00, 0x00, 0xFE, 0x0F, 0x07,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x40, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x78, 0x1F, 0x40, 0x32, 0x21, 0x4D, 0xC4, 0x00, 0x07, 0x05, 0xFF, 0x0F,
+        0x80, 0x69, 0x01, 0x00, 0xC8, 0x00, 0x00, 0xFC, 0x1A, 0x83, 0x0C, 0x03, 0x60, 0x30, 0xC1,
+        0x1A, 0x00, 0x00, 0x06, 0xBF, 0x27, 0x24, 0xBF, 0x54, 0x20, 0x02, 0x01, 0x18, 0x00, 0x90,
+        0x50, 0xB8, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x02, 0x00, 0x01, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ],
+    [
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ],
+    [
+        0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x20, 0x10, 0xF2, 0x1F, 0x40, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0xC8, 0xCE, 0x80, 0x70, 0x00, 0x00,
+        0x54, 0x7C, 0xF0, 0xFF, 0x01, 0x20, 0xA8, 0x00,
+    ],
+    [
+        0x00, 0x01, 0x20, 0x80, 0x40, 0x00, 0x00, 0x80, 0xC6, 0x63, 0x08, 0x00, 0x00, 0x04, 0x00,
+        0x20, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x09, 0x88, 0x00, 0x08, 0x00, 0x84, 0x70, 0x3C,
+        0x80, 0x2E, 0x00, 0x21, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF,
+        0x80, 0xF9, 0x03, 0x80, 0x3C, 0x01, 0x00, 0x20, 0x01, 0x06, 0x10, 0x1C, 0x00, 0x0E, 0x70,
+        0x0A, 0x81, 0x08, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x12, 0x01, 0x00, 0x20, 0x04, 0x16, 0x00, 0xE8,
+        0x00, 0x00, 0x3F, 0x02, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ],
+]);
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_0: [(u8, u8); 4] = [
+    (0x1A, 0x1B),
+    (0xE9, 0xEC),
+    (0xF0, 0xF0),
+    (0xF3, 0xF3),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_1: [(u8, u8); 1] = [
+    (0xFD, 0xFE),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_2: [(u8, u8); 15] = [
+    (0x14, 0x15),
+    (0x48, 0x53),
+    (0x7F, 0x7F),
+    (0x93, 0x93),
+    (0xA1, 0xA1),
+    (0xAA, 0xAB),
+    (0xBD, 0xBE),
+    (0xC4, 0xC5),
+    (0xCE, 0xCE),
+    (0xD4, 0xD4),
+    (0xEA, 0xEA),
+    (0xF2, 0xF3),
+    (0xF5, 0xF5),
+    (0xFA, 0xFA),
+    (0xFD, 0xFD),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_3: [(u8, u8); 10] = [
+    (0x05, 0x05),
+    (0x0A, 0x0B),
+    (0x28, 0x28),
+    (0x4C, 0x4C),
+    (0x4E, 0x4E),
+    (0x53, 0x55),
+    (0x57, 0x57),
+    (0x95, 0x97),
+    (0xB0, 0xB0),
+    (0xBF, 0xBF),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_4: [(u8, u8); 3] = [
+    (0x1B, 0x1C),
+    (0x50, 0x50),
+    (0x55, 0x55),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_5: [(u8, u8); 1] = [
+    (0x04, 0x04),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_6: [(u8, u8); 13] = [
+    (0x0D, 0x0F),
+    (0x15, 0x15),
+    (0x1C, 0x1C),
+    (0x78, 0x78),
+    (0x93, 0x93),
+    (0xA7, 0xA7),
+    (0xAC, 0xAE),
+    (0xC2, 0xC2),
+    (0xC4, 0xC4),
+    (0xC6, 0xC6),
+    (0xCA, 0xCA),
+    (0xE0, 0xE0),
+    (0xED, 0xED),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_7: [(u8, u8); 22] = [
+    (0x08, 0x08),
+    (0x15, 0x15),
+    (0x1F, 0x1F),
+    (0x26, 0x26),
+    (0x42, 0x42),
+    (0x46, 0x49),
+    (0x4D, 0x4E),
+    (0x53, 0x53),
+    (0x6A, 0x6A),
+    (0x7D, 0x7D),
+    (0xA3, 0xA3),
+    (0xB0, 0xB0),
+    (0xB3, 0xB3),
+    (0xBB, 0xBB),
+    (0xBF, 0xBF),
+    (0xCB, 0xCB),
+    (0xDA, 0xDA),
+    (0xDF, 0xDF),
+    (0xE4, 0xE6),
+    (0xEA, 0xED),
+    (0xF7, 0xF7),
+    (0xF9, 0xFB),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_8: [(u8, u8); 4] = [
+    (0x08, 0x08),
+    (0x0D, 0x0D),
+    (0x12, 0x13),
+    (0x50, 0x67),
+];
+
+#[rustfmt::skip]
+static TEXT_PRESENTATION_LEAF_9: [(u8, u8); 10] = [
+    (0x10, 0x10),
+    (0x87, 0x87),
+    (0x8D, 0x8D),
+    (0x91, 0x91),
+    (0x94, 0x94),
+    (0x98, 0x98),
+    (0xAD, 0xAD),
+    (0xB2, 0xB2),
+    (0xB9, 0xBA),
+    (0xBC, 0xBC),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_0: [(u8, u8); 2] = [
+    (0x1D, 0x1D),
+    (0xF9, 0xF9),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_1: [(u8, u8); 1] = [
+    (0x0A, 0x0D),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_2: [(u8, u8); 4] = [
+    (0x85, 0x85),
+    (0xC2, 0xC4),
+    (0xC7, 0xC7),
+    (0xCA, 0xCC),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_3: [(u8, u8); 9] = [
+    (0x42, 0x43),
+    (0x46, 0x50),
+    (0x66, 0x78),
+    (0x7C, 0x7C),
+    (0x81, 0x83),
+    (0x85, 0x87),
+    (0x8F, 0x8F),
+    (0x91, 0x91),
+    (0xAA, 0xAA),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_4: [(u8, u8); 4] = [
+    (0x74, 0x75),
+    (0x7A, 0x7A),
+    (0x90, 0x90),
+    (0x95, 0x96),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_5: [(u8, u8); 6] = [
+    (0x45, 0x47),
+    (0x4B, 0x4F),
+    (0xA3, 0xA3),
+    (0xB4, 0xB6),
+    (0xC0, 0xC0),
+    (0xCC, 0xCC),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_6: [(u8, u8); 12] = [
+    (0x0C, 0x0C),
+    (0x0F, 0x0F),
+    (0x18, 0x1F),
+    (0x26, 0x26),
+    (0x30, 0x39),
+    (0x3C, 0x3E),
+    (0x77, 0x77),
+    (0xB5, 0xB6),
+    (0xB8, 0xB9),
+    (0xBB, 0xBB),
+    (0xCD, 0xCF),
+    (0xD1, 0xDD),
+];
+
+#[rustfmt::skip]
+static EMOJI_MODIFIER_LEAF_7: [(u8, u8); 2] = [
+    (0xC3, 0xC5),
+    (0xF0, 0xF8),
+];
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn str_width_test(s: &str, init: WidthInfo) -> isize {
+        s.chars()
+            .rfold((0, init), |(sum, next_info), c| -> (isize, WidthInfo) {
+                let (add, info) = width_in_str(c, next_info);
+                (sum.checked_add(isize::from(add)).unwrap(), info)
+            })
+            .0
+    }
+
+    #[cfg(feature = "cjk")]
+    fn str_width_test_cjk(s: &str, init: WidthInfo) -> isize {
+        s.chars()
+            .rfold((0, init), |(sum, next_info), c| -> (isize, WidthInfo) {
+                let (add, info) = width_in_str_cjk(c, next_info);
+                (sum.checked_add(isize::from(add)).unwrap(), info)
+            })
+            .0
+    }
+
+    #[test]
+    fn test_normalization() {
+        for &(orig, nfc, nfd, nfkc, nfkd) in &NORMALIZATION_TEST {
+            for init in NORMALIZATION_TEST_WIDTHS {
+                assert_eq!(
+                    str_width_test(orig, init),
+                    str_width_test(nfc, init),
+                    "width of X = {orig:?} differs from toNFC(X) = {nfc:?} with mode {init:X?}",
+                );
+                assert_eq!(
+                    str_width_test(orig, init),
+                    str_width_test(nfd, init),
+                    "width of X = {orig:?} differs from toNFD(X) = {nfd:?} with mode {init:X?}",
+                );
+                assert_eq!(
+                    str_width_test(nfkc, init),
+                    str_width_test(nfkd, init),
+                    "width of toNFKC(X) = {nfkc:?} differs from toNFKD(X) = {nfkd:?} with mode {init:X?}",
+                );
+            }
+
+            #[cfg(feature = "cjk")]
+            for init in NORMALIZATION_TEST_WIDTHS_CJK {
+                assert_eq!(
+                    str_width_test_cjk(orig, init),
+                    str_width_test_cjk(nfc, init),
+                    "CJK width of X = {orig:?} differs from toNFC(X) = {nfc:?} with mode {init:X?}",
+                );
+                assert_eq!(
+                    str_width_test_cjk(orig, init),
+                    str_width_test_cjk(nfd, init),
+                    "CJK width of X = {orig:?} differs from toNFD(X) = {nfd:?} with mode {init:X?}",
+                );
+                assert_eq!(
+                    str_width_test_cjk(nfkc, init),
+                    str_width_test_cjk(nfkd, init),
+                    "CJK width of toNFKC(X) = {nfkc:?} differs from toNFKD(X) = {nfkd:?} with mode {init:?}",
+                );
+            }
+        }
+    }
+
+    static NORMALIZATION_TEST_WIDTHS: [WidthInfo; 38] = [
+        WidthInfo::DEFAULT,
+        WidthInfo::LINE_FEED,
+        WidthInfo::EMOJI_MODIFIER,
+        WidthInfo::REGIONAL_INDICATOR,
+        WidthInfo::SEVERAL_REGIONAL_INDICATOR,
+        WidthInfo::EMOJI_PRESENTATION,
+        WidthInfo::ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VS16_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::KEYCAP_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VARIATION_SELECTOR_15,
+        WidthInfo::VARIATION_SELECTOR_16,
+        WidthInfo::JOINING_GROUP_ALEF,
+        WidthInfo::HEBREW_LETTER_LAMED,
+        WidthInfo::ZWJ_HEBREW_LETTER_LAMED,
+        WidthInfo::BUGINESE_LETTER_YA,
+        WidthInfo::ZWJ_BUGINESE_LETTER_YA,
+        WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA,
+        WidthInfo::TIFINAGH_CONSONANT,
+        WidthInfo::ZWJ_TIFINAGH_CONSONANT,
+        WidthInfo::TIFINAGH_JOINER_CONSONANT,
+        WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU,
+        WidthInfo::OLD_TURKIC_LETTER_ORKHON_I,
+        WidthInfo::ZWJ_OLD_TURKIC_LETTER_ORKHON_I,
+        WidthInfo::KHMER_COENG_ELIGIBLE_LETTER,
+    ];
+
+    #[cfg(feature = "cjk")]
+    static NORMALIZATION_TEST_WIDTHS_CJK: [WidthInfo; 39] = [
+        WidthInfo::DEFAULT,
+        WidthInfo::LINE_FEED,
+        WidthInfo::EMOJI_MODIFIER,
+        WidthInfo::REGIONAL_INDICATOR,
+        WidthInfo::SEVERAL_REGIONAL_INDICATOR,
+        WidthInfo::EMOJI_PRESENTATION,
+        WidthInfo::ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VS16_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::KEYCAP_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VS16_KEYCAP_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::EVEN_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::ODD_REGIONAL_INDICATOR_ZWJ_PRESENTATION,
+        WidthInfo::TAG_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D1_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D2_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_D3_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A1_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A2_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A3_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A4_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A5_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::TAG_A6_END_ZWJ_EMOJI_PRESENTATION,
+        WidthInfo::VARIATION_SELECTOR_16,
+        WidthInfo::JOINING_GROUP_ALEF,
+        WidthInfo::COMBINING_LONG_SOLIDUS_OVERLAY,
+        WidthInfo::SOLIDUS_OVERLAY_ALEF,
+        WidthInfo::HEBREW_LETTER_LAMED,
+        WidthInfo::ZWJ_HEBREW_LETTER_LAMED,
+        WidthInfo::BUGINESE_LETTER_YA,
+        WidthInfo::ZWJ_BUGINESE_LETTER_YA,
+        WidthInfo::BUGINESE_VOWEL_SIGN_I_ZWJ_LETTER_YA,
+        WidthInfo::TIFINAGH_CONSONANT,
+        WidthInfo::ZWJ_TIFINAGH_CONSONANT,
+        WidthInfo::TIFINAGH_JOINER_CONSONANT,
+        WidthInfo::LISU_TONE_LETTER_MYA_NA_JEU,
+        WidthInfo::OLD_TURKIC_LETTER_ORKHON_I,
+        WidthInfo::ZWJ_OLD_TURKIC_LETTER_ORKHON_I,
+        WidthInfo::KHMER_COENG_ELIGIBLE_LETTER,
+    ];
+
+    #[rustfmt::skip]
+    static NORMALIZATION_TEST: [(&str, &str, &str, &str, &str); 19074] = [
+        (r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#),
+        (r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#),
+        (r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#),
+        (r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#),
+        (r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#),
+        (r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#, r#"Ḍ̇"#),
+        (r#"Ḋ̛"#, r#"Ḋ̛"#, r#"Ḋ̛"#, r#"Ḋ̛"#, r#"Ḋ̛"#),
+        (r#"Ḍ̛"#, r#"Ḍ̛"#, r#"Ḍ̛"#, r#"Ḍ̛"#, r#"Ḍ̛"#),
+        (r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#),
+        (r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#),
+        (r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#),
+        (r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#, r#"Ḍ̛̇"#),
+        (r#"È"#, r#"È"#, r#"È"#, r#"È"#, r#"È"#),
+        (r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#),
+        (r#"È"#, r#"È"#, r#"È"#, r#"È"#, r#"È"#),
+        (r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#),
+        (r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#),
+        (r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#),
+        (r#"Ḕ̄"#, r#"Ḕ̄"#, r#"Ḕ̄"#, r#"Ḕ̄"#, r#"Ḕ̄"#),
+        (r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#),
+        (r#"È̄"#, r#"È̄"#, r#"È̄"#, r#"È̄"#, r#"È̄"#),
+        (r#"ֱָֹ֑׃ְ֬֟"#, r#"ֱָֹ֑׃ְ֬֟"#, r#"ֱָֹ֑׃ְ֬֟"#, r#"ֱָֹ֑׃ְ֬֟"#, r#"ֱָֹ֑׃ְ֬֟"#),
+        (r#"ְַּ֥֒׀֭ׄ"#, r#"ְַּ֥֒׀֭ׄ"#, r#"ְַּ֥֒׀֭ׄ"#, r#"ְַּ֥֒׀֭ׄ"#, r#"ְַּ֥֒׀֭ׄ"#),
+        (r#"ᄀ각"#, r#"ᄀ각"#, r#"ᄀ각"#, r#"ᄀ각"#, r#"ᄀ각"#),
+        (r#"ᄀ각ᆨ"#, r#"ᄀ각ᆨ"#, r#"ᄀ각ᆨ"#, r#"ᄀ각ᆨ"#, r#"ᄀ각ᆨ"#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#"¨"#, r#"¨"#, r#"¨"#, r#" ̈"#, r#" ̈"#),
+        (r#"ª"#, r#"ª"#, r#"ª"#, r#"a"#, r#"a"#),
+        (r#"¯"#, r#"¯"#, r#"¯"#, r#" ̄"#, r#" ̄"#),
+        (r#"²"#, r#"²"#, r#"²"#, r#"2"#, r#"2"#),
+        (r#"³"#, r#"³"#, r#"³"#, r#"3"#, r#"3"#),
+        (r#"´"#, r#"´"#, r#"´"#, r#" ́"#, r#" ́"#),
+        (r#"µ"#, r#"µ"#, r#"µ"#, r#"μ"#, r#"μ"#),
+        (r#"¸"#, r#"¸"#, r#"¸"#, r#" ̧"#, r#" ̧"#),
+        (r#"¹"#, r#"¹"#, r#"¹"#, r#"1"#, r#"1"#),
+        (r#"º"#, r#"º"#, r#"º"#, r#"o"#, r#"o"#),
+        (r#"¼"#, r#"¼"#, r#"¼"#, r#"1⁄4"#, r#"1⁄4"#),
+        (r#"½"#, r#"½"#, r#"½"#, r#"1⁄2"#, r#"1⁄2"#),
+        (r#"¾"#, r#"¾"#, r#"¾"#, r#"3⁄4"#, r#"3⁄4"#),
+        (r#"À"#, r#"À"#, r#"À"#, r#"À"#, r#"À"#),
+        (r#"Á"#, r#"Á"#, r#"Á"#, r#"Á"#, r#"Á"#),
+        (r#"Â"#, r#"Â"#, r#"Â"#, r#"Â"#, r#"Â"#),
+        (r#"Ã"#, r#"Ã"#, r#"Ã"#, r#"Ã"#, r#"Ã"#),
+        (r#"Ä"#, r#"Ä"#, r#"Ä"#, r#"Ä"#, r#"Ä"#),
+        (r#"Å"#, r#"Å"#, r#"Å"#, r#"Å"#, r#"Å"#),
+        (r#"Ç"#, r#"Ç"#, r#"Ç"#, r#"Ç"#, r#"Ç"#),
+        (r#"È"#, r#"È"#, r#"È"#, r#"È"#, r#"È"#),
+        (r#"É"#, r#"É"#, r#"É"#, r#"É"#, r#"É"#),
+        (r#"Ê"#, r#"Ê"#, r#"Ê"#, r#"Ê"#, r#"Ê"#),
+        (r#"Ë"#, r#"Ë"#, r#"Ë"#, r#"Ë"#, r#"Ë"#),
+        (r#"Ì"#, r#"Ì"#, r#"Ì"#, r#"Ì"#, r#"Ì"#),
+        (r#"Í"#, r#"Í"#, r#"Í"#, r#"Í"#, r#"Í"#),
+        (r#"Î"#, r#"Î"#, r#"Î"#, r#"Î"#, r#"Î"#),
+        (r#"Ï"#, r#"Ï"#, r#"Ï"#, r#"Ï"#, r#"Ï"#),
+        (r#"Ñ"#, r#"Ñ"#, r#"Ñ"#, r#"Ñ"#, r#"Ñ"#),
+        (r#"Ò"#, r#"Ò"#, r#"Ò"#, r#"Ò"#, r#"Ò"#),
+        (r#"Ó"#, r#"Ó"#, r#"Ó"#, r#"Ó"#, r#"Ó"#),
+        (r#"Ô"#, r#"Ô"#, r#"Ô"#, r#"Ô"#, r#"Ô"#),
+        (r#"Õ"#, r#"Õ"#, r#"Õ"#, r#"Õ"#, r#"Õ"#),
+        (r#"Ö"#, r#"Ö"#, r#"Ö"#, r#"Ö"#, r#"Ö"#),
+        (r#"Ù"#, r#"Ù"#, r#"Ù"#, r#"Ù"#, r#"Ù"#),
+        (r#"Ú"#, r#"Ú"#, r#"Ú"#, r#"Ú"#, r#"Ú"#),
+        (r#"Û"#, r#"Û"#, r#"Û"#, r#"Û"#, r#"Û"#),
+        (r#"Ü"#, r#"Ü"#, r#"Ü"#, r#"Ü"#, r#"Ü"#),
+        (r#"Ý"#, r#"Ý"#, r#"Ý"#, r#"Ý"#, r#"Ý"#),
+        (r#"à"#, r#"à"#, r#"à"#, r#"à"#, r#"à"#),
+        (r#"á"#, r#"á"#, r#"á"#, r#"á"#, r#"á"#),
+        (r#"â"#, r#"â"#, r#"â"#, r#"â"#, r#"â"#),
+        (r#"ã"#, r#"ã"#, r#"ã"#, r#"ã"#, r#"ã"#),
+        (r#"ä"#, r#"ä"#, r#"ä"#, r#"ä"#, r#"ä"#),
+        (r#"å"#, r#"å"#, r#"å"#, r#"å"#, r#"å"#),
+        (r#"ç"#, r#"ç"#, r#"ç"#, r#"ç"#, r#"ç"#),
+        (r#"è"#, r#"è"#, r#"è"#, r#"è"#, r#"è"#),
+        (r#"é"#, r#"é"#, r#"é"#, r#"é"#, r#"é"#),
+        (r#"ê"#, r#"ê"#, r#"ê"#, r#"ê"#, r#"ê"#),
+        (r#"ë"#, r#"ë"#, r#"ë"#, r#"ë"#, r#"ë"#),
+        (r#"ì"#, r#"ì"#, r#"ì"#, r#"ì"#, r#"ì"#),
+        (r#"í"#, r#"í"#, r#"í"#, r#"í"#, r#"í"#),
+        (r#"î"#, r#"î"#, r#"î"#, r#"î"#, r#"î"#),
+        (r#"ï"#, r#"ï"#, r#"ï"#, r#"ï"#, r#"ï"#),
+        (r#"ñ"#, r#"ñ"#, r#"ñ"#, r#"ñ"#, r#"ñ"#),
+        (r#"ò"#, r#"ò"#, r#"ò"#, r#"ò"#, r#"ò"#),
+        (r#"ó"#, r#"ó"#, r#"ó"#, r#"ó"#, r#"ó"#),
+        (r#"ô"#, r#"ô"#, r#"ô"#, r#"ô"#, r#"ô"#),
+        (r#"õ"#, r#"õ"#, r#"õ"#, r#"õ"#, r#"õ"#),
+        (r#"ö"#, r#"ö"#, r#"ö"#, r#"ö"#, r#"ö"#),
+        (r#"ù"#, r#"ù"#, r#"ù"#, r#"ù"#, r#"ù"#),
+        (r#"ú"#, r#"ú"#, r#"ú"#, r#"ú"#, r#"ú"#),
+        (r#"û"#, r#"û"#, r#"û"#, r#"û"#, r#"û"#),
+        (r#"ü"#, r#"ü"#, r#"ü"#, r#"ü"#, r#"ü"#),
+        (r#"ý"#, r#"ý"#, r#"ý"#, r#"ý"#, r#"ý"#),
+        (r#"ÿ"#, r#"ÿ"#, r#"ÿ"#, r#"ÿ"#, r#"ÿ"#),
+        (r#"Ā"#, r#"Ā"#, r#"Ā"#, r#"Ā"#, r#"Ā"#),
+        (r#"ā"#, r#"ā"#, r#"ā"#, r#"ā"#, r#"ā"#),
+        (r#"Ă"#, r#"Ă"#, r#"Ă"#, r#"Ă"#, r#"Ă"#),
+        (r#"ă"#, r#"ă"#, r#"ă"#, r#"ă"#, r#"ă"#),
+        (r#"Ą"#, r#"Ą"#, r#"Ą"#, r#"Ą"#, r#"Ą"#),
+        (r#"ą"#, r#"ą"#, r#"ą"#, r#"ą"#, r#"ą"#),
+        (r#"Ć"#, r#"Ć"#, r#"Ć"#, r#"Ć"#, r#"Ć"#),
+        (r#"ć"#, r#"ć"#, r#"ć"#, r#"ć"#, r#"ć"#),
+        (r#"Ĉ"#, r#"Ĉ"#, r#"Ĉ"#, r#"Ĉ"#, r#"Ĉ"#),
+        (r#"ĉ"#, r#"ĉ"#, r#"ĉ"#, r#"ĉ"#, r#"ĉ"#),
+        (r#"Ċ"#, r#"Ċ"#, r#"Ċ"#, r#"Ċ"#, r#"Ċ"#),
+        (r#"ċ"#, r#"ċ"#, r#"ċ"#, r#"ċ"#, r#"ċ"#),
+        (r#"Č"#, r#"Č"#, r#"Č"#, r#"Č"#, r#"Č"#),
+        (r#"č"#, r#"č"#, r#"č"#, r#"č"#, r#"č"#),
+        (r#"Ď"#, r#"Ď"#, r#"Ď"#, r#"Ď"#, r#"Ď"#),
+        (r#"ď"#, r#"ď"#, r#"ď"#, r#"ď"#, r#"ď"#),
+        (r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#, r#"Ē"#),
+        (r#"ē"#, r#"ē"#, r#"ē"#, r#"ē"#, r#"ē"#),
+        (r#"Ĕ"#, r#"Ĕ"#, r#"Ĕ"#, r#"Ĕ"#, r#"Ĕ"#),
+        (r#"ĕ"#, r#"ĕ"#, r#"ĕ"#, r#"ĕ"#, r#"ĕ"#),
+        (r#"Ė"#, r#"Ė"#, r#"Ė"#, r#"Ė"#, r#"Ė"#),
+        (r#"ė"#, r#"ė"#, r#"ė"#, r#"ė"#, r#"ė"#),
+        (r#"Ę"#, r#"Ę"#, r#"Ę"#, r#"Ę"#, r#"Ę"#),
+        (r#"ę"#, r#"ę"#, r#"ę"#, r#"ę"#, r#"ę"#),
+        (r#"Ě"#, r#"Ě"#, r#"Ě"#, r#"Ě"#, r#"Ě"#),
+        (r#"ě"#, r#"ě"#, r#"ě"#, r#"ě"#, r#"ě"#),
+        (r#"Ĝ"#, r#"Ĝ"#, r#"Ĝ"#, r#"Ĝ"#, r#"Ĝ"#),
+        (r#"ĝ"#, r#"ĝ"#, r#"ĝ"#, r#"ĝ"#, r#"ĝ"#),
+        (r#"Ğ"#, r#"Ğ"#, r#"Ğ"#, r#"Ğ"#, r#"Ğ"#),
+        (r#"ğ"#, r#"ğ"#, r#"ğ"#, r#"ğ"#, r#"ğ"#),
+        (r#"Ġ"#, r#"Ġ"#, r#"Ġ"#, r#"Ġ"#, r#"Ġ"#),
+        (r#"ġ"#, r#"ġ"#, r#"ġ"#, r#"ġ"#, r#"ġ"#),
+        (r#"Ģ"#, r#"Ģ"#, r#"Ģ"#, r#"Ģ"#, r#"Ģ"#),
+        (r#"ģ"#, r#"ģ"#, r#"ģ"#, r#"ģ"#, r#"ģ"#),
+        (r#"Ĥ"#, r#"Ĥ"#, r#"Ĥ"#, r#"Ĥ"#, r#"Ĥ"#),
+        (r#"ĥ"#, r#"ĥ"#, r#"ĥ"#, r#"ĥ"#, r#"ĥ"#),
+        (r#"Ĩ"#, r#"Ĩ"#, r#"Ĩ"#, r#"Ĩ"#, r#"Ĩ"#),
+        (r#"ĩ"#, r#"ĩ"#, r#"ĩ"#, r#"ĩ"#, r#"ĩ"#),
+        (r#"Ī"#, r#"Ī"#, r#"Ī"#, r#"Ī"#, r#"Ī"#),
+        (r#"ī"#, r#"ī"#, r#"ī"#, r#"ī"#, r#"ī"#),
+        (r#"Ĭ"#, r#"Ĭ"#, r#"Ĭ"#, r#"Ĭ"#, r#"Ĭ"#),
+        (r#"ĭ"#, r#"ĭ"#, r#"ĭ"#, r#"ĭ"#, r#"ĭ"#),
+        (r#"Į"#, r#"Į"#, r#"Į"#, r#"Į"#, r#"Į"#),
+        (r#"į"#, r#"į"#, r#"į"#, r#"į"#, r#"į"#),
+        (r#"İ"#, r#"İ"#, r#"İ"#, r#"İ"#, r#"İ"#),
+        (r#"IJ"#, r#"IJ"#, r#"IJ"#, r#"IJ"#, r#"IJ"#),
+        (r#"ij"#, r#"ij"#, r#"ij"#, r#"ij"#, r#"ij"#),
+        (r#"Ĵ"#, r#"Ĵ"#, r#"Ĵ"#, r#"Ĵ"#, r#"Ĵ"#),
+        (r#"ĵ"#, r#"ĵ"#, r#"ĵ"#, r#"ĵ"#, r#"ĵ"#),
+        (r#"Ķ"#, r#"Ķ"#, r#"Ķ"#, r#"Ķ"#, r#"Ķ"#),
+        (r#"ķ"#, r#"ķ"#, r#"ķ"#, r#"ķ"#, r#"ķ"#),
+        (r#"Ĺ"#, r#"Ĺ"#, r#"Ĺ"#, r#"Ĺ"#, r#"Ĺ"#),
+        (r#"ĺ"#, r#"ĺ"#, r#"ĺ"#, r#"ĺ"#, r#"ĺ"#),
+        (r#"Ļ"#, r#"Ļ"#, r#"Ļ"#, r#"Ļ"#, r#"Ļ"#),
+        (r#"ļ"#, r#"ļ"#, r#"ļ"#, r#"ļ"#, r#"ļ"#),
+        (r#"Ľ"#, r#"Ľ"#, r#"Ľ"#, r#"Ľ"#, r#"Ľ"#),
+        (r#"ľ"#, r#"ľ"#, r#"ľ"#, r#"ľ"#, r#"ľ"#),
+        (r#"Ŀ"#, r#"Ŀ"#, r#"Ŀ"#, r#"L·"#, r#"L·"#),
+        (r#"ŀ"#, r#"ŀ"#, r#"ŀ"#, r#"l·"#, r#"l·"#),
+        (r#"Ń"#, r#"Ń"#, r#"Ń"#, r#"Ń"#, r#"Ń"#),
+        (r#"ń"#, r#"ń"#, r#"ń"#, r#"ń"#, r#"ń"#),
+        (r#"Ņ"#, r#"Ņ"#, r#"Ņ"#, r#"Ņ"#, r#"Ņ"#),
+        (r#"ņ"#, r#"ņ"#, r#"ņ"#, r#"ņ"#, r#"ņ"#),
+        (r#"Ň"#, r#"Ň"#, r#"Ň"#, r#"Ň"#, r#"Ň"#),
+        (r#"ň"#, r#"ň"#, r#"ň"#, r#"ň"#, r#"ň"#),
+        (r#"ʼn"#, r#"ʼn"#, r#"ʼn"#, r#"ʼn"#, r#"ʼn"#),
+        (r#"Ō"#, r#"Ō"#, r#"Ō"#, r#"Ō"#, r#"Ō"#),
+        (r#"ō"#, r#"ō"#, r#"ō"#, r#"ō"#, r#"ō"#),
+        (r#"Ŏ"#, r#"Ŏ"#, r#"Ŏ"#, r#"Ŏ"#, r#"Ŏ"#),
+        (r#"ŏ"#, r#"ŏ"#, r#"ŏ"#, r#"ŏ"#, r#"ŏ"#),
+        (r#"Ő"#, r#"Ő"#, r#"Ő"#, r#"Ő"#, r#"Ő"#),
+        (r#"ő"#, r#"ő"#, r#"ő"#, r#"ő"#, r#"ő"#),
+        (r#"Ŕ"#, r#"Ŕ"#, r#"Ŕ"#, r#"Ŕ"#, r#"Ŕ"#),
+        (r#"ŕ"#, r#"ŕ"#, r#"ŕ"#, r#"ŕ"#, r#"ŕ"#),
+        (r#"Ŗ"#, r#"Ŗ"#, r#"Ŗ"#, r#"Ŗ"#, r#"Ŗ"#),
+        (r#"ŗ"#, r#"ŗ"#, r#"ŗ"#, r#"ŗ"#, r#"ŗ"#),
+        (r#"Ř"#, r#"Ř"#, r#"Ř"#, r#"Ř"#, r#"Ř"#),
+        (r#"ř"#, r#"ř"#, r#"ř"#, r#"ř"#, r#"ř"#),
+        (r#"Ś"#, r#"Ś"#, r#"Ś"#, r#"Ś"#, r#"Ś"#),
+        (r#"ś"#, r#"ś"#, r#"ś"#, r#"ś"#, r#"ś"#),
+        (r#"Ŝ"#, r#"Ŝ"#, r#"Ŝ"#, r#"Ŝ"#, r#"Ŝ"#),
+        (r#"ŝ"#, r#"ŝ"#, r#"ŝ"#, r#"ŝ"#, r#"ŝ"#),
+        (r#"Ş"#, r#"Ş"#, r#"Ş"#, r#"Ş"#, r#"Ş"#),
+        (r#"ş"#, r#"ş"#, r#"ş"#, r#"ş"#, r#"ş"#),
+        (r#"Š"#, r#"Š"#, r#"Š"#, r#"Š"#, r#"Š"#),
+        (r#"š"#, r#"š"#, r#"š"#, r#"š"#, r#"š"#),
+        (r#"Ţ"#, r#"Ţ"#, r#"Ţ"#, r#"Ţ"#, r#"Ţ"#),
+        (r#"ţ"#, r#"ţ"#, r#"ţ"#, r#"ţ"#, r#"ţ"#),
+        (r#"Ť"#, r#"Ť"#, r#"Ť"#, r#"Ť"#, r#"Ť"#),
+        (r#"ť"#, r#"ť"#, r#"ť"#, r#"ť"#, r#"ť"#),
+        (r#"Ũ"#, r#"Ũ"#, r#"Ũ"#, r#"Ũ"#, r#"Ũ"#),
+        (r#"ũ"#, r#"ũ"#, r#"ũ"#, r#"ũ"#, r#"ũ"#),
+        (r#"Ū"#, r#"Ū"#, r#"Ū"#, r#"Ū"#, r#"Ū"#),
+        (r#"ū"#, r#"ū"#, r#"ū"#, r#"ū"#, r#"ū"#),
+        (r#"Ŭ"#, r#"Ŭ"#, r#"Ŭ"#, r#"Ŭ"#, r#"Ŭ"#),
+        (r#"ŭ"#, r#"ŭ"#, r#"ŭ"#, r#"ŭ"#, r#"ŭ"#),
+        (r#"Ů"#, r#"Ů"#, r#"Ů"#, r#"Ů"#, r#"Ů"#),
+        (r#"ů"#, r#"ů"#, r#"ů"#, r#"ů"#, r#"ů"#),
+        (r#"Ű"#, r#"Ű"#, r#"Ű"#, r#"Ű"#, r#"Ű"#),
+        (r#"ű"#, r#"ű"#, r#"ű"#, r#"ű"#, r#"ű"#),
+        (r#"Ų"#, r#"Ų"#, r#"Ų"#, r#"Ų"#, r#"Ų"#),
+        (r#"ų"#, r#"ų"#, r#"ų"#, r#"ų"#, r#"ų"#),
+        (r#"Ŵ"#, r#"Ŵ"#, r#"Ŵ"#, r#"Ŵ"#, r#"Ŵ"#),
+        (r#"ŵ"#, r#"ŵ"#, r#"ŵ"#, r#"ŵ"#, r#"ŵ"#),
+        (r#"Ŷ"#, r#"Ŷ"#, r#"Ŷ"#, r#"Ŷ"#, r#"Ŷ"#),
+        (r#"ŷ"#, r#"ŷ"#, r#"ŷ"#, r#"ŷ"#, r#"ŷ"#),
+        (r#"Ÿ"#, r#"Ÿ"#, r#"Ÿ"#, r#"Ÿ"#, r#"Ÿ"#),
+        (r#"Ź"#, r#"Ź"#, r#"Ź"#, r#"Ź"#, r#"Ź"#),
+        (r#"ź"#, r#"ź"#, r#"ź"#, r#"ź"#, r#"ź"#),
+        (r#"Ż"#, r#"Ż"#, r#"Ż"#, r#"Ż"#, r#"Ż"#),
+        (r#"ż"#, r#"ż"#, r#"ż"#, r#"ż"#, r#"ż"#),
+        (r#"Ž"#, r#"Ž"#, r#"Ž"#, r#"Ž"#, r#"Ž"#),
+        (r#"ž"#, r#"ž"#, r#"ž"#, r#"ž"#, r#"ž"#),
+        (r#"ſ"#, r#"ſ"#, r#"ſ"#, r#"s"#, r#"s"#),
+        (r#"Ơ"#, r#"Ơ"#, r#"Ơ"#, r#"Ơ"#, r#"Ơ"#),
+        (r#"ơ"#, r#"ơ"#, r#"ơ"#, r#"ơ"#, r#"ơ"#),
+        (r#"Ư"#, r#"Ư"#, r#"Ư"#, r#"Ư"#, r#"Ư"#),
+        (r#"ư"#, r#"ư"#, r#"ư"#, r#"ư"#, r#"ư"#),
+        (r#"DŽ"#, r#"DŽ"#, r#"DŽ"#, r#"DŽ"#, r#"DŽ"#),
+        (r#"Dž"#, r#"Dž"#, r#"Dž"#, r#"Dž"#, r#"Dž"#),
+        (r#"dž"#, r#"dž"#, r#"dž"#, r#"dž"#, r#"dž"#),
+        (r#"LJ"#, r#"LJ"#, r#"LJ"#, r#"LJ"#, r#"LJ"#),
+        (r#"Lj"#, r#"Lj"#, r#"Lj"#, r#"Lj"#, r#"Lj"#),
+        (r#"lj"#, r#"lj"#, r#"lj"#, r#"lj"#, r#"lj"#),
+        (r#"NJ"#, r#"NJ"#, r#"NJ"#, r#"NJ"#, r#"NJ"#),
+        (r#"Nj"#, r#"Nj"#, r#"Nj"#, r#"Nj"#, r#"Nj"#),
+        (r#"nj"#, r#"nj"#, r#"nj"#, r#"nj"#, r#"nj"#),
+        (r#"Ǎ"#, r#"Ǎ"#, r#"Ǎ"#, r#"Ǎ"#, r#"Ǎ"#),
+        (r#"ǎ"#, r#"ǎ"#, r#"ǎ"#, r#"ǎ"#, r#"ǎ"#),
+        (r#"Ǐ"#, r#"Ǐ"#, r#"Ǐ"#, r#"Ǐ"#, r#"Ǐ"#),
+        (r#"ǐ"#, r#"ǐ"#, r#"ǐ"#, r#"ǐ"#, r#"ǐ"#),
+        (r#"Ǒ"#, r#"Ǒ"#, r#"Ǒ"#, r#"Ǒ"#, r#"Ǒ"#),
+        (r#"ǒ"#, r#"ǒ"#, r#"ǒ"#, r#"ǒ"#, r#"ǒ"#),
+        (r#"Ǔ"#, r#"Ǔ"#, r#"Ǔ"#, r#"Ǔ"#, r#"Ǔ"#),
+        (r#"ǔ"#, r#"ǔ"#, r#"ǔ"#, r#"ǔ"#, r#"ǔ"#),
+        (r#"Ǖ"#, r#"Ǖ"#, r#"Ǖ"#, r#"Ǖ"#, r#"Ǖ"#),
+        (r#"ǖ"#, r#"ǖ"#, r#"ǖ"#, r#"ǖ"#, r#"ǖ"#),
+        (r#"Ǘ"#, r#"Ǘ"#, r#"Ǘ"#, r#"Ǘ"#, r#"Ǘ"#),
+        (r#"ǘ"#, r#"ǘ"#, r#"ǘ"#, r#"ǘ"#, r#"ǘ"#),
+        (r#"Ǚ"#, r#"Ǚ"#, r#"Ǚ"#, r#"Ǚ"#, r#"Ǚ"#),
+        (r#"ǚ"#, r#"ǚ"#, r#"ǚ"#, r#"ǚ"#, r#"ǚ"#),
+        (r#"Ǜ"#, r#"Ǜ"#, r#"Ǜ"#, r#"Ǜ"#, r#"Ǜ"#),
+        (r#"ǜ"#, r#"ǜ"#, r#"ǜ"#, r#"ǜ"#, r#"ǜ"#),
+        (r#"Ǟ"#, r#"Ǟ"#, r#"Ǟ"#, r#"Ǟ"#, r#"Ǟ"#),
+        (r#"ǟ"#, r#"ǟ"#, r#"ǟ"#, r#"ǟ"#, r#"ǟ"#),
+        (r#"Ǡ"#, r#"Ǡ"#, r#"Ǡ"#, r#"Ǡ"#, r#"Ǡ"#),
+        (r#"ǡ"#, r#"ǡ"#, r#"ǡ"#, r#"ǡ"#, r#"ǡ"#),
+        (r#"Ǣ"#, r#"Ǣ"#, r#"Ǣ"#, r#"Ǣ"#, r#"Ǣ"#),
+        (r#"ǣ"#, r#"ǣ"#, r#"ǣ"#, r#"ǣ"#, r#"ǣ"#),
+        (r#"Ǧ"#, r#"Ǧ"#, r#"Ǧ"#, r#"Ǧ"#, r#"Ǧ"#),
+        (r#"ǧ"#, r#"ǧ"#, r#"ǧ"#, r#"ǧ"#, r#"ǧ"#),
+        (r#"Ǩ"#, r#"Ǩ"#, r#"Ǩ"#, r#"Ǩ"#, r#"Ǩ"#),
+        (r#"ǩ"#, r#"ǩ"#, r#"ǩ"#, r#"ǩ"#, r#"ǩ"#),
+        (r#"Ǫ"#, r#"Ǫ"#, r#"Ǫ"#, r#"Ǫ"#, r#"Ǫ"#),
+        (r#"ǫ"#, r#"ǫ"#, r#"ǫ"#, r#"ǫ"#, r#"ǫ"#),
+        (r#"Ǭ"#, r#"Ǭ"#, r#"Ǭ"#, r#"Ǭ"#, r#"Ǭ"#),
+        (r#"ǭ"#, r#"ǭ"#, r#"ǭ"#, r#"ǭ"#, r#"ǭ"#),
+        (r#"Ǯ"#, r#"Ǯ"#, r#"Ǯ"#, r#"Ǯ"#, r#"Ǯ"#),
+        (r#"ǯ"#, r#"ǯ"#, r#"ǯ"#, r#"ǯ"#, r#"ǯ"#),
+        (r#"ǰ"#, r#"ǰ"#, r#"ǰ"#, r#"ǰ"#, r#"ǰ"#),
+        (r#"DZ"#, r#"DZ"#, r#"DZ"#, r#"DZ"#, r#"DZ"#),
+        (r#"Dz"#, r#"Dz"#, r#"Dz"#, r#"Dz"#, r#"Dz"#),
+        (r#"dz"#, r#"dz"#, r#"dz"#, r#"dz"#, r#"dz"#),
+        (r#"Ǵ"#, r#"Ǵ"#, r#"Ǵ"#, r#"Ǵ"#, r#"Ǵ"#),
+        (r#"ǵ"#, r#"ǵ"#, r#"ǵ"#, r#"ǵ"#, r#"ǵ"#),
+        (r#"Ǹ"#, r#"Ǹ"#, r#"Ǹ"#, r#"Ǹ"#, r#"Ǹ"#),
+        (r#"ǹ"#, r#"ǹ"#, r#"ǹ"#, r#"ǹ"#, r#"ǹ"#),
+        (r#"Ǻ"#, r#"Ǻ"#, r#"Ǻ"#, r#"Ǻ"#, r#"Ǻ"#),
+        (r#"ǻ"#, r#"ǻ"#, r#"ǻ"#, r#"ǻ"#, r#"ǻ"#),
+        (r#"Ǽ"#, r#"Ǽ"#, r#"Ǽ"#, r#"Ǽ"#, r#"Ǽ"#),
+        (r#"ǽ"#, r#"ǽ"#, r#"ǽ"#, r#"ǽ"#, r#"ǽ"#),
+        (r#"Ǿ"#, r#"Ǿ"#, r#"Ǿ"#, r#"Ǿ"#, r#"Ǿ"#),
+        (r#"ǿ"#, r#"ǿ"#, r#"ǿ"#, r#"ǿ"#, r#"ǿ"#),
+        (r#"Ȁ"#, r#"Ȁ"#, r#"Ȁ"#, r#"Ȁ"#, r#"Ȁ"#),
+        (r#"ȁ"#, r#"ȁ"#, r#"ȁ"#, r#"ȁ"#, r#"ȁ"#),
+        (r#"Ȃ"#, r#"Ȃ"#, r#"Ȃ"#, r#"Ȃ"#, r#"Ȃ"#),
+        (r#"ȃ"#, r#"ȃ"#, r#"ȃ"#, r#"ȃ"#, r#"ȃ"#),
+        (r#"Ȅ"#, r#"Ȅ"#, r#"Ȅ"#, r#"Ȅ"#, r#"Ȅ"#),
+        (r#"ȅ"#, r#"ȅ"#, r#"ȅ"#, r#"ȅ"#, r#"ȅ"#),
+        (r#"Ȇ"#, r#"Ȇ"#, r#"Ȇ"#, r#"Ȇ"#, r#"Ȇ"#),
+        (r#"ȇ"#, r#"ȇ"#, r#"ȇ"#, r#"ȇ"#, r#"ȇ"#),
+        (r#"Ȉ"#, r#"Ȉ"#, r#"Ȉ"#, r#"Ȉ"#, r#"Ȉ"#),
+        (r#"ȉ"#, r#"ȉ"#, r#"ȉ"#, r#"ȉ"#, r#"ȉ"#),
+        (r#"Ȋ"#, r#"Ȋ"#, r#"Ȋ"#, r#"Ȋ"#, r#"Ȋ"#),
+        (r#"ȋ"#, r#"ȋ"#, r#"ȋ"#, r#"ȋ"#, r#"ȋ"#),
+        (r#"Ȍ"#, r#"Ȍ"#, r#"Ȍ"#, r#"Ȍ"#, r#"Ȍ"#),
+        (r#"ȍ"#, r#"ȍ"#, r#"ȍ"#, r#"ȍ"#, r#"ȍ"#),
+        (r#"Ȏ"#, r#"Ȏ"#, r#"Ȏ"#, r#"Ȏ"#, r#"Ȏ"#),
+        (r#"ȏ"#, r#"ȏ"#, r#"ȏ"#, r#"ȏ"#, r#"ȏ"#),
+        (r#"Ȑ"#, r#"Ȑ"#, r#"Ȑ"#, r#"Ȑ"#, r#"Ȑ"#),
+        (r#"ȑ"#, r#"ȑ"#, r#"ȑ"#, r#"ȑ"#, r#"ȑ"#),
+        (r#"Ȓ"#, r#"Ȓ"#, r#"Ȓ"#, r#"Ȓ"#, r#"Ȓ"#),
+        (r#"ȓ"#, r#"ȓ"#, r#"ȓ"#, r#"ȓ"#, r#"ȓ"#),
+        (r#"Ȕ"#, r#"Ȕ"#, r#"Ȕ"#, r#"Ȕ"#, r#"Ȕ"#),
+        (r#"ȕ"#, r#"ȕ"#, r#"ȕ"#, r#"ȕ"#, r#"ȕ"#),
+        (r#"Ȗ"#, r#"Ȗ"#, r#"Ȗ"#, r#"Ȗ"#, r#"Ȗ"#),
+        (r#"ȗ"#, r#"ȗ"#, r#"ȗ"#, r#"ȗ"#, r#"ȗ"#),
+        (r#"Ș"#, r#"Ș"#, r#"Ș"#, r#"Ș"#, r#"Ș"#),
+        (r#"ș"#, r#"ș"#, r#"ș"#, r#"ș"#, r#"ș"#),
+        (r#"Ț"#, r#"Ț"#, r#"Ț"#, r#"Ț"#, r#"Ț"#),
+        (r#"ț"#, r#"ț"#, r#"ț"#, r#"ț"#, r#"ț"#),
+        (r#"Ȟ"#, r#"Ȟ"#, r#"Ȟ"#, r#"Ȟ"#, r#"Ȟ"#),
+        (r#"ȟ"#, r#"ȟ"#, r#"ȟ"#, r#"ȟ"#, r#"ȟ"#),
+        (r#"Ȧ"#, r#"Ȧ"#, r#"Ȧ"#, r#"Ȧ"#, r#"Ȧ"#),
+        (r#"ȧ"#, r#"ȧ"#, r#"ȧ"#, r#"ȧ"#, r#"ȧ"#),
+        (r#"Ȩ"#, r#"Ȩ"#, r#"Ȩ"#, r#"Ȩ"#, r#"Ȩ"#),
+        (r#"ȩ"#, r#"ȩ"#, r#"ȩ"#, r#"ȩ"#, r#"ȩ"#),
+        (r#"Ȫ"#, r#"Ȫ"#, r#"Ȫ"#, r#"Ȫ"#, r#"Ȫ"#),
+        (r#"ȫ"#, r#"ȫ"#, r#"ȫ"#, r#"ȫ"#, r#"ȫ"#),
+        (r#"Ȭ"#, r#"Ȭ"#, r#"Ȭ"#, r#"Ȭ"#, r#"Ȭ"#),
+        (r#"ȭ"#, r#"ȭ"#, r#"ȭ"#, r#"ȭ"#, r#"ȭ"#),
+        (r#"Ȯ"#, r#"Ȯ"#, r#"Ȯ"#, r#"Ȯ"#, r#"Ȯ"#),
+        (r#"ȯ"#, r#"ȯ"#, r#"ȯ"#, r#"ȯ"#, r#"ȯ"#),
+        (r#"Ȱ"#, r#"Ȱ"#, r#"Ȱ"#, r#"Ȱ"#, r#"Ȱ"#),
+        (r#"ȱ"#, r#"ȱ"#, r#"ȱ"#, r#"ȱ"#, r#"ȱ"#),
+        (r#"Ȳ"#, r#"Ȳ"#, r#"Ȳ"#, r#"Ȳ"#, r#"Ȳ"#),
+        (r#"ȳ"#, r#"ȳ"#, r#"ȳ"#, r#"ȳ"#, r#"ȳ"#),
+        (r#"ʰ"#, r#"ʰ"#, r#"ʰ"#, r#"h"#, r#"h"#),
+        (r#"ʱ"#, r#"ʱ"#, r#"ʱ"#, r#"ɦ"#, r#"ɦ"#),
+        (r#"ʲ"#, r#"ʲ"#, r#"ʲ"#, r#"j"#, r#"j"#),
+        (r#"ʳ"#, r#"ʳ"#, r#"ʳ"#, r#"r"#, r#"r"#),
+        (r#"ʴ"#, r#"ʴ"#, r#"ʴ"#, r#"ɹ"#, r#"ɹ"#),
+        (r#"ʵ"#, r#"ʵ"#, r#"ʵ"#, r#"ɻ"#, r#"ɻ"#),
+        (r#"ʶ"#, r#"ʶ"#, r#"ʶ"#, r#"ʁ"#, r#"ʁ"#),
+        (r#"ʷ"#, r#"ʷ"#, r#"ʷ"#, r#"w"#, r#"w"#),
+        (r#"ʸ"#, r#"ʸ"#, r#"ʸ"#, r#"y"#, r#"y"#),
+        (r#"˘"#, r#"˘"#, r#"˘"#, r#" ̆"#, r#" ̆"#),
+        (r#"˙"#, r#"˙"#, r#"˙"#, r#" ̇"#, r#" ̇"#),
+        (r#"˚"#, r#"˚"#, r#"˚"#, r#" ̊"#, r#" ̊"#),
+        (r#"˛"#, r#"˛"#, r#"˛"#, r#" ̨"#, r#" ̨"#),
+        (r#"˜"#, r#"˜"#, r#"˜"#, r#" ̃"#, r#" ̃"#),
+        (r#"˝"#, r#"˝"#, r#"˝"#, r#" ̋"#, r#" ̋"#),
+        (r#"ˠ"#, r#"ˠ"#, r#"ˠ"#, r#"ɣ"#, r#"ɣ"#),
+        (r#"ˡ"#, r#"ˡ"#, r#"ˡ"#, r#"l"#, r#"l"#),
+        (r#"ˢ"#, r#"ˢ"#, r#"ˢ"#, r#"s"#, r#"s"#),
+        (r#"ˣ"#, r#"ˣ"#, r#"ˣ"#, r#"x"#, r#"x"#),
+        (r#"ˤ"#, r#"ˤ"#, r#"ˤ"#, r#"ʕ"#, r#"ʕ"#),
+        (r#"̀"#, r#"̀"#, r#"̀"#, r#"̀"#, r#"̀"#),
+        (r#"́"#, r#"́"#, r#"́"#, r#"́"#, r#"́"#),
+        (r#"̓"#, r#"̓"#, r#"̓"#, r#"̓"#, r#"̓"#),
+        (r#"̈́"#, r#"̈́"#, r#"̈́"#, r#"̈́"#, r#"̈́"#),
+        (r#"ʹ"#, r#"ʹ"#, r#"ʹ"#, r#"ʹ"#, r#"ʹ"#),
+        (r#"ͺ"#, r#"ͺ"#, r#"ͺ"#, r#" ͅ"#, r#" ͅ"#),
+        (r#";"#, r#";"#, r#";"#, r#";"#, r#";"#),
+        (r#"΄"#, r#"΄"#, r#"΄"#, r#" ́"#, r#" ́"#),
+        (r#"΅"#, r#"΅"#, r#"΅"#, r#" ̈́"#, r#" ̈́"#),
+        (r#"Ά"#, r#"Ά"#, r#"Ά"#, r#"Ά"#, r#"Ά"#),
+        (r#"·"#, r#"·"#, r#"·"#, r#"·"#, r#"·"#),
+        (r#"Έ"#, r#"Έ"#, r#"Έ"#, r#"Έ"#, r#"Έ"#),
+        (r#"Ή"#, r#"Ή"#, r#"Ή"#, r#"Ή"#, r#"Ή"#),
+        (r#"Ί"#, r#"Ί"#, r#"Ί"#, r#"Ί"#, r#"Ί"#),
+        (r#"Ό"#, r#"Ό"#, r#"Ό"#, r#"Ό"#, r#"Ό"#),
+        (r#"Ύ"#, r#"Ύ"#, r#"Ύ"#, r#"Ύ"#, r#"Ύ"#),
+        (r#"Ώ"#, r#"Ώ"#, r#"Ώ"#, r#"Ώ"#, r#"Ώ"#),
+        (r#"ΐ"#, r#"ΐ"#, r#"ΐ"#, r#"ΐ"#, r#"ΐ"#),
+        (r#"Ϊ"#, r#"Ϊ"#, r#"Ϊ"#, r#"Ϊ"#, r#"Ϊ"#),
+        (r#"Ϋ"#, r#"Ϋ"#, r#"Ϋ"#, r#"Ϋ"#, r#"Ϋ"#),
+        (r#"ά"#, r#"ά"#, r#"ά"#, r#"ά"#, r#"ά"#),
+        (r#"έ"#, r#"έ"#, r#"έ"#, r#"έ"#, r#"έ"#),
+        (r#"ή"#, r#"ή"#, r#"ή"#, r#"ή"#, r#"ή"#),
+        (r#"ί"#, r#"ί"#, r#"ί"#, r#"ί"#, r#"ί"#),
+        (r#"ΰ"#, r#"ΰ"#, r#"ΰ"#, r#"ΰ"#, r#"ΰ"#),
+        (r#"ϊ"#, r#"ϊ"#, r#"ϊ"#, r#"ϊ"#, r#"ϊ"#),
+        (r#"ϋ"#, r#"ϋ"#, r#"ϋ"#, r#"ϋ"#, r#"ϋ"#),
+        (r#"ό"#, r#"ό"#, r#"ό"#, r#"ό"#, r#"ό"#),
+        (r#"ύ"#, r#"ύ"#, r#"ύ"#, r#"ύ"#, r#"ύ"#),
+        (r#"ώ"#, r#"ώ"#, r#"ώ"#, r#"ώ"#, r#"ώ"#),
+        (r#"ϐ"#, r#"ϐ"#, r#"ϐ"#, r#"β"#, r#"β"#),
+        (r#"ϑ"#, r#"ϑ"#, r#"ϑ"#, r#"θ"#, r#"θ"#),
+        (r#"ϒ"#, r#"ϒ"#, r#"ϒ"#, r#"Υ"#, r#"Υ"#),
+        (r#"ϓ"#, r#"ϓ"#, r#"ϓ"#, r#"Ύ"#, r#"Ύ"#),
+        (r#"ϔ"#, r#"ϔ"#, r#"ϔ"#, r#"Ϋ"#, r#"Ϋ"#),
+        (r#"ϕ"#, r#"ϕ"#, r#"ϕ"#, r#"φ"#, r#"φ"#),
+        (r#"ϖ"#, r#"ϖ"#, r#"ϖ"#, r#"π"#, r#"π"#),
+        (r#"ϰ"#, r#"ϰ"#, r#"ϰ"#, r#"κ"#, r#"κ"#),
+        (r#"ϱ"#, r#"ϱ"#, r#"ϱ"#, r#"ρ"#, r#"ρ"#),
+        (r#"ϲ"#, r#"ϲ"#, r#"ϲ"#, r#"ς"#, r#"ς"#),
+        (r#"ϴ"#, r#"ϴ"#, r#"ϴ"#, r#"Θ"#, r#"Θ"#),
+        (r#"ϵ"#, r#"ϵ"#, r#"ϵ"#, r#"ε"#, r#"ε"#),
+        (r#"Ϲ"#, r#"Ϲ"#, r#"Ϲ"#, r#"Σ"#, r#"Σ"#),
+        (r#"Ѐ"#, r#"Ѐ"#, r#"Ѐ"#, r#"Ѐ"#, r#"Ѐ"#),
+        (r#"Ё"#, r#"Ё"#, r#"Ё"#, r#"Ё"#, r#"Ё"#),
+        (r#"Ѓ"#, r#"Ѓ"#, r#"Ѓ"#, r#"Ѓ"#, r#"Ѓ"#),
+        (r#"Ї"#, r#"Ї"#, r#"Ї"#, r#"Ї"#, r#"Ї"#),
+        (r#"Ќ"#, r#"Ќ"#, r#"Ќ"#, r#"Ќ"#, r#"Ќ"#),
+        (r#"Ѝ"#, r#"Ѝ"#, r#"Ѝ"#, r#"Ѝ"#, r#"Ѝ"#),
+        (r#"Ў"#, r#"Ў"#, r#"Ў"#, r#"Ў"#, r#"Ў"#),
+        (r#"Й"#, r#"Й"#, r#"Й"#, r#"Й"#, r#"Й"#),
+        (r#"й"#, r#"й"#, r#"й"#, r#"й"#, r#"й"#),
+        (r#"ѐ"#, r#"ѐ"#, r#"ѐ"#, r#"ѐ"#, r#"ѐ"#),
+        (r#"ё"#, r#"ё"#, r#"ё"#, r#"ё"#, r#"ё"#),
+        (r#"ѓ"#, r#"ѓ"#, r#"ѓ"#, r#"ѓ"#, r#"ѓ"#),
+        (r#"ї"#, r#"ї"#, r#"ї"#, r#"ї"#, r#"ї"#),
+        (r#"ќ"#, r#"ќ"#, r#"ќ"#, r#"ќ"#, r#"ќ"#),
+        (r#"ѝ"#, r#"ѝ"#, r#"ѝ"#, r#"ѝ"#, r#"ѝ"#),
+        (r#"ў"#, r#"ў"#, r#"ў"#, r#"ў"#, r#"ў"#),
+        (r#"Ѷ"#, r#"Ѷ"#, r#"Ѷ"#, r#"Ѷ"#, r#"Ѷ"#),
+        (r#"ѷ"#, r#"ѷ"#, r#"ѷ"#, r#"ѷ"#, r#"ѷ"#),
+        (r#"Ӂ"#, r#"Ӂ"#, r#"Ӂ"#, r#"Ӂ"#, r#"Ӂ"#),
+        (r#"ӂ"#, r#"ӂ"#, r#"ӂ"#, r#"ӂ"#, r#"ӂ"#),
+        (r#"Ӑ"#, r#"Ӑ"#, r#"Ӑ"#, r#"Ӑ"#, r#"Ӑ"#),
+        (r#"ӑ"#, r#"ӑ"#, r#"ӑ"#, r#"ӑ"#, r#"ӑ"#),
+        (r#"Ӓ"#, r#"Ӓ"#, r#"Ӓ"#, r#"Ӓ"#, r#"Ӓ"#),
+        (r#"ӓ"#, r#"ӓ"#, r#"ӓ"#, r#"ӓ"#, r#"ӓ"#),
+        (r#"Ӗ"#, r#"Ӗ"#, r#"Ӗ"#, r#"Ӗ"#, r#"Ӗ"#),
+        (r#"ӗ"#, r#"ӗ"#, r#"ӗ"#, r#"ӗ"#, r#"ӗ"#),
+        (r#"Ӛ"#, r#"Ӛ"#, r#"Ӛ"#, r#"Ӛ"#, r#"Ӛ"#),
+        (r#"ӛ"#, r#"ӛ"#, r#"ӛ"#, r#"ӛ"#, r#"ӛ"#),
+        (r#"Ӝ"#, r#"Ӝ"#, r#"Ӝ"#, r#"Ӝ"#, r#"Ӝ"#),
+        (r#"ӝ"#, r#"ӝ"#, r#"ӝ"#, r#"ӝ"#, r#"ӝ"#),
+        (r#"Ӟ"#, r#"Ӟ"#, r#"Ӟ"#, r#"Ӟ"#, r#"Ӟ"#),
+        (r#"ӟ"#, r#"ӟ"#, r#"ӟ"#, r#"ӟ"#, r#"ӟ"#),
+        (r#"Ӣ"#, r#"Ӣ"#, r#"Ӣ"#, r#"Ӣ"#, r#"Ӣ"#),
+        (r#"ӣ"#, r#"ӣ"#, r#"ӣ"#, r#"ӣ"#, r#"ӣ"#),
+        (r#"Ӥ"#, r#"Ӥ"#, r#"Ӥ"#, r#"Ӥ"#, r#"Ӥ"#),
+        (r#"ӥ"#, r#"ӥ"#, r#"ӥ"#, r#"ӥ"#, r#"ӥ"#),
+        (r#"Ӧ"#, r#"Ӧ"#, r#"Ӧ"#, r#"Ӧ"#, r#"Ӧ"#),
+        (r#"ӧ"#, r#"ӧ"#, r#"ӧ"#, r#"ӧ"#, r#"ӧ"#),
+        (r#"Ӫ"#, r#"Ӫ"#, r#"Ӫ"#, r#"Ӫ"#, r#"Ӫ"#),
+        (r#"ӫ"#, r#"ӫ"#, r#"ӫ"#, r#"ӫ"#, r#"ӫ"#),
+        (r#"Ӭ"#, r#"Ӭ"#, r#"Ӭ"#, r#"Ӭ"#, r#"Ӭ"#),
+        (r#"ӭ"#, r#"ӭ"#, r#"ӭ"#, r#"ӭ"#, r#"ӭ"#),
+        (r#"Ӯ"#, r#"Ӯ"#, r#"Ӯ"#, r#"Ӯ"#, r#"Ӯ"#),
+        (r#"ӯ"#, r#"ӯ"#, r#"ӯ"#, r#"ӯ"#, r#"ӯ"#),
+        (r#"Ӱ"#, r#"Ӱ"#, r#"Ӱ"#, r#"Ӱ"#, r#"Ӱ"#),
+        (r#"ӱ"#, r#"ӱ"#, r#"ӱ"#, r#"ӱ"#, r#"ӱ"#),
+        (r#"Ӳ"#, r#"Ӳ"#, r#"Ӳ"#, r#"Ӳ"#, r#"Ӳ"#),
+        (r#"ӳ"#, r#"ӳ"#, r#"ӳ"#, r#"ӳ"#, r#"ӳ"#),
+        (r#"Ӵ"#, r#"Ӵ"#, r#"Ӵ"#, r#"Ӵ"#, r#"Ӵ"#),
+        (r#"ӵ"#, r#"ӵ"#, r#"ӵ"#, r#"ӵ"#, r#"ӵ"#),
+        (r#"Ӹ"#, r#"Ӹ"#, r#"Ӹ"#, r#"Ӹ"#, r#"Ӹ"#),
+        (r#"ӹ"#, r#"ӹ"#, r#"ӹ"#, r#"ӹ"#, r#"ӹ"#),
+        (r#"և"#, r#"և"#, r#"և"#, r#"եւ"#, r#"եւ"#),
+        (r#"آ"#, r#"آ"#, r#"آ"#, r#"آ"#, r#"آ"#),
+        (r#"أ"#, r#"أ"#, r#"أ"#, r#"أ"#, r#"أ"#),
+        (r#"ؤ"#, r#"ؤ"#, r#"ؤ"#, r#"ؤ"#, r#"ؤ"#),
+        (r#"إ"#, r#"إ"#, r#"إ"#, r#"إ"#, r#"إ"#),
+        (r#"ئ"#, r#"ئ"#, r#"ئ"#, r#"ئ"#, r#"ئ"#),
+        (r#"ٵ"#, r#"ٵ"#, r#"ٵ"#, r#"اٴ"#, r#"اٴ"#),
+        (r#"ٶ"#, r#"ٶ"#, r#"ٶ"#, r#"وٴ"#, r#"وٴ"#),
+        (r#"ٷ"#, r#"ٷ"#, r#"ٷ"#, r#"ۇٴ"#, r#"ۇٴ"#),
+        (r#"ٸ"#, r#"ٸ"#, r#"ٸ"#, r#"يٴ"#, r#"يٴ"#),
+        (r#"ۀ"#, r#"ۀ"#, r#"ۀ"#, r#"ۀ"#, r#"ۀ"#),
+        (r#"ۂ"#, r#"ۂ"#, r#"ۂ"#, r#"ۂ"#, r#"ۂ"#),
+        (r#"ۓ"#, r#"ۓ"#, r#"ۓ"#, r#"ۓ"#, r#"ۓ"#),
+        (r#"ऩ"#, r#"ऩ"#, r#"ऩ"#, r#"ऩ"#, r#"ऩ"#),
+        (r#"ऱ"#, r#"ऱ"#, r#"ऱ"#, r#"ऱ"#, r#"ऱ"#),
+        (r#"ऴ"#, r#"ऴ"#, r#"ऴ"#, r#"ऴ"#, r#"ऴ"#),
+        (r#"क़"#, r#"क़"#, r#"क़"#, r#"क़"#, r#"क़"#),
+        (r#"ख़"#, r#"ख़"#, r#"ख़"#, r#"ख़"#, r#"ख़"#),
+        (r#"ग़"#, r#"ग़"#, r#"ग़"#, r#"ग़"#, r#"ग़"#),
+        (r#"ज़"#, r#"ज़"#, r#"ज़"#, r#"ज़"#, r#"ज़"#),
+        (r#"ड़"#, r#"ड़"#, r#"ड़"#, r#"ड़"#, r#"ड़"#),
+        (r#"ढ़"#, r#"ढ़"#, r#"ढ़"#, r#"ढ़"#, r#"ढ़"#),
+        (r#"फ़"#, r#"फ़"#, r#"फ़"#, r#"फ़"#, r#"फ़"#),
+        (r#"य़"#, r#"य़"#, r#"य़"#, r#"य़"#, r#"य़"#),
+        (r#"ো"#, r#"ো"#, r#"ো"#, r#"ো"#, r#"ো"#),
+        (r#"ৌ"#, r#"ৌ"#, r#"ৌ"#, r#"ৌ"#, r#"ৌ"#),
+        (r#"ড়"#, r#"ড়"#, r#"ড়"#, r#"ড়"#, r#"ড়"#),
+        (r#"ঢ়"#, r#"ঢ়"#, r#"ঢ়"#, r#"ঢ়"#, r#"ঢ়"#),
+        (r#"য়"#, r#"য়"#, r#"য়"#, r#"য়"#, r#"য়"#),
+        (r#"ਲ਼"#, r#"ਲ਼"#, r#"ਲ਼"#, r#"ਲ਼"#, r#"ਲ਼"#),
+        (r#"ਸ਼"#, r#"ਸ਼"#, r#"ਸ਼"#, r#"ਸ਼"#, r#"ਸ਼"#),
+        (r#"ਖ਼"#, r#"ਖ਼"#, r#"ਖ਼"#, r#"ਖ਼"#, r#"ਖ਼"#),
+        (r#"ਗ਼"#, r#"ਗ਼"#, r#"ਗ਼"#, r#"ਗ਼"#, r#"ਗ਼"#),
+        (r#"ਜ਼"#, r#"ਜ਼"#, r#"ਜ਼"#, r#"ਜ਼"#, r#"ਜ਼"#),
+        (r#"ਫ਼"#, r#"ਫ਼"#, r#"ਫ਼"#, r#"ਫ਼"#, r#"ਫ਼"#),
+        (r#"ୈ"#, r#"ୈ"#, r#"ୈ"#, r#"ୈ"#, r#"ୈ"#),
+        (r#"ୋ"#, r#"ୋ"#, r#"ୋ"#, r#"ୋ"#, r#"ୋ"#),
+        (r#"ୌ"#, r#"ୌ"#, r#"ୌ"#, r#"ୌ"#, r#"ୌ"#),
+        (r#"ଡ଼"#, r#"ଡ଼"#, r#"ଡ଼"#, r#"ଡ଼"#, r#"ଡ଼"#),
+        (r#"ଢ଼"#, r#"ଢ଼"#, r#"ଢ଼"#, r#"ଢ଼"#, r#"ଢ଼"#),
+        (r#"ஔ"#, r#"ஔ"#, r#"ஔ"#, r#"ஔ"#, r#"ஔ"#),
+        (r#"ொ"#, r#"ொ"#, r#"ொ"#, r#"ொ"#, r#"ொ"#),
+        (r#"ோ"#, r#"ோ"#, r#"ோ"#, r#"ோ"#, r#"ோ"#),
+        (r#"ௌ"#, r#"ௌ"#, r#"ௌ"#, r#"ௌ"#, r#"ௌ"#),
+        (r#"ై"#, r#"ై"#, r#"ై"#, r#"ై"#, r#"ై"#),
+        (r#"ೀ"#, r#"ೀ"#, r#"ೀ"#, r#"ೀ"#, r#"ೀ"#),
+        (r#"ೇ"#, r#"ೇ"#, r#"ೇ"#, r#"ೇ"#, r#"ೇ"#),
+        (r#"ೈ"#, r#"ೈ"#, r#"ೈ"#, r#"ೈ"#, r#"ೈ"#),
+        (r#"ೊ"#, r#"ೊ"#, r#"ೊ"#, r#"ೊ"#, r#"ೊ"#),
+        (r#"ೋ"#, r#"ೋ"#, r#"ೋ"#, r#"ೋ"#, r#"ೋ"#),
+        (r#"ൊ"#, r#"ൊ"#, r#"ൊ"#, r#"ൊ"#, r#"ൊ"#),
+        (r#"ോ"#, r#"ോ"#, r#"ോ"#, r#"ോ"#, r#"ോ"#),
+        (r#"ൌ"#, r#"ൌ"#, r#"ൌ"#, r#"ൌ"#, r#"ൌ"#),
+        (r#"ේ"#, r#"ේ"#, r#"ේ"#, r#"ේ"#, r#"ේ"#),
+        (r#"ො"#, r#"ො"#, r#"ො"#, r#"ො"#, r#"ො"#),
+        (r#"ෝ"#, r#"ෝ"#, r#"ෝ"#, r#"ෝ"#, r#"ෝ"#),
+        (r#"ෞ"#, r#"ෞ"#, r#"ෞ"#, r#"ෞ"#, r#"ෞ"#),
+        (r#"ำ"#, r#"ำ"#, r#"ำ"#, r#"ํา"#, r#"ํา"#),
+        (r#"ຳ"#, r#"ຳ"#, r#"ຳ"#, r#"ໍາ"#, r#"ໍາ"#),
+        (r#"ໜ"#, r#"ໜ"#, r#"ໜ"#, r#"ຫນ"#, r#"ຫນ"#),
+        (r#"ໝ"#, r#"ໝ"#, r#"ໝ"#, r#"ຫມ"#, r#"ຫມ"#),
+        (r#"༌"#, r#"༌"#, r#"༌"#, r#"་"#, r#"་"#),
+        (r#"གྷ"#, r#"གྷ"#, r#"གྷ"#, r#"གྷ"#, r#"གྷ"#),
+        (r#"ཌྷ"#, r#"ཌྷ"#, r#"ཌྷ"#, r#"ཌྷ"#, r#"ཌྷ"#),
+        (r#"དྷ"#, r#"དྷ"#, r#"དྷ"#, r#"དྷ"#, r#"དྷ"#),
+        (r#"བྷ"#, r#"བྷ"#, r#"བྷ"#, r#"བྷ"#, r#"བྷ"#),
+        (r#"ཛྷ"#, r#"ཛྷ"#, r#"ཛྷ"#, r#"ཛྷ"#, r#"ཛྷ"#),
+        (r#"ཀྵ"#, r#"ཀྵ"#, r#"ཀྵ"#, r#"ཀྵ"#, r#"ཀྵ"#),
+        (r#"ཱི"#, r#"ཱི"#, r#"ཱི"#, r#"ཱི"#, r#"ཱི"#),
+        (r#"ཱུ"#, r#"ཱུ"#, r#"ཱུ"#, r#"ཱུ"#, r#"ཱུ"#),
+        (r#"ྲྀ"#, r#"ྲྀ"#, r#"ྲྀ"#, r#"ྲྀ"#, r#"ྲྀ"#),
+        (r#"ཷ"#, r#"ཷ"#, r#"ཷ"#, r#"ྲཱྀ"#, r#"ྲཱྀ"#),
+        (r#"ླྀ"#, r#"ླྀ"#, r#"ླྀ"#, r#"ླྀ"#, r#"ླྀ"#),
+        (r#"ཹ"#, r#"ཹ"#, r#"ཹ"#, r#"ླཱྀ"#, r#"ླཱྀ"#),
+        (r#"ཱྀ"#, r#"ཱྀ"#, r#"ཱྀ"#, r#"ཱྀ"#, r#"ཱྀ"#),
+        (r#"ྒྷ"#, r#"ྒྷ"#, r#"ྒྷ"#, r#"ྒྷ"#, r#"ྒྷ"#),
+        (r#"ྜྷ"#, r#"ྜྷ"#, r#"ྜྷ"#, r#"ྜྷ"#, r#"ྜྷ"#),
+        (r#"ྡྷ"#, r#"ྡྷ"#, r#"ྡྷ"#, r#"ྡྷ"#, r#"ྡྷ"#),
+        (r#"ྦྷ"#, r#"ྦྷ"#, r#"ྦྷ"#, r#"ྦྷ"#, r#"ྦྷ"#),
+        (r#"ྫྷ"#, r#"ྫྷ"#, r#"ྫྷ"#, r#"ྫྷ"#, r#"ྫྷ"#),
+        (r#"ྐྵ"#, r#"ྐྵ"#, r#"ྐྵ"#, r#"ྐྵ"#, r#"ྐྵ"#),
+        (r#"ဦ"#, r#"ဦ"#, r#"ဦ"#, r#"ဦ"#, r#"ဦ"#),
+        (r#"ჼ"#, r#"ჼ"#, r#"ჼ"#, r#"ნ"#, r#"ნ"#),
+        (r#"ᬆ"#, r#"ᬆ"#, r#"ᬆ"#, r#"ᬆ"#, r#"ᬆ"#),
+        (r#"ᬈ"#, r#"ᬈ"#, r#"ᬈ"#, r#"ᬈ"#, r#"ᬈ"#),
+        (r#"ᬊ"#, r#"ᬊ"#, r#"ᬊ"#, r#"ᬊ"#, r#"ᬊ"#),
+        (r#"ᬌ"#, r#"ᬌ"#, r#"ᬌ"#, r#"ᬌ"#, r#"ᬌ"#),
+        (r#"ᬎ"#, r#"ᬎ"#, r#"ᬎ"#, r#"ᬎ"#, r#"ᬎ"#),
+        (r#"ᬒ"#, r#"ᬒ"#, r#"ᬒ"#, r#"ᬒ"#, r#"ᬒ"#),
+        (r#"ᬻ"#, r#"ᬻ"#, r#"ᬻ"#, r#"ᬻ"#, r#"ᬻ"#),
+        (r#"ᬽ"#, r#"ᬽ"#, r#"ᬽ"#, r#"ᬽ"#, r#"ᬽ"#),
+        (r#"ᭀ"#, r#"ᭀ"#, r#"ᭀ"#, r#"ᭀ"#, r#"ᭀ"#),
+        (r#"ᭁ"#, r#"ᭁ"#, r#"ᭁ"#, r#"ᭁ"#, r#"ᭁ"#),
+        (r#"ᭃ"#, r#"ᭃ"#, r#"ᭃ"#, r#"ᭃ"#, r#"ᭃ"#),
+        (r#"ᴬ"#, r#"ᴬ"#, r#"ᴬ"#, r#"A"#, r#"A"#),
+        (r#"ᴭ"#, r#"ᴭ"#, r#"ᴭ"#, r#"Æ"#, r#"Æ"#),
+        (r#"ᴮ"#, r#"ᴮ"#, r#"ᴮ"#, r#"B"#, r#"B"#),
+        (r#"ᴰ"#, r#"ᴰ"#, r#"ᴰ"#, r#"D"#, r#"D"#),
+        (r#"ᴱ"#, r#"ᴱ"#, r#"ᴱ"#, r#"E"#, r#"E"#),
+        (r#"ᴲ"#, r#"ᴲ"#, r#"ᴲ"#, r#"Ǝ"#, r#"Ǝ"#),
+        (r#"ᴳ"#, r#"ᴳ"#, r#"ᴳ"#, r#"G"#, r#"G"#),
+        (r#"ᴴ"#, r#"ᴴ"#, r#"ᴴ"#, r#"H"#, r#"H"#),
+        (r#"ᴵ"#, r#"ᴵ"#, r#"ᴵ"#, r#"I"#, r#"I"#),
+        (r#"ᴶ"#, r#"ᴶ"#, r#"ᴶ"#, r#"J"#, r#"J"#),
+        (r#"ᴷ"#, r#"ᴷ"#, r#"ᴷ"#, r#"K"#, r#"K"#),
+        (r#"ᴸ"#, r#"ᴸ"#, r#"ᴸ"#, r#"L"#, r#"L"#),
+        (r#"ᴹ"#, r#"ᴹ"#, r#"ᴹ"#, r#"M"#, r#"M"#),
+        (r#"ᴺ"#, r#"ᴺ"#, r#"ᴺ"#, r#"N"#, r#"N"#),
+        (r#"ᴼ"#, r#"ᴼ"#, r#"ᴼ"#, r#"O"#, r#"O"#),
+        (r#"ᴽ"#, r#"ᴽ"#, r#"ᴽ"#, r#"Ȣ"#, r#"Ȣ"#),
+        (r#"ᴾ"#, r#"ᴾ"#, r#"ᴾ"#, r#"P"#, r#"P"#),
+        (r#"ᴿ"#, r#"ᴿ"#, r#"ᴿ"#, r#"R"#, r#"R"#),
+        (r#"ᵀ"#, r#"ᵀ"#, r#"ᵀ"#, r#"T"#, r#"T"#),
+        (r#"ᵁ"#, r#"ᵁ"#, r#"ᵁ"#, r#"U"#, r#"U"#),
+        (r#"ᵂ"#, r#"ᵂ"#, r#"ᵂ"#, r#"W"#, r#"W"#),
+        (r#"ᵃ"#, r#"ᵃ"#, r#"ᵃ"#, r#"a"#, r#"a"#),
+        (r#"ᵄ"#, r#"ᵄ"#, r#"ᵄ"#, r#"ɐ"#, r#"ɐ"#),
+        (r#"ᵅ"#, r#"ᵅ"#, r#"ᵅ"#, r#"ɑ"#, r#"ɑ"#),
+        (r#"ᵆ"#, r#"ᵆ"#, r#"ᵆ"#, r#"ᴂ"#, r#"ᴂ"#),
+        (r#"ᵇ"#, r#"ᵇ"#, r#"ᵇ"#, r#"b"#, r#"b"#),
+        (r#"ᵈ"#, r#"ᵈ"#, r#"ᵈ"#, r#"d"#, r#"d"#),
+        (r#"ᵉ"#, r#"ᵉ"#, r#"ᵉ"#, r#"e"#, r#"e"#),
+        (r#"ᵊ"#, r#"ᵊ"#, r#"ᵊ"#, r#"ə"#, r#"ə"#),
+        (r#"ᵋ"#, r#"ᵋ"#, r#"ᵋ"#, r#"ɛ"#, r#"ɛ"#),
+        (r#"ᵌ"#, r#"ᵌ"#, r#"ᵌ"#, r#"ɜ"#, r#"ɜ"#),
+        (r#"ᵍ"#, r#"ᵍ"#, r#"ᵍ"#, r#"g"#, r#"g"#),
+        (r#"ᵏ"#, r#"ᵏ"#, r#"ᵏ"#, r#"k"#, r#"k"#),
+        (r#"ᵐ"#, r#"ᵐ"#, r#"ᵐ"#, r#"m"#, r#"m"#),
+        (r#"ᵑ"#, r#"ᵑ"#, r#"ᵑ"#, r#"ŋ"#, r#"ŋ"#),
+        (r#"ᵒ"#, r#"ᵒ"#, r#"ᵒ"#, r#"o"#, r#"o"#),
+        (r#"ᵓ"#, r#"ᵓ"#, r#"ᵓ"#, r#"ɔ"#, r#"ɔ"#),
+        (r#"ᵔ"#, r#"ᵔ"#, r#"ᵔ"#, r#"ᴖ"#, r#"ᴖ"#),
+        (r#"ᵕ"#, r#"ᵕ"#, r#"ᵕ"#, r#"ᴗ"#, r#"ᴗ"#),
+        (r#"ᵖ"#, r#"ᵖ"#, r#"ᵖ"#, r#"p"#, r#"p"#),
+        (r#"ᵗ"#, r#"ᵗ"#, r#"ᵗ"#, r#"t"#, r#"t"#),
+        (r#"ᵘ"#, r#"ᵘ"#, r#"ᵘ"#, r#"u"#, r#"u"#),
+        (r#"ᵙ"#, r#"ᵙ"#, r#"ᵙ"#, r#"ᴝ"#, r#"ᴝ"#),
+        (r#"ᵚ"#, r#"ᵚ"#, r#"ᵚ"#, r#"ɯ"#, r#"ɯ"#),
+        (r#"ᵛ"#, r#"ᵛ"#, r#"ᵛ"#, r#"v"#, r#"v"#),
+        (r#"ᵜ"#, r#"ᵜ"#, r#"ᵜ"#, r#"ᴥ"#, r#"ᴥ"#),
+        (r#"ᵝ"#, r#"ᵝ"#, r#"ᵝ"#, r#"β"#, r#"β"#),
+        (r#"ᵞ"#, r#"ᵞ"#, r#"ᵞ"#, r#"γ"#, r#"γ"#),
+        (r#"ᵟ"#, r#"ᵟ"#, r#"ᵟ"#, r#"δ"#, r#"δ"#),
+        (r#"ᵠ"#, r#"ᵠ"#, r#"ᵠ"#, r#"φ"#, r#"φ"#),
+        (r#"ᵡ"#, r#"ᵡ"#, r#"ᵡ"#, r#"χ"#, r#"χ"#),
+        (r#"ᵢ"#, r#"ᵢ"#, r#"ᵢ"#, r#"i"#, r#"i"#),
+        (r#"ᵣ"#, r#"ᵣ"#, r#"ᵣ"#, r#"r"#, r#"r"#),
+        (r#"ᵤ"#, r#"ᵤ"#, r#"ᵤ"#, r#"u"#, r#"u"#),
+        (r#"ᵥ"#, r#"ᵥ"#, r#"ᵥ"#, r#"v"#, r#"v"#),
+        (r#"ᵦ"#, r#"ᵦ"#, r#"ᵦ"#, r#"β"#, r#"β"#),
+        (r#"ᵧ"#, r#"ᵧ"#, r#"ᵧ"#, r#"γ"#, r#"γ"#),
+        (r#"ᵨ"#, r#"ᵨ"#, r#"ᵨ"#, r#"ρ"#, r#"ρ"#),
+        (r#"ᵩ"#, r#"ᵩ"#, r#"ᵩ"#, r#"φ"#, r#"φ"#),
+        (r#"ᵪ"#, r#"ᵪ"#, r#"ᵪ"#, r#"χ"#, r#"χ"#),
+        (r#"ᵸ"#, r#"ᵸ"#, r#"ᵸ"#, r#"н"#, r#"н"#),
+        (r#"ᶛ"#, r#"ᶛ"#, r#"ᶛ"#, r#"ɒ"#, r#"ɒ"#),
+        (r#"ᶜ"#, r#"ᶜ"#, r#"ᶜ"#, r#"c"#, r#"c"#),
+        (r#"ᶝ"#, r#"ᶝ"#, r#"ᶝ"#, r#"ɕ"#, r#"ɕ"#),
+        (r#"ᶞ"#, r#"ᶞ"#, r#"ᶞ"#, r#"ð"#, r#"ð"#),
+        (r#"ᶟ"#, r#"ᶟ"#, r#"ᶟ"#, r#"ɜ"#, r#"ɜ"#),
+        (r#"ᶠ"#, r#"ᶠ"#, r#"ᶠ"#, r#"f"#, r#"f"#),
+        (r#"ᶡ"#, r#"ᶡ"#, r#"ᶡ"#, r#"ɟ"#, r#"ɟ"#),
+        (r#"ᶢ"#, r#"ᶢ"#, r#"ᶢ"#, r#"ɡ"#, r#"ɡ"#),
+        (r#"ᶣ"#, r#"ᶣ"#, r#"ᶣ"#, r#"ɥ"#, r#"ɥ"#),
+        (r#"ᶤ"#, r#"ᶤ"#, r#"ᶤ"#, r#"ɨ"#, r#"ɨ"#),
+        (r#"ᶥ"#, r#"ᶥ"#, r#"ᶥ"#, r#"ɩ"#, r#"ɩ"#),
+        (r#"ᶦ"#, r#"ᶦ"#, r#"ᶦ"#, r#"ɪ"#, r#"ɪ"#),
+        (r#"ᶧ"#, r#"ᶧ"#, r#"ᶧ"#, r#"ᵻ"#, r#"ᵻ"#),
+        (r#"ᶨ"#, r#"ᶨ"#, r#"ᶨ"#, r#"ʝ"#, r#"ʝ"#),
+        (r#"ᶩ"#, r#"ᶩ"#, r#"ᶩ"#, r#"ɭ"#, r#"ɭ"#),
+        (r#"ᶪ"#, r#"ᶪ"#, r#"ᶪ"#, r#"ᶅ"#, r#"ᶅ"#),
+        (r#"ᶫ"#, r#"ᶫ"#, r#"ᶫ"#, r#"ʟ"#, r#"ʟ"#),
+        (r#"ᶬ"#, r#"ᶬ"#, r#"ᶬ"#, r#"ɱ"#, r#"ɱ"#),
+        (r#"ᶭ"#, r#"ᶭ"#, r#"ᶭ"#, r#"ɰ"#, r#"ɰ"#),
+        (r#"ᶮ"#, r#"ᶮ"#, r#"ᶮ"#, r#"ɲ"#, r#"ɲ"#),
+        (r#"ᶯ"#, r#"ᶯ"#, r#"ᶯ"#, r#"ɳ"#, r#"ɳ"#),
+        (r#"ᶰ"#, r#"ᶰ"#, r#"ᶰ"#, r#"ɴ"#, r#"ɴ"#),
+        (r#"ᶱ"#, r#"ᶱ"#, r#"ᶱ"#, r#"ɵ"#, r#"ɵ"#),
+        (r#"ᶲ"#, r#"ᶲ"#, r#"ᶲ"#, r#"ɸ"#, r#"ɸ"#),
+        (r#"ᶳ"#, r#"ᶳ"#, r#"ᶳ"#, r#"ʂ"#, r#"ʂ"#),
+        (r#"ᶴ"#, r#"ᶴ"#, r#"ᶴ"#, r#"ʃ"#, r#"ʃ"#),
+        (r#"ᶵ"#, r#"ᶵ"#, r#"ᶵ"#, r#"ƫ"#, r#"ƫ"#),
+        (r#"ᶶ"#, r#"ᶶ"#, r#"ᶶ"#, r#"ʉ"#, r#"ʉ"#),
+        (r#"ᶷ"#, r#"ᶷ"#, r#"ᶷ"#, r#"ʊ"#, r#"ʊ"#),
+        (r#"ᶸ"#, r#"ᶸ"#, r#"ᶸ"#, r#"ᴜ"#, r#"ᴜ"#),
+        (r#"ᶹ"#, r#"ᶹ"#, r#"ᶹ"#, r#"ʋ"#, r#"ʋ"#),
+        (r#"ᶺ"#, r#"ᶺ"#, r#"ᶺ"#, r#"ʌ"#, r#"ʌ"#),
+        (r#"ᶻ"#, r#"ᶻ"#, r#"ᶻ"#, r#"z"#, r#"z"#),
+        (r#"ᶼ"#, r#"ᶼ"#, r#"ᶼ"#, r#"ʐ"#, r#"ʐ"#),
+        (r#"ᶽ"#, r#"ᶽ"#, r#"ᶽ"#, r#"ʑ"#, r#"ʑ"#),
+        (r#"ᶾ"#, r#"ᶾ"#, r#"ᶾ"#, r#"ʒ"#, r#"ʒ"#),
+        (r#"ᶿ"#, r#"ᶿ"#, r#"ᶿ"#, r#"θ"#, r#"θ"#),
+        (r#"Ḁ"#, r#"Ḁ"#, r#"Ḁ"#, r#"Ḁ"#, r#"Ḁ"#),
+        (r#"ḁ"#, r#"ḁ"#, r#"ḁ"#, r#"ḁ"#, r#"ḁ"#),
+        (r#"Ḃ"#, r#"Ḃ"#, r#"Ḃ"#, r#"Ḃ"#, r#"Ḃ"#),
+        (r#"ḃ"#, r#"ḃ"#, r#"ḃ"#, r#"ḃ"#, r#"ḃ"#),
+        (r#"Ḅ"#, r#"Ḅ"#, r#"Ḅ"#, r#"Ḅ"#, r#"Ḅ"#),
+        (r#"ḅ"#, r#"ḅ"#, r#"ḅ"#, r#"ḅ"#, r#"ḅ"#),
+        (r#"Ḇ"#, r#"Ḇ"#, r#"Ḇ"#, r#"Ḇ"#, r#"Ḇ"#),
+        (r#"ḇ"#, r#"ḇ"#, r#"ḇ"#, r#"ḇ"#, r#"ḇ"#),
+        (r#"Ḉ"#, r#"Ḉ"#, r#"Ḉ"#, r#"Ḉ"#, r#"Ḉ"#),
+        (r#"ḉ"#, r#"ḉ"#, r#"ḉ"#, r#"ḉ"#, r#"ḉ"#),
+        (r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#, r#"Ḋ"#),
+        (r#"ḋ"#, r#"ḋ"#, r#"ḋ"#, r#"ḋ"#, r#"ḋ"#),
+        (r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#, r#"Ḍ"#),
+        (r#"ḍ"#, r#"ḍ"#, r#"ḍ"#, r#"ḍ"#, r#"ḍ"#),
+        (r#"Ḏ"#, r#"Ḏ"#, r#"Ḏ"#, r#"Ḏ"#, r#"Ḏ"#),
+        (r#"ḏ"#, r#"ḏ"#, r#"ḏ"#, r#"ḏ"#, r#"ḏ"#),
+        (r#"Ḑ"#, r#"Ḑ"#, r#"Ḑ"#, r#"Ḑ"#, r#"Ḑ"#),
+        (r#"ḑ"#, r#"ḑ"#, r#"ḑ"#, r#"ḑ"#, r#"ḑ"#),
+        (r#"Ḓ"#, r#"Ḓ"#, r#"Ḓ"#, r#"Ḓ"#, r#"Ḓ"#),
+        (r#"ḓ"#, r#"ḓ"#, r#"ḓ"#, r#"ḓ"#, r#"ḓ"#),
+        (r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#, r#"Ḕ"#),
+        (r#"ḕ"#, r#"ḕ"#, r#"ḕ"#, r#"ḕ"#, r#"ḕ"#),
+        (r#"Ḗ"#, r#"Ḗ"#, r#"Ḗ"#, r#"Ḗ"#, r#"Ḗ"#),
+        (r#"ḗ"#, r#"ḗ"#, r#"ḗ"#, r#"ḗ"#, r#"ḗ"#),
+        (r#"Ḙ"#, r#"Ḙ"#, r#"Ḙ"#, r#"Ḙ"#, r#"Ḙ"#),
+        (r#"ḙ"#, r#"ḙ"#, r#"ḙ"#, r#"ḙ"#, r#"ḙ"#),
+        (r#"Ḛ"#, r#"Ḛ"#, r#"Ḛ"#, r#"Ḛ"#, r#"Ḛ"#),
+        (r#"ḛ"#, r#"ḛ"#, r#"ḛ"#, r#"ḛ"#, r#"ḛ"#),
+        (r#"Ḝ"#, r#"Ḝ"#, r#"Ḝ"#, r#"Ḝ"#, r#"Ḝ"#),
+        (r#"ḝ"#, r#"ḝ"#, r#"ḝ"#, r#"ḝ"#, r#"ḝ"#),
+        (r#"Ḟ"#, r#"Ḟ"#, r#"Ḟ"#, r#"Ḟ"#, r#"Ḟ"#),
+        (r#"ḟ"#, r#"ḟ"#, r#"ḟ"#, r#"ḟ"#, r#"ḟ"#),
+        (r#"Ḡ"#, r#"Ḡ"#, r#"Ḡ"#, r#"Ḡ"#, r#"Ḡ"#),
+        (r#"ḡ"#, r#"ḡ"#, r#"ḡ"#, r#"ḡ"#, r#"ḡ"#),
+        (r#"Ḣ"#, r#"Ḣ"#, r#"Ḣ"#, r#"Ḣ"#, r#"Ḣ"#),
+        (r#"ḣ"#, r#"ḣ"#, r#"ḣ"#, r#"ḣ"#, r#"ḣ"#),
+        (r#"Ḥ"#, r#"Ḥ"#, r#"Ḥ"#, r#"Ḥ"#, r#"Ḥ"#),
+        (r#"ḥ"#, r#"ḥ"#, r#"ḥ"#, r#"ḥ"#, r#"ḥ"#),
+        (r#"Ḧ"#, r#"Ḧ"#, r#"Ḧ"#, r#"Ḧ"#, r#"Ḧ"#),
+        (r#"ḧ"#, r#"ḧ"#, r#"ḧ"#, r#"ḧ"#, r#"ḧ"#),
+        (r#"Ḩ"#, r#"Ḩ"#, r#"Ḩ"#, r#"Ḩ"#, r#"Ḩ"#),
+        (r#"ḩ"#, r#"ḩ"#, r#"ḩ"#, r#"ḩ"#, r#"ḩ"#),
+        (r#"Ḫ"#, r#"Ḫ"#, r#"Ḫ"#, r#"Ḫ"#, r#"Ḫ"#),
+        (r#"ḫ"#, r#"ḫ"#, r#"ḫ"#, r#"ḫ"#, r#"ḫ"#),
+        (r#"Ḭ"#, r#"Ḭ"#, r#"Ḭ"#, r#"Ḭ"#, r#"Ḭ"#),
+        (r#"ḭ"#, r#"ḭ"#, r#"ḭ"#, r#"ḭ"#, r#"ḭ"#),
+        (r#"Ḯ"#, r#"Ḯ"#, r#"Ḯ"#, r#"Ḯ"#, r#"Ḯ"#),
+        (r#"ḯ"#, r#"ḯ"#, r#"ḯ"#, r#"ḯ"#, r#"ḯ"#),
+        (r#"Ḱ"#, r#"Ḱ"#, r#"Ḱ"#, r#"Ḱ"#, r#"Ḱ"#),
+        (r#"ḱ"#, r#"ḱ"#, r#"ḱ"#, r#"ḱ"#, r#"ḱ"#),
+        (r#"Ḳ"#, r#"Ḳ"#, r#"Ḳ"#, r#"Ḳ"#, r#"Ḳ"#),
+        (r#"ḳ"#, r#"ḳ"#, r#"ḳ"#, r#"ḳ"#, r#"ḳ"#),
+        (r#"Ḵ"#, r#"Ḵ"#, r#"Ḵ"#, r#"Ḵ"#, r#"Ḵ"#),
+        (r#"ḵ"#, r#"ḵ"#, r#"ḵ"#, r#"ḵ"#, r#"ḵ"#),
+        (r#"Ḷ"#, r#"Ḷ"#, r#"Ḷ"#, r#"Ḷ"#, r#"Ḷ"#),
+        (r#"ḷ"#, r#"ḷ"#, r#"ḷ"#, r#"ḷ"#, r#"ḷ"#),
+        (r#"Ḹ"#, r#"Ḹ"#, r#"Ḹ"#, r#"Ḹ"#, r#"Ḹ"#),
+        (r#"ḹ"#, r#"ḹ"#, r#"ḹ"#, r#"ḹ"#, r#"ḹ"#),
+        (r#"Ḻ"#, r#"Ḻ"#, r#"Ḻ"#, r#"Ḻ"#, r#"Ḻ"#),
+        (r#"ḻ"#, r#"ḻ"#, r#"ḻ"#, r#"ḻ"#, r#"ḻ"#),
+        (r#"Ḽ"#, r#"Ḽ"#, r#"Ḽ"#, r#"Ḽ"#, r#"Ḽ"#),
+        (r#"ḽ"#, r#"ḽ"#, r#"ḽ"#, r#"ḽ"#, r#"ḽ"#),
+        (r#"Ḿ"#, r#"Ḿ"#, r#"Ḿ"#, r#"Ḿ"#, r#"Ḿ"#),
+        (r#"ḿ"#, r#"ḿ"#, r#"ḿ"#, r#"ḿ"#, r#"ḿ"#),
+        (r#"Ṁ"#, r#"Ṁ"#, r#"Ṁ"#, r#"Ṁ"#, r#"Ṁ"#),
+        (r#"ṁ"#, r#"ṁ"#, r#"ṁ"#, r#"ṁ"#, r#"ṁ"#),
+        (r#"Ṃ"#, r#"Ṃ"#, r#"Ṃ"#, r#"Ṃ"#, r#"Ṃ"#),
+        (r#"ṃ"#, r#"ṃ"#, r#"ṃ"#, r#"ṃ"#, r#"ṃ"#),
+        (r#"Ṅ"#, r#"Ṅ"#, r#"Ṅ"#, r#"Ṅ"#, r#"Ṅ"#),
+        (r#"ṅ"#, r#"ṅ"#, r#"ṅ"#, r#"ṅ"#, r#"ṅ"#),
+        (r#"Ṇ"#, r#"Ṇ"#, r#"Ṇ"#, r#"Ṇ"#, r#"Ṇ"#),
+        (r#"ṇ"#, r#"ṇ"#, r#"ṇ"#, r#"ṇ"#, r#"ṇ"#),
+        (r#"Ṉ"#, r#"Ṉ"#, r#"Ṉ"#, r#"Ṉ"#, r#"Ṉ"#),
+        (r#"ṉ"#, r#"ṉ"#, r#"ṉ"#, r#"ṉ"#, r#"ṉ"#),
+        (r#"Ṋ"#, r#"Ṋ"#, r#"Ṋ"#, r#"Ṋ"#, r#"Ṋ"#),
+        (r#"ṋ"#, r#"ṋ"#, r#"ṋ"#, r#"ṋ"#, r#"ṋ"#),
+        (r#"Ṍ"#, r#"Ṍ"#, r#"Ṍ"#, r#"Ṍ"#, r#"Ṍ"#),
+        (r#"ṍ"#, r#"ṍ"#, r#"ṍ"#, r#"ṍ"#, r#"ṍ"#),
+        (r#"Ṏ"#, r#"Ṏ"#, r#"Ṏ"#, r#"Ṏ"#, r#"Ṏ"#),
+        (r#"ṏ"#, r#"ṏ"#, r#"ṏ"#, r#"ṏ"#, r#"ṏ"#),
+        (r#"Ṑ"#, r#"Ṑ"#, r#"Ṑ"#, r#"Ṑ"#, r#"Ṑ"#),
+        (r#"ṑ"#, r#"ṑ"#, r#"ṑ"#, r#"ṑ"#, r#"ṑ"#),
+        (r#"Ṓ"#, r#"Ṓ"#, r#"Ṓ"#, r#"Ṓ"#, r#"Ṓ"#),
+        (r#"ṓ"#, r#"ṓ"#, r#"ṓ"#, r#"ṓ"#, r#"ṓ"#),
+        (r#"Ṕ"#, r#"Ṕ"#, r#"Ṕ"#, r#"Ṕ"#, r#"Ṕ"#),
+        (r#"ṕ"#, r#"ṕ"#, r#"ṕ"#, r#"ṕ"#, r#"ṕ"#),
+        (r#"Ṗ"#, r#"Ṗ"#, r#"Ṗ"#, r#"Ṗ"#, r#"Ṗ"#),
+        (r#"ṗ"#, r#"ṗ"#, r#"ṗ"#, r#"ṗ"#, r#"ṗ"#),
+        (r#"Ṙ"#, r#"Ṙ"#, r#"Ṙ"#, r#"Ṙ"#, r#"Ṙ"#),
+        (r#"ṙ"#, r#"ṙ"#, r#"ṙ"#, r#"ṙ"#, r#"ṙ"#),
+        (r#"Ṛ"#, r#"Ṛ"#, r#"Ṛ"#, r#"Ṛ"#, r#"Ṛ"#),
+        (r#"ṛ"#, r#"ṛ"#, r#"ṛ"#, r#"ṛ"#, r#"ṛ"#),
+        (r#"Ṝ"#, r#"Ṝ"#, r#"Ṝ"#, r#"Ṝ"#, r#"Ṝ"#),
+        (r#"ṝ"#, r#"ṝ"#, r#"ṝ"#, r#"ṝ"#, r#"ṝ"#),
+        (r#"Ṟ"#, r#"Ṟ"#, r#"Ṟ"#, r#"Ṟ"#, r#"Ṟ"#),
+        (r#"ṟ"#, r#"ṟ"#, r#"ṟ"#, r#"ṟ"#, r#"ṟ"#),
+        (r#"Ṡ"#, r#"Ṡ"#, r#"Ṡ"#, r#"Ṡ"#, r#"Ṡ"#),
+        (r#"ṡ"#, r#"ṡ"#, r#"ṡ"#, r#"ṡ"#, r#"ṡ"#),
+        (r#"Ṣ"#, r#"Ṣ"#, r#"Ṣ"#, r#"Ṣ"#, r#"Ṣ"#),
+        (r#"ṣ"#, r#"ṣ"#, r#"ṣ"#, r#"ṣ"#, r#"ṣ"#),
+        (r#"Ṥ"#, r#"Ṥ"#, r#"Ṥ"#, r#"Ṥ"#, r#"Ṥ"#),
+        (r#"ṥ"#, r#"ṥ"#, r#"ṥ"#, r#"ṥ"#, r#"ṥ"#),
+        (r#"Ṧ"#, r#"Ṧ"#, r#"Ṧ"#, r#"Ṧ"#, r#"Ṧ"#),
+        (r#"ṧ"#, r#"ṧ"#, r#"ṧ"#, r#"ṧ"#, r#"ṧ"#),
+        (r#"Ṩ"#, r#"Ṩ"#, r#"Ṩ"#, r#"Ṩ"#, r#"Ṩ"#),
+        (r#"ṩ"#, r#"ṩ"#, r#"ṩ"#, r#"ṩ"#, r#"ṩ"#),
+        (r#"Ṫ"#, r#"Ṫ"#, r#"Ṫ"#, r#"Ṫ"#, r#"Ṫ"#),
+        (r#"ṫ"#, r#"ṫ"#, r#"ṫ"#, r#"ṫ"#, r#"ṫ"#),
+        (r#"Ṭ"#, r#"Ṭ"#, r#"Ṭ"#, r#"Ṭ"#, r#"Ṭ"#),
+        (r#"ṭ"#, r#"ṭ"#, r#"ṭ"#, r#"ṭ"#, r#"ṭ"#),
+        (r#"Ṯ"#, r#"Ṯ"#, r#"Ṯ"#, r#"Ṯ"#, r#"Ṯ"#),
+        (r#"ṯ"#, r#"ṯ"#, r#"ṯ"#, r#"ṯ"#, r#"ṯ"#),
+        (r#"Ṱ"#, r#"Ṱ"#, r#"Ṱ"#, r#"Ṱ"#, r#"Ṱ"#),
+        (r#"ṱ"#, r#"ṱ"#, r#"ṱ"#, r#"ṱ"#, r#"ṱ"#),
+        (r#"Ṳ"#, r#"Ṳ"#, r#"Ṳ"#, r#"Ṳ"#, r#"Ṳ"#),
+        (r#"ṳ"#, r#"ṳ"#, r#"ṳ"#, r#"ṳ"#, r#"ṳ"#),
+        (r#"Ṵ"#, r#"Ṵ"#, r#"Ṵ"#, r#"Ṵ"#, r#"Ṵ"#),
+        (r#"ṵ"#, r#"ṵ"#, r#"ṵ"#, r#"ṵ"#, r#"ṵ"#),
+        (r#"Ṷ"#, r#"Ṷ"#, r#"Ṷ"#, r#"Ṷ"#, r#"Ṷ"#),
+        (r#"ṷ"#, r#"ṷ"#, r#"ṷ"#, r#"ṷ"#, r#"ṷ"#),
+        (r#"Ṹ"#, r#"Ṹ"#, r#"Ṹ"#, r#"Ṹ"#, r#"Ṹ"#),
+        (r#"ṹ"#, r#"ṹ"#, r#"ṹ"#, r#"ṹ"#, r#"ṹ"#),
+        (r#"Ṻ"#, r#"Ṻ"#, r#"Ṻ"#, r#"Ṻ"#, r#"Ṻ"#),
+        (r#"ṻ"#, r#"ṻ"#, r#"ṻ"#, r#"ṻ"#, r#"ṻ"#),
+        (r#"Ṽ"#, r#"Ṽ"#, r#"Ṽ"#, r#"Ṽ"#, r#"Ṽ"#),
+        (r#"ṽ"#, r#"ṽ"#, r#"ṽ"#, r#"ṽ"#, r#"ṽ"#),
+        (r#"Ṿ"#, r#"Ṿ"#, r#"Ṿ"#, r#"Ṿ"#, r#"Ṿ"#),
+        (r#"ṿ"#, r#"ṿ"#, r#"ṿ"#, r#"ṿ"#, r#"ṿ"#),
+        (r#"Ẁ"#, r#"Ẁ"#, r#"Ẁ"#, r#"Ẁ"#, r#"Ẁ"#),
+        (r#"ẁ"#, r#"ẁ"#, r#"ẁ"#, r#"ẁ"#, r#"ẁ"#),
+        (r#"Ẃ"#, r#"Ẃ"#, r#"Ẃ"#, r#"Ẃ"#, r#"Ẃ"#),
+        (r#"ẃ"#, r#"ẃ"#, r#"ẃ"#, r#"ẃ"#, r#"ẃ"#),
+        (r#"Ẅ"#, r#"Ẅ"#, r#"Ẅ"#, r#"Ẅ"#, r#"Ẅ"#),
+        (r#"ẅ"#, r#"ẅ"#, r#"ẅ"#, r#"ẅ"#, r#"ẅ"#),
+        (r#"Ẇ"#, r#"Ẇ"#, r#"Ẇ"#, r#"Ẇ"#, r#"Ẇ"#),
+        (r#"ẇ"#, r#"ẇ"#, r#"ẇ"#, r#"ẇ"#, r#"ẇ"#),
+        (r#"Ẉ"#, r#"Ẉ"#, r#"Ẉ"#, r#"Ẉ"#, r#"Ẉ"#),
+        (r#"ẉ"#, r#"ẉ"#, r#"ẉ"#, r#"ẉ"#, r#"ẉ"#),
+        (r#"Ẋ"#, r#"Ẋ"#, r#"Ẋ"#, r#"Ẋ"#, r#"Ẋ"#),
+        (r#"ẋ"#, r#"ẋ"#, r#"ẋ"#, r#"ẋ"#, r#"ẋ"#),
+        (r#"Ẍ"#, r#"Ẍ"#, r#"Ẍ"#, r#"Ẍ"#, r#"Ẍ"#),
+        (r#"ẍ"#, r#"ẍ"#, r#"ẍ"#, r#"ẍ"#, r#"ẍ"#),
+        (r#"Ẏ"#, r#"Ẏ"#, r#"Ẏ"#, r#"Ẏ"#, r#"Ẏ"#),
+        (r#"ẏ"#, r#"ẏ"#, r#"ẏ"#, r#"ẏ"#, r#"ẏ"#),
+        (r#"Ẑ"#, r#"Ẑ"#, r#"Ẑ"#, r#"Ẑ"#, r#"Ẑ"#),
+        (r#"ẑ"#, r#"ẑ"#, r#"ẑ"#, r#"ẑ"#, r#"ẑ"#),
+        (r#"Ẓ"#, r#"Ẓ"#, r#"Ẓ"#, r#"Ẓ"#, r#"Ẓ"#),
+        (r#"ẓ"#, r#"ẓ"#, r#"ẓ"#, r#"ẓ"#, r#"ẓ"#),
+        (r#"Ẕ"#, r#"Ẕ"#, r#"Ẕ"#, r#"Ẕ"#, r#"Ẕ"#),
+        (r#"ẕ"#, r#"ẕ"#, r#"ẕ"#, r#"ẕ"#, r#"ẕ"#),
+        (r#"ẖ"#, r#"ẖ"#, r#"ẖ"#, r#"ẖ"#, r#"ẖ"#),
+        (r#"ẗ"#, r#"ẗ"#, r#"ẗ"#, r#"ẗ"#, r#"ẗ"#),
+        (r#"ẘ"#, r#"ẘ"#, r#"ẘ"#, r#"ẘ"#, r#"ẘ"#),
+        (r#"ẙ"#, r#"ẙ"#, r#"ẙ"#, r#"ẙ"#, r#"ẙ"#),
+        (r#"ẚ"#, r#"ẚ"#, r#"ẚ"#, r#"aʾ"#, r#"aʾ"#),
+        (r#"ẛ"#, r#"ẛ"#, r#"ẛ"#, r#"ṡ"#, r#"ṡ"#),
+        (r#"Ạ"#, r#"Ạ"#, r#"Ạ"#, r#"Ạ"#, r#"Ạ"#),
+        (r#"ạ"#, r#"ạ"#, r#"ạ"#, r#"ạ"#, r#"ạ"#),
+        (r#"Ả"#, r#"Ả"#, r#"Ả"#, r#"Ả"#, r#"Ả"#),
+        (r#"ả"#, r#"ả"#, r#"ả"#, r#"ả"#, r#"ả"#),
+        (r#"Ấ"#, r#"Ấ"#, r#"Ấ"#, r#"Ấ"#, r#"Ấ"#),
+        (r#"ấ"#, r#"ấ"#, r#"ấ"#, r#"ấ"#, r#"ấ"#),
+        (r#"Ầ"#, r#"Ầ"#, r#"Ầ"#, r#"Ầ"#, r#"Ầ"#),
+        (r#"ầ"#, r#"ầ"#, r#"ầ"#, r#"ầ"#, r#"ầ"#),
+        (r#"Ẩ"#, r#"Ẩ"#, r#"Ẩ"#, r#"Ẩ"#, r#"Ẩ"#),
+        (r#"ẩ"#, r#"ẩ"#, r#"ẩ"#, r#"ẩ"#, r#"ẩ"#),
+        (r#"Ẫ"#, r#"Ẫ"#, r#"Ẫ"#, r#"Ẫ"#, r#"Ẫ"#),
+        (r#"ẫ"#, r#"ẫ"#, r#"ẫ"#, r#"ẫ"#, r#"ẫ"#),
+        (r#"Ậ"#, r#"Ậ"#, r#"Ậ"#, r#"Ậ"#, r#"Ậ"#),
+        (r#"ậ"#, r#"ậ"#, r#"ậ"#, r#"ậ"#, r#"ậ"#),
+        (r#"Ắ"#, r#"Ắ"#, r#"Ắ"#, r#"Ắ"#, r#"Ắ"#),
+        (r#"ắ"#, r#"ắ"#, r#"ắ"#, r#"ắ"#, r#"ắ"#),
+        (r#"Ằ"#, r#"Ằ"#, r#"Ằ"#, r#"Ằ"#, r#"Ằ"#),
+        (r#"ằ"#, r#"ằ"#, r#"ằ"#, r#"ằ"#, r#"ằ"#),
+        (r#"Ẳ"#, r#"Ẳ"#, r#"Ẳ"#, r#"Ẳ"#, r#"Ẳ"#),
+        (r#"ẳ"#, r#"ẳ"#, r#"ẳ"#, r#"ẳ"#, r#"ẳ"#),
+        (r#"Ẵ"#, r#"Ẵ"#, r#"Ẵ"#, r#"Ẵ"#, r#"Ẵ"#),
+        (r#"ẵ"#, r#"ẵ"#, r#"ẵ"#, r#"ẵ"#, r#"ẵ"#),
+        (r#"Ặ"#, r#"Ặ"#, r#"Ặ"#, r#"Ặ"#, r#"Ặ"#),
+        (r#"ặ"#, r#"ặ"#, r#"ặ"#, r#"ặ"#, r#"ặ"#),
+        (r#"Ẹ"#, r#"Ẹ"#, r#"Ẹ"#, r#"Ẹ"#, r#"Ẹ"#),
+        (r#"ẹ"#, r#"ẹ"#, r#"ẹ"#, r#"ẹ"#, r#"ẹ"#),
+        (r#"Ẻ"#, r#"Ẻ"#, r#"Ẻ"#, r#"Ẻ"#, r#"Ẻ"#),
+        (r#"ẻ"#, r#"ẻ"#, r#"ẻ"#, r#"ẻ"#, r#"ẻ"#),
+        (r#"Ẽ"#, r#"Ẽ"#, r#"Ẽ"#, r#"Ẽ"#, r#"Ẽ"#),
+        (r#"ẽ"#, r#"ẽ"#, r#"ẽ"#, r#"ẽ"#, r#"ẽ"#),
+        (r#"Ế"#, r#"Ế"#, r#"Ế"#, r#"Ế"#, r#"Ế"#),
+        (r#"ế"#, r#"ế"#, r#"ế"#, r#"ế"#, r#"ế"#),
+        (r#"Ề"#, r#"Ề"#, r#"Ề"#, r#"Ề"#, r#"Ề"#),
+        (r#"ề"#, r#"ề"#, r#"ề"#, r#"ề"#, r#"ề"#),
+        (r#"Ể"#, r#"Ể"#, r#"Ể"#, r#"Ể"#, r#"Ể"#),
+        (r#"ể"#, r#"ể"#, r#"ể"#, r#"ể"#, r#"ể"#),
+        (r#"Ễ"#, r#"Ễ"#, r#"Ễ"#, r#"Ễ"#, r#"Ễ"#),
+        (r#"ễ"#, r#"ễ"#, r#"ễ"#, r#"ễ"#, r#"ễ"#),
+        (r#"Ệ"#, r#"Ệ"#, r#"Ệ"#, r#"Ệ"#, r#"Ệ"#),
+        (r#"ệ"#, r#"ệ"#, r#"ệ"#, r#"ệ"#, r#"ệ"#),
+        (r#"Ỉ"#, r#"Ỉ"#, r#"Ỉ"#, r#"Ỉ"#, r#"Ỉ"#),
+        (r#"ỉ"#, r#"ỉ"#, r#"ỉ"#, r#"ỉ"#, r#"ỉ"#),
+        (r#"Ị"#, r#"Ị"#, r#"Ị"#, r#"Ị"#, r#"Ị"#),
+        (r#"ị"#, r#"ị"#, r#"ị"#, r#"ị"#, r#"ị"#),
+        (r#"Ọ"#, r#"Ọ"#, r#"Ọ"#, r#"Ọ"#, r#"Ọ"#),
+        (r#"ọ"#, r#"ọ"#, r#"ọ"#, r#"ọ"#, r#"ọ"#),
+        (r#"Ỏ"#, r#"Ỏ"#, r#"Ỏ"#, r#"Ỏ"#, r#"Ỏ"#),
+        (r#"ỏ"#, r#"ỏ"#, r#"ỏ"#, r#"ỏ"#, r#"ỏ"#),
+        (r#"Ố"#, r#"Ố"#, r#"Ố"#, r#"Ố"#, r#"Ố"#),
+        (r#"ố"#, r#"ố"#, r#"ố"#, r#"ố"#, r#"ố"#),
+        (r#"Ồ"#, r#"Ồ"#, r#"Ồ"#, r#"Ồ"#, r#"Ồ"#),
+        (r#"ồ"#, r#"ồ"#, r#"ồ"#, r#"ồ"#, r#"ồ"#),
+        (r#"Ổ"#, r#"Ổ"#, r#"Ổ"#, r#"Ổ"#, r#"Ổ"#),
+        (r#"ổ"#, r#"ổ"#, r#"ổ"#, r#"ổ"#, r#"ổ"#),
+        (r#"Ỗ"#, r#"Ỗ"#, r#"Ỗ"#, r#"Ỗ"#, r#"Ỗ"#),
+        (r#"ỗ"#, r#"ỗ"#, r#"ỗ"#, r#"ỗ"#, r#"ỗ"#),
+        (r#"Ộ"#, r#"Ộ"#, r#"Ộ"#, r#"Ộ"#, r#"Ộ"#),
+        (r#"ộ"#, r#"ộ"#, r#"ộ"#, r#"ộ"#, r#"ộ"#),
+        (r#"Ớ"#, r#"Ớ"#, r#"Ớ"#, r#"Ớ"#, r#"Ớ"#),
+        (r#"ớ"#, r#"ớ"#, r#"ớ"#, r#"ớ"#, r#"ớ"#),
+        (r#"Ờ"#, r#"Ờ"#, r#"Ờ"#, r#"Ờ"#, r#"Ờ"#),
+        (r#"ờ"#, r#"ờ"#, r#"ờ"#, r#"ờ"#, r#"ờ"#),
+        (r#"Ở"#, r#"Ở"#, r#"Ở"#, r#"Ở"#, r#"Ở"#),
+        (r#"ở"#, r#"ở"#, r#"ở"#, r#"ở"#, r#"ở"#),
+        (r#"Ỡ"#, r#"Ỡ"#, r#"Ỡ"#, r#"Ỡ"#, r#"Ỡ"#),
+        (r#"ỡ"#, r#"ỡ"#, r#"ỡ"#, r#"ỡ"#, r#"ỡ"#),
+        (r#"Ợ"#, r#"Ợ"#, r#"Ợ"#, r#"Ợ"#, r#"Ợ"#),
+        (r#"ợ"#, r#"ợ"#, r#"ợ"#, r#"ợ"#, r#"ợ"#),
+        (r#"Ụ"#, r#"Ụ"#, r#"Ụ"#, r#"Ụ"#, r#"Ụ"#),
+        (r#"ụ"#, r#"ụ"#, r#"ụ"#, r#"ụ"#, r#"ụ"#),
+        (r#"Ủ"#, r#"Ủ"#, r#"Ủ"#, r#"Ủ"#, r#"Ủ"#),
+        (r#"ủ"#, r#"ủ"#, r#"ủ"#, r#"ủ"#, r#"ủ"#),
+        (r#"Ứ"#, r#"Ứ"#, r#"Ứ"#, r#"Ứ"#, r#"Ứ"#),
+        (r#"ứ"#, r#"ứ"#, r#"ứ"#, r#"ứ"#, r#"ứ"#),
+        (r#"Ừ"#, r#"Ừ"#, r#"Ừ"#, r#"Ừ"#, r#"Ừ"#),
+        (r#"ừ"#, r#"ừ"#, r#"ừ"#, r#"ừ"#, r#"ừ"#),
+        (r#"Ử"#, r#"Ử"#, r#"Ử"#, r#"Ử"#, r#"Ử"#),
+        (r#"ử"#, r#"ử"#, r#"ử"#, r#"ử"#, r#"ử"#),
+        (r#"Ữ"#, r#"Ữ"#, r#"Ữ"#, r#"Ữ"#, r#"Ữ"#),
+        (r#"ữ"#, r#"ữ"#, r#"ữ"#, r#"ữ"#, r#"ữ"#),
+        (r#"Ự"#, r#"Ự"#, r#"Ự"#, r#"Ự"#, r#"Ự"#),
+        (r#"ự"#, r#"ự"#, r#"ự"#, r#"ự"#, r#"ự"#),
+        (r#"Ỳ"#, r#"Ỳ"#, r#"Ỳ"#, r#"Ỳ"#, r#"Ỳ"#),
+        (r#"ỳ"#, r#"ỳ"#, r#"ỳ"#, r#"ỳ"#, r#"ỳ"#),
+        (r#"Ỵ"#, r#"Ỵ"#, r#"Ỵ"#, r#"Ỵ"#, r#"Ỵ"#),
+        (r#"ỵ"#, r#"ỵ"#, r#"ỵ"#, r#"ỵ"#, r#"ỵ"#),
+        (r#"Ỷ"#, r#"Ỷ"#, r#"Ỷ"#, r#"Ỷ"#, r#"Ỷ"#),
+        (r#"ỷ"#, r#"ỷ"#, r#"ỷ"#, r#"ỷ"#, r#"ỷ"#),
+        (r#"Ỹ"#, r#"Ỹ"#, r#"Ỹ"#, r#"Ỹ"#, r#"Ỹ"#),
+        (r#"ỹ"#, r#"ỹ"#, r#"ỹ"#, r#"ỹ"#, r#"ỹ"#),
+        (r#"ἀ"#, r#"ἀ"#, r#"ἀ"#, r#"ἀ"#, r#"ἀ"#),
+        (r#"ἁ"#, r#"ἁ"#, r#"ἁ"#, r#"ἁ"#, r#"ἁ"#),
+        (r#"ἂ"#, r#"ἂ"#, r#"ἂ"#, r#"ἂ"#, r#"ἂ"#),
+        (r#"ἃ"#, r#"ἃ"#, r#"ἃ"#, r#"ἃ"#, r#"ἃ"#),
+        (r#"ἄ"#, r#"ἄ"#, r#"ἄ"#, r#"ἄ"#, r#"ἄ"#),
+        (r#"ἅ"#, r#"ἅ"#, r#"ἅ"#, r#"ἅ"#, r#"ἅ"#),
+        (r#"ἆ"#, r#"ἆ"#, r#"ἆ"#, r#"ἆ"#, r#"ἆ"#),
+        (r#"ἇ"#, r#"ἇ"#, r#"ἇ"#, r#"ἇ"#, r#"ἇ"#),
+        (r#"Ἀ"#, r#"Ἀ"#, r#"Ἀ"#, r#"Ἀ"#, r#"Ἀ"#),
+        (r#"Ἁ"#, r#"Ἁ"#, r#"Ἁ"#, r#"Ἁ"#, r#"Ἁ"#),
+        (r#"Ἂ"#, r#"Ἂ"#, r#"Ἂ"#, r#"Ἂ"#, r#"Ἂ"#),
+        (r#"Ἃ"#, r#"Ἃ"#, r#"Ἃ"#, r#"Ἃ"#, r#"Ἃ"#),
+        (r#"Ἄ"#, r#"Ἄ"#, r#"Ἄ"#, r#"Ἄ"#, r#"Ἄ"#),
+        (r#"Ἅ"#, r#"Ἅ"#, r#"Ἅ"#, r#"Ἅ"#, r#"Ἅ"#),
+        (r#"Ἆ"#, r#"Ἆ"#, r#"Ἆ"#, r#"Ἆ"#, r#"Ἆ"#),
+        (r#"Ἇ"#, r#"Ἇ"#, r#"Ἇ"#, r#"Ἇ"#, r#"Ἇ"#),
+        (r#"ἐ"#, r#"ἐ"#, r#"ἐ"#, r#"ἐ"#, r#"ἐ"#),
+        (r#"ἑ"#, r#"ἑ"#, r#"ἑ"#, r#"ἑ"#, r#"ἑ"#),
+        (r#"ἒ"#, r#"ἒ"#, r#"ἒ"#, r#"ἒ"#, r#"ἒ"#),
+        (r#"ἓ"#, r#"ἓ"#, r#"ἓ"#, r#"ἓ"#, r#"ἓ"#),
+        (r#"ἔ"#, r#"ἔ"#, r#"ἔ"#, r#"ἔ"#, r#"ἔ"#),
+        (r#"ἕ"#, r#"ἕ"#, r#"ἕ"#, r#"ἕ"#, r#"ἕ"#),
+        (r#"Ἐ"#, r#"Ἐ"#, r#"Ἐ"#, r#"Ἐ"#, r#"Ἐ"#),
+        (r#"Ἑ"#, r#"Ἑ"#, r#"Ἑ"#, r#"Ἑ"#, r#"Ἑ"#),
+        (r#"Ἒ"#, r#"Ἒ"#, r#"Ἒ"#, r#"Ἒ"#, r#"Ἒ"#),
+        (r#"Ἓ"#, r#"Ἓ"#, r#"Ἓ"#, r#"Ἓ"#, r#"Ἓ"#),
+        (r#"Ἔ"#, r#"Ἔ"#, r#"Ἔ"#, r#"Ἔ"#, r#"Ἔ"#),
+        (r#"Ἕ"#, r#"Ἕ"#, r#"Ἕ"#, r#"Ἕ"#, r#"Ἕ"#),
+        (r#"ἠ"#, r#"ἠ"#, r#"ἠ"#, r#"ἠ"#, r#"ἠ"#),
+        (r#"ἡ"#, r#"ἡ"#, r#"ἡ"#, r#"ἡ"#, r#"ἡ"#),
+        (r#"ἢ"#, r#"ἢ"#, r#"ἢ"#, r#"ἢ"#, r#"ἢ"#),
+        (r#"ἣ"#, r#"ἣ"#, r#"ἣ"#, r#"ἣ"#, r#"ἣ"#),
+        (r#"ἤ"#, r#"ἤ"#, r#"ἤ"#, r#"ἤ"#, r#"ἤ"#),
+        (r#"ἥ"#, r#"ἥ"#, r#"ἥ"#, r#"ἥ"#, r#"ἥ"#),
+        (r#"ἦ"#, r#"ἦ"#, r#"ἦ"#, r#"ἦ"#, r#"ἦ"#),
+        (r#"ἧ"#, r#"ἧ"#, r#"ἧ"#, r#"ἧ"#, r#"ἧ"#),
+        (r#"Ἠ"#, r#"Ἠ"#, r#"Ἠ"#, r#"Ἠ"#, r#"Ἠ"#),
+        (r#"Ἡ"#, r#"Ἡ"#, r#"Ἡ"#, r#"Ἡ"#, r#"Ἡ"#),
+        (r#"Ἢ"#, r#"Ἢ"#, r#"Ἢ"#, r#"Ἢ"#, r#"Ἢ"#),
+        (r#"Ἣ"#, r#"Ἣ"#, r#"Ἣ"#, r#"Ἣ"#, r#"Ἣ"#),
+        (r#"Ἤ"#, r#"Ἤ"#, r#"Ἤ"#, r#"Ἤ"#, r#"Ἤ"#),
+        (r#"Ἥ"#, r#"Ἥ"#, r#"Ἥ"#, r#"Ἥ"#, r#"Ἥ"#),
+        (r#"Ἦ"#, r#"Ἦ"#, r#"Ἦ"#, r#"Ἦ"#, r#"Ἦ"#),
+        (r#"Ἧ"#, r#"Ἧ"#, r#"Ἧ"#, r#"Ἧ"#, r#"Ἧ"#),
+        (r#"ἰ"#, r#"ἰ"#, r#"ἰ"#, r#"ἰ"#, r#"ἰ"#),
+        (r#"ἱ"#, r#"ἱ"#, r#"ἱ"#, r#"ἱ"#, r#"ἱ"#),
+        (r#"ἲ"#, r#"ἲ"#, r#"ἲ"#, r#"ἲ"#, r#"ἲ"#),
+        (r#"ἳ"#, r#"ἳ"#, r#"ἳ"#, r#"ἳ"#, r#"ἳ"#),
+        (r#"ἴ"#, r#"ἴ"#, r#"ἴ"#, r#"ἴ"#, r#"ἴ"#),
+        (r#"ἵ"#, r#"ἵ"#, r#"ἵ"#, r#"ἵ"#, r#"ἵ"#),
+        (r#"ἶ"#, r#"ἶ"#, r#"ἶ"#, r#"ἶ"#, r#"ἶ"#),
+        (r#"ἷ"#, r#"ἷ"#, r#"ἷ"#, r#"ἷ"#, r#"ἷ"#),
+        (r#"Ἰ"#, r#"Ἰ"#, r#"Ἰ"#, r#"Ἰ"#, r#"Ἰ"#),
+        (r#"Ἱ"#, r#"Ἱ"#, r#"Ἱ"#, r#"Ἱ"#, r#"Ἱ"#),
+        (r#"Ἲ"#, r#"Ἲ"#, r#"Ἲ"#, r#"Ἲ"#, r#"Ἲ"#),
+        (r#"Ἳ"#, r#"Ἳ"#, r#"Ἳ"#, r#"Ἳ"#, r#"Ἳ"#),
+        (r#"Ἴ"#, r#"Ἴ"#, r#"Ἴ"#, r#"Ἴ"#, r#"Ἴ"#),
+        (r#"Ἵ"#, r#"Ἵ"#, r#"Ἵ"#, r#"Ἵ"#, r#"Ἵ"#),
+        (r#"Ἶ"#, r#"Ἶ"#, r#"Ἶ"#, r#"Ἶ"#, r#"Ἶ"#),
+        (r#"Ἷ"#, r#"Ἷ"#, r#"Ἷ"#, r#"Ἷ"#, r#"Ἷ"#),
+        (r#"ὀ"#, r#"ὀ"#, r#"ὀ"#, r#"ὀ"#, r#"ὀ"#),
+        (r#"ὁ"#, r#"ὁ"#, r#"ὁ"#, r#"ὁ"#, r#"ὁ"#),
+        (r#"ὂ"#, r#"ὂ"#, r#"ὂ"#, r#"ὂ"#, r#"ὂ"#),
+        (r#"ὃ"#, r#"ὃ"#, r#"ὃ"#, r#"ὃ"#, r#"ὃ"#),
+        (r#"ὄ"#, r#"ὄ"#, r#"ὄ"#, r#"ὄ"#, r#"ὄ"#),
+        (r#"ὅ"#, r#"ὅ"#, r#"ὅ"#, r#"ὅ"#, r#"ὅ"#),
+        (r#"Ὀ"#, r#"Ὀ"#, r#"Ὀ"#, r#"Ὀ"#, r#"Ὀ"#),
+        (r#"Ὁ"#, r#"Ὁ"#, r#"Ὁ"#, r#"Ὁ"#, r#"Ὁ"#),
+        (r#"Ὂ"#, r#"Ὂ"#, r#"Ὂ"#, r#"Ὂ"#, r#"Ὂ"#),
+        (r#"Ὃ"#, r#"Ὃ"#, r#"Ὃ"#, r#"Ὃ"#, r#"Ὃ"#),
+        (r#"Ὄ"#, r#"Ὄ"#, r#"Ὄ"#, r#"Ὄ"#, r#"Ὄ"#),
+        (r#"Ὅ"#, r#"Ὅ"#, r#"Ὅ"#, r#"Ὅ"#, r#"Ὅ"#),
+        (r#"ὐ"#, r#"ὐ"#, r#"ὐ"#, r#"ὐ"#, r#"ὐ"#),
+        (r#"ὑ"#, r#"ὑ"#, r#"ὑ"#, r#"ὑ"#, r#"ὑ"#),
+        (r#"ὒ"#, r#"ὒ"#, r#"ὒ"#, r#"ὒ"#, r#"ὒ"#),
+        (r#"ὓ"#, r#"ὓ"#, r#"ὓ"#, r#"ὓ"#, r#"ὓ"#),
+        (r#"ὔ"#, r#"ὔ"#, r#"ὔ"#, r#"ὔ"#, r#"ὔ"#),
+        (r#"ὕ"#, r#"ὕ"#, r#"ὕ"#, r#"ὕ"#, r#"ὕ"#),
+        (r#"ὖ"#, r#"ὖ"#, r#"ὖ"#, r#"ὖ"#, r#"ὖ"#),
+        (r#"ὗ"#, r#"ὗ"#, r#"ὗ"#, r#"ὗ"#, r#"ὗ"#),
+        (r#"Ὑ"#, r#"Ὑ"#, r#"Ὑ"#, r#"Ὑ"#, r#"Ὑ"#),
+        (r#"Ὓ"#, r#"Ὓ"#, r#"Ὓ"#, r#"Ὓ"#, r#"Ὓ"#),
+        (r#"Ὕ"#, r#"Ὕ"#, r#"Ὕ"#, r#"Ὕ"#, r#"Ὕ"#),
+        (r#"Ὗ"#, r#"Ὗ"#, r#"Ὗ"#, r#"Ὗ"#, r#"Ὗ"#),
+        (r#"ὠ"#, r#"ὠ"#, r#"ὠ"#, r#"ὠ"#, r#"ὠ"#),
+        (r#"ὡ"#, r#"ὡ"#, r#"ὡ"#, r#"ὡ"#, r#"ὡ"#),
+        (r#"ὢ"#, r#"ὢ"#, r#"ὢ"#, r#"ὢ"#, r#"ὢ"#),
+        (r#"ὣ"#, r#"ὣ"#, r#"ὣ"#, r#"ὣ"#, r#"ὣ"#),
+        (r#"ὤ"#, r#"ὤ"#, r#"ὤ"#, r#"ὤ"#, r#"ὤ"#),
+        (r#"ὥ"#, r#"ὥ"#, r#"ὥ"#, r#"ὥ"#, r#"ὥ"#),
+        (r#"ὦ"#, r#"ὦ"#, r#"ὦ"#, r#"ὦ"#, r#"ὦ"#),
+        (r#"ὧ"#, r#"ὧ"#, r#"ὧ"#, r#"ὧ"#, r#"ὧ"#),
+        (r#"Ὠ"#, r#"Ὠ"#, r#"Ὠ"#, r#"Ὠ"#, r#"Ὠ"#),
+        (r#"Ὡ"#, r#"Ὡ"#, r#"Ὡ"#, r#"Ὡ"#, r#"Ὡ"#),
+        (r#"Ὢ"#, r#"Ὢ"#, r#"Ὢ"#, r#"Ὢ"#, r#"Ὢ"#),
+        (r#"Ὣ"#, r#"Ὣ"#, r#"Ὣ"#, r#"Ὣ"#, r#"Ὣ"#),
+        (r#"Ὤ"#, r#"Ὤ"#, r#"Ὤ"#, r#"Ὤ"#, r#"Ὤ"#),
+        (r#"Ὥ"#, r#"Ὥ"#, r#"Ὥ"#, r#"Ὥ"#, r#"Ὥ"#),
+        (r#"Ὦ"#, r#"Ὦ"#, r#"Ὦ"#, r#"Ὦ"#, r#"Ὦ"#),
+        (r#"Ὧ"#, r#"Ὧ"#, r#"Ὧ"#, r#"Ὧ"#, r#"Ὧ"#),
+        (r#"ὰ"#, r#"ὰ"#, r#"ὰ"#, r#"ὰ"#, r#"ὰ"#),
+        (r#"ά"#, r#"ά"#, r#"ά"#, r#"ά"#, r#"ά"#),
+        (r#"ὲ"#, r#"ὲ"#, r#"ὲ"#, r#"ὲ"#, r#"ὲ"#),
+        (r#"έ"#, r#"έ"#, r#"έ"#, r#"έ"#, r#"έ"#),
+        (r#"ὴ"#, r#"ὴ"#, r#"ὴ"#, r#"ὴ"#, r#"ὴ"#),
+        (r#"ή"#, r#"ή"#, r#"ή"#, r#"ή"#, r#"ή"#),
+        (r#"ὶ"#, r#"ὶ"#, r#"ὶ"#, r#"ὶ"#, r#"ὶ"#),
+        (r#"ί"#, r#"ί"#, r#"ί"#, r#"ί"#, r#"ί"#),
+        (r#"ὸ"#, r#"ὸ"#, r#"ὸ"#, r#"ὸ"#, r#"ὸ"#),
+        (r#"ό"#, r#"ό"#, r#"ό"#, r#"ό"#, r#"ό"#),
+        (r#"ὺ"#, r#"ὺ"#, r#"ὺ"#, r#"ὺ"#, r#"ὺ"#),
+        (r#"ύ"#, r#"ύ"#, r#"ύ"#, r#"ύ"#, r#"ύ"#),
+        (r#"ὼ"#, r#"ὼ"#, r#"ὼ"#, r#"ὼ"#, r#"ὼ"#),
+        (r#"ώ"#, r#"ώ"#, r#"ώ"#, r#"ώ"#, r#"ώ"#),
+        (r#"ᾀ"#, r#"ᾀ"#, r#"ᾀ"#, r#"ᾀ"#, r#"ᾀ"#),
+        (r#"ᾁ"#, r#"ᾁ"#, r#"ᾁ"#, r#"ᾁ"#, r#"ᾁ"#),
+        (r#"ᾂ"#, r#"ᾂ"#, r#"ᾂ"#, r#"ᾂ"#, r#"ᾂ"#),
+        (r#"ᾃ"#, r#"ᾃ"#, r#"ᾃ"#, r#"ᾃ"#, r#"ᾃ"#),
+        (r#"ᾄ"#, r#"ᾄ"#, r#"ᾄ"#, r#"ᾄ"#, r#"ᾄ"#),
+        (r#"ᾅ"#, r#"ᾅ"#, r#"ᾅ"#, r#"ᾅ"#, r#"ᾅ"#),
+        (r#"ᾆ"#, r#"ᾆ"#, r#"ᾆ"#, r#"ᾆ"#, r#"ᾆ"#),
+        (r#"ᾇ"#, r#"ᾇ"#, r#"ᾇ"#, r#"ᾇ"#, r#"ᾇ"#),
+        (r#"ᾈ"#, r#"ᾈ"#, r#"ᾈ"#, r#"ᾈ"#, r#"ᾈ"#),
+        (r#"ᾉ"#, r#"ᾉ"#, r#"ᾉ"#, r#"ᾉ"#, r#"ᾉ"#),
+        (r#"ᾊ"#, r#"ᾊ"#, r#"ᾊ"#, r#"ᾊ"#, r#"ᾊ"#),
+        (r#"ᾋ"#, r#"ᾋ"#, r#"ᾋ"#, r#"ᾋ"#, r#"ᾋ"#),
+        (r#"ᾌ"#, r#"ᾌ"#, r#"ᾌ"#, r#"ᾌ"#, r#"ᾌ"#),
+        (r#"ᾍ"#, r#"ᾍ"#, r#"ᾍ"#, r#"ᾍ"#, r#"ᾍ"#),
+        (r#"ᾎ"#, r#"ᾎ"#, r#"ᾎ"#, r#"ᾎ"#, r#"ᾎ"#),
+        (r#"ᾏ"#, r#"ᾏ"#, r#"ᾏ"#, r#"ᾏ"#, r#"ᾏ"#),
+        (r#"ᾐ"#, r#"ᾐ"#, r#"ᾐ"#, r#"ᾐ"#, r#"ᾐ"#),
+        (r#"ᾑ"#, r#"ᾑ"#, r#"ᾑ"#, r#"ᾑ"#, r#"ᾑ"#),
+        (r#"ᾒ"#, r#"ᾒ"#, r#"ᾒ"#, r#"ᾒ"#, r#"ᾒ"#),
+        (r#"ᾓ"#, r#"ᾓ"#, r#"ᾓ"#, r#"ᾓ"#, r#"ᾓ"#),
+        (r#"ᾔ"#, r#"ᾔ"#, r#"ᾔ"#, r#"ᾔ"#, r#"ᾔ"#),
+        (r#"ᾕ"#, r#"ᾕ"#, r#"ᾕ"#, r#"ᾕ"#, r#"ᾕ"#),
+        (r#"ᾖ"#, r#"ᾖ"#, r#"ᾖ"#, r#"ᾖ"#, r#"ᾖ"#),
+        (r#"ᾗ"#, r#"ᾗ"#, r#"ᾗ"#, r#"ᾗ"#, r#"ᾗ"#),
+        (r#"ᾘ"#, r#"ᾘ"#, r#"ᾘ"#, r#"ᾘ"#, r#"ᾘ"#),
+        (r#"ᾙ"#, r#"ᾙ"#, r#"ᾙ"#, r#"ᾙ"#, r#"ᾙ"#),
+        (r#"ᾚ"#, r#"ᾚ"#, r#"ᾚ"#, r#"ᾚ"#, r#"ᾚ"#),
+        (r#"ᾛ"#, r#"ᾛ"#, r#"ᾛ"#, r#"ᾛ"#, r#"ᾛ"#),
+        (r#"ᾜ"#, r#"ᾜ"#, r#"ᾜ"#, r#"ᾜ"#, r#"ᾜ"#),
+        (r#"ᾝ"#, r#"ᾝ"#, r#"ᾝ"#, r#"ᾝ"#, r#"ᾝ"#),
+        (r#"ᾞ"#, r#"ᾞ"#, r#"ᾞ"#, r#"ᾞ"#, r#"ᾞ"#),
+        (r#"ᾟ"#, r#"ᾟ"#, r#"ᾟ"#, r#"ᾟ"#, r#"ᾟ"#),
+        (r#"ᾠ"#, r#"ᾠ"#, r#"ᾠ"#, r#"ᾠ"#, r#"ᾠ"#),
+        (r#"ᾡ"#, r#"ᾡ"#, r#"ᾡ"#, r#"ᾡ"#, r#"ᾡ"#),
+        (r#"ᾢ"#, r#"ᾢ"#, r#"ᾢ"#, r#"ᾢ"#, r#"ᾢ"#),
+        (r#"ᾣ"#, r#"ᾣ"#, r#"ᾣ"#, r#"ᾣ"#, r#"ᾣ"#),
+        (r#"ᾤ"#, r#"ᾤ"#, r#"ᾤ"#, r#"ᾤ"#, r#"ᾤ"#),
+        (r#"ᾥ"#, r#"ᾥ"#, r#"ᾥ"#, r#"ᾥ"#, r#"ᾥ"#),
+        (r#"ᾦ"#, r#"ᾦ"#, r#"ᾦ"#, r#"ᾦ"#, r#"ᾦ"#),
+        (r#"ᾧ"#, r#"ᾧ"#, r#"ᾧ"#, r#"ᾧ"#, r#"ᾧ"#),
+        (r#"ᾨ"#, r#"ᾨ"#, r#"ᾨ"#, r#"ᾨ"#, r#"ᾨ"#),
+        (r#"ᾩ"#, r#"ᾩ"#, r#"ᾩ"#, r#"ᾩ"#, r#"ᾩ"#),
+        (r#"ᾪ"#, r#"ᾪ"#, r#"ᾪ"#, r#"ᾪ"#, r#"ᾪ"#),
+        (r#"ᾫ"#, r#"ᾫ"#, r#"ᾫ"#, r#"ᾫ"#, r#"ᾫ"#),
+        (r#"ᾬ"#, r#"ᾬ"#, r#"ᾬ"#, r#"ᾬ"#, r#"ᾬ"#),
+        (r#"ᾭ"#, r#"ᾭ"#, r#"ᾭ"#, r#"ᾭ"#, r#"ᾭ"#),
+        (r#"ᾮ"#, r#"ᾮ"#, r#"ᾮ"#, r#"ᾮ"#, r#"ᾮ"#),
+        (r#"ᾯ"#, r#"ᾯ"#, r#"ᾯ"#, r#"ᾯ"#, r#"ᾯ"#),
+        (r#"ᾰ"#, r#"ᾰ"#, r#"ᾰ"#, r#"ᾰ"#, r#"ᾰ"#),
+        (r#"ᾱ"#, r#"ᾱ"#, r#"ᾱ"#, r#"ᾱ"#, r#"ᾱ"#),
+        (r#"ᾲ"#, r#"ᾲ"#, r#"ᾲ"#, r#"ᾲ"#, r#"ᾲ"#),
+        (r#"ᾳ"#, r#"ᾳ"#, r#"ᾳ"#, r#"ᾳ"#, r#"ᾳ"#),
+        (r#"ᾴ"#, r#"ᾴ"#, r#"ᾴ"#, r#"ᾴ"#, r#"ᾴ"#),
+        (r#"ᾶ"#, r#"ᾶ"#, r#"ᾶ"#, r#"ᾶ"#, r#"ᾶ"#),
+        (r#"ᾷ"#, r#"ᾷ"#, r#"ᾷ"#, r#"ᾷ"#, r#"ᾷ"#),
+        (r#"Ᾰ"#, r#"Ᾰ"#, r#"Ᾰ"#, r#"Ᾰ"#, r#"Ᾰ"#),
+        (r#"Ᾱ"#, r#"Ᾱ"#, r#"Ᾱ"#, r#"Ᾱ"#, r#"Ᾱ"#),
+        (r#"Ὰ"#, r#"Ὰ"#, r#"Ὰ"#, r#"Ὰ"#, r#"Ὰ"#),
+        (r#"Ά"#, r#"Ά"#, r#"Ά"#, r#"Ά"#, r#"Ά"#),
+        (r#"ᾼ"#, r#"ᾼ"#, r#"ᾼ"#, r#"ᾼ"#, r#"ᾼ"#),
+        (r#"᾽"#, r#"᾽"#, r#"᾽"#, r#" ̓"#, r#" ̓"#),
+        (r#"ι"#, r#"ι"#, r#"ι"#, r#"ι"#, r#"ι"#),
+        (r#"᾿"#, r#"᾿"#, r#"᾿"#, r#" ̓"#, r#" ̓"#),
+        (r#"῀"#, r#"῀"#, r#"῀"#, r#" ͂"#, r#" ͂"#),
+        (r#"῁"#, r#"῁"#, r#"῁"#, r#" ̈͂"#, r#" ̈͂"#),
+        (r#"ῂ"#, r#"ῂ"#, r#"ῂ"#, r#"ῂ"#, r#"ῂ"#),
+        (r#"ῃ"#, r#"ῃ"#, r#"ῃ"#, r#"ῃ"#, r#"ῃ"#),
+        (r#"ῄ"#, r#"ῄ"#, r#"ῄ"#, r#"ῄ"#, r#"ῄ"#),
+        (r#"ῆ"#, r#"ῆ"#, r#"ῆ"#, r#"ῆ"#, r#"ῆ"#),
+        (r#"ῇ"#, r#"ῇ"#, r#"ῇ"#, r#"ῇ"#, r#"ῇ"#),
+        (r#"Ὲ"#, r#"Ὲ"#, r#"Ὲ"#, r#"Ὲ"#, r#"Ὲ"#),
+        (r#"Έ"#, r#"Έ"#, r#"Έ"#, r#"Έ"#, r#"Έ"#),
+        (r#"Ὴ"#, r#"Ὴ"#, r#"Ὴ"#, r#"Ὴ"#, r#"Ὴ"#),
+        (r#"Ή"#, r#"Ή"#, r#"Ή"#, r#"Ή"#, r#"Ή"#),
+        (r#"ῌ"#, r#"ῌ"#, r#"ῌ"#, r#"ῌ"#, r#"ῌ"#),
+        (r#"῍"#, r#"῍"#, r#"῍"#, r#" ̓̀"#, r#" ̓̀"#),
+        (r#"῎"#, r#"῎"#, r#"῎"#, r#" ̓́"#, r#" ̓́"#),
+        (r#"῏"#, r#"῏"#, r#"῏"#, r#" ̓͂"#, r#" ̓͂"#),
+        (r#"ῐ"#, r#"ῐ"#, r#"ῐ"#, r#"ῐ"#, r#"ῐ"#),
+        (r#"ῑ"#, r#"ῑ"#, r#"ῑ"#, r#"ῑ"#, r#"ῑ"#),
+        (r#"ῒ"#, r#"ῒ"#, r#"ῒ"#, r#"ῒ"#, r#"ῒ"#),
+        (r#"ΐ"#, r#"ΐ"#, r#"ΐ"#, r#"ΐ"#, r#"ΐ"#),
+        (r#"ῖ"#, r#"ῖ"#, r#"ῖ"#, r#"ῖ"#, r#"ῖ"#),
+        (r#"ῗ"#, r#"ῗ"#, r#"ῗ"#, r#"ῗ"#, r#"ῗ"#),
+        (r#"Ῐ"#, r#"Ῐ"#, r#"Ῐ"#, r#"Ῐ"#, r#"Ῐ"#),
+        (r#"Ῑ"#, r#"Ῑ"#, r#"Ῑ"#, r#"Ῑ"#, r#"Ῑ"#),
+        (r#"Ὶ"#, r#"Ὶ"#, r#"Ὶ"#, r#"Ὶ"#, r#"Ὶ"#),
+        (r#"Ί"#, r#"Ί"#, r#"Ί"#, r#"Ί"#, r#"Ί"#),
+        (r#"῝"#, r#"῝"#, r#"῝"#, r#" ̔̀"#, r#" ̔̀"#),
+        (r#"῞"#, r#"῞"#, r#"῞"#, r#" ̔́"#, r#" ̔́"#),
+        (r#"῟"#, r#"῟"#, r#"῟"#, r#" ̔͂"#, r#" ̔͂"#),
+        (r#"ῠ"#, r#"ῠ"#, r#"ῠ"#, r#"ῠ"#, r#"ῠ"#),
+        (r#"ῡ"#, r#"ῡ"#, r#"ῡ"#, r#"ῡ"#, r#"ῡ"#),
+        (r#"ῢ"#, r#"ῢ"#, r#"ῢ"#, r#"ῢ"#, r#"ῢ"#),
+        (r#"ΰ"#, r#"ΰ"#, r#"ΰ"#, r#"ΰ"#, r#"ΰ"#),
+        (r#"ῤ"#, r#"ῤ"#, r#"ῤ"#, r#"ῤ"#, r#"ῤ"#),
+        (r#"ῥ"#, r#"ῥ"#, r#"ῥ"#, r#"ῥ"#, r#"ῥ"#),
+        (r#"ῦ"#, r#"ῦ"#, r#"ῦ"#, r#"ῦ"#, r#"ῦ"#),
+        (r#"ῧ"#, r#"ῧ"#, r#"ῧ"#, r#"ῧ"#, r#"ῧ"#),
+        (r#"Ῠ"#, r#"Ῠ"#, r#"Ῠ"#, r#"Ῠ"#, r#"Ῠ"#),
+        (r#"Ῡ"#, r#"Ῡ"#, r#"Ῡ"#, r#"Ῡ"#, r#"Ῡ"#),
+        (r#"Ὺ"#, r#"Ὺ"#, r#"Ὺ"#, r#"Ὺ"#, r#"Ὺ"#),
+        (r#"Ύ"#, r#"Ύ"#, r#"Ύ"#, r#"Ύ"#, r#"Ύ"#),
+        (r#"Ῥ"#, r#"Ῥ"#, r#"Ῥ"#, r#"Ῥ"#, r#"Ῥ"#),
+        (r#"῭"#, r#"῭"#, r#"῭"#, r#" ̈̀"#, r#" ̈̀"#),
+        (r#"΅"#, r#"΅"#, r#"΅"#, r#" ̈́"#, r#" ̈́"#),
+        (r#"`"#, r#"`"#, r#"`"#, r#"`"#, r#"`"#),
+        (r#"ῲ"#, r#"ῲ"#, r#"ῲ"#, r#"ῲ"#, r#"ῲ"#),
+        (r#"ῳ"#, r#"ῳ"#, r#"ῳ"#, r#"ῳ"#, r#"ῳ"#),
+        (r#"ῴ"#, r#"ῴ"#, r#"ῴ"#, r#"ῴ"#, r#"ῴ"#),
+        (r#"ῶ"#, r#"ῶ"#, r#"ῶ"#, r#"ῶ"#, r#"ῶ"#),
+        (r#"ῷ"#, r#"ῷ"#, r#"ῷ"#, r#"ῷ"#, r#"ῷ"#),
+        (r#"Ὸ"#, r#"Ὸ"#, r#"Ὸ"#, r#"Ὸ"#, r#"Ὸ"#),
+        (r#"Ό"#, r#"Ό"#, r#"Ό"#, r#"Ό"#, r#"Ό"#),
+        (r#"Ὼ"#, r#"Ὼ"#, r#"Ὼ"#, r#"Ὼ"#, r#"Ὼ"#),
+        (r#"Ώ"#, r#"Ώ"#, r#"Ώ"#, r#"Ώ"#, r#"Ώ"#),
+        (r#"ῼ"#, r#"ῼ"#, r#"ῼ"#, r#"ῼ"#, r#"ῼ"#),
+        (r#"´"#, r#"´"#, r#"´"#, r#" ́"#, r#" ́"#),
+        (r#"῾"#, r#"῾"#, r#"῾"#, r#" ̔"#, r#" ̔"#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#"‑"#, r#"‑"#, r#"‑"#, r#"‐"#, r#"‐"#),
+        (r#"‗"#, r#"‗"#, r#"‗"#, r#" ̳"#, r#" ̳"#),
+        (r#"․"#, r#"․"#, r#"․"#, r#"."#, r#"."#),
+        (r#"‥"#, r#"‥"#, r#"‥"#, r#".."#, r#".."#),
+        (r#"…"#, r#"…"#, r#"…"#, r#"..."#, r#"..."#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#"″"#, r#"″"#, r#"″"#, r#"′′"#, r#"′′"#),
+        (r#"‴"#, r#"‴"#, r#"‴"#, r#"′′′"#, r#"′′′"#),
+        (r#"‶"#, r#"‶"#, r#"‶"#, r#"‵‵"#, r#"‵‵"#),
+        (r#"‷"#, r#"‷"#, r#"‷"#, r#"‵‵‵"#, r#"‵‵‵"#),
+        (r#"‼"#, r#"‼"#, r#"‼"#, r#"!!"#, r#"!!"#),
+        (r#"‾"#, r#"‾"#, r#"‾"#, r#" ̅"#, r#" ̅"#),
+        (r#"⁇"#, r#"⁇"#, r#"⁇"#, r#"??"#, r#"??"#),
+        (r#"⁈"#, r#"⁈"#, r#"⁈"#, r#"?!"#, r#"?!"#),
+        (r#"⁉"#, r#"⁉"#, r#"⁉"#, r#"!?"#, r#"!?"#),
+        (r#"⁗"#, r#"⁗"#, r#"⁗"#, r#"′′′′"#, r#"′′′′"#),
+        (r#" "#, r#" "#, r#" "#, r#" "#, r#" "#),
+        (r#"⁰"#, r#"⁰"#, r#"⁰"#, r#"0"#, r#"0"#),
+        (r#"ⁱ"#, r#"ⁱ"#, r#"ⁱ"#, r#"i"#, r#"i"#),
+        (r#"⁴"#, r#"⁴"#, r#"⁴"#, r#"4"#, r#"4"#),
+        (r#"⁵"#, r#"⁵"#, r#"⁵"#, r#"5"#, r#"5"#),
+        (r#"⁶"#, r#"⁶"#, r#"⁶"#, r#"6"#, r#"6"#),
+        (r#"⁷"#, r#"⁷"#, r#"⁷"#, r#"7"#, r#"7"#),
+        (r#"⁸"#, r#"⁸"#, r#"⁸"#, r#"8"#, r#"8"#),
+        (r#"⁹"#, r#"⁹"#, r#"⁹"#, r#"9"#, r#"9"#),
+        (r#"⁺"#, r#"⁺"#, r#"⁺"#, r#"+"#, r#"+"#),
+        (r#"⁻"#, r#"⁻"#, r#"⁻"#, r#"−"#, r#"−"#),
+        (r#"⁼"#, r#"⁼"#, r#"⁼"#, r#"="#, r#"="#),
+        (r#"⁽"#, r#"⁽"#, r#"⁽"#, r#"("#, r#"("#),
+        (r#"⁾"#, r#"⁾"#, r#"⁾"#, r#")"#, r#")"#),
+        (r#"ⁿ"#, r#"ⁿ"#, r#"ⁿ"#, r#"n"#, r#"n"#),
+        (r#"₀"#, r#"₀"#, r#"₀"#, r#"0"#, r#"0"#),
+        (r#"₁"#, r#"₁"#, r#"₁"#, r#"1"#, r#"1"#),
+        (r#"₂"#, r#"₂"#, r#"₂"#, r#"2"#, r#"2"#),
+        (r#"₃"#, r#"₃"#, r#"₃"#, r#"3"#, r#"3"#),
+        (r#"₄"#, r#"₄"#, r#"₄"#, r#"4"#, r#"4"#),
+        (r#"₅"#, r#"₅"#, r#"₅"#, r#"5"#, r#"5"#),
+        (r#"₆"#, r#"₆"#, r#"₆"#, r#"6"#, r#"6"#),
+        (r#"₇"#, r#"₇"#, r#"₇"#, r#"7"#, r#"7"#),
+        (r#"₈"#, r#"₈"#, r#"₈"#, r#"8"#, r#"8"#),
+        (r#"₉"#, r#"₉"#, r#"₉"#, r#"9"#, r#"9"#),
+        (r#"₊"#, r#"₊"#, r#"₊"#, r#"+"#, r#"+"#),
+        (r#"₋"#, r#"₋"#, r#"₋"#, r#"−"#, r#"−"#),
+        (r#"₌"#, r#"₌"#, r#"₌"#, r#"="#, r#"="#),
+        (r#"₍"#, r#"₍"#, r#"₍"#, r#"("#, r#"("#),
+        (r#"₎"#, r#"₎"#, r#"₎"#, r#")"#, r#")"#),
+        (r#"ₐ"#, r#"ₐ"#, r#"ₐ"#, r#"a"#, r#"a"#),
+        (r#"ₑ"#, r#"ₑ"#, r#"ₑ"#, r#"e"#, r#"e"#),
+        (r#"ₒ"#, r#"ₒ"#, r#"ₒ"#, r#"o"#, r#"o"#),
+        (r#"ₓ"#, r#"ₓ"#, r#"ₓ"#, r#"x"#, r#"x"#),
+        (r#"ₔ"#, r#"ₔ"#, r#"ₔ"#, r#"ə"#, r#"ə"#),
+        (r#"ₕ"#, r#"ₕ"#, r#"ₕ"#, r#"h"#, r#"h"#),
+        (r#"ₖ"#, r#"ₖ"#, r#"ₖ"#, r#"k"#, r#"k"#),
+        (r#"ₗ"#, r#"ₗ"#, r#"ₗ"#, r#"l"#, r#"l"#),
+        (r#"ₘ"#, r#"ₘ"#, r#"ₘ"#, r#"m"#, r#"m"#),
+        (r#"ₙ"#, r#"ₙ"#, r#"ₙ"#, r#"n"#, r#"n"#),
+        (r#"ₚ"#, r#"ₚ"#, r#"ₚ"#, r#"p"#, r#"p"#),
+        (r#"ₛ"#, r#"ₛ"#, r#"ₛ"#, r#"s"#, r#"s"#),
+        (r#"ₜ"#, r#"ₜ"#, r#"ₜ"#, r#"t"#, r#"t"#),
+        (r#"₨"#, r#"₨"#, r#"₨"#, r#"Rs"#, r#"Rs"#),
+        (r#"℀"#, r#"℀"#, r#"℀"#, r#"a/c"#, r#"a/c"#),
+        (r#"℁"#, r#"℁"#, r#"℁"#, r#"a/s"#, r#"a/s"#),
+        (r#"ℂ"#, r#"ℂ"#, r#"ℂ"#, r#"C"#, r#"C"#),
+        (r#"℃"#, r#"℃"#, r#"℃"#, r#"°C"#, r#"°C"#),
+        (r#"℅"#, r#"℅"#, r#"℅"#, r#"c/o"#, r#"c/o"#),
+        (r#"℆"#, r#"℆"#, r#"℆"#, r#"c/u"#, r#"c/u"#),
+        (r#"ℇ"#, r#"ℇ"#, r#"ℇ"#, r#"Ɛ"#, r#"Ɛ"#),
+        (r#"℉"#, r#"℉"#, r#"℉"#, r#"°F"#, r#"°F"#),
+        (r#"ℊ"#, r#"ℊ"#, r#"ℊ"#, r#"g"#, r#"g"#),
+        (r#"ℋ"#, r#"ℋ"#, r#"ℋ"#, r#"H"#, r#"H"#),
+        (r#"ℌ"#, r#"ℌ"#, r#"ℌ"#, r#"H"#, r#"H"#),
+        (r#"ℍ"#, r#"ℍ"#, r#"ℍ"#, r#"H"#, r#"H"#),
+        (r#"ℎ"#, r#"ℎ"#, r#"ℎ"#, r#"h"#, r#"h"#),
+        (r#"ℏ"#, r#"ℏ"#, r#"ℏ"#, r#"ħ"#, r#"ħ"#),
+        (r#"ℐ"#, r#"ℐ"#, r#"ℐ"#, r#"I"#, r#"I"#),
+        (r#"ℑ"#, r#"ℑ"#, r#"ℑ"#, r#"I"#, r#"I"#),
+        (r#"ℒ"#, r#"ℒ"#, r#"ℒ"#, r#"L"#, r#"L"#),
+        (r#"ℓ"#, r#"ℓ"#, r#"ℓ"#, r#"l"#, r#"l"#),
+        (r#"ℕ"#, r#"ℕ"#, r#"ℕ"#, r#"N"#, r#"N"#),
+        (r#"№"#, r#"№"#, r#"№"#, r#"No"#, r#"No"#),
+        (r#"ℙ"#, r#"ℙ"#, r#"ℙ"#, r#"P"#, r#"P"#),
+        (r#"ℚ"#, r#"ℚ"#, r#"ℚ"#, r#"Q"#, r#"Q"#),
+        (r#"ℛ"#, r#"ℛ"#, r#"ℛ"#, r#"R"#, r#"R"#),
+        (r#"ℜ"#, r#"ℜ"#, r#"ℜ"#, r#"R"#, r#"R"#),
+        (r#"ℝ"#, r#"ℝ"#, r#"ℝ"#, r#"R"#, r#"R"#),
+        (r#"℠"#, r#"℠"#, r#"℠"#, r#"SM"#, r#"SM"#),
+        (r#"℡"#, r#"℡"#, r#"℡"#, r#"TEL"#, r#"TEL"#),
+        (r#"™"#, r#"™"#, r#"™"#, r#"TM"#, r#"TM"#),
+        (r#"ℤ"#, r#"ℤ"#, r#"ℤ"#, r#"Z"#, r#"Z"#),
+        (r#"Ω"#, r#"Ω"#, r#"Ω"#, r#"Ω"#, r#"Ω"#),
+        (r#"ℨ"#, r#"ℨ"#, r#"ℨ"#, r#"Z"#, r#"Z"#),
+        (r#"K"#, r#"K"#, r#"K"#, r#"K"#, r#"K"#),
+        (r#"Å"#, r#"Å"#, r#"Å"#, r#"Å"#, r#"Å"#),
+        (r#"ℬ"#, r#"ℬ"#, r#"ℬ"#, r#"B"#, r#"B"#),
+        (r#"ℭ"#, r#"ℭ"#, r#"ℭ"#, r#"C"#, r#"C"#),
+        (r#"ℯ"#, r#"ℯ"#, r#"ℯ"#, r#"e"#, r#"e"#),
+        (r#"ℰ"#, r#"ℰ"#, r#"ℰ"#, r#"E"#, r#"E"#),
+        (r#"ℱ"#, r#"ℱ"#, r#"ℱ"#, r#"F"#, r#"F"#),
+        (r#"ℳ"#, r#"ℳ"#, r#"ℳ"#, r#"M"#, r#"M"#),
+        (r#"ℴ"#, r#"ℴ"#, r#"ℴ"#, r#"o"#, r#"o"#),
+        (r#"ℵ"#, r#"ℵ"#, r#"ℵ"#, r#"א"#, r#"א"#),
+        (r#"ℶ"#, r#"ℶ"#, r#"ℶ"#, r#"ב"#, r#"ב"#),
+        (r#"ℷ"#, r#"ℷ"#, r#"ℷ"#, r#"ג"#, r#"ג"#),
+        (r#"ℸ"#, r#"ℸ"#, r#"ℸ"#, r#"ד"#, r#"ד"#),
+        (r#"ℹ"#, r#"ℹ"#, r#"ℹ"#, r#"i"#, r#"i"#),
+        (r#"℻"#, r#"℻"#, r#"℻"#, r#"FAX"#, r#"FAX"#),
+        (r#"ℼ"#, r#"ℼ"#, r#"ℼ"#, r#"π"#, r#"π"#),
+        (r#"ℽ"#, r#"ℽ"#, r#"ℽ"#, r#"γ"#, r#"γ"#),
+        (r#"ℾ"#, r#"ℾ"#, r#"ℾ"#, r#"Γ"#, r#"Γ"#),
+        (r#"ℿ"#, r#"ℿ"#, r#"ℿ"#, r#"Π"#, r#"Π"#),
+        (r#"⅀"#, r#"⅀"#, r#"⅀"#, r#"∑"#, r#"∑"#),
+        (r#"ⅅ"#, r#"ⅅ"#, r#"ⅅ"#, r#"D"#, r#"D"#),
+        (r#"ⅆ"#, r#"ⅆ"#, r#"ⅆ"#, r#"d"#, r#"d"#),
+        (r#"ⅇ"#, r#"ⅇ"#, r#"ⅇ"#, r#"e"#, r#"e"#),
+        (r#"ⅈ"#, r#"ⅈ"#, r#"ⅈ"#, r#"i"#, r#"i"#),
+        (r#"ⅉ"#, r#"ⅉ"#, r#"ⅉ"#, r#"j"#, r#"j"#),
+        (r#"⅐"#, r#"⅐"#, r#"⅐"#, r#"1⁄7"#, r#"1⁄7"#),
+        (r#"⅑"#, r#"⅑"#, r#"⅑"#, r#"1⁄9"#, r#"1⁄9"#),
+        (r#"⅒"#, r#"⅒"#, r#"⅒"#, r#"1⁄10"#, r#"1⁄10"#),
+        (r#"⅓"#, r#"⅓"#, r#"⅓"#, r#"1⁄3"#, r#"1⁄3"#),
+        (r#"⅔"#, r#"⅔"#, r#"⅔"#, r#"2⁄3"#, r#"2⁄3"#),
+        (r#"⅕"#, r#"⅕"#, r#"⅕"#, r#"1⁄5"#, r#"1⁄5"#),
+        (r#"⅖"#, r#"⅖"#, r#"⅖"#, r#"2⁄5"#, r#"2⁄5"#),
+        (r#"⅗"#, r#"⅗"#, r#"⅗"#, r#"3⁄5"#, r#"3⁄5"#),
+        (r#"⅘"#, r#"⅘"#, r#"⅘"#, r#"4⁄5"#, r#"4⁄5"#),
+        (r#"⅙"#, r#"⅙"#, r#"⅙"#, r#"1⁄6"#, r#"1⁄6"#),
+        (r#"⅚"#, r#"⅚"#, r#"⅚"#, r#"5⁄6"#, r#"5⁄6"#),
+        (r#"⅛"#, r#"⅛"#, r#"⅛"#, r#"1⁄8"#, r#"1⁄8"#),
+        (r#"⅜"#, r#"⅜"#, r#"⅜"#, r#"3⁄8"#, r#"3⁄8"#),
+        (r#"⅝"#, r#"⅝"#, r#"⅝"#, r#"5⁄8"#, r#"5⁄8"#),
+        (r#"⅞"#, r#"⅞"#, r#"⅞"#, r#"7⁄8"#, r#"7⁄8"#),
+        (r#"⅟"#, r#"⅟"#, r#"⅟"#, r#"1⁄"#, r#"1⁄"#),
+        (r#"Ⅰ"#, r#"Ⅰ"#, r#"Ⅰ"#, r#"I"#, r#"I"#),
+        (r#"Ⅱ"#, r#"Ⅱ"#, r#"Ⅱ"#, r#"II"#, r#"II"#),
+        (r#"Ⅲ"#, r#"Ⅲ"#, r#"Ⅲ"#, r#"III"#, r#"III"#),
+        (r#"Ⅳ"#, r#"Ⅳ"#, r#"Ⅳ"#, r#"IV"#, r#"IV"#),
+        (r#"Ⅴ"#, r#"Ⅴ"#, r#"Ⅴ"#, r#"V"#, r#"V"#),
+        (r#"Ⅵ"#, r#"Ⅵ"#, r#"Ⅵ"#, r#"VI"#, r#"VI"#),
+        (r#"Ⅶ"#, r#"Ⅶ"#, r#"Ⅶ"#, r#"VII"#, r#"VII"#),
+        (r#"Ⅷ"#, r#"Ⅷ"#, r#"Ⅷ"#, r#"VIII"#, r#"VIII"#),
+        (r#"Ⅸ"#, r#"Ⅸ"#, r#"Ⅸ"#, r#"IX"#, r#"IX"#),
+        (r#"Ⅹ"#, r#"Ⅹ"#, r#"Ⅹ"#, r#"X"#, r#"X"#),
+        (r#"Ⅺ"#, r#"Ⅺ"#, r#"Ⅺ"#, r#"XI"#, r#"XI"#),
+        (r#"Ⅻ"#, r#"Ⅻ"#, r#"Ⅻ"#, r#"XII"#, r#"XII"#),
+        (r#"Ⅼ"#, r#"Ⅼ"#, r#"Ⅼ"#, r#"L"#, r#"L"#),
+        (r#"Ⅽ"#, r#"Ⅽ"#, r#"Ⅽ"#, r#"C"#, r#"C"#),
+        (r#"Ⅾ"#, r#"Ⅾ"#, r#"Ⅾ"#, r#"D"#, r#"D"#),
+        (r#"Ⅿ"#, r#"Ⅿ"#, r#"Ⅿ"#, r#"M"#, r#"M"#),
+        (r#"ⅰ"#, r#"ⅰ"#, r#"ⅰ"#, r#"i"#, r#"i"#),
+        (r#"ⅱ"#, r#"ⅱ"#, r#"ⅱ"#, r#"ii"#, r#"ii"#),
+        (r#"ⅲ"#, r#"ⅲ"#, r#"ⅲ"#, r#"iii"#, r#"iii"#),
+        (r#"ⅳ"#, r#"ⅳ"#, r#"ⅳ"#, r#"iv"#, r#"iv"#),
+        (r#"ⅴ"#, r#"ⅴ"#, r#"ⅴ"#, r#"v"#, r#"v"#),
+        (r#"ⅵ"#, r#"ⅵ"#, r#"ⅵ"#, r#"vi"#, r#"vi"#),
+        (r#"ⅶ"#, r#"ⅶ"#, r#"ⅶ"#, r#"vii"#, r#"vii"#),
+        (r#"ⅷ"#, r#"ⅷ"#, r#"ⅷ"#, r#"viii"#, r#"viii"#),
+        (r#"ⅸ"#, r#"ⅸ"#, r#"ⅸ"#, r#"ix"#, r#"ix"#),
+        (r#"ⅹ"#, r#"ⅹ"#, r#"ⅹ"#, r#"x"#, r#"x"#),
+        (r#"ⅺ"#, r#"ⅺ"#, r#"ⅺ"#, r#"xi"#, r#"xi"#),
+        (r#"ⅻ"#, r#"ⅻ"#, r#"ⅻ"#, r#"xii"#, r#"xii"#),
+        (r#"ⅼ"#, r#"ⅼ"#, r#"ⅼ"#, r#"l"#, r#"l"#),
+        (r#"ⅽ"#, r#"ⅽ"#, r#"ⅽ"#, r#"c"#, r#"c"#),
+        (r#"ⅾ"#, r#"ⅾ"#, r#"ⅾ"#, r#"d"#, r#"d"#),
+        (r#"ⅿ"#, r#"ⅿ"#, r#"ⅿ"#, r#"m"#, r#"m"#),
+        (r#"↉"#, r#"↉"#, r#"↉"#, r#"0⁄3"#, r#"0⁄3"#),
+        (r#"↚"#, r#"↚"#, r#"↚"#, r#"↚"#, r#"↚"#),
+        (r#"↛"#, r#"↛"#, r#"↛"#, r#"↛"#, r#"↛"#),
+        (r#"↮"#, r#"↮"#, r#"↮"#, r#"↮"#, r#"↮"#),
+        (r#"⇍"#, r#"⇍"#, r#"⇍"#, r#"⇍"#, r#"⇍"#),
+        (r#"⇎"#, r#"⇎"#, r#"⇎"#, r#"⇎"#, r#"⇎"#),
+        (r#"⇏"#, r#"⇏"#, r#"⇏"#, r#"⇏"#, r#"⇏"#),
+        (r#"∄"#, r#"∄"#, r#"∄"#, r#"∄"#, r#"∄"#),
+        (r#"∉"#, r#"∉"#, r#"∉"#, r#"∉"#, r#"∉"#),
+        (r#"∌"#, r#"∌"#, r#"∌"#, r#"∌"#, r#"∌"#),
+        (r#"∤"#, r#"∤"#, r#"∤"#, r#"∤"#, r#"∤"#),
+        (r#"∦"#, r#"∦"#, r#"∦"#, r#"∦"#, r#"∦"#),
+        (r#"∬"#, r#"∬"#, r#"∬"#, r#"∫∫"#, r#"∫∫"#),
+        (r#"∭"#, r#"∭"#, r#"∭"#, r#"∫∫∫"#, r#"∫∫∫"#),
+        (r#"∯"#, r#"∯"#, r#"∯"#, r#"∮∮"#, r#"∮∮"#),
+        (r#"∰"#, r#"∰"#, r#"∰"#, r#"∮∮∮"#, r#"∮∮∮"#),
+        (r#"≁"#, r#"≁"#, r#"≁"#, r#"≁"#, r#"≁"#),
+        (r#"≄"#, r#"≄"#, r#"≄"#, r#"≄"#, r#"≄"#),
+        (r#"≇"#, r#"≇"#, r#"≇"#, r#"≇"#, r#"≇"#),
+        (r#"≉"#, r#"≉"#, r#"≉"#, r#"≉"#, r#"≉"#),
+        (r#"≠"#, r#"≠"#, r#"≠"#, r#"≠"#, r#"≠"#),
+        (r#"≢"#, r#"≢"#, r#"≢"#, r#"≢"#, r#"≢"#),
+        (r#"≭"#, r#"≭"#, r#"≭"#, r#"≭"#, r#"≭"#),
+        (r#"≮"#, r#"≮"#, r#"≮"#, r#"≮"#, r#"≮"#),
+        (r#"≯"#, r#"≯"#, r#"≯"#, r#"≯"#, r#"≯"#),
+        (r#"≰"#, r#"≰"#, r#"≰"#, r#"≰"#, r#"≰"#),
+        (r#"≱"#, r#"≱"#, r#"≱"#, r#"≱"#, r#"≱"#),
+        (r#"≴"#, r#"≴"#, r#"≴"#, r#"≴"#, r#"≴"#),
+        (r#"≵"#, r#"≵"#, r#"≵"#, r#"≵"#, r#"≵"#),
+        (r#"≸"#, r#"≸"#, r#"≸"#, r#"≸"#, r#"≸"#),
+        (r#"≹"#, r#"≹"#, r#"≹"#, r#"≹"#, r#"≹"#),
+        (r#"⊀"#, r#"⊀"#, r#"⊀"#, r#"⊀"#, r#"⊀"#),
+        (r#"⊁"#, r#"⊁"#, r#"⊁"#, r#"⊁"#, r#"⊁"#),
+        (r#"⊄"#, r#"⊄"#, r#"⊄"#, r#"⊄"#, r#"⊄"#),
+        (r#"⊅"#, r#"⊅"#, r#"⊅"#, r#"⊅"#, r#"⊅"#),
+        (r#"⊈"#, r#"⊈"#, r#"⊈"#, r#"⊈"#, r#"⊈"#),
+        (r#"⊉"#, r#"⊉"#, r#"⊉"#, r#"⊉"#, r#"⊉"#),
+        (r#"⊬"#, r#"⊬"#, r#"⊬"#, r#"⊬"#, r#"⊬"#),
+        (r#"⊭"#, r#"⊭"#, r#"⊭"#, r#"⊭"#, r#"⊭"#),
+        (r#"⊮"#, r#"⊮"#, r#"⊮"#, r#"⊮"#, r#"⊮"#),
+        (r#"⊯"#, r#"⊯"#, r#"⊯"#, r#"⊯"#, r#"⊯"#),
+        (r#"⋠"#, r#"⋠"#, r#"⋠"#, r#"⋠"#, r#"⋠"#),
+        (r#"⋡"#, r#"⋡"#, r#"⋡"#, r#"⋡"#, r#"⋡"#),
+        (r#"⋢"#, r#"⋢"#, r#"⋢"#, r#"⋢"#, r#"⋢"#),
+        (r#"⋣"#, r#"⋣"#, r#"⋣"#, r#"⋣"#, r#"⋣"#),
+        (r#"⋪"#, r#"⋪"#, r#"⋪"#, r#"⋪"#, r#"⋪"#),
+        (r#"⋫"#, r#"⋫"#, r#"⋫"#, r#"⋫"#, r#"⋫"#),
+        (r#"⋬"#, r#"⋬"#, r#"⋬"#, r#"⋬"#, r#"⋬"#),
+        (r#"⋭"#, r#"⋭"#, r#"⋭"#, r#"⋭"#, r#"⋭"#),
+        (r#"⟨"#, r#"〈"#, r#"〈"#, r#"〈"#, r#"〈"#),
+        (r#"⟩"#, r#"〉"#, r#"〉"#, r#"〉"#, r#"〉"#),
+        (r#"①"#, r#"①"#, r#"①"#, r#"1"#, r#"1"#),
+        (r#"②"#, r#"②"#, r#"②"#, r#"2"#, r#"2"#),
+        (r#"③"#, r#"③"#, r#"③"#, r#"3"#, r#"3"#),
+        (r#"④"#, r#"④"#, r#"④"#, r#"4"#, r#"4"#),
+        (r#"⑤"#, r#"⑤"#, r#"⑤"#, r#"5"#, r#"5"#),
+        (r#"⑥"#, r#"⑥"#, r#"⑥"#, r#"6"#, r#"6"#),
+        (r#"⑦"#, r#"⑦"#, r#"⑦"#, r#"7"#, r#"7"#),
+        (r#"⑧"#, r#"⑧"#, r#"⑧"#, r#"8"#, r#"8"#),
+        (r#"⑨"#, r#"⑨"#, r#"⑨"#, r#"9"#, r#"9"#),
+        (r#"⑩"#, r#"⑩"#, r#"⑩"#, r#"10"#, r#"10"#),
+        (r#"⑪"#, r#"⑪"#, r#"⑪"#, r#"11"#, r#"11"#),
+        (r#"⑫"#, r#"⑫"#, r#"⑫"#, r#"12"#, r#"12"#),
+        (r#"⑬"#, r#"⑬"#, r#"⑬"#, r#"13"#, r#"13"#),
+        (r#"⑭"#, r#"⑭"#, r#"⑭"#, r#"14"#, r#"14"#),
+        (r#"⑮"#, r#"⑮"#, r#"⑮"#, r#"15"#, r#"15"#),
+        (r#"⑯"#, r#"⑯"#, r#"⑯"#, r#"16"#, r#"16"#),
+        (r#"⑰"#, r#"⑰"#, r#"⑰"#, r#"17"#, r#"17"#),
+        (r#"⑱"#, r#"⑱"#, r#"⑱"#, r#"18"#, r#"18"#),
+        (r#"⑲"#, r#"⑲"#, r#"⑲"#, r#"19"#, r#"19"#),
+        (r#"⑳"#, r#"⑳"#, r#"⑳"#, r#"20"#, r#"20"#),
+        (r#"⑴"#, r#"⑴"#, r#"⑴"#, r#"(1)"#, r#"(1)"#),
+        (r#"⑵"#, r#"⑵"#, r#"⑵"#, r#"(2)"#, r#"(2)"#),
+        (r#"⑶"#, r#"⑶"#, r#"⑶"#, r#"(3)"#, r#"(3)"#),
+        (r#"⑷"#, r#"⑷"#, r#"⑷"#, r#"(4)"#, r#"(4)"#),
+        (r#"⑸"#, r#"⑸"#, r#"⑸"#, r#"(5)"#, r#"(5)"#),
+        (r#"⑹"#, r#"⑹"#, r#"⑹"#, r#"(6)"#, r#"(6)"#),
+        (r#"⑺"#, r#"⑺"#, r#"⑺"#, r#"(7)"#, r#"(7)"#),
+        (r#"⑻"#, r#"⑻"#, r#"⑻"#, r#"(8)"#, r#"(8)"#),
+        (r#"⑼"#, r#"⑼"#, r#"⑼"#, r#"(9)"#, r#"(9)"#),
+        (r#"⑽"#, r#"⑽"#, r#"⑽"#, r#"(10)"#, r#"(10)"#),
+        (r#"⑾"#, r#"⑾"#, r#"⑾"#, r#"(11)"#, r#"(11)"#),
+        (r#"⑿"#, r#"⑿"#, r#"⑿"#, r#"(12)"#, r#"(12)"#),
+        (r#"⒀"#, r#"⒀"#, r#"⒀"#, r#"(13)"#, r#"(13)"#),
+        (r#"⒁"#, r#"⒁"#, r#"⒁"#, r#"(14)"#, r#"(14)"#),
+        (r#"⒂"#, r#"⒂"#, r#"⒂"#, r#"(15)"#, r#"(15)"#),
+        (r#"⒃"#, r#"⒃"#, r#"⒃"#, r#"(16)"#, r#"(16)"#),
+        (r#"⒄"#, r#"⒄"#, r#"⒄"#, r#"(17)"#, r#"(17)"#),
+        (r#"⒅"#, r#"⒅"#, r#"⒅"#, r#"(18)"#, r#"(18)"#),
+        (r#"⒆"#, r#"⒆"#, r#"⒆"#, r#"(19)"#, r#"(19)"#),
+        (r#"⒇"#, r#"⒇"#, r#"⒇"#, r#"(20)"#, r#"(20)"#),
+        (r#"⒈"#, r#"⒈"#, r#"⒈"#, r#"1."#, r#"1."#),
+        (r#"⒉"#, r#"⒉"#, r#"⒉"#, r#"2."#, r#"2."#),
+        (r#"⒊"#, r#"⒊"#, r#"⒊"#, r#"3."#, r#"3."#),
+        (r#"⒋"#, r#"⒋"#, r#"⒋"#, r#"4."#, r#"4."#),
+        (r#"⒌"#, r#"⒌"#, r#"⒌"#, r#"5."#, r#"5."#),
+        (r#"⒍"#, r#"⒍"#, r#"⒍"#, r#"6."#, r#"6."#),
+        (r#"⒎"#, r#"⒎"#, r#"⒎"#, r#"7."#, r#"7."#),
+        (r#"⒏"#, r#"⒏"#, r#"⒏"#, r#"8."#, r#"8."#),
+        (r#"⒐"#, r#"⒐"#, r#"⒐"#, r#"9."#, r#"9."#),
+        (r#"⒑"#, r#"⒑"#, r#"⒑"#, r#"10."#, r#"10."#),
+        (r#"⒒"#, r#"⒒"#, r#"⒒"#, r#"11."#, r#"11."#),
+        (r#"⒓"#, r#"⒓"#, r#"⒓"#, r#"12."#, r#"12."#),
+        (r#"⒔"#, r#"⒔"#, r#"⒔"#, r#"13."#, r#"13."#),
+        (r#"⒕"#, r#"⒕"#, r#"⒕"#, r#"14."#, r#"14."#),
+        (r#"⒖"#, r#"⒖"#, r#"⒖"#, r#"15."#, r#"15."#),
+        (r#"⒗"#, r#"⒗"#, r#"⒗"#, r#"16."#, r#"16."#),
+        (r#"⒘"#, r#"⒘"#, r#"⒘"#, r#"17."#, r#"17."#),
+        (r#"⒙"#, r#"⒙"#, r#"⒙"#, r#"18."#, r#"18."#),
+        (r#"⒚"#, r#"⒚"#, r#"⒚"#, r#"19."#, r#"19."#),
+        (r#"⒛"#, r#"⒛"#, r#"⒛"#, r#"20."#, r#"20."#),
+        (r#"⒜"#, r#"⒜"#, r#"⒜"#, r#"(a)"#, r#"(a)"#),
+        (r#"⒝"#, r#"⒝"#, r#"⒝"#, r#"(b)"#, r#"(b)"#),
+        (r#"⒞"#, r#"⒞"#, r#"⒞"#, r#"(c)"#, r#"(c)"#),
+        (r#"⒟"#, r#"⒟"#, r#"⒟"#, r#"(d)"#, r#"(d)"#),
+        (r#"⒠"#, r#"⒠"#, r#"⒠"#, r#"(e)"#, r#"(e)"#),
+        (r#"⒡"#, r#"⒡"#, r#"⒡"#, r#"(f)"#, r#"(f)"#),
+        (r#"⒢"#, r#"⒢"#, r#"⒢"#, r#"(g)"#, r#"(g)"#),
+        (r#"⒣"#, r#"⒣"#, r#"⒣"#, r#"(h)"#, r#"(h)"#),
+        (r#"⒤"#, r#"⒤"#, r#"⒤"#, r#"(i)"#, r#"(i)"#),
+        (r#"⒥"#, r#"⒥"#, r#"⒥"#, r#"(j)"#, r#"(j)"#),
+        (r#"⒦"#, r#"⒦"#, r#"⒦"#, r#"(k)"#, r#"(k)"#),
+        (r#"⒧"#, r#"⒧"#, r#"⒧"#, r#"(l)"#, r#"(l)"#),
+        (r#"⒨"#, r#"⒨"#, r#"⒨"#, r#"(m)"#, r#"(m)"#),
+        (r#"⒩"#, r#"⒩"#, r#"⒩"#, r#"(n)"#, r#"(n)"#),
+        (r#"⒪"#, r#"⒪"#, r#"⒪"#, r#"(o)"#, r#"(o)"#),
+        (r#"⒫"#, r#"⒫"#, r#"⒫"#, r#"(p)"#, r#"(p)"#),
+        (r#"⒬"#, r#"⒬"#, r#"⒬"#, r#"(q)"#, r#"(q)"#),
+        (r#"⒭"#, r#"⒭"#, r#"⒭"#, r#"(r)"#, r#"(r)"#),
+        (r#"⒮"#, r#"⒮"#, r#"⒮"#, r#"(s)"#, r#"(s)"#),
+        (r#"⒯"#, r#"⒯"#, r#"⒯"#, r#"(t)"#, r#"(t)"#),
+        (r#"⒰"#, r#"⒰"#, r#"⒰"#, r#"(u)"#, r#"(u)"#),
+        (r#"⒱"#, r#"⒱"#, r#"⒱"#, r#"(v)"#, r#"(v)"#),
+        (r#"⒲"#, r#"⒲"#, r#"⒲"#, r#"(w)"#, r#"(w)"#),
+        (r#"⒳"#, r#"⒳"#, r#"⒳"#, r#"(x)"#, r#"(x)"#),
+        (r#"⒴"#, r#"⒴"#, r#"⒴"#, r#"(y)"#, r#"(y)"#),
+        (r#"⒵"#, r#"⒵"#, r#"⒵"#, r#"(z)"#, r#"(z)"#),
+        (r#"Ⓐ"#, r#"Ⓐ"#, r#"Ⓐ"#, r#"A"#, r#"A"#),
+        (r#"Ⓑ"#, r#"Ⓑ"#, r#"Ⓑ"#, r#"B"#, r#"B"#),
+        (r#"Ⓒ"#, r#"Ⓒ"#, r#"Ⓒ"#, r#"C"#, r#"C"#),
+        (r#"Ⓓ"#, r#"Ⓓ"#, r#"Ⓓ"#, r#"D"#, r#"D"#),
+        (r#"Ⓔ"#, r#"Ⓔ"#, r#"Ⓔ"#, r#"E"#, r#"E"#),
+        (r#"Ⓕ"#, r#"Ⓕ"#, r#"Ⓕ"#, r#"F"#, r#"F"#),
+        (r#"Ⓖ"#, r#"Ⓖ"#, r#"Ⓖ"#, r#"G"#, r#"G"#),
+        (r#"Ⓗ"#, r#"Ⓗ"#, r#"Ⓗ"#, r#"H"#, r#"H"#),
+        (r#"Ⓘ"#, r#"Ⓘ"#, r#"Ⓘ"#, r#"I"#, r#"I"#),
+        (r#"Ⓙ"#, r#"Ⓙ"#, r#"Ⓙ"#, r#"J"#, r#"J"#),
+        (r#"Ⓚ"#, r#"Ⓚ"#, r#"Ⓚ"#, r#"K"#, r#"K"#),
+        (r#"Ⓛ"#, r#"Ⓛ"#, r#"Ⓛ"#, r#"L"#, r#"L"#),
+        (r#"Ⓜ"#, r#"Ⓜ"#, r#"Ⓜ"#, r#"M"#, r#"M"#),
+        (r#"Ⓝ"#, r#"Ⓝ"#, r#"Ⓝ"#, r#"N"#, r#"N"#),
+        (r#"Ⓞ"#, r#"Ⓞ"#, r#"Ⓞ"#, r#"O"#, r#"O"#),
+        (r#"Ⓟ"#, r#"Ⓟ"#, r#"Ⓟ"#, r#"P"#, r#"P"#),
+        (r#"Ⓠ"#, r#"Ⓠ"#, r#"Ⓠ"#, r#"Q"#, r#"Q"#),
+        (r#"Ⓡ"#, r#"Ⓡ"#, r#"Ⓡ"#, r#"R"#, r#"R"#),
+        (r#"Ⓢ"#, r#"Ⓢ"#, r#"Ⓢ"#, r#"S"#, r#"S"#),
+        (r#"Ⓣ"#, r#"Ⓣ"#, r#"Ⓣ"#, r#"T"#, r#"T"#),
+        (r#"Ⓤ"#, r#"Ⓤ"#, r#"Ⓤ"#, r#"U"#, r#"U"#),
+        (r#"Ⓥ"#, r#"Ⓥ"#, r#"Ⓥ"#, r#"V"#, r#"V"#),
+        (r#"Ⓦ"#, r#"Ⓦ"#, r#"Ⓦ"#, r#"W"#, r#"W"#),
+        (r#"Ⓧ"#, r#"Ⓧ"#, r#"Ⓧ"#, r#"X"#, r#"X"#),
+        (r#"Ⓨ"#, r#"Ⓨ"#, r#"Ⓨ"#, r#"Y"#, r#"Y"#),
+        (r#"Ⓩ"#, r#"Ⓩ"#, r#"Ⓩ"#, r#"Z"#, r#"Z"#),
+        (r#"ⓐ"#, r#"ⓐ"#, r#"ⓐ"#, r#"a"#, r#"a"#),
+        (r#"ⓑ"#, r#"ⓑ"#, r#"ⓑ"#, r#"b"#, r#"b"#),
+        (r#"ⓒ"#, r#"ⓒ"#, r#"ⓒ"#, r#"c"#, r#"c"#),
+        (r#"ⓓ"#, r#"ⓓ"#, r#"ⓓ"#, r#"d"#, r#"d"#),
+        (r#"ⓔ"#, r#"ⓔ"#, r#"ⓔ"#, r#"e"#, r#"e"#),
+        (r#"ⓕ"#, r#"ⓕ"#, r#"ⓕ"#, r#"f"#, r#"f"#),
+        (r#"ⓖ"#, r#"ⓖ"#, r#"ⓖ"#, r#"g"#, r#"g"#),
+        (r#"ⓗ"#, r#"ⓗ"#, r#"ⓗ"#, r#"h"#, r#"h"#),
+        (r#"ⓘ"#, r#"ⓘ"#, r#"ⓘ"#, r#"i"#, r#"i"#),
+        (r#"ⓙ"#, r#"ⓙ"#, r#"ⓙ"#, r#"j"#, r#"j"#),
+        (r#"ⓚ"#, r#"ⓚ"#, r#"ⓚ"#, r#"k"#, r#"k"#),
+        (r#"ⓛ"#, r#"ⓛ"#, r#"ⓛ"#, r#"l"#, r#"l"#),
+        (r#"ⓜ"#, r#"ⓜ"#, r#"ⓜ"#, r#"m"#, r#"m"#),
+        (r#"ⓝ"#, r#"ⓝ"#, r#"ⓝ"#, r#"n"#, r#"n"#),
+        (r#"ⓞ"#, r#"ⓞ"#, r#"ⓞ"#, r#"o"#, r#"o"#),
+        (r#"ⓟ"#, r#"ⓟ"#, r#"ⓟ"#, r#"p"#, r#"p"#),
+        (r#"ⓠ"#, r#"ⓠ"#, r#"ⓠ"#, r#"q"#, r#"q"#),
+        (r#"ⓡ"#, r#"ⓡ"#, r#"ⓡ"#, r#"r"#, r#"r"#),
+        (r#"ⓢ"#, r#"ⓢ"#, r#"ⓢ"#, r#"s"#, r#"s"#),
+        (r#"ⓣ"#, r#"ⓣ"#, r#"ⓣ"#, r#"t"#, r#"t"#),
+        (r#"ⓤ"#, r#"ⓤ"#, r#"ⓤ"#, r#"u"#, r#"u"#),
+        (r#"ⓥ"#, r#"ⓥ"#, r#"ⓥ"#, r#"v"#, r#"v"#),
+        (r#"ⓦ"#, r#"ⓦ"#, r#"ⓦ"#, r#"w"#, r#"w"#),
+        (r#"ⓧ"#, r#"ⓧ"#, r#"ⓧ"#, r#"x"#, r#"x"#),
+        (r#"ⓨ"#, r#"ⓨ"#, r#"ⓨ"#, r#"y"#, r#"y"#),
+        (r#"ⓩ"#, r#"ⓩ"#, r#"ⓩ"#, r#"z"#, r#"z"#),
+        (r#"⓪"#, r#"⓪"#, r#"⓪"#, r#"0"#, r#"0"#),
+        (r#"⨌"#, r#"⨌"#, r#"⨌"#, r#"∫∫∫∫"#, r#"∫∫∫∫"#),
+        (r#"⩴"#, r#"⩴"#, r#"⩴"#, r#"::="#, r#"::="#),
+        (r#"⩵"#, r#"⩵"#, r#"⩵"#, r#"=="#, r#"=="#),
+        (r#"⩶"#, r#"⩶"#, r#"⩶"#, r#"==="#, r#"==="#),
+        (r#"⫝̸"#, r#"⫝̸"#, r#"⫝̸"#, r#"⫝̸"#, r#"⫝̸"#),
+        (r#"ⱼ"#, r#"ⱼ"#, r#"ⱼ"#, r#"j"#, r#"j"#),
+        (r#"ⱽ"#, r#"ⱽ"#, r#"ⱽ"#, r#"V"#, r#"V"#),
+        (r#"ⵯ"#, r#"ⵯ"#, r#"ⵯ"#, r#"ⵡ"#, r#"ⵡ"#),
+        (r#"⺟"#, r#"⺟"#, r#"⺟"#, r#"母"#, r#"母"#),
+        (r#"⻳"#, r#"⻳"#, r#"⻳"#, r#"龟"#, r#"龟"#),
+        (r#"⼀"#, r#"⼀"#, r#"⼀"#, r#"一"#, r#"一"#),
+        (r#"⼁"#, r#"⼁"#, r#"⼁"#, r#"丨"#, r#"丨"#),
+        (r#"⼂"#, r#"⼂"#, r#"⼂"#, r#"丶"#, r#"丶"#),
+        (r#"⼃"#, r#"⼃"#, r#"⼃"#, r#"丿"#, r#"丿"#),
+        (r#"⼄"#, r#"⼄"#, r#"⼄"#, r#"乙"#, r#"乙"#),
+        (r#"⼅"#, r#"⼅"#, r#"⼅"#, r#"亅"#, r#"亅"#),
+        (r#"⼆"#, r#"⼆"#, r#"⼆"#, r#"二"#, r#"二"#),
+        (r#"⼇"#, r#"⼇"#, r#"⼇"#, r#"亠"#, r#"亠"#),
+        (r#"⼈"#, r#"⼈"#, r#"⼈"#, r#"人"#, r#"人"#),
+        (r#"⼉"#, r#"⼉"#, r#"⼉"#, r#"儿"#, r#"儿"#),
+        (r#"⼊"#, r#"⼊"#, r#"⼊"#, r#"入"#, r#"入"#),
+        (r#"⼋"#, r#"⼋"#, r#"⼋"#, r#"八"#, r#"八"#),
+        (r#"⼌"#, r#"⼌"#, r#"⼌"#, r#"冂"#, r#"冂"#),
+        (r#"⼍"#, r#"⼍"#, r#"⼍"#, r#"冖"#, r#"冖"#),
+        (r#"⼎"#, r#"⼎"#, r#"⼎"#, r#"冫"#, r#"冫"#),
+        (r#"⼏"#, r#"⼏"#, r#"⼏"#, r#"几"#, r#"几"#),
+        (r#"⼐"#, r#"⼐"#, r#"⼐"#, r#"凵"#, r#"凵"#),
+        (r#"⼑"#, r#"⼑"#, r#"⼑"#, r#"刀"#, r#"刀"#),
+        (r#"⼒"#, r#"⼒"#, r#"⼒"#, r#"力"#, r#"力"#),
+        (r#"⼓"#, r#"⼓"#, r#"⼓"#, r#"勹"#, r#"勹"#),
+        (r#"⼔"#, r#"⼔"#, r#"⼔"#, r#"匕"#, r#"匕"#),
+        (r#"⼕"#, r#"⼕"#, r#"⼕"#, r#"匚"#, r#"匚"#),
+        (r#"⼖"#, r#"⼖"#, r#"⼖"#, r#"匸"#, r#"匸"#),
+        (r#"⼗"#, r#"⼗"#, r#"⼗"#, r#"十"#, r#"十"#),
+        (r#"⼘"#, r#"⼘"#, r#"⼘"#, r#"卜"#, r#"卜"#),
+        (r#"⼙"#, r#"⼙"#, r#"⼙"#, r#"卩"#, r#"卩"#),
+        (r#"⼚"#, r#"⼚"#, r#"⼚"#, r#"厂"#, r#"厂"#),
+        (r#"⼛"#, r#"⼛"#, r#"⼛"#, r#"厶"#, r#"厶"#),
+        (r#"⼜"#, r#"⼜"#, r#"⼜"#, r#"又"#, r#"又"#),
+        (r#"⼝"#, r#"⼝"#, r#"⼝"#, r#"口"#, r#"口"#),
+        (r#"⼞"#, r#"⼞"#, r#"⼞"#, r#"囗"#, r#"囗"#),
+        (r#"⼟"#, r#"⼟"#, r#"⼟"#, r#"土"#, r#"土"#),
+        (r#"⼠"#, r#"⼠"#, r#"⼠"#, r#"士"#, r#"士"#),
+        (r#"⼡"#, r#"⼡"#, r#"⼡"#, r#"夂"#, r#"夂"#),
+        (r#"⼢"#, r#"⼢"#, r#"⼢"#, r#"夊"#, r#"夊"#),
+        (r#"⼣"#, r#"⼣"#, r#"⼣"#, r#"夕"#, r#"夕"#),
+        (r#"⼤"#, r#"⼤"#, r#"⼤"#, r#"大"#, r#"大"#),
+        (r#"⼥"#, r#"⼥"#, r#"⼥"#, r#"女"#, r#"女"#),
+        (r#"⼦"#, r#"⼦"#, r#"⼦"#, r#"子"#, r#"子"#),
+        (r#"⼧"#, r#"⼧"#, r#"⼧"#, r#"宀"#, r#"宀"#),
+        (r#"⼨"#, r#"⼨"#, r#"⼨"#, r#"寸"#, r#"寸"#),
+        (r#"⼩"#, r#"⼩"#, r#"⼩"#, r#"小"#, r#"小"#),
+        (r#"⼪"#, r#"⼪"#, r#"⼪"#, r#"尢"#, r#"尢"#),
+        (r#"⼫"#, r#"⼫"#, r#"⼫"#, r#"尸"#, r#"尸"#),
+        (r#"⼬"#, r#"⼬"#, r#"⼬"#, r#"屮"#, r#"屮"#),
+        (r#"⼭"#, r#"⼭"#, r#"⼭"#, r#"山"#, r#"山"#),
+        (r#"⼮"#, r#"⼮"#, r#"⼮"#, r#"巛"#, r#"巛"#),
+        (r#"⼯"#, r#"⼯"#, r#"⼯"#, r#"工"#, r#"工"#),
+        (r#"⼰"#, r#"⼰"#, r#"⼰"#, r#"己"#, r#"己"#),
+        (r#"⼱"#, r#"⼱"#, r#"⼱"#, r#"巾"#, r#"巾"#),
+        (r#"⼲"#, r#"⼲"#, r#"⼲"#, r#"干"#, r#"干"#),
+        (r#"⼳"#, r#"⼳"#, r#"⼳"#, r#"幺"#, r#"幺"#),
+        (r#"⼴"#, r#"⼴"#, r#"⼴"#, r#"广"#, r#"广"#),
+        (r#"⼵"#, r#"⼵"#, r#"⼵"#, r#"廴"#, r#"廴"#),
+        (r#"⼶"#, r#"⼶"#, r#"⼶"#, r#"廾"#, r#"廾"#),
+        (r#"⼷"#, r#"⼷"#, r#"⼷"#, r#"弋"#, r#"弋"#),
+        (r#"⼸"#, r#"⼸"#, r#"⼸"#, r#"弓"#, r#"弓"#),
+        (r#"⼹"#, r#"⼹"#, r#"⼹"#, r#"彐"#, r#"彐"#),
+        (r#"⼺"#, r#"⼺"#, r#"⼺"#, r#"彡"#, r#"彡"#),
+        (r#"⼻"#, r#"⼻"#, r#"⼻"#, r#"彳"#, r#"彳"#),
+        (r#"⼼"#, r#"⼼"#, r#"⼼"#, r#"心"#, r#"心"#),
+        (r#"⼽"#, r#"⼽"#, r#"⼽"#, r#"戈"#, r#"戈"#),
+        (r#"⼾"#, r#"⼾"#, r#"⼾"#, r#"戶"#, r#"戶"#),
+        (r#"⼿"#, r#"⼿"#, r#"⼿"#, r#"手"#, r#"手"#),
+        (r#"⽀"#, r#"⽀"#, r#"⽀"#, r#"支"#, r#"支"#),
+        (r#"⽁"#, r#"⽁"#, r#"⽁"#, r#"攴"#, r#"攴"#),
+        (r#"⽂"#, r#"⽂"#, r#"⽂"#, r#"文"#, r#"文"#),
+        (r#"⽃"#, r#"⽃"#, r#"⽃"#, r#"斗"#, r#"斗"#),
+        (r#"⽄"#, r#"⽄"#, r#"⽄"#, r#"斤"#, r#"斤"#),
+        (r#"⽅"#, r#"⽅"#, r#"⽅"#, r#"方"#, r#"方"#),
+        (r#"⽆"#, r#"⽆"#, r#"⽆"#, r#"无"#, r#"无"#),
+        (r#"⽇"#, r#"⽇"#, r#"⽇"#, r#"日"#, r#"日"#),
+        (r#"⽈"#, r#"⽈"#, r#"⽈"#, r#"曰"#, r#"曰"#),
+        (r#"⽉"#, r#"⽉"#, r#"⽉"#, r#"月"#, r#"月"#),
+        (r#"⽊"#, r#"⽊"#, r#"⽊"#, r#"木"#, r#"木"#),
+        (r#"⽋"#, r#"⽋"#, r#"⽋"#, r#"欠"#, r#"欠"#),
+        (r#"⽌"#, r#"⽌"#, r#"⽌"#, r#"止"#, r#"止"#),
+        (r#"⽍"#, r#"⽍"#, r#"⽍"#, r#"歹"#, r#"歹"#),
+        (r#"⽎"#, r#"⽎"#, r#"⽎"#, r#"殳"#, r#"殳"#),
+        (r#"⽏"#, r#"⽏"#, r#"⽏"#, r#"毋"#, r#"毋"#),
+        (r#"⽐"#, r#"⽐"#, r#"⽐"#, r#"比"#, r#"比"#),
+        (r#"⽑"#, r#"⽑"#, r#"⽑"#, r#"毛"#, r#"毛"#),
+        (r#"⽒"#, r#"⽒"#, r#"⽒"#, r#"氏"#, r#"氏"#),
+        (r#"⽓"#, r#"⽓"#, r#"⽓"#, r#"气"#, r#"气"#),
+        (r#"⽔"#, r#"⽔"#, r#"⽔"#, r#"水"#, r#"水"#),
+        (r#"⽕"#, r#"⽕"#, r#"⽕"#, r#"火"#, r#"火"#),
+        (r#"⽖"#, r#"⽖"#, r#"⽖"#, r#"爪"#, r#"爪"#),
+        (r#"⽗"#, r#"⽗"#, r#"⽗"#, r#"父"#, r#"父"#),
+        (r#"⽘"#, r#"⽘"#, r#"⽘"#, r#"爻"#, r#"爻"#),
+        (r#"⽙"#, r#"⽙"#, r#"⽙"#, r#"爿"#, r#"爿"#),
+        (r#"⽚"#, r#"⽚"#, r#"⽚"#, r#"片"#, r#"片"#),
+        (r#"⽛"#, r#"⽛"#, r#"⽛"#, r#"牙"#, r#"牙"#),
+        (r#"⽜"#, r#"⽜"#, r#"⽜"#, r#"牛"#, r#"牛"#),
+        (r#"⽝"#, r#"⽝"#, r#"⽝"#, r#"犬"#, r#"犬"#),
+        (r#"⽞"#, r#"⽞"#, r#"⽞"#, r#"玄"#, r#"玄"#),
+        (r#"⽟"#, r#"⽟"#, r#"⽟"#, r#"玉"#, r#"玉"#),
+        (r#"⽠"#, r#"⽠"#, r#"⽠"#, r#"瓜"#, r#"瓜"#),
+        (r#"⽡"#, r#"⽡"#, r#"⽡"#, r#"瓦"#, r#"瓦"#),
+        (r#"⽢"#, r#"⽢"#, r#"⽢"#, r#"甘"#, r#"甘"#),
+        (r#"⽣"#, r#"⽣"#, r#"⽣"#, r#"生"#, r#"生"#),
+        (r#"⽤"#, r#"⽤"#, r#"⽤"#, r#"用"#, r#"用"#),
+        (r#"⽥"#, r#"⽥"#, r#"⽥"#, r#"田"#, r#"田"#),
+        (r#"⽦"#, r#"⽦"#, r#"⽦"#, r#"疋"#, r#"疋"#),
+        (r#"⽧"#, r#"⽧"#, r#"⽧"#, r#"疒"#, r#"疒"#),
+        (r#"⽨"#, r#"⽨"#, r#"⽨"#, r#"癶"#, r#"癶"#),
+        (r#"⽩"#, r#"⽩"#, r#"⽩"#, r#"白"#, r#"白"#),
+        (r#"⽪"#, r#"⽪"#, r#"⽪"#, r#"皮"#, r#"皮"#),
+        (r#"⽫"#, r#"⽫"#, r#"⽫"#, r#"皿"#, r#"皿"#),
+        (r#"⽬"#, r#"⽬"#, r#"⽬"#, r#"目"#, r#"目"#),
+        (r#"⽭"#, r#"⽭"#, r#"⽭"#, r#"矛"#, r#"矛"#),
+        (r#"⽮"#, r#"⽮"#, r#"⽮"#, r#"矢"#, r#"矢"#),
+        (r#"⽯"#, r#"⽯"#, r#"⽯"#, r#"石"#, r#"石"#),
+        (r#"⽰"#, r#"⽰"#, r#"⽰"#, r#"示"#, r#"示"#),
+        (r#"⽱"#, r#"⽱"#, r#"⽱"#, r#"禸"#, r#"禸"#),
+        (r#"⽲"#, r#"⽲"#, r#"⽲"#, r#"禾"#, r#"禾"#),
+        (r#"⽳"#, r#"⽳"#, r#"⽳"#, r#"穴"#, r#"穴"#),
+        (r#"⽴"#, r#"⽴"#, r#"⽴"#, r#"立"#, r#"立"#),
+        (r#"⽵"#, r#"⽵"#, r#"⽵"#, r#"竹"#, r#"竹"#),
+        (r#"⽶"#, r#"⽶"#, r#"⽶"#, r#"米"#, r#"米"#),
+        (r#"⽷"#, r#"⽷"#, r#"⽷"#, r#"糸"#, r#"糸"#),
+        (r#"⽸"#, r#"⽸"#, r#"⽸"#, r#"缶"#, r#"缶"#),
+        (r#"⽹"#, r#"⽹"#, r#"⽹"#, r#"网"#, r#"网"#),
+        (r#"⽺"#, r#"⽺"#, r#"⽺"#, r#"羊"#, r#"羊"#),
+        (r#"⽻"#, r#"⽻"#, r#"⽻"#, r#"羽"#, r#"羽"#),
+        (r#"⽼"#, r#"⽼"#, r#"⽼"#, r#"老"#, r#"老"#),
+        (r#"⽽"#, r#"⽽"#, r#"⽽"#, r#"而"#, r#"而"#),
+        (r#"⽾"#, r#"⽾"#, r#"⽾"#, r#"耒"#, r#"耒"#),
+        (r#"⽿"#, r#"⽿"#, r#"⽿"#, r#"耳"#, r#"耳"#),
+        (r#"⾀"#, r#"⾀"#, r#"⾀"#, r#"聿"#, r#"聿"#),
+        (r#"⾁"#, r#"⾁"#, r#"⾁"#, r#"肉"#, r#"肉"#),
+        (r#"⾂"#, r#"⾂"#, r#"⾂"#, r#"臣"#, r#"臣"#),
+        (r#"⾃"#, r#"⾃"#, r#"⾃"#, r#"自"#, r#"自"#),
+        (r#"⾄"#, r#"⾄"#, r#"⾄"#, r#"至"#, r#"至"#),
+        (r#"⾅"#, r#"⾅"#, r#"⾅"#, r#"臼"#, r#"臼"#),
+        (r#"⾆"#, r#"⾆"#, r#"⾆"#, r#"舌"#, r#"舌"#),
+        (r#"⾇"#, r#"⾇"#, r#"⾇"#, r#"舛"#, r#"舛"#),
+        (r#"⾈"#, r#"⾈"#, r#"⾈"#, r#"舟"#, r#"舟"#),
+        (r#"⾉"#, r#"⾉"#, r#"⾉"#, r#"艮"#, r#"艮"#),
+        (r#"⾊"#, r#"⾊"#, r#"⾊"#, r#"色"#, r#"色"#),
+        (r#"⾋"#, r#"⾋"#, r#"⾋"#, r#"艸"#, r#"艸"#),
+        (r#"⾌"#, r#"⾌"#, r#"⾌"#, r#"虍"#, r#"虍"#),
+        (r#"⾍"#, r#"⾍"#, r#"⾍"#, r#"虫"#, r#"虫"#),
+        (r#"⾎"#, r#"⾎"#, r#"⾎"#, r#"血"#, r#"血"#),
+        (r#"⾏"#, r#"⾏"#, r#"⾏"#, r#"行"#, r#"行"#),
+        (r#"⾐"#, r#"⾐"#, r#"⾐"#, r#"衣"#, r#"衣"#),
+        (r#"⾑"#, r#"⾑"#, r#"⾑"#, r#"襾"#, r#"襾"#),
+        (r#"⾒"#, r#"⾒"#, r#"⾒"#, r#"見"#, r#"見"#),
+        (r#"⾓"#, r#"⾓"#, r#"⾓"#, r#"角"#, r#"角"#),
+        (r#"⾔"#, r#"⾔"#, r#"⾔"#, r#"言"#, r#"言"#),
+        (r#"⾕"#, r#"⾕"#, r#"⾕"#, r#"谷"#, r#"谷"#),
+        (r#"⾖"#, r#"⾖"#, r#"⾖"#, r#"豆"#, r#"豆"#),
+        (r#"⾗"#, r#"⾗"#, r#"⾗"#, r#"豕"#, r#"豕"#),
+        (r#"⾘"#, r#"⾘"#, r#"⾘"#, r#"豸"#, r#"豸"#),
+        (r#"⾙"#, r#"⾙"#, r#"⾙"#, r#"貝"#, r#"貝"#),
+        (r#"⾚"#, r#"⾚"#, r#"⾚"#, r#"赤"#, r#"赤"#),
+        (r#"⾛"#, r#"⾛"#, r#"⾛"#, r#"走"#, r#"走"#),
+        (r#"⾜"#, r#"⾜"#, r#"⾜"#, r#"足"#, r#"足"#),
+        (r#"⾝"#, r#"⾝"#, r#"⾝"#, r#"身"#, r#"身"#),
+        (r#"⾞"#, r#"⾞"#, r#"⾞"#, r#"車"#, r#"車"#),
+        (r#"⾟"#, r#"⾟"#, r#"⾟"#, r#"辛"#, r#"辛"#),
+        (r#"⾠"#, r#"⾠"#, r#"⾠"#, r#"辰"#, r#"辰"#),
+        (r#"⾡"#, r#"⾡"#, r#"⾡"#, r#"辵"#, r#"辵"#),
+        (r#"⾢"#, r#"⾢"#, r#"⾢"#, r#"邑"#, r#"邑"#),
+        (r#"⾣"#, r#"⾣"#, r#"⾣"#, r#"酉"#, r#"酉"#),
+        (r#"⾤"#, r#"⾤"#, r#"⾤"#, r#"釆"#, r#"釆"#),
+        (r#"⾥"#, r#"⾥"#, r#"⾥"#, r#"里"#, r#"里"#),
+        (r#"⾦"#, r#"⾦"#, r#"⾦"#, r#"金"#, r#"金"#),
+        (r#"⾧"#, r#"⾧"#, r#"⾧"#, r#"長"#, r#"長"#),
+        (r#"⾨"#, r#"⾨"#, r#"⾨"#, r#"門"#, r#"門"#),
+        (r#"⾩"#, r#"⾩"#, r#"⾩"#, r#"阜"#, r#"阜"#),
+        (r#"⾪"#, r#"⾪"#, r#"⾪"#, r#"隶"#, r#"隶"#),
+        (r#"⾫"#, r#"⾫"#, r#"⾫"#, r#"隹"#, r#"隹"#),
+        (r#"⾬"#, r#"⾬"#, r#"⾬"#, r#"雨"#, r#"雨"#),
+        (r#"⾭"#, r#"⾭"#, r#"⾭"#, r#"靑"#, r#"靑"#),
+        (r#"⾮"#, r#"⾮"#, r#"⾮"#, r#"非"#, r#"非"#),
+        (r#"⾯"#, r#"⾯"#, r#"⾯"#, r#"面"#, r#"面"#),
+        (r#"⾰"#, r#"⾰"#, r#"⾰"#, r#"革"#, r#"革"#),
+        (r#"⾱"#, r#"⾱"#, r#"⾱"#, r#"韋"#, r#"韋"#),
+        (r#"⾲"#, r#"⾲"#, r#"⾲"#, r#"韭"#, r#"韭"#),
+        (r#"⾳"#, r#"⾳"#, r#"⾳"#, r#"音"#, r#"音"#),
+        (r#"⾴"#, r#"⾴"#, r#"⾴"#, r#"頁"#, r#"頁"#),
+        (r#"⾵"#, r#"⾵"#, r#"⾵"#, r#"風"#, r#"風"#),
+        (r#"⾶"#, r#"⾶"#, r#"⾶"#, r#"飛"#, r#"飛"#),
+        (r#"⾷"#, r#"⾷"#, r#"⾷"#, r#"食"#, r#"食"#),
+        (r#"⾸"#, r#"⾸"#, r#"⾸"#, r#"首"#, r#"首"#),
+        (r#"⾹"#, r#"⾹"#, r#"⾹"#, r#"香"#, r#"香"#),
+        (r#"⾺"#, r#"⾺"#, r#"⾺"#, r#"馬"#, r#"馬"#),
+        (r#"⾻"#, r#"⾻"#, r#"⾻"#, r#"骨"#, r#"骨"#),
+        (r#"⾼"#, r#"⾼"#, r#"⾼"#, r#"高"#, r#"高"#),
+        (r#"⾽"#, r#"⾽"#, r#"⾽"#, r#"髟"#, r#"髟"#),
+        (r#"⾾"#, r#"⾾"#, r#"⾾"#, r#"鬥"#, r#"鬥"#),
+        (r#"⾿"#, r#"⾿"#, r#"⾿"#, r#"鬯"#, r#"鬯"#),
+        (r#"⿀"#, r#"⿀"#, r#"⿀"#, r#"鬲"#, r#"鬲"#),
+        (r#"⿁"#, r#"⿁"#, r#"⿁"#, r#"鬼"#, r#"鬼"#),
+        (r#"⿂"#, r#"⿂"#, r#"⿂"#, r#"魚"#, r#"魚"#),
+        (r#"⿃"#, r#"⿃"#, r#"⿃"#, r#"鳥"#, r#"鳥"#),
+        (r#"⿄"#, r#"⿄"#, r#"⿄"#, r#"鹵"#, r#"鹵"#),
+        (r#"⿅"#, r#"⿅"#, r#"⿅"#, r#"鹿"#, r#"鹿"#),
+        (r#"⿆"#, r#"⿆"#, r#"⿆"#, r#"麥"#, r#"麥"#),
+        (r#"⿇"#, r#"⿇"#, r#"⿇"#, r#"麻"#, r#"麻"#),
+        (r#"⿈"#, r#"⿈"#, r#"⿈"#, r#"黃"#, r#"黃"#),
+        (r#"⿉"#, r#"⿉"#, r#"⿉"#, r#"黍"#, r#"黍"#),
+        (r#"⿊"#, r#"⿊"#, r#"⿊"#, r#"黑"#, r#"黑"#),
+        (r#"⿋"#, r#"⿋"#, r#"⿋"#, r#"黹"#, r#"黹"#),
+        (r#"⿌"#, r#"⿌"#, r#"⿌"#, r#"黽"#, r#"黽"#),
+        (r#"⿍"#, r#"⿍"#, r#"⿍"#, r#"鼎"#, r#"鼎"#),
+        (r#"⿎"#, r#"⿎"#, r#"⿎"#, r#"鼓"#, r#"鼓"#),
+        (r#"⿏"#, r#"⿏"#, r#"⿏"#, r#"鼠"#, r#"鼠"#),
+        (r#"⿐"#, r#"⿐"#, r#"⿐"#, r#"鼻"#, r#"鼻"#),
+        (r#"⿑"#, r#"⿑"#, r#"⿑"#, r#"齊"#, r#"齊"#),
+        (r#"⿒"#, r#"⿒"#, r#"⿒"#, r#"齒"#, r#"齒"#),
+        (r#"⿓"#, r#"⿓"#, r#"⿓"#, r#"龍"#, r#"龍"#),
+        (r#"⿔"#, r#"⿔"#, r#"⿔"#, r#"龜"#, r#"龜"#),
+        (r#"⿕"#, r#"⿕"#, r#"⿕"#, r#"龠"#, r#"龠"#),
+        (r#"　"#, r#"　"#, r#"　"#, r#" "#, r#" "#),
+        (r#"〶"#, r#"〶"#, r#"〶"#, r#"〒"#, r#"〒"#),
+        (r#"〸"#, r#"〸"#, r#"〸"#, r#"十"#, r#"十"#),
+        (r#"〹"#, r#"〹"#, r#"〹"#, r#"卄"#, r#"卄"#),
+        (r#"〺"#, r#"〺"#, r#"〺"#, r#"卅"#, r#"卅"#),
+        (r#"が"#, r#"が"#, r#"が"#, r#"が"#, r#"が"#),
+        (r#"ぎ"#, r#"ぎ"#, r#"ぎ"#, r#"ぎ"#, r#"ぎ"#),
+        (r#"ぐ"#, r#"ぐ"#, r#"ぐ"#, r#"ぐ"#, r#"ぐ"#),
+        (r#"げ"#, r#"げ"#, r#"げ"#, r#"げ"#, r#"げ"#),
+        (r#"ご"#, r#"ご"#, r#"ご"#, r#"ご"#, r#"ご"#),
+        (r#"ざ"#, r#"ざ"#, r#"ざ"#, r#"ざ"#, r#"ざ"#),
+        (r#"じ"#, r#"じ"#, r#"じ"#, r#"じ"#, r#"じ"#),
+        (r#"ず"#, r#"ず"#, r#"ず"#, r#"ず"#, r#"ず"#),
+        (r#"ぜ"#, r#"ぜ"#, r#"ぜ"#, r#"ぜ"#, r#"ぜ"#),
+        (r#"ぞ"#, r#"ぞ"#, r#"ぞ"#, r#"ぞ"#, r#"ぞ"#),
+        (r#"だ"#, r#"だ"#, r#"だ"#, r#"だ"#, r#"だ"#),
+        (r#"ぢ"#, r#"ぢ"#, r#"ぢ"#, r#"ぢ"#, r#"ぢ"#),
+        (r#"づ"#, r#"づ"#, r#"づ"#, r#"づ"#, r#"づ"#),
+        (r#"で"#, r#"で"#, r#"で"#, r#"で"#, r#"で"#),
+        (r#"ど"#, r#"ど"#, r#"ど"#, r#"ど"#, r#"ど"#),
+        (r#"ば"#, r#"ば"#, r#"ば"#, r#"ば"#, r#"ば"#),
+        (r#"ぱ"#, r#"ぱ"#, r#"ぱ"#, r#"ぱ"#, r#"ぱ"#),
+        (r#"び"#, r#"び"#, r#"び"#, r#"び"#, r#"び"#),
+        (r#"ぴ"#, r#"ぴ"#, r#"ぴ"#, r#"ぴ"#, r#"ぴ"#),
+        (r#"ぶ"#, r#"ぶ"#, r#"ぶ"#, r#"ぶ"#, r#"ぶ"#),
+        (r#"ぷ"#, r#"ぷ"#, r#"ぷ"#, r#"ぷ"#, r#"ぷ"#),
+        (r#"べ"#, r#"べ"#, r#"べ"#, r#"べ"#, r#"べ"#),
+        (r#"ぺ"#, r#"ぺ"#, r#"ぺ"#, r#"ぺ"#, r#"ぺ"#),
+        (r#"ぼ"#, r#"ぼ"#, r#"ぼ"#, r#"ぼ"#, r#"ぼ"#),
+        (r#"ぽ"#, r#"ぽ"#, r#"ぽ"#, r#"ぽ"#, r#"ぽ"#),
+        (r#"ゔ"#, r#"ゔ"#, r#"ゔ"#, r#"ゔ"#, r#"ゔ"#),
+        (r#"゛"#, r#"゛"#, r#"゛"#, r#" ゙"#, r#" ゙"#),
+        (r#"゜"#, r#"゜"#, r#"゜"#, r#" ゚"#, r#" ゚"#),
+        (r#"ゞ"#, r#"ゞ"#, r#"ゞ"#, r#"ゞ"#, r#"ゞ"#),
+        (r#"ゟ"#, r#"ゟ"#, r#"ゟ"#, r#"より"#, r#"より"#),
+        (r#"ガ"#, r#"ガ"#, r#"ガ"#, r#"ガ"#, r#"ガ"#),
+        (r#"ギ"#, r#"ギ"#, r#"ギ"#, r#"ギ"#, r#"ギ"#),
+        (r#"グ"#, r#"グ"#, r#"グ"#, r#"グ"#, r#"グ"#),
+        (r#"ゲ"#, r#"ゲ"#, r#"ゲ"#, r#"ゲ"#, r#"ゲ"#),
+        (r#"ゴ"#, r#"ゴ"#, r#"ゴ"#, r#"ゴ"#, r#"ゴ"#),
+        (r#"ザ"#, r#"ザ"#, r#"ザ"#, r#"ザ"#, r#"ザ"#),
+        (r#"ジ"#, r#"ジ"#, r#"ジ"#, r#"ジ"#, r#"ジ"#),
+        (r#"ズ"#, r#"ズ"#, r#"ズ"#, r#"ズ"#, r#"ズ"#),
+        (r#"ゼ"#, r#"ゼ"#, r#"ゼ"#, r#"ゼ"#, r#"ゼ"#),
+        (r#"ゾ"#, r#"ゾ"#, r#"ゾ"#, r#"ゾ"#, r#"ゾ"#),
+        (r#"ダ"#, r#"ダ"#, r#"ダ"#, r#"ダ"#, r#"ダ"#),
+        (r#"ヂ"#, r#"ヂ"#, r#"ヂ"#, r#"ヂ"#, r#"ヂ"#),
+        (r#"ヅ"#, r#"ヅ"#, r#"ヅ"#, r#"ヅ"#, r#"ヅ"#),
+        (r#"デ"#, r#"デ"#, r#"デ"#, r#"デ"#, r#"デ"#),
+        (r#"ド"#, r#"ド"#, r#"ド"#, r#"ド"#, r#"ド"#),
+        (r#"バ"#, r#"バ"#, r#"バ"#, r#"バ"#, r#"バ"#),
+        (r#"パ"#, r#"パ"#, r#"パ"#, r#"パ"#, r#"パ"#),
+        (r#"ビ"#, r#"ビ"#, r#"ビ"#, r#"ビ"#, r#"ビ"#),
+        (r#"ピ"#, r#"ピ"#, r#"ピ"#, r#"ピ"#, r#"ピ"#),
+        (r#"ブ"#, r#"ブ"#, r#"ブ"#, r#"ブ"#, r#"ブ"#),
+        (r#"プ"#, r#"プ"#, r#"プ"#, r#"プ"#, r#"プ"#),
+        (r#"ベ"#, r#"ベ"#, r#"ベ"#, r#"ベ"#, r#"ベ"#),
+        (r#"ペ"#, r#"ペ"#, r#"ペ"#, r#"ペ"#, r#"ペ"#),
+        (r#"ボ"#, r#"ボ"#, r#"ボ"#, r#"ボ"#, r#"ボ"#),
+        (r#"ポ"#, r#"ポ"#, r#"ポ"#, r#"ポ"#, r#"ポ"#),
+        (r#"ヴ"#, r#"ヴ"#, r#"ヴ"#, r#"ヴ"#, r#"ヴ"#),
+        (r#"ヷ"#, r#"ヷ"#, r#"ヷ"#, r#"ヷ"#, r#"ヷ"#),
+        (r#"ヸ"#, r#"ヸ"#, r#"ヸ"#, r#"ヸ"#, r#"ヸ"#),
+        (r#"ヹ"#, r#"ヹ"#, r#"ヹ"#, r#"ヹ"#, r#"ヹ"#),
+        (r#"ヺ"#, r#"ヺ"#, r#"ヺ"#, r#"ヺ"#, r#"ヺ"#),
+        (r#"ヾ"#, r#"ヾ"#, r#"ヾ"#, r#"ヾ"#, r#"ヾ"#),
+        (r#"ヿ"#, r#"ヿ"#, r#"ヿ"#, r#"コト"#, r#"コト"#),
+        (r#"ㄱ"#, r#"ㄱ"#, r#"ㄱ"#, r#"ᄀ"#, r#"ᄀ"#),
+        (r#"ㄲ"#, r#"ㄲ"#, r#"ㄲ"#, r#"ᄁ"#, r#"ᄁ"#),
+        (r#"ㄳ"#, r#"ㄳ"#, r#"ㄳ"#, r#"ᆪ"#, r#"ᆪ"#),
+        (r#"ㄴ"#, r#"ㄴ"#, r#"ㄴ"#, r#"ᄂ"#, r#"ᄂ"#),
+        (r#"ㄵ"#, r#"ㄵ"#, r#"ㄵ"#, r#"ᆬ"#, r#"ᆬ"#),
+        (r#"ㄶ"#, r#"ㄶ"#, r#"ㄶ"#, r#"ᆭ"#, r#"ᆭ"#),
+        (r#"ㄷ"#, r#"ㄷ"#, r#"ㄷ"#, r#"ᄃ"#, r#"ᄃ"#),
+        (r#"ㄸ"#, r#"ㄸ"#, r#"ㄸ"#, r#"ᄄ"#, r#"ᄄ"#),
+        (r#"ㄹ"#, r#"ㄹ"#, r#"ㄹ"#, r#"ᄅ"#, r#"ᄅ"#),
+        (r#"ㄺ"#, r#"ㄺ"#, r#"ㄺ"#, r#"ᆰ"#, r#"ᆰ"#),
+        (r#"ㄻ"#, r#"ㄻ"#, r#"ㄻ"#, r#"ᆱ"#, r#"ᆱ"#),
+        (r#"ㄼ"#, r#"ㄼ"#, r#"ㄼ"#, r#"ᆲ"#, r#"ᆲ"#),
+        (r#"ㄽ"#, r#"ㄽ"#, r#"ㄽ"#, r#"ᆳ"#, r#"ᆳ"#),
+        (r#"ㄾ"#, r#"ㄾ"#, r#"ㄾ"#, r#"ᆴ"#, r#"ᆴ"#),
+        (r#"ㄿ"#, r#"ㄿ"#, r#"ㄿ"#, r#"ᆵ"#, r#"ᆵ"#),
+        (r#"ㅀ"#, r#"ㅀ"#, r#"ㅀ"#, r#"ᄚ"#, r#"ᄚ"#),
+        (r#"ㅁ"#, r#"ㅁ"#, r#"ㅁ"#, r#"ᄆ"#, r#"ᄆ"#),
+        (r#"ㅂ"#, r#"ㅂ"#, r#"ㅂ"#, r#"ᄇ"#, r#"ᄇ"#),
+        (r#"ㅃ"#, r#"ㅃ"#, r#"ㅃ"#, r#"ᄈ"#, r#"ᄈ"#),
+        (r#"ㅄ"#, r#"ㅄ"#, r#"ㅄ"#, r#"ᄡ"#, r#"ᄡ"#),
+        (r#"ㅅ"#, r#"ㅅ"#, r#"ㅅ"#, r#"ᄉ"#, r#"ᄉ"#),
+        (r#"ㅆ"#, r#"ㅆ"#, r#"ㅆ"#, r#"ᄊ"#, r#"ᄊ"#),
+        (r#"ㅇ"#, r#"ㅇ"#, r#"ㅇ"#, r#"ᄋ"#, r#"ᄋ"#),
+        (r#"ㅈ"#, r#"ㅈ"#, r#"ㅈ"#, r#"ᄌ"#, r#"ᄌ"#),
+        (r#"ㅉ"#, r#"ㅉ"#, r#"ㅉ"#, r#"ᄍ"#, r#"ᄍ"#),
+        (r#"ㅊ"#, r#"ㅊ"#, r#"ㅊ"#, r#"ᄎ"#, r#"ᄎ"#),
+        (r#"ㅋ"#, r#"ㅋ"#, r#"ㅋ"#, r#"ᄏ"#, r#"ᄏ"#),
+        (r#"ㅌ"#, r#"ㅌ"#, r#"ㅌ"#, r#"ᄐ"#, r#"ᄐ"#),
+        (r#"ㅍ"#, r#"ㅍ"#, r#"ㅍ"#, r#"ᄑ"#, r#"ᄑ"#),
+        (r#"ㅎ"#, r#"ㅎ"#, r#"ㅎ"#, r#"ᄒ"#, r#"ᄒ"#),
+        (r#"ㅏ"#, r#"ㅏ"#, r#"ㅏ"#, r#"ᅡ"#, r#"ᅡ"#),
+        (r#"ㅐ"#, r#"ㅐ"#, r#"ㅐ"#, r#"ᅢ"#, r#"ᅢ"#),
+        (r#"ㅑ"#, r#"ㅑ"#, r#"ㅑ"#, r#"ᅣ"#, r#"ᅣ"#),
+        (r#"ㅒ"#, r#"ㅒ"#, r#"ㅒ"#, r#"ᅤ"#, r#"ᅤ"#),
+        (r#"ㅓ"#, r#"ㅓ"#, r#"ㅓ"#, r#"ᅥ"#, r#"ᅥ"#),
+        (r#"ㅔ"#, r#"ㅔ"#, r#"ㅔ"#, r#"ᅦ"#, r#"ᅦ"#),
+        (r#"ㅕ"#, r#"ㅕ"#, r#"ㅕ"#, r#"ᅧ"#, r#"ᅧ"#),
+        (r#"ㅖ"#, r#"ㅖ"#, r#"ㅖ"#, r#"ᅨ"#, r#"ᅨ"#),
+        (r#"ㅗ"#, r#"ㅗ"#, r#"ㅗ"#, r#"ᅩ"#, r#"ᅩ"#),
+        (r#"ㅘ"#, r#"ㅘ"#, r#"ㅘ"#, r#"ᅪ"#, r#"ᅪ"#),
+        (r#"ㅙ"#, r#"ㅙ"#, r#"ㅙ"#, r#"ᅫ"#, r#"ᅫ"#),
+        (r#"ㅚ"#, r#"ㅚ"#, r#"ㅚ"#, r#"ᅬ"#, r#"ᅬ"#),
+        (r#"ㅛ"#, r#"ㅛ"#, r#"ㅛ"#, r#"ᅭ"#, r#"ᅭ"#),
+        (r#"ㅜ"#, r#"ㅜ"#, r#"ㅜ"#, r#"ᅮ"#, r#"ᅮ"#),
+        (r#"ㅝ"#, r#"ㅝ"#, r#"ㅝ"#, r#"ᅯ"#, r#"ᅯ"#),
+        (r#"ㅞ"#, r#"ㅞ"#, r#"ㅞ"#, r#"ᅰ"#, r#"ᅰ"#),
+        (r#"ㅟ"#, r#"ㅟ"#, r#"ㅟ"#, r#"ᅱ"#, r#"ᅱ"#),
+        (r#"ㅠ"#, r#"ㅠ"#, r#"ㅠ"#, r#"ᅲ"#, r#"ᅲ"#),
+        (r#"ㅡ"#, r#"ㅡ"#, r#"ㅡ"#, r#"ᅳ"#, r#"ᅳ"#),
+        (r#"ㅢ"#, r#"ㅢ"#, r#"ㅢ"#, r#"ᅴ"#, r#"ᅴ"#),
+        (r#"ㅣ"#, r#"ㅣ"#, r#"ㅣ"#, r#"ᅵ"#, r#"ᅵ"#),
+        (r#"ㅤ"#, r#"ㅤ"#, r#"ㅤ"#, r#"ᅠ"#, r#"ᅠ"#),
+        (r#"ㅥ"#, r#"ㅥ"#, r#"ㅥ"#, r#"ᄔ"#, r#"ᄔ"#),
+        (r#"ㅦ"#, r#"ㅦ"#, r#"ㅦ"#, r#"ᄕ"#, r#"ᄕ"#),
+        (r#"ㅧ"#, r#"ㅧ"#, r#"ㅧ"#, r#"ᇇ"#, r#"ᇇ"#),
+        (r#"ㅨ"#, r#"ㅨ"#, r#"ㅨ"#, r#"ᇈ"#, r#"ᇈ"#),
+        (r#"ㅩ"#, r#"ㅩ"#, r#"ㅩ"#, r#"ᇌ"#, r#"ᇌ"#),
+        (r#"ㅪ"#, r#"ㅪ"#, r#"ㅪ"#, r#"ᇎ"#, r#"ᇎ"#),
+        (r#"ㅫ"#, r#"ㅫ"#, r#"ㅫ"#, r#"ᇓ"#, r#"ᇓ"#),
+        (r#"ㅬ"#, r#"ㅬ"#, r#"ㅬ"#, r#"ᇗ"#, r#"ᇗ"#),
+        (r#"ㅭ"#, r#"ㅭ"#, r#"ㅭ"#, r#"ᇙ"#, r#"ᇙ"#),
+        (r#"ㅮ"#, r#"ㅮ"#, r#"ㅮ"#, r#"ᄜ"#, r#"ᄜ"#),
+        (r#"ㅯ"#, r#"ㅯ"#, r#"ㅯ"#, r#"ᇝ"#, r#"ᇝ"#),
+        (r#"ㅰ"#, r#"ㅰ"#, r#"ㅰ"#, r#"ᇟ"#, r#"ᇟ"#),
+        (r#"ㅱ"#, r#"ㅱ"#, r#"ㅱ"#, r#"ᄝ"#, r#"ᄝ"#),
+        (r#"ㅲ"#, r#"ㅲ"#, r#"ㅲ"#, r#"ᄞ"#, r#"ᄞ"#),
+        (r#"ㅳ"#, r#"ㅳ"#, r#"ㅳ"#, r#"ᄠ"#, r#"ᄠ"#),
+        (r#"ㅴ"#, r#"ㅴ"#, r#"ㅴ"#, r#"ᄢ"#, r#"ᄢ"#),
+        (r#"ㅵ"#, r#"ㅵ"#, r#"ㅵ"#, r#"ᄣ"#, r#"ᄣ"#),
+        (r#"ㅶ"#, r#"ㅶ"#, r#"ㅶ"#, r#"ᄧ"#, r#"ᄧ"#),
+        (r#"ㅷ"#, r#"ㅷ"#, r#"ㅷ"#, r#"ᄩ"#, r#"ᄩ"#),
+        (r#"ㅸ"#, r#"ㅸ"#, r#"ㅸ"#, r#"ᄫ"#, r#"ᄫ"#),
+        (r#"ㅹ"#, r#"ㅹ"#, r#"ㅹ"#, r#"ᄬ"#, r#"ᄬ"#),
+        (r#"ㅺ"#, r#"ㅺ"#, r#"ㅺ"#, r#"ᄭ"#, r#"ᄭ"#),
+        (r#"ㅻ"#, r#"ㅻ"#, r#"ㅻ"#, r#"ᄮ"#, r#"ᄮ"#),
+        (r#"ㅼ"#, r#"ㅼ"#, r#"ㅼ"#, r#"ᄯ"#, r#"ᄯ"#),
+        (r#"ㅽ"#, r#"ㅽ"#, r#"ㅽ"#, r#"ᄲ"#, r#"ᄲ"#),
+        (r#"ㅾ"#, r#"ㅾ"#, r#"ㅾ"#, r#"ᄶ"#, r#"ᄶ"#),
+        (r#"ㅿ"#, r#"ㅿ"#, r#"ㅿ"#, r#"ᅀ"#, r#"ᅀ"#),
+        (r#"ㆀ"#, r#"ㆀ"#, r#"ㆀ"#, r#"ᅇ"#, r#"ᅇ"#),
+        (r#"ㆁ"#, r#"ㆁ"#, r#"ㆁ"#, r#"ᅌ"#, r#"ᅌ"#),
+        (r#"ㆂ"#, r#"ㆂ"#, r#"ㆂ"#, r#"ᇱ"#, r#"ᇱ"#),
+        (r#"ㆃ"#, r#"ㆃ"#, r#"ㆃ"#, r#"ᇲ"#, r#"ᇲ"#),
+        (r#"ㆄ"#, r#"ㆄ"#, r#"ㆄ"#, r#"ᅗ"#, r#"ᅗ"#),
+        (r#"ㆅ"#, r#"ㆅ"#, r#"ㆅ"#, r#"ᅘ"#, r#"ᅘ"#),
+        (r#"ㆆ"#, r#"ㆆ"#, r#"ㆆ"#, r#"ᅙ"#, r#"ᅙ"#),
+        (r#"ㆇ"#, r#"ㆇ"#, r#"ㆇ"#, r#"ᆄ"#, r#"ᆄ"#),
+        (r#"ㆈ"#, r#"ㆈ"#, r#"ㆈ"#, r#"ᆅ"#, r#"ᆅ"#),
+        (r#"ㆉ"#, r#"ㆉ"#, r#"ㆉ"#, r#"ᆈ"#, r#"ᆈ"#),
+        (r#"ㆊ"#, r#"ㆊ"#, r#"ㆊ"#, r#"ᆑ"#, r#"ᆑ"#),
+        (r#"ㆋ"#, r#"ㆋ"#, r#"ㆋ"#, r#"ᆒ"#, r#"ᆒ"#),
+        (r#"ㆌ"#, r#"ㆌ"#, r#"ㆌ"#, r#"ᆔ"#, r#"ᆔ"#),
+        (r#"ㆍ"#, r#"ㆍ"#, r#"ㆍ"#, r#"ᆞ"#, r#"ᆞ"#),
+        (r#"ㆎ"#, r#"ㆎ"#, r#"ㆎ"#, r#"ᆡ"#, r#"ᆡ"#),
+        (r#"㆒"#, r#"㆒"#, r#"㆒"#, r#"一"#, r#"一"#),
+        (r#"㆓"#, r#"㆓"#, r#"㆓"#, r#"二"#, r#"二"#),
+        (r#"㆔"#, r#"㆔"#, r#"㆔"#, r#"三"#, r#"三"#),
+        (r#"㆕"#, r#"㆕"#, r#"㆕"#, r#"四"#, r#"四"#),
+        (r#"㆖"#, r#"㆖"#, r#"㆖"#, r#"上"#, r#"上"#),
+        (r#"㆗"#, r#"㆗"#, r#"㆗"#, r#"中"#, r#"中"#),
+        (r#"㆘"#, r#"㆘"#, r#"㆘"#, r#"下"#, r#"下"#),
+        (r#"㆙"#, r#"㆙"#, r#"㆙"#, r#"甲"#, r#"甲"#),
+        (r#"㆚"#, r#"㆚"#, r#"㆚"#, r#"乙"#, r#"乙"#),
+        (r#"㆛"#, r#"㆛"#, r#"㆛"#, r#"丙"#, r#"丙"#),
+        (r#"㆜"#, r#"㆜"#, r#"㆜"#, r#"丁"#, r#"丁"#),
+        (r#"㆝"#, r#"㆝"#, r#"㆝"#, r#"天"#, r#"天"#),
+        (r#"㆞"#, r#"㆞"#, r#"㆞"#, r#"地"#, r#"地"#),
+        (r#"㆟"#, r#"㆟"#, r#"㆟"#, r#"人"#, r#"人"#),
+        (r#"㈀"#, r#"㈀"#, r#"㈀"#, r#"(ᄀ)"#, r#"(ᄀ)"#),
+        (r#"㈁"#, r#"㈁"#, r#"㈁"#, r#"(ᄂ)"#, r#"(ᄂ)"#),
+        (r#"㈂"#, r#"㈂"#, r#"㈂"#, r#"(ᄃ)"#, r#"(ᄃ)"#),
+        (r#"㈃"#, r#"㈃"#, r#"㈃"#, r#"(ᄅ)"#, r#"(ᄅ)"#),
+        (r#"㈄"#, r#"㈄"#, r#"㈄"#, r#"(ᄆ)"#, r#"(ᄆ)"#),
+        (r#"㈅"#, r#"㈅"#, r#"㈅"#, r#"(ᄇ)"#, r#"(ᄇ)"#),
+        (r#"㈆"#, r#"㈆"#, r#"㈆"#, r#"(ᄉ)"#, r#"(ᄉ)"#),
+        (r#"㈇"#, r#"㈇"#, r#"㈇"#, r#"(ᄋ)"#, r#"(ᄋ)"#),
+        (r#"㈈"#, r#"㈈"#, r#"㈈"#, r#"(ᄌ)"#, r#"(ᄌ)"#),
+        (r#"㈉"#, r#"㈉"#, r#"㈉"#, r#"(ᄎ)"#, r#"(ᄎ)"#),
+        (r#"㈊"#, r#"㈊"#, r#"㈊"#, r#"(ᄏ)"#, r#"(ᄏ)"#),
+        (r#"㈋"#, r#"㈋"#, r#"㈋"#, r#"(ᄐ)"#, r#"(ᄐ)"#),
+        (r#"㈌"#, r#"㈌"#, r#"㈌"#, r#"(ᄑ)"#, r#"(ᄑ)"#),
+        (r#"㈍"#, r#"㈍"#, r#"㈍"#, r#"(ᄒ)"#, r#"(ᄒ)"#),
+        (r#"㈎"#, r#"㈎"#, r#"㈎"#, r#"(가)"#, r#"(가)"#),
+        (r#"㈏"#, r#"㈏"#, r#"㈏"#, r#"(나)"#, r#"(나)"#),
+        (r#"㈐"#, r#"㈐"#, r#"㈐"#, r#"(다)"#, r#"(다)"#),
+        (r#"㈑"#, r#"㈑"#, r#"㈑"#, r#"(라)"#, r#"(라)"#),
+        (r#"㈒"#, r#"㈒"#, r#"㈒"#, r#"(마)"#, r#"(마)"#),
+        (r#"㈓"#, r#"㈓"#, r#"㈓"#, r#"(바)"#, r#"(바)"#),
+        (r#"㈔"#, r#"㈔"#, r#"㈔"#, r#"(사)"#, r#"(사)"#),
+        (r#"㈕"#, r#"㈕"#, r#"㈕"#, r#"(아)"#, r#"(아)"#),
+        (r#"㈖"#, r#"㈖"#, r#"㈖"#, r#"(자)"#, r#"(자)"#),
+        (r#"㈗"#, r#"㈗"#, r#"㈗"#, r#"(차)"#, r#"(차)"#),
+        (r#"㈘"#, r#"㈘"#, r#"㈘"#, r#"(카)"#, r#"(카)"#),
+        (r#"㈙"#, r#"㈙"#, r#"㈙"#, r#"(타)"#, r#"(타)"#),
+        (r#"㈚"#, r#"㈚"#, r#"㈚"#, r#"(파)"#, r#"(파)"#),
+        (r#"㈛"#, r#"㈛"#, r#"㈛"#, r#"(하)"#, r#"(하)"#),
+        (r#"㈜"#, r#"㈜"#, r#"㈜"#, r#"(주)"#, r#"(주)"#),
+        (r#"㈝"#, r#"㈝"#, r#"㈝"#, r#"(오전)"#, r#"(오전)"#),
+        (r#"㈞"#, r#"㈞"#, r#"㈞"#, r#"(오후)"#, r#"(오후)"#),
+        (r#"㈠"#, r#"㈠"#, r#"㈠"#, r#"(一)"#, r#"(一)"#),
+        (r#"㈡"#, r#"㈡"#, r#"㈡"#, r#"(二)"#, r#"(二)"#),
+        (r#"㈢"#, r#"㈢"#, r#"㈢"#, r#"(三)"#, r#"(三)"#),
+        (r#"㈣"#, r#"㈣"#, r#"㈣"#, r#"(四)"#, r#"(四)"#),
+        (r#"㈤"#, r#"㈤"#, r#"㈤"#, r#"(五)"#, r#"(五)"#),
+        (r#"㈥"#, r#"㈥"#, r#"㈥"#, r#"(六)"#, r#"(六)"#),
+        (r#"㈦"#, r#"㈦"#, r#"㈦"#, r#"(七)"#, r#"(七)"#),
+        (r#"㈧"#, r#"㈧"#, r#"㈧"#, r#"(八)"#, r#"(八)"#),
+        (r#"㈨"#, r#"㈨"#, r#"㈨"#, r#"(九)"#, r#"(九)"#),
+        (r#"㈩"#, r#"㈩"#, r#"㈩"#, r#"(十)"#, r#"(十)"#),
+        (r#"㈪"#, r#"㈪"#, r#"㈪"#, r#"(月)"#, r#"(月)"#),
+        (r#"㈫"#, r#"㈫"#, r#"㈫"#, r#"(火)"#, r#"(火)"#),
+        (r#"㈬"#, r#"㈬"#, r#"㈬"#, r#"(水)"#, r#"(水)"#),
+        (r#"㈭"#, r#"㈭"#, r#"㈭"#, r#"(木)"#, r#"(木)"#),
+        (r#"㈮"#, r#"㈮"#, r#"㈮"#, r#"(金)"#, r#"(金)"#),
+        (r#"㈯"#, r#"㈯"#, r#"㈯"#, r#"(土)"#, r#"(土)"#),
+        (r#"㈰"#, r#"㈰"#, r#"㈰"#, r#"(日)"#, r#"(日)"#),
+        (r#"㈱"#, r#"㈱"#, r#"㈱"#, r#"(株)"#, r#"(株)"#),
+        (r#"㈲"#, r#"㈲"#, r#"㈲"#, r#"(有)"#, r#"(有)"#),
+        (r#"㈳"#, r#"㈳"#, r#"㈳"#, r#"(社)"#, r#"(社)"#),
+        (r#"㈴"#, r#"㈴"#, r#"㈴"#, r#"(名)"#, r#"(名)"#),
+        (r#"㈵"#, r#"㈵"#, r#"㈵"#, r#"(特)"#, r#"(特)"#),
+        (r#"㈶"#, r#"㈶"#, r#"㈶"#, r#"(財)"#, r#"(財)"#),
+        (r#"㈷"#, r#"㈷"#, r#"㈷"#, r#"(祝)"#, r#"(祝)"#),
+        (r#"㈸"#, r#"㈸"#, r#"㈸"#, r#"(労)"#, r#"(労)"#),
+        (r#"㈹"#, r#"㈹"#, r#"㈹"#, r#"(代)"#, r#"(代)"#),
+        (r#"㈺"#, r#"㈺"#, r#"㈺"#, r#"(呼)"#, r#"(呼)"#),
+        (r#"㈻"#, r#"㈻"#, r#"㈻"#, r#"(学)"#, r#"(学)"#),
+        (r#"㈼"#, r#"㈼"#, r#"㈼"#, r#"(監)"#, r#"(監)"#),
+        (r#"㈽"#, r#"㈽"#, r#"㈽"#, r#"(企)"#, r#"(企)"#),
+        (r#"㈾"#, r#"㈾"#, r#"㈾"#, r#"(資)"#, r#"(資)"#),
+        (r#"㈿"#, r#"㈿"#, r#"㈿"#, r#"(協)"#, r#"(協)"#),
+        (r#"㉀"#, r#"㉀"#, r#"㉀"#, r#"(祭)"#, r#"(祭)"#),
+        (r#"㉁"#, r#"㉁"#, r#"㉁"#, r#"(休)"#, r#"(休)"#),
+        (r#"㉂"#, r#"㉂"#, r#"㉂"#, r#"(自)"#, r#"(自)"#),
+        (r#"㉃"#, r#"㉃"#, r#"㉃"#, r#"(至)"#, r#"(至)"#),
+        (r#"㉄"#, r#"㉄"#, r#"㉄"#, r#"問"#, r#"問"#),
+        (r#"㉅"#, r#"㉅"#, r#"㉅"#, r#"幼"#, r#"幼"#),
+        (r#"㉆"#, r#"㉆"#, r#"㉆"#, r#"文"#, r#"文"#),
+        (r#"㉇"#, r#"㉇"#, r#"㉇"#, r#"箏"#, r#"箏"#),
+        (r#"㉐"#, r#"㉐"#, r#"㉐"#, r#"PTE"#, r#"PTE"#),
+        (r#"㉑"#, r#"㉑"#, r#"㉑"#, r#"21"#, r#"21"#),
+        (r#"㉒"#, r#"㉒"#, r#"㉒"#, r#"22"#, r#"22"#),
+        (r#"㉓"#, r#"㉓"#, r#"㉓"#, r#"23"#, r#"23"#),
+        (r#"㉔"#, r#"㉔"#, r#"㉔"#, r#"24"#, r#"24"#),
+        (r#"㉕"#, r#"㉕"#, r#"㉕"#, r#"25"#, r#"25"#),
+        (r#"㉖"#, r#"㉖"#, r#"㉖"#, r#"26"#, r#"26"#),
+        (r#"㉗"#, r#"㉗"#, r#"㉗"#, r#"27"#, r#"27"#),
+        (r#"㉘"#, r#"㉘"#, r#"㉘"#, r#"28"#, r#"28"#),
+        (r#"㉙"#, r#"㉙"#, r#"㉙"#, r#"29"#, r#"29"#),
+        (r#"㉚"#, r#"㉚"#, r#"㉚"#, r#"30"#, r#"30"#),
+        (r#"㉛"#, r#"㉛"#, r#"㉛"#, r#"31"#, r#"31"#),
+        (r#"㉜"#, r#"㉜"#, r#"㉜"#, r#"32"#, r#"32"#),
+        (r#"㉝"#, r#"㉝"#, r#"㉝"#, r#"33"#, r#"33"#),
+        (r#"㉞"#, r#"㉞"#, r#"㉞"#, r#"34"#, r#"34"#),
+        (r#"㉟"#, r#"㉟"#, r#"㉟"#, r#"35"#, r#"35"#),
+        (r#"㉠"#, r#"㉠"#, r#"㉠"#, r#"ᄀ"#, r#"ᄀ"#),
+        (r#"㉡"#, r#"㉡"#, r#"㉡"#, r#"ᄂ"#, r#"ᄂ"#),
+        (r#"㉢"#, r#"㉢"#, r#"㉢"#, r#"ᄃ"#, r#"ᄃ"#),
+        (r#"㉣"#, r#"㉣"#, r#"㉣"#, r#"ᄅ"#, r#"ᄅ"#),
+        (r#"㉤"#, r#"㉤"#, r#"㉤"#, r#"ᄆ"#, r#"ᄆ"#),
+        (r#"㉥"#, r#"㉥"#, r#"㉥"#, r#"ᄇ"#, r#"ᄇ"#),
+        (r#"㉦"#, r#"㉦"#, r#"㉦"#, r#"ᄉ"#, r#"ᄉ"#),
+        (r#"㉧"#, r#"㉧"#, r#"㉧"#, r#"ᄋ"#, r#"ᄋ"#),
+        (r#"㉨"#, r#"㉨"#, r#"㉨"#, r#"ᄌ"#, r#"ᄌ"#),
+        (r#"㉩"#, r#"㉩"#, r#"㉩"#, r#"ᄎ"#, r#"ᄎ"#),
+        (r#"㉪"#, r#"㉪"#, r#"㉪"#, r#"ᄏ"#, r#"ᄏ"#),
+        (r#"㉫"#, r#"㉫"#, r#"㉫"#, r#"ᄐ"#, r#"ᄐ"#),
+        (r#"㉬"#, r#"㉬"#, r#"㉬"#, r#"ᄑ"#, r#"ᄑ"#),
+        (r#"㉭"#, r#"㉭"#, r#"㉭"#, r#"ᄒ"#, r#"ᄒ"#),
+        (r#"㉮"#, r#"㉮"#, r#"㉮"#, r#"가"#, r#"가"#),
+        (r#"㉯"#, r#"㉯"#, r#"㉯"#, r#"나"#, r#"나"#),
+        (r#"㉰"#, r#"㉰"#, r#"㉰"#, r#"다"#, r#"다"#),
+        (r#"㉱"#, r#"㉱"#, r#"㉱"#, r#"라"#, r#"라"#),
+        (r#"㉲"#, r#"㉲"#, r#"㉲"#, r#"마"#, r#"마"#),
+        (r#"㉳"#, r#"㉳"#, r#"㉳"#, r#"바"#, r#"바"#),
+        (r#"㉴"#, r#"㉴"#, r#"㉴"#, r#"사"#, r#"사"#),
+        (r#"㉵"#, r#"㉵"#, r#"㉵"#, r#"아"#, r#"아"#),
+        (r#"㉶"#, r#"㉶"#, r#"㉶"#, r#"자"#, r#"자"#),
+        (r#"㉷"#, r#"㉷"#, r#"㉷"#, r#"차"#, r#"차"#),
+        (r#"㉸"#, r#"㉸"#, r#"㉸"#, r#"카"#, r#"카"#),
+        (r#"㉹"#, r#"㉹"#, r#"㉹"#, r#"타"#, r#"타"#),
+        (r#"㉺"#, r#"㉺"#, r#"㉺"#, r#"파"#, r#"파"#),
+        (r#"㉻"#, r#"㉻"#, r#"㉻"#, r#"하"#, r#"하"#),
+        (r#"㉼"#, r#"㉼"#, r#"㉼"#, r#"참고"#, r#"참고"#),
+        (r#"㉽"#, r#"㉽"#, r#"㉽"#, r#"주의"#, r#"주의"#),
+        (r#"㉾"#, r#"㉾"#, r#"㉾"#, r#"우"#, r#"우"#),
+        (r#"㊀"#, r#"㊀"#, r#"㊀"#, r#"一"#, r#"一"#),
+        (r#"㊁"#, r#"㊁"#, r#"㊁"#, r#"二"#, r#"二"#),
+        (r#"㊂"#, r#"㊂"#, r#"㊂"#, r#"三"#, r#"三"#),
+        (r#"㊃"#, r#"㊃"#, r#"㊃"#, r#"四"#, r#"四"#),
+        (r#"㊄"#, r#"㊄"#, r#"㊄"#, r#"五"#, r#"五"#),
+        (r#"㊅"#, r#"㊅"#, r#"㊅"#, r#"六"#, r#"六"#),
+        (r#"㊆"#, r#"㊆"#, r#"㊆"#, r#"七"#, r#"七"#),
+        (r#"㊇"#, r#"㊇"#, r#"㊇"#, r#"八"#, r#"八"#),
+        (r#"㊈"#, r#"㊈"#, r#"㊈"#, r#"九"#, r#"九"#),
+        (r#"㊉"#, r#"㊉"#, r#"㊉"#, r#"十"#, r#"十"#),
+        (r#"㊊"#, r#"㊊"#, r#"㊊"#, r#"月"#, r#"月"#),
+        (r#"㊋"#, r#"㊋"#, r#"㊋"#, r#"火"#, r#"火"#),
+        (r#"㊌"#, r#"㊌"#, r#"㊌"#, r#"水"#, r#"水"#),
+        (r#"㊍"#, r#"㊍"#, r#"㊍"#, r#"木"#, r#"木"#),
+        (r#"㊎"#, r#"㊎"#, r#"㊎"#, r#"金"#, r#"金"#),
+        (r#"㊏"#, r#"㊏"#, r#"㊏"#, r#"土"#, r#"土"#),
+        (r#"㊐"#, r#"㊐"#, r#"㊐"#, r#"日"#, r#"日"#),
+        (r#"㊑"#, r#"㊑"#, r#"㊑"#, r#"株"#, r#"株"#),
+        (r#"㊒"#, r#"㊒"#, r#"㊒"#, r#"有"#, r#"有"#),
+        (r#"㊓"#, r#"㊓"#, r#"㊓"#, r#"社"#, r#"社"#),
+        (r#"㊔"#, r#"㊔"#, r#"㊔"#, r#"名"#, r#"名"#),
+        (r#"㊕"#, r#"㊕"#, r#"㊕"#, r#"特"#, r#"特"#),
+        (r#"㊖"#, r#"㊖"#, r#"㊖"#, r#"財"#, r#"財"#),
+        (r#"㊗"#, r#"㊗"#, r#"㊗"#, r#"祝"#, r#"祝"#),
+        (r#"㊘"#, r#"㊘"#, r#"㊘"#, r#"労"#, r#"労"#),
+        (r#"㊙"#, r#"㊙"#, r#"㊙"#, r#"秘"#, r#"秘"#),
+        (r#"㊚"#, r#"㊚"#, r#"㊚"#, r#"男"#, r#"男"#),
+        (r#"㊛"#, r#"㊛"#, r#"㊛"#, r#"女"#, r#"女"#),
+        (r#"㊜"#, r#"㊜"#, r#"㊜"#, r#"適"#, r#"適"#),
+        (r#"㊝"#, r#"㊝"#, r#"㊝"#, r#"優"#, r#"優"#),
+        (r#"㊞"#, r#"㊞"#, r#"㊞"#, r#"印"#, r#"印"#),
+        (r#"㊟"#, r#"㊟"#, r#"㊟"#, r#"注"#, r#"注"#),
+        (r#"㊠"#, r#"㊠"#, r#"㊠"#, r#"項"#, r#"項"#),
+        (r#"㊡"#, r#"㊡"#, r#"㊡"#, r#"休"#, r#"休"#),
+        (r#"㊢"#, r#"㊢"#, r#"㊢"#, r#"写"#, r#"写"#),
+        (r#"㊣"#, r#"㊣"#, r#"㊣"#, r#"正"#, r#"正"#),
+        (r#"㊤"#, r#"㊤"#, r#"㊤"#, r#"上"#, r#"上"#),
+        (r#"㊥"#, r#"㊥"#, r#"㊥"#, r#"中"#, r#"中"#),
+        (r#"㊦"#, r#"㊦"#, r#"㊦"#, r#"下"#, r#"下"#),
+        (r#"㊧"#, r#"㊧"#, r#"㊧"#, r#"左"#, r#"左"#),
+        (r#"㊨"#, r#"㊨"#, r#"㊨"#, r#"右"#, r#"右"#),
+        (r#"㊩"#, r#"㊩"#, r#"㊩"#, r#"医"#, r#"医"#),
+        (r#"㊪"#, r#"㊪"#, r#"㊪"#, r#"宗"#, r#"宗"#),
+        (r#"㊫"#, r#"㊫"#, r#"㊫"#, r#"学"#, r#"学"#),
+        (r#"㊬"#, r#"㊬"#, r#"㊬"#, r#"監"#, r#"監"#),
+        (r#"㊭"#, r#"㊭"#, r#"㊭"#, r#"企"#, r#"企"#),
+        (r#"㊮"#, r#"㊮"#, r#"㊮"#, r#"資"#, r#"資"#),
+        (r#"㊯"#, r#"㊯"#, r#"㊯"#, r#"協"#, r#"協"#),
+        (r#"㊰"#, r#"㊰"#, r#"㊰"#, r#"夜"#, r#"夜"#),
+        (r#"㊱"#, r#"㊱"#, r#"㊱"#, r#"36"#, r#"36"#),
+        (r#"㊲"#, r#"㊲"#, r#"㊲"#, r#"37"#, r#"37"#),
+        (r#"㊳"#, r#"㊳"#, r#"㊳"#, r#"38"#, r#"38"#),
+        (r#"㊴"#, r#"㊴"#, r#"㊴"#, r#"39"#, r#"39"#),
+        (r#"㊵"#, r#"㊵"#, r#"㊵"#, r#"40"#, r#"40"#),
+        (r#"㊶"#, r#"㊶"#, r#"㊶"#, r#"41"#, r#"41"#),
+        (r#"㊷"#, r#"㊷"#, r#"㊷"#, r#"42"#, r#"42"#),
+        (r#"㊸"#, r#"㊸"#, r#"㊸"#, r#"43"#, r#"43"#),
+        (r#"㊹"#, r#"㊹"#, r#"㊹"#, r#"44"#, r#"44"#),
+        (r#"㊺"#, r#"㊺"#, r#"㊺"#, r#"45"#, r#"45"#),
+        (r#"㊻"#, r#"㊻"#, r#"㊻"#, r#"46"#, r#"46"#),
+        (r#"㊼"#, r#"㊼"#, r#"㊼"#, r#"47"#, r#"47"#),
+        (r#"㊽"#, r#"㊽"#, r#"㊽"#, r#"48"#, r#"48"#),
+        (r#"㊾"#, r#"㊾"#, r#"㊾"#, r#"49"#, r#"49"#),
+        (r#"㊿"#, r#"㊿"#, r#"㊿"#, r#"50"#, r#"50"#),
+        (r#"㋀"#, r#"㋀"#, r#"㋀"#, r#"1月"#, r#"1月"#),
+        (r#"㋁"#, r#"㋁"#, r#"㋁"#, r#"2月"#, r#"2月"#),
+        (r#"㋂"#, r#"㋂"#, r#"㋂"#, r#"3月"#, r#"3月"#),
+        (r#"㋃"#, r#"㋃"#, r#"㋃"#, r#"4月"#, r#"4月"#),
+        (r#"㋄"#, r#"㋄"#, r#"㋄"#, r#"5月"#, r#"5月"#),
+        (r#"㋅"#, r#"㋅"#, r#"㋅"#, r#"6月"#, r#"6月"#),
+        (r#"㋆"#, r#"㋆"#, r#"㋆"#, r#"7月"#, r#"7月"#),
+        (r#"㋇"#, r#"㋇"#, r#"㋇"#, r#"8月"#, r#"8月"#),
+        (r#"㋈"#, r#"㋈"#, r#"㋈"#, r#"9月"#, r#"9月"#),
+        (r#"㋉"#, r#"㋉"#, r#"㋉"#, r#"10月"#, r#"10月"#),
+        (r#"㋊"#, r#"㋊"#, r#"㋊"#, r#"11月"#, r#"11月"#),
+        (r#"㋋"#, r#"㋋"#, r#"㋋"#, r#"12月"#, r#"12月"#),
+        (r#"㋌"#, r#"㋌"#, r#"㋌"#, r#"Hg"#, r#"Hg"#),
+        (r#"㋍"#, r#"㋍"#, r#"㋍"#, r#"erg"#, r#"erg"#),
+        (r#"㋎"#, r#"㋎"#, r#"㋎"#, r#"eV"#, r#"eV"#),
+        (r#"㋏"#, r#"㋏"#, r#"㋏"#, r#"LTD"#, r#"LTD"#),
+        (r#"㋐"#, r#"㋐"#, r#"㋐"#, r#"ア"#, r#"ア"#),
+        (r#"㋑"#, r#"㋑"#, r#"㋑"#, r#"イ"#, r#"イ"#),
+        (r#"㋒"#, r#"㋒"#, r#"㋒"#, r#"ウ"#, r#"ウ"#),
+        (r#"㋓"#, r#"㋓"#, r#"㋓"#, r#"エ"#, r#"エ"#),
+        (r#"㋔"#, r#"㋔"#, r#"㋔"#, r#"オ"#, r#"オ"#),
+        (r#"㋕"#, r#"㋕"#, r#"㋕"#, r#"カ"#, r#"カ"#),
+        (r#"㋖"#, r#"㋖"#, r#"㋖"#, r#"キ"#, r#"キ"#),
+        (r#"㋗"#, r#"㋗"#, r#"㋗"#, r#"ク"#, r#"ク"#),
+        (r#"㋘"#, r#"㋘"#, r#"㋘"#, r#"ケ"#, r#"ケ"#),
+        (r#"㋙"#, r#"㋙"#, r#"㋙"#, r#"コ"#, r#"コ"#),
+        (r#"㋚"#, r#"㋚"#, r#"㋚"#, r#"サ"#, r#"サ"#),
+        (r#"㋛"#, r#"㋛"#, r#"㋛"#, r#"シ"#, r#"シ"#),
+        (r#"㋜"#, r#"㋜"#, r#"㋜"#, r#"ス"#, r#"ス"#),
+        (r#"㋝"#, r#"㋝"#, r#"㋝"#, r#"セ"#, r#"セ"#),
+        (r#"㋞"#, r#"㋞"#, r#"㋞"#, r#"ソ"#, r#"ソ"#),
+        (r#"㋟"#, r#"㋟"#, r#"㋟"#, r#"タ"#, r#"タ"#),
+        (r#"㋠"#, r#"㋠"#, r#"㋠"#, r#"チ"#, r#"チ"#),
+        (r#"㋡"#, r#"㋡"#, r#"㋡"#, r#"ツ"#, r#"ツ"#),
+        (r#"㋢"#, r#"㋢"#, r#"㋢"#, r#"テ"#, r#"テ"#),
+        (r#"㋣"#, r#"㋣"#, r#"㋣"#, r#"ト"#, r#"ト"#),
+        (r#"㋤"#, r#"㋤"#, r#"㋤"#, r#"ナ"#, r#"ナ"#),
+        (r#"㋥"#, r#"㋥"#, r#"㋥"#, r#"ニ"#, r#"ニ"#),
+        (r#"㋦"#, r#"㋦"#, r#"㋦"#, r#"ヌ"#, r#"ヌ"#),
+        (r#"㋧"#, r#"㋧"#, r#"㋧"#, r#"ネ"#, r#"ネ"#),
+        (r#"㋨"#, r#"㋨"#, r#"㋨"#, r#"ノ"#, r#"ノ"#),
+        (r#"㋩"#, r#"㋩"#, r#"㋩"#, r#"ハ"#, r#"ハ"#),
+        (r#"㋪"#, r#"㋪"#, r#"㋪"#, r#"ヒ"#, r#"ヒ"#),
+        (r#"㋫"#, r#"㋫"#, r#"㋫"#, r#"フ"#, r#"フ"#),
+        (r#"㋬"#, r#"㋬"#, r#"㋬"#, r#"ヘ"#, r#"ヘ"#),
+        (r#"㋭"#, r#"㋭"#, r#"㋭"#, r#"ホ"#, r#"ホ"#),
+        (r#"㋮"#, r#"㋮"#, r#"㋮"#, r#"マ"#, r#"マ"#),
+        (r#"㋯"#, r#"㋯"#, r#"㋯"#, r#"ミ"#, r#"ミ"#),
+        (r#"㋰"#, r#"㋰"#, r#"㋰"#, r#"ム"#, r#"ム"#),
+        (r#"㋱"#, r#"㋱"#, r#"㋱"#, r#"メ"#, r#"メ"#),
+        (r#"㋲"#, r#"㋲"#, r#"㋲"#, r#"モ"#, r#"モ"#),
+        (r#"㋳"#, r#"㋳"#, r#"㋳"#, r#"ヤ"#, r#"ヤ"#),
+        (r#"㋴"#, r#"㋴"#, r#"㋴"#, r#"ユ"#, r#"ユ"#),
+        (r#"㋵"#, r#"㋵"#, r#"㋵"#, r#"ヨ"#, r#"ヨ"#),
+        (r#"㋶"#, r#"㋶"#, r#"㋶"#, r#"ラ"#, r#"ラ"#),
+        (r#"㋷"#, r#"㋷"#, r#"㋷"#, r#"リ"#, r#"リ"#),
+        (r#"㋸"#, r#"㋸"#, r#"㋸"#, r#"ル"#, r#"ル"#),
+        (r#"㋹"#, r#"㋹"#, r#"㋹"#, r#"レ"#, r#"レ"#),
+        (r#"㋺"#, r#"㋺"#, r#"㋺"#, r#"ロ"#, r#"ロ"#),
+        (r#"㋻"#, r#"㋻"#, r#"㋻"#, r#"ワ"#, r#"ワ"#),
+        (r#"㋼"#, r#"㋼"#, r#"㋼"#, r#"ヰ"#, r#"ヰ"#),
+        (r#"㋽"#, r#"㋽"#, r#"㋽"#, r#"ヱ"#, r#"ヱ"#),
+        (r#"㋾"#, r#"㋾"#, r#"㋾"#, r#"ヲ"#, r#"ヲ"#),
+        (r#"㋿"#, r#"㋿"#, r#"㋿"#, r#"令和"#, r#"令和"#),
+        (r#"㌀"#, r#"㌀"#, r#"㌀"#, r#"アパート"#, r#"アパート"#),
+        (r#"㌁"#, r#"㌁"#, r#"㌁"#, r#"アルファ"#, r#"アルファ"#),
+        (r#"㌂"#, r#"㌂"#, r#"㌂"#, r#"アンペア"#, r#"アンペア"#),
+        (r#"㌃"#, r#"㌃"#, r#"㌃"#, r#"アール"#, r#"アール"#),
+        (r#"㌄"#, r#"㌄"#, r#"㌄"#, r#"イニング"#, r#"イニング"#),
+        (r#"㌅"#, r#"㌅"#, r#"㌅"#, r#"インチ"#, r#"インチ"#),
+        (r#"㌆"#, r#"㌆"#, r#"㌆"#, r#"ウォン"#, r#"ウォン"#),
+        (r#"㌇"#, r#"㌇"#, r#"㌇"#, r#"エスクード"#, r#"エスクード"#),
+        (r#"㌈"#, r#"㌈"#, r#"㌈"#, r#"エーカー"#, r#"エーカー"#),
+        (r#"㌉"#, r#"㌉"#, r#"㌉"#, r#"オンス"#, r#"オンス"#),
+        (r#"㌊"#, r#"㌊"#, r#"㌊"#, r#"オーム"#, r#"オーム"#),
+        (r#"㌋"#, r#"㌋"#, r#"㌋"#, r#"カイリ"#, r#"カイリ"#),
+        (r#"㌌"#, r#"㌌"#, r#"㌌"#, r#"カラット"#, r#"カラット"#),
+        (r#"㌍"#, r#"㌍"#, r#"㌍"#, r#"カロリー"#, r#"カロリー"#),
+        (r#"㌎"#, r#"㌎"#, r#"㌎"#, r#"ガロン"#, r#"ガロン"#),
+        (r#"㌏"#, r#"㌏"#, r#"㌏"#, r#"ガンマ"#, r#"ガンマ"#),
+        (r#"㌐"#, r#"㌐"#, r#"㌐"#, r#"ギガ"#, r#"ギガ"#),
+        (r#"㌑"#, r#"㌑"#, r#"㌑"#, r#"ギニー"#, r#"ギニー"#),
+        (r#"㌒"#, r#"㌒"#, r#"㌒"#, r#"キュリー"#, r#"キュリー"#),
+        (r#"㌓"#, r#"㌓"#, r#"㌓"#, r#"ギルダー"#, r#"ギルダー"#),
+        (r#"㌔"#, r#"㌔"#, r#"㌔"#, r#"キロ"#, r#"キロ"#),
+        (r#"㌕"#, r#"㌕"#, r#"㌕"#, r#"キログラム"#, r#"キログラム"#),
+        (r#"㌖"#, r#"㌖"#, r#"㌖"#, r#"キロメートル"#, r#"キロメートル"#),
+        (r#"㌗"#, r#"㌗"#, r#"㌗"#, r#"キロワット"#, r#"キロワット"#),
+        (r#"㌘"#, r#"㌘"#, r#"㌘"#, r#"グラム"#, r#"グラム"#),
+        (r#"㌙"#, r#"㌙"#, r#"㌙"#, r#"グラムトン"#, r#"グラムトン"#),
+        (r#"㌚"#, r#"㌚"#, r#"㌚"#, r#"クルゼイロ"#, r#"クルゼイロ"#),
+        (r#"㌛"#, r#"㌛"#, r#"㌛"#, r#"クローネ"#, r#"クローネ"#),
+        (r#"㌜"#, r#"㌜"#, r#"㌜"#, r#"ケース"#, r#"ケース"#),
+        (r#"㌝"#, r#"㌝"#, r#"㌝"#, r#"コルナ"#, r#"コルナ"#),
+        (r#"㌞"#, r#"㌞"#, r#"㌞"#, r#"コーポ"#, r#"コーポ"#),
+        (r#"㌟"#, r#"㌟"#, r#"㌟"#, r#"サイクル"#, r#"サイクル"#),
+        (r#"㌠"#, r#"㌠"#, r#"㌠"#, r#"サンチーム"#, r#"サンチーム"#),
+        (r#"㌡"#, r#"㌡"#, r#"㌡"#, r#"シリング"#, r#"シリング"#),
+        (r#"㌢"#, r#"㌢"#, r#"㌢"#, r#"センチ"#, r#"センチ"#),
+        (r#"㌣"#, r#"㌣"#, r#"㌣"#, r#"セント"#, r#"セント"#),
+        (r#"㌤"#, r#"㌤"#, r#"㌤"#, r#"ダース"#, r#"ダース"#),
+        (r#"㌥"#, r#"㌥"#, r#"㌥"#, r#"デシ"#, r#"デシ"#),
+        (r#"㌦"#, r#"㌦"#, r#"㌦"#, r#"ドル"#, r#"ドル"#),
+        (r#"㌧"#, r#"㌧"#, r#"㌧"#, r#"トン"#, r#"トン"#),
+        (r#"㌨"#, r#"㌨"#, r#"㌨"#, r#"ナノ"#, r#"ナノ"#),
+        (r#"㌩"#, r#"㌩"#, r#"㌩"#, r#"ノット"#, r#"ノット"#),
+        (r#"㌪"#, r#"㌪"#, r#"㌪"#, r#"ハイツ"#, r#"ハイツ"#),
+        (r#"㌫"#, r#"㌫"#, r#"㌫"#, r#"パーセント"#, r#"パーセント"#),
+        (r#"㌬"#, r#"㌬"#, r#"㌬"#, r#"パーツ"#, r#"パーツ"#),
+        (r#"㌭"#, r#"㌭"#, r#"㌭"#, r#"バーレル"#, r#"バーレル"#),
+        (r#"㌮"#, r#"㌮"#, r#"㌮"#, r#"ピアストル"#, r#"ピアストル"#),
+        (r#"㌯"#, r#"㌯"#, r#"㌯"#, r#"ピクル"#, r#"ピクル"#),
+        (r#"㌰"#, r#"㌰"#, r#"㌰"#, r#"ピコ"#, r#"ピコ"#),
+        (r#"㌱"#, r#"㌱"#, r#"㌱"#, r#"ビル"#, r#"ビル"#),
+        (r#"㌲"#, r#"㌲"#, r#"㌲"#, r#"ファラッド"#, r#"ファラッド"#),
+        (r#"㌳"#, r#"㌳"#, r#"㌳"#, r#"フィート"#, r#"フィート"#),
+        (r#"㌴"#, r#"㌴"#, r#"㌴"#, r#"ブッシェル"#, r#"ブッシェル"#),
+        (r#"㌵"#, r#"㌵"#, r#"㌵"#, r#"フラン"#, r#"フラン"#),
+        (r#"㌶"#, r#"㌶"#, r#"㌶"#, r#"ヘクタール"#, r#"ヘクタール"#),
+        (r#"㌷"#, r#"㌷"#, r#"㌷"#, r#"ペソ"#, r#"ペソ"#),
+        (r#"㌸"#, r#"㌸"#, r#"㌸"#, r#"ペニヒ"#, r#"ペニヒ"#),
+        (r#"㌹"#, r#"㌹"#, r#"㌹"#, r#"ヘルツ"#, r#"ヘルツ"#),
+        (r#"㌺"#, r#"㌺"#, r#"㌺"#, r#"ペンス"#, r#"ペンス"#),
+        (r#"㌻"#, r#"㌻"#, r#"㌻"#, r#"ページ"#, r#"ページ"#),
+        (r#"㌼"#, r#"㌼"#, r#"㌼"#, r#"ベータ"#, r#"ベータ"#),
+        (r#"㌽"#, r#"㌽"#, r#"㌽"#, r#"ポイント"#, r#"ポイント"#),
+        (r#"㌾"#, r#"㌾"#, r#"㌾"#, r#"ボルト"#, r#"ボルト"#),
+        (r#"㌿"#, r#"㌿"#, r#"㌿"#, r#"ホン"#, r#"ホン"#),
+        (r#"㍀"#, r#"㍀"#, r#"㍀"#, r#"ポンド"#, r#"ポンド"#),
+        (r#"㍁"#, r#"㍁"#, r#"㍁"#, r#"ホール"#, r#"ホール"#),
+        (r#"㍂"#, r#"㍂"#, r#"㍂"#, r#"ホーン"#, r#"ホーン"#),
+        (r#"㍃"#, r#"㍃"#, r#"㍃"#, r#"マイクロ"#, r#"マイクロ"#),
+        (r#"㍄"#, r#"㍄"#, r#"㍄"#, r#"マイル"#, r#"マイル"#),
+        (r#"㍅"#, r#"㍅"#, r#"㍅"#, r#"マッハ"#, r#"マッハ"#),
+        (r#"㍆"#, r#"㍆"#, r#"㍆"#, r#"マルク"#, r#"マルク"#),
+        (r#"㍇"#, r#"㍇"#, r#"㍇"#, r#"マンション"#, r#"マンション"#),
+        (r#"㍈"#, r#"㍈"#, r#"㍈"#, r#"ミクロン"#, r#"ミクロン"#),
+        (r#"㍉"#, r#"㍉"#, r#"㍉"#, r#"ミリ"#, r#"ミリ"#),
+        (r#"㍊"#, r#"㍊"#, r#"㍊"#, r#"ミリバール"#, r#"ミリバール"#),
+        (r#"㍋"#, r#"㍋"#, r#"㍋"#, r#"メガ"#, r#"メガ"#),
+        (r#"㍌"#, r#"㍌"#, r#"㍌"#, r#"メガトン"#, r#"メガトン"#),
+        (r#"㍍"#, r#"㍍"#, r#"㍍"#, r#"メートル"#, r#"メートル"#),
+        (r#"㍎"#, r#"㍎"#, r#"㍎"#, r#"ヤード"#, r#"ヤード"#),
+        (r#"㍏"#, r#"㍏"#, r#"㍏"#, r#"ヤール"#, r#"ヤール"#),
+        (r#"㍐"#, r#"㍐"#, r#"㍐"#, r#"ユアン"#, r#"ユアン"#),
+        (r#"㍑"#, r#"㍑"#, r#"㍑"#, r#"リットル"#, r#"リットル"#),
+        (r#"㍒"#, r#"㍒"#, r#"㍒"#, r#"リラ"#, r#"リラ"#),
+        (r#"㍓"#, r#"㍓"#, r#"㍓"#, r#"ルピー"#, r#"ルピー"#),
+        (r#"㍔"#, r#"㍔"#, r#"㍔"#, r#"ルーブル"#, r#"ルーブル"#),
+        (r#"㍕"#, r#"㍕"#, r#"㍕"#, r#"レム"#, r#"レム"#),
+        (r#"㍖"#, r#"㍖"#, r#"㍖"#, r#"レントゲン"#, r#"レントゲン"#),
+        (r#"㍗"#, r#"㍗"#, r#"㍗"#, r#"ワット"#, r#"ワット"#),
+        (r#"㍘"#, r#"㍘"#, r#"㍘"#, r#"0点"#, r#"0点"#),
+        (r#"㍙"#, r#"㍙"#, r#"㍙"#, r#"1点"#, r#"1点"#),
+        (r#"㍚"#, r#"㍚"#, r#"㍚"#, r#"2点"#, r#"2点"#),
+        (r#"㍛"#, r#"㍛"#, r#"㍛"#, r#"3点"#, r#"3点"#),
+        (r#"㍜"#, r#"㍜"#, r#"㍜"#, r#"4点"#, r#"4点"#),
+        (r#"㍝"#, r#"㍝"#, r#"㍝"#, r#"5点"#, r#"5点"#),
+        (r#"㍞"#, r#"㍞"#, r#"㍞"#, r#"6点"#, r#"6点"#),
+        (r#"㍟"#, r#"㍟"#, r#"㍟"#, r#"7点"#, r#"7点"#),
+        (r#"㍠"#, r#"㍠"#, r#"㍠"#, r#"8点"#, r#"8点"#),
+        (r#"㍡"#, r#"㍡"#, r#"㍡"#, r#"9点"#, r#"9点"#),
+        (r#"㍢"#, r#"㍢"#, r#"㍢"#, r#"10点"#, r#"10点"#),
+        (r#"㍣"#, r#"㍣"#, r#"㍣"#, r#"11点"#, r#"11点"#),
+        (r#"㍤"#, r#"㍤"#, r#"㍤"#, r#"12点"#, r#"12点"#),
+        (r#"㍥"#, r#"㍥"#, r#"㍥"#, r#"13点"#, r#"13点"#),
+        (r#"㍦"#, r#"㍦"#, r#"㍦"#, r#"14点"#, r#"14点"#),
+        (r#"㍧"#, r#"㍧"#, r#"㍧"#, r#"15点"#, r#"15点"#),
+        (r#"㍨"#, r#"㍨"#, r#"㍨"#, r#"16点"#, r#"16点"#),
+        (r#"㍩"#, r#"㍩"#, r#"㍩"#, r#"17点"#, r#"17点"#),
+        (r#"㍪"#, r#"㍪"#, r#"㍪"#, r#"18点"#, r#"18点"#),
+        (r#"㍫"#, r#"㍫"#, r#"㍫"#, r#"19点"#, r#"19点"#),
+        (r#"㍬"#, r#"㍬"#, r#"㍬"#, r#"20点"#, r#"20点"#),
+        (r#"㍭"#, r#"㍭"#, r#"㍭"#, r#"21点"#, r#"21点"#),
+        (r#"㍮"#, r#"㍮"#, r#"㍮"#, r#"22点"#, r#"22点"#),
+        (r#"㍯"#, r#"㍯"#, r#"㍯"#, r#"23点"#, r#"23点"#),
+        (r#"㍰"#, r#"㍰"#, r#"㍰"#, r#"24点"#, r#"24点"#),
+        (r#"㍱"#, r#"㍱"#, r#"㍱"#, r#"hPa"#, r#"hPa"#),
+        (r#"㍲"#, r#"㍲"#, r#"㍲"#, r#"da"#, r#"da"#),
+        (r#"㍳"#, r#"㍳"#, r#"㍳"#, r#"AU"#, r#"AU"#),
+        (r#"㍴"#, r#"㍴"#, r#"㍴"#, r#"bar"#, r#"bar"#),
+        (r#"㍵"#, r#"㍵"#, r#"㍵"#, r#"oV"#, r#"oV"#),
+        (r#"㍶"#, r#"㍶"#, r#"㍶"#, r#"pc"#, r#"pc"#),
+        (r#"㍷"#, r#"㍷"#, r#"㍷"#, r#"dm"#, r#"dm"#),
+        (r#"㍸"#, r#"㍸"#, r#"㍸"#, r#"dm2"#, r#"dm2"#),
+        (r#"㍹"#, r#"㍹"#, r#"㍹"#, r#"dm3"#, r#"dm3"#),
+        (r#"㍺"#, r#"㍺"#, r#"㍺"#, r#"IU"#, r#"IU"#),
+        (r#"㍻"#, r#"㍻"#, r#"㍻"#, r#"平成"#, r#"平成"#),
+        (r#"㍼"#, r#"㍼"#, r#"㍼"#, r#"昭和"#, r#"昭和"#),
+        (r#"㍽"#, r#"㍽"#, r#"㍽"#, r#"大正"#, r#"大正"#),
+        (r#"㍾"#, r#"㍾"#, r#"㍾"#, r#"明治"#, r#"明治"#),
+        (r#"㍿"#, r#"㍿"#, r#"㍿"#, r#"株式会社"#, r#"株式会社"#),
+        (r#"㎀"#, r#"㎀"#, r#"㎀"#, r#"pA"#, r#"pA"#),
+        (r#"㎁"#, r#"㎁"#, r#"㎁"#, r#"nA"#, r#"nA"#),
+        (r#"㎂"#, r#"㎂"#, r#"㎂"#, r#"μA"#, r#"μA"#),
+        (r#"㎃"#, r#"㎃"#, r#"㎃"#, r#"mA"#, r#"mA"#),
+        (r#"㎄"#, r#"㎄"#, r#"㎄"#, r#"kA"#, r#"kA"#),
+        (r#"㎅"#, r#"㎅"#, r#"㎅"#, r#"KB"#, r#"KB"#),
+        (r#"㎆"#, r#"㎆"#, r#"㎆"#, r#"MB"#, r#"MB"#),
+        (r#"㎇"#, r#"㎇"#, r#"㎇"#, r#"GB"#, r#"GB"#),
+        (r#"㎈"#, r#"㎈"#, r#"㎈"#, r#"cal"#, r#"cal"#),
+        (r#"㎉"#, r#"㎉"#, r#"㎉"#, r#"kcal"#, r#"kcal"#),
+        (r#"㎊"#, r#"㎊"#, r#"㎊"#, r#"pF"#, r#"pF"#),
+        (r#"㎋"#, r#"㎋"#, r#"㎋"#, r#"nF"#, r#"nF"#),
+        (r#"㎌"#, r#"㎌"#, r#"㎌"#, r#"μF"#, r#"μF"#),
+        (r#"㎍"#, r#"㎍"#, r#"㎍"#, r#"μg"#, r#"μg"#),
+        (r#"㎎"#, r#"㎎"#, r#"㎎"#, r#"mg"#, r#"mg"#),
+        (r#"㎏"#, r#"㎏"#, r#"㎏"#, r#"kg"#, r#"kg"#),
+        (r#"㎐"#, r#"㎐"#, r#"㎐"#, r#"Hz"#, r#"Hz"#),
+        (r#"㎑"#, r#"㎑"#, r#"㎑"#, r#"kHz"#, r#"kHz"#),
+        (r#"㎒"#, r#"㎒"#, r#"㎒"#, r#"MHz"#, r#"MHz"#),
+        (r#"㎓"#, r#"㎓"#, r#"㎓"#, r#"GHz"#, r#"GHz"#),
+        (r#"㎔"#, r#"㎔"#, r#"㎔"#, r#"THz"#, r#"THz"#),
+        (r#"㎕"#, r#"㎕"#, r#"㎕"#, r#"μl"#, r#"μl"#),
+        (r#"㎖"#, r#"㎖"#, r#"㎖"#, r#"ml"#, r#"ml"#),
+        (r#"㎗"#, r#"㎗"#, r#"㎗"#, r#"dl"#, r#"dl"#),
+        (r#"㎘"#, r#"㎘"#, r#"㎘"#, r#"kl"#, r#"kl"#),
+        (r#"㎙"#, r#"㎙"#, r#"㎙"#, r#"fm"#, r#"fm"#),
+        (r#"㎚"#, r#"㎚"#, r#"㎚"#, r#"nm"#, r#"nm"#),
+        (r#"㎛"#, r#"㎛"#, r#"㎛"#, r#"μm"#, r#"μm"#),
+        (r#"㎜"#, r#"㎜"#, r#"㎜"#, r#"mm"#, r#"mm"#),
+        (r#"㎝"#, r#"㎝"#, r#"㎝"#, r#"cm"#, r#"cm"#),
+        (r#"㎞"#, r#"㎞"#, r#"㎞"#, r#"km"#, r#"km"#),
+        (r#"㎟"#, r#"㎟"#, r#"㎟"#, r#"mm2"#, r#"mm2"#),
+        (r#"㎠"#, r#"㎠"#, r#"㎠"#, r#"cm2"#, r#"cm2"#),
+        (r#"㎡"#, r#"㎡"#, r#"㎡"#, r#"m2"#, r#"m2"#),
+        (r#"㎢"#, r#"㎢"#, r#"㎢"#, r#"km2"#, r#"km2"#),
+        (r#"㎣"#, r#"㎣"#, r#"㎣"#, r#"mm3"#, r#"mm3"#),
+        (r#"㎤"#, r#"㎤"#, r#"㎤"#, r#"cm3"#, r#"cm3"#),
+        (r#"㎥"#, r#"㎥"#, r#"㎥"#, r#"m3"#, r#"m3"#),
+        (r#"㎦"#, r#"㎦"#, r#"㎦"#, r#"km3"#, r#"km3"#),
+        (r#"㎧"#, r#"㎧"#, r#"㎧"#, r#"m∕s"#, r#"m∕s"#),
+        (r#"㎨"#, r#"㎨"#, r#"㎨"#, r#"m∕s2"#, r#"m∕s2"#),
+        (r#"㎩"#, r#"㎩"#, r#"㎩"#, r#"Pa"#, r#"Pa"#),
+        (r#"㎪"#, r#"㎪"#, r#"㎪"#, r#"kPa"#, r#"kPa"#),
+        (r#"㎫"#, r#"㎫"#, r#"㎫"#, r#"MPa"#, r#"MPa"#),
+        (r#"㎬"#, r#"㎬"#, r#"㎬"#, r#"GPa"#, r#"GPa"#),
+        (r#"㎭"#, r#"㎭"#, r#"㎭"#, r#"rad"#, r#"rad"#),
+        (r#"㎮"#, r#"㎮"#, r#"㎮"#, r#"rad∕s"#, r#"rad∕s"#),
+        (r#"㎯"#, r#"㎯"#, r#"㎯"#, r#"rad∕s2"#, r#"rad∕s2"#),
+        (r#"㎰"#, r#"㎰"#, r#"㎰"#, r#"ps"#, r#"ps"#),
+        (r#"㎱"#, r#"㎱"#, r#"㎱"#, r#"ns"#, r#"ns"#),
+        (r#"㎲"#, r#"㎲"#, r#"㎲"#, r#"μs"#, r#"μs"#),
+        (r#"㎳"#, r#"㎳"#, r#"㎳"#, r#"ms"#, r#"ms"#),
+        (r#"㎴"#, r#"㎴"#, r#"㎴"#, r#"pV"#, r#"pV"#),
+        (r#"㎵"#, r#"㎵"#, r#"㎵"#, r#"nV"#, r#"nV"#),
+        (r#"㎶"#, r#"㎶"#, r#"㎶"#, r#"μV"#, r#"μV"#),
+        (r#"㎷"#, r#"㎷"#, r#"㎷"#, r#"mV"#, r#"mV"#),
+        (r#"㎸"#, r#"㎸"#, r#"㎸"#, r#"kV"#, r#"kV"#),
+        (r#"㎹"#, r#"㎹"#, r#"㎹"#, r#"MV"#, r#"MV"#),
+        (r#"㎺"#, r#"㎺"#, r#"㎺"#, r#"pW"#, r#"pW"#),
+        (r#"㎻"#, r#"㎻"#, r#"㎻"#, r#"nW"#, r#"nW"#),
+        (r#"㎼"#, r#"㎼"#, r#"㎼"#, r#"μW"#, r#"μW"#),
+        (r#"㎽"#, r#"㎽"#, r#"㎽"#, r#"mW"#, r#"mW"#),
+        (r#"㎾"#, r#"㎾"#, r#"㎾"#, r#"kW"#, r#"kW"#),
+        (r#"㎿"#, r#"㎿"#, r#"㎿"#, r#"MW"#, r#"MW"#),
+        (r#"㏀"#, r#"㏀"#, r#"㏀"#, r#"kΩ"#, r#"kΩ"#),
+        (r#"㏁"#, r#"㏁"#, r#"㏁"#, r#"MΩ"#, r#"MΩ"#),
+        (r#"㏂"#, r#"㏂"#, r#"㏂"#, r#"a.m."#, r#"a.m."#),
+        (r#"㏃"#, r#"㏃"#, r#"㏃"#, r#"Bq"#, r#"Bq"#),
+        (r#"㏄"#, r#"㏄"#, r#"㏄"#, r#"cc"#, r#"cc"#),
+        (r#"㏅"#, r#"㏅"#, r#"㏅"#, r#"cd"#, r#"cd"#),
+        (r#"㏆"#, r#"㏆"#, r#"㏆"#, r#"C∕kg"#, r#"C∕kg"#),
+        (r#"㏇"#, r#"㏇"#, r#"㏇"#, r#"Co."#, r#"Co."#),
+        (r#"㏈"#, r#"㏈"#, r#"㏈"#, r#"dB"#, r#"dB"#),
+        (r#"㏉"#, r#"㏉"#, r#"㏉"#, r#"Gy"#, r#"Gy"#),
+        (r#"㏊"#, r#"㏊"#, r#"㏊"#, r#"ha"#, r#"ha"#),
+        (r#"㏋"#, r#"㏋"#, r#"㏋"#, r#"HP"#, r#"HP"#),
+        (r#"㏌"#, r#"㏌"#, r#"㏌"#, r#"in"#, r#"in"#),
+        (r#"㏍"#, r#"㏍"#, r#"㏍"#, r#"KK"#, r#"KK"#),
+        (r#"㏎"#, r#"㏎"#, r#"㏎"#, r#"KM"#, r#"KM"#),
+        (r#"㏏"#, r#"㏏"#, r#"㏏"#, r#"kt"#, r#"kt"#),
+        (r#"㏐"#, r#"㏐"#, r#"㏐"#, r#"lm"#, r#"lm"#),
+        (r#"㏑"#, r#"㏑"#, r#"㏑"#, r#"ln"#, r#"ln"#),
+        (r#"㏒"#, r#"㏒"#, r#"㏒"#, r#"log"#, r#"log"#),
+        (r#"㏓"#, r#"㏓"#, r#"㏓"#, r#"lx"#, r#"lx"#),
+        (r#"㏔"#, r#"㏔"#, r#"㏔"#, r#"mb"#, r#"mb"#),
+        (r#"㏕"#, r#"㏕"#, r#"㏕"#, r#"mil"#, r#"mil"#),
+        (r#"㏖"#, r#"㏖"#, r#"㏖"#, r#"mol"#, r#"mol"#),
+        (r#"㏗"#, r#"㏗"#, r#"㏗"#, r#"PH"#, r#"PH"#),
+        (r#"㏘"#, r#"㏘"#, r#"㏘"#, r#"p.m."#, r#"p.m."#),
+        (r#"㏙"#, r#"㏙"#, r#"㏙"#, r#"PPM"#, r#"PPM"#),
+        (r#"㏚"#, r#"㏚"#, r#"㏚"#, r#"PR"#, r#"PR"#),
+        (r#"㏛"#, r#"㏛"#, r#"㏛"#, r#"sr"#, r#"sr"#),
+        (r#"㏜"#, r#"㏜"#, r#"㏜"#, r#"Sv"#, r#"Sv"#),
+        (r#"㏝"#, r#"㏝"#, r#"㏝"#, r#"Wb"#, r#"Wb"#),
+        (r#"㏞"#, r#"㏞"#, r#"㏞"#, r#"V∕m"#, r#"V∕m"#),
+        (r#"㏟"#, r#"㏟"#, r#"㏟"#, r#"A∕m"#, r#"A∕m"#),
+        (r#"㏠"#, r#"㏠"#, r#"㏠"#, r#"1日"#, r#"1日"#),
+        (r#"㏡"#, r#"㏡"#, r#"㏡"#, r#"2日"#, r#"2日"#),
+        (r#"㏢"#, r#"㏢"#, r#"㏢"#, r#"3日"#, r#"3日"#),
+        (r#"㏣"#, r#"㏣"#, r#"㏣"#, r#"4日"#, r#"4日"#),
+        (r#"㏤"#, r#"㏤"#, r#"㏤"#, r#"5日"#, r#"5日"#),
+        (r#"㏥"#, r#"㏥"#, r#"㏥"#, r#"6日"#, r#"6日"#),
+        (r#"㏦"#, r#"㏦"#, r#"㏦"#, r#"7日"#, r#"7日"#),
+        (r#"㏧"#, r#"㏧"#, r#"㏧"#, r#"8日"#, r#"8日"#),
+        (r#"㏨"#, r#"㏨"#, r#"㏨"#, r#"9日"#, r#"9日"#),
+        (r#"㏩"#, r#"㏩"#, r#"㏩"#, r#"10日"#, r#"10日"#),
+        (r#"㏪"#, r#"㏪"#, r#"㏪"#, r#"11日"#, r#"11日"#),
+        (r#"㏫"#, r#"㏫"#, r#"㏫"#, r#"12日"#, r#"12日"#),
+        (r#"㏬"#, r#"㏬"#, r#"㏬"#, r#"13日"#, r#"13日"#),
+        (r#"㏭"#, r#"㏭"#, r#"㏭"#, r#"14日"#, r#"14日"#),
+        (r#"㏮"#, r#"㏮"#, r#"㏮"#, r#"15日"#, r#"15日"#),
+        (r#"㏯"#, r#"㏯"#, r#"㏯"#, r#"16日"#, r#"16日"#),
+        (r#"㏰"#, r#"㏰"#, r#"㏰"#, r#"17日"#, r#"17日"#),
+        (r#"㏱"#, r#"㏱"#, r#"㏱"#, r#"18日"#, r#"18日"#),
+        (r#"㏲"#, r#"㏲"#, r#"㏲"#, r#"19日"#, r#"19日"#),
+        (r#"㏳"#, r#"㏳"#, r#"㏳"#, r#"20日"#, r#"20日"#),
+        (r#"㏴"#, r#"㏴"#, r#"㏴"#, r#"21日"#, r#"21日"#),
+        (r#"㏵"#, r#"㏵"#, r#"㏵"#, r#"22日"#, r#"22日"#),
+        (r#"㏶"#, r#"㏶"#, r#"㏶"#, r#"23日"#, r#"23日"#),
+        (r#"㏷"#, r#"㏷"#, r#"㏷"#, r#"24日"#, r#"24日"#),
+        (r#"㏸"#, r#"㏸"#, r#"㏸"#, r#"25日"#, r#"25日"#),
+        (r#"㏹"#, r#"㏹"#, r#"㏹"#, r#"26日"#, r#"26日"#),
+        (r#"㏺"#, r#"㏺"#, r#"㏺"#, r#"27日"#, r#"27日"#),
+        (r#"㏻"#, r#"㏻"#, r#"㏻"#, r#"28日"#, r#"28日"#),
+        (r#"㏼"#, r#"㏼"#, r#"㏼"#, r#"29日"#, r#"29日"#),
+        (r#"㏽"#, r#"㏽"#, r#"㏽"#, r#"30日"#, r#"30日"#),
+        (r#"㏾"#, r#"㏾"#, r#"㏾"#, r#"31日"#, r#"31日"#),
+        (r#"㏿"#, r#"㏿"#, r#"㏿"#, r#"gal"#, r#"gal"#),
+        (r#"ꚜ"#, r#"ꚜ"#, r#"ꚜ"#, r#"ъ"#, r#"ъ"#),
+        (r#"ꚝ"#, r#"ꚝ"#, r#"ꚝ"#, r#"ь"#, r#"ь"#),
+        (r#"ꝰ"#, r#"ꝰ"#, r#"ꝰ"#, r#"ꝯ"#, r#"ꝯ"#),
+        (r#"ꟲ"#, r#"ꟲ"#, r#"ꟲ"#, r#"C"#, r#"C"#),
+        (r#"ꟳ"#, r#"ꟳ"#, r#"ꟳ"#, r#"F"#, r#"F"#),
+        (r#"ꟴ"#, r#"ꟴ"#, r#"ꟴ"#, r#"Q"#, r#"Q"#),
+        (r#"ꟸ"#, r#"ꟸ"#, r#"ꟸ"#, r#"Ħ"#, r#"Ħ"#),
+        (r#"ꟹ"#, r#"ꟹ"#, r#"ꟹ"#, r#"œ"#, r#"œ"#),
+        (r#"ꭜ"#, r#"ꭜ"#, r#"ꭜ"#, r#"ꜧ"#, r#"ꜧ"#),
+        (r#"ꭝ"#, r#"ꭝ"#, r#"ꭝ"#, r#"ꬷ"#, r#"ꬷ"#),
+        (r#"ꭞ"#, r#"ꭞ"#, r#"ꭞ"#, r#"ɫ"#, r#"ɫ"#),
+        (r#"ꭟ"#, r#"ꭟ"#, r#"ꭟ"#, r#"ꭒ"#, r#"ꭒ"#),
+        (r#"ꭩ"#, r#"ꭩ"#, r#"ꭩ"#, r#"ʍ"#, r#"ʍ"#),
+        (r#"가"#, r#"가"#, r#"가"#, r#"가"#, r#"가"#),
+        (r#"각"#, r#"각"#, r#"각"#, r#"각"#, r#"각"#),
+        (r#"갂"#, r#"갂"#, r#"갂"#, r#"갂"#, r#"갂"#),
+        (r#"갃"#, r#"갃"#, r#"갃"#, r#"갃"#, r#"갃"#),
+        (r#"간"#, r#"간"#, r#"간"#, r#"간"#, r#"간"#),
+        (r#"갅"#, r#"갅"#, r#"갅"#, r#"갅"#, r#"갅"#),
+        (r#"갆"#, r#"갆"#, r#"갆"#, r#"갆"#, r#"갆"#),
+        (r#"갇"#, r#"갇"#, r#"갇"#, r#"갇"#, r#"갇"#),
+        (r#"갈"#, r#"갈"#, r#"갈"#, r#"갈"#, r#"갈"#),
+        (r#"갉"#, r#"갉"#, r#"갉"#, r#"갉"#, r#"갉"#),
+        (r#"갊"#, r#"갊"#, r#"갊"#, r#"갊"#, r#"갊"#),
+        (r#"갋"#, r#"갋"#, r#"갋"#, r#"갋"#, r#"갋"#),
+        (r#"갌"#, r#"갌"#, r#"갌"#, r#"갌"#, r#"갌"#),
+        (r#"갍"#, r#"갍"#, r#"갍"#, r#"갍"#, r#"갍"#),
+        (r#"갎"#, r#"갎"#, r#"갎"#, r#"갎"#, r#"갎"#),
+        (r#"갏"#, r#"갏"#, r#"갏"#, r#"갏"#, r#"갏"#),
+        (r#"감"#, r#"감"#, r#"감"#, r#"감"#, r#"감"#),
+        (r#"갑"#, r#"갑"#, r#"갑"#, r#"갑"#, r#"갑"#),
+        (r#"값"#, r#"값"#, r#"값"#, r#"값"#, r#"값"#),
+        (r#"갓"#, r#"갓"#, r#"갓"#, r#"갓"#, r#"갓"#),
+        (r#"갔"#, r#"갔"#, r#"갔"#, r#"갔"#, r#"갔"#),
+        (r#"강"#, r#"강"#, r#"강"#, r#"강"#, r#"강"#),
+        (r#"갖"#, r#"갖"#, r#"갖"#, r#"갖"#, r#"갖"#),
+        (r#"갗"#, r#"갗"#, r#"갗"#, r#"갗"#, r#"갗"#),
+        (r#"갘"#, r#"갘"#, r#"갘"#, r#"갘"#, r#"갘"#),
+        (r#"같"#, r#"같"#, r#"같"#, r#"같"#, r#"같"#),
+        (r#"갚"#, r#"갚"#, r#"갚"#, r#"갚"#, r#"갚"#),
+        (r#"갛"#, r#"갛"#, r#"갛"#, r#"갛"#, r#"갛"#),
+        (r#"개"#, r#"개"#, r#"개"#, r#"개"#, r#"개"#),
+        (r#"객"#, r#"객"#, r#"객"#, r#"객"#, r#"객"#),
+        (r#"갞"#, r#"갞"#, r#"갞"#, r#"갞"#, r#"갞"#),
+        (r#"갟"#, r#"갟"#, r#"갟"#, r#"갟"#, r#"갟"#),
+        (r#"갠"#, r#"갠"#, r#"갠"#, r#"갠"#, r#"갠"#),
+        (r#"갡"#, r#"갡"#, r#"갡"#, r#"갡"#, r#"갡"#),
+        (r#"갢"#, r#"갢"#, r#"갢"#, r#"갢"#, r#"갢"#),
+        (r#"갣"#, r#"갣"#, r#"갣"#, r#"갣"#, r#"갣"#),
+        (r#"갤"#, r#"갤"#, r#"갤"#, r#"갤"#, r#"갤"#),
+        (r#"갥"#, r#"갥"#, r#"갥"#, r#"갥"#, r#"갥"#),
+        (r#"갦"#, r#"갦"#, r#"갦"#, r#"갦"#, r#"갦"#),
+        (r#"갧"#, r#"갧"#, r#"갧"#, r#"갧"#, r#"갧"#),
+        (r#"갨"#, r#"갨"#, r#"갨"#, r#"갨"#, r#"갨"#),
+        (r#"갩"#, r#"갩"#, r#"갩"#, r#"갩"#, r#"갩"#),
+        (r#"갪"#, r#"갪"#, r#"갪"#, r#"갪"#, r#"갪"#),
+        (r#"갫"#, r#"갫"#, r#"갫"#, r#"갫"#, r#"갫"#),
+        (r#"갬"#, r#"갬"#, r#"갬"#, r#"갬"#, r#"갬"#),
+        (r#"갭"#, r#"갭"#, r#"갭"#, r#"갭"#, r#"갭"#),
+        (r#"갮"#, r#"갮"#, r#"갮"#, r#"갮"#, r#"갮"#),
+        (r#"갯"#, r#"갯"#, r#"갯"#, r#"갯"#, r#"갯"#),
+        (r#"갰"#, r#"갰"#, r#"갰"#, r#"갰"#, r#"갰"#),
+        (r#"갱"#, r#"갱"#, r#"갱"#, r#"갱"#, r#"갱"#),
+        (r#"갲"#, r#"갲"#, r#"갲"#, r#"갲"#, r#"갲"#),
+        (r#"갳"#, r#"갳"#, r#"갳"#, r#"갳"#, r#"갳"#),
+        (r#"갴"#, r#"갴"#, r#"갴"#, r#"갴"#, r#"갴"#),
+        (r#"갵"#, r#"갵"#, r#"갵"#, r#"갵"#, r#"갵"#),
+        (r#"갶"#, r#"갶"#, r#"갶"#, r#"갶"#, r#"갶"#),
+        (r#"갷"#, r#"갷"#, r#"갷"#, r#"갷"#, r#"갷"#),
+        (r#"갸"#, r#"갸"#, r#"갸"#, r#"갸"#, r#"갸"#),
+        (r#"갹"#, r#"갹"#, r#"갹"#, r#"갹"#, r#"갹"#),
+        (r#"갺"#, r#"갺"#, r#"갺"#, r#"갺"#, r#"갺"#),
+        (r#"갻"#, r#"갻"#, r#"갻"#, r#"갻"#, r#"갻"#),
+        (r#"갼"#, r#"갼"#, r#"갼"#, r#"갼"#, r#"갼"#),
+        (r#"갽"#, r#"갽"#, r#"갽"#, r#"갽"#, r#"갽"#),
+        (r#"갾"#, r#"갾"#, r#"갾"#, r#"갾"#, r#"갾"#),
+        (r#"갿"#, r#"갿"#, r#"갿"#, r#"갿"#, r#"갿"#),
+        (r#"걀"#, r#"걀"#, r#"걀"#, r#"걀"#, r#"걀"#),
+        (r#"걁"#, r#"걁"#, r#"걁"#, r#"걁"#, r#"걁"#),
+        (r#"걂"#, r#"걂"#, r#"걂"#, r#"걂"#, r#"걂"#),
+        (r#"걃"#, r#"걃"#, r#"걃"#, r#"걃"#, r#"걃"#),
+        (r#"걄"#, r#"걄"#, r#"걄"#, r#"걄"#, r#"걄"#),
+        (r#"걅"#, r#"걅"#, r#"걅"#, r#"걅"#, r#"걅"#),
+        (r#"걆"#, r#"걆"#, r#"걆"#, r#"걆"#, r#"걆"#),
+        (r#"걇"#, r#"걇"#, r#"걇"#, r#"걇"#, r#"걇"#),
+        (r#"걈"#, r#"걈"#, r#"걈"#, r#"걈"#, r#"걈"#),
+        (r#"걉"#, r#"걉"#, r#"걉"#, r#"걉"#, r#"걉"#),
+        (r#"걊"#, r#"걊"#, r#"걊"#, r#"걊"#, r#"걊"#),
+        (r#"걋"#, r#"걋"#, r#"걋"#, r#"걋"#, r#"걋"#),
+        (r#"걌"#, r#"걌"#, r#"걌"#, r#"걌"#, r#"걌"#),
+        (r#"걍"#, r#"걍"#, r#"걍"#, r#"걍"#, r#"걍"#),
+        (r#"걎"#, r#"걎"#, r#"걎"#, r#"걎"#, r#"걎"#),
+        (r#"걏"#, r#"걏"#, r#"걏"#, r#"걏"#, r#"걏"#),
+        (r#"걐"#, r#"걐"#, r#"걐"#, r#"걐"#, r#"걐"#),
+        (r#"걑"#, r#"걑"#, r#"걑"#, r#"걑"#, r#"걑"#),
+        (r#"걒"#, r#"걒"#, r#"걒"#, r#"걒"#, r#"걒"#),
+        (r#"걓"#, r#"걓"#, r#"걓"#, r#"걓"#, r#"걓"#),
+        (r#"걔"#, r#"걔"#, r#"걔"#, r#"걔"#, r#"걔"#),
+        (r#"걕"#, r#"걕"#, r#"걕"#, r#"걕"#, r#"걕"#),
+        (r#"걖"#, r#"걖"#, r#"걖"#, r#"걖"#, r#"걖"#),
+        (r#"걗"#, r#"걗"#, r#"걗"#, r#"걗"#, r#"걗"#),
+        (r#"걘"#, r#"걘"#, r#"걘"#, r#"걘"#, r#"걘"#),
+        (r#"걙"#, r#"걙"#, r#"걙"#, r#"걙"#, r#"걙"#),
+        (r#"걚"#, r#"걚"#, r#"걚"#, r#"걚"#, r#"걚"#),
+        (r#"걛"#, r#"걛"#, r#"걛"#, r#"걛"#, r#"걛"#),
+        (r#"걜"#, r#"걜"#, r#"걜"#, r#"걜"#, r#"걜"#),
+        (r#"걝"#, r#"걝"#, r#"걝"#, r#"걝"#, r#"걝"#),
+        (r#"걞"#, r#"걞"#, r#"걞"#, r#"걞"#, r#"걞"#),
+        (r#"걟"#, r#"걟"#, r#"걟"#, r#"걟"#, r#"걟"#),
+        (r#"걠"#, r#"걠"#, r#"걠"#, r#"걠"#, r#"걠"#),
+        (r#"걡"#, r#"걡"#, r#"걡"#, r#"걡"#, r#"걡"#),
+        (r#"걢"#, r#"걢"#, r#"걢"#, r#"걢"#, r#"걢"#),
+        (r#"걣"#, r#"걣"#, r#"걣"#, r#"걣"#, r#"걣"#),
+        (r#"걤"#, r#"걤"#, r#"걤"#, r#"걤"#, r#"걤"#),
+        (r#"걥"#, r#"걥"#, r#"걥"#, r#"걥"#, r#"걥"#),
+        (r#"걦"#, r#"걦"#, r#"걦"#, r#"걦"#, r#"걦"#),
+        (r#"걧"#, r#"걧"#, r#"걧"#, r#"걧"#, r#"걧"#),
+        (r#"걨"#, r#"걨"#, r#"걨"#, r#"걨"#, r#"걨"#),
+        (r#"걩"#, r#"걩"#, r#"걩"#, r#"걩"#, r#"걩"#),
+        (r#"걪"#, r#"걪"#, r#"걪"#, r#"걪"#, r#"걪"#),
+        (r#"걫"#, r#"걫"#, r#"걫"#, r#"걫"#, r#"걫"#),
+        (r#"걬"#, r#"걬"#, r#"걬"#, r#"걬"#, r#"걬"#),
+        (r#"걭"#, r#"걭"#, r#"걭"#, r#"걭"#, r#"걭"#),
+        (r#"걮"#, r#"걮"#, r#"걮"#, r#"걮"#, r#"걮"#),
+        (r#"걯"#, r#"걯"#, r#"걯"#, r#"걯"#, r#"걯"#),
+        (r#"거"#, r#"거"#, r#"거"#, r#"거"#, r#"거"#),
+        (r#"걱"#, r#"걱"#, r#"걱"#, r#"걱"#, r#"걱"#),
+        (r#"걲"#, r#"걲"#, r#"걲"#, r#"걲"#, r#"걲"#),
+        (r#"걳"#, r#"걳"#, r#"걳"#, r#"걳"#, r#"걳"#),
+        (r#"건"#, r#"건"#, r#"건"#, r#"건"#, r#"건"#),
+        (r#"걵"#, r#"걵"#, r#"걵"#, r#"걵"#, r#"걵"#),
+        (r#"걶"#, r#"걶"#, r#"걶"#, r#"걶"#, r#"걶"#),
+        (r#"걷"#, r#"걷"#, r#"걷"#, r#"걷"#, r#"걷"#),
+        (r#"걸"#, r#"걸"#, r#"걸"#, r#"걸"#, r#"걸"#),
+        (r#"걹"#, r#"걹"#, r#"걹"#, r#"걹"#, r#"걹"#),
+        (r#"걺"#, r#"걺"#, r#"걺"#, r#"걺"#, r#"걺"#),
+        (r#"걻"#, r#"걻"#, r#"걻"#, r#"걻"#, r#"걻"#),
+        (r#"걼"#, r#"걼"#, r#"걼"#, r#"걼"#, r#"걼"#),
+        (r#"걽"#, r#"걽"#, r#"걽"#, r#"걽"#, r#"걽"#),
+        (r#"걾"#, r#"걾"#, r#"걾"#, r#"걾"#, r#"걾"#),
+        (r#"걿"#, r#"걿"#, r#"걿"#, r#"걿"#, r#"걿"#),
+        (r#"검"#, r#"검"#, r#"검"#, r#"검"#, r#"검"#),
+        (r#"겁"#, r#"겁"#, r#"겁"#, r#"겁"#, r#"겁"#),
+        (r#"겂"#, r#"겂"#, r#"겂"#, r#"겂"#, r#"겂"#),
+        (r#"것"#, r#"것"#, r#"것"#, r#"것"#, r#"것"#),
+        (r#"겄"#, r#"겄"#, r#"겄"#, r#"겄"#, r#"겄"#),
+        (r#"겅"#, r#"겅"#, r#"겅"#, r#"겅"#, r#"겅"#),
+        (r#"겆"#, r#"겆"#, r#"겆"#, r#"겆"#, r#"겆"#),
+        (r#"겇"#, r#"겇"#, r#"겇"#, r#"겇"#, r#"겇"#),
+        (r#"겈"#, r#"겈"#, r#"겈"#, r#"겈"#, r#"겈"#),
+        (r#"겉"#, r#"겉"#, r#"겉"#, r#"겉"#, r#"겉"#),
+        (r#"겊"#, r#"겊"#, r#"겊"#, r#"겊"#, r#"겊"#),
+        (r#"겋"#, r#"겋"#, r#"겋"#, r#"겋"#, r#"겋"#),
+        (r#"게"#, r#"게"#, r#"게"#, r#"게"#, r#"게"#),
+        (r#"겍"#, r#"겍"#, r#"겍"#, r#"겍"#, r#"겍"#),
+        (r#"겎"#, r#"겎"#, r#"겎"#, r#"겎"#, r#"겎"#),
+        (r#"겏"#, r#"겏"#, r#"겏"#, r#"겏"#, r#"겏"#),
+        (r#"겐"#, r#"겐"#, r#"겐"#, r#"겐"#, r#"겐"#),
+        (r#"겑"#, r#"겑"#, r#"겑"#, r#"겑"#, r#"겑"#),
+        (r#"겒"#, r#"겒"#, r#"겒"#, r#"겒"#, r#"겒"#),
+        (r#"겓"#, r#"겓"#, r#"겓"#, r#"겓"#, r#"겓"#),
+        (r#"겔"#, r#"겔"#, r#"겔"#, r#"겔"#, r#"겔"#),
+        (r#"겕"#, r#"겕"#, r#"겕"#, r#"겕"#, r#"겕"#),
+        (r#"겖"#, r#"겖"#, r#"겖"#, r#"겖"#, r#"겖"#),
+        (r#"겗"#, r#"겗"#, r#"겗"#, r#"겗"#, r#"겗"#),
+        (r#"겘"#, r#"겘"#, r#"겘"#, r#"겘"#, r#"겘"#),
+        (r#"겙"#, r#"겙"#, r#"겙"#, r#"겙"#, r#"겙"#),
+        (r#"겚"#, r#"겚"#, r#"겚"#, r#"겚"#, r#"겚"#),
+        (r#"겛"#, r#"겛"#, r#"겛"#, r#"겛"#, r#"겛"#),
+        (r#"겜"#, r#"겜"#, r#"겜"#, r#"겜"#, r#"겜"#),
+        (r#"겝"#, r#"겝"#, r#"겝"#, r#"겝"#, r#"겝"#),
+        (r#"겞"#, r#"겞"#, r#"겞"#, r#"겞"#, r#"겞"#),
+        (r#"겟"#, r#"겟"#, r#"겟"#, r#"겟"#, r#"겟"#),
+        (r#"겠"#, r#"겠"#, r#"겠"#, r#"겠"#, r#"겠"#),
+        (r#"겡"#, r#"겡"#, r#"겡"#, r#"겡"#, r#"겡"#),
+        (r#"겢"#, r#"겢"#, r#"겢"#, r#"겢"#, r#"겢"#),
+        (r#"겣"#, r#"겣"#, r#"겣"#, r#"겣"#, r#"겣"#),
+        (r#"겤"#, r#"겤"#, r#"겤"#, r#"겤"#, r#"겤"#),
+        (r#"겥"#, r#"겥"#, r#"겥"#, r#"겥"#, r#"겥"#),
+        (r#"겦"#, r#"겦"#, r#"겦"#, r#"겦"#, r#"겦"#),
+        (r#"겧"#, r#"겧"#, r#"겧"#, r#"겧"#, r#"겧"#),
+        (r#"겨"#, r#"겨"#, r#"겨"#, r#"겨"#, r#"겨"#),
+        (r#"격"#, r#"격"#, r#"격"#, r#"격"#, r#"격"#),
+        (r#"겪"#, r#"겪"#, r#"겪"#, r#"겪"#, r#"겪"#),
+        (r#"겫"#, r#"겫"#, r#"겫"#, r#"겫"#, r#"겫"#),
+        (r#"견"#, r#"견"#, r#"견"#, r#"견"#, r#"견"#),
+        (r#"겭"#, r#"겭"#, r#"겭"#, r#"겭"#, r#"겭"#),
+        (r#"겮"#, r#"겮"#, r#"겮"#, r#"겮"#, r#"겮"#),
+        (r#"겯"#, r#"겯"#, r#"겯"#, r#"겯"#, r#"겯"#),
+        (r#"결"#, r#"결"#, r#"결"#, r#"결"#, r#"결"#),
+        (r#"겱"#, r#"겱"#, r#"겱"#, r#"겱"#, r#"겱"#),
+        (r#"겲"#, r#"겲"#, r#"겲"#, r#"겲"#, r#"겲"#),
+        (r#"겳"#, r#"겳"#, r#"겳"#, r#"겳"#, r#"겳"#),
+        (r#"겴"#, r#"겴"#, r#"겴"#, r#"겴"#, r#"겴"#),
+        (r#"겵"#, r#"겵"#, r#"겵"#, r#"겵"#, r#"겵"#),
+        (r#"겶"#, r#"겶"#, r#"겶"#, r#"겶"#, r#"겶"#),
+        (r#"겷"#, r#"겷"#, r#"겷"#, r#"겷"#, r#"겷"#),
+        (r#"겸"#, r#"겸"#, r#"겸"#, r#"겸"#, r#"겸"#),
+        (r#"겹"#, r#"겹"#, r#"겹"#, r#"겹"#, r#"겹"#),
+        (r#"겺"#, r#"겺"#, r#"겺"#, r#"겺"#, r#"겺"#),
+        (r#"겻"#, r#"겻"#, r#"겻"#, r#"겻"#, r#"겻"#),
+        (r#"겼"#, r#"겼"#, r#"겼"#, r#"겼"#, r#"겼"#),
+        (r#"경"#, r#"경"#, r#"경"#, r#"경"#, r#"경"#),
+        (r#"겾"#, r#"겾"#, r#"겾"#, r#"겾"#, r#"겾"#),
+        (r#"겿"#, r#"겿"#, r#"겿"#, r#"겿"#, r#"겿"#),
+        (r#"곀"#, r#"곀"#, r#"곀"#, r#"곀"#, r#"곀"#),
+        (r#"곁"#, r#"곁"#, r#"곁"#, r#"곁"#, r#"곁"#),
+        (r#"곂"#, r#"곂"#, r#"곂"#, r#"곂"#, r#"곂"#),
+        (r#"곃"#, r#"곃"#, r#"곃"#, r#"곃"#, r#"곃"#),
+        (r#"계"#, r#"계"#, r#"계"#, r#"계"#, r#"계"#),
+        (r#"곅"#, r#"곅"#, r#"곅"#, r#"곅"#, r#"곅"#),
+        (r#"곆"#, r#"곆"#, r#"곆"#, r#"곆"#, r#"곆"#),
+        (r#"곇"#, r#"곇"#, r#"곇"#, r#"곇"#, r#"곇"#),
+        (r#"곈"#, r#"곈"#, r#"곈"#, r#"곈"#, r#"곈"#),
+        (r#"곉"#, r#"곉"#, r#"곉"#, r#"곉"#, r#"곉"#),
+        (r#"곊"#, r#"곊"#, r#"곊"#, r#"곊"#, r#"곊"#),
+        (r#"곋"#, r#"곋"#, r#"곋"#, r#"곋"#, r#"곋"#),
+        (r#"곌"#, r#"곌"#, r#"곌"#, r#"곌"#, r#"곌"#),
+        (r#"곍"#, r#"곍"#, r#"곍"#, r#"곍"#, r#"곍"#),
+        (r#"곎"#, r#"곎"#, r#"곎"#, r#"곎"#, r#"곎"#),
+        (r#"곏"#, r#"곏"#, r#"곏"#, r#"곏"#, r#"곏"#),
+        (r#"곐"#, r#"곐"#, r#"곐"#, r#"곐"#, r#"곐"#),
+        (r#"곑"#, r#"곑"#, r#"곑"#, r#"곑"#, r#"곑"#),
+        (r#"곒"#, r#"곒"#, r#"곒"#, r#"곒"#, r#"곒"#),
+        (r#"곓"#, r#"곓"#, r#"곓"#, r#"곓"#, r#"곓"#),
+        (r#"곔"#, r#"곔"#, r#"곔"#, r#"곔"#, r#"곔"#),
+        (r#"곕"#, r#"곕"#, r#"곕"#, r#"곕"#, r#"곕"#),
+        (r#"곖"#, r#"곖"#, r#"곖"#, r#"곖"#, r#"곖"#),
+        (r#"곗"#, r#"곗"#, r#"곗"#, r#"곗"#, r#"곗"#),
+        (r#"곘"#, r#"곘"#, r#"곘"#, r#"곘"#, r#"곘"#),
+        (r#"곙"#, r#"곙"#, r#"곙"#, r#"곙"#, r#"곙"#),
+        (r#"곚"#, r#"곚"#, r#"곚"#, r#"곚"#, r#"곚"#),
+        (r#"곛"#, r#"곛"#, r#"곛"#, r#"곛"#, r#"곛"#),
+        (r#"곜"#, r#"곜"#, r#"곜"#, r#"곜"#, r#"곜"#),
+        (r#"곝"#, r#"곝"#, r#"곝"#, r#"곝"#, r#"곝"#),
+        (r#"곞"#, r#"곞"#, r#"곞"#, r#"곞"#, r#"곞"#),
+        (r#"곟"#, r#"곟"#, r#"곟"#, r#"곟"#, r#"곟"#),
+        (r#"고"#, r#"고"#, r#"고"#, r#"고"#, r#"고"#),
+        (r#"곡"#, r#"곡"#, r#"곡"#, r#"곡"#, r#"곡"#),
+        (r#"곢"#, r#"곢"#, r#"곢"#, r#"곢"#, r#"곢"#),
+        (r#"곣"#, r#"곣"#, r#"곣"#, r#"곣"#, r#"곣"#),
+        (r#"곤"#, r#"곤"#, r#"곤"#, r#"곤"#, r#"곤"#),
+        (r#"곥"#, r#"곥"#, r#"곥"#, r#"곥"#, r#"곥"#),
+        (r#"곦"#, r#"곦"#, r#"곦"#, r#"곦"#, r#"곦"#),
+        (r#"곧"#, r#"곧"#, r#"곧"#, r#"곧"#, r#"곧"#),
+        (r#"골"#, r#"골"#, r#"골"#, r#"골"#, r#"골"#),
+        (r#"곩"#, r#"곩"#, r#"곩"#, r#"곩"#, r#"곩"#),
+        (r#"곪"#, r#"곪"#, r#"곪"#, r#"곪"#, r#"곪"#),
+        (r#"곫"#, r#"곫"#, r#"곫"#, r#"곫"#, r#"곫"#),
+        (r#"곬"#, r#"곬"#, r#"곬"#, r#"곬"#, r#"곬"#),
+        (r#"곭"#, r#"곭"#, r#"곭"#, r#"곭"#, r#"곭"#),
+        (r#"곮"#, r#"곮"#, r#"곮"#, r#"곮"#, r#"곮"#),
+        (r#"곯"#, r#"곯"#, r#"곯"#, r#"곯"#, r#"곯"#),
+        (r#"곰"#, r#"곰"#, r#"곰"#, r#"곰"#, r#"곰"#),
+        (r#"곱"#, r#"곱"#, r#"곱"#, r#"곱"#, r#"곱"#),
+        (r#"곲"#, r#"곲"#, r#"곲"#, r#"곲"#, r#"곲"#),
+        (r#"곳"#, r#"곳"#, r#"곳"#, r#"곳"#, r#"곳"#),
+        (r#"곴"#, r#"곴"#, r#"곴"#, r#"곴"#, r#"곴"#),
+        (r#"공"#, r#"공"#, r#"공"#, r#"공"#, r#"공"#),
+        (r#"곶"#, r#"곶"#, r#"곶"#, r#"곶"#, r#"곶"#),
+        (r#"곷"#, r#"곷"#, r#"곷"#, r#"곷"#, r#"곷"#),
+        (r#"곸"#, r#"곸"#, r#"곸"#, r#"곸"#, r#"곸"#),
+        (r#"곹"#, r#"곹"#, r#"곹"#, r#"곹"#, r#"곹"#),
+        (r#"곺"#, r#"곺"#, r#"곺"#, r#"곺"#, r#"곺"#),
+        (r#"곻"#, r#"곻"#, r#"곻"#, r#"곻"#, r#"곻"#),
+        (r#"과"#, r#"과"#, r#"과"#, r#"과"#, r#"과"#),
+        (r#"곽"#, r#"곽"#, r#"곽"#, r#"곽"#, r#"곽"#),
+        (r#"곾"#, r#"곾"#, r#"곾"#, r#"곾"#, r#"곾"#),
+        (r#"곿"#, r#"곿"#, r#"곿"#, r#"곿"#, r#"곿"#),
+        (r#"관"#, r#"관"#, r#"관"#, r#"관"#, r#"관"#),
+        (r#"괁"#, r#"괁"#, r#"괁"#, r#"괁"#, r#"괁"#),
+        (r#"괂"#, r#"괂"#, r#"괂"#, r#"괂"#, r#"괂"#),
+        (r#"괃"#, r#"괃"#, r#"괃"#, r#"괃"#, r#"괃"#),
+        (r#"괄"#, r#"괄"#, r#"괄"#, r#"괄"#, r#"괄"#),
+        (r#"괅"#, r#"괅"#, r#"괅"#, r#"괅"#, r#"괅"#),
+        (r#"괆"#, r#"괆"#, r#"괆"#, r#"괆"#, r#"괆"#),
+        (r#"괇"#, r#"괇"#, r#"괇"#, r#"괇"#, r#"괇"#),
+        (r#"괈"#, r#"괈"#, r#"괈"#, r#"괈"#, r#"괈"#),
+        (r#"괉"#, r#"괉"#, r#"괉"#, r#"괉"#, r#"괉"#),
+        (r#"괊"#, r#"괊"#, r#"괊"#, r#"괊"#, r#"괊"#),
+        (r#"괋"#, r#"괋"#, r#"괋"#, r#"괋"#, r#"괋"#),
+        (r#"괌"#, r#"괌"#, r#"괌"#, r#"괌"#, r#"괌"#),
+        (r#"괍"#, r#"괍"#, r#"괍"#, r#"괍"#, r#"괍"#),
+        (r#"괎"#, r#"괎"#, r#"괎"#, r#"괎"#, r#"괎"#),
+        (r#"괏"#, r#"괏"#, r#"괏"#, r#"괏"#, r#"괏"#),
+        (r#"괐"#, r#"괐"#, r#"괐"#, r#"괐"#, r#"괐"#),
+        (r#"광"#, r#"광"#, r#"광"#, r#"광"#, r#"광"#),
+        (r#"괒"#, r#"괒"#, r#"괒"#, r#"괒"#, r#"괒"#),
+        (r#"괓"#, r#"괓"#, r#"괓"#, r#"괓"#, r#"괓"#),
+        (r#"괔"#, r#"괔"#, r#"괔"#, r#"괔"#, r#"괔"#),
+        (r#"괕"#, r#"괕"#, r#"괕"#, r#"괕"#, r#"괕"#),
+        (r#"괖"#, r#"괖"#, r#"괖"#, r#"괖"#, r#"괖"#),
+        (r#"괗"#, r#"괗"#, r#"괗"#, r#"괗"#, r#"괗"#),
+        (r#"괘"#, r#"괘"#, r#"괘"#, r#"괘"#, r#"괘"#),
+        (r#"괙"#, r#"괙"#, r#"괙"#, r#"괙"#, r#"괙"#),
+        (r#"괚"#, r#"괚"#, r#"괚"#, r#"괚"#, r#"괚"#),
+        (r#"괛"#, r#"괛"#, r#"괛"#, r#"괛"#, r#"괛"#),
+        (r#"괜"#, r#"괜"#, r#"괜"#, r#"괜"#, r#"괜"#),
+        (r#"괝"#, r#"괝"#, r#"괝"#, r#"괝"#, r#"괝"#),
+        (r#"괞"#, r#"괞"#, r#"괞"#, r#"괞"#, r#"괞"#),
+        (r#"괟"#, r#"괟"#, r#"괟"#, r#"괟"#, r#"괟"#),
+        (r#"괠"#, r#"괠"#, r#"괠"#, r#"괠"#, r#"괠"#),
+        (r#"괡"#, r#"괡"#, r#"괡"#, r#"괡"#, r#"괡"#),
+        (r#"괢"#, r#"괢"#, r#"괢"#, r#"괢"#, r#"괢"#),
+        (r#"괣"#, r#"괣"#, r#"괣"#, r#"괣"#, r#"괣"#),
+        (r#"괤"#, r#"괤"#, r#"괤"#, r#"괤"#, r#"괤"#),
+        (r#"괥"#, r#"괥"#, r#"괥"#, r#"괥"#, r#"괥"#),
+        (r#"괦"#, r#"괦"#, r#"괦"#, r#"괦"#, r#"괦"#),
+        (r#"괧"#, r#"괧"#, r#"괧"#, r#"괧"#, r#"괧"#),
+        (r#"괨"#, r#"괨"#, r#"괨"#, r#"괨"#, r#"괨"#),
+        (r#"괩"#, r#"괩"#, r#"괩"#, r#"괩"#, r#"괩"#),
+        (r#"괪"#, r#"괪"#, r#"괪"#, r#"괪"#, r#"괪"#),
+        (r#"괫"#, r#"괫"#, r#"괫"#, r#"괫"#, r#"괫"#),
+        (r#"괬"#, r#"괬"#, r#"괬"#, r#"괬"#, r#"괬"#),
+        (r#"괭"#, r#"괭"#, r#"괭"#, r#"괭"#, r#"괭"#),
+        (r#"괮"#, r#"괮"#, r#"괮"#, r#"괮"#, r#"괮"#),
+        (r#"괯"#, r#"괯"#, r#"괯"#, r#"괯"#, r#"괯"#),
+        (r#"괰"#, r#"괰"#, r#"괰"#, r#"괰"#, r#"괰"#),
+        (r#"괱"#, r#"괱"#, r#"괱"#, r#"괱"#, r#"괱"#),
+        (r#"괲"#, r#"괲"#, r#"괲"#, r#"괲"#, r#"괲"#),
+        (r#"괳"#, r#"괳"#, r#"괳"#, r#"괳"#, r#"괳"#),
+        (r#"괴"#, r#"괴"#, r#"괴"#, r#"괴"#, r#"괴"#),
+        (r#"괵"#, r#"괵"#, r#"괵"#, r#"괵"#, r#"괵"#),
+        (r#"괶"#, r#"괶"#, r#"괶"#, r#"괶"#, r#"괶"#),
+        (r#"괷"#, r#"괷"#, r#"괷"#, r#"괷"#, r#"괷"#),
+        (r#"괸"#, r#"괸"#, r#"괸"#, r#"괸"#, r#"괸"#),
+        (r#"괹"#, r#"괹"#, r#"괹"#, r#"괹"#, r#"괹"#),
+        (r#"괺"#, r#"괺"#, r#"괺"#, r#"괺"#, r#"괺"#),
+        (r#"괻"#, r#"괻"#, r#"괻"#, r#"괻"#, r#"괻"#),
+        (r#"괼"#, r#"괼"#, r#"괼"#, r#"괼"#, r#"괼"#),
+        (r#"괽"#, r#"괽"#, r#"괽"#, r#"괽"#, r#"괽"#),
+        (r#"괾"#, r#"괾"#, r#"괾"#, r#"괾"#, r#"괾"#),
+        (r#"괿"#, r#"괿"#, r#"괿"#, r#"괿"#, r#"괿"#),
+        (r#"굀"#, r#"굀"#, r#"굀"#, r#"굀"#, r#"굀"#),
+        (r#"굁"#, r#"굁"#, r#"굁"#, r#"굁"#, r#"굁"#),
+        (r#"굂"#, r#"굂"#, r#"굂"#, r#"굂"#, r#"굂"#),
+        (r#"굃"#, r#"굃"#, r#"굃"#, r#"굃"#, r#"굃"#),
+        (r#"굄"#, r#"굄"#, r#"굄"#, r#"굄"#, r#"굄"#),
+        (r#"굅"#, r#"굅"#, r#"굅"#, r#"굅"#, r#"굅"#),
+        (r#"굆"#, r#"굆"#, r#"굆"#, r#"굆"#, r#"굆"#),
+        (r#"굇"#, r#"굇"#, r#"굇"#, r#"굇"#, r#"굇"#),
+        (r#"굈"#, r#"굈"#, r#"굈"#, r#"굈"#, r#"굈"#),
+        (r#"굉"#, r#"굉"#, r#"굉"#, r#"굉"#, r#"굉"#),
+        (r#"굊"#, r#"굊"#, r#"굊"#, r#"굊"#, r#"굊"#),
+        (r#"굋"#, r#"굋"#, r#"굋"#, r#"굋"#, r#"굋"#),
+        (r#"굌"#, r#"굌"#, r#"굌"#, r#"굌"#, r#"굌"#),
+        (r#"굍"#, r#"굍"#, r#"굍"#, r#"굍"#, r#"굍"#),
+        (r#"굎"#, r#"굎"#, r#"굎"#, r#"굎"#, r#"굎"#),
+        (r#"굏"#, r#"굏"#, r#"굏"#, r#"굏"#, r#"굏"#),
+        (r#"교"#, r#"교"#, r#"교"#, r#"교"#, r#"교"#),
+        (r#"굑"#, r#"굑"#, r#"굑"#, r#"굑"#, r#"굑"#),
+        (r#"굒"#, r#"굒"#, r#"굒"#, r#"굒"#, r#"굒"#),
+        (r#"굓"#, r#"굓"#, r#"굓"#, r#"굓"#, r#"굓"#),
+        (r#"굔"#, r#"굔"#, r#"굔"#, r#"굔"#, r#"굔"#),
+        (r#"굕"#, r#"굕"#, r#"굕"#, r#"굕"#, r#"굕"#),
+        (r#"굖"#, r#"굖"#, r#"굖"#, r#"굖"#, r#"굖"#),
+        (r#"굗"#, r#"굗"#, r#"굗"#, r#"굗"#, r#"굗"#),
+        (r#"굘"#, r#"굘"#, r#"굘"#, r#"굘"#, r#"굘"#),
+        (r#"굙"#, r#"굙"#, r#"굙"#, r#"굙"#, r#"굙"#),
+        (r#"굚"#, r#"굚"#, r#"굚"#, r#"굚"#, r#"굚"#),
+        (r#"굛"#, r#"굛"#, r#"굛"#, r#"굛"#, r#"굛"#),
+        (r#"굜"#, r#"굜"#, r#"굜"#, r#"굜"#, r#"굜"#),
+        (r#"굝"#, r#"굝"#, r#"굝"#, r#"굝"#, r#"굝"#),
+        (r#"굞"#, r#"굞"#, r#"굞"#, r#"굞"#, r#"굞"#),
+        (r#"굟"#, r#"굟"#, r#"굟"#, r#"굟"#, r#"굟"#),
+        (r#"굠"#, r#"굠"#, r#"굠"#, r#"굠"#, r#"굠"#),
+        (r#"굡"#, r#"굡"#, r#"굡"#, r#"굡"#, r#"굡"#),
+        (r#"굢"#, r#"굢"#, r#"굢"#, r#"굢"#, r#"굢"#),
+        (r#"굣"#, r#"굣"#, r#"굣"#, r#"굣"#, r#"굣"#),
+        (r#"굤"#, r#"굤"#, r#"굤"#, r#"굤"#, r#"굤"#),
+        (r#"굥"#, r#"굥"#, r#"굥"#, r#"굥"#, r#"굥"#),
+        (r#"굦"#, r#"굦"#, r#"굦"#, r#"굦"#, r#"굦"#),
+        (r#"굧"#, r#"굧"#, r#"굧"#, r#"굧"#, r#"굧"#),
+        (r#"굨"#, r#"굨"#, r#"굨"#, r#"굨"#, r#"굨"#),
+        (r#"굩"#, r#"굩"#, r#"굩"#, r#"굩"#, r#"굩"#),
+        (r#"굪"#, r#"굪"#, r#"굪"#, r#"굪"#, r#"굪"#),
+        (r#"굫"#, r#"굫"#, r#"굫"#, r#"굫"#, r#"굫"#),
+        (r#"구"#, r#"구"#, r#"구"#, r#"구"#, r#"구"#),
+        (r#"국"#, r#"국"#, r#"국"#, r#"국"#, r#"국"#),
+        (r#"굮"#, r#"굮"#, r#"굮"#, r#"굮"#, r#"굮"#),
+        (r#"굯"#, r#"굯"#, r#"굯"#, r#"굯"#, r#"굯"#),
+        (r#"군"#, r#"군"#, r#"군"#, r#"군"#, r#"군"#),
+        (r#"굱"#, r#"굱"#, r#"굱"#, r#"굱"#, r#"굱"#),
+        (r#"굲"#, r#"굲"#, r#"굲"#, r#"굲"#, r#"굲"#),
+        (r#"굳"#, r#"굳"#, r#"굳"#, r#"굳"#, r#"굳"#),
+        (r#"굴"#, r#"굴"#, r#"굴"#, r#"굴"#, r#"굴"#),
+        (r#"굵"#, r#"굵"#, r#"굵"#, r#"굵"#, r#"굵"#),
+        (r#"굶"#, r#"굶"#, r#"굶"#, r#"굶"#, r#"굶"#),
+        (r#"굷"#, r#"굷"#, r#"굷"#, r#"굷"#, r#"굷"#),
+        (r#"굸"#, r#"굸"#, r#"굸"#, r#"굸"#, r#"굸"#),
+        (r#"굹"#, r#"굹"#, r#"굹"#, r#"굹"#, r#"굹"#),
+        (r#"굺"#, r#"굺"#, r#"굺"#, r#"굺"#, r#"굺"#),
+        (r#"굻"#, r#"굻"#, r#"굻"#, r#"굻"#, r#"굻"#),
+        (r#"굼"#, r#"굼"#, r#"굼"#, r#"굼"#, r#"굼"#),
+        (r#"굽"#, r#"굽"#, r#"굽"#, r#"굽"#, r#"굽"#),
+        (r#"굾"#, r#"굾"#, r#"굾"#, r#"굾"#, r#"굾"#),
+        (r#"굿"#, r#"굿"#, r#"굿"#, r#"굿"#, r#"굿"#),
+        (r#"궀"#, r#"궀"#, r#"궀"#, r#"궀"#, r#"궀"#),
+        (r#"궁"#, r#"궁"#, r#"궁"#, r#"궁"#, r#"궁"#),
+        (r#"궂"#, r#"궂"#, r#"궂"#, r#"궂"#, r#"궂"#),
+        (r#"궃"#, r#"궃"#, r#"궃"#, r#"궃"#, r#"궃"#),
+        (r#"궄"#, r#"궄"#, r#"궄"#, r#"궄"#, r#"궄"#),
+        (r#"궅"#, r#"궅"#, r#"궅"#, r#"궅"#, r#"궅"#),
+        (r#"궆"#, r#"궆"#, r#"궆"#, r#"궆"#, r#"궆"#),
+        (r#"궇"#, r#"궇"#, r#"궇"#, r#"궇"#, r#"궇"#),
+        (r#"궈"#, r#"궈"#, r#"궈"#, r#"궈"#, r#"궈"#),
+        (r#"궉"#, r#"궉"#, r#"궉"#, r#"궉"#, r#"궉"#),
+        (r#"궊"#, r#"궊"#, r#"궊"#, r#"궊"#, r#"궊"#),
+        (r#"궋"#, r#"궋"#, r#"궋"#, r#"궋"#, r#"궋"#),
+        (r#"권"#, r#"권"#, r#"권"#, r#"권"#, r#"권"#),
+        (r#"궍"#, r#"궍"#, r#"궍"#, r#"궍"#, r#"궍"#),
+        (r#"궎"#, r#"궎"#, r#"궎"#, r#"궎"#, r#"궎"#),
+        (r#"궏"#, r#"궏"#, r#"궏"#, r#"궏"#, r#"궏"#),
+        (r#"궐"#, r#"궐"#, r#"궐"#, r#"궐"#, r#"궐"#),
+        (r#"궑"#, r#"궑"#, r#"궑"#, r#"궑"#, r#"궑"#),
+        (r#"궒"#, r#"궒"#, r#"궒"#, r#"궒"#, r#"궒"#),
+        (r#"궓"#, r#"궓"#, r#"궓"#, r#"궓"#, r#"궓"#),
+        (r#"궔"#, r#"궔"#, r#"궔"#, r#"궔"#, r#"궔"#),
+        (r#"궕"#, r#"궕"#, r#"궕"#, r#"궕"#, r#"궕"#),
+        (r#"궖"#, r#"궖"#, r#"궖"#, r#"궖"#, r#"궖"#),
+        (r#"궗"#, r#"궗"#, r#"궗"#, r#"궗"#, r#"궗"#),
+        (r#"궘"#, r#"궘"#, r#"궘"#, r#"궘"#, r#"궘"#),
+        (r#"궙"#, r#"궙"#, r#"궙"#, r#"궙"#, r#"궙"#),
+        (r#"궚"#, r#"궚"#, r#"궚"#, r#"궚"#, r#"궚"#),
+        (r#"궛"#, r#"궛"#, r#"궛"#, r#"궛"#, r#"궛"#),
+        (r#"궜"#, r#"궜"#, r#"궜"#, r#"궜"#, r#"궜"#),
+        (r#"궝"#, r#"궝"#, r#"궝"#, r#"궝"#, r#"궝"#),
+        (r#"궞"#, r#"궞"#, r#"궞"#, r#"궞"#, r#"궞"#),
+        (r#"궟"#, r#"궟"#, r#"궟"#, r#"궟"#, r#"궟"#),
+        (r#"궠"#, r#"궠"#, r#"궠"#, r#"궠"#, r#"궠"#),
+        (r#"궡"#, r#"궡"#, r#"궡"#, r#"궡"#, r#"궡"#),
+        (r#"궢"#, r#"궢"#, r#"궢"#, r#"궢"#, r#"궢"#),
+        (r#"궣"#, r#"궣"#, r#"궣"#, r#"궣"#, r#"궣"#),
+        (r#"궤"#, r#"궤"#, r#"궤"#, r#"궤"#, r#"궤"#),
+        (r#"궥"#, r#"궥"#, r#"궥"#, r#"궥"#, r#"궥"#),
+        (r#"궦"#, r#"궦"#, r#"궦"#, r#"궦"#, r#"궦"#),
+        (r#"궧"#, r#"궧"#, r#"궧"#, r#"궧"#, r#"궧"#),
+        (r#"궨"#, r#"궨"#, r#"궨"#, r#"궨"#, r#"궨"#),
+        (r#"궩"#, r#"궩"#, r#"궩"#, r#"궩"#, r#"궩"#),
+        (r#"궪"#, r#"궪"#, r#"궪"#, r#"궪"#, r#"궪"#),
+        (r#"궫"#, r#"궫"#, r#"궫"#, r#"궫"#, r#"궫"#),
+        (r#"궬"#, r#"궬"#, r#"궬"#, r#"궬"#, r#"궬"#),
+        (r#"궭"#, r#"궭"#, r#"궭"#, r#"궭"#, r#"궭"#),
+        (r#"궮"#, r#"궮"#, r#"궮"#, r#"궮"#, r#"궮"#),
+        (r#"궯"#, r#"궯"#, r#"궯"#, r#"궯"#, r#"궯"#),
+        (r#"궰"#, r#"궰"#, r#"궰"#, r#"궰"#, r#"궰"#),
+        (r#"궱"#, r#"궱"#, r#"궱"#, r#"궱"#, r#"궱"#),
+        (r#"궲"#, r#"궲"#, r#"궲"#, r#"궲"#, r#"궲"#),
+        (r#"궳"#, r#"궳"#, r#"궳"#, r#"궳"#, r#"궳"#),
+        (r#"궴"#, r#"궴"#, r#"궴"#, r#"궴"#, r#"궴"#),
+        (r#"궵"#, r#"궵"#, r#"궵"#, r#"궵"#, r#"궵"#),
+        (r#"궶"#, r#"궶"#, r#"궶"#, r#"궶"#, r#"궶"#),
+        (r#"궷"#, r#"궷"#, r#"궷"#, r#"궷"#, r#"궷"#),
+        (r#"궸"#, r#"궸"#, r#"궸"#, r#"궸"#, r#"궸"#),
+        (r#"궹"#, r#"궹"#, r#"궹"#, r#"궹"#, r#"궹"#),
+        (r#"궺"#, r#"궺"#, r#"궺"#, r#"궺"#, r#"궺"#),
+        (r#"궻"#, r#"궻"#, r#"궻"#, r#"궻"#, r#"궻"#),
+        (r#"궼"#, r#"궼"#, r#"궼"#, r#"궼"#, r#"궼"#),
+        (r#"궽"#, r#"궽"#, r#"궽"#, r#"궽"#, r#"궽"#),
+        (r#"궾"#, r#"궾"#, r#"궾"#, r#"궾"#, r#"궾"#),
+        (r#"궿"#, r#"궿"#, r#"궿"#, r#"궿"#, r#"궿"#),
+        (r#"귀"#, r#"귀"#, r#"귀"#, r#"귀"#, r#"귀"#),
+        (r#"귁"#, r#"귁"#, r#"귁"#, r#"귁"#, r#"귁"#),
+        (r#"귂"#, r#"귂"#, r#"귂"#, r#"귂"#, r#"귂"#),
+        (r#"귃"#, r#"귃"#, r#"귃"#, r#"귃"#, r#"귃"#),
+        (r#"귄"#, r#"귄"#, r#"귄"#, r#"귄"#, r#"귄"#),
+        (r#"귅"#, r#"귅"#, r#"귅"#, r#"귅"#, r#"귅"#),
+        (r#"귆"#, r#"귆"#, r#"귆"#, r#"귆"#, r#"귆"#),
+        (r#"귇"#, r#"귇"#, r#"귇"#, r#"귇"#, r#"귇"#),
+        (r#"귈"#, r#"귈"#, r#"귈"#, r#"귈"#, r#"귈"#),
+        (r#"귉"#, r#"귉"#, r#"귉"#, r#"귉"#, r#"귉"#),
+        (r#"귊"#, r#"귊"#, r#"귊"#, r#"귊"#, r#"귊"#),
+        (r#"귋"#, r#"귋"#, r#"귋"#, r#"귋"#, r#"귋"#),
+        (r#"귌"#, r#"귌"#, r#"귌"#, r#"귌"#, r#"귌"#),
+        (r#"귍"#, r#"귍"#, r#"귍"#, r#"귍"#, r#"귍"#),
+        (r#"귎"#, r#"귎"#, r#"귎"#, r#"귎"#, r#"귎"#),
+        (r#"귏"#, r#"귏"#, r#"귏"#, r#"귏"#, r#"귏"#),
+        (r#"귐"#, r#"귐"#, r#"귐"#, r#"귐"#, r#"귐"#),
+        (r#"귑"#, r#"귑"#, r#"귑"#, r#"귑"#, r#"귑"#),
+        (r#"귒"#, r#"귒"#, r#"귒"#, r#"귒"#, r#"귒"#),
+        (r#"귓"#, r#"귓"#, r#"귓"#, r#"귓"#, r#"귓"#),
+        (r#"귔"#, r#"귔"#, r#"귔"#, r#"귔"#, r#"귔"#),
+        (r#"귕"#, r#"귕"#, r#"귕"#, r#"귕"#, r#"귕"#),
+        (r#"귖"#, r#"귖"#, r#"귖"#, r#"귖"#, r#"귖"#),
+        (r#"귗"#, r#"귗"#, r#"귗"#, r#"귗"#, r#"귗"#),
+        (r#"귘"#, r#"귘"#, r#"귘"#, r#"귘"#, r#"귘"#),
+        (r#"귙"#, r#"귙"#, r#"귙"#, r#"귙"#, r#"귙"#),
+        (r#"귚"#, r#"귚"#, r#"귚"#, r#"귚"#, r#"귚"#),
+        (r#"귛"#, r#"귛"#, r#"귛"#, r#"귛"#, r#"귛"#),
+        (r#"규"#, r#"규"#, r#"규"#, r#"규"#, r#"규"#),
+        (r#"귝"#, r#"귝"#, r#"귝"#, r#"귝"#, r#"귝"#),
+        (r#"귞"#, r#"귞"#, r#"귞"#, r#"귞"#, r#"귞"#),
+        (r#"귟"#, r#"귟"#, r#"귟"#, r#"귟"#, r#"귟"#),
+        (r#"균"#, r#"균"#, r#"균"#, r#"균"#, r#"균"#),
+        (r#"귡"#, r#"귡"#, r#"귡"#, r#"귡"#, r#"귡"#),
+        (r#"귢"#, r#"귢"#, r#"귢"#, r#"귢"#, r#"귢"#),
+        (r#"귣"#, r#"귣"#, r#"귣"#, r#"귣"#, r#"귣"#),
+        (r#"귤"#, r#"귤"#, r#"귤"#, r#"귤"#, r#"귤"#),
+        (r#"귥"#, r#"귥"#, r#"귥"#, r#"귥"#, r#"귥"#),
+        (r#"귦"#, r#"귦"#, r#"귦"#, r#"귦"#, r#"귦"#),
+        (r#"귧"#, r#"귧"#, r#"귧"#, r#"귧"#, r#"귧"#),
+        (r#"귨"#, r#"귨"#, r#"귨"#, r#"귨"#, r#"귨"#),
+        (r#"귩"#, r#"귩"#, r#"귩"#, r#"귩"#, r#"귩"#),
+        (r#"귪"#, r#"귪"#, r#"귪"#, r#"귪"#, r#"귪"#),
+        (r#"귫"#, r#"귫"#, r#"귫"#, r#"귫"#, r#"귫"#),
+        (r#"귬"#, r#"귬"#, r#"귬"#, r#"귬"#, r#"귬"#),
+        (r#"귭"#, r#"귭"#, r#"귭"#, r#"귭"#, r#"귭"#),
+        (r#"귮"#, r#"귮"#, r#"귮"#, r#"귮"#, r#"귮"#),
+        (r#"귯"#, r#"귯"#, r#"귯"#, r#"귯"#, r#"귯"#),
+        (r#"귰"#, r#"귰"#, r#"귰"#, r#"귰"#, r#"귰"#),
+        (r#"귱"#, r#"귱"#, r#"귱"#, r#"귱"#, r#"귱"#),
+        (r#"귲"#, r#"귲"#, r#"귲"#, r#"귲"#, r#"귲"#),
+        (r#"귳"#, r#"귳"#, r#"귳"#, r#"귳"#, r#"귳"#),
+        (r#"귴"#, r#"귴"#, r#"귴"#, r#"귴"#, r#"귴"#),
+        (r#"귵"#, r#"귵"#, r#"귵"#, r#"귵"#, r#"귵"#),
+        (r#"귶"#, r#"귶"#, r#"귶"#, r#"귶"#, r#"귶"#),
+        (r#"귷"#, r#"귷"#, r#"귷"#, r#"귷"#, r#"귷"#),
+        (r#"그"#, r#"그"#, r#"그"#, r#"그"#, r#"그"#),
+        (r#"극"#, r#"극"#, r#"극"#, r#"극"#, r#"극"#),
+        (r#"귺"#, r#"귺"#, r#"귺"#, r#"귺"#, r#"귺"#),
+        (r#"귻"#, r#"귻"#, r#"귻"#, r#"귻"#, r#"귻"#),
+        (r#"근"#, r#"근"#, r#"근"#, r#"근"#, r#"근"#),
+        (r#"귽"#, r#"귽"#, r#"귽"#, r#"귽"#, r#"귽"#),
+        (r#"귾"#, r#"귾"#, r#"귾"#, r#"귾"#, r#"귾"#),
+        (r#"귿"#, r#"귿"#, r#"귿"#, r#"귿"#, r#"귿"#),
+        (r#"글"#, r#"글"#, r#"글"#, r#"글"#, r#"글"#),
+        (r#"긁"#, r#"긁"#, r#"긁"#, r#"긁"#, r#"긁"#),
+        (r#"긂"#, r#"긂"#, r#"긂"#, r#"긂"#, r#"긂"#),
+        (r#"긃"#, r#"긃"#, r#"긃"#, r#"긃"#, r#"긃"#),
+        (r#"긄"#, r#"긄"#, r#"긄"#, r#"긄"#, r#"긄"#),
+        (r#"긅"#, r#"긅"#, r#"긅"#, r#"긅"#, r#"긅"#),
+        (r#"긆"#, r#"긆"#, r#"긆"#, r#"긆"#, r#"긆"#),
+        (r#"긇"#, r#"긇"#, r#"긇"#, r#"긇"#, r#"긇"#),
+        (r#"금"#, r#"금"#, r#"금"#, r#"금"#, r#"금"#),
+        (r#"급"#, r#"급"#, r#"급"#, r#"급"#, r#"급"#),
+        (r#"긊"#, r#"긊"#, r#"긊"#, r#"긊"#, r#"긊"#),
+        (r#"긋"#, r#"긋"#, r#"긋"#, r#"긋"#, r#"긋"#),
+        (r#"긌"#, r#"긌"#, r#"긌"#, r#"긌"#, r#"긌"#),
+        (r#"긍"#, r#"긍"#, r#"긍"#, r#"긍"#, r#"긍"#),
+        (r#"긎"#, r#"긎"#, r#"긎"#, r#"긎"#, r#"긎"#),
+        (r#"긏"#, r#"긏"#, r#"긏"#, r#"긏"#, r#"긏"#),
+        (r#"긐"#, r#"긐"#, r#"긐"#, r#"긐"#, r#"긐"#),
+        (r#"긑"#, r#"긑"#, r#"긑"#, r#"긑"#, r#"긑"#),
+        (r#"긒"#, r#"긒"#, r#"긒"#, r#"긒"#, r#"긒"#),
+        (r#"긓"#, r#"긓"#, r#"긓"#, r#"긓"#, r#"긓"#),
+        (r#"긔"#, r#"긔"#, r#"긔"#, r#"긔"#, r#"긔"#),
+        (r#"긕"#, r#"긕"#, r#"긕"#, r#"긕"#, r#"긕"#),
+        (r#"긖"#, r#"긖"#, r#"긖"#, r#"긖"#, r#"긖"#),
+        (r#"긗"#, r#"긗"#, r#"긗"#, r#"긗"#, r#"긗"#),
+        (r#"긘"#, r#"긘"#, r#"긘"#, r#"긘"#, r#"긘"#),
+        (r#"긙"#, r#"긙"#, r#"긙"#, r#"긙"#, r#"긙"#),
+        (r#"긚"#, r#"긚"#, r#"긚"#, r#"긚"#, r#"긚"#),
+        (r#"긛"#, r#"긛"#, r#"긛"#, r#"긛"#, r#"긛"#),
+        (r#"긜"#, r#"긜"#, r#"긜"#, r#"긜"#, r#"긜"#),
+        (r#"긝"#, r#"긝"#, r#"긝"#, r#"긝"#, r#"긝"#),
+        (r#"긞"#, r#"긞"#, r#"긞"#, r#"긞"#, r#"긞"#),
+        (r#"긟"#, r#"긟"#, r#"긟"#, r#"긟"#, r#"긟"#),
+        (r#"긠"#, r#"긠"#, r#"긠"#, r#"긠"#, r#"긠"#),
+        (r#"긡"#, r#"긡"#, r#"긡"#, r#"긡"#, r#"긡"#),
+        (r#"긢"#, r#"긢"#, r#"긢"#, r#"긢"#, r#"긢"#),
+        (r#"긣"#, r#"긣"#, r#"긣"#, r#"긣"#, r#"긣"#),
+        (r#"긤"#, r#"긤"#, r#"긤"#, r#"긤"#, r#"긤"#),
+        (r#"긥"#, r#"긥"#, r#"긥"#, r#"긥"#, r#"긥"#),
+        (r#"긦"#, r#"긦"#, r#"긦"#, r#"긦"#, r#"긦"#),
+        (r#"긧"#, r#"긧"#, r#"긧"#, r#"긧"#, r#"긧"#),
+        (r#"긨"#, r#"긨"#, r#"긨"#, r#"긨"#, r#"긨"#),
+        (r#"긩"#, r#"긩"#, r#"긩"#, r#"긩"#, r#"긩"#),
+        (r#"긪"#, r#"긪"#, r#"긪"#, r#"긪"#, r#"긪"#),
+        (r#"긫"#, r#"긫"#, r#"긫"#, r#"긫"#, r#"긫"#),
+        (r#"긬"#, r#"긬"#, r#"긬"#, r#"긬"#, r#"긬"#),
+        (r#"긭"#, r#"긭"#, r#"긭"#, r#"긭"#, r#"긭"#),
+        (r#"긮"#, r#"긮"#, r#"긮"#, r#"긮"#, r#"긮"#),
+        (r#"긯"#, r#"긯"#, r#"긯"#, r#"긯"#, r#"긯"#),
+        (r#"기"#, r#"기"#, r#"기"#, r#"기"#, r#"기"#),
+        (r#"긱"#, r#"긱"#, r#"긱"#, r#"긱"#, r#"긱"#),
+        (r#"긲"#, r#"긲"#, r#"긲"#, r#"긲"#, r#"긲"#),
+        (r#"긳"#, r#"긳"#, r#"긳"#, r#"긳"#, r#"긳"#),
+        (r#"긴"#, r#"긴"#, r#"긴"#, r#"긴"#, r#"긴"#),
+        (r#"긵"#, r#"긵"#, r#"긵"#, r#"긵"#, r#"긵"#),
+        (r#"긶"#, r#"긶"#, r#"긶"#, r#"긶"#, r#"긶"#),
+        (r#"긷"#, r#"긷"#, r#"긷"#, r#"긷"#, r#"긷"#),
+        (r#"길"#, r#"길"#, r#"길"#, r#"길"#, r#"길"#),
+        (r#"긹"#, r#"긹"#, r#"긹"#, r#"긹"#, r#"긹"#),
+        (r#"긺"#, r#"긺"#, r#"긺"#, r#"긺"#, r#"긺"#),
+        (r#"긻"#, r#"긻"#, r#"긻"#, r#"긻"#, r#"긻"#),
+        (r#"긼"#, r#"긼"#, r#"긼"#, r#"긼"#, r#"긼"#),
+        (r#"긽"#, r#"긽"#, r#"긽"#, r#"긽"#, r#"긽"#),
+        (r#"긾"#, r#"긾"#, r#"긾"#, r#"긾"#, r#"긾"#),
+        (r#"긿"#, r#"긿"#, r#"긿"#, r#"긿"#, r#"긿"#),
+        (r#"김"#, r#"김"#, r#"김"#, r#"김"#, r#"김"#),
+        (r#"깁"#, r#"깁"#, r#"깁"#, r#"깁"#, r#"깁"#),
+        (r#"깂"#, r#"깂"#, r#"깂"#, r#"깂"#, r#"깂"#),
+        (r#"깃"#, r#"깃"#, r#"깃"#, r#"깃"#, r#"깃"#),
+        (r#"깄"#, r#"깄"#, r#"깄"#, r#"깄"#, r#"깄"#),
+        (r#"깅"#, r#"깅"#, r#"깅"#, r#"깅"#, r#"깅"#),
+        (r#"깆"#, r#"깆"#, r#"깆"#, r#"깆"#, r#"깆"#),
+        (r#"깇"#, r#"깇"#, r#"깇"#, r#"깇"#, r#"깇"#),
+        (r#"깈"#, r#"깈"#, r#"깈"#, r#"깈"#, r#"깈"#),
+        (r#"깉"#, r#"깉"#, r#"깉"#, r#"깉"#, r#"깉"#),
+        (r#"깊"#, r#"깊"#, r#"깊"#, r#"깊"#, r#"깊"#),
+        (r#"깋"#, r#"깋"#, r#"깋"#, r#"깋"#, r#"깋"#),
+        (r#"까"#, r#"까"#, r#"까"#, r#"까"#, r#"까"#),
+        (r#"깍"#, r#"깍"#, r#"깍"#, r#"깍"#, r#"깍"#),
+        (r#"깎"#, r#"깎"#, r#"깎"#, r#"깎"#, r#"깎"#),
+        (r#"깏"#, r#"깏"#, r#"깏"#, r#"깏"#, r#"깏"#),
+        (r#"깐"#, r#"깐"#, r#"깐"#, r#"깐"#, r#"깐"#),
+        (r#"깑"#, r#"깑"#, r#"깑"#, r#"깑"#, r#"깑"#),
+        (r#"깒"#, r#"깒"#, r#"깒"#, r#"깒"#, r#"깒"#),
+        (r#"깓"#, r#"깓"#, r#"깓"#, r#"깓"#, r#"깓"#),
+        (r#"깔"#, r#"깔"#, r#"깔"#, r#"깔"#, r#"깔"#),
+        (r#"깕"#, r#"깕"#, r#"깕"#, r#"깕"#, r#"깕"#),
+        (r#"깖"#, r#"깖"#, r#"깖"#, r#"깖"#, r#"깖"#),
+        (r#"깗"#, r#"깗"#, r#"깗"#, r#"깗"#, r#"깗"#),
+        (r#"깘"#, r#"깘"#, r#"깘"#, r#"깘"#, r#"깘"#),
+        (r#"깙"#, r#"깙"#, r#"깙"#, r#"깙"#, r#"깙"#),
+        (r#"깚"#, r#"깚"#, r#"깚"#, r#"깚"#, r#"깚"#),
+        (r#"깛"#, r#"깛"#, r#"깛"#, r#"깛"#, r#"깛"#),
+        (r#"깜"#, r#"깜"#, r#"깜"#, r#"깜"#, r#"깜"#),
+        (r#"깝"#, r#"깝"#, r#"깝"#, r#"깝"#, r#"깝"#),
+        (r#"깞"#, r#"깞"#, r#"깞"#, r#"깞"#, r#"깞"#),
+        (r#"깟"#, r#"깟"#, r#"깟"#, r#"깟"#, r#"깟"#),
+        (r#"깠"#, r#"깠"#, r#"깠"#, r#"깠"#, r#"깠"#),
+        (r#"깡"#, r#"깡"#, r#"깡"#, r#"깡"#, r#"깡"#),
+        (r#"깢"#, r#"깢"#, r#"깢"#, r#"깢"#, r#"깢"#),
+        (r#"깣"#, r#"깣"#, r#"깣"#, r#"깣"#, r#"깣"#),
+        (r#"깤"#, r#"깤"#, r#"깤"#, r#"깤"#, r#"깤"#),
+        (r#"깥"#, r#"깥"#, r#"깥"#, r#"깥"#, r#"깥"#),
+        (r#"깦"#, r#"깦"#, r#"깦"#, r#"깦"#, r#"깦"#),
+        (r#"깧"#, r#"깧"#, r#"깧"#, r#"깧"#, r#"깧"#),
+        (r#"깨"#, r#"깨"#, r#"깨"#, r#"깨"#, r#"깨"#),
+        (r#"깩"#, r#"깩"#, r#"깩"#, r#"깩"#, r#"깩"#),
+        (r#"깪"#, r#"깪"#, r#"깪"#, r#"깪"#, r#"깪"#),
+        (r#"깫"#, r#"깫"#, r#"깫"#, r#"깫"#, r#"깫"#),
+        (r#"깬"#, r#"깬"#, r#"깬"#, r#"깬"#, r#"깬"#),
+        (r#"깭"#, r#"깭"#, r#"깭"#, r#"깭"#, r#"깭"#),
+        (r#"깮"#, r#"깮"#, r#"깮"#, r#"깮"#, r#"깮"#),
+        (r#"깯"#, r#"깯"#, r#"깯"#, r#"깯"#, r#"깯"#),
+        (r#"깰"#, r#"깰"#, r#"깰"#, r#"깰"#, r#"깰"#),
+        (r#"깱"#, r#"깱"#, r#"깱"#, r#"깱"#, r#"깱"#),
+        (r#"깲"#, r#"깲"#, r#"깲"#, r#"깲"#, r#"깲"#),
+        (r#"깳"#, r#"깳"#, r#"깳"#, r#"깳"#, r#"깳"#),
+        (r#"깴"#, r#"깴"#, r#"깴"#, r#"깴"#, r#"깴"#),
+        (r#"깵"#, r#"깵"#, r#"깵"#, r#"깵"#, r#"깵"#),
+        (r#"깶"#, r#"깶"#, r#"깶"#, r#"깶"#, r#"깶"#),
+        (r#"깷"#, r#"깷"#, r#"깷"#, r#"깷"#, r#"깷"#),
+        (r#"깸"#, r#"깸"#, r#"깸"#, r#"깸"#, r#"깸"#),
+        (r#"깹"#, r#"깹"#, r#"깹"#, r#"깹"#, r#"깹"#),
+        (r#"깺"#, r#"깺"#, r#"깺"#, r#"깺"#, r#"깺"#),
+        (r#"깻"#, r#"깻"#, r#"깻"#, r#"깻"#, r#"깻"#),
+        (r#"깼"#, r#"깼"#, r#"깼"#, r#"깼"#, r#"깼"#),
+        (r#"깽"#, r#"깽"#, r#"깽"#, r#"깽"#, r#"깽"#),
+        (r#"깾"#, r#"깾"#, r#"깾"#, r#"깾"#, r#"깾"#),
+        (r#"깿"#, r#"깿"#, r#"깿"#, r#"깿"#, r#"깿"#),
+        (r#"꺀"#, r#"꺀"#, r#"꺀"#, r#"꺀"#, r#"꺀"#),
+        (r#"꺁"#, r#"꺁"#, r#"꺁"#, r#"꺁"#, r#"꺁"#),
+        (r#"꺂"#, r#"꺂"#, r#"꺂"#, r#"꺂"#, r#"꺂"#),
+        (r#"꺃"#, r#"꺃"#, r#"꺃"#, r#"꺃"#, r#"꺃"#),
+        (r#"꺄"#, r#"꺄"#, r#"꺄"#, r#"꺄"#, r#"꺄"#),
+        (r#"꺅"#, r#"꺅"#, r#"꺅"#, r#"꺅"#, r#"꺅"#),
+        (r#"꺆"#, r#"꺆"#, r#"꺆"#, r#"꺆"#, r#"꺆"#),
+        (r#"꺇"#, r#"꺇"#, r#"꺇"#, r#"꺇"#, r#"꺇"#),
+        (r#"꺈"#, r#"꺈"#, r#"꺈"#, r#"꺈"#, r#"꺈"#),
+        (r#"꺉"#, r#"꺉"#, r#"꺉"#, r#"꺉"#, r#"꺉"#),
+        (r#"꺊"#, r#"꺊"#, r#"꺊"#, r#"꺊"#, r#"꺊"#),
+        (r#"꺋"#, r#"꺋"#, r#"꺋"#, r#"꺋"#, r#"꺋"#),
+        (r#"꺌"#, r#"꺌"#, r#"꺌"#, r#"꺌"#, r#"꺌"#),
+        (r#"꺍"#, r#"꺍"#, r#"꺍"#, r#"꺍"#, r#"꺍"#),
+        (r#"꺎"#, r#"꺎"#, r#"꺎"#, r#"꺎"#, r#"꺎"#),
+        (r#"꺏"#, r#"꺏"#, r#"꺏"#, r#"꺏"#, r#"꺏"#),
+        (r#"꺐"#, r#"꺐"#, r#"꺐"#, r#"꺐"#, r#"꺐"#),
+        (r#"꺑"#, r#"꺑"#, r#"꺑"#, r#"꺑"#, r#"꺑"#),
+        (r#"꺒"#, r#"꺒"#, r#"꺒"#, r#"꺒"#, r#"꺒"#),
+        (r#"꺓"#, r#"꺓"#, r#"꺓"#, r#"꺓"#, r#"꺓"#),
+        (r#"꺔"#, r#"꺔"#, r#"꺔"#, r#"꺔"#, r#"꺔"#),
+        (r#"꺕"#, r#"꺕"#, r#"꺕"#, r#"꺕"#, r#"꺕"#),
+        (r#"꺖"#, r#"꺖"#, r#"꺖"#, r#"꺖"#, r#"꺖"#),
+        (r#"꺗"#, r#"꺗"#, r#"꺗"#, r#"꺗"#, r#"꺗"#),
+        (r#"꺘"#, r#"꺘"#, r#"꺘"#, r#"꺘"#, r#"꺘"#),
+        (r#"꺙"#, r#"꺙"#, r#"꺙"#, r#"꺙"#, r#"꺙"#),
+        (r#"꺚"#, r#"꺚"#, r#"꺚"#, r#"꺚"#, r#"꺚"#),
+        (r#"꺛"#, r#"꺛"#, r#"꺛"#, r#"꺛"#, r#"꺛"#),
+        (r#"꺜"#, r#"꺜"#, r#"꺜"#, r#"꺜"#, r#"꺜"#),
+        (r#"꺝"#, r#"꺝"#, r#"꺝"#, r#"꺝"#, r#"꺝"#),
+        (r#"꺞"#, r#"꺞"#, r#"꺞"#, r#"꺞"#, r#"꺞"#),
+        (r#"꺟"#, r#"꺟"#, r#"꺟"#, r#"꺟"#, r#"꺟"#),
+        (r#"꺠"#, r#"꺠"#, r#"꺠"#, r#"꺠"#, r#"꺠"#),
+        (r#"꺡"#, r#"꺡"#, r#"꺡"#, r#"꺡"#, r#"꺡"#),
+        (r#"꺢"#, r#"꺢"#, r#"꺢"#, r#"꺢"#, r#"꺢"#),
+        (r#"꺣"#, r#"꺣"#, r#"꺣"#, r#"꺣"#, r#"꺣"#),
+        (r#"꺤"#, r#"꺤"#, r#"꺤"#, r#"꺤"#, r#"꺤"#),
+        (r#"꺥"#, r#"꺥"#, r#"꺥"#, r#"꺥"#, r#"꺥"#),
+        (r#"꺦"#, r#"꺦"#, r#"꺦"#, r#"꺦"#, r#"꺦"#),
+        (r#"꺧"#, r#"꺧"#, r#"꺧"#, r#"꺧"#, r#"꺧"#),
+        (r#"꺨"#, r#"꺨"#, r#"꺨"#, r#"꺨"#, r#"꺨"#),
+        (r#"꺩"#, r#"꺩"#, r#"꺩"#, r#"꺩"#, r#"꺩"#),
+        (r#"꺪"#, r#"꺪"#, r#"꺪"#, r#"꺪"#, r#"꺪"#),
+        (r#"꺫"#, r#"꺫"#, r#"꺫"#, r#"꺫"#, r#"꺫"#),
+        (r#"꺬"#, r#"꺬"#, r#"꺬"#, r#"꺬"#, r#"꺬"#),
+        (r#"꺭"#, r#"꺭"#, r#"꺭"#, r#"꺭"#, r#"꺭"#),
+        (r#"꺮"#, r#"꺮"#, r#"꺮"#, r#"꺮"#, r#"꺮"#),
+        (r#"꺯"#, r#"꺯"#, r#"꺯"#, r#"꺯"#, r#"꺯"#),
+        (r#"꺰"#, r#"꺰"#, r#"꺰"#, r#"꺰"#, r#"꺰"#),
+        (r#"꺱"#, r#"꺱"#, r#"꺱"#, r#"꺱"#, r#"꺱"#),
+        (r#"꺲"#, r#"꺲"#, r#"꺲"#, r#"꺲"#, r#"꺲"#),
+        (r#"꺳"#, r#"꺳"#, r#"꺳"#, r#"꺳"#, r#"꺳"#),
+        (r#"꺴"#, r#"꺴"#, r#"꺴"#, r#"꺴"#, r#"꺴"#),
+        (r#"꺵"#, r#"꺵"#, r#"꺵"#, r#"꺵"#, r#"꺵"#),
+        (r#"꺶"#, r#"꺶"#, r#"꺶"#, r#"꺶"#, r#"꺶"#),
+        (r#"꺷"#, r#"꺷"#, r#"꺷"#, r#"꺷"#, r#"꺷"#),
+        (r#"꺸"#, r#"꺸"#, r#"꺸"#, r#"꺸"#, r#"꺸"#),
+        (r#"꺹"#, r#"꺹"#, r#"꺹"#, r#"꺹"#, r#"꺹"#),
+        (r#"꺺"#, r#"꺺"#, r#"꺺"#, r#"꺺"#, r#"꺺"#),
+        (r#"꺻"#, r#"꺻"#, r#"꺻"#, r#"꺻"#, r#"꺻"#),
+        (r#"꺼"#, r#"꺼"#, r#"꺼"#, r#"꺼"#, r#"꺼"#),
+        (r#"꺽"#, r#"꺽"#, r#"꺽"#, r#"꺽"#, r#"꺽"#),
+        (r#"꺾"#, r#"꺾"#, r#"꺾"#, r#"꺾"#, r#"꺾"#),
+        (r#"꺿"#, r#"꺿"#, r#"꺿"#, r#"꺿"#, r#"꺿"#),
+        (r#"껀"#, r#"껀"#, r#"껀"#, r#"껀"#, r#"껀"#),
+        (r#"껁"#, r#"껁"#, r#"껁"#, r#"껁"#, r#"껁"#),
+        (r#"껂"#, r#"껂"#, r#"껂"#, r#"껂"#, r#"껂"#),
+        (r#"껃"#, r#"껃"#, r#"껃"#, r#"껃"#, r#"껃"#),
+        (r#"껄"#, r#"껄"#, r#"껄"#, r#"껄"#, r#"껄"#),
+        (r#"껅"#, r#"껅"#, r#"껅"#, r#"껅"#, r#"껅"#),
+        (r#"껆"#, r#"껆"#, r#"껆"#, r#"껆"#, r#"껆"#),
+        (r#"껇"#, r#"껇"#, r#"껇"#, r#"껇"#, r#"껇"#),
+        (r#"껈"#, r#"껈"#, r#"껈"#, r#"껈"#, r#"껈"#),
+        (r#"껉"#, r#"껉"#, r#"껉"#, r#"껉"#, r#"껉"#),
+        (r#"껊"#, r#"껊"#, r#"껊"#, r#"껊"#, r#"껊"#),
+        (r#"껋"#, r#"껋"#, r#"껋"#, r#"껋"#, r#"껋"#),
+        (r#"껌"#, r#"껌"#, r#"껌"#, r#"껌"#, r#"껌"#),
+        (r#"껍"#, r#"껍"#, r#"껍"#, r#"껍"#, r#"껍"#),
+        (r#"껎"#, r#"껎"#, r#"껎"#, r#"껎"#, r#"껎"#),
+        (r#"껏"#, r#"껏"#, r#"껏"#, r#"껏"#, r#"껏"#),
+        (r#"껐"#, r#"껐"#, r#"껐"#, r#"껐"#, r#"껐"#),
+        (r#"껑"#, r#"껑"#, r#"껑"#, r#"껑"#, r#"껑"#),
+        (r#"껒"#, r#"껒"#, r#"껒"#, r#"껒"#, r#"껒"#),
+        (r#"껓"#, r#"껓"#, r#"껓"#, r#"껓"#, r#"껓"#),
+        (r#"껔"#, r#"껔"#, r#"껔"#, r#"껔"#, r#"껔"#),
+        (r#"껕"#, r#"껕"#, r#"껕"#, r#"껕"#, r#"껕"#),
+        (r#"껖"#, r#"껖"#, r#"껖"#, r#"껖"#, r#"껖"#),
+        (r#"껗"#, r#"껗"#, r#"껗"#, r#"껗"#, r#"껗"#),
+        (r#"께"#, r#"께"#, r#"께"#, r#"께"#, r#"께"#),
+        (r#"껙"#, r#"껙"#, r#"껙"#, r#"껙"#, r#"껙"#),
+        (r#"껚"#, r#"껚"#, r#"껚"#, r#"껚"#, r#"껚"#),
+        (r#"껛"#, r#"껛"#, r#"껛"#, r#"껛"#, r#"껛"#),
+        (r#"껜"#, r#"껜"#, r#"껜"#, r#"껜"#, r#"껜"#),
+        (r#"껝"#, r#"껝"#, r#"껝"#, r#"껝"#, r#"껝"#),
+        (r#"껞"#, r#"껞"#, r#"껞"#, r#"껞"#, r#"껞"#),
+        (r#"껟"#, r#"껟"#, r#"껟"#, r#"껟"#, r#"껟"#),
+        (r#"껠"#, r#"껠"#, r#"껠"#, r#"껠"#, r#"껠"#),
+        (r#"껡"#, r#"껡"#, r#"껡"#, r#"껡"#, r#"껡"#),
+        (r#"껢"#, r#"껢"#, r#"껢"#, r#"껢"#, r#"껢"#),
+        (r#"껣"#, r#"껣"#, r#"껣"#, r#"껣"#, r#"껣"#),
+        (r#"껤"#, r#"껤"#, r#"껤"#, r#"껤"#, r#"껤"#),
+        (r#"껥"#, r#"껥"#, r#"껥"#, r#"껥"#, r#"껥"#),
+        (r#"껦"#, r#"껦"#, r#"껦"#, r#"껦"#, r#"껦"#),
+        (r#"껧"#, r#"껧"#, r#"껧"#, r#"껧"#, r#"껧"#),
+        (r#"껨"#, r#"껨"#, r#"껨"#, r#"껨"#, r#"껨"#),
+        (r#"껩"#, r#"껩"#, r#"껩"#, r#"껩"#, r#"껩"#),
+        (r#"껪"#, r#"껪"#, r#"껪"#, r#"껪"#, r#"껪"#),
+        (r#"껫"#, r#"껫"#, r#"껫"#, r#"껫"#, r#"껫"#),
+        (r#"껬"#, r#"껬"#, r#"껬"#, r#"껬"#, r#"껬"#),
+        (r#"껭"#, r#"껭"#, r#"껭"#, r#"껭"#, r#"껭"#),
+        (r#"껮"#, r#"껮"#, r#"껮"#, r#"껮"#, r#"껮"#),
+        (r#"껯"#, r#"껯"#, r#"껯"#, r#"껯"#, r#"껯"#),
+        (r#"껰"#, r#"껰"#, r#"껰"#, r#"껰"#, r#"껰"#),
+        (r#"껱"#, r#"껱"#, r#"껱"#, r#"껱"#, r#"껱"#),
+        (r#"껲"#, r#"껲"#, r#"껲"#, r#"껲"#, r#"껲"#),
+        (r#"껳"#, r#"껳"#, r#"껳"#, r#"껳"#, r#"껳"#),
+        (r#"껴"#, r#"껴"#, r#"껴"#, r#"껴"#, r#"껴"#),
+        (r#"껵"#, r#"껵"#, r#"껵"#, r#"껵"#, r#"껵"#),
+        (r#"껶"#, r#"껶"#, r#"껶"#, r#"껶"#, r#"껶"#),
+        (r#"껷"#, r#"껷"#, r#"껷"#, r#"껷"#, r#"껷"#),
+        (r#"껸"#, r#"껸"#, r#"껸"#, r#"껸"#, r#"껸"#),
+        (r#"껹"#, r#"껹"#, r#"껹"#, r#"껹"#, r#"껹"#),
+        (r#"껺"#, r#"껺"#, r#"껺"#, r#"껺"#, r#"껺"#),
+        (r#"껻"#, r#"껻"#, r#"껻"#, r#"껻"#, r#"껻"#),
+        (r#"껼"#, r#"껼"#, r#"껼"#, r#"껼"#, r#"껼"#),
+        (r#"껽"#, r#"껽"#, r#"껽"#, r#"껽"#, r#"껽"#),
+        (r#"껾"#, r#"껾"#, r#"껾"#, r#"껾"#, r#"껾"#),
+        (r#"껿"#, r#"껿"#, r#"껿"#, r#"껿"#, r#"껿"#),
+        (r#"꼀"#, r#"꼀"#, r#"꼀"#, r#"꼀"#, r#"꼀"#),
+        (r#"꼁"#, r#"꼁"#, r#"꼁"#, r#"꼁"#, r#"꼁"#),
+        (r#"꼂"#, r#"꼂"#, r#"꼂"#, r#"꼂"#, r#"꼂"#),
+        (r#"꼃"#, r#"꼃"#, r#"꼃"#, r#"꼃"#, r#"꼃"#),
+        (r#"꼄"#, r#"꼄"#, r#"꼄"#, r#"꼄"#, r#"꼄"#),
+        (r#"꼅"#, r#"꼅"#, r#"꼅"#, r#"꼅"#, r#"꼅"#),
+        (r#"꼆"#, r#"꼆"#, r#"꼆"#, r#"꼆"#, r#"꼆"#),
+        (r#"꼇"#, r#"꼇"#, r#"꼇"#, r#"꼇"#, r#"꼇"#),
+        (r#"꼈"#, r#"꼈"#, r#"꼈"#, r#"꼈"#, r#"꼈"#),
+        (r#"꼉"#, r#"꼉"#, r#"꼉"#, r#"꼉"#, r#"꼉"#),
+        (r#"꼊"#, r#"꼊"#, r#"꼊"#, r#"꼊"#, r#"꼊"#),
+        (r#"꼋"#, r#"꼋"#, r#"꼋"#, r#"꼋"#, r#"꼋"#),
+        (r#"꼌"#, r#"꼌"#, r#"꼌"#, r#"꼌"#, r#"꼌"#),
+        (r#"꼍"#, r#"꼍"#, r#"꼍"#, r#"꼍"#, r#"꼍"#),
+        (r#"꼎"#, r#"꼎"#, r#"꼎"#, r#"꼎"#, r#"꼎"#),
+        (r#"꼏"#, r#"꼏"#, r#"꼏"#, r#"꼏"#, r#"꼏"#),
+        (r#"꼐"#, r#"꼐"#, r#"꼐"#, r#"꼐"#, r#"꼐"#),
+        (r#"꼑"#, r#"꼑"#, r#"꼑"#, r#"꼑"#, r#"꼑"#),
+        (r#"꼒"#, r#"꼒"#, r#"꼒"#, r#"꼒"#, r#"꼒"#),
+        (r#"꼓"#, r#"꼓"#, r#"꼓"#, r#"꼓"#, r#"꼓"#),
+        (r#"꼔"#, r#"꼔"#, r#"꼔"#, r#"꼔"#, r#"꼔"#),
+        (r#"꼕"#, r#"꼕"#, r#"꼕"#, r#"꼕"#, r#"꼕"#),
+        (r#"꼖"#, r#"꼖"#, r#"꼖"#, r#"꼖"#, r#"꼖"#),
+        (r#"꼗"#, r#"꼗"#, r#"꼗"#, r#"꼗"#, r#"꼗"#),
+        (r#"꼘"#, r#"꼘"#, r#"꼘"#, r#"꼘"#, r#"꼘"#),
+        (r#"꼙"#, r#"꼙"#, r#"꼙"#, r#"꼙"#, r#"꼙"#),
+        (r#"꼚"#, r#"꼚"#, r#"꼚"#, r#"꼚"#, r#"꼚"#),
+        (r#"꼛"#, r#"꼛"#, r#"꼛"#, r#"꼛"#, r#"꼛"#),
+        (r#"꼜"#, r#"꼜"#, r#"꼜"#, r#"꼜"#, r#"꼜"#),
+        (r#"꼝"#, r#"꼝"#, r#"꼝"#, r#"꼝"#, r#"꼝"#),
+        (r#"꼞"#, r#"꼞"#, r#"꼞"#, r#"꼞"#, r#"꼞"#),
+        (r#"꼟"#, r#"꼟"#, r#"꼟"#, r#"꼟"#, r#"꼟"#),
+        (r#"꼠"#, r#"꼠"#, r#"꼠"#, r#"꼠"#, r#"꼠"#),
+        (r#"꼡"#, r#"꼡"#, r#"꼡"#, r#"꼡"#, r#"꼡"#),
+        (r#"꼢"#, r#"꼢"#, r#"꼢"#, r#"꼢"#, r#"꼢"#),
+        (r#"꼣"#, r#"꼣"#, r#"꼣"#, r#"꼣"#, r#"꼣"#),
+        (r#"꼤"#, r#"꼤"#, r#"꼤"#, r#"꼤"#, r#"꼤"#),
+        (r#"꼥"#, r#"꼥"#, r#"꼥"#, r#"꼥"#, r#"꼥"#),
+        (r#"꼦"#, r#"꼦"#, r#"꼦"#, r#"꼦"#, r#"꼦"#),
+        (r#"꼧"#, r#"꼧"#, r#"꼧"#, r#"꼧"#, r#"꼧"#),
+        (r#"꼨"#, r#"꼨"#, r#"꼨"#, r#"꼨"#, r#"꼨"#),
+        (r#"꼩"#, r#"꼩"#, r#"꼩"#, r#"꼩"#, r#"꼩"#),
+        (r#"꼪"#, r#"꼪"#, r#"꼪"#, r#"꼪"#, r#"꼪"#),
+        (r#"꼫"#, r#"꼫"#, r#"꼫"#, r#"꼫"#, r#"꼫"#),
+        (r#"꼬"#, r#"꼬"#, r#"꼬"#, r#"꼬"#, r#"꼬"#),
+        (r#"꼭"#, r#"꼭"#, r#"꼭"#, r#"꼭"#, r#"꼭"#),
+        (r#"꼮"#, r#"꼮"#, r#"꼮"#, r#"꼮"#, r#"꼮"#),
+        (r#"꼯"#, r#"꼯"#, r#"꼯"#, r#"꼯"#, r#"꼯"#),
+        (r#"꼰"#, r#"꼰"#, r#"꼰"#, r#"꼰"#, r#"꼰"#),
+        (r#"꼱"#, r#"꼱"#, r#"꼱"#, r#"꼱"#, r#"꼱"#),
+        (r#"꼲"#, r#"꼲"#, r#"꼲"#, r#"꼲"#, r#"꼲"#),
+        (r#"꼳"#, r#"꼳"#, r#"꼳"#, r#"꼳"#, r#"꼳"#),
+        (r#"꼴"#, r#"꼴"#, r#"꼴"#, r#"꼴"#, r#"꼴"#),
+        (r#"꼵"#, r#"꼵"#, r#"꼵"#, r#"꼵"#, r#"꼵"#),
+        (r#"꼶"#, r#"꼶"#, r#"꼶"#, r#"꼶"#, r#"꼶"#),
+        (r#"꼷"#, r#"꼷"#, r#"꼷"#, r#"꼷"#, r#"꼷"#),
+        (r#"꼸"#, r#"꼸"#, r#"꼸"#, r#"꼸"#, r#"꼸"#),
+        (r#"꼹"#, r#"꼹"#, r#"꼹"#, r#"꼹"#, r#"꼹"#),
+        (r#"꼺"#, r#"꼺"#, r#"꼺"#, r#"꼺"#, r#"꼺"#),
+        (r#"꼻"#, r#"꼻"#, r#"꼻"#, r#"꼻"#, r#"꼻"#),
+        (r#"꼼"#, r#"꼼"#, r#"꼼"#, r#"꼼"#, r#"꼼"#),
+        (r#"꼽"#, r#"꼽"#, r#"꼽"#, r#"꼽"#, r#"꼽"#),
+        (r#"꼾"#, r#"꼾"#, r#"꼾"#, r#"꼾"#, r#"꼾"#),
+        (r#"꼿"#, r#"꼿"#, r#"꼿"#, r#"꼿"#, r#"꼿"#),
+        (r#"꽀"#, r#"꽀"#, r#"꽀"#, r#"꽀"#, r#"꽀"#),
+        (r#"꽁"#, r#"꽁"#, r#"꽁"#, r#"꽁"#, r#"꽁"#),
+        (r#"꽂"#, r#"꽂"#, r#"꽂"#, r#"꽂"#, r#"꽂"#),
+        (r#"꽃"#, r#"꽃"#, r#"꽃"#, r#"꽃"#, r#"꽃"#),
+        (r#"꽄"#, r#"꽄"#, r#"꽄"#, r#"꽄"#, r#"꽄"#),
+        (r#"꽅"#, r#"꽅"#, r#"꽅"#, r#"꽅"#, r#"꽅"#),
+        (r#"꽆"#, r#"꽆"#, r#"꽆"#, r#"꽆"#, r#"꽆"#),
+        (r#"꽇"#, r#"꽇"#, r#"꽇"#, r#"꽇"#, r#"꽇"#),
+        (r#"꽈"#, r#"꽈"#, r#"꽈"#, r#"꽈"#, r#"꽈"#),
+        (r#"꽉"#, r#"꽉"#, r#"꽉"#, r#"꽉"#, r#"꽉"#),
+        (r#"꽊"#, r#"꽊"#, r#"꽊"#, r#"꽊"#, r#"꽊"#),
+        (r#"꽋"#, r#"꽋"#, r#"꽋"#, r#"꽋"#, r#"꽋"#),
+        (r#"꽌"#, r#"꽌"#, r#"꽌"#, r#"꽌"#, r#"꽌"#),
+        (r#"꽍"#, r#"꽍"#, r#"꽍"#, r#"꽍"#, r#"꽍"#),
+        (r#"꽎"#, r#"꽎"#, r#"꽎"#, r#"꽎"#, r#"꽎"#),
+        (r#"꽏"#, r#"꽏"#, r#"꽏"#, r#"꽏"#, r#"꽏"#),
+        (r#"꽐"#, r#"꽐"#, r#"꽐"#, r#"꽐"#, r#"꽐"#),
+        (r#"꽑"#, r#"꽑"#, r#"꽑"#, r#"꽑"#, r#"꽑"#),
+        (r#"꽒"#, r#"꽒"#, r#"꽒"#, r#"꽒"#, r#"꽒"#),
+        (r#"꽓"#, r#"꽓"#, r#"꽓"#, r#"꽓"#, r#"꽓"#),
+        (r#"꽔"#, r#"꽔"#, r#"꽔"#, r#"꽔"#, r#"꽔"#),
+        (r#"꽕"#, r#"꽕"#, r#"꽕"#, r#"꽕"#, r#"꽕"#),
+        (r#"꽖"#, r#"꽖"#, r#"꽖"#, r#"꽖"#, r#"꽖"#),
+        (r#"꽗"#, r#"꽗"#, r#"꽗"#, r#"꽗"#, r#"꽗"#),
+        (r#"꽘"#, r#"꽘"#, r#"꽘"#, r#"꽘"#, r#"꽘"#),
+        (r#"꽙"#, r#"꽙"#, r#"꽙"#, r#"꽙"#, r#"꽙"#),
+        (r#"꽚"#, r#"꽚"#, r#"꽚"#, r#"꽚"#, r#"꽚"#),
+        (r#"꽛"#, r#"꽛"#, r#"꽛"#, r#"꽛"#, r#"꽛"#),
+        (r#"꽜"#, r#"꽜"#, r#"꽜"#, r#"꽜"#, r#"꽜"#),
+        (r#"꽝"#, r#"꽝"#, r#"꽝"#, r#"꽝"#, r#"꽝"#),
+        (r#"꽞"#, r#"꽞"#, r#"꽞"#, r#"꽞"#, r#"꽞"#),
+        (r#"꽟"#, r#"꽟"#, r#"꽟"#, r#"꽟"#, r#"꽟"#),
+        (r#"꽠"#, r#"꽠"#, r#"꽠"#, r#"꽠"#, r#"꽠"#),
+        (r#"꽡"#, r#"꽡"#, r#"꽡"#, r#"꽡"#, r#"꽡"#),
+        (r#"꽢"#, r#"꽢"#, r#"꽢"#, r#"꽢"#, r#"꽢"#),
+        (r#"꽣"#, r#"꽣"#, r#"꽣"#, r#"꽣"#, r#"꽣"#),
+        (r#"꽤"#, r#"꽤"#, r#"꽤"#, r#"꽤"#, r#"꽤"#),
+        (r#"꽥"#, r#"꽥"#, r#"꽥"#, r#"꽥"#, r#"꽥"#),
+        (r#"꽦"#, r#"꽦"#, r#"꽦"#, r#"꽦"#, r#"꽦"#),
+        (r#"꽧"#, r#"꽧"#, r#"꽧"#, r#"꽧"#, r#"꽧"#),
+        (r#"꽨"#, r#"꽨"#, r#"꽨"#, r#"꽨"#, r#"꽨"#),
+        (r#"꽩"#, r#"꽩"#, r#"꽩"#, r#"꽩"#, r#"꽩"#),
+        (r#"꽪"#, r#"꽪"#, r#"꽪"#, r#"꽪"#, r#"꽪"#),
+        (r#"꽫"#, r#"꽫"#, r#"꽫"#, r#"꽫"#, r#"꽫"#),
+        (r#"꽬"#, r#"꽬"#, r#"꽬"#, r#"꽬"#, r#"꽬"#),
+        (r#"꽭"#, r#"꽭"#, r#"꽭"#, r#"꽭"#, r#"꽭"#),
+        (r#"꽮"#, r#"꽮"#, r#"꽮"#, r#"꽮"#, r#"꽮"#),
+        (r#"꽯"#, r#"꽯"#, r#"꽯"#, r#"꽯"#, r#"꽯"#),
+        (r#"꽰"#, r#"꽰"#, r#"꽰"#, r#"꽰"#, r#"꽰"#),
+        (r#"꽱"#, r#"꽱"#, r#"꽱"#, r#"꽱"#, r#"꽱"#),
+        (r#"꽲"#, r#"꽲"#, r#"꽲"#, r#"꽲"#, r#"꽲"#),
+        (r#"꽳"#, r#"꽳"#, r#"꽳"#, r#"꽳"#, r#"꽳"#),
+        (r#"꽴"#, r#"꽴"#, r#"꽴"#, r#"꽴"#, r#"꽴"#),
+        (r#"꽵"#, r#"꽵"#, r#"꽵"#, r#"꽵"#, r#"꽵"#),
+        (r#"꽶"#, r#"꽶"#, r#"꽶"#, r#"꽶"#, r#"꽶"#),
+        (r#"꽷"#, r#"꽷"#, r#"꽷"#, r#"꽷"#, r#"꽷"#),
+        (r#"꽸"#, r#"꽸"#, r#"꽸"#, r#"꽸"#, r#"꽸"#),
+        (r#"꽹"#, r#"꽹"#, r#"꽹"#, r#"꽹"#, r#"꽹"#),
+        (r#"꽺"#, r#"꽺"#, r#"꽺"#, r#"꽺"#, r#"꽺"#),
+        (r#"꽻"#, r#"꽻"#, r#"꽻"#, r#"꽻"#, r#"꽻"#),
+        (r#"꽼"#, r#"꽼"#, r#"꽼"#, r#"꽼"#, r#"꽼"#),
+        (r#"꽽"#, r#"꽽"#, r#"꽽"#, r#"꽽"#, r#"꽽"#),
+        (r#"꽾"#, r#"꽾"#, r#"꽾"#, r#"꽾"#, r#"꽾"#),
+        (r#"꽿"#, r#"꽿"#, r#"꽿"#, r#"꽿"#, r#"꽿"#),
+        (r#"꾀"#, r#"꾀"#, r#"꾀"#, r#"꾀"#, r#"꾀"#),
+        (r#"꾁"#, r#"꾁"#, r#"꾁"#, r#"꾁"#, r#"꾁"#),
+        (r#"꾂"#, r#"꾂"#, r#"꾂"#, r#"꾂"#, r#"꾂"#),
+        (r#"꾃"#, r#"꾃"#, r#"꾃"#, r#"꾃"#, r#"꾃"#),
+        (r#"꾄"#, r#"꾄"#, r#"꾄"#, r#"꾄"#, r#"꾄"#),
+        (r#"꾅"#, r#"꾅"#, r#"꾅"#, r#"꾅"#, r#"꾅"#),
+        (r#"꾆"#, r#"꾆"#, r#"꾆"#, r#"꾆"#, r#"꾆"#),
+        (r#"꾇"#, r#"꾇"#, r#"꾇"#, r#"꾇"#, r#"꾇"#),
+        (r#"꾈"#, r#"꾈"#, r#"꾈"#, r#"꾈"#, r#"꾈"#),
+        (r#"꾉"#, r#"꾉"#, r#"꾉"#, r#"꾉"#, r#"꾉"#),
+        (r#"꾊"#, r#"꾊"#, r#"꾊"#, r#"꾊"#, r#"꾊"#),
+        (r#"꾋"#, r#"꾋"#, r#"꾋"#, r#"꾋"#, r#"꾋"#),
+        (r#"꾌"#, r#"꾌"#, r#"꾌"#, r#"꾌"#, r#"꾌"#),
+        (r#"꾍"#, r#"꾍"#, r#"꾍"#, r#"꾍"#, r#"꾍"#),
+        (r#"꾎"#, r#"꾎"#, r#"꾎"#, r#"꾎"#, r#"꾎"#),
+        (r#"꾏"#, r#"꾏"#, r#"꾏"#, r#"꾏"#, r#"꾏"#),
+        (r#"꾐"#, r#"꾐"#, r#"꾐"#, r#"꾐"#, r#"꾐"#),
+        (r#"꾑"#, r#"꾑"#, r#"꾑"#, r#"꾑"#, r#"꾑"#),
+        (r#"꾒"#, r#"꾒"#, r#"꾒"#, r#"꾒"#, r#"꾒"#),
+        (r#"꾓"#, r#"꾓"#, r#"꾓"#, r#"꾓"#, r#"꾓"#),
+        (r#"꾔"#, r#"꾔"#, r#"꾔"#, r#"꾔"#, r#"꾔"#),
+        (r#"꾕"#, r#"꾕"#, r#"꾕"#, r#"꾕"#, r#"꾕"#),
+        (r#"꾖"#, r#"꾖"#, r#"꾖"#, r#"꾖"#, r#"꾖"#),
+        (r#"꾗"#, r#"꾗"#, r#"꾗"#, r#"꾗"#, r#"꾗"#),
+        (r#"꾘"#, r#"꾘"#, r#"꾘"#, r#"꾘"#, r#"꾘"#),
+        (r#"꾙"#, r#"꾙"#, r#"꾙"#, r#"꾙"#, r#"꾙"#),
+        (r#"꾚"#, r#"꾚"#, r#"꾚"#, r#"꾚"#, r#"꾚"#),
+        (r#"꾛"#, r#"꾛"#, r#"꾛"#, r#"꾛"#, r#"꾛"#),
+        (r#"꾜"#, r#"꾜"#, r#"꾜"#, r#"꾜"#, r#"꾜"#),
+        (r#"꾝"#, r#"꾝"#, r#"꾝"#, r#"꾝"#, r#"꾝"#),
+        (r#"꾞"#, r#"꾞"#, r#"꾞"#, r#"꾞"#, r#"꾞"#),
+        (r#"꾟"#, r#"꾟"#, r#"꾟"#, r#"꾟"#, r#"꾟"#),
+        (r#"꾠"#, r#"꾠"#, r#"꾠"#, r#"꾠"#, r#"꾠"#),
+        (r#"꾡"#, r#"꾡"#, r#"꾡"#, r#"꾡"#, r#"꾡"#),
+        (r#"꾢"#, r#"꾢"#, r#"꾢"#, r#"꾢"#, r#"꾢"#),
+        (r#"꾣"#, r#"꾣"#, r#"꾣"#, r#"꾣"#, r#"꾣"#),
+        (r#"꾤"#, r#"꾤"#, r#"꾤"#, r#"꾤"#, r#"꾤"#),
+        (r#"꾥"#, r#"꾥"#, r#"꾥"#, r#"꾥"#, r#"꾥"#),
+        (r#"꾦"#, r#"꾦"#, r#"꾦"#, r#"꾦"#, r#"꾦"#),
+        (r#"꾧"#, r#"꾧"#, r#"꾧"#, r#"꾧"#, r#"꾧"#),
+        (r#"꾨"#, r#"꾨"#, r#"꾨"#, r#"꾨"#, r#"꾨"#),
+        (r#"꾩"#, r#"꾩"#, r#"꾩"#, r#"꾩"#, r#"꾩"#),
+        (r#"꾪"#, r#"꾪"#, r#"꾪"#, r#"꾪"#, r#"꾪"#),
+        (r#"꾫"#, r#"꾫"#, r#"꾫"#, r#"꾫"#, r#"꾫"#),
+        (r#"꾬"#, r#"꾬"#, r#"꾬"#, r#"꾬"#, r#"꾬"#),
+        (r#"꾭"#, r#"꾭"#, r#"꾭"#, r#"꾭"#, r#"꾭"#),
+        (r#"꾮"#, r#"꾮"#, r#"꾮"#, r#"꾮"#, r#"꾮"#),
+        (r#"꾯"#, r#"꾯"#, r#"꾯"#, r#"꾯"#, r#"꾯"#),
+        (r#"꾰"#, r#"꾰"#, r#"꾰"#, r#"꾰"#, r#"꾰"#),
+        (r#"꾱"#, r#"꾱"#, r#"꾱"#, r#"꾱"#, r#"꾱"#),
+        (r#"꾲"#, r#"꾲"#, r#"꾲"#, r#"꾲"#, r#"꾲"#),
+        (r#"꾳"#, r#"꾳"#, r#"꾳"#, r#"꾳"#, r#"꾳"#),
+        (r#"꾴"#, r#"꾴"#, r#"꾴"#, r#"꾴"#, r#"꾴"#),
+        (r#"꾵"#, r#"꾵"#, r#"꾵"#, r#"꾵"#, r#"꾵"#),
+        (r#"꾶"#, r#"꾶"#, r#"꾶"#, r#"꾶"#, r#"꾶"#),
+        (r#"꾷"#, r#"꾷"#, r#"꾷"#, r#"꾷"#, r#"꾷"#),
+        (r#"꾸"#, r#"꾸"#, r#"꾸"#, r#"꾸"#, r#"꾸"#),
+        (r#"꾹"#, r#"꾹"#, r#"꾹"#, r#"꾹"#, r#"꾹"#),
+        (r#"꾺"#, r#"꾺"#, r#"꾺"#, r#"꾺"#, r#"꾺"#),
+        (r#"꾻"#, r#"꾻"#, r#"꾻"#, r#"꾻"#, r#"꾻"#),
+        (r#"꾼"#, r#"꾼"#, r#"꾼"#, r#"꾼"#, r#"꾼"#),
+        (r#"꾽"#, r#"꾽"#, r#"꾽"#, r#"꾽"#, r#"꾽"#),
+        (r#"꾾"#, r#"꾾"#, r#"꾾"#, r#"꾾"#, r#"꾾"#),
+        (r#"꾿"#, r#"꾿"#, r#"꾿"#, r#"꾿"#, r#"꾿"#),
+        (r#"꿀"#, r#"꿀"#, r#"꿀"#, r#"꿀"#, r#"꿀"#),
+        (r#"꿁"#, r#"꿁"#, r#"꿁"#, r#"꿁"#, r#"꿁"#),
+        (r#"꿂"#, r#"꿂"#, r#"꿂"#, r#"꿂"#, r#"꿂"#),
+        (r#"꿃"#, r#"꿃"#, r#"꿃"#, r#"꿃"#, r#"꿃"#),
+        (r#"꿄"#, r#"꿄"#, r#"꿄"#, r#"꿄"#, r#"꿄"#),
+        (r#"꿅"#, r#"꿅"#, r#"꿅"#, r#"꿅"#, r#"꿅"#),
+        (r#"꿆"#, r#"꿆"#, r#"꿆"#, r#"꿆"#, r#"꿆"#),
+        (r#"꿇"#, r#"꿇"#, r#"꿇"#, r#"꿇"#, r#"꿇"#),
+        (r#"꿈"#, r#"꿈"#, r#"꿈"#, r#"꿈"#, r#"꿈"#),
+        (r#"꿉"#, r#"꿉"#, r#"꿉"#, r#"꿉"#, r#"꿉"#),
+        (r#"꿊"#, r#"꿊"#, r#"꿊"#, r#"꿊"#, r#"꿊"#),
+        (r#"꿋"#, r#"꿋"#, r#"꿋"#, r#"꿋"#, r#"꿋"#),
+        (r#"꿌"#, r#"꿌"#, r#"꿌"#, r#"꿌"#, r#"꿌"#),
+        (r#"꿍"#, r#"꿍"#, r#"꿍"#, r#"꿍"#, r#"꿍"#),
+        (r#"꿎"#, r#"꿎"#, r#"꿎"#, r#"꿎"#, r#"꿎"#),
+        (r#"꿏"#, r#"꿏"#, r#"꿏"#, r#"꿏"#, r#"꿏"#),
+        (r#"꿐"#, r#"꿐"#, r#"꿐"#, r#"꿐"#, r#"꿐"#),
+        (r#"꿑"#, r#"꿑"#, r#"꿑"#, r#"꿑"#, r#"꿑"#),
+        (r#"꿒"#, r#"꿒"#, r#"꿒"#, r#"꿒"#, r#"꿒"#),
+        (r#"꿓"#, r#"꿓"#, r#"꿓"#, r#"꿓"#, r#"꿓"#),
+        (r#"꿔"#, r#"꿔"#, r#"꿔"#, r#"꿔"#, r#"꿔"#),
+        (r#"꿕"#, r#"꿕"#, r#"꿕"#, r#"꿕"#, r#"꿕"#),
+        (r#"꿖"#, r#"꿖"#, r#"꿖"#, r#"꿖"#, r#"꿖"#),
+        (r#"꿗"#, r#"꿗"#, r#"꿗"#, r#"꿗"#, r#"꿗"#),
+        (r#"꿘"#, r#"꿘"#, r#"꿘"#, r#"꿘"#, r#"꿘"#),
+        (r#"꿙"#, r#"꿙"#, r#"꿙"#, r#"꿙"#, r#"꿙"#),
+        (r#"꿚"#, r#"꿚"#, r#"꿚"#, r#"꿚"#, r#"꿚"#),
+        (r#"꿛"#, r#"꿛"#, r#"꿛"#, r#"꿛"#, r#"꿛"#),
+        (r#"꿜"#, r#"꿜"#, r#"꿜"#, r#"꿜"#, r#"꿜"#),
+        (r#"꿝"#, r#"꿝"#, r#"꿝"#, r#"꿝"#, r#"꿝"#),
+        (r#"꿞"#, r#"꿞"#, r#"꿞"#, r#"꿞"#, r#"꿞"#),
+        (r#"꿟"#, r#"꿟"#, r#"꿟"#, r#"꿟"#, r#"꿟"#),
+        (r#"꿠"#, r#"꿠"#, r#"꿠"#, r#"꿠"#, r#"꿠"#),
+        (r#"꿡"#, r#"꿡"#, r#"꿡"#, r#"꿡"#, r#"꿡"#),
+        (r#"꿢"#, r#"꿢"#, r#"꿢"#, r#"꿢"#, r#"꿢"#),
+        (r#"꿣"#, r#"꿣"#, r#"꿣"#, r#"꿣"#, r#"꿣"#),
+        (r#"꿤"#, r#"꿤"#, r#"꿤"#, r#"꿤"#, r#"꿤"#),
+        (r#"꿥"#, r#"꿥"#, r#"꿥"#, r#"꿥"#, r#"꿥"#),
+        (r#"꿦"#, r#"꿦"#, r#"꿦"#, r#"꿦"#, r#"꿦"#),
+        (r#"꿧"#, r#"꿧"#, r#"꿧"#, r#"꿧"#, r#"꿧"#),
+        (r#"꿨"#, r#"꿨"#, r#"꿨"#, r#"꿨"#, r#"꿨"#),
+        (r#"꿩"#, r#"꿩"#, r#"꿩"#, r#"꿩"#, r#"꿩"#),
+        (r#"꿪"#, r#"꿪"#, r#"꿪"#, r#"꿪"#, r#"꿪"#),
+        (r#"꿫"#, r#"꿫"#, r#"꿫"#, r#"꿫"#, r#"꿫"#),
+        (r#"꿬"#, r#"꿬"#, r#"꿬"#, r#"꿬"#, r#"꿬"#),
+        (r#"꿭"#, r#"꿭"#, r#"꿭"#, r#"꿭"#, r#"꿭"#),
+        (r#"꿮"#, r#"꿮"#, r#"꿮"#, r#"꿮"#, r#"꿮"#),
+        (r#"꿯"#, r#"꿯"#, r#"꿯"#, r#"꿯"#, r#"꿯"#),
+        (r#"꿰"#, r#"꿰"#, r#"꿰"#, r#"꿰"#, r#"꿰"#),
+        (r#"꿱"#, r#"꿱"#, r#"꿱"#, r#"꿱"#, r#"꿱"#),
+        (r#"꿲"#, r#"꿲"#, r#"꿲"#, r#"꿲"#, r#"꿲"#),
+        (r#"꿳"#, r#"꿳"#, r#"꿳"#, r#"꿳"#, r#"꿳"#),
+        (r#"꿴"#, r#"꿴"#, r#"꿴"#, r#"꿴"#, r#"꿴"#),
+        (r#"꿵"#, r#"꿵"#, r#"꿵"#, r#"꿵"#, r#"꿵"#),
+        (r#"꿶"#, r#"꿶"#, r#"꿶"#, r#"꿶"#, r#"꿶"#),
+        (r#"꿷"#, r#"꿷"#, r#"꿷"#, r#"꿷"#, r#"꿷"#),
+        (r#"꿸"#, r#"꿸"#, r#"꿸"#, r#"꿸"#, r#"꿸"#),
+        (r#"꿹"#, r#"꿹"#, r#"꿹"#, r#"꿹"#, r#"꿹"#),
+        (r#"꿺"#, r#"꿺"#, r#"꿺"#, r#"꿺"#, r#"꿺"#),
+        (r#"꿻"#, r#"꿻"#, r#"꿻"#, r#"꿻"#, r#"꿻"#),
+        (r#"꿼"#, r#"꿼"#, r#"꿼"#, r#"꿼"#, r#"꿼"#),
+        (r#"꿽"#, r#"꿽"#, r#"꿽"#, r#"꿽"#, r#"꿽"#),
+        (r#"꿾"#, r#"꿾"#, r#"꿾"#, r#"꿾"#, r#"꿾"#),
+        (r#"꿿"#, r#"꿿"#, r#"꿿"#, r#"꿿"#, r#"꿿"#),
+        (r#"뀀"#, r#"뀀"#, r#"뀀"#, r#"뀀"#, r#"뀀"#),
+        (r#"뀁"#, r#"뀁"#, r#"뀁"#, r#"뀁"#, r#"뀁"#),
+        (r#"뀂"#, r#"뀂"#, r#"뀂"#, r#"뀂"#, r#"뀂"#),
+        (r#"뀃"#, r#"뀃"#, r#"뀃"#, r#"뀃"#, r#"뀃"#),
+        (r#"뀄"#, r#"뀄"#, r#"뀄"#, r#"뀄"#, r#"뀄"#),
+        (r#"뀅"#, r#"뀅"#, r#"뀅"#, r#"뀅"#, r#"뀅"#),
+        (r#"뀆"#, r#"뀆"#, r#"뀆"#, r#"뀆"#, r#"뀆"#),
+        (r#"뀇"#, r#"뀇"#, r#"뀇"#, r#"뀇"#, r#"뀇"#),
+        (r#"뀈"#, r#"뀈"#, r#"뀈"#, r#"뀈"#, r#"뀈"#),
+        (r#"뀉"#, r#"뀉"#, r#"뀉"#, r#"뀉"#, r#"뀉"#),
+        (r#"뀊"#, r#"뀊"#, r#"뀊"#, r#"뀊"#, r#"뀊"#),
+        (r#"뀋"#, r#"뀋"#, r#"뀋"#, r#"뀋"#, r#"뀋"#),
+        (r#"뀌"#, r#"뀌"#, r#"뀌"#, r#"뀌"#, r#"뀌"#),
+        (r#"뀍"#, r#"뀍"#, r#"뀍"#, r#"뀍"#, r#"뀍"#),
+        (r#"뀎"#, r#"뀎"#, r#"뀎"#, r#"뀎"#, r#"뀎"#),
+        (r#"뀏"#, r#"뀏"#, r#"뀏"#, r#"뀏"#, r#"뀏"#),
+        (r#"뀐"#, r#"뀐"#, r#"뀐"#, r#"뀐"#, r#"뀐"#),
+        (r#"뀑"#, r#"뀑"#, r#"뀑"#, r#"뀑"#, r#"뀑"#),
+        (r#"뀒"#, r#"뀒"#, r#"뀒"#, r#"뀒"#, r#"뀒"#),
+        (r#"뀓"#, r#"뀓"#, r#"뀓"#, r#"뀓"#, r#"뀓"#),
+        (r#"뀔"#, r#"뀔"#, r#"뀔"#, r#"뀔"#, r#"뀔"#),
+        (r#"뀕"#, r#"뀕"#, r#"뀕"#, r#"뀕"#, r#"뀕"#),
+        (r#"뀖"#, r#"뀖"#, r#"뀖"#, r#"뀖"#, r#"뀖"#),
+        (r#"뀗"#, r#"뀗"#, r#"뀗"#, r#"뀗"#, r#"뀗"#),
+        (r#"뀘"#, r#"뀘"#, r#"뀘"#, r#"뀘"#, r#"뀘"#),
+        (r#"뀙"#, r#"뀙"#, r#"뀙"#, r#"뀙"#, r#"뀙"#),
+        (r#"뀚"#, r#"뀚"#, r#"뀚"#, r#"뀚"#, r#"뀚"#),
+        (r#"뀛"#, r#"뀛"#, r#"뀛"#, r#"뀛"#, r#"뀛"#),
+        (r#"뀜"#, r#"뀜"#, r#"뀜"#, r#"뀜"#, r#"뀜"#),
+        (r#"뀝"#, r#"뀝"#, r#"뀝"#, r#"뀝"#, r#"뀝"#),
+        (r#"뀞"#, r#"뀞"#, r#"뀞"#, r#"뀞"#, r#"뀞"#),
+        (r#"뀟"#, r#"뀟"#, r#"뀟"#, r#"뀟"#, r#"뀟"#),
+        (r#"뀠"#, r#"뀠"#, r#"뀠"#, r#"뀠"#, r#"뀠"#),
+        (r#"뀡"#, r#"뀡"#, r#"뀡"#, r#"뀡"#, r#"뀡"#),
+        (r#"뀢"#, r#"뀢"#, r#"뀢"#, r#"뀢"#, r#"뀢"#),
+        (r#"뀣"#, r#"뀣"#, r#"뀣"#, r#"뀣"#, r#"뀣"#),
+        (r#"뀤"#, r#"뀤"#, r#"뀤"#, r#"뀤"#, r#"뀤"#),
+        (r#"뀥"#, r#"뀥"#, r#"뀥"#, r#"뀥"#, r#"뀥"#),
+        (r#"뀦"#, r#"뀦"#, r#"뀦"#, r#"뀦"#, r#"뀦"#),
+        (r#"뀧"#, r#"뀧"#, r#"뀧"#, r#"뀧"#, r#"뀧"#),
+        (r#"뀨"#, r#"뀨"#, r#"뀨"#, r#"뀨"#, r#"뀨"#),
+        (r#"뀩"#, r#"뀩"#, r#"뀩"#, r#"뀩"#, r#"뀩"#),
+        (r#"뀪"#, r#"뀪"#, r#"뀪"#, r#"뀪"#, r#"뀪"#),
+        (r#"뀫"#, r#"뀫"#, r#"뀫"#, r#"뀫"#, r#"뀫"#),
+        (r#"뀬"#, r#"뀬"#, r#"뀬"#, r#"뀬"#, r#"뀬"#),
+        (r#"뀭"#, r#"뀭"#, r#"뀭"#, r#"뀭"#, r#"뀭"#),
+        (r#"뀮"#, r#"뀮"#, r#"뀮"#, r#"뀮"#, r#"뀮"#),
+        (r#"뀯"#, r#"뀯"#, r#"뀯"#, r#"뀯"#, r#"뀯"#),
+        (r#"뀰"#, r#"뀰"#, r#"뀰"#, r#"뀰"#, r#"뀰"#),
+        (r#"뀱"#, r#"뀱"#, r#"뀱"#, r#"뀱"#, r#"뀱"#),
+        (r#"뀲"#, r#"뀲"#, r#"뀲"#, r#"뀲"#, r#"뀲"#),
+        (r#"뀳"#, r#"뀳"#, r#"뀳"#, r#"뀳"#, r#"뀳"#),
+        (r#"뀴"#, r#"뀴"#, r#"뀴"#, r#"뀴"#, r#"뀴"#),
+        (r#"뀵"#, r#"뀵"#, r#"뀵"#, r#"뀵"#, r#"뀵"#),
+        (r#"뀶"#, r#"뀶"#, r#"뀶"#, r#"뀶"#, r#"뀶"#),
+        (r#"뀷"#, r#"뀷"#, r#"뀷"#, r#"뀷"#, r#"뀷"#),
+        (r#"뀸"#, r#"뀸"#, r#"뀸"#, r#"뀸"#, r#"뀸"#),
+        (r#"뀹"#, r#"뀹"#, r#"뀹"#, r#"뀹"#, r#"뀹"#),
+        (r#"뀺"#, r#"뀺"#, r#"뀺"#, r#"뀺"#, r#"뀺"#),
+        (r#"뀻"#, r#"뀻"#, r#"뀻"#, r#"뀻"#, r#"뀻"#),
+        (r#"뀼"#, r#"뀼"#, r#"뀼"#, r#"뀼"#, r#"뀼"#),
+        (r#"뀽"#, r#"뀽"#, r#"뀽"#, r#"뀽"#, r#"뀽"#),
+        (r#"뀾"#, r#"뀾"#, r#"뀾"#, r#"뀾"#, r#"뀾"#),
+        (r#"뀿"#, r#"뀿"#, r#"뀿"#, r#"뀿"#, r#"뀿"#),
+        (r#"끀"#, r#"끀"#, r#"끀"#, r#"끀"#, r#"끀"#),
+        (r#"끁"#, r#"끁"#, r#"끁"#, r#"끁"#, r#"끁"#),
+        (r#"끂"#, r#"끂"#, r#"끂"#, r#"끂"#, r#"끂"#),
+        (r#"끃"#, r#"끃"#, r#"끃"#, r#"끃"#, r#"끃"#),
+        (r#"끄"#, r#"끄"#, r#"끄"#, r#"끄"#, r#"끄"#),
+        (r#"끅"#, r#"끅"#, r#"끅"#, r#"끅"#, r#"끅"#),
+        (r#"끆"#, r#"끆"#, r#"끆"#, r#"끆"#, r#"끆"#),
+        (r#"끇"#, r#"끇"#, r#"끇"#, r#"끇"#, r#"끇"#),
+        (r#"끈"#, r#"끈"#, r#"끈"#, r#"끈"#, r#"끈"#),
+        (r#"끉"#, r#"끉"#, r#"끉"#, r#"끉"#, r#"끉"#),
+        (r#"끊"#, r#"끊"#, r#"끊"#, r#"끊"#, r#"끊"#),
+        (r#"끋"#, r#"끋"#, r#"끋"#, r#"끋"#, r#"끋"#),
+        (r#"끌"#, r#"끌"#, r#"끌"#, r#"끌"#, r#"끌"#),
+        (r#"끍"#, r#"끍"#, r#"끍"#, r#"끍"#, r#"끍"#),
+        (r#"끎"#, r#"끎"#, r#"끎"#, r#"끎"#, r#"끎"#),
+        (r#"끏"#, r#"끏"#, r#"끏"#, r#"끏"#, r#"끏"#),
+        (r#"끐"#, r#"끐"#, r#"끐"#, r#"끐"#, r#"끐"#),
+        (r#"끑"#, r#"끑"#, r#"끑"#, r#"끑"#, r#"끑"#),
+        (r#"끒"#, r#"끒"#, r#"끒"#, r#"끒"#, r#"끒"#),
+        (r#"끓"#, r#"끓"#, r#"끓"#, r#"끓"#, r#"끓"#),
+        (r#"끔"#, r#"끔"#, r#"끔"#, r#"끔"#, r#"끔"#),
+        (r#"끕"#, r#"끕"#, r#"끕"#, r#"끕"#, r#"끕"#),
+        (r#"끖"#, r#"끖"#, r#"끖"#, r#"끖"#, r#"끖"#),
+        (r#"끗"#, r#"끗"#, r#"끗"#, r#"끗"#, r#"끗"#),
+        (r#"끘"#, r#"끘"#, r#"끘"#, r#"끘"#, r#"끘"#),
+        (r#"끙"#, r#"끙"#, r#"끙"#, r#"끙"#, r#"끙"#),
+        (r#"끚"#, r#"끚"#, r#"끚"#, r#"끚"#, r#"끚"#),
+        (r#"끛"#, r#"끛"#, r#"끛"#, r#"끛"#, r#"끛"#),
+        (r#"끜"#, r#"끜"#, r#"끜"#, r#"끜"#, r#"끜"#),
+        (r#"끝"#, r#"끝"#, r#"끝"#, r#"끝"#, r#"끝"#),
+        (r#"끞"#, r#"끞"#, r#"끞"#, r#"끞"#, r#"끞"#),
+        (r#"끟"#, r#"끟"#, r#"끟"#, r#"끟"#, r#"끟"#),
+        (r#"끠"#, r#"끠"#, r#"끠"#, r#"끠"#, r#"끠"#),
+        (r#"끡"#, r#"끡"#, r#"끡"#, r#"끡"#, r#"끡"#),
+        (r#"끢"#, r#"끢"#, r#"끢"#, r#"끢"#, r#"끢"#),
+        (r#"끣"#, r#"끣"#, r#"끣"#, r#"끣"#, r#"끣"#),
+        (r#"끤"#, r#"끤"#, r#"끤"#, r#"끤"#, r#"끤"#),
+        (r#"끥"#, r#"끥"#, r#"끥"#, r#"끥"#, r#"끥"#),
+        (r#"끦"#, r#"끦"#, r#"끦"#, r#"끦"#, r#"끦"#),
+        (r#"끧"#, r#"끧"#, r#"끧"#, r#"끧"#, r#"끧"#),
+        (r#"끨"#, r#"끨"#, r#"끨"#, r#"끨"#, r#"끨"#),
+        (r#"끩"#, r#"끩"#, r#"끩"#, r#"끩"#, r#"끩"#),
+        (r#"끪"#, r#"끪"#, r#"끪"#, r#"끪"#, r#"끪"#),
+        (r#"끫"#, r#"끫"#, r#"끫"#, r#"끫"#, r#"끫"#),
+        (r#"끬"#, r#"끬"#, r#"끬"#, r#"끬"#, r#"끬"#),
+        (r#"끭"#, r#"끭"#, r#"끭"#, r#"끭"#, r#"끭"#),
+        (r#"끮"#, r#"끮"#, r#"끮"#, r#"끮"#, r#"끮"#),
+        (r#"끯"#, r#"끯"#, r#"끯"#, r#"끯"#, r#"끯"#),
+        (r#"끰"#, r#"끰"#, r#"끰"#, r#"끰"#, r#"끰"#),
+        (r#"끱"#, r#"끱"#, r#"끱"#, r#"끱"#, r#"끱"#),
+        (r#"끲"#, r#"끲"#, r#"끲"#, r#"끲"#, r#"끲"#),
+        (r#"끳"#, r#"끳"#, r#"끳"#, r#"끳"#, r#"끳"#),
+        (r#"끴"#, r#"끴"#, r#"끴"#, r#"끴"#, r#"끴"#),
+        (r#"끵"#, r#"끵"#, r#"끵"#, r#"끵"#, r#"끵"#),
+        (r#"끶"#, r#"끶"#, r#"끶"#, r#"끶"#, r#"끶"#),
+        (r#"끷"#, r#"끷"#, r#"끷"#, r#"끷"#, r#"끷"#),
+        (r#"끸"#, r#"끸"#, r#"끸"#, r#"끸"#, r#"끸"#),
+        (r#"끹"#, r#"끹"#, r#"끹"#, r#"끹"#, r#"끹"#),
+        (r#"끺"#, r#"끺"#, r#"끺"#, r#"끺"#, r#"끺"#),
+        (r#"끻"#, r#"끻"#, r#"끻"#, r#"끻"#, r#"끻"#),
+        (r#"끼"#, r#"끼"#, r#"끼"#, r#"끼"#, r#"끼"#),
+        (r#"끽"#, r#"끽"#, r#"끽"#, r#"끽"#, r#"끽"#),
+        (r#"끾"#, r#"끾"#, r#"끾"#, r#"끾"#, r#"끾"#),
+        (r#"끿"#, r#"끿"#, r#"끿"#, r#"끿"#, r#"끿"#),
+        (r#"낀"#, r#"낀"#, r#"낀"#, r#"낀"#, r#"낀"#),
+        (r#"낁"#, r#"낁"#, r#"낁"#, r#"낁"#, r#"낁"#),
+        (r#"낂"#, r#"낂"#, r#"낂"#, r#"낂"#, r#"낂"#),
+        (r#"낃"#, r#"낃"#, r#"낃"#, r#"낃"#, r#"낃"#),
+        (r#"낄"#, r#"낄"#, r#"낄"#, r#"낄"#, r#"낄"#),
+        (r#"낅"#, r#"낅"#, r#"낅"#, r#"낅"#, r#"낅"#),
+        (r#"낆"#, r#"낆"#, r#"낆"#, r#"낆"#, r#"낆"#),
+        (r#"낇"#, r#"낇"#, r#"낇"#, r#"낇"#, r#"낇"#),
+        (r#"낈"#, r#"낈"#, r#"낈"#, r#"낈"#, r#"낈"#),
+        (r#"낉"#, r#"낉"#, r#"낉"#, r#"낉"#, r#"낉"#),
+        (r#"낊"#, r#"낊"#, r#"낊"#, r#"낊"#, r#"낊"#),
+        (r#"낋"#, r#"낋"#, r#"낋"#, r#"낋"#, r#"낋"#),
+        (r#"낌"#, r#"낌"#, r#"낌"#, r#"낌"#, r#"낌"#),
+        (r#"낍"#, r#"낍"#, r#"낍"#, r#"낍"#, r#"낍"#),
+        (r#"낎"#, r#"낎"#, r#"낎"#, r#"낎"#, r#"낎"#),
+        (r#"낏"#, r#"낏"#, r#"낏"#, r#"낏"#, r#"낏"#),
+        (r#"낐"#, r#"낐"#, r#"낐"#, r#"낐"#, r#"낐"#),
+        (r#"낑"#, r#"낑"#, r#"낑"#, r#"낑"#, r#"낑"#),
+        (r#"낒"#, r#"낒"#, r#"낒"#, r#"낒"#, r#"낒"#),
+        (r#"낓"#, r#"낓"#, r#"낓"#, r#"낓"#, r#"낓"#),
+        (r#"낔"#, r#"낔"#, r#"낔"#, r#"낔"#, r#"낔"#),
+        (r#"낕"#, r#"낕"#, r#"낕"#, r#"낕"#, r#"낕"#),
+        (r#"낖"#, r#"낖"#, r#"낖"#, r#"낖"#, r#"낖"#),
+        (r#"낗"#, r#"낗"#, r#"낗"#, r#"낗"#, r#"낗"#),
+        (r#"나"#, r#"나"#, r#"나"#, r#"나"#, r#"나"#),
+        (r#"낙"#, r#"낙"#, r#"낙"#, r#"낙"#, r#"낙"#),
+        (r#"낚"#, r#"낚"#, r#"낚"#, r#"낚"#, r#"낚"#),
+        (r#"낛"#, r#"낛"#, r#"낛"#, r#"낛"#, r#"낛"#),
+        (r#"난"#, r#"난"#, r#"난"#, r#"난"#, r#"난"#),
+        (r#"낝"#, r#"낝"#, r#"낝"#, r#"낝"#, r#"낝"#),
+        (r#"낞"#, r#"낞"#, r#"낞"#, r#"낞"#, r#"낞"#),
+        (r#"낟"#, r#"낟"#, r#"낟"#, r#"낟"#, r#"낟"#),
+        (r#"날"#, r#"날"#, r#"날"#, r#"날"#, r#"날"#),
+        (r#"낡"#, r#"낡"#, r#"낡"#, r#"낡"#, r#"낡"#),
+        (r#"낢"#, r#"낢"#, r#"낢"#, r#"낢"#, r#"낢"#),
+        (r#"낣"#, r#"낣"#, r#"낣"#, r#"낣"#, r#"낣"#),
+        (r#"낤"#, r#"낤"#, r#"낤"#, r#"낤"#, r#"낤"#),
+        (r#"낥"#, r#"낥"#, r#"낥"#, r#"낥"#, r#"낥"#),
+        (r#"낦"#, r#"낦"#, r#"낦"#, r#"낦"#, r#"낦"#),
+        (r#"낧"#, r#"낧"#, r#"낧"#, r#"낧"#, r#"낧"#),
+        (r#"남"#, r#"남"#, r#"남"#, r#"남"#, r#"남"#),
+        (r#"납"#, r#"납"#, r#"납"#, r#"납"#, r#"납"#),
+        (r#"낪"#, r#"낪"#, r#"낪"#, r#"낪"#, r#"낪"#),
+        (r#"낫"#, r#"낫"#, r#"낫"#, r#"낫"#, r#"낫"#),
+        (r#"났"#, r#"났"#, r#"났"#, r#"났"#, r#"났"#),
+        (r#"낭"#, r#"낭"#, r#"낭"#, r#"낭"#, r#"낭"#),
+        (r#"낮"#, r#"낮"#, r#"낮"#, r#"낮"#, r#"낮"#),
+        (r#"낯"#, r#"낯"#, r#"낯"#, r#"낯"#, r#"낯"#),
+        (r#"낰"#, r#"낰"#, r#"낰"#, r#"낰"#, r#"낰"#),
+        (r#"낱"#, r#"낱"#, r#"낱"#, r#"낱"#, r#"낱"#),
+        (r#"낲"#, r#"낲"#, r#"낲"#, r#"낲"#, r#"낲"#),
+        (r#"낳"#, r#"낳"#, r#"낳"#, r#"낳"#, r#"낳"#),
+        (r#"내"#, r#"내"#, r#"내"#, r#"내"#, r#"내"#),
+        (r#"낵"#, r#"낵"#, r#"낵"#, r#"낵"#, r#"낵"#),
+        (r#"낶"#, r#"낶"#, r#"낶"#, r#"낶"#, r#"낶"#),
+        (r#"낷"#, r#"낷"#, r#"낷"#, r#"낷"#, r#"낷"#),
+        (r#"낸"#, r#"낸"#, r#"낸"#, r#"낸"#, r#"낸"#),
+        (r#"낹"#, r#"낹"#, r#"낹"#, r#"낹"#, r#"낹"#),
+        (r#"낺"#, r#"낺"#, r#"낺"#, r#"낺"#, r#"낺"#),
+        (r#"낻"#, r#"낻"#, r#"낻"#, r#"낻"#, r#"낻"#),
+        (r#"낼"#, r#"낼"#, r#"낼"#, r#"낼"#, r#"낼"#),
+        (r#"낽"#, r#"낽"#, r#"낽"#, r#"낽"#, r#"낽"#),
+        (r#"낾"#, r#"낾"#, r#"낾"#, r#"낾"#, r#"낾"#),
+        (r#"낿"#, r#"낿"#, r#"낿"#, r#"낿"#, r#"낿"#),
+        (r#"냀"#, r#"냀"#, r#"냀"#, r#"냀"#, r#"냀"#),
+        (r#"냁"#, r#"냁"#, r#"냁"#, r#"냁"#, r#"냁"#),
+        (r#"냂"#, r#"냂"#, r#"냂"#, r#"냂"#, r#"냂"#),
+        (r#"냃"#, r#"냃"#, r#"냃"#, r#"냃"#, r#"냃"#),
+        (r#"냄"#, r#"냄"#, r#"냄"#, r#"냄"#, r#"냄"#),
+        (r#"냅"#, r#"냅"#, r#"냅"#, r#"냅"#, r#"냅"#),
+        (r#"냆"#, r#"냆"#, r#"냆"#, r#"냆"#, r#"냆"#),
+        (r#"냇"#, r#"냇"#, r#"냇"#, r#"냇"#, r#"냇"#),
+        (r#"냈"#, r#"냈"#, r#"냈"#, r#"냈"#, r#"냈"#),
+        (r#"냉"#, r#"냉"#, r#"냉"#, r#"냉"#, r#"냉"#),
+        (r#"냊"#, r#"냊"#, r#"냊"#, r#"냊"#, r#"냊"#),
+        (r#"냋"#, r#"냋"#, r#"냋"#, r#"냋"#, r#"냋"#),
+        (r#"냌"#, r#"냌"#, r#"냌"#, r#"냌"#, r#"냌"#),
+        (r#"냍"#, r#"냍"#, r#"냍"#, r#"냍"#, r#"냍"#),
+        (r#"냎"#, r#"냎"#, r#"냎"#, r#"냎"#, r#"냎"#),
+        (r#"냏"#, r#"냏"#, r#"냏"#, r#"냏"#, r#"냏"#),
+        (r#"냐"#, r#"냐"#, r#"냐"#, r#"냐"#, r#"냐"#),
+        (r#"냑"#, r#"냑"#, r#"냑"#, r#"냑"#, r#"냑"#),
+        (r#"냒"#, r#"냒"#, r#"냒"#, r#"냒"#, r#"냒"#),
+        (r#"냓"#, r#"냓"#, r#"냓"#, r#"냓"#, r#"냓"#),
+        (r#"냔"#, r#"냔"#, r#"냔"#, r#"냔"#, r#"냔"#),
+        (r#"냕"#, r#"냕"#, r#"냕"#, r#"냕"#, r#"냕"#),
+        (r#"냖"#, r#"냖"#, r#"냖"#, r#"냖"#, r#"냖"#),
+        (r#"냗"#, r#"냗"#, r#"냗"#, r#"냗"#, r#"냗"#),
+        (r#"냘"#, r#"냘"#, r#"냘"#, r#"냘"#, r#"냘"#),
+        (r#"냙"#, r#"냙"#, r#"냙"#, r#"냙"#, r#"냙"#),
+        (r#"냚"#, r#"냚"#, r#"냚"#, r#"냚"#, r#"냚"#),
+        (r#"냛"#, r#"냛"#, r#"냛"#, r#"냛"#, r#"냛"#),
+        (r#"냜"#, r#"냜"#, r#"냜"#, r#"냜"#, r#"냜"#),
+        (r#"냝"#, r#"냝"#, r#"냝"#, r#"냝"#, r#"냝"#),
+        (r#"냞"#, r#"냞"#, r#"냞"#, r#"냞"#, r#"냞"#),
+        (r#"냟"#, r#"냟"#, r#"냟"#, r#"냟"#, r#"냟"#),
+        (r#"냠"#, r#"냠"#, r#"냠"#, r#"냠"#, r#"냠"#),
+        (r#"냡"#, r#"냡"#, r#"냡"#, r#"냡"#, r#"냡"#),
+        (r#"냢"#, r#"냢"#, r#"냢"#, r#"냢"#, r#"냢"#),
+        (r#"냣"#, r#"냣"#, r#"냣"#, r#"냣"#, r#"냣"#),
+        (r#"냤"#, r#"냤"#, r#"냤"#, r#"냤"#, r#"냤"#),
+        (r#"냥"#, r#"냥"#, r#"냥"#, r#"냥"#, r#"냥"#),
+        (r#"냦"#, r#"냦"#, r#"냦"#, r#"냦"#, r#"냦"#),
+        (r#"냧"#, r#"냧"#, r#"냧"#, r#"냧"#, r#"냧"#),
+        (r#"냨"#, r#"냨"#, r#"냨"#, r#"냨"#, r#"냨"#),
+        (r#"냩"#, r#"냩"#, r#"냩"#, r#"냩"#, r#"냩"#),
+        (r#"냪"#, r#"냪"#, r#"냪"#, r#"냪"#, r#"냪"#),
+        (r#"냫"#, r#"냫"#, r#"냫"#, r#"냫"#, r#"냫"#),
+        (r#"냬"#, r#"냬"#, r#"냬"#, r#"냬"#, r#"냬"#),
+        (r#"냭"#, r#"냭"#, r#"냭"#, r#"냭"#, r#"냭"#),
+        (r#"냮"#, r#"냮"#, r#"냮"#, r#"냮"#, r#"냮"#),
+        (r#"냯"#, r#"냯"#, r#"냯"#, r#"냯"#, r#"냯"#),
+        (r#"냰"#, r#"냰"#, r#"냰"#, r#"냰"#, r#"냰"#),
+        (r#"냱"#, r#"냱"#, r#"냱"#, r#"냱"#, r#"냱"#),
+        (r#"냲"#, r#"냲"#, r#"냲"#, r#"냲"#, r#"냲"#),
+        (r#"냳"#, r#"냳"#, r#"냳"#, r#"냳"#, r#"냳"#),
+        (r#"냴"#, r#"냴"#, r#"냴"#, r#"냴"#, r#"냴"#),
+        (r#"냵"#, r#"냵"#, r#"냵"#, r#"냵"#, r#"냵"#),
+        (r#"냶"#, r#"냶"#, r#"냶"#, r#"냶"#, r#"냶"#),
+        (r#"냷"#, r#"냷"#, r#"냷"#, r#"냷"#, r#"냷"#),
+        (r#"냸"#, r#"냸"#, r#"냸"#, r#"냸"#, r#"냸"#),
+        (r#"냹"#, r#"냹"#, r#"냹"#, r#"냹"#, r#"냹"#),
+        (r#"냺"#, r#"냺"#, r#"냺"#, r#"냺"#, r#"냺"#),
+        (r#"냻"#, r#"냻"#, r#"냻"#, r#"냻"#, r#"냻"#),
+        (r#"냼"#, r#"냼"#, r#"냼"#, r#"냼"#, r#"냼"#),
+        (r#"냽"#, r#"냽"#, r#"냽"#, r#"냽"#, r#"냽"#),
+        (r#"냾"#, r#"냾"#, r#"냾"#, r#"냾"#, r#"냾"#),
+        (r#"냿"#, r#"냿"#, r#"냿"#, r#"냿"#, r#"냿"#),
+        (r#"넀"#, r#"넀"#, r#"넀"#, r#"넀"#, r#"넀"#),
+        (r#"넁"#, r#"넁"#, r#"넁"#, r#"넁"#, r#"넁"#),
+        (r#"넂"#, r#"넂"#, r#"넂"#, r#"넂"#, r#"넂"#),
+        (r#"넃"#, r#"넃"#, r#"넃"#, r#"넃"#, r#"넃"#),
+        (r#"넄"#, r#"넄"#, r#"넄"#, r#"넄"#, r#"넄"#),
+        (r#"넅"#, r#"넅"#, r#"넅"#, r#"넅"#, r#"넅"#),
+        (r#"넆"#, r#"넆"#, r#"넆"#, r#"넆"#, r#"넆"#),
+        (r#"넇"#, r#"넇"#, r#"넇"#, r#"넇"#, r#"넇"#),
+        (r#"너"#, r#"너"#, r#"너"#, r#"너"#, r#"너"#),
+        (r#"넉"#, r#"넉"#, r#"넉"#, r#"넉"#, r#"넉"#),
+        (r#"넊"#, r#"넊"#, r#"넊"#, r#"넊"#, r#"넊"#),
+        (r#"넋"#, r#"넋"#, r#"넋"#, r#"넋"#, r#"넋"#),
+        (r#"넌"#, r#"넌"#, r#"넌"#, r#"넌"#, r#"넌"#),
+        (r#"넍"#, r#"넍"#, r#"넍"#, r#"넍"#, r#"넍"#),
+        (r#"넎"#, r#"넎"#, r#"넎"#, r#"넎"#, r#"넎"#),
+        (r#"넏"#, r#"넏"#, r#"넏"#, r#"넏"#, r#"넏"#),
+        (r#"널"#, r#"널"#, r#"널"#, r#"널"#, r#"널"#),
+        (r#"넑"#, r#"넑"#, r#"넑"#, r#"넑"#, r#"넑"#),
+        (r#"넒"#, r#"넒"#, r#"넒"#, r#"넒"#, r#"넒"#),
+        (r#"넓"#, r#"넓"#, r#"넓"#, r#"넓"#, r#"넓"#),
+        (r#"넔"#, r#"넔"#, r#"넔"#, r#"넔"#, r#"넔"#),
+        (r#"넕"#, r#"넕"#, r#"넕"#, r#"넕"#, r#"넕"#),
+        (r#"넖"#, r#"넖"#, r#"넖"#, r#"넖"#, r#"넖"#),
+        (r#"넗"#, r#"넗"#, r#"넗"#, r#"넗"#, r#"넗"#),
+        (r#"넘"#, r#"넘"#, r#"넘"#, r#"넘"#, r#"넘"#),
+        (r#"넙"#, r#"넙"#, r#"넙"#, r#"넙"#, r#"넙"#),
+        (r#"넚"#, r#"넚"#, r#"넚"#, r#"넚"#, r#"넚"#),
+        (r#"넛"#, r#"넛"#, r#"넛"#, r#"넛"#, r#"넛"#),
+        (r#"넜"#, r#"넜"#, r#"넜"#, r#"넜"#, r#"넜"#),
+        (r#"넝"#, r#"넝"#, r#"넝"#, r#"넝"#, r#"넝"#),
+        (r#"넞"#, r#"넞"#, r#"넞"#, r#"넞"#, r#"넞"#),
+        (r#"넟"#, r#"넟"#, r#"넟"#, r#"넟"#, r#"넟"#),
+        (r#"넠"#, r#"넠"#, r#"넠"#, r#"넠"#, r#"넠"#),
+        (r#"넡"#, r#"넡"#, r#"넡"#, r#"넡"#, r#"넡"#),
+        (r#"넢"#, r#"넢"#, r#"넢"#, r#"넢"#, r#"넢"#),
+        (r#"넣"#, r#"넣"#, r#"넣"#, r#"넣"#, r#"넣"#),
+        (r#"네"#, r#"네"#, r#"네"#, r#"네"#, r#"네"#),
+        (r#"넥"#, r#"넥"#, r#"넥"#, r#"넥"#, r#"넥"#),
+        (r#"넦"#, r#"넦"#, r#"넦"#, r#"넦"#, r#"넦"#),
+        (r#"넧"#, r#"넧"#, r#"넧"#, r#"넧"#, r#"넧"#),
+        (r#"넨"#, r#"넨"#, r#"넨"#, r#"넨"#, r#"넨"#),
+        (r#"넩"#, r#"넩"#, r#"넩"#, r#"넩"#, r#"넩"#),
+        (r#"넪"#, r#"넪"#, r#"넪"#, r#"넪"#, r#"넪"#),
+        (r#"넫"#, r#"넫"#, r#"넫"#, r#"넫"#, r#"넫"#),
+        (r#"넬"#, r#"넬"#, r#"넬"#, r#"넬"#, r#"넬"#),
+        (r#"넭"#, r#"넭"#, r#"넭"#, r#"넭"#, r#"넭"#),
+        (r#"넮"#, r#"넮"#, r#"넮"#, r#"넮"#, r#"넮"#),
+        (r#"넯"#, r#"넯"#, r#"넯"#, r#"넯"#, r#"넯"#),
+        (r#"넰"#, r#"넰"#, r#"넰"#, r#"넰"#, r#"넰"#),
+        (r#"넱"#, r#"넱"#, r#"넱"#, r#"넱"#, r#"넱"#),
+        (r#"넲"#, r#"넲"#, r#"넲"#, r#"넲"#, r#"넲"#),
+        (r#"넳"#, r#"넳"#, r#"넳"#, r#"넳"#, r#"넳"#),
+        (r#"넴"#, r#"넴"#, r#"넴"#, r#"넴"#, r#"넴"#),
+        (r#"넵"#, r#"넵"#, r#"넵"#, r#"넵"#, r#"넵"#),
+        (r#"넶"#, r#"넶"#, r#"넶"#, r#"넶"#, r#"넶"#),
+        (r#"넷"#, r#"넷"#, r#"넷"#, r#"넷"#, r#"넷"#),
+        (r#"넸"#, r#"넸"#, r#"넸"#, r#"넸"#, r#"넸"#),
+        (r#"넹"#, r#"넹"#, r#"넹"#, r#"넹"#, r#"넹"#),
+        (r#"넺"#, r#"넺"#, r#"넺"#, r#"넺"#, r#"넺"#),
+        (r#"넻"#, r#"넻"#, r#"넻"#, r#"넻"#, r#"넻"#),
+        (r#"넼"#, r#"넼"#, r#"넼"#, r#"넼"#, r#"넼"#),
+        (r#"넽"#, r#"넽"#, r#"넽"#, r#"넽"#, r#"넽"#),
+        (r#"넾"#, r#"넾"#, r#"넾"#, r#"넾"#, r#"넾"#),
+        (r#"넿"#, r#"넿"#, r#"넿"#, r#"넿"#, r#"넿"#),
+        (r#"녀"#, r#"녀"#, r#"녀"#, r#"녀"#, r#"녀"#),
+        (r#"녁"#, r#"녁"#, r#"녁"#, r#"녁"#, r#"녁"#),
+        (r#"녂"#, r#"녂"#, r#"녂"#, r#"녂"#, r#"녂"#),
+        (r#"녃"#, r#"녃"#, r#"녃"#, r#"녃"#, r#"녃"#),
+        (r#"년"#, r#"년"#, r#"년"#, r#"년"#, r#"년"#),
+        (r#"녅"#, r#"녅"#, r#"녅"#, r#"녅"#, r#"녅"#),
+        (r#"녆"#, r#"녆"#, r#"녆"#, r#"녆"#, r#"녆"#),
+        (r#"녇"#, r#"녇"#, r#"녇"#, r#"녇"#, r#"녇"#),
+        (r#"녈"#, r#"녈"#, r#"녈"#, r#"녈"#, r#"녈"#),
+        (r#"녉"#, r#"녉"#, r#"녉"#, r#"녉"#, r#"녉"#),
+        (r#"녊"#, r#"녊"#, r#"녊"#, r#"녊"#, r#"녊"#),
+        (r#"녋"#, r#"녋"#, r#"녋"#, r#"녋"#, r#"녋"#),
+        (r#"녌"#, r#"녌"#, r#"녌"#, r#"녌"#, r#"녌"#),
+        (r#"녍"#, r#"녍"#, r#"녍"#, r#"녍"#, r#"녍"#),
+        (r#"녎"#, r#"녎"#, r#"녎"#, r#"녎"#, r#"녎"#),
+        (r#"녏"#, r#"녏"#, r#"녏"#, r#"녏"#, r#"녏"#),
+        (r#"념"#, r#"념"#, r#"념"#, r#"념"#, r#"념"#),
+        (r#"녑"#, r#"녑"#, r#"녑"#, r#"녑"#, r#"녑"#),
+        (r#"녒"#, r#"녒"#, r#"녒"#, r#"녒"#, r#"녒"#),
+        (r#"녓"#, r#"녓"#, r#"녓"#, r#"녓"#, r#"녓"#),
+        (r#"녔"#, r#"녔"#, r#"녔"#, r#"녔"#, r#"녔"#),
+        (r#"녕"#, r#"녕"#, r#"녕"#, r#"녕"#, r#"녕"#),
+        (r#"녖"#, r#"녖"#, r#"녖"#, r#"녖"#, r#"녖"#),
+        (r#"녗"#, r#"녗"#, r#"녗"#, r#"녗"#, r#"녗"#),
+        (r#"녘"#, r#"녘"#, r#"녘"#, r#"녘"#, r#"녘"#),
+        (r#"녙"#, r#"녙"#, r#"녙"#, r#"녙"#, r#"녙"#),
+        (r#"녚"#, r#"녚"#, r#"녚"#, r#"녚"#, r#"녚"#),
+        (r#"녛"#, r#"녛"#, r#"녛"#, r#"녛"#, r#"녛"#),
+        (r#"녜"#, r#"녜"#, r#"녜"#, r#"녜"#, r#"녜"#),
+        (r#"녝"#, r#"녝"#, r#"녝"#, r#"녝"#, r#"녝"#),
+        (r#"녞"#, r#"녞"#, r#"녞"#, r#"녞"#, r#"녞"#),
+        (r#"녟"#, r#"녟"#, r#"녟"#, r#"녟"#, r#"녟"#),
+        (r#"녠"#, r#"녠"#, r#"녠"#, r#"녠"#, r#"녠"#),
+        (r#"녡"#, r#"녡"#, r#"녡"#, r#"녡"#, r#"녡"#),
+        (r#"녢"#, r#"녢"#, r#"녢"#, r#"녢"#, r#"녢"#),
+        (r#"녣"#, r#"녣"#, r#"녣"#, r#"녣"#, r#"녣"#),
+        (r#"녤"#, r#"녤"#, r#"녤"#, r#"녤"#, r#"녤"#),
+        (r#"녥"#, r#"녥"#, r#"녥"#, r#"녥"#, r#"녥"#),
+        (r#"녦"#, r#"녦"#, r#"녦"#, r#"녦"#, r#"녦"#),
+        (r#"녧"#, r#"녧"#, r#"녧"#, r#"녧"#, r#"녧"#),
+        (r#"녨"#, r#"녨"#, r#"녨"#, r#"녨"#, r#"녨"#),
+        (r#"녩"#, r#"녩"#, r#"녩"#, r#"녩"#, r#"녩"#),
+        (r#"녪"#, r#"녪"#, r#"녪"#, r#"녪"#, r#"녪"#),
+        (r#"녫"#, r#"녫"#, r#"녫"#, r#"녫"#, r#"녫"#),
+        (r#"녬"#, r#"녬"#, r#"녬"#, r#"녬"#, r#"녬"#),
+        (r#"녭"#, r#"녭"#, r#"녭"#, r#"녭"#, r#"녭"#),
+        (r#"녮"#, r#"녮"#, r#"녮"#, r#"녮"#, r#"녮"#),
+        (r#"녯"#, r#"녯"#, r#"녯"#, r#"녯"#, r#"녯"#),
+        (r#"녰"#, r#"녰"#, r#"녰"#, r#"녰"#, r#"녰"#),
+        (r#"녱"#, r#"녱"#, r#"녱"#, r#"녱"#, r#"녱"#),
+        (r#"녲"#, r#"녲"#, r#"녲"#, r#"녲"#, r#"녲"#),
+        (r#"녳"#, r#"녳"#, r#"녳"#, r#"녳"#, r#"녳"#),
+        (r#"녴"#, r#"녴"#, r#"녴"#, r#"녴"#, r#"녴"#),
+        (r#"녵"#, r#"녵"#, r#"녵"#, r#"녵"#, r#"녵"#),
+        (r#"녶"#, r#"녶"#, r#"녶"#, r#"녶"#, r#"녶"#),
+        (r#"녷"#, r#"녷"#, r#"녷"#, r#"녷"#, r#"녷"#),
+        (r#"노"#, r#"노"#, r#"노"#, r#"노"#, r#"노"#),
+        (r#"녹"#, r#"녹"#, r#"녹"#, r#"녹"#, r#"녹"#),
+        (r#"녺"#, r#"녺"#, r#"녺"#, r#"녺"#, r#"녺"#),
+        (r#"녻"#, r#"녻"#, r#"녻"#, r#"녻"#, r#"녻"#),
+        (r#"논"#, r#"논"#, r#"논"#, r#"논"#, r#"논"#),
+        (r#"녽"#, r#"녽"#, r#"녽"#, r#"녽"#, r#"녽"#),
+        (r#"녾"#, r#"녾"#, r#"녾"#, r#"녾"#, r#"녾"#),
+        (r#"녿"#, r#"녿"#, r#"녿"#, r#"녿"#, r#"녿"#),
+        (r#"놀"#, r#"놀"#, r#"놀"#, r#"놀"#, r#"놀"#),
+        (r#"놁"#, r#"놁"#, r#"놁"#, r#"놁"#, r#"놁"#),
+        (r#"놂"#, r#"놂"#, r#"놂"#, r#"놂"#, r#"놂"#),
+        (r#"놃"#, r#"놃"#, r#"놃"#, r#"놃"#, r#"놃"#),
+        (r#"놄"#, r#"놄"#, r#"놄"#, r#"놄"#, r#"놄"#),
+        (r#"놅"#, r#"놅"#, r#"놅"#, r#"놅"#, r#"놅"#),
+        (r#"놆"#, r#"놆"#, r#"놆"#, r#"놆"#, r#"놆"#),
+        (r#"놇"#, r#"놇"#, r#"놇"#, r#"놇"#, r#"놇"#),
+        (r#"놈"#, r#"놈"#, r#"놈"#, r#"놈"#, r#"놈"#),
+        (r#"놉"#, r#"놉"#, r#"놉"#, r#"놉"#, r#"놉"#),
+        (r#"놊"#, r#"놊"#, r#"놊"#, r#"놊"#, r#"놊"#),
+        (r#"놋"#, r#"놋"#, r#"놋"#, r#"놋"#, r#"놋"#),
+        (r#"놌"#, r#"놌"#, r#"놌"#, r#"놌"#, r#"놌"#),
+        (r#"농"#, r#"농"#, r#"농"#, r#"농"#, r#"농"#),
+        (r#"놎"#, r#"놎"#, r#"놎"#, r#"놎"#, r#"놎"#),
+        (r#"놏"#, r#"놏"#, r#"놏"#, r#"놏"#, r#"놏"#),
+        (r#"놐"#, r#"놐"#, r#"놐"#, r#"놐"#, r#"놐"#),
+        (r#"놑"#, r#"놑"#, r#"놑"#, r#"놑"#, r#"놑"#),
+        (r#"높"#, r#"높"#, r#"높"#, r#"높"#, r#"높"#),
+        (r#"놓"#, r#"놓"#, r#"놓"#, r#"놓"#, r#"놓"#),
+        (r#"놔"#, r#"놔"#, r#"놔"#, r#"놔"#, r#"놔"#),
+        (r#"놕"#, r#"놕"#, r#"놕"#, r#"놕"#, r#"놕"#),
+        (r#"놖"#, r#"놖"#, r#"놖"#, r#"놖"#, r#"놖"#),
+        (r#"놗"#, r#"놗"#, r#"놗"#, r#"놗"#, r#"놗"#),
+        (r#"놘"#, r#"놘"#, r#"놘"#, r#"놘"#, r#"놘"#),
+        (r#"놙"#, r#"놙"#, r#"놙"#, r#"놙"#, r#"놙"#),
+        (r#"놚"#, r#"놚"#, r#"놚"#, r#"놚"#, r#"놚"#),
+        (r#"놛"#, r#"놛"#, r#"놛"#, r#"놛"#, r#"놛"#),
+        (r#"놜"#, r#"놜"#, r#"놜"#, r#"놜"#, r#"놜"#),
+        (r#"놝"#, r#"놝"#, r#"놝"#, r#"놝"#, r#"놝"#),
+        (r#"놞"#, r#"놞"#, r#"놞"#, r#"놞"#, r#"놞"#),
+        (r#"놟"#, r#"놟"#, r#"놟"#, r#"놟"#, r#"놟"#),
+        (r#"놠"#, r#"놠"#, r#"놠"#, r#"놠"#, r#"놠"#),
+        (r#"놡"#, r#"놡"#, r#"놡"#, r#"놡"#, r#"놡"#),
+        (r#"놢"#, r#"놢"#, r#"놢"#, r#"놢"#, r#"놢"#),
+        (r#"놣"#, r#"놣"#, r#"놣"#, r#"놣"#, r#"놣"#),
+        (r#"놤"#, r#"놤"#, r#"놤"#, r#"놤"#, r#"놤"#),
+        (r#"놥"#, r#"놥"#, r#"놥"#, r#"놥"#, r#"놥"#),
+        (r#"놦"#, r#"놦"#, r#"놦"#, r#"놦"#, r#"놦"#),
+        (r#"놧"#, r#"놧"#, r#"놧"#, r#"놧"#, r#"놧"#),
+        (r#"놨"#, r#"놨"#, r#"놨"#, r#"놨"#, r#"놨"#),
+        (r#"놩"#, r#"놩"#, r#"놩"#, r#"놩"#, r#"놩"#),
+        (r#"놪"#, r#"놪"#, r#"놪"#, r#"놪"#, r#"놪"#),
+        (r#"놫"#, r#"놫"#, r#"놫"#, r#"놫"#, r#"놫"#),
+        (r#"놬"#, r#"놬"#, r#"놬"#, r#"놬"#, r#"놬"#),
+        (r#"놭"#, r#"놭"#, r#"놭"#, r#"놭"#, r#"놭"#),
+        (r#"놮"#, r#"놮"#, r#"놮"#, r#"놮"#, r#"놮"#),
+        (r#"놯"#, r#"놯"#, r#"놯"#, r#"놯"#, r#"놯"#),
+        (r#"놰"#, r#"놰"#, r#"놰"#, r#"놰"#, r#"놰"#),
+        (r#"놱"#, r#"놱"#, r#"놱"#, r#"놱"#, r#"놱"#),
+        (r#"놲"#, r#"놲"#, r#"놲"#, r#"놲"#, r#"놲"#),
+        (r#"놳"#, r#"놳"#, r#"놳"#, r#"놳"#, r#"놳"#),
+        (r#"놴"#, r#"놴"#, r#"놴"#, r#"놴"#, r#"놴"#),
+        (r#"놵"#, r#"놵"#, r#"놵"#, r#"놵"#, r#"놵"#),
+        (r#"놶"#, r#"놶"#, r#"놶"#, r#"놶"#, r#"놶"#),
+        (r#"놷"#, r#"놷"#, r#"놷"#, r#"놷"#, r#"놷"#),
+        (r#"놸"#, r#"놸"#, r#"놸"#, r#"놸"#, r#"놸"#),
+        (r#"놹"#, r#"놹"#, r#"놹"#, r#"놹"#, r#"놹"#),
+        (r#"놺"#, r#"놺"#, r#"놺"#, r#"놺"#, r#"놺"#),
+        (r#"놻"#, r#"놻"#, r#"놻"#, r#"놻"#, r#"놻"#),
+        (r#"놼"#, r#"놼"#, r#"놼"#, r#"놼"#, r#"놼"#),
+        (r#"놽"#, r#"놽"#, r#"놽"#, r#"놽"#, r#"놽"#),
+        (r#"놾"#, r#"놾"#, r#"놾"#, r#"놾"#, r#"놾"#),
+        (r#"놿"#, r#"놿"#, r#"놿"#, r#"놿"#, r#"놿"#),
+        (r#"뇀"#, r#"뇀"#, r#"뇀"#, r#"뇀"#, r#"뇀"#),
+        (r#"뇁"#, r#"뇁"#, r#"뇁"#, r#"뇁"#, r#"뇁"#),
+        (r#"뇂"#, r#"뇂"#, r#"뇂"#, r#"뇂"#, r#"뇂"#),
+        (r#"뇃"#, r#"뇃"#, r#"뇃"#, r#"뇃"#, r#"뇃"#),
+        (r#"뇄"#, r#"뇄"#, r#"뇄"#, r#"뇄"#, r#"뇄"#),
+        (r#"뇅"#, r#"뇅"#, r#"뇅"#, r#"뇅"#, r#"뇅"#),
+        (r#"뇆"#, r#"뇆"#, r#"뇆"#, r#"뇆"#, r#"뇆"#),
+        (r#"뇇"#, r#"뇇"#, r#"뇇"#, r#"뇇"#, r#"뇇"#),
+        (r#"뇈"#, r#"뇈"#, r#"뇈"#, r#"뇈"#, r#"뇈"#),
+        (r#"뇉"#, r#"뇉"#, r#"뇉"#, r#"뇉"#, r#"뇉"#),
+        (r#"뇊"#, r#"뇊"#, r#"뇊"#, r#"뇊"#, r#"뇊"#),
+        (r#"뇋"#, r#"뇋"#, r#"뇋"#, r#"뇋"#, r#"뇋"#),
+        (r#"뇌"#, r#"뇌"#, r#"뇌"#, r#"뇌"#, r#"뇌"#),
+        (r#"뇍"#, r#"뇍"#, r#"뇍"#, r#"뇍"#, r#"뇍"#),
+        (r#"뇎"#, r#"뇎"#, r#"뇎"#, r#"뇎"#, r#"뇎"#),
+        (r#"뇏"#, r#"뇏"#, r#"뇏"#, r#"뇏"#, r#"뇏"#),
+        (r#"뇐"#, r#"뇐"#, r#"뇐"#, r#"뇐"#, r#"뇐"#),
+        (r#"뇑"#, r#"뇑"#, r#"뇑"#, r#"뇑"#, r#"뇑"#),
+        (r#"뇒"#, r#"뇒"#, r#"뇒"#, r#"뇒"#, r#"뇒"#),
+        (r#"뇓"#, r#"뇓"#, r#"뇓"#, r#"뇓"#, r#"뇓"#),
+        (r#"뇔"#, r#"뇔"#, r#"뇔"#, r#"뇔"#, r#"뇔"#),
+        (r#"뇕"#, r#"뇕"#, r#"뇕"#, r#"뇕"#, r#"뇕"#),
+        (r#"뇖"#, r#"뇖"#, r#"뇖"#, r#"뇖"#, r#"뇖"#),
+        (r#"뇗"#, r#"뇗"#, r#"뇗"#, r#"뇗"#, r#"뇗"#),
+        (r#"뇘"#, r#"뇘"#, r#"뇘"#, r#"뇘"#, r#"뇘"#),
+        (r#"뇙"#, r#"뇙"#, r#"뇙"#, r#"뇙"#, r#"뇙"#),
+        (r#"뇚"#, r#"뇚"#, r#"뇚"#, r#"뇚"#, r#"뇚"#),
+        (r#"뇛"#, r#"뇛"#, r#"뇛"#, r#"뇛"#, r#"뇛"#),
+        (r#"뇜"#, r#"뇜"#, r#"뇜"#, r#"뇜"#, r#"뇜"#),
+        (r#"뇝"#, r#"뇝"#, r#"뇝"#, r#"뇝"#, r#"뇝"#),
+        (r#"뇞"#, r#"뇞"#, r#"뇞"#, r#"뇞"#, r#"뇞"#),
+        (r#"뇟"#, r#"뇟"#, r#"뇟"#, r#"뇟"#, r#"뇟"#),
+        (r#"뇠"#, r#"뇠"#, r#"뇠"#, r#"뇠"#, r#"뇠"#),
+        (r#"뇡"#, r#"뇡"#, r#"뇡"#, r#"뇡"#, r#"뇡"#),
+        (r#"뇢"#, r#"뇢"#, r#"뇢"#, r#"뇢"#, r#"뇢"#),
+        (r#"뇣"#, r#"뇣"#, r#"뇣"#, r#"뇣"#, r#"뇣"#),
+        (r#"뇤"#, r#"뇤"#, r#"뇤"#, r#"뇤"#, r#"뇤"#),
+        (r#"뇥"#, r#"뇥"#, r#"뇥"#, r#"뇥"#, r#"뇥"#),
+        (r#"뇦"#, r#"뇦"#, r#"뇦"#, r#"뇦"#, r#"뇦"#),
+        (r#"뇧"#, r#"뇧"#, r#"뇧"#, r#"뇧"#, r#"뇧"#),
+        (r#"뇨"#, r#"뇨"#, r#"뇨"#, r#"뇨"#, r#"뇨"#),
+        (r#"뇩"#, r#"뇩"#, r#"뇩"#, r#"뇩"#, r#"뇩"#),
+        (r#"뇪"#, r#"뇪"#, r#"뇪"#, r#"뇪"#, r#"뇪"#),
+        (r#"뇫"#, r#"뇫"#, r#"뇫"#, r#"뇫"#, r#"뇫"#),
+        (r#"뇬"#, r#"뇬"#, r#"뇬"#, r#"뇬"#, r#"뇬"#),
+        (r#"뇭"#, r#"뇭"#, r#"뇭"#, r#"뇭"#, r#"뇭"#),
+        (r#"뇮"#, r#"뇮"#, r#"뇮"#, r#"뇮"#, r#"뇮"#),
+        (r#"뇯"#, r#"뇯"#, r#"뇯"#, r#"뇯"#, r#"뇯"#),
+        (r#"뇰"#, r#"뇰"#, r#"뇰"#, r#"뇰"#, r#"뇰"#),
+        (r#"뇱"#, r#"뇱"#, r#"뇱"#, r#"뇱"#, r#"뇱"#),
+        (r#"뇲"#, r#"뇲"#, r#"뇲"#, r#"뇲"#, r#"뇲"#),
+        (r#"뇳"#, r#"뇳"#, r#"뇳"#, r#"뇳"#, r#"뇳"#),
+        (r#"뇴"#, r#"뇴"#, r#"뇴"#, r#"뇴"#, r#"뇴"#),
+        (r#"뇵"#, r#"뇵"#, r#"뇵"#, r#"뇵"#, r#"뇵"#),
+        (r#"뇶"#, r#"뇶"#, r#"뇶"#, r#"뇶"#, r#"뇶"#),
+        (r#"뇷"#, r#"뇷"#, r#"뇷"#, r#"뇷"#, r#"뇷"#),
+        (r#"뇸"#, r#"뇸"#, r#"뇸"#, r#"뇸"#, r#"뇸"#),
+        (r#"뇹"#, r#"뇹"#, r#"뇹"#, r#"뇹"#, r#"뇹"#),
+        (r#"뇺"#, r#"뇺"#, r#"뇺"#, r#"뇺"#, r#"뇺"#),
+        (r#"뇻"#, r#"뇻"#, r#"뇻"#, r#"뇻"#, r#"뇻"#),
+        (r#"뇼"#, r#"뇼"#, r#"뇼"#, r#"뇼"#, r#"뇼"#),
+        (r#"뇽"#, r#"뇽"#, r#"뇽"#, r#"뇽"#, r#"뇽"#),
+        (r#"뇾"#, r#"뇾"#, r#"뇾"#, r#"뇾"#, r#"뇾"#),
+        (r#"뇿"#, r#"뇿"#, r#"뇿"#, r#"뇿"#, r#"뇿"#),
+        (r#"눀"#, r#"눀"#, r#"눀"#, r#"눀"#, r#"눀"#),
+        (r#"눁"#, r#"눁"#, r#"눁"#, r#"눁"#, r#"눁"#),
+        (r#"눂"#, r#"눂"#, r#"눂"#, r#"눂"#, r#"눂"#),
+        (r#"눃"#, r#"눃"#, r#"눃"#, r#"눃"#, r#"눃"#),
+        (r#"누"#, r#"누"#, r#"누"#, r#"누"#, r#"누"#),
+        (r#"눅"#, r#"눅"#, r#"눅"#, r#"눅"#, r#"눅"#),
+        (r#"눆"#, r#"눆"#, r#"눆"#, r#"눆"#, r#"눆"#),
+        (r#"눇"#, r#"눇"#, r#"눇"#, r#"눇"#, r#"눇"#),
+        (r#"눈"#, r#"눈"#, r#"눈"#, r#"눈"#, r#"눈"#),
+        (r#"눉"#, r#"눉"#, r#"눉"#, r#"눉"#, r#"눉"#),
+        (r#"눊"#, r#"눊"#, r#"눊"#, r#"눊"#, r#"눊"#),
+        (r#"눋"#, r#"눋"#, r#"눋"#, r#"눋"#, r#"눋"#),
+        (r#"눌"#, r#"눌"#, r#"눌"#, r#"눌"#, r#"눌"#),
+        (r#"눍"#, r#"눍"#, r#"눍"#, r#"눍"#, r#"눍"#),
+        (r#"눎"#, r#"눎"#, r#"눎"#, r#"눎"#, r#"눎"#),
+        (r#"눏"#, r#"눏"#, r#"눏"#, r#"눏"#, r#"눏"#),
+        (r#"눐"#, r#"눐"#, r#"눐"#, r#"눐"#, r#"눐"#),
+        (r#"눑"#, r#"눑"#, r#"눑"#, r#"눑"#, r#"눑"#),
+        (r#"눒"#, r#"눒"#, r#"눒"#, r#"눒"#, r#"눒"#),
+        (r#"눓"#, r#"눓"#, r#"눓"#, r#"눓"#, r#"눓"#),
+        (r#"눔"#, r#"눔"#, r#"눔"#, r#"눔"#, r#"눔"#),
+        (r#"눕"#, r#"눕"#, r#"눕"#, r#"눕"#, r#"눕"#),
+        (r#"눖"#, r#"눖"#, r#"눖"#, r#"눖"#, r#"눖"#),
+        (r#"눗"#, r#"눗"#, r#"눗"#, r#"눗"#, r#"눗"#),
+        (r#"눘"#, r#"눘"#, r#"눘"#, r#"눘"#, r#"눘"#),
+        (r#"눙"#, r#"눙"#, r#"눙"#, r#"눙"#, r#"눙"#),
+        (r#"눚"#, r#"눚"#, r#"눚"#, r#"눚"#, r#"눚"#),
+        (r#"눛"#, r#"눛"#, r#"눛"#, r#"눛"#, r#"눛"#),
+        (r#"눜"#, r#"눜"#, r#"눜"#, r#"눜"#, r#"눜"#),
+        (r#"눝"#, r#"눝"#, r#"눝"#, r#"눝"#, r#"눝"#),
+        (r#"눞"#, r#"눞"#, r#"눞"#, r#"눞"#, r#"눞"#),
+        (r#"눟"#, r#"눟"#, r#"눟"#, r#"눟"#, r#"눟"#),
+        (r#"눠"#, r#"눠"#, r#"눠"#, r#"눠"#, r#"눠"#),
+        (r#"눡"#, r#"눡"#, r#"눡"#, r#"눡"#, r#"눡"#),
+        (r#"눢"#, r#"눢"#, r#"눢"#, r#"눢"#, r#"눢"#),
+        (r#"눣"#, r#"눣"#, r#"눣"#, r#"눣"#, r#"눣"#),
+        (r#"눤"#, r#"눤"#, r#"눤"#, r#"눤"#, r#"눤"#),
+        (r#"눥"#, r#"눥"#, r#"눥"#, r#"눥"#, r#"눥"#),
+        (r#"눦"#, r#"눦"#, r#"눦"#, r#"눦"#, r#"눦"#),
+        (r#"눧"#, r#"눧"#, r#"눧"#, r#"눧"#, r#"눧"#),
+        (r#"눨"#, r#"눨"#, r#"눨"#, r#"눨"#, r#"눨"#),
+        (r#"눩"#, r#"눩"#, r#"눩"#, r#"눩"#, r#"눩"#),
+        (r#"눪"#, r#"눪"#, r#"눪"#, r#"눪"#, r#"눪"#),
+        (r#"눫"#, r#"눫"#, r#"눫"#, r#"눫"#, r#"눫"#),
+        (r#"눬"#, r#"눬"#, r#"눬"#, r#"눬"#, r#"눬"#),
+        (r#"눭"#, r#"눭"#, r#"눭"#, r#"눭"#, r#"눭"#),
+        (r#"눮"#, r#"눮"#, r#"눮"#, r#"눮"#, r#"눮"#),
+        (r#"눯"#, r#"눯"#, r#"눯"#, r#"눯"#, r#"눯"#),
+        (r#"눰"#, r#"눰"#, r#"눰"#, r#"눰"#, r#"눰"#),
+        (r#"눱"#, r#"눱"#, r#"눱"#, r#"눱"#, r#"눱"#),
+        (r#"눲"#, r#"눲"#, r#"눲"#, r#"눲"#, r#"눲"#),
+        (r#"눳"#, r#"눳"#, r#"눳"#, r#"눳"#, r#"눳"#),
+        (r#"눴"#, r#"눴"#, r#"눴"#, r#"눴"#, r#"눴"#),
+        (r#"눵"#, r#"눵"#, r#"눵"#, r#"눵"#, r#"눵"#),
+        (r#"눶"#, r#"눶"#, r#"눶"#, r#"눶"#, r#"눶"#),
+        (r#"눷"#, r#"눷"#, r#"눷"#, r#"눷"#, r#"눷"#),
+        (r#"눸"#, r#"눸"#, r#"눸"#, r#"눸"#, r#"눸"#),
+        (r#"눹"#, r#"눹"#, r#"눹"#, r#"눹"#, r#"눹"#),
+        (r#"눺"#, r#"눺"#, r#"눺"#, r#"눺"#, r#"눺"#),
+        (r#"눻"#, r#"눻"#, r#"눻"#, r#"눻"#, r#"눻"#),
+        (r#"눼"#, r#"눼"#, r#"눼"#, r#"눼"#, r#"눼"#),
+        (r#"눽"#, r#"눽"#, r#"눽"#, r#"눽"#, r#"눽"#),
+        (r#"눾"#, r#"눾"#, r#"눾"#, r#"눾"#, r#"눾"#),
+        (r#"눿"#, r#"눿"#, r#"눿"#, r#"눿"#, r#"눿"#),
+        (r#"뉀"#, r#"뉀"#, r#"뉀"#, r#"뉀"#, r#"뉀"#),
+        (r#"뉁"#, r#"뉁"#, r#"뉁"#, r#"뉁"#, r#"뉁"#),
+        (r#"뉂"#, r#"뉂"#, r#"뉂"#, r#"뉂"#, r#"뉂"#),
+        (r#"뉃"#, r#"뉃"#, r#"뉃"#, r#"뉃"#, r#"뉃"#),
+        (r#"뉄"#, r#"뉄"#, r#"뉄"#, r#"뉄"#, r#"뉄"#),
+        (r#"뉅"#, r#"뉅"#, r#"뉅"#, r#"뉅"#, r#"뉅"#),
+        (r#"뉆"#, r#"뉆"#, r#"뉆"#, r#"뉆"#, r#"뉆"#),
+        (r#"뉇"#, r#"뉇"#, r#"뉇"#, r#"뉇"#, r#"뉇"#),
+        (r#"뉈"#, r#"뉈"#, r#"뉈"#, r#"뉈"#, r#"뉈"#),
+        (r#"뉉"#, r#"뉉"#, r#"뉉"#, r#"뉉"#, r#"뉉"#),
+        (r#"뉊"#, r#"뉊"#, r#"뉊"#, r#"뉊"#, r#"뉊"#),
+        (r#"뉋"#, r#"뉋"#, r#"뉋"#, r#"뉋"#, r#"뉋"#),
+        (r#"뉌"#, r#"뉌"#, r#"뉌"#, r#"뉌"#, r#"뉌"#),
+        (r#"뉍"#, r#"뉍"#, r#"뉍"#, r#"뉍"#, r#"뉍"#),
+        (r#"뉎"#, r#"뉎"#, r#"뉎"#, r#"뉎"#, r#"뉎"#),
+        (r#"뉏"#, r#"뉏"#, r#"뉏"#, r#"뉏"#, r#"뉏"#),
+        (r#"뉐"#, r#"뉐"#, r#"뉐"#, r#"뉐"#, r#"뉐"#),
+        (r#"뉑"#, r#"뉑"#, r#"뉑"#, r#"뉑"#, r#"뉑"#),
+        (r#"뉒"#, r#"뉒"#, r#"뉒"#, r#"뉒"#, r#"뉒"#),
+        (r#"뉓"#, r#"뉓"#, r#"뉓"#, r#"뉓"#, r#"뉓"#),
+        (r#"뉔"#, r#"뉔"#, r#"뉔"#, r#"뉔"#, r#"뉔"#),
+        (r#"뉕"#, r#"뉕"#, r#"뉕"#, r#"뉕"#, r#"뉕"#),
+        (r#"뉖"#, r#"뉖"#, r#"뉖"#, r#"뉖"#, r#"뉖"#),
+        (r#"뉗"#, r#"뉗"#, r#"뉗"#, r#"뉗"#, r#"뉗"#),
+        (r#"뉘"#, r#"뉘"#, r#"뉘"#, r#"뉘"#, r#"뉘"#),
+        (r#"뉙"#, r#"뉙"#, r#"뉙"#, r#"뉙"#, r#"뉙"#),
+        (r#"뉚"#, r#"뉚"#, r#"뉚"#, r#"뉚"#, r#"뉚"#),
+        (r#"뉛"#, r#"뉛"#, r#"뉛"#, r#"뉛"#, r#"뉛"#),
+        (r#"뉜"#, r#"뉜"#, r#"뉜"#, r#"뉜"#, r#"뉜"#),
+        (r#"뉝"#, r#"뉝"#, r#"뉝"#, r#"뉝"#, r#"뉝"#),
+        (r#"뉞"#, r#"뉞"#, r#"뉞"#, r#"뉞"#, r#"뉞"#),
+        (r#"뉟"#, r#"뉟"#, r#"뉟"#, r#"뉟"#, r#"뉟"#),
+        (r#"뉠"#, r#"뉠"#, r#"뉠"#, r#"뉠"#, r#"뉠"#),
+        (r#"뉡"#, r#"뉡"#, r#"뉡"#, r#"뉡"#, r#"뉡"#),
+        (r#"뉢"#, r#"뉢"#, r#"뉢"#, r#"뉢"#, r#"뉢"#),
+        (r#"뉣"#, r#"뉣"#, r#"뉣"#, r#"뉣"#, r#"뉣"#),
+        (r#"뉤"#, r#"뉤"#, r#"뉤"#, r#"뉤"#, r#"뉤"#),
+        (r#"뉥"#, r#"뉥"#, r#"뉥"#, r#"뉥"#, r#"뉥"#),
+        (r#"뉦"#, r#"뉦"#, r#"뉦"#, r#"뉦"#, r#"뉦"#),
+        (r#"뉧"#, r#"뉧"#, r#"뉧"#, r#"뉧"#, r#"뉧"#),
+        (r#"뉨"#, r#"뉨"#, r#"뉨"#, r#"뉨"#, r#"뉨"#),
+        (r#"뉩"#, r#"뉩"#, r#"뉩"#, r#"뉩"#, r#"뉩"#),
+        (r#"뉪"#, r#"뉪"#, r#"뉪"#, r#"뉪"#, r#"뉪"#),
+        (r#"뉫"#, r#"뉫"#, r#"뉫"#, r#"뉫"#, r#"뉫"#),
+        (r#"뉬"#, r#"뉬"#, r#"뉬"#, r#"뉬"#, r#"뉬"#),
+        (r#"뉭"#, r#"뉭"#, r#"뉭"#, r#"뉭"#, r#"뉭"#),
+        (r#"뉮"#, r#"뉮"#, r#"뉮"#, r#"뉮"#, r#"뉮"#),
+        (r#"뉯"#, r#"뉯"#, r#"뉯"#, r#"뉯"#, r#"뉯"#),
+        (r#"뉰"#, r#"뉰"#, r#"뉰"#, r#"뉰"#, r#"뉰"#),
+        (r#"뉱"#, r#"뉱"#, r#"뉱"#, r#"뉱"#, r#"뉱"#),
+        (r#"뉲"#, r#"뉲"#, r#"뉲"#, r#"뉲"#, r#"뉲"#),
+        (r#"뉳"#, r#"뉳"#, r#"뉳"#, r#"뉳"#, r#"뉳"#),
+        (r#"뉴"#, r#"뉴"#, r#"뉴"#, r#"뉴"#, r#"뉴"#),
+        (r#"뉵"#, r#"뉵"#, r#"뉵"#, r#"뉵"#, r#"뉵"#),
+        (r#"뉶"#, r#"뉶"#, r#"뉶"#, r#"뉶"#, r#"뉶"#),
+        (r#"뉷"#, r#"뉷"#, r#"뉷"#, r#"뉷"#, r#"뉷"#),
+        (r#"뉸"#, r#"뉸"#, r#"뉸"#, r#"뉸"#, r#"뉸"#),
+        (r#"뉹"#, r#"뉹"#, r#"뉹"#, r#"뉹"#, r#"뉹"#),
+        (r#"뉺"#, r#"뉺"#, r#"뉺"#, r#"뉺"#, r#"뉺"#),
+        (r#"뉻"#, r#"뉻"#, r#"뉻"#, r#"뉻"#, r#"뉻"#),
+        (r#"뉼"#, r#"뉼"#, r#"뉼"#, r#"뉼"#, r#"뉼"#),
+        (r#"뉽"#, r#"뉽"#, r#"뉽"#, r#"뉽"#, r#"뉽"#),
+        (r#"뉾"#, r#"뉾"#, r#"뉾"#, r#"뉾"#, r#"뉾"#),
+        (r#"뉿"#, r#"뉿"#, r#"뉿"#, r#"뉿"#, r#"뉿"#),
+        (r#"늀"#, r#"늀"#, r#"늀"#, r#"늀"#, r#"늀"#),
+        (r#"늁"#, r#"늁"#, r#"늁"#, r#"늁"#, r#"늁"#),
+        (r#"늂"#, r#"늂"#, r#"늂"#, r#"늂"#, r#"늂"#),
+        (r#"늃"#, r#"늃"#, r#"늃"#, r#"늃"#, r#"늃"#),
+        (r#"늄"#, r#"늄"#, r#"늄"#, r#"늄"#, r#"늄"#),
+        (r#"늅"#, r#"늅"#, r#"늅"#, r#"늅"#, r#"늅"#),
+        (r#"늆"#, r#"늆"#, r#"늆"#, r#"늆"#, r#"늆"#),
+        (r#"늇"#, r#"늇"#, r#"늇"#, r#"늇"#, r#"늇"#),
+        (r#"늈"#, r#"늈"#, r#"늈"#, r#"늈"#, r#"늈"#),
+        (r#"늉"#, r#"늉"#, r#"늉"#, r#"늉"#, r#"늉"#),
+        (r#"늊"#, r#"늊"#, r#"늊"#, r#"늊"#, r#"늊"#),
+        (r#"늋"#, r#"늋"#, r#"늋"#, r#"늋"#, r#"늋"#),
+        (r#"늌"#, r#"늌"#, r#"늌"#, r#"늌"#, r#"늌"#),
+        (r#"늍"#, r#"늍"#, r#"늍"#, r#"늍"#, r#"늍"#),
+        (r#"늎"#, r#"늎"#, r#"늎"#, r#"늎"#, r#"늎"#),
+        (r#"늏"#, r#"늏"#, r#"늏"#, r#"늏"#, r#"늏"#),
+        (r#"느"#, r#"느"#, r#"느"#, r#"느"#, r#"느"#),
+        (r#"늑"#, r#"늑"#, r#"늑"#, r#"늑"#, r#"늑"#),
+        (r#"늒"#, r#"늒"#, r#"늒"#, r#"늒"#, r#"늒"#),
+        (r#"늓"#, r#"늓"#, r#"늓"#, r#"늓"#, r#"늓"#),
+        (r#"는"#, r#"는"#, r#"는"#, r#"는"#, r#"는"#),
+        (r#"늕"#, r#"늕"#, r#"늕"#, r#"늕"#, r#"늕"#),
+        (r#"늖"#, r#"늖"#, r#"늖"#, r#"늖"#, r#"늖"#),
+        (r#"늗"#, r#"늗"#, r#"늗"#, r#"늗"#, r#"늗"#),
+        (r#"늘"#, r#"늘"#, r#"늘"#, r#"늘"#, r#"늘"#),
+        (r#"늙"#, r#"늙"#, r#"늙"#, r#"늙"#, r#"늙"#),
+        (r#"늚"#, r#"늚"#, r#"늚"#, r#"늚"#, r#"늚"#),
+        (r#"늛"#, r#"늛"#, r#"늛"#, r#"늛"#, r#"늛"#),
+        (r#"늜"#, r#"늜"#, r#"늜"#, r#"늜"#, r#"늜"#),
+        (r#"늝"#, r#"늝"#, r#"늝"#, r#"늝"#, r#"늝"#),
+        (r#"늞"#, r#"늞"#, r#"늞"#, r#"늞"#, r#"늞"#),
+        (r#"늟"#, r#"늟"#, r#"늟"#, r#"늟"#, r#"늟"#),
+        (r#"늠"#, r#"늠"#, r#"늠"#, r#"늠"#, r#"늠"#),
+        (r#"늡"#, r#"늡"#, r#"늡"#, r#"늡"#, r#"늡"#),
+        (r#"늢"#, r#"늢"#, r#"늢"#, r#"늢"#, r#"늢"#),
+        (r#"늣"#, r#"늣"#, r#"늣"#, r#"늣"#, r#"늣"#),
+        (r#"늤"#, r#"늤"#, r#"늤"#, r#"늤"#, r#"늤"#),
+        (r#"능"#, r#"능"#, r#"능"#, r#"능"#, r#"능"#),
+        (r#"늦"#, r#"늦"#, r#"늦"#, r#"늦"#, r#"늦"#),
+        (r#"늧"#, r#"늧"#, r#"늧"#, r#"늧"#, r#"늧"#),
+        (r#"늨"#, r#"늨"#, r#"늨"#, r#"늨"#, r#"늨"#),
+        (r#"늩"#, r#"늩"#, r#"늩"#, r#"늩"#, r#"늩"#),
+        (r#"늪"#, r#"늪"#, r#"늪"#, r#"늪"#, r#"늪"#),
+        (r#"늫"#, r#"늫"#, r#"늫"#, r#"늫"#, r#"늫"#),
+        (r#"늬"#, r#"늬"#, r#"늬"#, r#"늬"#, r#"늬"#),
+        (r#"늭"#, r#"늭"#, r#"늭"#, r#"늭"#, r#"늭"#),
+        (r#"늮"#, r#"늮"#, r#"늮"#, r#"늮"#, r#"늮"#),
+        (r#"늯"#, r#"늯"#, r#"늯"#, r#"늯"#, r#"늯"#),
+        (r#"늰"#, r#"늰"#, r#"늰"#, r#"늰"#, r#"늰"#),
+        (r#"늱"#, r#"늱"#, r#"늱"#, r#"늱"#, r#"늱"#),
+        (r#"늲"#, r#"늲"#, r#"늲"#, r#"늲"#, r#"늲"#),
+        (r#"늳"#, r#"늳"#, r#"늳"#, r#"늳"#, r#"늳"#),
+        (r#"늴"#, r#"늴"#, r#"늴"#, r#"늴"#, r#"늴"#),
+        (r#"늵"#, r#"늵"#, r#"늵"#, r#"늵"#, r#"늵"#),
+        (r#"늶"#, r#"늶"#, r#"늶"#, r#"늶"#, r#"늶"#),
+        (r#"늷"#, r#"늷"#, r#"늷"#, r#"늷"#, r#"늷"#),
+        (r#"늸"#, r#"늸"#, r#"늸"#, r#"늸"#, r#"늸"#),
+        (r#"늹"#, r#"늹"#, r#"늹"#, r#"늹"#, r#"늹"#),
+        (r#"늺"#, r#"늺"#, r#"늺"#, r#"늺"#, r#"늺"#),
+        (r#"늻"#, r#"늻"#, r#"늻"#, r#"늻"#, r#"늻"#),
+        (r#"늼"#, r#"늼"#, r#"늼"#, r#"늼"#, r#"늼"#),
+        (r#"늽"#, r#"늽"#, r#"늽"#, r#"늽"#, r#"늽"#),
+        (r#"늾"#, r#"늾"#, r#"늾"#, r#"늾"#, r#"늾"#),
+        (r#"늿"#, r#"늿"#, r#"늿"#, r#"늿"#, r#"늿"#),
+        (r#"닀"#, r#"닀"#, r#"닀"#, r#"닀"#, r#"닀"#),
+        (r#"닁"#, r#"닁"#, r#"닁"#, r#"닁"#, r#"닁"#),
+        (r#"닂"#, r#"닂"#, r#"닂"#, r#"닂"#, r#"닂"#),
+        (r#"닃"#, r#"닃"#, r#"닃"#, r#"닃"#, r#"닃"#),
+        (r#"닄"#, r#"닄"#, r#"닄"#, r#"닄"#, r#"닄"#),
+        (r#"닅"#, r#"닅"#, r#"닅"#, r#"닅"#, r#"닅"#),
+        (r#"닆"#, r#"닆"#, r#"닆"#, r#"닆"#, r#"닆"#),
+        (r#"닇"#, r#"닇"#, r#"닇"#, r#"닇"#, r#"닇"#),
+        (r#"니"#, r#"니"#, r#"니"#, r#"니"#, r#"니"#),
+        (r#"닉"#, r#"닉"#, r#"닉"#, r#"닉"#, r#"닉"#),
+        (r#"닊"#, r#"닊"#, r#"닊"#, r#"닊"#, r#"닊"#),
+        (r#"닋"#, r#"닋"#, r#"닋"#, r#"닋"#, r#"닋"#),
+        (r#"닌"#, r#"닌"#, r#"닌"#, r#"닌"#, r#"닌"#),
+        (r#"닍"#, r#"닍"#, r#"닍"#, r#"닍"#, r#"닍"#),
+        (r#"닎"#, r#"닎"#, r#"닎"#, r#"닎"#, r#"닎"#),
+        (r#"닏"#, r#"닏"#, r#"닏"#, r#"닏"#, r#"닏"#),
+        (r#"닐"#, r#"닐"#, r#"닐"#, r#"닐"#, r#"닐"#),
+        (r#"닑"#, r#"닑"#, r#"닑"#, r#"닑"#, r#"닑"#),
+        (r#"닒"#, r#"닒"#, r#"닒"#, r#"닒"#, r#"닒"#),
+        (r#"닓"#, r#"닓"#, r#"닓"#, r#"닓"#, r#"닓"#),
+        (r#"닔"#, r#"닔"#, r#"닔"#, r#"닔"#, r#"닔"#),
+        (r#"닕"#, r#"닕"#, r#"닕"#, r#"닕"#, r#"닕"#),
+        (r#"닖"#, r#"닖"#, r#"닖"#, r#"닖"#, r#"닖"#),
+        (r#"닗"#, r#"닗"#, r#"닗"#, r#"닗"#, r#"닗"#),
+        (r#"님"#, r#"님"#, r#"님"#, r#"님"#, r#"님"#),
+        (r#"닙"#, r#"닙"#, r#"닙"#, r#"닙"#, r#"닙"#),
+        (r#"닚"#, r#"닚"#, r#"닚"#, r#"닚"#, r#"닚"#),
+        (r#"닛"#, r#"닛"#, r#"닛"#, r#"닛"#, r#"닛"#),
+        (r#"닜"#, r#"닜"#, r#"닜"#, r#"닜"#, r#"닜"#),
+        (r#"닝"#, r#"닝"#, r#"닝"#, r#"닝"#, r#"닝"#),
+        (r#"닞"#, r#"닞"#, r#"닞"#, r#"닞"#, r#"닞"#),
+        (r#"닟"#, r#"닟"#, r#"닟"#, r#"닟"#, r#"닟"#),
+        (r#"닠"#, r#"닠"#, r#"닠"#, r#"닠"#, r#"닠"#),
+        (r#"닡"#, r#"닡"#, r#"닡"#, r#"닡"#, r#"닡"#),
+        (r#"닢"#, r#"닢"#, r#"닢"#, r#"닢"#, r#"닢"#),
+        (r#"닣"#, r#"닣"#, r#"닣"#, r#"닣"#, r#"닣"#),
+        (r#"다"#, r#"다"#, r#"다"#, r#"다"#, r#"다"#),
+        (r#"닥"#, r#"닥"#, r#"닥"#, r#"닥"#, r#"닥"#),
+        (r#"닦"#, r#"닦"#, r#"닦"#, r#"닦"#, r#"닦"#),
+        (r#"닧"#, r#"닧"#, r#"닧"#, r#"닧"#, r#"닧"#),
+        (r#"단"#, r#"단"#, r#"단"#, r#"단"#, r#"단"#),
+        (r#"닩"#, r#"닩"#, r#"닩"#, r#"닩"#, r#"닩"#),
+        (r#"닪"#, r#"닪"#, r#"닪"#, r#"닪"#, r#"닪"#),
+        (r#"닫"#, r#"닫"#, r#"닫"#, r#"닫"#, r#"닫"#),
+        (r#"달"#, r#"달"#, r#"달"#, r#"달"#, r#"달"#),
+        (r#"닭"#, r#"닭"#, r#"닭"#, r#"닭"#, r#"닭"#),
+        (r#"닮"#, r#"닮"#, r#"닮"#, r#"닮"#, r#"닮"#),
+        (r#"닯"#, r#"닯"#, r#"닯"#, r#"닯"#, r#"닯"#),
+        (r#"닰"#, r#"닰"#, r#"닰"#, r#"닰"#, r#"닰"#),
+        (r#"닱"#, r#"닱"#, r#"닱"#, r#"닱"#, r#"닱"#),
+        (r#"닲"#, r#"닲"#, r#"닲"#, r#"닲"#, r#"닲"#),
+        (r#"닳"#, r#"닳"#, r#"닳"#, r#"닳"#, r#"닳"#),
+        (r#"담"#, r#"담"#, r#"담"#, r#"담"#, r#"담"#),
+        (r#"답"#, r#"답"#, r#"답"#, r#"답"#, r#"답"#),
+        (r#"닶"#, r#"닶"#, r#"닶"#, r#"닶"#, r#"닶"#),
+        (r#"닷"#, r#"닷"#, r#"닷"#, r#"닷"#, r#"닷"#),
+        (r#"닸"#, r#"닸"#, r#"닸"#, r#"닸"#, r#"닸"#),
+        (r#"당"#, r#"당"#, r#"당"#, r#"당"#, r#"당"#),
+        (r#"닺"#, r#"닺"#, r#"닺"#, r#"닺"#, r#"닺"#),
+        (r#"닻"#, r#"닻"#, r#"닻"#, r#"닻"#, r#"닻"#),
+        (r#"닼"#, r#"닼"#, r#"닼"#, r#"닼"#, r#"닼"#),
+        (r#"닽"#, r#"닽"#, r#"닽"#, r#"닽"#, r#"닽"#),
+        (r#"닾"#, r#"닾"#, r#"닾"#, r#"닾"#, r#"닾"#),
+        (r#"닿"#, r#"닿"#, r#"닿"#, r#"닿"#, r#"닿"#),
+        (r#"대"#, r#"대"#, r#"대"#, r#"대"#, r#"대"#),
+        (r#"댁"#, r#"댁"#, r#"댁"#, r#"댁"#, r#"댁"#),
+        (r#"댂"#, r#"댂"#, r#"댂"#, r#"댂"#, r#"댂"#),
+        (r#"댃"#, r#"댃"#, r#"댃"#, r#"댃"#, r#"댃"#),
+        (r#"댄"#, r#"댄"#, r#"댄"#, r#"댄"#, r#"댄"#),
+        (r#"댅"#, r#"댅"#, r#"댅"#, r#"댅"#, r#"댅"#),
+        (r#"댆"#, r#"댆"#, r#"댆"#, r#"댆"#, r#"댆"#),
+        (r#"댇"#, r#"댇"#, r#"댇"#, r#"댇"#, r#"댇"#),
+        (r#"댈"#, r#"댈"#, r#"댈"#, r#"댈"#, r#"댈"#),
+        (r#"댉"#, r#"댉"#, r#"댉"#, r#"댉"#, r#"댉"#),
+        (r#"댊"#, r#"댊"#, r#"댊"#, r#"댊"#, r#"댊"#),
+        (r#"댋"#, r#"댋"#, r#"댋"#, r#"댋"#, r#"댋"#),
+        (r#"댌"#, r#"댌"#, r#"댌"#, r#"댌"#, r#"댌"#),
+        (r#"댍"#, r#"댍"#, r#"댍"#, r#"댍"#, r#"댍"#),
+        (r#"댎"#, r#"댎"#, r#"댎"#, r#"댎"#, r#"댎"#),
+        (r#"댏"#, r#"댏"#, r#"댏"#, r#"댏"#, r#"댏"#),
+        (r#"댐"#, r#"댐"#, r#"댐"#, r#"댐"#, r#"댐"#),
+        (r#"댑"#, r#"댑"#, r#"댑"#, r#"댑"#, r#"댑"#),
+        (r#"댒"#, r#"댒"#, r#"댒"#, r#"댒"#, r#"댒"#),
+        (r#"댓"#, r#"댓"#, r#"댓"#, r#"댓"#, r#"댓"#),
+        (r#"댔"#, r#"댔"#, r#"댔"#, r#"댔"#, r#"댔"#),
+        (r#"댕"#, r#"댕"#, r#"댕"#, r#"댕"#, r#"댕"#),
+        (r#"댖"#, r#"댖"#, r#"댖"#, r#"댖"#, r#"댖"#),
+        (r#"댗"#, r#"댗"#, r#"댗"#, r#"댗"#, r#"댗"#),
+        (r#"댘"#, r#"댘"#, r#"댘"#, r#"댘"#, r#"댘"#),
+        (r#"댙"#, r#"댙"#, r#"댙"#, r#"댙"#, r#"댙"#),
+        (r#"댚"#, r#"댚"#, r#"댚"#, r#"댚"#, r#"댚"#),
+        (r#"댛"#, r#"댛"#, r#"댛"#, r#"댛"#, r#"댛"#),
+        (r#"댜"#, r#"댜"#, r#"댜"#, r#"댜"#, r#"댜"#),
+        (r#"댝"#, r#"댝"#, r#"댝"#, r#"댝"#, r#"댝"#),
+        (r#"댞"#, r#"댞"#, r#"댞"#, r#"댞"#, r#"댞"#),
+        (r#"댟"#, r#"댟"#, r#"댟"#, r#"댟"#, r#"댟"#),
+        (r#"댠"#, r#"댠"#, r#"댠"#, r#"댠"#, r#"댠"#),
+        (r#"댡"#, r#"댡"#, r#"댡"#, r#"댡"#, r#"댡"#),
+        (r#"댢"#, r#"댢"#, r#"댢"#, r#"댢"#, r#"댢"#),
+        (r#"댣"#, r#"댣"#, r#"댣"#, r#"댣"#, r#"댣"#),
+        (r#"댤"#, r#"댤"#, r#"댤"#, r#"댤"#, r#"댤"#),
+        (r#"댥"#, r#"댥"#, r#"댥"#, r#"댥"#, r#"댥"#),
+        (r#"댦"#, r#"댦"#, r#"댦"#, r#"댦"#, r#"댦"#),
+        (r#"댧"#, r#"댧"#, r#"댧"#, r#"댧"#, r#"댧"#),
+        (r#"댨"#, r#"댨"#, r#"댨"#, r#"댨"#, r#"댨"#),
+        (r#"댩"#, r#"댩"#, r#"댩"#, r#"댩"#, r#"댩"#),
+        (r#"댪"#, r#"댪"#, r#"댪"#, r#"댪"#, r#"댪"#),
+        (r#"댫"#, r#"댫"#, r#"댫"#, r#"댫"#, r#"댫"#),
+        (r#"댬"#, r#"댬"#, r#"댬"#, r#"댬"#, r#"댬"#),
+        (r#"댭"#, r#"댭"#, r#"댭"#, r#"댭"#, r#"댭"#),
+        (r#"댮"#, r#"댮"#, r#"댮"#, r#"댮"#, r#"댮"#),
+        (r#"댯"#, r#"댯"#, r#"댯"#, r#"댯"#, r#"댯"#),
+        (r#"댰"#, r#"댰"#, r#"댰"#, r#"댰"#, r#"댰"#),
+        (r#"댱"#, r#"댱"#, r#"댱"#, r#"댱"#, r#"댱"#),
+        (r#"댲"#, r#"댲"#, r#"댲"#, r#"댲"#, r#"댲"#),
+        (r#"댳"#, r#"댳"#, r#"댳"#, r#"댳"#, r#"댳"#),
+        (r#"댴"#, r#"댴"#, r#"댴"#, r#"댴"#, r#"댴"#),
+        (r#"댵"#, r#"댵"#, r#"댵"#, r#"댵"#, r#"댵"#),
+        (r#"댶"#, r#"댶"#, r#"댶"#, r#"댶"#, r#"댶"#),
+        (r#"댷"#, r#"댷"#, r#"댷"#, r#"댷"#, r#"댷"#),
+        (r#"댸"#, r#"댸"#, r#"댸"#, r#"댸"#, r#"댸"#),
+        (r#"댹"#, r#"댹"#, r#"댹"#, r#"댹"#, r#"댹"#),
+        (r#"댺"#, r#"댺"#, r#"댺"#, r#"댺"#, r#"댺"#),
+        (r#"댻"#, r#"댻"#, r#"댻"#, r#"댻"#, r#"댻"#),
+        (r#"댼"#, r#"댼"#, r#"댼"#, r#"댼"#, r#"댼"#),
+        (r#"댽"#, r#"댽"#, r#"댽"#, r#"댽"#, r#"댽"#),
+        (r#"댾"#, r#"댾"#, r#"댾"#, r#"댾"#, r#"댾"#),
+        (r#"댿"#, r#"댿"#, r#"댿"#, r#"댿"#, r#"댿"#),
+        (r#"덀"#, r#"덀"#, r#"덀"#, r#"덀"#, r#"덀"#),
+        (r#"덁"#, r#"덁"#, r#"덁"#, r#"덁"#, r#"덁"#),
+        (r#"덂"#, r#"덂"#, r#"덂"#, r#"덂"#, r#"덂"#),
+        (r#"덃"#, r#"덃"#, r#"덃"#, r#"덃"#, r#"덃"#),
+        (r#"덄"#, r#"덄"#, r#"덄"#, r#"덄"#, r#"덄"#),
+        (r#"덅"#, r#"덅"#, r#"덅"#, r#"덅"#, r#"덅"#),
+        (r#"덆"#, r#"덆"#, r#"덆"#, r#"덆"#, r#"덆"#),
+        (r#"덇"#, r#"덇"#, r#"덇"#, r#"덇"#, r#"덇"#),
+        (r#"덈"#, r#"덈"#, r#"덈"#, r#"덈"#, r#"덈"#),
+        (r#"덉"#, r#"덉"#, r#"덉"#, r#"덉"#, r#"덉"#),
+        (r#"덊"#, r#"덊"#, r#"덊"#, r#"덊"#, r#"덊"#),
+        (r#"덋"#, r#"덋"#, r#"덋"#, r#"덋"#, r#"덋"#),
+        (r#"덌"#, r#"덌"#, r#"덌"#, r#"덌"#, r#"덌"#),
+        (r#"덍"#, r#"덍"#, r#"덍"#, r#"덍"#, r#"덍"#),
+        (r#"덎"#, r#"덎"#, r#"덎"#, r#"덎"#, r#"덎"#),
+        (r#"덏"#, r#"덏"#, r#"덏"#, r#"덏"#, r#"덏"#),
+        (r#"덐"#, r#"덐"#, r#"덐"#, r#"덐"#, r#"덐"#),
+        (r#"덑"#, r#"덑"#, r#"덑"#, r#"덑"#, r#"덑"#),
+        (r#"덒"#, r#"덒"#, r#"덒"#, r#"덒"#, r#"덒"#),
+        (r#"덓"#, r#"덓"#, r#"덓"#, r#"덓"#, r#"덓"#),
+        (r#"더"#, r#"더"#, r#"더"#, r#"더"#, r#"더"#),
+        (r#"덕"#, r#"덕"#, r#"덕"#, r#"덕"#, r#"덕"#),
+        (r#"덖"#, r#"덖"#, r#"덖"#, r#"덖"#, r#"덖"#),
+        (r#"덗"#, r#"덗"#, r#"덗"#, r#"덗"#, r#"덗"#),
+        (r#"던"#, r#"던"#, r#"던"#, r#"던"#, r#"던"#),
+        (r#"덙"#, r#"덙"#, r#"덙"#, r#"덙"#, r#"덙"#),
+        (r#"덚"#, r#"덚"#, r#"덚"#, r#"덚"#, r#"덚"#),
+        (r#"덛"#, r#"덛"#, r#"덛"#, r#"덛"#, r#"덛"#),
+        (r#"덜"#, r#"덜"#, r#"덜"#, r#"덜"#, r#"덜"#),
+        (r#"덝"#, r#"덝"#, r#"덝"#, r#"덝"#, r#"덝"#),
+        (r#"덞"#, r#"덞"#, r#"덞"#, r#"덞"#, r#"덞"#),
+        (r#"덟"#, r#"덟"#, r#"덟"#, r#"덟"#, r#"덟"#),
+        (r#"덠"#, r#"덠"#, r#"덠"#, r#"덠"#, r#"덠"#),
+        (r#"덡"#, r#"덡"#, r#"덡"#, r#"덡"#, r#"덡"#),
+        (r#"덢"#, r#"덢"#, r#"덢"#, r#"덢"#, r#"덢"#),
+        (r#"덣"#, r#"덣"#, r#"덣"#, r#"덣"#, r#"덣"#),
+        (r#"덤"#, r#"덤"#, r#"덤"#, r#"덤"#, r#"덤"#),
+        (r#"덥"#, r#"덥"#, r#"덥"#, r#"덥"#, r#"덥"#),
+        (r#"덦"#, r#"덦"#, r#"덦"#, r#"덦"#, r#"덦"#),
+        (r#"덧"#, r#"덧"#, r#"덧"#, r#"덧"#, r#"덧"#),
+        (r#"덨"#, r#"덨"#, r#"덨"#, r#"덨"#, r#"덨"#),
+        (r#"덩"#, r#"덩"#, r#"덩"#, r#"덩"#, r#"덩"#),
+        (r#"덪"#, r#"덪"#, r#"덪"#, r#"덪"#, r#"덪"#),
+        (r#"덫"#, r#"덫"#, r#"덫"#, r#"덫"#, r#"덫"#),
+        (r#"덬"#, r#"덬"#, r#"덬"#, r#"덬"#, r#"덬"#),
+        (r#"덭"#, r#"덭"#, r#"덭"#, r#"덭"#, r#"덭"#),
+        (r#"덮"#, r#"덮"#, r#"덮"#, r#"덮"#, r#"덮"#),
+        (r#"덯"#, r#"덯"#, r#"덯"#, r#"덯"#, r#"덯"#),
+        (r#"데"#, r#"데"#, r#"데"#, r#"데"#, r#"데"#),
+        (r#"덱"#, r#"덱"#, r#"덱"#, r#"덱"#, r#"덱"#),
+        (r#"덲"#, r#"덲"#, r#"덲"#, r#"덲"#, r#"덲"#),
+        (r#"덳"#, r#"덳"#, r#"덳"#, r#"덳"#, r#"덳"#),
+        (r#"덴"#, r#"덴"#, r#"덴"#, r#"덴"#, r#"덴"#),
+        (r#"덵"#, r#"덵"#, r#"덵"#, r#"덵"#, r#"덵"#),
+        (r#"덶"#, r#"덶"#, r#"덶"#, r#"덶"#, r#"덶"#),
+        (r#"덷"#, r#"덷"#, r#"덷"#, r#"덷"#, r#"덷"#),
+        (r#"델"#, r#"델"#, r#"델"#, r#"델"#, r#"델"#),
+        (r#"덹"#, r#"덹"#, r#"덹"#, r#"덹"#, r#"덹"#),
+        (r#"덺"#, r#"덺"#, r#"덺"#, r#"덺"#, r#"덺"#),
+        (r#"덻"#, r#"덻"#, r#"덻"#, r#"덻"#, r#"덻"#),
+        (r#"덼"#, r#"덼"#, r#"덼"#, r#"덼"#, r#"덼"#),
+        (r#"덽"#, r#"덽"#, r#"덽"#, r#"덽"#, r#"덽"#),
+        (r#"덾"#, r#"덾"#, r#"덾"#, r#"덾"#, r#"덾"#),
+        (r#"덿"#, r#"덿"#, r#"덿"#, r#"덿"#, r#"덿"#),
+        (r#"뎀"#, r#"뎀"#, r#"뎀"#, r#"뎀"#, r#"뎀"#),
+        (r#"뎁"#, r#"뎁"#, r#"뎁"#, r#"뎁"#, r#"뎁"#),
+        (r#"뎂"#, r#"뎂"#, r#"뎂"#, r#"뎂"#, r#"뎂"#),
+        (r#"뎃"#, r#"뎃"#, r#"뎃"#, r#"뎃"#, r#"뎃"#),
+        (r#"뎄"#, r#"뎄"#, r#"뎄"#, r#"뎄"#, r#"뎄"#),
+        (r#"뎅"#, r#"뎅"#, r#"뎅"#, r#"뎅"#, r#"뎅"#),
+        (r#"뎆"#, r#"뎆"#, r#"뎆"#, r#"뎆"#, r#"뎆"#),
+        (r#"뎇"#, r#"뎇"#, r#"뎇"#, r#"뎇"#, r#"뎇"#),
+        (r#"뎈"#, r#"뎈"#, r#"뎈"#, r#"뎈"#, r#"뎈"#),
+        (r#"뎉"#, r#"뎉"#, r#"뎉"#, r#"뎉"#, r#"뎉"#),
+        (r#"뎊"#, r#"뎊"#, r#"뎊"#, r#"뎊"#, r#"뎊"#),
+        (r#"뎋"#, r#"뎋"#, r#"뎋"#, r#"뎋"#, r#"뎋"#),
+        (r#"뎌"#, r#"뎌"#, r#"뎌"#, r#"뎌"#, r#"뎌"#),
+        (r#"뎍"#, r#"뎍"#, r#"뎍"#, r#"뎍"#, r#"뎍"#),
+        (r#"뎎"#, r#"뎎"#, r#"뎎"#, r#"뎎"#, r#"뎎"#),
+        (r#"뎏"#, r#"뎏"#, r#"뎏"#, r#"뎏"#, r#"뎏"#),
+        (r#"뎐"#, r#"뎐"#, r#"뎐"#, r#"뎐"#, r#"뎐"#),
+        (r#"뎑"#, r#"뎑"#, r#"뎑"#, r#"뎑"#, r#"뎑"#),
+        (r#"뎒"#, r#"뎒"#, r#"뎒"#, r#"뎒"#, r#"뎒"#),
+        (r#"뎓"#, r#"뎓"#, r#"뎓"#, r#"뎓"#, r#"뎓"#),
+        (r#"뎔"#, r#"뎔"#, r#"뎔"#, r#"뎔"#, r#"뎔"#),
+        (r#"뎕"#, r#"뎕"#, r#"뎕"#, r#"뎕"#, r#"뎕"#),
+        (r#"뎖"#, r#"뎖"#, r#"뎖"#, r#"뎖"#, r#"뎖"#),
+        (r#"뎗"#, r#"뎗"#, r#"뎗"#, r#"뎗"#, r#"뎗"#),
+        (r#"뎘"#, r#"뎘"#, r#"뎘"#, r#"뎘"#, r#"뎘"#),
+        (r#"뎙"#, r#"뎙"#, r#"뎙"#, r#"뎙"#, r#"뎙"#),
+        (r#"뎚"#, r#"뎚"#, r#"뎚"#, r#"뎚"#, r#"뎚"#),
+        (r#"뎛"#, r#"뎛"#, r#"뎛"#, r#"뎛"#, r#"뎛"#),
+        (r#"뎜"#, r#"뎜"#, r#"뎜"#, r#"뎜"#, r#"뎜"#),
+        (r#"뎝"#, r#"뎝"#, r#"뎝"#, r#"뎝"#, r#"뎝"#),
+        (r#"뎞"#, r#"뎞"#, r#"뎞"#, r#"뎞"#, r#"뎞"#),
+        (r#"뎟"#, r#"뎟"#, r#"뎟"#, r#"뎟"#, r#"뎟"#),
+        (r#"뎠"#, r#"뎠"#, r#"뎠"#, r#"뎠"#, r#"뎠"#),
+        (r#"뎡"#, r#"뎡"#, r#"뎡"#, r#"뎡"#, r#"뎡"#),
+        (r#"뎢"#, r#"뎢"#, r#"뎢"#, r#"뎢"#, r#"뎢"#),
+        (r#"뎣"#, r#"뎣"#, r#"뎣"#, r#"뎣"#, r#"뎣"#),
+        (r#"뎤"#, r#"뎤"#, r#"뎤"#, r#"뎤"#, r#"뎤"#),
+        (r#"뎥"#, r#"뎥"#, r#"뎥"#, r#"뎥"#, r#"뎥"#),
+        (r#"뎦"#, r#"뎦"#, r#"뎦"#, r#"뎦"#, r#"뎦"#),
+        (r#"뎧"#, r#"뎧"#, r#"뎧"#, r#"뎧"#, r#"뎧"#),
+        (r#"뎨"#, r#"뎨"#, r#"뎨"#, r#"뎨"#, r#"뎨"#),
+        (r#"뎩"#, r#"뎩"#, r#"뎩"#, r#"뎩"#, r#"뎩"#),
+        (r#"뎪"#, r#"뎪"#, r#"뎪"#, r#"뎪"#, r#"뎪"#),
+        (r#"뎫"#, r#"뎫"#, r#"뎫"#, r#"뎫"#, r#"뎫"#),
+        (r#"뎬"#, r#"뎬"#, r#"뎬"#, r#"뎬"#, r#"뎬"#),
+        (r#"뎭"#, r#"뎭"#, r#"뎭"#, r#"뎭"#, r#"뎭"#),
+        (r#"뎮"#, r#"뎮"#, r#"뎮"#, r#"뎮"#, r#"뎮"#),
+        (r#"뎯"#, r#"뎯"#, r#"뎯"#, r#"뎯"#, r#"뎯"#),
+        (r#"뎰"#, r#"뎰"#, r#"뎰"#, r#"뎰"#, r#"뎰"#),
+        (r#"뎱"#, r#"뎱"#, r#"뎱"#, r#"뎱"#, r#"뎱"#),
+        (r#"뎲"#, r#"뎲"#, r#"뎲"#, r#"뎲"#, r#"뎲"#),
+        (r#"뎳"#, r#"뎳"#, r#"뎳"#, r#"뎳"#, r#"뎳"#),
+        (r#"뎴"#, r#"뎴"#, r#"뎴"#, r#"뎴"#, r#"뎴"#),
+        (r#"뎵"#, r#"뎵"#, r#"뎵"#, r#"뎵"#, r#"뎵"#),
+        (r#"뎶"#, r#"뎶"#, r#"뎶"#, r#"뎶"#, r#"뎶"#),
+        (r#"뎷"#, r#"뎷"#, r#"뎷"#, r#"뎷"#, r#"뎷"#),
+        (r#"뎸"#, r#"뎸"#, r#"뎸"#, r#"뎸"#, r#"뎸"#),
+        (r#"뎹"#, r#"뎹"#, r#"뎹"#, r#"뎹"#, r#"뎹"#),
+        (r#"뎺"#, r#"뎺"#, r#"뎺"#, r#"뎺"#, r#"뎺"#),
+        (r#"뎻"#, r#"뎻"#, r#"뎻"#, r#"뎻"#, r#"뎻"#),
+        (r#"뎼"#, r#"뎼"#, r#"뎼"#, r#"뎼"#, r#"뎼"#),
+        (r#"뎽"#, r#"뎽"#, r#"뎽"#, r#"뎽"#, r#"뎽"#),
+        (r#"뎾"#, r#"뎾"#, r#"뎾"#, r#"뎾"#, r#"뎾"#),
+        (r#"뎿"#, r#"뎿"#, r#"뎿"#, r#"뎿"#, r#"뎿"#),
+        (r#"돀"#, r#"돀"#, r#"돀"#, r#"돀"#, r#"돀"#),
+        (r#"돁"#, r#"돁"#, r#"돁"#, r#"돁"#, r#"돁"#),
+        (r#"돂"#, r#"돂"#, r#"돂"#, r#"돂"#, r#"돂"#),
+        (r#"돃"#, r#"돃"#, r#"돃"#, r#"돃"#, r#"돃"#),
+        (r#"도"#, r#"도"#, r#"도"#, r#"도"#, r#"도"#),
+        (r#"독"#, r#"독"#, r#"독"#, r#"독"#, r#"독"#),
+        (r#"돆"#, r#"돆"#, r#"돆"#, r#"돆"#, r#"돆"#),
+        (r#"돇"#, r#"돇"#, r#"돇"#, r#"돇"#, r#"돇"#),
+        (r#"돈"#, r#"돈"#, r#"돈"#, r#"돈"#, r#"돈"#),
+        (r#"돉"#, r#"돉"#, r#"돉"#, r#"돉"#, r#"돉"#),
+        (r#"돊"#, r#"돊"#, r#"돊"#, r#"돊"#, r#"돊"#),
+        (r#"돋"#, r#"돋"#, r#"돋"#, r#"돋"#, r#"돋"#),
+        (r#"돌"#, r#"돌"#, r#"돌"#, r#"돌"#, r#"돌"#),
+        (r#"돍"#, r#"돍"#, r#"돍"#, r#"돍"#, r#"돍"#),
+        (r#"돎"#, r#"돎"#, r#"돎"#, r#"돎"#, r#"돎"#),
+        (r#"돏"#, r#"돏"#, r#"돏"#, r#"돏"#, r#"돏"#),
+        (r#"돐"#, r#"돐"#, r#"돐"#, r#"돐"#, r#"돐"#),
+        (r#"돑"#, r#"돑"#, r#"돑"#, r#"돑"#, r#"돑"#),
+        (r#"돒"#, r#"돒"#, r#"돒"#, r#"돒"#, r#"돒"#),
+        (r#"돓"#, r#"돓"#, r#"돓"#, r#"돓"#, r#"돓"#),
+        (r#"돔"#, r#"돔"#, r#"돔"#, r#"돔"#, r#"돔"#),
+        (r#"돕"#, r#"돕"#, r#"돕"#, r#"돕"#, r#"돕"#),
+        (r#"돖"#, r#"돖"#, r#"돖"#, r#"돖"#, r#"돖"#),
+        (r#"돗"#, r#"돗"#, r#"돗"#, r#"돗"#, r#"돗"#),
+        (r#"돘"#, r#"돘"#, r#"돘"#, r#"돘"#, r#"돘"#),
+        (r#"동"#, r#"동"#, r#"동"#, r#"동"#, r#"동"#),
+        (r#"돚"#, r#"돚"#, r#"돚"#, r#"돚"#, r#"돚"#),
+        (r#"돛"#, r#"돛"#, r#"돛"#, r#"돛"#, r#"돛"#),
+        (r#"돜"#, r#"돜"#, r#"돜"#, r#"돜"#, r#"돜"#),
+        (r#"돝"#, r#"돝"#, r#"돝"#, r#"돝"#, r#"돝"#),
+        (r#"돞"#, r#"돞"#, r#"돞"#, r#"돞"#, r#"돞"#),
+        (r#"돟"#, r#"돟"#, r#"돟"#, r#"돟"#, r#"돟"#),
+        (r#"돠"#, r#"돠"#, r#"돠"#, r#"돠"#, r#"돠"#),
+        (r#"돡"#, r#"돡"#, r#"돡"#, r#"돡"#, r#"돡"#),
+        (r#"돢"#, r#"돢"#, r#"돢"#, r#"돢"#, r#"돢"#),
+        (r#"돣"#, r#"돣"#, r#"돣"#, r#"돣"#, r#"돣"#),
+        (r#"돤"#, r#"돤"#, r#"돤"#, r#"돤"#, r#"돤"#),
+        (r#"돥"#, r#"돥"#, r#"돥"#, r#"돥"#, r#"돥"#),
+        (r#"돦"#, r#"돦"#, r#"돦"#, r#"돦"#, r#"돦"#),
+        (r#"돧"#, r#"돧"#, r#"돧"#, r#"돧"#, r#"돧"#),
+        (r#"돨"#, r#"돨"#, r#"돨"#, r#"돨"#, r#"돨"#),
+        (r#"돩"#, r#"돩"#, r#"돩"#, r#"돩"#, r#"돩"#),
+        (r#"돪"#, r#"돪"#, r#"돪"#, r#"돪"#, r#"돪"#),
+        (r#"돫"#, r#"돫"#, r#"돫"#, r#"돫"#, r#"돫"#),
+        (r#"돬"#, r#"돬"#, r#"돬"#, r#"돬"#, r#"돬"#),
+        (r#"돭"#, r#"돭"#, r#"돭"#, r#"돭"#, r#"돭"#),
+        (r#"돮"#, r#"돮"#, r#"돮"#, r#"돮"#, r#"돮"#),
+        (r#"돯"#, r#"돯"#, r#"돯"#, r#"돯"#, r#"돯"#),
+        (r#"돰"#, r#"돰"#, r#"돰"#, r#"돰"#, r#"돰"#),
+        (r#"돱"#, r#"돱"#, r#"돱"#, r#"돱"#, r#"돱"#),
+        (r#"돲"#, r#"돲"#, r#"돲"#, r#"돲"#, r#"돲"#),
+        (r#"돳"#, r#"돳"#, r#"돳"#, r#"돳"#, r#"돳"#),
+        (r#"돴"#, r#"돴"#, r#"돴"#, r#"돴"#, r#"돴"#),
+        (r#"돵"#, r#"돵"#, r#"돵"#, r#"돵"#, r#"돵"#),
+        (r#"돶"#, r#"돶"#, r#"돶"#, r#"돶"#, r#"돶"#),
+        (r#"돷"#, r#"돷"#, r#"돷"#, r#"돷"#, r#"돷"#),
+        (r#"돸"#, r#"돸"#, r#"돸"#, r#"돸"#, r#"돸"#),
+        (r#"돹"#, r#"돹"#, r#"돹"#, r#"돹"#, r#"돹"#),
+        (r#"돺"#, r#"돺"#, r#"돺"#, r#"돺"#, r#"돺"#),
+        (r#"돻"#, r#"돻"#, r#"돻"#, r#"돻"#, r#"돻"#),
+        (r#"돼"#, r#"돼"#, r#"돼"#, r#"돼"#, r#"돼"#),
+        (r#"돽"#, r#"돽"#, r#"돽"#, r#"돽"#, r#"돽"#),
+        (r#"돾"#, r#"돾"#, r#"돾"#, r#"돾"#, r#"돾"#),
+        (r#"돿"#, r#"돿"#, r#"돿"#, r#"돿"#, r#"돿"#),
+        (r#"됀"#, r#"됀"#, r#"됀"#, r#"됀"#, r#"됀"#),
+        (r#"됁"#, r#"됁"#, r#"됁"#, r#"됁"#, r#"됁"#),
+        (r#"됂"#, r#"됂"#, r#"됂"#, r#"됂"#, r#"됂"#),
+        (r#"됃"#, r#"됃"#, r#"됃"#, r#"됃"#, r#"됃"#),
+        (r#"됄"#, r#"됄"#, r#"됄"#, r#"됄"#, r#"됄"#),
+        (r#"됅"#, r#"됅"#, r#"됅"#, r#"됅"#, r#"됅"#),
+        (r#"됆"#, r#"됆"#, r#"됆"#, r#"됆"#, r#"됆"#),
+        (r#"됇"#, r#"됇"#, r#"됇"#, r#"됇"#, r#"됇"#),
+        (r#"됈"#, r#"됈"#, r#"됈"#, r#"됈"#, r#"됈"#),
+        (r#"됉"#, r#"됉"#, r#"됉"#, r#"됉"#, r#"됉"#),
+        (r#"됊"#, r#"됊"#, r#"됊"#, r#"됊"#, r#"됊"#),
+        (r#"됋"#, r#"됋"#, r#"됋"#, r#"됋"#, r#"됋"#),
+        (r#"됌"#, r#"됌"#, r#"됌"#, r#"됌"#, r#"됌"#),
+        (r#"됍"#, r#"됍"#, r#"됍"#, r#"됍"#, r#"됍"#),
+        (r#"됎"#, r#"됎"#, r#"됎"#, r#"됎"#, r#"됎"#),
+        (r#"됏"#, r#"됏"#, r#"됏"#, r#"됏"#, r#"됏"#),
+        (r#"됐"#, r#"됐"#, r#"됐"#, r#"됐"#, r#"됐"#),
+        (r#"됑"#, r#"됑"#, r#"됑"#, r#"됑"#, r#"됑"#),
+        (r#"됒"#, r#"됒"#, r#"됒"#, r#"됒"#, r#"됒"#),
+        (r#"됓"#, r#"됓"#, r#"됓"#, r#"됓"#, r#"됓"#),
+        (r#"됔"#, r#"됔"#, r#"됔"#, r#"됔"#, r#"됔"#),
+        (r#"됕"#, r#"됕"#, r#"됕"#, r#"됕"#, r#"됕"#),
+        (r#"됖"#, r#"됖"#, r#"됖"#, r#"됖"#, r#"됖"#),
+        (r#"됗"#, r#"됗"#, r#"됗"#, r#"됗"#, r#"됗"#),
+        (r#"되"#, r#"되"#, r#"되"#, r#"되"#, r#"되"#),
+        (r#"됙"#, r#"됙"#, r#"됙"#, r#"됙"#, r#"됙"#),
+        (r#"됚"#, r#"됚"#, r#"됚"#, r#"됚"#, r#"됚"#),
+        (r#"됛"#, r#"됛"#, r#"됛"#, r#"됛"#, r#"됛"#),
+        (r#"된"#, r#"된"#, r#"된"#, r#"된"#, r#"된"#),
+        (r#"됝"#, r#"됝"#, r#"됝"#, r#"됝"#, r#"됝"#),
+        (r#"됞"#, r#"됞"#, r#"됞"#, r#"됞"#, r#"됞"#),
+        (r#"됟"#, r#"됟"#, r#"됟"#, r#"됟"#, r#"됟"#),
+        (r#"될"#, r#"될"#, r#"될"#, r#"될"#, r#"될"#),
+        (r#"됡"#, r#"됡"#, r#"됡"#, r#"됡"#, r#"됡"#),
+        (r#"됢"#, r#"됢"#, r#"됢"#, r#"됢"#, r#"됢"#),
+        (r#"됣"#, r#"됣"#, r#"됣"#, r#"됣"#, r#"됣"#),
+        (r#"됤"#, r#"됤"#, r#"됤"#, r#"됤"#, r#"됤"#),
+        (r#"됥"#, r#"됥"#, r#"됥"#, r#"됥"#, r#"됥"#),
+        (r#"됦"#, r#"됦"#, r#"됦"#, r#"됦"#, r#"됦"#),
+        (r#"됧"#, r#"됧"#, r#"됧"#, r#"됧"#, r#"됧"#),
+        (r#"됨"#, r#"됨"#, r#"됨"#, r#"됨"#, r#"됨"#),
+        (r#"됩"#, r#"됩"#, r#"됩"#, r#"됩"#, r#"됩"#),
+        (r#"됪"#, r#"됪"#, r#"됪"#, r#"됪"#, r#"됪"#),
+        (r#"됫"#, r#"됫"#, r#"됫"#, r#"됫"#, r#"됫"#),
+        (r#"됬"#, r#"됬"#, r#"됬"#, r#"됬"#, r#"됬"#),
+        (r#"됭"#, r#"됭"#, r#"됭"#, r#"됭"#, r#"됭"#),
+        (r#"됮"#, r#"됮"#, r#"됮"#, r#"됮"#, r#"됮"#),
+        (r#"됯"#, r#"됯"#, r#"됯"#, r#"됯"#, r#"됯"#),
+        (r#"됰"#, r#"됰"#, r#"됰"#, r#"됰"#, r#"됰"#),
+        (r#"됱"#, r#"됱"#, r#"됱"#, r#"됱"#, r#"됱"#),
+        (r#"됲"#, r#"됲"#, r#"됲"#, r#"됲"#, r#"됲"#),
+        (r#"됳"#, r#"됳"#, r#"됳"#, r#"됳"#, r#"됳"#),
+        (r#"됴"#, r#"됴"#, r#"됴"#, r#"됴"#, r#"됴"#),
+        (r#"됵"#, r#"됵"#, r#"됵"#, r#"됵"#, r#"됵"#),
+        (r#"됶"#, r#"됶"#, r#"됶"#, r#"됶"#, r#"됶"#),
+        (r#"됷"#, r#"됷"#, r#"됷"#, r#"됷"#, r#"됷"#),
+        (r#"됸"#, r#"됸"#, r#"됸"#, r#"됸"#, r#"됸"#),
+        (r#"됹"#, r#"됹"#, r#"됹"#, r#"됹"#, r#"됹"#),
+        (r#"됺"#, r#"됺"#, r#"됺"#, r#"됺"#, r#"됺"#),
+        (r#"됻"#, r#"됻"#, r#"됻"#, r#"됻"#, r#"됻"#),
+        (r#"됼"#, r#"됼"#, r#"됼"#, r#"됼"#, r#"됼"#),
+        (r#"됽"#, r#"됽"#, r#"됽"#, r#"됽"#, r#"됽"#),
+        (r#"됾"#, r#"됾"#, r#"됾"#, r#"됾"#, r#"됾"#),
+        (r#"됿"#, r#"됿"#, r#"됿"#, r#"됿"#, r#"됿"#),
+        (r#"둀"#, r#"둀"#, r#"둀"#, r#"둀"#, r#"둀"#),
+        (r#"둁"#, r#"둁"#, r#"둁"#, r#"둁"#, r#"둁"#),
+        (r#"둂"#, r#"둂"#, r#"둂"#, r#"둂"#, r#"둂"#),
+        (r#"둃"#, r#"둃"#, r#"둃"#, r#"둃"#, r#"둃"#),
+        (r#"둄"#, r#"둄"#, r#"둄"#, r#"둄"#, r#"둄"#),
+        (r#"둅"#, r#"둅"#, r#"둅"#, r#"둅"#, r#"둅"#),
+        (r#"둆"#, r#"둆"#, r#"둆"#, r#"둆"#, r#"둆"#),
+        (r#"둇"#, r#"둇"#, r#"둇"#, r#"둇"#, r#"둇"#),
+        (r#"둈"#, r#"둈"#, r#"둈"#, r#"둈"#, r#"둈"#),
+        (r#"둉"#, r#"둉"#, r#"둉"#, r#"둉"#, r#"둉"#),
+        (r#"둊"#, r#"둊"#, r#"둊"#, r#"둊"#, r#"둊"#),
+        (r#"둋"#, r#"둋"#, r#"둋"#, r#"둋"#, r#"둋"#),
+        (r#"둌"#, r#"둌"#, r#"둌"#, r#"둌"#, r#"둌"#),
+        (r#"둍"#, r#"둍"#, r#"둍"#, r#"둍"#, r#"둍"#),
+        (r#"둎"#, r#"둎"#, r#"둎"#, r#"둎"#, r#"둎"#),
+        (r#"둏"#, r#"둏"#, r#"둏"#, r#"둏"#, r#"둏"#),
+        (r#"두"#, r#"두"#, r#"두"#, r#"두"#, r#"두"#),
+        (r#"둑"#, r#"둑"#, r#"둑"#, r#"둑"#, r#"둑"#),
+        (r#"둒"#, r#"둒"#, r#"둒"#, r#"둒"#, r#"둒"#),
+        (r#"둓"#, r#"둓"#, r#"둓"#, r#"둓"#, r#"둓"#),
+        (r#"둔"#, r#"둔"#, r#"둔"#, r#"둔"#, r#"둔"#),
+        (r#"둕"#, r#"둕"#, r#"둕"#, r#"둕"#, r#"둕"#),
+        (r#"둖"#, r#"둖"#, r#"둖"#, r#"둖"#, r#"둖"#),
+        (r#"둗"#, r#"둗"#, r#"둗"#, r#"둗"#, r#"둗"#),
+        (r#"둘"#, r#"둘"#, r#"둘"#, r#"둘"#, r#"둘"#),
+        (r#"둙"#, r#"둙"#, r#"둙"#, r#"둙"#, r#"둙"#),
+        (r#"둚"#, r#"둚"#, r#"둚"#, r#"둚"#, r#"둚"#),
+        (r#"둛"#, r#"둛"#, r#"둛"#, r#"둛"#, r#"둛"#),
+        (r#"둜"#, r#"둜"#, r#"둜"#, r#"둜"#, r#"둜"#),
+        (r#"둝"#, r#"둝"#, r#"둝"#, r#"둝"#, r#"둝"#),
+        (r#"둞"#, r#"둞"#, r#"둞"#, r#"둞"#, r#"둞"#),
+        (r#"둟"#, r#"둟"#, r#"둟"#, r#"둟"#, r#"둟"#),
+        (r#"둠"#, r#"둠"#, r#"둠"#, r#"둠"#, r#"둠"#),
+        (r#"둡"#, r#"둡"#, r#"둡"#, r#"둡"#, r#"둡"#),
+        (r#"둢"#, r#"둢"#, r#"둢"#, r#"둢"#, r#"둢"#),
+        (r#"둣"#, r#"둣"#, r#"둣"#, r#"둣"#, r#"둣"#),
+        (r#"둤"#, r#"둤"#, r#"둤"#, r#"둤"#, r#"둤"#),
+        (r#"둥"#, r#"둥"#, r#"둥"#, r#"둥"#, r#"둥"#),
+        (r#"둦"#, r#"둦"#, r#"둦"#, r#"둦"#, r#"둦"#),
+        (r#"둧"#, r#"둧"#, r#"둧"#, r#"둧"#, r#"둧"#),
+        (r#"둨"#, r#"둨"#, r#"둨"#, r#"둨"#, r#"둨"#),
+        (r#"둩"#, r#"둩"#, r#"둩"#, r#"둩"#, r#"둩"#),
+        (r#"둪"#, r#"둪"#, r#"둪"#, r#"둪"#, r#"둪"#),
+        (r#"둫"#, r#"둫"#, r#"둫"#, r#"둫"#, r#"둫"#),
+        (r#"둬"#, r#"둬"#, r#"둬"#, r#"둬"#, r#"둬"#),
+        (r#"둭"#, r#"둭"#, r#"둭"#, r#"둭"#, r#"둭"#),
+        (r#"둮"#, r#"둮"#, r#"둮"#, r#"둮"#, r#"둮"#),
+        (r#"둯"#, r#"둯"#, r#"둯"#, r#"둯"#, r#"둯"#),
+        (r#"둰"#, r#"둰"#, r#"둰"#, r#"둰"#, r#"둰"#),
+        (r#"둱"#, r#"둱"#, r#"둱"#, r#"둱"#, r#"둱"#),
+        (r#"둲"#, r#"둲"#, r#"둲"#, r#"둲"#, r#"둲"#),
+        (r#"둳"#, r#"둳"#, r#"둳"#, r#"둳"#, r#"둳"#),
+        (r#"둴"#, r#"둴"#, r#"둴"#, r#"둴"#, r#"둴"#),
+        (r#"둵"#, r#"둵"#, r#"둵"#, r#"둵"#, r#"둵"#),
+        (r#"둶"#, r#"둶"#, r#"둶"#, r#"둶"#, r#"둶"#),
+        (r#"둷"#, r#"둷"#, r#"둷"#, r#"둷"#, r#"둷"#),
+        (r#"둸"#, r#"둸"#, r#"둸"#, r#"둸"#, r#"둸"#),
+        (r#"둹"#, r#"둹"#, r#"둹"#, r#"둹"#, r#"둹"#),
+        (r#"둺"#, r#"둺"#, r#"둺"#, r#"둺"#, r#"둺"#),
+        (r#"둻"#, r#"둻"#, r#"둻"#, r#"둻"#, r#"둻"#),
+        (r#"둼"#, r#"둼"#, r#"둼"#, r#"둼"#, r#"둼"#),
+        (r#"둽"#, r#"둽"#, r#"둽"#, r#"둽"#, r#"둽"#),
+        (r#"둾"#, r#"둾"#, r#"둾"#, r#"둾"#, r#"둾"#),
+        (r#"둿"#, r#"둿"#, r#"둿"#, r#"둿"#, r#"둿"#),
+        (r#"뒀"#, r#"뒀"#, r#"뒀"#, r#"뒀"#, r#"뒀"#),
+        (r#"뒁"#, r#"뒁"#, r#"뒁"#, r#"뒁"#, r#"뒁"#),
+        (r#"뒂"#, r#"뒂"#, r#"뒂"#, r#"뒂"#, r#"뒂"#),
+        (r#"뒃"#, r#"뒃"#, r#"뒃"#, r#"뒃"#, r#"뒃"#),
+        (r#"뒄"#, r#"뒄"#, r#"뒄"#, r#"뒄"#, r#"뒄"#),
+        (r#"뒅"#, r#"뒅"#, r#"뒅"#, r#"뒅"#, r#"뒅"#),
+        (r#"뒆"#, r#"뒆"#, r#"뒆"#, r#"뒆"#, r#"뒆"#),
+        (r#"뒇"#, r#"뒇"#, r#"뒇"#, r#"뒇"#, r#"뒇"#),
+        (r#"뒈"#, r#"뒈"#, r#"뒈"#, r#"뒈"#, r#"뒈"#),
+        (r#"뒉"#, r#"뒉"#, r#"뒉"#, r#"뒉"#, r#"뒉"#),
+        (r#"뒊"#, r#"뒊"#, r#"뒊"#, r#"뒊"#, r#"뒊"#),
+        (r#"뒋"#, r#"뒋"#, r#"뒋"#, r#"뒋"#, r#"뒋"#),
+        (r#"뒌"#, r#"뒌"#, r#"뒌"#, r#"뒌"#, r#"뒌"#),
+        (r#"뒍"#, r#"뒍"#, r#"뒍"#, r#"뒍"#, r#"뒍"#),
+        (r#"뒎"#, r#"뒎"#, r#"뒎"#, r#"뒎"#, r#"뒎"#),
+        (r#"뒏"#, r#"뒏"#, r#"뒏"#, r#"뒏"#, r#"뒏"#),
+        (r#"뒐"#, r#"뒐"#, r#"뒐"#, r#"뒐"#, r#"뒐"#),
+        (r#"뒑"#, r#"뒑"#, r#"뒑"#, r#"뒑"#, r#"뒑"#),
+        (r#"뒒"#, r#"뒒"#, r#"뒒"#, r#"뒒"#, r#"뒒"#),
+        (r#"뒓"#, r#"뒓"#, r#"뒓"#, r#"뒓"#, r#"뒓"#),
+        (r#"뒔"#, r#"뒔"#, r#"뒔"#, r#"뒔"#, r#"뒔"#),
+        (r#"뒕"#, r#"뒕"#, r#"뒕"#, r#"뒕"#, r#"뒕"#),
+        (r#"뒖"#, r#"뒖"#, r#"뒖"#, r#"뒖"#, r#"뒖"#),
+        (r#"뒗"#, r#"뒗"#, r#"뒗"#, r#"뒗"#, r#"뒗"#),
+        (r#"뒘"#, r#"뒘"#, r#"뒘"#, r#"뒘"#, r#"뒘"#),
+        (r#"뒙"#, r#"뒙"#, r#"뒙"#, r#"뒙"#, r#"뒙"#),
+        (r#"뒚"#, r#"뒚"#, r#"뒚"#, r#"뒚"#, r#"뒚"#),
+        (r#"뒛"#, r#"뒛"#, r#"뒛"#, r#"뒛"#, r#"뒛"#),
+        (r#"뒜"#, r#"뒜"#, r#"뒜"#, r#"뒜"#, r#"뒜"#),
+        (r#"뒝"#, r#"뒝"#, r#"뒝"#, r#"뒝"#, r#"뒝"#),
+        (r#"뒞"#, r#"뒞"#, r#"뒞"#, r#"뒞"#, r#"뒞"#),
+        (r#"뒟"#, r#"뒟"#, r#"뒟"#, r#"뒟"#, r#"뒟"#),
+        (r#"뒠"#, r#"뒠"#, r#"뒠"#, r#"뒠"#, r#"뒠"#),
+        (r#"뒡"#, r#"뒡"#, r#"뒡"#, r#"뒡"#, r#"뒡"#),
+        (r#"뒢"#, r#"뒢"#, r#"뒢"#, r#"뒢"#, r#"뒢"#),
+        (r#"뒣"#, r#"뒣"#, r#"뒣"#, r#"뒣"#, r#"뒣"#),
+        (r#"뒤"#, r#"뒤"#, r#"뒤"#, r#"뒤"#, r#"뒤"#),
+        (r#"뒥"#, r#"뒥"#, r#"뒥"#, r#"뒥"#, r#"뒥"#),
+        (r#"뒦"#, r#"뒦"#, r#"뒦"#, r#"뒦"#, r#"뒦"#),
+        (r#"뒧"#, r#"뒧"#, r#"뒧"#, r#"뒧"#, r#"뒧"#),
+        (r#"뒨"#, r#"뒨"#, r#"뒨"#, r#"뒨"#, r#"뒨"#),
+        (r#"뒩"#, r#"뒩"#, r#"뒩"#, r#"뒩"#, r#"뒩"#),
+        (r#"뒪"#, r#"뒪"#, r#"뒪"#, r#"뒪"#, r#"뒪"#),
+        (r#"뒫"#, r#"뒫"#, r#"뒫"#, r#"뒫"#, r#"뒫"#),
+        (r#"뒬"#, r#"뒬"#, r#"뒬"#, r#"뒬"#, r#"뒬"#),
+        (r#"뒭"#, r#"뒭"#, r#"뒭"#, r#"뒭"#, r#"뒭"#),
+        (r#"뒮"#, r#"뒮"#, r#"뒮"#, r#"뒮"#, r#"뒮"#),
+        (r#"뒯"#, r#"뒯"#, r#"뒯"#, r#"뒯"#, r#"뒯"#),
+        (r#"뒰"#, r#"뒰"#, r#"뒰"#, r#"뒰"#, r#"뒰"#),
+        (r#"뒱"#, r#"뒱"#, r#"뒱"#, r#"뒱"#, r#"뒱"#),
+        (r#"뒲"#, r#"뒲"#, r#"뒲"#, r#"뒲"#, r#"뒲"#),
+        (r#"뒳"#, r#"뒳"#, r#"뒳"#, r#"뒳"#, r#"뒳"#),
+        (r#"뒴"#, r#"뒴"#, r#"뒴"#, r#"뒴"#, r#"뒴"#),
+        (r#"뒵"#, r#"뒵"#, r#"뒵"#, r#"뒵"#, r#"뒵"#),
+        (r#"뒶"#, r#"뒶"#, r#"뒶"#, r#"뒶"#, r#"뒶"#),
+        (r#"뒷"#, r#"뒷"#, r#"뒷"#, r#"뒷"#, r#"뒷"#),
+        (r#"뒸"#, r#"뒸"#, r#"뒸"#, r#"뒸"#, r#"뒸"#),
+        (r#"뒹"#, r#"뒹"#, r#"뒹"#, r#"뒹"#, r#"뒹"#),
+        (r#"뒺"#, r#"뒺"#, r#"뒺"#, r#"뒺"#, r#"뒺"#),
+        (r#"뒻"#, r#"뒻"#, r#"뒻"#, r#"뒻"#, r#"뒻"#),
+        (r#"뒼"#, r#"뒼"#, r#"뒼"#, r#"뒼"#, r#"뒼"#),
+        (r#"뒽"#, r#"뒽"#, r#"뒽"#, r#"뒽"#, r#"뒽"#),
+        (r#"뒾"#, r#"뒾"#, r#"뒾"#, r#"뒾"#, r#"뒾"#),
+        (r#"뒿"#, r#"뒿"#, r#"뒿"#, r#"뒿"#, r#"뒿"#),
+        (r#"듀"#, r#"듀"#, r#"듀"#, r#"듀"#, r#"듀"#),
+        (r#"듁"#, r#"듁"#, r#"듁"#, r#"듁"#, r#"듁"#),
+        (r#"듂"#, r#"듂"#, r#"듂"#, r#"듂"#, r#"듂"#),
+        (r#"듃"#, r#"듃"#, r#"듃"#, r#"듃"#, r#"듃"#),
+        (r#"듄"#, r#"듄"#, r#"듄"#, r#"듄"#, r#"듄"#),
+        (r#"듅"#, r#"듅"#, r#"듅"#, r#"듅"#, r#"듅"#),
+        (r#"듆"#, r#"듆"#, r#"듆"#, r#"듆"#, r#"듆"#),
+        (r#"듇"#, r#"듇"#, r#"듇"#, r#"듇"#, r#"듇"#),
+        (r#"듈"#, r#"듈"#, r#"듈"#, r#"듈"#, r#"듈"#),
+        (r#"듉"#, r#"듉"#, r#"듉"#, r#"듉"#, r#"듉"#),
+        (r#"듊"#, r#"듊"#, r#"듊"#, r#"듊"#, r#"듊"#),
+        (r#"듋"#, r#"듋"#, r#"듋"#, r#"듋"#, r#"듋"#),
+        (r#"듌"#, r#"듌"#, r#"듌"#, r#"듌"#, r#"듌"#),
+        (r#"듍"#, r#"듍"#, r#"듍"#, r#"듍"#, r#"듍"#),
+        (r#"듎"#, r#"듎"#, r#"듎"#, r#"듎"#, r#"듎"#),
+        (r#"듏"#, r#"듏"#, r#"듏"#, r#"듏"#, r#"듏"#),
+        (r#"듐"#, r#"듐"#, r#"듐"#, r#"듐"#, r#"듐"#),
+        (r#"듑"#, r#"듑"#, r#"듑"#, r#"듑"#, r#"듑"#),
+        (r#"듒"#, r#"듒"#, r#"듒"#, r#"듒"#, r#"듒"#),
+        (r#"듓"#, r#"듓"#, r#"듓"#, r#"듓"#, r#"듓"#),
+        (r#"듔"#, r#"듔"#, r#"듔"#, r#"듔"#, r#"듔"#),
+        (r#"듕"#, r#"듕"#, r#"듕"#, r#"듕"#, r#"듕"#),
+        (r#"듖"#, r#"듖"#, r#"듖"#, r#"듖"#, r#"듖"#),
+        (r#"듗"#, r#"듗"#, r#"듗"#, r#"듗"#, r#"듗"#),
+        (r#"듘"#, r#"듘"#, r#"듘"#, r#"듘"#, r#"듘"#),
+        (r#"듙"#, r#"듙"#, r#"듙"#, r#"듙"#, r#"듙"#),
+        (r#"듚"#, r#"듚"#, r#"듚"#, r#"듚"#, r#"듚"#),
+        (r#"듛"#, r#"듛"#, r#"듛"#, r#"듛"#, r#"듛"#),
+        (r#"드"#, r#"드"#, r#"드"#, r#"드"#, r#"드"#),
+        (r#"득"#, r#"득"#, r#"득"#, r#"득"#, r#"득"#),
+        (r#"듞"#, r#"듞"#, r#"듞"#, r#"듞"#, r#"듞"#),
+        (r#"듟"#, r#"듟"#, r#"듟"#, r#"듟"#, r#"듟"#),
+        (r#"든"#, r#"든"#, r#"든"#, r#"든"#, r#"든"#),
+        (r#"듡"#, r#"듡"#, r#"듡"#, r#"듡"#, r#"듡"#),
+        (r#"듢"#, r#"듢"#, r#"듢"#, r#"듢"#, r#"듢"#),
+        (r#"듣"#, r#"듣"#, r#"듣"#, r#"듣"#, r#"듣"#),
+        (r#"들"#, r#"들"#, r#"들"#, r#"들"#, r#"들"#),
+        (r#"듥"#, r#"듥"#, r#"듥"#, r#"듥"#, r#"듥"#),
+        (r#"듦"#, r#"듦"#, r#"듦"#, r#"듦"#, r#"듦"#),
+        (r#"듧"#, r#"듧"#, r#"듧"#, r#"듧"#, r#"듧"#),
+        (r#"듨"#, r#"듨"#, r#"듨"#, r#"듨"#, r#"듨"#),
+        (r#"듩"#, r#"듩"#, r#"듩"#, r#"듩"#, r#"듩"#),
+        (r#"듪"#, r#"듪"#, r#"듪"#, r#"듪"#, r#"듪"#),
+        (r#"듫"#, r#"듫"#, r#"듫"#, r#"듫"#, r#"듫"#),
+        (r#"듬"#, r#"듬"#, r#"듬"#, r#"듬"#, r#"듬"#),
+        (r#"듭"#, r#"듭"#, r#"듭"#, r#"듭"#, r#"듭"#),
+        (r#"듮"#, r#"듮"#, r#"듮"#, r#"듮"#, r#"듮"#),
+        (r#"듯"#, r#"듯"#, r#"듯"#, r#"듯"#, r#"듯"#),
+        (r#"듰"#, r#"듰"#, r#"듰"#, r#"듰"#, r#"듰"#),
+        (r#"등"#, r#"등"#, r#"등"#, r#"등"#, r#"등"#),
+        (r#"듲"#, r#"듲"#, r#"듲"#, r#"듲"#, r#"듲"#),
+        (r#"듳"#, r#"듳"#, r#"듳"#, r#"듳"#, r#"듳"#),
+        (r#"듴"#, r#"듴"#, r#"듴"#, r#"듴"#, r#"듴"#),
+        (r#"듵"#, r#"듵"#, r#"듵"#, r#"듵"#, r#"듵"#),
+        (r#"듶"#, r#"듶"#, r#"듶"#, r#"듶"#, r#"듶"#),
+        (r#"듷"#, r#"듷"#, r#"듷"#, r#"듷"#, r#"듷"#),
+        (r#"듸"#, r#"듸"#, r#"듸"#, r#"듸"#, r#"듸"#),
+        (r#"듹"#, r#"듹"#, r#"듹"#, r#"듹"#, r#"듹"#),
+        (r#"듺"#, r#"듺"#, r#"듺"#, r#"듺"#, r#"듺"#),
+        (r#"듻"#, r#"듻"#, r#"듻"#, r#"듻"#, r#"듻"#),
+        (r#"듼"#, r#"듼"#, r#"듼"#, r#"듼"#, r#"듼"#),
+        (r#"듽"#, r#"듽"#, r#"듽"#, r#"듽"#, r#"듽"#),
+        (r#"듾"#, r#"듾"#, r#"듾"#, r#"듾"#, r#"듾"#),
+        (r#"듿"#, r#"듿"#, r#"듿"#, r#"듿"#, r#"듿"#),
+        (r#"딀"#, r#"딀"#, r#"딀"#, r#"딀"#, r#"딀"#),
+        (r#"딁"#, r#"딁"#, r#"딁"#, r#"딁"#, r#"딁"#),
+        (r#"딂"#, r#"딂"#, r#"딂"#, r#"딂"#, r#"딂"#),
+        (r#"딃"#, r#"딃"#, r#"딃"#, r#"딃"#, r#"딃"#),
+        (r#"딄"#, r#"딄"#, r#"딄"#, r#"딄"#, r#"딄"#),
+        (r#"딅"#, r#"딅"#, r#"딅"#, r#"딅"#, r#"딅"#),
+        (r#"딆"#, r#"딆"#, r#"딆"#, r#"딆"#, r#"딆"#),
+        (r#"딇"#, r#"딇"#, r#"딇"#, r#"딇"#, r#"딇"#),
+        (r#"딈"#, r#"딈"#, r#"딈"#, r#"딈"#, r#"딈"#),
+        (r#"딉"#, r#"딉"#, r#"딉"#, r#"딉"#, r#"딉"#),
+        (r#"딊"#, r#"딊"#, r#"딊"#, r#"딊"#, r#"딊"#),
+        (r#"딋"#, r#"딋"#, r#"딋"#, r#"딋"#, r#"딋"#),
+        (r#"딌"#, r#"딌"#, r#"딌"#, r#"딌"#, r#"딌"#),
+        (r#"딍"#, r#"딍"#, r#"딍"#, r#"딍"#, r#"딍"#),
+        (r#"딎"#, r#"딎"#, r#"딎"#, r#"딎"#, r#"딎"#),
+        (r#"딏"#, r#"딏"#, r#"딏"#, r#"딏"#, r#"딏"#),
+        (r#"딐"#, r#"딐"#, r#"딐"#, r#"딐"#, r#"딐"#),
+        (r#"딑"#, r#"딑"#, r#"딑"#, r#"딑"#, r#"딑"#),
+        (r#"딒"#, r#"딒"#, r#"딒"#, r#"딒"#, r#"딒"#),
+        (r#"딓"#, r#"딓"#, r#"딓"#, r#"딓"#, r#"딓"#),
+        (r#"디"#, r#"디"#, r#"디"#, r#"디"#, r#"디"#),
+        (r#"딕"#, r#"딕"#, r#"딕"#, r#"딕"#, r#"딕"#),
+        (r#"딖"#, r#"딖"#, r#"딖"#, r#"딖"#, r#"딖"#),
+        (r#"딗"#, r#"딗"#, r#"딗"#, r#"딗"#, r#"딗"#),
+        (r#"딘"#, r#"딘"#, r#"딘"#, r#"딘"#, r#"딘"#),
+        (r#"딙"#, r#"딙"#, r#"딙"#, r#"딙"#, r#"딙"#),
+        (r#"딚"#, r#"딚"#, r#"딚"#, r#"딚"#, r#"딚"#),
+        (r#"딛"#, r#"딛"#, r#"딛"#, r#"딛"#, r#"딛"#),
+        (r#"딜"#, r#"딜"#, r#"딜"#, r#"딜"#, r#"딜"#),
+        (r#"딝"#, r#"딝"#, r#"딝"#, r#"딝"#, r#"딝"#),
+        (r#"딞"#, r#"딞"#, r#"딞"#, r#"딞"#, r#"딞"#),
+        (r#"딟"#, r#"딟"#, r#"딟"#, r#"딟"#, r#"딟"#),
+        (r#"딠"#, r#"딠"#, r#"딠"#, r#"딠"#, r#"딠"#),
+        (r#"딡"#, r#"딡"#, r#"딡"#, r#"딡"#, r#"딡"#),
+        (r#"딢"#, r#"딢"#, r#"딢"#, r#"딢"#, r#"딢"#),
+        (r#"딣"#, r#"딣"#, r#"딣"#, r#"딣"#, r#"딣"#),
+        (r#"딤"#, r#"딤"#, r#"딤"#, r#"딤"#, r#"딤"#),
+        (r#"딥"#, r#"딥"#, r#"딥"#, r#"딥"#, r#"딥"#),
+        (r#"딦"#, r#"딦"#, r#"딦"#, r#"딦"#, r#"딦"#),
+        (r#"딧"#, r#"딧"#, r#"딧"#, r#"딧"#, r#"딧"#),
+        (r#"딨"#, r#"딨"#, r#"딨"#, r#"딨"#, r#"딨"#),
+        (r#"딩"#, r#"딩"#, r#"딩"#, r#"딩"#, r#"딩"#),
+        (r#"딪"#, r#"딪"#, r#"딪"#, r#"딪"#, r#"딪"#),
+        (r#"딫"#, r#"딫"#, r#"딫"#, r#"딫"#, r#"딫"#),
+        (r#"딬"#, r#"딬"#, r#"딬"#, r#"딬"#, r#"딬"#),
+        (r#"딭"#, r#"딭"#, r#"딭"#, r#"딭"#, r#"딭"#),
+        (r#"딮"#, r#"딮"#, r#"딮"#, r#"딮"#, r#"딮"#),
+        (r#"딯"#, r#"딯"#, r#"딯"#, r#"딯"#, r#"딯"#),
+        (r#"따"#, r#"따"#, r#"따"#, r#"따"#, r#"따"#),
+        (r#"딱"#, r#"딱"#, r#"딱"#, r#"딱"#, r#"딱"#),
+        (r#"딲"#, r#"딲"#, r#"딲"#, r#"딲"#, r#"딲"#),
+        (r#"딳"#, r#"딳"#, r#"딳"#, r#"딳"#, r#"딳"#),
+        (r#"딴"#, r#"딴"#, r#"딴"#, r#"딴"#, r#"딴"#),
+        (r#"딵"#, r#"딵"#, r#"딵"#, r#"딵"#, r#"딵"#),
+        (r#"딶"#, r#"딶"#, r#"딶"#, r#"딶"#, r#"딶"#),
+        (r#"딷"#, r#"딷"#, r#"딷"#, r#"딷"#, r#"딷"#),
+        (r#"딸"#, r#"딸"#, r#"딸"#, r#"딸"#, r#"딸"#),
+        (r#"딹"#, r#"딹"#, r#"딹"#, r#"딹"#, r#"딹"#),
+        (r#"딺"#, r#"딺"#, r#"딺"#, r#"딺"#, r#"딺"#),
+        (r#"딻"#, r#"딻"#, r#"딻"#, r#"딻"#, r#"딻"#),
+        (r#"딼"#, r#"딼"#, r#"딼"#, r#"딼"#, r#"딼"#),
+        (r#"딽"#, r#"딽"#, r#"딽"#, r#"딽"#, r#"딽"#),
+        (r#"딾"#, r#"딾"#, r#"딾"#, r#"딾"#, r#"딾"#),
+        (r#"딿"#, r#"딿"#, r#"딿"#, r#"딿"#, r#"딿"#),
+        (r#"땀"#, r#"땀"#, r#"땀"#, r#"땀"#, r#"땀"#),
+        (r#"땁"#, r#"땁"#, r#"땁"#, r#"땁"#, r#"땁"#),
+        (r#"땂"#, r#"땂"#, r#"땂"#, r#"땂"#, r#"땂"#),
+        (r#"땃"#, r#"땃"#, r#"땃"#, r#"땃"#, r#"땃"#),
+        (r#"땄"#, r#"땄"#, r#"땄"#, r#"땄"#, r#"땄"#),
+        (r#"땅"#, r#"땅"#, r#"땅"#, r#"땅"#, r#"땅"#),
+        (r#"땆"#, r#"땆"#, r#"땆"#, r#"땆"#, r#"땆"#),
+        (r#"땇"#, r#"땇"#, r#"땇"#, r#"땇"#, r#"땇"#),
+        (r#"땈"#, r#"땈"#, r#"땈"#, r#"땈"#, r#"땈"#),
+        (r#"땉"#, r#"땉"#, r#"땉"#, r#"땉"#, r#"땉"#),
+        (r#"땊"#, r#"땊"#, r#"땊"#, r#"땊"#, r#"땊"#),
+        (r#"땋"#, r#"땋"#, r#"땋"#, r#"땋"#, r#"땋"#),
+        (r#"때"#, r#"때"#, r#"때"#, r#"때"#, r#"때"#),
+        (r#"땍"#, r#"땍"#, r#"땍"#, r#"땍"#, r#"땍"#),
+        (r#"땎"#, r#"땎"#, r#"땎"#, r#"땎"#, r#"땎"#),
+        (r#"땏"#, r#"땏"#, r#"땏"#, r#"땏"#, r#"땏"#),
+        (r#"땐"#, r#"땐"#, r#"땐"#, r#"땐"#, r#"땐"#),
+        (r#"땑"#, r#"땑"#, r#"땑"#, r#"땑"#, r#"땑"#),
+        (r#"땒"#, r#"땒"#, r#"땒"#, r#"땒"#, r#"땒"#),
+        (r#"땓"#, r#"땓"#, r#"땓"#, r#"땓"#, r#"땓"#),
+        (r#"땔"#, r#"땔"#, r#"땔"#, r#"땔"#, r#"땔"#),
+        (r#"땕"#, r#"땕"#, r#"땕"#, r#"땕"#, r#"땕"#),
+        (r#"땖"#, r#"땖"#, r#"땖"#, r#"땖"#, r#"땖"#),
+        (r#"땗"#, r#"땗"#, r#"땗"#, r#"땗"#, r#"땗"#),
+        (r#"땘"#, r#"땘"#, r#"땘"#, r#"땘"#, r#"땘"#),
+        (r#"땙"#, r#"땙"#, r#"땙"#, r#"땙"#, r#"땙"#),
+        (r#"땚"#, r#"땚"#, r#"땚"#, r#"땚"#, r#"땚"#),
+        (r#"땛"#, r#"땛"#, r#"땛"#, r#"땛"#, r#"땛"#),
+        (r#"땜"#, r#"땜"#, r#"땜"#, r#"땜"#, r#"땜"#),
+        (r#"땝"#, r#"땝"#, r#"땝"#, r#"땝"#, r#"땝"#),
+        (r#"땞"#, r#"땞"#, r#"땞"#, r#"땞"#, r#"땞"#),
+        (r#"땟"#, r#"땟"#, r#"땟"#, r#"땟"#, r#"땟"#),
+        (r#"땠"#, r#"땠"#, r#"땠"#, r#"땠"#, r#"땠"#),
+        (r#"땡"#, r#"땡"#, r#"땡"#, r#"땡"#, r#"땡"#),
+        (r#"땢"#, r#"땢"#, r#"땢"#, r#"땢"#, r#"땢"#),
+        (r#"땣"#, r#"땣"#, r#"땣"#, r#"땣"#, r#"땣"#),
+        (r#"땤"#, r#"땤"#, r#"땤"#, r#"땤"#, r#"땤"#),
+        (r#"땥"#, r#"땥"#, r#"땥"#, r#"땥"#, r#"땥"#),
+        (r#"땦"#, r#"땦"#, r#"땦"#, r#"땦"#, r#"땦"#),
+        (r#"땧"#, r#"땧"#, r#"땧"#, r#"땧"#, r#"땧"#),
+        (r#"땨"#, r#"땨"#, r#"땨"#, r#"땨"#, r#"땨"#),
+        (r#"땩"#, r#"땩"#, r#"땩"#, r#"땩"#, r#"땩"#),
+        (r#"땪"#, r#"땪"#, r#"땪"#, r#"땪"#, r#"땪"#),
+        (r#"땫"#, r#"땫"#, r#"땫"#, r#"땫"#, r#"땫"#),
+        (r#"땬"#, r#"땬"#, r#"땬"#, r#"땬"#, r#"땬"#),
+        (r#"땭"#, r#"땭"#, r#"땭"#, r#"땭"#, r#"땭"#),
+        (r#"땮"#, r#"땮"#, r#"땮"#, r#"땮"#, r#"땮"#),
+        (r#"땯"#, r#"땯"#, r#"땯"#, r#"땯"#, r#"땯"#),
+        (r#"땰"#, r#"땰"#, r#"땰"#, r#"땰"#, r#"땰"#),
+        (r#"땱"#, r#"땱"#, r#"땱"#, r#"땱"#, r#"땱"#),
+        (r#"땲"#, r#"땲"#, r#"땲"#, r#"땲"#, r#"땲"#),
+        (r#"땳"#, r#"땳"#, r#"땳"#, r#"땳"#, r#"땳"#),
+        (r#"땴"#, r#"땴"#, r#"땴"#, r#"땴"#, r#"땴"#),
+        (r#"땵"#, r#"땵"#, r#"땵"#, r#"땵"#, r#"땵"#),
+        (r#"땶"#, r#"땶"#, r#"땶"#, r#"땶"#, r#"땶"#),
+        (r#"땷"#, r#"땷"#, r#"땷"#, r#"땷"#, r#"땷"#),
+        (r#"땸"#, r#"땸"#, r#"땸"#, r#"땸"#, r#"땸"#),
+        (r#"땹"#, r#"땹"#, r#"땹"#, r#"땹"#, r#"땹"#),
+        (r#"땺"#, r#"땺"#, r#"땺"#, r#"땺"#, r#"땺"#),
+        (r#"땻"#, r#"땻"#, r#"땻"#, r#"땻"#, r#"땻"#),
+        (r#"땼"#, r#"땼"#, r#"땼"#, r#"땼"#, r#"땼"#),
+        (r#"땽"#, r#"땽"#, r#"땽"#, r#"땽"#, r#"땽"#),
+        (r#"땾"#, r#"땾"#, r#"땾"#, r#"땾"#, r#"땾"#),
+        (r#"땿"#, r#"땿"#, r#"땿"#, r#"땿"#, r#"땿"#),
+        (r#"떀"#, r#"떀"#, r#"떀"#, r#"떀"#, r#"떀"#),
+        (r#"떁"#, r#"떁"#, r#"떁"#, r#"떁"#, r#"떁"#),
+        (r#"떂"#, r#"떂"#, r#"떂"#, r#"떂"#, r#"떂"#),
+        (r#"떃"#, r#"떃"#, r#"떃"#, r#"떃"#, r#"떃"#),
+        (r#"떄"#, r#"떄"#, r#"떄"#, r#"떄"#, r#"떄"#),
+        (r#"떅"#, r#"떅"#, r#"떅"#, r#"떅"#, r#"떅"#),
+        (r#"떆"#, r#"떆"#, r#"떆"#, r#"떆"#, r#"떆"#),
+        (r#"떇"#, r#"떇"#, r#"떇"#, r#"떇"#, r#"떇"#),
+        (r#"떈"#, r#"떈"#, r#"떈"#, r#"떈"#, r#"떈"#),
+        (r#"떉"#, r#"떉"#, r#"떉"#, r#"떉"#, r#"떉"#),
+        (r#"떊"#, r#"떊"#, r#"떊"#, r#"떊"#, r#"떊"#),
+        (r#"떋"#, r#"떋"#, r#"떋"#, r#"떋"#, r#"떋"#),
+        (r#"떌"#, r#"떌"#, r#"떌"#, r#"떌"#, r#"떌"#),
+        (r#"떍"#, r#"떍"#, r#"떍"#, r#"떍"#, r#"떍"#),
+        (r#"떎"#, r#"떎"#, r#"떎"#, r#"떎"#, r#"떎"#),
+        (r#"떏"#, r#"떏"#, r#"떏"#, r#"떏"#, r#"떏"#),
+        (r#"떐"#, r#"떐"#, r#"떐"#, r#"떐"#, r#"떐"#),
+        (r#"떑"#, r#"떑"#, r#"떑"#, r#"떑"#, r#"떑"#),
+        (r#"떒"#, r#"떒"#, r#"떒"#, r#"떒"#, r#"떒"#),
+        (r#"떓"#, r#"떓"#, r#"떓"#, r#"떓"#, r#"떓"#),
+        (r#"떔"#, r#"떔"#, r#"떔"#, r#"떔"#, r#"떔"#),
+        (r#"떕"#, r#"떕"#, r#"떕"#, r#"떕"#, r#"떕"#),
+        (r#"떖"#, r#"떖"#, r#"떖"#, r#"떖"#, r#"떖"#),
+        (r#"떗"#, r#"떗"#, r#"떗"#, r#"떗"#, r#"떗"#),
+        (r#"떘"#, r#"떘"#, r#"떘"#, r#"떘"#, r#"떘"#),
+        (r#"떙"#, r#"떙"#, r#"떙"#, r#"떙"#, r#"떙"#),
+        (r#"떚"#, r#"떚"#, r#"떚"#, r#"떚"#, r#"떚"#),
+        (r#"떛"#, r#"떛"#, r#"떛"#, r#"떛"#, r#"떛"#),
+        (r#"떜"#, r#"떜"#, r#"떜"#, r#"떜"#, r#"떜"#),
+        (r#"떝"#, r#"떝"#, r#"떝"#, r#"떝"#, r#"떝"#),
+        (r#"떞"#, r#"떞"#, r#"떞"#, r#"떞"#, r#"떞"#),
+        (r#"떟"#, r#"떟"#, r#"떟"#, r#"떟"#, r#"떟"#),
+        (r#"떠"#, r#"떠"#, r#"떠"#, r#"떠"#, r#"떠"#),
+        (r#"떡"#, r#"떡"#, r#"떡"#, r#"떡"#, r#"떡"#),
+        (r#"떢"#, r#"떢"#, r#"떢"#, r#"떢"#, r#"떢"#),
+        (r#"떣"#, r#"떣"#, r#"떣"#, r#"떣"#, r#"떣"#),
+        (r#"떤"#, r#"떤"#, r#"떤"#, r#"떤"#, r#"떤"#),
+        (r#"떥"#, r#"떥"#, r#"떥"#, r#"떥"#, r#"떥"#),
+        (r#"떦"#, r#"떦"#, r#"떦"#, r#"떦"#, r#"떦"#),
+        (r#"떧"#, r#"떧"#, r#"떧"#, r#"떧"#, r#"떧"#),
+        (r#"떨"#, r#"떨"#, r#"떨"#, r#"떨"#, r#"떨"#),
+        (r#"떩"#, r#"떩"#, r#"떩"#, r#"떩"#, r#"떩"#),
+        (r#"떪"#, r#"떪"#, r#"떪"#, r#"떪"#, r#"떪"#),
+        (r#"떫"#, r#"떫"#, r#"떫"#, r#"떫"#, r#"떫"#),
+        (r#"떬"#, r#"떬"#, r#"떬"#, r#"떬"#, r#"떬"#),
+        (r#"떭"#, r#"떭"#, r#"떭"#, r#"떭"#, r#"떭"#),
+        (r#"떮"#, r#"떮"#, r#"떮"#, r#"떮"#, r#"떮"#),
+        (r#"떯"#, r#"떯"#, r#"떯"#, r#"떯"#, r#"떯"#),
+        (r#"떰"#, r#"떰"#, r#"떰"#, r#"떰"#, r#"떰"#),
+        (r#"떱"#, r#"떱"#, r#"떱"#, r#"떱"#, r#"떱"#),
+        (r#"떲"#, r#"떲"#, r#"떲"#, r#"떲"#, r#"떲"#),
+        (r#"떳"#, r#"떳"#, r#"떳"#, r#"떳"#, r#"떳"#),
+        (r#"떴"#, r#"떴"#, r#"떴"#, r#"떴"#, r#"떴"#),
+        (r#"떵"#, r#"떵"#, r#"떵"#, r#"떵"#, r#"떵"#),
+        (r#"떶"#, r#"떶"#, r#"떶"#, r#"떶"#, r#"떶"#),
+        (r#"떷"#, r#"떷"#, r#"떷"#, r#"떷"#, r#"떷"#),
+        (r#"떸"#, r#"떸"#, r#"떸"#, r#"떸"#, r#"떸"#),
+        (r#"떹"#, r#"떹"#, r#"떹"#, r#"떹"#, r#"떹"#),
+        (r#"떺"#, r#"떺"#, r#"떺"#, r#"떺"#, r#"떺"#),
+        (r#"떻"#, r#"떻"#, r#"떻"#, r#"떻"#, r#"떻"#),
+        (r#"떼"#, r#"떼"#, r#"떼"#, r#"떼"#, r#"떼"#),
+        (r#"떽"#, r#"떽"#, r#"떽"#, r#"떽"#, r#"떽"#),
+        (r#"떾"#, r#"떾"#, r#"떾"#, r#"떾"#, r#"떾"#),
+        (r#"떿"#, r#"떿"#, r#"떿"#, r#"떿"#, r#"떿"#),
+        (r#"뗀"#, r#"뗀"#, r#"뗀"#, r#"뗀"#, r#"뗀"#),
+        (r#"뗁"#, r#"뗁"#, r#"뗁"#, r#"뗁"#, r#"뗁"#),
+        (r#"뗂"#, r#"뗂"#, r#"뗂"#, r#"뗂"#, r#"뗂"#),
+        (r#"뗃"#, r#"뗃"#, r#"뗃"#, r#"뗃"#, r#"뗃"#),
+        (r#"뗄"#, r#"뗄"#, r#"뗄"#, r#"뗄"#, r#"뗄"#),
+        (r#"뗅"#, r#"뗅"#, r#"뗅"#, r#"뗅"#, r#"뗅"#),
+        (r#"뗆"#, r#"뗆"#, r#"뗆"#, r#"뗆"#, r#"뗆"#),
+        (r#"뗇"#, r#"뗇"#, r#"뗇"#, r#"뗇"#, r#"뗇"#),
+        (r#"뗈"#, r#"뗈"#, r#"뗈"#, r#"뗈"#, r#"뗈"#),
+        (r#"뗉"#, r#"뗉"#, r#"뗉"#, r#"뗉"#, r#"뗉"#),
+        (r#"뗊"#, r#"뗊"#, r#"뗊"#, r#"뗊"#, r#"뗊"#),
+        (r#"뗋"#, r#"뗋"#, r#"뗋"#, r#"뗋"#, r#"뗋"#),
+        (r#"뗌"#, r#"뗌"#, r#"뗌"#, r#"뗌"#, r#"뗌"#),
+        (r#"뗍"#, r#"뗍"#, r#"뗍"#, r#"뗍"#, r#"뗍"#),
+        (r#"뗎"#, r#"뗎"#, r#"뗎"#, r#"뗎"#, r#"뗎"#),
+        (r#"뗏"#, r#"뗏"#, r#"뗏"#, r#"뗏"#, r#"뗏"#),
+        (r#"뗐"#, r#"뗐"#, r#"뗐"#, r#"뗐"#, r#"뗐"#),
+        (r#"뗑"#, r#"뗑"#, r#"뗑"#, r#"뗑"#, r#"뗑"#),
+        (r#"뗒"#, r#"뗒"#, r#"뗒"#, r#"뗒"#, r#"뗒"#),
+        (r#"뗓"#, r#"뗓"#, r#"뗓"#, r#"뗓"#, r#"뗓"#),
+        (r#"뗔"#, r#"뗔"#, r#"뗔"#, r#"뗔"#, r#"뗔"#),
+        (r#"뗕"#, r#"뗕"#, r#"뗕"#, r#"뗕"#, r#"뗕"#),
+        (r#"뗖"#, r#"뗖"#, r#"뗖"#, r#"뗖"#, r#"뗖"#),
+        (r#"뗗"#, r#"뗗"#, r#"뗗"#, r#"뗗"#, r#"뗗"#),
+        (r#"뗘"#, r#"뗘"#, r#"뗘"#, r#"뗘"#, r#"뗘"#),
+        (r#"뗙"#, r#"뗙"#, r#"뗙"#, r#"뗙"#, r#"뗙"#),
+        (r#"뗚"#, r#"뗚"#, r#"뗚"#, r#"뗚"#, r#"뗚"#),
+        (r#"뗛"#, r#"뗛"#, r#"뗛"#, r#"뗛"#, r#"뗛"#),
+        (r#"뗜"#, r#"뗜"#, r#"뗜"#, r#"뗜"#, r#"뗜"#),
+        (r#"뗝"#, r#"뗝"#, r#"뗝"#, r#"뗝"#, r#"뗝"#),
+        (r#"뗞"#, r#"뗞"#, r#"뗞"#, r#"뗞"#, r#"뗞"#),
+        (r#"뗟"#, r#"뗟"#, r#"뗟"#, r#"뗟"#, r#"뗟"#),
+        (r#"뗠"#, r#"뗠"#, r#"뗠"#, r#"뗠"#, r#"뗠"#),
+        (r#"뗡"#, r#"뗡"#, r#"뗡"#, r#"뗡"#, r#"뗡"#),
+        (r#"뗢"#, r#"뗢"#, r#"뗢"#, r#"뗢"#, r#"뗢"#),
+        (r#"뗣"#, r#"뗣"#, r#"뗣"#, r#"뗣"#, r#"뗣"#),
+        (r#"뗤"#, r#"뗤"#, r#"뗤"#, r#"뗤"#, r#"뗤"#),
+        (r#"뗥"#, r#"뗥"#, r#"뗥"#, r#"뗥"#, r#"뗥"#),
+        (r#"뗦"#, r#"뗦"#, r#"뗦"#, r#"뗦"#, r#"뗦"#),
+        (r#"뗧"#, r#"뗧"#, r#"뗧"#, r#"뗧"#, r#"뗧"#),
+        (r#"뗨"#, r#"뗨"#, r#"뗨"#, r#"뗨"#, r#"뗨"#),
+        (r#"뗩"#, r#"뗩"#, r#"뗩"#, r#"뗩"#, r#"뗩"#),
+        (r#"뗪"#, r#"뗪"#, r#"뗪"#, r#"뗪"#, r#"뗪"#),
+        (r#"뗫"#, r#"뗫"#, r#"뗫"#, r#"뗫"#, r#"뗫"#),
+        (r#"뗬"#, r#"뗬"#, r#"뗬"#, r#"뗬"#, r#"뗬"#),
+        (r#"뗭"#, r#"뗭"#, r#"뗭"#, r#"뗭"#, r#"뗭"#),
+        (r#"뗮"#, r#"뗮"#, r#"뗮"#, r#"뗮"#, r#"뗮"#),
+        (r#"뗯"#, r#"뗯"#, r#"뗯"#, r#"뗯"#, r#"뗯"#),
+        (r#"뗰"#, r#"뗰"#, r#"뗰"#, r#"뗰"#, r#"뗰"#),
+        (r#"뗱"#, r#"뗱"#, r#"뗱"#, r#"뗱"#, r#"뗱"#),
+        (r#"뗲"#, r#"뗲"#, r#"뗲"#, r#"뗲"#, r#"뗲"#),
+        (r#"뗳"#, r#"뗳"#, r#"뗳"#, r#"뗳"#, r#"뗳"#),
+        (r#"뗴"#, r#"뗴"#, r#"뗴"#, r#"뗴"#, r#"뗴"#),
+        (r#"뗵"#, r#"뗵"#, r#"뗵"#, r#"뗵"#, r#"뗵"#),
+        (r#"뗶"#, r#"뗶"#, r#"뗶"#, r#"뗶"#, r#"뗶"#),
+        (r#"뗷"#, r#"뗷"#, r#"뗷"#, r#"뗷"#, r#"뗷"#),
+        (r#"뗸"#, r#"뗸"#, r#"뗸"#, r#"뗸"#, r#"뗸"#),
+        (r#"뗹"#, r#"뗹"#, r#"뗹"#, r#"뗹"#, r#"뗹"#),
+        (r#"뗺"#, r#"뗺"#, r#"뗺"#, r#"뗺"#, r#"뗺"#),
+        (r#"뗻"#, r#"뗻"#, r#"뗻"#, r#"뗻"#, r#"뗻"#),
+        (r#"뗼"#, r#"뗼"#, r#"뗼"#, r#"뗼"#, r#"뗼"#),
+        (r#"뗽"#, r#"뗽"#, r#"뗽"#, r#"뗽"#, r#"뗽"#),
+        (r#"뗾"#, r#"뗾"#, r#"뗾"#, r#"뗾"#, r#"뗾"#),
+        (r#"뗿"#, r#"뗿"#, r#"뗿"#, r#"뗿"#, r#"뗿"#),
+        (r#"똀"#, r#"똀"#, r#"똀"#, r#"똀"#, r#"똀"#),
+        (r#"똁"#, r#"똁"#, r#"똁"#, r#"똁"#, r#"똁"#),
+        (r#"똂"#, r#"똂"#, r#"똂"#, r#"똂"#, r#"똂"#),
+        (r#"똃"#, r#"똃"#, r#"똃"#, r#"똃"#, r#"똃"#),
+        (r#"똄"#, r#"똄"#, r#"똄"#, r#"똄"#, r#"똄"#),
+        (r#"똅"#, r#"똅"#, r#"똅"#, r#"똅"#, r#"똅"#),
+        (r#"똆"#, r#"똆"#, r#"똆"#, r#"똆"#, r#"똆"#),
+        (r#"똇"#, r#"똇"#, r#"똇"#, r#"똇"#, r#"똇"#),
+        (r#"똈"#, r#"똈"#, r#"똈"#, r#"똈"#, r#"똈"#),
+        (r#"똉"#, r#"똉"#, r#"똉"#, r#"똉"#, r#"똉"#),
+        (r#"똊"#, r#"똊"#, r#"똊"#, r#"똊"#, r#"똊"#),
+        (r#"똋"#, r#"똋"#, r#"똋"#, r#"똋"#, r#"똋"#),
+        (r#"똌"#, r#"똌"#, r#"똌"#, r#"똌"#, r#"똌"#),
+        (r#"똍"#, r#"똍"#, r#"똍"#, r#"똍"#, r#"똍"#),
+        (r#"똎"#, r#"똎"#, r#"똎"#, r#"똎"#, r#"똎"#),
+        (r#"똏"#, r#"똏"#, r#"똏"#, r#"똏"#, r#"똏"#),
+        (r#"또"#, r#"또"#, r#"또"#, r#"또"#, r#"또"#),
+        (r#"똑"#, r#"똑"#, r#"똑"#, r#"똑"#, r#"똑"#),
+        (r#"똒"#, r#"똒"#, r#"똒"#, r#"똒"#, r#"똒"#),
+        (r#"똓"#, r#"똓"#, r#"똓"#, r#"똓"#, r#"똓"#),
+        (r#"똔"#, r#"똔"#, r#"똔"#, r#"똔"#, r#"똔"#),
+        (r#"똕"#, r#"똕"#, r#"똕"#, r#"똕"#, r#"똕"#),
+        (r#"똖"#, r#"똖"#, r#"똖"#, r#"똖"#, r#"똖"#),
+        (r#"똗"#, r#"똗"#, r#"똗"#, r#"똗"#, r#"똗"#),
+        (r#"똘"#, r#"똘"#, r#"똘"#, r#"똘"#, r#"똘"#),
+        (r#"똙"#, r#"똙"#, r#"똙"#, r#"똙"#, r#"똙"#),
+        (r#"똚"#, r#"똚"#, r#"똚"#, r#"똚"#, r#"똚"#),
+        (r#"똛"#, r#"똛"#, r#"똛"#, r#"똛"#, r#"똛"#),
+        (r#"똜"#, r#"똜"#, r#"똜"#, r#"똜"#, r#"똜"#),
+        (r#"똝"#, r#"똝"#, r#"똝"#, r#"똝"#, r#"똝"#),
+        (r#"똞"#, r#"똞"#, r#"똞"#, r#"똞"#, r#"똞"#),
+        (r#"똟"#, r#"똟"#, r#"똟"#, r#"똟"#, r#"똟"#),
+        (r#"똠"#, r#"똠"#, r#"똠"#, r#"똠"#, r#"똠"#),
+        (r#"똡"#, r#"똡"#, r#"똡"#, r#"똡"#, r#"똡"#),
+        (r#"똢"#, r#"똢"#, r#"똢"#, r#"똢"#, r#"똢"#),
+        (r#"똣"#, r#"똣"#, r#"똣"#, r#"똣"#, r#"똣"#),
+        (r#"똤"#, r#"똤"#, r#"똤"#, r#"똤"#, r#"똤"#),
+        (r#"똥"#, r#"똥"#, r#"똥"#, r#"똥"#, r#"똥"#),
+        (r#"똦"#, r#"똦"#, r#"똦"#, r#"똦"#, r#"똦"#),
+        (r#"똧"#, r#"똧"#, r#"똧"#, r#"똧"#, r#"똧"#),
+        (r#"똨"#, r#"똨"#, r#"똨"#, r#"똨"#, r#"똨"#),
+        (r#"똩"#, r#"똩"#, r#"똩"#, r#"똩"#, r#"똩"#),
+        (r#"똪"#, r#"똪"#, r#"똪"#, r#"똪"#, r#"똪"#),
+        (r#"똫"#, r#"똫"#, r#"똫"#, r#"똫"#, r#"똫"#),
+        (r#"똬"#, r#"똬"#, r#"똬"#, r#"똬"#, r#"똬"#),
+        (r#"똭"#, r#"똭"#, r#"똭"#, r#"똭"#, r#"똭"#),
+        (r#"똮"#, r#"똮"#, r#"똮"#, r#"똮"#, r#"똮"#),
+        (r#"똯"#, r#"똯"#, r#"똯"#, r#"똯"#, r#"똯"#),
+        (r#"똰"#, r#"똰"#, r#"똰"#, r#"똰"#, r#"똰"#),
+        (r#"똱"#, r#"똱"#, r#"똱"#, r#"똱"#, r#"똱"#),
+        (r#"똲"#, r#"똲"#, r#"똲"#, r#"똲"#, r#"똲"#),
+        (r#"똳"#, r#"똳"#, r#"똳"#, r#"똳"#, r#"똳"#),
+        (r#"똴"#, r#"똴"#, r#"똴"#, r#"똴"#, r#"똴"#),
+        (r#"똵"#, r#"똵"#, r#"똵"#, r#"똵"#, r#"똵"#),
+        (r#"똶"#, r#"똶"#, r#"똶"#, r#"똶"#, r#"똶"#),
+        (r#"똷"#, r#"똷"#, r#"똷"#, r#"똷"#, r#"똷"#),
+        (r#"똸"#, r#"똸"#, r#"똸"#, r#"똸"#, r#"똸"#),
+        (r#"똹"#, r#"똹"#, r#"똹"#, r#"똹"#, r#"똹"#),
+        (r#"똺"#, r#"똺"#, r#"똺"#, r#"똺"#, r#"똺"#),
+        (r#"똻"#, r#"똻"#, r#"똻"#, r#"똻"#, r#"똻"#),
+        (r#"똼"#, r#"똼"#, r#"똼"#, r#"똼"#, r#"똼"#),
+        (r#"똽"#, r#"똽"#, r#"똽"#, r#"똽"#, r#"똽"#),
+        (r#"똾"#, r#"똾"#, r#"똾"#, r#"똾"#, r#"똾"#),
+        (r#"똿"#, r#"똿"#, r#"똿"#, r#"똿"#, r#"똿"#),
+        (r#"뙀"#, r#"뙀"#, r#"뙀"#, r#"뙀"#, r#"뙀"#),
+        (r#"뙁"#, r#"뙁"#, r#"뙁"#, r#"뙁"#, r#"뙁"#),
+        (r#"뙂"#, r#"뙂"#, r#"뙂"#, r#"뙂"#, r#"뙂"#),
+        (r#"뙃"#, r#"뙃"#, r#"뙃"#, r#"뙃"#, r#"뙃"#),
+        (r#"뙄"#, r#"뙄"#, r#"뙄"#, r#"뙄"#, r#"뙄"#),
+        (r#"뙅"#, r#"뙅"#, r#"뙅"#, r#"뙅"#, r#"뙅"#),
+        (r#"뙆"#, r#"뙆"#, r#"뙆"#, r#"뙆"#, r#"뙆"#),
+        (r#"뙇"#, r#"뙇"#, r#"뙇"#, r#"뙇"#, r#"뙇"#),
+        (r#"뙈"#, r#"뙈"#, r#"뙈"#, r#"뙈"#, r#"뙈"#),
+        (r#"뙉"#, r#"뙉"#, r#"뙉"#, r#"뙉"#, r#"뙉"#),
+        (r#"뙊"#, r#"뙊"#, r#"뙊"#, r#"뙊"#, r#"뙊"#),
+        (r#"뙋"#, r#"뙋"#, r#"뙋"#, r#"뙋"#, r#"뙋"#),
+        (r#"뙌"#, r#"뙌"#, r#"뙌"#, r#"뙌"#, r#"뙌"#),
+        (r#"뙍"#, r#"뙍"#, r#"뙍"#, r#"뙍"#, r#"뙍"#),
+        (r#"뙎"#, r#"뙎"#, r#"뙎"#, r#"뙎"#, r#"뙎"#),
+        (r#"뙏"#, r#"뙏"#, r#"뙏"#, r#"뙏"#, r#"뙏"#),
+        (r#"뙐"#, r#"뙐"#, r#"뙐"#, r#"뙐"#, r#"뙐"#),
+        (r#"뙑"#, r#"뙑"#, r#"뙑"#, r#"뙑"#, r#"뙑"#),
+        (r#"뙒"#, r#"뙒"#, r#"뙒"#, r#"뙒"#, r#"뙒"#),
+        (r#"뙓"#, r#"뙓"#, r#"뙓"#, r#"뙓"#, r#"뙓"#),
+        (r#"뙔"#, r#"뙔"#, r#"뙔"#, r#"뙔"#, r#"뙔"#),
+        (r#"뙕"#, r#"뙕"#, r#"뙕"#, r#"뙕"#, r#"뙕"#),
+        (r#"뙖"#, r#"뙖"#, r#"뙖"#, r#"뙖"#, r#"뙖"#),
+        (r#"뙗"#, r#"뙗"#, r#"뙗"#, r#"뙗"#, r#"뙗"#),
+        (r#"뙘"#, r#"뙘"#, r#"뙘"#, r#"뙘"#, r#"뙘"#),
+        (r#"뙙"#, r#"뙙"#, r#"뙙"#, r#"뙙"#, r#"뙙"#),
+        (r#"뙚"#, r#"뙚"#, r#"뙚"#, r#"뙚"#, r#"뙚"#),
+        (r#"뙛"#, r#"뙛"#, r#"뙛"#, r#"뙛"#, r#"뙛"#),
+        (r#"뙜"#, r#"뙜"#, r#"뙜"#, r#"뙜"#, r#"뙜"#),
+        (r#"뙝"#, r#"뙝"#, r#"뙝"#, r#"뙝"#, r#"뙝"#),
+        (r#"뙞"#, r#"뙞"#, r#"뙞"#, r#"뙞"#, r#"뙞"#),
+        (r#"뙟"#, r#"뙟"#, r#"뙟"#, r#"뙟"#, r#"뙟"#),
+        (r#"뙠"#, r#"뙠"#, r#"뙠"#, r#"뙠"#, r#"뙠"#),
+        (r#"뙡"#, r#"뙡"#, r#"뙡"#, r#"뙡"#, r#"뙡"#),
+        (r#"뙢"#, r#"뙢"#, r#"뙢"#, r#"뙢"#, r#"뙢"#),
+        (r#"뙣"#, r#"뙣"#, r#"뙣"#, r#"뙣"#, r#"뙣"#),
+        (r#"뙤"#, r#"뙤"#, r#"뙤"#, r#"뙤"#, r#"뙤"#),
+        (r#"뙥"#, r#"뙥"#, r#"뙥"#, r#"뙥"#, r#"뙥"#),
+        (r#"뙦"#, r#"뙦"#, r#"뙦"#, r#"뙦"#, r#"뙦"#),
+        (r#"뙧"#, r#"뙧"#, r#"뙧"#, r#"뙧"#, r#"뙧"#),
+        (r#"뙨"#, r#"뙨"#, r#"뙨"#, r#"뙨"#, r#"뙨"#),
+        (r#"뙩"#, r#"뙩"#, r#"뙩"#, r#"뙩"#, r#"뙩"#),
+        (r#"뙪"#, r#"뙪"#, r#"뙪"#, r#"뙪"#, r#"뙪"#),
+        (r#"뙫"#, r#"뙫"#, r#"뙫"#, r#"뙫"#, r#"뙫"#),
+        (r#"뙬"#, r#"뙬"#, r#"뙬"#, r#"뙬"#, r#"뙬"#),
+        (r#"뙭"#, r#"뙭"#, r#"뙭"#, r#"뙭"#, r#"뙭"#),
+        (r#"뙮"#, r#"뙮"#, r#"뙮"#, r#"뙮"#, r#"뙮"#),
+        (r#"뙯"#, r#"뙯"#, r#"뙯"#, r#"뙯"#, r#"뙯"#),
+        (r#"뙰"#, r#"뙰"#, r#"뙰"#, r#"뙰"#, r#"뙰"#),
+        (r#"뙱"#, r#"뙱"#, r#"뙱"#, r#"뙱"#, r#"뙱"#),
+        (r#"뙲"#, r#"뙲"#, r#"뙲"#, r#"뙲"#, r#"뙲"#),
+        (r#"뙳"#, r#"뙳"#, r#"뙳"#, r#"뙳"#, r#"뙳"#),
+        (r#"뙴"#, r#"뙴"#, r#"뙴"#, r#"뙴"#, r#"뙴"#),
+        (r#"뙵"#, r#"뙵"#, r#"뙵"#, r#"뙵"#, r#"뙵"#),
+        (r#"뙶"#, r#"뙶"#, r#"뙶"#, r#"뙶"#, r#"뙶"#),
+        (r#"뙷"#, r#"뙷"#, r#"뙷"#, r#"뙷"#, r#"뙷"#),
+        (r#"뙸"#, r#"뙸"#, r#"뙸"#, r#"뙸"#, r#"뙸"#),
+        (r#"뙹"#, r#"뙹"#, r#"뙹"#, r#"뙹"#, r#"뙹"#),
+        (r#"뙺"#, r#"뙺"#, r#"뙺"#, r#"뙺"#, r#"뙺"#),
+        (r#"뙻"#, r#"뙻"#, r#"뙻"#, r#"뙻"#, r#"뙻"#),
+        (r#"뙼"#, r#"뙼"#, r#"뙼"#, r#"뙼"#, r#"뙼"#),
+        (r#"뙽"#, r#"뙽"#, r#"뙽"#, r#"뙽"#, r#"뙽"#),
+        (r#"뙾"#, r#"뙾"#, r#"뙾"#, r#"뙾"#, r#"뙾"#),
+        (r#"뙿"#, r#"뙿"#, r#"뙿"#, r#"뙿"#, r#"뙿"#),
+        (r#"뚀"#, r#"뚀"#, r#"뚀"#, r#"뚀"#, r#"뚀"#),
+        (r#"뚁"#, r#"뚁"#, r#"뚁"#, r#"뚁"#, r#"뚁"#),
+        (r#"뚂"#, r#"뚂"#, r#"뚂"#, r#"뚂"#, r#"뚂"#),
+        (r#"뚃"#, r#"뚃"#, r#"뚃"#, r#"뚃"#, r#"뚃"#),
+        (r#"뚄"#, r#"뚄"#, r#"뚄"#, r#"뚄"#, r#"뚄"#),
+        (r#"뚅"#, r#"뚅"#, r#"뚅"#, r#"뚅"#, r#"뚅"#),
+        (r#"뚆"#, r#"뚆"#, r#"뚆"#, r#"뚆"#, r#"뚆"#),
+        (r#"뚇"#, r#"뚇"#, r#"뚇"#, r#"뚇"#, r#"뚇"#),
+        (r#"뚈"#, r#"뚈"#, r#"뚈"#, r#"뚈"#, r#"뚈"#),
+        (r#"뚉"#, r#"뚉"#, r#"뚉"#, r#"뚉"#, r#"뚉"#),
+        (r#"뚊"#, r#"뚊"#, r#"뚊"#, r#"뚊"#, r#"뚊"#),
+        (r#"뚋"#, r#"뚋"#, r#"뚋"#, r#"뚋"#, r#"뚋"#),
+        (r#"뚌"#, r#"뚌"#, r#"뚌"#, r#"뚌"#, r#"뚌"#),
+        (r#"뚍"#, r#"뚍"#, r#"뚍"#, r#"뚍"#, r#"뚍"#),
+        (r#"뚎"#, r#"뚎"#, r#"뚎"#, r#"뚎"#, r#"뚎"#),
+        (r#"뚏"#, r#"뚏"#, r#"뚏"#, r#"뚏"#, r#"뚏"#),
+        (r#"뚐"#, r#"뚐"#, r#"뚐"#, r#"뚐"#, r#"뚐"#),
+        (r#"뚑"#, r#"뚑"#, r#"뚑"#, r#"뚑"#, r#"뚑"#),
+        (r#"뚒"#, r#"뚒"#, r#"뚒"#, r#"뚒"#, r#"뚒"#),
+        (r#"뚓"#, r#"뚓"#, r#"뚓"#, r#"뚓"#, r#"뚓"#),
+        (r#"뚔"#, r#"뚔"#, r#"뚔"#, r#"뚔"#, r#"뚔"#),
+        (r#"뚕"#, r#"뚕"#, r#"뚕"#, r#"뚕"#, r#"뚕"#),
+        (r#"뚖"#, r#"뚖"#, r#"뚖"#, r#"뚖"#, r#"뚖"#),
+        (r#"뚗"#, r#"뚗"#, r#"뚗"#, r#"뚗"#, r#"뚗"#),
+        (r#"뚘"#, r#"뚘"#, r#"뚘"#, r#"뚘"#, r#"뚘"#),
+        (r#"뚙"#, r#"뚙"#, r#"뚙"#, r#"뚙"#, r#"뚙"#),
+        (r#"뚚"#, r#"뚚"#, r#"뚚"#, r#"뚚"#, r#"뚚"#),
+        (r#"뚛"#, r#"뚛"#, r#"뚛"#, r#"뚛"#, r#"뚛"#),
+        (r#"뚜"#, r#"뚜"#, r#"뚜"#, r#"뚜"#, r#"뚜"#),
+        (r#"뚝"#, r#"뚝"#, r#"뚝"#, r#"뚝"#, r#"뚝"#),
+        (r#"뚞"#, r#"뚞"#, r#"뚞"#, r#"뚞"#, r#"뚞"#),
+        (r#"뚟"#, r#"뚟"#, r#"뚟"#, r#"뚟"#, r#"뚟"#),
+        (r#"뚠"#, r#"뚠"#, r#"뚠"#, r#"뚠"#, r#"뚠"#),
+        (r#"뚡"#, r#"뚡"#, r#"뚡"#, r#"뚡"#, r#"뚡"#),
+        (r#"뚢"#, r#"뚢"#, r#"뚢"#, r#"뚢"#, r#"뚢"#),
+        (r#"뚣"#, r#"뚣"#, r#"뚣"#, r#"뚣"#, r#"뚣"#),
+        (r#"뚤"#, r#"뚤"#, r#"뚤"#, r#"뚤"#, r#"뚤"#),
+        (r#"뚥"#, r#"뚥"#, r#"뚥"#, r#"뚥"#, r#"뚥"#),
+        (r#"뚦"#, r#"뚦"#, r#"뚦"#, r#"뚦"#, r#"뚦"#),
+        (r#"뚧"#, r#"뚧"#, r#"뚧"#, r#"뚧"#, r#"뚧"#),
+        (r#"뚨"#, r#"뚨"#, r#"뚨"#, r#"뚨"#, r#"뚨"#),
+        (r#"뚩"#, r#"뚩"#, r#"뚩"#, r#"뚩"#, r#"뚩"#),
+        (r#"뚪"#, r#"뚪"#, r#"뚪"#, r#"뚪"#, r#"뚪"#),
+        (r#"뚫"#, r#"뚫"#, r#"뚫"#, r#"뚫"#, r#"뚫"#),
+        (r#"뚬"#, r#"뚬"#, r#"뚬"#, r#"뚬"#, r#"뚬"#),
+        (r#"뚭"#, r#"뚭"#, r#"뚭"#, r#"뚭"#, r#"뚭"#),
+        (r#"뚮"#, r#"뚮"#, r#"뚮"#, r#"뚮"#, r#"뚮"#),
+        (r#"뚯"#, r#"뚯"#, r#"뚯"#, r#"뚯"#, r#"뚯"#),
+        (r#"뚰"#, r#"뚰"#, r#"뚰"#, r#"뚰"#, r#"뚰"#),
+        (r#"뚱"#, r#"뚱"#, r#"뚱"#, r#"뚱"#, r#"뚱"#),
+        (r#"뚲"#, r#"뚲"#, r#"뚲"#, r#"뚲"#, r#"뚲"#),
+        (r#"뚳"#, r#"뚳"#, r#"뚳"#, r#"뚳"#, r#"뚳"#),
+        (r#"뚴"#, r#"뚴"#, r#"뚴"#, r#"뚴"#, r#"뚴"#),
+        (r#"뚵"#, r#"뚵"#, r#"뚵"#, r#"뚵"#, r#"뚵"#),
+        (r#"뚶"#, r#"뚶"#, r#"뚶"#, r#"뚶"#, r#"뚶"#),
+        (r#"뚷"#, r#"뚷"#, r#"뚷"#, r#"뚷"#, r#"뚷"#),
+        (r#"뚸"#, r#"뚸"#, r#"뚸"#, r#"뚸"#, r#"뚸"#),
+        (r#"뚹"#, r#"뚹"#, r#"뚹"#, r#"뚹"#, r#"뚹"#),
+        (r#"뚺"#, r#"뚺"#, r#"뚺"#, r#"뚺"#, r#"뚺"#),
+        (r#"뚻"#, r#"뚻"#, r#"뚻"#, r#"뚻"#, r#"뚻"#),
+        (r#"뚼"#, r#"뚼"#, r#"뚼"#, r#"뚼"#, r#"뚼"#),
+        (r#"뚽"#, r#"뚽"#, r#"뚽"#, r#"뚽"#, r#"뚽"#),
+        (r#"뚾"#, r#"뚾"#, r#"뚾"#, r#"뚾"#, r#"뚾"#),
+        (r#"뚿"#, r#"뚿"#, r#"뚿"#, r#"뚿"#, r#"뚿"#),
+        (r#"뛀"#, r#"뛀"#, r#"뛀"#, r#"뛀"#, r#"뛀"#),
+        (r#"뛁"#, r#"뛁"#, r#"뛁"#, r#"뛁"#, r#"뛁"#),
+        (r#"뛂"#, r#"뛂"#, r#"뛂"#, r#"뛂"#, r#"뛂"#),
+        (r#"뛃"#, r#"뛃"#, r#"뛃"#, r#"뛃"#, r#"뛃"#),
+        (r#"뛄"#, r#"뛄"#, r#"뛄"#, r#"뛄"#, r#"뛄"#),
+        (r#"뛅"#, r#"뛅"#, r#"뛅"#, r#"뛅"#, r#"뛅"#),
+        (r#"뛆"#, r#"뛆"#, r#"뛆"#, r#"뛆"#, r#"뛆"#),
+        (r#"뛇"#, r#"뛇"#, r#"뛇"#, r#"뛇"#, r#"뛇"#),
+        (r#"뛈"#, r#"뛈"#, r#"뛈"#, r#"뛈"#, r#"뛈"#),
+        (r#"뛉"#, r#"뛉"#, r#"뛉"#, r#"뛉"#, r#"뛉"#),
+        (r#"뛊"#, r#"뛊"#, r#"뛊"#, r#"뛊"#, r#"뛊"#),
+        (r#"뛋"#, r#"뛋"#, r#"뛋"#, r#"뛋"#, r#"뛋"#),
+        (r#"뛌"#, r#"뛌"#, r#"뛌"#, r#"뛌"#, r#"뛌"#),
+        (r#"뛍"#, r#"뛍"#, r#"뛍"#, r#"뛍"#, r#"뛍"#),
+        (r#"뛎"#, r#"뛎"#, r#"뛎"#, r#"뛎"#, r#"뛎"#),
+        (r#"뛏"#, r#"뛏"#, r#"뛏"#, r#"뛏"#, r#"뛏"#),
+        (r#"뛐"#, r#"뛐"#, r#"뛐"#, r#"뛐"#, r#"뛐"#),
+        (r#"뛑"#, r#"뛑"#, r#"뛑"#, r#"뛑"#, r#"뛑"#),
+        (r#"뛒"#, r#"뛒"#, r#"뛒"#, r#"뛒"#, r#"뛒"#),
+        (r#"뛓"#, r#"뛓"#, r#"뛓"#, r#"뛓"#, r#"뛓"#),
+        (r#"뛔"#, r#"뛔"#, r#"뛔"#, r#"뛔"#, r#"뛔"#),
+        (r#"뛕"#, r#"뛕"#, r#"뛕"#, r#"뛕"#, r#"뛕"#),
+        (r#"뛖"#, r#"뛖"#, r#"뛖"#, r#"뛖"#, r#"뛖"#),
+        (r#"뛗"#, r#"뛗"#, r#"뛗"#, r#"뛗"#, r#"뛗"#),
+        (r#"뛘"#, r#"뛘"#, r#"뛘"#, r#"뛘"#, r#"뛘"#),
+        (r#"뛙"#, r#"뛙"#, r#"뛙"#, r#"뛙"#, r#"뛙"#),
+        (r#"뛚"#, r#"뛚"#, r#"뛚"#, r#"뛚"#, r#"뛚"#),
+        (r#"뛛"#, r#"뛛"#, r#"뛛"#, r#"뛛"#, r#"뛛"#),
+        (r#"뛜"#, r#"뛜"#, r#"뛜"#, r#"뛜"#, r#"뛜"#),
+        (r#"뛝"#, r#"뛝"#, r#"뛝"#, r#"뛝"#, r#"뛝"#),
+        (r#"뛞"#, r#"뛞"#, r#"뛞"#, r#"뛞"#, r#"뛞"#),
+        (r#"뛟"#, r#"뛟"#, r#"뛟"#, r#"뛟"#, r#"뛟"#),
+        (r#"뛠"#, r#"뛠"#, r#"뛠"#, r#"뛠"#, r#"뛠"#),
+        (r#"뛡"#, r#"뛡"#, r#"뛡"#, r#"뛡"#, r#"뛡"#),
+        (r#"뛢"#, r#"뛢"#, r#"뛢"#, r#"뛢"#, r#"뛢"#),
+        (r#"뛣"#, r#"뛣"#, r#"뛣"#, r#"뛣"#, r#"뛣"#),
+        (r#"뛤"#, r#"뛤"#, r#"뛤"#, r#"뛤"#, r#"뛤"#),
+        (r#"뛥"#, r#"뛥"#, r#"뛥"#, r#"뛥"#, r#"뛥"#),
+        (r#"뛦"#, r#"뛦"#, r#"뛦"#, r#"뛦"#, r#"뛦"#),
+        (r#"뛧"#, r#"뛧"#, r#"뛧"#, r#"뛧"#, r#"뛧"#),
+        (r#"뛨"#, r#"뛨"#, r#"뛨"#, r#"뛨"#, r#"뛨"#),
+        (r#"뛩"#, r#"뛩"#, r#"뛩"#, r#"뛩"#, r#"뛩"#),
+        (r#"뛪"#, r#"뛪"#, r#"뛪"#, r#"뛪"#, r#"뛪"#),
+        (r#"뛫"#, r#"뛫"#, r#"뛫"#, r#"뛫"#, r#"뛫"#),
+        (r#"뛬"#, r#"뛬"#, r#"뛬"#, r#"뛬"#, r#"뛬"#),
+        (r#"뛭"#, r#"뛭"#, r#"뛭"#, r#"뛭"#, r#"뛭"#),
+        (r#"뛮"#, r#"뛮"#, r#"뛮"#, r#"뛮"#, r#"뛮"#),
+        (r#"뛯"#, r#"뛯"#, r#"뛯"#, r#"뛯"#, r#"뛯"#),
+        (r#"뛰"#, r#"뛰"#, r#"뛰"#, r#"뛰"#, r#"뛰"#),
+        (r#"뛱"#, r#"뛱"#, r#"뛱"#, r#"뛱"#, r#"뛱"#),
+        (r#"뛲"#, r#"뛲"#, r#"뛲"#, r#"뛲"#, r#"뛲"#),
+        (r#"뛳"#, r#"뛳"#, r#"뛳"#, r#"뛳"#, r#"뛳"#),
+        (r#"뛴"#, r#"뛴"#, r#"뛴"#, r#"뛴"#, r#"뛴"#),
+        (r#"뛵"#, r#"뛵"#, r#"뛵"#, r#"뛵"#, r#"뛵"#),
+        (r#"뛶"#, r#"뛶"#, r#"뛶"#, r#"뛶"#, r#"뛶"#),
+        (r#"뛷"#, r#"뛷"#, r#"뛷"#, r#"뛷"#, r#"뛷"#),
+        (r#"뛸"#, r#"뛸"#, r#"뛸"#, r#"뛸"#, r#"뛸"#),
+        (r#"뛹"#, r#"뛹"#, r#"뛹"#, r#"뛹"#, r#"뛹"#),
+        (r#"뛺"#, r#"뛺"#, r#"뛺"#, r#"뛺"#, r#"뛺"#),
+        (r#"뛻"#, r#"뛻"#, r#"뛻"#, r#"뛻"#, r#"뛻"#),
+        (r#"뛼"#, r#"뛼"#, r#"뛼"#, r#"뛼"#, r#"뛼"#),
+        (r#"뛽"#, r#"뛽"#, r#"뛽"#, r#"뛽"#, r#"뛽"#),
+        (r#"뛾"#, r#"뛾"#, r#"뛾"#, r#"뛾"#, r#"뛾"#),
+        (r#"뛿"#, r#"뛿"#, r#"뛿"#, r#"뛿"#, r#"뛿"#),
+        (r#"뜀"#, r#"뜀"#, r#"뜀"#, r#"뜀"#, r#"뜀"#),
+        (r#"뜁"#, r#"뜁"#, r#"뜁"#, r#"뜁"#, r#"뜁"#),
+        (r#"뜂"#, r#"뜂"#, r#"뜂"#, r#"뜂"#, r#"뜂"#),
+        (r#"뜃"#, r#"뜃"#, r#"뜃"#, r#"뜃"#, r#"뜃"#),
+        (r#"뜄"#, r#"뜄"#, r#"뜄"#, r#"뜄"#, r#"뜄"#),
+        (r#"뜅"#, r#"뜅"#, r#"뜅"#, r#"뜅"#, r#"뜅"#),
+        (r#"뜆"#, r#"뜆"#, r#"뜆"#, r#"뜆"#, r#"뜆"#),
+        (r#"뜇"#, r#"뜇"#, r#"뜇"#, r#"뜇"#, r#"뜇"#),
+        (r#"뜈"#, r#"뜈"#, r#"뜈"#, r#"뜈"#, r#"뜈"#),
+        (r#"뜉"#, r#"뜉"#, r#"뜉"#, r#"뜉"#, r#"뜉"#),
+        (r#"뜊"#, r#"뜊"#, r#"뜊"#, r#"뜊"#, r#"뜊"#),
+        (r#"뜋"#, r#"뜋"#, r#"뜋"#, r#"뜋"#, r#"뜋"#),
+        (r#"뜌"#, r#"뜌"#, r#"뜌"#, r#"뜌"#, r#"뜌"#),
+        (r#"뜍"#, r#"뜍"#, r#"뜍"#, r#"뜍"#, r#"뜍"#),
+        (r#"뜎"#, r#"뜎"#, r#"뜎"#, r#"뜎"#, r#"뜎"#),
+        (r#"뜏"#, r#"뜏"#, r#"뜏"#, r#"뜏"#, r#"뜏"#),
+        (r#"뜐"#, r#"뜐"#, r#"뜐"#, r#"뜐"#, r#"뜐"#),
+        (r#"뜑"#, r#"뜑"#, r#"뜑"#, r#"뜑"#, r#"뜑"#),
+        (r#"뜒"#, r#"뜒"#, r#"뜒"#, r#"뜒"#, r#"뜒"#),
+        (r#"뜓"#, r#"뜓"#, r#"뜓"#, r#"뜓"#, r#"뜓"#),
+        (r#"뜔"#, r#"뜔"#, r#"뜔"#, r#"뜔"#, r#"뜔"#),
+        (r#"뜕"#, r#"뜕"#, r#"뜕"#, r#"뜕"#, r#"뜕"#),
+        (r#"뜖"#, r#"뜖"#, r#"뜖"#, r#"뜖"#, r#"뜖"#),
+        (r#"뜗"#, r#"뜗"#, r#"뜗"#, r#"뜗"#, r#"뜗"#),
+        (r#"뜘"#, r#"뜘"#, r#"뜘"#, r#"뜘"#, r#"뜘"#),
+        (r#"뜙"#, r#"뜙"#, r#"뜙"#, r#"뜙"#, r#"뜙"#),
+        (r#"뜚"#, r#"뜚"#, r#"뜚"#, r#"뜚"#, r#"뜚"#),
+        (r#"뜛"#, r#"뜛"#, r#"뜛"#, r#"뜛"#, r#"뜛"#),
+        (r#"뜜"#, r#"뜜"#, r#"뜜"#, r#"뜜"#, r#"뜜"#),
+        (r#"뜝"#, r#"뜝"#, r#"뜝"#, r#"뜝"#, r#"뜝"#),
+        (r#"뜞"#, r#"뜞"#, r#"뜞"#, r#"뜞"#, r#"뜞"#),
+        (r#"뜟"#, r#"뜟"#, r#"뜟"#, r#"뜟"#, r#"뜟"#),
+        (r#"뜠"#, r#"뜠"#, r#"뜠"#, r#"뜠"#, r#"뜠"#),
+        (r#"뜡"#, r#"뜡"#, r#"뜡"#, r#"뜡"#, r#"뜡"#),
+        (r#"뜢"#, r#"뜢"#, r#"뜢"#, r#"뜢"#, r#"뜢"#),
+        (r#"뜣"#, r#"뜣"#, r#"뜣"#, r#"뜣"#, r#"뜣"#),
+        (r#"뜤"#, r#"뜤"#, r#"뜤"#, r#"뜤"#, r#"뜤"#),
+        (r#"뜥"#, r#"뜥"#, r#"뜥"#, r#"뜥"#, r#"뜥"#),
+        (r#"뜦"#, r#"뜦"#, r#"뜦"#, r#"뜦"#, r#"뜦"#),
+        (r#"뜧"#, r#"뜧"#, r#"뜧"#, r#"뜧"#, r#"뜧"#),
+        (r#"뜨"#, r#"뜨"#, r#"뜨"#, r#"뜨"#, r#"뜨"#),
+        (r#"뜩"#, r#"뜩"#, r#"뜩"#, r#"뜩"#, r#"뜩"#),
+        (r#"뜪"#, r#"뜪"#, r#"뜪"#, r#"뜪"#, r#"뜪"#),
+        (r#"뜫"#, r#"뜫"#, r#"뜫"#, r#"뜫"#, r#"뜫"#),
+        (r#"뜬"#, r#"뜬"#, r#"뜬"#, r#"뜬"#, r#"뜬"#),
+        (r#"뜭"#, r#"뜭"#, r#"뜭"#, r#"뜭"#, r#"뜭"#),
+        (r#"뜮"#, r#"뜮"#, r#"뜮"#, r#"뜮"#, r#"뜮"#),
+        (r#"뜯"#, r#"뜯"#, r#"뜯"#, r#"뜯"#, r#"뜯"#),
+        (r#"뜰"#, r#"뜰"#, r#"뜰"#, r#"뜰"#, r#"뜰"#),
+        (r#"뜱"#, r#"뜱"#, r#"뜱"#, r#"뜱"#, r#"뜱"#),
+        (r#"뜲"#, r#"뜲"#, r#"뜲"#, r#"뜲"#, r#"뜲"#),
+        (r#"뜳"#, r#"뜳"#, r#"뜳"#, r#"뜳"#, r#"뜳"#),
+        (r#"뜴"#, r#"뜴"#, r#"뜴"#, r#"뜴"#, r#"뜴"#),
+        (r#"뜵"#, r#"뜵"#, r#"뜵"#, r#"뜵"#, r#"뜵"#),
+        (r#"뜶"#, r#"뜶"#, r#"뜶"#, r#"뜶"#, r#"뜶"#),
+        (r#"뜷"#, r#"뜷"#, r#"뜷"#, r#"뜷"#, r#"뜷"#),
+        (r#"뜸"#, r#"뜸"#, r#"뜸"#, r#"뜸"#, r#"뜸"#),
+        (r#"뜹"#, r#"뜹"#, r#"뜹"#, r#"뜹"#, r#"뜹"#),
+        (r#"뜺"#, r#"뜺"#, r#"뜺"#, r#"뜺"#, r#"뜺"#),
+        (r#"뜻"#, r#"뜻"#, r#"뜻"#, r#"뜻"#, r#"뜻"#),
+        (r#"뜼"#, r#"뜼"#, r#"뜼"#, r#"뜼"#, r#"뜼"#),
+        (r#"뜽"#, r#"뜽"#, r#"뜽"#, r#"뜽"#, r#"뜽"#),
+        (r#"뜾"#, r#"뜾"#, r#"뜾"#, r#"뜾"#, r#"뜾"#),
+        (r#"뜿"#, r#"뜿"#, r#"뜿"#, r#"뜿"#, r#"뜿"#),
+        (r#"띀"#, r#"띀"#, r#"띀"#, r#"띀"#, r#"띀"#),
+        (r#"띁"#, r#"띁"#, r#"띁"#, r#"띁"#, r#"띁"#),
+        (r#"띂"#, r#"띂"#, r#"띂"#, r#"띂"#, r#"띂"#),
+        (r#"띃"#, r#"띃"#, r#"띃"#, r#"띃"#, r#"띃"#),
+        (r#"띄"#, r#"띄"#, r#"띄"#, r#"띄"#, r#"띄"#),
+        (r#"띅"#, r#"띅"#, r#"띅"#, r#"띅"#, r#"띅"#),
+        (r#"띆"#, r#"띆"#, r#"띆"#, r#"띆"#, r#"띆"#),
+        (r#"띇"#, r#"띇"#, r#"띇"#, r#"띇"#, r#"띇"#),
+        (r#"띈"#, r#"띈"#, r#"띈"#, r#"띈"#, r#"띈"#),
+        (r#"띉"#, r#"띉"#, r#"띉"#, r#"띉"#, r#"띉"#),
+        (r#"띊"#, r#"띊"#, r#"띊"#, r#"띊"#, r#"띊"#),
+        (r#"띋"#, r#"띋"#, r#"띋"#, r#"띋"#, r#"띋"#),
+        (r#"띌"#, r#"띌"#, r#"띌"#, r#"띌"#, r#"띌"#),
+        (r#"띍"#, r#"띍"#, r#"띍"#, r#"띍"#, r#"띍"#),
+        (r#"띎"#, r#"띎"#, r#"띎"#, r#"띎"#, r#"띎"#),
+        (r#"띏"#, r#"띏"#, r#"띏"#, r#"띏"#, r#"띏"#),
+        (r#"띐"#, r#"띐"#, r#"띐"#, r#"띐"#, r#"띐"#),
+        (r#"띑"#, r#"띑"#, r#"띑"#, r#"띑"#, r#"띑"#),
+        (r#"띒"#, r#"띒"#, r#"띒"#, r#"띒"#, r#"띒"#),
+        (r#"띓"#, r#"띓"#, r#"띓"#, r#"띓"#, r#"띓"#),
+        (r#"띔"#, r#"띔"#, r#"띔"#, r#"띔"#, r#"띔"#),
+        (r#"띕"#, r#"띕"#, r#"띕"#, r#"띕"#, r#"띕"#),
+        (r#"띖"#, r#"띖"#, r#"띖"#, r#"띖"#, r#"띖"#),
+        (r#"띗"#, r#"띗"#, r#"띗"#, r#"띗"#, r#"띗"#),
+        (r#"띘"#, r#"띘"#, r#"띘"#, r#"띘"#, r#"띘"#),
+        (r#"띙"#, r#"띙"#, r#"띙"#, r#"띙"#, r#"띙"#),
+        (r#"띚"#, r#"띚"#, r#"띚"#, r#"띚"#, r#"띚"#),
+        (r#"띛"#, r#"띛"#, r#"띛"#, r#"띛"#, r#"띛"#),
+        (r#"띜"#, r#"띜"#, r#"띜"#, r#"띜"#, r#"띜"#),
+        (r#"띝"#, r#"띝"#, r#"띝"#, r#"띝"#, r#"띝"#),
+        (r#"띞"#, r#"띞"#, r#"띞"#, r#"띞"#, r#"띞"#),
+        (r#"띟"#, r#"띟"#, r#"띟"#, r#"띟"#, r#"띟"#),
+        (r#"띠"#, r#"띠"#, r#"띠"#, r#"띠"#, r#"띠"#),
+        (r#"띡"#, r#"띡"#, r#"띡"#, r#"띡"#, r#"띡"#),
+        (r#"띢"#, r#"띢"#, r#"띢"#, r#"띢"#, r#"띢"#),
+        (r#"띣"#, r#"띣"#, r#"띣"#, r#"띣"#, r#"띣"#),
+        (r#"띤"#, r#"띤"#, r#"띤"#, r#"띤"#, r#"띤"#),
+        (r#"띥"#, r#"띥"#, r#"띥"#, r#"띥"#, r#"띥"#),
+        (r#"띦"#, r#"띦"#, r#"띦"#, r#"띦"#, r#"띦"#),
+        (r#"띧"#, r#"띧"#, r#"띧"#, r#"띧"#, r#"띧"#),
+        (r#"띨"#, r#"띨"#, r#"띨"#, r#"띨"#, r#"띨"#),
+        (r#"띩"#, r#"띩"#, r#"띩"#, r#"띩"#, r#"띩"#),
+        (r#"띪"#, r#"띪"#, r#"띪"#, r#"띪"#, r#"띪"#),
+        (r#"띫"#, r#"띫"#, r#"띫"#, r#"띫"#, r#"띫"#),
+        (r#"띬"#, r#"띬"#, r#"띬"#, r#"띬"#, r#"띬"#),
+        (r#"띭"#, r#"띭"#, r#"띭"#, r#"띭"#, r#"띭"#),
+        (r#"띮"#, r#"띮"#, r#"띮"#, r#"띮"#, r#"띮"#),
+        (r#"띯"#, r#"띯"#, r#"띯"#, r#"띯"#, r#"띯"#),
+        (r#"띰"#, r#"띰"#, r#"띰"#, r#"띰"#, r#"띰"#),
+        (r#"띱"#, r#"띱"#, r#"띱"#, r#"띱"#, r#"띱"#),
+        (r#"띲"#, r#"띲"#, r#"띲"#, r#"띲"#, r#"띲"#),
+        (r#"띳"#, r#"띳"#, r#"띳"#, r#"띳"#, r#"띳"#),
+        (r#"띴"#, r#"띴"#, r#"띴"#, r#"띴"#, r#"띴"#),
+        (r#"띵"#, r#"띵"#, r#"띵"#, r#"띵"#, r#"띵"#),
+        (r#"띶"#, r#"띶"#, r#"띶"#, r#"띶"#, r#"띶"#),
+        (r#"띷"#, r#"띷"#, r#"띷"#, r#"띷"#, r#"띷"#),
+        (r#"띸"#, r#"띸"#, r#"띸"#, r#"띸"#, r#"띸"#),
+        (r#"띹"#, r#"띹"#, r#"띹"#, r#"띹"#, r#"띹"#),
+        (r#"띺"#, r#"띺"#, r#"띺"#, r#"띺"#, r#"띺"#),
+        (r#"띻"#, r#"띻"#, r#"띻"#, r#"띻"#, r#"띻"#),
+        (r#"라"#, r#"라"#, r#"라"#, r#"라"#, r#"라"#),
+        (r#"락"#, r#"락"#, r#"락"#, r#"락"#, r#"락"#),
+        (r#"띾"#, r#"띾"#, r#"띾"#, r#"띾"#, r#"띾"#),
+        (r#"띿"#, r#"띿"#, r#"띿"#, r#"띿"#, r#"띿"#),
+        (r#"란"#, r#"란"#, r#"란"#, r#"란"#, r#"란"#),
+        (r#"랁"#, r#"랁"#, r#"랁"#, r#"랁"#, r#"랁"#),
+        (r#"랂"#, r#"랂"#, r#"랂"#, r#"랂"#, r#"랂"#),
+        (r#"랃"#, r#"랃"#, r#"랃"#, r#"랃"#, r#"랃"#),
+        (r#"랄"#, r#"랄"#, r#"랄"#, r#"랄"#, r#"랄"#),
+        (r#"랅"#, r#"랅"#, r#"랅"#, r#"랅"#, r#"랅"#),
+        (r#"랆"#, r#"랆"#, r#"랆"#, r#"랆"#, r#"랆"#),
+        (r#"랇"#, r#"랇"#, r#"랇"#, r#"랇"#, r#"랇"#),
+        (r#"랈"#, r#"랈"#, r#"랈"#, r#"랈"#, r#"랈"#),
+        (r#"랉"#, r#"랉"#, r#"랉"#, r#"랉"#, r#"랉"#),
+        (r#"랊"#, r#"랊"#, r#"랊"#, r#"랊"#, r#"랊"#),
+        (r#"랋"#, r#"랋"#, r#"랋"#, r#"랋"#, r#"랋"#),
+        (r#"람"#, r#"람"#, r#"람"#, r#"람"#, r#"람"#),
+        (r#"랍"#, r#"랍"#, r#"랍"#, r#"랍"#, r#"랍"#),
+        (r#"랎"#, r#"랎"#, r#"랎"#, r#"랎"#, r#"랎"#),
+        (r#"랏"#, r#"랏"#, r#"랏"#, r#"랏"#, r#"랏"#),
+        (r#"랐"#, r#"랐"#, r#"랐"#, r#"랐"#, r#"랐"#),
+        (r#"랑"#, r#"랑"#, r#"랑"#, r#"랑"#, r#"랑"#),
+        (r#"랒"#, r#"랒"#, r#"랒"#, r#"랒"#, r#"랒"#),
+        (r#"랓"#, r#"랓"#, r#"랓"#, r#"랓"#, r#"랓"#),
+        (r#"랔"#, r#"랔"#, r#"랔"#, r#"랔"#, r#"랔"#),
+        (r#"랕"#, r#"랕"#, r#"랕"#, r#"랕"#, r#"랕"#),
+        (r#"랖"#, r#"랖"#, r#"랖"#, r#"랖"#, r#"랖"#),
+        (r#"랗"#, r#"랗"#, r#"랗"#, r#"랗"#, r#"랗"#),
+        (r#"래"#, r#"래"#, r#"래"#, r#"래"#, r#"래"#),
+        (r#"랙"#, r#"랙"#, r#"랙"#, r#"랙"#, r#"랙"#),
+        (r#"랚"#, r#"랚"#, r#"랚"#, r#"랚"#, r#"랚"#),
+        (r#"랛"#, r#"랛"#, r#"랛"#, r#"랛"#, r#"랛"#),
+        (r#"랜"#, r#"랜"#, r#"랜"#, r#"랜"#, r#"랜"#),
+        (r#"랝"#, r#"랝"#, r#"랝"#, r#"랝"#, r#"랝"#),
+        (r#"랞"#, r#"랞"#, r#"랞"#, r#"랞"#, r#"랞"#),
+        (r#"랟"#, r#"랟"#, r#"랟"#, r#"랟"#, r#"랟"#),
+        (r#"랠"#, r#"랠"#, r#"랠"#, r#"랠"#, r#"랠"#),
+        (r#"랡"#, r#"랡"#, r#"랡"#, r#"랡"#, r#"랡"#),
+        (r#"랢"#, r#"랢"#, r#"랢"#, r#"랢"#, r#"랢"#),
+        (r#"랣"#, r#"랣"#, r#"랣"#, r#"랣"#, r#"랣"#),
+        (r#"랤"#, r#"랤"#, r#"랤"#, r#"랤"#, r#"랤"#),
+        (r#"랥"#, r#"랥"#, r#"랥"#, r#"랥"#, r#"랥"#),
+        (r#"랦"#, r#"랦"#, r#"랦"#, r#"랦"#, r#"랦"#),
+        (r#"랧"#, r#"랧"#, r#"랧"#, r#"랧"#, r#"랧"#),
+        (r#"램"#, r#"램"#, r#"램"#, r#"램"#, r#"램"#),
+        (r#"랩"#, r#"랩"#, r#"랩"#, r#"랩"#, r#"랩"#),
+        (r#"랪"#, r#"랪"#, r#"랪"#, r#"랪"#, r#"랪"#),
+        (r#"랫"#, r#"랫"#, r#"랫"#, r#"랫"#, r#"랫"#),
+        (r#"랬"#, r#"랬"#, r#"랬"#, r#"랬"#, r#"랬"#),
+        (r#"랭"#, r#"랭"#, r#"랭"#, r#"랭"#, r#"랭"#),
+        (r#"랮"#, r#"랮"#, r#"랮"#, r#"랮"#, r#"랮"#),
+        (r#"랯"#, r#"랯"#, r#"랯"#, r#"랯"#, r#"랯"#),
+        (r#"랰"#, r#"랰"#, r#"랰"#, r#"랰"#, r#"랰"#),
+        (r#"랱"#, r#"랱"#, r#"랱"#, r#"랱"#, r#"랱"#),
+        (r#"랲"#, r#"랲"#, r#"랲"#, r#"랲"#, r#"랲"#),
+        (r#"랳"#, r#"랳"#, r#"랳"#, r#"랳"#, r#"랳"#),
+        (r#"랴"#, r#"랴"#, r#"랴"#, r#"랴"#, r#"랴"#),
+        (r#"략"#, r#"략"#, r#"략"#, r#"략"#, r#"략"#),
+        (r#"랶"#, r#"랶"#, r#"랶"#, r#"랶"#, r#"랶"#),
+        (r#"랷"#, r#"랷"#, r#"랷"#, r#"랷"#, r#"랷"#),
+        (r#"랸"#, r#"랸"#, r#"랸"#, r#"랸"#, r#"랸"#),
+        (r#"랹"#, r#"랹"#, r#"랹"#, r#"랹"#, r#"랹"#),
+        (r#"랺"#, r#"랺"#, r#"랺"#, r#"랺"#, r#"랺"#),
+        (r#"랻"#, r#"랻"#, r#"랻"#, r#"랻"#, r#"랻"#),
+        (r#"랼"#, r#"랼"#, r#"랼"#, r#"랼"#, r#"랼"#),
+        (r#"랽"#, r#"랽"#, r#"랽"#, r#"랽"#, r#"랽"#),
+        (r#"랾"#, r#"랾"#, r#"랾"#, r#"랾"#, r#"랾"#),
+        (r#"랿"#, r#"랿"#, r#"랿"#, r#"랿"#, r#"랿"#),
+        (r#"럀"#, r#"럀"#, r#"럀"#, r#"럀"#, r#"럀"#),
+        (r#"럁"#, r#"럁"#, r#"럁"#, r#"럁"#, r#"럁"#),
+        (r#"럂"#, r#"럂"#, r#"럂"#, r#"럂"#, r#"럂"#),
+        (r#"럃"#, r#"럃"#, r#"럃"#, r#"럃"#, r#"럃"#),
+        (r#"럄"#, r#"럄"#, r#"럄"#, r#"럄"#, r#"럄"#),
+        (r#"럅"#, r#"럅"#, r#"럅"#, r#"럅"#, r#"럅"#),
+        (r#"럆"#, r#"럆"#, r#"럆"#, r#"럆"#, r#"럆"#),
+        (r#"럇"#, r#"럇"#, r#"럇"#, r#"럇"#, r#"럇"#),
+        (r#"럈"#, r#"럈"#, r#"럈"#, r#"럈"#, r#"럈"#),
+        (r#"량"#, r#"량"#, r#"량"#, r#"량"#, r#"량"#),
+        (r#"럊"#, r#"럊"#, r#"럊"#, r#"럊"#, r#"럊"#),
+        (r#"럋"#, r#"럋"#, r#"럋"#, r#"럋"#, r#"럋"#),
+        (r#"럌"#, r#"럌"#, r#"럌"#, r#"럌"#, r#"럌"#),
+        (r#"럍"#, r#"럍"#, r#"럍"#, r#"럍"#, r#"럍"#),
+        (r#"럎"#, r#"럎"#, r#"럎"#, r#"럎"#, r#"럎"#),
+        (r#"럏"#, r#"럏"#, r#"럏"#, r#"럏"#, r#"럏"#),
+        (r#"럐"#, r#"럐"#, r#"럐"#, r#"럐"#, r#"럐"#),
+        (r#"럑"#, r#"럑"#, r#"럑"#, r#"럑"#, r#"럑"#),
+        (r#"럒"#, r#"럒"#, r#"럒"#, r#"럒"#, r#"럒"#),
+        (r#"럓"#, r#"럓"#, r#"럓"#, r#"럓"#, r#"럓"#),
+        (r#"럔"#, r#"럔"#, r#"럔"#, r#"럔"#, r#"럔"#),
+        (r#"럕"#, r#"럕"#, r#"럕"#, r#"럕"#, r#"럕"#),
+        (r#"럖"#, r#"럖"#, r#"럖"#, r#"럖"#, r#"럖"#),
+        (r#"럗"#, r#"럗"#, r#"럗"#, r#"럗"#, r#"럗"#),
+        (r#"럘"#, r#"럘"#, r#"럘"#, r#"럘"#, r#"럘"#),
+        (r#"럙"#, r#"럙"#, r#"럙"#, r#"럙"#, r#"럙"#),
+        (r#"럚"#, r#"럚"#, r#"럚"#, r#"럚"#, r#"럚"#),
+        (r#"럛"#, r#"럛"#, r#"럛"#, r#"럛"#, r#"럛"#),
+        (r#"럜"#, r#"럜"#, r#"럜"#, r#"럜"#, r#"럜"#),
+        (r#"럝"#, r#"럝"#, r#"럝"#, r#"럝"#, r#"럝"#),
+        (r#"럞"#, r#"럞"#, r#"럞"#, r#"럞"#, r#"럞"#),
+        (r#"럟"#, r#"럟"#, r#"럟"#, r#"럟"#, r#"럟"#),
+        (r#"럠"#, r#"럠"#, r#"럠"#, r#"럠"#, r#"럠"#),
+        (r#"럡"#, r#"럡"#, r#"럡"#, r#"럡"#, r#"럡"#),
+        (r#"럢"#, r#"럢"#, r#"럢"#, r#"럢"#, r#"럢"#),
+        (r#"럣"#, r#"럣"#, r#"럣"#, r#"럣"#, r#"럣"#),
+        (r#"럤"#, r#"럤"#, r#"럤"#, r#"럤"#, r#"럤"#),
+        (r#"럥"#, r#"럥"#, r#"럥"#, r#"럥"#, r#"럥"#),
+        (r#"럦"#, r#"럦"#, r#"럦"#, r#"럦"#, r#"럦"#),
+        (r#"럧"#, r#"럧"#, r#"럧"#, r#"럧"#, r#"럧"#),
+        (r#"럨"#, r#"럨"#, r#"럨"#, r#"럨"#, r#"럨"#),
+        (r#"럩"#, r#"럩"#, r#"럩"#, r#"럩"#, r#"럩"#),
+        (r#"럪"#, r#"럪"#, r#"럪"#, r#"럪"#, r#"럪"#),
+        (r#"럫"#, r#"럫"#, r#"럫"#, r#"럫"#, r#"럫"#),
+        (r#"러"#, r#"러"#, r#"러"#, r#"러"#, r#"러"#),
+        (r#"럭"#, r#"럭"#, r#"럭"#, r#"럭"#, r#"럭"#),
+        (r#"럮"#, r#"럮"#, r#"럮"#, r#"럮"#, r#"럮"#),
+        (r#"럯"#, r#"럯"#, r#"럯"#, r#"럯"#, r#"럯"#),
+        (r#"런"#, r#"런"#, r#"런"#, r#"런"#, r#"런"#),
+        (r#"럱"#, r#"럱"#, r#"럱"#, r#"럱"#, r#"럱"#),
+        (r#"럲"#, r#"럲"#, r#"럲"#, r#"럲"#, r#"럲"#),
+        (r#"럳"#, r#"럳"#, r#"럳"#, r#"럳"#, r#"럳"#),
+        (r#"럴"#, r#"럴"#, r#"럴"#, r#"럴"#, r#"럴"#),
+        (r#"럵"#, r#"럵"#, r#"럵"#, r#"럵"#, r#"럵"#),
+        (r#"럶"#, r#"럶"#, r#"럶"#, r#"럶"#, r#"럶"#),
+        (r#"럷"#, r#"럷"#, r#"럷"#, r#"럷"#, r#"럷"#),
+        (r#"럸"#, r#"럸"#, r#"럸"#, r#"럸"#, r#"럸"#),
+        (r#"럹"#, r#"럹"#, r#"럹"#, r#"럹"#, r#"럹"#),
+        (r#"럺"#, r#"럺"#, r#"럺"#, r#"럺"#, r#"럺"#),
+        (r#"럻"#, r#"럻"#, r#"럻"#, r#"럻"#, r#"럻"#),
+        (r#"럼"#, r#"럼"#, r#"럼"#, r#"럼"#, r#"럼"#),
+        (r#"럽"#, r#"럽"#, r#"럽"#, r#"럽"#, r#"럽"#),
+        (r#"럾"#, r#"럾"#, r#"럾"#, r#"럾"#, r#"럾"#),
+        (r#"럿"#, r#"럿"#, r#"럿"#, r#"럿"#, r#"럿"#),
+        (r#"렀"#, r#"렀"#, r#"렀"#, r#"렀"#, r#"렀"#),
+        (r#"렁"#, r#"렁"#, r#"렁"#, r#"렁"#, r#"렁"#),
+        (r#"렂"#, r#"렂"#, r#"렂"#, r#"렂"#, r#"렂"#),
+        (r#"렃"#, r#"렃"#, r#"렃"#, r#"렃"#, r#"렃"#),
+        (r#"렄"#, r#"렄"#, r#"렄"#, r#"렄"#, r#"렄"#),
+        (r#"렅"#, r#"렅"#, r#"렅"#, r#"렅"#, r#"렅"#),
+        (r#"렆"#, r#"렆"#, r#"렆"#, r#"렆"#, r#"렆"#),
+        (r#"렇"#, r#"렇"#, r#"렇"#, r#"렇"#, r#"렇"#),
+        (r#"레"#, r#"레"#, r#"레"#, r#"레"#, r#"레"#),
+        (r#"렉"#, r#"렉"#, r#"렉"#, r#"렉"#, r#"렉"#),
+        (r#"렊"#, r#"렊"#, r#"렊"#, r#"렊"#, r#"렊"#),
+        (r#"렋"#, r#"렋"#, r#"렋"#, r#"렋"#, r#"렋"#),
+        (r#"렌"#, r#"렌"#, r#"렌"#, r#"렌"#, r#"렌"#),
+        (r#"렍"#, r#"렍"#, r#"렍"#, r#"렍"#, r#"렍"#),
+        (r#"렎"#, r#"렎"#, r#"렎"#, r#"렎"#, r#"렎"#),
+        (r#"렏"#, r#"렏"#, r#"렏"#, r#"렏"#, r#"렏"#),
+        (r#"렐"#, r#"렐"#, r#"렐"#, r#"렐"#, r#"렐"#),
+        (r#"렑"#, r#"렑"#, r#"렑"#, r#"렑"#, r#"렑"#),
+        (r#"렒"#, r#"렒"#, r#"렒"#, r#"렒"#, r#"렒"#),
+        (r#"렓"#, r#"렓"#, r#"렓"#, r#"렓"#, r#"렓"#),
+        (r#"렔"#, r#"렔"#, r#"렔"#, r#"렔"#, r#"렔"#),
+        (r#"렕"#, r#"렕"#, r#"렕"#, r#"렕"#, r#"렕"#),
+        (r#"렖"#, r#"렖"#, r#"렖"#, r#"렖"#, r#"렖"#),
+        (r#"렗"#, r#"렗"#, r#"렗"#, r#"렗"#, r#"렗"#),
+        (r#"렘"#, r#"렘"#, r#"렘"#, r#"렘"#, r#"렘"#),
+        (r#"렙"#, r#"렙"#, r#"렙"#, r#"렙"#, r#"렙"#),
+        (r#"렚"#, r#"렚"#, r#"렚"#, r#"렚"#, r#"렚"#),
+        (r#"렛"#, r#"렛"#, r#"렛"#, r#"렛"#, r#"렛"#),
+        (r#"렜"#, r#"렜"#, r#"렜"#, r#"렜"#, r#"렜"#),
+        (r#"렝"#, r#"렝"#, r#"렝"#, r#"렝"#, r#"렝"#),
+        (r#"렞"#, r#"렞"#, r#"렞"#, r#"렞"#, r#"렞"#),
+        (r#"렟"#, r#"렟"#, r#"렟"#, r#"렟"#, r#"렟"#),
+        (r#"렠"#, r#"렠"#, r#"렠"#, r#"렠"#, r#"렠"#),
+        (r#"렡"#, r#"렡"#, r#"렡"#, r#"렡"#, r#"렡"#),
+        (r#"렢"#, r#"렢"#, r#"렢"#, r#"렢"#, r#"렢"#),
+        (r#"렣"#, r#"렣"#, r#"렣"#, r#"렣"#, r#"렣"#),
+        (r#"려"#, r#"려"#, r#"려"#, r#"려"#, r#"려"#),
+        (r#"력"#, r#"력"#, r#"력"#, r#"력"#, r#"력"#),
+        (r#"렦"#, r#"렦"#, r#"렦"#, r#"렦"#, r#"렦"#),
+        (r#"렧"#, r#"렧"#, r#"렧"#, r#"렧"#, r#"렧"#),
+        (r#"련"#, r#"련"#, r#"련"#, r#"련"#, r#"련"#),
+        (r#"렩"#, r#"렩"#, r#"렩"#, r#"렩"#, r#"렩"#),
+        (r#"렪"#, r#"렪"#, r#"렪"#, r#"렪"#, r#"렪"#),
+        (r#"렫"#, r#"렫"#, r#"렫"#, r#"렫"#, r#"렫"#),
+        (r#"렬"#, r#"렬"#, r#"렬"#, r#"렬"#, r#"렬"#),
+        (r#"렭"#, r#"렭"#, r#"렭"#, r#"렭"#, r#"렭"#),
+        (r#"렮"#, r#"렮"#, r#"렮"#, r#"렮"#, r#"렮"#),
+        (r#"렯"#, r#"렯"#, r#"렯"#, r#"렯"#, r#"렯"#),
+        (r#"렰"#, r#"렰"#, r#"렰"#, r#"렰"#, r#"렰"#),
+        (r#"렱"#, r#"렱"#, r#"렱"#, r#"렱"#, r#"렱"#),
+        (r#"렲"#, r#"렲"#, r#"렲"#, r#"렲"#, r#"렲"#),
+        (r#"렳"#, r#"렳"#, r#"렳"#, r#"렳"#, r#"렳"#),
+        (r#"렴"#, r#"렴"#, r#"렴"#, r#"렴"#, r#"렴"#),
+        (r#"렵"#, r#"렵"#, r#"렵"#, r#"렵"#, r#"렵"#),
+        (r#"렶"#, r#"렶"#, r#"렶"#, r#"렶"#, r#"렶"#),
+        (r#"렷"#, r#"렷"#, r#"렷"#, r#"렷"#, r#"렷"#),
+        (r#"렸"#, r#"렸"#, r#"렸"#, r#"렸"#, r#"렸"#),
+        (r#"령"#, r#"령"#, r#"령"#, r#"령"#, r#"령"#),
+        (r#"렺"#, r#"렺"#, r#"렺"#, r#"렺"#, r#"렺"#),
+        (r#"렻"#, r#"렻"#, r#"렻"#, r#"렻"#, r#"렻"#),
+        (r#"렼"#, r#"렼"#, r#"렼"#, r#"렼"#, r#"렼"#),
+        (r#"렽"#, r#"렽"#, r#"렽"#, r#"렽"#, r#"렽"#),
+        (r#"렾"#, r#"렾"#, r#"렾"#, r#"렾"#, r#"렾"#),
+        (r#"렿"#, r#"렿"#, r#"렿"#, r#"렿"#, r#"렿"#),
+        (r#"례"#, r#"례"#, r#"례"#, r#"례"#, r#"례"#),
+        (r#"롁"#, r#"롁"#, r#"롁"#, r#"롁"#, r#"롁"#),
+        (r#"롂"#, r#"롂"#, r#"롂"#, r#"롂"#, r#"롂"#),
+        (r#"롃"#, r#"롃"#, r#"롃"#, r#"롃"#, r#"롃"#),
+        (r#"롄"#, r#"롄"#, r#"롄"#, r#"롄"#, r#"롄"#),
+        (r#"롅"#, r#"롅"#, r#"롅"#, r#"롅"#, r#"롅"#),
+        (r#"롆"#, r#"롆"#, r#"롆"#, r#"롆"#, r#"롆"#),
+        (r#"롇"#, r#"롇"#, r#"롇"#, r#"롇"#, r#"롇"#),
+        (r#"롈"#, r#"롈"#, r#"롈"#, r#"롈"#, r#"롈"#),
+        (r#"롉"#, r#"롉"#, r#"롉"#, r#"롉"#, r#"롉"#),
+        (r#"롊"#, r#"롊"#, r#"롊"#, r#"롊"#, r#"롊"#),
+        (r#"롋"#, r#"롋"#, r#"롋"#, r#"롋"#, r#"롋"#),
+        (r#"롌"#, r#"롌"#, r#"롌"#, r#"롌"#, r#"롌"#),
+        (r#"롍"#, r#"롍"#, r#"롍"#, r#"롍"#, r#"롍"#),
+        (r#"롎"#, r#"롎"#, r#"롎"#, r#"롎"#, r#"롎"#),
+        (r#"롏"#, r#"롏"#, r#"롏"#, r#"롏"#, r#"롏"#),
+        (r#"롐"#, r#"롐"#, r#"롐"#, r#"롐"#, r#"롐"#),
+        (r#"롑"#, r#"롑"#, r#"롑"#, r#"롑"#, r#"롑"#),
+        (r#"롒"#, r#"롒"#, r#"롒"#, r#"롒"#, r#"롒"#),
+        (r#"롓"#, r#"롓"#, r#"롓"#, r#"롓"#, r#"롓"#),
+        (r#"롔"#, r#"롔"#, r#"롔"#, r#"롔"#, r#"롔"#),
+        (r#"롕"#, r#"롕"#, r#"롕"#, r#"롕"#, r#"롕"#),
+        (r#"롖"#, r#"롖"#, r#"롖"#, r#"롖"#, r#"롖"#),
+        (r#"롗"#, r#"롗"#, r#"롗"#, r#"롗"#, r#"롗"#),
+        (r#"롘"#, r#"롘"#, r#"롘"#, r#"롘"#, r#"롘"#),
+        (r#"롙"#, r#"롙"#, r#"롙"#, r#"롙"#, r#"롙"#),
+        (r#"롚"#, r#"롚"#, r#"롚"#, r#"롚"#, r#"롚"#),
+        (r#"롛"#, r#"롛"#, r#"롛"#, r#"롛"#, r#"롛"#),
+        (r#"로"#, r#"로"#, r#"로"#, r#"로"#, r#"로"#),
+        (r#"록"#, r#"록"#, r#"록"#, r#"록"#, r#"록"#),
+        (r#"롞"#, r#"롞"#, r#"롞"#, r#"롞"#, r#"롞"#),
+        (r#"롟"#, r#"롟"#, r#"롟"#, r#"롟"#, r#"롟"#),
+        (r#"론"#, r#"론"#, r#"론"#, r#"론"#, r#"론"#),
+        (r#"롡"#, r#"롡"#, r#"롡"#, r#"롡"#, r#"롡"#),
+        (r#"롢"#, r#"롢"#, r#"롢"#, r#"롢"#, r#"롢"#),
+        (r#"롣"#, r#"롣"#, r#"롣"#, r#"롣"#, r#"롣"#),
+        (r#"롤"#, r#"롤"#, r#"롤"#, r#"롤"#, r#"롤"#),
+        (r#"롥"#, r#"롥"#, r#"롥"#, r#"롥"#, r#"롥"#),
+        (r#"롦"#, r#"롦"#, r#"롦"#, r#"롦"#, r#"롦"#),
+        (r#"롧"#, r#"롧"#, r#"롧"#, r#"롧"#, r#"롧"#),
+        (r#"롨"#, r#"롨"#, r#"롨"#, r#"롨"#, r#"롨"#),
+        (r#"롩"#, r#"롩"#, r#"롩"#, r#"롩"#, r#"롩"#),
+        (r#"롪"#, r#"롪"#, r#"롪"#, r#"롪"#, r#"롪"#),
+        (r#"롫"#, r#"롫"#, r#"롫"#, r#"롫"#, r#"롫"#),
+        (r#"롬"#, r#"롬"#, r#"롬"#, r#"롬"#, r#"롬"#),
+        (r#"롭"#, r#"롭"#, r#"롭"#, r#"롭"#, r#"롭"#),
+        (r#"롮"#, r#"롮"#, r#"롮"#, r#"롮"#, r#"롮"#),
+        (r#"롯"#, r#"롯"#, r#"롯"#, r#"롯"#, r#"롯"#),
+        (r#"롰"#, r#"롰"#, r#"롰"#, r#"롰"#, r#"롰"#),
+        (r#"롱"#, r#"롱"#, r#"롱"#, r#"롱"#, r#"롱"#),
+        (r#"롲"#, r#"롲"#, r#"롲"#, r#"롲"#, r#"롲"#),
+        (r#"롳"#, r#"롳"#, r#"롳"#, r#"롳"#, r#"롳"#),
+        (r#"롴"#, r#"롴"#, r#"롴"#, r#"롴"#, r#"롴"#),
+        (r#"롵"#, r#"롵"#, r#"롵"#, r#"롵"#, r#"롵"#),
+        (r#"롶"#, r#"롶"#, r#"롶"#, r#"롶"#, r#"롶"#),
+        (r#"롷"#, r#"롷"#, r#"롷"#, r#"롷"#, r#"롷"#),
+        (r#"롸"#, r#"롸"#, r#"롸"#, r#"롸"#, r#"롸"#),
+        (r#"롹"#, r#"롹"#, r#"롹"#, r#"롹"#, r#"롹"#),
+        (r#"롺"#, r#"롺"#, r#"롺"#, r#"롺"#, r#"롺"#),
+        (r#"롻"#, r#"롻"#, r#"롻"#, r#"롻"#, r#"롻"#),
+        (r#"롼"#, r#"롼"#, r#"롼"#, r#"롼"#, r#"롼"#),
+        (r#"롽"#, r#"롽"#, r#"롽"#, r#"롽"#, r#"롽"#),
+        (r#"롾"#, r#"롾"#, r#"롾"#, r#"롾"#, r#"롾"#),
+        (r#"롿"#, r#"롿"#, r#"롿"#, r#"롿"#, r#"롿"#),
+        (r#"뢀"#, r#"뢀"#, r#"뢀"#, r#"뢀"#, r#"뢀"#),
+        (r#"뢁"#, r#"뢁"#, r#"뢁"#, r#"뢁"#, r#"뢁"#),
+        (r#"뢂"#, r#"뢂"#, r#"뢂"#, r#"뢂"#, r#"뢂"#),
+        (r#"뢃"#, r#"뢃"#, r#"뢃"#, r#"뢃"#, r#"뢃"#),
+        (r#"뢄"#, r#"뢄"#, r#"뢄"#, r#"뢄"#, r#"뢄"#),
+        (r#"뢅"#, r#"뢅"#, r#"뢅"#, r#"뢅"#, r#"뢅"#),
+        (r#"뢆"#, r#"뢆"#, r#"뢆"#, r#"뢆"#, r#"뢆"#),
+        (r#"뢇"#, r#"뢇"#, r#"뢇"#, r#"뢇"#, r#"뢇"#),
+        (r#"뢈"#, r#"뢈"#, r#"뢈"#, r#"뢈"#, r#"뢈"#),
+        (r#"뢉"#, r#"뢉"#, r#"뢉"#, r#"뢉"#, r#"뢉"#),
+        (r#"뢊"#, r#"뢊"#, r#"뢊"#, r#"뢊"#, r#"뢊"#),
+        (r#"뢋"#, r#"뢋"#, r#"뢋"#, r#"뢋"#, r#"뢋"#),
+        (r#"뢌"#, r#"뢌"#, r#"뢌"#, r#"뢌"#, r#"뢌"#),
+        (r#"뢍"#, r#"뢍"#, r#"뢍"#, r#"뢍"#, r#"뢍"#),
+        (r#"뢎"#, r#"뢎"#, r#"뢎"#, r#"뢎"#, r#"뢎"#),
+        (r#"뢏"#, r#"뢏"#, r#"뢏"#, r#"뢏"#, r#"뢏"#),
+        (r#"뢐"#, r#"뢐"#, r#"뢐"#, r#"뢐"#, r#"뢐"#),
+        (r#"뢑"#, r#"뢑"#, r#"뢑"#, r#"뢑"#, r#"뢑"#),
+        (r#"뢒"#, r#"뢒"#, r#"뢒"#, r#"뢒"#, r#"뢒"#),
+        (r#"뢓"#, r#"뢓"#, r#"뢓"#, r#"뢓"#, r#"뢓"#),
+        (r#"뢔"#, r#"뢔"#, r#"뢔"#, r#"뢔"#, r#"뢔"#),
+        (r#"뢕"#, r#"뢕"#, r#"뢕"#, r#"뢕"#, r#"뢕"#),
+        (r#"뢖"#, r#"뢖"#, r#"뢖"#, r#"뢖"#, r#"뢖"#),
+        (r#"뢗"#, r#"뢗"#, r#"뢗"#, r#"뢗"#, r#"뢗"#),
+        (r#"뢘"#, r#"뢘"#, r#"뢘"#, r#"뢘"#, r#"뢘"#),
+        (r#"뢙"#, r#"뢙"#, r#"뢙"#, r#"뢙"#, r#"뢙"#),
+        (r#"뢚"#, r#"뢚"#, r#"뢚"#, r#"뢚"#, r#"뢚"#),
+        (r#"뢛"#, r#"뢛"#, r#"뢛"#, r#"뢛"#, r#"뢛"#),
+        (r#"뢜"#, r#"뢜"#, r#"뢜"#, r#"뢜"#, r#"뢜"#),
+        (r#"뢝"#, r#"뢝"#, r#"뢝"#, r#"뢝"#, r#"뢝"#),
+        (r#"뢞"#, r#"뢞"#, r#"뢞"#, r#"뢞"#, r#"뢞"#),
+        (r#"뢟"#, r#"뢟"#, r#"뢟"#, r#"뢟"#, r#"뢟"#),
+        (r#"뢠"#, r#"뢠"#, r#"뢠"#, r#"뢠"#, r#"뢠"#),
+        (r#"뢡"#, r#"뢡"#, r#"뢡"#, r#"뢡"#, r#"뢡"#),
+        (r#"뢢"#, r#"뢢"#, r#"뢢"#, r#"뢢"#, r#"뢢"#),
+        (r#"뢣"#, r#"뢣"#, r#"뢣"#, r#"뢣"#, r#"뢣"#),
+        (r#"뢤"#, r#"뢤"#, r#"뢤"#, r#"뢤"#, r#"뢤"#),
+        (r#"뢥"#, r#"뢥"#, r#"뢥"#, r#"뢥"#, r#"뢥"#),
+        (r#"뢦"#, r#"뢦"#, r#"뢦"#, r#"뢦"#, r#"뢦"#),
+        (r#"뢧"#, r#"뢧"#, r#"뢧"#, r#"뢧"#, r#"뢧"#),
+        (r#"뢨"#, r#"뢨"#, r#"뢨"#, r#"뢨"#, r#"뢨"#),
+        (r#"뢩"#, r#"뢩"#, r#"뢩"#, r#"뢩"#, r#"뢩"#),
+        (r#"뢪"#, r#"뢪"#, r#"뢪"#, r#"뢪"#, r#"뢪"#),
+        (r#"뢫"#, r#"뢫"#, r#"뢫"#, r#"뢫"#, r#"뢫"#),
+        (r#"뢬"#, r#"뢬"#, r#"뢬"#, r#"뢬"#, r#"뢬"#),
+        (r#"뢭"#, r#"뢭"#, r#"뢭"#, r#"뢭"#, r#"뢭"#),
+        (r#"뢮"#, r#"뢮"#, r#"뢮"#, r#"뢮"#, r#"뢮"#),
+        (r#"뢯"#, r#"뢯"#, r#"뢯"#, r#"뢯"#, r#"뢯"#),
+        (r#"뢰"#, r#"뢰"#, r#"뢰"#, r#"뢰"#, r#"뢰"#),
+        (r#"뢱"#, r#"뢱"#, r#"뢱"#, r#"뢱"#, r#"뢱"#),
+        (r#"뢲"#, r#"뢲"#, r#"뢲"#, r#"뢲"#, r#"뢲"#),
+        (r#"뢳"#, r#"뢳"#, r#"뢳"#, r#"뢳"#, r#"뢳"#),
+        (r#"뢴"#, r#"뢴"#, r#"뢴"#, r#"뢴"#, r#"뢴"#),
+        (r#"뢵"#, r#"뢵"#, r#"뢵"#, r#"뢵"#, r#"뢵"#),
+        (r#"뢶"#, r#"뢶"#, r#"뢶"#, r#"뢶"#, r#"뢶"#),
+        (r#"뢷"#, r#"뢷"#, r#"뢷"#, r#"뢷"#, r#"뢷"#),
+        (r#"뢸"#, r#"뢸"#, r#"뢸"#, r#"뢸"#, r#"뢸"#),
+        (r#"뢹"#, r#"뢹"#, r#"뢹"#, r#"뢹"#, r#"뢹"#),
+        (r#"뢺"#, r#"뢺"#, r#"뢺"#, r#"뢺"#, r#"뢺"#),
+        (r#"뢻"#, r#"뢻"#, r#"뢻"#, r#"뢻"#, r#"뢻"#),
+        (r#"뢼"#, r#"뢼"#, r#"뢼"#, r#"뢼"#, r#"뢼"#),
+        (r#"뢽"#, r#"뢽"#, r#"뢽"#, r#"뢽"#, r#"뢽"#),
+        (r#"뢾"#, r#"뢾"#, r#"뢾"#, r#"뢾"#, r#"뢾"#),
+        (r#"뢿"#, r#"뢿"#, r#"뢿"#, r#"뢿"#, r#"뢿"#),
+        (r#"룀"#, r#"룀"#, r#"룀"#, r#"룀"#, r#"룀"#),
+        (r#"룁"#, r#"룁"#, r#"룁"#, r#"룁"#, r#"룁"#),
+        (r#"룂"#, r#"룂"#, r#"룂"#, r#"룂"#, r#"룂"#),
+        (r#"룃"#, r#"룃"#, r#"룃"#, r#"룃"#, r#"룃"#),
+        (r#"룄"#, r#"룄"#, r#"룄"#, r#"룄"#, r#"룄"#),
+        (r#"룅"#, r#"룅"#, r#"룅"#, r#"룅"#, r#"룅"#),
+        (r#"룆"#, r#"룆"#, r#"룆"#, r#"룆"#, r#"룆"#),
+        (r#"룇"#, r#"룇"#, r#"룇"#, r#"룇"#, r#"룇"#),
+        (r#"룈"#, r#"룈"#, r#"룈"#, r#"룈"#, r#"룈"#),
+        (r#"룉"#, r#"룉"#, r#"룉"#, r#"룉"#, r#"룉"#),
+        (r#"룊"#, r#"룊"#, r#"룊"#, r#"룊"#, r#"룊"#),
+        (r#"룋"#, r#"룋"#, r#"룋"#, r#"룋"#, r#"룋"#),
+        (r#"료"#, r#"료"#, r#"료"#, r#"료"#, r#"료"#),
+        (r#"룍"#, r#"룍"#, r#"룍"#, r#"룍"#, r#"룍"#),
+        (r#"룎"#, r#"룎"#, r#"룎"#, r#"룎"#, r#"룎"#),
+        (r#"룏"#, r#"룏"#, r#"룏"#, r#"룏"#, r#"룏"#),
+        (r#"룐"#, r#"룐"#, r#"룐"#, r#"룐"#, r#"룐"#),
+        (r#"룑"#, r#"룑"#, r#"룑"#, r#"룑"#, r#"룑"#),
+        (r#"룒"#, r#"룒"#, r#"룒"#, r#"룒"#, r#"룒"#),
+        (r#"룓"#, r#"룓"#, r#"룓"#, r#"룓"#, r#"룓"#),
+        (r#"룔"#, r#"룔"#, r#"룔"#, r#"룔"#, r#"룔"#),
+        (r#"룕"#, r#"룕"#, r#"룕"#, r#"룕"#, r#"룕"#),
+        (r#"룖"#, r#"룖"#, r#"룖"#, r#"룖"#, r#"룖"#),
+        (r#"룗"#, r#"룗"#, r#"룗"#, r#"룗"#, r#"룗"#),
+        (r#"룘"#, r#"룘"#, r#"룘"#, r#"룘"#, r#"룘"#),
+        (r#"룙"#, r#"룙"#, r#"룙"#, r#"룙"#, r#"룙"#),
+        (r#"룚"#, r#"룚"#, r#"룚"#, r#"룚"#, r#"룚"#),
+        (r#"룛"#, r#"룛"#, r#"룛"#, r#"룛"#, r#"룛"#),
+        (r#"룜"#, r#"룜"#, r#"룜"#, r#"룜"#, r#"룜"#),
+        (r#"룝"#, r#"룝"#, r#"룝"#, r#"룝"#, r#"룝"#),
+        (r#"룞"#, r#"룞"#, r#"룞"#, r#"룞"#, r#"룞"#),
+        (r#"룟"#, r#"룟"#, r#"룟"#, r#"룟"#, r#"룟"#),
+        (r#"룠"#, r#"룠"#, r#"룠"#, r#"룠"#, r#"룠"#),
+        (r#"룡"#, r#"룡"#, r#"룡"#, r#"룡"#, r#"룡"#),
+        (r#"룢"#, r#"룢"#, r#"룢"#, r#"룢"#, r#"룢"#),
+        (r#"룣"#, r#"룣"#, r#"룣"#, r#"룣"#, r#"룣"#),
+        (r#"룤"#, r#"룤"#, r#"룤"#, r#"룤"#, r#"룤"#),
+        (r#"룥"#, r#"룥"#, r#"룥"#, r#"룥"#, r#"룥"#),
+        (r#"룦"#, r#"룦"#, r#"룦"#, r#"룦"#, r#"룦"#),
+        (r#"룧"#, r#"룧"#, r#"룧"#, r#"룧"#, r#"룧"#),
+        (r#"루"#, r#"루"#, r#"루"#, r#"루"#, r#"루"#),
+        (r#"룩"#, r#"룩"#, r#"룩"#, r#"룩"#, r#"룩"#),
+        (r#"룪"#, r#"룪"#, r#"룪"#, r#"룪"#, r#"룪"#),
+        (r#"룫"#, r#"룫"#, r#"룫"#, r#"룫"#, r#"룫"#),
+        (r#"룬"#, r#"룬"#, r#"룬"#, r#"룬"#, r#"룬"#),
+        (r#"룭"#, r#"룭"#, r#"룭"#, r#"룭"#, r#"룭"#),
+        (r#"룮"#, r#"룮"#, r#"룮"#, r#"룮"#, r#"룮"#),
+        (r#"룯"#, r#"룯"#, r#"룯"#, r#"룯"#, r#"룯"#),
+        (r#"룰"#, r#"룰"#, r#"룰"#, r#"룰"#, r#"룰"#),
+        (r#"룱"#, r#"룱"#, r#"룱"#, r#"룱"#, r#"룱"#),
+        (r#"룲"#, r#"룲"#, r#"룲"#, r#"룲"#, r#"룲"#),
+        (r#"룳"#, r#"룳"#, r#"룳"#, r#"룳"#, r#"룳"#),
+        (r#"룴"#, r#"룴"#, r#"룴"#, r#"룴"#, r#"룴"#),
+        (r#"룵"#, r#"룵"#, r#"룵"#, r#"룵"#, r#"룵"#),
+        (r#"룶"#, r#"룶"#, r#"룶"#, r#"룶"#, r#"룶"#),
+        (r#"룷"#, r#"룷"#, r#"룷"#, r#"룷"#, r#"룷"#),
+        (r#"룸"#, r#"룸"#, r#"룸"#, r#"룸"#, r#"룸"#),
+        (r#"룹"#, r#"룹"#, r#"룹"#, r#"룹"#, r#"룹"#),
+        (r#"룺"#, r#"룺"#, r#"룺"#, r#"룺"#, r#"룺"#),
+        (r#"룻"#, r#"룻"#, r#"룻"#, r#"룻"#, r#"룻"#),
+        (r#"룼"#, r#"룼"#, r#"룼"#, r#"룼"#, r#"룼"#),
+        (r#"룽"#, r#"룽"#, r#"룽"#, r#"룽"#, r#"룽"#),
+        (r#"룾"#, r#"룾"#, r#"룾"#, r#"룾"#, r#"룾"#),
+        (r#"룿"#, r#"룿"#, r#"룿"#, r#"룿"#, r#"룿"#),
+        (r#"뤀"#, r#"뤀"#, r#"뤀"#, r#"뤀"#, r#"뤀"#),
+        (r#"뤁"#, r#"뤁"#, r#"뤁"#, r#"뤁"#, r#"뤁"#),
+        (r#"뤂"#, r#"뤂"#, r#"뤂"#, r#"뤂"#, r#"뤂"#),
+        (r#"뤃"#, r#"뤃"#, r#"뤃"#, r#"뤃"#, r#"뤃"#),
+        (r#"뤄"#, r#"뤄"#, r#"뤄"#, r#"뤄"#, r#"뤄"#),
+        (r#"뤅"#, r#"뤅"#, r#"뤅"#, r#"뤅"#, r#"뤅"#),
+        (r#"뤆"#, r#"뤆"#, r#"뤆"#, r#"뤆"#, r#"뤆"#),
+        (r#"뤇"#, r#"뤇"#, r#"뤇"#, r#"뤇"#, r#"뤇"#),
+        (r#"뤈"#, r#"뤈"#, r#"뤈"#, r#"뤈"#, r#"뤈"#),
+        (r#"뤉"#, r#"뤉"#, r#"뤉"#, r#"뤉"#, r#"뤉"#),
+        (r#"뤊"#, r#"뤊"#, r#"뤊"#, r#"뤊"#, r#"뤊"#),
+        (r#"뤋"#, r#"뤋"#, r#"뤋"#, r#"뤋"#, r#"뤋"#),
+        (r#"뤌"#, r#"뤌"#, r#"뤌"#, r#"뤌"#, r#"뤌"#),
+        (r#"뤍"#, r#"뤍"#, r#"뤍"#, r#"뤍"#, r#"뤍"#),
+        (r#"뤎"#, r#"뤎"#, r#"뤎"#, r#"뤎"#, r#"뤎"#),
+        (r#"뤏"#, r#"뤏"#, r#"뤏"#, r#"뤏"#, r#"뤏"#),
+        (r#"뤐"#, r#"뤐"#, r#"뤐"#, r#"뤐"#, r#"뤐"#),
+        (r#"뤑"#, r#"뤑"#, r#"뤑"#, r#"뤑"#, r#"뤑"#),
+        (r#"뤒"#, r#"뤒"#, r#"뤒"#, r#"뤒"#, r#"뤒"#),
+        (r#"뤓"#, r#"뤓"#, r#"뤓"#, r#"뤓"#, r#"뤓"#),
+        (r#"뤔"#, r#"뤔"#, r#"뤔"#, r#"뤔"#, r#"뤔"#),
+        (r#"뤕"#, r#"뤕"#, r#"뤕"#, r#"뤕"#, r#"뤕"#),
+        (r#"뤖"#, r#"뤖"#, r#"뤖"#, r#"뤖"#, r#"뤖"#),
+        (r#"뤗"#, r#"뤗"#, r#"뤗"#, r#"뤗"#, r#"뤗"#),
+        (r#"뤘"#, r#"뤘"#, r#"뤘"#, r#"뤘"#, r#"뤘"#),
+        (r#"뤙"#, r#"뤙"#, r#"뤙"#, r#"뤙"#, r#"뤙"#),
+        (r#"뤚"#, r#"뤚"#, r#"뤚"#, r#"뤚"#, r#"뤚"#),
+        (r#"뤛"#, r#"뤛"#, r#"뤛"#, r#"뤛"#, r#"뤛"#),
+        (r#"뤜"#, r#"뤜"#, r#"뤜"#, r#"뤜"#, r#"뤜"#),
+        (r#"뤝"#, r#"뤝"#, r#"뤝"#, r#"뤝"#, r#"뤝"#),
+        (r#"뤞"#, r#"뤞"#, r#"뤞"#, r#"뤞"#, r#"뤞"#),
+        (r#"뤟"#, r#"뤟"#, r#"뤟"#, r#"뤟"#, r#"뤟"#),
+        (r#"뤠"#, r#"뤠"#, r#"뤠"#, r#"뤠"#, r#"뤠"#),
+        (r#"뤡"#, r#"뤡"#, r#"뤡"#, r#"뤡"#, r#"뤡"#),
+        (r#"뤢"#, r#"뤢"#, r#"뤢"#, r#"뤢"#, r#"뤢"#),
+        (r#"뤣"#, r#"뤣"#, r#"뤣"#, r#"뤣"#, r#"뤣"#),
+        (r#"뤤"#, r#"뤤"#, r#"뤤"#, r#"뤤"#, r#"뤤"#),
+        (r#"뤥"#, r#"뤥"#, r#"뤥"#, r#"뤥"#, r#"뤥"#),
+        (r#"뤦"#, r#"뤦"#, r#"뤦"#, r#"뤦"#, r#"뤦"#),
+        (r#"뤧"#, r#"뤧"#, r#"뤧"#, r#"뤧"#, r#"뤧"#),
+        (r#"뤨"#, r#"뤨"#, r#"뤨"#, r#"뤨"#, r#"뤨"#),
+        (r#"뤩"#, r#"뤩"#, r#"뤩"#, r#"뤩"#, r#"뤩"#),
+        (r#"뤪"#, r#"뤪"#, r#"뤪"#, r#"뤪"#, r#"뤪"#),
+        (r#"뤫"#, r#"뤫"#, r#"뤫"#, r#"뤫"#, r#"뤫"#),
+        (r#"뤬"#, r#"뤬"#, r#"뤬"#, r#"뤬"#, r#"뤬"#),
+        (r#"뤭"#, r#"뤭"#, r#"뤭"#, r#"뤭"#, r#"뤭"#),
+        (r#"뤮"#, r#"뤮"#, r#"뤮"#, r#"뤮"#, r#"뤮"#),
+        (r#"뤯"#, r#"뤯"#, r#"뤯"#, r#"뤯"#, r#"뤯"#),
+        (r#"뤰"#, r#"뤰"#, r#"뤰"#, r#"뤰"#, r#"뤰"#),
+        (r#"뤱"#, r#"뤱"#, r#"뤱"#, r#"뤱"#, r#"뤱"#),
+        (r#"뤲"#, r#"뤲"#, r#"뤲"#, r#"뤲"#, r#"뤲"#),
+        (r#"뤳"#, r#"뤳"#, r#"뤳"#, r#"뤳"#, r#"뤳"#),
+        (r#"뤴"#, r#"뤴"#, r#"뤴"#, r#"뤴"#, r#"뤴"#),
+        (r#"뤵"#, r#"뤵"#, r#"뤵"#, r#"뤵"#, r#"뤵"#),
+        (r#"뤶"#, r#"뤶"#, r#"뤶"#, r#"뤶"#, r#"뤶"#),
+        (r#"뤷"#, r#"뤷"#, r#"뤷"#, r#"뤷"#, r#"뤷"#),
+        (r#"뤸"#, r#"뤸"#, r#"뤸"#, r#"뤸"#, r#"뤸"#),
+        (r#"뤹"#, r#"뤹"#, r#"뤹"#, r#"뤹"#, r#"뤹"#),
+        (r#"뤺"#, r#"뤺"#, r#"뤺"#, r#"뤺"#, r#"뤺"#),
+        (r#"뤻"#, r#"뤻"#, r#"뤻"#, r#"뤻"#, r#"뤻"#),
+        (r#"뤼"#, r#"뤼"#, r#"뤼"#, r#"뤼"#, r#"뤼"#),
+        (r#"뤽"#, r#"뤽"#, r#"뤽"#, r#"뤽"#, r#"뤽"#),
+        (r#"뤾"#, r#"뤾"#, r#"뤾"#, r#"뤾"#, r#"뤾"#),
+        (r#"뤿"#, r#"뤿"#, r#"뤿"#, r#"뤿"#, r#"뤿"#),
+        (r#"륀"#, r#"륀"#, r#"륀"#, r#"륀"#, r#"륀"#),
+        (r#"륁"#, r#"륁"#, r#"륁"#, r#"륁"#, r#"륁"#),
+        (r#"륂"#, r#"륂"#, r#"륂"#, r#"륂"#, r#"륂"#),
+        (r#"륃"#, r#"륃"#, r#"륃"#, r#"륃"#, r#"륃"#),
+        (r#"륄"#, r#"륄"#, r#"륄"#, r#"륄"#, r#"륄"#),
+        (r#"륅"#, r#"륅"#, r#"륅"#, r#"륅"#, r#"륅"#),
+        (r#"륆"#, r#"륆"#, r#"륆"#, r#"륆"#, r#"륆"#),
+        (r#"륇"#, r#"륇"#, r#"륇"#, r#"륇"#, r#"륇"#),
+        (r#"륈"#, r#"륈"#, r#"륈"#, r#"륈"#, r#"륈"#),
+        (r#"륉"#, r#"륉"#, r#"륉"#, r#"륉"#, r#"륉"#),
+        (r#"륊"#, r#"륊"#, r#"륊"#, r#"륊"#, r#"륊"#),
+        (r#"륋"#, r#"륋"#, r#"륋"#, r#"륋"#, r#"륋"#),
+        (r#"륌"#, r#"륌"#, r#"륌"#, r#"륌"#, r#"륌"#),
+        (r#"륍"#, r#"륍"#, r#"륍"#, r#"륍"#, r#"륍"#),
+        (r#"륎"#, r#"륎"#, r#"륎"#, r#"륎"#, r#"륎"#),
+        (r#"륏"#, r#"륏"#, r#"륏"#, r#"륏"#, r#"륏"#),
+        (r#"륐"#, r#"륐"#, r#"륐"#, r#"륐"#, r#"륐"#),
+        (r#"륑"#, r#"륑"#, r#"륑"#, r#"륑"#, r#"륑"#),
+        (r#"륒"#, r#"륒"#, r#"륒"#, r#"륒"#, r#"륒"#),
+        (r#"륓"#, r#"륓"#, r#"륓"#, r#"륓"#, r#"륓"#),
+        (r#"륔"#, r#"륔"#, r#"륔"#, r#"륔"#, r#"륔"#),
+        (r#"륕"#, r#"륕"#, r#"륕"#, r#"륕"#, r#"륕"#),
+        (r#"륖"#, r#"륖"#, r#"륖"#, r#"륖"#, r#"륖"#),
+        (r#"륗"#, r#"륗"#, r#"륗"#, r#"륗"#, r#"륗"#),
+        (r#"류"#, r#"류"#, r#"류"#, r#"류"#, r#"류"#),
+        (r#"륙"#, r#"륙"#, r#"륙"#, r#"륙"#, r#"륙"#),
+        (r#"륚"#, r#"륚"#, r#"륚"#, r#"륚"#, r#"륚"#),
+        (r#"륛"#, r#"륛"#, r#"륛"#, r#"륛"#, r#"륛"#),
+        (r#"륜"#, r#"륜"#, r#"륜"#, r#"륜"#, r#"륜"#),
+        (r#"륝"#, r#"륝"#, r#"륝"#, r#"륝"#, r#"륝"#),
+        (r#"륞"#, r#"륞"#, r#"륞"#, r#"륞"#, r#"륞"#),
+        (r#"륟"#, r#"륟"#, r#"륟"#, r#"륟"#, r#"륟"#),
+        (r#"률"#, r#"률"#, r#"률"#, r#"률"#, r#"률"#),
+        (r#"륡"#, r#"륡"#, r#"륡"#, r#"륡"#, r#"륡"#),
+        (r#"륢"#, r#"륢"#, r#"륢"#, r#"륢"#, r#"륢"#),
+        (r#"륣"#, r#"륣"#, r#"륣"#, r#"륣"#, r#"륣"#),
+        (r#"륤"#, r#"륤"#, r#"륤"#, r#"륤"#, r#"륤"#),
+        (r#"륥"#, r#"륥"#, r#"륥"#, r#"륥"#, r#"륥"#),
+        (r#"륦"#, r#"륦"#, r#"륦"#, r#"륦"#, r#"륦"#),
+        (r#"륧"#, r#"륧"#, r#"륧"#, r#"륧"#, r#"륧"#),
+        (r#"륨"#, r#"륨"#, r#"륨"#, r#"륨"#, r#"륨"#),
+        (r#"륩"#, r#"륩"#, r#"륩"#, r#"륩"#, r#"륩"#),
+        (r#"륪"#, r#"륪"#, r#"륪"#, r#"륪"#, r#"륪"#),
+        (r#"륫"#, r#"륫"#, r#"륫"#, r#"륫"#, r#"륫"#),
+        (r#"륬"#, r#"륬"#, r#"륬"#, r#"륬"#, r#"륬"#),
+        (r#"륭"#, r#"륭"#, r#"륭"#, r#"륭"#, r#"륭"#),
+        (r#"륮"#, r#"륮"#, r#"륮"#, r#"륮"#, r#"륮"#),
+        (r#"륯"#, r#"륯"#, r#"륯"#, r#"륯"#, r#"륯"#),
+        (r#"륰"#, r#"륰"#, r#"륰"#, r#"륰"#, r#"륰"#),
+        (r#"륱"#, r#"륱"#, r#"륱"#, r#"륱"#, r#"륱"#),
+        (r#"륲"#, r#"륲"#, r#"륲"#, r#"륲"#, r#"륲"#),
+        (r#"륳"#, r#"륳"#, r#"륳"#, r#"륳"#, r#"륳"#),
+        (r#"르"#, r#"르"#, r#"르"#, r#"르"#, r#"르"#),
+        (r#"륵"#, r#"륵"#, r#"륵"#, r#"륵"#, r#"륵"#),
+        (r#"륶"#, r#"륶"#, r#"륶"#, r#"륶"#, r#"륶"#),
+        (r#"륷"#, r#"륷"#, r#"륷"#, r#"륷"#, r#"륷"#),
+        (r#"른"#, r#"른"#, r#"른"#, r#"른"#, r#"른"#),
+        (r#"륹"#, r#"륹"#, r#"륹"#, r#"륹"#, r#"륹"#),
+        (r#"륺"#, r#"륺"#, r#"륺"#, r#"륺"#, r#"륺"#),
+        (r#"륻"#, r#"륻"#, r#"륻"#, r#"륻"#, r#"륻"#),
+        (r#"를"#, r#"를"#, r#"를"#, r#"를"#, r#"를"#),
+        (r#"륽"#, r#"륽"#, r#"륽"#, r#"륽"#, r#"륽"#),
+        (r#"륾"#, r#"륾"#, r#"륾"#, r#"륾"#, r#"륾"#),
+        (r#"륿"#, r#"륿"#, r#"륿"#, r#"륿"#, r#"륿"#),
+        (r#"릀"#, r#"릀"#, r#"릀"#, r#"릀"#, r#"릀"#),
+        (r#"릁"#, r#"릁"#, r#"릁"#, r#"릁"#, r#"릁"#),
+        (r#"릂"#, r#"릂"#, r#"릂"#, r#"릂"#, r#"릂"#),
+        (r#"릃"#, r#"릃"#, r#"릃"#, r#"릃"#, r#"릃"#),
+        (r#"름"#, r#"름"#, r#"름"#, r#"름"#, r#"름"#),
+        (r#"릅"#, r#"릅"#, r#"릅"#, r#"릅"#, r#"릅"#),
+        (r#"릆"#, r#"릆"#, r#"릆"#, r#"릆"#, r#"릆"#),
+        (r#"릇"#, r#"릇"#, r#"릇"#, r#"릇"#, r#"릇"#),
+        (r#"릈"#, r#"릈"#, r#"릈"#, r#"릈"#, r#"릈"#),
+        (r#"릉"#, r#"릉"#, r#"릉"#, r#"릉"#, r#"릉"#),
+        (r#"릊"#, r#"릊"#, r#"릊"#, r#"릊"#, r#"릊"#),
+        (r#"릋"#, r#"릋"#, r#"릋"#, r#"릋"#, r#"릋"#),
+        (r#"릌"#, r#"릌"#, r#"릌"#, r#"릌"#, r#"릌"#),
+        (r#"릍"#, r#"릍"#, r#"릍"#, r#"릍"#, r#"릍"#),
+        (r#"릎"#, r#"릎"#, r#"릎"#, r#"릎"#, r#"릎"#),
+        (r#"릏"#, r#"릏"#, r#"릏"#, r#"릏"#, r#"릏"#),
+        (r#"릐"#, r#"릐"#, r#"릐"#, r#"릐"#, r#"릐"#),
+        (r#"릑"#, r#"릑"#, r#"릑"#, r#"릑"#, r#"릑"#),
+        (r#"릒"#, r#"릒"#, r#"릒"#, r#"릒"#, r#"릒"#),
+        (r#"릓"#, r#"릓"#, r#"릓"#, r#"릓"#, r#"릓"#),
+        (r#"릔"#, r#"릔"#, r#"릔"#, r#"릔"#, r#"릔"#),
+        (r#"릕"#, r#"릕"#, r#"릕"#, r#"릕"#, r#"릕"#),
+        (r#"릖"#, r#"릖"#, r#"릖"#, r#"릖"#, r#"릖"#),
+        (r#"릗"#, r#"릗"#, r#"릗"#, r#"릗"#, r#"릗"#),
+        (r#"릘"#, r#"릘"#, r#"릘"#, r#"릘"#, r#"릘"#),
+        (r#"릙"#, r#"릙"#, r#"릙"#, r#"릙"#, r#"릙"#),
+        (r#"릚"#, r#"릚"#, r#"릚"#, r#"릚"#, r#"릚"#),
+        (r#"릛"#, r#"릛"#, r#"릛"#, r#"릛"#, r#"릛"#),
+        (r#"릜"#, r#"릜"#, r#"릜"#, r#"릜"#, r#"릜"#),
+        (r#"릝"#, r#"릝"#, r#"릝"#, r#"릝"#, r#"릝"#),
+        (r#"릞"#, r#"릞"#, r#"릞"#, r#"릞"#, r#"릞"#),
+        (r#"릟"#, r#"릟"#, r#"릟"#, r#"릟"#, r#"릟"#),
+        (r#"릠"#, r#"릠"#, r#"릠"#, r#"릠"#, r#"릠"#),
+        (r#"릡"#, r#"릡"#, r#"릡"#, r#"릡"#, r#"릡"#),
+        (r#"릢"#, r#"릢"#, r#"릢"#, r#"릢"#, r#"릢"#),
+        (r#"릣"#, r#"릣"#, r#"릣"#, r#"릣"#, r#"릣"#),
+        (r#"릤"#, r#"릤"#, r#"릤"#, r#"릤"#, r#"릤"#),
+        (r#"릥"#, r#"릥"#, r#"릥"#, r#"릥"#, r#"릥"#),
+        (r#"릦"#, r#"릦"#, r#"릦"#, r#"릦"#, r#"릦"#),
+        (r#"릧"#, r#"릧"#, r#"릧"#, r#"릧"#, r#"릧"#),
+        (r#"릨"#, r#"릨"#, r#"릨"#, r#"릨"#, r#"릨"#),
+        (r#"릩"#, r#"릩"#, r#"릩"#, r#"릩"#, r#"릩"#),
+        (r#"릪"#, r#"릪"#, r#"릪"#, r#"릪"#, r#"릪"#),
+        (r#"릫"#, r#"릫"#, r#"릫"#, r#"릫"#, r#"릫"#),
+        (r#"리"#, r#"리"#, r#"리"#, r#"리"#, r#"리"#),
+        (r#"릭"#, r#"릭"#, r#"릭"#, r#"릭"#, r#"릭"#),
+        (r#"릮"#, r#"릮"#, r#"릮"#, r#"릮"#, r#"릮"#),
+        (r#"릯"#, r#"릯"#, r#"릯"#, r#"릯"#, r#"릯"#),
+        (r#"린"#, r#"린"#, r#"린"#, r#"린"#, r#"린"#),
+        (r#"릱"#, r#"릱"#, r#"릱"#, r#"릱"#, r#"릱"#),
+        (r#"릲"#, r#"릲"#, r#"릲"#, r#"릲"#, r#"릲"#),
+        (r#"릳"#, r#"릳"#, r#"릳"#, r#"릳"#, r#"릳"#),
+        (r#"릴"#, r#"릴"#, r#"릴"#, r#"릴"#, r#"릴"#),
+        (r#"릵"#, r#"릵"#, r#"릵"#, r#"릵"#, r#"릵"#),
+        (r#"릶"#, r#"릶"#, r#"릶"#, r#"릶"#, r#"릶"#),
+        (r#"릷"#, r#"릷"#, r#"릷"#, r#"릷"#, r#"릷"#),
+        (r#"릸"#, r#"릸"#, r#"릸"#, r#"릸"#, r#"릸"#),
+        (r#"릹"#, r#"릹"#, r#"릹"#, r#"릹"#, r#"릹"#),
+        (r#"릺"#, r#"릺"#, r#"릺"#, r#"릺"#, r#"릺"#),
+        (r#"릻"#, r#"릻"#, r#"릻"#, r#"릻"#, r#"릻"#),
+        (r#"림"#, r#"림"#, r#"림"#, r#"림"#, r#"림"#),
+        (r#"립"#, r#"립"#, r#"립"#, r#"립"#, r#"립"#),
+        (r#"릾"#, r#"릾"#, r#"릾"#, r#"릾"#, r#"릾"#),
+        (r#"릿"#, r#"릿"#, r#"릿"#, r#"릿"#, r#"릿"#),
+        (r#"맀"#, r#"맀"#, r#"맀"#, r#"맀"#, r#"맀"#),
+        (r#"링"#, r#"링"#, r#"링"#, r#"링"#, r#"링"#),
+        (r#"맂"#, r#"맂"#, r#"맂"#, r#"맂"#, r#"맂"#),
+        (r#"맃"#, r#"맃"#, r#"맃"#, r#"맃"#, r#"맃"#),
+        (r#"맄"#, r#"맄"#, r#"맄"#, r#"맄"#, r#"맄"#),
+        (r#"맅"#, r#"맅"#, r#"맅"#, r#"맅"#, r#"맅"#),
+        (r#"맆"#, r#"맆"#, r#"맆"#, r#"맆"#, r#"맆"#),
+        (r#"맇"#, r#"맇"#, r#"맇"#, r#"맇"#, r#"맇"#),
+        (r#"마"#, r#"마"#, r#"마"#, r#"마"#, r#"마"#),
+        (r#"막"#, r#"막"#, r#"막"#, r#"막"#, r#"막"#),
+        (r#"맊"#, r#"맊"#, r#"맊"#, r#"맊"#, r#"맊"#),
+        (r#"맋"#, r#"맋"#, r#"맋"#, r#"맋"#, r#"맋"#),
+        (r#"만"#, r#"만"#, r#"만"#, r#"만"#, r#"만"#),
+        (r#"맍"#, r#"맍"#, r#"맍"#, r#"맍"#, r#"맍"#),
+        (r#"많"#, r#"많"#, r#"많"#, r#"많"#, r#"많"#),
+        (r#"맏"#, r#"맏"#, r#"맏"#, r#"맏"#, r#"맏"#),
+        (r#"말"#, r#"말"#, r#"말"#, r#"말"#, r#"말"#),
+        (r#"맑"#, r#"맑"#, r#"맑"#, r#"맑"#, r#"맑"#),
+        (r#"맒"#, r#"맒"#, r#"맒"#, r#"맒"#, r#"맒"#),
+        (r#"맓"#, r#"맓"#, r#"맓"#, r#"맓"#, r#"맓"#),
+        (r#"맔"#, r#"맔"#, r#"맔"#, r#"맔"#, r#"맔"#),
+        (r#"맕"#, r#"맕"#, r#"맕"#, r#"맕"#, r#"맕"#),
+        (r#"맖"#, r#"맖"#, r#"맖"#, r#"맖"#, r#"맖"#),
+        (r#"맗"#, r#"맗"#, r#"맗"#, r#"맗"#, r#"맗"#),
+        (r#"맘"#, r#"맘"#, r#"맘"#, r#"맘"#, r#"맘"#),
+        (r#"맙"#, r#"맙"#, r#"맙"#, r#"맙"#, r#"맙"#),
+        (r#"맚"#, r#"맚"#, r#"맚"#, r#"맚"#, r#"맚"#),
+        (r#"맛"#, r#"맛"#, r#"맛"#, r#"맛"#, r#"맛"#),
+        (r#"맜"#, r#"맜"#, r#"맜"#, r#"맜"#, r#"맜"#),
+        (r#"망"#, r#"망"#, r#"망"#, r#"망"#, r#"망"#),
+        (r#"맞"#, r#"맞"#, r#"맞"#, r#"맞"#, r#"맞"#),
+        (r#"맟"#, r#"맟"#, r#"맟"#, r#"맟"#, r#"맟"#),
+        (r#"맠"#, r#"맠"#, r#"맠"#, r#"맠"#, r#"맠"#),
+        (r#"맡"#, r#"맡"#, r#"맡"#, r#"맡"#, r#"맡"#),
+        (r#"맢"#, r#"맢"#, r#"맢"#, r#"맢"#, r#"맢"#),
+        (r#"맣"#, r#"맣"#, r#"맣"#, r#"맣"#, r#"맣"#),
+        (r#"매"#, r#"매"#, r#"매"#, r#"매"#, r#"매"#),
+        (r#"맥"#, r#"맥"#, r#"맥"#, r#"맥"#, r#"맥"#),
+        (r#"맦"#, r#"맦"#, r#"맦"#, r#"맦"#, r#"맦"#),
+        (r#"맧"#, r#"맧"#, r#"맧"#, r#"맧"#, r#"맧"#),
+        (r#"맨"#, r#"맨"#, r#"맨"#, r#"맨"#, r#"맨"#),
+        (r#"맩"#, r#"맩"#, r#"맩"#, r#"맩"#, r#"맩"#),
+        (r#"맪"#, r#"맪"#, r#"맪"#, r#"맪"#, r#"맪"#),
+        (r#"맫"#, r#"맫"#, r#"맫"#, r#"맫"#, r#"맫"#),
+        (r#"맬"#, r#"맬"#, r#"맬"#, r#"맬"#, r#"맬"#),
+        (r#"맭"#, r#"맭"#, r#"맭"#, r#"맭"#, r#"맭"#),
+        (r#"맮"#, r#"맮"#, r#"맮"#, r#"맮"#, r#"맮"#),
+        (r#"맯"#, r#"맯"#, r#"맯"#, r#"맯"#, r#"맯"#),
+        (r#"맰"#, r#"맰"#, r#"맰"#, r#"맰"#, r#"맰"#),
+        (r#"맱"#, r#"맱"#, r#"맱"#, r#"맱"#, r#"맱"#),
+        (r#"맲"#, r#"맲"#, r#"맲"#, r#"맲"#, r#"맲"#),
+        (r#"맳"#, r#"맳"#, r#"맳"#, r#"맳"#, r#"맳"#),
+        (r#"맴"#, r#"맴"#, r#"맴"#, r#"맴"#, r#"맴"#),
+        (r#"맵"#, r#"맵"#, r#"맵"#, r#"맵"#, r#"맵"#),
+        (r#"맶"#, r#"맶"#, r#"맶"#, r#"맶"#, r#"맶"#),
+        (r#"맷"#, r#"맷"#, r#"맷"#, r#"맷"#, r#"맷"#),
+        (r#"맸"#, r#"맸"#, r#"맸"#, r#"맸"#, r#"맸"#),
+        (r#"맹"#, r#"맹"#, r#"맹"#, r#"맹"#, r#"맹"#),
+        (r#"맺"#, r#"맺"#, r#"맺"#, r#"맺"#, r#"맺"#),
+        (r#"맻"#, r#"맻"#, r#"맻"#, r#"맻"#, r#"맻"#),
+        (r#"맼"#, r#"맼"#, r#"맼"#, r#"맼"#, r#"맼"#),
+        (r#"맽"#, r#"맽"#, r#"맽"#, r#"맽"#, r#"맽"#),
+        (r#"맾"#, r#"맾"#, r#"맾"#, r#"맾"#, r#"맾"#),
+        (r#"맿"#, r#"맿"#, r#"맿"#, r#"맿"#, r#"맿"#),
+        (r#"먀"#, r#"먀"#, r#"먀"#, r#"먀"#, r#"먀"#),
+        (r#"먁"#, r#"먁"#, r#"먁"#, r#"먁"#, r#"먁"#),
+        (r#"먂"#, r#"먂"#, r#"먂"#, r#"먂"#, r#"먂"#),
+        (r#"먃"#, r#"먃"#, r#"먃"#, r#"먃"#, r#"먃"#),
+        (r#"먄"#, r#"먄"#, r#"먄"#, r#"먄"#, r#"먄"#),
+        (r#"먅"#, r#"먅"#, r#"먅"#, r#"먅"#, r#"먅"#),
+        (r#"먆"#, r#"먆"#, r#"먆"#, r#"먆"#, r#"먆"#),
+        (r#"먇"#, r#"먇"#, r#"먇"#, r#"먇"#, r#"먇"#),
+        (r#"먈"#, r#"먈"#, r#"먈"#, r#"먈"#, r#"먈"#),
+        (r#"먉"#, r#"먉"#, r#"먉"#, r#"먉"#, r#"먉"#),
+        (r#"먊"#, r#"먊"#, r#"먊"#, r#"먊"#, r#"먊"#),
+        (r#"먋"#, r#"먋"#, r#"먋"#, r#"먋"#, r#"먋"#),
+        (r#"먌"#, r#"먌"#, r#"먌"#, r#"먌"#, r#"먌"#),
+        (r#"먍"#, r#"먍"#, r#"먍"#, r#"먍"#, r#"먍"#),
+        (r#"먎"#, r#"먎"#, r#"먎"#, r#"먎"#, r#"먎"#),
+        (r#"먏"#, r#"먏"#, r#"먏"#, r#"먏"#, r#"먏"#),
+        (r#"먐"#, r#"먐"#, r#"먐"#, r#"먐"#, r#"먐"#),
+        (r#"먑"#, r#"먑"#, r#"먑"#, r#"먑"#, r#"먑"#),
+        (r#"먒"#, r#"먒"#, r#"먒"#, r#"먒"#, r#"먒"#),
+        (r#"먓"#, r#"먓"#, r#"먓"#, r#"먓"#, r#"먓"#),
+        (r#"먔"#, r#"먔"#, r#"먔"#, r#"먔"#, r#"먔"#),
+        (r#"먕"#, r#"먕"#, r#"먕"#, r#"먕"#, r#"먕"#),
+        (r#"먖"#, r#"먖"#, r#"먖"#, r#"먖"#, r#"먖"#),
+        (r#"먗"#, r#"먗"#, r#"먗"#, r#"먗"#, r#"먗"#),
+        (r#"먘"#, r#"먘"#, r#"먘"#, r#"먘"#, r#"먘"#),
+        (r#"먙"#, r#"먙"#, r#"먙"#, r#"먙"#, r#"먙"#),
+        (r#"먚"#, r#"먚"#, r#"먚"#, r#"먚"#, r#"먚"#),
+        (r#"먛"#, r#"먛"#, r#"먛"#, r#"먛"#, r#"먛"#),
+        (r#"먜"#, r#"먜"#, r#"먜"#, r#"먜"#, r#"먜"#),
+        (r#"먝"#, r#"먝"#, r#"먝"#, r#"먝"#, r#"먝"#),
+        (r#"먞"#, r#"먞"#, r#"먞"#, r#"먞"#, r#"먞"#),
+        (r#"먟"#, r#"먟"#, r#"먟"#, r#"먟"#, r#"먟"#),
+        (r#"먠"#, r#"먠"#, r#"먠"#, r#"먠"#, r#"먠"#),
+        (r#"먡"#, r#"먡"#, r#"먡"#, r#"먡"#, r#"먡"#),
+        (r#"먢"#, r#"먢"#, r#"먢"#, r#"먢"#, r#"먢"#),
+        (r#"먣"#, r#"먣"#, r#"먣"#, r#"먣"#, r#"먣"#),
+        (r#"먤"#, r#"먤"#, r#"먤"#, r#"먤"#, r#"먤"#),
+        (r#"먥"#, r#"먥"#, r#"먥"#, r#"먥"#, r#"먥"#),
+        (r#"먦"#, r#"먦"#, r#"먦"#, r#"먦"#, r#"먦"#),
+        (r#"먧"#, r#"먧"#, r#"먧"#, r#"먧"#, r#"먧"#),
+        (r#"먨"#, r#"먨"#, r#"먨"#, r#"먨"#, r#"먨"#),
+        (r#"먩"#, r#"먩"#, r#"먩"#, r#"먩"#, r#"먩"#),
+        (r#"먪"#, r#"먪"#, r#"먪"#, r#"먪"#, r#"먪"#),
+        (r#"먫"#, r#"먫"#, r#"먫"#, r#"먫"#, r#"먫"#),
+        (r#"먬"#, r#"먬"#, r#"먬"#, r#"먬"#, r#"먬"#),
+        (r#"먭"#, r#"먭"#, r#"먭"#, r#"먭"#, r#"먭"#),
+        (r#"먮"#, r#"먮"#, r#"먮"#, r#"먮"#, r#"먮"#),
+        (r#"먯"#, r#"먯"#, r#"먯"#, r#"먯"#, r#"먯"#),
+        (r#"먰"#, r#"먰"#, r#"먰"#, r#"먰"#, r#"먰"#),
+        (r#"먱"#, r#"먱"#, r#"먱"#, r#"먱"#, r#"먱"#),
+        (r#"먲"#, r#"먲"#, r#"먲"#, r#"먲"#, r#"먲"#),
+        (r#"먳"#, r#"먳"#, r#"먳"#, r#"먳"#, r#"먳"#),
+        (r#"먴"#, r#"먴"#, r#"먴"#, r#"먴"#, r#"먴"#),
+        (r#"먵"#, r#"먵"#, r#"먵"#, r#"먵"#, r#"먵"#),
+        (r#"먶"#, r#"먶"#, r#"먶"#, r#"먶"#, r#"먶"#),
+        (r#"먷"#, r#"먷"#, r#"먷"#, r#"먷"#, r#"먷"#),
+        (r#"머"#, r#"머"#, r#"머"#, r#"머"#, r#"머"#),
+        (r#"먹"#, r#"먹"#, r#"먹"#, r#"먹"#, r#"먹"#),
+        (r#"먺"#, r#"먺"#, r#"먺"#, r#"먺"#, r#"먺"#),
+        (r#"먻"#, r#"먻"#, r#"먻"#, r#"먻"#, r#"먻"#),
+        (r#"먼"#, r#"먼"#, r#"먼"#, r#"먼"#, r#"먼"#),
+        (r#"먽"#, r#"먽"#, r#"먽"#, r#"먽"#, r#"먽"#),
+        (r#"먾"#, r#"먾"#, r#"먾"#, r#"먾"#, r#"먾"#),
+        (r#"먿"#, r#"먿"#, r#"먿"#, r#"먿"#, r#"먿"#),
+        (r#"멀"#, r#"멀"#, r#"멀"#, r#"멀"#, r#"멀"#),
+        (r#"멁"#, r#"멁"#, r#"멁"#, r#"멁"#, r#"멁"#),
+        (r#"멂"#, r#"멂"#, r#"멂"#, r#"멂"#, r#"멂"#),
+        (r#"멃"#, r#"멃"#, r#"멃"#, r#"멃"#, r#"멃"#),
+        (r#"멄"#, r#"멄"#, r#"멄"#, r#"멄"#, r#"멄"#),
+        (r#"멅"#, r#"멅"#, r#"멅"#, r#"멅"#, r#"멅"#),
+        (r#"멆"#, r#"멆"#, r#"멆"#, r#"멆"#, r#"멆"#),
+        (r#"멇"#, r#"멇"#, r#"멇"#, r#"멇"#, r#"멇"#),
+        (r#"멈"#, r#"멈"#, r#"멈"#, r#"멈"#, r#"멈"#),
+        (r#"멉"#, r#"멉"#, r#"멉"#, r#"멉"#, r#"멉"#),
+        (r#"멊"#, r#"멊"#, r#"멊"#, r#"멊"#, r#"멊"#),
+        (r#"멋"#, r#"멋"#, r#"멋"#, r#"멋"#, r#"멋"#),
+        (r#"멌"#, r#"멌"#, r#"멌"#, r#"멌"#, r#"멌"#),
+        (r#"멍"#, r#"멍"#, r#"멍"#, r#"멍"#, r#"멍"#),
+        (r#"멎"#, r#"멎"#, r#"멎"#, r#"멎"#, r#"멎"#),
+        (r#"멏"#, r#"멏"#, r#"멏"#, r#"멏"#, r#"멏"#),
+        (r#"멐"#, r#"멐"#, r#"멐"#, r#"멐"#, r#"멐"#),
+        (r#"멑"#, r#"멑"#, r#"멑"#, r#"멑"#, r#"멑"#),
+        (r#"멒"#, r#"멒"#, r#"멒"#, r#"멒"#, r#"멒"#),
+        (r#"멓"#, r#"멓"#, r#"멓"#, r#"멓"#, r#"멓"#),
+        (r#"메"#, r#"메"#, r#"메"#, r#"메"#, r#"메"#),
+        (r#"멕"#, r#"멕"#, r#"멕"#, r#"멕"#, r#"멕"#),
+        (r#"멖"#, r#"멖"#, r#"멖"#, r#"멖"#, r#"멖"#),
+        (r#"멗"#, r#"멗"#, r#"멗"#, r#"멗"#, r#"멗"#),
+        (r#"멘"#, r#"멘"#, r#"멘"#, r#"멘"#, r#"멘"#),
+        (r#"멙"#, r#"멙"#, r#"멙"#, r#"멙"#, r#"멙"#),
+        (r#"멚"#, r#"멚"#, r#"멚"#, r#"멚"#, r#"멚"#),
+        (r#"멛"#, r#"멛"#, r#"멛"#, r#"멛"#, r#"멛"#),
+        (r#"멜"#, r#"멜"#, r#"멜"#, r#"멜"#, r#"멜"#),
+        (r#"멝"#, r#"멝"#, r#"멝"#, r#"멝"#, r#"멝"#),
+        (r#"멞"#, r#"멞"#, r#"멞"#, r#"멞"#, r#"멞"#),
+        (r#"멟"#, r#"멟"#, r#"멟"#, r#"멟"#, r#"멟"#),
+        (r#"멠"#, r#"멠"#, r#"멠"#, r#"멠"#, r#"멠"#),
+        (r#"멡"#, r#"멡"#, r#"멡"#, r#"멡"#, r#"멡"#),
+        (r#"멢"#, r#"멢"#, r#"멢"#, r#"멢"#, r#"멢"#),
+        (r#"멣"#, r#"멣"#, r#"멣"#, r#"멣"#, r#"멣"#),
+        (r#"멤"#, r#"멤"#, r#"멤"#, r#"멤"#, r#"멤"#),
+        (r#"멥"#, r#"멥"#, r#"멥"#, r#"멥"#, r#"멥"#),
+        (r#"멦"#, r#"멦"#, r#"멦"#, r#"멦"#, r#"멦"#),
+        (r#"멧"#, r#"멧"#, r#"멧"#, r#"멧"#, r#"멧"#),
+        (r#"멨"#, r#"멨"#, r#"멨"#, r#"멨"#, r#"멨"#),
+        (r#"멩"#, r#"멩"#, r#"멩"#, r#"멩"#, r#"멩"#),
+        (r#"멪"#, r#"멪"#, r#"멪"#, r#"멪"#, r#"멪"#),
+        (r#"멫"#, r#"멫"#, r#"멫"#, r#"멫"#, r#"멫"#),
+        (r#"멬"#, r#"멬"#, r#"멬"#, r#"멬"#, r#"멬"#),
+        (r#"멭"#, r#"멭"#, r#"멭"#, r#"멭"#, r#"멭"#),
+        (r#"멮"#, r#"멮"#, r#"멮"#, r#"멮"#, r#"멮"#),
+        (r#"멯"#, r#"멯"#, r#"멯"#, r#"멯"#, r#"멯"#),
+        (r#"며"#, r#"며"#, r#"며"#, r#"며"#, r#"며"#),
+        (r#"멱"#, r#"멱"#, r#"멱"#, r#"멱"#, r#"멱"#),
+        (r#"멲"#, r#"멲"#, r#"멲"#, r#"멲"#, r#"멲"#),
+        (r#"멳"#, r#"멳"#, r#"멳"#, r#"멳"#, r#"멳"#),
+        (r#"면"#, r#"면"#, r#"면"#, r#"면"#, r#"면"#),
+        (r#"멵"#, r#"멵"#, r#"멵"#, r#"멵"#, r#"멵"#),
+        (r#"멶"#, r#"멶"#, r#"멶"#, r#"멶"#, r#"멶"#),
+        (r#"멷"#, r#"멷"#, r#"멷"#, r#"멷"#, r#"멷"#),
+        (r#"멸"#, r#"멸"#, r#"멸"#, r#"멸"#, r#"멸"#),
+        (r#"멹"#, r#"멹"#, r#"멹"#, r#"멹"#, r#"멹"#),
+        (r#"멺"#, r#"멺"#, r#"멺"#, r#"멺"#, r#"멺"#),
+        (r#"멻"#, r#"멻"#, r#"멻"#, r#"멻"#, r#"멻"#),
+        (r#"멼"#, r#"멼"#, r#"멼"#, r#"멼"#, r#"멼"#),
+        (r#"멽"#, r#"멽"#, r#"멽"#, r#"멽"#, r#"멽"#),
+        (r#"멾"#, r#"멾"#, r#"멾"#, r#"멾"#, r#"멾"#),
+        (r#"멿"#, r#"멿"#, r#"멿"#, r#"멿"#, r#"멿"#),
+        (r#"몀"#, r#"몀"#, r#"몀"#, r#"몀"#, r#"몀"#),
+        (r#"몁"#, r#"몁"#, r#"몁"#, r#"몁"#, r#"몁"#),
+        (r#"몂"#, r#"몂"#, r#"몂"#, r#"몂"#, r#"몂"#),
+        (r#"몃"#, r#"몃"#, r#"몃"#, r#"몃"#, r#"몃"#),
+        (r#"몄"#, r#"몄"#, r#"몄"#, r#"몄"#, r#"몄"#),
+        (r#"명"#, r#"명"#, r#"명"#, r#"명"#, r#"명"#),
+        (r#"몆"#, r#"몆"#, r#"몆"#, r#"몆"#, r#"몆"#),
+        (r#"몇"#, r#"몇"#, r#"몇"#, r#"몇"#, r#"몇"#),
+        (r#"몈"#, r#"몈"#, r#"몈"#, r#"몈"#, r#"몈"#),
+        (r#"몉"#, r#"몉"#, r#"몉"#, r#"몉"#, r#"몉"#),
+        (r#"몊"#, r#"몊"#, r#"몊"#, r#"몊"#, r#"몊"#),
+        (r#"몋"#, r#"몋"#, r#"몋"#, r#"몋"#, r#"몋"#),
+        (r#"몌"#, r#"몌"#, r#"몌"#, r#"몌"#, r#"몌"#),
+        (r#"몍"#, r#"몍"#, r#"몍"#, r#"몍"#, r#"몍"#),
+        (r#"몎"#, r#"몎"#, r#"몎"#, r#"몎"#, r#"몎"#),
+        (r#"몏"#, r#"몏"#, r#"몏"#, r#"몏"#, r#"몏"#),
+        (r#"몐"#, r#"몐"#, r#"몐"#, r#"몐"#, r#"몐"#),
+        (r#"몑"#, r#"몑"#, r#"몑"#, r#"몑"#, r#"몑"#),
+        (r#"몒"#, r#"몒"#, r#"몒"#, r#"몒"#, r#"몒"#),
+        (r#"몓"#, r#"몓"#, r#"몓"#, r#"몓"#, r#"몓"#),
+        (r#"몔"#, r#"몔"#, r#"몔"#, r#"몔"#, r#"몔"#),
+        (r#"몕"#, r#"몕"#, r#"몕"#, r#"몕"#, r#"몕"#),
+        (r#"몖"#, r#"몖"#, r#"몖"#, r#"몖"#, r#"몖"#),
+        (r#"몗"#, r#"몗"#, r#"몗"#, r#"몗"#, r#"몗"#),
+        (r#"몘"#, r#"몘"#, r#"몘"#, r#"몘"#, r#"몘"#),
+        (r#"몙"#, r#"몙"#, r#"몙"#, r#"몙"#, r#"몙"#),
+        (r#"몚"#, r#"몚"#, r#"몚"#, r#"몚"#, r#"몚"#),
+        (r#"몛"#, r#"몛"#, r#"몛"#, r#"몛"#, r#"몛"#),
+        (r#"몜"#, r#"몜"#, r#"몜"#, r#"몜"#, r#"몜"#),
+        (r#"몝"#, r#"몝"#, r#"몝"#, r#"몝"#, r#"몝"#),
+        (r#"몞"#, r#"몞"#, r#"몞"#, r#"몞"#, r#"몞"#),
+        (r#"몟"#, r#"몟"#, r#"몟"#, r#"몟"#, r#"몟"#),
+        (r#"몠"#, r#"몠"#, r#"몠"#, r#"몠"#, r#"몠"#),
+        (r#"몡"#, r#"몡"#, r#"몡"#, r#"몡"#, r#"몡"#),
+        (r#"몢"#, r#"몢"#, r#"몢"#, r#"몢"#, r#"몢"#),
+        (r#"몣"#, r#"몣"#, r#"몣"#, r#"몣"#, r#"몣"#),
+        (r#"몤"#, r#"몤"#, r#"몤"#, r#"몤"#, r#"몤"#),
+        (r#"몥"#, r#"몥"#, r#"몥"#, r#"몥"#, r#"몥"#),
+        (r#"몦"#, r#"몦"#, r#"몦"#, r#"몦"#, r#"몦"#),
+        (r#"몧"#, r#"몧"#, r#"몧"#, r#"몧"#, r#"몧"#),
+        (r#"모"#, r#"모"#, r#"모"#, r#"모"#, r#"모"#),
+        (r#"목"#, r#"목"#, r#"목"#, r#"목"#, r#"목"#),
+        (r#"몪"#, r#"몪"#, r#"몪"#, r#"몪"#, r#"몪"#),
+        (r#"몫"#, r#"몫"#, r#"몫"#, r#"몫"#, r#"몫"#),
+        (r#"몬"#, r#"몬"#, r#"몬"#, r#"몬"#, r#"몬"#),
+        (r#"몭"#, r#"몭"#, r#"몭"#, r#"몭"#, r#"몭"#),
+        (r#"몮"#, r#"몮"#, r#"몮"#, r#"몮"#, r#"몮"#),
+        (r#"몯"#, r#"몯"#, r#"몯"#, r#"몯"#, r#"몯"#),
+        (r#"몰"#, r#"몰"#, r#"몰"#, r#"몰"#, r#"몰"#),
+        (r#"몱"#, r#"몱"#, r#"몱"#, r#"몱"#, r#"몱"#),
+        (r#"몲"#, r#"몲"#, r#"몲"#, r#"몲"#, r#"몲"#),
+        (r#"몳"#, r#"몳"#, r#"몳"#, r#"몳"#, r#"몳"#),
+        (r#"몴"#, r#"몴"#, r#"몴"#, r#"몴"#, r#"몴"#),
+        (r#"몵"#, r#"몵"#, r#"몵"#, r#"몵"#, r#"몵"#),
+        (r#"몶"#, r#"몶"#, r#"몶"#, r#"몶"#, r#"몶"#),
+        (r#"몷"#, r#"몷"#, r#"몷"#, r#"몷"#, r#"몷"#),
+        (r#"몸"#, r#"몸"#, r#"몸"#, r#"몸"#, r#"몸"#),
+        (r#"몹"#, r#"몹"#, r#"몹"#, r#"몹"#, r#"몹"#),
+        (r#"몺"#, r#"몺"#, r#"몺"#, r#"몺"#, r#"몺"#),
+        (r#"못"#, r#"못"#, r#"못"#, r#"못"#, r#"못"#),
+        (r#"몼"#, r#"몼"#, r#"몼"#, r#"몼"#, r#"몼"#),
+        (r#"몽"#, r#"몽"#, r#"몽"#, r#"몽"#, r#"몽"#),
+        (r#"몾"#, r#"몾"#, r#"몾"#, r#"몾"#, r#"몾"#),
+        (r#"몿"#, r#"몿"#, r#"몿"#, r#"몿"#, r#"몿"#),
+        (r#"뫀"#, r#"뫀"#, r#"뫀"#, r#"뫀"#, r#"뫀"#),
+        (r#"뫁"#, r#"뫁"#, r#"뫁"#, r#"뫁"#, r#"뫁"#),
+        (r#"뫂"#, r#"뫂"#, r#"뫂"#, r#"뫂"#, r#"뫂"#),
+        (r#"뫃"#, r#"뫃"#, r#"뫃"#, r#"뫃"#, r#"뫃"#),
+        (r#"뫄"#, r#"뫄"#, r#"뫄"#, r#"뫄"#, r#"뫄"#),
+        (r#"뫅"#, r#"뫅"#, r#"뫅"#, r#"뫅"#, r#"뫅"#),
+        (r#"뫆"#, r#"뫆"#, r#"뫆"#, r#"뫆"#, r#"뫆"#),
+        (r#"뫇"#, r#"뫇"#, r#"뫇"#, r#"뫇"#, r#"뫇"#),
+        (r#"뫈"#, r#"뫈"#, r#"뫈"#, r#"뫈"#, r#"뫈"#),
+        (r#"뫉"#, r#"뫉"#, r#"뫉"#, r#"뫉"#, r#"뫉"#),
+        (r#"뫊"#, r#"뫊"#, r#"뫊"#, r#"뫊"#, r#"뫊"#),
+        (r#"뫋"#, r#"뫋"#, r#"뫋"#, r#"뫋"#, r#"뫋"#),
+        (r#"뫌"#, r#"뫌"#, r#"뫌"#, r#"뫌"#, r#"뫌"#),
+        (r#"뫍"#, r#"뫍"#, r#"뫍"#, r#"뫍"#, r#"뫍"#),
+        (r#"뫎"#, r#"뫎"#, r#"뫎"#, r#"뫎"#, r#"뫎"#),
+        (r#"뫏"#, r#"뫏"#, r#"뫏"#, r#"뫏"#, r#"뫏"#),
+        (r#"뫐"#, r#"뫐"#, r#"뫐"#, r#"뫐"#, r#"뫐"#),
+        (r#"뫑"#, r#"뫑"#, r#"뫑"#, r#"뫑"#, r#"뫑"#),
+        (r#"뫒"#, r#"뫒"#, r#"뫒"#, r#"뫒"#, r#"뫒"#),
+        (r#"뫓"#, r#"뫓"#, r#"뫓"#, r#"뫓"#, r#"뫓"#),
+        (r#"뫔"#, r#"뫔"#, r#"뫔"#, r#"뫔"#, r#"뫔"#),
+        (r#"뫕"#, r#"뫕"#, r#"뫕"#, r#"뫕"#, r#"뫕"#),
+        (r#"뫖"#, r#"뫖"#, r#"뫖"#, r#"뫖"#, r#"뫖"#),
+        (r#"뫗"#, r#"뫗"#, r#"뫗"#, r#"뫗"#, r#"뫗"#),
+        (r#"뫘"#, r#"뫘"#, r#"뫘"#, r#"뫘"#, r#"뫘"#),
+        (r#"뫙"#, r#"뫙"#, r#"뫙"#, r#"뫙"#, r#"뫙"#),
+        (r#"뫚"#, r#"뫚"#, r#"뫚"#, r#"뫚"#, r#"뫚"#),
+        (r#"뫛"#, r#"뫛"#, r#"뫛"#, r#"뫛"#, r#"뫛"#),
+        (r#"뫜"#, r#"뫜"#, r#"뫜"#, r#"뫜"#, r#"뫜"#),
+        (r#"뫝"#, r#"뫝"#, r#"뫝"#, r#"뫝"#, r#"뫝"#),
+        (r#"뫞"#, r#"뫞"#, r#"뫞"#, r#"뫞"#, r#"뫞"#),
+        (r#"뫟"#, r#"뫟"#, r#"뫟"#, r#"뫟"#, r#"뫟"#),
+        (r#"뫠"#, r#"뫠"#, r#"뫠"#, r#"뫠"#, r#"뫠"#),
+        (r#"뫡"#, r#"뫡"#, r#"뫡"#, r#"뫡"#, r#"뫡"#),
+        (r#"뫢"#, r#"뫢"#, r#"뫢"#, r#"뫢"#, r#"뫢"#),
+        (r#"뫣"#, r#"뫣"#, r#"뫣"#, r#"뫣"#, r#"뫣"#),
+        (r#"뫤"#, r#"뫤"#, r#"뫤"#, r#"뫤"#, r#"뫤"#),
+        (r#"뫥"#, r#"뫥"#, r#"뫥"#, r#"뫥"#, r#"뫥"#),
+        (r#"뫦"#, r#"뫦"#, r#"뫦"#, r#"뫦"#, r#"뫦"#),
+        (r#"뫧"#, r#"뫧"#, r#"뫧"#, r#"뫧"#, r#"뫧"#),
+        (r#"뫨"#, r#"뫨"#, r#"뫨"#, r#"뫨"#, r#"뫨"#),
+        (r#"뫩"#, r#"뫩"#, r#"뫩"#, r#"뫩"#, r#"뫩"#),
+        (r#"뫪"#, r#"뫪"#, r#"뫪"#, r#"뫪"#, r#"뫪"#),
+        (r#"뫫"#, r#"뫫"#, r#"뫫"#, r#"뫫"#, r#"뫫"#),
+        (r#"뫬"#, r#"뫬"#, r#"뫬"#, r#"뫬"#, r#"뫬"#),
+        (r#"뫭"#, r#"뫭"#, r#"뫭"#, r#"뫭"#, r#"뫭"#),
+        (r#"뫮"#, r#"뫮"#, r#"뫮"#, r#"뫮"#, r#"뫮"#),
+        (r#"뫯"#, r#"뫯"#, r#"뫯"#, r#"뫯"#, r#"뫯"#),
+        (r#"뫰"#, r#"뫰"#, r#"뫰"#, r#"뫰"#, r#"뫰"#),
+        (r#"뫱"#, r#"뫱"#, r#"뫱"#, r#"뫱"#, r#"뫱"#),
+        (r#"뫲"#, r#"뫲"#, r#"뫲"#, r#"뫲"#, r#"뫲"#),
+        (r#"뫳"#, r#"뫳"#, r#"뫳"#, r#"뫳"#, r#"뫳"#),
+        (r#"뫴"#, r#"뫴"#, r#"뫴"#, r#"뫴"#, r#"뫴"#),
+        (r#"뫵"#, r#"뫵"#, r#"뫵"#, r#"뫵"#, r#"뫵"#),
+        (r#"뫶"#, r#"뫶"#, r#"뫶"#, r#"뫶"#, r#"뫶"#),
+        (r#"뫷"#, r#"뫷"#, r#"뫷"#, r#"뫷"#, r#"뫷"#),
+        (r#"뫸"#, r#"뫸"#, r#"뫸"#, r#"뫸"#, r#"뫸"#),
+        (r#"뫹"#, r#"뫹"#, r#"뫹"#, r#"뫹"#, r#"뫹"#),
+        (r#"뫺"#, r#"뫺"#, r#"뫺"#, r#"뫺"#, r#"뫺"#),
+        (r#"뫻"#, r#"뫻"#, r#"뫻"#, r#"뫻"#, r#"뫻"#),
+        (r#"뫼"#, r#"뫼"#, r#"뫼"#, r#"뫼"#, r#"뫼"#),
+        (r#"뫽"#, r#"뫽"#, r#"뫽"#, r#"뫽"#, r#"뫽"#),
+        (r#"뫾"#, r#"뫾"#, r#"뫾"#, r#"뫾"#, r#"뫾"#),
+        (r#"뫿"#, r#"뫿"#, r#"뫿"#, r#"뫿"#, r#"뫿"#),
+        (r#"묀"#, r#"묀"#, r#"묀"#, r#"묀"#, r#"묀"#),
+        (r#"묁"#, r#"묁"#, r#"묁"#, r#"묁"#, r#"묁"#),
+        (r#"묂"#, r#"묂"#, r#"묂"#, r#"묂"#, r#"묂"#),
+        (r#"묃"#, r#"묃"#, r#"묃"#, r#"묃"#, r#"묃"#),
+        (r#"묄"#, r#"묄"#, r#"묄"#, r#"묄"#, r#"묄"#),
+        (r#"묅"#, r#"묅"#, r#"묅"#, r#"묅"#, r#"묅"#),
+        (r#"묆"#, r#"묆"#, r#"묆"#, r#"묆"#, r#"묆"#),
+        (r#"묇"#, r#"묇"#, r#"묇"#, r#"묇"#, r#"묇"#),
+        (r#"묈"#, r#"묈"#, r#"묈"#, r#"묈"#, r#"묈"#),
+        (r#"묉"#, r#"묉"#, r#"묉"#, r#"묉"#, r#"묉"#),
+        (r#"묊"#, r#"묊"#, r#"묊"#, r#"묊"#, r#"묊"#),
+        (r#"묋"#, r#"묋"#, r#"묋"#, r#"묋"#, r#"묋"#),
+        (r#"묌"#, r#"묌"#, r#"묌"#, r#"묌"#, r#"묌"#),
+        (r#"묍"#, r#"묍"#, r#"묍"#, r#"묍"#, r#"묍"#),
+        (r#"묎"#, r#"묎"#, r#"묎"#, r#"묎"#, r#"묎"#),
+        (r#"묏"#, r#"묏"#, r#"묏"#, r#"묏"#, r#"묏"#),
+        (r#"묐"#, r#"묐"#, r#"묐"#, r#"묐"#, r#"묐"#),
+        (r#"묑"#, r#"묑"#, r#"묑"#, r#"묑"#, r#"묑"#),
+        (r#"묒"#, r#"묒"#, r#"묒"#, r#"묒"#, r#"묒"#),
+        (r#"묓"#, r#"묓"#, r#"묓"#, r#"묓"#, r#"묓"#),
+        (r#"묔"#, r#"묔"#, r#"묔"#, r#"묔"#, r#"묔"#),
+        (r#"묕"#, r#"묕"#, r#"묕"#, r#"묕"#, r#"묕"#),
+        (r#"묖"#, r#"묖"#, r#"묖"#, r#"묖"#, r#"묖"#),
+        (r#"묗"#, r#"묗"#, r#"묗"#, r#"묗"#, r#"묗"#),
+        (r#"묘"#, r#"묘"#, r#"묘"#, r#"묘"#, r#"묘"#),
+        (r#"묙"#, r#"묙"#, r#"묙"#, r#"묙"#, r#"묙"#),
+        (r#"묚"#, r#"묚"#, r#"묚"#, r#"묚"#, r#"묚"#),
+        (r#"묛"#, r#"묛"#, r#"묛"#, r#"묛"#, r#"묛"#),
+        (r#"묜"#, r#"묜"#, r#"묜"#, r#"묜"#, r#"묜"#),
+        (r#"묝"#, r#"묝"#, r#"묝"#, r#"묝"#, r#"묝"#),
+        (r#"묞"#, r#"묞"#, r#"묞"#, r#"묞"#, r#"묞"#),
+        (r#"묟"#, r#"묟"#, r#"묟"#, r#"묟"#, r#"묟"#),
+        (r#"묠"#, r#"묠"#, r#"묠"#, r#"묠"#, r#"묠"#),
+        (r#"묡"#, r#"묡"#, r#"묡"#, r#"묡"#, r#"묡"#),
+        (r#"묢"#, r#"묢"#, r#"묢"#, r#"묢"#, r#"묢"#),
+        (r#"묣"#, r#"묣"#, r#"묣"#, r#"묣"#, r#"묣"#),
+        (r#"묤"#, r#"묤"#, r#"묤"#, r#"묤"#, r#"묤"#),
+        (r#"묥"#, r#"묥"#, r#"묥"#, r#"묥"#, r#"묥"#),
+        (r#"묦"#, r#"묦"#, r#"묦"#, r#"묦"#, r#"묦"#),
+        (r#"묧"#, r#"묧"#, r#"묧"#, r#"묧"#, r#"묧"#),
+        (r#"묨"#, r#"묨"#, r#"묨"#, r#"묨"#, r#"묨"#),
+        (r#"묩"#, r#"묩"#, r#"묩"#, r#"묩"#, r#"묩"#),
+        (r#"묪"#, r#"묪"#, r#"묪"#, r#"묪"#, r#"묪"#),
+        (r#"묫"#, r#"묫"#, r#"묫"#, r#"묫"#, r#"묫"#),
+        (r#"묬"#, r#"묬"#, r#"묬"#, r#"묬"#, r#"묬"#),
+        (r#"묭"#, r#"묭"#, r#"묭"#, r#"묭"#, r#"묭"#),
+        (r#"묮"#, r#"묮"#, r#"묮"#, r#"묮"#, r#"묮"#),
+        (r#"묯"#, r#"묯"#, r#"묯"#, r#"묯"#, r#"묯"#),
+        (r#"묰"#, r#"묰"#, r#"묰"#, r#"묰"#, r#"묰"#),
+        (r#"묱"#, r#"묱"#, r#"묱"#, r#"묱"#, r#"묱"#),
+        (r#"묲"#, r#"묲"#, r#"묲"#, r#"묲"#, r#"묲"#),
+        (r#"묳"#, r#"묳"#, r#"묳"#, r#"묳"#, r#"묳"#),
+        (r#"무"#, r#"무"#, r#"무"#, r#"무"#, r#"무"#),
+        (r#"묵"#, r#"묵"#, r#"묵"#, r#"묵"#, r#"묵"#),
+        (r#"묶"#, r#"묶"#, r#"묶"#, r#"묶"#, r#"묶"#),
+        (r#"묷"#, r#"묷"#, r#"묷"#, r#"묷"#, r#"묷"#),
+        (r#"문"#, r#"문"#, r#"문"#, r#"문"#, r#"문"#),
+        (r#"묹"#, r#"묹"#, r#"묹"#, r#"묹"#, r#"묹"#),
+        (r#"묺"#, r#"묺"#, r#"묺"#, r#"묺"#, r#"묺"#),
+        (r#"묻"#, r#"묻"#, r#"묻"#, r#"묻"#, r#"묻"#),
+        (r#"물"#, r#"물"#, r#"물"#, r#"물"#, r#"물"#),
+        (r#"묽"#, r#"묽"#, r#"묽"#, r#"묽"#, r#"묽"#),
+        (r#"묾"#, r#"묾"#, r#"묾"#, r#"묾"#, r#"묾"#),
+        (r#"묿"#, r#"묿"#, r#"묿"#, r#"묿"#, r#"묿"#),
+        (r#"뭀"#, r#"뭀"#, r#"뭀"#, r#"뭀"#, r#"뭀"#),
+        (r#"뭁"#, r#"뭁"#, r#"뭁"#, r#"뭁"#, r#"뭁"#),
+        (r#"뭂"#, r#"뭂"#, r#"뭂"#, r#"뭂"#, r#"뭂"#),
+        (r#"뭃"#, r#"뭃"#, r#"뭃"#, r#"뭃"#, r#"뭃"#),
+        (r#"뭄"#, r#"뭄"#, r#"뭄"#, r#"뭄"#, r#"뭄"#),
+        (r#"뭅"#, r#"뭅"#, r#"뭅"#, r#"뭅"#, r#"뭅"#),
+        (r#"뭆"#, r#"뭆"#, r#"뭆"#, r#"뭆"#, r#"뭆"#),
+        (r#"뭇"#, r#"뭇"#, r#"뭇"#, r#"뭇"#, r#"뭇"#),
+        (r#"뭈"#, r#"뭈"#, r#"뭈"#, r#"뭈"#, r#"뭈"#),
+        (r#"뭉"#, r#"뭉"#, r#"뭉"#, r#"뭉"#, r#"뭉"#),
+        (r#"뭊"#, r#"뭊"#, r#"뭊"#, r#"뭊"#, r#"뭊"#),
+        (r#"뭋"#, r#"뭋"#, r#"뭋"#, r#"뭋"#, r#"뭋"#),
+        (r#"뭌"#, r#"뭌"#, r#"뭌"#, r#"뭌"#, r#"뭌"#),
+        (r#"뭍"#, r#"뭍"#, r#"뭍"#, r#"뭍"#, r#"뭍"#),
+        (r#"뭎"#, r#"뭎"#, r#"뭎"#, r#"뭎"#, r#"뭎"#),
+        (r#"뭏"#, r#"뭏"#, r#"뭏"#, r#"뭏"#, r#"뭏"#),
+        (r#"뭐"#, r#"뭐"#, r#"뭐"#, r#"뭐"#, r#"뭐"#),
+        (r#"뭑"#, r#"뭑"#, r#"뭑"#, r#"뭑"#, r#"뭑"#),
+        (r#"뭒"#, r#"뭒"#, r#"뭒"#, r#"뭒"#, r#"뭒"#),
+        (r#"뭓"#, r#"뭓"#, r#"뭓"#, r#"뭓"#, r#"뭓"#),
+        (r#"뭔"#, r#"뭔"#, r#"뭔"#, r#"뭔"#, r#"뭔"#),
+        (r#"뭕"#, r#"뭕"#, r#"뭕"#, r#"뭕"#, r#"뭕"#),
+        (r#"뭖"#, r#"뭖"#, r#"뭖"#, r#"뭖"#, r#"뭖"#),
+        (r#"뭗"#, r#"뭗"#, r#"뭗"#, r#"뭗"#, r#"뭗"#),
+        (r#"뭘"#, r#"뭘"#, r#"뭘"#, r#"뭘"#, r#"뭘"#),
+        (r#"뭙"#, r#"뭙"#, r#"뭙"#, r#"뭙"#, r#"뭙"#),
+        (r#"뭚"#, r#"뭚"#, r#"뭚"#, r#"뭚"#, r#"뭚"#),
+        (r#"뭛"#, r#"뭛"#, r#"뭛"#, r#"뭛"#, r#"뭛"#),
+        (r#"뭜"#, r#"뭜"#, r#"뭜"#, r#"뭜"#, r#"뭜"#),
+        (r#"뭝"#, r#"뭝"#, r#"뭝"#, r#"뭝"#, r#"뭝"#),
+        (r#"뭞"#, r#"뭞"#, r#"뭞"#, r#"뭞"#, r#"뭞"#),
+        (r#"뭟"#, r#"뭟"#, r#"뭟"#, r#"뭟"#, r#"뭟"#),
+        (r#"뭠"#, r#"뭠"#, r#"뭠"#, r#"뭠"#, r#"뭠"#),
+        (r#"뭡"#, r#"뭡"#, r#"뭡"#, r#"뭡"#, r#"뭡"#),
+        (r#"뭢"#, r#"뭢"#, r#"뭢"#, r#"뭢"#, r#"뭢"#),
+        (r#"뭣"#, r#"뭣"#, r#"뭣"#, r#"뭣"#, r#"뭣"#),
+        (r#"뭤"#, r#"뭤"#, r#"뭤"#, r#"뭤"#, r#"뭤"#),
+        (r#"뭥"#, r#"뭥"#, r#"뭥"#, r#"뭥"#, r#"뭥"#),
+        (r#"뭦"#, r#"뭦"#, r#"뭦"#, r#"뭦"#, r#"뭦"#),
+        (r#"뭧"#, r#"뭧"#, r#"뭧"#, r#"뭧"#, r#"뭧"#),
+        (r#"뭨"#, r#"뭨"#, r#"뭨"#, r#"뭨"#, r#"뭨"#),
+        (r#"뭩"#, r#"뭩"#, r#"뭩"#, r#"뭩"#, r#"뭩"#),
+        (r#"뭪"#, r#"뭪"#, r#"뭪"#, r#"뭪"#, r#"뭪"#),
+        (r#"뭫"#, r#"뭫"#, r#"뭫"#, r#"뭫"#, r#"뭫"#),
+        (r#"뭬"#, r#"뭬"#, r#"뭬"#, r#"뭬"#, r#"뭬"#),
+        (r#"뭭"#, r#"뭭"#, r#"뭭"#, r#"뭭"#, r#"뭭"#),
+        (r#"뭮"#, r#"뭮"#, r#"뭮"#, r#"뭮"#, r#"뭮"#),
+        (r#"뭯"#, r#"뭯"#, r#"뭯"#, r#"뭯"#, r#"뭯"#),
+        (r#"뭰"#, r#"뭰"#, r#"뭰"#, r#"뭰"#, r#"뭰"#),
+        (r#"뭱"#, r#"뭱"#, r#"뭱"#, r#"뭱"#, r#"뭱"#),
+        (r#"뭲"#, r#"뭲"#, r#"뭲"#, r#"뭲"#, r#"뭲"#),
+        (r#"뭳"#, r#"뭳"#, r#"뭳"#, r#"뭳"#, r#"뭳"#),
+        (r#"뭴"#, r#"뭴"#, r#"뭴"#, r#"뭴"#, r#"뭴"#),
+        (r#"뭵"#, r#"뭵"#, r#"뭵"#, r#"뭵"#, r#"뭵"#),
+        (r#"뭶"#, r#"뭶"#, r#"뭶"#, r#"뭶"#, r#"뭶"#),
+        (r#"뭷"#, r#"뭷"#, r#"뭷"#, r#"뭷"#, r#"뭷"#),
+        (r#"뭸"#, r#"뭸"#, r#"뭸"#, r#"뭸"#, r#"뭸"#),
+        (r#"뭹"#, r#"뭹"#, r#"뭹"#, r#"뭹"#, r#"뭹"#),
+        (r#"뭺"#, r#"뭺"#, r#"뭺"#, r#"뭺"#, r#"뭺"#),
+        (r#"뭻"#, r#"뭻"#, r#"뭻"#, r#"뭻"#, r#"뭻"#),
+        (r#"뭼"#, r#"뭼"#, r#"뭼"#, r#"뭼"#, r#"뭼"#),
+        (r#"뭽"#, r#"뭽"#, r#"뭽"#, r#"뭽"#, r#"뭽"#),
+        (r#"뭾"#, r#"뭾"#, r#"뭾"#, r#"뭾"#, r#"뭾"#),
+        (r#"뭿"#, r#"뭿"#, r#"뭿"#, r#"뭿"#, r#"뭿"#),
+        (r#"뮀"#, r#"뮀"#, r#"뮀"#, r#"뮀"#, r#"뮀"#),
+        (r#"뮁"#, r#"뮁"#, r#"뮁"#, r#"뮁"#, r#"뮁"#),
+        (r#"뮂"#, r#"뮂"#, r#"뮂"#, r#"뮂"#, r#"뮂"#),
+        (r#"뮃"#, r#"뮃"#, r#"뮃"#, r#"뮃"#, r#"뮃"#),
+        (r#"뮄"#, r#"뮄"#, r#"뮄"#, r#"뮄"#, r#"뮄"#),
+        (r#"뮅"#, r#"뮅"#, r#"뮅"#, r#"뮅"#, r#"뮅"#),
+        (r#"뮆"#, r#"뮆"#, r#"뮆"#, r#"뮆"#, r#"뮆"#),
+        (r#"뮇"#, r#"뮇"#, r#"뮇"#, r#"뮇"#, r#"뮇"#),
+        (r#"뮈"#, r#"뮈"#, r#"뮈"#, r#"뮈"#, r#"뮈"#),
+        (r#"뮉"#, r#"뮉"#, r#"뮉"#, r#"뮉"#, r#"뮉"#),
+        (r#"뮊"#, r#"뮊"#, r#"뮊"#, r#"뮊"#, r#"뮊"#),
+        (r#"뮋"#, r#"뮋"#, r#"뮋"#, r#"뮋"#, r#"뮋"#),
+        (r#"뮌"#, r#"뮌"#, r#"뮌"#, r#"뮌"#, r#"뮌"#),
+        (r#"뮍"#, r#"뮍"#, r#"뮍"#, r#"뮍"#, r#"뮍"#),
+        (r#"뮎"#, r#"뮎"#, r#"뮎"#, r#"뮎"#, r#"뮎"#),
+        (r#"뮏"#, r#"뮏"#, r#"뮏"#, r#"뮏"#, r#"뮏"#),
+        (r#"뮐"#, r#"뮐"#, r#"뮐"#, r#"뮐"#, r#"뮐"#),
+        (r#"뮑"#, r#"뮑"#, r#"뮑"#, r#"뮑"#, r#"뮑"#),
+        (r#"뮒"#, r#"뮒"#, r#"뮒"#, r#"뮒"#, r#"뮒"#),
+        (r#"뮓"#, r#"뮓"#, r#"뮓"#, r#"뮓"#, r#"뮓"#),
+        (r#"뮔"#, r#"뮔"#, r#"뮔"#, r#"뮔"#, r#"뮔"#),
+        (r#"뮕"#, r#"뮕"#, r#"뮕"#, r#"뮕"#, r#"뮕"#),
+        (r#"뮖"#, r#"뮖"#, r#"뮖"#, r#"뮖"#, r#"뮖"#),
+        (r#"뮗"#, r#"뮗"#, r#"뮗"#, r#"뮗"#, r#"뮗"#),
+        (r#"뮘"#, r#"뮘"#, r#"뮘"#, r#"뮘"#, r#"뮘"#),
+        (r#"뮙"#, r#"뮙"#, r#"뮙"#, r#"뮙"#, r#"뮙"#),
+        (r#"뮚"#, r#"뮚"#, r#"뮚"#, r#"뮚"#, r#"뮚"#),
+        (r#"뮛"#, r#"뮛"#, r#"뮛"#, r#"뮛"#, r#"뮛"#),
+        (r#"뮜"#, r#"뮜"#, r#"뮜"#, r#"뮜"#, r#"뮜"#),
+        (r#"뮝"#, r#"뮝"#, r#"뮝"#, r#"뮝"#, r#"뮝"#),
+        (r#"뮞"#, r#"뮞"#, r#"뮞"#, r#"뮞"#, r#"뮞"#),
+        (r#"뮟"#, r#"뮟"#, r#"뮟"#, r#"뮟"#, r#"뮟"#),
+        (r#"뮠"#, r#"뮠"#, r#"뮠"#, r#"뮠"#, r#"뮠"#),
+        (r#"뮡"#, r#"뮡"#, r#"뮡"#, r#"뮡"#, r#"뮡"#),
+        (r#"뮢"#, r#"뮢"#, r#"뮢"#, r#"뮢"#, r#"뮢"#),
+        (r#"뮣"#, r#"뮣"#, r#"뮣"#, r#"뮣"#, r#"뮣"#),
+        (r#"뮤"#, r#"뮤"#, r#"뮤"#, r#"뮤"#, r#"뮤"#),
+        (r#"뮥"#, r#"뮥"#, r#"뮥"#, r#"뮥"#, r#"뮥"#),
+        (r#"뮦"#, r#"뮦"#, r#"뮦"#, r#"뮦"#, r#"뮦"#),
+        (r#"뮧"#, r#"뮧"#, r#"뮧"#, r#"뮧"#, r#"뮧"#),
+        (r#"뮨"#, r#"뮨"#, r#"뮨"#, r#"뮨"#, r#"뮨"#),
+        (r#"뮩"#, r#"뮩"#, r#"뮩"#, r#"뮩"#, r#"뮩"#),
+        (r#"뮪"#, r#"뮪"#, r#"뮪"#, r#"뮪"#, r#"뮪"#),
+        (r#"뮫"#, r#"뮫"#, r#"뮫"#, r#"뮫"#, r#"뮫"#),
+        (r#"뮬"#, r#"뮬"#, r#"뮬"#, r#"뮬"#, r#"뮬"#),
+        (r#"뮭"#, r#"뮭"#, r#"뮭"#, r#"뮭"#, r#"뮭"#),
+        (r#"뮮"#, r#"뮮"#, r#"뮮"#, r#"뮮"#, r#"뮮"#),
+        (r#"뮯"#, r#"뮯"#, r#"뮯"#, r#"뮯"#, r#"뮯"#),
+        (r#"뮰"#, r#"뮰"#, r#"뮰"#, r#"뮰"#, r#"뮰"#),
+        (r#"뮱"#, r#"뮱"#, r#"뮱"#, r#"뮱"#, r#"뮱"#),
+        (r#"뮲"#, r#"뮲"#, r#"뮲"#, r#"뮲"#, r#"뮲"#),
+        (r#"뮳"#, r#"뮳"#, r#"뮳"#, r#"뮳"#, r#"뮳"#),
+        (r#"뮴"#, r#"뮴"#, r#"뮴"#, r#"뮴"#, r#"뮴"#),
+        (r#"뮵"#, r#"뮵"#, r#"뮵"#, r#"뮵"#, r#"뮵"#),
+        (r#"뮶"#, r#"뮶"#, r#"뮶"#, r#"뮶"#, r#"뮶"#),
+        (r#"뮷"#, r#"뮷"#, r#"뮷"#, r#"뮷"#, r#"뮷"#),
+        (r#"뮸"#, r#"뮸"#, r#"뮸"#, r#"뮸"#, r#"뮸"#),
+        (r#"뮹"#, r#"뮹"#, r#"뮹"#, r#"뮹"#, r#"뮹"#),
+        (r#"뮺"#, r#"뮺"#, r#"뮺"#, r#"뮺"#, r#"뮺"#),
+        (r#"뮻"#, r#"뮻"#, r#"뮻"#, r#"뮻"#, r#"뮻"#),
+        (r#"뮼"#, r#"뮼"#, r#"뮼"#, r#"뮼"#, r#"뮼"#),
+        (r#"뮽"#, r#"뮽"#, r#"뮽"#, r#"뮽"#, r#"뮽"#),
+        (r#"뮾"#, r#"뮾"#, r#"뮾"#, r#"뮾"#, r#"뮾"#),
+        (r#"뮿"#, r#"뮿"#, r#"뮿"#, r#"뮿"#, r#"뮿"#),
+        (r#"므"#, r#"므"#, r#"므"#, r#"므"#, r#"므"#),
+        (r#"믁"#, r#"믁"#, r#"믁"#, r#"믁"#, r#"믁"#),
+        (r#"믂"#, r#"믂"#, r#"믂"#, r#"믂"#, r#"믂"#),
+        (r#"믃"#, r#"믃"#, r#"믃"#, r#"믃"#, r#"믃"#),
+        (r#"믄"#, r#"믄"#, r#"믄"#, r#"믄"#, r#"믄"#),
+        (r#"믅"#, r#"믅"#, r#"믅"#, r#"믅"#, r#"믅"#),
+        (r#"믆"#, r#"믆"#, r#"믆"#, r#"믆"#, r#"믆"#),
+        (r#"믇"#, r#"믇"#, r#"믇"#, r#"믇"#, r#"믇"#),
+        (r#"믈"#, r#"믈"#, r#"믈"#, r#"믈"#, r#"믈"#),
+        (r#"믉"#, r#"믉"#, r#"믉"#, r#"믉"#, r#"믉"#),
+        (r#"믊"#, r#"믊"#, r#"믊"#, r#"믊"#, r#"믊"#),
+        (r#"믋"#, r#"믋"#, r#"믋"#, r#"믋"#, r#"믋"#),
+        (r#"믌"#, r#"믌"#, r#"믌"#, r#"믌"#, r#"믌"#),
+        (r#"믍"#, r#"믍"#, r#"믍"#, r#"믍"#, r#"믍"#),
+        (r#"믎"#, r#"믎"#, r#"믎"#, r#"믎"#, r#"믎"#),
+        (r#"믏"#, r#"믏"#, r#"믏"#, r#"믏"#, r#"믏"#),
+        (r#"믐"#, r#"믐"#, r#"믐"#, r#"믐"#, r#"믐"#),
+        (r#"믑"#, r#"믑"#, r#"믑"#, r#"믑"#, r#"믑"#),
+        (r#"믒"#, r#"믒"#, r#"믒"#, r#"믒"#, r#"믒"#),
+        (r#"믓"#, r#"믓"#, r#"믓"#, r#"믓"#, r#"믓"#),
+        (r#"믔"#, r#"믔"#, r#"믔"#, r#"믔"#, r#"믔"#),
+        (r#"믕"#, r#"믕"#, r#"믕"#, r#"믕"#, r#"믕"#),
+        (r#"믖"#, r#"믖"#, r#"믖"#, r#"믖"#, r#"믖"#),
+        (r#"믗"#, r#"믗"#, r#"믗"#, r#"믗"#, r#"믗"#),
+        (r#"믘"#, r#"믘"#, r#"믘"#, r#"믘"#, r#"믘"#),
+        (r#"믙"#, r#"믙"#, r#"믙"#, r#"믙"#, r#"믙"#),
+        (r#"믚"#, r#"믚"#, r#"믚"#, r#"믚"#, r#"믚"#),
+        (r#"믛"#, r#"믛"#, r#"믛"#, r#"믛"#, r#"믛"#),
+        (r#"믜"#, r#"믜"#, r#"믜"#, r#"믜"#, r#"믜"#),
+        (r#"믝"#, r#"믝"#, r#"믝"#, r#"믝"#, r#"믝"#),
+        (r#"믞"#, r#"믞"#, r#"믞"#, r#"믞"#, r#"믞"#),
+        (r#"믟"#, r#"믟"#, r#"믟"#, r#"믟"#, r#"믟"#),
+        (r#"믠"#, r#"믠"#, r#"믠"#, r#"믠"#, r#"믠"#),
+        (r#"믡"#, r#"믡"#, r#"믡"#, r#"믡"#, r#"믡"#),
+        (r#"믢"#, r#"믢"#, r#"믢"#, r#"믢"#, r#"믢"#),
+        (r#"믣"#, r#"믣"#, r#"믣"#, r#"믣"#, r#"믣"#),
+        (r#"믤"#, r#"믤"#, r#"믤"#, r#"믤"#, r#"믤"#),
+        (r#"믥"#, r#"믥"#, r#"믥"#, r#"믥"#, r#"믥"#),
+        (r#"믦"#, r#"믦"#, r#"믦"#, r#"믦"#, r#"믦"#),
+        (r#"믧"#, r#"믧"#, r#"믧"#, r#"믧"#, r#"믧"#),
+        (r#"믨"#, r#"믨"#, r#"믨"#, r#"믨"#, r#"믨"#),
+        (r#"믩"#, r#"믩"#, r#"믩"#, r#"믩"#, r#"믩"#),
+        (r#"믪"#, r#"믪"#, r#"믪"#, r#"믪"#, r#"믪"#),
+        (r#"믫"#, r#"믫"#, r#"믫"#, r#"믫"#, r#"믫"#),
+        (r#"믬"#, r#"믬"#, r#"믬"#, r#"믬"#, r#"믬"#),
+        (r#"믭"#, r#"믭"#, r#"믭"#, r#"믭"#, r#"믭"#),
+        (r#"믮"#, r#"믮"#, r#"믮"#, r#"믮"#, r#"믮"#),
+        (r#"믯"#, r#"믯"#, r#"믯"#, r#"믯"#, r#"믯"#),
+        (r#"믰"#, r#"믰"#, r#"믰"#, r#"믰"#, r#"믰"#),
+        (r#"믱"#, r#"믱"#, r#"믱"#, r#"믱"#, r#"믱"#),
+        (r#"믲"#, r#"믲"#, r#"믲"#, r#"믲"#, r#"믲"#),
+        (r#"믳"#, r#"믳"#, r#"믳"#, r#"믳"#, r#"믳"#),
+        (r#"믴"#, r#"믴"#, r#"믴"#, r#"믴"#, r#"믴"#),
+        (r#"믵"#, r#"믵"#, r#"믵"#, r#"믵"#, r#"믵"#),
+        (r#"믶"#, r#"믶"#, r#"믶"#, r#"믶"#, r#"믶"#),
+        (r#"믷"#, r#"믷"#, r#"믷"#, r#"믷"#, r#"믷"#),
+        (r#"미"#, r#"미"#, r#"미"#, r#"미"#, r#"미"#),
+        (r#"믹"#, r#"믹"#, r#"믹"#, r#"믹"#, r#"믹"#),
+        (r#"믺"#, r#"믺"#, r#"믺"#, r#"믺"#, r#"믺"#),
+        (r#"믻"#, r#"믻"#, r#"믻"#, r#"믻"#, r#"믻"#),
+        (r#"민"#, r#"민"#, r#"민"#, r#"민"#, r#"민"#),
+        (r#"믽"#, r#"믽"#, r#"믽"#, r#"믽"#, r#"믽"#),
+        (r#"믾"#, r#"믾"#, r#"믾"#, r#"믾"#, r#"믾"#),
+        (r#"믿"#, r#"믿"#, r#"믿"#, r#"믿"#, r#"믿"#),
+        (r#"밀"#, r#"밀"#, r#"밀"#, r#"밀"#, r#"밀"#),
+        (r#"밁"#, r#"밁"#, r#"밁"#, r#"밁"#, r#"밁"#),
+        (r#"밂"#, r#"밂"#, r#"밂"#, r#"밂"#, r#"밂"#),
+        (r#"밃"#, r#"밃"#, r#"밃"#, r#"밃"#, r#"밃"#),
+        (r#"밄"#, r#"밄"#, r#"밄"#, r#"밄"#, r#"밄"#),
+        (r#"밅"#, r#"밅"#, r#"밅"#, r#"밅"#, r#"밅"#),
+        (r#"밆"#, r#"밆"#, r#"밆"#, r#"밆"#, r#"밆"#),
+        (r#"밇"#, r#"밇"#, r#"밇"#, r#"밇"#, r#"밇"#),
+        (r#"밈"#, r#"밈"#, r#"밈"#, r#"밈"#, r#"밈"#),
+        (r#"밉"#, r#"밉"#, r#"밉"#, r#"밉"#, r#"밉"#),
+        (r#"밊"#, r#"밊"#, r#"밊"#, r#"밊"#, r#"밊"#),
+        (r#"밋"#, r#"밋"#, r#"밋"#, r#"밋"#, r#"밋"#),
+        (r#"밌"#, r#"밌"#, r#"밌"#, r#"밌"#, r#"밌"#),
+        (r#"밍"#, r#"밍"#, r#"밍"#, r#"밍"#, r#"밍"#),
+        (r#"밎"#, r#"밎"#, r#"밎"#, r#"밎"#, r#"밎"#),
+        (r#"및"#, r#"및"#, r#"및"#, r#"및"#, r#"및"#),
+        (r#"밐"#, r#"밐"#, r#"밐"#, r#"밐"#, r#"밐"#),
+        (r#"밑"#, r#"밑"#, r#"밑"#, r#"밑"#, r#"밑"#),
+        (r#"밒"#, r#"밒"#, r#"밒"#, r#"밒"#, r#"밒"#),
+        (r#"밓"#, r#"밓"#, r#"밓"#, r#"밓"#, r#"밓"#),
+        (r#"바"#, r#"바"#, r#"바"#, r#"바"#, r#"바"#),
+        (r#"박"#, r#"박"#, r#"박"#, r#"박"#, r#"박"#),
+        (r#"밖"#, r#"밖"#, r#"밖"#, r#"밖"#, r#"밖"#),
+        (r#"밗"#, r#"밗"#, r#"밗"#, r#"밗"#, r#"밗"#),
+        (r#"반"#, r#"반"#, r#"반"#, r#"반"#, r#"반"#),
+        (r#"밙"#, r#"밙"#, r#"밙"#, r#"밙"#, r#"밙"#),
+        (r#"밚"#, r#"밚"#, r#"밚"#, r#"밚"#, r#"밚"#),
+        (r#"받"#, r#"받"#, r#"받"#, r#"받"#, r#"받"#),
+        (r#"발"#, r#"발"#, r#"발"#, r#"발"#, r#"발"#),
+        (r#"밝"#, r#"밝"#, r#"밝"#, r#"밝"#, r#"밝"#),
+        (r#"밞"#, r#"밞"#, r#"밞"#, r#"밞"#, r#"밞"#),
+        (r#"밟"#, r#"밟"#, r#"밟"#, r#"밟"#, r#"밟"#),
+        (r#"밠"#, r#"밠"#, r#"밠"#, r#"밠"#, r#"밠"#),
+        (r#"밡"#, r#"밡"#, r#"밡"#, r#"밡"#, r#"밡"#),
+        (r#"밢"#, r#"밢"#, r#"밢"#, r#"밢"#, r#"밢"#),
+        (r#"밣"#, r#"밣"#, r#"밣"#, r#"밣"#, r#"밣"#),
+        (r#"밤"#, r#"밤"#, r#"밤"#, r#"밤"#, r#"밤"#),
+        (r#"밥"#, r#"밥"#, r#"밥"#, r#"밥"#, r#"밥"#),
+        (r#"밦"#, r#"밦"#, r#"밦"#, r#"밦"#, r#"밦"#),
+        (r#"밧"#, r#"밧"#, r#"밧"#, r#"밧"#, r#"밧"#),
+        (r#"밨"#, r#"밨"#, r#"밨"#, r#"밨"#, r#"밨"#),
+        (r#"방"#, r#"방"#, r#"방"#, r#"방"#, r#"방"#),
+        (r#"밪"#, r#"밪"#, r#"밪"#, r#"밪"#, r#"밪"#),
+        (r#"밫"#, r#"밫"#, r#"밫"#, r#"밫"#, r#"밫"#),
+        (r#"밬"#, r#"밬"#, r#"밬"#, r#"밬"#, r#"밬"#),
+        (r#"밭"#, r#"밭"#, r#"밭"#, r#"밭"#, r#"밭"#),
+        (r#"밮"#, r#"밮"#, r#"밮"#, r#"밮"#, r#"밮"#),
+        (r#"밯"#, r#"밯"#, r#"밯"#, r#"밯"#, r#"밯"#),
+        (r#"배"#, r#"배"#, r#"배"#, r#"배"#, r#"배"#),
+        (r#"백"#, r#"백"#, r#"백"#, r#"백"#, r#"백"#),
+        (r#"밲"#, r#"밲"#, r#"밲"#, r#"밲"#, r#"밲"#),
+        (r#"밳"#, r#"밳"#, r#"밳"#, r#"밳"#, r#"밳"#),
+        (r#"밴"#, r#"밴"#, r#"밴"#, r#"밴"#, r#"밴"#),
+        (r#"밵"#, r#"밵"#, r#"밵"#, r#"밵"#, r#"밵"#),
+        (r#"밶"#, r#"밶"#, r#"밶"#, r#"밶"#, r#"밶"#),
+        (r#"밷"#, r#"밷"#, r#"밷"#, r#"밷"#, r#"밷"#),
+        (r#"밸"#, r#"밸"#, r#"밸"#, r#"밸"#, r#"밸"#),
+        (r#"밹"#, r#"밹"#, r#"밹"#, r#"밹"#, r#"밹"#),
+        (r#"밺"#, r#"밺"#, r#"밺"#, r#"밺"#, r#"밺"#),
+        (r#"밻"#, r#"밻"#, r#"밻"#, r#"밻"#, r#"밻"#),
+        (r#"밼"#, r#"밼"#, r#"밼"#, r#"밼"#, r#"밼"#),
+        (r#"밽"#, r#"밽"#, r#"밽"#, r#"밽"#, r#"밽"#),
+        (r#"밾"#, r#"밾"#, r#"밾"#, r#"밾"#, r#"밾"#),
+        (r#"밿"#, r#"밿"#, r#"밿"#, r#"밿"#, r#"밿"#),
+        (r#"뱀"#, r#"뱀"#, r#"뱀"#, r#"뱀"#, r#"뱀"#),
+        (r#"뱁"#, r#"뱁"#, r#"뱁"#, r#"뱁"#, r#"뱁"#),
+        (r#"뱂"#, r#"뱂"#, r#"뱂"#, r#"뱂"#, r#"뱂"#),
+        (r#"뱃"#, r#"뱃"#, r#"뱃"#, r#"뱃"#, r#"뱃"#),
+        (r#"뱄"#, r#"뱄"#, r#"뱄"#, r#"뱄"#, r#"뱄"#),
+        (r#"뱅"#, r#"뱅"#, r#"뱅"#, r#"뱅"#, r#"뱅"#),
+        (r#"뱆"#, r#"뱆"#, r#"뱆"#, r#"뱆"#, r#"뱆"#),
+        (r#"뱇"#, r#"뱇"#, r#"뱇"#, r#"뱇"#, r#"뱇"#),
+        (r#"뱈"#, r#"뱈"#, r#"뱈"#, r#"뱈"#, r#"뱈"#),
+        (r#"뱉"#, r#"뱉"#, r#"뱉"#, r#"뱉"#, r#"뱉"#),
+        (r#"뱊"#, r#"뱊"#, r#"뱊"#, r#"뱊"#, r#"뱊"#),
+        (r#"뱋"#, r#"뱋"#, r#"뱋"#, r#"뱋"#, r#"뱋"#),
+        (r#"뱌"#, r#"뱌"#, r#"뱌"#, r#"뱌"#, r#"뱌"#),
+        (r#"뱍"#, r#"뱍"#, r#"뱍"#, r#"뱍"#, r#"뱍"#),
+        (r#"뱎"#, r#"뱎"#, r#"뱎"#, r#"뱎"#, r#"뱎"#),
+        (r#"뱏"#, r#"뱏"#, r#"뱏"#, r#"뱏"#, r#"뱏"#),
+        (r#"뱐"#, r#"뱐"#, r#"뱐"#, r#"뱐"#, r#"뱐"#),
+        (r#"뱑"#, r#"뱑"#, r#"뱑"#, r#"뱑"#, r#"뱑"#),
+        (r#"뱒"#, r#"뱒"#, r#"뱒"#, r#"뱒"#, r#"뱒"#),
+        (r#"뱓"#, r#"뱓"#, r#"뱓"#, r#"뱓"#, r#"뱓"#),
+        (r#"뱔"#, r#"뱔"#, r#"뱔"#, r#"뱔"#, r#"뱔"#),
+        (r#"뱕"#, r#"뱕"#, r#"뱕"#, r#"뱕"#, r#"뱕"#),
+        (r#"뱖"#, r#"뱖"#, r#"뱖"#, r#"뱖"#, r#"뱖"#),
+        (r#"뱗"#, r#"뱗"#, r#"뱗"#, r#"뱗"#, r#"뱗"#),
+        (r#"뱘"#, r#"뱘"#, r#"뱘"#, r#"뱘"#, r#"뱘"#),
+        (r#"뱙"#, r#"뱙"#, r#"뱙"#, r#"뱙"#, r#"뱙"#),
+        (r#"뱚"#, r#"뱚"#, r#"뱚"#, r#"뱚"#, r#"뱚"#),
+        (r#"뱛"#, r#"뱛"#, r#"뱛"#, r#"뱛"#, r#"뱛"#),
+        (r#"뱜"#, r#"뱜"#, r#"뱜"#, r#"뱜"#, r#"뱜"#),
+        (r#"뱝"#, r#"뱝"#, r#"뱝"#, r#"뱝"#, r#"뱝"#),
+        (r#"뱞"#, r#"뱞"#, r#"뱞"#, r#"뱞"#, r#"뱞"#),
+        (r#"뱟"#, r#"뱟"#, r#"뱟"#, r#"뱟"#, r#"뱟"#),
+        (r#"뱠"#, r#"뱠"#, r#"뱠"#, r#"뱠"#, r#"뱠"#),
+        (r#"뱡"#, r#"뱡"#, r#"뱡"#, r#"뱡"#, r#"뱡"#),
+        (r#"뱢"#, r#"뱢"#, r#"뱢"#, r#"뱢"#, r#"뱢"#),
+        (r#"뱣"#, r#"뱣"#, r#"뱣"#, r#"뱣"#, r#"뱣"#),
+        (r#"뱤"#, r#"뱤"#, r#"뱤"#, r#"뱤"#, r#"뱤"#),
+        (r#"뱥"#, r#"뱥"#, r#"뱥"#, r#"뱥"#, r#"뱥"#),
+        (r#"뱦"#, r#"뱦"#, r#"뱦"#, r#"뱦"#, r#"뱦"#),
+        (r#"뱧"#, r#"뱧"#, r#"뱧"#, r#"뱧"#, r#"뱧"#),
+        (r#"뱨"#, r#"뱨"#, r#"뱨"#, r#"뱨"#, r#"뱨"#),
+        (r#"뱩"#, r#"뱩"#, r#"뱩"#, r#"뱩"#, r#"뱩"#),
+        (r#"뱪"#, r#"뱪"#, r#"뱪"#, r#"뱪"#, r#"뱪"#),
+        (r#"뱫"#, r#"뱫"#, r#"뱫"#, r#"뱫"#, r#"뱫"#),
+        (r#"뱬"#, r#"뱬"#, r#"뱬"#, r#"뱬"#, r#"뱬"#),
+        (r#"뱭"#, r#"뱭"#, r#"뱭"#, r#"뱭"#, r#"뱭"#),
+        (r#"뱮"#, r#"뱮"#, r#"뱮"#, r#"뱮"#, r#"뱮"#),
+        (r#"뱯"#, r#"뱯"#, r#"뱯"#, r#"뱯"#, r#"뱯"#),
+        (r#"뱰"#, r#"뱰"#, r#"뱰"#, r#"뱰"#, r#"뱰"#),
+        (r#"뱱"#, r#"뱱"#, r#"뱱"#, r#"뱱"#, r#"뱱"#),
+        (r#"뱲"#, r#"뱲"#, r#"뱲"#, r#"뱲"#, r#"뱲"#),
+        (r#"뱳"#, r#"뱳"#, r#"뱳"#, r#"뱳"#, r#"뱳"#),
+        (r#"뱴"#, r#"뱴"#, r#"뱴"#, r#"뱴"#, r#"뱴"#),
+        (r#"뱵"#, r#"뱵"#, r#"뱵"#, r#"뱵"#, r#"뱵"#),
+        (r#"뱶"#, r#"뱶"#, r#"뱶"#, r#"뱶"#, r#"뱶"#),
+        (r#"뱷"#, r#"뱷"#, r#"뱷"#, r#"뱷"#, r#"뱷"#),
+        (r#"뱸"#, r#"뱸"#, r#"뱸"#, r#"뱸"#, r#"뱸"#),
+        (r#"뱹"#, r#"뱹"#, r#"뱹"#, r#"뱹"#, r#"뱹"#),
+        (r#"뱺"#, r#"뱺"#, r#"뱺"#, r#"뱺"#, r#"뱺"#),
+        (r#"뱻"#, r#"뱻"#, r#"뱻"#, r#"뱻"#, r#"뱻"#),
+        (r#"뱼"#, r#"뱼"#, r#"뱼"#, r#"뱼"#, r#"뱼"#),
+        (r#"뱽"#, r#"뱽"#, r#"뱽"#, r#"뱽"#, r#"뱽"#),
+        (r#"뱾"#, r#"뱾"#, r#"뱾"#, r#"뱾"#, r#"뱾"#),
+        (r#"뱿"#, r#"뱿"#, r#"뱿"#, r#"뱿"#, r#"뱿"#),
+        (r#"벀"#, r#"벀"#, r#"벀"#, r#"벀"#, r#"벀"#),
+        (r#"벁"#, r#"벁"#, r#"벁"#, r#"벁"#, r#"벁"#),
+        (r#"벂"#, r#"벂"#, r#"벂"#, r#"벂"#, r#"벂"#),
+        (r#"벃"#, r#"벃"#, r#"벃"#, r#"벃"#, r#"벃"#),
+        (r#"버"#, r#"버"#, r#"버"#, r#"버"#, r#"버"#),
+        (r#"벅"#, r#"벅"#, r#"벅"#, r#"벅"#, r#"벅"#),
+        (r#"벆"#, r#"벆"#, r#"벆"#, r#"벆"#, r#"벆"#),
+        (r#"벇"#, r#"벇"#, r#"벇"#, r#"벇"#, r#"벇"#),
+        (r#"번"#, r#"번"#, r#"번"#, r#"번"#, r#"번"#),
+        (r#"벉"#, r#"벉"#, r#"벉"#, r#"벉"#, r#"벉"#),
+        (r#"벊"#, r#"벊"#, r#"벊"#, r#"벊"#, r#"벊"#),
+        (r#"벋"#, r#"벋"#, r#"벋"#, r#"벋"#, r#"벋"#),
+        (r#"벌"#, r#"벌"#, r#"벌"#, r#"벌"#, r#"벌"#),
+        (r#"벍"#, r#"벍"#, r#"벍"#, r#"벍"#, r#"벍"#),
+        (r#"벎"#, r#"벎"#, r#"벎"#, r#"벎"#, r#"벎"#),
+        (r#"벏"#, r#"벏"#, r#"벏"#, r#"벏"#, r#"벏"#),
+        (r#"벐"#, r#"벐"#, r#"벐"#, r#"벐"#, r#"벐"#),
+        (r#"벑"#, r#"벑"#, r#"벑"#, r#"벑"#, r#"벑"#),
+        (r#"벒"#, r#"벒"#, r#"벒"#, r#"벒"#, r#"벒"#),
+        (r#"벓"#, r#"벓"#, r#"벓"#, r#"벓"#, r#"벓"#),
+        (r#"범"#, r#"범"#, r#"범"#, r#"범"#, r#"범"#),
+        (r#"법"#, r#"법"#, r#"법"#, r#"법"#, r#"법"#),
+        (r#"벖"#, r#"벖"#, r#"벖"#, r#"벖"#, r#"벖"#),
+        (r#"벗"#, r#"벗"#, r#"벗"#, r#"벗"#, r#"벗"#),
+        (r#"벘"#, r#"벘"#, r#"벘"#, r#"벘"#, r#"벘"#),
+        (r#"벙"#, r#"벙"#, r#"벙"#, r#"벙"#, r#"벙"#),
+        (r#"벚"#, r#"벚"#, r#"벚"#, r#"벚"#, r#"벚"#),
+        (r#"벛"#, r#"벛"#, r#"벛"#, r#"벛"#, r#"벛"#),
+        (r#"벜"#, r#"벜"#, r#"벜"#, r#"벜"#, r#"벜"#),
+        (r#"벝"#, r#"벝"#, r#"벝"#, r#"벝"#, r#"벝"#),
+        (r#"벞"#, r#"벞"#, r#"벞"#, r#"벞"#, r#"벞"#),
+        (r#"벟"#, r#"벟"#, r#"벟"#, r#"벟"#, r#"벟"#),
+        (r#"베"#, r#"베"#, r#"베"#, r#"베"#, r#"베"#),
+        (r#"벡"#, r#"벡"#, r#"벡"#, r#"벡"#, r#"벡"#),
+        (r#"벢"#, r#"벢"#, r#"벢"#, r#"벢"#, r#"벢"#),
+        (r#"벣"#, r#"벣"#, r#"벣"#, r#"벣"#, r#"벣"#),
+        (r#"벤"#, r#"벤"#, r#"벤"#, r#"벤"#, r#"벤"#),
+        (r#"벥"#, r#"벥"#, r#"벥"#, r#"벥"#, r#"벥"#),
+        (r#"벦"#, r#"벦"#, r#"벦"#, r#"벦"#, r#"벦"#),
+        (r#"벧"#, r#"벧"#, r#"벧"#, r#"벧"#, r#"벧"#),
+        (r#"벨"#, r#"벨"#, r#"벨"#, r#"벨"#, r#"벨"#),
+        (r#"벩"#, r#"벩"#, r#"벩"#, r#"벩"#, r#"벩"#),
+        (r#"벪"#, r#"벪"#, r#"벪"#, r#"벪"#, r#"벪"#),
+        (r#"벫"#, r#"벫"#, r#"벫"#, r#"벫"#, r#"벫"#),
+        (r#"벬"#, r#"벬"#, r#"벬"#, r#"벬"#, r#"벬"#),
+        (r#"벭"#, r#"벭"#, r#"벭"#, r#"벭"#, r#"벭"#),
+        (r#"벮"#, r#"벮"#, r#"벮"#, r#"벮"#, r#"벮"#),
+        (r#"벯"#, r#"벯"#, r#"벯"#, r#"벯"#, r#"벯"#),
+        (r#"벰"#, r#"벰"#, r#"벰"#, r#"벰"#, r#"벰"#),
+        (r#"벱"#, r#"벱"#, r#"벱"#, r#"벱"#, r#"벱"#),
+        (r#"벲"#, r#"벲"#, r#"벲"#, r#"벲"#, r#"벲"#),
+        (r#"벳"#, r#"벳"#, r#"벳"#, r#"벳"#, r#"벳"#),
+        (r#"벴"#, r#"벴"#, r#"벴"#, r#"벴"#, r#"벴"#),
+        (r#"벵"#, r#"벵"#, r#"벵"#, r#"벵"#, r#"벵"#),
+        (r#"벶"#, r#"벶"#, r#"벶"#, r#"벶"#, r#"벶"#),
+        (r#"벷"#, r#"벷"#, r#"벷"#, r#"벷"#, r#"벷"#),
+        (r#"벸"#, r#"벸"#, r#"벸"#, r#"벸"#, r#"벸"#),
+        (r#"벹"#, r#"벹"#, r#"벹"#, r#"벹"#, r#"벹"#),
+        (r#"벺"#, r#"벺"#, r#"벺"#, r#"벺"#, r#"벺"#),
+        (r#"벻"#, r#"벻"#, r#"벻"#, r#"벻"#, r#"벻"#),
+        (r#"벼"#, r#"벼"#, r#"벼"#, r#"벼"#, r#"벼"#),
+        (r#"벽"#, r#"벽"#, r#"벽"#, r#"벽"#, r#"벽"#),
+        (r#"벾"#, r#"벾"#, r#"벾"#, r#"벾"#, r#"벾"#),
+        (r#"벿"#, r#"벿"#, r#"벿"#, r#"벿"#, r#"벿"#),
+        (r#"변"#, r#"변"#, r#"변"#, r#"변"#, r#"변"#),
+        (r#"볁"#, r#"볁"#, r#"볁"#, r#"볁"#, r#"볁"#),
+        (r#"볂"#, r#"볂"#, r#"볂"#, r#"볂"#, r#"볂"#),
+        (r#"볃"#, r#"볃"#, r#"볃"#, r#"볃"#, r#"볃"#),
+        (r#"별"#, r#"별"#, r#"별"#, r#"별"#, r#"별"#),
+        (r#"볅"#, r#"볅"#, r#"볅"#, r#"볅"#, r#"볅"#),
+        (r#"볆"#, r#"볆"#, r#"볆"#, r#"볆"#, r#"볆"#),
+        (r#"볇"#, r#"볇"#, r#"볇"#, r#"볇"#, r#"볇"#),
+        (r#"볈"#, r#"볈"#, r#"볈"#, r#"볈"#, r#"볈"#),
+        (r#"볉"#, r#"볉"#, r#"볉"#, r#"볉"#, r#"볉"#),
+        (r#"볊"#, r#"볊"#, r#"볊"#, r#"볊"#, r#"볊"#),
+        (r#"볋"#, r#"볋"#, r#"볋"#, r#"볋"#, r#"볋"#),
+        (r#"볌"#, r#"볌"#, r#"볌"#, r#"볌"#, r#"볌"#),
+        (r#"볍"#, r#"볍"#, r#"볍"#, r#"볍"#, r#"볍"#),
+        (r#"볎"#, r#"볎"#, r#"볎"#, r#"볎"#, r#"볎"#),
+        (r#"볏"#, r#"볏"#, r#"볏"#, r#"볏"#, r#"볏"#),
+        (r#"볐"#, r#"볐"#, r#"볐"#, r#"볐"#, r#"볐"#),
+        (r#"병"#, r#"병"#, r#"병"#, r#"병"#, r#"병"#),
+        (r#"볒"#, r#"볒"#, r#"볒"#, r#"볒"#, r#"볒"#),
+        (r#"볓"#, r#"볓"#, r#"볓"#, r#"볓"#, r#"볓"#),
+        (r#"볔"#, r#"볔"#, r#"볔"#, r#"볔"#, r#"볔"#),
+        (r#"볕"#, r#"볕"#, r#"볕"#, r#"볕"#, r#"볕"#),
+        (r#"볖"#, r#"볖"#, r#"볖"#, r#"볖"#, r#"볖"#),
+        (r#"볗"#, r#"볗"#, r#"볗"#, r#"볗"#, r#"볗"#),
+        (r#"볘"#, r#"볘"#, r#"볘"#, r#"볘"#, r#"볘"#),
+        (r#"볙"#, r#"볙"#, r#"볙"#, r#"볙"#, r#"볙"#),
+        (r#"볚"#, r#"볚"#, r#"볚"#, r#"볚"#, r#"볚"#),
+        (r#"볛"#, r#"볛"#, r#"볛"#, r#"볛"#, r#"볛"#),
+        (r#"볜"#, r#"볜"#, r#"볜"#, r#"볜"#, r#"볜"#),
+        (r#"볝"#, r#"볝"#, r#"볝"#, r#"볝"#, r#"볝"#),
+        (r#"볞"#, r#"볞"#, r#"볞"#, r#"볞"#, r#"볞"#),
+        (r#"볟"#, r#"볟"#, r#"볟"#, r#"볟"#, r#"볟"#),
+        (r#"볠"#, r#"볠"#, r#"볠"#, r#"볠"#, r#"볠"#),
+        (r#"볡"#, r#"볡"#, r#"볡"#, r#"볡"#, r#"볡"#),
+        (r#"볢"#, r#"볢"#, r#"볢"#, r#"볢"#, r#"볢"#),
+        (r#"볣"#, r#"볣"#, r#"볣"#, r#"볣"#, r#"볣"#),
+        (r#"볤"#, r#"볤"#, r#"볤"#, r#"볤"#, r#"볤"#),
+        (r#"볥"#, r#"볥"#, r#"볥"#, r#"볥"#, r#"볥"#),
+        (r#"볦"#, r#"볦"#, r#"볦"#, r#"볦"#, r#"볦"#),
+        (r#"볧"#, r#"볧"#, r#"볧"#, r#"볧"#, r#"볧"#),
+        (r#"볨"#, r#"볨"#, r#"볨"#, r#"볨"#, r#"볨"#),
+        (r#"볩"#, r#"볩"#, r#"볩"#, r#"볩"#, r#"볩"#),
+        (r#"볪"#, r#"볪"#, r#"볪"#, r#"볪"#, r#"볪"#),
+        (r#"볫"#, r#"볫"#, r#"볫"#, r#"볫"#, r#"볫"#),
+        (r#"볬"#, r#"볬"#, r#"볬"#, r#"볬"#, r#"볬"#),
+        (r#"볭"#, r#"볭"#, r#"볭"#, r#"볭"#, r#"볭"#),
+        (r#"볮"#, r#"볮"#, r#"볮"#, r#"볮"#, r#"볮"#),
+        (r#"볯"#, r#"볯"#, r#"볯"#, r#"볯"#, r#"볯"#),
+        (r#"볰"#, r#"볰"#, r#"볰"#, r#"볰"#, r#"볰"#),
+        (r#"볱"#, r#"볱"#, r#"볱"#, r#"볱"#, r#"볱"#),
+        (r#"볲"#, r#"볲"#, r#"볲"#, r#"볲"#, r#"볲"#),
+        (r#"볳"#, r#"볳"#, r#"볳"#, r#"볳"#, r#"볳"#),
+        (r#"보"#, r#"보"#, r#"보"#, r#"보"#, r#"보"#),
+        (r#"복"#, r#"복"#, r#"복"#, r#"복"#, r#"복"#),
+        (r#"볶"#, r#"볶"#, r#"볶"#, r#"볶"#, r#"볶"#),
+        (r#"볷"#, r#"볷"#, r#"볷"#, r#"볷"#, r#"볷"#),
+        (r#"본"#, r#"본"#, r#"본"#, r#"본"#, r#"본"#),
+        (r#"볹"#, r#"볹"#, r#"볹"#, r#"볹"#, r#"볹"#),
+        (r#"볺"#, r#"볺"#, r#"볺"#, r#"볺"#, r#"볺"#),
+        (r#"볻"#, r#"볻"#, r#"볻"#, r#"볻"#, r#"볻"#),
+        (r#"볼"#, r#"볼"#, r#"볼"#, r#"볼"#, r#"볼"#),
+        (r#"볽"#, r#"볽"#, r#"볽"#, r#"볽"#, r#"볽"#),
+        (r#"볾"#, r#"볾"#, r#"볾"#, r#"볾"#, r#"볾"#),
+        (r#"볿"#, r#"볿"#, r#"볿"#, r#"볿"#, r#"볿"#),
+        (r#"봀"#, r#"봀"#, r#"봀"#, r#"봀"#, r#"봀"#),
+        (r#"봁"#, r#"봁"#, r#"봁"#, r#"봁"#, r#"봁"#),
+        (r#"봂"#, r#"봂"#, r#"봂"#, r#"봂"#, r#"봂"#),
+        (r#"봃"#, r#"봃"#, r#"봃"#, r#"봃"#, r#"봃"#),
+        (r#"봄"#, r#"봄"#, r#"봄"#, r#"봄"#, r#"봄"#),
+        (r#"봅"#, r#"봅"#, r#"봅"#, r#"봅"#, r#"봅"#),
+        (r#"봆"#, r#"봆"#, r#"봆"#, r#"봆"#, r#"봆"#),
+        (r#"봇"#, r#"봇"#, r#"봇"#, r#"봇"#, r#"봇"#),
+        (r#"봈"#, r#"봈"#, r#"봈"#, r#"봈"#, r#"봈"#),
+        (r#"봉"#, r#"봉"#, r#"봉"#, r#"봉"#, r#"봉"#),
+        (r#"봊"#, r#"봊"#, r#"봊"#, r#"봊"#, r#"봊"#),
+        (r#"봋"#, r#"봋"#, r#"봋"#, r#"봋"#, r#"봋"#),
+        (r#"봌"#, r#"봌"#, r#"봌"#, r#"봌"#, r#"봌"#),
+        (r#"봍"#, r#"봍"#, r#"봍"#, r#"봍"#, r#"봍"#),
+        (r#"봎"#, r#"봎"#, r#"봎"#, r#"봎"#, r#"봎"#),
+        (r#"봏"#, r#"봏"#, r#"봏"#, r#"봏"#, r#"봏"#),
+        (r#"봐"#, r#"봐"#, r#"봐"#, r#"봐"#, r#"봐"#),
+        (r#"봑"#, r#"봑"#, r#"봑"#, r#"봑"#, r#"봑"#),
+        (r#"봒"#, r#"봒"#, r#"봒"#, r#"봒"#, r#"봒"#),
+        (r#"봓"#, r#"봓"#, r#"봓"#, r#"봓"#, r#"봓"#),
+        (r#"봔"#, r#"봔"#, r#"봔"#, r#"봔"#, r#"봔"#),
+        (r#"봕"#, r#"봕"#, r#"봕"#, r#"봕"#, r#"봕"#),
+        (r#"봖"#, r#"봖"#, r#"봖"#, r#"봖"#, r#"봖"#),
+        (r#"봗"#, r#"봗"#, r#"봗"#, r#"봗"#, r#"봗"#),
+        (r#"봘"#, r#"봘"#, r#"봘"#, r#"봘"#, r#"봘"#),
+        (r#"봙"#, r#"봙"#, r#"봙"#, r#"봙"#, r#"봙"#),
+        (r#"봚"#, r#"봚"#, r#"봚"#, r#"봚"#, r#"봚"#),
+        (r#"봛"#, r#"봛"#, r#"봛"#, r#"봛"#, r#"봛"#),
+        (r#"봜"#, r#"봜"#, r#"봜"#, r#"봜"#, r#"봜"#),
+        (r#"봝"#, r#"봝"#, r#"봝"#, r#"봝"#, r#"봝"#),
+        (r#"봞"#, r#"봞"#, r#"봞"#, r#"봞"#, r#"봞"#),
+        (r#"봟"#, r#"봟"#, r#"봟"#, r#"봟"#, r#"봟"#),
+        (r#"봠"#, r#"봠"#, r#"봠"#, r#"봠"#, r#"봠"#),
+        (r#"봡"#, r#"봡"#, r#"봡"#, r#"봡"#, r#"봡"#),
+        (r#"봢"#, r#"봢"#, r#"봢"#, r#"봢"#, r#"봢"#),
+        (r#"봣"#, r#"봣"#, r#"봣"#, r#"봣"#, r#"봣"#),
+        (r#"봤"#, r#"봤"#, r#"봤"#, r#"봤"#, r#"봤"#),
+        (r#"봥"#, r#"봥"#, r#"봥"#, r#"봥"#, r#"봥"#),
+        (r#"봦"#, r#"봦"#, r#"봦"#, r#"봦"#, r#"봦"#),
+        (r#"봧"#, r#"봧"#, r#"봧"#, r#"봧"#, r#"봧"#),
+        (r#"봨"#, r#"봨"#, r#"봨"#, r#"봨"#, r#"봨"#),
+        (r#"봩"#, r#"봩"#, r#"봩"#, r#"봩"#, r#"봩"#),
+        (r#"봪"#, r#"봪"#, r#"봪"#, r#"봪"#, r#"봪"#),
+        (r#"봫"#, r#"봫"#, r#"봫"#, r#"봫"#, r#"봫"#),
+        (r#"봬"#, r#"봬"#, r#"봬"#, r#"봬"#, r#"봬"#),
+        (r#"봭"#, r#"봭"#, r#"봭"#, r#"봭"#, r#"봭"#),
+        (r#"봮"#, r#"봮"#, r#"봮"#, r#"봮"#, r#"봮"#),
+        (r#"봯"#, r#"봯"#, r#"봯"#, r#"봯"#, r#"봯"#),
+        (r#"봰"#, r#"봰"#, r#"봰"#, r#"봰"#, r#"봰"#),
+        (r#"봱"#, r#"봱"#, r#"봱"#, r#"봱"#, r#"봱"#),
+        (r#"봲"#, r#"봲"#, r#"봲"#, r#"봲"#, r#"봲"#),
+        (r#"봳"#, r#"봳"#, r#"봳"#, r#"봳"#, r#"봳"#),
+        (r#"봴"#, r#"봴"#, r#"봴"#, r#"봴"#, r#"봴"#),
+        (r#"봵"#, r#"봵"#, r#"봵"#, r#"봵"#, r#"봵"#),
+        (r#"봶"#, r#"봶"#, r#"봶"#, r#"봶"#, r#"봶"#),
+        (r#"봷"#, r#"봷"#, r#"봷"#, r#"봷"#, r#"봷"#),
+        (r#"봸"#, r#"봸"#, r#"봸"#, r#"봸"#, r#"봸"#),
+        (r#"봹"#, r#"봹"#, r#"봹"#, r#"봹"#, r#"봹"#),
+        (r#"봺"#, r#"봺"#, r#"봺"#, r#"봺"#, r#"봺"#),
+        (r#"봻"#, r#"봻"#, r#"봻"#, r#"봻"#, r#"봻"#),
+        (r#"봼"#, r#"봼"#, r#"봼"#, r#"봼"#, r#"봼"#),
+        (r#"봽"#, r#"봽"#, r#"봽"#, r#"봽"#, r#"봽"#),
+        (r#"봾"#, r#"봾"#, r#"봾"#, r#"봾"#, r#"봾"#),
+        (r#"봿"#, r#"봿"#, r#"봿"#, r#"봿"#, r#"봿"#),
+        (r#"뵀"#, r#"뵀"#, r#"뵀"#, r#"뵀"#, r#"뵀"#),
+        (r#"뵁"#, r#"뵁"#, r#"뵁"#, r#"뵁"#, r#"뵁"#),
+        (r#"뵂"#, r#"뵂"#, r#"뵂"#, r#"뵂"#, r#"뵂"#),
+        (r#"뵃"#, r#"뵃"#, r#"뵃"#, r#"뵃"#, r#"뵃"#),
+        (r#"뵄"#, r#"뵄"#, r#"뵄"#, r#"뵄"#, r#"뵄"#),
+        (r#"뵅"#, r#"뵅"#, r#"뵅"#, r#"뵅"#, r#"뵅"#),
+        (r#"뵆"#, r#"뵆"#, r#"뵆"#, r#"뵆"#, r#"뵆"#),
+        (r#"뵇"#, r#"뵇"#, r#"뵇"#, r#"뵇"#, r#"뵇"#),
+        (r#"뵈"#, r#"뵈"#, r#"뵈"#, r#"뵈"#, r#"뵈"#),
+        (r#"뵉"#, r#"뵉"#, r#"뵉"#, r#"뵉"#, r#"뵉"#),
+        (r#"뵊"#, r#"뵊"#, r#"뵊"#, r#"뵊"#, r#"뵊"#),
+        (r#"뵋"#, r#"뵋"#, r#"뵋"#, r#"뵋"#, r#"뵋"#),
+        (r#"뵌"#, r#"뵌"#, r#"뵌"#, r#"뵌"#, r#"뵌"#),
+        (r#"뵍"#, r#"뵍"#, r#"뵍"#, r#"뵍"#, r#"뵍"#),
+        (r#"뵎"#, r#"뵎"#, r#"뵎"#, r#"뵎"#, r#"뵎"#),
+        (r#"뵏"#, r#"뵏"#, r#"뵏"#, r#"뵏"#, r#"뵏"#),
+        (r#"뵐"#, r#"뵐"#, r#"뵐"#, r#"뵐"#, r#"뵐"#),
+        (r#"뵑"#, r#"뵑"#, r#"뵑"#, r#"뵑"#, r#"뵑"#),
+        (r#"뵒"#, r#"뵒"#, r#"뵒"#, r#"뵒"#, r#"뵒"#),
+        (r#"뵓"#, r#"뵓"#, r#"뵓"#, r#"뵓"#, r#"뵓"#),
+        (r#"뵔"#, r#"뵔"#, r#"뵔"#, r#"뵔"#, r#"뵔"#),
+        (r#"뵕"#, r#"뵕"#, r#"뵕"#, r#"뵕"#, r#"뵕"#),
+        (r#"뵖"#, r#"뵖"#, r#"뵖"#, r#"뵖"#, r#"뵖"#),
+        (r#"뵗"#, r#"뵗"#, r#"뵗"#, r#"뵗"#, r#"뵗"#),
+        (r#"뵘"#, r#"뵘"#, r#"뵘"#, r#"뵘"#, r#"뵘"#),
+        (r#"뵙"#, r#"뵙"#, r#"뵙"#, r#"뵙"#, r#"뵙"#),
+        (r#"뵚"#, r#"뵚"#, r#"뵚"#, r#"뵚"#, r#"뵚"#),
+        (r#"뵛"#, r#"뵛"#, r#"뵛"#, r#"뵛"#, r#"뵛"#),
+        (r#"뵜"#, r#"뵜"#, r#"뵜"#, r#"뵜"#, r#"뵜"#),
+        (r#"뵝"#, r#"뵝"#, r#"뵝"#, r#"뵝"#, r#"뵝"#),
+        (r#"뵞"#, r#"뵞"#, r#"뵞"#, r#"뵞"#, r#"뵞"#),
+        (r#"뵟"#, r#"뵟"#, r#"뵟"#, r#"뵟"#, r#"뵟"#),
+        (r#"뵠"#, r#"뵠"#, r#"뵠"#, r#"뵠"#, r#"뵠"#),
+        (r#"뵡"#, r#"뵡"#, r#"뵡"#, r#"뵡"#, r#"뵡"#),
+        (r#"뵢"#, r#"뵢"#, r#"뵢"#, r#"뵢"#, r#"뵢"#),
+        (r#"뵣"#, r#"뵣"#, r#"뵣"#, r#"뵣"#, r#"뵣"#),
+        (r#"뵤"#, r#"뵤"#, r#"뵤"#, r#"뵤"#, r#"뵤"#),
+        (r#"뵥"#, r#"뵥"#, r#"뵥"#, r#"뵥"#, r#"뵥"#),
+        (r#"뵦"#, r#"뵦"#, r#"뵦"#, r#"뵦"#, r#"뵦"#),
+        (r#"뵧"#, r#"뵧"#, r#"뵧"#, r#"뵧"#, r#"뵧"#),
+        (r#"뵨"#, r#"뵨"#, r#"뵨"#, r#"뵨"#, r#"뵨"#),
+        (r#"뵩"#, r#"뵩"#, r#"뵩"#, r#"뵩"#, r#"뵩"#),
+        (r#"뵪"#, r#"뵪"#, r#"뵪"#, r#"뵪"#, r#"뵪"#),
+        (r#"뵫"#, r#"뵫"#, r#"뵫"#, r#"뵫"#, r#"뵫"#),
+        (r#"뵬"#, r#"뵬"#, r#"뵬"#, r#"뵬"#, r#"뵬"#),
+        (r#"뵭"#, r#"뵭"#, r#"뵭"#, r#"뵭"#, r#"뵭"#),
+        (r#"뵮"#, r#"뵮"#, r#"뵮"#, r#"뵮"#, r#"뵮"#),
+        (r#"뵯"#, r#"뵯"#, r#"뵯"#, r#"뵯"#, r#"뵯"#),
+        (r#"뵰"#, r#"뵰"#, r#"뵰"#, r#"뵰"#, r#"뵰"#),
+        (r#"뵱"#, r#"뵱"#, r#"뵱"#, r#"뵱"#, r#"뵱"#),
+        (r#"뵲"#, r#"뵲"#, r#"뵲"#, r#"뵲"#, r#"뵲"#),
+        (r#"뵳"#, r#"뵳"#, r#"뵳"#, r#"뵳"#, r#"뵳"#),
+        (r#"뵴"#, r#"뵴"#, r#"뵴"#, r#"뵴"#, r#"뵴"#),
+        (r#"뵵"#, r#"뵵"#, r#"뵵"#, r#"뵵"#, r#"뵵"#),
+        (r#"뵶"#, r#"뵶"#, r#"뵶"#, r#"뵶"#, r#"뵶"#),
+        (r#"뵷"#, r#"뵷"#, r#"뵷"#, r#"뵷"#, r#"뵷"#),
+        (r#"뵸"#, r#"뵸"#, r#"뵸"#, r#"뵸"#, r#"뵸"#),
+        (r#"뵹"#, r#"뵹"#, r#"뵹"#, r#"뵹"#, r#"뵹"#),
+        (r#"뵺"#, r#"뵺"#, r#"뵺"#, r#"뵺"#, r#"뵺"#),
+        (r#"뵻"#, r#"뵻"#, r#"뵻"#, r#"뵻"#, r#"뵻"#),
+        (r#"뵼"#, r#"뵼"#, r#"뵼"#, r#"뵼"#, r#"뵼"#),
+        (r#"뵽"#, r#"뵽"#, r#"뵽"#, r#"뵽"#, r#"뵽"#),
+        (r#"뵾"#, r#"뵾"#, r#"뵾"#, r#"뵾"#, r#"뵾"#),
+        (r#"뵿"#, r#"뵿"#, r#"뵿"#, r#"뵿"#, r#"뵿"#),
+        (r#"부"#, r#"부"#, r#"부"#, r#"부"#, r#"부"#),
+        (r#"북"#, r#"북"#, r#"북"#, r#"북"#, r#"북"#),
+        (r#"붂"#, r#"붂"#, r#"붂"#, r#"붂"#, r#"붂"#),
+        (r#"붃"#, r#"붃"#, r#"붃"#, r#"붃"#, r#"붃"#),
+        (r#"분"#, r#"분"#, r#"분"#, r#"분"#, r#"분"#),
+        (r#"붅"#, r#"붅"#, r#"붅"#, r#"붅"#, r#"붅"#),
+        (r#"붆"#, r#"붆"#, r#"붆"#, r#"붆"#, r#"붆"#),
+        (r#"붇"#, r#"붇"#, r#"붇"#, r#"붇"#, r#"붇"#),
+        (r#"불"#, r#"불"#, r#"불"#, r#"불"#, r#"불"#),
+        (r#"붉"#, r#"붉"#, r#"붉"#, r#"붉"#, r#"붉"#),
+        (r#"붊"#, r#"붊"#, r#"붊"#, r#"붊"#, r#"붊"#),
+        (r#"붋"#, r#"붋"#, r#"붋"#, r#"붋"#, r#"붋"#),
+        (r#"붌"#, r#"붌"#, r#"붌"#, r#"붌"#, r#"붌"#),
+        (r#"붍"#, r#"붍"#, r#"붍"#, r#"붍"#, r#"붍"#),
+        (r#"붎"#, r#"붎"#, r#"붎"#, r#"붎"#, r#"붎"#),
+        (r#"붏"#, r#"붏"#, r#"붏"#, r#"붏"#, r#"붏"#),
+        (r#"붐"#, r#"붐"#, r#"붐"#, r#"붐"#, r#"붐"#),
+        (r#"붑"#, r#"붑"#, r#"붑"#, r#"붑"#, r#"붑"#),
+        (r#"붒"#, r#"붒"#, r#"붒"#, r#"붒"#, r#"붒"#),
+        (r#"붓"#, r#"붓"#, r#"붓"#, r#"붓"#, r#"붓"#),
+        (r#"붔"#, r#"붔"#, r#"붔"#, r#"붔"#, r#"붔"#),
+        (r#"붕"#, r#"붕"#, r#"붕"#, r#"붕"#, r#"붕"#),
+        (r#"붖"#, r#"붖"#, r#"붖"#, r#"붖"#, r#"붖"#),
+        (r#"붗"#, r#"붗"#, r#"붗"#, r#"붗"#, r#"붗"#),
+        (r#"붘"#, r#"붘"#, r#"붘"#, r#"붘"#, r#"붘"#),
+        (r#"붙"#, r#"붙"#, r#"붙"#, r#"붙"#, r#"붙"#),
+        (r#"붚"#, r#"붚"#, r#"붚"#, r#"붚"#, r#"붚"#),
+        (r#"붛"#, r#"붛"#, r#"붛"#, r#"붛"#, r#"붛"#),
+        (r#"붜"#, r#"붜"#, r#"붜"#, r#"붜"#, r#"붜"#),
+        (r#"붝"#, r#"붝"#, r#"붝"#, r#"붝"#, r#"붝"#),
+        (r#"붞"#, r#"붞"#, r#"붞"#, r#"붞"#, r#"붞"#),
+        (r#"붟"#, r#"붟"#, r#"붟"#, r#"붟"#, r#"붟"#),
+        (r#"붠"#, r#"붠"#, r#"붠"#, r#"붠"#, r#"붠"#),
+        (r#"붡"#, r#"붡"#, r#"붡"#, r#"붡"#, r#"붡"#),
+        (r#"붢"#, r#"붢"#, r#"붢"#, r#"붢"#, r#"붢"#),
+        (r#"붣"#, r#"붣"#, r#"붣"#, r#"붣"#, r#"붣"#),
+        (r#"붤"#, r#"붤"#, r#"붤"#, r#"붤"#, r#"붤"#),
+        (r#"붥"#, r#"붥"#, r#"붥"#, r#"붥"#, r#"붥"#),
+        (r#"붦"#, r#"붦"#, r#"붦"#, r#"붦"#, r#"붦"#),
+        (r#"붧"#, r#"붧"#, r#"붧"#, r#"붧"#, r#"붧"#),
+        (r#"붨"#, r#"붨"#, r#"붨"#, r#"붨"#, r#"붨"#),
+        (r#"붩"#, r#"붩"#, r#"붩"#, r#"붩"#, r#"붩"#),
+        (r#"붪"#, r#"붪"#, r#"붪"#, r#"붪"#, r#"붪"#),
+        (r#"붫"#, r#"붫"#, r#"붫"#, r#"붫"#, r#"붫"#),
+        (r#"붬"#, r#"붬"#, r#"붬"#, r#"붬"#, r#"붬"#),
+        (r#"붭"#, r#"붭"#, r#"붭"#, r#"붭"#, r#"붭"#),
+        (r#"붮"#, r#"붮"#, r#"붮"#, r#"붮"#, r#"붮"#),
+        (r#"붯"#, r#"붯"#, r#"붯"#, r#"붯"#, r#"붯"#),
+        (r#"붰"#, r#"붰"#, r#"붰"#, r#"붰"#, r#"붰"#),
+        (r#"붱"#, r#"붱"#, r#"붱"#, r#"붱"#, r#"붱"#),
+        (r#"붲"#, r#"붲"#, r#"붲"#, r#"붲"#, r#"붲"#),
+        (r#"붳"#, r#"붳"#, r#"붳"#, r#"붳"#, r#"붳"#),
+        (r#"붴"#, r#"붴"#, r#"붴"#, r#"붴"#, r#"붴"#),
+        (r#"붵"#, r#"붵"#, r#"붵"#, r#"붵"#, r#"붵"#),
+        (r#"붶"#, r#"붶"#, r#"붶"#, r#"붶"#, r#"붶"#),
+        (r#"붷"#, r#"붷"#, r#"붷"#, r#"붷"#, r#"붷"#),
+        (r#"붸"#, r#"붸"#, r#"붸"#, r#"붸"#, r#"붸"#),
+        (r#"붹"#, r#"붹"#, r#"붹"#, r#"붹"#, r#"붹"#),
+        (r#"붺"#, r#"붺"#, r#"붺"#, r#"붺"#, r#"붺"#),
+        (r#"붻"#, r#"붻"#, r#"붻"#, r#"붻"#, r#"붻"#),
+        (r#"붼"#, r#"붼"#, r#"붼"#, r#"붼"#, r#"붼"#),
+        (r#"붽"#, r#"붽"#, r#"붽"#, r#"붽"#, r#"붽"#),
+        (r#"붾"#, r#"붾"#, r#"붾"#, r#"붾"#, r#"붾"#),
+        (r#"붿"#, r#"붿"#, r#"붿"#, r#"붿"#, r#"붿"#),
+        (r#"뷀"#, r#"뷀"#, r#"뷀"#, r#"뷀"#, r#"뷀"#),
+        (r#"뷁"#, r#"뷁"#, r#"뷁"#, r#"뷁"#, r#"뷁"#),
+        (r#"뷂"#, r#"뷂"#, r#"뷂"#, r#"뷂"#, r#"뷂"#),
+        (r#"뷃"#, r#"뷃"#, r#"뷃"#, r#"뷃"#, r#"뷃"#),
+        (r#"뷄"#, r#"뷄"#, r#"뷄"#, r#"뷄"#, r#"뷄"#),
+        (r#"뷅"#, r#"뷅"#, r#"뷅"#, r#"뷅"#, r#"뷅"#),
+        (r#"뷆"#, r#"뷆"#, r#"뷆"#, r#"뷆"#, r#"뷆"#),
+        (r#"뷇"#, r#"뷇"#, r#"뷇"#, r#"뷇"#, r#"뷇"#),
+        (r#"뷈"#, r#"뷈"#, r#"뷈"#, r#"뷈"#, r#"뷈"#),
+        (r#"뷉"#, r#"뷉"#, r#"뷉"#, r#"뷉"#, r#"뷉"#),
+        (r#"뷊"#, r#"뷊"#, r#"뷊"#, r#"뷊"#, r#"뷊"#),
+        (r#"뷋"#, r#"뷋"#, r#"뷋"#, r#"뷋"#, r#"뷋"#),
+        (r#"뷌"#, r#"뷌"#, r#"뷌"#, r#"뷌"#, r#"뷌"#),
+        (r#"뷍"#, r#"뷍"#, r#"뷍"#, r#"뷍"#, r#"뷍"#),
+        (r#"뷎"#, r#"뷎"#, r#"뷎"#, r#"뷎"#, r#"뷎"#),
+        (r#"뷏"#, r#"뷏"#, r#"뷏"#, r#"뷏"#, r#"뷏"#),
+        (r#"뷐"#, r#"뷐"#, r#"뷐"#, r#"뷐"#, r#"뷐"#),
+        (r#"뷑"#, r#"뷑"#, r#"뷑"#, r#"뷑"#, r#"뷑"#),
+        (r#"뷒"#, r#"뷒"#, r#"뷒"#, r#"뷒"#, r#"뷒"#),
+        (r#"뷓"#, r#"뷓"#, r#"뷓"#, r#"뷓"#, r#"뷓"#),
+        (r#"뷔"#, r#"뷔"#, r#"뷔"#, r#"뷔"#, r#"뷔"#),
+        (r#"뷕"#, r#"뷕"#, r#"뷕"#, r#"뷕"#, r#"뷕"#),
+        (r#"뷖"#, r#"뷖"#, r#"뷖"#, r#"뷖"#, r#"뷖"#),
+        (r#"뷗"#, r#"뷗"#, r#"뷗"#, r#"뷗"#, r#"뷗"#),
+        (r#"뷘"#, r#"뷘"#, r#"뷘"#, r#"뷘"#, r#"뷘"#),
+        (r#"뷙"#, r#"뷙"#, r#"뷙"#, r#"뷙"#, r#"뷙"#),
+        (r#"뷚"#, r#"뷚"#, r#"뷚"#, r#"뷚"#, r#"뷚"#),
+        (r#"뷛"#, r#"뷛"#, r#"뷛"#, r#"뷛"#, r#"뷛"#),
+        (r#"뷜"#, r#"뷜"#, r#"뷜"#, r#"뷜"#, r#"뷜"#),
+        (r#"뷝"#, r#"뷝"#, r#"뷝"#, r#"뷝"#, r#"뷝"#),
+        (r#"뷞"#, r#"뷞"#, r#"뷞"#, r#"뷞"#, r#"뷞"#),
+        (r#"뷟"#, r#"뷟"#, r#"뷟"#, r#"뷟"#, r#"뷟"#),
+        (r#"뷠"#, r#"뷠"#, r#"뷠"#, r#"뷠"#, r#"뷠"#),
+        (r#"뷡"#, r#"뷡"#, r#"뷡"#, r#"뷡"#, r#"뷡"#),
+        (r#"뷢"#, r#"뷢"#, r#"뷢"#, r#"뷢"#, r#"뷢"#),
+        (r#"뷣"#, r#"뷣"#, r#"뷣"#, r#"뷣"#, r#"뷣"#),
+        (r#"뷤"#, r#"뷤"#, r#"뷤"#, r#"뷤"#, r#"뷤"#),
+        (r#"뷥"#, r#"뷥"#, r#"뷥"#, r#"뷥"#, r#"뷥"#),
+        (r#"뷦"#, r#"뷦"#, r#"뷦"#, r#"뷦"#, r#"뷦"#),
+        (r#"뷧"#, r#"뷧"#, r#"뷧"#, r#"뷧"#, r#"뷧"#),
+        (r#"뷨"#, r#"뷨"#, r#"뷨"#, r#"뷨"#, r#"뷨"#),
+        (r#"뷩"#, r#"뷩"#, r#"뷩"#, r#"뷩"#, r#"뷩"#),
+        (r#"뷪"#, r#"뷪"#, r#"뷪"#, r#"뷪"#, r#"뷪"#),
+        (r#"뷫"#, r#"뷫"#, r#"뷫"#, r#"뷫"#, r#"뷫"#),
+        (r#"뷬"#, r#"뷬"#, r#"뷬"#, r#"뷬"#, r#"뷬"#),
+        (r#"뷭"#, r#"뷭"#, r#"뷭"#, r#"뷭"#, r#"뷭"#),
+        (r#"뷮"#, r#"뷮"#, r#"뷮"#, r#"뷮"#, r#"뷮"#),
+        (r#"뷯"#, r#"뷯"#, r#"뷯"#, r#"뷯"#, r#"뷯"#),
+        (r#"뷰"#, r#"뷰"#, r#"뷰"#, r#"뷰"#, r#"뷰"#),
+        (r#"뷱"#, r#"뷱"#, r#"뷱"#, r#"뷱"#, r#"뷱"#),
+        (r#"뷲"#, r#"뷲"#, r#"뷲"#, r#"뷲"#, r#"뷲"#),
+        (r#"뷳"#, r#"뷳"#, r#"뷳"#, r#"뷳"#, r#"뷳"#),
+        (r#"뷴"#, r#"뷴"#, r#"뷴"#, r#"뷴"#, r#"뷴"#),
+        (r#"뷵"#, r#"뷵"#, r#"뷵"#, r#"뷵"#, r#"뷵"#),
+        (r#"뷶"#, r#"뷶"#, r#"뷶"#, r#"뷶"#, r#"뷶"#),
+        (r#"뷷"#, r#"뷷"#, r#"뷷"#, r#"뷷"#, r#"뷷"#),
+        (r#"뷸"#, r#"뷸"#, r#"뷸"#, r#"뷸"#, r#"뷸"#),
+        (r#"뷹"#, r#"뷹"#, r#"뷹"#, r#"뷹"#, r#"뷹"#),
+        (r#"뷺"#, r#"뷺"#, r#"뷺"#, r#"뷺"#, r#"뷺"#),
+        (r#"뷻"#, r#"뷻"#, r#"뷻"#, r#"뷻"#, r#"뷻"#),
+        (r#"뷼"#, r#"뷼"#, r#"뷼"#, r#"뷼"#, r#"뷼"#),
+        (r#"뷽"#, r#"뷽"#, r#"뷽"#, r#"뷽"#, r#"뷽"#),
+        (r#"뷾"#, r#"뷾"#, r#"뷾"#, r#"뷾"#, r#"뷾"#),
+        (r#"뷿"#, r#"뷿"#, r#"뷿"#, r#"뷿"#, r#"뷿"#),
+        (r#"븀"#, r#"븀"#, r#"븀"#, r#"븀"#, r#"븀"#),
+        (r#"븁"#, r#"븁"#, r#"븁"#, r#"븁"#, r#"븁"#),
+        (r#"븂"#, r#"븂"#, r#"븂"#, r#"븂"#, r#"븂"#),
+        (r#"븃"#, r#"븃"#, r#"븃"#, r#"븃"#, r#"븃"#),
+        (r#"븄"#, r#"븄"#, r#"븄"#, r#"븄"#, r#"븄"#),
+        (r#"븅"#, r#"븅"#, r#"븅"#, r#"븅"#, r#"븅"#),
+        (r#"븆"#, r#"븆"#, r#"븆"#, r#"븆"#, r#"븆"#),
+        (r#"븇"#, r#"븇"#, r#"븇"#, r#"븇"#, r#"븇"#),
+        (r#"븈"#, r#"븈"#, r#"븈"#, r#"븈"#, r#"븈"#),
+        (r#"븉"#, r#"븉"#, r#"븉"#, r#"븉"#, r#"븉"#),
+        (r#"븊"#, r#"븊"#, r#"븊"#, r#"븊"#, r#"븊"#),
+        (r#"븋"#, r#"븋"#, r#"븋"#, r#"븋"#, r#"븋"#),
+        (r#"브"#, r#"브"#, r#"브"#, r#"브"#, r#"브"#),
+        (r#"븍"#, r#"븍"#, r#"븍"#, r#"븍"#, r#"븍"#),
+        (r#"븎"#, r#"븎"#, r#"븎"#, r#"븎"#, r#"븎"#),
+        (r#"븏"#, r#"븏"#, r#"븏"#, r#"븏"#, r#"븏"#),
+        (r#"븐"#, r#"븐"#, r#"븐"#, r#"븐"#, r#"븐"#),
+        (r#"븑"#, r#"븑"#, r#"븑"#, r#"븑"#, r#"븑"#),
+        (r#"븒"#, r#"븒"#, r#"븒"#, r#"븒"#, r#"븒"#),
+        (r#"븓"#, r#"븓"#, r#"븓"#, r#"븓"#, r#"븓"#),
+        (r#"블"#, r#"블"#, r#"블"#, r#"블"#, r#"블"#),
+        (r#"븕"#, r#"븕"#, r#"븕"#, r#"븕"#, r#"븕"#),
+        (r#"븖"#, r#"븖"#, r#"븖"#, r#"븖"#, r#"븖"#),
+        (r#"븗"#, r#"븗"#, r#"븗"#, r#"븗"#, r#"븗"#),
+        (r#"븘"#, r#"븘"#, r#"븘"#, r#"븘"#, r#"븘"#),
+        (r#"븙"#, r#"븙"#, r#"븙"#, r#"븙"#, r#"븙"#),
+        (r#"븚"#, r#"븚"#, r#"븚"#, r#"븚"#, r#"븚"#),
+        (r#"븛"#, r#"븛"#, r#"븛"#, r#"븛"#, r#"븛"#),
+        (r#"븜"#, r#"븜"#, r#"븜"#, r#"븜"#, r#"븜"#),
+        (r#"븝"#, r#"븝"#, r#"븝"#, r#"븝"#, r#"븝"#),
+        (r#"븞"#, r#"븞"#, r#"븞"#, r#"븞"#, r#"븞"#),
+        (r#"븟"#, r#"븟"#, r#"븟"#, r#"븟"#, r#"븟"#),
+        (r#"븠"#, r#"븠"#, r#"븠"#, r#"븠"#, r#"븠"#),
+        (r#"븡"#, r#"븡"#, r#"븡"#, r#"븡"#, r#"븡"#),
+        (r#"븢"#, r#"븢"#, r#"븢"#, r#"븢"#, r#"븢"#),
+        (r#"븣"#, r#"븣"#, r#"븣"#, r#"븣"#, r#"븣"#),
+        (r#"븤"#, r#"븤"#, r#"븤"#, r#"븤"#, r#"븤"#),
+        (r#"븥"#, r#"븥"#, r#"븥"#, r#"븥"#, r#"븥"#),
+        (r#"븦"#, r#"븦"#, r#"븦"#, r#"븦"#, r#"븦"#),
+        (r#"븧"#, r#"븧"#, r#"븧"#, r#"븧"#, r#"븧"#),
+        (r#"븨"#, r#"븨"#, r#"븨"#, r#"븨"#, r#"븨"#),
+        (r#"븩"#, r#"븩"#, r#"븩"#, r#"븩"#, r#"븩"#),
+        (r#"븪"#, r#"븪"#, r#"븪"#, r#"븪"#, r#"븪"#),
+        (r#"븫"#, r#"븫"#, r#"븫"#, r#"븫"#, r#"븫"#),
+        (r#"븬"#, r#"븬"#, r#"븬"#, r#"븬"#, r#"븬"#),
+        (r#"븭"#, r#"븭"#, r#"븭"#, r#"븭"#, r#"븭"#),
+        (r#"븮"#, r#"븮"#, r#"븮"#, r#"븮"#, r#"븮"#),
+        (r#"븯"#, r#"븯"#, r#"븯"#, r#"븯"#, r#"븯"#),
+        (r#"븰"#, r#"븰"#, r#"븰"#, r#"븰"#, r#"븰"#),
+        (r#"븱"#, r#"븱"#, r#"븱"#, r#"븱"#, r#"븱"#),
+        (r#"븲"#, r#"븲"#, r#"븲"#, r#"븲"#, r#"븲"#),
+        (r#"븳"#, r#"븳"#, r#"븳"#, r#"븳"#, r#"븳"#),
+        (r#"븴"#, r#"븴"#, r#"븴"#, r#"븴"#, r#"븴"#),
+        (r#"븵"#, r#"븵"#, r#"븵"#, r#"븵"#, r#"븵"#),
+        (r#"븶"#, r#"븶"#, r#"븶"#, r#"븶"#, r#"븶"#),
+        (r#"븷"#, r#"븷"#, r#"븷"#, r#"븷"#, r#"븷"#),
+        (r#"븸"#, r#"븸"#, r#"븸"#, r#"븸"#, r#"븸"#),
+        (r#"븹"#, r#"븹"#, r#"븹"#, r#"븹"#, r#"븹"#),
+        (r#"븺"#, r#"븺"#, r#"븺"#, r#"븺"#, r#"븺"#),
+        (r#"븻"#, r#"븻"#, r#"븻"#, r#"븻"#, r#"븻"#),
+        (r#"븼"#, r#"븼"#, r#"븼"#, r#"븼"#, r#"븼"#),
+        (r#"븽"#, r#"븽"#, r#"븽"#, r#"븽"#, r#"븽"#),
+        (r#"븾"#, r#"븾"#, r#"븾"#, r#"븾"#, r#"븾"#),
+        (r#"븿"#, r#"븿"#, r#"븿"#, r#"븿"#, r#"븿"#),
+        (r#"빀"#, r#"빀"#, r#"빀"#, r#"빀"#, r#"빀"#),
+        (r#"빁"#, r#"빁"#, r#"빁"#, r#"빁"#, r#"빁"#),
+        (r#"빂"#, r#"빂"#, r#"빂"#, r#"빂"#, r#"빂"#),
+        (r#"빃"#, r#"빃"#, r#"빃"#, r#"빃"#, r#"빃"#),
+        (r#"비"#, r#"비"#, r#"비"#, r#"비"#, r#"비"#),
+        (r#"빅"#, r#"빅"#, r#"빅"#, r#"빅"#, r#"빅"#),
+        (r#"빆"#, r#"빆"#, r#"빆"#, r#"빆"#, r#"빆"#),
+        (r#"빇"#, r#"빇"#, r#"빇"#, r#"빇"#, r#"빇"#),
+        (r#"빈"#, r#"빈"#, r#"빈"#, r#"빈"#, r#"빈"#),
+        (r#"빉"#, r#"빉"#, r#"빉"#, r#"빉"#, r#"빉"#),
+        (r#"빊"#, r#"빊"#, r#"빊"#, r#"빊"#, r#"빊"#),
+        (r#"빋"#, r#"빋"#, r#"빋"#, r#"빋"#, r#"빋"#),
+        (r#"빌"#, r#"빌"#, r#"빌"#, r#"빌"#, r#"빌"#),
+        (r#"빍"#, r#"빍"#, r#"빍"#, r#"빍"#, r#"빍"#),
+        (r#"빎"#, r#"빎"#, r#"빎"#, r#"빎"#, r#"빎"#),
+        (r#"빏"#, r#"빏"#, r#"빏"#, r#"빏"#, r#"빏"#),
+        (r#"빐"#, r#"빐"#, r#"빐"#, r#"빐"#, r#"빐"#),
+        (r#"빑"#, r#"빑"#, r#"빑"#, r#"빑"#, r#"빑"#),
+        (r#"빒"#, r#"빒"#, r#"빒"#, r#"빒"#, r#"빒"#),
+        (r#"빓"#, r#"빓"#, r#"빓"#, r#"빓"#, r#"빓"#),
+        (r#"빔"#, r#"빔"#, r#"빔"#, r#"빔"#, r#"빔"#),
+        (r#"빕"#, r#"빕"#, r#"빕"#, r#"빕"#, r#"빕"#),
+        (r#"빖"#, r#"빖"#, r#"빖"#, r#"빖"#, r#"빖"#),
+        (r#"빗"#, r#"빗"#, r#"빗"#, r#"빗"#, r#"빗"#),
+        (r#"빘"#, r#"빘"#, r#"빘"#, r#"빘"#, r#"빘"#),
+        (r#"빙"#, r#"빙"#, r#"빙"#, r#"빙"#, r#"빙"#),
+        (r#"빚"#, r#"빚"#, r#"빚"#, r#"빚"#, r#"빚"#),
+        (r#"빛"#, r#"빛"#, r#"빛"#, r#"빛"#, r#"빛"#),
+        (r#"빜"#, r#"빜"#, r#"빜"#, r#"빜"#, r#"빜"#),
+        (r#"빝"#, r#"빝"#, r#"빝"#, r#"빝"#, r#"빝"#),
+        (r#"빞"#, r#"빞"#, r#"빞"#, r#"빞"#, r#"빞"#),
+        (r#"빟"#, r#"빟"#, r#"빟"#, r#"빟"#, r#"빟"#),
+        (r#"빠"#, r#"빠"#, r#"빠"#, r#"빠"#, r#"빠"#),
+        (r#"빡"#, r#"빡"#, r#"빡"#, r#"빡"#, r#"빡"#),
+        (r#"빢"#, r#"빢"#, r#"빢"#, r#"빢"#, r#"빢"#),
+        (r#"빣"#, r#"빣"#, r#"빣"#, r#"빣"#, r#"빣"#),
+        (r#"빤"#, r#"빤"#, r#"빤"#, r#"빤"#, r#"빤"#),
+        (r#"빥"#, r#"빥"#, r#"빥"#, r#"빥"#, r#"빥"#),
+        (r#"빦"#, r#"빦"#, r#"빦"#, r#"빦"#, r#"빦"#),
+        (r#"빧"#, r#"빧"#, r#"빧"#, r#"빧"#, r#"빧"#),
+        (r#"빨"#, r#"빨"#, r#"빨"#, r#"빨"#, r#"빨"#),
+        (r#"빩"#, r#"빩"#, r#"빩"#, r#"빩"#, r#"빩"#),
+        (r#"빪"#, r#"빪"#, r#"빪"#, r#"빪"#, r#"빪"#),
+        (r#"빫"#, r#"빫"#, r#"빫"#, r#"빫"#, r#"빫"#),
+        (r#"빬"#, r#"빬"#, r#"빬"#, r#"빬"#, r#"빬"#),
+        (r#"빭"#, r#"빭"#, r#"빭"#, r#"빭"#, r#"빭"#),
+        (r#"빮"#, r#"빮"#, r#"빮"#, r#"빮"#, r#"빮"#),
+        (r#"빯"#, r#"빯"#, r#"빯"#, r#"빯"#, r#"빯"#),
+        (r#"빰"#, r#"빰"#, r#"빰"#, r#"빰"#, r#"빰"#),
+        (r#"빱"#, r#"빱"#, r#"빱"#, r#"빱"#, r#"빱"#),
+        (r#"빲"#, r#"빲"#, r#"빲"#, r#"빲"#, r#"빲"#),
+        (r#"빳"#, r#"빳"#, r#"빳"#, r#"빳"#, r#"빳"#),
+        (r#"빴"#, r#"빴"#, r#"빴"#, r#"빴"#, r#"빴"#),
+        (r#"빵"#, r#"빵"#, r#"빵"#, r#"빵"#, r#"빵"#),
+        (r#"빶"#, r#"빶"#, r#"빶"#, r#"빶"#, r#"빶"#),
+        (r#"빷"#, r#"빷"#, r#"빷"#, r#"빷"#, r#"빷"#),
+        (r#"빸"#, r#"빸"#, r#"빸"#, r#"빸"#, r#"빸"#),
+        (r#"빹"#, r#"빹"#, r#"빹"#, r#"빹"#, r#"빹"#),
+        (r#"빺"#, r#"빺"#, r#"빺"#, r#"빺"#, r#"빺"#),
+        (r#"빻"#, r#"빻"#, r#"빻"#, r#"빻"#, r#"빻"#),
+        (r#"빼"#, r#"빼"#, r#"빼"#, r#"빼"#, r#"빼"#),
+        (r#"빽"#, r#"빽"#, r#"빽"#, r#"빽"#, r#"빽"#),
+        (r#"빾"#, r#"빾"#, r#"빾"#, r#"빾"#, r#"빾"#),
+        (r#"빿"#, r#"빿"#, r#"빿"#, r#"빿"#, r#"빿"#),
+        (r#"뺀"#, r#"뺀"#, r#"뺀"#, r#"뺀"#, r#"뺀"#),
+        (r#"뺁"#, r#"뺁"#, r#"뺁"#, r#"뺁"#, r#"뺁"#),
+        (r#"뺂"#, r#"뺂"#, r#"뺂"#, r#"뺂"#, r#"뺂"#),
+        (r#"뺃"#, r#"뺃"#, r#"뺃"#, r#"뺃"#, r#"뺃"#),
+        (r#"뺄"#, r#"뺄"#, r#"뺄"#, r#"뺄"#, r#"뺄"#),
+        (r#"뺅"#, r#"뺅"#, r#"뺅"#, r#"뺅"#, r#"뺅"#),
+        (r#"뺆"#, r#"뺆"#, r#"뺆"#, r#"뺆"#, r#"뺆"#),
+        (r#"뺇"#, r#"뺇"#, r#"뺇"#, r#"뺇"#, r#"뺇"#),
+        (r#"뺈"#, r#"뺈"#, r#"뺈"#, r#"뺈"#, r#"뺈"#),
+        (r#"뺉"#, r#"뺉"#, r#"뺉"#, r#"뺉"#, r#"뺉"#),
+        (r#"뺊"#, r#"뺊"#, r#"뺊"#, r#"뺊"#, r#"뺊"#),
+        (r#"뺋"#, r#"뺋"#, r#"뺋"#, r#"뺋"#, r#"뺋"#),
+        (r#"뺌"#, r#"뺌"#, r#"뺌"#, r#"뺌"#, r#"뺌"#),
+        (r#"뺍"#, r#"뺍"#, r#"뺍"#, r#"뺍"#, r#"뺍"#),
+        (r#"뺎"#, r#"뺎"#, r#"뺎"#, r#"뺎"#, r#"뺎"#),
+        (r#"뺏"#, r#"뺏"#, r#"뺏"#, r#"뺏"#, r#"뺏"#),
+        (r#"뺐"#, r#"뺐"#, r#"뺐"#, r#"뺐"#, r#"뺐"#),
+        (r#"뺑"#, r#"뺑"#, r#"뺑"#, r#"뺑"#, r#"뺑"#),
+        (r#"뺒"#, r#"뺒"#, r#"뺒"#, r#"뺒"#, r#"뺒"#),
+        (r#"뺓"#, r#"뺓"#, r#"뺓"#, r#"뺓"#, r#"뺓"#),
+        (r#"뺔"#, r#"뺔"#, r#"뺔"#, r#"뺔"#, r#"뺔"#),
+        (r#"뺕"#, r#"뺕"#, r#"뺕"#, r#"뺕"#, r#"뺕"#),
+        (r#"뺖"#, r#"뺖"#, r#"뺖"#, r#"뺖"#, r#"뺖"#),
+        (r#"뺗"#, r#"뺗"#, r#"뺗"#, r#"뺗"#, r#"뺗"#),
+        (r#"뺘"#, r#"뺘"#, r#"뺘"#, r#"뺘"#, r#"뺘"#),
+        (r#"뺙"#, r#"뺙"#, r#"뺙"#, r#"뺙"#, r#"뺙"#),
+        (r#"뺚"#, r#"뺚"#, r#"뺚"#, r#"뺚"#, r#"뺚"#),
+        (r#"뺛"#, r#"뺛"#, r#"뺛"#, r#"뺛"#, r#"뺛"#),
+        (r#"뺜"#, r#"뺜"#, r#"뺜"#, r#"뺜"#, r#"뺜"#),
+        (r#"뺝"#, r#"뺝"#, r#"뺝"#, r#"뺝"#, r#"뺝"#),
+        (r#"뺞"#, r#"뺞"#, r#"뺞"#, r#"뺞"#, r#"뺞"#),
+        (r#"뺟"#, r#"뺟"#, r#"뺟"#, r#"뺟"#, r#"뺟"#),
+        (r#"뺠"#, r#"뺠"#, r#"뺠"#, r#"뺠"#, r#"뺠"#),
+        (r#"뺡"#, r#"뺡"#, r#"뺡"#, r#"뺡"#, r#"뺡"#),
+        (r#"뺢"#, r#"뺢"#, r#"뺢"#, r#"뺢"#, r#"뺢"#),
+        (r#"뺣"#, r#"뺣"#, r#"뺣"#, r#"뺣"#, r#"뺣"#),
+        (r#"뺤"#, r#"뺤"#, r#"뺤"#, r#"뺤"#, r#"뺤"#),
+        (r#"뺥"#, r#"뺥"#, r#"뺥"#, r#"뺥"#, r#"뺥"#),
+        (r#"뺦"#, r#"뺦"#, r#"뺦"#, r#"뺦"#, r#"뺦"#),
+        (r#"뺧"#, r#"뺧"#, r#"뺧"#, r#"뺧"#, r#"뺧"#),
+        (r#"뺨"#, r#"뺨"#, r#"뺨"#, r#"뺨"#, r#"뺨"#),
+        (r#"뺩"#, r#"뺩"#, r#"뺩"#, r#"뺩"#, r#"뺩"#),
+        (r#"뺪"#, r#"뺪"#, r#"뺪"#, r#"뺪"#, r#"뺪"#),
+        (r#"뺫"#, r#"뺫"#, r#"뺫"#, r#"뺫"#, r#"뺫"#),
+        (r#"뺬"#, r#"뺬"#, r#"뺬"#, r#"뺬"#, r#"뺬"#),
+        (r#"뺭"#, r#"뺭"#, r#"뺭"#, r#"뺭"#, r#"뺭"#),
+        (r#"뺮"#, r#"뺮"#, r#"뺮"#, r#"뺮"#, r#"뺮"#),
+        (r#"뺯"#, r#"뺯"#, r#"뺯"#, r#"뺯"#, r#"뺯"#),
+        (r#"뺰"#, r#"뺰"#, r#"뺰"#, r#"뺰"#, r#"뺰"#),
+        (r#"뺱"#, r#"뺱"#, r#"뺱"#, r#"뺱"#, r#"뺱"#),
+        (r#"뺲"#, r#"뺲"#, r#"뺲"#, r#"뺲"#, r#"뺲"#),
+        (r#"뺳"#, r#"뺳"#, r#"뺳"#, r#"뺳"#, r#"뺳"#),
+        (r#"뺴"#, r#"뺴"#, r#"뺴"#, r#"뺴"#, r#"뺴"#),
+        (r#"뺵"#, r#"뺵"#, r#"뺵"#, r#"뺵"#, r#"뺵"#),
+        (r#"뺶"#, r#"뺶"#, r#"뺶"#, r#"뺶"#, r#"뺶"#),
+        (r#"뺷"#, r#"뺷"#, r#"뺷"#, r#"뺷"#, r#"뺷"#),
+        (r#"뺸"#, r#"뺸"#, r#"뺸"#, r#"뺸"#, r#"뺸"#),
+        (r#"뺹"#, r#"뺹"#, r#"뺹"#, r#"뺹"#, r#"뺹"#),
+        (r#"뺺"#, r#"뺺"#, r#"뺺"#, r#"뺺"#, r#"뺺"#),
+        (r#"뺻"#, r#"뺻"#, r#"뺻"#, r#"뺻"#, r#"뺻"#),
+        (r#"뺼"#, r#"뺼"#, r#"뺼"#, r#"뺼"#, r#"뺼"#),
+        (r#"뺽"#, r#"뺽"#, r#"뺽"#, r#"뺽"#, r#"뺽"#),
+        (r#"뺾"#, r#"뺾"#, r#"뺾"#, r#"뺾"#, r#"뺾"#),
+        (r#"뺿"#, r#"뺿"#, r#"뺿"#, r#"뺿"#, r#"뺿"#),
+        (r#"뻀"#, r#"뻀"#, r#"뻀"#, r#"뻀"#, r#"뻀"#),
+        (r#"뻁"#, r#"뻁"#, r#"뻁"#, r#"뻁"#, r#"뻁"#),
+        (r#"뻂"#, r#"뻂"#, r#"뻂"#, r#"뻂"#, r#"뻂"#),
+        (r#"뻃"#, r#"뻃"#, r#"뻃"#, r#"뻃"#, r#"뻃"#),
+        (r#"뻄"#, r#"뻄"#, r#"뻄"#, r#"뻄"#, r#"뻄"#),
+        (r#"뻅"#, r#"뻅"#, r#"뻅"#, r#"뻅"#, r#"뻅"#),
+        (r#"뻆"#, r#"뻆"#, r#"뻆"#, r#"뻆"#, r#"뻆"#),
+        (r#"뻇"#, r#"뻇"#, r#"뻇"#, r#"뻇"#, r#"뻇"#),
+        (r#"뻈"#, r#"뻈"#, r#"뻈"#, r#"뻈"#, r#"뻈"#),
+        (r#"뻉"#, r#"뻉"#, r#"뻉"#, r#"뻉"#, r#"뻉"#),
+        (r#"뻊"#, r#"뻊"#, r#"뻊"#, r#"뻊"#, r#"뻊"#),
+        (r#"뻋"#, r#"뻋"#, r#"뻋"#, r#"뻋"#, r#"뻋"#),
+        (r#"뻌"#, r#"뻌"#, r#"뻌"#, r#"뻌"#, r#"뻌"#),
+        (r#"뻍"#, r#"뻍"#, r#"뻍"#, r#"뻍"#, r#"뻍"#),
+        (r#"뻎"#, r#"뻎"#, r#"뻎"#, r#"뻎"#, r#"뻎"#),
+        (r#"뻏"#, r#"뻏"#, r#"뻏"#, r#"뻏"#, r#"뻏"#),
+        (r#"뻐"#, r#"뻐"#, r#"뻐"#, r#"뻐"#, r#"뻐"#),
+        (r#"뻑"#, r#"뻑"#, r#"뻑"#, r#"뻑"#, r#"뻑"#),
+        (r#"뻒"#, r#"뻒"#, r#"뻒"#, r#"뻒"#, r#"뻒"#),
+        (r#"뻓"#, r#"뻓"#, r#"뻓"#, r#"뻓"#, r#"뻓"#),
+        (r#"뻔"#, r#"뻔"#, r#"뻔"#, r#"뻔"#, r#"뻔"#),
+        (r#"뻕"#, r#"뻕"#, r#"뻕"#, r#"뻕"#, r#"뻕"#),
+        (r#"뻖"#, r#"뻖"#, r#"뻖"#, r#"뻖"#, r#"뻖"#),
+        (r#"뻗"#, r#"뻗"#, r#"뻗"#, r#"뻗"#, r#"뻗"#),
+        (r#"뻘"#, r#"뻘"#, r#"뻘"#, r#"뻘"#, r#"뻘"#),
+        (r#"뻙"#, r#"뻙"#, r#"뻙"#, r#"뻙"#, r#"뻙"#),
+        (r#"뻚"#, r#"뻚"#, r#"뻚"#, r#"뻚"#, r#"뻚"#),
+        (r#"뻛"#, r#"뻛"#, r#"뻛"#, r#"뻛"#, r#"뻛"#),
+        (r#"뻜"#, r#"뻜"#, r#"뻜"#, r#"뻜"#, r#"뻜"#),
+        (r#"뻝"#, r#"뻝"#, r#"뻝"#, r#"뻝"#, r#"뻝"#),
+        (r#"뻞"#, r#"뻞"#, r#"뻞"#, r#"뻞"#, r#"뻞"#),
+        (r#"뻟"#, r#"뻟"#, r#"뻟"#, r#"뻟"#, r#"뻟"#),
+        (r#"뻠"#, r#"뻠"#, r#"뻠"#, r#"뻠"#, r#"뻠"#),
+        (r#"뻡"#, r#"뻡"#, r#"뻡"#, r#"뻡"#, r#"뻡"#),
+        (r#"뻢"#, r#"뻢"#, r#"뻢"#, r#"뻢"#, r#"뻢"#),
+        (r#"뻣"#, r#"뻣"#, r#"뻣"#, r#"뻣"#, r#"뻣"#),
+        (r#"뻤"#, r#"뻤"#, r#"뻤"#, r#"뻤"#, r#"뻤"#),
+        (r#"뻥"#, r#"뻥"#, r#"뻥"#, r#"뻥"#, r#"뻥"#),
+        (r#"뻦"#, r#"뻦"#, r#"뻦"#, r#"뻦"#, r#"뻦"#),
+        (r#"뻧"#, r#"뻧"#, r#"뻧"#, r#"뻧"#, r#"뻧"#),
+        (r#"뻨"#, r#"뻨"#, r#"뻨"#, r#"뻨"#, r#"뻨"#),
+        (r#"뻩"#, r#"뻩"#, r#"뻩"#, r#"뻩"#, r#"뻩"#),
+        (r#"뻪"#, r#"뻪"#, r#"뻪"#, r#"뻪"#, r#"뻪"#),
+        (r#"뻫"#, r#"뻫"#, r#"뻫"#, r#"뻫"#, r#"뻫"#),
+        (r#"뻬"#, r#"뻬"#, r#"뻬"#, r#"뻬"#, r#"뻬"#),
+        (r#"뻭"#, r#"뻭"#, r#"뻭"#, r#"뻭"#, r#"뻭"#),
+        (r#"뻮"#, r#"뻮"#, r#"뻮"#, r#"뻮"#, r#"뻮"#),
+        (r#"뻯"#, r#"뻯"#, r#"뻯"#, r#"뻯"#, r#"뻯"#),
+        (r#"뻰"#, r#"뻰"#, r#"뻰"#, r#"뻰"#, r#"뻰"#),
+        (r#"뻱"#, r#"뻱"#, r#"뻱"#, r#"뻱"#, r#"뻱"#),
+        (r#"뻲"#, r#"뻲"#, r#"뻲"#, r#"뻲"#, r#"뻲"#),
+        (r#"뻳"#, r#"뻳"#, r#"뻳"#, r#"뻳"#, r#"뻳"#),
+        (r#"뻴"#, r#"뻴"#, r#"뻴"#, r#"뻴"#, r#"뻴"#),
+        (r#"뻵"#, r#"뻵"#, r#"뻵"#, r#"뻵"#, r#"뻵"#),
+        (r#"뻶"#, r#"뻶"#, r#"뻶"#, r#"뻶"#, r#"뻶"#),
+        (r#"뻷"#, r#"뻷"#, r#"뻷"#, r#"뻷"#, r#"뻷"#),
+        (r#"뻸"#, r#"뻸"#, r#"뻸"#, r#"뻸"#, r#"뻸"#),
+        (r#"뻹"#, r#"뻹"#, r#"뻹"#, r#"뻹"#, r#"뻹"#),
+        (r#"뻺"#, r#"뻺"#, r#"뻺"#, r#"뻺"#, r#"뻺"#),
+        (r#"뻻"#, r#"뻻"#, r#"뻻"#, r#"뻻"#, r#"뻻"#),
+        (r#"뻼"#, r#"뻼"#, r#"뻼"#, r#"뻼"#, r#"뻼"#),
+        (r#"뻽"#, r#"뻽"#, r#"뻽"#, r#"뻽"#, r#"뻽"#),
+        (r#"뻾"#, r#"뻾"#, r#"뻾"#, r#"뻾"#, r#"뻾"#),
+        (r#"뻿"#, r#"뻿"#, r#"뻿"#, r#"뻿"#, r#"뻿"#),
+        (r#"뼀"#, r#"뼀"#, r#"뼀"#, r#"뼀"#, r#"뼀"#),
+        (r#"뼁"#, r#"뼁"#, r#"뼁"#, r#"뼁"#, r#"뼁"#),
+        (r#"뼂"#, r#"뼂"#, r#"뼂"#, r#"뼂"#, r#"뼂"#),
+        (r#"뼃"#, r#"뼃"#, r#"뼃"#, r#"뼃"#, r#"뼃"#),
+        (r#"뼄"#, r#"뼄"#, r#"뼄"#, r#"뼄"#, r#"뼄"#),
+        (r#"뼅"#, r#"뼅"#, r#"뼅"#, r#"뼅"#, r#"뼅"#),
+        (r#"뼆"#, r#"뼆"#, r#"뼆"#, r#"뼆"#, r#"뼆"#),
+        (r#"뼇"#, r#"뼇"#, r#"뼇"#, r#"뼇"#, r#"뼇"#),
+        (r#"뼈"#, r#"뼈"#, r#"뼈"#, r#"뼈"#, r#"뼈"#),
+        (r#"뼉"#, r#"뼉"#, r#"뼉"#, r#"뼉"#, r#"뼉"#),
+        (r#"뼊"#, r#"뼊"#, r#"뼊"#, r#"뼊"#, r#"뼊"#),
+        (r#"뼋"#, r#"뼋"#, r#"뼋"#, r#"뼋"#, r#"뼋"#),
+        (r#"뼌"#, r#"뼌"#, r#"뼌"#, r#"뼌"#, r#"뼌"#),
+        (r#"뼍"#, r#"뼍"#, r#"뼍"#, r#"뼍"#, r#"뼍"#),
+        (r#"뼎"#, r#"뼎"#, r#"뼎"#, r#"뼎"#, r#"뼎"#),
+        (r#"뼏"#, r#"뼏"#, r#"뼏"#, r#"뼏"#, r#"뼏"#),
+        (r#"뼐"#, r#"뼐"#, r#"뼐"#, r#"뼐"#, r#"뼐"#),
+        (r#"뼑"#, r#"뼑"#, r#"뼑"#, r#"뼑"#, r#"뼑"#),
+        (r#"뼒"#, r#"뼒"#, r#"뼒"#, r#"뼒"#, r#"뼒"#),
+        (r#"뼓"#, r#"뼓"#, r#"뼓"#, r#"뼓"#, r#"뼓"#),
+        (r#"뼔"#, r#"뼔"#, r#"뼔"#, r#"뼔"#, r#"뼔"#),
+        (r#"뼕"#, r#"뼕"#, r#"뼕"#, r#"뼕"#, r#"뼕"#),
+        (r#"뼖"#, r#"뼖"#, r#"뼖"#, r#"뼖"#, r#"뼖"#),
+        (r#"뼗"#, r#"뼗"#, r#"뼗"#, r#"뼗"#, r#"뼗"#),
+        (r#"뼘"#, r#"뼘"#, r#"뼘"#, r#"뼘"#, r#"뼘"#),
+        (r#"뼙"#, r#"뼙"#, r#"뼙"#, r#"뼙"#, r#"뼙"#),
+        (r#"뼚"#, r#"뼚"#, r#"뼚"#, r#"뼚"#, r#"뼚"#),
+        (r#"뼛"#, r#"뼛"#, r#"뼛"#, r#"뼛"#, r#"뼛"#),
+        (r#"뼜"#, r#"뼜"#, r#"뼜"#, r#"뼜"#, r#"뼜"#),
+        (r#"뼝"#, r#"뼝"#, r#"뼝"#, r#"뼝"#, r#"뼝"#),
+        (r#"뼞"#, r#"뼞"#, r#"뼞"#, r#"뼞"#, r#"뼞"#),
+        (r#"뼟"#, r#"뼟"#, r#"뼟"#, r#"뼟"#, r#"뼟"#),
+        (r#"뼠"#, r#"뼠"#, r#"뼠"#, r#"뼠"#, r#"뼠"#),
+        (r#"뼡"#, r#"뼡"#, r#"뼡"#, r#"뼡"#, r#"뼡"#),
+        (r#"뼢"#, r#"뼢"#, r#"뼢"#, r#"뼢"#, r#"뼢"#),
+        (r#"뼣"#, r#"뼣"#, r#"뼣"#, r#"뼣"#, r#"뼣"#),
+        (r#"뼤"#, r#"뼤"#, r#"뼤"#, r#"뼤"#, r#"뼤"#),
+        (r#"뼥"#, r#"뼥"#, r#"뼥"#, r#"뼥"#, r#"뼥"#),
+        (r#"뼦"#, r#"뼦"#, r#"뼦"#, r#"뼦"#, r#"뼦"#),
+        (r#"뼧"#, r#"뼧"#, r#"뼧"#, r#"뼧"#, r#"뼧"#),
+        (r#"뼨"#, r#"뼨"#, r#"뼨"#, r#"뼨"#, r#"뼨"#),
+        (r#"뼩"#, r#"뼩"#, r#"뼩"#, r#"뼩"#, r#"뼩"#),
+        (r#"뼪"#, r#"뼪"#, r#"뼪"#, r#"뼪"#, r#"뼪"#),
+        (r#"뼫"#, r#"뼫"#, r#"뼫"#, r#"뼫"#, r#"뼫"#),
+        (r#"뼬"#, r#"뼬"#, r#"뼬"#, r#"뼬"#, r#"뼬"#),
+        (r#"뼭"#, r#"뼭"#, r#"뼭"#, r#"뼭"#, r#"뼭"#),
+        (r#"뼮"#, r#"뼮"#, r#"뼮"#, r#"뼮"#, r#"뼮"#),
+        (r#"뼯"#, r#"뼯"#, r#"뼯"#, r#"뼯"#, r#"뼯"#),
+        (r#"뼰"#, r#"뼰"#, r#"뼰"#, r#"뼰"#, r#"뼰"#),
+        (r#"뼱"#, r#"뼱"#, r#"뼱"#, r#"뼱"#, r#"뼱"#),
+        (r#"뼲"#, r#"뼲"#, r#"뼲"#, r#"뼲"#, r#"뼲"#),
+        (r#"뼳"#, r#"뼳"#, r#"뼳"#, r#"뼳"#, r#"뼳"#),
+        (r#"뼴"#, r#"뼴"#, r#"뼴"#, r#"뼴"#, r#"뼴"#),
+        (r#"뼵"#, r#"뼵"#, r#"뼵"#, r#"뼵"#, r#"뼵"#),
+        (r#"뼶"#, r#"뼶"#, r#"뼶"#, r#"뼶"#, r#"뼶"#),
+        (r#"뼷"#, r#"뼷"#, r#"뼷"#, r#"뼷"#, r#"뼷"#),
+        (r#"뼸"#, r#"뼸"#, r#"뼸"#, r#"뼸"#, r#"뼸"#),
+        (r#"뼹"#, r#"뼹"#, r#"뼹"#, r#"뼹"#, r#"뼹"#),
+        (r#"뼺"#, r#"뼺"#, r#"뼺"#, r#"뼺"#, r#"뼺"#),
+        (r#"뼻"#, r#"뼻"#, r#"뼻"#, r#"뼻"#, r#"뼻"#),
+        (r#"뼼"#, r#"뼼"#, r#"뼼"#, r#"뼼"#, r#"뼼"#),
+        (r#"뼽"#, r#"뼽"#, r#"뼽"#, r#"뼽"#, r#"뼽"#),
+        (r#"뼾"#, r#"뼾"#, r#"뼾"#, r#"뼾"#, r#"뼾"#),
+        (r#"뼿"#, r#"뼿"#, r#"뼿"#, r#"뼿"#, r#"뼿"#),
+        (r#"뽀"#, r#"뽀"#, r#"뽀"#, r#"뽀"#, r#"뽀"#),
+        (r#"뽁"#, r#"뽁"#, r#"뽁"#, r#"뽁"#, r#"뽁"#),
+        (r#"뽂"#, r#"뽂"#, r#"뽂"#, r#"뽂"#, r#"뽂"#),
+        (r#"뽃"#, r#"뽃"#, r#"뽃"#, r#"뽃"#, r#"뽃"#),
+        (r#"뽄"#, r#"뽄"#, r#"뽄"#, r#"뽄"#, r#"뽄"#),
+        (r#"뽅"#, r#"뽅"#, r#"뽅"#, r#"뽅"#, r#"뽅"#),
+        (r#"뽆"#, r#"뽆"#, r#"뽆"#, r#"뽆"#, r#"뽆"#),
+        (r#"뽇"#, r#"뽇"#, r#"뽇"#, r#"뽇"#, r#"뽇"#),
+        (r#"뽈"#, r#"뽈"#, r#"뽈"#, r#"뽈"#, r#"뽈"#),
+        (r#"뽉"#, r#"뽉"#, r#"뽉"#, r#"뽉"#, r#"뽉"#),
+        (r#"뽊"#, r#"뽊"#, r#"뽊"#, r#"뽊"#, r#"뽊"#),
+        (r#"뽋"#, r#"뽋"#, r#"뽋"#, r#"뽋"#, r#"뽋"#),
+        (r#"뽌"#, r#"뽌"#, r#"뽌"#, r#"뽌"#, r#"뽌"#),
+        (r#"뽍"#, r#"뽍"#, r#"뽍"#, r#"뽍"#, r#"뽍"#),
+        (r#"뽎"#, r#"뽎"#, r#"뽎"#, r#"뽎"#, r#"뽎"#),
+        (r#"뽏"#, r#"뽏"#, r#"뽏"#, r#"뽏"#, r#"뽏"#),
+        (r#"뽐"#, r#"뽐"#, r#"뽐"#, r#"뽐"#, r#"뽐"#),
+        (r#"뽑"#, r#"뽑"#, r#"뽑"#, r#"뽑"#, r#"뽑"#),
+        (r#"뽒"#, r#"뽒"#, r#"뽒"#, r#"뽒"#, r#"뽒"#),
+        (r#"뽓"#, r#"뽓"#, r#"뽓"#, r#"뽓"#, r#"뽓"#),
+        (r#"뽔"#, r#"뽔"#, r#"뽔"#, r#"뽔"#, r#"뽔"#),
+        (r#"뽕"#, r#"뽕"#, r#"뽕"#, r#"뽕"#, r#"뽕"#),
+        (r#"뽖"#, r#"뽖"#, r#"뽖"#, r#"뽖"#, r#"뽖"#),
+        (r#"뽗"#, r#"뽗"#, r#"뽗"#, r#"뽗"#, r#"뽗"#),
+        (r#"뽘"#, r#"뽘"#, r#"뽘"#, r#"뽘"#, r#"뽘"#),
+        (r#"뽙"#, r#"뽙"#, r#"뽙"#, r#"뽙"#, r#"뽙"#),
+        (r#"뽚"#, r#"뽚"#, r#"뽚"#, r#"뽚"#, r#"뽚"#),
+        (r#"뽛"#, r#"뽛"#, r#"뽛"#, r#"뽛"#, r#"뽛"#),
+        (r#"뽜"#, r#"뽜"#, r#"뽜"#, r#"뽜"#, r#"뽜"#),
+        (r#"뽝"#, r#"뽝"#, r#"뽝"#, r#"뽝"#, r#"뽝"#),
+        (r#"뽞"#, r#"뽞"#, r#"뽞"#, r#"뽞"#, r#"뽞"#),
+        (r#"뽟"#, r#"뽟"#, r#"뽟"#, r#"뽟"#, r#"뽟"#),
+        (r#"뽠"#, r#"뽠"#, r#"뽠"#, r#"뽠"#, r#"뽠"#),
+        (r#"뽡"#, r#"뽡"#, r#"뽡"#, r#"뽡"#, r#"뽡"#),
+        (r#"뽢"#, r#"뽢"#, r#"뽢"#, r#"뽢"#, r#"뽢"#),
+        (r#"뽣"#, r#"뽣"#, r#"뽣"#, r#"뽣"#, r#"뽣"#),
+        (r#"뽤"#, r#"뽤"#, r#"뽤"#, r#"뽤"#, r#"뽤"#),
+        (r#"뽥"#, r#"뽥"#, r#"뽥"#, r#"뽥"#, r#"뽥"#),
+        (r#"뽦"#, r#"뽦"#, r#"뽦"#, r#"뽦"#, r#"뽦"#),
+        (r#"뽧"#, r#"뽧"#, r#"뽧"#, r#"뽧"#, r#"뽧"#),
+        (r#"뽨"#, r#"뽨"#, r#"뽨"#, r#"뽨"#, r#"뽨"#),
+        (r#"뽩"#, r#"뽩"#, r#"뽩"#, r#"뽩"#, r#"뽩"#),
+        (r#"뽪"#, r#"뽪"#, r#"뽪"#, r#"뽪"#, r#"뽪"#),
+        (r#"뽫"#, r#"뽫"#, r#"뽫"#, r#"뽫"#, r#"뽫"#),
+        (r#"뽬"#, r#"뽬"#, r#"뽬"#, r#"뽬"#, r#"뽬"#),
+        (r#"뽭"#, r#"뽭"#, r#"뽭"#, r#"뽭"#, r#"뽭"#),
+        (r#"뽮"#, r#"뽮"#, r#"뽮"#, r#"뽮"#, r#"뽮"#),
+        (r#"뽯"#, r#"뽯"#, r#"뽯"#, r#"뽯"#, r#"뽯"#),
+        (r#"뽰"#, r#"뽰"#, r#"뽰"#, r#"뽰"#, r#"뽰"#),
+        (r#"뽱"#, r#"뽱"#, r#"뽱"#, r#"뽱"#, r#"뽱"#),
+        (r#"뽲"#, r#"뽲"#, r#"뽲"#, r#"뽲"#, r#"뽲"#),
+        (r#"뽳"#, r#"뽳"#, r#"뽳"#, r#"뽳"#, r#"뽳"#),
+        (r#"뽴"#, r#"뽴"#, r#"뽴"#, r#"뽴"#, r#"뽴"#),
+        (r#"뽵"#, r#"뽵"#, r#"뽵"#, r#"뽵"#, r#"뽵"#),
+        (r#"뽶"#, r#"뽶"#, r#"뽶"#, r#"뽶"#, r#"뽶"#),
+        (r#"뽷"#, r#"뽷"#, r#"뽷"#, r#"뽷"#, r#"뽷"#),
+        (r#"뽸"#, r#"뽸"#, r#"뽸"#, r#"뽸"#, r#"뽸"#),
+        (r#"뽹"#, r#"뽹"#, r#"뽹"#, r#"뽹"#, r#"뽹"#),
+        (r#"뽺"#, r#"뽺"#, r#"뽺"#, r#"뽺"#, r#"뽺"#),
+        (r#"뽻"#, r#"뽻"#, r#"뽻"#, r#"뽻"#, r#"뽻"#),
+        (r#"뽼"#, r#"뽼"#, r#"뽼"#, r#"뽼"#, r#"뽼"#),
+        (r#"뽽"#, r#"뽽"#, r#"뽽"#, r#"뽽"#, r#"뽽"#),
+        (r#"뽾"#, r#"뽾"#, r#"뽾"#, r#"뽾"#, r#"뽾"#),
+        (r#"뽿"#, r#"뽿"#, r#"뽿"#, r#"뽿"#, r#"뽿"#),
+        (r#"뾀"#, r#"뾀"#, r#"뾀"#, r#"뾀"#, r#"뾀"#),
+        (r#"뾁"#, r#"뾁"#, r#"뾁"#, r#"뾁"#, r#"뾁"#),
+        (r#"뾂"#, r#"뾂"#, r#"뾂"#, r#"뾂"#, r#"뾂"#),
+        (r#"뾃"#, r#"뾃"#, r#"뾃"#, r#"뾃"#, r#"뾃"#),
+        (r#"뾄"#, r#"뾄"#, r#"뾄"#, r#"뾄"#, r#"뾄"#),
+        (r#"뾅"#, r#"뾅"#, r#"뾅"#, r#"뾅"#, r#"뾅"#),
+        (r#"뾆"#, r#"뾆"#, r#"뾆"#, r#"뾆"#, r#"뾆"#),
+        (r#"뾇"#, r#"뾇"#, r#"뾇"#, r#"뾇"#, r#"뾇"#),
+        (r#"뾈"#, r#"뾈"#, r#"뾈"#, r#"뾈"#, r#"뾈"#),
+        (r#"뾉"#, r#"뾉"#, r#"뾉"#, r#"뾉"#, r#"뾉"#),
+        (r#"뾊"#, r#"뾊"#, r#"뾊"#, r#"뾊"#, r#"뾊"#),
+        (r#"뾋"#, r#"뾋"#, r#"뾋"#, r#"뾋"#, r#"뾋"#),
+        (r#"뾌"#, r#"뾌"#, r#"뾌"#, r#"뾌"#, r#"뾌"#),
+        (r#"뾍"#, r#"뾍"#, r#"뾍"#, r#"뾍"#, r#"뾍"#),
+        (r#"뾎"#, r#"뾎"#, r#"뾎"#, r#"뾎"#, r#"뾎"#),
+        (r#"뾏"#, r#"뾏"#, r#"뾏"#, r#"뾏"#, r#"뾏"#),
+        (r#"뾐"#, r#"뾐"#, r#"뾐"#, r#"뾐"#, r#"뾐"#),
+        (r#"뾑"#, r#"뾑"#, r#"뾑"#, r#"뾑"#, r#"뾑"#),
+        (r#"뾒"#, r#"뾒"#, r#"뾒"#, r#"뾒"#, r#"뾒"#),
+        (r#"뾓"#, r#"뾓"#, r#"뾓"#, r#"뾓"#, r#"뾓"#),
+        (r#"뾔"#, r#"뾔"#, r#"뾔"#, r#"뾔"#, r#"뾔"#),
+        (r#"뾕"#, r#"뾕"#, r#"뾕"#, r#"뾕"#, r#"뾕"#),
+        (r#"뾖"#, r#"뾖"#, r#"뾖"#, r#"뾖"#, r#"뾖"#),
+        (r#"뾗"#, r#"뾗"#, r#"뾗"#, r#"뾗"#, r#"뾗"#),
+        (r#"뾘"#, r#"뾘"#, r#"뾘"#, r#"뾘"#, r#"뾘"#),
+        (r#"뾙"#, r#"뾙"#, r#"뾙"#, r#"뾙"#, r#"뾙"#),
+        (r#"뾚"#, r#"뾚"#, r#"뾚"#, r#"뾚"#, r#"뾚"#),
+        (r#"뾛"#, r#"뾛"#, r#"뾛"#, r#"뾛"#, r#"뾛"#),
+        (r#"뾜"#, r#"뾜"#, r#"뾜"#, r#"뾜"#, r#"뾜"#),
+        (r#"뾝"#, r#"뾝"#, r#"뾝"#, r#"뾝"#, r#"뾝"#),
+        (r#"뾞"#, r#"뾞"#, r#"뾞"#, r#"뾞"#, r#"뾞"#),
+        (r#"뾟"#, r#"뾟"#, r#"뾟"#, r#"뾟"#, r#"뾟"#),
+        (r#"뾠"#, r#"뾠"#, r#"뾠"#, r#"뾠"#, r#"뾠"#),
+        (r#"뾡"#, r#"뾡"#, r#"뾡"#, r#"뾡"#, r#"뾡"#),
+        (r#"뾢"#, r#"뾢"#, r#"뾢"#, r#"뾢"#, r#"뾢"#),
+        (r#"뾣"#, r#"뾣"#, r#"뾣"#, r#"뾣"#, r#"뾣"#),
+        (r#"뾤"#, r#"뾤"#, r#"뾤"#, r#"뾤"#, r#"뾤"#),
+        (r#"뾥"#, r#"뾥"#, r#"뾥"#, r#"뾥"#, r#"뾥"#),
+        (r#"뾦"#, r#"뾦"#, r#"뾦"#, r#"뾦"#, r#"뾦"#),
+        (r#"뾧"#, r#"뾧"#, r#"뾧"#, r#"뾧"#, r#"뾧"#),
+        (r#"뾨"#, r#"뾨"#, r#"뾨"#, r#"뾨"#, r#"뾨"#),
+        (r#"뾩"#, r#"뾩"#, r#"뾩"#, r#"뾩"#, r#"뾩"#),
+        (r#"뾪"#, r#"뾪"#, r#"뾪"#, r#"뾪"#, r#"뾪"#),
+        (r#"뾫"#, r#"뾫"#, r#"뾫"#, r#"뾫"#, r#"뾫"#),
+        (r#"뾬"#, r#"뾬"#, r#"뾬"#, r#"뾬"#, r#"뾬"#),
+        (r#"뾭"#, r#"뾭"#, r#"뾭"#, r#"뾭"#, r#"뾭"#),
+        (r#"뾮"#, r#"뾮"#, r#"뾮"#, r#"뾮"#, r#"뾮"#),
+        (r#"뾯"#, r#"뾯"#, r#"뾯"#, r#"뾯"#, r#"뾯"#),
+        (r#"뾰"#, r#"뾰"#, r#"뾰"#, r#"뾰"#, r#"뾰"#),
+        (r#"뾱"#, r#"뾱"#, r#"뾱"#, r#"뾱"#, r#"뾱"#),
+        (r#"뾲"#, r#"뾲"#, r#"뾲"#, r#"뾲"#, r#"뾲"#),
+        (r#"뾳"#, r#"뾳"#, r#"뾳"#, r#"뾳"#, r#"뾳"#),
+        (r#"뾴"#, r#"뾴"#, r#"뾴"#, r#"뾴"#, r#"뾴"#),
+        (r#"뾵"#, r#"뾵"#, r#"뾵"#, r#"뾵"#, r#"뾵"#),
+        (r#"뾶"#, r#"뾶"#, r#"뾶"#, r#"뾶"#, r#"뾶"#),
+        (r#"뾷"#, r#"뾷"#, r#"뾷"#, r#"뾷"#, r#"뾷"#),
+        (r#"뾸"#, r#"뾸"#, r#"뾸"#, r#"뾸"#, r#"뾸"#),
+        (r#"뾹"#, r#"뾹"#, r#"뾹"#, r#"뾹"#, r#"뾹"#),
+        (r#"뾺"#, r#"뾺"#, r#"뾺"#, r#"뾺"#, r#"뾺"#),
+        (r#"뾻"#, r#"뾻"#, r#"뾻"#, r#"뾻"#, r#"뾻"#),
+        (r#"뾼"#, r#"뾼"#, r#"뾼"#, r#"뾼"#, r#"뾼"#),
+        (r#"뾽"#, r#"뾽"#, r#"뾽"#, r#"뾽"#, r#"뾽"#),
+        (r#"뾾"#, r#"뾾"#, r#"뾾"#, r#"뾾"#, r#"뾾"#),
+        (r#"뾿"#, r#"뾿"#, r#"뾿"#, r#"뾿"#, r#"뾿"#),
+        (r#"뿀"#, r#"뿀"#, r#"뿀"#, r#"뿀"#, r#"뿀"#),
+        (r#"뿁"#, r#"뿁"#, r#"뿁"#, r#"뿁"#, r#"뿁"#),
+        (r#"뿂"#, r#"뿂"#, r#"뿂"#, r#"뿂"#, r#"뿂"#),
+        (r#"뿃"#, r#"뿃"#, r#"뿃"#, r#"뿃"#, r#"뿃"#),
+        (r#"뿄"#, r#"뿄"#, r#"뿄"#, r#"뿄"#, r#"뿄"#),
+        (r#"뿅"#, r#"뿅"#, r#"뿅"#, r#"뿅"#, r#"뿅"#),
+        (r#"뿆"#, r#"뿆"#, r#"뿆"#, r#"뿆"#, r#"뿆"#),
+        (r#"뿇"#, r#"뿇"#, r#"뿇"#, r#"뿇"#, r#"뿇"#),
+        (r#"뿈"#, r#"뿈"#, r#"뿈"#, r#"뿈"#, r#"뿈"#),
+        (r#"뿉"#, r#"뿉"#, r#"뿉"#, r#"뿉"#, r#"뿉"#),
+        (r#"뿊"#, r#"뿊"#, r#"뿊"#, r#"뿊"#, r#"뿊"#),
+        (r#"뿋"#, r#"뿋"#, r#"뿋"#, r#"뿋"#, r#"뿋"#),
+        (r#"뿌"#, r#"뿌"#, r#"뿌"#, r#"뿌"#, r#"뿌"#),
+        (r#"뿍"#, r#"뿍"#, r#"뿍"#, r#"뿍"#, r#"뿍"#),
+        (r#"뿎"#, r#"뿎"#, r#"뿎"#, r#"뿎"#, r#"뿎"#),
+        (r#"뿏"#, r#"뿏"#, r#"뿏"#, r#"뿏"#, r#"뿏"#),
+        (r#"뿐"#, r#"뿐"#, r#"뿐"#, r#"뿐"#, r#"뿐"#),
+        (r#"뿑"#, r#"뿑"#, r#"뿑"#, r#"뿑"#, r#"뿑"#),
+        (r#"뿒"#, r#"뿒"#, r#"뿒"#, r#"뿒"#, r#"뿒"#),
+        (r#"뿓"#, r#"뿓"#, r#"뿓"#, r#"뿓"#, r#"뿓"#),
+        (r#"뿔"#, r#"뿔"#, r#"뿔"#, r#"뿔"#, r#"뿔"#),
+        (r#"뿕"#, r#"뿕"#, r#"뿕"#, r#"뿕"#, r#"뿕"#),
+        (r#"뿖"#, r#"뿖"#, r#"뿖"#, r#"뿖"#, r#"뿖"#),
+        (r#"뿗"#, r#"뿗"#, r#"뿗"#, r#"뿗"#, r#"뿗"#),
+        (r#"뿘"#, r#"뿘"#, r#"뿘"#, r#"뿘"#, r#"뿘"#),
+        (r#"뿙"#, r#"뿙"#, r#"뿙"#, r#"뿙"#, r#"뿙"#),
+        (r#"뿚"#, r#"뿚"#, r#"뿚"#, r#"뿚"#, r#"뿚"#),
+        (r#"뿛"#, r#"뿛"#, r#"뿛"#, r#"뿛"#, r#"뿛"#),
+        (r#"뿜"#, r#"뿜"#, r#"뿜"#, r#"뿜"#, r#"뿜"#),
+        (r#"뿝"#, r#"뿝"#, r#"뿝"#, r#"뿝"#, r#"뿝"#),
+        (r#"뿞"#, r#"뿞"#, r#"뿞"#, r#"뿞"#, r#"뿞"#),
+        (r#"뿟"#, r#"뿟"#, r#"뿟"#, r#"뿟"#, r#"뿟"#),
+        (r#"뿠"#, r#"뿠"#, r#"뿠"#, r#"뿠"#, r#"뿠"#),
+        (r#"뿡"#, r#"뿡"#, r#"뿡"#, r#"뿡"#, r#"뿡"#),
+        (r#"뿢"#, r#"뿢"#, r#"뿢"#, r#"뿢"#, r#"뿢"#),
+        (r#"뿣"#, r#"뿣"#, r#"뿣"#, r#"뿣"#, r#"뿣"#),
+        (r#"뿤"#, r#"뿤"#, r#"뿤"#, r#"뿤"#, r#"뿤"#),
+        (r#"뿥"#, r#"뿥"#, r#"뿥"#, r#"뿥"#, r#"뿥"#),
+        (r#"뿦"#, r#"뿦"#, r#"뿦"#, r#"뿦"#, r#"뿦"#),
+        (r#"뿧"#, r#"뿧"#, r#"뿧"#, r#"뿧"#, r#"뿧"#),
+        (r#"뿨"#, r#"뿨"#, r#"뿨"#, r#"뿨"#, r#"뿨"#),
+        (r#"뿩"#, r#"뿩"#, r#"뿩"#, r#"뿩"#, r#"뿩"#),
+        (r#"뿪"#, r#"뿪"#, r#"뿪"#, r#"뿪"#, r#"뿪"#),
+        (r#"뿫"#, r#"뿫"#, r#"뿫"#, r#"뿫"#, r#"뿫"#),
+        (r#"뿬"#, r#"뿬"#, r#"뿬"#, r#"뿬"#, r#"뿬"#),
+        (r#"뿭"#, r#"뿭"#, r#"뿭"#, r#"뿭"#, r#"뿭"#),
+        (r#"뿮"#, r#"뿮"#, r#"뿮"#, r#"뿮"#, r#"뿮"#),
+        (r#"뿯"#, r#"뿯"#, r#"뿯"#, r#"뿯"#, r#"뿯"#),
+        (r#"뿰"#, r#"뿰"#, r#"뿰"#, r#"뿰"#, r#"뿰"#),
+        (r#"뿱"#, r#"뿱"#, r#"뿱"#, r#"뿱"#, r#"뿱"#),
+        (r#"뿲"#, r#"뿲"#, r#"뿲"#, r#"뿲"#, r#"뿲"#),
+        (r#"뿳"#, r#"뿳"#, r#"뿳"#, r#"뿳"#, r#"뿳"#),
+        (r#"뿴"#, r#"뿴"#, r#"뿴"#, r#"뿴"#, r#"뿴"#),
+        (r#"뿵"#, r#"뿵"#, r#"뿵"#, r#"뿵"#, r#"뿵"#),
+        (r#"뿶"#, r#"뿶"#, r#"뿶"#, r#"뿶"#, r#"뿶"#),
+        (r#"뿷"#, r#"뿷"#, r#"뿷"#, r#"뿷"#, r#"뿷"#),
+        (r#"뿸"#, r#"뿸"#, r#"뿸"#, r#"뿸"#, r#"뿸"#),
+        (r#"뿹"#, r#"뿹"#, r#"뿹"#, r#"뿹"#, r#"뿹"#),
+        (r#"뿺"#, r#"뿺"#, r#"뿺"#, r#"뿺"#, r#"뿺"#),
+        (r#"뿻"#, r#"뿻"#, r#"뿻"#, r#"뿻"#, r#"뿻"#),
+        (r#"뿼"#, r#"뿼"#, r#"뿼"#, r#"뿼"#, r#"뿼"#),
+        (r#"뿽"#, r#"뿽"#, r#"뿽"#, r#"뿽"#, r#"뿽"#),
+        (r#"뿾"#, r#"뿾"#, r#"뿾"#, r#"뿾"#, r#"뿾"#),
+        (r#"뿿"#, r#"뿿"#, r#"뿿"#, r#"뿿"#, r#"뿿"#),
+        (r#"쀀"#, r#"쀀"#, r#"쀀"#, r#"쀀"#, r#"쀀"#),
+        (r#"쀁"#, r#"쀁"#, r#"쀁"#, r#"쀁"#, r#"쀁"#),
+        (r#"쀂"#, r#"쀂"#, r#"쀂"#, r#"쀂"#, r#"쀂"#),
+        (r#"쀃"#, r#"쀃"#, r#"쀃"#, r#"쀃"#, r#"쀃"#),
+        (r#"쀄"#, r#"쀄"#, r#"쀄"#, r#"쀄"#, r#"쀄"#),
+        (r#"쀅"#, r#"쀅"#, r#"쀅"#, r#"쀅"#, r#"쀅"#),
+        (r#"쀆"#, r#"쀆"#, r#"쀆"#, r#"쀆"#, r#"쀆"#),
+        (r#"쀇"#, r#"쀇"#, r#"쀇"#, r#"쀇"#, r#"쀇"#),
+        (r#"쀈"#, r#"쀈"#, r#"쀈"#, r#"쀈"#, r#"쀈"#),
+        (r#"쀉"#, r#"쀉"#, r#"쀉"#, r#"쀉"#, r#"쀉"#),
+        (r#"쀊"#, r#"쀊"#, r#"쀊"#, r#"쀊"#, r#"쀊"#),
+        (r#"쀋"#, r#"쀋"#, r#"쀋"#, r#"쀋"#, r#"쀋"#),
+        (r#"쀌"#, r#"쀌"#, r#"쀌"#, r#"쀌"#, r#"쀌"#),
+        (r#"쀍"#, r#"쀍"#, r#"쀍"#, r#"쀍"#, r#"쀍"#),
+        (r#"쀎"#, r#"쀎"#, r#"쀎"#, r#"쀎"#, r#"쀎"#),
+        (r#"쀏"#, r#"쀏"#, r#"쀏"#, r#"쀏"#, r#"쀏"#),
+        (r#"쀐"#, r#"쀐"#, r#"쀐"#, r#"쀐"#, r#"쀐"#),
+        (r#"쀑"#, r#"쀑"#, r#"쀑"#, r#"쀑"#, r#"쀑"#),
+        (r#"쀒"#, r#"쀒"#, r#"쀒"#, r#"쀒"#, r#"쀒"#),
+        (r#"쀓"#, r#"쀓"#, r#"쀓"#, r#"쀓"#, r#"쀓"#),
+        (r#"쀔"#, r#"쀔"#, r#"쀔"#, r#"쀔"#, r#"쀔"#),
+        (r#"쀕"#, r#"쀕"#, r#"쀕"#, r#"쀕"#, r#"쀕"#),
+        (r#"쀖"#, r#"쀖"#, r#"쀖"#, r#"쀖"#, r#"쀖"#),
+        (r#"쀗"#, r#"쀗"#, r#"쀗"#, r#"쀗"#, r#"쀗"#),
+        (r#"쀘"#, r#"쀘"#, r#"쀘"#, r#"쀘"#, r#"쀘"#),
+        (r#"쀙"#, r#"쀙"#, r#"쀙"#, r#"쀙"#, r#"쀙"#),
+        (r#"쀚"#, r#"쀚"#, r#"쀚"#, r#"쀚"#, r#"쀚"#),
+        (r#"쀛"#, r#"쀛"#, r#"쀛"#, r#"쀛"#, r#"쀛"#),
+        (r#"쀜"#, r#"쀜"#, r#"쀜"#, r#"쀜"#, r#"쀜"#),
+        (r#"쀝"#, r#"쀝"#, r#"쀝"#, r#"쀝"#, r#"쀝"#),
+        (r#"쀞"#, r#"쀞"#, r#"쀞"#, r#"쀞"#, r#"쀞"#),
+        (r#"쀟"#, r#"쀟"#, r#"쀟"#, r#"쀟"#, r#"쀟"#),
+        (r#"쀠"#, r#"쀠"#, r#"쀠"#, r#"쀠"#, r#"쀠"#),
+        (r#"쀡"#, r#"쀡"#, r#"쀡"#, r#"쀡"#, r#"쀡"#),
+        (r#"쀢"#, r#"쀢"#, r#"쀢"#, r#"쀢"#, r#"쀢"#),
+        (r#"쀣"#, r#"쀣"#, r#"쀣"#, r#"쀣"#, r#"쀣"#),
+        (r#"쀤"#, r#"쀤"#, r#"쀤"#, r#"쀤"#, r#"쀤"#),
+        (r#"쀥"#, r#"쀥"#, r#"쀥"#, r#"쀥"#, r#"쀥"#),
+        (r#"쀦"#, r#"쀦"#, r#"쀦"#, r#"쀦"#, r#"쀦"#),
+        (r#"쀧"#, r#"쀧"#, r#"쀧"#, r#"쀧"#, r#"쀧"#),
+        (r#"쀨"#, r#"쀨"#, r#"쀨"#, r#"쀨"#, r#"쀨"#),
+        (r#"쀩"#, r#"쀩"#, r#"쀩"#, r#"쀩"#, r#"쀩"#),
+        (r#"쀪"#, r#"쀪"#, r#"쀪"#, r#"쀪"#, r#"쀪"#),
+        (r#"쀫"#, r#"쀫"#, r#"쀫"#, r#"쀫"#, r#"쀫"#),
+        (r#"쀬"#, r#"쀬"#, r#"쀬"#, r#"쀬"#, r#"쀬"#),
+        (r#"쀭"#, r#"쀭"#, r#"쀭"#, r#"쀭"#, r#"쀭"#),
+        (r#"쀮"#, r#"쀮"#, r#"쀮"#, r#"쀮"#, r#"쀮"#),
+        (r#"쀯"#, r#"쀯"#, r#"쀯"#, r#"쀯"#, r#"쀯"#),
+        (r#"쀰"#, r#"쀰"#, r#"쀰"#, r#"쀰"#, r#"쀰"#),
+        (r#"쀱"#, r#"쀱"#, r#"쀱"#, r#"쀱"#, r#"쀱"#),
+        (r#"쀲"#, r#"쀲"#, r#"쀲"#, r#"쀲"#, r#"쀲"#),
+        (r#"쀳"#, r#"쀳"#, r#"쀳"#, r#"쀳"#, r#"쀳"#),
+        (r#"쀴"#, r#"쀴"#, r#"쀴"#, r#"쀴"#, r#"쀴"#),
+        (r#"쀵"#, r#"쀵"#, r#"쀵"#, r#"쀵"#, r#"쀵"#),
+        (r#"쀶"#, r#"쀶"#, r#"쀶"#, r#"쀶"#, r#"쀶"#),
+        (r#"쀷"#, r#"쀷"#, r#"쀷"#, r#"쀷"#, r#"쀷"#),
+        (r#"쀸"#, r#"쀸"#, r#"쀸"#, r#"쀸"#, r#"쀸"#),
+        (r#"쀹"#, r#"쀹"#, r#"쀹"#, r#"쀹"#, r#"쀹"#),
+        (r#"쀺"#, r#"쀺"#, r#"쀺"#, r#"쀺"#, r#"쀺"#),
+        (r#"쀻"#, r#"쀻"#, r#"쀻"#, r#"쀻"#, r#"쀻"#),
+        (r#"쀼"#, r#"쀼"#, r#"쀼"#, r#"쀼"#, r#"쀼"#),
+        (r#"쀽"#, r#"쀽"#, r#"쀽"#, r#"쀽"#, r#"쀽"#),
+        (r#"쀾"#, r#"쀾"#, r#"쀾"#, r#"쀾"#, r#"쀾"#),
+        (r#"쀿"#, r#"쀿"#, r#"쀿"#, r#"쀿"#, r#"쀿"#),
+        (r#"쁀"#, r#"쁀"#, r#"쁀"#, r#"쁀"#, r#"쁀"#),
+        (r#"쁁"#, r#"쁁"#, r#"쁁"#, r#"쁁"#, r#"쁁"#),
+        (r#"쁂"#, r#"쁂"#, r#"쁂"#, r#"쁂"#, r#"쁂"#),
+        (r#"쁃"#, r#"쁃"#, r#"쁃"#, r#"쁃"#, r#"쁃"#),
+        (r#"쁄"#, r#"쁄"#, r#"쁄"#, r#"쁄"#, r#"쁄"#),
+        (r#"쁅"#, r#"쁅"#, r#"쁅"#, r#"쁅"#, r#"쁅"#),
+        (r#"쁆"#, r#"쁆"#, r#"쁆"#, r#"쁆"#, r#"쁆"#),
+        (r#"쁇"#, r#"쁇"#, r#"쁇"#, r#"쁇"#, r#"쁇"#),
+        (r#"쁈"#, r#"쁈"#, r#"쁈"#, r#"쁈"#, r#"쁈"#),
+        (r#"쁉"#, r#"쁉"#, r#"쁉"#, r#"쁉"#, r#"쁉"#),
+        (r#"쁊"#, r#"쁊"#, r#"쁊"#, r#"쁊"#, r#"쁊"#),
+        (r#"쁋"#, r#"쁋"#, r#"쁋"#, r#"쁋"#, r#"쁋"#),
+        (r#"쁌"#, r#"쁌"#, r#"쁌"#, r#"쁌"#, r#"쁌"#),
+        (r#"쁍"#, r#"쁍"#, r#"쁍"#, r#"쁍"#, r#"쁍"#),
+        (r#"쁎"#, r#"쁎"#, r#"쁎"#, r#"쁎"#, r#"쁎"#),
+        (r#"쁏"#, r#"쁏"#, r#"쁏"#, r#"쁏"#, r#"쁏"#),
+        (r#"쁐"#, r#"쁐"#, r#"쁐"#, r#"쁐"#, r#"쁐"#),
+        (r#"쁑"#, r#"쁑"#, r#"쁑"#, r#"쁑"#, r#"쁑"#),
+        (r#"쁒"#, r#"쁒"#, r#"쁒"#, r#"쁒"#, r#"쁒"#),
+        (r#"쁓"#, r#"쁓"#, r#"쁓"#, r#"쁓"#, r#"쁓"#),
+        (r#"쁔"#, r#"쁔"#, r#"쁔"#, r#"쁔"#, r#"쁔"#),
+        (r#"쁕"#, r#"쁕"#, r#"쁕"#, r#"쁕"#, r#"쁕"#),
+        (r#"쁖"#, r#"쁖"#, r#"쁖"#, r#"쁖"#, r#"쁖"#),
+        (r#"쁗"#, r#"쁗"#, r#"쁗"#, r#"쁗"#, r#"쁗"#),
+        (r#"쁘"#, r#"쁘"#, r#"쁘"#, r#"쁘"#, r#"쁘"#),
+        (r#"쁙"#, r#"쁙"#, r#"쁙"#, r#"쁙"#, r#"쁙"#),
+        (r#"쁚"#, r#"쁚"#, r#"쁚"#, r#"쁚"#, r#"쁚"#),
+        (r#"쁛"#, r#"쁛"#, r#"쁛"#, r#"쁛"#, r#"쁛"#),
+        (r#"쁜"#, r#"쁜"#, r#"쁜"#, r#"쁜"#, r#"쁜"#),
+        (r#"쁝"#, r#"쁝"#, r#"쁝"#, r#"쁝"#, r#"쁝"#),
+        (r#"쁞"#, r#"쁞"#, r#"쁞"#, r#"쁞"#, r#"쁞"#),
+        (r#"쁟"#, r#"쁟"#, r#"쁟"#, r#"쁟"#, r#"쁟"#),
+        (r#"쁠"#, r#"쁠"#, r#"쁠"#, r#"쁠"#, r#"쁠"#),
+        (r#"쁡"#, r#"쁡"#, r#"쁡"#, r#"쁡"#, r#"쁡"#),
+        (r#"쁢"#, r#"쁢"#, r#"쁢"#, r#"쁢"#, r#"쁢"#),
+        (r#"쁣"#, r#"쁣"#, r#"쁣"#, r#"쁣"#, r#"쁣"#),
+        (r#"쁤"#, r#"쁤"#, r#"쁤"#, r#"쁤"#, r#"쁤"#),
+        (r#"쁥"#, r#"쁥"#, r#"쁥"#, r#"쁥"#, r#"쁥"#),
+        (r#"쁦"#, r#"쁦"#, r#"쁦"#, r#"쁦"#, r#"쁦"#),
+        (r#"쁧"#, r#"쁧"#, r#"쁧"#, r#"쁧"#, r#"쁧"#),
+        (r#"쁨"#, r#"쁨"#, r#"쁨"#, r#"쁨"#, r#"쁨"#),
+        (r#"쁩"#, r#"쁩"#, r#"쁩"#, r#"쁩"#, r#"쁩"#),
+        (r#"쁪"#, r#"쁪"#, r#"쁪"#, r#"쁪"#, r#"쁪"#),
+        (r#"쁫"#, r#"쁫"#, r#"쁫"#, r#"쁫"#, r#"쁫"#),
+        (r#"쁬"#, r#"쁬"#, r#"쁬"#, r#"쁬"#, r#"쁬"#),
+        (r#"쁭"#, r#"쁭"#, r#"쁭"#, r#"쁭"#, r#"쁭"#),
+        (r#"쁮"#, r#"쁮"#, r#"쁮"#, r#"쁮"#, r#"쁮"#),
+        (r#"쁯"#, r#"쁯"#, r#"쁯"#, r#"쁯"#, r#"쁯"#),
+        (r#"쁰"#, r#"쁰"#, r#"쁰"#, r#"쁰"#, r#"쁰"#),
+        (r#"쁱"#, r#"쁱"#, r#"쁱"#, r#"쁱"#, r#"쁱"#),
+        (r#"쁲"#, r#"쁲"#, r#"쁲"#, r#"쁲"#, r#"쁲"#),
+        (r#"쁳"#, r#"쁳"#, r#"쁳"#, r#"쁳"#, r#"쁳"#),
+        (r#"쁴"#, r#"쁴"#, r#"쁴"#, r#"쁴"#, r#"쁴"#),
+        (r#"쁵"#, r#"쁵"#, r#"쁵"#, r#"쁵"#, r#"쁵"#),
+        (r#"쁶"#, r#"쁶"#, r#"쁶"#, r#"쁶"#, r#"쁶"#),
+        (r#"쁷"#, r#"쁷"#, r#"쁷"#, r#"쁷"#, r#"쁷"#),
+        (r#"쁸"#, r#"쁸"#, r#"쁸"#, r#"쁸"#, r#"쁸"#),
+        (r#"쁹"#, r#"쁹"#, r#"쁹"#, r#"쁹"#, r#"쁹"#),
+        (r#"쁺"#, r#"쁺"#, r#"쁺"#, r#"쁺"#, r#"쁺"#),
+        (r#"쁻"#, r#"쁻"#, r#"쁻"#, r#"쁻"#, r#"쁻"#),
+        (r#"쁼"#, r#"쁼"#, r#"쁼"#, r#"쁼"#, r#"쁼"#),
+        (r#"쁽"#, r#"쁽"#, r#"쁽"#, r#"쁽"#, r#"쁽"#),
+        (r#"쁾"#, r#"쁾"#, r#"쁾"#, r#"쁾"#, r#"쁾"#),
+        (r#"쁿"#, r#"쁿"#, r#"쁿"#, r#"쁿"#, r#"쁿"#),
+        (r#"삀"#, r#"삀"#, r#"삀"#, r#"삀"#, r#"삀"#),
+        (r#"삁"#, r#"삁"#, r#"삁"#, r#"삁"#, r#"삁"#),
+        (r#"삂"#, r#"삂"#, r#"삂"#, r#"삂"#, r#"삂"#),
+        (r#"삃"#, r#"삃"#, r#"삃"#, r#"삃"#, r#"삃"#),
+        (r#"삄"#, r#"삄"#, r#"삄"#, r#"삄"#, r#"삄"#),
+        (r#"삅"#, r#"삅"#, r#"삅"#, r#"삅"#, r#"삅"#),
+        (r#"삆"#, r#"삆"#, r#"삆"#, r#"삆"#, r#"삆"#),
+        (r#"삇"#, r#"삇"#, r#"삇"#, r#"삇"#, r#"삇"#),
+        (r#"삈"#, r#"삈"#, r#"삈"#, r#"삈"#, r#"삈"#),
+        (r#"삉"#, r#"삉"#, r#"삉"#, r#"삉"#, r#"삉"#),
+        (r#"삊"#, r#"삊"#, r#"삊"#, r#"삊"#, r#"삊"#),
+        (r#"삋"#, r#"삋"#, r#"삋"#, r#"삋"#, r#"삋"#),
+        (r#"삌"#, r#"삌"#, r#"삌"#, r#"삌"#, r#"삌"#),
+        (r#"삍"#, r#"삍"#, r#"삍"#, r#"삍"#, r#"삍"#),
+        (r#"삎"#, r#"삎"#, r#"삎"#, r#"삎"#, r#"삎"#),
+        (r#"삏"#, r#"삏"#, r#"삏"#, r#"삏"#, r#"삏"#),
+        (r#"삐"#, r#"삐"#, r#"삐"#, r#"삐"#, r#"삐"#),
+        (r#"삑"#, r#"삑"#, r#"삑"#, r#"삑"#, r#"삑"#),
+        (r#"삒"#, r#"삒"#, r#"삒"#, r#"삒"#, r#"삒"#),
+        (r#"삓"#, r#"삓"#, r#"삓"#, r#"삓"#, r#"삓"#),
+        (r#"삔"#, r#"삔"#, r#"삔"#, r#"삔"#, r#"삔"#),
+        (r#"삕"#, r#"삕"#, r#"삕"#, r#"삕"#, r#"삕"#),
+        (r#"삖"#, r#"삖"#, r#"삖"#, r#"삖"#, r#"삖"#),
+        (r#"삗"#, r#"삗"#, r#"삗"#, r#"삗"#, r#"삗"#),
+        (r#"삘"#, r#"삘"#, r#"삘"#, r#"삘"#, r#"삘"#),
+        (r#"삙"#, r#"삙"#, r#"삙"#, r#"삙"#, r#"삙"#),
+        (r#"삚"#, r#"삚"#, r#"삚"#, r#"삚"#, r#"삚"#),
+        (r#"삛"#, r#"삛"#, r#"삛"#, r#"삛"#, r#"삛"#),
+        (r#"삜"#, r#"삜"#, r#"삜"#, r#"삜"#, r#"삜"#),
+        (r#"삝"#, r#"삝"#, r#"삝"#, r#"삝"#, r#"삝"#),
+        (r#"삞"#, r#"삞"#, r#"삞"#, r#"삞"#, r#"삞"#),
+        (r#"삟"#, r#"삟"#, r#"삟"#, r#"삟"#, r#"삟"#),
+        (r#"삠"#, r#"삠"#, r#"삠"#, r#"삠"#, r#"삠"#),
+        (r#"삡"#, r#"삡"#, r#"삡"#, r#"삡"#, r#"삡"#),
+        (r#"삢"#, r#"삢"#, r#"삢"#, r#"삢"#, r#"삢"#),
+        (r#"삣"#, r#"삣"#, r#"삣"#, r#"삣"#, r#"삣"#),
+        (r#"삤"#, r#"삤"#, r#"삤"#, r#"삤"#, r#"삤"#),
+        (r#"삥"#, r#"삥"#, r#"삥"#, r#"삥"#, r#"삥"#),
+        (r#"삦"#, r#"삦"#, r#"삦"#, r#"삦"#, r#"삦"#),
+        (r#"삧"#, r#"삧"#, r#"삧"#, r#"삧"#, r#"삧"#),
+        (r#"삨"#, r#"삨"#, r#"삨"#, r#"삨"#, r#"삨"#),
+        (r#"삩"#, r#"삩"#, r#"삩"#, r#"삩"#, r#"삩"#),
+        (r#"삪"#, r#"삪"#, r#"삪"#, r#"삪"#, r#"삪"#),
+        (r#"삫"#, r#"삫"#, r#"삫"#, r#"삫"#, r#"삫"#),
+        (r#"사"#, r#"사"#, r#"사"#, r#"사"#, r#"사"#),
+        (r#"삭"#, r#"삭"#, r#"삭"#, r#"삭"#, r#"삭"#),
+        (r#"삮"#, r#"삮"#, r#"삮"#, r#"삮"#, r#"삮"#),
+        (r#"삯"#, r#"삯"#, r#"삯"#, r#"삯"#, r#"삯"#),
+        (r#"산"#, r#"산"#, r#"산"#, r#"산"#, r#"산"#),
+        (r#"삱"#, r#"삱"#, r#"삱"#, r#"삱"#, r#"삱"#),
+        (r#"삲"#, r#"삲"#, r#"삲"#, r#"삲"#, r#"삲"#),
+        (r#"삳"#, r#"삳"#, r#"삳"#, r#"삳"#, r#"삳"#),
+        (r#"살"#, r#"살"#, r#"살"#, r#"살"#, r#"살"#),
+        (r#"삵"#, r#"삵"#, r#"삵"#, r#"삵"#, r#"삵"#),
+        (r#"삶"#, r#"삶"#, r#"삶"#, r#"삶"#, r#"삶"#),
+        (r#"삷"#, r#"삷"#, r#"삷"#, r#"삷"#, r#"삷"#),
+        (r#"삸"#, r#"삸"#, r#"삸"#, r#"삸"#, r#"삸"#),
+        (r#"삹"#, r#"삹"#, r#"삹"#, r#"삹"#, r#"삹"#),
+        (r#"삺"#, r#"삺"#, r#"삺"#, r#"삺"#, r#"삺"#),
+        (r#"삻"#, r#"삻"#, r#"삻"#, r#"삻"#, r#"삻"#),
+        (r#"삼"#, r#"삼"#, r#"삼"#, r#"삼"#, r#"삼"#),
+        (r#"삽"#, r#"삽"#, r#"삽"#, r#"삽"#, r#"삽"#),
+        (r#"삾"#, r#"삾"#, r#"삾"#, r#"삾"#, r#"삾"#),
+        (r#"삿"#, r#"삿"#, r#"삿"#, r#"삿"#, r#"삿"#),
+        (r#"샀"#, r#"샀"#, r#"샀"#, r#"샀"#, r#"샀"#),
+        (r#"상"#, r#"상"#, r#"상"#, r#"상"#, r#"상"#),
+        (r#"샂"#, r#"샂"#, r#"샂"#, r#"샂"#, r#"샂"#),
+        (r#"샃"#, r#"샃"#, r#"샃"#, r#"샃"#, r#"샃"#),
+        (r#"샄"#, r#"샄"#, r#"샄"#, r#"샄"#, r#"샄"#),
+        (r#"샅"#, r#"샅"#, r#"샅"#, r#"샅"#, r#"샅"#),
+        (r#"샆"#, r#"샆"#, r#"샆"#, r#"샆"#, r#"샆"#),
+        (r#"샇"#, r#"샇"#, r#"샇"#, r#"샇"#, r#"샇"#),
+        (r#"새"#, r#"새"#, r#"새"#, r#"새"#, r#"새"#),
+        (r#"색"#, r#"색"#, r#"색"#, r#"색"#, r#"색"#),
+        (r#"샊"#, r#"샊"#, r#"샊"#, r#"샊"#, r#"샊"#),
+        (r#"샋"#, r#"샋"#, r#"샋"#, r#"샋"#, r#"샋"#),
+        (r#"샌"#, r#"샌"#, r#"샌"#, r#"샌"#, r#"샌"#),
+        (r#"샍"#, r#"샍"#, r#"샍"#, r#"샍"#, r#"샍"#),
+        (r#"샎"#, r#"샎"#, r#"샎"#, r#"샎"#, r#"샎"#),
+        (r#"샏"#, r#"샏"#, r#"샏"#, r#"샏"#, r#"샏"#),
+        (r#"샐"#, r#"샐"#, r#"샐"#, r#"샐"#, r#"샐"#),
+        (r#"샑"#, r#"샑"#, r#"샑"#, r#"샑"#, r#"샑"#),
+        (r#"샒"#, r#"샒"#, r#"샒"#, r#"샒"#, r#"샒"#),
+        (r#"샓"#, r#"샓"#, r#"샓"#, r#"샓"#, r#"샓"#),
+        (r#"샔"#, r#"샔"#, r#"샔"#, r#"샔"#, r#"샔"#),
+        (r#"샕"#, r#"샕"#, r#"샕"#, r#"샕"#, r#"샕"#),
+        (r#"샖"#, r#"샖"#, r#"샖"#, r#"샖"#, r#"샖"#),
+        (r#"샗"#, r#"샗"#, r#"샗"#, r#"샗"#, r#"샗"#),
+        (r#"샘"#, r#"샘"#, r#"샘"#, r#"샘"#, r#"샘"#),
+        (r#"샙"#, r#"샙"#, r#"샙"#, r#"샙"#, r#"샙"#),
+        (r#"샚"#, r#"샚"#, r#"샚"#, r#"샚"#, r#"샚"#),
+        (r#"샛"#, r#"샛"#, r#"샛"#, r#"샛"#, r#"샛"#),
+        (r#"샜"#, r#"샜"#, r#"샜"#, r#"샜"#, r#"샜"#),
+        (r#"생"#, r#"생"#, r#"생"#, r#"생"#, r#"생"#),
+        (r#"샞"#, r#"샞"#, r#"샞"#, r#"샞"#, r#"샞"#),
+        (r#"샟"#, r#"샟"#, r#"샟"#, r#"샟"#, r#"샟"#),
+        (r#"샠"#, r#"샠"#, r#"샠"#, r#"샠"#, r#"샠"#),
+        (r#"샡"#, r#"샡"#, r#"샡"#, r#"샡"#, r#"샡"#),
+        (r#"샢"#, r#"샢"#, r#"샢"#, r#"샢"#, r#"샢"#),
+        (r#"샣"#, r#"샣"#, r#"샣"#, r#"샣"#, r#"샣"#),
+        (r#"샤"#, r#"샤"#, r#"샤"#, r#"샤"#, r#"샤"#),
+        (r#"샥"#, r#"샥"#, r#"샥"#, r#"샥"#, r#"샥"#),
+        (r#"샦"#, r#"샦"#, r#"샦"#, r#"샦"#, r#"샦"#),
+        (r#"샧"#, r#"샧"#, r#"샧"#, r#"샧"#, r#"샧"#),
+        (r#"샨"#, r#"샨"#, r#"샨"#, r#"샨"#, r#"샨"#),
+        (r#"샩"#, r#"샩"#, r#"샩"#, r#"샩"#, r#"샩"#),
+        (r#"샪"#, r#"샪"#, r#"샪"#, r#"샪"#, r#"샪"#),
+        (r#"샫"#, r#"샫"#, r#"샫"#, r#"샫"#, r#"샫"#),
+        (r#"샬"#, r#"샬"#, r#"샬"#, r#"샬"#, r#"샬"#),
+        (r#"샭"#, r#"샭"#, r#"샭"#, r#"샭"#, r#"샭"#),
+        (r#"샮"#, r#"샮"#, r#"샮"#, r#"샮"#, r#"샮"#),
+        (r#"샯"#, r#"샯"#, r#"샯"#, r#"샯"#, r#"샯"#),
+        (r#"샰"#, r#"샰"#, r#"샰"#, r#"샰"#, r#"샰"#),
+        (r#"샱"#, r#"샱"#, r#"샱"#, r#"샱"#, r#"샱"#),
+        (r#"샲"#, r#"샲"#, r#"샲"#, r#"샲"#, r#"샲"#),
+        (r#"샳"#, r#"샳"#, r#"샳"#, r#"샳"#, r#"샳"#),
+        (r#"샴"#, r#"샴"#, r#"샴"#, r#"샴"#, r#"샴"#),
+        (r#"샵"#, r#"샵"#, r#"샵"#, r#"샵"#, r#"샵"#),
+        (r#"샶"#, r#"샶"#, r#"샶"#, r#"샶"#, r#"샶"#),
+        (r#"샷"#, r#"샷"#, r#"샷"#, r#"샷"#, r#"샷"#),
+        (r#"샸"#, r#"샸"#, r#"샸"#, r#"샸"#, r#"샸"#),
+        (r#"샹"#, r#"샹"#, r#"샹"#, r#"샹"#, r#"샹"#),
+        (r#"샺"#, r#"샺"#, r#"샺"#, r#"샺"#, r#"샺"#),
+        (r#"샻"#, r#"샻"#, r#"샻"#, r#"샻"#, r#"샻"#),
+        (r#"샼"#, r#"샼"#, r#"샼"#, r#"샼"#, r#"샼"#),
+        (r#"샽"#, r#"샽"#, r#"샽"#, r#"샽"#, r#"샽"#),
+        (r#"샾"#, r#"샾"#, r#"샾"#, r#"샾"#, r#"샾"#),
+        (r#"샿"#, r#"샿"#, r#"샿"#, r#"샿"#, r#"샿"#),
+        (r#"섀"#, r#"섀"#, r#"섀"#, r#"섀"#, r#"섀"#),
+        (r#"섁"#, r#"섁"#, r#"섁"#, r#"섁"#, r#"섁"#),
+        (r#"섂"#, r#"섂"#, r#"섂"#, r#"섂"#, r#"섂"#),
+        (r#"섃"#, r#"섃"#, r#"섃"#, r#"섃"#, r#"섃"#),
+        (r#"섄"#, r#"섄"#, r#"섄"#, r#"섄"#, r#"섄"#),
+        (r#"섅"#, r#"섅"#, r#"섅"#, r#"섅"#, r#"섅"#),
+        (r#"섆"#, r#"섆"#, r#"섆"#, r#"섆"#, r#"섆"#),
+        (r#"섇"#, r#"섇"#, r#"섇"#, r#"섇"#, r#"섇"#),
+        (r#"섈"#, r#"섈"#, r#"섈"#, r#"섈"#, r#"섈"#),
+        (r#"섉"#, r#"섉"#, r#"섉"#, r#"섉"#, r#"섉"#),
+        (r#"섊"#, r#"섊"#, r#"섊"#, r#"섊"#, r#"섊"#),
+        (r#"섋"#, r#"섋"#, r#"섋"#, r#"섋"#, r#"섋"#),
+        (r#"섌"#, r#"섌"#, r#"섌"#, r#"섌"#, r#"섌"#),
+        (r#"섍"#, r#"섍"#, r#"섍"#, r#"섍"#, r#"섍"#),
+        (r#"섎"#, r#"섎"#, r#"섎"#, r#"섎"#, r#"섎"#),
+        (r#"섏"#, r#"섏"#, r#"섏"#, r#"섏"#, r#"섏"#),
+        (r#"섐"#, r#"섐"#, r#"섐"#, r#"섐"#, r#"섐"#),
+        (r#"섑"#, r#"섑"#, r#"섑"#, r#"섑"#, r#"섑"#),
+        (r#"섒"#, r#"섒"#, r#"섒"#, r#"섒"#, r#"섒"#),
+        (r#"섓"#, r#"섓"#, r#"섓"#, r#"섓"#, r#"섓"#),
+        (r#"섔"#, r#"섔"#, r#"섔"#, r#"섔"#, r#"섔"#),
+        (r#"섕"#, r#"섕"#, r#"섕"#, r#"섕"#, r#"섕"#),
+        (r#"섖"#, r#"섖"#, r#"섖"#, r#"섖"#, r#"섖"#),
+        (r#"섗"#, r#"섗"#, r#"섗"#, r#"섗"#, r#"섗"#),
+        (r#"섘"#, r#"섘"#, r#"섘"#, r#"섘"#, r#"섘"#),
+        (r#"섙"#, r#"섙"#, r#"섙"#, r#"섙"#, r#"섙"#),
+        (r#"섚"#, r#"섚"#, r#"섚"#, r#"섚"#, r#"섚"#),
+        (r#"섛"#, r#"섛"#, r#"섛"#, r#"섛"#, r#"섛"#),
+        (r#"서"#, r#"서"#, r#"서"#, r#"서"#, r#"서"#),
+        (r#"석"#, r#"석"#, r#"석"#, r#"석"#, r#"석"#),
+        (r#"섞"#, r#"섞"#, r#"섞"#, r#"섞"#, r#"섞"#),
+        (r#"섟"#, r#"섟"#, r#"섟"#, r#"섟"#, r#"섟"#),
+        (r#"선"#, r#"선"#, r#"선"#, r#"선"#, r#"선"#),
+        (r#"섡"#, r#"섡"#, r#"섡"#, r#"섡"#, r#"섡"#),
+        (r#"섢"#, r#"섢"#, r#"섢"#, r#"섢"#, r#"섢"#),
+        (r#"섣"#, r#"섣"#, r#"섣"#, r#"섣"#, r#"섣"#),
+        (r#"설"#, r#"설"#, r#"설"#, r#"설"#, r#"설"#),
+        (r#"섥"#, r#"섥"#, r#"섥"#, r#"섥"#, r#"섥"#),
+        (r#"섦"#, r#"섦"#, r#"섦"#, r#"섦"#, r#"섦"#),
+        (r#"섧"#, r#"섧"#, r#"섧"#, r#"섧"#, r#"섧"#),
+        (r#"섨"#, r#"섨"#, r#"섨"#, r#"섨"#, r#"섨"#),
+        (r#"섩"#, r#"섩"#, r#"섩"#, r#"섩"#, r#"섩"#),
+        (r#"섪"#, r#"섪"#, r#"섪"#, r#"섪"#, r#"섪"#),
+        (r#"섫"#, r#"섫"#, r#"섫"#, r#"섫"#, r#"섫"#),
+        (r#"섬"#, r#"섬"#, r#"섬"#, r#"섬"#, r#"섬"#),
+        (r#"섭"#, r#"섭"#, r#"섭"#, r#"섭"#, r#"섭"#),
+        (r#"섮"#, r#"섮"#, r#"섮"#, r#"섮"#, r#"섮"#),
+        (r#"섯"#, r#"섯"#, r#"섯"#, r#"섯"#, r#"섯"#),
+        (r#"섰"#, r#"섰"#, r#"섰"#, r#"섰"#, r#"섰"#),
+        (r#"성"#, r#"성"#, r#"성"#, r#"성"#, r#"성"#),
+        (r#"섲"#, r#"섲"#, r#"섲"#, r#"섲"#, r#"섲"#),
+        (r#"섳"#, r#"섳"#, r#"섳"#, r#"섳"#, r#"섳"#),
+        (r#"섴"#, r#"섴"#, r#"섴"#, r#"섴"#, r#"섴"#),
+        (r#"섵"#, r#"섵"#, r#"섵"#, r#"섵"#, r#"섵"#),
+        (r#"섶"#, r#"섶"#, r#"섶"#, r#"섶"#, r#"섶"#),
+        (r#"섷"#, r#"섷"#, r#"섷"#, r#"섷"#, r#"섷"#),
+        (r#"세"#, r#"세"#, r#"세"#, r#"세"#, r#"세"#),
+        (r#"섹"#, r#"섹"#, r#"섹"#, r#"섹"#, r#"섹"#),
+        (r#"섺"#, r#"섺"#, r#"섺"#, r#"섺"#, r#"섺"#),
+        (r#"섻"#, r#"섻"#, r#"섻"#, r#"섻"#, r#"섻"#),
+        (r#"센"#, r#"센"#, r#"센"#, r#"센"#, r#"센"#),
+        (r#"섽"#, r#"섽"#, r#"섽"#, r#"섽"#, r#"섽"#),
+        (r#"섾"#, r#"섾"#, r#"섾"#, r#"섾"#, r#"섾"#),
+        (r#"섿"#, r#"섿"#, r#"섿"#, r#"섿"#, r#"섿"#),
+        (r#"셀"#, r#"셀"#, r#"셀"#, r#"셀"#, r#"셀"#),
+        (r#"셁"#, r#"셁"#, r#"셁"#, r#"셁"#, r#"셁"#),
+        (r#"셂"#, r#"셂"#, r#"셂"#, r#"셂"#, r#"셂"#),
+        (r#"셃"#, r#"셃"#, r#"셃"#, r#"셃"#, r#"셃"#),
+        (r#"셄"#, r#"셄"#, r#"셄"#, r#"셄"#, r#"셄"#),
+        (r#"셅"#, r#"셅"#, r#"셅"#, r#"셅"#, r#"셅"#),
+        (r#"셆"#, r#"셆"#, r#"셆"#, r#"셆"#, r#"셆"#),
+        (r#"셇"#, r#"셇"#, r#"셇"#, r#"셇"#, r#"셇"#),
+        (r#"셈"#, r#"셈"#, r#"셈"#, r#"셈"#, r#"셈"#),
+        (r#"셉"#, r#"셉"#, r#"셉"#, r#"셉"#, r#"셉"#),
+        (r#"셊"#, r#"셊"#, r#"셊"#, r#"셊"#, r#"셊"#),
+        (r#"셋"#, r#"셋"#, r#"셋"#, r#"셋"#, r#"셋"#),
+        (r#"셌"#, r#"셌"#, r#"셌"#, r#"셌"#, r#"셌"#),
+        (r#"셍"#, r#"셍"#, r#"셍"#, r#"셍"#, r#"셍"#),
+        (r#"셎"#, r#"셎"#, r#"셎"#, r#"셎"#, r#"셎"#),
+        (r#"셏"#, r#"셏"#, r#"셏"#, r#"셏"#, r#"셏"#),
+        (r#"셐"#, r#"셐"#, r#"셐"#, r#"셐"#, r#"셐"#),
+        (r#"셑"#, r#"셑"#, r#"셑"#, r#"셑"#, r#"셑"#),
+        (r#"셒"#, r#"셒"#, r#"셒"#, r#"셒"#, r#"셒"#),
+        (r#"셓"#, r#"셓"#, r#"셓"#, r#"셓"#, r#"셓"#),
+        (r#"셔"#, r#"셔"#, r#"셔"#, r#"셔"#, r#"셔"#),
+        (r#"셕"#, r#"셕"#, r#"셕"#, r#"셕"#, r#"셕"#),
+        (r#"셖"#, r#"셖"#, r#"셖"#, r#"셖"#, r#"셖"#),
+        (r#"셗"#, r#"셗"#, r#"셗"#, r#"셗"#, r#"셗"#),
+        (r#"션"#, r#"션"#, r#"션"#, r#"션"#, r#"션"#),
+        (r#"셙"#, r#"셙"#, r#"셙"#, r#"셙"#, r#"셙"#),
+        (r#"셚"#, r#"셚"#, r#"셚"#, r#"셚"#, r#"셚"#),
+        (r#"셛"#, r#"셛"#, r#"셛"#, r#"셛"#, r#"셛"#),
+        (r#"셜"#, r#"셜"#, r#"셜"#, r#"셜"#, r#"셜"#),
+        (r#"셝"#, r#"셝"#, r#"셝"#, r#"셝"#, r#"셝"#),
+        (r#"셞"#, r#"셞"#, r#"셞"#, r#"셞"#, r#"셞"#),
+        (r#"셟"#, r#"셟"#, r#"셟"#, r#"셟"#, r#"셟"#),
+        (r#"셠"#, r#"셠"#, r#"셠"#, r#"셠"#, r#"셠"#),
+        (r#"셡"#, r#"셡"#, r#"셡"#, r#"셡"#, r#"셡"#),
+        (r#"셢"#, r#"셢"#, r#"셢"#, r#"셢"#, r#"셢"#),
+        (r#"셣"#, r#"셣"#, r#"셣"#, r#"셣"#, r#"셣"#),
+        (r#"셤"#, r#"셤"#, r#"셤"#, r#"셤"#, r#"셤"#),
+        (r#"셥"#, r#"셥"#, r#"셥"#, r#"셥"#, r#"셥"#),
+        (r#"셦"#, r#"셦"#, r#"셦"#, r#"셦"#, r#"셦"#),
+        (r#"셧"#, r#"셧"#, r#"셧"#, r#"셧"#, r#"셧"#),
+        (r#"셨"#, r#"셨"#, r#"셨"#, r#"셨"#, r#"셨"#),
+        (r#"셩"#, r#"셩"#, r#"셩"#, r#"셩"#, r#"셩"#),
+        (r#"셪"#, r#"셪"#, r#"셪"#, r#"셪"#, r#"셪"#),
+        (r#"셫"#, r#"셫"#, r#"셫"#, r#"셫"#, r#"셫"#),
+        (r#"셬"#, r#"셬"#, r#"셬"#, r#"셬"#, r#"셬"#),
+        (r#"셭"#, r#"셭"#, r#"셭"#, r#"셭"#, r#"셭"#),
+        (r#"셮"#, r#"셮"#, r#"셮"#, r#"셮"#, r#"셮"#),
+        (r#"셯"#, r#"셯"#, r#"셯"#, r#"셯"#, r#"셯"#),
+        (r#"셰"#, r#"셰"#, r#"셰"#, r#"셰"#, r#"셰"#),
+        (r#"셱"#, r#"셱"#, r#"셱"#, r#"셱"#, r#"셱"#),
+        (r#"셲"#, r#"셲"#, r#"셲"#, r#"셲"#, r#"셲"#),
+        (r#"셳"#, r#"셳"#, r#"셳"#, r#"셳"#, r#"셳"#),
+        (r#"셴"#, r#"셴"#, r#"셴"#, r#"셴"#, r#"셴"#),
+        (r#"셵"#, r#"셵"#, r#"셵"#, r#"셵"#, r#"셵"#),
+        (r#"셶"#, r#"셶"#, r#"셶"#, r#"셶"#, r#"셶"#),
+        (r#"셷"#, r#"셷"#, r#"셷"#, r#"셷"#, r#"셷"#),
+        (r#"셸"#, r#"셸"#, r#"셸"#, r#"셸"#, r#"셸"#),
+        (r#"셹"#, r#"셹"#, r#"셹"#, r#"셹"#, r#"셹"#),
+        (r#"셺"#, r#"셺"#, r#"셺"#, r#"셺"#, r#"셺"#),
+        (r#"셻"#, r#"셻"#, r#"셻"#, r#"셻"#, r#"셻"#),
+        (r#"셼"#, r#"셼"#, r#"셼"#, r#"셼"#, r#"셼"#),
+        (r#"셽"#, r#"셽"#, r#"셽"#, r#"셽"#, r#"셽"#),
+        (r#"셾"#, r#"셾"#, r#"셾"#, r#"셾"#, r#"셾"#),
+        (r#"셿"#, r#"셿"#, r#"셿"#, r#"셿"#, r#"셿"#),
+        (r#"솀"#, r#"솀"#, r#"솀"#, r#"솀"#, r#"솀"#),
+        (r#"솁"#, r#"솁"#, r#"솁"#, r#"솁"#, r#"솁"#),
+        (r#"솂"#, r#"솂"#, r#"솂"#, r#"솂"#, r#"솂"#),
+        (r#"솃"#, r#"솃"#, r#"솃"#, r#"솃"#, r#"솃"#),
+        (r#"솄"#, r#"솄"#, r#"솄"#, r#"솄"#, r#"솄"#),
+        (r#"솅"#, r#"솅"#, r#"솅"#, r#"솅"#, r#"솅"#),
+        (r#"솆"#, r#"솆"#, r#"솆"#, r#"솆"#, r#"솆"#),
+        (r#"솇"#, r#"솇"#, r#"솇"#, r#"솇"#, r#"솇"#),
+        (r#"솈"#, r#"솈"#, r#"솈"#, r#"솈"#, r#"솈"#),
+        (r#"솉"#, r#"솉"#, r#"솉"#, r#"솉"#, r#"솉"#),
+        (r#"솊"#, r#"솊"#, r#"솊"#, r#"솊"#, r#"솊"#),
+        (r#"솋"#, r#"솋"#, r#"솋"#, r#"솋"#, r#"솋"#),
+        (r#"소"#, r#"소"#, r#"소"#, r#"소"#, r#"소"#),
+        (r#"속"#, r#"속"#, r#"속"#, r#"속"#, r#"속"#),
+        (r#"솎"#, r#"솎"#, r#"솎"#, r#"솎"#, r#"솎"#),
+        (r#"솏"#, r#"솏"#, r#"솏"#, r#"솏"#, r#"솏"#),
+        (r#"손"#, r#"손"#, r#"손"#, r#"손"#, r#"손"#),
+        (r#"솑"#, r#"솑"#, r#"솑"#, r#"솑"#, r#"솑"#),
+        (r#"솒"#, r#"솒"#, r#"솒"#, r#"솒"#, r#"솒"#),
+        (r#"솓"#, r#"솓"#, r#"솓"#, r#"솓"#, r#"솓"#),
+        (r#"솔"#, r#"솔"#, r#"솔"#, r#"솔"#, r#"솔"#),
+        (r#"솕"#, r#"솕"#, r#"솕"#, r#"솕"#, r#"솕"#),
+        (r#"솖"#, r#"솖"#, r#"솖"#, r#"솖"#, r#"솖"#),
+        (r#"솗"#, r#"솗"#, r#"솗"#, r#"솗"#, r#"솗"#),
+        (r#"솘"#, r#"솘"#, r#"솘"#, r#"솘"#, r#"솘"#),
+        (r#"솙"#, r#"솙"#, r#"솙"#, r#"솙"#, r#"솙"#),
+        (r#"솚"#, r#"솚"#, r#"솚"#, r#"솚"#, r#"솚"#),
+        (r#"솛"#, r#"솛"#, r#"솛"#, r#"솛"#, r#"솛"#),
+        (r#"솜"#, r#"솜"#, r#"솜"#, r#"솜"#, r#"솜"#),
+        (r#"솝"#, r#"솝"#, r#"솝"#, r#"솝"#, r#"솝"#),
+        (r#"솞"#, r#"솞"#, r#"솞"#, r#"솞"#, r#"솞"#),
+        (r#"솟"#, r#"솟"#, r#"솟"#, r#"솟"#, r#"솟"#),
+        (r#"솠"#, r#"솠"#, r#"솠"#, r#"솠"#, r#"솠"#),
+        (r#"송"#, r#"송"#, r#"송"#, r#"송"#, r#"송"#),
+        (r#"솢"#, r#"솢"#, r#"솢"#, r#"솢"#, r#"솢"#),
+        (r#"솣"#, r#"솣"#, r#"솣"#, r#"솣"#, r#"솣"#),
+        (r#"솤"#, r#"솤"#, r#"솤"#, r#"솤"#, r#"솤"#),
+        (r#"솥"#, r#"솥"#, r#"솥"#, r#"솥"#, r#"솥"#),
+        (r#"솦"#, r#"솦"#, r#"솦"#, r#"솦"#, r#"솦"#),
+        (r#"솧"#, r#"솧"#, r#"솧"#, r#"솧"#, r#"솧"#),
+        (r#"솨"#, r#"솨"#, r#"솨"#, r#"솨"#, r#"솨"#),
+        (r#"솩"#, r#"솩"#, r#"솩"#, r#"솩"#, r#"솩"#),
+        (r#"솪"#, r#"솪"#, r#"솪"#, r#"솪"#, r#"솪"#),
+        (r#"솫"#, r#"솫"#, r#"솫"#, r#"솫"#, r#"솫"#),
+        (r#"솬"#, r#"솬"#, r#"솬"#, r#"솬"#, r#"솬"#),
+        (r#"솭"#, r#"솭"#, r#"솭"#, r#"솭"#, r#"솭"#),
+        (r#"솮"#, r#"솮"#, r#"솮"#, r#"솮"#, r#"솮"#),
+        (r#"솯"#, r#"솯"#, r#"솯"#, r#"솯"#, r#"솯"#),
+        (r#"솰"#, r#"솰"#, r#"솰"#, r#"솰"#, r#"솰"#),
+        (r#"솱"#, r#"솱"#, r#"솱"#, r#"솱"#, r#"솱"#),
+        (r#"솲"#, r#"솲"#, r#"솲"#, r#"솲"#, r#"솲"#),
+        (r#"솳"#, r#"솳"#, r#"솳"#, r#"솳"#, r#"솳"#),
+        (r#"솴"#, r#"솴"#, r#"솴"#, r#"솴"#, r#"솴"#),
+        (r#"솵"#, r#"솵"#, r#"솵"#, r#"솵"#, r#"솵"#),
+        (r#"솶"#, r#"솶"#, r#"솶"#, r#"솶"#, r#"솶"#),
+        (r#"솷"#, r#"솷"#, r#"솷"#, r#"솷"#, r#"솷"#),
+        (r#"솸"#, r#"솸"#, r#"솸"#, r#"솸"#, r#"솸"#),
+        (r#"솹"#, r#"솹"#, r#"솹"#, r#"솹"#, r#"솹"#),
+        (r#"솺"#, r#"솺"#, r#"솺"#, r#"솺"#, r#"솺"#),
+        (r#"솻"#, r#"솻"#, r#"솻"#, r#"솻"#, r#"솻"#),
+        (r#"솼"#, r#"솼"#, r#"솼"#, r#"솼"#, r#"솼"#),
+        (r#"솽"#, r#"솽"#, r#"솽"#, r#"솽"#, r#"솽"#),
+        (r#"솾"#, r#"솾"#, r#"솾"#, r#"솾"#, r#"솾"#),
+        (r#"솿"#, r#"솿"#, r#"솿"#, r#"솿"#, r#"솿"#),
+        (r#"쇀"#, r#"쇀"#, r#"쇀"#, r#"쇀"#, r#"쇀"#),
+        (r#"쇁"#, r#"쇁"#, r#"쇁"#, r#"쇁"#, r#"쇁"#),
+        (r#"쇂"#, r#"쇂"#, r#"쇂"#, r#"쇂"#, r#"쇂"#),
+        (r#"쇃"#, r#"쇃"#, r#"쇃"#, r#"쇃"#, r#"쇃"#),
+        (r#"쇄"#, r#"쇄"#, r#"쇄"#, r#"쇄"#, r#"쇄"#),
+        (r#"쇅"#, r#"쇅"#, r#"쇅"#, r#"쇅"#, r#"쇅"#),
+        (r#"쇆"#, r#"쇆"#, r#"쇆"#, r#"쇆"#, r#"쇆"#),
+        (r#"쇇"#, r#"쇇"#, r#"쇇"#, r#"쇇"#, r#"쇇"#),
+        (r#"쇈"#, r#"쇈"#, r#"쇈"#, r#"쇈"#, r#"쇈"#),
+        (r#"쇉"#, r#"쇉"#, r#"쇉"#, r#"쇉"#, r#"쇉"#),
+        (r#"쇊"#, r#"쇊"#, r#"쇊"#, r#"쇊"#, r#"쇊"#),
+        (r#"쇋"#, r#"쇋"#, r#"쇋"#, r#"쇋"#, r#"쇋"#),
+        (r#"쇌"#, r#"쇌"#, r#"쇌"#, r#"쇌"#, r#"쇌"#),
+        (r#"쇍"#, r#"쇍"#, r#"쇍"#, r#"쇍"#, r#"쇍"#),
+        (r#"쇎"#, r#"쇎"#, r#"쇎"#, r#"쇎"#, r#"쇎"#),
+        (r#"쇏"#, r#"쇏"#, r#"쇏"#, r#"쇏"#, r#"쇏"#),
+        (r#"쇐"#, r#"쇐"#, r#"쇐"#, r#"쇐"#, r#"쇐"#),
+        (r#"쇑"#, r#"쇑"#, r#"쇑"#, r#"쇑"#, r#"쇑"#),
+        (r#"쇒"#, r#"쇒"#, r#"쇒"#, r#"쇒"#, r#"쇒"#),
+        (r#"쇓"#, r#"쇓"#, r#"쇓"#, r#"쇓"#, r#"쇓"#),
+        (r#"쇔"#, r#"쇔"#, r#"쇔"#, r#"쇔"#, r#"쇔"#),
+        (r#"쇕"#, r#"쇕"#, r#"쇕"#, r#"쇕"#, r#"쇕"#),
+        (r#"쇖"#, r#"쇖"#, r#"쇖"#, r#"쇖"#, r#"쇖"#),
+        (r#"쇗"#, r#"쇗"#, r#"쇗"#, r#"쇗"#, r#"쇗"#),
+        (r#"쇘"#, r#"쇘"#, r#"쇘"#, r#"쇘"#, r#"쇘"#),
+        (r#"쇙"#, r#"쇙"#, r#"쇙"#, r#"쇙"#, r#"쇙"#),
+        (r#"쇚"#, r#"쇚"#, r#"쇚"#, r#"쇚"#, r#"쇚"#),
+        (r#"쇛"#, r#"쇛"#, r#"쇛"#, r#"쇛"#, r#"쇛"#),
+        (r#"쇜"#, r#"쇜"#, r#"쇜"#, r#"쇜"#, r#"쇜"#),
+        (r#"쇝"#, r#"쇝"#, r#"쇝"#, r#"쇝"#, r#"쇝"#),
+        (r#"쇞"#, r#"쇞"#, r#"쇞"#, r#"쇞"#, r#"쇞"#),
+        (r#"쇟"#, r#"쇟"#, r#"쇟"#, r#"쇟"#, r#"쇟"#),
+        (r#"쇠"#, r#"쇠"#, r#"쇠"#, r#"쇠"#, r#"쇠"#),
+        (r#"쇡"#, r#"쇡"#, r#"쇡"#, r#"쇡"#, r#"쇡"#),
+        (r#"쇢"#, r#"쇢"#, r#"쇢"#, r#"쇢"#, r#"쇢"#),
+        (r#"쇣"#, r#"쇣"#, r#"쇣"#, r#"쇣"#, r#"쇣"#),
+        (r#"쇤"#, r#"쇤"#, r#"쇤"#, r#"쇤"#, r#"쇤"#),
+        (r#"쇥"#, r#"쇥"#, r#"쇥"#, r#"쇥"#, r#"쇥"#),
+        (r#"쇦"#, r#"쇦"#, r#"쇦"#, r#"쇦"#, r#"쇦"#),
+        (r#"쇧"#, r#"쇧"#, r#"쇧"#, r#"쇧"#, r#"쇧"#),
+        (r#"쇨"#, r#"쇨"#, r#"쇨"#, r#"쇨"#, r#"쇨"#),
+        (r#"쇩"#, r#"쇩"#, r#"쇩"#, r#"쇩"#, r#"쇩"#),
+        (r#"쇪"#, r#"쇪"#, r#"쇪"#, r#"쇪"#, r#"쇪"#),
+        (r#"쇫"#, r#"쇫"#, r#"쇫"#, r#"쇫"#, r#"쇫"#),
+        (r#"쇬"#, r#"쇬"#, r#"쇬"#, r#"쇬"#, r#"쇬"#),
+        (r#"쇭"#, r#"쇭"#, r#"쇭"#, r#"쇭"#, r#"쇭"#),
+        (r#"쇮"#, r#"쇮"#, r#"쇮"#, r#"쇮"#, r#"쇮"#),
+        (r#"쇯"#, r#"쇯"#, r#"쇯"#, r#"쇯"#, r#"쇯"#),
+        (r#"쇰"#, r#"쇰"#, r#"쇰"#, r#"쇰"#, r#"쇰"#),
+        (r#"쇱"#, r#"쇱"#, r#"쇱"#, r#"쇱"#, r#"쇱"#),
+        (r#"쇲"#, r#"쇲"#, r#"쇲"#, r#"쇲"#, r#"쇲"#),
+        (r#"쇳"#, r#"쇳"#, r#"쇳"#, r#"쇳"#, r#"쇳"#),
+        (r#"쇴"#, r#"쇴"#, r#"쇴"#, r#"쇴"#, r#"쇴"#),
+        (r#"쇵"#, r#"쇵"#, r#"쇵"#, r#"쇵"#, r#"쇵"#),
+        (r#"쇶"#, r#"쇶"#, r#"쇶"#, r#"쇶"#, r#"쇶"#),
+        (r#"쇷"#, r#"쇷"#, r#"쇷"#, r#"쇷"#, r#"쇷"#),
+        (r#"쇸"#, r#"쇸"#, r#"쇸"#, r#"쇸"#, r#"쇸"#),
+        (r#"쇹"#, r#"쇹"#, r#"쇹"#, r#"쇹"#, r#"쇹"#),
+        (r#"쇺"#, r#"쇺"#, r#"쇺"#, r#"쇺"#, r#"쇺"#),
+        (r#"쇻"#, r#"쇻"#, r#"쇻"#, r#"쇻"#, r#"쇻"#),
+        (r#"쇼"#, r#"쇼"#, r#"쇼"#, r#"쇼"#, r#"쇼"#),
+        (r#"쇽"#, r#"쇽"#, r#"쇽"#, r#"쇽"#, r#"쇽"#),
+        (r#"쇾"#, r#"쇾"#, r#"쇾"#, r#"쇾"#, r#"쇾"#),
+        (r#"쇿"#, r#"쇿"#, r#"쇿"#, r#"쇿"#, r#"쇿"#),
+        (r#"숀"#, r#"숀"#, r#"숀"#, r#"숀"#, r#"숀"#),
+        (r#"숁"#, r#"숁"#, r#"숁"#, r#"숁"#, r#"숁"#),
+        (r#"숂"#, r#"숂"#, r#"숂"#, r#"숂"#, r#"숂"#),
+        (r#"숃"#, r#"숃"#, r#"숃"#, r#"숃"#, r#"숃"#),
+        (r#"숄"#, r#"숄"#, r#"숄"#, r#"숄"#, r#"숄"#),
+        (r#"숅"#, r#"숅"#, r#"숅"#, r#"숅"#, r#"숅"#),
+        (r#"숆"#, r#"숆"#, r#"숆"#, r#"숆"#, r#"숆"#),
+        (r#"숇"#, r#"숇"#, r#"숇"#, r#"숇"#, r#"숇"#),
+        (r#"숈"#, r#"숈"#, r#"숈"#, r#"숈"#, r#"숈"#),
+        (r#"숉"#, r#"숉"#, r#"숉"#, r#"숉"#, r#"숉"#),
+        (r#"숊"#, r#"숊"#, r#"숊"#, r#"숊"#, r#"숊"#),
+        (r#"숋"#, r#"숋"#, r#"숋"#, r#"숋"#, r#"숋"#),
+        (r#"숌"#, r#"숌"#, r#"숌"#, r#"숌"#, r#"숌"#),
+        (r#"숍"#, r#"숍"#, r#"숍"#, r#"숍"#, r#"숍"#),
+        (r#"숎"#, r#"숎"#, r#"숎"#, r#"숎"#, r#"숎"#),
+        (r#"숏"#, r#"숏"#, r#"숏"#, r#"숏"#, r#"숏"#),
+        (r#"숐"#, r#"숐"#, r#"숐"#, r#"숐"#, r#"숐"#),
+        (r#"숑"#, r#"숑"#, r#"숑"#, r#"숑"#, r#"숑"#),
+        (r#"숒"#, r#"숒"#, r#"숒"#, r#"숒"#, r#"숒"#),
+        (r#"숓"#, r#"숓"#, r#"숓"#, r#"숓"#, r#"숓"#),
+        (r#"숔"#, r#"숔"#, r#"숔"#, r#"숔"#, r#"숔"#),
+        (r#"숕"#, r#"숕"#, r#"숕"#, r#"숕"#, r#"숕"#),
+        (r#"숖"#, r#"숖"#, r#"숖"#, r#"숖"#, r#"숖"#),
+        (r#"숗"#, r#"숗"#, r#"숗"#, r#"숗"#, r#"숗"#),
+        (r#"수"#, r#"수"#, r#"수"#, r#"수"#, r#"수"#),
+        (r#"숙"#, r#"숙"#, r#"숙"#, r#"숙"#, r#"숙"#),
+        (r#"숚"#, r#"숚"#, r#"숚"#, r#"숚"#, r#"숚"#),
+        (r#"숛"#, r#"숛"#, r#"숛"#, r#"숛"#, r#"숛"#),
+        (r#"순"#, r#"순"#, r#"순"#, r#"순"#, r#"순"#),
+        (r#"숝"#, r#"숝"#, r#"숝"#, r#"숝"#, r#"숝"#),
+        (r#"숞"#, r#"숞"#, r#"숞"#, r#"숞"#, r#"숞"#),
+        (r#"숟"#, r#"숟"#, r#"숟"#, r#"숟"#, r#"숟"#),
+        (r#"술"#, r#"술"#, r#"술"#, r#"술"#, r#"술"#),
+        (r#"숡"#, r#"숡"#, r#"숡"#, r#"숡"#, r#"숡"#),
+        (r#"숢"#, r#"숢"#, r#"숢"#, r#"숢"#, r#"숢"#),
+        (r#"숣"#, r#"숣"#, r#"숣"#, r#"숣"#, r#"숣"#),
+        (r#"숤"#, r#"숤"#, r#"숤"#, r#"숤"#, r#"숤"#),
+        (r#"숥"#, r#"숥"#, r#"숥"#, r#"숥"#, r#"숥"#),
+        (r#"숦"#, r#"숦"#, r#"숦"#, r#"숦"#, r#"숦"#),
+        (r#"숧"#, r#"숧"#, r#"숧"#, r#"숧"#, r#"숧"#),
+        (r#"숨"#, r#"숨"#, r#"숨"#, r#"숨"#, r#"숨"#),
+        (r#"숩"#, r#"숩"#, r#"숩"#, r#"숩"#, r#"숩"#),
+        (r#"숪"#, r#"숪"#, r#"숪"#, r#"숪"#, r#"숪"#),
+        (r#"숫"#, r#"숫"#, r#"숫"#, r#"숫"#, r#"숫"#),
+        (r#"숬"#, r#"숬"#, r#"숬"#, r#"숬"#, r#"숬"#),
+        (r#"숭"#, r#"숭"#, r#"숭"#, r#"숭"#, r#"숭"#),
+        (r#"숮"#, r#"숮"#, r#"숮"#, r#"숮"#, r#"숮"#),
+        (r#"숯"#, r#"숯"#, r#"숯"#, r#"숯"#, r#"숯"#),
+        (r#"숰"#, r#"숰"#, r#"숰"#, r#"숰"#, r#"숰"#),
+        (r#"숱"#, r#"숱"#, r#"숱"#, r#"숱"#, r#"숱"#),
+        (r#"숲"#, r#"숲"#, r#"숲"#, r#"숲"#, r#"숲"#),
+        (r#"숳"#, r#"숳"#, r#"숳"#, r#"숳"#, r#"숳"#),
+        (r#"숴"#, r#"숴"#, r#"숴"#, r#"숴"#, r#"숴"#),
+        (r#"숵"#, r#"숵"#, r#"숵"#, r#"숵"#, r#"숵"#),
+        (r#"숶"#, r#"숶"#, r#"숶"#, r#"숶"#, r#"숶"#),
+        (r#"숷"#, r#"숷"#, r#"숷"#, r#"숷"#, r#"숷"#),
+        (r#"숸"#, r#"숸"#, r#"숸"#, r#"숸"#, r#"숸"#),
+        (r#"숹"#, r#"숹"#, r#"숹"#, r#"숹"#, r#"숹"#),
+        (r#"숺"#, r#"숺"#, r#"숺"#, r#"숺"#, r#"숺"#),
+        (r#"숻"#, r#"숻"#, r#"숻"#, r#"숻"#, r#"숻"#),
+        (r#"숼"#, r#"숼"#, r#"숼"#, r#"숼"#, r#"숼"#),
+        (r#"숽"#, r#"숽"#, r#"숽"#, r#"숽"#, r#"숽"#),
+        (r#"숾"#, r#"숾"#, r#"숾"#, r#"숾"#, r#"숾"#),
+        (r#"숿"#, r#"숿"#, r#"숿"#, r#"숿"#, r#"숿"#),
+        (r#"쉀"#, r#"쉀"#, r#"쉀"#, r#"쉀"#, r#"쉀"#),
+        (r#"쉁"#, r#"쉁"#, r#"쉁"#, r#"쉁"#, r#"쉁"#),
+        (r#"쉂"#, r#"쉂"#, r#"쉂"#, r#"쉂"#, r#"쉂"#),
+        (r#"쉃"#, r#"쉃"#, r#"쉃"#, r#"쉃"#, r#"쉃"#),
+        (r#"쉄"#, r#"쉄"#, r#"쉄"#, r#"쉄"#, r#"쉄"#),
+        (r#"쉅"#, r#"쉅"#, r#"쉅"#, r#"쉅"#, r#"쉅"#),
+        (r#"쉆"#, r#"쉆"#, r#"쉆"#, r#"쉆"#, r#"쉆"#),
+        (r#"쉇"#, r#"쉇"#, r#"쉇"#, r#"쉇"#, r#"쉇"#),
+        (r#"쉈"#, r#"쉈"#, r#"쉈"#, r#"쉈"#, r#"쉈"#),
+        (r#"쉉"#, r#"쉉"#, r#"쉉"#, r#"쉉"#, r#"쉉"#),
+        (r#"쉊"#, r#"쉊"#, r#"쉊"#, r#"쉊"#, r#"쉊"#),
+        (r#"쉋"#, r#"쉋"#, r#"쉋"#, r#"쉋"#, r#"쉋"#),
+        (r#"쉌"#, r#"쉌"#, r#"쉌"#, r#"쉌"#, r#"쉌"#),
+        (r#"쉍"#, r#"쉍"#, r#"쉍"#, r#"쉍"#, r#"쉍"#),
+        (r#"쉎"#, r#"쉎"#, r#"쉎"#, r#"쉎"#, r#"쉎"#),
+        (r#"쉏"#, r#"쉏"#, r#"쉏"#, r#"쉏"#, r#"쉏"#),
+        (r#"쉐"#, r#"쉐"#, r#"쉐"#, r#"쉐"#, r#"쉐"#),
+        (r#"쉑"#, r#"쉑"#, r#"쉑"#, r#"쉑"#, r#"쉑"#),
+        (r#"쉒"#, r#"쉒"#, r#"쉒"#, r#"쉒"#, r#"쉒"#),
+        (r#"쉓"#, r#"쉓"#, r#"쉓"#, r#"쉓"#, r#"쉓"#),
+        (r#"쉔"#, r#"쉔"#, r#"쉔"#, r#"쉔"#, r#"쉔"#),
+        (r#"쉕"#, r#"쉕"#, r#"쉕"#, r#"쉕"#, r#"쉕"#),
+        (r#"쉖"#, r#"쉖"#, r#"쉖"#, r#"쉖"#, r#"쉖"#),
+        (r#"쉗"#, r#"쉗"#, r#"쉗"#, r#"쉗"#, r#"쉗"#),
+        (r#"쉘"#, r#"쉘"#, r#"쉘"#, r#"쉘"#, r#"쉘"#),
+        (r#"쉙"#, r#"쉙"#, r#"쉙"#, r#"쉙"#, r#"쉙"#),
+        (r#"쉚"#, r#"쉚"#, r#"쉚"#, r#"쉚"#, r#"쉚"#),
+        (r#"쉛"#, r#"쉛"#, r#"쉛"#, r#"쉛"#, r#"쉛"#),
+        (r#"쉜"#, r#"쉜"#, r#"쉜"#, r#"쉜"#, r#"쉜"#),
+        (r#"쉝"#, r#"쉝"#, r#"쉝"#, r#"쉝"#, r#"쉝"#),
+        (r#"쉞"#, r#"쉞"#, r#"쉞"#, r#"쉞"#, r#"쉞"#),
+        (r#"쉟"#, r#"쉟"#, r#"쉟"#, r#"쉟"#, r#"쉟"#),
+        (r#"쉠"#, r#"쉠"#, r#"쉠"#, r#"쉠"#, r#"쉠"#),
+        (r#"쉡"#, r#"쉡"#, r#"쉡"#, r#"쉡"#, r#"쉡"#),
+        (r#"쉢"#, r#"쉢"#, r#"쉢"#, r#"쉢"#, r#"쉢"#),
+        (r#"쉣"#, r#"쉣"#, r#"쉣"#, r#"쉣"#, r#"쉣"#),
+        (r#"쉤"#, r#"쉤"#, r#"쉤"#, r#"쉤"#, r#"쉤"#),
+        (r#"쉥"#, r#"쉥"#, r#"쉥"#, r#"쉥"#, r#"쉥"#),
+        (r#"쉦"#, r#"쉦"#, r#"쉦"#, r#"쉦"#, r#"쉦"#),
+        (r#"쉧"#, r#"쉧"#, r#"쉧"#, r#"쉧"#, r#"쉧"#),
+        (r#"쉨"#, r#"쉨"#, r#"쉨"#, r#"쉨"#, r#"쉨"#),
+        (r#"쉩"#, r#"쉩"#, r#"쉩"#, r#"쉩"#, r#"쉩"#),
+        (r#"쉪"#, r#"쉪"#, r#"쉪"#, r#"쉪"#, r#"쉪"#),
+        (r#"쉫"#, r#"쉫"#, r#"쉫"#, r#"쉫"#, r#"쉫"#),
+        (r#"쉬"#, r#"쉬"#, r#"쉬"#, r#"쉬"#, r#"쉬"#),
+        (r#"쉭"#, r#"쉭"#, r#"쉭"#, r#"쉭"#, r#"쉭"#),
+        (r#"쉮"#, r#"쉮"#, r#"쉮"#, r#"쉮"#, r#"쉮"#),
+        (r#"쉯"#, r#"쉯"#, r#"쉯"#, r#"쉯"#, r#"쉯"#),
+        (r#"쉰"#, r#"쉰"#, r#"쉰"#, r#"쉰"#, r#"쉰"#),
+        (r#"쉱"#, r#"쉱"#, r#"쉱"#, r#"쉱"#, r#"쉱"#),
+        (r#"쉲"#, r#"쉲"#, r#"쉲"#, r#"쉲"#, r#"쉲"#),
+        (r#"쉳"#, r#"쉳"#, r#"쉳"#, r#"쉳"#, r#"쉳"#),
+        (r#"쉴"#, r#"쉴"#, r#"쉴"#, r#"쉴"#, r#"쉴"#),
+        (r#"쉵"#, r#"쉵"#, r#"쉵"#, r#"쉵"#, r#"쉵"#),
+        (r#"쉶"#, r#"쉶"#, r#"쉶"#, r#"쉶"#, r#"쉶"#),
+        (r#"쉷"#, r#"쉷"#, r#"쉷"#, r#"쉷"#, r#"쉷"#),
+        (r#"쉸"#, r#"쉸"#, r#"쉸"#, r#"쉸"#, r#"쉸"#),
+        (r#"쉹"#, r#"쉹"#, r#"쉹"#, r#"쉹"#, r#"쉹"#),
+        (r#"쉺"#, r#"쉺"#, r#"쉺"#, r#"쉺"#, r#"쉺"#),
+        (r#"쉻"#, r#"쉻"#, r#"쉻"#, r#"쉻"#, r#"쉻"#),
+        (r#"쉼"#, r#"쉼"#, r#"쉼"#, r#"쉼"#, r#"쉼"#),
+        (r#"쉽"#, r#"쉽"#, r#"쉽"#, r#"쉽"#, r#"쉽"#),
+        (r#"쉾"#, r#"쉾"#, r#"쉾"#, r#"쉾"#, r#"쉾"#),
+        (r#"쉿"#, r#"쉿"#, r#"쉿"#, r#"쉿"#, r#"쉿"#),
+        (r#"슀"#, r#"슀"#, r#"슀"#, r#"슀"#, r#"슀"#),
+        (r#"슁"#, r#"슁"#, r#"슁"#, r#"슁"#, r#"슁"#),
+        (r#"슂"#, r#"슂"#, r#"슂"#, r#"슂"#, r#"슂"#),
+        (r#"슃"#, r#"슃"#, r#"슃"#, r#"슃"#, r#"슃"#),
+        (r#"슄"#, r#"슄"#, r#"슄"#, r#"슄"#, r#"슄"#),
+        (r#"슅"#, r#"슅"#, r#"슅"#, r#"슅"#, r#"슅"#),
+        (r#"슆"#, r#"슆"#, r#"슆"#, r#"슆"#, r#"슆"#),
+        (r#"슇"#, r#"슇"#, r#"슇"#, r#"슇"#, r#"슇"#),
+        (r#"슈"#, r#"슈"#, r#"슈"#, r#"슈"#, r#"슈"#),
+        (r#"슉"#, r#"슉"#, r#"슉"#, r#"슉"#, r#"슉"#),
+        (r#"슊"#, r#"슊"#, r#"슊"#, r#"슊"#, r#"슊"#),
+        (r#"슋"#, r#"슋"#, r#"슋"#, r#"슋"#, r#"슋"#),
+        (r#"슌"#, r#"슌"#, r#"슌"#, r#"슌"#, r#"슌"#),
+        (r#"슍"#, r#"슍"#, r#"슍"#, r#"슍"#, r#"슍"#),
+        (r#"슎"#, r#"슎"#, r#"슎"#, r#"슎"#, r#"슎"#),
+        (r#"슏"#, r#"슏"#, r#"슏"#, r#"슏"#, r#"슏"#),
+        (r#"슐"#, r#"슐"#, r#"슐"#, r#"슐"#, r#"슐"#),
+        (r#"슑"#, r#"슑"#, r#"슑"#, r#"슑"#, r#"슑"#),
+        (r#"슒"#, r#"슒"#, r#"슒"#, r#"슒"#, r#"슒"#),
+        (r#"슓"#, r#"슓"#, r#"슓"#, r#"슓"#, r#"슓"#),
+        (r#"슔"#, r#"슔"#, r#"슔"#, r#"슔"#, r#"슔"#),
+        (r#"슕"#, r#"슕"#, r#"슕"#, r#"슕"#, r#"슕"#),
+        (r#"슖"#, r#"슖"#, r#"슖"#, r#"슖"#, r#"슖"#),
+        (r#"슗"#, r#"슗"#, r#"슗"#, r#"슗"#, r#"슗"#),
+        (r#"슘"#, r#"슘"#, r#"슘"#, r#"슘"#, r#"슘"#),
+        (r#"슙"#, r#"슙"#, r#"슙"#, r#"슙"#, r#"슙"#),
+        (r#"슚"#, r#"슚"#, r#"슚"#, r#"슚"#, r#"슚"#),
+        (r#"슛"#, r#"슛"#, r#"슛"#, r#"슛"#, r#"슛"#),
+        (r#"슜"#, r#"슜"#, r#"슜"#, r#"슜"#, r#"슜"#),
+        (r#"슝"#, r#"슝"#, r#"슝"#, r#"슝"#, r#"슝"#),
+        (r#"슞"#, r#"슞"#, r#"슞"#, r#"슞"#, r#"슞"#),
+        (r#"슟"#, r#"슟"#, r#"슟"#, r#"슟"#, r#"슟"#),
+        (r#"슠"#, r#"슠"#, r#"슠"#, r#"슠"#, r#"슠"#),
+        (r#"슡"#, r#"슡"#, r#"슡"#, r#"슡"#, r#"슡"#),
+        (r#"슢"#, r#"슢"#, r#"슢"#, r#"슢"#, r#"슢"#),
+        (r#"슣"#, r#"슣"#, r#"슣"#, r#"슣"#, r#"슣"#),
+        (r#"스"#, r#"스"#, r#"스"#, r#"스"#, r#"스"#),
+        (r#"슥"#, r#"슥"#, r#"슥"#, r#"슥"#, r#"슥"#),
+        (r#"슦"#, r#"슦"#, r#"슦"#, r#"슦"#, r#"슦"#),
+        (r#"슧"#, r#"슧"#, r#"슧"#, r#"슧"#, r#"슧"#),
+        (r#"슨"#, r#"슨"#, r#"슨"#, r#"슨"#, r#"슨"#),
+        (r#"슩"#, r#"슩"#, r#"슩"#, r#"슩"#, r#"슩"#),
+        (r#"슪"#, r#"슪"#, r#"슪"#, r#"슪"#, r#"슪"#),
+        (r#"슫"#, r#"슫"#, r#"슫"#, r#"슫"#, r#"슫"#),
+        (r#"슬"#, r#"슬"#, r#"슬"#, r#"슬"#, r#"슬"#),
+        (r#"슭"#, r#"슭"#, r#"슭"#, r#"슭"#, r#"슭"#),
+        (r#"슮"#, r#"슮"#, r#"슮"#, r#"슮"#, r#"슮"#),
+        (r#"슯"#, r#"슯"#, r#"슯"#, r#"슯"#, r#"슯"#),
+        (r#"슰"#, r#"슰"#, r#"슰"#, r#"슰"#, r#"슰"#),
+        (r#"슱"#, r#"슱"#, r#"슱"#, r#"슱"#, r#"슱"#),
+        (r#"슲"#, r#"슲"#, r#"슲"#, r#"슲"#, r#"슲"#),
+        (r#"슳"#, r#"슳"#, r#"슳"#, r#"슳"#, r#"슳"#),
+        (r#"슴"#, r#"슴"#, r#"슴"#, r#"슴"#, r#"슴"#),
+        (r#"습"#, r#"습"#, r#"습"#, r#"습"#, r#"습"#),
+        (r#"슶"#, r#"슶"#, r#"슶"#, r#"슶"#, r#"슶"#),
+        (r#"슷"#, r#"슷"#, r#"슷"#, r#"슷"#, r#"슷"#),
+        (r#"슸"#, r#"슸"#, r#"슸"#, r#"슸"#, r#"슸"#),
+        (r#"승"#, r#"승"#, r#"승"#, r#"승"#, r#"승"#),
+        (r#"슺"#, r#"슺"#, r#"슺"#, r#"슺"#, r#"슺"#),
+        (r#"슻"#, r#"슻"#, r#"슻"#, r#"슻"#, r#"슻"#),
+        (r#"슼"#, r#"슼"#, r#"슼"#, r#"슼"#, r#"슼"#),
+        (r#"슽"#, r#"슽"#, r#"슽"#, r#"슽"#, r#"슽"#),
+        (r#"슾"#, r#"슾"#, r#"슾"#, r#"슾"#, r#"슾"#),
+        (r#"슿"#, r#"슿"#, r#"슿"#, r#"슿"#, r#"슿"#),
+        (r#"싀"#, r#"싀"#, r#"싀"#, r#"싀"#, r#"싀"#),
+        (r#"싁"#, r#"싁"#, r#"싁"#, r#"싁"#, r#"싁"#),
+        (r#"싂"#, r#"싂"#, r#"싂"#, r#"싂"#, r#"싂"#),
+        (r#"싃"#, r#"싃"#, r#"싃"#, r#"싃"#, r#"싃"#),
+        (r#"싄"#, r#"싄"#, r#"싄"#, r#"싄"#, r#"싄"#),
+        (r#"싅"#, r#"싅"#, r#"싅"#, r#"싅"#, r#"싅"#),
+        (r#"싆"#, r#"싆"#, r#"싆"#, r#"싆"#, r#"싆"#),
+        (r#"싇"#, r#"싇"#, r#"싇"#, r#"싇"#, r#"싇"#),
+        (r#"싈"#, r#"싈"#, r#"싈"#, r#"싈"#, r#"싈"#),
+        (r#"싉"#, r#"싉"#, r#"싉"#, r#"싉"#, r#"싉"#),
+        (r#"싊"#, r#"싊"#, r#"싊"#, r#"싊"#, r#"싊"#),
+        (r#"싋"#, r#"싋"#, r#"싋"#, r#"싋"#, r#"싋"#),
+        (r#"싌"#, r#"싌"#, r#"싌"#, r#"싌"#, r#"싌"#),
+        (r#"싍"#, r#"싍"#, r#"싍"#, r#"싍"#, r#"싍"#),
+        (r#"싎"#, r#"싎"#, r#"싎"#, r#"싎"#, r#"싎"#),
+        (r#"싏"#, r#"싏"#, r#"싏"#, r#"싏"#, r#"싏"#),
+        (r#"싐"#, r#"싐"#, r#"싐"#, r#"싐"#, r#"싐"#),
+        (r#"싑"#, r#"싑"#, r#"싑"#, r#"싑"#, r#"싑"#),
+        (r#"싒"#, r#"싒"#, r#"싒"#, r#"싒"#, r#"싒"#),
+        (r#"싓"#, r#"싓"#, r#"싓"#, r#"싓"#, r#"싓"#),
+        (r#"싔"#, r#"싔"#, r#"싔"#, r#"싔"#, r#"싔"#),
+        (r#"싕"#, r#"싕"#, r#"싕"#, r#"싕"#, r#"싕"#),
+        (r#"싖"#, r#"싖"#, r#"싖"#, r#"싖"#, r#"싖"#),
+        (r#"싗"#, r#"싗"#, r#"싗"#, r#"싗"#, r#"싗"#),
+        (r#"싘"#, r#"싘"#, r#"싘"#, r#"싘"#, r#"싘"#),
+        (r#"싙"#, r#"싙"#, r#"싙"#, r#"싙"#, r#"싙"#),
+        (r#"싚"#, r#"싚"#, r#"싚"#, r#"싚"#, r#"싚"#),
+        (r#"싛"#, r#"싛"#, r#"싛"#, r#"싛"#, r#"싛"#),
+        (r#"시"#, r#"시"#, r#"시"#, r#"시"#, r#"시"#),
+        (r#"식"#, r#"식"#, r#"식"#, r#"식"#, r#"식"#),
+        (r#"싞"#, r#"싞"#, r#"싞"#, r#"싞"#, r#"싞"#),
+        (r#"싟"#, r#"싟"#, r#"싟"#, r#"싟"#, r#"싟"#),
+        (r#"신"#, r#"신"#, r#"신"#, r#"신"#, r#"신"#),
+        (r#"싡"#, r#"싡"#, r#"싡"#, r#"싡"#, r#"싡"#),
+        (r#"싢"#, r#"싢"#, r#"싢"#, r#"싢"#, r#"싢"#),
+        (r#"싣"#, r#"싣"#, r#"싣"#, r#"싣"#, r#"싣"#),
+        (r#"실"#, r#"실"#, r#"실"#, r#"실"#, r#"실"#),
+        (r#"싥"#, r#"싥"#, r#"싥"#, r#"싥"#, r#"싥"#),
+        (r#"싦"#, r#"싦"#, r#"싦"#, r#"싦"#, r#"싦"#),
+        (r#"싧"#, r#"싧"#, r#"싧"#, r#"싧"#, r#"싧"#),
+        (r#"싨"#, r#"싨"#, r#"싨"#, r#"싨"#, r#"싨"#),
+        (r#"싩"#, r#"싩"#, r#"싩"#, r#"싩"#, r#"싩"#),
+        (r#"싪"#, r#"싪"#, r#"싪"#, r#"싪"#, r#"싪"#),
+        (r#"싫"#, r#"싫"#, r#"싫"#, r#"싫"#, r#"싫"#),
+        (r#"심"#, r#"심"#, r#"심"#, r#"심"#, r#"심"#),
+        (r#"십"#, r#"십"#, r#"십"#, r#"십"#, r#"십"#),
+        (r#"싮"#, r#"싮"#, r#"싮"#, r#"싮"#, r#"싮"#),
+        (r#"싯"#, r#"싯"#, r#"싯"#, r#"싯"#, r#"싯"#),
+        (r#"싰"#, r#"싰"#, r#"싰"#, r#"싰"#, r#"싰"#),
+        (r#"싱"#, r#"싱"#, r#"싱"#, r#"싱"#, r#"싱"#),
+        (r#"싲"#, r#"싲"#, r#"싲"#, r#"싲"#, r#"싲"#),
+        (r#"싳"#, r#"싳"#, r#"싳"#, r#"싳"#, r#"싳"#),
+        (r#"싴"#, r#"싴"#, r#"싴"#, r#"싴"#, r#"싴"#),
+        (r#"싵"#, r#"싵"#, r#"싵"#, r#"싵"#, r#"싵"#),
+        (r#"싶"#, r#"싶"#, r#"싶"#, r#"싶"#, r#"싶"#),
+        (r#"싷"#, r#"싷"#, r#"싷"#, r#"싷"#, r#"싷"#),
+        (r#"싸"#, r#"싸"#, r#"싸"#, r#"싸"#, r#"싸"#),
+        (r#"싹"#, r#"싹"#, r#"싹"#, r#"싹"#, r#"싹"#),
+        (r#"싺"#, r#"싺"#, r#"싺"#, r#"싺"#, r#"싺"#),
+        (r#"싻"#, r#"싻"#, r#"싻"#, r#"싻"#, r#"싻"#),
+        (r#"싼"#, r#"싼"#, r#"싼"#, r#"싼"#, r#"싼"#),
+        (r#"싽"#, r#"싽"#, r#"싽"#, r#"싽"#, r#"싽"#),
+        (r#"싾"#, r#"싾"#, r#"싾"#, r#"싾"#, r#"싾"#),
+        (r#"싿"#, r#"싿"#, r#"싿"#, r#"싿"#, r#"싿"#),
+        (r#"쌀"#, r#"쌀"#, r#"쌀"#, r#"쌀"#, r#"쌀"#),
+        (r#"쌁"#, r#"쌁"#, r#"쌁"#, r#"쌁"#, r#"쌁"#),
+        (r#"쌂"#, r#"쌂"#, r#"쌂"#, r#"쌂"#, r#"쌂"#),
+        (r#"쌃"#, r#"쌃"#, r#"쌃"#, r#"쌃"#, r#"쌃"#),
+        (r#"쌄"#, r#"쌄"#, r#"쌄"#, r#"쌄"#, r#"쌄"#),
+        (r#"쌅"#, r#"쌅"#, r#"쌅"#, r#"쌅"#, r#"쌅"#),
+        (r#"쌆"#, r#"쌆"#, r#"쌆"#, r#"쌆"#, r#"쌆"#),
+        (r#"쌇"#, r#"쌇"#, r#"쌇"#, r#"쌇"#, r#"쌇"#),
+        (r#"쌈"#, r#"쌈"#, r#"쌈"#, r#"쌈"#, r#"쌈"#),
+        (r#"쌉"#, r#"쌉"#, r#"쌉"#, r#"쌉"#, r#"쌉"#),
+        (r#"쌊"#, r#"쌊"#, r#"쌊"#, r#"쌊"#, r#"쌊"#),
+        (r#"쌋"#, r#"쌋"#, r#"쌋"#, r#"쌋"#, r#"쌋"#),
+        (r#"쌌"#, r#"쌌"#, r#"쌌"#, r#"쌌"#, r#"쌌"#),
+        (r#"쌍"#, r#"쌍"#, r#"쌍"#, r#"쌍"#, r#"쌍"#),
+        (r#"쌎"#, r#"쌎"#, r#"쌎"#, r#"쌎"#, r#"쌎"#),
+        (r#"쌏"#, r#"쌏"#, r#"쌏"#, r#"쌏"#, r#"쌏"#),
+        (r#"쌐"#, r#"쌐"#, r#"쌐"#, r#"쌐"#, r#"쌐"#),
+        (r#"쌑"#, r#"쌑"#, r#"쌑"#, r#"쌑"#, r#"쌑"#),
+        (r#"쌒"#, r#"쌒"#, r#"쌒"#, r#"쌒"#, r#"쌒"#),
+        (r#"쌓"#, r#"쌓"#, r#"쌓"#, r#"쌓"#, r#"쌓"#),
+        (r#"쌔"#, r#"쌔"#, r#"쌔"#, r#"쌔"#, r#"쌔"#),
+        (r#"쌕"#, r#"쌕"#, r#"쌕"#, r#"쌕"#, r#"쌕"#),
+        (r#"쌖"#, r#"쌖"#, r#"쌖"#, r#"쌖"#, r#"쌖"#),
+        (r#"쌗"#, r#"쌗"#, r#"쌗"#, r#"쌗"#, r#"쌗"#),
+        (r#"쌘"#, r#"쌘"#, r#"쌘"#, r#"쌘"#, r#"쌘"#),
+        (r#"쌙"#, r#"쌙"#, r#"쌙"#, r#"쌙"#, r#"쌙"#),
+        (r#"쌚"#, r#"쌚"#, r#"쌚"#, r#"쌚"#, r#"쌚"#),
+        (r#"쌛"#, r#"쌛"#, r#"쌛"#, r#"쌛"#, r#"쌛"#),
+        (r#"쌜"#, r#"쌜"#, r#"쌜"#, r#"쌜"#, r#"쌜"#),
+        (r#"쌝"#, r#"쌝"#, r#"쌝"#, r#"쌝"#, r#"쌝"#),
+        (r#"쌞"#, r#"쌞"#, r#"쌞"#, r#"쌞"#, r#"쌞"#),
+        (r#"쌟"#, r#"쌟"#, r#"쌟"#, r#"쌟"#, r#"쌟"#),
+        (r#"쌠"#, r#"쌠"#, r#"쌠"#, r#"쌠"#, r#"쌠"#),
+        (r#"쌡"#, r#"쌡"#, r#"쌡"#, r#"쌡"#, r#"쌡"#),
+        (r#"쌢"#, r#"쌢"#, r#"쌢"#, r#"쌢"#, r#"쌢"#),
+        (r#"쌣"#, r#"쌣"#, r#"쌣"#, r#"쌣"#, r#"쌣"#),
+        (r#"쌤"#, r#"쌤"#, r#"쌤"#, r#"쌤"#, r#"쌤"#),
+        (r#"쌥"#, r#"쌥"#, r#"쌥"#, r#"쌥"#, r#"쌥"#),
+        (r#"쌦"#, r#"쌦"#, r#"쌦"#, r#"쌦"#, r#"쌦"#),
+        (r#"쌧"#, r#"쌧"#, r#"쌧"#, r#"쌧"#, r#"쌧"#),
+        (r#"쌨"#, r#"쌨"#, r#"쌨"#, r#"쌨"#, r#"쌨"#),
+        (r#"쌩"#, r#"쌩"#, r#"쌩"#, r#"쌩"#, r#"쌩"#),
+        (r#"쌪"#, r#"쌪"#, r#"쌪"#, r#"쌪"#, r#"쌪"#),
+        (r#"쌫"#, r#"쌫"#, r#"쌫"#, r#"쌫"#, r#"쌫"#),
+        (r#"쌬"#, r#"쌬"#, r#"쌬"#, r#"쌬"#, r#"쌬"#),
+        (r#"쌭"#, r#"쌭"#, r#"쌭"#, r#"쌭"#, r#"쌭"#),
+        (r#"쌮"#, r#"쌮"#, r#"쌮"#, r#"쌮"#, r#"쌮"#),
+        (r#"쌯"#, r#"쌯"#, r#"쌯"#, r#"쌯"#, r#"쌯"#),
+        (r#"쌰"#, r#"쌰"#, r#"쌰"#, r#"쌰"#, r#"쌰"#),
+        (r#"쌱"#, r#"쌱"#, r#"쌱"#, r#"쌱"#, r#"쌱"#),
+        (r#"쌲"#, r#"쌲"#, r#"쌲"#, r#"쌲"#, r#"쌲"#),
+        (r#"쌳"#, r#"쌳"#, r#"쌳"#, r#"쌳"#, r#"쌳"#),
+        (r#"쌴"#, r#"쌴"#, r#"쌴"#, r#"쌴"#, r#"쌴"#),
+        (r#"쌵"#, r#"쌵"#, r#"쌵"#, r#"쌵"#, r#"쌵"#),
+        (r#"쌶"#, r#"쌶"#, r#"쌶"#, r#"쌶"#, r#"쌶"#),
+        (r#"쌷"#, r#"쌷"#, r#"쌷"#, r#"쌷"#, r#"쌷"#),
+        (r#"쌸"#, r#"쌸"#, r#"쌸"#, r#"쌸"#, r#"쌸"#),
+        (r#"쌹"#, r#"쌹"#, r#"쌹"#, r#"쌹"#, r#"쌹"#),
+        (r#"쌺"#, r#"쌺"#, r#"쌺"#, r#"쌺"#, r#"쌺"#),
+        (r#"쌻"#, r#"쌻"#, r#"쌻"#, r#"쌻"#, r#"쌻"#),
+        (r#"쌼"#, r#"쌼"#, r#"쌼"#, r#"쌼"#, r#"쌼"#),
+        (r#"쌽"#, r#"쌽"#, r#"쌽"#, r#"쌽"#, r#"쌽"#),
+        (r#"쌾"#, r#"쌾"#, r#"쌾"#, r#"쌾"#, r#"쌾"#),
+        (r#"쌿"#, r#"쌿"#, r#"쌿"#, r#"쌿"#, r#"쌿"#),
+        (r#"썀"#, r#"썀"#, r#"썀"#, r#"썀"#, r#"썀"#),
+        (r#"썁"#, r#"썁"#, r#"썁"#, r#"썁"#, r#"썁"#),
+        (r#"썂"#, r#"썂"#, r#"썂"#, r#"썂"#, r#"썂"#),
+        (r#"썃"#, r#"썃"#, r#"썃"#, r#"썃"#, r#"썃"#),
+        (r#"썄"#, r#"썄"#, r#"썄"#, r#"썄"#, r#"썄"#),
+        (r#"썅"#, r#"썅"#, r#"썅"#, r#"썅"#, r#"썅"#),
+        (r#"썆"#, r#"썆"#, r#"썆"#, r#"썆"#, r#"썆"#),
+        (r#"썇"#, r#"썇"#, r#"썇"#, r#"썇"#, r#"썇"#),
+        (r#"썈"#, r#"썈"#, r#"썈"#, r#"썈"#, r#"썈"#),
+        (r#"썉"#, r#"썉"#, r#"썉"#, r#"썉"#, r#"썉"#),
+        (r#"썊"#, r#"썊"#, r#"썊"#, r#"썊"#, r#"썊"#),
+        (r#"썋"#, r#"썋"#, r#"썋"#, r#"썋"#, r#"썋"#),
+        (r#"썌"#, r#"썌"#, r#"썌"#, r#"썌"#, r#"썌"#),
+        (r#"썍"#, r#"썍"#, r#"썍"#, r#"썍"#, r#"썍"#),
+        (r#"썎"#, r#"썎"#, r#"썎"#, r#"썎"#, r#"썎"#),
+        (r#"썏"#, r#"썏"#, r#"썏"#, r#"썏"#, r#"썏"#),
+        (r#"썐"#, r#"썐"#, r#"썐"#, r#"썐"#, r#"썐"#),
+        (r#"썑"#, r#"썑"#, r#"썑"#, r#"썑"#, r#"썑"#),
+        (r#"썒"#, r#"썒"#, r#"썒"#, r#"썒"#, r#"썒"#),
+        (r#"썓"#, r#"썓"#, r#"썓"#, r#"썓"#, r#"썓"#),
+        (r#"썔"#, r#"썔"#, r#"썔"#, r#"썔"#, r#"썔"#),
+        (r#"썕"#, r#"썕"#, r#"썕"#, r#"썕"#, r#"썕"#),
+        (r#"썖"#, r#"썖"#, r#"썖"#, r#"썖"#, r#"썖"#),
+        (r#"썗"#, r#"썗"#, r#"썗"#, r#"썗"#, r#"썗"#),
+        (r#"썘"#, r#"썘"#, r#"썘"#, r#"썘"#, r#"썘"#),
+        (r#"썙"#, r#"썙"#, r#"썙"#, r#"썙"#, r#"썙"#),
+        (r#"썚"#, r#"썚"#, r#"썚"#, r#"썚"#, r#"썚"#),
+        (r#"썛"#, r#"썛"#, r#"썛"#, r#"썛"#, r#"썛"#),
+        (r#"썜"#, r#"썜"#, r#"썜"#, r#"썜"#, r#"썜"#),
+        (r#"썝"#, r#"썝"#, r#"썝"#, r#"썝"#, r#"썝"#),
+        (r#"썞"#, r#"썞"#, r#"썞"#, r#"썞"#, r#"썞"#),
+        (r#"썟"#, r#"썟"#, r#"썟"#, r#"썟"#, r#"썟"#),
+        (r#"썠"#, r#"썠"#, r#"썠"#, r#"썠"#, r#"썠"#),
+        (r#"썡"#, r#"썡"#, r#"썡"#, r#"썡"#, r#"썡"#),
+        (r#"썢"#, r#"썢"#, r#"썢"#, r#"썢"#, r#"썢"#),
+        (r#"썣"#, r#"썣"#, r#"썣"#, r#"썣"#, r#"썣"#),
+        (r#"썤"#, r#"썤"#, r#"썤"#, r#"썤"#, r#"썤"#),
+        (r#"썥"#, r#"썥"#, r#"썥"#, r#"썥"#, r#"썥"#),
+        (r#"썦"#, r#"썦"#, r#"썦"#, r#"썦"#, r#"썦"#),
+        (r#"썧"#, r#"썧"#, r#"썧"#, r#"썧"#, r#"썧"#),
+        (r#"써"#, r#"써"#, r#"써"#, r#"써"#, r#"써"#),
+        (r#"썩"#, r#"썩"#, r#"썩"#, r#"썩"#, r#"썩"#),
+        (r#"썪"#, r#"썪"#, r#"썪"#, r#"썪"#, r#"썪"#),
+        (r#"썫"#, r#"썫"#, r#"썫"#, r#"썫"#, r#"썫"#),
+        (r#"썬"#, r#"썬"#, r#"썬"#, r#"썬"#, r#"썬"#),
+        (r#"썭"#, r#"썭"#, r#"썭"#, r#"썭"#, r#"썭"#),
+        (r#"썮"#, r#"썮"#, r#"썮"#, r#"썮"#, r#"썮"#),
+        (r#"썯"#, r#"썯"#, r#"썯"#, r#"썯"#, r#"썯"#),
+        (r#"썰"#, r#"썰"#, r#"썰"#, r#"썰"#, r#"썰"#),
+        (r#"썱"#, r#"썱"#, r#"썱"#, r#"썱"#, r#"썱"#),
+        (r#"썲"#, r#"썲"#, r#"썲"#, r#"썲"#, r#"썲"#),
+        (r#"썳"#, r#"썳"#, r#"썳"#, r#"썳"#, r#"썳"#),
+        (r#"썴"#, r#"썴"#, r#"썴"#, r#"썴"#, r#"썴"#),
+        (r#"썵"#, r#"썵"#, r#"썵"#, r#"썵"#, r#"썵"#),
+        (r#"썶"#, r#"썶"#, r#"썶"#, r#"썶"#, r#"썶"#),
+        (r#"썷"#, r#"썷"#, r#"썷"#, r#"썷"#, r#"썷"#),
+        (r#"썸"#, r#"썸"#, r#"썸"#, r#"썸"#, r#"썸"#),
+        (r#"썹"#, r#"썹"#, r#"썹"#, r#"썹"#, r#"썹"#),
+        (r#"썺"#, r#"썺"#, r#"썺"#, r#"썺"#, r#"썺"#),
+        (r#"썻"#, r#"썻"#, r#"썻"#, r#"썻"#, r#"썻"#),
+        (r#"썼"#, r#"썼"#, r#"썼"#, r#"썼"#, r#"썼"#),
+        (r#"썽"#, r#"썽"#, r#"썽"#, r#"썽"#, r#"썽"#),
+        (r#"썾"#, r#"썾"#, r#"썾"#, r#"썾"#, r#"썾"#),
+        (r#"썿"#, r#"썿"#, r#"썿"#, r#"썿"#, r#"썿"#),
+        (r#"쎀"#, r#"쎀"#, r#"쎀"#, r#"쎀"#, r#"쎀"#),
+        (r#"쎁"#, r#"쎁"#, r#"쎁"#, r#"쎁"#, r#"쎁"#),
+        (r#"쎂"#, r#"쎂"#, r#"쎂"#, r#"쎂"#, r#"쎂"#),
+        (r#"쎃"#, r#"쎃"#, r#"쎃"#, r#"쎃"#, r#"쎃"#),
+        (r#"쎄"#, r#"쎄"#, r#"쎄"#, r#"쎄"#, r#"쎄"#),
+        (r#"쎅"#, r#"쎅"#, r#"쎅"#, r#"쎅"#, r#"쎅"#),
+        (r#"쎆"#, r#"쎆"#, r#"쎆"#, r#"쎆"#, r#"쎆"#),
+        (r#"쎇"#, r#"쎇"#, r#"쎇"#, r#"쎇"#, r#"쎇"#),
+        (r#"쎈"#, r#"쎈"#, r#"쎈"#, r#"쎈"#, r#"쎈"#),
+        (r#"쎉"#, r#"쎉"#, r#"쎉"#, r#"쎉"#, r#"쎉"#),
+        (r#"쎊"#, r#"쎊"#, r#"쎊"#, r#"쎊"#, r#"쎊"#),
+        (r#"쎋"#, r#"쎋"#, r#"쎋"#, r#"쎋"#, r#"쎋"#),
+        (r#"쎌"#, r#"쎌"#, r#"쎌"#, r#"쎌"#, r#"쎌"#),
+        (r#"쎍"#, r#"쎍"#, r#"쎍"#, r#"쎍"#, r#"쎍"#),
+        (r#"쎎"#, r#"쎎"#, r#"쎎"#, r#"쎎"#, r#"쎎"#),
+        (r#"쎏"#, r#"쎏"#, r#"쎏"#, r#"쎏"#, r#"쎏"#),
+        (r#"쎐"#, r#"쎐"#, r#"쎐"#, r#"쎐"#, r#"쎐"#),
+        (r#"쎑"#, r#"쎑"#, r#"쎑"#, r#"쎑"#, r#"쎑"#),
+        (r#"쎒"#, r#"쎒"#, r#"쎒"#, r#"쎒"#, r#"쎒"#),
+        (r#"쎓"#, r#"쎓"#, r#"쎓"#, r#"쎓"#, r#"쎓"#),
+        (r#"쎔"#, r#"쎔"#, r#"쎔"#, r#"쎔"#, r#"쎔"#),
+        (r#"쎕"#, r#"쎕"#, r#"쎕"#, r#"쎕"#, r#"쎕"#),
+        (r#"쎖"#, r#"쎖"#, r#"쎖"#, r#"쎖"#, r#"쎖"#),
+        (r#"쎗"#, r#"쎗"#, r#"쎗"#, r#"쎗"#, r#"쎗"#),
+        (r#"쎘"#, r#"쎘"#, r#"쎘"#, r#"쎘"#, r#"쎘"#),
+        (r#"쎙"#, r#"쎙"#, r#"쎙"#, r#"쎙"#, r#"쎙"#),
+        (r#"쎚"#, r#"쎚"#, r#"쎚"#, r#"쎚"#, r#"쎚"#),
+        (r#"쎛"#, r#"쎛"#, r#"쎛"#, r#"쎛"#, r#"쎛"#),
+        (r#"쎜"#, r#"쎜"#, r#"쎜"#, r#"쎜"#, r#"쎜"#),
+        (r#"쎝"#, r#"쎝"#, r#"쎝"#, r#"쎝"#, r#"쎝"#),
+        (r#"쎞"#, r#"쎞"#, r#"쎞"#, r#"쎞"#, r#"쎞"#),
+        (r#"쎟"#, r#"쎟"#, r#"쎟"#, r#"쎟"#, r#"쎟"#),
+        (r#"쎠"#, r#"쎠"#, r#"쎠"#, r#"쎠"#, r#"쎠"#),
+        (r#"쎡"#, r#"쎡"#, r#"쎡"#, r#"쎡"#, r#"쎡"#),
+        (r#"쎢"#, r#"쎢"#, r#"쎢"#, r#"쎢"#, r#"쎢"#),
+        (r#"쎣"#, r#"쎣"#, r#"쎣"#, r#"쎣"#, r#"쎣"#),
+        (r#"쎤"#, r#"쎤"#, r#"쎤"#, r#"쎤"#, r#"쎤"#),
+        (r#"쎥"#, r#"쎥"#, r#"쎥"#, r#"쎥"#, r#"쎥"#),
+        (r#"쎦"#, r#"쎦"#, r#"쎦"#, r#"쎦"#, r#"쎦"#),
+        (r#"쎧"#, r#"쎧"#, r#"쎧"#, r#"쎧"#, r#"쎧"#),
+        (r#"쎨"#, r#"쎨"#, r#"쎨"#, r#"쎨"#, r#"쎨"#),
+        (r#"쎩"#, r#"쎩"#, r#"쎩"#, r#"쎩"#, r#"쎩"#),
+        (r#"쎪"#, r#"쎪"#, r#"쎪"#, r#"쎪"#, r#"쎪"#),
+        (r#"쎫"#, r#"쎫"#, r#"쎫"#, r#"쎫"#, r#"쎫"#),
+        (r#"쎬"#, r#"쎬"#, r#"쎬"#, r#"쎬"#, r#"쎬"#),
+        (r#"쎭"#, r#"쎭"#, r#"쎭"#, r#"쎭"#, r#"쎭"#),
+        (r#"쎮"#, r#"쎮"#, r#"쎮"#, r#"쎮"#, r#"쎮"#),
+        (r#"쎯"#, r#"쎯"#, r#"쎯"#, r#"쎯"#, r#"쎯"#),
+        (r#"쎰"#, r#"쎰"#, r#"쎰"#, r#"쎰"#, r#"쎰"#),
+        (r#"쎱"#, r#"쎱"#, r#"쎱"#, r#"쎱"#, r#"쎱"#),
+        (r#"쎲"#, r#"쎲"#, r#"쎲"#, r#"쎲"#, r#"쎲"#),
+        (r#"쎳"#, r#"쎳"#, r#"쎳"#, r#"쎳"#, r#"쎳"#),
+        (r#"쎴"#, r#"쎴"#, r#"쎴"#, r#"쎴"#, r#"쎴"#),
+        (r#"쎵"#, r#"쎵"#, r#"쎵"#, r#"쎵"#, r#"쎵"#),
+        (r#"쎶"#, r#"쎶"#, r#"쎶"#, r#"쎶"#, r#"쎶"#),
+        (r#"쎷"#, r#"쎷"#, r#"쎷"#, r#"쎷"#, r#"쎷"#),
+        (r#"쎸"#, r#"쎸"#, r#"쎸"#, r#"쎸"#, r#"쎸"#),
+        (r#"쎹"#, r#"쎹"#, r#"쎹"#, r#"쎹"#, r#"쎹"#),
+        (r#"쎺"#, r#"쎺"#, r#"쎺"#, r#"쎺"#, r#"쎺"#),
+        (r#"쎻"#, r#"쎻"#, r#"쎻"#, r#"쎻"#, r#"쎻"#),
+        (r#"쎼"#, r#"쎼"#, r#"쎼"#, r#"쎼"#, r#"쎼"#),
+        (r#"쎽"#, r#"쎽"#, r#"쎽"#, r#"쎽"#, r#"쎽"#),
+        (r#"쎾"#, r#"쎾"#, r#"쎾"#, r#"쎾"#, r#"쎾"#),
+        (r#"쎿"#, r#"쎿"#, r#"쎿"#, r#"쎿"#, r#"쎿"#),
+        (r#"쏀"#, r#"쏀"#, r#"쏀"#, r#"쏀"#, r#"쏀"#),
+        (r#"쏁"#, r#"쏁"#, r#"쏁"#, r#"쏁"#, r#"쏁"#),
+        (r#"쏂"#, r#"쏂"#, r#"쏂"#, r#"쏂"#, r#"쏂"#),
+        (r#"쏃"#, r#"쏃"#, r#"쏃"#, r#"쏃"#, r#"쏃"#),
+        (r#"쏄"#, r#"쏄"#, r#"쏄"#, r#"쏄"#, r#"쏄"#),
+        (r#"쏅"#, r#"쏅"#, r#"쏅"#, r#"쏅"#, r#"쏅"#),
+        (r#"쏆"#, r#"쏆"#, r#"쏆"#, r#"쏆"#, r#"쏆"#),
+        (r#"쏇"#, r#"쏇"#, r#"쏇"#, r#"쏇"#, r#"쏇"#),
+        (r#"쏈"#, r#"쏈"#, r#"쏈"#, r#"쏈"#, r#"쏈"#),
+        (r#"쏉"#, r#"쏉"#, r#"쏉"#, r#"쏉"#, r#"쏉"#),
+        (r#"쏊"#, r#"쏊"#, r#"쏊"#, r#"쏊"#, r#"쏊"#),
+        (r#"쏋"#, r#"쏋"#, r#"쏋"#, r#"쏋"#, r#"쏋"#),
+        (r#"쏌"#, r#"쏌"#, r#"쏌"#, r#"쏌"#, r#"쏌"#),
+        (r#"쏍"#, r#"쏍"#, r#"쏍"#, r#"쏍"#, r#"쏍"#),
+        (r#"쏎"#, r#"쏎"#, r#"쏎"#, r#"쏎"#, r#"쏎"#),
+        (r#"쏏"#, r#"쏏"#, r#"쏏"#, r#"쏏"#, r#"쏏"#),
+        (r#"쏐"#, r#"쏐"#, r#"쏐"#, r#"쏐"#, r#"쏐"#),
+        (r#"쏑"#, r#"쏑"#, r#"쏑"#, r#"쏑"#, r#"쏑"#),
+        (r#"쏒"#, r#"쏒"#, r#"쏒"#, r#"쏒"#, r#"쏒"#),
+        (r#"쏓"#, r#"쏓"#, r#"쏓"#, r#"쏓"#, r#"쏓"#),
+        (r#"쏔"#, r#"쏔"#, r#"쏔"#, r#"쏔"#, r#"쏔"#),
+        (r#"쏕"#, r#"쏕"#, r#"쏕"#, r#"쏕"#, r#"쏕"#),
+        (r#"쏖"#, r#"쏖"#, r#"쏖"#, r#"쏖"#, r#"쏖"#),
+        (r#"쏗"#, r#"쏗"#, r#"쏗"#, r#"쏗"#, r#"쏗"#),
+        (r#"쏘"#, r#"쏘"#, r#"쏘"#, r#"쏘"#, r#"쏘"#),
+        (r#"쏙"#, r#"쏙"#, r#"쏙"#, r#"쏙"#, r#"쏙"#),
+        (r#"쏚"#, r#"쏚"#, r#"쏚"#, r#"쏚"#, r#"쏚"#),
+        (r#"쏛"#, r#"쏛"#, r#"쏛"#, r#"쏛"#, r#"쏛"#),
+        (r#"쏜"#, r#"쏜"#, r#"쏜"#, r#"쏜"#, r#"쏜"#),
+        (r#"쏝"#, r#"쏝"#, r#"쏝"#, r#"쏝"#, r#"쏝"#),
+        (r#"쏞"#, r#"쏞"#, r#"쏞"#, r#"쏞"#, r#"쏞"#),
+        (r#"쏟"#, r#"쏟"#, r#"쏟"#, r#"쏟"#, r#"쏟"#),
+        (r#"쏠"#, r#"쏠"#, r#"쏠"#, r#"쏠"#, r#"쏠"#),
+        (r#"쏡"#, r#"쏡"#, r#"쏡"#, r#"쏡"#, r#"쏡"#),
+        (r#"쏢"#, r#"쏢"#, r#"쏢"#, r#"쏢"#, r#"쏢"#),
+        (r#"쏣"#, r#"쏣"#, r#"쏣"#, r#"쏣"#, r#"쏣"#),
+        (r#"쏤"#, r#"쏤"#, r#"쏤"#, r#"쏤"#, r#"쏤"#),
+        (r#"쏥"#, r#"쏥"#, r#"쏥"#, r#"쏥"#, r#"쏥"#),
+        (r#"쏦"#, r#"쏦"#, r#"쏦"#, r#"쏦"#, r#"쏦"#),
+        (r#"쏧"#, r#"쏧"#, r#"쏧"#, r#"쏧"#, r#"쏧"#),
+        (r#"쏨"#, r#"쏨"#, r#"쏨"#, r#"쏨"#, r#"쏨"#),
+        (r#"쏩"#, r#"쏩"#, r#"쏩"#, r#"쏩"#, r#"쏩"#),
+        (r#"쏪"#, r#"쏪"#, r#"쏪"#, r#"쏪"#, r#"쏪"#),
+        (r#"쏫"#, r#"쏫"#, r#"쏫"#, r#"쏫"#, r#"쏫"#),
+        (r#"쏬"#, r#"쏬"#, r#"쏬"#, r#"쏬"#, r#"쏬"#),
+        (r#"쏭"#, r#"쏭"#, r#"쏭"#, r#"쏭"#, r#"쏭"#),
+        (r#"쏮"#, r#"쏮"#, r#"쏮"#, r#"쏮"#, r#"쏮"#),
+        (r#"쏯"#, r#"쏯"#, r#"쏯"#, r#"쏯"#, r#"쏯"#),
+        (r#"쏰"#, r#"쏰"#, r#"쏰"#, r#"쏰"#, r#"쏰"#),
+        (r#"쏱"#, r#"쏱"#, r#"쏱"#, r#"쏱"#, r#"쏱"#),
+        (r#"쏲"#, r#"쏲"#, r#"쏲"#, r#"쏲"#, r#"쏲"#),
+        (r#"쏳"#, r#"쏳"#, r#"쏳"#, r#"쏳"#, r#"쏳"#),
+        (r#"쏴"#, r#"쏴"#, r#"쏴"#, r#"쏴"#, r#"쏴"#),
+        (r#"쏵"#, r#"쏵"#, r#"쏵"#, r#"쏵"#, r#"쏵"#),
+        (r#"쏶"#, r#"쏶"#, r#"쏶"#, r#"쏶"#, r#"쏶"#),
+        (r#"쏷"#, r#"쏷"#, r#"쏷"#, r#"쏷"#, r#"쏷"#),
+        (r#"쏸"#, r#"쏸"#, r#"쏸"#, r#"쏸"#, r#"쏸"#),
+        (r#"쏹"#, r#"쏹"#, r#"쏹"#, r#"쏹"#, r#"쏹"#),
+        (r#"쏺"#, r#"쏺"#, r#"쏺"#, r#"쏺"#, r#"쏺"#),
+        (r#"쏻"#, r#"쏻"#, r#"쏻"#, r#"쏻"#, r#"쏻"#),
+        (r#"쏼"#, r#"쏼"#, r#"쏼"#, r#"쏼"#, r#"쏼"#),
+        (r#"쏽"#, r#"쏽"#, r#"쏽"#, r#"쏽"#, r#"쏽"#),
+        (r#"쏾"#, r#"쏾"#, r#"쏾"#, r#"쏾"#, r#"쏾"#),
+        (r#"쏿"#, r#"쏿"#, r#"쏿"#, r#"쏿"#, r#"쏿"#),
+        (r#"쐀"#, r#"쐀"#, r#"쐀"#, r#"쐀"#, r#"쐀"#),
+        (r#"쐁"#, r#"쐁"#, r#"쐁"#, r#"쐁"#, r#"쐁"#),
+        (r#"쐂"#, r#"쐂"#, r#"쐂"#, r#"쐂"#, r#"쐂"#),
+        (r#"쐃"#, r#"쐃"#, r#"쐃"#, r#"쐃"#, r#"쐃"#),
+        (r#"쐄"#, r#"쐄"#, r#"쐄"#, r#"쐄"#, r#"쐄"#),
+        (r#"쐅"#, r#"쐅"#, r#"쐅"#, r#"쐅"#, r#"쐅"#),
+        (r#"쐆"#, r#"쐆"#, r#"쐆"#, r#"쐆"#, r#"쐆"#),
+        (r#"쐇"#, r#"쐇"#, r#"쐇"#, r#"쐇"#, r#"쐇"#),
+        (r#"쐈"#, r#"쐈"#, r#"쐈"#, r#"쐈"#, r#"쐈"#),
+        (r#"쐉"#, r#"쐉"#, r#"쐉"#, r#"쐉"#, r#"쐉"#),
+        (r#"쐊"#, r#"쐊"#, r#"쐊"#, r#"쐊"#, r#"쐊"#),
+        (r#"쐋"#, r#"쐋"#, r#"쐋"#, r#"쐋"#, r#"쐋"#),
+        (r#"쐌"#, r#"쐌"#, r#"쐌"#, r#"쐌"#, r#"쐌"#),
+        (r#"쐍"#, r#"쐍"#, r#"쐍"#, r#"쐍"#, r#"쐍"#),
+        (r#"쐎"#, r#"쐎"#, r#"쐎"#, r#"쐎"#, r#"쐎"#),
+        (r#"쐏"#, r#"쐏"#, r#"쐏"#, r#"쐏"#, r#"쐏"#),
+        (r#"쐐"#, r#"쐐"#, r#"쐐"#, r#"쐐"#, r#"쐐"#),
+        (r#"쐑"#, r#"쐑"#, r#"쐑"#, r#"쐑"#, r#"쐑"#),
+        (r#"쐒"#, r#"쐒"#, r#"쐒"#, r#"쐒"#, r#"쐒"#),
+        (r#"쐓"#, r#"쐓"#, r#"쐓"#, r#"쐓"#, r#"쐓"#),
+        (r#"쐔"#, r#"쐔"#, r#"쐔"#, r#"쐔"#, r#"쐔"#),
+        (r#"쐕"#, r#"쐕"#, r#"쐕"#, r#"쐕"#, r#"쐕"#),
+        (r#"쐖"#, r#"쐖"#, r#"쐖"#, r#"쐖"#, r#"쐖"#),
+        (r#"쐗"#, r#"쐗"#, r#"쐗"#, r#"쐗"#, r#"쐗"#),
+        (r#"쐘"#, r#"쐘"#, r#"쐘"#, r#"쐘"#, r#"쐘"#),
+        (r#"쐙"#, r#"쐙"#, r#"쐙"#, r#"쐙"#, r#"쐙"#),
+        (r#"쐚"#, r#"쐚"#, r#"쐚"#, r#"쐚"#, r#"쐚"#),
+        (r#"쐛"#, r#"쐛"#, r#"쐛"#, r#"쐛"#, r#"쐛"#),
+        (r#"쐜"#, r#"쐜"#, r#"쐜"#, r#"쐜"#, r#"쐜"#),
+        (r#"쐝"#, r#"쐝"#, r#"쐝"#, r#"쐝"#, r#"쐝"#),
+        (r#"쐞"#, r#"쐞"#, r#"쐞"#, r#"쐞"#, r#"쐞"#),
+        (r#"쐟"#, r#"쐟"#, r#"쐟"#, r#"쐟"#, r#"쐟"#),
+        (r#"쐠"#, r#"쐠"#, r#"쐠"#, r#"쐠"#, r#"쐠"#),
+        (r#"쐡"#, r#"쐡"#, r#"쐡"#, r#"쐡"#, r#"쐡"#),
+        (r#"쐢"#, r#"쐢"#, r#"쐢"#, r#"쐢"#, r#"쐢"#),
+        (r#"쐣"#, r#"쐣"#, r#"쐣"#, r#"쐣"#, r#"쐣"#),
+        (r#"쐤"#, r#"쐤"#, r#"쐤"#, r#"쐤"#, r#"쐤"#),
+        (r#"쐥"#, r#"쐥"#, r#"쐥"#, r#"쐥"#, r#"쐥"#),
+        (r#"쐦"#, r#"쐦"#, r#"쐦"#, r#"쐦"#, r#"쐦"#),
+        (r#"쐧"#, r#"쐧"#, r#"쐧"#, r#"쐧"#, r#"쐧"#),
+        (r#"쐨"#, r#"쐨"#, r#"쐨"#, r#"쐨"#, r#"쐨"#),
+        (r#"쐩"#, r#"쐩"#, r#"쐩"#, r#"쐩"#, r#"쐩"#),
+        (r#"쐪"#, r#"쐪"#, r#"쐪"#, r#"쐪"#, r#"쐪"#),
+        (r#"쐫"#, r#"쐫"#, r#"쐫"#, r#"쐫"#, r#"쐫"#),
+        (r#"쐬"#, r#"쐬"#, r#"쐬"#, r#"쐬"#, r#"쐬"#),
+        (r#"쐭"#, r#"쐭"#, r#"쐭"#, r#"쐭"#, r#"쐭"#),
+        (r#"쐮"#, r#"쐮"#, r#"쐮"#, r#"쐮"#, r#"쐮"#),
+        (r#"쐯"#, r#"쐯"#, r#"쐯"#, r#"쐯"#, r#"쐯"#),
+        (r#"쐰"#, r#"쐰"#, r#"쐰"#, r#"쐰"#, r#"쐰"#),
+        (r#"쐱"#, r#"쐱"#, r#"쐱"#, r#"쐱"#, r#"쐱"#),
+        (r#"쐲"#, r#"쐲"#, r#"쐲"#, r#"쐲"#, r#"쐲"#),
+        (r#"쐳"#, r#"쐳"#, r#"쐳"#, r#"쐳"#, r#"쐳"#),
+        (r#"쐴"#, r#"쐴"#, r#"쐴"#, r#"쐴"#, r#"쐴"#),
+        (r#"쐵"#, r#"쐵"#, r#"쐵"#, r#"쐵"#, r#"쐵"#),
+        (r#"쐶"#, r#"쐶"#, r#"쐶"#, r#"쐶"#, r#"쐶"#),
+        (r#"쐷"#, r#"쐷"#, r#"쐷"#, r#"쐷"#, r#"쐷"#),
+        (r#"쐸"#, r#"쐸"#, r#"쐸"#, r#"쐸"#, r#"쐸"#),
+        (r#"쐹"#, r#"쐹"#, r#"쐹"#, r#"쐹"#, r#"쐹"#),
+        (r#"쐺"#, r#"쐺"#, r#"쐺"#, r#"쐺"#, r#"쐺"#),
+        (r#"쐻"#, r#"쐻"#, r#"쐻"#, r#"쐻"#, r#"쐻"#),
+        (r#"쐼"#, r#"쐼"#, r#"쐼"#, r#"쐼"#, r#"쐼"#),
+        (r#"쐽"#, r#"쐽"#, r#"쐽"#, r#"쐽"#, r#"쐽"#),
+        (r#"쐾"#, r#"쐾"#, r#"쐾"#, r#"쐾"#, r#"쐾"#),
+        (r#"쐿"#, r#"쐿"#, r#"쐿"#, r#"쐿"#, r#"쐿"#),
+        (r#"쑀"#, r#"쑀"#, r#"쑀"#, r#"쑀"#, r#"쑀"#),
+        (r#"쑁"#, r#"쑁"#, r#"쑁"#, r#"쑁"#, r#"쑁"#),
+        (r#"쑂"#, r#"쑂"#, r#"쑂"#, r#"쑂"#, r#"쑂"#),
+        (r#"쑃"#, r#"쑃"#, r#"쑃"#, r#"쑃"#, r#"쑃"#),
+        (r#"쑄"#, r#"쑄"#, r#"쑄"#, r#"쑄"#, r#"쑄"#),
+        (r#"쑅"#, r#"쑅"#, r#"쑅"#, r#"쑅"#, r#"쑅"#),
+        (r#"쑆"#, r#"쑆"#, r#"쑆"#, r#"쑆"#, r#"쑆"#),
+        (r#"쑇"#, r#"쑇"#, r#"쑇"#, r#"쑇"#, r#"쑇"#),
+        (r#"쑈"#, r#"쑈"#, r#"쑈"#, r#"쑈"#, r#"쑈"#),
+        (r#"쑉"#, r#"쑉"#, r#"쑉"#, r#"쑉"#, r#"쑉"#),
+        (r#"쑊"#, r#"쑊"#, r#"쑊"#, r#"쑊"#, r#"쑊"#),
+        (r#"쑋"#, r#"쑋"#, r#"쑋"#, r#"쑋"#, r#"쑋"#),
+        (r#"쑌"#, r#"쑌"#, r#"쑌"#, r#"쑌"#, r#"쑌"#),
+        (r#"쑍"#, r#"쑍"#, r#"쑍"#, r#"쑍"#, r#"쑍"#),
+        (r#"쑎"#, r#"쑎"#, r#"쑎"#, r#"쑎"#, r#"쑎"#),
+        (r#"쑏"#, r#"쑏"#, r#"쑏"#, r#"쑏"#, r#"쑏"#),
+        (r#"쑐"#, r#"쑐"#, r#"쑐"#, r#"쑐"#, r#"쑐"#),
+        (r#"쑑"#, r#"쑑"#, r#"쑑"#, r#"쑑"#, r#"쑑"#),
+        (r#"쑒"#, r#"쑒"#, r#"쑒"#, r#"쑒"#, r#"쑒"#),
+        (r#"쑓"#, r#"쑓"#, r#"쑓"#, r#"쑓"#, r#"쑓"#),
+        (r#"쑔"#, r#"쑔"#, r#"쑔"#, r#"쑔"#, r#"쑔"#),
+        (r#"쑕"#, r#"쑕"#, r#"쑕"#, r#"쑕"#, r#"쑕"#),
+        (r#"쑖"#, r#"쑖"#, r#"쑖"#, r#"쑖"#, r#"쑖"#),
+        (r#"쑗"#, r#"쑗"#, r#"쑗"#, r#"쑗"#, r#"쑗"#),
+        (r#"쑘"#, r#"쑘"#, r#"쑘"#, r#"쑘"#, r#"쑘"#),
+        (r#"쑙"#, r#"쑙"#, r#"쑙"#, r#"쑙"#, r#"쑙"#),
+        (r#"쑚"#, r#"쑚"#, r#"쑚"#, r#"쑚"#, r#"쑚"#),
+        (r#"쑛"#, r#"쑛"#, r#"쑛"#, r#"쑛"#, r#"쑛"#),
+        (r#"쑜"#, r#"쑜"#, r#"쑜"#, r#"쑜"#, r#"쑜"#),
+        (r#"쑝"#, r#"쑝"#, r#"쑝"#, r#"쑝"#, r#"쑝"#),
+        (r#"쑞"#, r#"쑞"#, r#"쑞"#, r#"쑞"#, r#"쑞"#),
+        (r#"쑟"#, r#"쑟"#, r#"쑟"#, r#"쑟"#, r#"쑟"#),
+        (r#"쑠"#, r#"쑠"#, r#"쑠"#, r#"쑠"#, r#"쑠"#),
+        (r#"쑡"#, r#"쑡"#, r#"쑡"#, r#"쑡"#, r#"쑡"#),
+        (r#"쑢"#, r#"쑢"#, r#"쑢"#, r#"쑢"#, r#"쑢"#),
+        (r#"쑣"#, r#"쑣"#, r#"쑣"#, r#"쑣"#, r#"쑣"#),
+        (r#"쑤"#, r#"쑤"#, r#"쑤"#, r#"쑤"#, r#"쑤"#),
+        (r#"쑥"#, r#"쑥"#, r#"쑥"#, r#"쑥"#, r#"쑥"#),
+        (r#"쑦"#, r#"쑦"#, r#"쑦"#, r#"쑦"#, r#"쑦"#),
+        (r#"쑧"#, r#"쑧"#, r#"쑧"#, r#"쑧"#, r#"쑧"#),
+        (r#"쑨"#, r#"쑨"#, r#"쑨"#, r#"쑨"#, r#"쑨"#),
+        (r#"쑩"#, r#"쑩"#, r#"쑩"#, r#"쑩"#, r#"쑩"#),
+        (r#"쑪"#, r#"쑪"#, r#"쑪"#, r#"쑪"#, r#"쑪"#),
+        (r#"쑫"#, r#"쑫"#, r#"쑫"#, r#"쑫"#, r#"쑫"#),
+        (r#"쑬"#, r#"쑬"#, r#"쑬"#, r#"쑬"#, r#"쑬"#),
+        (r#"쑭"#, r#"쑭"#, r#"쑭"#, r#"쑭"#, r#"쑭"#),
+        (r#"쑮"#, r#"쑮"#, r#"쑮"#, r#"쑮"#, r#"쑮"#),
+        (r#"쑯"#, r#"쑯"#, r#"쑯"#, r#"쑯"#, r#"쑯"#),
+        (r#"쑰"#, r#"쑰"#, r#"쑰"#, r#"쑰"#, r#"쑰"#),
+        (r#"쑱"#, r#"쑱"#, r#"쑱"#, r#"쑱"#, r#"쑱"#),
+        (r#"쑲"#, r#"쑲"#, r#"쑲"#, r#"쑲"#, r#"쑲"#),
+        (r#"쑳"#, r#"쑳"#, r#"쑳"#, r#"쑳"#, r#"쑳"#),
+        (r#"쑴"#, r#"쑴"#, r#"쑴"#, r#"쑴"#, r#"쑴"#),
+        (r#"쑵"#, r#"쑵"#, r#"쑵"#, r#"쑵"#, r#"쑵"#),
+        (r#"쑶"#, r#"쑶"#, r#"쑶"#, r#"쑶"#, r#"쑶"#),
+        (r#"쑷"#, r#"쑷"#, r#"쑷"#, r#"쑷"#, r#"쑷"#),
+        (r#"쑸"#, r#"쑸"#, r#"쑸"#, r#"쑸"#, r#"쑸"#),
+        (r#"쑹"#, r#"쑹"#, r#"쑹"#, r#"쑹"#, r#"쑹"#),
+        (r#"쑺"#, r#"쑺"#, r#"쑺"#, r#"쑺"#, r#"쑺"#),
+        (r#"쑻"#, r#"쑻"#, r#"쑻"#, r#"쑻"#, r#"쑻"#),
+        (r#"쑼"#, r#"쑼"#, r#"쑼"#, r#"쑼"#, r#"쑼"#),
+        (r#"쑽"#, r#"쑽"#, r#"쑽"#, r#"쑽"#, r#"쑽"#),
+        (r#"쑾"#, r#"쑾"#, r#"쑾"#, r#"쑾"#, r#"쑾"#),
+        (r#"쑿"#, r#"쑿"#, r#"쑿"#, r#"쑿"#, r#"쑿"#),
+        (r#"쒀"#, r#"쒀"#, r#"쒀"#, r#"쒀"#, r#"쒀"#),
+        (r#"쒁"#, r#"쒁"#, r#"쒁"#, r#"쒁"#, r#"쒁"#),
+        (r#"쒂"#, r#"쒂"#, r#"쒂"#, r#"쒂"#, r#"쒂"#),
+        (r#"쒃"#, r#"쒃"#, r#"쒃"#, r#"쒃"#, r#"쒃"#),
+        (r#"쒄"#, r#"쒄"#, r#"쒄"#, r#"쒄"#, r#"쒄"#),
+        (r#"쒅"#, r#"쒅"#, r#"쒅"#, r#"쒅"#, r#"쒅"#),
+        (r#"쒆"#, r#"쒆"#, r#"쒆"#, r#"쒆"#, r#"쒆"#),
+        (r#"쒇"#, r#"쒇"#, r#"쒇"#, r#"쒇"#, r#"쒇"#),
+        (r#"쒈"#, r#"쒈"#, r#"쒈"#, r#"쒈"#, r#"쒈"#),
+        (r#"쒉"#, r#"쒉"#, r#"쒉"#, r#"쒉"#, r#"쒉"#),
+        (r#"쒊"#, r#"쒊"#, r#"쒊"#, r#"쒊"#, r#"쒊"#),
+        (r#"쒋"#, r#"쒋"#, r#"쒋"#, r#"쒋"#, r#"쒋"#),
+        (r#"쒌"#, r#"쒌"#, r#"쒌"#, r#"쒌"#, r#"쒌"#),
+        (r#"쒍"#, r#"쒍"#, r#"쒍"#, r#"쒍"#, r#"쒍"#),
+        (r#"쒎"#, r#"쒎"#, r#"쒎"#, r#"쒎"#, r#"쒎"#),
+        (r#"쒏"#, r#"쒏"#, r#"쒏"#, r#"쒏"#, r#"쒏"#),
+        (r#"쒐"#, r#"쒐"#, r#"쒐"#, r#"쒐"#, r#"쒐"#),
+        (r#"쒑"#, r#"쒑"#, r#"쒑"#, r#"쒑"#, r#"쒑"#),
+        (r#"쒒"#, r#"쒒"#, r#"쒒"#, r#"쒒"#, r#"쒒"#),
+        (r#"쒓"#, r#"쒓"#, r#"쒓"#, r#"쒓"#, r#"쒓"#),
+        (r#"쒔"#, r#"쒔"#, r#"쒔"#, r#"쒔"#, r#"쒔"#),
+        (r#"쒕"#, r#"쒕"#, r#"쒕"#, r#"쒕"#, r#"쒕"#),
+        (r#"쒖"#, r#"쒖"#, r#"쒖"#, r#"쒖"#, r#"쒖"#),
+        (r#"쒗"#, r#"쒗"#, r#"쒗"#, r#"쒗"#, r#"쒗"#),
+        (r#"쒘"#, r#"쒘"#, r#"쒘"#, r#"쒘"#, r#"쒘"#),
+        (r#"쒙"#, r#"쒙"#, r#"쒙"#, r#"쒙"#, r#"쒙"#),
+        (r#"쒚"#, r#"쒚"#, r#"쒚"#, r#"쒚"#, r#"쒚"#),
+        (r#"쒛"#, r#"쒛"#, r#"쒛"#, r#"쒛"#, r#"쒛"#),
+        (r#"쒜"#, r#"쒜"#, r#"쒜"#, r#"쒜"#, r#"쒜"#),
+        (r#"쒝"#, r#"쒝"#, r#"쒝"#, r#"쒝"#, r#"쒝"#),
+        (r#"쒞"#, r#"쒞"#, r#"쒞"#, r#"쒞"#, r#"쒞"#),
+        (r#"쒟"#, r#"쒟"#, r#"쒟"#, r#"쒟"#, r#"쒟"#),
+        (r#"쒠"#, r#"쒠"#, r#"쒠"#, r#"쒠"#, r#"쒠"#),
+        (r#"쒡"#, r#"쒡"#, r#"쒡"#, r#"쒡"#, r#"쒡"#),
+        (r#"쒢"#, r#"쒢"#, r#"쒢"#, r#"쒢"#, r#"쒢"#),
+        (r#"쒣"#, r#"쒣"#, r#"쒣"#, r#"쒣"#, r#"쒣"#),
+        (r#"쒤"#, r#"쒤"#, r#"쒤"#, r#"쒤"#, r#"쒤"#),
+        (r#"쒥"#, r#"쒥"#, r#"쒥"#, r#"쒥"#, r#"쒥"#),
+        (r#"쒦"#, r#"쒦"#, r#"쒦"#, r#"쒦"#, r#"쒦"#),
+        (r#"쒧"#, r#"쒧"#, r#"쒧"#, r#"쒧"#, r#"쒧"#),
+        (r#"쒨"#, r#"쒨"#, r#"쒨"#, r#"쒨"#, r#"쒨"#),
+        (r#"쒩"#, r#"쒩"#, r#"쒩"#, r#"쒩"#, r#"쒩"#),
+        (r#"쒪"#, r#"쒪"#, r#"쒪"#, r#"쒪"#, r#"쒪"#),
+        (r#"쒫"#, r#"쒫"#, r#"쒫"#, r#"쒫"#, r#"쒫"#),
+        (r#"쒬"#, r#"쒬"#, r#"쒬"#, r#"쒬"#, r#"쒬"#),
+        (r#"쒭"#, r#"쒭"#, r#"쒭"#, r#"쒭"#, r#"쒭"#),
+        (r#"쒮"#, r#"쒮"#, r#"쒮"#, r#"쒮"#, r#"쒮"#),
+        (r#"쒯"#, r#"쒯"#, r#"쒯"#, r#"쒯"#, r#"쒯"#),
+        (r#"쒰"#, r#"쒰"#, r#"쒰"#, r#"쒰"#, r#"쒰"#),
+        (r#"쒱"#, r#"쒱"#, r#"쒱"#, r#"쒱"#, r#"쒱"#),
+        (r#"쒲"#, r#"쒲"#, r#"쒲"#, r#"쒲"#, r#"쒲"#),
+        (r#"쒳"#, r#"쒳"#, r#"쒳"#, r#"쒳"#, r#"쒳"#),
+        (r#"쒴"#, r#"쒴"#, r#"쒴"#, r#"쒴"#, r#"쒴"#),
+        (r#"쒵"#, r#"쒵"#, r#"쒵"#, r#"쒵"#, r#"쒵"#),
+        (r#"쒶"#, r#"쒶"#, r#"쒶"#, r#"쒶"#, r#"쒶"#),
+        (r#"쒷"#, r#"쒷"#, r#"쒷"#, r#"쒷"#, r#"쒷"#),
+        (r#"쒸"#, r#"쒸"#, r#"쒸"#, r#"쒸"#, r#"쒸"#),
+        (r#"쒹"#, r#"쒹"#, r#"쒹"#, r#"쒹"#, r#"쒹"#),
+        (r#"쒺"#, r#"쒺"#, r#"쒺"#, r#"쒺"#, r#"쒺"#),
+        (r#"쒻"#, r#"쒻"#, r#"쒻"#, r#"쒻"#, r#"쒻"#),
+        (r#"쒼"#, r#"쒼"#, r#"쒼"#, r#"쒼"#, r#"쒼"#),
+        (r#"쒽"#, r#"쒽"#, r#"쒽"#, r#"쒽"#, r#"쒽"#),
+        (r#"쒾"#, r#"쒾"#, r#"쒾"#, r#"쒾"#, r#"쒾"#),
+        (r#"쒿"#, r#"쒿"#, r#"쒿"#, r#"쒿"#, r#"쒿"#),
+        (r#"쓀"#, r#"쓀"#, r#"쓀"#, r#"쓀"#, r#"쓀"#),
+        (r#"쓁"#, r#"쓁"#, r#"쓁"#, r#"쓁"#, r#"쓁"#),
+        (r#"쓂"#, r#"쓂"#, r#"쓂"#, r#"쓂"#, r#"쓂"#),
+        (r#"쓃"#, r#"쓃"#, r#"쓃"#, r#"쓃"#, r#"쓃"#),
+        (r#"쓄"#, r#"쓄"#, r#"쓄"#, r#"쓄"#, r#"쓄"#),
+        (r#"쓅"#, r#"쓅"#, r#"쓅"#, r#"쓅"#, r#"쓅"#),
+        (r#"쓆"#, r#"쓆"#, r#"쓆"#, r#"쓆"#, r#"쓆"#),
+        (r#"쓇"#, r#"쓇"#, r#"쓇"#, r#"쓇"#, r#"쓇"#),
+        (r#"쓈"#, r#"쓈"#, r#"쓈"#, r#"쓈"#, r#"쓈"#),
+        (r#"쓉"#, r#"쓉"#, r#"쓉"#, r#"쓉"#, r#"쓉"#),
+        (r#"쓊"#, r#"쓊"#, r#"쓊"#, r#"쓊"#, r#"쓊"#),
+        (r#"쓋"#, r#"쓋"#, r#"쓋"#, r#"쓋"#, r#"쓋"#),
+        (r#"쓌"#, r#"쓌"#, r#"쓌"#, r#"쓌"#, r#"쓌"#),
+        (r#"쓍"#, r#"쓍"#, r#"쓍"#, r#"쓍"#, r#"쓍"#),
+        (r#"쓎"#, r#"쓎"#, r#"쓎"#, r#"쓎"#, r#"쓎"#),
+        (r#"쓏"#, r#"쓏"#, r#"쓏"#, r#"쓏"#, r#"쓏"#),
+        (r#"쓐"#, r#"쓐"#, r#"쓐"#, r#"쓐"#, r#"쓐"#),
+        (r#"쓑"#, r#"쓑"#, r#"쓑"#, r#"쓑"#, r#"쓑"#),
+        (r#"쓒"#, r#"쓒"#, r#"쓒"#, r#"쓒"#, r#"쓒"#),
+        (r#"쓓"#, r#"쓓"#, r#"쓓"#, r#"쓓"#, r#"쓓"#),
+        (r#"쓔"#, r#"쓔"#, r#"쓔"#, r#"쓔"#, r#"쓔"#),
+        (r#"쓕"#, r#"쓕"#, r#"쓕"#, r#"쓕"#, r#"쓕"#),
+        (r#"쓖"#, r#"쓖"#, r#"쓖"#, r#"쓖"#, r#"쓖"#),
+        (r#"쓗"#, r#"쓗"#, r#"쓗"#, r#"쓗"#, r#"쓗"#),
+        (r#"쓘"#, r#"쓘"#, r#"쓘"#, r#"쓘"#, r#"쓘"#),
+        (r#"쓙"#, r#"쓙"#, r#"쓙"#, r#"쓙"#, r#"쓙"#),
+        (r#"쓚"#, r#"쓚"#, r#"쓚"#, r#"쓚"#, r#"쓚"#),
+        (r#"쓛"#, r#"쓛"#, r#"쓛"#, r#"쓛"#, r#"쓛"#),
+        (r#"쓜"#, r#"쓜"#, r#"쓜"#, r#"쓜"#, r#"쓜"#),
+        (r#"쓝"#, r#"쓝"#, r#"쓝"#, r#"쓝"#, r#"쓝"#),
+        (r#"쓞"#, r#"쓞"#, r#"쓞"#, r#"쓞"#, r#"쓞"#),
+        (r#"쓟"#, r#"쓟"#, r#"쓟"#, r#"쓟"#, r#"쓟"#),
+        (r#"쓠"#, r#"쓠"#, r#"쓠"#, r#"쓠"#, r#"쓠"#),
+        (r#"쓡"#, r#"쓡"#, r#"쓡"#, r#"쓡"#, r#"쓡"#),
+        (r#"쓢"#, r#"쓢"#, r#"쓢"#, r#"쓢"#, r#"쓢"#),
+        (r#"쓣"#, r#"쓣"#, r#"쓣"#, r#"쓣"#, r#"쓣"#),
+        (r#"쓤"#, r#"쓤"#, r#"쓤"#, r#"쓤"#, r#"쓤"#),
+        (r#"쓥"#, r#"쓥"#, r#"쓥"#, r#"쓥"#, r#"쓥"#),
+        (r#"쓦"#, r#"쓦"#, r#"쓦"#, r#"쓦"#, r#"쓦"#),
+        (r#"쓧"#, r#"쓧"#, r#"쓧"#, r#"쓧"#, r#"쓧"#),
+        (r#"쓨"#, r#"쓨"#, r#"쓨"#, r#"쓨"#, r#"쓨"#),
+        (r#"쓩"#, r#"쓩"#, r#"쓩"#, r#"쓩"#, r#"쓩"#),
+        (r#"쓪"#, r#"쓪"#, r#"쓪"#, r#"쓪"#, r#"쓪"#),
+        (r#"쓫"#, r#"쓫"#, r#"쓫"#, r#"쓫"#, r#"쓫"#),
+        (r#"쓬"#, r#"쓬"#, r#"쓬"#, r#"쓬"#, r#"쓬"#),
+        (r#"쓭"#, r#"쓭"#, r#"쓭"#, r#"쓭"#, r#"쓭"#),
+        (r#"쓮"#, r#"쓮"#, r#"쓮"#, r#"쓮"#, r#"쓮"#),
+        (r#"쓯"#, r#"쓯"#, r#"쓯"#, r#"쓯"#, r#"쓯"#),
+        (r#"쓰"#, r#"쓰"#, r#"쓰"#, r#"쓰"#, r#"쓰"#),
+        (r#"쓱"#, r#"쓱"#, r#"쓱"#, r#"쓱"#, r#"쓱"#),
+        (r#"쓲"#, r#"쓲"#, r#"쓲"#, r#"쓲"#, r#"쓲"#),
+        (r#"쓳"#, r#"쓳"#, r#"쓳"#, r#"쓳"#, r#"쓳"#),
+        (r#"쓴"#, r#"쓴"#, r#"쓴"#, r#"쓴"#, r#"쓴"#),
+        (r#"쓵"#, r#"쓵"#, r#"쓵"#, r#"쓵"#, r#"쓵"#),
+        (r#"쓶"#, r#"쓶"#, r#"쓶"#, r#"쓶"#, r#"쓶"#),
+        (r#"쓷"#, r#"쓷"#, r#"쓷"#, r#"쓷"#, r#"쓷"#),
+        (r#"쓸"#, r#"쓸"#, r#"쓸"#, r#"쓸"#, r#"쓸"#),
+        (r#"쓹"#, r#"쓹"#, r#"쓹"#, r#"쓹"#, r#"쓹"#),
+        (r#"쓺"#, r#"쓺"#, r#"쓺"#, r#"쓺"#, r#"쓺"#),
+        (r#"쓻"#, r#"쓻"#, r#"쓻"#, r#"쓻"#, r#"쓻"#),
+        (r#"쓼"#, r#"쓼"#, r#"쓼"#, r#"쓼"#, r#"쓼"#),
+        (r#"쓽"#, r#"쓽"#, r#"쓽"#, r#"쓽"#, r#"쓽"#),
+        (r#"쓾"#, r#"쓾"#, r#"쓾"#, r#"쓾"#, r#"쓾"#),
+        (r#"쓿"#, r#"쓿"#, r#"쓿"#, r#"쓿"#, r#"쓿"#),
+        (r#"씀"#, r#"씀"#, r#"씀"#, r#"씀"#, r#"씀"#),
+        (r#"씁"#, r#"씁"#, r#"씁"#, r#"씁"#, r#"씁"#),
+        (r#"씂"#, r#"씂"#, r#"씂"#, r#"씂"#, r#"씂"#),
+        (r#"씃"#, r#"씃"#, r#"씃"#, r#"씃"#, r#"씃"#),
+        (r#"씄"#, r#"씄"#, r#"씄"#, r#"씄"#, r#"씄"#),
+        (r#"씅"#, r#"씅"#, r#"씅"#, r#"씅"#, r#"씅"#),
+        (r#"씆"#, r#"씆"#, r#"씆"#, r#"씆"#, r#"씆"#),
+        (r#"씇"#, r#"씇"#, r#"씇"#, r#"씇"#, r#"씇"#),
+        (r#"씈"#, r#"씈"#, r#"씈"#, r#"씈"#, r#"씈"#),
+        (r#"씉"#, r#"씉"#, r#"씉"#, r#"씉"#, r#"씉"#),
+        (r#"씊"#, r#"씊"#, r#"씊"#, r#"씊"#, r#"씊"#),
+        (r#"씋"#, r#"씋"#, r#"씋"#, r#"씋"#, r#"씋"#),
+        (r#"씌"#, r#"씌"#, r#"씌"#, r#"씌"#, r#"씌"#),
+        (r#"씍"#, r#"씍"#, r#"씍"#, r#"씍"#, r#"씍"#),
+        (r#"씎"#, r#"씎"#, r#"씎"#, r#"씎"#, r#"씎"#),
+        (r#"씏"#, r#"씏"#, r#"씏"#, r#"씏"#, r#"씏"#),
+        (r#"씐"#, r#"씐"#, r#"씐"#, r#"씐"#, r#"씐"#),
+        (r#"씑"#, r#"씑"#, r#"씑"#, r#"씑"#, r#"씑"#),
+        (r#"씒"#, r#"씒"#, r#"씒"#, r#"씒"#, r#"씒"#),
+        (r#"씓"#, r#"씓"#, r#"씓"#, r#"씓"#, r#"씓"#),
+        (r#"씔"#, r#"씔"#, r#"씔"#, r#"씔"#, r#"씔"#),
+        (r#"씕"#, r#"씕"#, r#"씕"#, r#"씕"#, r#"씕"#),
+        (r#"씖"#, r#"씖"#, r#"씖"#, r#"씖"#, r#"씖"#),
+        (r#"씗"#, r#"씗"#, r#"씗"#, r#"씗"#, r#"씗"#),
+        (r#"씘"#, r#"씘"#, r#"씘"#, r#"씘"#, r#"씘"#),
+        (r#"씙"#, r#"씙"#, r#"씙"#, r#"씙"#, r#"씙"#),
+        (r#"씚"#, r#"씚"#, r#"씚"#, r#"씚"#, r#"씚"#),
+        (r#"씛"#, r#"씛"#, r#"씛"#, r#"씛"#, r#"씛"#),
+        (r#"씜"#, r#"씜"#, r#"씜"#, r#"씜"#, r#"씜"#),
+        (r#"씝"#, r#"씝"#, r#"씝"#, r#"씝"#, r#"씝"#),
+        (r#"씞"#, r#"씞"#, r#"씞"#, r#"씞"#, r#"씞"#),
+        (r#"씟"#, r#"씟"#, r#"씟"#, r#"씟"#, r#"씟"#),
+        (r#"씠"#, r#"씠"#, r#"씠"#, r#"씠"#, r#"씠"#),
+        (r#"씡"#, r#"씡"#, r#"씡"#, r#"씡"#, r#"씡"#),
+        (r#"씢"#, r#"씢"#, r#"씢"#, r#"씢"#, r#"씢"#),
+        (r#"씣"#, r#"씣"#, r#"씣"#, r#"씣"#, r#"씣"#),
+        (r#"씤"#, r#"씤"#, r#"씤"#, r#"씤"#, r#"씤"#),
+        (r#"씥"#, r#"씥"#, r#"씥"#, r#"씥"#, r#"씥"#),
+        (r#"씦"#, r#"씦"#, r#"씦"#, r#"씦"#, r#"씦"#),
+        (r#"씧"#, r#"씧"#, r#"씧"#, r#"씧"#, r#"씧"#),
+        (r#"씨"#, r#"씨"#, r#"씨"#, r#"씨"#, r#"씨"#),
+        (r#"씩"#, r#"씩"#, r#"씩"#, r#"씩"#, r#"씩"#),
+        (r#"씪"#, r#"씪"#, r#"씪"#, r#"씪"#, r#"씪"#),
+        (r#"씫"#, r#"씫"#, r#"씫"#, r#"씫"#, r#"씫"#),
+        (r#"씬"#, r#"씬"#, r#"씬"#, r#"씬"#, r#"씬"#),
+        (r#"씭"#, r#"씭"#, r#"씭"#, r#"씭"#, r#"씭"#),
+        (r#"씮"#, r#"씮"#, r#"씮"#, r#"씮"#, r#"씮"#),
+        (r#"씯"#, r#"씯"#, r#"씯"#, r#"씯"#, r#"씯"#),
+        (r#"씰"#, r#"씰"#, r#"씰"#, r#"씰"#, r#"씰"#),
+        (r#"씱"#, r#"씱"#, r#"씱"#, r#"씱"#, r#"씱"#),
+        (r#"씲"#, r#"씲"#, r#"씲"#, r#"씲"#, r#"씲"#),
+        (r#"씳"#, r#"씳"#, r#"씳"#, r#"씳"#, r#"씳"#),
+        (r#"씴"#, r#"씴"#, r#"씴"#, r#"씴"#, r#"씴"#),
+        (r#"씵"#, r#"씵"#, r#"씵"#, r#"씵"#, r#"씵"#),
+        (r#"씶"#, r#"씶"#, r#"씶"#, r#"씶"#, r#"씶"#),
+        (r#"씷"#, r#"씷"#, r#"씷"#, r#"씷"#, r#"씷"#),
+        (r#"씸"#, r#"씸"#, r#"씸"#, r#"씸"#, r#"씸"#),
+        (r#"씹"#, r#"씹"#, r#"씹"#, r#"씹"#, r#"씹"#),
+        (r#"씺"#, r#"씺"#, r#"씺"#, r#"씺"#, r#"씺"#),
+        (r#"씻"#, r#"씻"#, r#"씻"#, r#"씻"#, r#"씻"#),
+        (r#"씼"#, r#"씼"#, r#"씼"#, r#"씼"#, r#"씼"#),
+        (r#"씽"#, r#"씽"#, r#"씽"#, r#"씽"#, r#"씽"#),
+        (r#"씾"#, r#"씾"#, r#"씾"#, r#"씾"#, r#"씾"#),
+        (r#"씿"#, r#"씿"#, r#"씿"#, r#"씿"#, r#"씿"#),
+        (r#"앀"#, r#"앀"#, r#"앀"#, r#"앀"#, r#"앀"#),
+        (r#"앁"#, r#"앁"#, r#"앁"#, r#"앁"#, r#"앁"#),
+        (r#"앂"#, r#"앂"#, r#"앂"#, r#"앂"#, r#"앂"#),
+        (r#"앃"#, r#"앃"#, r#"앃"#, r#"앃"#, r#"앃"#),
+        (r#"아"#, r#"아"#, r#"아"#, r#"아"#, r#"아"#),
+        (r#"악"#, r#"악"#, r#"악"#, r#"악"#, r#"악"#),
+        (r#"앆"#, r#"앆"#, r#"앆"#, r#"앆"#, r#"앆"#),
+        (r#"앇"#, r#"앇"#, r#"앇"#, r#"앇"#, r#"앇"#),
+        (r#"안"#, r#"안"#, r#"안"#, r#"안"#, r#"안"#),
+        (r#"앉"#, r#"앉"#, r#"앉"#, r#"앉"#, r#"앉"#),
+        (r#"않"#, r#"않"#, r#"않"#, r#"않"#, r#"않"#),
+        (r#"앋"#, r#"앋"#, r#"앋"#, r#"앋"#, r#"앋"#),
+        (r#"알"#, r#"알"#, r#"알"#, r#"알"#, r#"알"#),
+        (r#"앍"#, r#"앍"#, r#"앍"#, r#"앍"#, r#"앍"#),
+        (r#"앎"#, r#"앎"#, r#"앎"#, r#"앎"#, r#"앎"#),
+        (r#"앏"#, r#"앏"#, r#"앏"#, r#"앏"#, r#"앏"#),
+        (r#"앐"#, r#"앐"#, r#"앐"#, r#"앐"#, r#"앐"#),
+        (r#"앑"#, r#"앑"#, r#"앑"#, r#"앑"#, r#"앑"#),
+        (r#"앒"#, r#"앒"#, r#"앒"#, r#"앒"#, r#"앒"#),
+        (r#"앓"#, r#"앓"#, r#"앓"#, r#"앓"#, r#"앓"#),
+        (r#"암"#, r#"암"#, r#"암"#, r#"암"#, r#"암"#),
+        (r#"압"#, r#"압"#, r#"압"#, r#"압"#, r#"압"#),
+        (r#"앖"#, r#"앖"#, r#"앖"#, r#"앖"#, r#"앖"#),
+        (r#"앗"#, r#"앗"#, r#"앗"#, r#"앗"#, r#"앗"#),
+        (r#"았"#, r#"았"#, r#"았"#, r#"았"#, r#"았"#),
+        (r#"앙"#, r#"앙"#, r#"앙"#, r#"앙"#, r#"앙"#),
+        (r#"앚"#, r#"앚"#, r#"앚"#, r#"앚"#, r#"앚"#),
+        (r#"앛"#, r#"앛"#, r#"앛"#, r#"앛"#, r#"앛"#),
+        (r#"앜"#, r#"앜"#, r#"앜"#, r#"앜"#, r#"앜"#),
+        (r#"앝"#, r#"앝"#, r#"앝"#, r#"앝"#, r#"앝"#),
+        (r#"앞"#, r#"앞"#, r#"앞"#, r#"앞"#, r#"앞"#),
+        (r#"앟"#, r#"앟"#, r#"앟"#, r#"앟"#, r#"앟"#),
+        (r#"애"#, r#"애"#, r#"애"#, r#"애"#, r#"애"#),
+        (r#"액"#, r#"액"#, r#"액"#, r#"액"#, r#"액"#),
+        (r#"앢"#, r#"앢"#, r#"앢"#, r#"앢"#, r#"앢"#),
+        (r#"앣"#, r#"앣"#, r#"앣"#, r#"앣"#, r#"앣"#),
+        (r#"앤"#, r#"앤"#, r#"앤"#, r#"앤"#, r#"앤"#),
+        (r#"앥"#, r#"앥"#, r#"앥"#, r#"앥"#, r#"앥"#),
+        (r#"앦"#, r#"앦"#, r#"앦"#, r#"앦"#, r#"앦"#),
+        (r#"앧"#, r#"앧"#, r#"앧"#, r#"앧"#, r#"앧"#),
+        (r#"앨"#, r#"앨"#, r#"앨"#, r#"앨"#, r#"앨"#),
+        (r#"앩"#, r#"앩"#, r#"앩"#, r#"앩"#, r#"앩"#),
+        (r#"앪"#, r#"앪"#, r#"앪"#, r#"앪"#, r#"앪"#),
+        (r#"앫"#, r#"앫"#, r#"앫"#, r#"앫"#, r#"앫"#),
+        (r#"앬"#, r#"앬"#, r#"앬"#, r#"앬"#, r#"앬"#),
+        (r#"앭"#, r#"앭"#, r#"앭"#, r#"앭"#, r#"앭"#),
+        (r#"앮"#, r#"앮"#, r#"앮"#, r#"앮"#, r#"앮"#),
+        (r#"앯"#, r#"앯"#, r#"앯"#, r#"앯"#, r#"앯"#),
+        (r#"앰"#, r#"앰"#, r#"앰"#, r#"앰"#, r#"앰"#),
+        (r#"앱"#, r#"앱"#, r#"앱"#, r#"앱"#, r#"앱"#),
+        (r#"앲"#, r#"앲"#, r#"앲"#, r#"앲"#, r#"앲"#),
+        (r#"앳"#, r#"앳"#, r#"앳"#, r#"앳"#, r#"앳"#),
+        (r#"앴"#, r#"앴"#, r#"앴"#, r#"앴"#, r#"앴"#),
+        (r#"앵"#, r#"앵"#, r#"앵"#, r#"앵"#, r#"앵"#),
+        (r#"앶"#, r#"앶"#, r#"앶"#, r#"앶"#, r#"앶"#),
+        (r#"앷"#, r#"앷"#, r#"앷"#, r#"앷"#, r#"앷"#),
+        (r#"앸"#, r#"앸"#, r#"앸"#, r#"앸"#, r#"앸"#),
+        (r#"앹"#, r#"앹"#, r#"앹"#, r#"앹"#, r#"앹"#),
+        (r#"앺"#, r#"앺"#, r#"앺"#, r#"앺"#, r#"앺"#),
+        (r#"앻"#, r#"앻"#, r#"앻"#, r#"앻"#, r#"앻"#),
+        (r#"야"#, r#"야"#, r#"야"#, r#"야"#, r#"야"#),
+        (r#"약"#, r#"약"#, r#"약"#, r#"약"#, r#"약"#),
+        (r#"앾"#, r#"앾"#, r#"앾"#, r#"앾"#, r#"앾"#),
+        (r#"앿"#, r#"앿"#, r#"앿"#, r#"앿"#, r#"앿"#),
+        (r#"얀"#, r#"얀"#, r#"얀"#, r#"얀"#, r#"얀"#),
+        (r#"얁"#, r#"얁"#, r#"얁"#, r#"얁"#, r#"얁"#),
+        (r#"얂"#, r#"얂"#, r#"얂"#, r#"얂"#, r#"얂"#),
+        (r#"얃"#, r#"얃"#, r#"얃"#, r#"얃"#, r#"얃"#),
+        (r#"얄"#, r#"얄"#, r#"얄"#, r#"얄"#, r#"얄"#),
+        (r#"얅"#, r#"얅"#, r#"얅"#, r#"얅"#, r#"얅"#),
+        (r#"얆"#, r#"얆"#, r#"얆"#, r#"얆"#, r#"얆"#),
+        (r#"얇"#, r#"얇"#, r#"얇"#, r#"얇"#, r#"얇"#),
+        (r#"얈"#, r#"얈"#, r#"얈"#, r#"얈"#, r#"얈"#),
+        (r#"얉"#, r#"얉"#, r#"얉"#, r#"얉"#, r#"얉"#),
+        (r#"얊"#, r#"얊"#, r#"얊"#, r#"얊"#, r#"얊"#),
+        (r#"얋"#, r#"얋"#, r#"얋"#, r#"얋"#, r#"얋"#),
+        (r#"얌"#, r#"얌"#, r#"얌"#, r#"얌"#, r#"얌"#),
+        (r#"얍"#, r#"얍"#, r#"얍"#, r#"얍"#, r#"얍"#),
+        (r#"얎"#, r#"얎"#, r#"얎"#, r#"얎"#, r#"얎"#),
+        (r#"얏"#, r#"얏"#, r#"얏"#, r#"얏"#, r#"얏"#),
+        (r#"얐"#, r#"얐"#, r#"얐"#, r#"얐"#, r#"얐"#),
+        (r#"양"#, r#"양"#, r#"양"#, r#"양"#, r#"양"#),
+        (r#"얒"#, r#"얒"#, r#"얒"#, r#"얒"#, r#"얒"#),
+        (r#"얓"#, r#"얓"#, r#"얓"#, r#"얓"#, r#"얓"#),
+        (r#"얔"#, r#"얔"#, r#"얔"#, r#"얔"#, r#"얔"#),
+        (r#"얕"#, r#"얕"#, r#"얕"#, r#"얕"#, r#"얕"#),
+        (r#"얖"#, r#"얖"#, r#"얖"#, r#"얖"#, r#"얖"#),
+        (r#"얗"#, r#"얗"#, r#"얗"#, r#"얗"#, r#"얗"#),
+        (r#"얘"#, r#"얘"#, r#"얘"#, r#"얘"#, r#"얘"#),
+        (r#"얙"#, r#"얙"#, r#"얙"#, r#"얙"#, r#"얙"#),
+        (r#"얚"#, r#"얚"#, r#"얚"#, r#"얚"#, r#"얚"#),
+        (r#"얛"#, r#"얛"#, r#"얛"#, r#"얛"#, r#"얛"#),
+        (r#"얜"#, r#"얜"#, r#"얜"#, r#"얜"#, r#"얜"#),
+        (r#"얝"#, r#"얝"#, r#"얝"#, r#"얝"#, r#"얝"#),
+        (r#"얞"#, r#"얞"#, r#"얞"#, r#"얞"#, r#"얞"#),
+        (r#"얟"#, r#"얟"#, r#"얟"#, r#"얟"#, r#"얟"#),
+        (r#"얠"#, r#"얠"#, r#"얠"#, r#"얠"#, r#"얠"#),
+        (r#"얡"#, r#"얡"#, r#"얡"#, r#"얡"#, r#"얡"#),
+        (r#"얢"#, r#"얢"#, r#"얢"#, r#"얢"#, r#"얢"#),
+        (r#"얣"#, r#"얣"#, r#"얣"#, r#"얣"#, r#"얣"#),
+        (r#"얤"#, r#"얤"#, r#"얤"#, r#"얤"#, r#"얤"#),
+        (r#"얥"#, r#"얥"#, r#"얥"#, r#"얥"#, r#"얥"#),
+        (r#"얦"#, r#"얦"#, r#"얦"#, r#"얦"#, r#"얦"#),
+        (r#"얧"#, r#"얧"#, r#"얧"#, r#"얧"#, r#"얧"#),
+        (r#"얨"#, r#"얨"#, r#"얨"#, r#"얨"#, r#"얨"#),
+        (r#"얩"#, r#"얩"#, r#"얩"#, r#"얩"#, r#"얩"#),
+        (r#"얪"#, r#"얪"#, r#"얪"#, r#"얪"#, r#"얪"#),
+        (r#"얫"#, r#"얫"#, r#"얫"#, r#"얫"#, r#"얫"#),
+        (r#"얬"#, r#"얬"#, r#"얬"#, r#"얬"#, r#"얬"#),
+        (r#"얭"#, r#"얭"#, r#"얭"#, r#"얭"#, r#"얭"#),
+        (r#"얮"#, r#"얮"#, r#"얮"#, r#"얮"#, r#"얮"#),
+        (r#"얯"#, r#"얯"#, r#"얯"#, r#"얯"#, r#"얯"#),
+        (r#"얰"#, r#"얰"#, r#"얰"#, r#"얰"#, r#"얰"#),
+        (r#"얱"#, r#"얱"#, r#"얱"#, r#"얱"#, r#"얱"#),
+        (r#"얲"#, r#"얲"#, r#"얲"#, r#"얲"#, r#"얲"#),
+        (r#"얳"#, r#"얳"#, r#"얳"#, r#"얳"#, r#"얳"#),
+        (r#"어"#, r#"어"#, r#"어"#, r#"어"#, r#"어"#),
+        (r#"억"#, r#"억"#, r#"억"#, r#"억"#, r#"억"#),
+        (r#"얶"#, r#"얶"#, r#"얶"#, r#"얶"#, r#"얶"#),
+        (r#"얷"#, r#"얷"#, r#"얷"#, r#"얷"#, r#"얷"#),
+        (r#"언"#, r#"언"#, r#"언"#, r#"언"#, r#"언"#),
+        (r#"얹"#, r#"얹"#, r#"얹"#, r#"얹"#, r#"얹"#),
+        (r#"얺"#, r#"얺"#, r#"얺"#, r#"얺"#, r#"얺"#),
+        (r#"얻"#, r#"얻"#, r#"얻"#, r#"얻"#, r#"얻"#),
+        (r#"얼"#, r#"얼"#, r#"얼"#, r#"얼"#, r#"얼"#),
+        (r#"얽"#, r#"얽"#, r#"얽"#, r#"얽"#, r#"얽"#),
+        (r#"얾"#, r#"얾"#, r#"얾"#, r#"얾"#, r#"얾"#),
+        (r#"얿"#, r#"얿"#, r#"얿"#, r#"얿"#, r#"얿"#),
+        (r#"엀"#, r#"엀"#, r#"엀"#, r#"엀"#, r#"엀"#),
+        (r#"엁"#, r#"엁"#, r#"엁"#, r#"엁"#, r#"엁"#),
+        (r#"엂"#, r#"엂"#, r#"엂"#, r#"엂"#, r#"엂"#),
+        (r#"엃"#, r#"엃"#, r#"엃"#, r#"엃"#, r#"엃"#),
+        (r#"엄"#, r#"엄"#, r#"엄"#, r#"엄"#, r#"엄"#),
+        (r#"업"#, r#"업"#, r#"업"#, r#"업"#, r#"업"#),
+        (r#"없"#, r#"없"#, r#"없"#, r#"없"#, r#"없"#),
+        (r#"엇"#, r#"엇"#, r#"엇"#, r#"엇"#, r#"엇"#),
+        (r#"었"#, r#"었"#, r#"었"#, r#"었"#, r#"었"#),
+        (r#"엉"#, r#"엉"#, r#"엉"#, r#"엉"#, r#"엉"#),
+        (r#"엊"#, r#"엊"#, r#"엊"#, r#"엊"#, r#"엊"#),
+        (r#"엋"#, r#"엋"#, r#"엋"#, r#"엋"#, r#"엋"#),
+        (r#"엌"#, r#"엌"#, r#"엌"#, r#"엌"#, r#"엌"#),
+        (r#"엍"#, r#"엍"#, r#"엍"#, r#"엍"#, r#"엍"#),
+        (r#"엎"#, r#"엎"#, r#"엎"#, r#"엎"#, r#"엎"#),
+        (r#"엏"#, r#"엏"#, r#"엏"#, r#"엏"#, r#"엏"#),
+        (r#"에"#, r#"에"#, r#"에"#, r#"에"#, r#"에"#),
+        (r#"엑"#, r#"엑"#, r#"엑"#, r#"엑"#, r#"엑"#),
+        (r#"엒"#, r#"엒"#, r#"엒"#, r#"엒"#, r#"엒"#),
+        (r#"엓"#, r#"엓"#, r#"엓"#, r#"엓"#, r#"엓"#),
+        (r#"엔"#, r#"엔"#, r#"엔"#, r#"엔"#, r#"엔"#),
+        (r#"엕"#, r#"엕"#, r#"엕"#, r#"엕"#, r#"엕"#),
+        (r#"엖"#, r#"엖"#, r#"엖"#, r#"엖"#, r#"엖"#),
+        (r#"엗"#, r#"엗"#, r#"엗"#, r#"엗"#, r#"엗"#),
+        (r#"엘"#, r#"엘"#, r#"엘"#, r#"엘"#, r#"엘"#),
+        (r#"엙"#, r#"엙"#, r#"엙"#, r#"엙"#, r#"엙"#),
+        (r#"엚"#, r#"엚"#, r#"엚"#, r#"엚"#, r#"엚"#),
+        (r#"엛"#, r#"엛"#, r#"엛"#, r#"엛"#, r#"엛"#),
+        (r#"엜"#, r#"엜"#, r#"엜"#, r#"엜"#, r#"엜"#),
+        (r#"엝"#, r#"엝"#, r#"엝"#, r#"엝"#, r#"엝"#),
+        (r#"엞"#, r#"엞"#, r#"엞"#, r#"엞"#, r#"엞"#),
+        (r#"엟"#, r#"엟"#, r#"엟"#, r#"엟"#, r#"엟"#),
+        (r#"엠"#, r#"엠"#, r#"엠"#, r#"엠"#, r#"엠"#),
+        (r#"엡"#, r#"엡"#, r#"엡"#, r#"엡"#, r#"엡"#),
+        (r#"엢"#, r#"엢"#, r#"엢"#, r#"엢"#, r#"엢"#),
+        (r#"엣"#, r#"엣"#, r#"엣"#, r#"엣"#, r#"엣"#),
+        (r#"엤"#, r#"엤"#, r#"엤"#, r#"엤"#, r#"엤"#),
+        (r#"엥"#, r#"엥"#, r#"엥"#, r#"엥"#, r#"엥"#),
+        (r#"엦"#, r#"엦"#, r#"엦"#, r#"엦"#, r#"엦"#),
+        (r#"엧"#, r#"엧"#, r#"엧"#, r#"엧"#, r#"엧"#),
+        (r#"엨"#, r#"엨"#, r#"엨"#, r#"엨"#, r#"엨"#),
+        (r#"엩"#, r#"엩"#, r#"엩"#, r#"엩"#, r#"엩"#),
+        (r#"엪"#, r#"엪"#, r#"엪"#, r#"엪"#, r#"엪"#),
+        (r#"엫"#, r#"엫"#, r#"엫"#, r#"엫"#, r#"엫"#),
+        (r#"여"#, r#"여"#, r#"여"#, r#"여"#, r#"여"#),
+        (r#"역"#, r#"역"#, r#"역"#, r#"역"#, r#"역"#),
+        (r#"엮"#, r#"엮"#, r#"엮"#, r#"엮"#, r#"엮"#),
+        (r#"엯"#, r#"엯"#, r#"엯"#, r#"엯"#, r#"엯"#),
+        (r#"연"#, r#"연"#, r#"연"#, r#"연"#, r#"연"#),
+        (r#"엱"#, r#"엱"#, r#"엱"#, r#"엱"#, r#"엱"#),
+        (r#"엲"#, r#"엲"#, r#"엲"#, r#"엲"#, r#"엲"#),
+        (r#"엳"#, r#"엳"#, r#"엳"#, r#"엳"#, r#"엳"#),
+        (r#"열"#, r#"열"#, r#"열"#, r#"열"#, r#"열"#),
+        (r#"엵"#, r#"엵"#, r#"엵"#, r#"엵"#, r#"엵"#),
+        (r#"엶"#, r#"엶"#, r#"엶"#, r#"엶"#, r#"엶"#),
+        (r#"엷"#, r#"엷"#, r#"엷"#, r#"엷"#, r#"엷"#),
+        (r#"엸"#, r#"엸"#, r#"엸"#, r#"엸"#, r#"엸"#),
+        (r#"엹"#, r#"엹"#, r#"엹"#, r#"엹"#, r#"엹"#),
+        (r#"엺"#, r#"엺"#, r#"엺"#, r#"엺"#, r#"엺"#),
+        (r#"엻"#, r#"엻"#, r#"엻"#, r#"엻"#, r#"엻"#),
+        (r#"염"#, r#"염"#, r#"염"#, r#"염"#, r#"염"#),
+        (r#"엽"#, r#"엽"#, r#"엽"#, r#"엽"#, r#"엽"#),
+        (r#"엾"#, r#"엾"#, r#"엾"#, r#"엾"#, r#"엾"#),
+        (r#"엿"#, r#"엿"#, r#"엿"#, r#"엿"#, r#"엿"#),
+        (r#"였"#, r#"였"#, r#"였"#, r#"였"#, r#"였"#),
+        (r#"영"#, r#"영"#, r#"영"#, r#"영"#, r#"영"#),
+        (r#"옂"#, r#"옂"#, r#"옂"#, r#"옂"#, r#"옂"#),
+        (r#"옃"#, r#"옃"#, r#"옃"#, r#"옃"#, r#"옃"#),
+        (r#"옄"#, r#"옄"#, r#"옄"#, r#"옄"#, r#"옄"#),
+        (r#"옅"#, r#"옅"#, r#"옅"#, r#"옅"#, r#"옅"#),
+        (r#"옆"#, r#"옆"#, r#"옆"#, r#"옆"#, r#"옆"#),
+        (r#"옇"#, r#"옇"#, r#"옇"#, r#"옇"#, r#"옇"#),
+        (r#"예"#, r#"예"#, r#"예"#, r#"예"#, r#"예"#),
+        (r#"옉"#, r#"옉"#, r#"옉"#, r#"옉"#, r#"옉"#),
+        (r#"옊"#, r#"옊"#, r#"옊"#, r#"옊"#, r#"옊"#),
+        (r#"옋"#, r#"옋"#, r#"옋"#, r#"옋"#, r#"옋"#),
+        (r#"옌"#, r#"옌"#, r#"옌"#, r#"옌"#, r#"옌"#),
+        (r#"옍"#, r#"옍"#, r#"옍"#, r#"옍"#, r#"옍"#),
+        (r#"옎"#, r#"옎"#, r#"옎"#, r#"옎"#, r#"옎"#),
+        (r#"옏"#, r#"옏"#, r#"옏"#, r#"옏"#, r#"옏"#),
+        (r#"옐"#, r#"옐"#, r#"옐"#, r#"옐"#, r#"옐"#),
+        (r#"옑"#, r#"옑"#, r#"옑"#, r#"옑"#, r#"옑"#),
+        (r#"옒"#, r#"옒"#, r#"옒"#, r#"옒"#, r#"옒"#),
+        (r#"옓"#, r#"옓"#, r#"옓"#, r#"옓"#, r#"옓"#),
+        (r#"옔"#, r#"옔"#, r#"옔"#, r#"옔"#, r#"옔"#),
+        (r#"옕"#, r#"옕"#, r#"옕"#, r#"옕"#, r#"옕"#),
+        (r#"옖"#, r#"옖"#, r#"옖"#, r#"옖"#, r#"옖"#),
+        (r#"옗"#, r#"옗"#, r#"옗"#, r#"옗"#, r#"옗"#),
+        (r#"옘"#, r#"옘"#, r#"옘"#, r#"옘"#, r#"옘"#),
+        (r#"옙"#, r#"옙"#, r#"옙"#, r#"옙"#, r#"옙"#),
+        (r#"옚"#, r#"옚"#, r#"옚"#, r#"옚"#, r#"옚"#),
+        (r#"옛"#, r#"옛"#, r#"옛"#, r#"옛"#, r#"옛"#),
+        (r#"옜"#, r#"옜"#, r#"옜"#, r#"옜"#, r#"옜"#),
+        (r#"옝"#, r#"옝"#, r#"옝"#, r#"옝"#, r#"옝"#),
+        (r#"옞"#, r#"옞"#, r#"옞"#, r#"옞"#, r#"옞"#),
+        (r#"옟"#, r#"옟"#, r#"옟"#, r#"옟"#, r#"옟"#),
+        (r#"옠"#, r#"옠"#, r#"옠"#, r#"옠"#, r#"옠"#),
+        (r#"옡"#, r#"옡"#, r#"옡"#, r#"옡"#, r#"옡"#),
+        (r#"옢"#, r#"옢"#, r#"옢"#, r#"옢"#, r#"옢"#),
+        (r#"옣"#, r#"옣"#, r#"옣"#, r#"옣"#, r#"옣"#),
+        (r#"오"#, r#"오"#, r#"오"#, r#"오"#, r#"오"#),
+        (r#"옥"#, r#"옥"#, r#"옥"#, r#"옥"#, r#"옥"#),
+        (r#"옦"#, r#"옦"#, r#"옦"#, r#"옦"#, r#"옦"#),
+        (r#"옧"#, r#"옧"#, r#"옧"#, r#"옧"#, r#"옧"#),
+        (r#"온"#, r#"온"#, r#"온"#, r#"온"#, r#"온"#),
+        (r#"옩"#, r#"옩"#, r#"옩"#, r#"옩"#, r#"옩"#),
+        (r#"옪"#, r#"옪"#, r#"옪"#, r#"옪"#, r#"옪"#),
+        (r#"옫"#, r#"옫"#, r#"옫"#, r#"옫"#, r#"옫"#),
+        (r#"올"#, r#"올"#, r#"올"#, r#"올"#, r#"올"#),
+        (r#"옭"#, r#"옭"#, r#"옭"#, r#"옭"#, r#"옭"#),
+        (r#"옮"#, r#"옮"#, r#"옮"#, r#"옮"#, r#"옮"#),
+        (r#"옯"#, r#"옯"#, r#"옯"#, r#"옯"#, r#"옯"#),
+        (r#"옰"#, r#"옰"#, r#"옰"#, r#"옰"#, r#"옰"#),
+        (r#"옱"#, r#"옱"#, r#"옱"#, r#"옱"#, r#"옱"#),
+        (r#"옲"#, r#"옲"#, r#"옲"#, r#"옲"#, r#"옲"#),
+        (r#"옳"#, r#"옳"#, r#"옳"#, r#"옳"#, r#"옳"#),
+        (r#"옴"#, r#"옴"#, r#"옴"#, r#"옴"#, r#"옴"#),
+        (r#"옵"#, r#"옵"#, r#"옵"#, r#"옵"#, r#"옵"#),
+        (r#"옶"#, r#"옶"#, r#"옶"#, r#"옶"#, r#"옶"#),
+        (r#"옷"#, r#"옷"#, r#"옷"#, r#"옷"#, r#"옷"#),
+        (r#"옸"#, r#"옸"#, r#"옸"#, r#"옸"#, r#"옸"#),
+        (r#"옹"#, r#"옹"#, r#"옹"#, r#"옹"#, r#"옹"#),
+        (r#"옺"#, r#"옺"#, r#"옺"#, r#"옺"#, r#"옺"#),
+        (r#"옻"#, r#"옻"#, r#"옻"#, r#"옻"#, r#"옻"#),
+        (r#"옼"#, r#"옼"#, r#"옼"#, r#"옼"#, r#"옼"#),
+        (r#"옽"#, r#"옽"#, r#"옽"#, r#"옽"#, r#"옽"#),
+        (r#"옾"#, r#"옾"#, r#"옾"#, r#"옾"#, r#"옾"#),
+        (r#"옿"#, r#"옿"#, r#"옿"#, r#"옿"#, r#"옿"#),
+        (r#"와"#, r#"와"#, r#"와"#, r#"와"#, r#"와"#),
+        (r#"왁"#, r#"왁"#, r#"왁"#, r#"왁"#, r#"왁"#),
+        (r#"왂"#, r#"왂"#, r#"왂"#, r#"왂"#, r#"왂"#),
+        (r#"왃"#, r#"왃"#, r#"왃"#, r#"왃"#, r#"왃"#),
+        (r#"완"#, r#"완"#, r#"완"#, r#"완"#, r#"완"#),
+        (r#"왅"#, r#"왅"#, r#"왅"#, r#"왅"#, r#"왅"#),
+        (r#"왆"#, r#"왆"#, r#"왆"#, r#"왆"#, r#"왆"#),
+        (r#"왇"#, r#"왇"#, r#"왇"#, r#"왇"#, r#"왇"#),
+        (r#"왈"#, r#"왈"#, r#"왈"#, r#"왈"#, r#"왈"#),
+        (r#"왉"#, r#"왉"#, r#"왉"#, r#"왉"#, r#"왉"#),
+        (r#"왊"#, r#"왊"#, r#"왊"#, r#"왊"#, r#"왊"#),
+        (r#"왋"#, r#"왋"#, r#"왋"#, r#"왋"#, r#"왋"#),
+        (r#"왌"#, r#"왌"#, r#"왌"#, r#"왌"#, r#"왌"#),
+        (r#"왍"#, r#"왍"#, r#"왍"#, r#"왍"#, r#"왍"#),
+        (r#"왎"#, r#"왎"#, r#"왎"#, r#"왎"#, r#"왎"#),
+        (r#"왏"#, r#"왏"#, r#"왏"#, r#"왏"#, r#"왏"#),
+        (r#"왐"#, r#"왐"#, r#"왐"#, r#"왐"#, r#"왐"#),
+        (r#"왑"#, r#"왑"#, r#"왑"#, r#"왑"#, r#"왑"#),
+        (r#"왒"#, r#"왒"#, r#"왒"#, r#"왒"#, r#"왒"#),
+        (r#"왓"#, r#"왓"#, r#"왓"#, r#"왓"#, r#"왓"#),
+        (r#"왔"#, r#"왔"#, r#"왔"#, r#"왔"#, r#"왔"#),
+        (r#"왕"#, r#"왕"#, r#"왕"#, r#"왕"#, r#"왕"#),
+        (r#"왖"#, r#"왖"#, r#"왖"#, r#"왖"#, r#"왖"#),
+        (r#"왗"#, r#"왗"#, r#"왗"#, r#"왗"#, r#"왗"#),
+        (r#"왘"#, r#"왘"#, r#"왘"#, r#"왘"#, r#"왘"#),
+        (r#"왙"#, r#"왙"#, r#"왙"#, r#"왙"#, r#"왙"#),
+        (r#"왚"#, r#"왚"#, r#"왚"#, r#"왚"#, r#"왚"#),
+        (r#"왛"#, r#"왛"#, r#"왛"#, r#"왛"#, r#"왛"#),
+        (r#"왜"#, r#"왜"#, r#"왜"#, r#"왜"#, r#"왜"#),
+        (r#"왝"#, r#"왝"#, r#"왝"#, r#"왝"#, r#"왝"#),
+        (r#"왞"#, r#"왞"#, r#"왞"#, r#"왞"#, r#"왞"#),
+        (r#"왟"#, r#"왟"#, r#"왟"#, r#"왟"#, r#"왟"#),
+        (r#"왠"#, r#"왠"#, r#"왠"#, r#"왠"#, r#"왠"#),
+        (r#"왡"#, r#"왡"#, r#"왡"#, r#"왡"#, r#"왡"#),
+        (r#"왢"#, r#"왢"#, r#"왢"#, r#"왢"#, r#"왢"#),
+        (r#"왣"#, r#"왣"#, r#"왣"#, r#"왣"#, r#"왣"#),
+        (r#"왤"#, r#"왤"#, r#"왤"#, r#"왤"#, r#"왤"#),
+        (r#"왥"#, r#"왥"#, r#"왥"#, r#"왥"#, r#"왥"#),
+        (r#"왦"#, r#"왦"#, r#"왦"#, r#"왦"#, r#"왦"#),
+        (r#"왧"#, r#"왧"#, r#"왧"#, r#"왧"#, r#"왧"#),
+        (r#"왨"#, r#"왨"#, r#"왨"#, r#"왨"#, r#"왨"#),
+        (r#"왩"#, r#"왩"#, r#"왩"#, r#"왩"#, r#"왩"#),
+        (r#"왪"#, r#"왪"#, r#"왪"#, r#"왪"#, r#"왪"#),
+        (r#"왫"#, r#"왫"#, r#"왫"#, r#"왫"#, r#"왫"#),
+        (r#"왬"#, r#"왬"#, r#"왬"#, r#"왬"#, r#"왬"#),
+        (r#"왭"#, r#"왭"#, r#"왭"#, r#"왭"#, r#"왭"#),
+        (r#"왮"#, r#"왮"#, r#"왮"#, r#"왮"#, r#"왮"#),
+        (r#"왯"#, r#"왯"#, r#"왯"#, r#"왯"#, r#"왯"#),
+        (r#"왰"#, r#"왰"#, r#"왰"#, r#"왰"#, r#"왰"#),
+        (r#"왱"#, r#"왱"#, r#"왱"#, r#"왱"#, r#"왱"#),
+        (r#"왲"#, r#"왲"#, r#"왲"#, r#"왲"#, r#"왲"#),
+        (r#"왳"#, r#"왳"#, r#"왳"#, r#"왳"#, r#"왳"#),
+        (r#"왴"#, r#"왴"#, r#"왴"#, r#"왴"#, r#"왴"#),
+        (r#"왵"#, r#"왵"#, r#"왵"#, r#"왵"#, r#"왵"#),
+        (r#"왶"#, r#"왶"#, r#"왶"#, r#"왶"#, r#"왶"#),
+        (r#"왷"#, r#"왷"#, r#"왷"#, r#"왷"#, r#"왷"#),
+        (r#"외"#, r#"외"#, r#"외"#, r#"외"#, r#"외"#),
+        (r#"왹"#, r#"왹"#, r#"왹"#, r#"왹"#, r#"왹"#),
+        (r#"왺"#, r#"왺"#, r#"왺"#, r#"왺"#, r#"왺"#),
+        (r#"왻"#, r#"왻"#, r#"왻"#, r#"왻"#, r#"왻"#),
+        (r#"왼"#, r#"왼"#, r#"왼"#, r#"왼"#, r#"왼"#),
+        (r#"왽"#, r#"왽"#, r#"왽"#, r#"왽"#, r#"왽"#),
+        (r#"왾"#, r#"왾"#, r#"왾"#, r#"왾"#, r#"왾"#),
+        (r#"왿"#, r#"왿"#, r#"왿"#, r#"왿"#, r#"왿"#),
+        (r#"욀"#, r#"욀"#, r#"욀"#, r#"욀"#, r#"욀"#),
+        (r#"욁"#, r#"욁"#, r#"욁"#, r#"욁"#, r#"욁"#),
+        (r#"욂"#, r#"욂"#, r#"욂"#, r#"욂"#, r#"욂"#),
+        (r#"욃"#, r#"욃"#, r#"욃"#, r#"욃"#, r#"욃"#),
+        (r#"욄"#, r#"욄"#, r#"욄"#, r#"욄"#, r#"욄"#),
+        (r#"욅"#, r#"욅"#, r#"욅"#, r#"욅"#, r#"욅"#),
+        (r#"욆"#, r#"욆"#, r#"욆"#, r#"욆"#, r#"욆"#),
+        (r#"욇"#, r#"욇"#, r#"욇"#, r#"욇"#, r#"욇"#),
+        (r#"욈"#, r#"욈"#, r#"욈"#, r#"욈"#, r#"욈"#),
+        (r#"욉"#, r#"욉"#, r#"욉"#, r#"욉"#, r#"욉"#),
+        (r#"욊"#, r#"욊"#, r#"욊"#, r#"욊"#, r#"욊"#),
+        (r#"욋"#, r#"욋"#, r#"욋"#, r#"욋"#, r#"욋"#),
+        (r#"욌"#, r#"욌"#, r#"욌"#, r#"욌"#, r#"욌"#),
+        (r#"욍"#, r#"욍"#, r#"욍"#, r#"욍"#, r#"욍"#),
+        (r#"욎"#, r#"욎"#, r#"욎"#, r#"욎"#, r#"욎"#),
+        (r#"욏"#, r#"욏"#, r#"욏"#, r#"욏"#, r#"욏"#),
+        (r#"욐"#, r#"욐"#, r#"욐"#, r#"욐"#, r#"욐"#),
+        (r#"욑"#, r#"욑"#, r#"욑"#, r#"욑"#, r#"욑"#),
+        (r#"욒"#, r#"욒"#, r#"욒"#, r#"욒"#, r#"욒"#),
+        (r#"욓"#, r#"욓"#, r#"욓"#, r#"욓"#, r#"욓"#),
+        (r#"요"#, r#"요"#, r#"요"#, r#"요"#, r#"요"#),
+        (r#"욕"#, r#"욕"#, r#"욕"#, r#"욕"#, r#"욕"#),
+        (r#"욖"#, r#"욖"#, r#"욖"#, r#"욖"#, r#"욖"#),
+        (r#"욗"#, r#"욗"#, r#"욗"#, r#"욗"#, r#"욗"#),
+        (r#"욘"#, r#"욘"#, r#"욘"#, r#"욘"#, r#"욘"#),
+        (r#"욙"#, r#"욙"#, r#"욙"#, r#"욙"#, r#"욙"#),
+        (r#"욚"#, r#"욚"#, r#"욚"#, r#"욚"#, r#"욚"#),
+        (r#"욛"#, r#"욛"#, r#"욛"#, r#"욛"#, r#"욛"#),
+        (r#"욜"#, r#"욜"#, r#"욜"#, r#"욜"#, r#"욜"#),
+        (r#"욝"#, r#"욝"#, r#"욝"#, r#"욝"#, r#"욝"#),
+        (r#"욞"#, r#"욞"#, r#"욞"#, r#"욞"#, r#"욞"#),
+        (r#"욟"#, r#"욟"#, r#"욟"#, r#"욟"#, r#"욟"#),
+        (r#"욠"#, r#"욠"#, r#"욠"#, r#"욠"#, r#"욠"#),
+        (r#"욡"#, r#"욡"#, r#"욡"#, r#"욡"#, r#"욡"#),
+        (r#"욢"#, r#"욢"#, r#"욢"#, r#"욢"#, r#"욢"#),
+        (r#"욣"#, r#"욣"#, r#"욣"#, r#"욣"#, r#"욣"#),
+        (r#"욤"#, r#"욤"#, r#"욤"#, r#"욤"#, r#"욤"#),
+        (r#"욥"#, r#"욥"#, r#"욥"#, r#"욥"#, r#"욥"#),
+        (r#"욦"#, r#"욦"#, r#"욦"#, r#"욦"#, r#"욦"#),
+        (r#"욧"#, r#"욧"#, r#"욧"#, r#"욧"#, r#"욧"#),
+        (r#"욨"#, r#"욨"#, r#"욨"#, r#"욨"#, r#"욨"#),
+        (r#"용"#, r#"용"#, r#"용"#, r#"용"#, r#"용"#),
+        (r#"욪"#, r#"욪"#, r#"욪"#, r#"욪"#, r#"욪"#),
+        (r#"욫"#, r#"욫"#, r#"욫"#, r#"욫"#, r#"욫"#),
+        (r#"욬"#, r#"욬"#, r#"욬"#, r#"욬"#, r#"욬"#),
+        (r#"욭"#, r#"욭"#, r#"욭"#, r#"욭"#, r#"욭"#),
+        (r#"욮"#, r#"욮"#, r#"욮"#, r#"욮"#, r#"욮"#),
+        (r#"욯"#, r#"욯"#, r#"욯"#, r#"욯"#, r#"욯"#),
+        (r#"우"#, r#"우"#, r#"우"#, r#"우"#, r#"우"#),
+        (r#"욱"#, r#"욱"#, r#"욱"#, r#"욱"#, r#"욱"#),
+        (r#"욲"#, r#"욲"#, r#"욲"#, r#"욲"#, r#"욲"#),
+        (r#"욳"#, r#"욳"#, r#"욳"#, r#"욳"#, r#"욳"#),
+        (r#"운"#, r#"운"#, r#"운"#, r#"운"#, r#"운"#),
+        (r#"욵"#, r#"욵"#, r#"욵"#, r#"욵"#, r#"욵"#),
+        (r#"욶"#, r#"욶"#, r#"욶"#, r#"욶"#, r#"욶"#),
+        (r#"욷"#, r#"욷"#, r#"욷"#, r#"욷"#, r#"욷"#),
+        (r#"울"#, r#"울"#, r#"울"#, r#"울"#, r#"울"#),
+        (r#"욹"#, r#"욹"#, r#"욹"#, r#"욹"#, r#"욹"#),
+        (r#"욺"#, r#"욺"#, r#"욺"#, r#"욺"#, r#"욺"#),
+        (r#"욻"#, r#"욻"#, r#"욻"#, r#"욻"#, r#"욻"#),
+        (r#"욼"#, r#"욼"#, r#"욼"#, r#"욼"#, r#"욼"#),
+        (r#"욽"#, r#"욽"#, r#"욽"#, r#"욽"#, r#"욽"#),
+        (r#"욾"#, r#"욾"#, r#"욾"#, r#"욾"#, r#"욾"#),
+        (r#"욿"#, r#"욿"#, r#"욿"#, r#"욿"#, r#"욿"#),
+        (r#"움"#, r#"움"#, r#"움"#, r#"움"#, r#"움"#),
+        (r#"웁"#, r#"웁"#, r#"웁"#, r#"웁"#, r#"웁"#),
+        (r#"웂"#, r#"웂"#, r#"웂"#, r#"웂"#, r#"웂"#),
+        (r#"웃"#, r#"웃"#, r#"웃"#, r#"웃"#, r#"웃"#),
+        (r#"웄"#, r#"웄"#, r#"웄"#, r#"웄"#, r#"웄"#),
+        (r#"웅"#, r#"웅"#, r#"웅"#, r#"웅"#, r#"웅"#),
+        (r#"웆"#, r#"웆"#, r#"웆"#, r#"웆"#, r#"웆"#),
+        (r#"웇"#, r#"웇"#, r#"웇"#, r#"웇"#, r#"웇"#),
+        (r#"웈"#, r#"웈"#, r#"웈"#, r#"웈"#, r#"웈"#),
+        (r#"웉"#, r#"웉"#, r#"웉"#, r#"웉"#, r#"웉"#),
+        (r#"웊"#, r#"웊"#, r#"웊"#, r#"웊"#, r#"웊"#),
+        (r#"웋"#, r#"웋"#, r#"웋"#, r#"웋"#, r#"웋"#),
+        (r#"워"#, r#"워"#, r#"워"#, r#"워"#, r#"워"#),
+        (r#"웍"#, r#"웍"#, r#"웍"#, r#"웍"#, r#"웍"#),
+        (r#"웎"#, r#"웎"#, r#"웎"#, r#"웎"#, r#"웎"#),
+        (r#"웏"#, r#"웏"#, r#"웏"#, r#"웏"#, r#"웏"#),
+        (r#"원"#, r#"원"#, r#"원"#, r#"원"#, r#"원"#),
+        (r#"웑"#, r#"웑"#, r#"웑"#, r#"웑"#, r#"웑"#),
+        (r#"웒"#, r#"웒"#, r#"웒"#, r#"웒"#, r#"웒"#),
+        (r#"웓"#, r#"웓"#, r#"웓"#, r#"웓"#, r#"웓"#),
+        (r#"월"#, r#"월"#, r#"월"#, r#"월"#, r#"월"#),
+        (r#"웕"#, r#"웕"#, r#"웕"#, r#"웕"#, r#"웕"#),
+        (r#"웖"#, r#"웖"#, r#"웖"#, r#"웖"#, r#"웖"#),
+        (r#"웗"#, r#"웗"#, r#"웗"#, r#"웗"#, r#"웗"#),
+        (r#"웘"#, r#"웘"#, r#"웘"#, r#"웘"#, r#"웘"#),
+        (r#"웙"#, r#"웙"#, r#"웙"#, r#"웙"#, r#"웙"#),
+        (r#"웚"#, r#"웚"#, r#"웚"#, r#"웚"#, r#"웚"#),
+        (r#"웛"#, r#"웛"#, r#"웛"#, r#"웛"#, r#"웛"#),
+        (r#"웜"#, r#"웜"#, r#"웜"#, r#"웜"#, r#"웜"#),
+        (r#"웝"#, r#"웝"#, r#"웝"#, r#"웝"#, r#"웝"#),
+        (r#"웞"#, r#"웞"#, r#"웞"#, r#"웞"#, r#"웞"#),
+        (r#"웟"#, r#"웟"#, r#"웟"#, r#"웟"#, r#"웟"#),
+        (r#"웠"#, r#"웠"#, r#"웠"#, r#"웠"#, r#"웠"#),
+        (r#"웡"#, r#"웡"#, r#"웡"#, r#"웡"#, r#"웡"#),
+        (r#"웢"#, r#"웢"#, r#"웢"#, r#"웢"#, r#"웢"#),
+        (r#"웣"#, r#"웣"#, r#"웣"#, r#"웣"#, r#"웣"#),
+        (r#"웤"#, r#"웤"#, r#"웤"#, r#"웤"#, r#"웤"#),
+        (r#"웥"#, r#"웥"#, r#"웥"#, r#"웥"#, r#"웥"#),
+        (r#"웦"#, r#"웦"#, r#"웦"#, r#"웦"#, r#"웦"#),
+        (r#"웧"#, r#"웧"#, r#"웧"#, r#"웧"#, r#"웧"#),
+        (r#"웨"#, r#"웨"#, r#"웨"#, r#"웨"#, r#"웨"#),
+        (r#"웩"#, r#"웩"#, r#"웩"#, r#"웩"#, r#"웩"#),
+        (r#"웪"#, r#"웪"#, r#"웪"#, r#"웪"#, r#"웪"#),
+        (r#"웫"#, r#"웫"#, r#"웫"#, r#"웫"#, r#"웫"#),
+        (r#"웬"#, r#"웬"#, r#"웬"#, r#"웬"#, r#"웬"#),
+        (r#"웭"#, r#"웭"#, r#"웭"#, r#"웭"#, r#"웭"#),
+        (r#"웮"#, r#"웮"#, r#"웮"#, r#"웮"#, r#"웮"#),
+        (r#"웯"#, r#"웯"#, r#"웯"#, r#"웯"#, r#"웯"#),
+        (r#"웰"#, r#"웰"#, r#"웰"#, r#"웰"#, r#"웰"#),
+        (r#"웱"#, r#"웱"#, r#"웱"#, r#"웱"#, r#"웱"#),
+        (r#"웲"#, r#"웲"#, r#"웲"#, r#"웲"#, r#"웲"#),
+        (r#"웳"#, r#"웳"#, r#"웳"#, r#"웳"#, r#"웳"#),
+        (r#"웴"#, r#"웴"#, r#"웴"#, r#"웴"#, r#"웴"#),
+        (r#"웵"#, r#"웵"#, r#"웵"#, r#"웵"#, r#"웵"#),
+        (r#"웶"#, r#"웶"#, r#"웶"#, r#"웶"#, r#"웶"#),
+        (r#"웷"#, r#"웷"#, r#"웷"#, r#"웷"#, r#"웷"#),
+        (r#"웸"#, r#"웸"#, r#"웸"#, r#"웸"#, r#"웸"#),
+        (r#"웹"#, r#"웹"#, r#"웹"#, r#"웹"#, r#"웹"#),
+        (r#"웺"#, r#"웺"#, r#"웺"#, r#"웺"#, r#"웺"#),
+        (r#"웻"#, r#"웻"#, r#"웻"#, r#"웻"#, r#"웻"#),
+        (r#"웼"#, r#"웼"#, r#"웼"#, r#"웼"#, r#"웼"#),
+        (r#"웽"#, r#"웽"#, r#"웽"#, r#"웽"#, r#"웽"#),
+        (r#"웾"#, r#"웾"#, r#"웾"#, r#"웾"#, r#"웾"#),
+        (r#"웿"#, r#"웿"#, r#"웿"#, r#"웿"#, r#"웿"#),
+        (r#"윀"#, r#"윀"#, r#"윀"#, r#"윀"#, r#"윀"#),
+        (r#"윁"#, r#"윁"#, r#"윁"#, r#"윁"#, r#"윁"#),
+        (r#"윂"#, r#"윂"#, r#"윂"#, r#"윂"#, r#"윂"#),
+        (r#"윃"#, r#"윃"#, r#"윃"#, r#"윃"#, r#"윃"#),
+        (r#"위"#, r#"위"#, r#"위"#, r#"위"#, r#"위"#),
+        (r#"윅"#, r#"윅"#, r#"윅"#, r#"윅"#, r#"윅"#),
+        (r#"윆"#, r#"윆"#, r#"윆"#, r#"윆"#, r#"윆"#),
+        (r#"윇"#, r#"윇"#, r#"윇"#, r#"윇"#, r#"윇"#),
+        (r#"윈"#, r#"윈"#, r#"윈"#, r#"윈"#, r#"윈"#),
+        (r#"윉"#, r#"윉"#, r#"윉"#, r#"윉"#, r#"윉"#),
+        (r#"윊"#, r#"윊"#, r#"윊"#, r#"윊"#, r#"윊"#),
+        (r#"윋"#, r#"윋"#, r#"윋"#, r#"윋"#, r#"윋"#),
+        (r#"윌"#, r#"윌"#, r#"윌"#, r#"윌"#, r#"윌"#),
+        (r#"윍"#, r#"윍"#, r#"윍"#, r#"윍"#, r#"윍"#),
+        (r#"윎"#, r#"윎"#, r#"윎"#, r#"윎"#, r#"윎"#),
+        (r#"윏"#, r#"윏"#, r#"윏"#, r#"윏"#, r#"윏"#),
+        (r#"윐"#, r#"윐"#, r#"윐"#, r#"윐"#, r#"윐"#),
+        (r#"윑"#, r#"윑"#, r#"윑"#, r#"윑"#, r#"윑"#),
+        (r#"윒"#, r#"윒"#, r#"윒"#, r#"윒"#, r#"윒"#),
+        (r#"윓"#, r#"윓"#, r#"윓"#, r#"윓"#, r#"윓"#),
+        (r#"윔"#, r#"윔"#, r#"윔"#, r#"윔"#, r#"윔"#),
+        (r#"윕"#, r#"윕"#, r#"윕"#, r#"윕"#, r#"윕"#),
+        (r#"윖"#, r#"윖"#, r#"윖"#, r#"윖"#, r#"윖"#),
+        (r#"윗"#, r#"윗"#, r#"윗"#, r#"윗"#, r#"윗"#),
+        (r#"윘"#, r#"윘"#, r#"윘"#, r#"윘"#, r#"윘"#),
+        (r#"윙"#, r#"윙"#, r#"윙"#, r#"윙"#, r#"윙"#),
+        (r#"윚"#, r#"윚"#, r#"윚"#, r#"윚"#, r#"윚"#),
+        (r#"윛"#, r#"윛"#, r#"윛"#, r#"윛"#, r#"윛"#),
+        (r#"윜"#, r#"윜"#, r#"윜"#, r#"윜"#, r#"윜"#),
+        (r#"윝"#, r#"윝"#, r#"윝"#, r#"윝"#, r#"윝"#),
+        (r#"윞"#, r#"윞"#, r#"윞"#, r#"윞"#, r#"윞"#),
+        (r#"윟"#, r#"윟"#, r#"윟"#, r#"윟"#, r#"윟"#),
+        (r#"유"#, r#"유"#, r#"유"#, r#"유"#, r#"유"#),
+        (r#"육"#, r#"육"#, r#"육"#, r#"육"#, r#"육"#),
+        (r#"윢"#, r#"윢"#, r#"윢"#, r#"윢"#, r#"윢"#),
+        (r#"윣"#, r#"윣"#, r#"윣"#, r#"윣"#, r#"윣"#),
+        (r#"윤"#, r#"윤"#, r#"윤"#, r#"윤"#, r#"윤"#),
+        (r#"윥"#, r#"윥"#, r#"윥"#, r#"윥"#, r#"윥"#),
+        (r#"윦"#, r#"윦"#, r#"윦"#, r#"윦"#, r#"윦"#),
+        (r#"윧"#, r#"윧"#, r#"윧"#, r#"윧"#, r#"윧"#),
+        (r#"율"#, r#"율"#, r#"율"#, r#"율"#, r#"율"#),
+        (r#"윩"#, r#"윩"#, r#"윩"#, r#"윩"#, r#"윩"#),
+        (r#"윪"#, r#"윪"#, r#"윪"#, r#"윪"#, r#"윪"#),
+        (r#"윫"#, r#"윫"#, r#"윫"#, r#"윫"#, r#"윫"#),
+        (r#"윬"#, r#"윬"#, r#"윬"#, r#"윬"#, r#"윬"#),
+        (r#"윭"#, r#"윭"#, r#"윭"#, r#"윭"#, r#"윭"#),
+        (r#"윮"#, r#"윮"#, r#"윮"#, r#"윮"#, r#"윮"#),
+        (r#"윯"#, r#"윯"#, r#"윯"#, r#"윯"#, r#"윯"#),
+        (r#"윰"#, r#"윰"#, r#"윰"#, r#"윰"#, r#"윰"#),
+        (r#"윱"#, r#"윱"#, r#"윱"#, r#"윱"#, r#"윱"#),
+        (r#"윲"#, r#"윲"#, r#"윲"#, r#"윲"#, r#"윲"#),
+        (r#"윳"#, r#"윳"#, r#"윳"#, r#"윳"#, r#"윳"#),
+        (r#"윴"#, r#"윴"#, r#"윴"#, r#"윴"#, r#"윴"#),
+        (r#"융"#, r#"융"#, r#"융"#, r#"융"#, r#"융"#),
+        (r#"윶"#, r#"윶"#, r#"윶"#, r#"윶"#, r#"윶"#),
+        (r#"윷"#, r#"윷"#, r#"윷"#, r#"윷"#, r#"윷"#),
+        (r#"윸"#, r#"윸"#, r#"윸"#, r#"윸"#, r#"윸"#),
+        (r#"윹"#, r#"윹"#, r#"윹"#, r#"윹"#, r#"윹"#),
+        (r#"윺"#, r#"윺"#, r#"윺"#, r#"윺"#, r#"윺"#),
+        (r#"윻"#, r#"윻"#, r#"윻"#, r#"윻"#, r#"윻"#),
+        (r#"으"#, r#"으"#, r#"으"#, r#"으"#, r#"으"#),
+        (r#"윽"#, r#"윽"#, r#"윽"#, r#"윽"#, r#"윽"#),
+        (r#"윾"#, r#"윾"#, r#"윾"#, r#"윾"#, r#"윾"#),
+        (r#"윿"#, r#"윿"#, r#"윿"#, r#"윿"#, r#"윿"#),
+        (r#"은"#, r#"은"#, r#"은"#, r#"은"#, r#"은"#),
+        (r#"읁"#, r#"읁"#, r#"읁"#, r#"읁"#, r#"읁"#),
+        (r#"읂"#, r#"읂"#, r#"읂"#, r#"읂"#, r#"읂"#),
+        (r#"읃"#, r#"읃"#, r#"읃"#, r#"읃"#, r#"읃"#),
+        (r#"을"#, r#"을"#, r#"을"#, r#"을"#, r#"을"#),
+        (r#"읅"#, r#"읅"#, r#"읅"#, r#"읅"#, r#"읅"#),
+        (r#"읆"#, r#"읆"#, r#"읆"#, r#"읆"#, r#"읆"#),
+        (r#"읇"#, r#"읇"#, r#"읇"#, r#"읇"#, r#"읇"#),
+        (r#"읈"#, r#"읈"#, r#"읈"#, r#"읈"#, r#"읈"#),
+        (r#"읉"#, r#"읉"#, r#"읉"#, r#"읉"#, r#"읉"#),
+        (r#"읊"#, r#"읊"#, r#"읊"#, r#"읊"#, r#"읊"#),
+        (r#"읋"#, r#"읋"#, r#"읋"#, r#"읋"#, r#"읋"#),
+        (r#"음"#, r#"음"#, r#"음"#, r#"음"#, r#"음"#),
+        (r#"읍"#, r#"읍"#, r#"읍"#, r#"읍"#, r#"읍"#),
+        (r#"읎"#, r#"읎"#, r#"읎"#, r#"읎"#, r#"읎"#),
+        (r#"읏"#, r#"읏"#, r#"읏"#, r#"읏"#, r#"읏"#),
+        (r#"읐"#, r#"읐"#, r#"읐"#, r#"읐"#, r#"읐"#),
+        (r#"응"#, r#"응"#, r#"응"#, r#"응"#, r#"응"#),
+        (r#"읒"#, r#"읒"#, r#"읒"#, r#"읒"#, r#"읒"#),
+        (r#"읓"#, r#"읓"#, r#"읓"#, r#"읓"#, r#"읓"#),
+        (r#"읔"#, r#"읔"#, r#"읔"#, r#"읔"#, r#"읔"#),
+        (r#"읕"#, r#"읕"#, r#"읕"#, r#"읕"#, r#"읕"#),
+        (r#"읖"#, r#"읖"#, r#"읖"#, r#"읖"#, r#"읖"#),
+        (r#"읗"#, r#"읗"#, r#"읗"#, r#"읗"#, r#"읗"#),
+        (r#"의"#, r#"의"#, r#"의"#, r#"의"#, r#"의"#),
+        (r#"읙"#, r#"읙"#, r#"읙"#, r#"읙"#, r#"읙"#),
+        (r#"읚"#, r#"읚"#, r#"읚"#, r#"읚"#, r#"읚"#),
+        (r#"읛"#, r#"읛"#, r#"읛"#, r#"읛"#, r#"읛"#),
+        (r#"읜"#, r#"읜"#, r#"읜"#, r#"읜"#, r#"읜"#),
+        (r#"읝"#, r#"읝"#, r#"읝"#, r#"읝"#, r#"읝"#),
+        (r#"읞"#, r#"읞"#, r#"읞"#, r#"읞"#, r#"읞"#),
+        (r#"읟"#, r#"읟"#, r#"읟"#, r#"읟"#, r#"읟"#),
+        (r#"읠"#, r#"읠"#, r#"읠"#, r#"읠"#, r#"읠"#),
+        (r#"읡"#, r#"읡"#, r#"읡"#, r#"읡"#, r#"읡"#),
+        (r#"읢"#, r#"읢"#, r#"읢"#, r#"읢"#, r#"읢"#),
+        (r#"읣"#, r#"읣"#, r#"읣"#, r#"읣"#, r#"읣"#),
+        (r#"읤"#, r#"읤"#, r#"읤"#, r#"읤"#, r#"읤"#),
+        (r#"읥"#, r#"읥"#, r#"읥"#, r#"읥"#, r#"읥"#),
+        (r#"읦"#, r#"읦"#, r#"읦"#, r#"읦"#, r#"읦"#),
+        (r#"읧"#, r#"읧"#, r#"읧"#, r#"읧"#, r#"읧"#),
+        (r#"읨"#, r#"읨"#, r#"읨"#, r#"읨"#, r#"읨"#),
+        (r#"읩"#, r#"읩"#, r#"읩"#, r#"읩"#, r#"읩"#),
+        (r#"읪"#, r#"읪"#, r#"읪"#, r#"읪"#, r#"읪"#),
+        (r#"읫"#, r#"읫"#, r#"읫"#, r#"읫"#, r#"읫"#),
+        (r#"읬"#, r#"읬"#, r#"읬"#, r#"읬"#, r#"읬"#),
+        (r#"읭"#, r#"읭"#, r#"읭"#, r#"읭"#, r#"읭"#),
+        (r#"읮"#, r#"읮"#, r#"읮"#, r#"읮"#, r#"읮"#),
+        (r#"읯"#, r#"읯"#, r#"읯"#, r#"읯"#, r#"읯"#),
+        (r#"읰"#, r#"읰"#, r#"읰"#, r#"읰"#, r#"읰"#),
+        (r#"읱"#, r#"읱"#, r#"읱"#, r#"읱"#, r#"읱"#),
+        (r#"읲"#, r#"읲"#, r#"읲"#, r#"읲"#, r#"읲"#),
+        (r#"읳"#, r#"읳"#, r#"읳"#, r#"읳"#, r#"읳"#),
+        (r#"이"#, r#"이"#, r#"이"#, r#"이"#, r#"이"#),
+        (r#"익"#, r#"익"#, r#"익"#, r#"익"#, r#"익"#),
+        (r#"읶"#, r#"읶"#, r#"읶"#, r#"읶"#, r#"읶"#),
+        (r#"읷"#, r#"읷"#, r#"읷"#, r#"읷"#, r#"읷"#),
+        (r#"인"#, r#"인"#, r#"인"#, r#"인"#, r#"인"#),
+        (r#"읹"#, r#"읹"#, r#"읹"#, r#"읹"#, r#"읹"#),
+        (r#"읺"#, r#"읺"#, r#"읺"#, r#"읺"#, r#"읺"#),
+        (r#"읻"#, r#"읻"#, r#"읻"#, r#"읻"#, r#"읻"#),
+        (r#"일"#, r#"일"#, r#"일"#, r#"일"#, r#"일"#),
+        (r#"읽"#, r#"읽"#, r#"읽"#, r#"읽"#, r#"읽"#),
+        (r#"읾"#, r#"읾"#, r#"읾"#, r#"읾"#, r#"읾"#),
+        (r#"읿"#, r#"읿"#, r#"읿"#, r#"읿"#, r#"읿"#),
+        (r#"잀"#, r#"잀"#, r#"잀"#, r#"잀"#, r#"잀"#),
+        (r#"잁"#, r#"잁"#, r#"잁"#, r#"잁"#, r#"잁"#),
+        (r#"잂"#, r#"잂"#, r#"잂"#, r#"잂"#, r#"잂"#),
+        (r#"잃"#, r#"잃"#, r#"잃"#, r#"잃"#, r#"잃"#),
+        (r#"임"#, r#"임"#, r#"임"#, r#"임"#, r#"임"#),
+        (r#"입"#, r#"입"#, r#"입"#, r#"입"#, r#"입"#),
+        (r#"잆"#, r#"잆"#, r#"잆"#, r#"잆"#, r#"잆"#),
+        (r#"잇"#, r#"잇"#, r#"잇"#, r#"잇"#, r#"잇"#),
+        (r#"있"#, r#"있"#, r#"있"#, r#"있"#, r#"있"#),
+        (r#"잉"#, r#"잉"#, r#"잉"#, r#"잉"#, r#"잉"#),
+        (r#"잊"#, r#"잊"#, r#"잊"#, r#"잊"#, r#"잊"#),
+        (r#"잋"#, r#"잋"#, r#"잋"#, r#"잋"#, r#"잋"#),
+        (r#"잌"#, r#"잌"#, r#"잌"#, r#"잌"#, r#"잌"#),
+        (r#"잍"#, r#"잍"#, r#"잍"#, r#"잍"#, r#"잍"#),
+        (r#"잎"#, r#"잎"#, r#"잎"#, r#"잎"#, r#"잎"#),
+        (r#"잏"#, r#"잏"#, r#"잏"#, r#"잏"#, r#"잏"#),
+        (r#"자"#, r#"자"#, r#"자"#, r#"자"#, r#"자"#),
+        (r#"작"#, r#"작"#, r#"작"#, r#"작"#, r#"작"#),
+        (r#"잒"#, r#"잒"#, r#"잒"#, r#"잒"#, r#"잒"#),
+        (r#"잓"#, r#"잓"#, r#"잓"#, r#"잓"#, r#"잓"#),
+        (r#"잔"#, r#"잔"#, r#"잔"#, r#"잔"#, r#"잔"#),
+        (r#"잕"#, r#"잕"#, r#"잕"#, r#"잕"#, r#"잕"#),
+        (r#"잖"#, r#"잖"#, r#"잖"#, r#"잖"#, r#"잖"#),
+        (r#"잗"#, r#"잗"#, r#"잗"#, r#"잗"#, r#"잗"#),
+        (r#"잘"#, r#"잘"#, r#"잘"#, r#"잘"#, r#"잘"#),
+        (r#"잙"#, r#"잙"#, r#"잙"#, r#"잙"#, r#"잙"#),
+        (r#"잚"#, r#"잚"#, r#"잚"#, r#"잚"#, r#"잚"#),
+        (r#"잛"#, r#"잛"#, r#"잛"#, r#"잛"#, r#"잛"#),
+        (r#"잜"#, r#"잜"#, r#"잜"#, r#"잜"#, r#"잜"#),
+        (r#"잝"#, r#"잝"#, r#"잝"#, r#"잝"#, r#"잝"#),
+        (r#"잞"#, r#"잞"#, r#"잞"#, r#"잞"#, r#"잞"#),
+        (r#"잟"#, r#"잟"#, r#"잟"#, r#"잟"#, r#"잟"#),
+        (r#"잠"#, r#"잠"#, r#"잠"#, r#"잠"#, r#"잠"#),
+        (r#"잡"#, r#"잡"#, r#"잡"#, r#"잡"#, r#"잡"#),
+        (r#"잢"#, r#"잢"#, r#"잢"#, r#"잢"#, r#"잢"#),
+        (r#"잣"#, r#"잣"#, r#"잣"#, r#"잣"#, r#"잣"#),
+        (r#"잤"#, r#"잤"#, r#"잤"#, r#"잤"#, r#"잤"#),
+        (r#"장"#, r#"장"#, r#"장"#, r#"장"#, r#"장"#),
+        (r#"잦"#, r#"잦"#, r#"잦"#, r#"잦"#, r#"잦"#),
+        (r#"잧"#, r#"잧"#, r#"잧"#, r#"잧"#, r#"잧"#),
+        (r#"잨"#, r#"잨"#, r#"잨"#, r#"잨"#, r#"잨"#),
+        (r#"잩"#, r#"잩"#, r#"잩"#, r#"잩"#, r#"잩"#),
+        (r#"잪"#, r#"잪"#, r#"잪"#, r#"잪"#, r#"잪"#),
+        (r#"잫"#, r#"잫"#, r#"잫"#, r#"잫"#, r#"잫"#),
+        (r#"재"#, r#"재"#, r#"재"#, r#"재"#, r#"재"#),
+        (r#"잭"#, r#"잭"#, r#"잭"#, r#"잭"#, r#"잭"#),
+        (r#"잮"#, r#"잮"#, r#"잮"#, r#"잮"#, r#"잮"#),
+        (r#"잯"#, r#"잯"#, r#"잯"#, r#"잯"#, r#"잯"#),
+        (r#"잰"#, r#"잰"#, r#"잰"#, r#"잰"#, r#"잰"#),
+        (r#"잱"#, r#"잱"#, r#"잱"#, r#"잱"#, r#"잱"#),
+        (r#"잲"#, r#"잲"#, r#"잲"#, r#"잲"#, r#"잲"#),
+        (r#"잳"#, r#"잳"#, r#"잳"#, r#"잳"#, r#"잳"#),
+        (r#"잴"#, r#"잴"#, r#"잴"#, r#"잴"#, r#"잴"#),
+        (r#"잵"#, r#"잵"#, r#"잵"#, r#"잵"#, r#"잵"#),
+        (r#"잶"#, r#"잶"#, r#"잶"#, r#"잶"#, r#"잶"#),
+        (r#"잷"#, r#"잷"#, r#"잷"#, r#"잷"#, r#"잷"#),
+        (r#"잸"#, r#"잸"#, r#"잸"#, r#"잸"#, r#"잸"#),
+        (r#"잹"#, r#"잹"#, r#"잹"#, r#"잹"#, r#"잹"#),
+        (r#"잺"#, r#"잺"#, r#"잺"#, r#"잺"#, r#"잺"#),
+        (r#"잻"#, r#"잻"#, r#"잻"#, r#"잻"#, r#"잻"#),
+        (r#"잼"#, r#"잼"#, r#"잼"#, r#"잼"#, r#"잼"#),
+        (r#"잽"#, r#"잽"#, r#"잽"#, r#"잽"#, r#"잽"#),
+        (r#"잾"#, r#"잾"#, r#"잾"#, r#"잾"#, r#"잾"#),
+        (r#"잿"#, r#"잿"#, r#"잿"#, r#"잿"#, r#"잿"#),
+        (r#"쟀"#, r#"쟀"#, r#"쟀"#, r#"쟀"#, r#"쟀"#),
+        (r#"쟁"#, r#"쟁"#, r#"쟁"#, r#"쟁"#, r#"쟁"#),
+        (r#"쟂"#, r#"쟂"#, r#"쟂"#, r#"쟂"#, r#"쟂"#),
+        (r#"쟃"#, r#"쟃"#, r#"쟃"#, r#"쟃"#, r#"쟃"#),
+        (r#"쟄"#, r#"쟄"#, r#"쟄"#, r#"쟄"#, r#"쟄"#),
+        (r#"쟅"#, r#"쟅"#, r#"쟅"#, r#"쟅"#, r#"쟅"#),
+        (r#"쟆"#, r#"쟆"#, r#"쟆"#, r#"쟆"#, r#"쟆"#),
+        (r#"쟇"#, r#"쟇"#, r#"쟇"#, r#"쟇"#, r#"쟇"#),
+        (r#"쟈"#, r#"쟈"#, r#"쟈"#, r#"쟈"#, r#"쟈"#),
+        (r#"쟉"#, r#"쟉"#, r#"쟉"#, r#"쟉"#, r#"쟉"#),
+        (r#"쟊"#, r#"쟊"#, r#"쟊"#, r#"쟊"#, r#"쟊"#),
+        (r#"쟋"#, r#"쟋"#, r#"쟋"#, r#"쟋"#, r#"쟋"#),
+        (r#"쟌"#, r#"쟌"#, r#"쟌"#, r#"쟌"#, r#"쟌"#),
+        (r#"쟍"#, r#"쟍"#, r#"쟍"#, r#"쟍"#, r#"쟍"#),
+        (r#"쟎"#, r#"쟎"#, r#"쟎"#, r#"쟎"#, r#"쟎"#),
+        (r#"쟏"#, r#"쟏"#, r#"쟏"#, r#"쟏"#, r#"쟏"#),
+        (r#"쟐"#, r#"쟐"#, r#"쟐"#, r#"쟐"#, r#"쟐"#),
+        (r#"쟑"#, r#"쟑"#, r#"쟑"#, r#"쟑"#, r#"쟑"#),
+        (r#"쟒"#, r#"쟒"#, r#"쟒"#, r#"쟒"#, r#"쟒"#),
+        (r#"쟓"#, r#"쟓"#, r#"쟓"#, r#"쟓"#, r#"쟓"#),
+        (r#"쟔"#, r#"쟔"#, r#"쟔"#, r#"쟔"#, r#"쟔"#),
+        (r#"쟕"#, r#"쟕"#, r#"쟕"#, r#"쟕"#, r#"쟕"#),
+        (r#"쟖"#, r#"쟖"#, r#"쟖"#, r#"쟖"#, r#"쟖"#),
+        (r#"쟗"#, r#"쟗"#, r#"쟗"#, r#"쟗"#, r#"쟗"#),
+        (r#"쟘"#, r#"쟘"#, r#"쟘"#, r#"쟘"#, r#"쟘"#),
+        (r#"쟙"#, r#"쟙"#, r#"쟙"#, r#"쟙"#, r#"쟙"#),
+        (r#"쟚"#, r#"쟚"#, r#"쟚"#, r#"쟚"#, r#"쟚"#),
+        (r#"쟛"#, r#"쟛"#, r#"쟛"#, r#"쟛"#, r#"쟛"#),
+        (r#"쟜"#, r#"쟜"#, r#"쟜"#, r#"쟜"#, r#"쟜"#),
+        (r#"쟝"#, r#"쟝"#, r#"쟝"#, r#"쟝"#, r#"쟝"#),
+        (r#"쟞"#, r#"쟞"#, r#"쟞"#, r#"쟞"#, r#"쟞"#),
+        (r#"쟟"#, r#"쟟"#, r#"쟟"#, r#"쟟"#, r#"쟟"#),
+        (r#"쟠"#, r#"쟠"#, r#"쟠"#, r#"쟠"#, r#"쟠"#),
+        (r#"쟡"#, r#"쟡"#, r#"쟡"#, r#"쟡"#, r#"쟡"#),
+        (r#"쟢"#, r#"쟢"#, r#"쟢"#, r#"쟢"#, r#"쟢"#),
+        (r#"쟣"#, r#"쟣"#, r#"쟣"#, r#"쟣"#, r#"쟣"#),
+        (r#"쟤"#, r#"쟤"#, r#"쟤"#, r#"쟤"#, r#"쟤"#),
+        (r#"쟥"#, r#"쟥"#, r#"쟥"#, r#"쟥"#, r#"쟥"#),
+        (r#"쟦"#, r#"쟦"#, r#"쟦"#, r#"쟦"#, r#"쟦"#),
+        (r#"쟧"#, r#"쟧"#, r#"쟧"#, r#"쟧"#, r#"쟧"#),
+        (r#"쟨"#, r#"쟨"#, r#"쟨"#, r#"쟨"#, r#"쟨"#),
+        (r#"쟩"#, r#"쟩"#, r#"쟩"#, r#"쟩"#, r#"쟩"#),
+        (r#"쟪"#, r#"쟪"#, r#"쟪"#, r#"쟪"#, r#"쟪"#),
+        (r#"쟫"#, r#"쟫"#, r#"쟫"#, r#"쟫"#, r#"쟫"#),
+        (r#"쟬"#, r#"쟬"#, r#"쟬"#, r#"쟬"#, r#"쟬"#),
+        (r#"쟭"#, r#"쟭"#, r#"쟭"#, r#"쟭"#, r#"쟭"#),
+        (r#"쟮"#, r#"쟮"#, r#"쟮"#, r#"쟮"#, r#"쟮"#),
+        (r#"쟯"#, r#"쟯"#, r#"쟯"#, r#"쟯"#, r#"쟯"#),
+        (r#"쟰"#, r#"쟰"#, r#"쟰"#, r#"쟰"#, r#"쟰"#),
+        (r#"쟱"#, r#"쟱"#, r#"쟱"#, r#"쟱"#, r#"쟱"#),
+        (r#"쟲"#, r#"쟲"#, r#"쟲"#, r#"쟲"#, r#"쟲"#),
+        (r#"쟳"#, r#"쟳"#, r#"쟳"#, r#"쟳"#, r#"쟳"#),
+        (r#"쟴"#, r#"쟴"#, r#"쟴"#, r#"쟴"#, r#"쟴"#),
+        (r#"쟵"#, r#"쟵"#, r#"쟵"#, r#"쟵"#, r#"쟵"#),
+        (r#"쟶"#, r#"쟶"#, r#"쟶"#, r#"쟶"#, r#"쟶"#),
+        (r#"쟷"#, r#"쟷"#, r#"쟷"#, r#"쟷"#, r#"쟷"#),
+        (r#"쟸"#, r#"쟸"#, r#"쟸"#, r#"쟸"#, r#"쟸"#),
+        (r#"쟹"#, r#"쟹"#, r#"쟹"#, r#"쟹"#, r#"쟹"#),
+        (r#"쟺"#, r#"쟺"#, r#"쟺"#, r#"쟺"#, r#"쟺"#),
+        (r#"쟻"#, r#"쟻"#, r#"쟻"#, r#"쟻"#, r#"쟻"#),
+        (r#"쟼"#, r#"쟼"#, r#"쟼"#, r#"쟼"#, r#"쟼"#),
+        (r#"쟽"#, r#"쟽"#, r#"쟽"#, r#"쟽"#, r#"쟽"#),
+        (r#"쟾"#, r#"쟾"#, r#"쟾"#, r#"쟾"#, r#"쟾"#),
+        (r#"쟿"#, r#"쟿"#, r#"쟿"#, r#"쟿"#, r#"쟿"#),
+        (r#"저"#, r#"저"#, r#"저"#, r#"저"#, r#"저"#),
+        (r#"적"#, r#"적"#, r#"적"#, r#"적"#, r#"적"#),
+        (r#"젂"#, r#"젂"#, r#"젂"#, r#"젂"#, r#"젂"#),
+        (r#"젃"#, r#"젃"#, r#"젃"#, r#"젃"#, r#"젃"#),
+        (r#"전"#, r#"전"#, r#"전"#, r#"전"#, r#"전"#),
+        (r#"젅"#, r#"젅"#, r#"젅"#, r#"젅"#, r#"젅"#),
+        (r#"젆"#, r#"젆"#, r#"젆"#, r#"젆"#, r#"젆"#),
+        (r#"젇"#, r#"젇"#, r#"젇"#, r#"젇"#, r#"젇"#),
+        (r#"절"#, r#"절"#, r#"절"#, r#"절"#, r#"절"#),
+        (r#"젉"#, r#"젉"#, r#"젉"#, r#"젉"#, r#"젉"#),
+        (r#"젊"#, r#"젊"#, r#"젊"#, r#"젊"#, r#"젊"#),
+        (r#"젋"#, r#"젋"#, r#"젋"#, r#"젋"#, r#"젋"#),
+        (r#"젌"#, r#"젌"#, r#"젌"#, r#"젌"#, r#"젌"#),
+        (r#"젍"#, r#"젍"#, r#"젍"#, r#"젍"#, r#"젍"#),
+        (r#"젎"#, r#"젎"#, r#"젎"#, r#"젎"#, r#"젎"#),
+        (r#"젏"#, r#"젏"#, r#"젏"#, r#"젏"#, r#"젏"#),
+        (r#"점"#, r#"점"#, r#"점"#, r#"점"#, r#"점"#),
+        (r#"접"#, r#"접"#, r#"접"#, r#"접"#, r#"접"#),
+        (r#"젒"#, r#"젒"#, r#"젒"#, r#"젒"#, r#"젒"#),
+        (r#"젓"#, r#"젓"#, r#"젓"#, r#"젓"#, r#"젓"#),
+        (r#"젔"#, r#"젔"#, r#"젔"#, r#"젔"#, r#"젔"#),
+        (r#"정"#, r#"정"#, r#"정"#, r#"정"#, r#"정"#),
+        (r#"젖"#, r#"젖"#, r#"젖"#, r#"젖"#, r#"젖"#),
+        (r#"젗"#, r#"젗"#, r#"젗"#, r#"젗"#, r#"젗"#),
+        (r#"젘"#, r#"젘"#, r#"젘"#, r#"젘"#, r#"젘"#),
+        (r#"젙"#, r#"젙"#, r#"젙"#, r#"젙"#, r#"젙"#),
+        (r#"젚"#, r#"젚"#, r#"젚"#, r#"젚"#, r#"젚"#),
+        (r#"젛"#, r#"젛"#, r#"젛"#, r#"젛"#, r#"젛"#),
+        (r#"제"#, r#"제"#, r#"제"#, r#"제"#, r#"제"#),
+        (r#"젝"#, r#"젝"#, r#"젝"#, r#"젝"#, r#"젝"#),
+        (r#"젞"#, r#"젞"#, r#"젞"#, r#"젞"#, r#"젞"#),
+        (r#"젟"#, r#"젟"#, r#"젟"#, r#"젟"#, r#"젟"#),
+        (r#"젠"#, r#"젠"#, r#"젠"#, r#"젠"#, r#"젠"#),
+        (r#"젡"#, r#"젡"#, r#"젡"#, r#"젡"#, r#"젡"#),
+        (r#"젢"#, r#"젢"#, r#"젢"#, r#"젢"#, r#"젢"#),
+        (r#"젣"#, r#"젣"#, r#"젣"#, r#"젣"#, r#"젣"#),
+        (r#"젤"#, r#"젤"#, r#"젤"#, r#"젤"#, r#"젤"#),
+        (r#"젥"#, r#"젥"#, r#"젥"#, r#"젥"#, r#"젥"#),
+        (r#"젦"#, r#"젦"#, r#"젦"#, r#"젦"#, r#"젦"#),
+        (r#"젧"#, r#"젧"#, r#"젧"#, r#"젧"#, r#"젧"#),
+        (r#"젨"#, r#"젨"#, r#"젨"#, r#"젨"#, r#"젨"#),
+        (r#"젩"#, r#"젩"#, r#"젩"#, r#"젩"#, r#"젩"#),
+        (r#"젪"#, r#"젪"#, r#"젪"#, r#"젪"#, r#"젪"#),
+        (r#"젫"#, r#"젫"#, r#"젫"#, r#"젫"#, r#"젫"#),
+        (r#"젬"#, r#"젬"#, r#"젬"#, r#"젬"#, r#"젬"#),
+        (r#"젭"#, r#"젭"#, r#"젭"#, r#"젭"#, r#"젭"#),
+        (r#"젮"#, r#"젮"#, r#"젮"#, r#"젮"#, r#"젮"#),
+        (r#"젯"#, r#"젯"#, r#"젯"#, r#"젯"#, r#"젯"#),
+        (r#"젰"#, r#"젰"#, r#"젰"#, r#"젰"#, r#"젰"#),
+        (r#"젱"#, r#"젱"#, r#"젱"#, r#"젱"#, r#"젱"#),
+        (r#"젲"#, r#"젲"#, r#"젲"#, r#"젲"#, r#"젲"#),
+        (r#"젳"#, r#"젳"#, r#"젳"#, r#"젳"#, r#"젳"#),
+        (r#"젴"#, r#"젴"#, r#"젴"#, r#"젴"#, r#"젴"#),
+        (r#"젵"#, r#"젵"#, r#"젵"#, r#"젵"#, r#"젵"#),
+        (r#"젶"#, r#"젶"#, r#"젶"#, r#"젶"#, r#"젶"#),
+        (r#"젷"#, r#"젷"#, r#"젷"#, r#"젷"#, r#"젷"#),
+        (r#"져"#, r#"져"#, r#"져"#, r#"져"#, r#"져"#),
+        (r#"젹"#, r#"젹"#, r#"젹"#, r#"젹"#, r#"젹"#),
+        (r#"젺"#, r#"젺"#, r#"젺"#, r#"젺"#, r#"젺"#),
+        (r#"젻"#, r#"젻"#, r#"젻"#, r#"젻"#, r#"젻"#),
+        (r#"젼"#, r#"젼"#, r#"젼"#, r#"젼"#, r#"젼"#),
+        (r#"젽"#, r#"젽"#, r#"젽"#, r#"젽"#, r#"젽"#),
+        (r#"젾"#, r#"젾"#, r#"젾"#, r#"젾"#, r#"젾"#),
+        (r#"젿"#, r#"젿"#, r#"젿"#, r#"젿"#, r#"젿"#),
+        (r#"졀"#, r#"졀"#, r#"졀"#, r#"졀"#, r#"졀"#),
+        (r#"졁"#, r#"졁"#, r#"졁"#, r#"졁"#, r#"졁"#),
+        (r#"졂"#, r#"졂"#, r#"졂"#, r#"졂"#, r#"졂"#),
+        (r#"졃"#, r#"졃"#, r#"졃"#, r#"졃"#, r#"졃"#),
+        (r#"졄"#, r#"졄"#, r#"졄"#, r#"졄"#, r#"졄"#),
+        (r#"졅"#, r#"졅"#, r#"졅"#, r#"졅"#, r#"졅"#),
+        (r#"졆"#, r#"졆"#, r#"졆"#, r#"졆"#, r#"졆"#),
+        (r#"졇"#, r#"졇"#, r#"졇"#, r#"졇"#, r#"졇"#),
+        (r#"졈"#, r#"졈"#, r#"졈"#, r#"졈"#, r#"졈"#),
+        (r#"졉"#, r#"졉"#, r#"졉"#, r#"졉"#, r#"졉"#),
+        (r#"졊"#, r#"졊"#, r#"졊"#, r#"졊"#, r#"졊"#),
+        (r#"졋"#, r#"졋"#, r#"졋"#, r#"졋"#, r#"졋"#),
+        (r#"졌"#, r#"졌"#, r#"졌"#, r#"졌"#, r#"졌"#),
+        (r#"졍"#, r#"졍"#, r#"졍"#, r#"졍"#, r#"졍"#),
+        (r#"졎"#, r#"졎"#, r#"졎"#, r#"졎"#, r#"졎"#),
+        (r#"졏"#, r#"졏"#, r#"졏"#, r#"졏"#, r#"졏"#),
+        (r#"졐"#, r#"졐"#, r#"졐"#, r#"졐"#, r#"졐"#),
+        (r#"졑"#, r#"졑"#, r#"졑"#, r#"졑"#, r#"졑"#),
+        (r#"졒"#, r#"졒"#, r#"졒"#, r#"졒"#, r#"졒"#),
+        (r#"졓"#, r#"졓"#, r#"졓"#, r#"졓"#, r#"졓"#),
+        (r#"졔"#, r#"졔"#, r#"졔"#, r#"졔"#, r#"졔"#),
+        (r#"졕"#, r#"졕"#, r#"졕"#, r#"졕"#, r#"졕"#),
+        (r#"졖"#, r#"졖"#, r#"졖"#, r#"졖"#, r#"졖"#),
+        (r#"졗"#, r#"졗"#, r#"졗"#, r#"졗"#, r#"졗"#),
+        (r#"졘"#, r#"졘"#, r#"졘"#, r#"졘"#, r#"졘"#),
+        (r#"졙"#, r#"졙"#, r#"졙"#, r#"졙"#, r#"졙"#),
+        (r#"졚"#, r#"졚"#, r#"졚"#, r#"졚"#, r#"졚"#),
+        (r#"졛"#, r#"졛"#, r#"졛"#, r#"졛"#, r#"졛"#),
+        (r#"졜"#, r#"졜"#, r#"졜"#, r#"졜"#, r#"졜"#),
+        (r#"졝"#, r#"졝"#, r#"졝"#, r#"졝"#, r#"졝"#),
+        (r#"졞"#, r#"졞"#, r#"졞"#, r#"졞"#, r#"졞"#),
+        (r#"졟"#, r#"졟"#, r#"졟"#, r#"졟"#, r#"졟"#),
+        (r#"졠"#, r#"졠"#, r#"졠"#, r#"졠"#, r#"졠"#),
+        (r#"졡"#, r#"졡"#, r#"졡"#, r#"졡"#, r#"졡"#),
+        (r#"졢"#, r#"졢"#, r#"졢"#, r#"졢"#, r#"졢"#),
+        (r#"졣"#, r#"졣"#, r#"졣"#, r#"졣"#, r#"졣"#),
+        (r#"졤"#, r#"졤"#, r#"졤"#, r#"졤"#, r#"졤"#),
+        (r#"졥"#, r#"졥"#, r#"졥"#, r#"졥"#, r#"졥"#),
+        (r#"졦"#, r#"졦"#, r#"졦"#, r#"졦"#, r#"졦"#),
+        (r#"졧"#, r#"졧"#, r#"졧"#, r#"졧"#, r#"졧"#),
+        (r#"졨"#, r#"졨"#, r#"졨"#, r#"졨"#, r#"졨"#),
+        (r#"졩"#, r#"졩"#, r#"졩"#, r#"졩"#, r#"졩"#),
+        (r#"졪"#, r#"졪"#, r#"졪"#, r#"졪"#, r#"졪"#),
+        (r#"졫"#, r#"졫"#, r#"졫"#, r#"졫"#, r#"졫"#),
+        (r#"졬"#, r#"졬"#, r#"졬"#, r#"졬"#, r#"졬"#),
+        (r#"졭"#, r#"졭"#, r#"졭"#, r#"졭"#, r#"졭"#),
+        (r#"졮"#, r#"졮"#, r#"졮"#, r#"졮"#, r#"졮"#),
+        (r#"졯"#, r#"졯"#, r#"졯"#, r#"졯"#, r#"졯"#),
+        (r#"조"#, r#"조"#, r#"조"#, r#"조"#, r#"조"#),
+        (r#"족"#, r#"족"#, r#"족"#, r#"족"#, r#"족"#),
+        (r#"졲"#, r#"졲"#, r#"졲"#, r#"졲"#, r#"졲"#),
+        (r#"졳"#, r#"졳"#, r#"졳"#, r#"졳"#, r#"졳"#),
+        (r#"존"#, r#"존"#, r#"존"#, r#"존"#, r#"존"#),
+        (r#"졵"#, r#"졵"#, r#"졵"#, r#"졵"#, r#"졵"#),
+        (r#"졶"#, r#"졶"#, r#"졶"#, r#"졶"#, r#"졶"#),
+        (r#"졷"#, r#"졷"#, r#"졷"#, r#"졷"#, r#"졷"#),
+        (r#"졸"#, r#"졸"#, r#"졸"#, r#"졸"#, r#"졸"#),
+        (r#"졹"#, r#"졹"#, r#"졹"#, r#"졹"#, r#"졹"#),
+        (r#"졺"#, r#"졺"#, r#"졺"#, r#"졺"#, r#"졺"#),
+        (r#"졻"#, r#"졻"#, r#"졻"#, r#"졻"#, r#"졻"#),
+        (r#"졼"#, r#"졼"#, r#"졼"#, r#"졼"#, r#"졼"#),
+        (r#"졽"#, r#"졽"#, r#"졽"#, r#"졽"#, r#"졽"#),
+        (r#"졾"#, r#"졾"#, r#"졾"#, r#"졾"#, r#"졾"#),
+        (r#"졿"#, r#"졿"#, r#"졿"#, r#"졿"#, r#"졿"#),
+        (r#"좀"#, r#"좀"#, r#"좀"#, r#"좀"#, r#"좀"#),
+        (r#"좁"#, r#"좁"#, r#"좁"#, r#"좁"#, r#"좁"#),
+        (r#"좂"#, r#"좂"#, r#"좂"#, r#"좂"#, r#"좂"#),
+        (r#"좃"#, r#"좃"#, r#"좃"#, r#"좃"#, r#"좃"#),
+        (r#"좄"#, r#"좄"#, r#"좄"#, r#"좄"#, r#"좄"#),
+        (r#"종"#, r#"종"#, r#"종"#, r#"종"#, r#"종"#),
+        (r#"좆"#, r#"좆"#, r#"좆"#, r#"좆"#, r#"좆"#),
+        (r#"좇"#, r#"좇"#, r#"좇"#, r#"좇"#, r#"좇"#),
+        (r#"좈"#, r#"좈"#, r#"좈"#, r#"좈"#, r#"좈"#),
+        (r#"좉"#, r#"좉"#, r#"좉"#, r#"좉"#, r#"좉"#),
+        (r#"좊"#, r#"좊"#, r#"좊"#, r#"좊"#, r#"좊"#),
+        (r#"좋"#, r#"좋"#, r#"좋"#, r#"좋"#, r#"좋"#),
+        (r#"좌"#, r#"좌"#, r#"좌"#, r#"좌"#, r#"좌"#),
+        (r#"좍"#, r#"좍"#, r#"좍"#, r#"좍"#, r#"좍"#),
+        (r#"좎"#, r#"좎"#, r#"좎"#, r#"좎"#, r#"좎"#),
+        (r#"좏"#, r#"좏"#, r#"좏"#, r#"좏"#, r#"좏"#),
+        (r#"좐"#, r#"좐"#, r#"좐"#, r#"좐"#, r#"좐"#),
+        (r#"좑"#, r#"좑"#, r#"좑"#, r#"좑"#, r#"좑"#),
+        (r#"좒"#, r#"좒"#, r#"좒"#, r#"좒"#, r#"좒"#),
+        (r#"좓"#, r#"좓"#, r#"좓"#, r#"좓"#, r#"좓"#),
+        (r#"좔"#, r#"좔"#, r#"좔"#, r#"좔"#, r#"좔"#),
+        (r#"좕"#, r#"좕"#, r#"좕"#, r#"좕"#, r#"좕"#),
+        (r#"좖"#, r#"좖"#, r#"좖"#, r#"좖"#, r#"좖"#),
+        (r#"좗"#, r#"좗"#, r#"좗"#, r#"좗"#, r#"좗"#),
+        (r#"좘"#, r#"좘"#, r#"좘"#, r#"좘"#, r#"좘"#),
+        (r#"좙"#, r#"좙"#, r#"좙"#, r#"좙"#, r#"좙"#),
+        (r#"좚"#, r#"좚"#, r#"좚"#, r#"좚"#, r#"좚"#),
+        (r#"좛"#, r#"좛"#, r#"좛"#, r#"좛"#, r#"좛"#),
+        (r#"좜"#, r#"좜"#, r#"좜"#, r#"좜"#, r#"좜"#),
+        (r#"좝"#, r#"좝"#, r#"좝"#, r#"좝"#, r#"좝"#),
+        (r#"좞"#, r#"좞"#, r#"좞"#, r#"좞"#, r#"좞"#),
+        (r#"좟"#, r#"좟"#, r#"좟"#, r#"좟"#, r#"좟"#),
+        (r#"좠"#, r#"좠"#, r#"좠"#, r#"좠"#, r#"좠"#),
+        (r#"좡"#, r#"좡"#, r#"좡"#, r#"좡"#, r#"좡"#),
+        (r#"좢"#, r#"좢"#, r#"좢"#, r#"좢"#, r#"좢"#),
+        (r#"좣"#, r#"좣"#, r#"좣"#, r#"좣"#, r#"좣"#),
+        (r#"좤"#, r#"좤"#, r#"좤"#, r#"좤"#, r#"좤"#),
+        (r#"좥"#, r#"좥"#, r#"좥"#, r#"좥"#, r#"좥"#),
+        (r#"좦"#, r#"좦"#, r#"좦"#, r#"좦"#, r#"좦"#),
+        (r#"좧"#, r#"좧"#, r#"좧"#, r#"좧"#, r#"좧"#),
+        (r#"좨"#, r#"좨"#, r#"좨"#, r#"좨"#, r#"좨"#),
+        (r#"좩"#, r#"좩"#, r#"좩"#, r#"좩"#, r#"좩"#),
+        (r#"좪"#, r#"좪"#, r#"좪"#, r#"좪"#, r#"좪"#),
+        (r#"좫"#, r#"좫"#, r#"좫"#, r#"좫"#, r#"좫"#),
+        (r#"좬"#, r#"좬"#, r#"좬"#, r#"좬"#, r#"좬"#),
+        (r#"좭"#, r#"좭"#, r#"좭"#, r#"좭"#, r#"좭"#),
+        (r#"좮"#, r#"좮"#, r#"좮"#, r#"좮"#, r#"좮"#),
+        (r#"좯"#, r#"좯"#, r#"좯"#, r#"좯"#, r#"좯"#),
+        (r#"좰"#, r#"좰"#, r#"좰"#, r#"좰"#, r#"좰"#),
+        (r#"좱"#, r#"좱"#, r#"좱"#, r#"좱"#, r#"좱"#),
+        (r#"좲"#, r#"좲"#, r#"좲"#, r#"좲"#, r#"좲"#),
+        (r#"좳"#, r#"좳"#, r#"좳"#, r#"좳"#, r#"좳"#),
+        (r#"좴"#, r#"좴"#, r#"좴"#, r#"좴"#, r#"좴"#),
+        (r#"좵"#, r#"좵"#, r#"좵"#, r#"좵"#, r#"좵"#),
+        (r#"좶"#, r#"좶"#, r#"좶"#, r#"좶"#, r#"좶"#),
+        (r#"좷"#, r#"좷"#, r#"좷"#, r#"좷"#, r#"좷"#),
+        (r#"좸"#, r#"좸"#, r#"좸"#, r#"좸"#, r#"좸"#),
+        (r#"좹"#, r#"좹"#, r#"좹"#, r#"좹"#, r#"좹"#),
+        (r#"좺"#, r#"좺"#, r#"좺"#, r#"좺"#, r#"좺"#),
+        (r#"좻"#, r#"좻"#, r#"좻"#, r#"좻"#, r#"좻"#),
+        (r#"좼"#, r#"좼"#, r#"좼"#, r#"좼"#, r#"좼"#),
+        (r#"좽"#, r#"좽"#, r#"좽"#, r#"좽"#, r#"좽"#),
+        (r#"좾"#, r#"좾"#, r#"좾"#, r#"좾"#, r#"좾"#),
+        (r#"좿"#, r#"좿"#, r#"좿"#, r#"좿"#, r#"좿"#),
+        (r#"죀"#, r#"죀"#, r#"죀"#, r#"죀"#, r#"죀"#),
+        (r#"죁"#, r#"죁"#, r#"죁"#, r#"죁"#, r#"죁"#),
+        (r#"죂"#, r#"죂"#, r#"죂"#, r#"죂"#, r#"죂"#),
+        (r#"죃"#, r#"죃"#, r#"죃"#, r#"죃"#, r#"죃"#),
+        (r#"죄"#, r#"죄"#, r#"죄"#, r#"죄"#, r#"죄"#),
+        (r#"죅"#, r#"죅"#, r#"죅"#, r#"죅"#, r#"죅"#),
+        (r#"죆"#, r#"죆"#, r#"죆"#, r#"죆"#, r#"죆"#),
+        (r#"죇"#, r#"죇"#, r#"죇"#, r#"죇"#, r#"죇"#),
+        (r#"죈"#, r#"죈"#, r#"죈"#, r#"죈"#, r#"죈"#),
+        (r#"죉"#, r#"죉"#, r#"죉"#, r#"죉"#, r#"죉"#),
+        (r#"죊"#, r#"죊"#, r#"죊"#, r#"죊"#, r#"죊"#),
+        (r#"죋"#, r#"죋"#, r#"죋"#, r#"죋"#, r#"죋"#),
+        (r#"죌"#, r#"죌"#, r#"죌"#, r#"죌"#, r#"죌"#),
+        (r#"죍"#, r#"죍"#, r#"죍"#, r#"죍"#, r#"죍"#),
+        (r#"죎"#, r#"죎"#, r#"죎"#, r#"죎"#, r#"죎"#),
+        (r#"죏"#, r#"죏"#, r#"죏"#, r#"죏"#, r#"죏"#),
+        (r#"죐"#, r#"죐"#, r#"죐"#, r#"죐"#, r#"죐"#),
+        (r#"죑"#, r#"죑"#, r#"죑"#, r#"죑"#, r#"죑"#),
+        (r#"죒"#, r#"죒"#, r#"죒"#, r#"죒"#, r#"죒"#),
+        (r#"죓"#, r#"죓"#, r#"죓"#, r#"죓"#, r#"죓"#),
+        (r#"죔"#, r#"죔"#, r#"죔"#, r#"죔"#, r#"죔"#),
+        (r#"죕"#, r#"죕"#, r#"죕"#, r#"죕"#, r#"죕"#),
+        (r#"죖"#, r#"죖"#, r#"죖"#, r#"죖"#, r#"죖"#),
+        (r#"죗"#, r#"죗"#, r#"죗"#, r#"죗"#, r#"죗"#),
+        (r#"죘"#, r#"죘"#, r#"죘"#, r#"죘"#, r#"죘"#),
+        (r#"죙"#, r#"죙"#, r#"죙"#, r#"죙"#, r#"죙"#),
+        (r#"죚"#, r#"죚"#, r#"죚"#, r#"죚"#, r#"죚"#),
+        (r#"죛"#, r#"죛"#, r#"죛"#, r#"죛"#, r#"죛"#),
+        (r#"죜"#, r#"죜"#, r#"죜"#, r#"죜"#, r#"죜"#),
+        (r#"죝"#, r#"죝"#, r#"죝"#, r#"죝"#, r#"죝"#),
+        (r#"죞"#, r#"죞"#, r#"죞"#, r#"죞"#, r#"죞"#),
+        (r#"죟"#, r#"죟"#, r#"죟"#, r#"죟"#, r#"죟"#),
+        (r#"죠"#, r#"죠"#, r#"죠"#, r#"죠"#, r#"죠"#),
+        (r#"죡"#, r#"죡"#, r#"죡"#, r#"죡"#, r#"죡"#),
+        (r#"죢"#, r#"죢"#, r#"죢"#, r#"죢"#, r#"죢"#),
+        (r#"죣"#, r#"죣"#, r#"죣"#, r#"죣"#, r#"죣"#),
+        (r#"죤"#, r#"죤"#, r#"죤"#, r#"죤"#, r#"죤"#),
+        (r#"죥"#, r#"죥"#, r#"죥"#, r#"죥"#, r#"죥"#),
+        (r#"죦"#, r#"죦"#, r#"죦"#, r#"죦"#, r#"죦"#),
+        (r#"죧"#, r#"죧"#, r#"죧"#, r#"죧"#, r#"죧"#),
+        (r#"죨"#, r#"죨"#, r#"죨"#, r#"죨"#, r#"죨"#),
+        (r#"죩"#, r#"죩"#, r#"죩"#, r#"죩"#, r#"죩"#),
+        (r#"죪"#, r#"죪"#, r#"죪"#, r#"죪"#, r#"죪"#),
+        (r#"죫"#, r#"죫"#, r#"죫"#, r#"죫"#, r#"죫"#),
+        (r#"죬"#, r#"죬"#, r#"죬"#, r#"죬"#, r#"죬"#),
+        (r#"죭"#, r#"죭"#, r#"죭"#, r#"죭"#, r#"죭"#),
+        (r#"죮"#, r#"죮"#, r#"죮"#, r#"죮"#, r#"죮"#),
+        (r#"죯"#, r#"죯"#, r#"죯"#, r#"죯"#, r#"죯"#),
+        (r#"죰"#, r#"죰"#, r#"죰"#, r#"죰"#, r#"죰"#),
+        (r#"죱"#, r#"죱"#, r#"죱"#, r#"죱"#, r#"죱"#),
+        (r#"죲"#, r#"죲"#, r#"죲"#, r#"죲"#, r#"죲"#),
+        (r#"죳"#, r#"죳"#, r#"죳"#, r#"죳"#, r#"죳"#),
+        (r#"죴"#, r#"죴"#, r#"죴"#, r#"죴"#, r#"죴"#),
+        (r#"죵"#, r#"죵"#, r#"죵"#, r#"죵"#, r#"죵"#),
+        (r#"죶"#, r#"죶"#, r#"죶"#, r#"죶"#, r#"죶"#),
+        (r#"죷"#, r#"죷"#, r#"죷"#, r#"죷"#, r#"죷"#),
+        (r#"죸"#, r#"죸"#, r#"죸"#, r#"죸"#, r#"죸"#),
+        (r#"죹"#, r#"죹"#, r#"죹"#, r#"죹"#, r#"죹"#),
+        (r#"죺"#, r#"죺"#, r#"죺"#, r#"죺"#, r#"죺"#),
+        (r#"죻"#, r#"죻"#, r#"죻"#, r#"죻"#, r#"죻"#),
+        (r#"주"#, r#"주"#, r#"주"#, r#"주"#, r#"주"#),
+        (r#"죽"#, r#"죽"#, r#"죽"#, r#"죽"#, r#"죽"#),
+        (r#"죾"#, r#"죾"#, r#"죾"#, r#"죾"#, r#"죾"#),
+        (r#"죿"#, r#"죿"#, r#"죿"#, r#"죿"#, r#"죿"#),
+        (r#"준"#, r#"준"#, r#"준"#, r#"준"#, r#"준"#),
+        (r#"줁"#, r#"줁"#, r#"줁"#, r#"줁"#, r#"줁"#),
+        (r#"줂"#, r#"줂"#, r#"줂"#, r#"줂"#, r#"줂"#),
+        (r#"줃"#, r#"줃"#, r#"줃"#, r#"줃"#, r#"줃"#),
+        (r#"줄"#, r#"줄"#, r#"줄"#, r#"줄"#, r#"줄"#),
+        (r#"줅"#, r#"줅"#, r#"줅"#, r#"줅"#, r#"줅"#),
+        (r#"줆"#, r#"줆"#, r#"줆"#, r#"줆"#, r#"줆"#),
+        (r#"줇"#, r#"줇"#, r#"줇"#, r#"줇"#, r#"줇"#),
+        (r#"줈"#, r#"줈"#, r#"줈"#, r#"줈"#, r#"줈"#),
+        (r#"줉"#, r#"줉"#, r#"줉"#, r#"줉"#, r#"줉"#),
+        (r#"줊"#, r#"줊"#, r#"줊"#, r#"줊"#, r#"줊"#),
+        (r#"줋"#, r#"줋"#, r#"줋"#, r#"줋"#, r#"줋"#),
+        (r#"줌"#, r#"줌"#, r#"줌"#, r#"줌"#, r#"줌"#),
+        (r#"줍"#, r#"줍"#, r#"줍"#, r#"줍"#, r#"줍"#),
+        (r#"줎"#, r#"줎"#, r#"줎"#, r#"줎"#, r#"줎"#),
+        (r#"줏"#, r#"줏"#, r#"줏"#, r#"줏"#, r#"줏"#),
+        (r#"줐"#, r#"줐"#, r#"줐"#, r#"줐"#, r#"줐"#),
+        (r#"중"#, r#"중"#, r#"중"#, r#"중"#, r#"중"#),
+        (r#"줒"#, r#"줒"#, r#"줒"#, r#"줒"#, r#"줒"#),
+        (r#"줓"#, r#"줓"#, r#"줓"#, r#"줓"#, r#"줓"#),
+        (r#"줔"#, r#"줔"#, r#"줔"#, r#"줔"#, r#"줔"#),
+        (r#"줕"#, r#"줕"#, r#"줕"#, r#"줕"#, r#"줕"#),
+        (r#"줖"#, r#"줖"#, r#"줖"#, r#"줖"#, r#"줖"#),
+        (r#"줗"#, r#"줗"#, r#"줗"#, r#"줗"#, r#"줗"#),
+        (r#"줘"#, r#"줘"#, r#"줘"#, r#"줘"#, r#"줘"#),
+        (r#"줙"#, r#"줙"#, r#"줙"#, r#"줙"#, r#"줙"#),
+        (r#"줚"#, r#"줚"#, r#"줚"#, r#"줚"#, r#"줚"#),
+        (r#"줛"#, r#"줛"#, r#"줛"#, r#"줛"#, r#"줛"#),
+        (r#"줜"#, r#"줜"#, r#"줜"#, r#"줜"#, r#"줜"#),
+        (r#"줝"#, r#"줝"#, r#"줝"#, r#"줝"#, r#"줝"#),
+        (r#"줞"#, r#"줞"#, r#"줞"#, r#"줞"#, r#"줞"#),
+        (r#"줟"#, r#"줟"#, r#"줟"#, r#"줟"#, r#"줟"#),
+        (r#"줠"#, r#"줠"#, r#"줠"#, r#"줠"#, r#"줠"#),
+        (r#"줡"#, r#"줡"#, r#"줡"#, r#"줡"#, r#"줡"#),
+        (r#"줢"#, r#"줢"#, r#"줢"#, r#"줢"#, r#"줢"#),
+        (r#"줣"#, r#"줣"#, r#"줣"#, r#"줣"#, r#"줣"#),
+        (r#"줤"#, r#"줤"#, r#"줤"#, r#"줤"#, r#"줤"#),
+        (r#"줥"#, r#"줥"#, r#"줥"#, r#"줥"#, r#"줥"#),
+        (r#"줦"#, r#"줦"#, r#"줦"#, r#"줦"#, r#"줦"#),
+        (r#"줧"#, r#"줧"#, r#"줧"#, r#"줧"#, r#"줧"#),
+        (r#"줨"#, r#"줨"#, r#"줨"#, r#"줨"#, r#"줨"#),
+        (r#"줩"#, r#"줩"#, r#"줩"#, r#"줩"#, r#"줩"#),
+        (r#"줪"#, r#"줪"#, r#"줪"#, r#"줪"#, r#"줪"#),
+        (r#"줫"#, r#"줫"#, r#"줫"#, r#"줫"#, r#"줫"#),
+        (r#"줬"#, r#"줬"#, r#"줬"#, r#"줬"#, r#"줬"#),
+        (r#"줭"#, r#"줭"#, r#"줭"#, r#"줭"#, r#"줭"#),
+        (r#"줮"#, r#"줮"#, r#"줮"#, r#"줮"#, r#"줮"#),
+        (r#"줯"#, r#"줯"#, r#"줯"#, r#"줯"#, r#"줯"#),
+        (r#"줰"#, r#"줰"#, r#"줰"#, r#"줰"#, r#"줰"#),
+        (r#"줱"#, r#"줱"#, r#"줱"#, r#"줱"#, r#"줱"#),
+        (r#"줲"#, r#"줲"#, r#"줲"#, r#"줲"#, r#"줲"#),
+        (r#"줳"#, r#"줳"#, r#"줳"#, r#"줳"#, r#"줳"#),
+        (r#"줴"#, r#"줴"#, r#"줴"#, r#"줴"#, r#"줴"#),
+        (r#"줵"#, r#"줵"#, r#"줵"#, r#"줵"#, r#"줵"#),
+        (r#"줶"#, r#"줶"#, r#"줶"#, r#"줶"#, r#"줶"#),
+        (r#"줷"#, r#"줷"#, r#"줷"#, r#"줷"#, r#"줷"#),
+        (r#"줸"#, r#"줸"#, r#"줸"#, r#"줸"#, r#"줸"#),
+        (r#"줹"#, r#"줹"#, r#"줹"#, r#"줹"#, r#"줹"#),
+        (r#"줺"#, r#"줺"#, r#"줺"#, r#"줺"#, r#"줺"#),
+        (r#"줻"#, r#"줻"#, r#"줻"#, r#"줻"#, r#"줻"#),
+        (r#"줼"#, r#"줼"#, r#"줼"#, r#"줼"#, r#"줼"#),
+        (r#"줽"#, r#"줽"#, r#"줽"#, r#"줽"#, r#"줽"#),
+        (r#"줾"#, r#"줾"#, r#"줾"#, r#"줾"#, r#"줾"#),
+        (r#"줿"#, r#"줿"#, r#"줿"#, r#"줿"#, r#"줿"#),
+        (r#"쥀"#, r#"쥀"#, r#"쥀"#, r#"쥀"#, r#"쥀"#),
+        (r#"쥁"#, r#"쥁"#, r#"쥁"#, r#"쥁"#, r#"쥁"#),
+        (r#"쥂"#, r#"쥂"#, r#"쥂"#, r#"쥂"#, r#"쥂"#),
+        (r#"쥃"#, r#"쥃"#, r#"쥃"#, r#"쥃"#, r#"쥃"#),
+        (r#"쥄"#, r#"쥄"#, r#"쥄"#, r#"쥄"#, r#"쥄"#),
+        (r#"쥅"#, r#"쥅"#, r#"쥅"#, r#"쥅"#, r#"쥅"#),
+        (r#"쥆"#, r#"쥆"#, r#"쥆"#, r#"쥆"#, r#"쥆"#),
+        (r#"쥇"#, r#"쥇"#, r#"쥇"#, r#"쥇"#, r#"쥇"#),
+        (r#"쥈"#, r#"쥈"#, r#"쥈"#, r#"쥈"#, r#"쥈"#),
+        (r#"쥉"#, r#"쥉"#, r#"쥉"#, r#"쥉"#, r#"쥉"#),
+        (r#"쥊"#, r#"쥊"#, r#"쥊"#, r#"쥊"#, r#"쥊"#),
+        (r#"쥋"#, r#"쥋"#, r#"쥋"#, r#"쥋"#, r#"쥋"#),
+        (r#"쥌"#, r#"쥌"#, r#"쥌"#, r#"쥌"#, r#"쥌"#),
+        (r#"쥍"#, r#"쥍"#, r#"쥍"#, r#"쥍"#, r#"쥍"#),
+        (r#"쥎"#, r#"쥎"#, r#"쥎"#, r#"쥎"#, r#"쥎"#),
+        (r#"쥏"#, r#"쥏"#, r#"쥏"#, r#"쥏"#, r#"쥏"#),
+        (r#"쥐"#, r#"쥐"#, r#"쥐"#, r#"쥐"#, r#"쥐"#),
+        (r#"쥑"#, r#"쥑"#, r#"쥑"#, r#"쥑"#, r#"쥑"#),
+        (r#"쥒"#, r#"쥒"#, r#"쥒"#, r#"쥒"#, r#"쥒"#),
+        (r#"쥓"#, r#"쥓"#, r#"쥓"#, r#"쥓"#, r#"쥓"#),
+        (r#"쥔"#, r#"쥔"#, r#"쥔"#, r#"쥔"#, r#"쥔"#),
+        (r#"쥕"#, r#"쥕"#, r#"쥕"#, r#"쥕"#, r#"쥕"#),
+        (r#"쥖"#, r#"쥖"#, r#"쥖"#, r#"쥖"#, r#"쥖"#),
+        (r#"쥗"#, r#"쥗"#, r#"쥗"#, r#"쥗"#, r#"쥗"#),
+        (r#"쥘"#, r#"쥘"#, r#"쥘"#, r#"쥘"#, r#"쥘"#),
+        (r#"쥙"#, r#"쥙"#, r#"쥙"#, r#"쥙"#, r#"쥙"#),
+        (r#"쥚"#, r#"쥚"#, r#"쥚"#, r#"쥚"#, r#"쥚"#),
+        (r#"쥛"#, r#"쥛"#, r#"쥛"#, r#"쥛"#, r#"쥛"#),
+        (r#"쥜"#, r#"쥜"#, r#"쥜"#, r#"쥜"#, r#"쥜"#),
+        (r#"쥝"#, r#"쥝"#, r#"쥝"#, r#"쥝"#, r#"쥝"#),
+        (r#"쥞"#, r#"쥞"#, r#"쥞"#, r#"쥞"#, r#"쥞"#),
+        (r#"쥟"#, r#"쥟"#, r#"쥟"#, r#"쥟"#, r#"쥟"#),
+        (r#"쥠"#, r#"쥠"#, r#"쥠"#, r#"쥠"#, r#"쥠"#),
+        (r#"쥡"#, r#"쥡"#, r#"쥡"#, r#"쥡"#, r#"쥡"#),
+        (r#"쥢"#, r#"쥢"#, r#"쥢"#, r#"쥢"#, r#"쥢"#),
+        (r#"쥣"#, r#"쥣"#, r#"쥣"#, r#"쥣"#, r#"쥣"#),
+        (r#"쥤"#, r#"쥤"#, r#"쥤"#, r#"쥤"#, r#"쥤"#),
+        (r#"쥥"#, r#"쥥"#, r#"쥥"#, r#"쥥"#, r#"쥥"#),
+        (r#"쥦"#, r#"쥦"#, r#"쥦"#, r#"쥦"#, r#"쥦"#),
+        (r#"쥧"#, r#"쥧"#, r#"쥧"#, r#"쥧"#, r#"쥧"#),
+        (r#"쥨"#, r#"쥨"#, r#"쥨"#, r#"쥨"#, r#"쥨"#),
+        (r#"쥩"#, r#"쥩"#, r#"쥩"#, r#"쥩"#, r#"쥩"#),
+        (r#"쥪"#, r#"쥪"#, r#"쥪"#, r#"쥪"#, r#"쥪"#),
+        (r#"쥫"#, r#"쥫"#, r#"쥫"#, r#"쥫"#, r#"쥫"#),
+        (r#"쥬"#, r#"쥬"#, r#"쥬"#, r#"쥬"#, r#"쥬"#),
+        (r#"쥭"#, r#"쥭"#, r#"쥭"#, r#"쥭"#, r#"쥭"#),
+        (r#"쥮"#, r#"쥮"#, r#"쥮"#, r#"쥮"#, r#"쥮"#),
+        (r#"쥯"#, r#"쥯"#, r#"쥯"#, r#"쥯"#, r#"쥯"#),
+        (r#"쥰"#, r#"쥰"#, r#"쥰"#, r#"쥰"#, r#"쥰"#),
+        (r#"쥱"#, r#"쥱"#, r#"쥱"#, r#"쥱"#, r#"쥱"#),
+        (r#"쥲"#, r#"쥲"#, r#"쥲"#, r#"쥲"#, r#"쥲"#),
+        (r#"쥳"#, r#"쥳"#, r#"쥳"#, r#"쥳"#, r#"쥳"#),
+        (r#"쥴"#, r#"쥴"#, r#"쥴"#, r#"쥴"#, r#"쥴"#),
+        (r#"쥵"#, r#"쥵"#, r#"쥵"#, r#"쥵"#, r#"쥵"#),
+        (r#"쥶"#, r#"쥶"#, r#"쥶"#, r#"쥶"#, r#"쥶"#),
+        (r#"쥷"#, r#"쥷"#, r#"쥷"#, r#"쥷"#, r#"쥷"#),
+        (r#"쥸"#, r#"쥸"#, r#"쥸"#, r#"쥸"#, r#"쥸"#),
+        (r#"쥹"#, r#"쥹"#, r#"쥹"#, r#"쥹"#, r#"쥹"#),
+        (r#"쥺"#, r#"쥺"#, r#"쥺"#, r#"쥺"#, r#"쥺"#),
+        (r#"쥻"#, r#"쥻"#, r#"쥻"#, r#"쥻"#, r#"쥻"#),
+        (r#"쥼"#, r#"쥼"#, r#"쥼"#, r#"쥼"#, r#"쥼"#),
+        (r#"쥽"#, r#"쥽"#, r#"쥽"#, r#"쥽"#, r#"쥽"#),
+        (r#"쥾"#, r#"쥾"#, r#"쥾"#, r#"쥾"#, r#"쥾"#),
+        (r#"쥿"#, r#"쥿"#, r#"쥿"#, r#"쥿"#, r#"쥿"#),
+        (r#"즀"#, r#"즀"#, r#"즀"#, r#"즀"#, r#"즀"#),
+        (r#"즁"#, r#"즁"#, r#"즁"#, r#"즁"#, r#"즁"#),
+        (r#"즂"#, r#"즂"#, r#"즂"#, r#"즂"#, r#"즂"#),
+        (r#"즃"#, r#"즃"#, r#"즃"#, r#"즃"#, r#"즃"#),
+        (r#"즄"#, r#"즄"#, r#"즄"#, r#"즄"#, r#"즄"#),
+        (r#"즅"#, r#"즅"#, r#"즅"#, r#"즅"#, r#"즅"#),
+        (r#"즆"#, r#"즆"#, r#"즆"#, r#"즆"#, r#"즆"#),
+        (r#"즇"#, r#"즇"#, r#"즇"#, r#"즇"#, r#"즇"#),
+        (r#"즈"#, r#"즈"#, r#"즈"#, r#"즈"#, r#"즈"#),
+        (r#"즉"#, r#"즉"#, r#"즉"#, r#"즉"#, r#"즉"#),
+        (r#"즊"#, r#"즊"#, r#"즊"#, r#"즊"#, r#"즊"#),
+        (r#"즋"#, r#"즋"#, r#"즋"#, r#"즋"#, r#"즋"#),
+        (r#"즌"#, r#"즌"#, r#"즌"#, r#"즌"#, r#"즌"#),
+        (r#"즍"#, r#"즍"#, r#"즍"#, r#"즍"#, r#"즍"#),
+        (r#"즎"#, r#"즎"#, r#"즎"#, r#"즎"#, r#"즎"#),
+        (r#"즏"#, r#"즏"#, r#"즏"#, r#"즏"#, r#"즏"#),
+        (r#"즐"#, r#"즐"#, r#"즐"#, r#"즐"#, r#"즐"#),
+        (r#"즑"#, r#"즑"#, r#"즑"#, r#"즑"#, r#"즑"#),
+        (r#"즒"#, r#"즒"#, r#"즒"#, r#"즒"#, r#"즒"#),
+        (r#"즓"#, r#"즓"#, r#"즓"#, r#"즓"#, r#"즓"#),
+        (r#"즔"#, r#"즔"#, r#"즔"#, r#"즔"#, r#"즔"#),
+        (r#"즕"#, r#"즕"#, r#"즕"#, r#"즕"#, r#"즕"#),
+        (r#"즖"#, r#"즖"#, r#"즖"#, r#"즖"#, r#"즖"#),
+        (r#"즗"#, r#"즗"#, r#"즗"#, r#"즗"#, r#"즗"#),
+        (r#"즘"#, r#"즘"#, r#"즘"#, r#"즘"#, r#"즘"#),
+        (r#"즙"#, r#"즙"#, r#"즙"#, r#"즙"#, r#"즙"#),
+        (r#"즚"#, r#"즚"#, r#"즚"#, r#"즚"#, r#"즚"#),
+        (r#"즛"#, r#"즛"#, r#"즛"#, r#"즛"#, r#"즛"#),
+        (r#"즜"#, r#"즜"#, r#"즜"#, r#"즜"#, r#"즜"#),
+        (r#"증"#, r#"증"#, r#"증"#, r#"증"#, r#"증"#),
+        (r#"즞"#, r#"즞"#, r#"즞"#, r#"즞"#, r#"즞"#),
+        (r#"즟"#, r#"즟"#, r#"즟"#, r#"즟"#, r#"즟"#),
+        (r#"즠"#, r#"즠"#, r#"즠"#, r#"즠"#, r#"즠"#),
+        (r#"즡"#, r#"즡"#, r#"즡"#, r#"즡"#, r#"즡"#),
+        (r#"즢"#, r#"즢"#, r#"즢"#, r#"즢"#, r#"즢"#),
+        (r#"즣"#, r#"즣"#, r#"즣"#, r#"즣"#, r#"즣"#),
+        (r#"즤"#, r#"즤"#, r#"즤"#, r#"즤"#, r#"즤"#),
+        (r#"즥"#, r#"즥"#, r#"즥"#, r#"즥"#, r#"즥"#),
+        (r#"즦"#, r#"즦"#, r#"즦"#, r#"즦"#, r#"즦"#),
+        (r#"즧"#, r#"즧"#, r#"즧"#, r#"즧"#, r#"즧"#),
+        (r#"즨"#, r#"즨"#, r#"즨"#, r#"즨"#, r#"즨"#),
+        (r#"즩"#, r#"즩"#, r#"즩"#, r#"즩"#, r#"즩"#),
+        (r#"즪"#, r#"즪"#, r#"즪"#, r#"즪"#, r#"즪"#),
+        (r#"즫"#, r#"즫"#, r#"즫"#, r#"즫"#, r#"즫"#),
+        (r#"즬"#, r#"즬"#, r#"즬"#, r#"즬"#, r#"즬"#),
+        (r#"즭"#, r#"즭"#, r#"즭"#, r#"즭"#, r#"즭"#),
+        (r#"즮"#, r#"즮"#, r#"즮"#, r#"즮"#, r#"즮"#),
+        (r#"즯"#, r#"즯"#, r#"즯"#, r#"즯"#, r#"즯"#),
+        (r#"즰"#, r#"즰"#, r#"즰"#, r#"즰"#, r#"즰"#),
+        (r#"즱"#, r#"즱"#, r#"즱"#, r#"즱"#, r#"즱"#),
+        (r#"즲"#, r#"즲"#, r#"즲"#, r#"즲"#, r#"즲"#),
+        (r#"즳"#, r#"즳"#, r#"즳"#, r#"즳"#, r#"즳"#),
+        (r#"즴"#, r#"즴"#, r#"즴"#, r#"즴"#, r#"즴"#),
+        (r#"즵"#, r#"즵"#, r#"즵"#, r#"즵"#, r#"즵"#),
+        (r#"즶"#, r#"즶"#, r#"즶"#, r#"즶"#, r#"즶"#),
+        (r#"즷"#, r#"즷"#, r#"즷"#, r#"즷"#, r#"즷"#),
+        (r#"즸"#, r#"즸"#, r#"즸"#, r#"즸"#, r#"즸"#),
+        (r#"즹"#, r#"즹"#, r#"즹"#, r#"즹"#, r#"즹"#),
+        (r#"즺"#, r#"즺"#, r#"즺"#, r#"즺"#, r#"즺"#),
+        (r#"즻"#, r#"즻"#, r#"즻"#, r#"즻"#, r#"즻"#),
+        (r#"즼"#, r#"즼"#, r#"즼"#, r#"즼"#, r#"즼"#),
+        (r#"즽"#, r#"즽"#, r#"즽"#, r#"즽"#, r#"즽"#),
+        (r#"즾"#, r#"즾"#, r#"즾"#, r#"즾"#, r#"즾"#),
+        (r#"즿"#, r#"즿"#, r#"즿"#, r#"즿"#, r#"즿"#),
+        (r#"지"#, r#"지"#, r#"지"#, r#"지"#, r#"지"#),
+        (r#"직"#, r#"직"#, r#"직"#, r#"직"#, r#"직"#),
+        (r#"짂"#, r#"짂"#, r#"짂"#, r#"짂"#, r#"짂"#),
+        (r#"짃"#, r#"짃"#, r#"짃"#, r#"짃"#, r#"짃"#),
+        (r#"진"#, r#"진"#, r#"진"#, r#"진"#, r#"진"#),
+        (r#"짅"#, r#"짅"#, r#"짅"#, r#"짅"#, r#"짅"#),
+        (r#"짆"#, r#"짆"#, r#"짆"#, r#"짆"#, r#"짆"#),
+        (r#"짇"#, r#"짇"#, r#"짇"#, r#"짇"#, r#"짇"#),
+        (r#"질"#, r#"질"#, r#"질"#, r#"질"#, r#"질"#),
+        (r#"짉"#, r#"짉"#, r#"짉"#, r#"짉"#, r#"짉"#),
+        (r#"짊"#, r#"짊"#, r#"짊"#, r#"짊"#, r#"짊"#),
+        (r#"짋"#, r#"짋"#, r#"짋"#, r#"짋"#, r#"짋"#),
+        (r#"짌"#, r#"짌"#, r#"짌"#, r#"짌"#, r#"짌"#),
+        (r#"짍"#, r#"짍"#, r#"짍"#, r#"짍"#, r#"짍"#),
+        (r#"짎"#, r#"짎"#, r#"짎"#, r#"짎"#, r#"짎"#),
+        (r#"짏"#, r#"짏"#, r#"짏"#, r#"짏"#, r#"짏"#),
+        (r#"짐"#, r#"짐"#, r#"짐"#, r#"짐"#, r#"짐"#),
+        (r#"집"#, r#"집"#, r#"집"#, r#"집"#, r#"집"#),
+        (r#"짒"#, r#"짒"#, r#"짒"#, r#"짒"#, r#"짒"#),
+        (r#"짓"#, r#"짓"#, r#"짓"#, r#"짓"#, r#"짓"#),
+        (r#"짔"#, r#"짔"#, r#"짔"#, r#"짔"#, r#"짔"#),
+        (r#"징"#, r#"징"#, r#"징"#, r#"징"#, r#"징"#),
+        (r#"짖"#, r#"짖"#, r#"짖"#, r#"짖"#, r#"짖"#),
+        (r#"짗"#, r#"짗"#, r#"짗"#, r#"짗"#, r#"짗"#),
+        (r#"짘"#, r#"짘"#, r#"짘"#, r#"짘"#, r#"짘"#),
+        (r#"짙"#, r#"짙"#, r#"짙"#, r#"짙"#, r#"짙"#),
+        (r#"짚"#, r#"짚"#, r#"짚"#, r#"짚"#, r#"짚"#),
+        (r#"짛"#, r#"짛"#, r#"짛"#, r#"짛"#, r#"짛"#),
+        (r#"짜"#, r#"짜"#, r#"짜"#, r#"짜"#, r#"짜"#),
+        (r#"짝"#, r#"짝"#, r#"짝"#, r#"짝"#, r#"짝"#),
+        (r#"짞"#, r#"짞"#, r#"짞"#, r#"짞"#, r#"짞"#),
+        (r#"짟"#, r#"짟"#, r#"짟"#, r#"짟"#, r#"짟"#),
+        (r#"짠"#, r#"짠"#, r#"짠"#, r#"짠"#, r#"짠"#),
+        (r#"짡"#, r#"짡"#, r#"짡"#, r#"짡"#, r#"짡"#),
+        (r#"짢"#, r#"짢"#, r#"짢"#, r#"짢"#, r#"짢"#),
+        (r#"짣"#, r#"짣"#, r#"짣"#, r#"짣"#, r#"짣"#),
+        (r#"짤"#, r#"짤"#, r#"짤"#, r#"짤"#, r#"짤"#),
+        (r#"짥"#, r#"짥"#, r#"짥"#, r#"짥"#, r#"짥"#),
+        (r#"짦"#, r#"짦"#, r#"짦"#, r#"짦"#, r#"짦"#),
+        (r#"짧"#, r#"짧"#, r#"짧"#, r#"짧"#, r#"짧"#),
+        (r#"짨"#, r#"짨"#, r#"짨"#, r#"짨"#, r#"짨"#),
+        (r#"짩"#, r#"짩"#, r#"짩"#, r#"짩"#, r#"짩"#),
+        (r#"짪"#, r#"짪"#, r#"짪"#, r#"짪"#, r#"짪"#),
+        (r#"짫"#, r#"짫"#, r#"짫"#, r#"짫"#, r#"짫"#),
+        (r#"짬"#, r#"짬"#, r#"짬"#, r#"짬"#, r#"짬"#),
+        (r#"짭"#, r#"짭"#, r#"짭"#, r#"짭"#, r#"짭"#),
+        (r#"짮"#, r#"짮"#, r#"짮"#, r#"짮"#, r#"짮"#),
+        (r#"짯"#, r#"짯"#, r#"짯"#, r#"짯"#, r#"짯"#),
+        (r#"짰"#, r#"짰"#, r#"짰"#, r#"짰"#, r#"짰"#),
+        (r#"짱"#, r#"짱"#, r#"짱"#, r#"짱"#, r#"짱"#),
+        (r#"짲"#, r#"짲"#, r#"짲"#, r#"짲"#, r#"짲"#),
+        (r#"짳"#, r#"짳"#, r#"짳"#, r#"짳"#, r#"짳"#),
+        (r#"짴"#, r#"짴"#, r#"짴"#, r#"짴"#, r#"짴"#),
+        (r#"짵"#, r#"짵"#, r#"짵"#, r#"짵"#, r#"짵"#),
+        (r#"짶"#, r#"짶"#, r#"짶"#, r#"짶"#, r#"짶"#),
+        (r#"짷"#, r#"짷"#, r#"짷"#, r#"짷"#, r#"짷"#),
+        (r#"째"#, r#"째"#, r#"째"#, r#"째"#, r#"째"#),
+        (r#"짹"#, r#"짹"#, r#"짹"#, r#"짹"#, r#"짹"#),
+        (r#"짺"#, r#"짺"#, r#"짺"#, r#"짺"#, r#"짺"#),
+        (r#"짻"#, r#"짻"#, r#"짻"#, r#"짻"#, r#"짻"#),
+        (r#"짼"#, r#"짼"#, r#"짼"#, r#"짼"#, r#"짼"#),
+        (r#"짽"#, r#"짽"#, r#"짽"#, r#"짽"#, r#"짽"#),
+        (r#"짾"#, r#"짾"#, r#"짾"#, r#"짾"#, r#"짾"#),
+        (r#"짿"#, r#"짿"#, r#"짿"#, r#"짿"#, r#"짿"#),
+        (r#"쨀"#, r#"쨀"#, r#"쨀"#, r#"쨀"#, r#"쨀"#),
+        (r#"쨁"#, r#"쨁"#, r#"쨁"#, r#"쨁"#, r#"쨁"#),
+        (r#"쨂"#, r#"쨂"#, r#"쨂"#, r#"쨂"#, r#"쨂"#),
+        (r#"쨃"#, r#"쨃"#, r#"쨃"#, r#"쨃"#, r#"쨃"#),
+        (r#"쨄"#, r#"쨄"#, r#"쨄"#, r#"쨄"#, r#"쨄"#),
+        (r#"쨅"#, r#"쨅"#, r#"쨅"#, r#"쨅"#, r#"쨅"#),
+        (r#"쨆"#, r#"쨆"#, r#"쨆"#, r#"쨆"#, r#"쨆"#),
+        (r#"쨇"#, r#"쨇"#, r#"쨇"#, r#"쨇"#, r#"쨇"#),
+        (r#"쨈"#, r#"쨈"#, r#"쨈"#, r#"쨈"#, r#"쨈"#),
+        (r#"쨉"#, r#"쨉"#, r#"쨉"#, r#"쨉"#, r#"쨉"#),
+        (r#"쨊"#, r#"쨊"#, r#"쨊"#, r#"쨊"#, r#"쨊"#),
+        (r#"쨋"#, r#"쨋"#, r#"쨋"#, r#"쨋"#, r#"쨋"#),
+        (r#"쨌"#, r#"쨌"#, r#"쨌"#, r#"쨌"#, r#"쨌"#),
+        (r#"쨍"#, r#"쨍"#, r#"쨍"#, r#"쨍"#, r#"쨍"#),
+        (r#"쨎"#, r#"쨎"#, r#"쨎"#, r#"쨎"#, r#"쨎"#),
+        (r#"쨏"#, r#"쨏"#, r#"쨏"#, r#"쨏"#, r#"쨏"#),
+        (r#"쨐"#, r#"쨐"#, r#"쨐"#, r#"쨐"#, r#"쨐"#),
+        (r#"쨑"#, r#"쨑"#, r#"쨑"#, r#"쨑"#, r#"쨑"#),
+        (r#"쨒"#, r#"쨒"#, r#"쨒"#, r#"쨒"#, r#"쨒"#),
+        (r#"쨓"#, r#"쨓"#, r#"쨓"#, r#"쨓"#, r#"쨓"#),
+        (r#"쨔"#, r#"쨔"#, r#"쨔"#, r#"쨔"#, r#"쨔"#),
+        (r#"쨕"#, r#"쨕"#, r#"쨕"#, r#"쨕"#, r#"쨕"#),
+        (r#"쨖"#, r#"쨖"#, r#"쨖"#, r#"쨖"#, r#"쨖"#),
+        (r#"쨗"#, r#"쨗"#, r#"쨗"#, r#"쨗"#, r#"쨗"#),
+        (r#"쨘"#, r#"쨘"#, r#"쨘"#, r#"쨘"#, r#"쨘"#),
+        (r#"쨙"#, r#"쨙"#, r#"쨙"#, r#"쨙"#, r#"쨙"#),
+        (r#"쨚"#, r#"쨚"#, r#"쨚"#, r#"쨚"#, r#"쨚"#),
+        (r#"쨛"#, r#"쨛"#, r#"쨛"#, r#"쨛"#, r#"쨛"#),
+        (r#"쨜"#, r#"쨜"#, r#"쨜"#, r#"쨜"#, r#"쨜"#),
+        (r#"쨝"#, r#"쨝"#, r#"쨝"#, r#"쨝"#, r#"쨝"#),
+        (r#"쨞"#, r#"쨞"#, r#"쨞"#, r#"쨞"#, r#"쨞"#),
+        (r#"쨟"#, r#"쨟"#, r#"쨟"#, r#"쨟"#, r#"쨟"#),
+        (r#"쨠"#, r#"쨠"#, r#"쨠"#, r#"쨠"#, r#"쨠"#),
+        (r#"쨡"#, r#"쨡"#, r#"쨡"#, r#"쨡"#, r#"쨡"#),
+        (r#"쨢"#, r#"쨢"#, r#"쨢"#, r#"쨢"#, r#"쨢"#),
+        (r#"쨣"#, r#"쨣"#, r#"쨣"#, r#"쨣"#, r#"쨣"#),
+        (r#"쨤"#, r#"쨤"#, r#"쨤"#, r#"쨤"#, r#"쨤"#),
+        (r#"쨥"#, r#"쨥"#, r#"쨥"#, r#"쨥"#, r#"쨥"#),
+        (r#"쨦"#, r#"쨦"#, r#"쨦"#, r#"쨦"#, r#"쨦"#),
+        (r#"쨧"#, r#"쨧"#, r#"쨧"#, r#"쨧"#, r#"쨧"#),
+        (r#"쨨"#, r#"쨨"#, r#"쨨"#, r#"쨨"#, r#"쨨"#),
+        (r#"쨩"#, r#"쨩"#, r#"쨩"#, r#"쨩"#, r#"쨩"#),
+        (r#"쨪"#, r#"쨪"#, r#"쨪"#, r#"쨪"#, r#"쨪"#),
+        (r#"쨫"#, r#"쨫"#, r#"쨫"#, r#"쨫"#, r#"쨫"#),
+        (r#"쨬"#, r#"쨬"#, r#"쨬"#, r#"쨬"#, r#"쨬"#),
+        (r#"쨭"#, r#"쨭"#, r#"쨭"#, r#"쨭"#, r#"쨭"#),
+        (r#"쨮"#, r#"쨮"#, r#"쨮"#, r#"쨮"#, r#"쨮"#),
+        (r#"쨯"#, r#"쨯"#, r#"쨯"#, r#"쨯"#, r#"쨯"#),
+        (r#"쨰"#, r#"쨰"#, r#"쨰"#, r#"쨰"#, r#"쨰"#),
+        (r#"쨱"#, r#"쨱"#, r#"쨱"#, r#"쨱"#, r#"쨱"#),
+        (r#"쨲"#, r#"쨲"#, r#"쨲"#, r#"쨲"#, r#"쨲"#),
+        (r#"쨳"#, r#"쨳"#, r#"쨳"#, r#"쨳"#, r#"쨳"#),
+        (r#"쨴"#, r#"쨴"#, r#"쨴"#, r#"쨴"#, r#"쨴"#),
+        (r#"쨵"#, r#"쨵"#, r#"쨵"#, r#"쨵"#, r#"쨵"#),
+        (r#"쨶"#, r#"쨶"#, r#"쨶"#, r#"쨶"#, r#"쨶"#),
+        (r#"쨷"#, r#"쨷"#, r#"쨷"#, r#"쨷"#, r#"쨷"#),
+        (r#"쨸"#, r#"쨸"#, r#"쨸"#, r#"쨸"#, r#"쨸"#),
+        (r#"쨹"#, r#"쨹"#, r#"쨹"#, r#"쨹"#, r#"쨹"#),
+        (r#"쨺"#, r#"쨺"#, r#"쨺"#, r#"쨺"#, r#"쨺"#),
+        (r#"쨻"#, r#"쨻"#, r#"쨻"#, r#"쨻"#, r#"쨻"#),
+        (r#"쨼"#, r#"쨼"#, r#"쨼"#, r#"쨼"#, r#"쨼"#),
+        (r#"쨽"#, r#"쨽"#, r#"쨽"#, r#"쨽"#, r#"쨽"#),
+        (r#"쨾"#, r#"쨾"#, r#"쨾"#, r#"쨾"#, r#"쨾"#),
+        (r#"쨿"#, r#"쨿"#, r#"쨿"#, r#"쨿"#, r#"쨿"#),
+        (r#"쩀"#, r#"쩀"#, r#"쩀"#, r#"쩀"#, r#"쩀"#),
+        (r#"쩁"#, r#"쩁"#, r#"쩁"#, r#"쩁"#, r#"쩁"#),
+        (r#"쩂"#, r#"쩂"#, r#"쩂"#, r#"쩂"#, r#"쩂"#),
+        (r#"쩃"#, r#"쩃"#, r#"쩃"#, r#"쩃"#, r#"쩃"#),
+        (r#"쩄"#, r#"쩄"#, r#"쩄"#, r#"쩄"#, r#"쩄"#),
+        (r#"쩅"#, r#"쩅"#, r#"쩅"#, r#"쩅"#, r#"쩅"#),
+        (r#"쩆"#, r#"쩆"#, r#"쩆"#, r#"쩆"#, r#"쩆"#),
+        (r#"쩇"#, r#"쩇"#, r#"쩇"#, r#"쩇"#, r#"쩇"#),
+        (r#"쩈"#, r#"쩈"#, r#"쩈"#, r#"쩈"#, r#"쩈"#),
+        (r#"쩉"#, r#"쩉"#, r#"쩉"#, r#"쩉"#, r#"쩉"#),
+        (r#"쩊"#, r#"쩊"#, r#"쩊"#, r#"쩊"#, r#"쩊"#),
+        (r#"쩋"#, r#"쩋"#, r#"쩋"#, r#"쩋"#, r#"쩋"#),
+        (r#"쩌"#, r#"쩌"#, r#"쩌"#, r#"쩌"#, r#"쩌"#),
+        (r#"쩍"#, r#"쩍"#, r#"쩍"#, r#"쩍"#, r#"쩍"#),
+        (r#"쩎"#, r#"쩎"#, r#"쩎"#, r#"쩎"#, r#"쩎"#),
+        (r#"쩏"#, r#"쩏"#, r#"쩏"#, r#"쩏"#, r#"쩏"#),
+        (r#"쩐"#, r#"쩐"#, r#"쩐"#, r#"쩐"#, r#"쩐"#),
+        (r#"쩑"#, r#"쩑"#, r#"쩑"#, r#"쩑"#, r#"쩑"#),
+        (r#"쩒"#, r#"쩒"#, r#"쩒"#, r#"쩒"#, r#"쩒"#),
+        (r#"쩓"#, r#"쩓"#, r#"쩓"#, r#"쩓"#, r#"쩓"#),
+        (r#"쩔"#, r#"쩔"#, r#"쩔"#, r#"쩔"#, r#"쩔"#),
+        (r#"쩕"#, r#"쩕"#, r#"쩕"#, r#"쩕"#, r#"쩕"#),
+        (r#"쩖"#, r#"쩖"#, r#"쩖"#, r#"쩖"#, r#"쩖"#),
+        (r#"쩗"#, r#"쩗"#, r#"쩗"#, r#"쩗"#, r#"쩗"#),
+        (r#"쩘"#, r#"쩘"#, r#"쩘"#, r#"쩘"#, r#"쩘"#),
+        (r#"쩙"#, r#"쩙"#, r#"쩙"#, r#"쩙"#, r#"쩙"#),
+        (r#"쩚"#, r#"쩚"#, r#"쩚"#, r#"쩚"#, r#"쩚"#),
+        (r#"쩛"#, r#"쩛"#, r#"쩛"#, r#"쩛"#, r#"쩛"#),
+        (r#"쩜"#, r#"쩜"#, r#"쩜"#, r#"쩜"#, r#"쩜"#),
+        (r#"쩝"#, r#"쩝"#, r#"쩝"#, r#"쩝"#, r#"쩝"#),
+        (r#"쩞"#, r#"쩞"#, r#"쩞"#, r#"쩞"#, r#"쩞"#),
+        (r#"쩟"#, r#"쩟"#, r#"쩟"#, r#"쩟"#, r#"쩟"#),
+        (r#"쩠"#, r#"쩠"#, r#"쩠"#, r#"쩠"#, r#"쩠"#),
+        (r#"쩡"#, r#"쩡"#, r#"쩡"#, r#"쩡"#, r#"쩡"#),
+        (r#"쩢"#, r#"쩢"#, r#"쩢"#, r#"쩢"#, r#"쩢"#),
+        (r#"쩣"#, r#"쩣"#, r#"쩣"#, r#"쩣"#, r#"쩣"#),
+        (r#"쩤"#, r#"쩤"#, r#"쩤"#, r#"쩤"#, r#"쩤"#),
+        (r#"쩥"#, r#"쩥"#, r#"쩥"#, r#"쩥"#, r#"쩥"#),
+        (r#"쩦"#, r#"쩦"#, r#"쩦"#, r#"쩦"#, r#"쩦"#),
+        (r#"쩧"#, r#"쩧"#, r#"쩧"#, r#"쩧"#, r#"쩧"#),
+        (r#"쩨"#, r#"쩨"#, r#"쩨"#, r#"쩨"#, r#"쩨"#),
+        (r#"쩩"#, r#"쩩"#, r#"쩩"#, r#"쩩"#, r#"쩩"#),
+        (r#"쩪"#, r#"쩪"#, r#"쩪"#, r#"쩪"#, r#"쩪"#),
+        (r#"쩫"#, r#"쩫"#, r#"쩫"#, r#"쩫"#, r#"쩫"#),
+        (r#"쩬"#, r#"쩬"#, r#"쩬"#, r#"쩬"#, r#"쩬"#),
+        (r#"쩭"#, r#"쩭"#, r#"쩭"#, r#"쩭"#, r#"쩭"#),
+        (r#"쩮"#, r#"쩮"#, r#"쩮"#, r#"쩮"#, r#"쩮"#),
+        (r#"쩯"#, r#"쩯"#, r#"쩯"#, r#"쩯"#, r#"쩯"#),
+        (r#"쩰"#, r#"쩰"#, r#"쩰"#, r#"쩰"#, r#"쩰"#),
+        (r#"쩱"#, r#"쩱"#, r#"쩱"#, r#"쩱"#, r#"쩱"#),
+        (r#"쩲"#, r#"쩲"#, r#"쩲"#, r#"쩲"#, r#"쩲"#),
+        (r#"쩳"#, r#"쩳"#, r#"쩳"#, r#"쩳"#, r#"쩳"#),
+        (r#"쩴"#, r#"쩴"#, r#"쩴"#, r#"쩴"#, r#"쩴"#),
+        (r#"쩵"#, r#"쩵"#, r#"쩵"#, r#"쩵"#, r#"쩵"#),
+        (r#"쩶"#, r#"쩶"#, r#"쩶"#, r#"쩶"#, r#"쩶"#),
+        (r#"쩷"#, r#"쩷"#, r#"쩷"#, r#"쩷"#, r#"쩷"#),
+        (r#"쩸"#, r#"쩸"#, r#"쩸"#, r#"쩸"#, r#"쩸"#),
+        (r#"쩹"#, r#"쩹"#, r#"쩹"#, r#"쩹"#, r#"쩹"#),
+        (r#"쩺"#, r#"쩺"#, r#"쩺"#, r#"쩺"#, r#"쩺"#),
+        (r#"쩻"#, r#"쩻"#, r#"쩻"#, r#"쩻"#, r#"쩻"#),
+        (r#"쩼"#, r#"쩼"#, r#"쩼"#, r#"쩼"#, r#"쩼"#),
+        (r#"쩽"#, r#"쩽"#, r#"쩽"#, r#"쩽"#, r#"쩽"#),
+        (r#"쩾"#, r#"쩾"#, r#"쩾"#, r#"쩾"#, r#"쩾"#),
+        (r#"쩿"#, r#"쩿"#, r#"쩿"#, r#"쩿"#, r#"쩿"#),
+        (r#"쪀"#, r#"쪀"#, r#"쪀"#, r#"쪀"#, r#"쪀"#),
+        (r#"쪁"#, r#"쪁"#, r#"쪁"#, r#"쪁"#, r#"쪁"#),
+        (r#"쪂"#, r#"쪂"#, r#"쪂"#, r#"쪂"#, r#"쪂"#),
+        (r#"쪃"#, r#"쪃"#, r#"쪃"#, r#"쪃"#, r#"쪃"#),
+        (r#"쪄"#, r#"쪄"#, r#"쪄"#, r#"쪄"#, r#"쪄"#),
+        (r#"쪅"#, r#"쪅"#, r#"쪅"#, r#"쪅"#, r#"쪅"#),
+        (r#"쪆"#, r#"쪆"#, r#"쪆"#, r#"쪆"#, r#"쪆"#),
+        (r#"쪇"#, r#"쪇"#, r#"쪇"#, r#"쪇"#, r#"쪇"#),
+        (r#"쪈"#, r#"쪈"#, r#"쪈"#, r#"쪈"#, r#"쪈"#),
+        (r#"쪉"#, r#"쪉"#, r#"쪉"#, r#"쪉"#, r#"쪉"#),
+        (r#"쪊"#, r#"쪊"#, r#"쪊"#, r#"쪊"#, r#"쪊"#),
+        (r#"쪋"#, r#"쪋"#, r#"쪋"#, r#"쪋"#, r#"쪋"#),
+        (r#"쪌"#, r#"쪌"#, r#"쪌"#, r#"쪌"#, r#"쪌"#),
+        (r#"쪍"#, r#"쪍"#, r#"쪍"#, r#"쪍"#, r#"쪍"#),
+        (r#"쪎"#, r#"쪎"#, r#"쪎"#, r#"쪎"#, r#"쪎"#),
+        (r#"쪏"#, r#"쪏"#, r#"쪏"#, r#"쪏"#, r#"쪏"#),
+        (r#"쪐"#, r#"쪐"#, r#"쪐"#, r#"쪐"#, r#"쪐"#),
+        (r#"쪑"#, r#"쪑"#, r#"쪑"#, r#"쪑"#, r#"쪑"#),
+        (r#"쪒"#, r#"쪒"#, r#"쪒"#, r#"쪒"#, r#"쪒"#),
+        (r#"쪓"#, r#"쪓"#, r#"쪓"#, r#"쪓"#, r#"쪓"#),
+        (r#"쪔"#, r#"쪔"#, r#"쪔"#, r#"쪔"#, r#"쪔"#),
+        (r#"쪕"#, r#"쪕"#, r#"쪕"#, r#"쪕"#, r#"쪕"#),
+        (r#"쪖"#, r#"쪖"#, r#"쪖"#, r#"쪖"#, r#"쪖"#),
+        (r#"쪗"#, r#"쪗"#, r#"쪗"#, r#"쪗"#, r#"쪗"#),
+        (r#"쪘"#, r#"쪘"#, r#"쪘"#, r#"쪘"#, r#"쪘"#),
+        (r#"쪙"#, r#"쪙"#, r#"쪙"#, r#"쪙"#, r#"쪙"#),
+        (r#"쪚"#, r#"쪚"#, r#"쪚"#, r#"쪚"#, r#"쪚"#),
+        (r#"쪛"#, r#"쪛"#, r#"쪛"#, r#"쪛"#, r#"쪛"#),
+        (r#"쪜"#, r#"쪜"#, r#"쪜"#, r#"쪜"#, r#"쪜"#),
+        (r#"쪝"#, r#"쪝"#, r#"쪝"#, r#"쪝"#, r#"쪝"#),
+        (r#"쪞"#, r#"쪞"#, r#"쪞"#, r#"쪞"#, r#"쪞"#),
+        (r#"쪟"#, r#"쪟"#, r#"쪟"#, r#"쪟"#, r#"쪟"#),
+        (r#"쪠"#, r#"쪠"#, r#"쪠"#, r#"쪠"#, r#"쪠"#),
+        (r#"쪡"#, r#"쪡"#, r#"쪡"#, r#"쪡"#, r#"쪡"#),
+        (r#"쪢"#, r#"쪢"#, r#"쪢"#, r#"쪢"#, r#"쪢"#),
+        (r#"쪣"#, r#"쪣"#, r#"쪣"#, r#"쪣"#, r#"쪣"#),
+        (r#"쪤"#, r#"쪤"#, r#"쪤"#, r#"쪤"#, r#"쪤"#),
+        (r#"쪥"#, r#"쪥"#, r#"쪥"#, r#"쪥"#, r#"쪥"#),
+        (r#"쪦"#, r#"쪦"#, r#"쪦"#, r#"쪦"#, r#"쪦"#),
+        (r#"쪧"#, r#"쪧"#, r#"쪧"#, r#"쪧"#, r#"쪧"#),
+        (r#"쪨"#, r#"쪨"#, r#"쪨"#, r#"쪨"#, r#"쪨"#),
+        (r#"쪩"#, r#"쪩"#, r#"쪩"#, r#"쪩"#, r#"쪩"#),
+        (r#"쪪"#, r#"쪪"#, r#"쪪"#, r#"쪪"#, r#"쪪"#),
+        (r#"쪫"#, r#"쪫"#, r#"쪫"#, r#"쪫"#, r#"쪫"#),
+        (r#"쪬"#, r#"쪬"#, r#"쪬"#, r#"쪬"#, r#"쪬"#),
+        (r#"쪭"#, r#"쪭"#, r#"쪭"#, r#"쪭"#, r#"쪭"#),
+        (r#"쪮"#, r#"쪮"#, r#"쪮"#, r#"쪮"#, r#"쪮"#),
+        (r#"쪯"#, r#"쪯"#, r#"쪯"#, r#"쪯"#, r#"쪯"#),
+        (r#"쪰"#, r#"쪰"#, r#"쪰"#, r#"쪰"#, r#"쪰"#),
+        (r#"쪱"#, r#"쪱"#, r#"쪱"#, r#"쪱"#, r#"쪱"#),
+        (r#"쪲"#, r#"쪲"#, r#"쪲"#, r#"쪲"#, r#"쪲"#),
+        (r#"쪳"#, r#"쪳"#, r#"쪳"#, r#"쪳"#, r#"쪳"#),
+        (r#"쪴"#, r#"쪴"#, r#"쪴"#, r#"쪴"#, r#"쪴"#),
+        (r#"쪵"#, r#"쪵"#, r#"쪵"#, r#"쪵"#, r#"쪵"#),
+        (r#"쪶"#, r#"쪶"#, r#"쪶"#, r#"쪶"#, r#"쪶"#),
+        (r#"쪷"#, r#"쪷"#, r#"쪷"#, r#"쪷"#, r#"쪷"#),
+        (r#"쪸"#, r#"쪸"#, r#"쪸"#, r#"쪸"#, r#"쪸"#),
+        (r#"쪹"#, r#"쪹"#, r#"쪹"#, r#"쪹"#, r#"쪹"#),
+        (r#"쪺"#, r#"쪺"#, r#"쪺"#, r#"쪺"#, r#"쪺"#),
+        (r#"쪻"#, r#"쪻"#, r#"쪻"#, r#"쪻"#, r#"쪻"#),
+        (r#"쪼"#, r#"쪼"#, r#"쪼"#, r#"쪼"#, r#"쪼"#),
+        (r#"쪽"#, r#"쪽"#, r#"쪽"#, r#"쪽"#, r#"쪽"#),
+        (r#"쪾"#, r#"쪾"#, r#"쪾"#, r#"쪾"#, r#"쪾"#),
+        (r#"쪿"#, r#"쪿"#, r#"쪿"#, r#"쪿"#, r#"쪿"#),
+        (r#"쫀"#, r#"쫀"#, r#"쫀"#, r#"쫀"#, r#"쫀"#),
+        (r#"쫁"#, r#"쫁"#, r#"쫁"#, r#"쫁"#, r#"쫁"#),
+        (r#"쫂"#, r#"쫂"#, r#"쫂"#, r#"쫂"#, r#"쫂"#),
+        (r#"쫃"#, r#"쫃"#, r#"쫃"#, r#"쫃"#, r#"쫃"#),
+        (r#"쫄"#, r#"쫄"#, r#"쫄"#, r#"쫄"#, r#"쫄"#),
+        (r#"쫅"#, r#"쫅"#, r#"쫅"#, r#"쫅"#, r#"쫅"#),
+        (r#"쫆"#, r#"쫆"#, r#"쫆"#, r#"쫆"#, r#"쫆"#),
+        (r#"쫇"#, r#"쫇"#, r#"쫇"#, r#"쫇"#, r#"쫇"#),
+        (r#"쫈"#, r#"쫈"#, r#"쫈"#, r#"쫈"#, r#"쫈"#),
+        (r#"쫉"#, r#"쫉"#, r#"쫉"#, r#"쫉"#, r#"쫉"#),
+        (r#"쫊"#, r#"쫊"#, r#"쫊"#, r#"쫊"#, r#"쫊"#),
+        (r#"쫋"#, r#"쫋"#, r#"쫋"#, r#"쫋"#, r#"쫋"#),
+        (r#"쫌"#, r#"쫌"#, r#"쫌"#, r#"쫌"#, r#"쫌"#),
+        (r#"쫍"#, r#"쫍"#, r#"쫍"#, r#"쫍"#, r#"쫍"#),
+        (r#"쫎"#, r#"쫎"#, r#"쫎"#, r#"쫎"#, r#"쫎"#),
+        (r#"쫏"#, r#"쫏"#, r#"쫏"#, r#"쫏"#, r#"쫏"#),
+        (r#"쫐"#, r#"쫐"#, r#"쫐"#, r#"쫐"#, r#"쫐"#),
+        (r#"쫑"#, r#"쫑"#, r#"쫑"#, r#"쫑"#, r#"쫑"#),
+        (r#"쫒"#, r#"쫒"#, r#"쫒"#, r#"쫒"#, r#"쫒"#),
+        (r#"쫓"#, r#"쫓"#, r#"쫓"#, r#"쫓"#, r#"쫓"#),
+        (r#"쫔"#, r#"쫔"#, r#"쫔"#, r#"쫔"#, r#"쫔"#),
+        (r#"쫕"#, r#"쫕"#, r#"쫕"#, r#"쫕"#, r#"쫕"#),
+        (r#"쫖"#, r#"쫖"#, r#"쫖"#, r#"쫖"#, r#"쫖"#),
+        (r#"쫗"#, r#"쫗"#, r#"쫗"#, r#"쫗"#, r#"쫗"#),
+        (r#"쫘"#, r#"쫘"#, r#"쫘"#, r#"쫘"#, r#"쫘"#),
+        (r#"쫙"#, r#"쫙"#, r#"쫙"#, r#"쫙"#, r#"쫙"#),
+        (r#"쫚"#, r#"쫚"#, r#"쫚"#, r#"쫚"#, r#"쫚"#),
+        (r#"쫛"#, r#"쫛"#, r#"쫛"#, r#"쫛"#, r#"쫛"#),
+        (r#"쫜"#, r#"쫜"#, r#"쫜"#, r#"쫜"#, r#"쫜"#),
+        (r#"쫝"#, r#"쫝"#, r#"쫝"#, r#"쫝"#, r#"쫝"#),
+        (r#"쫞"#, r#"쫞"#, r#"쫞"#, r#"쫞"#, r#"쫞"#),
+        (r#"쫟"#, r#"쫟"#, r#"쫟"#, r#"쫟"#, r#"쫟"#),
+        (r#"쫠"#, r#"쫠"#, r#"쫠"#, r#"쫠"#, r#"쫠"#),
+        (r#"쫡"#, r#"쫡"#, r#"쫡"#, r#"쫡"#, r#"쫡"#),
+        (r#"쫢"#, r#"쫢"#, r#"쫢"#, r#"쫢"#, r#"쫢"#),
+        (r#"쫣"#, r#"쫣"#, r#"쫣"#, r#"쫣"#, r#"쫣"#),
+        (r#"쫤"#, r#"쫤"#, r#"쫤"#, r#"쫤"#, r#"쫤"#),
+        (r#"쫥"#, r#"쫥"#, r#"쫥"#, r#"쫥"#, r#"쫥"#),
+        (r#"쫦"#, r#"쫦"#, r#"쫦"#, r#"쫦"#, r#"쫦"#),
+        (r#"쫧"#, r#"쫧"#, r#"쫧"#, r#"쫧"#, r#"쫧"#),
+        (r#"쫨"#, r#"쫨"#, r#"쫨"#, r#"쫨"#, r#"쫨"#),
+        (r#"쫩"#, r#"쫩"#, r#"쫩"#, r#"쫩"#, r#"쫩"#),
+        (r#"쫪"#, r#"쫪"#, r#"쫪"#, r#"쫪"#, r#"쫪"#),
+        (r#"쫫"#, r#"쫫"#, r#"쫫"#, r#"쫫"#, r#"쫫"#),
+        (r#"쫬"#, r#"쫬"#, r#"쫬"#, r#"쫬"#, r#"쫬"#),
+        (r#"쫭"#, r#"쫭"#, r#"쫭"#, r#"쫭"#, r#"쫭"#),
+        (r#"쫮"#, r#"쫮"#, r#"쫮"#, r#"쫮"#, r#"쫮"#),
+        (r#"쫯"#, r#"쫯"#, r#"쫯"#, r#"쫯"#, r#"쫯"#),
+        (r#"쫰"#, r#"쫰"#, r#"쫰"#, r#"쫰"#, r#"쫰"#),
+        (r#"쫱"#, r#"쫱"#, r#"쫱"#, r#"쫱"#, r#"쫱"#),
+        (r#"쫲"#, r#"쫲"#, r#"쫲"#, r#"쫲"#, r#"쫲"#),
+        (r#"쫳"#, r#"쫳"#, r#"쫳"#, r#"쫳"#, r#"쫳"#),
+        (r#"쫴"#, r#"쫴"#, r#"쫴"#, r#"쫴"#, r#"쫴"#),
+        (r#"쫵"#, r#"쫵"#, r#"쫵"#, r#"쫵"#, r#"쫵"#),
+        (r#"쫶"#, r#"쫶"#, r#"쫶"#, r#"쫶"#, r#"쫶"#),
+        (r#"쫷"#, r#"쫷"#, r#"쫷"#, r#"쫷"#, r#"쫷"#),
+        (r#"쫸"#, r#"쫸"#, r#"쫸"#, r#"쫸"#, r#"쫸"#),
+        (r#"쫹"#, r#"쫹"#, r#"쫹"#, r#"쫹"#, r#"쫹"#),
+        (r#"쫺"#, r#"쫺"#, r#"쫺"#, r#"쫺"#, r#"쫺"#),
+        (r#"쫻"#, r#"쫻"#, r#"쫻"#, r#"쫻"#, r#"쫻"#),
+        (r#"쫼"#, r#"쫼"#, r#"쫼"#, r#"쫼"#, r#"쫼"#),
+        (r#"쫽"#, r#"쫽"#, r#"쫽"#, r#"쫽"#, r#"쫽"#),
+        (r#"쫾"#, r#"쫾"#, r#"쫾"#, r#"쫾"#, r#"쫾"#),
+        (r#"쫿"#, r#"쫿"#, r#"쫿"#, r#"쫿"#, r#"쫿"#),
+        (r#"쬀"#, r#"쬀"#, r#"쬀"#, r#"쬀"#, r#"쬀"#),
+        (r#"쬁"#, r#"쬁"#, r#"쬁"#, r#"쬁"#, r#"쬁"#),
+        (r#"쬂"#, r#"쬂"#, r#"쬂"#, r#"쬂"#, r#"쬂"#),
+        (r#"쬃"#, r#"쬃"#, r#"쬃"#, r#"쬃"#, r#"쬃"#),
+        (r#"쬄"#, r#"쬄"#, r#"쬄"#, r#"쬄"#, r#"쬄"#),
+        (r#"쬅"#, r#"쬅"#, r#"쬅"#, r#"쬅"#, r#"쬅"#),
+        (r#"쬆"#, r#"쬆"#, r#"쬆"#, r#"쬆"#, r#"쬆"#),
+        (r#"쬇"#, r#"쬇"#, r#"쬇"#, r#"쬇"#, r#"쬇"#),
+        (r#"쬈"#, r#"쬈"#, r#"쬈"#, r#"쬈"#, r#"쬈"#),
+        (r#"쬉"#, r#"쬉"#, r#"쬉"#, r#"쬉"#, r#"쬉"#),
+        (r#"쬊"#, r#"쬊"#, r#"쬊"#, r#"쬊"#, r#"쬊"#),
+        (r#"쬋"#, r#"쬋"#, r#"쬋"#, r#"쬋"#, r#"쬋"#),
+        (r#"쬌"#, r#"쬌"#, r#"쬌"#, r#"쬌"#, r#"쬌"#),
+        (r#"쬍"#, r#"쬍"#, r#"쬍"#, r#"쬍"#, r#"쬍"#),
+        (r#"쬎"#, r#"쬎"#, r#"쬎"#, r#"쬎"#, r#"쬎"#),
+        (r#"쬏"#, r#"쬏"#, r#"쬏"#, r#"쬏"#, r#"쬏"#),
+        (r#"쬐"#, r#"쬐"#, r#"쬐"#, r#"쬐"#, r#"쬐"#),
+        (r#"쬑"#, r#"쬑"#, r#"쬑"#, r#"쬑"#, r#"쬑"#),
+        (r#"쬒"#, r#"쬒"#, r#"쬒"#, r#"쬒"#, r#"쬒"#),
+        (r#"쬓"#, r#"쬓"#, r#"쬓"#, r#"쬓"#, r#"쬓"#),
+        (r#"쬔"#, r#"쬔"#, r#"쬔"#, r#"쬔"#, r#"쬔"#),
+        (r#"쬕"#, r#"쬕"#, r#"쬕"#, r#"쬕"#, r#"쬕"#),
+        (r#"쬖"#, r#"쬖"#, r#"쬖"#, r#"쬖"#, r#"쬖"#),
+        (r#"쬗"#, r#"쬗"#, r#"쬗"#, r#"쬗"#, r#"쬗"#),
+        (r#"쬘"#, r#"쬘"#, r#"쬘"#, r#"쬘"#, r#"쬘"#),
+        (r#"쬙"#, r#"쬙"#, r#"쬙"#, r#"쬙"#, r#"쬙"#),
+        (r#"쬚"#, r#"쬚"#, r#"쬚"#, r#"쬚"#, r#"쬚"#),
+        (r#"쬛"#, r#"쬛"#, r#"쬛"#, r#"쬛"#, r#"쬛"#),
+        (r#"쬜"#, r#"쬜"#, r#"쬜"#, r#"쬜"#, r#"쬜"#),
+        (r#"쬝"#, r#"쬝"#, r#"쬝"#, r#"쬝"#, r#"쬝"#),
+        (r#"쬞"#, r#"쬞"#, r#"쬞"#, r#"쬞"#, r#"쬞"#),
+        (r#"쬟"#, r#"쬟"#, r#"쬟"#, r#"쬟"#, r#"쬟"#),
+        (r#"쬠"#, r#"쬠"#, r#"쬠"#, r#"쬠"#, r#"쬠"#),
+        (r#"쬡"#, r#"쬡"#, r#"쬡"#, r#"쬡"#, r#"쬡"#),
+        (r#"쬢"#, r#"쬢"#, r#"쬢"#, r#"쬢"#, r#"쬢"#),
+        (r#"쬣"#, r#"쬣"#, r#"쬣"#, r#"쬣"#, r#"쬣"#),
+        (r#"쬤"#, r#"쬤"#, r#"쬤"#, r#"쬤"#, r#"쬤"#),
+        (r#"쬥"#, r#"쬥"#, r#"쬥"#, r#"쬥"#, r#"쬥"#),
+        (r#"쬦"#, r#"쬦"#, r#"쬦"#, r#"쬦"#, r#"쬦"#),
+        (r#"쬧"#, r#"쬧"#, r#"쬧"#, r#"쬧"#, r#"쬧"#),
+        (r#"쬨"#, r#"쬨"#, r#"쬨"#, r#"쬨"#, r#"쬨"#),
+        (r#"쬩"#, r#"쬩"#, r#"쬩"#, r#"쬩"#, r#"쬩"#),
+        (r#"쬪"#, r#"쬪"#, r#"쬪"#, r#"쬪"#, r#"쬪"#),
+        (r#"쬫"#, r#"쬫"#, r#"쬫"#, r#"쬫"#, r#"쬫"#),
+        (r#"쬬"#, r#"쬬"#, r#"쬬"#, r#"쬬"#, r#"쬬"#),
+        (r#"쬭"#, r#"쬭"#, r#"쬭"#, r#"쬭"#, r#"쬭"#),
+        (r#"쬮"#, r#"쬮"#, r#"쬮"#, r#"쬮"#, r#"쬮"#),
+        (r#"쬯"#, r#"쬯"#, r#"쬯"#, r#"쬯"#, r#"쬯"#),
+        (r#"쬰"#, r#"쬰"#, r#"쬰"#, r#"쬰"#, r#"쬰"#),
+        (r#"쬱"#, r#"쬱"#, r#"쬱"#, r#"쬱"#, r#"쬱"#),
+        (r#"쬲"#, r#"쬲"#, r#"쬲"#, r#"쬲"#, r#"쬲"#),
+        (r#"쬳"#, r#"쬳"#, r#"쬳"#, r#"쬳"#, r#"쬳"#),
+        (r#"쬴"#, r#"쬴"#, r#"쬴"#, r#"쬴"#, r#"쬴"#),
+        (r#"쬵"#, r#"쬵"#, r#"쬵"#, r#"쬵"#, r#"쬵"#),
+        (r#"쬶"#, r#"쬶"#, r#"쬶"#, r#"쬶"#, r#"쬶"#),
+        (r#"쬷"#, r#"쬷"#, r#"쬷"#, r#"쬷"#, r#"쬷"#),
+        (r#"쬸"#, r#"쬸"#, r#"쬸"#, r#"쬸"#, r#"쬸"#),
+        (r#"쬹"#, r#"쬹"#, r#"쬹"#, r#"쬹"#, r#"쬹"#),
+        (r#"쬺"#, r#"쬺"#, r#"쬺"#, r#"쬺"#, r#"쬺"#),
+        (r#"쬻"#, r#"쬻"#, r#"쬻"#, r#"쬻"#, r#"쬻"#),
+        (r#"쬼"#, r#"쬼"#, r#"쬼"#, r#"쬼"#, r#"쬼"#),
+        (r#"쬽"#, r#"쬽"#, r#"쬽"#, r#"쬽"#, r#"쬽"#),
+        (r#"쬾"#, r#"쬾"#, r#"쬾"#, r#"쬾"#, r#"쬾"#),
+        (r#"쬿"#, r#"쬿"#, r#"쬿"#, r#"쬿"#, r#"쬿"#),
+        (r#"쭀"#, r#"쭀"#, r#"쭀"#, r#"쭀"#, r#"쭀"#),
+        (r#"쭁"#, r#"쭁"#, r#"쭁"#, r#"쭁"#, r#"쭁"#),
+        (r#"쭂"#, r#"쭂"#, r#"쭂"#, r#"쭂"#, r#"쭂"#),
+        (r#"쭃"#, r#"쭃"#, r#"쭃"#, r#"쭃"#, r#"쭃"#),
+        (r#"쭄"#, r#"쭄"#, r#"쭄"#, r#"쭄"#, r#"쭄"#),
+        (r#"쭅"#, r#"쭅"#, r#"쭅"#, r#"쭅"#, r#"쭅"#),
+        (r#"쭆"#, r#"쭆"#, r#"쭆"#, r#"쭆"#, r#"쭆"#),
+        (r#"쭇"#, r#"쭇"#, r#"쭇"#, r#"쭇"#, r#"쭇"#),
+        (r#"쭈"#, r#"쭈"#, r#"쭈"#, r#"쭈"#, r#"쭈"#),
+        (r#"쭉"#, r#"쭉"#, r#"쭉"#, r#"쭉"#, r#"쭉"#),
+        (r#"쭊"#, r#"쭊"#, r#"쭊"#, r#"쭊"#, r#"쭊"#),
+        (r#"쭋"#, r#"쭋"#, r#"쭋"#, r#"쭋"#, r#"쭋"#),
+        (r#"쭌"#, r#"쭌"#, r#"쭌"#, r#"쭌"#, r#"쭌"#),
+        (r#"쭍"#, r#"쭍"#, r#"쭍"#, r#"쭍"#, r#"쭍"#),
+        (r#"쭎"#, r#"쭎"#, r#"쭎"#, r#"쭎"#, r#"쭎"#),
+        (r#"쭏"#, r#"쭏"#, r#"쭏"#, r#"쭏"#, r#"쭏"#),
+        (r#"쭐"#, r#"쭐"#, r#"쭐"#, r#"쭐"#, r#"쭐"#),
+        (r#"쭑"#, r#"쭑"#, r#"쭑"#, r#"쭑"#, r#"쭑"#),
+        (r#"쭒"#, r#"쭒"#, r#"쭒"#, r#"쭒"#, r#"쭒"#),
+        (r#"쭓"#, r#"쭓"#, r#"쭓"#, r#"쭓"#, r#"쭓"#),
+        (r#"쭔"#, r#"쭔"#, r#"쭔"#, r#"쭔"#, r#"쭔"#),
+        (r#"쭕"#, r#"쭕"#, r#"쭕"#, r#"쭕"#, r#"쭕"#),
+        (r#"쭖"#, r#"쭖"#, r#"쭖"#, r#"쭖"#, r#"쭖"#),
+        (r#"쭗"#, r#"쭗"#, r#"쭗"#, r#"쭗"#, r#"쭗"#),
+        (r#"쭘"#, r#"쭘"#, r#"쭘"#, r#"쭘"#, r#"쭘"#),
+        (r#"쭙"#, r#"쭙"#, r#"쭙"#, r#"쭙"#, r#"쭙"#),
+        (r#"쭚"#, r#"쭚"#, r#"쭚"#, r#"쭚"#, r#"쭚"#),
+        (r#"쭛"#, r#"쭛"#, r#"쭛"#, r#"쭛"#, r#"쭛"#),
+        (r#"쭜"#, r#"쭜"#, r#"쭜"#, r#"쭜"#, r#"쭜"#),
+        (r#"쭝"#, r#"쭝"#, r#"쭝"#, r#"쭝"#, r#"쭝"#),
+        (r#"쭞"#, r#"쭞"#, r#"쭞"#, r#"쭞"#, r#"쭞"#),
+        (r#"쭟"#, r#"쭟"#, r#"쭟"#, r#"쭟"#, r#"쭟"#),
+        (r#"쭠"#, r#"쭠"#, r#"쭠"#, r#"쭠"#, r#"쭠"#),
+        (r#"쭡"#, r#"쭡"#, r#"쭡"#, r#"쭡"#, r#"쭡"#),
+        (r#"쭢"#, r#"쭢"#, r#"쭢"#, r#"쭢"#, r#"쭢"#),
+        (r#"쭣"#, r#"쭣"#, r#"쭣"#, r#"쭣"#, r#"쭣"#),
+        (r#"쭤"#, r#"쭤"#, r#"쭤"#, r#"쭤"#, r#"쭤"#),
+        (r#"쭥"#, r#"쭥"#, r#"쭥"#, r#"쭥"#, r#"쭥"#),
+        (r#"쭦"#, r#"쭦"#, r#"쭦"#, r#"쭦"#, r#"쭦"#),
+        (r#"쭧"#, r#"쭧"#, r#"쭧"#, r#"쭧"#, r#"쭧"#),
+        (r#"쭨"#, r#"쭨"#, r#"쭨"#, r#"쭨"#, r#"쭨"#),
+        (r#"쭩"#, r#"쭩"#, r#"쭩"#, r#"쭩"#, r#"쭩"#),
+        (r#"쭪"#, r#"쭪"#, r#"쭪"#, r#"쭪"#, r#"쭪"#),
+        (r#"쭫"#, r#"쭫"#, r#"쭫"#, r#"쭫"#, r#"쭫"#),
+        (r#"쭬"#, r#"쭬"#, r#"쭬"#, r#"쭬"#, r#"쭬"#),
+        (r#"쭭"#, r#"쭭"#, r#"쭭"#, r#"쭭"#, r#"쭭"#),
+        (r#"쭮"#, r#"쭮"#, r#"쭮"#, r#"쭮"#, r#"쭮"#),
+        (r#"쭯"#, r#"쭯"#, r#"쭯"#, r#"쭯"#, r#"쭯"#),
+        (r#"쭰"#, r#"쭰"#, r#"쭰"#, r#"쭰"#, r#"쭰"#),
+        (r#"쭱"#, r#"쭱"#, r#"쭱"#, r#"쭱"#, r#"쭱"#),
+        (r#"쭲"#, r#"쭲"#, r#"쭲"#, r#"쭲"#, r#"쭲"#),
+        (r#"쭳"#, r#"쭳"#, r#"쭳"#, r#"쭳"#, r#"쭳"#),
+        (r#"쭴"#, r#"쭴"#, r#"쭴"#, r#"쭴"#, r#"쭴"#),
+        (r#"쭵"#, r#"쭵"#, r#"쭵"#, r#"쭵"#, r#"쭵"#),
+        (r#"쭶"#, r#"쭶"#, r#"쭶"#, r#"쭶"#, r#"쭶"#),
+        (r#"쭷"#, r#"쭷"#, r#"쭷"#, r#"쭷"#, r#"쭷"#),
+        (r#"쭸"#, r#"쭸"#, r#"쭸"#, r#"쭸"#, r#"쭸"#),
+        (r#"쭹"#, r#"쭹"#, r#"쭹"#, r#"쭹"#, r#"쭹"#),
+        (r#"쭺"#, r#"쭺"#, r#"쭺"#, r#"쭺"#, r#"쭺"#),
+        (r#"쭻"#, r#"쭻"#, r#"쭻"#, r#"쭻"#, r#"쭻"#),
+        (r#"쭼"#, r#"쭼"#, r#"쭼"#, r#"쭼"#, r#"쭼"#),
+        (r#"쭽"#, r#"쭽"#, r#"쭽"#, r#"쭽"#, r#"쭽"#),
+        (r#"쭾"#, r#"쭾"#, r#"쭾"#, r#"쭾"#, r#"쭾"#),
+        (r#"쭿"#, r#"쭿"#, r#"쭿"#, r#"쭿"#, r#"쭿"#),
+        (r#"쮀"#, r#"쮀"#, r#"쮀"#, r#"쮀"#, r#"쮀"#),
+        (r#"쮁"#, r#"쮁"#, r#"쮁"#, r#"쮁"#, r#"쮁"#),
+        (r#"쮂"#, r#"쮂"#, r#"쮂"#, r#"쮂"#, r#"쮂"#),
+        (r#"쮃"#, r#"쮃"#, r#"쮃"#, r#"쮃"#, r#"쮃"#),
+        (r#"쮄"#, r#"쮄"#, r#"쮄"#, r#"쮄"#, r#"쮄"#),
+        (r#"쮅"#, r#"쮅"#, r#"쮅"#, r#"쮅"#, r#"쮅"#),
+        (r#"쮆"#, r#"쮆"#, r#"쮆"#, r#"쮆"#, r#"쮆"#),
+        (r#"쮇"#, r#"쮇"#, r#"쮇"#, r#"쮇"#, r#"쮇"#),
+        (r#"쮈"#, r#"쮈"#, r#"쮈"#, r#"쮈"#, r#"쮈"#),
+        (r#"쮉"#, r#"쮉"#, r#"쮉"#, r#"쮉"#, r#"쮉"#),
+        (r#"쮊"#, r#"쮊"#, r#"쮊"#, r#"쮊"#, r#"쮊"#),
+        (r#"쮋"#, r#"쮋"#, r#"쮋"#, r#"쮋"#, r#"쮋"#),
+        (r#"쮌"#, r#"쮌"#, r#"쮌"#, r#"쮌"#, r#"쮌"#),
+        (r#"쮍"#, r#"쮍"#, r#"쮍"#, r#"쮍"#, r#"쮍"#),
+        (r#"쮎"#, r#"쮎"#, r#"쮎"#, r#"쮎"#, r#"쮎"#),
+        (r#"쮏"#, r#"쮏"#, r#"쮏"#, r#"쮏"#, r#"쮏"#),
+        (r#"쮐"#, r#"쮐"#, r#"쮐"#, r#"쮐"#, r#"쮐"#),
+        (r#"쮑"#, r#"쮑"#, r#"쮑"#, r#"쮑"#, r#"쮑"#),
+        (r#"쮒"#, r#"쮒"#, r#"쮒"#, r#"쮒"#, r#"쮒"#),
+        (r#"쮓"#, r#"쮓"#, r#"쮓"#, r#"쮓"#, r#"쮓"#),
+        (r#"쮔"#, r#"쮔"#, r#"쮔"#, r#"쮔"#, r#"쮔"#),
+        (r#"쮕"#, r#"쮕"#, r#"쮕"#, r#"쮕"#, r#"쮕"#),
+        (r#"쮖"#, r#"쮖"#, r#"쮖"#, r#"쮖"#, r#"쮖"#),
+        (r#"쮗"#, r#"쮗"#, r#"쮗"#, r#"쮗"#, r#"쮗"#),
+        (r#"쮘"#, r#"쮘"#, r#"쮘"#, r#"쮘"#, r#"쮘"#),
+        (r#"쮙"#, r#"쮙"#, r#"쮙"#, r#"쮙"#, r#"쮙"#),
+        (r#"쮚"#, r#"쮚"#, r#"쮚"#, r#"쮚"#, r#"쮚"#),
+        (r#"쮛"#, r#"쮛"#, r#"쮛"#, r#"쮛"#, r#"쮛"#),
+        (r#"쮜"#, r#"쮜"#, r#"쮜"#, r#"쮜"#, r#"쮜"#),
+        (r#"쮝"#, r#"쮝"#, r#"쮝"#, r#"쮝"#, r#"쮝"#),
+        (r#"쮞"#, r#"쮞"#, r#"쮞"#, r#"쮞"#, r#"쮞"#),
+        (r#"쮟"#, r#"쮟"#, r#"쮟"#, r#"쮟"#, r#"쮟"#),
+        (r#"쮠"#, r#"쮠"#, r#"쮠"#, r#"쮠"#, r#"쮠"#),
+        (r#"쮡"#, r#"쮡"#, r#"쮡"#, r#"쮡"#, r#"쮡"#),
+        (r#"쮢"#, r#"쮢"#, r#"쮢"#, r#"쮢"#, r#"쮢"#),
+        (r#"쮣"#, r#"쮣"#, r#"쮣"#, r#"쮣"#, r#"쮣"#),
+        (r#"쮤"#, r#"쮤"#, r#"쮤"#, r#"쮤"#, r#"쮤"#),
+        (r#"쮥"#, r#"쮥"#, r#"쮥"#, r#"쮥"#, r#"쮥"#),
+        (r#"쮦"#, r#"쮦"#, r#"쮦"#, r#"쮦"#, r#"쮦"#),
+        (r#"쮧"#, r#"쮧"#, r#"쮧"#, r#"쮧"#, r#"쮧"#),
+        (r#"쮨"#, r#"쮨"#, r#"쮨"#, r#"쮨"#, r#"쮨"#),
+        (r#"쮩"#, r#"쮩"#, r#"쮩"#, r#"쮩"#, r#"쮩"#),
+        (r#"쮪"#, r#"쮪"#, r#"쮪"#, r#"쮪"#, r#"쮪"#),
+        (r#"쮫"#, r#"쮫"#, r#"쮫"#, r#"쮫"#, r#"쮫"#),
+        (r#"쮬"#, r#"쮬"#, r#"쮬"#, r#"쮬"#, r#"쮬"#),
+        (r#"쮭"#, r#"쮭"#, r#"쮭"#, r#"쮭"#, r#"쮭"#),
+        (r#"쮮"#, r#"쮮"#, r#"쮮"#, r#"쮮"#, r#"쮮"#),
+        (r#"쮯"#, r#"쮯"#, r#"쮯"#, r#"쮯"#, r#"쮯"#),
+        (r#"쮰"#, r#"쮰"#, r#"쮰"#, r#"쮰"#, r#"쮰"#),
+        (r#"쮱"#, r#"쮱"#, r#"쮱"#, r#"쮱"#, r#"쮱"#),
+        (r#"쮲"#, r#"쮲"#, r#"쮲"#, r#"쮲"#, r#"쮲"#),
+        (r#"쮳"#, r#"쮳"#, r#"쮳"#, r#"쮳"#, r#"쮳"#),
+        (r#"쮴"#, r#"쮴"#, r#"쮴"#, r#"쮴"#, r#"쮴"#),
+        (r#"쮵"#, r#"쮵"#, r#"쮵"#, r#"쮵"#, r#"쮵"#),
+        (r#"쮶"#, r#"쮶"#, r#"쮶"#, r#"쮶"#, r#"쮶"#),
+        (r#"쮷"#, r#"쮷"#, r#"쮷"#, r#"쮷"#, r#"쮷"#),
+        (r#"쮸"#, r#"쮸"#, r#"쮸"#, r#"쮸"#, r#"쮸"#),
+        (r#"쮹"#, r#"쮹"#, r#"쮹"#, r#"쮹"#, r#"쮹"#),
+        (r#"쮺"#, r#"쮺"#, r#"쮺"#, r#"쮺"#, r#"쮺"#),
+        (r#"쮻"#, r#"쮻"#, r#"쮻"#, r#"쮻"#, r#"쮻"#),
+        (r#"쮼"#, r#"쮼"#, r#"쮼"#, r#"쮼"#, r#"쮼"#),
+        (r#"쮽"#, r#"쮽"#, r#"쮽"#, r#"쮽"#, r#"쮽"#),
+        (r#"쮾"#, r#"쮾"#, r#"쮾"#, r#"쮾"#, r#"쮾"#),
+        (r#"쮿"#, r#"쮿"#, r#"쮿"#, r#"쮿"#, r#"쮿"#),
+        (r#"쯀"#, r#"쯀"#, r#"쯀"#, r#"쯀"#, r#"쯀"#),
+        (r#"쯁"#, r#"쯁"#, r#"쯁"#, r#"쯁"#, r#"쯁"#),
+        (r#"쯂"#, r#"쯂"#, r#"쯂"#, r#"쯂"#, r#"쯂"#),
+        (r#"쯃"#, r#"쯃"#, r#"쯃"#, r#"쯃"#, r#"쯃"#),
+        (r#"쯄"#, r#"쯄"#, r#"쯄"#, r#"쯄"#, r#"쯄"#),
+        (r#"쯅"#, r#"쯅"#, r#"쯅"#, r#"쯅"#, r#"쯅"#),
+        (r#"쯆"#, r#"쯆"#, r#"쯆"#, r#"쯆"#, r#"쯆"#),
+        (r#"쯇"#, r#"쯇"#, r#"쯇"#, r#"쯇"#, r#"쯇"#),
+        (r#"쯈"#, r#"쯈"#, r#"쯈"#, r#"쯈"#, r#"쯈"#),
+        (r#"쯉"#, r#"쯉"#, r#"쯉"#, r#"쯉"#, r#"쯉"#),
+        (r#"쯊"#, r#"쯊"#, r#"쯊"#, r#"쯊"#, r#"쯊"#),
+        (r#"쯋"#, r#"쯋"#, r#"쯋"#, r#"쯋"#, r#"쯋"#),
+        (r#"쯌"#, r#"쯌"#, r#"쯌"#, r#"쯌"#, r#"쯌"#),
+        (r#"쯍"#, r#"쯍"#, r#"쯍"#, r#"쯍"#, r#"쯍"#),
+        (r#"쯎"#, r#"쯎"#, r#"쯎"#, r#"쯎"#, r#"쯎"#),
+        (r#"쯏"#, r#"쯏"#, r#"쯏"#, r#"쯏"#, r#"쯏"#),
+        (r#"쯐"#, r#"쯐"#, r#"쯐"#, r#"쯐"#, r#"쯐"#),
+        (r#"쯑"#, r#"쯑"#, r#"쯑"#, r#"쯑"#, r#"쯑"#),
+        (r#"쯒"#, r#"쯒"#, r#"쯒"#, r#"쯒"#, r#"쯒"#),
+        (r#"쯓"#, r#"쯓"#, r#"쯓"#, r#"쯓"#, r#"쯓"#),
+        (r#"쯔"#, r#"쯔"#, r#"쯔"#, r#"쯔"#, r#"쯔"#),
+        (r#"쯕"#, r#"쯕"#, r#"쯕"#, r#"쯕"#, r#"쯕"#),
+        (r#"쯖"#, r#"쯖"#, r#"쯖"#, r#"쯖"#, r#"쯖"#),
+        (r#"쯗"#, r#"쯗"#, r#"쯗"#, r#"쯗"#, r#"쯗"#),
+        (r#"쯘"#, r#"쯘"#, r#"쯘"#, r#"쯘"#, r#"쯘"#),
+        (r#"쯙"#, r#"쯙"#, r#"쯙"#, r#"쯙"#, r#"쯙"#),
+        (r#"쯚"#, r#"쯚"#, r#"쯚"#, r#"쯚"#, r#"쯚"#),
+        (r#"쯛"#, r#"쯛"#, r#"쯛"#, r#"쯛"#, r#"쯛"#),
+        (r#"쯜"#, r#"쯜"#, r#"쯜"#, r#"쯜"#, r#"쯜"#),
+        (r#"쯝"#, r#"쯝"#, r#"쯝"#, r#"쯝"#, r#"쯝"#),
+        (r#"쯞"#, r#"쯞"#, r#"쯞"#, r#"쯞"#, r#"쯞"#),
+        (r#"쯟"#, r#"쯟"#, r#"쯟"#, r#"쯟"#, r#"쯟"#),
+        (r#"쯠"#, r#"쯠"#, r#"쯠"#, r#"쯠"#, r#"쯠"#),
+        (r#"쯡"#, r#"쯡"#, r#"쯡"#, r#"쯡"#, r#"쯡"#),
+        (r#"쯢"#, r#"쯢"#, r#"쯢"#, r#"쯢"#, r#"쯢"#),
+        (r#"쯣"#, r#"쯣"#, r#"쯣"#, r#"쯣"#, r#"쯣"#),
+        (r#"쯤"#, r#"쯤"#, r#"쯤"#, r#"쯤"#, r#"쯤"#),
+        (r#"쯥"#, r#"쯥"#, r#"쯥"#, r#"쯥"#, r#"쯥"#),
+        (r#"쯦"#, r#"쯦"#, r#"쯦"#, r#"쯦"#, r#"쯦"#),
+        (r#"쯧"#, r#"쯧"#, r#"쯧"#, r#"쯧"#, r#"쯧"#),
+        (r#"쯨"#, r#"쯨"#, r#"쯨"#, r#"쯨"#, r#"쯨"#),
+        (r#"쯩"#, r#"쯩"#, r#"쯩"#, r#"쯩"#, r#"쯩"#),
+        (r#"쯪"#, r#"쯪"#, r#"쯪"#, r#"쯪"#, r#"쯪"#),
+        (r#"쯫"#, r#"쯫"#, r#"쯫"#, r#"쯫"#, r#"쯫"#),
+        (r#"쯬"#, r#"쯬"#, r#"쯬"#, r#"쯬"#, r#"쯬"#),
+        (r#"쯭"#, r#"쯭"#, r#"쯭"#, r#"쯭"#, r#"쯭"#),
+        (r#"쯮"#, r#"쯮"#, r#"쯮"#, r#"쯮"#, r#"쯮"#),
+        (r#"쯯"#, r#"쯯"#, r#"쯯"#, r#"쯯"#, r#"쯯"#),
+        (r#"쯰"#, r#"쯰"#, r#"쯰"#, r#"쯰"#, r#"쯰"#),
+        (r#"쯱"#, r#"쯱"#, r#"쯱"#, r#"쯱"#, r#"쯱"#),
+        (r#"쯲"#, r#"쯲"#, r#"쯲"#, r#"쯲"#, r#"쯲"#),
+        (r#"쯳"#, r#"쯳"#, r#"쯳"#, r#"쯳"#, r#"쯳"#),
+        (r#"쯴"#, r#"쯴"#, r#"쯴"#, r#"쯴"#, r#"쯴"#),
+        (r#"쯵"#, r#"쯵"#, r#"쯵"#, r#"쯵"#, r#"쯵"#),
+        (r#"쯶"#, r#"쯶"#, r#"쯶"#, r#"쯶"#, r#"쯶"#),
+        (r#"쯷"#, r#"쯷"#, r#"쯷"#, r#"쯷"#, r#"쯷"#),
+        (r#"쯸"#, r#"쯸"#, r#"쯸"#, r#"쯸"#, r#"쯸"#),
+        (r#"쯹"#, r#"쯹"#, r#"쯹"#, r#"쯹"#, r#"쯹"#),
+        (r#"쯺"#, r#"쯺"#, r#"쯺"#, r#"쯺"#, r#"쯺"#),
+        (r#"쯻"#, r#"쯻"#, r#"쯻"#, r#"쯻"#, r#"쯻"#),
+        (r#"쯼"#, r#"쯼"#, r#"쯼"#, r#"쯼"#, r#"쯼"#),
+        (r#"쯽"#, r#"쯽"#, r#"쯽"#, r#"쯽"#, r#"쯽"#),
+        (r#"쯾"#, r#"쯾"#, r#"쯾"#, r#"쯾"#, r#"쯾"#),
+        (r#"쯿"#, r#"쯿"#, r#"쯿"#, r#"쯿"#, r#"쯿"#),
+        (r#"찀"#, r#"찀"#, r#"찀"#, r#"찀"#, r#"찀"#),
+        (r#"찁"#, r#"찁"#, r#"찁"#, r#"찁"#, r#"찁"#),
+        (r#"찂"#, r#"찂"#, r#"찂"#, r#"찂"#, r#"찂"#),
+        (r#"찃"#, r#"찃"#, r#"찃"#, r#"찃"#, r#"찃"#),
+        (r#"찄"#, r#"찄"#, r#"찄"#, r#"찄"#, r#"찄"#),
+        (r#"찅"#, r#"찅"#, r#"찅"#, r#"찅"#, r#"찅"#),
+        (r#"찆"#, r#"찆"#, r#"찆"#, r#"찆"#, r#"찆"#),
+        (r#"찇"#, r#"찇"#, r#"찇"#, r#"찇"#, r#"찇"#),
+        (r#"찈"#, r#"찈"#, r#"찈"#, r#"찈"#, r#"찈"#),
+        (r#"찉"#, r#"찉"#, r#"찉"#, r#"찉"#, r#"찉"#),
+        (r#"찊"#, r#"찊"#, r#"찊"#, r#"찊"#, r#"찊"#),
+        (r#"찋"#, r#"찋"#, r#"찋"#, r#"찋"#, r#"찋"#),
+        (r#"찌"#, r#"찌"#, r#"찌"#, r#"찌"#, r#"찌"#),
+        (r#"찍"#, r#"찍"#, r#"찍"#, r#"찍"#, r#"찍"#),
+        (r#"찎"#, r#"찎"#, r#"찎"#, r#"찎"#, r#"찎"#),
+        (r#"찏"#, r#"찏"#, r#"찏"#, r#"찏"#, r#"찏"#),
+        (r#"찐"#, r#"찐"#, r#"찐"#, r#"찐"#, r#"찐"#),
+        (r#"찑"#, r#"찑"#, r#"찑"#, r#"찑"#, r#"찑"#),
+        (r#"찒"#, r#"찒"#, r#"찒"#, r#"찒"#, r#"찒"#),
+        (r#"찓"#, r#"찓"#, r#"찓"#, r#"찓"#, r#"찓"#),
+        (r#"찔"#, r#"찔"#, r#"찔"#, r#"찔"#, r#"찔"#),
+        (r#"찕"#, r#"찕"#, r#"찕"#, r#"찕"#, r#"찕"#),
+        (r#"찖"#, r#"찖"#, r#"찖"#, r#"찖"#, r#"찖"#),
+        (r#"찗"#, r#"찗"#, r#"찗"#, r#"찗"#, r#"찗"#),
+        (r#"찘"#, r#"찘"#, r#"찘"#, r#"찘"#, r#"찘"#),
+        (r#"찙"#, r#"찙"#, r#"찙"#, r#"찙"#, r#"찙"#),
+        (r#"찚"#, r#"찚"#, r#"찚"#, r#"찚"#, r#"찚"#),
+        (r#"찛"#, r#"찛"#, r#"찛"#, r#"찛"#, r#"찛"#),
+        (r#"찜"#, r#"찜"#, r#"찜"#, r#"찜"#, r#"찜"#),
+        (r#"찝"#, r#"찝"#, r#"찝"#, r#"찝"#, r#"찝"#),
+        (r#"찞"#, r#"찞"#, r#"찞"#, r#"찞"#, r#"찞"#),
+        (r#"찟"#, r#"찟"#, r#"찟"#, r#"찟"#, r#"찟"#),
+        (r#"찠"#, r#"찠"#, r#"찠"#, r#"찠"#, r#"찠"#),
+        (r#"찡"#, r#"찡"#, r#"찡"#, r#"찡"#, r#"찡"#),
+        (r#"찢"#, r#"찢"#, r#"찢"#, r#"찢"#, r#"찢"#),
+        (r#"찣"#, r#"찣"#, r#"찣"#, r#"찣"#, r#"찣"#),
+        (r#"찤"#, r#"찤"#, r#"찤"#, r#"찤"#, r#"찤"#),
+        (r#"찥"#, r#"찥"#, r#"찥"#, r#"찥"#, r#"찥"#),
+        (r#"찦"#, r#"찦"#, r#"찦"#, r#"찦"#, r#"찦"#),
+        (r#"찧"#, r#"찧"#, r#"찧"#, r#"찧"#, r#"찧"#),
+        (r#"차"#, r#"차"#, r#"차"#, r#"차"#, r#"차"#),
+        (r#"착"#, r#"착"#, r#"착"#, r#"착"#, r#"착"#),
+        (r#"찪"#, r#"찪"#, r#"찪"#, r#"찪"#, r#"찪"#),
+        (r#"찫"#, r#"찫"#, r#"찫"#, r#"찫"#, r#"찫"#),
+        (r#"찬"#, r#"찬"#, r#"찬"#, r#"찬"#, r#"찬"#),
+        (r#"찭"#, r#"찭"#, r#"찭"#, r#"찭"#, r#"찭"#),
+        (r#"찮"#, r#"찮"#, r#"찮"#, r#"찮"#, r#"찮"#),
+        (r#"찯"#, r#"찯"#, r#"찯"#, r#"찯"#, r#"찯"#),
+        (r#"찰"#, r#"찰"#, r#"찰"#, r#"찰"#, r#"찰"#),
+        (r#"찱"#, r#"찱"#, r#"찱"#, r#"찱"#, r#"찱"#),
+        (r#"찲"#, r#"찲"#, r#"찲"#, r#"찲"#, r#"찲"#),
+        (r#"찳"#, r#"찳"#, r#"찳"#, r#"찳"#, r#"찳"#),
+        (r#"찴"#, r#"찴"#, r#"찴"#, r#"찴"#, r#"찴"#),
+        (r#"찵"#, r#"찵"#, r#"찵"#, r#"찵"#, r#"찵"#),
+        (r#"찶"#, r#"찶"#, r#"찶"#, r#"찶"#, r#"찶"#),
+        (r#"찷"#, r#"찷"#, r#"찷"#, r#"찷"#, r#"찷"#),
+        (r#"참"#, r#"참"#, r#"참"#, r#"참"#, r#"참"#),
+        (r#"찹"#, r#"찹"#, r#"찹"#, r#"찹"#, r#"찹"#),
+        (r#"찺"#, r#"찺"#, r#"찺"#, r#"찺"#, r#"찺"#),
+        (r#"찻"#, r#"찻"#, r#"찻"#, r#"찻"#, r#"찻"#),
+        (r#"찼"#, r#"찼"#, r#"찼"#, r#"찼"#, r#"찼"#),
+        (r#"창"#, r#"창"#, r#"창"#, r#"창"#, r#"창"#),
+        (r#"찾"#, r#"찾"#, r#"찾"#, r#"찾"#, r#"찾"#),
+        (r#"찿"#, r#"찿"#, r#"찿"#, r#"찿"#, r#"찿"#),
+        (r#"챀"#, r#"챀"#, r#"챀"#, r#"챀"#, r#"챀"#),
+        (r#"챁"#, r#"챁"#, r#"챁"#, r#"챁"#, r#"챁"#),
+        (r#"챂"#, r#"챂"#, r#"챂"#, r#"챂"#, r#"챂"#),
+        (r#"챃"#, r#"챃"#, r#"챃"#, r#"챃"#, r#"챃"#),
+        (r#"채"#, r#"채"#, r#"채"#, r#"채"#, r#"채"#),
+        (r#"책"#, r#"책"#, r#"책"#, r#"책"#, r#"책"#),
+        (r#"챆"#, r#"챆"#, r#"챆"#, r#"챆"#, r#"챆"#),
+        (r#"챇"#, r#"챇"#, r#"챇"#, r#"챇"#, r#"챇"#),
+        (r#"챈"#, r#"챈"#, r#"챈"#, r#"챈"#, r#"챈"#),
+        (r#"챉"#, r#"챉"#, r#"챉"#, r#"챉"#, r#"챉"#),
+        (r#"챊"#, r#"챊"#, r#"챊"#, r#"챊"#, r#"챊"#),
+        (r#"챋"#, r#"챋"#, r#"챋"#, r#"챋"#, r#"챋"#),
+        (r#"챌"#, r#"챌"#, r#"챌"#, r#"챌"#, r#"챌"#),
+        (r#"챍"#, r#"챍"#, r#"챍"#, r#"챍"#, r#"챍"#),
+        (r#"챎"#, r#"챎"#, r#"챎"#, r#"챎"#, r#"챎"#),
+        (r#"챏"#, r#"챏"#, r#"챏"#, r#"챏"#, r#"챏"#),
+        (r#"챐"#, r#"챐"#, r#"챐"#, r#"챐"#, r#"챐"#),
+        (r#"챑"#, r#"챑"#, r#"챑"#, r#"챑"#, r#"챑"#),
+        (r#"챒"#, r#"챒"#, r#"챒"#, r#"챒"#, r#"챒"#),
+        (r#"챓"#, r#"챓"#, r#"챓"#, r#"챓"#, r#"챓"#),
+        (r#"챔"#, r#"챔"#, r#"챔"#, r#"챔"#, r#"챔"#),
+        (r#"챕"#, r#"챕"#, r#"챕"#, r#"챕"#, r#"챕"#),
+        (r#"챖"#, r#"챖"#, r#"챖"#, r#"챖"#, r#"챖"#),
+        (r#"챗"#, r#"챗"#, r#"챗"#, r#"챗"#, r#"챗"#),
+        (r#"챘"#, r#"챘"#, r#"챘"#, r#"챘"#, r#"챘"#),
+        (r#"챙"#, r#"챙"#, r#"챙"#, r#"챙"#, r#"챙"#),
+        (r#"챚"#, r#"챚"#, r#"챚"#, r#"챚"#, r#"챚"#),
+        (r#"챛"#, r#"챛"#, r#"챛"#, r#"챛"#, r#"챛"#),
+        (r#"챜"#, r#"챜"#, r#"챜"#, r#"챜"#, r#"챜"#),
+        (r#"챝"#, r#"챝"#, r#"챝"#, r#"챝"#, r#"챝"#),
+        (r#"챞"#, r#"챞"#, r#"챞"#, r#"챞"#, r#"챞"#),
+        (r#"챟"#, r#"챟"#, r#"챟"#, r#"챟"#, r#"챟"#),
+        (r#"챠"#, r#"챠"#, r#"챠"#, r#"챠"#, r#"챠"#),
+        (r#"챡"#, r#"챡"#, r#"챡"#, r#"챡"#, r#"챡"#),
+        (r#"챢"#, r#"챢"#, r#"챢"#, r#"챢"#, r#"챢"#),
+        (r#"챣"#, r#"챣"#, r#"챣"#, r#"챣"#, r#"챣"#),
+        (r#"챤"#, r#"챤"#, r#"챤"#, r#"챤"#, r#"챤"#),
+        (r#"챥"#, r#"챥"#, r#"챥"#, r#"챥"#, r#"챥"#),
+        (r#"챦"#, r#"챦"#, r#"챦"#, r#"챦"#, r#"챦"#),
+        (r#"챧"#, r#"챧"#, r#"챧"#, r#"챧"#, r#"챧"#),
+        (r#"챨"#, r#"챨"#, r#"챨"#, r#"챨"#, r#"챨"#),
+        (r#"챩"#, r#"챩"#, r#"챩"#, r#"챩"#, r#"챩"#),
+        (r#"챪"#, r#"챪"#, r#"챪"#, r#"챪"#, r#"챪"#),
+        (r#"챫"#, r#"챫"#, r#"챫"#, r#"챫"#, r#"챫"#),
+        (r#"챬"#, r#"챬"#, r#"챬"#, r#"챬"#, r#"챬"#),
+        (r#"챭"#, r#"챭"#, r#"챭"#, r#"챭"#, r#"챭"#),
+        (r#"챮"#, r#"챮"#, r#"챮"#, r#"챮"#, r#"챮"#),
+        (r#"챯"#, r#"챯"#, r#"챯"#, r#"챯"#, r#"챯"#),
+        (r#"챰"#, r#"챰"#, r#"챰"#, r#"챰"#, r#"챰"#),
+        (r#"챱"#, r#"챱"#, r#"챱"#, r#"챱"#, r#"챱"#),
+        (r#"챲"#, r#"챲"#, r#"챲"#, r#"챲"#, r#"챲"#),
+        (r#"챳"#, r#"챳"#, r#"챳"#, r#"챳"#, r#"챳"#),
+        (r#"챴"#, r#"챴"#, r#"챴"#, r#"챴"#, r#"챴"#),
+        (r#"챵"#, r#"챵"#, r#"챵"#, r#"챵"#, r#"챵"#),
+        (r#"챶"#, r#"챶"#, r#"챶"#, r#"챶"#, r#"챶"#),
+        (r#"챷"#, r#"챷"#, r#"챷"#, r#"챷"#, r#"챷"#),
+        (r#"챸"#, r#"챸"#, r#"챸"#, r#"챸"#, r#"챸"#),
+        (r#"챹"#, r#"챹"#, r#"챹"#, r#"챹"#, r#"챹"#),
+        (r#"챺"#, r#"챺"#, r#"챺"#, r#"챺"#, r#"챺"#),
+        (r#"챻"#, r#"챻"#, r#"챻"#, r#"챻"#, r#"챻"#),
+        (r#"챼"#, r#"챼"#, r#"챼"#, r#"챼"#, r#"챼"#),
+        (r#"챽"#, r#"챽"#, r#"챽"#, r#"챽"#, r#"챽"#),
+        (r#"챾"#, r#"챾"#, r#"챾"#, r#"챾"#, r#"챾"#),
+        (r#"챿"#, r#"챿"#, r#"챿"#, r#"챿"#, r#"챿"#),
+        (r#"첀"#, r#"첀"#, r#"첀"#, r#"첀"#, r#"첀"#),
+        (r#"첁"#, r#"첁"#, r#"첁"#, r#"첁"#, r#"첁"#),
+        (r#"첂"#, r#"첂"#, r#"첂"#, r#"첂"#, r#"첂"#),
+        (r#"첃"#, r#"첃"#, r#"첃"#, r#"첃"#, r#"첃"#),
+        (r#"첄"#, r#"첄"#, r#"첄"#, r#"첄"#, r#"첄"#),
+        (r#"첅"#, r#"첅"#, r#"첅"#, r#"첅"#, r#"첅"#),
+        (r#"첆"#, r#"첆"#, r#"첆"#, r#"첆"#, r#"첆"#),
+        (r#"첇"#, r#"첇"#, r#"첇"#, r#"첇"#, r#"첇"#),
+        (r#"첈"#, r#"첈"#, r#"첈"#, r#"첈"#, r#"첈"#),
+        (r#"첉"#, r#"첉"#, r#"첉"#, r#"첉"#, r#"첉"#),
+        (r#"첊"#, r#"첊"#, r#"첊"#, r#"첊"#, r#"첊"#),
+        (r#"첋"#, r#"첋"#, r#"첋"#, r#"첋"#, r#"첋"#),
+        (r#"첌"#, r#"첌"#, r#"첌"#, r#"첌"#, r#"첌"#),
+        (r#"첍"#, r#"첍"#, r#"첍"#, r#"첍"#, r#"첍"#),
+        (r#"첎"#, r#"첎"#, r#"첎"#, r#"첎"#, r#"첎"#),
+        (r#"첏"#, r#"첏"#, r#"첏"#, r#"첏"#, r#"첏"#),
+        (r#"첐"#, r#"첐"#, r#"첐"#, r#"첐"#, r#"첐"#),
+        (r#"첑"#, r#"첑"#, r#"첑"#, r#"첑"#, r#"첑"#),
+        (r#"첒"#, r#"첒"#, r#"첒"#, r#"첒"#, r#"첒"#),
+        (r#"첓"#, r#"첓"#, r#"첓"#, r#"첓"#, r#"첓"#),
+        (r#"첔"#, r#"첔"#, r#"첔"#, r#"첔"#, r#"첔"#),
+        (r#"첕"#, r#"첕"#, r#"첕"#, r#"첕"#, r#"첕"#),
+        (r#"첖"#, r#"첖"#, r#"첖"#, r#"첖"#, r#"첖"#),
+        (r#"첗"#, r#"첗"#, r#"첗"#, r#"첗"#, r#"첗"#),
+        (r#"처"#, r#"처"#, r#"처"#, r#"처"#, r#"처"#),
+        (r#"척"#, r#"척"#, r#"척"#, r#"척"#, r#"척"#),
+        (r#"첚"#, r#"첚"#, r#"첚"#, r#"첚"#, r#"첚"#),
+        (r#"첛"#, r#"첛"#, r#"첛"#, r#"첛"#, r#"첛"#),
+        (r#"천"#, r#"천"#, r#"천"#, r#"천"#, r#"천"#),
+        (r#"첝"#, r#"첝"#, r#"첝"#, r#"첝"#, r#"첝"#),
+        (r#"첞"#, r#"첞"#, r#"첞"#, r#"첞"#, r#"첞"#),
+        (r#"첟"#, r#"첟"#, r#"첟"#, r#"첟"#, r#"첟"#),
+        (r#"철"#, r#"철"#, r#"철"#, r#"철"#, r#"철"#),
+        (r#"첡"#, r#"첡"#, r#"첡"#, r#"첡"#, r#"첡"#),
+        (r#"첢"#, r#"첢"#, r#"첢"#, r#"첢"#, r#"첢"#),
+        (r#"첣"#, r#"첣"#, r#"첣"#, r#"첣"#, r#"첣"#),
+        (r#"첤"#, r#"첤"#, r#"첤"#, r#"첤"#, r#"첤"#),
+        (r#"첥"#, r#"첥"#, r#"첥"#, r#"첥"#, r#"첥"#),
+        (r#"첦"#, r#"첦"#, r#"첦"#, r#"첦"#, r#"첦"#),
+        (r#"첧"#, r#"첧"#, r#"첧"#, r#"첧"#, r#"첧"#),
+        (r#"첨"#, r#"첨"#, r#"첨"#, r#"첨"#, r#"첨"#),
+        (r#"첩"#, r#"첩"#, r#"첩"#, r#"첩"#, r#"첩"#),
+        (r#"첪"#, r#"첪"#, r#"첪"#, r#"첪"#, r#"첪"#),
+        (r#"첫"#, r#"첫"#, r#"첫"#, r#"첫"#, r#"첫"#),
+        (r#"첬"#, r#"첬"#, r#"첬"#, r#"첬"#, r#"첬"#),
+        (r#"청"#, r#"청"#, r#"청"#, r#"청"#, r#"청"#),
+        (r#"첮"#, r#"첮"#, r#"첮"#, r#"첮"#, r#"첮"#),
+        (r#"첯"#, r#"첯"#, r#"첯"#, r#"첯"#, r#"첯"#),
+        (r#"첰"#, r#"첰"#, r#"첰"#, r#"첰"#, r#"첰"#),
+        (r#"첱"#, r#"첱"#, r#"첱"#, r#"첱"#, r#"첱"#),
+        (r#"첲"#, r#"첲"#, r#"첲"#, r#"첲"#, r#"첲"#),
+        (r#"첳"#, r#"첳"#, r#"첳"#, r#"첳"#, r#"첳"#),
+        (r#"체"#, r#"체"#, r#"체"#, r#"체"#, r#"체"#),
+        (r#"첵"#, r#"첵"#, r#"첵"#, r#"첵"#, r#"첵"#),
+        (r#"첶"#, r#"첶"#, r#"첶"#, r#"첶"#, r#"첶"#),
+        (r#"첷"#, r#"첷"#, r#"첷"#, r#"첷"#, r#"첷"#),
+        (r#"첸"#, r#"첸"#, r#"첸"#, r#"첸"#, r#"첸"#),
+        (r#"첹"#, r#"첹"#, r#"첹"#, r#"첹"#, r#"첹"#),
+        (r#"첺"#, r#"첺"#, r#"첺"#, r#"첺"#, r#"첺"#),
+        (r#"첻"#, r#"첻"#, r#"첻"#, r#"첻"#, r#"첻"#),
+        (r#"첼"#, r#"첼"#, r#"첼"#, r#"첼"#, r#"첼"#),
+        (r#"첽"#, r#"첽"#, r#"첽"#, r#"첽"#, r#"첽"#),
+        (r#"첾"#, r#"첾"#, r#"첾"#, r#"첾"#, r#"첾"#),
+        (r#"첿"#, r#"첿"#, r#"첿"#, r#"첿"#, r#"첿"#),
+        (r#"쳀"#, r#"쳀"#, r#"쳀"#, r#"쳀"#, r#"쳀"#),
+        (r#"쳁"#, r#"쳁"#, r#"쳁"#, r#"쳁"#, r#"쳁"#),
+        (r#"쳂"#, r#"쳂"#, r#"쳂"#, r#"쳂"#, r#"쳂"#),
+        (r#"쳃"#, r#"쳃"#, r#"쳃"#, r#"쳃"#, r#"쳃"#),
+        (r#"쳄"#, r#"쳄"#, r#"쳄"#, r#"쳄"#, r#"쳄"#),
+        (r#"쳅"#, r#"쳅"#, r#"쳅"#, r#"쳅"#, r#"쳅"#),
+        (r#"쳆"#, r#"쳆"#, r#"쳆"#, r#"쳆"#, r#"쳆"#),
+        (r#"쳇"#, r#"쳇"#, r#"쳇"#, r#"쳇"#, r#"쳇"#),
+        (r#"쳈"#, r#"쳈"#, r#"쳈"#, r#"쳈"#, r#"쳈"#),
+        (r#"쳉"#, r#"쳉"#, r#"쳉"#, r#"쳉"#, r#"쳉"#),
+        (r#"쳊"#, r#"쳊"#, r#"쳊"#, r#"쳊"#, r#"쳊"#),
+        (r#"쳋"#, r#"쳋"#, r#"쳋"#, r#"쳋"#, r#"쳋"#),
+        (r#"쳌"#, r#"쳌"#, r#"쳌"#, r#"쳌"#, r#"쳌"#),
+        (r#"쳍"#, r#"쳍"#, r#"쳍"#, r#"쳍"#, r#"쳍"#),
+        (r#"쳎"#, r#"쳎"#, r#"쳎"#, r#"쳎"#, r#"쳎"#),
+        (r#"쳏"#, r#"쳏"#, r#"쳏"#, r#"쳏"#, r#"쳏"#),
+        (r#"쳐"#, r#"쳐"#, r#"쳐"#, r#"쳐"#, r#"쳐"#),
+        (r#"쳑"#, r#"쳑"#, r#"쳑"#, r#"쳑"#, r#"쳑"#),
+        (r#"쳒"#, r#"쳒"#, r#"쳒"#, r#"쳒"#, r#"쳒"#),
+        (r#"쳓"#, r#"쳓"#, r#"쳓"#, r#"쳓"#, r#"쳓"#),
+        (r#"쳔"#, r#"쳔"#, r#"쳔"#, r#"쳔"#, r#"쳔"#),
+        (r#"쳕"#, r#"쳕"#, r#"쳕"#, r#"쳕"#, r#"쳕"#),
+        (r#"쳖"#, r#"쳖"#, r#"쳖"#, r#"쳖"#, r#"쳖"#),
+        (r#"쳗"#, r#"쳗"#, r#"쳗"#, r#"쳗"#, r#"쳗"#),
+        (r#"쳘"#, r#"쳘"#, r#"쳘"#, r#"쳘"#, r#"쳘"#),
+        (r#"쳙"#, r#"쳙"#, r#"쳙"#, r#"쳙"#, r#"쳙"#),
+        (r#"쳚"#, r#"쳚"#, r#"쳚"#, r#"쳚"#, r#"쳚"#),
+        (r#"쳛"#, r#"쳛"#, r#"쳛"#, r#"쳛"#, r#"쳛"#),
+        (r#"쳜"#, r#"쳜"#, r#"쳜"#, r#"쳜"#, r#"쳜"#),
+        (r#"쳝"#, r#"쳝"#, r#"쳝"#, r#"쳝"#, r#"쳝"#),
+        (r#"쳞"#, r#"쳞"#, r#"쳞"#, r#"쳞"#, r#"쳞"#),
+        (r#"쳟"#, r#"쳟"#, r#"쳟"#, r#"쳟"#, r#"쳟"#),
+        (r#"쳠"#, r#"쳠"#, r#"쳠"#, r#"쳠"#, r#"쳠"#),
+        (r#"쳡"#, r#"쳡"#, r#"쳡"#, r#"쳡"#, r#"쳡"#),
+        (r#"쳢"#, r#"쳢"#, r#"쳢"#, r#"쳢"#, r#"쳢"#),
+        (r#"쳣"#, r#"쳣"#, r#"쳣"#, r#"쳣"#, r#"쳣"#),
+        (r#"쳤"#, r#"쳤"#, r#"쳤"#, r#"쳤"#, r#"쳤"#),
+        (r#"쳥"#, r#"쳥"#, r#"쳥"#, r#"쳥"#, r#"쳥"#),
+        (r#"쳦"#, r#"쳦"#, r#"쳦"#, r#"쳦"#, r#"쳦"#),
+        (r#"쳧"#, r#"쳧"#, r#"쳧"#, r#"쳧"#, r#"쳧"#),
+        (r#"쳨"#, r#"쳨"#, r#"쳨"#, r#"쳨"#, r#"쳨"#),
+        (r#"쳩"#, r#"쳩"#, r#"쳩"#, r#"쳩"#, r#"쳩"#),
+        (r#"쳪"#, r#"쳪"#, r#"쳪"#, r#"쳪"#, r#"쳪"#),
+        (r#"쳫"#, r#"쳫"#, r#"쳫"#, r#"쳫"#, r#"쳫"#),
+        (r#"쳬"#, r#"쳬"#, r#"쳬"#, r#"쳬"#, r#"쳬"#),
+        (r#"쳭"#, r#"쳭"#, r#"쳭"#, r#"쳭"#, r#"쳭"#),
+        (r#"쳮"#, r#"쳮"#, r#"쳮"#, r#"쳮"#, r#"쳮"#),
+        (r#"쳯"#, r#"쳯"#, r#"쳯"#, r#"쳯"#, r#"쳯"#),
+        (r#"쳰"#, r#"쳰"#, r#"쳰"#, r#"쳰"#, r#"쳰"#),
+        (r#"쳱"#, r#"쳱"#, r#"쳱"#, r#"쳱"#, r#"쳱"#),
+        (r#"쳲"#, r#"쳲"#, r#"쳲"#, r#"쳲"#, r#"쳲"#),
+        (r#"쳳"#, r#"쳳"#, r#"쳳"#, r#"쳳"#, r#"쳳"#),
+        (r#"쳴"#, r#"쳴"#, r#"쳴"#, r#"쳴"#, r#"쳴"#),
+        (r#"쳵"#, r#"쳵"#, r#"쳵"#, r#"쳵"#, r#"쳵"#),
+        (r#"쳶"#, r#"쳶"#, r#"쳶"#, r#"쳶"#, r#"쳶"#),
+        (r#"쳷"#, r#"쳷"#, r#"쳷"#, r#"쳷"#, r#"쳷"#),
+        (r#"쳸"#, r#"쳸"#, r#"쳸"#, r#"쳸"#, r#"쳸"#),
+        (r#"쳹"#, r#"쳹"#, r#"쳹"#, r#"쳹"#, r#"쳹"#),
+        (r#"쳺"#, r#"쳺"#, r#"쳺"#, r#"쳺"#, r#"쳺"#),
+        (r#"쳻"#, r#"쳻"#, r#"쳻"#, r#"쳻"#, r#"쳻"#),
+        (r#"쳼"#, r#"쳼"#, r#"쳼"#, r#"쳼"#, r#"쳼"#),
+        (r#"쳽"#, r#"쳽"#, r#"쳽"#, r#"쳽"#, r#"쳽"#),
+        (r#"쳾"#, r#"쳾"#, r#"쳾"#, r#"쳾"#, r#"쳾"#),
+        (r#"쳿"#, r#"쳿"#, r#"쳿"#, r#"쳿"#, r#"쳿"#),
+        (r#"촀"#, r#"촀"#, r#"촀"#, r#"촀"#, r#"촀"#),
+        (r#"촁"#, r#"촁"#, r#"촁"#, r#"촁"#, r#"촁"#),
+        (r#"촂"#, r#"촂"#, r#"촂"#, r#"촂"#, r#"촂"#),
+        (r#"촃"#, r#"촃"#, r#"촃"#, r#"촃"#, r#"촃"#),
+        (r#"촄"#, r#"촄"#, r#"촄"#, r#"촄"#, r#"촄"#),
+        (r#"촅"#, r#"촅"#, r#"촅"#, r#"촅"#, r#"촅"#),
+        (r#"촆"#, r#"촆"#, r#"촆"#, r#"촆"#, r#"촆"#),
+        (r#"촇"#, r#"촇"#, r#"촇"#, r#"촇"#, r#"촇"#),
+        (r#"초"#, r#"초"#, r#"초"#, r#"초"#, r#"초"#),
+        (r#"촉"#, r#"촉"#, r#"촉"#, r#"촉"#, r#"촉"#),
+        (r#"촊"#, r#"촊"#, r#"촊"#, r#"촊"#, r#"촊"#),
+        (r#"촋"#, r#"촋"#, r#"촋"#, r#"촋"#, r#"촋"#),
+        (r#"촌"#, r#"촌"#, r#"촌"#, r#"촌"#, r#"촌"#),
+        (r#"촍"#, r#"촍"#, r#"촍"#, r#"촍"#, r#"촍"#),
+        (r#"촎"#, r#"촎"#, r#"촎"#, r#"촎"#, r#"촎"#),
+        (r#"촏"#, r#"촏"#, r#"촏"#, r#"촏"#, r#"촏"#),
+        (r#"촐"#, r#"촐"#, r#"촐"#, r#"촐"#, r#"촐"#),
+        (r#"촑"#, r#"촑"#, r#"촑"#, r#"촑"#, r#"촑"#),
+        (r#"촒"#, r#"촒"#, r#"촒"#, r#"촒"#, r#"촒"#),
+        (r#"촓"#, r#"촓"#, r#"촓"#, r#"촓"#, r#"촓"#),
+        (r#"촔"#, r#"촔"#, r#"촔"#, r#"촔"#, r#"촔"#),
+        (r#"촕"#, r#"촕"#, r#"촕"#, r#"촕"#, r#"촕"#),
+        (r#"촖"#, r#"촖"#, r#"촖"#, r#"촖"#, r#"촖"#),
+        (r#"촗"#, r#"촗"#, r#"촗"#, r#"촗"#, r#"촗"#),
+        (r#"촘"#, r#"촘"#, r#"촘"#, r#"촘"#, r#"촘"#),
+        (r#"촙"#, r#"촙"#, r#"촙"#, r#"촙"#, r#"촙"#),
+        (r#"촚"#, r#"촚"#, r#"촚"#, r#"촚"#, r#"촚"#),
+        (r#"촛"#, r#"촛"#, r#"촛"#, r#"촛"#, r#"촛"#),
+        (r#"촜"#, r#"촜"#, r#"촜"#, r#"촜"#, r#"촜"#),
+        (r#"총"#, r#"총"#, r#"총"#, r#"총"#, r#"총"#),
+        (r#"촞"#, r#"촞"#, r#"촞"#, r#"촞"#, r#"촞"#),
+        (r#"촟"#, r#"촟"#, r#"촟"#, r#"촟"#, r#"촟"#),
+        (r#"촠"#, r#"촠"#, r#"촠"#, r#"촠"#, r#"촠"#),
+        (r#"촡"#, r#"촡"#, r#"촡"#, r#"촡"#, r#"촡"#),
+        (r#"촢"#, r#"촢"#, r#"촢"#, r#"촢"#, r#"촢"#),
+        (r#"촣"#, r#"촣"#, r#"촣"#, r#"촣"#, r#"촣"#),
+        (r#"촤"#, r#"촤"#, r#"촤"#, r#"촤"#, r#"촤"#),
+        (r#"촥"#, r#"촥"#, r#"촥"#, r#"촥"#, r#"촥"#),
+        (r#"촦"#, r#"촦"#, r#"촦"#, r#"촦"#, r#"촦"#),
+        (r#"촧"#, r#"촧"#, r#"촧"#, r#"촧"#, r#"촧"#),
+        (r#"촨"#, r#"촨"#, r#"촨"#, r#"촨"#, r#"촨"#),
+        (r#"촩"#, r#"촩"#, r#"촩"#, r#"촩"#, r#"촩"#),
+        (r#"촪"#, r#"촪"#, r#"촪"#, r#"촪"#, r#"촪"#),
+        (r#"촫"#, r#"촫"#, r#"촫"#, r#"촫"#, r#"촫"#),
+        (r#"촬"#, r#"촬"#, r#"촬"#, r#"촬"#, r#"촬"#),
+        (r#"촭"#, r#"촭"#, r#"촭"#, r#"촭"#, r#"촭"#),
+        (r#"촮"#, r#"촮"#, r#"촮"#, r#"촮"#, r#"촮"#),
+        (r#"촯"#, r#"촯"#, r#"촯"#, r#"촯"#, r#"촯"#),
+        (r#"촰"#, r#"촰"#, r#"촰"#, r#"촰"#, r#"촰"#),
+        (r#"촱"#, r#"촱"#, r#"촱"#, r#"촱"#, r#"촱"#),
+        (r#"촲"#, r#"촲"#, r#"촲"#, r#"촲"#, r#"촲"#),
+        (r#"촳"#, r#"촳"#, r#"촳"#, r#"촳"#, r#"촳"#),
+        (r#"촴"#, r#"촴"#, r#"촴"#, r#"촴"#, r#"촴"#),
+        (r#"촵"#, r#"촵"#, r#"촵"#, r#"촵"#, r#"촵"#),
+        (r#"촶"#, r#"촶"#, r#"촶"#, r#"촶"#, r#"촶"#),
+        (r#"촷"#, r#"촷"#, r#"촷"#, r#"촷"#, r#"촷"#),
+        (r#"촸"#, r#"촸"#, r#"촸"#, r#"촸"#, r#"촸"#),
+        (r#"촹"#, r#"촹"#, r#"촹"#, r#"촹"#, r#"촹"#),
+        (r#"촺"#, r#"촺"#, r#"촺"#, r#"촺"#, r#"촺"#),
+        (r#"촻"#, r#"촻"#, r#"촻"#, r#"촻"#, r#"촻"#),
+        (r#"촼"#, r#"촼"#, r#"촼"#, r#"촼"#, r#"촼"#),
+        (r#"촽"#, r#"촽"#, r#"촽"#, r#"촽"#, r#"촽"#),
+        (r#"촾"#, r#"촾"#, r#"촾"#, r#"촾"#, r#"촾"#),
+        (r#"촿"#, r#"촿"#, r#"촿"#, r#"촿"#, r#"촿"#),
+        (r#"쵀"#, r#"쵀"#, r#"쵀"#, r#"쵀"#, r#"쵀"#),
+        (r#"쵁"#, r#"쵁"#, r#"쵁"#, r#"쵁"#, r#"쵁"#),
+        (r#"쵂"#, r#"쵂"#, r#"쵂"#, r#"쵂"#, r#"쵂"#),
+        (r#"쵃"#, r#"쵃"#, r#"쵃"#, r#"쵃"#, r#"쵃"#),
+        (r#"쵄"#, r#"쵄"#, r#"쵄"#, r#"쵄"#, r#"쵄"#),
+        (r#"쵅"#, r#"쵅"#, r#"쵅"#, r#"쵅"#, r#"쵅"#),
+        (r#"쵆"#, r#"쵆"#, r#"쵆"#, r#"쵆"#, r#"쵆"#),
+        (r#"쵇"#, r#"쵇"#, r#"쵇"#, r#"쵇"#, r#"쵇"#),
+        (r#"쵈"#, r#"쵈"#, r#"쵈"#, r#"쵈"#, r#"쵈"#),
+        (r#"쵉"#, r#"쵉"#, r#"쵉"#, r#"쵉"#, r#"쵉"#),
+        (r#"쵊"#, r#"쵊"#, r#"쵊"#, r#"쵊"#, r#"쵊"#),
+        (r#"쵋"#, r#"쵋"#, r#"쵋"#, r#"쵋"#, r#"쵋"#),
+        (r#"쵌"#, r#"쵌"#, r#"쵌"#, r#"쵌"#, r#"쵌"#),
+        (r#"쵍"#, r#"쵍"#, r#"쵍"#, r#"쵍"#, r#"쵍"#),
+        (r#"쵎"#, r#"쵎"#, r#"쵎"#, r#"쵎"#, r#"쵎"#),
+        (r#"쵏"#, r#"쵏"#, r#"쵏"#, r#"쵏"#, r#"쵏"#),
+        (r#"쵐"#, r#"쵐"#, r#"쵐"#, r#"쵐"#, r#"쵐"#),
+        (r#"쵑"#, r#"쵑"#, r#"쵑"#, r#"쵑"#, r#"쵑"#),
+        (r#"쵒"#, r#"쵒"#, r#"쵒"#, r#"쵒"#, r#"쵒"#),
+        (r#"쵓"#, r#"쵓"#, r#"쵓"#, r#"쵓"#, r#"쵓"#),
+        (r#"쵔"#, r#"쵔"#, r#"쵔"#, r#"쵔"#, r#"쵔"#),
+        (r#"쵕"#, r#"쵕"#, r#"쵕"#, r#"쵕"#, r#"쵕"#),
+        (r#"쵖"#, r#"쵖"#, r#"쵖"#, r#"쵖"#, r#"쵖"#),
+        (r#"쵗"#, r#"쵗"#, r#"쵗"#, r#"쵗"#, r#"쵗"#),
+        (r#"쵘"#, r#"쵘"#, r#"쵘"#, r#"쵘"#, r#"쵘"#),
+        (r#"쵙"#, r#"쵙"#, r#"쵙"#, r#"쵙"#, r#"쵙"#),
+        (r#"쵚"#, r#"쵚"#, r#"쵚"#, r#"쵚"#, r#"쵚"#),
+        (r#"쵛"#, r#"쵛"#, r#"쵛"#, r#"쵛"#, r#"쵛"#),
+        (r#"최"#, r#"최"#, r#"최"#, r#"최"#, r#"최"#),
+        (r#"쵝"#, r#"쵝"#, r#"쵝"#, r#"쵝"#, r#"쵝"#),
+        (r#"쵞"#, r#"쵞"#, r#"쵞"#, r#"쵞"#, r#"쵞"#),
+        (r#"쵟"#, r#"쵟"#, r#"쵟"#, r#"쵟"#, r#"쵟"#),
+        (r#"쵠"#, r#"쵠"#, r#"쵠"#, r#"쵠"#, r#"쵠"#),
+        (r#"쵡"#, r#"쵡"#, r#"쵡"#, r#"쵡"#, r#"쵡"#),
+        (r#"쵢"#, r#"쵢"#, r#"쵢"#, r#"쵢"#, r#"쵢"#),
+        (r#"쵣"#, r#"쵣"#, r#"쵣"#, r#"쵣"#, r#"쵣"#),
+        (r#"쵤"#, r#"쵤"#, r#"쵤"#, r#"쵤"#, r#"쵤"#),
+        (r#"쵥"#, r#"쵥"#, r#"쵥"#, r#"쵥"#, r#"쵥"#),
+        (r#"쵦"#, r#"쵦"#, r#"쵦"#, r#"쵦"#, r#"쵦"#),
+        (r#"쵧"#, r#"쵧"#, r#"쵧"#, r#"쵧"#, r#"쵧"#),
+        (r#"쵨"#, r#"쵨"#, r#"쵨"#, r#"쵨"#, r#"쵨"#),
+        (r#"쵩"#, r#"쵩"#, r#"쵩"#, r#"쵩"#, r#"쵩"#),
+        (r#"쵪"#, r#"쵪"#, r#"쵪"#, r#"쵪"#, r#"쵪"#),
+        (r#"쵫"#, r#"쵫"#, r#"쵫"#, r#"쵫"#, r#"쵫"#),
+        (r#"쵬"#, r#"쵬"#, r#"쵬"#, r#"쵬"#, r#"쵬"#),
+        (r#"쵭"#, r#"쵭"#, r#"쵭"#, r#"쵭"#, r#"쵭"#),
+        (r#"쵮"#, r#"쵮"#, r#"쵮"#, r#"쵮"#, r#"쵮"#),
+        (r#"쵯"#, r#"쵯"#, r#"쵯"#, r#"쵯"#, r#"쵯"#),
+        (r#"쵰"#, r#"쵰"#, r#"쵰"#, r#"쵰"#, r#"쵰"#),
+        (r#"쵱"#, r#"쵱"#, r#"쵱"#, r#"쵱"#, r#"쵱"#),
+        (r#"쵲"#, r#"쵲"#, r#"쵲"#, r#"쵲"#, r#"쵲"#),
+        (r#"쵳"#, r#"쵳"#, r#"쵳"#, r#"쵳"#, r#"쵳"#),
+        (r#"쵴"#, r#"쵴"#, r#"쵴"#, r#"쵴"#, r#"쵴"#),
+        (r#"쵵"#, r#"쵵"#, r#"쵵"#, r#"쵵"#, r#"쵵"#),
+        (r#"쵶"#, r#"쵶"#, r#"쵶"#, r#"쵶"#, r#"쵶"#),
+        (r#"쵷"#, r#"쵷"#, r#"쵷"#, r#"쵷"#, r#"쵷"#),
+        (r#"쵸"#, r#"쵸"#, r#"쵸"#, r#"쵸"#, r#"쵸"#),
+        (r#"쵹"#, r#"쵹"#, r#"쵹"#, r#"쵹"#, r#"쵹"#),
+        (r#"쵺"#, r#"쵺"#, r#"쵺"#, r#"쵺"#, r#"쵺"#),
+        (r#"쵻"#, r#"쵻"#, r#"쵻"#, r#"쵻"#, r#"쵻"#),
+        (r#"쵼"#, r#"쵼"#, r#"쵼"#, r#"쵼"#, r#"쵼"#),
+        (r#"쵽"#, r#"쵽"#, r#"쵽"#, r#"쵽"#, r#"쵽"#),
+        (r#"쵾"#, r#"쵾"#, r#"쵾"#, r#"쵾"#, r#"쵾"#),
+        (r#"쵿"#, r#"쵿"#, r#"쵿"#, r#"쵿"#, r#"쵿"#),
+        (r#"춀"#, r#"춀"#, r#"춀"#, r#"춀"#, r#"춀"#),
+        (r#"춁"#, r#"춁"#, r#"춁"#, r#"춁"#, r#"춁"#),
+        (r#"춂"#, r#"춂"#, r#"춂"#, r#"춂"#, r#"춂"#),
+        (r#"춃"#, r#"춃"#, r#"춃"#, r#"춃"#, r#"춃"#),
+        (r#"춄"#, r#"춄"#, r#"춄"#, r#"춄"#, r#"춄"#),
+        (r#"춅"#, r#"춅"#, r#"춅"#, r#"춅"#, r#"춅"#),
+        (r#"춆"#, r#"춆"#, r#"춆"#, r#"춆"#, r#"춆"#),
+        (r#"춇"#, r#"춇"#, r#"춇"#, r#"춇"#, r#"춇"#),
+        (r#"춈"#, r#"춈"#, r#"춈"#, r#"춈"#, r#"춈"#),
+        (r#"춉"#, r#"춉"#, r#"춉"#, r#"춉"#, r#"춉"#),
+        (r#"춊"#, r#"춊"#, r#"춊"#, r#"춊"#, r#"춊"#),
+        (r#"춋"#, r#"춋"#, r#"춋"#, r#"춋"#, r#"춋"#),
+        (r#"춌"#, r#"춌"#, r#"춌"#, r#"춌"#, r#"춌"#),
+        (r#"춍"#, r#"춍"#, r#"춍"#, r#"춍"#, r#"춍"#),
+        (r#"춎"#, r#"춎"#, r#"춎"#, r#"춎"#, r#"춎"#),
+        (r#"춏"#, r#"춏"#, r#"춏"#, r#"춏"#, r#"춏"#),
+        (r#"춐"#, r#"춐"#, r#"춐"#, r#"춐"#, r#"춐"#),
+        (r#"춑"#, r#"춑"#, r#"춑"#, r#"춑"#, r#"춑"#),
+        (r#"춒"#, r#"춒"#, r#"춒"#, r#"춒"#, r#"춒"#),
+        (r#"춓"#, r#"춓"#, r#"춓"#, r#"춓"#, r#"춓"#),
+        (r#"추"#, r#"추"#, r#"추"#, r#"추"#, r#"추"#),
+        (r#"축"#, r#"축"#, r#"축"#, r#"축"#, r#"축"#),
+        (r#"춖"#, r#"춖"#, r#"춖"#, r#"춖"#, r#"춖"#),
+        (r#"춗"#, r#"춗"#, r#"춗"#, r#"춗"#, r#"춗"#),
+        (r#"춘"#, r#"춘"#, r#"춘"#, r#"춘"#, r#"춘"#),
+        (r#"춙"#, r#"춙"#, r#"춙"#, r#"춙"#, r#"춙"#),
+        (r#"춚"#, r#"춚"#, r#"춚"#, r#"춚"#, r#"춚"#),
+        (r#"춛"#, r#"춛"#, r#"춛"#, r#"춛"#, r#"춛"#),
+        (r#"출"#, r#"출"#, r#"출"#, r#"출"#, r#"출"#),
+        (r#"춝"#, r#"춝"#, r#"춝"#, r#"춝"#, r#"춝"#),
+        (r#"춞"#, r#"춞"#, r#"춞"#, r#"춞"#, r#"춞"#),
+        (r#"춟"#, r#"춟"#, r#"춟"#, r#"춟"#, r#"춟"#),
+        (r#"춠"#, r#"춠"#, r#"춠"#, r#"춠"#, r#"춠"#),
+        (r#"춡"#, r#"춡"#, r#"춡"#, r#"춡"#, r#"춡"#),
+        (r#"춢"#, r#"춢"#, r#"춢"#, r#"춢"#, r#"춢"#),
+        (r#"춣"#, r#"춣"#, r#"춣"#, r#"춣"#, r#"춣"#),
+        (r#"춤"#, r#"춤"#, r#"춤"#, r#"춤"#, r#"춤"#),
+        (r#"춥"#, r#"춥"#, r#"춥"#, r#"춥"#, r#"춥"#),
+        (r#"춦"#, r#"춦"#, r#"춦"#, r#"춦"#, r#"춦"#),
+        (r#"춧"#, r#"춧"#, r#"춧"#, r#"춧"#, r#"춧"#),
+        (r#"춨"#, r#"춨"#, r#"춨"#, r#"춨"#, r#"춨"#),
+        (r#"충"#, r#"충"#, r#"충"#, r#"충"#, r#"충"#),
+        (r#"춪"#, r#"춪"#, r#"춪"#, r#"춪"#, r#"춪"#),
+        (r#"춫"#, r#"춫"#, r#"춫"#, r#"춫"#, r#"춫"#),
+        (r#"춬"#, r#"춬"#, r#"춬"#, r#"춬"#, r#"춬"#),
+        (r#"춭"#, r#"춭"#, r#"춭"#, r#"춭"#, r#"춭"#),
+        (r#"춮"#, r#"춮"#, r#"춮"#, r#"춮"#, r#"춮"#),
+        (r#"춯"#, r#"춯"#, r#"춯"#, r#"춯"#, r#"춯"#),
+        (r#"춰"#, r#"춰"#, r#"춰"#, r#"춰"#, r#"춰"#),
+        (r#"춱"#, r#"춱"#, r#"춱"#, r#"춱"#, r#"춱"#),
+        (r#"춲"#, r#"춲"#, r#"춲"#, r#"춲"#, r#"춲"#),
+        (r#"춳"#, r#"춳"#, r#"춳"#, r#"춳"#, r#"춳"#),
+        (r#"춴"#, r#"춴"#, r#"춴"#, r#"춴"#, r#"춴"#),
+        (r#"춵"#, r#"춵"#, r#"춵"#, r#"춵"#, r#"춵"#),
+        (r#"춶"#, r#"춶"#, r#"춶"#, r#"춶"#, r#"춶"#),
+        (r#"춷"#, r#"춷"#, r#"춷"#, r#"춷"#, r#"춷"#),
+        (r#"춸"#, r#"춸"#, r#"춸"#, r#"춸"#, r#"춸"#),
+        (r#"춹"#, r#"춹"#, r#"춹"#, r#"춹"#, r#"춹"#),
+        (r#"춺"#, r#"춺"#, r#"춺"#, r#"춺"#, r#"춺"#),
+        (r#"춻"#, r#"춻"#, r#"춻"#, r#"춻"#, r#"춻"#),
+        (r#"춼"#, r#"춼"#, r#"춼"#, r#"춼"#, r#"춼"#),
+        (r#"춽"#, r#"춽"#, r#"춽"#, r#"춽"#, r#"춽"#),
+        (r#"춾"#, r#"춾"#, r#"춾"#, r#"춾"#, r#"춾"#),
+        (r#"춿"#, r#"춿"#, r#"춿"#, r#"춿"#, r#"춿"#),
+        (r#"췀"#, r#"췀"#, r#"췀"#, r#"췀"#, r#"췀"#),
+        (r#"췁"#, r#"췁"#, r#"췁"#, r#"췁"#, r#"췁"#),
+        (r#"췂"#, r#"췂"#, r#"췂"#, r#"췂"#, r#"췂"#),
+        (r#"췃"#, r#"췃"#, r#"췃"#, r#"췃"#, r#"췃"#),
+        (r#"췄"#, r#"췄"#, r#"췄"#, r#"췄"#, r#"췄"#),
+        (r#"췅"#, r#"췅"#, r#"췅"#, r#"췅"#, r#"췅"#),
+        (r#"췆"#, r#"췆"#, r#"췆"#, r#"췆"#, r#"췆"#),
+        (r#"췇"#, r#"췇"#, r#"췇"#, r#"췇"#, r#"췇"#),
+        (r#"췈"#, r#"췈"#, r#"췈"#, r#"췈"#, r#"췈"#),
+        (r#"췉"#, r#"췉"#, r#"췉"#, r#"췉"#, r#"췉"#),
+        (r#"췊"#, r#"췊"#, r#"췊"#, r#"췊"#, r#"췊"#),
+        (r#"췋"#, r#"췋"#, r#"췋"#, r#"췋"#, r#"췋"#),
+        (r#"췌"#, r#"췌"#, r#"췌"#, r#"췌"#, r#"췌"#),
+        (r#"췍"#, r#"췍"#, r#"췍"#, r#"췍"#, r#"췍"#),
+        (r#"췎"#, r#"췎"#, r#"췎"#, r#"췎"#, r#"췎"#),
+        (r#"췏"#, r#"췏"#, r#"췏"#, r#"췏"#, r#"췏"#),
+        (r#"췐"#, r#"췐"#, r#"췐"#, r#"췐"#, r#"췐"#),
+        (r#"췑"#, r#"췑"#, r#"췑"#, r#"췑"#, r#"췑"#),
+        (r#"췒"#, r#"췒"#, r#"췒"#, r#"췒"#, r#"췒"#),
+        (r#"췓"#, r#"췓"#, r#"췓"#, r#"췓"#, r#"췓"#),
+        (r#"췔"#, r#"췔"#, r#"췔"#, r#"췔"#, r#"췔"#),
+        (r#"췕"#, r#"췕"#, r#"췕"#, r#"췕"#, r#"췕"#),
+        (r#"췖"#, r#"췖"#, r#"췖"#, r#"췖"#, r#"췖"#),
+        (r#"췗"#, r#"췗"#, r#"췗"#, r#"췗"#, r#"췗"#),
+        (r#"췘"#, r#"췘"#, r#"췘"#, r#"췘"#, r#"췘"#),
+        (r#"췙"#, r#"췙"#, r#"췙"#, r#"췙"#, r#"췙"#),
+        (r#"췚"#, r#"췚"#, r#"췚"#, r#"췚"#, r#"췚"#),
+        (r#"췛"#, r#"췛"#, r#"췛"#, r#"췛"#, r#"췛"#),
+        (r#"췜"#, r#"췜"#, r#"췜"#, r#"췜"#, r#"췜"#),
+        (r#"췝"#, r#"췝"#, r#"췝"#, r#"췝"#, r#"췝"#),
+        (r#"췞"#, r#"췞"#, r#"췞"#, r#"췞"#, r#"췞"#),
+        (r#"췟"#, r#"췟"#, r#"췟"#, r#"췟"#, r#"췟"#),
+        (r#"췠"#, r#"췠"#, r#"췠"#, r#"췠"#, r#"췠"#),
+        (r#"췡"#, r#"췡"#, r#"췡"#, r#"췡"#, r#"췡"#),
+        (r#"췢"#, r#"췢"#, r#"췢"#, r#"췢"#, r#"췢"#),
+        (r#"췣"#, r#"췣"#, r#"췣"#, r#"췣"#, r#"췣"#),
+        (r#"췤"#, r#"췤"#, r#"췤"#, r#"췤"#, r#"췤"#),
+        (r#"췥"#, r#"췥"#, r#"췥"#, r#"췥"#, r#"췥"#),
+        (r#"췦"#, r#"췦"#, r#"췦"#, r#"췦"#, r#"췦"#),
+        (r#"췧"#, r#"췧"#, r#"췧"#, r#"췧"#, r#"췧"#),
+        (r#"취"#, r#"취"#, r#"취"#, r#"취"#, r#"취"#),
+        (r#"췩"#, r#"췩"#, r#"췩"#, r#"췩"#, r#"췩"#),
+        (r#"췪"#, r#"췪"#, r#"췪"#, r#"췪"#, r#"췪"#),
+        (r#"췫"#, r#"췫"#, r#"췫"#, r#"췫"#, r#"췫"#),
+        (r#"췬"#, r#"췬"#, r#"췬"#, r#"췬"#, r#"췬"#),
+        (r#"췭"#, r#"췭"#, r#"췭"#, r#"췭"#, r#"췭"#),
+        (r#"췮"#, r#"췮"#, r#"췮"#, r#"췮"#, r#"췮"#),
+        (r#"췯"#, r#"췯"#, r#"췯"#, r#"췯"#, r#"췯"#),
+        (r#"췰"#, r#"췰"#, r#"췰"#, r#"췰"#, r#"췰"#),
+        (r#"췱"#, r#"췱"#, r#"췱"#, r#"췱"#, r#"췱"#),
+        (r#"췲"#, r#"췲"#, r#"췲"#, r#"췲"#, r#"췲"#),
+        (r#"췳"#, r#"췳"#, r#"췳"#, r#"췳"#, r#"췳"#),
+        (r#"췴"#, r#"췴"#, r#"췴"#, r#"췴"#, r#"췴"#),
+        (r#"췵"#, r#"췵"#, r#"췵"#, r#"췵"#, r#"췵"#),
+        (r#"췶"#, r#"췶"#, r#"췶"#, r#"췶"#, r#"췶"#),
+        (r#"췷"#, r#"췷"#, r#"췷"#, r#"췷"#, r#"췷"#),
+        (r#"췸"#, r#"췸"#, r#"췸"#, r#"췸"#, r#"췸"#),
+        (r#"췹"#, r#"췹"#, r#"췹"#, r#"췹"#, r#"췹"#),
+        (r#"췺"#, r#"췺"#, r#"췺"#, r#"췺"#, r#"췺"#),
+        (r#"췻"#, r#"췻"#, r#"췻"#, r#"췻"#, r#"췻"#),
+        (r#"췼"#, r#"췼"#, r#"췼"#, r#"췼"#, r#"췼"#),
+        (r#"췽"#, r#"췽"#, r#"췽"#, r#"췽"#, r#"췽"#),
+        (r#"췾"#, r#"췾"#, r#"췾"#, r#"췾"#, r#"췾"#),
+        (r#"췿"#, r#"췿"#, r#"췿"#, r#"췿"#, r#"췿"#),
+        (r#"츀"#, r#"츀"#, r#"츀"#, r#"츀"#, r#"츀"#),
+        (r#"츁"#, r#"츁"#, r#"츁"#, r#"츁"#, r#"츁"#),
+        (r#"츂"#, r#"츂"#, r#"츂"#, r#"츂"#, r#"츂"#),
+        (r#"츃"#, r#"츃"#, r#"츃"#, r#"츃"#, r#"츃"#),
+        (r#"츄"#, r#"츄"#, r#"츄"#, r#"츄"#, r#"츄"#),
+        (r#"츅"#, r#"츅"#, r#"츅"#, r#"츅"#, r#"츅"#),
+        (r#"츆"#, r#"츆"#, r#"츆"#, r#"츆"#, r#"츆"#),
+        (r#"츇"#, r#"츇"#, r#"츇"#, r#"츇"#, r#"츇"#),
+        (r#"츈"#, r#"츈"#, r#"츈"#, r#"츈"#, r#"츈"#),
+        (r#"츉"#, r#"츉"#, r#"츉"#, r#"츉"#, r#"츉"#),
+        (r#"츊"#, r#"츊"#, r#"츊"#, r#"츊"#, r#"츊"#),
+        (r#"츋"#, r#"츋"#, r#"츋"#, r#"츋"#, r#"츋"#),
+        (r#"츌"#, r#"츌"#, r#"츌"#, r#"츌"#, r#"츌"#),
+        (r#"츍"#, r#"츍"#, r#"츍"#, r#"츍"#, r#"츍"#),
+        (r#"츎"#, r#"츎"#, r#"츎"#, r#"츎"#, r#"츎"#),
+        (r#"츏"#, r#"츏"#, r#"츏"#, r#"츏"#, r#"츏"#),
+        (r#"츐"#, r#"츐"#, r#"츐"#, r#"츐"#, r#"츐"#),
+        (r#"츑"#, r#"츑"#, r#"츑"#, r#"츑"#, r#"츑"#),
+        (r#"츒"#, r#"츒"#, r#"츒"#, r#"츒"#, r#"츒"#),
+        (r#"츓"#, r#"츓"#, r#"츓"#, r#"츓"#, r#"츓"#),
+        (r#"츔"#, r#"츔"#, r#"츔"#, r#"츔"#, r#"츔"#),
+        (r#"츕"#, r#"츕"#, r#"츕"#, r#"츕"#, r#"츕"#),
+        (r#"츖"#, r#"츖"#, r#"츖"#, r#"츖"#, r#"츖"#),
+        (r#"츗"#, r#"츗"#, r#"츗"#, r#"츗"#, r#"츗"#),
+        (r#"츘"#, r#"츘"#, r#"츘"#, r#"츘"#, r#"츘"#),
+        (r#"츙"#, r#"츙"#, r#"츙"#, r#"츙"#, r#"츙"#),
+        (r#"츚"#, r#"츚"#, r#"츚"#, r#"츚"#, r#"츚"#),
+        (r#"츛"#, r#"츛"#, r#"츛"#, r#"츛"#, r#"츛"#),
+        (r#"츜"#, r#"츜"#, r#"츜"#, r#"츜"#, r#"츜"#),
+        (r#"츝"#, r#"츝"#, r#"츝"#, r#"츝"#, r#"츝"#),
+        (r#"츞"#, r#"츞"#, r#"츞"#, r#"츞"#, r#"츞"#),
+        (r#"츟"#, r#"츟"#, r#"츟"#, r#"츟"#, r#"츟"#),
+        (r#"츠"#, r#"츠"#, r#"츠"#, r#"츠"#, r#"츠"#),
+        (r#"측"#, r#"측"#, r#"측"#, r#"측"#, r#"측"#),
+        (r#"츢"#, r#"츢"#, r#"츢"#, r#"츢"#, r#"츢"#),
+        (r#"츣"#, r#"츣"#, r#"츣"#, r#"츣"#, r#"츣"#),
+        (r#"츤"#, r#"츤"#, r#"츤"#, r#"츤"#, r#"츤"#),
+        (r#"츥"#, r#"츥"#, r#"츥"#, r#"츥"#, r#"츥"#),
+        (r#"츦"#, r#"츦"#, r#"츦"#, r#"츦"#, r#"츦"#),
+        (r#"츧"#, r#"츧"#, r#"츧"#, r#"츧"#, r#"츧"#),
+        (r#"츨"#, r#"츨"#, r#"츨"#, r#"츨"#, r#"츨"#),
+        (r#"츩"#, r#"츩"#, r#"츩"#, r#"츩"#, r#"츩"#),
+        (r#"츪"#, r#"츪"#, r#"츪"#, r#"츪"#, r#"츪"#),
+        (r#"츫"#, r#"츫"#, r#"츫"#, r#"츫"#, r#"츫"#),
+        (r#"츬"#, r#"츬"#, r#"츬"#, r#"츬"#, r#"츬"#),
+        (r#"츭"#, r#"츭"#, r#"츭"#, r#"츭"#, r#"츭"#),
+        (r#"츮"#, r#"츮"#, r#"츮"#, r#"츮"#, r#"츮"#),
+        (r#"츯"#, r#"츯"#, r#"츯"#, r#"츯"#, r#"츯"#),
+        (r#"츰"#, r#"츰"#, r#"츰"#, r#"츰"#, r#"츰"#),
+        (r#"츱"#, r#"츱"#, r#"츱"#, r#"츱"#, r#"츱"#),
+        (r#"츲"#, r#"츲"#, r#"츲"#, r#"츲"#, r#"츲"#),
+        (r#"츳"#, r#"츳"#, r#"츳"#, r#"츳"#, r#"츳"#),
+        (r#"츴"#, r#"츴"#, r#"츴"#, r#"츴"#, r#"츴"#),
+        (r#"층"#, r#"층"#, r#"층"#, r#"층"#, r#"층"#),
+        (r#"츶"#, r#"츶"#, r#"츶"#, r#"츶"#, r#"츶"#),
+        (r#"츷"#, r#"츷"#, r#"츷"#, r#"츷"#, r#"츷"#),
+        (r#"츸"#, r#"츸"#, r#"츸"#, r#"츸"#, r#"츸"#),
+        (r#"츹"#, r#"츹"#, r#"츹"#, r#"츹"#, r#"츹"#),
+        (r#"츺"#, r#"츺"#, r#"츺"#, r#"츺"#, r#"츺"#),
+        (r#"츻"#, r#"츻"#, r#"츻"#, r#"츻"#, r#"츻"#),
+        (r#"츼"#, r#"츼"#, r#"츼"#, r#"츼"#, r#"츼"#),
+        (r#"츽"#, r#"츽"#, r#"츽"#, r#"츽"#, r#"츽"#),
+        (r#"츾"#, r#"츾"#, r#"츾"#, r#"츾"#, r#"츾"#),
+        (r#"츿"#, r#"츿"#, r#"츿"#, r#"츿"#, r#"츿"#),
+        (r#"칀"#, r#"칀"#, r#"칀"#, r#"칀"#, r#"칀"#),
+        (r#"칁"#, r#"칁"#, r#"칁"#, r#"칁"#, r#"칁"#),
+        (r#"칂"#, r#"칂"#, r#"칂"#, r#"칂"#, r#"칂"#),
+        (r#"칃"#, r#"칃"#, r#"칃"#, r#"칃"#, r#"칃"#),
+        (r#"칄"#, r#"칄"#, r#"칄"#, r#"칄"#, r#"칄"#),
+        (r#"칅"#, r#"칅"#, r#"칅"#, r#"칅"#, r#"칅"#),
+        (r#"칆"#, r#"칆"#, r#"칆"#, r#"칆"#, r#"칆"#),
+        (r#"칇"#, r#"칇"#, r#"칇"#, r#"칇"#, r#"칇"#),
+        (r#"칈"#, r#"칈"#, r#"칈"#, r#"칈"#, r#"칈"#),
+        (r#"칉"#, r#"칉"#, r#"칉"#, r#"칉"#, r#"칉"#),
+        (r#"칊"#, r#"칊"#, r#"칊"#, r#"칊"#, r#"칊"#),
+        (r#"칋"#, r#"칋"#, r#"칋"#, r#"칋"#, r#"칋"#),
+        (r#"칌"#, r#"칌"#, r#"칌"#, r#"칌"#, r#"칌"#),
+        (r#"칍"#, r#"칍"#, r#"칍"#, r#"칍"#, r#"칍"#),
+        (r#"칎"#, r#"칎"#, r#"칎"#, r#"칎"#, r#"칎"#),
+        (r#"칏"#, r#"칏"#, r#"칏"#, r#"칏"#, r#"칏"#),
+        (r#"칐"#, r#"칐"#, r#"칐"#, r#"칐"#, r#"칐"#),
+        (r#"칑"#, r#"칑"#, r#"칑"#, r#"칑"#, r#"칑"#),
+        (r#"칒"#, r#"칒"#, r#"칒"#, r#"칒"#, r#"칒"#),
+        (r#"칓"#, r#"칓"#, r#"칓"#, r#"칓"#, r#"칓"#),
+        (r#"칔"#, r#"칔"#, r#"칔"#, r#"칔"#, r#"칔"#),
+        (r#"칕"#, r#"칕"#, r#"칕"#, r#"칕"#, r#"칕"#),
+        (r#"칖"#, r#"칖"#, r#"칖"#, r#"칖"#, r#"칖"#),
+        (r#"칗"#, r#"칗"#, r#"칗"#, r#"칗"#, r#"칗"#),
+        (r#"치"#, r#"치"#, r#"치"#, r#"치"#, r#"치"#),
+        (r#"칙"#, r#"칙"#, r#"칙"#, r#"칙"#, r#"칙"#),
+        (r#"칚"#, r#"칚"#, r#"칚"#, r#"칚"#, r#"칚"#),
+        (r#"칛"#, r#"칛"#, r#"칛"#, r#"칛"#, r#"칛"#),
+        (r#"친"#, r#"친"#, r#"친"#, r#"친"#, r#"친"#),
+        (r#"칝"#, r#"칝"#, r#"칝"#, r#"칝"#, r#"칝"#),
+        (r#"칞"#, r#"칞"#, r#"칞"#, r#"칞"#, r#"칞"#),
+        (r#"칟"#, r#"칟"#, r#"칟"#, r#"칟"#, r#"칟"#),
+        (r#"칠"#, r#"칠"#, r#"칠"#, r#"칠"#, r#"칠"#),
+        (r#"칡"#, r#"칡"#, r#"칡"#, r#"칡"#, r#"칡"#),
+        (r#"칢"#, r#"칢"#, r#"칢"#, r#"칢"#, r#"칢"#),
+        (r#"칣"#, r#"칣"#, r#"칣"#, r#"칣"#, r#"칣"#),
+        (r#"칤"#, r#"칤"#, r#"칤"#, r#"칤"#, r#"칤"#),
+        (r#"칥"#, r#"칥"#, r#"칥"#, r#"칥"#, r#"칥"#),
+        (r#"칦"#, r#"칦"#, r#"칦"#, r#"칦"#, r#"칦"#),
+        (r#"칧"#, r#"칧"#, r#"칧"#, r#"칧"#, r#"칧"#),
+        (r#"침"#, r#"침"#, r#"침"#, r#"침"#, r#"침"#),
+        (r#"칩"#, r#"칩"#, r#"칩"#, r#"칩"#, r#"칩"#),
+        (r#"칪"#, r#"칪"#, r#"칪"#, r#"칪"#, r#"칪"#),
+        (r#"칫"#, r#"칫"#, r#"칫"#, r#"칫"#, r#"칫"#),
+        (r#"칬"#, r#"칬"#, r#"칬"#, r#"칬"#, r#"칬"#),
+        (r#"칭"#, r#"칭"#, r#"칭"#, r#"칭"#, r#"칭"#),
+        (r#"칮"#, r#"칮"#, r#"칮"#, r#"칮"#, r#"칮"#),
+        (r#"칯"#, r#"칯"#, r#"칯"#, r#"칯"#, r#"칯"#),
+        (r#"칰"#, r#"칰"#, r#"칰"#, r#"칰"#, r#"칰"#),
+        (r#"칱"#, r#"칱"#, r#"칱"#, r#"칱"#, r#"칱"#),
+        (r#"칲"#, r#"칲"#, r#"칲"#, r#"칲"#, r#"칲"#),
+        (r#"칳"#, r#"칳"#, r#"칳"#, r#"칳"#, r#"칳"#),
+        (r#"카"#, r#"카"#, r#"카"#, r#"카"#, r#"카"#),
+        (r#"칵"#, r#"칵"#, r#"칵"#, r#"칵"#, r#"칵"#),
+        (r#"칶"#, r#"칶"#, r#"칶"#, r#"칶"#, r#"칶"#),
+        (r#"칷"#, r#"칷"#, r#"칷"#, r#"칷"#, r#"칷"#),
+        (r#"칸"#, r#"칸"#, r#"칸"#, r#"칸"#, r#"칸"#),
+        (r#"칹"#, r#"칹"#, r#"칹"#, r#"칹"#, r#"칹"#),
+        (r#"칺"#, r#"칺"#, r#"칺"#, r#"칺"#, r#"칺"#),
+        (r#"칻"#, r#"칻"#, r#"칻"#, r#"칻"#, r#"칻"#),
+        (r#"칼"#, r#"칼"#, r#"칼"#, r#"칼"#, r#"칼"#),
+        (r#"칽"#, r#"칽"#, r#"칽"#, r#"칽"#, r#"칽"#),
+        (r#"칾"#, r#"칾"#, r#"칾"#, r#"칾"#, r#"칾"#),
+        (r#"칿"#, r#"칿"#, r#"칿"#, r#"칿"#, r#"칿"#),
+        (r#"캀"#, r#"캀"#, r#"캀"#, r#"캀"#, r#"캀"#),
+        (r#"캁"#, r#"캁"#, r#"캁"#, r#"캁"#, r#"캁"#),
+        (r#"캂"#, r#"캂"#, r#"캂"#, r#"캂"#, r#"캂"#),
+        (r#"캃"#, r#"캃"#, r#"캃"#, r#"캃"#, r#"캃"#),
+        (r#"캄"#, r#"캄"#, r#"캄"#, r#"캄"#, r#"캄"#),
+        (r#"캅"#, r#"캅"#, r#"캅"#, r#"캅"#, r#"캅"#),
+        (r#"캆"#, r#"캆"#, r#"캆"#, r#"캆"#, r#"캆"#),
+        (r#"캇"#, r#"캇"#, r#"캇"#, r#"캇"#, r#"캇"#),
+        (r#"캈"#, r#"캈"#, r#"캈"#, r#"캈"#, r#"캈"#),
+        (r#"캉"#, r#"캉"#, r#"캉"#, r#"캉"#, r#"캉"#),
+        (r#"캊"#, r#"캊"#, r#"캊"#, r#"캊"#, r#"캊"#),
+        (r#"캋"#, r#"캋"#, r#"캋"#, r#"캋"#, r#"캋"#),
+        (r#"캌"#, r#"캌"#, r#"캌"#, r#"캌"#, r#"캌"#),
+        (r#"캍"#, r#"캍"#, r#"캍"#, r#"캍"#, r#"캍"#),
+        (r#"캎"#, r#"캎"#, r#"캎"#, r#"캎"#, r#"캎"#),
+        (r#"캏"#, r#"캏"#, r#"캏"#, r#"캏"#, r#"캏"#),
+        (r#"캐"#, r#"캐"#, r#"캐"#, r#"캐"#, r#"캐"#),
+        (r#"캑"#, r#"캑"#, r#"캑"#, r#"캑"#, r#"캑"#),
+        (r#"캒"#, r#"캒"#, r#"캒"#, r#"캒"#, r#"캒"#),
+        (r#"캓"#, r#"캓"#, r#"캓"#, r#"캓"#, r#"캓"#),
+        (r#"캔"#, r#"캔"#, r#"캔"#, r#"캔"#, r#"캔"#),
+        (r#"캕"#, r#"캕"#, r#"캕"#, r#"캕"#, r#"캕"#),
+        (r#"캖"#, r#"캖"#, r#"캖"#, r#"캖"#, r#"캖"#),
+        (r#"캗"#, r#"캗"#, r#"캗"#, r#"캗"#, r#"캗"#),
+        (r#"캘"#, r#"캘"#, r#"캘"#, r#"캘"#, r#"캘"#),
+        (r#"캙"#, r#"캙"#, r#"캙"#, r#"캙"#, r#"캙"#),
+        (r#"캚"#, r#"캚"#, r#"캚"#, r#"캚"#, r#"캚"#),
+        (r#"캛"#, r#"캛"#, r#"캛"#, r#"캛"#, r#"캛"#),
+        (r#"캜"#, r#"캜"#, r#"캜"#, r#"캜"#, r#"캜"#),
+        (r#"캝"#, r#"캝"#, r#"캝"#, r#"캝"#, r#"캝"#),
+        (r#"캞"#, r#"캞"#, r#"캞"#, r#"캞"#, r#"캞"#),
+        (r#"캟"#, r#"캟"#, r#"캟"#, r#"캟"#, r#"캟"#),
+        (r#"캠"#, r#"캠"#, r#"캠"#, r#"캠"#, r#"캠"#),
+        (r#"캡"#, r#"캡"#, r#"캡"#, r#"캡"#, r#"캡"#),
+        (r#"캢"#, r#"캢"#, r#"캢"#, r#"캢"#, r#"캢"#),
+        (r#"캣"#, r#"캣"#, r#"캣"#, r#"캣"#, r#"캣"#),
+        (r#"캤"#, r#"캤"#, r#"캤"#, r#"캤"#, r#"캤"#),
+        (r#"캥"#, r#"캥"#, r#"캥"#, r#"캥"#, r#"캥"#),
+        (r#"캦"#, r#"캦"#, r#"캦"#, r#"캦"#, r#"캦"#),
+        (r#"캧"#, r#"캧"#, r#"캧"#, r#"캧"#, r#"캧"#),
+        (r#"캨"#, r#"캨"#, r#"캨"#, r#"캨"#, r#"캨"#),
+        (r#"캩"#, r#"캩"#, r#"캩"#, r#"캩"#, r#"캩"#),
+        (r#"캪"#, r#"캪"#, r#"캪"#, r#"캪"#, r#"캪"#),
+        (r#"캫"#, r#"캫"#, r#"캫"#, r#"캫"#, r#"캫"#),
+        (r#"캬"#, r#"캬"#, r#"캬"#, r#"캬"#, r#"캬"#),
+        (r#"캭"#, r#"캭"#, r#"캭"#, r#"캭"#, r#"캭"#),
+        (r#"캮"#, r#"캮"#, r#"캮"#, r#"캮"#, r#"캮"#),
+        (r#"캯"#, r#"캯"#, r#"캯"#, r#"캯"#, r#"캯"#),
+        (r#"캰"#, r#"캰"#, r#"캰"#, r#"캰"#, r#"캰"#),
+        (r#"캱"#, r#"캱"#, r#"캱"#, r#"캱"#, r#"캱"#),
+        (r#"캲"#, r#"캲"#, r#"캲"#, r#"캲"#, r#"캲"#),
+        (r#"캳"#, r#"캳"#, r#"캳"#, r#"캳"#, r#"캳"#),
+        (r#"캴"#, r#"캴"#, r#"캴"#, r#"캴"#, r#"캴"#),
+        (r#"캵"#, r#"캵"#, r#"캵"#, r#"캵"#, r#"캵"#),
+        (r#"캶"#, r#"캶"#, r#"캶"#, r#"캶"#, r#"캶"#),
+        (r#"캷"#, r#"캷"#, r#"캷"#, r#"캷"#, r#"캷"#),
+        (r#"캸"#, r#"캸"#, r#"캸"#, r#"캸"#, r#"캸"#),
+        (r#"캹"#, r#"캹"#, r#"캹"#, r#"캹"#, r#"캹"#),
+        (r#"캺"#, r#"캺"#, r#"캺"#, r#"캺"#, r#"캺"#),
+        (r#"캻"#, r#"캻"#, r#"캻"#, r#"캻"#, r#"캻"#),
+        (r#"캼"#, r#"캼"#, r#"캼"#, r#"캼"#, r#"캼"#),
+        (r#"캽"#, r#"캽"#, r#"캽"#, r#"캽"#, r#"캽"#),
+        (r#"캾"#, r#"캾"#, r#"캾"#, r#"캾"#, r#"캾"#),
+        (r#"캿"#, r#"캿"#, r#"캿"#, r#"캿"#, r#"캿"#),
+        (r#"컀"#, r#"컀"#, r#"컀"#, r#"컀"#, r#"컀"#),
+        (r#"컁"#, r#"컁"#, r#"컁"#, r#"컁"#, r#"컁"#),
+        (r#"컂"#, r#"컂"#, r#"컂"#, r#"컂"#, r#"컂"#),
+        (r#"컃"#, r#"컃"#, r#"컃"#, r#"컃"#, r#"컃"#),
+        (r#"컄"#, r#"컄"#, r#"컄"#, r#"컄"#, r#"컄"#),
+        (r#"컅"#, r#"컅"#, r#"컅"#, r#"컅"#, r#"컅"#),
+        (r#"컆"#, r#"컆"#, r#"컆"#, r#"컆"#, r#"컆"#),
+        (r#"컇"#, r#"컇"#, r#"컇"#, r#"컇"#, r#"컇"#),
+        (r#"컈"#, r#"컈"#, r#"컈"#, r#"컈"#, r#"컈"#),
+        (r#"컉"#, r#"컉"#, r#"컉"#, r#"컉"#, r#"컉"#),
+        (r#"컊"#, r#"컊"#, r#"컊"#, r#"컊"#, r#"컊"#),
+        (r#"컋"#, r#"컋"#, r#"컋"#, r#"컋"#, r#"컋"#),
+        (r#"컌"#, r#"컌"#, r#"컌"#, r#"컌"#, r#"컌"#),
+        (r#"컍"#, r#"컍"#, r#"컍"#, r#"컍"#, r#"컍"#),
+        (r#"컎"#, r#"컎"#, r#"컎"#, r#"컎"#, r#"컎"#),
+        (r#"컏"#, r#"컏"#, r#"컏"#, r#"컏"#, r#"컏"#),
+        (r#"컐"#, r#"컐"#, r#"컐"#, r#"컐"#, r#"컐"#),
+        (r#"컑"#, r#"컑"#, r#"컑"#, r#"컑"#, r#"컑"#),
+        (r#"컒"#, r#"컒"#, r#"컒"#, r#"컒"#, r#"컒"#),
+        (r#"컓"#, r#"컓"#, r#"컓"#, r#"컓"#, r#"컓"#),
+        (r#"컔"#, r#"컔"#, r#"컔"#, r#"컔"#, r#"컔"#),
+        (r#"컕"#, r#"컕"#, r#"컕"#, r#"컕"#, r#"컕"#),
+        (r#"컖"#, r#"컖"#, r#"컖"#, r#"컖"#, r#"컖"#),
+        (r#"컗"#, r#"컗"#, r#"컗"#, r#"컗"#, r#"컗"#),
+        (r#"컘"#, r#"컘"#, r#"컘"#, r#"컘"#, r#"컘"#),
+        (r#"컙"#, r#"컙"#, r#"컙"#, r#"컙"#, r#"컙"#),
+        (r#"컚"#, r#"컚"#, r#"컚"#, r#"컚"#, r#"컚"#),
+        (r#"컛"#, r#"컛"#, r#"컛"#, r#"컛"#, r#"컛"#),
+        (r#"컜"#, r#"컜"#, r#"컜"#, r#"컜"#, r#"컜"#),
+        (r#"컝"#, r#"컝"#, r#"컝"#, r#"컝"#, r#"컝"#),
+        (r#"컞"#, r#"컞"#, r#"컞"#, r#"컞"#, r#"컞"#),
+        (r#"컟"#, r#"컟"#, r#"컟"#, r#"컟"#, r#"컟"#),
+        (r#"컠"#, r#"컠"#, r#"컠"#, r#"컠"#, r#"컠"#),
+        (r#"컡"#, r#"컡"#, r#"컡"#, r#"컡"#, r#"컡"#),
+        (r#"컢"#, r#"컢"#, r#"컢"#, r#"컢"#, r#"컢"#),
+        (r#"컣"#, r#"컣"#, r#"컣"#, r#"컣"#, r#"컣"#),
+        (r#"커"#, r#"커"#, r#"커"#, r#"커"#, r#"커"#),
+        (r#"컥"#, r#"컥"#, r#"컥"#, r#"컥"#, r#"컥"#),
+        (r#"컦"#, r#"컦"#, r#"컦"#, r#"컦"#, r#"컦"#),
+        (r#"컧"#, r#"컧"#, r#"컧"#, r#"컧"#, r#"컧"#),
+        (r#"컨"#, r#"컨"#, r#"컨"#, r#"컨"#, r#"컨"#),
+        (r#"컩"#, r#"컩"#, r#"컩"#, r#"컩"#, r#"컩"#),
+        (r#"컪"#, r#"컪"#, r#"컪"#, r#"컪"#, r#"컪"#),
+        (r#"컫"#, r#"컫"#, r#"컫"#, r#"컫"#, r#"컫"#),
+        (r#"컬"#, r#"컬"#, r#"컬"#, r#"컬"#, r#"컬"#),
+        (r#"컭"#, r#"컭"#, r#"컭"#, r#"컭"#, r#"컭"#),
+        (r#"컮"#, r#"컮"#, r#"컮"#, r#"컮"#, r#"컮"#),
+        (r#"컯"#, r#"컯"#, r#"컯"#, r#"컯"#, r#"컯"#),
+        (r#"컰"#, r#"컰"#, r#"컰"#, r#"컰"#, r#"컰"#),
+        (r#"컱"#, r#"컱"#, r#"컱"#, r#"컱"#, r#"컱"#),
+        (r#"컲"#, r#"컲"#, r#"컲"#, r#"컲"#, r#"컲"#),
+        (r#"컳"#, r#"컳"#, r#"컳"#, r#"컳"#, r#"컳"#),
+        (r#"컴"#, r#"컴"#, r#"컴"#, r#"컴"#, r#"컴"#),
+        (r#"컵"#, r#"컵"#, r#"컵"#, r#"컵"#, r#"컵"#),
+        (r#"컶"#, r#"컶"#, r#"컶"#, r#"컶"#, r#"컶"#),
+        (r#"컷"#, r#"컷"#, r#"컷"#, r#"컷"#, r#"컷"#),
+        (r#"컸"#, r#"컸"#, r#"컸"#, r#"컸"#, r#"컸"#),
+        (r#"컹"#, r#"컹"#, r#"컹"#, r#"컹"#, r#"컹"#),
+        (r#"컺"#, r#"컺"#, r#"컺"#, r#"컺"#, r#"컺"#),
+        (r#"컻"#, r#"컻"#, r#"컻"#, r#"컻"#, r#"컻"#),
+        (r#"컼"#, r#"컼"#, r#"컼"#, r#"컼"#, r#"컼"#),
+        (r#"컽"#, r#"컽"#, r#"컽"#, r#"컽"#, r#"컽"#),
+        (r#"컾"#, r#"컾"#, r#"컾"#, r#"컾"#, r#"컾"#),
+        (r#"컿"#, r#"컿"#, r#"컿"#, r#"컿"#, r#"컿"#),
+        (r#"케"#, r#"케"#, r#"케"#, r#"케"#, r#"케"#),
+        (r#"켁"#, r#"켁"#, r#"켁"#, r#"켁"#, r#"켁"#),
+        (r#"켂"#, r#"켂"#, r#"켂"#, r#"켂"#, r#"켂"#),
+        (r#"켃"#, r#"켃"#, r#"켃"#, r#"켃"#, r#"켃"#),
+        (r#"켄"#, r#"켄"#, r#"켄"#, r#"켄"#, r#"켄"#),
+        (r#"켅"#, r#"켅"#, r#"켅"#, r#"켅"#, r#"켅"#),
+        (r#"켆"#, r#"켆"#, r#"켆"#, r#"켆"#, r#"켆"#),
+        (r#"켇"#, r#"켇"#, r#"켇"#, r#"켇"#, r#"켇"#),
+        (r#"켈"#, r#"켈"#, r#"켈"#, r#"켈"#, r#"켈"#),
+        (r#"켉"#, r#"켉"#, r#"켉"#, r#"켉"#, r#"켉"#),
+        (r#"켊"#, r#"켊"#, r#"켊"#, r#"켊"#, r#"켊"#),
+        (r#"켋"#, r#"켋"#, r#"켋"#, r#"켋"#, r#"켋"#),
+        (r#"켌"#, r#"켌"#, r#"켌"#, r#"켌"#, r#"켌"#),
+        (r#"켍"#, r#"켍"#, r#"켍"#, r#"켍"#, r#"켍"#),
+        (r#"켎"#, r#"켎"#, r#"켎"#, r#"켎"#, r#"켎"#),
+        (r#"켏"#, r#"켏"#, r#"켏"#, r#"켏"#, r#"켏"#),
+        (r#"켐"#, r#"켐"#, r#"켐"#, r#"켐"#, r#"켐"#),
+        (r#"켑"#, r#"켑"#, r#"켑"#, r#"켑"#, r#"켑"#),
+        (r#"켒"#, r#"켒"#, r#"켒"#, r#"켒"#, r#"켒"#),
+        (r#"켓"#, r#"켓"#, r#"켓"#, r#"켓"#, r#"켓"#),
+        (r#"켔"#, r#"켔"#, r#"켔"#, r#"켔"#, r#"켔"#),
+        (r#"켕"#, r#"켕"#, r#"켕"#, r#"켕"#, r#"켕"#),
+        (r#"켖"#, r#"켖"#, r#"켖"#, r#"켖"#, r#"켖"#),
+        (r#"켗"#, r#"켗"#, r#"켗"#, r#"켗"#, r#"켗"#),
+        (r#"켘"#, r#"켘"#, r#"켘"#, r#"켘"#, r#"켘"#),
+        (r#"켙"#, r#"켙"#, r#"켙"#, r#"켙"#, r#"켙"#),
+        (r#"켚"#, r#"켚"#, r#"켚"#, r#"켚"#, r#"켚"#),
+        (r#"켛"#, r#"켛"#, r#"켛"#, r#"켛"#, r#"켛"#),
+        (r#"켜"#, r#"켜"#, r#"켜"#, r#"켜"#, r#"켜"#),
+        (r#"켝"#, r#"켝"#, r#"켝"#, r#"켝"#, r#"켝"#),
+        (r#"켞"#, r#"켞"#, r#"켞"#, r#"켞"#, r#"켞"#),
+        (r#"켟"#, r#"켟"#, r#"켟"#, r#"켟"#, r#"켟"#),
+        (r#"켠"#, r#"켠"#, r#"켠"#, r#"켠"#, r#"켠"#),
+        (r#"켡"#, r#"켡"#, r#"켡"#, r#"켡"#, r#"켡"#),
+        (r#"켢"#, r#"켢"#, r#"켢"#, r#"켢"#, r#"켢"#),
+        (r#"켣"#, r#"켣"#, r#"켣"#, r#"켣"#, r#"켣"#),
+        (r#"켤"#, r#"켤"#, r#"켤"#, r#"켤"#, r#"켤"#),
+        (r#"켥"#, r#"켥"#, r#"켥"#, r#"켥"#, r#"켥"#),
+        (r#"켦"#, r#"켦"#, r#"켦"#, r#"켦"#, r#"켦"#),
+        (r#"켧"#, r#"켧"#, r#"켧"#, r#"켧"#, r#"켧"#),
+        (r#"켨"#, r#"켨"#, r#"켨"#, r#"켨"#, r#"켨"#),
+        (r#"켩"#, r#"켩"#, r#"켩"#, r#"켩"#, r#"켩"#),
+        (r#"켪"#, r#"켪"#, r#"켪"#, r#"켪"#, r#"켪"#),
+        (r#"켫"#, r#"켫"#, r#"켫"#, r#"켫"#, r#"켫"#),
+        (r#"켬"#, r#"켬"#, r#"켬"#, r#"켬"#, r#"켬"#),
+        (r#"켭"#, r#"켭"#, r#"켭"#, r#"켭"#, r#"켭"#),
+        (r#"켮"#, r#"켮"#, r#"켮"#, r#"켮"#, r#"켮"#),
+        (r#"켯"#, r#"켯"#, r#"켯"#, r#"켯"#, r#"켯"#),
+        (r#"켰"#, r#"켰"#, r#"켰"#, r#"켰"#, r#"켰"#),
+        (r#"켱"#, r#"켱"#, r#"켱"#, r#"켱"#, r#"켱"#),
+        (r#"켲"#, r#"켲"#, r#"켲"#, r#"켲"#, r#"켲"#),
+        (r#"켳"#, r#"켳"#, r#"켳"#, r#"켳"#, r#"켳"#),
+        (r#"켴"#, r#"켴"#, r#"켴"#, r#"켴"#, r#"켴"#),
+        (r#"켵"#, r#"켵"#, r#"켵"#, r#"켵"#, r#"켵"#),
+        (r#"켶"#, r#"켶"#, r#"켶"#, r#"켶"#, r#"켶"#),
+        (r#"켷"#, r#"켷"#, r#"켷"#, r#"켷"#, r#"켷"#),
+        (r#"켸"#, r#"켸"#, r#"켸"#, r#"켸"#, r#"켸"#),
+        (r#"켹"#, r#"켹"#, r#"켹"#, r#"켹"#, r#"켹"#),
+        (r#"켺"#, r#"켺"#, r#"켺"#, r#"켺"#, r#"켺"#),
+        (r#"켻"#, r#"켻"#, r#"켻"#, r#"켻"#, r#"켻"#),
+        (r#"켼"#, r#"켼"#, r#"켼"#, r#"켼"#, r#"켼"#),
+        (r#"켽"#, r#"켽"#, r#"켽"#, r#"켽"#, r#"켽"#),
+        (r#"켾"#, r#"켾"#, r#"켾"#, r#"켾"#, r#"켾"#),
+        (r#"켿"#, r#"켿"#, r#"켿"#, r#"켿"#, r#"켿"#),
+        (r#"콀"#, r#"콀"#, r#"콀"#, r#"콀"#, r#"콀"#),
+        (r#"콁"#, r#"콁"#, r#"콁"#, r#"콁"#, r#"콁"#),
+        (r#"콂"#, r#"콂"#, r#"콂"#, r#"콂"#, r#"콂"#),
+        (r#"콃"#, r#"콃"#, r#"콃"#, r#"콃"#, r#"콃"#),
+        (r#"콄"#, r#"콄"#, r#"콄"#, r#"콄"#, r#"콄"#),
+        (r#"콅"#, r#"콅"#, r#"콅"#, r#"콅"#, r#"콅"#),
+        (r#"콆"#, r#"콆"#, r#"콆"#, r#"콆"#, r#"콆"#),
+        (r#"콇"#, r#"콇"#, r#"콇"#, r#"콇"#, r#"콇"#),
+        (r#"콈"#, r#"콈"#, r#"콈"#, r#"콈"#, r#"콈"#),
+        (r#"콉"#, r#"콉"#, r#"콉"#, r#"콉"#, r#"콉"#),
+        (r#"콊"#, r#"콊"#, r#"콊"#, r#"콊"#, r#"콊"#),
+        (r#"콋"#, r#"콋"#, r#"콋"#, r#"콋"#, r#"콋"#),
+        (r#"콌"#, r#"콌"#, r#"콌"#, r#"콌"#, r#"콌"#),
+        (r#"콍"#, r#"콍"#, r#"콍"#, r#"콍"#, r#"콍"#),
+        (r#"콎"#, r#"콎"#, r#"콎"#, r#"콎"#, r#"콎"#),
+        (r#"콏"#, r#"콏"#, r#"콏"#, r#"콏"#, r#"콏"#),
+        (r#"콐"#, r#"콐"#, r#"콐"#, r#"콐"#, r#"콐"#),
+        (r#"콑"#, r#"콑"#, r#"콑"#, r#"콑"#, r#"콑"#),
+        (r#"콒"#, r#"콒"#, r#"콒"#, r#"콒"#, r#"콒"#),
+        (r#"콓"#, r#"콓"#, r#"콓"#, r#"콓"#, r#"콓"#),
+        (r#"코"#, r#"코"#, r#"코"#, r#"코"#, r#"코"#),
+        (r#"콕"#, r#"콕"#, r#"콕"#, r#"콕"#, r#"콕"#),
+        (r#"콖"#, r#"콖"#, r#"콖"#, r#"콖"#, r#"콖"#),
+        (r#"콗"#, r#"콗"#, r#"콗"#, r#"콗"#, r#"콗"#),
+        (r#"콘"#, r#"콘"#, r#"콘"#, r#"콘"#, r#"콘"#),
+        (r#"콙"#, r#"콙"#, r#"콙"#, r#"콙"#, r#"콙"#),
+        (r#"콚"#, r#"콚"#, r#"콚"#, r#"콚"#, r#"콚"#),
+        (r#"콛"#, r#"콛"#, r#"콛"#, r#"콛"#, r#"콛"#),
+        (r#"콜"#, r#"콜"#, r#"콜"#, r#"콜"#, r#"콜"#),
+        (r#"콝"#, r#"콝"#, r#"콝"#, r#"콝"#, r#"콝"#),
+        (r#"콞"#, r#"콞"#, r#"콞"#, r#"콞"#, r#"콞"#),
+        (r#"콟"#, r#"콟"#, r#"콟"#, r#"콟"#, r#"콟"#),
+        (r#"콠"#, r#"콠"#, r#"콠"#, r#"콠"#, r#"콠"#),
+        (r#"콡"#, r#"콡"#, r#"콡"#, r#"콡"#, r#"콡"#),
+        (r#"콢"#, r#"콢"#, r#"콢"#, r#"콢"#, r#"콢"#),
+        (r#"콣"#, r#"콣"#, r#"콣"#, r#"콣"#, r#"콣"#),
+        (r#"콤"#, r#"콤"#, r#"콤"#, r#"콤"#, r#"콤"#),
+        (r#"콥"#, r#"콥"#, r#"콥"#, r#"콥"#, r#"콥"#),
+        (r#"콦"#, r#"콦"#, r#"콦"#, r#"콦"#, r#"콦"#),
+        (r#"콧"#, r#"콧"#, r#"콧"#, r#"콧"#, r#"콧"#),
+        (r#"콨"#, r#"콨"#, r#"콨"#, r#"콨"#, r#"콨"#),
+        (r#"콩"#, r#"콩"#, r#"콩"#, r#"콩"#, r#"콩"#),
+        (r#"콪"#, r#"콪"#, r#"콪"#, r#"콪"#, r#"콪"#),
+        (r#"콫"#, r#"콫"#, r#"콫"#, r#"콫"#, r#"콫"#),
+        (r#"콬"#, r#"콬"#, r#"콬"#, r#"콬"#, r#"콬"#),
+        (r#"콭"#, r#"콭"#, r#"콭"#, r#"콭"#, r#"콭"#),
+        (r#"콮"#, r#"콮"#, r#"콮"#, r#"콮"#, r#"콮"#),
+        (r#"콯"#, r#"콯"#, r#"콯"#, r#"콯"#, r#"콯"#),
+        (r#"콰"#, r#"콰"#, r#"콰"#, r#"콰"#, r#"콰"#),
+        (r#"콱"#, r#"콱"#, r#"콱"#, r#"콱"#, r#"콱"#),
+        (r#"콲"#, r#"콲"#, r#"콲"#, r#"콲"#, r#"콲"#),
+        (r#"콳"#, r#"콳"#, r#"콳"#, r#"콳"#, r#"콳"#),
+        (r#"콴"#, r#"콴"#, r#"콴"#, r#"콴"#, r#"콴"#),
+        (r#"콵"#, r#"콵"#, r#"콵"#, r#"콵"#, r#"콵"#),
+        (r#"콶"#, r#"콶"#, r#"콶"#, r#"콶"#, r#"콶"#),
+        (r#"콷"#, r#"콷"#, r#"콷"#, r#"콷"#, r#"콷"#),
+        (r#"콸"#, r#"콸"#, r#"콸"#, r#"콸"#, r#"콸"#),
+        (r#"콹"#, r#"콹"#, r#"콹"#, r#"콹"#, r#"콹"#),
+        (r#"콺"#, r#"콺"#, r#"콺"#, r#"콺"#, r#"콺"#),
+        (r#"콻"#, r#"콻"#, r#"콻"#, r#"콻"#, r#"콻"#),
+        (r#"콼"#, r#"콼"#, r#"콼"#, r#"콼"#, r#"콼"#),
+        (r#"콽"#, r#"콽"#, r#"콽"#, r#"콽"#, r#"콽"#),
+        (r#"콾"#, r#"콾"#, r#"콾"#, r#"콾"#, r#"콾"#),
+        (r#"콿"#, r#"콿"#, r#"콿"#, r#"콿"#, r#"콿"#),
+        (r#"쾀"#, r#"쾀"#, r#"쾀"#, r#"쾀"#, r#"쾀"#),
+        (r#"쾁"#, r#"쾁"#, r#"쾁"#, r#"쾁"#, r#"쾁"#),
+        (r#"쾂"#, r#"쾂"#, r#"쾂"#, r#"쾂"#, r#"쾂"#),
+        (r#"쾃"#, r#"쾃"#, r#"쾃"#, r#"쾃"#, r#"쾃"#),
+        (r#"쾄"#, r#"쾄"#, r#"쾄"#, r#"쾄"#, r#"쾄"#),
+        (r#"쾅"#, r#"쾅"#, r#"쾅"#, r#"쾅"#, r#"쾅"#),
+        (r#"쾆"#, r#"쾆"#, r#"쾆"#, r#"쾆"#, r#"쾆"#),
+        (r#"쾇"#, r#"쾇"#, r#"쾇"#, r#"쾇"#, r#"쾇"#),
+        (r#"쾈"#, r#"쾈"#, r#"쾈"#, r#"쾈"#, r#"쾈"#),
+        (r#"쾉"#, r#"쾉"#, r#"쾉"#, r#"쾉"#, r#"쾉"#),
+        (r#"쾊"#, r#"쾊"#, r#"쾊"#, r#"쾊"#, r#"쾊"#),
+        (r#"쾋"#, r#"쾋"#, r#"쾋"#, r#"쾋"#, r#"쾋"#),
+        (r#"쾌"#, r#"쾌"#, r#"쾌"#, r#"쾌"#, r#"쾌"#),
+        (r#"쾍"#, r#"쾍"#, r#"쾍"#, r#"쾍"#, r#"쾍"#),
+        (r#"쾎"#, r#"쾎"#, r#"쾎"#, r#"쾎"#, r#"쾎"#),
+        (r#"쾏"#, r#"쾏"#, r#"쾏"#, r#"쾏"#, r#"쾏"#),
+        (r#"쾐"#, r#"쾐"#, r#"쾐"#, r#"쾐"#, r#"쾐"#),
+        (r#"쾑"#, r#"쾑"#, r#"쾑"#, r#"쾑"#, r#"쾑"#),
+        (r#"쾒"#, r#"쾒"#, r#"쾒"#, r#"쾒"#, r#"쾒"#),
+        (r#"쾓"#, r#"쾓"#, r#"쾓"#, r#"쾓"#, r#"쾓"#),
+        (r#"쾔"#, r#"쾔"#, r#"쾔"#, r#"쾔"#, r#"쾔"#),
+        (r#"쾕"#, r#"쾕"#, r#"쾕"#, r#"쾕"#, r#"쾕"#),
+        (r#"쾖"#, r#"쾖"#, r#"쾖"#, r#"쾖"#, r#"쾖"#),
+        (r#"쾗"#, r#"쾗"#, r#"쾗"#, r#"쾗"#, r#"쾗"#),
+        (r#"쾘"#, r#"쾘"#, r#"쾘"#, r#"쾘"#, r#"쾘"#),
+        (r#"쾙"#, r#"쾙"#, r#"쾙"#, r#"쾙"#, r#"쾙"#),
+        (r#"쾚"#, r#"쾚"#, r#"쾚"#, r#"쾚"#, r#"쾚"#),
+        (r#"쾛"#, r#"쾛"#, r#"쾛"#, r#"쾛"#, r#"쾛"#),
+        (r#"쾜"#, r#"쾜"#, r#"쾜"#, r#"쾜"#, r#"쾜"#),
+        (r#"쾝"#, r#"쾝"#, r#"쾝"#, r#"쾝"#, r#"쾝"#),
+        (r#"쾞"#, r#"쾞"#, r#"쾞"#, r#"쾞"#, r#"쾞"#),
+        (r#"쾟"#, r#"쾟"#, r#"쾟"#, r#"쾟"#, r#"쾟"#),
+        (r#"쾠"#, r#"쾠"#, r#"쾠"#, r#"쾠"#, r#"쾠"#),
+        (r#"쾡"#, r#"쾡"#, r#"쾡"#, r#"쾡"#, r#"쾡"#),
+        (r#"쾢"#, r#"쾢"#, r#"쾢"#, r#"쾢"#, r#"쾢"#),
+        (r#"쾣"#, r#"쾣"#, r#"쾣"#, r#"쾣"#, r#"쾣"#),
+        (r#"쾤"#, r#"쾤"#, r#"쾤"#, r#"쾤"#, r#"쾤"#),
+        (r#"쾥"#, r#"쾥"#, r#"쾥"#, r#"쾥"#, r#"쾥"#),
+        (r#"쾦"#, r#"쾦"#, r#"쾦"#, r#"쾦"#, r#"쾦"#),
+        (r#"쾧"#, r#"쾧"#, r#"쾧"#, r#"쾧"#, r#"쾧"#),
+        (r#"쾨"#, r#"쾨"#, r#"쾨"#, r#"쾨"#, r#"쾨"#),
+        (r#"쾩"#, r#"쾩"#, r#"쾩"#, r#"쾩"#, r#"쾩"#),
+        (r#"쾪"#, r#"쾪"#, r#"쾪"#, r#"쾪"#, r#"쾪"#),
+        (r#"쾫"#, r#"쾫"#, r#"쾫"#, r#"쾫"#, r#"쾫"#),
+        (r#"쾬"#, r#"쾬"#, r#"쾬"#, r#"쾬"#, r#"쾬"#),
+        (r#"쾭"#, r#"쾭"#, r#"쾭"#, r#"쾭"#, r#"쾭"#),
+        (r#"쾮"#, r#"쾮"#, r#"쾮"#, r#"쾮"#, r#"쾮"#),
+        (r#"쾯"#, r#"쾯"#, r#"쾯"#, r#"쾯"#, r#"쾯"#),
+        (r#"쾰"#, r#"쾰"#, r#"쾰"#, r#"쾰"#, r#"쾰"#),
+        (r#"쾱"#, r#"쾱"#, r#"쾱"#, r#"쾱"#, r#"쾱"#),
+        (r#"쾲"#, r#"쾲"#, r#"쾲"#, r#"쾲"#, r#"쾲"#),
+        (r#"쾳"#, r#"쾳"#, r#"쾳"#, r#"쾳"#, r#"쾳"#),
+        (r#"쾴"#, r#"쾴"#, r#"쾴"#, r#"쾴"#, r#"쾴"#),
+        (r#"쾵"#, r#"쾵"#, r#"쾵"#, r#"쾵"#, r#"쾵"#),
+        (r#"쾶"#, r#"쾶"#, r#"쾶"#, r#"쾶"#, r#"쾶"#),
+        (r#"쾷"#, r#"쾷"#, r#"쾷"#, r#"쾷"#, r#"쾷"#),
+        (r#"쾸"#, r#"쾸"#, r#"쾸"#, r#"쾸"#, r#"쾸"#),
+        (r#"쾹"#, r#"쾹"#, r#"쾹"#, r#"쾹"#, r#"쾹"#),
+        (r#"쾺"#, r#"쾺"#, r#"쾺"#, r#"쾺"#, r#"쾺"#),
+        (r#"쾻"#, r#"쾻"#, r#"쾻"#, r#"쾻"#, r#"쾻"#),
+        (r#"쾼"#, r#"쾼"#, r#"쾼"#, r#"쾼"#, r#"쾼"#),
+        (r#"쾽"#, r#"쾽"#, r#"쾽"#, r#"쾽"#, r#"쾽"#),
+        (r#"쾾"#, r#"쾾"#, r#"쾾"#, r#"쾾"#, r#"쾾"#),
+        (r#"쾿"#, r#"쾿"#, r#"쾿"#, r#"쾿"#, r#"쾿"#),
+        (r#"쿀"#, r#"쿀"#, r#"쿀"#, r#"쿀"#, r#"쿀"#),
+        (r#"쿁"#, r#"쿁"#, r#"쿁"#, r#"쿁"#, r#"쿁"#),
+        (r#"쿂"#, r#"쿂"#, r#"쿂"#, r#"쿂"#, r#"쿂"#),
+        (r#"쿃"#, r#"쿃"#, r#"쿃"#, r#"쿃"#, r#"쿃"#),
+        (r#"쿄"#, r#"쿄"#, r#"쿄"#, r#"쿄"#, r#"쿄"#),
+        (r#"쿅"#, r#"쿅"#, r#"쿅"#, r#"쿅"#, r#"쿅"#),
+        (r#"쿆"#, r#"쿆"#, r#"쿆"#, r#"쿆"#, r#"쿆"#),
+        (r#"쿇"#, r#"쿇"#, r#"쿇"#, r#"쿇"#, r#"쿇"#),
+        (r#"쿈"#, r#"쿈"#, r#"쿈"#, r#"쿈"#, r#"쿈"#),
+        (r#"쿉"#, r#"쿉"#, r#"쿉"#, r#"쿉"#, r#"쿉"#),
+        (r#"쿊"#, r#"쿊"#, r#"쿊"#, r#"쿊"#, r#"쿊"#),
+        (r#"쿋"#, r#"쿋"#, r#"쿋"#, r#"쿋"#, r#"쿋"#),
+        (r#"쿌"#, r#"쿌"#, r#"쿌"#, r#"쿌"#, r#"쿌"#),
+        (r#"쿍"#, r#"쿍"#, r#"쿍"#, r#"쿍"#, r#"쿍"#),
+        (r#"쿎"#, r#"쿎"#, r#"쿎"#, r#"쿎"#, r#"쿎"#),
+        (r#"쿏"#, r#"쿏"#, r#"쿏"#, r#"쿏"#, r#"쿏"#),
+        (r#"쿐"#, r#"쿐"#, r#"쿐"#, r#"쿐"#, r#"쿐"#),
+        (r#"쿑"#, r#"쿑"#, r#"쿑"#, r#"쿑"#, r#"쿑"#),
+        (r#"쿒"#, r#"쿒"#, r#"쿒"#, r#"쿒"#, r#"쿒"#),
+        (r#"쿓"#, r#"쿓"#, r#"쿓"#, r#"쿓"#, r#"쿓"#),
+        (r#"쿔"#, r#"쿔"#, r#"쿔"#, r#"쿔"#, r#"쿔"#),
+        (r#"쿕"#, r#"쿕"#, r#"쿕"#, r#"쿕"#, r#"쿕"#),
+        (r#"쿖"#, r#"쿖"#, r#"쿖"#, r#"쿖"#, r#"쿖"#),
+        (r#"쿗"#, r#"쿗"#, r#"쿗"#, r#"쿗"#, r#"쿗"#),
+        (r#"쿘"#, r#"쿘"#, r#"쿘"#, r#"쿘"#, r#"쿘"#),
+        (r#"쿙"#, r#"쿙"#, r#"쿙"#, r#"쿙"#, r#"쿙"#),
+        (r#"쿚"#, r#"쿚"#, r#"쿚"#, r#"쿚"#, r#"쿚"#),
+        (r#"쿛"#, r#"쿛"#, r#"쿛"#, r#"쿛"#, r#"쿛"#),
+        (r#"쿜"#, r#"쿜"#, r#"쿜"#, r#"쿜"#, r#"쿜"#),
+        (r#"쿝"#, r#"쿝"#, r#"쿝"#, r#"쿝"#, r#"쿝"#),
+        (r#"쿞"#, r#"쿞"#, r#"쿞"#, r#"쿞"#, r#"쿞"#),
+        (r#"쿟"#, r#"쿟"#, r#"쿟"#, r#"쿟"#, r#"쿟"#),
+        (r#"쿠"#, r#"쿠"#, r#"쿠"#, r#"쿠"#, r#"쿠"#),
+        (r#"쿡"#, r#"쿡"#, r#"쿡"#, r#"쿡"#, r#"쿡"#),
+        (r#"쿢"#, r#"쿢"#, r#"쿢"#, r#"쿢"#, r#"쿢"#),
+        (r#"쿣"#, r#"쿣"#, r#"쿣"#, r#"쿣"#, r#"쿣"#),
+        (r#"쿤"#, r#"쿤"#, r#"쿤"#, r#"쿤"#, r#"쿤"#),
+        (r#"쿥"#, r#"쿥"#, r#"쿥"#, r#"쿥"#, r#"쿥"#),
+        (r#"쿦"#, r#"쿦"#, r#"쿦"#, r#"쿦"#, r#"쿦"#),
+        (r#"쿧"#, r#"쿧"#, r#"쿧"#, r#"쿧"#, r#"쿧"#),
+        (r#"쿨"#, r#"쿨"#, r#"쿨"#, r#"쿨"#, r#"쿨"#),
+        (r#"쿩"#, r#"쿩"#, r#"쿩"#, r#"쿩"#, r#"쿩"#),
+        (r#"쿪"#, r#"쿪"#, r#"쿪"#, r#"쿪"#, r#"쿪"#),
+        (r#"쿫"#, r#"쿫"#, r#"쿫"#, r#"쿫"#, r#"쿫"#),
+        (r#"쿬"#, r#"쿬"#, r#"쿬"#, r#"쿬"#, r#"쿬"#),
+        (r#"쿭"#, r#"쿭"#, r#"쿭"#, r#"쿭"#, r#"쿭"#),
+        (r#"쿮"#, r#"쿮"#, r#"쿮"#, r#"쿮"#, r#"쿮"#),
+        (r#"쿯"#, r#"쿯"#, r#"쿯"#, r#"쿯"#, r#"쿯"#),
+        (r#"쿰"#, r#"쿰"#, r#"쿰"#, r#"쿰"#, r#"쿰"#),
+        (r#"쿱"#, r#"쿱"#, r#"쿱"#, r#"쿱"#, r#"쿱"#),
+        (r#"쿲"#, r#"쿲"#, r#"쿲"#, r#"쿲"#, r#"쿲"#),
+        (r#"쿳"#, r#"쿳"#, r#"쿳"#, r#"쿳"#, r#"쿳"#),
+        (r#"쿴"#, r#"쿴"#, r#"쿴"#, r#"쿴"#, r#"쿴"#),
+        (r#"쿵"#, r#"쿵"#, r#"쿵"#, r#"쿵"#, r#"쿵"#),
+        (r#"쿶"#, r#"쿶"#, r#"쿶"#, r#"쿶"#, r#"쿶"#),
+        (r#"쿷"#, r#"쿷"#, r#"쿷"#, r#"쿷"#, r#"쿷"#),
+        (r#"쿸"#, r#"쿸"#, r#"쿸"#, r#"쿸"#, r#"쿸"#),
+        (r#"쿹"#, r#"쿹"#, r#"쿹"#, r#"쿹"#, r#"쿹"#),
+        (r#"쿺"#, r#"쿺"#, r#"쿺"#, r#"쿺"#, r#"쿺"#),
+        (r#"쿻"#, r#"쿻"#, r#"쿻"#, r#"쿻"#, r#"쿻"#),
+        (r#"쿼"#, r#"쿼"#, r#"쿼"#, r#"쿼"#, r#"쿼"#),
+        (r#"쿽"#, r#"쿽"#, r#"쿽"#, r#"쿽"#, r#"쿽"#),
+        (r#"쿾"#, r#"쿾"#, r#"쿾"#, r#"쿾"#, r#"쿾"#),
+        (r#"쿿"#, r#"쿿"#, r#"쿿"#, r#"쿿"#, r#"쿿"#),
+        (r#"퀀"#, r#"퀀"#, r#"퀀"#, r#"퀀"#, r#"퀀"#),
+        (r#"퀁"#, r#"퀁"#, r#"퀁"#, r#"퀁"#, r#"퀁"#),
+        (r#"퀂"#, r#"퀂"#, r#"퀂"#, r#"퀂"#, r#"퀂"#),
+        (r#"퀃"#, r#"퀃"#, r#"퀃"#, r#"퀃"#, r#"퀃"#),
+        (r#"퀄"#, r#"퀄"#, r#"퀄"#, r#"퀄"#, r#"퀄"#),
+        (r#"퀅"#, r#"퀅"#, r#"퀅"#, r#"퀅"#, r#"퀅"#),
+        (r#"퀆"#, r#"퀆"#, r#"퀆"#, r#"퀆"#, r#"퀆"#),
+        (r#"퀇"#, r#"퀇"#, r#"퀇"#, r#"퀇"#, r#"퀇"#),
+        (r#"퀈"#, r#"퀈"#, r#"퀈"#, r#"퀈"#, r#"퀈"#),
+        (r#"퀉"#, r#"퀉"#, r#"퀉"#, r#"퀉"#, r#"퀉"#),
+        (r#"퀊"#, r#"퀊"#, r#"퀊"#, r#"퀊"#, r#"퀊"#),
+        (r#"퀋"#, r#"퀋"#, r#"퀋"#, r#"퀋"#, r#"퀋"#),
+        (r#"퀌"#, r#"퀌"#, r#"퀌"#, r#"퀌"#, r#"퀌"#),
+        (r#"퀍"#, r#"퀍"#, r#"퀍"#, r#"퀍"#, r#"퀍"#),
+        (r#"퀎"#, r#"퀎"#, r#"퀎"#, r#"퀎"#, r#"퀎"#),
+        (r#"퀏"#, r#"퀏"#, r#"퀏"#, r#"퀏"#, r#"퀏"#),
+        (r#"퀐"#, r#"퀐"#, r#"퀐"#, r#"퀐"#, r#"퀐"#),
+        (r#"퀑"#, r#"퀑"#, r#"퀑"#, r#"퀑"#, r#"퀑"#),
+        (r#"퀒"#, r#"퀒"#, r#"퀒"#, r#"퀒"#, r#"퀒"#),
+        (r#"퀓"#, r#"퀓"#, r#"퀓"#, r#"퀓"#, r#"퀓"#),
+        (r#"퀔"#, r#"퀔"#, r#"퀔"#, r#"퀔"#, r#"퀔"#),
+        (r#"퀕"#, r#"퀕"#, r#"퀕"#, r#"퀕"#, r#"퀕"#),
+        (r#"퀖"#, r#"퀖"#, r#"퀖"#, r#"퀖"#, r#"퀖"#),
+        (r#"퀗"#, r#"퀗"#, r#"퀗"#, r#"퀗"#, r#"퀗"#),
+        (r#"퀘"#, r#"퀘"#, r#"퀘"#, r#"퀘"#, r#"퀘"#),
+        (r#"퀙"#, r#"퀙"#, r#"퀙"#, r#"퀙"#, r#"퀙"#),
+        (r#"퀚"#, r#"퀚"#, r#"퀚"#, r#"퀚"#, r#"퀚"#),
+        (r#"퀛"#, r#"퀛"#, r#"퀛"#, r#"퀛"#, r#"퀛"#),
+        (r#"퀜"#, r#"퀜"#, r#"퀜"#, r#"퀜"#, r#"퀜"#),
+        (r#"퀝"#, r#"퀝"#, r#"퀝"#, r#"퀝"#, r#"퀝"#),
+        (r#"퀞"#, r#"퀞"#, r#"퀞"#, r#"퀞"#, r#"퀞"#),
+        (r#"퀟"#, r#"퀟"#, r#"퀟"#, r#"퀟"#, r#"퀟"#),
+        (r#"퀠"#, r#"퀠"#, r#"퀠"#, r#"퀠"#, r#"퀠"#),
+        (r#"퀡"#, r#"퀡"#, r#"퀡"#, r#"퀡"#, r#"퀡"#),
+        (r#"퀢"#, r#"퀢"#, r#"퀢"#, r#"퀢"#, r#"퀢"#),
+        (r#"퀣"#, r#"퀣"#, r#"퀣"#, r#"퀣"#, r#"퀣"#),
+        (r#"퀤"#, r#"퀤"#, r#"퀤"#, r#"퀤"#, r#"퀤"#),
+        (r#"퀥"#, r#"퀥"#, r#"퀥"#, r#"퀥"#, r#"퀥"#),
+        (r#"퀦"#, r#"퀦"#, r#"퀦"#, r#"퀦"#, r#"퀦"#),
+        (r#"퀧"#, r#"퀧"#, r#"퀧"#, r#"퀧"#, r#"퀧"#),
+        (r#"퀨"#, r#"퀨"#, r#"퀨"#, r#"퀨"#, r#"퀨"#),
+        (r#"퀩"#, r#"퀩"#, r#"퀩"#, r#"퀩"#, r#"퀩"#),
+        (r#"퀪"#, r#"퀪"#, r#"퀪"#, r#"퀪"#, r#"퀪"#),
+        (r#"퀫"#, r#"퀫"#, r#"퀫"#, r#"퀫"#, r#"퀫"#),
+        (r#"퀬"#, r#"퀬"#, r#"퀬"#, r#"퀬"#, r#"퀬"#),
+        (r#"퀭"#, r#"퀭"#, r#"퀭"#, r#"퀭"#, r#"퀭"#),
+        (r#"퀮"#, r#"퀮"#, r#"퀮"#, r#"퀮"#, r#"퀮"#),
+        (r#"퀯"#, r#"퀯"#, r#"퀯"#, r#"퀯"#, r#"퀯"#),
+        (r#"퀰"#, r#"퀰"#, r#"퀰"#, r#"퀰"#, r#"퀰"#),
+        (r#"퀱"#, r#"퀱"#, r#"퀱"#, r#"퀱"#, r#"퀱"#),
+        (r#"퀲"#, r#"퀲"#, r#"퀲"#, r#"퀲"#, r#"퀲"#),
+        (r#"퀳"#, r#"퀳"#, r#"퀳"#, r#"퀳"#, r#"퀳"#),
+        (r#"퀴"#, r#"퀴"#, r#"퀴"#, r#"퀴"#, r#"퀴"#),
+        (r#"퀵"#, r#"퀵"#, r#"퀵"#, r#"퀵"#, r#"퀵"#),
+        (r#"퀶"#, r#"퀶"#, r#"퀶"#, r#"퀶"#, r#"퀶"#),
+        (r#"퀷"#, r#"퀷"#, r#"퀷"#, r#"퀷"#, r#"퀷"#),
+        (r#"퀸"#, r#"퀸"#, r#"퀸"#, r#"퀸"#, r#"퀸"#),
+        (r#"퀹"#, r#"퀹"#, r#"퀹"#, r#"퀹"#, r#"퀹"#),
+        (r#"퀺"#, r#"퀺"#, r#"퀺"#, r#"퀺"#, r#"퀺"#),
+        (r#"퀻"#, r#"퀻"#, r#"퀻"#, r#"퀻"#, r#"퀻"#),
+        (r#"퀼"#, r#"퀼"#, r#"퀼"#, r#"퀼"#, r#"퀼"#),
+        (r#"퀽"#, r#"퀽"#, r#"퀽"#, r#"퀽"#, r#"퀽"#),
+        (r#"퀾"#, r#"퀾"#, r#"퀾"#, r#"퀾"#, r#"퀾"#),
+        (r#"퀿"#, r#"퀿"#, r#"퀿"#, r#"퀿"#, r#"퀿"#),
+        (r#"큀"#, r#"큀"#, r#"큀"#, r#"큀"#, r#"큀"#),
+        (r#"큁"#, r#"큁"#, r#"큁"#, r#"큁"#, r#"큁"#),
+        (r#"큂"#, r#"큂"#, r#"큂"#, r#"큂"#, r#"큂"#),
+        (r#"큃"#, r#"큃"#, r#"큃"#, r#"큃"#, r#"큃"#),
+        (r#"큄"#, r#"큄"#, r#"큄"#, r#"큄"#, r#"큄"#),
+        (r#"큅"#, r#"큅"#, r#"큅"#, r#"큅"#, r#"큅"#),
+        (r#"큆"#, r#"큆"#, r#"큆"#, r#"큆"#, r#"큆"#),
+        (r#"큇"#, r#"큇"#, r#"큇"#, r#"큇"#, r#"큇"#),
+        (r#"큈"#, r#"큈"#, r#"큈"#, r#"큈"#, r#"큈"#),
+        (r#"큉"#, r#"큉"#, r#"큉"#, r#"큉"#, r#"큉"#),
+        (r#"큊"#, r#"큊"#, r#"큊"#, r#"큊"#, r#"큊"#),
+        (r#"큋"#, r#"큋"#, r#"큋"#, r#"큋"#, r#"큋"#),
+        (r#"큌"#, r#"큌"#, r#"큌"#, r#"큌"#, r#"큌"#),
+        (r#"큍"#, r#"큍"#, r#"큍"#, r#"큍"#, r#"큍"#),
+        (r#"큎"#, r#"큎"#, r#"큎"#, r#"큎"#, r#"큎"#),
+        (r#"큏"#, r#"큏"#, r#"큏"#, r#"큏"#, r#"큏"#),
+        (r#"큐"#, r#"큐"#, r#"큐"#, r#"큐"#, r#"큐"#),
+        (r#"큑"#, r#"큑"#, r#"큑"#, r#"큑"#, r#"큑"#),
+        (r#"큒"#, r#"큒"#, r#"큒"#, r#"큒"#, r#"큒"#),
+        (r#"큓"#, r#"큓"#, r#"큓"#, r#"큓"#, r#"큓"#),
+        (r#"큔"#, r#"큔"#, r#"큔"#, r#"큔"#, r#"큔"#),
+        (r#"큕"#, r#"큕"#, r#"큕"#, r#"큕"#, r#"큕"#),
+        (r#"큖"#, r#"큖"#, r#"큖"#, r#"큖"#, r#"큖"#),
+        (r#"큗"#, r#"큗"#, r#"큗"#, r#"큗"#, r#"큗"#),
+        (r#"큘"#, r#"큘"#, r#"큘"#, r#"큘"#, r#"큘"#),
+        (r#"큙"#, r#"큙"#, r#"큙"#, r#"큙"#, r#"큙"#),
+        (r#"큚"#, r#"큚"#, r#"큚"#, r#"큚"#, r#"큚"#),
+        (r#"큛"#, r#"큛"#, r#"큛"#, r#"큛"#, r#"큛"#),
+        (r#"큜"#, r#"큜"#, r#"큜"#, r#"큜"#, r#"큜"#),
+        (r#"큝"#, r#"큝"#, r#"큝"#, r#"큝"#, r#"큝"#),
+        (r#"큞"#, r#"큞"#, r#"큞"#, r#"큞"#, r#"큞"#),
+        (r#"큟"#, r#"큟"#, r#"큟"#, r#"큟"#, r#"큟"#),
+        (r#"큠"#, r#"큠"#, r#"큠"#, r#"큠"#, r#"큠"#),
+        (r#"큡"#, r#"큡"#, r#"큡"#, r#"큡"#, r#"큡"#),
+        (r#"큢"#, r#"큢"#, r#"큢"#, r#"큢"#, r#"큢"#),
+        (r#"큣"#, r#"큣"#, r#"큣"#, r#"큣"#, r#"큣"#),
+        (r#"큤"#, r#"큤"#, r#"큤"#, r#"큤"#, r#"큤"#),
+        (r#"큥"#, r#"큥"#, r#"큥"#, r#"큥"#, r#"큥"#),
+        (r#"큦"#, r#"큦"#, r#"큦"#, r#"큦"#, r#"큦"#),
+        (r#"큧"#, r#"큧"#, r#"큧"#, r#"큧"#, r#"큧"#),
+        (r#"큨"#, r#"큨"#, r#"큨"#, r#"큨"#, r#"큨"#),
+        (r#"큩"#, r#"큩"#, r#"큩"#, r#"큩"#, r#"큩"#),
+        (r#"큪"#, r#"큪"#, r#"큪"#, r#"큪"#, r#"큪"#),
+        (r#"큫"#, r#"큫"#, r#"큫"#, r#"큫"#, r#"큫"#),
+        (r#"크"#, r#"크"#, r#"크"#, r#"크"#, r#"크"#),
+        (r#"큭"#, r#"큭"#, r#"큭"#, r#"큭"#, r#"큭"#),
+        (r#"큮"#, r#"큮"#, r#"큮"#, r#"큮"#, r#"큮"#),
+        (r#"큯"#, r#"큯"#, r#"큯"#, r#"큯"#, r#"큯"#),
+        (r#"큰"#, r#"큰"#, r#"큰"#, r#"큰"#, r#"큰"#),
+        (r#"큱"#, r#"큱"#, r#"큱"#, r#"큱"#, r#"큱"#),
+        (r#"큲"#, r#"큲"#, r#"큲"#, r#"큲"#, r#"큲"#),
+        (r#"큳"#, r#"큳"#, r#"큳"#, r#"큳"#, r#"큳"#),
+        (r#"클"#, r#"클"#, r#"클"#, r#"클"#, r#"클"#),
+        (r#"큵"#, r#"큵"#, r#"큵"#, r#"큵"#, r#"큵"#),
+        (r#"큶"#, r#"큶"#, r#"큶"#, r#"큶"#, r#"큶"#),
+        (r#"큷"#, r#"큷"#, r#"큷"#, r#"큷"#, r#"큷"#),
+        (r#"큸"#, r#"큸"#, r#"큸"#, r#"큸"#, r#"큸"#),
+        (r#"큹"#, r#"큹"#, r#"큹"#, r#"큹"#, r#"큹"#),
+        (r#"큺"#, r#"큺"#, r#"큺"#, r#"큺"#, r#"큺"#),
+        (r#"큻"#, r#"큻"#, r#"큻"#, r#"큻"#, r#"큻"#),
+        (r#"큼"#, r#"큼"#, r#"큼"#, r#"큼"#, r#"큼"#),
+        (r#"큽"#, r#"큽"#, r#"큽"#, r#"큽"#, r#"큽"#),
+        (r#"큾"#, r#"큾"#, r#"큾"#, r#"큾"#, r#"큾"#),
+        (r#"큿"#, r#"큿"#, r#"큿"#, r#"큿"#, r#"큿"#),
+        (r#"킀"#, r#"킀"#, r#"킀"#, r#"킀"#, r#"킀"#),
+        (r#"킁"#, r#"킁"#, r#"킁"#, r#"킁"#, r#"킁"#),
+        (r#"킂"#, r#"킂"#, r#"킂"#, r#"킂"#, r#"킂"#),
+        (r#"킃"#, r#"킃"#, r#"킃"#, r#"킃"#, r#"킃"#),
+        (r#"킄"#, r#"킄"#, r#"킄"#, r#"킄"#, r#"킄"#),
+        (r#"킅"#, r#"킅"#, r#"킅"#, r#"킅"#, r#"킅"#),
+        (r#"킆"#, r#"킆"#, r#"킆"#, r#"킆"#, r#"킆"#),
+        (r#"킇"#, r#"킇"#, r#"킇"#, r#"킇"#, r#"킇"#),
+        (r#"킈"#, r#"킈"#, r#"킈"#, r#"킈"#, r#"킈"#),
+        (r#"킉"#, r#"킉"#, r#"킉"#, r#"킉"#, r#"킉"#),
+        (r#"킊"#, r#"킊"#, r#"킊"#, r#"킊"#, r#"킊"#),
+        (r#"킋"#, r#"킋"#, r#"킋"#, r#"킋"#, r#"킋"#),
+        (r#"킌"#, r#"킌"#, r#"킌"#, r#"킌"#, r#"킌"#),
+        (r#"킍"#, r#"킍"#, r#"킍"#, r#"킍"#, r#"킍"#),
+        (r#"킎"#, r#"킎"#, r#"킎"#, r#"킎"#, r#"킎"#),
+        (r#"킏"#, r#"킏"#, r#"킏"#, r#"킏"#, r#"킏"#),
+        (r#"킐"#, r#"킐"#, r#"킐"#, r#"킐"#, r#"킐"#),
+        (r#"킑"#, r#"킑"#, r#"킑"#, r#"킑"#, r#"킑"#),
+        (r#"킒"#, r#"킒"#, r#"킒"#, r#"킒"#, r#"킒"#),
+        (r#"킓"#, r#"킓"#, r#"킓"#, r#"킓"#, r#"킓"#),
+        (r#"킔"#, r#"킔"#, r#"킔"#, r#"킔"#, r#"킔"#),
+        (r#"킕"#, r#"킕"#, r#"킕"#, r#"킕"#, r#"킕"#),
+        (r#"킖"#, r#"킖"#, r#"킖"#, r#"킖"#, r#"킖"#),
+        (r#"킗"#, r#"킗"#, r#"킗"#, r#"킗"#, r#"킗"#),
+        (r#"킘"#, r#"킘"#, r#"킘"#, r#"킘"#, r#"킘"#),
+        (r#"킙"#, r#"킙"#, r#"킙"#, r#"킙"#, r#"킙"#),
+        (r#"킚"#, r#"킚"#, r#"킚"#, r#"킚"#, r#"킚"#),
+        (r#"킛"#, r#"킛"#, r#"킛"#, r#"킛"#, r#"킛"#),
+        (r#"킜"#, r#"킜"#, r#"킜"#, r#"킜"#, r#"킜"#),
+        (r#"킝"#, r#"킝"#, r#"킝"#, r#"킝"#, r#"킝"#),
+        (r#"킞"#, r#"킞"#, r#"킞"#, r#"킞"#, r#"킞"#),
+        (r#"킟"#, r#"킟"#, r#"킟"#, r#"킟"#, r#"킟"#),
+        (r#"킠"#, r#"킠"#, r#"킠"#, r#"킠"#, r#"킠"#),
+        (r#"킡"#, r#"킡"#, r#"킡"#, r#"킡"#, r#"킡"#),
+        (r#"킢"#, r#"킢"#, r#"킢"#, r#"킢"#, r#"킢"#),
+        (r#"킣"#, r#"킣"#, r#"킣"#, r#"킣"#, r#"킣"#),
+        (r#"키"#, r#"키"#, r#"키"#, r#"키"#, r#"키"#),
+        (r#"킥"#, r#"킥"#, r#"킥"#, r#"킥"#, r#"킥"#),
+        (r#"킦"#, r#"킦"#, r#"킦"#, r#"킦"#, r#"킦"#),
+        (r#"킧"#, r#"킧"#, r#"킧"#, r#"킧"#, r#"킧"#),
+        (r#"킨"#, r#"킨"#, r#"킨"#, r#"킨"#, r#"킨"#),
+        (r#"킩"#, r#"킩"#, r#"킩"#, r#"킩"#, r#"킩"#),
+        (r#"킪"#, r#"킪"#, r#"킪"#, r#"킪"#, r#"킪"#),
+        (r#"킫"#, r#"킫"#, r#"킫"#, r#"킫"#, r#"킫"#),
+        (r#"킬"#, r#"킬"#, r#"킬"#, r#"킬"#, r#"킬"#),
+        (r#"킭"#, r#"킭"#, r#"킭"#, r#"킭"#, r#"킭"#),
+        (r#"킮"#, r#"킮"#, r#"킮"#, r#"킮"#, r#"킮"#),
+        (r#"킯"#, r#"킯"#, r#"킯"#, r#"킯"#, r#"킯"#),
+        (r#"킰"#, r#"킰"#, r#"킰"#, r#"킰"#, r#"킰"#),
+        (r#"킱"#, r#"킱"#, r#"킱"#, r#"킱"#, r#"킱"#),
+        (r#"킲"#, r#"킲"#, r#"킲"#, r#"킲"#, r#"킲"#),
+        (r#"킳"#, r#"킳"#, r#"킳"#, r#"킳"#, r#"킳"#),
+        (r#"킴"#, r#"킴"#, r#"킴"#, r#"킴"#, r#"킴"#),
+        (r#"킵"#, r#"킵"#, r#"킵"#, r#"킵"#, r#"킵"#),
+        (r#"킶"#, r#"킶"#, r#"킶"#, r#"킶"#, r#"킶"#),
+        (r#"킷"#, r#"킷"#, r#"킷"#, r#"킷"#, r#"킷"#),
+        (r#"킸"#, r#"킸"#, r#"킸"#, r#"킸"#, r#"킸"#),
+        (r#"킹"#, r#"킹"#, r#"킹"#, r#"킹"#, r#"킹"#),
+        (r#"킺"#, r#"킺"#, r#"킺"#, r#"킺"#, r#"킺"#),
+        (r#"킻"#, r#"킻"#, r#"킻"#, r#"킻"#, r#"킻"#),
+        (r#"킼"#, r#"킼"#, r#"킼"#, r#"킼"#, r#"킼"#),
+        (r#"킽"#, r#"킽"#, r#"킽"#, r#"킽"#, r#"킽"#),
+        (r#"킾"#, r#"킾"#, r#"킾"#, r#"킾"#, r#"킾"#),
+        (r#"킿"#, r#"킿"#, r#"킿"#, r#"킿"#, r#"킿"#),
+        (r#"타"#, r#"타"#, r#"타"#, r#"타"#, r#"타"#),
+        (r#"탁"#, r#"탁"#, r#"탁"#, r#"탁"#, r#"탁"#),
+        (r#"탂"#, r#"탂"#, r#"탂"#, r#"탂"#, r#"탂"#),
+        (r#"탃"#, r#"탃"#, r#"탃"#, r#"탃"#, r#"탃"#),
+        (r#"탄"#, r#"탄"#, r#"탄"#, r#"탄"#, r#"탄"#),
+        (r#"탅"#, r#"탅"#, r#"탅"#, r#"탅"#, r#"탅"#),
+        (r#"탆"#, r#"탆"#, r#"탆"#, r#"탆"#, r#"탆"#),
+        (r#"탇"#, r#"탇"#, r#"탇"#, r#"탇"#, r#"탇"#),
+        (r#"탈"#, r#"탈"#, r#"탈"#, r#"탈"#, r#"탈"#),
+        (r#"탉"#, r#"탉"#, r#"탉"#, r#"탉"#, r#"탉"#),
+        (r#"탊"#, r#"탊"#, r#"탊"#, r#"탊"#, r#"탊"#),
+        (r#"탋"#, r#"탋"#, r#"탋"#, r#"탋"#, r#"탋"#),
+        (r#"탌"#, r#"탌"#, r#"탌"#, r#"탌"#, r#"탌"#),
+        (r#"탍"#, r#"탍"#, r#"탍"#, r#"탍"#, r#"탍"#),
+        (r#"탎"#, r#"탎"#, r#"탎"#, r#"탎"#, r#"탎"#),
+        (r#"탏"#, r#"탏"#, r#"탏"#, r#"탏"#, r#"탏"#),
+        (r#"탐"#, r#"탐"#, r#"탐"#, r#"탐"#, r#"탐"#),
+        (r#"탑"#, r#"탑"#, r#"탑"#, r#"탑"#, r#"탑"#),
+        (r#"탒"#, r#"탒"#, r#"탒"#, r#"탒"#, r#"탒"#),
+        (r#"탓"#, r#"탓"#, r#"탓"#, r#"탓"#, r#"탓"#),
+        (r#"탔"#, r#"탔"#, r#"탔"#, r#"탔"#, r#"탔"#),
+        (r#"탕"#, r#"탕"#, r#"탕"#, r#"탕"#, r#"탕"#),
+        (r#"탖"#, r#"탖"#, r#"탖"#, r#"탖"#, r#"탖"#),
+        (r#"탗"#, r#"탗"#, r#"탗"#, r#"탗"#, r#"탗"#),
+        (r#"탘"#, r#"탘"#, r#"탘"#, r#"탘"#, r#"탘"#),
+        (r#"탙"#, r#"탙"#, r#"탙"#, r#"탙"#, r#"탙"#),
+        (r#"탚"#, r#"탚"#, r#"탚"#, r#"탚"#, r#"탚"#),
+        (r#"탛"#, r#"탛"#, r#"탛"#, r#"탛"#, r#"탛"#),
+        (r#"태"#, r#"태"#, r#"태"#, r#"태"#, r#"태"#),
+        (r#"택"#, r#"택"#, r#"택"#, r#"택"#, r#"택"#),
+        (r#"탞"#, r#"탞"#, r#"탞"#, r#"탞"#, r#"탞"#),
+        (r#"탟"#, r#"탟"#, r#"탟"#, r#"탟"#, r#"탟"#),
+        (r#"탠"#, r#"탠"#, r#"탠"#, r#"탠"#, r#"탠"#),
+        (r#"탡"#, r#"탡"#, r#"탡"#, r#"탡"#, r#"탡"#),
+        (r#"탢"#, r#"탢"#, r#"탢"#, r#"탢"#, r#"탢"#),
+        (r#"탣"#, r#"탣"#, r#"탣"#, r#"탣"#, r#"탣"#),
+        (r#"탤"#, r#"탤"#, r#"탤"#, r#"탤"#, r#"탤"#),
+        (r#"탥"#, r#"탥"#, r#"탥"#, r#"탥"#, r#"탥"#),
+        (r#"탦"#, r#"탦"#, r#"탦"#, r#"탦"#, r#"탦"#),
+        (r#"탧"#, r#"탧"#, r#"탧"#, r#"탧"#, r#"탧"#),
+        (r#"탨"#, r#"탨"#, r#"탨"#, r#"탨"#, r#"탨"#),
+        (r#"탩"#, r#"탩"#, r#"탩"#, r#"탩"#, r#"탩"#),
+        (r#"탪"#, r#"탪"#, r#"탪"#, r#"탪"#, r#"탪"#),
+        (r#"탫"#, r#"탫"#, r#"탫"#, r#"탫"#, r#"탫"#),
+        (r#"탬"#, r#"탬"#, r#"탬"#, r#"탬"#, r#"탬"#),
+        (r#"탭"#, r#"탭"#, r#"탭"#, r#"탭"#, r#"탭"#),
+        (r#"탮"#, r#"탮"#, r#"탮"#, r#"탮"#, r#"탮"#),
+        (r#"탯"#, r#"탯"#, r#"탯"#, r#"탯"#, r#"탯"#),
+        (r#"탰"#, r#"탰"#, r#"탰"#, r#"탰"#, r#"탰"#),
+        (r#"탱"#, r#"탱"#, r#"탱"#, r#"탱"#, r#"탱"#),
+        (r#"탲"#, r#"탲"#, r#"탲"#, r#"탲"#, r#"탲"#),
+        (r#"탳"#, r#"탳"#, r#"탳"#, r#"탳"#, r#"탳"#),
+        (r#"탴"#, r#"탴"#, r#"탴"#, r#"탴"#, r#"탴"#),
+        (r#"탵"#, r#"탵"#, r#"탵"#, r#"탵"#, r#"탵"#),
+        (r#"탶"#, r#"탶"#, r#"탶"#, r#"탶"#, r#"탶"#),
+        (r#"탷"#, r#"탷"#, r#"탷"#, r#"탷"#, r#"탷"#),
+        (r#"탸"#, r#"탸"#, r#"탸"#, r#"탸"#, r#"탸"#),
+        (r#"탹"#, r#"탹"#, r#"탹"#, r#"탹"#, r#"탹"#),
+        (r#"탺"#, r#"탺"#, r#"탺"#, r#"탺"#, r#"탺"#),
+        (r#"탻"#, r#"탻"#, r#"탻"#, r#"탻"#, r#"탻"#),
+        (r#"탼"#, r#"탼"#, r#"탼"#, r#"탼"#, r#"탼"#),
+        (r#"탽"#, r#"탽"#, r#"탽"#, r#"탽"#, r#"탽"#),
+        (r#"탾"#, r#"탾"#, r#"탾"#, r#"탾"#, r#"탾"#),
+        (r#"탿"#, r#"탿"#, r#"탿"#, r#"탿"#, r#"탿"#),
+        (r#"턀"#, r#"턀"#, r#"턀"#, r#"턀"#, r#"턀"#),
+        (r#"턁"#, r#"턁"#, r#"턁"#, r#"턁"#, r#"턁"#),
+        (r#"턂"#, r#"턂"#, r#"턂"#, r#"턂"#, r#"턂"#),
+        (r#"턃"#, r#"턃"#, r#"턃"#, r#"턃"#, r#"턃"#),
+        (r#"턄"#, r#"턄"#, r#"턄"#, r#"턄"#, r#"턄"#),
+        (r#"턅"#, r#"턅"#, r#"턅"#, r#"턅"#, r#"턅"#),
+        (r#"턆"#, r#"턆"#, r#"턆"#, r#"턆"#, r#"턆"#),
+        (r#"턇"#, r#"턇"#, r#"턇"#, r#"턇"#, r#"턇"#),
+        (r#"턈"#, r#"턈"#, r#"턈"#, r#"턈"#, r#"턈"#),
+        (r#"턉"#, r#"턉"#, r#"턉"#, r#"턉"#, r#"턉"#),
+        (r#"턊"#, r#"턊"#, r#"턊"#, r#"턊"#, r#"턊"#),
+        (r#"턋"#, r#"턋"#, r#"턋"#, r#"턋"#, r#"턋"#),
+        (r#"턌"#, r#"턌"#, r#"턌"#, r#"턌"#, r#"턌"#),
+        (r#"턍"#, r#"턍"#, r#"턍"#, r#"턍"#, r#"턍"#),
+        (r#"턎"#, r#"턎"#, r#"턎"#, r#"턎"#, r#"턎"#),
+        (r#"턏"#, r#"턏"#, r#"턏"#, r#"턏"#, r#"턏"#),
+        (r#"턐"#, r#"턐"#, r#"턐"#, r#"턐"#, r#"턐"#),
+        (r#"턑"#, r#"턑"#, r#"턑"#, r#"턑"#, r#"턑"#),
+        (r#"턒"#, r#"턒"#, r#"턒"#, r#"턒"#, r#"턒"#),
+        (r#"턓"#, r#"턓"#, r#"턓"#, r#"턓"#, r#"턓"#),
+        (r#"턔"#, r#"턔"#, r#"턔"#, r#"턔"#, r#"턔"#),
+        (r#"턕"#, r#"턕"#, r#"턕"#, r#"턕"#, r#"턕"#),
+        (r#"턖"#, r#"턖"#, r#"턖"#, r#"턖"#, r#"턖"#),
+        (r#"턗"#, r#"턗"#, r#"턗"#, r#"턗"#, r#"턗"#),
+        (r#"턘"#, r#"턘"#, r#"턘"#, r#"턘"#, r#"턘"#),
+        (r#"턙"#, r#"턙"#, r#"턙"#, r#"턙"#, r#"턙"#),
+        (r#"턚"#, r#"턚"#, r#"턚"#, r#"턚"#, r#"턚"#),
+        (r#"턛"#, r#"턛"#, r#"턛"#, r#"턛"#, r#"턛"#),
+        (r#"턜"#, r#"턜"#, r#"턜"#, r#"턜"#, r#"턜"#),
+        (r#"턝"#, r#"턝"#, r#"턝"#, r#"턝"#, r#"턝"#),
+        (r#"턞"#, r#"턞"#, r#"턞"#, r#"턞"#, r#"턞"#),
+        (r#"턟"#, r#"턟"#, r#"턟"#, r#"턟"#, r#"턟"#),
+        (r#"턠"#, r#"턠"#, r#"턠"#, r#"턠"#, r#"턠"#),
+        (r#"턡"#, r#"턡"#, r#"턡"#, r#"턡"#, r#"턡"#),
+        (r#"턢"#, r#"턢"#, r#"턢"#, r#"턢"#, r#"턢"#),
+        (r#"턣"#, r#"턣"#, r#"턣"#, r#"턣"#, r#"턣"#),
+        (r#"턤"#, r#"턤"#, r#"턤"#, r#"턤"#, r#"턤"#),
+        (r#"턥"#, r#"턥"#, r#"턥"#, r#"턥"#, r#"턥"#),
+        (r#"턦"#, r#"턦"#, r#"턦"#, r#"턦"#, r#"턦"#),
+        (r#"턧"#, r#"턧"#, r#"턧"#, r#"턧"#, r#"턧"#),
+        (r#"턨"#, r#"턨"#, r#"턨"#, r#"턨"#, r#"턨"#),
+        (r#"턩"#, r#"턩"#, r#"턩"#, r#"턩"#, r#"턩"#),
+        (r#"턪"#, r#"턪"#, r#"턪"#, r#"턪"#, r#"턪"#),
+        (r#"턫"#, r#"턫"#, r#"턫"#, r#"턫"#, r#"턫"#),
+        (r#"턬"#, r#"턬"#, r#"턬"#, r#"턬"#, r#"턬"#),
+        (r#"턭"#, r#"턭"#, r#"턭"#, r#"턭"#, r#"턭"#),
+        (r#"턮"#, r#"턮"#, r#"턮"#, r#"턮"#, r#"턮"#),
+        (r#"턯"#, r#"턯"#, r#"턯"#, r#"턯"#, r#"턯"#),
+        (r#"터"#, r#"터"#, r#"터"#, r#"터"#, r#"터"#),
+        (r#"턱"#, r#"턱"#, r#"턱"#, r#"턱"#, r#"턱"#),
+        (r#"턲"#, r#"턲"#, r#"턲"#, r#"턲"#, r#"턲"#),
+        (r#"턳"#, r#"턳"#, r#"턳"#, r#"턳"#, r#"턳"#),
+        (r#"턴"#, r#"턴"#, r#"턴"#, r#"턴"#, r#"턴"#),
+        (r#"턵"#, r#"턵"#, r#"턵"#, r#"턵"#, r#"턵"#),
+        (r#"턶"#, r#"턶"#, r#"턶"#, r#"턶"#, r#"턶"#),
+        (r#"턷"#, r#"턷"#, r#"턷"#, r#"턷"#, r#"턷"#),
+        (r#"털"#, r#"털"#, r#"털"#, r#"털"#, r#"털"#),
+        (r#"턹"#, r#"턹"#, r#"턹"#, r#"턹"#, r#"턹"#),
+        (r#"턺"#, r#"턺"#, r#"턺"#, r#"턺"#, r#"턺"#),
+        (r#"턻"#, r#"턻"#, r#"턻"#, r#"턻"#, r#"턻"#),
+        (r#"턼"#, r#"턼"#, r#"턼"#, r#"턼"#, r#"턼"#),
+        (r#"턽"#, r#"턽"#, r#"턽"#, r#"턽"#, r#"턽"#),
+        (r#"턾"#, r#"턾"#, r#"턾"#, r#"턾"#, r#"턾"#),
+        (r#"턿"#, r#"턿"#, r#"턿"#, r#"턿"#, r#"턿"#),
+        (r#"텀"#, r#"텀"#, r#"텀"#, r#"텀"#, r#"텀"#),
+        (r#"텁"#, r#"텁"#, r#"텁"#, r#"텁"#, r#"텁"#),
+        (r#"텂"#, r#"텂"#, r#"텂"#, r#"텂"#, r#"텂"#),
+        (r#"텃"#, r#"텃"#, r#"텃"#, r#"텃"#, r#"텃"#),
+        (r#"텄"#, r#"텄"#, r#"텄"#, r#"텄"#, r#"텄"#),
+        (r#"텅"#, r#"텅"#, r#"텅"#, r#"텅"#, r#"텅"#),
+        (r#"텆"#, r#"텆"#, r#"텆"#, r#"텆"#, r#"텆"#),
+        (r#"텇"#, r#"텇"#, r#"텇"#, r#"텇"#, r#"텇"#),
+        (r#"텈"#, r#"텈"#, r#"텈"#, r#"텈"#, r#"텈"#),
+        (r#"텉"#, r#"텉"#, r#"텉"#, r#"텉"#, r#"텉"#),
+        (r#"텊"#, r#"텊"#, r#"텊"#, r#"텊"#, r#"텊"#),
+        (r#"텋"#, r#"텋"#, r#"텋"#, r#"텋"#, r#"텋"#),
+        (r#"테"#, r#"테"#, r#"테"#, r#"테"#, r#"테"#),
+        (r#"텍"#, r#"텍"#, r#"텍"#, r#"텍"#, r#"텍"#),
+        (r#"텎"#, r#"텎"#, r#"텎"#, r#"텎"#, r#"텎"#),
+        (r#"텏"#, r#"텏"#, r#"텏"#, r#"텏"#, r#"텏"#),
+        (r#"텐"#, r#"텐"#, r#"텐"#, r#"텐"#, r#"텐"#),
+        (r#"텑"#, r#"텑"#, r#"텑"#, r#"텑"#, r#"텑"#),
+        (r#"텒"#, r#"텒"#, r#"텒"#, r#"텒"#, r#"텒"#),
+        (r#"텓"#, r#"텓"#, r#"텓"#, r#"텓"#, r#"텓"#),
+        (r#"텔"#, r#"텔"#, r#"텔"#, r#"텔"#, r#"텔"#),
+        (r#"텕"#, r#"텕"#, r#"텕"#, r#"텕"#, r#"텕"#),
+        (r#"텖"#, r#"텖"#, r#"텖"#, r#"텖"#, r#"텖"#),
+        (r#"텗"#, r#"텗"#, r#"텗"#, r#"텗"#, r#"텗"#),
+        (r#"텘"#, r#"텘"#, r#"텘"#, r#"텘"#, r#"텘"#),
+        (r#"텙"#, r#"텙"#, r#"텙"#, r#"텙"#, r#"텙"#),
+        (r#"텚"#, r#"텚"#, r#"텚"#, r#"텚"#, r#"텚"#),
+        (r#"텛"#, r#"텛"#, r#"텛"#, r#"텛"#, r#"텛"#),
+        (r#"템"#, r#"템"#, r#"템"#, r#"템"#, r#"템"#),
+        (r#"텝"#, r#"텝"#, r#"텝"#, r#"텝"#, r#"텝"#),
+        (r#"텞"#, r#"텞"#, r#"텞"#, r#"텞"#, r#"텞"#),
+        (r#"텟"#, r#"텟"#, r#"텟"#, r#"텟"#, r#"텟"#),
+        (r#"텠"#, r#"텠"#, r#"텠"#, r#"텠"#, r#"텠"#),
+        (r#"텡"#, r#"텡"#, r#"텡"#, r#"텡"#, r#"텡"#),
+        (r#"텢"#, r#"텢"#, r#"텢"#, r#"텢"#, r#"텢"#),
+        (r#"텣"#, r#"텣"#, r#"텣"#, r#"텣"#, r#"텣"#),
+        (r#"텤"#, r#"텤"#, r#"텤"#, r#"텤"#, r#"텤"#),
+        (r#"텥"#, r#"텥"#, r#"텥"#, r#"텥"#, r#"텥"#),
+        (r#"텦"#, r#"텦"#, r#"텦"#, r#"텦"#, r#"텦"#),
+        (r#"텧"#, r#"텧"#, r#"텧"#, r#"텧"#, r#"텧"#),
+        (r#"텨"#, r#"텨"#, r#"텨"#, r#"텨"#, r#"텨"#),
+        (r#"텩"#, r#"텩"#, r#"텩"#, r#"텩"#, r#"텩"#),
+        (r#"텪"#, r#"텪"#, r#"텪"#, r#"텪"#, r#"텪"#),
+        (r#"텫"#, r#"텫"#, r#"텫"#, r#"텫"#, r#"텫"#),
+        (r#"텬"#, r#"텬"#, r#"텬"#, r#"텬"#, r#"텬"#),
+        (r#"텭"#, r#"텭"#, r#"텭"#, r#"텭"#, r#"텭"#),
+        (r#"텮"#, r#"텮"#, r#"텮"#, r#"텮"#, r#"텮"#),
+        (r#"텯"#, r#"텯"#, r#"텯"#, r#"텯"#, r#"텯"#),
+        (r#"텰"#, r#"텰"#, r#"텰"#, r#"텰"#, r#"텰"#),
+        (r#"텱"#, r#"텱"#, r#"텱"#, r#"텱"#, r#"텱"#),
+        (r#"텲"#, r#"텲"#, r#"텲"#, r#"텲"#, r#"텲"#),
+        (r#"텳"#, r#"텳"#, r#"텳"#, r#"텳"#, r#"텳"#),
+        (r#"텴"#, r#"텴"#, r#"텴"#, r#"텴"#, r#"텴"#),
+        (r#"텵"#, r#"텵"#, r#"텵"#, r#"텵"#, r#"텵"#),
+        (r#"텶"#, r#"텶"#, r#"텶"#, r#"텶"#, r#"텶"#),
+        (r#"텷"#, r#"텷"#, r#"텷"#, r#"텷"#, r#"텷"#),
+        (r#"텸"#, r#"텸"#, r#"텸"#, r#"텸"#, r#"텸"#),
+        (r#"텹"#, r#"텹"#, r#"텹"#, r#"텹"#, r#"텹"#),
+        (r#"텺"#, r#"텺"#, r#"텺"#, r#"텺"#, r#"텺"#),
+        (r#"텻"#, r#"텻"#, r#"텻"#, r#"텻"#, r#"텻"#),
+        (r#"텼"#, r#"텼"#, r#"텼"#, r#"텼"#, r#"텼"#),
+        (r#"텽"#, r#"텽"#, r#"텽"#, r#"텽"#, r#"텽"#),
+        (r#"텾"#, r#"텾"#, r#"텾"#, r#"텾"#, r#"텾"#),
+        (r#"텿"#, r#"텿"#, r#"텿"#, r#"텿"#, r#"텿"#),
+        (r#"톀"#, r#"톀"#, r#"톀"#, r#"톀"#, r#"톀"#),
+        (r#"톁"#, r#"톁"#, r#"톁"#, r#"톁"#, r#"톁"#),
+        (r#"톂"#, r#"톂"#, r#"톂"#, r#"톂"#, r#"톂"#),
+        (r#"톃"#, r#"톃"#, r#"톃"#, r#"톃"#, r#"톃"#),
+        (r#"톄"#, r#"톄"#, r#"톄"#, r#"톄"#, r#"톄"#),
+        (r#"톅"#, r#"톅"#, r#"톅"#, r#"톅"#, r#"톅"#),
+        (r#"톆"#, r#"톆"#, r#"톆"#, r#"톆"#, r#"톆"#),
+        (r#"톇"#, r#"톇"#, r#"톇"#, r#"톇"#, r#"톇"#),
+        (r#"톈"#, r#"톈"#, r#"톈"#, r#"톈"#, r#"톈"#),
+        (r#"톉"#, r#"톉"#, r#"톉"#, r#"톉"#, r#"톉"#),
+        (r#"톊"#, r#"톊"#, r#"톊"#, r#"톊"#, r#"톊"#),
+        (r#"톋"#, r#"톋"#, r#"톋"#, r#"톋"#, r#"톋"#),
+        (r#"톌"#, r#"톌"#, r#"톌"#, r#"톌"#, r#"톌"#),
+        (r#"톍"#, r#"톍"#, r#"톍"#, r#"톍"#, r#"톍"#),
+        (r#"톎"#, r#"톎"#, r#"톎"#, r#"톎"#, r#"톎"#),
+        (r#"톏"#, r#"톏"#, r#"톏"#, r#"톏"#, r#"톏"#),
+        (r#"톐"#, r#"톐"#, r#"톐"#, r#"톐"#, r#"톐"#),
+        (r#"톑"#, r#"톑"#, r#"톑"#, r#"톑"#, r#"톑"#),
+        (r#"톒"#, r#"톒"#, r#"톒"#, r#"톒"#, r#"톒"#),
+        (r#"톓"#, r#"톓"#, r#"톓"#, r#"톓"#, r#"톓"#),
+        (r#"톔"#, r#"톔"#, r#"톔"#, r#"톔"#, r#"톔"#),
+        (r#"톕"#, r#"톕"#, r#"톕"#, r#"톕"#, r#"톕"#),
+        (r#"톖"#, r#"톖"#, r#"톖"#, r#"톖"#, r#"톖"#),
+        (r#"톗"#, r#"톗"#, r#"톗"#, r#"톗"#, r#"톗"#),
+        (r#"톘"#, r#"톘"#, r#"톘"#, r#"톘"#, r#"톘"#),
+        (r#"톙"#, r#"톙"#, r#"톙"#, r#"톙"#, r#"톙"#),
+        (r#"톚"#, r#"톚"#, r#"톚"#, r#"톚"#, r#"톚"#),
+        (r#"톛"#, r#"톛"#, r#"톛"#, r#"톛"#, r#"톛"#),
+        (r#"톜"#, r#"톜"#, r#"톜"#, r#"톜"#, r#"톜"#),
+        (r#"톝"#, r#"톝"#, r#"톝"#, r#"톝"#, r#"톝"#),
+        (r#"톞"#, r#"톞"#, r#"톞"#, r#"톞"#, r#"톞"#),
+        (r#"톟"#, r#"톟"#, r#"톟"#, r#"톟"#, r#"톟"#),
+        (r#"토"#, r#"토"#, r#"토"#, r#"토"#, r#"토"#),
+        (r#"톡"#, r#"톡"#, r#"톡"#, r#"톡"#, r#"톡"#),
+        (r#"톢"#, r#"톢"#, r#"톢"#, r#"톢"#, r#"톢"#),
+        (r#"톣"#, r#"톣"#, r#"톣"#, r#"톣"#, r#"톣"#),
+        (r#"톤"#, r#"톤"#, r#"톤"#, r#"톤"#, r#"톤"#),
+        (r#"톥"#, r#"톥"#, r#"톥"#, r#"톥"#, r#"톥"#),
+        (r#"톦"#, r#"톦"#, r#"톦"#, r#"톦"#, r#"톦"#),
+        (r#"톧"#, r#"톧"#, r#"톧"#, r#"톧"#, r#"톧"#),
+        (r#"톨"#, r#"톨"#, r#"톨"#, r#"톨"#, r#"톨"#),
+        (r#"톩"#, r#"톩"#, r#"톩"#, r#"톩"#, r#"톩"#),
+        (r#"톪"#, r#"톪"#, r#"톪"#, r#"톪"#, r#"톪"#),
+        (r#"톫"#, r#"톫"#, r#"톫"#, r#"톫"#, r#"톫"#),
+        (r#"톬"#, r#"톬"#, r#"톬"#, r#"톬"#, r#"톬"#),
+        (r#"톭"#, r#"톭"#, r#"톭"#, r#"톭"#, r#"톭"#),
+        (r#"톮"#, r#"톮"#, r#"톮"#, r#"톮"#, r#"톮"#),
+        (r#"톯"#, r#"톯"#, r#"톯"#, r#"톯"#, r#"톯"#),
+        (r#"톰"#, r#"톰"#, r#"톰"#, r#"톰"#, r#"톰"#),
+        (r#"톱"#, r#"톱"#, r#"톱"#, r#"톱"#, r#"톱"#),
+        (r#"톲"#, r#"톲"#, r#"톲"#, r#"톲"#, r#"톲"#),
+        (r#"톳"#, r#"톳"#, r#"톳"#, r#"톳"#, r#"톳"#),
+        (r#"톴"#, r#"톴"#, r#"톴"#, r#"톴"#, r#"톴"#),
+        (r#"통"#, r#"통"#, r#"통"#, r#"통"#, r#"통"#),
+        (r#"톶"#, r#"톶"#, r#"톶"#, r#"톶"#, r#"톶"#),
+        (r#"톷"#, r#"톷"#, r#"톷"#, r#"톷"#, r#"톷"#),
+        (r#"톸"#, r#"톸"#, r#"톸"#, r#"톸"#, r#"톸"#),
+        (r#"톹"#, r#"톹"#, r#"톹"#, r#"톹"#, r#"톹"#),
+        (r#"톺"#, r#"톺"#, r#"톺"#, r#"톺"#, r#"톺"#),
+        (r#"톻"#, r#"톻"#, r#"톻"#, r#"톻"#, r#"톻"#),
+        (r#"톼"#, r#"톼"#, r#"톼"#, r#"톼"#, r#"톼"#),
+        (r#"톽"#, r#"톽"#, r#"톽"#, r#"톽"#, r#"톽"#),
+        (r#"톾"#, r#"톾"#, r#"톾"#, r#"톾"#, r#"톾"#),
+        (r#"톿"#, r#"톿"#, r#"톿"#, r#"톿"#, r#"톿"#),
+        (r#"퇀"#, r#"퇀"#, r#"퇀"#, r#"퇀"#, r#"퇀"#),
+        (r#"퇁"#, r#"퇁"#, r#"퇁"#, r#"퇁"#, r#"퇁"#),
+        (r#"퇂"#, r#"퇂"#, r#"퇂"#, r#"퇂"#, r#"퇂"#),
+        (r#"퇃"#, r#"퇃"#, r#"퇃"#, r#"퇃"#, r#"퇃"#),
+        (r#"퇄"#, r#"퇄"#, r#"퇄"#, r#"퇄"#, r#"퇄"#),
+        (r#"퇅"#, r#"퇅"#, r#"퇅"#, r#"퇅"#, r#"퇅"#),
+        (r#"퇆"#, r#"퇆"#, r#"퇆"#, r#"퇆"#, r#"퇆"#),
+        (r#"퇇"#, r#"퇇"#, r#"퇇"#, r#"퇇"#, r#"퇇"#),
+        (r#"퇈"#, r#"퇈"#, r#"퇈"#, r#"퇈"#, r#"퇈"#),
+        (r#"퇉"#, r#"퇉"#, r#"퇉"#, r#"퇉"#, r#"퇉"#),
+        (r#"퇊"#, r#"퇊"#, r#"퇊"#, r#"퇊"#, r#"퇊"#),
+        (r#"퇋"#, r#"퇋"#, r#"퇋"#, r#"퇋"#, r#"퇋"#),
+        (r#"퇌"#, r#"퇌"#, r#"퇌"#, r#"퇌"#, r#"퇌"#),
+        (r#"퇍"#, r#"퇍"#, r#"퇍"#, r#"퇍"#, r#"퇍"#),
+        (r#"퇎"#, r#"퇎"#, r#"퇎"#, r#"퇎"#, r#"퇎"#),
+        (r#"퇏"#, r#"퇏"#, r#"퇏"#, r#"퇏"#, r#"퇏"#),
+        (r#"퇐"#, r#"퇐"#, r#"퇐"#, r#"퇐"#, r#"퇐"#),
+        (r#"퇑"#, r#"퇑"#, r#"퇑"#, r#"퇑"#, r#"퇑"#),
+        (r#"퇒"#, r#"퇒"#, r#"퇒"#, r#"퇒"#, r#"퇒"#),
+        (r#"퇓"#, r#"퇓"#, r#"퇓"#, r#"퇓"#, r#"퇓"#),
+        (r#"퇔"#, r#"퇔"#, r#"퇔"#, r#"퇔"#, r#"퇔"#),
+        (r#"퇕"#, r#"퇕"#, r#"퇕"#, r#"퇕"#, r#"퇕"#),
+        (r#"퇖"#, r#"퇖"#, r#"퇖"#, r#"퇖"#, r#"퇖"#),
+        (r#"퇗"#, r#"퇗"#, r#"퇗"#, r#"퇗"#, r#"퇗"#),
+        (r#"퇘"#, r#"퇘"#, r#"퇘"#, r#"퇘"#, r#"퇘"#),
+        (r#"퇙"#, r#"퇙"#, r#"퇙"#, r#"퇙"#, r#"퇙"#),
+        (r#"퇚"#, r#"퇚"#, r#"퇚"#, r#"퇚"#, r#"퇚"#),
+        (r#"퇛"#, r#"퇛"#, r#"퇛"#, r#"퇛"#, r#"퇛"#),
+        (r#"퇜"#, r#"퇜"#, r#"퇜"#, r#"퇜"#, r#"퇜"#),
+        (r#"퇝"#, r#"퇝"#, r#"퇝"#, r#"퇝"#, r#"퇝"#),
+        (r#"퇞"#, r#"퇞"#, r#"퇞"#, r#"퇞"#, r#"퇞"#),
+        (r#"퇟"#, r#"퇟"#, r#"퇟"#, r#"퇟"#, r#"퇟"#),
+        (r#"퇠"#, r#"퇠"#, r#"퇠"#, r#"퇠"#, r#"퇠"#),
+        (r#"퇡"#, r#"퇡"#, r#"퇡"#, r#"퇡"#, r#"퇡"#),
+        (r#"퇢"#, r#"퇢"#, r#"퇢"#, r#"퇢"#, r#"퇢"#),
+        (r#"퇣"#, r#"퇣"#, r#"퇣"#, r#"퇣"#, r#"퇣"#),
+        (r#"퇤"#, r#"퇤"#, r#"퇤"#, r#"퇤"#, r#"퇤"#),
+        (r#"퇥"#, r#"퇥"#, r#"퇥"#, r#"퇥"#, r#"퇥"#),
+        (r#"퇦"#, r#"퇦"#, r#"퇦"#, r#"퇦"#, r#"퇦"#),
+        (r#"퇧"#, r#"퇧"#, r#"퇧"#, r#"퇧"#, r#"퇧"#),
+        (r#"퇨"#, r#"퇨"#, r#"퇨"#, r#"퇨"#, r#"퇨"#),
+        (r#"퇩"#, r#"퇩"#, r#"퇩"#, r#"퇩"#, r#"퇩"#),
+        (r#"퇪"#, r#"퇪"#, r#"퇪"#, r#"퇪"#, r#"퇪"#),
+        (r#"퇫"#, r#"퇫"#, r#"퇫"#, r#"퇫"#, r#"퇫"#),
+        (r#"퇬"#, r#"퇬"#, r#"퇬"#, r#"퇬"#, r#"퇬"#),
+        (r#"퇭"#, r#"퇭"#, r#"퇭"#, r#"퇭"#, r#"퇭"#),
+        (r#"퇮"#, r#"퇮"#, r#"퇮"#, r#"퇮"#, r#"퇮"#),
+        (r#"퇯"#, r#"퇯"#, r#"퇯"#, r#"퇯"#, r#"퇯"#),
+        (r#"퇰"#, r#"퇰"#, r#"퇰"#, r#"퇰"#, r#"퇰"#),
+        (r#"퇱"#, r#"퇱"#, r#"퇱"#, r#"퇱"#, r#"퇱"#),
+        (r#"퇲"#, r#"퇲"#, r#"퇲"#, r#"퇲"#, r#"퇲"#),
+        (r#"퇳"#, r#"퇳"#, r#"퇳"#, r#"퇳"#, r#"퇳"#),
+        (r#"퇴"#, r#"퇴"#, r#"퇴"#, r#"퇴"#, r#"퇴"#),
+        (r#"퇵"#, r#"퇵"#, r#"퇵"#, r#"퇵"#, r#"퇵"#),
+        (r#"퇶"#, r#"퇶"#, r#"퇶"#, r#"퇶"#, r#"퇶"#),
+        (r#"퇷"#, r#"퇷"#, r#"퇷"#, r#"퇷"#, r#"퇷"#),
+        (r#"퇸"#, r#"퇸"#, r#"퇸"#, r#"퇸"#, r#"퇸"#),
+        (r#"퇹"#, r#"퇹"#, r#"퇹"#, r#"퇹"#, r#"퇹"#),
+        (r#"퇺"#, r#"퇺"#, r#"퇺"#, r#"퇺"#, r#"퇺"#),
+        (r#"퇻"#, r#"퇻"#, r#"퇻"#, r#"퇻"#, r#"퇻"#),
+        (r#"퇼"#, r#"퇼"#, r#"퇼"#, r#"퇼"#, r#"퇼"#),
+        (r#"퇽"#, r#"퇽"#, r#"퇽"#, r#"퇽"#, r#"퇽"#),
+        (r#"퇾"#, r#"퇾"#, r#"퇾"#, r#"퇾"#, r#"퇾"#),
+        (r#"퇿"#, r#"퇿"#, r#"퇿"#, r#"퇿"#, r#"퇿"#),
+        (r#"툀"#, r#"툀"#, r#"툀"#, r#"툀"#, r#"툀"#),
+        (r#"툁"#, r#"툁"#, r#"툁"#, r#"툁"#, r#"툁"#),
+        (r#"툂"#, r#"툂"#, r#"툂"#, r#"툂"#, r#"툂"#),
+        (r#"툃"#, r#"툃"#, r#"툃"#, r#"툃"#, r#"툃"#),
+        (r#"툄"#, r#"툄"#, r#"툄"#, r#"툄"#, r#"툄"#),
+        (r#"툅"#, r#"툅"#, r#"툅"#, r#"툅"#, r#"툅"#),
+        (r#"툆"#, r#"툆"#, r#"툆"#, r#"툆"#, r#"툆"#),
+        (r#"툇"#, r#"툇"#, r#"툇"#, r#"툇"#, r#"툇"#),
+        (r#"툈"#, r#"툈"#, r#"툈"#, r#"툈"#, r#"툈"#),
+        (r#"툉"#, r#"툉"#, r#"툉"#, r#"툉"#, r#"툉"#),
+        (r#"툊"#, r#"툊"#, r#"툊"#, r#"툊"#, r#"툊"#),
+        (r#"툋"#, r#"툋"#, r#"툋"#, r#"툋"#, r#"툋"#),
+        (r#"툌"#, r#"툌"#, r#"툌"#, r#"툌"#, r#"툌"#),
+        (r#"툍"#, r#"툍"#, r#"툍"#, r#"툍"#, r#"툍"#),
+        (r#"툎"#, r#"툎"#, r#"툎"#, r#"툎"#, r#"툎"#),
+        (r#"툏"#, r#"툏"#, r#"툏"#, r#"툏"#, r#"툏"#),
+        (r#"툐"#, r#"툐"#, r#"툐"#, r#"툐"#, r#"툐"#),
+        (r#"툑"#, r#"툑"#, r#"툑"#, r#"툑"#, r#"툑"#),
+        (r#"툒"#, r#"툒"#, r#"툒"#, r#"툒"#, r#"툒"#),
+        (r#"툓"#, r#"툓"#, r#"툓"#, r#"툓"#, r#"툓"#),
+        (r#"툔"#, r#"툔"#, r#"툔"#, r#"툔"#, r#"툔"#),
+        (r#"툕"#, r#"툕"#, r#"툕"#, r#"툕"#, r#"툕"#),
+        (r#"툖"#, r#"툖"#, r#"툖"#, r#"툖"#, r#"툖"#),
+        (r#"툗"#, r#"툗"#, r#"툗"#, r#"툗"#, r#"툗"#),
+        (r#"툘"#, r#"툘"#, r#"툘"#, r#"툘"#, r#"툘"#),
+        (r#"툙"#, r#"툙"#, r#"툙"#, r#"툙"#, r#"툙"#),
+        (r#"툚"#, r#"툚"#, r#"툚"#, r#"툚"#, r#"툚"#),
+        (r#"툛"#, r#"툛"#, r#"툛"#, r#"툛"#, r#"툛"#),
+        (r#"툜"#, r#"툜"#, r#"툜"#, r#"툜"#, r#"툜"#),
+        (r#"툝"#, r#"툝"#, r#"툝"#, r#"툝"#, r#"툝"#),
+        (r#"툞"#, r#"툞"#, r#"툞"#, r#"툞"#, r#"툞"#),
+        (r#"툟"#, r#"툟"#, r#"툟"#, r#"툟"#, r#"툟"#),
+        (r#"툠"#, r#"툠"#, r#"툠"#, r#"툠"#, r#"툠"#),
+        (r#"툡"#, r#"툡"#, r#"툡"#, r#"툡"#, r#"툡"#),
+        (r#"툢"#, r#"툢"#, r#"툢"#, r#"툢"#, r#"툢"#),
+        (r#"툣"#, r#"툣"#, r#"툣"#, r#"툣"#, r#"툣"#),
+        (r#"툤"#, r#"툤"#, r#"툤"#, r#"툤"#, r#"툤"#),
+        (r#"툥"#, r#"툥"#, r#"툥"#, r#"툥"#, r#"툥"#),
+        (r#"툦"#, r#"툦"#, r#"툦"#, r#"툦"#, r#"툦"#),
+        (r#"툧"#, r#"툧"#, r#"툧"#, r#"툧"#, r#"툧"#),
+        (r#"툨"#, r#"툨"#, r#"툨"#, r#"툨"#, r#"툨"#),
+        (r#"툩"#, r#"툩"#, r#"툩"#, r#"툩"#, r#"툩"#),
+        (r#"툪"#, r#"툪"#, r#"툪"#, r#"툪"#, r#"툪"#),
+        (r#"툫"#, r#"툫"#, r#"툫"#, r#"툫"#, r#"툫"#),
+        (r#"투"#, r#"투"#, r#"투"#, r#"투"#, r#"투"#),
+        (r#"툭"#, r#"툭"#, r#"툭"#, r#"툭"#, r#"툭"#),
+        (r#"툮"#, r#"툮"#, r#"툮"#, r#"툮"#, r#"툮"#),
+        (r#"툯"#, r#"툯"#, r#"툯"#, r#"툯"#, r#"툯"#),
+        (r#"툰"#, r#"툰"#, r#"툰"#, r#"툰"#, r#"툰"#),
+        (r#"툱"#, r#"툱"#, r#"툱"#, r#"툱"#, r#"툱"#),
+        (r#"툲"#, r#"툲"#, r#"툲"#, r#"툲"#, r#"툲"#),
+        (r#"툳"#, r#"툳"#, r#"툳"#, r#"툳"#, r#"툳"#),
+        (r#"툴"#, r#"툴"#, r#"툴"#, r#"툴"#, r#"툴"#),
+        (r#"툵"#, r#"툵"#, r#"툵"#, r#"툵"#, r#"툵"#),
+        (r#"툶"#, r#"툶"#, r#"툶"#, r#"툶"#, r#"툶"#),
+        (r#"툷"#, r#"툷"#, r#"툷"#, r#"툷"#, r#"툷"#),
+        (r#"툸"#, r#"툸"#, r#"툸"#, r#"툸"#, r#"툸"#),
+        (r#"툹"#, r#"툹"#, r#"툹"#, r#"툹"#, r#"툹"#),
+        (r#"툺"#, r#"툺"#, r#"툺"#, r#"툺"#, r#"툺"#),
+        (r#"툻"#, r#"툻"#, r#"툻"#, r#"툻"#, r#"툻"#),
+        (r#"툼"#, r#"툼"#, r#"툼"#, r#"툼"#, r#"툼"#),
+        (r#"툽"#, r#"툽"#, r#"툽"#, r#"툽"#, r#"툽"#),
+        (r#"툾"#, r#"툾"#, r#"툾"#, r#"툾"#, r#"툾"#),
+        (r#"툿"#, r#"툿"#, r#"툿"#, r#"툿"#, r#"툿"#),
+        (r#"퉀"#, r#"퉀"#, r#"퉀"#, r#"퉀"#, r#"퉀"#),
+        (r#"퉁"#, r#"퉁"#, r#"퉁"#, r#"퉁"#, r#"퉁"#),
+        (r#"퉂"#, r#"퉂"#, r#"퉂"#, r#"퉂"#, r#"퉂"#),
+        (r#"퉃"#, r#"퉃"#, r#"퉃"#, r#"퉃"#, r#"퉃"#),
+        (r#"퉄"#, r#"퉄"#, r#"퉄"#, r#"퉄"#, r#"퉄"#),
+        (r#"퉅"#, r#"퉅"#, r#"퉅"#, r#"퉅"#, r#"퉅"#),
+        (r#"퉆"#, r#"퉆"#, r#"퉆"#, r#"퉆"#, r#"퉆"#),
+        (r#"퉇"#, r#"퉇"#, r#"퉇"#, r#"퉇"#, r#"퉇"#),
+        (r#"퉈"#, r#"퉈"#, r#"퉈"#, r#"퉈"#, r#"퉈"#),
+        (r#"퉉"#, r#"퉉"#, r#"퉉"#, r#"퉉"#, r#"퉉"#),
+        (r#"퉊"#, r#"퉊"#, r#"퉊"#, r#"퉊"#, r#"퉊"#),
+        (r#"퉋"#, r#"퉋"#, r#"퉋"#, r#"퉋"#, r#"퉋"#),
+        (r#"퉌"#, r#"퉌"#, r#"퉌"#, r#"퉌"#, r#"퉌"#),
+        (r#"퉍"#, r#"퉍"#, r#"퉍"#, r#"퉍"#, r#"퉍"#),
+        (r#"퉎"#, r#"퉎"#, r#"퉎"#, r#"퉎"#, r#"퉎"#),
+        (r#"퉏"#, r#"퉏"#, r#"퉏"#, r#"퉏"#, r#"퉏"#),
+        (r#"퉐"#, r#"퉐"#, r#"퉐"#, r#"퉐"#, r#"퉐"#),
+        (r#"퉑"#, r#"퉑"#, r#"퉑"#, r#"퉑"#, r#"퉑"#),
+        (r#"퉒"#, r#"퉒"#, r#"퉒"#, r#"퉒"#, r#"퉒"#),
+        (r#"퉓"#, r#"퉓"#, r#"퉓"#, r#"퉓"#, r#"퉓"#),
+        (r#"퉔"#, r#"퉔"#, r#"퉔"#, r#"퉔"#, r#"퉔"#),
+        (r#"퉕"#, r#"퉕"#, r#"퉕"#, r#"퉕"#, r#"퉕"#),
+        (r#"퉖"#, r#"퉖"#, r#"퉖"#, r#"퉖"#, r#"퉖"#),
+        (r#"퉗"#, r#"퉗"#, r#"퉗"#, r#"퉗"#, r#"퉗"#),
+        (r#"퉘"#, r#"퉘"#, r#"퉘"#, r#"퉘"#, r#"퉘"#),
+        (r#"퉙"#, r#"퉙"#, r#"퉙"#, r#"퉙"#, r#"퉙"#),
+        (r#"퉚"#, r#"퉚"#, r#"퉚"#, r#"퉚"#, r#"퉚"#),
+        (r#"퉛"#, r#"퉛"#, r#"퉛"#, r#"퉛"#, r#"퉛"#),
+        (r#"퉜"#, r#"퉜"#, r#"퉜"#, r#"퉜"#, r#"퉜"#),
+        (r#"퉝"#, r#"퉝"#, r#"퉝"#, r#"퉝"#, r#"퉝"#),
+        (r#"퉞"#, r#"퉞"#, r#"퉞"#, r#"퉞"#, r#"퉞"#),
+        (r#"퉟"#, r#"퉟"#, r#"퉟"#, r#"퉟"#, r#"퉟"#),
+        (r#"퉠"#, r#"퉠"#, r#"퉠"#, r#"퉠"#, r#"퉠"#),
+        (r#"퉡"#, r#"퉡"#, r#"퉡"#, r#"퉡"#, r#"퉡"#),
+        (r#"퉢"#, r#"퉢"#, r#"퉢"#, r#"퉢"#, r#"퉢"#),
+        (r#"퉣"#, r#"퉣"#, r#"퉣"#, r#"퉣"#, r#"퉣"#),
+        (r#"퉤"#, r#"퉤"#, r#"퉤"#, r#"퉤"#, r#"퉤"#),
+        (r#"퉥"#, r#"퉥"#, r#"퉥"#, r#"퉥"#, r#"퉥"#),
+        (r#"퉦"#, r#"퉦"#, r#"퉦"#, r#"퉦"#, r#"퉦"#),
+        (r#"퉧"#, r#"퉧"#, r#"퉧"#, r#"퉧"#, r#"퉧"#),
+        (r#"퉨"#, r#"퉨"#, r#"퉨"#, r#"퉨"#, r#"퉨"#),
+        (r#"퉩"#, r#"퉩"#, r#"퉩"#, r#"퉩"#, r#"퉩"#),
+        (r#"퉪"#, r#"퉪"#, r#"퉪"#, r#"퉪"#, r#"퉪"#),
+        (r#"퉫"#, r#"퉫"#, r#"퉫"#, r#"퉫"#, r#"퉫"#),
+        (r#"퉬"#, r#"퉬"#, r#"퉬"#, r#"퉬"#, r#"퉬"#),
+        (r#"퉭"#, r#"퉭"#, r#"퉭"#, r#"퉭"#, r#"퉭"#),
+        (r#"퉮"#, r#"퉮"#, r#"퉮"#, r#"퉮"#, r#"퉮"#),
+        (r#"퉯"#, r#"퉯"#, r#"퉯"#, r#"퉯"#, r#"퉯"#),
+        (r#"퉰"#, r#"퉰"#, r#"퉰"#, r#"퉰"#, r#"퉰"#),
+        (r#"퉱"#, r#"퉱"#, r#"퉱"#, r#"퉱"#, r#"퉱"#),
+        (r#"퉲"#, r#"퉲"#, r#"퉲"#, r#"퉲"#, r#"퉲"#),
+        (r#"퉳"#, r#"퉳"#, r#"퉳"#, r#"퉳"#, r#"퉳"#),
+        (r#"퉴"#, r#"퉴"#, r#"퉴"#, r#"퉴"#, r#"퉴"#),
+        (r#"퉵"#, r#"퉵"#, r#"퉵"#, r#"퉵"#, r#"퉵"#),
+        (r#"퉶"#, r#"퉶"#, r#"퉶"#, r#"퉶"#, r#"퉶"#),
+        (r#"퉷"#, r#"퉷"#, r#"퉷"#, r#"퉷"#, r#"퉷"#),
+        (r#"퉸"#, r#"퉸"#, r#"퉸"#, r#"퉸"#, r#"퉸"#),
+        (r#"퉹"#, r#"퉹"#, r#"퉹"#, r#"퉹"#, r#"퉹"#),
+        (r#"퉺"#, r#"퉺"#, r#"퉺"#, r#"퉺"#, r#"퉺"#),
+        (r#"퉻"#, r#"퉻"#, r#"퉻"#, r#"퉻"#, r#"퉻"#),
+        (r#"퉼"#, r#"퉼"#, r#"퉼"#, r#"퉼"#, r#"퉼"#),
+        (r#"퉽"#, r#"퉽"#, r#"퉽"#, r#"퉽"#, r#"퉽"#),
+        (r#"퉾"#, r#"퉾"#, r#"퉾"#, r#"퉾"#, r#"퉾"#),
+        (r#"퉿"#, r#"퉿"#, r#"퉿"#, r#"퉿"#, r#"퉿"#),
+        (r#"튀"#, r#"튀"#, r#"튀"#, r#"튀"#, r#"튀"#),
+        (r#"튁"#, r#"튁"#, r#"튁"#, r#"튁"#, r#"튁"#),
+        (r#"튂"#, r#"튂"#, r#"튂"#, r#"튂"#, r#"튂"#),
+        (r#"튃"#, r#"튃"#, r#"튃"#, r#"튃"#, r#"튃"#),
+        (r#"튄"#, r#"튄"#, r#"튄"#, r#"튄"#, r#"튄"#),
+        (r#"튅"#, r#"튅"#, r#"튅"#, r#"튅"#, r#"튅"#),
+        (r#"튆"#, r#"튆"#, r#"튆"#, r#"튆"#, r#"튆"#),
+        (r#"튇"#, r#"튇"#, r#"튇"#, r#"튇"#, r#"튇"#),
+        (r#"튈"#, r#"튈"#, r#"튈"#, r#"튈"#, r#"튈"#),
+        (r#"튉"#, r#"튉"#, r#"튉"#, r#"튉"#, r#"튉"#),
+        (r#"튊"#, r#"튊"#, r#"튊"#, r#"튊"#, r#"튊"#),
+        (r#"튋"#, r#"튋"#, r#"튋"#, r#"튋"#, r#"튋"#),
+        (r#"튌"#, r#"튌"#, r#"튌"#, r#"튌"#, r#"튌"#),
+        (r#"튍"#, r#"튍"#, r#"튍"#, r#"튍"#, r#"튍"#),
+        (r#"튎"#, r#"튎"#, r#"튎"#, r#"튎"#, r#"튎"#),
+        (r#"튏"#, r#"튏"#, r#"튏"#, r#"튏"#, r#"튏"#),
+        (r#"튐"#, r#"튐"#, r#"튐"#, r#"튐"#, r#"튐"#),
+        (r#"튑"#, r#"튑"#, r#"튑"#, r#"튑"#, r#"튑"#),
+        (r#"튒"#, r#"튒"#, r#"튒"#, r#"튒"#, r#"튒"#),
+        (r#"튓"#, r#"튓"#, r#"튓"#, r#"튓"#, r#"튓"#),
+        (r#"튔"#, r#"튔"#, r#"튔"#, r#"튔"#, r#"튔"#),
+        (r#"튕"#, r#"튕"#, r#"튕"#, r#"튕"#, r#"튕"#),
+        (r#"튖"#, r#"튖"#, r#"튖"#, r#"튖"#, r#"튖"#),
+        (r#"튗"#, r#"튗"#, r#"튗"#, r#"튗"#, r#"튗"#),
+        (r#"튘"#, r#"튘"#, r#"튘"#, r#"튘"#, r#"튘"#),
+        (r#"튙"#, r#"튙"#, r#"튙"#, r#"튙"#, r#"튙"#),
+        (r#"튚"#, r#"튚"#, r#"튚"#, r#"튚"#, r#"튚"#),
+        (r#"튛"#, r#"튛"#, r#"튛"#, r#"튛"#, r#"튛"#),
+        (r#"튜"#, r#"튜"#, r#"튜"#, r#"튜"#, r#"튜"#),
+        (r#"튝"#, r#"튝"#, r#"튝"#, r#"튝"#, r#"튝"#),
+        (r#"튞"#, r#"튞"#, r#"튞"#, r#"튞"#, r#"튞"#),
+        (r#"튟"#, r#"튟"#, r#"튟"#, r#"튟"#, r#"튟"#),
+        (r#"튠"#, r#"튠"#, r#"튠"#, r#"튠"#, r#"튠"#),
+        (r#"튡"#, r#"튡"#, r#"튡"#, r#"튡"#, r#"튡"#),
+        (r#"튢"#, r#"튢"#, r#"튢"#, r#"튢"#, r#"튢"#),
+        (r#"튣"#, r#"튣"#, r#"튣"#, r#"튣"#, r#"튣"#),
+        (r#"튤"#, r#"튤"#, r#"튤"#, r#"튤"#, r#"튤"#),
+        (r#"튥"#, r#"튥"#, r#"튥"#, r#"튥"#, r#"튥"#),
+        (r#"튦"#, r#"튦"#, r#"튦"#, r#"튦"#, r#"튦"#),
+        (r#"튧"#, r#"튧"#, r#"튧"#, r#"튧"#, r#"튧"#),
+        (r#"튨"#, r#"튨"#, r#"튨"#, r#"튨"#, r#"튨"#),
+        (r#"튩"#, r#"튩"#, r#"튩"#, r#"튩"#, r#"튩"#),
+        (r#"튪"#, r#"튪"#, r#"튪"#, r#"튪"#, r#"튪"#),
+        (r#"튫"#, r#"튫"#, r#"튫"#, r#"튫"#, r#"튫"#),
+        (r#"튬"#, r#"튬"#, r#"튬"#, r#"튬"#, r#"튬"#),
+        (r#"튭"#, r#"튭"#, r#"튭"#, r#"튭"#, r#"튭"#),
+        (r#"튮"#, r#"튮"#, r#"튮"#, r#"튮"#, r#"튮"#),
+        (r#"튯"#, r#"튯"#, r#"튯"#, r#"튯"#, r#"튯"#),
+        (r#"튰"#, r#"튰"#, r#"튰"#, r#"튰"#, r#"튰"#),
+        (r#"튱"#, r#"튱"#, r#"튱"#, r#"튱"#, r#"튱"#),
+        (r#"튲"#, r#"튲"#, r#"튲"#, r#"튲"#, r#"튲"#),
+        (r#"튳"#, r#"튳"#, r#"튳"#, r#"튳"#, r#"튳"#),
+        (r#"튴"#, r#"튴"#, r#"튴"#, r#"튴"#, r#"튴"#),
+        (r#"튵"#, r#"튵"#, r#"튵"#, r#"튵"#, r#"튵"#),
+        (r#"튶"#, r#"튶"#, r#"튶"#, r#"튶"#, r#"튶"#),
+        (r#"튷"#, r#"튷"#, r#"튷"#, r#"튷"#, r#"튷"#),
+        (r#"트"#, r#"트"#, r#"트"#, r#"트"#, r#"트"#),
+        (r#"특"#, r#"특"#, r#"특"#, r#"특"#, r#"특"#),
+        (r#"튺"#, r#"튺"#, r#"튺"#, r#"튺"#, r#"튺"#),
+        (r#"튻"#, r#"튻"#, r#"튻"#, r#"튻"#, r#"튻"#),
+        (r#"튼"#, r#"튼"#, r#"튼"#, r#"튼"#, r#"튼"#),
+        (r#"튽"#, r#"튽"#, r#"튽"#, r#"튽"#, r#"튽"#),
+        (r#"튾"#, r#"튾"#, r#"튾"#, r#"튾"#, r#"튾"#),
+        (r#"튿"#, r#"튿"#, r#"튿"#, r#"튿"#, r#"튿"#),
+        (r#"틀"#, r#"틀"#, r#"틀"#, r#"틀"#, r#"틀"#),
+        (r#"틁"#, r#"틁"#, r#"틁"#, r#"틁"#, r#"틁"#),
+        (r#"틂"#, r#"틂"#, r#"틂"#, r#"틂"#, r#"틂"#),
+        (r#"틃"#, r#"틃"#, r#"틃"#, r#"틃"#, r#"틃"#),
+        (r#"틄"#, r#"틄"#, r#"틄"#, r#"틄"#, r#"틄"#),
+        (r#"틅"#, r#"틅"#, r#"틅"#, r#"틅"#, r#"틅"#),
+        (r#"틆"#, r#"틆"#, r#"틆"#, r#"틆"#, r#"틆"#),
+        (r#"틇"#, r#"틇"#, r#"틇"#, r#"틇"#, r#"틇"#),
+        (r#"틈"#, r#"틈"#, r#"틈"#, r#"틈"#, r#"틈"#),
+        (r#"틉"#, r#"틉"#, r#"틉"#, r#"틉"#, r#"틉"#),
+        (r#"틊"#, r#"틊"#, r#"틊"#, r#"틊"#, r#"틊"#),
+        (r#"틋"#, r#"틋"#, r#"틋"#, r#"틋"#, r#"틋"#),
+        (r#"틌"#, r#"틌"#, r#"틌"#, r#"틌"#, r#"틌"#),
+        (r#"틍"#, r#"틍"#, r#"틍"#, r#"틍"#, r#"틍"#),
+        (r#"틎"#, r#"틎"#, r#"틎"#, r#"틎"#, r#"틎"#),
+        (r#"틏"#, r#"틏"#, r#"틏"#, r#"틏"#, r#"틏"#),
+        (r#"틐"#, r#"틐"#, r#"틐"#, r#"틐"#, r#"틐"#),
+        (r#"틑"#, r#"틑"#, r#"틑"#, r#"틑"#, r#"틑"#),
+        (r#"틒"#, r#"틒"#, r#"틒"#, r#"틒"#, r#"틒"#),
+        (r#"틓"#, r#"틓"#, r#"틓"#, r#"틓"#, r#"틓"#),
+        (r#"틔"#, r#"틔"#, r#"틔"#, r#"틔"#, r#"틔"#),
+        (r#"틕"#, r#"틕"#, r#"틕"#, r#"틕"#, r#"틕"#),
+        (r#"틖"#, r#"틖"#, r#"틖"#, r#"틖"#, r#"틖"#),
+        (r#"틗"#, r#"틗"#, r#"틗"#, r#"틗"#, r#"틗"#),
+        (r#"틘"#, r#"틘"#, r#"틘"#, r#"틘"#, r#"틘"#),
+        (r#"틙"#, r#"틙"#, r#"틙"#, r#"틙"#, r#"틙"#),
+        (r#"틚"#, r#"틚"#, r#"틚"#, r#"틚"#, r#"틚"#),
+        (r#"틛"#, r#"틛"#, r#"틛"#, r#"틛"#, r#"틛"#),
+        (r#"틜"#, r#"틜"#, r#"틜"#, r#"틜"#, r#"틜"#),
+        (r#"틝"#, r#"틝"#, r#"틝"#, r#"틝"#, r#"틝"#),
+        (r#"틞"#, r#"틞"#, r#"틞"#, r#"틞"#, r#"틞"#),
+        (r#"틟"#, r#"틟"#, r#"틟"#, r#"틟"#, r#"틟"#),
+        (r#"틠"#, r#"틠"#, r#"틠"#, r#"틠"#, r#"틠"#),
+        (r#"틡"#, r#"틡"#, r#"틡"#, r#"틡"#, r#"틡"#),
+        (r#"틢"#, r#"틢"#, r#"틢"#, r#"틢"#, r#"틢"#),
+        (r#"틣"#, r#"틣"#, r#"틣"#, r#"틣"#, r#"틣"#),
+        (r#"틤"#, r#"틤"#, r#"틤"#, r#"틤"#, r#"틤"#),
+        (r#"틥"#, r#"틥"#, r#"틥"#, r#"틥"#, r#"틥"#),
+        (r#"틦"#, r#"틦"#, r#"틦"#, r#"틦"#, r#"틦"#),
+        (r#"틧"#, r#"틧"#, r#"틧"#, r#"틧"#, r#"틧"#),
+        (r#"틨"#, r#"틨"#, r#"틨"#, r#"틨"#, r#"틨"#),
+        (r#"틩"#, r#"틩"#, r#"틩"#, r#"틩"#, r#"틩"#),
+        (r#"틪"#, r#"틪"#, r#"틪"#, r#"틪"#, r#"틪"#),
+        (r#"틫"#, r#"틫"#, r#"틫"#, r#"틫"#, r#"틫"#),
+        (r#"틬"#, r#"틬"#, r#"틬"#, r#"틬"#, r#"틬"#),
+        (r#"틭"#, r#"틭"#, r#"틭"#, r#"틭"#, r#"틭"#),
+        (r#"틮"#, r#"틮"#, r#"틮"#, r#"틮"#, r#"틮"#),
+        (r#"틯"#, r#"틯"#, r#"틯"#, r#"틯"#, r#"틯"#),
+        (r#"티"#, r#"티"#, r#"티"#, r#"티"#, r#"티"#),
+        (r#"틱"#, r#"틱"#, r#"틱"#, r#"틱"#, r#"틱"#),
+        (r#"틲"#, r#"틲"#, r#"틲"#, r#"틲"#, r#"틲"#),
+        (r#"틳"#, r#"틳"#, r#"틳"#, r#"틳"#, r#"틳"#),
+        (r#"틴"#, r#"틴"#, r#"틴"#, r#"틴"#, r#"틴"#),
+        (r#"틵"#, r#"틵"#, r#"틵"#, r#"틵"#, r#"틵"#),
+        (r#"틶"#, r#"틶"#, r#"틶"#, r#"틶"#, r#"틶"#),
+        (r#"틷"#, r#"틷"#, r#"틷"#, r#"틷"#, r#"틷"#),
+        (r#"틸"#, r#"틸"#, r#"틸"#, r#"틸"#, r#"틸"#),
+        (r#"틹"#, r#"틹"#, r#"틹"#, r#"틹"#, r#"틹"#),
+        (r#"틺"#, r#"틺"#, r#"틺"#, r#"틺"#, r#"틺"#),
+        (r#"틻"#, r#"틻"#, r#"틻"#, r#"틻"#, r#"틻"#),
+        (r#"틼"#, r#"틼"#, r#"틼"#, r#"틼"#, r#"틼"#),
+        (r#"틽"#, r#"틽"#, r#"틽"#, r#"틽"#, r#"틽"#),
+        (r#"틾"#, r#"틾"#, r#"틾"#, r#"틾"#, r#"틾"#),
+        (r#"틿"#, r#"틿"#, r#"틿"#, r#"틿"#, r#"틿"#),
+        (r#"팀"#, r#"팀"#, r#"팀"#, r#"팀"#, r#"팀"#),
+        (r#"팁"#, r#"팁"#, r#"팁"#, r#"팁"#, r#"팁"#),
+        (r#"팂"#, r#"팂"#, r#"팂"#, r#"팂"#, r#"팂"#),
+        (r#"팃"#, r#"팃"#, r#"팃"#, r#"팃"#, r#"팃"#),
+        (r#"팄"#, r#"팄"#, r#"팄"#, r#"팄"#, r#"팄"#),
+        (r#"팅"#, r#"팅"#, r#"팅"#, r#"팅"#, r#"팅"#),
+        (r#"팆"#, r#"팆"#, r#"팆"#, r#"팆"#, r#"팆"#),
+        (r#"팇"#, r#"팇"#, r#"팇"#, r#"팇"#, r#"팇"#),
+        (r#"팈"#, r#"팈"#, r#"팈"#, r#"팈"#, r#"팈"#),
+        (r#"팉"#, r#"팉"#, r#"팉"#, r#"팉"#, r#"팉"#),
+        (r#"팊"#, r#"팊"#, r#"팊"#, r#"팊"#, r#"팊"#),
+        (r#"팋"#, r#"팋"#, r#"팋"#, r#"팋"#, r#"팋"#),
+        (r#"파"#, r#"파"#, r#"파"#, r#"파"#, r#"파"#),
+        (r#"팍"#, r#"팍"#, r#"팍"#, r#"팍"#, r#"팍"#),
+        (r#"팎"#, r#"팎"#, r#"팎"#, r#"팎"#, r#"팎"#),
+        (r#"팏"#, r#"팏"#, r#"팏"#, r#"팏"#, r#"팏"#),
+        (r#"판"#, r#"판"#, r#"판"#, r#"판"#, r#"판"#),
+        (r#"팑"#, r#"팑"#, r#"팑"#, r#"팑"#, r#"팑"#),
+        (r#"팒"#, r#"팒"#, r#"팒"#, r#"팒"#, r#"팒"#),
+        (r#"팓"#, r#"팓"#, r#"팓"#, r#"팓"#, r#"팓"#),
+        (r#"팔"#, r#"팔"#, r#"팔"#, r#"팔"#, r#"팔"#),
+        (r#"팕"#, r#"팕"#, r#"팕"#, r#"팕"#, r#"팕"#),
+        (r#"팖"#, r#"팖"#, r#"팖"#, r#"팖"#, r#"팖"#),
+        (r#"팗"#, r#"팗"#, r#"팗"#, r#"팗"#, r#"팗"#),
+        (r#"팘"#, r#"팘"#, r#"팘"#, r#"팘"#, r#"팘"#),
+        (r#"팙"#, r#"팙"#, r#"팙"#, r#"팙"#, r#"팙"#),
+        (r#"팚"#, r#"팚"#, r#"팚"#, r#"팚"#, r#"팚"#),
+        (r#"팛"#, r#"팛"#, r#"팛"#, r#"팛"#, r#"팛"#),
+        (r#"팜"#, r#"팜"#, r#"팜"#, r#"팜"#, r#"팜"#),
+        (r#"팝"#, r#"팝"#, r#"팝"#, r#"팝"#, r#"팝"#),
+        (r#"팞"#, r#"팞"#, r#"팞"#, r#"팞"#, r#"팞"#),
+        (r#"팟"#, r#"팟"#, r#"팟"#, r#"팟"#, r#"팟"#),
+        (r#"팠"#, r#"팠"#, r#"팠"#, r#"팠"#, r#"팠"#),
+        (r#"팡"#, r#"팡"#, r#"팡"#, r#"팡"#, r#"팡"#),
+        (r#"팢"#, r#"팢"#, r#"팢"#, r#"팢"#, r#"팢"#),
+        (r#"팣"#, r#"팣"#, r#"팣"#, r#"팣"#, r#"팣"#),
+        (r#"팤"#, r#"팤"#, r#"팤"#, r#"팤"#, r#"팤"#),
+        (r#"팥"#, r#"팥"#, r#"팥"#, r#"팥"#, r#"팥"#),
+        (r#"팦"#, r#"팦"#, r#"팦"#, r#"팦"#, r#"팦"#),
+        (r#"팧"#, r#"팧"#, r#"팧"#, r#"팧"#, r#"팧"#),
+        (r#"패"#, r#"패"#, r#"패"#, r#"패"#, r#"패"#),
+        (r#"팩"#, r#"팩"#, r#"팩"#, r#"팩"#, r#"팩"#),
+        (r#"팪"#, r#"팪"#, r#"팪"#, r#"팪"#, r#"팪"#),
+        (r#"팫"#, r#"팫"#, r#"팫"#, r#"팫"#, r#"팫"#),
+        (r#"팬"#, r#"팬"#, r#"팬"#, r#"팬"#, r#"팬"#),
+        (r#"팭"#, r#"팭"#, r#"팭"#, r#"팭"#, r#"팭"#),
+        (r#"팮"#, r#"팮"#, r#"팮"#, r#"팮"#, r#"팮"#),
+        (r#"팯"#, r#"팯"#, r#"팯"#, r#"팯"#, r#"팯"#),
+        (r#"팰"#, r#"팰"#, r#"팰"#, r#"팰"#, r#"팰"#),
+        (r#"팱"#, r#"팱"#, r#"팱"#, r#"팱"#, r#"팱"#),
+        (r#"팲"#, r#"팲"#, r#"팲"#, r#"팲"#, r#"팲"#),
+        (r#"팳"#, r#"팳"#, r#"팳"#, r#"팳"#, r#"팳"#),
+        (r#"팴"#, r#"팴"#, r#"팴"#, r#"팴"#, r#"팴"#),
+        (r#"팵"#, r#"팵"#, r#"팵"#, r#"팵"#, r#"팵"#),
+        (r#"팶"#, r#"팶"#, r#"팶"#, r#"팶"#, r#"팶"#),
+        (r#"팷"#, r#"팷"#, r#"팷"#, r#"팷"#, r#"팷"#),
+        (r#"팸"#, r#"팸"#, r#"팸"#, r#"팸"#, r#"팸"#),
+        (r#"팹"#, r#"팹"#, r#"팹"#, r#"팹"#, r#"팹"#),
+        (r#"팺"#, r#"팺"#, r#"팺"#, r#"팺"#, r#"팺"#),
+        (r#"팻"#, r#"팻"#, r#"팻"#, r#"팻"#, r#"팻"#),
+        (r#"팼"#, r#"팼"#, r#"팼"#, r#"팼"#, r#"팼"#),
+        (r#"팽"#, r#"팽"#, r#"팽"#, r#"팽"#, r#"팽"#),
+        (r#"팾"#, r#"팾"#, r#"팾"#, r#"팾"#, r#"팾"#),
+        (r#"팿"#, r#"팿"#, r#"팿"#, r#"팿"#, r#"팿"#),
+        (r#"퍀"#, r#"퍀"#, r#"퍀"#, r#"퍀"#, r#"퍀"#),
+        (r#"퍁"#, r#"퍁"#, r#"퍁"#, r#"퍁"#, r#"퍁"#),
+        (r#"퍂"#, r#"퍂"#, r#"퍂"#, r#"퍂"#, r#"퍂"#),
+        (r#"퍃"#, r#"퍃"#, r#"퍃"#, r#"퍃"#, r#"퍃"#),
+        (r#"퍄"#, r#"퍄"#, r#"퍄"#, r#"퍄"#, r#"퍄"#),
+        (r#"퍅"#, r#"퍅"#, r#"퍅"#, r#"퍅"#, r#"퍅"#),
+        (r#"퍆"#, r#"퍆"#, r#"퍆"#, r#"퍆"#, r#"퍆"#),
+        (r#"퍇"#, r#"퍇"#, r#"퍇"#, r#"퍇"#, r#"퍇"#),
+        (r#"퍈"#, r#"퍈"#, r#"퍈"#, r#"퍈"#, r#"퍈"#),
+        (r#"퍉"#, r#"퍉"#, r#"퍉"#, r#"퍉"#, r#"퍉"#),
+        (r#"퍊"#, r#"퍊"#, r#"퍊"#, r#"퍊"#, r#"퍊"#),
+        (r#"퍋"#, r#"퍋"#, r#"퍋"#, r#"퍋"#, r#"퍋"#),
+        (r#"퍌"#, r#"퍌"#, r#"퍌"#, r#"퍌"#, r#"퍌"#),
+        (r#"퍍"#, r#"퍍"#, r#"퍍"#, r#"퍍"#, r#"퍍"#),
+        (r#"퍎"#, r#"퍎"#, r#"퍎"#, r#"퍎"#, r#"퍎"#),
+        (r#"퍏"#, r#"퍏"#, r#"퍏"#, r#"퍏"#, r#"퍏"#),
+        (r#"퍐"#, r#"퍐"#, r#"퍐"#, r#"퍐"#, r#"퍐"#),
+        (r#"퍑"#, r#"퍑"#, r#"퍑"#, r#"퍑"#, r#"퍑"#),
+        (r#"퍒"#, r#"퍒"#, r#"퍒"#, r#"퍒"#, r#"퍒"#),
+        (r#"퍓"#, r#"퍓"#, r#"퍓"#, r#"퍓"#, r#"퍓"#),
+        (r#"퍔"#, r#"퍔"#, r#"퍔"#, r#"퍔"#, r#"퍔"#),
+        (r#"퍕"#, r#"퍕"#, r#"퍕"#, r#"퍕"#, r#"퍕"#),
+        (r#"퍖"#, r#"퍖"#, r#"퍖"#, r#"퍖"#, r#"퍖"#),
+        (r#"퍗"#, r#"퍗"#, r#"퍗"#, r#"퍗"#, r#"퍗"#),
+        (r#"퍘"#, r#"퍘"#, r#"퍘"#, r#"퍘"#, r#"퍘"#),
+        (r#"퍙"#, r#"퍙"#, r#"퍙"#, r#"퍙"#, r#"퍙"#),
+        (r#"퍚"#, r#"퍚"#, r#"퍚"#, r#"퍚"#, r#"퍚"#),
+        (r#"퍛"#, r#"퍛"#, r#"퍛"#, r#"퍛"#, r#"퍛"#),
+        (r#"퍜"#, r#"퍜"#, r#"퍜"#, r#"퍜"#, r#"퍜"#),
+        (r#"퍝"#, r#"퍝"#, r#"퍝"#, r#"퍝"#, r#"퍝"#),
+        (r#"퍞"#, r#"퍞"#, r#"퍞"#, r#"퍞"#, r#"퍞"#),
+        (r#"퍟"#, r#"퍟"#, r#"퍟"#, r#"퍟"#, r#"퍟"#),
+        (r#"퍠"#, r#"퍠"#, r#"퍠"#, r#"퍠"#, r#"퍠"#),
+        (r#"퍡"#, r#"퍡"#, r#"퍡"#, r#"퍡"#, r#"퍡"#),
+        (r#"퍢"#, r#"퍢"#, r#"퍢"#, r#"퍢"#, r#"퍢"#),
+        (r#"퍣"#, r#"퍣"#, r#"퍣"#, r#"퍣"#, r#"퍣"#),
+        (r#"퍤"#, r#"퍤"#, r#"퍤"#, r#"퍤"#, r#"퍤"#),
+        (r#"퍥"#, r#"퍥"#, r#"퍥"#, r#"퍥"#, r#"퍥"#),
+        (r#"퍦"#, r#"퍦"#, r#"퍦"#, r#"퍦"#, r#"퍦"#),
+        (r#"퍧"#, r#"퍧"#, r#"퍧"#, r#"퍧"#, r#"퍧"#),
+        (r#"퍨"#, r#"퍨"#, r#"퍨"#, r#"퍨"#, r#"퍨"#),
+        (r#"퍩"#, r#"퍩"#, r#"퍩"#, r#"퍩"#, r#"퍩"#),
+        (r#"퍪"#, r#"퍪"#, r#"퍪"#, r#"퍪"#, r#"퍪"#),
+        (r#"퍫"#, r#"퍫"#, r#"퍫"#, r#"퍫"#, r#"퍫"#),
+        (r#"퍬"#, r#"퍬"#, r#"퍬"#, r#"퍬"#, r#"퍬"#),
+        (r#"퍭"#, r#"퍭"#, r#"퍭"#, r#"퍭"#, r#"퍭"#),
+        (r#"퍮"#, r#"퍮"#, r#"퍮"#, r#"퍮"#, r#"퍮"#),
+        (r#"퍯"#, r#"퍯"#, r#"퍯"#, r#"퍯"#, r#"퍯"#),
+        (r#"퍰"#, r#"퍰"#, r#"퍰"#, r#"퍰"#, r#"퍰"#),
+        (r#"퍱"#, r#"퍱"#, r#"퍱"#, r#"퍱"#, r#"퍱"#),
+        (r#"퍲"#, r#"퍲"#, r#"퍲"#, r#"퍲"#, r#"퍲"#),
+        (r#"퍳"#, r#"퍳"#, r#"퍳"#, r#"퍳"#, r#"퍳"#),
+        (r#"퍴"#, r#"퍴"#, r#"퍴"#, r#"퍴"#, r#"퍴"#),
+        (r#"퍵"#, r#"퍵"#, r#"퍵"#, r#"퍵"#, r#"퍵"#),
+        (r#"퍶"#, r#"퍶"#, r#"퍶"#, r#"퍶"#, r#"퍶"#),
+        (r#"퍷"#, r#"퍷"#, r#"퍷"#, r#"퍷"#, r#"퍷"#),
+        (r#"퍸"#, r#"퍸"#, r#"퍸"#, r#"퍸"#, r#"퍸"#),
+        (r#"퍹"#, r#"퍹"#, r#"퍹"#, r#"퍹"#, r#"퍹"#),
+        (r#"퍺"#, r#"퍺"#, r#"퍺"#, r#"퍺"#, r#"퍺"#),
+        (r#"퍻"#, r#"퍻"#, r#"퍻"#, r#"퍻"#, r#"퍻"#),
+        (r#"퍼"#, r#"퍼"#, r#"퍼"#, r#"퍼"#, r#"퍼"#),
+        (r#"퍽"#, r#"퍽"#, r#"퍽"#, r#"퍽"#, r#"퍽"#),
+        (r#"퍾"#, r#"퍾"#, r#"퍾"#, r#"퍾"#, r#"퍾"#),
+        (r#"퍿"#, r#"퍿"#, r#"퍿"#, r#"퍿"#, r#"퍿"#),
+        (r#"펀"#, r#"펀"#, r#"펀"#, r#"펀"#, r#"펀"#),
+        (r#"펁"#, r#"펁"#, r#"펁"#, r#"펁"#, r#"펁"#),
+        (r#"펂"#, r#"펂"#, r#"펂"#, r#"펂"#, r#"펂"#),
+        (r#"펃"#, r#"펃"#, r#"펃"#, r#"펃"#, r#"펃"#),
+        (r#"펄"#, r#"펄"#, r#"펄"#, r#"펄"#, r#"펄"#),
+        (r#"펅"#, r#"펅"#, r#"펅"#, r#"펅"#, r#"펅"#),
+        (r#"펆"#, r#"펆"#, r#"펆"#, r#"펆"#, r#"펆"#),
+        (r#"펇"#, r#"펇"#, r#"펇"#, r#"펇"#, r#"펇"#),
+        (r#"펈"#, r#"펈"#, r#"펈"#, r#"펈"#, r#"펈"#),
+        (r#"펉"#, r#"펉"#, r#"펉"#, r#"펉"#, r#"펉"#),
+        (r#"펊"#, r#"펊"#, r#"펊"#, r#"펊"#, r#"펊"#),
+        (r#"펋"#, r#"펋"#, r#"펋"#, r#"펋"#, r#"펋"#),
+        (r#"펌"#, r#"펌"#, r#"펌"#, r#"펌"#, r#"펌"#),
+        (r#"펍"#, r#"펍"#, r#"펍"#, r#"펍"#, r#"펍"#),
+        (r#"펎"#, r#"펎"#, r#"펎"#, r#"펎"#, r#"펎"#),
+        (r#"펏"#, r#"펏"#, r#"펏"#, r#"펏"#, r#"펏"#),
+        (r#"펐"#, r#"펐"#, r#"펐"#, r#"펐"#, r#"펐"#),
+        (r#"펑"#, r#"펑"#, r#"펑"#, r#"펑"#, r#"펑"#),
+        (r#"펒"#, r#"펒"#, r#"펒"#, r#"펒"#, r#"펒"#),
+        (r#"펓"#, r#"펓"#, r#"펓"#, r#"펓"#, r#"펓"#),
+        (r#"펔"#, r#"펔"#, r#"펔"#, r#"펔"#, r#"펔"#),
+        (r#"펕"#, r#"펕"#, r#"펕"#, r#"펕"#, r#"펕"#),
+        (r#"펖"#, r#"펖"#, r#"펖"#, r#"펖"#, r#"펖"#),
+        (r#"펗"#, r#"펗"#, r#"펗"#, r#"펗"#, r#"펗"#),
+        (r#"페"#, r#"페"#, r#"페"#, r#"페"#, r#"페"#),
+        (r#"펙"#, r#"펙"#, r#"펙"#, r#"펙"#, r#"펙"#),
+        (r#"펚"#, r#"펚"#, r#"펚"#, r#"펚"#, r#"펚"#),
+        (r#"펛"#, r#"펛"#, r#"펛"#, r#"펛"#, r#"펛"#),
+        (r#"펜"#, r#"펜"#, r#"펜"#, r#"펜"#, r#"펜"#),
+        (r#"펝"#, r#"펝"#, r#"펝"#, r#"펝"#, r#"펝"#),
+        (r#"펞"#, r#"펞"#, r#"펞"#, r#"펞"#, r#"펞"#),
+        (r#"펟"#, r#"펟"#, r#"펟"#, r#"펟"#, r#"펟"#),
+        (r#"펠"#, r#"펠"#, r#"펠"#, r#"펠"#, r#"펠"#),
+        (r#"펡"#, r#"펡"#, r#"펡"#, r#"펡"#, r#"펡"#),
+        (r#"펢"#, r#"펢"#, r#"펢"#, r#"펢"#, r#"펢"#),
+        (r#"펣"#, r#"펣"#, r#"펣"#, r#"펣"#, r#"펣"#),
+        (r#"펤"#, r#"펤"#, r#"펤"#, r#"펤"#, r#"펤"#),
+        (r#"펥"#, r#"펥"#, r#"펥"#, r#"펥"#, r#"펥"#),
+        (r#"펦"#, r#"펦"#, r#"펦"#, r#"펦"#, r#"펦"#),
+        (r#"펧"#, r#"펧"#, r#"펧"#, r#"펧"#, r#"펧"#),
+        (r#"펨"#, r#"펨"#, r#"펨"#, r#"펨"#, r#"펨"#),
+        (r#"펩"#, r#"펩"#, r#"펩"#, r#"펩"#, r#"펩"#),
+        (r#"펪"#, r#"펪"#, r#"펪"#, r#"펪"#, r#"펪"#),
+        (r#"펫"#, r#"펫"#, r#"펫"#, r#"펫"#, r#"펫"#),
+        (r#"펬"#, r#"펬"#, r#"펬"#, r#"펬"#, r#"펬"#),
+        (r#"펭"#, r#"펭"#, r#"펭"#, r#"펭"#, r#"펭"#),
+        (r#"펮"#, r#"펮"#, r#"펮"#, r#"펮"#, r#"펮"#),
+        (r#"펯"#, r#"펯"#, r#"펯"#, r#"펯"#, r#"펯"#),
+        (r#"펰"#, r#"펰"#, r#"펰"#, r#"펰"#, r#"펰"#),
+        (r#"펱"#, r#"펱"#, r#"펱"#, r#"펱"#, r#"펱"#),
+        (r#"펲"#, r#"펲"#, r#"펲"#, r#"펲"#, r#"펲"#),
+        (r#"펳"#, r#"펳"#, r#"펳"#, r#"펳"#, r#"펳"#),
+        (r#"펴"#, r#"펴"#, r#"펴"#, r#"펴"#, r#"펴"#),
+        (r#"펵"#, r#"펵"#, r#"펵"#, r#"펵"#, r#"펵"#),
+        (r#"펶"#, r#"펶"#, r#"펶"#, r#"펶"#, r#"펶"#),
+        (r#"펷"#, r#"펷"#, r#"펷"#, r#"펷"#, r#"펷"#),
+        (r#"편"#, r#"편"#, r#"편"#, r#"편"#, r#"편"#),
+        (r#"펹"#, r#"펹"#, r#"펹"#, r#"펹"#, r#"펹"#),
+        (r#"펺"#, r#"펺"#, r#"펺"#, r#"펺"#, r#"펺"#),
+        (r#"펻"#, r#"펻"#, r#"펻"#, r#"펻"#, r#"펻"#),
+        (r#"펼"#, r#"펼"#, r#"펼"#, r#"펼"#, r#"펼"#),
+        (r#"펽"#, r#"펽"#, r#"펽"#, r#"펽"#, r#"펽"#),
+        (r#"펾"#, r#"펾"#, r#"펾"#, r#"펾"#, r#"펾"#),
+        (r#"펿"#, r#"펿"#, r#"펿"#, r#"펿"#, r#"펿"#),
+        (r#"폀"#, r#"폀"#, r#"폀"#, r#"폀"#, r#"폀"#),
+        (r#"폁"#, r#"폁"#, r#"폁"#, r#"폁"#, r#"폁"#),
+        (r#"폂"#, r#"폂"#, r#"폂"#, r#"폂"#, r#"폂"#),
+        (r#"폃"#, r#"폃"#, r#"폃"#, r#"폃"#, r#"폃"#),
+        (r#"폄"#, r#"폄"#, r#"폄"#, r#"폄"#, r#"폄"#),
+        (r#"폅"#, r#"폅"#, r#"폅"#, r#"폅"#, r#"폅"#),
+        (r#"폆"#, r#"폆"#, r#"폆"#, r#"폆"#, r#"폆"#),
+        (r#"폇"#, r#"폇"#, r#"폇"#, r#"폇"#, r#"폇"#),
+        (r#"폈"#, r#"폈"#, r#"폈"#, r#"폈"#, r#"폈"#),
+        (r#"평"#, r#"평"#, r#"평"#, r#"평"#, r#"평"#),
+        (r#"폊"#, r#"폊"#, r#"폊"#, r#"폊"#, r#"폊"#),
+        (r#"폋"#, r#"폋"#, r#"폋"#, r#"폋"#, r#"폋"#),
+        (r#"폌"#, r#"폌"#, r#"폌"#, r#"폌"#, r#"폌"#),
+        (r#"폍"#, r#"폍"#, r#"폍"#, r#"폍"#, r#"폍"#),
+        (r#"폎"#, r#"폎"#, r#"폎"#, r#"폎"#, r#"폎"#),
+        (r#"폏"#, r#"폏"#, r#"폏"#, r#"폏"#, r#"폏"#),
+        (r#"폐"#, r#"폐"#, r#"폐"#, r#"폐"#, r#"폐"#),
+        (r#"폑"#, r#"폑"#, r#"폑"#, r#"폑"#, r#"폑"#),
+        (r#"폒"#, r#"폒"#, r#"폒"#, r#"폒"#, r#"폒"#),
+        (r#"폓"#, r#"폓"#, r#"폓"#, r#"폓"#, r#"폓"#),
+        (r#"폔"#, r#"폔"#, r#"폔"#, r#"폔"#, r#"폔"#),
+        (r#"폕"#, r#"폕"#, r#"폕"#, r#"폕"#, r#"폕"#),
+        (r#"폖"#, r#"폖"#, r#"폖"#, r#"폖"#, r#"폖"#),
+        (r#"폗"#, r#"폗"#, r#"폗"#, r#"폗"#, r#"폗"#),
+        (r#"폘"#, r#"폘"#, r#"폘"#, r#"폘"#, r#"폘"#),
+        (r#"폙"#, r#"폙"#, r#"폙"#, r#"폙"#, r#"폙"#),
+        (r#"폚"#, r#"폚"#, r#"폚"#, r#"폚"#, r#"폚"#),
+        (r#"폛"#, r#"폛"#, r#"폛"#, r#"폛"#, r#"폛"#),
+        (r#"폜"#, r#"폜"#, r#"폜"#, r#"폜"#, r#"폜"#),
+        (r#"폝"#, r#"폝"#, r#"폝"#, r#"폝"#, r#"폝"#),
+        (r#"폞"#, r#"폞"#, r#"폞"#, r#"폞"#, r#"폞"#),
+        (r#"폟"#, r#"폟"#, r#"폟"#, r#"폟"#, r#"폟"#),
+        (r#"폠"#, r#"폠"#, r#"폠"#, r#"폠"#, r#"폠"#),
+        (r#"폡"#, r#"폡"#, r#"폡"#, r#"폡"#, r#"폡"#),
+        (r#"폢"#, r#"폢"#, r#"폢"#, r#"폢"#, r#"폢"#),
+        (r#"폣"#, r#"폣"#, r#"폣"#, r#"폣"#, r#"폣"#),
+        (r#"폤"#, r#"폤"#, r#"폤"#, r#"폤"#, r#"폤"#),
+        (r#"폥"#, r#"폥"#, r#"폥"#, r#"폥"#, r#"폥"#),
+        (r#"폦"#, r#"폦"#, r#"폦"#, r#"폦"#, r#"폦"#),
+        (r#"폧"#, r#"폧"#, r#"폧"#, r#"폧"#, r#"폧"#),
+        (r#"폨"#, r#"폨"#, r#"폨"#, r#"폨"#, r#"폨"#),
+        (r#"폩"#, r#"폩"#, r#"폩"#, r#"폩"#, r#"폩"#),
+        (r#"폪"#, r#"폪"#, r#"폪"#, r#"폪"#, r#"폪"#),
+        (r#"폫"#, r#"폫"#, r#"폫"#, r#"폫"#, r#"폫"#),
+        (r#"포"#, r#"포"#, r#"포"#, r#"포"#, r#"포"#),
+        (r#"폭"#, r#"폭"#, r#"폭"#, r#"폭"#, r#"폭"#),
+        (r#"폮"#, r#"폮"#, r#"폮"#, r#"폮"#, r#"폮"#),
+        (r#"폯"#, r#"폯"#, r#"폯"#, r#"폯"#, r#"폯"#),
+        (r#"폰"#, r#"폰"#, r#"폰"#, r#"폰"#, r#"폰"#),
+        (r#"폱"#, r#"폱"#, r#"폱"#, r#"폱"#, r#"폱"#),
+        (r#"폲"#, r#"폲"#, r#"폲"#, r#"폲"#, r#"폲"#),
+        (r#"폳"#, r#"폳"#, r#"폳"#, r#"폳"#, r#"폳"#),
+        (r#"폴"#, r#"폴"#, r#"폴"#, r#"폴"#, r#"폴"#),
+        (r#"폵"#, r#"폵"#, r#"폵"#, r#"폵"#, r#"폵"#),
+        (r#"폶"#, r#"폶"#, r#"폶"#, r#"폶"#, r#"폶"#),
+        (r#"폷"#, r#"폷"#, r#"폷"#, r#"폷"#, r#"폷"#),
+        (r#"폸"#, r#"폸"#, r#"폸"#, r#"폸"#, r#"폸"#),
+        (r#"폹"#, r#"폹"#, r#"폹"#, r#"폹"#, r#"폹"#),
+        (r#"폺"#, r#"폺"#, r#"폺"#, r#"폺"#, r#"폺"#),
+        (r#"폻"#, r#"폻"#, r#"폻"#, r#"폻"#, r#"폻"#),
+        (r#"폼"#, r#"폼"#, r#"폼"#, r#"폼"#, r#"폼"#),
+        (r#"폽"#, r#"폽"#, r#"폽"#, r#"폽"#, r#"폽"#),
+        (r#"폾"#, r#"폾"#, r#"폾"#, r#"폾"#, r#"폾"#),
+        (r#"폿"#, r#"폿"#, r#"폿"#, r#"폿"#, r#"폿"#),
+        (r#"퐀"#, r#"퐀"#, r#"퐀"#, r#"퐀"#, r#"퐀"#),
+        (r#"퐁"#, r#"퐁"#, r#"퐁"#, r#"퐁"#, r#"퐁"#),
+        (r#"퐂"#, r#"퐂"#, r#"퐂"#, r#"퐂"#, r#"퐂"#),
+        (r#"퐃"#, r#"퐃"#, r#"퐃"#, r#"퐃"#, r#"퐃"#),
+        (r#"퐄"#, r#"퐄"#, r#"퐄"#, r#"퐄"#, r#"퐄"#),
+        (r#"퐅"#, r#"퐅"#, r#"퐅"#, r#"퐅"#, r#"퐅"#),
+        (r#"퐆"#, r#"퐆"#, r#"퐆"#, r#"퐆"#, r#"퐆"#),
+        (r#"퐇"#, r#"퐇"#, r#"퐇"#, r#"퐇"#, r#"퐇"#),
+        (r#"퐈"#, r#"퐈"#, r#"퐈"#, r#"퐈"#, r#"퐈"#),
+        (r#"퐉"#, r#"퐉"#, r#"퐉"#, r#"퐉"#, r#"퐉"#),
+        (r#"퐊"#, r#"퐊"#, r#"퐊"#, r#"퐊"#, r#"퐊"#),
+        (r#"퐋"#, r#"퐋"#, r#"퐋"#, r#"퐋"#, r#"퐋"#),
+        (r#"퐌"#, r#"퐌"#, r#"퐌"#, r#"퐌"#, r#"퐌"#),
+        (r#"퐍"#, r#"퐍"#, r#"퐍"#, r#"퐍"#, r#"퐍"#),
+        (r#"퐎"#, r#"퐎"#, r#"퐎"#, r#"퐎"#, r#"퐎"#),
+        (r#"퐏"#, r#"퐏"#, r#"퐏"#, r#"퐏"#, r#"퐏"#),
+        (r#"퐐"#, r#"퐐"#, r#"퐐"#, r#"퐐"#, r#"퐐"#),
+        (r#"퐑"#, r#"퐑"#, r#"퐑"#, r#"퐑"#, r#"퐑"#),
+        (r#"퐒"#, r#"퐒"#, r#"퐒"#, r#"퐒"#, r#"퐒"#),
+        (r#"퐓"#, r#"퐓"#, r#"퐓"#, r#"퐓"#, r#"퐓"#),
+        (r#"퐔"#, r#"퐔"#, r#"퐔"#, r#"퐔"#, r#"퐔"#),
+        (r#"퐕"#, r#"퐕"#, r#"퐕"#, r#"퐕"#, r#"퐕"#),
+        (r#"퐖"#, r#"퐖"#, r#"퐖"#, r#"퐖"#, r#"퐖"#),
+        (r#"퐗"#, r#"퐗"#, r#"퐗"#, r#"퐗"#, r#"퐗"#),
+        (r#"퐘"#, r#"퐘"#, r#"퐘"#, r#"퐘"#, r#"퐘"#),
+        (r#"퐙"#, r#"퐙"#, r#"퐙"#, r#"퐙"#, r#"퐙"#),
+        (r#"퐚"#, r#"퐚"#, r#"퐚"#, r#"퐚"#, r#"퐚"#),
+        (r#"퐛"#, r#"퐛"#, r#"퐛"#, r#"퐛"#, r#"퐛"#),
+        (r#"퐜"#, r#"퐜"#, r#"퐜"#, r#"퐜"#, r#"퐜"#),
+        (r#"퐝"#, r#"퐝"#, r#"퐝"#, r#"퐝"#, r#"퐝"#),
+        (r#"퐞"#, r#"퐞"#, r#"퐞"#, r#"퐞"#, r#"퐞"#),
+        (r#"퐟"#, r#"퐟"#, r#"퐟"#, r#"퐟"#, r#"퐟"#),
+        (r#"퐠"#, r#"퐠"#, r#"퐠"#, r#"퐠"#, r#"퐠"#),
+        (r#"퐡"#, r#"퐡"#, r#"퐡"#, r#"퐡"#, r#"퐡"#),
+        (r#"퐢"#, r#"퐢"#, r#"퐢"#, r#"퐢"#, r#"퐢"#),
+        (r#"퐣"#, r#"퐣"#, r#"퐣"#, r#"퐣"#, r#"퐣"#),
+        (r#"퐤"#, r#"퐤"#, r#"퐤"#, r#"퐤"#, r#"퐤"#),
+        (r#"퐥"#, r#"퐥"#, r#"퐥"#, r#"퐥"#, r#"퐥"#),
+        (r#"퐦"#, r#"퐦"#, r#"퐦"#, r#"퐦"#, r#"퐦"#),
+        (r#"퐧"#, r#"퐧"#, r#"퐧"#, r#"퐧"#, r#"퐧"#),
+        (r#"퐨"#, r#"퐨"#, r#"퐨"#, r#"퐨"#, r#"퐨"#),
+        (r#"퐩"#, r#"퐩"#, r#"퐩"#, r#"퐩"#, r#"퐩"#),
+        (r#"퐪"#, r#"퐪"#, r#"퐪"#, r#"퐪"#, r#"퐪"#),
+        (r#"퐫"#, r#"퐫"#, r#"퐫"#, r#"퐫"#, r#"퐫"#),
+        (r#"퐬"#, r#"퐬"#, r#"퐬"#, r#"퐬"#, r#"퐬"#),
+        (r#"퐭"#, r#"퐭"#, r#"퐭"#, r#"퐭"#, r#"퐭"#),
+        (r#"퐮"#, r#"퐮"#, r#"퐮"#, r#"퐮"#, r#"퐮"#),
+        (r#"퐯"#, r#"퐯"#, r#"퐯"#, r#"퐯"#, r#"퐯"#),
+        (r#"퐰"#, r#"퐰"#, r#"퐰"#, r#"퐰"#, r#"퐰"#),
+        (r#"퐱"#, r#"퐱"#, r#"퐱"#, r#"퐱"#, r#"퐱"#),
+        (r#"퐲"#, r#"퐲"#, r#"퐲"#, r#"퐲"#, r#"퐲"#),
+        (r#"퐳"#, r#"퐳"#, r#"퐳"#, r#"퐳"#, r#"퐳"#),
+        (r#"퐴"#, r#"퐴"#, r#"퐴"#, r#"퐴"#, r#"퐴"#),
+        (r#"퐵"#, r#"퐵"#, r#"퐵"#, r#"퐵"#, r#"퐵"#),
+        (r#"퐶"#, r#"퐶"#, r#"퐶"#, r#"퐶"#, r#"퐶"#),
+        (r#"퐷"#, r#"퐷"#, r#"퐷"#, r#"퐷"#, r#"퐷"#),
+        (r#"퐸"#, r#"퐸"#, r#"퐸"#, r#"퐸"#, r#"퐸"#),
+        (r#"퐹"#, r#"퐹"#, r#"퐹"#, r#"퐹"#, r#"퐹"#),
+        (r#"퐺"#, r#"퐺"#, r#"퐺"#, r#"퐺"#, r#"퐺"#),
+        (r#"퐻"#, r#"퐻"#, r#"퐻"#, r#"퐻"#, r#"퐻"#),
+        (r#"퐼"#, r#"퐼"#, r#"퐼"#, r#"퐼"#, r#"퐼"#),
+        (r#"퐽"#, r#"퐽"#, r#"퐽"#, r#"퐽"#, r#"퐽"#),
+        (r#"퐾"#, r#"퐾"#, r#"퐾"#, r#"퐾"#, r#"퐾"#),
+        (r#"퐿"#, r#"퐿"#, r#"퐿"#, r#"퐿"#, r#"퐿"#),
+        (r#"푀"#, r#"푀"#, r#"푀"#, r#"푀"#, r#"푀"#),
+        (r#"푁"#, r#"푁"#, r#"푁"#, r#"푁"#, r#"푁"#),
+        (r#"푂"#, r#"푂"#, r#"푂"#, r#"푂"#, r#"푂"#),
+        (r#"푃"#, r#"푃"#, r#"푃"#, r#"푃"#, r#"푃"#),
+        (r#"푄"#, r#"푄"#, r#"푄"#, r#"푄"#, r#"푄"#),
+        (r#"푅"#, r#"푅"#, r#"푅"#, r#"푅"#, r#"푅"#),
+        (r#"푆"#, r#"푆"#, r#"푆"#, r#"푆"#, r#"푆"#),
+        (r#"푇"#, r#"푇"#, r#"푇"#, r#"푇"#, r#"푇"#),
+        (r#"푈"#, r#"푈"#, r#"푈"#, r#"푈"#, r#"푈"#),
+        (r#"푉"#, r#"푉"#, r#"푉"#, r#"푉"#, r#"푉"#),
+        (r#"푊"#, r#"푊"#, r#"푊"#, r#"푊"#, r#"푊"#),
+        (r#"푋"#, r#"푋"#, r#"푋"#, r#"푋"#, r#"푋"#),
+        (r#"푌"#, r#"푌"#, r#"푌"#, r#"푌"#, r#"푌"#),
+        (r#"푍"#, r#"푍"#, r#"푍"#, r#"푍"#, r#"푍"#),
+        (r#"푎"#, r#"푎"#, r#"푎"#, r#"푎"#, r#"푎"#),
+        (r#"푏"#, r#"푏"#, r#"푏"#, r#"푏"#, r#"푏"#),
+        (r#"푐"#, r#"푐"#, r#"푐"#, r#"푐"#, r#"푐"#),
+        (r#"푑"#, r#"푑"#, r#"푑"#, r#"푑"#, r#"푑"#),
+        (r#"푒"#, r#"푒"#, r#"푒"#, r#"푒"#, r#"푒"#),
+        (r#"푓"#, r#"푓"#, r#"푓"#, r#"푓"#, r#"푓"#),
+        (r#"푔"#, r#"푔"#, r#"푔"#, r#"푔"#, r#"푔"#),
+        (r#"푕"#, r#"푕"#, r#"푕"#, r#"푕"#, r#"푕"#),
+        (r#"푖"#, r#"푖"#, r#"푖"#, r#"푖"#, r#"푖"#),
+        (r#"푗"#, r#"푗"#, r#"푗"#, r#"푗"#, r#"푗"#),
+        (r#"푘"#, r#"푘"#, r#"푘"#, r#"푘"#, r#"푘"#),
+        (r#"푙"#, r#"푙"#, r#"푙"#, r#"푙"#, r#"푙"#),
+        (r#"푚"#, r#"푚"#, r#"푚"#, r#"푚"#, r#"푚"#),
+        (r#"푛"#, r#"푛"#, r#"푛"#, r#"푛"#, r#"푛"#),
+        (r#"표"#, r#"표"#, r#"표"#, r#"표"#, r#"표"#),
+        (r#"푝"#, r#"푝"#, r#"푝"#, r#"푝"#, r#"푝"#),
+        (r#"푞"#, r#"푞"#, r#"푞"#, r#"푞"#, r#"푞"#),
+        (r#"푟"#, r#"푟"#, r#"푟"#, r#"푟"#, r#"푟"#),
+        (r#"푠"#, r#"푠"#, r#"푠"#, r#"푠"#, r#"푠"#),
+        (r#"푡"#, r#"푡"#, r#"푡"#, r#"푡"#, r#"푡"#),
+        (r#"푢"#, r#"푢"#, r#"푢"#, r#"푢"#, r#"푢"#),
+        (r#"푣"#, r#"푣"#, r#"푣"#, r#"푣"#, r#"푣"#),
+        (r#"푤"#, r#"푤"#, r#"푤"#, r#"푤"#, r#"푤"#),
+        (r#"푥"#, r#"푥"#, r#"푥"#, r#"푥"#, r#"푥"#),
+        (r#"푦"#, r#"푦"#, r#"푦"#, r#"푦"#, r#"푦"#),
+        (r#"푧"#, r#"푧"#, r#"푧"#, r#"푧"#, r#"푧"#),
+        (r#"푨"#, r#"푨"#, r#"푨"#, r#"푨"#, r#"푨"#),
+        (r#"푩"#, r#"푩"#, r#"푩"#, r#"푩"#, r#"푩"#),
+        (r#"푪"#, r#"푪"#, r#"푪"#, r#"푪"#, r#"푪"#),
+        (r#"푫"#, r#"푫"#, r#"푫"#, r#"푫"#, r#"푫"#),
+        (r#"푬"#, r#"푬"#, r#"푬"#, r#"푬"#, r#"푬"#),
+        (r#"푭"#, r#"푭"#, r#"푭"#, r#"푭"#, r#"푭"#),
+        (r#"푮"#, r#"푮"#, r#"푮"#, r#"푮"#, r#"푮"#),
+        (r#"푯"#, r#"푯"#, r#"푯"#, r#"푯"#, r#"푯"#),
+        (r#"푰"#, r#"푰"#, r#"푰"#, r#"푰"#, r#"푰"#),
+        (r#"푱"#, r#"푱"#, r#"푱"#, r#"푱"#, r#"푱"#),
+        (r#"푲"#, r#"푲"#, r#"푲"#, r#"푲"#, r#"푲"#),
+        (r#"푳"#, r#"푳"#, r#"푳"#, r#"푳"#, r#"푳"#),
+        (r#"푴"#, r#"푴"#, r#"푴"#, r#"푴"#, r#"푴"#),
+        (r#"푵"#, r#"푵"#, r#"푵"#, r#"푵"#, r#"푵"#),
+        (r#"푶"#, r#"푶"#, r#"푶"#, r#"푶"#, r#"푶"#),
+        (r#"푷"#, r#"푷"#, r#"푷"#, r#"푷"#, r#"푷"#),
+        (r#"푸"#, r#"푸"#, r#"푸"#, r#"푸"#, r#"푸"#),
+        (r#"푹"#, r#"푹"#, r#"푹"#, r#"푹"#, r#"푹"#),
+        (r#"푺"#, r#"푺"#, r#"푺"#, r#"푺"#, r#"푺"#),
+        (r#"푻"#, r#"푻"#, r#"푻"#, r#"푻"#, r#"푻"#),
+        (r#"푼"#, r#"푼"#, r#"푼"#, r#"푼"#, r#"푼"#),
+        (r#"푽"#, r#"푽"#, r#"푽"#, r#"푽"#, r#"푽"#),
+        (r#"푾"#, r#"푾"#, r#"푾"#, r#"푾"#, r#"푾"#),
+        (r#"푿"#, r#"푿"#, r#"푿"#, r#"푿"#, r#"푿"#),
+        (r#"풀"#, r#"풀"#, r#"풀"#, r#"풀"#, r#"풀"#),
+        (r#"풁"#, r#"풁"#, r#"풁"#, r#"풁"#, r#"풁"#),
+        (r#"풂"#, r#"풂"#, r#"풂"#, r#"풂"#, r#"풂"#),
+        (r#"풃"#, r#"풃"#, r#"풃"#, r#"풃"#, r#"풃"#),
+        (r#"풄"#, r#"풄"#, r#"풄"#, r#"풄"#, r#"풄"#),
+        (r#"풅"#, r#"풅"#, r#"풅"#, r#"풅"#, r#"풅"#),
+        (r#"풆"#, r#"풆"#, r#"풆"#, r#"풆"#, r#"풆"#),
+        (r#"풇"#, r#"풇"#, r#"풇"#, r#"풇"#, r#"풇"#),
+        (r#"품"#, r#"품"#, r#"품"#, r#"품"#, r#"품"#),
+        (r#"풉"#, r#"풉"#, r#"풉"#, r#"풉"#, r#"풉"#),
+        (r#"풊"#, r#"풊"#, r#"풊"#, r#"풊"#, r#"풊"#),
+        (r#"풋"#, r#"풋"#, r#"풋"#, r#"풋"#, r#"풋"#),
+        (r#"풌"#, r#"풌"#, r#"풌"#, r#"풌"#, r#"풌"#),
+        (r#"풍"#, r#"풍"#, r#"풍"#, r#"풍"#, r#"풍"#),
+        (r#"풎"#, r#"풎"#, r#"풎"#, r#"풎"#, r#"풎"#),
+        (r#"풏"#, r#"풏"#, r#"풏"#, r#"풏"#, r#"풏"#),
+        (r#"풐"#, r#"풐"#, r#"풐"#, r#"풐"#, r#"풐"#),
+        (r#"풑"#, r#"풑"#, r#"풑"#, r#"풑"#, r#"풑"#),
+        (r#"풒"#, r#"풒"#, r#"풒"#, r#"풒"#, r#"풒"#),
+        (r#"풓"#, r#"풓"#, r#"풓"#, r#"풓"#, r#"풓"#),
+        (r#"풔"#, r#"풔"#, r#"풔"#, r#"풔"#, r#"풔"#),
+        (r#"풕"#, r#"풕"#, r#"풕"#, r#"풕"#, r#"풕"#),
+        (r#"풖"#, r#"풖"#, r#"풖"#, r#"풖"#, r#"풖"#),
+        (r#"풗"#, r#"풗"#, r#"풗"#, r#"풗"#, r#"풗"#),
+        (r#"풘"#, r#"풘"#, r#"풘"#, r#"풘"#, r#"풘"#),
+        (r#"풙"#, r#"풙"#, r#"풙"#, r#"풙"#, r#"풙"#),
+        (r#"풚"#, r#"풚"#, r#"풚"#, r#"풚"#, r#"풚"#),
+        (r#"풛"#, r#"풛"#, r#"풛"#, r#"풛"#, r#"풛"#),
+        (r#"풜"#, r#"풜"#, r#"풜"#, r#"풜"#, r#"풜"#),
+        (r#"풝"#, r#"풝"#, r#"풝"#, r#"풝"#, r#"풝"#),
+        (r#"풞"#, r#"풞"#, r#"풞"#, r#"풞"#, r#"풞"#),
+        (r#"풟"#, r#"풟"#, r#"풟"#, r#"풟"#, r#"풟"#),
+        (r#"풠"#, r#"풠"#, r#"풠"#, r#"풠"#, r#"풠"#),
+        (r#"풡"#, r#"풡"#, r#"풡"#, r#"풡"#, r#"풡"#),
+        (r#"풢"#, r#"풢"#, r#"풢"#, r#"풢"#, r#"풢"#),
+        (r#"풣"#, r#"풣"#, r#"풣"#, r#"풣"#, r#"풣"#),
+        (r#"풤"#, r#"풤"#, r#"풤"#, r#"풤"#, r#"풤"#),
+        (r#"풥"#, r#"풥"#, r#"풥"#, r#"풥"#, r#"풥"#),
+        (r#"풦"#, r#"풦"#, r#"풦"#, r#"풦"#, r#"풦"#),
+        (r#"풧"#, r#"풧"#, r#"풧"#, r#"풧"#, r#"풧"#),
+        (r#"풨"#, r#"풨"#, r#"풨"#, r#"풨"#, r#"풨"#),
+        (r#"풩"#, r#"풩"#, r#"풩"#, r#"풩"#, r#"풩"#),
+        (r#"풪"#, r#"풪"#, r#"풪"#, r#"풪"#, r#"풪"#),
+        (r#"풫"#, r#"풫"#, r#"풫"#, r#"풫"#, r#"풫"#),
+        (r#"풬"#, r#"풬"#, r#"풬"#, r#"풬"#, r#"풬"#),
+        (r#"풭"#, r#"풭"#, r#"풭"#, r#"풭"#, r#"풭"#),
+        (r#"풮"#, r#"풮"#, r#"풮"#, r#"풮"#, r#"풮"#),
+        (r#"풯"#, r#"풯"#, r#"풯"#, r#"풯"#, r#"풯"#),
+        (r#"풰"#, r#"풰"#, r#"풰"#, r#"풰"#, r#"풰"#),
+        (r#"풱"#, r#"풱"#, r#"풱"#, r#"풱"#, r#"풱"#),
+        (r#"풲"#, r#"풲"#, r#"풲"#, r#"풲"#, r#"풲"#),
+        (r#"풳"#, r#"풳"#, r#"풳"#, r#"풳"#, r#"풳"#),
+        (r#"풴"#, r#"풴"#, r#"풴"#, r#"풴"#, r#"풴"#),
+        (r#"풵"#, r#"풵"#, r#"풵"#, r#"풵"#, r#"풵"#),
+        (r#"풶"#, r#"풶"#, r#"풶"#, r#"풶"#, r#"풶"#),
+        (r#"풷"#, r#"풷"#, r#"풷"#, r#"풷"#, r#"풷"#),
+        (r#"풸"#, r#"풸"#, r#"풸"#, r#"풸"#, r#"풸"#),
+        (r#"풹"#, r#"풹"#, r#"풹"#, r#"풹"#, r#"풹"#),
+        (r#"풺"#, r#"풺"#, r#"풺"#, r#"풺"#, r#"풺"#),
+        (r#"풻"#, r#"풻"#, r#"풻"#, r#"풻"#, r#"풻"#),
+        (r#"풼"#, r#"풼"#, r#"풼"#, r#"풼"#, r#"풼"#),
+        (r#"풽"#, r#"풽"#, r#"풽"#, r#"풽"#, r#"풽"#),
+        (r#"풾"#, r#"풾"#, r#"풾"#, r#"풾"#, r#"풾"#),
+        (r#"풿"#, r#"풿"#, r#"풿"#, r#"풿"#, r#"풿"#),
+        (r#"퓀"#, r#"퓀"#, r#"퓀"#, r#"퓀"#, r#"퓀"#),
+        (r#"퓁"#, r#"퓁"#, r#"퓁"#, r#"퓁"#, r#"퓁"#),
+        (r#"퓂"#, r#"퓂"#, r#"퓂"#, r#"퓂"#, r#"퓂"#),
+        (r#"퓃"#, r#"퓃"#, r#"퓃"#, r#"퓃"#, r#"퓃"#),
+        (r#"퓄"#, r#"퓄"#, r#"퓄"#, r#"퓄"#, r#"퓄"#),
+        (r#"퓅"#, r#"퓅"#, r#"퓅"#, r#"퓅"#, r#"퓅"#),
+        (r#"퓆"#, r#"퓆"#, r#"퓆"#, r#"퓆"#, r#"퓆"#),
+        (r#"퓇"#, r#"퓇"#, r#"퓇"#, r#"퓇"#, r#"퓇"#),
+        (r#"퓈"#, r#"퓈"#, r#"퓈"#, r#"퓈"#, r#"퓈"#),
+        (r#"퓉"#, r#"퓉"#, r#"퓉"#, r#"퓉"#, r#"퓉"#),
+        (r#"퓊"#, r#"퓊"#, r#"퓊"#, r#"퓊"#, r#"퓊"#),
+        (r#"퓋"#, r#"퓋"#, r#"퓋"#, r#"퓋"#, r#"퓋"#),
+        (r#"퓌"#, r#"퓌"#, r#"퓌"#, r#"퓌"#, r#"퓌"#),
+        (r#"퓍"#, r#"퓍"#, r#"퓍"#, r#"퓍"#, r#"퓍"#),
+        (r#"퓎"#, r#"퓎"#, r#"퓎"#, r#"퓎"#, r#"퓎"#),
+        (r#"퓏"#, r#"퓏"#, r#"퓏"#, r#"퓏"#, r#"퓏"#),
+        (r#"퓐"#, r#"퓐"#, r#"퓐"#, r#"퓐"#, r#"퓐"#),
+        (r#"퓑"#, r#"퓑"#, r#"퓑"#, r#"퓑"#, r#"퓑"#),
+        (r#"퓒"#, r#"퓒"#, r#"퓒"#, r#"퓒"#, r#"퓒"#),
+        (r#"퓓"#, r#"퓓"#, r#"퓓"#, r#"퓓"#, r#"퓓"#),
+        (r#"퓔"#, r#"퓔"#, r#"퓔"#, r#"퓔"#, r#"퓔"#),
+        (r#"퓕"#, r#"퓕"#, r#"퓕"#, r#"퓕"#, r#"퓕"#),
+        (r#"퓖"#, r#"퓖"#, r#"퓖"#, r#"퓖"#, r#"퓖"#),
+        (r#"퓗"#, r#"퓗"#, r#"퓗"#, r#"퓗"#, r#"퓗"#),
+        (r#"퓘"#, r#"퓘"#, r#"퓘"#, r#"퓘"#, r#"퓘"#),
+        (r#"퓙"#, r#"퓙"#, r#"퓙"#, r#"퓙"#, r#"퓙"#),
+        (r#"퓚"#, r#"퓚"#, r#"퓚"#, r#"퓚"#, r#"퓚"#),
+        (r#"퓛"#, r#"퓛"#, r#"퓛"#, r#"퓛"#, r#"퓛"#),
+        (r#"퓜"#, r#"퓜"#, r#"퓜"#, r#"퓜"#, r#"퓜"#),
+        (r#"퓝"#, r#"퓝"#, r#"퓝"#, r#"퓝"#, r#"퓝"#),
+        (r#"퓞"#, r#"퓞"#, r#"퓞"#, r#"퓞"#, r#"퓞"#),
+        (r#"퓟"#, r#"퓟"#, r#"퓟"#, r#"퓟"#, r#"퓟"#),
+        (r#"퓠"#, r#"퓠"#, r#"퓠"#, r#"퓠"#, r#"퓠"#),
+        (r#"퓡"#, r#"퓡"#, r#"퓡"#, r#"퓡"#, r#"퓡"#),
+        (r#"퓢"#, r#"퓢"#, r#"퓢"#, r#"퓢"#, r#"퓢"#),
+        (r#"퓣"#, r#"퓣"#, r#"퓣"#, r#"퓣"#, r#"퓣"#),
+        (r#"퓤"#, r#"퓤"#, r#"퓤"#, r#"퓤"#, r#"퓤"#),
+        (r#"퓥"#, r#"퓥"#, r#"퓥"#, r#"퓥"#, r#"퓥"#),
+        (r#"퓦"#, r#"퓦"#, r#"퓦"#, r#"퓦"#, r#"퓦"#),
+        (r#"퓧"#, r#"퓧"#, r#"퓧"#, r#"퓧"#, r#"퓧"#),
+        (r#"퓨"#, r#"퓨"#, r#"퓨"#, r#"퓨"#, r#"퓨"#),
+        (r#"퓩"#, r#"퓩"#, r#"퓩"#, r#"퓩"#, r#"퓩"#),
+        (r#"퓪"#, r#"퓪"#, r#"퓪"#, r#"퓪"#, r#"퓪"#),
+        (r#"퓫"#, r#"퓫"#, r#"퓫"#, r#"퓫"#, r#"퓫"#),
+        (r#"퓬"#, r#"퓬"#, r#"퓬"#, r#"퓬"#, r#"퓬"#),
+        (r#"퓭"#, r#"퓭"#, r#"퓭"#, r#"퓭"#, r#"퓭"#),
+        (r#"퓮"#, r#"퓮"#, r#"퓮"#, r#"퓮"#, r#"퓮"#),
+        (r#"퓯"#, r#"퓯"#, r#"퓯"#, r#"퓯"#, r#"퓯"#),
+        (r#"퓰"#, r#"퓰"#, r#"퓰"#, r#"퓰"#, r#"퓰"#),
+        (r#"퓱"#, r#"퓱"#, r#"퓱"#, r#"퓱"#, r#"퓱"#),
+        (r#"퓲"#, r#"퓲"#, r#"퓲"#, r#"퓲"#, r#"퓲"#),
+        (r#"퓳"#, r#"퓳"#, r#"퓳"#, r#"퓳"#, r#"퓳"#),
+        (r#"퓴"#, r#"퓴"#, r#"퓴"#, r#"퓴"#, r#"퓴"#),
+        (r#"퓵"#, r#"퓵"#, r#"퓵"#, r#"퓵"#, r#"퓵"#),
+        (r#"퓶"#, r#"퓶"#, r#"퓶"#, r#"퓶"#, r#"퓶"#),
+        (r#"퓷"#, r#"퓷"#, r#"퓷"#, r#"퓷"#, r#"퓷"#),
+        (r#"퓸"#, r#"퓸"#, r#"퓸"#, r#"퓸"#, r#"퓸"#),
+        (r#"퓹"#, r#"퓹"#, r#"퓹"#, r#"퓹"#, r#"퓹"#),
+        (r#"퓺"#, r#"퓺"#, r#"퓺"#, r#"퓺"#, r#"퓺"#),
+        (r#"퓻"#, r#"퓻"#, r#"퓻"#, r#"퓻"#, r#"퓻"#),
+        (r#"퓼"#, r#"퓼"#, r#"퓼"#, r#"퓼"#, r#"퓼"#),
+        (r#"퓽"#, r#"퓽"#, r#"퓽"#, r#"퓽"#, r#"퓽"#),
+        (r#"퓾"#, r#"퓾"#, r#"퓾"#, r#"퓾"#, r#"퓾"#),
+        (r#"퓿"#, r#"퓿"#, r#"퓿"#, r#"퓿"#, r#"퓿"#),
+        (r#"픀"#, r#"픀"#, r#"픀"#, r#"픀"#, r#"픀"#),
+        (r#"픁"#, r#"픁"#, r#"픁"#, r#"픁"#, r#"픁"#),
+        (r#"픂"#, r#"픂"#, r#"픂"#, r#"픂"#, r#"픂"#),
+        (r#"픃"#, r#"픃"#, r#"픃"#, r#"픃"#, r#"픃"#),
+        (r#"프"#, r#"프"#, r#"프"#, r#"프"#, r#"프"#),
+        (r#"픅"#, r#"픅"#, r#"픅"#, r#"픅"#, r#"픅"#),
+        (r#"픆"#, r#"픆"#, r#"픆"#, r#"픆"#, r#"픆"#),
+        (r#"픇"#, r#"픇"#, r#"픇"#, r#"픇"#, r#"픇"#),
+        (r#"픈"#, r#"픈"#, r#"픈"#, r#"픈"#, r#"픈"#),
+        (r#"픉"#, r#"픉"#, r#"픉"#, r#"픉"#, r#"픉"#),
+        (r#"픊"#, r#"픊"#, r#"픊"#, r#"픊"#, r#"픊"#),
+        (r#"픋"#, r#"픋"#, r#"픋"#, r#"픋"#, r#"픋"#),
+        (r#"플"#, r#"플"#, r#"플"#, r#"플"#, r#"플"#),
+        (r#"픍"#, r#"픍"#, r#"픍"#, r#"픍"#, r#"픍"#),
+        (r#"픎"#, r#"픎"#, r#"픎"#, r#"픎"#, r#"픎"#),
+        (r#"픏"#, r#"픏"#, r#"픏"#, r#"픏"#, r#"픏"#),
+        (r#"픐"#, r#"픐"#, r#"픐"#, r#"픐"#, r#"픐"#),
+        (r#"픑"#, r#"픑"#, r#"픑"#, r#"픑"#, r#"픑"#),
+        (r#"픒"#, r#"픒"#, r#"픒"#, r#"픒"#, r#"픒"#),
+        (r#"픓"#, r#"픓"#, r#"픓"#, r#"픓"#, r#"픓"#),
+        (r#"픔"#, r#"픔"#, r#"픔"#, r#"픔"#, r#"픔"#),
+        (r#"픕"#, r#"픕"#, r#"픕"#, r#"픕"#, r#"픕"#),
+        (r#"픖"#, r#"픖"#, r#"픖"#, r#"픖"#, r#"픖"#),
+        (r#"픗"#, r#"픗"#, r#"픗"#, r#"픗"#, r#"픗"#),
+        (r#"픘"#, r#"픘"#, r#"픘"#, r#"픘"#, r#"픘"#),
+        (r#"픙"#, r#"픙"#, r#"픙"#, r#"픙"#, r#"픙"#),
+        (r#"픚"#, r#"픚"#, r#"픚"#, r#"픚"#, r#"픚"#),
+        (r#"픛"#, r#"픛"#, r#"픛"#, r#"픛"#, r#"픛"#),
+        (r#"픜"#, r#"픜"#, r#"픜"#, r#"픜"#, r#"픜"#),
+        (r#"픝"#, r#"픝"#, r#"픝"#, r#"픝"#, r#"픝"#),
+        (r#"픞"#, r#"픞"#, r#"픞"#, r#"픞"#, r#"픞"#),
+        (r#"픟"#, r#"픟"#, r#"픟"#, r#"픟"#, r#"픟"#),
+        (r#"픠"#, r#"픠"#, r#"픠"#, r#"픠"#, r#"픠"#),
+        (r#"픡"#, r#"픡"#, r#"픡"#, r#"픡"#, r#"픡"#),
+        (r#"픢"#, r#"픢"#, r#"픢"#, r#"픢"#, r#"픢"#),
+        (r#"픣"#, r#"픣"#, r#"픣"#, r#"픣"#, r#"픣"#),
+        (r#"픤"#, r#"픤"#, r#"픤"#, r#"픤"#, r#"픤"#),
+        (r#"픥"#, r#"픥"#, r#"픥"#, r#"픥"#, r#"픥"#),
+        (r#"픦"#, r#"픦"#, r#"픦"#, r#"픦"#, r#"픦"#),
+        (r#"픧"#, r#"픧"#, r#"픧"#, r#"픧"#, r#"픧"#),
+        (r#"픨"#, r#"픨"#, r#"픨"#, r#"픨"#, r#"픨"#),
+        (r#"픩"#, r#"픩"#, r#"픩"#, r#"픩"#, r#"픩"#),
+        (r#"픪"#, r#"픪"#, r#"픪"#, r#"픪"#, r#"픪"#),
+        (r#"픫"#, r#"픫"#, r#"픫"#, r#"픫"#, r#"픫"#),
+        (r#"픬"#, r#"픬"#, r#"픬"#, r#"픬"#, r#"픬"#),
+        (r#"픭"#, r#"픭"#, r#"픭"#, r#"픭"#, r#"픭"#),
+        (r#"픮"#, r#"픮"#, r#"픮"#, r#"픮"#, r#"픮"#),
+        (r#"픯"#, r#"픯"#, r#"픯"#, r#"픯"#, r#"픯"#),
+        (r#"픰"#, r#"픰"#, r#"픰"#, r#"픰"#, r#"픰"#),
+        (r#"픱"#, r#"픱"#, r#"픱"#, r#"픱"#, r#"픱"#),
+        (r#"픲"#, r#"픲"#, r#"픲"#, r#"픲"#, r#"픲"#),
+        (r#"픳"#, r#"픳"#, r#"픳"#, r#"픳"#, r#"픳"#),
+        (r#"픴"#, r#"픴"#, r#"픴"#, r#"픴"#, r#"픴"#),
+        (r#"픵"#, r#"픵"#, r#"픵"#, r#"픵"#, r#"픵"#),
+        (r#"픶"#, r#"픶"#, r#"픶"#, r#"픶"#, r#"픶"#),
+        (r#"픷"#, r#"픷"#, r#"픷"#, r#"픷"#, r#"픷"#),
+        (r#"픸"#, r#"픸"#, r#"픸"#, r#"픸"#, r#"픸"#),
+        (r#"픹"#, r#"픹"#, r#"픹"#, r#"픹"#, r#"픹"#),
+        (r#"픺"#, r#"픺"#, r#"픺"#, r#"픺"#, r#"픺"#),
+        (r#"픻"#, r#"픻"#, r#"픻"#, r#"픻"#, r#"픻"#),
+        (r#"피"#, r#"피"#, r#"피"#, r#"피"#, r#"피"#),
+        (r#"픽"#, r#"픽"#, r#"픽"#, r#"픽"#, r#"픽"#),
+        (r#"픾"#, r#"픾"#, r#"픾"#, r#"픾"#, r#"픾"#),
+        (r#"픿"#, r#"픿"#, r#"픿"#, r#"픿"#, r#"픿"#),
+        (r#"핀"#, r#"핀"#, r#"핀"#, r#"핀"#, r#"핀"#),
+        (r#"핁"#, r#"핁"#, r#"핁"#, r#"핁"#, r#"핁"#),
+        (r#"핂"#, r#"핂"#, r#"핂"#, r#"핂"#, r#"핂"#),
+        (r#"핃"#, r#"핃"#, r#"핃"#, r#"핃"#, r#"핃"#),
+        (r#"필"#, r#"필"#, r#"필"#, r#"필"#, r#"필"#),
+        (r#"핅"#, r#"핅"#, r#"핅"#, r#"핅"#, r#"핅"#),
+        (r#"핆"#, r#"핆"#, r#"핆"#, r#"핆"#, r#"핆"#),
+        (r#"핇"#, r#"핇"#, r#"핇"#, r#"핇"#, r#"핇"#),
+        (r#"핈"#, r#"핈"#, r#"핈"#, r#"핈"#, r#"핈"#),
+        (r#"핉"#, r#"핉"#, r#"핉"#, r#"핉"#, r#"핉"#),
+        (r#"핊"#, r#"핊"#, r#"핊"#, r#"핊"#, r#"핊"#),
+        (r#"핋"#, r#"핋"#, r#"핋"#, r#"핋"#, r#"핋"#),
+        (r#"핌"#, r#"핌"#, r#"핌"#, r#"핌"#, r#"핌"#),
+        (r#"핍"#, r#"핍"#, r#"핍"#, r#"핍"#, r#"핍"#),
+        (r#"핎"#, r#"핎"#, r#"핎"#, r#"핎"#, r#"핎"#),
+        (r#"핏"#, r#"핏"#, r#"핏"#, r#"핏"#, r#"핏"#),
+        (r#"핐"#, r#"핐"#, r#"핐"#, r#"핐"#, r#"핐"#),
+        (r#"핑"#, r#"핑"#, r#"핑"#, r#"핑"#, r#"핑"#),
+        (r#"핒"#, r#"핒"#, r#"핒"#, r#"핒"#, r#"핒"#),
+        (r#"핓"#, r#"핓"#, r#"핓"#, r#"핓"#, r#"핓"#),
+        (r#"핔"#, r#"핔"#, r#"핔"#, r#"핔"#, r#"핔"#),
+        (r#"핕"#, r#"핕"#, r#"핕"#, r#"핕"#, r#"핕"#),
+        (r#"핖"#, r#"핖"#, r#"핖"#, r#"핖"#, r#"핖"#),
+        (r#"핗"#, r#"핗"#, r#"핗"#, r#"핗"#, r#"핗"#),
+        (r#"하"#, r#"하"#, r#"하"#, r#"하"#, r#"하"#),
+        (r#"학"#, r#"학"#, r#"학"#, r#"학"#, r#"학"#),
+        (r#"핚"#, r#"핚"#, r#"핚"#, r#"핚"#, r#"핚"#),
+        (r#"핛"#, r#"핛"#, r#"핛"#, r#"핛"#, r#"핛"#),
+        (r#"한"#, r#"한"#, r#"한"#, r#"한"#, r#"한"#),
+        (r#"핝"#, r#"핝"#, r#"핝"#, r#"핝"#, r#"핝"#),
+        (r#"핞"#, r#"핞"#, r#"핞"#, r#"핞"#, r#"핞"#),
+        (r#"핟"#, r#"핟"#, r#"핟"#, r#"핟"#, r#"핟"#),
+        (r#"할"#, r#"할"#, r#"할"#, r#"할"#, r#"할"#),
+        (r#"핡"#, r#"핡"#, r#"핡"#, r#"핡"#, r#"핡"#),
+        (r#"핢"#, r#"핢"#, r#"핢"#, r#"핢"#, r#"핢"#),
+        (r#"핣"#, r#"핣"#, r#"핣"#, r#"핣"#, r#"핣"#),
+        (r#"핤"#, r#"핤"#, r#"핤"#, r#"핤"#, r#"핤"#),
+        (r#"핥"#, r#"핥"#, r#"핥"#, r#"핥"#, r#"핥"#),
+        (r#"핦"#, r#"핦"#, r#"핦"#, r#"핦"#, r#"핦"#),
+        (r#"핧"#, r#"핧"#, r#"핧"#, r#"핧"#, r#"핧"#),
+        (r#"함"#, r#"함"#, r#"함"#, r#"함"#, r#"함"#),
+        (r#"합"#, r#"합"#, r#"합"#, r#"합"#, r#"합"#),
+        (r#"핪"#, r#"핪"#, r#"핪"#, r#"핪"#, r#"핪"#),
+        (r#"핫"#, r#"핫"#, r#"핫"#, r#"핫"#, r#"핫"#),
+        (r#"핬"#, r#"핬"#, r#"핬"#, r#"핬"#, r#"핬"#),
+        (r#"항"#, r#"항"#, r#"항"#, r#"항"#, r#"항"#),
+        (r#"핮"#, r#"핮"#, r#"핮"#, r#"핮"#, r#"핮"#),
+        (r#"핯"#, r#"핯"#, r#"핯"#, r#"핯"#, r#"핯"#),
+        (r#"핰"#, r#"핰"#, r#"핰"#, r#"핰"#, r#"핰"#),
+        (r#"핱"#, r#"핱"#, r#"핱"#, r#"핱"#, r#"핱"#),
+        (r#"핲"#, r#"핲"#, r#"핲"#, r#"핲"#, r#"핲"#),
+        (r#"핳"#, r#"핳"#, r#"핳"#, r#"핳"#, r#"핳"#),
+        (r#"해"#, r#"해"#, r#"해"#, r#"해"#, r#"해"#),
+        (r#"핵"#, r#"핵"#, r#"핵"#, r#"핵"#, r#"핵"#),
+        (r#"핶"#, r#"핶"#, r#"핶"#, r#"핶"#, r#"핶"#),
+        (r#"핷"#, r#"핷"#, r#"핷"#, r#"핷"#, r#"핷"#),
+        (r#"핸"#, r#"핸"#, r#"핸"#, r#"핸"#, r#"핸"#),
+        (r#"핹"#, r#"핹"#, r#"핹"#, r#"핹"#, r#"핹"#),
+        (r#"핺"#, r#"핺"#, r#"핺"#, r#"핺"#, r#"핺"#),
+        (r#"핻"#, r#"핻"#, r#"핻"#, r#"핻"#, r#"핻"#),
+        (r#"핼"#, r#"핼"#, r#"핼"#, r#"핼"#, r#"핼"#),
+        (r#"핽"#, r#"핽"#, r#"핽"#, r#"핽"#, r#"핽"#),
+        (r#"핾"#, r#"핾"#, r#"핾"#, r#"핾"#, r#"핾"#),
+        (r#"핿"#, r#"핿"#, r#"핿"#, r#"핿"#, r#"핿"#),
+        (r#"햀"#, r#"햀"#, r#"햀"#, r#"햀"#, r#"햀"#),
+        (r#"햁"#, r#"햁"#, r#"햁"#, r#"햁"#, r#"햁"#),
+        (r#"햂"#, r#"햂"#, r#"햂"#, r#"햂"#, r#"햂"#),
+        (r#"햃"#, r#"햃"#, r#"햃"#, r#"햃"#, r#"햃"#),
+        (r#"햄"#, r#"햄"#, r#"햄"#, r#"햄"#, r#"햄"#),
+        (r#"햅"#, r#"햅"#, r#"햅"#, r#"햅"#, r#"햅"#),
+        (r#"햆"#, r#"햆"#, r#"햆"#, r#"햆"#, r#"햆"#),
+        (r#"햇"#, r#"햇"#, r#"햇"#, r#"햇"#, r#"햇"#),
+        (r#"했"#, r#"했"#, r#"했"#, r#"했"#, r#"했"#),
+        (r#"행"#, r#"행"#, r#"행"#, r#"행"#, r#"행"#),
+        (r#"햊"#, r#"햊"#, r#"햊"#, r#"햊"#, r#"햊"#),
+        (r#"햋"#, r#"햋"#, r#"햋"#, r#"햋"#, r#"햋"#),
+        (r#"햌"#, r#"햌"#, r#"햌"#, r#"햌"#, r#"햌"#),
+        (r#"햍"#, r#"햍"#, r#"햍"#, r#"햍"#, r#"햍"#),
+        (r#"햎"#, r#"햎"#, r#"햎"#, r#"햎"#, r#"햎"#),
+        (r#"햏"#, r#"햏"#, r#"햏"#, r#"햏"#, r#"햏"#),
+        (r#"햐"#, r#"햐"#, r#"햐"#, r#"햐"#, r#"햐"#),
+        (r#"햑"#, r#"햑"#, r#"햑"#, r#"햑"#, r#"햑"#),
+        (r#"햒"#, r#"햒"#, r#"햒"#, r#"햒"#, r#"햒"#),
+        (r#"햓"#, r#"햓"#, r#"햓"#, r#"햓"#, r#"햓"#),
+        (r#"햔"#, r#"햔"#, r#"햔"#, r#"햔"#, r#"햔"#),
+        (r#"햕"#, r#"햕"#, r#"햕"#, r#"햕"#, r#"햕"#),
+        (r#"햖"#, r#"햖"#, r#"햖"#, r#"햖"#, r#"햖"#),
+        (r#"햗"#, r#"햗"#, r#"햗"#, r#"햗"#, r#"햗"#),
+        (r#"햘"#, r#"햘"#, r#"햘"#, r#"햘"#, r#"햘"#),
+        (r#"햙"#, r#"햙"#, r#"햙"#, r#"햙"#, r#"햙"#),
+        (r#"햚"#, r#"햚"#, r#"햚"#, r#"햚"#, r#"햚"#),
+        (r#"햛"#, r#"햛"#, r#"햛"#, r#"햛"#, r#"햛"#),
+        (r#"햜"#, r#"햜"#, r#"햜"#, r#"햜"#, r#"햜"#),
+        (r#"햝"#, r#"햝"#, r#"햝"#, r#"햝"#, r#"햝"#),
+        (r#"햞"#, r#"햞"#, r#"햞"#, r#"햞"#, r#"햞"#),
+        (r#"햟"#, r#"햟"#, r#"햟"#, r#"햟"#, r#"햟"#),
+        (r#"햠"#, r#"햠"#, r#"햠"#, r#"햠"#, r#"햠"#),
+        (r#"햡"#, r#"햡"#, r#"햡"#, r#"햡"#, r#"햡"#),
+        (r#"햢"#, r#"햢"#, r#"햢"#, r#"햢"#, r#"햢"#),
+        (r#"햣"#, r#"햣"#, r#"햣"#, r#"햣"#, r#"햣"#),
+        (r#"햤"#, r#"햤"#, r#"햤"#, r#"햤"#, r#"햤"#),
+        (r#"향"#, r#"향"#, r#"향"#, r#"향"#, r#"향"#),
+        (r#"햦"#, r#"햦"#, r#"햦"#, r#"햦"#, r#"햦"#),
+        (r#"햧"#, r#"햧"#, r#"햧"#, r#"햧"#, r#"햧"#),
+        (r#"햨"#, r#"햨"#, r#"햨"#, r#"햨"#, r#"햨"#),
+        (r#"햩"#, r#"햩"#, r#"햩"#, r#"햩"#, r#"햩"#),
+        (r#"햪"#, r#"햪"#, r#"햪"#, r#"햪"#, r#"햪"#),
+        (r#"햫"#, r#"햫"#, r#"햫"#, r#"햫"#, r#"햫"#),
+        (r#"햬"#, r#"햬"#, r#"햬"#, r#"햬"#, r#"햬"#),
+        (r#"햭"#, r#"햭"#, r#"햭"#, r#"햭"#, r#"햭"#),
+        (r#"햮"#, r#"햮"#, r#"햮"#, r#"햮"#, r#"햮"#),
+        (r#"햯"#, r#"햯"#, r#"햯"#, r#"햯"#, r#"햯"#),
+        (r#"햰"#, r#"햰"#, r#"햰"#, r#"햰"#, r#"햰"#),
+        (r#"햱"#, r#"햱"#, r#"햱"#, r#"햱"#, r#"햱"#),
+        (r#"햲"#, r#"햲"#, r#"햲"#, r#"햲"#, r#"햲"#),
+        (r#"햳"#, r#"햳"#, r#"햳"#, r#"햳"#, r#"햳"#),
+        (r#"햴"#, r#"햴"#, r#"햴"#, r#"햴"#, r#"햴"#),
+        (r#"햵"#, r#"햵"#, r#"햵"#, r#"햵"#, r#"햵"#),
+        (r#"햶"#, r#"햶"#, r#"햶"#, r#"햶"#, r#"햶"#),
+        (r#"햷"#, r#"햷"#, r#"햷"#, r#"햷"#, r#"햷"#),
+        (r#"햸"#, r#"햸"#, r#"햸"#, r#"햸"#, r#"햸"#),
+        (r#"햹"#, r#"햹"#, r#"햹"#, r#"햹"#, r#"햹"#),
+        (r#"햺"#, r#"햺"#, r#"햺"#, r#"햺"#, r#"햺"#),
+        (r#"햻"#, r#"햻"#, r#"햻"#, r#"햻"#, r#"햻"#),
+        (r#"햼"#, r#"햼"#, r#"햼"#, r#"햼"#, r#"햼"#),
+        (r#"햽"#, r#"햽"#, r#"햽"#, r#"햽"#, r#"햽"#),
+        (r#"햾"#, r#"햾"#, r#"햾"#, r#"햾"#, r#"햾"#),
+        (r#"햿"#, r#"햿"#, r#"햿"#, r#"햿"#, r#"햿"#),
+        (r#"헀"#, r#"헀"#, r#"헀"#, r#"헀"#, r#"헀"#),
+        (r#"헁"#, r#"헁"#, r#"헁"#, r#"헁"#, r#"헁"#),
+        (r#"헂"#, r#"헂"#, r#"헂"#, r#"헂"#, r#"헂"#),
+        (r#"헃"#, r#"헃"#, r#"헃"#, r#"헃"#, r#"헃"#),
+        (r#"헄"#, r#"헄"#, r#"헄"#, r#"헄"#, r#"헄"#),
+        (r#"헅"#, r#"헅"#, r#"헅"#, r#"헅"#, r#"헅"#),
+        (r#"헆"#, r#"헆"#, r#"헆"#, r#"헆"#, r#"헆"#),
+        (r#"헇"#, r#"헇"#, r#"헇"#, r#"헇"#, r#"헇"#),
+        (r#"허"#, r#"허"#, r#"허"#, r#"허"#, r#"허"#),
+        (r#"헉"#, r#"헉"#, r#"헉"#, r#"헉"#, r#"헉"#),
+        (r#"헊"#, r#"헊"#, r#"헊"#, r#"헊"#, r#"헊"#),
+        (r#"헋"#, r#"헋"#, r#"헋"#, r#"헋"#, r#"헋"#),
+        (r#"헌"#, r#"헌"#, r#"헌"#, r#"헌"#, r#"헌"#),
+        (r#"헍"#, r#"헍"#, r#"헍"#, r#"헍"#, r#"헍"#),
+        (r#"헎"#, r#"헎"#, r#"헎"#, r#"헎"#, r#"헎"#),
+        (r#"헏"#, r#"헏"#, r#"헏"#, r#"헏"#, r#"헏"#),
+        (r#"헐"#, r#"헐"#, r#"헐"#, r#"헐"#, r#"헐"#),
+        (r#"헑"#, r#"헑"#, r#"헑"#, r#"헑"#, r#"헑"#),
+        (r#"헒"#, r#"헒"#, r#"헒"#, r#"헒"#, r#"헒"#),
+        (r#"헓"#, r#"헓"#, r#"헓"#, r#"헓"#, r#"헓"#),
+        (r#"헔"#, r#"헔"#, r#"헔"#, r#"헔"#, r#"헔"#),
+        (r#"헕"#, r#"헕"#, r#"헕"#, r#"헕"#, r#"헕"#),
+        (r#"헖"#, r#"헖"#, r#"헖"#, r#"헖"#, r#"헖"#),
+        (r#"헗"#, r#"헗"#, r#"헗"#, r#"헗"#, r#"헗"#),
+        (r#"험"#, r#"험"#, r#"험"#, r#"험"#, r#"험"#),
+        (r#"헙"#, r#"헙"#, r#"헙"#, r#"헙"#, r#"헙"#),
+        (r#"헚"#, r#"헚"#, r#"헚"#, r#"헚"#, r#"헚"#),
+        (r#"헛"#, r#"헛"#, r#"헛"#, r#"헛"#, r#"헛"#),
+        (r#"헜"#, r#"헜"#, r#"헜"#, r#"헜"#, r#"헜"#),
+        (r#"헝"#, r#"헝"#, r#"헝"#, r#"헝"#, r#"헝"#),
+        (r#"헞"#, r#"헞"#, r#"헞"#, r#"헞"#, r#"헞"#),
+        (r#"헟"#, r#"헟"#, r#"헟"#, r#"헟"#, r#"헟"#),
+        (r#"헠"#, r#"헠"#, r#"헠"#, r#"헠"#, r#"헠"#),
+        (r#"헡"#, r#"헡"#, r#"헡"#, r#"헡"#, r#"헡"#),
+        (r#"헢"#, r#"헢"#, r#"헢"#, r#"헢"#, r#"헢"#),
+        (r#"헣"#, r#"헣"#, r#"헣"#, r#"헣"#, r#"헣"#),
+        (r#"헤"#, r#"헤"#, r#"헤"#, r#"헤"#, r#"헤"#),
+        (r#"헥"#, r#"헥"#, r#"헥"#, r#"헥"#, r#"헥"#),
+        (r#"헦"#, r#"헦"#, r#"헦"#, r#"헦"#, r#"헦"#),
+        (r#"헧"#, r#"헧"#, r#"헧"#, r#"헧"#, r#"헧"#),
+        (r#"헨"#, r#"헨"#, r#"헨"#, r#"헨"#, r#"헨"#),
+        (r#"헩"#, r#"헩"#, r#"헩"#, r#"헩"#, r#"헩"#),
+        (r#"헪"#, r#"헪"#, r#"헪"#, r#"헪"#, r#"헪"#),
+        (r#"헫"#, r#"헫"#, r#"헫"#, r#"헫"#, r#"헫"#),
+        (r#"헬"#, r#"헬"#, r#"헬"#, r#"헬"#, r#"헬"#),
+        (r#"헭"#, r#"헭"#, r#"헭"#, r#"헭"#, r#"헭"#),
+        (r#"헮"#, r#"헮"#, r#"헮"#, r#"헮"#, r#"헮"#),
+        (r#"헯"#, r#"헯"#, r#"헯"#, r#"헯"#, r#"헯"#),
+        (r#"헰"#, r#"헰"#, r#"헰"#, r#"헰"#, r#"헰"#),
+        (r#"헱"#, r#"헱"#, r#"헱"#, r#"헱"#, r#"헱"#),
+        (r#"헲"#, r#"헲"#, r#"헲"#, r#"헲"#, r#"헲"#),
+        (r#"헳"#, r#"헳"#, r#"헳"#, r#"헳"#, r#"헳"#),
+        (r#"헴"#, r#"헴"#, r#"헴"#, r#"헴"#, r#"헴"#),
+        (r#"헵"#, r#"헵"#, r#"헵"#, r#"헵"#, r#"헵"#),
+        (r#"헶"#, r#"헶"#, r#"헶"#, r#"헶"#, r#"헶"#),
+        (r#"헷"#, r#"헷"#, r#"헷"#, r#"헷"#, r#"헷"#),
+        (r#"헸"#, r#"헸"#, r#"헸"#, r#"헸"#, r#"헸"#),
+        (r#"헹"#, r#"헹"#, r#"헹"#, r#"헹"#, r#"헹"#),
+        (r#"헺"#, r#"헺"#, r#"헺"#, r#"헺"#, r#"헺"#),
+        (r#"헻"#, r#"헻"#, r#"헻"#, r#"헻"#, r#"헻"#),
+        (r#"헼"#, r#"헼"#, r#"헼"#, r#"헼"#, r#"헼"#),
+        (r#"헽"#, r#"헽"#, r#"헽"#, r#"헽"#, r#"헽"#),
+        (r#"헾"#, r#"헾"#, r#"헾"#, r#"헾"#, r#"헾"#),
+        (r#"헿"#, r#"헿"#, r#"헿"#, r#"헿"#, r#"헿"#),
+        (r#"혀"#, r#"혀"#, r#"혀"#, r#"혀"#, r#"혀"#),
+        (r#"혁"#, r#"혁"#, r#"혁"#, r#"혁"#, r#"혁"#),
+        (r#"혂"#, r#"혂"#, r#"혂"#, r#"혂"#, r#"혂"#),
+        (r#"혃"#, r#"혃"#, r#"혃"#, r#"혃"#, r#"혃"#),
+        (r#"현"#, r#"현"#, r#"현"#, r#"현"#, r#"현"#),
+        (r#"혅"#, r#"혅"#, r#"혅"#, r#"혅"#, r#"혅"#),
+        (r#"혆"#, r#"혆"#, r#"혆"#, r#"혆"#, r#"혆"#),
+        (r#"혇"#, r#"혇"#, r#"혇"#, r#"혇"#, r#"혇"#),
+        (r#"혈"#, r#"혈"#, r#"혈"#, r#"혈"#, r#"혈"#),
+        (r#"혉"#, r#"혉"#, r#"혉"#, r#"혉"#, r#"혉"#),
+        (r#"혊"#, r#"혊"#, r#"혊"#, r#"혊"#, r#"혊"#),
+        (r#"혋"#, r#"혋"#, r#"혋"#, r#"혋"#, r#"혋"#),
+        (r#"혌"#, r#"혌"#, r#"혌"#, r#"혌"#, r#"혌"#),
+        (r#"혍"#, r#"혍"#, r#"혍"#, r#"혍"#, r#"혍"#),
+        (r#"혎"#, r#"혎"#, r#"혎"#, r#"혎"#, r#"혎"#),
+        (r#"혏"#, r#"혏"#, r#"혏"#, r#"혏"#, r#"혏"#),
+        (r#"혐"#, r#"혐"#, r#"혐"#, r#"혐"#, r#"혐"#),
+        (r#"협"#, r#"협"#, r#"협"#, r#"협"#, r#"협"#),
+        (r#"혒"#, r#"혒"#, r#"혒"#, r#"혒"#, r#"혒"#),
+        (r#"혓"#, r#"혓"#, r#"혓"#, r#"혓"#, r#"혓"#),
+        (r#"혔"#, r#"혔"#, r#"혔"#, r#"혔"#, r#"혔"#),
+        (r#"형"#, r#"형"#, r#"형"#, r#"형"#, r#"형"#),
+        (r#"혖"#, r#"혖"#, r#"혖"#, r#"혖"#, r#"혖"#),
+        (r#"혗"#, r#"혗"#, r#"혗"#, r#"혗"#, r#"혗"#),
+        (r#"혘"#, r#"혘"#, r#"혘"#, r#"혘"#, r#"혘"#),
+        (r#"혙"#, r#"혙"#, r#"혙"#, r#"혙"#, r#"혙"#),
+        (r#"혚"#, r#"혚"#, r#"혚"#, r#"혚"#, r#"혚"#),
+        (r#"혛"#, r#"혛"#, r#"혛"#, r#"혛"#, r#"혛"#),
+        (r#"혜"#, r#"혜"#, r#"혜"#, r#"혜"#, r#"혜"#),
+        (r#"혝"#, r#"혝"#, r#"혝"#, r#"혝"#, r#"혝"#),
+        (r#"혞"#, r#"혞"#, r#"혞"#, r#"혞"#, r#"혞"#),
+        (r#"혟"#, r#"혟"#, r#"혟"#, r#"혟"#, r#"혟"#),
+        (r#"혠"#, r#"혠"#, r#"혠"#, r#"혠"#, r#"혠"#),
+        (r#"혡"#, r#"혡"#, r#"혡"#, r#"혡"#, r#"혡"#),
+        (r#"혢"#, r#"혢"#, r#"혢"#, r#"혢"#, r#"혢"#),
+        (r#"혣"#, r#"혣"#, r#"혣"#, r#"혣"#, r#"혣"#),
+        (r#"혤"#, r#"혤"#, r#"혤"#, r#"혤"#, r#"혤"#),
+        (r#"혥"#, r#"혥"#, r#"혥"#, r#"혥"#, r#"혥"#),
+        (r#"혦"#, r#"혦"#, r#"혦"#, r#"혦"#, r#"혦"#),
+        (r#"혧"#, r#"혧"#, r#"혧"#, r#"혧"#, r#"혧"#),
+        (r#"혨"#, r#"혨"#, r#"혨"#, r#"혨"#, r#"혨"#),
+        (r#"혩"#, r#"혩"#, r#"혩"#, r#"혩"#, r#"혩"#),
+        (r#"혪"#, r#"혪"#, r#"혪"#, r#"혪"#, r#"혪"#),
+        (r#"혫"#, r#"혫"#, r#"혫"#, r#"혫"#, r#"혫"#),
+        (r#"혬"#, r#"혬"#, r#"혬"#, r#"혬"#, r#"혬"#),
+        (r#"혭"#, r#"혭"#, r#"혭"#, r#"혭"#, r#"혭"#),
+        (r#"혮"#, r#"혮"#, r#"혮"#, r#"혮"#, r#"혮"#),
+        (r#"혯"#, r#"혯"#, r#"혯"#, r#"혯"#, r#"혯"#),
+        (r#"혰"#, r#"혰"#, r#"혰"#, r#"혰"#, r#"혰"#),
+        (r#"혱"#, r#"혱"#, r#"혱"#, r#"혱"#, r#"혱"#),
+        (r#"혲"#, r#"혲"#, r#"혲"#, r#"혲"#, r#"혲"#),
+        (r#"혳"#, r#"혳"#, r#"혳"#, r#"혳"#, r#"혳"#),
+        (r#"혴"#, r#"혴"#, r#"혴"#, r#"혴"#, r#"혴"#),
+        (r#"혵"#, r#"혵"#, r#"혵"#, r#"혵"#, r#"혵"#),
+        (r#"혶"#, r#"혶"#, r#"혶"#, r#"혶"#, r#"혶"#),
+        (r#"혷"#, r#"혷"#, r#"혷"#, r#"혷"#, r#"혷"#),
+        (r#"호"#, r#"호"#, r#"호"#, r#"호"#, r#"호"#),
+        (r#"혹"#, r#"혹"#, r#"혹"#, r#"혹"#, r#"혹"#),
+        (r#"혺"#, r#"혺"#, r#"혺"#, r#"혺"#, r#"혺"#),
+        (r#"혻"#, r#"혻"#, r#"혻"#, r#"혻"#, r#"혻"#),
+        (r#"혼"#, r#"혼"#, r#"혼"#, r#"혼"#, r#"혼"#),
+        (r#"혽"#, r#"혽"#, r#"혽"#, r#"혽"#, r#"혽"#),
+        (r#"혾"#, r#"혾"#, r#"혾"#, r#"혾"#, r#"혾"#),
+        (r#"혿"#, r#"혿"#, r#"혿"#, r#"혿"#, r#"혿"#),
+        (r#"홀"#, r#"홀"#, r#"홀"#, r#"홀"#, r#"홀"#),
+        (r#"홁"#, r#"홁"#, r#"홁"#, r#"홁"#, r#"홁"#),
+        (r#"홂"#, r#"홂"#, r#"홂"#, r#"홂"#, r#"홂"#),
+        (r#"홃"#, r#"홃"#, r#"홃"#, r#"홃"#, r#"홃"#),
+        (r#"홄"#, r#"홄"#, r#"홄"#, r#"홄"#, r#"홄"#),
+        (r#"홅"#, r#"홅"#, r#"홅"#, r#"홅"#, r#"홅"#),
+        (r#"홆"#, r#"홆"#, r#"홆"#, r#"홆"#, r#"홆"#),
+        (r#"홇"#, r#"홇"#, r#"홇"#, r#"홇"#, r#"홇"#),
+        (r#"홈"#, r#"홈"#, r#"홈"#, r#"홈"#, r#"홈"#),
+        (r#"홉"#, r#"홉"#, r#"홉"#, r#"홉"#, r#"홉"#),
+        (r#"홊"#, r#"홊"#, r#"홊"#, r#"홊"#, r#"홊"#),
+        (r#"홋"#, r#"홋"#, r#"홋"#, r#"홋"#, r#"홋"#),
+        (r#"홌"#, r#"홌"#, r#"홌"#, r#"홌"#, r#"홌"#),
+        (r#"홍"#, r#"홍"#, r#"홍"#, r#"홍"#, r#"홍"#),
+        (r#"홎"#, r#"홎"#, r#"홎"#, r#"홎"#, r#"홎"#),
+        (r#"홏"#, r#"홏"#, r#"홏"#, r#"홏"#, r#"홏"#),
+        (r#"홐"#, r#"홐"#, r#"홐"#, r#"홐"#, r#"홐"#),
+        (r#"홑"#, r#"홑"#, r#"홑"#, r#"홑"#, r#"홑"#),
+        (r#"홒"#, r#"홒"#, r#"홒"#, r#"홒"#, r#"홒"#),
+        (r#"홓"#, r#"홓"#, r#"홓"#, r#"홓"#, r#"홓"#),
+        (r#"화"#, r#"화"#, r#"화"#, r#"화"#, r#"화"#),
+        (r#"확"#, r#"확"#, r#"확"#, r#"확"#, r#"확"#),
+        (r#"홖"#, r#"홖"#, r#"홖"#, r#"홖"#, r#"홖"#),
+        (r#"홗"#, r#"홗"#, r#"홗"#, r#"홗"#, r#"홗"#),
+        (r#"환"#, r#"환"#, r#"환"#, r#"환"#, r#"환"#),
+        (r#"홙"#, r#"홙"#, r#"홙"#, r#"홙"#, r#"홙"#),
+        (r#"홚"#, r#"홚"#, r#"홚"#, r#"홚"#, r#"홚"#),
+        (r#"홛"#, r#"홛"#, r#"홛"#, r#"홛"#, r#"홛"#),
+        (r#"활"#, r#"활"#, r#"활"#, r#"활"#, r#"활"#),
+        (r#"홝"#, r#"홝"#, r#"홝"#, r#"홝"#, r#"홝"#),
+        (r#"홞"#, r#"홞"#, r#"홞"#, r#"홞"#, r#"홞"#),
+        (r#"홟"#, r#"홟"#, r#"홟"#, r#"홟"#, r#"홟"#),
+        (r#"홠"#, r#"홠"#, r#"홠"#, r#"홠"#, r#"홠"#),
+        (r#"홡"#, r#"홡"#, r#"홡"#, r#"홡"#, r#"홡"#),
+        (r#"홢"#, r#"홢"#, r#"홢"#, r#"홢"#, r#"홢"#),
+        (r#"홣"#, r#"홣"#, r#"홣"#, r#"홣"#, r#"홣"#),
+        (r#"홤"#, r#"홤"#, r#"홤"#, r#"홤"#, r#"홤"#),
+        (r#"홥"#, r#"홥"#, r#"홥"#, r#"홥"#, r#"홥"#),
+        (r#"홦"#, r#"홦"#, r#"홦"#, r#"홦"#, r#"홦"#),
+        (r#"홧"#, r#"홧"#, r#"홧"#, r#"홧"#, r#"홧"#),
+        (r#"홨"#, r#"홨"#, r#"홨"#, r#"홨"#, r#"홨"#),
+        (r#"황"#, r#"황"#, r#"황"#, r#"황"#, r#"황"#),
+        (r#"홪"#, r#"홪"#, r#"홪"#, r#"홪"#, r#"홪"#),
+        (r#"홫"#, r#"홫"#, r#"홫"#, r#"홫"#, r#"홫"#),
+        (r#"홬"#, r#"홬"#, r#"홬"#, r#"홬"#, r#"홬"#),
+        (r#"홭"#, r#"홭"#, r#"홭"#, r#"홭"#, r#"홭"#),
+        (r#"홮"#, r#"홮"#, r#"홮"#, r#"홮"#, r#"홮"#),
+        (r#"홯"#, r#"홯"#, r#"홯"#, r#"홯"#, r#"홯"#),
+        (r#"홰"#, r#"홰"#, r#"홰"#, r#"홰"#, r#"홰"#),
+        (r#"홱"#, r#"홱"#, r#"홱"#, r#"홱"#, r#"홱"#),
+        (r#"홲"#, r#"홲"#, r#"홲"#, r#"홲"#, r#"홲"#),
+        (r#"홳"#, r#"홳"#, r#"홳"#, r#"홳"#, r#"홳"#),
+        (r#"홴"#, r#"홴"#, r#"홴"#, r#"홴"#, r#"홴"#),
+        (r#"홵"#, r#"홵"#, r#"홵"#, r#"홵"#, r#"홵"#),
+        (r#"홶"#, r#"홶"#, r#"홶"#, r#"홶"#, r#"홶"#),
+        (r#"홷"#, r#"홷"#, r#"홷"#, r#"홷"#, r#"홷"#),
+        (r#"홸"#, r#"홸"#, r#"홸"#, r#"홸"#, r#"홸"#),
+        (r#"홹"#, r#"홹"#, r#"홹"#, r#"홹"#, r#"홹"#),
+        (r#"홺"#, r#"홺"#, r#"홺"#, r#"홺"#, r#"홺"#),
+        (r#"홻"#, r#"홻"#, r#"홻"#, r#"홻"#, r#"홻"#),
+        (r#"홼"#, r#"홼"#, r#"홼"#, r#"홼"#, r#"홼"#),
+        (r#"홽"#, r#"홽"#, r#"홽"#, r#"홽"#, r#"홽"#),
+        (r#"홾"#, r#"홾"#, r#"홾"#, r#"홾"#, r#"홾"#),
+        (r#"홿"#, r#"홿"#, r#"홿"#, r#"홿"#, r#"홿"#),
+        (r#"횀"#, r#"횀"#, r#"횀"#, r#"횀"#, r#"횀"#),
+        (r#"횁"#, r#"횁"#, r#"횁"#, r#"횁"#, r#"횁"#),
+        (r#"횂"#, r#"횂"#, r#"횂"#, r#"횂"#, r#"횂"#),
+        (r#"횃"#, r#"횃"#, r#"횃"#, r#"횃"#, r#"횃"#),
+        (r#"횄"#, r#"횄"#, r#"횄"#, r#"횄"#, r#"횄"#),
+        (r#"횅"#, r#"횅"#, r#"횅"#, r#"횅"#, r#"횅"#),
+        (r#"횆"#, r#"횆"#, r#"횆"#, r#"횆"#, r#"횆"#),
+        (r#"횇"#, r#"횇"#, r#"횇"#, r#"횇"#, r#"횇"#),
+        (r#"횈"#, r#"횈"#, r#"횈"#, r#"횈"#, r#"횈"#),
+        (r#"횉"#, r#"횉"#, r#"횉"#, r#"횉"#, r#"횉"#),
+        (r#"횊"#, r#"횊"#, r#"횊"#, r#"횊"#, r#"횊"#),
+        (r#"횋"#, r#"횋"#, r#"횋"#, r#"횋"#, r#"횋"#),
+        (r#"회"#, r#"회"#, r#"회"#, r#"회"#, r#"회"#),
+        (r#"획"#, r#"획"#, r#"획"#, r#"획"#, r#"획"#),
+        (r#"횎"#, r#"횎"#, r#"횎"#, r#"횎"#, r#"횎"#),
+        (r#"횏"#, r#"횏"#, r#"횏"#, r#"횏"#, r#"횏"#),
+        (r#"횐"#, r#"횐"#, r#"횐"#, r#"횐"#, r#"횐"#),
+        (r#"횑"#, r#"횑"#, r#"횑"#, r#"횑"#, r#"횑"#),
+        (r#"횒"#, r#"횒"#, r#"횒"#, r#"횒"#, r#"횒"#),
+        (r#"횓"#, r#"횓"#, r#"횓"#, r#"횓"#, r#"횓"#),
+        (r#"횔"#, r#"횔"#, r#"횔"#, r#"횔"#, r#"횔"#),
+        (r#"횕"#, r#"횕"#, r#"횕"#, r#"횕"#, r#"횕"#),
+        (r#"횖"#, r#"횖"#, r#"횖"#, r#"횖"#, r#"횖"#),
+        (r#"횗"#, r#"횗"#, r#"횗"#, r#"횗"#, r#"횗"#),
+        (r#"횘"#, r#"횘"#, r#"횘"#, r#"횘"#, r#"횘"#),
+        (r#"횙"#, r#"횙"#, r#"횙"#, r#"횙"#, r#"횙"#),
+        (r#"횚"#, r#"횚"#, r#"횚"#, r#"횚"#, r#"횚"#),
+        (r#"횛"#, r#"횛"#, r#"횛"#, r#"횛"#, r#"횛"#),
+        (r#"횜"#, r#"횜"#, r#"횜"#, r#"횜"#, r#"횜"#),
+        (r#"횝"#, r#"횝"#, r#"횝"#, r#"횝"#, r#"횝"#),
+        (r#"횞"#, r#"횞"#, r#"횞"#, r#"횞"#, r#"횞"#),
+        (r#"횟"#, r#"횟"#, r#"횟"#, r#"횟"#, r#"횟"#),
+        (r#"횠"#, r#"횠"#, r#"횠"#, r#"횠"#, r#"횠"#),
+        (r#"횡"#, r#"횡"#, r#"횡"#, r#"횡"#, r#"횡"#),
+        (r#"횢"#, r#"횢"#, r#"횢"#, r#"횢"#, r#"횢"#),
+        (r#"횣"#, r#"횣"#, r#"횣"#, r#"횣"#, r#"횣"#),
+        (r#"횤"#, r#"횤"#, r#"횤"#, r#"횤"#, r#"횤"#),
+        (r#"횥"#, r#"횥"#, r#"횥"#, r#"횥"#, r#"횥"#),
+        (r#"횦"#, r#"횦"#, r#"횦"#, r#"횦"#, r#"횦"#),
+        (r#"횧"#, r#"횧"#, r#"횧"#, r#"횧"#, r#"횧"#),
+        (r#"효"#, r#"효"#, r#"효"#, r#"효"#, r#"효"#),
+        (r#"횩"#, r#"횩"#, r#"횩"#, r#"횩"#, r#"횩"#),
+        (r#"횪"#, r#"횪"#, r#"횪"#, r#"횪"#, r#"횪"#),
+        (r#"횫"#, r#"횫"#, r#"횫"#, r#"횫"#, r#"횫"#),
+        (r#"횬"#, r#"횬"#, r#"횬"#, r#"횬"#, r#"횬"#),
+        (r#"횭"#, r#"횭"#, r#"횭"#, r#"횭"#, r#"횭"#),
+        (r#"횮"#, r#"횮"#, r#"횮"#, r#"횮"#, r#"횮"#),
+        (r#"횯"#, r#"횯"#, r#"횯"#, r#"횯"#, r#"횯"#),
+        (r#"횰"#, r#"횰"#, r#"횰"#, r#"횰"#, r#"횰"#),
+        (r#"횱"#, r#"횱"#, r#"횱"#, r#"횱"#, r#"횱"#),
+        (r#"횲"#, r#"횲"#, r#"횲"#, r#"횲"#, r#"횲"#),
+        (r#"횳"#, r#"횳"#, r#"횳"#, r#"횳"#, r#"횳"#),
+        (r#"횴"#, r#"횴"#, r#"횴"#, r#"횴"#, r#"횴"#),
+        (r#"횵"#, r#"횵"#, r#"횵"#, r#"횵"#, r#"횵"#),
+        (r#"횶"#, r#"횶"#, r#"횶"#, r#"횶"#, r#"횶"#),
+        (r#"횷"#, r#"횷"#, r#"횷"#, r#"횷"#, r#"횷"#),
+        (r#"횸"#, r#"횸"#, r#"횸"#, r#"횸"#, r#"횸"#),
+        (r#"횹"#, r#"횹"#, r#"횹"#, r#"횹"#, r#"횹"#),
+        (r#"횺"#, r#"횺"#, r#"횺"#, r#"횺"#, r#"횺"#),
+        (r#"횻"#, r#"횻"#, r#"횻"#, r#"횻"#, r#"횻"#),
+        (r#"횼"#, r#"횼"#, r#"횼"#, r#"횼"#, r#"횼"#),
+        (r#"횽"#, r#"횽"#, r#"횽"#, r#"횽"#, r#"횽"#),
+        (r#"횾"#, r#"횾"#, r#"횾"#, r#"횾"#, r#"횾"#),
+        (r#"횿"#, r#"횿"#, r#"횿"#, r#"횿"#, r#"횿"#),
+        (r#"훀"#, r#"훀"#, r#"훀"#, r#"훀"#, r#"훀"#),
+        (r#"훁"#, r#"훁"#, r#"훁"#, r#"훁"#, r#"훁"#),
+        (r#"훂"#, r#"훂"#, r#"훂"#, r#"훂"#, r#"훂"#),
+        (r#"훃"#, r#"훃"#, r#"훃"#, r#"훃"#, r#"훃"#),
+        (r#"후"#, r#"후"#, r#"후"#, r#"후"#, r#"후"#),
+        (r#"훅"#, r#"훅"#, r#"훅"#, r#"훅"#, r#"훅"#),
+        (r#"훆"#, r#"훆"#, r#"훆"#, r#"훆"#, r#"훆"#),
+        (r#"훇"#, r#"훇"#, r#"훇"#, r#"훇"#, r#"훇"#),
+        (r#"훈"#, r#"훈"#, r#"훈"#, r#"훈"#, r#"훈"#),
+        (r#"훉"#, r#"훉"#, r#"훉"#, r#"훉"#, r#"훉"#),
+        (r#"훊"#, r#"훊"#, r#"훊"#, r#"훊"#, r#"훊"#),
+        (r#"훋"#, r#"훋"#, r#"훋"#, r#"훋"#, r#"훋"#),
+        (r#"훌"#, r#"훌"#, r#"훌"#, r#"훌"#, r#"훌"#),
+        (r#"훍"#, r#"훍"#, r#"훍"#, r#"훍"#, r#"훍"#),
+        (r#"훎"#, r#"훎"#, r#"훎"#, r#"훎"#, r#"훎"#),
+        (r#"훏"#, r#"훏"#, r#"훏"#, r#"훏"#, r#"훏"#),
+        (r#"훐"#, r#"훐"#, r#"훐"#, r#"훐"#, r#"훐"#),
+        (r#"훑"#, r#"훑"#, r#"훑"#, r#"훑"#, r#"훑"#),
+        (r#"훒"#, r#"훒"#, r#"훒"#, r#"훒"#, r#"훒"#),
+        (r#"훓"#, r#"훓"#, r#"훓"#, r#"훓"#, r#"훓"#),
+        (r#"훔"#, r#"훔"#, r#"훔"#, r#"훔"#, r#"훔"#),
+        (r#"훕"#, r#"훕"#, r#"훕"#, r#"훕"#, r#"훕"#),
+        (r#"훖"#, r#"훖"#, r#"훖"#, r#"훖"#, r#"훖"#),
+        (r#"훗"#, r#"훗"#, r#"훗"#, r#"훗"#, r#"훗"#),
+        (r#"훘"#, r#"훘"#, r#"훘"#, r#"훘"#, r#"훘"#),
+        (r#"훙"#, r#"훙"#, r#"훙"#, r#"훙"#, r#"훙"#),
+        (r#"훚"#, r#"훚"#, r#"훚"#, r#"훚"#, r#"훚"#),
+        (r#"훛"#, r#"훛"#, r#"훛"#, r#"훛"#, r#"훛"#),
+        (r#"훜"#, r#"훜"#, r#"훜"#, r#"훜"#, r#"훜"#),
+        (r#"훝"#, r#"훝"#, r#"훝"#, r#"훝"#, r#"훝"#),
+        (r#"훞"#, r#"훞"#, r#"훞"#, r#"훞"#, r#"훞"#),
+        (r#"훟"#, r#"훟"#, r#"훟"#, r#"훟"#, r#"훟"#),
+        (r#"훠"#, r#"훠"#, r#"훠"#, r#"훠"#, r#"훠"#),
+        (r#"훡"#, r#"훡"#, r#"훡"#, r#"훡"#, r#"훡"#),
+        (r#"훢"#, r#"훢"#, r#"훢"#, r#"훢"#, r#"훢"#),
+        (r#"훣"#, r#"훣"#, r#"훣"#, r#"훣"#, r#"훣"#),
+        (r#"훤"#, r#"훤"#, r#"훤"#, r#"훤"#, r#"훤"#),
+        (r#"훥"#, r#"훥"#, r#"훥"#, r#"훥"#, r#"훥"#),
+        (r#"훦"#, r#"훦"#, r#"훦"#, r#"훦"#, r#"훦"#),
+        (r#"훧"#, r#"훧"#, r#"훧"#, r#"훧"#, r#"훧"#),
+        (r#"훨"#, r#"훨"#, r#"훨"#, r#"훨"#, r#"훨"#),
+        (r#"훩"#, r#"훩"#, r#"훩"#, r#"훩"#, r#"훩"#),
+        (r#"훪"#, r#"훪"#, r#"훪"#, r#"훪"#, r#"훪"#),
+        (r#"훫"#, r#"훫"#, r#"훫"#, r#"훫"#, r#"훫"#),
+        (r#"훬"#, r#"훬"#, r#"훬"#, r#"훬"#, r#"훬"#),
+        (r#"훭"#, r#"훭"#, r#"훭"#, r#"훭"#, r#"훭"#),
+        (r#"훮"#, r#"훮"#, r#"훮"#, r#"훮"#, r#"훮"#),
+        (r#"훯"#, r#"훯"#, r#"훯"#, r#"훯"#, r#"훯"#),
+        (r#"훰"#, r#"훰"#, r#"훰"#, r#"훰"#, r#"훰"#),
+        (r#"훱"#, r#"훱"#, r#"훱"#, r#"훱"#, r#"훱"#),
+        (r#"훲"#, r#"훲"#, r#"훲"#, r#"훲"#, r#"훲"#),
+        (r#"훳"#, r#"훳"#, r#"훳"#, r#"훳"#, r#"훳"#),
+        (r#"훴"#, r#"훴"#, r#"훴"#, r#"훴"#, r#"훴"#),
+        (r#"훵"#, r#"훵"#, r#"훵"#, r#"훵"#, r#"훵"#),
+        (r#"훶"#, r#"훶"#, r#"훶"#, r#"훶"#, r#"훶"#),
+        (r#"훷"#, r#"훷"#, r#"훷"#, r#"훷"#, r#"훷"#),
+        (r#"훸"#, r#"훸"#, r#"훸"#, r#"훸"#, r#"훸"#),
+        (r#"훹"#, r#"훹"#, r#"훹"#, r#"훹"#, r#"훹"#),
+        (r#"훺"#, r#"훺"#, r#"훺"#, r#"훺"#, r#"훺"#),
+        (r#"훻"#, r#"훻"#, r#"훻"#, r#"훻"#, r#"훻"#),
+        (r#"훼"#, r#"훼"#, r#"훼"#, r#"훼"#, r#"훼"#),
+        (r#"훽"#, r#"훽"#, r#"훽"#, r#"훽"#, r#"훽"#),
+        (r#"훾"#, r#"훾"#, r#"훾"#, r#"훾"#, r#"훾"#),
+        (r#"훿"#, r#"훿"#, r#"훿"#, r#"훿"#, r#"훿"#),
+        (r#"휀"#, r#"휀"#, r#"휀"#, r#"휀"#, r#"휀"#),
+        (r#"휁"#, r#"휁"#, r#"휁"#, r#"휁"#, r#"휁"#),
+        (r#"휂"#, r#"휂"#, r#"휂"#, r#"휂"#, r#"휂"#),
+        (r#"휃"#, r#"휃"#, r#"휃"#, r#"휃"#, r#"휃"#),
+        (r#"휄"#, r#"휄"#, r#"휄"#, r#"휄"#, r#"휄"#),
+        (r#"휅"#, r#"휅"#, r#"휅"#, r#"휅"#, r#"휅"#),
+        (r#"휆"#, r#"휆"#, r#"휆"#, r#"휆"#, r#"휆"#),
+        (r#"휇"#, r#"휇"#, r#"휇"#, r#"휇"#, r#"휇"#),
+        (r#"휈"#, r#"휈"#, r#"휈"#, r#"휈"#, r#"휈"#),
+        (r#"휉"#, r#"휉"#, r#"휉"#, r#"휉"#, r#"휉"#),
+        (r#"휊"#, r#"휊"#, r#"휊"#, r#"휊"#, r#"휊"#),
+        (r#"휋"#, r#"휋"#, r#"휋"#, r#"휋"#, r#"휋"#),
+        (r#"휌"#, r#"휌"#, r#"휌"#, r#"휌"#, r#"휌"#),
+        (r#"휍"#, r#"휍"#, r#"휍"#, r#"휍"#, r#"휍"#),
+        (r#"휎"#, r#"휎"#, r#"휎"#, r#"휎"#, r#"휎"#),
+        (r#"휏"#, r#"휏"#, r#"휏"#, r#"휏"#, r#"휏"#),
+        (r#"휐"#, r#"휐"#, r#"휐"#, r#"휐"#, r#"휐"#),
+        (r#"휑"#, r#"휑"#, r#"휑"#, r#"휑"#, r#"휑"#),
+        (r#"휒"#, r#"휒"#, r#"휒"#, r#"휒"#, r#"휒"#),
+        (r#"휓"#, r#"휓"#, r#"휓"#, r#"휓"#, r#"휓"#),
+        (r#"휔"#, r#"휔"#, r#"휔"#, r#"휔"#, r#"휔"#),
+        (r#"휕"#, r#"휕"#, r#"휕"#, r#"휕"#, r#"휕"#),
+        (r#"휖"#, r#"휖"#, r#"휖"#, r#"휖"#, r#"휖"#),
+        (r#"휗"#, r#"휗"#, r#"휗"#, r#"휗"#, r#"휗"#),
+        (r#"휘"#, r#"휘"#, r#"휘"#, r#"휘"#, r#"휘"#),
+        (r#"휙"#, r#"휙"#, r#"휙"#, r#"휙"#, r#"휙"#),
+        (r#"휚"#, r#"휚"#, r#"휚"#, r#"휚"#, r#"휚"#),
+        (r#"휛"#, r#"휛"#, r#"휛"#, r#"휛"#, r#"휛"#),
+        (r#"휜"#, r#"휜"#, r#"휜"#, r#"휜"#, r#"휜"#),
+        (r#"휝"#, r#"휝"#, r#"휝"#, r#"휝"#, r#"휝"#),
+        (r#"휞"#, r#"휞"#, r#"휞"#, r#"휞"#, r#"휞"#),
+        (r#"휟"#, r#"휟"#, r#"휟"#, r#"휟"#, r#"휟"#),
+        (r#"휠"#, r#"휠"#, r#"휠"#, r#"휠"#, r#"휠"#),
+        (r#"휡"#, r#"휡"#, r#"휡"#, r#"휡"#, r#"휡"#),
+        (r#"휢"#, r#"휢"#, r#"휢"#, r#"휢"#, r#"휢"#),
+        (r#"휣"#, r#"휣"#, r#"휣"#, r#"휣"#, r#"휣"#),
+        (r#"휤"#, r#"휤"#, r#"휤"#, r#"휤"#, r#"휤"#),
+        (r#"휥"#, r#"휥"#, r#"휥"#, r#"휥"#, r#"휥"#),
+        (r#"휦"#, r#"휦"#, r#"휦"#, r#"휦"#, r#"휦"#),
+        (r#"휧"#, r#"휧"#, r#"휧"#, r#"휧"#, r#"휧"#),
+        (r#"휨"#, r#"휨"#, r#"휨"#, r#"휨"#, r#"휨"#),
+        (r#"휩"#, r#"휩"#, r#"휩"#, r#"휩"#, r#"휩"#),
+        (r#"휪"#, r#"휪"#, r#"휪"#, r#"휪"#, r#"휪"#),
+        (r#"휫"#, r#"휫"#, r#"휫"#, r#"휫"#, r#"휫"#),
+        (r#"휬"#, r#"휬"#, r#"휬"#, r#"휬"#, r#"휬"#),
+        (r#"휭"#, r#"휭"#, r#"휭"#, r#"휭"#, r#"휭"#),
+        (r#"휮"#, r#"휮"#, r#"휮"#, r#"휮"#, r#"휮"#),
+        (r#"휯"#, r#"휯"#, r#"휯"#, r#"휯"#, r#"휯"#),
+        (r#"휰"#, r#"휰"#, r#"휰"#, r#"휰"#, r#"휰"#),
+        (r#"휱"#, r#"휱"#, r#"휱"#, r#"휱"#, r#"휱"#),
+        (r#"휲"#, r#"휲"#, r#"휲"#, r#"휲"#, r#"휲"#),
+        (r#"휳"#, r#"휳"#, r#"휳"#, r#"휳"#, r#"휳"#),
+        (r#"휴"#, r#"휴"#, r#"휴"#, r#"휴"#, r#"휴"#),
+        (r#"휵"#, r#"휵"#, r#"휵"#, r#"휵"#, r#"휵"#),
+        (r#"휶"#, r#"휶"#, r#"휶"#, r#"휶"#, r#"휶"#),
+        (r#"휷"#, r#"휷"#, r#"휷"#, r#"휷"#, r#"휷"#),
+        (r#"휸"#, r#"휸"#, r#"휸"#, r#"휸"#, r#"휸"#),
+        (r#"휹"#, r#"휹"#, r#"휹"#, r#"휹"#, r#"휹"#),
+        (r#"휺"#, r#"휺"#, r#"휺"#, r#"휺"#, r#"휺"#),
+        (r#"휻"#, r#"휻"#, r#"휻"#, r#"휻"#, r#"휻"#),
+        (r#"휼"#, r#"휼"#, r#"휼"#, r#"휼"#, r#"휼"#),
+        (r#"휽"#, r#"휽"#, r#"휽"#, r#"휽"#, r#"휽"#),
+        (r#"휾"#, r#"휾"#, r#"휾"#, r#"휾"#, r#"휾"#),
+        (r#"휿"#, r#"휿"#, r#"휿"#, r#"휿"#, r#"휿"#),
+        (r#"흀"#, r#"흀"#, r#"흀"#, r#"흀"#, r#"흀"#),
+        (r#"흁"#, r#"흁"#, r#"흁"#, r#"흁"#, r#"흁"#),
+        (r#"흂"#, r#"흂"#, r#"흂"#, r#"흂"#, r#"흂"#),
+        (r#"흃"#, r#"흃"#, r#"흃"#, r#"흃"#, r#"흃"#),
+        (r#"흄"#, r#"흄"#, r#"흄"#, r#"흄"#, r#"흄"#),
+        (r#"흅"#, r#"흅"#, r#"흅"#, r#"흅"#, r#"흅"#),
+        (r#"흆"#, r#"흆"#, r#"흆"#, r#"흆"#, r#"흆"#),
+        (r#"흇"#, r#"흇"#, r#"흇"#, r#"흇"#, r#"흇"#),
+        (r#"흈"#, r#"흈"#, r#"흈"#, r#"흈"#, r#"흈"#),
+        (r#"흉"#, r#"흉"#, r#"흉"#, r#"흉"#, r#"흉"#),
+        (r#"흊"#, r#"흊"#, r#"흊"#, r#"흊"#, r#"흊"#),
+        (r#"흋"#, r#"흋"#, r#"흋"#, r#"흋"#, r#"흋"#),
+        (r#"흌"#, r#"흌"#, r#"흌"#, r#"흌"#, r#"흌"#),
+        (r#"흍"#, r#"흍"#, r#"흍"#, r#"흍"#, r#"흍"#),
+        (r#"흎"#, r#"흎"#, r#"흎"#, r#"흎"#, r#"흎"#),
+        (r#"흏"#, r#"흏"#, r#"흏"#, r#"흏"#, r#"흏"#),
+        (r#"흐"#, r#"흐"#, r#"흐"#, r#"흐"#, r#"흐"#),
+        (r#"흑"#, r#"흑"#, r#"흑"#, r#"흑"#, r#"흑"#),
+        (r#"흒"#, r#"흒"#, r#"흒"#, r#"흒"#, r#"흒"#),
+        (r#"흓"#, r#"흓"#, r#"흓"#, r#"흓"#, r#"흓"#),
+        (r#"흔"#, r#"흔"#, r#"흔"#, r#"흔"#, r#"흔"#),
+        (r#"흕"#, r#"흕"#, r#"흕"#, r#"흕"#, r#"흕"#),
+        (r#"흖"#, r#"흖"#, r#"흖"#, r#"흖"#, r#"흖"#),
+        (r#"흗"#, r#"흗"#, r#"흗"#, r#"흗"#, r#"흗"#),
+        (r#"흘"#, r#"흘"#, r#"흘"#, r#"흘"#, r#"흘"#),
+        (r#"흙"#, r#"흙"#, r#"흙"#, r#"흙"#, r#"흙"#),
+        (r#"흚"#, r#"흚"#, r#"흚"#, r#"흚"#, r#"흚"#),
+        (r#"흛"#, r#"흛"#, r#"흛"#, r#"흛"#, r#"흛"#),
+        (r#"흜"#, r#"흜"#, r#"흜"#, r#"흜"#, r#"흜"#),
+        (r#"흝"#, r#"흝"#, r#"흝"#, r#"흝"#, r#"흝"#),
+        (r#"흞"#, r#"흞"#, r#"흞"#, r#"흞"#, r#"흞"#),
+        (r#"흟"#, r#"흟"#, r#"흟"#, r#"흟"#, r#"흟"#),
+        (r#"흠"#, r#"흠"#, r#"흠"#, r#"흠"#, r#"흠"#),
+        (r#"흡"#, r#"흡"#, r#"흡"#, r#"흡"#, r#"흡"#),
+        (r#"흢"#, r#"흢"#, r#"흢"#, r#"흢"#, r#"흢"#),
+        (r#"흣"#, r#"흣"#, r#"흣"#, r#"흣"#, r#"흣"#),
+        (r#"흤"#, r#"흤"#, r#"흤"#, r#"흤"#, r#"흤"#),
+        (r#"흥"#, r#"흥"#, r#"흥"#, r#"흥"#, r#"흥"#),
+        (r#"흦"#, r#"흦"#, r#"흦"#, r#"흦"#, r#"흦"#),
+        (r#"흧"#, r#"흧"#, r#"흧"#, r#"흧"#, r#"흧"#),
+        (r#"흨"#, r#"흨"#, r#"흨"#, r#"흨"#, r#"흨"#),
+        (r#"흩"#, r#"흩"#, r#"흩"#, r#"흩"#, r#"흩"#),
+        (r#"흪"#, r#"흪"#, r#"흪"#, r#"흪"#, r#"흪"#),
+        (r#"흫"#, r#"흫"#, r#"흫"#, r#"흫"#, r#"흫"#),
+        (r#"희"#, r#"희"#, r#"희"#, r#"희"#, r#"희"#),
+        (r#"흭"#, r#"흭"#, r#"흭"#, r#"흭"#, r#"흭"#),
+        (r#"흮"#, r#"흮"#, r#"흮"#, r#"흮"#, r#"흮"#),
+        (r#"흯"#, r#"흯"#, r#"흯"#, r#"흯"#, r#"흯"#),
+        (r#"흰"#, r#"흰"#, r#"흰"#, r#"흰"#, r#"흰"#),
+        (r#"흱"#, r#"흱"#, r#"흱"#, r#"흱"#, r#"흱"#),
+        (r#"흲"#, r#"흲"#, r#"흲"#, r#"흲"#, r#"흲"#),
+        (r#"흳"#, r#"흳"#, r#"흳"#, r#"흳"#, r#"흳"#),
+        (r#"흴"#, r#"흴"#, r#"흴"#, r#"흴"#, r#"흴"#),
+        (r#"흵"#, r#"흵"#, r#"흵"#, r#"흵"#, r#"흵"#),
+        (r#"흶"#, r#"흶"#, r#"흶"#, r#"흶"#, r#"흶"#),
+        (r#"흷"#, r#"흷"#, r#"흷"#, r#"흷"#, r#"흷"#),
+        (r#"흸"#, r#"흸"#, r#"흸"#, r#"흸"#, r#"흸"#),
+        (r#"흹"#, r#"흹"#, r#"흹"#, r#"흹"#, r#"흹"#),
+        (r#"흺"#, r#"흺"#, r#"흺"#, r#"흺"#, r#"흺"#),
+        (r#"흻"#, r#"흻"#, r#"흻"#, r#"흻"#, r#"흻"#),
+        (r#"흼"#, r#"흼"#, r#"흼"#, r#"흼"#, r#"흼"#),
+        (r#"흽"#, r#"흽"#, r#"흽"#, r#"흽"#, r#"흽"#),
+        (r#"흾"#, r#"흾"#, r#"흾"#, r#"흾"#, r#"흾"#),
+        (r#"흿"#, r#"흿"#, r#"흿"#, r#"흿"#, r#"흿"#),
+        (r#"힀"#, r#"힀"#, r#"힀"#, r#"힀"#, r#"힀"#),
+        (r#"힁"#, r#"힁"#, r#"힁"#, r#"힁"#, r#"힁"#),
+        (r#"힂"#, r#"힂"#, r#"힂"#, r#"힂"#, r#"힂"#),
+        (r#"힃"#, r#"힃"#, r#"힃"#, r#"힃"#, r#"힃"#),
+        (r#"힄"#, r#"힄"#, r#"힄"#, r#"힄"#, r#"힄"#),
+        (r#"힅"#, r#"힅"#, r#"힅"#, r#"힅"#, r#"힅"#),
+        (r#"힆"#, r#"힆"#, r#"힆"#, r#"힆"#, r#"힆"#),
+        (r#"힇"#, r#"힇"#, r#"힇"#, r#"힇"#, r#"힇"#),
+        (r#"히"#, r#"히"#, r#"히"#, r#"히"#, r#"히"#),
+        (r#"힉"#, r#"힉"#, r#"힉"#, r#"힉"#, r#"힉"#),
+        (r#"힊"#, r#"힊"#, r#"힊"#, r#"힊"#, r#"힊"#),
+        (r#"힋"#, r#"힋"#, r#"힋"#, r#"힋"#, r#"힋"#),
+        (r#"힌"#, r#"힌"#, r#"힌"#, r#"힌"#, r#"힌"#),
+        (r#"힍"#, r#"힍"#, r#"힍"#, r#"힍"#, r#"힍"#),
+        (r#"힎"#, r#"힎"#, r#"힎"#, r#"힎"#, r#"힎"#),
+        (r#"힏"#, r#"힏"#, r#"힏"#, r#"힏"#, r#"힏"#),
+        (r#"힐"#, r#"힐"#, r#"힐"#, r#"힐"#, r#"힐"#),
+        (r#"힑"#, r#"힑"#, r#"힑"#, r#"힑"#, r#"힑"#),
+        (r#"힒"#, r#"힒"#, r#"힒"#, r#"힒"#, r#"힒"#),
+        (r#"힓"#, r#"힓"#, r#"힓"#, r#"힓"#, r#"힓"#),
+        (r#"힔"#, r#"힔"#, r#"힔"#, r#"힔"#, r#"힔"#),
+        (r#"힕"#, r#"힕"#, r#"힕"#, r#"힕"#, r#"힕"#),
+        (r#"힖"#, r#"힖"#, r#"힖"#, r#"힖"#, r#"힖"#),
+        (r#"힗"#, r#"힗"#, r#"힗"#, r#"힗"#, r#"힗"#),
+        (r#"힘"#, r#"힘"#, r#"힘"#, r#"힘"#, r#"힘"#),
+        (r#"힙"#, r#"힙"#, r#"힙"#, r#"힙"#, r#"힙"#),
+        (r#"힚"#, r#"힚"#, r#"힚"#, r#"힚"#, r#"힚"#),
+        (r#"힛"#, r#"힛"#, r#"힛"#, r#"힛"#, r#"힛"#),
+        (r#"힜"#, r#"힜"#, r#"힜"#, r#"힜"#, r#"힜"#),
+        (r#"힝"#, r#"힝"#, r#"힝"#, r#"힝"#, r#"힝"#),
+        (r#"힞"#, r#"힞"#, r#"힞"#, r#"힞"#, r#"힞"#),
+        (r#"힟"#, r#"힟"#, r#"힟"#, r#"힟"#, r#"힟"#),
+        (r#"힠"#, r#"힠"#, r#"힠"#, r#"힠"#, r#"힠"#),
+        (r#"힡"#, r#"힡"#, r#"힡"#, r#"힡"#, r#"힡"#),
+        (r#"힢"#, r#"힢"#, r#"힢"#, r#"힢"#, r#"힢"#),
+        (r#"힣"#, r#"힣"#, r#"힣"#, r#"힣"#, r#"힣"#),
+        (r#"豈"#, r#"豈"#, r#"豈"#, r#"豈"#, r#"豈"#),
+        (r#"更"#, r#"更"#, r#"更"#, r#"更"#, r#"更"#),
+        (r#"車"#, r#"車"#, r#"車"#, r#"車"#, r#"車"#),
+        (r#"賈"#, r#"賈"#, r#"賈"#, r#"賈"#, r#"賈"#),
+        (r#"滑"#, r#"滑"#, r#"滑"#, r#"滑"#, r#"滑"#),
+        (r#"串"#, r#"串"#, r#"串"#, r#"串"#, r#"串"#),
+        (r#"句"#, r#"句"#, r#"句"#, r#"句"#, r#"句"#),
+        (r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#),
+        (r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#),
+        (r#"契"#, r#"契"#, r#"契"#, r#"契"#, r#"契"#),
+        (r#"金"#, r#"金"#, r#"金"#, r#"金"#, r#"金"#),
+        (r#"喇"#, r#"喇"#, r#"喇"#, r#"喇"#, r#"喇"#),
+        (r#"奈"#, r#"奈"#, r#"奈"#, r#"奈"#, r#"奈"#),
+        (r#"懶"#, r#"懶"#, r#"懶"#, r#"懶"#, r#"懶"#),
+        (r#"癩"#, r#"癩"#, r#"癩"#, r#"癩"#, r#"癩"#),
+        (r#"羅"#, r#"羅"#, r#"羅"#, r#"羅"#, r#"羅"#),
+        (r#"蘿"#, r#"蘿"#, r#"蘿"#, r#"蘿"#, r#"蘿"#),
+        (r#"螺"#, r#"螺"#, r#"螺"#, r#"螺"#, r#"螺"#),
+        (r#"裸"#, r#"裸"#, r#"裸"#, r#"裸"#, r#"裸"#),
+        (r#"邏"#, r#"邏"#, r#"邏"#, r#"邏"#, r#"邏"#),
+        (r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#),
+        (r#"洛"#, r#"洛"#, r#"洛"#, r#"洛"#, r#"洛"#),
+        (r#"烙"#, r#"烙"#, r#"烙"#, r#"烙"#, r#"烙"#),
+        (r#"珞"#, r#"珞"#, r#"珞"#, r#"珞"#, r#"珞"#),
+        (r#"落"#, r#"落"#, r#"落"#, r#"落"#, r#"落"#),
+        (r#"酪"#, r#"酪"#, r#"酪"#, r#"酪"#, r#"酪"#),
+        (r#"駱"#, r#"駱"#, r#"駱"#, r#"駱"#, r#"駱"#),
+        (r#"亂"#, r#"亂"#, r#"亂"#, r#"亂"#, r#"亂"#),
+        (r#"卵"#, r#"卵"#, r#"卵"#, r#"卵"#, r#"卵"#),
+        (r#"欄"#, r#"欄"#, r#"欄"#, r#"欄"#, r#"欄"#),
+        (r#"爛"#, r#"爛"#, r#"爛"#, r#"爛"#, r#"爛"#),
+        (r#"蘭"#, r#"蘭"#, r#"蘭"#, r#"蘭"#, r#"蘭"#),
+        (r#"鸞"#, r#"鸞"#, r#"鸞"#, r#"鸞"#, r#"鸞"#),
+        (r#"嵐"#, r#"嵐"#, r#"嵐"#, r#"嵐"#, r#"嵐"#),
+        (r#"濫"#, r#"濫"#, r#"濫"#, r#"濫"#, r#"濫"#),
+        (r#"藍"#, r#"藍"#, r#"藍"#, r#"藍"#, r#"藍"#),
+        (r#"襤"#, r#"襤"#, r#"襤"#, r#"襤"#, r#"襤"#),
+        (r#"拉"#, r#"拉"#, r#"拉"#, r#"拉"#, r#"拉"#),
+        (r#"臘"#, r#"臘"#, r#"臘"#, r#"臘"#, r#"臘"#),
+        (r#"蠟"#, r#"蠟"#, r#"蠟"#, r#"蠟"#, r#"蠟"#),
+        (r#"廊"#, r#"廊"#, r#"廊"#, r#"廊"#, r#"廊"#),
+        (r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#),
+        (r#"浪"#, r#"浪"#, r#"浪"#, r#"浪"#, r#"浪"#),
+        (r#"狼"#, r#"狼"#, r#"狼"#, r#"狼"#, r#"狼"#),
+        (r#"郎"#, r#"郎"#, r#"郎"#, r#"郎"#, r#"郎"#),
+        (r#"來"#, r#"來"#, r#"來"#, r#"來"#, r#"來"#),
+        (r#"冷"#, r#"冷"#, r#"冷"#, r#"冷"#, r#"冷"#),
+        (r#"勞"#, r#"勞"#, r#"勞"#, r#"勞"#, r#"勞"#),
+        (r#"擄"#, r#"擄"#, r#"擄"#, r#"擄"#, r#"擄"#),
+        (r#"櫓"#, r#"櫓"#, r#"櫓"#, r#"櫓"#, r#"櫓"#),
+        (r#"爐"#, r#"爐"#, r#"爐"#, r#"爐"#, r#"爐"#),
+        (r#"盧"#, r#"盧"#, r#"盧"#, r#"盧"#, r#"盧"#),
+        (r#"老"#, r#"老"#, r#"老"#, r#"老"#, r#"老"#),
+        (r#"蘆"#, r#"蘆"#, r#"蘆"#, r#"蘆"#, r#"蘆"#),
+        (r#"虜"#, r#"虜"#, r#"虜"#, r#"虜"#, r#"虜"#),
+        (r#"路"#, r#"路"#, r#"路"#, r#"路"#, r#"路"#),
+        (r#"露"#, r#"露"#, r#"露"#, r#"露"#, r#"露"#),
+        (r#"魯"#, r#"魯"#, r#"魯"#, r#"魯"#, r#"魯"#),
+        (r#"鷺"#, r#"鷺"#, r#"鷺"#, r#"鷺"#, r#"鷺"#),
+        (r#"碌"#, r#"碌"#, r#"碌"#, r#"碌"#, r#"碌"#),
+        (r#"祿"#, r#"祿"#, r#"祿"#, r#"祿"#, r#"祿"#),
+        (r#"綠"#, r#"綠"#, r#"綠"#, r#"綠"#, r#"綠"#),
+        (r#"菉"#, r#"菉"#, r#"菉"#, r#"菉"#, r#"菉"#),
+        (r#"錄"#, r#"錄"#, r#"錄"#, r#"錄"#, r#"錄"#),
+        (r#"鹿"#, r#"鹿"#, r#"鹿"#, r#"鹿"#, r#"鹿"#),
+        (r#"論"#, r#"論"#, r#"論"#, r#"論"#, r#"論"#),
+        (r#"壟"#, r#"壟"#, r#"壟"#, r#"壟"#, r#"壟"#),
+        (r#"弄"#, r#"弄"#, r#"弄"#, r#"弄"#, r#"弄"#),
+        (r#"籠"#, r#"籠"#, r#"籠"#, r#"籠"#, r#"籠"#),
+        (r#"聾"#, r#"聾"#, r#"聾"#, r#"聾"#, r#"聾"#),
+        (r#"牢"#, r#"牢"#, r#"牢"#, r#"牢"#, r#"牢"#),
+        (r#"磊"#, r#"磊"#, r#"磊"#, r#"磊"#, r#"磊"#),
+        (r#"賂"#, r#"賂"#, r#"賂"#, r#"賂"#, r#"賂"#),
+        (r#"雷"#, r#"雷"#, r#"雷"#, r#"雷"#, r#"雷"#),
+        (r#"壘"#, r#"壘"#, r#"壘"#, r#"壘"#, r#"壘"#),
+        (r#"屢"#, r#"屢"#, r#"屢"#, r#"屢"#, r#"屢"#),
+        (r#"樓"#, r#"樓"#, r#"樓"#, r#"樓"#, r#"樓"#),
+        (r#"淚"#, r#"淚"#, r#"淚"#, r#"淚"#, r#"淚"#),
+        (r#"漏"#, r#"漏"#, r#"漏"#, r#"漏"#, r#"漏"#),
+        (r#"累"#, r#"累"#, r#"累"#, r#"累"#, r#"累"#),
+        (r#"縷"#, r#"縷"#, r#"縷"#, r#"縷"#, r#"縷"#),
+        (r#"陋"#, r#"陋"#, r#"陋"#, r#"陋"#, r#"陋"#),
+        (r#"勒"#, r#"勒"#, r#"勒"#, r#"勒"#, r#"勒"#),
+        (r#"肋"#, r#"肋"#, r#"肋"#, r#"肋"#, r#"肋"#),
+        (r#"凜"#, r#"凜"#, r#"凜"#, r#"凜"#, r#"凜"#),
+        (r#"凌"#, r#"凌"#, r#"凌"#, r#"凌"#, r#"凌"#),
+        (r#"稜"#, r#"稜"#, r#"稜"#, r#"稜"#, r#"稜"#),
+        (r#"綾"#, r#"綾"#, r#"綾"#, r#"綾"#, r#"綾"#),
+        (r#"菱"#, r#"菱"#, r#"菱"#, r#"菱"#, r#"菱"#),
+        (r#"陵"#, r#"陵"#, r#"陵"#, r#"陵"#, r#"陵"#),
+        (r#"讀"#, r#"讀"#, r#"讀"#, r#"讀"#, r#"讀"#),
+        (r#"拏"#, r#"拏"#, r#"拏"#, r#"拏"#, r#"拏"#),
+        (r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#),
+        (r#"諾"#, r#"諾"#, r#"諾"#, r#"諾"#, r#"諾"#),
+        (r#"丹"#, r#"丹"#, r#"丹"#, r#"丹"#, r#"丹"#),
+        (r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#),
+        (r#"怒"#, r#"怒"#, r#"怒"#, r#"怒"#, r#"怒"#),
+        (r#"率"#, r#"率"#, r#"率"#, r#"率"#, r#"率"#),
+        (r#"異"#, r#"異"#, r#"異"#, r#"異"#, r#"異"#),
+        (r#"北"#, r#"北"#, r#"北"#, r#"北"#, r#"北"#),
+        (r#"磻"#, r#"磻"#, r#"磻"#, r#"磻"#, r#"磻"#),
+        (r#"便"#, r#"便"#, r#"便"#, r#"便"#, r#"便"#),
+        (r#"復"#, r#"復"#, r#"復"#, r#"復"#, r#"復"#),
+        (r#"不"#, r#"不"#, r#"不"#, r#"不"#, r#"不"#),
+        (r#"泌"#, r#"泌"#, r#"泌"#, r#"泌"#, r#"泌"#),
+        (r#"數"#, r#"數"#, r#"數"#, r#"數"#, r#"數"#),
+        (r#"索"#, r#"索"#, r#"索"#, r#"索"#, r#"索"#),
+        (r#"參"#, r#"參"#, r#"參"#, r#"參"#, r#"參"#),
+        (r#"塞"#, r#"塞"#, r#"塞"#, r#"塞"#, r#"塞"#),
+        (r#"省"#, r#"省"#, r#"省"#, r#"省"#, r#"省"#),
+        (r#"葉"#, r#"葉"#, r#"葉"#, r#"葉"#, r#"葉"#),
+        (r#"說"#, r#"說"#, r#"說"#, r#"說"#, r#"說"#),
+        (r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#),
+        (r#"辰"#, r#"辰"#, r#"辰"#, r#"辰"#, r#"辰"#),
+        (r#"沈"#, r#"沈"#, r#"沈"#, r#"沈"#, r#"沈"#),
+        (r#"拾"#, r#"拾"#, r#"拾"#, r#"拾"#, r#"拾"#),
+        (r#"若"#, r#"若"#, r#"若"#, r#"若"#, r#"若"#),
+        (r#"掠"#, r#"掠"#, r#"掠"#, r#"掠"#, r#"掠"#),
+        (r#"略"#, r#"略"#, r#"略"#, r#"略"#, r#"略"#),
+        (r#"亮"#, r#"亮"#, r#"亮"#, r#"亮"#, r#"亮"#),
+        (r#"兩"#, r#"兩"#, r#"兩"#, r#"兩"#, r#"兩"#),
+        (r#"凉"#, r#"凉"#, r#"凉"#, r#"凉"#, r#"凉"#),
+        (r#"梁"#, r#"梁"#, r#"梁"#, r#"梁"#, r#"梁"#),
+        (r#"糧"#, r#"糧"#, r#"糧"#, r#"糧"#, r#"糧"#),
+        (r#"良"#, r#"良"#, r#"良"#, r#"良"#, r#"良"#),
+        (r#"諒"#, r#"諒"#, r#"諒"#, r#"諒"#, r#"諒"#),
+        (r#"量"#, r#"量"#, r#"量"#, r#"量"#, r#"量"#),
+        (r#"勵"#, r#"勵"#, r#"勵"#, r#"勵"#, r#"勵"#),
+        (r#"呂"#, r#"呂"#, r#"呂"#, r#"呂"#, r#"呂"#),
+        (r#"女"#, r#"女"#, r#"女"#, r#"女"#, r#"女"#),
+        (r#"廬"#, r#"廬"#, r#"廬"#, r#"廬"#, r#"廬"#),
+        (r#"旅"#, r#"旅"#, r#"旅"#, r#"旅"#, r#"旅"#),
+        (r#"濾"#, r#"濾"#, r#"濾"#, r#"濾"#, r#"濾"#),
+        (r#"礪"#, r#"礪"#, r#"礪"#, r#"礪"#, r#"礪"#),
+        (r#"閭"#, r#"閭"#, r#"閭"#, r#"閭"#, r#"閭"#),
+        (r#"驪"#, r#"驪"#, r#"驪"#, r#"驪"#, r#"驪"#),
+        (r#"麗"#, r#"麗"#, r#"麗"#, r#"麗"#, r#"麗"#),
+        (r#"黎"#, r#"黎"#, r#"黎"#, r#"黎"#, r#"黎"#),
+        (r#"力"#, r#"力"#, r#"力"#, r#"力"#, r#"力"#),
+        (r#"曆"#, r#"曆"#, r#"曆"#, r#"曆"#, r#"曆"#),
+        (r#"歷"#, r#"歷"#, r#"歷"#, r#"歷"#, r#"歷"#),
+        (r#"轢"#, r#"轢"#, r#"轢"#, r#"轢"#, r#"轢"#),
+        (r#"年"#, r#"年"#, r#"年"#, r#"年"#, r#"年"#),
+        (r#"憐"#, r#"憐"#, r#"憐"#, r#"憐"#, r#"憐"#),
+        (r#"戀"#, r#"戀"#, r#"戀"#, r#"戀"#, r#"戀"#),
+        (r#"撚"#, r#"撚"#, r#"撚"#, r#"撚"#, r#"撚"#),
+        (r#"漣"#, r#"漣"#, r#"漣"#, r#"漣"#, r#"漣"#),
+        (r#"煉"#, r#"煉"#, r#"煉"#, r#"煉"#, r#"煉"#),
+        (r#"璉"#, r#"璉"#, r#"璉"#, r#"璉"#, r#"璉"#),
+        (r#"秊"#, r#"秊"#, r#"秊"#, r#"秊"#, r#"秊"#),
+        (r#"練"#, r#"練"#, r#"練"#, r#"練"#, r#"練"#),
+        (r#"聯"#, r#"聯"#, r#"聯"#, r#"聯"#, r#"聯"#),
+        (r#"輦"#, r#"輦"#, r#"輦"#, r#"輦"#, r#"輦"#),
+        (r#"蓮"#, r#"蓮"#, r#"蓮"#, r#"蓮"#, r#"蓮"#),
+        (r#"連"#, r#"連"#, r#"連"#, r#"連"#, r#"連"#),
+        (r#"鍊"#, r#"鍊"#, r#"鍊"#, r#"鍊"#, r#"鍊"#),
+        (r#"列"#, r#"列"#, r#"列"#, r#"列"#, r#"列"#),
+        (r#"劣"#, r#"劣"#, r#"劣"#, r#"劣"#, r#"劣"#),
+        (r#"咽"#, r#"咽"#, r#"咽"#, r#"咽"#, r#"咽"#),
+        (r#"烈"#, r#"烈"#, r#"烈"#, r#"烈"#, r#"烈"#),
+        (r#"裂"#, r#"裂"#, r#"裂"#, r#"裂"#, r#"裂"#),
+        (r#"說"#, r#"說"#, r#"說"#, r#"說"#, r#"說"#),
+        (r#"廉"#, r#"廉"#, r#"廉"#, r#"廉"#, r#"廉"#),
+        (r#"念"#, r#"念"#, r#"念"#, r#"念"#, r#"念"#),
+        (r#"捻"#, r#"捻"#, r#"捻"#, r#"捻"#, r#"捻"#),
+        (r#"殮"#, r#"殮"#, r#"殮"#, r#"殮"#, r#"殮"#),
+        (r#"簾"#, r#"簾"#, r#"簾"#, r#"簾"#, r#"簾"#),
+        (r#"獵"#, r#"獵"#, r#"獵"#, r#"獵"#, r#"獵"#),
+        (r#"令"#, r#"令"#, r#"令"#, r#"令"#, r#"令"#),
+        (r#"囹"#, r#"囹"#, r#"囹"#, r#"囹"#, r#"囹"#),
+        (r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#),
+        (r#"嶺"#, r#"嶺"#, r#"嶺"#, r#"嶺"#, r#"嶺"#),
+        (r#"怜"#, r#"怜"#, r#"怜"#, r#"怜"#, r#"怜"#),
+        (r#"玲"#, r#"玲"#, r#"玲"#, r#"玲"#, r#"玲"#),
+        (r#"瑩"#, r#"瑩"#, r#"瑩"#, r#"瑩"#, r#"瑩"#),
+        (r#"羚"#, r#"羚"#, r#"羚"#, r#"羚"#, r#"羚"#),
+        (r#"聆"#, r#"聆"#, r#"聆"#, r#"聆"#, r#"聆"#),
+        (r#"鈴"#, r#"鈴"#, r#"鈴"#, r#"鈴"#, r#"鈴"#),
+        (r#"零"#, r#"零"#, r#"零"#, r#"零"#, r#"零"#),
+        (r#"靈"#, r#"靈"#, r#"靈"#, r#"靈"#, r#"靈"#),
+        (r#"領"#, r#"領"#, r#"領"#, r#"領"#, r#"領"#),
+        (r#"例"#, r#"例"#, r#"例"#, r#"例"#, r#"例"#),
+        (r#"禮"#, r#"禮"#, r#"禮"#, r#"禮"#, r#"禮"#),
+        (r#"醴"#, r#"醴"#, r#"醴"#, r#"醴"#, r#"醴"#),
+        (r#"隸"#, r#"隸"#, r#"隸"#, r#"隸"#, r#"隸"#),
+        (r#"惡"#, r#"惡"#, r#"惡"#, r#"惡"#, r#"惡"#),
+        (r#"了"#, r#"了"#, r#"了"#, r#"了"#, r#"了"#),
+        (r#"僚"#, r#"僚"#, r#"僚"#, r#"僚"#, r#"僚"#),
+        (r#"寮"#, r#"寮"#, r#"寮"#, r#"寮"#, r#"寮"#),
+        (r#"尿"#, r#"尿"#, r#"尿"#, r#"尿"#, r#"尿"#),
+        (r#"料"#, r#"料"#, r#"料"#, r#"料"#, r#"料"#),
+        (r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#, r#"樂"#),
+        (r#"燎"#, r#"燎"#, r#"燎"#, r#"燎"#, r#"燎"#),
+        (r#"療"#, r#"療"#, r#"療"#, r#"療"#, r#"療"#),
+        (r#"蓼"#, r#"蓼"#, r#"蓼"#, r#"蓼"#, r#"蓼"#),
+        (r#"遼"#, r#"遼"#, r#"遼"#, r#"遼"#, r#"遼"#),
+        (r#"龍"#, r#"龍"#, r#"龍"#, r#"龍"#, r#"龍"#),
+        (r#"暈"#, r#"暈"#, r#"暈"#, r#"暈"#, r#"暈"#),
+        (r#"阮"#, r#"阮"#, r#"阮"#, r#"阮"#, r#"阮"#),
+        (r#"劉"#, r#"劉"#, r#"劉"#, r#"劉"#, r#"劉"#),
+        (r#"杻"#, r#"杻"#, r#"杻"#, r#"杻"#, r#"杻"#),
+        (r#"柳"#, r#"柳"#, r#"柳"#, r#"柳"#, r#"柳"#),
+        (r#"流"#, r#"流"#, r#"流"#, r#"流"#, r#"流"#),
+        (r#"溜"#, r#"溜"#, r#"溜"#, r#"溜"#, r#"溜"#),
+        (r#"琉"#, r#"琉"#, r#"琉"#, r#"琉"#, r#"琉"#),
+        (r#"留"#, r#"留"#, r#"留"#, r#"留"#, r#"留"#),
+        (r#"硫"#, r#"硫"#, r#"硫"#, r#"硫"#, r#"硫"#),
+        (r#"紐"#, r#"紐"#, r#"紐"#, r#"紐"#, r#"紐"#),
+        (r#"類"#, r#"類"#, r#"類"#, r#"類"#, r#"類"#),
+        (r#"六"#, r#"六"#, r#"六"#, r#"六"#, r#"六"#),
+        (r#"戮"#, r#"戮"#, r#"戮"#, r#"戮"#, r#"戮"#),
+        (r#"陸"#, r#"陸"#, r#"陸"#, r#"陸"#, r#"陸"#),
+        (r#"倫"#, r#"倫"#, r#"倫"#, r#"倫"#, r#"倫"#),
+        (r#"崙"#, r#"崙"#, r#"崙"#, r#"崙"#, r#"崙"#),
+        (r#"淪"#, r#"淪"#, r#"淪"#, r#"淪"#, r#"淪"#),
+        (r#"輪"#, r#"輪"#, r#"輪"#, r#"輪"#, r#"輪"#),
+        (r#"律"#, r#"律"#, r#"律"#, r#"律"#, r#"律"#),
+        (r#"慄"#, r#"慄"#, r#"慄"#, r#"慄"#, r#"慄"#),
+        (r#"栗"#, r#"栗"#, r#"栗"#, r#"栗"#, r#"栗"#),
+        (r#"率"#, r#"率"#, r#"率"#, r#"率"#, r#"率"#),
+        (r#"隆"#, r#"隆"#, r#"隆"#, r#"隆"#, r#"隆"#),
+        (r#"利"#, r#"利"#, r#"利"#, r#"利"#, r#"利"#),
+        (r#"吏"#, r#"吏"#, r#"吏"#, r#"吏"#, r#"吏"#),
+        (r#"履"#, r#"履"#, r#"履"#, r#"履"#, r#"履"#),
+        (r#"易"#, r#"易"#, r#"易"#, r#"易"#, r#"易"#),
+        (r#"李"#, r#"李"#, r#"李"#, r#"李"#, r#"李"#),
+        (r#"梨"#, r#"梨"#, r#"梨"#, r#"梨"#, r#"梨"#),
+        (r#"泥"#, r#"泥"#, r#"泥"#, r#"泥"#, r#"泥"#),
+        (r#"理"#, r#"理"#, r#"理"#, r#"理"#, r#"理"#),
+        (r#"痢"#, r#"痢"#, r#"痢"#, r#"痢"#, r#"痢"#),
+        (r#"罹"#, r#"罹"#, r#"罹"#, r#"罹"#, r#"罹"#),
+        (r#"裏"#, r#"裏"#, r#"裏"#, r#"裏"#, r#"裏"#),
+        (r#"裡"#, r#"裡"#, r#"裡"#, r#"裡"#, r#"裡"#),
+        (r#"里"#, r#"里"#, r#"里"#, r#"里"#, r#"里"#),
+        (r#"離"#, r#"離"#, r#"離"#, r#"離"#, r#"離"#),
+        (r#"匿"#, r#"匿"#, r#"匿"#, r#"匿"#, r#"匿"#),
+        (r#"溺"#, r#"溺"#, r#"溺"#, r#"溺"#, r#"溺"#),
+        (r#"吝"#, r#"吝"#, r#"吝"#, r#"吝"#, r#"吝"#),
+        (r#"燐"#, r#"燐"#, r#"燐"#, r#"燐"#, r#"燐"#),
+        (r#"璘"#, r#"璘"#, r#"璘"#, r#"璘"#, r#"璘"#),
+        (r#"藺"#, r#"藺"#, r#"藺"#, r#"藺"#, r#"藺"#),
+        (r#"隣"#, r#"隣"#, r#"隣"#, r#"隣"#, r#"隣"#),
+        (r#"鱗"#, r#"鱗"#, r#"鱗"#, r#"鱗"#, r#"鱗"#),
+        (r#"麟"#, r#"麟"#, r#"麟"#, r#"麟"#, r#"麟"#),
+        (r#"林"#, r#"林"#, r#"林"#, r#"林"#, r#"林"#),
+        (r#"淋"#, r#"淋"#, r#"淋"#, r#"淋"#, r#"淋"#),
+        (r#"臨"#, r#"臨"#, r#"臨"#, r#"臨"#, r#"臨"#),
+        (r#"立"#, r#"立"#, r#"立"#, r#"立"#, r#"立"#),
+        (r#"笠"#, r#"笠"#, r#"笠"#, r#"笠"#, r#"笠"#),
+        (r#"粒"#, r#"粒"#, r#"粒"#, r#"粒"#, r#"粒"#),
+        (r#"狀"#, r#"狀"#, r#"狀"#, r#"狀"#, r#"狀"#),
+        (r#"炙"#, r#"炙"#, r#"炙"#, r#"炙"#, r#"炙"#),
+        (r#"識"#, r#"識"#, r#"識"#, r#"識"#, r#"識"#),
+        (r#"什"#, r#"什"#, r#"什"#, r#"什"#, r#"什"#),
+        (r#"茶"#, r#"茶"#, r#"茶"#, r#"茶"#, r#"茶"#),
+        (r#"刺"#, r#"刺"#, r#"刺"#, r#"刺"#, r#"刺"#),
+        (r#"切"#, r#"切"#, r#"切"#, r#"切"#, r#"切"#),
+        (r#"度"#, r#"度"#, r#"度"#, r#"度"#, r#"度"#),
+        (r#"拓"#, r#"拓"#, r#"拓"#, r#"拓"#, r#"拓"#),
+        (r#"糖"#, r#"糖"#, r#"糖"#, r#"糖"#, r#"糖"#),
+        (r#"宅"#, r#"宅"#, r#"宅"#, r#"宅"#, r#"宅"#),
+        (r#"洞"#, r#"洞"#, r#"洞"#, r#"洞"#, r#"洞"#),
+        (r#"暴"#, r#"暴"#, r#"暴"#, r#"暴"#, r#"暴"#),
+        (r#"輻"#, r#"輻"#, r#"輻"#, r#"輻"#, r#"輻"#),
+        (r#"行"#, r#"行"#, r#"行"#, r#"行"#, r#"行"#),
+        (r#"降"#, r#"降"#, r#"降"#, r#"降"#, r#"降"#),
+        (r#"見"#, r#"見"#, r#"見"#, r#"見"#, r#"見"#),
+        (r#"廓"#, r#"廓"#, r#"廓"#, r#"廓"#, r#"廓"#),
+        (r#"兀"#, r#"兀"#, r#"兀"#, r#"兀"#, r#"兀"#),
+        (r#"嗀"#, r#"嗀"#, r#"嗀"#, r#"嗀"#, r#"嗀"#),
+        (r#"塚"#, r#"塚"#, r#"塚"#, r#"塚"#, r#"塚"#),
+        (r#"晴"#, r#"晴"#, r#"晴"#, r#"晴"#, r#"晴"#),
+        (r#"凞"#, r#"凞"#, r#"凞"#, r#"凞"#, r#"凞"#),
+        (r#"猪"#, r#"猪"#, r#"猪"#, r#"猪"#, r#"猪"#),
+        (r#"益"#, r#"益"#, r#"益"#, r#"益"#, r#"益"#),
+        (r#"礼"#, r#"礼"#, r#"礼"#, r#"礼"#, r#"礼"#),
+        (r#"神"#, r#"神"#, r#"神"#, r#"神"#, r#"神"#),
+        (r#"祥"#, r#"祥"#, r#"祥"#, r#"祥"#, r#"祥"#),
+        (r#"福"#, r#"福"#, r#"福"#, r#"福"#, r#"福"#),
+        (r#"靖"#, r#"靖"#, r#"靖"#, r#"靖"#, r#"靖"#),
+        (r#"精"#, r#"精"#, r#"精"#, r#"精"#, r#"精"#),
+        (r#"羽"#, r#"羽"#, r#"羽"#, r#"羽"#, r#"羽"#),
+        (r#"蘒"#, r#"蘒"#, r#"蘒"#, r#"蘒"#, r#"蘒"#),
+        (r#"諸"#, r#"諸"#, r#"諸"#, r#"諸"#, r#"諸"#),
+        (r#"逸"#, r#"逸"#, r#"逸"#, r#"逸"#, r#"逸"#),
+        (r#"都"#, r#"都"#, r#"都"#, r#"都"#, r#"都"#),
+        (r#"飯"#, r#"飯"#, r#"飯"#, r#"飯"#, r#"飯"#),
+        (r#"飼"#, r#"飼"#, r#"飼"#, r#"飼"#, r#"飼"#),
+        (r#"館"#, r#"館"#, r#"館"#, r#"館"#, r#"館"#),
+        (r#"鶴"#, r#"鶴"#, r#"鶴"#, r#"鶴"#, r#"鶴"#),
+        (r#"郞"#, r#"郞"#, r#"郞"#, r#"郞"#, r#"郞"#),
+        (r#"隷"#, r#"隷"#, r#"隷"#, r#"隷"#, r#"隷"#),
+        (r#"侮"#, r#"侮"#, r#"侮"#, r#"侮"#, r#"侮"#),
+        (r#"僧"#, r#"僧"#, r#"僧"#, r#"僧"#, r#"僧"#),
+        (r#"免"#, r#"免"#, r#"免"#, r#"免"#, r#"免"#),
+        (r#"勉"#, r#"勉"#, r#"勉"#, r#"勉"#, r#"勉"#),
+        (r#"勤"#, r#"勤"#, r#"勤"#, r#"勤"#, r#"勤"#),
+        (r#"卑"#, r#"卑"#, r#"卑"#, r#"卑"#, r#"卑"#),
+        (r#"喝"#, r#"喝"#, r#"喝"#, r#"喝"#, r#"喝"#),
+        (r#"嘆"#, r#"嘆"#, r#"嘆"#, r#"嘆"#, r#"嘆"#),
+        (r#"器"#, r#"器"#, r#"器"#, r#"器"#, r#"器"#),
+        (r#"塀"#, r#"塀"#, r#"塀"#, r#"塀"#, r#"塀"#),
+        (r#"墨"#, r#"墨"#, r#"墨"#, r#"墨"#, r#"墨"#),
+        (r#"層"#, r#"層"#, r#"層"#, r#"層"#, r#"層"#),
+        (r#"屮"#, r#"屮"#, r#"屮"#, r#"屮"#, r#"屮"#),
+        (r#"悔"#, r#"悔"#, r#"悔"#, r#"悔"#, r#"悔"#),
+        (r#"慨"#, r#"慨"#, r#"慨"#, r#"慨"#, r#"慨"#),
+        (r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#),
+        (r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#),
+        (r#"敏"#, r#"敏"#, r#"敏"#, r#"敏"#, r#"敏"#),
+        (r#"既"#, r#"既"#, r#"既"#, r#"既"#, r#"既"#),
+        (r#"暑"#, r#"暑"#, r#"暑"#, r#"暑"#, r#"暑"#),
+        (r#"梅"#, r#"梅"#, r#"梅"#, r#"梅"#, r#"梅"#),
+        (r#"海"#, r#"海"#, r#"海"#, r#"海"#, r#"海"#),
+        (r#"渚"#, r#"渚"#, r#"渚"#, r#"渚"#, r#"渚"#),
+        (r#"漢"#, r#"漢"#, r#"漢"#, r#"漢"#, r#"漢"#),
+        (r#"煮"#, r#"煮"#, r#"煮"#, r#"煮"#, r#"煮"#),
+        (r#"爫"#, r#"爫"#, r#"爫"#, r#"爫"#, r#"爫"#),
+        (r#"琢"#, r#"琢"#, r#"琢"#, r#"琢"#, r#"琢"#),
+        (r#"碑"#, r#"碑"#, r#"碑"#, r#"碑"#, r#"碑"#),
+        (r#"社"#, r#"社"#, r#"社"#, r#"社"#, r#"社"#),
+        (r#"祉"#, r#"祉"#, r#"祉"#, r#"祉"#, r#"祉"#),
+        (r#"祈"#, r#"祈"#, r#"祈"#, r#"祈"#, r#"祈"#),
+        (r#"祐"#, r#"祐"#, r#"祐"#, r#"祐"#, r#"祐"#),
+        (r#"祖"#, r#"祖"#, r#"祖"#, r#"祖"#, r#"祖"#),
+        (r#"祝"#, r#"祝"#, r#"祝"#, r#"祝"#, r#"祝"#),
+        (r#"禍"#, r#"禍"#, r#"禍"#, r#"禍"#, r#"禍"#),
+        (r#"禎"#, r#"禎"#, r#"禎"#, r#"禎"#, r#"禎"#),
+        (r#"穀"#, r#"穀"#, r#"穀"#, r#"穀"#, r#"穀"#),
+        (r#"突"#, r#"突"#, r#"突"#, r#"突"#, r#"突"#),
+        (r#"節"#, r#"節"#, r#"節"#, r#"節"#, r#"節"#),
+        (r#"練"#, r#"練"#, r#"練"#, r#"練"#, r#"練"#),
+        (r#"縉"#, r#"縉"#, r#"縉"#, r#"縉"#, r#"縉"#),
+        (r#"繁"#, r#"繁"#, r#"繁"#, r#"繁"#, r#"繁"#),
+        (r#"署"#, r#"署"#, r#"署"#, r#"署"#, r#"署"#),
+        (r#"者"#, r#"者"#, r#"者"#, r#"者"#, r#"者"#),
+        (r#"臭"#, r#"臭"#, r#"臭"#, r#"臭"#, r#"臭"#),
+        (r#"艹"#, r#"艹"#, r#"艹"#, r#"艹"#, r#"艹"#),
+        (r#"艹"#, r#"艹"#, r#"艹"#, r#"艹"#, r#"艹"#),
+        (r#"著"#, r#"著"#, r#"著"#, r#"著"#, r#"著"#),
+        (r#"褐"#, r#"褐"#, r#"褐"#, r#"褐"#, r#"褐"#),
+        (r#"視"#, r#"視"#, r#"視"#, r#"視"#, r#"視"#),
+        (r#"謁"#, r#"謁"#, r#"謁"#, r#"謁"#, r#"謁"#),
+        (r#"謹"#, r#"謹"#, r#"謹"#, r#"謹"#, r#"謹"#),
+        (r#"賓"#, r#"賓"#, r#"賓"#, r#"賓"#, r#"賓"#),
+        (r#"贈"#, r#"贈"#, r#"贈"#, r#"贈"#, r#"贈"#),
+        (r#"辶"#, r#"辶"#, r#"辶"#, r#"辶"#, r#"辶"#),
+        (r#"逸"#, r#"逸"#, r#"逸"#, r#"逸"#, r#"逸"#),
+        (r#"難"#, r#"難"#, r#"難"#, r#"難"#, r#"難"#),
+        (r#"響"#, r#"響"#, r#"響"#, r#"響"#, r#"響"#),
+        (r#"頻"#, r#"頻"#, r#"頻"#, r#"頻"#, r#"頻"#),
+        (r#"恵"#, r#"恵"#, r#"恵"#, r#"恵"#, r#"恵"#),
+        (r#"𤋮"#, r#"𤋮"#, r#"𤋮"#, r#"𤋮"#, r#"𤋮"#),
+        (r#"舘"#, r#"舘"#, r#"舘"#, r#"舘"#, r#"舘"#),
+        (r#"並"#, r#"並"#, r#"並"#, r#"並"#, r#"並"#),
+        (r#"况"#, r#"况"#, r#"况"#, r#"况"#, r#"况"#),
+        (r#"全"#, r#"全"#, r#"全"#, r#"全"#, r#"全"#),
+        (r#"侀"#, r#"侀"#, r#"侀"#, r#"侀"#, r#"侀"#),
+        (r#"充"#, r#"充"#, r#"充"#, r#"充"#, r#"充"#),
+        (r#"冀"#, r#"冀"#, r#"冀"#, r#"冀"#, r#"冀"#),
+        (r#"勇"#, r#"勇"#, r#"勇"#, r#"勇"#, r#"勇"#),
+        (r#"勺"#, r#"勺"#, r#"勺"#, r#"勺"#, r#"勺"#),
+        (r#"喝"#, r#"喝"#, r#"喝"#, r#"喝"#, r#"喝"#),
+        (r#"啕"#, r#"啕"#, r#"啕"#, r#"啕"#, r#"啕"#),
+        (r#"喙"#, r#"喙"#, r#"喙"#, r#"喙"#, r#"喙"#),
+        (r#"嗢"#, r#"嗢"#, r#"嗢"#, r#"嗢"#, r#"嗢"#),
+        (r#"塚"#, r#"塚"#, r#"塚"#, r#"塚"#, r#"塚"#),
+        (r#"墳"#, r#"墳"#, r#"墳"#, r#"墳"#, r#"墳"#),
+        (r#"奄"#, r#"奄"#, r#"奄"#, r#"奄"#, r#"奄"#),
+        (r#"奔"#, r#"奔"#, r#"奔"#, r#"奔"#, r#"奔"#),
+        (r#"婢"#, r#"婢"#, r#"婢"#, r#"婢"#, r#"婢"#),
+        (r#"嬨"#, r#"嬨"#, r#"嬨"#, r#"嬨"#, r#"嬨"#),
+        (r#"廒"#, r#"廒"#, r#"廒"#, r#"廒"#, r#"廒"#),
+        (r#"廙"#, r#"廙"#, r#"廙"#, r#"廙"#, r#"廙"#),
+        (r#"彩"#, r#"彩"#, r#"彩"#, r#"彩"#, r#"彩"#),
+        (r#"徭"#, r#"徭"#, r#"徭"#, r#"徭"#, r#"徭"#),
+        (r#"惘"#, r#"惘"#, r#"惘"#, r#"惘"#, r#"惘"#),
+        (r#"慎"#, r#"慎"#, r#"慎"#, r#"慎"#, r#"慎"#),
+        (r#"愈"#, r#"愈"#, r#"愈"#, r#"愈"#, r#"愈"#),
+        (r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#),
+        (r#"慠"#, r#"慠"#, r#"慠"#, r#"慠"#, r#"慠"#),
+        (r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#),
+        (r#"戴"#, r#"戴"#, r#"戴"#, r#"戴"#, r#"戴"#),
+        (r#"揄"#, r#"揄"#, r#"揄"#, r#"揄"#, r#"揄"#),
+        (r#"搜"#, r#"搜"#, r#"搜"#, r#"搜"#, r#"搜"#),
+        (r#"摒"#, r#"摒"#, r#"摒"#, r#"摒"#, r#"摒"#),
+        (r#"敖"#, r#"敖"#, r#"敖"#, r#"敖"#, r#"敖"#),
+        (r#"晴"#, r#"晴"#, r#"晴"#, r#"晴"#, r#"晴"#),
+        (r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#),
+        (r#"望"#, r#"望"#, r#"望"#, r#"望"#, r#"望"#),
+        (r#"杖"#, r#"杖"#, r#"杖"#, r#"杖"#, r#"杖"#),
+        (r#"歹"#, r#"歹"#, r#"歹"#, r#"歹"#, r#"歹"#),
+        (r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#),
+        (r#"流"#, r#"流"#, r#"流"#, r#"流"#, r#"流"#),
+        (r#"滛"#, r#"滛"#, r#"滛"#, r#"滛"#, r#"滛"#),
+        (r#"滋"#, r#"滋"#, r#"滋"#, r#"滋"#, r#"滋"#),
+        (r#"漢"#, r#"漢"#, r#"漢"#, r#"漢"#, r#"漢"#),
+        (r#"瀞"#, r#"瀞"#, r#"瀞"#, r#"瀞"#, r#"瀞"#),
+        (r#"煮"#, r#"煮"#, r#"煮"#, r#"煮"#, r#"煮"#),
+        (r#"瞧"#, r#"瞧"#, r#"瞧"#, r#"瞧"#, r#"瞧"#),
+        (r#"爵"#, r#"爵"#, r#"爵"#, r#"爵"#, r#"爵"#),
+        (r#"犯"#, r#"犯"#, r#"犯"#, r#"犯"#, r#"犯"#),
+        (r#"猪"#, r#"猪"#, r#"猪"#, r#"猪"#, r#"猪"#),
+        (r#"瑱"#, r#"瑱"#, r#"瑱"#, r#"瑱"#, r#"瑱"#),
+        (r#"甆"#, r#"甆"#, r#"甆"#, r#"甆"#, r#"甆"#),
+        (r#"画"#, r#"画"#, r#"画"#, r#"画"#, r#"画"#),
+        (r#"瘝"#, r#"瘝"#, r#"瘝"#, r#"瘝"#, r#"瘝"#),
+        (r#"瘟"#, r#"瘟"#, r#"瘟"#, r#"瘟"#, r#"瘟"#),
+        (r#"益"#, r#"益"#, r#"益"#, r#"益"#, r#"益"#),
+        (r#"盛"#, r#"盛"#, r#"盛"#, r#"盛"#, r#"盛"#),
+        (r#"直"#, r#"直"#, r#"直"#, r#"直"#, r#"直"#),
+        (r#"睊"#, r#"睊"#, r#"睊"#, r#"睊"#, r#"睊"#),
+        (r#"着"#, r#"着"#, r#"着"#, r#"着"#, r#"着"#),
+        (r#"磌"#, r#"磌"#, r#"磌"#, r#"磌"#, r#"磌"#),
+        (r#"窱"#, r#"窱"#, r#"窱"#, r#"窱"#, r#"窱"#),
+        (r#"節"#, r#"節"#, r#"節"#, r#"節"#, r#"節"#),
+        (r#"类"#, r#"类"#, r#"类"#, r#"类"#, r#"类"#),
+        (r#"絛"#, r#"絛"#, r#"絛"#, r#"絛"#, r#"絛"#),
+        (r#"練"#, r#"練"#, r#"練"#, r#"練"#, r#"練"#),
+        (r#"缾"#, r#"缾"#, r#"缾"#, r#"缾"#, r#"缾"#),
+        (r#"者"#, r#"者"#, r#"者"#, r#"者"#, r#"者"#),
+        (r#"荒"#, r#"荒"#, r#"荒"#, r#"荒"#, r#"荒"#),
+        (r#"華"#, r#"華"#, r#"華"#, r#"華"#, r#"華"#),
+        (r#"蝹"#, r#"蝹"#, r#"蝹"#, r#"蝹"#, r#"蝹"#),
+        (r#"襁"#, r#"襁"#, r#"襁"#, r#"襁"#, r#"襁"#),
+        (r#"覆"#, r#"覆"#, r#"覆"#, r#"覆"#, r#"覆"#),
+        (r#"視"#, r#"視"#, r#"視"#, r#"視"#, r#"視"#),
+        (r#"調"#, r#"調"#, r#"調"#, r#"調"#, r#"調"#),
+        (r#"諸"#, r#"諸"#, r#"諸"#, r#"諸"#, r#"諸"#),
+        (r#"請"#, r#"請"#, r#"請"#, r#"請"#, r#"請"#),
+        (r#"謁"#, r#"謁"#, r#"謁"#, r#"謁"#, r#"謁"#),
+        (r#"諾"#, r#"諾"#, r#"諾"#, r#"諾"#, r#"諾"#),
+        (r#"諭"#, r#"諭"#, r#"諭"#, r#"諭"#, r#"諭"#),
+        (r#"謹"#, r#"謹"#, r#"謹"#, r#"謹"#, r#"謹"#),
+        (r#"變"#, r#"變"#, r#"變"#, r#"變"#, r#"變"#),
+        (r#"贈"#, r#"贈"#, r#"贈"#, r#"贈"#, r#"贈"#),
+        (r#"輸"#, r#"輸"#, r#"輸"#, r#"輸"#, r#"輸"#),
+        (r#"遲"#, r#"遲"#, r#"遲"#, r#"遲"#, r#"遲"#),
+        (r#"醙"#, r#"醙"#, r#"醙"#, r#"醙"#, r#"醙"#),
+        (r#"鉶"#, r#"鉶"#, r#"鉶"#, r#"鉶"#, r#"鉶"#),
+        (r#"陼"#, r#"陼"#, r#"陼"#, r#"陼"#, r#"陼"#),
+        (r#"難"#, r#"難"#, r#"難"#, r#"難"#, r#"難"#),
+        (r#"靖"#, r#"靖"#, r#"靖"#, r#"靖"#, r#"靖"#),
+        (r#"韛"#, r#"韛"#, r#"韛"#, r#"韛"#, r#"韛"#),
+        (r#"響"#, r#"響"#, r#"響"#, r#"響"#, r#"響"#),
+        (r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#),
+        (r#"頻"#, r#"頻"#, r#"頻"#, r#"頻"#, r#"頻"#),
+        (r#"鬒"#, r#"鬒"#, r#"鬒"#, r#"鬒"#, r#"鬒"#),
+        (r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#, r#"龜"#),
+        (r#"𢡊"#, r#"𢡊"#, r#"𢡊"#, r#"𢡊"#, r#"𢡊"#),
+        (r#"𢡄"#, r#"𢡄"#, r#"𢡄"#, r#"𢡄"#, r#"𢡄"#),
+        (r#"𣏕"#, r#"𣏕"#, r#"𣏕"#, r#"𣏕"#, r#"𣏕"#),
+        (r#"㮝"#, r#"㮝"#, r#"㮝"#, r#"㮝"#, r#"㮝"#),
+        (r#"䀘"#, r#"䀘"#, r#"䀘"#, r#"䀘"#, r#"䀘"#),
+        (r#"䀹"#, r#"䀹"#, r#"䀹"#, r#"䀹"#, r#"䀹"#),
+        (r#"𥉉"#, r#"𥉉"#, r#"𥉉"#, r#"𥉉"#, r#"𥉉"#),
+        (r#"𥳐"#, r#"𥳐"#, r#"𥳐"#, r#"𥳐"#, r#"𥳐"#),
+        (r#"𧻓"#, r#"𧻓"#, r#"𧻓"#, r#"𧻓"#, r#"𧻓"#),
+        (r#"齃"#, r#"齃"#, r#"齃"#, r#"齃"#, r#"齃"#),
+        (r#"龎"#, r#"龎"#, r#"龎"#, r#"龎"#, r#"龎"#),
+        (r#"ff"#, r#"ff"#, r#"ff"#, r#"ff"#, r#"ff"#),
+        (r#"fi"#, r#"fi"#, r#"fi"#, r#"fi"#, r#"fi"#),
+        (r#"fl"#, r#"fl"#, r#"fl"#, r#"fl"#, r#"fl"#),
+        (r#"ffi"#, r#"ffi"#, r#"ffi"#, r#"ffi"#, r#"ffi"#),
+        (r#"ffl"#, r#"ffl"#, r#"ffl"#, r#"ffl"#, r#"ffl"#),
+        (r#"ſt"#, r#"ſt"#, r#"ſt"#, r#"st"#, r#"st"#),
+        (r#"st"#, r#"st"#, r#"st"#, r#"st"#, r#"st"#),
+        (r#"ﬓ"#, r#"ﬓ"#, r#"ﬓ"#, r#"մն"#, r#"մն"#),
+        (r#"ﬔ"#, r#"ﬔ"#, r#"ﬔ"#, r#"մե"#, r#"մե"#),
+        (r#"ﬕ"#, r#"ﬕ"#, r#"ﬕ"#, r#"մի"#, r#"մի"#),
+        (r#"ﬖ"#, r#"ﬖ"#, r#"ﬖ"#, r#"վն"#, r#"վն"#),
+        (r#"ﬗ"#, r#"ﬗ"#, r#"ﬗ"#, r#"մխ"#, r#"մխ"#),
+        (r#"יִ"#, r#"יִ"#, r#"יִ"#, r#"יִ"#, r#"יִ"#),
+        (r#"ײַ"#, r#"ײַ"#, r#"ײַ"#, r#"ײַ"#, r#"ײַ"#),
+        (r#"ﬠ"#, r#"ﬠ"#, r#"ﬠ"#, r#"ע"#, r#"ע"#),
+        (r#"ﬡ"#, r#"ﬡ"#, r#"ﬡ"#, r#"א"#, r#"א"#),
+        (r#"ﬢ"#, r#"ﬢ"#, r#"ﬢ"#, r#"ד"#, r#"ד"#),
+        (r#"ﬣ"#, r#"ﬣ"#, r#"ﬣ"#, r#"ה"#, r#"ה"#),
+        (r#"ﬤ"#, r#"ﬤ"#, r#"ﬤ"#, r#"כ"#, r#"כ"#),
+        (r#"ﬥ"#, r#"ﬥ"#, r#"ﬥ"#, r#"ל"#, r#"ל"#),
+        (r#"ﬦ"#, r#"ﬦ"#, r#"ﬦ"#, r#"ם"#, r#"ם"#),
+        (r#"ﬧ"#, r#"ﬧ"#, r#"ﬧ"#, r#"ר"#, r#"ר"#),
+        (r#"ﬨ"#, r#"ﬨ"#, r#"ﬨ"#, r#"ת"#, r#"ת"#),
+        (r#"﬩"#, r#"﬩"#, r#"﬩"#, r#"+"#, r#"+"#),
+        (r#"שׁ"#, r#"שׁ"#, r#"שׁ"#, r#"שׁ"#, r#"שׁ"#),
+        (r#"שׂ"#, r#"שׂ"#, r#"שׂ"#, r#"שׂ"#, r#"שׂ"#),
+        (r#"שּׁ"#, r#"שּׁ"#, r#"שּׁ"#, r#"שּׁ"#, r#"שּׁ"#),
+        (r#"שּׂ"#, r#"שּׂ"#, r#"שּׂ"#, r#"שּׂ"#, r#"שּׂ"#),
+        (r#"אַ"#, r#"אַ"#, r#"אַ"#, r#"אַ"#, r#"אַ"#),
+        (r#"אָ"#, r#"אָ"#, r#"אָ"#, r#"אָ"#, r#"אָ"#),
+        (r#"אּ"#, r#"אּ"#, r#"אּ"#, r#"אּ"#, r#"אּ"#),
+        (r#"בּ"#, r#"בּ"#, r#"בּ"#, r#"בּ"#, r#"בּ"#),
+        (r#"גּ"#, r#"גּ"#, r#"גּ"#, r#"גּ"#, r#"גּ"#),
+        (r#"דּ"#, r#"דּ"#, r#"דּ"#, r#"דּ"#, r#"דּ"#),
+        (r#"הּ"#, r#"הּ"#, r#"הּ"#, r#"הּ"#, r#"הּ"#),
+        (r#"וּ"#, r#"וּ"#, r#"וּ"#, r#"וּ"#, r#"וּ"#),
+        (r#"זּ"#, r#"זּ"#, r#"זּ"#, r#"זּ"#, r#"זּ"#),
+        (r#"טּ"#, r#"טּ"#, r#"טּ"#, r#"טּ"#, r#"טּ"#),
+        (r#"יּ"#, r#"יּ"#, r#"יּ"#, r#"יּ"#, r#"יּ"#),
+        (r#"ךּ"#, r#"ךּ"#, r#"ךּ"#, r#"ךּ"#, r#"ךּ"#),
+        (r#"כּ"#, r#"כּ"#, r#"כּ"#, r#"כּ"#, r#"כּ"#),
+        (r#"לּ"#, r#"לּ"#, r#"לּ"#, r#"לּ"#, r#"לּ"#),
+        (r#"מּ"#, r#"מּ"#, r#"מּ"#, r#"מּ"#, r#"מּ"#),
+        (r#"נּ"#, r#"נּ"#, r#"נּ"#, r#"נּ"#, r#"נּ"#),
+        (r#"סּ"#, r#"סּ"#, r#"סּ"#, r#"סּ"#, r#"סּ"#),
+        (r#"ףּ"#, r#"ףּ"#, r#"ףּ"#, r#"ףּ"#, r#"ףּ"#),
+        (r#"פּ"#, r#"פּ"#, r#"פּ"#, r#"פּ"#, r#"פּ"#),
+        (r#"צּ"#, r#"צּ"#, r#"צּ"#, r#"צּ"#, r#"צּ"#),
+        (r#"קּ"#, r#"קּ"#, r#"קּ"#, r#"קּ"#, r#"קּ"#),
+        (r#"רּ"#, r#"רּ"#, r#"רּ"#, r#"רּ"#, r#"רּ"#),
+        (r#"שּ"#, r#"שּ"#, r#"שּ"#, r#"שּ"#, r#"שּ"#),
+        (r#"תּ"#, r#"תּ"#, r#"תּ"#, r#"תּ"#, r#"תּ"#),
+        (r#"וֹ"#, r#"וֹ"#, r#"וֹ"#, r#"וֹ"#, r#"וֹ"#),
+        (r#"בֿ"#, r#"בֿ"#, r#"בֿ"#, r#"בֿ"#, r#"בֿ"#),
+        (r#"כֿ"#, r#"כֿ"#, r#"כֿ"#, r#"כֿ"#, r#"כֿ"#),
+        (r#"פֿ"#, r#"פֿ"#, r#"פֿ"#, r#"פֿ"#, r#"פֿ"#),
+        (r#"ﭏ"#, r#"ﭏ"#, r#"ﭏ"#, r#"אל"#, r#"אל"#),
+        (r#"ﭐ"#, r#"ﭐ"#, r#"ﭐ"#, r#"ٱ"#, r#"ٱ"#),
+        (r#"ﭑ"#, r#"ﭑ"#, r#"ﭑ"#, r#"ٱ"#, r#"ٱ"#),
+        (r#"ﭒ"#, r#"ﭒ"#, r#"ﭒ"#, r#"ٻ"#, r#"ٻ"#),
+        (r#"ﭓ"#, r#"ﭓ"#, r#"ﭓ"#, r#"ٻ"#, r#"ٻ"#),
+        (r#"ﭔ"#, r#"ﭔ"#, r#"ﭔ"#, r#"ٻ"#, r#"ٻ"#),
+        (r#"ﭕ"#, r#"ﭕ"#, r#"ﭕ"#, r#"ٻ"#, r#"ٻ"#),
+        (r#"ﭖ"#, r#"ﭖ"#, r#"ﭖ"#, r#"پ"#, r#"پ"#),
+        (r#"ﭗ"#, r#"ﭗ"#, r#"ﭗ"#, r#"پ"#, r#"پ"#),
+        (r#"ﭘ"#, r#"ﭘ"#, r#"ﭘ"#, r#"پ"#, r#"پ"#),
+        (r#"ﭙ"#, r#"ﭙ"#, r#"ﭙ"#, r#"پ"#, r#"پ"#),
+        (r#"ﭚ"#, r#"ﭚ"#, r#"ﭚ"#, r#"ڀ"#, r#"ڀ"#),
+        (r#"ﭛ"#, r#"ﭛ"#, r#"ﭛ"#, r#"ڀ"#, r#"ڀ"#),
+        (r#"ﭜ"#, r#"ﭜ"#, r#"ﭜ"#, r#"ڀ"#, r#"ڀ"#),
+        (r#"ﭝ"#, r#"ﭝ"#, r#"ﭝ"#, r#"ڀ"#, r#"ڀ"#),
+        (r#"ﭞ"#, r#"ﭞ"#, r#"ﭞ"#, r#"ٺ"#, r#"ٺ"#),
+        (r#"ﭟ"#, r#"ﭟ"#, r#"ﭟ"#, r#"ٺ"#, r#"ٺ"#),
+        (r#"ﭠ"#, r#"ﭠ"#, r#"ﭠ"#, r#"ٺ"#, r#"ٺ"#),
+        (r#"ﭡ"#, r#"ﭡ"#, r#"ﭡ"#, r#"ٺ"#, r#"ٺ"#),
+        (r#"ﭢ"#, r#"ﭢ"#, r#"ﭢ"#, r#"ٿ"#, r#"ٿ"#),
+        (r#"ﭣ"#, r#"ﭣ"#, r#"ﭣ"#, r#"ٿ"#, r#"ٿ"#),
+        (r#"ﭤ"#, r#"ﭤ"#, r#"ﭤ"#, r#"ٿ"#, r#"ٿ"#),
+        (r#"ﭥ"#, r#"ﭥ"#, r#"ﭥ"#, r#"ٿ"#, r#"ٿ"#),
+        (r#"ﭦ"#, r#"ﭦ"#, r#"ﭦ"#, r#"ٹ"#, r#"ٹ"#),
+        (r#"ﭧ"#, r#"ﭧ"#, r#"ﭧ"#, r#"ٹ"#, r#"ٹ"#),
+        (r#"ﭨ"#, r#"ﭨ"#, r#"ﭨ"#, r#"ٹ"#, r#"ٹ"#),
+        (r#"ﭩ"#, r#"ﭩ"#, r#"ﭩ"#, r#"ٹ"#, r#"ٹ"#),
+        (r#"ﭪ"#, r#"ﭪ"#, r#"ﭪ"#, r#"ڤ"#, r#"ڤ"#),
+        (r#"ﭫ"#, r#"ﭫ"#, r#"ﭫ"#, r#"ڤ"#, r#"ڤ"#),
+        (r#"ﭬ"#, r#"ﭬ"#, r#"ﭬ"#, r#"ڤ"#, r#"ڤ"#),
+        (r#"ﭭ"#, r#"ﭭ"#, r#"ﭭ"#, r#"ڤ"#, r#"ڤ"#),
+        (r#"ﭮ"#, r#"ﭮ"#, r#"ﭮ"#, r#"ڦ"#, r#"ڦ"#),
+        (r#"ﭯ"#, r#"ﭯ"#, r#"ﭯ"#, r#"ڦ"#, r#"ڦ"#),
+        (r#"ﭰ"#, r#"ﭰ"#, r#"ﭰ"#, r#"ڦ"#, r#"ڦ"#),
+        (r#"ﭱ"#, r#"ﭱ"#, r#"ﭱ"#, r#"ڦ"#, r#"ڦ"#),
+        (r#"ﭲ"#, r#"ﭲ"#, r#"ﭲ"#, r#"ڄ"#, r#"ڄ"#),
+        (r#"ﭳ"#, r#"ﭳ"#, r#"ﭳ"#, r#"ڄ"#, r#"ڄ"#),
+        (r#"ﭴ"#, r#"ﭴ"#, r#"ﭴ"#, r#"ڄ"#, r#"ڄ"#),
+        (r#"ﭵ"#, r#"ﭵ"#, r#"ﭵ"#, r#"ڄ"#, r#"ڄ"#),
+        (r#"ﭶ"#, r#"ﭶ"#, r#"ﭶ"#, r#"ڃ"#, r#"ڃ"#),
+        (r#"ﭷ"#, r#"ﭷ"#, r#"ﭷ"#, r#"ڃ"#, r#"ڃ"#),
+        (r#"ﭸ"#, r#"ﭸ"#, r#"ﭸ"#, r#"ڃ"#, r#"ڃ"#),
+        (r#"ﭹ"#, r#"ﭹ"#, r#"ﭹ"#, r#"ڃ"#, r#"ڃ"#),
+        (r#"ﭺ"#, r#"ﭺ"#, r#"ﭺ"#, r#"چ"#, r#"چ"#),
+        (r#"ﭻ"#, r#"ﭻ"#, r#"ﭻ"#, r#"چ"#, r#"چ"#),
+        (r#"ﭼ"#, r#"ﭼ"#, r#"ﭼ"#, r#"چ"#, r#"چ"#),
+        (r#"ﭽ"#, r#"ﭽ"#, r#"ﭽ"#, r#"چ"#, r#"چ"#),
+        (r#"ﭾ"#, r#"ﭾ"#, r#"ﭾ"#, r#"ڇ"#, r#"ڇ"#),
+        (r#"ﭿ"#, r#"ﭿ"#, r#"ﭿ"#, r#"ڇ"#, r#"ڇ"#),
+        (r#"ﮀ"#, r#"ﮀ"#, r#"ﮀ"#, r#"ڇ"#, r#"ڇ"#),
+        (r#"ﮁ"#, r#"ﮁ"#, r#"ﮁ"#, r#"ڇ"#, r#"ڇ"#),
+        (r#"ﮂ"#, r#"ﮂ"#, r#"ﮂ"#, r#"ڍ"#, r#"ڍ"#),
+        (r#"ﮃ"#, r#"ﮃ"#, r#"ﮃ"#, r#"ڍ"#, r#"ڍ"#),
+        (r#"ﮄ"#, r#"ﮄ"#, r#"ﮄ"#, r#"ڌ"#, r#"ڌ"#),
+        (r#"ﮅ"#, r#"ﮅ"#, r#"ﮅ"#, r#"ڌ"#, r#"ڌ"#),
+        (r#"ﮆ"#, r#"ﮆ"#, r#"ﮆ"#, r#"ڎ"#, r#"ڎ"#),
+        (r#"ﮇ"#, r#"ﮇ"#, r#"ﮇ"#, r#"ڎ"#, r#"ڎ"#),
+        (r#"ﮈ"#, r#"ﮈ"#, r#"ﮈ"#, r#"ڈ"#, r#"ڈ"#),
+        (r#"ﮉ"#, r#"ﮉ"#, r#"ﮉ"#, r#"ڈ"#, r#"ڈ"#),
+        (r#"ﮊ"#, r#"ﮊ"#, r#"ﮊ"#, r#"ژ"#, r#"ژ"#),
+        (r#"ﮋ"#, r#"ﮋ"#, r#"ﮋ"#, r#"ژ"#, r#"ژ"#),
+        (r#"ﮌ"#, r#"ﮌ"#, r#"ﮌ"#, r#"ڑ"#, r#"ڑ"#),
+        (r#"ﮍ"#, r#"ﮍ"#, r#"ﮍ"#, r#"ڑ"#, r#"ڑ"#),
+        (r#"ﮎ"#, r#"ﮎ"#, r#"ﮎ"#, r#"ک"#, r#"ک"#),
+        (r#"ﮏ"#, r#"ﮏ"#, r#"ﮏ"#, r#"ک"#, r#"ک"#),
+        (r#"ﮐ"#, r#"ﮐ"#, r#"ﮐ"#, r#"ک"#, r#"ک"#),
+        (r#"ﮑ"#, r#"ﮑ"#, r#"ﮑ"#, r#"ک"#, r#"ک"#),
+        (r#"ﮒ"#, r#"ﮒ"#, r#"ﮒ"#, r#"گ"#, r#"گ"#),
+        (r#"ﮓ"#, r#"ﮓ"#, r#"ﮓ"#, r#"گ"#, r#"گ"#),
+        (r#"ﮔ"#, r#"ﮔ"#, r#"ﮔ"#, r#"گ"#, r#"گ"#),
+        (r#"ﮕ"#, r#"ﮕ"#, r#"ﮕ"#, r#"گ"#, r#"گ"#),
+        (r#"ﮖ"#, r#"ﮖ"#, r#"ﮖ"#, r#"ڳ"#, r#"ڳ"#),
+        (r#"ﮗ"#, r#"ﮗ"#, r#"ﮗ"#, r#"ڳ"#, r#"ڳ"#),
+        (r#"ﮘ"#, r#"ﮘ"#, r#"ﮘ"#, r#"ڳ"#, r#"ڳ"#),
+        (r#"ﮙ"#, r#"ﮙ"#, r#"ﮙ"#, r#"ڳ"#, r#"ڳ"#),
+        (r#"ﮚ"#, r#"ﮚ"#, r#"ﮚ"#, r#"ڱ"#, r#"ڱ"#),
+        (r#"ﮛ"#, r#"ﮛ"#, r#"ﮛ"#, r#"ڱ"#, r#"ڱ"#),
+        (r#"ﮜ"#, r#"ﮜ"#, r#"ﮜ"#, r#"ڱ"#, r#"ڱ"#),
+        (r#"ﮝ"#, r#"ﮝ"#, r#"ﮝ"#, r#"ڱ"#, r#"ڱ"#),
+        (r#"ﮞ"#, r#"ﮞ"#, r#"ﮞ"#, r#"ں"#, r#"ں"#),
+        (r#"ﮟ"#, r#"ﮟ"#, r#"ﮟ"#, r#"ں"#, r#"ں"#),
+        (r#"ﮠ"#, r#"ﮠ"#, r#"ﮠ"#, r#"ڻ"#, r#"ڻ"#),
+        (r#"ﮡ"#, r#"ﮡ"#, r#"ﮡ"#, r#"ڻ"#, r#"ڻ"#),
+        (r#"ﮢ"#, r#"ﮢ"#, r#"ﮢ"#, r#"ڻ"#, r#"ڻ"#),
+        (r#"ﮣ"#, r#"ﮣ"#, r#"ﮣ"#, r#"ڻ"#, r#"ڻ"#),
+        (r#"ﮤ"#, r#"ﮤ"#, r#"ﮤ"#, r#"ۀ"#, r#"ۀ"#),
+        (r#"ﮥ"#, r#"ﮥ"#, r#"ﮥ"#, r#"ۀ"#, r#"ۀ"#),
+        (r#"ﮦ"#, r#"ﮦ"#, r#"ﮦ"#, r#"ہ"#, r#"ہ"#),
+        (r#"ﮧ"#, r#"ﮧ"#, r#"ﮧ"#, r#"ہ"#, r#"ہ"#),
+        (r#"ﮨ"#, r#"ﮨ"#, r#"ﮨ"#, r#"ہ"#, r#"ہ"#),
+        (r#"ﮩ"#, r#"ﮩ"#, r#"ﮩ"#, r#"ہ"#, r#"ہ"#),
+        (r#"ﮪ"#, r#"ﮪ"#, r#"ﮪ"#, r#"ھ"#, r#"ھ"#),
+        (r#"ﮫ"#, r#"ﮫ"#, r#"ﮫ"#, r#"ھ"#, r#"ھ"#),
+        (r#"ﮬ"#, r#"ﮬ"#, r#"ﮬ"#, r#"ھ"#, r#"ھ"#),
+        (r#"ﮭ"#, r#"ﮭ"#, r#"ﮭ"#, r#"ھ"#, r#"ھ"#),
+        (r#"ﮮ"#, r#"ﮮ"#, r#"ﮮ"#, r#"ے"#, r#"ے"#),
+        (r#"ﮯ"#, r#"ﮯ"#, r#"ﮯ"#, r#"ے"#, r#"ے"#),
+        (r#"ﮰ"#, r#"ﮰ"#, r#"ﮰ"#, r#"ۓ"#, r#"ۓ"#),
+        (r#"ﮱ"#, r#"ﮱ"#, r#"ﮱ"#, r#"ۓ"#, r#"ۓ"#),
+        (r#"ﯓ"#, r#"ﯓ"#, r#"ﯓ"#, r#"ڭ"#, r#"ڭ"#),
+        (r#"ﯔ"#, r#"ﯔ"#, r#"ﯔ"#, r#"ڭ"#, r#"ڭ"#),
+        (r#"ﯕ"#, r#"ﯕ"#, r#"ﯕ"#, r#"ڭ"#, r#"ڭ"#),
+        (r#"ﯖ"#, r#"ﯖ"#, r#"ﯖ"#, r#"ڭ"#, r#"ڭ"#),
+        (r#"ﯗ"#, r#"ﯗ"#, r#"ﯗ"#, r#"ۇ"#, r#"ۇ"#),
+        (r#"ﯘ"#, r#"ﯘ"#, r#"ﯘ"#, r#"ۇ"#, r#"ۇ"#),
+        (r#"ﯙ"#, r#"ﯙ"#, r#"ﯙ"#, r#"ۆ"#, r#"ۆ"#),
+        (r#"ﯚ"#, r#"ﯚ"#, r#"ﯚ"#, r#"ۆ"#, r#"ۆ"#),
+        (r#"ﯛ"#, r#"ﯛ"#, r#"ﯛ"#, r#"ۈ"#, r#"ۈ"#),
+        (r#"ﯜ"#, r#"ﯜ"#, r#"ﯜ"#, r#"ۈ"#, r#"ۈ"#),
+        (r#"ﯝ"#, r#"ﯝ"#, r#"ﯝ"#, r#"ۇٴ"#, r#"ۇٴ"#),
+        (r#"ﯞ"#, r#"ﯞ"#, r#"ﯞ"#, r#"ۋ"#, r#"ۋ"#),
+        (r#"ﯟ"#, r#"ﯟ"#, r#"ﯟ"#, r#"ۋ"#, r#"ۋ"#),
+        (r#"ﯠ"#, r#"ﯠ"#, r#"ﯠ"#, r#"ۅ"#, r#"ۅ"#),
+        (r#"ﯡ"#, r#"ﯡ"#, r#"ﯡ"#, r#"ۅ"#, r#"ۅ"#),
+        (r#"ﯢ"#, r#"ﯢ"#, r#"ﯢ"#, r#"ۉ"#, r#"ۉ"#),
+        (r#"ﯣ"#, r#"ﯣ"#, r#"ﯣ"#, r#"ۉ"#, r#"ۉ"#),
+        (r#"ﯤ"#, r#"ﯤ"#, r#"ﯤ"#, r#"ې"#, r#"ې"#),
+        (r#"ﯥ"#, r#"ﯥ"#, r#"ﯥ"#, r#"ې"#, r#"ې"#),
+        (r#"ﯦ"#, r#"ﯦ"#, r#"ﯦ"#, r#"ې"#, r#"ې"#),
+        (r#"ﯧ"#, r#"ﯧ"#, r#"ﯧ"#, r#"ې"#, r#"ې"#),
+        (r#"ﯨ"#, r#"ﯨ"#, r#"ﯨ"#, r#"ى"#, r#"ى"#),
+        (r#"ﯩ"#, r#"ﯩ"#, r#"ﯩ"#, r#"ى"#, r#"ى"#),
+        (r#"ﯪ"#, r#"ﯪ"#, r#"ﯪ"#, r#"ئا"#, r#"ئا"#),
+        (r#"ﯫ"#, r#"ﯫ"#, r#"ﯫ"#, r#"ئا"#, r#"ئا"#),
+        (r#"ﯬ"#, r#"ﯬ"#, r#"ﯬ"#, r#"ئە"#, r#"ئە"#),
+        (r#"ﯭ"#, r#"ﯭ"#, r#"ﯭ"#, r#"ئە"#, r#"ئە"#),
+        (r#"ﯮ"#, r#"ﯮ"#, r#"ﯮ"#, r#"ئو"#, r#"ئو"#),
+        (r#"ﯯ"#, r#"ﯯ"#, r#"ﯯ"#, r#"ئو"#, r#"ئو"#),
+        (r#"ﯰ"#, r#"ﯰ"#, r#"ﯰ"#, r#"ئۇ"#, r#"ئۇ"#),
+        (r#"ﯱ"#, r#"ﯱ"#, r#"ﯱ"#, r#"ئۇ"#, r#"ئۇ"#),
+        (r#"ﯲ"#, r#"ﯲ"#, r#"ﯲ"#, r#"ئۆ"#, r#"ئۆ"#),
+        (r#"ﯳ"#, r#"ﯳ"#, r#"ﯳ"#, r#"ئۆ"#, r#"ئۆ"#),
+        (r#"ﯴ"#, r#"ﯴ"#, r#"ﯴ"#, r#"ئۈ"#, r#"ئۈ"#),
+        (r#"ﯵ"#, r#"ﯵ"#, r#"ﯵ"#, r#"ئۈ"#, r#"ئۈ"#),
+        (r#"ﯶ"#, r#"ﯶ"#, r#"ﯶ"#, r#"ئې"#, r#"ئې"#),
+        (r#"ﯷ"#, r#"ﯷ"#, r#"ﯷ"#, r#"ئې"#, r#"ئې"#),
+        (r#"ﯸ"#, r#"ﯸ"#, r#"ﯸ"#, r#"ئې"#, r#"ئې"#),
+        (r#"ﯹ"#, r#"ﯹ"#, r#"ﯹ"#, r#"ئى"#, r#"ئى"#),
+        (r#"ﯺ"#, r#"ﯺ"#, r#"ﯺ"#, r#"ئى"#, r#"ئى"#),
+        (r#"ﯻ"#, r#"ﯻ"#, r#"ﯻ"#, r#"ئى"#, r#"ئى"#),
+        (r#"ﯼ"#, r#"ﯼ"#, r#"ﯼ"#, r#"ی"#, r#"ی"#),
+        (r#"ﯽ"#, r#"ﯽ"#, r#"ﯽ"#, r#"ی"#, r#"ی"#),
+        (r#"ﯾ"#, r#"ﯾ"#, r#"ﯾ"#, r#"ی"#, r#"ی"#),
+        (r#"ﯿ"#, r#"ﯿ"#, r#"ﯿ"#, r#"ی"#, r#"ی"#),
+        (r#"ﰀ"#, r#"ﰀ"#, r#"ﰀ"#, r#"ئج"#, r#"ئج"#),
+        (r#"ﰁ"#, r#"ﰁ"#, r#"ﰁ"#, r#"ئح"#, r#"ئح"#),
+        (r#"ﰂ"#, r#"ﰂ"#, r#"ﰂ"#, r#"ئم"#, r#"ئم"#),
+        (r#"ﰃ"#, r#"ﰃ"#, r#"ﰃ"#, r#"ئى"#, r#"ئى"#),
+        (r#"ﰄ"#, r#"ﰄ"#, r#"ﰄ"#, r#"ئي"#, r#"ئي"#),
+        (r#"ﰅ"#, r#"ﰅ"#, r#"ﰅ"#, r#"بج"#, r#"بج"#),
+        (r#"ﰆ"#, r#"ﰆ"#, r#"ﰆ"#, r#"بح"#, r#"بح"#),
+        (r#"ﰇ"#, r#"ﰇ"#, r#"ﰇ"#, r#"بخ"#, r#"بخ"#),
+        (r#"ﰈ"#, r#"ﰈ"#, r#"ﰈ"#, r#"بم"#, r#"بم"#),
+        (r#"ﰉ"#, r#"ﰉ"#, r#"ﰉ"#, r#"بى"#, r#"بى"#),
+        (r#"ﰊ"#, r#"ﰊ"#, r#"ﰊ"#, r#"بي"#, r#"بي"#),
+        (r#"ﰋ"#, r#"ﰋ"#, r#"ﰋ"#, r#"تج"#, r#"تج"#),
+        (r#"ﰌ"#, r#"ﰌ"#, r#"ﰌ"#, r#"تح"#, r#"تح"#),
+        (r#"ﰍ"#, r#"ﰍ"#, r#"ﰍ"#, r#"تخ"#, r#"تخ"#),
+        (r#"ﰎ"#, r#"ﰎ"#, r#"ﰎ"#, r#"تم"#, r#"تم"#),
+        (r#"ﰏ"#, r#"ﰏ"#, r#"ﰏ"#, r#"تى"#, r#"تى"#),
+        (r#"ﰐ"#, r#"ﰐ"#, r#"ﰐ"#, r#"تي"#, r#"تي"#),
+        (r#"ﰑ"#, r#"ﰑ"#, r#"ﰑ"#, r#"ثج"#, r#"ثج"#),
+        (r#"ﰒ"#, r#"ﰒ"#, r#"ﰒ"#, r#"ثم"#, r#"ثم"#),
+        (r#"ﰓ"#, r#"ﰓ"#, r#"ﰓ"#, r#"ثى"#, r#"ثى"#),
+        (r#"ﰔ"#, r#"ﰔ"#, r#"ﰔ"#, r#"ثي"#, r#"ثي"#),
+        (r#"ﰕ"#, r#"ﰕ"#, r#"ﰕ"#, r#"جح"#, r#"جح"#),
+        (r#"ﰖ"#, r#"ﰖ"#, r#"ﰖ"#, r#"جم"#, r#"جم"#),
+        (r#"ﰗ"#, r#"ﰗ"#, r#"ﰗ"#, r#"حج"#, r#"حج"#),
+        (r#"ﰘ"#, r#"ﰘ"#, r#"ﰘ"#, r#"حم"#, r#"حم"#),
+        (r#"ﰙ"#, r#"ﰙ"#, r#"ﰙ"#, r#"خج"#, r#"خج"#),
+        (r#"ﰚ"#, r#"ﰚ"#, r#"ﰚ"#, r#"خح"#, r#"خح"#),
+        (r#"ﰛ"#, r#"ﰛ"#, r#"ﰛ"#, r#"خم"#, r#"خم"#),
+        (r#"ﰜ"#, r#"ﰜ"#, r#"ﰜ"#, r#"سج"#, r#"سج"#),
+        (r#"ﰝ"#, r#"ﰝ"#, r#"ﰝ"#, r#"سح"#, r#"سح"#),
+        (r#"ﰞ"#, r#"ﰞ"#, r#"ﰞ"#, r#"سخ"#, r#"سخ"#),
+        (r#"ﰟ"#, r#"ﰟ"#, r#"ﰟ"#, r#"سم"#, r#"سم"#),
+        (r#"ﰠ"#, r#"ﰠ"#, r#"ﰠ"#, r#"صح"#, r#"صح"#),
+        (r#"ﰡ"#, r#"ﰡ"#, r#"ﰡ"#, r#"صم"#, r#"صم"#),
+        (r#"ﰢ"#, r#"ﰢ"#, r#"ﰢ"#, r#"ضج"#, r#"ضج"#),
+        (r#"ﰣ"#, r#"ﰣ"#, r#"ﰣ"#, r#"ضح"#, r#"ضح"#),
+        (r#"ﰤ"#, r#"ﰤ"#, r#"ﰤ"#, r#"ضخ"#, r#"ضخ"#),
+        (r#"ﰥ"#, r#"ﰥ"#, r#"ﰥ"#, r#"ضم"#, r#"ضم"#),
+        (r#"ﰦ"#, r#"ﰦ"#, r#"ﰦ"#, r#"طح"#, r#"طح"#),
+        (r#"ﰧ"#, r#"ﰧ"#, r#"ﰧ"#, r#"طم"#, r#"طم"#),
+        (r#"ﰨ"#, r#"ﰨ"#, r#"ﰨ"#, r#"ظم"#, r#"ظم"#),
+        (r#"ﰩ"#, r#"ﰩ"#, r#"ﰩ"#, r#"عج"#, r#"عج"#),
+        (r#"ﰪ"#, r#"ﰪ"#, r#"ﰪ"#, r#"عم"#, r#"عم"#),
+        (r#"ﰫ"#, r#"ﰫ"#, r#"ﰫ"#, r#"غج"#, r#"غج"#),
+        (r#"ﰬ"#, r#"ﰬ"#, r#"ﰬ"#, r#"غم"#, r#"غم"#),
+        (r#"ﰭ"#, r#"ﰭ"#, r#"ﰭ"#, r#"فج"#, r#"فج"#),
+        (r#"ﰮ"#, r#"ﰮ"#, r#"ﰮ"#, r#"فح"#, r#"فح"#),
+        (r#"ﰯ"#, r#"ﰯ"#, r#"ﰯ"#, r#"فخ"#, r#"فخ"#),
+        (r#"ﰰ"#, r#"ﰰ"#, r#"ﰰ"#, r#"فم"#, r#"فم"#),
+        (r#"ﰱ"#, r#"ﰱ"#, r#"ﰱ"#, r#"فى"#, r#"فى"#),
+        (r#"ﰲ"#, r#"ﰲ"#, r#"ﰲ"#, r#"في"#, r#"في"#),
+        (r#"ﰳ"#, r#"ﰳ"#, r#"ﰳ"#, r#"قح"#, r#"قح"#),
+        (r#"ﰴ"#, r#"ﰴ"#, r#"ﰴ"#, r#"قم"#, r#"قم"#),
+        (r#"ﰵ"#, r#"ﰵ"#, r#"ﰵ"#, r#"قى"#, r#"قى"#),
+        (r#"ﰶ"#, r#"ﰶ"#, r#"ﰶ"#, r#"قي"#, r#"قي"#),
+        (r#"ﰷ"#, r#"ﰷ"#, r#"ﰷ"#, r#"كا"#, r#"كا"#),
+        (r#"ﰸ"#, r#"ﰸ"#, r#"ﰸ"#, r#"كج"#, r#"كج"#),
+        (r#"ﰹ"#, r#"ﰹ"#, r#"ﰹ"#, r#"كح"#, r#"كح"#),
+        (r#"ﰺ"#, r#"ﰺ"#, r#"ﰺ"#, r#"كخ"#, r#"كخ"#),
+        (r#"ﰻ"#, r#"ﰻ"#, r#"ﰻ"#, r#"كل"#, r#"كل"#),
+        (r#"ﰼ"#, r#"ﰼ"#, r#"ﰼ"#, r#"كم"#, r#"كم"#),
+        (r#"ﰽ"#, r#"ﰽ"#, r#"ﰽ"#, r#"كى"#, r#"كى"#),
+        (r#"ﰾ"#, r#"ﰾ"#, r#"ﰾ"#, r#"كي"#, r#"كي"#),
+        (r#"ﰿ"#, r#"ﰿ"#, r#"ﰿ"#, r#"لج"#, r#"لج"#),
+        (r#"ﱀ"#, r#"ﱀ"#, r#"ﱀ"#, r#"لح"#, r#"لح"#),
+        (r#"ﱁ"#, r#"ﱁ"#, r#"ﱁ"#, r#"لخ"#, r#"لخ"#),
+        (r#"ﱂ"#, r#"ﱂ"#, r#"ﱂ"#, r#"لم"#, r#"لم"#),
+        (r#"ﱃ"#, r#"ﱃ"#, r#"ﱃ"#, r#"لى"#, r#"لى"#),
+        (r#"ﱄ"#, r#"ﱄ"#, r#"ﱄ"#, r#"لي"#, r#"لي"#),
+        (r#"ﱅ"#, r#"ﱅ"#, r#"ﱅ"#, r#"مج"#, r#"مج"#),
+        (r#"ﱆ"#, r#"ﱆ"#, r#"ﱆ"#, r#"مح"#, r#"مح"#),
+        (r#"ﱇ"#, r#"ﱇ"#, r#"ﱇ"#, r#"مخ"#, r#"مخ"#),
+        (r#"ﱈ"#, r#"ﱈ"#, r#"ﱈ"#, r#"مم"#, r#"مم"#),
+        (r#"ﱉ"#, r#"ﱉ"#, r#"ﱉ"#, r#"مى"#, r#"مى"#),
+        (r#"ﱊ"#, r#"ﱊ"#, r#"ﱊ"#, r#"مي"#, r#"مي"#),
+        (r#"ﱋ"#, r#"ﱋ"#, r#"ﱋ"#, r#"نج"#, r#"نج"#),
+        (r#"ﱌ"#, r#"ﱌ"#, r#"ﱌ"#, r#"نح"#, r#"نح"#),
+        (r#"ﱍ"#, r#"ﱍ"#, r#"ﱍ"#, r#"نخ"#, r#"نخ"#),
+        (r#"ﱎ"#, r#"ﱎ"#, r#"ﱎ"#, r#"نم"#, r#"نم"#),
+        (r#"ﱏ"#, r#"ﱏ"#, r#"ﱏ"#, r#"نى"#, r#"نى"#),
+        (r#"ﱐ"#, r#"ﱐ"#, r#"ﱐ"#, r#"ني"#, r#"ني"#),
+        (r#"ﱑ"#, r#"ﱑ"#, r#"ﱑ"#, r#"هج"#, r#"هج"#),
+        (r#"ﱒ"#, r#"ﱒ"#, r#"ﱒ"#, r#"هم"#, r#"هم"#),
+        (r#"ﱓ"#, r#"ﱓ"#, r#"ﱓ"#, r#"هى"#, r#"هى"#),
+        (r#"ﱔ"#, r#"ﱔ"#, r#"ﱔ"#, r#"هي"#, r#"هي"#),
+        (r#"ﱕ"#, r#"ﱕ"#, r#"ﱕ"#, r#"يج"#, r#"يج"#),
+        (r#"ﱖ"#, r#"ﱖ"#, r#"ﱖ"#, r#"يح"#, r#"يح"#),
+        (r#"ﱗ"#, r#"ﱗ"#, r#"ﱗ"#, r#"يخ"#, r#"يخ"#),
+        (r#"ﱘ"#, r#"ﱘ"#, r#"ﱘ"#, r#"يم"#, r#"يم"#),
+        (r#"ﱙ"#, r#"ﱙ"#, r#"ﱙ"#, r#"يى"#, r#"يى"#),
+        (r#"ﱚ"#, r#"ﱚ"#, r#"ﱚ"#, r#"يي"#, r#"يي"#),
+        (r#"ﱛ"#, r#"ﱛ"#, r#"ﱛ"#, r#"ذٰ"#, r#"ذٰ"#),
+        (r#"ﱜ"#, r#"ﱜ"#, r#"ﱜ"#, r#"رٰ"#, r#"رٰ"#),
+        (r#"ﱝ"#, r#"ﱝ"#, r#"ﱝ"#, r#"ىٰ"#, r#"ىٰ"#),
+        (r#"ﱞ"#, r#"ﱞ"#, r#"ﱞ"#, r#" ٌّ"#, r#" ٌّ"#),
+        (r#"ﱟ"#, r#"ﱟ"#, r#"ﱟ"#, r#" ٍّ"#, r#" ٍّ"#),
+        (r#"ﱠ"#, r#"ﱠ"#, r#"ﱠ"#, r#" َّ"#, r#" َّ"#),
+        (r#"ﱡ"#, r#"ﱡ"#, r#"ﱡ"#, r#" ُّ"#, r#" ُّ"#),
+        (r#"ﱢ"#, r#"ﱢ"#, r#"ﱢ"#, r#" ِّ"#, r#" ِّ"#),
+        (r#"ﱣ"#, r#"ﱣ"#, r#"ﱣ"#, r#" ّٰ"#, r#" ّٰ"#),
+        (r#"ﱤ"#, r#"ﱤ"#, r#"ﱤ"#, r#"ئر"#, r#"ئر"#),
+        (r#"ﱥ"#, r#"ﱥ"#, r#"ﱥ"#, r#"ئز"#, r#"ئز"#),
+        (r#"ﱦ"#, r#"ﱦ"#, r#"ﱦ"#, r#"ئم"#, r#"ئم"#),
+        (r#"ﱧ"#, r#"ﱧ"#, r#"ﱧ"#, r#"ئن"#, r#"ئن"#),
+        (r#"ﱨ"#, r#"ﱨ"#, r#"ﱨ"#, r#"ئى"#, r#"ئى"#),
+        (r#"ﱩ"#, r#"ﱩ"#, r#"ﱩ"#, r#"ئي"#, r#"ئي"#),
+        (r#"ﱪ"#, r#"ﱪ"#, r#"ﱪ"#, r#"بر"#, r#"بر"#),
+        (r#"ﱫ"#, r#"ﱫ"#, r#"ﱫ"#, r#"بز"#, r#"بز"#),
+        (r#"ﱬ"#, r#"ﱬ"#, r#"ﱬ"#, r#"بم"#, r#"بم"#),
+        (r#"ﱭ"#, r#"ﱭ"#, r#"ﱭ"#, r#"بن"#, r#"بن"#),
+        (r#"ﱮ"#, r#"ﱮ"#, r#"ﱮ"#, r#"بى"#, r#"بى"#),
+        (r#"ﱯ"#, r#"ﱯ"#, r#"ﱯ"#, r#"بي"#, r#"بي"#),
+        (r#"ﱰ"#, r#"ﱰ"#, r#"ﱰ"#, r#"تر"#, r#"تر"#),
+        (r#"ﱱ"#, r#"ﱱ"#, r#"ﱱ"#, r#"تز"#, r#"تز"#),
+        (r#"ﱲ"#, r#"ﱲ"#, r#"ﱲ"#, r#"تم"#, r#"تم"#),
+        (r#"ﱳ"#, r#"ﱳ"#, r#"ﱳ"#, r#"تن"#, r#"تن"#),
+        (r#"ﱴ"#, r#"ﱴ"#, r#"ﱴ"#, r#"تى"#, r#"تى"#),
+        (r#"ﱵ"#, r#"ﱵ"#, r#"ﱵ"#, r#"تي"#, r#"تي"#),
+        (r#"ﱶ"#, r#"ﱶ"#, r#"ﱶ"#, r#"ثر"#, r#"ثر"#),
+        (r#"ﱷ"#, r#"ﱷ"#, r#"ﱷ"#, r#"ثز"#, r#"ثز"#),
+        (r#"ﱸ"#, r#"ﱸ"#, r#"ﱸ"#, r#"ثم"#, r#"ثم"#),
+        (r#"ﱹ"#, r#"ﱹ"#, r#"ﱹ"#, r#"ثن"#, r#"ثن"#),
+        (r#"ﱺ"#, r#"ﱺ"#, r#"ﱺ"#, r#"ثى"#, r#"ثى"#),
+        (r#"ﱻ"#, r#"ﱻ"#, r#"ﱻ"#, r#"ثي"#, r#"ثي"#),
+        (r#"ﱼ"#, r#"ﱼ"#, r#"ﱼ"#, r#"فى"#, r#"فى"#),
+        (r#"ﱽ"#, r#"ﱽ"#, r#"ﱽ"#, r#"في"#, r#"في"#),
+        (r#"ﱾ"#, r#"ﱾ"#, r#"ﱾ"#, r#"قى"#, r#"قى"#),
+        (r#"ﱿ"#, r#"ﱿ"#, r#"ﱿ"#, r#"قي"#, r#"قي"#),
+        (r#"ﲀ"#, r#"ﲀ"#, r#"ﲀ"#, r#"كا"#, r#"كا"#),
+        (r#"ﲁ"#, r#"ﲁ"#, r#"ﲁ"#, r#"كل"#, r#"كل"#),
+        (r#"ﲂ"#, r#"ﲂ"#, r#"ﲂ"#, r#"كم"#, r#"كم"#),
+        (r#"ﲃ"#, r#"ﲃ"#, r#"ﲃ"#, r#"كى"#, r#"كى"#),
+        (r#"ﲄ"#, r#"ﲄ"#, r#"ﲄ"#, r#"كي"#, r#"كي"#),
+        (r#"ﲅ"#, r#"ﲅ"#, r#"ﲅ"#, r#"لم"#, r#"لم"#),
+        (r#"ﲆ"#, r#"ﲆ"#, r#"ﲆ"#, r#"لى"#, r#"لى"#),
+        (r#"ﲇ"#, r#"ﲇ"#, r#"ﲇ"#, r#"لي"#, r#"لي"#),
+        (r#"ﲈ"#, r#"ﲈ"#, r#"ﲈ"#, r#"ما"#, r#"ما"#),
+        (r#"ﲉ"#, r#"ﲉ"#, r#"ﲉ"#, r#"مم"#, r#"مم"#),
+        (r#"ﲊ"#, r#"ﲊ"#, r#"ﲊ"#, r#"نر"#, r#"نر"#),
+        (r#"ﲋ"#, r#"ﲋ"#, r#"ﲋ"#, r#"نز"#, r#"نز"#),
+        (r#"ﲌ"#, r#"ﲌ"#, r#"ﲌ"#, r#"نم"#, r#"نم"#),
+        (r#"ﲍ"#, r#"ﲍ"#, r#"ﲍ"#, r#"نن"#, r#"نن"#),
+        (r#"ﲎ"#, r#"ﲎ"#, r#"ﲎ"#, r#"نى"#, r#"نى"#),
+        (r#"ﲏ"#, r#"ﲏ"#, r#"ﲏ"#, r#"ني"#, r#"ني"#),
+        (r#"ﲐ"#, r#"ﲐ"#, r#"ﲐ"#, r#"ىٰ"#, r#"ىٰ"#),
+        (r#"ﲑ"#, r#"ﲑ"#, r#"ﲑ"#, r#"ير"#, r#"ير"#),
+        (r#"ﲒ"#, r#"ﲒ"#, r#"ﲒ"#, r#"يز"#, r#"يز"#),
+        (r#"ﲓ"#, r#"ﲓ"#, r#"ﲓ"#, r#"يم"#, r#"يم"#),
+        (r#"ﲔ"#, r#"ﲔ"#, r#"ﲔ"#, r#"ين"#, r#"ين"#),
+        (r#"ﲕ"#, r#"ﲕ"#, r#"ﲕ"#, r#"يى"#, r#"يى"#),
+        (r#"ﲖ"#, r#"ﲖ"#, r#"ﲖ"#, r#"يي"#, r#"يي"#),
+        (r#"ﲗ"#, r#"ﲗ"#, r#"ﲗ"#, r#"ئج"#, r#"ئج"#),
+        (r#"ﲘ"#, r#"ﲘ"#, r#"ﲘ"#, r#"ئح"#, r#"ئح"#),
+        (r#"ﲙ"#, r#"ﲙ"#, r#"ﲙ"#, r#"ئخ"#, r#"ئخ"#),
+        (r#"ﲚ"#, r#"ﲚ"#, r#"ﲚ"#, r#"ئم"#, r#"ئم"#),
+        (r#"ﲛ"#, r#"ﲛ"#, r#"ﲛ"#, r#"ئه"#, r#"ئه"#),
+        (r#"ﲜ"#, r#"ﲜ"#, r#"ﲜ"#, r#"بج"#, r#"بج"#),
+        (r#"ﲝ"#, r#"ﲝ"#, r#"ﲝ"#, r#"بح"#, r#"بح"#),
+        (r#"ﲞ"#, r#"ﲞ"#, r#"ﲞ"#, r#"بخ"#, r#"بخ"#),
+        (r#"ﲟ"#, r#"ﲟ"#, r#"ﲟ"#, r#"بم"#, r#"بم"#),
+        (r#"ﲠ"#, r#"ﲠ"#, r#"ﲠ"#, r#"به"#, r#"به"#),
+        (r#"ﲡ"#, r#"ﲡ"#, r#"ﲡ"#, r#"تج"#, r#"تج"#),
+        (r#"ﲢ"#, r#"ﲢ"#, r#"ﲢ"#, r#"تح"#, r#"تح"#),
+        (r#"ﲣ"#, r#"ﲣ"#, r#"ﲣ"#, r#"تخ"#, r#"تخ"#),
+        (r#"ﲤ"#, r#"ﲤ"#, r#"ﲤ"#, r#"تم"#, r#"تم"#),
+        (r#"ﲥ"#, r#"ﲥ"#, r#"ﲥ"#, r#"ته"#, r#"ته"#),
+        (r#"ﲦ"#, r#"ﲦ"#, r#"ﲦ"#, r#"ثم"#, r#"ثم"#),
+        (r#"ﲧ"#, r#"ﲧ"#, r#"ﲧ"#, r#"جح"#, r#"جح"#),
+        (r#"ﲨ"#, r#"ﲨ"#, r#"ﲨ"#, r#"جم"#, r#"جم"#),
+        (r#"ﲩ"#, r#"ﲩ"#, r#"ﲩ"#, r#"حج"#, r#"حج"#),
+        (r#"ﲪ"#, r#"ﲪ"#, r#"ﲪ"#, r#"حم"#, r#"حم"#),
+        (r#"ﲫ"#, r#"ﲫ"#, r#"ﲫ"#, r#"خج"#, r#"خج"#),
+        (r#"ﲬ"#, r#"ﲬ"#, r#"ﲬ"#, r#"خم"#, r#"خم"#),
+        (r#"ﲭ"#, r#"ﲭ"#, r#"ﲭ"#, r#"سج"#, r#"سج"#),
+        (r#"ﲮ"#, r#"ﲮ"#, r#"ﲮ"#, r#"سح"#, r#"سح"#),
+        (r#"ﲯ"#, r#"ﲯ"#, r#"ﲯ"#, r#"سخ"#, r#"سخ"#),
+        (r#"ﲰ"#, r#"ﲰ"#, r#"ﲰ"#, r#"سم"#, r#"سم"#),
+        (r#"ﲱ"#, r#"ﲱ"#, r#"ﲱ"#, r#"صح"#, r#"صح"#),
+        (r#"ﲲ"#, r#"ﲲ"#, r#"ﲲ"#, r#"صخ"#, r#"صخ"#),
+        (r#"ﲳ"#, r#"ﲳ"#, r#"ﲳ"#, r#"صم"#, r#"صم"#),
+        (r#"ﲴ"#, r#"ﲴ"#, r#"ﲴ"#, r#"ضج"#, r#"ضج"#),
+        (r#"ﲵ"#, r#"ﲵ"#, r#"ﲵ"#, r#"ضح"#, r#"ضح"#),
+        (r#"ﲶ"#, r#"ﲶ"#, r#"ﲶ"#, r#"ضخ"#, r#"ضخ"#),
+        (r#"ﲷ"#, r#"ﲷ"#, r#"ﲷ"#, r#"ضم"#, r#"ضم"#),
+        (r#"ﲸ"#, r#"ﲸ"#, r#"ﲸ"#, r#"طح"#, r#"طح"#),
+        (r#"ﲹ"#, r#"ﲹ"#, r#"ﲹ"#, r#"ظم"#, r#"ظم"#),
+        (r#"ﲺ"#, r#"ﲺ"#, r#"ﲺ"#, r#"عج"#, r#"عج"#),
+        (r#"ﲻ"#, r#"ﲻ"#, r#"ﲻ"#, r#"عم"#, r#"عم"#),
+        (r#"ﲼ"#, r#"ﲼ"#, r#"ﲼ"#, r#"غج"#, r#"غج"#),
+        (r#"ﲽ"#, r#"ﲽ"#, r#"ﲽ"#, r#"غم"#, r#"غم"#),
+        (r#"ﲾ"#, r#"ﲾ"#, r#"ﲾ"#, r#"فج"#, r#"فج"#),
+        (r#"ﲿ"#, r#"ﲿ"#, r#"ﲿ"#, r#"فح"#, r#"فح"#),
+        (r#"ﳀ"#, r#"ﳀ"#, r#"ﳀ"#, r#"فخ"#, r#"فخ"#),
+        (r#"ﳁ"#, r#"ﳁ"#, r#"ﳁ"#, r#"فم"#, r#"فم"#),
+        (r#"ﳂ"#, r#"ﳂ"#, r#"ﳂ"#, r#"قح"#, r#"قح"#),
+        (r#"ﳃ"#, r#"ﳃ"#, r#"ﳃ"#, r#"قم"#, r#"قم"#),
+        (r#"ﳄ"#, r#"ﳄ"#, r#"ﳄ"#, r#"كج"#, r#"كج"#),
+        (r#"ﳅ"#, r#"ﳅ"#, r#"ﳅ"#, r#"كح"#, r#"كح"#),
+        (r#"ﳆ"#, r#"ﳆ"#, r#"ﳆ"#, r#"كخ"#, r#"كخ"#),
+        (r#"ﳇ"#, r#"ﳇ"#, r#"ﳇ"#, r#"كل"#, r#"كل"#),
+        (r#"ﳈ"#, r#"ﳈ"#, r#"ﳈ"#, r#"كم"#, r#"كم"#),
+        (r#"ﳉ"#, r#"ﳉ"#, r#"ﳉ"#, r#"لج"#, r#"لج"#),
+        (r#"ﳊ"#, r#"ﳊ"#, r#"ﳊ"#, r#"لح"#, r#"لح"#),
+        (r#"ﳋ"#, r#"ﳋ"#, r#"ﳋ"#, r#"لخ"#, r#"لخ"#),
+        (r#"ﳌ"#, r#"ﳌ"#, r#"ﳌ"#, r#"لم"#, r#"لم"#),
+        (r#"ﳍ"#, r#"ﳍ"#, r#"ﳍ"#, r#"له"#, r#"له"#),
+        (r#"ﳎ"#, r#"ﳎ"#, r#"ﳎ"#, r#"مج"#, r#"مج"#),
+        (r#"ﳏ"#, r#"ﳏ"#, r#"ﳏ"#, r#"مح"#, r#"مح"#),
+        (r#"ﳐ"#, r#"ﳐ"#, r#"ﳐ"#, r#"مخ"#, r#"مخ"#),
+        (r#"ﳑ"#, r#"ﳑ"#, r#"ﳑ"#, r#"مم"#, r#"مم"#),
+        (r#"ﳒ"#, r#"ﳒ"#, r#"ﳒ"#, r#"نج"#, r#"نج"#),
+        (r#"ﳓ"#, r#"ﳓ"#, r#"ﳓ"#, r#"نح"#, r#"نح"#),
+        (r#"ﳔ"#, r#"ﳔ"#, r#"ﳔ"#, r#"نخ"#, r#"نخ"#),
+        (r#"ﳕ"#, r#"ﳕ"#, r#"ﳕ"#, r#"نم"#, r#"نم"#),
+        (r#"ﳖ"#, r#"ﳖ"#, r#"ﳖ"#, r#"نه"#, r#"نه"#),
+        (r#"ﳗ"#, r#"ﳗ"#, r#"ﳗ"#, r#"هج"#, r#"هج"#),
+        (r#"ﳘ"#, r#"ﳘ"#, r#"ﳘ"#, r#"هم"#, r#"هم"#),
+        (r#"ﳙ"#, r#"ﳙ"#, r#"ﳙ"#, r#"هٰ"#, r#"هٰ"#),
+        (r#"ﳚ"#, r#"ﳚ"#, r#"ﳚ"#, r#"يج"#, r#"يج"#),
+        (r#"ﳛ"#, r#"ﳛ"#, r#"ﳛ"#, r#"يح"#, r#"يح"#),
+        (r#"ﳜ"#, r#"ﳜ"#, r#"ﳜ"#, r#"يخ"#, r#"يخ"#),
+        (r#"ﳝ"#, r#"ﳝ"#, r#"ﳝ"#, r#"يم"#, r#"يم"#),
+        (r#"ﳞ"#, r#"ﳞ"#, r#"ﳞ"#, r#"يه"#, r#"يه"#),
+        (r#"ﳟ"#, r#"ﳟ"#, r#"ﳟ"#, r#"ئم"#, r#"ئم"#),
+        (r#"ﳠ"#, r#"ﳠ"#, r#"ﳠ"#, r#"ئه"#, r#"ئه"#),
+        (r#"ﳡ"#, r#"ﳡ"#, r#"ﳡ"#, r#"بم"#, r#"بم"#),
+        (r#"ﳢ"#, r#"ﳢ"#, r#"ﳢ"#, r#"به"#, r#"به"#),
+        (r#"ﳣ"#, r#"ﳣ"#, r#"ﳣ"#, r#"تم"#, r#"تم"#),
+        (r#"ﳤ"#, r#"ﳤ"#, r#"ﳤ"#, r#"ته"#, r#"ته"#),
+        (r#"ﳥ"#, r#"ﳥ"#, r#"ﳥ"#, r#"ثم"#, r#"ثم"#),
+        (r#"ﳦ"#, r#"ﳦ"#, r#"ﳦ"#, r#"ثه"#, r#"ثه"#),
+        (r#"ﳧ"#, r#"ﳧ"#, r#"ﳧ"#, r#"سم"#, r#"سم"#),
+        (r#"ﳨ"#, r#"ﳨ"#, r#"ﳨ"#, r#"سه"#, r#"سه"#),
+        (r#"ﳩ"#, r#"ﳩ"#, r#"ﳩ"#, r#"شم"#, r#"شم"#),
+        (r#"ﳪ"#, r#"ﳪ"#, r#"ﳪ"#, r#"شه"#, r#"شه"#),
+        (r#"ﳫ"#, r#"ﳫ"#, r#"ﳫ"#, r#"كل"#, r#"كل"#),
+        (r#"ﳬ"#, r#"ﳬ"#, r#"ﳬ"#, r#"كم"#, r#"كم"#),
+        (r#"ﳭ"#, r#"ﳭ"#, r#"ﳭ"#, r#"لم"#, r#"لم"#),
+        (r#"ﳮ"#, r#"ﳮ"#, r#"ﳮ"#, r#"نم"#, r#"نم"#),
+        (r#"ﳯ"#, r#"ﳯ"#, r#"ﳯ"#, r#"نه"#, r#"نه"#),
+        (r#"ﳰ"#, r#"ﳰ"#, r#"ﳰ"#, r#"يم"#, r#"يم"#),
+        (r#"ﳱ"#, r#"ﳱ"#, r#"ﳱ"#, r#"يه"#, r#"يه"#),
+        (r#"ﳲ"#, r#"ﳲ"#, r#"ﳲ"#, r#"ـَّ"#, r#"ـَّ"#),
+        (r#"ﳳ"#, r#"ﳳ"#, r#"ﳳ"#, r#"ـُّ"#, r#"ـُّ"#),
+        (r#"ﳴ"#, r#"ﳴ"#, r#"ﳴ"#, r#"ـِّ"#, r#"ـِّ"#),
+        (r#"ﳵ"#, r#"ﳵ"#, r#"ﳵ"#, r#"طى"#, r#"طى"#),
+        (r#"ﳶ"#, r#"ﳶ"#, r#"ﳶ"#, r#"طي"#, r#"طي"#),
+        (r#"ﳷ"#, r#"ﳷ"#, r#"ﳷ"#, r#"عى"#, r#"عى"#),
+        (r#"ﳸ"#, r#"ﳸ"#, r#"ﳸ"#, r#"عي"#, r#"عي"#),
+        (r#"ﳹ"#, r#"ﳹ"#, r#"ﳹ"#, r#"غى"#, r#"غى"#),
+        (r#"ﳺ"#, r#"ﳺ"#, r#"ﳺ"#, r#"غي"#, r#"غي"#),
+        (r#"ﳻ"#, r#"ﳻ"#, r#"ﳻ"#, r#"سى"#, r#"سى"#),
+        (r#"ﳼ"#, r#"ﳼ"#, r#"ﳼ"#, r#"سي"#, r#"سي"#),
+        (r#"ﳽ"#, r#"ﳽ"#, r#"ﳽ"#, r#"شى"#, r#"شى"#),
+        (r#"ﳾ"#, r#"ﳾ"#, r#"ﳾ"#, r#"شي"#, r#"شي"#),
+        (r#"ﳿ"#, r#"ﳿ"#, r#"ﳿ"#, r#"حى"#, r#"حى"#),
+        (r#"ﴀ"#, r#"ﴀ"#, r#"ﴀ"#, r#"حي"#, r#"حي"#),
+        (r#"ﴁ"#, r#"ﴁ"#, r#"ﴁ"#, r#"جى"#, r#"جى"#),
+        (r#"ﴂ"#, r#"ﴂ"#, r#"ﴂ"#, r#"جي"#, r#"جي"#),
+        (r#"ﴃ"#, r#"ﴃ"#, r#"ﴃ"#, r#"خى"#, r#"خى"#),
+        (r#"ﴄ"#, r#"ﴄ"#, r#"ﴄ"#, r#"خي"#, r#"خي"#),
+        (r#"ﴅ"#, r#"ﴅ"#, r#"ﴅ"#, r#"صى"#, r#"صى"#),
+        (r#"ﴆ"#, r#"ﴆ"#, r#"ﴆ"#, r#"صي"#, r#"صي"#),
+        (r#"ﴇ"#, r#"ﴇ"#, r#"ﴇ"#, r#"ضى"#, r#"ضى"#),
+        (r#"ﴈ"#, r#"ﴈ"#, r#"ﴈ"#, r#"ضي"#, r#"ضي"#),
+        (r#"ﴉ"#, r#"ﴉ"#, r#"ﴉ"#, r#"شج"#, r#"شج"#),
+        (r#"ﴊ"#, r#"ﴊ"#, r#"ﴊ"#, r#"شح"#, r#"شح"#),
+        (r#"ﴋ"#, r#"ﴋ"#, r#"ﴋ"#, r#"شخ"#, r#"شخ"#),
+        (r#"ﴌ"#, r#"ﴌ"#, r#"ﴌ"#, r#"شم"#, r#"شم"#),
+        (r#"ﴍ"#, r#"ﴍ"#, r#"ﴍ"#, r#"شر"#, r#"شر"#),
+        (r#"ﴎ"#, r#"ﴎ"#, r#"ﴎ"#, r#"سر"#, r#"سر"#),
+        (r#"ﴏ"#, r#"ﴏ"#, r#"ﴏ"#, r#"صر"#, r#"صر"#),
+        (r#"ﴐ"#, r#"ﴐ"#, r#"ﴐ"#, r#"ضر"#, r#"ضر"#),
+        (r#"ﴑ"#, r#"ﴑ"#, r#"ﴑ"#, r#"طى"#, r#"طى"#),
+        (r#"ﴒ"#, r#"ﴒ"#, r#"ﴒ"#, r#"طي"#, r#"طي"#),
+        (r#"ﴓ"#, r#"ﴓ"#, r#"ﴓ"#, r#"عى"#, r#"عى"#),
+        (r#"ﴔ"#, r#"ﴔ"#, r#"ﴔ"#, r#"عي"#, r#"عي"#),
+        (r#"ﴕ"#, r#"ﴕ"#, r#"ﴕ"#, r#"غى"#, r#"غى"#),
+        (r#"ﴖ"#, r#"ﴖ"#, r#"ﴖ"#, r#"غي"#, r#"غي"#),
+        (r#"ﴗ"#, r#"ﴗ"#, r#"ﴗ"#, r#"سى"#, r#"سى"#),
+        (r#"ﴘ"#, r#"ﴘ"#, r#"ﴘ"#, r#"سي"#, r#"سي"#),
+        (r#"ﴙ"#, r#"ﴙ"#, r#"ﴙ"#, r#"شى"#, r#"شى"#),
+        (r#"ﴚ"#, r#"ﴚ"#, r#"ﴚ"#, r#"شي"#, r#"شي"#),
+        (r#"ﴛ"#, r#"ﴛ"#, r#"ﴛ"#, r#"حى"#, r#"حى"#),
+        (r#"ﴜ"#, r#"ﴜ"#, r#"ﴜ"#, r#"حي"#, r#"حي"#),
+        (r#"ﴝ"#, r#"ﴝ"#, r#"ﴝ"#, r#"جى"#, r#"جى"#),
+        (r#"ﴞ"#, r#"ﴞ"#, r#"ﴞ"#, r#"جي"#, r#"جي"#),
+        (r#"ﴟ"#, r#"ﴟ"#, r#"ﴟ"#, r#"خى"#, r#"خى"#),
+        (r#"ﴠ"#, r#"ﴠ"#, r#"ﴠ"#, r#"خي"#, r#"خي"#),
+        (r#"ﴡ"#, r#"ﴡ"#, r#"ﴡ"#, r#"صى"#, r#"صى"#),
+        (r#"ﴢ"#, r#"ﴢ"#, r#"ﴢ"#, r#"صي"#, r#"صي"#),
+        (r#"ﴣ"#, r#"ﴣ"#, r#"ﴣ"#, r#"ضى"#, r#"ضى"#),
+        (r#"ﴤ"#, r#"ﴤ"#, r#"ﴤ"#, r#"ضي"#, r#"ضي"#),
+        (r#"ﴥ"#, r#"ﴥ"#, r#"ﴥ"#, r#"شج"#, r#"شج"#),
+        (r#"ﴦ"#, r#"ﴦ"#, r#"ﴦ"#, r#"شح"#, r#"شح"#),
+        (r#"ﴧ"#, r#"ﴧ"#, r#"ﴧ"#, r#"شخ"#, r#"شخ"#),
+        (r#"ﴨ"#, r#"ﴨ"#, r#"ﴨ"#, r#"شم"#, r#"شم"#),
+        (r#"ﴩ"#, r#"ﴩ"#, r#"ﴩ"#, r#"شر"#, r#"شر"#),
+        (r#"ﴪ"#, r#"ﴪ"#, r#"ﴪ"#, r#"سر"#, r#"سر"#),
+        (r#"ﴫ"#, r#"ﴫ"#, r#"ﴫ"#, r#"صر"#, r#"صر"#),
+        (r#"ﴬ"#, r#"ﴬ"#, r#"ﴬ"#, r#"ضر"#, r#"ضر"#),
+        (r#"ﴭ"#, r#"ﴭ"#, r#"ﴭ"#, r#"شج"#, r#"شج"#),
+        (r#"ﴮ"#, r#"ﴮ"#, r#"ﴮ"#, r#"شح"#, r#"شح"#),
+        (r#"ﴯ"#, r#"ﴯ"#, r#"ﴯ"#, r#"شخ"#, r#"شخ"#),
+        (r#"ﴰ"#, r#"ﴰ"#, r#"ﴰ"#, r#"شم"#, r#"شم"#),
+        (r#"ﴱ"#, r#"ﴱ"#, r#"ﴱ"#, r#"سه"#, r#"سه"#),
+        (r#"ﴲ"#, r#"ﴲ"#, r#"ﴲ"#, r#"شه"#, r#"شه"#),
+        (r#"ﴳ"#, r#"ﴳ"#, r#"ﴳ"#, r#"طم"#, r#"طم"#),
+        (r#"ﴴ"#, r#"ﴴ"#, r#"ﴴ"#, r#"سج"#, r#"سج"#),
+        (r#"ﴵ"#, r#"ﴵ"#, r#"ﴵ"#, r#"سح"#, r#"سح"#),
+        (r#"ﴶ"#, r#"ﴶ"#, r#"ﴶ"#, r#"سخ"#, r#"سخ"#),
+        (r#"ﴷ"#, r#"ﴷ"#, r#"ﴷ"#, r#"شج"#, r#"شج"#),
+        (r#"ﴸ"#, r#"ﴸ"#, r#"ﴸ"#, r#"شح"#, r#"شح"#),
+        (r#"ﴹ"#, r#"ﴹ"#, r#"ﴹ"#, r#"شخ"#, r#"شخ"#),
+        (r#"ﴺ"#, r#"ﴺ"#, r#"ﴺ"#, r#"طم"#, r#"طم"#),
+        (r#"ﴻ"#, r#"ﴻ"#, r#"ﴻ"#, r#"ظم"#, r#"ظم"#),
+        (r#"ﴼ"#, r#"ﴼ"#, r#"ﴼ"#, r#"اً"#, r#"اً"#),
+        (r#"ﴽ"#, r#"ﴽ"#, r#"ﴽ"#, r#"اً"#, r#"اً"#),
+        (r#"ﵐ"#, r#"ﵐ"#, r#"ﵐ"#, r#"تجم"#, r#"تجم"#),
+        (r#"ﵑ"#, r#"ﵑ"#, r#"ﵑ"#, r#"تحج"#, r#"تحج"#),
+        (r#"ﵒ"#, r#"ﵒ"#, r#"ﵒ"#, r#"تحج"#, r#"تحج"#),
+        (r#"ﵓ"#, r#"ﵓ"#, r#"ﵓ"#, r#"تحم"#, r#"تحم"#),
+        (r#"ﵔ"#, r#"ﵔ"#, r#"ﵔ"#, r#"تخم"#, r#"تخم"#),
+        (r#"ﵕ"#, r#"ﵕ"#, r#"ﵕ"#, r#"تمج"#, r#"تمج"#),
+        (r#"ﵖ"#, r#"ﵖ"#, r#"ﵖ"#, r#"تمح"#, r#"تمح"#),
+        (r#"ﵗ"#, r#"ﵗ"#, r#"ﵗ"#, r#"تمخ"#, r#"تمخ"#),
+        (r#"ﵘ"#, r#"ﵘ"#, r#"ﵘ"#, r#"جمح"#, r#"جمح"#),
+        (r#"ﵙ"#, r#"ﵙ"#, r#"ﵙ"#, r#"جمح"#, r#"جمح"#),
+        (r#"ﵚ"#, r#"ﵚ"#, r#"ﵚ"#, r#"حمي"#, r#"حمي"#),
+        (r#"ﵛ"#, r#"ﵛ"#, r#"ﵛ"#, r#"حمى"#, r#"حمى"#),
+        (r#"ﵜ"#, r#"ﵜ"#, r#"ﵜ"#, r#"سحج"#, r#"سحج"#),
+        (r#"ﵝ"#, r#"ﵝ"#, r#"ﵝ"#, r#"سجح"#, r#"سجح"#),
+        (r#"ﵞ"#, r#"ﵞ"#, r#"ﵞ"#, r#"سجى"#, r#"سجى"#),
+        (r#"ﵟ"#, r#"ﵟ"#, r#"ﵟ"#, r#"سمح"#, r#"سمح"#),
+        (r#"ﵠ"#, r#"ﵠ"#, r#"ﵠ"#, r#"سمح"#, r#"سمح"#),
+        (r#"ﵡ"#, r#"ﵡ"#, r#"ﵡ"#, r#"سمج"#, r#"سمج"#),
+        (r#"ﵢ"#, r#"ﵢ"#, r#"ﵢ"#, r#"سمم"#, r#"سمم"#),
+        (r#"ﵣ"#, r#"ﵣ"#, r#"ﵣ"#, r#"سمم"#, r#"سمم"#),
+        (r#"ﵤ"#, r#"ﵤ"#, r#"ﵤ"#, r#"صحح"#, r#"صحح"#),
+        (r#"ﵥ"#, r#"ﵥ"#, r#"ﵥ"#, r#"صحح"#, r#"صحح"#),
+        (r#"ﵦ"#, r#"ﵦ"#, r#"ﵦ"#, r#"صمم"#, r#"صمم"#),
+        (r#"ﵧ"#, r#"ﵧ"#, r#"ﵧ"#, r#"شحم"#, r#"شحم"#),
+        (r#"ﵨ"#, r#"ﵨ"#, r#"ﵨ"#, r#"شحم"#, r#"شحم"#),
+        (r#"ﵩ"#, r#"ﵩ"#, r#"ﵩ"#, r#"شجي"#, r#"شجي"#),
+        (r#"ﵪ"#, r#"ﵪ"#, r#"ﵪ"#, r#"شمخ"#, r#"شمخ"#),
+        (r#"ﵫ"#, r#"ﵫ"#, r#"ﵫ"#, r#"شمخ"#, r#"شمخ"#),
+        (r#"ﵬ"#, r#"ﵬ"#, r#"ﵬ"#, r#"شمم"#, r#"شمم"#),
+        (r#"ﵭ"#, r#"ﵭ"#, r#"ﵭ"#, r#"شمم"#, r#"شمم"#),
+        (r#"ﵮ"#, r#"ﵮ"#, r#"ﵮ"#, r#"ضحى"#, r#"ضحى"#),
+        (r#"ﵯ"#, r#"ﵯ"#, r#"ﵯ"#, r#"ضخم"#, r#"ضخم"#),
+        (r#"ﵰ"#, r#"ﵰ"#, r#"ﵰ"#, r#"ضخم"#, r#"ضخم"#),
+        (r#"ﵱ"#, r#"ﵱ"#, r#"ﵱ"#, r#"طمح"#, r#"طمح"#),
+        (r#"ﵲ"#, r#"ﵲ"#, r#"ﵲ"#, r#"طمح"#, r#"طمح"#),
+        (r#"ﵳ"#, r#"ﵳ"#, r#"ﵳ"#, r#"طمم"#, r#"طمم"#),
+        (r#"ﵴ"#, r#"ﵴ"#, r#"ﵴ"#, r#"طمي"#, r#"طمي"#),
+        (r#"ﵵ"#, r#"ﵵ"#, r#"ﵵ"#, r#"عجم"#, r#"عجم"#),
+        (r#"ﵶ"#, r#"ﵶ"#, r#"ﵶ"#, r#"عمم"#, r#"عمم"#),
+        (r#"ﵷ"#, r#"ﵷ"#, r#"ﵷ"#, r#"عمم"#, r#"عمم"#),
+        (r#"ﵸ"#, r#"ﵸ"#, r#"ﵸ"#, r#"عمى"#, r#"عمى"#),
+        (r#"ﵹ"#, r#"ﵹ"#, r#"ﵹ"#, r#"غمم"#, r#"غمم"#),
+        (r#"ﵺ"#, r#"ﵺ"#, r#"ﵺ"#, r#"غمي"#, r#"غمي"#),
+        (r#"ﵻ"#, r#"ﵻ"#, r#"ﵻ"#, r#"غمى"#, r#"غمى"#),
+        (r#"ﵼ"#, r#"ﵼ"#, r#"ﵼ"#, r#"فخم"#, r#"فخم"#),
+        (r#"ﵽ"#, r#"ﵽ"#, r#"ﵽ"#, r#"فخم"#, r#"فخم"#),
+        (r#"ﵾ"#, r#"ﵾ"#, r#"ﵾ"#, r#"قمح"#, r#"قمح"#),
+        (r#"ﵿ"#, r#"ﵿ"#, r#"ﵿ"#, r#"قمم"#, r#"قمم"#),
+        (r#"ﶀ"#, r#"ﶀ"#, r#"ﶀ"#, r#"لحم"#, r#"لحم"#),
+        (r#"ﶁ"#, r#"ﶁ"#, r#"ﶁ"#, r#"لحي"#, r#"لحي"#),
+        (r#"ﶂ"#, r#"ﶂ"#, r#"ﶂ"#, r#"لحى"#, r#"لحى"#),
+        (r#"ﶃ"#, r#"ﶃ"#, r#"ﶃ"#, r#"لجج"#, r#"لجج"#),
+        (r#"ﶄ"#, r#"ﶄ"#, r#"ﶄ"#, r#"لجج"#, r#"لجج"#),
+        (r#"ﶅ"#, r#"ﶅ"#, r#"ﶅ"#, r#"لخم"#, r#"لخم"#),
+        (r#"ﶆ"#, r#"ﶆ"#, r#"ﶆ"#, r#"لخم"#, r#"لخم"#),
+        (r#"ﶇ"#, r#"ﶇ"#, r#"ﶇ"#, r#"لمح"#, r#"لمح"#),
+        (r#"ﶈ"#, r#"ﶈ"#, r#"ﶈ"#, r#"لمح"#, r#"لمح"#),
+        (r#"ﶉ"#, r#"ﶉ"#, r#"ﶉ"#, r#"محج"#, r#"محج"#),
+        (r#"ﶊ"#, r#"ﶊ"#, r#"ﶊ"#, r#"محم"#, r#"محم"#),
+        (r#"ﶋ"#, r#"ﶋ"#, r#"ﶋ"#, r#"محي"#, r#"محي"#),
+        (r#"ﶌ"#, r#"ﶌ"#, r#"ﶌ"#, r#"مجح"#, r#"مجح"#),
+        (r#"ﶍ"#, r#"ﶍ"#, r#"ﶍ"#, r#"مجم"#, r#"مجم"#),
+        (r#"ﶎ"#, r#"ﶎ"#, r#"ﶎ"#, r#"مخج"#, r#"مخج"#),
+        (r#"ﶏ"#, r#"ﶏ"#, r#"ﶏ"#, r#"مخم"#, r#"مخم"#),
+        (r#"ﶒ"#, r#"ﶒ"#, r#"ﶒ"#, r#"مجخ"#, r#"مجخ"#),
+        (r#"ﶓ"#, r#"ﶓ"#, r#"ﶓ"#, r#"همج"#, r#"همج"#),
+        (r#"ﶔ"#, r#"ﶔ"#, r#"ﶔ"#, r#"همم"#, r#"همم"#),
+        (r#"ﶕ"#, r#"ﶕ"#, r#"ﶕ"#, r#"نحم"#, r#"نحم"#),
+        (r#"ﶖ"#, r#"ﶖ"#, r#"ﶖ"#, r#"نحى"#, r#"نحى"#),
+        (r#"ﶗ"#, r#"ﶗ"#, r#"ﶗ"#, r#"نجم"#, r#"نجم"#),
+        (r#"ﶘ"#, r#"ﶘ"#, r#"ﶘ"#, r#"نجم"#, r#"نجم"#),
+        (r#"ﶙ"#, r#"ﶙ"#, r#"ﶙ"#, r#"نجى"#, r#"نجى"#),
+        (r#"ﶚ"#, r#"ﶚ"#, r#"ﶚ"#, r#"نمي"#, r#"نمي"#),
+        (r#"ﶛ"#, r#"ﶛ"#, r#"ﶛ"#, r#"نمى"#, r#"نمى"#),
+        (r#"ﶜ"#, r#"ﶜ"#, r#"ﶜ"#, r#"يمم"#, r#"يمم"#),
+        (r#"ﶝ"#, r#"ﶝ"#, r#"ﶝ"#, r#"يمم"#, r#"يمم"#),
+        (r#"ﶞ"#, r#"ﶞ"#, r#"ﶞ"#, r#"بخي"#, r#"بخي"#),
+        (r#"ﶟ"#, r#"ﶟ"#, r#"ﶟ"#, r#"تجي"#, r#"تجي"#),
+        (r#"ﶠ"#, r#"ﶠ"#, r#"ﶠ"#, r#"تجى"#, r#"تجى"#),
+        (r#"ﶡ"#, r#"ﶡ"#, r#"ﶡ"#, r#"تخي"#, r#"تخي"#),
+        (r#"ﶢ"#, r#"ﶢ"#, r#"ﶢ"#, r#"تخى"#, r#"تخى"#),
+        (r#"ﶣ"#, r#"ﶣ"#, r#"ﶣ"#, r#"تمي"#, r#"تمي"#),
+        (r#"ﶤ"#, r#"ﶤ"#, r#"ﶤ"#, r#"تمى"#, r#"تمى"#),
+        (r#"ﶥ"#, r#"ﶥ"#, r#"ﶥ"#, r#"جمي"#, r#"جمي"#),
+        (r#"ﶦ"#, r#"ﶦ"#, r#"ﶦ"#, r#"جحى"#, r#"جحى"#),
+        (r#"ﶧ"#, r#"ﶧ"#, r#"ﶧ"#, r#"جمى"#, r#"جمى"#),
+        (r#"ﶨ"#, r#"ﶨ"#, r#"ﶨ"#, r#"سخى"#, r#"سخى"#),
+        (r#"ﶩ"#, r#"ﶩ"#, r#"ﶩ"#, r#"صحي"#, r#"صحي"#),
+        (r#"ﶪ"#, r#"ﶪ"#, r#"ﶪ"#, r#"شحي"#, r#"شحي"#),
+        (r#"ﶫ"#, r#"ﶫ"#, r#"ﶫ"#, r#"ضحي"#, r#"ضحي"#),
+        (r#"ﶬ"#, r#"ﶬ"#, r#"ﶬ"#, r#"لجي"#, r#"لجي"#),
+        (r#"ﶭ"#, r#"ﶭ"#, r#"ﶭ"#, r#"لمي"#, r#"لمي"#),
+        (r#"ﶮ"#, r#"ﶮ"#, r#"ﶮ"#, r#"يحي"#, r#"يحي"#),
+        (r#"ﶯ"#, r#"ﶯ"#, r#"ﶯ"#, r#"يجي"#, r#"يجي"#),
+        (r#"ﶰ"#, r#"ﶰ"#, r#"ﶰ"#, r#"يمي"#, r#"يمي"#),
+        (r#"ﶱ"#, r#"ﶱ"#, r#"ﶱ"#, r#"ممي"#, r#"ممي"#),
+        (r#"ﶲ"#, r#"ﶲ"#, r#"ﶲ"#, r#"قمي"#, r#"قمي"#),
+        (r#"ﶳ"#, r#"ﶳ"#, r#"ﶳ"#, r#"نحي"#, r#"نحي"#),
+        (r#"ﶴ"#, r#"ﶴ"#, r#"ﶴ"#, r#"قمح"#, r#"قمح"#),
+        (r#"ﶵ"#, r#"ﶵ"#, r#"ﶵ"#, r#"لحم"#, r#"لحم"#),
+        (r#"ﶶ"#, r#"ﶶ"#, r#"ﶶ"#, r#"عمي"#, r#"عمي"#),
+        (r#"ﶷ"#, r#"ﶷ"#, r#"ﶷ"#, r#"كمي"#, r#"كمي"#),
+        (r#"ﶸ"#, r#"ﶸ"#, r#"ﶸ"#, r#"نجح"#, r#"نجح"#),
+        (r#"ﶹ"#, r#"ﶹ"#, r#"ﶹ"#, r#"مخي"#, r#"مخي"#),
+        (r#"ﶺ"#, r#"ﶺ"#, r#"ﶺ"#, r#"لجم"#, r#"لجم"#),
+        (r#"ﶻ"#, r#"ﶻ"#, r#"ﶻ"#, r#"كمم"#, r#"كمم"#),
+        (r#"ﶼ"#, r#"ﶼ"#, r#"ﶼ"#, r#"لجم"#, r#"لجم"#),
+        (r#"ﶽ"#, r#"ﶽ"#, r#"ﶽ"#, r#"نجح"#, r#"نجح"#),
+        (r#"ﶾ"#, r#"ﶾ"#, r#"ﶾ"#, r#"جحي"#, r#"جحي"#),
+        (r#"ﶿ"#, r#"ﶿ"#, r#"ﶿ"#, r#"حجي"#, r#"حجي"#),
+        (r#"ﷀ"#, r#"ﷀ"#, r#"ﷀ"#, r#"مجي"#, r#"مجي"#),
+        (r#"ﷁ"#, r#"ﷁ"#, r#"ﷁ"#, r#"فمي"#, r#"فمي"#),
+        (r#"ﷂ"#, r#"ﷂ"#, r#"ﷂ"#, r#"بحي"#, r#"بحي"#),
+        (r#"ﷃ"#, r#"ﷃ"#, r#"ﷃ"#, r#"كمم"#, r#"كمم"#),
+        (r#"ﷄ"#, r#"ﷄ"#, r#"ﷄ"#, r#"عجم"#, r#"عجم"#),
+        (r#"ﷅ"#, r#"ﷅ"#, r#"ﷅ"#, r#"صمم"#, r#"صمم"#),
+        (r#"ﷆ"#, r#"ﷆ"#, r#"ﷆ"#, r#"سخي"#, r#"سخي"#),
+        (r#"ﷇ"#, r#"ﷇ"#, r#"ﷇ"#, r#"نجي"#, r#"نجي"#),
+        (r#"ﷰ"#, r#"ﷰ"#, r#"ﷰ"#, r#"صلے"#, r#"صلے"#),
+        (r#"ﷱ"#, r#"ﷱ"#, r#"ﷱ"#, r#"قلے"#, r#"قلے"#),
+        (r#"ﷲ"#, r#"ﷲ"#, r#"ﷲ"#, r#"الله"#, r#"الله"#),
+        (r#"ﷳ"#, r#"ﷳ"#, r#"ﷳ"#, r#"اكبر"#, r#"اكبر"#),
+        (r#"ﷴ"#, r#"ﷴ"#, r#"ﷴ"#, r#"محمد"#, r#"محمد"#),
+        (r#"ﷵ"#, r#"ﷵ"#, r#"ﷵ"#, r#"صلعم"#, r#"صلعم"#),
+        (r#"ﷶ"#, r#"ﷶ"#, r#"ﷶ"#, r#"رسول"#, r#"رسول"#),
+        (r#"ﷷ"#, r#"ﷷ"#, r#"ﷷ"#, r#"عليه"#, r#"عليه"#),
+        (r#"ﷸ"#, r#"ﷸ"#, r#"ﷸ"#, r#"وسلم"#, r#"وسلم"#),
+        (r#"ﷹ"#, r#"ﷹ"#, r#"ﷹ"#, r#"صلى"#, r#"صلى"#),
+        (r#"ﷺ"#, r#"ﷺ"#, r#"ﷺ"#, r#"صلى الله عليه وسلم"#, r#"صلى الله عليه وسلم"#),
+        (r#"ﷻ"#, r#"ﷻ"#, r#"ﷻ"#, r#"جل جلاله"#, r#"جل جلاله"#),
+        (r#"﷼"#, r#"﷼"#, r#"﷼"#, r#"ریال"#, r#"ریال"#),
+        (r#"︐"#, r#"︐"#, r#"︐"#, r#","#, r#","#),
+        (r#"︑"#, r#"︑"#, r#"︑"#, r#"、"#, r#"、"#),
+        (r#"︒"#, r#"︒"#, r#"︒"#, r#"。"#, r#"。"#),
+        (r#"︓"#, r#"︓"#, r#"︓"#, r#":"#, r#":"#),
+        (r#"︔"#, r#"︔"#, r#"︔"#, r#";"#, r#";"#),
+        (r#"︕"#, r#"︕"#, r#"︕"#, r#"!"#, r#"!"#),
+        (r#"︖"#, r#"︖"#, r#"︖"#, r#"?"#, r#"?"#),
+        (r#"︗"#, r#"︗"#, r#"︗"#, r#"〖"#, r#"〖"#),
+        (r#"︘"#, r#"︘"#, r#"︘"#, r#"〗"#, r#"〗"#),
+        (r#"︙"#, r#"︙"#, r#"︙"#, r#"..."#, r#"..."#),
+        (r#"︰"#, r#"︰"#, r#"︰"#, r#".."#, r#".."#),
+        (r#"︱"#, r#"︱"#, r#"︱"#, r#"—"#, r#"—"#),
+        (r#"︲"#, r#"︲"#, r#"︲"#, r#"–"#, r#"–"#),
+        (r#"︳"#, r#"︳"#, r#"︳"#, r#"_"#, r#"_"#),
+        (r#"︴"#, r#"︴"#, r#"︴"#, r#"_"#, r#"_"#),
+        (r#"︵"#, r#"︵"#, r#"︵"#, r#"("#, r#"("#),
+        (r#"︶"#, r#"︶"#, r#"︶"#, r#")"#, r#")"#),
+        (r#"︷"#, r#"︷"#, r#"︷"#, r#"{"#, r#"{"#),
+        (r#"︸"#, r#"︸"#, r#"︸"#, r#"}"#, r#"}"#),
+        (r#"︹"#, r#"︹"#, r#"︹"#, r#"〔"#, r#"〔"#),
+        (r#"︺"#, r#"︺"#, r#"︺"#, r#"〕"#, r#"〕"#),
+        (r#"︻"#, r#"︻"#, r#"︻"#, r#"【"#, r#"【"#),
+        (r#"︼"#, r#"︼"#, r#"︼"#, r#"】"#, r#"】"#),
+        (r#"︽"#, r#"︽"#, r#"︽"#, r#"《"#, r#"《"#),
+        (r#"︾"#, r#"︾"#, r#"︾"#, r#"》"#, r#"》"#),
+        (r#"︿"#, r#"︿"#, r#"︿"#, r#"〈"#, r#"〈"#),
+        (r#"﹀"#, r#"﹀"#, r#"﹀"#, r#"〉"#, r#"〉"#),
+        (r#"﹁"#, r#"﹁"#, r#"﹁"#, r#"「"#, r#"「"#),
+        (r#"﹂"#, r#"﹂"#, r#"﹂"#, r#"」"#, r#"」"#),
+        (r#"﹃"#, r#"﹃"#, r#"﹃"#, r#"『"#, r#"『"#),
+        (r#"﹄"#, r#"﹄"#, r#"﹄"#, r#"』"#, r#"』"#),
+        (r#"﹇"#, r#"﹇"#, r#"﹇"#, r#"["#, r#"["#),
+        (r#"﹈"#, r#"﹈"#, r#"﹈"#, r#"]"#, r#"]"#),
+        (r#"﹉"#, r#"﹉"#, r#"﹉"#, r#" ̅"#, r#" ̅"#),
+        (r#"﹊"#, r#"﹊"#, r#"﹊"#, r#" ̅"#, r#" ̅"#),
+        (r#"﹋"#, r#"﹋"#, r#"﹋"#, r#" ̅"#, r#" ̅"#),
+        (r#"﹌"#, r#"﹌"#, r#"﹌"#, r#" ̅"#, r#" ̅"#),
+        (r#"﹍"#, r#"﹍"#, r#"﹍"#, r#"_"#, r#"_"#),
+        (r#"﹎"#, r#"﹎"#, r#"﹎"#, r#"_"#, r#"_"#),
+        (r#"﹏"#, r#"﹏"#, r#"﹏"#, r#"_"#, r#"_"#),
+        (r#"﹐"#, r#"﹐"#, r#"﹐"#, r#","#, r#","#),
+        (r#"﹑"#, r#"﹑"#, r#"﹑"#, r#"、"#, r#"、"#),
+        (r#"﹒"#, r#"﹒"#, r#"﹒"#, r#"."#, r#"."#),
+        (r#"﹔"#, r#"﹔"#, r#"﹔"#, r#";"#, r#";"#),
+        (r#"﹕"#, r#"﹕"#, r#"﹕"#, r#":"#, r#":"#),
+        (r#"﹖"#, r#"﹖"#, r#"﹖"#, r#"?"#, r#"?"#),
+        (r#"﹗"#, r#"﹗"#, r#"﹗"#, r#"!"#, r#"!"#),
+        (r#"﹘"#, r#"﹘"#, r#"﹘"#, r#"—"#, r#"—"#),
+        (r#"﹙"#, r#"﹙"#, r#"﹙"#, r#"("#, r#"("#),
+        (r#"﹚"#, r#"﹚"#, r#"﹚"#, r#")"#, r#")"#),
+        (r#"﹛"#, r#"﹛"#, r#"﹛"#, r#"{"#, r#"{"#),
+        (r#"﹜"#, r#"﹜"#, r#"﹜"#, r#"}"#, r#"}"#),
+        (r#"﹝"#, r#"﹝"#, r#"﹝"#, r#"〔"#, r#"〔"#),
+        (r#"﹞"#, r#"﹞"#, r#"﹞"#, r#"〕"#, r#"〕"#),
+        (r#"﹟"#, r#"﹟"#, r#"﹟"#, r#"#"#, r#"#"#),
+        (r#"﹠"#, r#"﹠"#, r#"﹠"#, r#"&"#, r#"&"#),
+        (r#"﹡"#, r#"﹡"#, r#"﹡"#, r#"*"#, r#"*"#),
+        (r#"﹢"#, r#"﹢"#, r#"﹢"#, r#"+"#, r#"+"#),
+        (r#"﹣"#, r#"﹣"#, r#"﹣"#, r#"-"#, r#"-"#),
+        (r#"﹤"#, r#"﹤"#, r#"﹤"#, r#"<"#, r#"<"#),
+        (r#"﹥"#, r#"﹥"#, r#"﹥"#, r#">"#, r#">"#),
+        (r#"﹦"#, r#"﹦"#, r#"﹦"#, r#"="#, r#"="#),
+        (r#"﹨"#, r#"﹨"#, r#"﹨"#, r#"\"#, r#"\"#),
+        (r#"﹩"#, r#"﹩"#, r#"﹩"#, r#"$"#, r#"$"#),
+        (r#"﹪"#, r#"﹪"#, r#"﹪"#, r#"%"#, r#"%"#),
+        (r#"﹫"#, r#"﹫"#, r#"﹫"#, r#"@"#, r#"@"#),
+        (r#"ﹰ"#, r#"ﹰ"#, r#"ﹰ"#, r#" ً"#, r#" ً"#),
+        (r#"ﹱ"#, r#"ﹱ"#, r#"ﹱ"#, r#"ـً"#, r#"ـً"#),
+        (r#"ﹲ"#, r#"ﹲ"#, r#"ﹲ"#, r#" ٌ"#, r#" ٌ"#),
+        (r#"ﹴ"#, r#"ﹴ"#, r#"ﹴ"#, r#" ٍ"#, r#" ٍ"#),
+        (r#"ﹶ"#, r#"ﹶ"#, r#"ﹶ"#, r#" َ"#, r#" َ"#),
+        (r#"ﹷ"#, r#"ﹷ"#, r#"ﹷ"#, r#"ـَ"#, r#"ـَ"#),
+        (r#"ﹸ"#, r#"ﹸ"#, r#"ﹸ"#, r#" ُ"#, r#" ُ"#),
+        (r#"ﹹ"#, r#"ﹹ"#, r#"ﹹ"#, r#"ـُ"#, r#"ـُ"#),
+        (r#"ﹺ"#, r#"ﹺ"#, r#"ﹺ"#, r#" ِ"#, r#" ِ"#),
+        (r#"ﹻ"#, r#"ﹻ"#, r#"ﹻ"#, r#"ـِ"#, r#"ـِ"#),
+        (r#"ﹼ"#, r#"ﹼ"#, r#"ﹼ"#, r#" ّ"#, r#" ّ"#),
+        (r#"ﹽ"#, r#"ﹽ"#, r#"ﹽ"#, r#"ـّ"#, r#"ـّ"#),
+        (r#"ﹾ"#, r#"ﹾ"#, r#"ﹾ"#, r#" ْ"#, r#" ْ"#),
+        (r#"ﹿ"#, r#"ﹿ"#, r#"ﹿ"#, r#"ـْ"#, r#"ـْ"#),
+        (r#"ﺀ"#, r#"ﺀ"#, r#"ﺀ"#, r#"ء"#, r#"ء"#),
+        (r#"ﺁ"#, r#"ﺁ"#, r#"ﺁ"#, r#"آ"#, r#"آ"#),
+        (r#"ﺂ"#, r#"ﺂ"#, r#"ﺂ"#, r#"آ"#, r#"آ"#),
+        (r#"ﺃ"#, r#"ﺃ"#, r#"ﺃ"#, r#"أ"#, r#"أ"#),
+        (r#"ﺄ"#, r#"ﺄ"#, r#"ﺄ"#, r#"أ"#, r#"أ"#),
+        (r#"ﺅ"#, r#"ﺅ"#, r#"ﺅ"#, r#"ؤ"#, r#"ؤ"#),
+        (r#"ﺆ"#, r#"ﺆ"#, r#"ﺆ"#, r#"ؤ"#, r#"ؤ"#),
+        (r#"ﺇ"#, r#"ﺇ"#, r#"ﺇ"#, r#"إ"#, r#"إ"#),
+        (r#"ﺈ"#, r#"ﺈ"#, r#"ﺈ"#, r#"إ"#, r#"إ"#),
+        (r#"ﺉ"#, r#"ﺉ"#, r#"ﺉ"#, r#"ئ"#, r#"ئ"#),
+        (r#"ﺊ"#, r#"ﺊ"#, r#"ﺊ"#, r#"ئ"#, r#"ئ"#),
+        (r#"ﺋ"#, r#"ﺋ"#, r#"ﺋ"#, r#"ئ"#, r#"ئ"#),
+        (r#"ﺌ"#, r#"ﺌ"#, r#"ﺌ"#, r#"ئ"#, r#"ئ"#),
+        (r#"ﺍ"#, r#"ﺍ"#, r#"ﺍ"#, r#"ا"#, r#"ا"#),
+        (r#"ﺎ"#, r#"ﺎ"#, r#"ﺎ"#, r#"ا"#, r#"ا"#),
+        (r#"ﺏ"#, r#"ﺏ"#, r#"ﺏ"#, r#"ب"#, r#"ب"#),
+        (r#"ﺐ"#, r#"ﺐ"#, r#"ﺐ"#, r#"ب"#, r#"ب"#),
+        (r#"ﺑ"#, r#"ﺑ"#, r#"ﺑ"#, r#"ب"#, r#"ب"#),
+        (r#"ﺒ"#, r#"ﺒ"#, r#"ﺒ"#, r#"ب"#, r#"ب"#),
+        (r#"ﺓ"#, r#"ﺓ"#, r#"ﺓ"#, r#"ة"#, r#"ة"#),
+        (r#"ﺔ"#, r#"ﺔ"#, r#"ﺔ"#, r#"ة"#, r#"ة"#),
+        (r#"ﺕ"#, r#"ﺕ"#, r#"ﺕ"#, r#"ت"#, r#"ت"#),
+        (r#"ﺖ"#, r#"ﺖ"#, r#"ﺖ"#, r#"ت"#, r#"ت"#),
+        (r#"ﺗ"#, r#"ﺗ"#, r#"ﺗ"#, r#"ت"#, r#"ت"#),
+        (r#"ﺘ"#, r#"ﺘ"#, r#"ﺘ"#, r#"ت"#, r#"ت"#),
+        (r#"ﺙ"#, r#"ﺙ"#, r#"ﺙ"#, r#"ث"#, r#"ث"#),
+        (r#"ﺚ"#, r#"ﺚ"#, r#"ﺚ"#, r#"ث"#, r#"ث"#),
+        (r#"ﺛ"#, r#"ﺛ"#, r#"ﺛ"#, r#"ث"#, r#"ث"#),
+        (r#"ﺜ"#, r#"ﺜ"#, r#"ﺜ"#, r#"ث"#, r#"ث"#),
+        (r#"ﺝ"#, r#"ﺝ"#, r#"ﺝ"#, r#"ج"#, r#"ج"#),
+        (r#"ﺞ"#, r#"ﺞ"#, r#"ﺞ"#, r#"ج"#, r#"ج"#),
+        (r#"ﺟ"#, r#"ﺟ"#, r#"ﺟ"#, r#"ج"#, r#"ج"#),
+        (r#"ﺠ"#, r#"ﺠ"#, r#"ﺠ"#, r#"ج"#, r#"ج"#),
+        (r#"ﺡ"#, r#"ﺡ"#, r#"ﺡ"#, r#"ح"#, r#"ح"#),
+        (r#"ﺢ"#, r#"ﺢ"#, r#"ﺢ"#, r#"ح"#, r#"ح"#),
+        (r#"ﺣ"#, r#"ﺣ"#, r#"ﺣ"#, r#"ح"#, r#"ح"#),
+        (r#"ﺤ"#, r#"ﺤ"#, r#"ﺤ"#, r#"ح"#, r#"ح"#),
+        (r#"ﺥ"#, r#"ﺥ"#, r#"ﺥ"#, r#"خ"#, r#"خ"#),
+        (r#"ﺦ"#, r#"ﺦ"#, r#"ﺦ"#, r#"خ"#, r#"خ"#),
+        (r#"ﺧ"#, r#"ﺧ"#, r#"ﺧ"#, r#"خ"#, r#"خ"#),
+        (r#"ﺨ"#, r#"ﺨ"#, r#"ﺨ"#, r#"خ"#, r#"خ"#),
+        (r#"ﺩ"#, r#"ﺩ"#, r#"ﺩ"#, r#"د"#, r#"د"#),
+        (r#"ﺪ"#, r#"ﺪ"#, r#"ﺪ"#, r#"د"#, r#"د"#),
+        (r#"ﺫ"#, r#"ﺫ"#, r#"ﺫ"#, r#"ذ"#, r#"ذ"#),
+        (r#"ﺬ"#, r#"ﺬ"#, r#"ﺬ"#, r#"ذ"#, r#"ذ"#),
+        (r#"ﺭ"#, r#"ﺭ"#, r#"ﺭ"#, r#"ر"#, r#"ر"#),
+        (r#"ﺮ"#, r#"ﺮ"#, r#"ﺮ"#, r#"ر"#, r#"ر"#),
+        (r#"ﺯ"#, r#"ﺯ"#, r#"ﺯ"#, r#"ز"#, r#"ز"#),
+        (r#"ﺰ"#, r#"ﺰ"#, r#"ﺰ"#, r#"ز"#, r#"ز"#),
+        (r#"ﺱ"#, r#"ﺱ"#, r#"ﺱ"#, r#"س"#, r#"س"#),
+        (r#"ﺲ"#, r#"ﺲ"#, r#"ﺲ"#, r#"س"#, r#"س"#),
+        (r#"ﺳ"#, r#"ﺳ"#, r#"ﺳ"#, r#"س"#, r#"س"#),
+        (r#"ﺴ"#, r#"ﺴ"#, r#"ﺴ"#, r#"س"#, r#"س"#),
+        (r#"ﺵ"#, r#"ﺵ"#, r#"ﺵ"#, r#"ش"#, r#"ش"#),
+        (r#"ﺶ"#, r#"ﺶ"#, r#"ﺶ"#, r#"ش"#, r#"ش"#),
+        (r#"ﺷ"#, r#"ﺷ"#, r#"ﺷ"#, r#"ش"#, r#"ش"#),
+        (r#"ﺸ"#, r#"ﺸ"#, r#"ﺸ"#, r#"ش"#, r#"ش"#),
+        (r#"ﺹ"#, r#"ﺹ"#, r#"ﺹ"#, r#"ص"#, r#"ص"#),
+        (r#"ﺺ"#, r#"ﺺ"#, r#"ﺺ"#, r#"ص"#, r#"ص"#),
+        (r#"ﺻ"#, r#"ﺻ"#, r#"ﺻ"#, r#"ص"#, r#"ص"#),
+        (r#"ﺼ"#, r#"ﺼ"#, r#"ﺼ"#, r#"ص"#, r#"ص"#),
+        (r#"ﺽ"#, r#"ﺽ"#, r#"ﺽ"#, r#"ض"#, r#"ض"#),
+        (r#"ﺾ"#, r#"ﺾ"#, r#"ﺾ"#, r#"ض"#, r#"ض"#),
+        (r#"ﺿ"#, r#"ﺿ"#, r#"ﺿ"#, r#"ض"#, r#"ض"#),
+        (r#"ﻀ"#, r#"ﻀ"#, r#"ﻀ"#, r#"ض"#, r#"ض"#),
+        (r#"ﻁ"#, r#"ﻁ"#, r#"ﻁ"#, r#"ط"#, r#"ط"#),
+        (r#"ﻂ"#, r#"ﻂ"#, r#"ﻂ"#, r#"ط"#, r#"ط"#),
+        (r#"ﻃ"#, r#"ﻃ"#, r#"ﻃ"#, r#"ط"#, r#"ط"#),
+        (r#"ﻄ"#, r#"ﻄ"#, r#"ﻄ"#, r#"ط"#, r#"ط"#),
+        (r#"ﻅ"#, r#"ﻅ"#, r#"ﻅ"#, r#"ظ"#, r#"ظ"#),
+        (r#"ﻆ"#, r#"ﻆ"#, r#"ﻆ"#, r#"ظ"#, r#"ظ"#),
+        (r#"ﻇ"#, r#"ﻇ"#, r#"ﻇ"#, r#"ظ"#, r#"ظ"#),
+        (r#"ﻈ"#, r#"ﻈ"#, r#"ﻈ"#, r#"ظ"#, r#"ظ"#),
+        (r#"ﻉ"#, r#"ﻉ"#, r#"ﻉ"#, r#"ع"#, r#"ع"#),
+        (r#"ﻊ"#, r#"ﻊ"#, r#"ﻊ"#, r#"ع"#, r#"ع"#),
+        (r#"ﻋ"#, r#"ﻋ"#, r#"ﻋ"#, r#"ع"#, r#"ع"#),
+        (r#"ﻌ"#, r#"ﻌ"#, r#"ﻌ"#, r#"ع"#, r#"ع"#),
+        (r#"ﻍ"#, r#"ﻍ"#, r#"ﻍ"#, r#"غ"#, r#"غ"#),
+        (r#"ﻎ"#, r#"ﻎ"#, r#"ﻎ"#, r#"غ"#, r#"غ"#),
+        (r#"ﻏ"#, r#"ﻏ"#, r#"ﻏ"#, r#"غ"#, r#"غ"#),
+        (r#"ﻐ"#, r#"ﻐ"#, r#"ﻐ"#, r#"غ"#, r#"غ"#),
+        (r#"ﻑ"#, r#"ﻑ"#, r#"ﻑ"#, r#"ف"#, r#"ف"#),
+        (r#"ﻒ"#, r#"ﻒ"#, r#"ﻒ"#, r#"ف"#, r#"ف"#),
+        (r#"ﻓ"#, r#"ﻓ"#, r#"ﻓ"#, r#"ف"#, r#"ف"#),
+        (r#"ﻔ"#, r#"ﻔ"#, r#"ﻔ"#, r#"ف"#, r#"ف"#),
+        (r#"ﻕ"#, r#"ﻕ"#, r#"ﻕ"#, r#"ق"#, r#"ق"#),
+        (r#"ﻖ"#, r#"ﻖ"#, r#"ﻖ"#, r#"ق"#, r#"ق"#),
+        (r#"ﻗ"#, r#"ﻗ"#, r#"ﻗ"#, r#"ق"#, r#"ق"#),
+        (r#"ﻘ"#, r#"ﻘ"#, r#"ﻘ"#, r#"ق"#, r#"ق"#),
+        (r#"ﻙ"#, r#"ﻙ"#, r#"ﻙ"#, r#"ك"#, r#"ك"#),
+        (r#"ﻚ"#, r#"ﻚ"#, r#"ﻚ"#, r#"ك"#, r#"ك"#),
+        (r#"ﻛ"#, r#"ﻛ"#, r#"ﻛ"#, r#"ك"#, r#"ك"#),
+        (r#"ﻜ"#, r#"ﻜ"#, r#"ﻜ"#, r#"ك"#, r#"ك"#),
+        (r#"ﻝ"#, r#"ﻝ"#, r#"ﻝ"#, r#"ل"#, r#"ل"#),
+        (r#"ﻞ"#, r#"ﻞ"#, r#"ﻞ"#, r#"ل"#, r#"ل"#),
+        (r#"ﻟ"#, r#"ﻟ"#, r#"ﻟ"#, r#"ل"#, r#"ل"#),
+        (r#"ﻠ"#, r#"ﻠ"#, r#"ﻠ"#, r#"ل"#, r#"ل"#),
+        (r#"ﻡ"#, r#"ﻡ"#, r#"ﻡ"#, r#"م"#, r#"م"#),
+        (r#"ﻢ"#, r#"ﻢ"#, r#"ﻢ"#, r#"م"#, r#"م"#),
+        (r#"ﻣ"#, r#"ﻣ"#, r#"ﻣ"#, r#"م"#, r#"م"#),
+        (r#"ﻤ"#, r#"ﻤ"#, r#"ﻤ"#, r#"م"#, r#"م"#),
+        (r#"ﻥ"#, r#"ﻥ"#, r#"ﻥ"#, r#"ن"#, r#"ن"#),
+        (r#"ﻦ"#, r#"ﻦ"#, r#"ﻦ"#, r#"ن"#, r#"ن"#),
+        (r#"ﻧ"#, r#"ﻧ"#, r#"ﻧ"#, r#"ن"#, r#"ن"#),
+        (r#"ﻨ"#, r#"ﻨ"#, r#"ﻨ"#, r#"ن"#, r#"ن"#),
+        (r#"ﻩ"#, r#"ﻩ"#, r#"ﻩ"#, r#"ه"#, r#"ه"#),
+        (r#"ﻪ"#, r#"ﻪ"#, r#"ﻪ"#, r#"ه"#, r#"ه"#),
+        (r#"ﻫ"#, r#"ﻫ"#, r#"ﻫ"#, r#"ه"#, r#"ه"#),
+        (r#"ﻬ"#, r#"ﻬ"#, r#"ﻬ"#, r#"ه"#, r#"ه"#),
+        (r#"ﻭ"#, r#"ﻭ"#, r#"ﻭ"#, r#"و"#, r#"و"#),
+        (r#"ﻮ"#, r#"ﻮ"#, r#"ﻮ"#, r#"و"#, r#"و"#),
+        (r#"ﻯ"#, r#"ﻯ"#, r#"ﻯ"#, r#"ى"#, r#"ى"#),
+        (r#"ﻰ"#, r#"ﻰ"#, r#"ﻰ"#, r#"ى"#, r#"ى"#),
+        (r#"ﻱ"#, r#"ﻱ"#, r#"ﻱ"#, r#"ي"#, r#"ي"#),
+        (r#"ﻲ"#, r#"ﻲ"#, r#"ﻲ"#, r#"ي"#, r#"ي"#),
+        (r#"ﻳ"#, r#"ﻳ"#, r#"ﻳ"#, r#"ي"#, r#"ي"#),
+        (r#"ﻴ"#, r#"ﻴ"#, r#"ﻴ"#, r#"ي"#, r#"ي"#),
+        (r#"ﻵ"#, r#"ﻵ"#, r#"ﻵ"#, r#"لآ"#, r#"لآ"#),
+        (r#"ﻶ"#, r#"ﻶ"#, r#"ﻶ"#, r#"لآ"#, r#"لآ"#),
+        (r#"ﻷ"#, r#"ﻷ"#, r#"ﻷ"#, r#"لأ"#, r#"لأ"#),
+        (r#"ﻸ"#, r#"ﻸ"#, r#"ﻸ"#, r#"لأ"#, r#"لأ"#),
+        (r#"ﻹ"#, r#"ﻹ"#, r#"ﻹ"#, r#"لإ"#, r#"لإ"#),
+        (r#"ﻺ"#, r#"ﻺ"#, r#"ﻺ"#, r#"لإ"#, r#"لإ"#),
+        (r#"ﻻ"#, r#"ﻻ"#, r#"ﻻ"#, r#"لا"#, r#"لا"#),
+        (r#"ﻼ"#, r#"ﻼ"#, r#"ﻼ"#, r#"لا"#, r#"لا"#),
+        (r#"！"#, r#"！"#, r#"！"#, r#"!"#, r#"!"#),
+        (r#"＂"#, r#"＂"#, r#"＂"#, r#"""#, r#"""#),
+        (r#"＃"#, r#"＃"#, r#"＃"#, r#"#"#, r#"#"#),
+        (r#"＄"#, r#"＄"#, r#"＄"#, r#"$"#, r#"$"#),
+        (r#"％"#, r#"％"#, r#"％"#, r#"%"#, r#"%"#),
+        (r#"＆"#, r#"＆"#, r#"＆"#, r#"&"#, r#"&"#),
+        (r#"＇"#, r#"＇"#, r#"＇"#, r#"'"#, r#"'"#),
+        (r#"（"#, r#"（"#, r#"（"#, r#"("#, r#"("#),
+        (r#"）"#, r#"）"#, r#"）"#, r#")"#, r#")"#),
+        (r#"＊"#, r#"＊"#, r#"＊"#, r#"*"#, r#"*"#),
+        (r#"＋"#, r#"＋"#, r#"＋"#, r#"+"#, r#"+"#),
+        (r#"，"#, r#"，"#, r#"，"#, r#","#, r#","#),
+        (r#"－"#, r#"－"#, r#"－"#, r#"-"#, r#"-"#),
+        (r#"．"#, r#"．"#, r#"．"#, r#"."#, r#"."#),
+        (r#"／"#, r#"／"#, r#"／"#, r#"/"#, r#"/"#),
+        (r#"０"#, r#"０"#, r#"０"#, r#"0"#, r#"0"#),
+        (r#"１"#, r#"１"#, r#"１"#, r#"1"#, r#"1"#),
+        (r#"２"#, r#"２"#, r#"２"#, r#"2"#, r#"2"#),
+        (r#"３"#, r#"３"#, r#"３"#, r#"3"#, r#"3"#),
+        (r#"４"#, r#"４"#, r#"４"#, r#"4"#, r#"4"#),
+        (r#"５"#, r#"５"#, r#"５"#, r#"5"#, r#"5"#),
+        (r#"６"#, r#"６"#, r#"６"#, r#"6"#, r#"6"#),
+        (r#"７"#, r#"７"#, r#"７"#, r#"7"#, r#"7"#),
+        (r#"８"#, r#"８"#, r#"８"#, r#"8"#, r#"8"#),
+        (r#"９"#, r#"９"#, r#"９"#, r#"9"#, r#"9"#),
+        (r#"："#, r#"："#, r#"："#, r#":"#, r#":"#),
+        (r#"；"#, r#"；"#, r#"；"#, r#";"#, r#";"#),
+        (r#"＜"#, r#"＜"#, r#"＜"#, r#"<"#, r#"<"#),
+        (r#"＝"#, r#"＝"#, r#"＝"#, r#"="#, r#"="#),
+        (r#"＞"#, r#"＞"#, r#"＞"#, r#">"#, r#">"#),
+        (r#"？"#, r#"？"#, r#"？"#, r#"?"#, r#"?"#),
+        (r#"＠"#, r#"＠"#, r#"＠"#, r#"@"#, r#"@"#),
+        (r#"Ａ"#, r#"Ａ"#, r#"Ａ"#, r#"A"#, r#"A"#),
+        (r#"Ｂ"#, r#"Ｂ"#, r#"Ｂ"#, r#"B"#, r#"B"#),
+        (r#"Ｃ"#, r#"Ｃ"#, r#"Ｃ"#, r#"C"#, r#"C"#),
+        (r#"Ｄ"#, r#"Ｄ"#, r#"Ｄ"#, r#"D"#, r#"D"#),
+        (r#"Ｅ"#, r#"Ｅ"#, r#"Ｅ"#, r#"E"#, r#"E"#),
+        (r#"Ｆ"#, r#"Ｆ"#, r#"Ｆ"#, r#"F"#, r#"F"#),
+        (r#"Ｇ"#, r#"Ｇ"#, r#"Ｇ"#, r#"G"#, r#"G"#),
+        (r#"Ｈ"#, r#"Ｈ"#, r#"Ｈ"#, r#"H"#, r#"H"#),
+        (r#"Ｉ"#, r#"Ｉ"#, r#"Ｉ"#, r#"I"#, r#"I"#),
+        (r#"Ｊ"#, r#"Ｊ"#, r#"Ｊ"#, r#"J"#, r#"J"#),
+        (r#"Ｋ"#, r#"Ｋ"#, r#"Ｋ"#, r#"K"#, r#"K"#),
+        (r#"Ｌ"#, r#"Ｌ"#, r#"Ｌ"#, r#"L"#, r#"L"#),
+        (r#"Ｍ"#, r#"Ｍ"#, r#"Ｍ"#, r#"M"#, r#"M"#),
+        (r#"Ｎ"#, r#"Ｎ"#, r#"Ｎ"#, r#"N"#, r#"N"#),
+        (r#"Ｏ"#, r#"Ｏ"#, r#"Ｏ"#, r#"O"#, r#"O"#),
+        (r#"Ｐ"#, r#"Ｐ"#, r#"Ｐ"#, r#"P"#, r#"P"#),
+        (r#"Ｑ"#, r#"Ｑ"#, r#"Ｑ"#, r#"Q"#, r#"Q"#),
+        (r#"Ｒ"#, r#"Ｒ"#, r#"Ｒ"#, r#"R"#, r#"R"#),
+        (r#"Ｓ"#, r#"Ｓ"#, r#"Ｓ"#, r#"S"#, r#"S"#),
+        (r#"Ｔ"#, r#"Ｔ"#, r#"Ｔ"#, r#"T"#, r#"T"#),
+        (r#"Ｕ"#, r#"Ｕ"#, r#"Ｕ"#, r#"U"#, r#"U"#),
+        (r#"Ｖ"#, r#"Ｖ"#, r#"Ｖ"#, r#"V"#, r#"V"#),
+        (r#"Ｗ"#, r#"Ｗ"#, r#"Ｗ"#, r#"W"#, r#"W"#),
+        (r#"Ｘ"#, r#"Ｘ"#, r#"Ｘ"#, r#"X"#, r#"X"#),
+        (r#"Ｙ"#, r#"Ｙ"#, r#"Ｙ"#, r#"Y"#, r#"Y"#),
+        (r#"Ｚ"#, r#"Ｚ"#, r#"Ｚ"#, r#"Z"#, r#"Z"#),
+        (r#"［"#, r#"［"#, r#"［"#, r#"["#, r#"["#),
+        (r#"＼"#, r#"＼"#, r#"＼"#, r#"\"#, r#"\"#),
+        (r#"］"#, r#"］"#, r#"］"#, r#"]"#, r#"]"#),
+        (r#"＾"#, r#"＾"#, r#"＾"#, r#"^"#, r#"^"#),
+        (r#"＿"#, r#"＿"#, r#"＿"#, r#"_"#, r#"_"#),
+        (r#"｀"#, r#"｀"#, r#"｀"#, r#"`"#, r#"`"#),
+        (r#"ａ"#, r#"ａ"#, r#"ａ"#, r#"a"#, r#"a"#),
+        (r#"ｂ"#, r#"ｂ"#, r#"ｂ"#, r#"b"#, r#"b"#),
+        (r#"ｃ"#, r#"ｃ"#, r#"ｃ"#, r#"c"#, r#"c"#),
+        (r#"ｄ"#, r#"ｄ"#, r#"ｄ"#, r#"d"#, r#"d"#),
+        (r#"ｅ"#, r#"ｅ"#, r#"ｅ"#, r#"e"#, r#"e"#),
+        (r#"ｆ"#, r#"ｆ"#, r#"ｆ"#, r#"f"#, r#"f"#),
+        (r#"ｇ"#, r#"ｇ"#, r#"ｇ"#, r#"g"#, r#"g"#),
+        (r#"ｈ"#, r#"ｈ"#, r#"ｈ"#, r#"h"#, r#"h"#),
+        (r#"ｉ"#, r#"ｉ"#, r#"ｉ"#, r#"i"#, r#"i"#),
+        (r#"ｊ"#, r#"ｊ"#, r#"ｊ"#, r#"j"#, r#"j"#),
+        (r#"ｋ"#, r#"ｋ"#, r#"ｋ"#, r#"k"#, r#"k"#),
+        (r#"ｌ"#, r#"ｌ"#, r#"ｌ"#, r#"l"#, r#"l"#),
+        (r#"ｍ"#, r#"ｍ"#, r#"ｍ"#, r#"m"#, r#"m"#),
+        (r#"ｎ"#, r#"ｎ"#, r#"ｎ"#, r#"n"#, r#"n"#),
+        (r#"ｏ"#, r#"ｏ"#, r#"ｏ"#, r#"o"#, r#"o"#),
+        (r#"ｐ"#, r#"ｐ"#, r#"ｐ"#, r#"p"#, r#"p"#),
+        (r#"ｑ"#, r#"ｑ"#, r#"ｑ"#, r#"q"#, r#"q"#),
+        (r#"ｒ"#, r#"ｒ"#, r#"ｒ"#, r#"r"#, r#"r"#),
+        (r#"ｓ"#, r#"ｓ"#, r#"ｓ"#, r#"s"#, r#"s"#),
+        (r#"ｔ"#, r#"ｔ"#, r#"ｔ"#, r#"t"#, r#"t"#),
+        (r#"ｕ"#, r#"ｕ"#, r#"ｕ"#, r#"u"#, r#"u"#),
+        (r#"ｖ"#, r#"ｖ"#, r#"ｖ"#, r#"v"#, r#"v"#),
+        (r#"ｗ"#, r#"ｗ"#, r#"ｗ"#, r#"w"#, r#"w"#),
+        (r#"ｘ"#, r#"ｘ"#, r#"ｘ"#, r#"x"#, r#"x"#),
+        (r#"ｙ"#, r#"ｙ"#, r#"ｙ"#, r#"y"#, r#"y"#),
+        (r#"ｚ"#, r#"ｚ"#, r#"ｚ"#, r#"z"#, r#"z"#),
+        (r#"｛"#, r#"｛"#, r#"｛"#, r#"{"#, r#"{"#),
+        (r#"｜"#, r#"｜"#, r#"｜"#, r#"|"#, r#"|"#),
+        (r#"｝"#, r#"｝"#, r#"｝"#, r#"}"#, r#"}"#),
+        (r#"～"#, r#"～"#, r#"～"#, r#"~"#, r#"~"#),
+        (r#"｟"#, r#"｟"#, r#"｟"#, r#"⦅"#, r#"⦅"#),
+        (r#"｠"#, r#"｠"#, r#"｠"#, r#"⦆"#, r#"⦆"#),
+        (r#"｡"#, r#"｡"#, r#"｡"#, r#"。"#, r#"。"#),
+        (r#"｢"#, r#"｢"#, r#"｢"#, r#"「"#, r#"「"#),
+        (r#"｣"#, r#"｣"#, r#"｣"#, r#"」"#, r#"」"#),
+        (r#"､"#, r#"､"#, r#"､"#, r#"、"#, r#"、"#),
+        (r#"･"#, r#"･"#, r#"･"#, r#"・"#, r#"・"#),
+        (r#"ｦ"#, r#"ｦ"#, r#"ｦ"#, r#"ヲ"#, r#"ヲ"#),
+        (r#"ｧ"#, r#"ｧ"#, r#"ｧ"#, r#"ァ"#, r#"ァ"#),
+        (r#"ｨ"#, r#"ｨ"#, r#"ｨ"#, r#"ィ"#, r#"ィ"#),
+        (r#"ｩ"#, r#"ｩ"#, r#"ｩ"#, r#"ゥ"#, r#"ゥ"#),
+        (r#"ｪ"#, r#"ｪ"#, r#"ｪ"#, r#"ェ"#, r#"ェ"#),
+        (r#"ｫ"#, r#"ｫ"#, r#"ｫ"#, r#"ォ"#, r#"ォ"#),
+        (r#"ｬ"#, r#"ｬ"#, r#"ｬ"#, r#"ャ"#, r#"ャ"#),
+        (r#"ｭ"#, r#"ｭ"#, r#"ｭ"#, r#"ュ"#, r#"ュ"#),
+        (r#"ｮ"#, r#"ｮ"#, r#"ｮ"#, r#"ョ"#, r#"ョ"#),
+        (r#"ｯ"#, r#"ｯ"#, r#"ｯ"#, r#"ッ"#, r#"ッ"#),
+        (r#"ｰ"#, r#"ｰ"#, r#"ｰ"#, r#"ー"#, r#"ー"#),
+        (r#"ｱ"#, r#"ｱ"#, r#"ｱ"#, r#"ア"#, r#"ア"#),
+        (r#"ｲ"#, r#"ｲ"#, r#"ｲ"#, r#"イ"#, r#"イ"#),
+        (r#"ｳ"#, r#"ｳ"#, r#"ｳ"#, r#"ウ"#, r#"ウ"#),
+        (r#"ｴ"#, r#"ｴ"#, r#"ｴ"#, r#"エ"#, r#"エ"#),
+        (r#"ｵ"#, r#"ｵ"#, r#"ｵ"#, r#"オ"#, r#"オ"#),
+        (r#"ｶ"#, r#"ｶ"#, r#"ｶ"#, r#"カ"#, r#"カ"#),
+        (r#"ｷ"#, r#"ｷ"#, r#"ｷ"#, r#"キ"#, r#"キ"#),
+        (r#"ｸ"#, r#"ｸ"#, r#"ｸ"#, r#"ク"#, r#"ク"#),
+        (r#"ｹ"#, r#"ｹ"#, r#"ｹ"#, r#"ケ"#, r#"ケ"#),
+        (r#"ｺ"#, r#"ｺ"#, r#"ｺ"#, r#"コ"#, r#"コ"#),
+        (r#"ｻ"#, r#"ｻ"#, r#"ｻ"#, r#"サ"#, r#"サ"#),
+        (r#"ｼ"#, r#"ｼ"#, r#"ｼ"#, r#"シ"#, r#"シ"#),
+        (r#"ｽ"#, r#"ｽ"#, r#"ｽ"#, r#"ス"#, r#"ス"#),
+        (r#"ｾ"#, r#"ｾ"#, r#"ｾ"#, r#"セ"#, r#"セ"#),
+        (r#"ｿ"#, r#"ｿ"#, r#"ｿ"#, r#"ソ"#, r#"ソ"#),
+        (r#"ﾀ"#, r#"ﾀ"#, r#"ﾀ"#, r#"タ"#, r#"タ"#),
+        (r#"ﾁ"#, r#"ﾁ"#, r#"ﾁ"#, r#"チ"#, r#"チ"#),
+        (r#"ﾂ"#, r#"ﾂ"#, r#"ﾂ"#, r#"ツ"#, r#"ツ"#),
+        (r#"ﾃ"#, r#"ﾃ"#, r#"ﾃ"#, r#"テ"#, r#"テ"#),
+        (r#"ﾄ"#, r#"ﾄ"#, r#"ﾄ"#, r#"ト"#, r#"ト"#),
+        (r#"ﾅ"#, r#"ﾅ"#, r#"ﾅ"#, r#"ナ"#, r#"ナ"#),
+        (r#"ﾆ"#, r#"ﾆ"#, r#"ﾆ"#, r#"ニ"#, r#"ニ"#),
+        (r#"ﾇ"#, r#"ﾇ"#, r#"ﾇ"#, r#"ヌ"#, r#"ヌ"#),
+        (r#"ﾈ"#, r#"ﾈ"#, r#"ﾈ"#, r#"ネ"#, r#"ネ"#),
+        (r#"ﾉ"#, r#"ﾉ"#, r#"ﾉ"#, r#"ノ"#, r#"ノ"#),
+        (r#"ﾊ"#, r#"ﾊ"#, r#"ﾊ"#, r#"ハ"#, r#"ハ"#),
+        (r#"ﾋ"#, r#"ﾋ"#, r#"ﾋ"#, r#"ヒ"#, r#"ヒ"#),
+        (r#"ﾌ"#, r#"ﾌ"#, r#"ﾌ"#, r#"フ"#, r#"フ"#),
+        (r#"ﾍ"#, r#"ﾍ"#, r#"ﾍ"#, r#"ヘ"#, r#"ヘ"#),
+        (r#"ﾎ"#, r#"ﾎ"#, r#"ﾎ"#, r#"ホ"#, r#"ホ"#),
+        (r#"ﾏ"#, r#"ﾏ"#, r#"ﾏ"#, r#"マ"#, r#"マ"#),
+        (r#"ﾐ"#, r#"ﾐ"#, r#"ﾐ"#, r#"ミ"#, r#"ミ"#),
+        (r#"ﾑ"#, r#"ﾑ"#, r#"ﾑ"#, r#"ム"#, r#"ム"#),
+        (r#"ﾒ"#, r#"ﾒ"#, r#"ﾒ"#, r#"メ"#, r#"メ"#),
+        (r#"ﾓ"#, r#"ﾓ"#, r#"ﾓ"#, r#"モ"#, r#"モ"#),
+        (r#"ﾔ"#, r#"ﾔ"#, r#"ﾔ"#, r#"ヤ"#, r#"ヤ"#),
+        (r#"ﾕ"#, r#"ﾕ"#, r#"ﾕ"#, r#"ユ"#, r#"ユ"#),
+        (r#"ﾖ"#, r#"ﾖ"#, r#"ﾖ"#, r#"ヨ"#, r#"ヨ"#),
+        (r#"ﾗ"#, r#"ﾗ"#, r#"ﾗ"#, r#"ラ"#, r#"ラ"#),
+        (r#"ﾘ"#, r#"ﾘ"#, r#"ﾘ"#, r#"リ"#, r#"リ"#),
+        (r#"ﾙ"#, r#"ﾙ"#, r#"ﾙ"#, r#"ル"#, r#"ル"#),
+        (r#"ﾚ"#, r#"ﾚ"#, r#"ﾚ"#, r#"レ"#, r#"レ"#),
+        (r#"ﾛ"#, r#"ﾛ"#, r#"ﾛ"#, r#"ロ"#, r#"ロ"#),
+        (r#"ﾜ"#, r#"ﾜ"#, r#"ﾜ"#, r#"ワ"#, r#"ワ"#),
+        (r#"ﾝ"#, r#"ﾝ"#, r#"ﾝ"#, r#"ン"#, r#"ン"#),
+        (r#"ﾞ"#, r#"ﾞ"#, r#"ﾞ"#, r#"゙"#, r#"゙"#),
+        (r#"ﾟ"#, r#"ﾟ"#, r#"ﾟ"#, r#"゚"#, r#"゚"#),
+        (r#"ﾠ"#, r#"ﾠ"#, r#"ﾠ"#, r#"ᅠ"#, r#"ᅠ"#),
+        (r#"ﾡ"#, r#"ﾡ"#, r#"ﾡ"#, r#"ᄀ"#, r#"ᄀ"#),
+        (r#"ﾢ"#, r#"ﾢ"#, r#"ﾢ"#, r#"ᄁ"#, r#"ᄁ"#),
+        (r#"ﾣ"#, r#"ﾣ"#, r#"ﾣ"#, r#"ᆪ"#, r#"ᆪ"#),
+        (r#"ﾤ"#, r#"ﾤ"#, r#"ﾤ"#, r#"ᄂ"#, r#"ᄂ"#),
+        (r#"ﾥ"#, r#"ﾥ"#, r#"ﾥ"#, r#"ᆬ"#, r#"ᆬ"#),
+        (r#"ﾦ"#, r#"ﾦ"#, r#"ﾦ"#, r#"ᆭ"#, r#"ᆭ"#),
+        (r#"ﾧ"#, r#"ﾧ"#, r#"ﾧ"#, r#"ᄃ"#, r#"ᄃ"#),
+        (r#"ﾨ"#, r#"ﾨ"#, r#"ﾨ"#, r#"ᄄ"#, r#"ᄄ"#),
+        (r#"ﾩ"#, r#"ﾩ"#, r#"ﾩ"#, r#"ᄅ"#, r#"ᄅ"#),
+        (r#"ﾪ"#, r#"ﾪ"#, r#"ﾪ"#, r#"ᆰ"#, r#"ᆰ"#),
+        (r#"ﾫ"#, r#"ﾫ"#, r#"ﾫ"#, r#"ᆱ"#, r#"ᆱ"#),
+        (r#"ﾬ"#, r#"ﾬ"#, r#"ﾬ"#, r#"ᆲ"#, r#"ᆲ"#),
+        (r#"ﾭ"#, r#"ﾭ"#, r#"ﾭ"#, r#"ᆳ"#, r#"ᆳ"#),
+        (r#"ﾮ"#, r#"ﾮ"#, r#"ﾮ"#, r#"ᆴ"#, r#"ᆴ"#),
+        (r#"ﾯ"#, r#"ﾯ"#, r#"ﾯ"#, r#"ᆵ"#, r#"ᆵ"#),
+        (r#"ﾰ"#, r#"ﾰ"#, r#"ﾰ"#, r#"ᄚ"#, r#"ᄚ"#),
+        (r#"ﾱ"#, r#"ﾱ"#, r#"ﾱ"#, r#"ᄆ"#, r#"ᄆ"#),
+        (r#"ﾲ"#, r#"ﾲ"#, r#"ﾲ"#, r#"ᄇ"#, r#"ᄇ"#),
+        (r#"ﾳ"#, r#"ﾳ"#, r#"ﾳ"#, r#"ᄈ"#, r#"ᄈ"#),
+        (r#"ﾴ"#, r#"ﾴ"#, r#"ﾴ"#, r#"ᄡ"#, r#"ᄡ"#),
+        (r#"ﾵ"#, r#"ﾵ"#, r#"ﾵ"#, r#"ᄉ"#, r#"ᄉ"#),
+        (r#"ﾶ"#, r#"ﾶ"#, r#"ﾶ"#, r#"ᄊ"#, r#"ᄊ"#),
+        (r#"ﾷ"#, r#"ﾷ"#, r#"ﾷ"#, r#"ᄋ"#, r#"ᄋ"#),
+        (r#"ﾸ"#, r#"ﾸ"#, r#"ﾸ"#, r#"ᄌ"#, r#"ᄌ"#),
+        (r#"ﾹ"#, r#"ﾹ"#, r#"ﾹ"#, r#"ᄍ"#, r#"ᄍ"#),
+        (r#"ﾺ"#, r#"ﾺ"#, r#"ﾺ"#, r#"ᄎ"#, r#"ᄎ"#),
+        (r#"ﾻ"#, r#"ﾻ"#, r#"ﾻ"#, r#"ᄏ"#, r#"ᄏ"#),
+        (r#"ﾼ"#, r#"ﾼ"#, r#"ﾼ"#, r#"ᄐ"#, r#"ᄐ"#),
+        (r#"ﾽ"#, r#"ﾽ"#, r#"ﾽ"#, r#"ᄑ"#, r#"ᄑ"#),
+        (r#"ﾾ"#, r#"ﾾ"#, r#"ﾾ"#, r#"ᄒ"#, r#"ᄒ"#),
+        (r#"ￂ"#, r#"ￂ"#, r#"ￂ"#, r#"ᅡ"#, r#"ᅡ"#),
+        (r#"ￃ"#, r#"ￃ"#, r#"ￃ"#, r#"ᅢ"#, r#"ᅢ"#),
+        (r#"ￄ"#, r#"ￄ"#, r#"ￄ"#, r#"ᅣ"#, r#"ᅣ"#),
+        (r#"ￅ"#, r#"ￅ"#, r#"ￅ"#, r#"ᅤ"#, r#"ᅤ"#),
+        (r#"ￆ"#, r#"ￆ"#, r#"ￆ"#, r#"ᅥ"#, r#"ᅥ"#),
+        (r#"ￇ"#, r#"ￇ"#, r#"ￇ"#, r#"ᅦ"#, r#"ᅦ"#),
+        (r#"ￊ"#, r#"ￊ"#, r#"ￊ"#, r#"ᅧ"#, r#"ᅧ"#),
+        (r#"ￋ"#, r#"ￋ"#, r#"ￋ"#, r#"ᅨ"#, r#"ᅨ"#),
+        (r#"ￌ"#, r#"ￌ"#, r#"ￌ"#, r#"ᅩ"#, r#"ᅩ"#),
+        (r#"ￍ"#, r#"ￍ"#, r#"ￍ"#, r#"ᅪ"#, r#"ᅪ"#),
+        (r#"ￎ"#, r#"ￎ"#, r#"ￎ"#, r#"ᅫ"#, r#"ᅫ"#),
+        (r#"ￏ"#, r#"ￏ"#, r#"ￏ"#, r#"ᅬ"#, r#"ᅬ"#),
+        (r#"ￒ"#, r#"ￒ"#, r#"ￒ"#, r#"ᅭ"#, r#"ᅭ"#),
+        (r#"ￓ"#, r#"ￓ"#, r#"ￓ"#, r#"ᅮ"#, r#"ᅮ"#),
+        (r#"ￔ"#, r#"ￔ"#, r#"ￔ"#, r#"ᅯ"#, r#"ᅯ"#),
+        (r#"ￕ"#, r#"ￕ"#, r#"ￕ"#, r#"ᅰ"#, r#"ᅰ"#),
+        (r#"ￖ"#, r#"ￖ"#, r#"ￖ"#, r#"ᅱ"#, r#"ᅱ"#),
+        (r#"ￗ"#, r#"ￗ"#, r#"ￗ"#, r#"ᅲ"#, r#"ᅲ"#),
+        (r#"ￚ"#, r#"ￚ"#, r#"ￚ"#, r#"ᅳ"#, r#"ᅳ"#),
+        (r#"ￛ"#, r#"ￛ"#, r#"ￛ"#, r#"ᅴ"#, r#"ᅴ"#),
+        (r#"ￜ"#, r#"ￜ"#, r#"ￜ"#, r#"ᅵ"#, r#"ᅵ"#),
+        (r#"￠"#, r#"￠"#, r#"￠"#, r#"¢"#, r#"¢"#),
+        (r#"￡"#, r#"￡"#, r#"￡"#, r#"£"#, r#"£"#),
+        (r#"￢"#, r#"￢"#, r#"￢"#, r#"¬"#, r#"¬"#),
+        (r#"￣"#, r#"￣"#, r#"￣"#, r#" ̄"#, r#" ̄"#),
+        (r#"￤"#, r#"￤"#, r#"￤"#, r#"¦"#, r#"¦"#),
+        (r#"￥"#, r#"￥"#, r#"￥"#, r#"¥"#, r#"¥"#),
+        (r#"￦"#, r#"￦"#, r#"￦"#, r#"₩"#, r#"₩"#),
+        (r#"￨"#, r#"￨"#, r#"￨"#, r#"│"#, r#"│"#),
+        (r#"￩"#, r#"￩"#, r#"￩"#, r#"←"#, r#"←"#),
+        (r#"￪"#, r#"￪"#, r#"￪"#, r#"↑"#, r#"↑"#),
+        (r#"￫"#, r#"￫"#, r#"￫"#, r#"→"#, r#"→"#),
+        (r#"￬"#, r#"￬"#, r#"￬"#, r#"↓"#, r#"↓"#),
+        (r#"￭"#, r#"￭"#, r#"￭"#, r#"■"#, r#"■"#),
+        (r#"￮"#, r#"￮"#, r#"￮"#, r#"○"#, r#"○"#),
+        (r#"𐞁"#, r#"𐞁"#, r#"𐞁"#, r#"ː"#, r#"ː"#),
+        (r#"𐞂"#, r#"𐞂"#, r#"𐞂"#, r#"ˑ"#, r#"ˑ"#),
+        (r#"𐞃"#, r#"𐞃"#, r#"𐞃"#, r#"æ"#, r#"æ"#),
+        (r#"𐞄"#, r#"𐞄"#, r#"𐞄"#, r#"ʙ"#, r#"ʙ"#),
+        (r#"𐞅"#, r#"𐞅"#, r#"𐞅"#, r#"ɓ"#, r#"ɓ"#),
+        (r#"𐞇"#, r#"𐞇"#, r#"𐞇"#, r#"ʣ"#, r#"ʣ"#),
+        (r#"𐞈"#, r#"𐞈"#, r#"𐞈"#, r#"ꭦ"#, r#"ꭦ"#),
+        (r#"𐞉"#, r#"𐞉"#, r#"𐞉"#, r#"ʥ"#, r#"ʥ"#),
+        (r#"𐞊"#, r#"𐞊"#, r#"𐞊"#, r#"ʤ"#, r#"ʤ"#),
+        (r#"𐞋"#, r#"𐞋"#, r#"𐞋"#, r#"ɖ"#, r#"ɖ"#),
+        (r#"𐞌"#, r#"𐞌"#, r#"𐞌"#, r#"ɗ"#, r#"ɗ"#),
+        (r#"𐞍"#, r#"𐞍"#, r#"𐞍"#, r#"ᶑ"#, r#"ᶑ"#),
+        (r#"𐞎"#, r#"𐞎"#, r#"𐞎"#, r#"ɘ"#, r#"ɘ"#),
+        (r#"𐞏"#, r#"𐞏"#, r#"𐞏"#, r#"ɞ"#, r#"ɞ"#),
+        (r#"𐞐"#, r#"𐞐"#, r#"𐞐"#, r#"ʩ"#, r#"ʩ"#),
+        (r#"𐞑"#, r#"𐞑"#, r#"𐞑"#, r#"ɤ"#, r#"ɤ"#),
+        (r#"𐞒"#, r#"𐞒"#, r#"𐞒"#, r#"ɢ"#, r#"ɢ"#),
+        (r#"𐞓"#, r#"𐞓"#, r#"𐞓"#, r#"ɠ"#, r#"ɠ"#),
+        (r#"𐞔"#, r#"𐞔"#, r#"𐞔"#, r#"ʛ"#, r#"ʛ"#),
+        (r#"𐞕"#, r#"𐞕"#, r#"𐞕"#, r#"ħ"#, r#"ħ"#),
+        (r#"𐞖"#, r#"𐞖"#, r#"𐞖"#, r#"ʜ"#, r#"ʜ"#),
+        (r#"𐞗"#, r#"𐞗"#, r#"𐞗"#, r#"ɧ"#, r#"ɧ"#),
+        (r#"𐞘"#, r#"𐞘"#, r#"𐞘"#, r#"ʄ"#, r#"ʄ"#),
+        (r#"𐞙"#, r#"𐞙"#, r#"𐞙"#, r#"ʪ"#, r#"ʪ"#),
+        (r#"𐞚"#, r#"𐞚"#, r#"𐞚"#, r#"ʫ"#, r#"ʫ"#),
+        (r#"𐞛"#, r#"𐞛"#, r#"𐞛"#, r#"ɬ"#, r#"ɬ"#),
+        (r#"𐞜"#, r#"𐞜"#, r#"𐞜"#, r#"𝼄"#, r#"𝼄"#),
+        (r#"𐞝"#, r#"𐞝"#, r#"𐞝"#, r#"ꞎ"#, r#"ꞎ"#),
+        (r#"𐞞"#, r#"𐞞"#, r#"𐞞"#, r#"ɮ"#, r#"ɮ"#),
+        (r#"𐞟"#, r#"𐞟"#, r#"𐞟"#, r#"𝼅"#, r#"𝼅"#),
+        (r#"𐞠"#, r#"𐞠"#, r#"𐞠"#, r#"ʎ"#, r#"ʎ"#),
+        (r#"𐞡"#, r#"𐞡"#, r#"𐞡"#, r#"𝼆"#, r#"𝼆"#),
+        (r#"𐞢"#, r#"𐞢"#, r#"𐞢"#, r#"ø"#, r#"ø"#),
+        (r#"𐞣"#, r#"𐞣"#, r#"𐞣"#, r#"ɶ"#, r#"ɶ"#),
+        (r#"𐞤"#, r#"𐞤"#, r#"𐞤"#, r#"ɷ"#, r#"ɷ"#),
+        (r#"𐞥"#, r#"𐞥"#, r#"𐞥"#, r#"q"#, r#"q"#),
+        (r#"𐞦"#, r#"𐞦"#, r#"𐞦"#, r#"ɺ"#, r#"ɺ"#),
+        (r#"𐞧"#, r#"𐞧"#, r#"𐞧"#, r#"𝼈"#, r#"𝼈"#),
+        (r#"𐞨"#, r#"𐞨"#, r#"𐞨"#, r#"ɽ"#, r#"ɽ"#),
+        (r#"𐞩"#, r#"𐞩"#, r#"𐞩"#, r#"ɾ"#, r#"ɾ"#),
+        (r#"𐞪"#, r#"𐞪"#, r#"𐞪"#, r#"ʀ"#, r#"ʀ"#),
+        (r#"𐞫"#, r#"𐞫"#, r#"𐞫"#, r#"ʨ"#, r#"ʨ"#),
+        (r#"𐞬"#, r#"𐞬"#, r#"𐞬"#, r#"ʦ"#, r#"ʦ"#),
+        (r#"𐞭"#, r#"𐞭"#, r#"𐞭"#, r#"ꭧ"#, r#"ꭧ"#),
+        (r#"𐞮"#, r#"𐞮"#, r#"𐞮"#, r#"ʧ"#, r#"ʧ"#),
+        (r#"𐞯"#, r#"𐞯"#, r#"𐞯"#, r#"ʈ"#, r#"ʈ"#),
+        (r#"𐞰"#, r#"𐞰"#, r#"𐞰"#, r#"ⱱ"#, r#"ⱱ"#),
+        (r#"𐞲"#, r#"𐞲"#, r#"𐞲"#, r#"ʏ"#, r#"ʏ"#),
+        (r#"𐞳"#, r#"𐞳"#, r#"𐞳"#, r#"ʡ"#, r#"ʡ"#),
+        (r#"𐞴"#, r#"𐞴"#, r#"𐞴"#, r#"ʢ"#, r#"ʢ"#),
+        (r#"𐞵"#, r#"𐞵"#, r#"𐞵"#, r#"ʘ"#, r#"ʘ"#),
+        (r#"𐞶"#, r#"𐞶"#, r#"𐞶"#, r#"ǀ"#, r#"ǀ"#),
+        (r#"𐞷"#, r#"𐞷"#, r#"𐞷"#, r#"ǁ"#, r#"ǁ"#),
+        (r#"𐞸"#, r#"𐞸"#, r#"𐞸"#, r#"ǂ"#, r#"ǂ"#),
+        (r#"𐞹"#, r#"𐞹"#, r#"𐞹"#, r#"𝼊"#, r#"𝼊"#),
+        (r#"𐞺"#, r#"𐞺"#, r#"𐞺"#, r#"𝼞"#, r#"𝼞"#),
+        (r#"𑂚"#, r#"𑂚"#, r#"𑂚"#, r#"𑂚"#, r#"𑂚"#),
+        (r#"𑂜"#, r#"𑂜"#, r#"𑂜"#, r#"𑂜"#, r#"𑂜"#),
+        (r#"𑂫"#, r#"𑂫"#, r#"𑂫"#, r#"𑂫"#, r#"𑂫"#),
+        (r#"𑄮"#, r#"𑄮"#, r#"𑄮"#, r#"𑄮"#, r#"𑄮"#),
+        (r#"𑄯"#, r#"𑄯"#, r#"𑄯"#, r#"𑄯"#, r#"𑄯"#),
+        (r#"𑍋"#, r#"𑍋"#, r#"𑍋"#, r#"𑍋"#, r#"𑍋"#),
+        (r#"𑍌"#, r#"𑍌"#, r#"𑍌"#, r#"𑍌"#, r#"𑍌"#),
+        (r#"𑒻"#, r#"𑒻"#, r#"𑒻"#, r#"𑒻"#, r#"𑒻"#),
+        (r#"𑒼"#, r#"𑒼"#, r#"𑒼"#, r#"𑒼"#, r#"𑒼"#),
+        (r#"𑒾"#, r#"𑒾"#, r#"𑒾"#, r#"𑒾"#, r#"𑒾"#),
+        (r#"𑖺"#, r#"𑖺"#, r#"𑖺"#, r#"𑖺"#, r#"𑖺"#),
+        (r#"𑖻"#, r#"𑖻"#, r#"𑖻"#, r#"𑖻"#, r#"𑖻"#),
+        (r#"𑤸"#, r#"𑤸"#, r#"𑤸"#, r#"𑤸"#, r#"𑤸"#),
+        (r#"𝅗𝅥"#, r#"𝅗𝅥"#, r#"𝅗𝅥"#, r#"𝅗𝅥"#, r#"𝅗𝅥"#),
+        (r#"𝅘𝅥"#, r#"𝅘𝅥"#, r#"𝅘𝅥"#, r#"𝅘𝅥"#, r#"𝅘𝅥"#),
+        (r#"𝅘𝅥𝅮"#, r#"𝅘𝅥𝅮"#, r#"𝅘𝅥𝅮"#, r#"𝅘𝅥𝅮"#, r#"𝅘𝅥𝅮"#),
+        (r#"𝅘𝅥𝅯"#, r#"𝅘𝅥𝅯"#, r#"𝅘𝅥𝅯"#, r#"𝅘𝅥𝅯"#, r#"𝅘𝅥𝅯"#),
+        (r#"𝅘𝅥𝅰"#, r#"𝅘𝅥𝅰"#, r#"𝅘𝅥𝅰"#, r#"𝅘𝅥𝅰"#, r#"𝅘𝅥𝅰"#),
+        (r#"𝅘𝅥𝅱"#, r#"𝅘𝅥𝅱"#, r#"𝅘𝅥𝅱"#, r#"𝅘𝅥𝅱"#, r#"𝅘𝅥𝅱"#),
+        (r#"𝅘𝅥𝅲"#, r#"𝅘𝅥𝅲"#, r#"𝅘𝅥𝅲"#, r#"𝅘𝅥𝅲"#, r#"𝅘𝅥𝅲"#),
+        (r#"𝆹𝅥"#, r#"𝆹𝅥"#, r#"𝆹𝅥"#, r#"𝆹𝅥"#, r#"𝆹𝅥"#),
+        (r#"𝆺𝅥"#, r#"𝆺𝅥"#, r#"𝆺𝅥"#, r#"𝆺𝅥"#, r#"𝆺𝅥"#),
+        (r#"𝆹𝅥𝅮"#, r#"𝆹𝅥𝅮"#, r#"𝆹𝅥𝅮"#, r#"𝆹𝅥𝅮"#, r#"𝆹𝅥𝅮"#),
+        (r#"𝆺𝅥𝅮"#, r#"𝆺𝅥𝅮"#, r#"𝆺𝅥𝅮"#, r#"𝆺𝅥𝅮"#, r#"𝆺𝅥𝅮"#),
+        (r#"𝆹𝅥𝅯"#, r#"𝆹𝅥𝅯"#, r#"𝆹𝅥𝅯"#, r#"𝆹𝅥𝅯"#, r#"𝆹𝅥𝅯"#),
+        (r#"𝆺𝅥𝅯"#, r#"𝆺𝅥𝅯"#, r#"𝆺𝅥𝅯"#, r#"𝆺𝅥𝅯"#, r#"𝆺𝅥𝅯"#),
+        (r#"𝐀"#, r#"𝐀"#, r#"𝐀"#, r#"A"#, r#"A"#),
+        (r#"𝐁"#, r#"𝐁"#, r#"𝐁"#, r#"B"#, r#"B"#),
+        (r#"𝐂"#, r#"𝐂"#, r#"𝐂"#, r#"C"#, r#"C"#),
+        (r#"𝐃"#, r#"𝐃"#, r#"𝐃"#, r#"D"#, r#"D"#),
+        (r#"𝐄"#, r#"𝐄"#, r#"𝐄"#, r#"E"#, r#"E"#),
+        (r#"𝐅"#, r#"𝐅"#, r#"𝐅"#, r#"F"#, r#"F"#),
+        (r#"𝐆"#, r#"𝐆"#, r#"𝐆"#, r#"G"#, r#"G"#),
+        (r#"𝐇"#, r#"𝐇"#, r#"𝐇"#, r#"H"#, r#"H"#),
+        (r#"𝐈"#, r#"𝐈"#, r#"𝐈"#, r#"I"#, r#"I"#),
+        (r#"𝐉"#, r#"𝐉"#, r#"𝐉"#, r#"J"#, r#"J"#),
+        (r#"𝐊"#, r#"𝐊"#, r#"𝐊"#, r#"K"#, r#"K"#),
+        (r#"𝐋"#, r#"𝐋"#, r#"𝐋"#, r#"L"#, r#"L"#),
+        (r#"𝐌"#, r#"𝐌"#, r#"𝐌"#, r#"M"#, r#"M"#),
+        (r#"𝐍"#, r#"𝐍"#, r#"𝐍"#, r#"N"#, r#"N"#),
+        (r#"𝐎"#, r#"𝐎"#, r#"𝐎"#, r#"O"#, r#"O"#),
+        (r#"𝐏"#, r#"𝐏"#, r#"𝐏"#, r#"P"#, r#"P"#),
+        (r#"𝐐"#, r#"𝐐"#, r#"𝐐"#, r#"Q"#, r#"Q"#),
+        (r#"𝐑"#, r#"𝐑"#, r#"𝐑"#, r#"R"#, r#"R"#),
+        (r#"𝐒"#, r#"𝐒"#, r#"𝐒"#, r#"S"#, r#"S"#),
+        (r#"𝐓"#, r#"𝐓"#, r#"𝐓"#, r#"T"#, r#"T"#),
+        (r#"𝐔"#, r#"𝐔"#, r#"𝐔"#, r#"U"#, r#"U"#),
+        (r#"𝐕"#, r#"𝐕"#, r#"𝐕"#, r#"V"#, r#"V"#),
+        (r#"𝐖"#, r#"𝐖"#, r#"𝐖"#, r#"W"#, r#"W"#),
+        (r#"𝐗"#, r#"𝐗"#, r#"𝐗"#, r#"X"#, r#"X"#),
+        (r#"𝐘"#, r#"𝐘"#, r#"𝐘"#, r#"Y"#, r#"Y"#),
+        (r#"𝐙"#, r#"𝐙"#, r#"𝐙"#, r#"Z"#, r#"Z"#),
+        (r#"𝐚"#, r#"𝐚"#, r#"𝐚"#, r#"a"#, r#"a"#),
+        (r#"𝐛"#, r#"𝐛"#, r#"𝐛"#, r#"b"#, r#"b"#),
+        (r#"𝐜"#, r#"𝐜"#, r#"𝐜"#, r#"c"#, r#"c"#),
+        (r#"𝐝"#, r#"𝐝"#, r#"𝐝"#, r#"d"#, r#"d"#),
+        (r#"𝐞"#, r#"𝐞"#, r#"𝐞"#, r#"e"#, r#"e"#),
+        (r#"𝐟"#, r#"𝐟"#, r#"𝐟"#, r#"f"#, r#"f"#),
+        (r#"𝐠"#, r#"𝐠"#, r#"𝐠"#, r#"g"#, r#"g"#),
+        (r#"𝐡"#, r#"𝐡"#, r#"𝐡"#, r#"h"#, r#"h"#),
+        (r#"𝐢"#, r#"𝐢"#, r#"𝐢"#, r#"i"#, r#"i"#),
+        (r#"𝐣"#, r#"𝐣"#, r#"𝐣"#, r#"j"#, r#"j"#),
+        (r#"𝐤"#, r#"𝐤"#, r#"𝐤"#, r#"k"#, r#"k"#),
+        (r#"𝐥"#, r#"𝐥"#, r#"𝐥"#, r#"l"#, r#"l"#),
+        (r#"𝐦"#, r#"𝐦"#, r#"𝐦"#, r#"m"#, r#"m"#),
+        (r#"𝐧"#, r#"𝐧"#, r#"𝐧"#, r#"n"#, r#"n"#),
+        (r#"𝐨"#, r#"𝐨"#, r#"𝐨"#, r#"o"#, r#"o"#),
+        (r#"𝐩"#, r#"𝐩"#, r#"𝐩"#, r#"p"#, r#"p"#),
+        (r#"𝐪"#, r#"𝐪"#, r#"𝐪"#, r#"q"#, r#"q"#),
+        (r#"𝐫"#, r#"𝐫"#, r#"𝐫"#, r#"r"#, r#"r"#),
+        (r#"𝐬"#, r#"𝐬"#, r#"𝐬"#, r#"s"#, r#"s"#),
+        (r#"𝐭"#, r#"𝐭"#, r#"𝐭"#, r#"t"#, r#"t"#),
+        (r#"𝐮"#, r#"𝐮"#, r#"𝐮"#, r#"u"#, r#"u"#),
+        (r#"𝐯"#, r#"𝐯"#, r#"𝐯"#, r#"v"#, r#"v"#),
+        (r#"𝐰"#, r#"𝐰"#, r#"𝐰"#, r#"w"#, r#"w"#),
+        (r#"𝐱"#, r#"𝐱"#, r#"𝐱"#, r#"x"#, r#"x"#),
+        (r#"𝐲"#, r#"𝐲"#, r#"𝐲"#, r#"y"#, r#"y"#),
+        (r#"𝐳"#, r#"𝐳"#, r#"𝐳"#, r#"z"#, r#"z"#),
+        (r#"𝐴"#, r#"𝐴"#, r#"𝐴"#, r#"A"#, r#"A"#),
+        (r#"𝐵"#, r#"𝐵"#, r#"𝐵"#, r#"B"#, r#"B"#),
+        (r#"𝐶"#, r#"𝐶"#, r#"𝐶"#, r#"C"#, r#"C"#),
+        (r#"𝐷"#, r#"𝐷"#, r#"𝐷"#, r#"D"#, r#"D"#),
+        (r#"𝐸"#, r#"𝐸"#, r#"𝐸"#, r#"E"#, r#"E"#),
+        (r#"𝐹"#, r#"𝐹"#, r#"𝐹"#, r#"F"#, r#"F"#),
+        (r#"𝐺"#, r#"𝐺"#, r#"𝐺"#, r#"G"#, r#"G"#),
+        (r#"𝐻"#, r#"𝐻"#, r#"𝐻"#, r#"H"#, r#"H"#),
+        (r#"𝐼"#, r#"𝐼"#, r#"𝐼"#, r#"I"#, r#"I"#),
+        (r#"𝐽"#, r#"𝐽"#, r#"𝐽"#, r#"J"#, r#"J"#),
+        (r#"𝐾"#, r#"𝐾"#, r#"𝐾"#, r#"K"#, r#"K"#),
+        (r#"𝐿"#, r#"𝐿"#, r#"𝐿"#, r#"L"#, r#"L"#),
+        (r#"𝑀"#, r#"𝑀"#, r#"𝑀"#, r#"M"#, r#"M"#),
+        (r#"𝑁"#, r#"𝑁"#, r#"𝑁"#, r#"N"#, r#"N"#),
+        (r#"𝑂"#, r#"𝑂"#, r#"𝑂"#, r#"O"#, r#"O"#),
+        (r#"𝑃"#, r#"𝑃"#, r#"𝑃"#, r#"P"#, r#"P"#),
+        (r#"𝑄"#, r#"𝑄"#, r#"𝑄"#, r#"Q"#, r#"Q"#),
+        (r#"𝑅"#, r#"𝑅"#, r#"𝑅"#, r#"R"#, r#"R"#),
+        (r#"𝑆"#, r#"𝑆"#, r#"𝑆"#, r#"S"#, r#"S"#),
+        (r#"𝑇"#, r#"𝑇"#, r#"𝑇"#, r#"T"#, r#"T"#),
+        (r#"𝑈"#, r#"𝑈"#, r#"𝑈"#, r#"U"#, r#"U"#),
+        (r#"𝑉"#, r#"𝑉"#, r#"𝑉"#, r#"V"#, r#"V"#),
+        (r#"𝑊"#, r#"𝑊"#, r#"𝑊"#, r#"W"#, r#"W"#),
+        (r#"𝑋"#, r#"𝑋"#, r#"𝑋"#, r#"X"#, r#"X"#),
+        (r#"𝑌"#, r#"𝑌"#, r#"𝑌"#, r#"Y"#, r#"Y"#),
+        (r#"𝑍"#, r#"𝑍"#, r#"𝑍"#, r#"Z"#, r#"Z"#),
+        (r#"𝑎"#, r#"𝑎"#, r#"𝑎"#, r#"a"#, r#"a"#),
+        (r#"𝑏"#, r#"𝑏"#, r#"𝑏"#, r#"b"#, r#"b"#),
+        (r#"𝑐"#, r#"𝑐"#, r#"𝑐"#, r#"c"#, r#"c"#),
+        (r#"𝑑"#, r#"𝑑"#, r#"𝑑"#, r#"d"#, r#"d"#),
+        (r#"𝑒"#, r#"𝑒"#, r#"𝑒"#, r#"e"#, r#"e"#),
+        (r#"𝑓"#, r#"𝑓"#, r#"𝑓"#, r#"f"#, r#"f"#),
+        (r#"𝑔"#, r#"𝑔"#, r#"𝑔"#, r#"g"#, r#"g"#),
+        (r#"𝑖"#, r#"𝑖"#, r#"𝑖"#, r#"i"#, r#"i"#),
+        (r#"𝑗"#, r#"𝑗"#, r#"𝑗"#, r#"j"#, r#"j"#),
+        (r#"𝑘"#, r#"𝑘"#, r#"𝑘"#, r#"k"#, r#"k"#),
+        (r#"𝑙"#, r#"𝑙"#, r#"𝑙"#, r#"l"#, r#"l"#),
+        (r#"𝑚"#, r#"𝑚"#, r#"𝑚"#, r#"m"#, r#"m"#),
+        (r#"𝑛"#, r#"𝑛"#, r#"𝑛"#, r#"n"#, r#"n"#),
+        (r#"𝑜"#, r#"𝑜"#, r#"𝑜"#, r#"o"#, r#"o"#),
+        (r#"𝑝"#, r#"𝑝"#, r#"𝑝"#, r#"p"#, r#"p"#),
+        (r#"𝑞"#, r#"𝑞"#, r#"𝑞"#, r#"q"#, r#"q"#),
+        (r#"𝑟"#, r#"𝑟"#, r#"𝑟"#, r#"r"#, r#"r"#),
+        (r#"𝑠"#, r#"𝑠"#, r#"𝑠"#, r#"s"#, r#"s"#),
+        (r#"𝑡"#, r#"𝑡"#, r#"𝑡"#, r#"t"#, r#"t"#),
+        (r#"𝑢"#, r#"𝑢"#, r#"𝑢"#, r#"u"#, r#"u"#),
+        (r#"𝑣"#, r#"𝑣"#, r#"𝑣"#, r#"v"#, r#"v"#),
+        (r#"𝑤"#, r#"𝑤"#, r#"𝑤"#, r#"w"#, r#"w"#),
+        (r#"𝑥"#, r#"𝑥"#, r#"𝑥"#, r#"x"#, r#"x"#),
+        (r#"𝑦"#, r#"𝑦"#, r#"𝑦"#, r#"y"#, r#"y"#),
+        (r#"𝑧"#, r#"𝑧"#, r#"𝑧"#, r#"z"#, r#"z"#),
+        (r#"𝑨"#, r#"𝑨"#, r#"𝑨"#, r#"A"#, r#"A"#),
+        (r#"𝑩"#, r#"𝑩"#, r#"𝑩"#, r#"B"#, r#"B"#),
+        (r#"𝑪"#, r#"𝑪"#, r#"𝑪"#, r#"C"#, r#"C"#),
+        (r#"𝑫"#, r#"𝑫"#, r#"𝑫"#, r#"D"#, r#"D"#),
+        (r#"𝑬"#, r#"𝑬"#, r#"𝑬"#, r#"E"#, r#"E"#),
+        (r#"𝑭"#, r#"𝑭"#, r#"𝑭"#, r#"F"#, r#"F"#),
+        (r#"𝑮"#, r#"𝑮"#, r#"𝑮"#, r#"G"#, r#"G"#),
+        (r#"𝑯"#, r#"𝑯"#, r#"𝑯"#, r#"H"#, r#"H"#),
+        (r#"𝑰"#, r#"𝑰"#, r#"𝑰"#, r#"I"#, r#"I"#),
+        (r#"𝑱"#, r#"𝑱"#, r#"𝑱"#, r#"J"#, r#"J"#),
+        (r#"𝑲"#, r#"𝑲"#, r#"𝑲"#, r#"K"#, r#"K"#),
+        (r#"𝑳"#, r#"𝑳"#, r#"𝑳"#, r#"L"#, r#"L"#),
+        (r#"𝑴"#, r#"𝑴"#, r#"𝑴"#, r#"M"#, r#"M"#),
+        (r#"𝑵"#, r#"𝑵"#, r#"𝑵"#, r#"N"#, r#"N"#),
+        (r#"𝑶"#, r#"𝑶"#, r#"𝑶"#, r#"O"#, r#"O"#),
+        (r#"𝑷"#, r#"𝑷"#, r#"𝑷"#, r#"P"#, r#"P"#),
+        (r#"𝑸"#, r#"𝑸"#, r#"𝑸"#, r#"Q"#, r#"Q"#),
+        (r#"𝑹"#, r#"𝑹"#, r#"𝑹"#, r#"R"#, r#"R"#),
+        (r#"𝑺"#, r#"𝑺"#, r#"𝑺"#, r#"S"#, r#"S"#),
+        (r#"𝑻"#, r#"𝑻"#, r#"𝑻"#, r#"T"#, r#"T"#),
+        (r#"𝑼"#, r#"𝑼"#, r#"𝑼"#, r#"U"#, r#"U"#),
+        (r#"𝑽"#, r#"𝑽"#, r#"𝑽"#, r#"V"#, r#"V"#),
+        (r#"𝑾"#, r#"𝑾"#, r#"𝑾"#, r#"W"#, r#"W"#),
+        (r#"𝑿"#, r#"𝑿"#, r#"𝑿"#, r#"X"#, r#"X"#),
+        (r#"𝒀"#, r#"𝒀"#, r#"𝒀"#, r#"Y"#, r#"Y"#),
+        (r#"𝒁"#, r#"𝒁"#, r#"𝒁"#, r#"Z"#, r#"Z"#),
+        (r#"𝒂"#, r#"𝒂"#, r#"𝒂"#, r#"a"#, r#"a"#),
+        (r#"𝒃"#, r#"𝒃"#, r#"𝒃"#, r#"b"#, r#"b"#),
+        (r#"𝒄"#, r#"𝒄"#, r#"𝒄"#, r#"c"#, r#"c"#),
+        (r#"𝒅"#, r#"𝒅"#, r#"𝒅"#, r#"d"#, r#"d"#),
+        (r#"𝒆"#, r#"𝒆"#, r#"𝒆"#, r#"e"#, r#"e"#),
+        (r#"𝒇"#, r#"𝒇"#, r#"𝒇"#, r#"f"#, r#"f"#),
+        (r#"𝒈"#, r#"𝒈"#, r#"𝒈"#, r#"g"#, r#"g"#),
+        (r#"𝒉"#, r#"𝒉"#, r#"𝒉"#, r#"h"#, r#"h"#),
+        (r#"𝒊"#, r#"𝒊"#, r#"𝒊"#, r#"i"#, r#"i"#),
+        (r#"𝒋"#, r#"𝒋"#, r#"𝒋"#, r#"j"#, r#"j"#),
+        (r#"𝒌"#, r#"𝒌"#, r#"𝒌"#, r#"k"#, r#"k"#),
+        (r#"𝒍"#, r#"𝒍"#, r#"𝒍"#, r#"l"#, r#"l"#),
+        (r#"𝒎"#, r#"𝒎"#, r#"𝒎"#, r#"m"#, r#"m"#),
+        (r#"𝒏"#, r#"𝒏"#, r#"𝒏"#, r#"n"#, r#"n"#),
+        (r#"𝒐"#, r#"𝒐"#, r#"𝒐"#, r#"o"#, r#"o"#),
+        (r#"𝒑"#, r#"𝒑"#, r#"𝒑"#, r#"p"#, r#"p"#),
+        (r#"𝒒"#, r#"𝒒"#, r#"𝒒"#, r#"q"#, r#"q"#),
+        (r#"𝒓"#, r#"𝒓"#, r#"𝒓"#, r#"r"#, r#"r"#),
+        (r#"𝒔"#, r#"𝒔"#, r#"𝒔"#, r#"s"#, r#"s"#),
+        (r#"𝒕"#, r#"𝒕"#, r#"𝒕"#, r#"t"#, r#"t"#),
+        (r#"𝒖"#, r#"𝒖"#, r#"𝒖"#, r#"u"#, r#"u"#),
+        (r#"𝒗"#, r#"𝒗"#, r#"𝒗"#, r#"v"#, r#"v"#),
+        (r#"𝒘"#, r#"𝒘"#, r#"𝒘"#, r#"w"#, r#"w"#),
+        (r#"𝒙"#, r#"𝒙"#, r#"𝒙"#, r#"x"#, r#"x"#),
+        (r#"𝒚"#, r#"𝒚"#, r#"𝒚"#, r#"y"#, r#"y"#),
+        (r#"𝒛"#, r#"𝒛"#, r#"𝒛"#, r#"z"#, r#"z"#),
+        (r#"𝒜"#, r#"𝒜"#, r#"𝒜"#, r#"A"#, r#"A"#),
+        (r#"𝒞"#, r#"𝒞"#, r#"𝒞"#, r#"C"#, r#"C"#),
+        (r#"𝒟"#, r#"𝒟"#, r#"𝒟"#, r#"D"#, r#"D"#),
+        (r#"𝒢"#, r#"𝒢"#, r#"𝒢"#, r#"G"#, r#"G"#),
+        (r#"𝒥"#, r#"𝒥"#, r#"𝒥"#, r#"J"#, r#"J"#),
+        (r#"𝒦"#, r#"𝒦"#, r#"𝒦"#, r#"K"#, r#"K"#),
+        (r#"𝒩"#, r#"𝒩"#, r#"𝒩"#, r#"N"#, r#"N"#),
+        (r#"𝒪"#, r#"𝒪"#, r#"𝒪"#, r#"O"#, r#"O"#),
+        (r#"𝒫"#, r#"𝒫"#, r#"𝒫"#, r#"P"#, r#"P"#),
+        (r#"𝒬"#, r#"𝒬"#, r#"𝒬"#, r#"Q"#, r#"Q"#),
+        (r#"𝒮"#, r#"𝒮"#, r#"𝒮"#, r#"S"#, r#"S"#),
+        (r#"𝒯"#, r#"𝒯"#, r#"𝒯"#, r#"T"#, r#"T"#),
+        (r#"𝒰"#, r#"𝒰"#, r#"𝒰"#, r#"U"#, r#"U"#),
+        (r#"𝒱"#, r#"𝒱"#, r#"𝒱"#, r#"V"#, r#"V"#),
+        (r#"𝒲"#, r#"𝒲"#, r#"𝒲"#, r#"W"#, r#"W"#),
+        (r#"𝒳"#, r#"𝒳"#, r#"𝒳"#, r#"X"#, r#"X"#),
+        (r#"𝒴"#, r#"𝒴"#, r#"𝒴"#, r#"Y"#, r#"Y"#),
+        (r#"𝒵"#, r#"𝒵"#, r#"𝒵"#, r#"Z"#, r#"Z"#),
+        (r#"𝒶"#, r#"𝒶"#, r#"𝒶"#, r#"a"#, r#"a"#),
+        (r#"𝒷"#, r#"𝒷"#, r#"𝒷"#, r#"b"#, r#"b"#),
+        (r#"𝒸"#, r#"𝒸"#, r#"𝒸"#, r#"c"#, r#"c"#),
+        (r#"𝒹"#, r#"𝒹"#, r#"𝒹"#, r#"d"#, r#"d"#),
+        (r#"𝒻"#, r#"𝒻"#, r#"𝒻"#, r#"f"#, r#"f"#),
+        (r#"𝒽"#, r#"𝒽"#, r#"𝒽"#, r#"h"#, r#"h"#),
+        (r#"𝒾"#, r#"𝒾"#, r#"𝒾"#, r#"i"#, r#"i"#),
+        (r#"𝒿"#, r#"𝒿"#, r#"𝒿"#, r#"j"#, r#"j"#),
+        (r#"𝓀"#, r#"𝓀"#, r#"𝓀"#, r#"k"#, r#"k"#),
+        (r#"𝓁"#, r#"𝓁"#, r#"𝓁"#, r#"l"#, r#"l"#),
+        (r#"𝓂"#, r#"𝓂"#, r#"𝓂"#, r#"m"#, r#"m"#),
+        (r#"𝓃"#, r#"𝓃"#, r#"𝓃"#, r#"n"#, r#"n"#),
+        (r#"𝓅"#, r#"𝓅"#, r#"𝓅"#, r#"p"#, r#"p"#),
+        (r#"𝓆"#, r#"𝓆"#, r#"𝓆"#, r#"q"#, r#"q"#),
+        (r#"𝓇"#, r#"𝓇"#, r#"𝓇"#, r#"r"#, r#"r"#),
+        (r#"𝓈"#, r#"𝓈"#, r#"𝓈"#, r#"s"#, r#"s"#),
+        (r#"𝓉"#, r#"𝓉"#, r#"𝓉"#, r#"t"#, r#"t"#),
+        (r#"𝓊"#, r#"𝓊"#, r#"𝓊"#, r#"u"#, r#"u"#),
+        (r#"𝓋"#, r#"𝓋"#, r#"𝓋"#, r#"v"#, r#"v"#),
+        (r#"𝓌"#, r#"𝓌"#, r#"𝓌"#, r#"w"#, r#"w"#),
+        (r#"𝓍"#, r#"𝓍"#, r#"𝓍"#, r#"x"#, r#"x"#),
+        (r#"𝓎"#, r#"𝓎"#, r#"𝓎"#, r#"y"#, r#"y"#),
+        (r#"𝓏"#, r#"𝓏"#, r#"𝓏"#, r#"z"#, r#"z"#),
+        (r#"𝓐"#, r#"𝓐"#, r#"𝓐"#, r#"A"#, r#"A"#),
+        (r#"𝓑"#, r#"𝓑"#, r#"𝓑"#, r#"B"#, r#"B"#),
+        (r#"𝓒"#, r#"𝓒"#, r#"𝓒"#, r#"C"#, r#"C"#),
+        (r#"𝓓"#, r#"𝓓"#, r#"𝓓"#, r#"D"#, r#"D"#),
+        (r#"𝓔"#, r#"𝓔"#, r#"𝓔"#, r#"E"#, r#"E"#),
+        (r#"𝓕"#, r#"𝓕"#, r#"𝓕"#, r#"F"#, r#"F"#),
+        (r#"𝓖"#, r#"𝓖"#, r#"𝓖"#, r#"G"#, r#"G"#),
+        (r#"𝓗"#, r#"𝓗"#, r#"𝓗"#, r#"H"#, r#"H"#),
+        (r#"𝓘"#, r#"𝓘"#, r#"𝓘"#, r#"I"#, r#"I"#),
+        (r#"𝓙"#, r#"𝓙"#, r#"𝓙"#, r#"J"#, r#"J"#),
+        (r#"𝓚"#, r#"𝓚"#, r#"𝓚"#, r#"K"#, r#"K"#),
+        (r#"𝓛"#, r#"𝓛"#, r#"𝓛"#, r#"L"#, r#"L"#),
+        (r#"𝓜"#, r#"𝓜"#, r#"𝓜"#, r#"M"#, r#"M"#),
+        (r#"𝓝"#, r#"𝓝"#, r#"𝓝"#, r#"N"#, r#"N"#),
+        (r#"𝓞"#, r#"𝓞"#, r#"𝓞"#, r#"O"#, r#"O"#),
+        (r#"𝓟"#, r#"𝓟"#, r#"𝓟"#, r#"P"#, r#"P"#),
+        (r#"𝓠"#, r#"𝓠"#, r#"𝓠"#, r#"Q"#, r#"Q"#),
+        (r#"𝓡"#, r#"𝓡"#, r#"𝓡"#, r#"R"#, r#"R"#),
+        (r#"𝓢"#, r#"𝓢"#, r#"𝓢"#, r#"S"#, r#"S"#),
+        (r#"𝓣"#, r#"𝓣"#, r#"𝓣"#, r#"T"#, r#"T"#),
+        (r#"𝓤"#, r#"𝓤"#, r#"𝓤"#, r#"U"#, r#"U"#),
+        (r#"𝓥"#, r#"𝓥"#, r#"𝓥"#, r#"V"#, r#"V"#),
+        (r#"𝓦"#, r#"𝓦"#, r#"𝓦"#, r#"W"#, r#"W"#),
+        (r#"𝓧"#, r#"𝓧"#, r#"𝓧"#, r#"X"#, r#"X"#),
+        (r#"𝓨"#, r#"𝓨"#, r#"𝓨"#, r#"Y"#, r#"Y"#),
+        (r#"𝓩"#, r#"𝓩"#, r#"𝓩"#, r#"Z"#, r#"Z"#),
+        (r#"𝓪"#, r#"𝓪"#, r#"𝓪"#, r#"a"#, r#"a"#),
+        (r#"𝓫"#, r#"𝓫"#, r#"𝓫"#, r#"b"#, r#"b"#),
+        (r#"𝓬"#, r#"𝓬"#, r#"𝓬"#, r#"c"#, r#"c"#),
+        (r#"𝓭"#, r#"𝓭"#, r#"𝓭"#, r#"d"#, r#"d"#),
+        (r#"𝓮"#, r#"𝓮"#, r#"𝓮"#, r#"e"#, r#"e"#),
+        (r#"𝓯"#, r#"𝓯"#, r#"𝓯"#, r#"f"#, r#"f"#),
+        (r#"𝓰"#, r#"𝓰"#, r#"𝓰"#, r#"g"#, r#"g"#),
+        (r#"𝓱"#, r#"𝓱"#, r#"𝓱"#, r#"h"#, r#"h"#),
+        (r#"𝓲"#, r#"𝓲"#, r#"𝓲"#, r#"i"#, r#"i"#),
+        (r#"𝓳"#, r#"𝓳"#, r#"𝓳"#, r#"j"#, r#"j"#),
+        (r#"𝓴"#, r#"𝓴"#, r#"𝓴"#, r#"k"#, r#"k"#),
+        (r#"𝓵"#, r#"𝓵"#, r#"𝓵"#, r#"l"#, r#"l"#),
+        (r#"𝓶"#, r#"𝓶"#, r#"𝓶"#, r#"m"#, r#"m"#),
+        (r#"𝓷"#, r#"𝓷"#, r#"𝓷"#, r#"n"#, r#"n"#),
+        (r#"𝓸"#, r#"𝓸"#, r#"𝓸"#, r#"o"#, r#"o"#),
+        (r#"𝓹"#, r#"𝓹"#, r#"𝓹"#, r#"p"#, r#"p"#),
+        (r#"𝓺"#, r#"𝓺"#, r#"𝓺"#, r#"q"#, r#"q"#),
+        (r#"𝓻"#, r#"𝓻"#, r#"𝓻"#, r#"r"#, r#"r"#),
+        (r#"𝓼"#, r#"𝓼"#, r#"𝓼"#, r#"s"#, r#"s"#),
+        (r#"𝓽"#, r#"𝓽"#, r#"𝓽"#, r#"t"#, r#"t"#),
+        (r#"𝓾"#, r#"𝓾"#, r#"𝓾"#, r#"u"#, r#"u"#),
+        (r#"𝓿"#, r#"𝓿"#, r#"𝓿"#, r#"v"#, r#"v"#),
+        (r#"𝔀"#, r#"𝔀"#, r#"𝔀"#, r#"w"#, r#"w"#),
+        (r#"𝔁"#, r#"𝔁"#, r#"𝔁"#, r#"x"#, r#"x"#),
+        (r#"𝔂"#, r#"𝔂"#, r#"𝔂"#, r#"y"#, r#"y"#),
+        (r#"𝔃"#, r#"𝔃"#, r#"𝔃"#, r#"z"#, r#"z"#),
+        (r#"𝔄"#, r#"𝔄"#, r#"𝔄"#, r#"A"#, r#"A"#),
+        (r#"𝔅"#, r#"𝔅"#, r#"𝔅"#, r#"B"#, r#"B"#),
+        (r#"𝔇"#, r#"𝔇"#, r#"𝔇"#, r#"D"#, r#"D"#),
+        (r#"𝔈"#, r#"𝔈"#, r#"𝔈"#, r#"E"#, r#"E"#),
+        (r#"𝔉"#, r#"𝔉"#, r#"𝔉"#, r#"F"#, r#"F"#),
+        (r#"𝔊"#, r#"𝔊"#, r#"𝔊"#, r#"G"#, r#"G"#),
+        (r#"𝔍"#, r#"𝔍"#, r#"𝔍"#, r#"J"#, r#"J"#),
+        (r#"𝔎"#, r#"𝔎"#, r#"𝔎"#, r#"K"#, r#"K"#),
+        (r#"𝔏"#, r#"𝔏"#, r#"𝔏"#, r#"L"#, r#"L"#),
+        (r#"𝔐"#, r#"𝔐"#, r#"𝔐"#, r#"M"#, r#"M"#),
+        (r#"𝔑"#, r#"𝔑"#, r#"𝔑"#, r#"N"#, r#"N"#),
+        (r#"𝔒"#, r#"𝔒"#, r#"𝔒"#, r#"O"#, r#"O"#),
+        (r#"𝔓"#, r#"𝔓"#, r#"𝔓"#, r#"P"#, r#"P"#),
+        (r#"𝔔"#, r#"𝔔"#, r#"𝔔"#, r#"Q"#, r#"Q"#),
+        (r#"𝔖"#, r#"𝔖"#, r#"𝔖"#, r#"S"#, r#"S"#),
+        (r#"𝔗"#, r#"𝔗"#, r#"𝔗"#, r#"T"#, r#"T"#),
+        (r#"𝔘"#, r#"𝔘"#, r#"𝔘"#, r#"U"#, r#"U"#),
+        (r#"𝔙"#, r#"𝔙"#, r#"𝔙"#, r#"V"#, r#"V"#),
+        (r#"𝔚"#, r#"𝔚"#, r#"𝔚"#, r#"W"#, r#"W"#),
+        (r#"𝔛"#, r#"𝔛"#, r#"𝔛"#, r#"X"#, r#"X"#),
+        (r#"𝔜"#, r#"𝔜"#, r#"𝔜"#, r#"Y"#, r#"Y"#),
+        (r#"𝔞"#, r#"𝔞"#, r#"𝔞"#, r#"a"#, r#"a"#),
+        (r#"𝔟"#, r#"𝔟"#, r#"𝔟"#, r#"b"#, r#"b"#),
+        (r#"𝔠"#, r#"𝔠"#, r#"𝔠"#, r#"c"#, r#"c"#),
+        (r#"𝔡"#, r#"𝔡"#, r#"𝔡"#, r#"d"#, r#"d"#),
+        (r#"𝔢"#, r#"𝔢"#, r#"𝔢"#, r#"e"#, r#"e"#),
+        (r#"𝔣"#, r#"𝔣"#, r#"𝔣"#, r#"f"#, r#"f"#),
+        (r#"𝔤"#, r#"𝔤"#, r#"𝔤"#, r#"g"#, r#"g"#),
+        (r#"𝔥"#, r#"𝔥"#, r#"𝔥"#, r#"h"#, r#"h"#),
+        (r#"𝔦"#, r#"𝔦"#, r#"𝔦"#, r#"i"#, r#"i"#),
+        (r#"𝔧"#, r#"𝔧"#, r#"𝔧"#, r#"j"#, r#"j"#),
+        (r#"𝔨"#, r#"𝔨"#, r#"𝔨"#, r#"k"#, r#"k"#),
+        (r#"𝔩"#, r#"𝔩"#, r#"𝔩"#, r#"l"#, r#"l"#),
+        (r#"𝔪"#, r#"𝔪"#, r#"𝔪"#, r#"m"#, r#"m"#),
+        (r#"𝔫"#, r#"𝔫"#, r#"𝔫"#, r#"n"#, r#"n"#),
+        (r#"𝔬"#, r#"𝔬"#, r#"𝔬"#, r#"o"#, r#"o"#),
+        (r#"𝔭"#, r#"𝔭"#, r#"𝔭"#, r#"p"#, r#"p"#),
+        (r#"𝔮"#, r#"𝔮"#, r#"𝔮"#, r#"q"#, r#"q"#),
+        (r#"𝔯"#, r#"𝔯"#, r#"𝔯"#, r#"r"#, r#"r"#),
+        (r#"𝔰"#, r#"𝔰"#, r#"𝔰"#, r#"s"#, r#"s"#),
+        (r#"𝔱"#, r#"𝔱"#, r#"𝔱"#, r#"t"#, r#"t"#),
+        (r#"𝔲"#, r#"𝔲"#, r#"𝔲"#, r#"u"#, r#"u"#),
+        (r#"𝔳"#, r#"𝔳"#, r#"𝔳"#, r#"v"#, r#"v"#),
+        (r#"𝔴"#, r#"𝔴"#, r#"𝔴"#, r#"w"#, r#"w"#),
+        (r#"𝔵"#, r#"𝔵"#, r#"𝔵"#, r#"x"#, r#"x"#),
+        (r#"𝔶"#, r#"𝔶"#, r#"𝔶"#, r#"y"#, r#"y"#),
+        (r#"𝔷"#, r#"𝔷"#, r#"𝔷"#, r#"z"#, r#"z"#),
+        (r#"𝔸"#, r#"𝔸"#, r#"𝔸"#, r#"A"#, r#"A"#),
+        (r#"𝔹"#, r#"𝔹"#, r#"𝔹"#, r#"B"#, r#"B"#),
+        (r#"𝔻"#, r#"𝔻"#, r#"𝔻"#, r#"D"#, r#"D"#),
+        (r#"𝔼"#, r#"𝔼"#, r#"𝔼"#, r#"E"#, r#"E"#),
+        (r#"𝔽"#, r#"𝔽"#, r#"𝔽"#, r#"F"#, r#"F"#),
+        (r#"𝔾"#, r#"𝔾"#, r#"𝔾"#, r#"G"#, r#"G"#),
+        (r#"𝕀"#, r#"𝕀"#, r#"𝕀"#, r#"I"#, r#"I"#),
+        (r#"𝕁"#, r#"𝕁"#, r#"𝕁"#, r#"J"#, r#"J"#),
+        (r#"𝕂"#, r#"𝕂"#, r#"𝕂"#, r#"K"#, r#"K"#),
+        (r#"𝕃"#, r#"𝕃"#, r#"𝕃"#, r#"L"#, r#"L"#),
+        (r#"𝕄"#, r#"𝕄"#, r#"𝕄"#, r#"M"#, r#"M"#),
+        (r#"𝕆"#, r#"𝕆"#, r#"𝕆"#, r#"O"#, r#"O"#),
+        (r#"𝕊"#, r#"𝕊"#, r#"𝕊"#, r#"S"#, r#"S"#),
+        (r#"𝕋"#, r#"𝕋"#, r#"𝕋"#, r#"T"#, r#"T"#),
+        (r#"𝕌"#, r#"𝕌"#, r#"𝕌"#, r#"U"#, r#"U"#),
+        (r#"𝕍"#, r#"𝕍"#, r#"𝕍"#, r#"V"#, r#"V"#),
+        (r#"𝕎"#, r#"𝕎"#, r#"𝕎"#, r#"W"#, r#"W"#),
+        (r#"𝕏"#, r#"𝕏"#, r#"𝕏"#, r#"X"#, r#"X"#),
+        (r#"𝕐"#, r#"𝕐"#, r#"𝕐"#, r#"Y"#, r#"Y"#),
+        (r#"𝕒"#, r#"𝕒"#, r#"𝕒"#, r#"a"#, r#"a"#),
+        (r#"𝕓"#, r#"𝕓"#, r#"𝕓"#, r#"b"#, r#"b"#),
+        (r#"𝕔"#, r#"𝕔"#, r#"𝕔"#, r#"c"#, r#"c"#),
+        (r#"𝕕"#, r#"𝕕"#, r#"𝕕"#, r#"d"#, r#"d"#),
+        (r#"𝕖"#, r#"𝕖"#, r#"𝕖"#, r#"e"#, r#"e"#),
+        (r#"𝕗"#, r#"𝕗"#, r#"𝕗"#, r#"f"#, r#"f"#),
+        (r#"𝕘"#, r#"𝕘"#, r#"𝕘"#, r#"g"#, r#"g"#),
+        (r#"𝕙"#, r#"𝕙"#, r#"𝕙"#, r#"h"#, r#"h"#),
+        (r#"𝕚"#, r#"𝕚"#, r#"𝕚"#, r#"i"#, r#"i"#),
+        (r#"𝕛"#, r#"𝕛"#, r#"𝕛"#, r#"j"#, r#"j"#),
+        (r#"𝕜"#, r#"𝕜"#, r#"𝕜"#, r#"k"#, r#"k"#),
+        (r#"𝕝"#, r#"𝕝"#, r#"𝕝"#, r#"l"#, r#"l"#),
+        (r#"𝕞"#, r#"𝕞"#, r#"𝕞"#, r#"m"#, r#"m"#),
+        (r#"𝕟"#, r#"𝕟"#, r#"𝕟"#, r#"n"#, r#"n"#),
+        (r#"𝕠"#, r#"𝕠"#, r#"𝕠"#, r#"o"#, r#"o"#),
+        (r#"𝕡"#, r#"𝕡"#, r#"𝕡"#, r#"p"#, r#"p"#),
+        (r#"𝕢"#, r#"𝕢"#, r#"𝕢"#, r#"q"#, r#"q"#),
+        (r#"𝕣"#, r#"𝕣"#, r#"𝕣"#, r#"r"#, r#"r"#),
+        (r#"𝕤"#, r#"𝕤"#, r#"𝕤"#, r#"s"#, r#"s"#),
+        (r#"𝕥"#, r#"𝕥"#, r#"𝕥"#, r#"t"#, r#"t"#),
+        (r#"𝕦"#, r#"𝕦"#, r#"𝕦"#, r#"u"#, r#"u"#),
+        (r#"𝕧"#, r#"𝕧"#, r#"𝕧"#, r#"v"#, r#"v"#),
+        (r#"𝕨"#, r#"𝕨"#, r#"𝕨"#, r#"w"#, r#"w"#),
+        (r#"𝕩"#, r#"𝕩"#, r#"𝕩"#, r#"x"#, r#"x"#),
+        (r#"𝕪"#, r#"𝕪"#, r#"𝕪"#, r#"y"#, r#"y"#),
+        (r#"𝕫"#, r#"𝕫"#, r#"𝕫"#, r#"z"#, r#"z"#),
+        (r#"𝕬"#, r#"𝕬"#, r#"𝕬"#, r#"A"#, r#"A"#),
+        (r#"𝕭"#, r#"𝕭"#, r#"𝕭"#, r#"B"#, r#"B"#),
+        (r#"𝕮"#, r#"𝕮"#, r#"𝕮"#, r#"C"#, r#"C"#),
+        (r#"𝕯"#, r#"𝕯"#, r#"𝕯"#, r#"D"#, r#"D"#),
+        (r#"𝕰"#, r#"𝕰"#, r#"𝕰"#, r#"E"#, r#"E"#),
+        (r#"𝕱"#, r#"𝕱"#, r#"𝕱"#, r#"F"#, r#"F"#),
+        (r#"𝕲"#, r#"𝕲"#, r#"𝕲"#, r#"G"#, r#"G"#),
+        (r#"𝕳"#, r#"𝕳"#, r#"𝕳"#, r#"H"#, r#"H"#),
+        (r#"𝕴"#, r#"𝕴"#, r#"𝕴"#, r#"I"#, r#"I"#),
+        (r#"𝕵"#, r#"𝕵"#, r#"𝕵"#, r#"J"#, r#"J"#),
+        (r#"𝕶"#, r#"𝕶"#, r#"𝕶"#, r#"K"#, r#"K"#),
+        (r#"𝕷"#, r#"𝕷"#, r#"𝕷"#, r#"L"#, r#"L"#),
+        (r#"𝕸"#, r#"𝕸"#, r#"𝕸"#, r#"M"#, r#"M"#),
+        (r#"𝕹"#, r#"𝕹"#, r#"𝕹"#, r#"N"#, r#"N"#),
+        (r#"𝕺"#, r#"𝕺"#, r#"𝕺"#, r#"O"#, r#"O"#),
+        (r#"𝕻"#, r#"𝕻"#, r#"𝕻"#, r#"P"#, r#"P"#),
+        (r#"𝕼"#, r#"𝕼"#, r#"𝕼"#, r#"Q"#, r#"Q"#),
+        (r#"𝕽"#, r#"𝕽"#, r#"𝕽"#, r#"R"#, r#"R"#),
+        (r#"𝕾"#, r#"𝕾"#, r#"𝕾"#, r#"S"#, r#"S"#),
+        (r#"𝕿"#, r#"𝕿"#, r#"𝕿"#, r#"T"#, r#"T"#),
+        (r#"𝖀"#, r#"𝖀"#, r#"𝖀"#, r#"U"#, r#"U"#),
+        (r#"𝖁"#, r#"𝖁"#, r#"𝖁"#, r#"V"#, r#"V"#),
+        (r#"𝖂"#, r#"𝖂"#, r#"𝖂"#, r#"W"#, r#"W"#),
+        (r#"𝖃"#, r#"𝖃"#, r#"𝖃"#, r#"X"#, r#"X"#),
+        (r#"𝖄"#, r#"𝖄"#, r#"𝖄"#, r#"Y"#, r#"Y"#),
+        (r#"𝖅"#, r#"𝖅"#, r#"𝖅"#, r#"Z"#, r#"Z"#),
+        (r#"𝖆"#, r#"𝖆"#, r#"𝖆"#, r#"a"#, r#"a"#),
+        (r#"𝖇"#, r#"𝖇"#, r#"𝖇"#, r#"b"#, r#"b"#),
+        (r#"𝖈"#, r#"𝖈"#, r#"𝖈"#, r#"c"#, r#"c"#),
+        (r#"𝖉"#, r#"𝖉"#, r#"𝖉"#, r#"d"#, r#"d"#),
+        (r#"𝖊"#, r#"𝖊"#, r#"𝖊"#, r#"e"#, r#"e"#),
+        (r#"𝖋"#, r#"𝖋"#, r#"𝖋"#, r#"f"#, r#"f"#),
+        (r#"𝖌"#, r#"𝖌"#, r#"𝖌"#, r#"g"#, r#"g"#),
+        (r#"𝖍"#, r#"𝖍"#, r#"𝖍"#, r#"h"#, r#"h"#),
+        (r#"𝖎"#, r#"𝖎"#, r#"𝖎"#, r#"i"#, r#"i"#),
+        (r#"𝖏"#, r#"𝖏"#, r#"𝖏"#, r#"j"#, r#"j"#),
+        (r#"𝖐"#, r#"𝖐"#, r#"𝖐"#, r#"k"#, r#"k"#),
+        (r#"𝖑"#, r#"𝖑"#, r#"𝖑"#, r#"l"#, r#"l"#),
+        (r#"𝖒"#, r#"𝖒"#, r#"𝖒"#, r#"m"#, r#"m"#),
+        (r#"𝖓"#, r#"𝖓"#, r#"𝖓"#, r#"n"#, r#"n"#),
+        (r#"𝖔"#, r#"𝖔"#, r#"𝖔"#, r#"o"#, r#"o"#),
+        (r#"𝖕"#, r#"𝖕"#, r#"𝖕"#, r#"p"#, r#"p"#),
+        (r#"𝖖"#, r#"𝖖"#, r#"𝖖"#, r#"q"#, r#"q"#),
+        (r#"𝖗"#, r#"𝖗"#, r#"𝖗"#, r#"r"#, r#"r"#),
+        (r#"𝖘"#, r#"𝖘"#, r#"𝖘"#, r#"s"#, r#"s"#),
+        (r#"𝖙"#, r#"𝖙"#, r#"𝖙"#, r#"t"#, r#"t"#),
+        (r#"𝖚"#, r#"𝖚"#, r#"𝖚"#, r#"u"#, r#"u"#),
+        (r#"𝖛"#, r#"𝖛"#, r#"𝖛"#, r#"v"#, r#"v"#),
+        (r#"𝖜"#, r#"𝖜"#, r#"𝖜"#, r#"w"#, r#"w"#),
+        (r#"𝖝"#, r#"𝖝"#, r#"𝖝"#, r#"x"#, r#"x"#),
+        (r#"𝖞"#, r#"𝖞"#, r#"𝖞"#, r#"y"#, r#"y"#),
+        (r#"𝖟"#, r#"𝖟"#, r#"𝖟"#, r#"z"#, r#"z"#),
+        (r#"𝖠"#, r#"𝖠"#, r#"𝖠"#, r#"A"#, r#"A"#),
+        (r#"𝖡"#, r#"𝖡"#, r#"𝖡"#, r#"B"#, r#"B"#),
+        (r#"𝖢"#, r#"𝖢"#, r#"𝖢"#, r#"C"#, r#"C"#),
+        (r#"𝖣"#, r#"𝖣"#, r#"𝖣"#, r#"D"#, r#"D"#),
+        (r#"𝖤"#, r#"𝖤"#, r#"𝖤"#, r#"E"#, r#"E"#),
+        (r#"𝖥"#, r#"𝖥"#, r#"𝖥"#, r#"F"#, r#"F"#),
+        (r#"𝖦"#, r#"𝖦"#, r#"𝖦"#, r#"G"#, r#"G"#),
+        (r#"𝖧"#, r#"𝖧"#, r#"𝖧"#, r#"H"#, r#"H"#),
+        (r#"𝖨"#, r#"𝖨"#, r#"𝖨"#, r#"I"#, r#"I"#),
+        (r#"𝖩"#, r#"𝖩"#, r#"𝖩"#, r#"J"#, r#"J"#),
+        (r#"𝖪"#, r#"𝖪"#, r#"𝖪"#, r#"K"#, r#"K"#),
+        (r#"𝖫"#, r#"𝖫"#, r#"𝖫"#, r#"L"#, r#"L"#),
+        (r#"𝖬"#, r#"𝖬"#, r#"𝖬"#, r#"M"#, r#"M"#),
+        (r#"𝖭"#, r#"𝖭"#, r#"𝖭"#, r#"N"#, r#"N"#),
+        (r#"𝖮"#, r#"𝖮"#, r#"𝖮"#, r#"O"#, r#"O"#),
+        (r#"𝖯"#, r#"𝖯"#, r#"𝖯"#, r#"P"#, r#"P"#),
+        (r#"𝖰"#, r#"𝖰"#, r#"𝖰"#, r#"Q"#, r#"Q"#),
+        (r#"𝖱"#, r#"𝖱"#, r#"𝖱"#, r#"R"#, r#"R"#),
+        (r#"𝖲"#, r#"𝖲"#, r#"𝖲"#, r#"S"#, r#"S"#),
+        (r#"𝖳"#, r#"𝖳"#, r#"𝖳"#, r#"T"#, r#"T"#),
+        (r#"𝖴"#, r#"𝖴"#, r#"𝖴"#, r#"U"#, r#"U"#),
+        (r#"𝖵"#, r#"𝖵"#, r#"𝖵"#, r#"V"#, r#"V"#),
+        (r#"𝖶"#, r#"𝖶"#, r#"𝖶"#, r#"W"#, r#"W"#),
+        (r#"𝖷"#, r#"𝖷"#, r#"𝖷"#, r#"X"#, r#"X"#),
+        (r#"𝖸"#, r#"𝖸"#, r#"𝖸"#, r#"Y"#, r#"Y"#),
+        (r#"𝖹"#, r#"𝖹"#, r#"𝖹"#, r#"Z"#, r#"Z"#),
+        (r#"𝖺"#, r#"𝖺"#, r#"𝖺"#, r#"a"#, r#"a"#),
+        (r#"𝖻"#, r#"𝖻"#, r#"𝖻"#, r#"b"#, r#"b"#),
+        (r#"𝖼"#, r#"𝖼"#, r#"𝖼"#, r#"c"#, r#"c"#),
+        (r#"𝖽"#, r#"𝖽"#, r#"𝖽"#, r#"d"#, r#"d"#),
+        (r#"𝖾"#, r#"𝖾"#, r#"𝖾"#, r#"e"#, r#"e"#),
+        (r#"𝖿"#, r#"𝖿"#, r#"𝖿"#, r#"f"#, r#"f"#),
+        (r#"𝗀"#, r#"𝗀"#, r#"𝗀"#, r#"g"#, r#"g"#),
+        (r#"𝗁"#, r#"𝗁"#, r#"𝗁"#, r#"h"#, r#"h"#),
+        (r#"𝗂"#, r#"𝗂"#, r#"𝗂"#, r#"i"#, r#"i"#),
+        (r#"𝗃"#, r#"𝗃"#, r#"𝗃"#, r#"j"#, r#"j"#),
+        (r#"𝗄"#, r#"𝗄"#, r#"𝗄"#, r#"k"#, r#"k"#),
+        (r#"𝗅"#, r#"𝗅"#, r#"𝗅"#, r#"l"#, r#"l"#),
+        (r#"𝗆"#, r#"𝗆"#, r#"𝗆"#, r#"m"#, r#"m"#),
+        (r#"𝗇"#, r#"𝗇"#, r#"𝗇"#, r#"n"#, r#"n"#),
+        (r#"𝗈"#, r#"𝗈"#, r#"𝗈"#, r#"o"#, r#"o"#),
+        (r#"𝗉"#, r#"𝗉"#, r#"𝗉"#, r#"p"#, r#"p"#),
+        (r#"𝗊"#, r#"𝗊"#, r#"𝗊"#, r#"q"#, r#"q"#),
+        (r#"𝗋"#, r#"𝗋"#, r#"𝗋"#, r#"r"#, r#"r"#),
+        (r#"𝗌"#, r#"𝗌"#, r#"𝗌"#, r#"s"#, r#"s"#),
+        (r#"𝗍"#, r#"𝗍"#, r#"𝗍"#, r#"t"#, r#"t"#),
+        (r#"𝗎"#, r#"𝗎"#, r#"𝗎"#, r#"u"#, r#"u"#),
+        (r#"𝗏"#, r#"𝗏"#, r#"𝗏"#, r#"v"#, r#"v"#),
+        (r#"𝗐"#, r#"𝗐"#, r#"𝗐"#, r#"w"#, r#"w"#),
+        (r#"𝗑"#, r#"𝗑"#, r#"𝗑"#, r#"x"#, r#"x"#),
+        (r#"𝗒"#, r#"𝗒"#, r#"𝗒"#, r#"y"#, r#"y"#),
+        (r#"𝗓"#, r#"𝗓"#, r#"𝗓"#, r#"z"#, r#"z"#),
+        (r#"𝗔"#, r#"𝗔"#, r#"𝗔"#, r#"A"#, r#"A"#),
+        (r#"𝗕"#, r#"𝗕"#, r#"𝗕"#, r#"B"#, r#"B"#),
+        (r#"𝗖"#, r#"𝗖"#, r#"𝗖"#, r#"C"#, r#"C"#),
+        (r#"𝗗"#, r#"𝗗"#, r#"𝗗"#, r#"D"#, r#"D"#),
+        (r#"𝗘"#, r#"𝗘"#, r#"𝗘"#, r#"E"#, r#"E"#),
+        (r#"𝗙"#, r#"𝗙"#, r#"𝗙"#, r#"F"#, r#"F"#),
+        (r#"𝗚"#, r#"𝗚"#, r#"𝗚"#, r#"G"#, r#"G"#),
+        (r#"𝗛"#, r#"𝗛"#, r#"𝗛"#, r#"H"#, r#"H"#),
+        (r#"𝗜"#, r#"𝗜"#, r#"𝗜"#, r#"I"#, r#"I"#),
+        (r#"𝗝"#, r#"𝗝"#, r#"𝗝"#, r#"J"#, r#"J"#),
+        (r#"𝗞"#, r#"𝗞"#, r#"𝗞"#, r#"K"#, r#"K"#),
+        (r#"𝗟"#, r#"𝗟"#, r#"𝗟"#, r#"L"#, r#"L"#),
+        (r#"𝗠"#, r#"𝗠"#, r#"𝗠"#, r#"M"#, r#"M"#),
+        (r#"𝗡"#, r#"𝗡"#, r#"𝗡"#, r#"N"#, r#"N"#),
+        (r#"𝗢"#, r#"𝗢"#, r#"𝗢"#, r#"O"#, r#"O"#),
+        (r#"𝗣"#, r#"𝗣"#, r#"𝗣"#, r#"P"#, r#"P"#),
+        (r#"𝗤"#, r#"𝗤"#, r#"𝗤"#, r#"Q"#, r#"Q"#),
+        (r#"𝗥"#, r#"𝗥"#, r#"𝗥"#, r#"R"#, r#"R"#),
+        (r#"𝗦"#, r#"𝗦"#, r#"𝗦"#, r#"S"#, r#"S"#),
+        (r#"𝗧"#, r#"𝗧"#, r#"𝗧"#, r#"T"#, r#"T"#),
+        (r#"𝗨"#, r#"𝗨"#, r#"𝗨"#, r#"U"#, r#"U"#),
+        (r#"𝗩"#, r#"𝗩"#, r#"𝗩"#, r#"V"#, r#"V"#),
+        (r#"𝗪"#, r#"𝗪"#, r#"𝗪"#, r#"W"#, r#"W"#),
+        (r#"𝗫"#, r#"𝗫"#, r#"𝗫"#, r#"X"#, r#"X"#),
+        (r#"𝗬"#, r#"𝗬"#, r#"𝗬"#, r#"Y"#, r#"Y"#),
+        (r#"𝗭"#, r#"𝗭"#, r#"𝗭"#, r#"Z"#, r#"Z"#),
+        (r#"𝗮"#, r#"𝗮"#, r#"𝗮"#, r#"a"#, r#"a"#),
+        (r#"𝗯"#, r#"𝗯"#, r#"𝗯"#, r#"b"#, r#"b"#),
+        (r#"𝗰"#, r#"𝗰"#, r#"𝗰"#, r#"c"#, r#"c"#),
+        (r#"𝗱"#, r#"𝗱"#, r#"𝗱"#, r#"d"#, r#"d"#),
+        (r#"𝗲"#, r#"𝗲"#, r#"𝗲"#, r#"e"#, r#"e"#),
+        (r#"𝗳"#, r#"𝗳"#, r#"𝗳"#, r#"f"#, r#"f"#),
+        (r#"𝗴"#, r#"𝗴"#, r#"𝗴"#, r#"g"#, r#"g"#),
+        (r#"𝗵"#, r#"𝗵"#, r#"𝗵"#, r#"h"#, r#"h"#),
+        (r#"𝗶"#, r#"𝗶"#, r#"𝗶"#, r#"i"#, r#"i"#),
+        (r#"𝗷"#, r#"𝗷"#, r#"𝗷"#, r#"j"#, r#"j"#),
+        (r#"𝗸"#, r#"𝗸"#, r#"𝗸"#, r#"k"#, r#"k"#),
+        (r#"𝗹"#, r#"𝗹"#, r#"𝗹"#, r#"l"#, r#"l"#),
+        (r#"𝗺"#, r#"𝗺"#, r#"𝗺"#, r#"m"#, r#"m"#),
+        (r#"𝗻"#, r#"𝗻"#, r#"𝗻"#, r#"n"#, r#"n"#),
+        (r#"𝗼"#, r#"𝗼"#, r#"𝗼"#, r#"o"#, r#"o"#),
+        (r#"𝗽"#, r#"𝗽"#, r#"𝗽"#, r#"p"#, r#"p"#),
+        (r#"𝗾"#, r#"𝗾"#, r#"𝗾"#, r#"q"#, r#"q"#),
+        (r#"𝗿"#, r#"𝗿"#, r#"𝗿"#, r#"r"#, r#"r"#),
+        (r#"𝘀"#, r#"𝘀"#, r#"𝘀"#, r#"s"#, r#"s"#),
+        (r#"𝘁"#, r#"𝘁"#, r#"𝘁"#, r#"t"#, r#"t"#),
+        (r#"𝘂"#, r#"𝘂"#, r#"𝘂"#, r#"u"#, r#"u"#),
+        (r#"𝘃"#, r#"𝘃"#, r#"𝘃"#, r#"v"#, r#"v"#),
+        (r#"𝘄"#, r#"𝘄"#, r#"𝘄"#, r#"w"#, r#"w"#),
+        (r#"𝘅"#, r#"𝘅"#, r#"𝘅"#, r#"x"#, r#"x"#),
+        (r#"𝘆"#, r#"𝘆"#, r#"𝘆"#, r#"y"#, r#"y"#),
+        (r#"𝘇"#, r#"𝘇"#, r#"𝘇"#, r#"z"#, r#"z"#),
+        (r#"𝘈"#, r#"𝘈"#, r#"𝘈"#, r#"A"#, r#"A"#),
+        (r#"𝘉"#, r#"𝘉"#, r#"𝘉"#, r#"B"#, r#"B"#),
+        (r#"𝘊"#, r#"𝘊"#, r#"𝘊"#, r#"C"#, r#"C"#),
+        (r#"𝘋"#, r#"𝘋"#, r#"𝘋"#, r#"D"#, r#"D"#),
+        (r#"𝘌"#, r#"𝘌"#, r#"𝘌"#, r#"E"#, r#"E"#),
+        (r#"𝘍"#, r#"𝘍"#, r#"𝘍"#, r#"F"#, r#"F"#),
+        (r#"𝘎"#, r#"𝘎"#, r#"𝘎"#, r#"G"#, r#"G"#),
+        (r#"𝘏"#, r#"𝘏"#, r#"𝘏"#, r#"H"#, r#"H"#),
+        (r#"𝘐"#, r#"𝘐"#, r#"𝘐"#, r#"I"#, r#"I"#),
+        (r#"𝘑"#, r#"𝘑"#, r#"𝘑"#, r#"J"#, r#"J"#),
+        (r#"𝘒"#, r#"𝘒"#, r#"𝘒"#, r#"K"#, r#"K"#),
+        (r#"𝘓"#, r#"𝘓"#, r#"𝘓"#, r#"L"#, r#"L"#),
+        (r#"𝘔"#, r#"𝘔"#, r#"𝘔"#, r#"M"#, r#"M"#),
+        (r#"𝘕"#, r#"𝘕"#, r#"𝘕"#, r#"N"#, r#"N"#),
+        (r#"𝘖"#, r#"𝘖"#, r#"𝘖"#, r#"O"#, r#"O"#),
+        (r#"𝘗"#, r#"𝘗"#, r#"𝘗"#, r#"P"#, r#"P"#),
+        (r#"𝘘"#, r#"𝘘"#, r#"𝘘"#, r#"Q"#, r#"Q"#),
+        (r#"𝘙"#, r#"𝘙"#, r#"𝘙"#, r#"R"#, r#"R"#),
+        (r#"𝘚"#, r#"𝘚"#, r#"𝘚"#, r#"S"#, r#"S"#),
+        (r#"𝘛"#, r#"𝘛"#, r#"𝘛"#, r#"T"#, r#"T"#),
+        (r#"𝘜"#, r#"𝘜"#, r#"𝘜"#, r#"U"#, r#"U"#),
+        (r#"𝘝"#, r#"𝘝"#, r#"𝘝"#, r#"V"#, r#"V"#),
+        (r#"𝘞"#, r#"𝘞"#, r#"𝘞"#, r#"W"#, r#"W"#),
+        (r#"𝘟"#, r#"𝘟"#, r#"𝘟"#, r#"X"#, r#"X"#),
+        (r#"𝘠"#, r#"𝘠"#, r#"𝘠"#, r#"Y"#, r#"Y"#),
+        (r#"𝘡"#, r#"𝘡"#, r#"𝘡"#, r#"Z"#, r#"Z"#),
+        (r#"𝘢"#, r#"𝘢"#, r#"𝘢"#, r#"a"#, r#"a"#),
+        (r#"𝘣"#, r#"𝘣"#, r#"𝘣"#, r#"b"#, r#"b"#),
+        (r#"𝘤"#, r#"𝘤"#, r#"𝘤"#, r#"c"#, r#"c"#),
+        (r#"𝘥"#, r#"𝘥"#, r#"𝘥"#, r#"d"#, r#"d"#),
+        (r#"𝘦"#, r#"𝘦"#, r#"𝘦"#, r#"e"#, r#"e"#),
+        (r#"𝘧"#, r#"𝘧"#, r#"𝘧"#, r#"f"#, r#"f"#),
+        (r#"𝘨"#, r#"𝘨"#, r#"𝘨"#, r#"g"#, r#"g"#),
+        (r#"𝘩"#, r#"𝘩"#, r#"𝘩"#, r#"h"#, r#"h"#),
+        (r#"𝘪"#, r#"𝘪"#, r#"𝘪"#, r#"i"#, r#"i"#),
+        (r#"𝘫"#, r#"𝘫"#, r#"𝘫"#, r#"j"#, r#"j"#),
+        (r#"𝘬"#, r#"𝘬"#, r#"𝘬"#, r#"k"#, r#"k"#),
+        (r#"𝘭"#, r#"𝘭"#, r#"𝘭"#, r#"l"#, r#"l"#),
+        (r#"𝘮"#, r#"𝘮"#, r#"𝘮"#, r#"m"#, r#"m"#),
+        (r#"𝘯"#, r#"𝘯"#, r#"𝘯"#, r#"n"#, r#"n"#),
+        (r#"𝘰"#, r#"𝘰"#, r#"𝘰"#, r#"o"#, r#"o"#),
+        (r#"𝘱"#, r#"𝘱"#, r#"𝘱"#, r#"p"#, r#"p"#),
+        (r#"𝘲"#, r#"𝘲"#, r#"𝘲"#, r#"q"#, r#"q"#),
+        (r#"𝘳"#, r#"𝘳"#, r#"𝘳"#, r#"r"#, r#"r"#),
+        (r#"𝘴"#, r#"𝘴"#, r#"𝘴"#, r#"s"#, r#"s"#),
+        (r#"𝘵"#, r#"𝘵"#, r#"𝘵"#, r#"t"#, r#"t"#),
+        (r#"𝘶"#, r#"𝘶"#, r#"𝘶"#, r#"u"#, r#"u"#),
+        (r#"𝘷"#, r#"𝘷"#, r#"𝘷"#, r#"v"#, r#"v"#),
+        (r#"𝘸"#, r#"𝘸"#, r#"𝘸"#, r#"w"#, r#"w"#),
+        (r#"𝘹"#, r#"𝘹"#, r#"𝘹"#, r#"x"#, r#"x"#),
+        (r#"𝘺"#, r#"𝘺"#, r#"𝘺"#, r#"y"#, r#"y"#),
+        (r#"𝘻"#, r#"𝘻"#, r#"𝘻"#, r#"z"#, r#"z"#),
+        (r#"𝘼"#, r#"𝘼"#, r#"𝘼"#, r#"A"#, r#"A"#),
+        (r#"𝘽"#, r#"𝘽"#, r#"𝘽"#, r#"B"#, r#"B"#),
+        (r#"𝘾"#, r#"𝘾"#, r#"𝘾"#, r#"C"#, r#"C"#),
+        (r#"𝘿"#, r#"𝘿"#, r#"𝘿"#, r#"D"#, r#"D"#),
+        (r#"𝙀"#, r#"𝙀"#, r#"𝙀"#, r#"E"#, r#"E"#),
+        (r#"𝙁"#, r#"𝙁"#, r#"𝙁"#, r#"F"#, r#"F"#),
+        (r#"𝙂"#, r#"𝙂"#, r#"𝙂"#, r#"G"#, r#"G"#),
+        (r#"𝙃"#, r#"𝙃"#, r#"𝙃"#, r#"H"#, r#"H"#),
+        (r#"𝙄"#, r#"𝙄"#, r#"𝙄"#, r#"I"#, r#"I"#),
+        (r#"𝙅"#, r#"𝙅"#, r#"𝙅"#, r#"J"#, r#"J"#),
+        (r#"𝙆"#, r#"𝙆"#, r#"𝙆"#, r#"K"#, r#"K"#),
+        (r#"𝙇"#, r#"𝙇"#, r#"𝙇"#, r#"L"#, r#"L"#),
+        (r#"𝙈"#, r#"𝙈"#, r#"𝙈"#, r#"M"#, r#"M"#),
+        (r#"𝙉"#, r#"𝙉"#, r#"𝙉"#, r#"N"#, r#"N"#),
+        (r#"𝙊"#, r#"𝙊"#, r#"𝙊"#, r#"O"#, r#"O"#),
+        (r#"𝙋"#, r#"𝙋"#, r#"𝙋"#, r#"P"#, r#"P"#),
+        (r#"𝙌"#, r#"𝙌"#, r#"𝙌"#, r#"Q"#, r#"Q"#),
+        (r#"𝙍"#, r#"𝙍"#, r#"𝙍"#, r#"R"#, r#"R"#),
+        (r#"𝙎"#, r#"𝙎"#, r#"𝙎"#, r#"S"#, r#"S"#),
+        (r#"𝙏"#, r#"𝙏"#, r#"𝙏"#, r#"T"#, r#"T"#),
+        (r#"𝙐"#, r#"𝙐"#, r#"𝙐"#, r#"U"#, r#"U"#),
+        (r#"𝙑"#, r#"𝙑"#, r#"𝙑"#, r#"V"#, r#"V"#),
+        (r#"𝙒"#, r#"𝙒"#, r#"𝙒"#, r#"W"#, r#"W"#),
+        (r#"𝙓"#, r#"𝙓"#, r#"𝙓"#, r#"X"#, r#"X"#),
+        (r#"𝙔"#, r#"𝙔"#, r#"𝙔"#, r#"Y"#, r#"Y"#),
+        (r#"𝙕"#, r#"𝙕"#, r#"𝙕"#, r#"Z"#, r#"Z"#),
+        (r#"𝙖"#, r#"𝙖"#, r#"𝙖"#, r#"a"#, r#"a"#),
+        (r#"𝙗"#, r#"𝙗"#, r#"𝙗"#, r#"b"#, r#"b"#),
+        (r#"𝙘"#, r#"𝙘"#, r#"𝙘"#, r#"c"#, r#"c"#),
+        (r#"𝙙"#, r#"𝙙"#, r#"𝙙"#, r#"d"#, r#"d"#),
+        (r#"𝙚"#, r#"𝙚"#, r#"𝙚"#, r#"e"#, r#"e"#),
+        (r#"𝙛"#, r#"𝙛"#, r#"𝙛"#, r#"f"#, r#"f"#),
+        (r#"𝙜"#, r#"𝙜"#, r#"𝙜"#, r#"g"#, r#"g"#),
+        (r#"𝙝"#, r#"𝙝"#, r#"𝙝"#, r#"h"#, r#"h"#),
+        (r#"𝙞"#, r#"𝙞"#, r#"𝙞"#, r#"i"#, r#"i"#),
+        (r#"𝙟"#, r#"𝙟"#, r#"𝙟"#, r#"j"#, r#"j"#),
+        (r#"𝙠"#, r#"𝙠"#, r#"𝙠"#, r#"k"#, r#"k"#),
+        (r#"𝙡"#, r#"𝙡"#, r#"𝙡"#, r#"l"#, r#"l"#),
+        (r#"𝙢"#, r#"𝙢"#, r#"𝙢"#, r#"m"#, r#"m"#),
+        (r#"𝙣"#, r#"𝙣"#, r#"𝙣"#, r#"n"#, r#"n"#),
+        (r#"𝙤"#, r#"𝙤"#, r#"𝙤"#, r#"o"#, r#"o"#),
+        (r#"𝙥"#, r#"𝙥"#, r#"𝙥"#, r#"p"#, r#"p"#),
+        (r#"𝙦"#, r#"𝙦"#, r#"𝙦"#, r#"q"#, r#"q"#),
+        (r#"𝙧"#, r#"𝙧"#, r#"𝙧"#, r#"r"#, r#"r"#),
+        (r#"𝙨"#, r#"𝙨"#, r#"𝙨"#, r#"s"#, r#"s"#),
+        (r#"𝙩"#, r#"𝙩"#, r#"𝙩"#, r#"t"#, r#"t"#),
+        (r#"𝙪"#, r#"𝙪"#, r#"𝙪"#, r#"u"#, r#"u"#),
+        (r#"𝙫"#, r#"𝙫"#, r#"𝙫"#, r#"v"#, r#"v"#),
+        (r#"𝙬"#, r#"𝙬"#, r#"𝙬"#, r#"w"#, r#"w"#),
+        (r#"𝙭"#, r#"𝙭"#, r#"𝙭"#, r#"x"#, r#"x"#),
+        (r#"𝙮"#, r#"𝙮"#, r#"𝙮"#, r#"y"#, r#"y"#),
+        (r#"𝙯"#, r#"𝙯"#, r#"𝙯"#, r#"z"#, r#"z"#),
+        (r#"𝙰"#, r#"𝙰"#, r#"𝙰"#, r#"A"#, r#"A"#),
+        (r#"𝙱"#, r#"𝙱"#, r#"𝙱"#, r#"B"#, r#"B"#),
+        (r#"𝙲"#, r#"𝙲"#, r#"𝙲"#, r#"C"#, r#"C"#),
+        (r#"𝙳"#, r#"𝙳"#, r#"𝙳"#, r#"D"#, r#"D"#),
+        (r#"𝙴"#, r#"𝙴"#, r#"𝙴"#, r#"E"#, r#"E"#),
+        (r#"𝙵"#, r#"𝙵"#, r#"𝙵"#, r#"F"#, r#"F"#),
+        (r#"𝙶"#, r#"𝙶"#, r#"𝙶"#, r#"G"#, r#"G"#),
+        (r#"𝙷"#, r#"𝙷"#, r#"𝙷"#, r#"H"#, r#"H"#),
+        (r#"𝙸"#, r#"𝙸"#, r#"𝙸"#, r#"I"#, r#"I"#),
+        (r#"𝙹"#, r#"𝙹"#, r#"𝙹"#, r#"J"#, r#"J"#),
+        (r#"𝙺"#, r#"𝙺"#, r#"𝙺"#, r#"K"#, r#"K"#),
+        (r#"𝙻"#, r#"𝙻"#, r#"𝙻"#, r#"L"#, r#"L"#),
+        (r#"𝙼"#, r#"𝙼"#, r#"𝙼"#, r#"M"#, r#"M"#),
+        (r#"𝙽"#, r#"𝙽"#, r#"𝙽"#, r#"N"#, r#"N"#),
+        (r#"𝙾"#, r#"𝙾"#, r#"𝙾"#, r#"O"#, r#"O"#),
+        (r#"𝙿"#, r#"𝙿"#, r#"𝙿"#, r#"P"#, r#"P"#),
+        (r#"𝚀"#, r#"𝚀"#, r#"𝚀"#, r#"Q"#, r#"Q"#),
+        (r#"𝚁"#, r#"𝚁"#, r#"𝚁"#, r#"R"#, r#"R"#),
+        (r#"𝚂"#, r#"𝚂"#, r#"𝚂"#, r#"S"#, r#"S"#),
+        (r#"𝚃"#, r#"𝚃"#, r#"𝚃"#, r#"T"#, r#"T"#),
+        (r#"𝚄"#, r#"𝚄"#, r#"𝚄"#, r#"U"#, r#"U"#),
+        (r#"𝚅"#, r#"𝚅"#, r#"𝚅"#, r#"V"#, r#"V"#),
+        (r#"𝚆"#, r#"𝚆"#, r#"𝚆"#, r#"W"#, r#"W"#),
+        (r#"𝚇"#, r#"𝚇"#, r#"𝚇"#, r#"X"#, r#"X"#),
+        (r#"𝚈"#, r#"𝚈"#, r#"𝚈"#, r#"Y"#, r#"Y"#),
+        (r#"𝚉"#, r#"𝚉"#, r#"𝚉"#, r#"Z"#, r#"Z"#),
+        (r#"𝚊"#, r#"𝚊"#, r#"𝚊"#, r#"a"#, r#"a"#),
+        (r#"𝚋"#, r#"𝚋"#, r#"𝚋"#, r#"b"#, r#"b"#),
+        (r#"𝚌"#, r#"𝚌"#, r#"𝚌"#, r#"c"#, r#"c"#),
+        (r#"𝚍"#, r#"𝚍"#, r#"𝚍"#, r#"d"#, r#"d"#),
+        (r#"𝚎"#, r#"𝚎"#, r#"𝚎"#, r#"e"#, r#"e"#),
+        (r#"𝚏"#, r#"𝚏"#, r#"𝚏"#, r#"f"#, r#"f"#),
+        (r#"𝚐"#, r#"𝚐"#, r#"𝚐"#, r#"g"#, r#"g"#),
+        (r#"𝚑"#, r#"𝚑"#, r#"𝚑"#, r#"h"#, r#"h"#),
+        (r#"𝚒"#, r#"𝚒"#, r#"𝚒"#, r#"i"#, r#"i"#),
+        (r#"𝚓"#, r#"𝚓"#, r#"𝚓"#, r#"j"#, r#"j"#),
+        (r#"𝚔"#, r#"𝚔"#, r#"𝚔"#, r#"k"#, r#"k"#),
+        (r#"𝚕"#, r#"𝚕"#, r#"𝚕"#, r#"l"#, r#"l"#),
+        (r#"𝚖"#, r#"𝚖"#, r#"𝚖"#, r#"m"#, r#"m"#),
+        (r#"𝚗"#, r#"𝚗"#, r#"𝚗"#, r#"n"#, r#"n"#),
+        (r#"𝚘"#, r#"𝚘"#, r#"𝚘"#, r#"o"#, r#"o"#),
+        (r#"𝚙"#, r#"𝚙"#, r#"𝚙"#, r#"p"#, r#"p"#),
+        (r#"𝚚"#, r#"𝚚"#, r#"𝚚"#, r#"q"#, r#"q"#),
+        (r#"𝚛"#, r#"𝚛"#, r#"𝚛"#, r#"r"#, r#"r"#),
+        (r#"𝚜"#, r#"𝚜"#, r#"𝚜"#, r#"s"#, r#"s"#),
+        (r#"𝚝"#, r#"𝚝"#, r#"𝚝"#, r#"t"#, r#"t"#),
+        (r#"𝚞"#, r#"𝚞"#, r#"𝚞"#, r#"u"#, r#"u"#),
+        (r#"𝚟"#, r#"𝚟"#, r#"𝚟"#, r#"v"#, r#"v"#),
+        (r#"𝚠"#, r#"𝚠"#, r#"𝚠"#, r#"w"#, r#"w"#),
+        (r#"𝚡"#, r#"𝚡"#, r#"𝚡"#, r#"x"#, r#"x"#),
+        (r#"𝚢"#, r#"𝚢"#, r#"𝚢"#, r#"y"#, r#"y"#),
+        (r#"𝚣"#, r#"𝚣"#, r#"𝚣"#, r#"z"#, r#"z"#),
+        (r#"𝚤"#, r#"𝚤"#, r#"𝚤"#, r#"ı"#, r#"ı"#),
+        (r#"𝚥"#, r#"𝚥"#, r#"𝚥"#, r#"ȷ"#, r#"ȷ"#),
+        (r#"𝚨"#, r#"𝚨"#, r#"𝚨"#, r#"Α"#, r#"Α"#),
+        (r#"𝚩"#, r#"𝚩"#, r#"𝚩"#, r#"Β"#, r#"Β"#),
+        (r#"𝚪"#, r#"𝚪"#, r#"𝚪"#, r#"Γ"#, r#"Γ"#),
+        (r#"𝚫"#, r#"𝚫"#, r#"𝚫"#, r#"Δ"#, r#"Δ"#),
+        (r#"𝚬"#, r#"𝚬"#, r#"𝚬"#, r#"Ε"#, r#"Ε"#),
+        (r#"𝚭"#, r#"𝚭"#, r#"𝚭"#, r#"Ζ"#, r#"Ζ"#),
+        (r#"𝚮"#, r#"𝚮"#, r#"𝚮"#, r#"Η"#, r#"Η"#),
+        (r#"𝚯"#, r#"𝚯"#, r#"𝚯"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝚰"#, r#"𝚰"#, r#"𝚰"#, r#"Ι"#, r#"Ι"#),
+        (r#"𝚱"#, r#"𝚱"#, r#"𝚱"#, r#"Κ"#, r#"Κ"#),
+        (r#"𝚲"#, r#"𝚲"#, r#"𝚲"#, r#"Λ"#, r#"Λ"#),
+        (r#"𝚳"#, r#"𝚳"#, r#"𝚳"#, r#"Μ"#, r#"Μ"#),
+        (r#"𝚴"#, r#"𝚴"#, r#"𝚴"#, r#"Ν"#, r#"Ν"#),
+        (r#"𝚵"#, r#"𝚵"#, r#"𝚵"#, r#"Ξ"#, r#"Ξ"#),
+        (r#"𝚶"#, r#"𝚶"#, r#"𝚶"#, r#"Ο"#, r#"Ο"#),
+        (r#"𝚷"#, r#"𝚷"#, r#"𝚷"#, r#"Π"#, r#"Π"#),
+        (r#"𝚸"#, r#"𝚸"#, r#"𝚸"#, r#"Ρ"#, r#"Ρ"#),
+        (r#"𝚹"#, r#"𝚹"#, r#"𝚹"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝚺"#, r#"𝚺"#, r#"𝚺"#, r#"Σ"#, r#"Σ"#),
+        (r#"𝚻"#, r#"𝚻"#, r#"𝚻"#, r#"Τ"#, r#"Τ"#),
+        (r#"𝚼"#, r#"𝚼"#, r#"𝚼"#, r#"Υ"#, r#"Υ"#),
+        (r#"𝚽"#, r#"𝚽"#, r#"𝚽"#, r#"Φ"#, r#"Φ"#),
+        (r#"𝚾"#, r#"𝚾"#, r#"𝚾"#, r#"Χ"#, r#"Χ"#),
+        (r#"𝚿"#, r#"𝚿"#, r#"𝚿"#, r#"Ψ"#, r#"Ψ"#),
+        (r#"𝛀"#, r#"𝛀"#, r#"𝛀"#, r#"Ω"#, r#"Ω"#),
+        (r#"𝛁"#, r#"𝛁"#, r#"𝛁"#, r#"∇"#, r#"∇"#),
+        (r#"𝛂"#, r#"𝛂"#, r#"𝛂"#, r#"α"#, r#"α"#),
+        (r#"𝛃"#, r#"𝛃"#, r#"𝛃"#, r#"β"#, r#"β"#),
+        (r#"𝛄"#, r#"𝛄"#, r#"𝛄"#, r#"γ"#, r#"γ"#),
+        (r#"𝛅"#, r#"𝛅"#, r#"𝛅"#, r#"δ"#, r#"δ"#),
+        (r#"𝛆"#, r#"𝛆"#, r#"𝛆"#, r#"ε"#, r#"ε"#),
+        (r#"𝛇"#, r#"𝛇"#, r#"𝛇"#, r#"ζ"#, r#"ζ"#),
+        (r#"𝛈"#, r#"𝛈"#, r#"𝛈"#, r#"η"#, r#"η"#),
+        (r#"𝛉"#, r#"𝛉"#, r#"𝛉"#, r#"θ"#, r#"θ"#),
+        (r#"𝛊"#, r#"𝛊"#, r#"𝛊"#, r#"ι"#, r#"ι"#),
+        (r#"𝛋"#, r#"𝛋"#, r#"𝛋"#, r#"κ"#, r#"κ"#),
+        (r#"𝛌"#, r#"𝛌"#, r#"𝛌"#, r#"λ"#, r#"λ"#),
+        (r#"𝛍"#, r#"𝛍"#, r#"𝛍"#, r#"μ"#, r#"μ"#),
+        (r#"𝛎"#, r#"𝛎"#, r#"𝛎"#, r#"ν"#, r#"ν"#),
+        (r#"𝛏"#, r#"𝛏"#, r#"𝛏"#, r#"ξ"#, r#"ξ"#),
+        (r#"𝛐"#, r#"𝛐"#, r#"𝛐"#, r#"ο"#, r#"ο"#),
+        (r#"𝛑"#, r#"𝛑"#, r#"𝛑"#, r#"π"#, r#"π"#),
+        (r#"𝛒"#, r#"𝛒"#, r#"𝛒"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝛓"#, r#"𝛓"#, r#"𝛓"#, r#"ς"#, r#"ς"#),
+        (r#"𝛔"#, r#"𝛔"#, r#"𝛔"#, r#"σ"#, r#"σ"#),
+        (r#"𝛕"#, r#"𝛕"#, r#"𝛕"#, r#"τ"#, r#"τ"#),
+        (r#"𝛖"#, r#"𝛖"#, r#"𝛖"#, r#"υ"#, r#"υ"#),
+        (r#"𝛗"#, r#"𝛗"#, r#"𝛗"#, r#"φ"#, r#"φ"#),
+        (r#"𝛘"#, r#"𝛘"#, r#"𝛘"#, r#"χ"#, r#"χ"#),
+        (r#"𝛙"#, r#"𝛙"#, r#"𝛙"#, r#"ψ"#, r#"ψ"#),
+        (r#"𝛚"#, r#"𝛚"#, r#"𝛚"#, r#"ω"#, r#"ω"#),
+        (r#"𝛛"#, r#"𝛛"#, r#"𝛛"#, r#"∂"#, r#"∂"#),
+        (r#"𝛜"#, r#"𝛜"#, r#"𝛜"#, r#"ε"#, r#"ε"#),
+        (r#"𝛝"#, r#"𝛝"#, r#"𝛝"#, r#"θ"#, r#"θ"#),
+        (r#"𝛞"#, r#"𝛞"#, r#"𝛞"#, r#"κ"#, r#"κ"#),
+        (r#"𝛟"#, r#"𝛟"#, r#"𝛟"#, r#"φ"#, r#"φ"#),
+        (r#"𝛠"#, r#"𝛠"#, r#"𝛠"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝛡"#, r#"𝛡"#, r#"𝛡"#, r#"π"#, r#"π"#),
+        (r#"𝛢"#, r#"𝛢"#, r#"𝛢"#, r#"Α"#, r#"Α"#),
+        (r#"𝛣"#, r#"𝛣"#, r#"𝛣"#, r#"Β"#, r#"Β"#),
+        (r#"𝛤"#, r#"𝛤"#, r#"𝛤"#, r#"Γ"#, r#"Γ"#),
+        (r#"𝛥"#, r#"𝛥"#, r#"𝛥"#, r#"Δ"#, r#"Δ"#),
+        (r#"𝛦"#, r#"𝛦"#, r#"𝛦"#, r#"Ε"#, r#"Ε"#),
+        (r#"𝛧"#, r#"𝛧"#, r#"𝛧"#, r#"Ζ"#, r#"Ζ"#),
+        (r#"𝛨"#, r#"𝛨"#, r#"𝛨"#, r#"Η"#, r#"Η"#),
+        (r#"𝛩"#, r#"𝛩"#, r#"𝛩"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝛪"#, r#"𝛪"#, r#"𝛪"#, r#"Ι"#, r#"Ι"#),
+        (r#"𝛫"#, r#"𝛫"#, r#"𝛫"#, r#"Κ"#, r#"Κ"#),
+        (r#"𝛬"#, r#"𝛬"#, r#"𝛬"#, r#"Λ"#, r#"Λ"#),
+        (r#"𝛭"#, r#"𝛭"#, r#"𝛭"#, r#"Μ"#, r#"Μ"#),
+        (r#"𝛮"#, r#"𝛮"#, r#"𝛮"#, r#"Ν"#, r#"Ν"#),
+        (r#"𝛯"#, r#"𝛯"#, r#"𝛯"#, r#"Ξ"#, r#"Ξ"#),
+        (r#"𝛰"#, r#"𝛰"#, r#"𝛰"#, r#"Ο"#, r#"Ο"#),
+        (r#"𝛱"#, r#"𝛱"#, r#"𝛱"#, r#"Π"#, r#"Π"#),
+        (r#"𝛲"#, r#"𝛲"#, r#"𝛲"#, r#"Ρ"#, r#"Ρ"#),
+        (r#"𝛳"#, r#"𝛳"#, r#"𝛳"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝛴"#, r#"𝛴"#, r#"𝛴"#, r#"Σ"#, r#"Σ"#),
+        (r#"𝛵"#, r#"𝛵"#, r#"𝛵"#, r#"Τ"#, r#"Τ"#),
+        (r#"𝛶"#, r#"𝛶"#, r#"𝛶"#, r#"Υ"#, r#"Υ"#),
+        (r#"𝛷"#, r#"𝛷"#, r#"𝛷"#, r#"Φ"#, r#"Φ"#),
+        (r#"𝛸"#, r#"𝛸"#, r#"𝛸"#, r#"Χ"#, r#"Χ"#),
+        (r#"𝛹"#, r#"𝛹"#, r#"𝛹"#, r#"Ψ"#, r#"Ψ"#),
+        (r#"𝛺"#, r#"𝛺"#, r#"𝛺"#, r#"Ω"#, r#"Ω"#),
+        (r#"𝛻"#, r#"𝛻"#, r#"𝛻"#, r#"∇"#, r#"∇"#),
+        (r#"𝛼"#, r#"𝛼"#, r#"𝛼"#, r#"α"#, r#"α"#),
+        (r#"𝛽"#, r#"𝛽"#, r#"𝛽"#, r#"β"#, r#"β"#),
+        (r#"𝛾"#, r#"𝛾"#, r#"𝛾"#, r#"γ"#, r#"γ"#),
+        (r#"𝛿"#, r#"𝛿"#, r#"𝛿"#, r#"δ"#, r#"δ"#),
+        (r#"𝜀"#, r#"𝜀"#, r#"𝜀"#, r#"ε"#, r#"ε"#),
+        (r#"𝜁"#, r#"𝜁"#, r#"𝜁"#, r#"ζ"#, r#"ζ"#),
+        (r#"𝜂"#, r#"𝜂"#, r#"𝜂"#, r#"η"#, r#"η"#),
+        (r#"𝜃"#, r#"𝜃"#, r#"𝜃"#, r#"θ"#, r#"θ"#),
+        (r#"𝜄"#, r#"𝜄"#, r#"𝜄"#, r#"ι"#, r#"ι"#),
+        (r#"𝜅"#, r#"𝜅"#, r#"𝜅"#, r#"κ"#, r#"κ"#),
+        (r#"𝜆"#, r#"𝜆"#, r#"𝜆"#, r#"λ"#, r#"λ"#),
+        (r#"𝜇"#, r#"𝜇"#, r#"𝜇"#, r#"μ"#, r#"μ"#),
+        (r#"𝜈"#, r#"𝜈"#, r#"𝜈"#, r#"ν"#, r#"ν"#),
+        (r#"𝜉"#, r#"𝜉"#, r#"𝜉"#, r#"ξ"#, r#"ξ"#),
+        (r#"𝜊"#, r#"𝜊"#, r#"𝜊"#, r#"ο"#, r#"ο"#),
+        (r#"𝜋"#, r#"𝜋"#, r#"𝜋"#, r#"π"#, r#"π"#),
+        (r#"𝜌"#, r#"𝜌"#, r#"𝜌"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝜍"#, r#"𝜍"#, r#"𝜍"#, r#"ς"#, r#"ς"#),
+        (r#"𝜎"#, r#"𝜎"#, r#"𝜎"#, r#"σ"#, r#"σ"#),
+        (r#"𝜏"#, r#"𝜏"#, r#"𝜏"#, r#"τ"#, r#"τ"#),
+        (r#"𝜐"#, r#"𝜐"#, r#"𝜐"#, r#"υ"#, r#"υ"#),
+        (r#"𝜑"#, r#"𝜑"#, r#"𝜑"#, r#"φ"#, r#"φ"#),
+        (r#"𝜒"#, r#"𝜒"#, r#"𝜒"#, r#"χ"#, r#"χ"#),
+        (r#"𝜓"#, r#"𝜓"#, r#"𝜓"#, r#"ψ"#, r#"ψ"#),
+        (r#"𝜔"#, r#"𝜔"#, r#"𝜔"#, r#"ω"#, r#"ω"#),
+        (r#"𝜕"#, r#"𝜕"#, r#"𝜕"#, r#"∂"#, r#"∂"#),
+        (r#"𝜖"#, r#"𝜖"#, r#"𝜖"#, r#"ε"#, r#"ε"#),
+        (r#"𝜗"#, r#"𝜗"#, r#"𝜗"#, r#"θ"#, r#"θ"#),
+        (r#"𝜘"#, r#"𝜘"#, r#"𝜘"#, r#"κ"#, r#"κ"#),
+        (r#"𝜙"#, r#"𝜙"#, r#"𝜙"#, r#"φ"#, r#"φ"#),
+        (r#"𝜚"#, r#"𝜚"#, r#"𝜚"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝜛"#, r#"𝜛"#, r#"𝜛"#, r#"π"#, r#"π"#),
+        (r#"𝜜"#, r#"𝜜"#, r#"𝜜"#, r#"Α"#, r#"Α"#),
+        (r#"𝜝"#, r#"𝜝"#, r#"𝜝"#, r#"Β"#, r#"Β"#),
+        (r#"𝜞"#, r#"𝜞"#, r#"𝜞"#, r#"Γ"#, r#"Γ"#),
+        (r#"𝜟"#, r#"𝜟"#, r#"𝜟"#, r#"Δ"#, r#"Δ"#),
+        (r#"𝜠"#, r#"𝜠"#, r#"𝜠"#, r#"Ε"#, r#"Ε"#),
+        (r#"𝜡"#, r#"𝜡"#, r#"𝜡"#, r#"Ζ"#, r#"Ζ"#),
+        (r#"𝜢"#, r#"𝜢"#, r#"𝜢"#, r#"Η"#, r#"Η"#),
+        (r#"𝜣"#, r#"𝜣"#, r#"𝜣"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝜤"#, r#"𝜤"#, r#"𝜤"#, r#"Ι"#, r#"Ι"#),
+        (r#"𝜥"#, r#"𝜥"#, r#"𝜥"#, r#"Κ"#, r#"Κ"#),
+        (r#"𝜦"#, r#"𝜦"#, r#"𝜦"#, r#"Λ"#, r#"Λ"#),
+        (r#"𝜧"#, r#"𝜧"#, r#"𝜧"#, r#"Μ"#, r#"Μ"#),
+        (r#"𝜨"#, r#"𝜨"#, r#"𝜨"#, r#"Ν"#, r#"Ν"#),
+        (r#"𝜩"#, r#"𝜩"#, r#"𝜩"#, r#"Ξ"#, r#"Ξ"#),
+        (r#"𝜪"#, r#"𝜪"#, r#"𝜪"#, r#"Ο"#, r#"Ο"#),
+        (r#"𝜫"#, r#"𝜫"#, r#"𝜫"#, r#"Π"#, r#"Π"#),
+        (r#"𝜬"#, r#"𝜬"#, r#"𝜬"#, r#"Ρ"#, r#"Ρ"#),
+        (r#"𝜭"#, r#"𝜭"#, r#"𝜭"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝜮"#, r#"𝜮"#, r#"𝜮"#, r#"Σ"#, r#"Σ"#),
+        (r#"𝜯"#, r#"𝜯"#, r#"𝜯"#, r#"Τ"#, r#"Τ"#),
+        (r#"𝜰"#, r#"𝜰"#, r#"𝜰"#, r#"Υ"#, r#"Υ"#),
+        (r#"𝜱"#, r#"𝜱"#, r#"𝜱"#, r#"Φ"#, r#"Φ"#),
+        (r#"𝜲"#, r#"𝜲"#, r#"𝜲"#, r#"Χ"#, r#"Χ"#),
+        (r#"𝜳"#, r#"𝜳"#, r#"𝜳"#, r#"Ψ"#, r#"Ψ"#),
+        (r#"𝜴"#, r#"𝜴"#, r#"𝜴"#, r#"Ω"#, r#"Ω"#),
+        (r#"𝜵"#, r#"𝜵"#, r#"𝜵"#, r#"∇"#, r#"∇"#),
+        (r#"𝜶"#, r#"𝜶"#, r#"𝜶"#, r#"α"#, r#"α"#),
+        (r#"𝜷"#, r#"𝜷"#, r#"𝜷"#, r#"β"#, r#"β"#),
+        (r#"𝜸"#, r#"𝜸"#, r#"𝜸"#, r#"γ"#, r#"γ"#),
+        (r#"𝜹"#, r#"𝜹"#, r#"𝜹"#, r#"δ"#, r#"δ"#),
+        (r#"𝜺"#, r#"𝜺"#, r#"𝜺"#, r#"ε"#, r#"ε"#),
+        (r#"𝜻"#, r#"𝜻"#, r#"𝜻"#, r#"ζ"#, r#"ζ"#),
+        (r#"𝜼"#, r#"𝜼"#, r#"𝜼"#, r#"η"#, r#"η"#),
+        (r#"𝜽"#, r#"𝜽"#, r#"𝜽"#, r#"θ"#, r#"θ"#),
+        (r#"𝜾"#, r#"𝜾"#, r#"𝜾"#, r#"ι"#, r#"ι"#),
+        (r#"𝜿"#, r#"𝜿"#, r#"𝜿"#, r#"κ"#, r#"κ"#),
+        (r#"𝝀"#, r#"𝝀"#, r#"𝝀"#, r#"λ"#, r#"λ"#),
+        (r#"𝝁"#, r#"𝝁"#, r#"𝝁"#, r#"μ"#, r#"μ"#),
+        (r#"𝝂"#, r#"𝝂"#, r#"𝝂"#, r#"ν"#, r#"ν"#),
+        (r#"𝝃"#, r#"𝝃"#, r#"𝝃"#, r#"ξ"#, r#"ξ"#),
+        (r#"𝝄"#, r#"𝝄"#, r#"𝝄"#, r#"ο"#, r#"ο"#),
+        (r#"𝝅"#, r#"𝝅"#, r#"𝝅"#, r#"π"#, r#"π"#),
+        (r#"𝝆"#, r#"𝝆"#, r#"𝝆"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝝇"#, r#"𝝇"#, r#"𝝇"#, r#"ς"#, r#"ς"#),
+        (r#"𝝈"#, r#"𝝈"#, r#"𝝈"#, r#"σ"#, r#"σ"#),
+        (r#"𝝉"#, r#"𝝉"#, r#"𝝉"#, r#"τ"#, r#"τ"#),
+        (r#"𝝊"#, r#"𝝊"#, r#"𝝊"#, r#"υ"#, r#"υ"#),
+        (r#"𝝋"#, r#"𝝋"#, r#"𝝋"#, r#"φ"#, r#"φ"#),
+        (r#"𝝌"#, r#"𝝌"#, r#"𝝌"#, r#"χ"#, r#"χ"#),
+        (r#"𝝍"#, r#"𝝍"#, r#"𝝍"#, r#"ψ"#, r#"ψ"#),
+        (r#"𝝎"#, r#"𝝎"#, r#"𝝎"#, r#"ω"#, r#"ω"#),
+        (r#"𝝏"#, r#"𝝏"#, r#"𝝏"#, r#"∂"#, r#"∂"#),
+        (r#"𝝐"#, r#"𝝐"#, r#"𝝐"#, r#"ε"#, r#"ε"#),
+        (r#"𝝑"#, r#"𝝑"#, r#"𝝑"#, r#"θ"#, r#"θ"#),
+        (r#"𝝒"#, r#"𝝒"#, r#"𝝒"#, r#"κ"#, r#"κ"#),
+        (r#"𝝓"#, r#"𝝓"#, r#"𝝓"#, r#"φ"#, r#"φ"#),
+        (r#"𝝔"#, r#"𝝔"#, r#"𝝔"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝝕"#, r#"𝝕"#, r#"𝝕"#, r#"π"#, r#"π"#),
+        (r#"𝝖"#, r#"𝝖"#, r#"𝝖"#, r#"Α"#, r#"Α"#),
+        (r#"𝝗"#, r#"𝝗"#, r#"𝝗"#, r#"Β"#, r#"Β"#),
+        (r#"𝝘"#, r#"𝝘"#, r#"𝝘"#, r#"Γ"#, r#"Γ"#),
+        (r#"𝝙"#, r#"𝝙"#, r#"𝝙"#, r#"Δ"#, r#"Δ"#),
+        (r#"𝝚"#, r#"𝝚"#, r#"𝝚"#, r#"Ε"#, r#"Ε"#),
+        (r#"𝝛"#, r#"𝝛"#, r#"𝝛"#, r#"Ζ"#, r#"Ζ"#),
+        (r#"𝝜"#, r#"𝝜"#, r#"𝝜"#, r#"Η"#, r#"Η"#),
+        (r#"𝝝"#, r#"𝝝"#, r#"𝝝"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝝞"#, r#"𝝞"#, r#"𝝞"#, r#"Ι"#, r#"Ι"#),
+        (r#"𝝟"#, r#"𝝟"#, r#"𝝟"#, r#"Κ"#, r#"Κ"#),
+        (r#"𝝠"#, r#"𝝠"#, r#"𝝠"#, r#"Λ"#, r#"Λ"#),
+        (r#"𝝡"#, r#"𝝡"#, r#"𝝡"#, r#"Μ"#, r#"Μ"#),
+        (r#"𝝢"#, r#"𝝢"#, r#"𝝢"#, r#"Ν"#, r#"Ν"#),
+        (r#"𝝣"#, r#"𝝣"#, r#"𝝣"#, r#"Ξ"#, r#"Ξ"#),
+        (r#"𝝤"#, r#"𝝤"#, r#"𝝤"#, r#"Ο"#, r#"Ο"#),
+        (r#"𝝥"#, r#"𝝥"#, r#"𝝥"#, r#"Π"#, r#"Π"#),
+        (r#"𝝦"#, r#"𝝦"#, r#"𝝦"#, r#"Ρ"#, r#"Ρ"#),
+        (r#"𝝧"#, r#"𝝧"#, r#"𝝧"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝝨"#, r#"𝝨"#, r#"𝝨"#, r#"Σ"#, r#"Σ"#),
+        (r#"𝝩"#, r#"𝝩"#, r#"𝝩"#, r#"Τ"#, r#"Τ"#),
+        (r#"𝝪"#, r#"𝝪"#, r#"𝝪"#, r#"Υ"#, r#"Υ"#),
+        (r#"𝝫"#, r#"𝝫"#, r#"𝝫"#, r#"Φ"#, r#"Φ"#),
+        (r#"𝝬"#, r#"𝝬"#, r#"𝝬"#, r#"Χ"#, r#"Χ"#),
+        (r#"𝝭"#, r#"𝝭"#, r#"𝝭"#, r#"Ψ"#, r#"Ψ"#),
+        (r#"𝝮"#, r#"𝝮"#, r#"𝝮"#, r#"Ω"#, r#"Ω"#),
+        (r#"𝝯"#, r#"𝝯"#, r#"𝝯"#, r#"∇"#, r#"∇"#),
+        (r#"𝝰"#, r#"𝝰"#, r#"𝝰"#, r#"α"#, r#"α"#),
+        (r#"𝝱"#, r#"𝝱"#, r#"𝝱"#, r#"β"#, r#"β"#),
+        (r#"𝝲"#, r#"𝝲"#, r#"𝝲"#, r#"γ"#, r#"γ"#),
+        (r#"𝝳"#, r#"𝝳"#, r#"𝝳"#, r#"δ"#, r#"δ"#),
+        (r#"𝝴"#, r#"𝝴"#, r#"𝝴"#, r#"ε"#, r#"ε"#),
+        (r#"𝝵"#, r#"𝝵"#, r#"𝝵"#, r#"ζ"#, r#"ζ"#),
+        (r#"𝝶"#, r#"𝝶"#, r#"𝝶"#, r#"η"#, r#"η"#),
+        (r#"𝝷"#, r#"𝝷"#, r#"𝝷"#, r#"θ"#, r#"θ"#),
+        (r#"𝝸"#, r#"𝝸"#, r#"𝝸"#, r#"ι"#, r#"ι"#),
+        (r#"𝝹"#, r#"𝝹"#, r#"𝝹"#, r#"κ"#, r#"κ"#),
+        (r#"𝝺"#, r#"𝝺"#, r#"𝝺"#, r#"λ"#, r#"λ"#),
+        (r#"𝝻"#, r#"𝝻"#, r#"𝝻"#, r#"μ"#, r#"μ"#),
+        (r#"𝝼"#, r#"𝝼"#, r#"𝝼"#, r#"ν"#, r#"ν"#),
+        (r#"𝝽"#, r#"𝝽"#, r#"𝝽"#, r#"ξ"#, r#"ξ"#),
+        (r#"𝝾"#, r#"𝝾"#, r#"𝝾"#, r#"ο"#, r#"ο"#),
+        (r#"𝝿"#, r#"𝝿"#, r#"𝝿"#, r#"π"#, r#"π"#),
+        (r#"𝞀"#, r#"𝞀"#, r#"𝞀"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝞁"#, r#"𝞁"#, r#"𝞁"#, r#"ς"#, r#"ς"#),
+        (r#"𝞂"#, r#"𝞂"#, r#"𝞂"#, r#"σ"#, r#"σ"#),
+        (r#"𝞃"#, r#"𝞃"#, r#"𝞃"#, r#"τ"#, r#"τ"#),
+        (r#"𝞄"#, r#"𝞄"#, r#"𝞄"#, r#"υ"#, r#"υ"#),
+        (r#"𝞅"#, r#"𝞅"#, r#"𝞅"#, r#"φ"#, r#"φ"#),
+        (r#"𝞆"#, r#"𝞆"#, r#"𝞆"#, r#"χ"#, r#"χ"#),
+        (r#"𝞇"#, r#"𝞇"#, r#"𝞇"#, r#"ψ"#, r#"ψ"#),
+        (r#"𝞈"#, r#"𝞈"#, r#"𝞈"#, r#"ω"#, r#"ω"#),
+        (r#"𝞉"#, r#"𝞉"#, r#"𝞉"#, r#"∂"#, r#"∂"#),
+        (r#"𝞊"#, r#"𝞊"#, r#"𝞊"#, r#"ε"#, r#"ε"#),
+        (r#"𝞋"#, r#"𝞋"#, r#"𝞋"#, r#"θ"#, r#"θ"#),
+        (r#"𝞌"#, r#"𝞌"#, r#"𝞌"#, r#"κ"#, r#"κ"#),
+        (r#"𝞍"#, r#"𝞍"#, r#"𝞍"#, r#"φ"#, r#"φ"#),
+        (r#"𝞎"#, r#"𝞎"#, r#"𝞎"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝞏"#, r#"𝞏"#, r#"𝞏"#, r#"π"#, r#"π"#),
+        (r#"𝞐"#, r#"𝞐"#, r#"𝞐"#, r#"Α"#, r#"Α"#),
+        (r#"𝞑"#, r#"𝞑"#, r#"𝞑"#, r#"Β"#, r#"Β"#),
+        (r#"𝞒"#, r#"𝞒"#, r#"𝞒"#, r#"Γ"#, r#"Γ"#),
+        (r#"𝞓"#, r#"𝞓"#, r#"𝞓"#, r#"Δ"#, r#"Δ"#),
+        (r#"𝞔"#, r#"𝞔"#, r#"𝞔"#, r#"Ε"#, r#"Ε"#),
+        (r#"𝞕"#, r#"𝞕"#, r#"𝞕"#, r#"Ζ"#, r#"Ζ"#),
+        (r#"𝞖"#, r#"𝞖"#, r#"𝞖"#, r#"Η"#, r#"Η"#),
+        (r#"𝞗"#, r#"𝞗"#, r#"𝞗"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝞘"#, r#"𝞘"#, r#"𝞘"#, r#"Ι"#, r#"Ι"#),
+        (r#"𝞙"#, r#"𝞙"#, r#"𝞙"#, r#"Κ"#, r#"Κ"#),
+        (r#"𝞚"#, r#"𝞚"#, r#"𝞚"#, r#"Λ"#, r#"Λ"#),
+        (r#"𝞛"#, r#"𝞛"#, r#"𝞛"#, r#"Μ"#, r#"Μ"#),
+        (r#"𝞜"#, r#"𝞜"#, r#"𝞜"#, r#"Ν"#, r#"Ν"#),
+        (r#"𝞝"#, r#"𝞝"#, r#"𝞝"#, r#"Ξ"#, r#"Ξ"#),
+        (r#"𝞞"#, r#"𝞞"#, r#"𝞞"#, r#"Ο"#, r#"Ο"#),
+        (r#"𝞟"#, r#"𝞟"#, r#"𝞟"#, r#"Π"#, r#"Π"#),
+        (r#"𝞠"#, r#"𝞠"#, r#"𝞠"#, r#"Ρ"#, r#"Ρ"#),
+        (r#"𝞡"#, r#"𝞡"#, r#"𝞡"#, r#"Θ"#, r#"Θ"#),
+        (r#"𝞢"#, r#"𝞢"#, r#"𝞢"#, r#"Σ"#, r#"Σ"#),
+        (r#"𝞣"#, r#"𝞣"#, r#"𝞣"#, r#"Τ"#, r#"Τ"#),
+        (r#"𝞤"#, r#"𝞤"#, r#"𝞤"#, r#"Υ"#, r#"Υ"#),
+        (r#"𝞥"#, r#"𝞥"#, r#"𝞥"#, r#"Φ"#, r#"Φ"#),
+        (r#"𝞦"#, r#"𝞦"#, r#"𝞦"#, r#"Χ"#, r#"Χ"#),
+        (r#"𝞧"#, r#"𝞧"#, r#"𝞧"#, r#"Ψ"#, r#"Ψ"#),
+        (r#"𝞨"#, r#"𝞨"#, r#"𝞨"#, r#"Ω"#, r#"Ω"#),
+        (r#"𝞩"#, r#"𝞩"#, r#"𝞩"#, r#"∇"#, r#"∇"#),
+        (r#"𝞪"#, r#"𝞪"#, r#"𝞪"#, r#"α"#, r#"α"#),
+        (r#"𝞫"#, r#"𝞫"#, r#"𝞫"#, r#"β"#, r#"β"#),
+        (r#"𝞬"#, r#"𝞬"#, r#"𝞬"#, r#"γ"#, r#"γ"#),
+        (r#"𝞭"#, r#"𝞭"#, r#"𝞭"#, r#"δ"#, r#"δ"#),
+        (r#"𝞮"#, r#"𝞮"#, r#"𝞮"#, r#"ε"#, r#"ε"#),
+        (r#"𝞯"#, r#"𝞯"#, r#"𝞯"#, r#"ζ"#, r#"ζ"#),
+        (r#"𝞰"#, r#"𝞰"#, r#"𝞰"#, r#"η"#, r#"η"#),
+        (r#"𝞱"#, r#"𝞱"#, r#"𝞱"#, r#"θ"#, r#"θ"#),
+        (r#"𝞲"#, r#"𝞲"#, r#"𝞲"#, r#"ι"#, r#"ι"#),
+        (r#"𝞳"#, r#"𝞳"#, r#"𝞳"#, r#"κ"#, r#"κ"#),
+        (r#"𝞴"#, r#"𝞴"#, r#"𝞴"#, r#"λ"#, r#"λ"#),
+        (r#"𝞵"#, r#"𝞵"#, r#"𝞵"#, r#"μ"#, r#"μ"#),
+        (r#"𝞶"#, r#"𝞶"#, r#"𝞶"#, r#"ν"#, r#"ν"#),
+        (r#"𝞷"#, r#"𝞷"#, r#"𝞷"#, r#"ξ"#, r#"ξ"#),
+        (r#"𝞸"#, r#"𝞸"#, r#"𝞸"#, r#"ο"#, r#"ο"#),
+        (r#"𝞹"#, r#"𝞹"#, r#"𝞹"#, r#"π"#, r#"π"#),
+        (r#"𝞺"#, r#"𝞺"#, r#"𝞺"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝞻"#, r#"𝞻"#, r#"𝞻"#, r#"ς"#, r#"ς"#),
+        (r#"𝞼"#, r#"𝞼"#, r#"𝞼"#, r#"σ"#, r#"σ"#),
+        (r#"𝞽"#, r#"𝞽"#, r#"𝞽"#, r#"τ"#, r#"τ"#),
+        (r#"𝞾"#, r#"𝞾"#, r#"𝞾"#, r#"υ"#, r#"υ"#),
+        (r#"𝞿"#, r#"𝞿"#, r#"𝞿"#, r#"φ"#, r#"φ"#),
+        (r#"𝟀"#, r#"𝟀"#, r#"𝟀"#, r#"χ"#, r#"χ"#),
+        (r#"𝟁"#, r#"𝟁"#, r#"𝟁"#, r#"ψ"#, r#"ψ"#),
+        (r#"𝟂"#, r#"𝟂"#, r#"𝟂"#, r#"ω"#, r#"ω"#),
+        (r#"𝟃"#, r#"𝟃"#, r#"𝟃"#, r#"∂"#, r#"∂"#),
+        (r#"𝟄"#, r#"𝟄"#, r#"𝟄"#, r#"ε"#, r#"ε"#),
+        (r#"𝟅"#, r#"𝟅"#, r#"𝟅"#, r#"θ"#, r#"θ"#),
+        (r#"𝟆"#, r#"𝟆"#, r#"𝟆"#, r#"κ"#, r#"κ"#),
+        (r#"𝟇"#, r#"𝟇"#, r#"𝟇"#, r#"φ"#, r#"φ"#),
+        (r#"𝟈"#, r#"𝟈"#, r#"𝟈"#, r#"ρ"#, r#"ρ"#),
+        (r#"𝟉"#, r#"𝟉"#, r#"𝟉"#, r#"π"#, r#"π"#),
+        (r#"𝟊"#, r#"𝟊"#, r#"𝟊"#, r#"Ϝ"#, r#"Ϝ"#),
+        (r#"𝟋"#, r#"𝟋"#, r#"𝟋"#, r#"ϝ"#, r#"ϝ"#),
+        (r#"𝟎"#, r#"𝟎"#, r#"𝟎"#, r#"0"#, r#"0"#),
+        (r#"𝟏"#, r#"𝟏"#, r#"𝟏"#, r#"1"#, r#"1"#),
+        (r#"𝟐"#, r#"𝟐"#, r#"𝟐"#, r#"2"#, r#"2"#),
+        (r#"𝟑"#, r#"𝟑"#, r#"𝟑"#, r#"3"#, r#"3"#),
+        (r#"𝟒"#, r#"𝟒"#, r#"𝟒"#, r#"4"#, r#"4"#),
+        (r#"𝟓"#, r#"𝟓"#, r#"𝟓"#, r#"5"#, r#"5"#),
+        (r#"𝟔"#, r#"𝟔"#, r#"𝟔"#, r#"6"#, r#"6"#),
+        (r#"𝟕"#, r#"𝟕"#, r#"𝟕"#, r#"7"#, r#"7"#),
+        (r#"𝟖"#, r#"𝟖"#, r#"𝟖"#, r#"8"#, r#"8"#),
+        (r#"𝟗"#, r#"𝟗"#, r#"𝟗"#, r#"9"#, r#"9"#),
+        (r#"𝟘"#, r#"𝟘"#, r#"𝟘"#, r#"0"#, r#"0"#),
+        (r#"𝟙"#, r#"𝟙"#, r#"𝟙"#, r#"1"#, r#"1"#),
+        (r#"𝟚"#, r#"𝟚"#, r#"𝟚"#, r#"2"#, r#"2"#),
+        (r#"𝟛"#, r#"𝟛"#, r#"𝟛"#, r#"3"#, r#"3"#),
+        (r#"𝟜"#, r#"𝟜"#, r#"𝟜"#, r#"4"#, r#"4"#),
+        (r#"𝟝"#, r#"𝟝"#, r#"𝟝"#, r#"5"#, r#"5"#),
+        (r#"𝟞"#, r#"𝟞"#, r#"𝟞"#, r#"6"#, r#"6"#),
+        (r#"𝟟"#, r#"𝟟"#, r#"𝟟"#, r#"7"#, r#"7"#),
+        (r#"𝟠"#, r#"𝟠"#, r#"𝟠"#, r#"8"#, r#"8"#),
+        (r#"𝟡"#, r#"𝟡"#, r#"𝟡"#, r#"9"#, r#"9"#),
+        (r#"𝟢"#, r#"𝟢"#, r#"𝟢"#, r#"0"#, r#"0"#),
+        (r#"𝟣"#, r#"𝟣"#, r#"𝟣"#, r#"1"#, r#"1"#),
+        (r#"𝟤"#, r#"𝟤"#, r#"𝟤"#, r#"2"#, r#"2"#),
+        (r#"𝟥"#, r#"𝟥"#, r#"𝟥"#, r#"3"#, r#"3"#),
+        (r#"𝟦"#, r#"𝟦"#, r#"𝟦"#, r#"4"#, r#"4"#),
+        (r#"𝟧"#, r#"𝟧"#, r#"𝟧"#, r#"5"#, r#"5"#),
+        (r#"𝟨"#, r#"𝟨"#, r#"𝟨"#, r#"6"#, r#"6"#),
+        (r#"𝟩"#, r#"𝟩"#, r#"𝟩"#, r#"7"#, r#"7"#),
+        (r#"𝟪"#, r#"𝟪"#, r#"𝟪"#, r#"8"#, r#"8"#),
+        (r#"𝟫"#, r#"𝟫"#, r#"𝟫"#, r#"9"#, r#"9"#),
+        (r#"𝟬"#, r#"𝟬"#, r#"𝟬"#, r#"0"#, r#"0"#),
+        (r#"𝟭"#, r#"𝟭"#, r#"𝟭"#, r#"1"#, r#"1"#),
+        (r#"𝟮"#, r#"𝟮"#, r#"𝟮"#, r#"2"#, r#"2"#),
+        (r#"𝟯"#, r#"𝟯"#, r#"𝟯"#, r#"3"#, r#"3"#),
+        (r#"𝟰"#, r#"𝟰"#, r#"𝟰"#, r#"4"#, r#"4"#),
+        (r#"𝟱"#, r#"𝟱"#, r#"𝟱"#, r#"5"#, r#"5"#),
+        (r#"𝟲"#, r#"𝟲"#, r#"𝟲"#, r#"6"#, r#"6"#),
+        (r#"𝟳"#, r#"𝟳"#, r#"𝟳"#, r#"7"#, r#"7"#),
+        (r#"𝟴"#, r#"𝟴"#, r#"𝟴"#, r#"8"#, r#"8"#),
+        (r#"𝟵"#, r#"𝟵"#, r#"𝟵"#, r#"9"#, r#"9"#),
+        (r#"𝟶"#, r#"𝟶"#, r#"𝟶"#, r#"0"#, r#"0"#),
+        (r#"𝟷"#, r#"𝟷"#, r#"𝟷"#, r#"1"#, r#"1"#),
+        (r#"𝟸"#, r#"𝟸"#, r#"𝟸"#, r#"2"#, r#"2"#),
+        (r#"𝟹"#, r#"𝟹"#, r#"𝟹"#, r#"3"#, r#"3"#),
+        (r#"𝟺"#, r#"𝟺"#, r#"𝟺"#, r#"4"#, r#"4"#),
+        (r#"𝟻"#, r#"𝟻"#, r#"𝟻"#, r#"5"#, r#"5"#),
+        (r#"𝟼"#, r#"𝟼"#, r#"𝟼"#, r#"6"#, r#"6"#),
+        (r#"𝟽"#, r#"𝟽"#, r#"𝟽"#, r#"7"#, r#"7"#),
+        (r#"𝟾"#, r#"𝟾"#, r#"𝟾"#, r#"8"#, r#"8"#),
+        (r#"𝟿"#, r#"𝟿"#, r#"𝟿"#, r#"9"#, r#"9"#),
+        (r#"𞀰"#, r#"𞀰"#, r#"𞀰"#, r#"а"#, r#"а"#),
+        (r#"𞀱"#, r#"𞀱"#, r#"𞀱"#, r#"б"#, r#"б"#),
+        (r#"𞀲"#, r#"𞀲"#, r#"𞀲"#, r#"в"#, r#"в"#),
+        (r#"𞀳"#, r#"𞀳"#, r#"𞀳"#, r#"г"#, r#"г"#),
+        (r#"𞀴"#, r#"𞀴"#, r#"𞀴"#, r#"д"#, r#"д"#),
+        (r#"𞀵"#, r#"𞀵"#, r#"𞀵"#, r#"е"#, r#"е"#),
+        (r#"𞀶"#, r#"𞀶"#, r#"𞀶"#, r#"ж"#, r#"ж"#),
+        (r#"𞀷"#, r#"𞀷"#, r#"𞀷"#, r#"з"#, r#"з"#),
+        (r#"𞀸"#, r#"𞀸"#, r#"𞀸"#, r#"и"#, r#"и"#),
+        (r#"𞀹"#, r#"𞀹"#, r#"𞀹"#, r#"к"#, r#"к"#),
+        (r#"𞀺"#, r#"𞀺"#, r#"𞀺"#, r#"л"#, r#"л"#),
+        (r#"𞀻"#, r#"𞀻"#, r#"𞀻"#, r#"м"#, r#"м"#),
+        (r#"𞀼"#, r#"𞀼"#, r#"𞀼"#, r#"о"#, r#"о"#),
+        (r#"𞀽"#, r#"𞀽"#, r#"𞀽"#, r#"п"#, r#"п"#),
+        (r#"𞀾"#, r#"𞀾"#, r#"𞀾"#, r#"р"#, r#"р"#),
+        (r#"𞀿"#, r#"𞀿"#, r#"𞀿"#, r#"с"#, r#"с"#),
+        (r#"𞁀"#, r#"𞁀"#, r#"𞁀"#, r#"т"#, r#"т"#),
+        (r#"𞁁"#, r#"𞁁"#, r#"𞁁"#, r#"у"#, r#"у"#),
+        (r#"𞁂"#, r#"𞁂"#, r#"𞁂"#, r#"ф"#, r#"ф"#),
+        (r#"𞁃"#, r#"𞁃"#, r#"𞁃"#, r#"х"#, r#"х"#),
+        (r#"𞁄"#, r#"𞁄"#, r#"𞁄"#, r#"ц"#, r#"ц"#),
+        (r#"𞁅"#, r#"𞁅"#, r#"𞁅"#, r#"ч"#, r#"ч"#),
+        (r#"𞁆"#, r#"𞁆"#, r#"𞁆"#, r#"ш"#, r#"ш"#),
+        (r#"𞁇"#, r#"𞁇"#, r#"𞁇"#, r#"ы"#, r#"ы"#),
+        (r#"𞁈"#, r#"𞁈"#, r#"𞁈"#, r#"э"#, r#"э"#),
+        (r#"𞁉"#, r#"𞁉"#, r#"𞁉"#, r#"ю"#, r#"ю"#),
+        (r#"𞁊"#, r#"𞁊"#, r#"𞁊"#, r#"ꚉ"#, r#"ꚉ"#),
+        (r#"𞁋"#, r#"𞁋"#, r#"𞁋"#, r#"ә"#, r#"ә"#),
+        (r#"𞁌"#, r#"𞁌"#, r#"𞁌"#, r#"і"#, r#"і"#),
+        (r#"𞁍"#, r#"𞁍"#, r#"𞁍"#, r#"ј"#, r#"ј"#),
+        (r#"𞁎"#, r#"𞁎"#, r#"𞁎"#, r#"ө"#, r#"ө"#),
+        (r#"𞁏"#, r#"𞁏"#, r#"𞁏"#, r#"ү"#, r#"ү"#),
+        (r#"𞁐"#, r#"𞁐"#, r#"𞁐"#, r#"ӏ"#, r#"ӏ"#),
+        (r#"𞁑"#, r#"𞁑"#, r#"𞁑"#, r#"а"#, r#"а"#),
+        (r#"𞁒"#, r#"𞁒"#, r#"𞁒"#, r#"б"#, r#"б"#),
+        (r#"𞁓"#, r#"𞁓"#, r#"𞁓"#, r#"в"#, r#"в"#),
+        (r#"𞁔"#, r#"𞁔"#, r#"𞁔"#, r#"г"#, r#"г"#),
+        (r#"𞁕"#, r#"𞁕"#, r#"𞁕"#, r#"д"#, r#"д"#),
+        (r#"𞁖"#, r#"𞁖"#, r#"𞁖"#, r#"е"#, r#"е"#),
+        (r#"𞁗"#, r#"𞁗"#, r#"𞁗"#, r#"ж"#, r#"ж"#),
+        (r#"𞁘"#, r#"𞁘"#, r#"𞁘"#, r#"з"#, r#"з"#),
+        (r#"𞁙"#, r#"𞁙"#, r#"𞁙"#, r#"и"#, r#"и"#),
+        (r#"𞁚"#, r#"𞁚"#, r#"𞁚"#, r#"к"#, r#"к"#),
+        (r#"𞁛"#, r#"𞁛"#, r#"𞁛"#, r#"л"#, r#"л"#),
+        (r#"𞁜"#, r#"𞁜"#, r#"𞁜"#, r#"о"#, r#"о"#),
+        (r#"𞁝"#, r#"𞁝"#, r#"𞁝"#, r#"п"#, r#"п"#),
+        (r#"𞁞"#, r#"𞁞"#, r#"𞁞"#, r#"с"#, r#"с"#),
+        (r#"𞁟"#, r#"𞁟"#, r#"𞁟"#, r#"у"#, r#"у"#),
+        (r#"𞁠"#, r#"𞁠"#, r#"𞁠"#, r#"ф"#, r#"ф"#),
+        (r#"𞁡"#, r#"𞁡"#, r#"𞁡"#, r#"х"#, r#"х"#),
+        (r#"𞁢"#, r#"𞁢"#, r#"𞁢"#, r#"ц"#, r#"ц"#),
+        (r#"𞁣"#, r#"𞁣"#, r#"𞁣"#, r#"ч"#, r#"ч"#),
+        (r#"𞁤"#, r#"𞁤"#, r#"𞁤"#, r#"ш"#, r#"ш"#),
+        (r#"𞁥"#, r#"𞁥"#, r#"𞁥"#, r#"ъ"#, r#"ъ"#),
+        (r#"𞁦"#, r#"𞁦"#, r#"𞁦"#, r#"ы"#, r#"ы"#),
+        (r#"𞁧"#, r#"𞁧"#, r#"𞁧"#, r#"ґ"#, r#"ґ"#),
+        (r#"𞁨"#, r#"𞁨"#, r#"𞁨"#, r#"і"#, r#"і"#),
+        (r#"𞁩"#, r#"𞁩"#, r#"𞁩"#, r#"ѕ"#, r#"ѕ"#),
+        (r#"𞁪"#, r#"𞁪"#, r#"𞁪"#, r#"џ"#, r#"џ"#),
+        (r#"𞁫"#, r#"𞁫"#, r#"𞁫"#, r#"ҫ"#, r#"ҫ"#),
+        (r#"𞁬"#, r#"𞁬"#, r#"𞁬"#, r#"ꙑ"#, r#"ꙑ"#),
+        (r#"𞁭"#, r#"𞁭"#, r#"𞁭"#, r#"ұ"#, r#"ұ"#),
+        (r#"𞸀"#, r#"𞸀"#, r#"𞸀"#, r#"ا"#, r#"ا"#),
+        (r#"𞸁"#, r#"𞸁"#, r#"𞸁"#, r#"ب"#, r#"ب"#),
+        (r#"𞸂"#, r#"𞸂"#, r#"𞸂"#, r#"ج"#, r#"ج"#),
+        (r#"𞸃"#, r#"𞸃"#, r#"𞸃"#, r#"د"#, r#"د"#),
+        (r#"𞸅"#, r#"𞸅"#, r#"𞸅"#, r#"و"#, r#"و"#),
+        (r#"𞸆"#, r#"𞸆"#, r#"𞸆"#, r#"ز"#, r#"ز"#),
+        (r#"𞸇"#, r#"𞸇"#, r#"𞸇"#, r#"ح"#, r#"ح"#),
+        (r#"𞸈"#, r#"𞸈"#, r#"𞸈"#, r#"ط"#, r#"ط"#),
+        (r#"𞸉"#, r#"𞸉"#, r#"𞸉"#, r#"ي"#, r#"ي"#),
+        (r#"𞸊"#, r#"𞸊"#, r#"𞸊"#, r#"ك"#, r#"ك"#),
+        (r#"𞸋"#, r#"𞸋"#, r#"𞸋"#, r#"ل"#, r#"ل"#),
+        (r#"𞸌"#, r#"𞸌"#, r#"𞸌"#, r#"م"#, r#"م"#),
+        (r#"𞸍"#, r#"𞸍"#, r#"𞸍"#, r#"ن"#, r#"ن"#),
+        (r#"𞸎"#, r#"𞸎"#, r#"𞸎"#, r#"س"#, r#"س"#),
+        (r#"𞸏"#, r#"𞸏"#, r#"𞸏"#, r#"ع"#, r#"ع"#),
+        (r#"𞸐"#, r#"𞸐"#, r#"𞸐"#, r#"ف"#, r#"ف"#),
+        (r#"𞸑"#, r#"𞸑"#, r#"𞸑"#, r#"ص"#, r#"ص"#),
+        (r#"𞸒"#, r#"𞸒"#, r#"𞸒"#, r#"ق"#, r#"ق"#),
+        (r#"𞸓"#, r#"𞸓"#, r#"𞸓"#, r#"ر"#, r#"ر"#),
+        (r#"𞸔"#, r#"𞸔"#, r#"𞸔"#, r#"ش"#, r#"ش"#),
+        (r#"𞸕"#, r#"𞸕"#, r#"𞸕"#, r#"ت"#, r#"ت"#),
+        (r#"𞸖"#, r#"𞸖"#, r#"𞸖"#, r#"ث"#, r#"ث"#),
+        (r#"𞸗"#, r#"𞸗"#, r#"𞸗"#, r#"خ"#, r#"خ"#),
+        (r#"𞸘"#, r#"𞸘"#, r#"𞸘"#, r#"ذ"#, r#"ذ"#),
+        (r#"𞸙"#, r#"𞸙"#, r#"𞸙"#, r#"ض"#, r#"ض"#),
+        (r#"𞸚"#, r#"𞸚"#, r#"𞸚"#, r#"ظ"#, r#"ظ"#),
+        (r#"𞸛"#, r#"𞸛"#, r#"𞸛"#, r#"غ"#, r#"غ"#),
+        (r#"𞸜"#, r#"𞸜"#, r#"𞸜"#, r#"ٮ"#, r#"ٮ"#),
+        (r#"𞸝"#, r#"𞸝"#, r#"𞸝"#, r#"ں"#, r#"ں"#),
+        (r#"𞸞"#, r#"𞸞"#, r#"𞸞"#, r#"ڡ"#, r#"ڡ"#),
+        (r#"𞸟"#, r#"𞸟"#, r#"𞸟"#, r#"ٯ"#, r#"ٯ"#),
+        (r#"𞸡"#, r#"𞸡"#, r#"𞸡"#, r#"ب"#, r#"ب"#),
+        (r#"𞸢"#, r#"𞸢"#, r#"𞸢"#, r#"ج"#, r#"ج"#),
+        (r#"𞸤"#, r#"𞸤"#, r#"𞸤"#, r#"ه"#, r#"ه"#),
+        (r#"𞸧"#, r#"𞸧"#, r#"𞸧"#, r#"ح"#, r#"ح"#),
+        (r#"𞸩"#, r#"𞸩"#, r#"𞸩"#, r#"ي"#, r#"ي"#),
+        (r#"𞸪"#, r#"𞸪"#, r#"𞸪"#, r#"ك"#, r#"ك"#),
+        (r#"𞸫"#, r#"𞸫"#, r#"𞸫"#, r#"ل"#, r#"ل"#),
+        (r#"𞸬"#, r#"𞸬"#, r#"𞸬"#, r#"م"#, r#"م"#),
+        (r#"𞸭"#, r#"𞸭"#, r#"𞸭"#, r#"ن"#, r#"ن"#),
+        (r#"𞸮"#, r#"𞸮"#, r#"𞸮"#, r#"س"#, r#"س"#),
+        (r#"𞸯"#, r#"𞸯"#, r#"𞸯"#, r#"ع"#, r#"ع"#),
+        (r#"𞸰"#, r#"𞸰"#, r#"𞸰"#, r#"ف"#, r#"ف"#),
+        (r#"𞸱"#, r#"𞸱"#, r#"𞸱"#, r#"ص"#, r#"ص"#),
+        (r#"𞸲"#, r#"𞸲"#, r#"𞸲"#, r#"ق"#, r#"ق"#),
+        (r#"𞸴"#, r#"𞸴"#, r#"𞸴"#, r#"ش"#, r#"ش"#),
+        (r#"𞸵"#, r#"𞸵"#, r#"𞸵"#, r#"ت"#, r#"ت"#),
+        (r#"𞸶"#, r#"𞸶"#, r#"𞸶"#, r#"ث"#, r#"ث"#),
+        (r#"𞸷"#, r#"𞸷"#, r#"𞸷"#, r#"خ"#, r#"خ"#),
+        (r#"𞸹"#, r#"𞸹"#, r#"𞸹"#, r#"ض"#, r#"ض"#),
+        (r#"𞸻"#, r#"𞸻"#, r#"𞸻"#, r#"غ"#, r#"غ"#),
+        (r#"𞹂"#, r#"𞹂"#, r#"𞹂"#, r#"ج"#, r#"ج"#),
+        (r#"𞹇"#, r#"𞹇"#, r#"𞹇"#, r#"ح"#, r#"ح"#),
+        (r#"𞹉"#, r#"𞹉"#, r#"𞹉"#, r#"ي"#, r#"ي"#),
+        (r#"𞹋"#, r#"𞹋"#, r#"𞹋"#, r#"ل"#, r#"ل"#),
+        (r#"𞹍"#, r#"𞹍"#, r#"𞹍"#, r#"ن"#, r#"ن"#),
+        (r#"𞹎"#, r#"𞹎"#, r#"𞹎"#, r#"س"#, r#"س"#),
+        (r#"𞹏"#, r#"𞹏"#, r#"𞹏"#, r#"ع"#, r#"ع"#),
+        (r#"𞹑"#, r#"𞹑"#, r#"𞹑"#, r#"ص"#, r#"ص"#),
+        (r#"𞹒"#, r#"𞹒"#, r#"𞹒"#, r#"ق"#, r#"ق"#),
+        (r#"𞹔"#, r#"𞹔"#, r#"𞹔"#, r#"ش"#, r#"ش"#),
+        (r#"𞹗"#, r#"𞹗"#, r#"𞹗"#, r#"خ"#, r#"خ"#),
+        (r#"𞹙"#, r#"𞹙"#, r#"𞹙"#, r#"ض"#, r#"ض"#),
+        (r#"𞹛"#, r#"𞹛"#, r#"𞹛"#, r#"غ"#, r#"غ"#),
+        (r#"𞹝"#, r#"𞹝"#, r#"𞹝"#, r#"ں"#, r#"ں"#),
+        (r#"𞹟"#, r#"𞹟"#, r#"𞹟"#, r#"ٯ"#, r#"ٯ"#),
+        (r#"𞹡"#, r#"𞹡"#, r#"𞹡"#, r#"ب"#, r#"ب"#),
+        (r#"𞹢"#, r#"𞹢"#, r#"𞹢"#, r#"ج"#, r#"ج"#),
+        (r#"𞹤"#, r#"𞹤"#, r#"𞹤"#, r#"ه"#, r#"ه"#),
+        (r#"𞹧"#, r#"𞹧"#, r#"𞹧"#, r#"ح"#, r#"ح"#),
+        (r#"𞹨"#, r#"𞹨"#, r#"𞹨"#, r#"ط"#, r#"ط"#),
+        (r#"𞹩"#, r#"𞹩"#, r#"𞹩"#, r#"ي"#, r#"ي"#),
+        (r#"𞹪"#, r#"𞹪"#, r#"𞹪"#, r#"ك"#, r#"ك"#),
+        (r#"𞹬"#, r#"𞹬"#, r#"𞹬"#, r#"م"#, r#"م"#),
+        (r#"𞹭"#, r#"𞹭"#, r#"𞹭"#, r#"ن"#, r#"ن"#),
+        (r#"𞹮"#, r#"𞹮"#, r#"𞹮"#, r#"س"#, r#"س"#),
+        (r#"𞹯"#, r#"𞹯"#, r#"𞹯"#, r#"ع"#, r#"ع"#),
+        (r#"𞹰"#, r#"𞹰"#, r#"𞹰"#, r#"ف"#, r#"ف"#),
+        (r#"𞹱"#, r#"𞹱"#, r#"𞹱"#, r#"ص"#, r#"ص"#),
+        (r#"𞹲"#, r#"𞹲"#, r#"𞹲"#, r#"ق"#, r#"ق"#),
+        (r#"𞹴"#, r#"𞹴"#, r#"𞹴"#, r#"ش"#, r#"ش"#),
+        (r#"𞹵"#, r#"𞹵"#, r#"𞹵"#, r#"ت"#, r#"ت"#),
+        (r#"𞹶"#, r#"𞹶"#, r#"𞹶"#, r#"ث"#, r#"ث"#),
+        (r#"𞹷"#, r#"𞹷"#, r#"𞹷"#, r#"خ"#, r#"خ"#),
+        (r#"𞹹"#, r#"𞹹"#, r#"𞹹"#, r#"ض"#, r#"ض"#),
+        (r#"𞹺"#, r#"𞹺"#, r#"𞹺"#, r#"ظ"#, r#"ظ"#),
+        (r#"𞹻"#, r#"𞹻"#, r#"𞹻"#, r#"غ"#, r#"غ"#),
+        (r#"𞹼"#, r#"𞹼"#, r#"𞹼"#, r#"ٮ"#, r#"ٮ"#),
+        (r#"𞹾"#, r#"𞹾"#, r#"𞹾"#, r#"ڡ"#, r#"ڡ"#),
+        (r#"𞺀"#, r#"𞺀"#, r#"𞺀"#, r#"ا"#, r#"ا"#),
+        (r#"𞺁"#, r#"𞺁"#, r#"𞺁"#, r#"ب"#, r#"ب"#),
+        (r#"𞺂"#, r#"𞺂"#, r#"𞺂"#, r#"ج"#, r#"ج"#),
+        (r#"𞺃"#, r#"𞺃"#, r#"𞺃"#, r#"د"#, r#"د"#),
+        (r#"𞺄"#, r#"𞺄"#, r#"𞺄"#, r#"ه"#, r#"ه"#),
+        (r#"𞺅"#, r#"𞺅"#, r#"𞺅"#, r#"و"#, r#"و"#),
+        (r#"𞺆"#, r#"𞺆"#, r#"𞺆"#, r#"ز"#, r#"ز"#),
+        (r#"𞺇"#, r#"𞺇"#, r#"𞺇"#, r#"ح"#, r#"ح"#),
+        (r#"𞺈"#, r#"𞺈"#, r#"𞺈"#, r#"ط"#, r#"ط"#),
+        (r#"𞺉"#, r#"𞺉"#, r#"𞺉"#, r#"ي"#, r#"ي"#),
+        (r#"𞺋"#, r#"𞺋"#, r#"𞺋"#, r#"ل"#, r#"ل"#),
+        (r#"𞺌"#, r#"𞺌"#, r#"𞺌"#, r#"م"#, r#"م"#),
+        (r#"𞺍"#, r#"𞺍"#, r#"𞺍"#, r#"ن"#, r#"ن"#),
+        (r#"𞺎"#, r#"𞺎"#, r#"𞺎"#, r#"س"#, r#"س"#),
+        (r#"𞺏"#, r#"𞺏"#, r#"𞺏"#, r#"ع"#, r#"ع"#),
+        (r#"𞺐"#, r#"𞺐"#, r#"𞺐"#, r#"ف"#, r#"ف"#),
+        (r#"𞺑"#, r#"𞺑"#, r#"𞺑"#, r#"ص"#, r#"ص"#),
+        (r#"𞺒"#, r#"𞺒"#, r#"𞺒"#, r#"ق"#, r#"ق"#),
+        (r#"𞺓"#, r#"𞺓"#, r#"𞺓"#, r#"ر"#, r#"ر"#),
+        (r#"𞺔"#, r#"𞺔"#, r#"𞺔"#, r#"ش"#, r#"ش"#),
+        (r#"𞺕"#, r#"𞺕"#, r#"𞺕"#, r#"ت"#, r#"ت"#),
+        (r#"𞺖"#, r#"𞺖"#, r#"𞺖"#, r#"ث"#, r#"ث"#),
+        (r#"𞺗"#, r#"𞺗"#, r#"𞺗"#, r#"خ"#, r#"خ"#),
+        (r#"𞺘"#, r#"𞺘"#, r#"𞺘"#, r#"ذ"#, r#"ذ"#),
+        (r#"𞺙"#, r#"𞺙"#, r#"𞺙"#, r#"ض"#, r#"ض"#),
+        (r#"𞺚"#, r#"𞺚"#, r#"𞺚"#, r#"ظ"#, r#"ظ"#),
+        (r#"𞺛"#, r#"𞺛"#, r#"𞺛"#, r#"غ"#, r#"غ"#),
+        (r#"𞺡"#, r#"𞺡"#, r#"𞺡"#, r#"ب"#, r#"ب"#),
+        (r#"𞺢"#, r#"𞺢"#, r#"𞺢"#, r#"ج"#, r#"ج"#),
+        (r#"𞺣"#, r#"𞺣"#, r#"𞺣"#, r#"د"#, r#"د"#),
+        (r#"𞺥"#, r#"𞺥"#, r#"𞺥"#, r#"و"#, r#"و"#),
+        (r#"𞺦"#, r#"𞺦"#, r#"𞺦"#, r#"ز"#, r#"ز"#),
+        (r#"𞺧"#, r#"𞺧"#, r#"𞺧"#, r#"ح"#, r#"ح"#),
+        (r#"𞺨"#, r#"𞺨"#, r#"𞺨"#, r#"ط"#, r#"ط"#),
+        (r#"𞺩"#, r#"𞺩"#, r#"𞺩"#, r#"ي"#, r#"ي"#),
+        (r#"𞺫"#, r#"𞺫"#, r#"𞺫"#, r#"ل"#, r#"ل"#),
+        (r#"𞺬"#, r#"𞺬"#, r#"𞺬"#, r#"م"#, r#"م"#),
+        (r#"𞺭"#, r#"𞺭"#, r#"𞺭"#, r#"ن"#, r#"ن"#),
+        (r#"𞺮"#, r#"𞺮"#, r#"𞺮"#, r#"س"#, r#"س"#),
+        (r#"𞺯"#, r#"𞺯"#, r#"𞺯"#, r#"ع"#, r#"ع"#),
+        (r#"𞺰"#, r#"𞺰"#, r#"𞺰"#, r#"ف"#, r#"ف"#),
+        (r#"𞺱"#, r#"𞺱"#, r#"𞺱"#, r#"ص"#, r#"ص"#),
+        (r#"𞺲"#, r#"𞺲"#, r#"𞺲"#, r#"ق"#, r#"ق"#),
+        (r#"𞺳"#, r#"𞺳"#, r#"𞺳"#, r#"ر"#, r#"ر"#),
+        (r#"𞺴"#, r#"𞺴"#, r#"𞺴"#, r#"ش"#, r#"ش"#),
+        (r#"𞺵"#, r#"𞺵"#, r#"𞺵"#, r#"ت"#, r#"ت"#),
+        (r#"𞺶"#, r#"𞺶"#, r#"𞺶"#, r#"ث"#, r#"ث"#),
+        (r#"𞺷"#, r#"𞺷"#, r#"𞺷"#, r#"خ"#, r#"خ"#),
+        (r#"𞺸"#, r#"𞺸"#, r#"𞺸"#, r#"ذ"#, r#"ذ"#),
+        (r#"𞺹"#, r#"𞺹"#, r#"𞺹"#, r#"ض"#, r#"ض"#),
+        (r#"𞺺"#, r#"𞺺"#, r#"𞺺"#, r#"ظ"#, r#"ظ"#),
+        (r#"𞺻"#, r#"𞺻"#, r#"𞺻"#, r#"غ"#, r#"غ"#),
+        (r#"🄀"#, r#"🄀"#, r#"🄀"#, r#"0."#, r#"0."#),
+        (r#"🄁"#, r#"🄁"#, r#"🄁"#, r#"0,"#, r#"0,"#),
+        (r#"🄂"#, r#"🄂"#, r#"🄂"#, r#"1,"#, r#"1,"#),
+        (r#"🄃"#, r#"🄃"#, r#"🄃"#, r#"2,"#, r#"2,"#),
+        (r#"🄄"#, r#"🄄"#, r#"🄄"#, r#"3,"#, r#"3,"#),
+        (r#"🄅"#, r#"🄅"#, r#"🄅"#, r#"4,"#, r#"4,"#),
+        (r#"🄆"#, r#"🄆"#, r#"🄆"#, r#"5,"#, r#"5,"#),
+        (r#"🄇"#, r#"🄇"#, r#"🄇"#, r#"6,"#, r#"6,"#),
+        (r#"🄈"#, r#"🄈"#, r#"🄈"#, r#"7,"#, r#"7,"#),
+        (r#"🄉"#, r#"🄉"#, r#"🄉"#, r#"8,"#, r#"8,"#),
+        (r#"🄊"#, r#"🄊"#, r#"🄊"#, r#"9,"#, r#"9,"#),
+        (r#"🄐"#, r#"🄐"#, r#"🄐"#, r#"(A)"#, r#"(A)"#),
+        (r#"🄑"#, r#"🄑"#, r#"🄑"#, r#"(B)"#, r#"(B)"#),
+        (r#"🄒"#, r#"🄒"#, r#"🄒"#, r#"(C)"#, r#"(C)"#),
+        (r#"🄓"#, r#"🄓"#, r#"🄓"#, r#"(D)"#, r#"(D)"#),
+        (r#"🄔"#, r#"🄔"#, r#"🄔"#, r#"(E)"#, r#"(E)"#),
+        (r#"🄕"#, r#"🄕"#, r#"🄕"#, r#"(F)"#, r#"(F)"#),
+        (r#"🄖"#, r#"🄖"#, r#"🄖"#, r#"(G)"#, r#"(G)"#),
+        (r#"🄗"#, r#"🄗"#, r#"🄗"#, r#"(H)"#, r#"(H)"#),
+        (r#"🄘"#, r#"🄘"#, r#"🄘"#, r#"(I)"#, r#"(I)"#),
+        (r#"🄙"#, r#"🄙"#, r#"🄙"#, r#"(J)"#, r#"(J)"#),
+        (r#"🄚"#, r#"🄚"#, r#"🄚"#, r#"(K)"#, r#"(K)"#),
+        (r#"🄛"#, r#"🄛"#, r#"🄛"#, r#"(L)"#, r#"(L)"#),
+        (r#"🄜"#, r#"🄜"#, r#"🄜"#, r#"(M)"#, r#"(M)"#),
+        (r#"🄝"#, r#"🄝"#, r#"🄝"#, r#"(N)"#, r#"(N)"#),
+        (r#"🄞"#, r#"🄞"#, r#"🄞"#, r#"(O)"#, r#"(O)"#),
+        (r#"🄟"#, r#"🄟"#, r#"🄟"#, r#"(P)"#, r#"(P)"#),
+        (r#"🄠"#, r#"🄠"#, r#"🄠"#, r#"(Q)"#, r#"(Q)"#),
+        (r#"🄡"#, r#"🄡"#, r#"🄡"#, r#"(R)"#, r#"(R)"#),
+        (r#"🄢"#, r#"🄢"#, r#"🄢"#, r#"(S)"#, r#"(S)"#),
+        (r#"🄣"#, r#"🄣"#, r#"🄣"#, r#"(T)"#, r#"(T)"#),
+        (r#"🄤"#, r#"🄤"#, r#"🄤"#, r#"(U)"#, r#"(U)"#),
+        (r#"🄥"#, r#"🄥"#, r#"🄥"#, r#"(V)"#, r#"(V)"#),
+        (r#"🄦"#, r#"🄦"#, r#"🄦"#, r#"(W)"#, r#"(W)"#),
+        (r#"🄧"#, r#"🄧"#, r#"🄧"#, r#"(X)"#, r#"(X)"#),
+        (r#"🄨"#, r#"🄨"#, r#"🄨"#, r#"(Y)"#, r#"(Y)"#),
+        (r#"🄩"#, r#"🄩"#, r#"🄩"#, r#"(Z)"#, r#"(Z)"#),
+        (r#"🄪"#, r#"🄪"#, r#"🄪"#, r#"〔S〕"#, r#"〔S〕"#),
+        (r#"🄫"#, r#"🄫"#, r#"🄫"#, r#"C"#, r#"C"#),
+        (r#"🄬"#, r#"🄬"#, r#"🄬"#, r#"R"#, r#"R"#),
+        (r#"🄭"#, r#"🄭"#, r#"🄭"#, r#"CD"#, r#"CD"#),
+        (r#"🄮"#, r#"🄮"#, r#"🄮"#, r#"WZ"#, r#"WZ"#),
+        (r#"🄰"#, r#"🄰"#, r#"🄰"#, r#"A"#, r#"A"#),
+        (r#"🄱"#, r#"🄱"#, r#"🄱"#, r#"B"#, r#"B"#),
+        (r#"🄲"#, r#"🄲"#, r#"🄲"#, r#"C"#, r#"C"#),
+        (r#"🄳"#, r#"🄳"#, r#"🄳"#, r#"D"#, r#"D"#),
+        (r#"🄴"#, r#"🄴"#, r#"🄴"#, r#"E"#, r#"E"#),
+        (r#"🄵"#, r#"🄵"#, r#"🄵"#, r#"F"#, r#"F"#),
+        (r#"🄶"#, r#"🄶"#, r#"🄶"#, r#"G"#, r#"G"#),
+        (r#"🄷"#, r#"🄷"#, r#"🄷"#, r#"H"#, r#"H"#),
+        (r#"🄸"#, r#"🄸"#, r#"🄸"#, r#"I"#, r#"I"#),
+        (r#"🄹"#, r#"🄹"#, r#"🄹"#, r#"J"#, r#"J"#),
+        (r#"🄺"#, r#"🄺"#, r#"🄺"#, r#"K"#, r#"K"#),
+        (r#"🄻"#, r#"🄻"#, r#"🄻"#, r#"L"#, r#"L"#),
+        (r#"🄼"#, r#"🄼"#, r#"🄼"#, r#"M"#, r#"M"#),
+        (r#"🄽"#, r#"🄽"#, r#"🄽"#, r#"N"#, r#"N"#),
+        (r#"🄾"#, r#"🄾"#, r#"🄾"#, r#"O"#, r#"O"#),
+        (r#"🄿"#, r#"🄿"#, r#"🄿"#, r#"P"#, r#"P"#),
+        (r#"🅀"#, r#"🅀"#, r#"🅀"#, r#"Q"#, r#"Q"#),
+        (r#"🅁"#, r#"🅁"#, r#"🅁"#, r#"R"#, r#"R"#),
+        (r#"🅂"#, r#"🅂"#, r#"🅂"#, r#"S"#, r#"S"#),
+        (r#"🅃"#, r#"🅃"#, r#"🅃"#, r#"T"#, r#"T"#),
+        (r#"🅄"#, r#"🅄"#, r#"🅄"#, r#"U"#, r#"U"#),
+        (r#"🅅"#, r#"🅅"#, r#"🅅"#, r#"V"#, r#"V"#),
+        (r#"🅆"#, r#"🅆"#, r#"🅆"#, r#"W"#, r#"W"#),
+        (r#"🅇"#, r#"🅇"#, r#"🅇"#, r#"X"#, r#"X"#),
+        (r#"🅈"#, r#"🅈"#, r#"🅈"#, r#"Y"#, r#"Y"#),
+        (r#"🅉"#, r#"🅉"#, r#"🅉"#, r#"Z"#, r#"Z"#),
+        (r#"🅊"#, r#"🅊"#, r#"🅊"#, r#"HV"#, r#"HV"#),
+        (r#"🅋"#, r#"🅋"#, r#"🅋"#, r#"MV"#, r#"MV"#),
+        (r#"🅌"#, r#"🅌"#, r#"🅌"#, r#"SD"#, r#"SD"#),
+        (r#"🅍"#, r#"🅍"#, r#"🅍"#, r#"SS"#, r#"SS"#),
+        (r#"🅎"#, r#"🅎"#, r#"🅎"#, r#"PPV"#, r#"PPV"#),
+        (r#"🅏"#, r#"🅏"#, r#"🅏"#, r#"WC"#, r#"WC"#),
+        (r#"🅪"#, r#"🅪"#, r#"🅪"#, r#"MC"#, r#"MC"#),
+        (r#"🅫"#, r#"🅫"#, r#"🅫"#, r#"MD"#, r#"MD"#),
+        (r#"🅬"#, r#"🅬"#, r#"🅬"#, r#"MR"#, r#"MR"#),
+        (r#"🆐"#, r#"🆐"#, r#"🆐"#, r#"DJ"#, r#"DJ"#),
+        (r#"🈀"#, r#"🈀"#, r#"🈀"#, r#"ほか"#, r#"ほか"#),
+        (r#"🈁"#, r#"🈁"#, r#"🈁"#, r#"ココ"#, r#"ココ"#),
+        (r#"🈂"#, r#"🈂"#, r#"🈂"#, r#"サ"#, r#"サ"#),
+        (r#"🈐"#, r#"🈐"#, r#"🈐"#, r#"手"#, r#"手"#),
+        (r#"🈑"#, r#"🈑"#, r#"🈑"#, r#"字"#, r#"字"#),
+        (r#"🈒"#, r#"🈒"#, r#"🈒"#, r#"双"#, r#"双"#),
+        (r#"🈓"#, r#"🈓"#, r#"🈓"#, r#"デ"#, r#"デ"#),
+        (r#"🈔"#, r#"🈔"#, r#"🈔"#, r#"二"#, r#"二"#),
+        (r#"🈕"#, r#"🈕"#, r#"🈕"#, r#"多"#, r#"多"#),
+        (r#"🈖"#, r#"🈖"#, r#"🈖"#, r#"解"#, r#"解"#),
+        (r#"🈗"#, r#"🈗"#, r#"🈗"#, r#"天"#, r#"天"#),
+        (r#"🈘"#, r#"🈘"#, r#"🈘"#, r#"交"#, r#"交"#),
+        (r#"🈙"#, r#"🈙"#, r#"🈙"#, r#"映"#, r#"映"#),
+        (r#"🈚"#, r#"🈚"#, r#"🈚"#, r#"無"#, r#"無"#),
+        (r#"🈛"#, r#"🈛"#, r#"🈛"#, r#"料"#, r#"料"#),
+        (r#"🈜"#, r#"🈜"#, r#"🈜"#, r#"前"#, r#"前"#),
+        (r#"🈝"#, r#"🈝"#, r#"🈝"#, r#"後"#, r#"後"#),
+        (r#"🈞"#, r#"🈞"#, r#"🈞"#, r#"再"#, r#"再"#),
+        (r#"🈟"#, r#"🈟"#, r#"🈟"#, r#"新"#, r#"新"#),
+        (r#"🈠"#, r#"🈠"#, r#"🈠"#, r#"初"#, r#"初"#),
+        (r#"🈡"#, r#"🈡"#, r#"🈡"#, r#"終"#, r#"終"#),
+        (r#"🈢"#, r#"🈢"#, r#"🈢"#, r#"生"#, r#"生"#),
+        (r#"🈣"#, r#"🈣"#, r#"🈣"#, r#"販"#, r#"販"#),
+        (r#"🈤"#, r#"🈤"#, r#"🈤"#, r#"声"#, r#"声"#),
+        (r#"🈥"#, r#"🈥"#, r#"🈥"#, r#"吹"#, r#"吹"#),
+        (r#"🈦"#, r#"🈦"#, r#"🈦"#, r#"演"#, r#"演"#),
+        (r#"🈧"#, r#"🈧"#, r#"🈧"#, r#"投"#, r#"投"#),
+        (r#"🈨"#, r#"🈨"#, r#"🈨"#, r#"捕"#, r#"捕"#),
+        (r#"🈩"#, r#"🈩"#, r#"🈩"#, r#"一"#, r#"一"#),
+        (r#"🈪"#, r#"🈪"#, r#"🈪"#, r#"三"#, r#"三"#),
+        (r#"🈫"#, r#"🈫"#, r#"🈫"#, r#"遊"#, r#"遊"#),
+        (r#"🈬"#, r#"🈬"#, r#"🈬"#, r#"左"#, r#"左"#),
+        (r#"🈭"#, r#"🈭"#, r#"🈭"#, r#"中"#, r#"中"#),
+        (r#"🈮"#, r#"🈮"#, r#"🈮"#, r#"右"#, r#"右"#),
+        (r#"🈯"#, r#"🈯"#, r#"🈯"#, r#"指"#, r#"指"#),
+        (r#"🈰"#, r#"🈰"#, r#"🈰"#, r#"走"#, r#"走"#),
+        (r#"🈱"#, r#"🈱"#, r#"🈱"#, r#"打"#, r#"打"#),
+        (r#"🈲"#, r#"🈲"#, r#"🈲"#, r#"禁"#, r#"禁"#),
+        (r#"🈳"#, r#"🈳"#, r#"🈳"#, r#"空"#, r#"空"#),
+        (r#"🈴"#, r#"🈴"#, r#"🈴"#, r#"合"#, r#"合"#),
+        (r#"🈵"#, r#"🈵"#, r#"🈵"#, r#"満"#, r#"満"#),
+        (r#"🈶"#, r#"🈶"#, r#"🈶"#, r#"有"#, r#"有"#),
+        (r#"🈷"#, r#"🈷"#, r#"🈷"#, r#"月"#, r#"月"#),
+        (r#"🈸"#, r#"🈸"#, r#"🈸"#, r#"申"#, r#"申"#),
+        (r#"🈹"#, r#"🈹"#, r#"🈹"#, r#"割"#, r#"割"#),
+        (r#"🈺"#, r#"🈺"#, r#"🈺"#, r#"営"#, r#"営"#),
+        (r#"🈻"#, r#"🈻"#, r#"🈻"#, r#"配"#, r#"配"#),
+        (r#"🉀"#, r#"🉀"#, r#"🉀"#, r#"〔本〕"#, r#"〔本〕"#),
+        (r#"🉁"#, r#"🉁"#, r#"🉁"#, r#"〔三〕"#, r#"〔三〕"#),
+        (r#"🉂"#, r#"🉂"#, r#"🉂"#, r#"〔二〕"#, r#"〔二〕"#),
+        (r#"🉃"#, r#"🉃"#, r#"🉃"#, r#"〔安〕"#, r#"〔安〕"#),
+        (r#"🉄"#, r#"🉄"#, r#"🉄"#, r#"〔点〕"#, r#"〔点〕"#),
+        (r#"🉅"#, r#"🉅"#, r#"🉅"#, r#"〔打〕"#, r#"〔打〕"#),
+        (r#"🉆"#, r#"🉆"#, r#"🉆"#, r#"〔盗〕"#, r#"〔盗〕"#),
+        (r#"🉇"#, r#"🉇"#, r#"🉇"#, r#"〔勝〕"#, r#"〔勝〕"#),
+        (r#"🉈"#, r#"🉈"#, r#"🉈"#, r#"〔敗〕"#, r#"〔敗〕"#),
+        (r#"🉐"#, r#"🉐"#, r#"🉐"#, r#"得"#, r#"得"#),
+        (r#"🉑"#, r#"🉑"#, r#"🉑"#, r#"可"#, r#"可"#),
+        (r#"🯰"#, r#"🯰"#, r#"🯰"#, r#"0"#, r#"0"#),
+        (r#"🯱"#, r#"🯱"#, r#"🯱"#, r#"1"#, r#"1"#),
+        (r#"🯲"#, r#"🯲"#, r#"🯲"#, r#"2"#, r#"2"#),
+        (r#"🯳"#, r#"🯳"#, r#"🯳"#, r#"3"#, r#"3"#),
+        (r#"🯴"#, r#"🯴"#, r#"🯴"#, r#"4"#, r#"4"#),
+        (r#"🯵"#, r#"🯵"#, r#"🯵"#, r#"5"#, r#"5"#),
+        (r#"🯶"#, r#"🯶"#, r#"🯶"#, r#"6"#, r#"6"#),
+        (r#"🯷"#, r#"🯷"#, r#"🯷"#, r#"7"#, r#"7"#),
+        (r#"🯸"#, r#"🯸"#, r#"🯸"#, r#"8"#, r#"8"#),
+        (r#"🯹"#, r#"🯹"#, r#"🯹"#, r#"9"#, r#"9"#),
+        (r#"丽"#, r#"丽"#, r#"丽"#, r#"丽"#, r#"丽"#),
+        (r#"丸"#, r#"丸"#, r#"丸"#, r#"丸"#, r#"丸"#),
+        (r#"乁"#, r#"乁"#, r#"乁"#, r#"乁"#, r#"乁"#),
+        (r#"𠄢"#, r#"𠄢"#, r#"𠄢"#, r#"𠄢"#, r#"𠄢"#),
+        (r#"你"#, r#"你"#, r#"你"#, r#"你"#, r#"你"#),
+        (r#"侮"#, r#"侮"#, r#"侮"#, r#"侮"#, r#"侮"#),
+        (r#"侻"#, r#"侻"#, r#"侻"#, r#"侻"#, r#"侻"#),
+        (r#"倂"#, r#"倂"#, r#"倂"#, r#"倂"#, r#"倂"#),
+        (r#"偺"#, r#"偺"#, r#"偺"#, r#"偺"#, r#"偺"#),
+        (r#"備"#, r#"備"#, r#"備"#, r#"備"#, r#"備"#),
+        (r#"僧"#, r#"僧"#, r#"僧"#, r#"僧"#, r#"僧"#),
+        (r#"像"#, r#"像"#, r#"像"#, r#"像"#, r#"像"#),
+        (r#"㒞"#, r#"㒞"#, r#"㒞"#, r#"㒞"#, r#"㒞"#),
+        (r#"𠘺"#, r#"𠘺"#, r#"𠘺"#, r#"𠘺"#, r#"𠘺"#),
+        (r#"免"#, r#"免"#, r#"免"#, r#"免"#, r#"免"#),
+        (r#"兔"#, r#"兔"#, r#"兔"#, r#"兔"#, r#"兔"#),
+        (r#"兤"#, r#"兤"#, r#"兤"#, r#"兤"#, r#"兤"#),
+        (r#"具"#, r#"具"#, r#"具"#, r#"具"#, r#"具"#),
+        (r#"𠔜"#, r#"𠔜"#, r#"𠔜"#, r#"𠔜"#, r#"𠔜"#),
+        (r#"㒹"#, r#"㒹"#, r#"㒹"#, r#"㒹"#, r#"㒹"#),
+        (r#"內"#, r#"內"#, r#"內"#, r#"內"#, r#"內"#),
+        (r#"再"#, r#"再"#, r#"再"#, r#"再"#, r#"再"#),
+        (r#"𠕋"#, r#"𠕋"#, r#"𠕋"#, r#"𠕋"#, r#"𠕋"#),
+        (r#"冗"#, r#"冗"#, r#"冗"#, r#"冗"#, r#"冗"#),
+        (r#"冤"#, r#"冤"#, r#"冤"#, r#"冤"#, r#"冤"#),
+        (r#"仌"#, r#"仌"#, r#"仌"#, r#"仌"#, r#"仌"#),
+        (r#"冬"#, r#"冬"#, r#"冬"#, r#"冬"#, r#"冬"#),
+        (r#"况"#, r#"况"#, r#"况"#, r#"况"#, r#"况"#),
+        (r#"𩇟"#, r#"𩇟"#, r#"𩇟"#, r#"𩇟"#, r#"𩇟"#),
+        (r#"凵"#, r#"凵"#, r#"凵"#, r#"凵"#, r#"凵"#),
+        (r#"刃"#, r#"刃"#, r#"刃"#, r#"刃"#, r#"刃"#),
+        (r#"㓟"#, r#"㓟"#, r#"㓟"#, r#"㓟"#, r#"㓟"#),
+        (r#"刻"#, r#"刻"#, r#"刻"#, r#"刻"#, r#"刻"#),
+        (r#"剆"#, r#"剆"#, r#"剆"#, r#"剆"#, r#"剆"#),
+        (r#"割"#, r#"割"#, r#"割"#, r#"割"#, r#"割"#),
+        (r#"剷"#, r#"剷"#, r#"剷"#, r#"剷"#, r#"剷"#),
+        (r#"㔕"#, r#"㔕"#, r#"㔕"#, r#"㔕"#, r#"㔕"#),
+        (r#"勇"#, r#"勇"#, r#"勇"#, r#"勇"#, r#"勇"#),
+        (r#"勉"#, r#"勉"#, r#"勉"#, r#"勉"#, r#"勉"#),
+        (r#"勤"#, r#"勤"#, r#"勤"#, r#"勤"#, r#"勤"#),
+        (r#"勺"#, r#"勺"#, r#"勺"#, r#"勺"#, r#"勺"#),
+        (r#"包"#, r#"包"#, r#"包"#, r#"包"#, r#"包"#),
+        (r#"匆"#, r#"匆"#, r#"匆"#, r#"匆"#, r#"匆"#),
+        (r#"北"#, r#"北"#, r#"北"#, r#"北"#, r#"北"#),
+        (r#"卉"#, r#"卉"#, r#"卉"#, r#"卉"#, r#"卉"#),
+        (r#"卑"#, r#"卑"#, r#"卑"#, r#"卑"#, r#"卑"#),
+        (r#"博"#, r#"博"#, r#"博"#, r#"博"#, r#"博"#),
+        (r#"即"#, r#"即"#, r#"即"#, r#"即"#, r#"即"#),
+        (r#"卽"#, r#"卽"#, r#"卽"#, r#"卽"#, r#"卽"#),
+        (r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#),
+        (r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#),
+        (r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#, r#"卿"#),
+        (r#"𠨬"#, r#"𠨬"#, r#"𠨬"#, r#"𠨬"#, r#"𠨬"#),
+        (r#"灰"#, r#"灰"#, r#"灰"#, r#"灰"#, r#"灰"#),
+        (r#"及"#, r#"及"#, r#"及"#, r#"及"#, r#"及"#),
+        (r#"叟"#, r#"叟"#, r#"叟"#, r#"叟"#, r#"叟"#),
+        (r#"𠭣"#, r#"𠭣"#, r#"𠭣"#, r#"𠭣"#, r#"𠭣"#),
+        (r#"叫"#, r#"叫"#, r#"叫"#, r#"叫"#, r#"叫"#),
+        (r#"叱"#, r#"叱"#, r#"叱"#, r#"叱"#, r#"叱"#),
+        (r#"吆"#, r#"吆"#, r#"吆"#, r#"吆"#, r#"吆"#),
+        (r#"咞"#, r#"咞"#, r#"咞"#, r#"咞"#, r#"咞"#),
+        (r#"吸"#, r#"吸"#, r#"吸"#, r#"吸"#, r#"吸"#),
+        (r#"呈"#, r#"呈"#, r#"呈"#, r#"呈"#, r#"呈"#),
+        (r#"周"#, r#"周"#, r#"周"#, r#"周"#, r#"周"#),
+        (r#"咢"#, r#"咢"#, r#"咢"#, r#"咢"#, r#"咢"#),
+        (r#"哶"#, r#"哶"#, r#"哶"#, r#"哶"#, r#"哶"#),
+        (r#"唐"#, r#"唐"#, r#"唐"#, r#"唐"#, r#"唐"#),
+        (r#"啓"#, r#"啓"#, r#"啓"#, r#"啓"#, r#"啓"#),
+        (r#"啣"#, r#"啣"#, r#"啣"#, r#"啣"#, r#"啣"#),
+        (r#"善"#, r#"善"#, r#"善"#, r#"善"#, r#"善"#),
+        (r#"善"#, r#"善"#, r#"善"#, r#"善"#, r#"善"#),
+        (r#"喙"#, r#"喙"#, r#"喙"#, r#"喙"#, r#"喙"#),
+        (r#"喫"#, r#"喫"#, r#"喫"#, r#"喫"#, r#"喫"#),
+        (r#"喳"#, r#"喳"#, r#"喳"#, r#"喳"#, r#"喳"#),
+        (r#"嗂"#, r#"嗂"#, r#"嗂"#, r#"嗂"#, r#"嗂"#),
+        (r#"圖"#, r#"圖"#, r#"圖"#, r#"圖"#, r#"圖"#),
+        (r#"嘆"#, r#"嘆"#, r#"嘆"#, r#"嘆"#, r#"嘆"#),
+        (r#"圗"#, r#"圗"#, r#"圗"#, r#"圗"#, r#"圗"#),
+        (r#"噑"#, r#"噑"#, r#"噑"#, r#"噑"#, r#"噑"#),
+        (r#"噴"#, r#"噴"#, r#"噴"#, r#"噴"#, r#"噴"#),
+        (r#"切"#, r#"切"#, r#"切"#, r#"切"#, r#"切"#),
+        (r#"壮"#, r#"壮"#, r#"壮"#, r#"壮"#, r#"壮"#),
+        (r#"城"#, r#"城"#, r#"城"#, r#"城"#, r#"城"#),
+        (r#"埴"#, r#"埴"#, r#"埴"#, r#"埴"#, r#"埴"#),
+        (r#"堍"#, r#"堍"#, r#"堍"#, r#"堍"#, r#"堍"#),
+        (r#"型"#, r#"型"#, r#"型"#, r#"型"#, r#"型"#),
+        (r#"堲"#, r#"堲"#, r#"堲"#, r#"堲"#, r#"堲"#),
+        (r#"報"#, r#"報"#, r#"報"#, r#"報"#, r#"報"#),
+        (r#"墬"#, r#"墬"#, r#"墬"#, r#"墬"#, r#"墬"#),
+        (r#"𡓤"#, r#"𡓤"#, r#"𡓤"#, r#"𡓤"#, r#"𡓤"#),
+        (r#"売"#, r#"売"#, r#"売"#, r#"売"#, r#"売"#),
+        (r#"壷"#, r#"壷"#, r#"壷"#, r#"壷"#, r#"壷"#),
+        (r#"夆"#, r#"夆"#, r#"夆"#, r#"夆"#, r#"夆"#),
+        (r#"多"#, r#"多"#, r#"多"#, r#"多"#, r#"多"#),
+        (r#"夢"#, r#"夢"#, r#"夢"#, r#"夢"#, r#"夢"#),
+        (r#"奢"#, r#"奢"#, r#"奢"#, r#"奢"#, r#"奢"#),
+        (r#"𡚨"#, r#"𡚨"#, r#"𡚨"#, r#"𡚨"#, r#"𡚨"#),
+        (r#"𡛪"#, r#"𡛪"#, r#"𡛪"#, r#"𡛪"#, r#"𡛪"#),
+        (r#"姬"#, r#"姬"#, r#"姬"#, r#"姬"#, r#"姬"#),
+        (r#"娛"#, r#"娛"#, r#"娛"#, r#"娛"#, r#"娛"#),
+        (r#"娧"#, r#"娧"#, r#"娧"#, r#"娧"#, r#"娧"#),
+        (r#"姘"#, r#"姘"#, r#"姘"#, r#"姘"#, r#"姘"#),
+        (r#"婦"#, r#"婦"#, r#"婦"#, r#"婦"#, r#"婦"#),
+        (r#"㛮"#, r#"㛮"#, r#"㛮"#, r#"㛮"#, r#"㛮"#),
+        (r#"㛼"#, r#"㛼"#, r#"㛼"#, r#"㛼"#, r#"㛼"#),
+        (r#"嬈"#, r#"嬈"#, r#"嬈"#, r#"嬈"#, r#"嬈"#),
+        (r#"嬾"#, r#"嬾"#, r#"嬾"#, r#"嬾"#, r#"嬾"#),
+        (r#"嬾"#, r#"嬾"#, r#"嬾"#, r#"嬾"#, r#"嬾"#),
+        (r#"𡧈"#, r#"𡧈"#, r#"𡧈"#, r#"𡧈"#, r#"𡧈"#),
+        (r#"寃"#, r#"寃"#, r#"寃"#, r#"寃"#, r#"寃"#),
+        (r#"寘"#, r#"寘"#, r#"寘"#, r#"寘"#, r#"寘"#),
+        (r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#, r#"寧"#),
+        (r#"寳"#, r#"寳"#, r#"寳"#, r#"寳"#, r#"寳"#),
+        (r#"𡬘"#, r#"𡬘"#, r#"𡬘"#, r#"𡬘"#, r#"𡬘"#),
+        (r#"寿"#, r#"寿"#, r#"寿"#, r#"寿"#, r#"寿"#),
+        (r#"将"#, r#"将"#, r#"将"#, r#"将"#, r#"将"#),
+        (r#"当"#, r#"当"#, r#"当"#, r#"当"#, r#"当"#),
+        (r#"尢"#, r#"尢"#, r#"尢"#, r#"尢"#, r#"尢"#),
+        (r#"㞁"#, r#"㞁"#, r#"㞁"#, r#"㞁"#, r#"㞁"#),
+        (r#"屠"#, r#"屠"#, r#"屠"#, r#"屠"#, r#"屠"#),
+        (r#"屮"#, r#"屮"#, r#"屮"#, r#"屮"#, r#"屮"#),
+        (r#"峀"#, r#"峀"#, r#"峀"#, r#"峀"#, r#"峀"#),
+        (r#"岍"#, r#"岍"#, r#"岍"#, r#"岍"#, r#"岍"#),
+        (r#"𡷤"#, r#"𡷤"#, r#"𡷤"#, r#"𡷤"#, r#"𡷤"#),
+        (r#"嵃"#, r#"嵃"#, r#"嵃"#, r#"嵃"#, r#"嵃"#),
+        (r#"𡷦"#, r#"𡷦"#, r#"𡷦"#, r#"𡷦"#, r#"𡷦"#),
+        (r#"嵮"#, r#"嵮"#, r#"嵮"#, r#"嵮"#, r#"嵮"#),
+        (r#"嵫"#, r#"嵫"#, r#"嵫"#, r#"嵫"#, r#"嵫"#),
+        (r#"嵼"#, r#"嵼"#, r#"嵼"#, r#"嵼"#, r#"嵼"#),
+        (r#"巡"#, r#"巡"#, r#"巡"#, r#"巡"#, r#"巡"#),
+        (r#"巢"#, r#"巢"#, r#"巢"#, r#"巢"#, r#"巢"#),
+        (r#"㠯"#, r#"㠯"#, r#"㠯"#, r#"㠯"#, r#"㠯"#),
+        (r#"巽"#, r#"巽"#, r#"巽"#, r#"巽"#, r#"巽"#),
+        (r#"帨"#, r#"帨"#, r#"帨"#, r#"帨"#, r#"帨"#),
+        (r#"帽"#, r#"帽"#, r#"帽"#, r#"帽"#, r#"帽"#),
+        (r#"幩"#, r#"幩"#, r#"幩"#, r#"幩"#, r#"幩"#),
+        (r#"㡢"#, r#"㡢"#, r#"㡢"#, r#"㡢"#, r#"㡢"#),
+        (r#"𢆃"#, r#"𢆃"#, r#"𢆃"#, r#"𢆃"#, r#"𢆃"#),
+        (r#"㡼"#, r#"㡼"#, r#"㡼"#, r#"㡼"#, r#"㡼"#),
+        (r#"庰"#, r#"庰"#, r#"庰"#, r#"庰"#, r#"庰"#),
+        (r#"庳"#, r#"庳"#, r#"庳"#, r#"庳"#, r#"庳"#),
+        (r#"庶"#, r#"庶"#, r#"庶"#, r#"庶"#, r#"庶"#),
+        (r#"廊"#, r#"廊"#, r#"廊"#, r#"廊"#, r#"廊"#),
+        (r#"𪎒"#, r#"𪎒"#, r#"𪎒"#, r#"𪎒"#, r#"𪎒"#),
+        (r#"廾"#, r#"廾"#, r#"廾"#, r#"廾"#, r#"廾"#),
+        (r#"𢌱"#, r#"𢌱"#, r#"𢌱"#, r#"𢌱"#, r#"𢌱"#),
+        (r#"𢌱"#, r#"𢌱"#, r#"𢌱"#, r#"𢌱"#, r#"𢌱"#),
+        (r#"舁"#, r#"舁"#, r#"舁"#, r#"舁"#, r#"舁"#),
+        (r#"弢"#, r#"弢"#, r#"弢"#, r#"弢"#, r#"弢"#),
+        (r#"弢"#, r#"弢"#, r#"弢"#, r#"弢"#, r#"弢"#),
+        (r#"㣇"#, r#"㣇"#, r#"㣇"#, r#"㣇"#, r#"㣇"#),
+        (r#"𣊸"#, r#"𣊸"#, r#"𣊸"#, r#"𣊸"#, r#"𣊸"#),
+        (r#"𦇚"#, r#"𦇚"#, r#"𦇚"#, r#"𦇚"#, r#"𦇚"#),
+        (r#"形"#, r#"形"#, r#"形"#, r#"形"#, r#"形"#),
+        (r#"彫"#, r#"彫"#, r#"彫"#, r#"彫"#, r#"彫"#),
+        (r#"㣣"#, r#"㣣"#, r#"㣣"#, r#"㣣"#, r#"㣣"#),
+        (r#"徚"#, r#"徚"#, r#"徚"#, r#"徚"#, r#"徚"#),
+        (r#"忍"#, r#"忍"#, r#"忍"#, r#"忍"#, r#"忍"#),
+        (r#"志"#, r#"志"#, r#"志"#, r#"志"#, r#"志"#),
+        (r#"忹"#, r#"忹"#, r#"忹"#, r#"忹"#, r#"忹"#),
+        (r#"悁"#, r#"悁"#, r#"悁"#, r#"悁"#, r#"悁"#),
+        (r#"㤺"#, r#"㤺"#, r#"㤺"#, r#"㤺"#, r#"㤺"#),
+        (r#"㤜"#, r#"㤜"#, r#"㤜"#, r#"㤜"#, r#"㤜"#),
+        (r#"悔"#, r#"悔"#, r#"悔"#, r#"悔"#, r#"悔"#),
+        (r#"𢛔"#, r#"𢛔"#, r#"𢛔"#, r#"𢛔"#, r#"𢛔"#),
+        (r#"惇"#, r#"惇"#, r#"惇"#, r#"惇"#, r#"惇"#),
+        (r#"慈"#, r#"慈"#, r#"慈"#, r#"慈"#, r#"慈"#),
+        (r#"慌"#, r#"慌"#, r#"慌"#, r#"慌"#, r#"慌"#),
+        (r#"慎"#, r#"慎"#, r#"慎"#, r#"慎"#, r#"慎"#),
+        (r#"慌"#, r#"慌"#, r#"慌"#, r#"慌"#, r#"慌"#),
+        (r#"慺"#, r#"慺"#, r#"慺"#, r#"慺"#, r#"慺"#),
+        (r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#, r#"憎"#),
+        (r#"憲"#, r#"憲"#, r#"憲"#, r#"憲"#, r#"憲"#),
+        (r#"憤"#, r#"憤"#, r#"憤"#, r#"憤"#, r#"憤"#),
+        (r#"憯"#, r#"憯"#, r#"憯"#, r#"憯"#, r#"憯"#),
+        (r#"懞"#, r#"懞"#, r#"懞"#, r#"懞"#, r#"懞"#),
+        (r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#, r#"懲"#),
+        (r#"懶"#, r#"懶"#, r#"懶"#, r#"懶"#, r#"懶"#),
+        (r#"成"#, r#"成"#, r#"成"#, r#"成"#, r#"成"#),
+        (r#"戛"#, r#"戛"#, r#"戛"#, r#"戛"#, r#"戛"#),
+        (r#"扝"#, r#"扝"#, r#"扝"#, r#"扝"#, r#"扝"#),
+        (r#"抱"#, r#"抱"#, r#"抱"#, r#"抱"#, r#"抱"#),
+        (r#"拔"#, r#"拔"#, r#"拔"#, r#"拔"#, r#"拔"#),
+        (r#"捐"#, r#"捐"#, r#"捐"#, r#"捐"#, r#"捐"#),
+        (r#"𢬌"#, r#"𢬌"#, r#"𢬌"#, r#"𢬌"#, r#"𢬌"#),
+        (r#"挽"#, r#"挽"#, r#"挽"#, r#"挽"#, r#"挽"#),
+        (r#"拼"#, r#"拼"#, r#"拼"#, r#"拼"#, r#"拼"#),
+        (r#"捨"#, r#"捨"#, r#"捨"#, r#"捨"#, r#"捨"#),
+        (r#"掃"#, r#"掃"#, r#"掃"#, r#"掃"#, r#"掃"#),
+        (r#"揤"#, r#"揤"#, r#"揤"#, r#"揤"#, r#"揤"#),
+        (r#"𢯱"#, r#"𢯱"#, r#"𢯱"#, r#"𢯱"#, r#"𢯱"#),
+        (r#"搢"#, r#"搢"#, r#"搢"#, r#"搢"#, r#"搢"#),
+        (r#"揅"#, r#"揅"#, r#"揅"#, r#"揅"#, r#"揅"#),
+        (r#"掩"#, r#"掩"#, r#"掩"#, r#"掩"#, r#"掩"#),
+        (r#"㨮"#, r#"㨮"#, r#"㨮"#, r#"㨮"#, r#"㨮"#),
+        (r#"摩"#, r#"摩"#, r#"摩"#, r#"摩"#, r#"摩"#),
+        (r#"摾"#, r#"摾"#, r#"摾"#, r#"摾"#, r#"摾"#),
+        (r#"撝"#, r#"撝"#, r#"撝"#, r#"撝"#, r#"撝"#),
+        (r#"摷"#, r#"摷"#, r#"摷"#, r#"摷"#, r#"摷"#),
+        (r#"㩬"#, r#"㩬"#, r#"㩬"#, r#"㩬"#, r#"㩬"#),
+        (r#"敏"#, r#"敏"#, r#"敏"#, r#"敏"#, r#"敏"#),
+        (r#"敬"#, r#"敬"#, r#"敬"#, r#"敬"#, r#"敬"#),
+        (r#"𣀊"#, r#"𣀊"#, r#"𣀊"#, r#"𣀊"#, r#"𣀊"#),
+        (r#"旣"#, r#"旣"#, r#"旣"#, r#"旣"#, r#"旣"#),
+        (r#"書"#, r#"書"#, r#"書"#, r#"書"#, r#"書"#),
+        (r#"晉"#, r#"晉"#, r#"晉"#, r#"晉"#, r#"晉"#),
+        (r#"㬙"#, r#"㬙"#, r#"㬙"#, r#"㬙"#, r#"㬙"#),
+        (r#"暑"#, r#"暑"#, r#"暑"#, r#"暑"#, r#"暑"#),
+        (r#"㬈"#, r#"㬈"#, r#"㬈"#, r#"㬈"#, r#"㬈"#),
+        (r#"㫤"#, r#"㫤"#, r#"㫤"#, r#"㫤"#, r#"㫤"#),
+        (r#"冒"#, r#"冒"#, r#"冒"#, r#"冒"#, r#"冒"#),
+        (r#"冕"#, r#"冕"#, r#"冕"#, r#"冕"#, r#"冕"#),
+        (r#"最"#, r#"最"#, r#"最"#, r#"最"#, r#"最"#),
+        (r#"暜"#, r#"暜"#, r#"暜"#, r#"暜"#, r#"暜"#),
+        (r#"肭"#, r#"肭"#, r#"肭"#, r#"肭"#, r#"肭"#),
+        (r#"䏙"#, r#"䏙"#, r#"䏙"#, r#"䏙"#, r#"䏙"#),
+        (r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#, r#"朗"#),
+        (r#"望"#, r#"望"#, r#"望"#, r#"望"#, r#"望"#),
+        (r#"朡"#, r#"朡"#, r#"朡"#, r#"朡"#, r#"朡"#),
+        (r#"杞"#, r#"杞"#, r#"杞"#, r#"杞"#, r#"杞"#),
+        (r#"杓"#, r#"杓"#, r#"杓"#, r#"杓"#, r#"杓"#),
+        (r#"𣏃"#, r#"𣏃"#, r#"𣏃"#, r#"𣏃"#, r#"𣏃"#),
+        (r#"㭉"#, r#"㭉"#, r#"㭉"#, r#"㭉"#, r#"㭉"#),
+        (r#"柺"#, r#"柺"#, r#"柺"#, r#"柺"#, r#"柺"#),
+        (r#"枅"#, r#"枅"#, r#"枅"#, r#"枅"#, r#"枅"#),
+        (r#"桒"#, r#"桒"#, r#"桒"#, r#"桒"#, r#"桒"#),
+        (r#"梅"#, r#"梅"#, r#"梅"#, r#"梅"#, r#"梅"#),
+        (r#"𣑭"#, r#"𣑭"#, r#"𣑭"#, r#"𣑭"#, r#"𣑭"#),
+        (r#"梎"#, r#"梎"#, r#"梎"#, r#"梎"#, r#"梎"#),
+        (r#"栟"#, r#"栟"#, r#"栟"#, r#"栟"#, r#"栟"#),
+        (r#"椔"#, r#"椔"#, r#"椔"#, r#"椔"#, r#"椔"#),
+        (r#"㮝"#, r#"㮝"#, r#"㮝"#, r#"㮝"#, r#"㮝"#),
+        (r#"楂"#, r#"楂"#, r#"楂"#, r#"楂"#, r#"楂"#),
+        (r#"榣"#, r#"榣"#, r#"榣"#, r#"榣"#, r#"榣"#),
+        (r#"槪"#, r#"槪"#, r#"槪"#, r#"槪"#, r#"槪"#),
+        (r#"檨"#, r#"檨"#, r#"檨"#, r#"檨"#, r#"檨"#),
+        (r#"𣚣"#, r#"𣚣"#, r#"𣚣"#, r#"𣚣"#, r#"𣚣"#),
+        (r#"櫛"#, r#"櫛"#, r#"櫛"#, r#"櫛"#, r#"櫛"#),
+        (r#"㰘"#, r#"㰘"#, r#"㰘"#, r#"㰘"#, r#"㰘"#),
+        (r#"次"#, r#"次"#, r#"次"#, r#"次"#, r#"次"#),
+        (r#"𣢧"#, r#"𣢧"#, r#"𣢧"#, r#"𣢧"#, r#"𣢧"#),
+        (r#"歔"#, r#"歔"#, r#"歔"#, r#"歔"#, r#"歔"#),
+        (r#"㱎"#, r#"㱎"#, r#"㱎"#, r#"㱎"#, r#"㱎"#),
+        (r#"歲"#, r#"歲"#, r#"歲"#, r#"歲"#, r#"歲"#),
+        (r#"殟"#, r#"殟"#, r#"殟"#, r#"殟"#, r#"殟"#),
+        (r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#, r#"殺"#),
+        (r#"殻"#, r#"殻"#, r#"殻"#, r#"殻"#, r#"殻"#),
+        (r#"𣪍"#, r#"𣪍"#, r#"𣪍"#, r#"𣪍"#, r#"𣪍"#),
+        (r#"𡴋"#, r#"𡴋"#, r#"𡴋"#, r#"𡴋"#, r#"𡴋"#),
+        (r#"𣫺"#, r#"𣫺"#, r#"𣫺"#, r#"𣫺"#, r#"𣫺"#),
+        (r#"汎"#, r#"汎"#, r#"汎"#, r#"汎"#, r#"汎"#),
+        (r#"𣲼"#, r#"𣲼"#, r#"𣲼"#, r#"𣲼"#, r#"𣲼"#),
+        (r#"沿"#, r#"沿"#, r#"沿"#, r#"沿"#, r#"沿"#),
+        (r#"泍"#, r#"泍"#, r#"泍"#, r#"泍"#, r#"泍"#),
+        (r#"汧"#, r#"汧"#, r#"汧"#, r#"汧"#, r#"汧"#),
+        (r#"洖"#, r#"洖"#, r#"洖"#, r#"洖"#, r#"洖"#),
+        (r#"派"#, r#"派"#, r#"派"#, r#"派"#, r#"派"#),
+        (r#"海"#, r#"海"#, r#"海"#, r#"海"#, r#"海"#),
+        (r#"流"#, r#"流"#, r#"流"#, r#"流"#, r#"流"#),
+        (r#"浩"#, r#"浩"#, r#"浩"#, r#"浩"#, r#"浩"#),
+        (r#"浸"#, r#"浸"#, r#"浸"#, r#"浸"#, r#"浸"#),
+        (r#"涅"#, r#"涅"#, r#"涅"#, r#"涅"#, r#"涅"#),
+        (r#"𣴞"#, r#"𣴞"#, r#"𣴞"#, r#"𣴞"#, r#"𣴞"#),
+        (r#"洴"#, r#"洴"#, r#"洴"#, r#"洴"#, r#"洴"#),
+        (r#"港"#, r#"港"#, r#"港"#, r#"港"#, r#"港"#),
+        (r#"湮"#, r#"湮"#, r#"湮"#, r#"湮"#, r#"湮"#),
+        (r#"㴳"#, r#"㴳"#, r#"㴳"#, r#"㴳"#, r#"㴳"#),
+        (r#"滋"#, r#"滋"#, r#"滋"#, r#"滋"#, r#"滋"#),
+        (r#"滇"#, r#"滇"#, r#"滇"#, r#"滇"#, r#"滇"#),
+        (r#"𣻑"#, r#"𣻑"#, r#"𣻑"#, r#"𣻑"#, r#"𣻑"#),
+        (r#"淹"#, r#"淹"#, r#"淹"#, r#"淹"#, r#"淹"#),
+        (r#"潮"#, r#"潮"#, r#"潮"#, r#"潮"#, r#"潮"#),
+        (r#"𣽞"#, r#"𣽞"#, r#"𣽞"#, r#"𣽞"#, r#"𣽞"#),
+        (r#"𣾎"#, r#"𣾎"#, r#"𣾎"#, r#"𣾎"#, r#"𣾎"#),
+        (r#"濆"#, r#"濆"#, r#"濆"#, r#"濆"#, r#"濆"#),
+        (r#"瀹"#, r#"瀹"#, r#"瀹"#, r#"瀹"#, r#"瀹"#),
+        (r#"瀞"#, r#"瀞"#, r#"瀞"#, r#"瀞"#, r#"瀞"#),
+        (r#"瀛"#, r#"瀛"#, r#"瀛"#, r#"瀛"#, r#"瀛"#),
+        (r#"㶖"#, r#"㶖"#, r#"㶖"#, r#"㶖"#, r#"㶖"#),
+        (r#"灊"#, r#"灊"#, r#"灊"#, r#"灊"#, r#"灊"#),
+        (r#"災"#, r#"災"#, r#"災"#, r#"災"#, r#"災"#),
+        (r#"灷"#, r#"灷"#, r#"灷"#, r#"灷"#, r#"灷"#),
+        (r#"炭"#, r#"炭"#, r#"炭"#, r#"炭"#, r#"炭"#),
+        (r#"𠔥"#, r#"𠔥"#, r#"𠔥"#, r#"𠔥"#, r#"𠔥"#),
+        (r#"煅"#, r#"煅"#, r#"煅"#, r#"煅"#, r#"煅"#),
+        (r#"𤉣"#, r#"𤉣"#, r#"𤉣"#, r#"𤉣"#, r#"𤉣"#),
+        (r#"熜"#, r#"熜"#, r#"熜"#, r#"熜"#, r#"熜"#),
+        (r#"𤎫"#, r#"𤎫"#, r#"𤎫"#, r#"𤎫"#, r#"𤎫"#),
+        (r#"爨"#, r#"爨"#, r#"爨"#, r#"爨"#, r#"爨"#),
+        (r#"爵"#, r#"爵"#, r#"爵"#, r#"爵"#, r#"爵"#),
+        (r#"牐"#, r#"牐"#, r#"牐"#, r#"牐"#, r#"牐"#),
+        (r#"𤘈"#, r#"𤘈"#, r#"𤘈"#, r#"𤘈"#, r#"𤘈"#),
+        (r#"犀"#, r#"犀"#, r#"犀"#, r#"犀"#, r#"犀"#),
+        (r#"犕"#, r#"犕"#, r#"犕"#, r#"犕"#, r#"犕"#),
+        (r#"𤜵"#, r#"𤜵"#, r#"𤜵"#, r#"𤜵"#, r#"𤜵"#),
+        (r#"𤠔"#, r#"𤠔"#, r#"𤠔"#, r#"𤠔"#, r#"𤠔"#),
+        (r#"獺"#, r#"獺"#, r#"獺"#, r#"獺"#, r#"獺"#),
+        (r#"王"#, r#"王"#, r#"王"#, r#"王"#, r#"王"#),
+        (r#"㺬"#, r#"㺬"#, r#"㺬"#, r#"㺬"#, r#"㺬"#),
+        (r#"玥"#, r#"玥"#, r#"玥"#, r#"玥"#, r#"玥"#),
+        (r#"㺸"#, r#"㺸"#, r#"㺸"#, r#"㺸"#, r#"㺸"#),
+        (r#"㺸"#, r#"㺸"#, r#"㺸"#, r#"㺸"#, r#"㺸"#),
+        (r#"瑇"#, r#"瑇"#, r#"瑇"#, r#"瑇"#, r#"瑇"#),
+        (r#"瑜"#, r#"瑜"#, r#"瑜"#, r#"瑜"#, r#"瑜"#),
+        (r#"瑱"#, r#"瑱"#, r#"瑱"#, r#"瑱"#, r#"瑱"#),
+        (r#"璅"#, r#"璅"#, r#"璅"#, r#"璅"#, r#"璅"#),
+        (r#"瓊"#, r#"瓊"#, r#"瓊"#, r#"瓊"#, r#"瓊"#),
+        (r#"㼛"#, r#"㼛"#, r#"㼛"#, r#"㼛"#, r#"㼛"#),
+        (r#"甤"#, r#"甤"#, r#"甤"#, r#"甤"#, r#"甤"#),
+        (r#"𤰶"#, r#"𤰶"#, r#"𤰶"#, r#"𤰶"#, r#"𤰶"#),
+        (r#"甾"#, r#"甾"#, r#"甾"#, r#"甾"#, r#"甾"#),
+        (r#"𤲒"#, r#"𤲒"#, r#"𤲒"#, r#"𤲒"#, r#"𤲒"#),
+        (r#"異"#, r#"異"#, r#"異"#, r#"異"#, r#"異"#),
+        (r#"𢆟"#, r#"𢆟"#, r#"𢆟"#, r#"𢆟"#, r#"𢆟"#),
+        (r#"瘐"#, r#"瘐"#, r#"瘐"#, r#"瘐"#, r#"瘐"#),
+        (r#"𤾡"#, r#"𤾡"#, r#"𤾡"#, r#"𤾡"#, r#"𤾡"#),
+        (r#"𤾸"#, r#"𤾸"#, r#"𤾸"#, r#"𤾸"#, r#"𤾸"#),
+        (r#"𥁄"#, r#"𥁄"#, r#"𥁄"#, r#"𥁄"#, r#"𥁄"#),
+        (r#"㿼"#, r#"㿼"#, r#"㿼"#, r#"㿼"#, r#"㿼"#),
+        (r#"䀈"#, r#"䀈"#, r#"䀈"#, r#"䀈"#, r#"䀈"#),
+        (r#"直"#, r#"直"#, r#"直"#, r#"直"#, r#"直"#),
+        (r#"𥃳"#, r#"𥃳"#, r#"𥃳"#, r#"𥃳"#, r#"𥃳"#),
+        (r#"𥃲"#, r#"𥃲"#, r#"𥃲"#, r#"𥃲"#, r#"𥃲"#),
+        (r#"𥄙"#, r#"𥄙"#, r#"𥄙"#, r#"𥄙"#, r#"𥄙"#),
+        (r#"𥄳"#, r#"𥄳"#, r#"𥄳"#, r#"𥄳"#, r#"𥄳"#),
+        (r#"眞"#, r#"眞"#, r#"眞"#, r#"眞"#, r#"眞"#),
+        (r#"真"#, r#"真"#, r#"真"#, r#"真"#, r#"真"#),
+        (r#"真"#, r#"真"#, r#"真"#, r#"真"#, r#"真"#),
+        (r#"睊"#, r#"睊"#, r#"睊"#, r#"睊"#, r#"睊"#),
+        (r#"䀹"#, r#"䀹"#, r#"䀹"#, r#"䀹"#, r#"䀹"#),
+        (r#"瞋"#, r#"瞋"#, r#"瞋"#, r#"瞋"#, r#"瞋"#),
+        (r#"䁆"#, r#"䁆"#, r#"䁆"#, r#"䁆"#, r#"䁆"#),
+        (r#"䂖"#, r#"䂖"#, r#"䂖"#, r#"䂖"#, r#"䂖"#),
+        (r#"𥐝"#, r#"𥐝"#, r#"𥐝"#, r#"𥐝"#, r#"𥐝"#),
+        (r#"硎"#, r#"硎"#, r#"硎"#, r#"硎"#, r#"硎"#),
+        (r#"碌"#, r#"碌"#, r#"碌"#, r#"碌"#, r#"碌"#),
+        (r#"磌"#, r#"磌"#, r#"磌"#, r#"磌"#, r#"磌"#),
+        (r#"䃣"#, r#"䃣"#, r#"䃣"#, r#"䃣"#, r#"䃣"#),
+        (r#"𥘦"#, r#"𥘦"#, r#"𥘦"#, r#"𥘦"#, r#"𥘦"#),
+        (r#"祖"#, r#"祖"#, r#"祖"#, r#"祖"#, r#"祖"#),
+        (r#"𥚚"#, r#"𥚚"#, r#"𥚚"#, r#"𥚚"#, r#"𥚚"#),
+        (r#"𥛅"#, r#"𥛅"#, r#"𥛅"#, r#"𥛅"#, r#"𥛅"#),
+        (r#"福"#, r#"福"#, r#"福"#, r#"福"#, r#"福"#),
+        (r#"秫"#, r#"秫"#, r#"秫"#, r#"秫"#, r#"秫"#),
+        (r#"䄯"#, r#"䄯"#, r#"䄯"#, r#"䄯"#, r#"䄯"#),
+        (r#"穀"#, r#"穀"#, r#"穀"#, r#"穀"#, r#"穀"#),
+        (r#"穊"#, r#"穊"#, r#"穊"#, r#"穊"#, r#"穊"#),
+        (r#"穏"#, r#"穏"#, r#"穏"#, r#"穏"#, r#"穏"#),
+        (r#"𥥼"#, r#"𥥼"#, r#"𥥼"#, r#"𥥼"#, r#"𥥼"#),
+        (r#"𥪧"#, r#"𥪧"#, r#"𥪧"#, r#"𥪧"#, r#"𥪧"#),
+        (r#"𥪧"#, r#"𥪧"#, r#"𥪧"#, r#"𥪧"#, r#"𥪧"#),
+        (r#"竮"#, r#"竮"#, r#"竮"#, r#"竮"#, r#"竮"#),
+        (r#"䈂"#, r#"䈂"#, r#"䈂"#, r#"䈂"#, r#"䈂"#),
+        (r#"𥮫"#, r#"𥮫"#, r#"𥮫"#, r#"𥮫"#, r#"𥮫"#),
+        (r#"篆"#, r#"篆"#, r#"篆"#, r#"篆"#, r#"篆"#),
+        (r#"築"#, r#"築"#, r#"築"#, r#"築"#, r#"築"#),
+        (r#"䈧"#, r#"䈧"#, r#"䈧"#, r#"䈧"#, r#"䈧"#),
+        (r#"𥲀"#, r#"𥲀"#, r#"𥲀"#, r#"𥲀"#, r#"𥲀"#),
+        (r#"糒"#, r#"糒"#, r#"糒"#, r#"糒"#, r#"糒"#),
+        (r#"䊠"#, r#"䊠"#, r#"䊠"#, r#"䊠"#, r#"䊠"#),
+        (r#"糨"#, r#"糨"#, r#"糨"#, r#"糨"#, r#"糨"#),
+        (r#"糣"#, r#"糣"#, r#"糣"#, r#"糣"#, r#"糣"#),
+        (r#"紀"#, r#"紀"#, r#"紀"#, r#"紀"#, r#"紀"#),
+        (r#"𥾆"#, r#"𥾆"#, r#"𥾆"#, r#"𥾆"#, r#"𥾆"#),
+        (r#"絣"#, r#"絣"#, r#"絣"#, r#"絣"#, r#"絣"#),
+        (r#"䌁"#, r#"䌁"#, r#"䌁"#, r#"䌁"#, r#"䌁"#),
+        (r#"緇"#, r#"緇"#, r#"緇"#, r#"緇"#, r#"緇"#),
+        (r#"縂"#, r#"縂"#, r#"縂"#, r#"縂"#, r#"縂"#),
+        (r#"繅"#, r#"繅"#, r#"繅"#, r#"繅"#, r#"繅"#),
+        (r#"䌴"#, r#"䌴"#, r#"䌴"#, r#"䌴"#, r#"䌴"#),
+        (r#"𦈨"#, r#"𦈨"#, r#"𦈨"#, r#"𦈨"#, r#"𦈨"#),
+        (r#"𦉇"#, r#"𦉇"#, r#"𦉇"#, r#"𦉇"#, r#"𦉇"#),
+        (r#"䍙"#, r#"䍙"#, r#"䍙"#, r#"䍙"#, r#"䍙"#),
+        (r#"𦋙"#, r#"𦋙"#, r#"𦋙"#, r#"𦋙"#, r#"𦋙"#),
+        (r#"罺"#, r#"罺"#, r#"罺"#, r#"罺"#, r#"罺"#),
+        (r#"𦌾"#, r#"𦌾"#, r#"𦌾"#, r#"𦌾"#, r#"𦌾"#),
+        (r#"羕"#, r#"羕"#, r#"羕"#, r#"羕"#, r#"羕"#),
+        (r#"翺"#, r#"翺"#, r#"翺"#, r#"翺"#, r#"翺"#),
+        (r#"者"#, r#"者"#, r#"者"#, r#"者"#, r#"者"#),
+        (r#"𦓚"#, r#"𦓚"#, r#"𦓚"#, r#"𦓚"#, r#"𦓚"#),
+        (r#"𦔣"#, r#"𦔣"#, r#"𦔣"#, r#"𦔣"#, r#"𦔣"#),
+        (r#"聠"#, r#"聠"#, r#"聠"#, r#"聠"#, r#"聠"#),
+        (r#"𦖨"#, r#"𦖨"#, r#"𦖨"#, r#"𦖨"#, r#"𦖨"#),
+        (r#"聰"#, r#"聰"#, r#"聰"#, r#"聰"#, r#"聰"#),
+        (r#"𣍟"#, r#"𣍟"#, r#"𣍟"#, r#"𣍟"#, r#"𣍟"#),
+        (r#"䏕"#, r#"䏕"#, r#"䏕"#, r#"䏕"#, r#"䏕"#),
+        (r#"育"#, r#"育"#, r#"育"#, r#"育"#, r#"育"#),
+        (r#"脃"#, r#"脃"#, r#"脃"#, r#"脃"#, r#"脃"#),
+        (r#"䐋"#, r#"䐋"#, r#"䐋"#, r#"䐋"#, r#"䐋"#),
+        (r#"脾"#, r#"脾"#, r#"脾"#, r#"脾"#, r#"脾"#),
+        (r#"媵"#, r#"媵"#, r#"媵"#, r#"媵"#, r#"媵"#),
+        (r#"𦞧"#, r#"𦞧"#, r#"𦞧"#, r#"𦞧"#, r#"𦞧"#),
+        (r#"𦞵"#, r#"𦞵"#, r#"𦞵"#, r#"𦞵"#, r#"𦞵"#),
+        (r#"𣎓"#, r#"𣎓"#, r#"𣎓"#, r#"𣎓"#, r#"𣎓"#),
+        (r#"𣎜"#, r#"𣎜"#, r#"𣎜"#, r#"𣎜"#, r#"𣎜"#),
+        (r#"舁"#, r#"舁"#, r#"舁"#, r#"舁"#, r#"舁"#),
+        (r#"舄"#, r#"舄"#, r#"舄"#, r#"舄"#, r#"舄"#),
+        (r#"辞"#, r#"辞"#, r#"辞"#, r#"辞"#, r#"辞"#),
+        (r#"䑫"#, r#"䑫"#, r#"䑫"#, r#"䑫"#, r#"䑫"#),
+        (r#"芑"#, r#"芑"#, r#"芑"#, r#"芑"#, r#"芑"#),
+        (r#"芋"#, r#"芋"#, r#"芋"#, r#"芋"#, r#"芋"#),
+        (r#"芝"#, r#"芝"#, r#"芝"#, r#"芝"#, r#"芝"#),
+        (r#"劳"#, r#"劳"#, r#"劳"#, r#"劳"#, r#"劳"#),
+        (r#"花"#, r#"花"#, r#"花"#, r#"花"#, r#"花"#),
+        (r#"芳"#, r#"芳"#, r#"芳"#, r#"芳"#, r#"芳"#),
+        (r#"芽"#, r#"芽"#, r#"芽"#, r#"芽"#, r#"芽"#),
+        (r#"苦"#, r#"苦"#, r#"苦"#, r#"苦"#, r#"苦"#),
+        (r#"𦬼"#, r#"𦬼"#, r#"𦬼"#, r#"𦬼"#, r#"𦬼"#),
+        (r#"若"#, r#"若"#, r#"若"#, r#"若"#, r#"若"#),
+        (r#"茝"#, r#"茝"#, r#"茝"#, r#"茝"#, r#"茝"#),
+        (r#"荣"#, r#"荣"#, r#"荣"#, r#"荣"#, r#"荣"#),
+        (r#"莭"#, r#"莭"#, r#"莭"#, r#"莭"#, r#"莭"#),
+        (r#"茣"#, r#"茣"#, r#"茣"#, r#"茣"#, r#"茣"#),
+        (r#"莽"#, r#"莽"#, r#"莽"#, r#"莽"#, r#"莽"#),
+        (r#"菧"#, r#"菧"#, r#"菧"#, r#"菧"#, r#"菧"#),
+        (r#"著"#, r#"著"#, r#"著"#, r#"著"#, r#"著"#),
+        (r#"荓"#, r#"荓"#, r#"荓"#, r#"荓"#, r#"荓"#),
+        (r#"菊"#, r#"菊"#, r#"菊"#, r#"菊"#, r#"菊"#),
+        (r#"菌"#, r#"菌"#, r#"菌"#, r#"菌"#, r#"菌"#),
+        (r#"菜"#, r#"菜"#, r#"菜"#, r#"菜"#, r#"菜"#),
+        (r#"𦰶"#, r#"𦰶"#, r#"𦰶"#, r#"𦰶"#, r#"𦰶"#),
+        (r#"𦵫"#, r#"𦵫"#, r#"𦵫"#, r#"𦵫"#, r#"𦵫"#),
+        (r#"𦳕"#, r#"𦳕"#, r#"𦳕"#, r#"𦳕"#, r#"𦳕"#),
+        (r#"䔫"#, r#"䔫"#, r#"䔫"#, r#"䔫"#, r#"䔫"#),
+        (r#"蓱"#, r#"蓱"#, r#"蓱"#, r#"蓱"#, r#"蓱"#),
+        (r#"蓳"#, r#"蓳"#, r#"蓳"#, r#"蓳"#, r#"蓳"#),
+        (r#"蔖"#, r#"蔖"#, r#"蔖"#, r#"蔖"#, r#"蔖"#),
+        (r#"𧏊"#, r#"𧏊"#, r#"𧏊"#, r#"𧏊"#, r#"𧏊"#),
+        (r#"蕤"#, r#"蕤"#, r#"蕤"#, r#"蕤"#, r#"蕤"#),
+        (r#"𦼬"#, r#"𦼬"#, r#"𦼬"#, r#"𦼬"#, r#"𦼬"#),
+        (r#"䕝"#, r#"䕝"#, r#"䕝"#, r#"䕝"#, r#"䕝"#),
+        (r#"䕡"#, r#"䕡"#, r#"䕡"#, r#"䕡"#, r#"䕡"#),
+        (r#"𦾱"#, r#"𦾱"#, r#"𦾱"#, r#"𦾱"#, r#"𦾱"#),
+        (r#"𧃒"#, r#"𧃒"#, r#"𧃒"#, r#"𧃒"#, r#"𧃒"#),
+        (r#"䕫"#, r#"䕫"#, r#"䕫"#, r#"䕫"#, r#"䕫"#),
+        (r#"虐"#, r#"虐"#, r#"虐"#, r#"虐"#, r#"虐"#),
+        (r#"虜"#, r#"虜"#, r#"虜"#, r#"虜"#, r#"虜"#),
+        (r#"虧"#, r#"虧"#, r#"虧"#, r#"虧"#, r#"虧"#),
+        (r#"虩"#, r#"虩"#, r#"虩"#, r#"虩"#, r#"虩"#),
+        (r#"蚩"#, r#"蚩"#, r#"蚩"#, r#"蚩"#, r#"蚩"#),
+        (r#"蚈"#, r#"蚈"#, r#"蚈"#, r#"蚈"#, r#"蚈"#),
+        (r#"蜎"#, r#"蜎"#, r#"蜎"#, r#"蜎"#, r#"蜎"#),
+        (r#"蛢"#, r#"蛢"#, r#"蛢"#, r#"蛢"#, r#"蛢"#),
+        (r#"蝹"#, r#"蝹"#, r#"蝹"#, r#"蝹"#, r#"蝹"#),
+        (r#"蜨"#, r#"蜨"#, r#"蜨"#, r#"蜨"#, r#"蜨"#),
+        (r#"蝫"#, r#"蝫"#, r#"蝫"#, r#"蝫"#, r#"蝫"#),
+        (r#"螆"#, r#"螆"#, r#"螆"#, r#"螆"#, r#"螆"#),
+        (r#"䗗"#, r#"䗗"#, r#"䗗"#, r#"䗗"#, r#"䗗"#),
+        (r#"蟡"#, r#"蟡"#, r#"蟡"#, r#"蟡"#, r#"蟡"#),
+        (r#"蠁"#, r#"蠁"#, r#"蠁"#, r#"蠁"#, r#"蠁"#),
+        (r#"䗹"#, r#"䗹"#, r#"䗹"#, r#"䗹"#, r#"䗹"#),
+        (r#"衠"#, r#"衠"#, r#"衠"#, r#"衠"#, r#"衠"#),
+        (r#"衣"#, r#"衣"#, r#"衣"#, r#"衣"#, r#"衣"#),
+        (r#"𧙧"#, r#"𧙧"#, r#"𧙧"#, r#"𧙧"#, r#"𧙧"#),
+        (r#"裗"#, r#"裗"#, r#"裗"#, r#"裗"#, r#"裗"#),
+        (r#"裞"#, r#"裞"#, r#"裞"#, r#"裞"#, r#"裞"#),
+        (r#"䘵"#, r#"䘵"#, r#"䘵"#, r#"䘵"#, r#"䘵"#),
+        (r#"裺"#, r#"裺"#, r#"裺"#, r#"裺"#, r#"裺"#),
+        (r#"㒻"#, r#"㒻"#, r#"㒻"#, r#"㒻"#, r#"㒻"#),
+        (r#"𧢮"#, r#"𧢮"#, r#"𧢮"#, r#"𧢮"#, r#"𧢮"#),
+        (r#"𧥦"#, r#"𧥦"#, r#"𧥦"#, r#"𧥦"#, r#"𧥦"#),
+        (r#"䚾"#, r#"䚾"#, r#"䚾"#, r#"䚾"#, r#"䚾"#),
+        (r#"䛇"#, r#"䛇"#, r#"䛇"#, r#"䛇"#, r#"䛇"#),
+        (r#"誠"#, r#"誠"#, r#"誠"#, r#"誠"#, r#"誠"#),
+        (r#"諭"#, r#"諭"#, r#"諭"#, r#"諭"#, r#"諭"#),
+        (r#"變"#, r#"變"#, r#"變"#, r#"變"#, r#"變"#),
+        (r#"豕"#, r#"豕"#, r#"豕"#, r#"豕"#, r#"豕"#),
+        (r#"𧲨"#, r#"𧲨"#, r#"𧲨"#, r#"𧲨"#, r#"𧲨"#),
+        (r#"貫"#, r#"貫"#, r#"貫"#, r#"貫"#, r#"貫"#),
+        (r#"賁"#, r#"賁"#, r#"賁"#, r#"賁"#, r#"賁"#),
+        (r#"贛"#, r#"贛"#, r#"贛"#, r#"贛"#, r#"贛"#),
+        (r#"起"#, r#"起"#, r#"起"#, r#"起"#, r#"起"#),
+        (r#"𧼯"#, r#"𧼯"#, r#"𧼯"#, r#"𧼯"#, r#"𧼯"#),
+        (r#"𠠄"#, r#"𠠄"#, r#"𠠄"#, r#"𠠄"#, r#"𠠄"#),
+        (r#"跋"#, r#"跋"#, r#"跋"#, r#"跋"#, r#"跋"#),
+        (r#"趼"#, r#"趼"#, r#"趼"#, r#"趼"#, r#"趼"#),
+        (r#"跰"#, r#"跰"#, r#"跰"#, r#"跰"#, r#"跰"#),
+        (r#"𠣞"#, r#"𠣞"#, r#"𠣞"#, r#"𠣞"#, r#"𠣞"#),
+        (r#"軔"#, r#"軔"#, r#"軔"#, r#"軔"#, r#"軔"#),
+        (r#"輸"#, r#"輸"#, r#"輸"#, r#"輸"#, r#"輸"#),
+        (r#"𨗒"#, r#"𨗒"#, r#"𨗒"#, r#"𨗒"#, r#"𨗒"#),
+        (r#"𨗭"#, r#"𨗭"#, r#"𨗭"#, r#"𨗭"#, r#"𨗭"#),
+        (r#"邔"#, r#"邔"#, r#"邔"#, r#"邔"#, r#"邔"#),
+        (r#"郱"#, r#"郱"#, r#"郱"#, r#"郱"#, r#"郱"#),
+        (r#"鄑"#, r#"鄑"#, r#"鄑"#, r#"鄑"#, r#"鄑"#),
+        (r#"𨜮"#, r#"𨜮"#, r#"𨜮"#, r#"𨜮"#, r#"𨜮"#),
+        (r#"鄛"#, r#"鄛"#, r#"鄛"#, r#"鄛"#, r#"鄛"#),
+        (r#"鈸"#, r#"鈸"#, r#"鈸"#, r#"鈸"#, r#"鈸"#),
+        (r#"鋗"#, r#"鋗"#, r#"鋗"#, r#"鋗"#, r#"鋗"#),
+        (r#"鋘"#, r#"鋘"#, r#"鋘"#, r#"鋘"#, r#"鋘"#),
+        (r#"鉼"#, r#"鉼"#, r#"鉼"#, r#"鉼"#, r#"鉼"#),
+        (r#"鏹"#, r#"鏹"#, r#"鏹"#, r#"鏹"#, r#"鏹"#),
+        (r#"鐕"#, r#"鐕"#, r#"鐕"#, r#"鐕"#, r#"鐕"#),
+        (r#"𨯺"#, r#"𨯺"#, r#"𨯺"#, r#"𨯺"#, r#"𨯺"#),
+        (r#"開"#, r#"開"#, r#"開"#, r#"開"#, r#"開"#),
+        (r#"䦕"#, r#"䦕"#, r#"䦕"#, r#"䦕"#, r#"䦕"#),
+        (r#"閷"#, r#"閷"#, r#"閷"#, r#"閷"#, r#"閷"#),
+        (r#"𨵷"#, r#"𨵷"#, r#"𨵷"#, r#"𨵷"#, r#"𨵷"#),
+        (r#"䧦"#, r#"䧦"#, r#"䧦"#, r#"䧦"#, r#"䧦"#),
+        (r#"雃"#, r#"雃"#, r#"雃"#, r#"雃"#, r#"雃"#),
+        (r#"嶲"#, r#"嶲"#, r#"嶲"#, r#"嶲"#, r#"嶲"#),
+        (r#"霣"#, r#"霣"#, r#"霣"#, r#"霣"#, r#"霣"#),
+        (r#"𩅅"#, r#"𩅅"#, r#"𩅅"#, r#"𩅅"#, r#"𩅅"#),
+        (r#"𩈚"#, r#"𩈚"#, r#"𩈚"#, r#"𩈚"#, r#"𩈚"#),
+        (r#"䩮"#, r#"䩮"#, r#"䩮"#, r#"䩮"#, r#"䩮"#),
+        (r#"䩶"#, r#"䩶"#, r#"䩶"#, r#"䩶"#, r#"䩶"#),
+        (r#"韠"#, r#"韠"#, r#"韠"#, r#"韠"#, r#"韠"#),
+        (r#"𩐊"#, r#"𩐊"#, r#"𩐊"#, r#"𩐊"#, r#"𩐊"#),
+        (r#"䪲"#, r#"䪲"#, r#"䪲"#, r#"䪲"#, r#"䪲"#),
+        (r#"𩒖"#, r#"𩒖"#, r#"𩒖"#, r#"𩒖"#, r#"𩒖"#),
+        (r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#),
+        (r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#, r#"頋"#),
+        (r#"頩"#, r#"頩"#, r#"頩"#, r#"頩"#, r#"頩"#),
+        (r#"𩖶"#, r#"𩖶"#, r#"𩖶"#, r#"𩖶"#, r#"𩖶"#),
+        (r#"飢"#, r#"飢"#, r#"飢"#, r#"飢"#, r#"飢"#),
+        (r#"䬳"#, r#"䬳"#, r#"䬳"#, r#"䬳"#, r#"䬳"#),
+        (r#"餩"#, r#"餩"#, r#"餩"#, r#"餩"#, r#"餩"#),
+        (r#"馧"#, r#"馧"#, r#"馧"#, r#"馧"#, r#"馧"#),
+        (r#"駂"#, r#"駂"#, r#"駂"#, r#"駂"#, r#"駂"#),
+        (r#"駾"#, r#"駾"#, r#"駾"#, r#"駾"#, r#"駾"#),
+        (r#"䯎"#, r#"䯎"#, r#"䯎"#, r#"䯎"#, r#"䯎"#),
+        (r#"𩬰"#, r#"𩬰"#, r#"𩬰"#, r#"𩬰"#, r#"𩬰"#),
+        (r#"鬒"#, r#"鬒"#, r#"鬒"#, r#"鬒"#, r#"鬒"#),
+        (r#"鱀"#, r#"鱀"#, r#"鱀"#, r#"鱀"#, r#"鱀"#),
+        (r#"鳽"#, r#"鳽"#, r#"鳽"#, r#"鳽"#, r#"鳽"#),
+        (r#"䳎"#, r#"䳎"#, r#"䳎"#, r#"䳎"#, r#"䳎"#),
+        (r#"䳭"#, r#"䳭"#, r#"䳭"#, r#"䳭"#, r#"䳭"#),
+        (r#"鵧"#, r#"鵧"#, r#"鵧"#, r#"鵧"#, r#"鵧"#),
+        (r#"𪃎"#, r#"𪃎"#, r#"𪃎"#, r#"𪃎"#, r#"𪃎"#),
+        (r#"䳸"#, r#"䳸"#, r#"䳸"#, r#"䳸"#, r#"䳸"#),
+        (r#"𪄅"#, r#"𪄅"#, r#"𪄅"#, r#"𪄅"#, r#"𪄅"#),
+        (r#"𪈎"#, r#"𪈎"#, r#"𪈎"#, r#"𪈎"#, r#"𪈎"#),
+        (r#"𪊑"#, r#"𪊑"#, r#"𪊑"#, r#"𪊑"#, r#"𪊑"#),
+        (r#"麻"#, r#"麻"#, r#"麻"#, r#"麻"#, r#"麻"#),
+        (r#"䵖"#, r#"䵖"#, r#"䵖"#, r#"䵖"#, r#"䵖"#),
+        (r#"黹"#, r#"黹"#, r#"黹"#, r#"黹"#, r#"黹"#),
+        (r#"黾"#, r#"黾"#, r#"黾"#, r#"黾"#, r#"黾"#),
+        (r#"鼅"#, r#"鼅"#, r#"鼅"#, r#"鼅"#, r#"鼅"#),
+        (r#"鼏"#, r#"鼏"#, r#"鼏"#, r#"鼏"#, r#"鼏"#),
+        (r#"鼖"#, r#"鼖"#, r#"鼖"#, r#"鼖"#, r#"鼖"#),
+        (r#"鼻"#, r#"鼻"#, r#"鼻"#, r#"鼻"#, r#"鼻"#),
+        (r#"𪘀"#, r#"𪘀"#, r#"𪘀"#, r#"𪘀"#, r#"𪘀"#),
+        (r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#),
+        (r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#),
+        (r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#),
+        (r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#),
+        (r#"à֮̂̕b"#, r#"à֮̂̕b"#, r#"à֮̂̕b"#, r#"à֮̂̕b"#, r#"à֮̂̕b"#),
+        (r#"ầ֮̕b"#, r#"ầ֮̕b"#, r#"ầ֮̕b"#, r#"ầ֮̕b"#, r#"ầ֮̕b"#),
+        (r#"à֮̃̕b"#, r#"à֮̃̕b"#, r#"à֮̃̕b"#, r#"à֮̃̕b"#, r#"à֮̃̕b"#),
+        (r#"ã֮̀̕b"#, r#"ã֮̀̕b"#, r#"ã֮̀̕b"#, r#"ã֮̀̕b"#, r#"ã֮̀̕b"#),
+        (r#"à֮̄̕b"#, r#"à֮̄̕b"#, r#"à֮̄̕b"#, r#"à֮̄̕b"#, r#"à֮̄̕b"#),
+        (r#"ā֮̀̕b"#, r#"ā֮̀̕b"#, r#"ā֮̀̕b"#, r#"ā֮̀̕b"#, r#"ā֮̀̕b"#),
+        (r#"à֮̅̕b"#, r#"à֮̅̕b"#, r#"à֮̅̕b"#, r#"à֮̅̕b"#, r#"à֮̅̕b"#),
+        (r#"a֮̅̀̕b"#, r#"a֮̅̀̕b"#, r#"a֮̅̀̕b"#, r#"a֮̅̀̕b"#, r#"a֮̅̀̕b"#),
+        (r#"à֮̆̕b"#, r#"à֮̆̕b"#, r#"à֮̆̕b"#, r#"à֮̆̕b"#, r#"à֮̆̕b"#),
+        (r#"ằ֮̕b"#, r#"ằ֮̕b"#, r#"ằ֮̕b"#, r#"ằ֮̕b"#, r#"ằ֮̕b"#),
+        (r#"à֮̇̕b"#, r#"à֮̇̕b"#, r#"à֮̇̕b"#, r#"à֮̇̕b"#, r#"à֮̇̕b"#),
+        (r#"ȧ֮̀̕b"#, r#"ȧ֮̀̕b"#, r#"ȧ֮̀̕b"#, r#"ȧ֮̀̕b"#, r#"ȧ֮̀̕b"#),
+        (r#"à֮̈̕b"#, r#"à֮̈̕b"#, r#"à֮̈̕b"#, r#"à֮̈̕b"#, r#"à֮̈̕b"#),
+        (r#"ä֮̀̕b"#, r#"ä֮̀̕b"#, r#"ä֮̀̕b"#, r#"ä֮̀̕b"#, r#"ä֮̀̕b"#),
+        (r#"à֮̉̕b"#, r#"à֮̉̕b"#, r#"à֮̉̕b"#, r#"à֮̉̕b"#, r#"à֮̉̕b"#),
+        (r#"ả֮̀̕b"#, r#"ả֮̀̕b"#, r#"ả֮̀̕b"#, r#"ả֮̀̕b"#, r#"ả֮̀̕b"#),
+        (r#"à֮̊̕b"#, r#"à֮̊̕b"#, r#"à֮̊̕b"#, r#"à֮̊̕b"#, r#"à֮̊̕b"#),
+        (r#"å֮̀̕b"#, r#"å֮̀̕b"#, r#"å֮̀̕b"#, r#"å֮̀̕b"#, r#"å֮̀̕b"#),
+        (r#"à֮̋̕b"#, r#"à֮̋̕b"#, r#"à֮̋̕b"#, r#"à֮̋̕b"#, r#"à֮̋̕b"#),
+        (r#"a֮̋̀̕b"#, r#"a֮̋̀̕b"#, r#"a֮̋̀̕b"#, r#"a֮̋̀̕b"#, r#"a֮̋̀̕b"#),
+        (r#"à֮̌̕b"#, r#"à֮̌̕b"#, r#"à֮̌̕b"#, r#"à֮̌̕b"#, r#"à֮̌̕b"#),
+        (r#"ǎ֮̀̕b"#, r#"ǎ֮̀̕b"#, r#"ǎ֮̀̕b"#, r#"ǎ֮̀̕b"#, r#"ǎ֮̀̕b"#),
+        (r#"à֮̍̕b"#, r#"à֮̍̕b"#, r#"à֮̍̕b"#, r#"à֮̍̕b"#, r#"à֮̍̕b"#),
+        (r#"a֮̍̀̕b"#, r#"a֮̍̀̕b"#, r#"a֮̍̀̕b"#, r#"a֮̍̀̕b"#, r#"a֮̍̀̕b"#),
+        (r#"à֮̎̕b"#, r#"à֮̎̕b"#, r#"à֮̎̕b"#, r#"à֮̎̕b"#, r#"à֮̎̕b"#),
+        (r#"a֮̎̀̕b"#, r#"a֮̎̀̕b"#, r#"a֮̎̀̕b"#, r#"a֮̎̀̕b"#, r#"a֮̎̀̕b"#),
+        (r#"à֮̏̕b"#, r#"à֮̏̕b"#, r#"à֮̏̕b"#, r#"à֮̏̕b"#, r#"à֮̏̕b"#),
+        (r#"ȁ֮̀̕b"#, r#"ȁ֮̀̕b"#, r#"ȁ֮̀̕b"#, r#"ȁ֮̀̕b"#, r#"ȁ֮̀̕b"#),
+        (r#"à֮̐̕b"#, r#"à֮̐̕b"#, r#"à֮̐̕b"#, r#"à֮̐̕b"#, r#"à֮̐̕b"#),
+        (r#"a֮̐̀̕b"#, r#"a֮̐̀̕b"#, r#"a֮̐̀̕b"#, r#"a֮̐̀̕b"#, r#"a֮̐̀̕b"#),
+        (r#"à֮̑̕b"#, r#"à֮̑̕b"#, r#"à֮̑̕b"#, r#"à֮̑̕b"#, r#"à֮̑̕b"#),
+        (r#"ȃ֮̀̕b"#, r#"ȃ֮̀̕b"#, r#"ȃ֮̀̕b"#, r#"ȃ֮̀̕b"#, r#"ȃ֮̀̕b"#),
+        (r#"à֮̒̕b"#, r#"à֮̒̕b"#, r#"à֮̒̕b"#, r#"à֮̒̕b"#, r#"à֮̒̕b"#),
+        (r#"a֮̒̀̕b"#, r#"a֮̒̀̕b"#, r#"a֮̒̀̕b"#, r#"a֮̒̀̕b"#, r#"a֮̒̀̕b"#),
+        (r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#),
+        (r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#),
+        (r#"à֮̔̕b"#, r#"à֮̔̕b"#, r#"à֮̔̕b"#, r#"à֮̔̕b"#, r#"à֮̔̕b"#),
+        (r#"a֮̔̀̕b"#, r#"a֮̔̀̕b"#, r#"a֮̔̀̕b"#, r#"a֮̔̀̕b"#, r#"a֮̔̀̕b"#),
+        (r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#),
+        (r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#, r#"à̕̕͜b"#),
+        (r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#),
+        (r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#, r#"a᷺̖̖֚b"#),
+        (r#"a᷺̖̗֚b"#, r#"a᷺̖̗֚b"#, r#"a᷺̖̗֚b"#, r#"a᷺̖̗֚b"#, r#"a᷺̖̗֚b"#),
+        (r#"a᷺̗̖֚b"#, r#"a᷺̗̖֚b"#, r#"a᷺̗̖֚b"#, r#"a᷺̗̖֚b"#, r#"a᷺̗̖֚b"#),
+        (r#"a᷺̖̘֚b"#, r#"a᷺̖̘֚b"#, r#"a᷺̖̘֚b"#, r#"a᷺̖̘֚b"#, r#"a᷺̖̘֚b"#),
+        (r#"a᷺̘̖֚b"#, r#"a᷺̘̖֚b"#, r#"a᷺̘̖֚b"#, r#"a᷺̘̖֚b"#, r#"a᷺̘̖֚b"#),
+        (r#"a᷺̖̙֚b"#, r#"a᷺̖̙֚b"#, r#"a᷺̖̙֚b"#, r#"a᷺̖̙֚b"#, r#"a᷺̖̙֚b"#),
+        (r#"a᷺̙̖֚b"#, r#"a᷺̙̖֚b"#, r#"a᷺̙̖֚b"#, r#"a᷺̙̖֚b"#, r#"a᷺̙̖֚b"#),
+        (r#"à̕̚͜b"#, r#"à̕̚͜b"#, r#"à̕̚͜b"#, r#"à̕̚͜b"#, r#"à̕̚͜b"#),
+        (r#"à̚̕͜b"#, r#"à̚̕͜b"#, r#"à̚̕͜b"#, r#"à̚̕͜b"#, r#"à̚̕͜b"#),
+        (r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#),
+        (r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#, r#"a᷎̛̛᷺b"#),
+        (r#"a᷺̖̜֚b"#, r#"a᷺̖̜֚b"#, r#"a᷺̖̜֚b"#, r#"a᷺̖̜֚b"#, r#"a᷺̖̜֚b"#),
+        (r#"a᷺̜̖֚b"#, r#"a᷺̜̖֚b"#, r#"a᷺̜̖֚b"#, r#"a᷺̜̖֚b"#, r#"a᷺̜̖֚b"#),
+        (r#"a᷺̖̝֚b"#, r#"a᷺̖̝֚b"#, r#"a᷺̖̝֚b"#, r#"a᷺̖̝֚b"#, r#"a᷺̖̝֚b"#),
+        (r#"a᷺̝̖֚b"#, r#"a᷺̝̖֚b"#, r#"a᷺̝̖֚b"#, r#"a᷺̝̖֚b"#, r#"a᷺̝̖֚b"#),
+        (r#"a᷺̖̞֚b"#, r#"a᷺̖̞֚b"#, r#"a᷺̖̞֚b"#, r#"a᷺̖̞֚b"#, r#"a᷺̖̞֚b"#),
+        (r#"a᷺̞̖֚b"#, r#"a᷺̞̖֚b"#, r#"a᷺̞̖֚b"#, r#"a᷺̞̖֚b"#, r#"a᷺̞̖֚b"#),
+        (r#"a᷺̖̟֚b"#, r#"a᷺̖̟֚b"#, r#"a᷺̖̟֚b"#, r#"a᷺̖̟֚b"#, r#"a᷺̖̟֚b"#),
+        (r#"a᷺̟̖֚b"#, r#"a᷺̟̖֚b"#, r#"a᷺̟̖֚b"#, r#"a᷺̟̖֚b"#, r#"a᷺̟̖֚b"#),
+        (r#"a᷺̖̠֚b"#, r#"a᷺̖̠֚b"#, r#"a᷺̖̠֚b"#, r#"a᷺̖̠֚b"#, r#"a᷺̖̠֚b"#),
+        (r#"a᷺̠̖֚b"#, r#"a᷺̠̖֚b"#, r#"a᷺̠̖֚b"#, r#"a᷺̠̖֚b"#, r#"a᷺̠̖֚b"#),
+        (r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#),
+        (r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#, r#"aུ̡̡᷎b"#),
+        (r#"aུ̡̢᷎b"#, r#"aུ̡̢᷎b"#, r#"aུ̡̢᷎b"#, r#"aུ̡̢᷎b"#, r#"aུ̡̢᷎b"#),
+        (r#"aུ̢̡᷎b"#, r#"aུ̢̡᷎b"#, r#"aུ̢̡᷎b"#, r#"aུ̢̡᷎b"#, r#"aུ̢̡᷎b"#),
+        (r#"a᷺̖̣֚b"#, r#"a᷺̖̣֚b"#, r#"a᷺̖̣֚b"#, r#"a᷺̖̣֚b"#, r#"a᷺̖̣֚b"#),
+        (r#"ạ᷺̖֚b"#, r#"ạ᷺̖֚b"#, r#"ạ᷺̖֚b"#, r#"ạ᷺̖֚b"#, r#"ạ᷺̖֚b"#),
+        (r#"a᷺̖̤֚b"#, r#"a᷺̖̤֚b"#, r#"a᷺̖̤֚b"#, r#"a᷺̖̤֚b"#, r#"a᷺̖̤֚b"#),
+        (r#"a᷺̤̖֚b"#, r#"a᷺̤̖֚b"#, r#"a᷺̤̖֚b"#, r#"a᷺̤̖֚b"#, r#"a᷺̤̖֚b"#),
+        (r#"a᷺̖̥֚b"#, r#"a᷺̖̥֚b"#, r#"a᷺̖̥֚b"#, r#"a᷺̖̥֚b"#, r#"a᷺̖̥֚b"#),
+        (r#"ḁ᷺̖֚b"#, r#"ḁ᷺̖֚b"#, r#"ḁ᷺̖֚b"#, r#"ḁ᷺̖֚b"#, r#"ḁ᷺̖֚b"#),
+        (r#"a᷺̖̦֚b"#, r#"a᷺̖̦֚b"#, r#"a᷺̖̦֚b"#, r#"a᷺̖̦֚b"#, r#"a᷺̖̦֚b"#),
+        (r#"a᷺̦̖֚b"#, r#"a᷺̦̖֚b"#, r#"a᷺̦̖֚b"#, r#"a᷺̦̖֚b"#, r#"a᷺̦̖֚b"#),
+        (r#"aུ̡̧᷎b"#, r#"aུ̡̧᷎b"#, r#"aུ̡̧᷎b"#, r#"aུ̡̧᷎b"#, r#"aུ̡̧᷎b"#),
+        (r#"aུ̧̡᷎b"#, r#"aུ̧̡᷎b"#, r#"aུ̧̡᷎b"#, r#"aུ̧̡᷎b"#, r#"aུ̧̡᷎b"#),
+        (r#"aུ̡̨᷎b"#, r#"aུ̡̨᷎b"#, r#"aུ̡̨᷎b"#, r#"aུ̡̨᷎b"#, r#"aུ̡̨᷎b"#),
+        (r#"ąུ̡᷎b"#, r#"ąུ̡᷎b"#, r#"ąུ̡᷎b"#, r#"ąུ̡᷎b"#, r#"ąུ̡᷎b"#),
+        (r#"a᷺̖̩֚b"#, r#"a᷺̖̩֚b"#, r#"a᷺̖̩֚b"#, r#"a᷺̖̩֚b"#, r#"a᷺̖̩֚b"#),
+        (r#"a᷺̩̖֚b"#, r#"a᷺̩̖֚b"#, r#"a᷺̩̖֚b"#, r#"a᷺̩̖֚b"#, r#"a᷺̩̖֚b"#),
+        (r#"a᷺̖̪֚b"#, r#"a᷺̖̪֚b"#, r#"a᷺̖̪֚b"#, r#"a᷺̖̪֚b"#, r#"a᷺̖̪֚b"#),
+        (r#"a᷺̪̖֚b"#, r#"a᷺̪̖֚b"#, r#"a᷺̪̖֚b"#, r#"a᷺̪̖֚b"#, r#"a᷺̪̖֚b"#),
+        (r#"a᷺̖̫֚b"#, r#"a᷺̖̫֚b"#, r#"a᷺̖̫֚b"#, r#"a᷺̖̫֚b"#, r#"a᷺̖̫֚b"#),
+        (r#"a᷺̫̖֚b"#, r#"a᷺̫̖֚b"#, r#"a᷺̫̖֚b"#, r#"a᷺̫̖֚b"#, r#"a᷺̫̖֚b"#),
+        (r#"a᷺̖̬֚b"#, r#"a᷺̖̬֚b"#, r#"a᷺̖̬֚b"#, r#"a᷺̖̬֚b"#, r#"a᷺̖̬֚b"#),
+        (r#"a᷺̬̖֚b"#, r#"a᷺̬̖֚b"#, r#"a᷺̬̖֚b"#, r#"a᷺̬̖֚b"#, r#"a᷺̬̖֚b"#),
+        (r#"a᷺̖̭֚b"#, r#"a᷺̖̭֚b"#, r#"a᷺̖̭֚b"#, r#"a᷺̖̭֚b"#, r#"a᷺̖̭֚b"#),
+        (r#"a᷺̭̖֚b"#, r#"a᷺̭̖֚b"#, r#"a᷺̭̖֚b"#, r#"a᷺̭̖֚b"#, r#"a᷺̭̖֚b"#),
+        (r#"a᷺̖̮֚b"#, r#"a᷺̖̮֚b"#, r#"a᷺̖̮֚b"#, r#"a᷺̖̮֚b"#, r#"a᷺̖̮֚b"#),
+        (r#"a᷺̮̖֚b"#, r#"a᷺̮̖֚b"#, r#"a᷺̮̖֚b"#, r#"a᷺̮̖֚b"#, r#"a᷺̮̖֚b"#),
+        (r#"a᷺̖̯֚b"#, r#"a᷺̖̯֚b"#, r#"a᷺̖̯֚b"#, r#"a᷺̖̯֚b"#, r#"a᷺̖̯֚b"#),
+        (r#"a᷺̯̖֚b"#, r#"a᷺̯̖֚b"#, r#"a᷺̯̖֚b"#, r#"a᷺̯̖֚b"#, r#"a᷺̯̖֚b"#),
+        (r#"a᷺̖̰֚b"#, r#"a᷺̖̰֚b"#, r#"a᷺̖̰֚b"#, r#"a᷺̖̰֚b"#, r#"a᷺̖̰֚b"#),
+        (r#"a᷺̰̖֚b"#, r#"a᷺̰̖֚b"#, r#"a᷺̰̖֚b"#, r#"a᷺̰̖֚b"#, r#"a᷺̰̖֚b"#),
+        (r#"a᷺̖̱֚b"#, r#"a᷺̖̱֚b"#, r#"a᷺̖̱֚b"#, r#"a᷺̖̱֚b"#, r#"a᷺̖̱֚b"#),
+        (r#"a᷺̱̖֚b"#, r#"a᷺̱̖֚b"#, r#"a᷺̱̖֚b"#, r#"a᷺̱̖֚b"#, r#"a᷺̱̖֚b"#),
+        (r#"a᷺̖̲֚b"#, r#"a᷺̖̲֚b"#, r#"a᷺̖̲֚b"#, r#"a᷺̖̲֚b"#, r#"a᷺̖̲֚b"#),
+        (r#"a᷺̲̖֚b"#, r#"a᷺̲̖֚b"#, r#"a᷺̲̖֚b"#, r#"a᷺̲̖֚b"#, r#"a᷺̲̖֚b"#),
+        (r#"a᷺̖̳֚b"#, r#"a᷺̖̳֚b"#, r#"a᷺̖̳֚b"#, r#"a᷺̖̳֚b"#, r#"a᷺̖̳֚b"#),
+        (r#"a᷺̳̖֚b"#, r#"a᷺̳̖֚b"#, r#"a᷺̳̖֚b"#, r#"a᷺̳̖֚b"#, r#"a᷺̳̖֚b"#),
+        (r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#),
+        (r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#, r#"a̴̴𖿰b"#),
+        (r#"a̴̵𖿰b"#, r#"a̴̵𖿰b"#, r#"a̴̵𖿰b"#, r#"a̴̵𖿰b"#, r#"a̴̵𖿰b"#),
+        (r#"a̵̴𖿰b"#, r#"a̵̴𖿰b"#, r#"a̵̴𖿰b"#, r#"a̵̴𖿰b"#, r#"a̵̴𖿰b"#),
+        (r#"a̴̶𖿰b"#, r#"a̴̶𖿰b"#, r#"a̴̶𖿰b"#, r#"a̴̶𖿰b"#, r#"a̴̶𖿰b"#),
+        (r#"a̶̴𖿰b"#, r#"a̶̴𖿰b"#, r#"a̶̴𖿰b"#, r#"a̶̴𖿰b"#, r#"a̶̴𖿰b"#),
+        (r#"a̴̷𖿰b"#, r#"a̴̷𖿰b"#, r#"a̴̷𖿰b"#, r#"a̴̷𖿰b"#, r#"a̴̷𖿰b"#),
+        (r#"a̷̴𖿰b"#, r#"a̷̴𖿰b"#, r#"a̷̴𖿰b"#, r#"a̷̴𖿰b"#, r#"a̷̴𖿰b"#),
+        (r#"a̴̸𖿰b"#, r#"a̴̸𖿰b"#, r#"a̴̸𖿰b"#, r#"a̴̸𖿰b"#, r#"a̴̸𖿰b"#),
+        (r#"a̸̴𖿰b"#, r#"a̸̴𖿰b"#, r#"a̸̴𖿰b"#, r#"a̸̴𖿰b"#, r#"a̸̴𖿰b"#),
+        (r#"a᷺̖̹֚b"#, r#"a᷺̖̹֚b"#, r#"a᷺̖̹֚b"#, r#"a᷺̖̹֚b"#, r#"a᷺̖̹֚b"#),
+        (r#"a᷺̹̖֚b"#, r#"a᷺̹̖֚b"#, r#"a᷺̹̖֚b"#, r#"a᷺̹̖֚b"#, r#"a᷺̹̖֚b"#),
+        (r#"a᷺̖̺֚b"#, r#"a᷺̖̺֚b"#, r#"a᷺̖̺֚b"#, r#"a᷺̖̺֚b"#, r#"a᷺̖̺֚b"#),
+        (r#"a᷺̺̖֚b"#, r#"a᷺̺̖֚b"#, r#"a᷺̺̖֚b"#, r#"a᷺̺̖֚b"#, r#"a᷺̺̖֚b"#),
+        (r#"a᷺̖̻֚b"#, r#"a᷺̖̻֚b"#, r#"a᷺̖̻֚b"#, r#"a᷺̖̻֚b"#, r#"a᷺̖̻֚b"#),
+        (r#"a᷺̻̖֚b"#, r#"a᷺̻̖֚b"#, r#"a᷺̻̖֚b"#, r#"a᷺̻̖֚b"#, r#"a᷺̻̖֚b"#),
+        (r#"a᷺̖̼֚b"#, r#"a᷺̖̼֚b"#, r#"a᷺̖̼֚b"#, r#"a᷺̖̼֚b"#, r#"a᷺̖̼֚b"#),
+        (r#"a᷺̼̖֚b"#, r#"a᷺̼̖֚b"#, r#"a᷺̼̖֚b"#, r#"a᷺̼̖֚b"#, r#"a᷺̼̖֚b"#),
+        (r#"à֮̽̕b"#, r#"à֮̽̕b"#, r#"à֮̽̕b"#, r#"à֮̽̕b"#, r#"à֮̽̕b"#),
+        (r#"a֮̽̀̕b"#, r#"a֮̽̀̕b"#, r#"a֮̽̀̕b"#, r#"a֮̽̀̕b"#, r#"a֮̽̀̕b"#),
+        (r#"à֮̾̕b"#, r#"à֮̾̕b"#, r#"à֮̾̕b"#, r#"à֮̾̕b"#, r#"à֮̾̕b"#),
+        (r#"a֮̾̀̕b"#, r#"a֮̾̀̕b"#, r#"a֮̾̀̕b"#, r#"a֮̾̀̕b"#, r#"a֮̾̀̕b"#),
+        (r#"à֮̿̕b"#, r#"à֮̿̕b"#, r#"à֮̿̕b"#, r#"à֮̿̕b"#, r#"à֮̿̕b"#),
+        (r#"a֮̿̀̕b"#, r#"a֮̿̀̕b"#, r#"a֮̿̀̕b"#, r#"a֮̿̀̕b"#, r#"a֮̿̀̕b"#),
+        (r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#),
+        (r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#, r#"à֮̀̕b"#),
+        (r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#, r#"à֮́̕b"#),
+        (r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#, r#"á֮̀̕b"#),
+        (r#"à֮͂̕b"#, r#"à֮͂̕b"#, r#"à֮͂̕b"#, r#"à֮͂̕b"#, r#"à֮͂̕b"#),
+        (r#"a֮͂̀̕b"#, r#"a֮͂̀̕b"#, r#"a֮͂̀̕b"#, r#"a֮͂̀̕b"#, r#"a֮͂̀̕b"#),
+        (r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#, r#"à֮̓̕b"#),
+        (r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#, r#"a֮̓̀̕b"#),
+        (r#"à֮̈́̕b"#, r#"à֮̈́̕b"#, r#"à֮̈́̕b"#, r#"à֮̈́̕b"#, r#"à֮̈́̕b"#),
+        (r#"ä֮́̀̕b"#, r#"ä֮́̀̕b"#, r#"ä֮́̀̕b"#, r#"ä֮́̀̕b"#, r#"ä֮́̀̕b"#),
+        (r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#),
+        (r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#, r#"a͝ͅͅb"#),
+        (r#"à֮͆̕b"#, r#"à֮͆̕b"#, r#"à֮͆̕b"#, r#"à֮͆̕b"#, r#"à֮͆̕b"#),
+        (r#"a֮͆̀̕b"#, r#"a֮͆̀̕b"#, r#"a֮͆̀̕b"#, r#"a֮͆̀̕b"#, r#"a֮͆̀̕b"#),
+        (r#"a᷺̖͇֚b"#, r#"a᷺̖͇֚b"#, r#"a᷺̖͇֚b"#, r#"a᷺̖͇֚b"#, r#"a᷺̖͇֚b"#),
+        (r#"a᷺͇̖֚b"#, r#"a᷺͇̖֚b"#, r#"a᷺͇̖֚b"#, r#"a᷺͇̖֚b"#, r#"a᷺͇̖֚b"#),
+        (r#"a᷺̖͈֚b"#, r#"a᷺̖͈֚b"#, r#"a᷺̖͈֚b"#, r#"a᷺̖͈֚b"#, r#"a᷺̖͈֚b"#),
+        (r#"a᷺͈̖֚b"#, r#"a᷺͈̖֚b"#, r#"a᷺͈̖֚b"#, r#"a᷺͈̖֚b"#, r#"a᷺͈̖֚b"#),
+        (r#"a᷺̖͉֚b"#, r#"a᷺̖͉֚b"#, r#"a᷺̖͉֚b"#, r#"a᷺̖͉֚b"#, r#"a᷺̖͉֚b"#),
+        (r#"a᷺͉̖֚b"#, r#"a᷺͉̖֚b"#, r#"a᷺͉̖֚b"#, r#"a᷺͉̖֚b"#, r#"a᷺͉̖֚b"#),
+        (r#"à֮͊̕b"#, r#"à֮͊̕b"#, r#"à֮͊̕b"#, r#"à֮͊̕b"#, r#"à֮͊̕b"#),
+        (r#"a֮͊̀̕b"#, r#"a֮͊̀̕b"#, r#"a֮͊̀̕b"#, r#"a֮͊̀̕b"#, r#"a֮͊̀̕b"#),
+        (r#"à֮͋̕b"#, r#"à֮͋̕b"#, r#"à֮͋̕b"#, r#"à֮͋̕b"#, r#"à֮͋̕b"#),
+        (r#"a֮͋̀̕b"#, r#"a֮͋̀̕b"#, r#"a֮͋̀̕b"#, r#"a֮͋̀̕b"#, r#"a֮͋̀̕b"#),
+        (r#"à֮͌̕b"#, r#"à֮͌̕b"#, r#"à֮͌̕b"#, r#"à֮͌̕b"#, r#"à֮͌̕b"#),
+        (r#"a֮͌̀̕b"#, r#"a֮͌̀̕b"#, r#"a֮͌̀̕b"#, r#"a֮͌̀̕b"#, r#"a֮͌̀̕b"#),
+        (r#"a᷺̖͍֚b"#, r#"a᷺̖͍֚b"#, r#"a᷺̖͍֚b"#, r#"a᷺̖͍֚b"#, r#"a᷺̖͍֚b"#),
+        (r#"a᷺͍̖֚b"#, r#"a᷺͍̖֚b"#, r#"a᷺͍̖֚b"#, r#"a᷺͍̖֚b"#, r#"a᷺͍̖֚b"#),
+        (r#"a᷺̖͎֚b"#, r#"a᷺̖͎֚b"#, r#"a᷺̖͎֚b"#, r#"a᷺̖͎֚b"#, r#"a᷺̖͎֚b"#),
+        (r#"a᷺͎̖֚b"#, r#"a᷺͎̖֚b"#, r#"a᷺͎̖֚b"#, r#"a᷺͎̖֚b"#, r#"a᷺͎̖֚b"#),
+        (r#"à֮͐̕b"#, r#"à֮͐̕b"#, r#"à֮͐̕b"#, r#"à֮͐̕b"#, r#"à֮͐̕b"#),
+        (r#"a֮͐̀̕b"#, r#"a֮͐̀̕b"#, r#"a֮͐̀̕b"#, r#"a֮͐̀̕b"#, r#"a֮͐̀̕b"#),
+        (r#"à֮͑̕b"#, r#"à֮͑̕b"#, r#"à֮͑̕b"#, r#"à֮͑̕b"#, r#"à֮͑̕b"#),
+        (r#"a֮͑̀̕b"#, r#"a֮͑̀̕b"#, r#"a֮͑̀̕b"#, r#"a֮͑̀̕b"#, r#"a֮͑̀̕b"#),
+        (r#"à֮͒̕b"#, r#"à֮͒̕b"#, r#"à֮͒̕b"#, r#"à֮͒̕b"#, r#"à֮͒̕b"#),
+        (r#"a֮͒̀̕b"#, r#"a֮͒̀̕b"#, r#"a֮͒̀̕b"#, r#"a֮͒̀̕b"#, r#"a֮͒̀̕b"#),
+        (r#"a᷺̖͓֚b"#, r#"a᷺̖͓֚b"#, r#"a᷺̖͓֚b"#, r#"a᷺̖͓֚b"#, r#"a᷺̖͓֚b"#),
+        (r#"a᷺͓̖֚b"#, r#"a᷺͓̖֚b"#, r#"a᷺͓̖֚b"#, r#"a᷺͓̖֚b"#, r#"a᷺͓̖֚b"#),
+        (r#"a᷺̖͔֚b"#, r#"a᷺̖͔֚b"#, r#"a᷺̖͔֚b"#, r#"a᷺̖͔֚b"#, r#"a᷺̖͔֚b"#),
+        (r#"a᷺͔̖֚b"#, r#"a᷺͔̖֚b"#, r#"a᷺͔̖֚b"#, r#"a᷺͔̖֚b"#, r#"a᷺͔̖֚b"#),
+        (r#"a᷺̖͕֚b"#, r#"a᷺̖͕֚b"#, r#"a᷺̖͕֚b"#, r#"a᷺̖͕֚b"#, r#"a᷺̖͕֚b"#),
+        (r#"a᷺͕̖֚b"#, r#"a᷺͕̖֚b"#, r#"a᷺͕̖֚b"#, r#"a᷺͕̖֚b"#, r#"a᷺͕̖֚b"#),
+        (r#"a᷺̖͖֚b"#, r#"a᷺̖͖֚b"#, r#"a᷺̖͖֚b"#, r#"a᷺̖͖֚b"#, r#"a᷺̖͖֚b"#),
+        (r#"a᷺͖̖֚b"#, r#"a᷺͖̖֚b"#, r#"a᷺͖̖֚b"#, r#"a᷺͖̖֚b"#, r#"a᷺͖̖֚b"#),
+        (r#"à֮͗̕b"#, r#"à֮͗̕b"#, r#"à֮͗̕b"#, r#"à֮͗̕b"#, r#"à֮͗̕b"#),
+        (r#"a֮͗̀̕b"#, r#"a֮͗̀̕b"#, r#"a֮͗̀̕b"#, r#"a֮͗̀̕b"#, r#"a֮͗̀̕b"#),
+        (r#"à̕͘͜b"#, r#"à̕͘͜b"#, r#"à̕͘͜b"#, r#"à̕͘͜b"#, r#"à̕͘͜b"#),
+        (r#"à͘̕͜b"#, r#"à͘̕͜b"#, r#"à͘̕͜b"#, r#"à͘̕͜b"#, r#"à͘̕͜b"#),
+        (r#"a᷺̖͙֚b"#, r#"a᷺̖͙֚b"#, r#"a᷺̖͙֚b"#, r#"a᷺̖͙֚b"#, r#"a᷺̖͙֚b"#),
+        (r#"a᷺͙̖֚b"#, r#"a᷺͙̖֚b"#, r#"a᷺͙̖֚b"#, r#"a᷺͙̖֚b"#, r#"a᷺͙̖֚b"#),
+        (r#"a᷺̖͚֚b"#, r#"a᷺̖͚֚b"#, r#"a᷺̖͚֚b"#, r#"a᷺̖͚֚b"#, r#"a᷺̖͚֚b"#),
+        (r#"a᷺͚̖֚b"#, r#"a᷺͚̖֚b"#, r#"a᷺͚̖֚b"#, r#"a᷺͚̖֚b"#, r#"a᷺͚̖֚b"#),
+        (r#"à֮͛̕b"#, r#"à֮͛̕b"#, r#"à֮͛̕b"#, r#"à֮͛̕b"#, r#"à֮͛̕b"#),
+        (r#"a֮͛̀̕b"#, r#"a֮͛̀̕b"#, r#"a֮͛̀̕b"#, r#"a֮͛̀̕b"#, r#"a֮͛̀̕b"#),
+        (r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#),
+        (r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#, r#"a̕͜͜͝b"#),
+        (r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#),
+        (r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#, r#"a͜͝͝ͅb"#),
+        (r#"a͜͝͞ͅb"#, r#"a͜͝͞ͅb"#, r#"a͜͝͞ͅb"#, r#"a͜͝͞ͅb"#, r#"a͜͝͞ͅb"#),
+        (r#"a͜͞͝ͅb"#, r#"a͜͞͝ͅb"#, r#"a͜͞͝ͅb"#, r#"a͜͞͝ͅb"#, r#"a͜͞͝ͅb"#),
+        (r#"a̕͜͟͝b"#, r#"a̕͜͟͝b"#, r#"a̕͜͟͝b"#, r#"a̕͜͟͝b"#, r#"a̕͜͟͝b"#),
+        (r#"a̕͟͜͝b"#, r#"a̕͟͜͝b"#, r#"a̕͟͜͝b"#, r#"a̕͟͜͝b"#, r#"a̕͟͜͝b"#),
+        (r#"a͜͝͠ͅb"#, r#"a͜͝͠ͅb"#, r#"a͜͝͠ͅb"#, r#"a͜͝͠ͅb"#, r#"a͜͝͠ͅb"#),
+        (r#"a͜͠͝ͅb"#, r#"a͜͠͝ͅb"#, r#"a͜͠͝ͅb"#, r#"a͜͠͝ͅb"#, r#"a͜͠͝ͅb"#),
+        (r#"a͜͝͡ͅb"#, r#"a͜͝͡ͅb"#, r#"a͜͝͡ͅb"#, r#"a͜͝͡ͅb"#, r#"a͜͝͡ͅb"#),
+        (r#"a͜͡͝ͅb"#, r#"a͜͡͝ͅb"#, r#"a͜͡͝ͅb"#, r#"a͜͡͝ͅb"#, r#"a͜͡͝ͅb"#),
+        (r#"a̕͜͢͝b"#, r#"a̕͜͢͝b"#, r#"a̕͜͢͝b"#, r#"a̕͜͢͝b"#, r#"a̕͜͢͝b"#),
+        (r#"a̕͢͜͝b"#, r#"a̕͢͜͝b"#, r#"a̕͢͜͝b"#, r#"a̕͢͜͝b"#, r#"a̕͢͜͝b"#),
+        (r#"à֮ͣ̕b"#, r#"à֮ͣ̕b"#, r#"à֮ͣ̕b"#, r#"à֮ͣ̕b"#, r#"à֮ͣ̕b"#),
+        (r#"a֮ͣ̀̕b"#, r#"a֮ͣ̀̕b"#, r#"a֮ͣ̀̕b"#, r#"a֮ͣ̀̕b"#, r#"a֮ͣ̀̕b"#),
+        (r#"à֮ͤ̕b"#, r#"à֮ͤ̕b"#, r#"à֮ͤ̕b"#, r#"à֮ͤ̕b"#, r#"à֮ͤ̕b"#),
+        (r#"a֮ͤ̀̕b"#, r#"a֮ͤ̀̕b"#, r#"a֮ͤ̀̕b"#, r#"a֮ͤ̀̕b"#, r#"a֮ͤ̀̕b"#),
+        (r#"à֮ͥ̕b"#, r#"à֮ͥ̕b"#, r#"à֮ͥ̕b"#, r#"à֮ͥ̕b"#, r#"à֮ͥ̕b"#),
+        (r#"a֮ͥ̀̕b"#, r#"a֮ͥ̀̕b"#, r#"a֮ͥ̀̕b"#, r#"a֮ͥ̀̕b"#, r#"a֮ͥ̀̕b"#),
+        (r#"à֮ͦ̕b"#, r#"à֮ͦ̕b"#, r#"à֮ͦ̕b"#, r#"à֮ͦ̕b"#, r#"à֮ͦ̕b"#),
+        (r#"a֮ͦ̀̕b"#, r#"a֮ͦ̀̕b"#, r#"a֮ͦ̀̕b"#, r#"a֮ͦ̀̕b"#, r#"a֮ͦ̀̕b"#),
+        (r#"à֮ͧ̕b"#, r#"à֮ͧ̕b"#, r#"à֮ͧ̕b"#, r#"à֮ͧ̕b"#, r#"à֮ͧ̕b"#),
+        (r#"a֮ͧ̀̕b"#, r#"a֮ͧ̀̕b"#, r#"a֮ͧ̀̕b"#, r#"a֮ͧ̀̕b"#, r#"a֮ͧ̀̕b"#),
+        (r#"à֮ͨ̕b"#, r#"à֮ͨ̕b"#, r#"à֮ͨ̕b"#, r#"à֮ͨ̕b"#, r#"à֮ͨ̕b"#),
+        (r#"a֮ͨ̀̕b"#, r#"a֮ͨ̀̕b"#, r#"a֮ͨ̀̕b"#, r#"a֮ͨ̀̕b"#, r#"a֮ͨ̀̕b"#),
+        (r#"à֮ͩ̕b"#, r#"à֮ͩ̕b"#, r#"à֮ͩ̕b"#, r#"à֮ͩ̕b"#, r#"à֮ͩ̕b"#),
+        (r#"a֮ͩ̀̕b"#, r#"a֮ͩ̀̕b"#, r#"a֮ͩ̀̕b"#, r#"a֮ͩ̀̕b"#, r#"a֮ͩ̀̕b"#),
+        (r#"à֮ͪ̕b"#, r#"à֮ͪ̕b"#, r#"à֮ͪ̕b"#, r#"à֮ͪ̕b"#, r#"à֮ͪ̕b"#),
+        (r#"a֮ͪ̀̕b"#, r#"a֮ͪ̀̕b"#, r#"a֮ͪ̀̕b"#, r#"a֮ͪ̀̕b"#, r#"a֮ͪ̀̕b"#),
+        (r#"à֮ͫ̕b"#, r#"à֮ͫ̕b"#, r#"à֮ͫ̕b"#, r#"à֮ͫ̕b"#, r#"à֮ͫ̕b"#),
+        (r#"a֮ͫ̀̕b"#, r#"a֮ͫ̀̕b"#, r#"a֮ͫ̀̕b"#, r#"a֮ͫ̀̕b"#, r#"a֮ͫ̀̕b"#),
+        (r#"à֮ͬ̕b"#, r#"à֮ͬ̕b"#, r#"à֮ͬ̕b"#, r#"à֮ͬ̕b"#, r#"à֮ͬ̕b"#),
+        (r#"a֮ͬ̀̕b"#, r#"a֮ͬ̀̕b"#, r#"a֮ͬ̀̕b"#, r#"a֮ͬ̀̕b"#, r#"a֮ͬ̀̕b"#),
+        (r#"à֮ͭ̕b"#, r#"à֮ͭ̕b"#, r#"à֮ͭ̕b"#, r#"à֮ͭ̕b"#, r#"à֮ͭ̕b"#),
+        (r#"a֮ͭ̀̕b"#, r#"a֮ͭ̀̕b"#, r#"a֮ͭ̀̕b"#, r#"a֮ͭ̀̕b"#, r#"a֮ͭ̀̕b"#),
+        (r#"à֮ͮ̕b"#, r#"à֮ͮ̕b"#, r#"à֮ͮ̕b"#, r#"à֮ͮ̕b"#, r#"à֮ͮ̕b"#),
+        (r#"a֮ͮ̀̕b"#, r#"a֮ͮ̀̕b"#, r#"a֮ͮ̀̕b"#, r#"a֮ͮ̀̕b"#, r#"a֮ͮ̀̕b"#),
+        (r#"à֮ͯ̕b"#, r#"à֮ͯ̕b"#, r#"à֮ͯ̕b"#, r#"à֮ͯ̕b"#, r#"à֮ͯ̕b"#),
+        (r#"a֮ͯ̀̕b"#, r#"a֮ͯ̀̕b"#, r#"a֮ͯ̀̕b"#, r#"a֮ͯ̀̕b"#, r#"a֮ͯ̀̕b"#),
+        (r#"à֮҃̕b"#, r#"à֮҃̕b"#, r#"à֮҃̕b"#, r#"à֮҃̕b"#, r#"à֮҃̕b"#),
+        (r#"a֮҃̀̕b"#, r#"a֮҃̀̕b"#, r#"a֮҃̀̕b"#, r#"a֮҃̀̕b"#, r#"a֮҃̀̕b"#),
+        (r#"à֮҄̕b"#, r#"à֮҄̕b"#, r#"à֮҄̕b"#, r#"à֮҄̕b"#, r#"à֮҄̕b"#),
+        (r#"a֮҄̀̕b"#, r#"a֮҄̀̕b"#, r#"a֮҄̀̕b"#, r#"a֮҄̀̕b"#, r#"a֮҄̀̕b"#),
+        (r#"à֮҅̕b"#, r#"à֮҅̕b"#, r#"à֮҅̕b"#, r#"à֮҅̕b"#, r#"à֮҅̕b"#),
+        (r#"a֮҅̀̕b"#, r#"a֮҅̀̕b"#, r#"a֮҅̀̕b"#, r#"a֮҅̀̕b"#, r#"a֮҅̀̕b"#),
+        (r#"à֮҆̕b"#, r#"à֮҆̕b"#, r#"à֮҆̕b"#, r#"à֮҆̕b"#, r#"à֮҆̕b"#),
+        (r#"a֮҆̀̕b"#, r#"a֮҆̀̕b"#, r#"a֮҆̀̕b"#, r#"a֮҆̀̕b"#, r#"a֮҆̀̕b"#),
+        (r#"à֮҇̕b"#, r#"à֮҇̕b"#, r#"à֮҇̕b"#, r#"à֮҇̕b"#, r#"à֮҇̕b"#),
+        (r#"a֮҇̀̕b"#, r#"a֮҇̀̕b"#, r#"a֮҇̀̕b"#, r#"a֮҇̀̕b"#, r#"a֮҇̀̕b"#),
+        (r#"a᷺̖֑֚b"#, r#"a᷺̖֑֚b"#, r#"a᷺̖֑֚b"#, r#"a᷺̖֑֚b"#, r#"a᷺̖֑֚b"#),
+        (r#"a᷺֑̖֚b"#, r#"a᷺֑̖֚b"#, r#"a᷺֑̖֚b"#, r#"a᷺֑̖֚b"#, r#"a᷺֑̖֚b"#),
+        (r#"à֮֒̕b"#, r#"à֮֒̕b"#, r#"à֮֒̕b"#, r#"à֮֒̕b"#, r#"à֮֒̕b"#),
+        (r#"a֮֒̀̕b"#, r#"a֮֒̀̕b"#, r#"a֮֒̀̕b"#, r#"a֮֒̀̕b"#, r#"a֮֒̀̕b"#),
+        (r#"à֮֓̕b"#, r#"à֮֓̕b"#, r#"à֮֓̕b"#, r#"à֮֓̕b"#, r#"à֮֓̕b"#),
+        (r#"a֮֓̀̕b"#, r#"a֮֓̀̕b"#, r#"a֮֓̀̕b"#, r#"a֮֓̀̕b"#, r#"a֮֓̀̕b"#),
+        (r#"à֮֔̕b"#, r#"à֮֔̕b"#, r#"à֮֔̕b"#, r#"à֮֔̕b"#, r#"à֮֔̕b"#),
+        (r#"a֮֔̀̕b"#, r#"a֮֔̀̕b"#, r#"a֮֔̀̕b"#, r#"a֮֔̀̕b"#, r#"a֮֔̀̕b"#),
+        (r#"à֮֕̕b"#, r#"à֮֕̕b"#, r#"à֮֕̕b"#, r#"à֮֕̕b"#, r#"à֮֕̕b"#),
+        (r#"a֮֕̀̕b"#, r#"a֮֕̀̕b"#, r#"a֮֕̀̕b"#, r#"a֮֕̀̕b"#, r#"a֮֕̀̕b"#),
+        (r#"a᷺̖֖֚b"#, r#"a᷺̖֖֚b"#, r#"a᷺̖֖֚b"#, r#"a᷺̖֖֚b"#, r#"a᷺̖֖֚b"#),
+        (r#"a᷺֖̖֚b"#, r#"a᷺֖̖֚b"#, r#"a᷺֖̖֚b"#, r#"a᷺֖̖֚b"#, r#"a᷺֖̖֚b"#),
+        (r#"à֮֗̕b"#, r#"à֮֗̕b"#, r#"à֮֗̕b"#, r#"à֮֗̕b"#, r#"à֮֗̕b"#),
+        (r#"a֮֗̀̕b"#, r#"a֮֗̀̕b"#, r#"a֮֗̀̕b"#, r#"a֮֗̀̕b"#, r#"a֮֗̀̕b"#),
+        (r#"à֮֘̕b"#, r#"à֮֘̕b"#, r#"à֮֘̕b"#, r#"à֮֘̕b"#, r#"à֮֘̕b"#),
+        (r#"a֮֘̀̕b"#, r#"a֮֘̀̕b"#, r#"a֮֘̀̕b"#, r#"a֮֘̀̕b"#, r#"a֮֘̀̕b"#),
+        (r#"à֮֙̕b"#, r#"à֮֙̕b"#, r#"à֮֙̕b"#, r#"à֮֙̕b"#, r#"à֮֙̕b"#),
+        (r#"a֮֙̀̕b"#, r#"a֮֙̀̕b"#, r#"a֮֙̀̕b"#, r#"a֮֙̀̕b"#, r#"a֮֙̀̕b"#),
+        (r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#),
+        (r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#, r#"a̖֚֚〮b"#),
+        (r#"a᷺̖֛֚b"#, r#"a᷺̖֛֚b"#, r#"a᷺̖֛֚b"#, r#"a᷺̖֛֚b"#, r#"a᷺̖֛֚b"#),
+        (r#"a᷺֛̖֚b"#, r#"a᷺֛̖֚b"#, r#"a᷺֛̖֚b"#, r#"a᷺֛̖֚b"#, r#"a᷺֛̖֚b"#),
+        (r#"à֮֜̕b"#, r#"à֮֜̕b"#, r#"à֮֜̕b"#, r#"à֮֜̕b"#, r#"à֮֜̕b"#),
+        (r#"a֮֜̀̕b"#, r#"a֮֜̀̕b"#, r#"a֮֜̀̕b"#, r#"a֮֜̀̕b"#, r#"a֮֜̀̕b"#),
+        (r#"à֮֝̕b"#, r#"à֮֝̕b"#, r#"à֮֝̕b"#, r#"à֮֝̕b"#, r#"à֮֝̕b"#),
+        (r#"a֮֝̀̕b"#, r#"a֮֝̀̕b"#, r#"a֮֝̀̕b"#, r#"a֮֝̀̕b"#, r#"a֮֝̀̕b"#),
+        (r#"à֮֞̕b"#, r#"à֮֞̕b"#, r#"à֮֞̕b"#, r#"à֮֞̕b"#, r#"à֮֞̕b"#),
+        (r#"a֮֞̀̕b"#, r#"a֮֞̀̕b"#, r#"a֮֞̀̕b"#, r#"a֮֞̀̕b"#, r#"a֮֞̀̕b"#),
+        (r#"à֮֟̕b"#, r#"à֮֟̕b"#, r#"à֮֟̕b"#, r#"à֮֟̕b"#, r#"à֮֟̕b"#),
+        (r#"a֮֟̀̕b"#, r#"a֮֟̀̕b"#, r#"a֮֟̀̕b"#, r#"a֮֟̀̕b"#, r#"a֮֟̀̕b"#),
+        (r#"à֮֠̕b"#, r#"à֮֠̕b"#, r#"à֮֠̕b"#, r#"à֮֠̕b"#, r#"à֮֠̕b"#),
+        (r#"a֮֠̀̕b"#, r#"a֮֠̀̕b"#, r#"a֮֠̀̕b"#, r#"a֮֠̀̕b"#, r#"a֮֠̀̕b"#),
+        (r#"à֮֡̕b"#, r#"à֮֡̕b"#, r#"à֮֡̕b"#, r#"à֮֡̕b"#, r#"à֮֡̕b"#),
+        (r#"a֮֡̀̕b"#, r#"a֮֡̀̕b"#, r#"a֮֡̀̕b"#, r#"a֮֡̀̕b"#, r#"a֮֡̀̕b"#),
+        (r#"a᷺̖֢֚b"#, r#"a᷺̖֢֚b"#, r#"a᷺̖֢֚b"#, r#"a᷺̖֢֚b"#, r#"a᷺̖֢֚b"#),
+        (r#"a᷺֢̖֚b"#, r#"a᷺֢̖֚b"#, r#"a᷺֢̖֚b"#, r#"a᷺֢̖֚b"#, r#"a᷺֢̖֚b"#),
+        (r#"a᷺̖֣֚b"#, r#"a᷺̖֣֚b"#, r#"a᷺̖֣֚b"#, r#"a᷺̖֣֚b"#, r#"a᷺̖֣֚b"#),
+        (r#"a᷺֣̖֚b"#, r#"a᷺֣̖֚b"#, r#"a᷺֣̖֚b"#, r#"a᷺֣̖֚b"#, r#"a᷺֣̖֚b"#),
+        (r#"a᷺̖֤֚b"#, r#"a᷺̖֤֚b"#, r#"a᷺̖֤֚b"#, r#"a᷺̖֤֚b"#, r#"a᷺̖֤֚b"#),
+        (r#"a᷺֤̖֚b"#, r#"a᷺֤̖֚b"#, r#"a᷺֤̖֚b"#, r#"a᷺֤̖֚b"#, r#"a᷺֤̖֚b"#),
+        (r#"a᷺̖֥֚b"#, r#"a᷺̖֥֚b"#, r#"a᷺̖֥֚b"#, r#"a᷺̖֥֚b"#, r#"a᷺̖֥֚b"#),
+        (r#"a᷺֥̖֚b"#, r#"a᷺֥̖֚b"#, r#"a᷺֥̖֚b"#, r#"a᷺֥̖֚b"#, r#"a᷺֥̖֚b"#),
+        (r#"a᷺̖֦֚b"#, r#"a᷺̖֦֚b"#, r#"a᷺̖֦֚b"#, r#"a᷺̖֦֚b"#, r#"a᷺̖֦֚b"#),
+        (r#"a᷺֦̖֚b"#, r#"a᷺֦̖֚b"#, r#"a᷺֦̖֚b"#, r#"a᷺֦̖֚b"#, r#"a᷺֦̖֚b"#),
+        (r#"a᷺̖֧֚b"#, r#"a᷺̖֧֚b"#, r#"a᷺̖֧֚b"#, r#"a᷺̖֧֚b"#, r#"a᷺̖֧֚b"#),
+        (r#"a᷺֧̖֚b"#, r#"a᷺֧̖֚b"#, r#"a᷺֧̖֚b"#, r#"a᷺֧̖֚b"#, r#"a᷺֧̖֚b"#),
+        (r#"à֮֨̕b"#, r#"à֮֨̕b"#, r#"à֮֨̕b"#, r#"à֮֨̕b"#, r#"à֮֨̕b"#),
+        (r#"a֮֨̀̕b"#, r#"a֮֨̀̕b"#, r#"a֮֨̀̕b"#, r#"a֮֨̀̕b"#, r#"a֮֨̀̕b"#),
+        (r#"à֮֩̕b"#, r#"à֮֩̕b"#, r#"à֮֩̕b"#, r#"à֮֩̕b"#, r#"à֮֩̕b"#),
+        (r#"a֮֩̀̕b"#, r#"a֮֩̀̕b"#, r#"a֮֩̀̕b"#, r#"a֮֩̀̕b"#, r#"a֮֩̀̕b"#),
+        (r#"a᷺̖֪֚b"#, r#"a᷺̖֪֚b"#, r#"a᷺̖֪֚b"#, r#"a᷺̖֪֚b"#, r#"a᷺̖֪֚b"#),
+        (r#"a᷺֪̖֚b"#, r#"a᷺֪̖֚b"#, r#"a᷺֪̖֚b"#, r#"a᷺֪̖֚b"#, r#"a᷺֪̖֚b"#),
+        (r#"à֮֫̕b"#, r#"à֮֫̕b"#, r#"à֮֫̕b"#, r#"à֮֫̕b"#, r#"à֮֫̕b"#),
+        (r#"a֮֫̀̕b"#, r#"a֮֫̀̕b"#, r#"a֮֫̀̕b"#, r#"a֮֫̀̕b"#, r#"a֮֫̀̕b"#),
+        (r#"à֮֬̕b"#, r#"à֮֬̕b"#, r#"à֮֬̕b"#, r#"à֮֬̕b"#, r#"à֮֬̕b"#),
+        (r#"a֮֬̀̕b"#, r#"a֮֬̀̕b"#, r#"a֮֬̀̕b"#, r#"a֮֬̀̕b"#, r#"a֮֬̀̕b"#),
+        (r#"a̖֚֭〮b"#, r#"a̖֚֭〮b"#, r#"a̖֚֭〮b"#, r#"a̖֚֭〮b"#, r#"a̖֚֭〮b"#),
+        (r#"a̖֭֚〮b"#, r#"a̖֭֚〮b"#, r#"a̖֭֚〮b"#, r#"a̖֭֚〮b"#, r#"a̖֭֚〮b"#),
+        (r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#),
+        (r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#, r#"à𝅭֮֮b"#),
+        (r#"à֮֯̕b"#, r#"à֮֯̕b"#, r#"à֮֯̕b"#, r#"à֮֯̕b"#, r#"à֮֯̕b"#),
+        (r#"a֮֯̀̕b"#, r#"a֮֯̀̕b"#, r#"a֮֯̀̕b"#, r#"a֮֯̀̕b"#, r#"a֮֯̀̕b"#),
+        (r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#),
+        (r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#, r#"a्ְְֱb"#),
+        (r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#),
+        (r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#, r#"aְֱֱֲb"#),
+        (r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#),
+        (r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#, r#"aֱֲֲֳb"#),
+        (r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#),
+        (r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#, r#"aֲֳֳִb"#),
+        (r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#),
+        (r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#, r#"aֳִִֵb"#),
+        (r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#),
+        (r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#, r#"aִֵֵֶb"#),
+        (r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#),
+        (r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#, r#"aֵֶֶַb"#),
+        (r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#),
+        (r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#, r#"aֶַַָb"#),
+        (r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#),
+        (r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#, r#"aַָָֹb"#),
+        (r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#),
+        (r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#, r#"aָֹֹֻb"#),
+        (r#"aָֹֺֻb"#, r#"aָֹֺֻb"#, r#"aָֹֺֻb"#, r#"aָֹֺֻb"#, r#"aָֹֺֻb"#),
+        (r#"aָֺֹֻb"#, r#"aָֺֹֻb"#, r#"aָֺֹֻb"#, r#"aָֺֹֻb"#, r#"aָֺֹֻb"#),
+        (r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#),
+        (r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#, r#"aֹֻֻּb"#),
+        (r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#),
+        (r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#, r#"aֻּּֽb"#),
+        (r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#),
+        (r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#, r#"aּֽֽֿb"#),
+        (r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#),
+        (r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#, r#"aֽֿֿׁb"#),
+        (r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#),
+        (r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#, r#"aֿׁׁׂb"#),
+        (r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#),
+        (r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#, r#"aׁׂׂﬞb"#),
+        (r#"à֮ׄ̕b"#, r#"à֮ׄ̕b"#, r#"à֮ׄ̕b"#, r#"à֮ׄ̕b"#, r#"à֮ׄ̕b"#),
+        (r#"a֮ׄ̀̕b"#, r#"a֮ׄ̀̕b"#, r#"a֮ׄ̀̕b"#, r#"a֮ׄ̀̕b"#, r#"a֮ׄ̀̕b"#),
+        (r#"a᷺̖ׅ֚b"#, r#"a᷺̖ׅ֚b"#, r#"a᷺̖ׅ֚b"#, r#"a᷺̖ׅ֚b"#, r#"a᷺̖ׅ֚b"#),
+        (r#"a᷺ׅ̖֚b"#, r#"a᷺ׅ̖֚b"#, r#"a᷺ׅ̖֚b"#, r#"a᷺ׅ̖֚b"#, r#"a᷺ׅ̖֚b"#),
+        (r#"aַָׇֹb"#, r#"aַָׇֹb"#, r#"aַָׇֹb"#, r#"aַָׇֹb"#, r#"aַָׇֹb"#),
+        (r#"aַׇָֹb"#, r#"aַׇָֹb"#, r#"aַׇָֹb"#, r#"aַׇָֹb"#, r#"aַׇָֹb"#),
+        (r#"à֮ؐ̕b"#, r#"à֮ؐ̕b"#, r#"à֮ؐ̕b"#, r#"à֮ؐ̕b"#, r#"à֮ؐ̕b"#),
+        (r#"a֮ؐ̀̕b"#, r#"a֮ؐ̀̕b"#, r#"a֮ؐ̀̕b"#, r#"a֮ؐ̀̕b"#, r#"a֮ؐ̀̕b"#),
+        (r#"à֮ؑ̕b"#, r#"à֮ؑ̕b"#, r#"à֮ؑ̕b"#, r#"à֮ؑ̕b"#, r#"à֮ؑ̕b"#),
+        (r#"a֮ؑ̀̕b"#, r#"a֮ؑ̀̕b"#, r#"a֮ؑ̀̕b"#, r#"a֮ؑ̀̕b"#, r#"a֮ؑ̀̕b"#),
+        (r#"à֮ؒ̕b"#, r#"à֮ؒ̕b"#, r#"à֮ؒ̕b"#, r#"à֮ؒ̕b"#, r#"à֮ؒ̕b"#),
+        (r#"a֮ؒ̀̕b"#, r#"a֮ؒ̀̕b"#, r#"a֮ؒ̀̕b"#, r#"a֮ؒ̀̕b"#, r#"a֮ؒ̀̕b"#),
+        (r#"à֮ؓ̕b"#, r#"à֮ؓ̕b"#, r#"à֮ؓ̕b"#, r#"à֮ؓ̕b"#, r#"à֮ؓ̕b"#),
+        (r#"a֮ؓ̀̕b"#, r#"a֮ؓ̀̕b"#, r#"a֮ؓ̀̕b"#, r#"a֮ؓ̀̕b"#, r#"a֮ؓ̀̕b"#),
+        (r#"à֮ؔ̕b"#, r#"à֮ؔ̕b"#, r#"à֮ؔ̕b"#, r#"à֮ؔ̕b"#, r#"à֮ؔ̕b"#),
+        (r#"a֮ؔ̀̕b"#, r#"a֮ؔ̀̕b"#, r#"a֮ؔ̀̕b"#, r#"a֮ؔ̀̕b"#, r#"a֮ؔ̀̕b"#),
+        (r#"à֮ؕ̕b"#, r#"à֮ؕ̕b"#, r#"à֮ؕ̕b"#, r#"à֮ؕ̕b"#, r#"à֮ؕ̕b"#),
+        (r#"a֮ؕ̀̕b"#, r#"a֮ؕ̀̕b"#, r#"a֮ؕ̀̕b"#, r#"a֮ؕ̀̕b"#, r#"a֮ؕ̀̕b"#),
+        (r#"à֮ؖ̕b"#, r#"à֮ؖ̕b"#, r#"à֮ؖ̕b"#, r#"à֮ؖ̕b"#, r#"à֮ؖ̕b"#),
+        (r#"a֮ؖ̀̕b"#, r#"a֮ؖ̀̕b"#, r#"a֮ؖ̀̕b"#, r#"a֮ؖ̀̕b"#, r#"a֮ؖ̀̕b"#),
+        (r#"à֮ؗ̕b"#, r#"à֮ؗ̕b"#, r#"à֮ؗ̕b"#, r#"à֮ؗ̕b"#, r#"à֮ؗ̕b"#),
+        (r#"a֮ؗ̀̕b"#, r#"a֮ؗ̀̕b"#, r#"a֮ؗ̀̕b"#, r#"a֮ؗ̀̕b"#, r#"a֮ؗ̀̕b"#),
+        (r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#),
+        (r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#, r#"aٍؘؘؙb"#),
+        (r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#),
+        (r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#, r#"aؘؙؙؚb"#),
+        (r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#),
+        (r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#, r#"aؙؚؚّb"#),
+        (r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#),
+        (r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#, r#"aﬞًًٌb"#),
+        (r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#),
+        (r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#, r#"aًٌٌٍb"#),
+        (r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#),
+        (r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#, r#"aٌٍٍؘb"#),
+        (r#"aٍؘَؙb"#, r#"aٍؘَؙb"#, r#"aٍؘَؙb"#, r#"aٍؘَؙb"#, r#"aٍؘَؙb"#),
+        (r#"aٍَؘؙb"#, r#"aٍَؘؙb"#, r#"aٍَؘؙb"#, r#"aٍَؘؙb"#, r#"aٍَؘؙb"#),
+        (r#"aؘؙُؚb"#, r#"aؘؙُؚb"#, r#"aؘؙُؚb"#, r#"aؘؙُؚb"#, r#"aؘؙُؚb"#),
+        (r#"aؘُؙؚb"#, r#"aؘُؙؚb"#, r#"aؘُؙؚb"#, r#"aؘُؙؚb"#, r#"aؘُؙؚb"#),
+        (r#"aؙؚِّb"#, r#"aؙؚِّb"#, r#"aؙؚِّb"#, r#"aؙؚِّb"#, r#"aؙؚِّb"#),
+        (r#"aؙِؚّb"#, r#"aؙِؚّb"#, r#"aؙِؚّb"#, r#"aؙِؚّb"#, r#"aؙِؚّb"#),
+        (r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#),
+        (r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#, r#"aؚّّْb"#),
+        (r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#),
+        (r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#, r#"aّْْٰb"#),
+        (r#"à֮ٓ̕b"#, r#"à֮ٓ̕b"#, r#"à֮ٓ̕b"#, r#"à֮ٓ̕b"#, r#"à֮ٓ̕b"#),
+        (r#"a֮ٓ̀̕b"#, r#"a֮ٓ̀̕b"#, r#"a֮ٓ̀̕b"#, r#"a֮ٓ̀̕b"#, r#"a֮ٓ̀̕b"#),
+        (r#"à֮ٔ̕b"#, r#"à֮ٔ̕b"#, r#"à֮ٔ̕b"#, r#"à֮ٔ̕b"#, r#"à֮ٔ̕b"#),
+        (r#"a֮ٔ̀̕b"#, r#"a֮ٔ̀̕b"#, r#"a֮ٔ̀̕b"#, r#"a֮ٔ̀̕b"#, r#"a֮ٔ̀̕b"#),
+        (r#"a᷺̖ٕ֚b"#, r#"a᷺̖ٕ֚b"#, r#"a᷺̖ٕ֚b"#, r#"a᷺̖ٕ֚b"#, r#"a᷺̖ٕ֚b"#),
+        (r#"a᷺ٕ̖֚b"#, r#"a᷺ٕ̖֚b"#, r#"a᷺ٕ̖֚b"#, r#"a᷺ٕ̖֚b"#, r#"a᷺ٕ̖֚b"#),
+        (r#"a᷺̖ٖ֚b"#, r#"a᷺̖ٖ֚b"#, r#"a᷺̖ٖ֚b"#, r#"a᷺̖ٖ֚b"#, r#"a᷺̖ٖ֚b"#),
+        (r#"a᷺ٖ̖֚b"#, r#"a᷺ٖ̖֚b"#, r#"a᷺ٖ̖֚b"#, r#"a᷺ٖ̖֚b"#, r#"a᷺ٖ̖֚b"#),
+        (r#"à֮ٗ̕b"#, r#"à֮ٗ̕b"#, r#"à֮ٗ̕b"#, r#"à֮ٗ̕b"#, r#"à֮ٗ̕b"#),
+        (r#"a֮ٗ̀̕b"#, r#"a֮ٗ̀̕b"#, r#"a֮ٗ̀̕b"#, r#"a֮ٗ̀̕b"#, r#"a֮ٗ̀̕b"#),
+        (r#"à֮٘̕b"#, r#"à֮٘̕b"#, r#"à֮٘̕b"#, r#"à֮٘̕b"#, r#"à֮٘̕b"#),
+        (r#"a֮٘̀̕b"#, r#"a֮٘̀̕b"#, r#"a֮٘̀̕b"#, r#"a֮٘̀̕b"#, r#"a֮٘̀̕b"#),
+        (r#"à֮ٙ̕b"#, r#"à֮ٙ̕b"#, r#"à֮ٙ̕b"#, r#"à֮ٙ̕b"#, r#"à֮ٙ̕b"#),
+        (r#"a֮ٙ̀̕b"#, r#"a֮ٙ̀̕b"#, r#"a֮ٙ̀̕b"#, r#"a֮ٙ̀̕b"#, r#"a֮ٙ̀̕b"#),
+        (r#"à֮ٚ̕b"#, r#"à֮ٚ̕b"#, r#"à֮ٚ̕b"#, r#"à֮ٚ̕b"#, r#"à֮ٚ̕b"#),
+        (r#"a֮ٚ̀̕b"#, r#"a֮ٚ̀̕b"#, r#"a֮ٚ̀̕b"#, r#"a֮ٚ̀̕b"#, r#"a֮ٚ̀̕b"#),
+        (r#"à֮ٛ̕b"#, r#"à֮ٛ̕b"#, r#"à֮ٛ̕b"#, r#"à֮ٛ̕b"#, r#"à֮ٛ̕b"#),
+        (r#"a֮ٛ̀̕b"#, r#"a֮ٛ̀̕b"#, r#"a֮ٛ̀̕b"#, r#"a֮ٛ̀̕b"#, r#"a֮ٛ̀̕b"#),
+        (r#"a᷺̖ٜ֚b"#, r#"a᷺̖ٜ֚b"#, r#"a᷺̖ٜ֚b"#, r#"a᷺̖ٜ֚b"#, r#"a᷺̖ٜ֚b"#),
+        (r#"a᷺ٜ̖֚b"#, r#"a᷺ٜ̖֚b"#, r#"a᷺ٜ̖֚b"#, r#"a᷺ٜ̖֚b"#, r#"a᷺ٜ̖֚b"#),
+        (r#"à֮ٝ̕b"#, r#"à֮ٝ̕b"#, r#"à֮ٝ̕b"#, r#"à֮ٝ̕b"#, r#"à֮ٝ̕b"#),
+        (r#"a֮ٝ̀̕b"#, r#"a֮ٝ̀̕b"#, r#"a֮ٝ̀̕b"#, r#"a֮ٝ̀̕b"#, r#"a֮ٝ̀̕b"#),
+        (r#"à֮ٞ̕b"#, r#"à֮ٞ̕b"#, r#"à֮ٞ̕b"#, r#"à֮ٞ̕b"#, r#"à֮ٞ̕b"#),
+        (r#"a֮ٞ̀̕b"#, r#"a֮ٞ̀̕b"#, r#"a֮ٞ̀̕b"#, r#"a֮ٞ̀̕b"#, r#"a֮ٞ̀̕b"#),
+        (r#"a᷺̖ٟ֚b"#, r#"a᷺̖ٟ֚b"#, r#"a᷺̖ٟ֚b"#, r#"a᷺̖ٟ֚b"#, r#"a᷺̖ٟ֚b"#),
+        (r#"a᷺ٟ̖֚b"#, r#"a᷺ٟ̖֚b"#, r#"a᷺ٟ̖֚b"#, r#"a᷺ٟ̖֚b"#, r#"a᷺ٟ̖֚b"#),
+        (r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#),
+        (r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#, r#"aْٰٰܑb"#),
+        (r#"à֮ۖ̕b"#, r#"à֮ۖ̕b"#, r#"à֮ۖ̕b"#, r#"à֮ۖ̕b"#, r#"à֮ۖ̕b"#),
+        (r#"a֮ۖ̀̕b"#, r#"a֮ۖ̀̕b"#, r#"a֮ۖ̀̕b"#, r#"a֮ۖ̀̕b"#, r#"a֮ۖ̀̕b"#),
+        (r#"à֮ۗ̕b"#, r#"à֮ۗ̕b"#, r#"à֮ۗ̕b"#, r#"à֮ۗ̕b"#, r#"à֮ۗ̕b"#),
+        (r#"a֮ۗ̀̕b"#, r#"a֮ۗ̀̕b"#, r#"a֮ۗ̀̕b"#, r#"a֮ۗ̀̕b"#, r#"a֮ۗ̀̕b"#),
+        (r#"à֮ۘ̕b"#, r#"à֮ۘ̕b"#, r#"à֮ۘ̕b"#, r#"à֮ۘ̕b"#, r#"à֮ۘ̕b"#),
+        (r#"a֮ۘ̀̕b"#, r#"a֮ۘ̀̕b"#, r#"a֮ۘ̀̕b"#, r#"a֮ۘ̀̕b"#, r#"a֮ۘ̀̕b"#),
+        (r#"à֮ۙ̕b"#, r#"à֮ۙ̕b"#, r#"à֮ۙ̕b"#, r#"à֮ۙ̕b"#, r#"à֮ۙ̕b"#),
+        (r#"a֮ۙ̀̕b"#, r#"a֮ۙ̀̕b"#, r#"a֮ۙ̀̕b"#, r#"a֮ۙ̀̕b"#, r#"a֮ۙ̀̕b"#),
+        (r#"à֮ۚ̕b"#, r#"à֮ۚ̕b"#, r#"à֮ۚ̕b"#, r#"à֮ۚ̕b"#, r#"à֮ۚ̕b"#),
+        (r#"a֮ۚ̀̕b"#, r#"a֮ۚ̀̕b"#, r#"a֮ۚ̀̕b"#, r#"a֮ۚ̀̕b"#, r#"a֮ۚ̀̕b"#),
+        (r#"à֮ۛ̕b"#, r#"à֮ۛ̕b"#, r#"à֮ۛ̕b"#, r#"à֮ۛ̕b"#, r#"à֮ۛ̕b"#),
+        (r#"a֮ۛ̀̕b"#, r#"a֮ۛ̀̕b"#, r#"a֮ۛ̀̕b"#, r#"a֮ۛ̀̕b"#, r#"a֮ۛ̀̕b"#),
+        (r#"à֮ۜ̕b"#, r#"à֮ۜ̕b"#, r#"à֮ۜ̕b"#, r#"à֮ۜ̕b"#, r#"à֮ۜ̕b"#),
+        (r#"a֮ۜ̀̕b"#, r#"a֮ۜ̀̕b"#, r#"a֮ۜ̀̕b"#, r#"a֮ۜ̀̕b"#, r#"a֮ۜ̀̕b"#),
+        (r#"à֮۟̕b"#, r#"à֮۟̕b"#, r#"à֮۟̕b"#, r#"à֮۟̕b"#, r#"à֮۟̕b"#),
+        (r#"a֮۟̀̕b"#, r#"a֮۟̀̕b"#, r#"a֮۟̀̕b"#, r#"a֮۟̀̕b"#, r#"a֮۟̀̕b"#),
+        (r#"à֮۠̕b"#, r#"à֮۠̕b"#, r#"à֮۠̕b"#, r#"à֮۠̕b"#, r#"à֮۠̕b"#),
+        (r#"a֮۠̀̕b"#, r#"a֮۠̀̕b"#, r#"a֮۠̀̕b"#, r#"a֮۠̀̕b"#, r#"a֮۠̀̕b"#),
+        (r#"à֮ۡ̕b"#, r#"à֮ۡ̕b"#, r#"à֮ۡ̕b"#, r#"à֮ۡ̕b"#, r#"à֮ۡ̕b"#),
+        (r#"a֮ۡ̀̕b"#, r#"a֮ۡ̀̕b"#, r#"a֮ۡ̀̕b"#, r#"a֮ۡ̀̕b"#, r#"a֮ۡ̀̕b"#),
+        (r#"à֮ۢ̕b"#, r#"à֮ۢ̕b"#, r#"à֮ۢ̕b"#, r#"à֮ۢ̕b"#, r#"à֮ۢ̕b"#),
+        (r#"a֮ۢ̀̕b"#, r#"a֮ۢ̀̕b"#, r#"a֮ۢ̀̕b"#, r#"a֮ۢ̀̕b"#, r#"a֮ۢ̀̕b"#),
+        (r#"a᷺̖ۣ֚b"#, r#"a᷺̖ۣ֚b"#, r#"a᷺̖ۣ֚b"#, r#"a᷺̖ۣ֚b"#, r#"a᷺̖ۣ֚b"#),
+        (r#"a᷺ۣ̖֚b"#, r#"a᷺ۣ̖֚b"#, r#"a᷺ۣ̖֚b"#, r#"a᷺ۣ̖֚b"#, r#"a᷺ۣ̖֚b"#),
+        (r#"à֮ۤ̕b"#, r#"à֮ۤ̕b"#, r#"à֮ۤ̕b"#, r#"à֮ۤ̕b"#, r#"à֮ۤ̕b"#),
+        (r#"a֮ۤ̀̕b"#, r#"a֮ۤ̀̕b"#, r#"a֮ۤ̀̕b"#, r#"a֮ۤ̀̕b"#, r#"a֮ۤ̀̕b"#),
+        (r#"à֮ۧ̕b"#, r#"à֮ۧ̕b"#, r#"à֮ۧ̕b"#, r#"à֮ۧ̕b"#, r#"à֮ۧ̕b"#),
+        (r#"a֮ۧ̀̕b"#, r#"a֮ۧ̀̕b"#, r#"a֮ۧ̀̕b"#, r#"a֮ۧ̀̕b"#, r#"a֮ۧ̀̕b"#),
+        (r#"à֮ۨ̕b"#, r#"à֮ۨ̕b"#, r#"à֮ۨ̕b"#, r#"à֮ۨ̕b"#, r#"à֮ۨ̕b"#),
+        (r#"a֮ۨ̀̕b"#, r#"a֮ۨ̀̕b"#, r#"a֮ۨ̀̕b"#, r#"a֮ۨ̀̕b"#, r#"a֮ۨ̀̕b"#),
+        (r#"a᷺̖۪֚b"#, r#"a᷺̖۪֚b"#, r#"a᷺̖۪֚b"#, r#"a᷺̖۪֚b"#, r#"a᷺̖۪֚b"#),
+        (r#"a᷺۪̖֚b"#, r#"a᷺۪̖֚b"#, r#"a᷺۪̖֚b"#, r#"a᷺۪̖֚b"#, r#"a᷺۪̖֚b"#),
+        (r#"à֮۫̕b"#, r#"à֮۫̕b"#, r#"à֮۫̕b"#, r#"à֮۫̕b"#, r#"à֮۫̕b"#),
+        (r#"a֮۫̀̕b"#, r#"a֮۫̀̕b"#, r#"a֮۫̀̕b"#, r#"a֮۫̀̕b"#, r#"a֮۫̀̕b"#),
+        (r#"à֮۬̕b"#, r#"à֮۬̕b"#, r#"à֮۬̕b"#, r#"à֮۬̕b"#, r#"à֮۬̕b"#),
+        (r#"a֮۬̀̕b"#, r#"a֮۬̀̕b"#, r#"a֮۬̀̕b"#, r#"a֮۬̀̕b"#, r#"a֮۬̀̕b"#),
+        (r#"a᷺̖ۭ֚b"#, r#"a᷺̖ۭ֚b"#, r#"a᷺̖ۭ֚b"#, r#"a᷺̖ۭ֚b"#, r#"a᷺̖ۭ֚b"#),
+        (r#"a᷺ۭ̖֚b"#, r#"a᷺ۭ̖֚b"#, r#"a᷺ۭ̖֚b"#, r#"a᷺ۭ̖֚b"#, r#"a᷺ۭ̖֚b"#),
+        (r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#),
+        (r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#, r#"aٰܑܑౕb"#),
+        (r#"à֮ܰ̕b"#, r#"à֮ܰ̕b"#, r#"à֮ܰ̕b"#, r#"à֮ܰ̕b"#, r#"à֮ܰ̕b"#),
+        (r#"a֮ܰ̀̕b"#, r#"a֮ܰ̀̕b"#, r#"a֮ܰ̀̕b"#, r#"a֮ܰ̀̕b"#, r#"a֮ܰ̀̕b"#),
+        (r#"a᷺̖ܱ֚b"#, r#"a᷺̖ܱ֚b"#, r#"a᷺̖ܱ֚b"#, r#"a᷺̖ܱ֚b"#, r#"a᷺̖ܱ֚b"#),
+        (r#"a᷺ܱ̖֚b"#, r#"a᷺ܱ̖֚b"#, r#"a᷺ܱ̖֚b"#, r#"a᷺ܱ̖֚b"#, r#"a᷺ܱ̖֚b"#),
+        (r#"à֮ܲ̕b"#, r#"à֮ܲ̕b"#, r#"à֮ܲ̕b"#, r#"à֮ܲ̕b"#, r#"à֮ܲ̕b"#),
+        (r#"a֮ܲ̀̕b"#, r#"a֮ܲ̀̕b"#, r#"a֮ܲ̀̕b"#, r#"a֮ܲ̀̕b"#, r#"a֮ܲ̀̕b"#),
+        (r#"à֮ܳ̕b"#, r#"à֮ܳ̕b"#, r#"à֮ܳ̕b"#, r#"à֮ܳ̕b"#, r#"à֮ܳ̕b"#),
+        (r#"a֮ܳ̀̕b"#, r#"a֮ܳ̀̕b"#, r#"a֮ܳ̀̕b"#, r#"a֮ܳ̀̕b"#, r#"a֮ܳ̀̕b"#),
+        (r#"a᷺̖ܴ֚b"#, r#"a᷺̖ܴ֚b"#, r#"a᷺̖ܴ֚b"#, r#"a᷺̖ܴ֚b"#, r#"a᷺̖ܴ֚b"#),
+        (r#"a᷺ܴ̖֚b"#, r#"a᷺ܴ̖֚b"#, r#"a᷺ܴ̖֚b"#, r#"a᷺ܴ̖֚b"#, r#"a᷺ܴ̖֚b"#),
+        (r#"à֮ܵ̕b"#, r#"à֮ܵ̕b"#, r#"à֮ܵ̕b"#, r#"à֮ܵ̕b"#, r#"à֮ܵ̕b"#),
+        (r#"a֮ܵ̀̕b"#, r#"a֮ܵ̀̕b"#, r#"a֮ܵ̀̕b"#, r#"a֮ܵ̀̕b"#, r#"a֮ܵ̀̕b"#),
+        (r#"à֮ܶ̕b"#, r#"à֮ܶ̕b"#, r#"à֮ܶ̕b"#, r#"à֮ܶ̕b"#, r#"à֮ܶ̕b"#),
+        (r#"a֮ܶ̀̕b"#, r#"a֮ܶ̀̕b"#, r#"a֮ܶ̀̕b"#, r#"a֮ܶ̀̕b"#, r#"a֮ܶ̀̕b"#),
+        (r#"a᷺̖ܷ֚b"#, r#"a᷺̖ܷ֚b"#, r#"a᷺̖ܷ֚b"#, r#"a᷺̖ܷ֚b"#, r#"a᷺̖ܷ֚b"#),
+        (r#"a᷺ܷ̖֚b"#, r#"a᷺ܷ̖֚b"#, r#"a᷺ܷ̖֚b"#, r#"a᷺ܷ̖֚b"#, r#"a᷺ܷ̖֚b"#),
+        (r#"a᷺̖ܸ֚b"#, r#"a᷺̖ܸ֚b"#, r#"a᷺̖ܸ֚b"#, r#"a᷺̖ܸ֚b"#, r#"a᷺̖ܸ֚b"#),
+        (r#"a᷺ܸ̖֚b"#, r#"a᷺ܸ̖֚b"#, r#"a᷺ܸ̖֚b"#, r#"a᷺ܸ̖֚b"#, r#"a᷺ܸ̖֚b"#),
+        (r#"a᷺̖ܹ֚b"#, r#"a᷺̖ܹ֚b"#, r#"a᷺̖ܹ֚b"#, r#"a᷺̖ܹ֚b"#, r#"a᷺̖ܹ֚b"#),
+        (r#"a᷺ܹ̖֚b"#, r#"a᷺ܹ̖֚b"#, r#"a᷺ܹ̖֚b"#, r#"a᷺ܹ̖֚b"#, r#"a᷺ܹ̖֚b"#),
+        (r#"à֮ܺ̕b"#, r#"à֮ܺ̕b"#, r#"à֮ܺ̕b"#, r#"à֮ܺ̕b"#, r#"à֮ܺ̕b"#),
+        (r#"a֮ܺ̀̕b"#, r#"a֮ܺ̀̕b"#, r#"a֮ܺ̀̕b"#, r#"a֮ܺ̀̕b"#, r#"a֮ܺ̀̕b"#),
+        (r#"a᷺̖ܻ֚b"#, r#"a᷺̖ܻ֚b"#, r#"a᷺̖ܻ֚b"#, r#"a᷺̖ܻ֚b"#, r#"a᷺̖ܻ֚b"#),
+        (r#"a᷺ܻ̖֚b"#, r#"a᷺ܻ̖֚b"#, r#"a᷺ܻ̖֚b"#, r#"a᷺ܻ̖֚b"#, r#"a᷺ܻ̖֚b"#),
+        (r#"a᷺̖ܼ֚b"#, r#"a᷺̖ܼ֚b"#, r#"a᷺̖ܼ֚b"#, r#"a᷺̖ܼ֚b"#, r#"a᷺̖ܼ֚b"#),
+        (r#"a᷺ܼ̖֚b"#, r#"a᷺ܼ̖֚b"#, r#"a᷺ܼ̖֚b"#, r#"a᷺ܼ̖֚b"#, r#"a᷺ܼ̖֚b"#),
+        (r#"à֮ܽ̕b"#, r#"à֮ܽ̕b"#, r#"à֮ܽ̕b"#, r#"à֮ܽ̕b"#, r#"à֮ܽ̕b"#),
+        (r#"a֮ܽ̀̕b"#, r#"a֮ܽ̀̕b"#, r#"a֮ܽ̀̕b"#, r#"a֮ܽ̀̕b"#, r#"a֮ܽ̀̕b"#),
+        (r#"a᷺̖ܾ֚b"#, r#"a᷺̖ܾ֚b"#, r#"a᷺̖ܾ֚b"#, r#"a᷺̖ܾ֚b"#, r#"a᷺̖ܾ֚b"#),
+        (r#"a᷺ܾ̖֚b"#, r#"a᷺ܾ̖֚b"#, r#"a᷺ܾ̖֚b"#, r#"a᷺ܾ̖֚b"#, r#"a᷺ܾ̖֚b"#),
+        (r#"à֮ܿ̕b"#, r#"à֮ܿ̕b"#, r#"à֮ܿ̕b"#, r#"à֮ܿ̕b"#, r#"à֮ܿ̕b"#),
+        (r#"a֮ܿ̀̕b"#, r#"a֮ܿ̀̕b"#, r#"a֮ܿ̀̕b"#, r#"a֮ܿ̀̕b"#, r#"a֮ܿ̀̕b"#),
+        (r#"à֮݀̕b"#, r#"à֮݀̕b"#, r#"à֮݀̕b"#, r#"à֮݀̕b"#, r#"à֮݀̕b"#),
+        (r#"a֮݀̀̕b"#, r#"a֮݀̀̕b"#, r#"a֮݀̀̕b"#, r#"a֮݀̀̕b"#, r#"a֮݀̀̕b"#),
+        (r#"à֮݁̕b"#, r#"à֮݁̕b"#, r#"à֮݁̕b"#, r#"à֮݁̕b"#, r#"à֮݁̕b"#),
+        (r#"a֮݁̀̕b"#, r#"a֮݁̀̕b"#, r#"a֮݁̀̕b"#, r#"a֮݁̀̕b"#, r#"a֮݁̀̕b"#),
+        (r#"a᷺̖݂֚b"#, r#"a᷺̖݂֚b"#, r#"a᷺̖݂֚b"#, r#"a᷺̖݂֚b"#, r#"a᷺̖݂֚b"#),
+        (r#"a᷺݂̖֚b"#, r#"a᷺݂̖֚b"#, r#"a᷺݂̖֚b"#, r#"a᷺݂̖֚b"#, r#"a᷺݂̖֚b"#),
+        (r#"à֮݃̕b"#, r#"à֮݃̕b"#, r#"à֮݃̕b"#, r#"à֮݃̕b"#, r#"à֮݃̕b"#),
+        (r#"a֮݃̀̕b"#, r#"a֮݃̀̕b"#, r#"a֮݃̀̕b"#, r#"a֮݃̀̕b"#, r#"a֮݃̀̕b"#),
+        (r#"a᷺̖݄֚b"#, r#"a᷺̖݄֚b"#, r#"a᷺̖݄֚b"#, r#"a᷺̖݄֚b"#, r#"a᷺̖݄֚b"#),
+        (r#"a᷺݄̖֚b"#, r#"a᷺݄̖֚b"#, r#"a᷺݄̖֚b"#, r#"a᷺݄̖֚b"#, r#"a᷺݄̖֚b"#),
+        (r#"à֮݅̕b"#, r#"à֮݅̕b"#, r#"à֮݅̕b"#, r#"à֮݅̕b"#, r#"à֮݅̕b"#),
+        (r#"a֮݅̀̕b"#, r#"a֮݅̀̕b"#, r#"a֮݅̀̕b"#, r#"a֮݅̀̕b"#, r#"a֮݅̀̕b"#),
+        (r#"a᷺̖݆֚b"#, r#"a᷺̖݆֚b"#, r#"a᷺̖݆֚b"#, r#"a᷺̖݆֚b"#, r#"a᷺̖݆֚b"#),
+        (r#"a᷺݆̖֚b"#, r#"a᷺݆̖֚b"#, r#"a᷺݆̖֚b"#, r#"a᷺݆̖֚b"#, r#"a᷺݆̖֚b"#),
+        (r#"à֮݇̕b"#, r#"à֮݇̕b"#, r#"à֮݇̕b"#, r#"à֮݇̕b"#, r#"à֮݇̕b"#),
+        (r#"a֮݇̀̕b"#, r#"a֮݇̀̕b"#, r#"a֮݇̀̕b"#, r#"a֮݇̀̕b"#, r#"a֮݇̀̕b"#),
+        (r#"a᷺̖݈֚b"#, r#"a᷺̖݈֚b"#, r#"a᷺̖݈֚b"#, r#"a᷺̖݈֚b"#, r#"a᷺̖݈֚b"#),
+        (r#"a᷺݈̖֚b"#, r#"a᷺݈̖֚b"#, r#"a᷺݈̖֚b"#, r#"a᷺݈̖֚b"#, r#"a᷺݈̖֚b"#),
+        (r#"à֮݉̕b"#, r#"à֮݉̕b"#, r#"à֮݉̕b"#, r#"à֮݉̕b"#, r#"à֮݉̕b"#),
+        (r#"a֮݉̀̕b"#, r#"a֮݉̀̕b"#, r#"a֮݉̀̕b"#, r#"a֮݉̀̕b"#, r#"a֮݉̀̕b"#),
+        (r#"à֮݊̕b"#, r#"à֮݊̕b"#, r#"à֮݊̕b"#, r#"à֮݊̕b"#, r#"à֮݊̕b"#),
+        (r#"a֮݊̀̕b"#, r#"a֮݊̀̕b"#, r#"a֮݊̀̕b"#, r#"a֮݊̀̕b"#, r#"a֮݊̀̕b"#),
+        (r#"à֮߫̕b"#, r#"à֮߫̕b"#, r#"à֮߫̕b"#, r#"à֮߫̕b"#, r#"à֮߫̕b"#),
+        (r#"a֮߫̀̕b"#, r#"a֮߫̀̕b"#, r#"a֮߫̀̕b"#, r#"a֮߫̀̕b"#, r#"a֮߫̀̕b"#),
+        (r#"à֮߬̕b"#, r#"à֮߬̕b"#, r#"à֮߬̕b"#, r#"à֮߬̕b"#, r#"à֮߬̕b"#),
+        (r#"a֮߬̀̕b"#, r#"a֮߬̀̕b"#, r#"a֮߬̀̕b"#, r#"a֮߬̀̕b"#, r#"a֮߬̀̕b"#),
+        (r#"à֮߭̕b"#, r#"à֮߭̕b"#, r#"à֮߭̕b"#, r#"à֮߭̕b"#, r#"à֮߭̕b"#),
+        (r#"a֮߭̀̕b"#, r#"a֮߭̀̕b"#, r#"a֮߭̀̕b"#, r#"a֮߭̀̕b"#, r#"a֮߭̀̕b"#),
+        (r#"à֮߮̕b"#, r#"à֮߮̕b"#, r#"à֮߮̕b"#, r#"à֮߮̕b"#, r#"à֮߮̕b"#),
+        (r#"a֮߮̀̕b"#, r#"a֮߮̀̕b"#, r#"a֮߮̀̕b"#, r#"a֮߮̀̕b"#, r#"a֮߮̀̕b"#),
+        (r#"à֮߯̕b"#, r#"à֮߯̕b"#, r#"à֮߯̕b"#, r#"à֮߯̕b"#, r#"à֮߯̕b"#),
+        (r#"a֮߯̀̕b"#, r#"a֮߯̀̕b"#, r#"a֮߯̀̕b"#, r#"a֮߯̀̕b"#, r#"a֮߯̀̕b"#),
+        (r#"à֮߰̕b"#, r#"à֮߰̕b"#, r#"à֮߰̕b"#, r#"à֮߰̕b"#, r#"à֮߰̕b"#),
+        (r#"a֮߰̀̕b"#, r#"a֮߰̀̕b"#, r#"a֮߰̀̕b"#, r#"a֮߰̀̕b"#, r#"a֮߰̀̕b"#),
+        (r#"à֮߱̕b"#, r#"à֮߱̕b"#, r#"à֮߱̕b"#, r#"à֮߱̕b"#, r#"à֮߱̕b"#),
+        (r#"a֮߱̀̕b"#, r#"a֮߱̀̕b"#, r#"a֮߱̀̕b"#, r#"a֮߱̀̕b"#, r#"a֮߱̀̕b"#),
+        (r#"a᷺̖߲֚b"#, r#"a᷺̖߲֚b"#, r#"a᷺̖߲֚b"#, r#"a᷺̖߲֚b"#, r#"a᷺̖߲֚b"#),
+        (r#"a᷺߲̖֚b"#, r#"a᷺߲̖֚b"#, r#"a᷺߲̖֚b"#, r#"a᷺߲̖֚b"#, r#"a᷺߲̖֚b"#),
+        (r#"à֮߳̕b"#, r#"à֮߳̕b"#, r#"à֮߳̕b"#, r#"à֮߳̕b"#, r#"à֮߳̕b"#),
+        (r#"a֮߳̀̕b"#, r#"a֮߳̀̕b"#, r#"a֮߳̀̕b"#, r#"a֮߳̀̕b"#, r#"a֮߳̀̕b"#),
+        (r#"a᷺̖߽֚b"#, r#"a᷺̖߽֚b"#, r#"a᷺̖߽֚b"#, r#"a᷺̖߽֚b"#, r#"a᷺̖߽֚b"#),
+        (r#"a᷺߽̖֚b"#, r#"a᷺߽̖֚b"#, r#"a᷺߽̖֚b"#, r#"a᷺߽̖֚b"#, r#"a᷺߽̖֚b"#),
+        (r#"à֮ࠖ̕b"#, r#"à֮ࠖ̕b"#, r#"à֮ࠖ̕b"#, r#"à֮ࠖ̕b"#, r#"à֮ࠖ̕b"#),
+        (r#"a֮ࠖ̀̕b"#, r#"a֮ࠖ̀̕b"#, r#"a֮ࠖ̀̕b"#, r#"a֮ࠖ̀̕b"#, r#"a֮ࠖ̀̕b"#),
+        (r#"à֮ࠗ̕b"#, r#"à֮ࠗ̕b"#, r#"à֮ࠗ̕b"#, r#"à֮ࠗ̕b"#, r#"à֮ࠗ̕b"#),
+        (r#"a֮ࠗ̀̕b"#, r#"a֮ࠗ̀̕b"#, r#"a֮ࠗ̀̕b"#, r#"a֮ࠗ̀̕b"#, r#"a֮ࠗ̀̕b"#),
+        (r#"à֮࠘̕b"#, r#"à֮࠘̕b"#, r#"à֮࠘̕b"#, r#"à֮࠘̕b"#, r#"à֮࠘̕b"#),
+        (r#"a֮࠘̀̕b"#, r#"a֮࠘̀̕b"#, r#"a֮࠘̀̕b"#, r#"a֮࠘̀̕b"#, r#"a֮࠘̀̕b"#),
+        (r#"à֮࠙̕b"#, r#"à֮࠙̕b"#, r#"à֮࠙̕b"#, r#"à֮࠙̕b"#, r#"à֮࠙̕b"#),
+        (r#"a֮࠙̀̕b"#, r#"a֮࠙̀̕b"#, r#"a֮࠙̀̕b"#, r#"a֮࠙̀̕b"#, r#"a֮࠙̀̕b"#),
+        (r#"à֮ࠛ̕b"#, r#"à֮ࠛ̕b"#, r#"à֮ࠛ̕b"#, r#"à֮ࠛ̕b"#, r#"à֮ࠛ̕b"#),
+        (r#"a֮ࠛ̀̕b"#, r#"a֮ࠛ̀̕b"#, r#"a֮ࠛ̀̕b"#, r#"a֮ࠛ̀̕b"#, r#"a֮ࠛ̀̕b"#),
+        (r#"à֮ࠜ̕b"#, r#"à֮ࠜ̕b"#, r#"à֮ࠜ̕b"#, r#"à֮ࠜ̕b"#, r#"à֮ࠜ̕b"#),
+        (r#"a֮ࠜ̀̕b"#, r#"a֮ࠜ̀̕b"#, r#"a֮ࠜ̀̕b"#, r#"a֮ࠜ̀̕b"#, r#"a֮ࠜ̀̕b"#),
+        (r#"à֮ࠝ̕b"#, r#"à֮ࠝ̕b"#, r#"à֮ࠝ̕b"#, r#"à֮ࠝ̕b"#, r#"à֮ࠝ̕b"#),
+        (r#"a֮ࠝ̀̕b"#, r#"a֮ࠝ̀̕b"#, r#"a֮ࠝ̀̕b"#, r#"a֮ࠝ̀̕b"#, r#"a֮ࠝ̀̕b"#),
+        (r#"à֮ࠞ̕b"#, r#"à֮ࠞ̕b"#, r#"à֮ࠞ̕b"#, r#"à֮ࠞ̕b"#, r#"à֮ࠞ̕b"#),
+        (r#"a֮ࠞ̀̕b"#, r#"a֮ࠞ̀̕b"#, r#"a֮ࠞ̀̕b"#, r#"a֮ࠞ̀̕b"#, r#"a֮ࠞ̀̕b"#),
+        (r#"à֮ࠟ̕b"#, r#"à֮ࠟ̕b"#, r#"à֮ࠟ̕b"#, r#"à֮ࠟ̕b"#, r#"à֮ࠟ̕b"#),
+        (r#"a֮ࠟ̀̕b"#, r#"a֮ࠟ̀̕b"#, r#"a֮ࠟ̀̕b"#, r#"a֮ࠟ̀̕b"#, r#"a֮ࠟ̀̕b"#),
+        (r#"à֮ࠠ̕b"#, r#"à֮ࠠ̕b"#, r#"à֮ࠠ̕b"#, r#"à֮ࠠ̕b"#, r#"à֮ࠠ̕b"#),
+        (r#"a֮ࠠ̀̕b"#, r#"a֮ࠠ̀̕b"#, r#"a֮ࠠ̀̕b"#, r#"a֮ࠠ̀̕b"#, r#"a֮ࠠ̀̕b"#),
+        (r#"à֮ࠡ̕b"#, r#"à֮ࠡ̕b"#, r#"à֮ࠡ̕b"#, r#"à֮ࠡ̕b"#, r#"à֮ࠡ̕b"#),
+        (r#"a֮ࠡ̀̕b"#, r#"a֮ࠡ̀̕b"#, r#"a֮ࠡ̀̕b"#, r#"a֮ࠡ̀̕b"#, r#"a֮ࠡ̀̕b"#),
+        (r#"à֮ࠢ̕b"#, r#"à֮ࠢ̕b"#, r#"à֮ࠢ̕b"#, r#"à֮ࠢ̕b"#, r#"à֮ࠢ̕b"#),
+        (r#"a֮ࠢ̀̕b"#, r#"a֮ࠢ̀̕b"#, r#"a֮ࠢ̀̕b"#, r#"a֮ࠢ̀̕b"#, r#"a֮ࠢ̀̕b"#),
+        (r#"à֮ࠣ̕b"#, r#"à֮ࠣ̕b"#, r#"à֮ࠣ̕b"#, r#"à֮ࠣ̕b"#, r#"à֮ࠣ̕b"#),
+        (r#"a֮ࠣ̀̕b"#, r#"a֮ࠣ̀̕b"#, r#"a֮ࠣ̀̕b"#, r#"a֮ࠣ̀̕b"#, r#"a֮ࠣ̀̕b"#),
+        (r#"à֮ࠥ̕b"#, r#"à֮ࠥ̕b"#, r#"à֮ࠥ̕b"#, r#"à֮ࠥ̕b"#, r#"à֮ࠥ̕b"#),
+        (r#"a֮ࠥ̀̕b"#, r#"a֮ࠥ̀̕b"#, r#"a֮ࠥ̀̕b"#, r#"a֮ࠥ̀̕b"#, r#"a֮ࠥ̀̕b"#),
+        (r#"à֮ࠦ̕b"#, r#"à֮ࠦ̕b"#, r#"à֮ࠦ̕b"#, r#"à֮ࠦ̕b"#, r#"à֮ࠦ̕b"#),
+        (r#"a֮ࠦ̀̕b"#, r#"a֮ࠦ̀̕b"#, r#"a֮ࠦ̀̕b"#, r#"a֮ࠦ̀̕b"#, r#"a֮ࠦ̀̕b"#),
+        (r#"à֮ࠧ̕b"#, r#"à֮ࠧ̕b"#, r#"à֮ࠧ̕b"#, r#"à֮ࠧ̕b"#, r#"à֮ࠧ̕b"#),
+        (r#"a֮ࠧ̀̕b"#, r#"a֮ࠧ̀̕b"#, r#"a֮ࠧ̀̕b"#, r#"a֮ࠧ̀̕b"#, r#"a֮ࠧ̀̕b"#),
+        (r#"à֮ࠩ̕b"#, r#"à֮ࠩ̕b"#, r#"à֮ࠩ̕b"#, r#"à֮ࠩ̕b"#, r#"à֮ࠩ̕b"#),
+        (r#"a֮ࠩ̀̕b"#, r#"a֮ࠩ̀̕b"#, r#"a֮ࠩ̀̕b"#, r#"a֮ࠩ̀̕b"#, r#"a֮ࠩ̀̕b"#),
+        (r#"à֮ࠪ̕b"#, r#"à֮ࠪ̕b"#, r#"à֮ࠪ̕b"#, r#"à֮ࠪ̕b"#, r#"à֮ࠪ̕b"#),
+        (r#"a֮ࠪ̀̕b"#, r#"a֮ࠪ̀̕b"#, r#"a֮ࠪ̀̕b"#, r#"a֮ࠪ̀̕b"#, r#"a֮ࠪ̀̕b"#),
+        (r#"à֮ࠫ̕b"#, r#"à֮ࠫ̕b"#, r#"à֮ࠫ̕b"#, r#"à֮ࠫ̕b"#, r#"à֮ࠫ̕b"#),
+        (r#"a֮ࠫ̀̕b"#, r#"a֮ࠫ̀̕b"#, r#"a֮ࠫ̀̕b"#, r#"a֮ࠫ̀̕b"#, r#"a֮ࠫ̀̕b"#),
+        (r#"à֮ࠬ̕b"#, r#"à֮ࠬ̕b"#, r#"à֮ࠬ̕b"#, r#"à֮ࠬ̕b"#, r#"à֮ࠬ̕b"#),
+        (r#"a֮ࠬ̀̕b"#, r#"a֮ࠬ̀̕b"#, r#"a֮ࠬ̀̕b"#, r#"a֮ࠬ̀̕b"#, r#"a֮ࠬ̀̕b"#),
+        (r#"à֮࠭̕b"#, r#"à֮࠭̕b"#, r#"à֮࠭̕b"#, r#"à֮࠭̕b"#, r#"à֮࠭̕b"#),
+        (r#"a֮࠭̀̕b"#, r#"a֮࠭̀̕b"#, r#"a֮࠭̀̕b"#, r#"a֮࠭̀̕b"#, r#"a֮࠭̀̕b"#),
+        (r#"a᷺̖࡙֚b"#, r#"a᷺̖࡙֚b"#, r#"a᷺̖࡙֚b"#, r#"a᷺̖࡙֚b"#, r#"a᷺̖࡙֚b"#),
+        (r#"a᷺࡙̖֚b"#, r#"a᷺࡙̖֚b"#, r#"a᷺࡙̖֚b"#, r#"a᷺࡙̖֚b"#, r#"a᷺࡙̖֚b"#),
+        (r#"a᷺̖࡚֚b"#, r#"a᷺̖࡚֚b"#, r#"a᷺̖࡚֚b"#, r#"a᷺̖࡚֚b"#, r#"a᷺̖࡚֚b"#),
+        (r#"a᷺࡚̖֚b"#, r#"a᷺࡚̖֚b"#, r#"a᷺࡚̖֚b"#, r#"a᷺࡚̖֚b"#, r#"a᷺࡚̖֚b"#),
+        (r#"a᷺̖࡛֚b"#, r#"a᷺̖࡛֚b"#, r#"a᷺̖࡛֚b"#, r#"a᷺̖࡛֚b"#, r#"a᷺̖࡛֚b"#),
+        (r#"a᷺࡛̖֚b"#, r#"a᷺࡛̖֚b"#, r#"a᷺࡛̖֚b"#, r#"a᷺࡛̖֚b"#, r#"a᷺࡛̖֚b"#),
+        (r#"à֮࢘̕b"#, r#"à֮࢘̕b"#, r#"à֮࢘̕b"#, r#"à֮࢘̕b"#, r#"à֮࢘̕b"#),
+        (r#"a֮࢘̀̕b"#, r#"a֮࢘̀̕b"#, r#"a֮࢘̀̕b"#, r#"a֮࢘̀̕b"#, r#"a֮࢘̀̕b"#),
+        (r#"a᷺̖࢙֚b"#, r#"a᷺̖࢙֚b"#, r#"a᷺̖࢙֚b"#, r#"a᷺̖࢙֚b"#, r#"a᷺̖࢙֚b"#),
+        (r#"a᷺࢙̖֚b"#, r#"a᷺࢙̖֚b"#, r#"a᷺࢙̖֚b"#, r#"a᷺࢙̖֚b"#, r#"a᷺࢙̖֚b"#),
+        (r#"a᷺̖࢚֚b"#, r#"a᷺̖࢚֚b"#, r#"a᷺̖࢚֚b"#, r#"a᷺̖࢚֚b"#, r#"a᷺̖࢚֚b"#),
+        (r#"a᷺࢚̖֚b"#, r#"a᷺࢚̖֚b"#, r#"a᷺࢚̖֚b"#, r#"a᷺࢚̖֚b"#, r#"a᷺࢚̖֚b"#),
+        (r#"a᷺̖࢛֚b"#, r#"a᷺̖࢛֚b"#, r#"a᷺̖࢛֚b"#, r#"a᷺̖࢛֚b"#, r#"a᷺̖࢛֚b"#),
+        (r#"a᷺࢛̖֚b"#, r#"a᷺࢛̖֚b"#, r#"a᷺࢛̖֚b"#, r#"a᷺࢛̖֚b"#, r#"a᷺࢛̖֚b"#),
+        (r#"à֮࢜̕b"#, r#"à֮࢜̕b"#, r#"à֮࢜̕b"#, r#"à֮࢜̕b"#, r#"à֮࢜̕b"#),
+        (r#"a֮࢜̀̕b"#, r#"a֮࢜̀̕b"#, r#"a֮࢜̀̕b"#, r#"a֮࢜̀̕b"#, r#"a֮࢜̀̕b"#),
+        (r#"à֮࢝̕b"#, r#"à֮࢝̕b"#, r#"à֮࢝̕b"#, r#"à֮࢝̕b"#, r#"à֮࢝̕b"#),
+        (r#"a֮࢝̀̕b"#, r#"a֮࢝̀̕b"#, r#"a֮࢝̀̕b"#, r#"a֮࢝̀̕b"#, r#"a֮࢝̀̕b"#),
+        (r#"à֮࢞̕b"#, r#"à֮࢞̕b"#, r#"à֮࢞̕b"#, r#"à֮࢞̕b"#, r#"à֮࢞̕b"#),
+        (r#"a֮࢞̀̕b"#, r#"a֮࢞̀̕b"#, r#"a֮࢞̀̕b"#, r#"a֮࢞̀̕b"#, r#"a֮࢞̀̕b"#),
+        (r#"à֮࢟̕b"#, r#"à֮࢟̕b"#, r#"à֮࢟̕b"#, r#"à֮࢟̕b"#, r#"à֮࢟̕b"#),
+        (r#"a֮࢟̀̕b"#, r#"a֮࢟̀̕b"#, r#"a֮࢟̀̕b"#, r#"a֮࢟̀̕b"#, r#"a֮࢟̀̕b"#),
+        (r#"à֮࣊̕b"#, r#"à֮࣊̕b"#, r#"à֮࣊̕b"#, r#"à֮࣊̕b"#, r#"à֮࣊̕b"#),
+        (r#"a֮࣊̀̕b"#, r#"a֮࣊̀̕b"#, r#"a֮࣊̀̕b"#, r#"a֮࣊̀̕b"#, r#"a֮࣊̀̕b"#),
+        (r#"à֮࣋̕b"#, r#"à֮࣋̕b"#, r#"à֮࣋̕b"#, r#"à֮࣋̕b"#, r#"à֮࣋̕b"#),
+        (r#"a֮࣋̀̕b"#, r#"a֮࣋̀̕b"#, r#"a֮࣋̀̕b"#, r#"a֮࣋̀̕b"#, r#"a֮࣋̀̕b"#),
+        (r#"à֮࣌̕b"#, r#"à֮࣌̕b"#, r#"à֮࣌̕b"#, r#"à֮࣌̕b"#, r#"à֮࣌̕b"#),
+        (r#"a֮࣌̀̕b"#, r#"a֮࣌̀̕b"#, r#"a֮࣌̀̕b"#, r#"a֮࣌̀̕b"#, r#"a֮࣌̀̕b"#),
+        (r#"à֮࣍̕b"#, r#"à֮࣍̕b"#, r#"à֮࣍̕b"#, r#"à֮࣍̕b"#, r#"à֮࣍̕b"#),
+        (r#"a֮࣍̀̕b"#, r#"a֮࣍̀̕b"#, r#"a֮࣍̀̕b"#, r#"a֮࣍̀̕b"#, r#"a֮࣍̀̕b"#),
+        (r#"à֮࣎̕b"#, r#"à֮࣎̕b"#, r#"à֮࣎̕b"#, r#"à֮࣎̕b"#, r#"à֮࣎̕b"#),
+        (r#"a֮࣎̀̕b"#, r#"a֮࣎̀̕b"#, r#"a֮࣎̀̕b"#, r#"a֮࣎̀̕b"#, r#"a֮࣎̀̕b"#),
+        (r#"a᷺̖࣏֚b"#, r#"a᷺̖࣏֚b"#, r#"a᷺̖࣏֚b"#, r#"a᷺̖࣏֚b"#, r#"a᷺̖࣏֚b"#),
+        (r#"a᷺࣏̖֚b"#, r#"a᷺࣏̖֚b"#, r#"a᷺࣏̖֚b"#, r#"a᷺࣏̖֚b"#, r#"a᷺࣏̖֚b"#),
+        (r#"a᷺̖࣐֚b"#, r#"a᷺̖࣐֚b"#, r#"a᷺̖࣐֚b"#, r#"a᷺̖࣐֚b"#, r#"a᷺̖࣐֚b"#),
+        (r#"a᷺࣐̖֚b"#, r#"a᷺࣐̖֚b"#, r#"a᷺࣐̖֚b"#, r#"a᷺࣐̖֚b"#, r#"a᷺࣐̖֚b"#),
+        (r#"a᷺̖࣑֚b"#, r#"a᷺̖࣑֚b"#, r#"a᷺̖࣑֚b"#, r#"a᷺̖࣑֚b"#, r#"a᷺̖࣑֚b"#),
+        (r#"a᷺࣑̖֚b"#, r#"a᷺࣑̖֚b"#, r#"a᷺࣑̖֚b"#, r#"a᷺࣑̖֚b"#, r#"a᷺࣑̖֚b"#),
+        (r#"a᷺̖࣒֚b"#, r#"a᷺̖࣒֚b"#, r#"a᷺̖࣒֚b"#, r#"a᷺̖࣒֚b"#, r#"a᷺̖࣒֚b"#),
+        (r#"a᷺࣒̖֚b"#, r#"a᷺࣒̖֚b"#, r#"a᷺࣒̖֚b"#, r#"a᷺࣒̖֚b"#, r#"a᷺࣒̖֚b"#),
+        (r#"a᷺̖࣓֚b"#, r#"a᷺̖࣓֚b"#, r#"a᷺̖࣓֚b"#, r#"a᷺̖࣓֚b"#, r#"a᷺̖࣓֚b"#),
+        (r#"a᷺࣓̖֚b"#, r#"a᷺࣓̖֚b"#, r#"a᷺࣓̖֚b"#, r#"a᷺࣓̖֚b"#, r#"a᷺࣓̖֚b"#),
+        (r#"à֮ࣔ̕b"#, r#"à֮ࣔ̕b"#, r#"à֮ࣔ̕b"#, r#"à֮ࣔ̕b"#, r#"à֮ࣔ̕b"#),
+        (r#"a֮ࣔ̀̕b"#, r#"a֮ࣔ̀̕b"#, r#"a֮ࣔ̀̕b"#, r#"a֮ࣔ̀̕b"#, r#"a֮ࣔ̀̕b"#),
+        (r#"à֮ࣕ̕b"#, r#"à֮ࣕ̕b"#, r#"à֮ࣕ̕b"#, r#"à֮ࣕ̕b"#, r#"à֮ࣕ̕b"#),
+        (r#"a֮ࣕ̀̕b"#, r#"a֮ࣕ̀̕b"#, r#"a֮ࣕ̀̕b"#, r#"a֮ࣕ̀̕b"#, r#"a֮ࣕ̀̕b"#),
+        (r#"à֮ࣖ̕b"#, r#"à֮ࣖ̕b"#, r#"à֮ࣖ̕b"#, r#"à֮ࣖ̕b"#, r#"à֮ࣖ̕b"#),
+        (r#"a֮ࣖ̀̕b"#, r#"a֮ࣖ̀̕b"#, r#"a֮ࣖ̀̕b"#, r#"a֮ࣖ̀̕b"#, r#"a֮ࣖ̀̕b"#),
+        (r#"à֮ࣗ̕b"#, r#"à֮ࣗ̕b"#, r#"à֮ࣗ̕b"#, r#"à֮ࣗ̕b"#, r#"à֮ࣗ̕b"#),
+        (r#"a֮ࣗ̀̕b"#, r#"a֮ࣗ̀̕b"#, r#"a֮ࣗ̀̕b"#, r#"a֮ࣗ̀̕b"#, r#"a֮ࣗ̀̕b"#),
+        (r#"à֮ࣘ̕b"#, r#"à֮ࣘ̕b"#, r#"à֮ࣘ̕b"#, r#"à֮ࣘ̕b"#, r#"à֮ࣘ̕b"#),
+        (r#"a֮ࣘ̀̕b"#, r#"a֮ࣘ̀̕b"#, r#"a֮ࣘ̀̕b"#, r#"a֮ࣘ̀̕b"#, r#"a֮ࣘ̀̕b"#),
+        (r#"à֮ࣙ̕b"#, r#"à֮ࣙ̕b"#, r#"à֮ࣙ̕b"#, r#"à֮ࣙ̕b"#, r#"à֮ࣙ̕b"#),
+        (r#"a֮ࣙ̀̕b"#, r#"a֮ࣙ̀̕b"#, r#"a֮ࣙ̀̕b"#, r#"a֮ࣙ̀̕b"#, r#"a֮ࣙ̀̕b"#),
+        (r#"à֮ࣚ̕b"#, r#"à֮ࣚ̕b"#, r#"à֮ࣚ̕b"#, r#"à֮ࣚ̕b"#, r#"à֮ࣚ̕b"#),
+        (r#"a֮ࣚ̀̕b"#, r#"a֮ࣚ̀̕b"#, r#"a֮ࣚ̀̕b"#, r#"a֮ࣚ̀̕b"#, r#"a֮ࣚ̀̕b"#),
+        (r#"à֮ࣛ̕b"#, r#"à֮ࣛ̕b"#, r#"à֮ࣛ̕b"#, r#"à֮ࣛ̕b"#, r#"à֮ࣛ̕b"#),
+        (r#"a֮ࣛ̀̕b"#, r#"a֮ࣛ̀̕b"#, r#"a֮ࣛ̀̕b"#, r#"a֮ࣛ̀̕b"#, r#"a֮ࣛ̀̕b"#),
+        (r#"à֮ࣜ̕b"#, r#"à֮ࣜ̕b"#, r#"à֮ࣜ̕b"#, r#"à֮ࣜ̕b"#, r#"à֮ࣜ̕b"#),
+        (r#"a֮ࣜ̀̕b"#, r#"a֮ࣜ̀̕b"#, r#"a֮ࣜ̀̕b"#, r#"a֮ࣜ̀̕b"#, r#"a֮ࣜ̀̕b"#),
+        (r#"à֮ࣝ̕b"#, r#"à֮ࣝ̕b"#, r#"à֮ࣝ̕b"#, r#"à֮ࣝ̕b"#, r#"à֮ࣝ̕b"#),
+        (r#"a֮ࣝ̀̕b"#, r#"a֮ࣝ̀̕b"#, r#"a֮ࣝ̀̕b"#, r#"a֮ࣝ̀̕b"#, r#"a֮ࣝ̀̕b"#),
+        (r#"à֮ࣞ̕b"#, r#"à֮ࣞ̕b"#, r#"à֮ࣞ̕b"#, r#"à֮ࣞ̕b"#, r#"à֮ࣞ̕b"#),
+        (r#"a֮ࣞ̀̕b"#, r#"a֮ࣞ̀̕b"#, r#"a֮ࣞ̀̕b"#, r#"a֮ࣞ̀̕b"#, r#"a֮ࣞ̀̕b"#),
+        (r#"à֮ࣟ̕b"#, r#"à֮ࣟ̕b"#, r#"à֮ࣟ̕b"#, r#"à֮ࣟ̕b"#, r#"à֮ࣟ̕b"#),
+        (r#"a֮ࣟ̀̕b"#, r#"a֮ࣟ̀̕b"#, r#"a֮ࣟ̀̕b"#, r#"a֮ࣟ̀̕b"#, r#"a֮ࣟ̀̕b"#),
+        (r#"à֮࣠̕b"#, r#"à֮࣠̕b"#, r#"à֮࣠̕b"#, r#"à֮࣠̕b"#, r#"à֮࣠̕b"#),
+        (r#"a֮࣠̀̕b"#, r#"a֮࣠̀̕b"#, r#"a֮࣠̀̕b"#, r#"a֮࣠̀̕b"#, r#"a֮࣠̀̕b"#),
+        (r#"à֮࣡̕b"#, r#"à֮࣡̕b"#, r#"à֮࣡̕b"#, r#"à֮࣡̕b"#, r#"à֮࣡̕b"#),
+        (r#"a֮࣡̀̕b"#, r#"a֮࣡̀̕b"#, r#"a֮࣡̀̕b"#, r#"a֮࣡̀̕b"#, r#"a֮࣡̀̕b"#),
+        (r#"a᷺̖ࣣ֚b"#, r#"a᷺̖ࣣ֚b"#, r#"a᷺̖ࣣ֚b"#, r#"a᷺̖ࣣ֚b"#, r#"a᷺̖ࣣ֚b"#),
+        (r#"a᷺ࣣ̖֚b"#, r#"a᷺ࣣ̖֚b"#, r#"a᷺ࣣ̖֚b"#, r#"a᷺ࣣ̖֚b"#, r#"a᷺ࣣ̖֚b"#),
+        (r#"à֮ࣤ̕b"#, r#"à֮ࣤ̕b"#, r#"à֮ࣤ̕b"#, r#"à֮ࣤ̕b"#, r#"à֮ࣤ̕b"#),
+        (r#"a֮ࣤ̀̕b"#, r#"a֮ࣤ̀̕b"#, r#"a֮ࣤ̀̕b"#, r#"a֮ࣤ̀̕b"#, r#"a֮ࣤ̀̕b"#),
+        (r#"à֮ࣥ̕b"#, r#"à֮ࣥ̕b"#, r#"à֮ࣥ̕b"#, r#"à֮ࣥ̕b"#, r#"à֮ࣥ̕b"#),
+        (r#"a֮ࣥ̀̕b"#, r#"a֮ࣥ̀̕b"#, r#"a֮ࣥ̀̕b"#, r#"a֮ࣥ̀̕b"#, r#"a֮ࣥ̀̕b"#),
+        (r#"a᷺̖ࣦ֚b"#, r#"a᷺̖ࣦ֚b"#, r#"a᷺̖ࣦ֚b"#, r#"a᷺̖ࣦ֚b"#, r#"a᷺̖ࣦ֚b"#),
+        (r#"a᷺ࣦ̖֚b"#, r#"a᷺ࣦ̖֚b"#, r#"a᷺ࣦ̖֚b"#, r#"a᷺ࣦ̖֚b"#, r#"a᷺ࣦ̖֚b"#),
+        (r#"à֮ࣧ̕b"#, r#"à֮ࣧ̕b"#, r#"à֮ࣧ̕b"#, r#"à֮ࣧ̕b"#, r#"à֮ࣧ̕b"#),
+        (r#"a֮ࣧ̀̕b"#, r#"a֮ࣧ̀̕b"#, r#"a֮ࣧ̀̕b"#, r#"a֮ࣧ̀̕b"#, r#"a֮ࣧ̀̕b"#),
+        (r#"à֮ࣨ̕b"#, r#"à֮ࣨ̕b"#, r#"à֮ࣨ̕b"#, r#"à֮ࣨ̕b"#, r#"à֮ࣨ̕b"#),
+        (r#"a֮ࣨ̀̕b"#, r#"a֮ࣨ̀̕b"#, r#"a֮ࣨ̀̕b"#, r#"a֮ࣨ̀̕b"#, r#"a֮ࣨ̀̕b"#),
+        (r#"a᷺̖ࣩ֚b"#, r#"a᷺̖ࣩ֚b"#, r#"a᷺̖ࣩ֚b"#, r#"a᷺̖ࣩ֚b"#, r#"a᷺̖ࣩ֚b"#),
+        (r#"a᷺ࣩ̖֚b"#, r#"a᷺ࣩ̖֚b"#, r#"a᷺ࣩ̖֚b"#, r#"a᷺ࣩ̖֚b"#, r#"a᷺ࣩ̖֚b"#),
+        (r#"à֮࣪̕b"#, r#"à֮࣪̕b"#, r#"à֮࣪̕b"#, r#"à֮࣪̕b"#, r#"à֮࣪̕b"#),
+        (r#"a֮࣪̀̕b"#, r#"a֮࣪̀̕b"#, r#"a֮࣪̀̕b"#, r#"a֮࣪̀̕b"#, r#"a֮࣪̀̕b"#),
+        (r#"à֮࣫̕b"#, r#"à֮࣫̕b"#, r#"à֮࣫̕b"#, r#"à֮࣫̕b"#, r#"à֮࣫̕b"#),
+        (r#"a֮࣫̀̕b"#, r#"a֮࣫̀̕b"#, r#"a֮࣫̀̕b"#, r#"a֮࣫̀̕b"#, r#"a֮࣫̀̕b"#),
+        (r#"à֮࣬̕b"#, r#"à֮࣬̕b"#, r#"à֮࣬̕b"#, r#"à֮࣬̕b"#, r#"à֮࣬̕b"#),
+        (r#"a֮࣬̀̕b"#, r#"a֮࣬̀̕b"#, r#"a֮࣬̀̕b"#, r#"a֮࣬̀̕b"#, r#"a֮࣬̀̕b"#),
+        (r#"a᷺̖࣭֚b"#, r#"a᷺̖࣭֚b"#, r#"a᷺̖࣭֚b"#, r#"a᷺̖࣭֚b"#, r#"a᷺̖࣭֚b"#),
+        (r#"a᷺࣭̖֚b"#, r#"a᷺࣭̖֚b"#, r#"a᷺࣭̖֚b"#, r#"a᷺࣭̖֚b"#, r#"a᷺࣭̖֚b"#),
+        (r#"a᷺̖࣮֚b"#, r#"a᷺̖࣮֚b"#, r#"a᷺̖࣮֚b"#, r#"a᷺̖࣮֚b"#, r#"a᷺̖࣮֚b"#),
+        (r#"a᷺࣮̖֚b"#, r#"a᷺࣮̖֚b"#, r#"a᷺࣮̖֚b"#, r#"a᷺࣮̖֚b"#, r#"a᷺࣮̖֚b"#),
+        (r#"a᷺̖࣯֚b"#, r#"a᷺̖࣯֚b"#, r#"a᷺̖࣯֚b"#, r#"a᷺̖࣯֚b"#, r#"a᷺̖࣯֚b"#),
+        (r#"a᷺࣯̖֚b"#, r#"a᷺࣯̖֚b"#, r#"a᷺࣯̖֚b"#, r#"a᷺࣯̖֚b"#, r#"a᷺࣯̖֚b"#),
+        (r#"aﬞًࣰٌb"#, r#"aﬞًࣰٌb"#, r#"aﬞًࣰٌb"#, r#"aﬞًࣰٌb"#, r#"aﬞًࣰٌb"#),
+        (r#"aﬞࣰًٌb"#, r#"aﬞࣰًٌb"#, r#"aﬞࣰًٌb"#, r#"aﬞࣰًٌb"#, r#"aﬞࣰًٌb"#),
+        (r#"aًٌࣱٍb"#, r#"aًٌࣱٍb"#, r#"aًٌࣱٍb"#, r#"aًٌࣱٍb"#, r#"aًٌࣱٍb"#),
+        (r#"aًࣱٌٍb"#, r#"aًࣱٌٍb"#, r#"aًࣱٌٍb"#, r#"aًࣱٌٍb"#, r#"aًࣱٌٍb"#),
+        (r#"aٌٍࣲؘb"#, r#"aٌٍࣲؘb"#, r#"aٌٍࣲؘb"#, r#"aٌٍࣲؘb"#, r#"aٌٍࣲؘb"#),
+        (r#"aٌࣲٍؘb"#, r#"aٌࣲٍؘb"#, r#"aٌࣲٍؘb"#, r#"aٌࣲٍؘb"#, r#"aٌࣲٍؘb"#),
+        (r#"à֮ࣳ̕b"#, r#"à֮ࣳ̕b"#, r#"à֮ࣳ̕b"#, r#"à֮ࣳ̕b"#, r#"à֮ࣳ̕b"#),
+        (r#"a֮ࣳ̀̕b"#, r#"a֮ࣳ̀̕b"#, r#"a֮ࣳ̀̕b"#, r#"a֮ࣳ̀̕b"#, r#"a֮ࣳ̀̕b"#),
+        (r#"à֮ࣴ̕b"#, r#"à֮ࣴ̕b"#, r#"à֮ࣴ̕b"#, r#"à֮ࣴ̕b"#, r#"à֮ࣴ̕b"#),
+        (r#"a֮ࣴ̀̕b"#, r#"a֮ࣴ̀̕b"#, r#"a֮ࣴ̀̕b"#, r#"a֮ࣴ̀̕b"#, r#"a֮ࣴ̀̕b"#),
+        (r#"à֮ࣵ̕b"#, r#"à֮ࣵ̕b"#, r#"à֮ࣵ̕b"#, r#"à֮ࣵ̕b"#, r#"à֮ࣵ̕b"#),
+        (r#"a֮ࣵ̀̕b"#, r#"a֮ࣵ̀̕b"#, r#"a֮ࣵ̀̕b"#, r#"a֮ࣵ̀̕b"#, r#"a֮ࣵ̀̕b"#),
+        (r#"a᷺̖ࣶ֚b"#, r#"a᷺̖ࣶ֚b"#, r#"a᷺̖ࣶ֚b"#, r#"a᷺̖ࣶ֚b"#, r#"a᷺̖ࣶ֚b"#),
+        (r#"a᷺ࣶ̖֚b"#, r#"a᷺ࣶ̖֚b"#, r#"a᷺ࣶ̖֚b"#, r#"a᷺ࣶ̖֚b"#, r#"a᷺ࣶ̖֚b"#),
+        (r#"à֮ࣷ̕b"#, r#"à֮ࣷ̕b"#, r#"à֮ࣷ̕b"#, r#"à֮ࣷ̕b"#, r#"à֮ࣷ̕b"#),
+        (r#"a֮ࣷ̀̕b"#, r#"a֮ࣷ̀̕b"#, r#"a֮ࣷ̀̕b"#, r#"a֮ࣷ̀̕b"#, r#"a֮ࣷ̀̕b"#),
+        (r#"à֮ࣸ̕b"#, r#"à֮ࣸ̕b"#, r#"à֮ࣸ̕b"#, r#"à֮ࣸ̕b"#, r#"à֮ࣸ̕b"#),
+        (r#"a֮ࣸ̀̕b"#, r#"a֮ࣸ̀̕b"#, r#"a֮ࣸ̀̕b"#, r#"a֮ࣸ̀̕b"#, r#"a֮ࣸ̀̕b"#),
+        (r#"a᷺̖ࣹ֚b"#, r#"a᷺̖ࣹ֚b"#, r#"a᷺̖ࣹ֚b"#, r#"a᷺̖ࣹ֚b"#, r#"a᷺̖ࣹ֚b"#),
+        (r#"a᷺ࣹ̖֚b"#, r#"a᷺ࣹ̖֚b"#, r#"a᷺ࣹ̖֚b"#, r#"a᷺ࣹ̖֚b"#, r#"a᷺ࣹ̖֚b"#),
+        (r#"a᷺̖ࣺ֚b"#, r#"a᷺̖ࣺ֚b"#, r#"a᷺̖ࣺ֚b"#, r#"a᷺̖ࣺ֚b"#, r#"a᷺̖ࣺ֚b"#),
+        (r#"a᷺ࣺ̖֚b"#, r#"a᷺ࣺ̖֚b"#, r#"a᷺ࣺ̖֚b"#, r#"a᷺ࣺ̖֚b"#, r#"a᷺ࣺ̖֚b"#),
+        (r#"à֮ࣻ̕b"#, r#"à֮ࣻ̕b"#, r#"à֮ࣻ̕b"#, r#"à֮ࣻ̕b"#, r#"à֮ࣻ̕b"#),
+        (r#"a֮ࣻ̀̕b"#, r#"a֮ࣻ̀̕b"#, r#"a֮ࣻ̀̕b"#, r#"a֮ࣻ̀̕b"#, r#"a֮ࣻ̀̕b"#),
+        (r#"à֮ࣼ̕b"#, r#"à֮ࣼ̕b"#, r#"à֮ࣼ̕b"#, r#"à֮ࣼ̕b"#, r#"à֮ࣼ̕b"#),
+        (r#"a֮ࣼ̀̕b"#, r#"a֮ࣼ̀̕b"#, r#"a֮ࣼ̀̕b"#, r#"a֮ࣼ̀̕b"#, r#"a֮ࣼ̀̕b"#),
+        (r#"à֮ࣽ̕b"#, r#"à֮ࣽ̕b"#, r#"à֮ࣽ̕b"#, r#"à֮ࣽ̕b"#, r#"à֮ࣽ̕b"#),
+        (r#"a֮ࣽ̀̕b"#, r#"a֮ࣽ̀̕b"#, r#"a֮ࣽ̀̕b"#, r#"a֮ࣽ̀̕b"#, r#"a֮ࣽ̀̕b"#),
+        (r#"à֮ࣾ̕b"#, r#"à֮ࣾ̕b"#, r#"à֮ࣾ̕b"#, r#"à֮ࣾ̕b"#, r#"à֮ࣾ̕b"#),
+        (r#"a֮ࣾ̀̕b"#, r#"a֮ࣾ̀̕b"#, r#"a֮ࣾ̀̕b"#, r#"a֮ࣾ̀̕b"#, r#"a֮ࣾ̀̕b"#),
+        (r#"à֮ࣿ̕b"#, r#"à֮ࣿ̕b"#, r#"à֮ࣿ̕b"#, r#"à֮ࣿ̕b"#, r#"à֮ࣿ̕b"#),
+        (r#"a֮ࣿ̀̕b"#, r#"a֮ࣿ̀̕b"#, r#"a֮ࣿ̀̕b"#, r#"a֮ࣿ̀̕b"#, r#"a֮ࣿ̀̕b"#),
+        (r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#),
+        (r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#, r#"a𖿰़़゙b"#),
+        (r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#),
+        (r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#, r#"a゙््ְb"#),
+        (r#"à֮॑̕b"#, r#"à֮॑̕b"#, r#"à֮॑̕b"#, r#"à֮॑̕b"#, r#"à֮॑̕b"#),
+        (r#"a֮॑̀̕b"#, r#"a֮॑̀̕b"#, r#"a֮॑̀̕b"#, r#"a֮॑̀̕b"#, r#"a֮॑̀̕b"#),
+        (r#"a᷺̖॒֚b"#, r#"a᷺̖॒֚b"#, r#"a᷺̖॒֚b"#, r#"a᷺̖॒֚b"#, r#"a᷺̖॒֚b"#),
+        (r#"a᷺॒̖֚b"#, r#"a᷺॒̖֚b"#, r#"a᷺॒̖֚b"#, r#"a᷺॒̖֚b"#, r#"a᷺॒̖֚b"#),
+        (r#"à֮॓̕b"#, r#"à֮॓̕b"#, r#"à֮॓̕b"#, r#"à֮॓̕b"#, r#"à֮॓̕b"#),
+        (r#"a֮॓̀̕b"#, r#"a֮॓̀̕b"#, r#"a֮॓̀̕b"#, r#"a֮॓̀̕b"#, r#"a֮॓̀̕b"#),
+        (r#"à֮॔̕b"#, r#"à֮॔̕b"#, r#"à֮॔̕b"#, r#"à֮॔̕b"#, r#"à֮॔̕b"#),
+        (r#"a֮॔̀̕b"#, r#"a֮॔̀̕b"#, r#"a֮॔̀̕b"#, r#"a֮॔̀̕b"#, r#"a֮॔̀̕b"#),
+        (r#"a𖿰़়゙b"#, r#"a𖿰़়゙b"#, r#"a𖿰़়゙b"#, r#"a𖿰़়゙b"#, r#"a𖿰़়゙b"#),
+        (r#"a𖿰়़゙b"#, r#"a𖿰়़゙b"#, r#"a𖿰়़゙b"#, r#"a𖿰়़゙b"#, r#"a𖿰়़゙b"#),
+        (r#"a゙्্ְb"#, r#"a゙्্ְb"#, r#"a゙्্ְb"#, r#"a゙्্ְb"#, r#"a゙्্ְb"#),
+        (r#"a゙্्ְb"#, r#"a゙্्ְb"#, r#"a゙্्ְb"#, r#"a゙্्ְb"#, r#"a゙্्ְb"#),
+        (r#"à֮৾̕b"#, r#"à֮৾̕b"#, r#"à֮৾̕b"#, r#"à֮৾̕b"#, r#"à֮৾̕b"#),
+        (r#"a֮৾̀̕b"#, r#"a֮৾̀̕b"#, r#"a֮৾̀̕b"#, r#"a֮৾̀̕b"#, r#"a֮৾̀̕b"#),
+        (r#"a𖿰़਼゙b"#, r#"a𖿰़਼゙b"#, r#"a𖿰़਼゙b"#, r#"a𖿰़਼゙b"#, r#"a𖿰़਼゙b"#),
+        (r#"a𖿰਼़゙b"#, r#"a𖿰਼़゙b"#, r#"a𖿰਼़゙b"#, r#"a𖿰਼़゙b"#, r#"a𖿰਼़゙b"#),
+        (r#"a゙्੍ְb"#, r#"a゙्੍ְb"#, r#"a゙्੍ְb"#, r#"a゙्੍ְb"#, r#"a゙्੍ְb"#),
+        (r#"a゙੍्ְb"#, r#"a゙੍्ְb"#, r#"a゙੍्ְb"#, r#"a゙੍्ְb"#, r#"a゙੍्ְb"#),
+        (r#"a𖿰़઼゙b"#, r#"a𖿰़઼゙b"#, r#"a𖿰़઼゙b"#, r#"a𖿰़઼゙b"#, r#"a𖿰़઼゙b"#),
+        (r#"a𖿰઼़゙b"#, r#"a𖿰઼़゙b"#, r#"a𖿰઼़゙b"#, r#"a𖿰઼़゙b"#, r#"a𖿰઼़゙b"#),
+        (r#"a゙्્ְb"#, r#"a゙्્ְb"#, r#"a゙्્ְb"#, r#"a゙्્ְb"#, r#"a゙्્ְb"#),
+        (r#"a゙્्ְb"#, r#"a゙્्ְb"#, r#"a゙્्ְb"#, r#"a゙્्ְb"#, r#"a゙્्ְb"#),
+        (r#"a𖿰़଼゙b"#, r#"a𖿰़଼゙b"#, r#"a𖿰़଼゙b"#, r#"a𖿰़଼゙b"#, r#"a𖿰़଼゙b"#),
+        (r#"a𖿰଼़゙b"#, r#"a𖿰଼़゙b"#, r#"a𖿰଼़゙b"#, r#"a𖿰଼़゙b"#, r#"a𖿰଼़゙b"#),
+        (r#"a゙्୍ְb"#, r#"a゙्୍ְb"#, r#"a゙्୍ְb"#, r#"a゙्୍ְb"#, r#"a゙्୍ְb"#),
+        (r#"a゙୍्ְb"#, r#"a゙୍्ְb"#, r#"a゙୍्ְb"#, r#"a゙୍्ְb"#, r#"a゙୍्ְb"#),
+        (r#"a゙्்ְb"#, r#"a゙्்ְb"#, r#"a゙्்ְb"#, r#"a゙्்ְb"#, r#"a゙्்ְb"#),
+        (r#"a゙்्ְb"#, r#"a゙்्ְb"#, r#"a゙்्ְb"#, r#"a゙்्ְb"#, r#"a゙்्ְb"#),
+        (r#"a𖿰़఼゙b"#, r#"a𖿰़఼゙b"#, r#"a𖿰़఼゙b"#, r#"a𖿰़఼゙b"#, r#"a𖿰़఼゙b"#),
+        (r#"a𖿰఼़゙b"#, r#"a𖿰఼़゙b"#, r#"a𖿰఼़゙b"#, r#"a𖿰఼़゙b"#, r#"a𖿰఼़゙b"#),
+        (r#"a゙्్ְb"#, r#"a゙्్ְb"#, r#"a゙्్ְb"#, r#"a゙्్ְb"#, r#"a゙्్ְb"#),
+        (r#"a゙్्ְb"#, r#"a゙్्ְb"#, r#"a゙్्ְb"#, r#"a゙్्ְb"#, r#"a゙్्ְb"#),
+        (r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#),
+        (r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#, r#"aܑౕౕౖb"#),
+        (r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#),
+        (r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#, r#"aౕౖౖุb"#),
+        (r#"a𖿰़಼゙b"#, r#"a𖿰़಼゙b"#, r#"a𖿰़಼゙b"#, r#"a𖿰़಼゙b"#, r#"a𖿰़಼゙b"#),
+        (r#"a𖿰಼़゙b"#, r#"a𖿰಼़゙b"#, r#"a𖿰಼़゙b"#, r#"a𖿰಼़゙b"#, r#"a𖿰಼़゙b"#),
+        (r#"a゙्್ְb"#, r#"a゙्್ְb"#, r#"a゙्್ְb"#, r#"a゙्್ְb"#, r#"a゙्್ְb"#),
+        (r#"a゙್्ְb"#, r#"a゙್्ְb"#, r#"a゙್्ְb"#, r#"a゙್्ְb"#, r#"a゙್्ְb"#),
+        (r#"a゙्഻ְb"#, r#"a゙्഻ְb"#, r#"a゙्഻ְb"#, r#"a゙्഻ְb"#, r#"a゙्഻ְb"#),
+        (r#"a゙഻्ְb"#, r#"a゙഻्ְb"#, r#"a゙഻्ְb"#, r#"a゙഻्ְb"#, r#"a゙഻्ְb"#),
+        (r#"a゙्഼ְb"#, r#"a゙्഼ְb"#, r#"a゙्഼ְb"#, r#"a゙्഼ְb"#, r#"a゙्഼ְb"#),
+        (r#"a゙഼्ְb"#, r#"a゙഼्ְb"#, r#"a゙഼्ְb"#, r#"a゙഼्ְb"#, r#"a゙഼्ְb"#),
+        (r#"a゙्്ְb"#, r#"a゙्്ְb"#, r#"a゙्്ְb"#, r#"a゙्്ְb"#, r#"a゙्്ְb"#),
+        (r#"a゙്्ְb"#, r#"a゙്्ְb"#, r#"a゙്्ְb"#, r#"a゙്्ְb"#, r#"a゙്्ְb"#),
+        (r#"a゙्්ְb"#, r#"a゙्්ְb"#, r#"a゙्්ְb"#, r#"a゙्්ְb"#, r#"a゙्්ְb"#),
+        (r#"a゙්्ְb"#, r#"a゙්्ְb"#, r#"a゙්्ְb"#, r#"a゙්्ְb"#, r#"a゙්्ְb"#),
+        (r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#),
+        (r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#, r#"aౖุุ่b"#),
+        (r#"aౖุู่b"#, r#"aౖุู่b"#, r#"aౖุู่b"#, r#"aౖุู่b"#, r#"aౖุู่b"#),
+        (r#"aౖูุ่b"#, r#"aౖูุ่b"#, r#"aౖูุ่b"#, r#"aౖูุ่b"#, r#"aౖูุ่b"#),
+        (r#"a゙्ฺְb"#, r#"a゙्ฺְb"#, r#"a゙्ฺְb"#, r#"a゙्ฺְb"#, r#"a゙्ฺְb"#),
+        (r#"a゙ฺ्ְb"#, r#"a゙ฺ्ְb"#, r#"a゙ฺ्ְb"#, r#"a゙ฺ्ְb"#, r#"a゙ฺ्ְb"#),
+        (r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#),
+        (r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#, r#"aุ่่ຸb"#),
+        (r#"aุ่้ຸb"#, r#"aุ่้ຸb"#, r#"aุ่้ຸb"#, r#"aุ่้ຸb"#, r#"aุ่้ຸb"#),
+        (r#"aุ้่ຸb"#, r#"aุ้่ຸb"#, r#"aุ้่ຸb"#, r#"aุ้่ຸb"#, r#"aุ้่ຸb"#),
+        (r#"aุ่๊ຸb"#, r#"aุ่๊ຸb"#, r#"aุ่๊ຸb"#, r#"aุ่๊ຸb"#, r#"aุ่๊ຸb"#),
+        (r#"aุ๊่ຸb"#, r#"aุ๊่ຸb"#, r#"aุ๊่ຸb"#, r#"aุ๊่ຸb"#, r#"aุ๊่ຸb"#),
+        (r#"aุ่๋ຸb"#, r#"aุ่๋ຸb"#, r#"aุ่๋ຸb"#, r#"aุ่๋ຸb"#, r#"aุ่๋ຸb"#),
+        (r#"aุ๋่ຸb"#, r#"aุ๋่ຸb"#, r#"aุ๋่ຸb"#, r#"aุ๋่ຸb"#, r#"aุ๋่ຸb"#),
+        (r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#),
+        (r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#, r#"a่ຸຸ່b"#),
+        (r#"a่ຸູ່b"#, r#"a่ຸູ່b"#, r#"a่ຸູ່b"#, r#"a่ຸູ່b"#, r#"a่ຸູ່b"#),
+        (r#"a่ູຸ່b"#, r#"a่ູຸ່b"#, r#"a่ູຸ່b"#, r#"a่ູຸ່b"#, r#"a่ູຸ່b"#),
+        (r#"a゙्຺ְb"#, r#"a゙्຺ְb"#, r#"a゙्຺ְb"#, r#"a゙्຺ְb"#, r#"a゙्຺ְb"#),
+        (r#"a゙຺्ְb"#, r#"a゙຺्ְb"#, r#"a゙຺्ְb"#, r#"a゙຺्ְb"#, r#"a゙຺्ְb"#),
+        (r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#),
+        (r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#, r#"aຸ່່ཱb"#),
+        (r#"aຸ່້ཱb"#, r#"aຸ່້ཱb"#, r#"aຸ່້ཱb"#, r#"aຸ່້ཱb"#, r#"aຸ່້ཱb"#),
+        (r#"aຸ້່ཱb"#, r#"aຸ້່ཱb"#, r#"aຸ້່ཱb"#, r#"aຸ້່ཱb"#, r#"aຸ້່ཱb"#),
+        (r#"aຸ່໊ཱb"#, r#"aຸ່໊ཱb"#, r#"aຸ່໊ཱb"#, r#"aຸ່໊ཱb"#, r#"aຸ່໊ཱb"#),
+        (r#"aຸ໊່ཱb"#, r#"aຸ໊່ཱb"#, r#"aຸ໊່ཱb"#, r#"aຸ໊່ཱb"#, r#"aຸ໊່ཱb"#),
+        (r#"aຸ່໋ཱb"#, r#"aຸ່໋ཱb"#, r#"aຸ່໋ཱb"#, r#"aຸ່໋ཱb"#, r#"aຸ່໋ཱb"#),
+        (r#"aຸ໋່ཱb"#, r#"aຸ໋່ཱb"#, r#"aຸ໋່ཱb"#, r#"aຸ໋່ཱb"#, r#"aຸ໋່ཱb"#),
+        (r#"a᷺̖༘֚b"#, r#"a᷺̖༘֚b"#, r#"a᷺̖༘֚b"#, r#"a᷺̖༘֚b"#, r#"a᷺̖༘֚b"#),
+        (r#"a᷺༘̖֚b"#, r#"a᷺༘̖֚b"#, r#"a᷺༘̖֚b"#, r#"a᷺༘̖֚b"#, r#"a᷺༘̖֚b"#),
+        (r#"a᷺̖༙֚b"#, r#"a᷺̖༙֚b"#, r#"a᷺̖༙֚b"#, r#"a᷺̖༙֚b"#, r#"a᷺̖༙֚b"#),
+        (r#"a᷺༙̖֚b"#, r#"a᷺༙̖֚b"#, r#"a᷺༙̖֚b"#, r#"a᷺༙̖֚b"#, r#"a᷺༙̖֚b"#),
+        (r#"a᷺̖༵֚b"#, r#"a᷺̖༵֚b"#, r#"a᷺̖༵֚b"#, r#"a᷺̖༵֚b"#, r#"a᷺̖༵֚b"#),
+        (r#"a᷺༵̖֚b"#, r#"a᷺༵̖֚b"#, r#"a᷺༵̖֚b"#, r#"a᷺༵̖֚b"#, r#"a᷺༵̖֚b"#),
+        (r#"a᷺̖༷֚b"#, r#"a᷺̖༷֚b"#, r#"a᷺̖༷֚b"#, r#"a᷺̖༷֚b"#, r#"a᷺̖༷֚b"#),
+        (r#"a᷺༷̖֚b"#, r#"a᷺༷̖֚b"#, r#"a᷺༷̖֚b"#, r#"a᷺༷̖֚b"#, r#"a᷺༷̖֚b"#),
+        (r#"a᷎̛༹᷺b"#, r#"a᷎̛༹᷺b"#, r#"a᷎̛༹᷺b"#, r#"a᷎̛༹᷺b"#, r#"a᷎̛༹᷺b"#),
+        (r#"a᷎༹̛᷺b"#, r#"a᷎༹̛᷺b"#, r#"a᷎༹̛᷺b"#, r#"a᷎༹̛᷺b"#, r#"a᷎༹̛᷺b"#),
+        (r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#),
+        (r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#, r#"a່ཱཱིb"#),
+        (r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#),
+        (r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#, r#"aཱིིུb"#),
+        (r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#),
+        (r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#, r#"aིུུ̡b"#),
+        (r#"aཱིེུb"#, r#"aཱིེུb"#, r#"aཱིེུb"#, r#"aཱིེུb"#, r#"aཱིེུb"#),
+        (r#"aཱེིུb"#, r#"aཱེིུb"#, r#"aཱེིུb"#, r#"aཱེིུb"#, r#"aཱེིུb"#),
+        (r#"aཱིཻུb"#, r#"aཱིཻུb"#, r#"aཱིཻུb"#, r#"aཱིཻུb"#, r#"aཱིཻུb"#),
+        (r#"aཱཻིུb"#, r#"aཱཻིུb"#, r#"aཱཻིུb"#, r#"aཱཻིུb"#, r#"aཱཻིུb"#),
+        (r#"aཱིོུb"#, r#"aཱིོུb"#, r#"aཱིོུb"#, r#"aཱིོུb"#, r#"aཱིོུb"#),
+        (r#"aཱོིུb"#, r#"aཱོིུb"#, r#"aཱོིུb"#, r#"aཱོིུb"#, r#"aཱོིུb"#),
+        (r#"aཱིཽུb"#, r#"aཱིཽུb"#, r#"aཱིཽུb"#, r#"aཱིཽུb"#, r#"aཱིཽུb"#),
+        (r#"aཱཽིུb"#, r#"aཱཽིུb"#, r#"aཱཽིུb"#, r#"aཱཽིུb"#, r#"aཱཽིུb"#),
+        (r#"aཱིྀུb"#, r#"aཱིྀུb"#, r#"aཱིྀུb"#, r#"aཱིྀུb"#, r#"aཱིྀུb"#),
+        (r#"aཱྀིུb"#, r#"aཱྀིུb"#, r#"aཱྀིུb"#, r#"aཱྀིུb"#, r#"aཱྀིུb"#),
+        (r#"à֮ྂ̕b"#, r#"à֮ྂ̕b"#, r#"à֮ྂ̕b"#, r#"à֮ྂ̕b"#, r#"à֮ྂ̕b"#),
+        (r#"a֮ྂ̀̕b"#, r#"a֮ྂ̀̕b"#, r#"a֮ྂ̀̕b"#, r#"a֮ྂ̀̕b"#, r#"a֮ྂ̀̕b"#),
+        (r#"à֮ྃ̕b"#, r#"à֮ྃ̕b"#, r#"à֮ྃ̕b"#, r#"à֮ྃ̕b"#, r#"à֮ྃ̕b"#),
+        (r#"a֮ྃ̀̕b"#, r#"a֮ྃ̀̕b"#, r#"a֮ྃ̀̕b"#, r#"a֮ྃ̀̕b"#, r#"a֮ྃ̀̕b"#),
+        (r#"a゙्྄ְb"#, r#"a゙्྄ְb"#, r#"a゙्྄ְb"#, r#"a゙्྄ְb"#, r#"a゙्྄ְb"#),
+        (r#"a゙྄्ְb"#, r#"a゙྄्ְb"#, r#"a゙྄्ְb"#, r#"a゙྄्ְb"#, r#"a゙྄्ְb"#),
+        (r#"à֮྆̕b"#, r#"à֮྆̕b"#, r#"à֮྆̕b"#, r#"à֮྆̕b"#, r#"à֮྆̕b"#),
+        (r#"a֮྆̀̕b"#, r#"a֮྆̀̕b"#, r#"a֮྆̀̕b"#, r#"a֮྆̀̕b"#, r#"a֮྆̀̕b"#),
+        (r#"à֮྇̕b"#, r#"à֮྇̕b"#, r#"à֮྇̕b"#, r#"à֮྇̕b"#, r#"à֮྇̕b"#),
+        (r#"a֮྇̀̕b"#, r#"a֮྇̀̕b"#, r#"a֮྇̀̕b"#, r#"a֮྇̀̕b"#, r#"a֮྇̀̕b"#),
+        (r#"a᷺̖࿆֚b"#, r#"a᷺̖࿆֚b"#, r#"a᷺̖࿆֚b"#, r#"a᷺̖࿆֚b"#, r#"a᷺̖࿆֚b"#),
+        (r#"a᷺࿆̖֚b"#, r#"a᷺࿆̖֚b"#, r#"a᷺࿆̖֚b"#, r#"a᷺࿆̖֚b"#, r#"a᷺࿆̖֚b"#),
+        (r#"a𖿰़့゙b"#, r#"a𖿰़့゙b"#, r#"a𖿰़့゙b"#, r#"a𖿰़့゙b"#, r#"a𖿰़့゙b"#),
+        (r#"a𖿰့़゙b"#, r#"a𖿰့़゙b"#, r#"a𖿰့़゙b"#, r#"a𖿰့़゙b"#, r#"a𖿰့़゙b"#),
+        (r#"a゙्္ְb"#, r#"a゙्္ְb"#, r#"a゙्္ְb"#, r#"a゙्္ְb"#, r#"a゙्္ְb"#),
+        (r#"a゙္्ְb"#, r#"a゙္्ְb"#, r#"a゙္्ְb"#, r#"a゙္्ְb"#, r#"a゙္्ְb"#),
+        (r#"a゙्်ְb"#, r#"a゙्်ְb"#, r#"a゙्်ְb"#, r#"a゙्်ְb"#, r#"a゙्်ְb"#),
+        (r#"a゙်्ְb"#, r#"a゙်्ְb"#, r#"a゙်्ְb"#, r#"a゙်्ְb"#, r#"a゙်्ְb"#),
+        (r#"a᷺̖ႍ֚b"#, r#"a᷺̖ႍ֚b"#, r#"a᷺̖ႍ֚b"#, r#"a᷺̖ႍ֚b"#, r#"a᷺̖ႍ֚b"#),
+        (r#"a᷺ႍ̖֚b"#, r#"a᷺ႍ̖֚b"#, r#"a᷺ႍ̖֚b"#, r#"a᷺ႍ̖֚b"#, r#"a᷺ႍ̖֚b"#),
+        (r#"à֮፝̕b"#, r#"à֮፝̕b"#, r#"à֮፝̕b"#, r#"à֮፝̕b"#, r#"à֮፝̕b"#),
+        (r#"a֮፝̀̕b"#, r#"a֮፝̀̕b"#, r#"a֮፝̀̕b"#, r#"a֮፝̀̕b"#, r#"a֮፝̀̕b"#),
+        (r#"à֮፞̕b"#, r#"à֮፞̕b"#, r#"à֮፞̕b"#, r#"à֮፞̕b"#, r#"à֮፞̕b"#),
+        (r#"a֮፞̀̕b"#, r#"a֮፞̀̕b"#, r#"a֮፞̀̕b"#, r#"a֮፞̀̕b"#, r#"a֮፞̀̕b"#),
+        (r#"à֮፟̕b"#, r#"à֮፟̕b"#, r#"à֮፟̕b"#, r#"à֮፟̕b"#, r#"à֮፟̕b"#),
+        (r#"a֮፟̀̕b"#, r#"a֮፟̀̕b"#, r#"a֮፟̀̕b"#, r#"a֮፟̀̕b"#, r#"a֮፟̀̕b"#),
+        (r#"a゙्᜔ְb"#, r#"a゙्᜔ְb"#, r#"a゙्᜔ְb"#, r#"a゙्᜔ְb"#, r#"a゙्᜔ְb"#),
+        (r#"a゙᜔्ְb"#, r#"a゙᜔्ְb"#, r#"a゙᜔्ְb"#, r#"a゙᜔्ְb"#, r#"a゙᜔्ְb"#),
+        (r#"a゙्᜕ְb"#, r#"a゙्᜕ְb"#, r#"a゙्᜕ְb"#, r#"a゙्᜕ְb"#, r#"a゙्᜕ְb"#),
+        (r#"a゙᜕्ְb"#, r#"a゙᜕्ְb"#, r#"a゙᜕्ְb"#, r#"a゙᜕्ְb"#, r#"a゙᜕्ְb"#),
+        (r#"a゙्᜴ְb"#, r#"a゙्᜴ְb"#, r#"a゙्᜴ְb"#, r#"a゙्᜴ְb"#, r#"a゙्᜴ְb"#),
+        (r#"a゙᜴्ְb"#, r#"a゙᜴्ְb"#, r#"a゙᜴्ְb"#, r#"a゙᜴्ְb"#, r#"a゙᜴्ְb"#),
+        (r#"a゙्្ְb"#, r#"a゙्្ְb"#, r#"a゙्្ְb"#, r#"a゙्្ְb"#, r#"a゙्្ְb"#),
+        (r#"a゙្्ְb"#, r#"a゙្्ְb"#, r#"a゙្्ְb"#, r#"a゙្्ְb"#, r#"a゙្्ְb"#),
+        (r#"à֮៝̕b"#, r#"à֮៝̕b"#, r#"à֮៝̕b"#, r#"à֮៝̕b"#, r#"à֮៝̕b"#),
+        (r#"a֮៝̀̕b"#, r#"a֮៝̀̕b"#, r#"a֮៝̀̕b"#, r#"a֮៝̀̕b"#, r#"a֮៝̀̕b"#),
+        (r#"à𝅭֮ᢩb"#, r#"à𝅭֮ᢩb"#, r#"à𝅭֮ᢩb"#, r#"à𝅭֮ᢩb"#, r#"à𝅭֮ᢩb"#),
+        (r#"à𝅭ᢩ֮b"#, r#"à𝅭ᢩ֮b"#, r#"à𝅭ᢩ֮b"#, r#"à𝅭ᢩ֮b"#, r#"à𝅭ᢩ֮b"#),
+        (r#"a̖֚᤹〮b"#, r#"a̖֚᤹〮b"#, r#"a̖֚᤹〮b"#, r#"a̖֚᤹〮b"#, r#"a̖֚᤹〮b"#),
+        (r#"a̖᤹֚〮b"#, r#"a̖᤹֚〮b"#, r#"a̖᤹֚〮b"#, r#"a̖᤹֚〮b"#, r#"a̖᤹֚〮b"#),
+        (r#"à֮᤺̕b"#, r#"à֮᤺̕b"#, r#"à֮᤺̕b"#, r#"à֮᤺̕b"#, r#"à֮᤺̕b"#),
+        (r#"a֮᤺̀̕b"#, r#"a֮᤺̀̕b"#, r#"a֮᤺̀̕b"#, r#"a֮᤺̀̕b"#, r#"a֮᤺̀̕b"#),
+        (r#"a᷺̖᤻֚b"#, r#"a᷺̖᤻֚b"#, r#"a᷺̖᤻֚b"#, r#"a᷺̖᤻֚b"#, r#"a᷺̖᤻֚b"#),
+        (r#"a᷺᤻̖֚b"#, r#"a᷺᤻̖֚b"#, r#"a᷺᤻̖֚b"#, r#"a᷺᤻̖֚b"#, r#"a᷺᤻̖֚b"#),
+        (r#"à֮ᨗ̕b"#, r#"à֮ᨗ̕b"#, r#"à֮ᨗ̕b"#, r#"à֮ᨗ̕b"#, r#"à֮ᨗ̕b"#),
+        (r#"a֮ᨗ̀̕b"#, r#"a֮ᨗ̀̕b"#, r#"a֮ᨗ̀̕b"#, r#"a֮ᨗ̀̕b"#, r#"a֮ᨗ̀̕b"#),
+        (r#"a᷺̖ᨘ֚b"#, r#"a᷺̖ᨘ֚b"#, r#"a᷺̖ᨘ֚b"#, r#"a᷺̖ᨘ֚b"#, r#"a᷺̖ᨘ֚b"#),
+        (r#"a᷺ᨘ̖֚b"#, r#"a᷺ᨘ̖֚b"#, r#"a᷺ᨘ̖֚b"#, r#"a᷺ᨘ̖֚b"#, r#"a᷺ᨘ̖֚b"#),
+        (r#"a゙्᩠ְb"#, r#"a゙्᩠ְb"#, r#"a゙्᩠ְb"#, r#"a゙्᩠ְb"#, r#"a゙्᩠ְb"#),
+        (r#"a゙᩠्ְb"#, r#"a゙᩠्ְb"#, r#"a゙᩠्ְb"#, r#"a゙᩠्ְb"#, r#"a゙᩠्ְb"#),
+        (r#"à֮᩵̕b"#, r#"à֮᩵̕b"#, r#"à֮᩵̕b"#, r#"à֮᩵̕b"#, r#"à֮᩵̕b"#),
+        (r#"a֮᩵̀̕b"#, r#"a֮᩵̀̕b"#, r#"a֮᩵̀̕b"#, r#"a֮᩵̀̕b"#, r#"a֮᩵̀̕b"#),
+        (r#"à֮᩶̕b"#, r#"à֮᩶̕b"#, r#"à֮᩶̕b"#, r#"à֮᩶̕b"#, r#"à֮᩶̕b"#),
+        (r#"a֮᩶̀̕b"#, r#"a֮᩶̀̕b"#, r#"a֮᩶̀̕b"#, r#"a֮᩶̀̕b"#, r#"a֮᩶̀̕b"#),
+        (r#"à֮᩷̕b"#, r#"à֮᩷̕b"#, r#"à֮᩷̕b"#, r#"à֮᩷̕b"#, r#"à֮᩷̕b"#),
+        (r#"a֮᩷̀̕b"#, r#"a֮᩷̀̕b"#, r#"a֮᩷̀̕b"#, r#"a֮᩷̀̕b"#, r#"a֮᩷̀̕b"#),
+        (r#"à֮᩸̕b"#, r#"à֮᩸̕b"#, r#"à֮᩸̕b"#, r#"à֮᩸̕b"#, r#"à֮᩸̕b"#),
+        (r#"a֮᩸̀̕b"#, r#"a֮᩸̀̕b"#, r#"a֮᩸̀̕b"#, r#"a֮᩸̀̕b"#, r#"a֮᩸̀̕b"#),
+        (r#"à֮᩹̕b"#, r#"à֮᩹̕b"#, r#"à֮᩹̕b"#, r#"à֮᩹̕b"#, r#"à֮᩹̕b"#),
+        (r#"a֮᩹̀̕b"#, r#"a֮᩹̀̕b"#, r#"a֮᩹̀̕b"#, r#"a֮᩹̀̕b"#, r#"a֮᩹̀̕b"#),
+        (r#"à֮᩺̕b"#, r#"à֮᩺̕b"#, r#"à֮᩺̕b"#, r#"à֮᩺̕b"#, r#"à֮᩺̕b"#),
+        (r#"a֮᩺̀̕b"#, r#"a֮᩺̀̕b"#, r#"a֮᩺̀̕b"#, r#"a֮᩺̀̕b"#, r#"a֮᩺̀̕b"#),
+        (r#"à֮᩻̕b"#, r#"à֮᩻̕b"#, r#"à֮᩻̕b"#, r#"à֮᩻̕b"#, r#"à֮᩻̕b"#),
+        (r#"a֮᩻̀̕b"#, r#"a֮᩻̀̕b"#, r#"a֮᩻̀̕b"#, r#"a֮᩻̀̕b"#, r#"a֮᩻̀̕b"#),
+        (r#"à֮᩼̕b"#, r#"à֮᩼̕b"#, r#"à֮᩼̕b"#, r#"à֮᩼̕b"#, r#"à֮᩼̕b"#),
+        (r#"a֮᩼̀̕b"#, r#"a֮᩼̀̕b"#, r#"a֮᩼̀̕b"#, r#"a֮᩼̀̕b"#, r#"a֮᩼̀̕b"#),
+        (r#"a᷺̖᩿֚b"#, r#"a᷺̖᩿֚b"#, r#"a᷺̖᩿֚b"#, r#"a᷺̖᩿֚b"#, r#"a᷺̖᩿֚b"#),
+        (r#"a᷺᩿̖֚b"#, r#"a᷺᩿̖֚b"#, r#"a᷺᩿̖֚b"#, r#"a᷺᩿̖֚b"#, r#"a᷺᩿̖֚b"#),
+        (r#"à֮᪰̕b"#, r#"à֮᪰̕b"#, r#"à֮᪰̕b"#, r#"à֮᪰̕b"#, r#"à֮᪰̕b"#),
+        (r#"a֮᪰̀̕b"#, r#"a֮᪰̀̕b"#, r#"a֮᪰̀̕b"#, r#"a֮᪰̀̕b"#, r#"a֮᪰̀̕b"#),
+        (r#"à֮᪱̕b"#, r#"à֮᪱̕b"#, r#"à֮᪱̕b"#, r#"à֮᪱̕b"#, r#"à֮᪱̕b"#),
+        (r#"a֮᪱̀̕b"#, r#"a֮᪱̀̕b"#, r#"a֮᪱̀̕b"#, r#"a֮᪱̀̕b"#, r#"a֮᪱̀̕b"#),
+        (r#"à֮᪲̕b"#, r#"à֮᪲̕b"#, r#"à֮᪲̕b"#, r#"à֮᪲̕b"#, r#"à֮᪲̕b"#),
+        (r#"a֮᪲̀̕b"#, r#"a֮᪲̀̕b"#, r#"a֮᪲̀̕b"#, r#"a֮᪲̀̕b"#, r#"a֮᪲̀̕b"#),
+        (r#"à֮᪳̕b"#, r#"à֮᪳̕b"#, r#"à֮᪳̕b"#, r#"à֮᪳̕b"#, r#"à֮᪳̕b"#),
+        (r#"a֮᪳̀̕b"#, r#"a֮᪳̀̕b"#, r#"a֮᪳̀̕b"#, r#"a֮᪳̀̕b"#, r#"a֮᪳̀̕b"#),
+        (r#"à֮᪴̕b"#, r#"à֮᪴̕b"#, r#"à֮᪴̕b"#, r#"à֮᪴̕b"#, r#"à֮᪴̕b"#),
+        (r#"a֮᪴̀̕b"#, r#"a֮᪴̀̕b"#, r#"a֮᪴̀̕b"#, r#"a֮᪴̀̕b"#, r#"a֮᪴̀̕b"#),
+        (r#"a᷺̖᪵֚b"#, r#"a᷺̖᪵֚b"#, r#"a᷺̖᪵֚b"#, r#"a᷺̖᪵֚b"#, r#"a᷺̖᪵֚b"#),
+        (r#"a᷺᪵̖֚b"#, r#"a᷺᪵̖֚b"#, r#"a᷺᪵̖֚b"#, r#"a᷺᪵̖֚b"#, r#"a᷺᪵̖֚b"#),
+        (r#"a᷺̖᪶֚b"#, r#"a᷺̖᪶֚b"#, r#"a᷺̖᪶֚b"#, r#"a᷺̖᪶֚b"#, r#"a᷺̖᪶֚b"#),
+        (r#"a᷺᪶̖֚b"#, r#"a᷺᪶̖֚b"#, r#"a᷺᪶̖֚b"#, r#"a᷺᪶̖֚b"#, r#"a᷺᪶̖֚b"#),
+        (r#"a᷺̖᪷֚b"#, r#"a᷺̖᪷֚b"#, r#"a᷺̖᪷֚b"#, r#"a᷺̖᪷֚b"#, r#"a᷺̖᪷֚b"#),
+        (r#"a᷺᪷̖֚b"#, r#"a᷺᪷̖֚b"#, r#"a᷺᪷̖֚b"#, r#"a᷺᪷̖֚b"#, r#"a᷺᪷̖֚b"#),
+        (r#"a᷺̖᪸֚b"#, r#"a᷺̖᪸֚b"#, r#"a᷺̖᪸֚b"#, r#"a᷺̖᪸֚b"#, r#"a᷺̖᪸֚b"#),
+        (r#"a᷺᪸̖֚b"#, r#"a᷺᪸̖֚b"#, r#"a᷺᪸̖֚b"#, r#"a᷺᪸̖֚b"#, r#"a᷺᪸̖֚b"#),
+        (r#"a᷺̖᪹֚b"#, r#"a᷺̖᪹֚b"#, r#"a᷺̖᪹֚b"#, r#"a᷺̖᪹֚b"#, r#"a᷺̖᪹֚b"#),
+        (r#"a᷺᪹̖֚b"#, r#"a᷺᪹̖֚b"#, r#"a᷺᪹̖֚b"#, r#"a᷺᪹̖֚b"#, r#"a᷺᪹̖֚b"#),
+        (r#"a᷺̖᪺֚b"#, r#"a᷺̖᪺֚b"#, r#"a᷺̖᪺֚b"#, r#"a᷺̖᪺֚b"#, r#"a᷺̖᪺֚b"#),
+        (r#"a᷺᪺̖֚b"#, r#"a᷺᪺̖֚b"#, r#"a᷺᪺̖֚b"#, r#"a᷺᪺̖֚b"#, r#"a᷺᪺̖֚b"#),
+        (r#"à֮᪻̕b"#, r#"à֮᪻̕b"#, r#"à֮᪻̕b"#, r#"à֮᪻̕b"#, r#"à֮᪻̕b"#),
+        (r#"a֮᪻̀̕b"#, r#"a֮᪻̀̕b"#, r#"a֮᪻̀̕b"#, r#"a֮᪻̀̕b"#, r#"a֮᪻̀̕b"#),
+        (r#"à֮᪼̕b"#, r#"à֮᪼̕b"#, r#"à֮᪼̕b"#, r#"à֮᪼̕b"#, r#"à֮᪼̕b"#),
+        (r#"a֮᪼̀̕b"#, r#"a֮᪼̀̕b"#, r#"a֮᪼̀̕b"#, r#"a֮᪼̀̕b"#, r#"a֮᪼̀̕b"#),
+        (r#"a᷺̖᪽֚b"#, r#"a᷺̖᪽֚b"#, r#"a᷺̖᪽֚b"#, r#"a᷺̖᪽֚b"#, r#"a᷺̖᪽֚b"#),
+        (r#"a᷺᪽̖֚b"#, r#"a᷺᪽̖֚b"#, r#"a᷺᪽̖֚b"#, r#"a᷺᪽̖֚b"#, r#"a᷺᪽̖֚b"#),
+        (r#"a᷺̖ᪿ֚b"#, r#"a᷺̖ᪿ֚b"#, r#"a᷺̖ᪿ֚b"#, r#"a᷺̖ᪿ֚b"#, r#"a᷺̖ᪿ֚b"#),
+        (r#"a᷺ᪿ̖֚b"#, r#"a᷺ᪿ̖֚b"#, r#"a᷺ᪿ̖֚b"#, r#"a᷺ᪿ̖֚b"#, r#"a᷺ᪿ̖֚b"#),
+        (r#"a᷺̖ᫀ֚b"#, r#"a᷺̖ᫀ֚b"#, r#"a᷺̖ᫀ֚b"#, r#"a᷺̖ᫀ֚b"#, r#"a᷺̖ᫀ֚b"#),
+        (r#"a᷺ᫀ̖֚b"#, r#"a᷺ᫀ̖֚b"#, r#"a᷺ᫀ̖֚b"#, r#"a᷺ᫀ̖֚b"#, r#"a᷺ᫀ̖֚b"#),
+        (r#"à֮᫁̕b"#, r#"à֮᫁̕b"#, r#"à֮᫁̕b"#, r#"à֮᫁̕b"#, r#"à֮᫁̕b"#),
+        (r#"a֮᫁̀̕b"#, r#"a֮᫁̀̕b"#, r#"a֮᫁̀̕b"#, r#"a֮᫁̀̕b"#, r#"a֮᫁̀̕b"#),
+        (r#"à֮᫂̕b"#, r#"à֮᫂̕b"#, r#"à֮᫂̕b"#, r#"à֮᫂̕b"#, r#"à֮᫂̕b"#),
+        (r#"a֮᫂̀̕b"#, r#"a֮᫂̀̕b"#, r#"a֮᫂̀̕b"#, r#"a֮᫂̀̕b"#, r#"a֮᫂̀̕b"#),
+        (r#"a᷺̖᫃֚b"#, r#"a᷺̖᫃֚b"#, r#"a᷺̖᫃֚b"#, r#"a᷺̖᫃֚b"#, r#"a᷺̖᫃֚b"#),
+        (r#"a᷺᫃̖֚b"#, r#"a᷺᫃̖֚b"#, r#"a᷺᫃̖֚b"#, r#"a᷺᫃̖֚b"#, r#"a᷺᫃̖֚b"#),
+        (r#"a᷺̖᫄֚b"#, r#"a᷺̖᫄֚b"#, r#"a᷺̖᫄֚b"#, r#"a᷺̖᫄֚b"#, r#"a᷺̖᫄֚b"#),
+        (r#"a᷺᫄̖֚b"#, r#"a᷺᫄̖֚b"#, r#"a᷺᫄̖֚b"#, r#"a᷺᫄̖֚b"#, r#"a᷺᫄̖֚b"#),
+        (r#"à֮᫅̕b"#, r#"à֮᫅̕b"#, r#"à֮᫅̕b"#, r#"à֮᫅̕b"#, r#"à֮᫅̕b"#),
+        (r#"a֮᫅̀̕b"#, r#"a֮᫅̀̕b"#, r#"a֮᫅̀̕b"#, r#"a֮᫅̀̕b"#, r#"a֮᫅̀̕b"#),
+        (r#"à֮᫆̕b"#, r#"à֮᫆̕b"#, r#"à֮᫆̕b"#, r#"à֮᫆̕b"#, r#"à֮᫆̕b"#),
+        (r#"a֮᫆̀̕b"#, r#"a֮᫆̀̕b"#, r#"a֮᫆̀̕b"#, r#"a֮᫆̀̕b"#, r#"a֮᫆̀̕b"#),
+        (r#"à֮᫇̕b"#, r#"à֮᫇̕b"#, r#"à֮᫇̕b"#, r#"à֮᫇̕b"#, r#"à֮᫇̕b"#),
+        (r#"a֮᫇̀̕b"#, r#"a֮᫇̀̕b"#, r#"a֮᫇̀̕b"#, r#"a֮᫇̀̕b"#, r#"a֮᫇̀̕b"#),
+        (r#"à֮᫈̕b"#, r#"à֮᫈̕b"#, r#"à֮᫈̕b"#, r#"à֮᫈̕b"#, r#"à֮᫈̕b"#),
+        (r#"a֮᫈̀̕b"#, r#"a֮᫈̀̕b"#, r#"a֮᫈̀̕b"#, r#"a֮᫈̀̕b"#, r#"a֮᫈̀̕b"#),
+        (r#"à֮᫉̕b"#, r#"à֮᫉̕b"#, r#"à֮᫉̕b"#, r#"à֮᫉̕b"#, r#"à֮᫉̕b"#),
+        (r#"a֮᫉̀̕b"#, r#"a֮᫉̀̕b"#, r#"a֮᫉̀̕b"#, r#"a֮᫉̀̕b"#, r#"a֮᫉̀̕b"#),
+        (r#"a᷺̖᫊֚b"#, r#"a᷺̖᫊֚b"#, r#"a᷺̖᫊֚b"#, r#"a᷺̖᫊֚b"#, r#"a᷺̖᫊֚b"#),
+        (r#"a᷺᫊̖֚b"#, r#"a᷺᫊̖֚b"#, r#"a᷺᫊̖֚b"#, r#"a᷺᫊̖֚b"#, r#"a᷺᫊̖֚b"#),
+        (r#"à֮᫋̕b"#, r#"à֮᫋̕b"#, r#"à֮᫋̕b"#, r#"à֮᫋̕b"#, r#"à֮᫋̕b"#),
+        (r#"a֮᫋̀̕b"#, r#"a֮᫋̀̕b"#, r#"a֮᫋̀̕b"#, r#"a֮᫋̀̕b"#, r#"a֮᫋̀̕b"#),
+        (r#"à֮ᫌ̕b"#, r#"à֮ᫌ̕b"#, r#"à֮ᫌ̕b"#, r#"à֮ᫌ̕b"#, r#"à֮ᫌ̕b"#),
+        (r#"a֮ᫌ̀̕b"#, r#"a֮ᫌ̀̕b"#, r#"a֮ᫌ̀̕b"#, r#"a֮ᫌ̀̕b"#, r#"a֮ᫌ̀̕b"#),
+        (r#"à֮ᫍ̕b"#, r#"à֮ᫍ̕b"#, r#"à֮ᫍ̕b"#, r#"à֮ᫍ̕b"#, r#"à֮ᫍ̕b"#),
+        (r#"a֮ᫍ̀̕b"#, r#"a֮ᫍ̀̕b"#, r#"a֮ᫍ̀̕b"#, r#"a֮ᫍ̀̕b"#, r#"a֮ᫍ̀̕b"#),
+        (r#"à֮ᫎ̕b"#, r#"à֮ᫎ̕b"#, r#"à֮ᫎ̕b"#, r#"à֮ᫎ̕b"#, r#"à֮ᫎ̕b"#),
+        (r#"a֮ᫎ̀̕b"#, r#"a֮ᫎ̀̕b"#, r#"a֮ᫎ̀̕b"#, r#"a֮ᫎ̀̕b"#, r#"a֮ᫎ̀̕b"#),
+        (r#"a𖿰़᬴゙b"#, r#"a𖿰़᬴゙b"#, r#"a𖿰़᬴゙b"#, r#"a𖿰़᬴゙b"#, r#"a𖿰़᬴゙b"#),
+        (r#"a𖿰᬴़゙b"#, r#"a𖿰᬴़゙b"#, r#"a𖿰᬴़゙b"#, r#"a𖿰᬴़゙b"#, r#"a𖿰᬴़゙b"#),
+        (r#"a゙्᭄ְb"#, r#"a゙्᭄ְb"#, r#"a゙्᭄ְb"#, r#"a゙्᭄ְb"#, r#"a゙्᭄ְb"#),
+        (r#"a゙᭄्ְb"#, r#"a゙᭄्ְb"#, r#"a゙᭄्ְb"#, r#"a゙᭄्ְb"#, r#"a゙᭄्ְb"#),
+        (r#"à֮᭫̕b"#, r#"à֮᭫̕b"#, r#"à֮᭫̕b"#, r#"à֮᭫̕b"#, r#"à֮᭫̕b"#),
+        (r#"a֮᭫̀̕b"#, r#"a֮᭫̀̕b"#, r#"a֮᭫̀̕b"#, r#"a֮᭫̀̕b"#, r#"a֮᭫̀̕b"#),
+        (r#"a᷺̖᭬֚b"#, r#"a᷺̖᭬֚b"#, r#"a᷺̖᭬֚b"#, r#"a᷺̖᭬֚b"#, r#"a᷺̖᭬֚b"#),
+        (r#"a᷺᭬̖֚b"#, r#"a᷺᭬̖֚b"#, r#"a᷺᭬̖֚b"#, r#"a᷺᭬̖֚b"#, r#"a᷺᭬̖֚b"#),
+        (r#"à֮᭭̕b"#, r#"à֮᭭̕b"#, r#"à֮᭭̕b"#, r#"à֮᭭̕b"#, r#"à֮᭭̕b"#),
+        (r#"a֮᭭̀̕b"#, r#"a֮᭭̀̕b"#, r#"a֮᭭̀̕b"#, r#"a֮᭭̀̕b"#, r#"a֮᭭̀̕b"#),
+        (r#"à֮᭮̕b"#, r#"à֮᭮̕b"#, r#"à֮᭮̕b"#, r#"à֮᭮̕b"#, r#"à֮᭮̕b"#),
+        (r#"a֮᭮̀̕b"#, r#"a֮᭮̀̕b"#, r#"a֮᭮̀̕b"#, r#"a֮᭮̀̕b"#, r#"a֮᭮̀̕b"#),
+        (r#"à֮᭯̕b"#, r#"à֮᭯̕b"#, r#"à֮᭯̕b"#, r#"à֮᭯̕b"#, r#"à֮᭯̕b"#),
+        (r#"a֮᭯̀̕b"#, r#"a֮᭯̀̕b"#, r#"a֮᭯̀̕b"#, r#"a֮᭯̀̕b"#, r#"a֮᭯̀̕b"#),
+        (r#"à֮᭰̕b"#, r#"à֮᭰̕b"#, r#"à֮᭰̕b"#, r#"à֮᭰̕b"#, r#"à֮᭰̕b"#),
+        (r#"a֮᭰̀̕b"#, r#"a֮᭰̀̕b"#, r#"a֮᭰̀̕b"#, r#"a֮᭰̀̕b"#, r#"a֮᭰̀̕b"#),
+        (r#"à֮᭱̕b"#, r#"à֮᭱̕b"#, r#"à֮᭱̕b"#, r#"à֮᭱̕b"#, r#"à֮᭱̕b"#),
+        (r#"a֮᭱̀̕b"#, r#"a֮᭱̀̕b"#, r#"a֮᭱̀̕b"#, r#"a֮᭱̀̕b"#, r#"a֮᭱̀̕b"#),
+        (r#"à֮᭲̕b"#, r#"à֮᭲̕b"#, r#"à֮᭲̕b"#, r#"à֮᭲̕b"#, r#"à֮᭲̕b"#),
+        (r#"a֮᭲̀̕b"#, r#"a֮᭲̀̕b"#, r#"a֮᭲̀̕b"#, r#"a֮᭲̀̕b"#, r#"a֮᭲̀̕b"#),
+        (r#"à֮᭳̕b"#, r#"à֮᭳̕b"#, r#"à֮᭳̕b"#, r#"à֮᭳̕b"#, r#"à֮᭳̕b"#),
+        (r#"a֮᭳̀̕b"#, r#"a֮᭳̀̕b"#, r#"a֮᭳̀̕b"#, r#"a֮᭳̀̕b"#, r#"a֮᭳̀̕b"#),
+        (r#"a゙्᮪ְb"#, r#"a゙्᮪ְb"#, r#"a゙्᮪ְb"#, r#"a゙्᮪ְb"#, r#"a゙्᮪ְb"#),
+        (r#"a゙᮪्ְb"#, r#"a゙᮪्ְb"#, r#"a゙᮪्ְb"#, r#"a゙᮪्ְb"#, r#"a゙᮪्ְb"#),
+        (r#"a゙्᮫ְb"#, r#"a゙्᮫ְb"#, r#"a゙्᮫ְb"#, r#"a゙्᮫ְb"#, r#"a゙्᮫ְb"#),
+        (r#"a゙᮫्ְb"#, r#"a゙᮫्ְb"#, r#"a゙᮫्ְb"#, r#"a゙᮫्ְb"#, r#"a゙᮫्ְb"#),
+        (r#"a𖿰़᯦゙b"#, r#"a𖿰़᯦゙b"#, r#"a𖿰़᯦゙b"#, r#"a𖿰़᯦゙b"#, r#"a𖿰़᯦゙b"#),
+        (r#"a𖿰᯦़゙b"#, r#"a𖿰᯦़゙b"#, r#"a𖿰᯦़゙b"#, r#"a𖿰᯦़゙b"#, r#"a𖿰᯦़゙b"#),
+        (r#"a゙्᯲ְb"#, r#"a゙्᯲ְb"#, r#"a゙्᯲ְb"#, r#"a゙्᯲ְb"#, r#"a゙्᯲ְb"#),
+        (r#"a゙᯲्ְb"#, r#"a゙᯲्ְb"#, r#"a゙᯲्ְb"#, r#"a゙᯲्ְb"#, r#"a゙᯲्ְb"#),
+        (r#"a゙्᯳ְb"#, r#"a゙्᯳ְb"#, r#"a゙्᯳ְb"#, r#"a゙्᯳ְb"#, r#"a゙्᯳ְb"#),
+        (r#"a゙᯳्ְb"#, r#"a゙᯳्ְb"#, r#"a゙᯳्ְb"#, r#"a゙᯳्ְb"#, r#"a゙᯳्ְb"#),
+        (r#"a𖿰़᰷゙b"#, r#"a𖿰़᰷゙b"#, r#"a𖿰़᰷゙b"#, r#"a𖿰़᰷゙b"#, r#"a𖿰़᰷゙b"#),
+        (r#"a𖿰᰷़゙b"#, r#"a𖿰᰷़゙b"#, r#"a𖿰᰷़゙b"#, r#"a𖿰᰷़゙b"#, r#"a𖿰᰷़゙b"#),
+        (r#"à֮᳐̕b"#, r#"à֮᳐̕b"#, r#"à֮᳐̕b"#, r#"à֮᳐̕b"#, r#"à֮᳐̕b"#),
+        (r#"a֮᳐̀̕b"#, r#"a֮᳐̀̕b"#, r#"a֮᳐̀̕b"#, r#"a֮᳐̀̕b"#, r#"a֮᳐̀̕b"#),
+        (r#"à֮᳑̕b"#, r#"à֮᳑̕b"#, r#"à֮᳑̕b"#, r#"à֮᳑̕b"#, r#"à֮᳑̕b"#),
+        (r#"a֮᳑̀̕b"#, r#"a֮᳑̀̕b"#, r#"a֮᳑̀̕b"#, r#"a֮᳑̀̕b"#, r#"a֮᳑̀̕b"#),
+        (r#"à֮᳒̕b"#, r#"à֮᳒̕b"#, r#"à֮᳒̕b"#, r#"à֮᳒̕b"#, r#"à֮᳒̕b"#),
+        (r#"a֮᳒̀̕b"#, r#"a֮᳒̀̕b"#, r#"a֮᳒̀̕b"#, r#"a֮᳒̀̕b"#, r#"a֮᳒̀̕b"#),
+        (r#"a̴᳔𖿰b"#, r#"a̴᳔𖿰b"#, r#"a̴᳔𖿰b"#, r#"a̴᳔𖿰b"#, r#"a̴᳔𖿰b"#),
+        (r#"a᳔̴𖿰b"#, r#"a᳔̴𖿰b"#, r#"a᳔̴𖿰b"#, r#"a᳔̴𖿰b"#, r#"a᳔̴𖿰b"#),
+        (r#"a᷺̖᳕֚b"#, r#"a᷺̖᳕֚b"#, r#"a᷺̖᳕֚b"#, r#"a᷺̖᳕֚b"#, r#"a᷺̖᳕֚b"#),
+        (r#"a᷺᳕̖֚b"#, r#"a᷺᳕̖֚b"#, r#"a᷺᳕̖֚b"#, r#"a᷺᳕̖֚b"#, r#"a᷺᳕̖֚b"#),
+        (r#"a᷺̖᳖֚b"#, r#"a᷺̖᳖֚b"#, r#"a᷺̖᳖֚b"#, r#"a᷺̖᳖֚b"#, r#"a᷺̖᳖֚b"#),
+        (r#"a᷺᳖̖֚b"#, r#"a᷺᳖̖֚b"#, r#"a᷺᳖̖֚b"#, r#"a᷺᳖̖֚b"#, r#"a᷺᳖̖֚b"#),
+        (r#"a᷺̖᳗֚b"#, r#"a᷺̖᳗֚b"#, r#"a᷺̖᳗֚b"#, r#"a᷺̖᳗֚b"#, r#"a᷺̖᳗֚b"#),
+        (r#"a᷺᳗̖֚b"#, r#"a᷺᳗̖֚b"#, r#"a᷺᳗̖֚b"#, r#"a᷺᳗̖֚b"#, r#"a᷺᳗̖֚b"#),
+        (r#"a᷺̖᳘֚b"#, r#"a᷺̖᳘֚b"#, r#"a᷺̖᳘֚b"#, r#"a᷺̖᳘֚b"#, r#"a᷺̖᳘֚b"#),
+        (r#"a᷺᳘̖֚b"#, r#"a᷺᳘̖֚b"#, r#"a᷺᳘̖֚b"#, r#"a᷺᳘̖֚b"#, r#"a᷺᳘̖֚b"#),
+        (r#"a᷺̖᳙֚b"#, r#"a᷺̖᳙֚b"#, r#"a᷺̖᳙֚b"#, r#"a᷺̖᳙֚b"#, r#"a᷺̖᳙֚b"#),
+        (r#"a᷺᳙̖֚b"#, r#"a᷺᳙̖֚b"#, r#"a᷺᳙̖֚b"#, r#"a᷺᳙̖֚b"#, r#"a᷺᳙̖֚b"#),
+        (r#"à֮᳚̕b"#, r#"à֮᳚̕b"#, r#"à֮᳚̕b"#, r#"à֮᳚̕b"#, r#"à֮᳚̕b"#),
+        (r#"a֮᳚̀̕b"#, r#"a֮᳚̀̕b"#, r#"a֮᳚̀̕b"#, r#"a֮᳚̀̕b"#, r#"a֮᳚̀̕b"#),
+        (r#"à֮᳛̕b"#, r#"à֮᳛̕b"#, r#"à֮᳛̕b"#, r#"à֮᳛̕b"#, r#"à֮᳛̕b"#),
+        (r#"a֮᳛̀̕b"#, r#"a֮᳛̀̕b"#, r#"a֮᳛̀̕b"#, r#"a֮᳛̀̕b"#, r#"a֮᳛̀̕b"#),
+        (r#"a᷺̖᳜֚b"#, r#"a᷺̖᳜֚b"#, r#"a᷺̖᳜֚b"#, r#"a᷺̖᳜֚b"#, r#"a᷺̖᳜֚b"#),
+        (r#"a᷺᳜̖֚b"#, r#"a᷺᳜̖֚b"#, r#"a᷺᳜̖֚b"#, r#"a᷺᳜̖֚b"#, r#"a᷺᳜̖֚b"#),
+        (r#"a᷺̖᳝֚b"#, r#"a᷺̖᳝֚b"#, r#"a᷺̖᳝֚b"#, r#"a᷺̖᳝֚b"#, r#"a᷺̖᳝֚b"#),
+        (r#"a᷺᳝̖֚b"#, r#"a᷺᳝̖֚b"#, r#"a᷺᳝̖֚b"#, r#"a᷺᳝̖֚b"#, r#"a᷺᳝̖֚b"#),
+        (r#"a᷺̖᳞֚b"#, r#"a᷺̖᳞֚b"#, r#"a᷺̖᳞֚b"#, r#"a᷺̖᳞֚b"#, r#"a᷺̖᳞֚b"#),
+        (r#"a᷺᳞̖֚b"#, r#"a᷺᳞̖֚b"#, r#"a᷺᳞̖֚b"#, r#"a᷺᳞̖֚b"#, r#"a᷺᳞̖֚b"#),
+        (r#"a᷺̖᳟֚b"#, r#"a᷺̖᳟֚b"#, r#"a᷺̖᳟֚b"#, r#"a᷺̖᳟֚b"#, r#"a᷺̖᳟֚b"#),
+        (r#"a᷺᳟̖֚b"#, r#"a᷺᳟̖֚b"#, r#"a᷺᳟̖֚b"#, r#"a᷺᳟̖֚b"#, r#"a᷺᳟̖֚b"#),
+        (r#"à֮᳠̕b"#, r#"à֮᳠̕b"#, r#"à֮᳠̕b"#, r#"à֮᳠̕b"#, r#"à֮᳠̕b"#),
+        (r#"a֮᳠̀̕b"#, r#"a֮᳠̀̕b"#, r#"a֮᳠̀̕b"#, r#"a֮᳠̀̕b"#, r#"a֮᳠̀̕b"#),
+        (r#"a̴᳢𖿰b"#, r#"a̴᳢𖿰b"#, r#"a̴᳢𖿰b"#, r#"a̴᳢𖿰b"#, r#"a̴᳢𖿰b"#),
+        (r#"a᳢̴𖿰b"#, r#"a᳢̴𖿰b"#, r#"a᳢̴𖿰b"#, r#"a᳢̴𖿰b"#, r#"a᳢̴𖿰b"#),
+        (r#"a̴᳣𖿰b"#, r#"a̴᳣𖿰b"#, r#"a̴᳣𖿰b"#, r#"a̴᳣𖿰b"#, r#"a̴᳣𖿰b"#),
+        (r#"a᳣̴𖿰b"#, r#"a᳣̴𖿰b"#, r#"a᳣̴𖿰b"#, r#"a᳣̴𖿰b"#, r#"a᳣̴𖿰b"#),
+        (r#"a̴᳤𖿰b"#, r#"a̴᳤𖿰b"#, r#"a̴᳤𖿰b"#, r#"a̴᳤𖿰b"#, r#"a̴᳤𖿰b"#),
+        (r#"a᳤̴𖿰b"#, r#"a᳤̴𖿰b"#, r#"a᳤̴𖿰b"#, r#"a᳤̴𖿰b"#, r#"a᳤̴𖿰b"#),
+        (r#"a̴᳥𖿰b"#, r#"a̴᳥𖿰b"#, r#"a̴᳥𖿰b"#, r#"a̴᳥𖿰b"#, r#"a̴᳥𖿰b"#),
+        (r#"a᳥̴𖿰b"#, r#"a᳥̴𖿰b"#, r#"a᳥̴𖿰b"#, r#"a᳥̴𖿰b"#, r#"a᳥̴𖿰b"#),
+        (r#"a̴᳦𖿰b"#, r#"a̴᳦𖿰b"#, r#"a̴᳦𖿰b"#, r#"a̴᳦𖿰b"#, r#"a̴᳦𖿰b"#),
+        (r#"a᳦̴𖿰b"#, r#"a᳦̴𖿰b"#, r#"a᳦̴𖿰b"#, r#"a᳦̴𖿰b"#, r#"a᳦̴𖿰b"#),
+        (r#"a̴᳧𖿰b"#, r#"a̴᳧𖿰b"#, r#"a̴᳧𖿰b"#, r#"a̴᳧𖿰b"#, r#"a̴᳧𖿰b"#),
+        (r#"a᳧̴𖿰b"#, r#"a᳧̴𖿰b"#, r#"a᳧̴𖿰b"#, r#"a᳧̴𖿰b"#, r#"a᳧̴𖿰b"#),
+        (r#"a̴᳨𖿰b"#, r#"a̴᳨𖿰b"#, r#"a̴᳨𖿰b"#, r#"a̴᳨𖿰b"#, r#"a̴᳨𖿰b"#),
+        (r#"a᳨̴𖿰b"#, r#"a᳨̴𖿰b"#, r#"a᳨̴𖿰b"#, r#"a᳨̴𖿰b"#, r#"a᳨̴𖿰b"#),
+        (r#"a᷺̖᳭֚b"#, r#"a᷺̖᳭֚b"#, r#"a᷺̖᳭֚b"#, r#"a᷺̖᳭֚b"#, r#"a᷺̖᳭֚b"#),
+        (r#"a᷺᳭̖֚b"#, r#"a᷺᳭̖֚b"#, r#"a᷺᳭̖֚b"#, r#"a᷺᳭̖֚b"#, r#"a᷺᳭̖֚b"#),
+        (r#"à֮᳴̕b"#, r#"à֮᳴̕b"#, r#"à֮᳴̕b"#, r#"à֮᳴̕b"#, r#"à֮᳴̕b"#),
+        (r#"a֮᳴̀̕b"#, r#"a֮᳴̀̕b"#, r#"a֮᳴̀̕b"#, r#"a֮᳴̀̕b"#, r#"a֮᳴̀̕b"#),
+        (r#"à֮᳸̕b"#, r#"à֮᳸̕b"#, r#"à֮᳸̕b"#, r#"à֮᳸̕b"#, r#"à֮᳸̕b"#),
+        (r#"a֮᳸̀̕b"#, r#"a֮᳸̀̕b"#, r#"a֮᳸̀̕b"#, r#"a֮᳸̀̕b"#, r#"a֮᳸̀̕b"#),
+        (r#"à֮᳹̕b"#, r#"à֮᳹̕b"#, r#"à֮᳹̕b"#, r#"à֮᳹̕b"#, r#"à֮᳹̕b"#),
+        (r#"a֮᳹̀̕b"#, r#"a֮᳹̀̕b"#, r#"a֮᳹̀̕b"#, r#"a֮᳹̀̕b"#, r#"a֮᳹̀̕b"#),
+        (r#"à֮᷀̕b"#, r#"à֮᷀̕b"#, r#"à֮᷀̕b"#, r#"à֮᷀̕b"#, r#"à֮᷀̕b"#),
+        (r#"a֮᷀̀̕b"#, r#"a֮᷀̀̕b"#, r#"a֮᷀̀̕b"#, r#"a֮᷀̀̕b"#, r#"a֮᷀̀̕b"#),
+        (r#"à֮᷁̕b"#, r#"à֮᷁̕b"#, r#"à֮᷁̕b"#, r#"à֮᷁̕b"#, r#"à֮᷁̕b"#),
+        (r#"a֮᷁̀̕b"#, r#"a֮᷁̀̕b"#, r#"a֮᷁̀̕b"#, r#"a֮᷁̀̕b"#, r#"a֮᷁̀̕b"#),
+        (r#"a᷺̖᷂֚b"#, r#"a᷺̖᷂֚b"#, r#"a᷺̖᷂֚b"#, r#"a᷺̖᷂֚b"#, r#"a᷺̖᷂֚b"#),
+        (r#"a᷺᷂̖֚b"#, r#"a᷺᷂̖֚b"#, r#"a᷺᷂̖֚b"#, r#"a᷺᷂̖֚b"#, r#"a᷺᷂̖֚b"#),
+        (r#"à֮᷃̕b"#, r#"à֮᷃̕b"#, r#"à֮᷃̕b"#, r#"à֮᷃̕b"#, r#"à֮᷃̕b"#),
+        (r#"a֮᷃̀̕b"#, r#"a֮᷃̀̕b"#, r#"a֮᷃̀̕b"#, r#"a֮᷃̀̕b"#, r#"a֮᷃̀̕b"#),
+        (r#"à֮᷄̕b"#, r#"à֮᷄̕b"#, r#"à֮᷄̕b"#, r#"à֮᷄̕b"#, r#"à֮᷄̕b"#),
+        (r#"a֮᷄̀̕b"#, r#"a֮᷄̀̕b"#, r#"a֮᷄̀̕b"#, r#"a֮᷄̀̕b"#, r#"a֮᷄̀̕b"#),
+        (r#"à֮᷅̕b"#, r#"à֮᷅̕b"#, r#"à֮᷅̕b"#, r#"à֮᷅̕b"#, r#"à֮᷅̕b"#),
+        (r#"a֮᷅̀̕b"#, r#"a֮᷅̀̕b"#, r#"a֮᷅̀̕b"#, r#"a֮᷅̀̕b"#, r#"a֮᷅̀̕b"#),
+        (r#"à֮᷆̕b"#, r#"à֮᷆̕b"#, r#"à֮᷆̕b"#, r#"à֮᷆̕b"#, r#"à֮᷆̕b"#),
+        (r#"a֮᷆̀̕b"#, r#"a֮᷆̀̕b"#, r#"a֮᷆̀̕b"#, r#"a֮᷆̀̕b"#, r#"a֮᷆̀̕b"#),
+        (r#"à֮᷇̕b"#, r#"à֮᷇̕b"#, r#"à֮᷇̕b"#, r#"à֮᷇̕b"#, r#"à֮᷇̕b"#),
+        (r#"a֮᷇̀̕b"#, r#"a֮᷇̀̕b"#, r#"a֮᷇̀̕b"#, r#"a֮᷇̀̕b"#, r#"a֮᷇̀̕b"#),
+        (r#"à֮᷈̕b"#, r#"à֮᷈̕b"#, r#"à֮᷈̕b"#, r#"à֮᷈̕b"#, r#"à֮᷈̕b"#),
+        (r#"a֮᷈̀̕b"#, r#"a֮᷈̀̕b"#, r#"a֮᷈̀̕b"#, r#"a֮᷈̀̕b"#, r#"a֮᷈̀̕b"#),
+        (r#"à֮᷉̕b"#, r#"à֮᷉̕b"#, r#"à֮᷉̕b"#, r#"à֮᷉̕b"#, r#"à֮᷉̕b"#),
+        (r#"a֮᷉̀̕b"#, r#"a֮᷉̀̕b"#, r#"a֮᷉̀̕b"#, r#"a֮᷉̀̕b"#, r#"a֮᷉̀̕b"#),
+        (r#"a᷺̖᷊֚b"#, r#"a᷺̖᷊֚b"#, r#"a᷺̖᷊֚b"#, r#"a᷺̖᷊֚b"#, r#"a᷺̖᷊֚b"#),
+        (r#"a᷺᷊̖֚b"#, r#"a᷺᷊̖֚b"#, r#"a᷺᷊̖֚b"#, r#"a᷺᷊̖֚b"#, r#"a᷺᷊̖֚b"#),
+        (r#"à֮᷋̕b"#, r#"à֮᷋̕b"#, r#"à֮᷋̕b"#, r#"à֮᷋̕b"#, r#"à֮᷋̕b"#),
+        (r#"a֮᷋̀̕b"#, r#"a֮᷋̀̕b"#, r#"a֮᷋̀̕b"#, r#"a֮᷋̀̕b"#, r#"a֮᷋̀̕b"#),
+        (r#"à֮᷌̕b"#, r#"à֮᷌̕b"#, r#"à֮᷌̕b"#, r#"à֮᷌̕b"#, r#"à֮᷌̕b"#),
+        (r#"a֮᷌̀̕b"#, r#"a֮᷌̀̕b"#, r#"a֮᷌̀̕b"#, r#"a֮᷌̀̕b"#, r#"a֮᷌̀̕b"#),
+        (r#"a͜͝᷍ͅb"#, r#"a͜͝᷍ͅb"#, r#"a͜͝᷍ͅb"#, r#"a͜͝᷍ͅb"#, r#"a͜͝᷍ͅb"#),
+        (r#"a͜᷍͝ͅb"#, r#"a͜᷍͝ͅb"#, r#"a͜᷍͝ͅb"#, r#"a͜᷍͝ͅb"#, r#"a͜᷍͝ͅb"#),
+        (r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#),
+        (r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#, r#"a̡᷎᷎̛b"#),
+        (r#"a᷺̖᷏֚b"#, r#"a᷺̖᷏֚b"#, r#"a᷺̖᷏֚b"#, r#"a᷺̖᷏֚b"#, r#"a᷺̖᷏֚b"#),
+        (r#"a᷺᷏̖֚b"#, r#"a᷺᷏̖֚b"#, r#"a᷺᷏̖֚b"#, r#"a᷺᷏̖֚b"#, r#"a᷺᷏̖֚b"#),
+        (r#"aུ̡᷐᷎b"#, r#"aུ̡᷐᷎b"#, r#"aུ̡᷐᷎b"#, r#"aུ̡᷐᷎b"#, r#"aུ̡᷐᷎b"#),
+        (r#"aུ᷐̡᷎b"#, r#"aུ᷐̡᷎b"#, r#"aུ᷐̡᷎b"#, r#"aུ᷐̡᷎b"#, r#"aུ᷐̡᷎b"#),
+        (r#"à֮᷑̕b"#, r#"à֮᷑̕b"#, r#"à֮᷑̕b"#, r#"à֮᷑̕b"#, r#"à֮᷑̕b"#),
+        (r#"a֮᷑̀̕b"#, r#"a֮᷑̀̕b"#, r#"a֮᷑̀̕b"#, r#"a֮᷑̀̕b"#, r#"a֮᷑̀̕b"#),
+        (r#"à֮᷒̕b"#, r#"à֮᷒̕b"#, r#"à֮᷒̕b"#, r#"à֮᷒̕b"#, r#"à֮᷒̕b"#),
+        (r#"a֮᷒̀̕b"#, r#"a֮᷒̀̕b"#, r#"a֮᷒̀̕b"#, r#"a֮᷒̀̕b"#, r#"a֮᷒̀̕b"#),
+        (r#"à֮ᷓ̕b"#, r#"à֮ᷓ̕b"#, r#"à֮ᷓ̕b"#, r#"à֮ᷓ̕b"#, r#"à֮ᷓ̕b"#),
+        (r#"a֮ᷓ̀̕b"#, r#"a֮ᷓ̀̕b"#, r#"a֮ᷓ̀̕b"#, r#"a֮ᷓ̀̕b"#, r#"a֮ᷓ̀̕b"#),
+        (r#"à֮ᷔ̕b"#, r#"à֮ᷔ̕b"#, r#"à֮ᷔ̕b"#, r#"à֮ᷔ̕b"#, r#"à֮ᷔ̕b"#),
+        (r#"a֮ᷔ̀̕b"#, r#"a֮ᷔ̀̕b"#, r#"a֮ᷔ̀̕b"#, r#"a֮ᷔ̀̕b"#, r#"a֮ᷔ̀̕b"#),
+        (r#"à֮ᷕ̕b"#, r#"à֮ᷕ̕b"#, r#"à֮ᷕ̕b"#, r#"à֮ᷕ̕b"#, r#"à֮ᷕ̕b"#),
+        (r#"a֮ᷕ̀̕b"#, r#"a֮ᷕ̀̕b"#, r#"a֮ᷕ̀̕b"#, r#"a֮ᷕ̀̕b"#, r#"a֮ᷕ̀̕b"#),
+        (r#"à֮ᷖ̕b"#, r#"à֮ᷖ̕b"#, r#"à֮ᷖ̕b"#, r#"à֮ᷖ̕b"#, r#"à֮ᷖ̕b"#),
+        (r#"a֮ᷖ̀̕b"#, r#"a֮ᷖ̀̕b"#, r#"a֮ᷖ̀̕b"#, r#"a֮ᷖ̀̕b"#, r#"a֮ᷖ̀̕b"#),
+        (r#"à֮ᷗ̕b"#, r#"à֮ᷗ̕b"#, r#"à֮ᷗ̕b"#, r#"à֮ᷗ̕b"#, r#"à֮ᷗ̕b"#),
+        (r#"a֮ᷗ̀̕b"#, r#"a֮ᷗ̀̕b"#, r#"a֮ᷗ̀̕b"#, r#"a֮ᷗ̀̕b"#, r#"a֮ᷗ̀̕b"#),
+        (r#"à֮ᷘ̕b"#, r#"à֮ᷘ̕b"#, r#"à֮ᷘ̕b"#, r#"à֮ᷘ̕b"#, r#"à֮ᷘ̕b"#),
+        (r#"a֮ᷘ̀̕b"#, r#"a֮ᷘ̀̕b"#, r#"a֮ᷘ̀̕b"#, r#"a֮ᷘ̀̕b"#, r#"a֮ᷘ̀̕b"#),
+        (r#"à֮ᷙ̕b"#, r#"à֮ᷙ̕b"#, r#"à֮ᷙ̕b"#, r#"à֮ᷙ̕b"#, r#"à֮ᷙ̕b"#),
+        (r#"a֮ᷙ̀̕b"#, r#"a֮ᷙ̀̕b"#, r#"a֮ᷙ̀̕b"#, r#"a֮ᷙ̀̕b"#, r#"a֮ᷙ̀̕b"#),
+        (r#"à֮ᷚ̕b"#, r#"à֮ᷚ̕b"#, r#"à֮ᷚ̕b"#, r#"à֮ᷚ̕b"#, r#"à֮ᷚ̕b"#),
+        (r#"a֮ᷚ̀̕b"#, r#"a֮ᷚ̀̕b"#, r#"a֮ᷚ̀̕b"#, r#"a֮ᷚ̀̕b"#, r#"a֮ᷚ̀̕b"#),
+        (r#"à֮ᷛ̕b"#, r#"à֮ᷛ̕b"#, r#"à֮ᷛ̕b"#, r#"à֮ᷛ̕b"#, r#"à֮ᷛ̕b"#),
+        (r#"a֮ᷛ̀̕b"#, r#"a֮ᷛ̀̕b"#, r#"a֮ᷛ̀̕b"#, r#"a֮ᷛ̀̕b"#, r#"a֮ᷛ̀̕b"#),
+        (r#"à֮ᷜ̕b"#, r#"à֮ᷜ̕b"#, r#"à֮ᷜ̕b"#, r#"à֮ᷜ̕b"#, r#"à֮ᷜ̕b"#),
+        (r#"a֮ᷜ̀̕b"#, r#"a֮ᷜ̀̕b"#, r#"a֮ᷜ̀̕b"#, r#"a֮ᷜ̀̕b"#, r#"a֮ᷜ̀̕b"#),
+        (r#"à֮ᷝ̕b"#, r#"à֮ᷝ̕b"#, r#"à֮ᷝ̕b"#, r#"à֮ᷝ̕b"#, r#"à֮ᷝ̕b"#),
+        (r#"a֮ᷝ̀̕b"#, r#"a֮ᷝ̀̕b"#, r#"a֮ᷝ̀̕b"#, r#"a֮ᷝ̀̕b"#, r#"a֮ᷝ̀̕b"#),
+        (r#"à֮ᷞ̕b"#, r#"à֮ᷞ̕b"#, r#"à֮ᷞ̕b"#, r#"à֮ᷞ̕b"#, r#"à֮ᷞ̕b"#),
+        (r#"a֮ᷞ̀̕b"#, r#"a֮ᷞ̀̕b"#, r#"a֮ᷞ̀̕b"#, r#"a֮ᷞ̀̕b"#, r#"a֮ᷞ̀̕b"#),
+        (r#"à֮ᷟ̕b"#, r#"à֮ᷟ̕b"#, r#"à֮ᷟ̕b"#, r#"à֮ᷟ̕b"#, r#"à֮ᷟ̕b"#),
+        (r#"a֮ᷟ̀̕b"#, r#"a֮ᷟ̀̕b"#, r#"a֮ᷟ̀̕b"#, r#"a֮ᷟ̀̕b"#, r#"a֮ᷟ̀̕b"#),
+        (r#"à֮ᷠ̕b"#, r#"à֮ᷠ̕b"#, r#"à֮ᷠ̕b"#, r#"à֮ᷠ̕b"#, r#"à֮ᷠ̕b"#),
+        (r#"a֮ᷠ̀̕b"#, r#"a֮ᷠ̀̕b"#, r#"a֮ᷠ̀̕b"#, r#"a֮ᷠ̀̕b"#, r#"a֮ᷠ̀̕b"#),
+        (r#"à֮ᷡ̕b"#, r#"à֮ᷡ̕b"#, r#"à֮ᷡ̕b"#, r#"à֮ᷡ̕b"#, r#"à֮ᷡ̕b"#),
+        (r#"a֮ᷡ̀̕b"#, r#"a֮ᷡ̀̕b"#, r#"a֮ᷡ̀̕b"#, r#"a֮ᷡ̀̕b"#, r#"a֮ᷡ̀̕b"#),
+        (r#"à֮ᷢ̕b"#, r#"à֮ᷢ̕b"#, r#"à֮ᷢ̕b"#, r#"à֮ᷢ̕b"#, r#"à֮ᷢ̕b"#),
+        (r#"a֮ᷢ̀̕b"#, r#"a֮ᷢ̀̕b"#, r#"a֮ᷢ̀̕b"#, r#"a֮ᷢ̀̕b"#, r#"a֮ᷢ̀̕b"#),
+        (r#"à֮ᷣ̕b"#, r#"à֮ᷣ̕b"#, r#"à֮ᷣ̕b"#, r#"à֮ᷣ̕b"#, r#"à֮ᷣ̕b"#),
+        (r#"a֮ᷣ̀̕b"#, r#"a֮ᷣ̀̕b"#, r#"a֮ᷣ̀̕b"#, r#"a֮ᷣ̀̕b"#, r#"a֮ᷣ̀̕b"#),
+        (r#"à֮ᷤ̕b"#, r#"à֮ᷤ̕b"#, r#"à֮ᷤ̕b"#, r#"à֮ᷤ̕b"#, r#"à֮ᷤ̕b"#),
+        (r#"a֮ᷤ̀̕b"#, r#"a֮ᷤ̀̕b"#, r#"a֮ᷤ̀̕b"#, r#"a֮ᷤ̀̕b"#, r#"a֮ᷤ̀̕b"#),
+        (r#"à֮ᷥ̕b"#, r#"à֮ᷥ̕b"#, r#"à֮ᷥ̕b"#, r#"à֮ᷥ̕b"#, r#"à֮ᷥ̕b"#),
+        (r#"a֮ᷥ̀̕b"#, r#"a֮ᷥ̀̕b"#, r#"a֮ᷥ̀̕b"#, r#"a֮ᷥ̀̕b"#, r#"a֮ᷥ̀̕b"#),
+        (r#"à֮ᷦ̕b"#, r#"à֮ᷦ̕b"#, r#"à֮ᷦ̕b"#, r#"à֮ᷦ̕b"#, r#"à֮ᷦ̕b"#),
+        (r#"a֮ᷦ̀̕b"#, r#"a֮ᷦ̀̕b"#, r#"a֮ᷦ̀̕b"#, r#"a֮ᷦ̀̕b"#, r#"a֮ᷦ̀̕b"#),
+        (r#"à֮ᷧ̕b"#, r#"à֮ᷧ̕b"#, r#"à֮ᷧ̕b"#, r#"à֮ᷧ̕b"#, r#"à֮ᷧ̕b"#),
+        (r#"a֮ᷧ̀̕b"#, r#"a֮ᷧ̀̕b"#, r#"a֮ᷧ̀̕b"#, r#"a֮ᷧ̀̕b"#, r#"a֮ᷧ̀̕b"#),
+        (r#"à֮ᷨ̕b"#, r#"à֮ᷨ̕b"#, r#"à֮ᷨ̕b"#, r#"à֮ᷨ̕b"#, r#"à֮ᷨ̕b"#),
+        (r#"a֮ᷨ̀̕b"#, r#"a֮ᷨ̀̕b"#, r#"a֮ᷨ̀̕b"#, r#"a֮ᷨ̀̕b"#, r#"a֮ᷨ̀̕b"#),
+        (r#"à֮ᷩ̕b"#, r#"à֮ᷩ̕b"#, r#"à֮ᷩ̕b"#, r#"à֮ᷩ̕b"#, r#"à֮ᷩ̕b"#),
+        (r#"a֮ᷩ̀̕b"#, r#"a֮ᷩ̀̕b"#, r#"a֮ᷩ̀̕b"#, r#"a֮ᷩ̀̕b"#, r#"a֮ᷩ̀̕b"#),
+        (r#"à֮ᷪ̕b"#, r#"à֮ᷪ̕b"#, r#"à֮ᷪ̕b"#, r#"à֮ᷪ̕b"#, r#"à֮ᷪ̕b"#),
+        (r#"a֮ᷪ̀̕b"#, r#"a֮ᷪ̀̕b"#, r#"a֮ᷪ̀̕b"#, r#"a֮ᷪ̀̕b"#, r#"a֮ᷪ̀̕b"#),
+        (r#"à֮ᷫ̕b"#, r#"à֮ᷫ̕b"#, r#"à֮ᷫ̕b"#, r#"à֮ᷫ̕b"#, r#"à֮ᷫ̕b"#),
+        (r#"a֮ᷫ̀̕b"#, r#"a֮ᷫ̀̕b"#, r#"a֮ᷫ̀̕b"#, r#"a֮ᷫ̀̕b"#, r#"a֮ᷫ̀̕b"#),
+        (r#"à֮ᷬ̕b"#, r#"à֮ᷬ̕b"#, r#"à֮ᷬ̕b"#, r#"à֮ᷬ̕b"#, r#"à֮ᷬ̕b"#),
+        (r#"a֮ᷬ̀̕b"#, r#"a֮ᷬ̀̕b"#, r#"a֮ᷬ̀̕b"#, r#"a֮ᷬ̀̕b"#, r#"a֮ᷬ̀̕b"#),
+        (r#"à֮ᷭ̕b"#, r#"à֮ᷭ̕b"#, r#"à֮ᷭ̕b"#, r#"à֮ᷭ̕b"#, r#"à֮ᷭ̕b"#),
+        (r#"a֮ᷭ̀̕b"#, r#"a֮ᷭ̀̕b"#, r#"a֮ᷭ̀̕b"#, r#"a֮ᷭ̀̕b"#, r#"a֮ᷭ̀̕b"#),
+        (r#"à֮ᷮ̕b"#, r#"à֮ᷮ̕b"#, r#"à֮ᷮ̕b"#, r#"à֮ᷮ̕b"#, r#"à֮ᷮ̕b"#),
+        (r#"a֮ᷮ̀̕b"#, r#"a֮ᷮ̀̕b"#, r#"a֮ᷮ̀̕b"#, r#"a֮ᷮ̀̕b"#, r#"a֮ᷮ̀̕b"#),
+        (r#"à֮ᷯ̕b"#, r#"à֮ᷯ̕b"#, r#"à֮ᷯ̕b"#, r#"à֮ᷯ̕b"#, r#"à֮ᷯ̕b"#),
+        (r#"a֮ᷯ̀̕b"#, r#"a֮ᷯ̀̕b"#, r#"a֮ᷯ̀̕b"#, r#"a֮ᷯ̀̕b"#, r#"a֮ᷯ̀̕b"#),
+        (r#"à֮ᷰ̕b"#, r#"à֮ᷰ̕b"#, r#"à֮ᷰ̕b"#, r#"à֮ᷰ̕b"#, r#"à֮ᷰ̕b"#),
+        (r#"a֮ᷰ̀̕b"#, r#"a֮ᷰ̀̕b"#, r#"a֮ᷰ̀̕b"#, r#"a֮ᷰ̀̕b"#, r#"a֮ᷰ̀̕b"#),
+        (r#"à֮ᷱ̕b"#, r#"à֮ᷱ̕b"#, r#"à֮ᷱ̕b"#, r#"à֮ᷱ̕b"#, r#"à֮ᷱ̕b"#),
+        (r#"a֮ᷱ̀̕b"#, r#"a֮ᷱ̀̕b"#, r#"a֮ᷱ̀̕b"#, r#"a֮ᷱ̀̕b"#, r#"a֮ᷱ̀̕b"#),
+        (r#"à֮ᷲ̕b"#, r#"à֮ᷲ̕b"#, r#"à֮ᷲ̕b"#, r#"à֮ᷲ̕b"#, r#"à֮ᷲ̕b"#),
+        (r#"a֮ᷲ̀̕b"#, r#"a֮ᷲ̀̕b"#, r#"a֮ᷲ̀̕b"#, r#"a֮ᷲ̀̕b"#, r#"a֮ᷲ̀̕b"#),
+        (r#"à֮ᷳ̕b"#, r#"à֮ᷳ̕b"#, r#"à֮ᷳ̕b"#, r#"à֮ᷳ̕b"#, r#"à֮ᷳ̕b"#),
+        (r#"a֮ᷳ̀̕b"#, r#"a֮ᷳ̀̕b"#, r#"a֮ᷳ̀̕b"#, r#"a֮ᷳ̀̕b"#, r#"a֮ᷳ̀̕b"#),
+        (r#"à֮ᷴ̕b"#, r#"à֮ᷴ̕b"#, r#"à֮ᷴ̕b"#, r#"à֮ᷴ̕b"#, r#"à֮ᷴ̕b"#),
+        (r#"a֮ᷴ̀̕b"#, r#"a֮ᷴ̀̕b"#, r#"a֮ᷴ̀̕b"#, r#"a֮ᷴ̀̕b"#, r#"a֮ᷴ̀̕b"#),
+        (r#"à֮᷵̕b"#, r#"à֮᷵̕b"#, r#"à֮᷵̕b"#, r#"à֮᷵̕b"#, r#"à֮᷵̕b"#),
+        (r#"a֮᷵̀̕b"#, r#"a֮᷵̀̕b"#, r#"a֮᷵̀̕b"#, r#"a֮᷵̀̕b"#, r#"a֮᷵̀̕b"#),
+        (r#"à̕᷶͜b"#, r#"à̕᷶͜b"#, r#"à̕᷶͜b"#, r#"à̕᷶͜b"#, r#"à̕᷶͜b"#),
+        (r#"à᷶̕͜b"#, r#"à᷶̕͜b"#, r#"à᷶̕͜b"#, r#"à᷶̕͜b"#, r#"à᷶̕͜b"#),
+        (r#"à𝅭֮᷷b"#, r#"à𝅭֮᷷b"#, r#"à𝅭֮᷷b"#, r#"à𝅭֮᷷b"#, r#"à𝅭֮᷷b"#),
+        (r#"à𝅭᷷֮b"#, r#"à𝅭᷷֮b"#, r#"à𝅭᷷֮b"#, r#"à𝅭᷷֮b"#, r#"à𝅭᷷֮b"#),
+        (r#"à𝅭֮᷸b"#, r#"à𝅭֮᷸b"#, r#"à𝅭֮᷸b"#, r#"à𝅭֮᷸b"#, r#"à𝅭֮᷸b"#),
+        (r#"à𝅭᷸֮b"#, r#"à𝅭᷸֮b"#, r#"à𝅭᷸֮b"#, r#"à𝅭᷸֮b"#, r#"à𝅭᷸֮b"#),
+        (r#"a᷺̖᷹֚b"#, r#"a᷺̖᷹֚b"#, r#"a᷺̖᷹֚b"#, r#"a᷺̖᷹֚b"#, r#"a᷺̖᷹֚b"#),
+        (r#"a᷺᷹̖֚b"#, r#"a᷺᷹̖֚b"#, r#"a᷺᷹̖֚b"#, r#"a᷺᷹̖֚b"#, r#"a᷺᷹̖֚b"#),
+        (r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#),
+        (r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#, r#"a̛᷺᷺̖b"#),
+        (r#"à֮᷻̕b"#, r#"à֮᷻̕b"#, r#"à֮᷻̕b"#, r#"à֮᷻̕b"#, r#"à֮᷻̕b"#),
+        (r#"a֮᷻̀̕b"#, r#"a֮᷻̀̕b"#, r#"a֮᷻̀̕b"#, r#"a֮᷻̀̕b"#, r#"a֮᷻̀̕b"#),
+        (r#"a̕͜᷼͝b"#, r#"a̕͜᷼͝b"#, r#"a̕͜᷼͝b"#, r#"a̕͜᷼͝b"#, r#"a̕͜᷼͝b"#),
+        (r#"a̕᷼͜͝b"#, r#"a̕᷼͜͝b"#, r#"a̕᷼͜͝b"#, r#"a̕᷼͜͝b"#, r#"a̕᷼͜͝b"#),
+        (r#"a᷺̖᷽֚b"#, r#"a᷺̖᷽֚b"#, r#"a᷺̖᷽֚b"#, r#"a᷺̖᷽֚b"#, r#"a᷺̖᷽֚b"#),
+        (r#"a᷺᷽̖֚b"#, r#"a᷺᷽̖֚b"#, r#"a᷺᷽̖֚b"#, r#"a᷺᷽̖֚b"#, r#"a᷺᷽̖֚b"#),
+        (r#"à֮᷾̕b"#, r#"à֮᷾̕b"#, r#"à֮᷾̕b"#, r#"à֮᷾̕b"#, r#"à֮᷾̕b"#),
+        (r#"a֮᷾̀̕b"#, r#"a֮᷾̀̕b"#, r#"a֮᷾̀̕b"#, r#"a֮᷾̀̕b"#, r#"a֮᷾̀̕b"#),
+        (r#"a᷺̖᷿֚b"#, r#"a᷺̖᷿֚b"#, r#"a᷺̖᷿֚b"#, r#"a᷺̖᷿֚b"#, r#"a᷺̖᷿֚b"#),
+        (r#"a᷺᷿̖֚b"#, r#"a᷺᷿̖֚b"#, r#"a᷺᷿̖֚b"#, r#"a᷺᷿̖֚b"#, r#"a᷺᷿̖֚b"#),
+        (r#"à֮⃐̕b"#, r#"à֮⃐̕b"#, r#"à֮⃐̕b"#, r#"à֮⃐̕b"#, r#"à֮⃐̕b"#),
+        (r#"a֮⃐̀̕b"#, r#"a֮⃐̀̕b"#, r#"a֮⃐̀̕b"#, r#"a֮⃐̀̕b"#, r#"a֮⃐̀̕b"#),
+        (r#"à֮⃑̕b"#, r#"à֮⃑̕b"#, r#"à֮⃑̕b"#, r#"à֮⃑̕b"#, r#"à֮⃑̕b"#),
+        (r#"a֮⃑̀̕b"#, r#"a֮⃑̀̕b"#, r#"a֮⃑̀̕b"#, r#"a֮⃑̀̕b"#, r#"a֮⃑̀̕b"#),
+        (r#"a̴⃒𖿰b"#, r#"a̴⃒𖿰b"#, r#"a̴⃒𖿰b"#, r#"a̴⃒𖿰b"#, r#"a̴⃒𖿰b"#),
+        (r#"a⃒̴𖿰b"#, r#"a⃒̴𖿰b"#, r#"a⃒̴𖿰b"#, r#"a⃒̴𖿰b"#, r#"a⃒̴𖿰b"#),
+        (r#"a̴⃓𖿰b"#, r#"a̴⃓𖿰b"#, r#"a̴⃓𖿰b"#, r#"a̴⃓𖿰b"#, r#"a̴⃓𖿰b"#),
+        (r#"a⃓̴𖿰b"#, r#"a⃓̴𖿰b"#, r#"a⃓̴𖿰b"#, r#"a⃓̴𖿰b"#, r#"a⃓̴𖿰b"#),
+        (r#"à֮⃔̕b"#, r#"à֮⃔̕b"#, r#"à֮⃔̕b"#, r#"à֮⃔̕b"#, r#"à֮⃔̕b"#),
+        (r#"a֮⃔̀̕b"#, r#"a֮⃔̀̕b"#, r#"a֮⃔̀̕b"#, r#"a֮⃔̀̕b"#, r#"a֮⃔̀̕b"#),
+        (r#"à֮⃕̕b"#, r#"à֮⃕̕b"#, r#"à֮⃕̕b"#, r#"à֮⃕̕b"#, r#"à֮⃕̕b"#),
+        (r#"a֮⃕̀̕b"#, r#"a֮⃕̀̕b"#, r#"a֮⃕̀̕b"#, r#"a֮⃕̀̕b"#, r#"a֮⃕̀̕b"#),
+        (r#"à֮⃖̕b"#, r#"à֮⃖̕b"#, r#"à֮⃖̕b"#, r#"à֮⃖̕b"#, r#"à֮⃖̕b"#),
+        (r#"a֮⃖̀̕b"#, r#"a֮⃖̀̕b"#, r#"a֮⃖̀̕b"#, r#"a֮⃖̀̕b"#, r#"a֮⃖̀̕b"#),
+        (r#"à֮⃗̕b"#, r#"à֮⃗̕b"#, r#"à֮⃗̕b"#, r#"à֮⃗̕b"#, r#"à֮⃗̕b"#),
+        (r#"a֮⃗̀̕b"#, r#"a֮⃗̀̕b"#, r#"a֮⃗̀̕b"#, r#"a֮⃗̀̕b"#, r#"a֮⃗̀̕b"#),
+        (r#"a̴⃘𖿰b"#, r#"a̴⃘𖿰b"#, r#"a̴⃘𖿰b"#, r#"a̴⃘𖿰b"#, r#"a̴⃘𖿰b"#),
+        (r#"a⃘̴𖿰b"#, r#"a⃘̴𖿰b"#, r#"a⃘̴𖿰b"#, r#"a⃘̴𖿰b"#, r#"a⃘̴𖿰b"#),
+        (r#"a̴⃙𖿰b"#, r#"a̴⃙𖿰b"#, r#"a̴⃙𖿰b"#, r#"a̴⃙𖿰b"#, r#"a̴⃙𖿰b"#),
+        (r#"a⃙̴𖿰b"#, r#"a⃙̴𖿰b"#, r#"a⃙̴𖿰b"#, r#"a⃙̴𖿰b"#, r#"a⃙̴𖿰b"#),
+        (r#"a̴⃚𖿰b"#, r#"a̴⃚𖿰b"#, r#"a̴⃚𖿰b"#, r#"a̴⃚𖿰b"#, r#"a̴⃚𖿰b"#),
+        (r#"a⃚̴𖿰b"#, r#"a⃚̴𖿰b"#, r#"a⃚̴𖿰b"#, r#"a⃚̴𖿰b"#, r#"a⃚̴𖿰b"#),
+        (r#"à֮⃛̕b"#, r#"à֮⃛̕b"#, r#"à֮⃛̕b"#, r#"à֮⃛̕b"#, r#"à֮⃛̕b"#),
+        (r#"a֮⃛̀̕b"#, r#"a֮⃛̀̕b"#, r#"a֮⃛̀̕b"#, r#"a֮⃛̀̕b"#, r#"a֮⃛̀̕b"#),
+        (r#"à֮⃜̕b"#, r#"à֮⃜̕b"#, r#"à֮⃜̕b"#, r#"à֮⃜̕b"#, r#"à֮⃜̕b"#),
+        (r#"a֮⃜̀̕b"#, r#"a֮⃜̀̕b"#, r#"a֮⃜̀̕b"#, r#"a֮⃜̀̕b"#, r#"a֮⃜̀̕b"#),
+        (r#"à֮⃡̕b"#, r#"à֮⃡̕b"#, r#"à֮⃡̕b"#, r#"à֮⃡̕b"#, r#"à֮⃡̕b"#),
+        (r#"a֮⃡̀̕b"#, r#"a֮⃡̀̕b"#, r#"a֮⃡̀̕b"#, r#"a֮⃡̀̕b"#, r#"a֮⃡̀̕b"#),
+        (r#"a̴⃥𖿰b"#, r#"a̴⃥𖿰b"#, r#"a̴⃥𖿰b"#, r#"a̴⃥𖿰b"#, r#"a̴⃥𖿰b"#),
+        (r#"a⃥̴𖿰b"#, r#"a⃥̴𖿰b"#, r#"a⃥̴𖿰b"#, r#"a⃥̴𖿰b"#, r#"a⃥̴𖿰b"#),
+        (r#"a̴⃦𖿰b"#, r#"a̴⃦𖿰b"#, r#"a̴⃦𖿰b"#, r#"a̴⃦𖿰b"#, r#"a̴⃦𖿰b"#),
+        (r#"a⃦̴𖿰b"#, r#"a⃦̴𖿰b"#, r#"a⃦̴𖿰b"#, r#"a⃦̴𖿰b"#, r#"a⃦̴𖿰b"#),
+        (r#"à֮⃧̕b"#, r#"à֮⃧̕b"#, r#"à֮⃧̕b"#, r#"à֮⃧̕b"#, r#"à֮⃧̕b"#),
+        (r#"a֮⃧̀̕b"#, r#"a֮⃧̀̕b"#, r#"a֮⃧̀̕b"#, r#"a֮⃧̀̕b"#, r#"a֮⃧̀̕b"#),
+        (r#"a᷺̖⃨֚b"#, r#"a᷺̖⃨֚b"#, r#"a᷺̖⃨֚b"#, r#"a᷺̖⃨֚b"#, r#"a᷺̖⃨֚b"#),
+        (r#"a᷺⃨̖֚b"#, r#"a᷺⃨̖֚b"#, r#"a᷺⃨̖֚b"#, r#"a᷺⃨̖֚b"#, r#"a᷺⃨̖֚b"#),
+        (r#"à֮⃩̕b"#, r#"à֮⃩̕b"#, r#"à֮⃩̕b"#, r#"à֮⃩̕b"#, r#"à֮⃩̕b"#),
+        (r#"a֮⃩̀̕b"#, r#"a֮⃩̀̕b"#, r#"a֮⃩̀̕b"#, r#"a֮⃩̀̕b"#, r#"a֮⃩̀̕b"#),
+        (r#"a̴⃪𖿰b"#, r#"a̴⃪𖿰b"#, r#"a̴⃪𖿰b"#, r#"a̴⃪𖿰b"#, r#"a̴⃪𖿰b"#),
+        (r#"a⃪̴𖿰b"#, r#"a⃪̴𖿰b"#, r#"a⃪̴𖿰b"#, r#"a⃪̴𖿰b"#, r#"a⃪̴𖿰b"#),
+        (r#"a̴⃫𖿰b"#, r#"a̴⃫𖿰b"#, r#"a̴⃫𖿰b"#, r#"a̴⃫𖿰b"#, r#"a̴⃫𖿰b"#),
+        (r#"a⃫̴𖿰b"#, r#"a⃫̴𖿰b"#, r#"a⃫̴𖿰b"#, r#"a⃫̴𖿰b"#, r#"a⃫̴𖿰b"#),
+        (r#"a᷺̖⃬֚b"#, r#"a᷺̖⃬֚b"#, r#"a᷺̖⃬֚b"#, r#"a᷺̖⃬֚b"#, r#"a᷺̖⃬֚b"#),
+        (r#"a᷺⃬̖֚b"#, r#"a᷺⃬̖֚b"#, r#"a᷺⃬̖֚b"#, r#"a᷺⃬̖֚b"#, r#"a᷺⃬̖֚b"#),
+        (r#"a᷺̖⃭֚b"#, r#"a᷺̖⃭֚b"#, r#"a᷺̖⃭֚b"#, r#"a᷺̖⃭֚b"#, r#"a᷺̖⃭֚b"#),
+        (r#"a᷺⃭̖֚b"#, r#"a᷺⃭̖֚b"#, r#"a᷺⃭̖֚b"#, r#"a᷺⃭̖֚b"#, r#"a᷺⃭̖֚b"#),
+        (r#"a᷺̖⃮֚b"#, r#"a᷺̖⃮֚b"#, r#"a᷺̖⃮֚b"#, r#"a᷺̖⃮֚b"#, r#"a᷺̖⃮֚b"#),
+        (r#"a᷺⃮̖֚b"#, r#"a᷺⃮̖֚b"#, r#"a᷺⃮̖֚b"#, r#"a᷺⃮̖֚b"#, r#"a᷺⃮̖֚b"#),
+        (r#"a᷺̖⃯֚b"#, r#"a᷺̖⃯֚b"#, r#"a᷺̖⃯֚b"#, r#"a᷺̖⃯֚b"#, r#"a᷺̖⃯֚b"#),
+        (r#"a᷺⃯̖֚b"#, r#"a᷺⃯̖֚b"#, r#"a᷺⃯̖֚b"#, r#"a᷺⃯̖֚b"#, r#"a᷺⃯̖֚b"#),
+        (r#"à֮⃰̕b"#, r#"à֮⃰̕b"#, r#"à֮⃰̕b"#, r#"à֮⃰̕b"#, r#"à֮⃰̕b"#),
+        (r#"a֮⃰̀̕b"#, r#"a֮⃰̀̕b"#, r#"a֮⃰̀̕b"#, r#"a֮⃰̀̕b"#, r#"a֮⃰̀̕b"#),
+        (r#"à֮⳯̕b"#, r#"à֮⳯̕b"#, r#"à֮⳯̕b"#, r#"à֮⳯̕b"#, r#"à֮⳯̕b"#),
+        (r#"a֮⳯̀̕b"#, r#"a֮⳯̀̕b"#, r#"a֮⳯̀̕b"#, r#"a֮⳯̀̕b"#, r#"a֮⳯̀̕b"#),
+        (r#"à֮⳰̕b"#, r#"à֮⳰̕b"#, r#"à֮⳰̕b"#, r#"à֮⳰̕b"#, r#"à֮⳰̕b"#),
+        (r#"a֮⳰̀̕b"#, r#"a֮⳰̀̕b"#, r#"a֮⳰̀̕b"#, r#"a֮⳰̀̕b"#, r#"a֮⳰̀̕b"#),
+        (r#"à֮⳱̕b"#, r#"à֮⳱̕b"#, r#"à֮⳱̕b"#, r#"à֮⳱̕b"#, r#"à֮⳱̕b"#),
+        (r#"a֮⳱̀̕b"#, r#"a֮⳱̀̕b"#, r#"a֮⳱̀̕b"#, r#"a֮⳱̀̕b"#, r#"a֮⳱̀̕b"#),
+        (r#"a゙्⵿ְb"#, r#"a゙्⵿ְb"#, r#"a゙्⵿ְb"#, r#"a゙्⵿ְb"#, r#"a゙्⵿ְb"#),
+        (r#"a゙⵿्ְb"#, r#"a゙⵿्ְb"#, r#"a゙⵿्ְb"#, r#"a゙⵿्ְb"#, r#"a゙⵿्ְb"#),
+        (r#"à֮ⷠ̕b"#, r#"à֮ⷠ̕b"#, r#"à֮ⷠ̕b"#, r#"à֮ⷠ̕b"#, r#"à֮ⷠ̕b"#),
+        (r#"a֮ⷠ̀̕b"#, r#"a֮ⷠ̀̕b"#, r#"a֮ⷠ̀̕b"#, r#"a֮ⷠ̀̕b"#, r#"a֮ⷠ̀̕b"#),
+        (r#"à֮ⷡ̕b"#, r#"à֮ⷡ̕b"#, r#"à֮ⷡ̕b"#, r#"à֮ⷡ̕b"#, r#"à֮ⷡ̕b"#),
+        (r#"a֮ⷡ̀̕b"#, r#"a֮ⷡ̀̕b"#, r#"a֮ⷡ̀̕b"#, r#"a֮ⷡ̀̕b"#, r#"a֮ⷡ̀̕b"#),
+        (r#"à֮ⷢ̕b"#, r#"à֮ⷢ̕b"#, r#"à֮ⷢ̕b"#, r#"à֮ⷢ̕b"#, r#"à֮ⷢ̕b"#),
+        (r#"a֮ⷢ̀̕b"#, r#"a֮ⷢ̀̕b"#, r#"a֮ⷢ̀̕b"#, r#"a֮ⷢ̀̕b"#, r#"a֮ⷢ̀̕b"#),
+        (r#"à֮ⷣ̕b"#, r#"à֮ⷣ̕b"#, r#"à֮ⷣ̕b"#, r#"à֮ⷣ̕b"#, r#"à֮ⷣ̕b"#),
+        (r#"a֮ⷣ̀̕b"#, r#"a֮ⷣ̀̕b"#, r#"a֮ⷣ̀̕b"#, r#"a֮ⷣ̀̕b"#, r#"a֮ⷣ̀̕b"#),
+        (r#"à֮ⷤ̕b"#, r#"à֮ⷤ̕b"#, r#"à֮ⷤ̕b"#, r#"à֮ⷤ̕b"#, r#"à֮ⷤ̕b"#),
+        (r#"a֮ⷤ̀̕b"#, r#"a֮ⷤ̀̕b"#, r#"a֮ⷤ̀̕b"#, r#"a֮ⷤ̀̕b"#, r#"a֮ⷤ̀̕b"#),
+        (r#"à֮ⷥ̕b"#, r#"à֮ⷥ̕b"#, r#"à֮ⷥ̕b"#, r#"à֮ⷥ̕b"#, r#"à֮ⷥ̕b"#),
+        (r#"a֮ⷥ̀̕b"#, r#"a֮ⷥ̀̕b"#, r#"a֮ⷥ̀̕b"#, r#"a֮ⷥ̀̕b"#, r#"a֮ⷥ̀̕b"#),
+        (r#"à֮ⷦ̕b"#, r#"à֮ⷦ̕b"#, r#"à֮ⷦ̕b"#, r#"à֮ⷦ̕b"#, r#"à֮ⷦ̕b"#),
+        (r#"a֮ⷦ̀̕b"#, r#"a֮ⷦ̀̕b"#, r#"a֮ⷦ̀̕b"#, r#"a֮ⷦ̀̕b"#, r#"a֮ⷦ̀̕b"#),
+        (r#"à֮ⷧ̕b"#, r#"à֮ⷧ̕b"#, r#"à֮ⷧ̕b"#, r#"à֮ⷧ̕b"#, r#"à֮ⷧ̕b"#),
+        (r#"a֮ⷧ̀̕b"#, r#"a֮ⷧ̀̕b"#, r#"a֮ⷧ̀̕b"#, r#"a֮ⷧ̀̕b"#, r#"a֮ⷧ̀̕b"#),
+        (r#"à֮ⷨ̕b"#, r#"à֮ⷨ̕b"#, r#"à֮ⷨ̕b"#, r#"à֮ⷨ̕b"#, r#"à֮ⷨ̕b"#),
+        (r#"a֮ⷨ̀̕b"#, r#"a֮ⷨ̀̕b"#, r#"a֮ⷨ̀̕b"#, r#"a֮ⷨ̀̕b"#, r#"a֮ⷨ̀̕b"#),
+        (r#"à֮ⷩ̕b"#, r#"à֮ⷩ̕b"#, r#"à֮ⷩ̕b"#, r#"à֮ⷩ̕b"#, r#"à֮ⷩ̕b"#),
+        (r#"a֮ⷩ̀̕b"#, r#"a֮ⷩ̀̕b"#, r#"a֮ⷩ̀̕b"#, r#"a֮ⷩ̀̕b"#, r#"a֮ⷩ̀̕b"#),
+        (r#"à֮ⷪ̕b"#, r#"à֮ⷪ̕b"#, r#"à֮ⷪ̕b"#, r#"à֮ⷪ̕b"#, r#"à֮ⷪ̕b"#),
+        (r#"a֮ⷪ̀̕b"#, r#"a֮ⷪ̀̕b"#, r#"a֮ⷪ̀̕b"#, r#"a֮ⷪ̀̕b"#, r#"a֮ⷪ̀̕b"#),
+        (r#"à֮ⷫ̕b"#, r#"à֮ⷫ̕b"#, r#"à֮ⷫ̕b"#, r#"à֮ⷫ̕b"#, r#"à֮ⷫ̕b"#),
+        (r#"a֮ⷫ̀̕b"#, r#"a֮ⷫ̀̕b"#, r#"a֮ⷫ̀̕b"#, r#"a֮ⷫ̀̕b"#, r#"a֮ⷫ̀̕b"#),
+        (r#"à֮ⷬ̕b"#, r#"à֮ⷬ̕b"#, r#"à֮ⷬ̕b"#, r#"à֮ⷬ̕b"#, r#"à֮ⷬ̕b"#),
+        (r#"a֮ⷬ̀̕b"#, r#"a֮ⷬ̀̕b"#, r#"a֮ⷬ̀̕b"#, r#"a֮ⷬ̀̕b"#, r#"a֮ⷬ̀̕b"#),
+        (r#"à֮ⷭ̕b"#, r#"à֮ⷭ̕b"#, r#"à֮ⷭ̕b"#, r#"à֮ⷭ̕b"#, r#"à֮ⷭ̕b"#),
+        (r#"a֮ⷭ̀̕b"#, r#"a֮ⷭ̀̕b"#, r#"a֮ⷭ̀̕b"#, r#"a֮ⷭ̀̕b"#, r#"a֮ⷭ̀̕b"#),
+        (r#"à֮ⷮ̕b"#, r#"à֮ⷮ̕b"#, r#"à֮ⷮ̕b"#, r#"à֮ⷮ̕b"#, r#"à֮ⷮ̕b"#),
+        (r#"a֮ⷮ̀̕b"#, r#"a֮ⷮ̀̕b"#, r#"a֮ⷮ̀̕b"#, r#"a֮ⷮ̀̕b"#, r#"a֮ⷮ̀̕b"#),
+        (r#"à֮ⷯ̕b"#, r#"à֮ⷯ̕b"#, r#"à֮ⷯ̕b"#, r#"à֮ⷯ̕b"#, r#"à֮ⷯ̕b"#),
+        (r#"a֮ⷯ̀̕b"#, r#"a֮ⷯ̀̕b"#, r#"a֮ⷯ̀̕b"#, r#"a֮ⷯ̀̕b"#, r#"a֮ⷯ̀̕b"#),
+        (r#"à֮ⷰ̕b"#, r#"à֮ⷰ̕b"#, r#"à֮ⷰ̕b"#, r#"à֮ⷰ̕b"#, r#"à֮ⷰ̕b"#),
+        (r#"a֮ⷰ̀̕b"#, r#"a֮ⷰ̀̕b"#, r#"a֮ⷰ̀̕b"#, r#"a֮ⷰ̀̕b"#, r#"a֮ⷰ̀̕b"#),
+        (r#"à֮ⷱ̕b"#, r#"à֮ⷱ̕b"#, r#"à֮ⷱ̕b"#, r#"à֮ⷱ̕b"#, r#"à֮ⷱ̕b"#),
+        (r#"a֮ⷱ̀̕b"#, r#"a֮ⷱ̀̕b"#, r#"a֮ⷱ̀̕b"#, r#"a֮ⷱ̀̕b"#, r#"a֮ⷱ̀̕b"#),
+        (r#"à֮ⷲ̕b"#, r#"à֮ⷲ̕b"#, r#"à֮ⷲ̕b"#, r#"à֮ⷲ̕b"#, r#"à֮ⷲ̕b"#),
+        (r#"a֮ⷲ̀̕b"#, r#"a֮ⷲ̀̕b"#, r#"a֮ⷲ̀̕b"#, r#"a֮ⷲ̀̕b"#, r#"a֮ⷲ̀̕b"#),
+        (r#"à֮ⷳ̕b"#, r#"à֮ⷳ̕b"#, r#"à֮ⷳ̕b"#, r#"à֮ⷳ̕b"#, r#"à֮ⷳ̕b"#),
+        (r#"a֮ⷳ̀̕b"#, r#"a֮ⷳ̀̕b"#, r#"a֮ⷳ̀̕b"#, r#"a֮ⷳ̀̕b"#, r#"a֮ⷳ̀̕b"#),
+        (r#"à֮ⷴ̕b"#, r#"à֮ⷴ̕b"#, r#"à֮ⷴ̕b"#, r#"à֮ⷴ̕b"#, r#"à֮ⷴ̕b"#),
+        (r#"a֮ⷴ̀̕b"#, r#"a֮ⷴ̀̕b"#, r#"a֮ⷴ̀̕b"#, r#"a֮ⷴ̀̕b"#, r#"a֮ⷴ̀̕b"#),
+        (r#"à֮ⷵ̕b"#, r#"à֮ⷵ̕b"#, r#"à֮ⷵ̕b"#, r#"à֮ⷵ̕b"#, r#"à֮ⷵ̕b"#),
+        (r#"a֮ⷵ̀̕b"#, r#"a֮ⷵ̀̕b"#, r#"a֮ⷵ̀̕b"#, r#"a֮ⷵ̀̕b"#, r#"a֮ⷵ̀̕b"#),
+        (r#"à֮ⷶ̕b"#, r#"à֮ⷶ̕b"#, r#"à֮ⷶ̕b"#, r#"à֮ⷶ̕b"#, r#"à֮ⷶ̕b"#),
+        (r#"a֮ⷶ̀̕b"#, r#"a֮ⷶ̀̕b"#, r#"a֮ⷶ̀̕b"#, r#"a֮ⷶ̀̕b"#, r#"a֮ⷶ̀̕b"#),
+        (r#"à֮ⷷ̕b"#, r#"à֮ⷷ̕b"#, r#"à֮ⷷ̕b"#, r#"à֮ⷷ̕b"#, r#"à֮ⷷ̕b"#),
+        (r#"a֮ⷷ̀̕b"#, r#"a֮ⷷ̀̕b"#, r#"a֮ⷷ̀̕b"#, r#"a֮ⷷ̀̕b"#, r#"a֮ⷷ̀̕b"#),
+        (r#"à֮ⷸ̕b"#, r#"à֮ⷸ̕b"#, r#"à֮ⷸ̕b"#, r#"à֮ⷸ̕b"#, r#"à֮ⷸ̕b"#),
+        (r#"a֮ⷸ̀̕b"#, r#"a֮ⷸ̀̕b"#, r#"a֮ⷸ̀̕b"#, r#"a֮ⷸ̀̕b"#, r#"a֮ⷸ̀̕b"#),
+        (r#"à֮ⷹ̕b"#, r#"à֮ⷹ̕b"#, r#"à֮ⷹ̕b"#, r#"à֮ⷹ̕b"#, r#"à֮ⷹ̕b"#),
+        (r#"a֮ⷹ̀̕b"#, r#"a֮ⷹ̀̕b"#, r#"a֮ⷹ̀̕b"#, r#"a֮ⷹ̀̕b"#, r#"a֮ⷹ̀̕b"#),
+        (r#"à֮ⷺ̕b"#, r#"à֮ⷺ̕b"#, r#"à֮ⷺ̕b"#, r#"à֮ⷺ̕b"#, r#"à֮ⷺ̕b"#),
+        (r#"a֮ⷺ̀̕b"#, r#"a֮ⷺ̀̕b"#, r#"a֮ⷺ̀̕b"#, r#"a֮ⷺ̀̕b"#, r#"a֮ⷺ̀̕b"#),
+        (r#"à֮ⷻ̕b"#, r#"à֮ⷻ̕b"#, r#"à֮ⷻ̕b"#, r#"à֮ⷻ̕b"#, r#"à֮ⷻ̕b"#),
+        (r#"a֮ⷻ̀̕b"#, r#"a֮ⷻ̀̕b"#, r#"a֮ⷻ̀̕b"#, r#"a֮ⷻ̀̕b"#, r#"a֮ⷻ̀̕b"#),
+        (r#"à֮ⷼ̕b"#, r#"à֮ⷼ̕b"#, r#"à֮ⷼ̕b"#, r#"à֮ⷼ̕b"#, r#"à֮ⷼ̕b"#),
+        (r#"a֮ⷼ̀̕b"#, r#"a֮ⷼ̀̕b"#, r#"a֮ⷼ̀̕b"#, r#"a֮ⷼ̀̕b"#, r#"a֮ⷼ̀̕b"#),
+        (r#"à֮ⷽ̕b"#, r#"à֮ⷽ̕b"#, r#"à֮ⷽ̕b"#, r#"à֮ⷽ̕b"#, r#"à֮ⷽ̕b"#),
+        (r#"a֮ⷽ̀̕b"#, r#"a֮ⷽ̀̕b"#, r#"a֮ⷽ̀̕b"#, r#"a֮ⷽ̀̕b"#, r#"a֮ⷽ̀̕b"#),
+        (r#"à֮ⷾ̕b"#, r#"à֮ⷾ̕b"#, r#"à֮ⷾ̕b"#, r#"à֮ⷾ̕b"#, r#"à֮ⷾ̕b"#),
+        (r#"a֮ⷾ̀̕b"#, r#"a֮ⷾ̀̕b"#, r#"a֮ⷾ̀̕b"#, r#"a֮ⷾ̀̕b"#, r#"a֮ⷾ̀̕b"#),
+        (r#"à֮ⷿ̕b"#, r#"à֮ⷿ̕b"#, r#"à֮ⷿ̕b"#, r#"à֮ⷿ̕b"#, r#"à֮ⷿ̕b"#),
+        (r#"a֮ⷿ̀̕b"#, r#"a֮ⷿ̀̕b"#, r#"a֮ⷿ̀̕b"#, r#"a֮ⷿ̀̕b"#, r#"a֮ⷿ̀̕b"#),
+        (r#"a̛᷺〪̖b"#, r#"a̛᷺〪̖b"#, r#"a̛᷺〪̖b"#, r#"a̛᷺〪̖b"#, r#"a̛᷺〪̖b"#),
+        (r#"a̛〪᷺̖b"#, r#"a̛〪᷺̖b"#, r#"a̛〪᷺̖b"#, r#"a̛〪᷺̖b"#, r#"a̛〪᷺̖b"#),
+        (r#"à𝅭֮〫b"#, r#"à𝅭֮〫b"#, r#"à𝅭֮〫b"#, r#"à𝅭֮〫b"#, r#"à𝅭֮〫b"#),
+        (r#"à𝅭〫֮b"#, r#"à𝅭〫֮b"#, r#"à𝅭〫֮b"#, r#"à𝅭〫֮b"#, r#"à𝅭〫֮b"#),
+        (r#"à̕〬͜b"#, r#"à̕〬͜b"#, r#"à̕〬͜b"#, r#"à̕〬͜b"#, r#"à̕〬͜b"#),
+        (r#"à〬̕͜b"#, r#"à〬̕͜b"#, r#"à〬̕͜b"#, r#"à〬̕͜b"#, r#"à〬̕͜b"#),
+        (r#"a̖֚〭〮b"#, r#"a̖֚〭〮b"#, r#"a̖֚〭〮b"#, r#"a̖֚〭〮b"#, r#"a̖֚〭〮b"#),
+        (r#"a̖〭֚〮b"#, r#"a̖〭֚〮b"#, r#"a̖〭֚〮b"#, r#"a̖〭֚〮b"#, r#"a̖〭֚〮b"#),
+        (r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#),
+        (r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#, r#"a֚〮〮𝅭b"#),
+        (r#"a֚〮〯𝅭b"#, r#"a֚〮〯𝅭b"#, r#"a֚〮〯𝅭b"#, r#"a֚〮〯𝅭b"#, r#"a֚〮〯𝅭b"#),
+        (r#"a֚〯〮𝅭b"#, r#"a֚〯〮𝅭b"#, r#"a֚〯〮𝅭b"#, r#"a֚〯〮𝅭b"#, r#"a֚〯〮𝅭b"#),
+        (r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#),
+        (r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#, r#"a़゙゙्b"#),
+        (r#"a़゙゚्b"#, r#"a़゙゚्b"#, r#"a़゙゚्b"#, r#"a़゙゚्b"#, r#"a़゙゚्b"#),
+        (r#"a़゚゙्b"#, r#"a़゚゙्b"#, r#"a़゚゙्b"#, r#"a़゚゙्b"#, r#"a़゚゙्b"#),
+        (r#"à֮꙯̕b"#, r#"à֮꙯̕b"#, r#"à֮꙯̕b"#, r#"à֮꙯̕b"#, r#"à֮꙯̕b"#),
+        (r#"a֮꙯̀̕b"#, r#"a֮꙯̀̕b"#, r#"a֮꙯̀̕b"#, r#"a֮꙯̀̕b"#, r#"a֮꙯̀̕b"#),
+        (r#"à֮ꙴ̕b"#, r#"à֮ꙴ̕b"#, r#"à֮ꙴ̕b"#, r#"à֮ꙴ̕b"#, r#"à֮ꙴ̕b"#),
+        (r#"a֮ꙴ̀̕b"#, r#"a֮ꙴ̀̕b"#, r#"a֮ꙴ̀̕b"#, r#"a֮ꙴ̀̕b"#, r#"a֮ꙴ̀̕b"#),
+        (r#"à֮ꙵ̕b"#, r#"à֮ꙵ̕b"#, r#"à֮ꙵ̕b"#, r#"à֮ꙵ̕b"#, r#"à֮ꙵ̕b"#),
+        (r#"a֮ꙵ̀̕b"#, r#"a֮ꙵ̀̕b"#, r#"a֮ꙵ̀̕b"#, r#"a֮ꙵ̀̕b"#, r#"a֮ꙵ̀̕b"#),
+        (r#"à֮ꙶ̕b"#, r#"à֮ꙶ̕b"#, r#"à֮ꙶ̕b"#, r#"à֮ꙶ̕b"#, r#"à֮ꙶ̕b"#),
+        (r#"a֮ꙶ̀̕b"#, r#"a֮ꙶ̀̕b"#, r#"a֮ꙶ̀̕b"#, r#"a֮ꙶ̀̕b"#, r#"a֮ꙶ̀̕b"#),
+        (r#"à֮ꙷ̕b"#, r#"à֮ꙷ̕b"#, r#"à֮ꙷ̕b"#, r#"à֮ꙷ̕b"#, r#"à֮ꙷ̕b"#),
+        (r#"a֮ꙷ̀̕b"#, r#"a֮ꙷ̀̕b"#, r#"a֮ꙷ̀̕b"#, r#"a֮ꙷ̀̕b"#, r#"a֮ꙷ̀̕b"#),
+        (r#"à֮ꙸ̕b"#, r#"à֮ꙸ̕b"#, r#"à֮ꙸ̕b"#, r#"à֮ꙸ̕b"#, r#"à֮ꙸ̕b"#),
+        (r#"a֮ꙸ̀̕b"#, r#"a֮ꙸ̀̕b"#, r#"a֮ꙸ̀̕b"#, r#"a֮ꙸ̀̕b"#, r#"a֮ꙸ̀̕b"#),
+        (r#"à֮ꙹ̕b"#, r#"à֮ꙹ̕b"#, r#"à֮ꙹ̕b"#, r#"à֮ꙹ̕b"#, r#"à֮ꙹ̕b"#),
+        (r#"a֮ꙹ̀̕b"#, r#"a֮ꙹ̀̕b"#, r#"a֮ꙹ̀̕b"#, r#"a֮ꙹ̀̕b"#, r#"a֮ꙹ̀̕b"#),
+        (r#"à֮ꙺ̕b"#, r#"à֮ꙺ̕b"#, r#"à֮ꙺ̕b"#, r#"à֮ꙺ̕b"#, r#"à֮ꙺ̕b"#),
+        (r#"a֮ꙺ̀̕b"#, r#"a֮ꙺ̀̕b"#, r#"a֮ꙺ̀̕b"#, r#"a֮ꙺ̀̕b"#, r#"a֮ꙺ̀̕b"#),
+        (r#"à֮ꙻ̕b"#, r#"à֮ꙻ̕b"#, r#"à֮ꙻ̕b"#, r#"à֮ꙻ̕b"#, r#"à֮ꙻ̕b"#),
+        (r#"a֮ꙻ̀̕b"#, r#"a֮ꙻ̀̕b"#, r#"a֮ꙻ̀̕b"#, r#"a֮ꙻ̀̕b"#, r#"a֮ꙻ̀̕b"#),
+        (r#"à֮꙼̕b"#, r#"à֮꙼̕b"#, r#"à֮꙼̕b"#, r#"à֮꙼̕b"#, r#"à֮꙼̕b"#),
+        (r#"a֮꙼̀̕b"#, r#"a֮꙼̀̕b"#, r#"a֮꙼̀̕b"#, r#"a֮꙼̀̕b"#, r#"a֮꙼̀̕b"#),
+        (r#"à֮꙽̕b"#, r#"à֮꙽̕b"#, r#"à֮꙽̕b"#, r#"à֮꙽̕b"#, r#"à֮꙽̕b"#),
+        (r#"a֮꙽̀̕b"#, r#"a֮꙽̀̕b"#, r#"a֮꙽̀̕b"#, r#"a֮꙽̀̕b"#, r#"a֮꙽̀̕b"#),
+        (r#"à֮ꚞ̕b"#, r#"à֮ꚞ̕b"#, r#"à֮ꚞ̕b"#, r#"à֮ꚞ̕b"#, r#"à֮ꚞ̕b"#),
+        (r#"a֮ꚞ̀̕b"#, r#"a֮ꚞ̀̕b"#, r#"a֮ꚞ̀̕b"#, r#"a֮ꚞ̀̕b"#, r#"a֮ꚞ̀̕b"#),
+        (r#"à֮ꚟ̕b"#, r#"à֮ꚟ̕b"#, r#"à֮ꚟ̕b"#, r#"à֮ꚟ̕b"#, r#"à֮ꚟ̕b"#),
+        (r#"a֮ꚟ̀̕b"#, r#"a֮ꚟ̀̕b"#, r#"a֮ꚟ̀̕b"#, r#"a֮ꚟ̀̕b"#, r#"a֮ꚟ̀̕b"#),
+        (r#"à֮꛰̕b"#, r#"à֮꛰̕b"#, r#"à֮꛰̕b"#, r#"à֮꛰̕b"#, r#"à֮꛰̕b"#),
+        (r#"a֮꛰̀̕b"#, r#"a֮꛰̀̕b"#, r#"a֮꛰̀̕b"#, r#"a֮꛰̀̕b"#, r#"a֮꛰̀̕b"#),
+        (r#"à֮꛱̕b"#, r#"à֮꛱̕b"#, r#"à֮꛱̕b"#, r#"à֮꛱̕b"#, r#"à֮꛱̕b"#),
+        (r#"a֮꛱̀̕b"#, r#"a֮꛱̀̕b"#, r#"a֮꛱̀̕b"#, r#"a֮꛱̀̕b"#, r#"a֮꛱̀̕b"#),
+        (r#"a゙्꠆ְb"#, r#"a゙्꠆ְb"#, r#"a゙्꠆ְb"#, r#"a゙्꠆ְb"#, r#"a゙्꠆ְb"#),
+        (r#"a゙꠆्ְb"#, r#"a゙꠆्ְb"#, r#"a゙꠆्ְb"#, r#"a゙꠆्ְb"#, r#"a゙꠆्ְb"#),
+        (r#"a゙्꠬ְb"#, r#"a゙्꠬ְb"#, r#"a゙्꠬ְb"#, r#"a゙्꠬ְb"#, r#"a゙्꠬ְb"#),
+        (r#"a゙꠬्ְb"#, r#"a゙꠬्ְb"#, r#"a゙꠬्ְb"#, r#"a゙꠬्ְb"#, r#"a゙꠬्ְb"#),
+        (r#"a゙्꣄ְb"#, r#"a゙्꣄ְb"#, r#"a゙्꣄ְb"#, r#"a゙्꣄ְb"#, r#"a゙्꣄ְb"#),
+        (r#"a゙꣄्ְb"#, r#"a゙꣄्ְb"#, r#"a゙꣄्ְb"#, r#"a゙꣄्ְb"#, r#"a゙꣄्ְb"#),
+        (r#"à֮꣠̕b"#, r#"à֮꣠̕b"#, r#"à֮꣠̕b"#, r#"à֮꣠̕b"#, r#"à֮꣠̕b"#),
+        (r#"a֮꣠̀̕b"#, r#"a֮꣠̀̕b"#, r#"a֮꣠̀̕b"#, r#"a֮꣠̀̕b"#, r#"a֮꣠̀̕b"#),
+        (r#"à֮꣡̕b"#, r#"à֮꣡̕b"#, r#"à֮꣡̕b"#, r#"à֮꣡̕b"#, r#"à֮꣡̕b"#),
+        (r#"a֮꣡̀̕b"#, r#"a֮꣡̀̕b"#, r#"a֮꣡̀̕b"#, r#"a֮꣡̀̕b"#, r#"a֮꣡̀̕b"#),
+        (r#"à֮꣢̕b"#, r#"à֮꣢̕b"#, r#"à֮꣢̕b"#, r#"à֮꣢̕b"#, r#"à֮꣢̕b"#),
+        (r#"a֮꣢̀̕b"#, r#"a֮꣢̀̕b"#, r#"a֮꣢̀̕b"#, r#"a֮꣢̀̕b"#, r#"a֮꣢̀̕b"#),
+        (r#"à֮꣣̕b"#, r#"à֮꣣̕b"#, r#"à֮꣣̕b"#, r#"à֮꣣̕b"#, r#"à֮꣣̕b"#),
+        (r#"a֮꣣̀̕b"#, r#"a֮꣣̀̕b"#, r#"a֮꣣̀̕b"#, r#"a֮꣣̀̕b"#, r#"a֮꣣̀̕b"#),
+        (r#"à֮꣤̕b"#, r#"à֮꣤̕b"#, r#"à֮꣤̕b"#, r#"à֮꣤̕b"#, r#"à֮꣤̕b"#),
+        (r#"a֮꣤̀̕b"#, r#"a֮꣤̀̕b"#, r#"a֮꣤̀̕b"#, r#"a֮꣤̀̕b"#, r#"a֮꣤̀̕b"#),
+        (r#"à֮꣥̕b"#, r#"à֮꣥̕b"#, r#"à֮꣥̕b"#, r#"à֮꣥̕b"#, r#"à֮꣥̕b"#),
+        (r#"a֮꣥̀̕b"#, r#"a֮꣥̀̕b"#, r#"a֮꣥̀̕b"#, r#"a֮꣥̀̕b"#, r#"a֮꣥̀̕b"#),
+        (r#"à֮꣦̕b"#, r#"à֮꣦̕b"#, r#"à֮꣦̕b"#, r#"à֮꣦̕b"#, r#"à֮꣦̕b"#),
+        (r#"a֮꣦̀̕b"#, r#"a֮꣦̀̕b"#, r#"a֮꣦̀̕b"#, r#"a֮꣦̀̕b"#, r#"a֮꣦̀̕b"#),
+        (r#"à֮꣧̕b"#, r#"à֮꣧̕b"#, r#"à֮꣧̕b"#, r#"à֮꣧̕b"#, r#"à֮꣧̕b"#),
+        (r#"a֮꣧̀̕b"#, r#"a֮꣧̀̕b"#, r#"a֮꣧̀̕b"#, r#"a֮꣧̀̕b"#, r#"a֮꣧̀̕b"#),
+        (r#"à֮꣨̕b"#, r#"à֮꣨̕b"#, r#"à֮꣨̕b"#, r#"à֮꣨̕b"#, r#"à֮꣨̕b"#),
+        (r#"a֮꣨̀̕b"#, r#"a֮꣨̀̕b"#, r#"a֮꣨̀̕b"#, r#"a֮꣨̀̕b"#, r#"a֮꣨̀̕b"#),
+        (r#"à֮꣩̕b"#, r#"à֮꣩̕b"#, r#"à֮꣩̕b"#, r#"à֮꣩̕b"#, r#"à֮꣩̕b"#),
+        (r#"a֮꣩̀̕b"#, r#"a֮꣩̀̕b"#, r#"a֮꣩̀̕b"#, r#"a֮꣩̀̕b"#, r#"a֮꣩̀̕b"#),
+        (r#"à֮꣪̕b"#, r#"à֮꣪̕b"#, r#"à֮꣪̕b"#, r#"à֮꣪̕b"#, r#"à֮꣪̕b"#),
+        (r#"a֮꣪̀̕b"#, r#"a֮꣪̀̕b"#, r#"a֮꣪̀̕b"#, r#"a֮꣪̀̕b"#, r#"a֮꣪̀̕b"#),
+        (r#"à֮꣫̕b"#, r#"à֮꣫̕b"#, r#"à֮꣫̕b"#, r#"à֮꣫̕b"#, r#"à֮꣫̕b"#),
+        (r#"a֮꣫̀̕b"#, r#"a֮꣫̀̕b"#, r#"a֮꣫̀̕b"#, r#"a֮꣫̀̕b"#, r#"a֮꣫̀̕b"#),
+        (r#"à֮꣬̕b"#, r#"à֮꣬̕b"#, r#"à֮꣬̕b"#, r#"à֮꣬̕b"#, r#"à֮꣬̕b"#),
+        (r#"a֮꣬̀̕b"#, r#"a֮꣬̀̕b"#, r#"a֮꣬̀̕b"#, r#"a֮꣬̀̕b"#, r#"a֮꣬̀̕b"#),
+        (r#"à֮꣭̕b"#, r#"à֮꣭̕b"#, r#"à֮꣭̕b"#, r#"à֮꣭̕b"#, r#"à֮꣭̕b"#),
+        (r#"a֮꣭̀̕b"#, r#"a֮꣭̀̕b"#, r#"a֮꣭̀̕b"#, r#"a֮꣭̀̕b"#, r#"a֮꣭̀̕b"#),
+        (r#"à֮꣮̕b"#, r#"à֮꣮̕b"#, r#"à֮꣮̕b"#, r#"à֮꣮̕b"#, r#"à֮꣮̕b"#),
+        (r#"a֮꣮̀̕b"#, r#"a֮꣮̀̕b"#, r#"a֮꣮̀̕b"#, r#"a֮꣮̀̕b"#, r#"a֮꣮̀̕b"#),
+        (r#"à֮꣯̕b"#, r#"à֮꣯̕b"#, r#"à֮꣯̕b"#, r#"à֮꣯̕b"#, r#"à֮꣯̕b"#),
+        (r#"a֮꣯̀̕b"#, r#"a֮꣯̀̕b"#, r#"a֮꣯̀̕b"#, r#"a֮꣯̀̕b"#, r#"a֮꣯̀̕b"#),
+        (r#"à֮꣰̕b"#, r#"à֮꣰̕b"#, r#"à֮꣰̕b"#, r#"à֮꣰̕b"#, r#"à֮꣰̕b"#),
+        (r#"a֮꣰̀̕b"#, r#"a֮꣰̀̕b"#, r#"a֮꣰̀̕b"#, r#"a֮꣰̀̕b"#, r#"a֮꣰̀̕b"#),
+        (r#"à֮꣱̕b"#, r#"à֮꣱̕b"#, r#"à֮꣱̕b"#, r#"à֮꣱̕b"#, r#"à֮꣱̕b"#),
+        (r#"a֮꣱̀̕b"#, r#"a֮꣱̀̕b"#, r#"a֮꣱̀̕b"#, r#"a֮꣱̀̕b"#, r#"a֮꣱̀̕b"#),
+        (r#"a᷺̖꤫֚b"#, r#"a᷺̖꤫֚b"#, r#"a᷺̖꤫֚b"#, r#"a᷺̖꤫֚b"#, r#"a᷺̖꤫֚b"#),
+        (r#"a᷺꤫̖֚b"#, r#"a᷺꤫̖֚b"#, r#"a᷺꤫̖֚b"#, r#"a᷺꤫̖֚b"#, r#"a᷺꤫̖֚b"#),
+        (r#"a᷺̖꤬֚b"#, r#"a᷺̖꤬֚b"#, r#"a᷺̖꤬֚b"#, r#"a᷺̖꤬֚b"#, r#"a᷺̖꤬֚b"#),
+        (r#"a᷺꤬̖֚b"#, r#"a᷺꤬̖֚b"#, r#"a᷺꤬̖֚b"#, r#"a᷺꤬̖֚b"#, r#"a᷺꤬̖֚b"#),
+        (r#"a᷺̖꤭֚b"#, r#"a᷺̖꤭֚b"#, r#"a᷺̖꤭֚b"#, r#"a᷺̖꤭֚b"#, r#"a᷺̖꤭֚b"#),
+        (r#"a᷺꤭̖֚b"#, r#"a᷺꤭̖֚b"#, r#"a᷺꤭̖֚b"#, r#"a᷺꤭̖֚b"#, r#"a᷺꤭̖֚b"#),
+        (r#"a゙्꥓ְb"#, r#"a゙्꥓ְb"#, r#"a゙्꥓ְb"#, r#"a゙्꥓ְb"#, r#"a゙्꥓ְb"#),
+        (r#"a゙꥓्ְb"#, r#"a゙꥓्ְb"#, r#"a゙꥓्ְb"#, r#"a゙꥓्ְb"#, r#"a゙꥓्ְb"#),
+        (r#"a𖿰़꦳゙b"#, r#"a𖿰़꦳゙b"#, r#"a𖿰़꦳゙b"#, r#"a𖿰़꦳゙b"#, r#"a𖿰़꦳゙b"#),
+        (r#"a𖿰꦳़゙b"#, r#"a𖿰꦳़゙b"#, r#"a𖿰꦳़゙b"#, r#"a𖿰꦳़゙b"#, r#"a𖿰꦳़゙b"#),
+        (r#"a゙्꧀ְb"#, r#"a゙्꧀ְb"#, r#"a゙्꧀ְb"#, r#"a゙्꧀ְb"#, r#"a゙्꧀ְb"#),
+        (r#"a゙꧀्ְb"#, r#"a゙꧀्ְb"#, r#"a゙꧀्ְb"#, r#"a゙꧀्ְb"#, r#"a゙꧀्ְb"#),
+        (r#"à֮ꪰ̕b"#, r#"à֮ꪰ̕b"#, r#"à֮ꪰ̕b"#, r#"à֮ꪰ̕b"#, r#"à֮ꪰ̕b"#),
+        (r#"a֮ꪰ̀̕b"#, r#"a֮ꪰ̀̕b"#, r#"a֮ꪰ̀̕b"#, r#"a֮ꪰ̀̕b"#, r#"a֮ꪰ̀̕b"#),
+        (r#"à֮ꪲ̕b"#, r#"à֮ꪲ̕b"#, r#"à֮ꪲ̕b"#, r#"à֮ꪲ̕b"#, r#"à֮ꪲ̕b"#),
+        (r#"a֮ꪲ̀̕b"#, r#"a֮ꪲ̀̕b"#, r#"a֮ꪲ̀̕b"#, r#"a֮ꪲ̀̕b"#, r#"a֮ꪲ̀̕b"#),
+        (r#"à֮ꪳ̕b"#, r#"à֮ꪳ̕b"#, r#"à֮ꪳ̕b"#, r#"à֮ꪳ̕b"#, r#"à֮ꪳ̕b"#),
+        (r#"a֮ꪳ̀̕b"#, r#"a֮ꪳ̀̕b"#, r#"a֮ꪳ̀̕b"#, r#"a֮ꪳ̀̕b"#, r#"a֮ꪳ̀̕b"#),
+        (r#"a᷺̖ꪴ֚b"#, r#"a᷺̖ꪴ֚b"#, r#"a᷺̖ꪴ֚b"#, r#"a᷺̖ꪴ֚b"#, r#"a᷺̖ꪴ֚b"#),
+        (r#"a᷺ꪴ̖֚b"#, r#"a᷺ꪴ̖֚b"#, r#"a᷺ꪴ̖֚b"#, r#"a᷺ꪴ̖֚b"#, r#"a᷺ꪴ̖֚b"#),
+        (r#"à֮ꪷ̕b"#, r#"à֮ꪷ̕b"#, r#"à֮ꪷ̕b"#, r#"à֮ꪷ̕b"#, r#"à֮ꪷ̕b"#),
+        (r#"a֮ꪷ̀̕b"#, r#"a֮ꪷ̀̕b"#, r#"a֮ꪷ̀̕b"#, r#"a֮ꪷ̀̕b"#, r#"a֮ꪷ̀̕b"#),
+        (r#"à֮ꪸ̕b"#, r#"à֮ꪸ̕b"#, r#"à֮ꪸ̕b"#, r#"à֮ꪸ̕b"#, r#"à֮ꪸ̕b"#),
+        (r#"a֮ꪸ̀̕b"#, r#"a֮ꪸ̀̕b"#, r#"a֮ꪸ̀̕b"#, r#"a֮ꪸ̀̕b"#, r#"a֮ꪸ̀̕b"#),
+        (r#"à֮ꪾ̕b"#, r#"à֮ꪾ̕b"#, r#"à֮ꪾ̕b"#, r#"à֮ꪾ̕b"#, r#"à֮ꪾ̕b"#),
+        (r#"a֮ꪾ̀̕b"#, r#"a֮ꪾ̀̕b"#, r#"a֮ꪾ̀̕b"#, r#"a֮ꪾ̀̕b"#, r#"a֮ꪾ̀̕b"#),
+        (r#"à֮꪿̕b"#, r#"à֮꪿̕b"#, r#"à֮꪿̕b"#, r#"à֮꪿̕b"#, r#"à֮꪿̕b"#),
+        (r#"a֮꪿̀̕b"#, r#"a֮꪿̀̕b"#, r#"a֮꪿̀̕b"#, r#"a֮꪿̀̕b"#, r#"a֮꪿̀̕b"#),
+        (r#"à֮꫁̕b"#, r#"à֮꫁̕b"#, r#"à֮꫁̕b"#, r#"à֮꫁̕b"#, r#"à֮꫁̕b"#),
+        (r#"a֮꫁̀̕b"#, r#"a֮꫁̀̕b"#, r#"a֮꫁̀̕b"#, r#"a֮꫁̀̕b"#, r#"a֮꫁̀̕b"#),
+        (r#"a゙्꫶ְb"#, r#"a゙्꫶ְb"#, r#"a゙्꫶ְb"#, r#"a゙्꫶ְb"#, r#"a゙्꫶ְb"#),
+        (r#"a゙꫶्ְb"#, r#"a゙꫶्ְb"#, r#"a゙꫶्ְb"#, r#"a゙꫶्ְb"#, r#"a゙꫶्ְb"#),
+        (r#"a゙्꯭ְb"#, r#"a゙्꯭ְb"#, r#"a゙्꯭ְb"#, r#"a゙्꯭ְb"#, r#"a゙्꯭ְb"#),
+        (r#"a゙꯭्ְb"#, r#"a゙꯭्ְb"#, r#"a゙꯭्ְb"#, r#"a゙꯭्ְb"#, r#"a゙꯭्ְb"#),
+        (r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#),
+        (r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#, r#"aׂﬞﬞًb"#),
+        (r#"à֮︠̕b"#, r#"à֮︠̕b"#, r#"à֮︠̕b"#, r#"à֮︠̕b"#, r#"à֮︠̕b"#),
+        (r#"a֮︠̀̕b"#, r#"a֮︠̀̕b"#, r#"a֮︠̀̕b"#, r#"a֮︠̀̕b"#, r#"a֮︠̀̕b"#),
+        (r#"à֮︡̕b"#, r#"à֮︡̕b"#, r#"à֮︡̕b"#, r#"à֮︡̕b"#, r#"à֮︡̕b"#),
+        (r#"a֮︡̀̕b"#, r#"a֮︡̀̕b"#, r#"a֮︡̀̕b"#, r#"a֮︡̀̕b"#, r#"a֮︡̀̕b"#),
+        (r#"à֮︢̕b"#, r#"à֮︢̕b"#, r#"à֮︢̕b"#, r#"à֮︢̕b"#, r#"à֮︢̕b"#),
+        (r#"a֮︢̀̕b"#, r#"a֮︢̀̕b"#, r#"a֮︢̀̕b"#, r#"a֮︢̀̕b"#, r#"a֮︢̀̕b"#),
+        (r#"à֮︣̕b"#, r#"à֮︣̕b"#, r#"à֮︣̕b"#, r#"à֮︣̕b"#, r#"à֮︣̕b"#),
+        (r#"a֮︣̀̕b"#, r#"a֮︣̀̕b"#, r#"a֮︣̀̕b"#, r#"a֮︣̀̕b"#, r#"a֮︣̀̕b"#),
+        (r#"à֮︤̕b"#, r#"à֮︤̕b"#, r#"à֮︤̕b"#, r#"à֮︤̕b"#, r#"à֮︤̕b"#),
+        (r#"a֮︤̀̕b"#, r#"a֮︤̀̕b"#, r#"a֮︤̀̕b"#, r#"a֮︤̀̕b"#, r#"a֮︤̀̕b"#),
+        (r#"à֮︥̕b"#, r#"à֮︥̕b"#, r#"à֮︥̕b"#, r#"à֮︥̕b"#, r#"à֮︥̕b"#),
+        (r#"a֮︥̀̕b"#, r#"a֮︥̀̕b"#, r#"a֮︥̀̕b"#, r#"a֮︥̀̕b"#, r#"a֮︥̀̕b"#),
+        (r#"à֮︦̕b"#, r#"à֮︦̕b"#, r#"à֮︦̕b"#, r#"à֮︦̕b"#, r#"à֮︦̕b"#),
+        (r#"a֮︦̀̕b"#, r#"a֮︦̀̕b"#, r#"a֮︦̀̕b"#, r#"a֮︦̀̕b"#, r#"a֮︦̀̕b"#),
+        (r#"a᷺̖︧֚b"#, r#"a᷺̖︧֚b"#, r#"a᷺̖︧֚b"#, r#"a᷺̖︧֚b"#, r#"a᷺̖︧֚b"#),
+        (r#"a᷺︧̖֚b"#, r#"a᷺︧̖֚b"#, r#"a᷺︧̖֚b"#, r#"a᷺︧̖֚b"#, r#"a᷺︧̖֚b"#),
+        (r#"a᷺̖︨֚b"#, r#"a᷺̖︨֚b"#, r#"a᷺̖︨֚b"#, r#"a᷺̖︨֚b"#, r#"a᷺̖︨֚b"#),
+        (r#"a᷺︨̖֚b"#, r#"a᷺︨̖֚b"#, r#"a᷺︨̖֚b"#, r#"a᷺︨̖֚b"#, r#"a᷺︨̖֚b"#),
+        (r#"a᷺̖︩֚b"#, r#"a᷺̖︩֚b"#, r#"a᷺̖︩֚b"#, r#"a᷺̖︩֚b"#, r#"a᷺̖︩֚b"#),
+        (r#"a᷺︩̖֚b"#, r#"a᷺︩̖֚b"#, r#"a᷺︩̖֚b"#, r#"a᷺︩̖֚b"#, r#"a᷺︩̖֚b"#),
+        (r#"a᷺̖︪֚b"#, r#"a᷺̖︪֚b"#, r#"a᷺̖︪֚b"#, r#"a᷺̖︪֚b"#, r#"a᷺̖︪֚b"#),
+        (r#"a᷺︪̖֚b"#, r#"a᷺︪̖֚b"#, r#"a᷺︪̖֚b"#, r#"a᷺︪̖֚b"#, r#"a᷺︪̖֚b"#),
+        (r#"a᷺̖︫֚b"#, r#"a᷺̖︫֚b"#, r#"a᷺̖︫֚b"#, r#"a᷺̖︫֚b"#, r#"a᷺̖︫֚b"#),
+        (r#"a᷺︫̖֚b"#, r#"a᷺︫̖֚b"#, r#"a᷺︫̖֚b"#, r#"a᷺︫̖֚b"#, r#"a᷺︫̖֚b"#),
+        (r#"a᷺̖︬֚b"#, r#"a᷺̖︬֚b"#, r#"a᷺̖︬֚b"#, r#"a᷺̖︬֚b"#, r#"a᷺̖︬֚b"#),
+        (r#"a᷺︬̖֚b"#, r#"a᷺︬̖֚b"#, r#"a᷺︬̖֚b"#, r#"a᷺︬̖֚b"#, r#"a᷺︬̖֚b"#),
+        (r#"a᷺̖︭֚b"#, r#"a᷺̖︭֚b"#, r#"a᷺̖︭֚b"#, r#"a᷺̖︭֚b"#, r#"a᷺̖︭֚b"#),
+        (r#"a᷺︭̖֚b"#, r#"a᷺︭̖֚b"#, r#"a᷺︭̖֚b"#, r#"a᷺︭̖֚b"#, r#"a᷺︭̖֚b"#),
+        (r#"à֮︮̕b"#, r#"à֮︮̕b"#, r#"à֮︮̕b"#, r#"à֮︮̕b"#, r#"à֮︮̕b"#),
+        (r#"a֮︮̀̕b"#, r#"a֮︮̀̕b"#, r#"a֮︮̀̕b"#, r#"a֮︮̀̕b"#, r#"a֮︮̀̕b"#),
+        (r#"à֮︯̕b"#, r#"à֮︯̕b"#, r#"à֮︯̕b"#, r#"à֮︯̕b"#, r#"à֮︯̕b"#),
+        (r#"a֮︯̀̕b"#, r#"a֮︯̀̕b"#, r#"a֮︯̀̕b"#, r#"a֮︯̀̕b"#, r#"a֮︯̀̕b"#),
+        (r#"a᷺̖𐇽֚b"#, r#"a᷺̖𐇽֚b"#, r#"a᷺̖𐇽֚b"#, r#"a᷺̖𐇽֚b"#, r#"a᷺̖𐇽֚b"#),
+        (r#"a᷺𐇽̖֚b"#, r#"a᷺𐇽̖֚b"#, r#"a᷺𐇽̖֚b"#, r#"a᷺𐇽̖֚b"#, r#"a᷺𐇽̖֚b"#),
+        (r#"a᷺̖𐋠֚b"#, r#"a᷺̖𐋠֚b"#, r#"a᷺̖𐋠֚b"#, r#"a᷺̖𐋠֚b"#, r#"a᷺̖𐋠֚b"#),
+        (r#"a᷺𐋠̖֚b"#, r#"a᷺𐋠̖֚b"#, r#"a᷺𐋠̖֚b"#, r#"a᷺𐋠̖֚b"#, r#"a᷺𐋠̖֚b"#),
+        (r#"à֮𐍶̕b"#, r#"à֮𐍶̕b"#, r#"à֮𐍶̕b"#, r#"à֮𐍶̕b"#, r#"à֮𐍶̕b"#),
+        (r#"a֮𐍶̀̕b"#, r#"a֮𐍶̀̕b"#, r#"a֮𐍶̀̕b"#, r#"a֮𐍶̀̕b"#, r#"a֮𐍶̀̕b"#),
+        (r#"à֮𐍷̕b"#, r#"à֮𐍷̕b"#, r#"à֮𐍷̕b"#, r#"à֮𐍷̕b"#, r#"à֮𐍷̕b"#),
+        (r#"a֮𐍷̀̕b"#, r#"a֮𐍷̀̕b"#, r#"a֮𐍷̀̕b"#, r#"a֮𐍷̀̕b"#, r#"a֮𐍷̀̕b"#),
+        (r#"à֮𐍸̕b"#, r#"à֮𐍸̕b"#, r#"à֮𐍸̕b"#, r#"à֮𐍸̕b"#, r#"à֮𐍸̕b"#),
+        (r#"a֮𐍸̀̕b"#, r#"a֮𐍸̀̕b"#, r#"a֮𐍸̀̕b"#, r#"a֮𐍸̀̕b"#, r#"a֮𐍸̀̕b"#),
+        (r#"à֮𐍹̕b"#, r#"à֮𐍹̕b"#, r#"à֮𐍹̕b"#, r#"à֮𐍹̕b"#, r#"à֮𐍹̕b"#),
+        (r#"a֮𐍹̀̕b"#, r#"a֮𐍹̀̕b"#, r#"a֮𐍹̀̕b"#, r#"a֮𐍹̀̕b"#, r#"a֮𐍹̀̕b"#),
+        (r#"à֮𐍺̕b"#, r#"à֮𐍺̕b"#, r#"à֮𐍺̕b"#, r#"à֮𐍺̕b"#, r#"à֮𐍺̕b"#),
+        (r#"a֮𐍺̀̕b"#, r#"a֮𐍺̀̕b"#, r#"a֮𐍺̀̕b"#, r#"a֮𐍺̀̕b"#, r#"a֮𐍺̀̕b"#),
+        (r#"a᷺̖𐨍֚b"#, r#"a᷺̖𐨍֚b"#, r#"a᷺̖𐨍֚b"#, r#"a᷺̖𐨍֚b"#, r#"a᷺̖𐨍֚b"#),
+        (r#"a᷺𐨍̖֚b"#, r#"a᷺𐨍̖֚b"#, r#"a᷺𐨍̖֚b"#, r#"a᷺𐨍̖֚b"#, r#"a᷺𐨍̖֚b"#),
+        (r#"à֮𐨏̕b"#, r#"à֮𐨏̕b"#, r#"à֮𐨏̕b"#, r#"à֮𐨏̕b"#, r#"à֮𐨏̕b"#),
+        (r#"a֮𐨏̀̕b"#, r#"a֮𐨏̀̕b"#, r#"a֮𐨏̀̕b"#, r#"a֮𐨏̀̕b"#, r#"a֮𐨏̀̕b"#),
+        (r#"à֮𐨸̕b"#, r#"à֮𐨸̕b"#, r#"à֮𐨸̕b"#, r#"à֮𐨸̕b"#, r#"à֮𐨸̕b"#),
+        (r#"a֮𐨸̀̕b"#, r#"a֮𐨸̀̕b"#, r#"a֮𐨸̀̕b"#, r#"a֮𐨸̀̕b"#, r#"a֮𐨸̀̕b"#),
+        (r#"a̴𐨹𖿰b"#, r#"a̴𐨹𖿰b"#, r#"a̴𐨹𖿰b"#, r#"a̴𐨹𖿰b"#, r#"a̴𐨹𖿰b"#),
+        (r#"a𐨹̴𖿰b"#, r#"a𐨹̴𖿰b"#, r#"a𐨹̴𖿰b"#, r#"a𐨹̴𖿰b"#, r#"a𐨹̴𖿰b"#),
+        (r#"a᷺̖𐨺֚b"#, r#"a᷺̖𐨺֚b"#, r#"a᷺̖𐨺֚b"#, r#"a᷺̖𐨺֚b"#, r#"a᷺̖𐨺֚b"#),
+        (r#"a᷺𐨺̖֚b"#, r#"a᷺𐨺̖֚b"#, r#"a᷺𐨺̖֚b"#, r#"a᷺𐨺̖֚b"#, r#"a᷺𐨺̖֚b"#),
+        (r#"a゙्𐨿ְb"#, r#"a゙्𐨿ְb"#, r#"a゙्𐨿ְb"#, r#"a゙्𐨿ְb"#, r#"a゙्𐨿ְb"#),
+        (r#"a゙𐨿्ְb"#, r#"a゙𐨿्ְb"#, r#"a゙𐨿्ְb"#, r#"a゙𐨿्ְb"#, r#"a゙𐨿्ְb"#),
+        (r#"à֮𐫥̕b"#, r#"à֮𐫥̕b"#, r#"à֮𐫥̕b"#, r#"à֮𐫥̕b"#, r#"à֮𐫥̕b"#),
+        (r#"a֮𐫥̀̕b"#, r#"a֮𐫥̀̕b"#, r#"a֮𐫥̀̕b"#, r#"a֮𐫥̀̕b"#, r#"a֮𐫥̀̕b"#),
+        (r#"a᷺̖𐫦֚b"#, r#"a᷺̖𐫦֚b"#, r#"a᷺̖𐫦֚b"#, r#"a᷺̖𐫦֚b"#, r#"a᷺̖𐫦֚b"#),
+        (r#"a᷺𐫦̖֚b"#, r#"a᷺𐫦̖֚b"#, r#"a᷺𐫦̖֚b"#, r#"a᷺𐫦̖֚b"#, r#"a᷺𐫦̖֚b"#),
+        (r#"à֮𐴤̕b"#, r#"à֮𐴤̕b"#, r#"à֮𐴤̕b"#, r#"à֮𐴤̕b"#, r#"à֮𐴤̕b"#),
+        (r#"a֮𐴤̀̕b"#, r#"a֮𐴤̀̕b"#, r#"a֮𐴤̀̕b"#, r#"a֮𐴤̀̕b"#, r#"a֮𐴤̀̕b"#),
+        (r#"à֮𐴥̕b"#, r#"à֮𐴥̕b"#, r#"à֮𐴥̕b"#, r#"à֮𐴥̕b"#, r#"à֮𐴥̕b"#),
+        (r#"a֮𐴥̀̕b"#, r#"a֮𐴥̀̕b"#, r#"a֮𐴥̀̕b"#, r#"a֮𐴥̀̕b"#, r#"a֮𐴥̀̕b"#),
+        (r#"à֮𐴦̕b"#, r#"à֮𐴦̕b"#, r#"à֮𐴦̕b"#, r#"à֮𐴦̕b"#, r#"à֮𐴦̕b"#),
+        (r#"a֮𐴦̀̕b"#, r#"a֮𐴦̀̕b"#, r#"a֮𐴦̀̕b"#, r#"a֮𐴦̀̕b"#, r#"a֮𐴦̀̕b"#),
+        (r#"à֮𐴧̕b"#, r#"à֮𐴧̕b"#, r#"à֮𐴧̕b"#, r#"à֮𐴧̕b"#, r#"à֮𐴧̕b"#),
+        (r#"a֮𐴧̀̕b"#, r#"a֮𐴧̀̕b"#, r#"a֮𐴧̀̕b"#, r#"a֮𐴧̀̕b"#, r#"a֮𐴧̀̕b"#),
+        (r#"à֮𐺫̕b"#, r#"à֮𐺫̕b"#, r#"à֮𐺫̕b"#, r#"à֮𐺫̕b"#, r#"à֮𐺫̕b"#),
+        (r#"a֮𐺫̀̕b"#, r#"a֮𐺫̀̕b"#, r#"a֮𐺫̀̕b"#, r#"a֮𐺫̀̕b"#, r#"a֮𐺫̀̕b"#),
+        (r#"à֮𐺬̕b"#, r#"à֮𐺬̕b"#, r#"à֮𐺬̕b"#, r#"à֮𐺬̕b"#, r#"à֮𐺬̕b"#),
+        (r#"a֮𐺬̀̕b"#, r#"a֮𐺬̀̕b"#, r#"a֮𐺬̀̕b"#, r#"a֮𐺬̀̕b"#, r#"a֮𐺬̀̕b"#),
+        (r#"a᷺̖𐻽֚b"#, r#"a᷺̖𐻽֚b"#, r#"a᷺̖𐻽֚b"#, r#"a᷺̖𐻽֚b"#, r#"a᷺̖𐻽֚b"#),
+        (r#"a᷺𐻽̖֚b"#, r#"a᷺𐻽̖֚b"#, r#"a᷺𐻽̖֚b"#, r#"a᷺𐻽̖֚b"#, r#"a᷺𐻽̖֚b"#),
+        (r#"a᷺̖𐻾֚b"#, r#"a᷺̖𐻾֚b"#, r#"a᷺̖𐻾֚b"#, r#"a᷺̖𐻾֚b"#, r#"a᷺̖𐻾֚b"#),
+        (r#"a᷺𐻾̖֚b"#, r#"a᷺𐻾̖֚b"#, r#"a᷺𐻾̖֚b"#, r#"a᷺𐻾̖֚b"#, r#"a᷺𐻾̖֚b"#),
+        (r#"a᷺̖𐻿֚b"#, r#"a᷺̖𐻿֚b"#, r#"a᷺̖𐻿֚b"#, r#"a᷺̖𐻿֚b"#, r#"a᷺̖𐻿֚b"#),
+        (r#"a᷺𐻿̖֚b"#, r#"a᷺𐻿̖֚b"#, r#"a᷺𐻿̖֚b"#, r#"a᷺𐻿̖֚b"#, r#"a᷺𐻿̖֚b"#),
+        (r#"a᷺̖𐽆֚b"#, r#"a᷺̖𐽆֚b"#, r#"a᷺̖𐽆֚b"#, r#"a᷺̖𐽆֚b"#, r#"a᷺̖𐽆֚b"#),
+        (r#"a᷺𐽆̖֚b"#, r#"a᷺𐽆̖֚b"#, r#"a᷺𐽆̖֚b"#, r#"a᷺𐽆̖֚b"#, r#"a᷺𐽆̖֚b"#),
+        (r#"a᷺̖𐽇֚b"#, r#"a᷺̖𐽇֚b"#, r#"a᷺̖𐽇֚b"#, r#"a᷺̖𐽇֚b"#, r#"a᷺̖𐽇֚b"#),
+        (r#"a᷺𐽇̖֚b"#, r#"a᷺𐽇̖֚b"#, r#"a᷺𐽇̖֚b"#, r#"a᷺𐽇̖֚b"#, r#"a᷺𐽇̖֚b"#),
+        (r#"à֮𐽈̕b"#, r#"à֮𐽈̕b"#, r#"à֮𐽈̕b"#, r#"à֮𐽈̕b"#, r#"à֮𐽈̕b"#),
+        (r#"a֮𐽈̀̕b"#, r#"a֮𐽈̀̕b"#, r#"a֮𐽈̀̕b"#, r#"a֮𐽈̀̕b"#, r#"a֮𐽈̀̕b"#),
+        (r#"à֮𐽉̕b"#, r#"à֮𐽉̕b"#, r#"à֮𐽉̕b"#, r#"à֮𐽉̕b"#, r#"à֮𐽉̕b"#),
+        (r#"a֮𐽉̀̕b"#, r#"a֮𐽉̀̕b"#, r#"a֮𐽉̀̕b"#, r#"a֮𐽉̀̕b"#, r#"a֮𐽉̀̕b"#),
+        (r#"à֮𐽊̕b"#, r#"à֮𐽊̕b"#, r#"à֮𐽊̕b"#, r#"à֮𐽊̕b"#, r#"à֮𐽊̕b"#),
+        (r#"a֮𐽊̀̕b"#, r#"a֮𐽊̀̕b"#, r#"a֮𐽊̀̕b"#, r#"a֮𐽊̀̕b"#, r#"a֮𐽊̀̕b"#),
+        (r#"a᷺̖𐽋֚b"#, r#"a᷺̖𐽋֚b"#, r#"a᷺̖𐽋֚b"#, r#"a᷺̖𐽋֚b"#, r#"a᷺̖𐽋֚b"#),
+        (r#"a᷺𐽋̖֚b"#, r#"a᷺𐽋̖֚b"#, r#"a᷺𐽋̖֚b"#, r#"a᷺𐽋̖֚b"#, r#"a᷺𐽋̖֚b"#),
+        (r#"à֮𐽌̕b"#, r#"à֮𐽌̕b"#, r#"à֮𐽌̕b"#, r#"à֮𐽌̕b"#, r#"à֮𐽌̕b"#),
+        (r#"a֮𐽌̀̕b"#, r#"a֮𐽌̀̕b"#, r#"a֮𐽌̀̕b"#, r#"a֮𐽌̀̕b"#, r#"a֮𐽌̀̕b"#),
+        (r#"a᷺̖𐽍֚b"#, r#"a᷺̖𐽍֚b"#, r#"a᷺̖𐽍֚b"#, r#"a᷺̖𐽍֚b"#, r#"a᷺̖𐽍֚b"#),
+        (r#"a᷺𐽍̖֚b"#, r#"a᷺𐽍̖֚b"#, r#"a᷺𐽍̖֚b"#, r#"a᷺𐽍̖֚b"#, r#"a᷺𐽍̖֚b"#),
+        (r#"a᷺̖𐽎֚b"#, r#"a᷺̖𐽎֚b"#, r#"a᷺̖𐽎֚b"#, r#"a᷺̖𐽎֚b"#, r#"a᷺̖𐽎֚b"#),
+        (r#"a᷺𐽎̖֚b"#, r#"a᷺𐽎̖֚b"#, r#"a᷺𐽎̖֚b"#, r#"a᷺𐽎̖֚b"#, r#"a᷺𐽎̖֚b"#),
+        (r#"a᷺̖𐽏֚b"#, r#"a᷺̖𐽏֚b"#, r#"a᷺̖𐽏֚b"#, r#"a᷺̖𐽏֚b"#, r#"a᷺̖𐽏֚b"#),
+        (r#"a᷺𐽏̖֚b"#, r#"a᷺𐽏̖֚b"#, r#"a᷺𐽏̖֚b"#, r#"a᷺𐽏̖֚b"#, r#"a᷺𐽏̖֚b"#),
+        (r#"a᷺̖𐽐֚b"#, r#"a᷺̖𐽐֚b"#, r#"a᷺̖𐽐֚b"#, r#"a᷺̖𐽐֚b"#, r#"a᷺̖𐽐֚b"#),
+        (r#"a᷺𐽐̖֚b"#, r#"a᷺𐽐̖֚b"#, r#"a᷺𐽐̖֚b"#, r#"a᷺𐽐̖֚b"#, r#"a᷺𐽐̖֚b"#),
+        (r#"à֮𐾂̕b"#, r#"à֮𐾂̕b"#, r#"à֮𐾂̕b"#, r#"à֮𐾂̕b"#, r#"à֮𐾂̕b"#),
+        (r#"a֮𐾂̀̕b"#, r#"a֮𐾂̀̕b"#, r#"a֮𐾂̀̕b"#, r#"a֮𐾂̀̕b"#, r#"a֮𐾂̀̕b"#),
+        (r#"a᷺̖𐾃֚b"#, r#"a᷺̖𐾃֚b"#, r#"a᷺̖𐾃֚b"#, r#"a᷺̖𐾃֚b"#, r#"a᷺̖𐾃֚b"#),
+        (r#"a᷺𐾃̖֚b"#, r#"a᷺𐾃̖֚b"#, r#"a᷺𐾃̖֚b"#, r#"a᷺𐾃̖֚b"#, r#"a᷺𐾃̖֚b"#),
+        (r#"à֮𐾄̕b"#, r#"à֮𐾄̕b"#, r#"à֮𐾄̕b"#, r#"à֮𐾄̕b"#, r#"à֮𐾄̕b"#),
+        (r#"a֮𐾄̀̕b"#, r#"a֮𐾄̀̕b"#, r#"a֮𐾄̀̕b"#, r#"a֮𐾄̀̕b"#, r#"a֮𐾄̀̕b"#),
+        (r#"a᷺̖𐾅֚b"#, r#"a᷺̖𐾅֚b"#, r#"a᷺̖𐾅֚b"#, r#"a᷺̖𐾅֚b"#, r#"a᷺̖𐾅֚b"#),
+        (r#"a᷺𐾅̖֚b"#, r#"a᷺𐾅̖֚b"#, r#"a᷺𐾅̖֚b"#, r#"a᷺𐾅̖֚b"#, r#"a᷺𐾅̖֚b"#),
+        (r#"a゙्𑁆ְb"#, r#"a゙्𑁆ְb"#, r#"a゙्𑁆ְb"#, r#"a゙्𑁆ְb"#, r#"a゙्𑁆ְb"#),
+        (r#"a゙𑁆्ְb"#, r#"a゙𑁆्ְb"#, r#"a゙𑁆्ְb"#, r#"a゙𑁆्ְb"#, r#"a゙𑁆्ְb"#),
+        (r#"a゙्𑁰ְb"#, r#"a゙्𑁰ְb"#, r#"a゙्𑁰ְb"#, r#"a゙्𑁰ְb"#, r#"a゙्𑁰ְb"#),
+        (r#"a゙𑁰्ְb"#, r#"a゙𑁰्ְb"#, r#"a゙𑁰्ְb"#, r#"a゙𑁰्ְb"#, r#"a゙𑁰्ְb"#),
+        (r#"a゙्𑁿ְb"#, r#"a゙्𑁿ְb"#, r#"a゙्𑁿ְb"#, r#"a゙्𑁿ְb"#, r#"a゙्𑁿ְb"#),
+        (r#"a゙𑁿्ְb"#, r#"a゙𑁿्ְb"#, r#"a゙𑁿्ְb"#, r#"a゙𑁿्ְb"#, r#"a゙𑁿्ְb"#),
+        (r#"a゙्𑂹ְb"#, r#"a゙्𑂹ְb"#, r#"a゙्𑂹ְb"#, r#"a゙्𑂹ְb"#, r#"a゙्𑂹ְb"#),
+        (r#"a゙𑂹्ְb"#, r#"a゙𑂹्ְb"#, r#"a゙𑂹्ְb"#, r#"a゙𑂹्ְb"#, r#"a゙𑂹्ְb"#),
+        (r#"a𖿰़𑂺゙b"#, r#"a𖿰़𑂺゙b"#, r#"a𖿰़𑂺゙b"#, r#"a𖿰़𑂺゙b"#, r#"a𖿰़𑂺゙b"#),
+        (r#"a𖿰𑂺़゙b"#, r#"a𖿰𑂺़゙b"#, r#"a𖿰𑂺़゙b"#, r#"a𖿰𑂺़゙b"#, r#"a𖿰𑂺़゙b"#),
+        (r#"à֮𑄀̕b"#, r#"à֮𑄀̕b"#, r#"à֮𑄀̕b"#, r#"à֮𑄀̕b"#, r#"à֮𑄀̕b"#),
+        (r#"a֮𑄀̀̕b"#, r#"a֮𑄀̀̕b"#, r#"a֮𑄀̀̕b"#, r#"a֮𑄀̀̕b"#, r#"a֮𑄀̀̕b"#),
+        (r#"à֮𑄁̕b"#, r#"à֮𑄁̕b"#, r#"à֮𑄁̕b"#, r#"à֮𑄁̕b"#, r#"à֮𑄁̕b"#),
+        (r#"a֮𑄁̀̕b"#, r#"a֮𑄁̀̕b"#, r#"a֮𑄁̀̕b"#, r#"a֮𑄁̀̕b"#, r#"a֮𑄁̀̕b"#),
+        (r#"à֮𑄂̕b"#, r#"à֮𑄂̕b"#, r#"à֮𑄂̕b"#, r#"à֮𑄂̕b"#, r#"à֮𑄂̕b"#),
+        (r#"a֮𑄂̀̕b"#, r#"a֮𑄂̀̕b"#, r#"a֮𑄂̀̕b"#, r#"a֮𑄂̀̕b"#, r#"a֮𑄂̀̕b"#),
+        (r#"a゙्𑄳ְb"#, r#"a゙्𑄳ְb"#, r#"a゙्𑄳ְb"#, r#"a゙्𑄳ְb"#, r#"a゙्𑄳ְb"#),
+        (r#"a゙𑄳्ְb"#, r#"a゙𑄳्ְb"#, r#"a゙𑄳्ְb"#, r#"a゙𑄳्ְb"#, r#"a゙𑄳्ְb"#),
+        (r#"a゙्𑄴ְb"#, r#"a゙्𑄴ְb"#, r#"a゙्𑄴ְb"#, r#"a゙्𑄴ְb"#, r#"a゙्𑄴ְb"#),
+        (r#"a゙𑄴्ְb"#, r#"a゙𑄴्ְb"#, r#"a゙𑄴्ְb"#, r#"a゙𑄴्ְb"#, r#"a゙𑄴्ְb"#),
+        (r#"a𖿰़𑅳゙b"#, r#"a𖿰़𑅳゙b"#, r#"a𖿰़𑅳゙b"#, r#"a𖿰़𑅳゙b"#, r#"a𖿰़𑅳゙b"#),
+        (r#"a𖿰𑅳़゙b"#, r#"a𖿰𑅳़゙b"#, r#"a𖿰𑅳़゙b"#, r#"a𖿰𑅳़゙b"#, r#"a𖿰𑅳़゙b"#),
+        (r#"a゙्𑇀ְb"#, r#"a゙्𑇀ְb"#, r#"a゙्𑇀ְb"#, r#"a゙्𑇀ְb"#, r#"a゙्𑇀ְb"#),
+        (r#"a゙𑇀्ְb"#, r#"a゙𑇀्ְb"#, r#"a゙𑇀्ְb"#, r#"a゙𑇀्ְb"#, r#"a゙𑇀्ְb"#),
+        (r#"a𖿰़𑇊゙b"#, r#"a𖿰़𑇊゙b"#, r#"a𖿰़𑇊゙b"#, r#"a𖿰़𑇊゙b"#, r#"a𖿰़𑇊゙b"#),
+        (r#"a𖿰𑇊़゙b"#, r#"a𖿰𑇊़゙b"#, r#"a𖿰𑇊़゙b"#, r#"a𖿰𑇊़゙b"#, r#"a𖿰𑇊़゙b"#),
+        (r#"a゙्𑈵ְb"#, r#"a゙्𑈵ְb"#, r#"a゙्𑈵ְb"#, r#"a゙्𑈵ְb"#, r#"a゙्𑈵ְb"#),
+        (r#"a゙𑈵्ְb"#, r#"a゙𑈵्ְb"#, r#"a゙𑈵्ְb"#, r#"a゙𑈵्ְb"#, r#"a゙𑈵्ְb"#),
+        (r#"a𖿰़𑈶゙b"#, r#"a𖿰़𑈶゙b"#, r#"a𖿰़𑈶゙b"#, r#"a𖿰़𑈶゙b"#, r#"a𖿰़𑈶゙b"#),
+        (r#"a𖿰𑈶़゙b"#, r#"a𖿰𑈶़゙b"#, r#"a𖿰𑈶़゙b"#, r#"a𖿰𑈶़゙b"#, r#"a𖿰𑈶़゙b"#),
+        (r#"a𖿰़𑋩゙b"#, r#"a𖿰़𑋩゙b"#, r#"a𖿰़𑋩゙b"#, r#"a𖿰़𑋩゙b"#, r#"a𖿰़𑋩゙b"#),
+        (r#"a𖿰𑋩़゙b"#, r#"a𖿰𑋩़゙b"#, r#"a𖿰𑋩़゙b"#, r#"a𖿰𑋩़゙b"#, r#"a𖿰𑋩़゙b"#),
+        (r#"a゙्𑋪ְb"#, r#"a゙्𑋪ְb"#, r#"a゙्𑋪ְb"#, r#"a゙्𑋪ְb"#, r#"a゙्𑋪ְb"#),
+        (r#"a゙𑋪्ְb"#, r#"a゙𑋪्ְb"#, r#"a゙𑋪्ְb"#, r#"a゙𑋪्ְb"#, r#"a゙𑋪्ְb"#),
+        (r#"a𖿰़𑌻゙b"#, r#"a𖿰़𑌻゙b"#, r#"a𖿰़𑌻゙b"#, r#"a𖿰़𑌻゙b"#, r#"a𖿰़𑌻゙b"#),
+        (r#"a𖿰𑌻़゙b"#, r#"a𖿰𑌻़゙b"#, r#"a𖿰𑌻़゙b"#, r#"a𖿰𑌻़゙b"#, r#"a𖿰𑌻़゙b"#),
+        (r#"a𖿰़𑌼゙b"#, r#"a𖿰़𑌼゙b"#, r#"a𖿰़𑌼゙b"#, r#"a𖿰़𑌼゙b"#, r#"a𖿰़𑌼゙b"#),
+        (r#"a𖿰𑌼़゙b"#, r#"a𖿰𑌼़゙b"#, r#"a𖿰𑌼़゙b"#, r#"a𖿰𑌼़゙b"#, r#"a𖿰𑌼़゙b"#),
+        (r#"a゙्𑍍ְb"#, r#"a゙्𑍍ְb"#, r#"a゙्𑍍ְb"#, r#"a゙्𑍍ְb"#, r#"a゙्𑍍ְb"#),
+        (r#"a゙𑍍्ְb"#, r#"a゙𑍍्ְb"#, r#"a゙𑍍्ְb"#, r#"a゙𑍍्ְb"#, r#"a゙𑍍्ְb"#),
+        (r#"à֮𑍦̕b"#, r#"à֮𑍦̕b"#, r#"à֮𑍦̕b"#, r#"à֮𑍦̕b"#, r#"à֮𑍦̕b"#),
+        (r#"a֮𑍦̀̕b"#, r#"a֮𑍦̀̕b"#, r#"a֮𑍦̀̕b"#, r#"a֮𑍦̀̕b"#, r#"a֮𑍦̀̕b"#),
+        (r#"à֮𑍧̕b"#, r#"à֮𑍧̕b"#, r#"à֮𑍧̕b"#, r#"à֮𑍧̕b"#, r#"à֮𑍧̕b"#),
+        (r#"a֮𑍧̀̕b"#, r#"a֮𑍧̀̕b"#, r#"a֮𑍧̀̕b"#, r#"a֮𑍧̀̕b"#, r#"a֮𑍧̀̕b"#),
+        (r#"à֮𑍨̕b"#, r#"à֮𑍨̕b"#, r#"à֮𑍨̕b"#, r#"à֮𑍨̕b"#, r#"à֮𑍨̕b"#),
+        (r#"a֮𑍨̀̕b"#, r#"a֮𑍨̀̕b"#, r#"a֮𑍨̀̕b"#, r#"a֮𑍨̀̕b"#, r#"a֮𑍨̀̕b"#),
+        (r#"à֮𑍩̕b"#, r#"à֮𑍩̕b"#, r#"à֮𑍩̕b"#, r#"à֮𑍩̕b"#, r#"à֮𑍩̕b"#),
+        (r#"a֮𑍩̀̕b"#, r#"a֮𑍩̀̕b"#, r#"a֮𑍩̀̕b"#, r#"a֮𑍩̀̕b"#, r#"a֮𑍩̀̕b"#),
+        (r#"à֮𑍪̕b"#, r#"à֮𑍪̕b"#, r#"à֮𑍪̕b"#, r#"à֮𑍪̕b"#, r#"à֮𑍪̕b"#),
+        (r#"a֮𑍪̀̕b"#, r#"a֮𑍪̀̕b"#, r#"a֮𑍪̀̕b"#, r#"a֮𑍪̀̕b"#, r#"a֮𑍪̀̕b"#),
+        (r#"à֮𑍫̕b"#, r#"à֮𑍫̕b"#, r#"à֮𑍫̕b"#, r#"à֮𑍫̕b"#, r#"à֮𑍫̕b"#),
+        (r#"a֮𑍫̀̕b"#, r#"a֮𑍫̀̕b"#, r#"a֮𑍫̀̕b"#, r#"a֮𑍫̀̕b"#, r#"a֮𑍫̀̕b"#),
+        (r#"à֮𑍬̕b"#, r#"à֮𑍬̕b"#, r#"à֮𑍬̕b"#, r#"à֮𑍬̕b"#, r#"à֮𑍬̕b"#),
+        (r#"a֮𑍬̀̕b"#, r#"a֮𑍬̀̕b"#, r#"a֮𑍬̀̕b"#, r#"a֮𑍬̀̕b"#, r#"a֮𑍬̀̕b"#),
+        (r#"à֮𑍰̕b"#, r#"à֮𑍰̕b"#, r#"à֮𑍰̕b"#, r#"à֮𑍰̕b"#, r#"à֮𑍰̕b"#),
+        (r#"a֮𑍰̀̕b"#, r#"a֮𑍰̀̕b"#, r#"a֮𑍰̀̕b"#, r#"a֮𑍰̀̕b"#, r#"a֮𑍰̀̕b"#),
+        (r#"à֮𑍱̕b"#, r#"à֮𑍱̕b"#, r#"à֮𑍱̕b"#, r#"à֮𑍱̕b"#, r#"à֮𑍱̕b"#),
+        (r#"a֮𑍱̀̕b"#, r#"a֮𑍱̀̕b"#, r#"a֮𑍱̀̕b"#, r#"a֮𑍱̀̕b"#, r#"a֮𑍱̀̕b"#),
+        (r#"à֮𑍲̕b"#, r#"à֮𑍲̕b"#, r#"à֮𑍲̕b"#, r#"à֮𑍲̕b"#, r#"à֮𑍲̕b"#),
+        (r#"a֮𑍲̀̕b"#, r#"a֮𑍲̀̕b"#, r#"a֮𑍲̀̕b"#, r#"a֮𑍲̀̕b"#, r#"a֮𑍲̀̕b"#),
+        (r#"à֮𑍳̕b"#, r#"à֮𑍳̕b"#, r#"à֮𑍳̕b"#, r#"à֮𑍳̕b"#, r#"à֮𑍳̕b"#),
+        (r#"a֮𑍳̀̕b"#, r#"a֮𑍳̀̕b"#, r#"a֮𑍳̀̕b"#, r#"a֮𑍳̀̕b"#, r#"a֮𑍳̀̕b"#),
+        (r#"à֮𑍴̕b"#, r#"à֮𑍴̕b"#, r#"à֮𑍴̕b"#, r#"à֮𑍴̕b"#, r#"à֮𑍴̕b"#),
+        (r#"a֮𑍴̀̕b"#, r#"a֮𑍴̀̕b"#, r#"a֮𑍴̀̕b"#, r#"a֮𑍴̀̕b"#, r#"a֮𑍴̀̕b"#),
+        (r#"a゙्𑑂ְb"#, r#"a゙्𑑂ְb"#, r#"a゙्𑑂ְb"#, r#"a゙्𑑂ְb"#, r#"a゙्𑑂ְb"#),
+        (r#"a゙𑑂्ְb"#, r#"a゙𑑂्ְb"#, r#"a゙𑑂्ְb"#, r#"a゙𑑂्ְb"#, r#"a゙𑑂्ְb"#),
+        (r#"a𖿰़𑑆゙b"#, r#"a𖿰़𑑆゙b"#, r#"a𖿰़𑑆゙b"#, r#"a𖿰़𑑆゙b"#, r#"a𖿰़𑑆゙b"#),
+        (r#"a𖿰𑑆़゙b"#, r#"a𖿰𑑆़゙b"#, r#"a𖿰𑑆़゙b"#, r#"a𖿰𑑆़゙b"#, r#"a𖿰𑑆़゙b"#),
+        (r#"à֮𑑞̕b"#, r#"à֮𑑞̕b"#, r#"à֮𑑞̕b"#, r#"à֮𑑞̕b"#, r#"à֮𑑞̕b"#),
+        (r#"a֮𑑞̀̕b"#, r#"a֮𑑞̀̕b"#, r#"a֮𑑞̀̕b"#, r#"a֮𑑞̀̕b"#, r#"a֮𑑞̀̕b"#),
+        (r#"a゙्𑓂ְb"#, r#"a゙्𑓂ְb"#, r#"a゙्𑓂ְb"#, r#"a゙्𑓂ְb"#, r#"a゙्𑓂ְb"#),
+        (r#"a゙𑓂्ְb"#, r#"a゙𑓂्ְb"#, r#"a゙𑓂्ְb"#, r#"a゙𑓂्ְb"#, r#"a゙𑓂्ְb"#),
+        (r#"a𖿰़𑓃゙b"#, r#"a𖿰़𑓃゙b"#, r#"a𖿰़𑓃゙b"#, r#"a𖿰़𑓃゙b"#, r#"a𖿰़𑓃゙b"#),
+        (r#"a𖿰𑓃़゙b"#, r#"a𖿰𑓃़゙b"#, r#"a𖿰𑓃़゙b"#, r#"a𖿰𑓃़゙b"#, r#"a𖿰𑓃़゙b"#),
+        (r#"a゙्𑖿ְb"#, r#"a゙्𑖿ְb"#, r#"a゙्𑖿ְb"#, r#"a゙्𑖿ְb"#, r#"a゙्𑖿ְb"#),
+        (r#"a゙𑖿्ְb"#, r#"a゙𑖿्ְb"#, r#"a゙𑖿्ְb"#, r#"a゙𑖿्ְb"#, r#"a゙𑖿्ְb"#),
+        (r#"a𖿰़𑗀゙b"#, r#"a𖿰़𑗀゙b"#, r#"a𖿰़𑗀゙b"#, r#"a𖿰़𑗀゙b"#, r#"a𖿰़𑗀゙b"#),
+        (r#"a𖿰𑗀़゙b"#, r#"a𖿰𑗀़゙b"#, r#"a𖿰𑗀़゙b"#, r#"a𖿰𑗀़゙b"#, r#"a𖿰𑗀़゙b"#),
+        (r#"a゙्𑘿ְb"#, r#"a゙्𑘿ְb"#, r#"a゙्𑘿ְb"#, r#"a゙्𑘿ְb"#, r#"a゙्𑘿ְb"#),
+        (r#"a゙𑘿्ְb"#, r#"a゙𑘿्ְb"#, r#"a゙𑘿्ְb"#, r#"a゙𑘿्ְb"#, r#"a゙𑘿्ְb"#),
+        (r#"a゙्𑚶ְb"#, r#"a゙्𑚶ְb"#, r#"a゙्𑚶ְb"#, r#"a゙्𑚶ְb"#, r#"a゙्𑚶ְb"#),
+        (r#"a゙𑚶्ְb"#, r#"a゙𑚶्ְb"#, r#"a゙𑚶्ְb"#, r#"a゙𑚶्ְb"#, r#"a゙𑚶्ְb"#),
+        (r#"a𖿰़𑚷゙b"#, r#"a𖿰़𑚷゙b"#, r#"a𖿰़𑚷゙b"#, r#"a𖿰़𑚷゙b"#, r#"a𖿰़𑚷゙b"#),
+        (r#"a𖿰𑚷़゙b"#, r#"a𖿰𑚷़゙b"#, r#"a𖿰𑚷़゙b"#, r#"a𖿰𑚷़゙b"#, r#"a𖿰𑚷़゙b"#),
+        (r#"a゙्𑜫ְb"#, r#"a゙्𑜫ְb"#, r#"a゙्𑜫ְb"#, r#"a゙्𑜫ְb"#, r#"a゙्𑜫ְb"#),
+        (r#"a゙𑜫्ְb"#, r#"a゙𑜫्ְb"#, r#"a゙𑜫्ְb"#, r#"a゙𑜫्ְb"#, r#"a゙𑜫्ְb"#),
+        (r#"a゙्𑠹ְb"#, r#"a゙्𑠹ְb"#, r#"a゙्𑠹ְb"#, r#"a゙्𑠹ְb"#, r#"a゙्𑠹ְb"#),
+        (r#"a゙𑠹्ְb"#, r#"a゙𑠹्ְb"#, r#"a゙𑠹्ְb"#, r#"a゙𑠹्ְb"#, r#"a゙𑠹्ְb"#),
+        (r#"a𖿰़𑠺゙b"#, r#"a𖿰़𑠺゙b"#, r#"a𖿰़𑠺゙b"#, r#"a𖿰़𑠺゙b"#, r#"a𖿰़𑠺゙b"#),
+        (r#"a𖿰𑠺़゙b"#, r#"a𖿰𑠺़゙b"#, r#"a𖿰𑠺़゙b"#, r#"a𖿰𑠺़゙b"#, r#"a𖿰𑠺़゙b"#),
+        (r#"a゙्𑤽ְb"#, r#"a゙्𑤽ְb"#, r#"a゙्𑤽ְb"#, r#"a゙्𑤽ְb"#, r#"a゙्𑤽ְb"#),
+        (r#"a゙𑤽्ְb"#, r#"a゙𑤽्ְb"#, r#"a゙𑤽्ְb"#, r#"a゙𑤽्ְb"#, r#"a゙𑤽्ְb"#),
+        (r#"a゙्𑤾ְb"#, r#"a゙्𑤾ְb"#, r#"a゙्𑤾ְb"#, r#"a゙्𑤾ְb"#, r#"a゙्𑤾ְb"#),
+        (r#"a゙𑤾्ְb"#, r#"a゙𑤾्ְb"#, r#"a゙𑤾्ְb"#, r#"a゙𑤾्ְb"#, r#"a゙𑤾्ְb"#),
+        (r#"a𖿰़𑥃゙b"#, r#"a𖿰़𑥃゙b"#, r#"a𖿰़𑥃゙b"#, r#"a𖿰़𑥃゙b"#, r#"a𖿰़𑥃゙b"#),
+        (r#"a𖿰𑥃़゙b"#, r#"a𖿰𑥃़゙b"#, r#"a𖿰𑥃़゙b"#, r#"a𖿰𑥃़゙b"#, r#"a𖿰𑥃़゙b"#),
+        (r#"a゙्𑧠ְb"#, r#"a゙्𑧠ְb"#, r#"a゙्𑧠ְb"#, r#"a゙्𑧠ְb"#, r#"a゙्𑧠ְb"#),
+        (r#"a゙𑧠्ְb"#, r#"a゙𑧠्ְb"#, r#"a゙𑧠्ְb"#, r#"a゙𑧠्ְb"#, r#"a゙𑧠्ְb"#),
+        (r#"a゙्𑨴ְb"#, r#"a゙्𑨴ְb"#, r#"a゙्𑨴ְb"#, r#"a゙्𑨴ְb"#, r#"a゙्𑨴ְb"#),
+        (r#"a゙𑨴्ְb"#, r#"a゙𑨴्ְb"#, r#"a゙𑨴्ְb"#, r#"a゙𑨴्ְb"#, r#"a゙𑨴्ְb"#),
+        (r#"a゙्𑩇ְb"#, r#"a゙्𑩇ְb"#, r#"a゙्𑩇ְb"#, r#"a゙्𑩇ְb"#, r#"a゙्𑩇ְb"#),
+        (r#"a゙𑩇्ְb"#, r#"a゙𑩇्ְb"#, r#"a゙𑩇्ְb"#, r#"a゙𑩇्ְb"#, r#"a゙𑩇्ְb"#),
+        (r#"a゙्𑪙ְb"#, r#"a゙्𑪙ְb"#, r#"a゙्𑪙ְb"#, r#"a゙्𑪙ְb"#, r#"a゙्𑪙ְb"#),
+        (r#"a゙𑪙्ְb"#, r#"a゙𑪙्ְb"#, r#"a゙𑪙्ְb"#, r#"a゙𑪙्ְb"#, r#"a゙𑪙्ְb"#),
+        (r#"a゙्𑰿ְb"#, r#"a゙्𑰿ְb"#, r#"a゙्𑰿ְb"#, r#"a゙्𑰿ְb"#, r#"a゙्𑰿ְb"#),
+        (r#"a゙𑰿्ְb"#, r#"a゙𑰿्ְb"#, r#"a゙𑰿्ְb"#, r#"a゙𑰿्ְb"#, r#"a゙𑰿्ְb"#),
+        (r#"a𖿰़𑵂゙b"#, r#"a𖿰़𑵂゙b"#, r#"a𖿰़𑵂゙b"#, r#"a𖿰़𑵂゙b"#, r#"a𖿰़𑵂゙b"#),
+        (r#"a𖿰𑵂़゙b"#, r#"a𖿰𑵂़゙b"#, r#"a𖿰𑵂़゙b"#, r#"a𖿰𑵂़゙b"#, r#"a𖿰𑵂़゙b"#),
+        (r#"a゙्𑵄ְb"#, r#"a゙्𑵄ְb"#, r#"a゙्𑵄ְb"#, r#"a゙्𑵄ְb"#, r#"a゙्𑵄ְb"#),
+        (r#"a゙𑵄्ְb"#, r#"a゙𑵄्ְb"#, r#"a゙𑵄्ְb"#, r#"a゙𑵄्ְb"#, r#"a゙𑵄्ְb"#),
+        (r#"a゙्𑵅ְb"#, r#"a゙्𑵅ְb"#, r#"a゙्𑵅ְb"#, r#"a゙्𑵅ְb"#, r#"a゙्𑵅ְb"#),
+        (r#"a゙𑵅्ְb"#, r#"a゙𑵅्ְb"#, r#"a゙𑵅्ְb"#, r#"a゙𑵅्ְb"#, r#"a゙𑵅्ְb"#),
+        (r#"a゙्𑶗ְb"#, r#"a゙्𑶗ְb"#, r#"a゙्𑶗ְb"#, r#"a゙्𑶗ְb"#, r#"a゙्𑶗ְb"#),
+        (r#"a゙𑶗्ְb"#, r#"a゙𑶗्ְb"#, r#"a゙𑶗्ְb"#, r#"a゙𑶗्ְb"#, r#"a゙𑶗्ְb"#),
+        (r#"a゙्𑽁ְb"#, r#"a゙्𑽁ְb"#, r#"a゙्𑽁ְb"#, r#"a゙्𑽁ְb"#, r#"a゙्𑽁ְb"#),
+        (r#"a゙𑽁्ְb"#, r#"a゙𑽁्ְb"#, r#"a゙𑽁्ְb"#, r#"a゙𑽁्ְb"#, r#"a゙𑽁्ְb"#),
+        (r#"a゙्𑽂ְb"#, r#"a゙्𑽂ְb"#, r#"a゙्𑽂ְb"#, r#"a゙्𑽂ְb"#, r#"a゙्𑽂ְb"#),
+        (r#"a゙𑽂्ְb"#, r#"a゙𑽂्ְb"#, r#"a゙𑽂्ְb"#, r#"a゙𑽂्ְb"#, r#"a゙𑽂्ְb"#),
+        (r#"a̴𖫰𖿰b"#, r#"a̴𖫰𖿰b"#, r#"a̴𖫰𖿰b"#, r#"a̴𖫰𖿰b"#, r#"a̴𖫰𖿰b"#),
+        (r#"a𖫰̴𖿰b"#, r#"a𖫰̴𖿰b"#, r#"a𖫰̴𖿰b"#, r#"a𖫰̴𖿰b"#, r#"a𖫰̴𖿰b"#),
+        (r#"a̴𖫱𖿰b"#, r#"a̴𖫱𖿰b"#, r#"a̴𖫱𖿰b"#, r#"a̴𖫱𖿰b"#, r#"a̴𖫱𖿰b"#),
+        (r#"a𖫱̴𖿰b"#, r#"a𖫱̴𖿰b"#, r#"a𖫱̴𖿰b"#, r#"a𖫱̴𖿰b"#, r#"a𖫱̴𖿰b"#),
+        (r#"a̴𖫲𖿰b"#, r#"a̴𖫲𖿰b"#, r#"a̴𖫲𖿰b"#, r#"a̴𖫲𖿰b"#, r#"a̴𖫲𖿰b"#),
+        (r#"a𖫲̴𖿰b"#, r#"a𖫲̴𖿰b"#, r#"a𖫲̴𖿰b"#, r#"a𖫲̴𖿰b"#, r#"a𖫲̴𖿰b"#),
+        (r#"a̴𖫳𖿰b"#, r#"a̴𖫳𖿰b"#, r#"a̴𖫳𖿰b"#, r#"a̴𖫳𖿰b"#, r#"a̴𖫳𖿰b"#),
+        (r#"a𖫳̴𖿰b"#, r#"a𖫳̴𖿰b"#, r#"a𖫳̴𖿰b"#, r#"a𖫳̴𖿰b"#, r#"a𖫳̴𖿰b"#),
+        (r#"a̴𖫴𖿰b"#, r#"a̴𖫴𖿰b"#, r#"a̴𖫴𖿰b"#, r#"a̴𖫴𖿰b"#, r#"a̴𖫴𖿰b"#),
+        (r#"a𖫴̴𖿰b"#, r#"a𖫴̴𖿰b"#, r#"a𖫴̴𖿰b"#, r#"a𖫴̴𖿰b"#, r#"a𖫴̴𖿰b"#),
+        (r#"à֮𖬰̕b"#, r#"à֮𖬰̕b"#, r#"à֮𖬰̕b"#, r#"à֮𖬰̕b"#, r#"à֮𖬰̕b"#),
+        (r#"a֮𖬰̀̕b"#, r#"a֮𖬰̀̕b"#, r#"a֮𖬰̀̕b"#, r#"a֮𖬰̀̕b"#, r#"a֮𖬰̀̕b"#),
+        (r#"à֮𖬱̕b"#, r#"à֮𖬱̕b"#, r#"à֮𖬱̕b"#, r#"à֮𖬱̕b"#, r#"à֮𖬱̕b"#),
+        (r#"a֮𖬱̀̕b"#, r#"a֮𖬱̀̕b"#, r#"a֮𖬱̀̕b"#, r#"a֮𖬱̀̕b"#, r#"a֮𖬱̀̕b"#),
+        (r#"à֮𖬲̕b"#, r#"à֮𖬲̕b"#, r#"à֮𖬲̕b"#, r#"à֮𖬲̕b"#, r#"à֮𖬲̕b"#),
+        (r#"a֮𖬲̀̕b"#, r#"a֮𖬲̀̕b"#, r#"a֮𖬲̀̕b"#, r#"a֮𖬲̀̕b"#, r#"a֮𖬲̀̕b"#),
+        (r#"à֮𖬳̕b"#, r#"à֮𖬳̕b"#, r#"à֮𖬳̕b"#, r#"à֮𖬳̕b"#, r#"à֮𖬳̕b"#),
+        (r#"a֮𖬳̀̕b"#, r#"a֮𖬳̀̕b"#, r#"a֮𖬳̀̕b"#, r#"a֮𖬳̀̕b"#, r#"a֮𖬳̀̕b"#),
+        (r#"à֮𖬴̕b"#, r#"à֮𖬴̕b"#, r#"à֮𖬴̕b"#, r#"à֮𖬴̕b"#, r#"à֮𖬴̕b"#),
+        (r#"a֮𖬴̀̕b"#, r#"a֮𖬴̀̕b"#, r#"a֮𖬴̀̕b"#, r#"a֮𖬴̀̕b"#, r#"a֮𖬴̀̕b"#),
+        (r#"à֮𖬵̕b"#, r#"à֮𖬵̕b"#, r#"à֮𖬵̕b"#, r#"à֮𖬵̕b"#, r#"à֮𖬵̕b"#),
+        (r#"a֮𖬵̀̕b"#, r#"a֮𖬵̀̕b"#, r#"a֮𖬵̀̕b"#, r#"a֮𖬵̀̕b"#, r#"a֮𖬵̀̕b"#),
+        (r#"à֮𖬶̕b"#, r#"à֮𖬶̕b"#, r#"à֮𖬶̕b"#, r#"à֮𖬶̕b"#, r#"à֮𖬶̕b"#),
+        (r#"a֮𖬶̀̕b"#, r#"a֮𖬶̀̕b"#, r#"a֮𖬶̀̕b"#, r#"a֮𖬶̀̕b"#, r#"a֮𖬶̀̕b"#),
+        (r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#),
+        (r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#, r#"a̴𖿰𖿰़b"#),
+        (r#"a̴𖿰𖿱़b"#, r#"a̴𖿰𖿱़b"#, r#"a̴𖿰𖿱़b"#, r#"a̴𖿰𖿱़b"#, r#"a̴𖿰𖿱़b"#),
+        (r#"a̴𖿱𖿰़b"#, r#"a̴𖿱𖿰़b"#, r#"a̴𖿱𖿰़b"#, r#"a̴𖿱𖿰़b"#, r#"a̴𖿱𖿰़b"#),
+        (r#"a̴𛲞𖿰b"#, r#"a̴𛲞𖿰b"#, r#"a̴𛲞𖿰b"#, r#"a̴𛲞𖿰b"#, r#"a̴𛲞𖿰b"#),
+        (r#"a𛲞̴𖿰b"#, r#"a𛲞̴𖿰b"#, r#"a𛲞̴𖿰b"#, r#"a𛲞̴𖿰b"#, r#"a𛲞̴𖿰b"#),
+        (r#"a᷎̛𝅥᷺b"#, r#"a᷎̛𝅥᷺b"#, r#"a᷎̛𝅥᷺b"#, r#"a᷎̛𝅥᷺b"#, r#"a᷎̛𝅥᷺b"#),
+        (r#"a᷎𝅥̛᷺b"#, r#"a᷎𝅥̛᷺b"#, r#"a᷎𝅥̛᷺b"#, r#"a᷎𝅥̛᷺b"#, r#"a᷎𝅥̛᷺b"#),
+        (r#"a᷎̛𝅦᷺b"#, r#"a᷎̛𝅦᷺b"#, r#"a᷎̛𝅦᷺b"#, r#"a᷎̛𝅦᷺b"#, r#"a᷎̛𝅦᷺b"#),
+        (r#"a᷎𝅦̛᷺b"#, r#"a᷎𝅦̛᷺b"#, r#"a᷎𝅦̛᷺b"#, r#"a᷎𝅦̛᷺b"#, r#"a᷎𝅦̛᷺b"#),
+        (r#"a̴𝅧𖿰b"#, r#"a̴𝅧𖿰b"#, r#"a̴𝅧𖿰b"#, r#"a̴𝅧𖿰b"#, r#"a̴𝅧𖿰b"#),
+        (r#"a𝅧̴𖿰b"#, r#"a𝅧̴𖿰b"#, r#"a𝅧̴𖿰b"#, r#"a𝅧̴𖿰b"#, r#"a𝅧̴𖿰b"#),
+        (r#"a̴𝅨𖿰b"#, r#"a̴𝅨𖿰b"#, r#"a̴𝅨𖿰b"#, r#"a̴𝅨𖿰b"#, r#"a̴𝅨𖿰b"#),
+        (r#"a𝅨̴𖿰b"#, r#"a𝅨̴𖿰b"#, r#"a𝅨̴𖿰b"#, r#"a𝅨̴𖿰b"#, r#"a𝅨̴𖿰b"#),
+        (r#"a̴𝅩𖿰b"#, r#"a̴𝅩𖿰b"#, r#"a̴𝅩𖿰b"#, r#"a̴𝅩𖿰b"#, r#"a̴𝅩𖿰b"#),
+        (r#"a𝅩̴𖿰b"#, r#"a𝅩̴𖿰b"#, r#"a𝅩̴𖿰b"#, r#"a𝅩̴𖿰b"#, r#"a𝅩̴𖿰b"#),
+        (r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#),
+        (r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#, r#"a〮𝅭𝅭֮b"#),
+        (r#"a᷎̛𝅮᷺b"#, r#"a᷎̛𝅮᷺b"#, r#"a᷎̛𝅮᷺b"#, r#"a᷎̛𝅮᷺b"#, r#"a᷎̛𝅮᷺b"#),
+        (r#"a᷎𝅮̛᷺b"#, r#"a᷎𝅮̛᷺b"#, r#"a᷎𝅮̛᷺b"#, r#"a᷎𝅮̛᷺b"#, r#"a᷎𝅮̛᷺b"#),
+        (r#"a᷎̛𝅯᷺b"#, r#"a᷎̛𝅯᷺b"#, r#"a᷎̛𝅯᷺b"#, r#"a᷎̛𝅯᷺b"#, r#"a᷎̛𝅯᷺b"#),
+        (r#"a᷎𝅯̛᷺b"#, r#"a᷎𝅯̛᷺b"#, r#"a᷎𝅯̛᷺b"#, r#"a᷎𝅯̛᷺b"#, r#"a᷎𝅯̛᷺b"#),
+        (r#"a᷎̛𝅰᷺b"#, r#"a᷎̛𝅰᷺b"#, r#"a᷎̛𝅰᷺b"#, r#"a᷎̛𝅰᷺b"#, r#"a᷎̛𝅰᷺b"#),
+        (r#"a᷎𝅰̛᷺b"#, r#"a᷎𝅰̛᷺b"#, r#"a᷎𝅰̛᷺b"#, r#"a᷎𝅰̛᷺b"#, r#"a᷎𝅰̛᷺b"#),
+        (r#"a᷎̛𝅱᷺b"#, r#"a᷎̛𝅱᷺b"#, r#"a᷎̛𝅱᷺b"#, r#"a᷎̛𝅱᷺b"#, r#"a᷎̛𝅱᷺b"#),
+        (r#"a᷎𝅱̛᷺b"#, r#"a᷎𝅱̛᷺b"#, r#"a᷎𝅱̛᷺b"#, r#"a᷎𝅱̛᷺b"#, r#"a᷎𝅱̛᷺b"#),
+        (r#"a᷎̛𝅲᷺b"#, r#"a᷎̛𝅲᷺b"#, r#"a᷎̛𝅲᷺b"#, r#"a᷎̛𝅲᷺b"#, r#"a᷎̛𝅲᷺b"#),
+        (r#"a᷎𝅲̛᷺b"#, r#"a᷎𝅲̛᷺b"#, r#"a᷎𝅲̛᷺b"#, r#"a᷎𝅲̛᷺b"#, r#"a᷎𝅲̛᷺b"#),
+        (r#"a᷺̖𝅻֚b"#, r#"a᷺̖𝅻֚b"#, r#"a᷺̖𝅻֚b"#, r#"a᷺̖𝅻֚b"#, r#"a᷺̖𝅻֚b"#),
+        (r#"a᷺𝅻̖֚b"#, r#"a᷺𝅻̖֚b"#, r#"a᷺𝅻̖֚b"#, r#"a᷺𝅻̖֚b"#, r#"a᷺𝅻̖֚b"#),
+        (r#"a᷺̖𝅼֚b"#, r#"a᷺̖𝅼֚b"#, r#"a᷺̖𝅼֚b"#, r#"a᷺̖𝅼֚b"#, r#"a᷺̖𝅼֚b"#),
+        (r#"a᷺𝅼̖֚b"#, r#"a᷺𝅼̖֚b"#, r#"a᷺𝅼̖֚b"#, r#"a᷺𝅼̖֚b"#, r#"a᷺𝅼̖֚b"#),
+        (r#"a᷺̖𝅽֚b"#, r#"a᷺̖𝅽֚b"#, r#"a᷺̖𝅽֚b"#, r#"a᷺̖𝅽֚b"#, r#"a᷺̖𝅽֚b"#),
+        (r#"a᷺𝅽̖֚b"#, r#"a᷺𝅽̖֚b"#, r#"a᷺𝅽̖֚b"#, r#"a᷺𝅽̖֚b"#, r#"a᷺𝅽̖֚b"#),
+        (r#"a᷺̖𝅾֚b"#, r#"a᷺̖𝅾֚b"#, r#"a᷺̖𝅾֚b"#, r#"a᷺̖𝅾֚b"#, r#"a᷺̖𝅾֚b"#),
+        (r#"a᷺𝅾̖֚b"#, r#"a᷺𝅾̖֚b"#, r#"a᷺𝅾̖֚b"#, r#"a᷺𝅾̖֚b"#, r#"a᷺𝅾̖֚b"#),
+        (r#"a᷺̖𝅿֚b"#, r#"a᷺̖𝅿֚b"#, r#"a᷺̖𝅿֚b"#, r#"a᷺̖𝅿֚b"#, r#"a᷺̖𝅿֚b"#),
+        (r#"a᷺𝅿̖֚b"#, r#"a᷺𝅿̖֚b"#, r#"a᷺𝅿̖֚b"#, r#"a᷺𝅿̖֚b"#, r#"a᷺𝅿̖֚b"#),
+        (r#"a᷺̖𝆀֚b"#, r#"a᷺̖𝆀֚b"#, r#"a᷺̖𝆀֚b"#, r#"a᷺̖𝆀֚b"#, r#"a᷺̖𝆀֚b"#),
+        (r#"a᷺𝆀̖֚b"#, r#"a᷺𝆀̖֚b"#, r#"a᷺𝆀̖֚b"#, r#"a᷺𝆀̖֚b"#, r#"a᷺𝆀̖֚b"#),
+        (r#"a᷺̖𝆁֚b"#, r#"a᷺̖𝆁֚b"#, r#"a᷺̖𝆁֚b"#, r#"a᷺̖𝆁֚b"#, r#"a᷺̖𝆁֚b"#),
+        (r#"a᷺𝆁̖֚b"#, r#"a᷺𝆁̖֚b"#, r#"a᷺𝆁̖֚b"#, r#"a᷺𝆁̖֚b"#, r#"a᷺𝆁̖֚b"#),
+        (r#"a᷺̖𝆂֚b"#, r#"a᷺̖𝆂֚b"#, r#"a᷺̖𝆂֚b"#, r#"a᷺̖𝆂֚b"#, r#"a᷺̖𝆂֚b"#),
+        (r#"a᷺𝆂̖֚b"#, r#"a᷺𝆂̖֚b"#, r#"a᷺𝆂̖֚b"#, r#"a᷺𝆂̖֚b"#, r#"a᷺𝆂̖֚b"#),
+        (r#"à֮𝆅̕b"#, r#"à֮𝆅̕b"#, r#"à֮𝆅̕b"#, r#"à֮𝆅̕b"#, r#"à֮𝆅̕b"#),
+        (r#"a֮𝆅̀̕b"#, r#"a֮𝆅̀̕b"#, r#"a֮𝆅̀̕b"#, r#"a֮𝆅̀̕b"#, r#"a֮𝆅̀̕b"#),
+        (r#"à֮𝆆̕b"#, r#"à֮𝆆̕b"#, r#"à֮𝆆̕b"#, r#"à֮𝆆̕b"#, r#"à֮𝆆̕b"#),
+        (r#"a֮𝆆̀̕b"#, r#"a֮𝆆̀̕b"#, r#"a֮𝆆̀̕b"#, r#"a֮𝆆̀̕b"#, r#"a֮𝆆̀̕b"#),
+        (r#"à֮𝆇̕b"#, r#"à֮𝆇̕b"#, r#"à֮𝆇̕b"#, r#"à֮𝆇̕b"#, r#"à֮𝆇̕b"#),
+        (r#"a֮𝆇̀̕b"#, r#"a֮𝆇̀̕b"#, r#"a֮𝆇̀̕b"#, r#"a֮𝆇̀̕b"#, r#"a֮𝆇̀̕b"#),
+        (r#"à֮𝆈̕b"#, r#"à֮𝆈̕b"#, r#"à֮𝆈̕b"#, r#"à֮𝆈̕b"#, r#"à֮𝆈̕b"#),
+        (r#"a֮𝆈̀̕b"#, r#"a֮𝆈̀̕b"#, r#"a֮𝆈̀̕b"#, r#"a֮𝆈̀̕b"#, r#"a֮𝆈̀̕b"#),
+        (r#"à֮𝆉̕b"#, r#"à֮𝆉̕b"#, r#"à֮𝆉̕b"#, r#"à֮𝆉̕b"#, r#"à֮𝆉̕b"#),
+        (r#"a֮𝆉̀̕b"#, r#"a֮𝆉̀̕b"#, r#"a֮𝆉̀̕b"#, r#"a֮𝆉̀̕b"#, r#"a֮𝆉̀̕b"#),
+        (r#"a᷺̖𝆊֚b"#, r#"a᷺̖𝆊֚b"#, r#"a᷺̖𝆊֚b"#, r#"a᷺̖𝆊֚b"#, r#"a᷺̖𝆊֚b"#),
+        (r#"a᷺𝆊̖֚b"#, r#"a᷺𝆊̖֚b"#, r#"a᷺𝆊̖֚b"#, r#"a᷺𝆊̖֚b"#, r#"a᷺𝆊̖֚b"#),
+        (r#"a᷺̖𝆋֚b"#, r#"a᷺̖𝆋֚b"#, r#"a᷺̖𝆋֚b"#, r#"a᷺̖𝆋֚b"#, r#"a᷺̖𝆋֚b"#),
+        (r#"a᷺𝆋̖֚b"#, r#"a᷺𝆋̖֚b"#, r#"a᷺𝆋̖֚b"#, r#"a᷺𝆋̖֚b"#, r#"a᷺𝆋̖֚b"#),
+        (r#"à֮𝆪̕b"#, r#"à֮𝆪̕b"#, r#"à֮𝆪̕b"#, r#"à֮𝆪̕b"#, r#"à֮𝆪̕b"#),
+        (r#"a֮𝆪̀̕b"#, r#"a֮𝆪̀̕b"#, r#"a֮𝆪̀̕b"#, r#"a֮𝆪̀̕b"#, r#"a֮𝆪̀̕b"#),
+        (r#"à֮𝆫̕b"#, r#"à֮𝆫̕b"#, r#"à֮𝆫̕b"#, r#"à֮𝆫̕b"#, r#"à֮𝆫̕b"#),
+        (r#"a֮𝆫̀̕b"#, r#"a֮𝆫̀̕b"#, r#"a֮𝆫̀̕b"#, r#"a֮𝆫̀̕b"#, r#"a֮𝆫̀̕b"#),
+        (r#"à֮𝆬̕b"#, r#"à֮𝆬̕b"#, r#"à֮𝆬̕b"#, r#"à֮𝆬̕b"#, r#"à֮𝆬̕b"#),
+        (r#"a֮𝆬̀̕b"#, r#"a֮𝆬̀̕b"#, r#"a֮𝆬̀̕b"#, r#"a֮𝆬̀̕b"#, r#"a֮𝆬̀̕b"#),
+        (r#"à֮𝆭̕b"#, r#"à֮𝆭̕b"#, r#"à֮𝆭̕b"#, r#"à֮𝆭̕b"#, r#"à֮𝆭̕b"#),
+        (r#"a֮𝆭̀̕b"#, r#"a֮𝆭̀̕b"#, r#"a֮𝆭̀̕b"#, r#"a֮𝆭̀̕b"#, r#"a֮𝆭̀̕b"#),
+        (r#"à֮𝉂̕b"#, r#"à֮𝉂̕b"#, r#"à֮𝉂̕b"#, r#"à֮𝉂̕b"#, r#"à֮𝉂̕b"#),
+        (r#"a֮𝉂̀̕b"#, r#"a֮𝉂̀̕b"#, r#"a֮𝉂̀̕b"#, r#"a֮𝉂̀̕b"#, r#"a֮𝉂̀̕b"#),
+        (r#"à֮𝉃̕b"#, r#"à֮𝉃̕b"#, r#"à֮𝉃̕b"#, r#"à֮𝉃̕b"#, r#"à֮𝉃̕b"#),
+        (r#"a֮𝉃̀̕b"#, r#"a֮𝉃̀̕b"#, r#"a֮𝉃̀̕b"#, r#"a֮𝉃̀̕b"#, r#"a֮𝉃̀̕b"#),
+        (r#"à֮𝉄̕b"#, r#"à֮𝉄̕b"#, r#"à֮𝉄̕b"#, r#"à֮𝉄̕b"#, r#"à֮𝉄̕b"#),
+        (r#"a֮𝉄̀̕b"#, r#"a֮𝉄̀̕b"#, r#"a֮𝉄̀̕b"#, r#"a֮𝉄̀̕b"#, r#"a֮𝉄̀̕b"#),
+        (r#"à֮𞀀̕b"#, r#"à֮𞀀̕b"#, r#"à֮𞀀̕b"#, r#"à֮𞀀̕b"#, r#"à֮𞀀̕b"#),
+        (r#"a֮𞀀̀̕b"#, r#"a֮𞀀̀̕b"#, r#"a֮𞀀̀̕b"#, r#"a֮𞀀̀̕b"#, r#"a֮𞀀̀̕b"#),
+        (r#"à֮𞀁̕b"#, r#"à֮𞀁̕b"#, r#"à֮𞀁̕b"#, r#"à֮𞀁̕b"#, r#"à֮𞀁̕b"#),
+        (r#"a֮𞀁̀̕b"#, r#"a֮𞀁̀̕b"#, r#"a֮𞀁̀̕b"#, r#"a֮𞀁̀̕b"#, r#"a֮𞀁̀̕b"#),
+        (r#"à֮𞀂̕b"#, r#"à֮𞀂̕b"#, r#"à֮𞀂̕b"#, r#"à֮𞀂̕b"#, r#"à֮𞀂̕b"#),
+        (r#"a֮𞀂̀̕b"#, r#"a֮𞀂̀̕b"#, r#"a֮𞀂̀̕b"#, r#"a֮𞀂̀̕b"#, r#"a֮𞀂̀̕b"#),
+        (r#"à֮𞀃̕b"#, r#"à֮𞀃̕b"#, r#"à֮𞀃̕b"#, r#"à֮𞀃̕b"#, r#"à֮𞀃̕b"#),
+        (r#"a֮𞀃̀̕b"#, r#"a֮𞀃̀̕b"#, r#"a֮𞀃̀̕b"#, r#"a֮𞀃̀̕b"#, r#"a֮𞀃̀̕b"#),
+        (r#"à֮𞀄̕b"#, r#"à֮𞀄̕b"#, r#"à֮𞀄̕b"#, r#"à֮𞀄̕b"#, r#"à֮𞀄̕b"#),
+        (r#"a֮𞀄̀̕b"#, r#"a֮𞀄̀̕b"#, r#"a֮𞀄̀̕b"#, r#"a֮𞀄̀̕b"#, r#"a֮𞀄̀̕b"#),
+        (r#"à֮𞀅̕b"#, r#"à֮𞀅̕b"#, r#"à֮𞀅̕b"#, r#"à֮𞀅̕b"#, r#"à֮𞀅̕b"#),
+        (r#"a֮𞀅̀̕b"#, r#"a֮𞀅̀̕b"#, r#"a֮𞀅̀̕b"#, r#"a֮𞀅̀̕b"#, r#"a֮𞀅̀̕b"#),
+        (r#"à֮𞀆̕b"#, r#"à֮𞀆̕b"#, r#"à֮𞀆̕b"#, r#"à֮𞀆̕b"#, r#"à֮𞀆̕b"#),
+        (r#"a֮𞀆̀̕b"#, r#"a֮𞀆̀̕b"#, r#"a֮𞀆̀̕b"#, r#"a֮𞀆̀̕b"#, r#"a֮𞀆̀̕b"#),
+        (r#"à֮𞀈̕b"#, r#"à֮𞀈̕b"#, r#"à֮𞀈̕b"#, r#"à֮𞀈̕b"#, r#"à֮𞀈̕b"#),
+        (r#"a֮𞀈̀̕b"#, r#"a֮𞀈̀̕b"#, r#"a֮𞀈̀̕b"#, r#"a֮𞀈̀̕b"#, r#"a֮𞀈̀̕b"#),
+        (r#"à֮𞀉̕b"#, r#"à֮𞀉̕b"#, r#"à֮𞀉̕b"#, r#"à֮𞀉̕b"#, r#"à֮𞀉̕b"#),
+        (r#"a֮𞀉̀̕b"#, r#"a֮𞀉̀̕b"#, r#"a֮𞀉̀̕b"#, r#"a֮𞀉̀̕b"#, r#"a֮𞀉̀̕b"#),
+        (r#"à֮𞀊̕b"#, r#"à֮𞀊̕b"#, r#"à֮𞀊̕b"#, r#"à֮𞀊̕b"#, r#"à֮𞀊̕b"#),
+        (r#"a֮𞀊̀̕b"#, r#"a֮𞀊̀̕b"#, r#"a֮𞀊̀̕b"#, r#"a֮𞀊̀̕b"#, r#"a֮𞀊̀̕b"#),
+        (r#"à֮𞀋̕b"#, r#"à֮𞀋̕b"#, r#"à֮𞀋̕b"#, r#"à֮𞀋̕b"#, r#"à֮𞀋̕b"#),
+        (r#"a֮𞀋̀̕b"#, r#"a֮𞀋̀̕b"#, r#"a֮𞀋̀̕b"#, r#"a֮𞀋̀̕b"#, r#"a֮𞀋̀̕b"#),
+        (r#"à֮𞀌̕b"#, r#"à֮𞀌̕b"#, r#"à֮𞀌̕b"#, r#"à֮𞀌̕b"#, r#"à֮𞀌̕b"#),
+        (r#"a֮𞀌̀̕b"#, r#"a֮𞀌̀̕b"#, r#"a֮𞀌̀̕b"#, r#"a֮𞀌̀̕b"#, r#"a֮𞀌̀̕b"#),
+        (r#"à֮𞀍̕b"#, r#"à֮𞀍̕b"#, r#"à֮𞀍̕b"#, r#"à֮𞀍̕b"#, r#"à֮𞀍̕b"#),
+        (r#"a֮𞀍̀̕b"#, r#"a֮𞀍̀̕b"#, r#"a֮𞀍̀̕b"#, r#"a֮𞀍̀̕b"#, r#"a֮𞀍̀̕b"#),
+        (r#"à֮𞀎̕b"#, r#"à֮𞀎̕b"#, r#"à֮𞀎̕b"#, r#"à֮𞀎̕b"#, r#"à֮𞀎̕b"#),
+        (r#"a֮𞀎̀̕b"#, r#"a֮𞀎̀̕b"#, r#"a֮𞀎̀̕b"#, r#"a֮𞀎̀̕b"#, r#"a֮𞀎̀̕b"#),
+        (r#"à֮𞀏̕b"#, r#"à֮𞀏̕b"#, r#"à֮𞀏̕b"#, r#"à֮𞀏̕b"#, r#"à֮𞀏̕b"#),
+        (r#"a֮𞀏̀̕b"#, r#"a֮𞀏̀̕b"#, r#"a֮𞀏̀̕b"#, r#"a֮𞀏̀̕b"#, r#"a֮𞀏̀̕b"#),
+        (r#"à֮𞀐̕b"#, r#"à֮𞀐̕b"#, r#"à֮𞀐̕b"#, r#"à֮𞀐̕b"#, r#"à֮𞀐̕b"#),
+        (r#"a֮𞀐̀̕b"#, r#"a֮𞀐̀̕b"#, r#"a֮𞀐̀̕b"#, r#"a֮𞀐̀̕b"#, r#"a֮𞀐̀̕b"#),
+        (r#"à֮𞀑̕b"#, r#"à֮𞀑̕b"#, r#"à֮𞀑̕b"#, r#"à֮𞀑̕b"#, r#"à֮𞀑̕b"#),
+        (r#"a֮𞀑̀̕b"#, r#"a֮𞀑̀̕b"#, r#"a֮𞀑̀̕b"#, r#"a֮𞀑̀̕b"#, r#"a֮𞀑̀̕b"#),
+        (r#"à֮𞀒̕b"#, r#"à֮𞀒̕b"#, r#"à֮𞀒̕b"#, r#"à֮𞀒̕b"#, r#"à֮𞀒̕b"#),
+        (r#"a֮𞀒̀̕b"#, r#"a֮𞀒̀̕b"#, r#"a֮𞀒̀̕b"#, r#"a֮𞀒̀̕b"#, r#"a֮𞀒̀̕b"#),
+        (r#"à֮𞀓̕b"#, r#"à֮𞀓̕b"#, r#"à֮𞀓̕b"#, r#"à֮𞀓̕b"#, r#"à֮𞀓̕b"#),
+        (r#"a֮𞀓̀̕b"#, r#"a֮𞀓̀̕b"#, r#"a֮𞀓̀̕b"#, r#"a֮𞀓̀̕b"#, r#"a֮𞀓̀̕b"#),
+        (r#"à֮𞀔̕b"#, r#"à֮𞀔̕b"#, r#"à֮𞀔̕b"#, r#"à֮𞀔̕b"#, r#"à֮𞀔̕b"#),
+        (r#"a֮𞀔̀̕b"#, r#"a֮𞀔̀̕b"#, r#"a֮𞀔̀̕b"#, r#"a֮𞀔̀̕b"#, r#"a֮𞀔̀̕b"#),
+        (r#"à֮𞀕̕b"#, r#"à֮𞀕̕b"#, r#"à֮𞀕̕b"#, r#"à֮𞀕̕b"#, r#"à֮𞀕̕b"#),
+        (r#"a֮𞀕̀̕b"#, r#"a֮𞀕̀̕b"#, r#"a֮𞀕̀̕b"#, r#"a֮𞀕̀̕b"#, r#"a֮𞀕̀̕b"#),
+        (r#"à֮𞀖̕b"#, r#"à֮𞀖̕b"#, r#"à֮𞀖̕b"#, r#"à֮𞀖̕b"#, r#"à֮𞀖̕b"#),
+        (r#"a֮𞀖̀̕b"#, r#"a֮𞀖̀̕b"#, r#"a֮𞀖̀̕b"#, r#"a֮𞀖̀̕b"#, r#"a֮𞀖̀̕b"#),
+        (r#"à֮𞀗̕b"#, r#"à֮𞀗̕b"#, r#"à֮𞀗̕b"#, r#"à֮𞀗̕b"#, r#"à֮𞀗̕b"#),
+        (r#"a֮𞀗̀̕b"#, r#"a֮𞀗̀̕b"#, r#"a֮𞀗̀̕b"#, r#"a֮𞀗̀̕b"#, r#"a֮𞀗̀̕b"#),
+        (r#"à֮𞀘̕b"#, r#"à֮𞀘̕b"#, r#"à֮𞀘̕b"#, r#"à֮𞀘̕b"#, r#"à֮𞀘̕b"#),
+        (r#"a֮𞀘̀̕b"#, r#"a֮𞀘̀̕b"#, r#"a֮𞀘̀̕b"#, r#"a֮𞀘̀̕b"#, r#"a֮𞀘̀̕b"#),
+        (r#"à֮𞀛̕b"#, r#"à֮𞀛̕b"#, r#"à֮𞀛̕b"#, r#"à֮𞀛̕b"#, r#"à֮𞀛̕b"#),
+        (r#"a֮𞀛̀̕b"#, r#"a֮𞀛̀̕b"#, r#"a֮𞀛̀̕b"#, r#"a֮𞀛̀̕b"#, r#"a֮𞀛̀̕b"#),
+        (r#"à֮𞀜̕b"#, r#"à֮𞀜̕b"#, r#"à֮𞀜̕b"#, r#"à֮𞀜̕b"#, r#"à֮𞀜̕b"#),
+        (r#"a֮𞀜̀̕b"#, r#"a֮𞀜̀̕b"#, r#"a֮𞀜̀̕b"#, r#"a֮𞀜̀̕b"#, r#"a֮𞀜̀̕b"#),
+        (r#"à֮𞀝̕b"#, r#"à֮𞀝̕b"#, r#"à֮𞀝̕b"#, r#"à֮𞀝̕b"#, r#"à֮𞀝̕b"#),
+        (r#"a֮𞀝̀̕b"#, r#"a֮𞀝̀̕b"#, r#"a֮𞀝̀̕b"#, r#"a֮𞀝̀̕b"#, r#"a֮𞀝̀̕b"#),
+        (r#"à֮𞀞̕b"#, r#"à֮𞀞̕b"#, r#"à֮𞀞̕b"#, r#"à֮𞀞̕b"#, r#"à֮𞀞̕b"#),
+        (r#"a֮𞀞̀̕b"#, r#"a֮𞀞̀̕b"#, r#"a֮𞀞̀̕b"#, r#"a֮𞀞̀̕b"#, r#"a֮𞀞̀̕b"#),
+        (r#"à֮𞀟̕b"#, r#"à֮𞀟̕b"#, r#"à֮𞀟̕b"#, r#"à֮𞀟̕b"#, r#"à֮𞀟̕b"#),
+        (r#"a֮𞀟̀̕b"#, r#"a֮𞀟̀̕b"#, r#"a֮𞀟̀̕b"#, r#"a֮𞀟̀̕b"#, r#"a֮𞀟̀̕b"#),
+        (r#"à֮𞀠̕b"#, r#"à֮𞀠̕b"#, r#"à֮𞀠̕b"#, r#"à֮𞀠̕b"#, r#"à֮𞀠̕b"#),
+        (r#"a֮𞀠̀̕b"#, r#"a֮𞀠̀̕b"#, r#"a֮𞀠̀̕b"#, r#"a֮𞀠̀̕b"#, r#"a֮𞀠̀̕b"#),
+        (r#"à֮𞀡̕b"#, r#"à֮𞀡̕b"#, r#"à֮𞀡̕b"#, r#"à֮𞀡̕b"#, r#"à֮𞀡̕b"#),
+        (r#"a֮𞀡̀̕b"#, r#"a֮𞀡̀̕b"#, r#"a֮𞀡̀̕b"#, r#"a֮𞀡̀̕b"#, r#"a֮𞀡̀̕b"#),
+        (r#"à֮𞀣̕b"#, r#"à֮𞀣̕b"#, r#"à֮𞀣̕b"#, r#"à֮𞀣̕b"#, r#"à֮𞀣̕b"#),
+        (r#"a֮𞀣̀̕b"#, r#"a֮𞀣̀̕b"#, r#"a֮𞀣̀̕b"#, r#"a֮𞀣̀̕b"#, r#"a֮𞀣̀̕b"#),
+        (r#"à֮𞀤̕b"#, r#"à֮𞀤̕b"#, r#"à֮𞀤̕b"#, r#"à֮𞀤̕b"#, r#"à֮𞀤̕b"#),
+        (r#"a֮𞀤̀̕b"#, r#"a֮𞀤̀̕b"#, r#"a֮𞀤̀̕b"#, r#"a֮𞀤̀̕b"#, r#"a֮𞀤̀̕b"#),
+        (r#"à֮𞀦̕b"#, r#"à֮𞀦̕b"#, r#"à֮𞀦̕b"#, r#"à֮𞀦̕b"#, r#"à֮𞀦̕b"#),
+        (r#"a֮𞀦̀̕b"#, r#"a֮𞀦̀̕b"#, r#"a֮𞀦̀̕b"#, r#"a֮𞀦̀̕b"#, r#"a֮𞀦̀̕b"#),
+        (r#"à֮𞀧̕b"#, r#"à֮𞀧̕b"#, r#"à֮𞀧̕b"#, r#"à֮𞀧̕b"#, r#"à֮𞀧̕b"#),
+        (r#"a֮𞀧̀̕b"#, r#"a֮𞀧̀̕b"#, r#"a֮𞀧̀̕b"#, r#"a֮𞀧̀̕b"#, r#"a֮𞀧̀̕b"#),
+        (r#"à֮𞀨̕b"#, r#"à֮𞀨̕b"#, r#"à֮𞀨̕b"#, r#"à֮𞀨̕b"#, r#"à֮𞀨̕b"#),
+        (r#"a֮𞀨̀̕b"#, r#"a֮𞀨̀̕b"#, r#"a֮𞀨̀̕b"#, r#"a֮𞀨̀̕b"#, r#"a֮𞀨̀̕b"#),
+        (r#"à֮𞀩̕b"#, r#"à֮𞀩̕b"#, r#"à֮𞀩̕b"#, r#"à֮𞀩̕b"#, r#"à֮𞀩̕b"#),
+        (r#"a֮𞀩̀̕b"#, r#"a֮𞀩̀̕b"#, r#"a֮𞀩̀̕b"#, r#"a֮𞀩̀̕b"#, r#"a֮𞀩̀̕b"#),
+        (r#"à֮𞀪̕b"#, r#"à֮𞀪̕b"#, r#"à֮𞀪̕b"#, r#"à֮𞀪̕b"#, r#"à֮𞀪̕b"#),
+        (r#"a֮𞀪̀̕b"#, r#"a֮𞀪̀̕b"#, r#"a֮𞀪̀̕b"#, r#"a֮𞀪̀̕b"#, r#"a֮𞀪̀̕b"#),
+        (r#"à֮𞂏̕b"#, r#"à֮𞂏̕b"#, r#"à֮𞂏̕b"#, r#"à֮𞂏̕b"#, r#"à֮𞂏̕b"#),
+        (r#"a֮𞂏̀̕b"#, r#"a֮𞂏̀̕b"#, r#"a֮𞂏̀̕b"#, r#"a֮𞂏̀̕b"#, r#"a֮𞂏̀̕b"#),
+        (r#"à֮𞄰̕b"#, r#"à֮𞄰̕b"#, r#"à֮𞄰̕b"#, r#"à֮𞄰̕b"#, r#"à֮𞄰̕b"#),
+        (r#"a֮𞄰̀̕b"#, r#"a֮𞄰̀̕b"#, r#"a֮𞄰̀̕b"#, r#"a֮𞄰̀̕b"#, r#"a֮𞄰̀̕b"#),
+        (r#"à֮𞄱̕b"#, r#"à֮𞄱̕b"#, r#"à֮𞄱̕b"#, r#"à֮𞄱̕b"#, r#"à֮𞄱̕b"#),
+        (r#"a֮𞄱̀̕b"#, r#"a֮𞄱̀̕b"#, r#"a֮𞄱̀̕b"#, r#"a֮𞄱̀̕b"#, r#"a֮𞄱̀̕b"#),
+        (r#"à֮𞄲̕b"#, r#"à֮𞄲̕b"#, r#"à֮𞄲̕b"#, r#"à֮𞄲̕b"#, r#"à֮𞄲̕b"#),
+        (r#"a֮𞄲̀̕b"#, r#"a֮𞄲̀̕b"#, r#"a֮𞄲̀̕b"#, r#"a֮𞄲̀̕b"#, r#"a֮𞄲̀̕b"#),
+        (r#"à֮𞄳̕b"#, r#"à֮𞄳̕b"#, r#"à֮𞄳̕b"#, r#"à֮𞄳̕b"#, r#"à֮𞄳̕b"#),
+        (r#"a֮𞄳̀̕b"#, r#"a֮𞄳̀̕b"#, r#"a֮𞄳̀̕b"#, r#"a֮𞄳̀̕b"#, r#"a֮𞄳̀̕b"#),
+        (r#"à֮𞄴̕b"#, r#"à֮𞄴̕b"#, r#"à֮𞄴̕b"#, r#"à֮𞄴̕b"#, r#"à֮𞄴̕b"#),
+        (r#"a֮𞄴̀̕b"#, r#"a֮𞄴̀̕b"#, r#"a֮𞄴̀̕b"#, r#"a֮𞄴̀̕b"#, r#"a֮𞄴̀̕b"#),
+        (r#"à֮𞄵̕b"#, r#"à֮𞄵̕b"#, r#"à֮𞄵̕b"#, r#"à֮𞄵̕b"#, r#"à֮𞄵̕b"#),
+        (r#"a֮𞄵̀̕b"#, r#"a֮𞄵̀̕b"#, r#"a֮𞄵̀̕b"#, r#"a֮𞄵̀̕b"#, r#"a֮𞄵̀̕b"#),
+        (r#"à֮𞄶̕b"#, r#"à֮𞄶̕b"#, r#"à֮𞄶̕b"#, r#"à֮𞄶̕b"#, r#"à֮𞄶̕b"#),
+        (r#"a֮𞄶̀̕b"#, r#"a֮𞄶̀̕b"#, r#"a֮𞄶̀̕b"#, r#"a֮𞄶̀̕b"#, r#"a֮𞄶̀̕b"#),
+        (r#"à֮𞊮̕b"#, r#"à֮𞊮̕b"#, r#"à֮𞊮̕b"#, r#"à֮𞊮̕b"#, r#"à֮𞊮̕b"#),
+        (r#"a֮𞊮̀̕b"#, r#"a֮𞊮̀̕b"#, r#"a֮𞊮̀̕b"#, r#"a֮𞊮̀̕b"#, r#"a֮𞊮̀̕b"#),
+        (r#"à֮𞋬̕b"#, r#"à֮𞋬̕b"#, r#"à֮𞋬̕b"#, r#"à֮𞋬̕b"#, r#"à֮𞋬̕b"#),
+        (r#"a֮𞋬̀̕b"#, r#"a֮𞋬̀̕b"#, r#"a֮𞋬̀̕b"#, r#"a֮𞋬̀̕b"#, r#"a֮𞋬̀̕b"#),
+        (r#"à֮𞋭̕b"#, r#"à֮𞋭̕b"#, r#"à֮𞋭̕b"#, r#"à֮𞋭̕b"#, r#"à֮𞋭̕b"#),
+        (r#"a֮𞋭̀̕b"#, r#"a֮𞋭̀̕b"#, r#"a֮𞋭̀̕b"#, r#"a֮𞋭̀̕b"#, r#"a֮𞋭̀̕b"#),
+        (r#"à֮𞋮̕b"#, r#"à֮𞋮̕b"#, r#"à֮𞋮̕b"#, r#"à֮𞋮̕b"#, r#"à֮𞋮̕b"#),
+        (r#"a֮𞋮̀̕b"#, r#"a֮𞋮̀̕b"#, r#"a֮𞋮̀̕b"#, r#"a֮𞋮̀̕b"#, r#"a֮𞋮̀̕b"#),
+        (r#"à֮𞋯̕b"#, r#"à֮𞋯̕b"#, r#"à֮𞋯̕b"#, r#"à֮𞋯̕b"#, r#"à֮𞋯̕b"#),
+        (r#"a֮𞋯̀̕b"#, r#"a֮𞋯̀̕b"#, r#"a֮𞋯̀̕b"#, r#"a֮𞋯̀̕b"#, r#"a֮𞋯̀̕b"#),
+        (r#"à̕𞓬͜b"#, r#"à̕𞓬͜b"#, r#"à̕𞓬͜b"#, r#"à̕𞓬͜b"#, r#"à̕𞓬͜b"#),
+        (r#"à𞓬̕͜b"#, r#"à𞓬̕͜b"#, r#"à𞓬̕͜b"#, r#"à𞓬̕͜b"#, r#"à𞓬̕͜b"#),
+        (r#"à̕𞓭͜b"#, r#"à̕𞓭͜b"#, r#"à̕𞓭͜b"#, r#"à̕𞓭͜b"#, r#"à̕𞓭͜b"#),
+        (r#"à𞓭̕͜b"#, r#"à𞓭̕͜b"#, r#"à𞓭̕͜b"#, r#"à𞓭̕͜b"#, r#"à𞓭̕͜b"#),
+        (r#"a᷺̖𞓮֚b"#, r#"a᷺̖𞓮֚b"#, r#"a᷺̖𞓮֚b"#, r#"a᷺̖𞓮֚b"#, r#"a᷺̖𞓮֚b"#),
+        (r#"a᷺𞓮̖֚b"#, r#"a᷺𞓮̖֚b"#, r#"a᷺𞓮̖֚b"#, r#"a᷺𞓮̖֚b"#, r#"a᷺𞓮̖֚b"#),
+        (r#"à֮𞓯̕b"#, r#"à֮𞓯̕b"#, r#"à֮𞓯̕b"#, r#"à֮𞓯̕b"#, r#"à֮𞓯̕b"#),
+        (r#"a֮𞓯̀̕b"#, r#"a֮𞓯̀̕b"#, r#"a֮𞓯̀̕b"#, r#"a֮𞓯̀̕b"#, r#"a֮𞓯̀̕b"#),
+        (r#"a᷺̖𞣐֚b"#, r#"a᷺̖𞣐֚b"#, r#"a᷺̖𞣐֚b"#, r#"a᷺̖𞣐֚b"#, r#"a᷺̖𞣐֚b"#),
+        (r#"a᷺𞣐̖֚b"#, r#"a᷺𞣐̖֚b"#, r#"a᷺𞣐̖֚b"#, r#"a᷺𞣐̖֚b"#, r#"a᷺𞣐̖֚b"#),
+        (r#"a᷺̖𞣑֚b"#, r#"a᷺̖𞣑֚b"#, r#"a᷺̖𞣑֚b"#, r#"a᷺̖𞣑֚b"#, r#"a᷺̖𞣑֚b"#),
+        (r#"a᷺𞣑̖֚b"#, r#"a᷺𞣑̖֚b"#, r#"a᷺𞣑̖֚b"#, r#"a᷺𞣑̖֚b"#, r#"a᷺𞣑̖֚b"#),
+        (r#"a᷺̖𞣒֚b"#, r#"a᷺̖𞣒֚b"#, r#"a᷺̖𞣒֚b"#, r#"a᷺̖𞣒֚b"#, r#"a᷺̖𞣒֚b"#),
+        (r#"a᷺𞣒̖֚b"#, r#"a᷺𞣒̖֚b"#, r#"a᷺𞣒̖֚b"#, r#"a᷺𞣒̖֚b"#, r#"a᷺𞣒̖֚b"#),
+        (r#"a᷺̖𞣓֚b"#, r#"a᷺̖𞣓֚b"#, r#"a᷺̖𞣓֚b"#, r#"a᷺̖𞣓֚b"#, r#"a᷺̖𞣓֚b"#),
+        (r#"a᷺𞣓̖֚b"#, r#"a᷺𞣓̖֚b"#, r#"a᷺𞣓̖֚b"#, r#"a᷺𞣓̖֚b"#, r#"a᷺𞣓̖֚b"#),
+        (r#"a᷺̖𞣔֚b"#, r#"a᷺̖𞣔֚b"#, r#"a᷺̖𞣔֚b"#, r#"a᷺̖𞣔֚b"#, r#"a᷺̖𞣔֚b"#),
+        (r#"a᷺𞣔̖֚b"#, r#"a᷺𞣔̖֚b"#, r#"a᷺𞣔̖֚b"#, r#"a᷺𞣔̖֚b"#, r#"a᷺𞣔̖֚b"#),
+        (r#"a᷺̖𞣕֚b"#, r#"a᷺̖𞣕֚b"#, r#"a᷺̖𞣕֚b"#, r#"a᷺̖𞣕֚b"#, r#"a᷺̖𞣕֚b"#),
+        (r#"a᷺𞣕̖֚b"#, r#"a᷺𞣕̖֚b"#, r#"a᷺𞣕̖֚b"#, r#"a᷺𞣕̖֚b"#, r#"a᷺𞣕̖֚b"#),
+        (r#"a᷺̖𞣖֚b"#, r#"a᷺̖𞣖֚b"#, r#"a᷺̖𞣖֚b"#, r#"a᷺̖𞣖֚b"#, r#"a᷺̖𞣖֚b"#),
+        (r#"a᷺𞣖̖֚b"#, r#"a᷺𞣖̖֚b"#, r#"a᷺𞣖̖֚b"#, r#"a᷺𞣖̖֚b"#, r#"a᷺𞣖̖֚b"#),
+        (r#"à֮𞥄̕b"#, r#"à֮𞥄̕b"#, r#"à֮𞥄̕b"#, r#"à֮𞥄̕b"#, r#"à֮𞥄̕b"#),
+        (r#"a֮𞥄̀̕b"#, r#"a֮𞥄̀̕b"#, r#"a֮𞥄̀̕b"#, r#"a֮𞥄̀̕b"#, r#"a֮𞥄̀̕b"#),
+        (r#"à֮𞥅̕b"#, r#"à֮𞥅̕b"#, r#"à֮𞥅̕b"#, r#"à֮𞥅̕b"#, r#"à֮𞥅̕b"#),
+        (r#"a֮𞥅̀̕b"#, r#"a֮𞥅̀̕b"#, r#"a֮𞥅̀̕b"#, r#"a֮𞥅̀̕b"#, r#"a֮𞥅̀̕b"#),
+        (r#"à֮𞥆̕b"#, r#"à֮𞥆̕b"#, r#"à֮𞥆̕b"#, r#"à֮𞥆̕b"#, r#"à֮𞥆̕b"#),
+        (r#"a֮𞥆̀̕b"#, r#"a֮𞥆̀̕b"#, r#"a֮𞥆̀̕b"#, r#"a֮𞥆̀̕b"#, r#"a֮𞥆̀̕b"#),
+        (r#"à֮𞥇̕b"#, r#"à֮𞥇̕b"#, r#"à֮𞥇̕b"#, r#"à֮𞥇̕b"#, r#"à֮𞥇̕b"#),
+        (r#"a֮𞥇̀̕b"#, r#"a֮𞥇̀̕b"#, r#"a֮𞥇̀̕b"#, r#"a֮𞥇̀̕b"#, r#"a֮𞥇̀̕b"#),
+        (r#"à֮𞥈̕b"#, r#"à֮𞥈̕b"#, r#"à֮𞥈̕b"#, r#"à֮𞥈̕b"#, r#"à֮𞥈̕b"#),
+        (r#"a֮𞥈̀̕b"#, r#"a֮𞥈̀̕b"#, r#"a֮𞥈̀̕b"#, r#"a֮𞥈̀̕b"#, r#"a֮𞥈̀̕b"#),
+        (r#"à֮𞥉̕b"#, r#"à֮𞥉̕b"#, r#"à֮𞥉̕b"#, r#"à֮𞥉̕b"#, r#"à֮𞥉̕b"#),
+        (r#"a֮𞥉̀̕b"#, r#"a֮𞥉̀̕b"#, r#"a֮𞥉̀̕b"#, r#"a֮𞥉̀̕b"#, r#"a֮𞥉̀̕b"#),
+        (r#"a𖿰़𞥊゙b"#, r#"a𖿰़𞥊゙b"#, r#"a𖿰़𞥊゙b"#, r#"a𖿰़𞥊゙b"#, r#"a𖿰़𞥊゙b"#),
+        (r#"a𖿰𞥊़゙b"#, r#"a𖿰𞥊़゙b"#, r#"a𖿰𞥊़゙b"#, r#"a𖿰𞥊़゙b"#, r#"a𖿰𞥊़゙b"#),
+        (r#"ে̴া"#, r#"ে̴া"#, r#"ে̴া"#, r#"ে̴া"#, r#"ে̴া"#),
+        (r#"ে̴ৗ"#, r#"ে̴ৗ"#, r#"ে̴ৗ"#, r#"ে̴ৗ"#, r#"ে̴ৗ"#),
+        (r#"େ̴ା"#, r#"େ̴ା"#, r#"େ̴ା"#, r#"େ̴ା"#, r#"େ̴ା"#),
+        (r#"େ̴ୖ"#, r#"େ̴ୖ"#, r#"େ̴ୖ"#, r#"େ̴ୖ"#, r#"େ̴ୖ"#),
+        (r#"େ̴ୗ"#, r#"େ̴ୗ"#, r#"େ̴ୗ"#, r#"େ̴ୗ"#, r#"େ̴ୗ"#),
+        (r#"ஒ̴ௗ"#, r#"ஒ̴ௗ"#, r#"ஒ̴ௗ"#, r#"ஒ̴ௗ"#, r#"ஒ̴ௗ"#),
+        (r#"ெ̴ா"#, r#"ெ̴ா"#, r#"ெ̴ா"#, r#"ெ̴ா"#, r#"ெ̴ா"#),
+        (r#"ெ̴ௗ"#, r#"ெ̴ௗ"#, r#"ெ̴ௗ"#, r#"ெ̴ௗ"#, r#"ெ̴ௗ"#),
+        (r#"ே̴ா"#, r#"ே̴ா"#, r#"ே̴ா"#, r#"ே̴ா"#, r#"ே̴ா"#),
+        (r#"ಿ̴ೕ"#, r#"ಿ̴ೕ"#, r#"ಿ̴ೕ"#, r#"ಿ̴ೕ"#, r#"ಿ̴ೕ"#),
+        (r#"ೆ̴ೂ"#, r#"ೆ̴ೂ"#, r#"ೆ̴ೂ"#, r#"ೆ̴ೂ"#, r#"ೆ̴ೂ"#),
+        (r#"ೆ̴ೕ"#, r#"ೆ̴ೕ"#, r#"ೆ̴ೕ"#, r#"ೆ̴ೕ"#, r#"ೆ̴ೕ"#),
+        (r#"ೆ̴ೖ"#, r#"ೆ̴ೖ"#, r#"ೆ̴ೖ"#, r#"ೆ̴ೖ"#, r#"ೆ̴ೖ"#),
+        (r#"ೊ̴ೕ"#, r#"ೊ̴ೕ"#, r#"ೊ̴ೕ"#, r#"ೊ̴ೕ"#, r#"ೊ̴ೕ"#),
+        (r#"െ̴ാ"#, r#"െ̴ാ"#, r#"െ̴ാ"#, r#"െ̴ാ"#, r#"െ̴ാ"#),
+        (r#"െ̴ൗ"#, r#"െ̴ൗ"#, r#"െ̴ൗ"#, r#"െ̴ൗ"#, r#"െ̴ൗ"#),
+        (r#"േ̴ാ"#, r#"േ̴ാ"#, r#"േ̴ാ"#, r#"േ̴ാ"#, r#"േ̴ാ"#),
+        (r#"ෙ̴ා"#, r#"ෙ̴ා"#, r#"ෙ̴ා"#, r#"ෙ̴ා"#, r#"ෙ̴ා"#),
+        (r#"ෙ̴ෟ"#, r#"ෙ̴ෟ"#, r#"ෙ̴ෟ"#, r#"ෙ̴ෟ"#, r#"ෙ̴ෟ"#),
+        (r#"ཀ̴ྵ"#, r#"ཀ̴ྵ"#, r#"ཀ̴ྵ"#, r#"ཀ̴ྵ"#, r#"ཀ̴ྵ"#),
+        (r#"ག̴ྷ"#, r#"ག̴ྷ"#, r#"ག̴ྷ"#, r#"ག̴ྷ"#, r#"ག̴ྷ"#),
+        (r#"ཌ̴ྷ"#, r#"ཌ̴ྷ"#, r#"ཌ̴ྷ"#, r#"ཌ̴ྷ"#, r#"ཌ̴ྷ"#),
+        (r#"ད̴ྷ"#, r#"ད̴ྷ"#, r#"ད̴ྷ"#, r#"ད̴ྷ"#, r#"ད̴ྷ"#),
+        (r#"བ̴ྷ"#, r#"བ̴ྷ"#, r#"བ̴ྷ"#, r#"བ̴ྷ"#, r#"བ̴ྷ"#),
+        (r#"ཛ̴ྷ"#, r#"ཛ̴ྷ"#, r#"ཛ̴ྷ"#, r#"ཛ̴ྷ"#, r#"ཛ̴ྷ"#),
+        (r#"ྐ̴ྵ"#, r#"ྐ̴ྵ"#, r#"ྐ̴ྵ"#, r#"ྐ̴ྵ"#, r#"ྐ̴ྵ"#),
+        (r#"ྒ̴ྷ"#, r#"ྒ̴ྷ"#, r#"ྒ̴ྷ"#, r#"ྒ̴ྷ"#, r#"ྒ̴ྷ"#),
+        (r#"ྜ̴ྷ"#, r#"ྜ̴ྷ"#, r#"ྜ̴ྷ"#, r#"ྜ̴ྷ"#, r#"ྜ̴ྷ"#),
+        (r#"ྡ̴ྷ"#, r#"ྡ̴ྷ"#, r#"ྡ̴ྷ"#, r#"ྡ̴ྷ"#, r#"ྡ̴ྷ"#),
+        (r#"ྦ̴ྷ"#, r#"ྦ̴ྷ"#, r#"ྦ̴ྷ"#, r#"ྦ̴ྷ"#, r#"ྦ̴ྷ"#),
+        (r#"ྫ̴ྷ"#, r#"ྫ̴ྷ"#, r#"ྫ̴ྷ"#, r#"ྫ̴ྷ"#, r#"ྫ̴ྷ"#),
+        (r#"ဥ̴ီ"#, r#"ဥ̴ီ"#, r#"ဥ̴ီ"#, r#"ဥ̴ီ"#, r#"ဥ̴ီ"#),
+        (r#"ᄀ̴ᅡ"#, r#"ᄀ̴ᅡ"#, r#"ᄀ̴ᅡ"#, r#"ᄀ̴ᅡ"#, r#"ᄀ̴ᅡ"#),
+        (r#"ᄀ̴ᅮ"#, r#"ᄀ̴ᅮ"#, r#"ᄀ̴ᅮ"#, r#"ᄀ̴ᅮ"#, r#"ᄀ̴ᅮ"#),
+        (r#"ᄁ̴ᅦ"#, r#"ᄁ̴ᅦ"#, r#"ᄁ̴ᅦ"#, r#"ᄁ̴ᅦ"#, r#"ᄁ̴ᅦ"#),
+        (r#"ᄁ̴ᅳ"#, r#"ᄁ̴ᅳ"#, r#"ᄁ̴ᅳ"#, r#"ᄁ̴ᅳ"#, r#"ᄁ̴ᅳ"#),
+        (r#"ᄂ̴ᅫ"#, r#"ᄂ̴ᅫ"#, r#"ᄂ̴ᅫ"#, r#"ᄂ̴ᅫ"#, r#"ᄂ̴ᅫ"#),
+        (r#"ᄃ̴ᅣ"#, r#"ᄃ̴ᅣ"#, r#"ᄃ̴ᅣ"#, r#"ᄃ̴ᅣ"#, r#"ᄃ̴ᅣ"#),
+        (r#"ᄃ̴ᅰ"#, r#"ᄃ̴ᅰ"#, r#"ᄃ̴ᅰ"#, r#"ᄃ̴ᅰ"#, r#"ᄃ̴ᅰ"#),
+        (r#"ᄄ̴ᅨ"#, r#"ᄄ̴ᅨ"#, r#"ᄄ̴ᅨ"#, r#"ᄄ̴ᅨ"#, r#"ᄄ̴ᅨ"#),
+        (r#"ᄄ̴ᅵ"#, r#"ᄄ̴ᅵ"#, r#"ᄄ̴ᅵ"#, r#"ᄄ̴ᅵ"#, r#"ᄄ̴ᅵ"#),
+        (r#"ᄅ̴ᅭ"#, r#"ᄅ̴ᅭ"#, r#"ᄅ̴ᅭ"#, r#"ᄅ̴ᅭ"#, r#"ᄅ̴ᅭ"#),
+        (r#"ᄆ̴ᅥ"#, r#"ᄆ̴ᅥ"#, r#"ᄆ̴ᅥ"#, r#"ᄆ̴ᅥ"#, r#"ᄆ̴ᅥ"#),
+        (r#"ᄆ̴ᅲ"#, r#"ᄆ̴ᅲ"#, r#"ᄆ̴ᅲ"#, r#"ᄆ̴ᅲ"#, r#"ᄆ̴ᅲ"#),
+        (r#"ᄇ̴ᅪ"#, r#"ᄇ̴ᅪ"#, r#"ᄇ̴ᅪ"#, r#"ᄇ̴ᅪ"#, r#"ᄇ̴ᅪ"#),
+        (r#"ᄈ̴ᅢ"#, r#"ᄈ̴ᅢ"#, r#"ᄈ̴ᅢ"#, r#"ᄈ̴ᅢ"#, r#"ᄈ̴ᅢ"#),
+        (r#"ᄈ̴ᅯ"#, r#"ᄈ̴ᅯ"#, r#"ᄈ̴ᅯ"#, r#"ᄈ̴ᅯ"#, r#"ᄈ̴ᅯ"#),
+        (r#"ᄉ̴ᅧ"#, r#"ᄉ̴ᅧ"#, r#"ᄉ̴ᅧ"#, r#"ᄉ̴ᅧ"#, r#"ᄉ̴ᅧ"#),
+        (r#"ᄉ̴ᅴ"#, r#"ᄉ̴ᅴ"#, r#"ᄉ̴ᅴ"#, r#"ᄉ̴ᅴ"#, r#"ᄉ̴ᅴ"#),
+        (r#"ᄊ̴ᅬ"#, r#"ᄊ̴ᅬ"#, r#"ᄊ̴ᅬ"#, r#"ᄊ̴ᅬ"#, r#"ᄊ̴ᅬ"#),
+        (r#"ᄋ̴ᅤ"#, r#"ᄋ̴ᅤ"#, r#"ᄋ̴ᅤ"#, r#"ᄋ̴ᅤ"#, r#"ᄋ̴ᅤ"#),
+        (r#"ᄋ̴ᅱ"#, r#"ᄋ̴ᅱ"#, r#"ᄋ̴ᅱ"#, r#"ᄋ̴ᅱ"#, r#"ᄋ̴ᅱ"#),
+        (r#"ᄌ̴ᅩ"#, r#"ᄌ̴ᅩ"#, r#"ᄌ̴ᅩ"#, r#"ᄌ̴ᅩ"#, r#"ᄌ̴ᅩ"#),
+        (r#"ᄍ̴ᅡ"#, r#"ᄍ̴ᅡ"#, r#"ᄍ̴ᅡ"#, r#"ᄍ̴ᅡ"#, r#"ᄍ̴ᅡ"#),
+        (r#"ᄍ̴ᅮ"#, r#"ᄍ̴ᅮ"#, r#"ᄍ̴ᅮ"#, r#"ᄍ̴ᅮ"#, r#"ᄍ̴ᅮ"#),
+        (r#"ᄎ̴ᅦ"#, r#"ᄎ̴ᅦ"#, r#"ᄎ̴ᅦ"#, r#"ᄎ̴ᅦ"#, r#"ᄎ̴ᅦ"#),
+        (r#"ᄎ̴ᅳ"#, r#"ᄎ̴ᅳ"#, r#"ᄎ̴ᅳ"#, r#"ᄎ̴ᅳ"#, r#"ᄎ̴ᅳ"#),
+        (r#"ᄏ̴ᅫ"#, r#"ᄏ̴ᅫ"#, r#"ᄏ̴ᅫ"#, r#"ᄏ̴ᅫ"#, r#"ᄏ̴ᅫ"#),
+        (r#"ᄐ̴ᅣ"#, r#"ᄐ̴ᅣ"#, r#"ᄐ̴ᅣ"#, r#"ᄐ̴ᅣ"#, r#"ᄐ̴ᅣ"#),
+        (r#"ᄐ̴ᅰ"#, r#"ᄐ̴ᅰ"#, r#"ᄐ̴ᅰ"#, r#"ᄐ̴ᅰ"#, r#"ᄐ̴ᅰ"#),
+        (r#"ᄑ̴ᅨ"#, r#"ᄑ̴ᅨ"#, r#"ᄑ̴ᅨ"#, r#"ᄑ̴ᅨ"#, r#"ᄑ̴ᅨ"#),
+        (r#"ᄑ̴ᅵ"#, r#"ᄑ̴ᅵ"#, r#"ᄑ̴ᅵ"#, r#"ᄑ̴ᅵ"#, r#"ᄑ̴ᅵ"#),
+        (r#"ᄒ̴ᅭ"#, r#"ᄒ̴ᅭ"#, r#"ᄒ̴ᅭ"#, r#"ᄒ̴ᅭ"#, r#"ᄒ̴ᅭ"#),
+        (r#"ᬅ̴ᬵ"#, r#"ᬅ̴ᬵ"#, r#"ᬅ̴ᬵ"#, r#"ᬅ̴ᬵ"#, r#"ᬅ̴ᬵ"#),
+        (r#"ᬇ̴ᬵ"#, r#"ᬇ̴ᬵ"#, r#"ᬇ̴ᬵ"#, r#"ᬇ̴ᬵ"#, r#"ᬇ̴ᬵ"#),
+        (r#"ᬉ̴ᬵ"#, r#"ᬉ̴ᬵ"#, r#"ᬉ̴ᬵ"#, r#"ᬉ̴ᬵ"#, r#"ᬉ̴ᬵ"#),
+        (r#"ᬋ̴ᬵ"#, r#"ᬋ̴ᬵ"#, r#"ᬋ̴ᬵ"#, r#"ᬋ̴ᬵ"#, r#"ᬋ̴ᬵ"#),
+        (r#"ᬍ̴ᬵ"#, r#"ᬍ̴ᬵ"#, r#"ᬍ̴ᬵ"#, r#"ᬍ̴ᬵ"#, r#"ᬍ̴ᬵ"#),
+        (r#"ᬑ̴ᬵ"#, r#"ᬑ̴ᬵ"#, r#"ᬑ̴ᬵ"#, r#"ᬑ̴ᬵ"#, r#"ᬑ̴ᬵ"#),
+        (r#"ᬺ̴ᬵ"#, r#"ᬺ̴ᬵ"#, r#"ᬺ̴ᬵ"#, r#"ᬺ̴ᬵ"#, r#"ᬺ̴ᬵ"#),
+        (r#"ᬼ̴ᬵ"#, r#"ᬼ̴ᬵ"#, r#"ᬼ̴ᬵ"#, r#"ᬼ̴ᬵ"#, r#"ᬼ̴ᬵ"#),
+        (r#"ᬾ̴ᬵ"#, r#"ᬾ̴ᬵ"#, r#"ᬾ̴ᬵ"#, r#"ᬾ̴ᬵ"#, r#"ᬾ̴ᬵ"#),
+        (r#"ᬿ̴ᬵ"#, r#"ᬿ̴ᬵ"#, r#"ᬿ̴ᬵ"#, r#"ᬿ̴ᬵ"#, r#"ᬿ̴ᬵ"#),
+        (r#"ᭂ̴ᬵ"#, r#"ᭂ̴ᬵ"#, r#"ᭂ̴ᬵ"#, r#"ᭂ̴ᬵ"#, r#"ᭂ̴ᬵ"#),
+        (r#"걔̴ᆮ"#, r#"걔̴ᆮ"#, r#"걔̴ᆮ"#, r#"걔̴ᆮ"#, r#"걔̴ᆮ"#),
+        (r#"겨̴ᆵ"#, r#"겨̴ᆵ"#, r#"겨̴ᆵ"#, r#"겨̴ᆵ"#, r#"겨̴ᆵ"#),
+        (r#"과̴ᆼ"#, r#"과̴ᆼ"#, r#"과̴ᆼ"#, r#"과̴ᆼ"#, r#"과̴ᆼ"#),
+        (r#"귀̴ᆮ"#, r#"귀̴ᆮ"#, r#"귀̴ᆮ"#, r#"귀̴ᆮ"#, r#"귀̴ᆮ"#),
+        (r#"긔̴ᆵ"#, r#"긔̴ᆵ"#, r#"긔̴ᆵ"#, r#"긔̴ᆵ"#, r#"긔̴ᆵ"#),
+        (r#"깨̴ᆼ"#, r#"깨̴ᆼ"#, r#"깨̴ᆼ"#, r#"깨̴ᆼ"#, r#"깨̴ᆼ"#),
+        (r#"꼬̴ᆮ"#, r#"꼬̴ᆮ"#, r#"꼬̴ᆮ"#, r#"꼬̴ᆮ"#, r#"꼬̴ᆮ"#),
+        (r#"꾀̴ᆵ"#, r#"꾀̴ᆵ"#, r#"꾀̴ᆵ"#, r#"꾀̴ᆵ"#, r#"꾀̴ᆵ"#),
+        (r#"꿔̴ᆼ"#, r#"꿔̴ᆼ"#, r#"꿔̴ᆼ"#, r#"꿔̴ᆼ"#, r#"꿔̴ᆼ"#),
+        (r#"나̴ᆮ"#, r#"나̴ᆮ"#, r#"나̴ᆮ"#, r#"나̴ᆮ"#, r#"나̴ᆮ"#),
+        (r#"냬̴ᆵ"#, r#"냬̴ᆵ"#, r#"냬̴ᆵ"#, r#"냬̴ᆵ"#, r#"냬̴ᆵ"#),
+        (r#"녀̴ᆼ"#, r#"녀̴ᆼ"#, r#"녀̴ᆼ"#, r#"녀̴ᆼ"#, r#"녀̴ᆼ"#),
+        (r#"누̴ᆮ"#, r#"누̴ᆮ"#, r#"누̴ᆮ"#, r#"누̴ᆮ"#, r#"누̴ᆮ"#),
+        (r#"뉘̴ᆵ"#, r#"뉘̴ᆵ"#, r#"뉘̴ᆵ"#, r#"뉘̴ᆵ"#, r#"뉘̴ᆵ"#),
+        (r#"늬̴ᆼ"#, r#"늬̴ᆼ"#, r#"늬̴ᆼ"#, r#"늬̴ᆼ"#, r#"늬̴ᆼ"#),
+        (r#"데̴ᆮ"#, r#"데̴ᆮ"#, r#"데̴ᆮ"#, r#"데̴ᆮ"#, r#"데̴ᆮ"#),
+        (r#"도̴ᆵ"#, r#"도̴ᆵ"#, r#"도̴ᆵ"#, r#"도̴ᆵ"#, r#"도̴ᆵ"#),
+        (r#"되̴ᆼ"#, r#"되̴ᆼ"#, r#"되̴ᆼ"#, r#"되̴ᆼ"#, r#"되̴ᆼ"#),
+        (r#"드̴ᆮ"#, r#"드̴ᆮ"#, r#"드̴ᆮ"#, r#"드̴ᆮ"#, r#"드̴ᆮ"#),
+        (r#"따̴ᆵ"#, r#"따̴ᆵ"#, r#"따̴ᆵ"#, r#"따̴ᆵ"#, r#"따̴ᆵ"#),
+        (r#"떄̴ᆼ"#, r#"떄̴ᆼ"#, r#"떄̴ᆼ"#, r#"떄̴ᆼ"#, r#"떄̴ᆼ"#),
+        (r#"뙈̴ᆮ"#, r#"뙈̴ᆮ"#, r#"뙈̴ᆮ"#, r#"뙈̴ᆮ"#, r#"뙈̴ᆮ"#),
+        (r#"뚜̴ᆵ"#, r#"뚜̴ᆵ"#, r#"뚜̴ᆵ"#, r#"뚜̴ᆵ"#, r#"뚜̴ᆵ"#),
+        (r#"뛰̴ᆼ"#, r#"뛰̴ᆼ"#, r#"뛰̴ᆼ"#, r#"뛰̴ᆼ"#, r#"뛰̴ᆼ"#),
+        (r#"랴̴ᆮ"#, r#"랴̴ᆮ"#, r#"랴̴ᆮ"#, r#"랴̴ᆮ"#, r#"랴̴ᆮ"#),
+        (r#"레̴ᆵ"#, r#"레̴ᆵ"#, r#"레̴ᆵ"#, r#"레̴ᆵ"#, r#"레̴ᆵ"#),
+        (r#"로̴ᆼ"#, r#"로̴ᆼ"#, r#"로̴ᆼ"#, r#"로̴ᆼ"#, r#"로̴ᆼ"#),
+        (r#"뤠̴ᆮ"#, r#"뤠̴ᆮ"#, r#"뤠̴ᆮ"#, r#"뤠̴ᆮ"#, r#"뤠̴ᆮ"#),
+        (r#"르̴ᆵ"#, r#"르̴ᆵ"#, r#"르̴ᆵ"#, r#"르̴ᆵ"#, r#"르̴ᆵ"#),
+        (r#"마̴ᆼ"#, r#"마̴ᆼ"#, r#"마̴ᆼ"#, r#"마̴ᆼ"#, r#"마̴ᆼ"#),
+        (r#"몌̴ᆮ"#, r#"몌̴ᆮ"#, r#"몌̴ᆮ"#, r#"몌̴ᆮ"#, r#"몌̴ᆮ"#),
+        (r#"뫠̴ᆵ"#, r#"뫠̴ᆵ"#, r#"뫠̴ᆵ"#, r#"뫠̴ᆵ"#, r#"뫠̴ᆵ"#),
+        (r#"무̴ᆼ"#, r#"무̴ᆼ"#, r#"무̴ᆼ"#, r#"무̴ᆼ"#, r#"무̴ᆼ"#),
+        (r#"미̴ᆮ"#, r#"미̴ᆮ"#, r#"미̴ᆮ"#, r#"미̴ᆮ"#, r#"미̴ᆮ"#),
+        (r#"뱌̴ᆵ"#, r#"뱌̴ᆵ"#, r#"뱌̴ᆵ"#, r#"뱌̴ᆵ"#, r#"뱌̴ᆵ"#),
+        (r#"베̴ᆼ"#, r#"베̴ᆼ"#, r#"베̴ᆼ"#, r#"베̴ᆼ"#, r#"베̴ᆼ"#),
+        (r#"뵤̴ᆮ"#, r#"뵤̴ᆮ"#, r#"뵤̴ᆮ"#, r#"뵤̴ᆮ"#, r#"뵤̴ᆮ"#),
+        (r#"붸̴ᆵ"#, r#"붸̴ᆵ"#, r#"붸̴ᆵ"#, r#"붸̴ᆵ"#, r#"붸̴ᆵ"#),
+        (r#"브̴ᆼ"#, r#"브̴ᆼ"#, r#"브̴ᆼ"#, r#"브̴ᆼ"#, r#"브̴ᆼ"#),
+        (r#"뻐̴ᆮ"#, r#"뻐̴ᆮ"#, r#"뻐̴ᆮ"#, r#"뻐̴ᆮ"#, r#"뻐̴ᆮ"#),
+        (r#"뼤̴ᆵ"#, r#"뼤̴ᆵ"#, r#"뼤̴ᆵ"#, r#"뼤̴ᆵ"#, r#"뼤̴ᆵ"#),
+        (r#"뽸̴ᆼ"#, r#"뽸̴ᆼ"#, r#"뽸̴ᆼ"#, r#"뽸̴ᆼ"#, r#"뽸̴ᆼ"#),
+        (r#"쀼̴ᆮ"#, r#"쀼̴ᆮ"#, r#"쀼̴ᆮ"#, r#"쀼̴ᆮ"#, r#"쀼̴ᆮ"#),
+        (r#"삐̴ᆵ"#, r#"삐̴ᆵ"#, r#"삐̴ᆵ"#, r#"삐̴ᆵ"#, r#"삐̴ᆵ"#),
+        (r#"샤̴ᆼ"#, r#"샤̴ᆼ"#, r#"샤̴ᆼ"#, r#"샤̴ᆼ"#, r#"샤̴ᆼ"#),
+        (r#"솨̴ᆮ"#, r#"솨̴ᆮ"#, r#"솨̴ᆮ"#, r#"솨̴ᆮ"#, r#"솨̴ᆮ"#),
+        (r#"쇼̴ᆵ"#, r#"쇼̴ᆵ"#, r#"쇼̴ᆵ"#, r#"쇼̴ᆵ"#, r#"쇼̴ᆵ"#),
+        (r#"쉐̴ᆼ"#, r#"쉐̴ᆼ"#, r#"쉐̴ᆼ"#, r#"쉐̴ᆼ"#, r#"쉐̴ᆼ"#),
+        (r#"쌔̴ᆮ"#, r#"쌔̴ᆮ"#, r#"쌔̴ᆮ"#, r#"쌔̴ᆮ"#, r#"쌔̴ᆮ"#),
+        (r#"써̴ᆵ"#, r#"써̴ᆵ"#, r#"써̴ᆵ"#, r#"써̴ᆵ"#, r#"써̴ᆵ"#),
+        (r#"쎼̴ᆼ"#, r#"쎼̴ᆼ"#, r#"쎼̴ᆼ"#, r#"쎼̴ᆼ"#, r#"쎼̴ᆼ"#),
+        (r#"쒀̴ᆮ"#, r#"쒀̴ᆮ"#, r#"쒀̴ᆮ"#, r#"쒀̴ᆮ"#, r#"쒀̴ᆮ"#),
+        (r#"쓔̴ᆵ"#, r#"쓔̴ᆵ"#, r#"쓔̴ᆵ"#, r#"쓔̴ᆵ"#, r#"쓔̴ᆵ"#),
+        (r#"씨̴ᆼ"#, r#"씨̴ᆼ"#, r#"씨̴ᆼ"#, r#"씨̴ᆼ"#, r#"씨̴ᆼ"#),
+        (r#"여̴ᆮ"#, r#"여̴ᆮ"#, r#"여̴ᆮ"#, r#"여̴ᆮ"#, r#"여̴ᆮ"#),
+        (r#"와̴ᆵ"#, r#"와̴ᆵ"#, r#"와̴ᆵ"#, r#"와̴ᆵ"#, r#"와̴ᆵ"#),
+        (r#"요̴ᆼ"#, r#"요̴ᆼ"#, r#"요̴ᆼ"#, r#"요̴ᆼ"#, r#"요̴ᆼ"#),
+        (r#"의̴ᆮ"#, r#"의̴ᆮ"#, r#"의̴ᆮ"#, r#"의̴ᆮ"#, r#"의̴ᆮ"#),
+        (r#"재̴ᆵ"#, r#"재̴ᆵ"#, r#"재̴ᆵ"#, r#"재̴ᆵ"#, r#"재̴ᆵ"#),
+        (r#"저̴ᆼ"#, r#"저̴ᆼ"#, r#"저̴ᆼ"#, r#"저̴ᆼ"#, r#"저̴ᆼ"#),
+        (r#"죄̴ᆮ"#, r#"죄̴ᆮ"#, r#"죄̴ᆮ"#, r#"죄̴ᆮ"#, r#"죄̴ᆮ"#),
+        (r#"줘̴ᆵ"#, r#"줘̴ᆵ"#, r#"줘̴ᆵ"#, r#"줘̴ᆵ"#, r#"줘̴ᆵ"#),
+        (r#"쥬̴ᆼ"#, r#"쥬̴ᆼ"#, r#"쥬̴ᆼ"#, r#"쥬̴ᆼ"#, r#"쥬̴ᆼ"#),
+        (r#"쨰̴ᆮ"#, r#"쨰̴ᆮ"#, r#"쨰̴ᆮ"#, r#"쨰̴ᆮ"#, r#"쨰̴ᆮ"#),
+        (r#"쪄̴ᆵ"#, r#"쪄̴ᆵ"#, r#"쪄̴ᆵ"#, r#"쪄̴ᆵ"#, r#"쪄̴ᆵ"#),
+        (r#"쫘̴ᆼ"#, r#"쫘̴ᆼ"#, r#"쫘̴ᆼ"#, r#"쫘̴ᆼ"#, r#"쫘̴ᆼ"#),
+        (r#"쮜̴ᆮ"#, r#"쮜̴ᆮ"#, r#"쮜̴ᆮ"#, r#"쮜̴ᆮ"#, r#"쮜̴ᆮ"#),
+        (r#"쯰̴ᆵ"#, r#"쯰̴ᆵ"#, r#"쯰̴ᆵ"#, r#"쯰̴ᆵ"#, r#"쯰̴ᆵ"#),
+        (r#"채̴ᆼ"#, r#"채̴ᆼ"#, r#"채̴ᆼ"#, r#"채̴ᆼ"#, r#"채̴ᆼ"#),
+        (r#"초̴ᆮ"#, r#"초̴ᆮ"#, r#"초̴ᆮ"#, r#"초̴ᆮ"#, r#"초̴ᆮ"#),
+        (r#"최̴ᆵ"#, r#"최̴ᆵ"#, r#"최̴ᆵ"#, r#"최̴ᆵ"#, r#"최̴ᆵ"#),
+        (r#"춰̴ᆼ"#, r#"춰̴ᆼ"#, r#"춰̴ᆼ"#, r#"춰̴ᆼ"#, r#"춰̴ᆼ"#),
+        (r#"카̴ᆮ"#, r#"카̴ᆮ"#, r#"카̴ᆮ"#, r#"카̴ᆮ"#, r#"카̴ᆮ"#),
+        (r#"컈̴ᆵ"#, r#"컈̴ᆵ"#, r#"컈̴ᆵ"#, r#"컈̴ᆵ"#, r#"컈̴ᆵ"#),
+        (r#"켜̴ᆼ"#, r#"켜̴ᆼ"#, r#"켜̴ᆼ"#, r#"켜̴ᆼ"#, r#"켜̴ᆼ"#),
+        (r#"쿠̴ᆮ"#, r#"쿠̴ᆮ"#, r#"쿠̴ᆮ"#, r#"쿠̴ᆮ"#, r#"쿠̴ᆮ"#),
+        (r#"퀴̴ᆵ"#, r#"퀴̴ᆵ"#, r#"퀴̴ᆵ"#, r#"퀴̴ᆵ"#, r#"퀴̴ᆵ"#),
+        (r#"킈̴ᆼ"#, r#"킈̴ᆼ"#, r#"킈̴ᆼ"#, r#"킈̴ᆼ"#, r#"킈̴ᆼ"#),
+        (r#"테̴ᆮ"#, r#"테̴ᆮ"#, r#"테̴ᆮ"#, r#"테̴ᆮ"#, r#"테̴ᆮ"#),
+        (r#"토̴ᆵ"#, r#"토̴ᆵ"#, r#"토̴ᆵ"#, r#"토̴ᆵ"#, r#"토̴ᆵ"#),
+        (r#"퇴̴ᆼ"#, r#"퇴̴ᆼ"#, r#"퇴̴ᆼ"#, r#"퇴̴ᆼ"#, r#"퇴̴ᆼ"#),
+        (r#"트̴ᆮ"#, r#"트̴ᆮ"#, r#"트̴ᆮ"#, r#"트̴ᆮ"#, r#"트̴ᆮ"#),
+        (r#"파̴ᆵ"#, r#"파̴ᆵ"#, r#"파̴ᆵ"#, r#"파̴ᆵ"#, r#"파̴ᆵ"#),
+        (r#"퍠̴ᆼ"#, r#"퍠̴ᆼ"#, r#"퍠̴ᆼ"#, r#"퍠̴ᆼ"#, r#"퍠̴ᆼ"#),
+        (r#"퐤̴ᆮ"#, r#"퐤̴ᆮ"#, r#"퐤̴ᆮ"#, r#"퐤̴ᆮ"#, r#"퐤̴ᆮ"#),
+        (r#"푸̴ᆵ"#, r#"푸̴ᆵ"#, r#"푸̴ᆵ"#, r#"푸̴ᆵ"#, r#"푸̴ᆵ"#),
+        (r#"퓌̴ᆼ"#, r#"퓌̴ᆼ"#, r#"퓌̴ᆼ"#, r#"퓌̴ᆼ"#, r#"퓌̴ᆼ"#),
+        (r#"햐̴ᆮ"#, r#"햐̴ᆮ"#, r#"햐̴ᆮ"#, r#"햐̴ᆮ"#, r#"햐̴ᆮ"#),
+        (r#"헤̴ᆵ"#, r#"헤̴ᆵ"#, r#"헤̴ᆵ"#, r#"헤̴ᆵ"#, r#"헤̴ᆵ"#),
+        (r#"호̴ᆼ"#, r#"호̴ᆼ"#, r#"호̴ᆼ"#, r#"호̴ᆼ"#, r#"호̴ᆼ"#),
+        (r#"훼̴ᆮ"#, r#"훼̴ᆮ"#, r#"훼̴ᆮ"#, r#"훼̴ᆮ"#, r#"훼̴ᆮ"#),
+        (r#"흐̴ᆵ"#, r#"흐̴ᆵ"#, r#"흐̴ᆵ"#, r#"흐̴ᆵ"#, r#"흐̴ᆵ"#),
+        (r#"𑄱̴𑄧"#, r#"𑄱̴𑄧"#, r#"𑄱̴𑄧"#, r#"𑄱̴𑄧"#, r#"𑄱̴𑄧"#),
+        (r#"𑄲̴𑄧"#, r#"𑄲̴𑄧"#, r#"𑄲̴𑄧"#, r#"𑄲̴𑄧"#, r#"𑄲̴𑄧"#),
+        (r#"𑍇̴𑌾"#, r#"𑍇̴𑌾"#, r#"𑍇̴𑌾"#, r#"𑍇̴𑌾"#, r#"𑍇̴𑌾"#),
+        (r#"𑍇̴𑍗"#, r#"𑍇̴𑍗"#, r#"𑍇̴𑍗"#, r#"𑍇̴𑍗"#, r#"𑍇̴𑍗"#),
+        (r#"𑒹̴𑒰"#, r#"𑒹̴𑒰"#, r#"𑒹̴𑒰"#, r#"𑒹̴𑒰"#, r#"𑒹̴𑒰"#),
+        (r#"𑒹̴𑒺"#, r#"𑒹̴𑒺"#, r#"𑒹̴𑒺"#, r#"𑒹̴𑒺"#, r#"𑒹̴𑒺"#),
+        (r#"𑒹̴𑒽"#, r#"𑒹̴𑒽"#, r#"𑒹̴𑒽"#, r#"𑒹̴𑒽"#, r#"𑒹̴𑒽"#),
+        (r#"𑖸̴𑖯"#, r#"𑖸̴𑖯"#, r#"𑖸̴𑖯"#, r#"𑖸̴𑖯"#, r#"𑖸̴𑖯"#),
+        (r#"𑖹̴𑖯"#, r#"𑖹̴𑖯"#, r#"𑖹̴𑖯"#, r#"𑖹̴𑖯"#, r#"𑖹̴𑖯"#),
+        (r#"𑤵̴𑤰"#, r#"𑤵̴𑤰"#, r#"𑤵̴𑤰"#, r#"𑤵̴𑤰"#, r#"𑤵̴𑤰"#),
     ];
 }

crates/unicode-width/src/tests.rs

diff --git a/crates/unicode-width/src/tests.rs b/crates/unicode-width/src/tests.rs
deleted file mode 100644
index e49b1bf..0000000
--- a/crates/unicode-width/src/tests.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(feature = "bench")]
-use std::iter;
-#[cfg(feature = "bench")]
-use test::{self, Bencher};
-#[cfg(feature = "bench")]
-use super::{UnicodeWidthChar, UnicodeWidthStr};
-
-use std::prelude::v1::*;
-
-#[cfg(feature = "bench")]
-#[bench]
-fn cargo(b: &mut Bencher) {
-    let string = iter::repeat('a').take(4096).collect::<String>();
-
-    b.iter(|| {
-        for c in string.chars() {
-            test::black_box(UnicodeWidthChar::width(c));
-        }
-    });
-}
-
-#[cfg(feature = "bench")]
-#[bench]
-#[allow(deprecated)]
-fn stdlib(b: &mut Bencher) {
-    let string = iter::repeat('a').take(4096).collect::<String>();
-
-    b.iter(|| {
-        for c in string.chars() {
-            test::black_box(c.width());
-        }
-    });
-}
-
-#[cfg(feature = "bench")]
-#[bench]
-fn simple_if(b: &mut Bencher) {
-    let string = iter::repeat('a').take(4096).collect::<String>();
-
-    b.iter(|| {
-        for c in string.chars() {
-            test::black_box(simple_width_if(c));
-        }
-    });
-}
-
-#[cfg(feature = "bench")]
-#[bench]
-fn simple_match(b: &mut Bencher) {
-    let string = iter::repeat('a').take(4096).collect::<String>();
-
-    b.iter(|| {
-        for c in string.chars() {
-            test::black_box(simple_width_match(c));
-        }
-    });
-}
-
-#[cfg(feature = "bench")]
-#[inline]
-fn simple_width_if(c: char) -> Option<usize> {
-    let cu = c as u32;
-    if cu < 127 {
-        if cu > 31 {
-            Some(1)
-        } else if cu == 0 {
-            Some(0)
-        } else {
-            None
-        }
-    } else {
-        UnicodeWidthChar::width(c)
-    }
-}
-
-#[cfg(feature = "bench")]
-#[inline]
-fn simple_width_match(c: char) -> Option<usize> {
-    match c as u32 {
-        cu if cu == 0 => Some(0),
-        cu if cu < 0x20 => None,
-        cu if cu < 0x7f => Some(1),
-        _ => UnicodeWidthChar::width(c)
-    }
-}
-#[cfg(all(feature = "bench", not(feature = "no_std")))]
-#[bench]
-fn enwik8(b: &mut Bencher) {
-    // To benchmark, download & unzip `enwik8` from https://data.deepai.org/enwik8.zip
-    let data_path = "bench_data/enwik8";
-    let string = std::fs::read_to_string(data_path).unwrap_or_default();
-    b.iter(|| test::black_box(UnicodeWidthStr::width(string.as_str())));
-}
-#[cfg(all(feature = "bench", not(feature = "no_std")))]
-#[bench]
-fn jawiki(b: &mut Bencher) {
-    // To benchmark, download & extract `jawiki-20220501-pages-articles-multistream-index.txt` from
-    // https://dumps.wikimedia.org/jawiki/20220501/jawiki-20220501-pages-articles-multistream-index.txt.bz2
-    let data_path = "bench_data/jawiki-20220501-pages-articles-multistream-index.txt";
-    let string = std::fs::read_to_string(data_path).unwrap_or_default();
-    b.iter(|| test::black_box(UnicodeWidthStr::width(string.as_str())));
-}
-#[test]
-fn test_str() {
-    use super::UnicodeWidthStr;
-
-    assert_eq!(UnicodeWidthStr::width("ｈｅｌｌｏ"), 10);
-    assert_eq!("ｈｅｌｌｏ".width_cjk(), 10);
-    assert_eq!(UnicodeWidthStr::width("\0\0\0\x01\x01"), 0);
-    assert_eq!("\0\0\0\x01\x01".width_cjk(), 0);
-    assert_eq!(UnicodeWidthStr::width(""), 0);
-    assert_eq!("".width_cjk(), 0);
-    assert_eq!(UnicodeWidthStr::width("\u{2081}\u{2082}\u{2083}\u{2084}"), 4);
-    assert_eq!("\u{2081}\u{2082}\u{2083}\u{2084}".width_cjk(), 8);
-}
-
-#[test]
-fn test_emoji() {
-    // Example from the README.
-    use super::UnicodeWidthStr;
-
-    assert_eq!(UnicodeWidthStr::width("👩"), 2); // Woman
-    assert_eq!(UnicodeWidthStr::width("🔬"), 2); // Microscope
-    assert_eq!(UnicodeWidthStr::width("👩‍🔬"), 4); // Woman scientist
-}
-
-#[test]
-fn test_char() {
-    use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{Some, None};
-
-    assert_eq!(UnicodeWidthChar::width('ｈ'), Some(2));
-    assert_eq!('ｈ'.width_cjk(), Some(2));
-    assert_eq!(UnicodeWidthChar::width('\x00'), Some(0));
-    assert_eq!('\x00'.width_cjk(), Some(0));
-    assert_eq!(UnicodeWidthChar::width('\x01'), None);
-    assert_eq!('\x01'.width_cjk(), None);
-    assert_eq!(UnicodeWidthChar::width('\u{2081}'), Some(1));
-    assert_eq!('\u{2081}'.width_cjk(), Some(2));
-}
-
-#[test]
-fn test_char2() {
-    use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{Some, None};
-
-    assert_eq!(UnicodeWidthChar::width('\x00'),Some(0));
-    assert_eq!('\x00'.width_cjk(),Some(0));
-
-    assert_eq!(UnicodeWidthChar::width('\x0A'),None);
-    assert_eq!('\x0A'.width_cjk(),None);
-
-    assert_eq!(UnicodeWidthChar::width('w'),Some(1));
-    assert_eq!('w'.width_cjk(),Some(1));
-
-    assert_eq!(UnicodeWidthChar::width('ｈ'),Some(2));
-    assert_eq!('ｈ'.width_cjk(),Some(2));
-
-    assert_eq!(UnicodeWidthChar::width('\u{AD}'),Some(1));
-    assert_eq!('\u{AD}'.width_cjk(),Some(1));
-
-    assert_eq!(UnicodeWidthChar::width('\u{1160}'),Some(0));
-    assert_eq!('\u{1160}'.width_cjk(),Some(0));
-
-    assert_eq!(UnicodeWidthChar::width('\u{a1}'),Some(1));
-    assert_eq!('\u{a1}'.width_cjk(),Some(2));
-
-    assert_eq!(UnicodeWidthChar::width('\u{300}'),Some(0));
-    assert_eq!('\u{300}'.width_cjk(),Some(0));
-}
-
-#[test]
-fn unicode_12() {
-    use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{Some, None};
-
-    assert_eq!(UnicodeWidthChar::width('\u{1F971}'), Some(2));
-}

crates/unicode-width/tests/emoji-test.txt

diff --git a/crates/unicode-width/tests/emoji-test.txt b/crates/unicode-width/tests/emoji-test.txt
new file mode 100644
index 0000000..1c4d1e7
--- /dev/null
+++ b/crates/unicode-width/tests/emoji-test.txt
@@ -0,0 +1,5325 @@
+# emoji-test.txt
+# Date: 2023-06-05, 21:39:54 GMT
+# © 2023 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see https://www.unicode.org/terms_of_use.html
+#
+# Emoji Keyboard/Display Test Data for UTS #51
+# Version: 15.1
+#
+# For documentation and usage, see https://www.unicode.org/reports/tr51
+#
+# This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
+# Format: code points; status # emoji name
+#     Code points — list of one or more hex code points, separated by spaces
+#     Status
+#       component           — an Emoji_Component,
+#                             excluding Regional_Indicators, ASCII, and non-Emoji.
+#       fully-qualified     — a fully-qualified emoji (see ED-18 in UTS #51),
+#                             excluding Emoji_Component
+#       minimally-qualified — a minimally-qualified emoji (see ED-18a in UTS #51)
+#       unqualified         — a unqualified emoji (See ED-19 in UTS #51)
+# Notes:
+#   • This includes the emoji components that need emoji presentation (skin tone and hair)
+#     when isolated, but omits the components that need not have an emoji
+#     presentation when isolated.
+#   • The RGI set is covered by the listed fully-qualified emoji. 
+#   • The listed minimally-qualified and unqualified cover all cases where an
+#     element of the RGI set is missing one or more emoji presentation selectors.
+#   • The file is in CLDR order, not codepoint order. This is recommended (but not required!) for keyboard palettes.
+#   • The groups and subgroups are illustrative. See the Emoji Order chart for more information.
+
+
+# group: Smileys & Emotion
+
+# subgroup: face-smiling
+1F600                                                  ; fully-qualified     # 😀 E1.0 grinning face
+1F603                                                  ; fully-qualified     # 😃 E0.6 grinning face with big eyes
+1F604                                                  ; fully-qualified     # 😄 E0.6 grinning face with smiling eyes
+1F601                                                  ; fully-qualified     # 😁 E0.6 beaming face with smiling eyes
+1F606                                                  ; fully-qualified     # 😆 E0.6 grinning squinting face
+1F605                                                  ; fully-qualified     # 😅 E0.6 grinning face with sweat
+1F923                                                  ; fully-qualified     # 🤣 E3.0 rolling on the floor laughing
+1F602                                                  ; fully-qualified     # 😂 E0.6 face with tears of joy
+1F642                                                  ; fully-qualified     # 🙂 E1.0 slightly smiling face
+1F643                                                  ; fully-qualified     # 🙃 E1.0 upside-down face
+1FAE0                                                  ; fully-qualified     # 🫠 E14.0 melting face
+1F609                                                  ; fully-qualified     # 😉 E0.6 winking face
+1F60A                                                  ; fully-qualified     # 😊 E0.6 smiling face with smiling eyes
+1F607                                                  ; fully-qualified     # 😇 E1.0 smiling face with halo
+
+# subgroup: face-affection
+1F970                                                  ; fully-qualified     # 🥰 E11.0 smiling face with hearts
+1F60D                                                  ; fully-qualified     # 😍 E0.6 smiling face with heart-eyes
+1F929                                                  ; fully-qualified     # 🤩 E5.0 star-struck
+1F618                                                  ; fully-qualified     # 😘 E0.6 face blowing a kiss
+1F617                                                  ; fully-qualified     # 😗 E1.0 kissing face
+263A FE0F                                              ; fully-qualified     # ☺️ E0.6 smiling face
+263A                                                   ; unqualified         # ☺ E0.6 smiling face
+1F61A                                                  ; fully-qualified     # 😚 E0.6 kissing face with closed eyes
+1F619                                                  ; fully-qualified     # 😙 E1.0 kissing face with smiling eyes
+1F972                                                  ; fully-qualified     # 🥲 E13.0 smiling face with tear
+
+# subgroup: face-tongue
+1F60B                                                  ; fully-qualified     # 😋 E0.6 face savoring food
+1F61B                                                  ; fully-qualified     # 😛 E1.0 face with tongue
+1F61C                                                  ; fully-qualified     # 😜 E0.6 winking face with tongue
+1F92A                                                  ; fully-qualified     # 🤪 E5.0 zany face
+1F61D                                                  ; fully-qualified     # 😝 E0.6 squinting face with tongue
+1F911                                                  ; fully-qualified     # 🤑 E1.0 money-mouth face
+
+# subgroup: face-hand
+1F917                                                  ; fully-qualified     # 🤗 E1.0 smiling face with open hands
+1F92D                                                  ; fully-qualified     # 🤭 E5.0 face with hand over mouth
+1FAE2                                                  ; fully-qualified     # 🫢 E14.0 face with open eyes and hand over mouth
+1FAE3                                                  ; fully-qualified     # 🫣 E14.0 face with peeking eye
+1F92B                                                  ; fully-qualified     # 🤫 E5.0 shushing face
+1F914                                                  ; fully-qualified     # 🤔 E1.0 thinking face
+1FAE1                                                  ; fully-qualified     # 🫡 E14.0 saluting face
+
+# subgroup: face-neutral-skeptical
+1F910                                                  ; fully-qualified     # 🤐 E1.0 zipper-mouth face
+1F928                                                  ; fully-qualified     # 🤨 E5.0 face with raised eyebrow
+1F610                                                  ; fully-qualified     # 😐 E0.7 neutral face
+1F611                                                  ; fully-qualified     # 😑 E1.0 expressionless face
+1F636                                                  ; fully-qualified     # 😶 E1.0 face without mouth
+1FAE5                                                  ; fully-qualified     # 🫥 E14.0 dotted line face
+1F636 200D 1F32B FE0F                                  ; fully-qualified     # 😶‍🌫️ E13.1 face in clouds
+1F636 200D 1F32B                                       ; minimally-qualified # 😶‍🌫 E13.1 face in clouds
+1F60F                                                  ; fully-qualified     # 😏 E0.6 smirking face
+1F612                                                  ; fully-qualified     # 😒 E0.6 unamused face
+1F644                                                  ; fully-qualified     # 🙄 E1.0 face with rolling eyes
+1F62C                                                  ; fully-qualified     # 😬 E1.0 grimacing face
+1F62E 200D 1F4A8                                       ; fully-qualified     # 😮‍💨 E13.1 face exhaling
+1F925                                                  ; fully-qualified     # 🤥 E3.0 lying face
+1FAE8                                                  ; fully-qualified     # 🫨 E15.0 shaking face
+1F642 200D 2194 FE0F                                   ; fully-qualified     # 🙂‍↔️ E15.1 head shaking horizontally
+1F642 200D 2194                                        ; minimally-qualified # 🙂‍↔ E15.1 head shaking horizontally
+1F642 200D 2195 FE0F                                   ; fully-qualified     # 🙂‍↕️ E15.1 head shaking vertically
+1F642 200D 2195                                        ; minimally-qualified # 🙂‍↕ E15.1 head shaking vertically
+
+# subgroup: face-sleepy
+1F60C                                                  ; fully-qualified     # 😌 E0.6 relieved face
+1F614                                                  ; fully-qualified     # 😔 E0.6 pensive face
+1F62A                                                  ; fully-qualified     # 😪 E0.6 sleepy face
+1F924                                                  ; fully-qualified     # 🤤 E3.0 drooling face
+1F634                                                  ; fully-qualified     # 😴 E1.0 sleeping face
+
+# subgroup: face-unwell
+1F637                                                  ; fully-qualified     # 😷 E0.6 face with medical mask
+1F912                                                  ; fully-qualified     # 🤒 E1.0 face with thermometer
+1F915                                                  ; fully-qualified     # 🤕 E1.0 face with head-bandage
+1F922                                                  ; fully-qualified     # 🤢 E3.0 nauseated face
+1F92E                                                  ; fully-qualified     # 🤮 E5.0 face vomiting
+1F927                                                  ; fully-qualified     # 🤧 E3.0 sneezing face
+1F975                                                  ; fully-qualified     # 🥵 E11.0 hot face
+1F976                                                  ; fully-qualified     # 🥶 E11.0 cold face
+1F974                                                  ; fully-qualified     # 🥴 E11.0 woozy face
+1F635                                                  ; fully-qualified     # 😵 E0.6 face with crossed-out eyes
+1F635 200D 1F4AB                                       ; fully-qualified     # 😵‍💫 E13.1 face with spiral eyes
+1F92F                                                  ; fully-qualified     # 🤯 E5.0 exploding head
+
+# subgroup: face-hat
+1F920                                                  ; fully-qualified     # 🤠 E3.0 cowboy hat face
+1F973                                                  ; fully-qualified     # 🥳 E11.0 partying face
+1F978                                                  ; fully-qualified     # 🥸 E13.0 disguised face
+
+# subgroup: face-glasses
+1F60E                                                  ; fully-qualified     # 😎 E1.0 smiling face with sunglasses
+1F913                                                  ; fully-qualified     # 🤓 E1.0 nerd face
+1F9D0                                                  ; fully-qualified     # 🧐 E5.0 face with monocle
+
+# subgroup: face-concerned
+1F615                                                  ; fully-qualified     # 😕 E1.0 confused face
+1FAE4                                                  ; fully-qualified     # 🫤 E14.0 face with diagonal mouth
+1F61F                                                  ; fully-qualified     # 😟 E1.0 worried face
+1F641                                                  ; fully-qualified     # 🙁 E1.0 slightly frowning face
+2639 FE0F                                              ; fully-qualified     # ☹️ E0.7 frowning face
+2639                                                   ; unqualified         # ☹ E0.7 frowning face
+1F62E                                                  ; fully-qualified     # 😮 E1.0 face with open mouth
+1F62F                                                  ; fully-qualified     # 😯 E1.0 hushed face
+1F632                                                  ; fully-qualified     # 😲 E0.6 astonished face
+1F633                                                  ; fully-qualified     # 😳 E0.6 flushed face
+1F97A                                                  ; fully-qualified     # 🥺 E11.0 pleading face
+1F979                                                  ; fully-qualified     # 🥹 E14.0 face holding back tears
+1F626                                                  ; fully-qualified     # 😦 E1.0 frowning face with open mouth
+1F627                                                  ; fully-qualified     # 😧 E1.0 anguished face
+1F628                                                  ; fully-qualified     # 😨 E0.6 fearful face
+1F630                                                  ; fully-qualified     # 😰 E0.6 anxious face with sweat
+1F625                                                  ; fully-qualified     # 😥 E0.6 sad but relieved face
+1F622                                                  ; fully-qualified     # 😢 E0.6 crying face
+1F62D                                                  ; fully-qualified     # 😭 E0.6 loudly crying face
+1F631                                                  ; fully-qualified     # 😱 E0.6 face screaming in fear
+1F616                                                  ; fully-qualified     # 😖 E0.6 confounded face
+1F623                                                  ; fully-qualified     # 😣 E0.6 persevering face
+1F61E                                                  ; fully-qualified     # 😞 E0.6 disappointed face
+1F613                                                  ; fully-qualified     # 😓 E0.6 downcast face with sweat
+1F629                                                  ; fully-qualified     # 😩 E0.6 weary face
+1F62B                                                  ; fully-qualified     # 😫 E0.6 tired face
+1F971                                                  ; fully-qualified     # 🥱 E12.0 yawning face
+
+# subgroup: face-negative
+1F624                                                  ; fully-qualified     # 😤 E0.6 face with steam from nose
+1F621                                                  ; fully-qualified     # 😡 E0.6 enraged face
+1F620                                                  ; fully-qualified     # 😠 E0.6 angry face
+1F92C                                                  ; fully-qualified     # 🤬 E5.0 face with symbols on mouth
+1F608                                                  ; fully-qualified     # 😈 E1.0 smiling face with horns
+1F47F                                                  ; fully-qualified     # 👿 E0.6 angry face with horns
+1F480                                                  ; fully-qualified     # 💀 E0.6 skull
+2620 FE0F                                              ; fully-qualified     # ☠️ E1.0 skull and crossbones
+2620                                                   ; unqualified         # ☠ E1.0 skull and crossbones
+
+# subgroup: face-costume
+1F4A9                                                  ; fully-qualified     # 💩 E0.6 pile of poo
+1F921                                                  ; fully-qualified     # 🤡 E3.0 clown face
+1F479                                                  ; fully-qualified     # 👹 E0.6 ogre
+1F47A                                                  ; fully-qualified     # 👺 E0.6 goblin
+1F47B                                                  ; fully-qualified     # 👻 E0.6 ghost
+1F47D                                                  ; fully-qualified     # 👽 E0.6 alien
+1F47E                                                  ; fully-qualified     # 👾 E0.6 alien monster
+1F916                                                  ; fully-qualified     # 🤖 E1.0 robot
+
+# subgroup: cat-face
+1F63A                                                  ; fully-qualified     # 😺 E0.6 grinning cat
+1F638                                                  ; fully-qualified     # 😸 E0.6 grinning cat with smiling eyes
+1F639                                                  ; fully-qualified     # 😹 E0.6 cat with tears of joy
+1F63B                                                  ; fully-qualified     # 😻 E0.6 smiling cat with heart-eyes
+1F63C                                                  ; fully-qualified     # 😼 E0.6 cat with wry smile
+1F63D                                                  ; fully-qualified     # 😽 E0.6 kissing cat
+1F640                                                  ; fully-qualified     # 🙀 E0.6 weary cat
+1F63F                                                  ; fully-qualified     # 😿 E0.6 crying cat
+1F63E                                                  ; fully-qualified     # 😾 E0.6 pouting cat
+
+# subgroup: monkey-face
+1F648                                                  ; fully-qualified     # 🙈 E0.6 see-no-evil monkey
+1F649                                                  ; fully-qualified     # 🙉 E0.6 hear-no-evil monkey
+1F64A                                                  ; fully-qualified     # 🙊 E0.6 speak-no-evil monkey
+
+# subgroup: heart
+1F48C                                                  ; fully-qualified     # 💌 E0.6 love letter
+1F498                                                  ; fully-qualified     # 💘 E0.6 heart with arrow
+1F49D                                                  ; fully-qualified     # 💝 E0.6 heart with ribbon
+1F496                                                  ; fully-qualified     # 💖 E0.6 sparkling heart
+1F497                                                  ; fully-qualified     # 💗 E0.6 growing heart
+1F493                                                  ; fully-qualified     # 💓 E0.6 beating heart
+1F49E                                                  ; fully-qualified     # 💞 E0.6 revolving hearts
+1F495                                                  ; fully-qualified     # 💕 E0.6 two hearts
+1F49F                                                  ; fully-qualified     # 💟 E0.6 heart decoration
+2763 FE0F                                              ; fully-qualified     # ❣️ E1.0 heart exclamation
+2763                                                   ; unqualified         # ❣ E1.0 heart exclamation
+1F494                                                  ; fully-qualified     # 💔 E0.6 broken heart
+2764 FE0F 200D 1F525                                   ; fully-qualified     # ❤️‍🔥 E13.1 heart on fire
+2764 200D 1F525                                        ; unqualified         # ❤‍🔥 E13.1 heart on fire
+2764 FE0F 200D 1FA79                                   ; fully-qualified     # ❤️‍🩹 E13.1 mending heart
+2764 200D 1FA79                                        ; unqualified         # ❤‍🩹 E13.1 mending heart
+2764 FE0F                                              ; fully-qualified     # ❤️ E0.6 red heart
+2764                                                   ; unqualified         # ❤ E0.6 red heart
+1FA77                                                  ; fully-qualified     # 🩷 E15.0 pink heart
+1F9E1                                                  ; fully-qualified     # 🧡 E5.0 orange heart
+1F49B                                                  ; fully-qualified     # 💛 E0.6 yellow heart
+1F49A                                                  ; fully-qualified     # 💚 E0.6 green heart
+1F499                                                  ; fully-qualified     # 💙 E0.6 blue heart
+1FA75                                                  ; fully-qualified     # 🩵 E15.0 light blue heart
+1F49C                                                  ; fully-qualified     # 💜 E0.6 purple heart
+1F90E                                                  ; fully-qualified     # 🤎 E12.0 brown heart
+1F5A4                                                  ; fully-qualified     # 🖤 E3.0 black heart
+1FA76                                                  ; fully-qualified     # 🩶 E15.0 grey heart
+1F90D                                                  ; fully-qualified     # 🤍 E12.0 white heart
+
+# subgroup: emotion
+1F48B                                                  ; fully-qualified     # 💋 E0.6 kiss mark
+1F4AF                                                  ; fully-qualified     # 💯 E0.6 hundred points
+1F4A2                                                  ; fully-qualified     # 💢 E0.6 anger symbol
+1F4A5                                                  ; fully-qualified     # 💥 E0.6 collision
+1F4AB                                                  ; fully-qualified     # 💫 E0.6 dizzy
+1F4A6                                                  ; fully-qualified     # 💦 E0.6 sweat droplets
+1F4A8                                                  ; fully-qualified     # 💨 E0.6 dashing away
+1F573 FE0F                                             ; fully-qualified     # 🕳️ E0.7 hole
+1F573                                                  ; unqualified         # 🕳 E0.7 hole
+1F4AC                                                  ; fully-qualified     # 💬 E0.6 speech balloon
+1F441 FE0F 200D 1F5E8 FE0F                             ; fully-qualified     # 👁️‍🗨️ E2.0 eye in speech bubble
+1F441 200D 1F5E8 FE0F                                  ; unqualified         # 👁‍🗨️ E2.0 eye in speech bubble
+1F441 FE0F 200D 1F5E8                                  ; minimally-qualified # 👁️‍🗨 E2.0 eye in speech bubble
+1F441 200D 1F5E8                                       ; unqualified         # 👁‍🗨 E2.0 eye in speech bubble
+1F5E8 FE0F                                             ; fully-qualified     # 🗨️ E2.0 left speech bubble
+1F5E8                                                  ; unqualified         # 🗨 E2.0 left speech bubble
+1F5EF FE0F                                             ; fully-qualified     # 🗯️ E0.7 right anger bubble
+1F5EF                                                  ; unqualified         # 🗯 E0.7 right anger bubble
+1F4AD                                                  ; fully-qualified     # 💭 E1.0 thought balloon
+1F4A4                                                  ; fully-qualified     # 💤 E0.6 ZZZ
+
+# Smileys & Emotion subtotal:		184
+# Smileys & Emotion subtotal:		184	w/o modifiers
+
+# group: People & Body
+
+# subgroup: hand-fingers-open
+1F44B                                                  ; fully-qualified     # 👋 E0.6 waving hand
+1F44B 1F3FB                                            ; fully-qualified     # 👋🏻 E1.0 waving hand: light skin tone
+1F44B 1F3FC                                            ; fully-qualified     # 👋🏼 E1.0 waving hand: medium-light skin tone
+1F44B 1F3FD                                            ; fully-qualified     # 👋🏽 E1.0 waving hand: medium skin tone
+1F44B 1F3FE                                            ; fully-qualified     # 👋🏾 E1.0 waving hand: medium-dark skin tone
+1F44B 1F3FF                                            ; fully-qualified     # 👋🏿 E1.0 waving hand: dark skin tone
+1F91A                                                  ; fully-qualified     # 🤚 E3.0 raised back of hand
+1F91A 1F3FB                                            ; fully-qualified     # 🤚🏻 E3.0 raised back of hand: light skin tone
+1F91A 1F3FC                                            ; fully-qualified     # 🤚🏼 E3.0 raised back of hand: medium-light skin tone
+1F91A 1F3FD                                            ; fully-qualified     # 🤚🏽 E3.0 raised back of hand: medium skin tone
+1F91A 1F3FE                                            ; fully-qualified     # 🤚🏾 E3.0 raised back of hand: medium-dark skin tone
+1F91A 1F3FF                                            ; fully-qualified     # 🤚🏿 E3.0 raised back of hand: dark skin tone
+1F590 FE0F                                             ; fully-qualified     # 🖐️ E0.7 hand with fingers splayed
+1F590                                                  ; unqualified         # 🖐 E0.7 hand with fingers splayed
+1F590 1F3FB                                            ; fully-qualified     # 🖐🏻 E1.0 hand with fingers splayed: light skin tone
+1F590 1F3FC                                            ; fully-qualified     # 🖐🏼 E1.0 hand with fingers splayed: medium-light skin tone
+1F590 1F3FD                                            ; fully-qualified     # 🖐🏽 E1.0 hand with fingers splayed: medium skin tone
+1F590 1F3FE                                            ; fully-qualified     # 🖐🏾 E1.0 hand with fingers splayed: medium-dark skin tone
+1F590 1F3FF                                            ; fully-qualified     # 🖐🏿 E1.0 hand with fingers splayed: dark skin tone
+270B                                                   ; fully-qualified     # ✋ E0.6 raised hand
+270B 1F3FB                                             ; fully-qualified     # ✋🏻 E1.0 raised hand: light skin tone
+270B 1F3FC                                             ; fully-qualified     # ✋🏼 E1.0 raised hand: medium-light skin tone
+270B 1F3FD                                             ; fully-qualified     # ✋🏽 E1.0 raised hand: medium skin tone
+270B 1F3FE                                             ; fully-qualified     # ✋🏾 E1.0 raised hand: medium-dark skin tone
+270B 1F3FF                                             ; fully-qualified     # ✋🏿 E1.0 raised hand: dark skin tone
+1F596                                                  ; fully-qualified     # 🖖 E1.0 vulcan salute
+1F596 1F3FB                                            ; fully-qualified     # 🖖🏻 E1.0 vulcan salute: light skin tone
+1F596 1F3FC                                            ; fully-qualified     # 🖖🏼 E1.0 vulcan salute: medium-light skin tone
+1F596 1F3FD                                            ; fully-qualified     # 🖖🏽 E1.0 vulcan salute: medium skin tone
+1F596 1F3FE                                            ; fully-qualified     # 🖖🏾 E1.0 vulcan salute: medium-dark skin tone
+1F596 1F3FF                                            ; fully-qualified     # 🖖🏿 E1.0 vulcan salute: dark skin tone
+1FAF1                                                  ; fully-qualified     # 🫱 E14.0 rightwards hand
+1FAF1 1F3FB                                            ; fully-qualified     # 🫱🏻 E14.0 rightwards hand: light skin tone
+1FAF1 1F3FC                                            ; fully-qualified     # 🫱🏼 E14.0 rightwards hand: medium-light skin tone
+1FAF1 1F3FD                                            ; fully-qualified     # 🫱🏽 E14.0 rightwards hand: medium skin tone
+1FAF1 1F3FE                                            ; fully-qualified     # 🫱🏾 E14.0 rightwards hand: medium-dark skin tone
+1FAF1 1F3FF                                            ; fully-qualified     # 🫱🏿 E14.0 rightwards hand: dark skin tone
+1FAF2                                                  ; fully-qualified     # 🫲 E14.0 leftwards hand
+1FAF2 1F3FB                                            ; fully-qualified     # 🫲🏻 E14.0 leftwards hand: light skin tone
+1FAF2 1F3FC                                            ; fully-qualified     # 🫲🏼 E14.0 leftwards hand: medium-light skin tone
+1FAF2 1F3FD                                            ; fully-qualified     # 🫲🏽 E14.0 leftwards hand: medium skin tone
+1FAF2 1F3FE                                            ; fully-qualified     # 🫲🏾 E14.0 leftwards hand: medium-dark skin tone
+1FAF2 1F3FF                                            ; fully-qualified     # 🫲🏿 E14.0 leftwards hand: dark skin tone
+1FAF3                                                  ; fully-qualified     # 🫳 E14.0 palm down hand
+1FAF3 1F3FB                                            ; fully-qualified     # 🫳🏻 E14.0 palm down hand: light skin tone
+1FAF3 1F3FC                                            ; fully-qualified     # 🫳🏼 E14.0 palm down hand: medium-light skin tone
+1FAF3 1F3FD                                            ; fully-qualified     # 🫳🏽 E14.0 palm down hand: medium skin tone
+1FAF3 1F3FE                                            ; fully-qualified     # 🫳🏾 E14.0 palm down hand: medium-dark skin tone
+1FAF3 1F3FF                                            ; fully-qualified     # 🫳🏿 E14.0 palm down hand: dark skin tone
+1FAF4                                                  ; fully-qualified     # 🫴 E14.0 palm up hand
+1FAF4 1F3FB                                            ; fully-qualified     # 🫴🏻 E14.0 palm up hand: light skin tone
+1FAF4 1F3FC                                            ; fully-qualified     # 🫴🏼 E14.0 palm up hand: medium-light skin tone
+1FAF4 1F3FD                                            ; fully-qualified     # 🫴🏽 E14.0 palm up hand: medium skin tone
+1FAF4 1F3FE                                            ; fully-qualified     # 🫴🏾 E14.0 palm up hand: medium-dark skin tone
+1FAF4 1F3FF                                            ; fully-qualified     # 🫴🏿 E14.0 palm up hand: dark skin tone
+1FAF7                                                  ; fully-qualified     # 🫷 E15.0 leftwards pushing hand
+1FAF7 1F3FB                                            ; fully-qualified     # 🫷🏻 E15.0 leftwards pushing hand: light skin tone
+1FAF7 1F3FC                                            ; fully-qualified     # 🫷🏼 E15.0 leftwards pushing hand: medium-light skin tone
+1FAF7 1F3FD                                            ; fully-qualified     # 🫷🏽 E15.0 leftwards pushing hand: medium skin tone
+1FAF7 1F3FE                                            ; fully-qualified     # 🫷🏾 E15.0 leftwards pushing hand: medium-dark skin tone
+1FAF7 1F3FF                                            ; fully-qualified     # 🫷🏿 E15.0 leftwards pushing hand: dark skin tone
+1FAF8                                                  ; fully-qualified     # 🫸 E15.0 rightwards pushing hand
+1FAF8 1F3FB                                            ; fully-qualified     # 🫸🏻 E15.0 rightwards pushing hand: light skin tone
+1FAF8 1F3FC                                            ; fully-qualified     # 🫸🏼 E15.0 rightwards pushing hand: medium-light skin tone
+1FAF8 1F3FD                                            ; fully-qualified     # 🫸🏽 E15.0 rightwards pushing hand: medium skin tone
+1FAF8 1F3FE                                            ; fully-qualified     # 🫸🏾 E15.0 rightwards pushing hand: medium-dark skin tone
+1FAF8 1F3FF                                            ; fully-qualified     # 🫸🏿 E15.0 rightwards pushing hand: dark skin tone
+
+# subgroup: hand-fingers-partial
+1F44C                                                  ; fully-qualified     # 👌 E0.6 OK hand
+1F44C 1F3FB                                            ; fully-qualified     # 👌🏻 E1.0 OK hand: light skin tone
+1F44C 1F3FC                                            ; fully-qualified     # 👌🏼 E1.0 OK hand: medium-light skin tone
+1F44C 1F3FD                                            ; fully-qualified     # 👌🏽 E1.0 OK hand: medium skin tone
+1F44C 1F3FE                                            ; fully-qualified     # 👌🏾 E1.0 OK hand: medium-dark skin tone
+1F44C 1F3FF                                            ; fully-qualified     # 👌🏿 E1.0 OK hand: dark skin tone
+1F90C                                                  ; fully-qualified     # 🤌 E13.0 pinched fingers
+1F90C 1F3FB                                            ; fully-qualified     # 🤌🏻 E13.0 pinched fingers: light skin tone
+1F90C 1F3FC                                            ; fully-qualified     # 🤌🏼 E13.0 pinched fingers: medium-light skin tone
+1F90C 1F3FD                                            ; fully-qualified     # 🤌🏽 E13.0 pinched fingers: medium skin tone
+1F90C 1F3FE                                            ; fully-qualified     # 🤌🏾 E13.0 pinched fingers: medium-dark skin tone
+1F90C 1F3FF                                            ; fully-qualified     # 🤌🏿 E13.0 pinched fingers: dark skin tone
+1F90F                                                  ; fully-qualified     # 🤏 E12.0 pinching hand
+1F90F 1F3FB                                            ; fully-qualified     # 🤏🏻 E12.0 pinching hand: light skin tone
+1F90F 1F3FC                                            ; fully-qualified     # 🤏🏼 E12.0 pinching hand: medium-light skin tone
+1F90F 1F3FD                                            ; fully-qualified     # 🤏🏽 E12.0 pinching hand: medium skin tone
+1F90F 1F3FE                                            ; fully-qualified     # 🤏🏾 E12.0 pinching hand: medium-dark skin tone
+1F90F 1F3FF                                            ; fully-qualified     # 🤏🏿 E12.0 pinching hand: dark skin tone
+270C FE0F                                              ; fully-qualified     # ✌️ E0.6 victory hand
+270C                                                   ; unqualified         # ✌ E0.6 victory hand
+270C 1F3FB                                             ; fully-qualified     # ✌🏻 E1.0 victory hand: light skin tone
+270C 1F3FC                                             ; fully-qualified     # ✌🏼 E1.0 victory hand: medium-light skin tone
+270C 1F3FD                                             ; fully-qualified     # ✌🏽 E1.0 victory hand: medium skin tone
+270C 1F3FE                                             ; fully-qualified     # ✌🏾 E1.0 victory hand: medium-dark skin tone
+270C 1F3FF                                             ; fully-qualified     # ✌🏿 E1.0 victory hand: dark skin tone
+1F91E                                                  ; fully-qualified     # 🤞 E3.0 crossed fingers
+1F91E 1F3FB                                            ; fully-qualified     # 🤞🏻 E3.0 crossed fingers: light skin tone
+1F91E 1F3FC                                            ; fully-qualified     # 🤞🏼 E3.0 crossed fingers: medium-light skin tone
+1F91E 1F3FD                                            ; fully-qualified     # 🤞🏽 E3.0 crossed fingers: medium skin tone
+1F91E 1F3FE                                            ; fully-qualified     # 🤞🏾 E3.0 crossed fingers: medium-dark skin tone
+1F91E 1F3FF                                            ; fully-qualified     # 🤞🏿 E3.0 crossed fingers: dark skin tone
+1FAF0                                                  ; fully-qualified     # 🫰 E14.0 hand with index finger and thumb crossed
+1FAF0 1F3FB                                            ; fully-qualified     # 🫰🏻 E14.0 hand with index finger and thumb crossed: light skin tone
+1FAF0 1F3FC                                            ; fully-qualified     # 🫰🏼 E14.0 hand with index finger and thumb crossed: medium-light skin tone
+1FAF0 1F3FD                                            ; fully-qualified     # 🫰🏽 E14.0 hand with index finger and thumb crossed: medium skin tone
+1FAF0 1F3FE                                            ; fully-qualified     # 🫰🏾 E14.0 hand with index finger and thumb crossed: medium-dark skin tone
+1FAF0 1F3FF                                            ; fully-qualified     # 🫰🏿 E14.0 hand with index finger and thumb crossed: dark skin tone
+1F91F                                                  ; fully-qualified     # 🤟 E5.0 love-you gesture
+1F91F 1F3FB                                            ; fully-qualified     # 🤟🏻 E5.0 love-you gesture: light skin tone
+1F91F 1F3FC                                            ; fully-qualified     # 🤟🏼 E5.0 love-you gesture: medium-light skin tone
+1F91F 1F3FD                                            ; fully-qualified     # 🤟🏽 E5.0 love-you gesture: medium skin tone
+1F91F 1F3FE                                            ; fully-qualified     # 🤟🏾 E5.0 love-you gesture: medium-dark skin tone
+1F91F 1F3FF                                            ; fully-qualified     # 🤟🏿 E5.0 love-you gesture: dark skin tone
+1F918                                                  ; fully-qualified     # 🤘 E1.0 sign of the horns
+1F918 1F3FB                                            ; fully-qualified     # 🤘🏻 E1.0 sign of the horns: light skin tone
+1F918 1F3FC                                            ; fully-qualified     # 🤘🏼 E1.0 sign of the horns: medium-light skin tone
+1F918 1F3FD                                            ; fully-qualified     # 🤘🏽 E1.0 sign of the horns: medium skin tone
+1F918 1F3FE                                            ; fully-qualified     # 🤘🏾 E1.0 sign of the horns: medium-dark skin tone
+1F918 1F3FF                                            ; fully-qualified     # 🤘🏿 E1.0 sign of the horns: dark skin tone
+1F919                                                  ; fully-qualified     # 🤙 E3.0 call me hand
+1F919 1F3FB                                            ; fully-qualified     # 🤙🏻 E3.0 call me hand: light skin tone
+1F919 1F3FC                                            ; fully-qualified     # 🤙🏼 E3.0 call me hand: medium-light skin tone
+1F919 1F3FD                                            ; fully-qualified     # 🤙🏽 E3.0 call me hand: medium skin tone
+1F919 1F3FE                                            ; fully-qualified     # 🤙🏾 E3.0 call me hand: medium-dark skin tone
+1F919 1F3FF                                            ; fully-qualified     # 🤙🏿 E3.0 call me hand: dark skin tone
+
+# subgroup: hand-single-finger
+1F448                                                  ; fully-qualified     # 👈 E0.6 backhand index pointing left
+1F448 1F3FB                                            ; fully-qualified     # 👈🏻 E1.0 backhand index pointing left: light skin tone
+1F448 1F3FC                                            ; fully-qualified     # 👈🏼 E1.0 backhand index pointing left: medium-light skin tone
+1F448 1F3FD                                            ; fully-qualified     # 👈🏽 E1.0 backhand index pointing left: medium skin tone
+1F448 1F3FE                                            ; fully-qualified     # 👈🏾 E1.0 backhand index pointing left: medium-dark skin tone
+1F448 1F3FF                                            ; fully-qualified     # 👈🏿 E1.0 backhand index pointing left: dark skin tone
+1F449                                                  ; fully-qualified     # 👉 E0.6 backhand index pointing right
+1F449 1F3FB                                            ; fully-qualified     # 👉🏻 E1.0 backhand index pointing right: light skin tone
+1F449 1F3FC                                            ; fully-qualified     # 👉🏼 E1.0 backhand index pointing right: medium-light skin tone
+1F449 1F3FD                                            ; fully-qualified     # 👉🏽 E1.0 backhand index pointing right: medium skin tone
+1F449 1F3FE                                            ; fully-qualified     # 👉🏾 E1.0 backhand index pointing right: medium-dark skin tone
+1F449 1F3FF                                            ; fully-qualified     # 👉🏿 E1.0 backhand index pointing right: dark skin tone
+1F446                                                  ; fully-qualified     # 👆 E0.6 backhand index pointing up
+1F446 1F3FB                                            ; fully-qualified     # 👆🏻 E1.0 backhand index pointing up: light skin tone
+1F446 1F3FC                                            ; fully-qualified     # 👆🏼 E1.0 backhand index pointing up: medium-light skin tone
+1F446 1F3FD                                            ; fully-qualified     # 👆🏽 E1.0 backhand index pointing up: medium skin tone
+1F446 1F3FE                                            ; fully-qualified     # 👆🏾 E1.0 backhand index pointing up: medium-dark skin tone
+1F446 1F3FF                                            ; fully-qualified     # 👆🏿 E1.0 backhand index pointing up: dark skin tone
+1F595                                                  ; fully-qualified     # 🖕 E1.0 middle finger
+1F595 1F3FB                                            ; fully-qualified     # 🖕🏻 E1.0 middle finger: light skin tone
+1F595 1F3FC                                            ; fully-qualified     # 🖕🏼 E1.0 middle finger: medium-light skin tone
+1F595 1F3FD                                            ; fully-qualified     # 🖕🏽 E1.0 middle finger: medium skin tone
+1F595 1F3FE                                            ; fully-qualified     # 🖕🏾 E1.0 middle finger: medium-dark skin tone
+1F595 1F3FF                                            ; fully-qualified     # 🖕🏿 E1.0 middle finger: dark skin tone
+1F447                                                  ; fully-qualified     # 👇 E0.6 backhand index pointing down
+1F447 1F3FB                                            ; fully-qualified     # 👇🏻 E1.0 backhand index pointing down: light skin tone
+1F447 1F3FC                                            ; fully-qualified     # 👇🏼 E1.0 backhand index pointing down: medium-light skin tone
+1F447 1F3FD                                            ; fully-qualified     # 👇🏽 E1.0 backhand index pointing down: medium skin tone
+1F447 1F3FE                                            ; fully-qualified     # 👇🏾 E1.0 backhand index pointing down: medium-dark skin tone
+1F447 1F3FF                                            ; fully-qualified     # 👇🏿 E1.0 backhand index pointing down: dark skin tone
+261D FE0F                                              ; fully-qualified     # ☝️ E0.6 index pointing up
+261D                                                   ; unqualified         # ☝ E0.6 index pointing up
+261D 1F3FB                                             ; fully-qualified     # ☝🏻 E1.0 index pointing up: light skin tone
+261D 1F3FC                                             ; fully-qualified     # ☝🏼 E1.0 index pointing up: medium-light skin tone
+261D 1F3FD                                             ; fully-qualified     # ☝🏽 E1.0 index pointing up: medium skin tone
+261D 1F3FE                                             ; fully-qualified     # ☝🏾 E1.0 index pointing up: medium-dark skin tone
+261D 1F3FF                                             ; fully-qualified     # ☝🏿 E1.0 index pointing up: dark skin tone
+1FAF5                                                  ; fully-qualified     # 🫵 E14.0 index pointing at the viewer
+1FAF5 1F3FB                                            ; fully-qualified     # 🫵🏻 E14.0 index pointing at the viewer: light skin tone
+1FAF5 1F3FC                                            ; fully-qualified     # 🫵🏼 E14.0 index pointing at the viewer: medium-light skin tone
+1FAF5 1F3FD                                            ; fully-qualified     # 🫵🏽 E14.0 index pointing at the viewer: medium skin tone
+1FAF5 1F3FE                                            ; fully-qualified     # 🫵🏾 E14.0 index pointing at the viewer: medium-dark skin tone
+1FAF5 1F3FF                                            ; fully-qualified     # 🫵🏿 E14.0 index pointing at the viewer: dark skin tone
+
+# subgroup: hand-fingers-closed
+1F44D                                                  ; fully-qualified     # 👍 E0.6 thumbs up
+1F44D 1F3FB                                            ; fully-qualified     # 👍🏻 E1.0 thumbs up: light skin tone
+1F44D 1F3FC                                            ; fully-qualified     # 👍🏼 E1.0 thumbs up: medium-light skin tone
+1F44D 1F3FD                                            ; fully-qualified     # 👍🏽 E1.0 thumbs up: medium skin tone
+1F44D 1F3FE                                            ; fully-qualified     # 👍🏾 E1.0 thumbs up: medium-dark skin tone
+1F44D 1F3FF                                            ; fully-qualified     # 👍🏿 E1.0 thumbs up: dark skin tone
+1F44E                                                  ; fully-qualified     # 👎 E0.6 thumbs down
+1F44E 1F3FB                                            ; fully-qualified     # 👎🏻 E1.0 thumbs down: light skin tone
+1F44E 1F3FC                                            ; fully-qualified     # 👎🏼 E1.0 thumbs down: medium-light skin tone
+1F44E 1F3FD                                            ; fully-qualified     # 👎🏽 E1.0 thumbs down: medium skin tone
+1F44E 1F3FE                                            ; fully-qualified     # 👎🏾 E1.0 thumbs down: medium-dark skin tone
+1F44E 1F3FF                                            ; fully-qualified     # 👎🏿 E1.0 thumbs down: dark skin tone
+270A                                                   ; fully-qualified     # ✊ E0.6 raised fist
+270A 1F3FB                                             ; fully-qualified     # ✊🏻 E1.0 raised fist: light skin tone
+270A 1F3FC                                             ; fully-qualified     # ✊🏼 E1.0 raised fist: medium-light skin tone
+270A 1F3FD                                             ; fully-qualified     # ✊🏽 E1.0 raised fist: medium skin tone
+270A 1F3FE                                             ; fully-qualified     # ✊🏾 E1.0 raised fist: medium-dark skin tone
+270A 1F3FF                                             ; fully-qualified     # ✊🏿 E1.0 raised fist: dark skin tone
+1F44A                                                  ; fully-qualified     # 👊 E0.6 oncoming fist
+1F44A 1F3FB                                            ; fully-qualified     # 👊🏻 E1.0 oncoming fist: light skin tone
+1F44A 1F3FC                                            ; fully-qualified     # 👊🏼 E1.0 oncoming fist: medium-light skin tone
+1F44A 1F3FD                                            ; fully-qualified     # 👊🏽 E1.0 oncoming fist: medium skin tone
+1F44A 1F3FE                                            ; fully-qualified     # 👊🏾 E1.0 oncoming fist: medium-dark skin tone
+1F44A 1F3FF                                            ; fully-qualified     # 👊🏿 E1.0 oncoming fist: dark skin tone
+1F91B                                                  ; fully-qualified     # 🤛 E3.0 left-facing fist
+1F91B 1F3FB                                            ; fully-qualified     # 🤛🏻 E3.0 left-facing fist: light skin tone
+1F91B 1F3FC                                            ; fully-qualified     # 🤛🏼 E3.0 left-facing fist: medium-light skin tone
+1F91B 1F3FD                                            ; fully-qualified     # 🤛🏽 E3.0 left-facing fist: medium skin tone
+1F91B 1F3FE                                            ; fully-qualified     # 🤛🏾 E3.0 left-facing fist: medium-dark skin tone
+1F91B 1F3FF                                            ; fully-qualified     # 🤛🏿 E3.0 left-facing fist: dark skin tone
+1F91C                                                  ; fully-qualified     # 🤜 E3.0 right-facing fist
+1F91C 1F3FB                                            ; fully-qualified     # 🤜🏻 E3.0 right-facing fist: light skin tone
+1F91C 1F3FC                                            ; fully-qualified     # 🤜🏼 E3.0 right-facing fist: medium-light skin tone
+1F91C 1F3FD                                            ; fully-qualified     # 🤜🏽 E3.0 right-facing fist: medium skin tone
+1F91C 1F3FE                                            ; fully-qualified     # 🤜🏾 E3.0 right-facing fist: medium-dark skin tone
+1F91C 1F3FF                                            ; fully-qualified     # 🤜🏿 E3.0 right-facing fist: dark skin tone
+
+# subgroup: hands
+1F44F                                                  ; fully-qualified     # 👏 E0.6 clapping hands
+1F44F 1F3FB                                            ; fully-qualified     # 👏🏻 E1.0 clapping hands: light skin tone
+1F44F 1F3FC                                            ; fully-qualified     # 👏🏼 E1.0 clapping hands: medium-light skin tone
+1F44F 1F3FD                                            ; fully-qualified     # 👏🏽 E1.0 clapping hands: medium skin tone
+1F44F 1F3FE                                            ; fully-qualified     # 👏🏾 E1.0 clapping hands: medium-dark skin tone
+1F44F 1F3FF                                            ; fully-qualified     # 👏🏿 E1.0 clapping hands: dark skin tone
+1F64C                                                  ; fully-qualified     # 🙌 E0.6 raising hands
+1F64C 1F3FB                                            ; fully-qualified     # 🙌🏻 E1.0 raising hands: light skin tone
+1F64C 1F3FC                                            ; fully-qualified     # 🙌🏼 E1.0 raising hands: medium-light skin tone
+1F64C 1F3FD                                            ; fully-qualified     # 🙌🏽 E1.0 raising hands: medium skin tone
+1F64C 1F3FE                                            ; fully-qualified     # 🙌🏾 E1.0 raising hands: medium-dark skin tone
+1F64C 1F3FF                                            ; fully-qualified     # 🙌🏿 E1.0 raising hands: dark skin tone
+1FAF6                                                  ; fully-qualified     # 🫶 E14.0 heart hands
+1FAF6 1F3FB                                            ; fully-qualified     # 🫶🏻 E14.0 heart hands: light skin tone
+1FAF6 1F3FC                                            ; fully-qualified     # 🫶🏼 E14.0 heart hands: medium-light skin tone
+1FAF6 1F3FD                                            ; fully-qualified     # 🫶🏽 E14.0 heart hands: medium skin tone
+1FAF6 1F3FE                                            ; fully-qualified     # 🫶🏾 E14.0 heart hands: medium-dark skin tone
+1FAF6 1F3FF                                            ; fully-qualified     # 🫶🏿 E14.0 heart hands: dark skin tone
+1F450                                                  ; fully-qualified     # 👐 E0.6 open hands
+1F450 1F3FB                                            ; fully-qualified     # 👐🏻 E1.0 open hands: light skin tone
+1F450 1F3FC                                            ; fully-qualified     # 👐🏼 E1.0 open hands: medium-light skin tone
+1F450 1F3FD                                            ; fully-qualified     # 👐🏽 E1.0 open hands: medium skin tone
+1F450 1F3FE                                            ; fully-qualified     # 👐🏾 E1.0 open hands: medium-dark skin tone
+1F450 1F3FF                                            ; fully-qualified     # 👐🏿 E1.0 open hands: dark skin tone
+1F932                                                  ; fully-qualified     # 🤲 E5.0 palms up together
+1F932 1F3FB                                            ; fully-qualified     # 🤲🏻 E5.0 palms up together: light skin tone
+1F932 1F3FC                                            ; fully-qualified     # 🤲🏼 E5.0 palms up together: medium-light skin tone
+1F932 1F3FD                                            ; fully-qualified     # 🤲🏽 E5.0 palms up together: medium skin tone
+1F932 1F3FE                                            ; fully-qualified     # 🤲🏾 E5.0 palms up together: medium-dark skin tone
+1F932 1F3FF                                            ; fully-qualified     # 🤲🏿 E5.0 palms up together: dark skin tone
+1F91D                                                  ; fully-qualified     # 🤝 E3.0 handshake
+1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E14.0 handshake: light skin tone
+1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E14.0 handshake: medium-light skin tone
+1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E14.0 handshake: medium skin tone
+1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E14.0 handshake: medium-dark skin tone
+1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E14.0 handshake: dark skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏻‍🫲🏼 E14.0 handshake: light skin tone, medium-light skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏻‍🫲🏽 E14.0 handshake: light skin tone, medium skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏻‍🫲🏾 E14.0 handshake: light skin tone, medium-dark skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏻‍🫲🏿 E14.0 handshake: light skin tone, dark skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏼‍🫲🏻 E14.0 handshake: medium-light skin tone, light skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏼‍🫲🏽 E14.0 handshake: medium-light skin tone, medium skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏼‍🫲🏾 E14.0 handshake: medium-light skin tone, medium-dark skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏼‍🫲🏿 E14.0 handshake: medium-light skin tone, dark skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏽‍🫲🏻 E14.0 handshake: medium skin tone, light skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏽‍🫲🏼 E14.0 handshake: medium skin tone, medium-light skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏽‍🫲🏾 E14.0 handshake: medium skin tone, medium-dark skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏽‍🫲🏿 E14.0 handshake: medium skin tone, dark skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏾‍🫲🏻 E14.0 handshake: medium-dark skin tone, light skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏾‍🫲🏼 E14.0 handshake: medium-dark skin tone, medium-light skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏾‍🫲🏽 E14.0 handshake: medium-dark skin tone, medium skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏾‍🫲🏿 E14.0 handshake: medium-dark skin tone, dark skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏿‍🫲🏻 E14.0 handshake: dark skin tone, light skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏿‍🫲🏼 E14.0 handshake: dark skin tone, medium-light skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏿‍🫲🏽 E14.0 handshake: dark skin tone, medium skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏿‍🫲🏾 E14.0 handshake: dark skin tone, medium-dark skin tone
+1F64F                                                  ; fully-qualified     # 🙏 E0.6 folded hands
+1F64F 1F3FB                                            ; fully-qualified     # 🙏🏻 E1.0 folded hands: light skin tone
+1F64F 1F3FC                                            ; fully-qualified     # 🙏🏼 E1.0 folded hands: medium-light skin tone
+1F64F 1F3FD                                            ; fully-qualified     # 🙏🏽 E1.0 folded hands: medium skin tone
+1F64F 1F3FE                                            ; fully-qualified     # 🙏🏾 E1.0 folded hands: medium-dark skin tone
+1F64F 1F3FF                                            ; fully-qualified     # 🙏🏿 E1.0 folded hands: dark skin tone
+
+# subgroup: hand-prop
+270D FE0F                                              ; fully-qualified     # ✍️ E0.7 writing hand
+270D                                                   ; unqualified         # ✍ E0.7 writing hand
+270D 1F3FB                                             ; fully-qualified     # ✍🏻 E1.0 writing hand: light skin tone
+270D 1F3FC                                             ; fully-qualified     # ✍🏼 E1.0 writing hand: medium-light skin tone
+270D 1F3FD                                             ; fully-qualified     # ✍🏽 E1.0 writing hand: medium skin tone
+270D 1F3FE                                             ; fully-qualified     # ✍🏾 E1.0 writing hand: medium-dark skin tone
+270D 1F3FF                                             ; fully-qualified     # ✍🏿 E1.0 writing hand: dark skin tone
+1F485                                                  ; fully-qualified     # 💅 E0.6 nail polish
+1F485 1F3FB                                            ; fully-qualified     # 💅🏻 E1.0 nail polish: light skin tone
+1F485 1F3FC                                            ; fully-qualified     # 💅🏼 E1.0 nail polish: medium-light skin tone
+1F485 1F3FD                                            ; fully-qualified     # 💅🏽 E1.0 nail polish: medium skin tone
+1F485 1F3FE                                            ; fully-qualified     # 💅🏾 E1.0 nail polish: medium-dark skin tone
+1F485 1F3FF                                            ; fully-qualified     # 💅🏿 E1.0 nail polish: dark skin tone
+1F933                                                  ; fully-qualified     # 🤳 E3.0 selfie
+1F933 1F3FB                                            ; fully-qualified     # 🤳🏻 E3.0 selfie: light skin tone
+1F933 1F3FC                                            ; fully-qualified     # 🤳🏼 E3.0 selfie: medium-light skin tone
+1F933 1F3FD                                            ; fully-qualified     # 🤳🏽 E3.0 selfie: medium skin tone
+1F933 1F3FE                                            ; fully-qualified     # 🤳🏾 E3.0 selfie: medium-dark skin tone
+1F933 1F3FF                                            ; fully-qualified     # 🤳🏿 E3.0 selfie: dark skin tone
+
+# subgroup: body-parts
+1F4AA                                                  ; fully-qualified     # 💪 E0.6 flexed biceps
+1F4AA 1F3FB                                            ; fully-qualified     # 💪🏻 E1.0 flexed biceps: light skin tone
+1F4AA 1F3FC                                            ; fully-qualified     # 💪🏼 E1.0 flexed biceps: medium-light skin tone
+1F4AA 1F3FD                                            ; fully-qualified     # 💪🏽 E1.0 flexed biceps: medium skin tone
+1F4AA 1F3FE                                            ; fully-qualified     # 💪🏾 E1.0 flexed biceps: medium-dark skin tone
+1F4AA 1F3FF                                            ; fully-qualified     # 💪🏿 E1.0 flexed biceps: dark skin tone
+1F9BE                                                  ; fully-qualified     # 🦾 E12.0 mechanical arm
+1F9BF                                                  ; fully-qualified     # 🦿 E12.0 mechanical leg
+1F9B5                                                  ; fully-qualified     # 🦵 E11.0 leg
+1F9B5 1F3FB                                            ; fully-qualified     # 🦵🏻 E11.0 leg: light skin tone
+1F9B5 1F3FC                                            ; fully-qualified     # 🦵🏼 E11.0 leg: medium-light skin tone
+1F9B5 1F3FD                                            ; fully-qualified     # 🦵🏽 E11.0 leg: medium skin tone
+1F9B5 1F3FE                                            ; fully-qualified     # 🦵🏾 E11.0 leg: medium-dark skin tone
+1F9B5 1F3FF                                            ; fully-qualified     # 🦵🏿 E11.0 leg: dark skin tone
+1F9B6                                                  ; fully-qualified     # 🦶 E11.0 foot
+1F9B6 1F3FB                                            ; fully-qualified     # 🦶🏻 E11.0 foot: light skin tone
+1F9B6 1F3FC                                            ; fully-qualified     # 🦶🏼 E11.0 foot: medium-light skin tone
+1F9B6 1F3FD                                            ; fully-qualified     # 🦶🏽 E11.0 foot: medium skin tone
+1F9B6 1F3FE                                            ; fully-qualified     # 🦶🏾 E11.0 foot: medium-dark skin tone
+1F9B6 1F3FF                                            ; fully-qualified     # 🦶🏿 E11.0 foot: dark skin tone
+1F442                                                  ; fully-qualified     # 👂 E0.6 ear
+1F442 1F3FB                                            ; fully-qualified     # 👂🏻 E1.0 ear: light skin tone
+1F442 1F3FC                                            ; fully-qualified     # 👂🏼 E1.0 ear: medium-light skin tone
+1F442 1F3FD                                            ; fully-qualified     # 👂🏽 E1.0 ear: medium skin tone
+1F442 1F3FE                                            ; fully-qualified     # 👂🏾 E1.0 ear: medium-dark skin tone
+1F442 1F3FF                                            ; fully-qualified     # 👂🏿 E1.0 ear: dark skin tone
+1F9BB                                                  ; fully-qualified     # 🦻 E12.0 ear with hearing aid
+1F9BB 1F3FB                                            ; fully-qualified     # 🦻🏻 E12.0 ear with hearing aid: light skin tone
+1F9BB 1F3FC                                            ; fully-qualified     # 🦻🏼 E12.0 ear with hearing aid: medium-light skin tone
+1F9BB 1F3FD                                            ; fully-qualified     # 🦻🏽 E12.0 ear with hearing aid: medium skin tone
+1F9BB 1F3FE                                            ; fully-qualified     # 🦻🏾 E12.0 ear with hearing aid: medium-dark skin tone
+1F9BB 1F3FF                                            ; fully-qualified     # 🦻🏿 E12.0 ear with hearing aid: dark skin tone
+1F443                                                  ; fully-qualified     # 👃 E0.6 nose
+1F443 1F3FB                                            ; fully-qualified     # 👃🏻 E1.0 nose: light skin tone
+1F443 1F3FC                                            ; fully-qualified     # 👃🏼 E1.0 nose: medium-light skin tone
+1F443 1F3FD                                            ; fully-qualified     # 👃🏽 E1.0 nose: medium skin tone
+1F443 1F3FE                                            ; fully-qualified     # 👃🏾 E1.0 nose: medium-dark skin tone
+1F443 1F3FF                                            ; fully-qualified     # 👃🏿 E1.0 nose: dark skin tone
+1F9E0                                                  ; fully-qualified     # 🧠 E5.0 brain
+1FAC0                                                  ; fully-qualified     # 🫀 E13.0 anatomical heart
+1FAC1                                                  ; fully-qualified     # 🫁 E13.0 lungs
+1F9B7                                                  ; fully-qualified     # 🦷 E11.0 tooth
+1F9B4                                                  ; fully-qualified     # 🦴 E11.0 bone
+1F440                                                  ; fully-qualified     # 👀 E0.6 eyes
+1F441 FE0F                                             ; fully-qualified     # 👁️ E0.7 eye
+1F441                                                  ; unqualified         # 👁 E0.7 eye
+1F445                                                  ; fully-qualified     # 👅 E0.6 tongue
+1F444                                                  ; fully-qualified     # 👄 E0.6 mouth
+1FAE6                                                  ; fully-qualified     # 🫦 E14.0 biting lip
+
+# subgroup: person
+1F476                                                  ; fully-qualified     # 👶 E0.6 baby
+1F476 1F3FB                                            ; fully-qualified     # 👶🏻 E1.0 baby: light skin tone
+1F476 1F3FC                                            ; fully-qualified     # 👶🏼 E1.0 baby: medium-light skin tone
+1F476 1F3FD                                            ; fully-qualified     # 👶🏽 E1.0 baby: medium skin tone
+1F476 1F3FE                                            ; fully-qualified     # 👶🏾 E1.0 baby: medium-dark skin tone
+1F476 1F3FF                                            ; fully-qualified     # 👶🏿 E1.0 baby: dark skin tone
+1F9D2                                                  ; fully-qualified     # 🧒 E5.0 child
+1F9D2 1F3FB                                            ; fully-qualified     # 🧒🏻 E5.0 child: light skin tone
+1F9D2 1F3FC                                            ; fully-qualified     # 🧒🏼 E5.0 child: medium-light skin tone
+1F9D2 1F3FD                                            ; fully-qualified     # 🧒🏽 E5.0 child: medium skin tone
+1F9D2 1F3FE                                            ; fully-qualified     # 🧒🏾 E5.0 child: medium-dark skin tone
+1F9D2 1F3FF                                            ; fully-qualified     # 🧒🏿 E5.0 child: dark skin tone
+1F466                                                  ; fully-qualified     # 👦 E0.6 boy
+1F466 1F3FB                                            ; fully-qualified     # 👦🏻 E1.0 boy: light skin tone
+1F466 1F3FC                                            ; fully-qualified     # 👦🏼 E1.0 boy: medium-light skin tone
+1F466 1F3FD                                            ; fully-qualified     # 👦🏽 E1.0 boy: medium skin tone
+1F466 1F3FE                                            ; fully-qualified     # 👦🏾 E1.0 boy: medium-dark skin tone
+1F466 1F3FF                                            ; fully-qualified     # 👦🏿 E1.0 boy: dark skin tone
+1F467                                                  ; fully-qualified     # 👧 E0.6 girl
+1F467 1F3FB                                            ; fully-qualified     # 👧🏻 E1.0 girl: light skin tone
+1F467 1F3FC                                            ; fully-qualified     # 👧🏼 E1.0 girl: medium-light skin tone
+1F467 1F3FD                                            ; fully-qualified     # 👧🏽 E1.0 girl: medium skin tone
+1F467 1F3FE                                            ; fully-qualified     # 👧🏾 E1.0 girl: medium-dark skin tone
+1F467 1F3FF                                            ; fully-qualified     # 👧🏿 E1.0 girl: dark skin tone
+1F9D1                                                  ; fully-qualified     # 🧑 E5.0 person
+1F9D1 1F3FB                                            ; fully-qualified     # 🧑🏻 E5.0 person: light skin tone
+1F9D1 1F3FC                                            ; fully-qualified     # 🧑🏼 E5.0 person: medium-light skin tone
+1F9D1 1F3FD                                            ; fully-qualified     # 🧑🏽 E5.0 person: medium skin tone
+1F9D1 1F3FE                                            ; fully-qualified     # 🧑🏾 E5.0 person: medium-dark skin tone
+1F9D1 1F3FF                                            ; fully-qualified     # 🧑🏿 E5.0 person: dark skin tone
+1F471                                                  ; fully-qualified     # 👱 E0.6 person: blond hair
+1F471 1F3FB                                            ; fully-qualified     # 👱🏻 E1.0 person: light skin tone, blond hair
+1F471 1F3FC                                            ; fully-qualified     # 👱🏼 E1.0 person: medium-light skin tone, blond hair
+1F471 1F3FD                                            ; fully-qualified     # 👱🏽 E1.0 person: medium skin tone, blond hair
+1F471 1F3FE                                            ; fully-qualified     # 👱🏾 E1.0 person: medium-dark skin tone, blond hair
+1F471 1F3FF                                            ; fully-qualified     # 👱🏿 E1.0 person: dark skin tone, blond hair
+1F468                                                  ; fully-qualified     # 👨 E0.6 man
+1F468 1F3FB                                            ; fully-qualified     # 👨🏻 E1.0 man: light skin tone
+1F468 1F3FC                                            ; fully-qualified     # 👨🏼 E1.0 man: medium-light skin tone
+1F468 1F3FD                                            ; fully-qualified     # 👨🏽 E1.0 man: medium skin tone
+1F468 1F3FE                                            ; fully-qualified     # 👨🏾 E1.0 man: medium-dark skin tone
+1F468 1F3FF                                            ; fully-qualified     # 👨🏿 E1.0 man: dark skin tone
+1F9D4                                                  ; fully-qualified     # 🧔 E5.0 person: beard
+1F9D4 1F3FB                                            ; fully-qualified     # 🧔🏻 E5.0 person: light skin tone, beard
+1F9D4 1F3FC                                            ; fully-qualified     # 🧔🏼 E5.0 person: medium-light skin tone, beard
+1F9D4 1F3FD                                            ; fully-qualified     # 🧔🏽 E5.0 person: medium skin tone, beard
+1F9D4 1F3FE                                            ; fully-qualified     # 🧔🏾 E5.0 person: medium-dark skin tone, beard
+1F9D4 1F3FF                                            ; fully-qualified     # 🧔🏿 E5.0 person: dark skin tone, beard
+1F9D4 200D 2642 FE0F                                   ; fully-qualified     # 🧔‍♂️ E13.1 man: beard
+1F9D4 200D 2642                                        ; minimally-qualified # 🧔‍♂ E13.1 man: beard
+1F9D4 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧔🏻‍♂️ E13.1 man: light skin tone, beard
+1F9D4 1F3FB 200D 2642                                  ; minimally-qualified # 🧔🏻‍♂ E13.1 man: light skin tone, beard
+1F9D4 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧔🏼‍♂️ E13.1 man: medium-light skin tone, beard
+1F9D4 1F3FC 200D 2642                                  ; minimally-qualified # 🧔🏼‍♂ E13.1 man: medium-light skin tone, beard
+1F9D4 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧔🏽‍♂️ E13.1 man: medium skin tone, beard
+1F9D4 1F3FD 200D 2642                                  ; minimally-qualified # 🧔🏽‍♂ E13.1 man: medium skin tone, beard
+1F9D4 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧔🏾‍♂️ E13.1 man: medium-dark skin tone, beard
+1F9D4 1F3FE 200D 2642                                  ; minimally-qualified # 🧔🏾‍♂ E13.1 man: medium-dark skin tone, beard
+1F9D4 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧔🏿‍♂️ E13.1 man: dark skin tone, beard
+1F9D4 1F3FF 200D 2642                                  ; minimally-qualified # 🧔🏿‍♂ E13.1 man: dark skin tone, beard
+1F9D4 200D 2640 FE0F                                   ; fully-qualified     # 🧔‍♀️ E13.1 woman: beard
+1F9D4 200D 2640                                        ; minimally-qualified # 🧔‍♀ E13.1 woman: beard
+1F9D4 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧔🏻‍♀️ E13.1 woman: light skin tone, beard
+1F9D4 1F3FB 200D 2640                                  ; minimally-qualified # 🧔🏻‍♀ E13.1 woman: light skin tone, beard
+1F9D4 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧔🏼‍♀️ E13.1 woman: medium-light skin tone, beard
+1F9D4 1F3FC 200D 2640                                  ; minimally-qualified # 🧔🏼‍♀ E13.1 woman: medium-light skin tone, beard
+1F9D4 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧔🏽‍♀️ E13.1 woman: medium skin tone, beard
+1F9D4 1F3FD 200D 2640                                  ; minimally-qualified # 🧔🏽‍♀ E13.1 woman: medium skin tone, beard
+1F9D4 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧔🏾‍♀️ E13.1 woman: medium-dark skin tone, beard
+1F9D4 1F3FE 200D 2640                                  ; minimally-qualified # 🧔🏾‍♀ E13.1 woman: medium-dark skin tone, beard
+1F9D4 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧔🏿‍♀️ E13.1 woman: dark skin tone, beard
+1F9D4 1F3FF 200D 2640                                  ; minimally-qualified # 🧔🏿‍♀ E13.1 woman: dark skin tone, beard
+1F468 200D 1F9B0                                       ; fully-qualified     # 👨‍🦰 E11.0 man: red hair
+1F468 1F3FB 200D 1F9B0                                 ; fully-qualified     # 👨🏻‍🦰 E11.0 man: light skin tone, red hair
+1F468 1F3FC 200D 1F9B0                                 ; fully-qualified     # 👨🏼‍🦰 E11.0 man: medium-light skin tone, red hair
+1F468 1F3FD 200D 1F9B0                                 ; fully-qualified     # 👨🏽‍🦰 E11.0 man: medium skin tone, red hair
+1F468 1F3FE 200D 1F9B0                                 ; fully-qualified     # 👨🏾‍🦰 E11.0 man: medium-dark skin tone, red hair
+1F468 1F3FF 200D 1F9B0                                 ; fully-qualified     # 👨🏿‍🦰 E11.0 man: dark skin tone, red hair
+1F468 200D 1F9B1                                       ; fully-qualified     # 👨‍🦱 E11.0 man: curly hair
+1F468 1F3FB 200D 1F9B1                                 ; fully-qualified     # 👨🏻‍🦱 E11.0 man: light skin tone, curly hair
+1F468 1F3FC 200D 1F9B1                                 ; fully-qualified     # 👨🏼‍🦱 E11.0 man: medium-light skin tone, curly hair
+1F468 1F3FD 200D 1F9B1                                 ; fully-qualified     # 👨🏽‍🦱 E11.0 man: medium skin tone, curly hair
+1F468 1F3FE 200D 1F9B1                                 ; fully-qualified     # 👨🏾‍🦱 E11.0 man: medium-dark skin tone, curly hair
+1F468 1F3FF 200D 1F9B1                                 ; fully-qualified     # 👨🏿‍🦱 E11.0 man: dark skin tone, curly hair
+1F468 200D 1F9B3                                       ; fully-qualified     # 👨‍🦳 E11.0 man: white hair
+1F468 1F3FB 200D 1F9B3                                 ; fully-qualified     # 👨🏻‍🦳 E11.0 man: light skin tone, white hair
+1F468 1F3FC 200D 1F9B3                                 ; fully-qualified     # 👨🏼‍🦳 E11.0 man: medium-light skin tone, white hair
+1F468 1F3FD 200D 1F9B3                                 ; fully-qualified     # 👨🏽‍🦳 E11.0 man: medium skin tone, white hair
+1F468 1F3FE 200D 1F9B3                                 ; fully-qualified     # 👨🏾‍🦳 E11.0 man: medium-dark skin tone, white hair
+1F468 1F3FF 200D 1F9B3                                 ; fully-qualified     # 👨🏿‍🦳 E11.0 man: dark skin tone, white hair
+1F468 200D 1F9B2                                       ; fully-qualified     # 👨‍🦲 E11.0 man: bald
+1F468 1F3FB 200D 1F9B2                                 ; fully-qualified     # 👨🏻‍🦲 E11.0 man: light skin tone, bald
+1F468 1F3FC 200D 1F9B2                                 ; fully-qualified     # 👨🏼‍🦲 E11.0 man: medium-light skin tone, bald
+1F468 1F3FD 200D 1F9B2                                 ; fully-qualified     # 👨🏽‍🦲 E11.0 man: medium skin tone, bald
+1F468 1F3FE 200D 1F9B2                                 ; fully-qualified     # 👨🏾‍🦲 E11.0 man: medium-dark skin tone, bald
+1F468 1F3FF 200D 1F9B2                                 ; fully-qualified     # 👨🏿‍🦲 E11.0 man: dark skin tone, bald
+1F469                                                  ; fully-qualified     # 👩 E0.6 woman
+1F469 1F3FB                                            ; fully-qualified     # 👩🏻 E1.0 woman: light skin tone
+1F469 1F3FC                                            ; fully-qualified     # 👩🏼 E1.0 woman: medium-light skin tone
+1F469 1F3FD                                            ; fully-qualified     # 👩🏽 E1.0 woman: medium skin tone
+1F469 1F3FE                                            ; fully-qualified     # 👩🏾 E1.0 woman: medium-dark skin tone
+1F469 1F3FF                                            ; fully-qualified     # 👩🏿 E1.0 woman: dark skin tone
+1F469 200D 1F9B0                                       ; fully-qualified     # 👩‍🦰 E11.0 woman: red hair
+1F469 1F3FB 200D 1F9B0                                 ; fully-qualified     # 👩🏻‍🦰 E11.0 woman: light skin tone, red hair
+1F469 1F3FC 200D 1F9B0                                 ; fully-qualified     # 👩🏼‍🦰 E11.0 woman: medium-light skin tone, red hair
+1F469 1F3FD 200D 1F9B0                                 ; fully-qualified     # 👩🏽‍🦰 E11.0 woman: medium skin tone, red hair
+1F469 1F3FE 200D 1F9B0                                 ; fully-qualified     # 👩🏾‍🦰 E11.0 woman: medium-dark skin tone, red hair
+1F469 1F3FF 200D 1F9B0                                 ; fully-qualified     # 👩🏿‍🦰 E11.0 woman: dark skin tone, red hair
+1F9D1 200D 1F9B0                                       ; fully-qualified     # 🧑‍🦰 E12.1 person: red hair
+1F9D1 1F3FB 200D 1F9B0                                 ; fully-qualified     # 🧑🏻‍🦰 E12.1 person: light skin tone, red hair
+1F9D1 1F3FC 200D 1F9B0                                 ; fully-qualified     # 🧑🏼‍🦰 E12.1 person: medium-light skin tone, red hair
+1F9D1 1F3FD 200D 1F9B0                                 ; fully-qualified     # 🧑🏽‍🦰 E12.1 person: medium skin tone, red hair
+1F9D1 1F3FE 200D 1F9B0                                 ; fully-qualified     # 🧑🏾‍🦰 E12.1 person: medium-dark skin tone, red hair
+1F9D1 1F3FF 200D 1F9B0                                 ; fully-qualified     # 🧑🏿‍🦰 E12.1 person: dark skin tone, red hair
+1F469 200D 1F9B1                                       ; fully-qualified     # 👩‍🦱 E11.0 woman: curly hair
+1F469 1F3FB 200D 1F9B1                                 ; fully-qualified     # 👩🏻‍🦱 E11.0 woman: light skin tone, curly hair
+1F469 1F3FC 200D 1F9B1                                 ; fully-qualified     # 👩🏼‍🦱 E11.0 woman: medium-light skin tone, curly hair
+1F469 1F3FD 200D 1F9B1                                 ; fully-qualified     # 👩🏽‍🦱 E11.0 woman: medium skin tone, curly hair
+1F469 1F3FE 200D 1F9B1                                 ; fully-qualified     # 👩🏾‍🦱 E11.0 woman: medium-dark skin tone, curly hair
+1F469 1F3FF 200D 1F9B1                                 ; fully-qualified     # 👩🏿‍🦱 E11.0 woman: dark skin tone, curly hair
+1F9D1 200D 1F9B1                                       ; fully-qualified     # 🧑‍🦱 E12.1 person: curly hair
+1F9D1 1F3FB 200D 1F9B1                                 ; fully-qualified     # 🧑🏻‍🦱 E12.1 person: light skin tone, curly hair
+1F9D1 1F3FC 200D 1F9B1                                 ; fully-qualified     # 🧑🏼‍🦱 E12.1 person: medium-light skin tone, curly hair
+1F9D1 1F3FD 200D 1F9B1                                 ; fully-qualified     # 🧑🏽‍🦱 E12.1 person: medium skin tone, curly hair
+1F9D1 1F3FE 200D 1F9B1                                 ; fully-qualified     # 🧑🏾‍🦱 E12.1 person: medium-dark skin tone, curly hair
+1F9D1 1F3FF 200D 1F9B1                                 ; fully-qualified     # 🧑🏿‍🦱 E12.1 person: dark skin tone, curly hair
+1F469 200D 1F9B3                                       ; fully-qualified     # 👩‍🦳 E11.0 woman: white hair
+1F469 1F3FB 200D 1F9B3                                 ; fully-qualified     # 👩🏻‍🦳 E11.0 woman: light skin tone, white hair
+1F469 1F3FC 200D 1F9B3                                 ; fully-qualified     # 👩🏼‍🦳 E11.0 woman: medium-light skin tone, white hair
+1F469 1F3FD 200D 1F9B3                                 ; fully-qualified     # 👩🏽‍🦳 E11.0 woman: medium skin tone, white hair
+1F469 1F3FE 200D 1F9B3                                 ; fully-qualified     # 👩🏾‍🦳 E11.0 woman: medium-dark skin tone, white hair
+1F469 1F3FF 200D 1F9B3                                 ; fully-qualified     # 👩🏿‍🦳 E11.0 woman: dark skin tone, white hair
+1F9D1 200D 1F9B3                                       ; fully-qualified     # 🧑‍🦳 E12.1 person: white hair
+1F9D1 1F3FB 200D 1F9B3                                 ; fully-qualified     # 🧑🏻‍🦳 E12.1 person: light skin tone, white hair
+1F9D1 1F3FC 200D 1F9B3                                 ; fully-qualified     # 🧑🏼‍🦳 E12.1 person: medium-light skin tone, white hair
+1F9D1 1F3FD 200D 1F9B3                                 ; fully-qualified     # 🧑🏽‍🦳 E12.1 person: medium skin tone, white hair
+1F9D1 1F3FE 200D 1F9B3                                 ; fully-qualified     # 🧑🏾‍🦳 E12.1 person: medium-dark skin tone, white hair
+1F9D1 1F3FF 200D 1F9B3                                 ; fully-qualified     # 🧑🏿‍🦳 E12.1 person: dark skin tone, white hair
+1F469 200D 1F9B2                                       ; fully-qualified     # 👩‍🦲 E11.0 woman: bald
+1F469 1F3FB 200D 1F9B2                                 ; fully-qualified     # 👩🏻‍🦲 E11.0 woman: light skin tone, bald
+1F469 1F3FC 200D 1F9B2                                 ; fully-qualified     # 👩🏼‍🦲 E11.0 woman: medium-light skin tone, bald
+1F469 1F3FD 200D 1F9B2                                 ; fully-qualified     # 👩🏽‍🦲 E11.0 woman: medium skin tone, bald
+1F469 1F3FE 200D 1F9B2                                 ; fully-qualified     # 👩🏾‍🦲 E11.0 woman: medium-dark skin tone, bald
+1F469 1F3FF 200D 1F9B2                                 ; fully-qualified     # 👩🏿‍🦲 E11.0 woman: dark skin tone, bald
+1F9D1 200D 1F9B2                                       ; fully-qualified     # 🧑‍🦲 E12.1 person: bald
+1F9D1 1F3FB 200D 1F9B2                                 ; fully-qualified     # 🧑🏻‍🦲 E12.1 person: light skin tone, bald
+1F9D1 1F3FC 200D 1F9B2                                 ; fully-qualified     # 🧑🏼‍🦲 E12.1 person: medium-light skin tone, bald
+1F9D1 1F3FD 200D 1F9B2                                 ; fully-qualified     # 🧑🏽‍🦲 E12.1 person: medium skin tone, bald
+1F9D1 1F3FE 200D 1F9B2                                 ; fully-qualified     # 🧑🏾‍🦲 E12.1 person: medium-dark skin tone, bald
+1F9D1 1F3FF 200D 1F9B2                                 ; fully-qualified     # 🧑🏿‍🦲 E12.1 person: dark skin tone, bald
+1F471 200D 2640 FE0F                                   ; fully-qualified     # 👱‍♀️ E4.0 woman: blond hair
+1F471 200D 2640                                        ; minimally-qualified # 👱‍♀ E4.0 woman: blond hair
+1F471 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 👱🏻‍♀️ E4.0 woman: light skin tone, blond hair
+1F471 1F3FB 200D 2640                                  ; minimally-qualified # 👱🏻‍♀ E4.0 woman: light skin tone, blond hair
+1F471 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 👱🏼‍♀️ E4.0 woman: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2640                                  ; minimally-qualified # 👱🏼‍♀ E4.0 woman: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 👱🏽‍♀️ E4.0 woman: medium skin tone, blond hair
+1F471 1F3FD 200D 2640                                  ; minimally-qualified # 👱🏽‍♀ E4.0 woman: medium skin tone, blond hair
+1F471 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 👱🏾‍♀️ E4.0 woman: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2640                                  ; minimally-qualified # 👱🏾‍♀ E4.0 woman: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👱🏿‍♀️ E4.0 woman: dark skin tone, blond hair
+1F471 1F3FF 200D 2640                                  ; minimally-qualified # 👱🏿‍♀ E4.0 woman: dark skin tone, blond hair
+1F471 200D 2642 FE0F                                   ; fully-qualified     # 👱‍♂️ E4.0 man: blond hair
+1F471 200D 2642                                        ; minimally-qualified # 👱‍♂ E4.0 man: blond hair
+1F471 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 👱🏻‍♂️ E4.0 man: light skin tone, blond hair
+1F471 1F3FB 200D 2642                                  ; minimally-qualified # 👱🏻‍♂ E4.0 man: light skin tone, blond hair
+1F471 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 👱🏼‍♂️ E4.0 man: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2642                                  ; minimally-qualified # 👱🏼‍♂ E4.0 man: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 👱🏽‍♂️ E4.0 man: medium skin tone, blond hair
+1F471 1F3FD 200D 2642                                  ; minimally-qualified # 👱🏽‍♂ E4.0 man: medium skin tone, blond hair
+1F471 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 👱🏾‍♂️ E4.0 man: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2642                                  ; minimally-qualified # 👱🏾‍♂ E4.0 man: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 👱🏿‍♂️ E4.0 man: dark skin tone, blond hair
+1F471 1F3FF 200D 2642                                  ; minimally-qualified # 👱🏿‍♂ E4.0 man: dark skin tone, blond hair
+1F9D3                                                  ; fully-qualified     # 🧓 E5.0 older person
+1F9D3 1F3FB                                            ; fully-qualified     # 🧓🏻 E5.0 older person: light skin tone
+1F9D3 1F3FC                                            ; fully-qualified     # 🧓🏼 E5.0 older person: medium-light skin tone
+1F9D3 1F3FD                                            ; fully-qualified     # 🧓🏽 E5.0 older person: medium skin tone
+1F9D3 1F3FE                                            ; fully-qualified     # 🧓🏾 E5.0 older person: medium-dark skin tone
+1F9D3 1F3FF                                            ; fully-qualified     # 🧓🏿 E5.0 older person: dark skin tone
+1F474                                                  ; fully-qualified     # 👴 E0.6 old man
+1F474 1F3FB                                            ; fully-qualified     # 👴🏻 E1.0 old man: light skin tone
+1F474 1F3FC                                            ; fully-qualified     # 👴🏼 E1.0 old man: medium-light skin tone
+1F474 1F3FD                                            ; fully-qualified     # 👴🏽 E1.0 old man: medium skin tone
+1F474 1F3FE                                            ; fully-qualified     # 👴🏾 E1.0 old man: medium-dark skin tone
+1F474 1F3FF                                            ; fully-qualified     # 👴🏿 E1.0 old man: dark skin tone
+1F475                                                  ; fully-qualified     # 👵 E0.6 old woman
+1F475 1F3FB                                            ; fully-qualified     # 👵🏻 E1.0 old woman: light skin tone
+1F475 1F3FC                                            ; fully-qualified     # 👵🏼 E1.0 old woman: medium-light skin tone
+1F475 1F3FD                                            ; fully-qualified     # 👵🏽 E1.0 old woman: medium skin tone
+1F475 1F3FE                                            ; fully-qualified     # 👵🏾 E1.0 old woman: medium-dark skin tone
+1F475 1F3FF                                            ; fully-qualified     # 👵🏿 E1.0 old woman: dark skin tone
+
+# subgroup: person-gesture
+1F64D                                                  ; fully-qualified     # 🙍 E0.6 person frowning
+1F64D 1F3FB                                            ; fully-qualified     # 🙍🏻 E1.0 person frowning: light skin tone
+1F64D 1F3FC                                            ; fully-qualified     # 🙍🏼 E1.0 person frowning: medium-light skin tone
+1F64D 1F3FD                                            ; fully-qualified     # 🙍🏽 E1.0 person frowning: medium skin tone
+1F64D 1F3FE                                            ; fully-qualified     # 🙍🏾 E1.0 person frowning: medium-dark skin tone
+1F64D 1F3FF                                            ; fully-qualified     # 🙍🏿 E1.0 person frowning: dark skin tone
+1F64D 200D 2642 FE0F                                   ; fully-qualified     # 🙍‍♂️ E4.0 man frowning
+1F64D 200D 2642                                        ; minimally-qualified # 🙍‍♂ E4.0 man frowning
+1F64D 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙍🏻‍♂️ E4.0 man frowning: light skin tone
+1F64D 1F3FB 200D 2642                                  ; minimally-qualified # 🙍🏻‍♂ E4.0 man frowning: light skin tone
+1F64D 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙍🏼‍♂️ E4.0 man frowning: medium-light skin tone
+1F64D 1F3FC 200D 2642                                  ; minimally-qualified # 🙍🏼‍♂ E4.0 man frowning: medium-light skin tone
+1F64D 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙍🏽‍♂️ E4.0 man frowning: medium skin tone
+1F64D 1F3FD 200D 2642                                  ; minimally-qualified # 🙍🏽‍♂ E4.0 man frowning: medium skin tone
+1F64D 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙍🏾‍♂️ E4.0 man frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2642                                  ; minimally-qualified # 🙍🏾‍♂ E4.0 man frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙍🏿‍♂️ E4.0 man frowning: dark skin tone
+1F64D 1F3FF 200D 2642                                  ; minimally-qualified # 🙍🏿‍♂ E4.0 man frowning: dark skin tone
+1F64D 200D 2640 FE0F                                   ; fully-qualified     # 🙍‍♀️ E4.0 woman frowning
+1F64D 200D 2640                                        ; minimally-qualified # 🙍‍♀ E4.0 woman frowning
+1F64D 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙍🏻‍♀️ E4.0 woman frowning: light skin tone
+1F64D 1F3FB 200D 2640                                  ; minimally-qualified # 🙍🏻‍♀ E4.0 woman frowning: light skin tone
+1F64D 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙍🏼‍♀️ E4.0 woman frowning: medium-light skin tone
+1F64D 1F3FC 200D 2640                                  ; minimally-qualified # 🙍🏼‍♀ E4.0 woman frowning: medium-light skin tone
+1F64D 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙍🏽‍♀️ E4.0 woman frowning: medium skin tone
+1F64D 1F3FD 200D 2640                                  ; minimally-qualified # 🙍🏽‍♀ E4.0 woman frowning: medium skin tone
+1F64D 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙍🏾‍♀️ E4.0 woman frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2640                                  ; minimally-qualified # 🙍🏾‍♀ E4.0 woman frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙍🏿‍♀️ E4.0 woman frowning: dark skin tone
+1F64D 1F3FF 200D 2640                                  ; minimally-qualified # 🙍🏿‍♀ E4.0 woman frowning: dark skin tone
+1F64E                                                  ; fully-qualified     # 🙎 E0.6 person pouting
+1F64E 1F3FB                                            ; fully-qualified     # 🙎🏻 E1.0 person pouting: light skin tone
+1F64E 1F3FC                                            ; fully-qualified     # 🙎🏼 E1.0 person pouting: medium-light skin tone
+1F64E 1F3FD                                            ; fully-qualified     # 🙎🏽 E1.0 person pouting: medium skin tone
+1F64E 1F3FE                                            ; fully-qualified     # 🙎🏾 E1.0 person pouting: medium-dark skin tone
+1F64E 1F3FF                                            ; fully-qualified     # 🙎🏿 E1.0 person pouting: dark skin tone
+1F64E 200D 2642 FE0F                                   ; fully-qualified     # 🙎‍♂️ E4.0 man pouting
+1F64E 200D 2642                                        ; minimally-qualified # 🙎‍♂ E4.0 man pouting
+1F64E 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙎🏻‍♂️ E4.0 man pouting: light skin tone
+1F64E 1F3FB 200D 2642                                  ; minimally-qualified # 🙎🏻‍♂ E4.0 man pouting: light skin tone
+1F64E 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙎🏼‍♂️ E4.0 man pouting: medium-light skin tone
+1F64E 1F3FC 200D 2642                                  ; minimally-qualified # 🙎🏼‍♂ E4.0 man pouting: medium-light skin tone
+1F64E 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙎🏽‍♂️ E4.0 man pouting: medium skin tone
+1F64E 1F3FD 200D 2642                                  ; minimally-qualified # 🙎🏽‍♂ E4.0 man pouting: medium skin tone
+1F64E 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙎🏾‍♂️ E4.0 man pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2642                                  ; minimally-qualified # 🙎🏾‍♂ E4.0 man pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙎🏿‍♂️ E4.0 man pouting: dark skin tone
+1F64E 1F3FF 200D 2642                                  ; minimally-qualified # 🙎🏿‍♂ E4.0 man pouting: dark skin tone
+1F64E 200D 2640 FE0F                                   ; fully-qualified     # 🙎‍♀️ E4.0 woman pouting
+1F64E 200D 2640                                        ; minimally-qualified # 🙎‍♀ E4.0 woman pouting
+1F64E 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙎🏻‍♀️ E4.0 woman pouting: light skin tone
+1F64E 1F3FB 200D 2640                                  ; minimally-qualified # 🙎🏻‍♀ E4.0 woman pouting: light skin tone
+1F64E 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙎🏼‍♀️ E4.0 woman pouting: medium-light skin tone
+1F64E 1F3FC 200D 2640                                  ; minimally-qualified # 🙎🏼‍♀ E4.0 woman pouting: medium-light skin tone
+1F64E 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙎🏽‍♀️ E4.0 woman pouting: medium skin tone
+1F64E 1F3FD 200D 2640                                  ; minimally-qualified # 🙎🏽‍♀ E4.0 woman pouting: medium skin tone
+1F64E 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙎🏾‍♀️ E4.0 woman pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2640                                  ; minimally-qualified # 🙎🏾‍♀ E4.0 woman pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙎🏿‍♀️ E4.0 woman pouting: dark skin tone
+1F64E 1F3FF 200D 2640                                  ; minimally-qualified # 🙎🏿‍♀ E4.0 woman pouting: dark skin tone
+1F645                                                  ; fully-qualified     # 🙅 E0.6 person gesturing NO
+1F645 1F3FB                                            ; fully-qualified     # 🙅🏻 E1.0 person gesturing NO: light skin tone
+1F645 1F3FC                                            ; fully-qualified     # 🙅🏼 E1.0 person gesturing NO: medium-light skin tone
+1F645 1F3FD                                            ; fully-qualified     # 🙅🏽 E1.0 person gesturing NO: medium skin tone
+1F645 1F3FE                                            ; fully-qualified     # 🙅🏾 E1.0 person gesturing NO: medium-dark skin tone
+1F645 1F3FF                                            ; fully-qualified     # 🙅🏿 E1.0 person gesturing NO: dark skin tone
+1F645 200D 2642 FE0F                                   ; fully-qualified     # 🙅‍♂️ E4.0 man gesturing NO
+1F645 200D 2642                                        ; minimally-qualified # 🙅‍♂ E4.0 man gesturing NO
+1F645 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙅🏻‍♂️ E4.0 man gesturing NO: light skin tone
+1F645 1F3FB 200D 2642                                  ; minimally-qualified # 🙅🏻‍♂ E4.0 man gesturing NO: light skin tone
+1F645 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙅🏼‍♂️ E4.0 man gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2642                                  ; minimally-qualified # 🙅🏼‍♂ E4.0 man gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙅🏽‍♂️ E4.0 man gesturing NO: medium skin tone
+1F645 1F3FD 200D 2642                                  ; minimally-qualified # 🙅🏽‍♂ E4.0 man gesturing NO: medium skin tone
+1F645 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙅🏾‍♂️ E4.0 man gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2642                                  ; minimally-qualified # 🙅🏾‍♂ E4.0 man gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙅🏿‍♂️ E4.0 man gesturing NO: dark skin tone
+1F645 1F3FF 200D 2642                                  ; minimally-qualified # 🙅🏿‍♂ E4.0 man gesturing NO: dark skin tone
+1F645 200D 2640 FE0F                                   ; fully-qualified     # 🙅‍♀️ E4.0 woman gesturing NO
+1F645 200D 2640                                        ; minimally-qualified # 🙅‍♀ E4.0 woman gesturing NO
+1F645 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙅🏻‍♀️ E4.0 woman gesturing NO: light skin tone
+1F645 1F3FB 200D 2640                                  ; minimally-qualified # 🙅🏻‍♀ E4.0 woman gesturing NO: light skin tone
+1F645 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙅🏼‍♀️ E4.0 woman gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2640                                  ; minimally-qualified # 🙅🏼‍♀ E4.0 woman gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙅🏽‍♀️ E4.0 woman gesturing NO: medium skin tone
+1F645 1F3FD 200D 2640                                  ; minimally-qualified # 🙅🏽‍♀ E4.0 woman gesturing NO: medium skin tone
+1F645 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙅🏾‍♀️ E4.0 woman gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2640                                  ; minimally-qualified # 🙅🏾‍♀ E4.0 woman gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙅🏿‍♀️ E4.0 woman gesturing NO: dark skin tone
+1F645 1F3FF 200D 2640                                  ; minimally-qualified # 🙅🏿‍♀ E4.0 woman gesturing NO: dark skin tone
+1F646                                                  ; fully-qualified     # 🙆 E0.6 person gesturing OK
+1F646 1F3FB                                            ; fully-qualified     # 🙆🏻 E1.0 person gesturing OK: light skin tone
+1F646 1F3FC                                            ; fully-qualified     # 🙆🏼 E1.0 person gesturing OK: medium-light skin tone
+1F646 1F3FD                                            ; fully-qualified     # 🙆🏽 E1.0 person gesturing OK: medium skin tone
+1F646 1F3FE                                            ; fully-qualified     # 🙆🏾 E1.0 person gesturing OK: medium-dark skin tone
+1F646 1F3FF                                            ; fully-qualified     # 🙆🏿 E1.0 person gesturing OK: dark skin tone
+1F646 200D 2642 FE0F                                   ; fully-qualified     # 🙆‍♂️ E4.0 man gesturing OK
+1F646 200D 2642                                        ; minimally-qualified # 🙆‍♂ E4.0 man gesturing OK
+1F646 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙆🏻‍♂️ E4.0 man gesturing OK: light skin tone
+1F646 1F3FB 200D 2642                                  ; minimally-qualified # 🙆🏻‍♂ E4.0 man gesturing OK: light skin tone
+1F646 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙆🏼‍♂️ E4.0 man gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2642                                  ; minimally-qualified # 🙆🏼‍♂ E4.0 man gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙆🏽‍♂️ E4.0 man gesturing OK: medium skin tone
+1F646 1F3FD 200D 2642                                  ; minimally-qualified # 🙆🏽‍♂ E4.0 man gesturing OK: medium skin tone
+1F646 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙆🏾‍♂️ E4.0 man gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2642                                  ; minimally-qualified # 🙆🏾‍♂ E4.0 man gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙆🏿‍♂️ E4.0 man gesturing OK: dark skin tone
+1F646 1F3FF 200D 2642                                  ; minimally-qualified # 🙆🏿‍♂ E4.0 man gesturing OK: dark skin tone
+1F646 200D 2640 FE0F                                   ; fully-qualified     # 🙆‍♀️ E4.0 woman gesturing OK
+1F646 200D 2640                                        ; minimally-qualified # 🙆‍♀ E4.0 woman gesturing OK
+1F646 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙆🏻‍♀️ E4.0 woman gesturing OK: light skin tone
+1F646 1F3FB 200D 2640                                  ; minimally-qualified # 🙆🏻‍♀ E4.0 woman gesturing OK: light skin tone
+1F646 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙆🏼‍♀️ E4.0 woman gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2640                                  ; minimally-qualified # 🙆🏼‍♀ E4.0 woman gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙆🏽‍♀️ E4.0 woman gesturing OK: medium skin tone
+1F646 1F3FD 200D 2640                                  ; minimally-qualified # 🙆🏽‍♀ E4.0 woman gesturing OK: medium skin tone
+1F646 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙆🏾‍♀️ E4.0 woman gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2640                                  ; minimally-qualified # 🙆🏾‍♀ E4.0 woman gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙆🏿‍♀️ E4.0 woman gesturing OK: dark skin tone
+1F646 1F3FF 200D 2640                                  ; minimally-qualified # 🙆🏿‍♀ E4.0 woman gesturing OK: dark skin tone
+1F481                                                  ; fully-qualified     # 💁 E0.6 person tipping hand
+1F481 1F3FB                                            ; fully-qualified     # 💁🏻 E1.0 person tipping hand: light skin tone
+1F481 1F3FC                                            ; fully-qualified     # 💁🏼 E1.0 person tipping hand: medium-light skin tone
+1F481 1F3FD                                            ; fully-qualified     # 💁🏽 E1.0 person tipping hand: medium skin tone
+1F481 1F3FE                                            ; fully-qualified     # 💁🏾 E1.0 person tipping hand: medium-dark skin tone
+1F481 1F3FF                                            ; fully-qualified     # 💁🏿 E1.0 person tipping hand: dark skin tone
+1F481 200D 2642 FE0F                                   ; fully-qualified     # 💁‍♂️ E4.0 man tipping hand
+1F481 200D 2642                                        ; minimally-qualified # 💁‍♂ E4.0 man tipping hand
+1F481 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 💁🏻‍♂️ E4.0 man tipping hand: light skin tone
+1F481 1F3FB 200D 2642                                  ; minimally-qualified # 💁🏻‍♂ E4.0 man tipping hand: light skin tone
+1F481 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 💁🏼‍♂️ E4.0 man tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2642                                  ; minimally-qualified # 💁🏼‍♂ E4.0 man tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 💁🏽‍♂️ E4.0 man tipping hand: medium skin tone
+1F481 1F3FD 200D 2642                                  ; minimally-qualified # 💁🏽‍♂ E4.0 man tipping hand: medium skin tone
+1F481 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 💁🏾‍♂️ E4.0 man tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2642                                  ; minimally-qualified # 💁🏾‍♂ E4.0 man tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 💁🏿‍♂️ E4.0 man tipping hand: dark skin tone
+1F481 1F3FF 200D 2642                                  ; minimally-qualified # 💁🏿‍♂ E4.0 man tipping hand: dark skin tone
+1F481 200D 2640 FE0F                                   ; fully-qualified     # 💁‍♀️ E4.0 woman tipping hand
+1F481 200D 2640                                        ; minimally-qualified # 💁‍♀ E4.0 woman tipping hand
+1F481 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 💁🏻‍♀️ E4.0 woman tipping hand: light skin tone
+1F481 1F3FB 200D 2640                                  ; minimally-qualified # 💁🏻‍♀ E4.0 woman tipping hand: light skin tone
+1F481 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 💁🏼‍♀️ E4.0 woman tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2640                                  ; minimally-qualified # 💁🏼‍♀ E4.0 woman tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 💁🏽‍♀️ E4.0 woman tipping hand: medium skin tone
+1F481 1F3FD 200D 2640                                  ; minimally-qualified # 💁🏽‍♀ E4.0 woman tipping hand: medium skin tone
+1F481 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 💁🏾‍♀️ E4.0 woman tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2640                                  ; minimally-qualified # 💁🏾‍♀ E4.0 woman tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 💁🏿‍♀️ E4.0 woman tipping hand: dark skin tone
+1F481 1F3FF 200D 2640                                  ; minimally-qualified # 💁🏿‍♀ E4.0 woman tipping hand: dark skin tone
+1F64B                                                  ; fully-qualified     # 🙋 E0.6 person raising hand
+1F64B 1F3FB                                            ; fully-qualified     # 🙋🏻 E1.0 person raising hand: light skin tone
+1F64B 1F3FC                                            ; fully-qualified     # 🙋🏼 E1.0 person raising hand: medium-light skin tone
+1F64B 1F3FD                                            ; fully-qualified     # 🙋🏽 E1.0 person raising hand: medium skin tone
+1F64B 1F3FE                                            ; fully-qualified     # 🙋🏾 E1.0 person raising hand: medium-dark skin tone
+1F64B 1F3FF                                            ; fully-qualified     # 🙋🏿 E1.0 person raising hand: dark skin tone
+1F64B 200D 2642 FE0F                                   ; fully-qualified     # 🙋‍♂️ E4.0 man raising hand
+1F64B 200D 2642                                        ; minimally-qualified # 🙋‍♂ E4.0 man raising hand
+1F64B 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙋🏻‍♂️ E4.0 man raising hand: light skin tone
+1F64B 1F3FB 200D 2642                                  ; minimally-qualified # 🙋🏻‍♂ E4.0 man raising hand: light skin tone
+1F64B 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙋🏼‍♂️ E4.0 man raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2642                                  ; minimally-qualified # 🙋🏼‍♂ E4.0 man raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙋🏽‍♂️ E4.0 man raising hand: medium skin tone
+1F64B 1F3FD 200D 2642                                  ; minimally-qualified # 🙋🏽‍♂ E4.0 man raising hand: medium skin tone
+1F64B 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙋🏾‍♂️ E4.0 man raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2642                                  ; minimally-qualified # 🙋🏾‍♂ E4.0 man raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙋🏿‍♂️ E4.0 man raising hand: dark skin tone
+1F64B 1F3FF 200D 2642                                  ; minimally-qualified # 🙋🏿‍♂ E4.0 man raising hand: dark skin tone
+1F64B 200D 2640 FE0F                                   ; fully-qualified     # 🙋‍♀️ E4.0 woman raising hand
+1F64B 200D 2640                                        ; minimally-qualified # 🙋‍♀ E4.0 woman raising hand
+1F64B 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙋🏻‍♀️ E4.0 woman raising hand: light skin tone
+1F64B 1F3FB 200D 2640                                  ; minimally-qualified # 🙋🏻‍♀ E4.0 woman raising hand: light skin tone
+1F64B 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙋🏼‍♀️ E4.0 woman raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2640                                  ; minimally-qualified # 🙋🏼‍♀ E4.0 woman raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙋🏽‍♀️ E4.0 woman raising hand: medium skin tone
+1F64B 1F3FD 200D 2640                                  ; minimally-qualified # 🙋🏽‍♀ E4.0 woman raising hand: medium skin tone
+1F64B 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙋🏾‍♀️ E4.0 woman raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2640                                  ; minimally-qualified # 🙋🏾‍♀ E4.0 woman raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙋🏿‍♀️ E4.0 woman raising hand: dark skin tone
+1F64B 1F3FF 200D 2640                                  ; minimally-qualified # 🙋🏿‍♀ E4.0 woman raising hand: dark skin tone
+1F9CF                                                  ; fully-qualified     # 🧏 E12.0 deaf person
+1F9CF 1F3FB                                            ; fully-qualified     # 🧏🏻 E12.0 deaf person: light skin tone
+1F9CF 1F3FC                                            ; fully-qualified     # 🧏🏼 E12.0 deaf person: medium-light skin tone
+1F9CF 1F3FD                                            ; fully-qualified     # 🧏🏽 E12.0 deaf person: medium skin tone
+1F9CF 1F3FE                                            ; fully-qualified     # 🧏🏾 E12.0 deaf person: medium-dark skin tone
+1F9CF 1F3FF                                            ; fully-qualified     # 🧏🏿 E12.0 deaf person: dark skin tone
+1F9CF 200D 2642 FE0F                                   ; fully-qualified     # 🧏‍♂️ E12.0 deaf man
+1F9CF 200D 2642                                        ; minimally-qualified # 🧏‍♂ E12.0 deaf man
+1F9CF 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧏🏻‍♂️ E12.0 deaf man: light skin tone
+1F9CF 1F3FB 200D 2642                                  ; minimally-qualified # 🧏🏻‍♂ E12.0 deaf man: light skin tone
+1F9CF 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧏🏼‍♂️ E12.0 deaf man: medium-light skin tone
+1F9CF 1F3FC 200D 2642                                  ; minimally-qualified # 🧏🏼‍♂ E12.0 deaf man: medium-light skin tone
+1F9CF 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧏🏽‍♂️ E12.0 deaf man: medium skin tone
+1F9CF 1F3FD 200D 2642                                  ; minimally-qualified # 🧏🏽‍♂ E12.0 deaf man: medium skin tone
+1F9CF 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧏🏾‍♂️ E12.0 deaf man: medium-dark skin tone
+1F9CF 1F3FE 200D 2642                                  ; minimally-qualified # 🧏🏾‍♂ E12.0 deaf man: medium-dark skin tone
+1F9CF 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧏🏿‍♂️ E12.0 deaf man: dark skin tone
+1F9CF 1F3FF 200D 2642                                  ; minimally-qualified # 🧏🏿‍♂ E12.0 deaf man: dark skin tone
+1F9CF 200D 2640 FE0F                                   ; fully-qualified     # 🧏‍♀️ E12.0 deaf woman
+1F9CF 200D 2640                                        ; minimally-qualified # 🧏‍♀ E12.0 deaf woman
+1F9CF 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧏🏻‍♀️ E12.0 deaf woman: light skin tone
+1F9CF 1F3FB 200D 2640                                  ; minimally-qualified # 🧏🏻‍♀ E12.0 deaf woman: light skin tone
+1F9CF 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧏🏼‍♀️ E12.0 deaf woman: medium-light skin tone
+1F9CF 1F3FC 200D 2640                                  ; minimally-qualified # 🧏🏼‍♀ E12.0 deaf woman: medium-light skin tone
+1F9CF 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧏🏽‍♀️ E12.0 deaf woman: medium skin tone
+1F9CF 1F3FD 200D 2640                                  ; minimally-qualified # 🧏🏽‍♀ E12.0 deaf woman: medium skin tone
+1F9CF 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧏🏾‍♀️ E12.0 deaf woman: medium-dark skin tone
+1F9CF 1F3FE 200D 2640                                  ; minimally-qualified # 🧏🏾‍♀ E12.0 deaf woman: medium-dark skin tone
+1F9CF 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧏🏿‍♀️ E12.0 deaf woman: dark skin tone
+1F9CF 1F3FF 200D 2640                                  ; minimally-qualified # 🧏🏿‍♀ E12.0 deaf woman: dark skin tone
+1F647                                                  ; fully-qualified     # 🙇 E0.6 person bowing
+1F647 1F3FB                                            ; fully-qualified     # 🙇🏻 E1.0 person bowing: light skin tone
+1F647 1F3FC                                            ; fully-qualified     # 🙇🏼 E1.0 person bowing: medium-light skin tone
+1F647 1F3FD                                            ; fully-qualified     # 🙇🏽 E1.0 person bowing: medium skin tone
+1F647 1F3FE                                            ; fully-qualified     # 🙇🏾 E1.0 person bowing: medium-dark skin tone
+1F647 1F3FF                                            ; fully-qualified     # 🙇🏿 E1.0 person bowing: dark skin tone
+1F647 200D 2642 FE0F                                   ; fully-qualified     # 🙇‍♂️ E4.0 man bowing
+1F647 200D 2642                                        ; minimally-qualified # 🙇‍♂ E4.0 man bowing
+1F647 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🙇🏻‍♂️ E4.0 man bowing: light skin tone
+1F647 1F3FB 200D 2642                                  ; minimally-qualified # 🙇🏻‍♂ E4.0 man bowing: light skin tone
+1F647 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🙇🏼‍♂️ E4.0 man bowing: medium-light skin tone
+1F647 1F3FC 200D 2642                                  ; minimally-qualified # 🙇🏼‍♂ E4.0 man bowing: medium-light skin tone
+1F647 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🙇🏽‍♂️ E4.0 man bowing: medium skin tone
+1F647 1F3FD 200D 2642                                  ; minimally-qualified # 🙇🏽‍♂ E4.0 man bowing: medium skin tone
+1F647 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🙇🏾‍♂️ E4.0 man bowing: medium-dark skin tone
+1F647 1F3FE 200D 2642                                  ; minimally-qualified # 🙇🏾‍♂ E4.0 man bowing: medium-dark skin tone
+1F647 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🙇🏿‍♂️ E4.0 man bowing: dark skin tone
+1F647 1F3FF 200D 2642                                  ; minimally-qualified # 🙇🏿‍♂ E4.0 man bowing: dark skin tone
+1F647 200D 2640 FE0F                                   ; fully-qualified     # 🙇‍♀️ E4.0 woman bowing
+1F647 200D 2640                                        ; minimally-qualified # 🙇‍♀ E4.0 woman bowing
+1F647 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🙇🏻‍♀️ E4.0 woman bowing: light skin tone
+1F647 1F3FB 200D 2640                                  ; minimally-qualified # 🙇🏻‍♀ E4.0 woman bowing: light skin tone
+1F647 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🙇🏼‍♀️ E4.0 woman bowing: medium-light skin tone
+1F647 1F3FC 200D 2640                                  ; minimally-qualified # 🙇🏼‍♀ E4.0 woman bowing: medium-light skin tone
+1F647 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🙇🏽‍♀️ E4.0 woman bowing: medium skin tone
+1F647 1F3FD 200D 2640                                  ; minimally-qualified # 🙇🏽‍♀ E4.0 woman bowing: medium skin tone
+1F647 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🙇🏾‍♀️ E4.0 woman bowing: medium-dark skin tone
+1F647 1F3FE 200D 2640                                  ; minimally-qualified # 🙇🏾‍♀ E4.0 woman bowing: medium-dark skin tone
+1F647 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🙇🏿‍♀️ E4.0 woman bowing: dark skin tone
+1F647 1F3FF 200D 2640                                  ; minimally-qualified # 🙇🏿‍♀ E4.0 woman bowing: dark skin tone
+1F926                                                  ; fully-qualified     # 🤦 E3.0 person facepalming
+1F926 1F3FB                                            ; fully-qualified     # 🤦🏻 E3.0 person facepalming: light skin tone
+1F926 1F3FC                                            ; fully-qualified     # 🤦🏼 E3.0 person facepalming: medium-light skin tone
+1F926 1F3FD                                            ; fully-qualified     # 🤦🏽 E3.0 person facepalming: medium skin tone
+1F926 1F3FE                                            ; fully-qualified     # 🤦🏾 E3.0 person facepalming: medium-dark skin tone
+1F926 1F3FF                                            ; fully-qualified     # 🤦🏿 E3.0 person facepalming: dark skin tone
+1F926 200D 2642 FE0F                                   ; fully-qualified     # 🤦‍♂️ E4.0 man facepalming
+1F926 200D 2642                                        ; minimally-qualified # 🤦‍♂ E4.0 man facepalming
+1F926 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤦🏻‍♂️ E4.0 man facepalming: light skin tone
+1F926 1F3FB 200D 2642                                  ; minimally-qualified # 🤦🏻‍♂ E4.0 man facepalming: light skin tone
+1F926 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤦🏼‍♂️ E4.0 man facepalming: medium-light skin tone
+1F926 1F3FC 200D 2642                                  ; minimally-qualified # 🤦🏼‍♂ E4.0 man facepalming: medium-light skin tone
+1F926 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤦🏽‍♂️ E4.0 man facepalming: medium skin tone
+1F926 1F3FD 200D 2642                                  ; minimally-qualified # 🤦🏽‍♂ E4.0 man facepalming: medium skin tone
+1F926 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤦🏾‍♂️ E4.0 man facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2642                                  ; minimally-qualified # 🤦🏾‍♂ E4.0 man facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤦🏿‍♂️ E4.0 man facepalming: dark skin tone
+1F926 1F3FF 200D 2642                                  ; minimally-qualified # 🤦🏿‍♂ E4.0 man facepalming: dark skin tone
+1F926 200D 2640 FE0F                                   ; fully-qualified     # 🤦‍♀️ E4.0 woman facepalming
+1F926 200D 2640                                        ; minimally-qualified # 🤦‍♀ E4.0 woman facepalming
+1F926 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤦🏻‍♀️ E4.0 woman facepalming: light skin tone
+1F926 1F3FB 200D 2640                                  ; minimally-qualified # 🤦🏻‍♀ E4.0 woman facepalming: light skin tone
+1F926 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤦🏼‍♀️ E4.0 woman facepalming: medium-light skin tone
+1F926 1F3FC 200D 2640                                  ; minimally-qualified # 🤦🏼‍♀ E4.0 woman facepalming: medium-light skin tone
+1F926 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤦🏽‍♀️ E4.0 woman facepalming: medium skin tone
+1F926 1F3FD 200D 2640                                  ; minimally-qualified # 🤦🏽‍♀ E4.0 woman facepalming: medium skin tone
+1F926 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤦🏾‍♀️ E4.0 woman facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2640                                  ; minimally-qualified # 🤦🏾‍♀ E4.0 woman facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤦🏿‍♀️ E4.0 woman facepalming: dark skin tone
+1F926 1F3FF 200D 2640                                  ; minimally-qualified # 🤦🏿‍♀ E4.0 woman facepalming: dark skin tone
+1F937                                                  ; fully-qualified     # 🤷 E3.0 person shrugging
+1F937 1F3FB                                            ; fully-qualified     # 🤷🏻 E3.0 person shrugging: light skin tone
+1F937 1F3FC                                            ; fully-qualified     # 🤷🏼 E3.0 person shrugging: medium-light skin tone
+1F937 1F3FD                                            ; fully-qualified     # 🤷🏽 E3.0 person shrugging: medium skin tone
+1F937 1F3FE                                            ; fully-qualified     # 🤷🏾 E3.0 person shrugging: medium-dark skin tone
+1F937 1F3FF                                            ; fully-qualified     # 🤷🏿 E3.0 person shrugging: dark skin tone
+1F937 200D 2642 FE0F                                   ; fully-qualified     # 🤷‍♂️ E4.0 man shrugging
+1F937 200D 2642                                        ; minimally-qualified # 🤷‍♂ E4.0 man shrugging
+1F937 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤷🏻‍♂️ E4.0 man shrugging: light skin tone
+1F937 1F3FB 200D 2642                                  ; minimally-qualified # 🤷🏻‍♂ E4.0 man shrugging: light skin tone
+1F937 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤷🏼‍♂️ E4.0 man shrugging: medium-light skin tone
+1F937 1F3FC 200D 2642                                  ; minimally-qualified # 🤷🏼‍♂ E4.0 man shrugging: medium-light skin tone
+1F937 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤷🏽‍♂️ E4.0 man shrugging: medium skin tone
+1F937 1F3FD 200D 2642                                  ; minimally-qualified # 🤷🏽‍♂ E4.0 man shrugging: medium skin tone
+1F937 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤷🏾‍♂️ E4.0 man shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2642                                  ; minimally-qualified # 🤷🏾‍♂ E4.0 man shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤷🏿‍♂️ E4.0 man shrugging: dark skin tone
+1F937 1F3FF 200D 2642                                  ; minimally-qualified # 🤷🏿‍♂ E4.0 man shrugging: dark skin tone
+1F937 200D 2640 FE0F                                   ; fully-qualified     # 🤷‍♀️ E4.0 woman shrugging
+1F937 200D 2640                                        ; minimally-qualified # 🤷‍♀ E4.0 woman shrugging
+1F937 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤷🏻‍♀️ E4.0 woman shrugging: light skin tone
+1F937 1F3FB 200D 2640                                  ; minimally-qualified # 🤷🏻‍♀ E4.0 woman shrugging: light skin tone
+1F937 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤷🏼‍♀️ E4.0 woman shrugging: medium-light skin tone
+1F937 1F3FC 200D 2640                                  ; minimally-qualified # 🤷🏼‍♀ E4.0 woman shrugging: medium-light skin tone
+1F937 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤷🏽‍♀️ E4.0 woman shrugging: medium skin tone
+1F937 1F3FD 200D 2640                                  ; minimally-qualified # 🤷🏽‍♀ E4.0 woman shrugging: medium skin tone
+1F937 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤷🏾‍♀️ E4.0 woman shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2640                                  ; minimally-qualified # 🤷🏾‍♀ E4.0 woman shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤷🏿‍♀️ E4.0 woman shrugging: dark skin tone
+1F937 1F3FF 200D 2640                                  ; minimally-qualified # 🤷🏿‍♀ E4.0 woman shrugging: dark skin tone
+
+# subgroup: person-role
+1F9D1 200D 2695 FE0F                                   ; fully-qualified     # 🧑‍⚕️ E12.1 health worker
+1F9D1 200D 2695                                        ; minimally-qualified # 🧑‍⚕ E12.1 health worker
+1F9D1 1F3FB 200D 2695 FE0F                             ; fully-qualified     # 🧑🏻‍⚕️ E12.1 health worker: light skin tone
+1F9D1 1F3FB 200D 2695                                  ; minimally-qualified # 🧑🏻‍⚕ E12.1 health worker: light skin tone
+1F9D1 1F3FC 200D 2695 FE0F                             ; fully-qualified     # 🧑🏼‍⚕️ E12.1 health worker: medium-light skin tone
+1F9D1 1F3FC 200D 2695                                  ; minimally-qualified # 🧑🏼‍⚕ E12.1 health worker: medium-light skin tone
+1F9D1 1F3FD 200D 2695 FE0F                             ; fully-qualified     # 🧑🏽‍⚕️ E12.1 health worker: medium skin tone
+1F9D1 1F3FD 200D 2695                                  ; minimally-qualified # 🧑🏽‍⚕ E12.1 health worker: medium skin tone
+1F9D1 1F3FE 200D 2695 FE0F                             ; fully-qualified     # 🧑🏾‍⚕️ E12.1 health worker: medium-dark skin tone
+1F9D1 1F3FE 200D 2695                                  ; minimally-qualified # 🧑🏾‍⚕ E12.1 health worker: medium-dark skin tone
+1F9D1 1F3FF 200D 2695 FE0F                             ; fully-qualified     # 🧑🏿‍⚕️ E12.1 health worker: dark skin tone
+1F9D1 1F3FF 200D 2695                                  ; minimally-qualified # 🧑🏿‍⚕ E12.1 health worker: dark skin tone
+1F468 200D 2695 FE0F                                   ; fully-qualified     # 👨‍⚕️ E4.0 man health worker
+1F468 200D 2695                                        ; minimally-qualified # 👨‍⚕ E4.0 man health worker
+1F468 1F3FB 200D 2695 FE0F                             ; fully-qualified     # 👨🏻‍⚕️ E4.0 man health worker: light skin tone
+1F468 1F3FB 200D 2695                                  ; minimally-qualified # 👨🏻‍⚕ E4.0 man health worker: light skin tone
+1F468 1F3FC 200D 2695 FE0F                             ; fully-qualified     # 👨🏼‍⚕️ E4.0 man health worker: medium-light skin tone
+1F468 1F3FC 200D 2695                                  ; minimally-qualified # 👨🏼‍⚕ E4.0 man health worker: medium-light skin tone
+1F468 1F3FD 200D 2695 FE0F                             ; fully-qualified     # 👨🏽‍⚕️ E4.0 man health worker: medium skin tone
+1F468 1F3FD 200D 2695                                  ; minimally-qualified # 👨🏽‍⚕ E4.0 man health worker: medium skin tone
+1F468 1F3FE 200D 2695 FE0F                             ; fully-qualified     # 👨🏾‍⚕️ E4.0 man health worker: medium-dark skin tone
+1F468 1F3FE 200D 2695                                  ; minimally-qualified # 👨🏾‍⚕ E4.0 man health worker: medium-dark skin tone
+1F468 1F3FF 200D 2695 FE0F                             ; fully-qualified     # 👨🏿‍⚕️ E4.0 man health worker: dark skin tone
+1F468 1F3FF 200D 2695                                  ; minimally-qualified # 👨🏿‍⚕ E4.0 man health worker: dark skin tone
+1F469 200D 2695 FE0F                                   ; fully-qualified     # 👩‍⚕️ E4.0 woman health worker
+1F469 200D 2695                                        ; minimally-qualified # 👩‍⚕ E4.0 woman health worker
+1F469 1F3FB 200D 2695 FE0F                             ; fully-qualified     # 👩🏻‍⚕️ E4.0 woman health worker: light skin tone
+1F469 1F3FB 200D 2695                                  ; minimally-qualified # 👩🏻‍⚕ E4.0 woman health worker: light skin tone
+1F469 1F3FC 200D 2695 FE0F                             ; fully-qualified     # 👩🏼‍⚕️ E4.0 woman health worker: medium-light skin tone
+1F469 1F3FC 200D 2695                                  ; minimally-qualified # 👩🏼‍⚕ E4.0 woman health worker: medium-light skin tone
+1F469 1F3FD 200D 2695 FE0F                             ; fully-qualified     # 👩🏽‍⚕️ E4.0 woman health worker: medium skin tone
+1F469 1F3FD 200D 2695                                  ; minimally-qualified # 👩🏽‍⚕ E4.0 woman health worker: medium skin tone
+1F469 1F3FE 200D 2695 FE0F                             ; fully-qualified     # 👩🏾‍⚕️ E4.0 woman health worker: medium-dark skin tone
+1F469 1F3FE 200D 2695                                  ; minimally-qualified # 👩🏾‍⚕ E4.0 woman health worker: medium-dark skin tone
+1F469 1F3FF 200D 2695 FE0F                             ; fully-qualified     # 👩🏿‍⚕️ E4.0 woman health worker: dark skin tone
+1F469 1F3FF 200D 2695                                  ; minimally-qualified # 👩🏿‍⚕ E4.0 woman health worker: dark skin tone
+1F9D1 200D 1F393                                       ; fully-qualified     # 🧑‍🎓 E12.1 student
+1F9D1 1F3FB 200D 1F393                                 ; fully-qualified     # 🧑🏻‍🎓 E12.1 student: light skin tone
+1F9D1 1F3FC 200D 1F393                                 ; fully-qualified     # 🧑🏼‍🎓 E12.1 student: medium-light skin tone
+1F9D1 1F3FD 200D 1F393                                 ; fully-qualified     # 🧑🏽‍🎓 E12.1 student: medium skin tone
+1F9D1 1F3FE 200D 1F393                                 ; fully-qualified     # 🧑🏾‍🎓 E12.1 student: medium-dark skin tone
+1F9D1 1F3FF 200D 1F393                                 ; fully-qualified     # 🧑🏿‍🎓 E12.1 student: dark skin tone
+1F468 200D 1F393                                       ; fully-qualified     # 👨‍🎓 E4.0 man student
+1F468 1F3FB 200D 1F393                                 ; fully-qualified     # 👨🏻‍🎓 E4.0 man student: light skin tone
+1F468 1F3FC 200D 1F393                                 ; fully-qualified     # 👨🏼‍🎓 E4.0 man student: medium-light skin tone
+1F468 1F3FD 200D 1F393                                 ; fully-qualified     # 👨🏽‍🎓 E4.0 man student: medium skin tone
+1F468 1F3FE 200D 1F393                                 ; fully-qualified     # 👨🏾‍🎓 E4.0 man student: medium-dark skin tone
+1F468 1F3FF 200D 1F393                                 ; fully-qualified     # 👨🏿‍🎓 E4.0 man student: dark skin tone
+1F469 200D 1F393                                       ; fully-qualified     # 👩‍🎓 E4.0 woman student
+1F469 1F3FB 200D 1F393                                 ; fully-qualified     # 👩🏻‍🎓 E4.0 woman student: light skin tone
+1F469 1F3FC 200D 1F393                                 ; fully-qualified     # 👩🏼‍🎓 E4.0 woman student: medium-light skin tone
+1F469 1F3FD 200D 1F393                                 ; fully-qualified     # 👩🏽‍🎓 E4.0 woman student: medium skin tone
+1F469 1F3FE 200D 1F393                                 ; fully-qualified     # 👩🏾‍🎓 E4.0 woman student: medium-dark skin tone
+1F469 1F3FF 200D 1F393                                 ; fully-qualified     # 👩🏿‍🎓 E4.0 woman student: dark skin tone
+1F9D1 200D 1F3EB                                       ; fully-qualified     # 🧑‍🏫 E12.1 teacher
+1F9D1 1F3FB 200D 1F3EB                                 ; fully-qualified     # 🧑🏻‍🏫 E12.1 teacher: light skin tone
+1F9D1 1F3FC 200D 1F3EB                                 ; fully-qualified     # 🧑🏼‍🏫 E12.1 teacher: medium-light skin tone
+1F9D1 1F3FD 200D 1F3EB                                 ; fully-qualified     # 🧑🏽‍🏫 E12.1 teacher: medium skin tone
+1F9D1 1F3FE 200D 1F3EB                                 ; fully-qualified     # 🧑🏾‍🏫 E12.1 teacher: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3EB                                 ; fully-qualified     # 🧑🏿‍🏫 E12.1 teacher: dark skin tone
+1F468 200D 1F3EB                                       ; fully-qualified     # 👨‍🏫 E4.0 man teacher
+1F468 1F3FB 200D 1F3EB                                 ; fully-qualified     # 👨🏻‍🏫 E4.0 man teacher: light skin tone
+1F468 1F3FC 200D 1F3EB                                 ; fully-qualified     # 👨🏼‍🏫 E4.0 man teacher: medium-light skin tone
+1F468 1F3FD 200D 1F3EB                                 ; fully-qualified     # 👨🏽‍🏫 E4.0 man teacher: medium skin tone
+1F468 1F3FE 200D 1F3EB                                 ; fully-qualified     # 👨🏾‍🏫 E4.0 man teacher: medium-dark skin tone
+1F468 1F3FF 200D 1F3EB                                 ; fully-qualified     # 👨🏿‍🏫 E4.0 man teacher: dark skin tone
+1F469 200D 1F3EB                                       ; fully-qualified     # 👩‍🏫 E4.0 woman teacher
+1F469 1F3FB 200D 1F3EB                                 ; fully-qualified     # 👩🏻‍🏫 E4.0 woman teacher: light skin tone
+1F469 1F3FC 200D 1F3EB                                 ; fully-qualified     # 👩🏼‍🏫 E4.0 woman teacher: medium-light skin tone
+1F469 1F3FD 200D 1F3EB                                 ; fully-qualified     # 👩🏽‍🏫 E4.0 woman teacher: medium skin tone
+1F469 1F3FE 200D 1F3EB                                 ; fully-qualified     # 👩🏾‍🏫 E4.0 woman teacher: medium-dark skin tone
+1F469 1F3FF 200D 1F3EB                                 ; fully-qualified     # 👩🏿‍🏫 E4.0 woman teacher: dark skin tone
+1F9D1 200D 2696 FE0F                                   ; fully-qualified     # 🧑‍⚖️ E12.1 judge
+1F9D1 200D 2696                                        ; minimally-qualified # 🧑‍⚖ E12.1 judge
+1F9D1 1F3FB 200D 2696 FE0F                             ; fully-qualified     # 🧑🏻‍⚖️ E12.1 judge: light skin tone
+1F9D1 1F3FB 200D 2696                                  ; minimally-qualified # 🧑🏻‍⚖ E12.1 judge: light skin tone
+1F9D1 1F3FC 200D 2696 FE0F                             ; fully-qualified     # 🧑🏼‍⚖️ E12.1 judge: medium-light skin tone
+1F9D1 1F3FC 200D 2696                                  ; minimally-qualified # 🧑🏼‍⚖ E12.1 judge: medium-light skin tone
+1F9D1 1F3FD 200D 2696 FE0F                             ; fully-qualified     # 🧑🏽‍⚖️ E12.1 judge: medium skin tone
+1F9D1 1F3FD 200D 2696                                  ; minimally-qualified # 🧑🏽‍⚖ E12.1 judge: medium skin tone
+1F9D1 1F3FE 200D 2696 FE0F                             ; fully-qualified     # 🧑🏾‍⚖️ E12.1 judge: medium-dark skin tone
+1F9D1 1F3FE 200D 2696                                  ; minimally-qualified # 🧑🏾‍⚖ E12.1 judge: medium-dark skin tone
+1F9D1 1F3FF 200D 2696 FE0F                             ; fully-qualified     # 🧑🏿‍⚖️ E12.1 judge: dark skin tone
+1F9D1 1F3FF 200D 2696                                  ; minimally-qualified # 🧑🏿‍⚖ E12.1 judge: dark skin tone
+1F468 200D 2696 FE0F                                   ; fully-qualified     # 👨‍⚖️ E4.0 man judge
+1F468 200D 2696                                        ; minimally-qualified # 👨‍⚖ E4.0 man judge
+1F468 1F3FB 200D 2696 FE0F                             ; fully-qualified     # 👨🏻‍⚖️ E4.0 man judge: light skin tone
+1F468 1F3FB 200D 2696                                  ; minimally-qualified # 👨🏻‍⚖ E4.0 man judge: light skin tone
+1F468 1F3FC 200D 2696 FE0F                             ; fully-qualified     # 👨🏼‍⚖️ E4.0 man judge: medium-light skin tone
+1F468 1F3FC 200D 2696                                  ; minimally-qualified # 👨🏼‍⚖ E4.0 man judge: medium-light skin tone
+1F468 1F3FD 200D 2696 FE0F                             ; fully-qualified     # 👨🏽‍⚖️ E4.0 man judge: medium skin tone
+1F468 1F3FD 200D 2696                                  ; minimally-qualified # 👨🏽‍⚖ E4.0 man judge: medium skin tone
+1F468 1F3FE 200D 2696 FE0F                             ; fully-qualified     # 👨🏾‍⚖️ E4.0 man judge: medium-dark skin tone
+1F468 1F3FE 200D 2696                                  ; minimally-qualified # 👨🏾‍⚖ E4.0 man judge: medium-dark skin tone
+1F468 1F3FF 200D 2696 FE0F                             ; fully-qualified     # 👨🏿‍⚖️ E4.0 man judge: dark skin tone
+1F468 1F3FF 200D 2696                                  ; minimally-qualified # 👨🏿‍⚖ E4.0 man judge: dark skin tone
+1F469 200D 2696 FE0F                                   ; fully-qualified     # 👩‍⚖️ E4.0 woman judge
+1F469 200D 2696                                        ; minimally-qualified # 👩‍⚖ E4.0 woman judge
+1F469 1F3FB 200D 2696 FE0F                             ; fully-qualified     # 👩🏻‍⚖️ E4.0 woman judge: light skin tone
+1F469 1F3FB 200D 2696                                  ; minimally-qualified # 👩🏻‍⚖ E4.0 woman judge: light skin tone
+1F469 1F3FC 200D 2696 FE0F                             ; fully-qualified     # 👩🏼‍⚖️ E4.0 woman judge: medium-light skin tone
+1F469 1F3FC 200D 2696                                  ; minimally-qualified # 👩🏼‍⚖ E4.0 woman judge: medium-light skin tone
+1F469 1F3FD 200D 2696 FE0F                             ; fully-qualified     # 👩🏽‍⚖️ E4.0 woman judge: medium skin tone
+1F469 1F3FD 200D 2696                                  ; minimally-qualified # 👩🏽‍⚖ E4.0 woman judge: medium skin tone
+1F469 1F3FE 200D 2696 FE0F                             ; fully-qualified     # 👩🏾‍⚖️ E4.0 woman judge: medium-dark skin tone
+1F469 1F3FE 200D 2696                                  ; minimally-qualified # 👩🏾‍⚖ E4.0 woman judge: medium-dark skin tone
+1F469 1F3FF 200D 2696 FE0F                             ; fully-qualified     # 👩🏿‍⚖️ E4.0 woman judge: dark skin tone
+1F469 1F3FF 200D 2696                                  ; minimally-qualified # 👩🏿‍⚖ E4.0 woman judge: dark skin tone
+1F9D1 200D 1F33E                                       ; fully-qualified     # 🧑‍🌾 E12.1 farmer
+1F9D1 1F3FB 200D 1F33E                                 ; fully-qualified     # 🧑🏻‍🌾 E12.1 farmer: light skin tone
+1F9D1 1F3FC 200D 1F33E                                 ; fully-qualified     # 🧑🏼‍🌾 E12.1 farmer: medium-light skin tone
+1F9D1 1F3FD 200D 1F33E                                 ; fully-qualified     # 🧑🏽‍🌾 E12.1 farmer: medium skin tone
+1F9D1 1F3FE 200D 1F33E                                 ; fully-qualified     # 🧑🏾‍🌾 E12.1 farmer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F33E                                 ; fully-qualified     # 🧑🏿‍🌾 E12.1 farmer: dark skin tone
+1F468 200D 1F33E                                       ; fully-qualified     # 👨‍🌾 E4.0 man farmer
+1F468 1F3FB 200D 1F33E                                 ; fully-qualified     # 👨🏻‍🌾 E4.0 man farmer: light skin tone
+1F468 1F3FC 200D 1F33E                                 ; fully-qualified     # 👨🏼‍🌾 E4.0 man farmer: medium-light skin tone
+1F468 1F3FD 200D 1F33E                                 ; fully-qualified     # 👨🏽‍🌾 E4.0 man farmer: medium skin tone
+1F468 1F3FE 200D 1F33E                                 ; fully-qualified     # 👨🏾‍🌾 E4.0 man farmer: medium-dark skin tone
+1F468 1F3FF 200D 1F33E                                 ; fully-qualified     # 👨🏿‍🌾 E4.0 man farmer: dark skin tone
+1F469 200D 1F33E                                       ; fully-qualified     # 👩‍🌾 E4.0 woman farmer
+1F469 1F3FB 200D 1F33E                                 ; fully-qualified     # 👩🏻‍🌾 E4.0 woman farmer: light skin tone
+1F469 1F3FC 200D 1F33E                                 ; fully-qualified     # 👩🏼‍🌾 E4.0 woman farmer: medium-light skin tone
+1F469 1F3FD 200D 1F33E                                 ; fully-qualified     # 👩🏽‍🌾 E4.0 woman farmer: medium skin tone
+1F469 1F3FE 200D 1F33E                                 ; fully-qualified     # 👩🏾‍🌾 E4.0 woman farmer: medium-dark skin tone
+1F469 1F3FF 200D 1F33E                                 ; fully-qualified     # 👩🏿‍🌾 E4.0 woman farmer: dark skin tone
+1F9D1 200D 1F373                                       ; fully-qualified     # 🧑‍🍳 E12.1 cook
+1F9D1 1F3FB 200D 1F373                                 ; fully-qualified     # 🧑🏻‍🍳 E12.1 cook: light skin tone
+1F9D1 1F3FC 200D 1F373                                 ; fully-qualified     # 🧑🏼‍🍳 E12.1 cook: medium-light skin tone
+1F9D1 1F3FD 200D 1F373                                 ; fully-qualified     # 🧑🏽‍🍳 E12.1 cook: medium skin tone
+1F9D1 1F3FE 200D 1F373                                 ; fully-qualified     # 🧑🏾‍🍳 E12.1 cook: medium-dark skin tone
+1F9D1 1F3FF 200D 1F373                                 ; fully-qualified     # 🧑🏿‍🍳 E12.1 cook: dark skin tone
+1F468 200D 1F373                                       ; fully-qualified     # 👨‍🍳 E4.0 man cook
+1F468 1F3FB 200D 1F373                                 ; fully-qualified     # 👨🏻‍🍳 E4.0 man cook: light skin tone
+1F468 1F3FC 200D 1F373                                 ; fully-qualified     # 👨🏼‍🍳 E4.0 man cook: medium-light skin tone
+1F468 1F3FD 200D 1F373                                 ; fully-qualified     # 👨🏽‍🍳 E4.0 man cook: medium skin tone
+1F468 1F3FE 200D 1F373                                 ; fully-qualified     # 👨🏾‍🍳 E4.0 man cook: medium-dark skin tone
+1F468 1F3FF 200D 1F373                                 ; fully-qualified     # 👨🏿‍🍳 E4.0 man cook: dark skin tone
+1F469 200D 1F373                                       ; fully-qualified     # 👩‍🍳 E4.0 woman cook
+1F469 1F3FB 200D 1F373                                 ; fully-qualified     # 👩🏻‍🍳 E4.0 woman cook: light skin tone
+1F469 1F3FC 200D 1F373                                 ; fully-qualified     # 👩🏼‍🍳 E4.0 woman cook: medium-light skin tone
+1F469 1F3FD 200D 1F373                                 ; fully-qualified     # 👩🏽‍🍳 E4.0 woman cook: medium skin tone
+1F469 1F3FE 200D 1F373                                 ; fully-qualified     # 👩🏾‍🍳 E4.0 woman cook: medium-dark skin tone
+1F469 1F3FF 200D 1F373                                 ; fully-qualified     # 👩🏿‍🍳 E4.0 woman cook: dark skin tone
+1F9D1 200D 1F527                                       ; fully-qualified     # 🧑‍🔧 E12.1 mechanic
+1F9D1 1F3FB 200D 1F527                                 ; fully-qualified     # 🧑🏻‍🔧 E12.1 mechanic: light skin tone
+1F9D1 1F3FC 200D 1F527                                 ; fully-qualified     # 🧑🏼‍🔧 E12.1 mechanic: medium-light skin tone
+1F9D1 1F3FD 200D 1F527                                 ; fully-qualified     # 🧑🏽‍🔧 E12.1 mechanic: medium skin tone
+1F9D1 1F3FE 200D 1F527                                 ; fully-qualified     # 🧑🏾‍🔧 E12.1 mechanic: medium-dark skin tone
+1F9D1 1F3FF 200D 1F527                                 ; fully-qualified     # 🧑🏿‍🔧 E12.1 mechanic: dark skin tone
+1F468 200D 1F527                                       ; fully-qualified     # 👨‍🔧 E4.0 man mechanic
+1F468 1F3FB 200D 1F527                                 ; fully-qualified     # 👨🏻‍🔧 E4.0 man mechanic: light skin tone
+1F468 1F3FC 200D 1F527                                 ; fully-qualified     # 👨🏼‍🔧 E4.0 man mechanic: medium-light skin tone
+1F468 1F3FD 200D 1F527                                 ; fully-qualified     # 👨🏽‍🔧 E4.0 man mechanic: medium skin tone
+1F468 1F3FE 200D 1F527                                 ; fully-qualified     # 👨🏾‍🔧 E4.0 man mechanic: medium-dark skin tone
+1F468 1F3FF 200D 1F527                                 ; fully-qualified     # 👨🏿‍🔧 E4.0 man mechanic: dark skin tone
+1F469 200D 1F527                                       ; fully-qualified     # 👩‍🔧 E4.0 woman mechanic
+1F469 1F3FB 200D 1F527                                 ; fully-qualified     # 👩🏻‍🔧 E4.0 woman mechanic: light skin tone
+1F469 1F3FC 200D 1F527                                 ; fully-qualified     # 👩🏼‍🔧 E4.0 woman mechanic: medium-light skin tone
+1F469 1F3FD 200D 1F527                                 ; fully-qualified     # 👩🏽‍🔧 E4.0 woman mechanic: medium skin tone
+1F469 1F3FE 200D 1F527                                 ; fully-qualified     # 👩🏾‍🔧 E4.0 woman mechanic: medium-dark skin tone
+1F469 1F3FF 200D 1F527                                 ; fully-qualified     # 👩🏿‍🔧 E4.0 woman mechanic: dark skin tone
+1F9D1 200D 1F3ED                                       ; fully-qualified     # 🧑‍🏭 E12.1 factory worker
+1F9D1 1F3FB 200D 1F3ED                                 ; fully-qualified     # 🧑🏻‍🏭 E12.1 factory worker: light skin tone
+1F9D1 1F3FC 200D 1F3ED                                 ; fully-qualified     # 🧑🏼‍🏭 E12.1 factory worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F3ED                                 ; fully-qualified     # 🧑🏽‍🏭 E12.1 factory worker: medium skin tone
+1F9D1 1F3FE 200D 1F3ED                                 ; fully-qualified     # 🧑🏾‍🏭 E12.1 factory worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3ED                                 ; fully-qualified     # 🧑🏿‍🏭 E12.1 factory worker: dark skin tone
+1F468 200D 1F3ED                                       ; fully-qualified     # 👨‍🏭 E4.0 man factory worker
+1F468 1F3FB 200D 1F3ED                                 ; fully-qualified     # 👨🏻‍🏭 E4.0 man factory worker: light skin tone
+1F468 1F3FC 200D 1F3ED                                 ; fully-qualified     # 👨🏼‍🏭 E4.0 man factory worker: medium-light skin tone
+1F468 1F3FD 200D 1F3ED                                 ; fully-qualified     # 👨🏽‍🏭 E4.0 man factory worker: medium skin tone
+1F468 1F3FE 200D 1F3ED                                 ; fully-qualified     # 👨🏾‍🏭 E4.0 man factory worker: medium-dark skin tone
+1F468 1F3FF 200D 1F3ED                                 ; fully-qualified     # 👨🏿‍🏭 E4.0 man factory worker: dark skin tone
+1F469 200D 1F3ED                                       ; fully-qualified     # 👩‍🏭 E4.0 woman factory worker
+1F469 1F3FB 200D 1F3ED                                 ; fully-qualified     # 👩🏻‍🏭 E4.0 woman factory worker: light skin tone
+1F469 1F3FC 200D 1F3ED                                 ; fully-qualified     # 👩🏼‍🏭 E4.0 woman factory worker: medium-light skin tone
+1F469 1F3FD 200D 1F3ED                                 ; fully-qualified     # 👩🏽‍🏭 E4.0 woman factory worker: medium skin tone
+1F469 1F3FE 200D 1F3ED                                 ; fully-qualified     # 👩🏾‍🏭 E4.0 woman factory worker: medium-dark skin tone
+1F469 1F3FF 200D 1F3ED                                 ; fully-qualified     # 👩🏿‍🏭 E4.0 woman factory worker: dark skin tone
+1F9D1 200D 1F4BC                                       ; fully-qualified     # 🧑‍💼 E12.1 office worker
+1F9D1 1F3FB 200D 1F4BC                                 ; fully-qualified     # 🧑🏻‍💼 E12.1 office worker: light skin tone
+1F9D1 1F3FC 200D 1F4BC                                 ; fully-qualified     # 🧑🏼‍💼 E12.1 office worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BC                                 ; fully-qualified     # 🧑🏽‍💼 E12.1 office worker: medium skin tone
+1F9D1 1F3FE 200D 1F4BC                                 ; fully-qualified     # 🧑🏾‍💼 E12.1 office worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BC                                 ; fully-qualified     # 🧑🏿‍💼 E12.1 office worker: dark skin tone
+1F468 200D 1F4BC                                       ; fully-qualified     # 👨‍💼 E4.0 man office worker
+1F468 1F3FB 200D 1F4BC                                 ; fully-qualified     # 👨🏻‍💼 E4.0 man office worker: light skin tone
+1F468 1F3FC 200D 1F4BC                                 ; fully-qualified     # 👨🏼‍💼 E4.0 man office worker: medium-light skin tone
+1F468 1F3FD 200D 1F4BC                                 ; fully-qualified     # 👨🏽‍💼 E4.0 man office worker: medium skin tone
+1F468 1F3FE 200D 1F4BC                                 ; fully-qualified     # 👨🏾‍💼 E4.0 man office worker: medium-dark skin tone
+1F468 1F3FF 200D 1F4BC                                 ; fully-qualified     # 👨🏿‍💼 E4.0 man office worker: dark skin tone
+1F469 200D 1F4BC                                       ; fully-qualified     # 👩‍💼 E4.0 woman office worker
+1F469 1F3FB 200D 1F4BC                                 ; fully-qualified     # 👩🏻‍💼 E4.0 woman office worker: light skin tone
+1F469 1F3FC 200D 1F4BC                                 ; fully-qualified     # 👩🏼‍💼 E4.0 woman office worker: medium-light skin tone
+1F469 1F3FD 200D 1F4BC                                 ; fully-qualified     # 👩🏽‍💼 E4.0 woman office worker: medium skin tone
+1F469 1F3FE 200D 1F4BC                                 ; fully-qualified     # 👩🏾‍💼 E4.0 woman office worker: medium-dark skin tone
+1F469 1F3FF 200D 1F4BC                                 ; fully-qualified     # 👩🏿‍💼 E4.0 woman office worker: dark skin tone
+1F9D1 200D 1F52C                                       ; fully-qualified     # 🧑‍🔬 E12.1 scientist
+1F9D1 1F3FB 200D 1F52C                                 ; fully-qualified     # 🧑🏻‍🔬 E12.1 scientist: light skin tone
+1F9D1 1F3FC 200D 1F52C                                 ; fully-qualified     # 🧑🏼‍🔬 E12.1 scientist: medium-light skin tone
+1F9D1 1F3FD 200D 1F52C                                 ; fully-qualified     # 🧑🏽‍🔬 E12.1 scientist: medium skin tone
+1F9D1 1F3FE 200D 1F52C                                 ; fully-qualified     # 🧑🏾‍🔬 E12.1 scientist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F52C                                 ; fully-qualified     # 🧑🏿‍🔬 E12.1 scientist: dark skin tone
+1F468 200D 1F52C                                       ; fully-qualified     # 👨‍🔬 E4.0 man scientist
+1F468 1F3FB 200D 1F52C                                 ; fully-qualified     # 👨🏻‍🔬 E4.0 man scientist: light skin tone
+1F468 1F3FC 200D 1F52C                                 ; fully-qualified     # 👨🏼‍🔬 E4.0 man scientist: medium-light skin tone
+1F468 1F3FD 200D 1F52C                                 ; fully-qualified     # 👨🏽‍🔬 E4.0 man scientist: medium skin tone
+1F468 1F3FE 200D 1F52C                                 ; fully-qualified     # 👨🏾‍🔬 E4.0 man scientist: medium-dark skin tone
+1F468 1F3FF 200D 1F52C                                 ; fully-qualified     # 👨🏿‍🔬 E4.0 man scientist: dark skin tone
+1F469 200D 1F52C                                       ; fully-qualified     # 👩‍🔬 E4.0 woman scientist
+1F469 1F3FB 200D 1F52C                                 ; fully-qualified     # 👩🏻‍🔬 E4.0 woman scientist: light skin tone
+1F469 1F3FC 200D 1F52C                                 ; fully-qualified     # 👩🏼‍🔬 E4.0 woman scientist: medium-light skin tone
+1F469 1F3FD 200D 1F52C                                 ; fully-qualified     # 👩🏽‍🔬 E4.0 woman scientist: medium skin tone
+1F469 1F3FE 200D 1F52C                                 ; fully-qualified     # 👩🏾‍🔬 E4.0 woman scientist: medium-dark skin tone
+1F469 1F3FF 200D 1F52C                                 ; fully-qualified     # 👩🏿‍🔬 E4.0 woman scientist: dark skin tone
+1F9D1 200D 1F4BB                                       ; fully-qualified     # 🧑‍💻 E12.1 technologist
+1F9D1 1F3FB 200D 1F4BB                                 ; fully-qualified     # 🧑🏻‍💻 E12.1 technologist: light skin tone
+1F9D1 1F3FC 200D 1F4BB                                 ; fully-qualified     # 🧑🏼‍💻 E12.1 technologist: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BB                                 ; fully-qualified     # 🧑🏽‍💻 E12.1 technologist: medium skin tone
+1F9D1 1F3FE 200D 1F4BB                                 ; fully-qualified     # 🧑🏾‍💻 E12.1 technologist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BB                                 ; fully-qualified     # 🧑🏿‍💻 E12.1 technologist: dark skin tone
+1F468 200D 1F4BB                                       ; fully-qualified     # 👨‍💻 E4.0 man technologist
+1F468 1F3FB 200D 1F4BB                                 ; fully-qualified     # 👨🏻‍💻 E4.0 man technologist: light skin tone
+1F468 1F3FC 200D 1F4BB                                 ; fully-qualified     # 👨🏼‍💻 E4.0 man technologist: medium-light skin tone
+1F468 1F3FD 200D 1F4BB                                 ; fully-qualified     # 👨🏽‍💻 E4.0 man technologist: medium skin tone
+1F468 1F3FE 200D 1F4BB                                 ; fully-qualified     # 👨🏾‍💻 E4.0 man technologist: medium-dark skin tone
+1F468 1F3FF 200D 1F4BB                                 ; fully-qualified     # 👨🏿‍💻 E4.0 man technologist: dark skin tone
+1F469 200D 1F4BB                                       ; fully-qualified     # 👩‍💻 E4.0 woman technologist
+1F469 1F3FB 200D 1F4BB                                 ; fully-qualified     # 👩🏻‍💻 E4.0 woman technologist: light skin tone
+1F469 1F3FC 200D 1F4BB                                 ; fully-qualified     # 👩🏼‍💻 E4.0 woman technologist: medium-light skin tone
+1F469 1F3FD 200D 1F4BB                                 ; fully-qualified     # 👩🏽‍💻 E4.0 woman technologist: medium skin tone
+1F469 1F3FE 200D 1F4BB                                 ; fully-qualified     # 👩🏾‍💻 E4.0 woman technologist: medium-dark skin tone
+1F469 1F3FF 200D 1F4BB                                 ; fully-qualified     # 👩🏿‍💻 E4.0 woman technologist: dark skin tone
+1F9D1 200D 1F3A4                                       ; fully-qualified     # 🧑‍🎤 E12.1 singer
+1F9D1 1F3FB 200D 1F3A4                                 ; fully-qualified     # 🧑🏻‍🎤 E12.1 singer: light skin tone
+1F9D1 1F3FC 200D 1F3A4                                 ; fully-qualified     # 🧑🏼‍🎤 E12.1 singer: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A4                                 ; fully-qualified     # 🧑🏽‍🎤 E12.1 singer: medium skin tone
+1F9D1 1F3FE 200D 1F3A4                                 ; fully-qualified     # 🧑🏾‍🎤 E12.1 singer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A4                                 ; fully-qualified     # 🧑🏿‍🎤 E12.1 singer: dark skin tone
+1F468 200D 1F3A4                                       ; fully-qualified     # 👨‍🎤 E4.0 man singer
+1F468 1F3FB 200D 1F3A4                                 ; fully-qualified     # 👨🏻‍🎤 E4.0 man singer: light skin tone
+1F468 1F3FC 200D 1F3A4                                 ; fully-qualified     # 👨🏼‍🎤 E4.0 man singer: medium-light skin tone
+1F468 1F3FD 200D 1F3A4                                 ; fully-qualified     # 👨🏽‍🎤 E4.0 man singer: medium skin tone
+1F468 1F3FE 200D 1F3A4                                 ; fully-qualified     # 👨🏾‍🎤 E4.0 man singer: medium-dark skin tone
+1F468 1F3FF 200D 1F3A4                                 ; fully-qualified     # 👨🏿‍🎤 E4.0 man singer: dark skin tone
+1F469 200D 1F3A4                                       ; fully-qualified     # 👩‍🎤 E4.0 woman singer
+1F469 1F3FB 200D 1F3A4                                 ; fully-qualified     # 👩🏻‍🎤 E4.0 woman singer: light skin tone
+1F469 1F3FC 200D 1F3A4                                 ; fully-qualified     # 👩🏼‍🎤 E4.0 woman singer: medium-light skin tone
+1F469 1F3FD 200D 1F3A4                                 ; fully-qualified     # 👩🏽‍🎤 E4.0 woman singer: medium skin tone
+1F469 1F3FE 200D 1F3A4                                 ; fully-qualified     # 👩🏾‍🎤 E4.0 woman singer: medium-dark skin tone
+1F469 1F3FF 200D 1F3A4                                 ; fully-qualified     # 👩🏿‍🎤 E4.0 woman singer: dark skin tone
+1F9D1 200D 1F3A8                                       ; fully-qualified     # 🧑‍🎨 E12.1 artist
+1F9D1 1F3FB 200D 1F3A8                                 ; fully-qualified     # 🧑🏻‍🎨 E12.1 artist: light skin tone
+1F9D1 1F3FC 200D 1F3A8                                 ; fully-qualified     # 🧑🏼‍🎨 E12.1 artist: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A8                                 ; fully-qualified     # 🧑🏽‍🎨 E12.1 artist: medium skin tone
+1F9D1 1F3FE 200D 1F3A8                                 ; fully-qualified     # 🧑🏾‍🎨 E12.1 artist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A8                                 ; fully-qualified     # 🧑🏿‍🎨 E12.1 artist: dark skin tone
+1F468 200D 1F3A8                                       ; fully-qualified     # 👨‍🎨 E4.0 man artist
+1F468 1F3FB 200D 1F3A8                                 ; fully-qualified     # 👨🏻‍🎨 E4.0 man artist: light skin tone
+1F468 1F3FC 200D 1F3A8                                 ; fully-qualified     # 👨🏼‍🎨 E4.0 man artist: medium-light skin tone
+1F468 1F3FD 200D 1F3A8                                 ; fully-qualified     # 👨🏽‍🎨 E4.0 man artist: medium skin tone
+1F468 1F3FE 200D 1F3A8                                 ; fully-qualified     # 👨🏾‍🎨 E4.0 man artist: medium-dark skin tone
+1F468 1F3FF 200D 1F3A8                                 ; fully-qualified     # 👨🏿‍🎨 E4.0 man artist: dark skin tone
+1F469 200D 1F3A8                                       ; fully-qualified     # 👩‍🎨 E4.0 woman artist
+1F469 1F3FB 200D 1F3A8                                 ; fully-qualified     # 👩🏻‍🎨 E4.0 woman artist: light skin tone
+1F469 1F3FC 200D 1F3A8                                 ; fully-qualified     # 👩🏼‍🎨 E4.0 woman artist: medium-light skin tone
+1F469 1F3FD 200D 1F3A8                                 ; fully-qualified     # 👩🏽‍🎨 E4.0 woman artist: medium skin tone
+1F469 1F3FE 200D 1F3A8                                 ; fully-qualified     # 👩🏾‍🎨 E4.0 woman artist: medium-dark skin tone
+1F469 1F3FF 200D 1F3A8                                 ; fully-qualified     # 👩🏿‍🎨 E4.0 woman artist: dark skin tone
+1F9D1 200D 2708 FE0F                                   ; fully-qualified     # 🧑‍✈️ E12.1 pilot
+1F9D1 200D 2708                                        ; minimally-qualified # 🧑‍✈ E12.1 pilot
+1F9D1 1F3FB 200D 2708 FE0F                             ; fully-qualified     # 🧑🏻‍✈️ E12.1 pilot: light skin tone
+1F9D1 1F3FB 200D 2708                                  ; minimally-qualified # 🧑🏻‍✈ E12.1 pilot: light skin tone
+1F9D1 1F3FC 200D 2708 FE0F                             ; fully-qualified     # 🧑🏼‍✈️ E12.1 pilot: medium-light skin tone
+1F9D1 1F3FC 200D 2708                                  ; minimally-qualified # 🧑🏼‍✈ E12.1 pilot: medium-light skin tone
+1F9D1 1F3FD 200D 2708 FE0F                             ; fully-qualified     # 🧑🏽‍✈️ E12.1 pilot: medium skin tone
+1F9D1 1F3FD 200D 2708                                  ; minimally-qualified # 🧑🏽‍✈ E12.1 pilot: medium skin tone
+1F9D1 1F3FE 200D 2708 FE0F                             ; fully-qualified     # 🧑🏾‍✈️ E12.1 pilot: medium-dark skin tone
+1F9D1 1F3FE 200D 2708                                  ; minimally-qualified # 🧑🏾‍✈ E12.1 pilot: medium-dark skin tone
+1F9D1 1F3FF 200D 2708 FE0F                             ; fully-qualified     # 🧑🏿‍✈️ E12.1 pilot: dark skin tone
+1F9D1 1F3FF 200D 2708                                  ; minimally-qualified # 🧑🏿‍✈ E12.1 pilot: dark skin tone
+1F468 200D 2708 FE0F                                   ; fully-qualified     # 👨‍✈️ E4.0 man pilot
+1F468 200D 2708                                        ; minimally-qualified # 👨‍✈ E4.0 man pilot
+1F468 1F3FB 200D 2708 FE0F                             ; fully-qualified     # 👨🏻‍✈️ E4.0 man pilot: light skin tone
+1F468 1F3FB 200D 2708                                  ; minimally-qualified # 👨🏻‍✈ E4.0 man pilot: light skin tone
+1F468 1F3FC 200D 2708 FE0F                             ; fully-qualified     # 👨🏼‍✈️ E4.0 man pilot: medium-light skin tone
+1F468 1F3FC 200D 2708                                  ; minimally-qualified # 👨🏼‍✈ E4.0 man pilot: medium-light skin tone
+1F468 1F3FD 200D 2708 FE0F                             ; fully-qualified     # 👨🏽‍✈️ E4.0 man pilot: medium skin tone
+1F468 1F3FD 200D 2708                                  ; minimally-qualified # 👨🏽‍✈ E4.0 man pilot: medium skin tone
+1F468 1F3FE 200D 2708 FE0F                             ; fully-qualified     # 👨🏾‍✈️ E4.0 man pilot: medium-dark skin tone
+1F468 1F3FE 200D 2708                                  ; minimally-qualified # 👨🏾‍✈ E4.0 man pilot: medium-dark skin tone
+1F468 1F3FF 200D 2708 FE0F                             ; fully-qualified     # 👨🏿‍✈️ E4.0 man pilot: dark skin tone
+1F468 1F3FF 200D 2708                                  ; minimally-qualified # 👨🏿‍✈ E4.0 man pilot: dark skin tone
+1F469 200D 2708 FE0F                                   ; fully-qualified     # 👩‍✈️ E4.0 woman pilot
+1F469 200D 2708                                        ; minimally-qualified # 👩‍✈ E4.0 woman pilot
+1F469 1F3FB 200D 2708 FE0F                             ; fully-qualified     # 👩🏻‍✈️ E4.0 woman pilot: light skin tone
+1F469 1F3FB 200D 2708                                  ; minimally-qualified # 👩🏻‍✈ E4.0 woman pilot: light skin tone
+1F469 1F3FC 200D 2708 FE0F                             ; fully-qualified     # 👩🏼‍✈️ E4.0 woman pilot: medium-light skin tone
+1F469 1F3FC 200D 2708                                  ; minimally-qualified # 👩🏼‍✈ E4.0 woman pilot: medium-light skin tone
+1F469 1F3FD 200D 2708 FE0F                             ; fully-qualified     # 👩🏽‍✈️ E4.0 woman pilot: medium skin tone
+1F469 1F3FD 200D 2708                                  ; minimally-qualified # 👩🏽‍✈ E4.0 woman pilot: medium skin tone
+1F469 1F3FE 200D 2708 FE0F                             ; fully-qualified     # 👩🏾‍✈️ E4.0 woman pilot: medium-dark skin tone
+1F469 1F3FE 200D 2708                                  ; minimally-qualified # 👩🏾‍✈ E4.0 woman pilot: medium-dark skin tone
+1F469 1F3FF 200D 2708 FE0F                             ; fully-qualified     # 👩🏿‍✈️ E4.0 woman pilot: dark skin tone
+1F469 1F3FF 200D 2708                                  ; minimally-qualified # 👩🏿‍✈ E4.0 woman pilot: dark skin tone
+1F9D1 200D 1F680                                       ; fully-qualified     # 🧑‍🚀 E12.1 astronaut
+1F9D1 1F3FB 200D 1F680                                 ; fully-qualified     # 🧑🏻‍🚀 E12.1 astronaut: light skin tone
+1F9D1 1F3FC 200D 1F680                                 ; fully-qualified     # 🧑🏼‍🚀 E12.1 astronaut: medium-light skin tone
+1F9D1 1F3FD 200D 1F680                                 ; fully-qualified     # 🧑🏽‍🚀 E12.1 astronaut: medium skin tone
+1F9D1 1F3FE 200D 1F680                                 ; fully-qualified     # 🧑🏾‍🚀 E12.1 astronaut: medium-dark skin tone
+1F9D1 1F3FF 200D 1F680                                 ; fully-qualified     # 🧑🏿‍🚀 E12.1 astronaut: dark skin tone
+1F468 200D 1F680                                       ; fully-qualified     # 👨‍🚀 E4.0 man astronaut
+1F468 1F3FB 200D 1F680                                 ; fully-qualified     # 👨🏻‍🚀 E4.0 man astronaut: light skin tone
+1F468 1F3FC 200D 1F680                                 ; fully-qualified     # 👨🏼‍🚀 E4.0 man astronaut: medium-light skin tone
+1F468 1F3FD 200D 1F680                                 ; fully-qualified     # 👨🏽‍🚀 E4.0 man astronaut: medium skin tone
+1F468 1F3FE 200D 1F680                                 ; fully-qualified     # 👨🏾‍🚀 E4.0 man astronaut: medium-dark skin tone
+1F468 1F3FF 200D 1F680                                 ; fully-qualified     # 👨🏿‍🚀 E4.0 man astronaut: dark skin tone
+1F469 200D 1F680                                       ; fully-qualified     # 👩‍🚀 E4.0 woman astronaut
+1F469 1F3FB 200D 1F680                                 ; fully-qualified     # 👩🏻‍🚀 E4.0 woman astronaut: light skin tone
+1F469 1F3FC 200D 1F680                                 ; fully-qualified     # 👩🏼‍🚀 E4.0 woman astronaut: medium-light skin tone
+1F469 1F3FD 200D 1F680                                 ; fully-qualified     # 👩🏽‍🚀 E4.0 woman astronaut: medium skin tone
+1F469 1F3FE 200D 1F680                                 ; fully-qualified     # 👩🏾‍🚀 E4.0 woman astronaut: medium-dark skin tone
+1F469 1F3FF 200D 1F680                                 ; fully-qualified     # 👩🏿‍🚀 E4.0 woman astronaut: dark skin tone
+1F9D1 200D 1F692                                       ; fully-qualified     # 🧑‍🚒 E12.1 firefighter
+1F9D1 1F3FB 200D 1F692                                 ; fully-qualified     # 🧑🏻‍🚒 E12.1 firefighter: light skin tone
+1F9D1 1F3FC 200D 1F692                                 ; fully-qualified     # 🧑🏼‍🚒 E12.1 firefighter: medium-light skin tone
+1F9D1 1F3FD 200D 1F692                                 ; fully-qualified     # 🧑🏽‍🚒 E12.1 firefighter: medium skin tone
+1F9D1 1F3FE 200D 1F692                                 ; fully-qualified     # 🧑🏾‍🚒 E12.1 firefighter: medium-dark skin tone
+1F9D1 1F3FF 200D 1F692                                 ; fully-qualified     # 🧑🏿‍🚒 E12.1 firefighter: dark skin tone
+1F468 200D 1F692                                       ; fully-qualified     # 👨‍🚒 E4.0 man firefighter
+1F468 1F3FB 200D 1F692                                 ; fully-qualified     # 👨🏻‍🚒 E4.0 man firefighter: light skin tone
+1F468 1F3FC 200D 1F692                                 ; fully-qualified     # 👨🏼‍🚒 E4.0 man firefighter: medium-light skin tone
+1F468 1F3FD 200D 1F692                                 ; fully-qualified     # 👨🏽‍🚒 E4.0 man firefighter: medium skin tone
+1F468 1F3FE 200D 1F692                                 ; fully-qualified     # 👨🏾‍🚒 E4.0 man firefighter: medium-dark skin tone
+1F468 1F3FF 200D 1F692                                 ; fully-qualified     # 👨🏿‍🚒 E4.0 man firefighter: dark skin tone
+1F469 200D 1F692                                       ; fully-qualified     # 👩‍🚒 E4.0 woman firefighter
+1F469 1F3FB 200D 1F692                                 ; fully-qualified     # 👩🏻‍🚒 E4.0 woman firefighter: light skin tone
+1F469 1F3FC 200D 1F692                                 ; fully-qualified     # 👩🏼‍🚒 E4.0 woman firefighter: medium-light skin tone
+1F469 1F3FD 200D 1F692                                 ; fully-qualified     # 👩🏽‍🚒 E4.0 woman firefighter: medium skin tone
+1F469 1F3FE 200D 1F692                                 ; fully-qualified     # 👩🏾‍🚒 E4.0 woman firefighter: medium-dark skin tone
+1F469 1F3FF 200D 1F692                                 ; fully-qualified     # 👩🏿‍🚒 E4.0 woman firefighter: dark skin tone
+1F46E                                                  ; fully-qualified     # 👮 E0.6 police officer
+1F46E 1F3FB                                            ; fully-qualified     # 👮🏻 E1.0 police officer: light skin tone
+1F46E 1F3FC                                            ; fully-qualified     # 👮🏼 E1.0 police officer: medium-light skin tone
+1F46E 1F3FD                                            ; fully-qualified     # 👮🏽 E1.0 police officer: medium skin tone
+1F46E 1F3FE                                            ; fully-qualified     # 👮🏾 E1.0 police officer: medium-dark skin tone
+1F46E 1F3FF                                            ; fully-qualified     # 👮🏿 E1.0 police officer: dark skin tone
+1F46E 200D 2642 FE0F                                   ; fully-qualified     # 👮‍♂️ E4.0 man police officer
+1F46E 200D 2642                                        ; minimally-qualified # 👮‍♂ E4.0 man police officer
+1F46E 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 👮🏻‍♂️ E4.0 man police officer: light skin tone
+1F46E 1F3FB 200D 2642                                  ; minimally-qualified # 👮🏻‍♂ E4.0 man police officer: light skin tone
+1F46E 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 👮🏼‍♂️ E4.0 man police officer: medium-light skin tone
+1F46E 1F3FC 200D 2642                                  ; minimally-qualified # 👮🏼‍♂ E4.0 man police officer: medium-light skin tone
+1F46E 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 👮🏽‍♂️ E4.0 man police officer: medium skin tone
+1F46E 1F3FD 200D 2642                                  ; minimally-qualified # 👮🏽‍♂ E4.0 man police officer: medium skin tone
+1F46E 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 👮🏾‍♂️ E4.0 man police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2642                                  ; minimally-qualified # 👮🏾‍♂ E4.0 man police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 👮🏿‍♂️ E4.0 man police officer: dark skin tone
+1F46E 1F3FF 200D 2642                                  ; minimally-qualified # 👮🏿‍♂ E4.0 man police officer: dark skin tone
+1F46E 200D 2640 FE0F                                   ; fully-qualified     # 👮‍♀️ E4.0 woman police officer
+1F46E 200D 2640                                        ; minimally-qualified # 👮‍♀ E4.0 woman police officer
+1F46E 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 👮🏻‍♀️ E4.0 woman police officer: light skin tone
+1F46E 1F3FB 200D 2640                                  ; minimally-qualified # 👮🏻‍♀ E4.0 woman police officer: light skin tone
+1F46E 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 👮🏼‍♀️ E4.0 woman police officer: medium-light skin tone
+1F46E 1F3FC 200D 2640                                  ; minimally-qualified # 👮🏼‍♀ E4.0 woman police officer: medium-light skin tone
+1F46E 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 👮🏽‍♀️ E4.0 woman police officer: medium skin tone
+1F46E 1F3FD 200D 2640                                  ; minimally-qualified # 👮🏽‍♀ E4.0 woman police officer: medium skin tone
+1F46E 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 👮🏾‍♀️ E4.0 woman police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2640                                  ; minimally-qualified # 👮🏾‍♀ E4.0 woman police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👮🏿‍♀️ E4.0 woman police officer: dark skin tone
+1F46E 1F3FF 200D 2640                                  ; minimally-qualified # 👮🏿‍♀ E4.0 woman police officer: dark skin tone
+1F575 FE0F                                             ; fully-qualified     # 🕵️ E0.7 detective
+1F575                                                  ; unqualified         # 🕵 E0.7 detective
+1F575 1F3FB                                            ; fully-qualified     # 🕵🏻 E2.0 detective: light skin tone
+1F575 1F3FC                                            ; fully-qualified     # 🕵🏼 E2.0 detective: medium-light skin tone
+1F575 1F3FD                                            ; fully-qualified     # 🕵🏽 E2.0 detective: medium skin tone
+1F575 1F3FE                                            ; fully-qualified     # 🕵🏾 E2.0 detective: medium-dark skin tone
+1F575 1F3FF                                            ; fully-qualified     # 🕵🏿 E2.0 detective: dark skin tone
+1F575 FE0F 200D 2642 FE0F                              ; fully-qualified     # 🕵️‍♂️ E4.0 man detective
+1F575 200D 2642 FE0F                                   ; unqualified         # 🕵‍♂️ E4.0 man detective
+1F575 FE0F 200D 2642                                   ; minimally-qualified # 🕵️‍♂ E4.0 man detective
+1F575 200D 2642                                        ; unqualified         # 🕵‍♂ E4.0 man detective
+1F575 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🕵🏻‍♂️ E4.0 man detective: light skin tone
+1F575 1F3FB 200D 2642                                  ; minimally-qualified # 🕵🏻‍♂ E4.0 man detective: light skin tone
+1F575 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🕵🏼‍♂️ E4.0 man detective: medium-light skin tone
+1F575 1F3FC 200D 2642                                  ; minimally-qualified # 🕵🏼‍♂ E4.0 man detective: medium-light skin tone
+1F575 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🕵🏽‍♂️ E4.0 man detective: medium skin tone
+1F575 1F3FD 200D 2642                                  ; minimally-qualified # 🕵🏽‍♂ E4.0 man detective: medium skin tone
+1F575 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🕵🏾‍♂️ E4.0 man detective: medium-dark skin tone
+1F575 1F3FE 200D 2642                                  ; minimally-qualified # 🕵🏾‍♂ E4.0 man detective: medium-dark skin tone
+1F575 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🕵🏿‍♂️ E4.0 man detective: dark skin tone
+1F575 1F3FF 200D 2642                                  ; minimally-qualified # 🕵🏿‍♂ E4.0 man detective: dark skin tone
+1F575 FE0F 200D 2640 FE0F                              ; fully-qualified     # 🕵️‍♀️ E4.0 woman detective
+1F575 200D 2640 FE0F                                   ; unqualified         # 🕵‍♀️ E4.0 woman detective
+1F575 FE0F 200D 2640                                   ; minimally-qualified # 🕵️‍♀ E4.0 woman detective
+1F575 200D 2640                                        ; unqualified         # 🕵‍♀ E4.0 woman detective
+1F575 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🕵🏻‍♀️ E4.0 woman detective: light skin tone
+1F575 1F3FB 200D 2640                                  ; minimally-qualified # 🕵🏻‍♀ E4.0 woman detective: light skin tone
+1F575 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🕵🏼‍♀️ E4.0 woman detective: medium-light skin tone
+1F575 1F3FC 200D 2640                                  ; minimally-qualified # 🕵🏼‍♀ E4.0 woman detective: medium-light skin tone
+1F575 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🕵🏽‍♀️ E4.0 woman detective: medium skin tone
+1F575 1F3FD 200D 2640                                  ; minimally-qualified # 🕵🏽‍♀ E4.0 woman detective: medium skin tone
+1F575 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🕵🏾‍♀️ E4.0 woman detective: medium-dark skin tone
+1F575 1F3FE 200D 2640                                  ; minimally-qualified # 🕵🏾‍♀ E4.0 woman detective: medium-dark skin tone
+1F575 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🕵🏿‍♀️ E4.0 woman detective: dark skin tone
+1F575 1F3FF 200D 2640                                  ; minimally-qualified # 🕵🏿‍♀ E4.0 woman detective: dark skin tone
+1F482                                                  ; fully-qualified     # 💂 E0.6 guard
+1F482 1F3FB                                            ; fully-qualified     # 💂🏻 E1.0 guard: light skin tone
+1F482 1F3FC                                            ; fully-qualified     # 💂🏼 E1.0 guard: medium-light skin tone
+1F482 1F3FD                                            ; fully-qualified     # 💂🏽 E1.0 guard: medium skin tone
+1F482 1F3FE                                            ; fully-qualified     # 💂🏾 E1.0 guard: medium-dark skin tone
+1F482 1F3FF                                            ; fully-qualified     # 💂🏿 E1.0 guard: dark skin tone
+1F482 200D 2642 FE0F                                   ; fully-qualified     # 💂‍♂️ E4.0 man guard
+1F482 200D 2642                                        ; minimally-qualified # 💂‍♂ E4.0 man guard
+1F482 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 💂🏻‍♂️ E4.0 man guard: light skin tone
+1F482 1F3FB 200D 2642                                  ; minimally-qualified # 💂🏻‍♂ E4.0 man guard: light skin tone
+1F482 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 💂🏼‍♂️ E4.0 man guard: medium-light skin tone
+1F482 1F3FC 200D 2642                                  ; minimally-qualified # 💂🏼‍♂ E4.0 man guard: medium-light skin tone
+1F482 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 💂🏽‍♂️ E4.0 man guard: medium skin tone
+1F482 1F3FD 200D 2642                                  ; minimally-qualified # 💂🏽‍♂ E4.0 man guard: medium skin tone
+1F482 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 💂🏾‍♂️ E4.0 man guard: medium-dark skin tone
+1F482 1F3FE 200D 2642                                  ; minimally-qualified # 💂🏾‍♂ E4.0 man guard: medium-dark skin tone
+1F482 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 💂🏿‍♂️ E4.0 man guard: dark skin tone
+1F482 1F3FF 200D 2642                                  ; minimally-qualified # 💂🏿‍♂ E4.0 man guard: dark skin tone
+1F482 200D 2640 FE0F                                   ; fully-qualified     # 💂‍♀️ E4.0 woman guard
+1F482 200D 2640                                        ; minimally-qualified # 💂‍♀ E4.0 woman guard
+1F482 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 💂🏻‍♀️ E4.0 woman guard: light skin tone
+1F482 1F3FB 200D 2640                                  ; minimally-qualified # 💂🏻‍♀ E4.0 woman guard: light skin tone
+1F482 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 💂🏼‍♀️ E4.0 woman guard: medium-light skin tone
+1F482 1F3FC 200D 2640                                  ; minimally-qualified # 💂🏼‍♀ E4.0 woman guard: medium-light skin tone
+1F482 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 💂🏽‍♀️ E4.0 woman guard: medium skin tone
+1F482 1F3FD 200D 2640                                  ; minimally-qualified # 💂🏽‍♀ E4.0 woman guard: medium skin tone
+1F482 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 💂🏾‍♀️ E4.0 woman guard: medium-dark skin tone
+1F482 1F3FE 200D 2640                                  ; minimally-qualified # 💂🏾‍♀ E4.0 woman guard: medium-dark skin tone
+1F482 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 💂🏿‍♀️ E4.0 woman guard: dark skin tone
+1F482 1F3FF 200D 2640                                  ; minimally-qualified # 💂🏿‍♀ E4.0 woman guard: dark skin tone
+1F977                                                  ; fully-qualified     # 🥷 E13.0 ninja
+1F977 1F3FB                                            ; fully-qualified     # 🥷🏻 E13.0 ninja: light skin tone
+1F977 1F3FC                                            ; fully-qualified     # 🥷🏼 E13.0 ninja: medium-light skin tone
+1F977 1F3FD                                            ; fully-qualified     # 🥷🏽 E13.0 ninja: medium skin tone
+1F977 1F3FE                                            ; fully-qualified     # 🥷🏾 E13.0 ninja: medium-dark skin tone
+1F977 1F3FF                                            ; fully-qualified     # 🥷🏿 E13.0 ninja: dark skin tone
+1F477                                                  ; fully-qualified     # 👷 E0.6 construction worker
+1F477 1F3FB                                            ; fully-qualified     # 👷🏻 E1.0 construction worker: light skin tone
+1F477 1F3FC                                            ; fully-qualified     # 👷🏼 E1.0 construction worker: medium-light skin tone
+1F477 1F3FD                                            ; fully-qualified     # 👷🏽 E1.0 construction worker: medium skin tone
+1F477 1F3FE                                            ; fully-qualified     # 👷🏾 E1.0 construction worker: medium-dark skin tone
+1F477 1F3FF                                            ; fully-qualified     # 👷🏿 E1.0 construction worker: dark skin tone
+1F477 200D 2642 FE0F                                   ; fully-qualified     # 👷‍♂️ E4.0 man construction worker
+1F477 200D 2642                                        ; minimally-qualified # 👷‍♂ E4.0 man construction worker
+1F477 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 👷🏻‍♂️ E4.0 man construction worker: light skin tone
+1F477 1F3FB 200D 2642                                  ; minimally-qualified # 👷🏻‍♂ E4.0 man construction worker: light skin tone
+1F477 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 👷🏼‍♂️ E4.0 man construction worker: medium-light skin tone
+1F477 1F3FC 200D 2642                                  ; minimally-qualified # 👷🏼‍♂ E4.0 man construction worker: medium-light skin tone
+1F477 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 👷🏽‍♂️ E4.0 man construction worker: medium skin tone
+1F477 1F3FD 200D 2642                                  ; minimally-qualified # 👷🏽‍♂ E4.0 man construction worker: medium skin tone
+1F477 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 👷🏾‍♂️ E4.0 man construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2642                                  ; minimally-qualified # 👷🏾‍♂ E4.0 man construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 👷🏿‍♂️ E4.0 man construction worker: dark skin tone
+1F477 1F3FF 200D 2642                                  ; minimally-qualified # 👷🏿‍♂ E4.0 man construction worker: dark skin tone
+1F477 200D 2640 FE0F                                   ; fully-qualified     # 👷‍♀️ E4.0 woman construction worker
+1F477 200D 2640                                        ; minimally-qualified # 👷‍♀ E4.0 woman construction worker
+1F477 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 👷🏻‍♀️ E4.0 woman construction worker: light skin tone
+1F477 1F3FB 200D 2640                                  ; minimally-qualified # 👷🏻‍♀ E4.0 woman construction worker: light skin tone
+1F477 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 👷🏼‍♀️ E4.0 woman construction worker: medium-light skin tone
+1F477 1F3FC 200D 2640                                  ; minimally-qualified # 👷🏼‍♀ E4.0 woman construction worker: medium-light skin tone
+1F477 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 👷🏽‍♀️ E4.0 woman construction worker: medium skin tone
+1F477 1F3FD 200D 2640                                  ; minimally-qualified # 👷🏽‍♀ E4.0 woman construction worker: medium skin tone
+1F477 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 👷🏾‍♀️ E4.0 woman construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2640                                  ; minimally-qualified # 👷🏾‍♀ E4.0 woman construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👷🏿‍♀️ E4.0 woman construction worker: dark skin tone
+1F477 1F3FF 200D 2640                                  ; minimally-qualified # 👷🏿‍♀ E4.0 woman construction worker: dark skin tone
+1FAC5                                                  ; fully-qualified     # 🫅 E14.0 person with crown
+1FAC5 1F3FB                                            ; fully-qualified     # 🫅🏻 E14.0 person with crown: light skin tone
+1FAC5 1F3FC                                            ; fully-qualified     # 🫅🏼 E14.0 person with crown: medium-light skin tone
+1FAC5 1F3FD                                            ; fully-qualified     # 🫅🏽 E14.0 person with crown: medium skin tone
+1FAC5 1F3FE                                            ; fully-qualified     # 🫅🏾 E14.0 person with crown: medium-dark skin tone
+1FAC5 1F3FF                                            ; fully-qualified     # 🫅🏿 E14.0 person with crown: dark skin tone
+1F934                                                  ; fully-qualified     # 🤴 E3.0 prince
+1F934 1F3FB                                            ; fully-qualified     # 🤴🏻 E3.0 prince: light skin tone
+1F934 1F3FC                                            ; fully-qualified     # 🤴🏼 E3.0 prince: medium-light skin tone
+1F934 1F3FD                                            ; fully-qualified     # 🤴🏽 E3.0 prince: medium skin tone
+1F934 1F3FE                                            ; fully-qualified     # 🤴🏾 E3.0 prince: medium-dark skin tone
+1F934 1F3FF                                            ; fully-qualified     # 🤴🏿 E3.0 prince: dark skin tone
+1F478                                                  ; fully-qualified     # 👸 E0.6 princess
+1F478 1F3FB                                            ; fully-qualified     # 👸🏻 E1.0 princess: light skin tone
+1F478 1F3FC                                            ; fully-qualified     # 👸🏼 E1.0 princess: medium-light skin tone
+1F478 1F3FD                                            ; fully-qualified     # 👸🏽 E1.0 princess: medium skin tone
+1F478 1F3FE                                            ; fully-qualified     # 👸🏾 E1.0 princess: medium-dark skin tone
+1F478 1F3FF                                            ; fully-qualified     # 👸🏿 E1.0 princess: dark skin tone
+1F473                                                  ; fully-qualified     # 👳 E0.6 person wearing turban
+1F473 1F3FB                                            ; fully-qualified     # 👳🏻 E1.0 person wearing turban: light skin tone
+1F473 1F3FC                                            ; fully-qualified     # 👳🏼 E1.0 person wearing turban: medium-light skin tone
+1F473 1F3FD                                            ; fully-qualified     # 👳🏽 E1.0 person wearing turban: medium skin tone
+1F473 1F3FE                                            ; fully-qualified     # 👳🏾 E1.0 person wearing turban: medium-dark skin tone
+1F473 1F3FF                                            ; fully-qualified     # 👳🏿 E1.0 person wearing turban: dark skin tone
+1F473 200D 2642 FE0F                                   ; fully-qualified     # 👳‍♂️ E4.0 man wearing turban
+1F473 200D 2642                                        ; minimally-qualified # 👳‍♂ E4.0 man wearing turban
+1F473 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 👳🏻‍♂️ E4.0 man wearing turban: light skin tone
+1F473 1F3FB 200D 2642                                  ; minimally-qualified # 👳🏻‍♂ E4.0 man wearing turban: light skin tone
+1F473 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 👳🏼‍♂️ E4.0 man wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2642                                  ; minimally-qualified # 👳🏼‍♂ E4.0 man wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 👳🏽‍♂️ E4.0 man wearing turban: medium skin tone
+1F473 1F3FD 200D 2642                                  ; minimally-qualified # 👳🏽‍♂ E4.0 man wearing turban: medium skin tone
+1F473 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 👳🏾‍♂️ E4.0 man wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2642                                  ; minimally-qualified # 👳🏾‍♂ E4.0 man wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 👳🏿‍♂️ E4.0 man wearing turban: dark skin tone
+1F473 1F3FF 200D 2642                                  ; minimally-qualified # 👳🏿‍♂ E4.0 man wearing turban: dark skin tone
+1F473 200D 2640 FE0F                                   ; fully-qualified     # 👳‍♀️ E4.0 woman wearing turban
+1F473 200D 2640                                        ; minimally-qualified # 👳‍♀ E4.0 woman wearing turban
+1F473 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 👳🏻‍♀️ E4.0 woman wearing turban: light skin tone
+1F473 1F3FB 200D 2640                                  ; minimally-qualified # 👳🏻‍♀ E4.0 woman wearing turban: light skin tone
+1F473 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 👳🏼‍♀️ E4.0 woman wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2640                                  ; minimally-qualified # 👳🏼‍♀ E4.0 woman wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 👳🏽‍♀️ E4.0 woman wearing turban: medium skin tone
+1F473 1F3FD 200D 2640                                  ; minimally-qualified # 👳🏽‍♀ E4.0 woman wearing turban: medium skin tone
+1F473 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 👳🏾‍♀️ E4.0 woman wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2640                                  ; minimally-qualified # 👳🏾‍♀ E4.0 woman wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👳🏿‍♀️ E4.0 woman wearing turban: dark skin tone
+1F473 1F3FF 200D 2640                                  ; minimally-qualified # 👳🏿‍♀ E4.0 woman wearing turban: dark skin tone
+1F472                                                  ; fully-qualified     # 👲 E0.6 person with skullcap
+1F472 1F3FB                                            ; fully-qualified     # 👲🏻 E1.0 person with skullcap: light skin tone
+1F472 1F3FC                                            ; fully-qualified     # 👲🏼 E1.0 person with skullcap: medium-light skin tone
+1F472 1F3FD                                            ; fully-qualified     # 👲🏽 E1.0 person with skullcap: medium skin tone
+1F472 1F3FE                                            ; fully-qualified     # 👲🏾 E1.0 person with skullcap: medium-dark skin tone
+1F472 1F3FF                                            ; fully-qualified     # 👲🏿 E1.0 person with skullcap: dark skin tone
+1F9D5                                                  ; fully-qualified     # 🧕 E5.0 woman with headscarf
+1F9D5 1F3FB                                            ; fully-qualified     # 🧕🏻 E5.0 woman with headscarf: light skin tone
+1F9D5 1F3FC                                            ; fully-qualified     # 🧕🏼 E5.0 woman with headscarf: medium-light skin tone
+1F9D5 1F3FD                                            ; fully-qualified     # 🧕🏽 E5.0 woman with headscarf: medium skin tone
+1F9D5 1F3FE                                            ; fully-qualified     # 🧕🏾 E5.0 woman with headscarf: medium-dark skin tone
+1F9D5 1F3FF                                            ; fully-qualified     # 🧕🏿 E5.0 woman with headscarf: dark skin tone
+1F935                                                  ; fully-qualified     # 🤵 E3.0 person in tuxedo
+1F935 1F3FB                                            ; fully-qualified     # 🤵🏻 E3.0 person in tuxedo: light skin tone
+1F935 1F3FC                                            ; fully-qualified     # 🤵🏼 E3.0 person in tuxedo: medium-light skin tone
+1F935 1F3FD                                            ; fully-qualified     # 🤵🏽 E3.0 person in tuxedo: medium skin tone
+1F935 1F3FE                                            ; fully-qualified     # 🤵🏾 E3.0 person in tuxedo: medium-dark skin tone
+1F935 1F3FF                                            ; fully-qualified     # 🤵🏿 E3.0 person in tuxedo: dark skin tone
+1F935 200D 2642 FE0F                                   ; fully-qualified     # 🤵‍♂️ E13.0 man in tuxedo
+1F935 200D 2642                                        ; minimally-qualified # 🤵‍♂ E13.0 man in tuxedo
+1F935 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤵🏻‍♂️ E13.0 man in tuxedo: light skin tone
+1F935 1F3FB 200D 2642                                  ; minimally-qualified # 🤵🏻‍♂ E13.0 man in tuxedo: light skin tone
+1F935 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤵🏼‍♂️ E13.0 man in tuxedo: medium-light skin tone
+1F935 1F3FC 200D 2642                                  ; minimally-qualified # 🤵🏼‍♂ E13.0 man in tuxedo: medium-light skin tone
+1F935 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤵🏽‍♂️ E13.0 man in tuxedo: medium skin tone
+1F935 1F3FD 200D 2642                                  ; minimally-qualified # 🤵🏽‍♂ E13.0 man in tuxedo: medium skin tone
+1F935 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤵🏾‍♂️ E13.0 man in tuxedo: medium-dark skin tone
+1F935 1F3FE 200D 2642                                  ; minimally-qualified # 🤵🏾‍♂ E13.0 man in tuxedo: medium-dark skin tone
+1F935 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤵🏿‍♂️ E13.0 man in tuxedo: dark skin tone
+1F935 1F3FF 200D 2642                                  ; minimally-qualified # 🤵🏿‍♂ E13.0 man in tuxedo: dark skin tone
+1F935 200D 2640 FE0F                                   ; fully-qualified     # 🤵‍♀️ E13.0 woman in tuxedo
+1F935 200D 2640                                        ; minimally-qualified # 🤵‍♀ E13.0 woman in tuxedo
+1F935 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤵🏻‍♀️ E13.0 woman in tuxedo: light skin tone
+1F935 1F3FB 200D 2640                                  ; minimally-qualified # 🤵🏻‍♀ E13.0 woman in tuxedo: light skin tone
+1F935 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤵🏼‍♀️ E13.0 woman in tuxedo: medium-light skin tone
+1F935 1F3FC 200D 2640                                  ; minimally-qualified # 🤵🏼‍♀ E13.0 woman in tuxedo: medium-light skin tone
+1F935 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤵🏽‍♀️ E13.0 woman in tuxedo: medium skin tone
+1F935 1F3FD 200D 2640                                  ; minimally-qualified # 🤵🏽‍♀ E13.0 woman in tuxedo: medium skin tone
+1F935 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤵🏾‍♀️ E13.0 woman in tuxedo: medium-dark skin tone
+1F935 1F3FE 200D 2640                                  ; minimally-qualified # 🤵🏾‍♀ E13.0 woman in tuxedo: medium-dark skin tone
+1F935 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤵🏿‍♀️ E13.0 woman in tuxedo: dark skin tone
+1F935 1F3FF 200D 2640                                  ; minimally-qualified # 🤵🏿‍♀ E13.0 woman in tuxedo: dark skin tone
+1F470                                                  ; fully-qualified     # 👰 E0.6 person with veil
+1F470 1F3FB                                            ; fully-qualified     # 👰🏻 E1.0 person with veil: light skin tone
+1F470 1F3FC                                            ; fully-qualified     # 👰🏼 E1.0 person with veil: medium-light skin tone
+1F470 1F3FD                                            ; fully-qualified     # 👰🏽 E1.0 person with veil: medium skin tone
+1F470 1F3FE                                            ; fully-qualified     # 👰🏾 E1.0 person with veil: medium-dark skin tone
+1F470 1F3FF                                            ; fully-qualified     # 👰🏿 E1.0 person with veil: dark skin tone
+1F470 200D 2642 FE0F                                   ; fully-qualified     # 👰‍♂️ E13.0 man with veil
+1F470 200D 2642                                        ; minimally-qualified # 👰‍♂ E13.0 man with veil
+1F470 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 👰🏻‍♂️ E13.0 man with veil: light skin tone
+1F470 1F3FB 200D 2642                                  ; minimally-qualified # 👰🏻‍♂ E13.0 man with veil: light skin tone
+1F470 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 👰🏼‍♂️ E13.0 man with veil: medium-light skin tone
+1F470 1F3FC 200D 2642                                  ; minimally-qualified # 👰🏼‍♂ E13.0 man with veil: medium-light skin tone
+1F470 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 👰🏽‍♂️ E13.0 man with veil: medium skin tone
+1F470 1F3FD 200D 2642                                  ; minimally-qualified # 👰🏽‍♂ E13.0 man with veil: medium skin tone
+1F470 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 👰🏾‍♂️ E13.0 man with veil: medium-dark skin tone
+1F470 1F3FE 200D 2642                                  ; minimally-qualified # 👰🏾‍♂ E13.0 man with veil: medium-dark skin tone
+1F470 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 👰🏿‍♂️ E13.0 man with veil: dark skin tone
+1F470 1F3FF 200D 2642                                  ; minimally-qualified # 👰🏿‍♂ E13.0 man with veil: dark skin tone
+1F470 200D 2640 FE0F                                   ; fully-qualified     # 👰‍♀️ E13.0 woman with veil
+1F470 200D 2640                                        ; minimally-qualified # 👰‍♀ E13.0 woman with veil
+1F470 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 👰🏻‍♀️ E13.0 woman with veil: light skin tone
+1F470 1F3FB 200D 2640                                  ; minimally-qualified # 👰🏻‍♀ E13.0 woman with veil: light skin tone
+1F470 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 👰🏼‍♀️ E13.0 woman with veil: medium-light skin tone
+1F470 1F3FC 200D 2640                                  ; minimally-qualified # 👰🏼‍♀ E13.0 woman with veil: medium-light skin tone
+1F470 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 👰🏽‍♀️ E13.0 woman with veil: medium skin tone
+1F470 1F3FD 200D 2640                                  ; minimally-qualified # 👰🏽‍♀ E13.0 woman with veil: medium skin tone
+1F470 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 👰🏾‍♀️ E13.0 woman with veil: medium-dark skin tone
+1F470 1F3FE 200D 2640                                  ; minimally-qualified # 👰🏾‍♀ E13.0 woman with veil: medium-dark skin tone
+1F470 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👰🏿‍♀️ E13.0 woman with veil: dark skin tone
+1F470 1F3FF 200D 2640                                  ; minimally-qualified # 👰🏿‍♀ E13.0 woman with veil: dark skin tone
+1F930                                                  ; fully-qualified     # 🤰 E3.0 pregnant woman
+1F930 1F3FB                                            ; fully-qualified     # 🤰🏻 E3.0 pregnant woman: light skin tone
+1F930 1F3FC                                            ; fully-qualified     # 🤰🏼 E3.0 pregnant woman: medium-light skin tone
+1F930 1F3FD                                            ; fully-qualified     # 🤰🏽 E3.0 pregnant woman: medium skin tone
+1F930 1F3FE                                            ; fully-qualified     # 🤰🏾 E3.0 pregnant woman: medium-dark skin tone
+1F930 1F3FF                                            ; fully-qualified     # 🤰🏿 E3.0 pregnant woman: dark skin tone
+1FAC3                                                  ; fully-qualified     # 🫃 E14.0 pregnant man
+1FAC3 1F3FB                                            ; fully-qualified     # 🫃🏻 E14.0 pregnant man: light skin tone
+1FAC3 1F3FC                                            ; fully-qualified     # 🫃🏼 E14.0 pregnant man: medium-light skin tone
+1FAC3 1F3FD                                            ; fully-qualified     # 🫃🏽 E14.0 pregnant man: medium skin tone
+1FAC3 1F3FE                                            ; fully-qualified     # 🫃🏾 E14.0 pregnant man: medium-dark skin tone
+1FAC3 1F3FF                                            ; fully-qualified     # 🫃🏿 E14.0 pregnant man: dark skin tone
+1FAC4                                                  ; fully-qualified     # 🫄 E14.0 pregnant person
+1FAC4 1F3FB                                            ; fully-qualified     # 🫄🏻 E14.0 pregnant person: light skin tone
+1FAC4 1F3FC                                            ; fully-qualified     # 🫄🏼 E14.0 pregnant person: medium-light skin tone
+1FAC4 1F3FD                                            ; fully-qualified     # 🫄🏽 E14.0 pregnant person: medium skin tone
+1FAC4 1F3FE                                            ; fully-qualified     # 🫄🏾 E14.0 pregnant person: medium-dark skin tone
+1FAC4 1F3FF                                            ; fully-qualified     # 🫄🏿 E14.0 pregnant person: dark skin tone
+1F931                                                  ; fully-qualified     # 🤱 E5.0 breast-feeding
+1F931 1F3FB                                            ; fully-qualified     # 🤱🏻 E5.0 breast-feeding: light skin tone
+1F931 1F3FC                                            ; fully-qualified     # 🤱🏼 E5.0 breast-feeding: medium-light skin tone
+1F931 1F3FD                                            ; fully-qualified     # 🤱🏽 E5.0 breast-feeding: medium skin tone
+1F931 1F3FE                                            ; fully-qualified     # 🤱🏾 E5.0 breast-feeding: medium-dark skin tone
+1F931 1F3FF                                            ; fully-qualified     # 🤱🏿 E5.0 breast-feeding: dark skin tone
+1F469 200D 1F37C                                       ; fully-qualified     # 👩‍🍼 E13.0 woman feeding baby
+1F469 1F3FB 200D 1F37C                                 ; fully-qualified     # 👩🏻‍🍼 E13.0 woman feeding baby: light skin tone
+1F469 1F3FC 200D 1F37C                                 ; fully-qualified     # 👩🏼‍🍼 E13.0 woman feeding baby: medium-light skin tone
+1F469 1F3FD 200D 1F37C                                 ; fully-qualified     # 👩🏽‍🍼 E13.0 woman feeding baby: medium skin tone
+1F469 1F3FE 200D 1F37C                                 ; fully-qualified     # 👩🏾‍🍼 E13.0 woman feeding baby: medium-dark skin tone
+1F469 1F3FF 200D 1F37C                                 ; fully-qualified     # 👩🏿‍🍼 E13.0 woman feeding baby: dark skin tone
+1F468 200D 1F37C                                       ; fully-qualified     # 👨‍🍼 E13.0 man feeding baby
+1F468 1F3FB 200D 1F37C                                 ; fully-qualified     # 👨🏻‍🍼 E13.0 man feeding baby: light skin tone
+1F468 1F3FC 200D 1F37C                                 ; fully-qualified     # 👨🏼‍🍼 E13.0 man feeding baby: medium-light skin tone
+1F468 1F3FD 200D 1F37C                                 ; fully-qualified     # 👨🏽‍🍼 E13.0 man feeding baby: medium skin tone
+1F468 1F3FE 200D 1F37C                                 ; fully-qualified     # 👨🏾‍🍼 E13.0 man feeding baby: medium-dark skin tone
+1F468 1F3FF 200D 1F37C                                 ; fully-qualified     # 👨🏿‍🍼 E13.0 man feeding baby: dark skin tone
+1F9D1 200D 1F37C                                       ; fully-qualified     # 🧑‍🍼 E13.0 person feeding baby
+1F9D1 1F3FB 200D 1F37C                                 ; fully-qualified     # 🧑🏻‍🍼 E13.0 person feeding baby: light skin tone
+1F9D1 1F3FC 200D 1F37C                                 ; fully-qualified     # 🧑🏼‍🍼 E13.0 person feeding baby: medium-light skin tone
+1F9D1 1F3FD 200D 1F37C                                 ; fully-qualified     # 🧑🏽‍🍼 E13.0 person feeding baby: medium skin tone
+1F9D1 1F3FE 200D 1F37C                                 ; fully-qualified     # 🧑🏾‍🍼 E13.0 person feeding baby: medium-dark skin tone
+1F9D1 1F3FF 200D 1F37C                                 ; fully-qualified     # 🧑🏿‍🍼 E13.0 person feeding baby: dark skin tone
+
+# subgroup: person-fantasy
+1F47C                                                  ; fully-qualified     # 👼 E0.6 baby angel
+1F47C 1F3FB                                            ; fully-qualified     # 👼🏻 E1.0 baby angel: light skin tone
+1F47C 1F3FC                                            ; fully-qualified     # 👼🏼 E1.0 baby angel: medium-light skin tone
+1F47C 1F3FD                                            ; fully-qualified     # 👼🏽 E1.0 baby angel: medium skin tone
+1F47C 1F3FE                                            ; fully-qualified     # 👼🏾 E1.0 baby angel: medium-dark skin tone
+1F47C 1F3FF                                            ; fully-qualified     # 👼🏿 E1.0 baby angel: dark skin tone
+1F385                                                  ; fully-qualified     # 🎅 E0.6 Santa Claus
+1F385 1F3FB                                            ; fully-qualified     # 🎅🏻 E1.0 Santa Claus: light skin tone
+1F385 1F3FC                                            ; fully-qualified     # 🎅🏼 E1.0 Santa Claus: medium-light skin tone
+1F385 1F3FD                                            ; fully-qualified     # 🎅🏽 E1.0 Santa Claus: medium skin tone
+1F385 1F3FE                                            ; fully-qualified     # 🎅🏾 E1.0 Santa Claus: medium-dark skin tone
+1F385 1F3FF                                            ; fully-qualified     # 🎅🏿 E1.0 Santa Claus: dark skin tone
+1F936                                                  ; fully-qualified     # 🤶 E3.0 Mrs. Claus
+1F936 1F3FB                                            ; fully-qualified     # 🤶🏻 E3.0 Mrs. Claus: light skin tone
+1F936 1F3FC                                            ; fully-qualified     # 🤶🏼 E3.0 Mrs. Claus: medium-light skin tone
+1F936 1F3FD                                            ; fully-qualified     # 🤶🏽 E3.0 Mrs. Claus: medium skin tone
+1F936 1F3FE                                            ; fully-qualified     # 🤶🏾 E3.0 Mrs. Claus: medium-dark skin tone
+1F936 1F3FF                                            ; fully-qualified     # 🤶🏿 E3.0 Mrs. Claus: dark skin tone
+1F9D1 200D 1F384                                       ; fully-qualified     # 🧑‍🎄 E13.0 mx claus
+1F9D1 1F3FB 200D 1F384                                 ; fully-qualified     # 🧑🏻‍🎄 E13.0 mx claus: light skin tone
+1F9D1 1F3FC 200D 1F384                                 ; fully-qualified     # 🧑🏼‍🎄 E13.0 mx claus: medium-light skin tone
+1F9D1 1F3FD 200D 1F384                                 ; fully-qualified     # 🧑🏽‍🎄 E13.0 mx claus: medium skin tone
+1F9D1 1F3FE 200D 1F384                                 ; fully-qualified     # 🧑🏾‍🎄 E13.0 mx claus: medium-dark skin tone
+1F9D1 1F3FF 200D 1F384                                 ; fully-qualified     # 🧑🏿‍🎄 E13.0 mx claus: dark skin tone
+1F9B8                                                  ; fully-qualified     # 🦸 E11.0 superhero
+1F9B8 1F3FB                                            ; fully-qualified     # 🦸🏻 E11.0 superhero: light skin tone
+1F9B8 1F3FC                                            ; fully-qualified     # 🦸🏼 E11.0 superhero: medium-light skin tone
+1F9B8 1F3FD                                            ; fully-qualified     # 🦸🏽 E11.0 superhero: medium skin tone
+1F9B8 1F3FE                                            ; fully-qualified     # 🦸🏾 E11.0 superhero: medium-dark skin tone
+1F9B8 1F3FF                                            ; fully-qualified     # 🦸🏿 E11.0 superhero: dark skin tone
+1F9B8 200D 2642 FE0F                                   ; fully-qualified     # 🦸‍♂️ E11.0 man superhero
+1F9B8 200D 2642                                        ; minimally-qualified # 🦸‍♂ E11.0 man superhero
+1F9B8 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🦸🏻‍♂️ E11.0 man superhero: light skin tone
+1F9B8 1F3FB 200D 2642                                  ; minimally-qualified # 🦸🏻‍♂ E11.0 man superhero: light skin tone
+1F9B8 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🦸🏼‍♂️ E11.0 man superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2642                                  ; minimally-qualified # 🦸🏼‍♂ E11.0 man superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🦸🏽‍♂️ E11.0 man superhero: medium skin tone
+1F9B8 1F3FD 200D 2642                                  ; minimally-qualified # 🦸🏽‍♂ E11.0 man superhero: medium skin tone
+1F9B8 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🦸🏾‍♂️ E11.0 man superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2642                                  ; minimally-qualified # 🦸🏾‍♂ E11.0 man superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🦸🏿‍♂️ E11.0 man superhero: dark skin tone
+1F9B8 1F3FF 200D 2642                                  ; minimally-qualified # 🦸🏿‍♂ E11.0 man superhero: dark skin tone
+1F9B8 200D 2640 FE0F                                   ; fully-qualified     # 🦸‍♀️ E11.0 woman superhero
+1F9B8 200D 2640                                        ; minimally-qualified # 🦸‍♀ E11.0 woman superhero
+1F9B8 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🦸🏻‍♀️ E11.0 woman superhero: light skin tone
+1F9B8 1F3FB 200D 2640                                  ; minimally-qualified # 🦸🏻‍♀ E11.0 woman superhero: light skin tone
+1F9B8 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🦸🏼‍♀️ E11.0 woman superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2640                                  ; minimally-qualified # 🦸🏼‍♀ E11.0 woman superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🦸🏽‍♀️ E11.0 woman superhero: medium skin tone
+1F9B8 1F3FD 200D 2640                                  ; minimally-qualified # 🦸🏽‍♀ E11.0 woman superhero: medium skin tone
+1F9B8 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🦸🏾‍♀️ E11.0 woman superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2640                                  ; minimally-qualified # 🦸🏾‍♀ E11.0 woman superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🦸🏿‍♀️ E11.0 woman superhero: dark skin tone
+1F9B8 1F3FF 200D 2640                                  ; minimally-qualified # 🦸🏿‍♀ E11.0 woman superhero: dark skin tone
+1F9B9                                                  ; fully-qualified     # 🦹 E11.0 supervillain
+1F9B9 1F3FB                                            ; fully-qualified     # 🦹🏻 E11.0 supervillain: light skin tone
+1F9B9 1F3FC                                            ; fully-qualified     # 🦹🏼 E11.0 supervillain: medium-light skin tone
+1F9B9 1F3FD                                            ; fully-qualified     # 🦹🏽 E11.0 supervillain: medium skin tone
+1F9B9 1F3FE                                            ; fully-qualified     # 🦹🏾 E11.0 supervillain: medium-dark skin tone
+1F9B9 1F3FF                                            ; fully-qualified     # 🦹🏿 E11.0 supervillain: dark skin tone
+1F9B9 200D 2642 FE0F                                   ; fully-qualified     # 🦹‍♂️ E11.0 man supervillain
+1F9B9 200D 2642                                        ; minimally-qualified # 🦹‍♂ E11.0 man supervillain
+1F9B9 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🦹🏻‍♂️ E11.0 man supervillain: light skin tone
+1F9B9 1F3FB 200D 2642                                  ; minimally-qualified # 🦹🏻‍♂ E11.0 man supervillain: light skin tone
+1F9B9 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🦹🏼‍♂️ E11.0 man supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2642                                  ; minimally-qualified # 🦹🏼‍♂ E11.0 man supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🦹🏽‍♂️ E11.0 man supervillain: medium skin tone
+1F9B9 1F3FD 200D 2642                                  ; minimally-qualified # 🦹🏽‍♂ E11.0 man supervillain: medium skin tone
+1F9B9 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🦹🏾‍♂️ E11.0 man supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2642                                  ; minimally-qualified # 🦹🏾‍♂ E11.0 man supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🦹🏿‍♂️ E11.0 man supervillain: dark skin tone
+1F9B9 1F3FF 200D 2642                                  ; minimally-qualified # 🦹🏿‍♂ E11.0 man supervillain: dark skin tone
+1F9B9 200D 2640 FE0F                                   ; fully-qualified     # 🦹‍♀️ E11.0 woman supervillain
+1F9B9 200D 2640                                        ; minimally-qualified # 🦹‍♀ E11.0 woman supervillain
+1F9B9 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🦹🏻‍♀️ E11.0 woman supervillain: light skin tone
+1F9B9 1F3FB 200D 2640                                  ; minimally-qualified # 🦹🏻‍♀ E11.0 woman supervillain: light skin tone
+1F9B9 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🦹🏼‍♀️ E11.0 woman supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2640                                  ; minimally-qualified # 🦹🏼‍♀ E11.0 woman supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🦹🏽‍♀️ E11.0 woman supervillain: medium skin tone
+1F9B9 1F3FD 200D 2640                                  ; minimally-qualified # 🦹🏽‍♀ E11.0 woman supervillain: medium skin tone
+1F9B9 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🦹🏾‍♀️ E11.0 woman supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2640                                  ; minimally-qualified # 🦹🏾‍♀ E11.0 woman supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🦹🏿‍♀️ E11.0 woman supervillain: dark skin tone
+1F9B9 1F3FF 200D 2640                                  ; minimally-qualified # 🦹🏿‍♀ E11.0 woman supervillain: dark skin tone
+1F9D9                                                  ; fully-qualified     # 🧙 E5.0 mage
+1F9D9 1F3FB                                            ; fully-qualified     # 🧙🏻 E5.0 mage: light skin tone
+1F9D9 1F3FC                                            ; fully-qualified     # 🧙🏼 E5.0 mage: medium-light skin tone
+1F9D9 1F3FD                                            ; fully-qualified     # 🧙🏽 E5.0 mage: medium skin tone
+1F9D9 1F3FE                                            ; fully-qualified     # 🧙🏾 E5.0 mage: medium-dark skin tone
+1F9D9 1F3FF                                            ; fully-qualified     # 🧙🏿 E5.0 mage: dark skin tone
+1F9D9 200D 2642 FE0F                                   ; fully-qualified     # 🧙‍♂️ E5.0 man mage
+1F9D9 200D 2642                                        ; minimally-qualified # 🧙‍♂ E5.0 man mage
+1F9D9 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧙🏻‍♂️ E5.0 man mage: light skin tone
+1F9D9 1F3FB 200D 2642                                  ; minimally-qualified # 🧙🏻‍♂ E5.0 man mage: light skin tone
+1F9D9 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧙🏼‍♂️ E5.0 man mage: medium-light skin tone
+1F9D9 1F3FC 200D 2642                                  ; minimally-qualified # 🧙🏼‍♂ E5.0 man mage: medium-light skin tone
+1F9D9 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧙🏽‍♂️ E5.0 man mage: medium skin tone
+1F9D9 1F3FD 200D 2642                                  ; minimally-qualified # 🧙🏽‍♂ E5.0 man mage: medium skin tone
+1F9D9 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧙🏾‍♂️ E5.0 man mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2642                                  ; minimally-qualified # 🧙🏾‍♂ E5.0 man mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧙🏿‍♂️ E5.0 man mage: dark skin tone
+1F9D9 1F3FF 200D 2642                                  ; minimally-qualified # 🧙🏿‍♂ E5.0 man mage: dark skin tone
+1F9D9 200D 2640 FE0F                                   ; fully-qualified     # 🧙‍♀️ E5.0 woman mage
+1F9D9 200D 2640                                        ; minimally-qualified # 🧙‍♀ E5.0 woman mage
+1F9D9 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧙🏻‍♀️ E5.0 woman mage: light skin tone
+1F9D9 1F3FB 200D 2640                                  ; minimally-qualified # 🧙🏻‍♀ E5.0 woman mage: light skin tone
+1F9D9 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧙🏼‍♀️ E5.0 woman mage: medium-light skin tone
+1F9D9 1F3FC 200D 2640                                  ; minimally-qualified # 🧙🏼‍♀ E5.0 woman mage: medium-light skin tone
+1F9D9 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧙🏽‍♀️ E5.0 woman mage: medium skin tone
+1F9D9 1F3FD 200D 2640                                  ; minimally-qualified # 🧙🏽‍♀ E5.0 woman mage: medium skin tone
+1F9D9 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧙🏾‍♀️ E5.0 woman mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2640                                  ; minimally-qualified # 🧙🏾‍♀ E5.0 woman mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧙🏿‍♀️ E5.0 woman mage: dark skin tone
+1F9D9 1F3FF 200D 2640                                  ; minimally-qualified # 🧙🏿‍♀ E5.0 woman mage: dark skin tone
+1F9DA                                                  ; fully-qualified     # 🧚 E5.0 fairy
+1F9DA 1F3FB                                            ; fully-qualified     # 🧚🏻 E5.0 fairy: light skin tone
+1F9DA 1F3FC                                            ; fully-qualified     # 🧚🏼 E5.0 fairy: medium-light skin tone
+1F9DA 1F3FD                                            ; fully-qualified     # 🧚🏽 E5.0 fairy: medium skin tone
+1F9DA 1F3FE                                            ; fully-qualified     # 🧚🏾 E5.0 fairy: medium-dark skin tone
+1F9DA 1F3FF                                            ; fully-qualified     # 🧚🏿 E5.0 fairy: dark skin tone
+1F9DA 200D 2642 FE0F                                   ; fully-qualified     # 🧚‍♂️ E5.0 man fairy
+1F9DA 200D 2642                                        ; minimally-qualified # 🧚‍♂ E5.0 man fairy
+1F9DA 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧚🏻‍♂️ E5.0 man fairy: light skin tone
+1F9DA 1F3FB 200D 2642                                  ; minimally-qualified # 🧚🏻‍♂ E5.0 man fairy: light skin tone
+1F9DA 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧚🏼‍♂️ E5.0 man fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2642                                  ; minimally-qualified # 🧚🏼‍♂ E5.0 man fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧚🏽‍♂️ E5.0 man fairy: medium skin tone
+1F9DA 1F3FD 200D 2642                                  ; minimally-qualified # 🧚🏽‍♂ E5.0 man fairy: medium skin tone
+1F9DA 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧚🏾‍♂️ E5.0 man fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2642                                  ; minimally-qualified # 🧚🏾‍♂ E5.0 man fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧚🏿‍♂️ E5.0 man fairy: dark skin tone
+1F9DA 1F3FF 200D 2642                                  ; minimally-qualified # 🧚🏿‍♂ E5.0 man fairy: dark skin tone
+1F9DA 200D 2640 FE0F                                   ; fully-qualified     # 🧚‍♀️ E5.0 woman fairy
+1F9DA 200D 2640                                        ; minimally-qualified # 🧚‍♀ E5.0 woman fairy
+1F9DA 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧚🏻‍♀️ E5.0 woman fairy: light skin tone
+1F9DA 1F3FB 200D 2640                                  ; minimally-qualified # 🧚🏻‍♀ E5.0 woman fairy: light skin tone
+1F9DA 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧚🏼‍♀️ E5.0 woman fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2640                                  ; minimally-qualified # 🧚🏼‍♀ E5.0 woman fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧚🏽‍♀️ E5.0 woman fairy: medium skin tone
+1F9DA 1F3FD 200D 2640                                  ; minimally-qualified # 🧚🏽‍♀ E5.0 woman fairy: medium skin tone
+1F9DA 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧚🏾‍♀️ E5.0 woman fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2640                                  ; minimally-qualified # 🧚🏾‍♀ E5.0 woman fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧚🏿‍♀️ E5.0 woman fairy: dark skin tone
+1F9DA 1F3FF 200D 2640                                  ; minimally-qualified # 🧚🏿‍♀ E5.0 woman fairy: dark skin tone
+1F9DB                                                  ; fully-qualified     # 🧛 E5.0 vampire
+1F9DB 1F3FB                                            ; fully-qualified     # 🧛🏻 E5.0 vampire: light skin tone
+1F9DB 1F3FC                                            ; fully-qualified     # 🧛🏼 E5.0 vampire: medium-light skin tone
+1F9DB 1F3FD                                            ; fully-qualified     # 🧛🏽 E5.0 vampire: medium skin tone
+1F9DB 1F3FE                                            ; fully-qualified     # 🧛🏾 E5.0 vampire: medium-dark skin tone
+1F9DB 1F3FF                                            ; fully-qualified     # 🧛🏿 E5.0 vampire: dark skin tone
+1F9DB 200D 2642 FE0F                                   ; fully-qualified     # 🧛‍♂️ E5.0 man vampire
+1F9DB 200D 2642                                        ; minimally-qualified # 🧛‍♂ E5.0 man vampire
+1F9DB 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧛🏻‍♂️ E5.0 man vampire: light skin tone
+1F9DB 1F3FB 200D 2642                                  ; minimally-qualified # 🧛🏻‍♂ E5.0 man vampire: light skin tone
+1F9DB 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧛🏼‍♂️ E5.0 man vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2642                                  ; minimally-qualified # 🧛🏼‍♂ E5.0 man vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧛🏽‍♂️ E5.0 man vampire: medium skin tone
+1F9DB 1F3FD 200D 2642                                  ; minimally-qualified # 🧛🏽‍♂ E5.0 man vampire: medium skin tone
+1F9DB 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧛🏾‍♂️ E5.0 man vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2642                                  ; minimally-qualified # 🧛🏾‍♂ E5.0 man vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧛🏿‍♂️ E5.0 man vampire: dark skin tone
+1F9DB 1F3FF 200D 2642                                  ; minimally-qualified # 🧛🏿‍♂ E5.0 man vampire: dark skin tone
+1F9DB 200D 2640 FE0F                                   ; fully-qualified     # 🧛‍♀️ E5.0 woman vampire
+1F9DB 200D 2640                                        ; minimally-qualified # 🧛‍♀ E5.0 woman vampire
+1F9DB 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧛🏻‍♀️ E5.0 woman vampire: light skin tone
+1F9DB 1F3FB 200D 2640                                  ; minimally-qualified # 🧛🏻‍♀ E5.0 woman vampire: light skin tone
+1F9DB 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧛🏼‍♀️ E5.0 woman vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2640                                  ; minimally-qualified # 🧛🏼‍♀ E5.0 woman vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧛🏽‍♀️ E5.0 woman vampire: medium skin tone
+1F9DB 1F3FD 200D 2640                                  ; minimally-qualified # 🧛🏽‍♀ E5.0 woman vampire: medium skin tone
+1F9DB 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧛🏾‍♀️ E5.0 woman vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2640                                  ; minimally-qualified # 🧛🏾‍♀ E5.0 woman vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧛🏿‍♀️ E5.0 woman vampire: dark skin tone
+1F9DB 1F3FF 200D 2640                                  ; minimally-qualified # 🧛🏿‍♀ E5.0 woman vampire: dark skin tone
+1F9DC                                                  ; fully-qualified     # 🧜 E5.0 merperson
+1F9DC 1F3FB                                            ; fully-qualified     # 🧜🏻 E5.0 merperson: light skin tone
+1F9DC 1F3FC                                            ; fully-qualified     # 🧜🏼 E5.0 merperson: medium-light skin tone
+1F9DC 1F3FD                                            ; fully-qualified     # 🧜🏽 E5.0 merperson: medium skin tone
+1F9DC 1F3FE                                            ; fully-qualified     # 🧜🏾 E5.0 merperson: medium-dark skin tone
+1F9DC 1F3FF                                            ; fully-qualified     # 🧜🏿 E5.0 merperson: dark skin tone
+1F9DC 200D 2642 FE0F                                   ; fully-qualified     # 🧜‍♂️ E5.0 merman
+1F9DC 200D 2642                                        ; minimally-qualified # 🧜‍♂ E5.0 merman
+1F9DC 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧜🏻‍♂️ E5.0 merman: light skin tone
+1F9DC 1F3FB 200D 2642                                  ; minimally-qualified # 🧜🏻‍♂ E5.0 merman: light skin tone
+1F9DC 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧜🏼‍♂️ E5.0 merman: medium-light skin tone
+1F9DC 1F3FC 200D 2642                                  ; minimally-qualified # 🧜🏼‍♂ E5.0 merman: medium-light skin tone
+1F9DC 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧜🏽‍♂️ E5.0 merman: medium skin tone
+1F9DC 1F3FD 200D 2642                                  ; minimally-qualified # 🧜🏽‍♂ E5.0 merman: medium skin tone
+1F9DC 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧜🏾‍♂️ E5.0 merman: medium-dark skin tone
+1F9DC 1F3FE 200D 2642                                  ; minimally-qualified # 🧜🏾‍♂ E5.0 merman: medium-dark skin tone
+1F9DC 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧜🏿‍♂️ E5.0 merman: dark skin tone
+1F9DC 1F3FF 200D 2642                                  ; minimally-qualified # 🧜🏿‍♂ E5.0 merman: dark skin tone
+1F9DC 200D 2640 FE0F                                   ; fully-qualified     # 🧜‍♀️ E5.0 mermaid
+1F9DC 200D 2640                                        ; minimally-qualified # 🧜‍♀ E5.0 mermaid
+1F9DC 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧜🏻‍♀️ E5.0 mermaid: light skin tone
+1F9DC 1F3FB 200D 2640                                  ; minimally-qualified # 🧜🏻‍♀ E5.0 mermaid: light skin tone
+1F9DC 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧜🏼‍♀️ E5.0 mermaid: medium-light skin tone
+1F9DC 1F3FC 200D 2640                                  ; minimally-qualified # 🧜🏼‍♀ E5.0 mermaid: medium-light skin tone
+1F9DC 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧜🏽‍♀️ E5.0 mermaid: medium skin tone
+1F9DC 1F3FD 200D 2640                                  ; minimally-qualified # 🧜🏽‍♀ E5.0 mermaid: medium skin tone
+1F9DC 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧜🏾‍♀️ E5.0 mermaid: medium-dark skin tone
+1F9DC 1F3FE 200D 2640                                  ; minimally-qualified # 🧜🏾‍♀ E5.0 mermaid: medium-dark skin tone
+1F9DC 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧜🏿‍♀️ E5.0 mermaid: dark skin tone
+1F9DC 1F3FF 200D 2640                                  ; minimally-qualified # 🧜🏿‍♀ E5.0 mermaid: dark skin tone
+1F9DD                                                  ; fully-qualified     # 🧝 E5.0 elf
+1F9DD 1F3FB                                            ; fully-qualified     # 🧝🏻 E5.0 elf: light skin tone
+1F9DD 1F3FC                                            ; fully-qualified     # 🧝🏼 E5.0 elf: medium-light skin tone
+1F9DD 1F3FD                                            ; fully-qualified     # 🧝🏽 E5.0 elf: medium skin tone
+1F9DD 1F3FE                                            ; fully-qualified     # 🧝🏾 E5.0 elf: medium-dark skin tone
+1F9DD 1F3FF                                            ; fully-qualified     # 🧝🏿 E5.0 elf: dark skin tone
+1F9DD 200D 2642 FE0F                                   ; fully-qualified     # 🧝‍♂️ E5.0 man elf
+1F9DD 200D 2642                                        ; minimally-qualified # 🧝‍♂ E5.0 man elf
+1F9DD 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧝🏻‍♂️ E5.0 man elf: light skin tone
+1F9DD 1F3FB 200D 2642                                  ; minimally-qualified # 🧝🏻‍♂ E5.0 man elf: light skin tone
+1F9DD 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧝🏼‍♂️ E5.0 man elf: medium-light skin tone
+1F9DD 1F3FC 200D 2642                                  ; minimally-qualified # 🧝🏼‍♂ E5.0 man elf: medium-light skin tone
+1F9DD 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧝🏽‍♂️ E5.0 man elf: medium skin tone
+1F9DD 1F3FD 200D 2642                                  ; minimally-qualified # 🧝🏽‍♂ E5.0 man elf: medium skin tone
+1F9DD 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧝🏾‍♂️ E5.0 man elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2642                                  ; minimally-qualified # 🧝🏾‍♂ E5.0 man elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧝🏿‍♂️ E5.0 man elf: dark skin tone
+1F9DD 1F3FF 200D 2642                                  ; minimally-qualified # 🧝🏿‍♂ E5.0 man elf: dark skin tone
+1F9DD 200D 2640 FE0F                                   ; fully-qualified     # 🧝‍♀️ E5.0 woman elf
+1F9DD 200D 2640                                        ; minimally-qualified # 🧝‍♀ E5.0 woman elf
+1F9DD 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧝🏻‍♀️ E5.0 woman elf: light skin tone
+1F9DD 1F3FB 200D 2640                                  ; minimally-qualified # 🧝🏻‍♀ E5.0 woman elf: light skin tone
+1F9DD 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧝🏼‍♀️ E5.0 woman elf: medium-light skin tone
+1F9DD 1F3FC 200D 2640                                  ; minimally-qualified # 🧝🏼‍♀ E5.0 woman elf: medium-light skin tone
+1F9DD 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧝🏽‍♀️ E5.0 woman elf: medium skin tone
+1F9DD 1F3FD 200D 2640                                  ; minimally-qualified # 🧝🏽‍♀ E5.0 woman elf: medium skin tone
+1F9DD 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧝🏾‍♀️ E5.0 woman elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2640                                  ; minimally-qualified # 🧝🏾‍♀ E5.0 woman elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧝🏿‍♀️ E5.0 woman elf: dark skin tone
+1F9DD 1F3FF 200D 2640                                  ; minimally-qualified # 🧝🏿‍♀ E5.0 woman elf: dark skin tone
+1F9DE                                                  ; fully-qualified     # 🧞 E5.0 genie
+1F9DE 200D 2642 FE0F                                   ; fully-qualified     # 🧞‍♂️ E5.0 man genie
+1F9DE 200D 2642                                        ; minimally-qualified # 🧞‍♂ E5.0 man genie
+1F9DE 200D 2640 FE0F                                   ; fully-qualified     # 🧞‍♀️ E5.0 woman genie
+1F9DE 200D 2640                                        ; minimally-qualified # 🧞‍♀ E5.0 woman genie
+1F9DF                                                  ; fully-qualified     # 🧟 E5.0 zombie
+1F9DF 200D 2642 FE0F                                   ; fully-qualified     # 🧟‍♂️ E5.0 man zombie
+1F9DF 200D 2642                                        ; minimally-qualified # 🧟‍♂ E5.0 man zombie
+1F9DF 200D 2640 FE0F                                   ; fully-qualified     # 🧟‍♀️ E5.0 woman zombie
+1F9DF 200D 2640                                        ; minimally-qualified # 🧟‍♀ E5.0 woman zombie
+1F9CC                                                  ; fully-qualified     # 🧌 E14.0 troll
+
+# subgroup: person-activity
+1F486                                                  ; fully-qualified     # 💆 E0.6 person getting massage
+1F486 1F3FB                                            ; fully-qualified     # 💆🏻 E1.0 person getting massage: light skin tone
+1F486 1F3FC                                            ; fully-qualified     # 💆🏼 E1.0 person getting massage: medium-light skin tone
+1F486 1F3FD                                            ; fully-qualified     # 💆🏽 E1.0 person getting massage: medium skin tone
+1F486 1F3FE                                            ; fully-qualified     # 💆🏾 E1.0 person getting massage: medium-dark skin tone
+1F486 1F3FF                                            ; fully-qualified     # 💆🏿 E1.0 person getting massage: dark skin tone
+1F486 200D 2642 FE0F                                   ; fully-qualified     # 💆‍♂️ E4.0 man getting massage
+1F486 200D 2642                                        ; minimally-qualified # 💆‍♂ E4.0 man getting massage
+1F486 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 💆🏻‍♂️ E4.0 man getting massage: light skin tone
+1F486 1F3FB 200D 2642                                  ; minimally-qualified # 💆🏻‍♂ E4.0 man getting massage: light skin tone
+1F486 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 💆🏼‍♂️ E4.0 man getting massage: medium-light skin tone
+1F486 1F3FC 200D 2642                                  ; minimally-qualified # 💆🏼‍♂ E4.0 man getting massage: medium-light skin tone
+1F486 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 💆🏽‍♂️ E4.0 man getting massage: medium skin tone
+1F486 1F3FD 200D 2642                                  ; minimally-qualified # 💆🏽‍♂ E4.0 man getting massage: medium skin tone
+1F486 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 💆🏾‍♂️ E4.0 man getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2642                                  ; minimally-qualified # 💆🏾‍♂ E4.0 man getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 💆🏿‍♂️ E4.0 man getting massage: dark skin tone
+1F486 1F3FF 200D 2642                                  ; minimally-qualified # 💆🏿‍♂ E4.0 man getting massage: dark skin tone
+1F486 200D 2640 FE0F                                   ; fully-qualified     # 💆‍♀️ E4.0 woman getting massage
+1F486 200D 2640                                        ; minimally-qualified # 💆‍♀ E4.0 woman getting massage
+1F486 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 💆🏻‍♀️ E4.0 woman getting massage: light skin tone
+1F486 1F3FB 200D 2640                                  ; minimally-qualified # 💆🏻‍♀ E4.0 woman getting massage: light skin tone
+1F486 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 💆🏼‍♀️ E4.0 woman getting massage: medium-light skin tone
+1F486 1F3FC 200D 2640                                  ; minimally-qualified # 💆🏼‍♀ E4.0 woman getting massage: medium-light skin tone
+1F486 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 💆🏽‍♀️ E4.0 woman getting massage: medium skin tone
+1F486 1F3FD 200D 2640                                  ; minimally-qualified # 💆🏽‍♀ E4.0 woman getting massage: medium skin tone
+1F486 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 💆🏾‍♀️ E4.0 woman getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2640                                  ; minimally-qualified # 💆🏾‍♀ E4.0 woman getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 💆🏿‍♀️ E4.0 woman getting massage: dark skin tone
+1F486 1F3FF 200D 2640                                  ; minimally-qualified # 💆🏿‍♀ E4.0 woman getting massage: dark skin tone
+1F487                                                  ; fully-qualified     # 💇 E0.6 person getting haircut
+1F487 1F3FB                                            ; fully-qualified     # 💇🏻 E1.0 person getting haircut: light skin tone
+1F487 1F3FC                                            ; fully-qualified     # 💇🏼 E1.0 person getting haircut: medium-light skin tone
+1F487 1F3FD                                            ; fully-qualified     # 💇🏽 E1.0 person getting haircut: medium skin tone
+1F487 1F3FE                                            ; fully-qualified     # 💇🏾 E1.0 person getting haircut: medium-dark skin tone
+1F487 1F3FF                                            ; fully-qualified     # 💇🏿 E1.0 person getting haircut: dark skin tone
+1F487 200D 2642 FE0F                                   ; fully-qualified     # 💇‍♂️ E4.0 man getting haircut
+1F487 200D 2642                                        ; minimally-qualified # 💇‍♂ E4.0 man getting haircut
+1F487 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 💇🏻‍♂️ E4.0 man getting haircut: light skin tone
+1F487 1F3FB 200D 2642                                  ; minimally-qualified # 💇🏻‍♂ E4.0 man getting haircut: light skin tone
+1F487 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 💇🏼‍♂️ E4.0 man getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2642                                  ; minimally-qualified # 💇🏼‍♂ E4.0 man getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 💇🏽‍♂️ E4.0 man getting haircut: medium skin tone
+1F487 1F3FD 200D 2642                                  ; minimally-qualified # 💇🏽‍♂ E4.0 man getting haircut: medium skin tone
+1F487 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 💇🏾‍♂️ E4.0 man getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2642                                  ; minimally-qualified # 💇🏾‍♂ E4.0 man getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 💇🏿‍♂️ E4.0 man getting haircut: dark skin tone
+1F487 1F3FF 200D 2642                                  ; minimally-qualified # 💇🏿‍♂ E4.0 man getting haircut: dark skin tone
+1F487 200D 2640 FE0F                                   ; fully-qualified     # 💇‍♀️ E4.0 woman getting haircut
+1F487 200D 2640                                        ; minimally-qualified # 💇‍♀ E4.0 woman getting haircut
+1F487 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 💇🏻‍♀️ E4.0 woman getting haircut: light skin tone
+1F487 1F3FB 200D 2640                                  ; minimally-qualified # 💇🏻‍♀ E4.0 woman getting haircut: light skin tone
+1F487 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 💇🏼‍♀️ E4.0 woman getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2640                                  ; minimally-qualified # 💇🏼‍♀ E4.0 woman getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 💇🏽‍♀️ E4.0 woman getting haircut: medium skin tone
+1F487 1F3FD 200D 2640                                  ; minimally-qualified # 💇🏽‍♀ E4.0 woman getting haircut: medium skin tone
+1F487 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 💇🏾‍♀️ E4.0 woman getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2640                                  ; minimally-qualified # 💇🏾‍♀ E4.0 woman getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 💇🏿‍♀️ E4.0 woman getting haircut: dark skin tone
+1F487 1F3FF 200D 2640                                  ; minimally-qualified # 💇🏿‍♀ E4.0 woman getting haircut: dark skin tone
+1F6B6                                                  ; fully-qualified     # 🚶 E0.6 person walking
+1F6B6 1F3FB                                            ; fully-qualified     # 🚶🏻 E1.0 person walking: light skin tone
+1F6B6 1F3FC                                            ; fully-qualified     # 🚶🏼 E1.0 person walking: medium-light skin tone
+1F6B6 1F3FD                                            ; fully-qualified     # 🚶🏽 E1.0 person walking: medium skin tone
+1F6B6 1F3FE                                            ; fully-qualified     # 🚶🏾 E1.0 person walking: medium-dark skin tone
+1F6B6 1F3FF                                            ; fully-qualified     # 🚶🏿 E1.0 person walking: dark skin tone
+1F6B6 200D 2642 FE0F                                   ; fully-qualified     # 🚶‍♂️ E4.0 man walking
+1F6B6 200D 2642                                        ; minimally-qualified # 🚶‍♂ E4.0 man walking
+1F6B6 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🚶🏻‍♂️ E4.0 man walking: light skin tone
+1F6B6 1F3FB 200D 2642                                  ; minimally-qualified # 🚶🏻‍♂ E4.0 man walking: light skin tone
+1F6B6 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🚶🏼‍♂️ E4.0 man walking: medium-light skin tone
+1F6B6 1F3FC 200D 2642                                  ; minimally-qualified # 🚶🏼‍♂ E4.0 man walking: medium-light skin tone
+1F6B6 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🚶🏽‍♂️ E4.0 man walking: medium skin tone
+1F6B6 1F3FD 200D 2642                                  ; minimally-qualified # 🚶🏽‍♂ E4.0 man walking: medium skin tone
+1F6B6 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🚶🏾‍♂️ E4.0 man walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2642                                  ; minimally-qualified # 🚶🏾‍♂ E4.0 man walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🚶🏿‍♂️ E4.0 man walking: dark skin tone
+1F6B6 1F3FF 200D 2642                                  ; minimally-qualified # 🚶🏿‍♂ E4.0 man walking: dark skin tone
+1F6B6 200D 2640 FE0F                                   ; fully-qualified     # 🚶‍♀️ E4.0 woman walking
+1F6B6 200D 2640                                        ; minimally-qualified # 🚶‍♀ E4.0 woman walking
+1F6B6 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🚶🏻‍♀️ E4.0 woman walking: light skin tone
+1F6B6 1F3FB 200D 2640                                  ; minimally-qualified # 🚶🏻‍♀ E4.0 woman walking: light skin tone
+1F6B6 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🚶🏼‍♀️ E4.0 woman walking: medium-light skin tone
+1F6B6 1F3FC 200D 2640                                  ; minimally-qualified # 🚶🏼‍♀ E4.0 woman walking: medium-light skin tone
+1F6B6 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🚶🏽‍♀️ E4.0 woman walking: medium skin tone
+1F6B6 1F3FD 200D 2640                                  ; minimally-qualified # 🚶🏽‍♀ E4.0 woman walking: medium skin tone
+1F6B6 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🚶🏾‍♀️ E4.0 woman walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2640                                  ; minimally-qualified # 🚶🏾‍♀ E4.0 woman walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🚶🏿‍♀️ E4.0 woman walking: dark skin tone
+1F6B6 1F3FF 200D 2640                                  ; minimally-qualified # 🚶🏿‍♀ E4.0 woman walking: dark skin tone
+1F6B6 200D 27A1 FE0F                                   ; fully-qualified     # 🚶‍➡️ E15.1 person walking facing right
+1F6B6 200D 27A1                                        ; minimally-qualified # 🚶‍➡ E15.1 person walking facing right
+1F6B6 1F3FB 200D 27A1 FE0F                             ; fully-qualified     # 🚶🏻‍➡️ E15.1 person walking facing right: light skin tone
+1F6B6 1F3FB 200D 27A1                                  ; minimally-qualified # 🚶🏻‍➡ E15.1 person walking facing right: light skin tone
+1F6B6 1F3FC 200D 27A1 FE0F                             ; fully-qualified     # 🚶🏼‍➡️ E15.1 person walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 27A1                                  ; minimally-qualified # 🚶🏼‍➡ E15.1 person walking facing right: medium-light skin tone
+1F6B6 1F3FD 200D 27A1 FE0F                             ; fully-qualified     # 🚶🏽‍➡️ E15.1 person walking facing right: medium skin tone
+1F6B6 1F3FD 200D 27A1                                  ; minimally-qualified # 🚶🏽‍➡ E15.1 person walking facing right: medium skin tone
+1F6B6 1F3FE 200D 27A1 FE0F                             ; fully-qualified     # 🚶🏾‍➡️ E15.1 person walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 27A1                                  ; minimally-qualified # 🚶🏾‍➡ E15.1 person walking facing right: medium-dark skin tone
+1F6B6 1F3FF 200D 27A1 FE0F                             ; fully-qualified     # 🚶🏿‍➡️ E15.1 person walking facing right: dark skin tone
+1F6B6 1F3FF 200D 27A1                                  ; minimally-qualified # 🚶🏿‍➡ E15.1 person walking facing right: dark skin tone
+1F6B6 200D 2640 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🚶‍♀️‍➡️ E15.1 woman walking facing right
+1F6B6 200D 2640 200D 27A1 FE0F                         ; minimally-qualified # 🚶‍♀‍➡️ E15.1 woman walking facing right
+1F6B6 200D 2640 FE0F 200D 27A1                         ; minimally-qualified # 🚶‍♀️‍➡ E15.1 woman walking facing right
+1F6B6 200D 2640 200D 27A1                              ; minimally-qualified # 🚶‍♀‍➡ E15.1 woman walking facing right
+1F6B6 1F3FB 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏻‍♀️‍➡️ E15.1 woman walking facing right: light skin tone
+1F6B6 1F3FB 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏻‍♀‍➡️ E15.1 woman walking facing right: light skin tone
+1F6B6 1F3FB 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏻‍♀️‍➡ E15.1 woman walking facing right: light skin tone
+1F6B6 1F3FB 200D 2640 200D 27A1                        ; minimally-qualified # 🚶🏻‍♀‍➡ E15.1 woman walking facing right: light skin tone
+1F6B6 1F3FC 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏼‍♀️‍➡️ E15.1 woman walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏼‍♀‍➡️ E15.1 woman walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏼‍♀️‍➡ E15.1 woman walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2640 200D 27A1                        ; minimally-qualified # 🚶🏼‍♀‍➡ E15.1 woman walking facing right: medium-light skin tone
+1F6B6 1F3FD 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏽‍♀️‍➡️ E15.1 woman walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏽‍♀‍➡️ E15.1 woman walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏽‍♀️‍➡ E15.1 woman walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2640 200D 27A1                        ; minimally-qualified # 🚶🏽‍♀‍➡ E15.1 woman walking facing right: medium skin tone
+1F6B6 1F3FE 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏾‍♀️‍➡️ E15.1 woman walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏾‍♀‍➡️ E15.1 woman walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏾‍♀️‍➡ E15.1 woman walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2640 200D 27A1                        ; minimally-qualified # 🚶🏾‍♀‍➡ E15.1 woman walking facing right: medium-dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏿‍♀️‍➡️ E15.1 woman walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏿‍♀‍➡️ E15.1 woman walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏿‍♀️‍➡ E15.1 woman walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2640 200D 27A1                        ; minimally-qualified # 🚶🏿‍♀‍➡ E15.1 woman walking facing right: dark skin tone
+1F6B6 200D 2642 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🚶‍♂️‍➡️ E15.1 man walking facing right
+1F6B6 200D 2642 200D 27A1 FE0F                         ; minimally-qualified # 🚶‍♂‍➡️ E15.1 man walking facing right
+1F6B6 200D 2642 FE0F 200D 27A1                         ; minimally-qualified # 🚶‍♂️‍➡ E15.1 man walking facing right
+1F6B6 200D 2642 200D 27A1                              ; minimally-qualified # 🚶‍♂‍➡ E15.1 man walking facing right
+1F6B6 1F3FB 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏻‍♂️‍➡️ E15.1 man walking facing right: light skin tone
+1F6B6 1F3FB 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏻‍♂‍➡️ E15.1 man walking facing right: light skin tone
+1F6B6 1F3FB 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏻‍♂️‍➡ E15.1 man walking facing right: light skin tone
+1F6B6 1F3FB 200D 2642 200D 27A1                        ; minimally-qualified # 🚶🏻‍♂‍➡ E15.1 man walking facing right: light skin tone
+1F6B6 1F3FC 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏼‍♂️‍➡️ E15.1 man walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏼‍♂‍➡️ E15.1 man walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏼‍♂️‍➡ E15.1 man walking facing right: medium-light skin tone
+1F6B6 1F3FC 200D 2642 200D 27A1                        ; minimally-qualified # 🚶🏼‍♂‍➡ E15.1 man walking facing right: medium-light skin tone
+1F6B6 1F3FD 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏽‍♂️‍➡️ E15.1 man walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏽‍♂‍➡️ E15.1 man walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏽‍♂️‍➡ E15.1 man walking facing right: medium skin tone
+1F6B6 1F3FD 200D 2642 200D 27A1                        ; minimally-qualified # 🚶🏽‍♂‍➡ E15.1 man walking facing right: medium skin tone
+1F6B6 1F3FE 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏾‍♂️‍➡️ E15.1 man walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏾‍♂‍➡️ E15.1 man walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏾‍♂️‍➡ E15.1 man walking facing right: medium-dark skin tone
+1F6B6 1F3FE 200D 2642 200D 27A1                        ; minimally-qualified # 🚶🏾‍♂‍➡ E15.1 man walking facing right: medium-dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🚶🏿‍♂️‍➡️ E15.1 man walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🚶🏿‍♂‍➡️ E15.1 man walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🚶🏿‍♂️‍➡ E15.1 man walking facing right: dark skin tone
+1F6B6 1F3FF 200D 2642 200D 27A1                        ; minimally-qualified # 🚶🏿‍♂‍➡ E15.1 man walking facing right: dark skin tone
+1F9CD                                                  ; fully-qualified     # 🧍 E12.0 person standing
+1F9CD 1F3FB                                            ; fully-qualified     # 🧍🏻 E12.0 person standing: light skin tone
+1F9CD 1F3FC                                            ; fully-qualified     # 🧍🏼 E12.0 person standing: medium-light skin tone
+1F9CD 1F3FD                                            ; fully-qualified     # 🧍🏽 E12.0 person standing: medium skin tone
+1F9CD 1F3FE                                            ; fully-qualified     # 🧍🏾 E12.0 person standing: medium-dark skin tone
+1F9CD 1F3FF                                            ; fully-qualified     # 🧍🏿 E12.0 person standing: dark skin tone
+1F9CD 200D 2642 FE0F                                   ; fully-qualified     # 🧍‍♂️ E12.0 man standing
+1F9CD 200D 2642                                        ; minimally-qualified # 🧍‍♂ E12.0 man standing
+1F9CD 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧍🏻‍♂️ E12.0 man standing: light skin tone
+1F9CD 1F3FB 200D 2642                                  ; minimally-qualified # 🧍🏻‍♂ E12.0 man standing: light skin tone
+1F9CD 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧍🏼‍♂️ E12.0 man standing: medium-light skin tone
+1F9CD 1F3FC 200D 2642                                  ; minimally-qualified # 🧍🏼‍♂ E12.0 man standing: medium-light skin tone
+1F9CD 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧍🏽‍♂️ E12.0 man standing: medium skin tone
+1F9CD 1F3FD 200D 2642                                  ; minimally-qualified # 🧍🏽‍♂ E12.0 man standing: medium skin tone
+1F9CD 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧍🏾‍♂️ E12.0 man standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2642                                  ; minimally-qualified # 🧍🏾‍♂ E12.0 man standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧍🏿‍♂️ E12.0 man standing: dark skin tone
+1F9CD 1F3FF 200D 2642                                  ; minimally-qualified # 🧍🏿‍♂ E12.0 man standing: dark skin tone
+1F9CD 200D 2640 FE0F                                   ; fully-qualified     # 🧍‍♀️ E12.0 woman standing
+1F9CD 200D 2640                                        ; minimally-qualified # 🧍‍♀ E12.0 woman standing
+1F9CD 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧍🏻‍♀️ E12.0 woman standing: light skin tone
+1F9CD 1F3FB 200D 2640                                  ; minimally-qualified # 🧍🏻‍♀ E12.0 woman standing: light skin tone
+1F9CD 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧍🏼‍♀️ E12.0 woman standing: medium-light skin tone
+1F9CD 1F3FC 200D 2640                                  ; minimally-qualified # 🧍🏼‍♀ E12.0 woman standing: medium-light skin tone
+1F9CD 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧍🏽‍♀️ E12.0 woman standing: medium skin tone
+1F9CD 1F3FD 200D 2640                                  ; minimally-qualified # 🧍🏽‍♀ E12.0 woman standing: medium skin tone
+1F9CD 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧍🏾‍♀️ E12.0 woman standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2640                                  ; minimally-qualified # 🧍🏾‍♀ E12.0 woman standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧍🏿‍♀️ E12.0 woman standing: dark skin tone
+1F9CD 1F3FF 200D 2640                                  ; minimally-qualified # 🧍🏿‍♀ E12.0 woman standing: dark skin tone
+1F9CE                                                  ; fully-qualified     # 🧎 E12.0 person kneeling
+1F9CE 1F3FB                                            ; fully-qualified     # 🧎🏻 E12.0 person kneeling: light skin tone
+1F9CE 1F3FC                                            ; fully-qualified     # 🧎🏼 E12.0 person kneeling: medium-light skin tone
+1F9CE 1F3FD                                            ; fully-qualified     # 🧎🏽 E12.0 person kneeling: medium skin tone
+1F9CE 1F3FE                                            ; fully-qualified     # 🧎🏾 E12.0 person kneeling: medium-dark skin tone
+1F9CE 1F3FF                                            ; fully-qualified     # 🧎🏿 E12.0 person kneeling: dark skin tone
+1F9CE 200D 2642 FE0F                                   ; fully-qualified     # 🧎‍♂️ E12.0 man kneeling
+1F9CE 200D 2642                                        ; minimally-qualified # 🧎‍♂ E12.0 man kneeling
+1F9CE 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧎🏻‍♂️ E12.0 man kneeling: light skin tone
+1F9CE 1F3FB 200D 2642                                  ; minimally-qualified # 🧎🏻‍♂ E12.0 man kneeling: light skin tone
+1F9CE 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧎🏼‍♂️ E12.0 man kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2642                                  ; minimally-qualified # 🧎🏼‍♂ E12.0 man kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧎🏽‍♂️ E12.0 man kneeling: medium skin tone
+1F9CE 1F3FD 200D 2642                                  ; minimally-qualified # 🧎🏽‍♂ E12.0 man kneeling: medium skin tone
+1F9CE 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧎🏾‍♂️ E12.0 man kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2642                                  ; minimally-qualified # 🧎🏾‍♂ E12.0 man kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧎🏿‍♂️ E12.0 man kneeling: dark skin tone
+1F9CE 1F3FF 200D 2642                                  ; minimally-qualified # 🧎🏿‍♂ E12.0 man kneeling: dark skin tone
+1F9CE 200D 2640 FE0F                                   ; fully-qualified     # 🧎‍♀️ E12.0 woman kneeling
+1F9CE 200D 2640                                        ; minimally-qualified # 🧎‍♀ E12.0 woman kneeling
+1F9CE 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧎🏻‍♀️ E12.0 woman kneeling: light skin tone
+1F9CE 1F3FB 200D 2640                                  ; minimally-qualified # 🧎🏻‍♀ E12.0 woman kneeling: light skin tone
+1F9CE 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧎🏼‍♀️ E12.0 woman kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2640                                  ; minimally-qualified # 🧎🏼‍♀ E12.0 woman kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧎🏽‍♀️ E12.0 woman kneeling: medium skin tone
+1F9CE 1F3FD 200D 2640                                  ; minimally-qualified # 🧎🏽‍♀ E12.0 woman kneeling: medium skin tone
+1F9CE 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧎🏾‍♀️ E12.0 woman kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2640                                  ; minimally-qualified # 🧎🏾‍♀ E12.0 woman kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧎🏿‍♀️ E12.0 woman kneeling: dark skin tone
+1F9CE 1F3FF 200D 2640                                  ; minimally-qualified # 🧎🏿‍♀ E12.0 woman kneeling: dark skin tone
+1F9CE 200D 27A1 FE0F                                   ; fully-qualified     # 🧎‍➡️ E15.1 person kneeling facing right
+1F9CE 200D 27A1                                        ; minimally-qualified # 🧎‍➡ E15.1 person kneeling facing right
+1F9CE 1F3FB 200D 27A1 FE0F                             ; fully-qualified     # 🧎🏻‍➡️ E15.1 person kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 27A1                                  ; minimally-qualified # 🧎🏻‍➡ E15.1 person kneeling facing right: light skin tone
+1F9CE 1F3FC 200D 27A1 FE0F                             ; fully-qualified     # 🧎🏼‍➡️ E15.1 person kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 27A1                                  ; minimally-qualified # 🧎🏼‍➡ E15.1 person kneeling facing right: medium-light skin tone
+1F9CE 1F3FD 200D 27A1 FE0F                             ; fully-qualified     # 🧎🏽‍➡️ E15.1 person kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 27A1                                  ; minimally-qualified # 🧎🏽‍➡ E15.1 person kneeling facing right: medium skin tone
+1F9CE 1F3FE 200D 27A1 FE0F                             ; fully-qualified     # 🧎🏾‍➡️ E15.1 person kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 27A1                                  ; minimally-qualified # 🧎🏾‍➡ E15.1 person kneeling facing right: medium-dark skin tone
+1F9CE 1F3FF 200D 27A1 FE0F                             ; fully-qualified     # 🧎🏿‍➡️ E15.1 person kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 27A1                                  ; minimally-qualified # 🧎🏿‍➡ E15.1 person kneeling facing right: dark skin tone
+1F9CE 200D 2640 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🧎‍♀️‍➡️ E15.1 woman kneeling facing right
+1F9CE 200D 2640 200D 27A1 FE0F                         ; minimally-qualified # 🧎‍♀‍➡️ E15.1 woman kneeling facing right
+1F9CE 200D 2640 FE0F 200D 27A1                         ; minimally-qualified # 🧎‍♀️‍➡ E15.1 woman kneeling facing right
+1F9CE 200D 2640 200D 27A1                              ; minimally-qualified # 🧎‍♀‍➡ E15.1 woman kneeling facing right
+1F9CE 1F3FB 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏻‍♀️‍➡️ E15.1 woman kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏻‍♀‍➡️ E15.1 woman kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏻‍♀️‍➡ E15.1 woman kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2640 200D 27A1                        ; minimally-qualified # 🧎🏻‍♀‍➡ E15.1 woman kneeling facing right: light skin tone
+1F9CE 1F3FC 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏼‍♀️‍➡️ E15.1 woman kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏼‍♀‍➡️ E15.1 woman kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏼‍♀️‍➡ E15.1 woman kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2640 200D 27A1                        ; minimally-qualified # 🧎🏼‍♀‍➡ E15.1 woman kneeling facing right: medium-light skin tone
+1F9CE 1F3FD 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏽‍♀️‍➡️ E15.1 woman kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏽‍♀‍➡️ E15.1 woman kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏽‍♀️‍➡ E15.1 woman kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2640 200D 27A1                        ; minimally-qualified # 🧎🏽‍♀‍➡ E15.1 woman kneeling facing right: medium skin tone
+1F9CE 1F3FE 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏾‍♀️‍➡️ E15.1 woman kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏾‍♀‍➡️ E15.1 woman kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏾‍♀️‍➡ E15.1 woman kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2640 200D 27A1                        ; minimally-qualified # 🧎🏾‍♀‍➡ E15.1 woman kneeling facing right: medium-dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏿‍♀️‍➡️ E15.1 woman kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏿‍♀‍➡️ E15.1 woman kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏿‍♀️‍➡ E15.1 woman kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2640 200D 27A1                        ; minimally-qualified # 🧎🏿‍♀‍➡ E15.1 woman kneeling facing right: dark skin tone
+1F9CE 200D 2642 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🧎‍♂️‍➡️ E15.1 man kneeling facing right
+1F9CE 200D 2642 200D 27A1 FE0F                         ; minimally-qualified # 🧎‍♂‍➡️ E15.1 man kneeling facing right
+1F9CE 200D 2642 FE0F 200D 27A1                         ; minimally-qualified # 🧎‍♂️‍➡ E15.1 man kneeling facing right
+1F9CE 200D 2642 200D 27A1                              ; minimally-qualified # 🧎‍♂‍➡ E15.1 man kneeling facing right
+1F9CE 1F3FB 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏻‍♂️‍➡️ E15.1 man kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏻‍♂‍➡️ E15.1 man kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏻‍♂️‍➡ E15.1 man kneeling facing right: light skin tone
+1F9CE 1F3FB 200D 2642 200D 27A1                        ; minimally-qualified # 🧎🏻‍♂‍➡ E15.1 man kneeling facing right: light skin tone
+1F9CE 1F3FC 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏼‍♂️‍➡️ E15.1 man kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏼‍♂‍➡️ E15.1 man kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏼‍♂️‍➡ E15.1 man kneeling facing right: medium-light skin tone
+1F9CE 1F3FC 200D 2642 200D 27A1                        ; minimally-qualified # 🧎🏼‍♂‍➡ E15.1 man kneeling facing right: medium-light skin tone
+1F9CE 1F3FD 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏽‍♂️‍➡️ E15.1 man kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏽‍♂‍➡️ E15.1 man kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏽‍♂️‍➡ E15.1 man kneeling facing right: medium skin tone
+1F9CE 1F3FD 200D 2642 200D 27A1                        ; minimally-qualified # 🧎🏽‍♂‍➡ E15.1 man kneeling facing right: medium skin tone
+1F9CE 1F3FE 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏾‍♂️‍➡️ E15.1 man kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏾‍♂‍➡️ E15.1 man kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏾‍♂️‍➡ E15.1 man kneeling facing right: medium-dark skin tone
+1F9CE 1F3FE 200D 2642 200D 27A1                        ; minimally-qualified # 🧎🏾‍♂‍➡ E15.1 man kneeling facing right: medium-dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🧎🏿‍♂️‍➡️ E15.1 man kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🧎🏿‍♂‍➡️ E15.1 man kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🧎🏿‍♂️‍➡ E15.1 man kneeling facing right: dark skin tone
+1F9CE 1F3FF 200D 2642 200D 27A1                        ; minimally-qualified # 🧎🏿‍♂‍➡ E15.1 man kneeling facing right: dark skin tone
+1F9D1 200D 1F9AF                                       ; fully-qualified     # 🧑‍🦯 E12.1 person with white cane
+1F9D1 1F3FB 200D 1F9AF                                 ; fully-qualified     # 🧑🏻‍🦯 E12.1 person with white cane: light skin tone
+1F9D1 1F3FC 200D 1F9AF                                 ; fully-qualified     # 🧑🏼‍🦯 E12.1 person with white cane: medium-light skin tone
+1F9D1 1F3FD 200D 1F9AF                                 ; fully-qualified     # 🧑🏽‍🦯 E12.1 person with white cane: medium skin tone
+1F9D1 1F3FE 200D 1F9AF                                 ; fully-qualified     # 🧑🏾‍🦯 E12.1 person with white cane: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9AF                                 ; fully-qualified     # 🧑🏿‍🦯 E12.1 person with white cane: dark skin tone
+1F9D1 200D 1F9AF 200D 27A1 FE0F                        ; fully-qualified     # 🧑‍🦯‍➡️ E15.1 person with white cane facing right
+1F9D1 200D 1F9AF 200D 27A1                             ; minimally-qualified # 🧑‍🦯‍➡ E15.1 person with white cane facing right
+1F9D1 1F3FB 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏻‍🦯‍➡️ E15.1 person with white cane facing right: light skin tone
+1F9D1 1F3FB 200D 1F9AF 200D 27A1                       ; minimally-qualified # 🧑🏻‍🦯‍➡ E15.1 person with white cane facing right: light skin tone
+1F9D1 1F3FC 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏼‍🦯‍➡️ E15.1 person with white cane facing right: medium-light skin tone
+1F9D1 1F3FC 200D 1F9AF 200D 27A1                       ; minimally-qualified # 🧑🏼‍🦯‍➡ E15.1 person with white cane facing right: medium-light skin tone
+1F9D1 1F3FD 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏽‍🦯‍➡️ E15.1 person with white cane facing right: medium skin tone
+1F9D1 1F3FD 200D 1F9AF 200D 27A1                       ; minimally-qualified # 🧑🏽‍🦯‍➡ E15.1 person with white cane facing right: medium skin tone
+1F9D1 1F3FE 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏾‍🦯‍➡️ E15.1 person with white cane facing right: medium-dark skin tone
+1F9D1 1F3FE 200D 1F9AF 200D 27A1                       ; minimally-qualified # 🧑🏾‍🦯‍➡ E15.1 person with white cane facing right: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏿‍🦯‍➡️ E15.1 person with white cane facing right: dark skin tone
+1F9D1 1F3FF 200D 1F9AF 200D 27A1                       ; minimally-qualified # 🧑🏿‍🦯‍➡ E15.1 person with white cane facing right: dark skin tone
+1F468 200D 1F9AF                                       ; fully-qualified     # 👨‍🦯 E12.0 man with white cane
+1F468 1F3FB 200D 1F9AF                                 ; fully-qualified     # 👨🏻‍🦯 E12.0 man with white cane: light skin tone
+1F468 1F3FC 200D 1F9AF                                 ; fully-qualified     # 👨🏼‍🦯 E12.0 man with white cane: medium-light skin tone
+1F468 1F3FD 200D 1F9AF                                 ; fully-qualified     # 👨🏽‍🦯 E12.0 man with white cane: medium skin tone
+1F468 1F3FE 200D 1F9AF                                 ; fully-qualified     # 👨🏾‍🦯 E12.0 man with white cane: medium-dark skin tone
+1F468 1F3FF 200D 1F9AF                                 ; fully-qualified     # 👨🏿‍🦯 E12.0 man with white cane: dark skin tone
+1F468 200D 1F9AF 200D 27A1 FE0F                        ; fully-qualified     # 👨‍🦯‍➡️ E15.1 man with white cane facing right
+1F468 200D 1F9AF 200D 27A1                             ; minimally-qualified # 👨‍🦯‍➡ E15.1 man with white cane facing right
+1F468 1F3FB 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👨🏻‍🦯‍➡️ E15.1 man with white cane facing right: light skin tone
+1F468 1F3FB 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👨🏻‍🦯‍➡ E15.1 man with white cane facing right: light skin tone
+1F468 1F3FC 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👨🏼‍🦯‍➡️ E15.1 man with white cane facing right: medium-light skin tone
+1F468 1F3FC 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👨🏼‍🦯‍➡ E15.1 man with white cane facing right: medium-light skin tone
+1F468 1F3FD 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👨🏽‍🦯‍➡️ E15.1 man with white cane facing right: medium skin tone
+1F468 1F3FD 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👨🏽‍🦯‍➡ E15.1 man with white cane facing right: medium skin tone
+1F468 1F3FE 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👨🏾‍🦯‍➡️ E15.1 man with white cane facing right: medium-dark skin tone
+1F468 1F3FE 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👨🏾‍🦯‍➡ E15.1 man with white cane facing right: medium-dark skin tone
+1F468 1F3FF 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👨🏿‍🦯‍➡️ E15.1 man with white cane facing right: dark skin tone
+1F468 1F3FF 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👨🏿‍🦯‍➡ E15.1 man with white cane facing right: dark skin tone
+1F469 200D 1F9AF                                       ; fully-qualified     # 👩‍🦯 E12.0 woman with white cane
+1F469 1F3FB 200D 1F9AF                                 ; fully-qualified     # 👩🏻‍🦯 E12.0 woman with white cane: light skin tone
+1F469 1F3FC 200D 1F9AF                                 ; fully-qualified     # 👩🏼‍🦯 E12.0 woman with white cane: medium-light skin tone
+1F469 1F3FD 200D 1F9AF                                 ; fully-qualified     # 👩🏽‍🦯 E12.0 woman with white cane: medium skin tone
+1F469 1F3FE 200D 1F9AF                                 ; fully-qualified     # 👩🏾‍🦯 E12.0 woman with white cane: medium-dark skin tone
+1F469 1F3FF 200D 1F9AF                                 ; fully-qualified     # 👩🏿‍🦯 E12.0 woman with white cane: dark skin tone
+1F469 200D 1F9AF 200D 27A1 FE0F                        ; fully-qualified     # 👩‍🦯‍➡️ E15.1 woman with white cane facing right
+1F469 200D 1F9AF 200D 27A1                             ; minimally-qualified # 👩‍🦯‍➡ E15.1 woman with white cane facing right
+1F469 1F3FB 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👩🏻‍🦯‍➡️ E15.1 woman with white cane facing right: light skin tone
+1F469 1F3FB 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👩🏻‍🦯‍➡ E15.1 woman with white cane facing right: light skin tone
+1F469 1F3FC 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👩🏼‍🦯‍➡️ E15.1 woman with white cane facing right: medium-light skin tone
+1F469 1F3FC 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👩🏼‍🦯‍➡ E15.1 woman with white cane facing right: medium-light skin tone
+1F469 1F3FD 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👩🏽‍🦯‍➡️ E15.1 woman with white cane facing right: medium skin tone
+1F469 1F3FD 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👩🏽‍🦯‍➡ E15.1 woman with white cane facing right: medium skin tone
+1F469 1F3FE 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👩🏾‍🦯‍➡️ E15.1 woman with white cane facing right: medium-dark skin tone
+1F469 1F3FE 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👩🏾‍🦯‍➡ E15.1 woman with white cane facing right: medium-dark skin tone
+1F469 1F3FF 200D 1F9AF 200D 27A1 FE0F                  ; fully-qualified     # 👩🏿‍🦯‍➡️ E15.1 woman with white cane facing right: dark skin tone
+1F469 1F3FF 200D 1F9AF 200D 27A1                       ; minimally-qualified # 👩🏿‍🦯‍➡ E15.1 woman with white cane facing right: dark skin tone
+1F9D1 200D 1F9BC                                       ; fully-qualified     # 🧑‍🦼 E12.1 person in motorized wheelchair
+1F9D1 1F3FB 200D 1F9BC                                 ; fully-qualified     # 🧑🏻‍🦼 E12.1 person in motorized wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BC                                 ; fully-qualified     # 🧑🏼‍🦼 E12.1 person in motorized wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BC                                 ; fully-qualified     # 🧑🏽‍🦼 E12.1 person in motorized wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BC                                 ; fully-qualified     # 🧑🏾‍🦼 E12.1 person in motorized wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BC                                 ; fully-qualified     # 🧑🏿‍🦼 E12.1 person in motorized wheelchair: dark skin tone
+1F9D1 200D 1F9BC 200D 27A1 FE0F                        ; fully-qualified     # 🧑‍🦼‍➡️ E15.1 person in motorized wheelchair facing right
+1F9D1 200D 1F9BC 200D 27A1                             ; minimally-qualified # 🧑‍🦼‍➡ E15.1 person in motorized wheelchair facing right
+1F9D1 1F3FB 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏻‍🦼‍➡️ E15.1 person in motorized wheelchair facing right: light skin tone
+1F9D1 1F3FB 200D 1F9BC 200D 27A1                       ; minimally-qualified # 🧑🏻‍🦼‍➡ E15.1 person in motorized wheelchair facing right: light skin tone
+1F9D1 1F3FC 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏼‍🦼‍➡️ E15.1 person in motorized wheelchair facing right: medium-light skin tone
+1F9D1 1F3FC 200D 1F9BC 200D 27A1                       ; minimally-qualified # 🧑🏼‍🦼‍➡ E15.1 person in motorized wheelchair facing right: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏽‍🦼‍➡️ E15.1 person in motorized wheelchair facing right: medium skin tone
+1F9D1 1F3FD 200D 1F9BC 200D 27A1                       ; minimally-qualified # 🧑🏽‍🦼‍➡ E15.1 person in motorized wheelchair facing right: medium skin tone
+1F9D1 1F3FE 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏾‍🦼‍➡️ E15.1 person in motorized wheelchair facing right: medium-dark skin tone
+1F9D1 1F3FE 200D 1F9BC 200D 27A1                       ; minimally-qualified # 🧑🏾‍🦼‍➡ E15.1 person in motorized wheelchair facing right: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏿‍🦼‍➡️ E15.1 person in motorized wheelchair facing right: dark skin tone
+1F9D1 1F3FF 200D 1F9BC 200D 27A1                       ; minimally-qualified # 🧑🏿‍🦼‍➡ E15.1 person in motorized wheelchair facing right: dark skin tone
+1F468 200D 1F9BC                                       ; fully-qualified     # 👨‍🦼 E12.0 man in motorized wheelchair
+1F468 1F3FB 200D 1F9BC                                 ; fully-qualified     # 👨🏻‍🦼 E12.0 man in motorized wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BC                                 ; fully-qualified     # 👨🏼‍🦼 E12.0 man in motorized wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BC                                 ; fully-qualified     # 👨🏽‍🦼 E12.0 man in motorized wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BC                                 ; fully-qualified     # 👨🏾‍🦼 E12.0 man in motorized wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BC                                 ; fully-qualified     # 👨🏿‍🦼 E12.0 man in motorized wheelchair: dark skin tone
+1F468 200D 1F9BC 200D 27A1 FE0F                        ; fully-qualified     # 👨‍🦼‍➡️ E15.1 man in motorized wheelchair facing right
+1F468 200D 1F9BC 200D 27A1                             ; minimally-qualified # 👨‍🦼‍➡ E15.1 man in motorized wheelchair facing right
+1F468 1F3FB 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👨🏻‍🦼‍➡️ E15.1 man in motorized wheelchair facing right: light skin tone
+1F468 1F3FB 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👨🏻‍🦼‍➡ E15.1 man in motorized wheelchair facing right: light skin tone
+1F468 1F3FC 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👨🏼‍🦼‍➡️ E15.1 man in motorized wheelchair facing right: medium-light skin tone
+1F468 1F3FC 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👨🏼‍🦼‍➡ E15.1 man in motorized wheelchair facing right: medium-light skin tone
+1F468 1F3FD 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👨🏽‍🦼‍➡️ E15.1 man in motorized wheelchair facing right: medium skin tone
+1F468 1F3FD 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👨🏽‍🦼‍➡ E15.1 man in motorized wheelchair facing right: medium skin tone
+1F468 1F3FE 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👨🏾‍🦼‍➡️ E15.1 man in motorized wheelchair facing right: medium-dark skin tone
+1F468 1F3FE 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👨🏾‍🦼‍➡ E15.1 man in motorized wheelchair facing right: medium-dark skin tone
+1F468 1F3FF 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👨🏿‍🦼‍➡️ E15.1 man in motorized wheelchair facing right: dark skin tone
+1F468 1F3FF 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👨🏿‍🦼‍➡ E15.1 man in motorized wheelchair facing right: dark skin tone
+1F469 200D 1F9BC                                       ; fully-qualified     # 👩‍🦼 E12.0 woman in motorized wheelchair
+1F469 1F3FB 200D 1F9BC                                 ; fully-qualified     # 👩🏻‍🦼 E12.0 woman in motorized wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BC                                 ; fully-qualified     # 👩🏼‍🦼 E12.0 woman in motorized wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BC                                 ; fully-qualified     # 👩🏽‍🦼 E12.0 woman in motorized wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BC                                 ; fully-qualified     # 👩🏾‍🦼 E12.0 woman in motorized wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BC                                 ; fully-qualified     # 👩🏿‍🦼 E12.0 woman in motorized wheelchair: dark skin tone
+1F469 200D 1F9BC 200D 27A1 FE0F                        ; fully-qualified     # 👩‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right
+1F469 200D 1F9BC 200D 27A1                             ; minimally-qualified # 👩‍🦼‍➡ E15.1 woman in motorized wheelchair facing right
+1F469 1F3FB 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👩🏻‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right: light skin tone
+1F469 1F3FB 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👩🏻‍🦼‍➡ E15.1 woman in motorized wheelchair facing right: light skin tone
+1F469 1F3FC 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👩🏼‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right: medium-light skin tone
+1F469 1F3FC 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👩🏼‍🦼‍➡ E15.1 woman in motorized wheelchair facing right: medium-light skin tone
+1F469 1F3FD 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👩🏽‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right: medium skin tone
+1F469 1F3FD 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👩🏽‍🦼‍➡ E15.1 woman in motorized wheelchair facing right: medium skin tone
+1F469 1F3FE 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👩🏾‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right: medium-dark skin tone
+1F469 1F3FE 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👩🏾‍🦼‍➡ E15.1 woman in motorized wheelchair facing right: medium-dark skin tone
+1F469 1F3FF 200D 1F9BC 200D 27A1 FE0F                  ; fully-qualified     # 👩🏿‍🦼‍➡️ E15.1 woman in motorized wheelchair facing right: dark skin tone
+1F469 1F3FF 200D 1F9BC 200D 27A1                       ; minimally-qualified # 👩🏿‍🦼‍➡ E15.1 woman in motorized wheelchair facing right: dark skin tone
+1F9D1 200D 1F9BD                                       ; fully-qualified     # 🧑‍🦽 E12.1 person in manual wheelchair
+1F9D1 1F3FB 200D 1F9BD                                 ; fully-qualified     # 🧑🏻‍🦽 E12.1 person in manual wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BD                                 ; fully-qualified     # 🧑🏼‍🦽 E12.1 person in manual wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BD                                 ; fully-qualified     # 🧑🏽‍🦽 E12.1 person in manual wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BD                                 ; fully-qualified     # 🧑🏾‍🦽 E12.1 person in manual wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BD                                 ; fully-qualified     # 🧑🏿‍🦽 E12.1 person in manual wheelchair: dark skin tone
+1F9D1 200D 1F9BD 200D 27A1 FE0F                        ; fully-qualified     # 🧑‍🦽‍➡️ E15.1 person in manual wheelchair facing right
+1F9D1 200D 1F9BD 200D 27A1                             ; minimally-qualified # 🧑‍🦽‍➡ E15.1 person in manual wheelchair facing right
+1F9D1 1F3FB 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏻‍🦽‍➡️ E15.1 person in manual wheelchair facing right: light skin tone
+1F9D1 1F3FB 200D 1F9BD 200D 27A1                       ; minimally-qualified # 🧑🏻‍🦽‍➡ E15.1 person in manual wheelchair facing right: light skin tone
+1F9D1 1F3FC 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏼‍🦽‍➡️ E15.1 person in manual wheelchair facing right: medium-light skin tone
+1F9D1 1F3FC 200D 1F9BD 200D 27A1                       ; minimally-qualified # 🧑🏼‍🦽‍➡ E15.1 person in manual wheelchair facing right: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏽‍🦽‍➡️ E15.1 person in manual wheelchair facing right: medium skin tone
+1F9D1 1F3FD 200D 1F9BD 200D 27A1                       ; minimally-qualified # 🧑🏽‍🦽‍➡ E15.1 person in manual wheelchair facing right: medium skin tone
+1F9D1 1F3FE 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏾‍🦽‍➡️ E15.1 person in manual wheelchair facing right: medium-dark skin tone
+1F9D1 1F3FE 200D 1F9BD 200D 27A1                       ; minimally-qualified # 🧑🏾‍🦽‍➡ E15.1 person in manual wheelchair facing right: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 🧑🏿‍🦽‍➡️ E15.1 person in manual wheelchair facing right: dark skin tone
+1F9D1 1F3FF 200D 1F9BD 200D 27A1                       ; minimally-qualified # 🧑🏿‍🦽‍➡ E15.1 person in manual wheelchair facing right: dark skin tone
+1F468 200D 1F9BD                                       ; fully-qualified     # 👨‍🦽 E12.0 man in manual wheelchair
+1F468 1F3FB 200D 1F9BD                                 ; fully-qualified     # 👨🏻‍🦽 E12.0 man in manual wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BD                                 ; fully-qualified     # 👨🏼‍🦽 E12.0 man in manual wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BD                                 ; fully-qualified     # 👨🏽‍🦽 E12.0 man in manual wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BD                                 ; fully-qualified     # 👨🏾‍🦽 E12.0 man in manual wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BD                                 ; fully-qualified     # 👨🏿‍🦽 E12.0 man in manual wheelchair: dark skin tone
+1F468 200D 1F9BD 200D 27A1 FE0F                        ; fully-qualified     # 👨‍🦽‍➡️ E15.1 man in manual wheelchair facing right
+1F468 200D 1F9BD 200D 27A1                             ; minimally-qualified # 👨‍🦽‍➡ E15.1 man in manual wheelchair facing right
+1F468 1F3FB 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👨🏻‍🦽‍➡️ E15.1 man in manual wheelchair facing right: light skin tone
+1F468 1F3FB 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👨🏻‍🦽‍➡ E15.1 man in manual wheelchair facing right: light skin tone
+1F468 1F3FC 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👨🏼‍🦽‍➡️ E15.1 man in manual wheelchair facing right: medium-light skin tone
+1F468 1F3FC 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👨🏼‍🦽‍➡ E15.1 man in manual wheelchair facing right: medium-light skin tone
+1F468 1F3FD 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👨🏽‍🦽‍➡️ E15.1 man in manual wheelchair facing right: medium skin tone
+1F468 1F3FD 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👨🏽‍🦽‍➡ E15.1 man in manual wheelchair facing right: medium skin tone
+1F468 1F3FE 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👨🏾‍🦽‍➡️ E15.1 man in manual wheelchair facing right: medium-dark skin tone
+1F468 1F3FE 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👨🏾‍🦽‍➡ E15.1 man in manual wheelchair facing right: medium-dark skin tone
+1F468 1F3FF 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👨🏿‍🦽‍➡️ E15.1 man in manual wheelchair facing right: dark skin tone
+1F468 1F3FF 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👨🏿‍🦽‍➡ E15.1 man in manual wheelchair facing right: dark skin tone
+1F469 200D 1F9BD                                       ; fully-qualified     # 👩‍🦽 E12.0 woman in manual wheelchair
+1F469 1F3FB 200D 1F9BD                                 ; fully-qualified     # 👩🏻‍🦽 E12.0 woman in manual wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BD                                 ; fully-qualified     # 👩🏼‍🦽 E12.0 woman in manual wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BD                                 ; fully-qualified     # 👩🏽‍🦽 E12.0 woman in manual wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BD                                 ; fully-qualified     # 👩🏾‍🦽 E12.0 woman in manual wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BD                                 ; fully-qualified     # 👩🏿‍🦽 E12.0 woman in manual wheelchair: dark skin tone
+1F469 200D 1F9BD 200D 27A1 FE0F                        ; fully-qualified     # 👩‍🦽‍➡️ E15.1 woman in manual wheelchair facing right
+1F469 200D 1F9BD 200D 27A1                             ; minimally-qualified # 👩‍🦽‍➡ E15.1 woman in manual wheelchair facing right
+1F469 1F3FB 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👩🏻‍🦽‍➡️ E15.1 woman in manual wheelchair facing right: light skin tone
+1F469 1F3FB 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👩🏻‍🦽‍➡ E15.1 woman in manual wheelchair facing right: light skin tone
+1F469 1F3FC 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👩🏼‍🦽‍➡️ E15.1 woman in manual wheelchair facing right: medium-light skin tone
+1F469 1F3FC 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👩🏼‍🦽‍➡ E15.1 woman in manual wheelchair facing right: medium-light skin tone
+1F469 1F3FD 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👩🏽‍🦽‍➡️ E15.1 woman in manual wheelchair facing right: medium skin tone
+1F469 1F3FD 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👩🏽‍🦽‍➡ E15.1 woman in manual wheelchair facing right: medium skin tone
+1F469 1F3FE 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👩🏾‍🦽‍➡️ E15.1 woman in manual wheelchair facing right: medium-dark skin tone
+1F469 1F3FE 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👩🏾‍🦽‍➡ E15.1 woman in manual wheelchair facing right: medium-dark skin tone
+1F469 1F3FF 200D 1F9BD 200D 27A1 FE0F                  ; fully-qualified     # 👩🏿‍🦽‍➡️ E15.1 woman in manual wheelchair facing right: dark skin tone
+1F469 1F3FF 200D 1F9BD 200D 27A1                       ; minimally-qualified # 👩🏿‍🦽‍➡ E15.1 woman in manual wheelchair facing right: dark skin tone
+1F3C3                                                  ; fully-qualified     # 🏃 E0.6 person running
+1F3C3 1F3FB                                            ; fully-qualified     # 🏃🏻 E1.0 person running: light skin tone
+1F3C3 1F3FC                                            ; fully-qualified     # 🏃🏼 E1.0 person running: medium-light skin tone
+1F3C3 1F3FD                                            ; fully-qualified     # 🏃🏽 E1.0 person running: medium skin tone
+1F3C3 1F3FE                                            ; fully-qualified     # 🏃🏾 E1.0 person running: medium-dark skin tone
+1F3C3 1F3FF                                            ; fully-qualified     # 🏃🏿 E1.0 person running: dark skin tone
+1F3C3 200D 2642 FE0F                                   ; fully-qualified     # 🏃‍♂️ E4.0 man running
+1F3C3 200D 2642                                        ; minimally-qualified # 🏃‍♂ E4.0 man running
+1F3C3 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏃🏻‍♂️ E4.0 man running: light skin tone
+1F3C3 1F3FB 200D 2642                                  ; minimally-qualified # 🏃🏻‍♂ E4.0 man running: light skin tone
+1F3C3 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🏃🏼‍♂️ E4.0 man running: medium-light skin tone
+1F3C3 1F3FC 200D 2642                                  ; minimally-qualified # 🏃🏼‍♂ E4.0 man running: medium-light skin tone
+1F3C3 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🏃🏽‍♂️ E4.0 man running: medium skin tone
+1F3C3 1F3FD 200D 2642                                  ; minimally-qualified # 🏃🏽‍♂ E4.0 man running: medium skin tone
+1F3C3 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🏃🏾‍♂️ E4.0 man running: medium-dark skin tone
+1F3C3 1F3FE 200D 2642                                  ; minimally-qualified # 🏃🏾‍♂ E4.0 man running: medium-dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🏃🏿‍♂️ E4.0 man running: dark skin tone
+1F3C3 1F3FF 200D 2642                                  ; minimally-qualified # 🏃🏿‍♂ E4.0 man running: dark skin tone
+1F3C3 200D 2640 FE0F                                   ; fully-qualified     # 🏃‍♀️ E4.0 woman running
+1F3C3 200D 2640                                        ; minimally-qualified # 🏃‍♀ E4.0 woman running
+1F3C3 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏃🏻‍♀️ E4.0 woman running: light skin tone
+1F3C3 1F3FB 200D 2640                                  ; minimally-qualified # 🏃🏻‍♀ E4.0 woman running: light skin tone
+1F3C3 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🏃🏼‍♀️ E4.0 woman running: medium-light skin tone
+1F3C3 1F3FC 200D 2640                                  ; minimally-qualified # 🏃🏼‍♀ E4.0 woman running: medium-light skin tone
+1F3C3 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🏃🏽‍♀️ E4.0 woman running: medium skin tone
+1F3C3 1F3FD 200D 2640                                  ; minimally-qualified # 🏃🏽‍♀ E4.0 woman running: medium skin tone
+1F3C3 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🏃🏾‍♀️ E4.0 woman running: medium-dark skin tone
+1F3C3 1F3FE 200D 2640                                  ; minimally-qualified # 🏃🏾‍♀ E4.0 woman running: medium-dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🏃🏿‍♀️ E4.0 woman running: dark skin tone
+1F3C3 1F3FF 200D 2640                                  ; minimally-qualified # 🏃🏿‍♀ E4.0 woman running: dark skin tone
+1F3C3 200D 27A1 FE0F                                   ; fully-qualified     # 🏃‍➡️ E15.1 person running facing right
+1F3C3 200D 27A1                                        ; minimally-qualified # 🏃‍➡ E15.1 person running facing right
+1F3C3 1F3FB 200D 27A1 FE0F                             ; fully-qualified     # 🏃🏻‍➡️ E15.1 person running facing right: light skin tone
+1F3C3 1F3FB 200D 27A1                                  ; minimally-qualified # 🏃🏻‍➡ E15.1 person running facing right: light skin tone
+1F3C3 1F3FC 200D 27A1 FE0F                             ; fully-qualified     # 🏃🏼‍➡️ E15.1 person running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 27A1                                  ; minimally-qualified # 🏃🏼‍➡ E15.1 person running facing right: medium-light skin tone
+1F3C3 1F3FD 200D 27A1 FE0F                             ; fully-qualified     # 🏃🏽‍➡️ E15.1 person running facing right: medium skin tone
+1F3C3 1F3FD 200D 27A1                                  ; minimally-qualified # 🏃🏽‍➡ E15.1 person running facing right: medium skin tone
+1F3C3 1F3FE 200D 27A1 FE0F                             ; fully-qualified     # 🏃🏾‍➡️ E15.1 person running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 27A1                                  ; minimally-qualified # 🏃🏾‍➡ E15.1 person running facing right: medium-dark skin tone
+1F3C3 1F3FF 200D 27A1 FE0F                             ; fully-qualified     # 🏃🏿‍➡️ E15.1 person running facing right: dark skin tone
+1F3C3 1F3FF 200D 27A1                                  ; minimally-qualified # 🏃🏿‍➡ E15.1 person running facing right: dark skin tone
+1F3C3 200D 2640 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🏃‍♀️‍➡️ E15.1 woman running facing right
+1F3C3 200D 2640 200D 27A1 FE0F                         ; minimally-qualified # 🏃‍♀‍➡️ E15.1 woman running facing right
+1F3C3 200D 2640 FE0F 200D 27A1                         ; minimally-qualified # 🏃‍♀️‍➡ E15.1 woman running facing right
+1F3C3 200D 2640 200D 27A1                              ; minimally-qualified # 🏃‍♀‍➡ E15.1 woman running facing right
+1F3C3 1F3FB 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏻‍♀️‍➡️ E15.1 woman running facing right: light skin tone
+1F3C3 1F3FB 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏻‍♀‍➡️ E15.1 woman running facing right: light skin tone
+1F3C3 1F3FB 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏻‍♀️‍➡ E15.1 woman running facing right: light skin tone
+1F3C3 1F3FB 200D 2640 200D 27A1                        ; minimally-qualified # 🏃🏻‍♀‍➡ E15.1 woman running facing right: light skin tone
+1F3C3 1F3FC 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏼‍♀️‍➡️ E15.1 woman running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏼‍♀‍➡️ E15.1 woman running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏼‍♀️‍➡ E15.1 woman running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2640 200D 27A1                        ; minimally-qualified # 🏃🏼‍♀‍➡ E15.1 woman running facing right: medium-light skin tone
+1F3C3 1F3FD 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏽‍♀️‍➡️ E15.1 woman running facing right: medium skin tone
+1F3C3 1F3FD 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏽‍♀‍➡️ E15.1 woman running facing right: medium skin tone
+1F3C3 1F3FD 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏽‍♀️‍➡ E15.1 woman running facing right: medium skin tone
+1F3C3 1F3FD 200D 2640 200D 27A1                        ; minimally-qualified # 🏃🏽‍♀‍➡ E15.1 woman running facing right: medium skin tone
+1F3C3 1F3FE 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏾‍♀️‍➡️ E15.1 woman running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏾‍♀‍➡️ E15.1 woman running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏾‍♀️‍➡ E15.1 woman running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2640 200D 27A1                        ; minimally-qualified # 🏃🏾‍♀‍➡ E15.1 woman running facing right: medium-dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏿‍♀️‍➡️ E15.1 woman running facing right: dark skin tone
+1F3C3 1F3FF 200D 2640 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏿‍♀‍➡️ E15.1 woman running facing right: dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏿‍♀️‍➡ E15.1 woman running facing right: dark skin tone
+1F3C3 1F3FF 200D 2640 200D 27A1                        ; minimally-qualified # 🏃🏿‍♀‍➡ E15.1 woman running facing right: dark skin tone
+1F3C3 200D 2642 FE0F 200D 27A1 FE0F                    ; fully-qualified     # 🏃‍♂️‍➡️ E15.1 man running facing right
+1F3C3 200D 2642 200D 27A1 FE0F                         ; minimally-qualified # 🏃‍♂‍➡️ E15.1 man running facing right
+1F3C3 200D 2642 FE0F 200D 27A1                         ; minimally-qualified # 🏃‍♂️‍➡ E15.1 man running facing right
+1F3C3 200D 2642 200D 27A1                              ; minimally-qualified # 🏃‍♂‍➡ E15.1 man running facing right
+1F3C3 1F3FB 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏻‍♂️‍➡️ E15.1 man running facing right: light skin tone
+1F3C3 1F3FB 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏻‍♂‍➡️ E15.1 man running facing right: light skin tone
+1F3C3 1F3FB 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏻‍♂️‍➡ E15.1 man running facing right: light skin tone
+1F3C3 1F3FB 200D 2642 200D 27A1                        ; minimally-qualified # 🏃🏻‍♂‍➡ E15.1 man running facing right: light skin tone
+1F3C3 1F3FC 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏼‍♂️‍➡️ E15.1 man running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏼‍♂‍➡️ E15.1 man running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏼‍♂️‍➡ E15.1 man running facing right: medium-light skin tone
+1F3C3 1F3FC 200D 2642 200D 27A1                        ; minimally-qualified # 🏃🏼‍♂‍➡ E15.1 man running facing right: medium-light skin tone
+1F3C3 1F3FD 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏽‍♂️‍➡️ E15.1 man running facing right: medium skin tone
+1F3C3 1F3FD 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏽‍♂‍➡️ E15.1 man running facing right: medium skin tone
+1F3C3 1F3FD 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏽‍♂️‍➡ E15.1 man running facing right: medium skin tone
+1F3C3 1F3FD 200D 2642 200D 27A1                        ; minimally-qualified # 🏃🏽‍♂‍➡ E15.1 man running facing right: medium skin tone
+1F3C3 1F3FE 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏾‍♂️‍➡️ E15.1 man running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏾‍♂‍➡️ E15.1 man running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏾‍♂️‍➡ E15.1 man running facing right: medium-dark skin tone
+1F3C3 1F3FE 200D 2642 200D 27A1                        ; minimally-qualified # 🏃🏾‍♂‍➡ E15.1 man running facing right: medium-dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F 200D 27A1 FE0F              ; fully-qualified     # 🏃🏿‍♂️‍➡️ E15.1 man running facing right: dark skin tone
+1F3C3 1F3FF 200D 2642 200D 27A1 FE0F                   ; minimally-qualified # 🏃🏿‍♂‍➡️ E15.1 man running facing right: dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F 200D 27A1                   ; minimally-qualified # 🏃🏿‍♂️‍➡ E15.1 man running facing right: dark skin tone
+1F3C3 1F3FF 200D 2642 200D 27A1                        ; minimally-qualified # 🏃🏿‍♂‍➡ E15.1 man running facing right: dark skin tone
+1F483                                                  ; fully-qualified     # 💃 E0.6 woman dancing
+1F483 1F3FB                                            ; fully-qualified     # 💃🏻 E1.0 woman dancing: light skin tone
+1F483 1F3FC                                            ; fully-qualified     # 💃🏼 E1.0 woman dancing: medium-light skin tone
+1F483 1F3FD                                            ; fully-qualified     # 💃🏽 E1.0 woman dancing: medium skin tone
+1F483 1F3FE                                            ; fully-qualified     # 💃🏾 E1.0 woman dancing: medium-dark skin tone
+1F483 1F3FF                                            ; fully-qualified     # 💃🏿 E1.0 woman dancing: dark skin tone
+1F57A                                                  ; fully-qualified     # 🕺 E3.0 man dancing
+1F57A 1F3FB                                            ; fully-qualified     # 🕺🏻 E3.0 man dancing: light skin tone
+1F57A 1F3FC                                            ; fully-qualified     # 🕺🏼 E3.0 man dancing: medium-light skin tone
+1F57A 1F3FD                                            ; fully-qualified     # 🕺🏽 E3.0 man dancing: medium skin tone
+1F57A 1F3FE                                            ; fully-qualified     # 🕺🏾 E3.0 man dancing: medium-dark skin tone
+1F57A 1F3FF                                            ; fully-qualified     # 🕺🏿 E3.0 man dancing: dark skin tone
+1F574 FE0F                                             ; fully-qualified     # 🕴️ E0.7 person in suit levitating
+1F574                                                  ; unqualified         # 🕴 E0.7 person in suit levitating
+1F574 1F3FB                                            ; fully-qualified     # 🕴🏻 E4.0 person in suit levitating: light skin tone
+1F574 1F3FC                                            ; fully-qualified     # 🕴🏼 E4.0 person in suit levitating: medium-light skin tone
+1F574 1F3FD                                            ; fully-qualified     # 🕴🏽 E4.0 person in suit levitating: medium skin tone
+1F574 1F3FE                                            ; fully-qualified     # 🕴🏾 E4.0 person in suit levitating: medium-dark skin tone
+1F574 1F3FF                                            ; fully-qualified     # 🕴🏿 E4.0 person in suit levitating: dark skin tone
+1F46F                                                  ; fully-qualified     # 👯 E0.6 people with bunny ears
+1F46F 200D 2642 FE0F                                   ; fully-qualified     # 👯‍♂️ E4.0 men with bunny ears
+1F46F 200D 2642                                        ; minimally-qualified # 👯‍♂ E4.0 men with bunny ears
+1F46F 200D 2640 FE0F                                   ; fully-qualified     # 👯‍♀️ E4.0 women with bunny ears
+1F46F 200D 2640                                        ; minimally-qualified # 👯‍♀ E4.0 women with bunny ears
+1F9D6                                                  ; fully-qualified     # 🧖 E5.0 person in steamy room
+1F9D6 1F3FB                                            ; fully-qualified     # 🧖🏻 E5.0 person in steamy room: light skin tone
+1F9D6 1F3FC                                            ; fully-qualified     # 🧖🏼 E5.0 person in steamy room: medium-light skin tone
+1F9D6 1F3FD                                            ; fully-qualified     # 🧖🏽 E5.0 person in steamy room: medium skin tone
+1F9D6 1F3FE                                            ; fully-qualified     # 🧖🏾 E5.0 person in steamy room: medium-dark skin tone
+1F9D6 1F3FF                                            ; fully-qualified     # 🧖🏿 E5.0 person in steamy room: dark skin tone
+1F9D6 200D 2642 FE0F                                   ; fully-qualified     # 🧖‍♂️ E5.0 man in steamy room
+1F9D6 200D 2642                                        ; minimally-qualified # 🧖‍♂ E5.0 man in steamy room
+1F9D6 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧖🏻‍♂️ E5.0 man in steamy room: light skin tone
+1F9D6 1F3FB 200D 2642                                  ; minimally-qualified # 🧖🏻‍♂ E5.0 man in steamy room: light skin tone
+1F9D6 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧖🏼‍♂️ E5.0 man in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2642                                  ; minimally-qualified # 🧖🏼‍♂ E5.0 man in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧖🏽‍♂️ E5.0 man in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2642                                  ; minimally-qualified # 🧖🏽‍♂ E5.0 man in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧖🏾‍♂️ E5.0 man in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2642                                  ; minimally-qualified # 🧖🏾‍♂ E5.0 man in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧖🏿‍♂️ E5.0 man in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2642                                  ; minimally-qualified # 🧖🏿‍♂ E5.0 man in steamy room: dark skin tone
+1F9D6 200D 2640 FE0F                                   ; fully-qualified     # 🧖‍♀️ E5.0 woman in steamy room
+1F9D6 200D 2640                                        ; minimally-qualified # 🧖‍♀ E5.0 woman in steamy room
+1F9D6 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧖🏻‍♀️ E5.0 woman in steamy room: light skin tone
+1F9D6 1F3FB 200D 2640                                  ; minimally-qualified # 🧖🏻‍♀ E5.0 woman in steamy room: light skin tone
+1F9D6 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧖🏼‍♀️ E5.0 woman in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2640                                  ; minimally-qualified # 🧖🏼‍♀ E5.0 woman in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧖🏽‍♀️ E5.0 woman in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2640                                  ; minimally-qualified # 🧖🏽‍♀ E5.0 woman in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧖🏾‍♀️ E5.0 woman in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2640                                  ; minimally-qualified # 🧖🏾‍♀ E5.0 woman in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧖🏿‍♀️ E5.0 woman in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2640                                  ; minimally-qualified # 🧖🏿‍♀ E5.0 woman in steamy room: dark skin tone
+1F9D7                                                  ; fully-qualified     # 🧗 E5.0 person climbing
+1F9D7 1F3FB                                            ; fully-qualified     # 🧗🏻 E5.0 person climbing: light skin tone
+1F9D7 1F3FC                                            ; fully-qualified     # 🧗🏼 E5.0 person climbing: medium-light skin tone
+1F9D7 1F3FD                                            ; fully-qualified     # 🧗🏽 E5.0 person climbing: medium skin tone
+1F9D7 1F3FE                                            ; fully-qualified     # 🧗🏾 E5.0 person climbing: medium-dark skin tone
+1F9D7 1F3FF                                            ; fully-qualified     # 🧗🏿 E5.0 person climbing: dark skin tone
+1F9D7 200D 2642 FE0F                                   ; fully-qualified     # 🧗‍♂️ E5.0 man climbing
+1F9D7 200D 2642                                        ; minimally-qualified # 🧗‍♂ E5.0 man climbing
+1F9D7 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧗🏻‍♂️ E5.0 man climbing: light skin tone
+1F9D7 1F3FB 200D 2642                                  ; minimally-qualified # 🧗🏻‍♂ E5.0 man climbing: light skin tone
+1F9D7 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧗🏼‍♂️ E5.0 man climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2642                                  ; minimally-qualified # 🧗🏼‍♂ E5.0 man climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧗🏽‍♂️ E5.0 man climbing: medium skin tone
+1F9D7 1F3FD 200D 2642                                  ; minimally-qualified # 🧗🏽‍♂ E5.0 man climbing: medium skin tone
+1F9D7 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧗🏾‍♂️ E5.0 man climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2642                                  ; minimally-qualified # 🧗🏾‍♂ E5.0 man climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧗🏿‍♂️ E5.0 man climbing: dark skin tone
+1F9D7 1F3FF 200D 2642                                  ; minimally-qualified # 🧗🏿‍♂ E5.0 man climbing: dark skin tone
+1F9D7 200D 2640 FE0F                                   ; fully-qualified     # 🧗‍♀️ E5.0 woman climbing
+1F9D7 200D 2640                                        ; minimally-qualified # 🧗‍♀ E5.0 woman climbing
+1F9D7 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧗🏻‍♀️ E5.0 woman climbing: light skin tone
+1F9D7 1F3FB 200D 2640                                  ; minimally-qualified # 🧗🏻‍♀ E5.0 woman climbing: light skin tone
+1F9D7 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧗🏼‍♀️ E5.0 woman climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2640                                  ; minimally-qualified # 🧗🏼‍♀ E5.0 woman climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧗🏽‍♀️ E5.0 woman climbing: medium skin tone
+1F9D7 1F3FD 200D 2640                                  ; minimally-qualified # 🧗🏽‍♀ E5.0 woman climbing: medium skin tone
+1F9D7 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧗🏾‍♀️ E5.0 woman climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2640                                  ; minimally-qualified # 🧗🏾‍♀ E5.0 woman climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧗🏿‍♀️ E5.0 woman climbing: dark skin tone
+1F9D7 1F3FF 200D 2640                                  ; minimally-qualified # 🧗🏿‍♀ E5.0 woman climbing: dark skin tone
+
+# subgroup: person-sport
+1F93A                                                  ; fully-qualified     # 🤺 E3.0 person fencing
+1F3C7                                                  ; fully-qualified     # 🏇 E1.0 horse racing
+1F3C7 1F3FB                                            ; fully-qualified     # 🏇🏻 E1.0 horse racing: light skin tone
+1F3C7 1F3FC                                            ; fully-qualified     # 🏇🏼 E1.0 horse racing: medium-light skin tone
+1F3C7 1F3FD                                            ; fully-qualified     # 🏇🏽 E1.0 horse racing: medium skin tone
+1F3C7 1F3FE                                            ; fully-qualified     # 🏇🏾 E1.0 horse racing: medium-dark skin tone
+1F3C7 1F3FF                                            ; fully-qualified     # 🏇🏿 E1.0 horse racing: dark skin tone
+26F7 FE0F                                              ; fully-qualified     # ⛷️ E0.7 skier
+26F7                                                   ; unqualified         # ⛷ E0.7 skier
+1F3C2                                                  ; fully-qualified     # 🏂 E0.6 snowboarder
+1F3C2 1F3FB                                            ; fully-qualified     # 🏂🏻 E1.0 snowboarder: light skin tone
+1F3C2 1F3FC                                            ; fully-qualified     # 🏂🏼 E1.0 snowboarder: medium-light skin tone
+1F3C2 1F3FD                                            ; fully-qualified     # 🏂🏽 E1.0 snowboarder: medium skin tone
+1F3C2 1F3FE                                            ; fully-qualified     # 🏂🏾 E1.0 snowboarder: medium-dark skin tone
+1F3C2 1F3FF                                            ; fully-qualified     # 🏂🏿 E1.0 snowboarder: dark skin tone
+1F3CC FE0F                                             ; fully-qualified     # 🏌️ E0.7 person golfing
+1F3CC                                                  ; unqualified         # 🏌 E0.7 person golfing
+1F3CC 1F3FB                                            ; fully-qualified     # 🏌🏻 E4.0 person golfing: light skin tone
+1F3CC 1F3FC                                            ; fully-qualified     # 🏌🏼 E4.0 person golfing: medium-light skin tone
+1F3CC 1F3FD                                            ; fully-qualified     # 🏌🏽 E4.0 person golfing: medium skin tone
+1F3CC 1F3FE                                            ; fully-qualified     # 🏌🏾 E4.0 person golfing: medium-dark skin tone
+1F3CC 1F3FF                                            ; fully-qualified     # 🏌🏿 E4.0 person golfing: dark skin tone
+1F3CC FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏌️‍♂️ E4.0 man golfing
+1F3CC 200D 2642 FE0F                                   ; unqualified         # 🏌‍♂️ E4.0 man golfing
+1F3CC FE0F 200D 2642                                   ; minimally-qualified # 🏌️‍♂ E4.0 man golfing
+1F3CC 200D 2642                                        ; unqualified         # 🏌‍♂ E4.0 man golfing
+1F3CC 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏌🏻‍♂️ E4.0 man golfing: light skin tone
+1F3CC 1F3FB 200D 2642                                  ; minimally-qualified # 🏌🏻‍♂ E4.0 man golfing: light skin tone
+1F3CC 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🏌🏼‍♂️ E4.0 man golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2642                                  ; minimally-qualified # 🏌🏼‍♂ E4.0 man golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🏌🏽‍♂️ E4.0 man golfing: medium skin tone
+1F3CC 1F3FD 200D 2642                                  ; minimally-qualified # 🏌🏽‍♂ E4.0 man golfing: medium skin tone
+1F3CC 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🏌🏾‍♂️ E4.0 man golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2642                                  ; minimally-qualified # 🏌🏾‍♂ E4.0 man golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🏌🏿‍♂️ E4.0 man golfing: dark skin tone
+1F3CC 1F3FF 200D 2642                                  ; minimally-qualified # 🏌🏿‍♂ E4.0 man golfing: dark skin tone
+1F3CC FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏌️‍♀️ E4.0 woman golfing
+1F3CC 200D 2640 FE0F                                   ; unqualified         # 🏌‍♀️ E4.0 woman golfing
+1F3CC FE0F 200D 2640                                   ; minimally-qualified # 🏌️‍♀ E4.0 woman golfing
+1F3CC 200D 2640                                        ; unqualified         # 🏌‍♀ E4.0 woman golfing
+1F3CC 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏌🏻‍♀️ E4.0 woman golfing: light skin tone
+1F3CC 1F3FB 200D 2640                                  ; minimally-qualified # 🏌🏻‍♀ E4.0 woman golfing: light skin tone
+1F3CC 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🏌🏼‍♀️ E4.0 woman golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2640                                  ; minimally-qualified # 🏌🏼‍♀ E4.0 woman golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🏌🏽‍♀️ E4.0 woman golfing: medium skin tone
+1F3CC 1F3FD 200D 2640                                  ; minimally-qualified # 🏌🏽‍♀ E4.0 woman golfing: medium skin tone
+1F3CC 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🏌🏾‍♀️ E4.0 woman golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2640                                  ; minimally-qualified # 🏌🏾‍♀ E4.0 woman golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🏌🏿‍♀️ E4.0 woman golfing: dark skin tone
+1F3CC 1F3FF 200D 2640                                  ; minimally-qualified # 🏌🏿‍♀ E4.0 woman golfing: dark skin tone
+1F3C4                                                  ; fully-qualified     # 🏄 E0.6 person surfing
+1F3C4 1F3FB                                            ; fully-qualified     # 🏄🏻 E1.0 person surfing: light skin tone
+1F3C4 1F3FC                                            ; fully-qualified     # 🏄🏼 E1.0 person surfing: medium-light skin tone
+1F3C4 1F3FD                                            ; fully-qualified     # 🏄🏽 E1.0 person surfing: medium skin tone
+1F3C4 1F3FE                                            ; fully-qualified     # 🏄🏾 E1.0 person surfing: medium-dark skin tone
+1F3C4 1F3FF                                            ; fully-qualified     # 🏄🏿 E1.0 person surfing: dark skin tone
+1F3C4 200D 2642 FE0F                                   ; fully-qualified     # 🏄‍♂️ E4.0 man surfing
+1F3C4 200D 2642                                        ; minimally-qualified # 🏄‍♂ E4.0 man surfing
+1F3C4 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏄🏻‍♂️ E4.0 man surfing: light skin tone
+1F3C4 1F3FB 200D 2642                                  ; minimally-qualified # 🏄🏻‍♂ E4.0 man surfing: light skin tone
+1F3C4 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🏄🏼‍♂️ E4.0 man surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2642                                  ; minimally-qualified # 🏄🏼‍♂ E4.0 man surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🏄🏽‍♂️ E4.0 man surfing: medium skin tone
+1F3C4 1F3FD 200D 2642                                  ; minimally-qualified # 🏄🏽‍♂ E4.0 man surfing: medium skin tone
+1F3C4 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🏄🏾‍♂️ E4.0 man surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2642                                  ; minimally-qualified # 🏄🏾‍♂ E4.0 man surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🏄🏿‍♂️ E4.0 man surfing: dark skin tone
+1F3C4 1F3FF 200D 2642                                  ; minimally-qualified # 🏄🏿‍♂ E4.0 man surfing: dark skin tone
+1F3C4 200D 2640 FE0F                                   ; fully-qualified     # 🏄‍♀️ E4.0 woman surfing
+1F3C4 200D 2640                                        ; minimally-qualified # 🏄‍♀ E4.0 woman surfing
+1F3C4 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏄🏻‍♀️ E4.0 woman surfing: light skin tone
+1F3C4 1F3FB 200D 2640                                  ; minimally-qualified # 🏄🏻‍♀ E4.0 woman surfing: light skin tone
+1F3C4 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🏄🏼‍♀️ E4.0 woman surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2640                                  ; minimally-qualified # 🏄🏼‍♀ E4.0 woman surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🏄🏽‍♀️ E4.0 woman surfing: medium skin tone
+1F3C4 1F3FD 200D 2640                                  ; minimally-qualified # 🏄🏽‍♀ E4.0 woman surfing: medium skin tone
+1F3C4 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🏄🏾‍♀️ E4.0 woman surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2640                                  ; minimally-qualified # 🏄🏾‍♀ E4.0 woman surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🏄🏿‍♀️ E4.0 woman surfing: dark skin tone
+1F3C4 1F3FF 200D 2640                                  ; minimally-qualified # 🏄🏿‍♀ E4.0 woman surfing: dark skin tone
+1F6A3                                                  ; fully-qualified     # 🚣 E1.0 person rowing boat
+1F6A3 1F3FB                                            ; fully-qualified     # 🚣🏻 E1.0 person rowing boat: light skin tone
+1F6A3 1F3FC                                            ; fully-qualified     # 🚣🏼 E1.0 person rowing boat: medium-light skin tone
+1F6A3 1F3FD                                            ; fully-qualified     # 🚣🏽 E1.0 person rowing boat: medium skin tone
+1F6A3 1F3FE                                            ; fully-qualified     # 🚣🏾 E1.0 person rowing boat: medium-dark skin tone
+1F6A3 1F3FF                                            ; fully-qualified     # 🚣🏿 E1.0 person rowing boat: dark skin tone
+1F6A3 200D 2642 FE0F                                   ; fully-qualified     # 🚣‍♂️ E4.0 man rowing boat
+1F6A3 200D 2642                                        ; minimally-qualified # 🚣‍♂ E4.0 man rowing boat
+1F6A3 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🚣🏻‍♂️ E4.0 man rowing boat: light skin tone
+1F6A3 1F3FB 200D 2642                                  ; minimally-qualified # 🚣🏻‍♂ E4.0 man rowing boat: light skin tone
+1F6A3 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🚣🏼‍♂️ E4.0 man rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2642                                  ; minimally-qualified # 🚣🏼‍♂ E4.0 man rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🚣🏽‍♂️ E4.0 man rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2642                                  ; minimally-qualified # 🚣🏽‍♂ E4.0 man rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🚣🏾‍♂️ E4.0 man rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2642                                  ; minimally-qualified # 🚣🏾‍♂ E4.0 man rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🚣🏿‍♂️ E4.0 man rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2642                                  ; minimally-qualified # 🚣🏿‍♂ E4.0 man rowing boat: dark skin tone
+1F6A3 200D 2640 FE0F                                   ; fully-qualified     # 🚣‍♀️ E4.0 woman rowing boat
+1F6A3 200D 2640                                        ; minimally-qualified # 🚣‍♀ E4.0 woman rowing boat
+1F6A3 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🚣🏻‍♀️ E4.0 woman rowing boat: light skin tone
+1F6A3 1F3FB 200D 2640                                  ; minimally-qualified # 🚣🏻‍♀ E4.0 woman rowing boat: light skin tone
+1F6A3 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🚣🏼‍♀️ E4.0 woman rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2640                                  ; minimally-qualified # 🚣🏼‍♀ E4.0 woman rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🚣🏽‍♀️ E4.0 woman rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2640                                  ; minimally-qualified # 🚣🏽‍♀ E4.0 woman rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🚣🏾‍♀️ E4.0 woman rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2640                                  ; minimally-qualified # 🚣🏾‍♀ E4.0 woman rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🚣🏿‍♀️ E4.0 woman rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2640                                  ; minimally-qualified # 🚣🏿‍♀ E4.0 woman rowing boat: dark skin tone
+1F3CA                                                  ; fully-qualified     # 🏊 E0.6 person swimming
+1F3CA 1F3FB                                            ; fully-qualified     # 🏊🏻 E1.0 person swimming: light skin tone
+1F3CA 1F3FC                                            ; fully-qualified     # 🏊🏼 E1.0 person swimming: medium-light skin tone
+1F3CA 1F3FD                                            ; fully-qualified     # 🏊🏽 E1.0 person swimming: medium skin tone
+1F3CA 1F3FE                                            ; fully-qualified     # 🏊🏾 E1.0 person swimming: medium-dark skin tone
+1F3CA 1F3FF                                            ; fully-qualified     # 🏊🏿 E1.0 person swimming: dark skin tone
+1F3CA 200D 2642 FE0F                                   ; fully-qualified     # 🏊‍♂️ E4.0 man swimming
+1F3CA 200D 2642                                        ; minimally-qualified # 🏊‍♂ E4.0 man swimming
+1F3CA 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏊🏻‍♂️ E4.0 man swimming: light skin tone
+1F3CA 1F3FB 200D 2642                                  ; minimally-qualified # 🏊🏻‍♂ E4.0 man swimming: light skin tone
+1F3CA 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🏊🏼‍♂️ E4.0 man swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2642                                  ; minimally-qualified # 🏊🏼‍♂ E4.0 man swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🏊🏽‍♂️ E4.0 man swimming: medium skin tone
+1F3CA 1F3FD 200D 2642                                  ; minimally-qualified # 🏊🏽‍♂ E4.0 man swimming: medium skin tone
+1F3CA 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🏊🏾‍♂️ E4.0 man swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2642                                  ; minimally-qualified # 🏊🏾‍♂ E4.0 man swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🏊🏿‍♂️ E4.0 man swimming: dark skin tone
+1F3CA 1F3FF 200D 2642                                  ; minimally-qualified # 🏊🏿‍♂ E4.0 man swimming: dark skin tone
+1F3CA 200D 2640 FE0F                                   ; fully-qualified     # 🏊‍♀️ E4.0 woman swimming
+1F3CA 200D 2640                                        ; minimally-qualified # 🏊‍♀ E4.0 woman swimming
+1F3CA 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏊🏻‍♀️ E4.0 woman swimming: light skin tone
+1F3CA 1F3FB 200D 2640                                  ; minimally-qualified # 🏊🏻‍♀ E4.0 woman swimming: light skin tone
+1F3CA 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🏊🏼‍♀️ E4.0 woman swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2640                                  ; minimally-qualified # 🏊🏼‍♀ E4.0 woman swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🏊🏽‍♀️ E4.0 woman swimming: medium skin tone
+1F3CA 1F3FD 200D 2640                                  ; minimally-qualified # 🏊🏽‍♀ E4.0 woman swimming: medium skin tone
+1F3CA 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🏊🏾‍♀️ E4.0 woman swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2640                                  ; minimally-qualified # 🏊🏾‍♀ E4.0 woman swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🏊🏿‍♀️ E4.0 woman swimming: dark skin tone
+1F3CA 1F3FF 200D 2640                                  ; minimally-qualified # 🏊🏿‍♀ E4.0 woman swimming: dark skin tone
+26F9 FE0F                                              ; fully-qualified     # ⛹️ E0.7 person bouncing ball
+26F9                                                   ; unqualified         # ⛹ E0.7 person bouncing ball
+26F9 1F3FB                                             ; fully-qualified     # ⛹🏻 E2.0 person bouncing ball: light skin tone
+26F9 1F3FC                                             ; fully-qualified     # ⛹🏼 E2.0 person bouncing ball: medium-light skin tone
+26F9 1F3FD                                             ; fully-qualified     # ⛹🏽 E2.0 person bouncing ball: medium skin tone
+26F9 1F3FE                                             ; fully-qualified     # ⛹🏾 E2.0 person bouncing ball: medium-dark skin tone
+26F9 1F3FF                                             ; fully-qualified     # ⛹🏿 E2.0 person bouncing ball: dark skin tone
+26F9 FE0F 200D 2642 FE0F                               ; fully-qualified     # ⛹️‍♂️ E4.0 man bouncing ball
+26F9 200D 2642 FE0F                                    ; unqualified         # ⛹‍♂️ E4.0 man bouncing ball
+26F9 FE0F 200D 2642                                    ; minimally-qualified # ⛹️‍♂ E4.0 man bouncing ball
+26F9 200D 2642                                         ; unqualified         # ⛹‍♂ E4.0 man bouncing ball
+26F9 1F3FB 200D 2642 FE0F                              ; fully-qualified     # ⛹🏻‍♂️ E4.0 man bouncing ball: light skin tone
+26F9 1F3FB 200D 2642                                   ; minimally-qualified # ⛹🏻‍♂ E4.0 man bouncing ball: light skin tone
+26F9 1F3FC 200D 2642 FE0F                              ; fully-qualified     # ⛹🏼‍♂️ E4.0 man bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2642                                   ; minimally-qualified # ⛹🏼‍♂ E4.0 man bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2642 FE0F                              ; fully-qualified     # ⛹🏽‍♂️ E4.0 man bouncing ball: medium skin tone
+26F9 1F3FD 200D 2642                                   ; minimally-qualified # ⛹🏽‍♂ E4.0 man bouncing ball: medium skin tone
+26F9 1F3FE 200D 2642 FE0F                              ; fully-qualified     # ⛹🏾‍♂️ E4.0 man bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2642                                   ; minimally-qualified # ⛹🏾‍♂ E4.0 man bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2642 FE0F                              ; fully-qualified     # ⛹🏿‍♂️ E4.0 man bouncing ball: dark skin tone
+26F9 1F3FF 200D 2642                                   ; minimally-qualified # ⛹🏿‍♂ E4.0 man bouncing ball: dark skin tone
+26F9 FE0F 200D 2640 FE0F                               ; fully-qualified     # ⛹️‍♀️ E4.0 woman bouncing ball
+26F9 200D 2640 FE0F                                    ; unqualified         # ⛹‍♀️ E4.0 woman bouncing ball
+26F9 FE0F 200D 2640                                    ; minimally-qualified # ⛹️‍♀ E4.0 woman bouncing ball
+26F9 200D 2640                                         ; unqualified         # ⛹‍♀ E4.0 woman bouncing ball
+26F9 1F3FB 200D 2640 FE0F                              ; fully-qualified     # ⛹🏻‍♀️ E4.0 woman bouncing ball: light skin tone
+26F9 1F3FB 200D 2640                                   ; minimally-qualified # ⛹🏻‍♀ E4.0 woman bouncing ball: light skin tone
+26F9 1F3FC 200D 2640 FE0F                              ; fully-qualified     # ⛹🏼‍♀️ E4.0 woman bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2640                                   ; minimally-qualified # ⛹🏼‍♀ E4.0 woman bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2640 FE0F                              ; fully-qualified     # ⛹🏽‍♀️ E4.0 woman bouncing ball: medium skin tone
+26F9 1F3FD 200D 2640                                   ; minimally-qualified # ⛹🏽‍♀ E4.0 woman bouncing ball: medium skin tone
+26F9 1F3FE 200D 2640 FE0F                              ; fully-qualified     # ⛹🏾‍♀️ E4.0 woman bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2640                                   ; minimally-qualified # ⛹🏾‍♀ E4.0 woman bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2640 FE0F                              ; fully-qualified     # ⛹🏿‍♀️ E4.0 woman bouncing ball: dark skin tone
+26F9 1F3FF 200D 2640                                   ; minimally-qualified # ⛹🏿‍♀ E4.0 woman bouncing ball: dark skin tone
+1F3CB FE0F                                             ; fully-qualified     # 🏋️ E0.7 person lifting weights
+1F3CB                                                  ; unqualified         # 🏋 E0.7 person lifting weights
+1F3CB 1F3FB                                            ; fully-qualified     # 🏋🏻 E2.0 person lifting weights: light skin tone
+1F3CB 1F3FC                                            ; fully-qualified     # 🏋🏼 E2.0 person lifting weights: medium-light skin tone
+1F3CB 1F3FD                                            ; fully-qualified     # 🏋🏽 E2.0 person lifting weights: medium skin tone
+1F3CB 1F3FE                                            ; fully-qualified     # 🏋🏾 E2.0 person lifting weights: medium-dark skin tone
+1F3CB 1F3FF                                            ; fully-qualified     # 🏋🏿 E2.0 person lifting weights: dark skin tone
+1F3CB FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏋️‍♂️ E4.0 man lifting weights
+1F3CB 200D 2642 FE0F                                   ; unqualified         # 🏋‍♂️ E4.0 man lifting weights
+1F3CB FE0F 200D 2642                                   ; minimally-qualified # 🏋️‍♂ E4.0 man lifting weights
+1F3CB 200D 2642                                        ; unqualified         # 🏋‍♂ E4.0 man lifting weights
+1F3CB 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏋🏻‍♂️ E4.0 man lifting weights: light skin tone
+1F3CB 1F3FB 200D 2642                                  ; minimally-qualified # 🏋🏻‍♂ E4.0 man lifting weights: light skin tone
+1F3CB 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🏋🏼‍♂️ E4.0 man lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2642                                  ; minimally-qualified # 🏋🏼‍♂ E4.0 man lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🏋🏽‍♂️ E4.0 man lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2642                                  ; minimally-qualified # 🏋🏽‍♂ E4.0 man lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🏋🏾‍♂️ E4.0 man lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2642                                  ; minimally-qualified # 🏋🏾‍♂ E4.0 man lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🏋🏿‍♂️ E4.0 man lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2642                                  ; minimally-qualified # 🏋🏿‍♂ E4.0 man lifting weights: dark skin tone
+1F3CB FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏋️‍♀️ E4.0 woman lifting weights
+1F3CB 200D 2640 FE0F                                   ; unqualified         # 🏋‍♀️ E4.0 woman lifting weights
+1F3CB FE0F 200D 2640                                   ; minimally-qualified # 🏋️‍♀ E4.0 woman lifting weights
+1F3CB 200D 2640                                        ; unqualified         # 🏋‍♀ E4.0 woman lifting weights
+1F3CB 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏋🏻‍♀️ E4.0 woman lifting weights: light skin tone
+1F3CB 1F3FB 200D 2640                                  ; minimally-qualified # 🏋🏻‍♀ E4.0 woman lifting weights: light skin tone
+1F3CB 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🏋🏼‍♀️ E4.0 woman lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2640                                  ; minimally-qualified # 🏋🏼‍♀ E4.0 woman lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🏋🏽‍♀️ E4.0 woman lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2640                                  ; minimally-qualified # 🏋🏽‍♀ E4.0 woman lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🏋🏾‍♀️ E4.0 woman lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2640                                  ; minimally-qualified # 🏋🏾‍♀ E4.0 woman lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🏋🏿‍♀️ E4.0 woman lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2640                                  ; minimally-qualified # 🏋🏿‍♀ E4.0 woman lifting weights: dark skin tone
+1F6B4                                                  ; fully-qualified     # 🚴 E1.0 person biking
+1F6B4 1F3FB                                            ; fully-qualified     # 🚴🏻 E1.0 person biking: light skin tone
+1F6B4 1F3FC                                            ; fully-qualified     # 🚴🏼 E1.0 person biking: medium-light skin tone
+1F6B4 1F3FD                                            ; fully-qualified     # 🚴🏽 E1.0 person biking: medium skin tone
+1F6B4 1F3FE                                            ; fully-qualified     # 🚴🏾 E1.0 person biking: medium-dark skin tone
+1F6B4 1F3FF                                            ; fully-qualified     # 🚴🏿 E1.0 person biking: dark skin tone
+1F6B4 200D 2642 FE0F                                   ; fully-qualified     # 🚴‍♂️ E4.0 man biking
+1F6B4 200D 2642                                        ; minimally-qualified # 🚴‍♂ E4.0 man biking
+1F6B4 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🚴🏻‍♂️ E4.0 man biking: light skin tone
+1F6B4 1F3FB 200D 2642                                  ; minimally-qualified # 🚴🏻‍♂ E4.0 man biking: light skin tone
+1F6B4 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🚴🏼‍♂️ E4.0 man biking: medium-light skin tone
+1F6B4 1F3FC 200D 2642                                  ; minimally-qualified # 🚴🏼‍♂ E4.0 man biking: medium-light skin tone
+1F6B4 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🚴🏽‍♂️ E4.0 man biking: medium skin tone
+1F6B4 1F3FD 200D 2642                                  ; minimally-qualified # 🚴🏽‍♂ E4.0 man biking: medium skin tone
+1F6B4 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🚴🏾‍♂️ E4.0 man biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2642                                  ; minimally-qualified # 🚴🏾‍♂ E4.0 man biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🚴🏿‍♂️ E4.0 man biking: dark skin tone
+1F6B4 1F3FF 200D 2642                                  ; minimally-qualified # 🚴🏿‍♂ E4.0 man biking: dark skin tone
+1F6B4 200D 2640 FE0F                                   ; fully-qualified     # 🚴‍♀️ E4.0 woman biking
+1F6B4 200D 2640                                        ; minimally-qualified # 🚴‍♀ E4.0 woman biking
+1F6B4 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🚴🏻‍♀️ E4.0 woman biking: light skin tone
+1F6B4 1F3FB 200D 2640                                  ; minimally-qualified # 🚴🏻‍♀ E4.0 woman biking: light skin tone
+1F6B4 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🚴🏼‍♀️ E4.0 woman biking: medium-light skin tone
+1F6B4 1F3FC 200D 2640                                  ; minimally-qualified # 🚴🏼‍♀ E4.0 woman biking: medium-light skin tone
+1F6B4 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🚴🏽‍♀️ E4.0 woman biking: medium skin tone
+1F6B4 1F3FD 200D 2640                                  ; minimally-qualified # 🚴🏽‍♀ E4.0 woman biking: medium skin tone
+1F6B4 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🚴🏾‍♀️ E4.0 woman biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2640                                  ; minimally-qualified # 🚴🏾‍♀ E4.0 woman biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🚴🏿‍♀️ E4.0 woman biking: dark skin tone
+1F6B4 1F3FF 200D 2640                                  ; minimally-qualified # 🚴🏿‍♀ E4.0 woman biking: dark skin tone
+1F6B5                                                  ; fully-qualified     # 🚵 E1.0 person mountain biking
+1F6B5 1F3FB                                            ; fully-qualified     # 🚵🏻 E1.0 person mountain biking: light skin tone
+1F6B5 1F3FC                                            ; fully-qualified     # 🚵🏼 E1.0 person mountain biking: medium-light skin tone
+1F6B5 1F3FD                                            ; fully-qualified     # 🚵🏽 E1.0 person mountain biking: medium skin tone
+1F6B5 1F3FE                                            ; fully-qualified     # 🚵🏾 E1.0 person mountain biking: medium-dark skin tone
+1F6B5 1F3FF                                            ; fully-qualified     # 🚵🏿 E1.0 person mountain biking: dark skin tone
+1F6B5 200D 2642 FE0F                                   ; fully-qualified     # 🚵‍♂️ E4.0 man mountain biking
+1F6B5 200D 2642                                        ; minimally-qualified # 🚵‍♂ E4.0 man mountain biking
+1F6B5 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🚵🏻‍♂️ E4.0 man mountain biking: light skin tone
+1F6B5 1F3FB 200D 2642                                  ; minimally-qualified # 🚵🏻‍♂ E4.0 man mountain biking: light skin tone
+1F6B5 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🚵🏼‍♂️ E4.0 man mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2642                                  ; minimally-qualified # 🚵🏼‍♂ E4.0 man mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🚵🏽‍♂️ E4.0 man mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2642                                  ; minimally-qualified # 🚵🏽‍♂ E4.0 man mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🚵🏾‍♂️ E4.0 man mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2642                                  ; minimally-qualified # 🚵🏾‍♂ E4.0 man mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🚵🏿‍♂️ E4.0 man mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2642                                  ; minimally-qualified # 🚵🏿‍♂ E4.0 man mountain biking: dark skin tone
+1F6B5 200D 2640 FE0F                                   ; fully-qualified     # 🚵‍♀️ E4.0 woman mountain biking
+1F6B5 200D 2640                                        ; minimally-qualified # 🚵‍♀ E4.0 woman mountain biking
+1F6B5 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🚵🏻‍♀️ E4.0 woman mountain biking: light skin tone
+1F6B5 1F3FB 200D 2640                                  ; minimally-qualified # 🚵🏻‍♀ E4.0 woman mountain biking: light skin tone
+1F6B5 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🚵🏼‍♀️ E4.0 woman mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2640                                  ; minimally-qualified # 🚵🏼‍♀ E4.0 woman mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🚵🏽‍♀️ E4.0 woman mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2640                                  ; minimally-qualified # 🚵🏽‍♀ E4.0 woman mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🚵🏾‍♀️ E4.0 woman mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2640                                  ; minimally-qualified # 🚵🏾‍♀ E4.0 woman mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🚵🏿‍♀️ E4.0 woman mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2640                                  ; minimally-qualified # 🚵🏿‍♀ E4.0 woman mountain biking: dark skin tone
+1F938                                                  ; fully-qualified     # 🤸 E3.0 person cartwheeling
+1F938 1F3FB                                            ; fully-qualified     # 🤸🏻 E3.0 person cartwheeling: light skin tone
+1F938 1F3FC                                            ; fully-qualified     # 🤸🏼 E3.0 person cartwheeling: medium-light skin tone
+1F938 1F3FD                                            ; fully-qualified     # 🤸🏽 E3.0 person cartwheeling: medium skin tone
+1F938 1F3FE                                            ; fully-qualified     # 🤸🏾 E3.0 person cartwheeling: medium-dark skin tone
+1F938 1F3FF                                            ; fully-qualified     # 🤸🏿 E3.0 person cartwheeling: dark skin tone
+1F938 200D 2642 FE0F                                   ; fully-qualified     # 🤸‍♂️ E4.0 man cartwheeling
+1F938 200D 2642                                        ; minimally-qualified # 🤸‍♂ E4.0 man cartwheeling
+1F938 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤸🏻‍♂️ E4.0 man cartwheeling: light skin tone
+1F938 1F3FB 200D 2642                                  ; minimally-qualified # 🤸🏻‍♂ E4.0 man cartwheeling: light skin tone
+1F938 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤸🏼‍♂️ E4.0 man cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2642                                  ; minimally-qualified # 🤸🏼‍♂ E4.0 man cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤸🏽‍♂️ E4.0 man cartwheeling: medium skin tone
+1F938 1F3FD 200D 2642                                  ; minimally-qualified # 🤸🏽‍♂ E4.0 man cartwheeling: medium skin tone
+1F938 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤸🏾‍♂️ E4.0 man cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2642                                  ; minimally-qualified # 🤸🏾‍♂ E4.0 man cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤸🏿‍♂️ E4.0 man cartwheeling: dark skin tone
+1F938 1F3FF 200D 2642                                  ; minimally-qualified # 🤸🏿‍♂ E4.0 man cartwheeling: dark skin tone
+1F938 200D 2640 FE0F                                   ; fully-qualified     # 🤸‍♀️ E4.0 woman cartwheeling
+1F938 200D 2640                                        ; minimally-qualified # 🤸‍♀ E4.0 woman cartwheeling
+1F938 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤸🏻‍♀️ E4.0 woman cartwheeling: light skin tone
+1F938 1F3FB 200D 2640                                  ; minimally-qualified # 🤸🏻‍♀ E4.0 woman cartwheeling: light skin tone
+1F938 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤸🏼‍♀️ E4.0 woman cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2640                                  ; minimally-qualified # 🤸🏼‍♀ E4.0 woman cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤸🏽‍♀️ E4.0 woman cartwheeling: medium skin tone
+1F938 1F3FD 200D 2640                                  ; minimally-qualified # 🤸🏽‍♀ E4.0 woman cartwheeling: medium skin tone
+1F938 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤸🏾‍♀️ E4.0 woman cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2640                                  ; minimally-qualified # 🤸🏾‍♀ E4.0 woman cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤸🏿‍♀️ E4.0 woman cartwheeling: dark skin tone
+1F938 1F3FF 200D 2640                                  ; minimally-qualified # 🤸🏿‍♀ E4.0 woman cartwheeling: dark skin tone
+1F93C                                                  ; fully-qualified     # 🤼 E3.0 people wrestling
+1F93C 200D 2642 FE0F                                   ; fully-qualified     # 🤼‍♂️ E4.0 men wrestling
+1F93C 200D 2642                                        ; minimally-qualified # 🤼‍♂ E4.0 men wrestling
+1F93C 200D 2640 FE0F                                   ; fully-qualified     # 🤼‍♀️ E4.0 women wrestling
+1F93C 200D 2640                                        ; minimally-qualified # 🤼‍♀ E4.0 women wrestling
+1F93D                                                  ; fully-qualified     # 🤽 E3.0 person playing water polo
+1F93D 1F3FB                                            ; fully-qualified     # 🤽🏻 E3.0 person playing water polo: light skin tone
+1F93D 1F3FC                                            ; fully-qualified     # 🤽🏼 E3.0 person playing water polo: medium-light skin tone
+1F93D 1F3FD                                            ; fully-qualified     # 🤽🏽 E3.0 person playing water polo: medium skin tone
+1F93D 1F3FE                                            ; fully-qualified     # 🤽🏾 E3.0 person playing water polo: medium-dark skin tone
+1F93D 1F3FF                                            ; fully-qualified     # 🤽🏿 E3.0 person playing water polo: dark skin tone
+1F93D 200D 2642 FE0F                                   ; fully-qualified     # 🤽‍♂️ E4.0 man playing water polo
+1F93D 200D 2642                                        ; minimally-qualified # 🤽‍♂ E4.0 man playing water polo
+1F93D 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤽🏻‍♂️ E4.0 man playing water polo: light skin tone
+1F93D 1F3FB 200D 2642                                  ; minimally-qualified # 🤽🏻‍♂ E4.0 man playing water polo: light skin tone
+1F93D 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤽🏼‍♂️ E4.0 man playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2642                                  ; minimally-qualified # 🤽🏼‍♂ E4.0 man playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤽🏽‍♂️ E4.0 man playing water polo: medium skin tone
+1F93D 1F3FD 200D 2642                                  ; minimally-qualified # 🤽🏽‍♂ E4.0 man playing water polo: medium skin tone
+1F93D 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤽🏾‍♂️ E4.0 man playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2642                                  ; minimally-qualified # 🤽🏾‍♂ E4.0 man playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤽🏿‍♂️ E4.0 man playing water polo: dark skin tone
+1F93D 1F3FF 200D 2642                                  ; minimally-qualified # 🤽🏿‍♂ E4.0 man playing water polo: dark skin tone
+1F93D 200D 2640 FE0F                                   ; fully-qualified     # 🤽‍♀️ E4.0 woman playing water polo
+1F93D 200D 2640                                        ; minimally-qualified # 🤽‍♀ E4.0 woman playing water polo
+1F93D 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤽🏻‍♀️ E4.0 woman playing water polo: light skin tone
+1F93D 1F3FB 200D 2640                                  ; minimally-qualified # 🤽🏻‍♀ E4.0 woman playing water polo: light skin tone
+1F93D 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤽🏼‍♀️ E4.0 woman playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2640                                  ; minimally-qualified # 🤽🏼‍♀ E4.0 woman playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤽🏽‍♀️ E4.0 woman playing water polo: medium skin tone
+1F93D 1F3FD 200D 2640                                  ; minimally-qualified # 🤽🏽‍♀ E4.0 woman playing water polo: medium skin tone
+1F93D 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤽🏾‍♀️ E4.0 woman playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2640                                  ; minimally-qualified # 🤽🏾‍♀ E4.0 woman playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤽🏿‍♀️ E4.0 woman playing water polo: dark skin tone
+1F93D 1F3FF 200D 2640                                  ; minimally-qualified # 🤽🏿‍♀ E4.0 woman playing water polo: dark skin tone
+1F93E                                                  ; fully-qualified     # 🤾 E3.0 person playing handball
+1F93E 1F3FB                                            ; fully-qualified     # 🤾🏻 E3.0 person playing handball: light skin tone
+1F93E 1F3FC                                            ; fully-qualified     # 🤾🏼 E3.0 person playing handball: medium-light skin tone
+1F93E 1F3FD                                            ; fully-qualified     # 🤾🏽 E3.0 person playing handball: medium skin tone
+1F93E 1F3FE                                            ; fully-qualified     # 🤾🏾 E3.0 person playing handball: medium-dark skin tone
+1F93E 1F3FF                                            ; fully-qualified     # 🤾🏿 E3.0 person playing handball: dark skin tone
+1F93E 200D 2642 FE0F                                   ; fully-qualified     # 🤾‍♂️ E4.0 man playing handball
+1F93E 200D 2642                                        ; minimally-qualified # 🤾‍♂ E4.0 man playing handball
+1F93E 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤾🏻‍♂️ E4.0 man playing handball: light skin tone
+1F93E 1F3FB 200D 2642                                  ; minimally-qualified # 🤾🏻‍♂ E4.0 man playing handball: light skin tone
+1F93E 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤾🏼‍♂️ E4.0 man playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2642                                  ; minimally-qualified # 🤾🏼‍♂ E4.0 man playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤾🏽‍♂️ E4.0 man playing handball: medium skin tone
+1F93E 1F3FD 200D 2642                                  ; minimally-qualified # 🤾🏽‍♂ E4.0 man playing handball: medium skin tone
+1F93E 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤾🏾‍♂️ E4.0 man playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2642                                  ; minimally-qualified # 🤾🏾‍♂ E4.0 man playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤾🏿‍♂️ E4.0 man playing handball: dark skin tone
+1F93E 1F3FF 200D 2642                                  ; minimally-qualified # 🤾🏿‍♂ E4.0 man playing handball: dark skin tone
+1F93E 200D 2640 FE0F                                   ; fully-qualified     # 🤾‍♀️ E4.0 woman playing handball
+1F93E 200D 2640                                        ; minimally-qualified # 🤾‍♀ E4.0 woman playing handball
+1F93E 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤾🏻‍♀️ E4.0 woman playing handball: light skin tone
+1F93E 1F3FB 200D 2640                                  ; minimally-qualified # 🤾🏻‍♀ E4.0 woman playing handball: light skin tone
+1F93E 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤾🏼‍♀️ E4.0 woman playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2640                                  ; minimally-qualified # 🤾🏼‍♀ E4.0 woman playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤾🏽‍♀️ E4.0 woman playing handball: medium skin tone
+1F93E 1F3FD 200D 2640                                  ; minimally-qualified # 🤾🏽‍♀ E4.0 woman playing handball: medium skin tone
+1F93E 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤾🏾‍♀️ E4.0 woman playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2640                                  ; minimally-qualified # 🤾🏾‍♀ E4.0 woman playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤾🏿‍♀️ E4.0 woman playing handball: dark skin tone
+1F93E 1F3FF 200D 2640                                  ; minimally-qualified # 🤾🏿‍♀ E4.0 woman playing handball: dark skin tone
+1F939                                                  ; fully-qualified     # 🤹 E3.0 person juggling
+1F939 1F3FB                                            ; fully-qualified     # 🤹🏻 E3.0 person juggling: light skin tone
+1F939 1F3FC                                            ; fully-qualified     # 🤹🏼 E3.0 person juggling: medium-light skin tone
+1F939 1F3FD                                            ; fully-qualified     # 🤹🏽 E3.0 person juggling: medium skin tone
+1F939 1F3FE                                            ; fully-qualified     # 🤹🏾 E3.0 person juggling: medium-dark skin tone
+1F939 1F3FF                                            ; fully-qualified     # 🤹🏿 E3.0 person juggling: dark skin tone
+1F939 200D 2642 FE0F                                   ; fully-qualified     # 🤹‍♂️ E4.0 man juggling
+1F939 200D 2642                                        ; minimally-qualified # 🤹‍♂ E4.0 man juggling
+1F939 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🤹🏻‍♂️ E4.0 man juggling: light skin tone
+1F939 1F3FB 200D 2642                                  ; minimally-qualified # 🤹🏻‍♂ E4.0 man juggling: light skin tone
+1F939 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🤹🏼‍♂️ E4.0 man juggling: medium-light skin tone
+1F939 1F3FC 200D 2642                                  ; minimally-qualified # 🤹🏼‍♂ E4.0 man juggling: medium-light skin tone
+1F939 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🤹🏽‍♂️ E4.0 man juggling: medium skin tone
+1F939 1F3FD 200D 2642                                  ; minimally-qualified # 🤹🏽‍♂ E4.0 man juggling: medium skin tone
+1F939 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🤹🏾‍♂️ E4.0 man juggling: medium-dark skin tone
+1F939 1F3FE 200D 2642                                  ; minimally-qualified # 🤹🏾‍♂ E4.0 man juggling: medium-dark skin tone
+1F939 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🤹🏿‍♂️ E4.0 man juggling: dark skin tone
+1F939 1F3FF 200D 2642                                  ; minimally-qualified # 🤹🏿‍♂ E4.0 man juggling: dark skin tone
+1F939 200D 2640 FE0F                                   ; fully-qualified     # 🤹‍♀️ E4.0 woman juggling
+1F939 200D 2640                                        ; minimally-qualified # 🤹‍♀ E4.0 woman juggling
+1F939 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🤹🏻‍♀️ E4.0 woman juggling: light skin tone
+1F939 1F3FB 200D 2640                                  ; minimally-qualified # 🤹🏻‍♀ E4.0 woman juggling: light skin tone
+1F939 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🤹🏼‍♀️ E4.0 woman juggling: medium-light skin tone
+1F939 1F3FC 200D 2640                                  ; minimally-qualified # 🤹🏼‍♀ E4.0 woman juggling: medium-light skin tone
+1F939 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🤹🏽‍♀️ E4.0 woman juggling: medium skin tone
+1F939 1F3FD 200D 2640                                  ; minimally-qualified # 🤹🏽‍♀ E4.0 woman juggling: medium skin tone
+1F939 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🤹🏾‍♀️ E4.0 woman juggling: medium-dark skin tone
+1F939 1F3FE 200D 2640                                  ; minimally-qualified # 🤹🏾‍♀ E4.0 woman juggling: medium-dark skin tone
+1F939 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🤹🏿‍♀️ E4.0 woman juggling: dark skin tone
+1F939 1F3FF 200D 2640                                  ; minimally-qualified # 🤹🏿‍♀ E4.0 woman juggling: dark skin tone
+
+# subgroup: person-resting
+1F9D8                                                  ; fully-qualified     # 🧘 E5.0 person in lotus position
+1F9D8 1F3FB                                            ; fully-qualified     # 🧘🏻 E5.0 person in lotus position: light skin tone
+1F9D8 1F3FC                                            ; fully-qualified     # 🧘🏼 E5.0 person in lotus position: medium-light skin tone
+1F9D8 1F3FD                                            ; fully-qualified     # 🧘🏽 E5.0 person in lotus position: medium skin tone
+1F9D8 1F3FE                                            ; fully-qualified     # 🧘🏾 E5.0 person in lotus position: medium-dark skin tone
+1F9D8 1F3FF                                            ; fully-qualified     # 🧘🏿 E5.0 person in lotus position: dark skin tone
+1F9D8 200D 2642 FE0F                                   ; fully-qualified     # 🧘‍♂️ E5.0 man in lotus position
+1F9D8 200D 2642                                        ; minimally-qualified # 🧘‍♂ E5.0 man in lotus position
+1F9D8 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🧘🏻‍♂️ E5.0 man in lotus position: light skin tone
+1F9D8 1F3FB 200D 2642                                  ; minimally-qualified # 🧘🏻‍♂ E5.0 man in lotus position: light skin tone
+1F9D8 1F3FC 200D 2642 FE0F                             ; fully-qualified     # 🧘🏼‍♂️ E5.0 man in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2642                                  ; minimally-qualified # 🧘🏼‍♂ E5.0 man in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2642 FE0F                             ; fully-qualified     # 🧘🏽‍♂️ E5.0 man in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2642                                  ; minimally-qualified # 🧘🏽‍♂ E5.0 man in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2642 FE0F                             ; fully-qualified     # 🧘🏾‍♂️ E5.0 man in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2642                                  ; minimally-qualified # 🧘🏾‍♂ E5.0 man in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2642 FE0F                             ; fully-qualified     # 🧘🏿‍♂️ E5.0 man in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2642                                  ; minimally-qualified # 🧘🏿‍♂ E5.0 man in lotus position: dark skin tone
+1F9D8 200D 2640 FE0F                                   ; fully-qualified     # 🧘‍♀️ E5.0 woman in lotus position
+1F9D8 200D 2640                                        ; minimally-qualified # 🧘‍♀ E5.0 woman in lotus position
+1F9D8 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🧘🏻‍♀️ E5.0 woman in lotus position: light skin tone
+1F9D8 1F3FB 200D 2640                                  ; minimally-qualified # 🧘🏻‍♀ E5.0 woman in lotus position: light skin tone
+1F9D8 1F3FC 200D 2640 FE0F                             ; fully-qualified     # 🧘🏼‍♀️ E5.0 woman in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2640                                  ; minimally-qualified # 🧘🏼‍♀ E5.0 woman in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2640 FE0F                             ; fully-qualified     # 🧘🏽‍♀️ E5.0 woman in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2640                                  ; minimally-qualified # 🧘🏽‍♀ E5.0 woman in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2640 FE0F                             ; fully-qualified     # 🧘🏾‍♀️ E5.0 woman in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2640                                  ; minimally-qualified # 🧘🏾‍♀ E5.0 woman in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 🧘🏿‍♀️ E5.0 woman in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2640                                  ; minimally-qualified # 🧘🏿‍♀ E5.0 woman in lotus position: dark skin tone
+1F6C0                                                  ; fully-qualified     # 🛀 E0.6 person taking bath
+1F6C0 1F3FB                                            ; fully-qualified     # 🛀🏻 E1.0 person taking bath: light skin tone
+1F6C0 1F3FC                                            ; fully-qualified     # 🛀🏼 E1.0 person taking bath: medium-light skin tone
+1F6C0 1F3FD                                            ; fully-qualified     # 🛀🏽 E1.0 person taking bath: medium skin tone
+1F6C0 1F3FE                                            ; fully-qualified     # 🛀🏾 E1.0 person taking bath: medium-dark skin tone
+1F6C0 1F3FF                                            ; fully-qualified     # 🛀🏿 E1.0 person taking bath: dark skin tone
+1F6CC                                                  ; fully-qualified     # 🛌 E1.0 person in bed
+1F6CC 1F3FB                                            ; fully-qualified     # 🛌🏻 E4.0 person in bed: light skin tone
+1F6CC 1F3FC                                            ; fully-qualified     # 🛌🏼 E4.0 person in bed: medium-light skin tone
+1F6CC 1F3FD                                            ; fully-qualified     # 🛌🏽 E4.0 person in bed: medium skin tone
+1F6CC 1F3FE                                            ; fully-qualified     # 🛌🏾 E4.0 person in bed: medium-dark skin tone
+1F6CC 1F3FF                                            ; fully-qualified     # 🛌🏿 E4.0 person in bed: dark skin tone
+
+# subgroup: family
+1F9D1 200D 1F91D 200D 1F9D1                            ; fully-qualified     # 🧑‍🤝‍🧑 E12.0 people holding hands
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB                ; fully-qualified     # 🧑🏻‍🤝‍🧑🏻 E12.0 people holding hands: light skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FC                ; fully-qualified     # 🧑🏻‍🤝‍🧑🏼 E12.1 people holding hands: light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FD                ; fully-qualified     # 🧑🏻‍🤝‍🧑🏽 E12.1 people holding hands: light skin tone, medium skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FE                ; fully-qualified     # 🧑🏻‍🤝‍🧑🏾 E12.1 people holding hands: light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FF                ; fully-qualified     # 🧑🏻‍🤝‍🧑🏿 E12.1 people holding hands: light skin tone, dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB                ; fully-qualified     # 🧑🏼‍🤝‍🧑🏻 E12.0 people holding hands: medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC                ; fully-qualified     # 🧑🏼‍🤝‍🧑🏼 E12.0 people holding hands: medium-light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FD                ; fully-qualified     # 🧑🏼‍🤝‍🧑🏽 E12.1 people holding hands: medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FE                ; fully-qualified     # 🧑🏼‍🤝‍🧑🏾 E12.1 people holding hands: medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FF                ; fully-qualified     # 🧑🏼‍🤝‍🧑🏿 E12.1 people holding hands: medium-light skin tone, dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB                ; fully-qualified     # 🧑🏽‍🤝‍🧑🏻 E12.0 people holding hands: medium skin tone, light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC                ; fully-qualified     # 🧑🏽‍🤝‍🧑🏼 E12.0 people holding hands: medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD                ; fully-qualified     # 🧑🏽‍🤝‍🧑🏽 E12.0 people holding hands: medium skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FE                ; fully-qualified     # 🧑🏽‍🤝‍🧑🏾 E12.1 people holding hands: medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FF                ; fully-qualified     # 🧑🏽‍🤝‍🧑🏿 E12.1 people holding hands: medium skin tone, dark skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB                ; fully-qualified     # 🧑🏾‍🤝‍🧑🏻 E12.0 people holding hands: medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC                ; fully-qualified     # 🧑🏾‍🤝‍🧑🏼 E12.0 people holding hands: medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD                ; fully-qualified     # 🧑🏾‍🤝‍🧑🏽 E12.0 people holding hands: medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE                ; fully-qualified     # 🧑🏾‍🤝‍🧑🏾 E12.0 people holding hands: medium-dark skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FF                ; fully-qualified     # 🧑🏾‍🤝‍🧑🏿 E12.1 people holding hands: medium-dark skin tone, dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB                ; fully-qualified     # 🧑🏿‍🤝‍🧑🏻 E12.0 people holding hands: dark skin tone, light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC                ; fully-qualified     # 🧑🏿‍🤝‍🧑🏼 E12.0 people holding hands: dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD                ; fully-qualified     # 🧑🏿‍🤝‍🧑🏽 E12.0 people holding hands: dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE                ; fully-qualified     # 🧑🏿‍🤝‍🧑🏾 E12.0 people holding hands: dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF                ; fully-qualified     # 🧑🏿‍🤝‍🧑🏿 E12.0 people holding hands: dark skin tone
+1F46D                                                  ; fully-qualified     # 👭 E1.0 women holding hands
+1F46D 1F3FB                                            ; fully-qualified     # 👭🏻 E12.0 women holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FC                ; fully-qualified     # 👩🏻‍🤝‍👩🏼 E12.1 women holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FD                ; fully-qualified     # 👩🏻‍🤝‍👩🏽 E12.1 women holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FE                ; fully-qualified     # 👩🏻‍🤝‍👩🏾 E12.1 women holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FF                ; fully-qualified     # 👩🏻‍🤝‍👩🏿 E12.1 women holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB                ; fully-qualified     # 👩🏼‍🤝‍👩🏻 E12.0 women holding hands: medium-light skin tone, light skin tone
+1F46D 1F3FC                                            ; fully-qualified     # 👭🏼 E12.0 women holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FD                ; fully-qualified     # 👩🏼‍🤝‍👩🏽 E12.1 women holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FE                ; fully-qualified     # 👩🏼‍🤝‍👩🏾 E12.1 women holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FF                ; fully-qualified     # 👩🏼‍🤝‍👩🏿 E12.1 women holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB                ; fully-qualified     # 👩🏽‍🤝‍👩🏻 E12.0 women holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC                ; fully-qualified     # 👩🏽‍🤝‍👩🏼 E12.0 women holding hands: medium skin tone, medium-light skin tone
+1F46D 1F3FD                                            ; fully-qualified     # 👭🏽 E12.0 women holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FE                ; fully-qualified     # 👩🏽‍🤝‍👩🏾 E12.1 women holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FF                ; fully-qualified     # 👩🏽‍🤝‍👩🏿 E12.1 women holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB                ; fully-qualified     # 👩🏾‍🤝‍👩🏻 E12.0 women holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC                ; fully-qualified     # 👩🏾‍🤝‍👩🏼 E12.0 women holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD                ; fully-qualified     # 👩🏾‍🤝‍👩🏽 E12.0 women holding hands: medium-dark skin tone, medium skin tone
+1F46D 1F3FE                                            ; fully-qualified     # 👭🏾 E12.0 women holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FF                ; fully-qualified     # 👩🏾‍🤝‍👩🏿 E12.1 women holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB                ; fully-qualified     # 👩🏿‍🤝‍👩🏻 E12.0 women holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC                ; fully-qualified     # 👩🏿‍🤝‍👩🏼 E12.0 women holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD                ; fully-qualified     # 👩🏿‍🤝‍👩🏽 E12.0 women holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE                ; fully-qualified     # 👩🏿‍🤝‍👩🏾 E12.0 women holding hands: dark skin tone, medium-dark skin tone
+1F46D 1F3FF                                            ; fully-qualified     # 👭🏿 E12.0 women holding hands: dark skin tone
+1F46B                                                  ; fully-qualified     # 👫 E0.6 woman and man holding hands
+1F46B 1F3FB                                            ; fully-qualified     # 👫🏻 E12.0 woman and man holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👩🏻‍🤝‍👨🏼 E12.0 woman and man holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👩🏻‍🤝‍👨🏽 E12.0 woman and man holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👩🏻‍🤝‍👨🏾 E12.0 woman and man holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👩🏻‍🤝‍👨🏿 E12.0 woman and man holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👩🏼‍🤝‍👨🏻 E12.0 woman and man holding hands: medium-light skin tone, light skin tone
+1F46B 1F3FC                                            ; fully-qualified     # 👫🏼 E12.0 woman and man holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👩🏼‍🤝‍👨🏽 E12.0 woman and man holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👩🏼‍🤝‍👨🏾 E12.0 woman and man holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👩🏼‍🤝‍👨🏿 E12.0 woman and man holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👩🏽‍🤝‍👨🏻 E12.0 woman and man holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👩🏽‍🤝‍👨🏼 E12.0 woman and man holding hands: medium skin tone, medium-light skin tone
+1F46B 1F3FD                                            ; fully-qualified     # 👫🏽 E12.0 woman and man holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👩🏽‍🤝‍👨🏾 E12.0 woman and man holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👩🏽‍🤝‍👨🏿 E12.0 woman and man holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👩🏾‍🤝‍👨🏻 E12.0 woman and man holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👩🏾‍🤝‍👨🏼 E12.0 woman and man holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👩🏾‍🤝‍👨🏽 E12.0 woman and man holding hands: medium-dark skin tone, medium skin tone
+1F46B 1F3FE                                            ; fully-qualified     # 👫🏾 E12.0 woman and man holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👩🏾‍🤝‍👨🏿 E12.0 woman and man holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👩🏿‍🤝‍👨🏻 E12.0 woman and man holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👩🏿‍🤝‍👨🏼 E12.0 woman and man holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👩🏿‍🤝‍👨🏽 E12.0 woman and man holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👩🏿‍🤝‍👨🏾 E12.0 woman and man holding hands: dark skin tone, medium-dark skin tone
+1F46B 1F3FF                                            ; fully-qualified     # 👫🏿 E12.0 woman and man holding hands: dark skin tone
+1F46C                                                  ; fully-qualified     # 👬 E1.0 men holding hands
+1F46C 1F3FB                                            ; fully-qualified     # 👬🏻 E12.0 men holding hands: light skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👨🏻‍🤝‍👨🏼 E12.1 men holding hands: light skin tone, medium-light skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👨🏻‍🤝‍👨🏽 E12.1 men holding hands: light skin tone, medium skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👨🏻‍🤝‍👨🏾 E12.1 men holding hands: light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👨🏻‍🤝‍👨🏿 E12.1 men holding hands: light skin tone, dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👨🏼‍🤝‍👨🏻 E12.0 men holding hands: medium-light skin tone, light skin tone
+1F46C 1F3FC                                            ; fully-qualified     # 👬🏼 E12.0 men holding hands: medium-light skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👨🏼‍🤝‍👨🏽 E12.1 men holding hands: medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👨🏼‍🤝‍👨🏾 E12.1 men holding hands: medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👨🏼‍🤝‍👨🏿 E12.1 men holding hands: medium-light skin tone, dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👨🏽‍🤝‍👨🏻 E12.0 men holding hands: medium skin tone, light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👨🏽‍🤝‍👨🏼 E12.0 men holding hands: medium skin tone, medium-light skin tone
+1F46C 1F3FD                                            ; fully-qualified     # 👬🏽 E12.0 men holding hands: medium skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👨🏽‍🤝‍👨🏾 E12.1 men holding hands: medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👨🏽‍🤝‍👨🏿 E12.1 men holding hands: medium skin tone, dark skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👨🏾‍🤝‍👨🏻 E12.0 men holding hands: medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👨🏾‍🤝‍👨🏼 E12.0 men holding hands: medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👨🏾‍🤝‍👨🏽 E12.0 men holding hands: medium-dark skin tone, medium skin tone
+1F46C 1F3FE                                            ; fully-qualified     # 👬🏾 E12.0 men holding hands: medium-dark skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FF                ; fully-qualified     # 👨🏾‍🤝‍👨🏿 E12.1 men holding hands: medium-dark skin tone, dark skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB                ; fully-qualified     # 👨🏿‍🤝‍👨🏻 E12.0 men holding hands: dark skin tone, light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC                ; fully-qualified     # 👨🏿‍🤝‍👨🏼 E12.0 men holding hands: dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD                ; fully-qualified     # 👨🏿‍🤝‍👨🏽 E12.0 men holding hands: dark skin tone, medium skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE                ; fully-qualified     # 👨🏿‍🤝‍👨🏾 E12.0 men holding hands: dark skin tone, medium-dark skin tone
+1F46C 1F3FF                                            ; fully-qualified     # 👬🏿 E12.0 men holding hands: dark skin tone
+1F48F                                                  ; fully-qualified     # 💏 E0.6 kiss
+1F48F 1F3FB                                            ; fully-qualified     # 💏🏻 E13.1 kiss: light skin tone
+1F48F 1F3FC                                            ; fully-qualified     # 💏🏼 E13.1 kiss: medium-light skin tone
+1F48F 1F3FD                                            ; fully-qualified     # 💏🏽 E13.1 kiss: medium skin tone
+1F48F 1F3FE                                            ; fully-qualified     # 💏🏾 E13.1 kiss: medium-dark skin tone
+1F48F 1F3FF                                            ; fully-qualified     # 💏🏿 E13.1 kiss: dark skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FC ; fully-qualified     # 🧑🏻‍❤️‍💋‍🧑🏼 E13.1 kiss: person, person, light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 2764 200D 1F48B 200D 1F9D1 1F3FC      ; minimally-qualified # 🧑🏻‍❤‍💋‍🧑🏼 E13.1 kiss: person, person, light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FD ; fully-qualified     # 🧑🏻‍❤️‍💋‍🧑🏽 E13.1 kiss: person, person, light skin tone, medium skin tone
+1F9D1 1F3FB 200D 2764 200D 1F48B 200D 1F9D1 1F3FD      ; minimally-qualified # 🧑🏻‍❤‍💋‍🧑🏽 E13.1 kiss: person, person, light skin tone, medium skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FE ; fully-qualified     # 🧑🏻‍❤️‍💋‍🧑🏾 E13.1 kiss: person, person, light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 2764 200D 1F48B 200D 1F9D1 1F3FE      ; minimally-qualified # 🧑🏻‍❤‍💋‍🧑🏾 E13.1 kiss: person, person, light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FF ; fully-qualified     # 🧑🏻‍❤️‍💋‍🧑🏿 E13.1 kiss: person, person, light skin tone, dark skin tone
+1F9D1 1F3FB 200D 2764 200D 1F48B 200D 1F9D1 1F3FF      ; minimally-qualified # 🧑🏻‍❤‍💋‍🧑🏿 E13.1 kiss: person, person, light skin tone, dark skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FB ; fully-qualified     # 🧑🏼‍❤️‍💋‍🧑🏻 E13.1 kiss: person, person, medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 2764 200D 1F48B 200D 1F9D1 1F3FB      ; minimally-qualified # 🧑🏼‍❤‍💋‍🧑🏻 E13.1 kiss: person, person, medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FD ; fully-qualified     # 🧑🏼‍❤️‍💋‍🧑🏽 E13.1 kiss: person, person, medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 2764 200D 1F48B 200D 1F9D1 1F3FD      ; minimally-qualified # 🧑🏼‍❤‍💋‍🧑🏽 E13.1 kiss: person, person, medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FE ; fully-qualified     # 🧑🏼‍❤️‍💋‍🧑🏾 E13.1 kiss: person, person, medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 2764 200D 1F48B 200D 1F9D1 1F3FE      ; minimally-qualified # 🧑🏼‍❤‍💋‍🧑🏾 E13.1 kiss: person, person, medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FF ; fully-qualified     # 🧑🏼‍❤️‍💋‍🧑🏿 E13.1 kiss: person, person, medium-light skin tone, dark skin tone
+1F9D1 1F3FC 200D 2764 200D 1F48B 200D 1F9D1 1F3FF      ; minimally-qualified # 🧑🏼‍❤‍💋‍🧑🏿 E13.1 kiss: person, person, medium-light skin tone, dark skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FB ; fully-qualified     # 🧑🏽‍❤️‍💋‍🧑🏻 E13.1 kiss: person, person, medium skin tone, light skin tone
+1F9D1 1F3FD 200D 2764 200D 1F48B 200D 1F9D1 1F3FB      ; minimally-qualified # 🧑🏽‍❤‍💋‍🧑🏻 E13.1 kiss: person, person, medium skin tone, light skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FC ; fully-qualified     # 🧑🏽‍❤️‍💋‍🧑🏼 E13.1 kiss: person, person, medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 2764 200D 1F48B 200D 1F9D1 1F3FC      ; minimally-qualified # 🧑🏽‍❤‍💋‍🧑🏼 E13.1 kiss: person, person, medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FE ; fully-qualified     # 🧑🏽‍❤️‍💋‍🧑🏾 E13.1 kiss: person, person, medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 2764 200D 1F48B 200D 1F9D1 1F3FE      ; minimally-qualified # 🧑🏽‍❤‍💋‍🧑🏾 E13.1 kiss: person, person, medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FF ; fully-qualified     # 🧑🏽‍❤️‍💋‍🧑🏿 E13.1 kiss: person, person, medium skin tone, dark skin tone
+1F9D1 1F3FD 200D 2764 200D 1F48B 200D 1F9D1 1F3FF      ; minimally-qualified # 🧑🏽‍❤‍💋‍🧑🏿 E13.1 kiss: person, person, medium skin tone, dark skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FB ; fully-qualified     # 🧑🏾‍❤️‍💋‍🧑🏻 E13.1 kiss: person, person, medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 2764 200D 1F48B 200D 1F9D1 1F3FB      ; minimally-qualified # 🧑🏾‍❤‍💋‍🧑🏻 E13.1 kiss: person, person, medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FC ; fully-qualified     # 🧑🏾‍❤️‍💋‍🧑🏼 E13.1 kiss: person, person, medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 2764 200D 1F48B 200D 1F9D1 1F3FC      ; minimally-qualified # 🧑🏾‍❤‍💋‍🧑🏼 E13.1 kiss: person, person, medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FD ; fully-qualified     # 🧑🏾‍❤️‍💋‍🧑🏽 E13.1 kiss: person, person, medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 2764 200D 1F48B 200D 1F9D1 1F3FD      ; minimally-qualified # 🧑🏾‍❤‍💋‍🧑🏽 E13.1 kiss: person, person, medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FF ; fully-qualified     # 🧑🏾‍❤️‍💋‍🧑🏿 E13.1 kiss: person, person, medium-dark skin tone, dark skin tone
+1F9D1 1F3FE 200D 2764 200D 1F48B 200D 1F9D1 1F3FF      ; minimally-qualified # 🧑🏾‍❤‍💋‍🧑🏿 E13.1 kiss: person, person, medium-dark skin tone, dark skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FB ; fully-qualified     # 🧑🏿‍❤️‍💋‍🧑🏻 E13.1 kiss: person, person, dark skin tone, light skin tone
+1F9D1 1F3FF 200D 2764 200D 1F48B 200D 1F9D1 1F3FB      ; minimally-qualified # 🧑🏿‍❤‍💋‍🧑🏻 E13.1 kiss: person, person, dark skin tone, light skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FC ; fully-qualified     # 🧑🏿‍❤️‍💋‍🧑🏼 E13.1 kiss: person, person, dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 2764 200D 1F48B 200D 1F9D1 1F3FC      ; minimally-qualified # 🧑🏿‍❤‍💋‍🧑🏼 E13.1 kiss: person, person, dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FD ; fully-qualified     # 🧑🏿‍❤️‍💋‍🧑🏽 E13.1 kiss: person, person, dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 2764 200D 1F48B 200D 1F9D1 1F3FD      ; minimally-qualified # 🧑🏿‍❤‍💋‍🧑🏽 E13.1 kiss: person, person, dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F9D1 1F3FE ; fully-qualified     # 🧑🏿‍❤️‍💋‍🧑🏾 E13.1 kiss: person, person, dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 2764 200D 1F48B 200D 1F9D1 1F3FE      ; minimally-qualified # 🧑🏿‍❤‍💋‍🧑🏾 E13.1 kiss: person, person, dark skin tone, medium-dark skin tone
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F468             ; fully-qualified     # 👩‍❤️‍💋‍👨 E2.0 kiss: woman, man
+1F469 200D 2764 200D 1F48B 200D 1F468                  ; minimally-qualified # 👩‍❤‍💋‍👨 E2.0 kiss: woman, man
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👩🏻‍❤️‍💋‍👨🏻 E13.1 kiss: woman, man, light skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👩🏻‍❤‍💋‍👨🏻 E13.1 kiss: woman, man, light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👩🏻‍❤️‍💋‍👨🏼 E13.1 kiss: woman, man, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👩🏻‍❤‍💋‍👨🏼 E13.1 kiss: woman, man, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👩🏻‍❤️‍💋‍👨🏽 E13.1 kiss: woman, man, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👩🏻‍❤‍💋‍👨🏽 E13.1 kiss: woman, man, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👩🏻‍❤️‍💋‍👨🏾 E13.1 kiss: woman, man, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👩🏻‍❤‍💋‍👨🏾 E13.1 kiss: woman, man, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👩🏻‍❤️‍💋‍👨🏿 E13.1 kiss: woman, man, light skin tone, dark skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👩🏻‍❤‍💋‍👨🏿 E13.1 kiss: woman, man, light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👩🏼‍❤️‍💋‍👨🏻 E13.1 kiss: woman, man, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👩🏼‍❤‍💋‍👨🏻 E13.1 kiss: woman, man, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👩🏼‍❤️‍💋‍👨🏼 E13.1 kiss: woman, man, medium-light skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👩🏼‍❤‍💋‍👨🏼 E13.1 kiss: woman, man, medium-light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👩🏼‍❤️‍💋‍👨🏽 E13.1 kiss: woman, man, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👩🏼‍❤‍💋‍👨🏽 E13.1 kiss: woman, man, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👩🏼‍❤️‍💋‍👨🏾 E13.1 kiss: woman, man, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👩🏼‍❤‍💋‍👨🏾 E13.1 kiss: woman, man, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👩🏼‍❤️‍💋‍👨🏿 E13.1 kiss: woman, man, medium-light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👩🏼‍❤‍💋‍👨🏿 E13.1 kiss: woman, man, medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👩🏽‍❤️‍💋‍👨🏻 E13.1 kiss: woman, man, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👩🏽‍❤‍💋‍👨🏻 E13.1 kiss: woman, man, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👩🏽‍❤️‍💋‍👨🏼 E13.1 kiss: woman, man, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👩🏽‍❤‍💋‍👨🏼 E13.1 kiss: woman, man, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👩🏽‍❤️‍💋‍👨🏽 E13.1 kiss: woman, man, medium skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👩🏽‍❤‍💋‍👨🏽 E13.1 kiss: woman, man, medium skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👩🏽‍❤️‍💋‍👨🏾 E13.1 kiss: woman, man, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👩🏽‍❤‍💋‍👨🏾 E13.1 kiss: woman, man, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👩🏽‍❤️‍💋‍👨🏿 E13.1 kiss: woman, man, medium skin tone, dark skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👩🏽‍❤‍💋‍👨🏿 E13.1 kiss: woman, man, medium skin tone, dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👩🏾‍❤️‍💋‍👨🏻 E13.1 kiss: woman, man, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👩🏾‍❤‍💋‍👨🏻 E13.1 kiss: woman, man, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👩🏾‍❤️‍💋‍👨🏼 E13.1 kiss: woman, man, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👩🏾‍❤‍💋‍👨🏼 E13.1 kiss: woman, man, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👩🏾‍❤️‍💋‍👨🏽 E13.1 kiss: woman, man, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👩🏾‍❤‍💋‍👨🏽 E13.1 kiss: woman, man, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👩🏾‍❤️‍💋‍👨🏾 E13.1 kiss: woman, man, medium-dark skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👩🏾‍❤‍💋‍👨🏾 E13.1 kiss: woman, man, medium-dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👩🏾‍❤️‍💋‍👨🏿 E13.1 kiss: woman, man, medium-dark skin tone, dark skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👩🏾‍❤‍💋‍👨🏿 E13.1 kiss: woman, man, medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👩🏿‍❤️‍💋‍👨🏻 E13.1 kiss: woman, man, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👩🏿‍❤‍💋‍👨🏻 E13.1 kiss: woman, man, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👩🏿‍❤️‍💋‍👨🏼 E13.1 kiss: woman, man, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👩🏿‍❤‍💋‍👨🏼 E13.1 kiss: woman, man, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👩🏿‍❤️‍💋‍👨🏽 E13.1 kiss: woman, man, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👩🏿‍❤‍💋‍👨🏽 E13.1 kiss: woman, man, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👩🏿‍❤️‍💋‍👨🏾 E13.1 kiss: woman, man, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👩🏿‍❤‍💋‍👨🏾 E13.1 kiss: woman, man, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👩🏿‍❤️‍💋‍👨🏿 E13.1 kiss: woman, man, dark skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👩🏿‍❤‍💋‍👨🏿 E13.1 kiss: woman, man, dark skin tone
+1F468 200D 2764 FE0F 200D 1F48B 200D 1F468             ; fully-qualified     # 👨‍❤️‍💋‍👨 E2.0 kiss: man, man
+1F468 200D 2764 200D 1F48B 200D 1F468                  ; minimally-qualified # 👨‍❤‍💋‍👨 E2.0 kiss: man, man
+1F468 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👨🏻‍❤️‍💋‍👨🏻 E13.1 kiss: man, man, light skin tone
+1F468 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👨🏻‍❤‍💋‍👨🏻 E13.1 kiss: man, man, light skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👨🏻‍❤️‍💋‍👨🏼 E13.1 kiss: man, man, light skin tone, medium-light skin tone
+1F468 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👨🏻‍❤‍💋‍👨🏼 E13.1 kiss: man, man, light skin tone, medium-light skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👨🏻‍❤️‍💋‍👨🏽 E13.1 kiss: man, man, light skin tone, medium skin tone
+1F468 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👨🏻‍❤‍💋‍👨🏽 E13.1 kiss: man, man, light skin tone, medium skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👨🏻‍❤️‍💋‍👨🏾 E13.1 kiss: man, man, light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👨🏻‍❤‍💋‍👨🏾 E13.1 kiss: man, man, light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👨🏻‍❤️‍💋‍👨🏿 E13.1 kiss: man, man, light skin tone, dark skin tone
+1F468 1F3FB 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👨🏻‍❤‍💋‍👨🏿 E13.1 kiss: man, man, light skin tone, dark skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👨🏼‍❤️‍💋‍👨🏻 E13.1 kiss: man, man, medium-light skin tone, light skin tone
+1F468 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👨🏼‍❤‍💋‍👨🏻 E13.1 kiss: man, man, medium-light skin tone, light skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👨🏼‍❤️‍💋‍👨🏼 E13.1 kiss: man, man, medium-light skin tone
+1F468 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👨🏼‍❤‍💋‍👨🏼 E13.1 kiss: man, man, medium-light skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👨🏼‍❤️‍💋‍👨🏽 E13.1 kiss: man, man, medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👨🏼‍❤‍💋‍👨🏽 E13.1 kiss: man, man, medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👨🏼‍❤️‍💋‍👨🏾 E13.1 kiss: man, man, medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👨🏼‍❤‍💋‍👨🏾 E13.1 kiss: man, man, medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👨🏼‍❤️‍💋‍👨🏿 E13.1 kiss: man, man, medium-light skin tone, dark skin tone
+1F468 1F3FC 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👨🏼‍❤‍💋‍👨🏿 E13.1 kiss: man, man, medium-light skin tone, dark skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👨🏽‍❤️‍💋‍👨🏻 E13.1 kiss: man, man, medium skin tone, light skin tone
+1F468 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👨🏽‍❤‍💋‍👨🏻 E13.1 kiss: man, man, medium skin tone, light skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👨🏽‍❤️‍💋‍👨🏼 E13.1 kiss: man, man, medium skin tone, medium-light skin tone
+1F468 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👨🏽‍❤‍💋‍👨🏼 E13.1 kiss: man, man, medium skin tone, medium-light skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👨🏽‍❤️‍💋‍👨🏽 E13.1 kiss: man, man, medium skin tone
+1F468 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👨🏽‍❤‍💋‍👨🏽 E13.1 kiss: man, man, medium skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👨🏽‍❤️‍💋‍👨🏾 E13.1 kiss: man, man, medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👨🏽‍❤‍💋‍👨🏾 E13.1 kiss: man, man, medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👨🏽‍❤️‍💋‍👨🏿 E13.1 kiss: man, man, medium skin tone, dark skin tone
+1F468 1F3FD 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👨🏽‍❤‍💋‍👨🏿 E13.1 kiss: man, man, medium skin tone, dark skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👨🏾‍❤️‍💋‍👨🏻 E13.1 kiss: man, man, medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👨🏾‍❤‍💋‍👨🏻 E13.1 kiss: man, man, medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👨🏾‍❤️‍💋‍👨🏼 E13.1 kiss: man, man, medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👨🏾‍❤‍💋‍👨🏼 E13.1 kiss: man, man, medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👨🏾‍❤️‍💋‍👨🏽 E13.1 kiss: man, man, medium-dark skin tone, medium skin tone
+1F468 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👨🏾‍❤‍💋‍👨🏽 E13.1 kiss: man, man, medium-dark skin tone, medium skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👨🏾‍❤️‍💋‍👨🏾 E13.1 kiss: man, man, medium-dark skin tone
+1F468 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👨🏾‍❤‍💋‍👨🏾 E13.1 kiss: man, man, medium-dark skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👨🏾‍❤️‍💋‍👨🏿 E13.1 kiss: man, man, medium-dark skin tone, dark skin tone
+1F468 1F3FE 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👨🏾‍❤‍💋‍👨🏿 E13.1 kiss: man, man, medium-dark skin tone, dark skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FB ; fully-qualified     # 👨🏿‍❤️‍💋‍👨🏻 E13.1 kiss: man, man, dark skin tone, light skin tone
+1F468 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FB      ; minimally-qualified # 👨🏿‍❤‍💋‍👨🏻 E13.1 kiss: man, man, dark skin tone, light skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FC ; fully-qualified     # 👨🏿‍❤️‍💋‍👨🏼 E13.1 kiss: man, man, dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FC      ; minimally-qualified # 👨🏿‍❤‍💋‍👨🏼 E13.1 kiss: man, man, dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FD ; fully-qualified     # 👨🏿‍❤️‍💋‍👨🏽 E13.1 kiss: man, man, dark skin tone, medium skin tone
+1F468 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FD      ; minimally-qualified # 👨🏿‍❤‍💋‍👨🏽 E13.1 kiss: man, man, dark skin tone, medium skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FE ; fully-qualified     # 👨🏿‍❤️‍💋‍👨🏾 E13.1 kiss: man, man, dark skin tone, medium-dark skin tone
+1F468 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FE      ; minimally-qualified # 👨🏿‍❤‍💋‍👨🏾 E13.1 kiss: man, man, dark skin tone, medium-dark skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F468 1F3FF ; fully-qualified     # 👨🏿‍❤️‍💋‍👨🏿 E13.1 kiss: man, man, dark skin tone
+1F468 1F3FF 200D 2764 200D 1F48B 200D 1F468 1F3FF      ; minimally-qualified # 👨🏿‍❤‍💋‍👨🏿 E13.1 kiss: man, man, dark skin tone
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F469             ; fully-qualified     # 👩‍❤️‍💋‍👩 E2.0 kiss: woman, woman
+1F469 200D 2764 200D 1F48B 200D 1F469                  ; minimally-qualified # 👩‍❤‍💋‍👩 E2.0 kiss: woman, woman
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FB ; fully-qualified     # 👩🏻‍❤️‍💋‍👩🏻 E13.1 kiss: woman, woman, light skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F469 1F3FB      ; minimally-qualified # 👩🏻‍❤‍💋‍👩🏻 E13.1 kiss: woman, woman, light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FC ; fully-qualified     # 👩🏻‍❤️‍💋‍👩🏼 E13.1 kiss: woman, woman, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F469 1F3FC      ; minimally-qualified # 👩🏻‍❤‍💋‍👩🏼 E13.1 kiss: woman, woman, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FD ; fully-qualified     # 👩🏻‍❤️‍💋‍👩🏽 E13.1 kiss: woman, woman, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F469 1F3FD      ; minimally-qualified # 👩🏻‍❤‍💋‍👩🏽 E13.1 kiss: woman, woman, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FE ; fully-qualified     # 👩🏻‍❤️‍💋‍👩🏾 E13.1 kiss: woman, woman, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F469 1F3FE      ; minimally-qualified # 👩🏻‍❤‍💋‍👩🏾 E13.1 kiss: woman, woman, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FF ; fully-qualified     # 👩🏻‍❤️‍💋‍👩🏿 E13.1 kiss: woman, woman, light skin tone, dark skin tone
+1F469 1F3FB 200D 2764 200D 1F48B 200D 1F469 1F3FF      ; minimally-qualified # 👩🏻‍❤‍💋‍👩🏿 E13.1 kiss: woman, woman, light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FB ; fully-qualified     # 👩🏼‍❤️‍💋‍👩🏻 E13.1 kiss: woman, woman, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F469 1F3FB      ; minimally-qualified # 👩🏼‍❤‍💋‍👩🏻 E13.1 kiss: woman, woman, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FC ; fully-qualified     # 👩🏼‍❤️‍💋‍👩🏼 E13.1 kiss: woman, woman, medium-light skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F469 1F3FC      ; minimally-qualified # 👩🏼‍❤‍💋‍👩🏼 E13.1 kiss: woman, woman, medium-light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FD ; fully-qualified     # 👩🏼‍❤️‍💋‍👩🏽 E13.1 kiss: woman, woman, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F469 1F3FD      ; minimally-qualified # 👩🏼‍❤‍💋‍👩🏽 E13.1 kiss: woman, woman, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FE ; fully-qualified     # 👩🏼‍❤️‍💋‍👩🏾 E13.1 kiss: woman, woman, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F469 1F3FE      ; minimally-qualified # 👩🏼‍❤‍💋‍👩🏾 E13.1 kiss: woman, woman, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FF ; fully-qualified     # 👩🏼‍❤️‍💋‍👩🏿 E13.1 kiss: woman, woman, medium-light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 200D 1F48B 200D 1F469 1F3FF      ; minimally-qualified # 👩🏼‍❤‍💋‍👩🏿 E13.1 kiss: woman, woman, medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FB ; fully-qualified     # 👩🏽‍❤️‍💋‍👩🏻 E13.1 kiss: woman, woman, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F469 1F3FB      ; minimally-qualified # 👩🏽‍❤‍💋‍👩🏻 E13.1 kiss: woman, woman, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FC ; fully-qualified     # 👩🏽‍❤️‍💋‍👩🏼 E13.1 kiss: woman, woman, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F469 1F3FC      ; minimally-qualified # 👩🏽‍❤‍💋‍👩🏼 E13.1 kiss: woman, woman, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FD ; fully-qualified     # 👩🏽‍❤️‍💋‍👩🏽 E13.1 kiss: woman, woman, medium skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F469 1F3FD      ; minimally-qualified # 👩🏽‍❤‍💋‍👩🏽 E13.1 kiss: woman, woman, medium skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FE ; fully-qualified     # 👩🏽‍❤️‍💋‍👩🏾 E13.1 kiss: woman, woman, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F469 1F3FE      ; minimally-qualified # 👩🏽‍❤‍💋‍👩🏾 E13.1 kiss: woman, woman, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FF ; fully-qualified     # 👩🏽‍❤️‍💋‍👩🏿 E13.1 kiss: woman, woman, medium skin tone, dark skin tone
+1F469 1F3FD 200D 2764 200D 1F48B 200D 1F469 1F3FF      ; minimally-qualified # 👩🏽‍❤‍💋‍👩🏿 E13.1 kiss: woman, woman, medium skin tone, dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FB ; fully-qualified     # 👩🏾‍❤️‍💋‍👩🏻 E13.1 kiss: woman, woman, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F469 1F3FB      ; minimally-qualified # 👩🏾‍❤‍💋‍👩🏻 E13.1 kiss: woman, woman, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FC ; fully-qualified     # 👩🏾‍❤️‍💋‍👩🏼 E13.1 kiss: woman, woman, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F469 1F3FC      ; minimally-qualified # 👩🏾‍❤‍💋‍👩🏼 E13.1 kiss: woman, woman, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FD ; fully-qualified     # 👩🏾‍❤️‍💋‍👩🏽 E13.1 kiss: woman, woman, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F469 1F3FD      ; minimally-qualified # 👩🏾‍❤‍💋‍👩🏽 E13.1 kiss: woman, woman, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FE ; fully-qualified     # 👩🏾‍❤️‍💋‍👩🏾 E13.1 kiss: woman, woman, medium-dark skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F469 1F3FE      ; minimally-qualified # 👩🏾‍❤‍💋‍👩🏾 E13.1 kiss: woman, woman, medium-dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FF ; fully-qualified     # 👩🏾‍❤️‍💋‍👩🏿 E13.1 kiss: woman, woman, medium-dark skin tone, dark skin tone
+1F469 1F3FE 200D 2764 200D 1F48B 200D 1F469 1F3FF      ; minimally-qualified # 👩🏾‍❤‍💋‍👩🏿 E13.1 kiss: woman, woman, medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FB ; fully-qualified     # 👩🏿‍❤️‍💋‍👩🏻 E13.1 kiss: woman, woman, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F469 1F3FB      ; minimally-qualified # 👩🏿‍❤‍💋‍👩🏻 E13.1 kiss: woman, woman, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FC ; fully-qualified     # 👩🏿‍❤️‍💋‍👩🏼 E13.1 kiss: woman, woman, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F469 1F3FC      ; minimally-qualified # 👩🏿‍❤‍💋‍👩🏼 E13.1 kiss: woman, woman, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FD ; fully-qualified     # 👩🏿‍❤️‍💋‍👩🏽 E13.1 kiss: woman, woman, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F469 1F3FD      ; minimally-qualified # 👩🏿‍❤‍💋‍👩🏽 E13.1 kiss: woman, woman, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FE ; fully-qualified     # 👩🏿‍❤️‍💋‍👩🏾 E13.1 kiss: woman, woman, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F469 1F3FE      ; minimally-qualified # 👩🏿‍❤‍💋‍👩🏾 E13.1 kiss: woman, woman, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F48B 200D 1F469 1F3FF ; fully-qualified     # 👩🏿‍❤️‍💋‍👩🏿 E13.1 kiss: woman, woman, dark skin tone
+1F469 1F3FF 200D 2764 200D 1F48B 200D 1F469 1F3FF      ; minimally-qualified # 👩🏿‍❤‍💋‍👩🏿 E13.1 kiss: woman, woman, dark skin tone
+1F491                                                  ; fully-qualified     # 💑 E0.6 couple with heart
+1F491 1F3FB                                            ; fully-qualified     # 💑🏻 E13.1 couple with heart: light skin tone
+1F491 1F3FC                                            ; fully-qualified     # 💑🏼 E13.1 couple with heart: medium-light skin tone
+1F491 1F3FD                                            ; fully-qualified     # 💑🏽 E13.1 couple with heart: medium skin tone
+1F491 1F3FE                                            ; fully-qualified     # 💑🏾 E13.1 couple with heart: medium-dark skin tone
+1F491 1F3FF                                            ; fully-qualified     # 💑🏿 E13.1 couple with heart: dark skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F9D1 1F3FC            ; fully-qualified     # 🧑🏻‍❤️‍🧑🏼 E13.1 couple with heart: person, person, light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 2764 200D 1F9D1 1F3FC                 ; minimally-qualified # 🧑🏻‍❤‍🧑🏼 E13.1 couple with heart: person, person, light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F9D1 1F3FD            ; fully-qualified     # 🧑🏻‍❤️‍🧑🏽 E13.1 couple with heart: person, person, light skin tone, medium skin tone
+1F9D1 1F3FB 200D 2764 200D 1F9D1 1F3FD                 ; minimally-qualified # 🧑🏻‍❤‍🧑🏽 E13.1 couple with heart: person, person, light skin tone, medium skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F9D1 1F3FE            ; fully-qualified     # 🧑🏻‍❤️‍🧑🏾 E13.1 couple with heart: person, person, light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 2764 200D 1F9D1 1F3FE                 ; minimally-qualified # 🧑🏻‍❤‍🧑🏾 E13.1 couple with heart: person, person, light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 2764 FE0F 200D 1F9D1 1F3FF            ; fully-qualified     # 🧑🏻‍❤️‍🧑🏿 E13.1 couple with heart: person, person, light skin tone, dark skin tone
+1F9D1 1F3FB 200D 2764 200D 1F9D1 1F3FF                 ; minimally-qualified # 🧑🏻‍❤‍🧑🏿 E13.1 couple with heart: person, person, light skin tone, dark skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F9D1 1F3FB            ; fully-qualified     # 🧑🏼‍❤️‍🧑🏻 E13.1 couple with heart: person, person, medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 2764 200D 1F9D1 1F3FB                 ; minimally-qualified # 🧑🏼‍❤‍🧑🏻 E13.1 couple with heart: person, person, medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F9D1 1F3FD            ; fully-qualified     # 🧑🏼‍❤️‍🧑🏽 E13.1 couple with heart: person, person, medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 2764 200D 1F9D1 1F3FD                 ; minimally-qualified # 🧑🏼‍❤‍🧑🏽 E13.1 couple with heart: person, person, medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F9D1 1F3FE            ; fully-qualified     # 🧑🏼‍❤️‍🧑🏾 E13.1 couple with heart: person, person, medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 2764 200D 1F9D1 1F3FE                 ; minimally-qualified # 🧑🏼‍❤‍🧑🏾 E13.1 couple with heart: person, person, medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 2764 FE0F 200D 1F9D1 1F3FF            ; fully-qualified     # 🧑🏼‍❤️‍🧑🏿 E13.1 couple with heart: person, person, medium-light skin tone, dark skin tone
+1F9D1 1F3FC 200D 2764 200D 1F9D1 1F3FF                 ; minimally-qualified # 🧑🏼‍❤‍🧑🏿 E13.1 couple with heart: person, person, medium-light skin tone, dark skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F9D1 1F3FB            ; fully-qualified     # 🧑🏽‍❤️‍🧑🏻 E13.1 couple with heart: person, person, medium skin tone, light skin tone
+1F9D1 1F3FD 200D 2764 200D 1F9D1 1F3FB                 ; minimally-qualified # 🧑🏽‍❤‍🧑🏻 E13.1 couple with heart: person, person, medium skin tone, light skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F9D1 1F3FC            ; fully-qualified     # 🧑🏽‍❤️‍🧑🏼 E13.1 couple with heart: person, person, medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 2764 200D 1F9D1 1F3FC                 ; minimally-qualified # 🧑🏽‍❤‍🧑🏼 E13.1 couple with heart: person, person, medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F9D1 1F3FE            ; fully-qualified     # 🧑🏽‍❤️‍🧑🏾 E13.1 couple with heart: person, person, medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 2764 200D 1F9D1 1F3FE                 ; minimally-qualified # 🧑🏽‍❤‍🧑🏾 E13.1 couple with heart: person, person, medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 2764 FE0F 200D 1F9D1 1F3FF            ; fully-qualified     # 🧑🏽‍❤️‍🧑🏿 E13.1 couple with heart: person, person, medium skin tone, dark skin tone
+1F9D1 1F3FD 200D 2764 200D 1F9D1 1F3FF                 ; minimally-qualified # 🧑🏽‍❤‍🧑🏿 E13.1 couple with heart: person, person, medium skin tone, dark skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F9D1 1F3FB            ; fully-qualified     # 🧑🏾‍❤️‍🧑🏻 E13.1 couple with heart: person, person, medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 2764 200D 1F9D1 1F3FB                 ; minimally-qualified # 🧑🏾‍❤‍🧑🏻 E13.1 couple with heart: person, person, medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F9D1 1F3FC            ; fully-qualified     # 🧑🏾‍❤️‍🧑🏼 E13.1 couple with heart: person, person, medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 2764 200D 1F9D1 1F3FC                 ; minimally-qualified # 🧑🏾‍❤‍🧑🏼 E13.1 couple with heart: person, person, medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F9D1 1F3FD            ; fully-qualified     # 🧑🏾‍❤️‍🧑🏽 E13.1 couple with heart: person, person, medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 2764 200D 1F9D1 1F3FD                 ; minimally-qualified # 🧑🏾‍❤‍🧑🏽 E13.1 couple with heart: person, person, medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 2764 FE0F 200D 1F9D1 1F3FF            ; fully-qualified     # 🧑🏾‍❤️‍🧑🏿 E13.1 couple with heart: person, person, medium-dark skin tone, dark skin tone
+1F9D1 1F3FE 200D 2764 200D 1F9D1 1F3FF                 ; minimally-qualified # 🧑🏾‍❤‍🧑🏿 E13.1 couple with heart: person, person, medium-dark skin tone, dark skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F9D1 1F3FB            ; fully-qualified     # 🧑🏿‍❤️‍🧑🏻 E13.1 couple with heart: person, person, dark skin tone, light skin tone
+1F9D1 1F3FF 200D 2764 200D 1F9D1 1F3FB                 ; minimally-qualified # 🧑🏿‍❤‍🧑🏻 E13.1 couple with heart: person, person, dark skin tone, light skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F9D1 1F3FC            ; fully-qualified     # 🧑🏿‍❤️‍🧑🏼 E13.1 couple with heart: person, person, dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 2764 200D 1F9D1 1F3FC                 ; minimally-qualified # 🧑🏿‍❤‍🧑🏼 E13.1 couple with heart: person, person, dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F9D1 1F3FD            ; fully-qualified     # 🧑🏿‍❤️‍🧑🏽 E13.1 couple with heart: person, person, dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 2764 200D 1F9D1 1F3FD                 ; minimally-qualified # 🧑🏿‍❤‍🧑🏽 E13.1 couple with heart: person, person, dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 2764 FE0F 200D 1F9D1 1F3FE            ; fully-qualified     # 🧑🏿‍❤️‍🧑🏾 E13.1 couple with heart: person, person, dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 2764 200D 1F9D1 1F3FE                 ; minimally-qualified # 🧑🏿‍❤‍🧑🏾 E13.1 couple with heart: person, person, dark skin tone, medium-dark skin tone
+1F469 200D 2764 FE0F 200D 1F468                        ; fully-qualified     # 👩‍❤️‍👨 E2.0 couple with heart: woman, man
+1F469 200D 2764 200D 1F468                             ; minimally-qualified # 👩‍❤‍👨 E2.0 couple with heart: woman, man
+1F469 1F3FB 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👩🏻‍❤️‍👨🏻 E13.1 couple with heart: woman, man, light skin tone
+1F469 1F3FB 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👩🏻‍❤‍👨🏻 E13.1 couple with heart: woman, man, light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👩🏻‍❤️‍👨🏼 E13.1 couple with heart: woman, man, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👩🏻‍❤‍👨🏼 E13.1 couple with heart: woman, man, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👩🏻‍❤️‍👨🏽 E13.1 couple with heart: woman, man, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👩🏻‍❤‍👨🏽 E13.1 couple with heart: woman, man, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👩🏻‍❤️‍👨🏾 E13.1 couple with heart: woman, man, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👩🏻‍❤‍👨🏾 E13.1 couple with heart: woman, man, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👩🏻‍❤️‍👨🏿 E13.1 couple with heart: woman, man, light skin tone, dark skin tone
+1F469 1F3FB 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👩🏻‍❤‍👨🏿 E13.1 couple with heart: woman, man, light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👩🏼‍❤️‍👨🏻 E13.1 couple with heart: woman, man, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👩🏼‍❤‍👨🏻 E13.1 couple with heart: woman, man, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👩🏼‍❤️‍👨🏼 E13.1 couple with heart: woman, man, medium-light skin tone
+1F469 1F3FC 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👩🏼‍❤‍👨🏼 E13.1 couple with heart: woman, man, medium-light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👩🏼‍❤️‍👨🏽 E13.1 couple with heart: woman, man, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👩🏼‍❤‍👨🏽 E13.1 couple with heart: woman, man, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👩🏼‍❤️‍👨🏾 E13.1 couple with heart: woman, man, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👩🏼‍❤‍👨🏾 E13.1 couple with heart: woman, man, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👩🏼‍❤️‍👨🏿 E13.1 couple with heart: woman, man, medium-light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👩🏼‍❤‍👨🏿 E13.1 couple with heart: woman, man, medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👩🏽‍❤️‍👨🏻 E13.1 couple with heart: woman, man, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👩🏽‍❤‍👨🏻 E13.1 couple with heart: woman, man, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👩🏽‍❤️‍👨🏼 E13.1 couple with heart: woman, man, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👩🏽‍❤‍👨🏼 E13.1 couple with heart: woman, man, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👩🏽‍❤️‍👨🏽 E13.1 couple with heart: woman, man, medium skin tone
+1F469 1F3FD 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👩🏽‍❤‍👨🏽 E13.1 couple with heart: woman, man, medium skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👩🏽‍❤️‍👨🏾 E13.1 couple with heart: woman, man, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👩🏽‍❤‍👨🏾 E13.1 couple with heart: woman, man, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👩🏽‍❤️‍👨🏿 E13.1 couple with heart: woman, man, medium skin tone, dark skin tone
+1F469 1F3FD 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👩🏽‍❤‍👨🏿 E13.1 couple with heart: woman, man, medium skin tone, dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👩🏾‍❤️‍👨🏻 E13.1 couple with heart: woman, man, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👩🏾‍❤‍👨🏻 E13.1 couple with heart: woman, man, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👩🏾‍❤️‍👨🏼 E13.1 couple with heart: woman, man, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👩🏾‍❤‍👨🏼 E13.1 couple with heart: woman, man, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👩🏾‍❤️‍👨🏽 E13.1 couple with heart: woman, man, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👩🏾‍❤‍👨🏽 E13.1 couple with heart: woman, man, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👩🏾‍❤️‍👨🏾 E13.1 couple with heart: woman, man, medium-dark skin tone
+1F469 1F3FE 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👩🏾‍❤‍👨🏾 E13.1 couple with heart: woman, man, medium-dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👩🏾‍❤️‍👨🏿 E13.1 couple with heart: woman, man, medium-dark skin tone, dark skin tone
+1F469 1F3FE 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👩🏾‍❤‍👨🏿 E13.1 couple with heart: woman, man, medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👩🏿‍❤️‍👨🏻 E13.1 couple with heart: woman, man, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👩🏿‍❤‍👨🏻 E13.1 couple with heart: woman, man, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👩🏿‍❤️‍👨🏼 E13.1 couple with heart: woman, man, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👩🏿‍❤‍👨🏼 E13.1 couple with heart: woman, man, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👩🏿‍❤️‍👨🏽 E13.1 couple with heart: woman, man, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👩🏿‍❤‍👨🏽 E13.1 couple with heart: woman, man, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👩🏿‍❤️‍👨🏾 E13.1 couple with heart: woman, man, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👩🏿‍❤‍👨🏾 E13.1 couple with heart: woman, man, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👩🏿‍❤️‍👨🏿 E13.1 couple with heart: woman, man, dark skin tone
+1F469 1F3FF 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👩🏿‍❤‍👨🏿 E13.1 couple with heart: woman, man, dark skin tone
+1F468 200D 2764 FE0F 200D 1F468                        ; fully-qualified     # 👨‍❤️‍👨 E2.0 couple with heart: man, man
+1F468 200D 2764 200D 1F468                             ; minimally-qualified # 👨‍❤‍👨 E2.0 couple with heart: man, man
+1F468 1F3FB 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👨🏻‍❤️‍👨🏻 E13.1 couple with heart: man, man, light skin tone
+1F468 1F3FB 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👨🏻‍❤‍👨🏻 E13.1 couple with heart: man, man, light skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👨🏻‍❤️‍👨🏼 E13.1 couple with heart: man, man, light skin tone, medium-light skin tone
+1F468 1F3FB 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👨🏻‍❤‍👨🏼 E13.1 couple with heart: man, man, light skin tone, medium-light skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👨🏻‍❤️‍👨🏽 E13.1 couple with heart: man, man, light skin tone, medium skin tone
+1F468 1F3FB 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👨🏻‍❤‍👨🏽 E13.1 couple with heart: man, man, light skin tone, medium skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👨🏻‍❤️‍👨🏾 E13.1 couple with heart: man, man, light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👨🏻‍❤‍👨🏾 E13.1 couple with heart: man, man, light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👨🏻‍❤️‍👨🏿 E13.1 couple with heart: man, man, light skin tone, dark skin tone
+1F468 1F3FB 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👨🏻‍❤‍👨🏿 E13.1 couple with heart: man, man, light skin tone, dark skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👨🏼‍❤️‍👨🏻 E13.1 couple with heart: man, man, medium-light skin tone, light skin tone
+1F468 1F3FC 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👨🏼‍❤‍👨🏻 E13.1 couple with heart: man, man, medium-light skin tone, light skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👨🏼‍❤️‍👨🏼 E13.1 couple with heart: man, man, medium-light skin tone
+1F468 1F3FC 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👨🏼‍❤‍👨🏼 E13.1 couple with heart: man, man, medium-light skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👨🏼‍❤️‍👨🏽 E13.1 couple with heart: man, man, medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👨🏼‍❤‍👨🏽 E13.1 couple with heart: man, man, medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👨🏼‍❤️‍👨🏾 E13.1 couple with heart: man, man, medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👨🏼‍❤‍👨🏾 E13.1 couple with heart: man, man, medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👨🏼‍❤️‍👨🏿 E13.1 couple with heart: man, man, medium-light skin tone, dark skin tone
+1F468 1F3FC 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👨🏼‍❤‍👨🏿 E13.1 couple with heart: man, man, medium-light skin tone, dark skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👨🏽‍❤️‍👨🏻 E13.1 couple with heart: man, man, medium skin tone, light skin tone
+1F468 1F3FD 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👨🏽‍❤‍👨🏻 E13.1 couple with heart: man, man, medium skin tone, light skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👨🏽‍❤️‍👨🏼 E13.1 couple with heart: man, man, medium skin tone, medium-light skin tone
+1F468 1F3FD 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👨🏽‍❤‍👨🏼 E13.1 couple with heart: man, man, medium skin tone, medium-light skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👨🏽‍❤️‍👨🏽 E13.1 couple with heart: man, man, medium skin tone
+1F468 1F3FD 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👨🏽‍❤‍👨🏽 E13.1 couple with heart: man, man, medium skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👨🏽‍❤️‍👨🏾 E13.1 couple with heart: man, man, medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👨🏽‍❤‍👨🏾 E13.1 couple with heart: man, man, medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👨🏽‍❤️‍👨🏿 E13.1 couple with heart: man, man, medium skin tone, dark skin tone
+1F468 1F3FD 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👨🏽‍❤‍👨🏿 E13.1 couple with heart: man, man, medium skin tone, dark skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👨🏾‍❤️‍👨🏻 E13.1 couple with heart: man, man, medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👨🏾‍❤‍👨🏻 E13.1 couple with heart: man, man, medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👨🏾‍❤️‍👨🏼 E13.1 couple with heart: man, man, medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👨🏾‍❤‍👨🏼 E13.1 couple with heart: man, man, medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👨🏾‍❤️‍👨🏽 E13.1 couple with heart: man, man, medium-dark skin tone, medium skin tone
+1F468 1F3FE 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👨🏾‍❤‍👨🏽 E13.1 couple with heart: man, man, medium-dark skin tone, medium skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👨🏾‍❤️‍👨🏾 E13.1 couple with heart: man, man, medium-dark skin tone
+1F468 1F3FE 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👨🏾‍❤‍👨🏾 E13.1 couple with heart: man, man, medium-dark skin tone
+1F468 1F3FE 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👨🏾‍❤️‍👨🏿 E13.1 couple with heart: man, man, medium-dark skin tone, dark skin tone
+1F468 1F3FE 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👨🏾‍❤‍👨🏿 E13.1 couple with heart: man, man, medium-dark skin tone, dark skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F468 1F3FB            ; fully-qualified     # 👨🏿‍❤️‍👨🏻 E13.1 couple with heart: man, man, dark skin tone, light skin tone
+1F468 1F3FF 200D 2764 200D 1F468 1F3FB                 ; minimally-qualified # 👨🏿‍❤‍👨🏻 E13.1 couple with heart: man, man, dark skin tone, light skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F468 1F3FC            ; fully-qualified     # 👨🏿‍❤️‍👨🏼 E13.1 couple with heart: man, man, dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 2764 200D 1F468 1F3FC                 ; minimally-qualified # 👨🏿‍❤‍👨🏼 E13.1 couple with heart: man, man, dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F468 1F3FD            ; fully-qualified     # 👨🏿‍❤️‍👨🏽 E13.1 couple with heart: man, man, dark skin tone, medium skin tone
+1F468 1F3FF 200D 2764 200D 1F468 1F3FD                 ; minimally-qualified # 👨🏿‍❤‍👨🏽 E13.1 couple with heart: man, man, dark skin tone, medium skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F468 1F3FE            ; fully-qualified     # 👨🏿‍❤️‍👨🏾 E13.1 couple with heart: man, man, dark skin tone, medium-dark skin tone
+1F468 1F3FF 200D 2764 200D 1F468 1F3FE                 ; minimally-qualified # 👨🏿‍❤‍👨🏾 E13.1 couple with heart: man, man, dark skin tone, medium-dark skin tone
+1F468 1F3FF 200D 2764 FE0F 200D 1F468 1F3FF            ; fully-qualified     # 👨🏿‍❤️‍👨🏿 E13.1 couple with heart: man, man, dark skin tone
+1F468 1F3FF 200D 2764 200D 1F468 1F3FF                 ; minimally-qualified # 👨🏿‍❤‍👨🏿 E13.1 couple with heart: man, man, dark skin tone
+1F469 200D 2764 FE0F 200D 1F469                        ; fully-qualified     # 👩‍❤️‍👩 E2.0 couple with heart: woman, woman
+1F469 200D 2764 200D 1F469                             ; minimally-qualified # 👩‍❤‍👩 E2.0 couple with heart: woman, woman
+1F469 1F3FB 200D 2764 FE0F 200D 1F469 1F3FB            ; fully-qualified     # 👩🏻‍❤️‍👩🏻 E13.1 couple with heart: woman, woman, light skin tone
+1F469 1F3FB 200D 2764 200D 1F469 1F3FB                 ; minimally-qualified # 👩🏻‍❤‍👩🏻 E13.1 couple with heart: woman, woman, light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F469 1F3FC            ; fully-qualified     # 👩🏻‍❤️‍👩🏼 E13.1 couple with heart: woman, woman, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 200D 1F469 1F3FC                 ; minimally-qualified # 👩🏻‍❤‍👩🏼 E13.1 couple with heart: woman, woman, light skin tone, medium-light skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F469 1F3FD            ; fully-qualified     # 👩🏻‍❤️‍👩🏽 E13.1 couple with heart: woman, woman, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 200D 1F469 1F3FD                 ; minimally-qualified # 👩🏻‍❤‍👩🏽 E13.1 couple with heart: woman, woman, light skin tone, medium skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F469 1F3FE            ; fully-qualified     # 👩🏻‍❤️‍👩🏾 E13.1 couple with heart: woman, woman, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 200D 1F469 1F3FE                 ; minimally-qualified # 👩🏻‍❤‍👩🏾 E13.1 couple with heart: woman, woman, light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 2764 FE0F 200D 1F469 1F3FF            ; fully-qualified     # 👩🏻‍❤️‍👩🏿 E13.1 couple with heart: woman, woman, light skin tone, dark skin tone
+1F469 1F3FB 200D 2764 200D 1F469 1F3FF                 ; minimally-qualified # 👩🏻‍❤‍👩🏿 E13.1 couple with heart: woman, woman, light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F469 1F3FB            ; fully-qualified     # 👩🏼‍❤️‍👩🏻 E13.1 couple with heart: woman, woman, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 200D 1F469 1F3FB                 ; minimally-qualified # 👩🏼‍❤‍👩🏻 E13.1 couple with heart: woman, woman, medium-light skin tone, light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F469 1F3FC            ; fully-qualified     # 👩🏼‍❤️‍👩🏼 E13.1 couple with heart: woman, woman, medium-light skin tone
+1F469 1F3FC 200D 2764 200D 1F469 1F3FC                 ; minimally-qualified # 👩🏼‍❤‍👩🏼 E13.1 couple with heart: woman, woman, medium-light skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F469 1F3FD            ; fully-qualified     # 👩🏼‍❤️‍👩🏽 E13.1 couple with heart: woman, woman, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 200D 1F469 1F3FD                 ; minimally-qualified # 👩🏼‍❤‍👩🏽 E13.1 couple with heart: woman, woman, medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F469 1F3FE            ; fully-qualified     # 👩🏼‍❤️‍👩🏾 E13.1 couple with heart: woman, woman, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 200D 1F469 1F3FE                 ; minimally-qualified # 👩🏼‍❤‍👩🏾 E13.1 couple with heart: woman, woman, medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 2764 FE0F 200D 1F469 1F3FF            ; fully-qualified     # 👩🏼‍❤️‍👩🏿 E13.1 couple with heart: woman, woman, medium-light skin tone, dark skin tone
+1F469 1F3FC 200D 2764 200D 1F469 1F3FF                 ; minimally-qualified # 👩🏼‍❤‍👩🏿 E13.1 couple with heart: woman, woman, medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F469 1F3FB            ; fully-qualified     # 👩🏽‍❤️‍👩🏻 E13.1 couple with heart: woman, woman, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 200D 1F469 1F3FB                 ; minimally-qualified # 👩🏽‍❤‍👩🏻 E13.1 couple with heart: woman, woman, medium skin tone, light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F469 1F3FC            ; fully-qualified     # 👩🏽‍❤️‍👩🏼 E13.1 couple with heart: woman, woman, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 200D 1F469 1F3FC                 ; minimally-qualified # 👩🏽‍❤‍👩🏼 E13.1 couple with heart: woman, woman, medium skin tone, medium-light skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F469 1F3FD            ; fully-qualified     # 👩🏽‍❤️‍👩🏽 E13.1 couple with heart: woman, woman, medium skin tone
+1F469 1F3FD 200D 2764 200D 1F469 1F3FD                 ; minimally-qualified # 👩🏽‍❤‍👩🏽 E13.1 couple with heart: woman, woman, medium skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F469 1F3FE            ; fully-qualified     # 👩🏽‍❤️‍👩🏾 E13.1 couple with heart: woman, woman, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 200D 1F469 1F3FE                 ; minimally-qualified # 👩🏽‍❤‍👩🏾 E13.1 couple with heart: woman, woman, medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 2764 FE0F 200D 1F469 1F3FF            ; fully-qualified     # 👩🏽‍❤️‍👩🏿 E13.1 couple with heart: woman, woman, medium skin tone, dark skin tone
+1F469 1F3FD 200D 2764 200D 1F469 1F3FF                 ; minimally-qualified # 👩🏽‍❤‍👩🏿 E13.1 couple with heart: woman, woman, medium skin tone, dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F469 1F3FB            ; fully-qualified     # 👩🏾‍❤️‍👩🏻 E13.1 couple with heart: woman, woman, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 200D 1F469 1F3FB                 ; minimally-qualified # 👩🏾‍❤‍👩🏻 E13.1 couple with heart: woman, woman, medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F469 1F3FC            ; fully-qualified     # 👩🏾‍❤️‍👩🏼 E13.1 couple with heart: woman, woman, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 200D 1F469 1F3FC                 ; minimally-qualified # 👩🏾‍❤‍👩🏼 E13.1 couple with heart: woman, woman, medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F469 1F3FD            ; fully-qualified     # 👩🏾‍❤️‍👩🏽 E13.1 couple with heart: woman, woman, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 200D 1F469 1F3FD                 ; minimally-qualified # 👩🏾‍❤‍👩🏽 E13.1 couple with heart: woman, woman, medium-dark skin tone, medium skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F469 1F3FE            ; fully-qualified     # 👩🏾‍❤️‍👩🏾 E13.1 couple with heart: woman, woman, medium-dark skin tone
+1F469 1F3FE 200D 2764 200D 1F469 1F3FE                 ; minimally-qualified # 👩🏾‍❤‍👩🏾 E13.1 couple with heart: woman, woman, medium-dark skin tone
+1F469 1F3FE 200D 2764 FE0F 200D 1F469 1F3FF            ; fully-qualified     # 👩🏾‍❤️‍👩🏿 E13.1 couple with heart: woman, woman, medium-dark skin tone, dark skin tone
+1F469 1F3FE 200D 2764 200D 1F469 1F3FF                 ; minimally-qualified # 👩🏾‍❤‍👩🏿 E13.1 couple with heart: woman, woman, medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F469 1F3FB            ; fully-qualified     # 👩🏿‍❤️‍👩🏻 E13.1 couple with heart: woman, woman, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 200D 1F469 1F3FB                 ; minimally-qualified # 👩🏿‍❤‍👩🏻 E13.1 couple with heart: woman, woman, dark skin tone, light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F469 1F3FC            ; fully-qualified     # 👩🏿‍❤️‍👩🏼 E13.1 couple with heart: woman, woman, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 200D 1F469 1F3FC                 ; minimally-qualified # 👩🏿‍❤‍👩🏼 E13.1 couple with heart: woman, woman, dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F469 1F3FD            ; fully-qualified     # 👩🏿‍❤️‍👩🏽 E13.1 couple with heart: woman, woman, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 200D 1F469 1F3FD                 ; minimally-qualified # 👩🏿‍❤‍👩🏽 E13.1 couple with heart: woman, woman, dark skin tone, medium skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F469 1F3FE            ; fully-qualified     # 👩🏿‍❤️‍👩🏾 E13.1 couple with heart: woman, woman, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 200D 1F469 1F3FE                 ; minimally-qualified # 👩🏿‍❤‍👩🏾 E13.1 couple with heart: woman, woman, dark skin tone, medium-dark skin tone
+1F469 1F3FF 200D 2764 FE0F 200D 1F469 1F3FF            ; fully-qualified     # 👩🏿‍❤️‍👩🏿 E13.1 couple with heart: woman, woman, dark skin tone
+1F469 1F3FF 200D 2764 200D 1F469 1F3FF                 ; minimally-qualified # 👩🏿‍❤‍👩🏿 E13.1 couple with heart: woman, woman, dark skin tone
+1F468 200D 1F469 200D 1F466                            ; fully-qualified     # 👨‍👩‍👦 E2.0 family: man, woman, boy
+1F468 200D 1F469 200D 1F467                            ; fully-qualified     # 👨‍👩‍👧 E2.0 family: man, woman, girl
+1F468 200D 1F469 200D 1F467 200D 1F466                 ; fully-qualified     # 👨‍👩‍👧‍👦 E2.0 family: man, woman, girl, boy
+1F468 200D 1F469 200D 1F466 200D 1F466                 ; fully-qualified     # 👨‍👩‍👦‍👦 E2.0 family: man, woman, boy, boy
+1F468 200D 1F469 200D 1F467 200D 1F467                 ; fully-qualified     # 👨‍👩‍👧‍👧 E2.0 family: man, woman, girl, girl
+1F468 200D 1F468 200D 1F466                            ; fully-qualified     # 👨‍👨‍👦 E2.0 family: man, man, boy
+1F468 200D 1F468 200D 1F467                            ; fully-qualified     # 👨‍👨‍👧 E2.0 family: man, man, girl
+1F468 200D 1F468 200D 1F467 200D 1F466                 ; fully-qualified     # 👨‍👨‍👧‍👦 E2.0 family: man, man, girl, boy
+1F468 200D 1F468 200D 1F466 200D 1F466                 ; fully-qualified     # 👨‍👨‍👦‍👦 E2.0 family: man, man, boy, boy
+1F468 200D 1F468 200D 1F467 200D 1F467                 ; fully-qualified     # 👨‍👨‍👧‍👧 E2.0 family: man, man, girl, girl
+1F469 200D 1F469 200D 1F466                            ; fully-qualified     # 👩‍👩‍👦 E2.0 family: woman, woman, boy
+1F469 200D 1F469 200D 1F467                            ; fully-qualified     # 👩‍👩‍👧 E2.0 family: woman, woman, girl
+1F469 200D 1F469 200D 1F467 200D 1F466                 ; fully-qualified     # 👩‍👩‍👧‍👦 E2.0 family: woman, woman, girl, boy
+1F469 200D 1F469 200D 1F466 200D 1F466                 ; fully-qualified     # 👩‍👩‍👦‍👦 E2.0 family: woman, woman, boy, boy
+1F469 200D 1F469 200D 1F467 200D 1F467                 ; fully-qualified     # 👩‍👩‍👧‍👧 E2.0 family: woman, woman, girl, girl
+1F468 200D 1F466                                       ; fully-qualified     # 👨‍👦 E4.0 family: man, boy
+1F468 200D 1F466 200D 1F466                            ; fully-qualified     # 👨‍👦‍👦 E4.0 family: man, boy, boy
+1F468 200D 1F467                                       ; fully-qualified     # 👨‍👧 E4.0 family: man, girl
+1F468 200D 1F467 200D 1F466                            ; fully-qualified     # 👨‍👧‍👦 E4.0 family: man, girl, boy
+1F468 200D 1F467 200D 1F467                            ; fully-qualified     # 👨‍👧‍👧 E4.0 family: man, girl, girl
+1F469 200D 1F466                                       ; fully-qualified     # 👩‍👦 E4.0 family: woman, boy
+1F469 200D 1F466 200D 1F466                            ; fully-qualified     # 👩‍👦‍👦 E4.0 family: woman, boy, boy
+1F469 200D 1F467                                       ; fully-qualified     # 👩‍👧 E4.0 family: woman, girl
+1F469 200D 1F467 200D 1F466                            ; fully-qualified     # 👩‍👧‍👦 E4.0 family: woman, girl, boy
+1F469 200D 1F467 200D 1F467                            ; fully-qualified     # 👩‍👧‍👧 E4.0 family: woman, girl, girl
+
+# subgroup: person-symbol
+1F5E3 FE0F                                             ; fully-qualified     # 🗣️ E0.7 speaking head
+1F5E3                                                  ; unqualified         # 🗣 E0.7 speaking head
+1F464                                                  ; fully-qualified     # 👤 E0.6 bust in silhouette
+1F465                                                  ; fully-qualified     # 👥 E1.0 busts in silhouette
+1FAC2                                                  ; fully-qualified     # 🫂 E13.0 people hugging
+1F46A                                                  ; fully-qualified     # 👪 E0.6 family
+1F9D1 200D 1F9D1 200D 1F9D2                            ; fully-qualified     # 🧑‍🧑‍🧒 E15.1 family: adult, adult, child
+1F9D1 200D 1F9D1 200D 1F9D2 200D 1F9D2                 ; fully-qualified     # 🧑‍🧑‍🧒‍🧒 E15.1 family: adult, adult, child, child
+1F9D1 200D 1F9D2                                       ; fully-qualified     # 🧑‍🧒 E15.1 family: adult, child
+1F9D1 200D 1F9D2 200D 1F9D2                            ; fully-qualified     # 🧑‍🧒‍🧒 E15.1 family: adult, child, child
+1F463                                                  ; fully-qualified     # 👣 E0.6 footprints
+
+# People & Body subtotal:		3290
+# People & Body subtotal:		560	w/o modifiers
+
+# group: Component
+
+# subgroup: skin-tone
+1F3FB                                                  ; component           # 🏻 E1.0 light skin tone
+1F3FC                                                  ; component           # 🏼 E1.0 medium-light skin tone
+1F3FD                                                  ; component           # 🏽 E1.0 medium skin tone
+1F3FE                                                  ; component           # 🏾 E1.0 medium-dark skin tone
+1F3FF                                                  ; component           # 🏿 E1.0 dark skin tone
+
+# subgroup: hair-style
+1F9B0                                                  ; component           # 🦰 E11.0 red hair
+1F9B1                                                  ; component           # 🦱 E11.0 curly hair
+1F9B3                                                  ; component           # 🦳 E11.0 white hair
+1F9B2                                                  ; component           # 🦲 E11.0 bald
+
+# Component subtotal:		9
+# Component subtotal:		4	w/o modifiers
+
+# group: Animals & Nature
+
+# subgroup: animal-mammal
+1F435                                                  ; fully-qualified     # 🐵 E0.6 monkey face
+1F412                                                  ; fully-qualified     # 🐒 E0.6 monkey
+1F98D                                                  ; fully-qualified     # 🦍 E3.0 gorilla
+1F9A7                                                  ; fully-qualified     # 🦧 E12.0 orangutan
+1F436                                                  ; fully-qualified     # 🐶 E0.6 dog face
+1F415                                                  ; fully-qualified     # 🐕 E0.7 dog
+1F9AE                                                  ; fully-qualified     # 🦮 E12.0 guide dog
+1F415 200D 1F9BA                                       ; fully-qualified     # 🐕‍🦺 E12.0 service dog
+1F429                                                  ; fully-qualified     # 🐩 E0.6 poodle
+1F43A                                                  ; fully-qualified     # 🐺 E0.6 wolf
+1F98A                                                  ; fully-qualified     # 🦊 E3.0 fox
+1F99D                                                  ; fully-qualified     # 🦝 E11.0 raccoon
+1F431                                                  ; fully-qualified     # 🐱 E0.6 cat face
+1F408                                                  ; fully-qualified     # 🐈 E0.7 cat
+1F408 200D 2B1B                                        ; fully-qualified     # 🐈‍⬛ E13.0 black cat
+1F981                                                  ; fully-qualified     # 🦁 E1.0 lion
+1F42F                                                  ; fully-qualified     # 🐯 E0.6 tiger face
+1F405                                                  ; fully-qualified     # 🐅 E1.0 tiger
+1F406                                                  ; fully-qualified     # 🐆 E1.0 leopard
+1F434                                                  ; fully-qualified     # 🐴 E0.6 horse face
+1FACE                                                  ; fully-qualified     # 🫎 E15.0 moose
+1FACF                                                  ; fully-qualified     # 🫏 E15.0 donkey
+1F40E                                                  ; fully-qualified     # 🐎 E0.6 horse
+1F984                                                  ; fully-qualified     # 🦄 E1.0 unicorn
+1F993                                                  ; fully-qualified     # 🦓 E5.0 zebra
+1F98C                                                  ; fully-qualified     # 🦌 E3.0 deer
+1F9AC                                                  ; fully-qualified     # 🦬 E13.0 bison
+1F42E                                                  ; fully-qualified     # 🐮 E0.6 cow face
+1F402                                                  ; fully-qualified     # 🐂 E1.0 ox
+1F403                                                  ; fully-qualified     # 🐃 E1.0 water buffalo
+1F404                                                  ; fully-qualified     # 🐄 E1.0 cow
+1F437                                                  ; fully-qualified     # 🐷 E0.6 pig face
+1F416                                                  ; fully-qualified     # 🐖 E1.0 pig
+1F417                                                  ; fully-qualified     # 🐗 E0.6 boar
+1F43D                                                  ; fully-qualified     # 🐽 E0.6 pig nose
+1F40F                                                  ; fully-qualified     # 🐏 E1.0 ram
+1F411                                                  ; fully-qualified     # 🐑 E0.6 ewe
+1F410                                                  ; fully-qualified     # 🐐 E1.0 goat
+1F42A                                                  ; fully-qualified     # 🐪 E1.0 camel
+1F42B                                                  ; fully-qualified     # 🐫 E0.6 two-hump camel
+1F999                                                  ; fully-qualified     # 🦙 E11.0 llama
+1F992                                                  ; fully-qualified     # 🦒 E5.0 giraffe
+1F418                                                  ; fully-qualified     # 🐘 E0.6 elephant
+1F9A3                                                  ; fully-qualified     # 🦣 E13.0 mammoth
+1F98F                                                  ; fully-qualified     # 🦏 E3.0 rhinoceros
+1F99B                                                  ; fully-qualified     # 🦛 E11.0 hippopotamus
+1F42D                                                  ; fully-qualified     # 🐭 E0.6 mouse face
+1F401                                                  ; fully-qualified     # 🐁 E1.0 mouse
+1F400                                                  ; fully-qualified     # 🐀 E1.0 rat
+1F439                                                  ; fully-qualified     # 🐹 E0.6 hamster
+1F430                                                  ; fully-qualified     # 🐰 E0.6 rabbit face
+1F407                                                  ; fully-qualified     # 🐇 E1.0 rabbit
+1F43F FE0F                                             ; fully-qualified     # 🐿️ E0.7 chipmunk
+1F43F                                                  ; unqualified         # 🐿 E0.7 chipmunk
+1F9AB                                                  ; fully-qualified     # 🦫 E13.0 beaver
+1F994                                                  ; fully-qualified     # 🦔 E5.0 hedgehog
+1F987                                                  ; fully-qualified     # 🦇 E3.0 bat
+1F43B                                                  ; fully-qualified     # 🐻 E0.6 bear
+1F43B 200D 2744 FE0F                                   ; fully-qualified     # 🐻‍❄️ E13.0 polar bear
+1F43B 200D 2744                                        ; minimally-qualified # 🐻‍❄ E13.0 polar bear
+1F428                                                  ; fully-qualified     # 🐨 E0.6 koala
+1F43C                                                  ; fully-qualified     # 🐼 E0.6 panda
+1F9A5                                                  ; fully-qualified     # 🦥 E12.0 sloth
+1F9A6                                                  ; fully-qualified     # 🦦 E12.0 otter
+1F9A8                                                  ; fully-qualified     # 🦨 E12.0 skunk
+1F998                                                  ; fully-qualified     # 🦘 E11.0 kangaroo
+1F9A1                                                  ; fully-qualified     # 🦡 E11.0 badger
+1F43E                                                  ; fully-qualified     # 🐾 E0.6 paw prints
+
+# subgroup: animal-bird
+1F983                                                  ; fully-qualified     # 🦃 E1.0 turkey
+1F414                                                  ; fully-qualified     # 🐔 E0.6 chicken
+1F413                                                  ; fully-qualified     # 🐓 E1.0 rooster
+1F423                                                  ; fully-qualified     # 🐣 E0.6 hatching chick
+1F424                                                  ; fully-qualified     # 🐤 E0.6 baby chick
+1F425                                                  ; fully-qualified     # 🐥 E0.6 front-facing baby chick
+1F426                                                  ; fully-qualified     # 🐦 E0.6 bird
+1F427                                                  ; fully-qualified     # 🐧 E0.6 penguin
+1F54A FE0F                                             ; fully-qualified     # 🕊️ E0.7 dove
+1F54A                                                  ; unqualified         # 🕊 E0.7 dove
+1F985                                                  ; fully-qualified     # 🦅 E3.0 eagle
+1F986                                                  ; fully-qualified     # 🦆 E3.0 duck
+1F9A2                                                  ; fully-qualified     # 🦢 E11.0 swan
+1F989                                                  ; fully-qualified     # 🦉 E3.0 owl
+1F9A4                                                  ; fully-qualified     # 🦤 E13.0 dodo
+1FAB6                                                  ; fully-qualified     # 🪶 E13.0 feather
+1F9A9                                                  ; fully-qualified     # 🦩 E12.0 flamingo
+1F99A                                                  ; fully-qualified     # 🦚 E11.0 peacock
+1F99C                                                  ; fully-qualified     # 🦜 E11.0 parrot
+1FABD                                                  ; fully-qualified     # 🪽 E15.0 wing
+1F426 200D 2B1B                                        ; fully-qualified     # 🐦‍⬛ E15.0 black bird
+1FABF                                                  ; fully-qualified     # 🪿 E15.0 goose
+1F426 200D 1F525                                       ; fully-qualified     # 🐦‍🔥 E15.1 phoenix
+
+# subgroup: animal-amphibian
+1F438                                                  ; fully-qualified     # 🐸 E0.6 frog
+
+# subgroup: animal-reptile
+1F40A                                                  ; fully-qualified     # 🐊 E1.0 crocodile
+1F422                                                  ; fully-qualified     # 🐢 E0.6 turtle
+1F98E                                                  ; fully-qualified     # 🦎 E3.0 lizard
+1F40D                                                  ; fully-qualified     # 🐍 E0.6 snake
+1F432                                                  ; fully-qualified     # 🐲 E0.6 dragon face
+1F409                                                  ; fully-qualified     # 🐉 E1.0 dragon
+1F995                                                  ; fully-qualified     # 🦕 E5.0 sauropod
+1F996                                                  ; fully-qualified     # 🦖 E5.0 T-Rex
+
+# subgroup: animal-marine
+1F433                                                  ; fully-qualified     # 🐳 E0.6 spouting whale
+1F40B                                                  ; fully-qualified     # 🐋 E1.0 whale
+1F42C                                                  ; fully-qualified     # 🐬 E0.6 dolphin
+1F9AD                                                  ; fully-qualified     # 🦭 E13.0 seal
+1F41F                                                  ; fully-qualified     # 🐟 E0.6 fish
+1F420                                                  ; fully-qualified     # 🐠 E0.6 tropical fish
+1F421                                                  ; fully-qualified     # 🐡 E0.6 blowfish
+1F988                                                  ; fully-qualified     # 🦈 E3.0 shark
+1F419                                                  ; fully-qualified     # 🐙 E0.6 octopus
+1F41A                                                  ; fully-qualified     # 🐚 E0.6 spiral shell
+1FAB8                                                  ; fully-qualified     # 🪸 E14.0 coral
+1FABC                                                  ; fully-qualified     # 🪼 E15.0 jellyfish
+
+# subgroup: animal-bug
+1F40C                                                  ; fully-qualified     # 🐌 E0.6 snail
+1F98B                                                  ; fully-qualified     # 🦋 E3.0 butterfly
+1F41B                                                  ; fully-qualified     # 🐛 E0.6 bug
+1F41C                                                  ; fully-qualified     # 🐜 E0.6 ant
+1F41D                                                  ; fully-qualified     # 🐝 E0.6 honeybee
+1FAB2                                                  ; fully-qualified     # 🪲 E13.0 beetle
+1F41E                                                  ; fully-qualified     # 🐞 E0.6 lady beetle
+1F997                                                  ; fully-qualified     # 🦗 E5.0 cricket
+1FAB3                                                  ; fully-qualified     # 🪳 E13.0 cockroach
+1F577 FE0F                                             ; fully-qualified     # 🕷️ E0.7 spider
+1F577                                                  ; unqualified         # 🕷 E0.7 spider
+1F578 FE0F                                             ; fully-qualified     # 🕸️ E0.7 spider web
+1F578                                                  ; unqualified         # 🕸 E0.7 spider web
+1F982                                                  ; fully-qualified     # 🦂 E1.0 scorpion
+1F99F                                                  ; fully-qualified     # 🦟 E11.0 mosquito
+1FAB0                                                  ; fully-qualified     # 🪰 E13.0 fly
+1FAB1                                                  ; fully-qualified     # 🪱 E13.0 worm
+1F9A0                                                  ; fully-qualified     # 🦠 E11.0 microbe
+
+# subgroup: plant-flower
+1F490                                                  ; fully-qualified     # 💐 E0.6 bouquet
+1F338                                                  ; fully-qualified     # 🌸 E0.6 cherry blossom
+1F4AE                                                  ; fully-qualified     # 💮 E0.6 white flower
+1FAB7                                                  ; fully-qualified     # 🪷 E14.0 lotus
+1F3F5 FE0F                                             ; fully-qualified     # 🏵️ E0.7 rosette
+1F3F5                                                  ; unqualified         # 🏵 E0.7 rosette
+1F339                                                  ; fully-qualified     # 🌹 E0.6 rose
+1F940                                                  ; fully-qualified     # 🥀 E3.0 wilted flower
+1F33A                                                  ; fully-qualified     # 🌺 E0.6 hibiscus
+1F33B                                                  ; fully-qualified     # 🌻 E0.6 sunflower
+1F33C                                                  ; fully-qualified     # 🌼 E0.6 blossom
+1F337                                                  ; fully-qualified     # 🌷 E0.6 tulip
+1FABB                                                  ; fully-qualified     # 🪻 E15.0 hyacinth
+
+# subgroup: plant-other
+1F331                                                  ; fully-qualified     # 🌱 E0.6 seedling
+1FAB4                                                  ; fully-qualified     # 🪴 E13.0 potted plant
+1F332                                                  ; fully-qualified     # 🌲 E1.0 evergreen tree
+1F333                                                  ; fully-qualified     # 🌳 E1.0 deciduous tree
+1F334                                                  ; fully-qualified     # 🌴 E0.6 palm tree
+1F335                                                  ; fully-qualified     # 🌵 E0.6 cactus
+1F33E                                                  ; fully-qualified     # 🌾 E0.6 sheaf of rice
+1F33F                                                  ; fully-qualified     # 🌿 E0.6 herb
+2618 FE0F                                              ; fully-qualified     # ☘️ E1.0 shamrock
+2618                                                   ; unqualified         # ☘ E1.0 shamrock
+1F340                                                  ; fully-qualified     # 🍀 E0.6 four leaf clover
+1F341                                                  ; fully-qualified     # 🍁 E0.6 maple leaf
+1F342                                                  ; fully-qualified     # 🍂 E0.6 fallen leaf
+1F343                                                  ; fully-qualified     # 🍃 E0.6 leaf fluttering in wind
+1FAB9                                                  ; fully-qualified     # 🪹 E14.0 empty nest
+1FABA                                                  ; fully-qualified     # 🪺 E14.0 nest with eggs
+1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
+
+# Animals & Nature subtotal:		160
+# Animals & Nature subtotal:		160	w/o modifiers
+
+# group: Food & Drink
+
+# subgroup: food-fruit
+1F347                                                  ; fully-qualified     # 🍇 E0.6 grapes
+1F348                                                  ; fully-qualified     # 🍈 E0.6 melon
+1F349                                                  ; fully-qualified     # 🍉 E0.6 watermelon
+1F34A                                                  ; fully-qualified     # 🍊 E0.6 tangerine
+1F34B                                                  ; fully-qualified     # 🍋 E1.0 lemon
+1F34B 200D 1F7E9                                       ; fully-qualified     # 🍋‍🟩 E15.1 lime
+1F34C                                                  ; fully-qualified     # 🍌 E0.6 banana
+1F34D                                                  ; fully-qualified     # 🍍 E0.6 pineapple
+1F96D                                                  ; fully-qualified     # 🥭 E11.0 mango
+1F34E                                                  ; fully-qualified     # 🍎 E0.6 red apple
+1F34F                                                  ; fully-qualified     # 🍏 E0.6 green apple
+1F350                                                  ; fully-qualified     # 🍐 E1.0 pear
+1F351                                                  ; fully-qualified     # 🍑 E0.6 peach
+1F352                                                  ; fully-qualified     # 🍒 E0.6 cherries
+1F353                                                  ; fully-qualified     # 🍓 E0.6 strawberry
+1FAD0                                                  ; fully-qualified     # 🫐 E13.0 blueberries
+1F95D                                                  ; fully-qualified     # 🥝 E3.0 kiwi fruit
+1F345                                                  ; fully-qualified     # 🍅 E0.6 tomato
+1FAD2                                                  ; fully-qualified     # 🫒 E13.0 olive
+1F965                                                  ; fully-qualified     # 🥥 E5.0 coconut
+
+# subgroup: food-vegetable
+1F951                                                  ; fully-qualified     # 🥑 E3.0 avocado
+1F346                                                  ; fully-qualified     # 🍆 E0.6 eggplant
+1F954                                                  ; fully-qualified     # 🥔 E3.0 potato
+1F955                                                  ; fully-qualified     # 🥕 E3.0 carrot
+1F33D                                                  ; fully-qualified     # 🌽 E0.6 ear of corn
+1F336 FE0F                                             ; fully-qualified     # 🌶️ E0.7 hot pepper
+1F336                                                  ; unqualified         # 🌶 E0.7 hot pepper
+1FAD1                                                  ; fully-qualified     # 🫑 E13.0 bell pepper
+1F952                                                  ; fully-qualified     # 🥒 E3.0 cucumber
+1F96C                                                  ; fully-qualified     # 🥬 E11.0 leafy green
+1F966                                                  ; fully-qualified     # 🥦 E5.0 broccoli
+1F9C4                                                  ; fully-qualified     # 🧄 E12.0 garlic
+1F9C5                                                  ; fully-qualified     # 🧅 E12.0 onion
+1F95C                                                  ; fully-qualified     # 🥜 E3.0 peanuts
+1FAD8                                                  ; fully-qualified     # 🫘 E14.0 beans
+1F330                                                  ; fully-qualified     # 🌰 E0.6 chestnut
+1FADA                                                  ; fully-qualified     # 🫚 E15.0 ginger root
+1FADB                                                  ; fully-qualified     # 🫛 E15.0 pea pod
+1F344 200D 1F7EB                                       ; fully-qualified     # 🍄‍🟫 E15.1 brown mushroom
+
+# subgroup: food-prepared
+1F35E                                                  ; fully-qualified     # 🍞 E0.6 bread
+1F950                                                  ; fully-qualified     # 🥐 E3.0 croissant
+1F956                                                  ; fully-qualified     # 🥖 E3.0 baguette bread
+1FAD3                                                  ; fully-qualified     # 🫓 E13.0 flatbread
+1F968                                                  ; fully-qualified     # 🥨 E5.0 pretzel
+1F96F                                                  ; fully-qualified     # 🥯 E11.0 bagel
+1F95E                                                  ; fully-qualified     # 🥞 E3.0 pancakes
+1F9C7                                                  ; fully-qualified     # 🧇 E12.0 waffle
+1F9C0                                                  ; fully-qualified     # 🧀 E1.0 cheese wedge
+1F356                                                  ; fully-qualified     # 🍖 E0.6 meat on bone
+1F357                                                  ; fully-qualified     # 🍗 E0.6 poultry leg
+1F969                                                  ; fully-qualified     # 🥩 E5.0 cut of meat
+1F953                                                  ; fully-qualified     # 🥓 E3.0 bacon
+1F354                                                  ; fully-qualified     # 🍔 E0.6 hamburger
+1F35F                                                  ; fully-qualified     # 🍟 E0.6 french fries
+1F355                                                  ; fully-qualified     # 🍕 E0.6 pizza
+1F32D                                                  ; fully-qualified     # 🌭 E1.0 hot dog
+1F96A                                                  ; fully-qualified     # 🥪 E5.0 sandwich
+1F32E                                                  ; fully-qualified     # 🌮 E1.0 taco
+1F32F                                                  ; fully-qualified     # 🌯 E1.0 burrito
+1FAD4                                                  ; fully-qualified     # 🫔 E13.0 tamale
+1F959                                                  ; fully-qualified     # 🥙 E3.0 stuffed flatbread
+1F9C6                                                  ; fully-qualified     # 🧆 E12.0 falafel
+1F95A                                                  ; fully-qualified     # 🥚 E3.0 egg
+1F373                                                  ; fully-qualified     # 🍳 E0.6 cooking
+1F958                                                  ; fully-qualified     # 🥘 E3.0 shallow pan of food
+1F372                                                  ; fully-qualified     # 🍲 E0.6 pot of food
+1FAD5                                                  ; fully-qualified     # 🫕 E13.0 fondue
+1F963                                                  ; fully-qualified     # 🥣 E5.0 bowl with spoon
+1F957                                                  ; fully-qualified     # 🥗 E3.0 green salad
+1F37F                                                  ; fully-qualified     # 🍿 E1.0 popcorn
+1F9C8                                                  ; fully-qualified     # 🧈 E12.0 butter
+1F9C2                                                  ; fully-qualified     # 🧂 E11.0 salt
+1F96B                                                  ; fully-qualified     # 🥫 E5.0 canned food
+
+# subgroup: food-asian
+1F371                                                  ; fully-qualified     # 🍱 E0.6 bento box
+1F358                                                  ; fully-qualified     # 🍘 E0.6 rice cracker
+1F359                                                  ; fully-qualified     # 🍙 E0.6 rice ball
+1F35A                                                  ; fully-qualified     # 🍚 E0.6 cooked rice
+1F35B                                                  ; fully-qualified     # 🍛 E0.6 curry rice
+1F35C                                                  ; fully-qualified     # 🍜 E0.6 steaming bowl
+1F35D                                                  ; fully-qualified     # 🍝 E0.6 spaghetti
+1F360                                                  ; fully-qualified     # 🍠 E0.6 roasted sweet potato
+1F362                                                  ; fully-qualified     # 🍢 E0.6 oden
+1F363                                                  ; fully-qualified     # 🍣 E0.6 sushi
+1F364                                                  ; fully-qualified     # 🍤 E0.6 fried shrimp
+1F365                                                  ; fully-qualified     # 🍥 E0.6 fish cake with swirl
+1F96E                                                  ; fully-qualified     # 🥮 E11.0 moon cake
+1F361                                                  ; fully-qualified     # 🍡 E0.6 dango
+1F95F                                                  ; fully-qualified     # 🥟 E5.0 dumpling
+1F960                                                  ; fully-qualified     # 🥠 E5.0 fortune cookie
+1F961                                                  ; fully-qualified     # 🥡 E5.0 takeout box
+
+# subgroup: food-marine
+1F980                                                  ; fully-qualified     # 🦀 E1.0 crab
+1F99E                                                  ; fully-qualified     # 🦞 E11.0 lobster
+1F990                                                  ; fully-qualified     # 🦐 E3.0 shrimp
+1F991                                                  ; fully-qualified     # 🦑 E3.0 squid
+1F9AA                                                  ; fully-qualified     # 🦪 E12.0 oyster
+
+# subgroup: food-sweet
+1F366                                                  ; fully-qualified     # 🍦 E0.6 soft ice cream
+1F367                                                  ; fully-qualified     # 🍧 E0.6 shaved ice
+1F368                                                  ; fully-qualified     # 🍨 E0.6 ice cream
+1F369                                                  ; fully-qualified     # 🍩 E0.6 doughnut
+1F36A                                                  ; fully-qualified     # 🍪 E0.6 cookie
+1F382                                                  ; fully-qualified     # 🎂 E0.6 birthday cake
+1F370                                                  ; fully-qualified     # 🍰 E0.6 shortcake
+1F9C1                                                  ; fully-qualified     # 🧁 E11.0 cupcake
+1F967                                                  ; fully-qualified     # 🥧 E5.0 pie
+1F36B                                                  ; fully-qualified     # 🍫 E0.6 chocolate bar
+1F36C                                                  ; fully-qualified     # 🍬 E0.6 candy
+1F36D                                                  ; fully-qualified     # 🍭 E0.6 lollipop
+1F36E                                                  ; fully-qualified     # 🍮 E0.6 custard
+1F36F                                                  ; fully-qualified     # 🍯 E0.6 honey pot
+
+# subgroup: drink
+1F37C                                                  ; fully-qualified     # 🍼 E1.0 baby bottle
+1F95B                                                  ; fully-qualified     # 🥛 E3.0 glass of milk
+2615                                                   ; fully-qualified     # ☕ E0.6 hot beverage
+1FAD6                                                  ; fully-qualified     # 🫖 E13.0 teapot
+1F375                                                  ; fully-qualified     # 🍵 E0.6 teacup without handle
+1F376                                                  ; fully-qualified     # 🍶 E0.6 sake
+1F37E                                                  ; fully-qualified     # 🍾 E1.0 bottle with popping cork
+1F377                                                  ; fully-qualified     # 🍷 E0.6 wine glass
+1F378                                                  ; fully-qualified     # 🍸 E0.6 cocktail glass
+1F379                                                  ; fully-qualified     # 🍹 E0.6 tropical drink
+1F37A                                                  ; fully-qualified     # 🍺 E0.6 beer mug
+1F37B                                                  ; fully-qualified     # 🍻 E0.6 clinking beer mugs
+1F942                                                  ; fully-qualified     # 🥂 E3.0 clinking glasses
+1F943                                                  ; fully-qualified     # 🥃 E3.0 tumbler glass
+1FAD7                                                  ; fully-qualified     # 🫗 E14.0 pouring liquid
+1F964                                                  ; fully-qualified     # 🥤 E5.0 cup with straw
+1F9CB                                                  ; fully-qualified     # 🧋 E13.0 bubble tea
+1F9C3                                                  ; fully-qualified     # 🧃 E12.0 beverage box
+1F9C9                                                  ; fully-qualified     # 🧉 E12.0 mate
+1F9CA                                                  ; fully-qualified     # 🧊 E12.0 ice
+
+# subgroup: dishware
+1F962                                                  ; fully-qualified     # 🥢 E5.0 chopsticks
+1F37D FE0F                                             ; fully-qualified     # 🍽️ E0.7 fork and knife with plate
+1F37D                                                  ; unqualified         # 🍽 E0.7 fork and knife with plate
+1F374                                                  ; fully-qualified     # 🍴 E0.6 fork and knife
+1F944                                                  ; fully-qualified     # 🥄 E3.0 spoon
+1F52A                                                  ; fully-qualified     # 🔪 E0.6 kitchen knife
+1FAD9                                                  ; fully-qualified     # 🫙 E14.0 jar
+1F3FA                                                  ; fully-qualified     # 🏺 E1.0 amphora
+
+# Food & Drink subtotal:		137
+# Food & Drink subtotal:		137	w/o modifiers
+
+# group: Travel & Places
+
+# subgroup: place-map
+1F30D                                                  ; fully-qualified     # 🌍 E0.7 globe showing Europe-Africa
+1F30E                                                  ; fully-qualified     # 🌎 E0.7 globe showing Americas
+1F30F                                                  ; fully-qualified     # 🌏 E0.6 globe showing Asia-Australia
+1F310                                                  ; fully-qualified     # 🌐 E1.0 globe with meridians
+1F5FA FE0F                                             ; fully-qualified     # 🗺️ E0.7 world map
+1F5FA                                                  ; unqualified         # 🗺 E0.7 world map
+1F5FE                                                  ; fully-qualified     # 🗾 E0.6 map of Japan
+1F9ED                                                  ; fully-qualified     # 🧭 E11.0 compass
+
+# subgroup: place-geographic
+1F3D4 FE0F                                             ; fully-qualified     # 🏔️ E0.7 snow-capped mountain
+1F3D4                                                  ; unqualified         # 🏔 E0.7 snow-capped mountain
+26F0 FE0F                                              ; fully-qualified     # ⛰️ E0.7 mountain
+26F0                                                   ; unqualified         # ⛰ E0.7 mountain
+1F30B                                                  ; fully-qualified     # 🌋 E0.6 volcano
+1F5FB                                                  ; fully-qualified     # 🗻 E0.6 mount fuji
+1F3D5 FE0F                                             ; fully-qualified     # 🏕️ E0.7 camping
+1F3D5                                                  ; unqualified         # 🏕 E0.7 camping
+1F3D6 FE0F                                             ; fully-qualified     # 🏖️ E0.7 beach with umbrella
+1F3D6                                                  ; unqualified         # 🏖 E0.7 beach with umbrella
+1F3DC FE0F                                             ; fully-qualified     # 🏜️ E0.7 desert
+1F3DC                                                  ; unqualified         # 🏜 E0.7 desert
+1F3DD FE0F                                             ; fully-qualified     # 🏝️ E0.7 desert island
+1F3DD                                                  ; unqualified         # 🏝 E0.7 desert island
+1F3DE FE0F                                             ; fully-qualified     # 🏞️ E0.7 national park
+1F3DE                                                  ; unqualified         # 🏞 E0.7 national park
+
+# subgroup: place-building
+1F3DF FE0F                                             ; fully-qualified     # 🏟️ E0.7 stadium
+1F3DF                                                  ; unqualified         # 🏟 E0.7 stadium
+1F3DB FE0F                                             ; fully-qualified     # 🏛️ E0.7 classical building
+1F3DB                                                  ; unqualified         # 🏛 E0.7 classical building
+1F3D7 FE0F                                             ; fully-qualified     # 🏗️ E0.7 building construction
+1F3D7                                                  ; unqualified         # 🏗 E0.7 building construction
+1F9F1                                                  ; fully-qualified     # 🧱 E11.0 brick
+1FAA8                                                  ; fully-qualified     # 🪨 E13.0 rock
+1FAB5                                                  ; fully-qualified     # 🪵 E13.0 wood
+1F6D6                                                  ; fully-qualified     # 🛖 E13.0 hut
+1F3D8 FE0F                                             ; fully-qualified     # 🏘️ E0.7 houses
+1F3D8                                                  ; unqualified         # 🏘 E0.7 houses
+1F3DA FE0F                                             ; fully-qualified     # 🏚️ E0.7 derelict house
+1F3DA                                                  ; unqualified         # 🏚 E0.7 derelict house
+1F3E0                                                  ; fully-qualified     # 🏠 E0.6 house
+1F3E1                                                  ; fully-qualified     # 🏡 E0.6 house with garden
+1F3E2                                                  ; fully-qualified     # 🏢 E0.6 office building
+1F3E3                                                  ; fully-qualified     # 🏣 E0.6 Japanese post office
+1F3E4                                                  ; fully-qualified     # 🏤 E1.0 post office
+1F3E5                                                  ; fully-qualified     # 🏥 E0.6 hospital
+1F3E6                                                  ; fully-qualified     # 🏦 E0.6 bank
+1F3E8                                                  ; fully-qualified     # 🏨 E0.6 hotel
+1F3E9                                                  ; fully-qualified     # 🏩 E0.6 love hotel
+1F3EA                                                  ; fully-qualified     # 🏪 E0.6 convenience store
+1F3EB                                                  ; fully-qualified     # 🏫 E0.6 school
+1F3EC                                                  ; fully-qualified     # 🏬 E0.6 department store
+1F3ED                                                  ; fully-qualified     # 🏭 E0.6 factory
+1F3EF                                                  ; fully-qualified     # 🏯 E0.6 Japanese castle
+1F3F0                                                  ; fully-qualified     # 🏰 E0.6 castle
+1F492                                                  ; fully-qualified     # 💒 E0.6 wedding
+1F5FC                                                  ; fully-qualified     # 🗼 E0.6 Tokyo tower
+1F5FD                                                  ; fully-qualified     # 🗽 E0.6 Statue of Liberty
+
+# subgroup: place-religious
+26EA                                                   ; fully-qualified     # ⛪ E0.6 church
+1F54C                                                  ; fully-qualified     # 🕌 E1.0 mosque
+1F6D5                                                  ; fully-qualified     # 🛕 E12.0 hindu temple
+1F54D                                                  ; fully-qualified     # 🕍 E1.0 synagogue
+26E9 FE0F                                              ; fully-qualified     # ⛩️ E0.7 shinto shrine
+26E9                                                   ; unqualified         # ⛩ E0.7 shinto shrine
+1F54B                                                  ; fully-qualified     # 🕋 E1.0 kaaba
+
+# subgroup: place-other
+26F2                                                   ; fully-qualified     # ⛲ E0.6 fountain
+26FA                                                   ; fully-qualified     # ⛺ E0.6 tent
+1F301                                                  ; fully-qualified     # 🌁 E0.6 foggy
+1F303                                                  ; fully-qualified     # 🌃 E0.6 night with stars
+1F3D9 FE0F                                             ; fully-qualified     # 🏙️ E0.7 cityscape
+1F3D9                                                  ; unqualified         # 🏙 E0.7 cityscape
+1F304                                                  ; fully-qualified     # 🌄 E0.6 sunrise over mountains
+1F305                                                  ; fully-qualified     # 🌅 E0.6 sunrise
+1F306                                                  ; fully-qualified     # 🌆 E0.6 cityscape at dusk
+1F307                                                  ; fully-qualified     # 🌇 E0.6 sunset
+1F309                                                  ; fully-qualified     # 🌉 E0.6 bridge at night
+2668 FE0F                                              ; fully-qualified     # ♨️ E0.6 hot springs
+2668                                                   ; unqualified         # ♨ E0.6 hot springs
+1F3A0                                                  ; fully-qualified     # 🎠 E0.6 carousel horse
+1F6DD                                                  ; fully-qualified     # 🛝 E14.0 playground slide
+1F3A1                                                  ; fully-qualified     # 🎡 E0.6 ferris wheel
+1F3A2                                                  ; fully-qualified     # 🎢 E0.6 roller coaster
+1F488                                                  ; fully-qualified     # 💈 E0.6 barber pole
+1F3AA                                                  ; fully-qualified     # 🎪 E0.6 circus tent
+
+# subgroup: transport-ground
+1F682                                                  ; fully-qualified     # 🚂 E1.0 locomotive
+1F683                                                  ; fully-qualified     # 🚃 E0.6 railway car
+1F684                                                  ; fully-qualified     # 🚄 E0.6 high-speed train
+1F685                                                  ; fully-qualified     # 🚅 E0.6 bullet train
+1F686                                                  ; fully-qualified     # 🚆 E1.0 train
+1F687                                                  ; fully-qualified     # 🚇 E0.6 metro
+1F688                                                  ; fully-qualified     # 🚈 E1.0 light rail
+1F689                                                  ; fully-qualified     # 🚉 E0.6 station
+1F68A                                                  ; fully-qualified     # 🚊 E1.0 tram
+1F69D                                                  ; fully-qualified     # 🚝 E1.0 monorail
+1F69E                                                  ; fully-qualified     # 🚞 E1.0 mountain railway
+1F68B                                                  ; fully-qualified     # 🚋 E1.0 tram car
+1F68C                                                  ; fully-qualified     # 🚌 E0.6 bus
+1F68D                                                  ; fully-qualified     # 🚍 E0.7 oncoming bus
+1F68E                                                  ; fully-qualified     # 🚎 E1.0 trolleybus
+1F690                                                  ; fully-qualified     # 🚐 E1.0 minibus
+1F691                                                  ; fully-qualified     # 🚑 E0.6 ambulance
+1F692                                                  ; fully-qualified     # 🚒 E0.6 fire engine
+1F693                                                  ; fully-qualified     # 🚓 E0.6 police car
+1F694                                                  ; fully-qualified     # 🚔 E0.7 oncoming police car
+1F695                                                  ; fully-qualified     # 🚕 E0.6 taxi
+1F696                                                  ; fully-qualified     # 🚖 E1.0 oncoming taxi
+1F697                                                  ; fully-qualified     # 🚗 E0.6 automobile
+1F698                                                  ; fully-qualified     # 🚘 E0.7 oncoming automobile
+1F699                                                  ; fully-qualified     # 🚙 E0.6 sport utility vehicle
+1F6FB                                                  ; fully-qualified     # 🛻 E13.0 pickup truck
+1F69A                                                  ; fully-qualified     # 🚚 E0.6 delivery truck
+1F69B                                                  ; fully-qualified     # 🚛 E1.0 articulated lorry
+1F69C                                                  ; fully-qualified     # 🚜 E1.0 tractor
+1F3CE FE0F                                             ; fully-qualified     # 🏎️ E0.7 racing car
+1F3CE                                                  ; unqualified         # 🏎 E0.7 racing car
+1F3CD FE0F                                             ; fully-qualified     # 🏍️ E0.7 motorcycle
+1F3CD                                                  ; unqualified         # 🏍 E0.7 motorcycle
+1F6F5                                                  ; fully-qualified     # 🛵 E3.0 motor scooter
+1F9BD                                                  ; fully-qualified     # 🦽 E12.0 manual wheelchair
+1F9BC                                                  ; fully-qualified     # 🦼 E12.0 motorized wheelchair
+1F6FA                                                  ; fully-qualified     # 🛺 E12.0 auto rickshaw
+1F6B2                                                  ; fully-qualified     # 🚲 E0.6 bicycle
+1F6F4                                                  ; fully-qualified     # 🛴 E3.0 kick scooter
+1F6F9                                                  ; fully-qualified     # 🛹 E11.0 skateboard
+1F6FC                                                  ; fully-qualified     # 🛼 E13.0 roller skate
+1F68F                                                  ; fully-qualified     # 🚏 E0.6 bus stop
+1F6E3 FE0F                                             ; fully-qualified     # 🛣️ E0.7 motorway
+1F6E3                                                  ; unqualified         # 🛣 E0.7 motorway
+1F6E4 FE0F                                             ; fully-qualified     # 🛤️ E0.7 railway track
+1F6E4                                                  ; unqualified         # 🛤 E0.7 railway track
+1F6E2 FE0F                                             ; fully-qualified     # 🛢️ E0.7 oil drum
+1F6E2                                                  ; unqualified         # 🛢 E0.7 oil drum
+26FD                                                   ; fully-qualified     # ⛽ E0.6 fuel pump
+1F6DE                                                  ; fully-qualified     # 🛞 E14.0 wheel
+1F6A8                                                  ; fully-qualified     # 🚨 E0.6 police car light
+1F6A5                                                  ; fully-qualified     # 🚥 E0.6 horizontal traffic light
+1F6A6                                                  ; fully-qualified     # 🚦 E1.0 vertical traffic light
+1F6D1                                                  ; fully-qualified     # 🛑 E3.0 stop sign
+1F6A7                                                  ; fully-qualified     # 🚧 E0.6 construction
+
+# subgroup: transport-water
+2693                                                   ; fully-qualified     # ⚓ E0.6 anchor
+1F6DF                                                  ; fully-qualified     # 🛟 E14.0 ring buoy
+26F5                                                   ; fully-qualified     # ⛵ E0.6 sailboat
+1F6F6                                                  ; fully-qualified     # 🛶 E3.0 canoe
+1F6A4                                                  ; fully-qualified     # 🚤 E0.6 speedboat
+1F6F3 FE0F                                             ; fully-qualified     # 🛳️ E0.7 passenger ship
+1F6F3                                                  ; unqualified         # 🛳 E0.7 passenger ship
+26F4 FE0F                                              ; fully-qualified     # ⛴️ E0.7 ferry
+26F4                                                   ; unqualified         # ⛴ E0.7 ferry
+1F6E5 FE0F                                             ; fully-qualified     # 🛥️ E0.7 motor boat
+1F6E5                                                  ; unqualified         # 🛥 E0.7 motor boat
+1F6A2                                                  ; fully-qualified     # 🚢 E0.6 ship
+
+# subgroup: transport-air
+2708 FE0F                                              ; fully-qualified     # ✈️ E0.6 airplane
+2708                                                   ; unqualified         # ✈ E0.6 airplane
+1F6E9 FE0F                                             ; fully-qualified     # 🛩️ E0.7 small airplane
+1F6E9                                                  ; unqualified         # 🛩 E0.7 small airplane
+1F6EB                                                  ; fully-qualified     # 🛫 E1.0 airplane departure
+1F6EC                                                  ; fully-qualified     # 🛬 E1.0 airplane arrival
+1FA82                                                  ; fully-qualified     # 🪂 E12.0 parachute
+1F4BA                                                  ; fully-qualified     # 💺 E0.6 seat
+1F681                                                  ; fully-qualified     # 🚁 E1.0 helicopter
+1F69F                                                  ; fully-qualified     # 🚟 E1.0 suspension railway
+1F6A0                                                  ; fully-qualified     # 🚠 E1.0 mountain cableway
+1F6A1                                                  ; fully-qualified     # 🚡 E1.0 aerial tramway
+1F6F0 FE0F                                             ; fully-qualified     # 🛰️ E0.7 satellite
+1F6F0                                                  ; unqualified         # 🛰 E0.7 satellite
+1F680                                                  ; fully-qualified     # 🚀 E0.6 rocket
+1F6F8                                                  ; fully-qualified     # 🛸 E5.0 flying saucer
+
+# subgroup: hotel
+1F6CE FE0F                                             ; fully-qualified     # 🛎️ E0.7 bellhop bell
+1F6CE                                                  ; unqualified         # 🛎 E0.7 bellhop bell
+1F9F3                                                  ; fully-qualified     # 🧳 E11.0 luggage
+
+# subgroup: time
+231B                                                   ; fully-qualified     # ⌛ E0.6 hourglass done
+23F3                                                   ; fully-qualified     # ⏳ E0.6 hourglass not done
+231A                                                   ; fully-qualified     # ⌚ E0.6 watch
+23F0                                                   ; fully-qualified     # ⏰ E0.6 alarm clock
+23F1 FE0F                                              ; fully-qualified     # ⏱️ E1.0 stopwatch
+23F1                                                   ; unqualified         # ⏱ E1.0 stopwatch
+23F2 FE0F                                              ; fully-qualified     # ⏲️ E1.0 timer clock
+23F2                                                   ; unqualified         # ⏲ E1.0 timer clock
+1F570 FE0F                                             ; fully-qualified     # 🕰️ E0.7 mantelpiece clock
+1F570                                                  ; unqualified         # 🕰 E0.7 mantelpiece clock
+1F55B                                                  ; fully-qualified     # 🕛 E0.6 twelve o’clock
+1F567                                                  ; fully-qualified     # 🕧 E0.7 twelve-thirty
+1F550                                                  ; fully-qualified     # 🕐 E0.6 one o’clock
+1F55C                                                  ; fully-qualified     # 🕜 E0.7 one-thirty
+1F551                                                  ; fully-qualified     # 🕑 E0.6 two o’clock
+1F55D                                                  ; fully-qualified     # 🕝 E0.7 two-thirty
+1F552                                                  ; fully-qualified     # 🕒 E0.6 three o’clock
+1F55E                                                  ; fully-qualified     # 🕞 E0.7 three-thirty
+1F553                                                  ; fully-qualified     # 🕓 E0.6 four o’clock
+1F55F                                                  ; fully-qualified     # 🕟 E0.7 four-thirty
+1F554                                                  ; fully-qualified     # 🕔 E0.6 five o’clock
+1F560                                                  ; fully-qualified     # 🕠 E0.7 five-thirty
+1F555                                                  ; fully-qualified     # 🕕 E0.6 six o’clock
+1F561                                                  ; fully-qualified     # 🕡 E0.7 six-thirty
+1F556                                                  ; fully-qualified     # 🕖 E0.6 seven o’clock
+1F562                                                  ; fully-qualified     # 🕢 E0.7 seven-thirty
+1F557                                                  ; fully-qualified     # 🕗 E0.6 eight o’clock
+1F563                                                  ; fully-qualified     # 🕣 E0.7 eight-thirty
+1F558                                                  ; fully-qualified     # 🕘 E0.6 nine o’clock
+1F564                                                  ; fully-qualified     # 🕤 E0.7 nine-thirty
+1F559                                                  ; fully-qualified     # 🕙 E0.6 ten o’clock
+1F565                                                  ; fully-qualified     # 🕥 E0.7 ten-thirty
+1F55A                                                  ; fully-qualified     # 🕚 E0.6 eleven o’clock
+1F566                                                  ; fully-qualified     # 🕦 E0.7 eleven-thirty
+
+# subgroup: sky & weather
+1F311                                                  ; fully-qualified     # 🌑 E0.6 new moon
+1F312                                                  ; fully-qualified     # 🌒 E1.0 waxing crescent moon
+1F313                                                  ; fully-qualified     # 🌓 E0.6 first quarter moon
+1F314                                                  ; fully-qualified     # 🌔 E0.6 waxing gibbous moon
+1F315                                                  ; fully-qualified     # 🌕 E0.6 full moon
+1F316                                                  ; fully-qualified     # 🌖 E1.0 waning gibbous moon
+1F317                                                  ; fully-qualified     # 🌗 E1.0 last quarter moon
+1F318                                                  ; fully-qualified     # 🌘 E1.0 waning crescent moon
+1F319                                                  ; fully-qualified     # 🌙 E0.6 crescent moon
+1F31A                                                  ; fully-qualified     # 🌚 E1.0 new moon face
+1F31B                                                  ; fully-qualified     # 🌛 E0.6 first quarter moon face
+1F31C                                                  ; fully-qualified     # 🌜 E0.7 last quarter moon face
+1F321 FE0F                                             ; fully-qualified     # 🌡️ E0.7 thermometer
+1F321                                                  ; unqualified         # 🌡 E0.7 thermometer
+2600 FE0F                                              ; fully-qualified     # ☀️ E0.6 sun
+2600                                                   ; unqualified         # ☀ E0.6 sun
+1F31D                                                  ; fully-qualified     # 🌝 E1.0 full moon face
+1F31E                                                  ; fully-qualified     # 🌞 E1.0 sun with face
+1FA90                                                  ; fully-qualified     # 🪐 E12.0 ringed planet
+2B50                                                   ; fully-qualified     # ⭐ E0.6 star
+1F31F                                                  ; fully-qualified     # 🌟 E0.6 glowing star
+1F320                                                  ; fully-qualified     # 🌠 E0.6 shooting star
+1F30C                                                  ; fully-qualified     # 🌌 E0.6 milky way
+2601 FE0F                                              ; fully-qualified     # ☁️ E0.6 cloud
+2601                                                   ; unqualified         # ☁ E0.6 cloud
+26C5                                                   ; fully-qualified     # ⛅ E0.6 sun behind cloud
+26C8 FE0F                                              ; fully-qualified     # ⛈️ E0.7 cloud with lightning and rain
+26C8                                                   ; unqualified         # ⛈ E0.7 cloud with lightning and rain
+1F324 FE0F                                             ; fully-qualified     # 🌤️ E0.7 sun behind small cloud
+1F324                                                  ; unqualified         # 🌤 E0.7 sun behind small cloud
+1F325 FE0F                                             ; fully-qualified     # 🌥️ E0.7 sun behind large cloud
+1F325                                                  ; unqualified         # 🌥 E0.7 sun behind large cloud
+1F326 FE0F                                             ; fully-qualified     # 🌦️ E0.7 sun behind rain cloud
+1F326                                                  ; unqualified         # 🌦 E0.7 sun behind rain cloud
+1F327 FE0F                                             ; fully-qualified     # 🌧️ E0.7 cloud with rain
+1F327                                                  ; unqualified         # 🌧 E0.7 cloud with rain
+1F328 FE0F                                             ; fully-qualified     # 🌨️ E0.7 cloud with snow
+1F328                                                  ; unqualified         # 🌨 E0.7 cloud with snow
+1F329 FE0F                                             ; fully-qualified     # 🌩️ E0.7 cloud with lightning
+1F329                                                  ; unqualified         # 🌩 E0.7 cloud with lightning
+1F32A FE0F                                             ; fully-qualified     # 🌪️ E0.7 tornado
+1F32A                                                  ; unqualified         # 🌪 E0.7 tornado
+1F32B FE0F                                             ; fully-qualified     # 🌫️ E0.7 fog
+1F32B                                                  ; unqualified         # 🌫 E0.7 fog
+1F32C FE0F                                             ; fully-qualified     # 🌬️ E0.7 wind face
+1F32C                                                  ; unqualified         # 🌬 E0.7 wind face
+1F300                                                  ; fully-qualified     # 🌀 E0.6 cyclone
+1F308                                                  ; fully-qualified     # 🌈 E0.6 rainbow
+1F302                                                  ; fully-qualified     # 🌂 E0.6 closed umbrella
+2602 FE0F                                              ; fully-qualified     # ☂️ E0.7 umbrella
+2602                                                   ; unqualified         # ☂ E0.7 umbrella
+2614                                                   ; fully-qualified     # ☔ E0.6 umbrella with rain drops
+26F1 FE0F                                              ; fully-qualified     # ⛱️ E0.7 umbrella on ground
+26F1                                                   ; unqualified         # ⛱ E0.7 umbrella on ground
+26A1                                                   ; fully-qualified     # ⚡ E0.6 high voltage
+2744 FE0F                                              ; fully-qualified     # ❄️ E0.6 snowflake
+2744                                                   ; unqualified         # ❄ E0.6 snowflake
+2603 FE0F                                              ; fully-qualified     # ☃️ E0.7 snowman
+2603                                                   ; unqualified         # ☃ E0.7 snowman
+26C4                                                   ; fully-qualified     # ⛄ E0.6 snowman without snow
+2604 FE0F                                              ; fully-qualified     # ☄️ E1.0 comet
+2604                                                   ; unqualified         # ☄ E1.0 comet
+1F525                                                  ; fully-qualified     # 🔥 E0.6 fire
+1F4A7                                                  ; fully-qualified     # 💧 E0.6 droplet
+1F30A                                                  ; fully-qualified     # 🌊 E0.6 water wave
+
+# Travel & Places subtotal:		267
+# Travel & Places subtotal:		267	w/o modifiers
+
+# group: Activities
+
+# subgroup: event
+1F383                                                  ; fully-qualified     # 🎃 E0.6 jack-o-lantern
+1F384                                                  ; fully-qualified     # 🎄 E0.6 Christmas tree
+1F386                                                  ; fully-qualified     # 🎆 E0.6 fireworks
+1F387                                                  ; fully-qualified     # 🎇 E0.6 sparkler
+1F9E8                                                  ; fully-qualified     # 🧨 E11.0 firecracker
+2728                                                   ; fully-qualified     # ✨ E0.6 sparkles
+1F388                                                  ; fully-qualified     # 🎈 E0.6 balloon
+1F389                                                  ; fully-qualified     # 🎉 E0.6 party popper
+1F38A                                                  ; fully-qualified     # 🎊 E0.6 confetti ball
+1F38B                                                  ; fully-qualified     # 🎋 E0.6 tanabata tree
+1F38D                                                  ; fully-qualified     # 🎍 E0.6 pine decoration
+1F38E                                                  ; fully-qualified     # 🎎 E0.6 Japanese dolls
+1F38F                                                  ; fully-qualified     # 🎏 E0.6 carp streamer
+1F390                                                  ; fully-qualified     # 🎐 E0.6 wind chime
+1F391                                                  ; fully-qualified     # 🎑 E0.6 moon viewing ceremony
+1F9E7                                                  ; fully-qualified     # 🧧 E11.0 red envelope
+1F380                                                  ; fully-qualified     # 🎀 E0.6 ribbon
+1F381                                                  ; fully-qualified     # 🎁 E0.6 wrapped gift
+1F397 FE0F                                             ; fully-qualified     # 🎗️ E0.7 reminder ribbon
+1F397                                                  ; unqualified         # 🎗 E0.7 reminder ribbon
+1F39F FE0F                                             ; fully-qualified     # 🎟️ E0.7 admission tickets
+1F39F                                                  ; unqualified         # 🎟 E0.7 admission tickets
+1F3AB                                                  ; fully-qualified     # 🎫 E0.6 ticket
+
+# subgroup: award-medal
+1F396 FE0F                                             ; fully-qualified     # 🎖️ E0.7 military medal
+1F396                                                  ; unqualified         # 🎖 E0.7 military medal
+1F3C6                                                  ; fully-qualified     # 🏆 E0.6 trophy
+1F3C5                                                  ; fully-qualified     # 🏅 E1.0 sports medal
+1F947                                                  ; fully-qualified     # 🥇 E3.0 1st place medal
+1F948                                                  ; fully-qualified     # 🥈 E3.0 2nd place medal
+1F949                                                  ; fully-qualified     # 🥉 E3.0 3rd place medal
+
+# subgroup: sport
+26BD                                                   ; fully-qualified     # ⚽ E0.6 soccer ball
+26BE                                                   ; fully-qualified     # ⚾ E0.6 baseball
+1F94E                                                  ; fully-qualified     # 🥎 E11.0 softball
+1F3C0                                                  ; fully-qualified     # 🏀 E0.6 basketball
+1F3D0                                                  ; fully-qualified     # 🏐 E1.0 volleyball
+1F3C8                                                  ; fully-qualified     # 🏈 E0.6 american football
+1F3C9                                                  ; fully-qualified     # 🏉 E1.0 rugby football
+1F3BE                                                  ; fully-qualified     # 🎾 E0.6 tennis
+1F94F                                                  ; fully-qualified     # 🥏 E11.0 flying disc
+1F3B3                                                  ; fully-qualified     # 🎳 E0.6 bowling
+1F3CF                                                  ; fully-qualified     # 🏏 E1.0 cricket game
+1F3D1                                                  ; fully-qualified     # 🏑 E1.0 field hockey
+1F3D2                                                  ; fully-qualified     # 🏒 E1.0 ice hockey
+1F94D                                                  ; fully-qualified     # 🥍 E11.0 lacrosse
+1F3D3                                                  ; fully-qualified     # 🏓 E1.0 ping pong
+1F3F8                                                  ; fully-qualified     # 🏸 E1.0 badminton
+1F94A                                                  ; fully-qualified     # 🥊 E3.0 boxing glove
+1F94B                                                  ; fully-qualified     # 🥋 E3.0 martial arts uniform
+1F945                                                  ; fully-qualified     # 🥅 E3.0 goal net
+26F3                                                   ; fully-qualified     # ⛳ E0.6 flag in hole
+26F8 FE0F                                              ; fully-qualified     # ⛸️ E0.7 ice skate
+26F8                                                   ; unqualified         # ⛸ E0.7 ice skate
+1F3A3                                                  ; fully-qualified     # 🎣 E0.6 fishing pole
+1F93F                                                  ; fully-qualified     # 🤿 E12.0 diving mask
+1F3BD                                                  ; fully-qualified     # 🎽 E0.6 running shirt
+1F3BF                                                  ; fully-qualified     # 🎿 E0.6 skis
+1F6F7                                                  ; fully-qualified     # 🛷 E5.0 sled
+1F94C                                                  ; fully-qualified     # 🥌 E5.0 curling stone
+
+# subgroup: game
+1F3AF                                                  ; fully-qualified     # 🎯 E0.6 bullseye
+1FA80                                                  ; fully-qualified     # 🪀 E12.0 yo-yo
+1FA81                                                  ; fully-qualified     # 🪁 E12.0 kite
+1F52B                                                  ; fully-qualified     # 🔫 E0.6 water pistol
+1F3B1                                                  ; fully-qualified     # 🎱 E0.6 pool 8 ball
+1F52E                                                  ; fully-qualified     # 🔮 E0.6 crystal ball
+1FA84                                                  ; fully-qualified     # 🪄 E13.0 magic wand
+1F3AE                                                  ; fully-qualified     # 🎮 E0.6 video game
+1F579 FE0F                                             ; fully-qualified     # 🕹️ E0.7 joystick
+1F579                                                  ; unqualified         # 🕹 E0.7 joystick
+1F3B0                                                  ; fully-qualified     # 🎰 E0.6 slot machine
+1F3B2                                                  ; fully-qualified     # 🎲 E0.6 game die
+1F9E9                                                  ; fully-qualified     # 🧩 E11.0 puzzle piece
+1F9F8                                                  ; fully-qualified     # 🧸 E11.0 teddy bear
+1FA85                                                  ; fully-qualified     # 🪅 E13.0 piñata
+1FAA9                                                  ; fully-qualified     # 🪩 E14.0 mirror ball
+1FA86                                                  ; fully-qualified     # 🪆 E13.0 nesting dolls
+2660 FE0F                                              ; fully-qualified     # ♠️ E0.6 spade suit
+2660                                                   ; unqualified         # ♠ E0.6 spade suit
+2665 FE0F                                              ; fully-qualified     # ♥️ E0.6 heart suit
+2665                                                   ; unqualified         # ♥ E0.6 heart suit
+2666 FE0F                                              ; fully-qualified     # ♦️ E0.6 diamond suit
+2666                                                   ; unqualified         # ♦ E0.6 diamond suit
+2663 FE0F                                              ; fully-qualified     # ♣️ E0.6 club suit
+2663                                                   ; unqualified         # ♣ E0.6 club suit
+265F FE0F                                              ; fully-qualified     # ♟️ E11.0 chess pawn
+265F                                                   ; unqualified         # ♟ E11.0 chess pawn
+1F0CF                                                  ; fully-qualified     # 🃏 E0.6 joker
+1F004                                                  ; fully-qualified     # 🀄 E0.6 mahjong red dragon
+1F3B4                                                  ; fully-qualified     # 🎴 E0.6 flower playing cards
+
+# subgroup: arts & crafts
+1F3AD                                                  ; fully-qualified     # 🎭 E0.6 performing arts
+1F5BC FE0F                                             ; fully-qualified     # 🖼️ E0.7 framed picture
+1F5BC                                                  ; unqualified         # 🖼 E0.7 framed picture
+1F3A8                                                  ; fully-qualified     # 🎨 E0.6 artist palette
+1F9F5                                                  ; fully-qualified     # 🧵 E11.0 thread
+1FAA1                                                  ; fully-qualified     # 🪡 E13.0 sewing needle
+1F9F6                                                  ; fully-qualified     # 🧶 E11.0 yarn
+1FAA2                                                  ; fully-qualified     # 🪢 E13.0 knot
+
+# Activities subtotal:		96
+# Activities subtotal:		96	w/o modifiers
+
+# group: Objects
+
+# subgroup: clothing
+1F453                                                  ; fully-qualified     # 👓 E0.6 glasses
+1F576 FE0F                                             ; fully-qualified     # 🕶️ E0.7 sunglasses
+1F576                                                  ; unqualified         # 🕶 E0.7 sunglasses
+1F97D                                                  ; fully-qualified     # 🥽 E11.0 goggles
+1F97C                                                  ; fully-qualified     # 🥼 E11.0 lab coat
+1F9BA                                                  ; fully-qualified     # 🦺 E12.0 safety vest
+1F454                                                  ; fully-qualified     # 👔 E0.6 necktie
+1F455                                                  ; fully-qualified     # 👕 E0.6 t-shirt
+1F456                                                  ; fully-qualified     # 👖 E0.6 jeans
+1F9E3                                                  ; fully-qualified     # 🧣 E5.0 scarf
+1F9E4                                                  ; fully-qualified     # 🧤 E5.0 gloves
+1F9E5                                                  ; fully-qualified     # 🧥 E5.0 coat
+1F9E6                                                  ; fully-qualified     # 🧦 E5.0 socks
+1F457                                                  ; fully-qualified     # 👗 E0.6 dress
+1F458                                                  ; fully-qualified     # 👘 E0.6 kimono
+1F97B                                                  ; fully-qualified     # 🥻 E12.0 sari
+1FA71                                                  ; fully-qualified     # 🩱 E12.0 one-piece swimsuit
+1FA72                                                  ; fully-qualified     # 🩲 E12.0 briefs
+1FA73                                                  ; fully-qualified     # 🩳 E12.0 shorts
+1F459                                                  ; fully-qualified     # 👙 E0.6 bikini
+1F45A                                                  ; fully-qualified     # 👚 E0.6 woman’s clothes
+1FAAD                                                  ; fully-qualified     # 🪭 E15.0 folding hand fan
+1F45B                                                  ; fully-qualified     # 👛 E0.6 purse
+1F45C                                                  ; fully-qualified     # 👜 E0.6 handbag
+1F45D                                                  ; fully-qualified     # 👝 E0.6 clutch bag
+1F6CD FE0F                                             ; fully-qualified     # 🛍️ E0.7 shopping bags
+1F6CD                                                  ; unqualified         # 🛍 E0.7 shopping bags
+1F392                                                  ; fully-qualified     # 🎒 E0.6 backpack
+1FA74                                                  ; fully-qualified     # 🩴 E13.0 thong sandal
+1F45E                                                  ; fully-qualified     # 👞 E0.6 man’s shoe
+1F45F                                                  ; fully-qualified     # 👟 E0.6 running shoe
+1F97E                                                  ; fully-qualified     # 🥾 E11.0 hiking boot
+1F97F                                                  ; fully-qualified     # 🥿 E11.0 flat shoe
+1F460                                                  ; fully-qualified     # 👠 E0.6 high-heeled shoe
+1F461                                                  ; fully-qualified     # 👡 E0.6 woman’s sandal
+1FA70                                                  ; fully-qualified     # 🩰 E12.0 ballet shoes
+1F462                                                  ; fully-qualified     # 👢 E0.6 woman’s boot
+1FAAE                                                  ; fully-qualified     # 🪮 E15.0 hair pick
+1F451                                                  ; fully-qualified     # 👑 E0.6 crown
+1F452                                                  ; fully-qualified     # 👒 E0.6 woman’s hat
+1F3A9                                                  ; fully-qualified     # 🎩 E0.6 top hat
+1F393                                                  ; fully-qualified     # 🎓 E0.6 graduation cap
+1F9E2                                                  ; fully-qualified     # 🧢 E5.0 billed cap
+1FA96                                                  ; fully-qualified     # 🪖 E13.0 military helmet
+26D1 FE0F                                              ; fully-qualified     # ⛑️ E0.7 rescue worker’s helmet
+26D1                                                   ; unqualified         # ⛑ E0.7 rescue worker’s helmet
+1F4FF                                                  ; fully-qualified     # 📿 E1.0 prayer beads
+1F484                                                  ; fully-qualified     # 💄 E0.6 lipstick
+1F48D                                                  ; fully-qualified     # 💍 E0.6 ring
+1F48E                                                  ; fully-qualified     # 💎 E0.6 gem stone
+
+# subgroup: sound
+1F507                                                  ; fully-qualified     # 🔇 E1.0 muted speaker
+1F508                                                  ; fully-qualified     # 🔈 E0.7 speaker low volume
+1F509                                                  ; fully-qualified     # 🔉 E1.0 speaker medium volume
+1F50A                                                  ; fully-qualified     # 🔊 E0.6 speaker high volume
+1F4E2                                                  ; fully-qualified     # 📢 E0.6 loudspeaker
+1F4E3                                                  ; fully-qualified     # 📣 E0.6 megaphone
+1F4EF                                                  ; fully-qualified     # 📯 E1.0 postal horn
+1F514                                                  ; fully-qualified     # 🔔 E0.6 bell
+1F515                                                  ; fully-qualified     # 🔕 E1.0 bell with slash
+
+# subgroup: music
+1F3BC                                                  ; fully-qualified     # 🎼 E0.6 musical score
+1F3B5                                                  ; fully-qualified     # 🎵 E0.6 musical note
+1F3B6                                                  ; fully-qualified     # 🎶 E0.6 musical notes
+1F399 FE0F                                             ; fully-qualified     # 🎙️ E0.7 studio microphone
+1F399                                                  ; unqualified         # 🎙 E0.7 studio microphone
+1F39A FE0F                                             ; fully-qualified     # 🎚️ E0.7 level slider
+1F39A                                                  ; unqualified         # 🎚 E0.7 level slider
+1F39B FE0F                                             ; fully-qualified     # 🎛️ E0.7 control knobs
+1F39B                                                  ; unqualified         # 🎛 E0.7 control knobs
+1F3A4                                                  ; fully-qualified     # 🎤 E0.6 microphone
+1F3A7                                                  ; fully-qualified     # 🎧 E0.6 headphone
+1F4FB                                                  ; fully-qualified     # 📻 E0.6 radio
+
+# subgroup: musical-instrument
+1F3B7                                                  ; fully-qualified     # 🎷 E0.6 saxophone
+1FA97                                                  ; fully-qualified     # 🪗 E13.0 accordion
+1F3B8                                                  ; fully-qualified     # 🎸 E0.6 guitar
+1F3B9                                                  ; fully-qualified     # 🎹 E0.6 musical keyboard
+1F3BA                                                  ; fully-qualified     # 🎺 E0.6 trumpet
+1F3BB                                                  ; fully-qualified     # 🎻 E0.6 violin
+1FA95                                                  ; fully-qualified     # 🪕 E12.0 banjo
+1F941                                                  ; fully-qualified     # 🥁 E3.0 drum
+1FA98                                                  ; fully-qualified     # 🪘 E13.0 long drum
+1FA87                                                  ; fully-qualified     # 🪇 E15.0 maracas
+1FA88                                                  ; fully-qualified     # 🪈 E15.0 flute
+
+# subgroup: phone
+1F4F1                                                  ; fully-qualified     # 📱 E0.6 mobile phone
+1F4F2                                                  ; fully-qualified     # 📲 E0.6 mobile phone with arrow
+260E FE0F                                              ; fully-qualified     # ☎️ E0.6 telephone
+260E                                                   ; unqualified         # ☎ E0.6 telephone
+1F4DE                                                  ; fully-qualified     # 📞 E0.6 telephone receiver
+1F4DF                                                  ; fully-qualified     # 📟 E0.6 pager
+1F4E0                                                  ; fully-qualified     # 📠 E0.6 fax machine
+
+# subgroup: computer
+1F50B                                                  ; fully-qualified     # 🔋 E0.6 battery
+1FAAB                                                  ; fully-qualified     # 🪫 E14.0 low battery
+1F50C                                                  ; fully-qualified     # 🔌 E0.6 electric plug
+1F4BB                                                  ; fully-qualified     # 💻 E0.6 laptop
+1F5A5 FE0F                                             ; fully-qualified     # 🖥️ E0.7 desktop computer
+1F5A5                                                  ; unqualified         # 🖥 E0.7 desktop computer
+1F5A8 FE0F                                             ; fully-qualified     # 🖨️ E0.7 printer
+1F5A8                                                  ; unqualified         # 🖨 E0.7 printer
+2328 FE0F                                              ; fully-qualified     # ⌨️ E1.0 keyboard
+2328                                                   ; unqualified         # ⌨ E1.0 keyboard
+1F5B1 FE0F                                             ; fully-qualified     # 🖱️ E0.7 computer mouse
+1F5B1                                                  ; unqualified         # 🖱 E0.7 computer mouse
+1F5B2 FE0F                                             ; fully-qualified     # 🖲️ E0.7 trackball
+1F5B2                                                  ; unqualified         # 🖲 E0.7 trackball
+1F4BD                                                  ; fully-qualified     # 💽 E0.6 computer disk
+1F4BE                                                  ; fully-qualified     # 💾 E0.6 floppy disk
+1F4BF                                                  ; fully-qualified     # 💿 E0.6 optical disk
+1F4C0                                                  ; fully-qualified     # 📀 E0.6 dvd
+1F9EE                                                  ; fully-qualified     # 🧮 E11.0 abacus
+
+# subgroup: light & video
+1F3A5                                                  ; fully-qualified     # 🎥 E0.6 movie camera
+1F39E FE0F                                             ; fully-qualified     # 🎞️ E0.7 film frames
+1F39E                                                  ; unqualified         # 🎞 E0.7 film frames
+1F4FD FE0F                                             ; fully-qualified     # 📽️ E0.7 film projector
+1F4FD                                                  ; unqualified         # 📽 E0.7 film projector
+1F3AC                                                  ; fully-qualified     # 🎬 E0.6 clapper board
+1F4FA                                                  ; fully-qualified     # 📺 E0.6 television
+1F4F7                                                  ; fully-qualified     # 📷 E0.6 camera
+1F4F8                                                  ; fully-qualified     # 📸 E1.0 camera with flash
+1F4F9                                                  ; fully-qualified     # 📹 E0.6 video camera
+1F4FC                                                  ; fully-qualified     # 📼 E0.6 videocassette
+1F50D                                                  ; fully-qualified     # 🔍 E0.6 magnifying glass tilted left
+1F50E                                                  ; fully-qualified     # 🔎 E0.6 magnifying glass tilted right
+1F56F FE0F                                             ; fully-qualified     # 🕯️ E0.7 candle
+1F56F                                                  ; unqualified         # 🕯 E0.7 candle
+1F4A1                                                  ; fully-qualified     # 💡 E0.6 light bulb
+1F526                                                  ; fully-qualified     # 🔦 E0.6 flashlight
+1F3EE                                                  ; fully-qualified     # 🏮 E0.6 red paper lantern
+1FA94                                                  ; fully-qualified     # 🪔 E12.0 diya lamp
+
+# subgroup: book-paper
+1F4D4                                                  ; fully-qualified     # 📔 E0.6 notebook with decorative cover
+1F4D5                                                  ; fully-qualified     # 📕 E0.6 closed book
+1F4D6                                                  ; fully-qualified     # 📖 E0.6 open book
+1F4D7                                                  ; fully-qualified     # 📗 E0.6 green book
+1F4D8                                                  ; fully-qualified     # 📘 E0.6 blue book
+1F4D9                                                  ; fully-qualified     # 📙 E0.6 orange book
+1F4DA                                                  ; fully-qualified     # 📚 E0.6 books
+1F4D3                                                  ; fully-qualified     # 📓 E0.6 notebook
+1F4D2                                                  ; fully-qualified     # 📒 E0.6 ledger
+1F4C3                                                  ; fully-qualified     # 📃 E0.6 page with curl
+1F4DC                                                  ; fully-qualified     # 📜 E0.6 scroll
+1F4C4                                                  ; fully-qualified     # 📄 E0.6 page facing up
+1F4F0                                                  ; fully-qualified     # 📰 E0.6 newspaper
+1F5DE FE0F                                             ; fully-qualified     # 🗞️ E0.7 rolled-up newspaper
+1F5DE                                                  ; unqualified         # 🗞 E0.7 rolled-up newspaper
+1F4D1                                                  ; fully-qualified     # 📑 E0.6 bookmark tabs
+1F516                                                  ; fully-qualified     # 🔖 E0.6 bookmark
+1F3F7 FE0F                                             ; fully-qualified     # 🏷️ E0.7 label
+1F3F7                                                  ; unqualified         # 🏷 E0.7 label
+
+# subgroup: money
+1F4B0                                                  ; fully-qualified     # 💰 E0.6 money bag
+1FA99                                                  ; fully-qualified     # 🪙 E13.0 coin
+1F4B4                                                  ; fully-qualified     # 💴 E0.6 yen banknote
+1F4B5                                                  ; fully-qualified     # 💵 E0.6 dollar banknote
+1F4B6                                                  ; fully-qualified     # 💶 E1.0 euro banknote
+1F4B7                                                  ; fully-qualified     # 💷 E1.0 pound banknote
+1F4B8                                                  ; fully-qualified     # 💸 E0.6 money with wings
+1F4B3                                                  ; fully-qualified     # 💳 E0.6 credit card
+1F9FE                                                  ; fully-qualified     # 🧾 E11.0 receipt
+1F4B9                                                  ; fully-qualified     # 💹 E0.6 chart increasing with yen
+
+# subgroup: mail
+2709 FE0F                                              ; fully-qualified     # ✉️ E0.6 envelope
+2709                                                   ; unqualified         # ✉ E0.6 envelope
+1F4E7                                                  ; fully-qualified     # 📧 E0.6 e-mail
+1F4E8                                                  ; fully-qualified     # 📨 E0.6 incoming envelope
+1F4E9                                                  ; fully-qualified     # 📩 E0.6 envelope with arrow
+1F4E4                                                  ; fully-qualified     # 📤 E0.6 outbox tray
+1F4E5                                                  ; fully-qualified     # 📥 E0.6 inbox tray
+1F4E6                                                  ; fully-qualified     # 📦 E0.6 package
+1F4EB                                                  ; fully-qualified     # 📫 E0.6 closed mailbox with raised flag
+1F4EA                                                  ; fully-qualified     # 📪 E0.6 closed mailbox with lowered flag
+1F4EC                                                  ; fully-qualified     # 📬 E0.7 open mailbox with raised flag
+1F4ED                                                  ; fully-qualified     # 📭 E0.7 open mailbox with lowered flag
+1F4EE                                                  ; fully-qualified     # 📮 E0.6 postbox
+1F5F3 FE0F                                             ; fully-qualified     # 🗳️ E0.7 ballot box with ballot
+1F5F3                                                  ; unqualified         # 🗳 E0.7 ballot box with ballot
+
+# subgroup: writing
+270F FE0F                                              ; fully-qualified     # ✏️ E0.6 pencil
+270F                                                   ; unqualified         # ✏ E0.6 pencil
+2712 FE0F                                              ; fully-qualified     # ✒️ E0.6 black nib
+2712                                                   ; unqualified         # ✒ E0.6 black nib
+1F58B FE0F                                             ; fully-qualified     # 🖋️ E0.7 fountain pen
+1F58B                                                  ; unqualified         # 🖋 E0.7 fountain pen
+1F58A FE0F                                             ; fully-qualified     # 🖊️ E0.7 pen
+1F58A                                                  ; unqualified         # 🖊 E0.7 pen
+1F58C FE0F                                             ; fully-qualified     # 🖌️ E0.7 paintbrush
+1F58C                                                  ; unqualified         # 🖌 E0.7 paintbrush
+1F58D FE0F                                             ; fully-qualified     # 🖍️ E0.7 crayon
+1F58D                                                  ; unqualified         # 🖍 E0.7 crayon
+1F4DD                                                  ; fully-qualified     # 📝 E0.6 memo
+
+# subgroup: office
+1F4BC                                                  ; fully-qualified     # 💼 E0.6 briefcase
+1F4C1                                                  ; fully-qualified     # 📁 E0.6 file folder
+1F4C2                                                  ; fully-qualified     # 📂 E0.6 open file folder
+1F5C2 FE0F                                             ; fully-qualified     # 🗂️ E0.7 card index dividers
+1F5C2                                                  ; unqualified         # 🗂 E0.7 card index dividers
+1F4C5                                                  ; fully-qualified     # 📅 E0.6 calendar
+1F4C6                                                  ; fully-qualified     # 📆 E0.6 tear-off calendar
+1F5D2 FE0F                                             ; fully-qualified     # 🗒️ E0.7 spiral notepad
+1F5D2                                                  ; unqualified         # 🗒 E0.7 spiral notepad
+1F5D3 FE0F                                             ; fully-qualified     # 🗓️ E0.7 spiral calendar
+1F5D3                                                  ; unqualified         # 🗓 E0.7 spiral calendar
+1F4C7                                                  ; fully-qualified     # 📇 E0.6 card index
+1F4C8                                                  ; fully-qualified     # 📈 E0.6 chart increasing
+1F4C9                                                  ; fully-qualified     # 📉 E0.6 chart decreasing
+1F4CA                                                  ; fully-qualified     # 📊 E0.6 bar chart
+1F4CB                                                  ; fully-qualified     # 📋 E0.6 clipboard
+1F4CC                                                  ; fully-qualified     # 📌 E0.6 pushpin
+1F4CD                                                  ; fully-qualified     # 📍 E0.6 round pushpin
+1F4CE                                                  ; fully-qualified     # 📎 E0.6 paperclip
+1F587 FE0F                                             ; fully-qualified     # 🖇️ E0.7 linked paperclips
+1F587                                                  ; unqualified         # 🖇 E0.7 linked paperclips
+1F4CF                                                  ; fully-qualified     # 📏 E0.6 straight ruler
+1F4D0                                                  ; fully-qualified     # 📐 E0.6 triangular ruler
+2702 FE0F                                              ; fully-qualified     # ✂️ E0.6 scissors
+2702                                                   ; unqualified         # ✂ E0.6 scissors
+1F5C3 FE0F                                             ; fully-qualified     # 🗃️ E0.7 card file box
+1F5C3                                                  ; unqualified         # 🗃 E0.7 card file box
+1F5C4 FE0F                                             ; fully-qualified     # 🗄️ E0.7 file cabinet
+1F5C4                                                  ; unqualified         # 🗄 E0.7 file cabinet
+1F5D1 FE0F                                             ; fully-qualified     # 🗑️ E0.7 wastebasket
+1F5D1                                                  ; unqualified         # 🗑 E0.7 wastebasket
+
+# subgroup: lock
+1F512                                                  ; fully-qualified     # 🔒 E0.6 locked
+1F513                                                  ; fully-qualified     # 🔓 E0.6 unlocked
+1F50F                                                  ; fully-qualified     # 🔏 E0.6 locked with pen
+1F510                                                  ; fully-qualified     # 🔐 E0.6 locked with key
+1F511                                                  ; fully-qualified     # 🔑 E0.6 key
+1F5DD FE0F                                             ; fully-qualified     # 🗝️ E0.7 old key
+1F5DD                                                  ; unqualified         # 🗝 E0.7 old key
+
+# subgroup: tool
+1F528                                                  ; fully-qualified     # 🔨 E0.6 hammer
+1FA93                                                  ; fully-qualified     # 🪓 E12.0 axe
+26CF FE0F                                              ; fully-qualified     # ⛏️ E0.7 pick
+26CF                                                   ; unqualified         # ⛏ E0.7 pick
+2692 FE0F                                              ; fully-qualified     # ⚒️ E1.0 hammer and pick
+2692                                                   ; unqualified         # ⚒ E1.0 hammer and pick
+1F6E0 FE0F                                             ; fully-qualified     # 🛠️ E0.7 hammer and wrench
+1F6E0                                                  ; unqualified         # 🛠 E0.7 hammer and wrench
+1F5E1 FE0F                                             ; fully-qualified     # 🗡️ E0.7 dagger
+1F5E1                                                  ; unqualified         # 🗡 E0.7 dagger
+2694 FE0F                                              ; fully-qualified     # ⚔️ E1.0 crossed swords
+2694                                                   ; unqualified         # ⚔ E1.0 crossed swords
+1F4A3                                                  ; fully-qualified     # 💣 E0.6 bomb
+1FA83                                                  ; fully-qualified     # 🪃 E13.0 boomerang
+1F3F9                                                  ; fully-qualified     # 🏹 E1.0 bow and arrow
+1F6E1 FE0F                                             ; fully-qualified     # 🛡️ E0.7 shield
+1F6E1                                                  ; unqualified         # 🛡 E0.7 shield
+1FA9A                                                  ; fully-qualified     # 🪚 E13.0 carpentry saw
+1F527                                                  ; fully-qualified     # 🔧 E0.6 wrench
+1FA9B                                                  ; fully-qualified     # 🪛 E13.0 screwdriver
+1F529                                                  ; fully-qualified     # 🔩 E0.6 nut and bolt
+2699 FE0F                                              ; fully-qualified     # ⚙️ E1.0 gear
+2699                                                   ; unqualified         # ⚙ E1.0 gear
+1F5DC FE0F                                             ; fully-qualified     # 🗜️ E0.7 clamp
+1F5DC                                                  ; unqualified         # 🗜 E0.7 clamp
+2696 FE0F                                              ; fully-qualified     # ⚖️ E1.0 balance scale
+2696                                                   ; unqualified         # ⚖ E1.0 balance scale
+1F9AF                                                  ; fully-qualified     # 🦯 E12.0 white cane
+1F517                                                  ; fully-qualified     # 🔗 E0.6 link
+26D3 FE0F 200D 1F4A5                                   ; fully-qualified     # ⛓️‍💥 E15.1 broken chain
+26D3 200D 1F4A5                                        ; unqualified         # ⛓‍💥 E15.1 broken chain
+26D3 FE0F                                              ; fully-qualified     # ⛓️ E0.7 chains
+26D3                                                   ; unqualified         # ⛓ E0.7 chains
+1FA9D                                                  ; fully-qualified     # 🪝 E13.0 hook
+1F9F0                                                  ; fully-qualified     # 🧰 E11.0 toolbox
+1F9F2                                                  ; fully-qualified     # 🧲 E11.0 magnet
+1FA9C                                                  ; fully-qualified     # 🪜 E13.0 ladder
+
+# subgroup: science
+2697 FE0F                                              ; fully-qualified     # ⚗️ E1.0 alembic
+2697                                                   ; unqualified         # ⚗ E1.0 alembic
+1F9EA                                                  ; fully-qualified     # 🧪 E11.0 test tube
+1F9EB                                                  ; fully-qualified     # 🧫 E11.0 petri dish
+1F9EC                                                  ; fully-qualified     # 🧬 E11.0 dna
+1F52C                                                  ; fully-qualified     # 🔬 E1.0 microscope
+1F52D                                                  ; fully-qualified     # 🔭 E1.0 telescope
+1F4E1                                                  ; fully-qualified     # 📡 E0.6 satellite antenna
+
+# subgroup: medical
+1F489                                                  ; fully-qualified     # 💉 E0.6 syringe
+1FA78                                                  ; fully-qualified     # 🩸 E12.0 drop of blood
+1F48A                                                  ; fully-qualified     # 💊 E0.6 pill
+1FA79                                                  ; fully-qualified     # 🩹 E12.0 adhesive bandage
+1FA7C                                                  ; fully-qualified     # 🩼 E14.0 crutch
+1FA7A                                                  ; fully-qualified     # 🩺 E12.0 stethoscope
+1FA7B                                                  ; fully-qualified     # 🩻 E14.0 x-ray
+
+# subgroup: household
+1F6AA                                                  ; fully-qualified     # 🚪 E0.6 door
+1F6D7                                                  ; fully-qualified     # 🛗 E13.0 elevator
+1FA9E                                                  ; fully-qualified     # 🪞 E13.0 mirror
+1FA9F                                                  ; fully-qualified     # 🪟 E13.0 window
+1F6CF FE0F                                             ; fully-qualified     # 🛏️ E0.7 bed
+1F6CF                                                  ; unqualified         # 🛏 E0.7 bed
+1F6CB FE0F                                             ; fully-qualified     # 🛋️ E0.7 couch and lamp
+1F6CB                                                  ; unqualified         # 🛋 E0.7 couch and lamp
+1FA91                                                  ; fully-qualified     # 🪑 E12.0 chair
+1F6BD                                                  ; fully-qualified     # 🚽 E0.6 toilet
+1FAA0                                                  ; fully-qualified     # 🪠 E13.0 plunger
+1F6BF                                                  ; fully-qualified     # 🚿 E1.0 shower
+1F6C1                                                  ; fully-qualified     # 🛁 E1.0 bathtub
+1FAA4                                                  ; fully-qualified     # 🪤 E13.0 mouse trap
+1FA92                                                  ; fully-qualified     # 🪒 E12.0 razor
+1F9F4                                                  ; fully-qualified     # 🧴 E11.0 lotion bottle
+1F9F7                                                  ; fully-qualified     # 🧷 E11.0 safety pin
+1F9F9                                                  ; fully-qualified     # 🧹 E11.0 broom
+1F9FA                                                  ; fully-qualified     # 🧺 E11.0 basket
+1F9FB                                                  ; fully-qualified     # 🧻 E11.0 roll of paper
+1FAA3                                                  ; fully-qualified     # 🪣 E13.0 bucket
+1F9FC                                                  ; fully-qualified     # 🧼 E11.0 soap
+1FAE7                                                  ; fully-qualified     # 🫧 E14.0 bubbles
+1FAA5                                                  ; fully-qualified     # 🪥 E13.0 toothbrush
+1F9FD                                                  ; fully-qualified     # 🧽 E11.0 sponge
+1F9EF                                                  ; fully-qualified     # 🧯 E11.0 fire extinguisher
+1F6D2                                                  ; fully-qualified     # 🛒 E3.0 shopping cart
+
+# subgroup: other-object
+1F6AC                                                  ; fully-qualified     # 🚬 E0.6 cigarette
+26B0 FE0F                                              ; fully-qualified     # ⚰️ E1.0 coffin
+26B0                                                   ; unqualified         # ⚰ E1.0 coffin
+1FAA6                                                  ; fully-qualified     # 🪦 E13.0 headstone
+26B1 FE0F                                              ; fully-qualified     # ⚱️ E1.0 funeral urn
+26B1                                                   ; unqualified         # ⚱ E1.0 funeral urn
+1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
+1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
+1F5FF                                                  ; fully-qualified     # 🗿 E0.6 moai
+1FAA7                                                  ; fully-qualified     # 🪧 E13.0 placard
+1FAAA                                                  ; fully-qualified     # 🪪 E14.0 identification card
+
+# Objects subtotal:		312
+# Objects subtotal:		312	w/o modifiers
+
+# group: Symbols
+
+# subgroup: transport-sign
+1F3E7                                                  ; fully-qualified     # 🏧 E0.6 ATM sign
+1F6AE                                                  ; fully-qualified     # 🚮 E1.0 litter in bin sign
+1F6B0                                                  ; fully-qualified     # 🚰 E1.0 potable water
+267F                                                   ; fully-qualified     # ♿ E0.6 wheelchair symbol
+1F6B9                                                  ; fully-qualified     # 🚹 E0.6 men’s room
+1F6BA                                                  ; fully-qualified     # 🚺 E0.6 women’s room
+1F6BB                                                  ; fully-qualified     # 🚻 E0.6 restroom
+1F6BC                                                  ; fully-qualified     # 🚼 E0.6 baby symbol
+1F6BE                                                  ; fully-qualified     # 🚾 E0.6 water closet
+1F6C2                                                  ; fully-qualified     # 🛂 E1.0 passport control
+1F6C3                                                  ; fully-qualified     # 🛃 E1.0 customs
+1F6C4                                                  ; fully-qualified     # 🛄 E1.0 baggage claim
+1F6C5                                                  ; fully-qualified     # 🛅 E1.0 left luggage
+
+# subgroup: warning
+26A0 FE0F                                              ; fully-qualified     # ⚠️ E0.6 warning
+26A0                                                   ; unqualified         # ⚠ E0.6 warning
+1F6B8                                                  ; fully-qualified     # 🚸 E1.0 children crossing
+26D4                                                   ; fully-qualified     # ⛔ E0.6 no entry
+1F6AB                                                  ; fully-qualified     # 🚫 E0.6 prohibited
+1F6B3                                                  ; fully-qualified     # 🚳 E1.0 no bicycles
+1F6AD                                                  ; fully-qualified     # 🚭 E0.6 no smoking
+1F6AF                                                  ; fully-qualified     # 🚯 E1.0 no littering
+1F6B1                                                  ; fully-qualified     # 🚱 E1.0 non-potable water
+1F6B7                                                  ; fully-qualified     # 🚷 E1.0 no pedestrians
+1F4F5                                                  ; fully-qualified     # 📵 E1.0 no mobile phones
+1F51E                                                  ; fully-qualified     # 🔞 E0.6 no one under eighteen
+2622 FE0F                                              ; fully-qualified     # ☢️ E1.0 radioactive
+2622                                                   ; unqualified         # ☢ E1.0 radioactive
+2623 FE0F                                              ; fully-qualified     # ☣️ E1.0 biohazard
+2623                                                   ; unqualified         # ☣ E1.0 biohazard
+
+# subgroup: arrow
+2B06 FE0F                                              ; fully-qualified     # ⬆️ E0.6 up arrow
+2B06                                                   ; unqualified         # ⬆ E0.6 up arrow
+2197 FE0F                                              ; fully-qualified     # ↗️ E0.6 up-right arrow
+2197                                                   ; unqualified         # ↗ E0.6 up-right arrow
+27A1 FE0F                                              ; fully-qualified     # ➡️ E0.6 right arrow
+27A1                                                   ; unqualified         # ➡ E0.6 right arrow
+2198 FE0F                                              ; fully-qualified     # ↘️ E0.6 down-right arrow
+2198                                                   ; unqualified         # ↘ E0.6 down-right arrow
+2B07 FE0F                                              ; fully-qualified     # ⬇️ E0.6 down arrow
+2B07                                                   ; unqualified         # ⬇ E0.6 down arrow
+2199 FE0F                                              ; fully-qualified     # ↙️ E0.6 down-left arrow
+2199                                                   ; unqualified         # ↙ E0.6 down-left arrow
+2B05 FE0F                                              ; fully-qualified     # ⬅️ E0.6 left arrow
+2B05                                                   ; unqualified         # ⬅ E0.6 left arrow
+2196 FE0F                                              ; fully-qualified     # ↖️ E0.6 up-left arrow
+2196                                                   ; unqualified         # ↖ E0.6 up-left arrow
+2195 FE0F                                              ; fully-qualified     # ↕️ E0.6 up-down arrow
+2195                                                   ; unqualified         # ↕ E0.6 up-down arrow
+2194 FE0F                                              ; fully-qualified     # ↔️ E0.6 left-right arrow
+2194                                                   ; unqualified         # ↔ E0.6 left-right arrow
+21A9 FE0F                                              ; fully-qualified     # ↩️ E0.6 right arrow curving left
+21A9                                                   ; unqualified         # ↩ E0.6 right arrow curving left
+21AA FE0F                                              ; fully-qualified     # ↪️ E0.6 left arrow curving right
+21AA                                                   ; unqualified         # ↪ E0.6 left arrow curving right
+2934 FE0F                                              ; fully-qualified     # ⤴️ E0.6 right arrow curving up
+2934                                                   ; unqualified         # ⤴ E0.6 right arrow curving up
+2935 FE0F                                              ; fully-qualified     # ⤵️ E0.6 right arrow curving down
+2935                                                   ; unqualified         # ⤵ E0.6 right arrow curving down
+1F503                                                  ; fully-qualified     # 🔃 E0.6 clockwise vertical arrows
+1F504                                                  ; fully-qualified     # 🔄 E1.0 counterclockwise arrows button
+1F519                                                  ; fully-qualified     # 🔙 E0.6 BACK arrow
+1F51A                                                  ; fully-qualified     # 🔚 E0.6 END arrow
+1F51B                                                  ; fully-qualified     # 🔛 E0.6 ON! arrow
+1F51C                                                  ; fully-qualified     # 🔜 E0.6 SOON arrow
+1F51D                                                  ; fully-qualified     # 🔝 E0.6 TOP arrow
+
+# subgroup: religion
+1F6D0                                                  ; fully-qualified     # 🛐 E1.0 place of worship
+269B FE0F                                              ; fully-qualified     # ⚛️ E1.0 atom symbol
+269B                                                   ; unqualified         # ⚛ E1.0 atom symbol
+1F549 FE0F                                             ; fully-qualified     # 🕉️ E0.7 om
+1F549                                                  ; unqualified         # 🕉 E0.7 om
+2721 FE0F                                              ; fully-qualified     # ✡️ E0.7 star of David
+2721                                                   ; unqualified         # ✡ E0.7 star of David
+2638 FE0F                                              ; fully-qualified     # ☸️ E0.7 wheel of dharma
+2638                                                   ; unqualified         # ☸ E0.7 wheel of dharma
+262F FE0F                                              ; fully-qualified     # ☯️ E0.7 yin yang
+262F                                                   ; unqualified         # ☯ E0.7 yin yang
+271D FE0F                                              ; fully-qualified     # ✝️ E0.7 latin cross
+271D                                                   ; unqualified         # ✝ E0.7 latin cross
+2626 FE0F                                              ; fully-qualified     # ☦️ E1.0 orthodox cross
+2626                                                   ; unqualified         # ☦ E1.0 orthodox cross
+262A FE0F                                              ; fully-qualified     # ☪️ E0.7 star and crescent
+262A                                                   ; unqualified         # ☪ E0.7 star and crescent
+262E FE0F                                              ; fully-qualified     # ☮️ E1.0 peace symbol
+262E                                                   ; unqualified         # ☮ E1.0 peace symbol
+1F54E                                                  ; fully-qualified     # 🕎 E1.0 menorah
+1F52F                                                  ; fully-qualified     # 🔯 E0.6 dotted six-pointed star
+1FAAF                                                  ; fully-qualified     # 🪯 E15.0 khanda
+
+# subgroup: zodiac
+2648                                                   ; fully-qualified     # ♈ E0.6 Aries
+2649                                                   ; fully-qualified     # ♉ E0.6 Taurus
+264A                                                   ; fully-qualified     # ♊ E0.6 Gemini
+264B                                                   ; fully-qualified     # ♋ E0.6 Cancer
+264C                                                   ; fully-qualified     # ♌ E0.6 Leo
+264D                                                   ; fully-qualified     # ♍ E0.6 Virgo
+264E                                                   ; fully-qualified     # ♎ E0.6 Libra
+264F                                                   ; fully-qualified     # ♏ E0.6 Scorpio
+2650                                                   ; fully-qualified     # ♐ E0.6 Sagittarius
+2651                                                   ; fully-qualified     # ♑ E0.6 Capricorn
+2652                                                   ; fully-qualified     # ♒ E0.6 Aquarius
+2653                                                   ; fully-qualified     # ♓ E0.6 Pisces
+26CE                                                   ; fully-qualified     # ⛎ E0.6 Ophiuchus
+
+# subgroup: av-symbol
+1F500                                                  ; fully-qualified     # 🔀 E1.0 shuffle tracks button
+1F501                                                  ; fully-qualified     # 🔁 E1.0 repeat button
+1F502                                                  ; fully-qualified     # 🔂 E1.0 repeat single button
+25B6 FE0F                                              ; fully-qualified     # ▶️ E0.6 play button
+25B6                                                   ; unqualified         # ▶ E0.6 play button
+23E9                                                   ; fully-qualified     # ⏩ E0.6 fast-forward button
+23ED FE0F                                              ; fully-qualified     # ⏭️ E0.7 next track button
+23ED                                                   ; unqualified         # ⏭ E0.7 next track button
+23EF FE0F                                              ; fully-qualified     # ⏯️ E1.0 play or pause button
+23EF                                                   ; unqualified         # ⏯ E1.0 play or pause button
+25C0 FE0F                                              ; fully-qualified     # ◀️ E0.6 reverse button
+25C0                                                   ; unqualified         # ◀ E0.6 reverse button
+23EA                                                   ; fully-qualified     # ⏪ E0.6 fast reverse button
+23EE FE0F                                              ; fully-qualified     # ⏮️ E0.7 last track button
+23EE                                                   ; unqualified         # ⏮ E0.7 last track button
+1F53C                                                  ; fully-qualified     # 🔼 E0.6 upwards button
+23EB                                                   ; fully-qualified     # ⏫ E0.6 fast up button
+1F53D                                                  ; fully-qualified     # 🔽 E0.6 downwards button
+23EC                                                   ; fully-qualified     # ⏬ E0.6 fast down button
+23F8 FE0F                                              ; fully-qualified     # ⏸️ E0.7 pause button
+23F8                                                   ; unqualified         # ⏸ E0.7 pause button
+23F9 FE0F                                              ; fully-qualified     # ⏹️ E0.7 stop button
+23F9                                                   ; unqualified         # ⏹ E0.7 stop button
+23FA FE0F                                              ; fully-qualified     # ⏺️ E0.7 record button
+23FA                                                   ; unqualified         # ⏺ E0.7 record button
+23CF FE0F                                              ; fully-qualified     # ⏏️ E1.0 eject button
+23CF                                                   ; unqualified         # ⏏ E1.0 eject button
+1F3A6                                                  ; fully-qualified     # 🎦 E0.6 cinema
+1F505                                                  ; fully-qualified     # 🔅 E1.0 dim button
+1F506                                                  ; fully-qualified     # 🔆 E1.0 bright button
+1F4F6                                                  ; fully-qualified     # 📶 E0.6 antenna bars
+1F6DC                                                  ; fully-qualified     # 🛜 E15.0 wireless
+1F4F3                                                  ; fully-qualified     # 📳 E0.6 vibration mode
+1F4F4                                                  ; fully-qualified     # 📴 E0.6 mobile phone off
+
+# subgroup: gender
+2640 FE0F                                              ; fully-qualified     # ♀️ E4.0 female sign
+2640                                                   ; unqualified         # ♀ E4.0 female sign
+2642 FE0F                                              ; fully-qualified     # ♂️ E4.0 male sign
+2642                                                   ; unqualified         # ♂ E4.0 male sign
+26A7 FE0F                                              ; fully-qualified     # ⚧️ E13.0 transgender symbol
+26A7                                                   ; unqualified         # ⚧ E13.0 transgender symbol
+
+# subgroup: math
+2716 FE0F                                              ; fully-qualified     # ✖️ E0.6 multiply
+2716                                                   ; unqualified         # ✖ E0.6 multiply
+2795                                                   ; fully-qualified     # ➕ E0.6 plus
+2796                                                   ; fully-qualified     # ➖ E0.6 minus
+2797                                                   ; fully-qualified     # ➗ E0.6 divide
+1F7F0                                                  ; fully-qualified     # 🟰 E14.0 heavy equals sign
+267E FE0F                                              ; fully-qualified     # ♾️ E11.0 infinity
+267E                                                   ; unqualified         # ♾ E11.0 infinity
+
+# subgroup: punctuation
+203C FE0F                                              ; fully-qualified     # ‼️ E0.6 double exclamation mark
+203C                                                   ; unqualified         # ‼ E0.6 double exclamation mark
+2049 FE0F                                              ; fully-qualified     # ⁉️ E0.6 exclamation question mark
+2049                                                   ; unqualified         # ⁉ E0.6 exclamation question mark
+2753                                                   ; fully-qualified     # ❓ E0.6 red question mark
+2754                                                   ; fully-qualified     # ❔ E0.6 white question mark
+2755                                                   ; fully-qualified     # ❕ E0.6 white exclamation mark
+2757                                                   ; fully-qualified     # ❗ E0.6 red exclamation mark
+3030 FE0F                                              ; fully-qualified     # 〰️ E0.6 wavy dash
+3030                                                   ; unqualified         # 〰 E0.6 wavy dash
+
+# subgroup: currency
+1F4B1                                                  ; fully-qualified     # 💱 E0.6 currency exchange
+1F4B2                                                  ; fully-qualified     # 💲 E0.6 heavy dollar sign
+
+# subgroup: other-symbol
+2695 FE0F                                              ; fully-qualified     # ⚕️ E4.0 medical symbol
+2695                                                   ; unqualified         # ⚕ E4.0 medical symbol
+267B FE0F                                              ; fully-qualified     # ♻️ E0.6 recycling symbol
+267B                                                   ; unqualified         # ♻ E0.6 recycling symbol
+269C FE0F                                              ; fully-qualified     # ⚜️ E1.0 fleur-de-lis
+269C                                                   ; unqualified         # ⚜ E1.0 fleur-de-lis
+1F531                                                  ; fully-qualified     # 🔱 E0.6 trident emblem
+1F4DB                                                  ; fully-qualified     # 📛 E0.6 name badge
+1F530                                                  ; fully-qualified     # 🔰 E0.6 Japanese symbol for beginner
+2B55                                                   ; fully-qualified     # ⭕ E0.6 hollow red circle
+2705                                                   ; fully-qualified     # ✅ E0.6 check mark button
+2611 FE0F                                              ; fully-qualified     # ☑️ E0.6 check box with check
+2611                                                   ; unqualified         # ☑ E0.6 check box with check
+2714 FE0F                                              ; fully-qualified     # ✔️ E0.6 check mark
+2714                                                   ; unqualified         # ✔ E0.6 check mark
+274C                                                   ; fully-qualified     # ❌ E0.6 cross mark
+274E                                                   ; fully-qualified     # ❎ E0.6 cross mark button
+27B0                                                   ; fully-qualified     # ➰ E0.6 curly loop
+27BF                                                   ; fully-qualified     # ➿ E1.0 double curly loop
+303D FE0F                                              ; fully-qualified     # 〽️ E0.6 part alternation mark
+303D                                                   ; unqualified         # 〽 E0.6 part alternation mark
+2733 FE0F                                              ; fully-qualified     # ✳️ E0.6 eight-spoked asterisk
+2733                                                   ; unqualified         # ✳ E0.6 eight-spoked asterisk
+2734 FE0F                                              ; fully-qualified     # ✴️ E0.6 eight-pointed star
+2734                                                   ; unqualified         # ✴ E0.6 eight-pointed star
+2747 FE0F                                              ; fully-qualified     # ❇️ E0.6 sparkle
+2747                                                   ; unqualified         # ❇ E0.6 sparkle
+00A9 FE0F                                              ; fully-qualified     # ©️ E0.6 copyright
+00A9                                                   ; unqualified         # © E0.6 copyright
+00AE FE0F                                              ; fully-qualified     # ®️ E0.6 registered
+00AE                                                   ; unqualified         # ® E0.6 registered
+2122 FE0F                                              ; fully-qualified     # ™️ E0.6 trade mark
+2122                                                   ; unqualified         # ™ E0.6 trade mark
+
+# subgroup: keycap
+0023 FE0F 20E3                                         ; fully-qualified     # #️⃣ E0.6 keycap: #
+0023 20E3                                              ; unqualified         # #⃣ E0.6 keycap: #
+002A FE0F 20E3                                         ; fully-qualified     # *️⃣ E2.0 keycap: *
+002A 20E3                                              ; unqualified         # *⃣ E2.0 keycap: *
+0030 FE0F 20E3                                         ; fully-qualified     # 0️⃣ E0.6 keycap: 0
+0030 20E3                                              ; unqualified         # 0⃣ E0.6 keycap: 0
+0031 FE0F 20E3                                         ; fully-qualified     # 1️⃣ E0.6 keycap: 1
+0031 20E3                                              ; unqualified         # 1⃣ E0.6 keycap: 1
+0032 FE0F 20E3                                         ; fully-qualified     # 2️⃣ E0.6 keycap: 2
+0032 20E3                                              ; unqualified         # 2⃣ E0.6 keycap: 2
+0033 FE0F 20E3                                         ; fully-qualified     # 3️⃣ E0.6 keycap: 3
+0033 20E3                                              ; unqualified         # 3⃣ E0.6 keycap: 3
+0034 FE0F 20E3                                         ; fully-qualified     # 4️⃣ E0.6 keycap: 4
+0034 20E3                                              ; unqualified         # 4⃣ E0.6 keycap: 4
+0035 FE0F 20E3                                         ; fully-qualified     # 5️⃣ E0.6 keycap: 5
+0035 20E3                                              ; unqualified         # 5⃣ E0.6 keycap: 5
+0036 FE0F 20E3                                         ; fully-qualified     # 6️⃣ E0.6 keycap: 6
+0036 20E3                                              ; unqualified         # 6⃣ E0.6 keycap: 6
+0037 FE0F 20E3                                         ; fully-qualified     # 7️⃣ E0.6 keycap: 7
+0037 20E3                                              ; unqualified         # 7⃣ E0.6 keycap: 7
+0038 FE0F 20E3                                         ; fully-qualified     # 8️⃣ E0.6 keycap: 8
+0038 20E3                                              ; unqualified         # 8⃣ E0.6 keycap: 8
+0039 FE0F 20E3                                         ; fully-qualified     # 9️⃣ E0.6 keycap: 9
+0039 20E3                                              ; unqualified         # 9⃣ E0.6 keycap: 9
+1F51F                                                  ; fully-qualified     # 🔟 E0.6 keycap: 10
+
+# subgroup: alphanum
+1F520                                                  ; fully-qualified     # 🔠 E0.6 input latin uppercase
+1F521                                                  ; fully-qualified     # 🔡 E0.6 input latin lowercase
+1F522                                                  ; fully-qualified     # 🔢 E0.6 input numbers
+1F523                                                  ; fully-qualified     # 🔣 E0.6 input symbols
+1F524                                                  ; fully-qualified     # 🔤 E0.6 input latin letters
+1F170 FE0F                                             ; fully-qualified     # 🅰️ E0.6 A button (blood type)
+1F170                                                  ; unqualified         # 🅰 E0.6 A button (blood type)
+1F18E                                                  ; fully-qualified     # 🆎 E0.6 AB button (blood type)
+1F171 FE0F                                             ; fully-qualified     # 🅱️ E0.6 B button (blood type)
+1F171                                                  ; unqualified         # 🅱 E0.6 B button (blood type)
+1F191                                                  ; fully-qualified     # 🆑 E0.6 CL button
+1F192                                                  ; fully-qualified     # 🆒 E0.6 COOL button
+1F193                                                  ; fully-qualified     # 🆓 E0.6 FREE button
+2139 FE0F                                              ; fully-qualified     # ℹ️ E0.6 information
+2139                                                   ; unqualified         # ℹ E0.6 information
+1F194                                                  ; fully-qualified     # 🆔 E0.6 ID button
+24C2 FE0F                                              ; fully-qualified     # Ⓜ️ E0.6 circled M
+24C2                                                   ; unqualified         # Ⓜ E0.6 circled M
+1F195                                                  ; fully-qualified     # 🆕 E0.6 NEW button
+1F196                                                  ; fully-qualified     # 🆖 E0.6 NG button
+1F17E FE0F                                             ; fully-qualified     # 🅾️ E0.6 O button (blood type)
+1F17E                                                  ; unqualified         # 🅾 E0.6 O button (blood type)
+1F197                                                  ; fully-qualified     # 🆗 E0.6 OK button
+1F17F FE0F                                             ; fully-qualified     # 🅿️ E0.6 P button
+1F17F                                                  ; unqualified         # 🅿 E0.6 P button
+1F198                                                  ; fully-qualified     # 🆘 E0.6 SOS button
+1F199                                                  ; fully-qualified     # 🆙 E0.6 UP! button
+1F19A                                                  ; fully-qualified     # 🆚 E0.6 VS button
+1F201                                                  ; fully-qualified     # 🈁 E0.6 Japanese “here” button
+1F202 FE0F                                             ; fully-qualified     # 🈂️ E0.6 Japanese “service charge” button
+1F202                                                  ; unqualified         # 🈂 E0.6 Japanese “service charge” button
+1F237 FE0F                                             ; fully-qualified     # 🈷️ E0.6 Japanese “monthly amount” button
+1F237                                                  ; unqualified         # 🈷 E0.6 Japanese “monthly amount” button
+1F236                                                  ; fully-qualified     # 🈶 E0.6 Japanese “not free of charge” button
+1F22F                                                  ; fully-qualified     # 🈯 E0.6 Japanese “reserved” button
+1F250                                                  ; fully-qualified     # 🉐 E0.6 Japanese “bargain” button
+1F239                                                  ; fully-qualified     # 🈹 E0.6 Japanese “discount” button
+1F21A                                                  ; fully-qualified     # 🈚 E0.6 Japanese “free of charge” button
+1F232                                                  ; fully-qualified     # 🈲 E0.6 Japanese “prohibited” button
+1F251                                                  ; fully-qualified     # 🉑 E0.6 Japanese “acceptable” button
+1F238                                                  ; fully-qualified     # 🈸 E0.6 Japanese “application” button
+1F234                                                  ; fully-qualified     # 🈴 E0.6 Japanese “passing grade” button
+1F233                                                  ; fully-qualified     # 🈳 E0.6 Japanese “vacancy” button
+3297 FE0F                                              ; fully-qualified     # ㊗️ E0.6 Japanese “congratulations” button
+3297                                                   ; unqualified         # ㊗ E0.6 Japanese “congratulations” button
+3299 FE0F                                              ; fully-qualified     # ㊙️ E0.6 Japanese “secret” button
+3299                                                   ; unqualified         # ㊙ E0.6 Japanese “secret” button
+1F23A                                                  ; fully-qualified     # 🈺 E0.6 Japanese “open for business” button
+1F235                                                  ; fully-qualified     # 🈵 E0.6 Japanese “no vacancy” button
+
+# subgroup: geometric
+1F534                                                  ; fully-qualified     # 🔴 E0.6 red circle
+1F7E0                                                  ; fully-qualified     # 🟠 E12.0 orange circle
+1F7E1                                                  ; fully-qualified     # 🟡 E12.0 yellow circle
+1F7E2                                                  ; fully-qualified     # 🟢 E12.0 green circle
+1F535                                                  ; fully-qualified     # 🔵 E0.6 blue circle
+1F7E3                                                  ; fully-qualified     # 🟣 E12.0 purple circle
+1F7E4                                                  ; fully-qualified     # 🟤 E12.0 brown circle
+26AB                                                   ; fully-qualified     # ⚫ E0.6 black circle
+26AA                                                   ; fully-qualified     # ⚪ E0.6 white circle
+1F7E5                                                  ; fully-qualified     # 🟥 E12.0 red square
+1F7E7                                                  ; fully-qualified     # 🟧 E12.0 orange square
+1F7E8                                                  ; fully-qualified     # 🟨 E12.0 yellow square
+1F7E9                                                  ; fully-qualified     # 🟩 E12.0 green square
+1F7E6                                                  ; fully-qualified     # 🟦 E12.0 blue square
+1F7EA                                                  ; fully-qualified     # 🟪 E12.0 purple square
+1F7EB                                                  ; fully-qualified     # 🟫 E12.0 brown square
+2B1B                                                   ; fully-qualified     # ⬛ E0.6 black large square
+2B1C                                                   ; fully-qualified     # ⬜ E0.6 white large square
+25FC FE0F                                              ; fully-qualified     # ◼️ E0.6 black medium square
+25FC                                                   ; unqualified         # ◼ E0.6 black medium square
+25FB FE0F                                              ; fully-qualified     # ◻️ E0.6 white medium square
+25FB                                                   ; unqualified         # ◻ E0.6 white medium square
+25FE                                                   ; fully-qualified     # ◾ E0.6 black medium-small square
+25FD                                                   ; fully-qualified     # ◽ E0.6 white medium-small square
+25AA FE0F                                              ; fully-qualified     # ▪️ E0.6 black small square
+25AA                                                   ; unqualified         # ▪ E0.6 black small square
+25AB FE0F                                              ; fully-qualified     # ▫️ E0.6 white small square
+25AB                                                   ; unqualified         # ▫ E0.6 white small square
+1F536                                                  ; fully-qualified     # 🔶 E0.6 large orange diamond
+1F537                                                  ; fully-qualified     # 🔷 E0.6 large blue diamond
+1F538                                                  ; fully-qualified     # 🔸 E0.6 small orange diamond
+1F539                                                  ; fully-qualified     # 🔹 E0.6 small blue diamond
+1F53A                                                  ; fully-qualified     # 🔺 E0.6 red triangle pointed up
+1F53B                                                  ; fully-qualified     # 🔻 E0.6 red triangle pointed down
+1F4A0                                                  ; fully-qualified     # 💠 E0.6 diamond with a dot
+1F518                                                  ; fully-qualified     # 🔘 E0.6 radio button
+1F533                                                  ; fully-qualified     # 🔳 E0.6 white square button
+1F532                                                  ; fully-qualified     # 🔲 E0.6 black square button
+
+# Symbols subtotal:		304
+# Symbols subtotal:		304	w/o modifiers
+
+# group: Flags
+
+# subgroup: flag
+1F3C1                                                  ; fully-qualified     # 🏁 E0.6 chequered flag
+1F6A9                                                  ; fully-qualified     # 🚩 E0.6 triangular flag
+1F38C                                                  ; fully-qualified     # 🎌 E0.6 crossed flags
+1F3F4                                                  ; fully-qualified     # 🏴 E1.0 black flag
+1F3F3 FE0F                                             ; fully-qualified     # 🏳️ E0.7 white flag
+1F3F3                                                  ; unqualified         # 🏳 E0.7 white flag
+1F3F3 FE0F 200D 1F308                                  ; fully-qualified     # 🏳️‍🌈 E4.0 rainbow flag
+1F3F3 200D 1F308                                       ; unqualified         # 🏳‍🌈 E4.0 rainbow flag
+1F3F3 FE0F 200D 26A7 FE0F                              ; fully-qualified     # 🏳️‍⚧️ E13.0 transgender flag
+1F3F3 200D 26A7 FE0F                                   ; unqualified         # 🏳‍⚧️ E13.0 transgender flag
+1F3F3 FE0F 200D 26A7                                   ; minimally-qualified # 🏳️‍⚧ E13.0 transgender flag
+1F3F3 200D 26A7                                        ; unqualified         # 🏳‍⚧ E13.0 transgender flag
+1F3F4 200D 2620 FE0F                                   ; fully-qualified     # 🏴‍☠️ E11.0 pirate flag
+1F3F4 200D 2620                                        ; minimally-qualified # 🏴‍☠ E11.0 pirate flag
+
+# subgroup: country-flag
+1F1E6 1F1E8                                            ; fully-qualified     # 🇦🇨 E2.0 flag: Ascension Island
+1F1E6 1F1E9                                            ; fully-qualified     # 🇦🇩 E2.0 flag: Andorra
+1F1E6 1F1EA                                            ; fully-qualified     # 🇦🇪 E2.0 flag: United Arab Emirates
+1F1E6 1F1EB                                            ; fully-qualified     # 🇦🇫 E2.0 flag: Afghanistan
+1F1E6 1F1EC                                            ; fully-qualified     # 🇦🇬 E2.0 flag: Antigua & Barbuda
+1F1E6 1F1EE                                            ; fully-qualified     # 🇦🇮 E2.0 flag: Anguilla
+1F1E6 1F1F1                                            ; fully-qualified     # 🇦🇱 E2.0 flag: Albania
+1F1E6 1F1F2                                            ; fully-qualified     # 🇦🇲 E2.0 flag: Armenia
+1F1E6 1F1F4                                            ; fully-qualified     # 🇦🇴 E2.0 flag: Angola
+1F1E6 1F1F6                                            ; fully-qualified     # 🇦🇶 E2.0 flag: Antarctica
+1F1E6 1F1F7                                            ; fully-qualified     # 🇦🇷 E2.0 flag: Argentina
+1F1E6 1F1F8                                            ; fully-qualified     # 🇦🇸 E2.0 flag: American Samoa
+1F1E6 1F1F9                                            ; fully-qualified     # 🇦🇹 E2.0 flag: Austria
+1F1E6 1F1FA                                            ; fully-qualified     # 🇦🇺 E2.0 flag: Australia
+1F1E6 1F1FC                                            ; fully-qualified     # 🇦🇼 E2.0 flag: Aruba
+1F1E6 1F1FD                                            ; fully-qualified     # 🇦🇽 E2.0 flag: Åland Islands
+1F1E6 1F1FF                                            ; fully-qualified     # 🇦🇿 E2.0 flag: Azerbaijan
+1F1E7 1F1E6                                            ; fully-qualified     # 🇧🇦 E2.0 flag: Bosnia & Herzegovina
+1F1E7 1F1E7                                            ; fully-qualified     # 🇧🇧 E2.0 flag: Barbados
+1F1E7 1F1E9                                            ; fully-qualified     # 🇧🇩 E2.0 flag: Bangladesh
+1F1E7 1F1EA                                            ; fully-qualified     # 🇧🇪 E2.0 flag: Belgium
+1F1E7 1F1EB                                            ; fully-qualified     # 🇧🇫 E2.0 flag: Burkina Faso
+1F1E7 1F1EC                                            ; fully-qualified     # 🇧🇬 E2.0 flag: Bulgaria
+1F1E7 1F1ED                                            ; fully-qualified     # 🇧🇭 E2.0 flag: Bahrain
+1F1E7 1F1EE                                            ; fully-qualified     # 🇧🇮 E2.0 flag: Burundi
+1F1E7 1F1EF                                            ; fully-qualified     # 🇧🇯 E2.0 flag: Benin
+1F1E7 1F1F1                                            ; fully-qualified     # 🇧🇱 E2.0 flag: St. Barthélemy
+1F1E7 1F1F2                                            ; fully-qualified     # 🇧🇲 E2.0 flag: Bermuda
+1F1E7 1F1F3                                            ; fully-qualified     # 🇧🇳 E2.0 flag: Brunei
+1F1E7 1F1F4                                            ; fully-qualified     # 🇧🇴 E2.0 flag: Bolivia
+1F1E7 1F1F6                                            ; fully-qualified     # 🇧🇶 E2.0 flag: Caribbean Netherlands
+1F1E7 1F1F7                                            ; fully-qualified     # 🇧🇷 E2.0 flag: Brazil
+1F1E7 1F1F8                                            ; fully-qualified     # 🇧🇸 E2.0 flag: Bahamas
+1F1E7 1F1F9                                            ; fully-qualified     # 🇧🇹 E2.0 flag: Bhutan
+1F1E7 1F1FB                                            ; fully-qualified     # 🇧🇻 E2.0 flag: Bouvet Island
+1F1E7 1F1FC                                            ; fully-qualified     # 🇧🇼 E2.0 flag: Botswana
+1F1E7 1F1FE                                            ; fully-qualified     # 🇧🇾 E2.0 flag: Belarus
+1F1E7 1F1FF                                            ; fully-qualified     # 🇧🇿 E2.0 flag: Belize
+1F1E8 1F1E6                                            ; fully-qualified     # 🇨🇦 E2.0 flag: Canada
+1F1E8 1F1E8                                            ; fully-qualified     # 🇨🇨 E2.0 flag: Cocos (Keeling) Islands
+1F1E8 1F1E9                                            ; fully-qualified     # 🇨🇩 E2.0 flag: Congo - Kinshasa
+1F1E8 1F1EB                                            ; fully-qualified     # 🇨🇫 E2.0 flag: Central African Republic
+1F1E8 1F1EC                                            ; fully-qualified     # 🇨🇬 E2.0 flag: Congo - Brazzaville
+1F1E8 1F1ED                                            ; fully-qualified     # 🇨🇭 E2.0 flag: Switzerland
+1F1E8 1F1EE                                            ; fully-qualified     # 🇨🇮 E2.0 flag: Côte d’Ivoire
+1F1E8 1F1F0                                            ; fully-qualified     # 🇨🇰 E2.0 flag: Cook Islands
+1F1E8 1F1F1                                            ; fully-qualified     # 🇨🇱 E2.0 flag: Chile
+1F1E8 1F1F2                                            ; fully-qualified     # 🇨🇲 E2.0 flag: Cameroon
+1F1E8 1F1F3                                            ; fully-qualified     # 🇨🇳 E0.6 flag: China
+1F1E8 1F1F4                                            ; fully-qualified     # 🇨🇴 E2.0 flag: Colombia
+1F1E8 1F1F5                                            ; fully-qualified     # 🇨🇵 E2.0 flag: Clipperton Island
+1F1E8 1F1F7                                            ; fully-qualified     # 🇨🇷 E2.0 flag: Costa Rica
+1F1E8 1F1FA                                            ; fully-qualified     # 🇨🇺 E2.0 flag: Cuba
+1F1E8 1F1FB                                            ; fully-qualified     # 🇨🇻 E2.0 flag: Cape Verde
+1F1E8 1F1FC                                            ; fully-qualified     # 🇨🇼 E2.0 flag: Curaçao
+1F1E8 1F1FD                                            ; fully-qualified     # 🇨🇽 E2.0 flag: Christmas Island
+1F1E8 1F1FE                                            ; fully-qualified     # 🇨🇾 E2.0 flag: Cyprus
+1F1E8 1F1FF                                            ; fully-qualified     # 🇨🇿 E2.0 flag: Czechia
+1F1E9 1F1EA                                            ; fully-qualified     # 🇩🇪 E0.6 flag: Germany
+1F1E9 1F1EC                                            ; fully-qualified     # 🇩🇬 E2.0 flag: Diego Garcia
+1F1E9 1F1EF                                            ; fully-qualified     # 🇩🇯 E2.0 flag: Djibouti
+1F1E9 1F1F0                                            ; fully-qualified     # 🇩🇰 E2.0 flag: Denmark
+1F1E9 1F1F2                                            ; fully-qualified     # 🇩🇲 E2.0 flag: Dominica
+1F1E9 1F1F4                                            ; fully-qualified     # 🇩🇴 E2.0 flag: Dominican Republic
+1F1E9 1F1FF                                            ; fully-qualified     # 🇩🇿 E2.0 flag: Algeria
+1F1EA 1F1E6                                            ; fully-qualified     # 🇪🇦 E2.0 flag: Ceuta & Melilla
+1F1EA 1F1E8                                            ; fully-qualified     # 🇪🇨 E2.0 flag: Ecuador
+1F1EA 1F1EA                                            ; fully-qualified     # 🇪🇪 E2.0 flag: Estonia
+1F1EA 1F1EC                                            ; fully-qualified     # 🇪🇬 E2.0 flag: Egypt
+1F1EA 1F1ED                                            ; fully-qualified     # 🇪🇭 E2.0 flag: Western Sahara
+1F1EA 1F1F7                                            ; fully-qualified     # 🇪🇷 E2.0 flag: Eritrea
+1F1EA 1F1F8                                            ; fully-qualified     # 🇪🇸 E0.6 flag: Spain
+1F1EA 1F1F9                                            ; fully-qualified     # 🇪🇹 E2.0 flag: Ethiopia
+1F1EA 1F1FA                                            ; fully-qualified     # 🇪🇺 E2.0 flag: European Union
+1F1EB 1F1EE                                            ; fully-qualified     # 🇫🇮 E2.0 flag: Finland
+1F1EB 1F1EF                                            ; fully-qualified     # 🇫🇯 E2.0 flag: Fiji
+1F1EB 1F1F0                                            ; fully-qualified     # 🇫🇰 E2.0 flag: Falkland Islands
+1F1EB 1F1F2                                            ; fully-qualified     # 🇫🇲 E2.0 flag: Micronesia
+1F1EB 1F1F4                                            ; fully-qualified     # 🇫🇴 E2.0 flag: Faroe Islands
+1F1EB 1F1F7                                            ; fully-qualified     # 🇫🇷 E0.6 flag: France
+1F1EC 1F1E6                                            ; fully-qualified     # 🇬🇦 E2.0 flag: Gabon
+1F1EC 1F1E7                                            ; fully-qualified     # 🇬🇧 E0.6 flag: United Kingdom
+1F1EC 1F1E9                                            ; fully-qualified     # 🇬🇩 E2.0 flag: Grenada
+1F1EC 1F1EA                                            ; fully-qualified     # 🇬🇪 E2.0 flag: Georgia
+1F1EC 1F1EB                                            ; fully-qualified     # 🇬🇫 E2.0 flag: French Guiana
+1F1EC 1F1EC                                            ; fully-qualified     # 🇬🇬 E2.0 flag: Guernsey
+1F1EC 1F1ED                                            ; fully-qualified     # 🇬🇭 E2.0 flag: Ghana
+1F1EC 1F1EE                                            ; fully-qualified     # 🇬🇮 E2.0 flag: Gibraltar
+1F1EC 1F1F1                                            ; fully-qualified     # 🇬🇱 E2.0 flag: Greenland
+1F1EC 1F1F2                                            ; fully-qualified     # 🇬🇲 E2.0 flag: Gambia
+1F1EC 1F1F3                                            ; fully-qualified     # 🇬🇳 E2.0 flag: Guinea
+1F1EC 1F1F5                                            ; fully-qualified     # 🇬🇵 E2.0 flag: Guadeloupe
+1F1EC 1F1F6                                            ; fully-qualified     # 🇬🇶 E2.0 flag: Equatorial Guinea
+1F1EC 1F1F7                                            ; fully-qualified     # 🇬🇷 E2.0 flag: Greece
+1F1EC 1F1F8                                            ; fully-qualified     # 🇬🇸 E2.0 flag: South Georgia & South Sandwich Islands
+1F1EC 1F1F9                                            ; fully-qualified     # 🇬🇹 E2.0 flag: Guatemala
+1F1EC 1F1FA                                            ; fully-qualified     # 🇬🇺 E2.0 flag: Guam
+1F1EC 1F1FC                                            ; fully-qualified     # 🇬🇼 E2.0 flag: Guinea-Bissau
+1F1EC 1F1FE                                            ; fully-qualified     # 🇬🇾 E2.0 flag: Guyana
+1F1ED 1F1F0                                            ; fully-qualified     # 🇭🇰 E2.0 flag: Hong Kong SAR China
+1F1ED 1F1F2                                            ; fully-qualified     # 🇭🇲 E2.0 flag: Heard & McDonald Islands
+1F1ED 1F1F3                                            ; fully-qualified     # 🇭🇳 E2.0 flag: Honduras
+1F1ED 1F1F7                                            ; fully-qualified     # 🇭🇷 E2.0 flag: Croatia
+1F1ED 1F1F9                                            ; fully-qualified     # 🇭🇹 E2.0 flag: Haiti
+1F1ED 1F1FA                                            ; fully-qualified     # 🇭🇺 E2.0 flag: Hungary
+1F1EE 1F1E8                                            ; fully-qualified     # 🇮🇨 E2.0 flag: Canary Islands
+1F1EE 1F1E9                                            ; fully-qualified     # 🇮🇩 E2.0 flag: Indonesia
+1F1EE 1F1EA                                            ; fully-qualified     # 🇮🇪 E2.0 flag: Ireland
+1F1EE 1F1F1                                            ; fully-qualified     # 🇮🇱 E2.0 flag: Israel
+1F1EE 1F1F2                                            ; fully-qualified     # 🇮🇲 E2.0 flag: Isle of Man
+1F1EE 1F1F3                                            ; fully-qualified     # 🇮🇳 E2.0 flag: India
+1F1EE 1F1F4                                            ; fully-qualified     # 🇮🇴 E2.0 flag: British Indian Ocean Territory
+1F1EE 1F1F6                                            ; fully-qualified     # 🇮🇶 E2.0 flag: Iraq
+1F1EE 1F1F7                                            ; fully-qualified     # 🇮🇷 E2.0 flag: Iran
+1F1EE 1F1F8                                            ; fully-qualified     # 🇮🇸 E2.0 flag: Iceland
+1F1EE 1F1F9                                            ; fully-qualified     # 🇮🇹 E0.6 flag: Italy
+1F1EF 1F1EA                                            ; fully-qualified     # 🇯🇪 E2.0 flag: Jersey
+1F1EF 1F1F2                                            ; fully-qualified     # 🇯🇲 E2.0 flag: Jamaica
+1F1EF 1F1F4                                            ; fully-qualified     # 🇯🇴 E2.0 flag: Jordan
+1F1EF 1F1F5                                            ; fully-qualified     # 🇯🇵 E0.6 flag: Japan
+1F1F0 1F1EA                                            ; fully-qualified     # 🇰🇪 E2.0 flag: Kenya
+1F1F0 1F1EC                                            ; fully-qualified     # 🇰🇬 E2.0 flag: Kyrgyzstan
+1F1F0 1F1ED                                            ; fully-qualified     # 🇰🇭 E2.0 flag: Cambodia
+1F1F0 1F1EE                                            ; fully-qualified     # 🇰🇮 E2.0 flag: Kiribati
+1F1F0 1F1F2                                            ; fully-qualified     # 🇰🇲 E2.0 flag: Comoros
+1F1F0 1F1F3                                            ; fully-qualified     # 🇰🇳 E2.0 flag: St. Kitts & Nevis
+1F1F0 1F1F5                                            ; fully-qualified     # 🇰🇵 E2.0 flag: North Korea
+1F1F0 1F1F7                                            ; fully-qualified     # 🇰🇷 E0.6 flag: South Korea
+1F1F0 1F1FC                                            ; fully-qualified     # 🇰🇼 E2.0 flag: Kuwait
+1F1F0 1F1FE                                            ; fully-qualified     # 🇰🇾 E2.0 flag: Cayman Islands
+1F1F0 1F1FF                                            ; fully-qualified     # 🇰🇿 E2.0 flag: Kazakhstan
+1F1F1 1F1E6                                            ; fully-qualified     # 🇱🇦 E2.0 flag: Laos
+1F1F1 1F1E7                                            ; fully-qualified     # 🇱🇧 E2.0 flag: Lebanon
+1F1F1 1F1E8                                            ; fully-qualified     # 🇱🇨 E2.0 flag: St. Lucia
+1F1F1 1F1EE                                            ; fully-qualified     # 🇱🇮 E2.0 flag: Liechtenstein
+1F1F1 1F1F0                                            ; fully-qualified     # 🇱🇰 E2.0 flag: Sri Lanka
+1F1F1 1F1F7                                            ; fully-qualified     # 🇱🇷 E2.0 flag: Liberia
+1F1F1 1F1F8                                            ; fully-qualified     # 🇱🇸 E2.0 flag: Lesotho
+1F1F1 1F1F9                                            ; fully-qualified     # 🇱🇹 E2.0 flag: Lithuania
+1F1F1 1F1FA                                            ; fully-qualified     # 🇱🇺 E2.0 flag: Luxembourg
+1F1F1 1F1FB                                            ; fully-qualified     # 🇱🇻 E2.0 flag: Latvia
+1F1F1 1F1FE                                            ; fully-qualified     # 🇱🇾 E2.0 flag: Libya
+1F1F2 1F1E6                                            ; fully-qualified     # 🇲🇦 E2.0 flag: Morocco
+1F1F2 1F1E8                                            ; fully-qualified     # 🇲🇨 E2.0 flag: Monaco
+1F1F2 1F1E9                                            ; fully-qualified     # 🇲🇩 E2.0 flag: Moldova
+1F1F2 1F1EA                                            ; fully-qualified     # 🇲🇪 E2.0 flag: Montenegro
+1F1F2 1F1EB                                            ; fully-qualified     # 🇲🇫 E2.0 flag: St. Martin
+1F1F2 1F1EC                                            ; fully-qualified     # 🇲🇬 E2.0 flag: Madagascar
+1F1F2 1F1ED                                            ; fully-qualified     # 🇲🇭 E2.0 flag: Marshall Islands
+1F1F2 1F1F0                                            ; fully-qualified     # 🇲🇰 E2.0 flag: North Macedonia
+1F1F2 1F1F1                                            ; fully-qualified     # 🇲🇱 E2.0 flag: Mali
+1F1F2 1F1F2                                            ; fully-qualified     # 🇲🇲 E2.0 flag: Myanmar (Burma)
+1F1F2 1F1F3                                            ; fully-qualified     # 🇲🇳 E2.0 flag: Mongolia
+1F1F2 1F1F4                                            ; fully-qualified     # 🇲🇴 E2.0 flag: Macao SAR China
+1F1F2 1F1F5                                            ; fully-qualified     # 🇲🇵 E2.0 flag: Northern Mariana Islands
+1F1F2 1F1F6                                            ; fully-qualified     # 🇲🇶 E2.0 flag: Martinique
+1F1F2 1F1F7                                            ; fully-qualified     # 🇲🇷 E2.0 flag: Mauritania
+1F1F2 1F1F8                                            ; fully-qualified     # 🇲🇸 E2.0 flag: Montserrat
+1F1F2 1F1F9                                            ; fully-qualified     # 🇲🇹 E2.0 flag: Malta
+1F1F2 1F1FA                                            ; fully-qualified     # 🇲🇺 E2.0 flag: Mauritius
+1F1F2 1F1FB                                            ; fully-qualified     # 🇲🇻 E2.0 flag: Maldives
+1F1F2 1F1FC                                            ; fully-qualified     # 🇲🇼 E2.0 flag: Malawi
+1F1F2 1F1FD                                            ; fully-qualified     # 🇲🇽 E2.0 flag: Mexico
+1F1F2 1F1FE                                            ; fully-qualified     # 🇲🇾 E2.0 flag: Malaysia
+1F1F2 1F1FF                                            ; fully-qualified     # 🇲🇿 E2.0 flag: Mozambique
+1F1F3 1F1E6                                            ; fully-qualified     # 🇳🇦 E2.0 flag: Namibia
+1F1F3 1F1E8                                            ; fully-qualified     # 🇳🇨 E2.0 flag: New Caledonia
+1F1F3 1F1EA                                            ; fully-qualified     # 🇳🇪 E2.0 flag: Niger
+1F1F3 1F1EB                                            ; fully-qualified     # 🇳🇫 E2.0 flag: Norfolk Island
+1F1F3 1F1EC                                            ; fully-qualified     # 🇳🇬 E2.0 flag: Nigeria
+1F1F3 1F1EE                                            ; fully-qualified     # 🇳🇮 E2.0 flag: Nicaragua
+1F1F3 1F1F1                                            ; fully-qualified     # 🇳🇱 E2.0 flag: Netherlands
+1F1F3 1F1F4                                            ; fully-qualified     # 🇳🇴 E2.0 flag: Norway
+1F1F3 1F1F5                                            ; fully-qualified     # 🇳🇵 E2.0 flag: Nepal
+1F1F3 1F1F7                                            ; fully-qualified     # 🇳🇷 E2.0 flag: Nauru
+1F1F3 1F1FA                                            ; fully-qualified     # 🇳🇺 E2.0 flag: Niue
+1F1F3 1F1FF                                            ; fully-qualified     # 🇳🇿 E2.0 flag: New Zealand
+1F1F4 1F1F2                                            ; fully-qualified     # 🇴🇲 E2.0 flag: Oman
+1F1F5 1F1E6                                            ; fully-qualified     # 🇵🇦 E2.0 flag: Panama
+1F1F5 1F1EA                                            ; fully-qualified     # 🇵🇪 E2.0 flag: Peru
+1F1F5 1F1EB                                            ; fully-qualified     # 🇵🇫 E2.0 flag: French Polynesia
+1F1F5 1F1EC                                            ; fully-qualified     # 🇵🇬 E2.0 flag: Papua New Guinea
+1F1F5 1F1ED                                            ; fully-qualified     # 🇵🇭 E2.0 flag: Philippines
+1F1F5 1F1F0                                            ; fully-qualified     # 🇵🇰 E2.0 flag: Pakistan
+1F1F5 1F1F1                                            ; fully-qualified     # 🇵🇱 E2.0 flag: Poland
+1F1F5 1F1F2                                            ; fully-qualified     # 🇵🇲 E2.0 flag: St. Pierre & Miquelon
+1F1F5 1F1F3                                            ; fully-qualified     # 🇵🇳 E2.0 flag: Pitcairn Islands
+1F1F5 1F1F7                                            ; fully-qualified     # 🇵🇷 E2.0 flag: Puerto Rico
+1F1F5 1F1F8                                            ; fully-qualified     # 🇵🇸 E2.0 flag: Palestinian Territories
+1F1F5 1F1F9                                            ; fully-qualified     # 🇵🇹 E2.0 flag: Portugal
+1F1F5 1F1FC                                            ; fully-qualified     # 🇵🇼 E2.0 flag: Palau
+1F1F5 1F1FE                                            ; fully-qualified     # 🇵🇾 E2.0 flag: Paraguay
+1F1F6 1F1E6                                            ; fully-qualified     # 🇶🇦 E2.0 flag: Qatar
+1F1F7 1F1EA                                            ; fully-qualified     # 🇷🇪 E2.0 flag: Réunion
+1F1F7 1F1F4                                            ; fully-qualified     # 🇷🇴 E2.0 flag: Romania
+1F1F7 1F1F8                                            ; fully-qualified     # 🇷🇸 E2.0 flag: Serbia
+1F1F7 1F1FA                                            ; fully-qualified     # 🇷🇺 E0.6 flag: Russia
+1F1F7 1F1FC                                            ; fully-qualified     # 🇷🇼 E2.0 flag: Rwanda
+1F1F8 1F1E6                                            ; fully-qualified     # 🇸🇦 E2.0 flag: Saudi Arabia
+1F1F8 1F1E7                                            ; fully-qualified     # 🇸🇧 E2.0 flag: Solomon Islands
+1F1F8 1F1E8                                            ; fully-qualified     # 🇸🇨 E2.0 flag: Seychelles
+1F1F8 1F1E9                                            ; fully-qualified     # 🇸🇩 E2.0 flag: Sudan
+1F1F8 1F1EA                                            ; fully-qualified     # 🇸🇪 E2.0 flag: Sweden
+1F1F8 1F1EC                                            ; fully-qualified     # 🇸🇬 E2.0 flag: Singapore
+1F1F8 1F1ED                                            ; fully-qualified     # 🇸🇭 E2.0 flag: St. Helena
+1F1F8 1F1EE                                            ; fully-qualified     # 🇸🇮 E2.0 flag: Slovenia
+1F1F8 1F1EF                                            ; fully-qualified     # 🇸🇯 E2.0 flag: Svalbard & Jan Mayen
+1F1F8 1F1F0                                            ; fully-qualified     # 🇸🇰 E2.0 flag: Slovakia
+1F1F8 1F1F1                                            ; fully-qualified     # 🇸🇱 E2.0 flag: Sierra Leone
+1F1F8 1F1F2                                            ; fully-qualified     # 🇸🇲 E2.0 flag: San Marino
+1F1F8 1F1F3                                            ; fully-qualified     # 🇸🇳 E2.0 flag: Senegal
+1F1F8 1F1F4                                            ; fully-qualified     # 🇸🇴 E2.0 flag: Somalia
+1F1F8 1F1F7                                            ; fully-qualified     # 🇸🇷 E2.0 flag: Suriname
+1F1F8 1F1F8                                            ; fully-qualified     # 🇸🇸 E2.0 flag: South Sudan
+1F1F8 1F1F9                                            ; fully-qualified     # 🇸🇹 E2.0 flag: São Tomé & Príncipe
+1F1F8 1F1FB                                            ; fully-qualified     # 🇸🇻 E2.0 flag: El Salvador
+1F1F8 1F1FD                                            ; fully-qualified     # 🇸🇽 E2.0 flag: Sint Maarten
+1F1F8 1F1FE                                            ; fully-qualified     # 🇸🇾 E2.0 flag: Syria
+1F1F8 1F1FF                                            ; fully-qualified     # 🇸🇿 E2.0 flag: Eswatini
+1F1F9 1F1E6                                            ; fully-qualified     # 🇹🇦 E2.0 flag: Tristan da Cunha
+1F1F9 1F1E8                                            ; fully-qualified     # 🇹🇨 E2.0 flag: Turks & Caicos Islands
+1F1F9 1F1E9                                            ; fully-qualified     # 🇹🇩 E2.0 flag: Chad
+1F1F9 1F1EB                                            ; fully-qualified     # 🇹🇫 E2.0 flag: French Southern Territories
+1F1F9 1F1EC                                            ; fully-qualified     # 🇹🇬 E2.0 flag: Togo
+1F1F9 1F1ED                                            ; fully-qualified     # 🇹🇭 E2.0 flag: Thailand
+1F1F9 1F1EF                                            ; fully-qualified     # 🇹🇯 E2.0 flag: Tajikistan
+1F1F9 1F1F0                                            ; fully-qualified     # 🇹🇰 E2.0 flag: Tokelau
+1F1F9 1F1F1                                            ; fully-qualified     # 🇹🇱 E2.0 flag: Timor-Leste
+1F1F9 1F1F2                                            ; fully-qualified     # 🇹🇲 E2.0 flag: Turkmenistan
+1F1F9 1F1F3                                            ; fully-qualified     # 🇹🇳 E2.0 flag: Tunisia
+1F1F9 1F1F4                                            ; fully-qualified     # 🇹🇴 E2.0 flag: Tonga
+1F1F9 1F1F7                                            ; fully-qualified     # 🇹🇷 E2.0 flag: Türkiye
+1F1F9 1F1F9                                            ; fully-qualified     # 🇹🇹 E2.0 flag: Trinidad & Tobago
+1F1F9 1F1FB                                            ; fully-qualified     # 🇹🇻 E2.0 flag: Tuvalu
+1F1F9 1F1FC                                            ; fully-qualified     # 🇹🇼 E2.0 flag: Taiwan
+1F1F9 1F1FF                                            ; fully-qualified     # 🇹🇿 E2.0 flag: Tanzania
+1F1FA 1F1E6                                            ; fully-qualified     # 🇺🇦 E2.0 flag: Ukraine
+1F1FA 1F1EC                                            ; fully-qualified     # 🇺🇬 E2.0 flag: Uganda
+1F1FA 1F1F2                                            ; fully-qualified     # 🇺🇲 E2.0 flag: U.S. Outlying Islands
+1F1FA 1F1F3                                            ; fully-qualified     # 🇺🇳 E4.0 flag: United Nations
+1F1FA 1F1F8                                            ; fully-qualified     # 🇺🇸 E0.6 flag: United States
+1F1FA 1F1FE                                            ; fully-qualified     # 🇺🇾 E2.0 flag: Uruguay
+1F1FA 1F1FF                                            ; fully-qualified     # 🇺🇿 E2.0 flag: Uzbekistan
+1F1FB 1F1E6                                            ; fully-qualified     # 🇻🇦 E2.0 flag: Vatican City
+1F1FB 1F1E8                                            ; fully-qualified     # 🇻🇨 E2.0 flag: St. Vincent & Grenadines
+1F1FB 1F1EA                                            ; fully-qualified     # 🇻🇪 E2.0 flag: Venezuela
+1F1FB 1F1EC                                            ; fully-qualified     # 🇻🇬 E2.0 flag: British Virgin Islands
+1F1FB 1F1EE                                            ; fully-qualified     # 🇻🇮 E2.0 flag: U.S. Virgin Islands
+1F1FB 1F1F3                                            ; fully-qualified     # 🇻🇳 E2.0 flag: Vietnam
+1F1FB 1F1FA                                            ; fully-qualified     # 🇻🇺 E2.0 flag: Vanuatu
+1F1FC 1F1EB                                            ; fully-qualified     # 🇼🇫 E2.0 flag: Wallis & Futuna
+1F1FC 1F1F8                                            ; fully-qualified     # 🇼🇸 E2.0 flag: Samoa
+1F1FD 1F1F0                                            ; fully-qualified     # 🇽🇰 E2.0 flag: Kosovo
+1F1FE 1F1EA                                            ; fully-qualified     # 🇾🇪 E2.0 flag: Yemen
+1F1FE 1F1F9                                            ; fully-qualified     # 🇾🇹 E2.0 flag: Mayotte
+1F1FF 1F1E6                                            ; fully-qualified     # 🇿🇦 E2.0 flag: South Africa
+1F1FF 1F1F2                                            ; fully-qualified     # 🇿🇲 E2.0 flag: Zambia
+1F1FF 1F1FC                                            ; fully-qualified     # 🇿🇼 E2.0 flag: Zimbabwe
+
+# subgroup: subdivision-flag
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F              ; fully-qualified     # 🏴󠁧󠁢󠁥󠁮󠁧󠁿 E5.0 flag: England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F              ; fully-qualified     # 🏴󠁧󠁢󠁳󠁣󠁴󠁿 E5.0 flag: Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F              ; fully-qualified     # 🏴󠁧󠁢󠁷󠁬󠁳󠁿 E5.0 flag: Wales
+
+# Flags subtotal:		275
+# Flags subtotal:		275	w/o modifiers
+
+# Status Counts
+# fully-qualified : 3773
+# minimally-qualified : 1009
+# unqualified : 243
+# component : 9
+
+#EOF

crates/unicode-width/tests/tests.rs

diff --git a/crates/unicode-width/tests/tests.rs b/crates/unicode-width/tests/tests.rs
new file mode 100644
index 0000000..2940df2
--- /dev/null
+++ b/crates/unicode-width/tests/tests.rs
@@ -0,0 +1,617 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::{
+    fs::File,
+    io::{BufRead, BufReader},
+};
+
+use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
+
+macro_rules! assert_width {
+    ($s:expr, $nocjk:expr, $cjk:expr $(,)?) => {{
+        assert_eq!($s.width(), $nocjk, "{:?} has the wrong width", $s);
+        #[cfg(feature = "cjk")]
+        assert_eq!($s.width_cjk(), $cjk, "{:?} has the wrong width (CJK)", $s);
+    }};
+}
+
+#[test]
+fn test_str() {
+    assert_width!("ｈｅｌｌｏ", 10, 10);
+    assert_width!("\0\0\0\x01\x01", 5, 5);
+    assert_width!("", 0, 0);
+    assert_width!("\u{2081}\u{2082}\u{2083}\u{2084}", 4, 8);
+}
+
+#[test]
+fn test_emoji() {
+    assert_width!("👩", 2, 2); // Woman
+    assert_width!("🔬", 2, 2); // Microscope
+    assert_width!("👩‍🔬", 2, 2); // Woman scientist
+}
+
+// From README
+#[test]
+fn test_bad_devanagari() {
+    assert_eq!("क".width(), 1); // Devanagari letter Ka
+    assert_eq!("ष".width(), 1); // Devanagari letter Ssa
+    assert_eq!("क्ष".width(), 2); // Ka + Virama + Ssa
+}
+
+#[test]
+fn test_char() {
+    assert_width!('ｈ', Some(2), Some(2));
+    assert_width!('\x00', None, None);
+    assert_width!('\x01', None, None);
+    assert_width!('\u{2081}', Some(1), Some(2));
+}
+
+#[test]
+fn test_char2() {
+    assert_width!('\x0A', None, None);
+    assert_width!('w', Some(1), Some(1));
+    assert_width!('ｈ', Some(2), Some(2));
+    assert_width!('\u{AD}', Some(0), Some(0));
+    assert_width!('\u{1160}', Some(0), Some(0));
+    assert_width!('\u{a1}', Some(1), Some(2));
+    assert_width!('\u{300}', Some(0), Some(0));
+}
+
+#[test]
+fn unicode_12() {
+    assert_width!('\u{1F971}', Some(2), Some(2));
+}
+
+#[test]
+fn test_default_ignorable() {
+    assert_width!('\u{1160}', Some(0), Some(0));
+    assert_width!('\u{3164}', Some(0), Some(0));
+    assert_width!('\u{FFA0}', Some(0), Some(0));
+    assert_width!('\u{E0000}', Some(0), Some(0));
+}
+
+#[test]
+fn test_ambiguous() {
+    assert_width!("\u{B7}", 1, 2);
+    assert_width!("\u{0387}", 1, 2);
+    assert_width!("\u{A8}", 1, 1);
+    assert_width!("\u{02C9}", 1, 1);
+}
+
+#[test]
+fn test_jamo() {
+    assert_width!('\u{1100}', Some(2), Some(2));
+    assert_width!('\u{A97C}', Some(2), Some(2));
+    // Special case: U+115F HANGUL CHOSEONG FILLER
+    assert_width!('\u{115F}', Some(2), Some(2));
+    assert_width!('\u{1160}', Some(0), Some(0));
+    assert_width!('\u{D7C6}', Some(0), Some(0));
+    assert_width!('\u{11A8}', Some(0), Some(0));
+    assert_width!('\u{D7FB}', Some(0), Some(0));
+}
+
+#[test]
+fn test_prepended_concatenation_marks() {
+    for c in [
+        '\u{0600}',
+        '\u{0601}',
+        '\u{0602}',
+        '\u{0603}',
+        '\u{0604}',
+        '\u{06DD}',
+        '\u{110BD}',
+        '\u{110CD}',
+    ] {
+        assert_width!(c, Some(1), Some(1));
+    }
+
+    for c in ['\u{0605}', '\u{070F}', '\u{0890}', '\u{0891}', '\u{08E2}'] {
+        assert_width!(c, Some(0), Some(0));
+    }
+}
+
+#[test]
+fn test_gcb_prepend() {
+    assert_width!("ൎഉ", 1, 1);
+    assert_width!("\u{11A89}", 0, 0);
+}
+
+#[test]
+fn test_interlinear_annotation_chars() {
+    assert_width!('\u{FFF9}', Some(1), Some(1));
+    assert_width!('\u{FFFA}', Some(1), Some(1));
+    assert_width!('\u{FFFB}', Some(1), Some(1));
+}
+
+#[test]
+fn test_hieroglyph_format_controls() {
+    assert_width!('\u{13430}', Some(1), Some(1));
+    assert_width!('\u{13436}', Some(1), Some(1));
+    assert_width!('\u{1343C}', Some(1), Some(1));
+}
+
+#[test]
+fn test_marks() {
+    // Nonspacing marks have 0 width
+    assert_width!('\u{0301}', Some(0), Some(0));
+    // Enclosing marks have 0 width
+    assert_width!('\u{20DD}', Some(0), Some(0));
+    // Some spacing marks have width 1
+    assert_width!('\u{09CB}', Some(1), Some(1));
+    // But others have width 0
+    assert_width!('\u{09BE}', Some(0), Some(0));
+}
+
+#[test]
+fn test_devanagari_caret() {
+    assert_width!('\u{A8FA}', Some(0), Some(0));
+}
+
+#[test]
+fn test_solidus_overlay() {
+    assert_width!("<\u{338}", 1, 2);
+    assert_width!("=\u{338}", 1, 2);
+    assert_width!(">\u{338}", 1, 2);
+    assert_width!("=\u{301}\u{338}", 1, 2);
+    assert_width!("=\u{338}\u{301}", 1, 2);
+    assert_width!("=\u{FE0F}\u{338}", 1, 2);
+    assert_width!("#\u{FE0F}\u{338}", 2, 2);
+    assert_width!("#\u{338}\u{FE0F}", 1, 1);
+
+    assert_width!("\u{06B8}\u{338}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{338}\u{FE0E}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{338}\u{FE0F}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{FE0E}\u{338}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{FE0F}\u{338}\u{0627}", 1, 1);
+
+    assert_width!("=\u{338}\u{0627}", 2, 3);
+}
+
+#[test]
+fn test_emoji_presentation() {
+    assert_width!('\u{0023}', Some(1), Some(1));
+    assert_width!('\u{FE0F}', Some(0), Some(0));
+    assert_width!("\u{0023}\u{FE0F}", 2, 2);
+    assert_width!("a\u{0023}\u{FE0F}a", 4, 4);
+    assert_width!("\u{0023}a\u{FE0F}", 2, 2);
+    assert_width!("a\u{FE0F}", 1, 1);
+    assert_width!("\u{0023}\u{0023}\u{FE0F}a", 4, 4);
+    assert_width!("\u{002A}\u{FE0F}", 2, 2);
+    assert_width!("\u{23F9}\u{FE0F}", 2, 2);
+    assert_width!("\u{24C2}\u{FE0F}", 2, 2);
+    assert_width!("\u{1F6F3}\u{FE0F}", 2, 2);
+    assert_width!("\u{1F700}\u{FE0F}", 1, 1);
+    assert_width!("\u{002A}\u{301}\u{FE0F}", 1, 1);
+    assert_width!("\u{002A}\u{200D}\u{FE0F}", 1, 1);
+    assert_width!("\u{002A}\u{FE0E}\u{FE0F}", 1, 1);
+}
+
+#[test]
+fn test_text_presentation() {
+    assert_width!('\u{FE0E}', Some(0), Some(0));
+    assert_width!('\u{2648}', Some(2), Some(2));
+    assert_width!("\u{2648}\u{FE0E}", 1, 2);
+    assert_width!("\u{1F21A}\u{FE0E}", 2, 2);
+    assert_width!("\u{0301}\u{FE0E}", 0, 0);
+    assert_width!("a\u{FE0E}", 1, 1);
+    assert_width!("𘀀\u{FE0E}", 2, 2);
+    assert_width!("\u{2648}\u{0301}\u{FE0E}", 2, 2);
+    assert_width!("\u{2648}\u{200D}\u{FE0E}", 2, 2);
+}
+
+#[test]
+fn test_control_line_break() {
+    assert_width!('\u{2028}', Some(1), Some(1));
+    assert_width!('\u{2029}', Some(1), Some(1));
+    assert_width!('\r', None, None);
+    assert_width!('\n', None, None);
+    assert_width!("\r", 1, 1);
+    assert_width!("\n", 1, 1);
+    assert_width!("\r\n", 1, 1);
+    assert_width!("\0", 1, 1);
+    assert_width!("1\t2\r\n3\u{85}4", 7, 7);
+    assert_width!("\r\u{FE0F}\n", 2, 2);
+    assert_width!("\r\u{200D}\n", 2, 2);
+}
+
+#[test]
+fn char_str_consistent() {
+    let mut s = String::with_capacity(4);
+    for c in '\0'..=char::MAX {
+        s.clear();
+        s.push(c);
+        assert_eq!(c.width().unwrap_or(1), s.width());
+        #[cfg(feature = "cjk")]
+        assert_eq!(c.width_cjk().unwrap_or(1), s.width_cjk());
+    }
+}
+
+#[test]
+fn test_lisu_tones() {
+    for c in '\u{A4F8}'..='\u{A4FD}' {
+        assert_width!(c, Some(1), Some(1));
+        assert_width!(String::from(c), 1, 1);
+    }
+    for c1 in '\u{A4F8}'..='\u{A4FD}' {
+        for c2 in '\u{A4F8}'..='\u{A4FD}' {
+            let mut s = String::with_capacity(8);
+            s.push(c1);
+            s.push(c2);
+            match (c1, c2) {
+                ('\u{A4F8}'..='\u{A4FB}', '\u{A4FC}'..='\u{A4FD}') => assert_width!(s, 1, 1),
+                _ => assert_width!(s, 2, 2),
+            }
+        }
+    }
+
+    assert_width!("ꓪꓹ", 2, 2);
+    assert_width!("ꓪꓹꓼ", 2, 2);
+    assert_width!("ꓪꓹ\u{FE0F}ꓼ", 2, 2);
+    assert_width!("ꓪꓹ\u{200D}ꓼ", 2, 2);
+    assert_width!("ꓪꓹꓼ\u{FE0F}", 2, 2);
+    assert_width!("ꓪꓹ\u{0301}ꓼ", 3, 3);
+    assert_width!("ꓪꓹꓹ", 3, 3);
+    assert_width!("ꓪꓼꓼ", 3, 3);
+}
+
+#[test]
+fn test_hebrew_alef_lamed() {
+    assert_width!("\u{05D0}", 1, 1);
+    assert_width!("\u{05DC}", 1, 1);
+    assert_width!("\u{05D0}\u{05DC}", 2, 2);
+    assert_width!("\u{05D0}\u{200D}\u{05DC}", 1, 1);
+    assert_width!(
+        "\u{05D0}\u{200D}\u{200D}\u{200D}\u{200D}\u{200D}\u{200D}\u{200D}\u{05DC}",
+        1,
+        1,
+    );
+    assert_width!("\u{05D0}\u{05D0}\u{200D}\u{05DC}", 2, 2);
+    assert_width!(
+        "\u{05D0}\u{05D0}\u{200D}\u{200D}\u{200D}\u{200D}\u{200D}\u{200D}\u{05DC}",
+        2,
+        2,
+    );
+    assert_width!("\u{05D0}\u{FE0F}\u{200D}\u{FE0F}\u{05DC}\u{FE0F}", 1, 1);
+    assert_width!("\u{05D0}\u{FE0E}\u{200D}\u{FE0E}\u{05DC}\u{FE0E}", 1, 1);
+}
+
+#[test]
+fn test_arabic_lam_alef() {
+    assert_width!("\u{0644}", 1, 1);
+    assert_width!("\u{06B8}", 1, 1);
+
+    assert_width!("\u{0623}", 1, 1);
+    assert_width!("\u{0627}", 1, 1);
+
+    assert_width!("\u{0644}\u{0623}", 1, 1);
+    assert_width!("\u{0644}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{0623}", 1, 1);
+    assert_width!("\u{06B8}\u{0627}", 1, 1);
+
+    assert_width!("\u{0644}\u{065F}\u{065E}\u{0623}", 1, 1);
+    assert_width!("\u{0644}\u{065F}\u{065E}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{065F}\u{065E}\u{0623}", 1, 1);
+    assert_width!("\u{06B8}\u{065F}\u{065E}\u{0627}", 1, 1);
+
+    assert_width!("\u{06B8}\u{FE0E}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{FE0F}\u{0627}", 1, 1);
+    assert_width!("\u{06B8}\u{17B5}\u{0627}", 1, 1);
+
+    assert_width!("\u{0644}\u{0644}\u{0623}", 2, 2);
+    assert_width!("\u{0644}\u{0644}\u{0627}", 2, 2);
+    assert_width!("\u{06B8}\u{06B8}\u{0623}", 2, 2);
+    assert_width!("\u{06B8}\u{06B8}\u{0627}", 2, 2);
+
+    assert_width!("\u{0644}\u{200D}\u{0623}", 2, 2);
+    assert_width!("\u{0644}\u{200D}\u{0627}", 2, 2);
+    assert_width!("\u{06B8}\u{200D}\u{0623}", 2, 2);
+    assert_width!("\u{06B8}\u{200D}\u{0627}", 2, 2);
+
+    assert_width!("\u{0644}\u{1E94B}\u{0623}", 3, 3);
+    assert_width!("\u{0644}\u{1E94B}\u{0627}", 3, 3);
+    assert_width!("\u{06B8}\u{1E94B}\u{0623}", 3, 3);
+    assert_width!("\u{06B8}\u{1E94B}\u{0627}", 3, 3);
+}
+
+#[test]
+fn test_buginese_a_i_ya() {
+    assert_width!("\u{1A15}", 1, 1);
+    assert_width!("\u{1A17}", 0, 0);
+    assert_width!("\u{1A10}", 1, 1);
+
+    assert_width!("\u{1A15}\u{1A17}\u{200D}\u{1A10}", 1, 1);
+    assert_width!(
+        "\u{1A15}\u{1A17}\u{200D}\u{200D}\u{200D}\u{200D}\u{1A10}",
+        1,
+        1,
+    );
+    assert_width!("\u{1A15}\u{1A17}\u{200D}\u{338}", 1, 1);
+    assert_width!("\u{1A15}\u{FE0E}\u{1A17}\u{200D}", 1, 1);
+    assert_width!("\u{1A15}\u{FE0F}\u{1A17}\u{200D}", 1, 1);
+    assert_width!("\u{1A15}\u{1A17}\u{FE0E}\u{200D}", 1, 1);
+    assert_width!("\u{1A15}\u{1A17}\u{FE0F}\u{200D}", 1, 1);
+    assert_width!("\u{1A15}\u{1A17}\u{200D}\u{FE0E}", 1, 1);
+    assert_width!("\u{1A15}\u{1A17}\u{200D}\u{FE0F}", 1, 1);
+    assert_width!(
+        "\u{1A15}\u{17B5}\u{200D}\u{FE0E}\u{1A17}\u{200D}\u{FE0F}\u{200D}\u{FE0F}",
+        1,
+        1,
+    );
+
+    assert_width!("\u{1A15}\u{1A15}\u{1A17}\u{200D}\u{1A10}", 2, 2);
+    assert_width!(
+        "\u{1A15}\u{1A15}\u{1A17}\u{200D}\u{200D}\u{200D}\u{200D}\u{1A10}",
+        2,
+        2,
+    );
+
+    assert_width!("\u{1A15}\u{1A17}\u{1A10}", 2, 2);
+    assert_width!("\u{1A15}\u{200D}\u{1A10}", 2, 2);
+    assert_width!("\u{1A15}\u{1A10}", 2, 2);
+    assert_width!("\u{1A15}\u{1A17}\u{1A17}\u{200D}\u{1A10}", 2, 2);
+    assert_width!("\u{1A15}\u{1A17}\u{338}\u{200D}\u{1A10}", 2, 2);
+}
+
+#[test]
+fn test_tifinagh_biconsonants() {
+    assert_width!("\u{2D4F}", 1, 1);
+    assert_width!("\u{2D3E}", 1, 1);
+    assert_width!("\u{2D7F}", 1, 1);
+
+    assert_width!("\u{2D4F}\u{200D}\u{2D3E}", 1, 1);
+    assert_width!("\u{2D4F}\u{2D7F}\u{2D3E}", 1, 1);
+    assert_width!("\u{2D4F}\u{200D}\u{2D3E}", 1, 1);
+    assert_width!(
+        "\u{2D4F}\u{FE0F}\u{200D}\u{2D7F}\u{FE0E}\u{200D}\u{17B5}\u{2D3E}",
+        1,
+        1,
+    );
+
+    assert_width!("\u{2D4F}\u{301}\u{2D7F}\u{2D3E}", 3, 3);
+    assert_width!("\u{2D4F}\u{301}\u{200D}\u{2D3E}", 2, 2);
+    assert_width!("\u{2D4F}\u{2D3E}", 2, 2);
+    assert_width!("\u{2D4F}\u{2D7F}\u{2D7F}\u{2D3E}", 4, 4);
+    assert_width!("\u{2D7F}\u{2D3E}", 2, 2);
+    assert_width!("\u{2D7F}\u{2D7F}\u{2D66}", 3, 3);
+    assert_width!("\u{2D66}\u{2D7F}\u{2D3E}", 3, 3);
+}
+
+#[test]
+fn test_old_turkic_ligature() {
+    assert_width!("\u{10C32}", 1, 1);
+    assert_width!("\u{10C03}", 1, 1);
+    assert_width!("\u{10C32}\u{10C03}", 2, 2);
+
+    assert_width!("\u{10C32}\u{200D}\u{10C03}", 1, 1);
+    assert_width!("\u{10C32}\u{FE0F}\u{200D}\u{FE0E}\u{10C03}", 1, 1);
+
+    assert_width!("\u{10C32}\u{2D7F}\u{10C03}", 3, 3);
+    assert_width!("\u{10C32}\u{0301}\u{200D}\u{10C03}", 2, 2);
+    assert_width!("\u{10C03}\u{200D}\u{10C32}", 2, 2);
+    assert_width!("\u{200D}\u{10C32}", 1, 1);
+}
+
+#[test]
+fn test_khmer_coeng() {
+    assert_width!("ល", 1, 1);
+    assert_width!("ង", 1, 1);
+    assert_width!("លង", 2, 2);
+    assert_width!("ល្ង", 1, 1);
+
+    for c in '\0'..=char::MAX {
+        if matches!(
+            c,
+            '\u{1780}'..='\u{1782}' | '\u{1784}'..='\u{1787}'
+            | '\u{1789}'..='\u{178C}'  | '\u{178E}'..='\u{1793}'
+            | '\u{1795}'..='\u{1798}' | '\u{179B}'..='\u{179D}'
+            | '\u{17A0}' | '\u{17A2}'  | '\u{17A7}'
+            | '\u{17AB}'..='\u{17AC}' | '\u{17AF}'
+        ) {
+            assert_width!(format!("\u{17D2}{c}"), 0, 0);
+            assert_width!(format!("\u{17D2}\u{200D}\u{200D}{c}"), 0, 0);
+        } else {
+            assert_width!(
+                format!("\u{17D2}{c}"),
+                c.width().unwrap_or(1),
+                c.width_cjk().unwrap_or(1)
+            );
+        }
+    }
+}
+
+#[test]
+fn test_khmer_qaa() {
+    assert_width!("\u{17A4}", 2, 2);
+    assert_width!("\u{17A2}\u{17A6}", 2, 2);
+}
+
+#[test]
+fn test_khmer_sign_beyyal() {
+    assert_width!("\u{17D8}", 3, 3);
+    assert_width!("\u{17D4}\u{179B}\u{17D4}", 3, 3);
+}
+
+#[test]
+fn test_emoji_modifier() {
+    assert_width!("\u{1F46A}", 2, 2);
+    assert_width!("\u{1F3FB}", 2, 2);
+    assert_width!("\u{1F46A}\u{1F3FB}", 2, 2);
+    assert_width!("\u{1F46A}\u{200D}\u{200D}\u{1F3FB}", 4, 4);
+}
+
+#[test]
+fn test_emoji_zwj() {
+    assert_width!("🧑‍🤝‍🧑", 2, 2);
+
+    assert_width!("🇮🇱🕊️🇵🇸", 6, 6);
+    assert_width!("🇵🇸\u{200D}🕊️\u{200D}🇮🇱", 2, 2);
+    assert_width!("🇮🇱\u{200D}🕊️\u{200D}\u{200D}🇵🇸", 4, 4);
+    assert_width!("🇵🇸\u{200D}\u{200D}🕊️\u{200D}🇮🇱", 4, 4);
+
+    assert_width!("🇦🇦\u{200D}🇦🇦", 2, 2);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦", 3, 3);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦", 3, 3);
+
+    assert_width!("🇦🇦\u{200D}\u{200D}🇦🇦", 4, 4);
+    assert_width!("🇦🇦\u{200D}🇦\u{200D}🇦🇦", 5, 5);
+    assert_width!("🇦🇦\u{200D}🇦🇦\u{200D}🇦🇦", 2, 2);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦\u{200D}🇦🇦", 5, 5);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦🇦\u{200D}🇦🇦", 4, 4);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦🇦🇦\u{200D}🇦🇦", 7, 7);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦🇦🇦🇦\u{200D}🇦🇦", 6, 6);
+    assert_width!("🇦🇦\u{200D}🇦🇦🇦🇦🇦🇦🇦\u{200D}🇦🇦", 9, 9);
+
+    assert_width!("🏴󠁧󠁢󠁷󠁬󠁳󠁿", 2, 2);
+    assert_width!("🏴󠁧󠁢󠁥󠁮󠁧󠁿\u{200D}🏴󠁧󠁢󠁳󠁣󠁴󠁿\u{200D}🏴󠁧󠁢󠁷󠁬󠁳󠁿", 2, 2);
+
+    assert_width!("🇦👪\u{200D}🏿", 3, 3);
+    assert_width!("🇦🏿\u{200D}🏿", 3, 3);
+
+    assert_width!('🏴', Some(2), Some(2));
+    assert_width!("\u{E0031}", 0, 0);
+    assert_width!("\u{E0063}", 0, 0);
+    assert_width!("\u{E007F}", 0, 0);
+    assert_width!("🏴\u{200D}Ⓜ️", 2, 2);
+    assert_width!("🏴\u{E0031}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E0063}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E007F}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E0031}\u{E007F}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E0031}\u{E0031}\u{E007F}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E0031}\u{E0031}\u{E0031}\u{E007F}\u{200D}Ⓜ️", 2, 2);
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0031}\u{E007F}\u{200D}Ⓜ️",
+        4,
+        4,
+    );
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0031}\u{E0031}\u{E0031}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        4,
+        4,
+    );
+    assert_width!("🏴\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️", 4, 4);
+    assert_width!("🏴\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️", 2, 2);
+    assert_width!(
+        "🏴\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        2,
+        2,
+    );
+    assert_width!(
+        "🏴\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E0063}\u{E007F}\u{200D}Ⓜ️",
+        4,
+        4,
+    );
+
+    assert_width!("a\u{200D}🏴󠁧󠁢󠁷󠁬󠁳󠁿", 3, 3);
+    assert_width!("👪\u{200D}a", 3, 3);
+    assert_width!("a\u{200D}a", 2, 2);
+
+    assert_width!("*\u{FE0F}", 2, 2);
+    assert_width!("*\u{20E3}", 1, 1);
+    assert_width!("*️⃣", 2, 2);
+    assert_width!("*\u{FE0F}", 2, 2);
+    assert_width!("*\u{20E3}\u{FE0F}", 1, 1);
+    assert_width!("*️⃣\u{200D}👪", 2, 2);
+    assert_width!("*\u{20E3}\u{FE0F}\u{200D}👪", 3, 3);
+    assert_width!("*\u{20E3}\u{200D}👪", 3, 3);
+    assert_width!("*\u{FE0F}\u{200D}👪", 2, 2);
+    assert_width!("*️⃣\u{20E3}\u{200D}👪", 4, 4);
+    assert_width!("*\u{FE0F}\u{FE0F}\u{20E3}\u{200D}👪", 4, 4);
+
+    assert_width!(
+        "🇦👪\u{200D}🏿\u{200D}👪🏻\u{200D}Ⓜ️\u{200D}*\u{FE0F}\u{200D}🇦🇦\u{200D}🏴󠁧󠁢󠁷󠁬󠁳󠁿\u{200D}👪",
+        3,
+        3,
+    );
+}
+
+#[test]
+fn emoji_test_file() {
+    let norm_file = BufReader::new(
+        File::open("tests/emoji-test.txt")
+            .expect("run `unicode.py` first to download `emoji-test.txt`"),
+    );
+    for line in norm_file.lines() {
+        let line = line.unwrap();
+        if line.is_empty() || line.starts_with('#') {
+            continue;
+        }
+
+        let (cps, status) = line.split_once(';').unwrap();
+        let status = status.trim();
+        if status.starts_with("fully-qualified") || status.starts_with("component") {
+            let emoji: String = cps
+                .trim()
+                .split(' ')
+                .map(|s| char::try_from(u32::from_str_radix(s, 16).unwrap()).unwrap())
+                .collect();
+            dbg!(&emoji);
+            assert_width!(emoji, 2, 2);
+        }
+    }
+}
+
+// Test traits are unsealed
+
+#[cfg(feature = "cjk")]
+#[allow(dead_code)]
+struct Foo;
+
+#[cfg(feature = "cjk")]
+impl UnicodeWidthChar for Foo {
+    fn width(self) -> Option<usize> {
+        Some(0)
+    }
+
+    fn width_cjk(self) -> Option<usize> {
+        Some(0)
+    }
+}
+
+#[cfg(feature = "cjk")]
+impl UnicodeWidthStr for Foo {
+    fn width(&self) -> usize {
+        0
+    }
+
+    fn width_cjk(&self) -> usize {
+        0
+    }
+}

crates/uuid/.android-checksum.json

diff --git a/crates/uuid/.android-checksum.json b/crates/uuid/.android-checksum.json
index 6be07f6..2110fe1 100644
--- a/crates/uuid/.android-checksum.json
+++ b/crates/uuid/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"c80812a1ec6a2a6a3f9957359095bf9c1e8cbcdae4a531775a783dd6266ed46d","Android.bp":"2bbcb0aaf870704ac5aecc4279bbed1d684ffa6747cf84a77daca1029e1a2338","Cargo.toml":"d735a31bccbca378268ebb919e4a742f885ea62643b5349a31d61ca83cf74a81","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"08bc387e24ed88cdda3af9eb97d401d69c31dc98049e63a9c3dfd763dc45a29d","METADATA":"8e9891c6939ba8ab0c456a22f5eefd4accc485ceb747b34d3631bd234ed84a7a","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"8f1b5b3db24ce08b2b90aa46eca37567be46d499a86a6ed5a4e108bae714b58c","TEST_MAPPING":"e93962d7a70966b064fcb2f8429feb4f97dca1cfaeb526f4ec56a44305c6de69","cargo_embargo.json":"3bf1a98721509650cb9f52cad8d9432fc466b69a9556fc24726caee458caaf0b","rules.mk":"c6a05070a68ecf74533aa73ac4cef3a8ada1f5ef3de138d4c98a79c48f863482","src/builder.rs":"bbfcd69aad7e4eaabe0e987febd3f6c5f30ff58d76701f8c890e42f641682546","src/error.rs":"a074f13c8ebaef5c563e961fae295134bf75386bfc44efbea5fefbbef7f44f24","src/external.rs":"d5b9021ea1db870ed29525e3290fae1d6ef89ab615d54548830c6632a1353d4c","src/external/arbitrary_support.rs":"f508e7015c8c14c8304a133eb275b60fb946a194c7e431642fe2fa0959a9990c","src/external/borsh_support.rs":"9b7f8438d29dad79dc79efd5db412e8a37e29d567ae21c76f4f3f37febabcd07","src/external/serde_support.rs":"15e735ff56d72b5a8bb846f429cf463361ba1e50d83118df27222ea01a8b0cb3","src/external/slog_support.rs":"9f7009bf65d8ca6961ad9b170c33a5eb787820155286a070324ff0d5fd3c09a2","src/fmt.rs":"80c5fa5eec2e2afcc4d8bfb045b63b3c796ac72fb0b7646d297cf35aa9eabd38","src/lib.rs":"2ebd885a33317ff2ca93be509b96816000799cc6bd5af9a3cf07f60270a341bc","src/macros.rs":"59262f55948d70b7ca0dcee15c990b6a3ad4fca47705d36ba1e90f88e53e8839","src/md5.rs":"5612c79b17b868220029baf52a87bff31530e607ac2522afdf8677eecb28e780","src/parser.rs":"a0d125589f80f3e30bca52897b58c2fce10473eecca1f2b5253ccc024f19162b","src/rng.rs":"158c5d6336c10007f7fa8ede586e7b2fccc9e28186109c8ca060f6e0086c5bb2","src/sha1.rs":"173b844e6a3975270ea36d235f5b7e406e9612ba95833d811b3602f5107589f0","src/timestamp.rs":"0e7db00a98d997bf8b3caa2ad3d97a892cecfcf56d5f19f34d3a392997292431","src/v1.rs":"e52a27d89e344036ffe4408a7b5b5fb326d6fb18ae06704a090c6399b7eb3611","src/v3.rs":"7af107a0c0339cae9b50b8b084c5339caf850fe0cd60bc1b129577ee2f140e67","src/v4.rs":"20ae5609a8f891dca1bd8fd99421121dfe452d9ce7f51d635a6d14b4a09889b5","src/v5.rs":"2e435575aa2f5f8971709ffac815407e5f245fe24f64a4666881549a516e30d8","src/v6.rs":"b0f8cf1bec6df06aa7c3d06a465c1a795f02a0bb41328b9509a4662c7b4cf89d","src/v7.rs":"13eb4cc951ac6359aa0d751172cc3f2155dc76a9c89e65d6d5a3f3817d0b2b7c","src/v8.rs":"25b49a2e5e947cffad78ac4b6da187b75469193814eb340eb8a1a9c644021106"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"dea2b2b850b17d4c3c2bcac38bde6c8c53a18291e647d02a91a331f31ec288e8","Android.bp":"737eccb7bd5d9b2d254e30efef3965fd6c8a5697565633e22653170ad316b146","Cargo.toml":"705581536ed46491230879ed499840673b339b20383b8755fe26874e2ffb6625","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"08bc387e24ed88cdda3af9eb97d401d69c31dc98049e63a9c3dfd763dc45a29d","METADATA":"35cf8ca93bdc132c2acc772c50768a274b9ec7d24094a6c4b0a8646bb2e59830","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"70396bc90fbfe2aad4750ba42c49de7e300741052693364ec602845d3968531f","TEST_MAPPING":"e93962d7a70966b064fcb2f8429feb4f97dca1cfaeb526f4ec56a44305c6de69","cargo_embargo.json":"3bf1a98721509650cb9f52cad8d9432fc466b69a9556fc24726caee458caaf0b","rules.mk":"c6a05070a68ecf74533aa73ac4cef3a8ada1f5ef3de138d4c98a79c48f863482","src/builder.rs":"be1a3145dec9b84852e0308443e09d5961a6f7278a574336a42a91babf83018d","src/error.rs":"7d2913559d5179ff0ed4430abe0fea081cd6033c1c89f366c6fe91984f1151cd","src/external.rs":"d5b9021ea1db870ed29525e3290fae1d6ef89ab615d54548830c6632a1353d4c","src/external/arbitrary_support.rs":"e012688d57194c3eb03393fc4c768bba0afd57667c3525f7b36027bf7ab546cd","src/external/borsh_support.rs":"9b7f8438d29dad79dc79efd5db412e8a37e29d567ae21c76f4f3f37febabcd07","src/external/serde_support.rs":"86e708f535cdc16a8ece6f6bdf579c3beee453a7346077263b8636ee1d1d3e50","src/external/slog_support.rs":"beaa766f1e536a65bbe983192feefc3db8510058d81bf098a8265bc33100180b","src/fmt.rs":"80c5fa5eec2e2afcc4d8bfb045b63b3c796ac72fb0b7646d297cf35aa9eabd38","src/lib.rs":"ab6849d33bc1f1f1eceb8b3a611e194f7c25b8129c4ff68f92b6940d8e1fb04b","src/macros.rs":"59262f55948d70b7ca0dcee15c990b6a3ad4fca47705d36ba1e90f88e53e8839","src/md5.rs":"5612c79b17b868220029baf52a87bff31530e607ac2522afdf8677eecb28e780","src/non_nil.rs":"b09342ba0f2a92123a0b3578132e54f5968d7ab40f877eadaf6274847de27074","src/parser.rs":"a0d125589f80f3e30bca52897b58c2fce10473eecca1f2b5253ccc024f19162b","src/rng.rs":"158c5d6336c10007f7fa8ede586e7b2fccc9e28186109c8ca060f6e0086c5bb2","src/sha1.rs":"173b844e6a3975270ea36d235f5b7e406e9612ba95833d811b3602f5107589f0","src/timestamp.rs":"170a2a94271cd6ec9a672c7baa1c7a0adf09e1de06acd80c3bc06cf35600b20b","src/v1.rs":"e52a27d89e344036ffe4408a7b5b5fb326d6fb18ae06704a090c6399b7eb3611","src/v3.rs":"7af107a0c0339cae9b50b8b084c5339caf850fe0cd60bc1b129577ee2f140e67","src/v4.rs":"20ae5609a8f891dca1bd8fd99421121dfe452d9ce7f51d635a6d14b4a09889b5","src/v5.rs":"2e435575aa2f5f8971709ffac815407e5f245fe24f64a4666881549a516e30d8","src/v6.rs":"b0f8cf1bec6df06aa7c3d06a465c1a795f02a0bb41328b9509a4662c7b4cf89d","src/v7.rs":"6aa389648dd187a86766e420d7b055c79ed1437353590c2440fe04f713a7b650","src/v8.rs":"25b49a2e5e947cffad78ac4b6da187b75469193814eb340eb8a1a9c644021106"}}
\ No newline at end of file

crates/uuid/.cargo-checksum.json

diff --git a/crates/uuid/.cargo-checksum.json b/crates/uuid/.cargo-checksum.json
index 0cad08a..deb142e 100644
--- a/crates/uuid/.cargo-checksum.json
+++ b/crates/uuid/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3e129d39ba3ad1910e2492c75c2596faa848683660bcb0d443bd7b7a1a5ef726","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"383cbe6804afa72e448883bd0419087e2afd1e0ea7c5d66fdedfb228d1dc8e8a","src/builder.rs":"2f46ba8b4f9b333b0edc926a05c2a9a2d5bf3629cdad05a058532005e71ecc29","src/error.rs":"6a402cde971f7d186be3a184953bc6c89e8b8039fa95cd351e1e158fbe7378cb","src/external.rs":"a0640bdb98de1c24fcc9851a438a5abe6f7e3acb195885c817a64fac25521b9d","src/external/arbitrary_support.rs":"7e7fbcc4b8af5878b71858a1f5fa31e85d84fc2fd159614f8d450ba1fe06ac28","src/external/borsh_support.rs":"b49d82a59653445ba26db46a1515294b1ab480c0671dbe5499dfd1fb02588b3b","src/external/serde_support.rs":"b818f54e784143677146666a6737597bf95523d0de73fedc90b22d9c949b0997","src/external/slog_support.rs":"4fe1cc136b1eb5e27d8b308801bcd72872c129fd20ced1f2415af6760a83751b","src/fmt.rs":"3bf88d68d838bef81380a1e669a86eee46f24a8113effbd7b4e92da714ec97c7","src/lib.rs":"e005d6b2ffaa8e0e253a1e565878653bfb642dd4aa5d01cab5c2b368ca591880","src/macros.rs":"dff4a00bcbc37912d38d58edc3edfb8552ba8bb936403b8b33fe7dc3c2041908","src/md5.rs":"316d65b760ffa58beb6aa678be24359eb21a744e9e143bc99c11fe1907659245","src/parser.rs":"838e4a5af613a1d9b9dd6ca4b3c13a42e65fdea35fc02c93c34a416387dbdb7c","src/rng.rs":"d9cdd08ca225f28c103276c985db0540bb8db877a4bcb5348cb4a2648b29883e","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"b53c7ec88c4be2d73100d1300cfb684b3d0d93173f93e9fdcde54b75d463f661","src/v1.rs":"9c8254742e58a1d75b8374260108516fc914e2641f83e3a8ada75f05a62a62d1","src/v3.rs":"287860f5376e35d5292959d65948bdb0bbdb4605e3d2e463742c5400075bbe76","src/v4.rs":"c2f2844791cdb2c9e0c90bf7d9d155b96572f1f77aa9586104ddb77d44a5aeea","src/v5.rs":"70799f332c043b3d3ddf4aee791aa448296a5e05122be434945076f9cb29517c","src/v6.rs":"7bd0a52aa316e145ad55b99b0ad46ad3234b0936ab61a4935300f053f2030a56","src/v7.rs":"3ec7d26bbb457347f4c282f3feb90f123d18e62f81753b81196c995034c28256","src/v8.rs":"15a4c3b81afcca4ec406192f2099fac0ad43d734e12672b02a693ddcc38b6684"},"package":"b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4"}
\ No newline at end of file
+{"files":{"Cargo.toml":"286a84f2f8c07e743b2d4af0055f1723763a4175c1dc8c4d60e717f3662e7738","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"151c7172b60dab055ec853b7534a2b1f5becafd70c3478d558fc578dd98ed317","src/builder.rs":"855c402ff7d6ac920ddc89fd75d365818187529970fdea17e3af32f255ea8b4e","src/error.rs":"2d1c71fe562fe695cd690e6e2371f998424472bfb8c5e31bc36d953d5523040b","src/external.rs":"a0640bdb98de1c24fcc9851a438a5abe6f7e3acb195885c817a64fac25521b9d","src/external/arbitrary_support.rs":"a7e0f0686c7c79e3af797f6d3f1976bee13fa9c3d8cb40f58bd10ff6ebdadae3","src/external/borsh_support.rs":"b49d82a59653445ba26db46a1515294b1ab480c0671dbe5499dfd1fb02588b3b","src/external/serde_support.rs":"4275abf9b543e5a1ebc20823208d0a983e5e34131da4d41648b4685f4a81df63","src/external/slog_support.rs":"d9bab6f91a80c773e77326ce40d84976beb2b2946ab708de21f25afe5b9ece13","src/fmt.rs":"3bf88d68d838bef81380a1e669a86eee46f24a8113effbd7b4e92da714ec97c7","src/lib.rs":"3166822eef37e2a67fc9eccf2639bda04d83350ff0a40181e1dfe8a932d10624","src/macros.rs":"dff4a00bcbc37912d38d58edc3edfb8552ba8bb936403b8b33fe7dc3c2041908","src/md5.rs":"316d65b760ffa58beb6aa678be24359eb21a744e9e143bc99c11fe1907659245","src/non_nil.rs":"a1cfe91f63cad13ef4d0a9e8e4c9aad55b8b29ec67c6c3897e8093d669d890fe","src/parser.rs":"838e4a5af613a1d9b9dd6ca4b3c13a42e65fdea35fc02c93c34a416387dbdb7c","src/rng.rs":"d9cdd08ca225f28c103276c985db0540bb8db877a4bcb5348cb4a2648b29883e","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"ad68e5b71953fb9df544fad858f9bde878a7d483f6a273523d8ee073511078d5","src/v1.rs":"9c8254742e58a1d75b8374260108516fc914e2641f83e3a8ada75f05a62a62d1","src/v3.rs":"287860f5376e35d5292959d65948bdb0bbdb4605e3d2e463742c5400075bbe76","src/v4.rs":"c2f2844791cdb2c9e0c90bf7d9d155b96572f1f77aa9586104ddb77d44a5aeea","src/v5.rs":"70799f332c043b3d3ddf4aee791aa448296a5e05122be434945076f9cb29517c","src/v6.rs":"7bd0a52aa316e145ad55b99b0ad46ad3234b0936ab61a4935300f053f2030a56","src/v7.rs":"bc737c502247c83189f3627c7f1612e0af2638c5919d47aeffee3647b9ec63a0","src/v8.rs":"15a4c3b81afcca4ec406192f2099fac0ad43d734e12672b02a693ddcc38b6684"},"package":"744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"}
\ No newline at end of file

crates/uuid/Android.bp

diff --git a/crates/uuid/Android.bp b/crates/uuid/Android.bp
index 7642834..867c937 100644
--- a/crates/uuid/Android.bp
+++ b/crates/uuid/Android.bp
@@ -18,7 +18,7 @@
     host_supported: true,
     crate_name: "uuid",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.11.1",
+    cargo_pkg_version: "1.12.0",
     crate_root: "src/lib.rs",
     edition: "2018",
     features: [
@@ -47,7 +47,7 @@
     host_supported: true,
     crate_name: "uuid",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.11.1",
+    cargo_pkg_version: "1.12.0",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -81,7 +81,7 @@
     name: "libuuid_nostd",
     crate_name: "uuid",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.11.1",
+    cargo_pkg_version: "1.12.0",
     crate_root: "src/lib.rs",
     edition: "2018",
     apex_available: [

crates/uuid/Cargo.toml

diff --git a/crates/uuid/Cargo.toml b/crates/uuid/Cargo.toml
index 0065894..0882340 100644
--- a/crates/uuid/Cargo.toml
+++ b/crates/uuid/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2018"
 rust-version = "1.63.0"
 name = "uuid"
-version = "1.11.1"
+version = "1.12.0"
 authors = [
     "Ashley Mannix<ashleymannix@live.com.au>",
     "Dylan DPC<dylan.dpc@gmail.com>",
@@ -141,7 +141,7 @@
 optional = true
 
 [dependencies.uuid-macro-internal]
-version = "1.11.1"
+version = "1.12.0"
 optional = true
 
 [dependencies.zerocopy]

crates/uuid/METADATA

diff --git a/crates/uuid/METADATA b/crates/uuid/METADATA
index 80f6f51..754e4f6 100644
--- a/crates/uuid/METADATA
+++ b/crates/uuid/METADATA
@@ -1,17 +1,17 @@
 name: "uuid"
 description: "A library to generate and parse UUIDs."
 third_party {
-  version: "1.11.1"
+  version: "1.12.0"
   license_type: NOTICE
   last_upgrade_date {
     year: 2025
     month: 1
-    day: 13
+    day: 14
   }
   homepage: "https://crates.io/crates/uuid"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/uuid/uuid-1.11.1.crate"
-    version: "1.11.1"
+    value: "https://static.crates.io/crates/uuid/uuid-1.12.0.crate"
+    version: "1.12.0"
   }
 }

crates/uuid/README.md

diff --git a/crates/uuid/README.md b/crates/uuid/README.md
index bc85103..f76e2fd 100644
--- a/crates/uuid/README.md
+++ b/crates/uuid/README.md
@@ -28,7 +28,7 @@
 
 ```toml
 [dependencies.uuid]
-version = "1.11.1"
+version = "1.12.0"
 features = [
     "v4",                # Lets you generate random UUIDs
     "fast-rng",          # Use a faster (but still sufficiently random) RNG
@@ -65,11 +65,11 @@
 If you'd like to parse UUIDs _really_ fast, check out the [`uuid-simd`](https://github.com/nugine/uuid-simd)
 library.
 
-For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.11.1/uuid).
+For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.12.0/uuid).
 
 ## References
 
-* [`uuid` library docs](https://docs.rs/uuid/1.11.1/uuid).
+* [`uuid` library docs](https://docs.rs/uuid/1.12.0/uuid).
 * [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier).
 * [RFC 9562: Universally Unique IDentifiers (UUID)](https://www.ietf.org/rfc/rfc9562.html).
 

crates/uuid/src/builder.rs

diff --git a/crates/uuid/src/builder.rs b/crates/uuid/src/builder.rs
index f1b6811..6a07a30 100644
--- a/crates/uuid/src/builder.rs
+++ b/crates/uuid/src/builder.rs
@@ -909,7 +909,7 @@
 #[doc(hidden)]
 impl Builder {
     #[deprecated(
-        since = "1.11.1",
+        since = "1.10.0",
         note = "use `Builder::from_gregorian_timestamp(ticks, counter, node_id)`"
     )]
     pub const fn from_rfc4122_timestamp(ticks: u64, counter: u16, node_id: &[u8; 6]) -> Self {
@@ -917,7 +917,7 @@
     }
 
     #[deprecated(
-        since = "1.11.1",
+        since = "1.10.0",
         note = "use `Builder::from_sorted_gregorian_timestamp(ticks, counter, node_id)`"
     )]
     pub const fn from_sorted_rfc4122_timestamp(

crates/uuid/src/error.rs

diff --git a/crates/uuid/src/error.rs b/crates/uuid/src/error.rs
index 30e0175..7a65c2d 100644
--- a/crates/uuid/src/error.rs
+++ b/crates/uuid/src/error.rs
@@ -30,6 +30,8 @@
     },
     /// The input was not a valid UTF8 string
     InvalidUTF8,
+    /// The UUID is nil.
+    Nil,
     /// Some other error occurred.
     Other,
 }
@@ -158,6 +160,7 @@
                 )
             }
             ErrorKind::InvalidUTF8 => write!(f, "non-UTF8 input"),
+            ErrorKind::Nil => write!(f, "the UUID is nil"),
             ErrorKind::Other => write!(f, "failed to parse a UUID"),
         }
     }

crates/uuid/src/external/arbitrary_support.rs

diff --git a/crates/uuid/src/external/arbitrary_support.rs b/crates/uuid/src/external/arbitrary_support.rs
index 40c11f5..c753f74 100644
--- a/crates/uuid/src/external/arbitrary_support.rs
+++ b/crates/uuid/src/external/arbitrary_support.rs
@@ -1,4 +1,8 @@
-use crate::{std::convert::TryInto, Builder, Uuid};
+use crate::{
+    non_nil::NonNilUuid,
+    std::convert::{TryFrom, TryInto},
+    Builder, Uuid,
+};
 
 use arbitrary::{Arbitrary, Unstructured};
 
@@ -16,6 +20,16 @@
         (16, Some(16))
     }
 }
+impl arbitrary::Arbitrary<'_> for NonNilUuid {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'_>) -> arbitrary::Result<Self> {
+        let uuid = Uuid::arbitrary(u)?;
+        Self::try_from(uuid).map_err(|_| arbitrary::Error::IncorrectFormat)
+    }
+
+    fn size_hint(_: usize) -> (usize, Option<usize>) {
+        (16, Some(16))
+    }
+}
 
 #[cfg(test)]
 mod tests {
@@ -42,4 +56,16 @@
 
         assert!(uuid.is_err());
     }
+
+    #[test]
+    fn test_arbitrary_non_nil() {
+        let mut bytes = Unstructured::new(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+
+        let non_nil_uuid = NonNilUuid::arbitrary(&mut bytes).unwrap();
+        let uuid: Uuid = non_nil_uuid.into();
+
+        assert_eq!(Some(Version::Random), uuid.get_version());
+        assert_eq!(Variant::RFC4122, uuid.get_variant());
+        assert!(!uuid.is_nil());
+    }
 }

crates/uuid/src/external/serde_support.rs

diff --git a/crates/uuid/src/external/serde_support.rs b/crates/uuid/src/external/serde_support.rs
index f389271..954a349 100644
--- a/crates/uuid/src/external/serde_support.rs
+++ b/crates/uuid/src/external/serde_support.rs
@@ -10,8 +10,10 @@
 // except according to those terms.
 
 use crate::{
+    convert::TryFrom,
     error::*,
     fmt::{Braced, Hyphenated, Simple, Urn},
+    non_nil::NonNilUuid,
     std::fmt,
     Uuid,
 };
@@ -30,6 +32,15 @@
     }
 }
 
+impl Serialize for NonNilUuid {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        Uuid::from(*self).serialize(serializer)
+    }
+}
+
 impl Serialize for Hyphenated {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         serializer.serialize_str(self.encode_lower(&mut Uuid::encode_buffer()))
@@ -127,6 +138,17 @@
     }
 }
 
+impl<'de> Deserialize<'de> for NonNilUuid {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let uuid = Uuid::deserialize(deserializer)?;
+
+        NonNilUuid::try_from(uuid).map_err(|_| de::Error::invalid_value(de::Unexpected::Other("nil UUID"), &"a non-nil UUID"))
+    }
+}
+
 enum ExpectedFormat {
     Simple,
     Braced,
@@ -732,4 +754,14 @@
             "UUID parsing failed: invalid length: expected 16 bytes, found 11",
         );
     }
+
+    #[test]
+    fn test_serde_non_nil_uuid() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let uuid = Uuid::parse_str(uuid_str).unwrap();
+        let non_nil_uuid = NonNilUuid::try_from(uuid).unwrap();
+
+        serde_test::assert_ser_tokens(&non_nil_uuid.readable(), &[Token::Str(uuid_str)]);
+        serde_test::assert_de_tokens(&non_nil_uuid.readable(), &[Token::Str(uuid_str)]);
+    }
 }

crates/uuid/src/external/slog_support.rs

diff --git a/crates/uuid/src/external/slog_support.rs b/crates/uuid/src/external/slog_support.rs
index cb06255..7e1c419 100644
--- a/crates/uuid/src/external/slog_support.rs
+++ b/crates/uuid/src/external/slog_support.rs
@@ -9,7 +9,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::Uuid;
+use crate::{non_nil::NonNilUuid, Uuid};
 
 impl slog::Value for Uuid {
     fn serialize(
@@ -22,6 +22,17 @@
     }
 }
 
+impl slog::Value for NonNilUuid {
+    fn serialize(
+        &self,
+        record: &slog::Record<'_>,
+        key: slog::Key,
+        serializer: &mut dyn slog::Serializer,
+    ) -> Result<(), slog::Error> {
+        Uuid::from(*self).serialize(record, key, serializer)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::tests::new;

crates/uuid/src/lib.rs

diff --git a/crates/uuid/src/lib.rs b/crates/uuid/src/lib.rs
index 7d9ed42..7843d7d 100644
--- a/crates/uuid/src/lib.rs
+++ b/crates/uuid/src/lib.rs
@@ -38,7 +38,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.11.1"
+//! version = "1.12.0"
 //! features = [
 //!     "v4",                # Lets you generate random UUIDs
 //!     "fast-rng",          # Use a faster (but still sufficiently random) RNG
@@ -138,7 +138,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.11.1"
+//! version = "1.12.0"
 //! features = [
 //!     "v4",
 //!     "v7",
@@ -153,7 +153,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.11.1"
+//! version = "1.12.0"
 //! default-features = false
 //! ```
 //!
@@ -211,7 +211,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/uuid/1.11.1"
+    html_root_url = "https://docs.rs/uuid/1.12.0"
 )]
 
 #[cfg(any(feature = "std", test))]
@@ -222,11 +222,9 @@
 #[macro_use]
 extern crate core as std;
 
-#[cfg(all(uuid_unstable, feature = "zerocopy"))]
-use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout, Unaligned};
-
 mod builder;
 mod error;
+mod non_nil;
 mod parser;
 
 pub mod fmt;
@@ -281,7 +279,7 @@
 
 use crate::std::convert;
 
-pub use crate::{builder::Builder, error::Error};
+pub use crate::{builder::Builder, error::Error, non_nil::NonNilUuid};
 
 /// A 128-bit (16 byte) buffer containing the UUID.
 ///
@@ -436,15 +434,16 @@
 ///
 /// The `Uuid` type is always guaranteed to be have the same ABI as [`Bytes`].
 #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[repr(transparent)]
+// NOTE: Also check `NonNilUuid` when ading new derives here
 #[cfg_attr(
     all(uuid_unstable, feature = "zerocopy"),
-    derive(IntoBytes, FromBytes, KnownLayout, Immutable, Unaligned)
+    derive(zerocopy::IntoBytes, zerocopy::FromBytes, zerocopy::KnownLayout, zerocopy::Immutable, zerocopy::Unaligned)
 )]
 #[cfg_attr(
     feature = "borsh",
     derive(borsh_derive::BorshDeserialize, borsh_derive::BorshSerialize)
 )]
-#[repr(transparent)]
 #[cfg_attr(
     feature = "bytemuck",
     derive(bytemuck::Zeroable, bytemuck::Pod, bytemuck::TransparentWrapper)

crates/uuid/src/non_nil.rs

diff --git a/crates/uuid/src/non_nil.rs b/crates/uuid/src/non_nil.rs
new file mode 100644
index 0000000..ee235a1
--- /dev/null
+++ b/crates/uuid/src/non_nil.rs
@@ -0,0 +1,142 @@
+//! A wrapper type for nil UUIDs that provides a more memory-efficient
+//! `Option<NonNilUuid>` representation.
+
+use core::convert::TryFrom;
+use std::{fmt, num::NonZeroU128};
+
+use crate::{
+    error::{Error, ErrorKind},
+    Uuid,
+};
+
+/// A UUID that is guaranteed not to be the [nil UUID](https://www.ietf.org/rfc/rfc9562.html#name-nil-uuid).
+///
+/// This is useful for representing optional UUIDs more efficiently, as `Option<NonNilUuid>`
+/// takes up the same space as `Uuid`.
+///
+/// Note that `Uuid`s created by the following methods are guaranteed to be non-nil:
+///
+/// - [`Uuid::new_v1`]
+/// - [`Uuid::now_v1`]
+/// - [`Uuid::new_v3`]
+/// - [`Uuid::new_v4`]
+/// - [`Uuid::new_v5`]
+/// - [`Uuid::new_v6`]
+/// - [`Uuid::now_v6`]
+/// - [`Uuid::new_v7`]
+/// - [`Uuid::now_v7`]
+/// - [`Uuid::new_v8`]
+///
+/// # ABI
+///
+/// The `NonNilUuid` type does not yet have a stable ABI. Its representation or alignment
+/// may change. It is currently only guaranteed that `NonNilUuid` and `Option<NonNilUuid>`
+/// are the same size as `Uuid`.
+#[repr(transparent)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct NonNilUuid(NonZeroU128);
+
+impl fmt::Display for NonNilUuid {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", Uuid::from(*self))
+    }
+}
+
+impl PartialEq<Uuid> for NonNilUuid {
+    fn eq(&self, other: &Uuid) -> bool {
+        self.get() == *other
+    }
+}
+
+impl PartialEq<NonNilUuid> for Uuid {
+    fn eq(&self, other: &NonNilUuid) -> bool {
+        *self == other.get()
+    }
+}
+
+impl NonNilUuid {
+    /// Creates a non-nil UUID if the value is non-nil.
+    pub const fn new(uuid: Uuid) -> Option<Self> {
+        match NonZeroU128::new(uuid.as_u128()) {
+            Some(non_nil) => Some(NonNilUuid(non_nil)),
+            None => None,
+        }
+    }
+
+    /// Creates a non-nil without checking whether the value is non-nil. This results in undefined behavior if the value is nil.
+    ///
+    /// # Safety
+    ///
+    /// The value must not be nil.
+    pub const unsafe fn new_unchecked(uuid: Uuid) -> Self {
+        NonNilUuid(unsafe { NonZeroU128::new_unchecked(uuid.as_u128()) })
+    }
+
+    /// Get the underlying [`Uuid`] value.
+    #[inline]
+    pub const fn get(self) -> Uuid {
+        Uuid::from_u128(self.0.get())
+    }
+}
+
+impl From<NonNilUuid> for Uuid {
+    /// Converts a [`NonNilUuid`] back into a [`Uuid`].
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::convert::TryFrom;
+    /// # use uuid::{NonNilUuid, Uuid};
+    /// let uuid = Uuid::from_u128(0x0123456789abcdef0123456789abcdef);
+    /// let non_nil = NonNilUuid::try_from(uuid).unwrap();
+    /// let uuid_again = Uuid::from(non_nil);
+    ///
+    /// assert_eq!(uuid, uuid_again);
+    /// ```
+    fn from(non_nil: NonNilUuid) -> Self {
+        Uuid::from_u128(non_nil.0.get())
+    }
+}
+
+impl TryFrom<Uuid> for NonNilUuid {
+    type Error = Error;
+
+    /// Attempts to convert a [`Uuid`] into a [`NonNilUuid`].
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::convert::TryFrom;
+    /// # use uuid::{NonNilUuid, Uuid};
+    /// let uuid = Uuid::from_u128(0x0123456789abcdef0123456789abcdef);
+    /// let non_nil = NonNilUuid::try_from(uuid).unwrap();
+    /// ```
+    fn try_from(uuid: Uuid) -> Result<Self, Self::Error> {
+        NonZeroU128::new(uuid.as_u128())
+            .map(Self)
+            .ok_or(Error(ErrorKind::Nil))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_non_nil_with_option_size() {
+        assert_eq!(
+            std::mem::size_of::<Option<NonNilUuid>>(),
+            std::mem::size_of::<Uuid>()
+        );
+    }
+
+    #[test]
+    fn test_non_nil() {
+        let uuid = Uuid::from_u128(0x0123456789abcdef0123456789abcdef);
+
+        assert_eq!(Uuid::from(NonNilUuid::try_from(uuid).unwrap()), uuid);
+        assert_eq!(NonNilUuid::new(uuid).unwrap(), uuid);
+        assert_eq!(unsafe { NonNilUuid::new_unchecked(uuid) }, uuid);
+
+        assert!(NonNilUuid::try_from(Uuid::nil()).is_err());
+        assert!(NonNilUuid::new(Uuid::nil()).is_none());
+    }
+}

crates/uuid/src/timestamp.rs

diff --git a/crates/uuid/src/timestamp.rs b/crates/uuid/src/timestamp.rs
index 56262f1..d30df5b 100644
--- a/crates/uuid/src/timestamp.rs
+++ b/crates/uuid/src/timestamp.rs
@@ -128,7 +128,7 @@
     ///
     /// If conversion from the internal timestamp format to ticks would overflow
     /// then it will wrap.
-    /// 
+    ///
     /// If the internal counter is wider than 14 bits then it will be truncated to 14 bits.
     pub const fn to_gregorian(&self) -> (u64, u16) {
         (
@@ -165,17 +165,23 @@
 
 #[doc(hidden)]
 impl Timestamp {
-    #[deprecated(since = "1.11.1", note = "use `Timestamp::from_gregorian(ticks, counter)`")]
+    #[deprecated(
+        since = "1.10.0",
+        note = "use `Timestamp::from_gregorian(ticks, counter)`"
+    )]
     pub const fn from_rfc4122(ticks: u64, counter: u16) -> Self {
         Timestamp::from_gregorian(ticks, counter)
     }
 
-    #[deprecated(since = "1.11.1", note = "use `Timestamp::to_gregorian()`")]
+    #[deprecated(since = "1.10.0", note = "use `Timestamp::to_gregorian()`")]
     pub const fn to_rfc4122(&self) -> (u64, u16) {
         self.to_gregorian()
     }
 
-    #[deprecated(since = "1.2.0", note = "`Timestamp::to_unix_nanos()` is deprecated and will be removed: use `Timestamp::to_unix()`")]
+    #[deprecated(
+        since = "1.2.0",
+        note = "`Timestamp::to_unix_nanos()` is deprecated and will be removed: use `Timestamp::to_unix()`"
+    )]
     pub const fn to_unix_nanos(&self) -> u32 {
         panic!("`Timestamp::to_unix_nanos()` is deprecated and will be removed: use `Timestamp::to_unix()`")
     }

crates/uuid/src/v7.rs

diff --git a/crates/uuid/src/v7.rs b/crates/uuid/src/v7.rs
index c2b4a22..d55cf94 100644
--- a/crates/uuid/src/v7.rs
+++ b/crates/uuid/src/v7.rs
@@ -31,7 +31,7 @@
     /// # Examples
     ///
     /// A v7 UUID can be created from a unix [`Timestamp`] plus a 128 bit
-    /// random number. When supplied as such, the data will be combined 
+    /// random number. When supplied as such, the data will be combined
     /// to ensure uniqueness and sortability at millisecond granularity.
     ///
     /// ```rust

crates/winnow/.android-checksum.json

diff --git a/crates/winnow/.android-checksum.json b/crates/winnow/.android-checksum.json
index 930ab63..a791faf 100644
--- a/crates/winnow/.android-checksum.json
+++ b/crates/winnow/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"9807c51d899dbd4514e2e6363f5434bccee13cce357e4baa61ce3c966c68e9fa","Android.bp":"c97eda5127e5f3cd2248e5d2067ca9c240ee6f35c90b8662765f1493ed5474dd","Cargo.lock":"1b5c9eaab0f7efffefe7761a8683d3084dba064809874b9300c136b19a94960c","Cargo.toml":"0ac50b2e08a91c98a006442d12cfd7dd30733da1cb7ae5d6a242ac28a932a01c","LICENSE":"c0eb8549d2cf81653902a4df95bcbf95657d17ac97ee17d4ac99409be3d02d09","LICENSE-MIT":"c0eb8549d2cf81653902a4df95bcbf95657d17ac97ee17d4ac99409be3d02d09","METADATA":"6dda3988202652161cea8e3149d3a021347df5d0e542cf64ad927e31a2adbfe0","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"dab283945bcaeeab1ede8ee4521016c740bfa62b27385f4aedb72ebf38e3a68d","benches/contains_token.rs":"0f11db56776001e13ee9058ac7e2a31832d838bf83a3e0bc850d23bee2a5254c","benches/find_slice.rs":"8b0f978cde8992af1895bb0cf984e4c0b0dc6558f78080b167a58e6a40ced873","benches/iter.rs":"4e3a64f6c3ae1efd5311033a23241472b85a5bbf1eacc180443f197ec221ab66","benches/next_slice.rs":"5a9825b165a5afe6858cd49732f737638bb35a3c41fcc97f3a8b2bb9e8582bb0","benches/number.rs":"48898f827b7545f9de081a94aa95715cc3dbae4f36345ff23d4b4f8a020607d3","cargo_embargo.json":"4322d11531d0decc7f497f1c135679c7f1573c2362137121d587bf6d49e21fcb","examples/arithmetic/bench.rs":"58d7c0e48a39d2f439adcbe75e5d537f036646835b712935d14478e2cab2f78a","examples/arithmetic/main.rs":"80d7b17eef961eb010b9c40260b76c93a8470142ff1533358fc4fc83e71c23d2","examples/arithmetic/parser.rs":"73174a9aa5165ebb9451b0b77736db3a5d7fef45e8dd9d50293d2495fae5a7d3","examples/arithmetic/parser_ast.rs":"3d3e9cfbc4d6250778615fed07b4820bea27f07cb94580faca29357e87062d12","examples/arithmetic/parser_lexer.rs":"24a21c2b444a06b70db8e645182a2ce63cd2c80c824559a96af960a8faad506d","examples/css/main.rs":"a3076c828130b4382d95e3f5de692bd7cf0eebb2bddb76077b88287b3490de31","examples/css/parser.rs":"94ad11cbfa9baeb67eddf9cbfe7a9ce955bdd9c0624996f822c928b460d0461d","examples/custom_error.rs":"86836f16fc8cf5245964236d12d8a4a89abe908f8aab7c56632a4a3b8776c0e4","examples/http/bench.rs":"1e5d38c6411b3069bf7a998269fab94da79835c8c0fe9118b3dd271926603133","examples/http/main.rs":"4e70aa42228e684c43dce8849ffba3259638e426e8adbeb97d049f3d761b37c6","examples/http/parser.rs":"d63fa668cfbe22253baf0d78a5da617054808788ddf10ba0bb978bb738dc0820","examples/http/parser_streaming.rs":"07146bb496b7dfc74c0a3129c38652b81d62942423f92a32e09e5450e30d6c3a","examples/ini/bench.rs":"9c2a733b5d40b809066c5b157012c4e2016de3bc03a3fa266bda9a5fbddb2233","examples/ini/main.rs":"0d567bca2b3c80932d42c783bafdaa348d97f033438afaf67215d9187ff95c4b","examples/ini/parser.rs":"3b2f7365b328cb2c7e15a043bf94cb9ac946d381112e18bdbde239a6487d6254","examples/ini/parser_str.rs":"d6989e083a25caac703c0d988d7f0012d250033d6a369c6efef06cd4bab26663","examples/iterator.rs":"315d5d88cca72216574e6880da2148eb61a23d7cb6312c4b2f8181fce56fd358","examples/json/bench.rs":"6b7722681f3dad5b7fbbfa8519abd22ca4096ed12fa83c1101092f852e1a76a5","examples/json/json.rs":"353c6b044f18e932a9079a2db850593df3a5e1bd08ec3c8da3d227fd12b64fbc","examples/json/main.rs":"4977e3b0db27033d65b119585b453134fadf5f36ceac42ab6d46d6d03b4534ef","examples/json/parser.rs":"2c5e52c945fce159eb76921988ef2b27f7d3b72e4c74233ff09bb32f0e6c645e","examples/json/parser_dispatch.rs":"55362b0d8a64623085b2b408e65a1657b2ab8ec0392994e89e8643157f90b662","examples/json/parser_partial.rs":"32d96bb3afd93a7b027fb51cca890bae887340983f36d4b5160e6775d52f1486","examples/json_iterator.rs":"c73125de3c73149cac6436781ba6449b1d530beb9196e68d2fea77faf4d528bf","examples/ndjson/example.ndjson":"1c013270a2f5ee7d2df2ac6fa1b9d82af68afe954c7a0ed629c04e274d6f7bac","examples/ndjson/main.rs":"50aeeb26a11a6445e8e58c5b84c4b9282b3155dacbd782f0609773d9f17a0038","examples/ndjson/parser.rs":"e1e33c479540fd3c23e4725364c9f0aa5b4e45dc90767e46e0d73b8862e1fad6","examples/s_expression/main.rs":"2e365d7c5e5dbcddfcc4bdc0d73407ed041d270b524125c04e89ec9925c0274e","examples/s_expression/parser.rs":"b54f415141d5aa90fdb98178e006e245519828d71a065b72b9ce26413d5b9809","examples/string/main.rs":"4b87cfb442ce6251981ade950ca92e0da7ad4b38bb9fc9c6935d797106d69843","examples/string/parser.rs":"e997fb0e78c4c982c4267e1cac29d551c05eb45e9bf4ba6a855a479ab6add1ce","src/_topic/arithmetic.rs":"b79c44c429021dc2f4ce8bd2821b53eed1d65bfe47ba91bd036c17f748e4ceba","src/_topic/error.rs":"b77f2c21f5290f3bd2f544b704b7885b2c8c171fb4f7ff5cab5b92f0f7dacde9","src/_topic/fromstr.rs":"aa7b4d94824efd91a6db87e5477f98f19ac20f931d65d09f064b167b424e8ed6","src/_topic/http.rs":"b4a0854c82f687cd4307b0ba1aba448a1a73cb06409a521b512735900a2a121d","src/_topic/ini.rs":"f7dc4e1c4d824597317e09a5a8737ac5b8578094d616d4cc9aa8367cbeb1747f","src/_topic/json.rs":"559d2a9d7b7461eaf92b6985a0e79f54c32a63c70ce2ea86a2528413e1f2ddd4","src/_topic/language.rs":"4a6cdd708e253326b1092685ea1bf8268f81a94d24f35424cc49bbcdceeae8b7","src/_topic/mod.rs":"937d25b66169bbca7c97d9acf5eb4c9fd3bfdcdfcc8b39192d34e99eb1e42cae","src/_topic/nom.rs":"63141a80234da3a13ba074aedb3ed879588600705c236f30616c45d1731e6669","src/_topic/partial.rs":"2ee81a75c384c5e6fe1ebea3eb760be66142749785a5ae97f72e0299895dde2a","src/_topic/performance.rs":"8258b4ad39543d6d851319c55922b4af26711e75b7b171270c2c10337dfcd538","src/_topic/s_expression.rs":"ca745384c41df90add4da390fb5de3b21a3a49a8eeeb069796de2075d5ac86de","src/_topic/stream.rs":"f9e85b6bede8c514c0b84ac484ac615cab9c42a8f3f676ee014f90d79a2f5ada","src/_topic/why.rs":"40e5ebd322fddf7271283c01507a279e9563aaaa2eb6f3281eb0dccc22f43b4d","src/_tutorial/chapter_0.rs":"f64082bcd7e6e69d2bf0c4c7742502536930d6fcd542598d3b943c6f880ff34f","src/_tutorial/chapter_1.rs":"8a35197636d680b431c7f8ae4bd8c184b53e7b4d1ffddf0abb0e8f6971d1f63c","src/_tutorial/chapter_2.rs":"c63a0136334269561eaabfdce5269541b70d727423a266dd07cbe4b8dbb67307","src/_tutorial/chapter_3.rs":"440d0404d0f903d62ddae7578244d362ce8257f3d79b5fb19dafc607238f5ed5","src/_tutorial/chapter_4.rs":"394dc5eb022152a87edbb6cf3e6fa4b7b29a8b2bad918f69fa21622a8633ea15","src/_tutorial/chapter_5.rs":"022221e2cb9f7a3020b9ee13481d571be965a901c973b9a3c59507ba4891927d","src/_tutorial/chapter_6.rs":"37fc80b8747843b55d530b285f7f67319247678f32d380f7e472aac42ba1e453","src/_tutorial/chapter_7.rs":"b5ca138f12195417a70f5b068191075dce890bac02e417b43bf3ec624def37c5","src/_tutorial/chapter_8.rs":"360a550dd330991e219870da121ada9380a0bccea2c555017acee913bbb84dca","src/_tutorial/mod.rs":"29f78e7b383fa4aa90d72e6452b8d37cf34868dd2d2087f286577c5ce762bb7b","src/ascii/mod.rs":"094d12a192c1fafbf8d58d679f32e85159b36532de042a956a8b54b63d8f8b2d","src/ascii/tests.rs":"3734aa29e434b4fadbb123f26618a219a357a662c1d4d52a7c999c043ada09b8","src/binary/bits/mod.rs":"8807804337b8cb91bcc42d9d761fc79eac3301e33dc459c645134d04a01e72cf","src/binary/bits/tests.rs":"1ea9bf42b8ab77bea711ca6fc154751cf0379067b53c3a41d4557daebe8c8d20","src/binary/mod.rs":"793a504ef87d20f78b7d283f8bfd505bf9b6ea08e684d267126ee0fead93d2d7","src/binary/tests.rs":"49a32c8c0c03e789c4337943e047bf629f41d2d8910fdce85b272124db7b643a","src/combinator/branch.rs":"9ed597692c2006c86ae1297c1e4cbeaa5a5c08fd97c4f5362797c1dc96919f02","src/combinator/core.rs":"b5e2828f0345bd288c74f7fd1b1bde537d3b029ad1b718264a7f17347d85775d","src/combinator/debug/internals.rs":"65db58a13bd238acbcda2e9195d6086aed0abea46749df6755c48370d22fd02a","src/combinator/debug/mod.rs":"1ba4102cdf036e0964db3df2c21d4c27149f159e707006beac5a59b2e625bef7","src/combinator/mod.rs":"c2853feaa0a7c73b44cbf4aaee262043c3ed79d5537f29961798850e3d11d201","src/combinator/multi.rs":"e0cbe4f29c0fb08300a5bc6e5f1afc791ef4a7b9b14dc536ec04bdd50e26ea2b","src/combinator/parser.rs":"e27c71836dd0bbd653a9c319f6235e51afc9086695e40ae9c88eaabaa0acb17a","src/combinator/sequence.rs":"c7753b9de890a8fc2d01052aba2ac2d0c7e53f0541f8e25e0dc260ac2ef3e943","src/combinator/tests.rs":"f62f831596ceeb5bcdfaf2b8320b1a9d64cdfc3fc001ab88f15188c25920b2e5","src/error.rs":"0e413b68747fb8f6170c8a98a89756ebf4c0af5772ed52420c3e9d08b9813c7a","src/lib.rs":"5005ecd14a9d4779dc59f3dba4c4444524170042d7b0eafa7565786c702496ba","src/macros/dispatch.rs":"bbbe8f53ee232943ebd51c0388f41ff5dea79b71ad1e41c63b10e5d20fd7c1ad","src/macros/mod.rs":"1cc229c6cc6cb56e5d37ed10217d90e430b4ca0e006a0303060be5c2b4809f1e","src/macros/seq.rs":"c0dbc97dc5c23302ef36eb0bd6e6aba55627d4ef84d7a47f9dffdcd047b76a44","src/macros/test.rs":"9b480299987d3935b5ebd57f314e5b6413b46f8d0ce168980c938b452b899bfe","src/parser.rs":"2682d25a4479c02c91eadb3afb5e115befff67a0b24451f3c7afdb0f529f3e9c","src/stream/impls.rs":"74e80ad8fda33bd182e33f716e30ecb8f438454bc375f4000c5553fb93844e8c","src/stream/mod.rs":"39d79ab76d3d7aada84c651e16670df79433c837478252d77167646a46450d4f","src/stream/tests.rs":"29c34ca57b189162b303d3de50d5b36a35b7cc58522326fe4565d96b3fd25b6d","src/token/mod.rs":"206c3ddff0ef6fcd1f7bb8c2f08ea12f45370f5470ef6422c479801fb698e4f0","src/token/tests.rs":"189571d2a69f7879fbcf4dc8f9cee0a9af0ddf2c2fbd45823402cb9a6d1a8945","src/trace.rs":"bc3eea7f64cda9a893bb99863c088360f719bf00f95ee51b0538097071455326"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"c9f30f54d4f20588333a8fdb26279f82bf8459b85d68a30970ee0f47f4bf55cd","Android.bp":"9d54f882e444a0b3dadda5b5570c490275209b31597a7760883e74497026a5d4","Cargo.lock":"1c58647c7170d12483320b058f2555527a2b449e70979e2c942a7645e03a13d9","Cargo.toml":"34a2d60dffe4378d633995f0e70da9448cc5cfabd5adfdd28b30a72b3b4546f1","LICENSE":"c0eb8549d2cf81653902a4df95bcbf95657d17ac97ee17d4ac99409be3d02d09","LICENSE-MIT":"c0eb8549d2cf81653902a4df95bcbf95657d17ac97ee17d4ac99409be3d02d09","METADATA":"db85e0a97567123eddaf47161ad39242070b65f8aaa6c62e3273daa497d0aff9","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"dab283945bcaeeab1ede8ee4521016c740bfa62b27385f4aedb72ebf38e3a68d","benches/contains_token.rs":"0f11db56776001e13ee9058ac7e2a31832d838bf83a3e0bc850d23bee2a5254c","benches/find_slice.rs":"8b0f978cde8992af1895bb0cf984e4c0b0dc6558f78080b167a58e6a40ced873","benches/iter.rs":"717e3fc61a25b4228ca9afb9e437492da4970e7803ea50865b860274b6180aca","benches/next_slice.rs":"5db6ccaad2bbf9f88c2bbf8573f35c42bbbbdc40813244a9a263fbcc0b6272e5","benches/number.rs":"48898f827b7545f9de081a94aa95715cc3dbae4f36345ff23d4b4f8a020607d3","cargo_embargo.json":"4322d11531d0decc7f497f1c135679c7f1573c2362137121d587bf6d49e21fcb","examples/arithmetic/bench.rs":"58d7c0e48a39d2f439adcbe75e5d537f036646835b712935d14478e2cab2f78a","examples/arithmetic/main.rs":"88eee2a4c18cf58b973bf1764d017d54028d59b8fa156f2b9862fc3f22bd65de","examples/arithmetic/parser.rs":"3d95be05390265e016e59fec0261547fa64146a5b3ab94c03b388eb650f35bc4","examples/arithmetic/parser_ast.rs":"b158850f51d3dd495ba7ccedeab1a39bbcfe86387c5c7ef9cfc2c870866c7178","examples/arithmetic/parser_lexer.rs":"cab8827532dfe7c72990f2817803569fe8ee4ccdad558db8ee13161493d0b113","examples/css/main.rs":"52d266f9f9e8c90e189febf21373ba4af9fb1f006e9671d346deb7403cd4652c","examples/css/parser.rs":"8f19e6aad0c141dd757988b029f67e5cc17a99bae331d931d85e20ad804c89b2","examples/custom_error.rs":"3a247addf688f4d6c85e2a8afb8d030012aeed9a8b85e58c0b6d8bd2d8ab946a","examples/http/bench.rs":"1e5d38c6411b3069bf7a998269fab94da79835c8c0fe9118b3dd271926603133","examples/http/main.rs":"cb229289c242a2c9393b574cdaeaa5f8b8f99d17ae6b7f2b9eed4e770e7004ee","examples/http/parser.rs":"be7dae5d458a3c10a5551d3264e6f685044c03b446263840f009570426510c8f","examples/http/parser_streaming.rs":"833ffc19cfb6494f4dfc8a466e6e1c8222cd5f13d1c15233c25ad229f8c2c04c","examples/ini/bench.rs":"0f563192241369dd34d2d8732c8bc27d802143345d96195782a5668f3fd55c80","examples/ini/main.rs":"975d1297560fd7d4e34d647e8badb31c11ec397c9ea637397fc8e05ded5553b3","examples/ini/parser.rs":"e676777f509fd719c0d3b5b477a417fec402a6bf420dc29ae611e7b378ef3dd7","examples/ini/parser_str.rs":"73147c6612e0aba1d0be5e4963933198205bdf0f5778451b0010582e40735d05","examples/iterator.rs":"0c78e9e20ff9351a68b3a73dcab248d471a64848f31a492a2a3b13d784bbb9de","examples/json/bench.rs":"69f7a196a986fc7489ae739566d8eea98ca525d1c1368920479d3f8831505b7e","examples/json/json.rs":"35d125cd92b9219401df343ac3d98f7e6fd516cbb3b5f09594aed73e7c3d50c9","examples/json/main.rs":"cf7038310b5fe17cb0552a4d94d9b3796eaf438769d85ec48e56a9fa61995f49","examples/json/parser.rs":"00ee33b2c3dd1345be1e6fb284dae27ba25ba7fb5f8109c0a3dc43036d3fe22a","examples/json/parser_dispatch.rs":"096176d51f2d85bff0b225472c72afe0b3195718ba441474f503fba01302c731","examples/json/parser_partial.rs":"a57051e2044e6a3c095d46932a093baacdeca26535d6c08c2c3488b91a33c44a","examples/json_iterator.rs":"8d3ef40d1dfc70cb8f35a968fce5c392c24241b1d91c36998d0ea303ab25e9cb","examples/ndjson/example.ndjson":"1c013270a2f5ee7d2df2ac6fa1b9d82af68afe954c7a0ed629c04e274d6f7bac","examples/ndjson/main.rs":"1675437d9b57073ff3b350b74f6d91db96147c1b72ed886a8a66d8d1221d1096","examples/ndjson/parser.rs":"067c7ff9c5d92bc2d167bdb02a25dadb680908496a610d3d487da361ada75dc3","examples/s_expression/main.rs":"2e365d7c5e5dbcddfcc4bdc0d73407ed041d270b524125c04e89ec9925c0274e","examples/s_expression/parser.rs":"ecb267b48407a35361281fa9f09d37331e5f6d0decaf69b9366502db64b7bbda","examples/string/main.rs":"a21024f6dbbf0c66189d265851009fe885d9f17ade62a66322baf003384ae305","examples/string/parser.rs":"46394e67d8bd3ab74fb1c80dfed1f4dd8381c097d89c53e8fdf492bd22542ab1","src/_topic/arithmetic.rs":"b79c44c429021dc2f4ce8bd2821b53eed1d65bfe47ba91bd036c17f748e4ceba","src/_topic/error.rs":"7e4a39dffaf5d2b9757d9d995ab3b200321cb3a5c175fd2a5f0880598c001a98","src/_topic/fromstr.rs":"aa7b4d94824efd91a6db87e5477f98f19ac20f931d65d09f064b167b424e8ed6","src/_topic/http.rs":"b4a0854c82f687cd4307b0ba1aba448a1a73cb06409a521b512735900a2a121d","src/_topic/ini.rs":"f7dc4e1c4d824597317e09a5a8737ac5b8578094d616d4cc9aa8367cbeb1747f","src/_topic/json.rs":"559d2a9d7b7461eaf92b6985a0e79f54c32a63c70ce2ea86a2528413e1f2ddd4","src/_topic/language.rs":"95e71875c6b923f4f8eb0debf77697f10084a33b51c857fd227ae826282ca4b8","src/_topic/mod.rs":"1eabc7567c01c58851cc1aa5c30a8896b5b6f87a96189cd9bc16e77401b2961e","src/_topic/nom.rs":"fecfc2cd238ed49cb91ce7744eb417b02df061c4ce0d7db7adebd09e2a2a86ee","src/_topic/partial.rs":"2ee81a75c384c5e6fe1ebea3eb760be66142749785a5ae97f72e0299895dde2a","src/_topic/performance.rs":"8258b4ad39543d6d851319c55922b4af26711e75b7b171270c2c10337dfcd538","src/_topic/s_expression.rs":"ca745384c41df90add4da390fb5de3b21a3a49a8eeeb069796de2075d5ac86de","src/_topic/stream.rs":"9eeb1f303f6b346f5ba0c64e4b120451c270ce1fb3409162e4d2afee986e2a22","src/_topic/why.rs":"06e0f617354d47f2fcc9912f390d3fe0d0f07e88d194bebb7551aff32d786fae","src/_tutorial/chapter_0.rs":"24e4fe727bf0d7a0e50fcd90019c3d11987737bd36d4abd79d399917096ba21a","src/_tutorial/chapter_1.rs":"4b7db4081993b1c231694a83676e714295af67369a99a0f38da72685973d73b1","src/_tutorial/chapter_2.rs":"1d9e8eab1c92a9eb868edb907b1c06ef2fb0145ed9a96d4a829dce548bf0b090","src/_tutorial/chapter_3.rs":"a83a624580d3f09beaea028524f11dbf65090ef87179e8496e07c2429c38fa56","src/_tutorial/chapter_4.rs":"03600ef6c02b080b31181c248e786e8b4a2cdf69862d0f4f8ba11622cfe7b2e7","src/_tutorial/chapter_5.rs":"d42dfc2fb81fbf2bb6bdc38088d93e8c1874172a1358ce23e0e0ce40ccd6dc43","src/_tutorial/chapter_6.rs":"1fe7efd324918c8d91bdec3b4a56d44cc82815d04c75b25bb2b32e4f21f8f2fa","src/_tutorial/chapter_7.rs":"bcb56daa6d06caf0e5de3b471396724731aa595b32898c5b70da030601d35595","src/_tutorial/chapter_8.rs":"ca042e342d96d2a33b9211b975c4b35fde9bd05ae7f61567f28ccb1d4a9407d8","src/_tutorial/mod.rs":"29f78e7b383fa4aa90d72e6452b8d37cf34868dd2d2087f286577c5ce762bb7b","src/ascii/mod.rs":"27c72fdc650b4bd72d7d17799a05efb2c99e678f71e14aa6473abad22ee126cc","src/ascii/tests.rs":"8d5094fbbc19bd8760e886efd9c99d0110368d7a9f5af5d18d06212f785af260","src/binary/bits/mod.rs":"3a9971974c8a66099cb75e5c95140494fa18fa904a2737ccad46ed74f5d9f281","src/binary/bits/tests.rs":"688bd31747f074e974f494bd27103997d790336d34a75e4836aaf011ae7720ac","src/binary/mod.rs":"e909d0778cf8ffd4a64c83b772844f2c298db4d8e25358a12553563a21227959","src/binary/tests.rs":"1a7d8362d43c3cad6eadd0e46280a35f146508f2839967b41d744ca7df913940","src/combinator/branch.rs":"fb3241e3a1403e3f3aecc4ad227ff51cf0c37a3fe54789a84d162782ae119e9a","src/combinator/core.rs":"ad11bf23a0d8d54543aeba8e06eae06a31450b4e5cfb126b600b214b264d2e18","src/combinator/debug/internals.rs":"f68abbdee3651c17971915348c4812834b7c6c38f58f5bb1da8d5b2cd443e337","src/combinator/debug/mod.rs":"1c6e836a80a2c966e71d4f292f021ae10f6ded08c926c76da2fd0e549500ea56","src/combinator/impls.rs":"8dfaa0b5f4a59e8b21651eef38470c1d6ba745e5e32d0873dcbff7da648735c1","src/combinator/mod.rs":"cf29982a9ce75b8272bb687360288649ff44219123e592b7b8e1e8cece42dd65","src/combinator/multi.rs":"1e791ee30315c9400f9ebae7799fc753282752f9ff516651d0b1302379a769f4","src/combinator/sequence.rs":"3bf9f13a3757f11bef108d6667f89b0221b3d51151d0f2319916b3fdf1f10458","src/combinator/tests.rs":"770569359f5a35eff92309739555ce522942661da0391fa72ad2253de129418b","src/error.rs":"fb24df66ae692111187cbf75c27100dfd2ef359b2a465810249b264d372b2b6c","src/lib.rs":"de34b284156c358021a13bed6edd58a138178b955553b0beb8918e86a11231dc","src/macros/dispatch.rs":"bbbe8f53ee232943ebd51c0388f41ff5dea79b71ad1e41c63b10e5d20fd7c1ad","src/macros/mod.rs":"06eed9d8626d444dbfcff753f83836da4474a9b145fea3992d89877d7f4023e6","src/macros/seq.rs":"e241cd8c2afd9033e2362deb4cfa9da3b88d4b96c4e6b92a0addef2b14b8bbb3","src/macros/tests.rs":"8bd38c7805192e2df69c4972ab8e43f33c6d1f90828c4bb9ce30f0924e9c3ae3","src/parser.rs":"446232c519f2ccd53a22767332883a2bb4439234728a1f419d19a80dc4a3827f","src/stream/impls.rs":"5920f82ab5e4c81e66ad6f30830b9d5adf22178e6a0441eeee92a4dc742bbad3","src/stream/mod.rs":"511b36ff2e27f2859428cbcaa56a65507964ffb097d16a6e3f796e1a1ffba42d","src/stream/tests.rs":"7d40f65e6f32f8fd23b5043b02e2a248c8fff211b71cc32aa8c2d7f9ae40d1e9","src/token/mod.rs":"c5461997b4b750125284a7f23fd5318cdb260bf8c3caa87c1204d12043a090d1","src/token/tests.rs":"ab4892648202709cf7e1a3999563656460efa43c853f64a80cfdc294b7b8bfff"}}
\ No newline at end of file

crates/winnow/.cargo-checksum.json

diff --git a/crates/winnow/.cargo-checksum.json b/crates/winnow/.cargo-checksum.json
index c82a3d6..903a57e 100644
--- a/crates/winnow/.cargo-checksum.json
+++ b/crates/winnow/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"db694e7e6a1d861cf51cc0db96f47cd04136035be41b456a871d6be38df7909a","Cargo.toml":"282f87b5600ef0f2476bba16911877bce142c1109930a5b297d702ab0ee72f83","LICENSE-MIT":"cb5aedb296c5246d1f22e9099f925a65146f9f0d6b4eebba97fd27a6cdbbab2d","README.md":"0b7e4cad5ef0cbb47dc1c1c34ff3b5d090aaba2cc3b3c5401539e5c4a22b7938","benches/contains_token.rs":"20e765de27f0ad9bf549e250bdb67d73714d23bc10bb67be240a258dcf8b6ed7","benches/find_slice.rs":"4853142ad538403b17c5f2d486b958a11628039b5366925927e61743ea462c48","benches/iter.rs":"bede3f156b87ffb8b901b092bcbb2717b7adf9a461a2fecdfad86025aad3e587","benches/next_slice.rs":"7cb1ea5e7122676532ecfbc53e0de78417bf96546c63a170370db8a99c90620b","benches/number.rs":"f4b54895ed523c462ce327a5205b0b99591eb7056fe9de9abe3f809eff287386","examples/arithmetic/bench.rs":"a162e4f91ce2ed19b5b53f79d77c92eb52278f0788da9af8fee3ee62cebfe0a9","examples/arithmetic/main.rs":"b7f2090beefa76ca324d23bc62e06ef97df8c7d02934998f4ddce1ac45e0b852","examples/arithmetic/parser.rs":"318f804e7324b762a7f84f4202537a21c2a299111b42e559d682a6d01857119a","examples/arithmetic/parser_ast.rs":"93f4b8a361bf37f20cba941a9bee878890e86eee0eb8256162f52910a8c43fe2","examples/arithmetic/parser_lexer.rs":"ecdbe258e9f88d5f25f6a57da3de5f4426b01f86f7ba20d2fd4e35a75481d2c8","examples/css/main.rs":"3127f259af57aaaa8363bfa6e0a64c9719173cc1dcc5a293771a2c8a7f31982e","examples/css/parser.rs":"e81d89b876288637d8480fe981ddacdf2faa7f54da051801ee308db39834497d","examples/custom_error.rs":"5ebf88007ed2ce998fdb16cd4326b1573e83f0c420e2f6561c10b6dd8ebf69a2","examples/http/bench.rs":"b6d3e9e5833b53ac58f8336617cc42a2f3f4c5e5ce88feb23184fcdbb36843f6","examples/http/main.rs":"95d3c73953cd76ea462d886ade2ab34e987239bae3abb0349c434fb01b80467d","examples/http/parser.rs":"21ebf9083fd5ced93ba74865bab80c76ba6ec0dcdf9f6fcc95acb7c0c90c2a73","examples/http/parser_streaming.rs":"468c2896d03d0d35bfe0ed750c13643e9a13d2dc4a651c0d9ffc024aba7fada7","examples/ini/bench.rs":"c8fd1aed25ce2878c0f440d765779d7877e83ca202cf071f8f4c57566596bf89","examples/ini/main.rs":"d771aa8aae11e53f4f5453ac39e10ae3a1de210408dfd31ca7d1ce58d14c3fb9","examples/ini/parser.rs":"c554286e8f2077f999d607902e7a63ce3945939118bccf830a68b22bfe24c775","examples/ini/parser_str.rs":"d55687d113440e40ce6df400a49331183feac3e904844af57b956caaa567fcec","examples/iterator.rs":"21fb0480749116407689162f0d3e9957e3e7b6863f9dda08ee01af675409b06e","examples/json/bench.rs":"9479248ccef46e0741e0eebf9fb3b307b343ba665925481adc4554d8e65f9d39","examples/json/json.rs":"48cf6c114098113c9767bebe430682f55f7c1a227e6486131ca58c00770711f2","examples/json/main.rs":"7ab1f6eefd4eb61153cf05991e593fd10827ac09f66af45d3019f94c39c5b84e","examples/json/parser.rs":"b7de8bfed29aa5c1da9f483d601dd2bb4129b8b2783bd0d339e356f34b265254","examples/json/parser_dispatch.rs":"148bfb3a1c73181b935dd4ad12ff1b79ce375f908377b93bdbfe0c7339d4e513","examples/json/parser_partial.rs":"d39c6749038031a363a79d9ee87fe9ea8c2bf21a321884845f37a1f63cac2905","examples/json_iterator.rs":"2a8a842b43fdea12a6b5c4927cede23cbd0eb96bb1cbf42a794103fc9be9ff3a","examples/ndjson/example.ndjson":"c44c130731008bca76181348d40f46b183577949b5a4d229e0e1a56e1e405e5d","examples/ndjson/main.rs":"dc92dd5d76b5d43edf947b6455d552f0212e46d59c926d95f97f5d159b14e361","examples/ndjson/parser.rs":"948a876edc6fbac22920c40c40c319fc48806544b7b7bc6d17109513d87e8179","examples/s_expression/main.rs":"5a2de0b477807c7d6ab8bb72579f03692e8f5ea89d5b6f3a8342cfdbe4d84b96","examples/s_expression/parser.rs":"2a468bf61e4aed9aa5c556fb19c479060d121f60671865324675ab9fd92f0ddd","examples/string/main.rs":"e6362f957d532d41bcd96476e55ac4c253eb04fa25ee88b48d872661a46a5bb5","examples/string/parser.rs":"7ed4bb82c4ec7f4b5a88b1ef127d7b6e59f5ff4105cc8d6b4590cf8d242f0799","src/_topic/arithmetic.rs":"28d61dd492b308209d534c54813ea48ac1862a39196527042180de7718f915d0","src/_topic/error.rs":"0d5e9631ff497d52e9da21958cae1b12e0e5d7293b0e650c5321a4d2a2bdcbcd","src/_topic/fromstr.rs":"01abdab296cd30067ae5f508b2b21ebe97c0571ace58e7817876eb2110e8d23a","src/_topic/http.rs":"19b9ec78a031fe5b3086fb34d04d6c13308c50b6e7bfe30229f5b682d3605ac8","src/_topic/ini.rs":"b2b04d48eac3158f4e26ee9dce748a699d02acaa0b12ae8d54421cad0fdc4ad7","src/_topic/json.rs":"bde39ee6b1c5fab2d2da480822b737674aed877f92c3f748d6932bec313b5661","src/_topic/language.rs":"61fc2e5bea30ded24fad43aaa6a7d5de940e6236f95c54093490be79514ff4ed","src/_topic/mod.rs":"c52d1cf092892d2b7548316a7ce77e2fabca1bd43e2bebc549f2a3f5d2fe9e9f","src/_topic/nom.rs":"9e7c4a900a7ad1bd417d9a72f2a5122a75707c5d53a2d39845b350d5aab362ca","src/_topic/partial.rs":"4777cedfbe8437a547114da346f6cd350d8e77ae62e2ed32d50636e9acbf876e","src/_topic/performance.rs":"115b636769c307bd80ecc5b89ffad47877352bc93ef47bf664093d3d7a2562cc","src/_topic/s_expression.rs":"6ca9a22a5c3344e120421f2ab353a1e822777aebfa1faa0acffc9632f7668cb2","src/_topic/stream.rs":"acc1e8942e27fec3911c562934be6bf9b096d436593af50a4418d9e0fe607535","src/_topic/why.rs":"097dbb252ed0c67e0d50157e1826286997450a9c413cf40697c0918e0dfecba1","src/_tutorial/chapter_0.rs":"c0512cb9857edb9df0ac1d327fccb1e950019b9a417959c802714039038b8bce","src/_tutorial/chapter_1.rs":"743847b36faab89235f7e4d36076b5090d1dff7c0f5f38f9c3387aaff80bbec2","src/_tutorial/chapter_2.rs":"3671bfd14e7a9c6c630daac8bc2c8128938fd0f830a5524c33a800d06d4cd205","src/_tutorial/chapter_3.rs":"b5dfcc806552ee958ef27558d377d6abee1c1437a5829941c51f475f389e2aa4","src/_tutorial/chapter_4.rs":"4390d7ec2a67a726bd8df7f62ebd3fc26df926e79c014b8a2e623ec3e4c1ca25","src/_tutorial/chapter_5.rs":"25656769ea285f9d6d3780294a24491b27918cecd754b430220b56ac2047a10c","src/_tutorial/chapter_6.rs":"51fae6d7479288f518d04d43b3e987aa0f26f83ff0620ca4bdcfe7ec92e2e0cb","src/_tutorial/chapter_7.rs":"6ffab9e8a2a7ef6c38dfb097a1f8ab6bffe86545511259a00e81e5b6e4367650","src/_tutorial/chapter_8.rs":"ddd6ec7cdd2d888a2361c4715221be2fdd24475d7be2953474fdd2a01ce6234a","src/_tutorial/mod.rs":"afba818d7d1c8309bee5399dc8f695d93b08e93f406734d41e7e66c019b43c53","src/ascii/mod.rs":"d607899a8399e769659d54dbee12e783239d7574224f507d09fbd0baef7294c2","src/ascii/tests.rs":"fc44d6120c7e6ca4f70684f668e195884ff1193e6924b99093cf411ad90f4a8b","src/binary/bits/mod.rs":"c0ba2cafd89f11d3f70c036b713e7792d7b55aa61cf91f12dc1a9d88766b660a","src/binary/bits/tests.rs":"1ce1707a8ab2300d601f67fb3cb9c4b8ba7528564477e65ff25d8542c3e0f6e7","src/binary/mod.rs":"79bf5f8f49ca21205afa2666762b68ec5769283f5503e86eacf6abe88b639e63","src/binary/tests.rs":"107a6a36115f0a52b5adf9e5e3bd2d242fc43888e916d3acca772c49563c545b","src/combinator/branch.rs":"243f68835c1ebd8407658f823093fd86f2e02d2dd79dcbde576b87c78e835689","src/combinator/core.rs":"a7c773c79001e061742327b4fa99082e4cb023e26defc5f23fc9f31fc83abc1f","src/combinator/debug/internals.rs":"3480e946ba22390ac84046487728fd89d78cb3bc5547305162ed925e2437802f","src/combinator/debug/mod.rs":"2b876e31880f3a1ff84585a5d31458f5c0e135a9d6176cb36859e365cbbe8baf","src/combinator/mod.rs":"b6d97df5256857b95d9d683682efc5b6078b43a3abd0a51bd55df6da93e67f9d","src/combinator/multi.rs":"ba423a6b199ddb550f9f2c63700a0c5ef16c5652863a1ad67c47210f63efe837","src/combinator/parser.rs":"a3ee56f3d12b6d1a5c74e590b646bde5aacf653d64fbb9a983ec2402b7af80ab","src/combinator/sequence.rs":"9ecf8e294fea355d00b4cc8d8a82c56b0565bc647d4f294a8c73c1d85d7dd355","src/combinator/tests.rs":"93848556fb5461e0bbbd9926d30204ef6980c88c0b36351048a8f140c0de2124","src/error.rs":"61d03a606b543e0e22eeefc4ee15abd7745fff6d089d904702692206aba4cefa","src/lib.rs":"a967f08aea09bfc95eb53112fd4718baa39819f9c35f9098bf29c5e0a4445a30","src/macros/dispatch.rs":"6a82b6f3472a58d114e2b40443d7177d326f9b9b7b25d1370b4867838e0e1e80","src/macros/mod.rs":"9faebae01ea216cda6160cc306ca4a5f531344aa65a628973c0825d0f53b3fb3","src/macros/seq.rs":"c64d7354d27c21b37901887f0bd3fb1c720adbe6c677a02880636d0ba9fc9491","src/macros/test.rs":"7b1df320d703fdedf90204d094c209cb69a3022b2cefb27803fb73031596b87b","src/parser.rs":"a26ffd1c9cfcb518b3224165dea96b6fe66c6bfad9a96b2b20745134d7f72419","src/stream/impls.rs":"139025ed7c350c86e14b3a23019b1e5569cfee98c5f3e07d5a7dc69f411a8730","src/stream/mod.rs":"db11794ada41fc3145691eab621fdb07096229bfe951f5c8e682b99cec4f7b11","src/stream/tests.rs":"399d884c7b1baf256f667f8dd25218fa473bd30a3b293625f756a9accd5b1f2d","src/token/mod.rs":"fc109bbd13e3531376c8a2cc3be6dd0c93b2fbf30113df958b6d862c432faa19","src/token/tests.rs":"74b54c5b631a29377c0af15329c822fed9752031d04531444d4c2b23367e3a5c","src/trace.rs":"6a1f066c7a3e4d93b6fdb0fa53c08e744b19173bb669f389933786908a88a5e0"},"package":"a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5"}
\ No newline at end of file
+{"files":{"Cargo.lock":"db0b0c8f9fe2fc0bfabe9268ec881fe129a6e56fdd7d8749fe5b6f183a79238e","Cargo.toml":"375763b9a87681acabc281125d064c7ef7a49bc67e2502531f4613bd758c7735","LICENSE-MIT":"cb5aedb296c5246d1f22e9099f925a65146f9f0d6b4eebba97fd27a6cdbbab2d","README.md":"0b7e4cad5ef0cbb47dc1c1c34ff3b5d090aaba2cc3b3c5401539e5c4a22b7938","benches/contains_token.rs":"20e765de27f0ad9bf549e250bdb67d73714d23bc10bb67be240a258dcf8b6ed7","benches/find_slice.rs":"4853142ad538403b17c5f2d486b958a11628039b5366925927e61743ea462c48","benches/iter.rs":"6a6c316e0bc28e31ac861d5f33c5d9976a3fa8e0221828dbb7ba197ba27685e9","benches/next_slice.rs":"78968522a84d357d3f7d5962749bb37766b1235a12cadfce7f015759c91a4688","benches/number.rs":"f4b54895ed523c462ce327a5205b0b99591eb7056fe9de9abe3f809eff287386","examples/arithmetic/bench.rs":"a162e4f91ce2ed19b5b53f79d77c92eb52278f0788da9af8fee3ee62cebfe0a9","examples/arithmetic/main.rs":"66212042c1810c3fe06e6b6b225ecde4a66f4cc378ef1ea4c7533e1420d7e257","examples/arithmetic/parser.rs":"9630411e61c96df6eb86641cf4c1c381c43a920779badaae2ca6aed49eaf826c","examples/arithmetic/parser_ast.rs":"853e79366d0ed7995465c7657d335c386ddf1171e8417de674d8d2ad6f5c7c20","examples/arithmetic/parser_lexer.rs":"e7d746867c6b0fb3d9c70c6e2778cbabebb15d052926b3989f35ada82bdd2b15","examples/css/main.rs":"06647d68a57f8ef47198bda81dd88b2e123e70c7e1a79a0109a759ead1212904","examples/css/parser.rs":"ee0c553b9e68729a311f00cb49366cda96731d5d69d4d7454160371e01ab30e4","examples/custom_error.rs":"b6fca4f4db0c61f9d941e36aa53d4035d11b5e47d2e6e12d4639dcdd9a59fef3","examples/http/bench.rs":"b6d3e9e5833b53ac58f8336617cc42a2f3f4c5e5ce88feb23184fcdbb36843f6","examples/http/main.rs":"ae6fbf6b7083e73b3bd29cb63094f0aace6f7834c90504fa1f3abdca87d81826","examples/http/parser.rs":"3ece9ff3349cfb3c89c0bb7ddc915ce679139cece3cc0ff929fbd41b05d30c5e","examples/http/parser_streaming.rs":"979df0482e516037128b7b02a6b4c08ac3b36603955289bba772d011019d543e","examples/ini/bench.rs":"430ef9276fb284f93e50ba87c6b1a3e4cfd2b4e6cc5f4d76bbc0d40a26112299","examples/ini/main.rs":"b3b6d508a6e8fa99e34fb400a625d346da6eeeea909ad5e365636acd1a8a354f","examples/ini/parser.rs":"78e8576cd53ef1f7d37169e4e5558aeaad7701841978cdf19f2e0e79d86a9f06","examples/ini/parser_str.rs":"61497ca84ab2e4e945bd249d8dc67816fdb646c06b8c2456b74ef88933d96487","examples/iterator.rs":"7794f6fa5306e53024b9b1686f67df355efb9404cee2b2e7de3b6af5d0d3bfcc","examples/json/bench.rs":"01061b696d94952e0f9cf2e7bb4bb2cae6cf1069e36d9fadfed4379e8502762f","examples/json/json.rs":"fd9fa5e4b76ba1f7d9180ae8127751d2c665892ad6d1c95f4eba16ceca6ff576","examples/json/main.rs":"d4857f9e58d0795ea6c9f33b271eca1f7b2aac13102c9eb723b630fa99fc2adb","examples/json/parser.rs":"a971afb90ca2279c62c8013ae3e1b84e7c73c668cb05288686d992e39a06d15b","examples/json/parser_dispatch.rs":"16b0199212e774cfd8cc838096fd75c511991eacdb8804b88dd8a0be1c6210db","examples/json/parser_partial.rs":"cf72cc355acb41a66d07e6fe6c8957e745761c854f39055aba4cd667425546ea","examples/json_iterator.rs":"619720c801603ae6d8285b3aa682198c7126575ee143c3b59e0873208a6fddf3","examples/ndjson/example.ndjson":"c44c130731008bca76181348d40f46b183577949b5a4d229e0e1a56e1e405e5d","examples/ndjson/main.rs":"aaffe73971ea5e3f5aff7e40a5d091e77a95e5e5be997f8f840b9dc934c3b45d","examples/ndjson/parser.rs":"ca03480022822a7a76f06daab99880e5a05651e70824810a9a51fb4be08ccf32","examples/s_expression/main.rs":"5a2de0b477807c7d6ab8bb72579f03692e8f5ea89d5b6f3a8342cfdbe4d84b96","examples/s_expression/parser.rs":"9fbd4d6e836e4c4d8724a39592579243f805bfddd72883cca91ec9c51eedf1ca","examples/string/main.rs":"5537748a97de502ba5965f70fc6b9dcb66a4c051e88dbe5dfe604ce1bc0cae35","examples/string/parser.rs":"735a7cd220f058d398feb826b1ff9a7301bfded0fc7800f13f721e031a1725f8","src/_topic/arithmetic.rs":"28d61dd492b308209d534c54813ea48ac1862a39196527042180de7718f915d0","src/_topic/error.rs":"98fad96735246bd12757c596926f65757b2942564a8cccc159f74715631defc7","src/_topic/fromstr.rs":"01abdab296cd30067ae5f508b2b21ebe97c0571ace58e7817876eb2110e8d23a","src/_topic/http.rs":"19b9ec78a031fe5b3086fb34d04d6c13308c50b6e7bfe30229f5b682d3605ac8","src/_topic/ini.rs":"b2b04d48eac3158f4e26ee9dce748a699d02acaa0b12ae8d54421cad0fdc4ad7","src/_topic/json.rs":"bde39ee6b1c5fab2d2da480822b737674aed877f92c3f748d6932bec313b5661","src/_topic/language.rs":"5853c47cb42c58d8554afffd970c7810d2a84ba774942764ff5520f997601538","src/_topic/mod.rs":"2e7ee6ee1e2b39874ae37120ee40a4a55baa0536701c1ee62777bbf5b86a4ac6","src/_topic/nom.rs":"94b57630f91f716f1583d1590abe03360d11fc7cbaac03e6c7154ef404160cb0","src/_topic/partial.rs":"4777cedfbe8437a547114da346f6cd350d8e77ae62e2ed32d50636e9acbf876e","src/_topic/performance.rs":"115b636769c307bd80ecc5b89ffad47877352bc93ef47bf664093d3d7a2562cc","src/_topic/s_expression.rs":"6ca9a22a5c3344e120421f2ab353a1e822777aebfa1faa0acffc9632f7668cb2","src/_topic/stream.rs":"64aa893b39d277b03fcc30ec25365db9d989cdfe042b10bc17ab59b8ffe4ec63","src/_topic/why.rs":"645f8023ca7b33a32fd2265e5ec87286ad43acc4b8318a4539eb8c9c89f1267f","src/_tutorial/chapter_0.rs":"dbda2c50ccfc3bc04c798a57d7019ec93a99954327a733a7f48449da8c2ceba5","src/_tutorial/chapter_1.rs":"d96b372e2542939972ef22e852e2f413d7322792ce569cc59e4167ffcf8177ae","src/_tutorial/chapter_2.rs":"149465c97a0b65ed90534455d3c4e6256a80610020aad7519cdf8df1ff7f8d1d","src/_tutorial/chapter_3.rs":"f644c0fa752de95cc9b936a62737c89e59e00ad9a21fe93c75d52b599e16e020","src/_tutorial/chapter_4.rs":"9c94695afef4b24c066a68baa09f4bb7b3421c77c59bdf090f38b8b1fad82b7e","src/_tutorial/chapter_5.rs":"7321beb11338245a5bc0b321518fc7454c6b209c3f516c289dacd0eaa66362b7","src/_tutorial/chapter_6.rs":"4243644675ba7295bd4e25f4afdc45c06c1f2c04c4d0572089dc561a79811a12","src/_tutorial/chapter_7.rs":"218ed0f56eeec0b7bdd060fbee4382df41932fe6b17f653e7ffc34879d7b6d25","src/_tutorial/chapter_8.rs":"efa2d44ec3d35316288e33a9f5003f03b979756ecae928a16ff9e71c84092a9a","src/_tutorial/mod.rs":"afba818d7d1c8309bee5399dc8f695d93b08e93f406734d41e7e66c019b43c53","src/ascii/mod.rs":"e9b2c98984b00d89a51e52b76c9e99852cb50a5a2c5571eb0b3c4a61c2d05406","src/ascii/tests.rs":"f5b364c0d37a5c47214119877e90b7cae6e66e856a5ca907376ce3f4a8dc02a9","src/binary/bits/mod.rs":"2d6cfbc162fd739ecb7c084382c3a87d8a61d856a1bd26183116576cb8ad1544","src/binary/bits/tests.rs":"cf2da97a6e84a5391ec20cc9a50093431cce160308703b4db1daec8bd29df199","src/binary/mod.rs":"1720840f4818d6bc2a5e9c0fcef97a57cf9a88b2cc4654e8b4ddd7865858d012","src/binary/tests.rs":"4a082c68f2356da97a699246f586e9c5ab584a3c600d9d68883de1450fde2f3b","src/combinator/branch.rs":"0a154e7814a2eb3f0cbc53f4646c54811a5271705922ed63fd53ccbd21ded86a","src/combinator/core.rs":"586394dee9e4c02a09f1bdb52d166901110500325580edfc8be515a84c97f2c1","src/combinator/debug/internals.rs":"3573d767ffdd93398a6f13799584f1ce9d3ef2854f9cb761c0318acfeb16e6e4","src/combinator/debug/mod.rs":"ac7c9035154fb15a4c66321286f066fc6a77cf9de954066bfc274cfe7eb76054","src/combinator/impls.rs":"932d21cd65b15db8612f4b3e9442797f0bdd3a414f23212b1fc542c8aa1c5646","src/combinator/mod.rs":"c30801cf4fe8af1770f71e96a2ed98d3625d9822c1da932e2cd315e034add2bc","src/combinator/multi.rs":"40e9490b892df3bfa3278b1455735f8e8a8ffe34aec54c6f9cc2e51f37af18b2","src/combinator/sequence.rs":"cc1dd9b562dcdb13da6842596852990d0ec16dc203ba65e1430ec3f38ad014b3","src/combinator/tests.rs":"147e334d25e26bcc222eb1d993e030dab8afb1771b90bb5830b57b2cef8cf472","src/error.rs":"88b068733c62417e12673df380129f4f4b310341a0a1e0d009c9c76d299977d1","src/lib.rs":"382043729e04b93b97467c04d0f2ebe262a92513877aa5081d72b4b8fe8b6875","src/macros/dispatch.rs":"6a82b6f3472a58d114e2b40443d7177d326f9b9b7b25d1370b4867838e0e1e80","src/macros/mod.rs":"2946d54397a9cdab1e584892e3b78271f63dd1076c19bec81b5ccbc55b32c190","src/macros/seq.rs":"ce6c5b19ac595e7cc7c828290b9217a4a620807a84ae5c0678e41f28549aed39","src/macros/tests.rs":"af979e4b176cb04971d1adf9d02e84dcadd19589632365eb18a27e6c48c5c8d1","src/parser.rs":"88da095a92e8e9aa42aedca7061ccf27f61953ac4f4ccbdd79213b6cdc2092d8","src/stream/impls.rs":"fd3ad050853d5e36528276ac223aa5f953d686fd724703a90633e141365ca876","src/stream/mod.rs":"a874fa56952cf74a4b7ee2f04af00c2d2d16c0cc260aa50506dae823f0527937","src/stream/tests.rs":"ff6b23e887340b5fc9e6d0bbe8c8933dc9af60d159df9167cc606c613724ff34","src/token/mod.rs":"322a95e765eb22ffa148e56a3390028acad52dd663700e8d9c0b501edb53b35d","src/token/tests.rs":"a11bbb20f8d628ca69f736c2cf11a70a2e106602e15fd40f11e9913f10aa4bc1"},"package":"c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"}
\ No newline at end of file

crates/winnow/Android.bp

diff --git a/crates/winnow/Android.bp b/crates/winnow/Android.bp
index 79f5412..ad0ee29 100644
--- a/crates/winnow/Android.bp
+++ b/crates/winnow/Android.bp
@@ -17,7 +17,7 @@
     name: "libwinnow",
     crate_name: "winnow",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.5.37",
+    cargo_pkg_version: "0.6.24",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [

crates/winnow/Cargo.lock

diff --git a/crates/winnow/Cargo.lock b/crates/winnow/Cargo.lock
index 9dcaa1c..70984ef 100644
--- a/crates/winnow/Cargo.lock
+++ b/crates/winnow/Cargo.lock
@@ -9,6 +9,16 @@
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
+name = "annotate-snippets"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "086b0afab3b349e5691143adbfb26983821e3eec4ba4c51957104d372c2e1b7d"
+dependencies = [
+ "anstyle",
+ "unicode-width",
+]
+
+[[package]]
 name = "anstream"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -17,17 +27,32 @@
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
- "anstyle-wincon",
+ "anstyle-wincon 1.0.1",
  "colorchoice",
  "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
-name = "anstyle"
-version = "1.0.1"
+name = "anstream"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon 3.0.3",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
@@ -58,6 +83,22 @@
 ]
 
 [[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
 name = "atty"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -75,6 +116,17 @@
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
+name = "automod"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
 name = "bit-set"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -491,6 +543,15 @@
 ]
 
 [[package]]
+name = "is_terminal_polyfill"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b52b2de84ed0341893ce61ca1af04fa54eea0a764ecc38c6855cc5db84dc1927"
+dependencies = [
+ "is-terminal",
+]
+
+[[package]]
 name = "itertools"
 version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -720,9 +781,9 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
@@ -764,9 +825,9 @@
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -945,7 +1006,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.22",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -978,11 +1039,11 @@
 
 [[package]]
 name = "snapbox"
-version = "0.4.11"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835"
+checksum = "9ad8c7be18cc9ec7f4d7948ad6b9df0e04fc649663e3c0ed59f304ed17ca69e9"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
  "anstyle",
  "escargot",
  "normalize-line-endings",
@@ -992,11 +1053,11 @@
 
 [[package]]
 name = "snapbox-macros"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31"
+checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
 dependencies = [
- "anstream",
+ "anstream 0.6.14",
 ]
 
 [[package]]
@@ -1012,9 +1073,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.22"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1063,12 +1124,12 @@
 
 [[package]]
 name = "terminal_size"
-version = "0.2.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
 dependencies = [
- "rustix 0.37.20",
- "windows-sys 0.48.0",
+ "rustix 0.38.6",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1127,9 +1188,9 @@
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "utf8parse"
@@ -1189,7 +1250,7 @@
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.22",
+ "syn 2.0.60",
  "wasm-bindgen-shared",
 ]
 
@@ -1211,7 +1272,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.22",
+ "syn 2.0.60",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1282,6 +1343,24 @@
 ]
 
 [[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
 name = "windows-targets"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1312,6 +1391,22 @@
 ]
 
 [[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1324,6 +1419,12 @@
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1336,6 +1437,12 @@
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1348,6 +1455,18 @@
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1360,6 +1479,12 @@
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1372,6 +1497,12 @@
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1384,6 +1515,12 @@
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1396,15 +1533,23 @@
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
 name = "winnow"
-version = "0.5.37"
+version = "0.6.24"
 dependencies = [
- "anstream",
+ "annotate-snippets",
+ "anstream 0.3.2",
  "anstyle",
+ "anyhow",
+ "automod",
  "circular",
  "criterion",
  "doc-comment",
- "escargot",
  "is-terminal",
  "lexopt",
  "memchr",

crates/winnow/Cargo.toml

diff --git a/crates/winnow/Cargo.toml b/crates/winnow/Cargo.toml
index 61cf661..7e93658 100644
--- a/crates/winnow/Cargo.toml
+++ b/crates/winnow/Cargo.toml
@@ -11,9 +11,10 @@
 
 [package]
 edition = "2021"
-rust-version = "1.64.0"
+rust-version = "1.65.0"
 name = "winnow"
-version = "0.5.37"
+version = "0.6.24"
+build = false
 include = [
     "build.rs",
     "src/**/*",
@@ -24,7 +25,11 @@
     "benches/**/*",
     "examples/**/*",
 ]
+autolib = false
+autobins = false
 autoexamples = false
+autotests = false
+autobenches = false
 description = "A byte-oriented, zero-copy, parser combinators library"
 readme = "README.md"
 keywords = [
@@ -39,14 +44,11 @@
 repository = "https://github.com/winnow-rs/winnow"
 
 [package.metadata.docs.rs]
-cargo-args = [
-    "-Zunstable-options",
-    "-Zrustdoc-scrape-examples",
-]
 features = ["unstable-doc"]
 rustdoc-args = [
     "--cfg",
     "docsrs",
+    "--generate-link-to-definition",
 ]
 
 [[package.metadata.release.pre-release-replacements]]
@@ -90,58 +92,91 @@
 replace = "blob/v{{version}}/CHANGELOG.md"
 search = 'blob/v.+\..+\..+/CHANGELOG.md'
 
-[profile.bench]
-lto = true
-codegen-units = 1
-debug = 2
+[features]
+alloc = []
+debug = [
+    "std",
+    "dep:anstream",
+    "dep:anstyle",
+    "dep:is-terminal",
+    "dep:terminal_size",
+]
+default = ["std"]
+simd = ["dep:memchr"]
+std = [
+    "alloc",
+    "memchr?/std",
+]
+unstable-doc = [
+    "alloc",
+    "std",
+    "simd",
+    "unstable-recover",
+]
+unstable-recover = []
+
+[lib]
+name = "winnow"
+path = "src/lib.rs"
 
 [[example]]
 name = "arithmetic"
+path = "examples/arithmetic/main.rs"
 test = true
 required-features = ["alloc"]
 
 [[example]]
 name = "css"
+path = "examples/css/main.rs"
 test = true
 required-features = ["alloc"]
 
 [[example]]
 name = "custom_error"
+path = "examples/custom_error.rs"
 test = true
 required-features = ["alloc"]
 
 [[example]]
 name = "http"
+path = "examples/http/main.rs"
 required-features = ["alloc"]
 
 [[example]]
 name = "ini"
+path = "examples/ini/main.rs"
 test = true
 required-features = ["std"]
 
 [[example]]
+name = "iterator"
+path = "examples/iterator.rs"
+
+[[example]]
 name = "json"
-test = true
-required-features = ["std"]
-
-[[example]]
-name = "ndjson"
+path = "examples/json/main.rs"
 test = true
 required-features = ["std"]
 
 [[example]]
 name = "json_iterator"
+path = "examples/json_iterator.rs"
 required-features = ["std"]
 
 [[example]]
-name = "iterator"
+name = "ndjson"
+path = "examples/ndjson/main.rs"
+test = true
+required-features = ["std"]
 
 [[example]]
 name = "s_expression"
+path = "examples/s_expression/main.rs"
 required-features = ["alloc"]
 
 [[example]]
 name = "string"
+path = "examples/string/main.rs"
 required-features = ["alloc"]
 
 [[bench]]
@@ -152,22 +187,12 @@
 
 [[bench]]
 name = "contains_token"
+path = "benches/contains_token.rs"
 harness = false
 
 [[bench]]
 name = "find_slice"
-harness = false
-
-[[bench]]
-name = "iter"
-harness = false
-
-[[bench]]
-name = "next_slice"
-harness = false
-
-[[bench]]
-name = "number"
+path = "benches/find_slice.rs"
 harness = false
 
 [[bench]]
@@ -183,11 +208,26 @@
 required-features = ["std"]
 
 [[bench]]
+name = "iter"
+path = "benches/iter.rs"
+harness = false
+
+[[bench]]
 name = "json"
 path = "examples/json/bench.rs"
 harness = false
 required-features = ["std"]
 
+[[bench]]
+name = "next_slice"
+path = "benches/next_slice.rs"
+harness = false
+
+[[bench]]
+name = "number"
+path = "benches/number.rs"
+harness = false
+
 [dependencies.anstream]
 version = "0.3.2"
 optional = true
@@ -206,9 +246,18 @@
 default-features = false
 
 [dependencies.terminal_size]
-version = "0.2.6"
+version = "0.4.0"
 optional = true
 
+[dev-dependencies.annotate-snippets]
+version = "0.11.3"
+
+[dev-dependencies.anyhow]
+version = "1.0.86"
+
+[dev-dependencies.automod]
+version = "1.0.14"
+
 [dev-dependencies.circular]
 version = "0.3.0"
 
@@ -218,9 +267,6 @@
 [dev-dependencies.doc-comment]
 version = "0.3"
 
-[dev-dependencies.escargot]
-version = "0.5.7"
-
 [dev-dependencies.lexopt]
 version = "0.3.0"
 
@@ -231,30 +277,83 @@
 version = "1.1.0"
 
 [dev-dependencies.snapbox]
-version = "0.4.11"
+version = "0.6.0"
 features = ["examples"]
 
 [dev-dependencies.term-transcript]
 version = "0.2.0"
 
-[features]
-alloc = []
-debug = [
-    "dep:anstream",
-    "dep:anstyle",
-    "dep:is-terminal",
-    "dep:terminal_size",
-]
-default = ["std"]
-simd = ["dep:memchr"]
-std = [
-    "alloc",
-    "memchr?/std",
-]
-unstable-doc = [
-    "alloc",
-    "std",
-    "simd",
-    "unstable-recover",
-]
-unstable-recover = []
+[lints.clippy]
+bool_assert_comparison = "allow"
+branches_sharing_code = "allow"
+checked_conversions = "warn"
+collapsible_else_if = "allow"
+create_dir = "warn"
+dbg_macro = "warn"
+debug_assert_with_mut_call = "warn"
+doc_markdown = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+expl_impl_clone_on_copy = "warn"
+explicit_deref_methods = "warn"
+explicit_into_iter_loop = "warn"
+fallible_impl_from = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+float_cmp_const = "warn"
+fn_params_excessive_bools = "warn"
+from_iter_instead_of_collect = "warn"
+if_same_then_else = "allow"
+implicit_clone = "warn"
+imprecise_flops = "warn"
+inconsistent_struct_constructor = "warn"
+inefficient_to_string = "warn"
+infinite_loop = "warn"
+invalid_upcast_comparisons = "warn"
+large_digit_groups = "warn"
+large_stack_arrays = "warn"
+large_types_passed_by_value = "warn"
+let_and_return = "allow"
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+mem_forget = "warn"
+mutex_integer = "warn"
+needless_continue = "warn"
+needless_for_each = "warn"
+negative_feature_names = "warn"
+path_buf_push_overwrite = "warn"
+ptr_as_ptr = "warn"
+rc_mutex = "warn"
+redundant_feature_names = "warn"
+ref_option_ref = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+result_large_err = "allow"
+same_functions_in_if_condition = "warn"
+semicolon_if_nothing_returned = "warn"
+str_to_string = "warn"
+string_add = "warn"
+string_add_assign = "warn"
+string_lit_as_bytes = "warn"
+string_to_string = "warn"
+todo = "warn"
+trait_duplication_in_bounds = "warn"
+uninlined_format_args = "warn"
+verbose_file_reads = "warn"
+wildcard_imports = "allow"
+zero_sized_map_values = "warn"
+
+[lints.rust]
+unreachable_pub = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+unused_lifetimes = "warn"
+unused_macro_rules = "warn"
+
+[lints.rust.rust_2018_idioms]
+level = "warn"
+priority = -1
+
+[profile.bench]
+lto = true
+codegen-units = 1
+debug = 2

crates/winnow/METADATA

diff --git a/crates/winnow/METADATA b/crates/winnow/METADATA
index d0decfb..15b0e37 100644
--- a/crates/winnow/METADATA
+++ b/crates/winnow/METADATA
@@ -1,17 +1,17 @@
 name: "winnow"
 description: "A byte-oriented, zero-copy, parser combinators library"
 third_party {
-  version: "0.5.37"
+  version: "0.6.24"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2024
-    month: 2
-    day: 6
+    year: 2025
+    month: 1
+    day: 14
   }
   homepage: "https://crates.io/crates/winnow"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/winnow/winnow-0.5.37.crate"
-    version: "0.5.37"
+    value: "https://static.crates.io/crates/winnow/winnow-0.6.24.crate"
+    version: "0.6.24"
   }
 }

crates/winnow/benches/iter.rs

diff --git a/crates/winnow/benches/iter.rs b/crates/winnow/benches/iter.rs
index 0a0d5ff..6f42baa 100644
--- a/crates/winnow/benches/iter.rs
+++ b/crates/winnow/benches/iter.rs
@@ -107,7 +107,8 @@
         count += winnow::combinator::repeat(0.., one_of(AsChar::is_dec_digit))
             .map(|count: usize| count)
             .parse_next(input)?;
-        winnow::combinator::repeat(0.., one_of(|b: u8| !b.is_dec_digit())).parse_next(input)?;
+        let () =
+            winnow::combinator::repeat(0.., one_of(|b: u8| !b.is_dec_digit())).parse_next(input)?;
     }
     Ok(count)
 }

crates/winnow/benches/next_slice.rs

diff --git a/crates/winnow/benches/next_slice.rs b/crates/winnow/benches/next_slice.rs
index 6c25d23..b8f2e0b 100644
--- a/crates/winnow/benches/next_slice.rs
+++ b/crates/winnow/benches/next_slice.rs
@@ -2,8 +2,8 @@
 
 use winnow::combinator::repeat;
 use winnow::prelude::*;
+use winnow::token::literal;
 use winnow::token::one_of;
-use winnow::token::tag;
 
 fn next_slice(c: &mut criterion::Criterion) {
     let mut group = c.benchmark_group("next_slice");
@@ -102,11 +102,11 @@
 }
 
 fn parser_ascii_tag_char(input: &mut &str) -> PResult<usize> {
-    repeat(0.., tag('h')).parse_next(input)
+    repeat(0.., literal('h')).parse_next(input)
 }
 
 fn parser_ascii_tag_str(input: &mut &str) -> PResult<usize> {
-    repeat(0.., tag("h")).parse_next(input)
+    repeat(0.., literal("h")).parse_next(input)
 }
 
 fn parser_utf8_char(input: &mut &str) -> PResult<usize> {
@@ -122,11 +122,11 @@
 }
 
 fn parser_utf8_tag_char(input: &mut &str) -> PResult<usize> {
-    repeat(0.., tag('🧑')).parse_next(input)
+    repeat(0.., literal('🧑')).parse_next(input)
 }
 
 fn parser_utf8_tag_str(input: &mut &str) -> PResult<usize> {
-    repeat(0.., tag("🧑")).parse_next(input)
+    repeat(0.., literal("🧑")).parse_next(input)
 }
 
 criterion::criterion_group!(benches, next_slice);

crates/winnow/examples/arithmetic/main.rs

diff --git a/crates/winnow/examples/arithmetic/main.rs b/crates/winnow/examples/arithmetic/main.rs
index e46cf2f..046ad8c 100644
--- a/crates/winnow/examples/arithmetic/main.rs
+++ b/crates/winnow/examples/arithmetic/main.rs
@@ -10,7 +10,7 @@
     let input = args.input.as_deref().unwrap_or("1 + 1");
     if let Err(err) = calc(input, args.implementation) {
         println!("FAILED");
-        println!("{}", err);
+        println!("{err}");
     }
 
     Ok(())
@@ -20,11 +20,11 @@
     input: &str,
     imp: Impl,
 ) -> Result<(), winnow::error::ParseError<&str, winnow::error::ContextError>> {
-    println!("{} =", input);
+    println!("{input} =");
     match imp {
         Impl::Eval => {
             let result = parser::expr.parse(input)?;
-            println!("  {}", result);
+            println!("  {result}");
         }
         Impl::Ast => {
             let result = parser_ast::expr.parse(input)?;
@@ -32,7 +32,7 @@
         }
         Impl::Lexer => {
             let tokens = parser_lexer::lex.parse(input)?;
-            println!("  {:#?}", tokens);
+            println!("  {tokens:#?}");
             let result = parser_lexer::expr.parse(tokens.as_slice()).unwrap();
             println!("  {:#?}={}", result, result.eval());
         }

crates/winnow/examples/arithmetic/parser.rs

diff --git a/crates/winnow/examples/arithmetic/parser.rs b/crates/winnow/examples/arithmetic/parser.rs
index d51007a..2e174d8 100644
--- a/crates/winnow/examples/arithmetic/parser.rs
+++ b/crates/winnow/examples/arithmetic/parser.rs
@@ -11,7 +11,7 @@
 
 // Parser definition
 
-pub fn expr(i: &mut &str) -> PResult<i64> {
+pub(crate) fn expr(i: &mut &str) -> PResult<i64> {
     let init = term.parse_next(i)?;
 
     repeat(0.., (one_of(['+', '-']), term))

crates/winnow/examples/arithmetic/parser_ast.rs

diff --git a/crates/winnow/examples/arithmetic/parser_ast.rs b/crates/winnow/examples/arithmetic/parser_ast.rs
index 20feb26..251d730 100644
--- a/crates/winnow/examples/arithmetic/parser_ast.rs
+++ b/crates/winnow/examples/arithmetic/parser_ast.rs
@@ -13,7 +13,7 @@
 };
 
 #[derive(Debug, Clone)]
-pub enum Expr {
+pub(crate) enum Expr {
     Value(i64),
     Add(Box<Expr>, Box<Expr>),
     Sub(Box<Expr>, Box<Expr>),
@@ -23,7 +23,7 @@
 }
 
 impl Expr {
-    pub fn eval(&self) -> i64 {
+    pub(crate) fn eval(&self) -> i64 {
         match self {
             Self::Value(v) => *v,
             Self::Add(lhs, rhs) => lhs.eval() + rhs.eval(),
@@ -39,17 +39,17 @@
     fn fmt(&self, format: &mut Formatter<'_>) -> fmt::Result {
         use Expr::{Add, Div, Mul, Paren, Sub, Value};
         match *self {
-            Value(val) => write!(format, "{}", val),
-            Add(ref left, ref right) => write!(format, "{} + {}", left, right),
-            Sub(ref left, ref right) => write!(format, "{} - {}", left, right),
-            Mul(ref left, ref right) => write!(format, "{} * {}", left, right),
-            Div(ref left, ref right) => write!(format, "{} / {}", left, right),
-            Paren(ref expr) => write!(format, "({})", expr),
+            Value(val) => write!(format, "{val}"),
+            Add(ref left, ref right) => write!(format, "{left} + {right}"),
+            Sub(ref left, ref right) => write!(format, "{left} - {right}"),
+            Mul(ref left, ref right) => write!(format, "{left} * {right}"),
+            Div(ref left, ref right) => write!(format, "{left} / {right}"),
+            Paren(ref expr) => write!(format, "({expr})"),
         }
     }
 }
 
-pub fn expr(i: &mut &str) -> PResult<Expr> {
+pub(crate) fn expr(i: &mut &str) -> PResult<Expr> {
     let init = term.parse_next(i)?;
 
     repeat(0.., (one_of(['+', '-']), term))

crates/winnow/examples/arithmetic/parser_lexer.rs

diff --git a/crates/winnow/examples/arithmetic/parser_lexer.rs b/crates/winnow/examples/arithmetic/parser_lexer.rs
index d6b7422..3e3d842 100644
--- a/crates/winnow/examples/arithmetic/parser_lexer.rs
+++ b/crates/winnow/examples/arithmetic/parser_lexer.rs
@@ -17,7 +17,7 @@
 };
 
 #[derive(Debug, Clone)]
-pub enum Expr {
+pub(crate) enum Expr {
     Value(i64),
     Add(Box<Expr>, Box<Expr>),
     Sub(Box<Expr>, Box<Expr>),
@@ -27,7 +27,7 @@
 }
 
 impl Expr {
-    pub fn eval(&self) -> i64 {
+    pub(crate) fn eval(&self) -> i64 {
         match self {
             Self::Value(v) => *v,
             Self::Add(lhs, rhs) => lhs.eval() + rhs.eval(),
@@ -43,12 +43,12 @@
     fn fmt(&self, format: &mut Formatter<'_>) -> fmt::Result {
         use Expr::{Add, Div, Mul, Paren, Sub, Value};
         match *self {
-            Value(val) => write!(format, "{}", val),
-            Add(ref left, ref right) => write!(format, "{} + {}", left, right),
-            Sub(ref left, ref right) => write!(format, "{} - {}", left, right),
-            Mul(ref left, ref right) => write!(format, "{} * {}", left, right),
-            Div(ref left, ref right) => write!(format, "{} / {}", left, right),
-            Paren(ref expr) => write!(format, "({})", expr),
+            Value(val) => write!(format, "{val}"),
+            Add(ref left, ref right) => write!(format, "{left} + {right}"),
+            Sub(ref left, ref right) => write!(format, "{left} - {right}"),
+            Mul(ref left, ref right) => write!(format, "{left} * {right}"),
+            Div(ref left, ref right) => write!(format, "{left} / {right}"),
+            Paren(ref expr) => write!(format, "({expr})"),
         }
     }
 }
@@ -98,12 +98,12 @@
 }
 
 #[allow(dead_code)]
-pub fn expr2(i: &mut &str) -> PResult<Expr> {
+pub(crate) fn expr2(i: &mut &str) -> PResult<Expr> {
     let tokens = lex.parse_next(i)?;
     expr.parse_next(&mut tokens.as_slice())
 }
 
-pub fn lex(i: &mut &str) -> PResult<Vec<Token>> {
+pub(crate) fn lex(i: &mut &str) -> PResult<Vec<Token>> {
     preceded(multispaces, repeat(1.., terminated(token, multispaces))).parse_next(i)
 }
 
@@ -121,7 +121,7 @@
     .parse_next(i)
 }
 
-pub fn expr(i: &mut &[Token]) -> PResult<Expr> {
+pub(crate) fn expr(i: &mut &[Token]) -> PResult<Expr> {
     let init = term.parse_next(i)?;
 
     repeat(

crates/winnow/examples/css/main.rs

diff --git a/crates/winnow/examples/css/main.rs b/crates/winnow/examples/css/main.rs
index cf52ada..f6e981d 100644
--- a/crates/winnow/examples/css/main.rs
+++ b/crates/winnow/examples/css/main.rs
@@ -9,13 +9,13 @@
 
     let input = args.input.as_deref().unwrap_or("#AAAAAA");
 
-    println!("{} =", input);
+    println!("{input} =");
     match hex_color.parse(input) {
         Ok(result) => {
-            println!("  {:?}", result);
+            println!("  {result:?}");
         }
         Err(err) => {
-            println!("  {}", err);
+            println!("  {err}");
         }
     }
 

crates/winnow/examples/css/parser.rs

diff --git a/crates/winnow/examples/css/parser.rs b/crates/winnow/examples/css/parser.rs
index fa13078..8088de5 100644
--- a/crates/winnow/examples/css/parser.rs
+++ b/crates/winnow/examples/css/parser.rs
@@ -3,10 +3,10 @@
 use winnow::token::take_while;
 
 #[derive(Debug, Eq, PartialEq)]
-pub struct Color {
-    pub red: u8,
-    pub green: u8,
-    pub blue: u8,
+pub(crate) struct Color {
+    pub(crate) red: u8,
+    pub(crate) green: u8,
+    pub(crate) blue: u8,
 }
 
 impl std::str::FromStr for Color {
@@ -18,7 +18,7 @@
     }
 }
 
-pub fn hex_color(input: &mut &str) -> PResult<Color> {
+pub(crate) fn hex_color(input: &mut &str) -> PResult<Color> {
     seq!(Color {
         _: '#',
         red: hex_primary,

crates/winnow/examples/custom_error.rs

diff --git a/crates/winnow/examples/custom_error.rs b/crates/winnow/examples/custom_error.rs
index 998e5ad..a728a7e 100644
--- a/crates/winnow/examples/custom_error.rs
+++ b/crates/winnow/examples/custom_error.rs
@@ -1,24 +1,57 @@
+use winnow::error::AddContext;
 use winnow::error::ErrMode;
 use winnow::error::ErrorKind;
+use winnow::error::FromExternalError;
 use winnow::error::ParserError;
 use winnow::prelude::*;
+use winnow::stream::Stream;
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 pub enum CustomError<I> {
     MyError,
-    Nom(I, ErrorKind),
+    Winnow(I, ErrorKind),
+    External {
+        cause: Box<dyn std::error::Error + Send + Sync + 'static>,
+        input: I,
+        kind: ErrorKind,
+    },
 }
 
-impl<I: Clone> ParserError<I> for CustomError<I> {
+impl<I: Stream + Clone> ParserError<I> for CustomError<I> {
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
-        CustomError::Nom(input.clone(), kind)
+        CustomError::Winnow(input.clone(), kind)
     }
 
-    fn append(self, _: &I, _: ErrorKind) -> Self {
+    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> Self {
         self
     }
 }
 
+impl<C, I: Stream> AddContext<I, C> for CustomError<I> {
+    #[inline]
+    fn add_context(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _context: C,
+    ) -> Self {
+        self
+    }
+}
+
+impl<I: Stream + Clone, E: std::error::Error + Send + Sync + 'static> FromExternalError<I, E>
+    for CustomError<I>
+{
+    #[inline]
+    fn from_external_error(input: &I, kind: ErrorKind, e: E) -> Self {
+        CustomError::External {
+            cause: Box::new(e),
+            input: input.clone(),
+            kind,
+        }
+    }
+}
+
 pub fn parse<'s>(_input: &mut &'s str) -> PResult<&'s str, CustomError<&'s str>> {
     Err(ErrMode::Backtrack(CustomError::MyError))
 }
@@ -32,9 +65,6 @@
     #[test]
     fn it_works() {
         let err = parse.parse_next(&mut "").unwrap_err();
-        match err {
-            ErrMode::Backtrack(e) => assert_eq!(e, CustomError::MyError),
-            _ => panic!("Unexpected error: {:?}", err),
-        }
+        assert!(matches!(err, ErrMode::Backtrack(CustomError::MyError)));
     }
 }

crates/winnow/examples/http/main.rs

diff --git a/crates/winnow/examples/http/main.rs b/crates/winnow/examples/http/main.rs
index b0e480f..02858c2 100644
--- a/crates/winnow/examples/http/main.rs
+++ b/crates/winnow/examples/http/main.rs
@@ -16,7 +16,7 @@
     );
 
     if let Some(result) = parser::parse(input.as_bytes()) {
-        println!("  {:#?}", result);
+        println!("  {result:#?}");
     }
 
     Ok(())

crates/winnow/examples/http/parser.rs

diff --git a/crates/winnow/examples/http/parser.rs b/crates/winnow/examples/http/parser.rs
index 0afe33b..4c790f4 100644
--- a/crates/winnow/examples/http/parser.rs
+++ b/crates/winnow/examples/http/parser.rs
@@ -2,12 +2,12 @@
 use winnow::prelude::*;
 use winnow::{ascii::line_ending, combinator::repeat, token::take_while};
 
-pub type Stream<'i> = &'i [u8];
+pub(crate) type Stream<'i> = &'i [u8];
 
 #[rustfmt::skip]
 #[derive(Debug)]
 #[allow(dead_code)]
-pub struct Request<'a> {
+pub(crate) struct Request<'a> {
   method:  &'a [u8],
   uri:     &'a [u8],
   version: &'a [u8],
@@ -15,12 +15,12 @@
 
 #[derive(Debug)]
 #[allow(dead_code)]
-pub struct Header<'a> {
+pub(crate) struct Header<'a> {
     name: &'a [u8],
     value: Vec<&'a [u8]>,
 }
 
-pub fn parse(data: &[u8]) -> Option<Vec<(Request<'_>, Vec<Header<'_>>)>> {
+pub(crate) fn parse(data: &[u8]) -> Option<Vec<(Request<'_>, Vec<Header<'_>>)>> {
     let mut buf = data;
     let mut v = Vec::new();
     loop {
@@ -34,7 +34,7 @@
                 }
             }
             Err(e) => {
-                println!("error: {:?}", e);
+                println!("error: {e:?}");
                 return None;
             }
         }

crates/winnow/examples/http/parser_streaming.rs

diff --git a/crates/winnow/examples/http/parser_streaming.rs b/crates/winnow/examples/http/parser_streaming.rs
index 1079bc0..361730e 100644
--- a/crates/winnow/examples/http/parser_streaming.rs
+++ b/crates/winnow/examples/http/parser_streaming.rs
@@ -3,12 +3,12 @@
     ascii::line_ending, combinator::repeat, prelude::*, stream::Partial, token::take_while,
 };
 
-pub type Stream<'i> = Partial<&'i [u8]>;
+pub(crate) type Stream<'i> = Partial<&'i [u8]>;
 
 #[rustfmt::skip]
 #[derive(Debug)]
 #[allow(dead_code)]
-pub struct Request<'a> {
+pub(crate) struct Request<'a> {
   method:  &'a [u8],
   uri:     &'a [u8],
   version: &'a [u8],
@@ -16,12 +16,12 @@
 
 #[derive(Debug)]
 #[allow(dead_code)]
-pub struct Header<'a> {
+pub(crate) struct Header<'a> {
     name: &'a [u8],
     value: Vec<&'a [u8]>,
 }
 
-pub fn parse(data: &[u8]) -> Option<Vec<(Request<'_>, Vec<Header<'_>>)>> {
+pub(crate) fn parse(data: &[u8]) -> Option<Vec<(Request<'_>, Vec<Header<'_>>)>> {
     let mut buf = Partial::new(data);
     let mut v = Vec::new();
     loop {
@@ -35,7 +35,7 @@
                 }
             }
             Err(e) => {
-                println!("error: {:?}", e);
+                println!("error: {e:?}");
                 return None;
             }
         }

crates/winnow/examples/ini/bench.rs

diff --git a/crates/winnow/examples/ini/bench.rs b/crates/winnow/examples/ini/bench.rs
index 3c7eab8..b6ccf28 100644
--- a/crates/winnow/examples/ini/bench.rs
+++ b/crates/winnow/examples/ini/bench.rs
@@ -21,7 +21,7 @@
         b.iter(|| parser::categories.parse_peek(str.as_bytes()).unwrap());
     });
     group.bench_function(criterion::BenchmarkId::new("str", str.len()), |b| {
-        b.iter(|| parser_str::categories.parse_peek(str).unwrap())
+        b.iter(|| parser_str::categories.parse_peek(str).unwrap());
     });
 }
 

crates/winnow/examples/ini/main.rs

diff --git a/crates/winnow/examples/ini/main.rs b/crates/winnow/examples/ini/main.rs
index 8f61d18..5e18887 100644
--- a/crates/winnow/examples/ini/main.rs
+++ b/crates/winnow/examples/ini/main.rs
@@ -11,19 +11,19 @@
     if args.binary {
         match parser::categories.parse(input.as_bytes()) {
             Ok(result) => {
-                println!("  {:?}", result);
+                println!("  {result:?}");
             }
             Err(err) => {
-                println!("  {:?}", err);
+                println!("  {err:?}");
             }
         }
     } else {
         match parser_str::categories.parse(input) {
             Ok(result) => {
-                println!("  {:?}", result);
+                println!("  {result:?}");
             }
             Err(err) => {
-                println!("  {}", err);
+                println!("  {err}");
             }
         }
     }

crates/winnow/examples/ini/parser.rs

diff --git a/crates/winnow/examples/ini/parser.rs b/crates/winnow/examples/ini/parser.rs
index a782d6e..13b552e 100644
--- a/crates/winnow/examples/ini/parser.rs
+++ b/crates/winnow/examples/ini/parser.rs
@@ -10,9 +10,11 @@
     token::take_while,
 };
 
-pub type Stream<'i> = &'i [u8];
+pub(crate) type Stream<'i> = &'i [u8];
 
-pub fn categories<'s>(i: &mut Stream<'s>) -> PResult<HashMap<&'s str, HashMap<&'s str, &'s str>>> {
+pub(crate) fn categories<'s>(
+    i: &mut Stream<'s>,
+) -> PResult<HashMap<&'s str, HashMap<&'s str, &'s str>>> {
     repeat(
         0..,
         separated_pair(
@@ -30,7 +32,7 @@
         .parse_next(i)
 }
 
-pub fn key_value<'s>(i: &mut Stream<'s>) -> PResult<(&'s str, &'s str)> {
+pub(crate) fn key_value<'s>(i: &mut Stream<'s>) -> PResult<(&'s str, &'s str)> {
     let key = alphanumeric.try_map(str::from_utf8).parse_next(i)?;
     let _ = (opt(space), '=', opt(space)).parse_next(i)?;
     let val = take_while(0.., |c| c != b'\n' && c != b';')
@@ -51,7 +53,7 @@
 key = value2"[..];
 
     let res = category.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
         Ok((i, o)) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o),
         _ => println!("error"),
@@ -68,7 +70,7 @@
     let ini_without_key_value = &b"\nkey = value2"[..];
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
         Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
         _ => println!("error"),
@@ -85,7 +87,7 @@
     let ini_without_key_value = &b"\nkey = value2"[..];
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
         Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
         _ => println!("error"),
@@ -102,7 +104,7 @@
     let ini_without_key_value = &b"\nkey = value2"[..];
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
         Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
         _ => println!("error"),

crates/winnow/examples/ini/parser_str.rs

diff --git a/crates/winnow/examples/ini/parser_str.rs b/crates/winnow/examples/ini/parser_str.rs
index 7c3603c..8af75a5 100644
--- a/crates/winnow/examples/ini/parser_str.rs
+++ b/crates/winnow/examples/ini/parser_str.rs
@@ -9,9 +9,9 @@
     token::{take_till, take_while},
 };
 
-pub type Stream<'i> = &'i str;
+pub(crate) type Stream<'i> = &'i str;
 
-pub fn categories<'s>(
+pub(crate) fn categories<'s>(
     input: &mut Stream<'s>,
 ) -> PResult<HashMap<&'s str, HashMap<&'s str, &'s str>>> {
     repeat(0.., category_and_keys).parse_next(input)
@@ -67,9 +67,9 @@
 key = value2";
 
     let res = category.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, o)) => println!("i: {} | o: {:?}", i, o),
+        Ok((i, o)) => println!("i: {i} | o: {o:?}"),
         _ => println!("error"),
     }
 
@@ -84,9 +84,9 @@
     let ini_without_key_value = "key = value2";
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+        Ok((i, (o1, o2))) => println!("i: {i} | o: ({o1:?},{o2:?})"),
         _ => println!("error"),
     }
 
@@ -101,9 +101,9 @@
     let ini_without_key_value = "key = value2";
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+        Ok((i, (o1, o2))) => println!("i: {i} | o: ({o1:?},{o2:?})"),
         _ => println!("error"),
     }
 
@@ -118,9 +118,9 @@
     let ini_without_key_value = "key = value2";
 
     let res = key_value.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+        Ok((i, (o1, o2))) => println!("i: {i} | o: ({o1:?},{o2:?})"),
         _ => println!("error"),
     }
 
@@ -138,9 +138,9 @@
     let ini_without_key_value = "[category]";
 
     let res = keys_and_values.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+        Ok((i, ref o)) => println!("i: {i} | o: {o:?}"),
         _ => println!("error"),
     }
 
@@ -163,9 +163,9 @@
     let ini_after_parser = "[category]";
 
     let res = category_and_keys.parse_peek(ini_file);
-    println!("{:?}", res);
+    println!("{res:?}");
     match res {
-        Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+        Ok((i, ref o)) => println!("i: {i} | o: {o:?}"),
         _ => println!("error"),
     }
 
@@ -191,7 +191,7 @@
     let res = categories.parse_peek(ini_file);
     //println!("{:?}", res);
     match res {
-        Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+        Ok((i, ref o)) => println!("i: {i} | o: {o:?}"),
         _ => println!("error"),
     }
 

crates/winnow/examples/iterator.rs

diff --git a/crates/winnow/examples/iterator.rs b/crates/winnow/examples/iterator.rs
index 5c8c731..a394f71 100644
--- a/crates/winnow/examples/iterator.rs
+++ b/crates/winnow/examples/iterator.rs
@@ -27,7 +27,7 @@
     });
 
     for value in it {
-        println!("parser returned: {}", value);
+        println!("parser returned: {value}");
     }
 
     println!("\n********************\n");
@@ -46,7 +46,7 @@
         });
 
     // will print "parser iterator returned: Ok(("abc", ["abc", "abc", "abc"]))"
-    println!("\nparser iterator returned: {:?}", res);
+    println!("\nparser iterator returned: {res:?}");
 
     println!("\n********************\n");
 
@@ -70,8 +70,5 @@
     let (remaining_input, ()) = parser_result.unwrap();
 
     // will print "iterator returned {"key1": "value1", "key3": "value3", "key2": "value2"}, remaining input is ';'"
-    println!(
-        "iterator returned {:?}, remaining input is '{}'",
-        res, remaining_input
-    );
+    println!("iterator returned {res:?}, remaining input is '{remaining_input}'");
 }

crates/winnow/examples/json/bench.rs

diff --git a/crates/winnow/examples/json/bench.rs b/crates/winnow/examples/json/bench.rs
index d074ba5..c789da2 100644
--- a/crates/winnow/examples/json/bench.rs
+++ b/crates/winnow/examples/json/bench.rs
@@ -13,21 +13,16 @@
         let len = sample.len();
         group.throughput(criterion::Throughput::Bytes(len as u64));
 
-        group.bench_with_input(criterion::BenchmarkId::new("basic", name), &len, |b, _| {
-            type Error<'i> = winnow::error::InputError<parser::Stream<'i>>;
-
-            b.iter(|| parser::json::<Error>.parse_peek(sample).unwrap());
-        });
         group.bench_with_input(criterion::BenchmarkId::new("unit", name), &len, |b, _| {
             type Error<'i> = ();
 
-            b.iter(|| parser::json::<Error>.parse_peek(sample).unwrap());
+            b.iter(|| parser::json::<Error<'_>>.parse_peek(sample).unwrap());
         });
         group.bench_with_input(
             criterion::BenchmarkId::new("context", name),
             &len,
             |b, _| {
-                type Error<'i> = winnow::error::ContextError<parser::Stream<'i>>;
+                type Error = winnow::error::ContextError;
 
                 b.iter(|| parser::json::<Error>.parse_peek(sample).unwrap());
             },
@@ -36,7 +31,7 @@
             criterion::BenchmarkId::new("dispatch", name),
             &len,
             |b, _| {
-                type Error<'i> = winnow::error::InputError<parser_dispatch::Stream<'i>>;
+                type Error = winnow::error::ContextError;
 
                 b.iter(|| parser_dispatch::json::<Error>.parse_peek(sample).unwrap());
             },
@@ -45,7 +40,7 @@
             criterion::BenchmarkId::new("streaming", name),
             &len,
             |b, _| {
-                type Error<'i> = winnow::error::InputError<parser_partial::Stream<'i>>;
+                type Error = winnow::error::ContextError;
 
                 b.iter(|| {
                     parser_partial::json::<Error>

crates/winnow/examples/json/json.rs

diff --git a/crates/winnow/examples/json/json.rs b/crates/winnow/examples/json/json.rs
index 6912d60..2611171 100644
--- a/crates/winnow/examples/json/json.rs
+++ b/crates/winnow/examples/json/json.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 #[derive(Debug, PartialEq, Clone)]
-pub enum JsonValue {
+pub(crate) enum JsonValue {
     Null,
     Boolean(bool),
     Str(String),

crates/winnow/examples/json/main.rs

diff --git a/crates/winnow/examples/json/main.rs b/crates/winnow/examples/json/main.rs
index be431e8..5f90f74 100644
--- a/crates/winnow/examples/json/main.rs
+++ b/crates/winnow/examples/json/main.rs
@@ -30,13 +30,13 @@
     };
     match result {
         Ok(json) => {
-            println!("{:#?}", json);
+            println!("{json:#?}");
         }
         Err(err) => {
             if args.pretty {
-                println!("{}", err);
+                println!("{err}");
             } else {
-                println!("{:#?}", err);
+                println!("{err:#?}");
             }
         }
     }

crates/winnow/examples/json/parser.rs

diff --git a/crates/winnow/examples/json/parser.rs b/crates/winnow/examples/json/parser.rs
index e8d9c8a..a9597f2 100644
--- a/crates/winnow/examples/json/parser.rs
+++ b/crates/winnow/examples/json/parser.rs
@@ -8,18 +8,18 @@
     combinator::cut_err,
     combinator::{delimited, preceded, separated_pair, terminated},
     combinator::{repeat, separated},
-    error::{AddContext, ParserError},
+    error::{AddContext, ParserError, StrContext},
     token::{any, none_of, take, take_while},
 };
 
 use crate::json::JsonValue;
 
-pub type Stream<'i> = &'i str;
+pub(crate) type Stream<'i> = &'i str;
 
 /// The root element of a JSON parser is any value
 ///
 /// A parser has the following signature:
-/// `&mut Stream -> PResult<Output, InputError>`, with `PResult` defined as:
+/// `&mut Stream -> PResult<Output, ContextError>`, with `PResult` defined as:
 /// `type PResult<O, E = (I, ErrorKind)> = Result<O, Err<E>>;`
 ///
 /// most of the times you can ignore the error type and use the default (but this
@@ -28,7 +28,7 @@
 /// Here we use `&str` as input type, but parsers can be generic over
 /// the input type, work directly with `&[u8]`, or any other type that
 /// implements the required traits.
-pub fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+pub(crate) fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     delimited(ws, json_value, ws).parse_next(input)
@@ -36,7 +36,7 @@
 
 /// `alt` is a combinator that tries multiple parsers one by one, until
 /// one of them succeeds
-fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     // `alt` combines the each value parser. It returns the result of the first
@@ -52,7 +52,7 @@
     .parse_next(input)
 }
 
-/// `tag(string)` generates a parser that recognizes the argument string.
+/// `literal(string)` generates a parser that takes the argument string.
 ///
 /// This also shows returning a sub-slice of the original input
 fn null<'i, E: ParserError<Stream<'i>>>(input: &mut Stream<'i>) -> PResult<&'i str, E> {
@@ -75,9 +75,9 @@
     alt((parse_true, parse_false)).parse_next(input)
 }
 
-/// This parser gathers all `char`s up into a `String`with a parse to recognize the double quote
+/// This parser gathers all `char`s up into a `String`with a parse to take the double quote
 /// character, before the string (using `preceded`) and after the string (using `terminated`).
-fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<String, E> {
     preceded(
@@ -96,7 +96,7 @@
     )
     // `context` lets you add a static string to errors to provide more information in the
     // error chain (to indicate which parser had an error)
-    .context("string")
+    .context(StrContext::Expected("string".into()))
     .parse_next(input)
 }
 
@@ -157,7 +157,7 @@
 /// accumulating results in a `Vec`, until it encounters an error.
 /// If you want more control on the parser application, check out the `iterator`
 /// combinator (cf `examples/iterator.rs`)
-fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<Vec<JsonValue>, E> {
     preceded(
@@ -167,11 +167,11 @@
             (ws, ']'),
         )),
     )
-    .context("array")
+    .context(StrContext::Expected("array".into()))
     .parse_next(input)
 }
 
-fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<HashMap<String, JsonValue>, E> {
     preceded(
@@ -181,11 +181,11 @@
             (ws, '}'),
         )),
     )
-    .context("object")
+    .context(StrContext::Expected("object".into()))
     .parse_next(input)
 }
 
-fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<(String, JsonValue), E> {
     separated_pair(string, cut_err((ws, ':', ws)), json_value).parse_next(input)
@@ -205,42 +205,37 @@
 #[cfg(test)]
 mod test {
     #[allow(clippy::useless_attribute)]
-    #[allow(dead_code)] // its dead for benches
+    #[allow(unused_imports)] // its dead for benches
     use super::*;
 
     #[allow(clippy::useless_attribute)]
     #[allow(dead_code)] // its dead for benches
-    type Error<'i> = winnow::error::InputError<&'i str>;
+    type Error = winnow::error::ContextError;
 
     #[test]
     fn json_string() {
+        assert_eq!(string::<Error>.parse_peek("\"\""), Ok(("", "".to_owned())));
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"\""),
-            Ok(("", "".to_string()))
+            string::<Error>.parse_peek("\"abc\""),
+            Ok(("", "abc".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"abc\""),
-            Ok(("", "abc".to_string()))
-        );
-        assert_eq!(
-            string::<Error<'_>>
+            string::<Error>
                 .parse_peek("\"abc\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0001\\u2014\u{2014}def\""),
-            Ok(("", "abc\"\\/\x08\x0C\n\r\t\x01——def".to_string())),
+            Ok(("", "abc\"\\/\x08\x0C\n\r\t\x01——def".to_owned())),
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"\\uD83D\\uDE10\""),
-            Ok(("", "😐".to_string()))
+            string::<Error>.parse_peek("\"\\uD83D\\uDE10\""),
+            Ok(("", "😐".to_owned()))
         );
 
-        assert!(string::<Error<'_>>.parse_peek("\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"abc").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\u123\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\uD800\"").is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek("\"\\uD800\\uD800\"")
-            .is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\uDC00\"").is_err());
+        assert!(string::<Error>.parse_peek("\"").is_err());
+        assert!(string::<Error>.parse_peek("\"abc").is_err());
+        assert!(string::<Error>.parse_peek("\"\\\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\u123\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uD800\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uD800\\uD800\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uDC00\"").is_err());
     }
 
     #[test]
@@ -251,14 +246,14 @@
 
         let expected = Object(
             vec![
-                ("a".to_string(), Num(42.0)),
-                ("b".to_string(), Str("x".to_string())),
+                ("a".to_owned(), Num(42.0)),
+                ("b".to_owned(), Str("x".to_owned())),
             ]
             .into_iter()
             .collect(),
         );
 
-        assert_eq!(json::<Error<'_>>.parse_peek(input), Ok(("", expected)));
+        assert_eq!(json::<Error>.parse_peek(input), Ok(("", expected)));
     }
 
     #[test]
@@ -267,9 +262,9 @@
 
         let input = r#"[42,"x"]"#;
 
-        let expected = Array(vec![Num(42.0), Str("x".to_string())]);
+        let expected = Array(vec![Num(42.0), Str("x".to_owned())]);
 
-        assert_eq!(json::<Error<'_>>.parse_peek(input), Ok(("", expected)));
+        assert_eq!(json::<Error>.parse_peek(input), Ok(("", expected)));
     }
 
     #[test]
@@ -291,33 +286,33 @@
   "#;
 
         assert_eq!(
-            json::<Error<'_>>.parse_peek(input),
+            json::<Error>.parse_peek(input),
             Ok((
                 "",
                 Object(
                     vec![
-                        ("null".to_string(), Null),
-                        ("true".to_string(), Boolean(true)),
-                        ("false".to_string(), Boolean(false)),
-                        ("number".to_string(), Num(123e4)),
-                        ("string".to_string(), Str(" abc 123 ".to_string())),
+                        ("null".to_owned(), Null),
+                        ("true".to_owned(), Boolean(true)),
+                        ("false".to_owned(), Boolean(false)),
+                        ("number".to_owned(), Num(123e4)),
+                        ("string".to_owned(), Str(" abc 123 ".to_owned())),
                         (
-                            "array".to_string(),
-                            Array(vec![Boolean(false), Num(1.0), Str("two".to_string())])
+                            "array".to_owned(),
+                            Array(vec![Boolean(false), Num(1.0), Str("two".to_owned())])
                         ),
                         (
-                            "object".to_string(),
+                            "object".to_owned(),
                             Object(
                                 vec![
-                                    ("a".to_string(), Num(1.0)),
-                                    ("b".to_string(), Str("c".to_string())),
+                                    ("a".to_owned(), Num(1.0)),
+                                    ("b".to_owned(), Str("c".to_owned())),
                                 ]
                                 .into_iter()
                                 .collect()
                             )
                         ),
-                        ("empty_array".to_string(), Array(vec![]),),
-                        ("empty_object".to_string(), Object(HashMap::new()),),
+                        ("empty_array".to_owned(), Array(vec![]),),
+                        ("empty_object".to_owned(), Object(HashMap::new()),),
                     ]
                     .into_iter()
                     .collect()

crates/winnow/examples/json/parser_dispatch.rs

diff --git a/crates/winnow/examples/json/parser_dispatch.rs b/crates/winnow/examples/json/parser_dispatch.rs
index 11bda4f..06b391b 100644
--- a/crates/winnow/examples/json/parser_dispatch.rs
+++ b/crates/winnow/examples/json/parser_dispatch.rs
@@ -11,18 +11,18 @@
     combinator::{alt, dispatch},
     combinator::{delimited, preceded, separated_pair, terminated},
     combinator::{repeat, separated},
-    error::{AddContext, ParserError},
+    error::{AddContext, ParserError, StrContext},
     token::{any, none_of, take, take_while},
 };
 
 use crate::json::JsonValue;
 
-pub type Stream<'i> = &'i str;
+pub(crate) type Stream<'i> = &'i str;
 
 /// The root element of a JSON parser is any value
 ///
 /// A parser has the following signature:
-/// `&mut Stream -> PResult<Output, InputError>`, with `PResult` defined as:
+/// `&mut Stream -> PResult<Output ContextError>`, with `PResult` defined as:
 /// `type PResult<O, E = ErrorKind> = Result<O, ErrMode<E>>;`
 ///
 /// most of the times you can ignore the error type and use the default (but this
@@ -31,7 +31,7 @@
 /// Here we use `&str` as input type, but parsers can be generic over
 /// the input type, work directly with `&[u8]`, or any other type that
 /// implements the required traits.
-pub fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+pub(crate) fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     delimited(ws, json_value, ws).parse_next(input)
@@ -39,7 +39,7 @@
 
 /// `alt` is a combinator that tries multiple parsers one by one, until
 /// one of them succeeds
-fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     // `dispatch` gives you `match`-like behavior compared to `alt` successively trying different
@@ -59,7 +59,7 @@
     .parse_next(input)
 }
 
-/// `tag(string)` generates a parser that recognizes the argument string.
+/// `literal(string)` generates a parser that takes the argument string.
 ///
 /// This also shows returning a sub-slice of the original input
 fn null<'i, E: ParserError<Stream<'i>>>(input: &mut Stream<'i>) -> PResult<&'i str, E> {
@@ -84,9 +84,9 @@
     "false".value(false).parse_next(input)
 }
 
-/// This parser gathers all `char`s up into a `String`with a parse to recognize the double quote
+/// This parser gathers all `char`s up into a `String`with a parse to take the double quote
 /// character, before the string (using `preceded`) and after the string (using `terminated`).
-fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<String, E> {
     preceded(
@@ -105,7 +105,7 @@
     )
     // `context` lets you add a static string to errors to provide more information in the
     // error chain (to indicate which parser had an error)
-    .context("string")
+    .context(StrContext::Expected("string".into()))
     .parse_next(input)
 }
 
@@ -164,7 +164,7 @@
 /// accumulating results in a `Vec`, until it encounters an error.
 /// If you want more control on the parser application, check out the `iterator`
 /// combinator (cf `examples/iterator.rs`)
-fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<Vec<JsonValue>, E> {
     preceded(
@@ -174,11 +174,11 @@
             (ws, ']'),
         )),
     )
-    .context("array")
+    .context(StrContext::Expected("array".into()))
     .parse_next(input)
 }
 
-fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<HashMap<String, JsonValue>, E> {
     preceded(
@@ -188,11 +188,11 @@
             (ws, '}'),
         )),
     )
-    .context("object")
+    .context(StrContext::Expected("object".into()))
     .parse_next(input)
 }
 
-fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<(String, JsonValue), E> {
     separated_pair(string, cut_err((ws, ':', ws)), json_value).parse_next(input)
@@ -212,42 +212,37 @@
 #[cfg(test)]
 mod test {
     #[allow(clippy::useless_attribute)]
-    #[allow(dead_code)] // its dead for benches
+    #[allow(unused_imports)] // its dead for benches
     use super::*;
 
     #[allow(clippy::useless_attribute)]
     #[allow(dead_code)] // its dead for benches
-    type Error<'i> = winnow::error::InputError<&'i str>;
+    type Error = winnow::error::ContextError;
 
     #[test]
     fn json_string() {
+        assert_eq!(string::<Error>.parse_peek("\"\""), Ok(("", "".to_owned())));
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"\""),
-            Ok(("", "".to_string()))
+            string::<Error>.parse_peek("\"abc\""),
+            Ok(("", "abc".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"abc\""),
-            Ok(("", "abc".to_string()))
-        );
-        assert_eq!(
-            string::<Error<'_>>
+            string::<Error>
                 .parse_peek("\"abc\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0001\\u2014\u{2014}def\""),
-            Ok(("", "abc\"\\/\x08\x0C\n\r\t\x01——def".to_string())),
+            Ok(("", "abc\"\\/\x08\x0C\n\r\t\x01——def".to_owned())),
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek("\"\\uD83D\\uDE10\""),
-            Ok(("", "😐".to_string()))
+            string::<Error>.parse_peek("\"\\uD83D\\uDE10\""),
+            Ok(("", "😐".to_owned()))
         );
 
-        assert!(string::<Error<'_>>.parse_peek("\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"abc").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\u123\"").is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\uD800\"").is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek("\"\\uD800\\uD800\"")
-            .is_err());
-        assert!(string::<Error<'_>>.parse_peek("\"\\uDC00\"").is_err());
+        assert!(string::<Error>.parse_peek("\"").is_err());
+        assert!(string::<Error>.parse_peek("\"abc").is_err());
+        assert!(string::<Error>.parse_peek("\"\\\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\u123\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uD800\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uD800\\uD800\"").is_err());
+        assert!(string::<Error>.parse_peek("\"\\uDC00\"").is_err());
     }
 
     #[test]
@@ -258,14 +253,14 @@
 
         let expected = Object(
             vec![
-                ("a".to_string(), Num(42.0)),
-                ("b".to_string(), Str("x".to_string())),
+                ("a".to_owned(), Num(42.0)),
+                ("b".to_owned(), Str("x".to_owned())),
             ]
             .into_iter()
             .collect(),
         );
 
-        assert_eq!(json::<Error<'_>>.parse_peek(input), Ok(("", expected)));
+        assert_eq!(json::<Error>.parse_peek(input), Ok(("", expected)));
     }
 
     #[test]
@@ -274,9 +269,9 @@
 
         let input = r#"[42,"x"]"#;
 
-        let expected = Array(vec![Num(42.0), Str("x".to_string())]);
+        let expected = Array(vec![Num(42.0), Str("x".to_owned())]);
 
-        assert_eq!(json::<Error<'_>>.parse_peek(input), Ok(("", expected)));
+        assert_eq!(json::<Error>.parse_peek(input), Ok(("", expected)));
     }
 
     #[test]
@@ -298,33 +293,33 @@
   "#;
 
         assert_eq!(
-            json::<Error<'_>>.parse_peek(input),
+            json::<Error>.parse_peek(input),
             Ok((
                 "",
                 Object(
                     vec![
-                        ("null".to_string(), Null),
-                        ("true".to_string(), Boolean(true)),
-                        ("false".to_string(), Boolean(false)),
-                        ("number".to_string(), Num(123e4)),
-                        ("string".to_string(), Str(" abc 123 ".to_string())),
+                        ("null".to_owned(), Null),
+                        ("true".to_owned(), Boolean(true)),
+                        ("false".to_owned(), Boolean(false)),
+                        ("number".to_owned(), Num(123e4)),
+                        ("string".to_owned(), Str(" abc 123 ".to_owned())),
                         (
-                            "array".to_string(),
-                            Array(vec![Boolean(false), Num(1.0), Str("two".to_string())])
+                            "array".to_owned(),
+                            Array(vec![Boolean(false), Num(1.0), Str("two".to_owned())])
                         ),
                         (
-                            "object".to_string(),
+                            "object".to_owned(),
                             Object(
                                 vec![
-                                    ("a".to_string(), Num(1.0)),
-                                    ("b".to_string(), Str("c".to_string())),
+                                    ("a".to_owned(), Num(1.0)),
+                                    ("b".to_owned(), Str("c".to_owned())),
                                 ]
                                 .into_iter()
                                 .collect()
                             )
                         ),
-                        ("empty_array".to_string(), Array(vec![]),),
-                        ("empty_object".to_string(), Object(HashMap::new()),),
+                        ("empty_array".to_owned(), Array(vec![]),),
+                        ("empty_object".to_owned(), Object(HashMap::new()),),
                     ]
                     .into_iter()
                     .collect()

crates/winnow/examples/json/parser_partial.rs

diff --git a/crates/winnow/examples/json/parser_partial.rs b/crates/winnow/examples/json/parser_partial.rs
index 31aba00..864f7b2 100644
--- a/crates/winnow/examples/json/parser_partial.rs
+++ b/crates/winnow/examples/json/parser_partial.rs
@@ -5,22 +5,22 @@
 use winnow::{
     ascii::float,
     combinator::alt,
-    combinator::{cut_err, rest},
+    combinator::cut_err,
     combinator::{delimited, preceded, separated_pair, terminated},
     combinator::{repeat, separated},
-    error::{AddContext, ParserError},
+    error::{AddContext, ParserError, StrContext},
     stream::Partial,
-    token::{any, none_of, take, take_while},
+    token::{any, none_of, rest, take, take_while},
 };
 
 use crate::json::JsonValue;
 
-pub type Stream<'i> = Partial<&'i str>;
+pub(crate) type Stream<'i> = Partial<&'i str>;
 
 /// The root element of a JSON parser is any value
 ///
 /// A parser has the following signature:
-/// `&mut Stream -> PResult<Output, InputError>`, with `PResult` defined as:
+/// `&mut Stream -> PResult<Output, ContextError>`, with `PResult` defined as:
 /// `type PResult<O, E = ErrorKind> = Result<O, ErrMode<E>>;`
 ///
 /// most of the times you can ignore the error type and use the default (but this
@@ -29,7 +29,7 @@
 /// Here we use `&str` as input type, but parsers can be generic over
 /// the input type, work directly with `&[u8]`, or any other type that
 /// implements the required traits.
-pub fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+pub(crate) fn json<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     delimited(ws, json_value, ws_or_eof).parse_next(input)
@@ -37,7 +37,7 @@
 
 /// `alt` is a combinator that tries multiple parsers one by one, until
 /// one of them succeeds
-fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     // `alt` combines the each value parser. It returns the result of the first
@@ -53,7 +53,7 @@
     .parse_next(input)
 }
 
-/// `tag(string)` generates a parser that recognizes the argument string.
+/// `literal(string)` generates a parser that takes the argument string.
 ///
 /// This also shows returning a sub-slice of the original input
 fn null<'i, E: ParserError<Stream<'i>>>(input: &mut Stream<'i>) -> PResult<&'i str, E> {
@@ -76,9 +76,9 @@
     alt((parse_true, parse_false)).parse_next(input)
 }
 
-/// This parser gathers all `char`s up into a `String`with a parse to recognize the double quote
+/// This parser gathers all `char`s up into a `String`with a parse to take the double quote
 /// character, before the string (using `preceded`) and after the string (using `terminated`).
-fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<String, E> {
     preceded(
@@ -97,7 +97,7 @@
     )
     // `context` lets you add a static string to errors to provide more information in the
     // error chain (to indicate which parser had an error)
-    .context("string")
+    .context(StrContext::Expected("string".into()))
     .parse_next(input)
 }
 
@@ -158,7 +158,7 @@
 /// accumulating results in a `Vec`, until it encounters an error.
 /// If you want more control on the parser application, check out the `iterator`
 /// combinator (cf `examples/iterator.rs`)
-fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<Vec<JsonValue>, E> {
     preceded(
@@ -168,11 +168,11 @@
             (ws, ']'),
         )),
     )
-    .context("array")
+    .context(StrContext::Expected("array".into()))
     .parse_next(input)
 }
 
-fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<HashMap<String, JsonValue>, E> {
     preceded(
@@ -182,11 +182,11 @@
             (ws, '}'),
         )),
     )
-    .context("object")
+    .context(StrContext::Expected("object".into()))
     .parse_next(input)
 }
 
-fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<(String, JsonValue), E> {
     separated_pair(string, cut_err((ws, ':', ws)), json_value).parse_next(input)
@@ -211,54 +211,50 @@
 #[cfg(test)]
 mod test {
     #[allow(clippy::useless_attribute)]
-    #[allow(dead_code)] // its dead for benches
+    #[allow(unused_imports)] // its dead for benches
     use super::*;
 
     #[allow(clippy::useless_attribute)]
     #[allow(dead_code)] // its dead for benches
-    type Error<'i> = winnow::error::InputError<Partial<&'i str>>;
+    type Error = winnow::error::ContextError;
 
     #[test]
     fn json_string() {
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"\"")),
-            Ok((Partial::new(""), "".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"\"")),
+            Ok((Partial::new(""), "".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"abc\"")),
-            Ok((Partial::new(""), "abc".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"abc\"")),
+            Ok((Partial::new(""), "abc".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new(
+            string::<Error>.parse_peek(Partial::new(
                 "\"abc\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0001\\u2014\u{2014}def\""
             )),
             Ok((
                 Partial::new(""),
-                "abc\"\\/\x08\x0C\n\r\t\x01——def".to_string()
+                "abc\"\\/\x08\x0C\n\r\t\x01——def".to_owned()
             )),
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"\\uD83D\\uDE10\"")),
-            Ok((Partial::new(""), "😐".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"\\uD83D\\uDE10\"")),
+            Ok((Partial::new(""), "😐".to_owned()))
         );
 
-        assert!(string::<Error<'_>>.parse_peek(Partial::new("\"")).is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek(Partial::new("\"abc"))
-            .is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek(Partial::new("\"\\\""))
-            .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>.parse_peek(Partial::new("\"")).is_err());
+        assert!(string::<Error>.parse_peek(Partial::new("\"abc")).is_err());
+        assert!(string::<Error>.parse_peek(Partial::new("\"\\\"")).is_err());
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\u123\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uD800\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uD800\\uD800\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uDC00\""))
             .is_err());
     }
@@ -271,15 +267,15 @@
 
         let expected = Object(
             vec![
-                ("a".to_string(), Num(42.0)),
-                ("b".to_string(), Str("x".to_string())),
+                ("a".to_owned(), Num(42.0)),
+                ("b".to_owned(), Str("x".to_owned())),
             ]
             .into_iter()
             .collect(),
         );
 
         assert_eq!(
-            json::<Error<'_>>.parse_peek(Partial::new(input)),
+            json::<Error>.parse_peek(Partial::new(input)),
             Ok((Partial::new(""), expected))
         );
     }
@@ -290,10 +286,10 @@
 
         let input = r#"[42,"x"]"#;
 
-        let expected = Array(vec![Num(42.0), Str("x".to_string())]);
+        let expected = Array(vec![Num(42.0), Str("x".to_owned())]);
 
         assert_eq!(
-            json::<Error<'_>>.parse_peek(Partial::new(input)),
+            json::<Error>.parse_peek(Partial::new(input)),
             Ok((Partial::new(""), expected))
         );
     }
@@ -317,33 +313,33 @@
   "#;
 
         assert_eq!(
-            json::<Error<'_>>.parse_peek(Partial::new(input)),
+            json::<Error>.parse_peek(Partial::new(input)),
             Ok((
                 Partial::new(""),
                 Object(
                     vec![
-                        ("null".to_string(), Null),
-                        ("true".to_string(), Boolean(true)),
-                        ("false".to_string(), Boolean(false)),
-                        ("number".to_string(), Num(123e4)),
-                        ("string".to_string(), Str(" abc 123 ".to_string())),
+                        ("null".to_owned(), Null),
+                        ("true".to_owned(), Boolean(true)),
+                        ("false".to_owned(), Boolean(false)),
+                        ("number".to_owned(), Num(123e4)),
+                        ("string".to_owned(), Str(" abc 123 ".to_owned())),
                         (
-                            "array".to_string(),
-                            Array(vec![Boolean(false), Num(1.0), Str("two".to_string())])
+                            "array".to_owned(),
+                            Array(vec![Boolean(false), Num(1.0), Str("two".to_owned())])
                         ),
                         (
-                            "object".to_string(),
+                            "object".to_owned(),
                             Object(
                                 vec![
-                                    ("a".to_string(), Num(1.0)),
-                                    ("b".to_string(), Str("c".to_string())),
+                                    ("a".to_owned(), Num(1.0)),
+                                    ("b".to_owned(), Str("c".to_owned())),
                                 ]
                                 .into_iter()
                                 .collect()
                             )
                         ),
-                        ("empty_array".to_string(), Array(vec![]),),
-                        ("empty_object".to_string(), Object(HashMap::new()),),
+                        ("empty_array".to_owned(), Array(vec![]),),
+                        ("empty_object".to_owned(), Object(HashMap::new()),),
                     ]
                     .into_iter()
                     .collect()

crates/winnow/examples/json_iterator.rs

diff --git a/crates/winnow/examples/json_iterator.rs b/crates/winnow/examples/json_iterator.rs
index 9c21ae3..3ca8677 100644
--- a/crates/winnow/examples/json_iterator.rs
+++ b/crates/winnow/examples/json_iterator.rs
@@ -2,7 +2,7 @@
 
 use winnow::prelude::*;
 use winnow::{
-    ascii::{alphanumeric1 as alphanumeric, escaped, float},
+    ascii::{alphanumeric1 as alphanumeric, float, take_escaped},
     combinator::alt,
     combinator::cut_err,
     combinator::separated,
@@ -11,7 +11,7 @@
     error::StrContext,
     stream::Offset,
     token::one_of,
-    token::{tag, take_while},
+    token::{literal, take_while},
 };
 
 use std::cell::Cell;
@@ -43,7 +43,7 @@
         match string(&mut data) {
             Ok(s) => {
                 self.offset(data);
-                println!("-> {}", s);
+                println!("-> {s}");
                 Some(s)
             }
             _ => None,
@@ -56,7 +56,7 @@
         match boolean(&mut data) {
             Ok(o) => {
                 self.offset(data);
-                println!("-> {}", o);
+                println!("-> {o}");
                 Some(o)
             }
             _ => None,
@@ -69,7 +69,7 @@
         match float::<_, _, ()>.parse_next(&mut data) {
             Ok(o) => {
                 self.offset(data);
-                println!("-> {}", o);
+                println!("-> {o}");
                 Some(o)
             }
             _ => None,
@@ -80,14 +80,14 @@
         println!("array()");
 
         let mut data = self.data();
-        match tag::<_, _, ()>("[").parse_next(&mut data) {
+        match literal::<_, _, ()>("[").parse_next(&mut data) {
             Err(_) => None,
             Ok(_) => {
                 println!("[");
                 self.offset(data);
                 let mut first = true;
                 let mut done = false;
-                let mut previous = std::usize::MAX;
+                let mut previous = usize::MAX;
 
                 let v = self.clone();
 
@@ -104,7 +104,7 @@
                         }
                     }
 
-                    if tag::<_, _, ()>("]").parse_next(&mut data).is_ok() {
+                    if literal::<_, _, ()>("]").parse_next(&mut data).is_ok() {
                         println!("]");
                         v.offset(data);
                         done = true;
@@ -114,7 +114,7 @@
                     if first {
                         first = false;
                     } else {
-                        match tag::<_, _, ()>(",").parse_next(&mut data) {
+                        match literal::<_, _, ()>(",").parse_next(&mut data) {
                             Ok(_) => {
                                 println!(",");
                                 v.offset(data);
@@ -137,7 +137,7 @@
     pub fn object(&self) -> Option<impl Iterator<Item = (&'a str, JsonValue<'a, 'b>)>> {
         println!("object()");
         let mut data = self.data();
-        match tag::<_, _, ()>("{").parse_next(&mut data) {
+        match literal::<_, _, ()>("{").parse_next(&mut data) {
             Err(_) => None,
             Ok(_) => {
                 self.offset(data);
@@ -146,7 +146,7 @@
 
                 let mut first = true;
                 let mut done = false;
-                let mut previous = std::usize::MAX;
+                let mut previous = usize::MAX;
 
                 let v = self.clone();
 
@@ -163,7 +163,7 @@
                         }
                     }
 
-                    if tag::<_, _, ()>("}").parse_next(&mut data).is_ok() {
+                    if literal::<_, _, ()>("}").parse_next(&mut data).is_ok() {
                         println!("}}");
                         v.offset(data);
                         done = true;
@@ -173,7 +173,7 @@
                     if first {
                         first = false;
                     } else {
-                        match tag::<_, _, ()>(",").parse_next(&mut data) {
+                        match literal::<_, _, ()>(",").parse_next(&mut data) {
                             Ok(_) => {
                                 println!(",");
                                 v.offset(data);
@@ -189,7 +189,7 @@
                         Ok(key) => {
                             v.offset(data);
 
-                            match tag::<_, _, ()>(":").parse_next(&mut data) {
+                            match literal::<_, _, ()>(":").parse_next(&mut data) {
                                 Err(_) => None,
                                 Ok(_) => {
                                     v.offset(data);
@@ -216,7 +216,7 @@
 }
 
 fn parse_str<'a, E: ParserError<&'a str>>(i: &mut &'a str) -> PResult<&'a str, E> {
-    escaped(alphanumeric, '\\', one_of(['"', 'n', '\\'])).parse_next(i)
+    take_escaped(alphanumeric, '\\', one_of(['"', 'n', '\\'])).parse_next(i)
 }
 
 fn string<'s>(i: &mut &'s str) -> PResult<&'s str> {
@@ -276,7 +276,7 @@
 ///
 /// JsonValue.string -> iterator over String (returns None after first successful call)
 ///
-/// object(input).filter(|(k, _)| k == "users").flatten(|(_, v)| v.object()).filter(|(k, _)| k == "city").flatten(|(_,v)| v.string())
+/// object(input).filter(|(k, _)| k == "users").flatten(|(_, v)| v.object()).filter(|(k, _)| k == "city").flatten(|(_,v)| `v.string()`)
 fn main() {
     /*let data = "{
     \"users\": {
@@ -305,7 +305,7 @@
                 })
                 .collect();
 
-            println!("res = {:?}", s);
+            println!("res = {s:?}");
         }
     };
 }

crates/winnow/examples/ndjson/main.rs

diff --git a/crates/winnow/examples/ndjson/main.rs b/crates/winnow/examples/ndjson/main.rs
index 6b2a716..750a10c 100644
--- a/crates/winnow/examples/ndjson/main.rs
+++ b/crates/winnow/examples/ndjson/main.rs
@@ -2,11 +2,12 @@
 
 use std::io::Read;
 
+use winnow::error::ContextError;
 use winnow::error::ErrMode;
-use winnow::error::InputError;
 use winnow::error::Needed;
 use winnow::prelude::*;
 use winnow::stream::Offset;
+use winnow::stream::Stream as _;
 
 fn main() -> Result<(), lexopt::Error> {
     let args = Args::parse()?;
@@ -14,7 +15,7 @@
         option: Some("<PATH>".to_owned()),
     })?;
 
-    let mut file = std::fs::File::open(&input).map_err(to_lexopt)?;
+    let mut file = std::fs::File::open(input).map_err(to_lexopt)?;
 
     // Intentionally starting with a small buffer to make it easier to show `Incomplete` handling
     let buffer_size = 10;
@@ -23,7 +24,7 @@
     let mut buffer = circular::Buffer::with_capacity(buffer_size);
     loop {
         let read = file.read(buffer.space()).map_err(to_lexopt)?;
-        eprintln!("read {}", read);
+        eprintln!("read {read}");
         if read == 0 {
             // Should be EOF since we always make sure there is `available_space`
             assert_ne!(buffer.available_space(), 0);
@@ -38,13 +39,15 @@
         buffer.fill(read);
 
         loop {
-            let input = parser::Stream::new(std::str::from_utf8(buffer.data()).map_err(to_lexopt)?);
-            match parser::ndjson::<InputError<parser::Stream>>.parse_peek(input) {
-                Ok((remainder, value)) => {
-                    println!("{:?}", value);
+            let mut input =
+                parser::Stream::new(std::str::from_utf8(buffer.data()).map_err(to_lexopt)?);
+            let start = input.checkpoint();
+            match parser::ndjson::<ContextError>.parse_next(&mut input) {
+                Ok(value) => {
+                    println!("{value:?}");
                     println!();
                     // Tell the buffer how much we read
-                    let consumed = remainder.offset_from(&input);
+                    let consumed = input.offset_from(&start);
                     buffer.consume(consumed);
                 }
                 Err(ErrMode::Backtrack(e)) | Err(ErrMode::Cut(e)) => {
@@ -60,7 +63,7 @@
                     // one byte at a time
                     let head_room = size.get().max(min_buffer_growth);
                     let new_capacity = buffer.available_data() + head_room;
-                    eprintln!("growing buffer to {}", new_capacity);
+                    eprintln!("growing buffer to {new_capacity}");
                     buffer.grow(new_capacity);
                     if buffer.available_space() < head_room {
                         eprintln!("buffer shift");
@@ -70,7 +73,7 @@
                 }
                 Err(ErrMode::Incomplete(Needed::Unknown)) => {
                     let new_capacity = buffer_growth_factor * buffer.capacity();
-                    eprintln!("growing buffer to {}", new_capacity);
+                    eprintln!("growing buffer to {new_capacity}");
                     buffer.grow(new_capacity);
                     break;
                 }

crates/winnow/examples/ndjson/parser.rs

diff --git a/crates/winnow/examples/ndjson/parser.rs b/crates/winnow/examples/ndjson/parser.rs
index 101391e..4d5f495 100644
--- a/crates/winnow/examples/ndjson/parser.rs
+++ b/crates/winnow/examples/ndjson/parser.rs
@@ -9,13 +9,13 @@
     combinator::cut_err,
     combinator::{delimited, preceded, separated_pair, terminated},
     combinator::{repeat, separated},
-    error::{AddContext, ParserError},
+    error::{AddContext, ParserError, StrContext},
     stream::Partial,
     token::{any, none_of, take, take_while},
 };
 
 #[derive(Debug, PartialEq, Clone)]
-pub enum JsonValue {
+pub(crate) enum JsonValue {
     Null,
     Boolean(bool),
     Str(String),
@@ -25,9 +25,9 @@
 }
 
 /// Use `Partial` to cause `ErrMode::Incomplete` while parsing
-pub type Stream<'i> = Partial<&'i str>;
+pub(crate) type Stream<'i> = Partial<&'i str>;
 
-pub fn ndjson<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+pub(crate) fn ndjson<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<Option<JsonValue>, E> {
     alt((
@@ -41,7 +41,7 @@
 
 /// `alt` is a combinator that tries multiple parsers one by one, until
 /// one of them succeeds
-fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn json_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<JsonValue, E> {
     // `alt` combines the each value parser. It returns the result of the first
@@ -57,7 +57,7 @@
     .parse_next(input)
 }
 
-/// `tag(string)` generates a parser that recognizes the argument string.
+/// `literal(string)` generates a parser that takes the argument string.
 ///
 /// This also shows returning a sub-slice of the original input
 fn null<'i, E: ParserError<Stream<'i>>>(input: &mut Stream<'i>) -> PResult<&'i str, E> {
@@ -80,9 +80,9 @@
     alt((parse_true, parse_false)).parse_next(input)
 }
 
-/// This parser gathers all `char`s up into a `String`with a parse to recognize the double quote
+/// This parser gathers all `char`s up into a `String`with a parse to take the double quote
 /// character, before the string (using `preceded`) and after the string (using `terminated`).
-fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn string<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<String, E> {
     preceded(
@@ -101,7 +101,7 @@
     )
     // `context` lets you add a static string to errors to provide more information in the
     // error chain (to indicate which parser had an error)
-    .context("string")
+    .context(StrContext::Expected("string".into()))
     .parse_next(input)
 }
 
@@ -162,7 +162,7 @@
 /// accumulating results in a `Vec`, until it encounters an error.
 /// If you want more control on the parser application, check out the `iterator`
 /// combinator (cf `examples/iterator.rs`)
-fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn array<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<Vec<JsonValue>, E> {
     preceded(
@@ -172,11 +172,11 @@
             (ws, ']'),
         )),
     )
-    .context("array")
+    .context(StrContext::Expected("array".into()))
     .parse_next(input)
 }
 
-fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn object<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<HashMap<String, JsonValue>, E> {
     preceded(
@@ -186,11 +186,11 @@
             (ws, '}'),
         )),
     )
-    .context("object")
+    .context(StrContext::Expected("object".into()))
     .parse_next(input)
 }
 
-fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, &'static str>>(
+fn key_value<'i, E: ParserError<Stream<'i>> + AddContext<Stream<'i>, StrContext>>(
     input: &mut Stream<'i>,
 ) -> PResult<(String, JsonValue), E> {
     separated_pair(string, cut_err((ws, ':', ws)), json_value).parse_next(input)
@@ -210,54 +210,50 @@
 #[cfg(test)]
 mod test {
     #[allow(clippy::useless_attribute)]
-    #[allow(dead_code)] // its dead for benches
+    #[allow(unused_imports)] // its dead for benches
     use super::*;
 
     #[allow(clippy::useless_attribute)]
     #[allow(dead_code)] // its dead for benches
-    type Error<'i> = winnow::error::InputError<Partial<&'i str>>;
+    type Error = winnow::error::ContextError;
 
     #[test]
     fn json_string() {
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"\"")),
-            Ok((Partial::new(""), "".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"\"")),
+            Ok((Partial::new(""), "".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"abc\"")),
-            Ok((Partial::new(""), "abc".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"abc\"")),
+            Ok((Partial::new(""), "abc".to_owned()))
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new(
+            string::<Error>.parse_peek(Partial::new(
                 "\"abc\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0001\\u2014\u{2014}def\""
             )),
             Ok((
                 Partial::new(""),
-                "abc\"\\/\x08\x0C\n\r\t\x01——def".to_string()
+                "abc\"\\/\x08\x0C\n\r\t\x01——def".to_owned()
             )),
         );
         assert_eq!(
-            string::<Error<'_>>.parse_peek(Partial::new("\"\\uD83D\\uDE10\"")),
-            Ok((Partial::new(""), "😐".to_string()))
+            string::<Error>.parse_peek(Partial::new("\"\\uD83D\\uDE10\"")),
+            Ok((Partial::new(""), "😐".to_owned()))
         );
 
-        assert!(string::<Error<'_>>.parse_peek(Partial::new("\"")).is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek(Partial::new("\"abc"))
-            .is_err());
-        assert!(string::<Error<'_>>
-            .parse_peek(Partial::new("\"\\\""))
-            .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>.parse_peek(Partial::new("\"")).is_err());
+        assert!(string::<Error>.parse_peek(Partial::new("\"abc")).is_err());
+        assert!(string::<Error>.parse_peek(Partial::new("\"\\\"")).is_err());
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\u123\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uD800\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uD800\\uD800\""))
             .is_err());
-        assert!(string::<Error<'_>>
+        assert!(string::<Error>
             .parse_peek(Partial::new("\"\\uDC00\""))
             .is_err());
     }
@@ -271,15 +267,15 @@
 
         let expected = Object(
             vec![
-                ("a".to_string(), Num(42.0)),
-                ("b".to_string(), Str("x".to_string())),
+                ("a".to_owned(), Num(42.0)),
+                ("b".to_owned(), Str("x".to_owned())),
             ]
             .into_iter()
             .collect(),
         );
 
         assert_eq!(
-            ndjson::<Error<'_>>.parse_peek(Partial::new(input)),
+            ndjson::<Error>.parse_peek(Partial::new(input)),
             Ok((Partial::new(""), Some(expected)))
         );
     }
@@ -291,10 +287,10 @@
         let input = r#"[42,"x"]
 "#;
 
-        let expected = Array(vec![Num(42.0), Str("x".to_string())]);
+        let expected = Array(vec![Num(42.0), Str("x".to_owned())]);
 
         assert_eq!(
-            ndjson::<Error<'_>>.parse_peek(Partial::new(input)),
+            ndjson::<Error>.parse_peek(Partial::new(input)),
             Ok((Partial::new(""), Some(expected)))
         );
     }
@@ -307,33 +303,33 @@
 "#;
 
         assert_eq!(
-            ndjson::<Error<'_>>.parse_peek(Partial::new(input)),
+            ndjson::<Error>.parse_peek(Partial::new(input)),
             Ok((
                 Partial::new(""),
                 Some(Object(
                     vec![
-                        ("null".to_string(), Null),
-                        ("true".to_string(), Boolean(true)),
-                        ("false".to_string(), Boolean(false)),
-                        ("number".to_string(), Num(123e4)),
-                        ("string".to_string(), Str(" abc 123 ".to_string())),
+                        ("null".to_owned(), Null),
+                        ("true".to_owned(), Boolean(true)),
+                        ("false".to_owned(), Boolean(false)),
+                        ("number".to_owned(), Num(123e4)),
+                        ("string".to_owned(), Str(" abc 123 ".to_owned())),
                         (
-                            "array".to_string(),
-                            Array(vec![Boolean(false), Num(1.0), Str("two".to_string())])
+                            "array".to_owned(),
+                            Array(vec![Boolean(false), Num(1.0), Str("two".to_owned())])
                         ),
                         (
-                            "object".to_string(),
+                            "object".to_owned(),
                             Object(
                                 vec![
-                                    ("a".to_string(), Num(1.0)),
-                                    ("b".to_string(), Str("c".to_string())),
+                                    ("a".to_owned(), Num(1.0)),
+                                    ("b".to_owned(), Str("c".to_owned())),
                                 ]
                                 .into_iter()
                                 .collect()
                             )
                         ),
-                        ("empty_array".to_string(), Array(vec![]),),
-                        ("empty_object".to_string(), Object(HashMap::new()),),
+                        ("empty_array".to_owned(), Array(vec![]),),
+                        ("empty_object".to_owned(), Object(HashMap::new()),),
                     ]
                     .into_iter()
                     .collect()

crates/winnow/examples/s_expression/parser.rs

diff --git a/crates/winnow/examples/s_expression/parser.rs b/crates/winnow/examples/s_expression/parser.rs
index c445053..abcf5a4 100644
--- a/crates/winnow/examples/s_expression/parser.rs
+++ b/crates/winnow/examples/s_expression/parser.rs
@@ -16,16 +16,16 @@
 
 /// We start with a top-level function to tie everything together, letting
 /// us call eval on a string directly
-pub fn eval_from_str(src: &str) -> Result<Expr, String> {
+pub(crate) fn eval_from_str(src: &str) -> Result<Expr, String> {
     parse_expr
         .parse(src)
         .map_err(|e| e.to_string())
-        .and_then(|exp| eval_expression(exp).ok_or_else(|| "Eval failed".to_string()))
+        .and_then(|exp| eval_expression(exp).ok_or_else(|| "Eval failed".to_owned()))
 }
 
 /// For parsing, we start by defining the types that define the shape of data that we want.
 /// In this case, we want something tree-like
-
+///
 /// The remaining half is Lists. We implement these as recursive Expressions.
 /// For a list of numbers, we have `'(1 2 3)`, which we'll parse to:
 /// ```
@@ -36,7 +36,7 @@
 /// structure that we can deal with programmatically. Thus any valid expression
 /// is also a valid data structure in Lisp itself.
 #[derive(Debug, Eq, PartialEq, Clone)]
-pub enum Expr {
+pub(crate) enum Expr {
     Constant(Atom),
     /// (func-name arg1 arg2)
     Application(Box<Expr>, Vec<Expr>),
@@ -51,7 +51,7 @@
 /// We now wrap this type and a few other primitives into our Atom type.
 /// Remember from before that Atoms form one half of our language.
 #[derive(Debug, Eq, PartialEq, Clone)]
-pub enum Atom {
+pub(crate) enum Atom {
     Num(i32),
     Keyword(String),
     Boolean(bool),
@@ -60,7 +60,7 @@
 
 /// Now, the most basic type. We define some built-in functions that our lisp has
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
-pub enum BuiltIn {
+pub(crate) enum BuiltIn {
     Plus,
     Minus,
     Times,
@@ -153,7 +153,7 @@
 fn parse_keyword(i: &mut &'_ str) -> PResult<Atom> {
     preceded(":", cut_err(alpha1))
         .context(StrContext::Label("keyword"))
-        .map(|sym_str: &str| Atom::Keyword(sym_str.to_string()))
+        .map(|sym_str: &str| Atom::Keyword(sym_str.to_owned()))
         .parse_next(i)
 }
 
@@ -242,7 +242,7 @@
 /// a little interpreter to take an Expr, which is really an
 /// [Abstract Syntax Tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree) (AST),
 /// and give us something back
-
+///
 /// This function tries to reduce the AST.
 /// This has to return an Expression rather than an Atom because quoted `s_expressions`
 /// can't be reduced

crates/winnow/examples/string/main.rs

diff --git a/crates/winnow/examples/string/main.rs b/crates/winnow/examples/string/main.rs
index 0c2647e..3f57f40 100644
--- a/crates/winnow/examples/string/main.rs
+++ b/crates/winnow/examples/string/main.rs
@@ -21,8 +21,8 @@
     let data = args.input.as_deref().unwrap_or("\"abc\"");
     let result = parser::parse_string::<()>.parse(data);
     match result {
-        Ok(data) => println!("{}", data),
-        Err(err) => println!("{:?}", err),
+        Ok(data) => println!("{data}"),
+        Err(err) => println!("{err:?}"),
     }
 
     Ok(())

crates/winnow/examples/string/parser.rs

diff --git a/crates/winnow/examples/string/parser.rs b/crates/winnow/examples/string/parser.rs
index 7701335..a84df74 100644
--- a/crates/winnow/examples/string/parser.rs
+++ b/crates/winnow/examples/string/parser.rs
@@ -19,7 +19,7 @@
 
 /// Parse a string. Use a loop of `parse_fragment` and push all of the fragments
 /// into an output string.
-pub fn parse_string<'a, E>(input: &mut &'a str) -> PResult<String, E>
+pub(crate) fn parse_string<'a, E>(input: &mut &'a str) -> PResult<String, E>
 where
     E: ParserError<&'a str> + FromExternalError<&'a str, std::num::ParseIntError>,
 {

crates/winnow/src/_topic/error.rs

diff --git a/crates/winnow/src/_topic/error.rs b/crates/winnow/src/_topic/error.rs
index 8a401b4..35caa9d 100644
--- a/crates/winnow/src/_topic/error.rs
+++ b/crates/winnow/src/_topic/error.rs
@@ -1,18 +1,33 @@
 //! # Custom Errors
 //!
-//! Between [`ContextError`], [`Parser::context`], and [`cut_err`],
-//! most error needs will likely be met
-//! (see [tutorial][chapter_6]).
-//! When that isn't the case, you can implement your own error type.
+//! A lot can be accomplished with the built-in error tools, like:
+//! - [`ContextError`]
+//! - [`Parser::context`]
+//! - [`cut_err`]
 //!
-//! The most basic error trait is [`ParserError`].
+//! *(see [tutorial][chapter_7])*
+//!
+//! Most other needs can likely be met by using a custom context type with [`ContextError`] instead
+//! of [`StrContext`].
+//! This will require implementing a custom renderer.
+//!
+//! ## `ParserError` Trait
+//!
+//! When needed, you can also create your own type that implements [`ParserError`].
 //!
 //! Optional traits include:
 //! - [`AddContext`]
 //! - [`FromExternalError`]
+//! - [`ErrorConvert`]
 //!
-//! # Example
+//! There are multiple strategies for implementing support for [`AddContext`] and [`FromExternalError`]:
+//! - Make your error type generic over the context or external error
+//! - Require a trait for the context or external error and `Box` it
+//! - Make the context an enum like [`StrContext`]
+//! - Implement the trait multiple times, one for each concrete context or external error type,
+//!   allowing custom behavior per type
 //!
+//! Example:
 //!```rust
 #![doc = include_str!("../../examples/custom_error.rs")]
 //!```
@@ -20,8 +35,10 @@
 #![allow(unused_imports)]
 use crate::combinator::cut_err;
 use crate::error::ContextError;
+use crate::error::ErrorConvert;
+use crate::error::StrContext;
 use crate::Parser;
-use crate::_tutorial::chapter_6;
+use crate::_tutorial::chapter_7;
 use crate::error::AddContext;
 use crate::error::FromExternalError;
 use crate::error::ParserError;

crates/winnow/src/_topic/language.rs

diff --git a/crates/winnow/src/_topic/language.rs b/crates/winnow/src/_topic/language.rs
index c6a713a..740fbe7 100644
--- a/crates/winnow/src/_topic/language.rs
+++ b/crates/winnow/src/_topic/language.rs
@@ -62,12 +62,12 @@
 //! use winnow::prelude::*;
 //! use winnow::{
 //!   error::ParserError,
-//!   token::take_till1,
+//!   token::take_till,
 //! };
 //!
 //! pub fn peol_comment<'a, E: ParserError<&'a str>>(i: &mut &'a str) -> PResult<(), E>
 //! {
-//!   ('%', take_till1(['\n', '\r']))
+//!   ('%', take_till(1.., ['\n', '\r']))
 //!     .void() // Output is thrown away.
 //!     .parse_next(i)
 //! }
@@ -75,14 +75,14 @@
 //!
 //! ### `/* C-style comments */`
 //!
-//! Inline comments surrounded with sentinel tags `(*` and `*)`. This version returns an output of `()`
+//! Inline comments surrounded with sentinel literals `(*` and `*)`. This version returns an output of `()`
 //! and does not handle nested comments.
 //!
 //! ```rust
 //! use winnow::prelude::*;
 //! use winnow::{
 //!   error::ParserError,
-//!   token::{tag, take_until},
+//!   token::take_until,
 //! };
 //!
 //! pub fn pinline_comment<'a, E: ParserError<&'a str>>(i: &mut &'a str) -> PResult<(), E> {
@@ -116,16 +116,16 @@
 //!       one_of(|c: char| c.is_alpha() || c == '_'),
 //!       take_while(0.., |c: char| c.is_alphanum() || c == '_')
 //!   )
-//!   .recognize()
+//!   .take()
 //!   .parse_next(input)
 //! }
 //! ```
 //!
 //! Let's say we apply this to the identifier `hello_world123abc`. The first element of the tuple
-//! would uses [`one_of`][crate::token::one_of] which would recognize `h`. The tuple ensures that
+//! would uses [`one_of`][crate::token::one_of] which would take `h`. The tuple ensures that
 //! `ello_world123abc` will be piped to the next [`take_while`][crate::token::take_while] parser,
-//! which recognizes every remaining character. However, the tuple returns a tuple of the results
-//! of its sub-parsers. The [`recognize`][crate::Parser::recognize] parser produces a `&str` of the
+//! which takes every remaining character. However, the tuple returns a tuple of the results
+//! of its sub-parsers. The [`take`][crate::Parser::take] parser produces a `&str` of the
 //! input text that was parsed, which in this case is the entire `&str` `hello_world123abc`.
 //!
 //! ## Literal Values
@@ -136,7 +136,7 @@
 #![doc = include_str!("../../examples/string/parser.rs")]
 //! ```
 //!
-//! See also [`escaped`] and [`escaped_transform`].
+//! See also [`take_escaped`] and [`escaped_transform`].
 //!
 //! ### Integers
 //!
@@ -159,7 +159,6 @@
 //!   combinator::{repeat},
 //!   combinator::{preceded, terminated},
 //!   token::one_of,
-//!   token::tag,
 //! };
 //!
 //! fn hexadecimal<'s>(input: &mut &'s str) -> PResult<&'s str> { // <'a, E: ParserError<&'a str>>
@@ -167,7 +166,7 @@
 //!     alt(("0x", "0X")),
 //!     repeat(1..,
 //!       terminated(one_of(('0'..='9', 'a'..='f', 'A'..='F')), repeat(0.., '_').map(|()| ()))
-//!     ).map(|()| ()).recognize()
+//!     ).map(|()| ()).take()
 //!   ).parse_next(input)
 //! }
 //! ```
@@ -181,7 +180,6 @@
 //!   combinator::{repeat},
 //!   combinator::{preceded, terminated},
 //!   token::one_of,
-//!   token::tag,
 //! };
 //!
 //! fn hexadecimal_value(input: &mut &str) -> PResult<i64> {
@@ -189,7 +187,7 @@
 //!     alt(("0x", "0X")),
 //!     repeat(1..,
 //!       terminated(one_of(('0'..='9', 'a'..='f', 'A'..='F')), repeat(0.., '_').map(|()| ()))
-//!     ).map(|()| ()).recognize()
+//!     ).map(|()| ()).take()
 //!   ).try_map(
 //!     |out: &str| i64::from_str_radix(&str::replace(&out, "_", ""), 16)
 //!   ).parse_next(input)
@@ -207,7 +205,6 @@
 //!   combinator::{repeat},
 //!   combinator::{preceded, terminated},
 //!   token::one_of,
-//!   token::tag,
 //! };
 //!
 //! fn octal<'s>(input: &mut &'s str) -> PResult<&'s str> {
@@ -215,7 +212,7 @@
 //!     alt(("0o", "0O")),
 //!     repeat(1..,
 //!       terminated(one_of('0'..='7'), repeat(0.., '_').map(|()| ()))
-//!     ).map(|()| ()).recognize()
+//!     ).map(|()| ()).take()
 //!   ).parse_next(input)
 //! }
 //! ```
@@ -229,7 +226,6 @@
 //!   combinator::{repeat},
 //!   combinator::{preceded, terminated},
 //!   token::one_of,
-//!   token::tag,
 //! };
 //!
 //! fn binary<'s>(input: &mut &'s str) -> PResult<&'s str> {
@@ -237,7 +233,7 @@
 //!     alt(("0b", "0B")),
 //!     repeat(1..,
 //!       terminated(one_of('0'..='1'), repeat(0.., '_').map(|()| ()))
-//!     ).map(|()| ()).recognize()
+//!     ).map(|()| ()).take()
 //!   ).parse_next(input)
 //! }
 //! ```
@@ -256,7 +252,7 @@
 //!   repeat(1..,
 //!     terminated(one_of('0'..='9'), repeat(0.., '_').map(|()| ()))
 //!   ).map(|()| ())
-//!     .recognize()
+//!     .take()
 //!     .parse_next(input)
 //! }
 //! ```
@@ -288,7 +284,7 @@
 //!         opt(one_of(['+', '-'])),
 //!         decimal
 //!       ))
-//!     ).recognize()
+//!     ).take()
 //!     , // Case two: 42e42 and 42.42e42
 //!     (
 //!       decimal,
@@ -299,13 +295,13 @@
 //!       one_of(['e', 'E']),
 //!       opt(one_of(['+', '-'])),
 //!       decimal
-//!     ).recognize()
+//!     ).take()
 //!     , // Case three: 42. and 42.42
 //!     (
 //!       decimal,
 //!       '.',
 //!       opt(decimal)
-//!     ).recognize()
+//!     ).take()
 //!   )).parse_next(input)
 //! }
 //!
@@ -314,7 +310,7 @@
 //!     terminated(one_of('0'..='9'), repeat(0.., '_').map(|()| ()))
 //!   ).
 //!   map(|()| ())
-//!     .recognize()
+//!     .take()
 //!     .parse_next(input)
 //! }
 //! ```
@@ -324,7 +320,7 @@
 #![allow(unused_imports)]
 use crate::ascii::dec_int;
 use crate::ascii::dec_uint;
-use crate::ascii::escaped;
 use crate::ascii::escaped_transform;
 use crate::ascii::float;
 use crate::ascii::hex_uint;
+use crate::ascii::take_escaped;

crates/winnow/src/_topic/mod.rs

diff --git a/crates/winnow/src/_topic/mod.rs b/crates/winnow/src/_topic/mod.rs
index c7bcc53..f279ac6 100644
--- a/crates/winnow/src/_topic/mod.rs
+++ b/crates/winnow/src/_topic/mod.rs
@@ -3,7 +3,7 @@
 //! These are short recipes for accomplishing common tasks.
 //!
 //! - [Why `winnow`?][why]
-//! - [Migrating from `nom`][nom]
+//! - [For `nom` users][nom]
 //! - Formats:
 //!   - [Elements of Programming Languages][language]
 //!   - [Arithmetic][arithmetic]

crates/winnow/src/_topic/nom.rs

diff --git a/crates/winnow/src/_topic/nom.rs b/crates/winnow/src/_topic/nom.rs
index f3cb74e..4c9c45f 100644
--- a/crates/winnow/src/_topic/nom.rs
+++ b/crates/winnow/src/_topic/nom.rs
@@ -1,4 +1,6 @@
-//! # Migrating from `nom`
+//! # For `nom` users
+//!
+//! ## Migrating from `nom`
 //!
 //! For comparisons with `nom`, see
 //! - [Why `winnow`][super::why]
@@ -10,6 +12,8 @@
 //! of the `nom` combinator.  It is expected that, where names diverge, a doc alias exists.
 //! See also the [List of combinators][crate::combinator].
 //!
+//! ### Complex migrations
+//!
 //! For larger parsers, it is likely best to take smaller steps
 //! - Easier to debug when something goes wrong
 //! - Deprecation messages will help assist through the process
@@ -17,23 +21,25 @@
 //! The workflow goes something like:
 //! 1. Run `cargo rm nom && cargo add winnow@0.3`
 //! 1. Ensure everything compiles and tests pass, ignoring deprecation messages (see [migration
-//!    notes](https://github.com/winnow-rs/winnow/blob/v0.3-main/CHANGELOG.md#nom-migration-guide))
+//!    notes](https://github.com/winnow-rs/winnow/blob/main/CHANGELOG.md#nom-migration-guide))
 //! 1. Commit
 //! 1. Switch any `impl FnMut(I) -> IResult<I, O, E>` to `impl Parser<I, O, E>`
 //! 1. Resolve deprecation messages
 //! 1. Commit
 //! 1. Run `cargo add winnow@0.4`
-//! 1. Ensure everything compiles and tests pass, ignoring deprecation messages (see [changelog](https://github.com/winnow-rs/winnow/blob/v0.4-main/CHANGELOG.md#compatibility-2) for more details)
+//! 1. Ensure everything compiles and tests pass, ignoring deprecation messages (see [changelog](https://github.com/winnow-rs/winnow/blob/main/CHANGELOG.md#040---2023-03-18) for more details)
 //! 1. Commit
 //! 1. Resolve deprecation messages
 //! 1. Commit
 //! 1. Run `cargo add winnow@0.5`
 //! 1. Ensure everything compiles and tests pass, ignoring deprecation messages (see [migration
-//!     notes](https://github.com/winnow-rs/winnow/blob/v0.5.0/CHANGELOG.md))
+//!     notes](https://github.com/winnow-rs/winnow/blob/main/CHANGELOG.md#050---2023-07-13))
 //! 1. Commit
-//! 1. Resolve deprecation messagess
+//! 1. Resolve deprecation messages
 //! 1. Commit
 //!
+//! ### Examples
+//!
 //! For example migrations, see
 //! - [git-config-env](https://github.com/gitext-rs/git-config-env/pull/11) (nom to winnow 0.3)
 //! - [git-conventional](https://github.com/crate-ci/git-conventional/pull/37) (nom to winnow 0.3,
@@ -47,3 +53,52 @@
 //!   to winnow 0.5)
 //! - [gitoxide](https://github.com/Byron/gitoxide/pull/956) (gradual migration from nom
 //!   to winnow 0.5)
+//!
+//! ## API differences
+//!
+//! ### Renamed APIs
+//!
+//! Names have changed for consistency or clarity.
+//!
+//! To find a parser you are looking for,
+//! - Search the docs for the `nom` parser
+//! - See the [List of combinators][crate::combinator]
+//!
+//! ### `&mut I`
+//!
+//! For an explanation of this change, see [Why `winnow`][super::why]
+//!
+//! To save and restore from intermediate states, [`Stream::checkpoint`] and [`Stream::reset`] can help:
+//! ```rust
+//! use winnow::stream::Stream as _;
+//! # let mut i = "";
+//! # let i = &mut i;
+//!
+//! let start = i.checkpoint();
+//! // ...
+//! i.reset(&start);
+//! ```
+//!
+//! When the Output of a parser is a slice, you have to add a lifetime:
+//! ```rust
+//! # use winnow::prelude::*;
+//! fn foo<'i>(i: &mut &'i str) -> PResult<&'i str> {
+//!     // ...
+//! #   winnow::token::rest.parse_next(i)
+//! }
+//! ```
+//!
+//! When writing a closure, you need to annotate the type:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::combinator::trace;
+//! fn foo(i: &mut &str) -> PResult<usize> {
+//!     trace("foo", |i: &mut _| {
+//!         // ...
+//! #       Ok(0)
+//!     }).parse_next(i)
+//! }
+//! ```
+
+#![allow(unused_imports)]
+use crate::stream::Stream;

crates/winnow/src/_topic/stream.rs

diff --git a/crates/winnow/src/_topic/stream.rs b/crates/winnow/src/_topic/stream.rs
index 2254f87..eb9573e 100644
--- a/crates/winnow/src/_topic/stream.rs
+++ b/crates/winnow/src/_topic/stream.rs
@@ -5,7 +5,7 @@
 //! - Improved debug output like [`Bytes`]
 //! - [`Stateful`] for passing state through your parser, like tracking recursion
 //!   depth
-//! - [`Located`] for looking up the absolute position of a token
+//! - [`LocatingSlice`] for looking up the absolute position of a token
 //!
 //! But that won't always cut it for your parser. For example, you might lex `&str` into
 //! a series of tokens and then want to parse a `TokenStream`.
@@ -18,7 +18,6 @@
 //! The goal is to define parsers with this signature: `&mut MyStream -> PResult<Output>`.
 //! ```rust
 //! # use winnow::prelude::*;
-//! # use winnow::token::tag;
 //! # type MyStream<'i> = &'i str;
 //! # type Output<'i> = &'i str;
 //! fn parser<'s>(i: &mut MyStream<'s>) -> PResult<Output<'s>> {

crates/winnow/src/_topic/why.rs

diff --git a/crates/winnow/src/_topic/why.rs b/crates/winnow/src/_topic/why.rs
index fc1716a..625c5b5 100644
--- a/crates/winnow/src/_topic/why.rs
+++ b/crates/winnow/src/_topic/why.rs
@@ -2,10 +2,14 @@
 //!
 //! To answer this question, it will be useful to contrast this with other approaches to parsing.
 //!
+//! <div class="warning">
+//!
 //! **Note:** This will focus on principles and priorities. For a deeper and wider wider
 //! comparison with other Rust parser libraries, see
 //! [parse-rosetta-rs](https://github.com/rosetta-rs/parse-rosetta-rs).
 //!
+//! </div>
+//!
 //! ## Hand-written parsers
 //!
 //! Typically, a hand-written parser gives you the flexibility to get
@@ -36,18 +40,18 @@
 //!
 //! `winnow` includes support for:
 //! - Zero-copy parsing
-//! - [Parse traces][crate::trace] for easier debugging
-//! - [Streaming parsing][crate::Partial] for network communication or large file
-//! - [Stateful][crate::Stateful] parsers
+//! - [Parse traces][trace] for easier debugging
+//! - [Streaming parsing][Partial] for network communication or large file
+//! - [Stateful] parsers
 //!
 //! For binary formats, `winnow` includes:
-//! - [A hexadecimal view][crate::Bytes] in [traces][crate::trace]
+//! - [A hexadecimal view][crate::Bytes] in [trace]
 //! - [TLV](https://en.wikipedia.org/wiki/Type-length-value) (e.g. [`length_take`])
 //! - Some common parsers to help get started, like numbers
 //!
 //! For text formats, `winnow` includes:
-//! - [Tracking of spans][crate::Located]
-//! - [A textual view when parsing as bytes][crate::BStr] in [traces][crate::trace]
+//! - [Tracking of spans][crate::LocatingSlice]
+//! - [A textual view when parsing as bytes][crate::BStr] in [trace]
 //! - Ability to evaluate directly, parse to an AST, or lex and parse the format
 //!
 //! This works well for:
@@ -70,6 +74,25 @@
 //!
 //! See also our [nom migration guide][super::nom]
 //!
+//! ### Design trade-offs
+//!
+//! `winnow` switched from pure-function parser (`Fn(I) -> (I, O)` to `Fn(&mut I) -> O`).
+//! On error, `i` is left pointing at where the error happened.
+//!
+//! Benefits:
+//! - Cleaner code: Removes need to pass `i` everywhere and makes changes to `i` more explicit
+//! - Correctness: No forgetting to chain `i` through a parser
+//! - Flexibility: `I` does not need to be `Copy` or even `Clone`. For example, [`Stateful`] can use `&mut S` instead of `RefCell<S>`.
+//! - Performance: `Result::Ok` is smaller without `i`, reducing the risk that the output will be
+//!   returned on the stack, rather than the much faster CPU registers.
+//!   `Result::Err` can also be smaller because the error type does not need to carry `i` to point
+//!   to the error.
+//!   See also [#72](https://github.com/winnow-rs/winnow/issues/72).
+//!
+//! Downsides:
+//! - When returning a slice, you have to add a lifetime (`fn foo<'i>(i: &mut &i str) -> PResult<&i str>`)
+//! - When writing a closure, you need to annotate the type (`|i: &mut _|`, at least the full type isn't needed)
+//!
 //! ## `chumsky`
 //!
 //! [`chumsky`](https://crates.io/crates/chumsky) is an up and coming parser-combinator library
@@ -98,4 +121,7 @@
 
 #![allow(unused_imports)]
 use crate::binary::length_take;
+use crate::combinator::trace;
 use crate::stream::Accumulate;
+use crate::stream::Partial;
+use crate::stream::Stateful;

crates/winnow/src/_tutorial/chapter_0.rs

diff --git a/crates/winnow/src/_tutorial/chapter_0.rs b/crates/winnow/src/_tutorial/chapter_0.rs
index 35a2d14..47e85a2 100644
--- a/crates/winnow/src/_tutorial/chapter_0.rs
+++ b/crates/winnow/src/_tutorial/chapter_0.rs
@@ -25,11 +25,10 @@
 //!
 //! Parser combinators are great because:
 //!
-//! - The parsers are small and easy to write
-//! - The parsers components are easy to reuse (if they're general enough, please add them to winnow!)
-//! - The parsers components are easy to test separately (unit tests and property-based tests)
-//! - The parser combination code looks close to the grammar you would have written
-//! - You can build partial parsers, specific to the data you need at the moment, and ignore the rest
+//! - Individual parser functions are small, focused on one thing, ignoring the rest
+//! - You can write tests focused on individual parsers (unit tests and property-based tests)
+//!   in addition to testing the top-level parser as a whole.
+//! - Top-level parsing code looks close to the grammar you would have written
 
 #![allow(unused_imports)]
 use crate::_topic;

crates/winnow/src/_tutorial/chapter_1.rs

diff --git a/crates/winnow/src/_tutorial/chapter_1.rs b/crates/winnow/src/_tutorial/chapter_1.rs
index 2d94418..41220bc 100644
--- a/crates/winnow/src/_tutorial/chapter_1.rs
+++ b/crates/winnow/src/_tutorial/chapter_1.rs
@@ -1,26 +1,25 @@
 //! # Chapter 1: The Winnow Way
 //!
 //! First of all, we need to understand the way that winnow thinks about parsing.
-//! As discussed in the introduction, winnow lets us build simple parsers, and
-//! then combine them (using "combinators").
+//! As discussed in the introduction, winnow lets us compose more complex parsers from more simple
+//! ones (using "combinators").
 //!
-//! Let's discuss what a "parser" actually does. A parser takes an input and returns
+//! Let's discuss what a "parser" actually does. A parser takes an input and advances it until it returns
 //! a result, where:
 //!  - `Ok` indicates the parser successfully found what it was looking for; or
 //!  - `Err` indicates the parser could not find what it was looking for.
 //!
 //! Parsers do more than just return a binary "success"/"failure" code.
-//! On success, the parser will return the processed data. The input will be left pointing to
-//! data that still needs processing
-//!
-//! If the parser failed, then there are multiple errors that could be returned.
-//! For simplicity, however, in the next chapters we will leave these unexplored.
+//! - On success, the parser will return the processed data. The input will be advanced to the end of
+//!   what was processed, pointing to what will be parsed next.
+//! - If the parser failed, then there are multiple errors that could be returned.
+//!   We'll explore this further in [`chapter_7`].
 //!
 //! ```text
-//!                                   ┌─► Ok(what matched the parser)
-//!             ┌─────────┐           │
-//! my input───►│my parser├──►either──┤
-//!             └─────────┘           └─► Err(...)
+//!                                  ┌─► Ok(what matched the parser)
+//!             ┌────────┐           │
+//! my input───►│a parser├──►either──┤
+//!             └────────┘           └─► Err(...)
 //! ```
 //!
 //!
@@ -37,13 +36,14 @@
 //! To combine parsers, we need a common way to refer to them which is where the [`Parser<I, O, E>`]
 //! trait comes in with [`Parser::parse_next`] being the primary way to drive
 //! parsing forward.
+//! In [`chapter_6`], we'll cover how to integrate these into your application, particularly with
+//! [`Parser::parse`].
 //!
 //! You'll note that `I` and `O` are parameterized -- while most of the examples in this book
 //! will be with `&str` (i.e. parsing a string); they do not have to be strings; nor do they
 //! have to be the same type (consider the simple example where `I = &str`, and `O = u64` -- this
 //! parses a string into an unsigned integer.)
 //!
-//!
 //! # Let's write our first parser!
 //!
 //! The simplest parser we can write is one which successfully does nothing.
@@ -54,7 +54,7 @@
 //! This parser function should take in a `&str`:
 //!
 //!  - Since it is supposed to succeed, we know it will return the `Ok` variant.
-//!  - Since it does nothing to our input, the remaining input is the same as the input.
+//!  - Since it does nothing to our input, the input will be left where it started.
 //!  - Since it doesn't parse anything, it also should just return an empty string.
 //!
 //! ```rust
@@ -78,6 +78,8 @@
 //! ```
 
 #![allow(unused_imports)]
+use super::chapter_6;
+use super::chapter_7;
 use crate::PResult;
 use crate::Parser;
 

crates/winnow/src/_tutorial/chapter_2.rs

diff --git a/crates/winnow/src/_tutorial/chapter_2.rs b/crates/winnow/src/_tutorial/chapter_2.rs
index c27b719..6b3953d 100644
--- a/crates/winnow/src/_tutorial/chapter_2.rs
+++ b/crates/winnow/src/_tutorial/chapter_2.rs
@@ -36,14 +36,48 @@
 //! }
 //! ```
 //!
-//! [`any`] and [`Parser::verify`] are [`Parser`] building blocks on top of [`Stream`]:
+//! This extraction of a token is encapsulated in the [`any`] parser:
+//! ```rust
+//! # use winnow::PResult;
+//! # use winnow::error::ParserError;
+//! # use winnow::error::ErrorKind;
+//! # use winnow::error::ErrMode;
+//! use winnow::Parser;
+//! use winnow::token::any;
+//!
+//! fn parse_prefix(input: &mut &str) -> PResult<char> {
+//!     let c = any
+//!         .parse_next(input)?;
+//!     if c != '0' {
+//!         return Err(ErrMode::from_error_kind(input, ErrorKind::Verify));
+//!     }
+//!     Ok(c)
+//! }
+//! #
+//! # fn main()  {
+//! #     let mut input = "0x1a2b Hello";
+//! #
+//! #     let output = parse_prefix.parse_next(&mut input).unwrap();
+//! #
+//! #     assert_eq!(input, "x1a2b Hello");
+//! #     assert_eq!(output, '0');
+//! #
+//! #     assert!(parse_prefix.parse_next(&mut "d").is_err());
+//! # }
+//! ```
+//!
+//! Using the higher level [`any`] parser opens `parse_prefix` to the helpers on the [`Parser`] trait,
+//! like [`Parser::verify`] which fails a parse if a condition isn't met, like our check above:
 //! ```rust
 //! # use winnow::PResult;
 //! use winnow::Parser;
 //! use winnow::token::any;
 //!
 //! fn parse_prefix(input: &mut &str) -> PResult<char> {
-//!     any.verify(|c| *c == '0').parse_next(input)
+//!     let c = any
+//!         .verify(|c| *c == '0')
+//!         .parse_next(input)?;
+//!     Ok(c)
 //! }
 //! #
 //! # fn main()  {
@@ -59,14 +93,14 @@
 //! ```
 //!
 //! Matching a single token literal is common enough that [`Parser`] is implemented for
-//! `char`.
-//!
+//! the `char` type, encapsulating both [`any`] and [`Parser::verify`]:
 //! ```rust
 //! # use winnow::PResult;
 //! use winnow::Parser;
 //!
 //! fn parse_prefix(input: &mut &str) -> PResult<char> {
-//!     '0'.parse_next(input)
+//!     let c = '0'.parse_next(input)?;
+//!     Ok(c)
 //! }
 //! #
 //! # fn main()  {
@@ -115,13 +149,16 @@
 //! }
 //! ```
 //!
-//! Again, matching a literal is common enough that [`Parser`] is implemented for `&str`:
+//! Matching the input position against a string literal is encapsulated in the [`literal`] parser:
 //! ```rust
 //! # use winnow::PResult;
-//! use winnow::Parser;
+//! # use winnow::Parser;
+//! use winnow::token::literal;
 //!
 //! fn parse_prefix<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//!     "0x".parse_next(input)
+//!     let expected = "0x";
+//!     let actual = literal(expected).parse_next(input)?;
+//!     Ok(actual)
 //! }
 //! #
 //! # fn main()  {
@@ -135,12 +172,32 @@
 //! # }
 //! ```
 //!
-//! In `winnow`, we call this type of parser a [`tag`]. See [`token`] for additional individual
-//! and token-slice parsers.
+//! Like for a single token, matching a string literal is common enough that [`Parser`] is implemented for the `&str` type:
+//! ```rust
+//! # use winnow::PResult;
+//! use winnow::Parser;
+//!
+//! fn parse_prefix<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//!     let actual = "0x".parse_next(input)?;
+//!     Ok(actual)
+//! }
+//! #
+//! # fn main()  {
+//! #     let mut input = "0x1a2b Hello";
+//! #
+//! #     let output = parse_prefix.parse_next(&mut input).unwrap();
+//! #     assert_eq!(input, "1a2b Hello");
+//! #     assert_eq!(output, "0x");
+//! #
+//! #     assert!(parse_prefix.parse_next(&mut "0o123").is_err());
+//! # }
+//! ```
+//!
+//! See [`token`] for additional individual and token-slice parsers.
 //!
 //! ## Character Classes
 //!
-//! Selecting a single `char` or a [`tag`] is fairly limited. Sometimes, you will want to select one of several
+//! Selecting a single `char` or a [`literal`] is fairly limited. Sometimes, you will want to select one of several
 //! `chars` of a specific class, like digits. For this, we use the [`one_of`] parser:
 //!
 //! ```rust
@@ -237,8 +294,8 @@
 use crate::stream::Stream;
 use crate::token;
 use crate::token::any;
+use crate::token::literal;
 use crate::token::one_of;
-use crate::token::tag;
 use crate::token::take_while;
 use crate::Parser;
 use std::ops::RangeInclusive;

crates/winnow/src/_tutorial/chapter_3.rs

diff --git a/crates/winnow/src/_tutorial/chapter_3.rs b/crates/winnow/src/_tutorial/chapter_3.rs
index 2ad0124..a24f409 100644
--- a/crates/winnow/src/_tutorial/chapter_3.rs
+++ b/crates/winnow/src/_tutorial/chapter_3.rs
@@ -1,9 +1,9 @@
 //! # Chapter 3: Sequencing and Alternatives
 //!
-//! In the last chapter, we saw how to create simple parsers using prebuilt parsers.
+//! In the last chapter, we saw how to create parsers using prebuilt parsers.
 //!
 //! In this chapter, we explore two other widely used features:
-//! alternatives and composition.
+//! sequencing and alternatives.
 //!
 //! ## Sequencing
 //!
@@ -70,7 +70,7 @@
 //! }
 //! ```
 //!
-//! Frequently, you won't care about the tag and you can instead use one of the provided combinators,
+//! Frequently, you won't care about the literal and you can instead use one of the provided combinators,
 //! like [`preceded`]:
 //! ```rust
 //! # use winnow::prelude::*;
@@ -111,7 +111,8 @@
 //! Sometimes, we might want to choose between two parsers; and we're happy with
 //! either being used.
 //!
-//! [`Stream::checkpoint`] helps us to retry parsing:
+//! To retry a parse result, we can save off a [`Stream::checkpoint`] and later restore the parser
+//! back to that position with [`Stream::reset`]:
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
@@ -119,29 +120,28 @@
 //!
 //! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
 //!     let start = input.checkpoint();
-//!
 //!     if let Ok(output) = ("0b", parse_bin_digits).parse_next(input) {
 //!         return Ok(output);
 //!     }
 //!
-//!     input.reset(start);
+//!     input.reset(&start);
 //!     if let Ok(output) = ("0o", parse_oct_digits).parse_next(input) {
 //!         return Ok(output);
 //!     }
 //!
-//!     input.reset(start);
+//!     input.reset(&start);
 //!     if let Ok(output) = ("0d", parse_dec_digits).parse_next(input) {
 //!         return Ok(output);
 //!     }
 //!
-//!     input.reset(start);
+//!     input.reset(&start);
 //!     ("0x", parse_hex_digits).parse_next(input)
 //! }
 //!
 //! // ...
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -178,11 +178,15 @@
 //! }
 //! ```
 //!
-//! > **Warning:** the above example is for illustrative purposes and relying on `Result::Ok` or
-//! > `Result::Err` can lead to incorrect behavior. This will be clarified in later when covering
-//! > [error handling][`chapter_6`#errmode]
+//! <div class="warning">
 //!
-//! [`opt`] is a basic building block for correctly handling retrying parsing:
+//! **Warning:** the above example is for illustrative purposes and relying on `Result::Ok` or
+//! `Result::Err` can lead to incorrect behavior. This will be clarified in later when covering
+//! [error handling][`chapter_7`#error-cuts]
+//!
+//! </div>
+//!
+//! [`opt`] is a parser that encapsulates this pattern of "retry on failure":
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
@@ -202,7 +206,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -239,7 +243,7 @@
 //! # }
 //! ```
 //!
-//! [`alt`] encapsulates this if/else-if ladder pattern, with the last case being the `else`:
+//! [`alt`] encapsulates this if/else-if ladder pattern, with the last case being the "else":
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
@@ -256,7 +260,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -293,7 +297,11 @@
 //! # }
 //! ```
 //!
-//! > **Note:** [`empty`] and [`fail`] are parsers that might be useful in the `else` case.
+//! <div class="warning">
+//!
+//! **Note:** [`empty`] and [`fail`] are parsers that might be useful in the "else" case.
+//!
+//! </div>
 //!
 //! Sometimes a giant if/else-if ladder can be slow and you'd rather have a `match` statement for
 //! branches of your parser that have unique prefixes. In this case, you can use the
@@ -315,11 +323,10 @@
 //!         _ => fail,
 //!     ).parse_next(input)
 //! }
-//!
-//! // ...
+//! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -342,25 +349,29 @@
 //! #         ('a'..='f'),
 //! #     )).parse_next(input)
 //! # }
-//!
-//! fn main() {
-//!     let mut input = "0x1a2b Hello";
-//!
-//!     let digits = parse_digits.parse_next(&mut input).unwrap();
-//!
-//!     assert_eq!(input, " Hello");
-//!     assert_eq!(digits, "1a2b");
-//!
-//!     assert!(parse_digits(&mut "ghiWorld").is_err());
-//! }
+//! #
+//! # fn main() {
+//! #     let mut input = "0x1a2b Hello";
+//! #
+//! #     let digits = parse_digits.parse_next(&mut input).unwrap();
+//! #
+//! #     assert_eq!(input, " Hello");
+//! #     assert_eq!(digits, "1a2b");
+//! #
+//! #     assert!(parse_digits(&mut "ghiWorld").is_err());
+//! # }
 //! ```
 //!
-//! > **Note:** [`peek`] may be useful when [`dispatch`]ing from hints from each case's parser.
+//! <div class="warning">
+//!
+//! **Note:** [`peek`] may be useful when [`dispatch`]ing from hints from each case's parser.
+//!
+//! </div>
 //!
 //! See [`combinator`] for more alternative parsers.
 
 #![allow(unused_imports)]
-use super::chapter_6;
+use super::chapter_7;
 use crate::combinator;
 use crate::combinator::alt;
 use crate::combinator::dispatch;

crates/winnow/src/_tutorial/chapter_4.rs

diff --git a/crates/winnow/src/_tutorial/chapter_4.rs b/crates/winnow/src/_tutorial/chapter_4.rs
index 328a648..1f4d352 100644
--- a/crates/winnow/src/_tutorial/chapter_4.rs
+++ b/crates/winnow/src/_tutorial/chapter_4.rs
@@ -59,7 +59,7 @@
 //! // ...
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #

crates/winnow/src/_tutorial/chapter_5.rs

diff --git a/crates/winnow/src/_tutorial/chapter_5.rs b/crates/winnow/src/_tutorial/chapter_5.rs
index 8aa719b..f095e82 100644
--- a/crates/winnow/src/_tutorial/chapter_5.rs
+++ b/crates/winnow/src/_tutorial/chapter_5.rs
@@ -35,7 +35,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -100,7 +100,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -136,8 +136,8 @@
 //! # }
 //! ```
 //!
-//! You'll notice that the above allows trailing `,` when we intended to not support that. We can
-//! easily fix this by using [`separated`]:
+//! You'll notice that the above allows trailing `,`. However, if that's not desired, it
+//! can easily be fixed by using [`separated`] instead of [`repeat`]:
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
@@ -163,7 +163,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -199,9 +199,22 @@
 //! }
 //! ```
 //!
-//! If you look closely at [`repeat`], it isn't collecting directly into a [`Vec`] but
-//! [`Accumulate`] to gather the results. This lets us make more complex parsers than we did in
-//! [`chapter_2`] by accumulating the results into a `()` and [`recognize`][Parser::recognize]-ing the captured input:
+//! If you look closely at [`separated`] and [`repeat`], they aren't limited to collecting
+//! the result into a [`Vec`], but rather anything that implements the [`Accumulate`] trait.
+//! [`Accumulate`] is for instance also implemented for [`HashSet`], [`String`] and `()`.
+//!
+//! This lets us build more complex parsers than we did in
+//! [`chapter_2`] by accumulating the results into a `()` and [`take`][Parser::take]-ing
+//! the consumed input.
+//!
+//! `take` works by
+//! 1. Creating a [`checkpoint`][Stream::checkpoint]
+//! 2. Running the inner parser, in our case the `parse_list` parser, which will advance the input
+//! 3. Returning the slice from the first checkpoint to the current position.
+//!
+//! Since the result of `parse_list` gets thrown away, we
+//! accumulates into a `()` to not waste work creating an unused `Vec`.
+//!
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
@@ -210,8 +223,8 @@
 //! # use winnow::combinator::fail;
 //! # use winnow::combinator::separated;
 //! #
-//! fn recognize_list<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//!     parse_list.recognize().parse_next(input)
+//! fn take_list<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//!     parse_list.take().parse_next(input)
 //! }
 //!
 //! fn parse_list(input: &mut &str) -> PResult<()> {
@@ -230,7 +243,7 @@
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -257,7 +270,7 @@
 //! fn main() {
 //!     let mut input = "0x1a2b,0x3c4d,0x5e6f Hello";
 //!
-//!     let digits = recognize_list.parse_next(&mut input).unwrap();
+//!     let digits = take_list.parse_next(&mut input).unwrap();
 //!
 //!     assert_eq!(input, " Hello");
 //!     assert_eq!(digits, "0x1a2b,0x3c4d,0x5e6f");
@@ -274,7 +287,9 @@
 use crate::combinator::repeat;
 use crate::combinator::separated;
 use crate::stream::Accumulate;
+use crate::stream::Stream;
 use crate::Parser;
+use std::collections::HashSet;
 use std::vec::Vec;
 
 pub use super::chapter_4 as previous;

crates/winnow/src/_tutorial/chapter_6.rs

diff --git a/crates/winnow/src/_tutorial/chapter_6.rs b/crates/winnow/src/_tutorial/chapter_6.rs
index 0d54e15..c465757 100644
--- a/crates/winnow/src/_tutorial/chapter_6.rs
+++ b/crates/winnow/src/_tutorial/chapter_6.rs
@@ -1,108 +1,77 @@
-//! # Chapter 6: Error Reporting
+//! # Chapter 6: Integrating the Parser
 //!
-//! ## `Error`
+//! So far, we've highlighted how to incrementally parse, but how do we bring this all together
+//! into our application?
 //!
-//! Back in [`chapter_1`], we glossed over the `Err` side of [`PResult`].  `PResult<O>` is
-//! actually short for `PResult<O, E=ContextError>` where [`ContextError`] is a relatively cheap
-//! way of building up reasonable errors for humans.
-//!
-//! You can use [`Parser::context`] to annotate the error with custom types
-//! while unwinding to further improve the error quality.
-//!
+//! Parsers we've been working with look like:
 //! ```rust
-//! # use winnow::prelude::*;
-//! # use winnow::token::take_while;
-//! # use winnow::combinator::alt;
-//! use winnow::error::StrContext;
-//!
-//! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
-//!     alt((
-//!         ("0b", parse_bin_digits).context(StrContext::Label("binary")),
-//!         ("0o", parse_oct_digits).context(StrContext::Label("octal")),
-//!         ("0d", parse_dec_digits).context(StrContext::Label("decimal")),
-//!         ("0x", parse_hex_digits).context(StrContext::Label("hexadecimal")),
-//!     )).parse_next(input)
-//! }
-//!
-//! // ...
-//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//! #     take_while(1.., (
-//! #         ('0'..='7'),
-//! #     )).parse_next(input)
-//! # }
-//! #
-//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//! #     take_while(1.., (
-//! #         ('0'..='7'),
-//! #     )).parse_next(input)
-//! # }
-//! #
-//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//! #     take_while(1.., (
-//! #         ('0'..='9'),
-//! #     )).parse_next(input)
-//! # }
-//! #
-//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//! #     take_while(1.., (
-//! #         ('0'..='9'),
-//! #         ('A'..='F'),
-//! #         ('a'..='f'),
-//! #     )).parse_next(input)
-//! # }
-//!
-//! fn main() {
-//!     let mut input = "0x1a2b Hello";
-//!
-//!     let (prefix, digits) = parse_digits.parse_next(&mut input).unwrap();
-//!
-//!     assert_eq!(input, " Hello");
-//!     assert_eq!(prefix, "0x");
-//!     assert_eq!(digits, "1a2b");
-//! }
-//! ```
-//!
-//! At first glance, this looks correct but what `context` will be reported when parsing `"0b5"`?
-//! If you remember back to [`chapter_3`], [`alt`] will only report the last error by default which
-//! means when parsing `"0b5"`, the `context` will be `"hexadecimal"`.
-//!
-//! ## `ErrMode`
-//!
-//! Let's break down `PResult<O, E>` one step further:
-//! ```rust
-//! # use winnow::error::ErrorKind;
+//! # use winnow::error::ContextError;
 //! # use winnow::error::ErrMode;
-//! pub type PResult<O, E = ErrorKind> = Result<O, ErrMode<E>>;
+//! # use winnow::Parser;
+//! use winnow::PResult;
+//!
+//! pub fn parser<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//!     // ...
+//! #     Ok("")
+//! }
 //! ```
-//! [`PResult`] is just a fancy wrapper around `Result` that wraps our error in an [`ErrMode`]
-//! type.
+//! 1. We have to decide what to do about the "remainder" of the `input`.
+//! 2. The [`PResult`] is not compatible with the rest of the Rust ecosystem.
+//!     Normally, Rust applications want errors that are `std::error::Error + Send + Sync + 'static`
+//!     meaning:
+//!     - They implement the [`std::error::Error`] trait
+//!     - They can be sent across threads
+//!     - They are safe to be referenced across threads
+//!     - They do not borrow
 //!
-//! [`ErrMode`] is an enum with [`Backtrack`] and [`Cut`] variants (ignore [`Incomplete`] as its only
-//! relevant for [streaming][_topic::stream]). By default, errors are [`Backtrack`], meaning that
-//! other parsing branches will be attempted on failure, like the next case of an [`alt`].  [`Cut`]
-//! shortcircuits all other branches, immediately reporting the error.
+//! winnow provides [`Parser::parse`] to help with this:
+//! - Ensures we hit [`eof`]
+//! - Converts from [`PResult`] to [`Result`]
+//! - Wraps the error in [`ParseError`]
+//!   - For simple cases, [`ParseError`] provides a [`std::fmt::Display`] impl to render the error.
+//!   - For more involved cases, [`ParseError`] provides the original [`input`][ParseError::input] and the
+//!     [`offset`][ParseError::offset] of where it failed so you can capture this information in
+//!     your error, [rendering it as you wish][chapter_7#error-adaptation-and-rendering].
 //!
-//! So we can get the correct `context` by modifying the above example with [`cut_err`]:
+//! However, [`ParseError`] will still need some level of adaptation to integrate with your
+//! application's error type (like with `?`).
+//!
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
-//! # use winnow::combinator::alt;
-//! # use winnow::error::StrContext;
-//! use winnow::combinator::cut_err;
+//! # use winnow::combinator::dispatch;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! use winnow::Parser;
 //!
-//! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
-//!     alt((
-//!         ("0b", cut_err(parse_bin_digits)).context(StrContext::Label("binary")),
-//!         ("0o", cut_err(parse_oct_digits)).context(StrContext::Label("octal")),
-//!         ("0d", cut_err(parse_dec_digits)).context(StrContext::Label("decimal")),
-//!         ("0x", cut_err(parse_hex_digits)).context(StrContext::Label("hexadecimal")),
-//!     )).parse_next(input)
+//! #[derive(Debug, PartialEq, Eq)]
+//! pub struct Hex(usize);
+//!
+//! impl std::str::FromStr for Hex {
+//!     type Err = anyhow::Error;
+//!
+//!     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//!         parse_digits
+//!             .map(Hex)
+//!             .parse(input)
+//!             .map_err(|e| anyhow::format_err!("{e}"))
+//!     }
 //! }
 //!
 //! // ...
+//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<usize> {
+//! #     dispatch!(take(2usize);
+//! #         "0b" => parse_bin_digits.try_map(|s| usize::from_str_radix(s, 2)),
+//! #         "0o" => parse_oct_digits.try_map(|s| usize::from_str_radix(s, 8)),
+//! #         "0d" => parse_dec_digits.try_map(|s| usize::from_str_radix(s, 10)),
+//! #         "0x" => parse_hex_digits.try_map(|s| usize::from_str_radix(s, 16)),
+//! #         _ => fail,
+//! #     ).parse_next(input)
+//! # }
+//! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -127,29 +96,25 @@
 //! # }
 //!
 //! fn main() {
-//!     let mut input = "0x1a2b Hello";
+//!     let input = "0x1a2b";
+//!     assert_eq!(input.parse::<Hex>().unwrap(), Hex(0x1a2b));
 //!
-//!     let (prefix, digits) = parse_digits.parse_next(&mut input).unwrap();
-//!
-//!     assert_eq!(input, " Hello");
-//!     assert_eq!(prefix, "0x");
-//!     assert_eq!(digits, "1a2b");
+//!     let input = "0x1a2b Hello";
+//!     assert!(input.parse::<Hex>().is_err());
+//!     let input = "ghiHello";
+//!     assert!(input.parse::<Hex>().is_err());
 //! }
 //! ```
-//! Now, when parsing `"0b5"`, the `context` will be `"binary"`.
 
 #![allow(unused_imports)]
 use super::chapter_1;
-use super::chapter_3;
-use crate::combinator::alt;
-use crate::combinator::cut_err;
-use crate::error::ContextError;
+use super::chapter_7;
+use crate::combinator::eof;
 use crate::error::ErrMode;
-use crate::error::ErrMode::*;
-use crate::error::ErrorKind;
+use crate::error::InputError;
+use crate::error::ParseError;
 use crate::PResult;
 use crate::Parser;
-use crate::_topic;
 
 pub use super::chapter_5 as previous;
 pub use super::chapter_7 as next;

crates/winnow/src/_tutorial/chapter_7.rs

diff --git a/crates/winnow/src/_tutorial/chapter_7.rs b/crates/winnow/src/_tutorial/chapter_7.rs
index 659be3a..58ccc4d 100644
--- a/crates/winnow/src/_tutorial/chapter_7.rs
+++ b/crates/winnow/src/_tutorial/chapter_7.rs
@@ -1,76 +1,52 @@
-//! # Chapter 7: Integrating the Parser
+//! # Chapter 7: Error Reporting
 //!
-//! So far, we've highlighted how to incrementally parse, but how do we bring this all together
-//! into our application?
+//! ## Context
 //!
-//! Parsers we've been working with look like:
-//! ```rust
-//! # use winnow::error::ContextError;
-//! # use winnow::error::ErrMode;
-//! # use winnow::Parser;
-//! #
-//! pub fn parser<'s>(input: &mut &'s str) -> PResult<&'s str> {
-//!     // ...
-//! #     Ok("")
-//! }
-//!
-//! type PResult<O> = Result<
-//!     O,
-//!     ErrMode<ContextError>
-//! >;
-//! ```
-//! 1. We have to decide what to do about the "remainder" of the `input`.
-//! 2. The [`ErrMode<ContextError>`] is not compatible with the rest of the Rust ecosystem.
-//!     Normally, Rust applications want errors that are `std::error::Error + Send + Sync + 'static`
-//!     meaning:
-//!     - They implement the [`std::error::Error`] trait
-//!     - They can be sent across threads
-//!     - They are safe to be referenced across threads
-//!     - They do not borrow
-//!
-//! winnow provides [`Parser::parse`] to help with this:
-//! - Ensures we hit [`eof`]
-//! - Removes the [`ErrMode`] wrapper
-//! - Wraps the error in [`ParseError`]
-//!   - Provides access to the original [`input`][ParseError::input] with the
-//!     [`offset`][ParseError::offset] of where it failed
-//!   - Provides a default renderer (via [`std::fmt::Display`])
+//! With [`Parser::parse`] we get errors that point to the failure but don't explain the reason for
+//! the failure:
 //! ```rust
 //! # use winnow::prelude::*;
 //! # use winnow::token::take_while;
-//! # use winnow::combinator::dispatch;
+//! # use winnow::combinator::alt;
 //! # use winnow::token::take;
 //! # use winnow::combinator::fail;
-//! use winnow::Parser;
-//!
-//! #[derive(Debug, PartialEq, Eq)]
-//! pub struct Hex(usize);
-//!
-//! impl std::str::FromStr for Hex {
-//!     type Err = String;
-//!
-//!     fn from_str(input: &str) -> Result<Self, Self::Err> {
-//!         parse_digits
-//!             .map(Hex)
-//!             .parse(input)
-//!             .map_err(|e| e.to_string())
-//!     }
-//! }
-//!
+//! # use winnow::Parser;
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
 //! // ...
-//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<usize> {
-//! #     dispatch!(take(2usize);
-//! #         "0b" => parse_bin_digits.try_map(|s| usize::from_str_radix(s, 2)),
-//! #         "0o" => parse_oct_digits.try_map(|s| usize::from_str_radix(s, 8)),
-//! #         "0d" => parse_dec_digits.try_map(|s| usize::from_str_radix(s, 10)),
-//! #         "0x" => parse_hex_digits.try_map(|s| usize::from_str_radix(s, 16)),
-//! #         _ => fail,
-//! #     ).parse_next(input)
+//!
+//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//! #     alt((
+//! #         ("0b", parse_bin_digits),
+//! #         ("0o", parse_oct_digits),
+//! #         ("0d", parse_dec_digits),
+//! #         ("0x", parse_hex_digits),
+//! #     )).parse_next(input)
 //! # }
 //! #
 //! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
 //! #     take_while(1.., (
-//! #         ('0'..='7'),
+//! #         ('0'..='1'),
 //! #     )).parse_next(input)
 //! # }
 //! #
@@ -93,26 +69,659 @@
 //! #         ('a'..='f'),
 //! #     )).parse_next(input)
 //! # }
-//!
 //! fn main() {
-//!     let input = "0x1a2b";
-//!     assert_eq!(input.parse::<Hex>().unwrap(), Hex(0x1a2b));
+//!     let input = "0xZZ";
+//!     let error = "\
+//! 0xZZ
+//!   ^
+//! ";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
 //!
-//!     let input = "0x1a2b Hello";
-//!     assert!(input.parse::<Hex>().is_err());
-//!     let input = "ghiHello";
-//!     assert!(input.parse::<Hex>().is_err());
+//! Back in [`chapter_1`], we glossed over the `Err` variant of [`PResult`].  `PResult<O>` is
+//! actually short for `PResult<O, E=ContextError>` where [`ContextError`] is a relatively cheap
+//! way of building up reasonable errors for humans.
+//!
+//! You can use [`Parser::context`] to annotate the error with custom types
+//! while unwinding to further clarify the error:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! use winnow::error::StrContext;
+//! use winnow::error::StrContextValue;
+//!
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
+//! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//!     alt((
+//!         ("0b", parse_bin_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//!         ("0o", parse_oct_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//!         ("0d", parse_dec_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//!         ("0x", parse_hex_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//!     )).parse_next(input)
+//! }
+//!
+//! // ...
+//!
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "0xZZ";
+//!     let error = "\
+//! 0xZZ
+//!   ^
+//! invalid digit
+//! expected hexadecimal";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
+//!
+//! If you remember back to [`chapter_3`], [`alt`] will only report the last error.
+//! So if the parsers fail for any reason, like a bad radix, it will be reported as an invalid
+//! hexadecimal value:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! # use winnow::error::StrContext;
+//! # use winnow::error::StrContextValue;
+//! #
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
+//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//! #     alt((
+//! #         ("0b", parse_bin_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//! #         ("0o", parse_oct_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//! #         ("0d", parse_dec_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//! #         ("0x", parse_hex_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "100";
+//!     let error = "\
+//! 100
+//! ^
+//! invalid digit
+//! expected hexadecimal";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
+//! We can improve this with [`fail`]:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! use winnow::error::StrContext;
+//! use winnow::error::StrContextValue;
+//!
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
+//! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//!     alt((
+//!         ("0b", parse_bin_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//!         ("0o", parse_oct_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//!         ("0d", parse_dec_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//!         ("0x", parse_hex_digits)
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//!         fail
+//!           .context(StrContext::Label("radix prefix"))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0b")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0o")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0d")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0x"))),
+//!     )).parse_next(input)
+//! }
+//!
+//! // ...
+//!
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "100";
+//!     let error = "\
+//! 100
+//! ^
+//! invalid radix prefix
+//! expected `0b`, `0o`, `0d`, `0x`";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
+//!
+//! ## Error Cuts
+//!
+//! We still have the issue that we are falling-through when the radix is valid but the digits
+//! don't match it:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! # use winnow::error::StrContext;
+//! # use winnow::error::StrContextValue;
+//! #
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
+//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//! #     alt((
+//! #         ("0b", parse_bin_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//! #         ("0o", parse_oct_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//! #         ("0d", parse_dec_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//! #         ("0x", parse_hex_digits)
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//! #         fail
+//! #           .context(StrContext::Label("radix prefix"))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0b")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0o")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0d")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0x"))),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "0b5";
+//!     let error = "\
+//! 0b5
+//! ^
+//! invalid radix prefix
+//! expected `0b`, `0o`, `0d`, `0x`";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
+//!
+//! Let's break down `PResult<O, E>` one step further:
+//! ```rust
+//! # use winnow::error::ErrorKind;
+//! # use winnow::error::ErrMode;
+//! pub type PResult<O, E = ErrorKind> = Result<O, ErrMode<E>>;
+//! ```
+//! [`PResult`] is just a fancy wrapper around `Result` that wraps our error in an [`ErrMode`]
+//! type.
+//!
+//! [`ErrMode`] is an enum with [`Backtrack`] and [`Cut`] variants (ignore [`Incomplete`] as its only
+//! relevant for [streaming][_topic::stream]). By default, errors are [`Backtrack`], meaning that
+//! other parsing branches will be attempted on failure, like the next case of an [`alt`].  [`Cut`]
+//! shortcircuits all other branches, immediately reporting the error.
+//!
+//! So we can get the correct `context` by modifying the above example with [`cut_err`]:
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! # use winnow::error::StrContext;
+//! # use winnow::error::StrContextValue;
+//! use winnow::combinator::cut_err;
+//!
+//! #
+//! # #[derive(Debug, PartialEq, Eq)]
+//! # pub struct Hex(usize);
+//! #
+//! # impl std::str::FromStr for Hex {
+//! #     type Err = String;
+//! #
+//! #     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//! #             .parse(input)
+//! #             .map_err(|e| e.to_string())
+//! #     }
+//! # }
+//! #
+//! fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//!     alt((
+//!         ("0b", cut_err(parse_bin_digits))
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//!         ("0o", cut_err(parse_oct_digits))
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//!         ("0d", cut_err(parse_dec_digits))
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//!         ("0x", cut_err(parse_hex_digits))
+//!           .context(StrContext::Label("digit"))
+//!           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//!         fail
+//!           .context(StrContext::Label("radix prefix"))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0b")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0o")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0d")))
+//!           .context(StrContext::Expected(StrContextValue::StringLiteral("0x"))),
+//!     )).parse_next(input)
+//! }
+//!
+//! // ...
+//!
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "0b5";
+//!     let error = "\
+//! 0b5
+//!   ^
+//! invalid digit
+//! expected binary";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err(), error);
+//! }
+//! ```
+//!
+//! ## Error Adaptation and Rendering
+//!
+//! While Winnow can provide basic rendering of errors, your application can have various demands
+//! beyond the basics provided like
+//! - Correctly reporting columns with unicode
+//! - Conforming to a specific layout
+//!
+//! For example, to get rustc-like errors with [`annotate-snippets`](https://crates.io/crates/annotate-snippets):
+//! ```rust
+//! # use winnow::prelude::*;
+//! # use winnow::token::take_while;
+//! # use winnow::combinator::alt;
+//! # use winnow::token::take;
+//! # use winnow::combinator::fail;
+//! # use winnow::Parser;
+//! # use winnow::error::ParseError;
+//! # use winnow::error::ContextError;
+//! # use winnow::error::StrContext;
+//! # use winnow::error::StrContextValue;
+//! # use winnow::combinator::cut_err;
+//! #
+//! #
+//! #[derive(Debug, PartialEq, Eq)]
+//! pub struct Hex(usize);
+//!
+//! impl std::str::FromStr for Hex {
+//!     type Err = HexError;
+//!
+//!     fn from_str(input: &str) -> Result<Self, Self::Err> {
+//!         // ...
+//! #         parse_digits
+//! #             .try_map(|(t, v)| match t {
+//! #                "0b" => usize::from_str_radix(v, 2),
+//! #                "0o" => usize::from_str_radix(v, 8),
+//! #                "0d" => usize::from_str_radix(v, 10),
+//! #                "0x" => usize::from_str_radix(v, 16),
+//! #                _ => unreachable!("`parse_digits` doesn't return `{t}`"),
+//! #              })
+//! #             .map(Hex)
+//!             .parse(input)
+//!             .map_err(|e| HexError::from_parse(e, input))
+//!     }
+//! }
+//!
+//! #[derive(Debug)]
+//! pub struct HexError {
+//!     message: String,
+//!     // Byte spans are tracked, rather than line and column.
+//!     // This makes it easier to operate on programmatically
+//!     // and doesn't limit us to one definition for column count
+//!     // which can depend on the output medium and application.
+//!     span: std::ops::Range<usize>,
+//!     input: String,
+//! }
+//!
+//! impl HexError {
+//!     fn from_parse(error: ParseError<&str, ContextError>, input: &str) -> Self {
+//!         // The default renderer for `ContextError` is still used but that can be
+//!         // customized as well to better fit your needs.
+//!         let message = error.inner().to_string();
+//!         let input = input.to_owned();
+//!         let start = error.offset();
+//!         // Assume the error span is only for the first `char`.
+//!         // Semantic errors are free to choose the entire span returned by `Parser::with_span`.
+//!         let end = (start + 1..).find(|e| input.is_char_boundary(*e)).unwrap_or(start);
+//!         Self {
+//!             message,
+//!             span: start..end,
+//!             input,
+//!         }
+//!     }
+//! }
+//!
+//! impl std::fmt::Display for HexError {
+//!     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+//!         let message = annotate_snippets::Level::Error.title(&self.message)
+//!             .snippet(annotate_snippets::Snippet::source(&self.input)
+//!                 .fold(true)
+//!                 .annotation(annotate_snippets::Level::Error.span(self.span.clone()))
+//!             );
+//!         let renderer = annotate_snippets::Renderer::plain();
+//!         let rendered = renderer.render(message);
+//!         rendered.fmt(f)
+//!     }
+//! }
+//!
+//! impl std::error::Error for HexError {}
+//!
+//! # fn parse_digits<'s>(input: &mut &'s str) -> PResult<(&'s str, &'s str)> {
+//! #     alt((
+//! #         ("0b", cut_err(parse_bin_digits))
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("binary"))),
+//! #         ("0o", cut_err(parse_oct_digits))
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("octal"))),
+//! #         ("0d", cut_err(parse_dec_digits))
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("decimal"))),
+//! #         ("0x", cut_err(parse_hex_digits))
+//! #           .context(StrContext::Label("digit"))
+//! #           .context(StrContext::Expected(StrContextValue::Description("hexadecimal"))),
+//! #         fail
+//! #           .context(StrContext::Label("radix prefix"))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0b")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0o")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0d")))
+//! #           .context(StrContext::Expected(StrContextValue::StringLiteral("0x"))),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_bin_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='1'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_oct_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='7'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_dec_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #     )).parse_next(input)
+//! # }
+//! #
+//! # fn parse_hex_digits<'s>(input: &mut &'s str) -> PResult<&'s str> {
+//! #     take_while(1.., (
+//! #         ('0'..='9'),
+//! #         ('A'..='F'),
+//! #         ('a'..='f'),
+//! #     )).parse_next(input)
+//! # }
+//! fn main() {
+//!     let input = "0b5";
+//!     let error = "\
+//! error: invalid digit
+//! expected binary
+//!   |
+//! 1 | 0b5
+//!   |   ^
+//!   |";
+//!     assert_eq!(input.parse::<Hex>().unwrap_err().to_string(), error);
 //! }
 //! ```
 
 #![allow(unused_imports)]
 use super::chapter_1;
-use crate::combinator::eof;
+use super::chapter_3;
+use crate::combinator::alt;
+use crate::combinator::cut_err;
+use crate::combinator::fail;
+use crate::error::ContextError;
 use crate::error::ErrMode;
-use crate::error::InputError;
-use crate::error::ParseError;
+use crate::error::ErrMode::*;
+use crate::error::ErrorKind;
 use crate::PResult;
 use crate::Parser;
+use crate::_topic;
 
 pub use super::chapter_6 as previous;
 pub use super::chapter_8 as next;

crates/winnow/src/_tutorial/chapter_8.rs

diff --git a/crates/winnow/src/_tutorial/chapter_8.rs b/crates/winnow/src/_tutorial/chapter_8.rs
index 6ff8f29..d594fc4 100644
--- a/crates/winnow/src/_tutorial/chapter_8.rs
+++ b/crates/winnow/src/_tutorial/chapter_8.rs
@@ -1,7 +1,8 @@
 //! # Chapter 8: Debugging
 //!
 //! When things inevitably go wrong, you can introspect the parsing state by running your test case
-//! with `--features debug`:
+//! with `--features winnow/debug`:
+//!
 //! ![Trace output from string example](https://raw.githubusercontent.com/winnow-rs/winnow/main/assets/trace.svg "Example output")
 //!
 //! You can extend your own parsers to show up by wrapping their body with

crates/winnow/src/ascii/mod.rs

diff --git a/crates/winnow/src/ascii/mod.rs b/crates/winnow/src/ascii/mod.rs
index 8e6a480..bdcfc5c 100644
--- a/crates/winnow/src/ascii/mod.rs
+++ b/crates/winnow/src/ascii/mod.rs
@@ -9,14 +9,19 @@
 
 use crate::combinator::alt;
 use crate::combinator::cut_err;
+use crate::combinator::dispatch;
+use crate::combinator::empty;
+use crate::combinator::fail;
 use crate::combinator::opt;
 use crate::combinator::trace;
 use crate::error::ParserError;
 use crate::error::{ErrMode, ErrorKind, Needed};
+use crate::stream::FindSlice;
 use crate::stream::{AsBStr, AsChar, ParseSlice, Stream, StreamIsPartial};
 use crate::stream::{Compare, CompareResult};
+use crate::token::any;
 use crate::token::one_of;
-use crate::token::take_till;
+use crate::token::take_until;
 use crate::token::take_while;
 use crate::PResult;
 use crate::Parser;
@@ -54,7 +59,18 @@
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn crlf<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::crlf.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -81,11 +97,10 @@
 /// assert_eq!(crlf::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn crlf<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn crlf<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    I: Compare<&'static str>,
+    Input: StreamIsPartial + Stream + Compare<&'static str>,
+    Error: ParserError<Input>,
 {
     trace("crlf", "\r\n").parse_next(input)
 }
@@ -94,7 +109,18 @@
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn till_line_ending<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::till_line_ending.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -120,21 +146,20 @@
 /// # use winnow::Partial;
 /// # use winnow::ascii::till_line_ending;
 /// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("ab\r\nc")), Ok((Partial::new("\r\nc"), "ab")));
-/// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("abc")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
+/// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("abc")), Err(ErrMode::Incomplete(Needed::Unknown)));
+/// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::Unknown)));
 /// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("a\rb\nc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\rb\nc"), ErrorKind::Tag ))));
 /// assert_eq!(till_line_ending::<_, InputError<_>>.parse_peek(Partial::new("a\rbc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\rbc"), ErrorKind::Tag ))));
 /// ```
 #[inline(always)]
-pub fn till_line_ending<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn till_line_ending<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    I: Compare<&'static str>,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream + Compare<&'static str> + FindSlice<(char, char)>,
+    <Input as Stream>::Token: AsChar + Clone,
+    Error: ParserError<Input>,
 {
-    trace("till_line_ending", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() {
+    trace("till_line_ending", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
             till_line_ending_::<_, _, true>(input)
         } else {
             till_line_ending_::<_, _, false>(input)
@@ -143,19 +168,6 @@
     .parse_next(input)
 }
 
-/// Deprecated, replaced with [`till_line_ending`]
-#[deprecated(since = "0.5.35", note = "Replaced with `till_line_ending`")]
-#[inline(always)]
-pub fn not_line_ending<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    I: Compare<&'static str>,
-    <I as Stream>::Token: AsChar + Clone,
-{
-    till_line_ending(input)
-}
-
 fn till_line_ending_<I, E: ParserError<I>, const PARTIAL: bool>(
     input: &mut I,
 ) -> PResult<<I as Stream>::Slice, E>
@@ -163,14 +175,20 @@
     I: StreamIsPartial,
     I: Stream,
     I: Compare<&'static str>,
+    I: FindSlice<(char, char)>,
     <I as Stream>::Token: AsChar + Clone,
 {
-    let res = take_till(0.., ('\r', '\n')).parse_next(input)?;
-    if input.compare("\r") == CompareResult::Ok {
+    let res = match take_until(0.., ('\r', '\n')).parse_next(input) {
+        Ok(slice) => slice,
+        Err(ErrMode::Backtrack(_)) => input.finish(),
+        Err(err) => {
+            return Err(err);
+        }
+    };
+    if matches!(input.compare("\r"), CompareResult::Ok(_)) {
         let comp = input.compare("\r\n");
         match comp {
-            //FIXME: calculate the right index
-            CompareResult::Ok => {}
+            CompareResult::Ok(_) => {}
             CompareResult::Incomplete if PARTIAL && input.is_partial() => {
                 return Err(ErrMode::Incomplete(Needed::Unknown));
             }
@@ -187,7 +205,18 @@
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn line_ending<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::line_ending.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -214,11 +243,10 @@
 /// assert_eq!(line_ending::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn line_ending<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn line_ending<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    I: Compare<&'static str>,
+    Input: StreamIsPartial + Stream + Compare<&'static str>,
+    Error: ParserError<Input>,
 {
     trace("line_ending", alt(("\n", "\r\n"))).parse_next(input)
 }
@@ -227,7 +255,18 @@
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn newline(input: &mut &str) -> PResult<char>
+/// # {
+/// #     winnow::ascii::newline.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -240,8 +279,8 @@
 /// }
 ///
 /// assert_eq!(parser.parse_peek("\nc"), Ok(("c", '\n')));
-/// assert_eq!(parser.parse_peek("\r\nc"), Err(ErrMode::Backtrack(InputError::new("\r\nc", ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Token))));
+/// assert_eq!(parser.parse_peek("\r\nc"), Err(ErrMode::Backtrack(InputError::new("\r\nc", ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// ```
 ///
 /// ```
@@ -250,7 +289,7 @@
 /// # use winnow::Partial;
 /// # use winnow::ascii::newline;
 /// assert_eq!(newline::<_, InputError<_>>.parse_peek(Partial::new("\nc")), Ok((Partial::new("c"), '\n')));
-/// assert_eq!(newline::<_, InputError<_>>.parse_peek(Partial::new("\r\nc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\r\nc"), ErrorKind::Verify))));
+/// assert_eq!(newline::<_, InputError<_>>.parse_peek(Partial::new("\r\nc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\r\nc"), ErrorKind::Tag))));
 /// assert_eq!(newline::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
@@ -258,16 +297,27 @@
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    I: Compare<char>,
 {
-    trace("newline", '\n'.map(AsChar::as_char)).parse_next(input)
+    trace("newline", '\n').parse_next(input)
 }
 
 /// Matches a tab character `'\t'`.
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn tab(input: &mut &str) -> PResult<char>
+/// # {
+/// #     winnow::ascii::tab.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -280,8 +330,8 @@
 /// }
 ///
 /// assert_eq!(parser.parse_peek("\tc"), Ok(("c", '\t')));
-/// assert_eq!(parser.parse_peek("\r\nc"), Err(ErrMode::Backtrack(InputError::new("\r\nc", ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Token))));
+/// assert_eq!(parser.parse_peek("\r\nc"), Err(ErrMode::Backtrack(InputError::new("\r\nc", ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// ```
 ///
 /// ```
@@ -290,17 +340,16 @@
 /// # use winnow::Partial;
 /// # use winnow::ascii::tab;
 /// assert_eq!(tab::<_, InputError<_>>.parse_peek(Partial::new("\tc")), Ok((Partial::new("c"), '\t')));
-/// assert_eq!(tab::<_, InputError<_>>.parse_peek(Partial::new("\r\nc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\r\nc"), ErrorKind::Verify))));
+/// assert_eq!(tab::<_, InputError<_>>.parse_peek(Partial::new("\r\nc")), Err(ErrMode::Backtrack(InputError::new(Partial::new("\r\nc"), ErrorKind::Tag))));
 /// assert_eq!(tab::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn tab<I, Error: ParserError<I>>(input: &mut I) -> PResult<char, Error>
+pub fn tab<Input, Error>(input: &mut Input) -> PResult<char, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream + Compare<char>,
+    Error: ParserError<Input>,
 {
-    trace("tab", '\t'.map(AsChar::as_char)).parse_next(input)
+    trace("tab", '\t').parse_next(input)
 }
 
 /// Recognizes zero or more lowercase and uppercase ASCII alphabetic characters: `'a'..='z'`, `'A'..='Z'`
@@ -308,9 +357,20 @@
 /// *Complete version*: Will return the whole input if no terminating token is found (a non
 /// alphabetic character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non alphabetic character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn alpha0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::alpha0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -336,11 +396,11 @@
 /// assert_eq!(alpha0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn alpha0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn alpha0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("alpha0", take_while(0.., AsChar::is_alpha)).parse_next(input)
 }
@@ -350,9 +410,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found  (a non alphabetic character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non alphabetic character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn alpha1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::alpha1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -378,11 +449,11 @@
 /// assert_eq!(alpha1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn alpha1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn alpha1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("alpha1", take_while(1.., AsChar::is_alpha)).parse_next(input)
 }
@@ -392,9 +463,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn digit0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::digit0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -421,11 +503,11 @@
 /// assert_eq!(digit0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn digit0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn digit0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("digit0", take_while(0.., AsChar::is_dec_digit)).parse_next(input)
 }
@@ -435,9 +517,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn digit1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::digit1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -480,11 +573,11 @@
 /// assert!(parser.parse_peek("b").is_err());
 /// ```
 #[inline(always)]
-pub fn digit1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn digit1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("digit1", take_while(1.., AsChar::is_dec_digit)).parse_next(input)
 }
@@ -494,9 +587,20 @@
 ///
 /// *Complete version*: Will return the whole input if no terminating token is found (a non hexadecimal digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non hexadecimal digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn hex_digit0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::hex_digit0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -522,11 +626,11 @@
 /// assert_eq!(hex_digit0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn hex_digit0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn hex_digit0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("hex_digit0", take_while(0.., AsChar::is_hex_digit)).parse_next(input)
 }
@@ -537,9 +641,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non hexadecimal digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non hexadecimal digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn hex_digit1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::hex_digit1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -565,11 +680,11 @@
 /// assert_eq!(hex_digit1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn hex_digit1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn hex_digit1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("hex_digit1", take_while(1.., AsChar::is_hex_digit)).parse_next(input)
 }
@@ -579,9 +694,20 @@
 /// *Complete version*: Will return the whole input if no terminating token is found (a non octal
 /// digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non octal digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn oct_digit0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::oct_digit0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -607,11 +733,12 @@
 /// assert_eq!(oct_digit0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn oct_digit0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn oct_digit0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial,
+    Input: Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("oct_digit0", take_while(0.., AsChar::is_oct_digit)).parse_next(input)
 }
@@ -621,9 +748,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non octal digit character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non octal digit character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn oct_digit1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::oct_digit1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -649,11 +787,11 @@
 /// assert_eq!(oct_digit1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn oct_digit1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn oct_digit1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("oct_digit0", take_while(1.., AsChar::is_oct_digit)).parse_next(input)
 }
@@ -663,9 +801,20 @@
 /// *Complete version*: Will return the whole input if no terminating token is found (a non
 /// alphanumerical character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non alphanumerical character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn alphanumeric0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::alphanumeric0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -691,11 +840,11 @@
 /// assert_eq!(alphanumeric0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn alphanumeric0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn alphanumeric0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("alphanumeric0", take_while(0.., AsChar::is_alphanum)).parse_next(input)
 }
@@ -705,9 +854,20 @@
 /// *Complete version*: Will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non alphanumerical character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non alphanumerical character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn alphanumeric1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::alphanumeric1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -733,11 +893,11 @@
 /// assert_eq!(alphanumeric1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn alphanumeric1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn alphanumeric1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("alphanumeric1", take_while(1.., AsChar::is_alphanum)).parse_next(input)
 }
@@ -747,9 +907,20 @@
 /// *Complete version*: Will return the whole input if no terminating token is found (a non space
 /// character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non space character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn space0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::space0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -762,23 +933,34 @@
 /// assert_eq!(space0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn space0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn space0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("space0", take_while(0.., AsChar::is_space)).parse_next(input)
 }
 
-/// Recognizes zero or more spaces and tabs.
+/// Recognizes one or more spaces and tabs.
 ///
 /// *Complete version*: Will return the whole input if no terminating token is found (a non space
 /// character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non space character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn space1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::space1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -804,11 +986,11 @@
 /// assert_eq!(space1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn space1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn space1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    Error: ParserError<Input>,
 {
     trace("space1", take_while(1.., AsChar::is_space)).parse_next(input)
 }
@@ -818,9 +1000,20 @@
 /// *Complete version*: will return the whole input if no terminating token is found (a non space
 /// character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non space character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn multispace0<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::multispace0.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -846,11 +1039,11 @@
 /// assert_eq!(multispace0::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn multispace0<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn multispace0<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar + Clone,
+    Error: ParserError<Input>,
 {
     trace("multispace0", take_while(0.., (' ', '\t', '\r', '\n'))).parse_next(input)
 }
@@ -860,9 +1053,20 @@
 /// *Complete version*: will return an error if there's not enough input data,
 /// or the whole input if no terminating token is found (a non space character).
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data,
 /// or if no terminating token is found (a non space character).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn multispace1<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::ascii::multispace1.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```
@@ -888,11 +1092,11 @@
 /// assert_eq!(multispace1::<_, InputError<_>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn multispace1<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn multispace1<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar + Clone,
+    Error: ParserError<Input>,
 {
     trace("multispace1", take_while(1.., (' ', '\t', '\r', '\n'))).parse_next(input)
 }
@@ -901,159 +1105,84 @@
 ///
 /// *Complete version*: can parse until the end of input.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] into a `u32`:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn dec_uint(input: &mut &str) -> PResult<u32>
+/// # {
+/// #     winnow::ascii::dec_uint.parse_next(input)
+/// # }
+/// ```
 #[doc(alias = "u8")]
 #[doc(alias = "u16")]
 #[doc(alias = "u32")]
 #[doc(alias = "u64")]
 #[doc(alias = "u128")]
-pub fn dec_uint<I, O, E: ParserError<I>>(input: &mut I) -> PResult<O, E>
+pub fn dec_uint<Input, Output, Error>(input: &mut Input) -> PResult<Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
-    O: Uint,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Slice: AsBStr,
+    <Input as Stream>::Token: AsChar + Clone,
+    Output: Uint,
+    Error: ParserError<Input>,
 {
-    trace("dec_uint", move |input: &mut I| {
-        if input.eof_offset() == 0 {
-            if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
-                return Err(ErrMode::Incomplete(Needed::new(1)));
-            } else {
-                return Err(ErrMode::from_error_kind(input, ErrorKind::Slice));
-            }
-        }
-
-        let mut value = O::default();
-        for (offset, c) in input.iter_offsets() {
-            match c.as_char().to_digit(10) {
-                Some(d) => match value.checked_mul(10, sealed::SealedMarker).and_then(|v| {
-                    let d = d as u8;
-                    v.checked_add(d, sealed::SealedMarker)
-                }) {
-                    None => return Err(ErrMode::from_error_kind(input, ErrorKind::Verify)),
-                    Some(v) => value = v,
-                },
-                None => {
-                    if offset == 0 {
-                        return Err(ErrMode::from_error_kind(input, ErrorKind::Slice));
-                    } else {
-                        let _ = input.next_slice(offset);
-                        return Ok(value);
-                    }
-                }
-            }
-        }
-
-        if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
-            Err(ErrMode::Incomplete(Needed::new(1)))
-        } else {
-            let _ = input.finish();
-            Ok(value)
-        }
+    trace("dec_uint", move |input: &mut Input| {
+        alt(((one_of('1'..='9'), digit0).void(), one_of('0').void()))
+            .take()
+            .verify_map(|s: <Input as Stream>::Slice| {
+                let s = s.as_bstr();
+                // SAFETY: Only 7-bit ASCII characters are parsed
+                let s = unsafe { crate::lib::std::str::from_utf8_unchecked(s) };
+                Output::try_from_dec_uint(s)
+            })
+            .parse_next(input)
     })
     .parse_next(input)
 }
 
 /// Metadata for parsing unsigned integers, see [`dec_uint`]
-pub trait Uint: Default {
+pub trait Uint: Sized {
     #[doc(hidden)]
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self>;
-    #[doc(hidden)]
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self>;
+    fn try_from_dec_uint(slice: &str) -> Option<Self>;
 }
 
 impl Uint for u8 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Uint for u16 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Uint for u32 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Uint for u64 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Uint for u128 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
-/// Deprecated since v0.5.17
-impl Uint for i8 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
-    }
-}
-
-/// Deprecated since v0.5.17
-impl Uint for i16 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
-    }
-}
-
-/// Deprecated since v0.5.17
-impl Uint for i32 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
-    }
-}
-
-/// Deprecated since v0.5.17
-impl Uint for i64 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
-    }
-}
-
-/// Deprecated since v0.5.17
-impl Uint for i128 {
-    fn checked_mul(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_mul(by as Self)
-    }
-    fn checked_add(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_add(by as Self)
+impl Uint for usize {
+    fn try_from_dec_uint(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
@@ -1061,104 +1190,89 @@
 ///
 /// *Complete version*: can parse until the end of input.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] into an `i32`:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn dec_int(input: &mut &str) -> PResult<i32>
+/// # {
+/// #     winnow::ascii::dec_int.parse_next(input)
+/// # }
+/// ```
 #[doc(alias = "i8")]
 #[doc(alias = "i16")]
 #[doc(alias = "i32")]
 #[doc(alias = "i64")]
 #[doc(alias = "i128")]
-pub fn dec_int<I, O, E: ParserError<I>>(input: &mut I) -> PResult<O, E>
+pub fn dec_int<Input, Output, Error>(input: &mut Input) -> PResult<Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
-    O: Int,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Slice: AsBStr,
+    <Input as Stream>::Token: AsChar + Clone,
+    Output: Int,
+    Error: ParserError<Input>,
 {
-    trace("dec_int", move |input: &mut I| {
-        fn sign(token: impl AsChar) -> bool {
-            let token = token.as_char();
-            token == '+' || token == '-'
-        }
-        let sign = opt(crate::token::one_of(sign).map(AsChar::as_char))
-            .map(|c| c != Some('-'))
-            .parse_next(input)?;
-
-        if input.eof_offset() == 0 {
-            if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
-                return Err(ErrMode::Incomplete(Needed::new(1)));
-            } else {
-                return Err(ErrMode::from_error_kind(input, ErrorKind::Slice));
-            }
-        }
-
-        let mut value = O::default();
-        for (offset, c) in input.iter_offsets() {
-            match c.as_char().to_digit(10) {
-                Some(d) => match value.checked_mul(10, sealed::SealedMarker).and_then(|v| {
-                    let d = d as u8;
-                    if sign {
-                        v.checked_add(d, sealed::SealedMarker)
-                    } else {
-                        v.checked_sub(d, sealed::SealedMarker)
-                    }
-                }) {
-                    None => return Err(ErrMode::from_error_kind(input, ErrorKind::Verify)),
-                    Some(v) => value = v,
-                },
-                None => {
-                    if offset == 0 {
-                        return Err(ErrMode::from_error_kind(input, ErrorKind::Slice));
-                    } else {
-                        let _ = input.next_slice(offset);
-                        return Ok(value);
-                    }
-                }
-            }
-        }
-
-        if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
-            Err(ErrMode::Incomplete(Needed::new(1)))
-        } else {
-            let _ = input.finish();
-            Ok(value)
-        }
+    trace("dec_int", move |input: &mut Input| {
+        let sign = opt(dispatch! {any.map(AsChar::as_char);
+            '+' => empty.value(true),
+            '-' => empty.value(false),
+            _ => fail,
+        });
+        alt(((sign, one_of('1'..='9'), digit0).void(), one_of('0').void()))
+            .take()
+            .verify_map(|s: <Input as Stream>::Slice| {
+                let s = s.as_bstr();
+                // SAFETY: Only 7-bit ASCII characters are parsed
+                let s = unsafe { crate::lib::std::str::from_utf8_unchecked(s) };
+                Output::try_from_dec_int(s)
+            })
+            .parse_next(input)
     })
     .parse_next(input)
 }
 
 /// Metadata for parsing signed integers, see [`dec_int`]
-pub trait Int: Uint {
+pub trait Int: Sized {
     #[doc(hidden)]
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self>;
+    fn try_from_dec_int(slice: &str) -> Option<Self>;
 }
 
 impl Int for i8 {
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_sub(by as Self)
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Int for i16 {
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_sub(by as Self)
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Int for i32 {
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_sub(by as Self)
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Int for i64 {
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_sub(by as Self)
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
 impl Int for i128 {
-    fn checked_sub(self, by: u8, _: sealed::SealedMarker) -> Option<Self> {
-        self.checked_sub(by as Self)
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
+    }
+}
+
+impl Int for isize {
+    fn try_from_dec_int(slice: &str) -> Option<Self> {
+        slice.parse().ok()
     }
 }
 
@@ -1167,9 +1281,20 @@
 /// *Complete version*: Will parse until the end of input if it has fewer characters than the type
 /// supports.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if end-of-input
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if end-of-input
 /// is hit before a hard boundary (non-hex character, more characters than supported).
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] into a `u32`:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn hex_uint(input: &mut &str) -> PResult<u32>
+/// # {
+/// #     winnow::ascii::hex_uint.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
@@ -1201,22 +1326,22 @@
 /// assert_eq!(parser.parse_peek(Partial::new(&b"ggg"[..])), Err(ErrMode::Backtrack(InputError::new(Partial::new(&b"ggg"[..]), ErrorKind::Slice))));
 /// ```
 #[inline]
-pub fn hex_uint<I, O, E: ParserError<I>>(input: &mut I) -> PResult<O, E>
+pub fn hex_uint<Input, Output, Error>(input: &mut Input) -> PResult<Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    O: HexUint,
-    <I as Stream>::Token: AsChar,
-    <I as Stream>::Slice: AsBStr,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: AsChar,
+    <Input as Stream>::Slice: AsBStr,
+    Output: HexUint,
+    Error: ParserError<Input>,
 {
-    trace("hex_uint", move |input: &mut I| {
+    trace("hex_uint", move |input: &mut Input| {
         let invalid_offset = input
             .offset_for(|c| {
                 let c = c.as_char();
                 !"0123456789abcdefABCDEF".contains(c)
             })
             .unwrap_or_else(|| input.eof_offset());
-        let max_nibbles = O::max_nibbles(sealed::SealedMarker);
+        let max_nibbles = Output::max_nibbles(sealed::SealedMarker);
         let max_offset = input.offset_at(max_nibbles);
         let offset = match max_offset {
             Ok(max_offset) => {
@@ -1228,7 +1353,7 @@
                 }
             }
             Err(_) => {
-                if <I as StreamIsPartial>::is_partial_supported()
+                if <Input as StreamIsPartial>::is_partial_supported()
                     && input.is_partial()
                     && invalid_offset == input.eof_offset()
                 {
@@ -1245,12 +1370,12 @@
         }
         let parsed = input.next_slice(offset);
 
-        let mut res = O::default();
+        let mut res = Output::default();
         for c in parsed.as_bstr() {
             let nibble = *c as char;
             let nibble = nibble.to_digit(16).unwrap_or(0) as u8;
-            let nibble = O::from(nibble);
-            res = (res << O::from(4)) + nibble;
+            let nibble = Output::from(nibble);
+            res = (res << Output::from(4)) + nibble;
         }
 
         Ok(res)
@@ -1305,7 +1430,18 @@
 ///
 /// *Complete version*: Can parse until the end of input.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] into an `f64`:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn float(input: &mut &str) -> PResult<f64>
+/// # {
+/// #     winnow::ascii::float.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -1346,18 +1482,16 @@
 #[doc(alias = "f32")]
 #[doc(alias = "double")]
 #[allow(clippy::trait_duplication_in_bounds)] // HACK: clippy 1.64.0 bug
-pub fn float<I, O, E: ParserError<I>>(input: &mut I) -> PResult<O, E>
+pub fn float<Input, Output, Error>(input: &mut Input) -> PResult<Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    I: Compare<&'static str>,
-    <I as Stream>::Slice: ParseSlice<O>,
-    <I as Stream>::Token: AsChar + Clone,
-    <I as Stream>::IterOffsets: Clone,
-    I: AsBStr,
+    Input: StreamIsPartial + Stream + Compare<Caseless<&'static str>> + Compare<char> + AsBStr,
+    <Input as Stream>::Slice: ParseSlice<Output>,
+    <Input as Stream>::Token: AsChar + Clone,
+    <Input as Stream>::IterOffsets: Clone,
+    Error: ParserError<Input>,
 {
-    trace("float", move |input: &mut I| {
-        let s = recognize_float_or_exceptions(input)?;
+    trace("float", move |input: &mut Input| {
+        let s = take_float_or_exceptions(input)?;
         s.parse_slice()
             .ok_or_else(|| ErrMode::from_error_kind(input, ErrorKind::Verify))
     })
@@ -1365,37 +1499,39 @@
 }
 
 #[allow(clippy::trait_duplication_in_bounds)] // HACK: clippy 1.64.0 bug
-#[allow(deprecated)]
-fn recognize_float_or_exceptions<I, E: ParserError<I>>(
-    input: &mut I,
-) -> PResult<<I as Stream>::Slice, E>
+fn take_float_or_exceptions<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
 where
     I: StreamIsPartial,
     I: Stream,
-    I: Compare<&'static str>,
+    I: Compare<Caseless<&'static str>>,
+    I: Compare<char>,
     <I as Stream>::Token: AsChar + Clone,
     <I as Stream>::IterOffsets: Clone,
     I: AsBStr,
 {
     alt((
-        recognize_float,
-        crate::token::tag_no_case("nan"),
+        take_float,
+        crate::token::literal(Caseless("nan")),
         (
             opt(one_of(['+', '-'])),
-            crate::token::tag_no_case("infinity"),
+            crate::token::literal(Caseless("infinity")),
         )
-            .recognize(),
-        (opt(one_of(['+', '-'])), crate::token::tag_no_case("inf")).recognize(),
+            .take(),
+        (
+            opt(one_of(['+', '-'])),
+            crate::token::literal(Caseless("inf")),
+        )
+            .take(),
     ))
     .parse_next(input)
 }
 
 #[allow(clippy::trait_duplication_in_bounds)] // HACK: clippy 1.64.0 bug
-fn recognize_float<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+fn take_float<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
 where
     I: StreamIsPartial,
     I: Stream,
-    I: Compare<&'static str>,
+    I: Compare<char>,
     <I as Stream>::Token: AsChar + Clone,
     <I as Stream>::IterOffsets: Clone,
     I: AsBStr,
@@ -1403,20 +1539,29 @@
     (
         opt(one_of(['+', '-'])),
         alt((
-            (digit1, opt(('.', opt(digit1)))).map(|_| ()),
-            ('.', digit1).map(|_| ()),
+            (digit1, opt(('.', opt(digit1)))).void(),
+            ('.', digit1).void(),
         )),
         opt((one_of(['e', 'E']), opt(one_of(['+', '-'])), cut_err(digit1))),
     )
-        .recognize()
+        .take()
         .parse_next(input)
 }
 
-/// Matches a byte string with escaped characters.
+/// Recognize the input slice with escaped characters.
 ///
-/// * The first argument matches the normal characters (it must not accept the control character)
-/// * The second argument is the control character (like `\` in most languages)
-/// * The third argument matches the escaped characters
+/// Arguments:
+/// - `normal`: unescapeable characters
+///   - Must not include `control`
+/// - `control_char`: e.g. `\` for strings in most languages
+/// - `escape`: parse and transform the escaped character
+///
+/// Parsing ends when:
+/// - `alt(normal, control._char)` [`Backtrack`s][crate::error::ErrMode::Backtrack]
+/// - `normal` doesn't advance the input stream
+/// - *(complete)* input stream is exhausted
+///
+/// See also [`escaped_transform`]
 ///
 /// # Example
 ///
@@ -1425,11 +1570,11 @@
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError, error::Needed, IResult};
 /// # use winnow::ascii::digit1;
 /// # use winnow::prelude::*;
-/// use winnow::ascii::escaped;
+/// use winnow::ascii::take_escaped;
 /// use winnow::token::one_of;
 ///
 /// fn esc(s: &str) -> IResult<&str, &str> {
-///   escaped(digit1, '\\', one_of(['"', 'n', '\\'])).parse_peek(s)
+///   take_escaped(digit1, '\\', one_of(['"', 'n', '\\'])).parse_peek(s)
 /// }
 ///
 /// assert_eq!(esc("123;"), Ok((";", "123")));
@@ -1442,32 +1587,30 @@
 /// # use winnow::ascii::digit1;
 /// # use winnow::prelude::*;
 /// # use winnow::Partial;
-/// use winnow::ascii::escaped;
+/// use winnow::ascii::take_escaped;
 /// use winnow::token::one_of;
 ///
 /// fn esc(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
-///   escaped(digit1, '\\', one_of(['"', 'n', '\\'])).parse_peek(s)
+///   take_escaped(digit1, '\\', one_of(['"', 'n', '\\'])).parse_peek(s)
 /// }
 ///
 /// assert_eq!(esc(Partial::new("123;")), Ok((Partial::new(";"), "123")));
 /// assert_eq!(esc(Partial::new("12\\\"34;")), Ok((Partial::new(";"), "12\\\"34")));
 /// ```
 #[inline(always)]
-pub fn escaped<'a, I: 'a, Error, F, G, O1, O2>(
-    mut normal: F,
+pub fn take_escaped<'i, Input, Error, Normal, Escapable, NormalOutput, EscapableOutput>(
+    mut normal: Normal,
     control_char: char,
-    mut escapable: G,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
+    mut escapable: Escapable,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
-    F: Parser<I, O1, Error>,
-    G: Parser<I, O2, Error>,
-    Error: ParserError<I>,
+    Input: StreamIsPartial + Stream + Compare<char> + 'i,
+    Normal: Parser<Input, NormalOutput, Error>,
+    Escapable: Parser<Input, EscapableOutput, Error>,
+    Error: ParserError<Input>,
 {
-    trace("escaped", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
+    trace("take_escaped", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() && input.is_partial() {
             streaming_escaped_internal(input, &mut normal, control_char, &mut escapable)
         } else {
             complete_escaped_internal(input, &mut normal, control_char, &mut escapable)
@@ -1475,6 +1618,23 @@
     })
 }
 
+/// Deprecated, replaced with [`take_escaped`]
+#[deprecated(since = "0.6.4", note = "Replaced with `take_escaped`")]
+#[inline(always)]
+pub fn escaped<'i, Input, Error, Normal, Escapable, NormalOutput, EscapableOutput>(
+    normal: Normal,
+    control_char: char,
+    escapable: Escapable,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
+where
+    Input: StreamIsPartial + Stream + Compare<char> + 'i,
+    Normal: Parser<Input, NormalOutput, Error>,
+    Escapable: Parser<Input, EscapableOutput, Error>,
+    Error: ParserError<Input>,
+{
+    take_escaped(normal, control_char, escapable)
+}
+
 fn streaming_escaped_internal<I, Error, F, G, O1, O2>(
     input: &mut I,
     normal: &mut F,
@@ -1484,7 +1644,7 @@
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    I: Compare<char>,
     F: Parser<I, O1, Error>,
     G: Parser<I, O2, Error>,
     Error: ParserError<I>,
@@ -1498,7 +1658,7 @@
             Some(_) => {
                 if input.eof_offset() == current_len {
                     let offset = input.offset_from(&start);
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(input.next_slice(offset));
                 }
             }
@@ -1507,7 +1667,7 @@
                     let _ = escapable.parse_next(input)?;
                 } else {
                     let offset = input.offset_from(&start);
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(input.next_slice(offset));
                 }
             }
@@ -1517,7 +1677,7 @@
     Err(ErrMode::Incomplete(Needed::Unknown))
 }
 
-fn complete_escaped_internal<'a, I: 'a, Error, F, G, O1, O2>(
+fn complete_escaped_internal<'a, I, Error, F, G, O1, O2>(
     input: &mut I,
     normal: &mut F,
     control_char: char,
@@ -1526,7 +1686,8 @@
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: crate::stream::AsChar + Clone,
+    I: Compare<char>,
+    I: 'a,
     F: Parser<I, O1, Error>,
     G: Parser<I, O2, Error>,
     Error: ParserError<I>,
@@ -1540,7 +1701,7 @@
             Some(_) => {
                 if input.eof_offset() == current_len {
                     let offset = input.offset_from(&start);
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(input.next_slice(offset));
                 }
             }
@@ -1549,32 +1710,38 @@
                     let _ = escapable.parse_next(input)?;
                 } else {
                     let offset = input.offset_from(&start);
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(input.next_slice(offset));
                 }
             }
         }
     }
 
-    input.reset(start);
+    input.reset(&start);
     Ok(input.finish())
 }
 
-/// Matches a byte string with escaped characters.
+/// Parse escaped characters, unescaping them
 ///
-/// * The first argument matches the normal characters (it must not match the control character)
-/// * The second argument is the control character (like `\` in most languages)
-/// * The third argument matches the escaped characters and transforms them
+/// Arguments:
+/// - `normal`: unescapeable characters
+///   - Must not include `control`
+/// - `control_char`: e.g. `\` for strings in most languages
+/// - `escape`: parse and transform the escaped character
 ///
-/// As an example, the chain `abc\tdef` could be `abc    def` (it also consumes the control character)
+/// Parsing ends when:
+/// - `alt(normal, control._char)` [`Backtrack`s][crate::error::ErrMode::Backtrack]
+/// - `normal` doesn't advance the input stream
+/// - *(complete)* input stream is exhausted
 ///
 /// # Example
 ///
 /// ```rust
+/// # #[cfg(feature = "std")] {
 /// # use winnow::prelude::*;
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError, error::Needed};
 /// # use std::str::from_utf8;
-/// use winnow::token::tag;
+/// use winnow::token::literal;
 /// use winnow::ascii::escaped_transform;
 /// use winnow::ascii::alpha1;
 /// use winnow::combinator::alt;
@@ -1593,14 +1760,16 @@
 ///
 /// assert_eq!(parser.parse_peek("ab\\\"cd"), Ok(("", String::from("ab\"cd"))));
 /// assert_eq!(parser.parse_peek("ab\\ncd"), Ok(("", String::from("ab\ncd"))));
+/// # }
 /// ```
 ///
 /// ```
+/// # #[cfg(feature = "std")] {
 /// # use winnow::prelude::*;
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError, error::Needed};
 /// # use std::str::from_utf8;
 /// # use winnow::Partial;
-/// use winnow::token::tag;
+/// use winnow::token::literal;
 /// use winnow::ascii::escaped_transform;
 /// use winnow::ascii::alpha1;
 /// use winnow::combinator::alt;
@@ -1618,27 +1787,26 @@
 /// }
 ///
 /// assert_eq!(parser.parse_peek(Partial::new("ab\\\"cd\"")), Ok((Partial::new("\""), String::from("ab\"cd"))));
+/// # }
 /// ```
 #[inline(always)]
-pub fn escaped_transform<I, Error, F, G, Output>(
-    mut normal: F,
+pub fn escaped_transform<Input, Error, Normal, Escape, Output>(
+    mut normal: Normal,
     control_char: char,
-    mut transform: G,
-) -> impl Parser<I, Output, Error>
+    mut escape: Escape,
+) -> impl Parser<Input, Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: crate::stream::AsChar + Clone,
-    Output: crate::stream::Accumulate<<I as Stream>::Slice>,
-    F: Parser<I, <I as Stream>::Slice, Error>,
-    G: Parser<I, <I as Stream>::Slice, Error>,
-    Error: ParserError<I>,
+    Input: StreamIsPartial + Stream + Compare<char>,
+    Output: crate::stream::Accumulate<<Input as Stream>::Slice>,
+    Normal: Parser<Input, <Input as Stream>::Slice, Error>,
+    Escape: Parser<Input, <Input as Stream>::Slice, Error>,
+    Error: ParserError<Input>,
 {
-    trace("escaped_transform", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() && input.is_partial() {
-            streaming_escaped_transform_internal(input, &mut normal, control_char, &mut transform)
+    trace("escaped_transform", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() && input.is_partial() {
+            streaming_escaped_transform_internal(input, &mut normal, control_char, &mut escape)
         } else {
-            complete_escaped_transform_internal(input, &mut normal, control_char, &mut transform)
+            complete_escaped_transform_internal(input, &mut normal, control_char, &mut escape)
         }
     })
 }
@@ -1652,7 +1820,7 @@
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: crate::stream::AsChar + Clone,
+    I: Compare<char>,
     Output: crate::stream::Accumulate<<I as Stream>::Slice>,
     F: Parser<I, <I as Stream>::Slice, Error>,
     G: Parser<I, <I as Stream>::Slice, Error>,
@@ -1691,7 +1859,7 @@
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: crate::stream::AsChar + Clone,
+    I: Compare<char>,
     Output: crate::stream::Accumulate<<I as Stream>::Slice>,
     F: Parser<I, <I as Stream>::Slice, Error>,
     G: Parser<I, <I as Stream>::Slice, Error>,

crates/winnow/src/ascii/tests.rs

diff --git a/crates/winnow/src/ascii/tests.rs b/crates/winnow/src/ascii/tests.rs
index 5091dc5..f6891a6 100644
--- a/crates/winnow/src/ascii/tests.rs
+++ b/crates/winnow/src/ascii/tests.rs
@@ -4,7 +4,6 @@
 mod complete {
     use super::*;
     use crate::combinator::alt;
-    use crate::combinator::opt;
     use crate::error::ErrMode;
     use crate::error::ErrorKind;
     use crate::error::InputError;
@@ -427,52 +426,63 @@
         );
     }
 
-    fn digit_to_i16(input: &str) -> IResult<&str, i16> {
-        let i = input;
-        let (i, opt_sign) = opt(alt(('+', '-'))).parse_peek(i)?;
-        let sign = match opt_sign {
-            Some('+') | None => true,
-            Some('-') => false,
-            _ => unreachable!(),
-        };
-
-        let (i, s) = digit1::<_, InputError<_>>.parse_peek(i)?;
-        match s.parse_slice() {
-            Some(n) => {
-                if sign {
-                    Ok((i, n))
-                } else {
-                    Ok((i, -n))
-                }
-            }
-            None => Err(ErrMode::from_error_kind(&i, ErrorKind::Verify)),
+    #[test]
+    fn dec_uint_tests() {
+        fn dec_u32(input: &[u8]) -> IResult<&[u8], u32> {
+            dec_uint.parse_peek(input)
         }
+
+        assert_parse!(
+            dec_u32(&b";"[..]),
+            Err(ErrMode::Backtrack(error_position!(
+                &&b";"[..],
+                ErrorKind::Verify
+            )))
+        );
+        assert_parse!(dec_u32(&b"0;"[..]), Ok((&b";"[..], 0)));
+        assert_parse!(dec_u32(&b"1;"[..]), Ok((&b";"[..], 1)));
+        assert_parse!(dec_u32(&b"32;"[..]), Ok((&b";"[..], 32)));
+        assert_parse!(
+            dec_u32(&b"1000000000000000000000;"[..]), // overflow
+            Err(ErrMode::Backtrack(error_position!(
+                &&b"1000000000000000000000;"[..],
+                ErrorKind::Verify
+            )))
+        );
     }
 
-    fn digit_to_u32(i: &str) -> IResult<&str, u32> {
-        let (i, s) = digit1.parse_peek(i)?;
-        match s.parse_slice() {
-            Some(n) => Ok((i, n)),
-            None => Err(ErrMode::from_error_kind(&i, ErrorKind::Verify)),
+    #[test]
+    fn dec_int_tests() {
+        fn dec_i32(input: &[u8]) -> IResult<&[u8], i32> {
+            dec_int.parse_peek(input)
         }
-    }
 
-    proptest! {
-      #[test]
-      #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
-      fn ints(s in "\\PC*") {
-          let res1 = digit_to_i16(&s);
-          let res2 = dec_int.parse_peek(s.as_str());
-          assert_eq!(res1, res2);
-      }
-
-      #[test]
-      #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
-      fn uints(s in "\\PC*") {
-          let res1 = digit_to_u32(&s);
-          let res2 = dec_uint.parse_peek(s.as_str());
-          assert_eq!(res1, res2);
-      }
+        assert_parse!(
+            dec_i32(&b";"[..]),
+            Err(ErrMode::Backtrack(error_position!(
+                &&b";"[..],
+                ErrorKind::Verify
+            )))
+        );
+        assert_parse!(dec_i32(&b"0;"[..]), Ok((&b";"[..], 0)));
+        assert_parse!(dec_i32(&b"1;"[..]), Ok((&b";"[..], 1)));
+        assert_parse!(dec_i32(&b"32;"[..]), Ok((&b";"[..], 32)));
+        assert_parse!(
+            dec_i32(&b"-0;"[..]),
+            Err(ErrMode::Backtrack(error_position!(
+                &&b"-0;"[..],
+                ErrorKind::Verify
+            )))
+        );
+        assert_parse!(dec_i32(&b"-1;"[..]), Ok((&b";"[..], -1)));
+        assert_parse!(dec_i32(&b"-32;"[..]), Ok((&b";"[..], -32)));
+        assert_parse!(
+            dec_i32(&b"1000000000000000000000;"[..]), // overflow
+            Err(ErrMode::Backtrack(error_position!(
+                &&b"1000000000000000000000;"[..],
+                ErrorKind::Verify
+            )))
+        );
     }
 
     #[test]
@@ -564,7 +574,7 @@
             let expected32 = str::parse::<f32>(test).unwrap();
             let expected64 = str::parse::<f64>(test).unwrap();
 
-            println!("now parsing: {} -> {}", test, expected32);
+            println!("now parsing: {test} -> {expected32}");
 
             assert_parse!(
                 float.parse_peek(test.as_bytes()),
@@ -588,7 +598,7 @@
         let nan_test_cases = ["nan", "NaN", "NAN"];
 
         for test in nan_test_cases {
-            println!("now parsing: {}", test);
+            println!("now parsing: {test}");
 
             let (remaining, parsed) = float::<_, f32, ()>.parse_peek(test.as_bytes()).unwrap();
             assert!(parsed.is_nan());
@@ -610,7 +620,7 @@
 
     #[cfg(feature = "std")]
     fn parse_f64(i: &str) -> IResult<&str, f64, ()> {
-        match super::recognize_float_or_exceptions.parse_peek(i) {
+        match take_float_or_exceptions.parse_peek(i) {
             Err(e) => Err(e),
             Ok((i, s)) => {
                 if s.is_empty() {
@@ -629,21 +639,21 @@
       #[cfg(feature = "std")]
       #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
       fn floats(s in "\\PC*") {
-          println!("testing {}", s);
+          println!("testing {s}");
           let res1 = parse_f64(&s);
           let res2 = float::<_, f64, ()>.parse_peek(s.as_str());
           assert_eq!(res1, res2);
       }
     }
 
-    // issue #1336 "escaped hangs if normal parser accepts empty"
+    // issue #1336 "take_escaped hangs if normal parser accepts empty"
     #[test]
-    fn complete_escaped_hang() {
-        // issue #1336 "escaped hangs if normal parser accepts empty"
+    fn complete_take_escaped_hang() {
+        // issue #1336 "take_escaped hangs if normal parser accepts empty"
         fn escaped_string(input: &str) -> IResult<&str, &str> {
             use crate::ascii::alpha0;
             use crate::token::one_of;
-            escaped(alpha0, '\\', one_of(['n'])).parse_peek(input)
+            take_escaped(alpha0, '\\', one_of(['n'])).parse_peek(input)
         }
 
         escaped_string("7").unwrap();
@@ -651,8 +661,8 @@
     }
 
     #[test]
-    fn complete_escaped_hang_1118() {
-        // issue ##1118 escaped does not work with empty string
+    fn complete_take_escaped_hang_1118() {
+        // issue ##1118 take_escaped does not work with empty string
         fn unquote(input: &str) -> IResult<&str, &str> {
             use crate::combinator::delimited;
             use crate::combinator::opt;
@@ -660,7 +670,7 @@
 
             delimited(
                 '"',
-                escaped(
+                take_escaped(
                     opt(none_of(['\\', '"'])),
                     '\\',
                     one_of(['\\', '"', 'r', 'n', 't']),
@@ -681,7 +691,7 @@
         use crate::token::one_of;
 
         fn esc(i: &[u8]) -> IResult<&[u8], &[u8]> {
-            escaped(alpha, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
+            take_escaped(alpha, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
         }
         assert_eq!(esc(&b"abcd;"[..]), Ok((&b";"[..], &b"abcd"[..])));
         assert_eq!(esc(&b"ab\\\"cd;"[..]), Ok((&b";"[..], &b"ab\\\"cd"[..])));
@@ -705,7 +715,7 @@
         );
 
         fn esc2(i: &[u8]) -> IResult<&[u8], &[u8]> {
-            escaped(digit, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
+            take_escaped(digit, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
         }
         assert_eq!(esc2(&b"12\\nnn34"[..]), Ok((&b"nn34"[..], &b"12\\n"[..])));
     }
@@ -717,7 +727,7 @@
         use crate::token::one_of;
 
         fn esc(i: &str) -> IResult<&str, &str> {
-            escaped(alpha, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
+            take_escaped(alpha, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
         }
         assert_eq!(esc("abcd;"), Ok((";", "abcd")));
         assert_eq!(esc("ab\\\"cd;"), Ok((";", "ab\\\"cd")));
@@ -738,12 +748,12 @@
         );
 
         fn esc2(i: &str) -> IResult<&str, &str> {
-            escaped(digit, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
+            take_escaped(digit, '\\', one_of(['\"', 'n', '\\'])).parse_peek(i)
         }
         assert_eq!(esc2("12\\nnn34"), Ok(("nn34", "12\\n")));
 
         fn esc3(i: &str) -> IResult<&str, &str> {
-            escaped(alpha, '\u{241b}', one_of(['\"', 'n'])).parse_peek(i)
+            take_escaped(alpha, '\u{241b}', one_of(['\"', 'n'])).parse_peek(i)
         }
         assert_eq!(esc3("ab␛ncd;"), Ok((";", "ab␛ncd")));
     }
@@ -752,7 +762,7 @@
     fn test_escaped_error() {
         fn esc(s: &str) -> IResult<&str, &str> {
             use crate::ascii::digit1;
-            escaped(digit1, '\\', one_of(['\"', 'n', '\\'])).parse_peek(s)
+            take_escaped(digit1, '\\', one_of(['\"', 'n', '\\'])).parse_peek(s)
         }
 
         assert_eq!(esc("abcd"), Ok(("abcd", "")));
@@ -900,14 +910,11 @@
 
 mod partial {
     use super::*;
-    use crate::combinator::opt;
     use crate::error::ErrorKind;
     use crate::error::InputError;
     use crate::error::{ErrMode, Needed};
-    use crate::stream::ParseSlice;
     use crate::IResult;
     use crate::Partial;
-    use proptest::prelude::*;
 
     macro_rules! assert_parse(
     ($left: expr, $right: expr) => {
@@ -1243,7 +1250,7 @@
         let d: &[u8] = b"ab12cd";
         assert_eq!(
             till_line_ending::<_, InputError<_>>.parse_peek(Partial::new(d)),
-            Err(ErrMode::Incomplete(Needed::new(1)))
+            Err(ErrMode::Incomplete(Needed::Unknown))
         );
     }
 
@@ -1261,7 +1268,7 @@
         let g2: &str = "ab12cd";
         assert_eq!(
             till_line_ending::<_, InputError<_>>.parse_peek(Partial::new(g2)),
-            Err(ErrMode::Incomplete(Needed::new(1)))
+            Err(ErrMode::Incomplete(Needed::Unknown))
         );
     }
 
@@ -1454,54 +1461,6 @@
         );
     }
 
-    fn digit_to_i16(input: Partial<&str>) -> IResult<Partial<&str>, i16> {
-        let i = input;
-        let (i, opt_sign) = opt(one_of(['+', '-'])).parse_peek(i)?;
-        let sign = match opt_sign {
-            Some('+') | None => true,
-            Some('-') => false,
-            _ => unreachable!(),
-        };
-
-        let (i, s) = digit1::<_, InputError<_>>.parse_peek(i)?;
-        match s.parse_slice() {
-            Some(n) => {
-                if sign {
-                    Ok((i, n))
-                } else {
-                    Ok((i, -n))
-                }
-            }
-            None => Err(ErrMode::from_error_kind(&i, ErrorKind::Verify)),
-        }
-    }
-
-    fn digit_to_u32(i: Partial<&str>) -> IResult<Partial<&str>, u32> {
-        let (i, s) = digit1.parse_peek(i)?;
-        match s.parse_slice() {
-            Some(n) => Ok((i, n)),
-            None => Err(ErrMode::from_error_kind(&i, ErrorKind::Verify)),
-        }
-    }
-
-    proptest! {
-      #[test]
-      #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
-      fn ints(s in "\\PC*") {
-          let res1 = digit_to_i16(Partial::new(&s));
-          let res2 = dec_int.parse_peek(Partial::new(s.as_str()));
-          assert_eq!(res1, res2);
-      }
-
-      #[test]
-      #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
-      fn uints(s in "\\PC*") {
-          let res1 = digit_to_u32(Partial::new(&s));
-          let res2 = dec_uint.parse_peek(Partial::new(s.as_str()));
-          assert_eq!(res1, res2);
-      }
-    }
-
     #[test]
     fn hex_uint_tests() {
         fn hex_u32(input: Partial<&[u8]>) -> IResult<Partial<&[u8]>, u32> {

crates/winnow/src/binary/bits/mod.rs

diff --git a/crates/winnow/src/binary/bits/mod.rs b/crates/winnow/src/binary/bits/mod.rs
index 4a198c4..9c8e037 100644
--- a/crates/winnow/src/binary/bits/mod.rs
+++ b/crates/winnow/src/binary/bits/mod.rs
@@ -7,8 +7,8 @@
 use crate::combinator::trace;
 use crate::error::{ErrMode, ErrorConvert, ErrorKind, Needed, ParserError};
 use crate::lib::std::ops::{AddAssign, Div, Shl, Shr};
-use crate::stream::{AsBytes, Stream, StreamIsPartial, ToUsize};
-use crate::{unpeek, IResult, PResult, Parser};
+use crate::stream::{Stream, StreamIsPartial, ToUsize};
+use crate::{PResult, Parser};
 
 /// Number of bits in a byte
 const BYTE: usize = u8::BITS as usize;
@@ -46,45 +46,51 @@
 /// assert_eq!(parsed.0, 0x01);
 /// assert_eq!(parsed.1, 0x23);
 /// ```
-pub fn bits<I, O, E1, E2, P>(mut parser: P) -> impl Parser<I, O, E2>
+pub fn bits<Input, Output, BitError, ByteError, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, ByteError>
 where
-    E1: ParserError<(I, usize)> + ErrorConvert<E2>,
-    E2: ParserError<I>,
-    I: Stream + Clone,
-    P: Parser<(I, usize), O, E1>,
+    BitError: ParserError<(Input, usize)> + ErrorConvert<ByteError>,
+    ByteError: ParserError<Input>,
+    (Input, usize): Stream,
+    Input: Stream + Clone,
+    ParseNext: Parser<(Input, usize), Output, BitError>,
 {
-    trace(
-        "bits",
-        unpeek(move |input: I| {
-            match parser.parse_peek((input, 0)) {
-                Ok(((rest, offset), result)) => {
-                    // If the next byte has been partially read, it will be sliced away as well.
-                    // The parser functions might already slice away all fully read bytes.
-                    // That's why `offset / BYTE` isn't necessarily needed at all times.
-                    let remaining_bytes_index =
-                        offset / BYTE + if offset % BYTE == 0 { 0 } else { 1 };
-                    let (input, _) = rest.peek_slice(remaining_bytes_index);
-                    Ok((input, result))
-                }
-                Err(ErrMode::Incomplete(n)) => {
-                    Err(ErrMode::Incomplete(n.map(|u| u.get() / BYTE + 1)))
-                }
-                Err(e) => Err(e.convert()),
+    trace("bits", move |input: &mut Input| {
+        let mut bit_input = (input.clone(), 0);
+        match parser.parse_next(&mut bit_input) {
+            Ok(result) => {
+                let (mut rest, offset) = bit_input;
+                // If the next byte has been partially read, it will be sliced away as well.
+                // The parser functions might already slice away all fully read bytes.
+                // That's why `offset / BYTE` isn't necessarily needed at all times.
+                let remaining_bytes_index = offset / BYTE + if offset % BYTE == 0 { 0 } else { 1 };
+                let _ = rest.next_slice(remaining_bytes_index);
+                *input = rest;
+                Ok(result)
             }
-        }),
-    )
+            Err(ErrMode::Incomplete(n)) => Err(ErrMode::Incomplete(n.map(|u| u.get() / BYTE + 1))),
+            Err(e) => Err(e.convert()),
+        }
+    })
 }
 
 /// Convert a [`bits`] stream back into a byte stream
 ///
+/// <div class="warning">
+///
 /// **Warning:** A partial byte remaining in the input will be ignored and the given parser will
 /// start parsing at the next full byte.
 ///
+/// </div>
+///
+/// # Examples
+///
 /// ```
 /// use winnow::prelude::*;
 /// use winnow::Bytes;
 /// use winnow::binary::bits::{bits, bytes, take};
-/// use winnow::combinator::rest;
+/// use winnow::token::rest;
 /// use winnow::error::InputError;
 ///
 /// type Stream<'i> = &'i Bytes;
@@ -105,44 +111,54 @@
 ///
 /// assert_eq!(parse(input), Ok(( stream(&[]), (0x01, 0x23, &[0xff, 0xff][..]) )));
 /// ```
-pub fn bytes<I, O, E1, E2, P>(mut parser: P) -> impl Parser<(I, usize), O, E2>
+pub fn bytes<Input, Output, ByteError, BitError, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<(Input, usize), Output, BitError>
 where
-    E1: ParserError<I> + ErrorConvert<E2>,
-    E2: ParserError<(I, usize)>,
-    I: Stream<Token = u8> + Clone,
-    P: Parser<I, O, E1>,
+    ByteError: ParserError<Input> + ErrorConvert<BitError>,
+    BitError: ParserError<(Input, usize)>,
+    Input: Stream<Token = u8> + Clone,
+    ParseNext: Parser<Input, Output, ByteError>,
 {
-    trace(
-        "bytes",
-        unpeek(move |(input, offset): (I, usize)| {
-            let (inner, _) = if offset % BYTE != 0 {
-                input.peek_slice(1 + offset / BYTE)
-            } else {
-                input.peek_slice(offset / BYTE)
-            };
-            let i = (input, offset);
-            match parser.parse_peek(inner) {
-                Ok((rest, res)) => Ok(((rest, 0), res)),
-                Err(ErrMode::Incomplete(Needed::Unknown)) => {
-                    Err(ErrMode::Incomplete(Needed::Unknown))
-                }
-                Err(ErrMode::Incomplete(Needed::Size(sz))) => {
-                    Err(match sz.get().checked_mul(BYTE) {
-                        Some(v) => ErrMode::Incomplete(Needed::new(v)),
-                        None => ErrMode::Cut(E2::assert(
-                            &i,
-                            "overflow in turning needed bytes into needed bits",
-                        )),
-                    })
-                }
-                Err(e) => Err(e.convert()),
+    trace("bytes", move |bit_input: &mut (Input, usize)| {
+        let (mut input, offset) = bit_input.clone();
+        let _ = if offset % BYTE != 0 {
+            input.next_slice(1 + offset / BYTE)
+        } else {
+            input.next_slice(offset / BYTE)
+        };
+        match parser.parse_next(&mut input) {
+            Ok(res) => {
+                *bit_input = (input, 0);
+                Ok(res)
             }
-        }),
-    )
+            Err(ErrMode::Incomplete(Needed::Unknown)) => Err(ErrMode::Incomplete(Needed::Unknown)),
+            Err(ErrMode::Incomplete(Needed::Size(sz))) => Err(match sz.get().checked_mul(BYTE) {
+                Some(v) => ErrMode::Incomplete(Needed::new(v)),
+                None => ErrMode::Cut(BitError::assert(
+                    bit_input,
+                    "overflow in turning needed bytes into needed bits",
+                )),
+            }),
+            Err(e) => Err(e.convert()),
+        }
+    })
 }
 
 /// Parse taking `count` bits
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `(&[u8], usize)` bit [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::error::ContextError;
+/// pub fn take<'i>(count: usize) -> impl Parser<(&'i [u8], usize), u8, ContextError>
+/// # {
+/// #     winnow::binary::bits::take(count)
+/// # }
+/// ```
+///
 /// # Example
 /// ```rust
 /// # use winnow::prelude::*;
@@ -173,37 +189,36 @@
 /// assert_eq!(parser((stream(&[0b00010010]), 0), 12), Err(winnow::error::ErrMode::Backtrack(InputError::new((stream(&[0b00010010]), 0), ErrorKind::Eof))));
 /// ```
 #[inline(always)]
-pub fn take<I, O, C, E: ParserError<(I, usize)>>(count: C) -> impl Parser<(I, usize), O, E>
+pub fn take<Input, Output, Count, Error>(count: Count) -> impl Parser<(Input, usize), Output, Error>
 where
-    I: Stream<Token = u8> + AsBytes + StreamIsPartial + Clone,
-    C: ToUsize,
-    O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O>,
+    Input: Stream<Token = u8> + StreamIsPartial + Clone,
+    Output: From<u8> + AddAssign + Shl<usize, Output = Output> + Shr<usize, Output = Output>,
+    Count: ToUsize,
+    Error: ParserError<(Input, usize)>,
 {
     let count = count.to_usize();
-    trace(
-        "take",
-        unpeek(move |input: (I, usize)| {
-            if <I as StreamIsPartial>::is_partial_supported() {
-                take_::<_, _, _, true>(input, count)
-            } else {
-                take_::<_, _, _, false>(input, count)
-            }
-        }),
-    )
+    trace("take", move |input: &mut (Input, usize)| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
+            take_::<_, _, _, true>(input, count)
+        } else {
+            take_::<_, _, _, false>(input, count)
+        }
+    })
 }
 
 fn take_<I, O, E: ParserError<(I, usize)>, const PARTIAL: bool>(
-    (input, bit_offset): (I, usize),
+    bit_input: &mut (I, usize),
     count: usize,
-) -> IResult<(I, usize), O, E>
+) -> PResult<O, E>
 where
     I: StreamIsPartial,
-    I: Stream<Token = u8> + AsBytes + Clone,
+    I: Stream<Token = u8> + Clone,
     O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O>,
 {
     if count == 0 {
-        Ok(((input, bit_offset), 0u8.into()))
+        Ok(0u8.into())
     } else {
+        let (mut input, bit_offset) = bit_input.clone();
         if input.eof_offset() * BYTE < count + bit_offset {
             if PARTIAL && input.is_partial() {
                 Err(ErrMode::Incomplete(Needed::new(count)))
@@ -220,7 +235,7 @@
             let mut remaining: usize = count;
             let mut end_offset: usize = 0;
 
-            for byte in input.as_bytes().iter().copied().take(cnt + 1) {
+            for (_, byte) in input.iter_offsets().take(cnt + 1) {
                 if remaining == 0 {
                     break;
                 }
@@ -240,21 +255,34 @@
                     offset = 0;
                 }
             }
-            let (input, _) = input.peek_slice(cnt);
-            Ok(((input, end_offset), acc))
+            let _ = input.next_slice(cnt);
+            *bit_input = (input, end_offset);
+            Ok(acc)
         }
     }
 }
 
 /// Parse taking `count` bits and comparing them to `pattern`
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `(&[u8], usize)` bit [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::error::ContextError;
+/// pub fn pattern<'i>(pattern: u8, count: usize) -> impl Parser<(&'i [u8], usize), u8, ContextError>
+/// # {
+/// #     winnow::binary::bits::pattern(pattern, count)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
 /// # use winnow::prelude::*;
 /// # use winnow::Bytes;
 /// # use winnow::error::{InputError, ErrorKind};
-/// use winnow::binary::bits::tag;
+/// use winnow::binary::bits::pattern;
 ///
 /// type Stream<'i> = &'i Bytes;
 ///
@@ -265,8 +293,8 @@
 /// /// Compare the lowest `count` bits of `input` against the lowest `count` bits of `pattern`.
 /// /// Return Ok and the matching section of `input` if there's a match.
 /// /// Return Err if there's no match.
-/// fn parser(pattern: u8, count: u8, input: (Stream<'_>, usize)) -> IResult<(Stream<'_>, usize), u8> {
-///     tag(pattern, count).parse_peek(input)
+/// fn parser(bits: u8, count: u8, input: (Stream<'_>, usize)) -> IResult<(Stream<'_>, usize), u8> {
+///     pattern(bits, count).parse_peek(input)
 /// }
 ///
 /// // The lowest 4 bits of 0b00001111 match the lowest 4 bits of 0b11111111.
@@ -302,25 +330,30 @@
 #[inline(always)]
 #[doc(alias = "literal")]
 #[doc(alias = "just")]
-pub fn tag<I, O, C, E: ParserError<(I, usize)>>(
-    pattern: O,
-    count: C,
-) -> impl Parser<(I, usize), O, E>
+#[doc(alias = "tag")]
+pub fn pattern<Input, Output, Count, Error: ParserError<(Input, usize)>>(
+    pattern: Output,
+    count: Count,
+) -> impl Parser<(Input, usize), Output, Error>
 where
-    I: Stream<Token = u8> + AsBytes + StreamIsPartial + Clone,
-    C: ToUsize,
-    O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O> + PartialEq,
+    Input: Stream<Token = u8> + StreamIsPartial + Clone,
+    Count: ToUsize,
+    Output: From<u8>
+        + AddAssign
+        + Shl<usize, Output = Output>
+        + Shr<usize, Output = Output>
+        + PartialEq,
 {
     let count = count.to_usize();
-    trace("tag", move |input: &mut (I, usize)| {
+    trace("pattern", move |input: &mut (Input, usize)| {
         let start = input.checkpoint();
 
         take(count).parse_next(input).and_then(|o| {
             if pattern == o {
                 Ok(o)
             } else {
-                input.reset(start);
-                Err(ErrMode::Backtrack(E::from_error_kind(
+                input.reset(&start);
+                Err(ErrMode::Backtrack(Error::from_error_kind(
                     input,
                     ErrorKind::Tag,
                 )))
@@ -331,6 +364,18 @@
 
 /// Parses one specific bit as a bool.
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `(&[u8], usize)` bit [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::error::ContextError;
+/// pub fn bool(input: &mut (&[u8], usize)) -> PResult<bool>
+/// # {
+/// #     winnow::binary::bits::bool.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
@@ -353,11 +398,13 @@
 /// assert_eq!(parse((stream(&[0b10000000]), 1)), Ok(((stream(&[0b10000000]), 2), false)));
 /// ```
 #[doc(alias = "any")]
-pub fn bool<I, E: ParserError<(I, usize)>>(input: &mut (I, usize)) -> PResult<bool, E>
+pub fn bool<Input, Error: ParserError<(Input, usize)>>(
+    input: &mut (Input, usize),
+) -> PResult<bool, Error>
 where
-    I: Stream<Token = u8> + AsBytes + StreamIsPartial + Clone,
+    Input: Stream<Token = u8> + StreamIsPartial + Clone,
 {
-    trace("bool", |input: &mut (I, usize)| {
+    trace("bool", |input: &mut (Input, usize)| {
         let bit: u32 = take(1usize).parse_next(input)?;
         Ok(bit != 0)
     })

crates/winnow/src/binary/bits/tests.rs

diff --git a/crates/winnow/src/binary/bits/tests.rs b/crates/winnow/src/binary/bits/tests.rs
index 41207c6..630b451 100644
--- a/crates/winnow/src/binary/bits/tests.rs
+++ b/crates/winnow/src/binary/bits/tests.rs
@@ -1,4 +1,5 @@
 use super::*;
+use crate::error::IResult;
 use crate::error::InputError;
 use crate::Partial;
 
@@ -59,7 +60,7 @@
 
     assert!(result.is_err());
     let error = result.err().unwrap();
-    assert_eq!("Parsing requires 2 bytes/chars", error.to_string());
+    assert_eq!("Parsing requires 2 more data", error.to_string());
 }
 
 #[test]
@@ -69,7 +70,7 @@
     assert_eq!(count, 0usize);
     let offset = 0usize;
 
-    let result: crate::IResult<(&[u8], usize), usize> = take(count).parse_peek((input, offset));
+    let result: IResult<(&[u8], usize), usize> = take(count).parse_peek((input, offset));
 
     assert_eq!(result, Ok(((input, offset), 0)));
 }
@@ -78,7 +79,7 @@
 fn test_take_complete_eof() {
     let input = &[0b00010010][..];
 
-    let result: crate::IResult<(&[u8], usize), usize> = take(1usize).parse_peek((input, 8));
+    let result: IResult<(&[u8], usize), usize> = take(1usize).parse_peek((input, 8));
 
     assert_eq!(
         result,
@@ -93,7 +94,7 @@
 fn test_take_complete_span_over_multiple_bytes() {
     let input = &[0b00010010, 0b00110100, 0b11111111, 0b11111111][..];
 
-    let result: crate::IResult<(&[u8], usize), usize> = take(24usize).parse_peek((input, 4));
+    let result: IResult<(&[u8], usize), usize> = take(24usize).parse_peek((input, 4));
 
     assert_eq!(
         result,
@@ -108,33 +109,33 @@
     assert_eq!(count, 0usize);
     let offset = 0usize;
 
-    let result: crate::IResult<(_, usize), usize> = take(count).parse_peek((input, offset));
+    let result: IResult<(_, usize), usize> = take(count).parse_peek((input, offset));
 
     assert_eq!(result, Ok(((input, offset), 0)));
 }
 
 #[test]
-fn test_tag_partial_ok() {
+fn test_pattern_partial_ok() {
     let input = Partial::new(&[0b00011111][..]);
     let offset = 0usize;
     let bits_to_take = 4usize;
-    let value_to_tag = 0b0001;
+    let value_to_pattern = 0b0001;
 
-    let result: crate::IResult<(_, usize), usize> =
-        tag(value_to_tag, bits_to_take).parse_peek((input, offset));
+    let result: IResult<(_, usize), usize> =
+        pattern(value_to_pattern, bits_to_take).parse_peek((input, offset));
 
-    assert_eq!(result, Ok(((input, bits_to_take), value_to_tag)));
+    assert_eq!(result, Ok(((input, bits_to_take), value_to_pattern)));
 }
 
 #[test]
-fn test_tag_partial_err() {
+fn test_pattern_partial_err() {
     let input = Partial::new(&[0b00011111][..]);
     let offset = 0usize;
     let bits_to_take = 4usize;
-    let value_to_tag = 0b1111;
+    let value_to_pattern = 0b1111;
 
-    let result: crate::IResult<(_, usize), usize> =
-        tag(value_to_tag, bits_to_take).parse_peek((input, offset));
+    let result: IResult<(_, usize), usize> =
+        pattern(value_to_pattern, bits_to_take).parse_peek((input, offset));
 
     assert_eq!(
         result,
@@ -149,7 +150,7 @@
 fn test_bool_0_complete() {
     let input = [0b10000000].as_ref();
 
-    let result: crate::IResult<(&[u8], usize), bool> = bool.parse_peek((input, 0));
+    let result: IResult<(&[u8], usize), bool> = bool.parse_peek((input, 0));
 
     assert_eq!(result, Ok(((input, 1), true)));
 }
@@ -158,7 +159,7 @@
 fn test_bool_eof_complete() {
     let input = [0b10000000].as_ref();
 
-    let result: crate::IResult<(&[u8], usize), bool> = bool.parse_peek((input, 8));
+    let result: IResult<(&[u8], usize), bool> = bool.parse_peek((input, 8));
 
     assert_eq!(
         result,
@@ -173,7 +174,7 @@
 fn test_bool_0_partial() {
     let input = Partial::new([0b10000000].as_ref());
 
-    let result: crate::IResult<(Partial<&[u8]>, usize), bool> = bool.parse_peek((input, 0));
+    let result: IResult<(Partial<&[u8]>, usize), bool> = bool.parse_peek((input, 0));
 
     assert_eq!(result, Ok(((input, 1), true)));
 }
@@ -182,7 +183,7 @@
 fn test_bool_eof_partial() {
     let input = Partial::new([0b10000000].as_ref());
 
-    let result: crate::IResult<(Partial<&[u8]>, usize), bool> = bool.parse_peek((input, 8));
+    let result: IResult<(Partial<&[u8]>, usize), bool> = bool.parse_peek((input, 8));
 
     assert_eq!(
         result,

crates/winnow/src/binary/mod.rs

diff --git a/crates/winnow/src/binary/mod.rs b/crates/winnow/src/binary/mod.rs
index 01053a5..bc1c656 100644
--- a/crates/winnow/src/binary/mod.rs
+++ b/crates/winnow/src/binary/mod.rs
@@ -15,9 +15,8 @@
 use crate::error::ParserError;
 use crate::lib::std::ops::{Add, Shl};
 use crate::stream::Accumulate;
-use crate::stream::{AsBytes, Stream, StreamIsPartial};
+use crate::stream::{Stream, StreamIsPartial};
 use crate::stream::{ToUsize, UpdateSlice};
-use crate::token::take;
 use crate::PResult;
 use crate::Parser;
 
@@ -36,7 +35,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -68,10 +67,10 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn be_u8<I, E: ParserError<I>>(input: &mut I) -> PResult<u8, E>
+pub fn be_u8<Input, Error>(input: &mut Input) -> PResult<u8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
     u8(input)
 }
@@ -80,7 +79,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -112,20 +111,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn be_u16<I, E: ParserError<I>>(input: &mut I) -> PResult<u16, E>
+pub fn be_u16<Input, Error>(input: &mut Input) -> PResult<u16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_u16", move |input: &mut I| be_uint(input, 2)).parse_next(input)
+    trace("be_u16", move |input: &mut Input| be_uint(input, 2)).parse_next(input)
 }
 
 /// Recognizes a big endian unsigned 3 byte integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -157,20 +155,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn be_u24<I, E: ParserError<I>>(input: &mut I) -> PResult<u32, E>
+pub fn be_u24<Input, Error>(input: &mut Input) -> PResult<u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_u23", move |input: &mut I| be_uint(input, 3)).parse_next(input)
+    trace("be_u23", move |input: &mut Input| be_uint(input, 3)).parse_next(input)
 }
 
 /// Recognizes a big endian unsigned 4 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -202,20 +199,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn be_u32<I, E: ParserError<I>>(input: &mut I) -> PResult<u32, E>
+pub fn be_u32<Input, Error>(input: &mut Input) -> PResult<u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_u32", move |input: &mut I| be_uint(input, 4)).parse_next(input)
+    trace("be_u32", move |input: &mut Input| be_uint(input, 4)).parse_next(input)
 }
 
 /// Recognizes a big endian unsigned 8 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -247,20 +243,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn be_u64<I, E: ParserError<I>>(input: &mut I) -> PResult<u64, E>
+pub fn be_u64<Input, Error>(input: &mut Input) -> PResult<u64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_u64", move |input: &mut I| be_uint(input, 8)).parse_next(input)
+    trace("be_u64", move |input: &mut Input| be_uint(input, 8)).parse_next(input)
 }
 
 /// Recognizes a big endian unsigned 16 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -292,36 +287,46 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn be_u128<I, E: ParserError<I>>(input: &mut I) -> PResult<u128, E>
+pub fn be_u128<Input, Error>(input: &mut Input) -> PResult<u128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_u128", move |input: &mut I| be_uint(input, 16)).parse_next(input)
+    trace("be_u128", move |input: &mut Input| be_uint(input, 16)).parse_next(input)
 }
 
 #[inline]
-fn be_uint<I, Uint, E: ParserError<I>>(input: &mut I, bound: usize) -> PResult<Uint, E>
+fn be_uint<Input, Uint, Error>(input: &mut Input, bound: usize) -> PResult<Uint, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
     Uint: Default + Shl<u8, Output = Uint> + Add<Uint, Output = Uint> + From<u8>,
+    Error: ParserError<Input>,
 {
     debug_assert_ne!(bound, 1, "to_be_uint needs extra work to avoid overflow");
-    take(bound)
-        .map(|n: <I as Stream>::Slice| to_be_uint(n.as_bytes()))
-        .parse_next(input)
+    match input.offset_at(bound) {
+        Ok(offset) => {
+            let res = to_be_uint(input, offset);
+            input.next_slice(offset);
+            Ok(res)
+        }
+        Err(e) if <Input as StreamIsPartial>::is_partial_supported() && input.is_partial() => {
+            Err(ErrMode::Incomplete(e))
+        }
+        Err(_needed) => Err(ErrMode::from_error_kind(input, ErrorKind::Slice)),
+    }
 }
 
 #[inline]
-fn to_be_uint<Uint>(number: &[u8]) -> Uint
+fn to_be_uint<Input, Uint>(number: &Input, offset: usize) -> Uint
 where
-    Uint: Default + Shl<u8, Output = Uint> + Add<Uint, Output = Uint> + From<u8>,
+    Input: Stream,
+    Uint: Default
+        + Shl<u8, Output = Uint>
+        + Add<Uint, Output = Uint>
+        + From<<Input as Stream>::Token>,
 {
     let mut res = Uint::default();
-    for byte in number.iter().copied() {
+    for (_, byte) in number.iter_offsets().take(offset) {
         res = (res << 8) + byte.into();
     }
 
@@ -332,7 +337,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -364,10 +369,10 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn be_i8<I, E: ParserError<I>>(input: &mut I) -> PResult<i8, E>
+pub fn be_i8<Input, Error>(input: &mut Input) -> PResult<i8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
     i8(input)
 }
@@ -376,7 +381,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -408,13 +413,12 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn be_i16<I, E: ParserError<I>>(input: &mut I) -> PResult<i16, E>
+pub fn be_i16<Input, Error>(input: &mut Input) -> PResult<i16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_i16", move |input: &mut I| {
+    trace("be_i16", move |input: &mut Input| {
         be_uint::<_, u16, _>(input, 2).map(|n| n as i16)
     })
     .parse_next(input)
@@ -424,7 +428,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -456,13 +460,12 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn be_i24<I, E: ParserError<I>>(input: &mut I) -> PResult<i32, E>
+pub fn be_i24<Input, Error>(input: &mut Input) -> PResult<i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_i24", move |input: &mut I| {
+    trace("be_i24", move |input: &mut Input| {
         be_uint::<_, u32, _>(input, 3).map(|n| {
             // Same as the unsigned version but we need to sign-extend manually here
             let n = if n & 0x80_00_00 != 0 {
@@ -480,7 +483,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -512,13 +515,12 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(4))));
 /// ```
 #[inline(always)]
-pub fn be_i32<I, E: ParserError<I>>(input: &mut I) -> PResult<i32, E>
+pub fn be_i32<Input, Error>(input: &mut Input) -> PResult<i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_i32", move |input: &mut I| {
+    trace("be_i32", move |input: &mut Input| {
         be_uint::<_, u32, _>(input, 4).map(|n| n as i32)
     })
     .parse_next(input)
@@ -528,7 +530,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -560,13 +562,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn be_i64<I, E: ParserError<I>>(input: &mut I) -> PResult<i64, E>
+pub fn be_i64<Input, Error>(input: &mut Input) -> PResult<i64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_i64", move |input: &mut I| {
+    trace("be_i64", move |input: &mut Input| {
         be_uint::<_, u64, _>(input, 8).map(|n| n as i64)
     })
     .parse_next(input)
@@ -576,7 +577,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -608,13 +609,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn be_i128<I, E: ParserError<I>>(input: &mut I) -> PResult<i128, E>
+pub fn be_i128<Input, Error>(input: &mut Input) -> PResult<i128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_i128", move |input: &mut I| {
+    trace("be_i128", move |input: &mut Input| {
         be_uint::<_, u128, _>(input, 16).map(|n| n as i128)
     })
     .parse_next(input)
@@ -624,7 +624,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -656,10 +656,10 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn le_u8<I, E: ParserError<I>>(input: &mut I) -> PResult<u8, E>
+pub fn le_u8<Input, Error>(input: &mut Input) -> PResult<u8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
     u8(input)
 }
@@ -668,7 +668,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -700,20 +700,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn le_u16<I, E: ParserError<I>>(input: &mut I) -> PResult<u16, E>
+pub fn le_u16<Input, Error>(input: &mut Input) -> PResult<u16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_u16", move |input: &mut I| le_uint(input, 2)).parse_next(input)
+    trace("le_u16", move |input: &mut Input| le_uint(input, 2)).parse_next(input)
 }
 
 /// Recognizes a little endian unsigned 3 byte integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -745,20 +744,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn le_u24<I, E: ParserError<I>>(input: &mut I) -> PResult<u32, E>
+pub fn le_u24<Input, Error>(input: &mut Input) -> PResult<u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_u24", move |input: &mut I| le_uint(input, 3)).parse_next(input)
+    trace("le_u24", move |input: &mut Input| le_uint(input, 3)).parse_next(input)
 }
 
 /// Recognizes a little endian unsigned 4 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -790,20 +788,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn le_u32<I, E: ParserError<I>>(input: &mut I) -> PResult<u32, E>
+pub fn le_u32<Input, Error>(input: &mut Input) -> PResult<u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_u32", move |input: &mut I| le_uint(input, 4)).parse_next(input)
+    trace("le_u32", move |input: &mut Input| le_uint(input, 4)).parse_next(input)
 }
 
 /// Recognizes a little endian unsigned 8 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -835,20 +832,19 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn le_u64<I, E: ParserError<I>>(input: &mut I) -> PResult<u64, E>
+pub fn le_u64<Input, Error>(input: &mut Input) -> PResult<u64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_u64", move |input: &mut I| le_uint(input, 8)).parse_next(input)
+    trace("le_u64", move |input: &mut Input| le_uint(input, 8)).parse_next(input)
 }
 
 /// Recognizes a little endian unsigned 16 bytes integer.
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -880,35 +876,45 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn le_u128<I, E: ParserError<I>>(input: &mut I) -> PResult<u128, E>
+pub fn le_u128<Input, Error>(input: &mut Input) -> PResult<u128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_u128", move |input: &mut I| le_uint(input, 16)).parse_next(input)
+    trace("le_u128", move |input: &mut Input| le_uint(input, 16)).parse_next(input)
 }
 
 #[inline]
-fn le_uint<I, Uint, E: ParserError<I>>(input: &mut I, bound: usize) -> PResult<Uint, E>
+fn le_uint<Input, Uint, Error>(input: &mut Input, bound: usize) -> PResult<Uint, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
     Uint: Default + Shl<u8, Output = Uint> + Add<Uint, Output = Uint> + From<u8>,
+    Error: ParserError<Input>,
 {
-    take(bound)
-        .map(|n: <I as Stream>::Slice| to_le_uint(n.as_bytes()))
-        .parse_next(input)
+    match input.offset_at(bound) {
+        Ok(offset) => {
+            let res = to_le_uint(input, offset);
+            input.next_slice(offset);
+            Ok(res)
+        }
+        Err(e) if <Input as StreamIsPartial>::is_partial_supported() && input.is_partial() => {
+            Err(ErrMode::Incomplete(e))
+        }
+        Err(_needed) => Err(ErrMode::from_error_kind(input, ErrorKind::Slice)),
+    }
 }
 
 #[inline]
-fn to_le_uint<Uint>(number: &[u8]) -> Uint
+fn to_le_uint<Input, Uint>(number: &Input, offset: usize) -> Uint
 where
-    Uint: Default + Shl<u8, Output = Uint> + Add<Uint, Output = Uint> + From<u8>,
+    Input: Stream,
+    Uint: Default
+        + Shl<u8, Output = Uint>
+        + Add<Uint, Output = Uint>
+        + From<<Input as Stream>::Token>,
 {
     let mut res = Uint::default();
-    for (index, byte) in number.iter_offsets() {
+    for (index, byte) in number.iter_offsets().take(offset) {
         res = res + (Uint::from(byte) << (8 * index as u8));
     }
 
@@ -919,7 +925,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -951,10 +957,10 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn le_i8<I, E: ParserError<I>>(input: &mut I) -> PResult<i8, E>
+pub fn le_i8<Input, Error>(input: &mut Input) -> PResult<i8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
     i8(input)
 }
@@ -963,7 +969,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -995,13 +1001,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn le_i16<I, E: ParserError<I>>(input: &mut I) -> PResult<i16, E>
+pub fn le_i16<Input, Error>(input: &mut Input) -> PResult<i16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_i16", move |input: &mut I| {
+    trace("le_i16", move |input: &mut Input| {
         le_uint::<_, u16, _>(input, 2).map(|n| n as i16)
     })
     .parse_next(input)
@@ -1011,7 +1016,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1043,13 +1048,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn le_i24<I, E: ParserError<I>>(input: &mut I) -> PResult<i32, E>
+pub fn le_i24<Input, Error>(input: &mut Input) -> PResult<i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_i24", move |input: &mut I| {
+    trace("le_i24", move |input: &mut Input| {
         le_uint::<_, u32, _>(input, 3).map(|n| {
             // Same as the unsigned version but we need to sign-extend manually here
             let n = if n & 0x80_00_00 != 0 {
@@ -1067,7 +1071,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1099,13 +1103,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn le_i32<I, E: ParserError<I>>(input: &mut I) -> PResult<i32, E>
+pub fn le_i32<Input, Error>(input: &mut Input) -> PResult<i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_i32", move |input: &mut I| {
+    trace("le_i32", move |input: &mut Input| {
         le_uint::<_, u32, _>(input, 4).map(|n| n as i32)
     })
     .parse_next(input)
@@ -1115,7 +1118,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1147,13 +1150,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn le_i64<I, E: ParserError<I>>(input: &mut I) -> PResult<i64, E>
+pub fn le_i64<Input, Error>(input: &mut Input) -> PResult<i64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_i64", move |input: &mut I| {
+    trace("le_i64", move |input: &mut Input| {
         le_uint::<_, u64, _>(input, 8).map(|n| n as i64)
     })
     .parse_next(input)
@@ -1163,7 +1165,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1195,13 +1197,12 @@
 /// assert_eq!(parser(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn le_i128<I, E: ParserError<I>>(input: &mut I) -> PResult<i128, E>
+pub fn le_i128<Input, Error>(input: &mut Input) -> PResult<i128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_i128", move |input: &mut I| {
+    trace("le_i128", move |input: &mut Input| {
         le_uint::<_, u128, _>(input, 16).map(|n| n as i128)
     })
     .parse_next(input)
@@ -1209,11 +1210,15 @@
 
 /// Recognizes an unsigned 1 byte integer
 ///
+/// <div class="warning">
+///
 /// **Note:** that endianness does not apply to 1 byte numbers.
 ///
+/// </div>
+///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1246,13 +1251,13 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn u8<I, E: ParserError<I>>(input: &mut I) -> PResult<u8, E>
+pub fn u8<Input, Error>(input: &mut Input) -> PResult<u8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("u8", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() {
+    trace("u8", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
             u8_::<_, _, true>(input)
         } else {
             u8_::<_, _, false>(input)
@@ -1261,16 +1266,16 @@
     .parse_next(input)
 }
 
-fn u8_<I, E: ParserError<I>, const PARTIAL: bool>(input: &mut I) -> PResult<u8, E>
+fn u8_<Input, Error, const PARTIAL: bool>(input: &mut Input) -> PResult<u8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
     input.next_token().ok_or_else(|| {
         if PARTIAL && input.is_partial() {
             ErrMode::Incomplete(Needed::new(1))
         } else {
-            ErrMode::Backtrack(E::from_error_kind(input, ErrorKind::Token))
+            ErrMode::Backtrack(Error::from_error_kind(input, ErrorKind::Token))
         }
     })
 }
@@ -1282,7 +1287,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1329,13 +1334,12 @@
 /// assert_eq!(le_u16(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn u16<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, u16, E>
+pub fn u16<Input, Error>(endian: Endianness) -> impl Parser<Input, u16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_u16,
             Endianness::Little => le_u16,
@@ -1354,7 +1358,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1401,13 +1405,12 @@
 /// assert_eq!(le_u24(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn u24<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, u32, E>
+pub fn u24<Input, Error>(endian: Endianness) -> impl Parser<Input, u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_u24,
             Endianness::Little => le_u24,
@@ -1426,7 +1429,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1473,13 +1476,12 @@
 /// assert_eq!(le_u32(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn u32<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, u32, E>
+pub fn u32<Input, Error>(endian: Endianness) -> impl Parser<Input, u32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_u32,
             Endianness::Little => le_u32,
@@ -1498,7 +1500,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1545,13 +1547,12 @@
 /// assert_eq!(le_u64(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn u64<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, u64, E>
+pub fn u64<Input, Error>(endian: Endianness) -> impl Parser<Input, u64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_u64,
             Endianness::Little => le_u64,
@@ -1570,7 +1571,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1617,13 +1618,12 @@
 /// assert_eq!(le_u128(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn u128<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, u128, E>
+pub fn u128<Input, Error>(endian: Endianness) -> impl Parser<Input, u128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_u128,
             Endianness::Little => le_u128,
@@ -1637,11 +1637,15 @@
 
 /// Recognizes a signed 1 byte integer
 ///
+/// <div class="warning">
+///
 /// **Note:** that endianness does not apply to 1 byte numbers.
 ///
+/// </div>
+///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1674,13 +1678,13 @@
 /// assert_eq!(parser(Partial::new(&b""[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn i8<I, E: ParserError<I>>(input: &mut I) -> PResult<i8, E>
+pub fn i8<Input, Error>(input: &mut Input) -> PResult<i8, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("i8", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() {
+    trace("i8", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
             u8_::<_, _, true>(input)
         } else {
             u8_::<_, _, false>(input)
@@ -1697,7 +1701,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1744,13 +1748,12 @@
 /// assert_eq!(le_i16(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn i16<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, i16, E>
+pub fn i16<Input, Error>(endian: Endianness) -> impl Parser<Input, i16, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_i16,
             Endianness::Little => le_i16,
@@ -1769,7 +1772,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1816,13 +1819,12 @@
 /// assert_eq!(le_i24(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
 #[inline(always)]
-pub fn i24<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, i32, E>
+pub fn i24<Input, Error>(endian: Endianness) -> impl Parser<Input, i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_i24,
             Endianness::Little => le_i24,
@@ -1841,7 +1843,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1888,13 +1890,12 @@
 /// assert_eq!(le_i32(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn i32<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, i32, E>
+pub fn i32<Input, Error>(endian: Endianness) -> impl Parser<Input, i32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_i32,
             Endianness::Little => le_i32,
@@ -1913,7 +1914,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -1960,13 +1961,12 @@
 /// assert_eq!(le_i64(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn i64<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, i64, E>
+pub fn i64<Input, Error>(endian: Endianness) -> impl Parser<Input, i64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_i64,
             Endianness::Little => le_i64,
@@ -1985,7 +1985,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2032,13 +2032,12 @@
 /// assert_eq!(le_i128(Partial::new(&b"\x01"[..])), Err(ErrMode::Incomplete(Needed::new(15))));
 /// ```
 #[inline(always)]
-pub fn i128<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, i128, E>
+pub fn i128<Input, Error>(endian: Endianness) -> impl Parser<Input, i128, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_i128,
             Endianness::Little => le_i128,
@@ -2054,7 +2053,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2087,13 +2086,12 @@
 /// assert_eq!(parser(Partial::new(&[0x01][..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn be_f32<I, E: ParserError<I>>(input: &mut I) -> PResult<f32, E>
+pub fn be_f32<Input, Error>(input: &mut Input) -> PResult<f32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_f32", move |input: &mut I| {
+    trace("be_f32", move |input: &mut Input| {
         be_uint::<_, u32, _>(input, 4).map(f32::from_bits)
     })
     .parse_next(input)
@@ -2103,7 +2101,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2135,13 +2133,12 @@
 /// assert_eq!(parser(Partial::new(&[0x01][..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn be_f64<I, E: ParserError<I>>(input: &mut I) -> PResult<f64, E>
+pub fn be_f64<Input, Error>(input: &mut Input) -> PResult<f64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_f64", move |input: &mut I| {
+    trace("be_f64", move |input: &mut Input| {
         be_uint::<_, u64, _>(input, 8).map(f64::from_bits)
     })
     .parse_next(input)
@@ -2151,7 +2148,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2183,13 +2180,12 @@
 /// assert_eq!(parser(Partial::new(&[0x01][..])), Err(ErrMode::Incomplete(Needed::new(3))));
 /// ```
 #[inline(always)]
-pub fn le_f32<I, E: ParserError<I>>(input: &mut I) -> PResult<f32, E>
+pub fn le_f32<Input, Error>(input: &mut Input) -> PResult<f32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("le_f32", move |input: &mut I| {
+    trace("le_f32", move |input: &mut Input| {
         le_uint::<_, u32, _>(input, 4).map(f32::from_bits)
     })
     .parse_next(input)
@@ -2199,7 +2195,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2231,13 +2227,12 @@
 /// assert_eq!(parser(Partial::new(&[0x01][..])), Err(ErrMode::Incomplete(Needed::new(7))));
 /// ```
 #[inline(always)]
-pub fn le_f64<I, E: ParserError<I>>(input: &mut I) -> PResult<f64, E>
+pub fn le_f64<Input, Error>(input: &mut Input) -> PResult<f64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    trace("be_f64", move |input: &mut I| {
+    trace("be_f64", move |input: &mut Input| {
         le_uint::<_, u64, _>(input, 8).map(f64::from_bits)
     })
     .parse_next(input)
@@ -2250,7 +2245,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2297,13 +2292,12 @@
 /// assert_eq!(le_f32(Partial::new(&b"abc"[..])), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn f32<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, f32, E>
+pub fn f32<Input, Error>(endian: Endianness) -> impl Parser<Input, f32, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_f32,
             Endianness::Little => le_f32,
@@ -2322,7 +2316,7 @@
 ///
 /// *Complete version*: returns an error if there is not enough input data
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2369,13 +2363,12 @@
 /// assert_eq!(le_f64(Partial::new(&b"abc"[..])), Err(ErrMode::Incomplete(Needed::new(5))));
 /// ```
 #[inline(always)]
-pub fn f64<I, E: ParserError<I>>(endian: Endianness) -> impl Parser<I, f64, E>
+pub fn f64<Input, Error>(endian: Endianness) -> impl Parser<Input, f64, Error>
 where
-    I: StreamIsPartial,
-    I: Stream<Token = u8>,
-    <I as Stream>::Slice: AsBytes,
+    Input: StreamIsPartial + Stream<Token = u8>,
+    Error: ParserError<Input>,
 {
-    move |input: &mut I| {
+    move |input: &mut Input| {
         match endian {
             Endianness::Big => be_f64,
             Endianness::Little => le_f64,
@@ -2395,10 +2388,7 @@
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
-///
-/// # Arguments
-/// * `f` The parser to apply.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2408,7 +2398,6 @@
 /// use winnow::Bytes;
 /// use winnow::binary::be_u16;
 /// use winnow::binary::length_take;
-/// use winnow::token::tag;
 ///
 /// type Stream<'i> = Partial<&'i Bytes>;
 ///
@@ -2423,43 +2412,27 @@
 /// assert_eq!(parser(stream(b"\x00\x03abcefg")), Ok((stream(&b"efg"[..]), &b"abc"[..])));
 /// assert_eq!(parser(stream(b"\x00\x03a")), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
-pub fn length_take<I, N, E, F>(mut f: F) -> impl Parser<I, <I as Stream>::Slice, E>
+pub fn length_take<Input, Count, Error, CountParser>(
+    mut count: CountParser,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    N: ToUsize,
-    F: Parser<I, N, E>,
-    E: ParserError<I>,
+    Input: StreamIsPartial + Stream,
+    Count: ToUsize,
+    CountParser: Parser<Input, Count, Error>,
+    Error: ParserError<Input>,
 {
-    trace("length_take", move |i: &mut I| {
-        let length = f.parse_next(i)?;
+    trace("length_take", move |i: &mut Input| {
+        let length = count.parse_next(i)?;
 
         crate::token::take(length).parse_next(i)
     })
 }
 
-/// Deprecated since 0.5.27, replaced with [`length_take`]
-#[deprecated(since = "0.5.27", note = "Replaced with `length_take`")]
-pub fn length_data<I, N, E, F>(f: F) -> impl Parser<I, <I as Stream>::Slice, E>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    N: ToUsize,
-    F: Parser<I, N, E>,
-    E: ParserError<I>,
-{
-    length_take(f)
-}
-
 /// Parse a length-prefixed slice ([TLV](https://en.wikipedia.org/wiki/Type-length-value))
 ///
 /// *Complete version*: Returns an error if there is not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
-///
-/// # Arguments
-/// * `f` The parser to apply.
-/// * `g` The parser to apply on the subslice.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there is not enough data.
 ///
 /// # Example
 ///
@@ -2469,7 +2442,6 @@
 /// use winnow::Bytes;
 /// use winnow::binary::be_u16;
 /// use winnow::binary::length_and_then;
-/// use winnow::token::tag;
 ///
 /// type Stream<'i> = Partial<&'i Bytes>;
 ///
@@ -2491,46 +2463,30 @@
 /// assert_eq!(parser(stream(b"\x00\x03123123")), Err(ErrMode::Backtrack(InputError::new(complete_stream(&b"123"[..]), ErrorKind::Tag))));
 /// assert_eq!(parser(stream(b"\x00\x03a")), Err(ErrMode::Incomplete(Needed::new(2))));
 /// ```
-pub fn length_and_then<I, O, N, E, F, G>(mut f: F, mut g: G) -> impl Parser<I, O, E>
+pub fn length_and_then<Input, Output, Count, Error, CountParser, ParseNext>(
+    mut count: CountParser,
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, Error>
 where
-    I: StreamIsPartial,
-    I: Stream + UpdateSlice + Clone,
-    N: ToUsize,
-    F: Parser<I, N, E>,
-    G: Parser<I, O, E>,
-    E: ParserError<I>,
+    Input: StreamIsPartial + Stream + UpdateSlice + Clone,
+    Count: ToUsize,
+    CountParser: Parser<Input, Count, Error>,
+    ParseNext: Parser<Input, Output, Error>,
+    Error: ParserError<Input>,
 {
-    trace("length_and_then", move |i: &mut I| {
-        let data = length_take(f.by_ref()).parse_next(i)?;
-        let mut data = I::update_slice(i.clone(), data);
+    trace("length_and_then", move |i: &mut Input| {
+        let data = length_take(count.by_ref()).parse_next(i)?;
+        let mut data = Input::update_slice(i.clone(), data);
         let _ = data.complete();
-        let o = g.by_ref().complete_err().parse_next(&mut data)?;
+        let o = parser.by_ref().complete_err().parse_next(&mut data)?;
         Ok(o)
     })
 }
 
-/// Deprecated since 0.5.27, replaced with [`length_and_then`]
-#[deprecated(since = "0.5.27", note = "Replaced with `length_and_then`")]
-pub fn length_value<I, O, N, E, F, G>(f: F, g: G) -> impl Parser<I, O, E>
-where
-    I: StreamIsPartial,
-    I: Stream + UpdateSlice + Clone,
-    N: ToUsize,
-    F: Parser<I, N, E>,
-    G: Parser<I, O, E>,
-    E: ParserError<I>,
-{
-    length_and_then(f, g)
-}
-
 /// [`Accumulate`] a length-prefixed sequence of values ([TLV](https://en.wikipedia.org/wiki/Type-length-value))
 ///
 /// If the length represents token counts, see instead [`length_take`]
 ///
-/// # Arguments
-/// * `f` The parser to apply to obtain the count.
-/// * `g` The parser to apply repeatedly.
-///
 /// # Example
 ///
 /// ```rust
@@ -2540,8 +2496,7 @@
 /// # use winnow::prelude::*;
 /// use winnow::Bytes;
 /// use winnow::binary::u8;
-/// use winnow::binary::length_count;
-/// use winnow::token::tag;
+/// use winnow::binary::length_repeat;
 ///
 /// type Stream<'i> = &'i Bytes;
 ///
@@ -2550,7 +2505,7 @@
 /// }
 ///
 /// fn parser(s: Stream<'_>) -> IResult<Stream<'_>, Vec<&[u8]>> {
-///   length_count(u8.map(|i| {
+///   length_repeat(u8.map(|i| {
 ///      println!("got number: {}", i);
 ///      i
 ///   }), "abc").parse_peek(s)
@@ -2560,32 +2515,21 @@
 /// assert_eq!(parser(stream(b"\x03123123123")), Err(ErrMode::Backtrack(InputError::new(stream(b"123123123"), ErrorKind::Tag))));
 /// # }
 /// ```
-pub fn length_repeat<I, O, C, N, E, F, G>(mut f: F, mut g: G) -> impl Parser<I, C, E>
+pub fn length_repeat<Input, Output, Accumulator, Count, Error, CountParser, ParseNext>(
+    mut count: CountParser,
+    mut parser: ParseNext,
+) -> impl Parser<Input, Accumulator, Error>
 where
-    I: Stream,
-    N: ToUsize,
-    C: Accumulate<O>,
-    F: Parser<I, N, E>,
-    G: Parser<I, O, E>,
-    E: ParserError<I>,
+    Input: Stream,
+    Count: ToUsize,
+    Accumulator: Accumulate<Output>,
+    CountParser: Parser<Input, Count, Error>,
+    ParseNext: Parser<Input, Output, Error>,
+    Error: ParserError<Input>,
 {
-    trace("length_repeat", move |i: &mut I| {
-        let n = f.parse_next(i)?;
+    trace("length_repeat", move |i: &mut Input| {
+        let n = count.parse_next(i)?;
         let n = n.to_usize();
-        repeat(n, g.by_ref()).parse_next(i)
+        repeat(n, parser.by_ref()).parse_next(i)
     })
 }
-
-/// Deprecated since 0.5.27, replaced with [`length_repeat`]
-#[deprecated(since = "0.5.27", note = "Replaced with `length_repeat`")]
-pub fn length_count<I, O, C, N, E, F, G>(f: F, g: G) -> impl Parser<I, C, E>
-where
-    I: Stream,
-    N: ToUsize,
-    C: Accumulate<O>,
-    F: Parser<I, N, E>,
-    G: Parser<I, O, E>,
-    E: ParserError<I>,
-{
-    length_repeat(f, g)
-}

crates/winnow/src/binary/tests.rs

diff --git a/crates/winnow/src/binary/tests.rs b/crates/winnow/src/binary/tests.rs
index bc2a005..9747b36 100644
--- a/crates/winnow/src/binary/tests.rs
+++ b/crates/winnow/src/binary/tests.rs
@@ -797,6 +797,22 @@
     }
 
     #[test]
+    fn le_u16_tests() {
+        assert_parse!(
+            le_u16.parse_peek(Partial::new(&[0x00, 0x03][..])),
+            Ok((Partial::new(&b""[..]), 0x0300))
+        );
+        assert_parse!(
+            le_u16.parse_peek(Partial::new(&[b'a', b'b'][..])),
+            Ok((Partial::new(&b""[..]), 0x6261))
+        );
+        assert_parse!(
+            le_u16.parse_peek(Partial::new(&[0x01][..])),
+            Err(ErrMode::Incomplete(Needed::new(1)))
+        );
+    }
+
+    #[test]
     fn le_i8_tests() {
         assert_parse!(
             le_i8.parse_peek(Partial::new(&[0x00][..])),
@@ -869,6 +885,22 @@
     }
 
     #[test]
+    fn le_u32_test() {
+        assert_parse!(
+            le_u32.parse_peek(Partial::new(&[0x00, 0x03, 0x05, 0x07][..])),
+            Ok((Partial::new(&b""[..]), 0x07050300))
+        );
+        assert_parse!(
+            le_u32.parse_peek(Partial::new(&[b'a', b'b', b'c', b'd'][..])),
+            Ok((Partial::new(&b""[..]), 0x64636261))
+        );
+        assert_parse!(
+            le_u32.parse_peek(Partial::new(&[0x01][..])),
+            Err(ErrMode::Incomplete(Needed::new(3)))
+        );
+    }
+
+    #[test]
     fn le_i32_tests() {
         assert_parse!(
             le_i32.parse_peek(Partial::new(&[0x00, 0x00, 0x00, 0x00][..])),

crates/winnow/src/combinator/branch.rs

diff --git a/crates/winnow/src/combinator/branch.rs b/crates/winnow/src/combinator/branch.rs
index 7fdcf8d..535b438 100644
--- a/crates/winnow/src/combinator/branch.rs
+++ b/crates/winnow/src/combinator/branch.rs
@@ -6,7 +6,7 @@
 #[doc(inline)]
 pub use crate::dispatch;
 
-/// Helper trait for the [alt()] combinator.
+/// Helper trait for the [`alt()`] combinator.
 ///
 /// This trait is implemented for tuples of up to 21 elements
 pub trait Alt<I, O, E> {
@@ -17,7 +17,7 @@
 /// Pick the first successful parser
 ///
 /// To stop on an error, rather than trying further cases, see
-/// [`cut_err`][crate::combinator::cut_err] ([example][crate::_tutorial::chapter_6]).
+/// [`cut_err`][crate::combinator::cut_err] ([example][crate::_tutorial::chapter_7]).
 ///
 /// For tight control over the error when no match is found, add a final case using [`fail`][crate::combinator::fail].
 /// Alternatively, with a [custom error type][crate::_topic::error], it is possible to track all
@@ -37,7 +37,7 @@
 ///   alt((alpha1, digit1)).parse_peek(input)
 /// };
 ///
-/// // the first parser, alpha1, recognizes the input
+/// // the first parser, alpha1, takes the input
 /// assert_eq!(parser("abc"), Ok(("", "abc")));
 ///
 /// // the first parser returns an error, so alt tries the second one
@@ -48,13 +48,18 @@
 /// # }
 /// ```
 #[doc(alias = "choice")]
-pub fn alt<I: Stream, O, E: ParserError<I>, List: Alt<I, O, E>>(
-    mut l: List,
-) -> impl Parser<I, O, E> {
-    trace("alt", move |i: &mut I| l.choice(i))
+#[inline(always)]
+pub fn alt<Input: Stream, Output, Error, Alternatives>(
+    mut alternatives: Alternatives,
+) -> impl Parser<Input, Output, Error>
+where
+    Alternatives: Alt<Input, Output, Error>,
+    Error: ParserError<Input>,
+{
+    trace("alt", move |i: &mut Input| alternatives.choice(i))
 }
 
-/// Helper trait for the [permutation()] combinator.
+/// Helper trait for the [`permutation()`] combinator.
 ///
 /// This trait is implemented for tuples of up to 21 elements
 pub trait Permutation<I, O, E> {
@@ -69,7 +74,7 @@
 /// tuple of the parser results.
 ///
 /// To stop on an error, rather than trying further permutations, see
-/// [`cut_err`][crate::combinator::cut_err] ([example][crate::_tutorial::chapter_6]).
+/// [`cut_err`][crate::combinator::cut_err] ([example][crate::_tutorial::chapter_7]).
 ///
 /// # Example
 ///
@@ -83,7 +88,7 @@
 ///   permutation((alpha1, digit1)).parse_peek(input)
 /// }
 ///
-/// // permutation recognizes alphabetic characters then digit
+/// // permutation takes alphabetic characters then digit
 /// assert_eq!(parser("abc123"), Ok(("", ("abc", "123"))));
 ///
 /// // but also in inverse order
@@ -111,9 +116,10 @@
 ///
 /// // any parses 'a', then char('a') fails on 'b',
 /// // even though char('a') followed by any would succeed
-/// assert_eq!(parser("ab"), Err(ErrMode::Backtrack(InputError::new("b", ErrorKind::Verify))));
+/// assert_eq!(parser("ab"), Err(ErrMode::Backtrack(InputError::new("b", ErrorKind::Tag))));
 /// ```
 ///
+#[inline(always)]
 pub fn permutation<I: Stream, O, E: ParserError<I>, List: Permutation<I, O, E>>(
     mut l: List,
 ) -> impl Parser<I, O, E> {
@@ -126,7 +132,7 @@
 
         let start = input.checkpoint();
         for branch in self {
-            input.reset(start.clone());
+            input.reset(&start);
             match branch.parse_next(input) {
                 Err(ErrMode::Backtrack(e)) => {
                     error = match error {
@@ -139,7 +145,32 @@
         }
 
         match error {
-            Some(e) => Err(ErrMode::Backtrack(e.append(input, ErrorKind::Alt))),
+            Some(e) => Err(ErrMode::Backtrack(e.append(input, &start, ErrorKind::Alt))),
+            None => Err(ErrMode::assert(input, "`alt` needs at least one parser")),
+        }
+    }
+}
+
+impl<I: Stream, O, E: ParserError<I>, P: Parser<I, O, E>> Alt<I, O, E> for &mut [P] {
+    fn choice(&mut self, input: &mut I) -> PResult<O, E> {
+        let mut error: Option<E> = None;
+
+        let start = input.checkpoint();
+        for branch in self.iter_mut() {
+            input.reset(&start);
+            match branch.parse_next(input) {
+                Err(ErrMode::Backtrack(e)) => {
+                    error = match error {
+                        Some(error) => Some(error.or(e)),
+                        None => Some(e),
+                    };
+                }
+                res => return res,
+            }
+        }
+
+        match error {
+            Some(e) => Err(ErrMode::Backtrack(e.append(input, &start, ErrorKind::Alt))),
             None => Err(ErrMode::assert(input, "`alt` needs at least one parser")),
         }
     }
@@ -204,7 +235,7 @@
 
 macro_rules! alt_trait_inner(
   ($it:tt, $self:expr, $input:expr, $start:ident, $err:expr, $head:ident $($id:ident)+) => ({
-    $input.reset($start.clone());
+    $input.reset(&$start);
     match $self.$it.parse_next($input) {
       Err(ErrMode::Backtrack(e)) => {
         let err = $err.or(e);
@@ -214,14 +245,14 @@
     }
   });
   ($it:tt, $self:expr, $input:expr, $start:ident, $err:expr, $head:ident) => ({
-    Err(ErrMode::Backtrack($err.append($input, ErrorKind::Alt)))
+    Err(ErrMode::Backtrack($err.append($input, &$start, ErrorKind::Alt)))
   });
 );
 
 alt_trait!(Alt2 Alt3 Alt4 Alt5 Alt6 Alt7 Alt8 Alt9 Alt10 Alt11 Alt12 Alt13 Alt14 Alt15 Alt16 Alt17 Alt18 Alt19 Alt20 Alt21 Alt22);
 
 // Manually implement Alt for (A,), the 1-tuple type
-impl<I, O, E: ParserError<I>, A: Parser<I, O, E>> Alt<I, O, E> for (A,) {
+impl<I: Stream, O, E: ParserError<I>, A: Parser<I, O, E>> Alt<I, O, E> for (A,) {
     fn choice(&mut self, input: &mut I) -> PResult<O, E> {
         self.0.parse_next(input)
     }
@@ -266,8 +297,8 @@
           // or errored on the remaining input
           if let Some(err) = err {
             // There are remaining parsers, and all errored on the remaining input
-            input.reset(start.clone());
-            return Err(ErrMode::Backtrack(err.append(input, ErrorKind::Alt)));
+            input.reset(&start);
+            return Err(ErrMode::Backtrack(err.append(input, &start, ErrorKind::Alt)));
           }
 
           // All parsers were applied
@@ -284,7 +315,7 @@
 macro_rules! permutation_trait_inner(
   ($it:tt, $self:expr, $input:ident, $start:ident, $res:expr, $err:expr, $head:ident $($id:ident)*) => (
     if $res.$it.is_none() {
-      $input.reset($start.clone());
+      $input.reset(&$start);
       match $self.$it.parse_next($input) {
         Ok(o) => {
           $res.$it = Some(o);

crates/winnow/src/combinator/core.rs

diff --git a/crates/winnow/src/combinator/core.rs b/crates/winnow/src/combinator/core.rs
index efd7758..3a2020d 100644
--- a/crates/winnow/src/combinator/core.rs
+++ b/crates/winnow/src/combinator/core.rs
@@ -3,50 +3,26 @@
 use crate::stream::Stream;
 use crate::*;
 
-/// Return the remaining input.
-///
-/// # Example
-///
-/// ```rust
-/// # use winnow::prelude::*;
-/// # use winnow::error::ErrorKind;
-/// # use winnow::error::InputError;
-/// use winnow::combinator::rest;
-/// assert_eq!(rest::<_,InputError<_>>.parse_peek("abc"), Ok(("", "abc")));
-/// assert_eq!(rest::<_,InputError<_>>.parse_peek(""), Ok(("", "")));
-/// ```
+/// Deprecated, replaced with [`token::rest`]
+#[deprecated(since = "0.6.23", note = "replaced with `token::rest`")]
 #[inline]
-pub fn rest<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn rest<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: Stream,
+    Input: Stream,
+    Error: ParserError<Input>,
 {
-    trace("rest", move |input: &mut I| Ok(input.finish())).parse_next(input)
+    crate::token::rest(input)
 }
 
-/// Return the length of the remaining input.
-///
-/// Note: this does not advance the [`Stream`]
-///
-/// # Example
-///
-/// ```rust
-/// # use winnow::prelude::*;
-/// # use winnow::error::ErrorKind;
-/// # use winnow::error::InputError;
-/// use winnow::combinator::rest_len;
-/// assert_eq!(rest_len::<_,InputError<_>>.parse_peek("abc"), Ok(("abc", 3)));
-/// assert_eq!(rest_len::<_,InputError<_>>.parse_peek(""), Ok(("", 0)));
-/// ```
+/// Deprecated, replaced with [`token::rest_len`]
+#[deprecated(since = "0.6.23", note = "replaced with `token::rest_len`")]
 #[inline]
-pub fn rest_len<I, E: ParserError<I>>(input: &mut I) -> PResult<usize, E>
+pub fn rest_len<Input, Error>(input: &mut Input) -> PResult<usize, Error>
 where
-    I: Stream,
+    Input: Stream,
+    Error: ParserError<Input>,
 {
-    trace("rest_len", move |input: &mut I| {
-        let len = input.eof_offset();
-        Ok(len)
-    })
-    .parse_next(input)
+    crate::token::rest_len(input)
 }
 
 /// Apply a [`Parser`], producing `None` on [`ErrMode::Backtrack`].
@@ -70,16 +46,19 @@
 /// assert_eq!(parser("123;"), Ok(("123;", None)));
 /// # }
 /// ```
-pub fn opt<I: Stream, O, E: ParserError<I>, F>(mut f: F) -> impl Parser<I, Option<O>, E>
+pub fn opt<Input: Stream, Output, Error, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<Input, Option<Output>, Error>
 where
-    F: Parser<I, O, E>,
+    ParseNext: Parser<Input, Output, Error>,
+    Error: ParserError<Input>,
 {
-    trace("opt", move |input: &mut I| {
+    trace("opt", move |input: &mut Input| {
         let start = input.checkpoint();
-        match f.parse_next(input) {
+        match parser.parse_next(input) {
             Ok(o) => Ok(Some(o)),
             Err(ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 Ok(None)
             }
             Err(e) => Err(e),
@@ -108,21 +87,27 @@
 /// assert_eq!(parser(false, "123;"), Ok(("123;", None)));
 /// # }
 /// ```
-pub fn cond<I, O, E: ParserError<I>, F>(b: bool, mut f: F) -> impl Parser<I, Option<O>, E>
+pub fn cond<Input, Output, Error, ParseNext>(
+    cond: bool,
+    mut parser: ParseNext,
+) -> impl Parser<Input, Option<Output>, Error>
 where
-    I: Stream,
-    F: Parser<I, O, E>,
+    Input: Stream,
+    ParseNext: Parser<Input, Output, Error>,
+    Error: ParserError<Input>,
 {
-    trace("cond", move |input: &mut I| {
-        if b {
-            f.parse_next(input).map(Some)
+    trace("cond", move |input: &mut Input| {
+        if cond {
+            parser.parse_next(input).map(Some)
         } else {
             Ok(None)
         }
     })
 }
 
-/// Tries to apply its parser without consuming the input.
+/// Apply the parser without advancing the input.
+///
+/// To lookahead and only advance on success, see [`opt`].
 ///
 /// # Example
 ///
@@ -141,14 +126,18 @@
 /// ```
 #[doc(alias = "look_ahead")]
 #[doc(alias = "rewind")]
-pub fn peek<I: Stream, O, E: ParserError<I>, F>(mut f: F) -> impl Parser<I, O, E>
+pub fn peek<Input, Output, Error, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, Error>
 where
-    F: Parser<I, O, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    ParseNext: Parser<Input, Output, Error>,
 {
-    trace("peek", move |input: &mut I| {
+    trace("peek", move |input: &mut Input| {
         let start = input.checkpoint();
-        let res = f.parse_next(input);
-        input.reset(start);
+        let res = parser.parse_next(input);
+        input.reset(&start);
         res
     })
 }
@@ -157,6 +146,17 @@
 ///
 /// Otherwise, it will error.
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn eof<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::combinator::eof.parse_next(input)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
@@ -171,11 +171,12 @@
 /// ```
 #[doc(alias = "end")]
 #[doc(alias = "eoi")]
-pub fn eof<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Slice, E>
+pub fn eof<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
 where
-    I: Stream,
+    Input: Stream,
+    Error: ParserError<Input>,
 {
-    trace("eof", move |input: &mut I| {
+    trace("eof", move |input: &mut Input| {
         if input.eof_offset() == 0 {
             Ok(input.next_slice(0))
         } else {
@@ -187,8 +188,12 @@
 
 /// Succeeds if the child parser returns an error.
 ///
+/// <div class="warning">
+///
 /// **Note:** This does not advance the [`Stream`]
 ///
+/// </div>
+///
 /// # Example
 ///
 /// ```rust
@@ -204,14 +209,16 @@
 /// assert_eq!(parser.parse_peek("abcd"), Err(ErrMode::Backtrack(InputError::new("abcd", ErrorKind::Not))));
 /// # }
 /// ```
-pub fn not<I: Stream, O, E: ParserError<I>, F>(mut parser: F) -> impl Parser<I, (), E>
+pub fn not<Input, Output, Error, ParseNext>(mut parser: ParseNext) -> impl Parser<Input, (), Error>
 where
-    F: Parser<I, O, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    ParseNext: Parser<Input, Output, Error>,
 {
-    trace("not", move |input: &mut I| {
+    trace("not", move |input: &mut Input| {
         let start = input.checkpoint();
         let res = parser.parse_next(input);
-        input.reset(start);
+        input.reset(&start);
         match res {
             Ok(_) => Err(ErrMode::from_error_kind(input, ErrorKind::Not)),
             Err(ErrMode::Backtrack(_)) => Ok(()),
@@ -225,7 +232,7 @@
 /// This commits the parse result, preventing alternative branch paths like with
 /// [`winnow::combinator::alt`][crate::combinator::alt].
 ///
-/// See the [tutorial][crate::_tutorial::chapter_6] for more details.
+/// See the [tutorial][crate::_tutorial::chapter_7] for more details.
 ///
 /// # Example
 ///
@@ -233,8 +240,8 @@
 /// ```rust
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError};
 /// # use winnow::token::one_of;
+/// # use winnow::token::rest;
 /// # use winnow::ascii::digit1;
-/// # use winnow::combinator::rest;
 /// # use winnow::combinator::alt;
 /// # use winnow::combinator::preceded;
 /// # use winnow::prelude::*;
@@ -258,8 +265,8 @@
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError};
 /// # use winnow::prelude::*;
 /// # use winnow::token::one_of;
+/// # use winnow::token::rest;
 /// # use winnow::ascii::digit1;
-/// # use winnow::combinator::rest;
 /// # use winnow::combinator::alt;
 /// # use winnow::combinator::preceded;
 /// use winnow::combinator::cut_err;
@@ -277,12 +284,15 @@
 /// assert_eq!(parser("+"), Err(ErrMode::Cut(InputError::new("", ErrorKind::Slice ))));
 /// # }
 /// ```
-pub fn cut_err<I, O, E: ParserError<I>, F>(mut parser: F) -> impl Parser<I, O, E>
+pub fn cut_err<Input, Output, Error, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    F: Parser<I, O, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    ParseNext: Parser<Input, Output, Error>,
 {
-    trace("cut_err", move |input: &mut I| {
+    trace("cut_err", move |input: &mut Input| {
         parser.parse_next(input).map_err(|e| e.cut())
     })
 }
@@ -291,12 +301,15 @@
 ///
 /// This attempts the parse, allowing other parsers to be tried on failure, like with
 /// [`winnow::combinator::alt`][crate::combinator::alt].
-pub fn backtrack_err<I, O, E: ParserError<I>, F>(mut parser: F) -> impl Parser<I, O, E>
+pub fn backtrack_err<Input, Output, Error, ParseNext>(
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    F: Parser<I, O, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    ParseNext: Parser<Input, Output, Error>,
 {
-    trace("backtrack_err", move |input: &mut I| {
+    trace("backtrack_err", move |input: &mut Input| {
         parser.parse_next(input).map_err(|e| e.backtrack())
     })
 }
@@ -320,12 +333,15 @@
 /// }
 /// ```
 #[track_caller]
-pub fn todo<I, O, E>(input: &mut I) -> PResult<O, E>
+pub fn todo<Input, Output, Error>(input: &mut Input) -> PResult<Output, Error>
 where
-    I: Stream,
+    Input: Stream,
 {
     #![allow(clippy::todo)]
-    trace("todo", move |_input: &mut I| todo!("unimplemented parse")).parse_next(input)
+    trace("todo", move |_input: &mut Input| {
+        todo!("unimplemented parse")
+    })
+    .parse_next(input)
 }
 
 /// Repeats the embedded parser, lazily returning the results
@@ -338,7 +354,7 @@
 /// # Example
 ///
 /// ```rust
-/// use winnow::{combinator::iterator, IResult, token::tag, ascii::alpha1, combinator::terminated};
+/// use winnow::{combinator::iterator, IResult, ascii::alpha1, combinator::terminated};
 /// use std::collections::HashMap;
 ///
 /// let data = "abc|defg|hijkl|mnopqr|123";
@@ -350,11 +366,14 @@
 /// assert_eq!(parsed, [("abc", 3usize), ("defg", 4), ("hijkl", 5), ("mnopqr", 6)].iter().cloned().collect());
 /// assert_eq!(res, Ok(("123", ())));
 /// ```
-pub fn iterator<I, O, E, F>(input: I, parser: F) -> ParserIterator<F, I, O, E>
+pub fn iterator<Input, Output, Error, ParseNext>(
+    input: Input,
+    parser: ParseNext,
+) -> ParserIterator<ParseNext, Input, Output, Error>
 where
-    F: Parser<I, O, E>,
-    I: Stream,
-    E: ParserError<I>,
+    ParseNext: Parser<Input, Output, Error>,
+    Input: Stream,
+    Error: ParserError<Input>,
 {
     ParserIterator {
         parser,
@@ -391,7 +410,7 @@
     }
 }
 
-impl<'a, F, I, O, E> core::iter::Iterator for &'a mut ParserIterator<F, I, O, E>
+impl<F, I, O, E> core::iter::Iterator for &mut ParserIterator<F, I, O, E>
 where
     F: Parser<I, O, E>,
     I: Stream,
@@ -408,7 +427,7 @@
                     Some(o)
                 }
                 Err(ErrMode::Backtrack(_)) => {
-                    self.input.reset(start);
+                    self.input.reset(&start);
                     self.state = Some(State::Done);
                     None
                 }
@@ -444,8 +463,12 @@
 /// - [`Parser::default_value`]
 /// - [`Parser::map`]
 ///
+/// <div class="warning">
+///
 /// **Note:** This never advances the [`Stream`]
 ///
+/// </div>
+///
 /// # Example
 ///
 /// ```rust
@@ -467,16 +490,15 @@
 /// ```
 #[doc(alias = "value")]
 #[doc(alias = "success")]
-pub fn empty<I: Stream, E: ParserError<I>>(_input: &mut I) -> PResult<(), E> {
+#[inline]
+pub fn empty<Input, Error>(_input: &mut Input) -> PResult<(), Error>
+where
+    Input: Stream,
+    Error: ParserError<Input>,
+{
     Ok(())
 }
 
-/// Deprecated, replaced with [`empty`] + [`Parser::value`]
-#[deprecated(since = "0.5.35", note = "Replaced with empty.value(...)`")]
-pub fn success<I: Stream, O: Clone, E: ParserError<I>>(val: O) -> impl Parser<I, O, E> {
-    trace("success", move |_input: &mut I| Ok(val.clone()))
-}
-
 /// A parser which always fails.
 ///
 /// For example, it can be used as the last alternative in `alt` to
@@ -493,8 +515,13 @@
 /// assert_eq!(fail::<_, &str, _>.parse_peek(s), Err(ErrMode::Backtrack(InputError::new(s, ErrorKind::Fail))));
 /// ```
 #[doc(alias = "unexpected")]
-pub fn fail<I: Stream, O, E: ParserError<I>>(i: &mut I) -> PResult<O, E> {
-    trace("fail", |i: &mut I| {
+#[inline]
+pub fn fail<Input, Output, Error>(i: &mut Input) -> PResult<Output, Error>
+where
+    Input: Stream,
+    Error: ParserError<Input>,
+{
+    trace("fail", |i: &mut Input| {
         Err(ErrMode::from_error_kind(i, ErrorKind::Fail))
     })
     .parse_next(i)

crates/winnow/src/combinator/debug/internals.rs

diff --git a/crates/winnow/src/combinator/debug/internals.rs b/crates/winnow/src/combinator/debug/internals.rs
index c38b11e..d210374 100644
--- a/crates/winnow/src/combinator/debug/internals.rs
+++ b/crates/winnow/src/combinator/debug/internals.rs
@@ -6,7 +6,7 @@
 use crate::stream::Stream;
 use crate::*;
 
-pub struct Trace<P, D, I, O, E>
+pub(crate) struct Trace<P, D, I, O, E>
 where
     P: Parser<I, O, E>,
     I: Stream,
@@ -27,7 +27,7 @@
     D: std::fmt::Display,
 {
     #[inline(always)]
-    pub fn new(parser: P, name: D) -> Self {
+    pub(crate) fn new(parser: P, name: D) -> Self {
         Self {
             parser,
             name,
@@ -62,19 +62,19 @@
     }
 }
 
-pub struct Depth {
+pub(crate) struct Depth {
     depth: usize,
     inc: bool,
 }
 
 impl Depth {
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         let depth = DEPTH.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
         let inc = true;
         Self { depth, inc }
     }
 
-    pub fn existing() -> Self {
+    pub(crate) fn existing() -> Self {
         let depth = DEPTH.load(std::sync::atomic::Ordering::SeqCst);
         let inc = false;
         Self { depth, inc }
@@ -107,7 +107,7 @@
 
 static DEPTH: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
 
-pub enum Severity {
+pub(crate) enum Severity {
     Success,
     Backtrack,
     Cut,
@@ -115,7 +115,7 @@
 }
 
 impl Severity {
-    pub fn with_result<T, E>(result: &Result<T, ErrMode<E>>) -> Self {
+    pub(crate) fn with_result<T, E>(result: &Result<T, ErrMode<E>>) -> Self {
         match result {
             Ok(_) => Self::Success,
             Err(ErrMode::Backtrack(_)) => Self::Backtrack,
@@ -125,7 +125,7 @@
     }
 }
 
-pub fn start<I: Stream>(
+pub(crate) fn start<I: Stream>(
     depth: usize,
     name: &dyn crate::lib::std::fmt::Display,
     count: usize,
@@ -178,7 +178,7 @@
     );
 }
 
-pub fn end(
+pub(crate) fn end(
     depth: usize,
     name: &dyn crate::lib::std::fmt::Display,
     count: usize,
@@ -199,7 +199,7 @@
     let (status_style, status) = match severity {
         Severity::Success => {
             let style = anstyle::Style::new().fg_color(Some(anstyle::AnsiColor::Green.into()));
-            let status = format!("+{}", consumed);
+            let status = format!("+{consumed}");
             (style, status)
         }
         Severity::Backtrack => (
@@ -228,7 +228,7 @@
     );
 }
 
-pub fn result(depth: usize, name: &dyn crate::lib::std::fmt::Display, severity: Severity) {
+pub(crate) fn result(depth: usize, name: &dyn crate::lib::std::fmt::Display, severity: Severity) {
     let gutter_style = anstyle::Style::new().bold();
 
     let (call_width, _) = column_widths();

crates/winnow/src/combinator/debug/mod.rs

diff --git a/crates/winnow/src/combinator/debug/mod.rs b/crates/winnow/src/combinator/debug/mod.rs
index ee4c293..0b5db5e 100644
--- a/crates/winnow/src/combinator/debug/mod.rs
+++ b/crates/winnow/src/combinator/debug/mod.rs
@@ -7,9 +7,6 @@
 use crate::stream::Stream;
 use crate::Parser;
 
-#[cfg(all(feature = "debug", not(feature = "std")))]
-compile_error!("`debug` requires `std`");
-
 /// Trace the execution of the parser
 ///
 /// Note that [`Parser::context`] also provides high level trace information.
@@ -67,6 +64,14 @@
     }
 }
 
+pub(crate) struct DisplayDebug<D>(pub(crate) D);
+
+impl<D: crate::lib::std::fmt::Debug> crate::lib::std::fmt::Display for DisplayDebug<D> {
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        write!(f, "{:?}", self.0)
+    }
+}
+
 #[test]
 #[cfg(feature = "std")]
 #[cfg_attr(miri, ignore)]

crates/winnow/src/combinator/impls.rs

diff --git a/crates/winnow/src/combinator/impls.rs b/crates/winnow/src/combinator/impls.rs
new file mode 100644
index 0000000..eed9c48
--- /dev/null
+++ b/crates/winnow/src/combinator/impls.rs
@@ -0,0 +1,728 @@
+//! Opaque implementations of [`Parser`]
+
+use crate::combinator::trace;
+use crate::combinator::trace_result;
+use crate::combinator::DisplayDebug;
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+use crate::error::FromRecoverableError;
+use crate::error::{AddContext, ErrMode, ErrorKind, FromExternalError, ParserError};
+use crate::lib::std::borrow::Borrow;
+use crate::lib::std::ops::Range;
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+use crate::stream::Recover;
+use crate::stream::StreamIsPartial;
+use crate::stream::{Location, Stream};
+use crate::*;
+
+/// [`Parser`] implementation for [`Parser::by_ref`]
+pub struct ByRef<'p, P> {
+    pub(crate) p: &'p mut P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for ByRef<'_, P>
+where
+    P: Parser<I, O, E>,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
+        self.p.parse_next(i)
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::map`]
+pub struct Map<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> O2,
+{
+    pub(crate) parser: F,
+    pub(crate) map: G,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, G, I, O, O2, E> Parser<I, O2, E> for Map<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> O2,
+{
+    #[inline]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
+        match self.parser.parse_next(i) {
+            Err(e) => Err(e),
+            Ok(o) => Ok((self.map)(o)),
+        }
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::try_map`]
+pub struct TryMap<F, G, I, O, O2, E, E2>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> Result<O2, E2>,
+    I: Stream,
+    E: FromExternalError<I, E2>,
+{
+    pub(crate) parser: F,
+    pub(crate) map: G,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+    pub(crate) e2: core::marker::PhantomData<E2>,
+}
+
+impl<F, G, I, O, O2, E, E2> Parser<I, O2, E> for TryMap<F, G, I, O, O2, E, E2>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> Result<O2, E2>,
+    I: Stream,
+    E: FromExternalError<I, E2>,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
+        let start = input.checkpoint();
+        let o = self.parser.parse_next(input)?;
+        let res = (self.map)(o).map_err(|err| {
+            input.reset(&start);
+            ErrMode::from_external_error(input, ErrorKind::Verify, err)
+        });
+        trace_result("verify", &res);
+        res
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::verify_map`]
+pub struct VerifyMap<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> Option<O2>,
+    I: Stream,
+    E: ParserError<I>,
+{
+    pub(crate) parser: F,
+    pub(crate) map: G,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, G, I, O, O2, E> Parser<I, O2, E> for VerifyMap<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> Option<O2>,
+    I: Stream,
+    E: ParserError<I>,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
+        let start = input.checkpoint();
+        let o = self.parser.parse_next(input)?;
+        let res = (self.map)(o).ok_or_else(|| {
+            input.reset(&start);
+            ErrMode::from_error_kind(input, ErrorKind::Verify)
+        });
+        trace_result("verify", &res);
+        res
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::and_then`]
+pub struct AndThen<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: Parser<O, O2, E>,
+    O: StreamIsPartial,
+    I: Stream,
+{
+    pub(crate) outer: F,
+    pub(crate) inner: G,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, G, I, O, O2, E> Parser<I, O2, E> for AndThen<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: Parser<O, O2, E>,
+    O: StreamIsPartial,
+    I: Stream,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
+        let start = i.checkpoint();
+        let mut o = self.outer.parse_next(i)?;
+        let _ = o.complete();
+        let o2 = self.inner.parse_next(&mut o).map_err(|err| {
+            i.reset(&start);
+            err
+        })?;
+        Ok(o2)
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::parse_to`]
+pub struct ParseTo<P, I, O, O2, E>
+where
+    P: Parser<I, O, E>,
+    I: Stream,
+    O: crate::stream::ParseSlice<O2>,
+    E: ParserError<I>,
+{
+    pub(crate) p: P,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<P, I, O, O2, E> Parser<I, O2, E> for ParseTo<P, I, O, O2, E>
+where
+    P: Parser<I, O, E>,
+    I: Stream,
+    O: crate::stream::ParseSlice<O2>,
+    E: ParserError<I>,
+{
+    #[inline]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
+        let start = i.checkpoint();
+        let o = self.p.parse_next(i)?;
+        let res = o.parse_slice().ok_or_else(|| {
+            i.reset(&start);
+            ErrMode::from_error_kind(i, ErrorKind::Verify)
+        });
+        trace_result("verify", &res);
+        res
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::flat_map`]
+pub struct FlatMap<F, G, H, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> H,
+    H: Parser<I, O2, E>,
+{
+    pub(crate) f: F,
+    pub(crate) g: G,
+    pub(crate) h: core::marker::PhantomData<H>,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, G, H, I, O, O2, E> Parser<I, O2, E> for FlatMap<F, G, H, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(O) -> H,
+    H: Parser<I, O2, E>,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
+        let o = self.f.parse_next(i)?;
+        (self.g)(o).parse_next(i)
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::complete_err`]
+pub struct CompleteErr<F> {
+    pub(crate) f: F,
+}
+
+impl<F, I, O, E> Parser<I, O, E> for CompleteErr<F>
+where
+    I: Stream,
+    F: Parser<I, O, E>,
+    E: ParserError<I>,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O, E> {
+        trace("complete_err", |input: &mut I| {
+            match (self.f).parse_next(input) {
+                Err(ErrMode::Incomplete(_)) => {
+                    Err(ErrMode::from_error_kind(input, ErrorKind::Complete))
+                }
+                rest => rest,
+            }
+        })
+        .parse_next(input)
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::verify`]
+pub struct Verify<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(&O2) -> bool,
+    I: Stream,
+    O: Borrow<O2>,
+    O2: ?Sized,
+    E: ParserError<I>,
+{
+    pub(crate) parser: F,
+    pub(crate) filter: G,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, G, I, O, O2, E> Parser<I, O, E> for Verify<F, G, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    G: FnMut(&O2) -> bool,
+    I: Stream,
+    O: Borrow<O2>,
+    O2: ?Sized,
+    E: ParserError<I>,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O, E> {
+        let start = input.checkpoint();
+        let o = self.parser.parse_next(input)?;
+        let res = (self.filter)(o.borrow()).then_some(o).ok_or_else(|| {
+            input.reset(&start);
+            ErrMode::from_error_kind(input, ErrorKind::Verify)
+        });
+        trace_result("verify", &res);
+        res
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::value`]
+pub struct Value<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O2: Clone,
+{
+    pub(crate) parser: F,
+    pub(crate) val: O2,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, O2, E> Parser<I, O2, E> for Value<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O2: Clone,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
+        (self.parser).parse_next(input).map(|_| self.val.clone())
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::default_value`]
+pub struct DefaultValue<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O2: core::default::Default,
+{
+    pub(crate) parser: F,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, O2, E> Parser<I, O2, E> for DefaultValue<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O2: core::default::Default,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
+        (self.parser).parse_next(input).map(|_| O2::default())
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::void`]
+pub struct Void<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, E> Parser<I, (), E> for Void<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, input: &mut I) -> PResult<(), E> {
+        (self.parser).parse_next(input).map(|_| ())
+    }
+}
+
+/// Replaced with [`Take`]
+#[deprecated(since = "0.6.14", note = "Replaced with `Take`")]
+pub type Recognize<F, I, O, E> = Take<F, I, O, E>;
+
+/// [`Parser`] implementation for [`Parser::take`]
+pub struct Take<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<I, O, E, F> Parser<I, <I as Stream>::Slice, E> for Take<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<<I as Stream>::Slice, E> {
+        let checkpoint = input.checkpoint();
+        match (self.parser).parse_next(input) {
+            Ok(_) => {
+                let offset = input.offset_from(&checkpoint);
+                input.reset(&checkpoint);
+                let taken = input.next_slice(offset);
+                Ok(taken)
+            }
+            Err(e) => Err(e),
+        }
+    }
+}
+
+/// Replaced with [`WithTaken`]
+#[deprecated(since = "0.6.14", note = "Replaced with `WithTaken`")]
+pub type WithRecognized<F, I, O, E> = WithTaken<F, I, O, E>;
+
+/// [`Parser`] implementation for [`Parser::with_taken`]
+pub struct WithTaken<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, E> Parser<I, (O, <I as Stream>::Slice), E> for WithTaken<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<(O, <I as Stream>::Slice), E> {
+        let checkpoint = input.checkpoint();
+        match (self.parser).parse_next(input) {
+            Ok(result) => {
+                let offset = input.offset_from(&checkpoint);
+                input.reset(&checkpoint);
+                let taken = input.next_slice(offset);
+                Ok((result, taken))
+            }
+            Err(e) => Err(e),
+        }
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::span`]
+pub struct Span<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream + Location,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<I, O, E, F> Parser<I, Range<usize>, E> for Span<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream + Location,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<Range<usize>, E> {
+        let start = input.location();
+        self.parser.parse_next(input).map(move |_| {
+            let end = input.location();
+            start..end
+        })
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::with_span`]
+pub struct WithSpan<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream + Location,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, E> Parser<I, (O, Range<usize>), E> for WithSpan<F, I, O, E>
+where
+    F: Parser<I, O, E>,
+    I: Stream + Location,
+{
+    #[inline]
+    fn parse_next(&mut self, input: &mut I) -> PResult<(O, Range<usize>), E> {
+        let start = input.location();
+        self.parser.parse_next(input).map(move |output| {
+            let end = input.location();
+            (output, (start..end))
+        })
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::output_into`]
+pub struct OutputInto<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O: Into<O2>,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) o2: core::marker::PhantomData<O2>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, O2, E> Parser<I, O2, E> for OutputInto<F, I, O, O2, E>
+where
+    F: Parser<I, O, E>,
+    O: Into<O2>,
+{
+    #[inline]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
+        self.parser.parse_next(i).map(|o| o.into())
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::err_into`]
+pub struct ErrInto<F, I, O, E, E2>
+where
+    F: Parser<I, O, E>,
+    E: Into<E2>,
+{
+    pub(crate) parser: F,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+    pub(crate) e2: core::marker::PhantomData<E2>,
+}
+
+impl<F, I, O, E, E2> Parser<I, O, E2> for ErrInto<F, I, O, E, E2>
+where
+    F: Parser<I, O, E>,
+    E: Into<E2>,
+{
+    #[inline]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O, E2> {
+        self.parser
+            .parse_next(i)
+            .map_err(|err| err.map(|e| e.into()))
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::context`]
+pub struct Context<F, I, O, E, C>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+    E: AddContext<I, C>,
+    C: Clone + crate::lib::std::fmt::Debug,
+{
+    pub(crate) parser: F,
+    pub(crate) context: C,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+impl<F, I, O, E, C> Parser<I, O, E> for Context<F, I, O, E, C>
+where
+    F: Parser<I, O, E>,
+    I: Stream,
+    E: AddContext<I, C>,
+    C: Clone + crate::lib::std::fmt::Debug,
+{
+    #[inline]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
+        let context = self.context.clone();
+        trace(DisplayDebug(self.context.clone()), move |i: &mut I| {
+            let start = i.checkpoint();
+            (self.parser)
+                .parse_next(i)
+                .map_err(|err| err.add_context(i, &start, context.clone()))
+        })
+        .parse_next(i)
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::retry_after`]
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+pub struct RetryAfter<P, R, I, O, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    pub(crate) parser: P,
+    pub(crate) recover: R,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+impl<P, R, I, O, E> Parser<I, O, E> for RetryAfter<P, R, I, O, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
+        if I::is_recovery_supported() {
+            retry_after_inner(&mut self.parser, &mut self.recover, i)
+        } else {
+            self.parser.parse_next(i)
+        }
+    }
+}
+
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+fn retry_after_inner<P, R, I, O, E>(parser: &mut P, recover: &mut R, i: &mut I) -> PResult<O, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    loop {
+        let token_start = i.checkpoint();
+        let mut err = match parser.parse_next(i) {
+            Ok(o) => {
+                return Ok(o);
+            }
+            Err(ErrMode::Incomplete(e)) => return Err(ErrMode::Incomplete(e)),
+            Err(err) => err,
+        };
+        let err_start = i.checkpoint();
+        let err_start_eof_offset = i.eof_offset();
+        if recover.parse_next(i).is_ok() {
+            let i_eof_offset = i.eof_offset();
+            if err_start_eof_offset == i_eof_offset {
+                // Didn't advance so bubble the error up
+            } else if let Err(err_) = i.record_err(&token_start, &err_start, err) {
+                err = err_;
+            } else {
+                continue;
+            }
+        }
+
+        i.reset(&err_start);
+        err = err.map(|err| E::from_recoverable_error(&token_start, &err_start, i, err));
+        return Err(err);
+    }
+}
+
+/// [`Parser`] implementation for [`Parser::resume_after`]
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+pub struct ResumeAfter<P, R, I, O, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    pub(crate) parser: P,
+    pub(crate) recover: R,
+    pub(crate) i: core::marker::PhantomData<I>,
+    pub(crate) o: core::marker::PhantomData<O>,
+    pub(crate) e: core::marker::PhantomData<E>,
+}
+
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+impl<P, R, I, O, E> Parser<I, Option<O>, E> for ResumeAfter<P, R, I, O, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    #[inline(always)]
+    fn parse_next(&mut self, i: &mut I) -> PResult<Option<O>, E> {
+        if I::is_recovery_supported() {
+            resume_after_inner(&mut self.parser, &mut self.recover, i)
+        } else {
+            self.parser.parse_next(i).map(Some)
+        }
+    }
+}
+
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+fn resume_after_inner<P, R, I, O, E>(
+    parser: &mut P,
+    recover: &mut R,
+    i: &mut I,
+) -> PResult<Option<O>, E>
+where
+    P: Parser<I, O, E>,
+    R: Parser<I, (), E>,
+    I: Stream,
+    I: Recover<E>,
+    E: FromRecoverableError<I, E>,
+{
+    let token_start = i.checkpoint();
+    let mut err = match parser.parse_next(i) {
+        Ok(o) => {
+            return Ok(Some(o));
+        }
+        Err(ErrMode::Incomplete(e)) => return Err(ErrMode::Incomplete(e)),
+        Err(err) => err,
+    };
+    let err_start = i.checkpoint();
+    if recover.parse_next(i).is_ok() {
+        if let Err(err_) = i.record_err(&token_start, &err_start, err) {
+            err = err_;
+        } else {
+            return Ok(None);
+        }
+    }
+
+    i.reset(&err_start);
+    err = err.map(|err| E::from_recoverable_error(&token_start, &err_start, i, err));
+    Err(err)
+}

crates/winnow/src/combinator/mod.rs

diff --git a/crates/winnow/src/combinator/mod.rs b/crates/winnow/src/combinator/mod.rs
index da5fa79..a7f540c 100644
--- a/crates/winnow/src/combinator/mod.rs
+++ b/crates/winnow/src/combinator/mod.rs
@@ -1,20 +1,24 @@
 //! # List of parsers and combinators
 //!
+//! <div class="warning">
+//!
 //! **Note**: this list is meant to provide a nicer way to find a parser than reading through the documentation on docs.rs. Function combinators are organized in module so they are a bit easier to find.
 //!
+//! </div>
+//!
 //! ## Basic elements
 //!
-//! Those are used to recognize the lowest level elements of your grammar, like, "here is a dot", or "here is an big endian integer".
+//! Those are used to take a series of tokens for the lowest level elements of your grammar, like, "here is a dot", or "here is an big endian integer".
 //!
 //! | combinator | usage | input | new input | output | comment |
 //! |---|---|---|---|---|---|
-//! | [`one_of`][crate::token::one_of] | `one_of(['a', 'b', 'c'])` |  `"abc"` |  `"bc"` | `Ok('a')` |Matches one of the provided characters (works with non ASCII characters too)|
-//! | [`none_of`][crate::token::none_of] | `none_of(['a', 'b', 'c'])` |  `"xyab"` |  `"yab"` | `Ok('x')` |Matches anything but the provided characters|
-//! | [`tag`][crate::token::tag] | `"hello"` |  `"hello world"` |  `" world"` | `Ok("hello")` |Recognizes a specific suite of characters or bytes (see also [`Caseless`][crate::ascii::Caseless])|
+//! | [`one_of`][crate::token::one_of] | `one_of(['a', 'b', 'c'])` |  `"abc"` |  `"bc"` | `Ok('a')` |Matches one of the provided [set of tokens][crate::stream::ContainsToken] (works with non ASCII characters too)|
+//! | [`none_of`][crate::token::none_of] | `none_of(['a', 'b', 'c'])` |  `"xyab"` |  `"yab"` | `Ok('x')` |Matches anything but one of the provided [set of tokens][crate::stream::ContainsToken]|
+//! | [`literal`][crate::token::literal] | `"hello"` |  `"hello world"` |  `" world"` | `Ok("hello")` |Recognizes a specific suite of characters or bytes (see also [`Caseless`][crate::ascii::Caseless])|
 //! | [`take`][crate::token::take] | `take(4)` |  `"hello"` |  `"o"` | `Ok("hell")` |Takes a specific number of bytes or characters|
-//! | [`take_while`][crate::token::take_while] | `take_while(0.., is_alphabetic)` |  `"abc123"` |  `"123"` | `Ok("abc")` |Returns the longest list of bytes for which the provided pattern matches.|
-//! | [`take_till0`][crate::token::take_till0] | `take_till0(is_alphabetic)` |  `"123abc"` |  `"abc"` | `Ok("123")` |Returns the longest list of bytes or characters until the provided pattern matches. `take_till1` does the same, but must return at least one character. This is the reverse behaviour from `take_while`: `take_till(f)` is equivalent to `take_while(0.., \|c\| !f(c))`|
-//! | [`take_until`][crate::token::take_until] | `take_until(0.., "world")` |  `"Hello world"` |  `"world"` | `Ok("Hello ")` |Returns the longest list of bytes or characters until the provided tag is found.|
+//! | [`take_while`][crate::token::take_while] | `take_while(0.., is_alphabetic)` |  `"abc123"` |  `"123"` | `Ok("abc")` |Returns the longest slice of bytes or characters for which the provided [set of tokens][crate::stream::ContainsToken] matches.|
+//! | [`take_till`][crate::token::take_till] | `take_till(0.., is_alphabetic)` |  `"123abc"` |  `"abc"` | `Ok("123")` |Returns a slice of bytes or characters until the provided [set of tokens][crate::stream::ContainsToken] matches. This is the reverse behaviour from `take_while`: `take_till(f)` is equivalent to `take_while(0.., \|c\| !f(c))`|
+//! | [`take_until`][crate::token::take_until] | `take_until(0.., "world")` |  `"Hello world"` |  `"world"` | `Ok("Hello ")` |Returns a slice of bytes or characters until the provided [literal][crate::token::literal] is found.|
 //!
 //! ## Choice combinators
 //!
@@ -28,21 +32,21 @@
 //!
 //! | combinator | usage | input | new input | output | comment |
 //! |---|---|---|---|---|---|
-//! | [`(...)` (tuples)][crate::Parser] | `("ab", "XY", take(1))` | `"abXYZ!"` | `"!"` | `Ok(("ab", "XY", "Z"))` |Chains parsers and assemble the sub results in a tuple. You can use as many child parsers as you can put elements in a tuple|
-//! | [`seq!`] | `seq!(_: char('('), take(2), _: char(')'))` | `"(ab)cd"` | `"cd"` | `Ok("ab")` ||
-//! | [`delimited`] | `delimited(char('('), take(2), char(')'))` | `"(ab)cd"` | `"cd"` | `Ok("ab")` ||
-//! | [`preceded`] | `preceded("ab", "XY")` | `"abXYZ"` | `"Z"` | `Ok("XY")` ||
-//! | [`terminated`] | `terminated("ab", "XY")` | `"abXYZ"` | `"Z"` | `Ok("ab")` ||
-//! | [`separated_pair`] | `separated_pair("hello", char(','), "world")` | `"hello,world!"` | `"!"` | `Ok(("hello", "world"))` ||
+//! | [`(...)` (tuples)][crate::Parser] | `("ab", "XY", take(1))` | `"abXYZ!"` | `"!"` | `Ok(("ab", "XY", "Z"))` |Parse a series of values|
+//! | [`seq!`] | `seq!(_: '(', take(2), _: ')')` | `"(ab)cd"` | `"cd"` | `Ok("ab")` |Parse a series of values, discarding those you specify|
+//! | [`delimited`] | `delimited('(', take(2), ')')` | `"(ab)cd"` | `"cd"` | `Ok("ab")` |Parse three values, discarding the first and third value|
+//! | [`preceded`] | `preceded("ab", "XY")` | `"abXYZ"` | `"Z"` | `Ok("XY")` |Parse two values, discarding the first value|
+//! | [`terminated`] | `terminated("ab", "XY")` | `"abXYZ"` | `"Z"` | `Ok("ab")` |Parse two values, discarding the second value|
+//! | [`separated_pair`] | `separated_pair("hello", ',', "world")` | `"hello,world!"` | `"!"` | `Ok(("hello", "world"))` | Parse three values, discarding the middle value|
 //!
 //! ## Applying a parser multiple times
 //!
 //! | combinator | usage | input | new input | output | comment |
 //! |---|---|---|---|---|---|
 //! | [`repeat`] | `repeat(1..=3, "ab")` | `"ababc"` | `"c"` | `Ok(vec!["ab", "ab"])` |Applies the parser between m and n times (n included) and returns the list of results in a Vec|
-//! | [`repeat_till`] | `repeat_till(0.., tag( "ab" ), tag( "ef" ))` | `"ababefg"` | `"g"` | `Ok((vec!["ab", "ab"], "ef"))` |Applies the first parser until the second applies. Returns a tuple containing the list of results from the first in a Vec and the result of the second|
+//! | [`repeat_till`] | `repeat_till(0.., "ab", "ef")` | `"ababefg"` | `"g"` | `Ok((vec!["ab", "ab"], "ef"))` |Applies the first parser until the second applies. Returns a tuple containing the list of results from the first in a Vec and the result of the second|
 //! | [`separated`] | `separated(1..=3, "ab", ",")` | `"ab,ab,ab."` | `"."` | `Ok(vec!["ab", "ab", "ab"])` |Applies the parser and separator between m and n times (n included) and returns the list of results in a Vec|
-//! | [`fold_repeat`] | `fold_repeat(1..=2, be_u8, \|\| 0, \|acc, item\| acc + item)` | `[1, 2, 3]` | `[3]` | `Ok(3)` |Applies the parser between m and n times (n included) and folds the list of return value|
+//! | [`Repeat::fold`] | <code>repeat(1..=2, `be_u8`).fold(\|\| 0, \|acc, item\| acc + item)</code> | `[1, 2, 3]` | `[3]` | `Ok(3)` |Applies the parser between m and n times (n included) and folds the list of return value|
 //!
 //! ## Partial related
 //!
@@ -64,8 +68,8 @@
 //! - [`not`]: Returns a result only if the embedded parser returns `Backtrack` or `Incomplete`. Does not consume the input
 //! - [`opt`]: Make the underlying parser optional
 //! - [`peek`]: Returns a result without consuming the input
-//! - [`Parser::recognize`]: If the child parser was successful, return the consumed input as the produced value
-//! - [`Parser::with_recognized`]: If the child parser was successful, return a tuple of the consumed input and the produced output.
+//! - [`Parser::take`]: If the child parser was successful, return the consumed input as the produced value
+//! - [`Parser::with_taken`]: If the child parser was successful, return a tuple of the consumed input and the produced output.
 //! - [`Parser::span`]: If the child parser was successful, return the location of the consumed input as the produced value
 //! - [`Parser::with_span`]: If the child parser was successful, return a tuple of the location of the consumed input and the produced output.
 //! - [`Parser::verify`]: Returns the result of the child parser if it satisfies a verification function
@@ -81,8 +85,8 @@
 //!
 //! ## Remaining combinators
 //!
-//! - [`success`]: Returns a value without consuming any input, always succeeds
-//! - [`fail`]: Inversion of `success`. Always fails.
+//! - [`empty`]: Returns a value without consuming any input, always succeeds
+//! - [`fail`]: Inversion of [`empty`]. Always fails.
 //! - [`Parser::by_ref`]: Allow moving `&mut impl Parser` into other parsers
 //!
 //! ## Text parsing
@@ -108,8 +112,8 @@
 //! - [`dec_uint`][crate::ascii::dec_uint]: Decode a variable-width, decimal unsigned integer
 //! - [`hex_uint`][crate::ascii::hex_uint]: Decode a variable-width, hexadecimal integer
 //!
-//! - [`escaped`][crate::ascii::escaped]: Matches a byte string with escaped characters
-//! - [`escaped_transform`][crate::ascii::escaped_transform]: Matches a byte string with escaped characters, and returns a new string with the escaped characters replaced
+//! - [`take_escaped`][crate::ascii::take_escaped]: Recognize the input slice with escaped characters
+//! - [`escaped_transform`][crate::ascii::escaped_transform]: Parse escaped characters, unescaping them
 //!
 //! ### Character test functions
 //!
@@ -125,9 +129,9 @@
 //!
 //! ## Binary format parsing
 //!
-//! - [`length_count`][crate::binary::length_count] Gets a number from the first parser, then applies the second parser that many times
-//! - [`length_data`][crate::binary::length_data]: Gets a number from the first parser, then takes a subslice of the input of that size, and returns that subslice
-//! - [`length_value`][crate::binary::length_value]: Gets a number from the first parser, takes a subslice of the input of that size, then applies the second parser on that subslice. If the second parser returns `Incomplete`, `length_value` will return an error
+//! - [`length_repeat`][crate::binary::length_repeat] Gets a number from the first parser, then applies the second parser that many times
+//! - [`length_take`][crate::binary::length_take]: Gets a number from the first parser, then takes a subslice of the input of that size, and returns that subslice
+//! - [`length_and_then`][crate::binary::length_and_then]: Gets a number from the first parser, takes a subslice of the input of that size, then applies the second parser on that subslice. If the second parser returns `Incomplete`, `length_value` will return an error
 //!
 //! ### Integers
 //!
@@ -152,24 +156,26 @@
 //! - [`bits`][crate::binary::bits::bits]: Transforms the current input type (byte slice `&[u8]`) to a bit stream on which bit specific parsers and more general combinators can be applied
 //! - [`bytes`][crate::binary::bits::bytes]: Transforms its bits stream input back into a byte slice for the underlying parser
 //! - [`take`][crate::binary::bits::take]: Take a set number of bits
-//! - [`tag`][crate::binary::bits::tag]: Check if a set number of bits matches a pattern
+//! - [`pattern`][crate::binary::bits::pattern]: Check if a set number of bits matches a pattern
 //! - [`bool`][crate::binary::bits::bool]: Match any one bit
 
 mod branch;
 mod core;
 mod debug;
 mod multi;
-mod parser;
 mod sequence;
 
 #[cfg(test)]
 mod tests;
 
+pub mod impls;
+
 pub use self::branch::*;
 pub use self::core::*;
 pub use self::debug::*;
+#[deprecated(since = "0.6.23", note = "Replaced with `combinator::impls`")]
+pub use self::impls::*;
 pub use self::multi::*;
-pub use self::parser::*;
 pub use self::sequence::*;
 
 #[allow(unused_imports)]

crates/winnow/src/combinator/multi.rs

diff --git a/crates/winnow/src/combinator/multi.rs b/crates/winnow/src/combinator/multi.rs
index f76d635..38558f3 100644
--- a/crates/winnow/src/combinator/multi.rs
+++ b/crates/winnow/src/combinator/multi.rs
@@ -3,6 +3,7 @@
 use crate::combinator::trace;
 use crate::error::ErrMode;
 use crate::error::ErrorKind;
+use crate::error::FromExternalError;
 use crate::error::ParserError;
 use crate::stream::Accumulate;
 use crate::stream::Range;
@@ -15,17 +16,18 @@
 /// This stops before `n` when the parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
 /// [`cut_err`][crate::combinator::cut_err].
 ///
-/// # Arguments
-/// * `m` The minimum number of iterations.
-/// * `n` The maximum number of iterations.
-/// * `f` The parser to apply.
+/// To take a series of tokens, [`Accumulate`] into a `()`
+/// (e.g. with [`.map(|()| ())`][Parser::map])
+/// and then [`Parser::take`].
 ///
-/// To recognize a series of tokens, [`Accumulate`] into a `()` and then [`Parser::recognize`].
+/// <div class="warning">
 ///
 /// **Warning:** If the parser passed to `repeat` accepts empty inputs
 /// (like `alpha0` or `digit0`), `repeat` will return an error,
 /// to prevent going into an infinite loop.
 ///
+/// </div>
+///
 /// # Example
 ///
 /// Zero or more repetitions:
@@ -34,7 +36,6 @@
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::repeat;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   repeat(0.., "abc").parse_peek(s)
@@ -53,7 +54,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::repeat;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   repeat(1.., "abc").parse_peek(s)
@@ -72,7 +72,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::repeat;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   repeat(2, "abc").parse_peek(s)
@@ -92,7 +91,6 @@
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::repeat;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   repeat(0..=2, "abc").parse_peek(s)
@@ -115,15 +113,18 @@
 #[doc(alias = "skip_many")]
 #[doc(alias = "skip_many1")]
 #[inline(always)]
-pub fn repeat<I, O, C, E, P>(range: impl Into<Range>, parser: P) -> Repeat<P, I, O, C, E>
+pub fn repeat<Input, Output, Accumulator, Error, ParseNext>(
+    occurrences: impl Into<Range>,
+    parser: ParseNext,
+) -> Repeat<ParseNext, Input, Output, Accumulator, Error>
 where
-    I: Stream,
-    C: Accumulate<O>,
-    P: Parser<I, O, E>,
-    E: ParserError<I>,
+    Input: Stream,
+    Accumulator: Accumulate<Output>,
+    ParseNext: Parser<Input, Output, Error>,
+    Error: ParserError<Input>,
 {
     Repeat {
-        range: range.into(),
+        occurrences: occurrences.into(),
         parser,
         i: Default::default(),
         o: Default::default(),
@@ -132,8 +133,7 @@
     }
 }
 
-/// Implementation of [`repeat`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
+/// Customizable [`Parser`] implementation for [`repeat`]
 pub struct Repeat<P, I, O, C, E>
 where
     P: Parser<I, O, E>,
@@ -141,7 +141,7 @@
     C: Accumulate<O>,
     E: ParserError<I>,
 {
-    range: Range,
+    occurrences: Range,
     parser: P,
     i: core::marker::PhantomData<I>,
     o: core::marker::PhantomData<O>,
@@ -149,26 +149,30 @@
     e: core::marker::PhantomData<E>,
 }
 
-impl<P, I, O, E> Repeat<P, I, O, (), E>
+impl<ParseNext, Input, Output, Error> Repeat<ParseNext, Input, Output, (), Error>
 where
-    P: Parser<I, O, E>,
-    I: Stream,
-    E: ParserError<I>,
+    ParseNext: Parser<Input, Output, Error>,
+    Input: Stream,
+    Error: ParserError<Input>,
 {
-    /// Repeats the embedded parser, calling `g` to gather the results
+    /// Repeats the embedded parser, calling `op` to gather the results
     ///
     /// This stops before `n` when the parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
     /// [`cut_err`][crate::combinator::cut_err].
     ///
     /// # Arguments
     /// * `init` A function returning the initial value.
-    /// * `g` The function that combines a result of `f` with
+    /// * `op` The function that combines a result of `f` with
     ///       the current accumulator.
     ///
+    /// <div class="warning">
+    ///
     /// **Warning:** If the parser passed to `fold` accepts empty inputs
     /// (like `alpha0` or `digit0`), `fold_repeat` will return an error,
     /// to prevent going into an infinite loop.
     ///
+    /// </div>
+    ///
     /// # Example
     ///
     /// Zero or more repetitions:
@@ -176,7 +180,6 @@
     /// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
     /// # use winnow::prelude::*;
     /// use winnow::combinator::repeat;
-    /// use winnow::token::tag;
     ///
     /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
     ///   repeat(
@@ -202,7 +205,6 @@
     /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
     /// # use winnow::prelude::*;
     /// use winnow::combinator::repeat;
-    /// use winnow::token::tag;
     ///
     /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
     ///   repeat(
@@ -228,7 +230,6 @@
     /// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
     /// # use winnow::prelude::*;
     /// use winnow::combinator::repeat;
-    /// use winnow::token::tag;
     ///
     /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
     ///   repeat(
@@ -254,30 +255,185 @@
     #[doc(alias = "fold_many_m_n")]
     #[doc(alias = "fold_repeat")]
     #[inline(always)]
-    pub fn fold<H, G, R>(mut self, mut init: H, mut g: G) -> impl Parser<I, R, E>
+    pub fn fold<Init, Op, Result>(
+        mut self,
+        mut init: Init,
+        mut op: Op,
+    ) -> impl Parser<Input, Result, Error>
     where
-        G: FnMut(R, O) -> R,
-        H: FnMut() -> R,
+        Init: FnMut() -> Result,
+        Op: FnMut(Result, Output) -> Result,
     {
         let Range {
             start_inclusive,
             end_inclusive,
-        } = self.range;
-        trace("repeat_fold", move |i: &mut I| {
+        } = self.occurrences;
+        trace("repeat_fold", move |i: &mut Input| {
             match (start_inclusive, end_inclusive) {
-                (0, None) => fold_repeat0_(&mut self.parser, &mut init, &mut g, i),
-                (1, None) => fold_repeat1_(&mut self.parser, &mut init, &mut g, i),
+                (0, None) => fold_repeat0_(&mut self.parser, &mut init, &mut op, i),
+                (1, None) => fold_repeat1_(&mut self.parser, &mut init, &mut op, i),
                 (start, end) => fold_repeat_m_n_(
                     start,
                     end.unwrap_or(usize::MAX),
                     &mut self.parser,
                     &mut init,
-                    &mut g,
+                    &mut op,
                     i,
                 ),
             }
         })
     }
+
+    /// Akin to [`Repeat::fold`], but for containers that can reject an element.
+    ///
+    /// This stops before `n` when the parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
+    /// [`cut_err`][crate::combinator::cut_err]. Additionally, if the fold function returns `None`, the parser will
+    /// stop and return an error.
+    ///
+    /// # Arguments
+    /// * `init` A function returning the initial value.
+    /// * `op` The function that combines a result of `f` with
+    ///       the current accumulator.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Warning:** If the parser passed to `repeat` accepts empty inputs
+    /// (like `alpha0` or `digit0`), `verify_fold` will return an error,
+    /// to prevent going into an infinite loop.
+    ///
+    /// </div>
+    ///
+    /// # Example
+    ///
+    /// Guaranteeing that the input had unique elements:
+    /// ```rust
+    /// # use winnow::error::IResult;
+    /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
+    /// # use winnow::prelude::*;
+    /// use winnow::combinator::repeat;
+    /// use std::collections::HashSet;
+    ///
+    /// fn parser(s: &str) -> IResult<&str, HashSet<&str>> {
+    ///   repeat(
+    ///     0..,
+    ///     "abc"
+    ///   ).verify_fold(
+    ///     HashSet::new,
+    ///     |mut acc: HashSet<_>, item| {
+    ///       if acc.insert(item) {
+    ///          Some(acc)
+    ///       } else {
+    ///          None
+    ///       }
+    ///     }
+    ///   ).parse_peek(s)
+    /// }
+    ///
+    /// assert_eq!(parser("abc"), Ok(("", HashSet::from(["abc"]))));
+    /// assert_eq!(parser("abcabc"), Err(ErrMode::Backtrack(InputError::new("abc", ErrorKind::Verify))));
+    /// assert_eq!(parser("abc123"), Ok(("123", HashSet::from(["abc"]))));
+    /// assert_eq!(parser("123123"), Ok(("123123", HashSet::from([]))));
+    /// assert_eq!(parser(""), Ok(("", HashSet::from([]))));
+    /// ```
+    #[inline(always)]
+    pub fn verify_fold<Init, Op, Result>(
+        mut self,
+        mut init: Init,
+        mut op: Op,
+    ) -> impl Parser<Input, Result, Error>
+    where
+        Init: FnMut() -> Result,
+        Op: FnMut(Result, Output) -> Option<Result>,
+    {
+        let Range {
+            start_inclusive,
+            end_inclusive,
+        } = self.occurrences;
+        trace("repeat_verify_fold", move |input: &mut Input| {
+            verify_fold_m_n(
+                start_inclusive,
+                end_inclusive.unwrap_or(usize::MAX),
+                &mut self.parser,
+                &mut init,
+                &mut op,
+                input,
+            )
+        })
+    }
+
+    /// Akin to [`Repeat::fold`], but for containers that can error when an element is accumulated.
+    ///
+    /// This stops before `n` when the parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
+    /// [`cut_err`][crate::combinator::cut_err]. Additionally, if the fold function returns an error, the parser will
+    /// stop and return it.
+    ///
+    /// # Arguments
+    /// * `init` A function returning the initial value.
+    /// * `op` The function that combines a result of `f` with
+    ///       the current accumulator.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Warning:** If the parser passed to `repeat` accepts empty inputs
+    /// (like `alpha0` or `digit0`), `try_fold` will return an error,
+    /// to prevent going into an infinite loop.
+    ///
+    /// </div>
+    ///
+    /// # Example
+    ///
+    /// Writing the output to a vector of bytes:
+    /// ```rust
+    /// # use winnow::error::IResult;
+    /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
+    /// # use winnow::prelude::*;
+    /// use winnow::combinator::repeat;
+    /// use std::io::Write;
+    /// use std::io::Error;
+    ///
+    /// fn parser(s: &str) -> IResult<&str, Vec<u8>> {
+    ///   repeat(
+    ///     0..,
+    ///     "abc"
+    ///   ).try_fold(
+    ///     Vec::new,
+    ///     |mut acc, item: &str| -> Result<_, Error> {
+    ///       acc.write(item.as_bytes())?;
+    ///       Ok(acc)
+    ///     }
+    ///   ).parse_peek(s)
+    /// }
+    ///
+    /// assert_eq!(parser("abc"), Ok(("", b"abc".to_vec())));
+    /// assert_eq!(parser("abc123"), Ok(("123", b"abc".to_vec())));
+    /// assert_eq!(parser("123123"), Ok(("123123", vec![])));
+    /// assert_eq!(parser(""), Ok(("", vec![])));
+    #[inline(always)]
+    pub fn try_fold<Init, Op, OpError, Result>(
+        mut self,
+        mut init: Init,
+        mut op: Op,
+    ) -> impl Parser<Input, Result, Error>
+    where
+        Init: FnMut() -> Result,
+        Op: FnMut(Result, Output) -> core::result::Result<Result, OpError>,
+        Error: FromExternalError<Input, OpError>,
+    {
+        let Range {
+            start_inclusive,
+            end_inclusive,
+        } = self.occurrences;
+        trace("repeat_try_fold", move |input: &mut Input| {
+            try_fold_m_n(
+                start_inclusive,
+                end_inclusive.unwrap_or(usize::MAX),
+                &mut self.parser,
+                &mut init,
+                &mut op,
+                input,
+            )
+        })
+    }
 }
 
 impl<P, I, O, C, E> Parser<I, C, E> for Repeat<P, I, O, C, E>
@@ -292,7 +448,7 @@
         let Range {
             start_inclusive,
             end_inclusive,
-        } = self.range;
+        } = self.occurrences;
         trace("repeat", move |i: &mut I| {
             match (start_inclusive, end_inclusive) {
                 (0, None) => repeat0_(&mut self.parser, i),
@@ -318,7 +474,7 @@
         let len = i.eof_offset();
         match f.parse_next(i) {
             Err(ErrMode::Backtrack(_)) => {
-                i.reset(start);
+                i.reset(&start);
                 return Ok(acc);
             }
             Err(e) => return Err(e),
@@ -341,8 +497,9 @@
     F: Parser<I, O, E>,
     E: ParserError<I>,
 {
+    let start = i.checkpoint();
     match f.parse_next(i) {
-        Err(e) => Err(e.append(i, ErrorKind::Many)),
+        Err(e) => Err(e.append(i, &start, ErrorKind::Many)),
         Ok(o) => {
             let mut acc = C::initial(None);
             acc.accumulate(o);
@@ -352,7 +509,7 @@
                 let len = i.eof_offset();
                 match f.parse_next(i) {
                     Err(ErrMode::Backtrack(_)) => {
-                        i.reset(start);
+                        i.reset(&start);
                         return Ok(acc);
                     }
                     Err(e) => return Err(e),
@@ -380,12 +537,19 @@
     let mut res = C::initial(Some(count));
 
     for _ in 0..count {
+        let start = i.checkpoint();
+        let len = i.eof_offset();
         match f.parse_next(i) {
             Ok(o) => {
+                // infinite loop check: the parser must always consume
+                if i.eof_offset() == len {
+                    return Err(ErrMode::assert(i, "`repeat` parsers must always consume"));
+                }
+
                 res.accumulate(o);
             }
             Err(e) => {
-                return Err(e.append(i, ErrorKind::Many));
+                return Err(e.append(i, &start, ErrorKind::Many));
             }
         }
     }
@@ -401,7 +565,10 @@
     E: ParserError<I>,
 {
     if min > max {
-        return Err(ErrMode::Cut(E::from_error_kind(input, ErrorKind::Many)));
+        return Err(ErrMode::assert(
+            input,
+            "range should be ascending, rather than descending",
+        ));
     }
 
     let mut res = C::initial(Some(min));
@@ -422,9 +589,9 @@
             }
             Err(ErrMode::Backtrack(e)) => {
                 if count < min {
-                    return Err(ErrMode::Backtrack(e.append(input, ErrorKind::Many)));
+                    return Err(ErrMode::Backtrack(e.append(input, &start, ErrorKind::Many)));
                 } else {
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(res);
                 }
             }
@@ -444,7 +611,13 @@
 ///
 /// `f` keeps going so long as `g` produces [`ErrMode::Backtrack`]. To instead chain an error up, see [`cut_err`][crate::combinator::cut_err].
 ///
-/// To recognize a series of tokens, [`Accumulate`] into a `()` and then [`Parser::recognize`].
+/// To take a series of tokens, [`Accumulate`] into a `()`
+/// (e.g. with [`.map(|((), _)| ())`][Parser::map])
+/// and then [`Parser::take`].
+///
+/// See also
+/// - [`take_till`][crate::token::take_till] for recognizing up-to a member of a [set of tokens][crate::stream::ContainsToken]
+/// - [`take_until`][crate::token::take_until] for recognizing up-to a [`literal`][crate::token::literal] (w/ optional simd optimizations)
 ///
 /// # Example
 ///
@@ -453,7 +626,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::repeat_till;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, (Vec<&str>, &str)> {
 ///   repeat_till(0.., "abc", "end").parse_peek(s)
@@ -467,44 +639,36 @@
 /// # }
 /// ```
 #[doc(alias = "many_till0")]
-pub fn repeat_till<I, O, C, P, E, F, G>(
-    range: impl Into<Range>,
-    mut f: F,
-    mut g: G,
-) -> impl Parser<I, (C, P), E>
+pub fn repeat_till<Input, Output, Accumulator, Terminator, Error, ParseNext, TerminatorParser>(
+    occurrences: impl Into<Range>,
+    mut parse: ParseNext,
+    mut terminator: TerminatorParser,
+) -> impl Parser<Input, (Accumulator, Terminator), Error>
 where
-    I: Stream,
-    C: Accumulate<O>,
-    F: Parser<I, O, E>,
-    G: Parser<I, P, E>,
-    E: ParserError<I>,
+    Input: Stream,
+    Accumulator: Accumulate<Output>,
+    ParseNext: Parser<Input, Output, Error>,
+    TerminatorParser: Parser<Input, Terminator, Error>,
+    Error: ParserError<Input>,
 {
     let Range {
         start_inclusive,
         end_inclusive,
-    } = range.into();
-    trace("repeat_till", move |i: &mut I| {
+    } = occurrences.into();
+    trace("repeat_till", move |i: &mut Input| {
         match (start_inclusive, end_inclusive) {
-            (0, None) => repeat_till0_(&mut f, &mut g, i),
-            (start, end) => repeat_till_m_n_(start, end.unwrap_or(usize::MAX), &mut f, &mut g, i),
+            (0, None) => repeat_till0_(&mut parse, &mut terminator, i),
+            (start, end) => repeat_till_m_n_(
+                start,
+                end.unwrap_or(usize::MAX),
+                &mut parse,
+                &mut terminator,
+                i,
+            ),
         }
     })
 }
 
-/// Deprecated, replaced with [`repeat_till`]
-#[deprecated(since = "0.5.35", note = "Replaced with `repeat_till`")]
-#[inline(always)]
-pub fn repeat_till0<I, O, C, P, E, F, G>(f: F, g: G) -> impl Parser<I, (C, P), E>
-where
-    I: Stream,
-    C: Accumulate<O>,
-    F: Parser<I, O, E>,
-    G: Parser<I, P, E>,
-    E: ParserError<I>,
-{
-    repeat_till(0.., f, g)
-}
-
 fn repeat_till0_<I, O, C, P, E, F, G>(f: &mut F, g: &mut G, i: &mut I) -> PResult<(C, P), E>
 where
     I: Stream,
@@ -520,9 +684,9 @@
         match g.parse_next(i) {
             Ok(o) => return Ok((res, o)),
             Err(ErrMode::Backtrack(_)) => {
-                i.reset(start);
+                i.reset(&start);
                 match f.parse_next(i) {
-                    Err(e) => return Err(e.append(i, ErrorKind::Many)),
+                    Err(e) => return Err(e.append(i, &start, ErrorKind::Many)),
                     Ok(o) => {
                         // infinite loop check: the parser must always consume
                         if i.eof_offset() == len {
@@ -553,17 +717,22 @@
     E: ParserError<I>,
 {
     if min > max {
-        return Err(ErrMode::Cut(E::from_error_kind(i, ErrorKind::Many)));
+        return Err(ErrMode::assert(
+            i,
+            "range should be ascending, rather than descending",
+        ));
     }
 
     let mut res = C::initial(Some(min));
+
+    let start = i.checkpoint();
     for _ in 0..min {
         match f.parse_next(i) {
             Ok(o) => {
                 res.accumulate(o);
             }
             Err(e) => {
-                return Err(e.append(i, ErrorKind::Many));
+                return Err(e.append(i, &start, ErrorKind::Many));
             }
         }
     }
@@ -576,10 +745,10 @@
                 if count == max {
                     return Err(ErrMode::Backtrack(err));
                 }
-                i.reset(start);
+                i.reset(&start);
                 match f.parse_next(i) {
                     Err(e) => {
-                        return Err(e.append(i, ErrorKind::Many));
+                        return Err(e.append(i, &start, ErrorKind::Many));
                     }
                     Ok(o) => {
                         // infinite loop check: the parser must always consume
@@ -602,15 +771,18 @@
 /// This stops when either parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
 /// [`cut_err`][crate::combinator::cut_err].
 ///
-/// # Arguments
-/// * `range` The minimum and maximum number of iterations.
-/// * `parser` The parser that parses the elements of the list.
-/// * `sep` The parser that parses the separator between list elements.
+/// To take a series of tokens, [`Accumulate`] into a `()`
+/// (e.g. with [`.map(|()| ())`][Parser::map])
+/// and then [`Parser::take`].
+///
+/// <div class="warning">
 ///
 /// **Warning:** If the separator parser accepts empty inputs
 /// (like `alpha0` or `digit0`), `separated` will return an error,
 /// to prevent going into an infinite loop.
 ///
+/// </div>
+///
 /// # Example
 ///
 /// Zero or more repetitions:
@@ -619,7 +791,6 @@
 /// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::separated;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   separated(0.., "abc", "|").parse_peek(s)
@@ -639,7 +810,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::separated;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   separated(1.., "abc", "|").parse_peek(s)
@@ -659,7 +829,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::separated;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   separated(2, "abc", "|").parse_peek(s)
@@ -679,7 +848,6 @@
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::separated;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
 ///   separated(0..=2, "abc", "|").parse_peek(s)
@@ -698,23 +866,23 @@
 #[doc(alias = "separated_list1")]
 #[doc(alias = "separated_m_n")]
 #[inline(always)]
-pub fn separated<I, O, C, O2, E, P, S>(
-    range: impl Into<Range>,
-    mut parser: P,
-    mut separator: S,
-) -> impl Parser<I, C, E>
+pub fn separated<Input, Output, Accumulator, Sep, Error, ParseNext, SepParser>(
+    occurrences: impl Into<Range>,
+    mut parser: ParseNext,
+    mut separator: SepParser,
+) -> impl Parser<Input, Accumulator, Error>
 where
-    I: Stream,
-    C: Accumulate<O>,
-    P: Parser<I, O, E>,
-    S: Parser<I, O2, E>,
-    E: ParserError<I>,
+    Input: Stream,
+    Accumulator: Accumulate<Output>,
+    ParseNext: Parser<Input, Output, Error>,
+    SepParser: Parser<Input, Sep, Error>,
+    Error: ParserError<Input>,
 {
     let Range {
         start_inclusive,
         end_inclusive,
-    } = range.into();
-    trace("separated", move |input: &mut I| {
+    } = occurrences.into();
+    trace("separated", move |input: &mut Input| {
         match (start_inclusive, end_inclusive) {
             (0, None) => separated0_(&mut parser, &mut separator, input),
             (1, None) => separated1_(&mut parser, &mut separator, input),
@@ -732,51 +900,6 @@
     })
 }
 
-/// [`Accumulate`] the output of a parser, interleaved with `sep`
-///
-/// This stops when either parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
-/// [`cut_err`][crate::combinator::cut_err].
-///
-/// # Arguments
-/// * `parser` Parses the elements of the list.
-/// * `sep` Parses the separator between list elements.
-///
-/// # Example
-///
-/// ```rust
-/// # #[cfg(feature = "std")] {
-/// # use winnow::{error::ErrMode, error::ErrorKind, error::Needed};
-/// # use winnow::prelude::*;
-/// use winnow::combinator::separated0;
-/// use winnow::token::tag;
-///
-/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
-///   separated0("abc", "|").parse_peek(s)
-/// }
-///
-/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
-/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
-/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
-/// assert_eq!(parser(""), Ok(("", vec![])));
-/// assert_eq!(parser("def|abc"), Ok(("def|abc", vec![])));
-/// # }
-/// ```
-#[doc(alias = "sep_by")]
-#[doc(alias = "separated_list0")]
-#[deprecated(since = "0.5.19", note = "Replaced with `combinator::separated`")]
-pub fn separated0<I, O, C, O2, E, P, S>(mut parser: P, mut sep: S) -> impl Parser<I, C, E>
-where
-    I: Stream,
-    C: Accumulate<O>,
-    P: Parser<I, O, E>,
-    S: Parser<I, O2, E>,
-    E: ParserError<I>,
-{
-    trace("separated0", move |i: &mut I| {
-        separated0_(&mut parser, &mut sep, i)
-    })
-}
-
 fn separated0_<I, O, C, O2, E, P, S>(
     parser: &mut P,
     separator: &mut S,
@@ -794,7 +917,7 @@
     let start = input.checkpoint();
     match parser.parse_next(input) {
         Err(ErrMode::Backtrack(_)) => {
-            input.reset(start);
+            input.reset(&start);
             return Ok(acc);
         }
         Err(e) => return Err(e),
@@ -808,7 +931,7 @@
         let len = input.eof_offset();
         match separator.parse_next(input) {
             Err(ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 return Ok(acc);
             }
             Err(e) => return Err(e),
@@ -823,7 +946,7 @@
 
                 match parser.parse_next(input) {
                     Err(ErrMode::Backtrack(_)) => {
-                        input.reset(start);
+                        input.reset(&start);
                         return Ok(acc);
                     }
                     Err(e) => return Err(e),
@@ -836,53 +959,6 @@
     }
 }
 
-/// [`Accumulate`] the output of a parser, interleaved with `sep`
-///
-/// Fails if the element parser does not produce at least one element.$
-///
-/// This stops when either parser returns [`ErrMode::Backtrack`]. To instead chain an error up, see
-/// [`cut_err`][crate::combinator::cut_err].
-///
-/// # Arguments
-/// * `sep` Parses the separator between list elements.
-/// * `f` Parses the elements of the list.
-///
-/// # Example
-///
-/// ```rust
-/// # #[cfg(feature = "std")] {
-/// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// # use winnow::prelude::*;
-/// use winnow::combinator::separated1;
-/// use winnow::token::tag;
-///
-/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
-///   separated1("abc", "|").parse_peek(s)
-/// }
-///
-/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
-/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
-/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
-/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
-/// assert_eq!(parser("def|abc"), Err(ErrMode::Backtrack(InputError::new("def|abc", ErrorKind::Tag))));
-/// # }
-/// ```
-#[doc(alias = "sep_by1")]
-#[doc(alias = "separated_list1")]
-#[deprecated(since = "0.5.19", note = "Replaced with `combinator::separated`")]
-pub fn separated1<I, O, C, O2, E, P, S>(mut parser: P, mut sep: S) -> impl Parser<I, C, E>
-where
-    I: Stream,
-    C: Accumulate<O>,
-    P: Parser<I, O, E>,
-    S: Parser<I, O2, E>,
-    E: ParserError<I>,
-{
-    trace("separated1", move |i: &mut I| {
-        separated1_(&mut parser, &mut sep, i)
-    })
-}
-
 fn separated1_<I, O, C, O2, E, P, S>(
     parser: &mut P,
     separator: &mut S,
@@ -910,7 +986,7 @@
         let len = input.eof_offset();
         match separator.parse_next(input) {
             Err(ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 return Ok(acc);
             }
             Err(e) => return Err(e),
@@ -925,7 +1001,7 @@
 
                 match parser.parse_next(input) {
                     Err(ErrMode::Backtrack(_)) => {
-                        input.reset(start);
+                        input.reset(&start);
                         return Ok(acc);
                     }
                     Err(e) => return Err(e),
@@ -957,9 +1033,10 @@
         return Ok(acc);
     }
 
+    let start = input.checkpoint();
     match parser.parse_next(input) {
         Err(e) => {
-            return Err(e.append(input, ErrorKind::Many));
+            return Err(e.append(input, &start, ErrorKind::Many));
         }
         Ok(o) => {
             acc.accumulate(o);
@@ -967,10 +1044,11 @@
     }
 
     for _ in 1..count {
+        let start = input.checkpoint();
         let len = input.eof_offset();
         match separator.parse_next(input) {
             Err(e) => {
-                return Err(e.append(input, ErrorKind::Many));
+                return Err(e.append(input, &start, ErrorKind::Many));
             }
             Ok(_) => {
                 // infinite loop check
@@ -983,7 +1061,7 @@
 
                 match parser.parse_next(input) {
                     Err(e) => {
-                        return Err(e.append(input, ErrorKind::Many));
+                        return Err(e.append(input, &start, ErrorKind::Many));
                     }
                     Ok(o) => {
                         acc.accumulate(o);
@@ -1011,7 +1089,10 @@
     E: ParserError<I>,
 {
     if min > max {
-        return Err(ErrMode::Cut(E::from_error_kind(input, ErrorKind::Many)));
+        return Err(ErrMode::assert(
+            input,
+            "range should be ascending, rather than descending",
+        ));
     }
 
     let mut acc = C::initial(Some(min));
@@ -1020,10 +1101,10 @@
     match parser.parse_next(input) {
         Err(ErrMode::Backtrack(e)) => {
             if min == 0 {
-                input.reset(start);
+                input.reset(&start);
                 return Ok(acc);
             } else {
-                return Err(ErrMode::Backtrack(e.append(input, ErrorKind::Many)));
+                return Err(ErrMode::Backtrack(e.append(input, &start, ErrorKind::Many)));
             }
         }
         Err(e) => return Err(e),
@@ -1038,9 +1119,9 @@
         match separator.parse_next(input) {
             Err(ErrMode::Backtrack(e)) => {
                 if index < min {
-                    return Err(ErrMode::Backtrack(e.append(input, ErrorKind::Many)));
+                    return Err(ErrMode::Backtrack(e.append(input, &start, ErrorKind::Many)));
                 } else {
-                    input.reset(start);
+                    input.reset(&start);
                     return Ok(acc);
                 }
             }
@@ -1059,9 +1140,13 @@
                 match parser.parse_next(input) {
                     Err(ErrMode::Backtrack(e)) => {
                         if index < min {
-                            return Err(ErrMode::Backtrack(e.append(input, ErrorKind::Many)));
+                            return Err(ErrMode::Backtrack(e.append(
+                                input,
+                                &start,
+                                ErrorKind::Many,
+                            )));
                         } else {
-                            input.reset(start);
+                            input.reset(&start);
                             return Ok(acc);
                         }
                     }
@@ -1097,22 +1182,22 @@
 /// }
 ///
 /// assert_eq!(parser("9-3-5"), Ok(("", 1)));
-/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Slice))));
-/// assert_eq!(parser("def|abc"), Err(ErrMode::Backtrack(InputError::new("def|abc", ErrorKind::Slice))));
+/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Token))));
+/// assert_eq!(parser("def|abc"), Err(ErrMode::Backtrack(InputError::new("def|abc", ErrorKind::Verify))));
 /// ```
-pub fn separated_foldl1<I, O, O2, E, P, S, Op>(
-    mut parser: P,
-    mut sep: S,
+pub fn separated_foldl1<Input, Output, Sep, Error, ParseNext, SepParser, Op>(
+    mut parser: ParseNext,
+    mut sep: SepParser,
     mut op: Op,
-) -> impl Parser<I, O, E>
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    P: Parser<I, O, E>,
-    S: Parser<I, O2, E>,
-    E: ParserError<I>,
-    Op: FnMut(O, O2, O) -> O,
+    Input: Stream,
+    ParseNext: Parser<Input, Output, Error>,
+    SepParser: Parser<Input, Sep, Error>,
+    Error: ParserError<Input>,
+    Op: FnMut(Output, Sep, Output) -> Output,
 {
-    trace("separated_foldl1", move |i: &mut I| {
+    trace("separated_foldl1", move |i: &mut Input| {
         let mut ol = parser.parse_next(i)?;
 
         loop {
@@ -1120,7 +1205,7 @@
             let len = i.eof_offset();
             match sep.parse_next(i) {
                 Err(ErrMode::Backtrack(_)) => {
-                    i.reset(start);
+                    i.reset(&start);
                     return Ok(ol);
                 }
                 Err(e) => return Err(e),
@@ -1132,7 +1217,7 @@
 
                     match parser.parse_next(i) {
                         Err(ErrMode::Backtrack(_)) => {
-                            i.reset(start);
+                            i.reset(&start);
                             return Ok(ol);
                         }
                         Err(e) => return Err(e),
@@ -1165,25 +1250,25 @@
 ///
 /// assert_eq!(parser("2^3^2"), Ok(("", 512)));
 /// assert_eq!(parser("2"), Ok(("", 2)));
-/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Slice))));
-/// assert_eq!(parser("def|abc"), Err(ErrMode::Backtrack(InputError::new("def|abc", ErrorKind::Slice))));
+/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Token))));
+/// assert_eq!(parser("def|abc"), Err(ErrMode::Backtrack(InputError::new("def|abc", ErrorKind::Verify))));
 /// ```
 #[cfg(feature = "alloc")]
-pub fn separated_foldr1<I, O, O2, E, P, S, Op>(
-    mut parser: P,
-    mut sep: S,
+pub fn separated_foldr1<Input, Output, Sep, Error, ParseNext, SepParser, Op>(
+    mut parser: ParseNext,
+    mut sep: SepParser,
     mut op: Op,
-) -> impl Parser<I, O, E>
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    P: Parser<I, O, E>,
-    S: Parser<I, O2, E>,
-    E: ParserError<I>,
-    Op: FnMut(O, O2, O) -> O,
+    Input: Stream,
+    ParseNext: Parser<Input, Output, Error>,
+    SepParser: Parser<Input, Sep, Error>,
+    Error: ParserError<Input>,
+    Op: FnMut(Output, Sep, Output) -> Output,
 {
-    trace("separated_foldr1", move |i: &mut I| {
+    trace("separated_foldr1", move |i: &mut Input| {
         let ol = parser.parse_next(i)?;
-        let all: crate::lib::std::vec::Vec<(O2, O)> =
+        let all: crate::lib::std::vec::Vec<(Sep, Output)> =
             repeat(0.., (sep.by_ref(), parser.by_ref())).parse_next(i)?;
         if let Some((s, or)) = all
             .into_iter()
@@ -1202,17 +1287,12 @@
 ///
 /// This parser fails if the input runs out before the given slice is full.
 ///
-/// # Arguments
-/// * `f` The parser to apply.
-/// * `buf` The slice to fill
-///
 /// # Example
 ///
 /// ```rust
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
 /// use winnow::combinator::fill;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: &str) -> IResult<&str, [&str; 2]> {
 ///   let mut buf = ["", ""];
@@ -1226,20 +1306,24 @@
 /// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// assert_eq!(parser("abcabcabc"), Ok(("abc", ["abc", "abc"])));
 /// ```
-pub fn fill<'a, I, O, E, F>(mut f: F, buf: &'a mut [O]) -> impl Parser<I, (), E> + 'a
+pub fn fill<'i, Input, Output, Error, ParseNext>(
+    mut parser: ParseNext,
+    buf: &'i mut [Output],
+) -> impl Parser<Input, (), Error> + 'i
 where
-    I: Stream + 'a,
-    F: Parser<I, O, E> + 'a,
-    E: ParserError<I> + 'a,
+    Input: Stream + 'i,
+    ParseNext: Parser<Input, Output, Error> + 'i,
+    Error: ParserError<Input> + 'i,
 {
-    trace("fill", move |i: &mut I| {
+    trace("fill", move |i: &mut Input| {
         for elem in buf.iter_mut() {
-            match f.parse_next(i) {
+            let start = i.checkpoint();
+            match parser.parse_next(i) {
                 Ok(o) => {
                     *elem = o;
                 }
                 Err(e) => {
-                    return Err(e.append(i, ErrorKind::Many));
+                    return Err(e.append(i, &start, ErrorKind::Many));
                 }
             }
         }
@@ -1248,25 +1332,6 @@
     })
 }
 
-/// Deprecated, replaced with [`Repeat::fold`]
-#[deprecated(since = "0.5.36", note = "Replaced with `repeat(...).fold(...)`")]
-#[inline(always)]
-pub fn fold_repeat<I, O, E, F, G, H, R>(
-    range: impl Into<Range>,
-    f: F,
-    init: H,
-    g: G,
-) -> impl Parser<I, R, E>
-where
-    I: Stream,
-    F: Parser<I, O, E>,
-    G: FnMut(R, O) -> R,
-    H: FnMut() -> R,
-    E: ParserError<I>,
-{
-    repeat(range, f).fold(init, g)
-}
-
 fn fold_repeat0_<I, O, E, F, G, H, R>(
     f: &mut F,
     init: &mut H,
@@ -1298,7 +1363,7 @@
                 res = g(res, o);
             }
             Err(ErrMode::Backtrack(_)) => {
-                input.reset(start);
+                input.reset(&start);
                 return Ok(res);
             }
             Err(e) => {
@@ -1333,7 +1398,7 @@
                 let len = input.eof_offset();
                 match f.parse_next(input) {
                     Err(ErrMode::Backtrack(_)) => {
-                        input.reset(start);
+                        input.reset(&start);
                         break;
                     }
                     Err(e) => return Err(e),
@@ -1372,7 +1437,10 @@
     E: ParserError<I>,
 {
     if min > max {
-        return Err(ErrMode::Cut(E::from_error_kind(input, ErrorKind::Many)));
+        return Err(ErrMode::assert(
+            input,
+            "range should be ascending, rather than descending",
+        ));
     }
 
     let mut acc = init();
@@ -1394,9 +1462,145 @@
             //FInputXMError: handle failure properly
             Err(ErrMode::Backtrack(err)) => {
                 if count < min {
-                    return Err(ErrMode::Backtrack(err.append(input, ErrorKind::Many)));
+                    return Err(ErrMode::Backtrack(err.append(
+                        input,
+                        &start,
+                        ErrorKind::Many,
+                    )));
                 } else {
-                    input.reset(start);
+                    input.reset(&start);
+                    break;
+                }
+            }
+            Err(e) => return Err(e),
+        }
+    }
+
+    Ok(acc)
+}
+
+#[inline(always)]
+fn verify_fold_m_n<I, O, E, F, G, H, R>(
+    min: usize,
+    max: usize,
+    parse: &mut F,
+    init: &mut H,
+    fold: &mut G,
+    input: &mut I,
+) -> PResult<R, E>
+where
+    I: Stream,
+    F: Parser<I, O, E>,
+    G: FnMut(R, O) -> Option<R>,
+    H: FnMut() -> R,
+    E: ParserError<I>,
+{
+    if min > max {
+        return Err(ErrMode::assert(
+            input,
+            "range should be ascending, rather than descending",
+        ));
+    }
+
+    let mut acc = init();
+    for count in 0..max {
+        let start = input.checkpoint();
+        let len = input.eof_offset();
+        match parse.parse_next(input) {
+            Ok(value) => {
+                // infinite loop check: the parser must always consume
+                if input.eof_offset() == len {
+                    return Err(ErrMode::assert(
+                        input,
+                        "`repeat` parsers must always consume",
+                    ));
+                }
+
+                let Some(tmp) = fold(acc, value) else {
+                    input.reset(&start);
+                    let res = Err(ErrMode::from_error_kind(input, ErrorKind::Verify));
+                    super::debug::trace_result("verify_fold", &res);
+                    return res;
+                };
+                acc = tmp;
+            }
+            //FInputXMError: handle failure properly
+            Err(ErrMode::Backtrack(err)) => {
+                if count < min {
+                    return Err(ErrMode::Backtrack(err.append(
+                        input,
+                        &start,
+                        ErrorKind::Many,
+                    )));
+                } else {
+                    input.reset(&start);
+                    break;
+                }
+            }
+            Err(e) => return Err(e),
+        }
+    }
+
+    Ok(acc)
+}
+
+#[inline(always)]
+fn try_fold_m_n<I, O, E, F, G, H, R, GE>(
+    min: usize,
+    max: usize,
+    parse: &mut F,
+    init: &mut H,
+    fold: &mut G,
+    input: &mut I,
+) -> PResult<R, E>
+where
+    I: Stream,
+    F: Parser<I, O, E>,
+    G: FnMut(R, O) -> Result<R, GE>,
+    H: FnMut() -> R,
+    E: ParserError<I> + FromExternalError<I, GE>,
+{
+    if min > max {
+        return Err(ErrMode::assert(
+            input,
+            "range should be ascending, rather than descending",
+        ));
+    }
+
+    let mut acc = init();
+    for count in 0..max {
+        let start = input.checkpoint();
+        let len = input.eof_offset();
+        match parse.parse_next(input) {
+            Ok(value) => {
+                // infinite loop check: the parser must always consume
+                if input.eof_offset() == len {
+                    return Err(ErrMode::assert(
+                        input,
+                        "`repeat` parsers must always consume",
+                    ));
+                }
+
+                match fold(acc, value) {
+                    Ok(tmp) => acc = tmp,
+                    Err(e) => {
+                        input.reset(&start);
+                        let res = Err(ErrMode::from_external_error(input, ErrorKind::Verify, e));
+                        super::debug::trace_result("try_fold", &res);
+                        return res;
+                    }
+                }
+            }
+            //FInputXMError: handle failure properly
+            Err(ErrMode::Backtrack(err)) => {
+                if count < min {
+                    return Err(ErrMode::Backtrack(err.append(
+                        input,
+                        &start,
+                        ErrorKind::Many,
+                    )));
+                } else {
+                    input.reset(&start);
                     break;
                 }
             }

crates/winnow/src/combinator/parser.rs

diff --git a/crates/winnow/src/combinator/parser.rs b/crates/winnow/src/combinator/parser.rs
deleted file mode 100644
index 9ffdb3c..0000000
--- a/crates/winnow/src/combinator/parser.rs
+++ /dev/null
@@ -1,1097 +0,0 @@
-use crate::combinator::trace;
-use crate::combinator::trace_result;
-#[cfg(feature = "unstable-recover")]
-use crate::error::FromRecoverableError;
-use crate::error::{AddContext, ErrMode, ErrorKind, FromExternalError, ParserError};
-use crate::lib::std::borrow::Borrow;
-use crate::lib::std::ops::Range;
-#[cfg(feature = "unstable-recover")]
-use crate::stream::Recover;
-use crate::stream::StreamIsPartial;
-use crate::stream::{Location, Stream};
-use crate::*;
-
-/// Implementation of [`Parser::by_ref`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct ByRef<'p, P> {
-    p: &'p mut P,
-}
-
-impl<'p, P> ByRef<'p, P> {
-    #[inline(always)]
-    pub(crate) fn new(p: &'p mut P) -> Self {
-        Self { p }
-    }
-}
-
-impl<'p, I, O, E, P> Parser<I, O, E> for ByRef<'p, P>
-where
-    P: Parser<I, O, E>,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
-        self.p.parse_next(i)
-    }
-}
-
-/// Implementation of [`Parser::map`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Map<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> O2,
-{
-    parser: F,
-    map: G,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, G, I, O, O2, E> Map<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> O2,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, map: G) -> Self {
-        Self {
-            parser,
-            map,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, G, I, O, O2, E> Parser<I, O2, E> for Map<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> O2,
-{
-    #[inline]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
-        match self.parser.parse_next(i) {
-            Err(e) => Err(e),
-            Ok(o) => Ok((self.map)(o)),
-        }
-    }
-}
-
-/// Implementation of [`Parser::try_map`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct TryMap<F, G, I, O, O2, E, E2>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Result<O2, E2>,
-    I: Stream,
-    E: FromExternalError<I, E2>,
-{
-    parser: F,
-    map: G,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-    e2: core::marker::PhantomData<E2>,
-}
-
-impl<F, G, I, O, O2, E, E2> TryMap<F, G, I, O, O2, E, E2>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Result<O2, E2>,
-    I: Stream,
-    E: FromExternalError<I, E2>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, map: G) -> Self {
-        Self {
-            parser,
-            map,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-            e2: Default::default(),
-        }
-    }
-}
-
-impl<F, G, I, O, O2, E, E2> Parser<I, O2, E> for TryMap<F, G, I, O, O2, E, E2>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Result<O2, E2>,
-    I: Stream,
-    E: FromExternalError<I, E2>,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
-        let start = input.checkpoint();
-        let o = self.parser.parse_next(input)?;
-        let res = (self.map)(o).map_err(|err| {
-            input.reset(start);
-            ErrMode::from_external_error(input, ErrorKind::Verify, err)
-        });
-        trace_result("verify", &res);
-        res
-    }
-}
-
-/// Implementation of [`Parser::verify_map`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct VerifyMap<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Option<O2>,
-    I: Stream,
-    E: ParserError<I>,
-{
-    parser: F,
-    map: G,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, G, I, O, O2, E> VerifyMap<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Option<O2>,
-    I: Stream,
-    E: ParserError<I>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, map: G) -> Self {
-        Self {
-            parser,
-            map,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, G, I, O, O2, E> Parser<I, O2, E> for VerifyMap<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> Option<O2>,
-    I: Stream,
-    E: ParserError<I>,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
-        let start = input.checkpoint();
-        let o = self.parser.parse_next(input)?;
-        let res = (self.map)(o).ok_or_else(|| {
-            input.reset(start);
-            ErrMode::from_error_kind(input, ErrorKind::Verify)
-        });
-        trace_result("verify", &res);
-        res
-    }
-}
-
-/// Implementation of [`Parser::and_then`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct AndThen<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: Parser<O, O2, E>,
-    O: StreamIsPartial,
-    I: Stream,
-{
-    outer: F,
-    inner: G,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, G, I, O, O2, E> AndThen<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: Parser<O, O2, E>,
-    O: StreamIsPartial,
-    I: Stream,
-{
-    #[inline(always)]
-    pub(crate) fn new(outer: F, inner: G) -> Self {
-        Self {
-            outer,
-            inner,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, G, I, O, O2, E> Parser<I, O2, E> for AndThen<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: Parser<O, O2, E>,
-    O: StreamIsPartial,
-    I: Stream,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
-        let start = i.checkpoint();
-        let mut o = self.outer.parse_next(i)?;
-        let _ = o.complete();
-        let o2 = self.inner.parse_next(&mut o).map_err(|err| {
-            i.reset(start);
-            err
-        })?;
-        Ok(o2)
-    }
-}
-
-/// Implementation of [`Parser::parse_to`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct ParseTo<P, I, O, O2, E>
-where
-    P: Parser<I, O, E>,
-    I: Stream,
-    O: crate::stream::ParseSlice<O2>,
-    E: ParserError<I>,
-{
-    p: P,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<P, I, O, O2, E> ParseTo<P, I, O, O2, E>
-where
-    P: Parser<I, O, E>,
-    I: Stream,
-    O: crate::stream::ParseSlice<O2>,
-    E: ParserError<I>,
-{
-    #[inline(always)]
-    pub(crate) fn new(p: P) -> Self {
-        Self {
-            p,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<P, I, O, O2, E> Parser<I, O2, E> for ParseTo<P, I, O, O2, E>
-where
-    P: Parser<I, O, E>,
-    I: Stream,
-    O: crate::stream::ParseSlice<O2>,
-    E: ParserError<I>,
-{
-    #[inline]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
-        let start = i.checkpoint();
-        let o = self.p.parse_next(i)?;
-        let res = o.parse_slice().ok_or_else(|| {
-            i.reset(start);
-            ErrMode::from_error_kind(i, ErrorKind::Verify)
-        });
-        trace_result("verify", &res);
-        res
-    }
-}
-
-/// Implementation of [`Parser::flat_map`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct FlatMap<F, G, H, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> H,
-    H: Parser<I, O2, E>,
-{
-    f: F,
-    g: G,
-    h: core::marker::PhantomData<H>,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, G, H, I, O, O2, E> FlatMap<F, G, H, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> H,
-    H: Parser<I, O2, E>,
-{
-    #[inline(always)]
-    pub(crate) fn new(f: F, g: G) -> Self {
-        Self {
-            f,
-            g,
-            h: Default::default(),
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, G, H, I, O, O2, E> Parser<I, O2, E> for FlatMap<F, G, H, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(O) -> H,
-    H: Parser<I, O2, E>,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
-        let o = self.f.parse_next(i)?;
-        (self.g)(o).parse_next(i)
-    }
-}
-
-/// Implementation of [`Parser::complete_err`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct CompleteErr<F> {
-    f: F,
-}
-
-impl<F> CompleteErr<F> {
-    #[inline(always)]
-    pub(crate) fn new(f: F) -> Self {
-        Self { f }
-    }
-}
-
-impl<F, I, O, E> Parser<I, O, E> for CompleteErr<F>
-where
-    I: Stream,
-    F: Parser<I, O, E>,
-    E: ParserError<I>,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O, E> {
-        trace("complete_err", |input: &mut I| {
-            match (self.f).parse_next(input) {
-                Err(ErrMode::Incomplete(_)) => {
-                    Err(ErrMode::from_error_kind(input, ErrorKind::Complete))
-                }
-                rest => rest,
-            }
-        })
-        .parse_next(input)
-    }
-}
-
-/// Implementation of [`Parser::verify`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Verify<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(&O2) -> bool,
-    I: Stream,
-    O: Borrow<O2>,
-    O2: ?Sized,
-    E: ParserError<I>,
-{
-    parser: F,
-    filter: G,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, G, I, O, O2, E> Verify<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(&O2) -> bool,
-    I: Stream,
-    O: Borrow<O2>,
-    O2: ?Sized,
-    E: ParserError<I>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, filter: G) -> Self {
-        Self {
-            parser,
-            filter,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, G, I, O, O2, E> Parser<I, O, E> for Verify<F, G, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    G: FnMut(&O2) -> bool,
-    I: Stream,
-    O: Borrow<O2>,
-    O2: ?Sized,
-    E: ParserError<I>,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O, E> {
-        let start = input.checkpoint();
-        let o = self.parser.parse_next(input)?;
-        let res = (self.filter)(o.borrow()).then_some(o).ok_or_else(|| {
-            input.reset(start);
-            ErrMode::from_error_kind(input, ErrorKind::Verify)
-        });
-        trace_result("verify", &res);
-        res
-    }
-}
-
-/// Implementation of [`Parser::value`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Value<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: Clone,
-{
-    parser: F,
-    val: O2,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, O2, E> Value<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: Clone,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, val: O2) -> Self {
-        Self {
-            parser,
-            val,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, O2, E> Parser<I, O2, E> for Value<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: Clone,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
-        (self.parser).parse_next(input).map(|_| self.val.clone())
-    }
-}
-
-/// Implementation of [`Parser::default_value`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct DefaultValue<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: core::default::Default,
-{
-    parser: F,
-    o2: core::marker::PhantomData<O2>,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, O2, E> DefaultValue<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: core::default::Default,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            o2: Default::default(),
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, O2, E> Parser<I, O2, E> for DefaultValue<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O2: core::default::Default,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<O2, E> {
-        (self.parser).parse_next(input).map(|_| O2::default())
-    }
-}
-
-/// Implementation of [`Parser::void`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Void<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E> Void<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, E> Parser<I, (), E> for Void<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, input: &mut I) -> PResult<(), E> {
-        (self.parser).parse_next(input).map(|_| ())
-    }
-}
-
-/// Implementation of [`Parser::recognize`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Recognize<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E> Recognize<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<I, O, E, F> Parser<I, <I as Stream>::Slice, E> for Recognize<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        let checkpoint = input.checkpoint();
-        match (self.parser).parse_next(input) {
-            Ok(_) => {
-                let offset = input.offset_from(&checkpoint);
-                input.reset(checkpoint);
-                let recognized = input.next_slice(offset);
-                Ok(recognized)
-            }
-            Err(e) => Err(e),
-        }
-    }
-}
-
-/// Implementation of [`Parser::with_recognized`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct WithRecognized<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E> WithRecognized<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, E> Parser<I, (O, <I as Stream>::Slice), E> for WithRecognized<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<(O, <I as Stream>::Slice), E> {
-        let checkpoint = input.checkpoint();
-        match (self.parser).parse_next(input) {
-            Ok(result) => {
-                let offset = input.offset_from(&checkpoint);
-                input.reset(checkpoint);
-                let recognized = input.next_slice(offset);
-                Ok((result, recognized))
-            }
-            Err(e) => Err(e),
-        }
-    }
-}
-
-/// Implementation of [`Parser::span`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Span<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E> Span<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<I, O, E, F> Parser<I, Range<usize>, E> for Span<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<Range<usize>, E> {
-        let start = input.location();
-        self.parser.parse_next(input).map(move |_| {
-            let end = input.location();
-            start..end
-        })
-    }
-}
-
-/// Implementation of [`Parser::with_span`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct WithSpan<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E> WithSpan<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, E> Parser<I, (O, Range<usize>), E> for WithSpan<F, I, O, E>
-where
-    F: Parser<I, O, E>,
-    I: Stream + Location,
-{
-    #[inline]
-    fn parse_next(&mut self, input: &mut I) -> PResult<(O, Range<usize>), E> {
-        let start = input.location();
-        self.parser.parse_next(input).map(move |output| {
-            let end = input.location();
-            (output, (start..end))
-        })
-    }
-}
-
-/// Implementation of [`Parser::output_into`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct OutputInto<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O: Into<O2>,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    o2: core::marker::PhantomData<O2>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, O2, E> OutputInto<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O: Into<O2>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            o2: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, O2, E> Parser<I, O2, E> for OutputInto<F, I, O, O2, E>
-where
-    F: Parser<I, O, E>,
-    O: Into<O2>,
-{
-    #[inline]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O2, E> {
-        self.parser.parse_next(i).map(|o| o.into())
-    }
-}
-
-/// Implementation of [`Parser::err_into`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct ErrInto<F, I, O, E, E2>
-where
-    F: Parser<I, O, E>,
-    E: Into<E2>,
-{
-    parser: F,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-    e2: core::marker::PhantomData<E2>,
-}
-
-impl<F, I, O, E, E2> ErrInto<F, I, O, E, E2>
-where
-    F: Parser<I, O, E>,
-    E: Into<E2>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F) -> Self {
-        Self {
-            parser,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-            e2: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, E, E2> Parser<I, O, E2> for ErrInto<F, I, O, E, E2>
-where
-    F: Parser<I, O, E>,
-    E: Into<E2>,
-{
-    #[inline]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O, E2> {
-        match self.parser.parse_next(i) {
-            Ok(ok) => Ok(ok),
-            Err(ErrMode::Backtrack(e)) => Err(ErrMode::Backtrack(e.into())),
-            Err(ErrMode::Cut(e)) => Err(ErrMode::Cut(e.into())),
-            Err(ErrMode::Incomplete(e)) => Err(ErrMode::Incomplete(e)),
-        }
-    }
-}
-
-/// Implementation of [`Parser::context`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct Context<F, I, O, E, C>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-    E: AddContext<I, C>,
-    C: Clone + crate::lib::std::fmt::Debug,
-{
-    parser: F,
-    context: C,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-impl<F, I, O, E, C> Context<F, I, O, E, C>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-    E: AddContext<I, C>,
-    C: Clone + crate::lib::std::fmt::Debug,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: F, context: C) -> Self {
-        Self {
-            parser,
-            context,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-impl<F, I, O, E, C> Parser<I, O, E> for Context<F, I, O, E, C>
-where
-    F: Parser<I, O, E>,
-    I: Stream,
-    E: AddContext<I, C>,
-    C: Clone + crate::lib::std::fmt::Debug,
-{
-    #[inline]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
-        #[cfg(feature = "debug")]
-        let name = format!("context={:?}", self.context);
-        #[cfg(not(feature = "debug"))]
-        let name = "context";
-        trace(name, move |i: &mut I| {
-            (self.parser)
-                .parse_next(i)
-                .map_err(|err| err.add_context(i, self.context.clone()))
-        })
-        .parse_next(i)
-    }
-}
-
-/// Implementation of [`Parser::retry_after`]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-#[cfg(feature = "unstable-recover")]
-pub struct RetryAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    parser: P,
-    recover: R,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-#[cfg(feature = "unstable-recover")]
-impl<P, R, I, O, E> RetryAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: P, recover: R) -> Self {
-        Self {
-            parser,
-            recover,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-#[cfg(feature = "unstable-recover")]
-impl<P, R, I, O, E> Parser<I, O, E> for RetryAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
-        if I::is_recovery_supported() {
-            retry_after_inner(&mut self.parser, &mut self.recover, i)
-        } else {
-            self.parser.parse_next(i)
-        }
-    }
-}
-
-#[cfg(feature = "unstable-recover")]
-fn retry_after_inner<P, R, I, O, E>(parser: &mut P, recover: &mut R, i: &mut I) -> PResult<O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    loop {
-        let token_start = i.checkpoint();
-        let mut err = match parser.parse_next(i) {
-            Ok(o) => {
-                return Ok(o);
-            }
-            Err(ErrMode::Incomplete(e)) => return Err(ErrMode::Incomplete(e)),
-            Err(err) => err,
-        };
-        let err_start = i.checkpoint();
-        let err_start_eof_offset = i.eof_offset();
-        if recover.parse_next(i).is_ok() {
-            let i_eof_offset = i.eof_offset();
-            if err_start_eof_offset == i_eof_offset {
-                // Didn't advance so bubble the error up
-            } else if let Err(err_) = i.record_err(&token_start, &err_start, err) {
-                err = err_;
-            } else {
-                continue;
-            }
-        }
-
-        i.reset(err_start.clone());
-        err = err.map(|err| E::from_recoverable_error(&token_start, &err_start, i, err));
-        return Err(err);
-    }
-}
-
-/// Implementation of [`Parser::resume_after`]
-#[cfg(feature = "unstable-recover")]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
-pub struct ResumeAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    parser: P,
-    recover: R,
-    i: core::marker::PhantomData<I>,
-    o: core::marker::PhantomData<O>,
-    e: core::marker::PhantomData<E>,
-}
-
-#[cfg(feature = "unstable-recover")]
-impl<P, R, I, O, E> ResumeAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    #[inline(always)]
-    pub(crate) fn new(parser: P, recover: R) -> Self {
-        Self {
-            parser,
-            recover,
-            i: Default::default(),
-            o: Default::default(),
-            e: Default::default(),
-        }
-    }
-}
-
-#[cfg(feature = "unstable-recover")]
-impl<P, R, I, O, E> Parser<I, Option<O>, E> for ResumeAfter<P, R, I, O, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<Option<O>, E> {
-        if I::is_recovery_supported() {
-            resume_after_inner(&mut self.parser, &mut self.recover, i)
-        } else {
-            self.parser.parse_next(i).map(Some)
-        }
-    }
-}
-
-#[cfg(feature = "unstable-recover")]
-fn resume_after_inner<P, R, I, O, E>(
-    parser: &mut P,
-    recover: &mut R,
-    i: &mut I,
-) -> PResult<Option<O>, E>
-where
-    P: Parser<I, O, E>,
-    R: Parser<I, (), E>,
-    I: Stream,
-    I: Recover<E>,
-    E: FromRecoverableError<I, E>,
-{
-    let token_start = i.checkpoint();
-    let mut err = match parser.parse_next(i) {
-        Ok(o) => {
-            return Ok(Some(o));
-        }
-        Err(ErrMode::Incomplete(e)) => return Err(ErrMode::Incomplete(e)),
-        Err(err) => err,
-    };
-    let err_start = i.checkpoint();
-    if recover.parse_next(i).is_ok() {
-        if let Err(err_) = i.record_err(&token_start, &err_start, err) {
-            err = err_;
-        } else {
-            return Ok(None);
-        }
-    }
-
-    i.reset(err_start.clone());
-    err = err.map(|err| E::from_recoverable_error(&token_start, &err_start, i, err));
-    Err(err)
-}

crates/winnow/src/combinator/sequence.rs

diff --git a/crates/winnow/src/combinator/sequence.rs b/crates/winnow/src/combinator/sequence.rs
index 0f2e633..b3b2711 100644
--- a/crates/winnow/src/combinator/sequence.rs
+++ b/crates/winnow/src/combinator/sequence.rs
@@ -8,10 +8,6 @@
 
 /// Sequence two parsers, only returning the output from the second.
 ///
-/// # Arguments
-/// * `first` The opening parser.
-/// * `second` The second parser to get object.
-///
 /// See also [`seq`] to generalize this across any number of fields.
 ///
 /// # Example
@@ -21,7 +17,6 @@
 /// # use winnow::prelude::*;
 /// # use winnow::error::Needed::Size;
 /// use winnow::combinator::preceded;
-/// use winnow::token::tag;
 ///
 /// let mut parser = preceded("abc", "efg");
 ///
@@ -31,27 +26,24 @@
 /// assert_eq!(parser.parse_peek("123"), Err(ErrMode::Backtrack(InputError::new("123", ErrorKind::Tag))));
 /// ```
 #[doc(alias = "ignore_then")]
-pub fn preceded<I, O1, O2, E: ParserError<I>, F, G>(
-    mut first: F,
-    mut second: G,
-) -> impl Parser<I, O2, E>
+pub fn preceded<Input, Ignored, Output, Error, IgnoredParser, ParseNext>(
+    mut ignored: IgnoredParser,
+    mut parser: ParseNext,
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    F: Parser<I, O1, E>,
-    G: Parser<I, O2, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    IgnoredParser: Parser<Input, Ignored, Error>,
+    ParseNext: Parser<Input, Output, Error>,
 {
-    trace("preceded", move |input: &mut I| {
-        let _ = first.parse_next(input)?;
-        second.parse_next(input)
+    trace("preceded", move |input: &mut Input| {
+        let _ = ignored.parse_next(input)?;
+        parser.parse_next(input)
     })
 }
 
 /// Sequence two parsers, only returning the output of the first.
 ///
-/// # Arguments
-/// * `first` The first parser to apply.
-/// * `second` The second parser to match an object.
-///
 /// See also [`seq`] to generalize this across any number of fields.
 ///
 /// # Example
@@ -61,7 +53,6 @@
 /// # use winnow::prelude::*;
 /// # use winnow::error::Needed::Size;
 /// use winnow::combinator::terminated;
-/// use winnow::token::tag;
 ///
 /// let mut parser = terminated("abc", "efg");
 ///
@@ -71,28 +62,24 @@
 /// assert_eq!(parser.parse_peek("123"), Err(ErrMode::Backtrack(InputError::new("123", ErrorKind::Tag))));
 /// ```
 #[doc(alias = "then_ignore")]
-pub fn terminated<I, O1, O2, E: ParserError<I>, F, G>(
-    mut first: F,
-    mut second: G,
-) -> impl Parser<I, O1, E>
+pub fn terminated<Input, Output, Ignored, Error, ParseNext, IgnoredParser>(
+    mut parser: ParseNext,
+    mut ignored: IgnoredParser,
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    F: Parser<I, O1, E>,
-    G: Parser<I, O2, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    ParseNext: Parser<Input, Output, Error>,
+    IgnoredParser: Parser<Input, Ignored, Error>,
 {
-    trace("terminated", move |input: &mut I| {
-        let o1 = first.parse_next(input)?;
-        second.parse_next(input).map(|_| o1)
+    trace("terminated", move |input: &mut Input| {
+        let o = parser.parse_next(input)?;
+        ignored.parse_next(input).map(|_| o)
     })
 }
 
 /// Sequence three parsers, only returning the values of the first and third.
 ///
-/// # Arguments
-/// * `first` The first parser to apply.
-/// * `sep` The separator parser to apply.
-/// * `second` The second parser to apply.
-///
 /// See also [`seq`] to generalize this across any number of fields.
 ///
 /// # Example
@@ -102,7 +89,6 @@
 /// # use winnow::error::Needed::Size;
 /// # use winnow::prelude::*;
 /// use winnow::combinator::separated_pair;
-/// use winnow::token::tag;
 ///
 /// let mut parser = separated_pair("abc", "|", "efg");
 ///
@@ -111,18 +97,19 @@
 /// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// assert_eq!(parser.parse_peek("123"), Err(ErrMode::Backtrack(InputError::new("123", ErrorKind::Tag))));
 /// ```
-pub fn separated_pair<I, O1, O2, O3, E: ParserError<I>, F, G, H>(
-    mut first: F,
-    mut sep: G,
-    mut second: H,
-) -> impl Parser<I, (O1, O3), E>
+pub fn separated_pair<Input, O1, Sep, O2, Error, P1, SepParser, P2>(
+    mut first: P1,
+    mut sep: SepParser,
+    mut second: P2,
+) -> impl Parser<Input, (O1, O2), Error>
 where
-    I: Stream,
-    F: Parser<I, O1, E>,
-    G: Parser<I, O2, E>,
-    H: Parser<I, O3, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    P1: Parser<Input, O1, Error>,
+    SepParser: Parser<Input, Sep, Error>,
+    P2: Parser<Input, O2, Error>,
 {
-    trace("separated_pair", move |input: &mut I| {
+    trace("separated_pair", move |input: &mut Input| {
         let o1 = first.parse_next(input)?;
         let _ = sep.parse_next(input)?;
         second.parse_next(input).map(|o2| (o1, o2))
@@ -131,11 +118,6 @@
 
 /// Sequence three parsers, only returning the output of the second.
 ///
-/// # Arguments
-/// * `first` The first parser to apply and discard.
-/// * `second` The second parser to apply.
-/// * `third` The third parser to apply and discard.
-///
 /// See also [`seq`] to generalize this across any number of fields.
 ///
 /// # Example
@@ -145,7 +127,6 @@
 /// # use winnow::error::Needed::Size;
 /// # use winnow::prelude::*;
 /// use winnow::combinator::delimited;
-/// use winnow::token::tag;
 ///
 /// let mut parser = delimited("(", "abc", ")");
 ///
@@ -156,20 +137,30 @@
 /// ```
 #[doc(alias = "between")]
 #[doc(alias = "padded")]
-pub fn delimited<I, O1, O2, O3, E: ParserError<I>, F, G, H>(
-    mut first: F,
-    mut second: G,
-    mut third: H,
-) -> impl Parser<I, O2, E>
+pub fn delimited<
+    Input,
+    Ignored1,
+    Output,
+    Ignored2,
+    Error,
+    IgnoredParser1,
+    ParseNext,
+    IgnoredParser2,
+>(
+    mut ignored1: IgnoredParser1,
+    mut parser: ParseNext,
+    mut ignored2: IgnoredParser2,
+) -> impl Parser<Input, Output, Error>
 where
-    I: Stream,
-    F: Parser<I, O1, E>,
-    G: Parser<I, O2, E>,
-    H: Parser<I, O3, E>,
+    Input: Stream,
+    Error: ParserError<Input>,
+    IgnoredParser1: Parser<Input, Ignored1, Error>,
+    ParseNext: Parser<Input, Output, Error>,
+    IgnoredParser2: Parser<Input, Ignored2, Error>,
 {
-    trace("delimited", move |input: &mut I| {
-        let _ = first.parse_next(input)?;
-        let o2 = second.parse_next(input)?;
-        third.parse_next(input).map(|_| o2)
+    trace("delimited", move |input: &mut Input| {
+        let _ = ignored1.parse_next(input)?;
+        let o2 = parser.parse_next(input)?;
+        ignored2.parse_next(input).map(|_| o2)
     })
 }

crates/winnow/src/combinator/tests.rs

diff --git a/crates/winnow/src/combinator/tests.rs b/crates/winnow/src/combinator/tests.rs
index 726b410..d0caf8c 100644
--- a/crates/winnow/src/combinator/tests.rs
+++ b/crates/winnow/src/combinator/tests.rs
@@ -9,6 +9,8 @@
 use crate::error::InputError;
 use crate::error::Needed;
 use crate::error::ParserError;
+#[cfg(feature = "alloc")]
+use crate::lib::std::borrow::ToOwned;
 use crate::stream::Stream;
 use crate::token::take;
 use crate::unpeek;
@@ -63,26 +65,6 @@
     assert_parse!(res_over, Ok((is_over, is_over)));
 }
 
-#[test]
-fn rest_on_slices() {
-    let input: &[u8] = &b"Hello, world!"[..];
-    let empty: &[u8] = &b""[..];
-    assert_parse!(rest.parse_peek(input), Ok((empty, input)));
-}
-
-#[test]
-fn rest_on_strs() {
-    let input: &str = "Hello, world!";
-    let empty: &str = "";
-    assert_parse!(rest.parse_peek(input), Ok((empty, input)));
-}
-
-#[test]
-fn rest_len_on_slices() {
-    let input: &[u8] = &b"Hello, world!"[..];
-    assert_parse!(rest_len.parse_peek(input), Ok((input, input.len())));
-}
-
 use crate::lib::std::convert::From;
 impl From<u32> for CustomError {
     fn from(_: u32) -> Self {
@@ -90,12 +72,12 @@
     }
 }
 
-impl<I> ParserError<I> for CustomError {
+impl<I: Stream> ParserError<I> for CustomError {
     fn from_error_kind(_: &I, _: ErrorKind) -> Self {
         CustomError
     }
 
-    fn append(self, _: &I, _: ErrorKind) -> Self {
+    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> Self {
         CustomError
     }
 }
@@ -186,20 +168,20 @@
 
 #[test]
 fn peek_test() {
-    fn peek_tag(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
+    fn peek_literal(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
         peek("abcd").parse_peek(i)
     }
 
     assert_eq!(
-        peek_tag(Partial::new(&b"abcdef"[..])),
+        peek_literal(Partial::new(&b"abcdef"[..])),
         Ok((Partial::new(&b"abcdef"[..]), &b"abcd"[..]))
     );
     assert_eq!(
-        peek_tag(Partial::new(&b"ab"[..])),
+        peek_literal(Partial::new(&b"ab"[..])),
         Err(ErrMode::Incomplete(Needed::new(2)))
     );
     assert_eq!(
-        peek_tag(Partial::new(&b"xxx"[..])),
+        peek_literal(Partial::new(&b"xxx"[..])),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new(&b"xxx"[..]),
             ErrorKind::Tag
@@ -518,40 +500,36 @@
     #[cfg(feature = "alloc")]
     use crate::{
         error::ParserError,
-        lib::std::{
-            fmt::Debug,
-            string::{String, ToString},
-        },
+        lib::std::{fmt::Debug, string::String},
     };
 
     #[cfg(feature = "alloc")]
     #[derive(Debug, Clone, Eq, PartialEq)]
-    pub struct ErrorStr(String);
+    struct ErrorStr(String);
 
     #[cfg(feature = "alloc")]
     impl From<u32> for ErrorStr {
         fn from(i: u32) -> Self {
-            ErrorStr(format!("custom error code: {}", i))
+            ErrorStr(format!("custom error code: {i}"))
         }
     }
 
     #[cfg(feature = "alloc")]
     impl<'a> From<&'a str> for ErrorStr {
         fn from(i: &'a str) -> Self {
-            ErrorStr(format!("custom error message: {}", i))
+            ErrorStr(format!("custom error message: {i}"))
         }
     }
 
     #[cfg(feature = "alloc")]
-    impl<I: Debug> ParserError<I> for ErrorStr {
+    impl<I: Stream + Debug> ParserError<I> for ErrorStr {
         fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
-            ErrorStr(format!("custom error message: ({:?}, {:?})", input, kind))
+            ErrorStr(format!("custom error message: ({input:?}, {kind:?})"))
         }
 
-        fn append(self, input: &I, kind: ErrorKind) -> Self {
+        fn append(self, input: &I, _: &<I as Stream>::Checkpoint, kind: ErrorKind) -> Self {
             ErrorStr(format!(
-                "custom error message: ({:?}, {:?}) - {:?}",
-                input, kind, self
+                "custom error message: ({input:?}, {kind:?}) - {self:?}"
             ))
         }
     }
@@ -562,7 +540,7 @@
 
     #[allow(unused_variables)]
     fn dont_work(input: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
-        Err(ErrMode::Backtrack(ErrorStr("abcd".to_string())))
+        Err(ErrMode::Backtrack(ErrorStr("abcd".to_owned())))
     }
 
     fn work2(input: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
@@ -594,7 +572,7 @@
         Err(ErrMode::Backtrack(error_node_position!(
             &a,
             ErrorKind::Alt,
-            ErrorStr("abcd".to_string())
+            ErrorStr("abcd".to_owned())
         )))
     );
     assert_eq!(alt2(a), Ok((&b""[..], a)));
@@ -672,6 +650,22 @@
 }
 
 #[test]
+fn alt_dynamic_array() {
+    fn alt1<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8]> {
+        alt(&mut ["a", "bc", "def"][..]).parse_next(i)
+    }
+
+    let a = &b"a"[..];
+    assert_eq!(alt1.parse_peek(a), Ok((&b""[..], (&b"a"[..]))));
+
+    let bc = &b"bc"[..];
+    assert_eq!(alt1.parse_peek(bc), Ok((&b""[..], (&b"bc"[..]))));
+
+    let defg = &b"defg"[..];
+    assert_eq!(alt1.parse_peek(defg), Ok((&b"g"[..], (&b"def"[..]))));
+}
+
+#[test]
 fn permutation_test() {
     #[allow(clippy::type_complexity)]
     fn perm(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, (&[u8], &[u8], &[u8])> {
@@ -781,7 +775,7 @@
     let i_err_pos = &i[3..];
     assert_eq!(
         empty_sep(Partial::new(i)),
-        Err(ErrMode::Backtrack(error_position!(
+        Err(ErrMode::Cut(error_position!(
             &Partial::new(i_err_pos),
             ErrorKind::Assert
         )))
@@ -922,7 +916,7 @@
 
     assert_eq!(
         multi_empty(Partial::new(&b"abcdef"[..])),
-        Err(ErrMode::Backtrack(error_position!(
+        Err(ErrMode::Cut(error_position!(
             &Partial::new(&b"abcdef"[..]),
             ErrorKind::Assert
         )))
@@ -1031,7 +1025,7 @@
 #[cfg(feature = "std")]
 fn infinite_many() {
     fn tst(input: &[u8]) -> IResult<&[u8], &[u8]> {
-        println!("input: {:?}", input);
+        println!("input: {input:?}");
         Err(ErrMode::Backtrack(error_position!(&input, ErrorKind::Tag)))
     }
 
@@ -1176,7 +1170,7 @@
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub struct NilError;
+struct NilError;
 
 impl<I> From<(I, ErrorKind)> for NilError {
     fn from(_: (I, ErrorKind)) -> Self {
@@ -1184,11 +1178,11 @@
     }
 }
 
-impl<I> ParserError<I> for NilError {
+impl<I: Stream> ParserError<I> for NilError {
     fn from_error_kind(_: &I, _: ErrorKind) -> NilError {
         NilError
     }
-    fn append(self, _: &I, _: ErrorKind) -> NilError {
+    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> NilError {
         NilError
     }
 }
@@ -1246,7 +1240,7 @@
 
     assert_eq!(
         multi_empty(Partial::new(&b"abcdef"[..])),
-        Err(ErrMode::Backtrack(error_position!(
+        Err(ErrMode::Cut(error_position!(
             &Partial::new(&b"abcdef"[..]),
             ErrorKind::Assert
         )))

crates/winnow/src/error.rs

diff --git a/crates/winnow/src/error.rs b/crates/winnow/src/error.rs
index 3f28013..c70b1a5 100644
--- a/crates/winnow/src/error.rs
+++ b/crates/winnow/src/error.rs
@@ -30,6 +30,18 @@
 #[allow(unused_imports)] // Here for intra-doc links
 use crate::Parser;
 
+/// For use with [`Parser::parse_next`]
+///
+/// - `Ok(O)` is the parsed value
+/// - [`Err(ErrMode<E>)`][ErrMode] is the error along with how to respond to it
+///
+/// By default, the error type (`E`) is [`ContextError`].
+///
+/// When integrating into the result of the application, see
+/// - [`Parser::parse`]
+/// - [`ErrMode::into_inner`]
+pub type PResult<O, E = ContextError> = Result<O, ErrMode<E>>;
+
 /// For use with [`Parser::parse_peek`] which allows the input stream to be threaded through a
 /// parser.
 ///
@@ -43,28 +55,21 @@
 /// - [`ErrMode::into_inner`]
 pub type IResult<I, O, E = InputError<I>> = PResult<(I, O), E>;
 
-/// For use with [`Parser::parse_next`]
-///
-/// - `Ok(O)` is the parsed value
-/// - [`Err(ErrMode<E>)`][ErrMode] is the error along with how to respond to it
-///
-/// By default, the error type (`E`) is [`ContextError`].
-///
-/// When integrating into the result of the application, see
-/// - [`Parser::parse`]
-/// - [`ErrMode::into_inner`]
-pub type PResult<O, E = ContextError> = Result<O, ErrMode<E>>;
-
 /// Contains information on needed data if a parser returned `Incomplete`
 ///
+/// <div class="warning">
+///
 /// **Note:** This is only possible for `Stream` that are [partial][`crate::stream::StreamIsPartial`],
 /// like [`Partial`][crate::Partial].
+///
+/// </div>
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
 pub enum Needed {
     /// Needs more data, but we do not know how much
     Unknown,
-    /// Contains the required data size in bytes
+    /// Contains a lower bound on the buffer offset needed to finish parsing
+    ///
+    /// For byte/`&str` streams, this translates to bytes
     Size(NonZeroUsize),
 }
 
@@ -94,7 +99,6 @@
 
 /// Add parse error state to [`ParserError`]s
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
 pub enum ErrMode<E> {
     /// There was not enough data to determine the appropriate action
     ///
@@ -168,7 +172,6 @@
     /// Unwrap the mode, returning the underlying error
     ///
     /// Returns `None` for [`ErrMode::Incomplete`]
-    #[cfg_attr(debug_assertions, track_caller)]
     #[inline(always)]
     pub fn into_inner(self) -> Option<E> {
         match self {
@@ -178,7 +181,7 @@
     }
 }
 
-impl<I, E: ParserError<I>> ParserError<I> for ErrMode<E> {
+impl<I: Stream, E: ParserError<I>> ParserError<I> for ErrMode<E> {
     #[inline(always)]
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
         ErrMode::Backtrack(E::from_error_kind(input, kind))
@@ -190,13 +193,13 @@
     where
         I: crate::lib::std::fmt::Debug,
     {
-        ErrMode::Backtrack(E::assert(input, message))
+        ErrMode::Cut(E::assert(input, message))
     }
 
     #[inline]
-    fn append(self, input: &I, kind: ErrorKind) -> Self {
+    fn append(self, input: &I, token_start: &<I as Stream>::Checkpoint, kind: ErrorKind) -> Self {
         match self {
-            ErrMode::Backtrack(e) => ErrMode::Backtrack(e.append(input, kind)),
+            ErrMode::Backtrack(e) => ErrMode::Backtrack(e.append(input, token_start, kind)),
             e => e,
         }
     }
@@ -220,10 +223,10 @@
     }
 }
 
-impl<I, C, E: AddContext<I, C>> AddContext<I, C> for ErrMode<E> {
+impl<I: Stream, C, E: AddContext<I, C>> AddContext<I, C> for ErrMode<E> {
     #[inline(always)]
-    fn add_context(self, input: &I, ctx: C) -> Self {
-        self.map(|err| err.add_context(input, ctx))
+    fn add_context(self, input: &I, token_start: &<I as Stream>::Checkpoint, context: C) -> Self {
+        self.map(|err| err.add_context(input, token_start, context))
     }
 }
 
@@ -255,10 +258,10 @@
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            ErrMode::Incomplete(Needed::Size(u)) => write!(f, "Parsing requires {} bytes/chars", u),
+            ErrMode::Incomplete(Needed::Size(u)) => write!(f, "Parsing requires {u} more data"),
             ErrMode::Incomplete(Needed::Unknown) => write!(f, "Parsing requires more data"),
-            ErrMode::Cut(c) => write!(f, "Parsing Failure: {:?}", c),
-            ErrMode::Backtrack(c) => write!(f, "Parsing Error: {:?}", c),
+            ErrMode::Cut(c) => write!(f, "Parsing Failure: {c:?}"),
+            ErrMode::Backtrack(c) => write!(f, "Parsing Error: {c:?}"),
         }
     }
 }
@@ -267,18 +270,19 @@
 ///
 /// It provides methods to create an error from some combinators,
 /// and combine existing errors in combinators like `alt`.
-pub trait ParserError<I>: Sized {
+pub trait ParserError<I: Stream>: Sized {
     /// Creates an error from the input position and an [`ErrorKind`]
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self;
 
     /// Process a parser assertion
     #[cfg_attr(debug_assertions, track_caller)]
+    #[inline(always)]
     fn assert(input: &I, _message: &'static str) -> Self
     where
         I: crate::lib::std::fmt::Debug,
     {
         #[cfg(debug_assertions)]
-        panic!("assert `{}` failed at {:#?}", _message, input);
+        panic!("assert `{_message}` failed at {input:#?}");
         #[cfg(not(debug_assertions))]
         Self::from_error_kind(input, ErrorKind::Assert)
     }
@@ -287,7 +291,7 @@
     ///
     /// This is useful when backtracking through a parse tree, accumulating error context on the
     /// way.
-    fn append(self, input: &I, kind: ErrorKind) -> Self;
+    fn append(self, input: &I, token_start: &<I as Stream>::Checkpoint, kind: ErrorKind) -> Self;
 
     /// Combines errors from two different parse branches.
     ///
@@ -302,18 +306,25 @@
 /// Used by [`Parser::context`] to add custom data to error while backtracking
 ///
 /// May be implemented multiple times for different kinds of context.
-pub trait AddContext<I, C = &'static str>: Sized {
+pub trait AddContext<I: Stream, C = &'static str>: Sized {
     /// Append to an existing error custom data
     ///
     /// This is used mainly by [`Parser::context`], to add user friendly information
     /// to errors when backtracking through a parse tree
     #[inline]
-    fn add_context(self, _input: &I, _ctx: C) -> Self {
+    fn add_context(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _context: C,
+    ) -> Self {
         self
     }
 }
 
 /// Capture context from when an error was recovered
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 pub trait FromRecoverableError<I: Stream, E> {
     /// Capture context from when an error was recovered
     fn from_recoverable_error(
@@ -343,8 +354,12 @@
 /// This is useful for testing of generic parsers to ensure the error happens at the right
 /// location.
 ///
+/// <div class="warning">
+///
 /// **Note:** [context][Parser::context] and inner errors (like from [`Parser::try_map`]) will be
 /// dropped.
+///
+/// </div>
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct InputError<I: Clone> {
     /// The input stream, pointing to the location where the error occurred
@@ -371,7 +386,7 @@
 }
 
 #[cfg(feature = "alloc")]
-impl<'i, I: ToOwned> InputError<&'i I>
+impl<I: ToOwned> InputError<&I>
 where
     <I as ToOwned>::Owned: Clone,
 {
@@ -381,7 +396,7 @@
     }
 }
 
-impl<I: Clone> ParserError<I> for InputError<I> {
+impl<I: Stream + Clone> ParserError<I> for InputError<I> {
     #[inline]
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
         Self {
@@ -391,13 +406,20 @@
     }
 
     #[inline]
-    fn append(self, _: &I, _: ErrorKind) -> Self {
+    fn append(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _kind: ErrorKind,
+    ) -> Self {
         self
     }
 }
 
-impl<I: Clone, C> AddContext<I, C> for InputError<I> {}
+impl<I: Stream + Clone, C> AddContext<I, C> for InputError<I> {}
 
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I: Clone + Stream> FromRecoverableError<I, Self> for InputError<I> {
     #[inline]
     fn from_recoverable_error(
@@ -459,16 +481,24 @@
 {
 }
 
-impl<I> ParserError<I> for () {
+impl<I: Stream> ParserError<I> for () {
     #[inline]
     fn from_error_kind(_: &I, _: ErrorKind) -> Self {}
 
     #[inline]
-    fn append(self, _: &I, _: ErrorKind) -> Self {}
+    fn append(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _kind: ErrorKind,
+    ) -> Self {
+    }
 }
 
-impl<I, C> AddContext<I, C> for () {}
+impl<I: Stream, C> AddContext<I, C> for () {}
 
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I: Stream> FromRecoverableError<I, Self> for () {
     #[inline]
     fn from_recoverable_error(
@@ -544,14 +574,19 @@
     }
 }
 
-impl<I, C> ParserError<I> for ContextError<C> {
+impl<I: Stream, C> ParserError<I> for ContextError<C> {
     #[inline]
     fn from_error_kind(_input: &I, _kind: ErrorKind) -> Self {
         Self::new()
     }
 
     #[inline]
-    fn append(self, _input: &I, _kind: ErrorKind) -> Self {
+    fn append(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _kind: ErrorKind,
+    ) -> Self {
         self
     }
 
@@ -561,15 +596,22 @@
     }
 }
 
-impl<C, I> AddContext<I, C> for ContextError<C> {
+impl<C, I: Stream> AddContext<I, C> for ContextError<C> {
     #[inline]
-    fn add_context(mut self, _input: &I, ctx: C) -> Self {
+    fn add_context(
+        mut self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        context: C,
+    ) -> Self {
         #[cfg(feature = "alloc")]
-        self.context.push(ctx);
+        self.context.push(context);
         self
     }
 }
 
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I: Stream, C> FromRecoverableError<I, Self> for ContextError<C> {
     #[inline]
     fn from_recoverable_error(
@@ -649,7 +691,7 @@
             if let Some(expression) = expression {
                 newline = true;
 
-                write!(f, "invalid {}", expression)?;
+                write!(f, "invalid {expression}")?;
             }
 
             if !expected.is_empty() {
@@ -663,7 +705,7 @@
                     if i != 0 {
                         write!(f, ", ")?;
                     }
-                    write!(f, "{}", expected)?;
+                    write!(f, "{expected}")?;
                 }
             }
             #[cfg(feature = "std")]
@@ -672,7 +714,7 @@
                     if newline {
                         writeln!(f)?;
                     }
-                    write!(f, "{}", cause)?;
+                    write!(f, "{cause}")?;
                 }
             }
         }
@@ -681,6 +723,13 @@
     }
 }
 
+impl<C> ErrorConvert<ContextError<C>> for ContextError<C> {
+    #[inline]
+    fn convert(self) -> ContextError<C> {
+        self
+    }
+}
+
 /// Additional parse context for [`ContextError`] added via [`Parser::context`]
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[non_exhaustive]
@@ -734,9 +783,9 @@
             Self::CharLiteral(c) if c.is_ascii_control() => {
                 write!(f, "`{}`", c.escape_debug())
             }
-            Self::CharLiteral(c) => write!(f, "`{}`", c),
-            Self::StringLiteral(c) => write!(f, "`{}`", c),
-            Self::Description(c) => write!(f, "{}", c),
+            Self::CharLiteral(c) => write!(f, "`{c}`"),
+            Self::StringLiteral(c) => write!(f, "`{c}`"),
+            Self::Description(c) => write!(f, "{c}"),
         }
     }
 }
@@ -793,6 +842,7 @@
 #[cfg(feature = "std")]
 impl<'i, I: ToOwned, C> TreeError<&'i I, C>
 where
+    &'i I: Stream + Clone,
     <I as ToOwned>::Owned: Clone,
 {
     /// Obtaining ownership
@@ -804,7 +854,7 @@
 #[cfg(feature = "std")]
 impl<I, C> TreeError<I, C>
 where
-    I: Clone,
+    I: Stream + Clone,
 {
     /// Translate the input type
     pub fn map_input<I2: Clone, O: Clone + Fn(I) -> I2>(self, op: O) -> TreeError<I2, C> {
@@ -857,7 +907,7 @@
 #[cfg(feature = "std")]
 impl<I, C> ParserError<I> for TreeError<I, C>
 where
-    I: Clone,
+    I: Stream + Clone,
 {
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
         TreeError::Base(TreeErrorBase {
@@ -867,9 +917,11 @@
         })
     }
 
-    fn append(self, input: &I, kind: ErrorKind) -> Self {
+    fn append(self, input: &I, token_start: &<I as Stream>::Checkpoint, kind: ErrorKind) -> Self {
+        let mut input = input.clone();
+        input.reset(token_start);
         let frame = TreeErrorFrame::Kind(TreeErrorBase {
-            input: input.clone(),
+            input,
             kind,
             cause: None,
         });
@@ -898,19 +950,19 @@
 #[cfg(feature = "std")]
 impl<I, C> AddContext<I, C> for TreeError<I, C>
 where
-    I: Clone,
+    I: Stream + Clone,
 {
-    fn add_context(self, input: &I, context: C) -> Self {
-        let frame = TreeErrorFrame::Context(TreeErrorContext {
-            input: input.clone(),
-            context,
-        });
+    fn add_context(self, input: &I, token_start: &<I as Stream>::Checkpoint, context: C) -> Self {
+        let mut input = input.clone();
+        input.reset(token_start);
+        let frame = TreeErrorFrame::Context(TreeErrorContext { input, context });
         self.append_frame(frame)
     }
 }
 
 #[cfg(feature = "std")]
-impl<I: Clone + Stream, C> FromRecoverableError<I, Self> for TreeError<I, C> {
+#[cfg(feature = "unstable-recover")]
+impl<I: Stream + Clone, C> FromRecoverableError<I, Self> for TreeError<I, C> {
     #[inline]
     fn from_recoverable_error(
         _token_start: &<I as Stream>::Checkpoint,
@@ -925,7 +977,7 @@
 #[cfg(feature = "std")]
 impl<I, C, E: std::error::Error + Send + Sync + 'static> FromExternalError<I, E> for TreeError<I, C>
 where
-    I: Clone,
+    I: Stream + Clone,
 {
     fn from_external_error(input: &I, kind: ErrorKind, e: E) -> Self {
         TreeError::Base(TreeErrorBase {
@@ -939,7 +991,7 @@
 #[cfg(feature = "std")]
 impl<I, C> TreeError<I, C>
 where
-    I: Clone + crate::lib::std::fmt::Display,
+    I: Stream + Clone + crate::lib::std::fmt::Display,
     C: fmt::Display,
 {
     fn write(&self, f: &mut fmt::Formatter<'_>, indent: usize) -> fmt::Result {
@@ -974,7 +1026,7 @@
 }
 
 #[cfg(feature = "std")]
-impl<I: Clone + fmt::Display> fmt::Display for TreeErrorBase<I> {
+impl<I: Stream + Clone + fmt::Display> fmt::Display for TreeErrorBase<I> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(cause) = self.cause.as_ref() {
             write!(f, "caused by {cause}")?;
@@ -989,7 +1041,7 @@
 }
 
 #[cfg(feature = "std")]
-impl<I: Clone + fmt::Display, C: fmt::Display> fmt::Display for TreeErrorContext<I, C> {
+impl<I: Stream + Clone + fmt::Display, C: fmt::Display> fmt::Display for TreeErrorContext<I, C> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let context = &self.context;
         let input = abbreviate(self.input.to_string());
@@ -1000,7 +1052,7 @@
 
 #[cfg(feature = "std")]
 impl<
-        I: Clone + fmt::Debug + fmt::Display + Sync + Send + 'static,
+        I: Stream + Clone + fmt::Debug + fmt::Display + Sync + Send + 'static,
         C: fmt::Display + fmt::Debug,
     > std::error::Error for TreeError<I, C>
 {
@@ -1030,119 +1082,12 @@
 }
 
 #[cfg(feature = "std")]
-impl<I: Clone + fmt::Display, C: fmt::Display> fmt::Display for TreeError<I, C> {
+impl<I: Stream + Clone + fmt::Display, C: fmt::Display> fmt::Display for TreeError<I, C> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.write(f, 0)
     }
 }
 
-/// Deprecated, replaced with [`ContextError`]
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-#[deprecated(since = "0.5.8", note = "Replaced with `ContextError`")]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct VerboseError<I: Clone, C = &'static str> {
-    /// Accumulated error information
-    pub errors: crate::lib::std::vec::Vec<(I, VerboseErrorKind<C>)>,
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<'i, I: ToOwned, C> VerboseError<&'i I, C>
-where
-    <I as ToOwned>::Owned: Clone,
-{
-    /// Obtaining ownership
-    pub fn into_owned(self) -> VerboseError<<I as ToOwned>::Owned, C> {
-        self.map_input(ToOwned::to_owned)
-    }
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<I: Clone, C> VerboseError<I, C> {
-    /// Translate the input type
-    pub fn map_input<I2: Clone, O>(self, op: O) -> VerboseError<I2, C>
-    where
-        O: Fn(I) -> I2,
-    {
-        VerboseError {
-            errors: self.errors.into_iter().map(|(i, k)| (op(i), k)).collect(),
-        }
-    }
-}
-
-/// Deprecated, replaced with [`ContextError`]
-#[cfg(feature = "std")]
-#[deprecated(since = "0.5.8", note = "Replaced with `ContextError`")]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum VerboseErrorKind<C = &'static str> {
-    /// Static string added by the `context` function
-    Context(C),
-    /// Error kind given by various parsers
-    Winnow(ErrorKind),
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<I: Clone, C> ParserError<I> for VerboseError<I, C> {
-    fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
-        VerboseError {
-            errors: vec![(input.clone(), VerboseErrorKind::Winnow(kind))],
-        }
-    }
-
-    fn append(mut self, input: &I, kind: ErrorKind) -> Self {
-        self.errors
-            .push((input.clone(), VerboseErrorKind::Winnow(kind)));
-        self
-    }
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<I: Clone, C> AddContext<I, C> for VerboseError<I, C> {
-    fn add_context(mut self, input: &I, ctx: C) -> Self {
-        self.errors
-            .push((input.clone(), VerboseErrorKind::Context(ctx)));
-        self
-    }
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<I: Clone, C, E> FromExternalError<I, E> for VerboseError<I, C> {
-    /// Create a new error from an input position and an external error
-    fn from_external_error(input: &I, kind: ErrorKind, _e: E) -> Self {
-        Self::from_error_kind(input, kind)
-    }
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<I: Clone + fmt::Display, C: fmt::Display> fmt::Display for VerboseError<I, C> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "Parse error:")?;
-        for (input, error) in &self.errors {
-            match error {
-                VerboseErrorKind::Winnow(e) => writeln!(f, "{} at: {}", e.description(), input)?,
-                VerboseErrorKind::Context(s) => writeln!(f, "in section '{}', at: {}", s, input)?,
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(feature = "std")]
-#[allow(deprecated)]
-impl<
-        I: Clone + fmt::Debug + fmt::Display + Sync + Send + 'static,
-        C: fmt::Display + fmt::Debug,
-    > std::error::Error for VerboseError<I, C>
-{
-}
-
 /// Provide some minor debug context for errors
 #[rustfmt::skip]
 #[derive(Debug,PartialEq,Eq,Hash,Clone,Copy)]
@@ -1181,19 +1126,24 @@
   }
 }
 
-impl<I> ParserError<I> for ErrorKind {
+impl<I: Stream> ParserError<I> for ErrorKind {
     #[inline]
     fn from_error_kind(_input: &I, kind: ErrorKind) -> Self {
         kind
     }
 
     #[inline]
-    fn append(self, _: &I, _: ErrorKind) -> Self {
+    fn append(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _kind: ErrorKind,
+    ) -> Self {
         self
     }
 }
 
-impl<I, C> AddContext<I, C> for ErrorKind {}
+impl<I: Stream, C> AddContext<I, C> for ErrorKind {}
 
 impl<I, E> FromExternalError<I, E> for ErrorKind {
     /// Create a new error from an input position and an external error
@@ -1206,7 +1156,7 @@
 /// The Display implementation allows the `std::error::Error` implementation
 impl fmt::Display for ErrorKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "error {:?}", self)
+        write!(f, "error {self:?}")
     }
 }
 
@@ -1224,7 +1174,7 @@
 impl<I: Stream, E: ParserError<I>> ParseError<I, E> {
     pub(crate) fn new(mut input: I, start: I::Checkpoint, inner: E) -> Self {
         let offset = input.offset_from(&start);
-        input.reset(start);
+        input.reset(&start);
         Self {
             input,
             offset,
@@ -1242,8 +1192,12 @@
 
     /// The location in [`ParseError::input`] where parsing failed
     ///
+    /// <div class="warning">
+    ///
     /// **Note:** This is an offset, not an index, and may point to the end of input
     /// (`input.len()`) on eof errors.
+    ///
+    /// </div>
     #[inline]
     pub fn offset(&self) -> usize {
         self.offset
@@ -1282,7 +1236,7 @@
                 .nth(line_idx)
                 .expect("valid line number");
 
-            writeln!(f, "parse error at line {}, column {}", line_num, col_num)?;
+            writeln!(f, "parse error at line {line_num}, column {col_num}")?;
             //   |
             for _ in 0..gutter {
                 write!(f, " ")?;
@@ -1290,7 +1244,7 @@
             writeln!(f, " |")?;
 
             // 1 | 00:32:00.a999999
-            write!(f, "{} | ", line_num)?;
+            write!(f, "{line_num} | ")?;
             writeln!(f, "{}", String::from_utf8_lossy(content))?;
 
             //   |          ^
@@ -1462,6 +1416,7 @@
 #[cfg(test)]
 macro_rules! error_node_position(
   ($input:expr, $code:expr, $next:expr) => ({
-    $crate::error::ParserError::append($next, $input, $code)
+    let start = $input.checkpoint();
+    $crate::error::ParserError::append($next, $input, &start, $code)
   });
 );

crates/winnow/src/lib.rs

diff --git a/crates/winnow/src/lib.rs b/crates/winnow/src/lib.rs
index 6dcbda5..08acb6f 100644
--- a/crates/winnow/src/lib.rs
+++ b/crates/winnow/src/lib.rs
@@ -7,7 +7,7 @@
 //! - [Tutorial][_tutorial::chapter_0]
 //! - [Special Topics][_topic]
 //! - [Discussions](https://github.com/winnow-rs/winnow/discussions)
-//! - [CHANGELOG](https://github.com/winnow-rs/winnow/blob/v0.5.37/CHANGELOG.md) (includes major version migration
+//! - [CHANGELOG](https://github.com/winnow-rs/winnow/blob/v0.6.24/CHANGELOG.md) (includes major version migration
 //!   guides)
 //!
 //! ## Aspirations
@@ -52,95 +52,12 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 #![warn(clippy::std_instead_of_core)]
-// BEGIN - Embark standard lints v6 for Rust 1.55+
-// do not change or add/remove here, but one can add exceptions after this section
-// for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
-// "-Dunsafe_code",
-#![warn(clippy::all)]
-#![warn(clippy::await_holding_lock)]
-#![warn(clippy::char_lit_as_u8)]
-#![warn(clippy::checked_conversions)]
-#![warn(clippy::dbg_macro)]
-#![warn(clippy::debug_assert_with_mut_call)]
-#![warn(clippy::doc_markdown)]
-#![warn(clippy::empty_enum)]
-#![warn(clippy::enum_glob_use)]
-#![warn(clippy::exit)]
-#![warn(clippy::expl_impl_clone_on_copy)]
-#![warn(clippy::explicit_deref_methods)]
-#![warn(clippy::explicit_into_iter_loop)]
-#![warn(clippy::fallible_impl_from)]
-#![warn(clippy::filter_map_next)]
-#![warn(clippy::flat_map_option)]
-#![warn(clippy::float_cmp_const)]
-#![warn(clippy::fn_params_excessive_bools)]
-#![warn(clippy::from_iter_instead_of_collect)]
-#![warn(clippy::if_let_mutex)]
-#![warn(clippy::implicit_clone)]
-#![warn(clippy::imprecise_flops)]
-#![warn(clippy::inefficient_to_string)]
-#![warn(clippy::invalid_upcast_comparisons)]
-#![warn(clippy::large_digit_groups)]
-#![warn(clippy::large_stack_arrays)]
-#![warn(clippy::large_types_passed_by_value)]
-#![warn(clippy::let_unit_value)]
-#![warn(clippy::linkedlist)]
-#![warn(clippy::lossy_float_literal)]
-#![warn(clippy::macro_use_imports)]
-#![warn(clippy::manual_ok_or)]
-#![warn(clippy::map_err_ignore)]
-#![warn(clippy::map_flatten)]
-#![warn(clippy::map_unwrap_or)]
-#![warn(clippy::match_on_vec_items)]
-#![warn(clippy::match_same_arms)]
-#![warn(clippy::match_wild_err_arm)]
-#![warn(clippy::match_wildcard_for_single_variants)]
-#![warn(clippy::mem_forget)]
-#![warn(clippy::mismatched_target_os)]
-#![warn(clippy::missing_enforced_import_renames)]
-#![warn(clippy::mut_mut)]
-#![warn(clippy::mutex_integer)]
-#![warn(clippy::needless_borrow)]
-#![warn(clippy::needless_continue)]
-#![warn(clippy::needless_for_each)]
-#![warn(clippy::option_option)]
-#![warn(clippy::path_buf_push_overwrite)]
-#![warn(clippy::ptr_as_ptr)]
-#![warn(clippy::rc_mutex)]
-#![warn(clippy::ref_option_ref)]
-#![warn(clippy::rest_pat_in_fully_bound_structs)]
-#![warn(clippy::same_functions_in_if_condition)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-#![warn(clippy::single_match_else)]
-#![warn(clippy::string_add_assign)]
-#![warn(clippy::string_add)]
-#![warn(clippy::string_lit_as_bytes)]
-#![warn(clippy::string_to_string)]
-#![warn(clippy::todo)]
-#![warn(clippy::trait_duplication_in_bounds)]
-#![warn(clippy::unimplemented)]
-#![warn(clippy::unnested_or_patterns)]
-#![warn(clippy::unused_self)]
-#![warn(clippy::useless_transmute)]
-#![warn(clippy::verbose_file_reads)]
-#![warn(clippy::zero_sized_map_values)]
-#![warn(future_incompatible)]
-#![warn(nonstandard_style)]
-#![warn(rust_2018_idioms)]
-// END - Embark standard lints v6 for Rust 1.55+
-#![allow(clippy::branches_sharing_code)]
-#![allow(clippy::collapsible_else_if)]
-#![allow(clippy::if_same_then_else)]
-#![allow(clippy::bool_assert_comparison)]
-#![allow(clippy::let_and_return)]
-#![allow(clippy::assertions_on_constants)]
-#![allow(clippy::map_unwrap_or)]
-#![allow(clippy::single_match_else)]
-#![allow(clippy::single_match)]
-#![allow(clippy::unnested_or_patterns)]
-#[cfg_attr(nightly, warn(rustdoc::missing_doc_code_examples))]
+#![warn(clippy::print_stderr)]
+#![warn(clippy::print_stdout)]
+
 #[cfg(feature = "alloc")]
 #[cfg_attr(test, macro_use)]
+#[allow(unused_extern_crates)]
 extern crate alloc;
 #[cfg(doctest)]
 extern crate doc_comment;
@@ -152,44 +69,36 @@
 /// it, albeit there it is not public.
 #[doc(hidden)]
 pub(crate) mod lib {
+    #![allow(unused_imports)]
+
     /// `std` facade allowing `std`/`core` to be interchangeable. Reexports `alloc` crate optionally,
     /// as well as `core` or `std`
     #[cfg(not(feature = "std"))]
     /// internal std exports for no_std compatibility
-    pub mod std {
+    pub(crate) mod std {
         #[doc(hidden)]
         #[cfg(not(feature = "alloc"))]
-        pub use core::borrow;
+        pub(crate) use core::borrow;
 
         #[cfg(feature = "alloc")]
         #[doc(hidden)]
-        pub use alloc::{borrow, boxed, collections, string, vec};
+        pub(crate) use alloc::{borrow, boxed, collections, string, vec};
 
         #[doc(hidden)]
-        pub use core::{cmp, convert, fmt, hash, iter, mem, ops, option, result, slice, str};
-
-        /// internal reproduction of std prelude
-        #[doc(hidden)]
-        pub mod prelude {
-            pub use core::prelude as v1;
-        }
+        pub(crate) use core::{
+            cmp, convert, fmt, hash, iter, mem, ops, option, result, slice, str,
+        };
     }
 
     #[cfg(feature = "std")]
     /// internal std exports for `no_std` compatibility
-    pub mod std {
+    pub(crate) mod std {
         #![allow(clippy::std_instead_of_core)]
         #[doc(hidden)]
-        pub use std::{
-            alloc, borrow, boxed, cmp, collections, convert, fmt, hash, iter, mem, ops, option,
-            result, slice, str, string, vec,
+        pub(crate) use std::{
+            borrow, boxed, cmp, collections, convert, fmt, hash, iter, mem, ops, result, slice,
+            str, string, vec,
         };
-
-        /// internal reproduction of std prelude
-        #[doc(hidden)]
-        pub mod prelude {
-            pub use std::prelude as v1;
-        }
     }
 }
 
@@ -207,7 +116,6 @@
 pub mod binary;
 pub mod combinator;
 pub mod token;
-pub mod trace;
 
 #[cfg(feature = "unstable-doc")]
 pub mod _topic;
@@ -241,6 +149,7 @@
     pub use crate::PResult;
     pub use crate::Parser;
     #[cfg(feature = "unstable-recover")]
+    #[cfg(feature = "std")]
     pub use crate::RecoverableParser as _;
 }
 
@@ -249,7 +158,9 @@
 pub use parser::*;
 pub use stream::BStr;
 pub use stream::Bytes;
+#[allow(deprecated)]
 pub use stream::Located;
+pub use stream::LocatingSlice;
 pub use stream::Partial;
 pub use stream::Stateful;
 pub use stream::Str;

crates/winnow/src/macros/mod.rs

diff --git a/crates/winnow/src/macros/mod.rs b/crates/winnow/src/macros/mod.rs
index 09dc68b..cedb897 100644
--- a/crates/winnow/src/macros/mod.rs
+++ b/crates/winnow/src/macros/mod.rs
@@ -2,4 +2,4 @@
 mod seq;
 
 #[cfg(test)]
-mod test;
+mod tests;

crates/winnow/src/macros/seq.rs

diff --git a/crates/winnow/src/macros/seq.rs b/crates/winnow/src/macros/seq.rs
index e104391..a9991c9 100644
--- a/crates/winnow/src/macros/seq.rs
+++ b/crates/winnow/src/macros/seq.rs
@@ -1,5 +1,13 @@
 /// Initialize a struct or tuple out of a sequences of parsers
 ///
+/// Unlike normal struct initialization syntax:
+/// - `_` fields can exist to run a parser but ignore the result
+/// - Parse results for a field can later be referenced using the field name
+///
+/// Unlike normal tuple initialization syntax:
+/// - Struct-style initialization (`{ 0: _, 1: _}`) is not supported
+/// - `_: <parser>` fields can exist to run a parser but ignore the result
+///
 ///# Example
 ///
 /// ```
@@ -62,23 +70,22 @@
 #[doc(alias = "pair")]
 #[doc(alias = "separated_pair")]
 #[doc(alias = "struct_parser")]
+#[doc(hidden)] // forced to be visible in intended location
 macro_rules! seq {
-    ($name: ident { $($fields: tt)* }) => {
-        $crate::combinator::trace(stringify!($name), move |input: &mut _| {
-            use $crate::Parser;
+    ($($name: ident)::* { $($fields: tt)* }) => {
+        $crate::combinator::trace(stringify!($($name)::*), move |input: &mut _| {
             $crate::seq_parse_struct_fields!(input; $($fields)*);
             #[allow(clippy::redundant_field_names)]
-            Ok($crate::seq_init_struct_fields!( ($($fields)*); $name;))
+            Ok($crate::seq_init_struct_fields!( ($($fields)*); $($name)::*;))
         })
     };
-    ($name: ident ( $($elements: tt)* )) => {
-        $crate::combinator::trace(stringify!($name), move |input: &mut _| {
-            use $crate::Parser;
+    ($($name: ident)::* ( $($elements: tt)* )) => {
+        $crate::combinator::trace(stringify!($($name)::*), move |input: &mut _| {
             $crate::seq_parse_tuple_fields!( ($($elements)*) ; ).map(|t| {
                 $crate::seq_init_tuple_fields!(
                     ($($elements)*);
                     (t.0, t.1, t.2, t.3, t.4, t.5, t.6, t.7, t.8, t.9, t.10, t.11, t.12, t.13, t.14, t.15, t.16, t.17, t.18, t.19, t.20);
-                    $name;
+                    $($name)::*;
                 )
             }).parse_next(input)
         })
@@ -107,27 +114,27 @@
         $input: ident;
         _ : $head_parser: expr, $($fields: tt)*
     ) => {
-        let _ = $head_parser.parse_next($input)?;
+        let _ = $crate::Parser::parse_next(&mut $head_parser, $input)?;
         $crate::seq_parse_struct_fields!($input; $($fields)*)
     };
     (
         $input: ident;
         _ : $head_parser: expr
     ) => {
-        let _ = $head_parser.parse_next($input)?;
+        let _ = $crate::Parser::parse_next(&mut $head_parser, $input)?;
     };
     (
         $input: ident;
         $head_field: ident : $head_parser: expr, $($fields: tt)*
     ) => {
-        let $head_field = $head_parser.parse_next($input)?;
+        let $head_field = $crate::Parser::parse_next(&mut $head_parser, $input)?;
         $crate::seq_parse_struct_fields!($input; $($fields)*)
     };
     (
         $input: ident;
         $head_field: ident : $head_parser: expr
     ) => {
-        let $head_field = $head_parser.parse_next($input)?;
+        let $head_field = $crate::Parser::parse_next(&mut $head_parser, $input)?;
     };
     (
         $input: expr;
@@ -179,46 +186,46 @@
 macro_rules! seq_init_struct_fields {
     (
         (_ : $head_parser: expr, $($fields: tt)*);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_struct_fields!( ( $($fields)* ) ; $name ; $($inits)* )
+        $crate::seq_init_struct_fields!( ( $($fields)* ) ; $($name)::* ; $($inits)* )
     };
     (
         (_ : $head_parser: expr);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_struct_fields!( (); $name ; $($inits)* )
+        $crate::seq_init_struct_fields!( (); $($name)::* ; $($inits)* )
     };
     (
         ($head_field: ident : $head_parser: expr, $($fields: tt)*);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) =>
     {
-        $crate::seq_init_struct_fields!( ( $($fields)* ) ; $name ; $($inits)* $head_field: $head_field, )
+        $crate::seq_init_struct_fields!( ( $($fields)* ) ; $($name)::* ; $($inits)* $head_field: $head_field, )
     };
     (
         ($head_field: ident : $head_parser: expr);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_struct_fields!( (); $name ; $($inits)* $head_field: $head_field,)
+        $crate::seq_init_struct_fields!( (); $($name)::* ; $($inits)* $head_field: $head_field,)
     };
     (
         (.. $update: expr);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $name { $($inits)* ..$update }
+        $($name)::* { $($inits)* ..$update }
     };
     (
         ($(,)?);
-        $name: ident;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $name { $($inits)* }
+        $($name)::* { $($inits)* }
     };
 }
 
@@ -228,41 +235,41 @@
     (
         (_ : $head_parser: expr, $($fields: tt)*);
         ($head_arg: expr, $($args: expr),*);
-        $($name: ident)?;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_tuple_fields!( ( $($fields)* ); ( $($args),* ) ; $($name)? ; $($inits)* )
+        $crate::seq_init_tuple_fields!( ( $($fields)* ); ( $($args),* ) ; $($name)::* ; $($inits)* )
     };
     (
         (_ : $head_parser: expr);
         ($head_arg: expr, $($args: expr),*);
-        $($name: ident)?;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_tuple_fields!((); ( $($args),* ); $($name)? ; $($inits)*)
+        $crate::seq_init_tuple_fields!((); ( $($args),* ); $($name)::* ; $($inits)*)
     };
     (
         ($head_parser: expr, $($fields: tt)*);
         ($head_arg: expr, $($args: expr),*);
-        $($name: ident)?;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_tuple_fields!( ( $($fields)* ) ; ( $($args),* ) ; $($name)? ; $($inits)* $head_arg, )
+        $crate::seq_init_tuple_fields!( ( $($fields)* ) ; ( $($args),* ) ; $($name)::* ; $($inits)* $head_arg, )
     };
     (
         ($head_parser: expr);
         ($head_arg: expr, $($args: expr),*);
-        $($name: ident)?;
+        $($name: ident)::*;
         $($inits: tt)*
     ) => {
-        $crate::seq_init_tuple_fields!((); ( $($args),* ); $($name)? ; $($inits)* $head_arg)
+        $crate::seq_init_tuple_fields!((); ( $($args),* ); $($name)::* ; $($inits)* $head_arg)
     };
     (
         ();
         ($($args: expr),*);
-        $($name: ident)?;
+        $($name: ident)::*;
         $($inits: expr),* $(,)?
     ) => {
-        $($name)?( $($inits,)* )
+        $($name)::*( $($inits,)* )
     };
 }

crates/winnow/src/macros/test.rs

diff --git a/crates/winnow/src/macros/test.rs b/crates/winnow/src/macros/test.rs
deleted file mode 100644
index 17601bc..0000000
--- a/crates/winnow/src/macros/test.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-use crate::ascii::dec_uint;
-use crate::combinator::dispatch;
-use crate::combinator::empty;
-use crate::combinator::fail;
-use crate::combinator::seq;
-use crate::error::ErrMode;
-use crate::error::ErrorKind;
-use crate::error::ParserError;
-use crate::prelude::*;
-use crate::token::any;
-
-#[test]
-fn dispatch_basics() {
-    fn escape_seq_char(input: &mut &str) -> PResult<char> {
-        dispatch! {any;
-            'b' => empty.value('\u{8}'),
-            'f' => empty.value('\u{c}'),
-            'n' => empty.value('\n'),
-            'r' => empty.value('\r'),
-            't' => empty.value('\t'),
-            '\\' => empty.value('\\'),
-            '"' => empty.value('"'),
-            _ => fail::<_, char, _>,
-        }
-        .parse_next(input)
-    }
-    assert_eq!(escape_seq_char.parse_peek("b123"), Ok(("123", '\u{8}')));
-    assert_eq!(
-        escape_seq_char.parse_peek("error"),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"rror",
-            ErrorKind::Fail
-        )))
-    );
-    assert_eq!(
-        escape_seq_char.parse_peek(""),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"",
-            ErrorKind::Fail
-        )))
-    );
-}
-
-#[test]
-fn seq_struct_basics() {
-    #[derive(Debug, PartialEq)]
-    struct Point {
-        x: u32,
-        y: u32,
-    }
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point {
-                x: dec_uint,
-                _: ',',
-                y: dec_uint,
-            }
-        }
-        .parse_next(input)
-    }
-    assert_eq!(
-        parser.parse_peek("123,4 remaining"),
-        Ok((" remaining", Point { x: 123, y: 4 },)),
-    );
-    assert_eq!(
-        parser.parse_peek("123, remaining"),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &" remaining",
-            ErrorKind::Fail
-        )))
-    );
-    assert_eq!(
-        parser.parse_peek(""),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"",
-            ErrorKind::Fail
-        )))
-    );
-}
-
-#[test]
-fn seq_struct_default_init() {
-    #[derive(Debug, PartialEq, Default)]
-    struct Point {
-        x: u32,
-        y: u32,
-        z: u32,
-    }
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point {
-                x: dec_uint,
-                _: ',',
-                y: dec_uint,
-                ..Default::default()
-            }
-        }
-        .parse_next(input)
-    }
-    assert_eq!(
-        parser.parse_peek("123,4 remaining"),
-        Ok((" remaining", Point { x: 123, y: 4, z: 0 },)),
-    );
-    assert_eq!(
-        parser.parse_peek("123, remaining"),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &" remaining",
-            ErrorKind::Fail
-        )))
-    );
-    assert_eq!(
-        parser.parse_peek(""),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"",
-            ErrorKind::Fail
-        )))
-    );
-}
-
-#[test]
-fn seq_struct_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point {
-        x: u32,
-        y: u32,
-    }
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point {
-                x: dec_uint,
-                _: ',',
-                y: dec_uint,
-                _: empty,
-            }
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_struct_no_trailing_comma() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point {
-        x: u32,
-        y: u32,
-    }
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point {
-                x: dec_uint,
-                _: ',',
-                y: dec_uint
-            }
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_struct_no_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point {
-        x: u32,
-        y: u32,
-    }
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point {
-                x: dec_uint,
-                _: ',',
-                y: dec_uint,
-                _: empty
-            }
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_struct_basics() {
-    #[derive(Debug, PartialEq)]
-    struct Point(u32, u32);
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point(
-                dec_uint,
-                _: ',',
-                dec_uint,
-            )
-        }
-        .parse_next(input)
-    }
-    assert_eq!(
-        parser.parse_peek("123,4 remaining"),
-        Ok((" remaining", Point(123, 4),)),
-    );
-    assert_eq!(
-        parser.parse_peek("123, remaining"),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &" remaining",
-            ErrorKind::Fail
-        )))
-    );
-    assert_eq!(
-        parser.parse_peek(""),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"",
-            ErrorKind::Fail
-        )))
-    );
-}
-
-#[test]
-fn seq_tuple_struct_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point(u32, u32);
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point(
-                dec_uint,
-                _: ',',
-                dec_uint,
-                _: empty,
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_struct_no_trailing_comma() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point(u32, u32);
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point(
-                dec_uint,
-                _: ',',
-                dec_uint
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_struct_no_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    #[derive(Debug, PartialEq)]
-    struct Point(u32, u32);
-
-    fn parser(input: &mut &str) -> PResult<Point> {
-        seq! {
-            Point(
-                dec_uint,
-                _: ',',
-                dec_uint,
-                _: empty
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_basics() {
-    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
-        seq! {
-            (
-                dec_uint,
-                _: ',',
-                dec_uint,
-            )
-        }
-        .parse_next(input)
-    }
-    assert_eq!(
-        parser.parse_peek("123,4 remaining"),
-        Ok((" remaining", (123, 4),)),
-    );
-    assert_eq!(
-        parser.parse_peek("123, remaining"),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &" remaining",
-            ErrorKind::Fail
-        )))
-    );
-    assert_eq!(
-        parser.parse_peek(""),
-        Err(ErrMode::Backtrack(ParserError::from_error_kind(
-            &"",
-            ErrorKind::Fail
-        )))
-    );
-}
-
-#[test]
-fn seq_tuple_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
-        seq! {
-            (
-                dec_uint,
-                _: ',',
-                dec_uint,
-                _: empty,
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_no_trailing_comma() {
-    #![allow(dead_code)]
-
-    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
-        seq! {
-            (
-                dec_uint,
-                _: ',',
-                dec_uint
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_no_trailing_comma_elided() {
-    #![allow(dead_code)]
-
-    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
-        seq! {
-            (
-                dec_uint,
-                _: ',',
-                dec_uint,
-                _: empty
-            )
-        }
-        .parse_next(input)
-    }
-}
-
-#[test]
-fn seq_tuple_no_parens() {
-    #![allow(dead_code)]
-
-    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
-        seq! (
-            dec_uint,
-            _: ',',
-            dec_uint,
-        )
-        .parse_next(input)
-    }
-}

crates/winnow/src/macros/tests.rs

diff --git a/crates/winnow/src/macros/tests.rs b/crates/winnow/src/macros/tests.rs
new file mode 100644
index 0000000..ef50133
--- /dev/null
+++ b/crates/winnow/src/macros/tests.rs
@@ -0,0 +1,415 @@
+use crate::ascii::dec_uint;
+use crate::combinator::dispatch;
+use crate::combinator::empty;
+use crate::combinator::fail;
+use crate::combinator::seq;
+use crate::error::ErrMode;
+use crate::error::ErrorKind;
+use crate::error::ParserError;
+use crate::prelude::*;
+use crate::token::any;
+
+#[test]
+fn dispatch_basics() {
+    fn escape_seq_char(input: &mut &str) -> PResult<char> {
+        dispatch! {any;
+            'b' => empty.value('\u{8}'),
+            'f' => empty.value('\u{c}'),
+            'n' => empty.value('\n'),
+            'r' => empty.value('\r'),
+            't' => empty.value('\t'),
+            '\\' => empty.value('\\'),
+            '"' => empty.value('"'),
+            _ => fail::<_, char, _>,
+        }
+        .parse_next(input)
+    }
+    assert_eq!(escape_seq_char.parse_peek("b123"), Ok(("123", '\u{8}')));
+    assert_eq!(
+        escape_seq_char.parse_peek("error"),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"rror",
+            ErrorKind::Fail
+        )))
+    );
+    assert_eq!(
+        escape_seq_char.parse_peek(""),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"",
+            ErrorKind::Fail
+        )))
+    );
+}
+
+#[test]
+fn seq_struct_basics() {
+    #[derive(Debug, PartialEq)]
+    struct Point {
+        x: u32,
+        y: u32,
+    }
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point {
+                x: dec_uint,
+                _: ',',
+                y: dec_uint,
+            }
+        }
+        .parse_next(input)
+    }
+    assert_eq!(
+        parser.parse_peek("123,4 remaining"),
+        Ok((" remaining", Point { x: 123, y: 4 },)),
+    );
+    assert_eq!(
+        parser.parse_peek("123, remaining"),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &" remaining",
+            ErrorKind::Fail
+        )))
+    );
+    assert_eq!(
+        parser.parse_peek(""),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"",
+            ErrorKind::Fail
+        )))
+    );
+}
+
+#[test]
+fn seq_struct_default_init() {
+    #[derive(Debug, PartialEq, Default)]
+    struct Point {
+        x: u32,
+        y: u32,
+        z: u32,
+    }
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point {
+                x: dec_uint,
+                _: ',',
+                y: dec_uint,
+                ..Default::default()
+            }
+        }
+        .parse_next(input)
+    }
+    assert_eq!(
+        parser.parse_peek("123,4 remaining"),
+        Ok((" remaining", Point { x: 123, y: 4, z: 0 },)),
+    );
+    assert_eq!(
+        parser.parse_peek("123, remaining"),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &" remaining",
+            ErrorKind::Fail
+        )))
+    );
+    assert_eq!(
+        parser.parse_peek(""),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"",
+            ErrorKind::Fail
+        )))
+    );
+}
+
+#[test]
+fn seq_struct_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point {
+        x: u32,
+        y: u32,
+    }
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point {
+                x: dec_uint,
+                _: ',',
+                y: dec_uint,
+                _: empty,
+            }
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_struct_no_trailing_comma() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point {
+        x: u32,
+        y: u32,
+    }
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point {
+                x: dec_uint,
+                _: ',',
+                y: dec_uint
+            }
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_struct_no_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point {
+        x: u32,
+        y: u32,
+    }
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point {
+                x: dec_uint,
+                _: ',',
+                y: dec_uint,
+                _: empty
+            }
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_enum_struct_variant() {
+    #[derive(Debug, PartialEq, Eq)]
+    enum Expr {
+        Add { lhs: u32, rhs: u32 },
+        Mul(u32, u32),
+    }
+
+    fn add(input: &mut &[u8]) -> PResult<Expr> {
+        seq! {Expr::Add {
+            lhs: dec_uint::<_, u32, _>,
+            _: b" + ",
+            rhs: dec_uint::<_, u32, _>,
+        }}
+        .parse_next(input)
+    }
+
+    fn mul(input: &mut &[u8]) -> PResult<Expr> {
+        seq!(Expr::Mul(
+             dec_uint::<_, u32, _>,
+             _: b" * ",
+             dec_uint::<_, u32, _>,
+        ))
+        .parse_next(input)
+    }
+
+    assert_eq!(
+        add.parse_peek(&b"1 + 2"[..]),
+        Ok((&b""[..], Expr::Add { lhs: 1, rhs: 2 })),
+    );
+
+    assert_eq!(
+        mul.parse_peek(&b"3 * 4"[..]),
+        Ok((&b""[..], Expr::Mul(3, 4))),
+    );
+}
+
+#[test]
+fn seq_tuple_struct_basics() {
+    #[derive(Debug, PartialEq)]
+    struct Point(u32, u32);
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point(
+                dec_uint,
+                _: ',',
+                dec_uint,
+            )
+        }
+        .parse_next(input)
+    }
+    assert_eq!(
+        parser.parse_peek("123,4 remaining"),
+        Ok((" remaining", Point(123, 4),)),
+    );
+    assert_eq!(
+        parser.parse_peek("123, remaining"),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &" remaining",
+            ErrorKind::Fail
+        )))
+    );
+    assert_eq!(
+        parser.parse_peek(""),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"",
+            ErrorKind::Fail
+        )))
+    );
+}
+
+#[test]
+fn seq_tuple_struct_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point(u32, u32);
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point(
+                dec_uint,
+                _: ',',
+                dec_uint,
+                _: empty,
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_struct_no_trailing_comma() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point(u32, u32);
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point(
+                dec_uint,
+                _: ',',
+                dec_uint
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_struct_no_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    #[derive(Debug, PartialEq)]
+    struct Point(u32, u32);
+
+    fn parser(input: &mut &str) -> PResult<Point> {
+        seq! {
+            Point(
+                dec_uint,
+                _: ',',
+                dec_uint,
+                _: empty
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_basics() {
+    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
+        seq! {
+            (
+                dec_uint,
+                _: ',',
+                dec_uint,
+            )
+        }
+        .parse_next(input)
+    }
+    assert_eq!(
+        parser.parse_peek("123,4 remaining"),
+        Ok((" remaining", (123, 4),)),
+    );
+    assert_eq!(
+        parser.parse_peek("123, remaining"),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &" remaining",
+            ErrorKind::Fail
+        )))
+    );
+    assert_eq!(
+        parser.parse_peek(""),
+        Err(ErrMode::Backtrack(ParserError::from_error_kind(
+            &"",
+            ErrorKind::Fail
+        )))
+    );
+}
+
+#[test]
+fn seq_tuple_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
+        seq! {
+            (
+                dec_uint,
+                _: ',',
+                dec_uint,
+                _: empty,
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_no_trailing_comma() {
+    #![allow(dead_code)]
+
+    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
+        seq! {
+            (
+                dec_uint,
+                _: ',',
+                dec_uint
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_no_trailing_comma_elided() {
+    #![allow(dead_code)]
+
+    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
+        seq! {
+            (
+                dec_uint,
+                _: ',',
+                dec_uint,
+                _: empty
+            )
+        }
+        .parse_next(input)
+    }
+}
+
+#[test]
+fn seq_tuple_no_parens() {
+    #![allow(dead_code)]
+
+    fn parser(input: &mut &str) -> PResult<(u32, u32)> {
+        seq! (
+            dec_uint,
+            _: ',',
+            dec_uint,
+        )
+        .parse_next(input)
+    }
+}

crates/winnow/src/parser.rs

diff --git a/crates/winnow/src/parser.rs b/crates/winnow/src/parser.rs
index 1afa7e5..7d49c63 100644
--- a/crates/winnow/src/parser.rs
+++ b/crates/winnow/src/parser.rs
@@ -1,12 +1,14 @@
 //! Basic types to build the parsers
 
 use crate::ascii::Caseless as AsciiCaseless;
-use crate::combinator::*;
+use crate::combinator::impls;
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 use crate::error::FromRecoverableError;
 use crate::error::{AddContext, FromExternalError, IResult, PResult, ParseError, ParserError};
-use crate::stream::{AsChar, Compare, Location, ParseSlice, Stream, StreamIsPartial};
+use crate::stream::{Compare, Location, ParseSlice, Stream, StreamIsPartial};
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 use crate::stream::{Recover, Recoverable};
 
 /// Core trait for parsing
@@ -42,7 +44,7 @@
 ///
 /// Additionally, some basic types implement `Parser` as well, including
 /// - `u8` and `char`, see [`winnow::token::one_of`][crate::token::one_of]
-/// - `&[u8]` and `&str`, see [`winnow::token::tag`][crate::token::tag]
+/// - `&[u8]` and `&str`, see [`winnow::token::literal`][crate::token::literal]
 pub trait Parser<I, O, E> {
     /// Parse all of `input`, generating `O` from it
     #[inline]
@@ -52,7 +54,6 @@
         I: Stream,
         // Force users to deal with `Incomplete` when `StreamIsPartial<true>`
         I: StreamIsPartial,
-        I: Clone,
         E: ParserError<I>,
     {
         debug_assert!(
@@ -81,7 +82,18 @@
 
     /// Take tokens from the [`Stream`], turning it into the output
     ///
-    /// This includes advancing the [`Stream`] to the next location.
+    /// This returns a copy of the [`Stream`] advanced to the next location.
+    ///
+    /// <div class="warning">
+    ///
+    /// Generally, prefer [`Parser::parse_next`].
+    /// This is primarily intended for:
+    /// - Migrating from older versions / `nom`
+    /// - Testing [`Parser`]s
+    ///
+    /// For look-ahead parsing, see instead [`peek`][crate::combinator::peek].
+    ///
+    /// </div>
     #[inline(always)]
     fn parse_peek(&mut self, mut input: I) -> IResult<I, O, E> {
         match self.parse_next(&mut input) {
@@ -97,19 +109,19 @@
     /// # Example
     ///
     /// Because parsers are `FnMut`, they can be called multiple times. This prevents moving `f`
-    /// into [`length_data`][crate::binary::length_data] and `g` into
+    /// into [`length_take`][crate::binary::length_take] and `g` into
     /// [`Parser::complete_err`]:
     /// ```rust,compile_fail
     /// # use winnow::prelude::*;
     /// # use winnow::Parser;
     /// # use winnow::error::ParserError;
-    /// # use winnow::binary::length_data;
+    /// # use winnow::binary::length_take;
     /// pub fn length_value<'i, O, E: ParserError<&'i [u8]>>(
     ///     mut f: impl Parser<&'i [u8], usize, E>,
     ///     mut g: impl Parser<&'i [u8], O, E>
     /// ) -> impl Parser<&'i [u8], O, E> {
     ///   move |i: &mut &'i [u8]| {
-    ///     let mut data = length_data(f).parse_next(i)?;
+    ///     let mut data = length_take(f).parse_next(i)?;
     ///     let o = g.complete_err().parse_next(&mut data)?;
     ///     Ok(o)
     ///   }
@@ -121,24 +133,24 @@
     /// # use winnow::prelude::*;
     /// # use winnow::Parser;
     /// # use winnow::error::ParserError;
-    /// # use winnow::binary::length_data;
+    /// # use winnow::binary::length_take;
     /// pub fn length_value<'i, O, E: ParserError<&'i [u8]>>(
     ///     mut f: impl Parser<&'i [u8], usize, E>,
     ///     mut g: impl Parser<&'i [u8], O, E>
     /// ) -> impl Parser<&'i [u8], O, E> {
     ///   move |i: &mut &'i [u8]| {
-    ///     let mut data = length_data(f.by_ref()).parse_next(i)?;
+    ///     let mut data = length_take(f.by_ref()).parse_next(i)?;
     ///     let o = g.by_ref().complete_err().parse_next(&mut data)?;
     ///     Ok(o)
     ///   }
     /// }
     /// ```
     #[inline(always)]
-    fn by_ref(&mut self) -> ByRef<'_, Self>
+    fn by_ref(&mut self) -> impls::ByRef<'_, Self>
     where
         Self: core::marker::Sized,
     {
-        ByRef::new(self)
+        impls::ByRef { p: self }
     }
 
     /// Produce the provided value
@@ -158,12 +170,18 @@
     /// ```
     #[doc(alias = "to")]
     #[inline(always)]
-    fn value<O2>(self, val: O2) -> Value<Self, I, O, O2, E>
+    fn value<O2>(self, val: O2) -> impls::Value<Self, I, O, O2, E>
     where
         Self: core::marker::Sized,
         O2: Clone,
     {
-        Value::new(self, val)
+        impls::Value {
+            parser: self,
+            val,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Produce a type's default value
@@ -182,12 +200,18 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn default_value<O2>(self) -> DefaultValue<Self, I, O, O2, E>
+    fn default_value<O2>(self) -> impls::DefaultValue<Self, I, O, O2, E>
     where
         Self: core::marker::Sized,
         O2: core::default::Default,
     {
-        DefaultValue::new(self)
+        impls::DefaultValue {
+            parser: self,
+            o2: Default::default(),
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Discards the output of the `Parser`
@@ -206,11 +230,16 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn void(self) -> Void<Self, I, O, E>
+    fn void(self) -> impls::Void<Self, I, O, E>
     where
         Self: core::marker::Sized,
     {
-        Void::new(self)
+        impls::Void {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Convert the parser's output to another type using [`std::convert::From`]
@@ -235,12 +264,18 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn output_into<O2>(self) -> OutputInto<Self, I, O, O2, E>
+    fn output_into<O2>(self) -> impls::OutputInto<Self, I, O, O2, E>
     where
         Self: core::marker::Sized,
         O: Into<O2>,
     {
-        OutputInto::new(self)
+        impls::OutputInto {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Produce the consumed input as produced value.
@@ -253,25 +288,47 @@
     /// use winnow::combinator::separated_pair;
     /// # fn main() {
     ///
-    /// let mut parser = separated_pair(alpha1, ',', alpha1).recognize();
+    /// let mut parser = separated_pair(alpha1, ',', alpha1).take();
     ///
     /// assert_eq!(parser.parse_peek("abcd,efgh"), Ok(("", "abcd,efgh")));
-    /// assert_eq!(parser.parse_peek("abcd;"),Err(ErrMode::Backtrack(InputError::new(";", ErrorKind::Verify))));
+    /// assert_eq!(parser.parse_peek("abcd;"),Err(ErrMode::Backtrack(InputError::new(";", ErrorKind::Tag))));
     /// # }
     /// ```
     #[doc(alias = "concat")]
+    #[doc(alias = "recognize")]
     #[inline(always)]
-    fn recognize(self) -> Recognize<Self, I, O, E>
+    fn take(self) -> impls::Take<Self, I, O, E>
     where
         Self: core::marker::Sized,
         I: Stream,
     {
-        Recognize::new(self)
+        impls::Take {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
+    }
+
+    /// Replaced with [`Parser::take`]
+    #[inline(always)]
+    #[deprecated(since = "0.6.14", note = "Replaced with `Parser::take`")]
+    fn recognize(self) -> impls::Take<Self, I, O, E>
+    where
+        Self: core::marker::Sized,
+        I: Stream,
+    {
+        impls::Take {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Produce the consumed input with the output
     ///
-    /// Functions similarly to [recognize][Parser::recognize] except it
+    /// Functions similarly to [take][Parser::take] except it
     /// returns the parser output as well.
     ///
     /// This can be useful especially in cases where the output is not the same type
@@ -285,34 +342,56 @@
     /// # use winnow::prelude::*;
     /// # use winnow::{error::ErrMode,error::ErrorKind, error::InputError};
     /// use winnow::ascii::{alpha1};
-    /// use winnow::token::tag;
+    /// use winnow::token::literal;
     /// use winnow::combinator::separated_pair;
     ///
     /// fn inner_parser<'s>(input: &mut &'s str) -> PResult<bool, InputError<&'s str>> {
     ///     "1234".value(true).parse_next(input)
     /// }
     ///
-    /// let mut consumed_parser = separated_pair(alpha1, ',', alpha1).value(true).with_recognized();
+    /// let mut consumed_parser = separated_pair(alpha1, ',', alpha1).value(true).with_taken();
     ///
     /// assert_eq!(consumed_parser.parse_peek("abcd,efgh1"), Ok(("1", (true, "abcd,efgh"))));
-    /// assert_eq!(consumed_parser.parse_peek("abcd;"),Err(ErrMode::Backtrack(InputError::new(";", ErrorKind::Verify))));
+    /// assert_eq!(consumed_parser.parse_peek("abcd;"),Err(ErrMode::Backtrack(InputError::new(";", ErrorKind::Tag))));
     ///
     /// // the second output (representing the consumed input)
-    /// // should be the same as that of the `recognize` parser.
-    /// let mut recognize_parser = inner_parser.recognize();
-    /// let mut consumed_parser = inner_parser.with_recognized().map(|(output, consumed)| consumed);
+    /// // should be the same as that of the `take` parser.
+    /// let mut take_parser = inner_parser.take();
+    /// let mut consumed_parser = inner_parser.with_taken().map(|(output, consumed)| consumed);
     ///
-    /// assert_eq!(recognize_parser.parse_peek("1234"), consumed_parser.parse_peek("1234"));
-    /// assert_eq!(recognize_parser.parse_peek("abcd"), consumed_parser.parse_peek("abcd"));
+    /// assert_eq!(take_parser.parse_peek("1234"), consumed_parser.parse_peek("1234"));
+    /// assert_eq!(take_parser.parse_peek("abcd"), consumed_parser.parse_peek("abcd"));
     /// ```
     #[doc(alias = "consumed")]
+    #[doc(alias = "with_recognized")]
     #[inline(always)]
-    fn with_recognized(self) -> WithRecognized<Self, I, O, E>
+    fn with_taken(self) -> impls::WithTaken<Self, I, O, E>
     where
         Self: core::marker::Sized,
         I: Stream,
     {
-        WithRecognized::new(self)
+        impls::WithTaken {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
+    }
+
+    /// Replaced with [`Parser::with_taken`]
+    #[inline(always)]
+    #[deprecated(since = "0.6.14", note = "Replaced with `Parser::with_taken`")]
+    fn with_recognized(self) -> impls::WithTaken<Self, I, O, E>
+    where
+        Self: core::marker::Sized,
+        I: Stream,
+    {
+        impls::WithTaken {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Produce the location of the consumed input as produced value.
@@ -322,22 +401,27 @@
     /// ```rust
     /// # use winnow::prelude::*;
     /// # use winnow::{error::ErrMode,error::ErrorKind, error::InputError, stream::Stream};
-    /// use winnow::stream::Located;
+    /// use winnow::stream::LocatingSlice;
     /// use winnow::ascii::alpha1;
     /// use winnow::combinator::separated_pair;
     ///
     /// let mut parser = separated_pair(alpha1.span(), ',', alpha1.span());
     ///
-    /// assert_eq!(parser.parse(Located::new("abcd,efgh")), Ok((0..4, 5..9)));
-    /// assert_eq!(parser.parse_peek(Located::new("abcd;")),Err(ErrMode::Backtrack(InputError::new(Located::new("abcd;").peek_slice(4).0, ErrorKind::Verify))));
+    /// assert_eq!(parser.parse(LocatingSlice::new("abcd,efgh")), Ok((0..4, 5..9)));
+    /// assert_eq!(parser.parse_peek(LocatingSlice::new("abcd;")),Err(ErrMode::Backtrack(InputError::new(LocatingSlice::new("abcd;").peek_slice(4).0, ErrorKind::Tag))));
     /// ```
     #[inline(always)]
-    fn span(self) -> Span<Self, I, O, E>
+    fn span(self) -> impls::Span<Self, I, O, E>
     where
         Self: core::marker::Sized,
         I: Stream + Location,
     {
-        Span::new(self)
+        impls::Span {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Produce the location of consumed input with the output
@@ -355,12 +439,12 @@
     /// ```rust
     /// # use winnow::prelude::*;
     /// # use winnow::{error::ErrMode,error::ErrorKind, error::InputError, stream::Stream};
-    /// use winnow::stream::Located;
+    /// use winnow::stream::LocatingSlice;
     /// use winnow::ascii::alpha1;
-    /// use winnow::token::tag;
+    /// use winnow::token::literal;
     /// use winnow::combinator::separated_pair;
     ///
-    /// fn inner_parser<'s>(input: &mut Located<&'s str>) -> PResult<bool, InputError<Located<&'s str>>> {
+    /// fn inner_parser<'s>(input: &mut LocatingSlice<&'s str>) -> PResult<bool, InputError<LocatingSlice<&'s str>>> {
     ///     "1234".value(true).parse_next(input)
     /// }
     ///
@@ -368,25 +452,30 @@
     ///
     /// let mut consumed_parser = separated_pair(alpha1.value(1).with_span(), ',', alpha1.value(2).with_span());
     ///
-    /// assert_eq!(consumed_parser.parse(Located::new("abcd,efgh")), Ok(((1, 0..4), (2, 5..9))));
-    /// assert_eq!(consumed_parser.parse_peek(Located::new("abcd;")),Err(ErrMode::Backtrack(InputError::new(Located::new("abcd;").peek_slice(4).0, ErrorKind::Verify))));
+    /// assert_eq!(consumed_parser.parse(LocatingSlice::new("abcd,efgh")), Ok(((1, 0..4), (2, 5..9))));
+    /// assert_eq!(consumed_parser.parse_peek(LocatingSlice::new("abcd;")),Err(ErrMode::Backtrack(InputError::new(LocatingSlice::new("abcd;").peek_slice(4).0, ErrorKind::Tag))));
     ///
     /// // the second output (representing the consumed input)
     /// // should be the same as that of the `span` parser.
-    /// let mut recognize_parser = inner_parser.span();
+    /// let mut span_parser = inner_parser.span();
     /// let mut consumed_parser = inner_parser.with_span().map(|(output, consumed)| consumed);
     ///
-    /// assert_eq!(recognize_parser.parse_peek(Located::new("1234")), consumed_parser.parse_peek(Located::new("1234")));
-    /// assert_eq!(recognize_parser.parse_peek(Located::new("abcd")), consumed_parser.parse_peek(Located::new("abcd")));
+    /// assert_eq!(span_parser.parse_peek(LocatingSlice::new("1234")), consumed_parser.parse_peek(LocatingSlice::new("1234")));
+    /// assert_eq!(span_parser.parse_peek(LocatingSlice::new("abcd")), consumed_parser.parse_peek(LocatingSlice::new("abcd")));
     /// # }
     /// ```
     #[inline(always)]
-    fn with_span(self) -> WithSpan<Self, I, O, E>
+    fn with_span(self) -> impls::WithSpan<Self, I, O, E>
     where
         Self: core::marker::Sized,
         I: Stream + Location,
     {
-        WithSpan::new(self)
+        impls::WithSpan {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Maps a function over the output of a parser
@@ -408,12 +497,19 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn map<G, O2>(self, map: G) -> Map<Self, G, I, O, O2, E>
+    fn map<G, O2>(self, map: G) -> impls::Map<Self, G, I, O, O2, E>
     where
         G: FnMut(O) -> O2,
         Self: core::marker::Sized,
     {
-        Map::new(self, map)
+        impls::Map {
+            parser: self,
+            map,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Applies a function returning a `Result` over the output of a parser.
@@ -438,14 +534,22 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn try_map<G, O2, E2>(self, map: G) -> TryMap<Self, G, I, O, O2, E, E2>
+    fn try_map<G, O2, E2>(self, map: G) -> impls::TryMap<Self, G, I, O, O2, E, E2>
     where
         Self: core::marker::Sized,
         G: FnMut(O) -> Result<O2, E2>,
         I: Stream,
         E: FromExternalError<I, E2>,
     {
-        TryMap::new(self, map)
+        impls::TryMap {
+            parser: self,
+            map,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+            e2: Default::default(),
+        }
     }
 
     /// Apply both [`Parser::verify`] and [`Parser::map`].
@@ -473,14 +577,21 @@
     #[doc(alias = "filter_map")]
     #[doc(alias = "map_opt")]
     #[inline(always)]
-    fn verify_map<G, O2>(self, map: G) -> VerifyMap<Self, G, I, O, O2, E>
+    fn verify_map<G, O2>(self, map: G) -> impls::VerifyMap<Self, G, I, O, O2, E>
     where
         Self: core::marker::Sized,
         G: FnMut(O) -> Option<O2>,
         I: Stream,
         E: ParserError<I>,
     {
-        VerifyMap::new(self, map)
+        impls::VerifyMap {
+            parser: self,
+            map,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Creates a parser from the output of this one
@@ -492,12 +603,12 @@
     /// use winnow::token::take;
     /// use winnow::binary::u8;
     ///
-    /// fn length_data<'s>(input: &mut &'s [u8]) -> PResult<&'s [u8], InputError<&'s [u8]>> {
+    /// fn length_take<'s>(input: &mut &'s [u8]) -> PResult<&'s [u8], InputError<&'s [u8]>> {
     ///     u8.flat_map(take).parse_next(input)
     /// }
     ///
-    /// assert_eq!(length_data.parse_peek(&[2, 0, 1, 2][..]), Ok((&[2][..], &[0, 1][..])));
-    /// assert_eq!(length_data.parse_peek(&[4, 0, 1, 2][..]), Err(ErrMode::Backtrack(InputError::new(&[0, 1, 2][..], ErrorKind::Slice))));
+    /// assert_eq!(length_take.parse_peek(&[2, 0, 1, 2][..]), Ok((&[2][..], &[0, 1][..])));
+    /// assert_eq!(length_take.parse_peek(&[4, 0, 1, 2][..]), Err(ErrMode::Backtrack(InputError::new(&[0, 1, 2][..], ErrorKind::Slice))));
     /// ```
     ///
     /// which is the same as
@@ -506,23 +617,31 @@
     /// use winnow::token::take;
     /// use winnow::binary::u8;
     ///
-    /// fn length_data<'s>(input: &mut &'s [u8]) -> PResult<&'s [u8], InputError<&'s [u8]>> {
+    /// fn length_take<'s>(input: &mut &'s [u8]) -> PResult<&'s [u8], InputError<&'s [u8]>> {
     ///     let length = u8.parse_next(input)?;
     ///     let data = take(length).parse_next(input)?;
     ///     Ok(data)
     /// }
     ///
-    /// assert_eq!(length_data.parse_peek(&[2, 0, 1, 2][..]), Ok((&[2][..], &[0, 1][..])));
-    /// assert_eq!(length_data.parse_peek(&[4, 0, 1, 2][..]), Err(ErrMode::Backtrack(InputError::new(&[0, 1, 2][..], ErrorKind::Slice))));
+    /// assert_eq!(length_take.parse_peek(&[2, 0, 1, 2][..]), Ok((&[2][..], &[0, 1][..])));
+    /// assert_eq!(length_take.parse_peek(&[4, 0, 1, 2][..]), Err(ErrMode::Backtrack(InputError::new(&[0, 1, 2][..], ErrorKind::Slice))));
     /// ```
     #[inline(always)]
-    fn flat_map<G, H, O2>(self, map: G) -> FlatMap<Self, G, H, I, O, O2, E>
+    fn flat_map<G, H, O2>(self, map: G) -> impls::FlatMap<Self, G, H, I, O, O2, E>
     where
         Self: core::marker::Sized,
         G: FnMut(O) -> H,
         H: Parser<I, O2, E>,
     {
-        FlatMap::new(self, map)
+        impls::FlatMap {
+            f: self,
+            g: map,
+            h: Default::default(),
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Applies a second parser over the output of the first one
@@ -543,14 +662,21 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn and_then<G, O2>(self, inner: G) -> AndThen<Self, G, I, O, O2, E>
+    fn and_then<G, O2>(self, inner: G) -> impls::AndThen<Self, G, I, O, O2, E>
     where
         Self: core::marker::Sized,
         G: Parser<O, O2, E>,
         O: StreamIsPartial,
         I: Stream,
     {
-        AndThen::new(self, inner)
+        impls::AndThen {
+            outer: self,
+            inner,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Apply [`std::str::FromStr`] to the output of the parser
@@ -574,14 +700,20 @@
     /// ```
     #[doc(alias = "from_str")]
     #[inline(always)]
-    fn parse_to<O2>(self) -> ParseTo<Self, I, O, O2, E>
+    fn parse_to<O2>(self) -> impls::ParseTo<Self, I, O, O2, E>
     where
         Self: core::marker::Sized,
         I: Stream,
         O: ParseSlice<O2>,
         E: ParserError<I>,
     {
-        ParseTo::new(self)
+        impls::ParseTo {
+            p: self,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Returns the output of the child parser if it satisfies a verification function.
@@ -606,7 +738,7 @@
     #[doc(alias = "satisfy")]
     #[doc(alias = "filter")]
     #[inline(always)]
-    fn verify<G, O2>(self, filter: G) -> Verify<Self, G, I, O, O2, E>
+    fn verify<G, O2>(self, filter: G) -> impls::Verify<Self, G, I, O, O2, E>
     where
         Self: core::marker::Sized,
         G: FnMut(&O2) -> bool,
@@ -615,7 +747,14 @@
         O2: ?Sized,
         E: ParserError<I>,
     {
-        Verify::new(self, filter)
+        impls::Verify {
+            parser: self,
+            filter,
+            i: Default::default(),
+            o: Default::default(),
+            o2: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// If parsing fails, add context to the error
@@ -624,14 +763,20 @@
     /// to errors when backtracking through a parse tree.
     #[doc(alias = "labelled")]
     #[inline(always)]
-    fn context<C>(self, context: C) -> Context<Self, I, O, E, C>
+    fn context<C>(self, context: C) -> impls::Context<Self, I, O, E, C>
     where
         Self: core::marker::Sized,
         I: Stream,
         E: AddContext<I, C>,
         C: Clone + crate::lib::std::fmt::Debug,
     {
-        Context::new(self, context)
+        impls::Context {
+            parser: self,
+            context,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Transforms [`Incomplete`][crate::error::ErrMode::Incomplete] into [`Backtrack`][crate::error::ErrMode::Backtrack]
@@ -650,21 +795,27 @@
     /// # }
     /// ```
     #[inline(always)]
-    fn complete_err(self) -> CompleteErr<Self>
+    fn complete_err(self) -> impls::CompleteErr<Self>
     where
         Self: core::marker::Sized,
     {
-        CompleteErr::new(self)
+        impls::CompleteErr { f: self }
     }
 
     /// Convert the parser's error to another type using [`std::convert::From`]
     #[inline(always)]
-    fn err_into<E2>(self) -> ErrInto<Self, I, O, E, E2>
+    fn err_into<E2>(self) -> impls::ErrInto<Self, I, O, E, E2>
     where
         Self: core::marker::Sized,
         E: Into<E2>,
     {
-        ErrInto::new(self)
+        impls::ErrInto {
+            parser: self,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+            e2: Default::default(),
+        }
     }
 
     /// Recover from an error by skipping everything `recover` consumes and trying again
@@ -676,7 +827,8 @@
     /// [`winnow::combinator::alt`][crate::combinator::alt].
     #[inline(always)]
     #[cfg(feature = "unstable-recover")]
-    fn retry_after<R>(self, recover: R) -> RetryAfter<Self, R, I, O, E>
+    #[cfg(feature = "std")]
+    fn retry_after<R>(self, recover: R) -> impls::RetryAfter<Self, R, I, O, E>
     where
         Self: core::marker::Sized,
         R: Parser<I, (), E>,
@@ -684,7 +836,13 @@
         I: Recover<E>,
         E: FromRecoverableError<I, E>,
     {
-        RetryAfter::new(self, recover)
+        impls::RetryAfter {
+            parser: self,
+            recover,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 
     /// Recover from an error by skipping this parse and everything `recover` consumes
@@ -693,7 +851,8 @@
     /// [`winnow::combinator::alt`][crate::combinator::alt].
     #[inline(always)]
     #[cfg(feature = "unstable-recover")]
-    fn resume_after<R>(self, recover: R) -> ResumeAfter<Self, R, I, O, E>
+    #[cfg(feature = "std")]
+    fn resume_after<R>(self, recover: R) -> impls::ResumeAfter<Self, R, I, O, E>
     where
         Self: core::marker::Sized,
         R: Parser<I, (), E>,
@@ -701,13 +860,19 @@
         I: Recover<E>,
         E: FromRecoverableError<I, E>,
     {
-        ResumeAfter::new(self, recover)
+        impls::ResumeAfter {
+            parser: self,
+            recover,
+            i: Default::default(),
+            o: Default::default(),
+            e: Default::default(),
+        }
     }
 }
 
-impl<'a, I, O, E, F> Parser<I, O, E> for F
+impl<I, O, E, F> Parser<I, O, E> for F
 where
-    F: FnMut(&mut I) -> PResult<O, E> + 'a,
+    F: FnMut(&mut I) -> PResult<O, E>,
     I: Stream,
 {
     #[inline(always)]
@@ -727,19 +892,20 @@
 ///     b'a'.parse_next(i)
 /// }
 /// assert_eq!(parser.parse_peek(&b"abc"[..]), Ok((&b"bc"[..], b'a')));
-/// assert_eq!(parser.parse_peek(&b" abc"[..]), Err(ErrMode::Backtrack(InputError::new(&b" abc"[..], ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek(&b"bc"[..]), Err(ErrMode::Backtrack(InputError::new(&b"bc"[..], ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek(&b""[..]), Err(ErrMode::Backtrack(InputError::new(&b""[..], ErrorKind::Token))));
+/// assert_eq!(parser.parse_peek(&b" abc"[..]), Err(ErrMode::Backtrack(InputError::new(&b" abc"[..], ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek(&b"bc"[..]), Err(ErrMode::Backtrack(InputError::new(&b"bc"[..], ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek(&b""[..]), Err(ErrMode::Backtrack(InputError::new(&b""[..], ErrorKind::Tag))));
 /// ```
 impl<I, E> Parser<I, u8, E> for u8
 where
     I: StreamIsPartial,
-    I: Stream<Token = u8>,
+    I: Stream,
+    I: Compare<u8>,
     E: ParserError<I>,
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<u8, E> {
-        crate::token::one_of(*self).parse_next(i)
+        crate::token::literal(*self).value(*self).parse_next(i)
     }
 }
 
@@ -754,24 +920,24 @@
 ///     'a'.parse_next(i)
 /// }
 /// assert_eq!(parser.parse_peek("abc"), Ok(("bc", 'a')));
-/// assert_eq!(parser.parse_peek(" abc"), Err(ErrMode::Backtrack(InputError::new(" abc", ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek("bc"), Err(ErrMode::Backtrack(InputError::new("bc", ErrorKind::Verify))));
-/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Token))));
+/// assert_eq!(parser.parse_peek(" abc"), Err(ErrMode::Backtrack(InputError::new(" abc", ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek("bc"), Err(ErrMode::Backtrack(InputError::new("bc", ErrorKind::Tag))));
+/// assert_eq!(parser.parse_peek(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// ```
-impl<I, E> Parser<I, <I as Stream>::Token, E> for char
+impl<I, E> Parser<I, char, E> for char
 where
     I: StreamIsPartial,
     I: Stream,
-    <I as Stream>::Token: AsChar + Clone,
+    I: Compare<char>,
     E: ParserError<I>,
 {
     #[inline(always)]
-    fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Token, E> {
-        crate::token::one_of(*self).parse_next(i)
+    fn parse_next(&mut self, i: &mut I) -> PResult<char, E> {
+        crate::token::literal(*self).value(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -796,11 +962,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -828,11 +994,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -857,11 +1023,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -890,11 +1056,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -919,11 +1085,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-/// This is a shortcut for [`tag`][crate::token::tag].
+/// This is a shortcut for [`literal`][crate::token::literal].
 ///
 /// # Example
 /// ```rust
@@ -951,11 +1117,11 @@
 {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<<I as Stream>::Slice, E> {
-        crate::token::tag(*self).parse_next(i)
+        crate::token::literal(*self).parse_next(i)
     }
 }
 
-impl<I, E: ParserError<I>> Parser<I, (), E> for () {
+impl<I: Stream, E: ParserError<I>> Parser<I, (), E> for () {
     #[inline(always)]
     fn parse_next(&mut self, _i: &mut I) -> PResult<(), E> {
         Ok(())
@@ -965,7 +1131,7 @@
 macro_rules! impl_parser_for_tuple {
   ($($parser:ident $output:ident),+) => (
     #[allow(non_snake_case)]
-    impl<I, $($output),+, E: ParserError<I>, $($parser),+> Parser<I, ($($output),+,), E> for ($($parser),+,)
+    impl<I: Stream, $($output),+, E: ParserError<I>, $($parser),+> Parser<I, ($($output),+,), E> for ($($parser),+,)
     where
       $($parser: Parser<I, $output, E>),+
     {
@@ -998,6 +1164,7 @@
 ///
 /// [`Parser`]s will need to use [`Recoverable<I, _>`] for their input.
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 pub trait RecoverableParser<I, O, R, E> {
     /// Collect all errors when parsing the input
     ///
@@ -1010,6 +1177,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<P, I, O, R, E> RecoverableParser<I, O, R, E> for P
 where
     P: Parser<Recoverable<I, R>, O, E>,
@@ -1021,7 +1189,6 @@
     E: ParserError<Recoverable<I, R>>,
     E: crate::lib::std::fmt::Debug,
 {
-    #[inline]
     fn recoverable_parse(&mut self, input: I) -> (I, Option<O>, Vec<R>) {
         debug_assert!(
             !I::is_partial_supported(),
@@ -1033,7 +1200,7 @@
         let start_token = input.checkpoint();
         let result = (
             self.by_ref(),
-            crate::combinator::eof.resume_after(rest.void()),
+            crate::combinator::eof.resume_after(crate::token::rest.void()),
         )
             .parse_next(&mut input);
 
@@ -1050,7 +1217,7 @@
         };
 
         let (mut input, mut errs) = input.into_parts();
-        input.reset(start);
+        input.reset(&start);
         if let Some(err) = err {
             errs.push(err);
         }
@@ -1084,18 +1251,19 @@
 );
 
 #[cfg(feature = "alloc")]
-use alloc::boxed::Box;
+use crate::lib::std::boxed::Box;
 
 #[cfg(feature = "alloc")]
-impl<'a, I, O, E> Parser<I, O, E> for Box<dyn Parser<I, O, E> + 'a> {
+impl<I, O, E> Parser<I, O, E> for Box<dyn Parser<I, O, E> + '_> {
     #[inline(always)]
     fn parse_next(&mut self, i: &mut I) -> PResult<O, E> {
         (**self).parse_next(i)
     }
 }
 
-/// Convert a [`Parser::parse_peek`] style parse function to be a [`Parser`]
+/// Deprecated
 #[inline(always)]
+#[deprecated(since = "0.6.23")]
 pub fn unpeek<'a, I, O, E>(
     mut peek: impl FnMut(I) -> IResult<I, O, E> + 'a,
 ) -> impl FnMut(&mut I) -> PResult<O, E>

crates/winnow/src/stream/impls.rs

diff --git a/crates/winnow/src/stream/impls.rs b/crates/winnow/src/stream/impls.rs
index d76e1bf..1cc295e 100644
--- a/crates/winnow/src/stream/impls.rs
+++ b/crates/winnow/src/stream/impls.rs
@@ -1,6 +1,7 @@
 macro_rules! impl_partial_eq {
     ($lhs:ty, $rhs:ty) => {
-        impl<'a, 'b> PartialEq<$rhs> for $lhs {
+        #[allow(unused_lifetimes)]
+        impl<'a> PartialEq<$rhs> for $lhs {
             #[inline]
             fn eq(&self, other: &$rhs) -> bool {
                 let l = self.as_ref();
@@ -9,7 +10,8 @@
             }
         }
 
-        impl<'a, 'b> PartialEq<$lhs> for $rhs {
+        #[allow(unused_lifetimes)]
+        impl<'a> PartialEq<$lhs> for $rhs {
             #[inline]
             fn eq(&self, other: &$lhs) -> bool {
                 PartialEq::eq(other, self)
@@ -20,7 +22,8 @@
 
 macro_rules! impl_partial_ord {
     ($lhs:ty, $rhs:ty) => {
-        impl<'a, 'b> PartialOrd<$rhs> for $lhs {
+        #[allow(unused_lifetimes)]
+        impl<'a> PartialOrd<$rhs> for $lhs {
             #[inline]
             fn partial_cmp(&self, other: &$rhs) -> Option<Ordering> {
                 let l = self.as_ref();
@@ -29,7 +32,8 @@
             }
         }
 
-        impl<'a, 'b> PartialOrd<$lhs> for $rhs {
+        #[allow(unused_lifetimes)]
+        impl<'a> PartialOrd<$lhs> for $rhs {
             #[inline]
             fn partial_cmp(&self, other: &$lhs) -> Option<Ordering> {
                 PartialOrd::partial_cmp(other, self)
@@ -61,7 +65,7 @@
         #[inline]
         fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
             for byte in self.as_bytes() {
-                write!(f, "{:0>2x}", byte)?;
+                write!(f, "{byte:0>2x}")?;
             }
             Ok(())
         }
@@ -77,7 +81,7 @@
                         write!(f, "_")?;
                     }
                 }
-                write!(f, "{:0>2X}", byte)?;
+                write!(f, "{byte:0>2X}")?;
             }
             Ok(())
         }
@@ -283,7 +287,7 @@
         #[test]
         fn test_pretty_debug() {
             // Output can change from run-to-run
-            format!(
+            let _ = format!(
                 "{:#?}",
                 Bytes::new(b"\0\0\0 ftypisom\0\0\x02\0isomiso2avc1mp")
             );
@@ -293,9 +297,9 @@
         fn test_sliced() {
             // Output can change from run-to-run
             let total = Bytes::new(b"12345678901234567890");
-            format!("{:#?}", total);
-            format!("{:#?}", &total[1..]);
-            format!("{:#?}", &total[10..]);
+            let _ = format!("{total:#?}");
+            let _ = format!("{:#?}", &total[1..]);
+            let _ = format!("{:#?}", &total[10..]);
         }
     }
 }

crates/winnow/src/stream/mod.rs

diff --git a/crates/winnow/src/stream/mod.rs b/crates/winnow/src/stream/mod.rs
index 6873ac3..45470fb 100644
--- a/crates/winnow/src/stream/mod.rs
+++ b/crates/winnow/src/stream/mod.rs
@@ -3,7 +3,7 @@
 //! Stream types include:
 //! - `&[u8]` and [`Bytes`] for binary data
 //! - `&str` (aliased as [`Str`]) and [`BStr`] for UTF-8 data
-//! - [`Located`] can track the location within the original buffer to report
+//! - [`LocatingSlice`] can track the location within the original buffer to report
 //!   [spans][crate::Parser::with_span]
 //! - [`Stateful`] to thread global state through your parsers
 //! - [`Partial`] can mark an input as partial buffer that is being streamed into
@@ -14,6 +14,7 @@
 
 use crate::ascii::Caseless as AsciiCaseless;
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 use crate::error::FromRecoverableError;
 use crate::error::Needed;
 use crate::lib::std::iter::{Cloned, Enumerate};
@@ -47,7 +48,7 @@
 pub type Str<'i> = &'i str;
 
 /// Improved `Debug` experience for `&[u8]` byte streams
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 #[derive(Hash)]
 #[repr(transparent)]
 pub struct Bytes([u8]);
@@ -71,7 +72,7 @@
 }
 
 /// Improved `Debug` experience for `&[u8]` UTF-8-ish streams
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 #[derive(Hash)]
 #[repr(transparent)]
 pub struct BStr([u8]);
@@ -94,7 +95,11 @@
     }
 }
 
-/// Allow collecting the span of a parsed token
+/// Deprecated, replaced with [`LocatingSlice`]
+#[deprecated(since = "0.6.23", note = "Replaced with `LocatingSlice`")]
+pub type Located<I> = LocatingSlice<I>;
+
+/// Allow collecting the span of a parsed token within a slice
 ///
 /// Spans are tracked as a [`Range<usize>`] of byte offsets.
 ///
@@ -106,14 +111,15 @@
 /// byte offsets to line numbers.
 ///
 /// See [`Parser::span`][crate::Parser::span] and [`Parser::with_span`][crate::Parser::with_span] for more details
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord)]
-#[doc(alias = "LocatedSpan")]
-pub struct Located<I> {
+#[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[doc(alias = "LocatingSliceSpan")]
+#[doc(alias = "Located")]
+pub struct LocatingSlice<I> {
     initial: I,
     input: I,
 }
 
-impl<I> Located<I>
+impl<I> LocatingSlice<I>
 where
     I: Clone + Offset,
 {
@@ -123,19 +129,36 @@
         Self { initial, input }
     }
 
+    #[inline]
     fn location(&self) -> usize {
         self.input.offset_from(&self.initial)
     }
 }
 
-impl<I> AsRef<I> for Located<I> {
+impl<I> LocatingSlice<I>
+where
+    I: Clone + Stream + Offset,
+{
+    /// Reset the stream to the start
+    ///
+    /// This is useful for formats that encode a graph with addresses relative to the start of the
+    /// input.
+    #[doc(alias = "fseek")]
+    #[inline]
+    pub fn reset_to_start(&mut self) {
+        let start = self.initial.checkpoint();
+        self.input.reset(&start);
+    }
+}
+
+impl<I> AsRef<I> for LocatingSlice<I> {
     #[inline(always)]
     fn as_ref(&self) -> &I {
         &self.input
     }
 }
 
-impl<I> crate::lib::std::ops::Deref for Located<I> {
+impl<I> crate::lib::std::ops::Deref for LocatingSlice<I> {
     type Target = I;
 
     #[inline(always)]
@@ -144,7 +167,14 @@
     }
 }
 
-impl<I: crate::lib::std::fmt::Display> crate::lib::std::fmt::Display for Located<I> {
+impl<I: crate::lib::std::fmt::Display> crate::lib::std::fmt::Display for LocatingSlice<I> {
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        self.input.fmt(f)
+    }
+}
+
+impl<I: crate::lib::std::fmt::Debug> crate::lib::std::fmt::Debug for LocatingSlice<I> {
+    #[inline]
     fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
         self.input.fmt(f)
     }
@@ -155,7 +185,8 @@
 /// Generally, this will be used indirectly via
 /// [`RecoverableParser::recoverable_parse`][crate::RecoverableParser::recoverable_parse].
 #[cfg(feature = "unstable-recover")]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
+#[cfg(feature = "std")]
 pub struct Recoverable<I, E>
 where
     I: Stream,
@@ -166,11 +197,25 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+impl<I, E> Default for Recoverable<I, E>
+where
+    I: Default + Stream,
+{
+    #[inline]
+    fn default() -> Self {
+        Self::new(I::default())
+    }
+}
+
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Recoverable<I, E>
 where
     I: Stream,
 {
     /// Track recoverable errors with the stream
+    #[inline]
     pub fn new(input: I) -> Self {
         Self {
             input,
@@ -180,6 +225,7 @@
     }
 
     /// Act as a normal stream
+    #[inline]
     pub fn unrecoverable(input: I) -> Self {
         Self {
             input,
@@ -189,12 +235,14 @@
     }
 
     /// Access the current input and errors
+    #[inline]
     pub fn into_parts(self) -> (I, Vec<E>) {
         (self.input, self.errors)
     }
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> AsRef<I> for Recoverable<I, E>
 where
     I: Stream,
@@ -206,6 +254,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> crate::lib::std::ops::Deref for Recoverable<I, E>
 where
     I: Stream,
@@ -219,6 +268,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I: crate::lib::std::fmt::Display, E> crate::lib::std::fmt::Display for Recoverable<I, E>
 where
     I: Stream,
@@ -228,6 +278,25 @@
     }
 }
 
+#[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
+impl<I: Stream + crate::lib::std::fmt::Debug, E: crate::lib::std::fmt::Debug>
+    crate::lib::std::fmt::Debug for Recoverable<I, E>
+{
+    #[inline]
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        if f.alternate() {
+            self.input.fmt(f)
+        } else {
+            f.debug_struct("Recoverable")
+                .field("input", &self.input)
+                .field("errors", &self.errors)
+                .field("is_recoverable", &self.is_recoverable)
+                .finish()
+        }
+    }
+}
+
 /// Thread global state through your parsers
 ///
 /// Use cases
@@ -244,12 +313,12 @@
 /// # use winnow::ascii::alpha1;
 /// # type Error = ();
 ///
-/// #[derive(Clone, Debug)]
-/// struct State<'s>(&'s Cell<u32>);
+/// #[derive(Debug)]
+/// struct State<'s>(&'s mut u32);
 ///
 /// impl<'s> State<'s> {
-///     fn count(&self) {
-///         self.0.set(self.0.get() + 1);
+///     fn count(&mut self) {
+///         *self.0 += 1;
 ///     }
 /// }
 ///
@@ -261,13 +330,13 @@
 /// }
 ///
 /// let data = "Hello";
-/// let state = Cell::new(0);
-/// let input = Stream { input: data, state: State(&state) };
+/// let mut state = 0;
+/// let input = Stream { input: data, state: State(&mut state) };
 /// let output = word.parse(input).unwrap();
-/// assert_eq!(state.get(), 1);
+/// assert_eq!(state, 1);
 /// ```
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-#[doc(alias = "LocatedSpan")]
+#[derive(Clone, Copy, Default, Eq, PartialEq)]
+#[doc(alias = "LocatingSliceSpan")]
 pub struct Stateful<I, S> {
     /// Inner input being wrapped in state
     pub input: I,
@@ -297,6 +366,22 @@
     }
 }
 
+impl<I: crate::lib::std::fmt::Debug, S: crate::lib::std::fmt::Debug> crate::lib::std::fmt::Debug
+    for Stateful<I, S>
+{
+    #[inline]
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        if f.alternate() {
+            self.input.fmt(f)
+        } else {
+            f.debug_struct("Stateful")
+                .field("input", &self.input)
+                .field("state", &self.state)
+                .finish()
+        }
+    }
+}
+
 /// Mark the input as a partial buffer for streaming input.
 ///
 /// Complete input means that we already have all of the data. This will be the common case with
@@ -340,7 +425,7 @@
 /// // but the complete parser will return an error
 /// assert_eq!(take_complete.parse_peek(&b"abc"[..]), Err(ErrMode::Backtrack(InputError::new(&b"abc"[..], ErrorKind::Slice))));
 ///
-/// // the alpha0 function recognizes 0 or more alphabetic characters
+/// // the alpha0 function takes 0 or more alphabetic characters
 /// fn alpha0_partial<'s>(i: &mut Partial<&'s str>) -> PResult<&'s str, InputError<Partial<&'s str>>> {
 ///   ascii::alpha0.parse_next(i)
 /// }
@@ -349,19 +434,19 @@
 ///   ascii::alpha0.parse_next(i)
 /// }
 ///
-/// // if there's a clear limit to the recognized characters, both parsers work the same way
+/// // if there's a clear limit to the taken characters, both parsers work the same way
 /// assert_eq!(alpha0_partial.parse_peek(Partial::new("abcd;")), Ok((Partial::new(";"), "abcd")));
 /// assert_eq!(alpha0_complete.parse_peek("abcd;"), Ok((";", "abcd")));
 ///
 /// // but when there's no limit, the partial version returns `Incomplete`, because it cannot
-/// // know if more input data should be recognized. The whole input could be "abcd;", or
+/// // know if more input data should be taken. The whole input could be "abcd;", or
 /// // "abcde;"
 /// assert_eq!(alpha0_partial.parse_peek(Partial::new("abcd")), Err(ErrMode::Incomplete(Needed::new(1))));
 ///
 /// // while the complete version knows that all of the data is there
 /// assert_eq!(alpha0_complete.parse_peek("abcd"), Ok(("", "abcd")));
 /// ```
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Partial<I> {
     input: I,
     partial: bool,
@@ -372,6 +457,7 @@
     I: StreamIsPartial,
 {
     /// Create a partial input
+    #[inline]
     pub fn new(input: I) -> Self {
         debug_assert!(
             !I::is_partial_supported(),
@@ -392,6 +478,7 @@
 where
     I: Default + StreamIsPartial,
 {
+    #[inline]
     fn default() -> Self {
         Self::new(I::default())
     }
@@ -412,6 +499,20 @@
     }
 }
 
+impl<I: crate::lib::std::fmt::Debug> crate::lib::std::fmt::Debug for Partial<I> {
+    #[inline]
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        if f.alternate() {
+            self.input.fmt(f)
+        } else {
+            f.debug_struct("Partial")
+                .field("input", &self.input)
+                .field("partial", &self.partial)
+                .finish()
+        }
+    }
+}
+
 /// Abstract method to calculate the input length
 pub trait SliceLen {
     /// Calculates the input length, as indicated by its name,
@@ -426,50 +527,57 @@
     }
 }
 
-impl<'a, T> SliceLen for &'a [T] {
-    #[inline]
+impl<T> SliceLen for &[T] {
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
 }
 
 impl<T, const LEN: usize> SliceLen for [T; LEN] {
-    #[inline]
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
 }
 
-impl<'a, T, const LEN: usize> SliceLen for &'a [T; LEN] {
-    #[inline]
+impl<T, const LEN: usize> SliceLen for &[T; LEN] {
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
 }
 
-impl<'a> SliceLen for &'a str {
-    #[inline]
+impl SliceLen for &str {
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
 }
 
+impl SliceLen for u8 {
+    #[inline(always)]
+    fn slice_len(&self) -> usize {
+        1
+    }
+}
+
 impl SliceLen for char {
-    #[inline]
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len_utf8()
     }
 }
 
-impl<'a> SliceLen for &'a Bytes {
-    #[inline]
+impl SliceLen for &Bytes {
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
 }
 
-impl<'a> SliceLen for &'a BStr {
-    #[inline]
+impl SliceLen for &BStr {
+    #[inline(always)]
     fn slice_len(&self) -> usize {
         self.len()
     }
@@ -485,7 +593,7 @@
     }
 }
 
-impl<I> SliceLen for Located<I>
+impl<I> SliceLen for LocatingSlice<I>
 where
     I: SliceLen,
 {
@@ -496,6 +604,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> SliceLen for Recoverable<I, E>
 where
     I: SliceLen,
@@ -535,7 +644,7 @@
     type Token: crate::lib::std::fmt::Debug;
     /// Sequence of `Token`s
     ///
-    /// Example: `&[u8]` for `Located<&[u8]>` or `&str` for `Located<&str>`
+    /// Example: `&[u8]` for `LocatingSlice<&[u8]>` or `&str` for `LocatingSlice<&str>`
     type Slice: crate::lib::std::fmt::Debug;
 
     /// Iterate with the offset from the current location
@@ -573,13 +682,17 @@
     fn offset_at(&self, tokens: usize) -> Result<usize, Needed>;
     /// Split off a slice of tokens from the input
     ///
-    /// **NOTE:** For inputs with variable width tokens, like `&str`'s `char`, `offset` might not correspond
+    /// <div class="warning">
+    ///
+    /// **Note:** For inputs with variable width tokens, like `&str`'s `char`, `offset` might not correspond
     /// with the number of tokens. To get a valid offset, use:
     /// - [`Stream::eof_offset`]
     /// - [`Stream::iter_offsets`]
     /// - [`Stream::offset_for`]
     /// - [`Stream::offset_at`]
     ///
+    /// </div>
+    ///
     /// # Panic
     ///
     /// This will panic if
@@ -623,7 +736,7 @@
     /// # Panic
     ///
     /// May panic if an invalid [`Self::Checkpoint`] is provided
-    fn reset(&mut self, checkpoint: Self::Checkpoint);
+    fn reset(&mut self, checkpoint: &Self::Checkpoint);
 
     /// Return the inner-most stream
     fn raw(&self) -> &dyn crate::lib::std::fmt::Debug;
@@ -638,7 +751,7 @@
 
     type IterOffsets = Enumerate<Cloned<Iter<'i, T>>>;
 
-    type Checkpoint = Checkpoint<Self>;
+    type Checkpoint = Checkpoint<Self, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -680,11 +793,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(*self)
+        Checkpoint::<_, Self>::new(*self)
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        *self = checkpoint.0;
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        *self = checkpoint.inner;
     }
 
     #[inline(always)]
@@ -699,7 +812,7 @@
 
     type IterOffsets = CharIndices<'i>;
 
-    type Checkpoint = Checkpoint<Self>;
+    type Checkpoint = Checkpoint<Self, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -755,11 +868,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(*self)
+        Checkpoint::<_, Self>::new(*self)
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        *self = checkpoint.0;
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        *self = checkpoint.inner;
     }
 
     #[inline(always)]
@@ -774,7 +887,7 @@
 
     type IterOffsets = Enumerate<Cloned<Iter<'i, u8>>>;
 
-    type Checkpoint = Checkpoint<Self>;
+    type Checkpoint = Checkpoint<Self, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -820,11 +933,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(*self)
+        Checkpoint::<_, Self>::new(*self)
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        *self = checkpoint.0;
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        *self = checkpoint.inner;
     }
 
     #[inline(always)]
@@ -839,7 +952,7 @@
 
     type IterOffsets = Enumerate<Cloned<Iter<'i, u8>>>;
 
-    type Checkpoint = Checkpoint<Self>;
+    type Checkpoint = Checkpoint<Self, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -885,11 +998,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(*self)
+        Checkpoint::<_, Self>::new(*self)
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        *self = checkpoint.0;
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        *self = checkpoint.inner;
     }
 
     #[inline(always)]
@@ -907,7 +1020,7 @@
 
     type IterOffsets = BitOffsets<I>;
 
-    type Checkpoint = Checkpoint<(I::Checkpoint, usize)>;
+    type Checkpoint = Checkpoint<(I::Checkpoint, usize), Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -962,12 +1075,12 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint((self.0.checkpoint(), self.1))
+        Checkpoint::<_, Self>::new((self.0.checkpoint(), self.1))
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        self.0.reset(checkpoint.0 .0);
-        self.1 = checkpoint.0 .1;
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        self.0.reset(&checkpoint.inner.0);
+        self.1 = checkpoint.inner.1;
     }
 
     #[inline(always)]
@@ -1021,13 +1134,13 @@
     }
 }
 
-impl<I: Stream> Stream for Located<I> {
+impl<I: Stream> Stream for LocatingSlice<I> {
     type Token = <I as Stream>::Token;
     type Slice = <I as Stream>::Slice;
 
     type IterOffsets = <I as Stream>::IterOffsets;
 
-    type Checkpoint = Checkpoint<I::Checkpoint>;
+    type Checkpoint = Checkpoint<I::Checkpoint, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -1061,11 +1174,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(self.input.checkpoint())
+        Checkpoint::<_, Self>::new(self.input.checkpoint())
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        self.input.reset(checkpoint.0);
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        self.input.reset(&checkpoint.inner);
     }
 
     #[inline(always)]
@@ -1075,6 +1188,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E: crate::lib::std::fmt::Debug> Stream for Recoverable<I, E>
 where
     I: Stream,
@@ -1084,7 +1198,7 @@
 
     type IterOffsets = <I as Stream>::IterOffsets;
 
-    type Checkpoint = Checkpoint<I::Checkpoint>;
+    type Checkpoint = Checkpoint<I::Checkpoint, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -1118,11 +1232,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(self.input.checkpoint())
+        Checkpoint::<_, Self>::new(self.input.checkpoint())
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        self.input.reset(checkpoint.0);
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        self.input.reset(&checkpoint.inner);
     }
 
     #[inline(always)]
@@ -1137,7 +1251,7 @@
 
     type IterOffsets = <I as Stream>::IterOffsets;
 
-    type Checkpoint = Checkpoint<I::Checkpoint>;
+    type Checkpoint = Checkpoint<I::Checkpoint, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -1171,11 +1285,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(self.input.checkpoint())
+        Checkpoint::<_, Self>::new(self.input.checkpoint())
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        self.input.reset(checkpoint.0);
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        self.input.reset(&checkpoint.inner);
     }
 
     #[inline(always)]
@@ -1190,7 +1304,7 @@
 
     type IterOffsets = <I as Stream>::IterOffsets;
 
-    type Checkpoint = Checkpoint<I::Checkpoint>;
+    type Checkpoint = Checkpoint<I::Checkpoint, Self>;
 
     #[inline(always)]
     fn iter_offsets(&self) -> Self::IterOffsets {
@@ -1224,11 +1338,11 @@
 
     #[inline(always)]
     fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(self.input.checkpoint())
+        Checkpoint::<_, Self>::new(self.input.checkpoint())
     }
     #[inline(always)]
-    fn reset(&mut self, checkpoint: Self::Checkpoint) {
-        self.input.reset(checkpoint.0);
+    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
+        self.input.reset(&checkpoint.inner);
     }
 
     #[inline(always)]
@@ -1239,13 +1353,13 @@
 
 /// Number of indices input has advanced since start of parsing
 ///
-/// See [`Located`] for adding location tracking to your [`Stream`]
+/// See [`LocatingSlice`] for adding location tracking to your [`Stream`]
 pub trait Location {
     /// Number of indices input has advanced since start of parsing
     fn location(&self) -> usize;
 }
 
-impl<I> Location for Located<I>
+impl<I> Location for LocatingSlice<I>
 where
     I: Clone + Offset,
 {
@@ -1256,6 +1370,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Location for Recoverable<I, E>
 where
     I: Location,
@@ -1291,6 +1406,7 @@
 ///
 /// See [`Recoverable`] for adding error recovery tracking to your [`Stream`]
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 pub trait Recover<E>: Stream {
     /// Capture a top-level error
     ///
@@ -1308,6 +1424,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<'a, T, E> Recover<E> for &'a [T]
 where
     &'a [T]: Stream,
@@ -1330,7 +1447,8 @@
 }
 
 #[cfg(feature = "unstable-recover")]
-impl<'a, E> Recover<E> for &'a str {
+#[cfg(feature = "std")]
+impl<E> Recover<E> for &str {
     #[inline(always)]
     fn record_err(
         &mut self,
@@ -1349,7 +1467,8 @@
 }
 
 #[cfg(feature = "unstable-recover")]
-impl<'a, E> Recover<E> for &'a Bytes {
+#[cfg(feature = "std")]
+impl<E> Recover<E> for &Bytes {
     #[inline(always)]
     fn record_err(
         &mut self,
@@ -1368,7 +1487,8 @@
 }
 
 #[cfg(feature = "unstable-recover")]
-impl<'a, E> Recover<E> for &'a BStr {
+#[cfg(feature = "std")]
+impl<E> Recover<E> for &BStr {
     #[inline(always)]
     fn record_err(
         &mut self,
@@ -1387,6 +1507,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Recover<E> for (I, usize)
 where
     I: Recover<E>,
@@ -1410,7 +1531,8 @@
 }
 
 #[cfg(feature = "unstable-recover")]
-impl<I, E> Recover<E> for Located<I>
+#[cfg(feature = "std")]
+impl<I, E> Recover<E> for LocatingSlice<I>
 where
     I: Recover<E>,
     I: Stream,
@@ -1433,6 +1555,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E, R> Recover<E> for Recoverable<I, R>
 where
     I: Stream,
@@ -1467,6 +1590,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E, S> Recover<E> for Stateful<I, S>
 where
     I: Recover<E>,
@@ -1491,6 +1615,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Recover<E> for Partial<I>
 where
     I: Recover<E>,
@@ -1537,11 +1662,13 @@
     }
 }
 
-impl<'a, T> StreamIsPartial for &'a [T] {
+impl<T> StreamIsPartial for &[T] {
     type PartialState = ();
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {}
 
+    #[inline]
     fn restore_partial(&mut self, _state: Self::PartialState) {}
 
     #[inline(always)]
@@ -1550,13 +1677,15 @@
     }
 }
 
-impl<'a> StreamIsPartial for &'a str {
+impl StreamIsPartial for &str {
     type PartialState = ();
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         // Already complete
     }
 
+    #[inline]
     fn restore_partial(&mut self, _state: Self::PartialState) {}
 
     #[inline(always)]
@@ -1565,13 +1694,15 @@
     }
 }
 
-impl<'a> StreamIsPartial for &'a Bytes {
+impl StreamIsPartial for &Bytes {
     type PartialState = ();
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         // Already complete
     }
 
+    #[inline]
     fn restore_partial(&mut self, _state: Self::PartialState) {}
 
     #[inline(always)]
@@ -1580,13 +1711,15 @@
     }
 }
 
-impl<'a> StreamIsPartial for &'a BStr {
+impl StreamIsPartial for &BStr {
     type PartialState = ();
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         // Already complete
     }
 
+    #[inline]
     fn restore_partial(&mut self, _state: Self::PartialState) {}
 
     #[inline(always)]
@@ -1601,10 +1734,12 @@
 {
     type PartialState = I::PartialState;
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         self.0.complete()
     }
 
+    #[inline]
     fn restore_partial(&mut self, state: Self::PartialState) {
         self.0.restore_partial(state);
     }
@@ -1620,16 +1755,18 @@
     }
 }
 
-impl<I> StreamIsPartial for Located<I>
+impl<I> StreamIsPartial for LocatingSlice<I>
 where
     I: StreamIsPartial,
 {
     type PartialState = I::PartialState;
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         self.input.complete()
     }
 
+    #[inline]
     fn restore_partial(&mut self, state: Self::PartialState) {
         self.input.restore_partial(state);
     }
@@ -1646,6 +1783,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> StreamIsPartial for Recoverable<I, E>
 where
     I: StreamIsPartial,
@@ -1653,10 +1791,12 @@
 {
     type PartialState = I::PartialState;
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         self.input.complete()
     }
 
+    #[inline]
     fn restore_partial(&mut self, state: Self::PartialState) {
         self.input.restore_partial(state);
     }
@@ -1678,10 +1818,12 @@
 {
     type PartialState = I::PartialState;
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         self.input.complete()
     }
 
+    #[inline]
     fn restore_partial(&mut self, state: Self::PartialState) {
         self.input.restore_partial(state);
     }
@@ -1703,10 +1845,12 @@
 {
     type PartialState = bool;
 
+    #[inline]
     fn complete(&mut self) -> Self::PartialState {
         core::mem::replace(&mut self.partial, false)
     }
 
+    #[inline]
     fn restore_partial(&mut self, state: Self::PartialState) {
         self.partial = state;
     }
@@ -1726,12 +1870,16 @@
 pub trait Offset<Start = Self> {
     /// Offset between the first byte of `start` and the first byte of `self`a
     ///
+    /// <div class="warning">
+    ///
     /// **Note:** This is an offset, not an index, and may point to the end of input
     /// (`start.len()`) when `self` is exhausted.
+    ///
+    /// </div>
     fn offset_from(&self, start: &Start) -> usize;
 }
 
-impl<'a, T> Offset for &'a [T] {
+impl<T> Offset for &[T] {
     #[inline]
     fn offset_from(&self, start: &Self) -> usize {
         let fst = (*start).as_ptr();
@@ -1755,7 +1903,7 @@
     }
 }
 
-impl<'a> Offset for &'a str {
+impl Offset for &str {
     #[inline(always)]
     fn offset_from(&self, start: &Self) -> usize {
         self.as_bytes().offset_from(&start.as_bytes())
@@ -1769,7 +1917,7 @@
     }
 }
 
-impl<'a> Offset for &'a Bytes {
+impl Offset for &Bytes {
     #[inline(always)]
     fn offset_from(&self, start: &Self) -> usize {
         self.as_bytes().offset_from(&start.as_bytes())
@@ -1783,7 +1931,7 @@
     }
 }
 
-impl<'a> Offset for &'a BStr {
+impl Offset for &BStr {
     #[inline(always)]
     fn offset_from(&self, start: &Self) -> usize {
         self.as_bytes().offset_from(&start.as_bytes())
@@ -1817,7 +1965,7 @@
     }
 }
 
-impl<I> Offset for Located<I>
+impl<I> Offset for LocatingSlice<I>
 where
     I: Stream,
 {
@@ -1827,17 +1975,18 @@
     }
 }
 
-impl<I> Offset<<Located<I> as Stream>::Checkpoint> for Located<I>
+impl<I> Offset<<LocatingSlice<I> as Stream>::Checkpoint> for LocatingSlice<I>
 where
     I: Stream,
 {
     #[inline(always)]
-    fn offset_from(&self, other: &<Located<I> as Stream>::Checkpoint) -> usize {
+    fn offset_from(&self, other: &<LocatingSlice<I> as Stream>::Checkpoint) -> usize {
         self.checkpoint().offset_from(other)
     }
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Offset for Recoverable<I, E>
 where
     I: Stream,
@@ -1850,6 +1999,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> Offset<<Recoverable<I, E> as Stream>::Checkpoint> for Recoverable<I, E>
 where
     I: Stream,
@@ -1903,13 +2053,13 @@
     }
 }
 
-impl<I> Offset for Checkpoint<I>
+impl<I, S> Offset for Checkpoint<I, S>
 where
     I: Offset,
 {
     #[inline(always)]
     fn offset_from(&self, start: &Self) -> usize {
-        self.0.offset_from(&start.0)
+        self.inner.offset_from(&start.inner)
     }
 }
 
@@ -1919,21 +2069,21 @@
     fn as_bytes(&self) -> &[u8];
 }
 
-impl<'a> AsBytes for &'a [u8] {
+impl AsBytes for &[u8] {
     #[inline(always)]
     fn as_bytes(&self) -> &[u8] {
         self
     }
 }
 
-impl<'a> AsBytes for &'a Bytes {
+impl AsBytes for &Bytes {
     #[inline(always)]
     fn as_bytes(&self) -> &[u8] {
         (*self).as_bytes()
     }
 }
 
-impl<I> AsBytes for Located<I>
+impl<I> AsBytes for LocatingSlice<I>
 where
     I: AsBytes,
 {
@@ -1944,6 +2094,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> AsBytes for Recoverable<I, E>
 where
     I: Stream,
@@ -1981,28 +2132,28 @@
     fn as_bstr(&self) -> &[u8];
 }
 
-impl<'a> AsBStr for &'a [u8] {
+impl AsBStr for &[u8] {
     #[inline(always)]
     fn as_bstr(&self) -> &[u8] {
         self
     }
 }
 
-impl<'a> AsBStr for &'a BStr {
+impl AsBStr for &BStr {
     #[inline(always)]
     fn as_bstr(&self) -> &[u8] {
         (*self).as_bytes()
     }
 }
 
-impl<'a> AsBStr for &'a str {
+impl AsBStr for &str {
     #[inline(always)]
     fn as_bstr(&self) -> &[u8] {
         (*self).as_bytes()
     }
 }
 
-impl<I> AsBStr for Located<I>
+impl<I> AsBStr for LocatingSlice<I>
 where
     I: AsBStr,
 {
@@ -2013,6 +2164,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> AsBStr for Recoverable<I, E>
 where
     I: Stream,
@@ -2048,7 +2200,11 @@
 #[derive(Debug, Eq, PartialEq)]
 pub enum CompareResult {
     /// Comparison was successful
-    Ok,
+    ///
+    /// `usize` is the end of the successful match within the buffer.
+    /// This is most relevant for caseless UTF-8 where `Compare::compare`'s parameter might be a different
+    /// length than the match within the buffer.
+    Ok(usize),
     /// We need more data to be sure
     Incomplete,
     /// Comparison failed
@@ -2059,18 +2215,9 @@
 pub trait Compare<T> {
     /// Compares self to another value for equality
     fn compare(&self, t: T) -> CompareResult;
-    /// Compares self to another value for equality
-    /// independently of the case.
-    ///
-    /// Warning: for `&str`, the comparison is done
-    /// by lowercasing both strings and comparing
-    /// the result. This is a temporary solution until
-    /// a better one appears
-    #[deprecated(since = "0.5.20", note = "Replaced with `compare(ascii::Caseless(_))`")]
-    fn compare_no_case(&self, t: T) -> CompareResult;
 }
 
-impl<'a, 'b> Compare<&'b [u8]> for &'a [u8] {
+impl<'b> Compare<&'b [u8]> for &[u8] {
     #[inline]
     fn compare(&self, t: &'b [u8]) -> CompareResult {
         if t.iter().zip(*self).any(|(a, b)| a != b) {
@@ -2078,18 +2225,12 @@
         } else if self.len() < t.slice_len() {
             CompareResult::Incomplete
         } else {
-            CompareResult::Ok
+            CompareResult::Ok(t.slice_len())
         }
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: &'b [u8]) -> CompareResult {
-        self.compare(AsciiCaseless(t))
-    }
 }
 
-impl<'a, 'b> Compare<AsciiCaseless<&'b [u8]>> for &'a [u8] {
+impl<'b> Compare<AsciiCaseless<&'b [u8]>> for &[u8] {
     #[inline]
     fn compare(&self, t: AsciiCaseless<&'b [u8]>) -> CompareResult {
         if t.0
@@ -2101,192 +2242,114 @@
         } else if self.len() < t.slice_len() {
             CompareResult::Incomplete
         } else {
-            CompareResult::Ok
+            CompareResult::Ok(t.slice_len())
         }
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<&'b [u8]>) -> CompareResult {
-        self.compare(t)
-    }
 }
 
-impl<'a, const LEN: usize> Compare<[u8; LEN]> for &'a [u8] {
+impl<const LEN: usize> Compare<[u8; LEN]> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: [u8; LEN]) -> CompareResult {
         self.compare(&t[..])
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: [u8; LEN]) -> CompareResult {
-        self.compare_no_case(&t[..])
-    }
 }
 
-impl<'a, const LEN: usize> Compare<AsciiCaseless<[u8; LEN]>> for &'a [u8] {
+impl<const LEN: usize> Compare<AsciiCaseless<[u8; LEN]>> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: AsciiCaseless<[u8; LEN]>) -> CompareResult {
         self.compare(AsciiCaseless(&t.0[..]))
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<[u8; LEN]>) -> CompareResult {
-        self.compare_no_case(AsciiCaseless(&t.0[..]))
-    }
 }
 
-impl<'a, 'b, const LEN: usize> Compare<&'b [u8; LEN]> for &'a [u8] {
+impl<'b, const LEN: usize> Compare<&'b [u8; LEN]> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: &'b [u8; LEN]) -> CompareResult {
         self.compare(&t[..])
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: &'b [u8; LEN]) -> CompareResult {
-        self.compare_no_case(&t[..])
-    }
 }
 
-impl<'a, 'b, const LEN: usize> Compare<AsciiCaseless<&'b [u8; LEN]>> for &'a [u8] {
+impl<'b, const LEN: usize> Compare<AsciiCaseless<&'b [u8; LEN]>> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: AsciiCaseless<&'b [u8; LEN]>) -> CompareResult {
         self.compare(AsciiCaseless(&t.0[..]))
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<&'b [u8; LEN]>) -> CompareResult {
-        self.compare_no_case(AsciiCaseless(&t.0[..]))
-    }
 }
 
-impl<'a, 'b> Compare<&'b str> for &'a [u8] {
+impl<'b> Compare<&'b str> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: &'b str) -> CompareResult {
         self.compare(t.as_bytes())
     }
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: &'b str) -> CompareResult {
-        self.compare_no_case(t.as_bytes())
-    }
 }
 
-impl<'a, 'b> Compare<AsciiCaseless<&'b str>> for &'a [u8] {
+impl<'b> Compare<AsciiCaseless<&'b str>> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: AsciiCaseless<&'b str>) -> CompareResult {
         self.compare(AsciiCaseless(t.0.as_bytes()))
     }
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<&'b str>) -> CompareResult {
-        self.compare_no_case(AsciiCaseless(t.0.as_bytes()))
+}
+
+impl Compare<u8> for &[u8] {
+    #[inline]
+    fn compare(&self, t: u8) -> CompareResult {
+        match self.first().copied() {
+            Some(c) if t == c => CompareResult::Ok(t.slice_len()),
+            Some(_) => CompareResult::Error,
+            None => CompareResult::Incomplete,
+        }
     }
 }
 
-impl<'a> Compare<char> for &'a [u8] {
+impl Compare<AsciiCaseless<u8>> for &[u8] {
+    #[inline]
+    fn compare(&self, t: AsciiCaseless<u8>) -> CompareResult {
+        match self.first() {
+            Some(c) if t.0.eq_ignore_ascii_case(c) => CompareResult::Ok(t.slice_len()),
+            Some(_) => CompareResult::Error,
+            None => CompareResult::Incomplete,
+        }
+    }
+}
+
+impl Compare<char> for &[u8] {
     #[inline(always)]
     fn compare(&self, t: char) -> CompareResult {
         self.compare(t.encode_utf8(&mut [0; 4]).as_bytes())
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: char) -> CompareResult {
-        self.compare_no_case(t.encode_utf8(&mut [0; 4]).as_bytes())
-    }
 }
 
-impl<'a> Compare<AsciiCaseless<char>> for &'a [u8] {
-    #[inline]
+impl Compare<AsciiCaseless<char>> for &[u8] {
+    #[inline(always)]
     fn compare(&self, t: AsciiCaseless<char>) -> CompareResult {
         self.compare(AsciiCaseless(t.0.encode_utf8(&mut [0; 4]).as_bytes()))
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<char>) -> CompareResult {
-        self.compare_no_case(AsciiCaseless(t.0.encode_utf8(&mut [0; 4]).as_bytes()))
-    }
 }
 
-impl<'a, 'b> Compare<&'b str> for &'a str {
+impl<'b> Compare<&'b str> for &str {
     #[inline(always)]
     fn compare(&self, t: &'b str) -> CompareResult {
         self.as_bytes().compare(t.as_bytes())
     }
-
-    #[inline]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: &'b str) -> CompareResult {
-        self.compare(AsciiCaseless(t))
-    }
 }
 
-impl<'a, 'b> Compare<AsciiCaseless<&'b str>> for &'a str {
+impl<'b> Compare<AsciiCaseless<&'b str>> for &str {
     #[inline(always)]
     fn compare(&self, t: AsciiCaseless<&'b str>) -> CompareResult {
         self.as_bytes().compare(t.as_bytes())
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<&'b str>) -> CompareResult {
-        self.compare(t)
-    }
 }
 
-impl<'a> Compare<char> for &'a str {
+impl Compare<char> for &str {
     #[inline(always)]
     fn compare(&self, t: char) -> CompareResult {
-        self.compare(t.encode_utf8(&mut [0; 4]).as_bytes())
-    }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: char) -> CompareResult {
-        self.compare_no_case(t.encode_utf8(&mut [0; 4]).as_bytes())
+        self.as_bytes().compare(t)
     }
 }
 
-impl<'a> Compare<AsciiCaseless<char>> for &'a str {
-    #[inline]
+impl Compare<AsciiCaseless<char>> for &str {
+    #[inline(always)]
     fn compare(&self, t: AsciiCaseless<char>) -> CompareResult {
-        self.compare(AsciiCaseless(t.0.encode_utf8(&mut [0; 4]).as_bytes()))
-    }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<char>) -> CompareResult {
-        self.compare_no_case(AsciiCaseless(t.0.encode_utf8(&mut [0; 4]).as_bytes()))
-    }
-}
-
-impl<'a, 'b> Compare<&'b [u8]> for &'a str {
-    #[inline(always)]
-    fn compare(&self, t: &'b [u8]) -> CompareResult {
-        AsBStr::as_bstr(self).compare(t)
-    }
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: &'b [u8]) -> CompareResult {
-        AsBStr::as_bstr(self).compare_no_case(t)
-    }
-}
-
-impl<'a, 'b> Compare<AsciiCaseless<&'b [u8]>> for &'a str {
-    #[inline(always)]
-    fn compare(&self, t: AsciiCaseless<&'b [u8]>) -> CompareResult {
-        AsBStr::as_bstr(self).compare(t)
-    }
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: AsciiCaseless<&'b [u8]>) -> CompareResult {
-        AsBStr::as_bstr(self).compare_no_case(t)
+        self.as_bytes().compare(t)
     }
 }
 
@@ -2299,13 +2362,6 @@
         let bytes = (*self).as_bytes();
         bytes.compare(t)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: T) -> CompareResult {
-        let bytes = (*self).as_bytes();
-        bytes.compare_no_case(t)
-    }
 }
 
 impl<'a, T> Compare<T> for &'a BStr
@@ -2317,16 +2373,9 @@
         let bytes = (*self).as_bytes();
         bytes.compare(t)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: T) -> CompareResult {
-        let bytes = (*self).as_bytes();
-        bytes.compare_no_case(t)
-    }
 }
 
-impl<I, U> Compare<U> for Located<I>
+impl<I, U> Compare<U> for LocatingSlice<I>
 where
     I: Compare<U>,
 {
@@ -2334,15 +2383,10 @@
     fn compare(&self, other: U) -> CompareResult {
         self.input.compare(other)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, other: U) -> CompareResult {
-        self.input.compare_no_case(other)
-    }
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E, U> Compare<U> for Recoverable<I, E>
 where
     I: Stream,
@@ -2352,12 +2396,6 @@
     fn compare(&self, other: U) -> CompareResult {
         self.input.compare(other)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, other: U) -> CompareResult {
-        self.input.compare_no_case(other)
-    }
 }
 
 impl<I, S, U> Compare<U> for Stateful<I, S>
@@ -2368,12 +2406,6 @@
     fn compare(&self, other: U) -> CompareResult {
         self.input.compare(other)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, other: U) -> CompareResult {
-        self.input.compare_no_case(other)
-    }
 }
 
 impl<I, T> Compare<T> for Partial<I>
@@ -2384,100 +2416,145 @@
     fn compare(&self, t: T) -> CompareResult {
         self.input.compare(t)
     }
-
-    #[inline(always)]
-    #[allow(deprecated)]
-    fn compare_no_case(&self, t: T) -> CompareResult {
-        self.input.compare_no_case(t)
-    }
 }
 
 /// Look for a slice in self
 pub trait FindSlice<T> {
     /// Returns the offset of the slice if it is found
-    fn find_slice(&self, substr: T) -> Option<usize>;
+    fn find_slice(&self, substr: T) -> Option<crate::lib::std::ops::Range<usize>>;
 }
 
-impl<'i, 's> FindSlice<&'s [u8]> for &'i [u8] {
+impl<'s> FindSlice<&'s [u8]> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: &'s [u8]) -> Option<usize> {
+    fn find_slice(&self, substr: &'s [u8]) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem(self, substr)
     }
 }
 
-impl<'i, 's> FindSlice<(&'s [u8],)> for &'i [u8] {
+impl<'s> FindSlice<(&'s [u8],)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s [u8],)) -> Option<usize> {
+    fn find_slice(&self, substr: (&'s [u8],)) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem(self, substr.0)
     }
 }
 
-impl<'i, 's> FindSlice<(&'s [u8], &'s [u8])> for &'i [u8] {
+impl<'s> FindSlice<(&'s [u8], &'s [u8])> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s [u8], &'s [u8])) -> Option<usize> {
+    fn find_slice(
+        &self,
+        substr: (&'s [u8], &'s [u8]),
+    ) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem2(self, substr)
     }
 }
 
-impl<'i, 's> FindSlice<(&'s [u8], &'s [u8], &'s [u8])> for &'i [u8] {
+impl<'s> FindSlice<(&'s [u8], &'s [u8], &'s [u8])> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s [u8], &'s [u8], &'s [u8])) -> Option<usize> {
+    fn find_slice(
+        &self,
+        substr: (&'s [u8], &'s [u8], &'s [u8]),
+    ) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem3(self, substr)
     }
 }
 
-impl<'i> FindSlice<u8> for &'i [u8] {
+impl FindSlice<char> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: u8) -> Option<usize> {
-        memchr(substr, self)
+    fn find_slice(&self, substr: char) -> Option<crate::lib::std::ops::Range<usize>> {
+        let mut b = [0; 4];
+        let substr = substr.encode_utf8(&mut b);
+        self.find_slice(&*substr)
     }
 }
 
-impl<'i> FindSlice<(u8,)> for &'i [u8] {
+impl FindSlice<(char,)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (u8,)) -> Option<usize> {
-        memchr(substr.0, self)
+    fn find_slice(&self, substr: (char,)) -> Option<crate::lib::std::ops::Range<usize>> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        self.find_slice((&*substr0,))
     }
 }
 
-impl<'i> FindSlice<(u8, u8)> for &'i [u8] {
+impl FindSlice<(char, char)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (u8, u8)) -> Option<usize> {
-        memchr2(substr, self)
+    fn find_slice(&self, substr: (char, char)) -> Option<crate::lib::std::ops::Range<usize>> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr1 = substr.1.encode_utf8(&mut b);
+        self.find_slice((&*substr0, &*substr1))
     }
 }
 
-impl<'i> FindSlice<(u8, u8, u8)> for &'i [u8] {
+impl FindSlice<(char, char, char)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (u8, u8, u8)) -> Option<usize> {
-        memchr3(substr, self)
+    fn find_slice(&self, substr: (char, char, char)) -> Option<crate::lib::std::ops::Range<usize>> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr1 = substr.1.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr2 = substr.2.encode_utf8(&mut b);
+        self.find_slice((&*substr0, &*substr1, &*substr2))
     }
 }
 
-impl<'i, 's> FindSlice<&'s str> for &'i [u8] {
+impl FindSlice<u8> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: &'s str) -> Option<usize> {
+    fn find_slice(&self, substr: u8) -> Option<crate::lib::std::ops::Range<usize>> {
+        memchr(substr, self).map(|i| i..i + 1)
+    }
+}
+
+impl FindSlice<(u8,)> for &[u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (u8,)) -> Option<crate::lib::std::ops::Range<usize>> {
+        memchr(substr.0, self).map(|i| i..i + 1)
+    }
+}
+
+impl FindSlice<(u8, u8)> for &[u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (u8, u8)) -> Option<crate::lib::std::ops::Range<usize>> {
+        memchr2(substr, self).map(|i| i..i + 1)
+    }
+}
+
+impl FindSlice<(u8, u8, u8)> for &[u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (u8, u8, u8)) -> Option<crate::lib::std::ops::Range<usize>> {
+        memchr3(substr, self).map(|i| i..i + 1)
+    }
+}
+
+impl<'s> FindSlice<&'s str> for &[u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: &'s str) -> Option<crate::lib::std::ops::Range<usize>> {
         self.find_slice(substr.as_bytes())
     }
 }
 
-impl<'i, 's> FindSlice<(&'s str,)> for &'i [u8] {
+impl<'s> FindSlice<(&'s str,)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s str,)) -> Option<usize> {
+    fn find_slice(&self, substr: (&'s str,)) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem(self, substr.0.as_bytes())
     }
 }
 
-impl<'i, 's> FindSlice<(&'s str, &'s str)> for &'i [u8] {
+impl<'s> FindSlice<(&'s str, &'s str)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s str, &'s str)) -> Option<usize> {
+    fn find_slice(&self, substr: (&'s str, &'s str)) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem2(self, (substr.0.as_bytes(), substr.1.as_bytes()))
     }
 }
 
-impl<'i, 's> FindSlice<(&'s str, &'s str, &'s str)> for &'i [u8] {
+impl<'s> FindSlice<(&'s str, &'s str, &'s str)> for &[u8] {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s str, &'s str, &'s str)) -> Option<usize> {
+    fn find_slice(
+        &self,
+        substr: (&'s str, &'s str, &'s str),
+    ) -> Option<crate::lib::std::ops::Range<usize>> {
         memmem3(
             self,
             (
@@ -2489,101 +2566,62 @@
     }
 }
 
-impl<'i, 's> FindSlice<&'s str> for &'i str {
+impl<'s> FindSlice<&'s str> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: &'s str) -> Option<usize> {
-        self.as_bytes().find_slice(substr.as_bytes())
-    }
-}
-
-impl<'i, 's> FindSlice<(&'s str,)> for &'i str {
-    #[inline(always)]
-    fn find_slice(&self, substr: (&'s str,)) -> Option<usize> {
+    fn find_slice(&self, substr: &'s str) -> Option<crate::lib::std::ops::Range<usize>> {
         self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i, 's> FindSlice<(&'s str, &'s str)> for &'i str {
+impl<'s> FindSlice<(&'s str,)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s str, &'s str)) -> Option<usize> {
+    fn find_slice(&self, substr: (&'s str,)) -> Option<crate::lib::std::ops::Range<usize>> {
         self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i, 's> FindSlice<(&'s str, &'s str, &'s str)> for &'i str {
+impl<'s> FindSlice<(&'s str, &'s str)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: (&'s str, &'s str, &'s str)) -> Option<usize> {
+    fn find_slice(&self, substr: (&'s str, &'s str)) -> Option<crate::lib::std::ops::Range<usize>> {
         self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i> FindSlice<char> for &'i str {
+impl<'s> FindSlice<(&'s str, &'s str, &'s str)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: char) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr = substr.encode_utf8(&mut b);
-        self.find_slice(&*substr)
+    fn find_slice(
+        &self,
+        substr: (&'s str, &'s str, &'s str),
+    ) -> Option<crate::lib::std::ops::Range<usize>> {
+        self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i> FindSlice<(char,)> for &'i str {
+impl FindSlice<char> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: (char,)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        self.find_slice((&*substr0,))
+    fn find_slice(&self, substr: char) -> Option<crate::lib::std::ops::Range<usize>> {
+        self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i> FindSlice<(char, char)> for &'i str {
+impl FindSlice<(char,)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: (char, char)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr1 = substr.1.encode_utf8(&mut b);
-        self.find_slice((&*substr0, &*substr1))
+    fn find_slice(&self, substr: (char,)) -> Option<crate::lib::std::ops::Range<usize>> {
+        self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i> FindSlice<(char, char, char)> for &'i str {
+impl FindSlice<(char, char)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: (char, char, char)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr1 = substr.1.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr2 = substr.2.encode_utf8(&mut b);
-        self.find_slice((&*substr0, &*substr1, &*substr2))
+    fn find_slice(&self, substr: (char, char)) -> Option<crate::lib::std::ops::Range<usize>> {
+        self.as_bytes().find_slice(substr)
     }
 }
 
-impl<'i> FindSlice<u8> for &'i str {
+impl FindSlice<(char, char, char)> for &str {
     #[inline(always)]
-    fn find_slice(&self, substr: u8) -> Option<usize> {
-        self.find_slice(substr.as_char())
-    }
-}
-
-impl<'i> FindSlice<(u8,)> for &'i str {
-    #[inline(always)]
-    fn find_slice(&self, substr: (u8,)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(),))
-    }
-}
-
-impl<'i> FindSlice<(u8, u8)> for &'i str {
-    #[inline(always)]
-    fn find_slice(&self, substr: (u8, u8)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(), substr.1.as_char()))
-    }
-}
-
-impl<'i> FindSlice<(u8, u8, u8)> for &'i str {
-    #[inline(always)]
-    fn find_slice(&self, substr: (u8, u8, u8)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(), substr.1.as_char(), substr.2.as_char()))
+    fn find_slice(&self, substr: (char, char, char)) -> Option<crate::lib::std::ops::Range<usize>> {
+        self.as_bytes().find_slice(substr)
     }
 }
 
@@ -2592,7 +2630,7 @@
     &'i [u8]: FindSlice<S>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: S) -> Option<usize> {
+    fn find_slice(&self, substr: S) -> Option<crate::lib::std::ops::Range<usize>> {
         let bytes = (*self).as_bytes();
         let offset = bytes.find_slice(substr);
         offset
@@ -2604,31 +2642,32 @@
     &'i [u8]: FindSlice<S>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: S) -> Option<usize> {
+    fn find_slice(&self, substr: S) -> Option<crate::lib::std::ops::Range<usize>> {
         let bytes = (*self).as_bytes();
         let offset = bytes.find_slice(substr);
         offset
     }
 }
 
-impl<I, T> FindSlice<T> for Located<I>
+impl<I, T> FindSlice<T> for LocatingSlice<I>
 where
     I: FindSlice<T>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: T) -> Option<usize> {
+    fn find_slice(&self, substr: T) -> Option<crate::lib::std::ops::Range<usize>> {
         self.input.find_slice(substr)
     }
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E, T> FindSlice<T> for Recoverable<I, E>
 where
     I: Stream,
     I: FindSlice<T>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: T) -> Option<usize> {
+    fn find_slice(&self, substr: T) -> Option<crate::lib::std::ops::Range<usize>> {
         self.input.find_slice(substr)
     }
 }
@@ -2638,7 +2677,7 @@
     I: FindSlice<T>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: T) -> Option<usize> {
+    fn find_slice(&self, substr: T) -> Option<crate::lib::std::ops::Range<usize>> {
         self.input.find_slice(substr)
     }
 }
@@ -2648,28 +2687,28 @@
     I: FindSlice<T>,
 {
     #[inline(always)]
-    fn find_slice(&self, substr: T) -> Option<usize> {
+    fn find_slice(&self, substr: T) -> Option<crate::lib::std::ops::Range<usize>> {
         self.input.find_slice(substr)
     }
 }
 
 /// Used to integrate `str`'s `parse()` method
 pub trait ParseSlice<R> {
-    /// Succeeds if `parse()` succeededThe
+    /// Succeeds if `parse()` succeeded
     ///
     /// The byte slice implementation will first convert it to a `&str`, then apply the `parse()`
     /// function
     fn parse_slice(&self) -> Option<R>;
 }
 
-impl<'a, R: FromStr> ParseSlice<R> for &'a [u8] {
+impl<R: FromStr> ParseSlice<R> for &[u8] {
     #[inline(always)]
     fn parse_slice(&self) -> Option<R> {
         from_utf8(self).ok().and_then(|s| s.parse().ok())
     }
 }
 
-impl<'a, R: FromStr> ParseSlice<R> for &'a str {
+impl<R: FromStr> ParseSlice<R> for &str {
     #[inline(always)]
     fn parse_slice(&self) -> Option<R> {
         self.parse().ok()
@@ -2682,7 +2721,7 @@
     fn update_slice(self, inner: Self::Slice) -> Self;
 }
 
-impl<'a, T> UpdateSlice for &'a [T]
+impl<T> UpdateSlice for &[T]
 where
     T: Clone + crate::lib::std::fmt::Debug,
 {
@@ -2692,28 +2731,28 @@
     }
 }
 
-impl<'a> UpdateSlice for &'a str {
+impl UpdateSlice for &str {
     #[inline(always)]
     fn update_slice(self, inner: Self::Slice) -> Self {
         inner
     }
 }
 
-impl<'a> UpdateSlice for &'a Bytes {
+impl UpdateSlice for &Bytes {
     #[inline(always)]
     fn update_slice(self, inner: Self::Slice) -> Self {
         Bytes::new(inner)
     }
 }
 
-impl<'a> UpdateSlice for &'a BStr {
+impl UpdateSlice for &BStr {
     #[inline(always)]
     fn update_slice(self, inner: Self::Slice) -> Self {
         BStr::new(inner)
     }
 }
 
-impl<I> UpdateSlice for Located<I>
+impl<I> UpdateSlice for LocatingSlice<I>
 where
     I: UpdateSlice,
 {
@@ -2725,6 +2764,7 @@
 }
 
 #[cfg(feature = "unstable-recover")]
+#[cfg(feature = "std")]
 impl<I, E> UpdateSlice for Recoverable<I, E>
 where
     I: Stream,
@@ -2764,10 +2804,89 @@
 }
 
 /// Ensure checkpoint details are kept private
-#[derive(Copy, Clone, Debug)]
-pub struct Checkpoint<T>(T);
+pub struct Checkpoint<T, S> {
+    inner: T,
+    stream: core::marker::PhantomData<S>,
+}
+
+impl<T, S> Checkpoint<T, S> {
+    fn new(inner: T) -> Self {
+        Self {
+            inner,
+            stream: Default::default(),
+        }
+    }
+}
+
+impl<T: Copy, S> Copy for Checkpoint<T, S> {}
+
+impl<T: Clone, S> Clone for Checkpoint<T, S> {
+    #[inline(always)]
+    fn clone(&self) -> Self {
+        Self {
+            inner: self.inner.clone(),
+            stream: Default::default(),
+        }
+    }
+}
+
+impl<T: PartialOrd, S> PartialOrd for Checkpoint<T, S> {
+    #[inline(always)]
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+        self.inner.partial_cmp(&other.inner)
+    }
+}
+
+impl<T: Ord, S> Ord for Checkpoint<T, S> {
+    #[inline(always)]
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+        self.inner.cmp(&other.inner)
+    }
+}
+
+impl<T: PartialEq, S> PartialEq for Checkpoint<T, S> {
+    #[inline(always)]
+    fn eq(&self, other: &Self) -> bool {
+        self.inner.eq(&other.inner)
+    }
+}
+
+impl<T: Eq, S> Eq for Checkpoint<T, S> {}
+
+impl<T: crate::lib::std::fmt::Debug, S> crate::lib::std::fmt::Debug for Checkpoint<T, S> {
+    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+        self.inner.fmt(f)
+    }
+}
 
 /// A range bounded inclusively for counting parses performed
+///
+/// This is flexible in what can be converted to a [Range]:
+/// ```rust
+/// # #[cfg(feature = "std")] {
+/// # use winnow::prelude::*;
+/// # use winnow::token::any;
+/// # use winnow::combinator::repeat;
+/// # fn inner(input: &mut &str) -> PResult<char> {
+/// #     any.parse_next(input)
+/// # }
+/// # let mut input = "0123456789012345678901234567890123456789";
+/// # let input = &mut input;
+/// let parser: Vec<_> = repeat(5, inner).parse_next(input).unwrap();
+/// # let mut input = "0123456789012345678901234567890123456789";
+/// # let input = &mut input;
+/// let parser: Vec<_> = repeat(.., inner).parse_next(input).unwrap();
+/// # let mut input = "0123456789012345678901234567890123456789";
+/// # let input = &mut input;
+/// let parser: Vec<_> = repeat(1.., inner).parse_next(input).unwrap();
+/// # let mut input = "0123456789012345678901234567890123456789";
+/// # let input = &mut input;
+/// let parser: Vec<_> = repeat(5..8, inner).parse_next(input).unwrap();
+/// # let mut input = "0123456789012345678901234567890123456789";
+/// # let input = &mut input;
+/// let parser: Vec<_> = repeat(5..=8, inner).parse_next(input).unwrap();
+/// # }
+/// ```
 #[derive(PartialEq, Eq)]
 pub struct Range {
     pub(crate) start_inclusive: usize,
@@ -3128,8 +3247,12 @@
 
     /// Tests that self is an alphabetic character
     ///
-    /// **Warning:** for `&str` it recognizes alphabetic
+    /// <div class="warning">
+    ///
+    /// **Warning:** for `&str` it matches alphabetic
     /// characters outside of the 52 ASCII letters
+    ///
+    /// </div>
     fn is_alpha(self) -> bool;
 
     /// Tests that self is an alphabetic character
@@ -3188,42 +3311,42 @@
     }
 }
 
-impl<'a> AsChar for &'a u8 {
+impl AsChar for &u8 {
     #[inline(always)]
     fn as_char(self) -> char {
-        *self as char
+        (*self).as_char()
     }
-    #[inline]
+    #[inline(always)]
     fn is_alpha(self) -> bool {
-        matches!(*self, 0x41..=0x5A | 0x61..=0x7A)
+        (*self).is_alpha()
     }
-    #[inline]
+    #[inline(always)]
     fn is_alphanum(self) -> bool {
-        self.is_alpha() || self.is_dec_digit()
+        (*self).is_alphanum()
     }
-    #[inline]
+    #[inline(always)]
     fn is_dec_digit(self) -> bool {
-        matches!(*self, 0x30..=0x39)
+        (*self).is_dec_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn is_hex_digit(self) -> bool {
-        matches!(*self, 0x30..=0x39 | 0x41..=0x46 | 0x61..=0x66)
+        (*self).is_hex_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn is_oct_digit(self) -> bool {
-        matches!(*self, 0x30..=0x37)
+        (*self).is_oct_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn len(self) -> usize {
-        1
+        (*self).len()
     }
-    #[inline]
+    #[inline(always)]
     fn is_space(self) -> bool {
-        *self == b' ' || *self == b'\t'
+        (*self).is_space()
     }
-    #[inline]
+    #[inline(always)]
     fn is_newline(self) -> bool {
-        *self == b'\n'
+        (*self).is_newline()
     }
 }
 
@@ -3266,54 +3389,53 @@
     }
 }
 
-impl<'a> AsChar for &'a char {
+impl AsChar for &char {
     #[inline(always)]
     fn as_char(self) -> char {
-        *self
+        (*self).as_char()
     }
-    #[inline]
+    #[inline(always)]
     fn is_alpha(self) -> bool {
-        self.is_ascii_alphabetic()
+        (*self).is_alpha()
     }
-    #[inline]
+    #[inline(always)]
     fn is_alphanum(self) -> bool {
-        self.is_alpha() || self.is_dec_digit()
+        (*self).is_alphanum()
     }
-    #[inline]
+    #[inline(always)]
     fn is_dec_digit(self) -> bool {
-        self.is_ascii_digit()
+        (*self).is_dec_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn is_hex_digit(self) -> bool {
-        self.is_ascii_hexdigit()
+        (*self).is_hex_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn is_oct_digit(self) -> bool {
-        self.is_digit(8)
+        (*self).is_oct_digit()
     }
-    #[inline]
+    #[inline(always)]
     fn len(self) -> usize {
-        self.len_utf8()
+        (*self).len()
     }
-    #[inline]
+    #[inline(always)]
     fn is_space(self) -> bool {
-        *self == ' ' || *self == '\t'
+        (*self).is_space()
     }
-    #[inline]
+    #[inline(always)]
     fn is_newline(self) -> bool {
-        *self == '\n'
+        (*self).is_newline()
     }
 }
 
-/// Check if a token in in a set of possible tokens
+/// Check if a token is in a set of possible tokens
 ///
-/// This is generally implemented on patterns that a token may match and supports `u8` and `char`
-/// tokens along with the following patterns
+/// While this can be implemented manually, you can also build up sets using:
 /// - `b'c'` and `'c'`
-/// - `b""` and `""`
+/// - `b""`
 /// - `|c| true`
 /// - `b'a'..=b'z'`, `'a'..='z'` (etc for each [range type][std::ops])
-/// - `(pattern1, pattern2, ...)`
+/// - `(set1, set2, ...)`
 ///
 /// # Example
 ///
@@ -3342,7 +3464,7 @@
     }
 }
 
-impl<'a> ContainsToken<&'a u8> for u8 {
+impl ContainsToken<&u8> for u8 {
     #[inline(always)]
     fn contains_token(&self, token: &u8) -> bool {
         self.contains_token(*token)
@@ -3356,7 +3478,7 @@
     }
 }
 
-impl<'a> ContainsToken<&'a char> for u8 {
+impl ContainsToken<&char> for u8 {
     #[inline(always)]
     fn contains_token(&self, token: &char) -> bool {
         self.contains_token(*token)
@@ -3558,126 +3680,147 @@
 }
 
 #[inline(always)]
-fn memmem(slice: &[u8], tag: &[u8]) -> Option<usize> {
-    if tag.len() == 1 {
-        memchr(tag[0], slice)
-    } else {
-        memmem_(slice, tag)
+fn memmem(slice: &[u8], literal: &[u8]) -> Option<crate::lib::std::ops::Range<usize>> {
+    match literal.len() {
+        0 => Some(0..0),
+        1 => memchr(literal[0], slice).map(|i| i..i + 1),
+        _ => memmem_(slice, literal),
     }
 }
 
 #[inline(always)]
-fn memmem2(slice: &[u8], tag: (&[u8], &[u8])) -> Option<usize> {
-    if tag.0.len() == 1 && tag.1.len() == 1 {
-        memchr2((tag.0[0], tag.1[0]), slice)
-    } else {
-        memmem2_(slice, tag)
+fn memmem2(slice: &[u8], literal: (&[u8], &[u8])) -> Option<crate::lib::std::ops::Range<usize>> {
+    match (literal.0.len(), literal.1.len()) {
+        (0, _) | (_, 0) => Some(0..0),
+        (1, 1) => memchr2((literal.0[0], literal.1[0]), slice).map(|i| i..i + 1),
+        _ => memmem2_(slice, literal),
     }
 }
 
 #[inline(always)]
-fn memmem3(slice: &[u8], tag: (&[u8], &[u8], &[u8])) -> Option<usize> {
-    if tag.0.len() == 1 && tag.1.len() == 1 && tag.2.len() == 1 {
-        memchr3((tag.0[0], tag.1[0], tag.2[0]), slice)
-    } else {
-        memmem3_(slice, tag)
+fn memmem3(
+    slice: &[u8],
+    literal: (&[u8], &[u8], &[u8]),
+) -> Option<crate::lib::std::ops::Range<usize>> {
+    match (literal.0.len(), literal.1.len(), literal.2.len()) {
+        (0, _, _) | (_, 0, _) | (_, _, 0) => Some(0..0),
+        (1, 1, 1) => memchr3((literal.0[0], literal.1[0], literal.2[0]), slice).map(|i| i..i + 1),
+        _ => memmem3_(slice, literal),
     }
 }
 
 #[cfg(feature = "simd")]
 #[inline(always)]
-fn memmem_(slice: &[u8], tag: &[u8]) -> Option<usize> {
-    let &prefix = match tag.first() {
+fn memmem_(slice: &[u8], literal: &[u8]) -> Option<crate::lib::std::ops::Range<usize>> {
+    let &prefix = match literal.first() {
         Some(x) => x,
-        None => return Some(0),
+        None => return Some(0..0),
     };
     #[allow(clippy::manual_find)] // faster this way
     for i in memchr::memchr_iter(prefix, slice) {
-        if slice[i..].starts_with(tag) {
-            return Some(i);
+        if slice[i..].starts_with(literal) {
+            let i_end = i + literal.len();
+            return Some(i..i_end);
         }
     }
     None
 }
 
 #[cfg(feature = "simd")]
-fn memmem2_(slice: &[u8], tag: (&[u8], &[u8])) -> Option<usize> {
-    let prefix = match (tag.0.first(), tag.1.first()) {
+fn memmem2_(slice: &[u8], literal: (&[u8], &[u8])) -> Option<crate::lib::std::ops::Range<usize>> {
+    let prefix = match (literal.0.first(), literal.1.first()) {
         (Some(&a), Some(&b)) => (a, b),
-        _ => return Some(0),
+        _ => return Some(0..0),
     };
     #[allow(clippy::manual_find)] // faster this way
     for i in memchr::memchr2_iter(prefix.0, prefix.1, slice) {
         let subslice = &slice[i..];
-        if subslice.starts_with(tag.0) {
-            return Some(i);
+        if subslice.starts_with(literal.0) {
+            let i_end = i + literal.0.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.1) {
-            return Some(i);
+        if subslice.starts_with(literal.1) {
+            let i_end = i + literal.1.len();
+            return Some(i..i_end);
         }
     }
     None
 }
 
 #[cfg(feature = "simd")]
-fn memmem3_(slice: &[u8], tag: (&[u8], &[u8], &[u8])) -> Option<usize> {
-    let prefix = match (tag.0.first(), tag.1.first(), tag.2.first()) {
+fn memmem3_(
+    slice: &[u8],
+    literal: (&[u8], &[u8], &[u8]),
+) -> Option<crate::lib::std::ops::Range<usize>> {
+    let prefix = match (literal.0.first(), literal.1.first(), literal.2.first()) {
         (Some(&a), Some(&b), Some(&c)) => (a, b, c),
-        _ => return Some(0),
+        _ => return Some(0..0),
     };
     #[allow(clippy::manual_find)] // faster this way
     for i in memchr::memchr3_iter(prefix.0, prefix.1, prefix.2, slice) {
         let subslice = &slice[i..];
-        if subslice.starts_with(tag.0) {
-            return Some(i);
+        if subslice.starts_with(literal.0) {
+            let i_end = i + literal.0.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.1) {
-            return Some(i);
+        if subslice.starts_with(literal.1) {
+            let i_end = i + literal.1.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.2) {
-            return Some(i);
+        if subslice.starts_with(literal.2) {
+            let i_end = i + literal.2.len();
+            return Some(i..i_end);
         }
     }
     None
 }
 
 #[cfg(not(feature = "simd"))]
-fn memmem_(slice: &[u8], tag: &[u8]) -> Option<usize> {
+fn memmem_(slice: &[u8], literal: &[u8]) -> Option<crate::lib::std::ops::Range<usize>> {
     for i in 0..slice.len() {
         let subslice = &slice[i..];
-        if subslice.starts_with(tag) {
-            return Some(i);
+        if subslice.starts_with(literal) {
+            let i_end = i + literal.len();
+            return Some(i..i_end);
         }
     }
     None
 }
 
 #[cfg(not(feature = "simd"))]
-fn memmem2_(slice: &[u8], tag: (&[u8], &[u8])) -> Option<usize> {
+fn memmem2_(slice: &[u8], literal: (&[u8], &[u8])) -> Option<crate::lib::std::ops::Range<usize>> {
     for i in 0..slice.len() {
         let subslice = &slice[i..];
-        if subslice.starts_with(tag.0) {
-            return Some(i);
+        if subslice.starts_with(literal.0) {
+            let i_end = i + literal.0.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.1) {
-            return Some(i);
+        if subslice.starts_with(literal.1) {
+            let i_end = i + literal.1.len();
+            return Some(i..i_end);
         }
     }
     None
 }
 
 #[cfg(not(feature = "simd"))]
-fn memmem3_(slice: &[u8], tag: (&[u8], &[u8], &[u8])) -> Option<usize> {
+fn memmem3_(
+    slice: &[u8],
+    literal: (&[u8], &[u8], &[u8]),
+) -> Option<crate::lib::std::ops::Range<usize>> {
     for i in 0..slice.len() {
         let subslice = &slice[i..];
-        if subslice.starts_with(tag.0) {
-            return Some(i);
+        if subslice.starts_with(literal.0) {
+            let i_end = i + literal.0.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.1) {
-            return Some(i);
+        if subslice.starts_with(literal.1) {
+            let i_end = i + literal.1.len();
+            return Some(i..i_end);
         }
-        if subslice.starts_with(tag.2) {
-            return Some(i);
+        if subslice.starts_with(literal.2) {
+            let i_end = i + literal.2.len();
+            return Some(i..i_end);
         }
     }
     None

crates/winnow/src/stream/tests.rs

diff --git a/crates/winnow/src/stream/tests.rs b/crates/winnow/src/stream/tests.rs
index 06047df..56fbc4c 100644
--- a/crates/winnow/src/stream/tests.rs
+++ b/crates/winnow/src/stream/tests.rs
@@ -3,7 +3,7 @@
 
 use crate::error::ErrMode::Backtrack;
 use crate::error::{ErrorKind, InputError};
-use crate::token::tag;
+use crate::token::literal;
 use crate::{
     combinator::{separated, separated_pair},
     PResult, Parser,
@@ -151,78 +151,78 @@
 }
 
 #[test]
-fn test_tag_support_char() {
+fn test_literal_support_char() {
     assert_eq!(
-        tag::<_, _, InputError<_>>('π').parse_peek("π"),
+        literal::<_, _, InputError<_>>('π').parse_peek("π"),
         Ok(("", "π"))
     );
     assert_eq!(
-        tag::<_, _, InputError<_>>('π').parse_peek("π3.14"),
+        literal::<_, _, InputError<_>>('π').parse_peek("π3.14"),
         Ok(("3.14", "π"))
     );
 
     assert_eq!(
-        tag::<_, _, InputError<_>>("π").parse_peek("π3.14"),
+        literal::<_, _, InputError<_>>("π").parse_peek("π3.14"),
         Ok(("3.14", "π"))
     );
 
     assert_eq!(
-        tag::<_, _, InputError<_>>('-').parse_peek("π"),
+        literal::<_, _, InputError<_>>('-').parse_peek("π"),
         Err(Backtrack(InputError::new("π", ErrorKind::Tag)))
     );
 
     assert_eq!(
-        tag::<_, Partial<&[u8]>, InputError<_>>('π').parse_peek(Partial::new(b"\xCF\x80")),
+        literal::<_, Partial<&[u8]>, InputError<_>>('π').parse_peek(Partial::new(b"\xCF\x80")),
         Ok((Partial::new(Default::default()), "π".as_bytes()))
     );
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x80"),
+        literal::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x80"),
         Ok((Default::default(), "π".as_bytes()))
     );
 
     assert_eq!(
-        tag::<_, Partial<&[u8]>, InputError<_>>('π').parse_peek(Partial::new(b"\xCF\x803.14")),
+        literal::<_, Partial<&[u8]>, InputError<_>>('π').parse_peek(Partial::new(b"\xCF\x803.14")),
         Ok((Partial::new(&b"3.14"[..]), "π".as_bytes()))
     );
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x80"),
+        literal::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x80"),
         Ok((Default::default(), "π".as_bytes()))
     );
 
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x803.14"),
+        literal::<_, &[u8], InputError<_>>('π').parse_peek(b"\xCF\x803.14"),
         Ok((&b"3.14"[..], "π".as_bytes()))
     );
 
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>(AsciiCaseless('a')).parse_peek(b"ABCxyz"),
+        literal::<_, &[u8], InputError<_>>(AsciiCaseless('a')).parse_peek(b"ABCxyz"),
         Ok((&b"BCxyz"[..], &b"A"[..]))
     );
 
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>('a').parse_peek(b"ABCxyz"),
+        literal::<_, &[u8], InputError<_>>('a').parse_peek(b"ABCxyz"),
         Err(Backtrack(InputError::new(&b"ABCxyz"[..], ErrorKind::Tag)))
     );
 
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>(AsciiCaseless('π')).parse_peek(b"\xCF\x803.14"),
+        literal::<_, &[u8], InputError<_>>(AsciiCaseless('π')).parse_peek(b"\xCF\x803.14"),
         Ok((&b"3.14"[..], "π".as_bytes()))
     );
 
     assert_eq!(
-        tag::<_, _, InputError<_>>(AsciiCaseless('🧑')).parse_peek("🧑你好"),
+        literal::<_, _, InputError<_>>(AsciiCaseless('🧑')).parse_peek("🧑你好"),
         Ok(("你好", "🧑"))
     );
 
     let mut buffer = [0; 4];
     let input = '\u{241b}'.encode_utf8(&mut buffer);
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>(AsciiCaseless('␛')).parse_peek(input.as_bytes()),
+        literal::<_, &[u8], InputError<_>>(AsciiCaseless('␛')).parse_peek(input.as_bytes()),
         Ok((&b""[..], [226, 144, 155].as_slice()))
     );
 
     assert_eq!(
-        tag::<_, &[u8], InputError<_>>('-').parse_peek(b"\xCF\x80"),
+        literal::<_, &[u8], InputError<_>>('-').parse_peek(b"\xCF\x80"),
         Err(Backtrack(InputError::new(&b"\xCF\x80"[..], ErrorKind::Tag)))
     );
 }

crates/winnow/src/token/mod.rs

diff --git a/crates/winnow/src/token/mod.rs b/crates/winnow/src/token/mod.rs
index 8641515..f17ded0 100644
--- a/crates/winnow/src/token/mod.rs
+++ b/crates/winnow/src/token/mod.rs
@@ -4,6 +4,7 @@
 mod tests;
 
 use crate::combinator::trace;
+use crate::combinator::DisplayDebug;
 use crate::error::ErrMode;
 use crate::error::ErrorKind;
 use crate::error::Needed;
@@ -19,7 +20,18 @@
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn any(input: &mut &str) -> PResult<char>
+/// # {
+/// #     winnow::token::any.parse_next(input)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -43,13 +55,13 @@
 /// ```
 #[inline(always)]
 #[doc(alias = "token")]
-pub fn any<I, E: ParserError<I>>(input: &mut I) -> PResult<<I as Stream>::Token, E>
+pub fn any<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Token, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
+    Input: StreamIsPartial + Stream,
+    Error: ParserError<Input>,
 {
-    trace("any", move |input: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() {
+    trace("any", move |input: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
             any_::<_, _, true>(input)
         } else {
             any_::<_, _, false>(input)
@@ -76,20 +88,35 @@
 
 /// Recognizes a literal
 ///
-/// The input data will be compared to the tag combinator's argument and will return the part of
+/// The input data will be compared to the literal combinator's argument and will return the part of
 /// the input that matches the argument
 ///
-/// It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Tag)))` if the input doesn't match the pattern
+/// It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Tag)))` if the input doesn't match the literal
+///
+/// <div class="warning">
 ///
 /// **Note:** [`Parser`] is implemented for strings and byte strings as a convenience (complete
 /// only)
 ///
+/// </div>
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::error::ContextError;
+/// pub fn literal(literal: &str) -> impl Parser<&str, &str, ContextError>
+/// # {
+/// #     winnow::token::literal(literal)
+/// # }
+/// ```
+///
 /// # Example
 /// ```rust
 /// # use winnow::prelude::*;
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// use winnow::token::tag;
-///
+/// #
 /// fn parser(s: &str) -> IResult<&str, &str> {
 ///   "Hello".parse_peek(s)
 /// }
@@ -103,7 +130,6 @@
 /// # use winnow::prelude::*;
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::Partial;
-/// use winnow::token::tag;
 ///
 /// fn parser(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
 ///   "Hello".parse_peek(s)
@@ -118,11 +144,11 @@
 /// ```rust
 /// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
 /// # use winnow::prelude::*;
-/// use winnow::token::tag;
+/// use winnow::token::literal;
 /// use winnow::ascii::Caseless;
 ///
 /// fn parser(s: &str) -> IResult<&str, &str> {
-///   tag(Caseless("hello")).parse_peek(s)
+///   literal(Caseless("hello")).parse_peek(s)
 /// }
 ///
 /// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
@@ -132,40 +158,42 @@
 /// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
 /// ```
 #[inline(always)]
-#[doc(alias = "literal")]
+#[doc(alias = "tag")]
 #[doc(alias = "bytes")]
 #[doc(alias = "just")]
-pub fn tag<T, I, Error: ParserError<I>>(tag: T) -> impl Parser<I, <I as Stream>::Slice, Error>
+pub fn literal<Literal, Input, Error>(
+    literal: Literal,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream + Compare<T>,
-    T: SliceLen + Clone,
+    Input: StreamIsPartial + Stream + Compare<Literal>,
+    Literal: SliceLen + Clone + crate::lib::std::fmt::Debug,
+    Error: ParserError<Input>,
 {
-    trace("tag", move |i: &mut I| {
-        let t = tag.clone();
-        if <I as StreamIsPartial>::is_partial_supported() {
-            tag_::<_, _, _, true>(i, t)
+    trace(DisplayDebug(literal.clone()), move |i: &mut Input| {
+        let t = literal.clone();
+        if <Input as StreamIsPartial>::is_partial_supported() {
+            literal_::<_, _, _, true>(i, t)
         } else {
-            tag_::<_, _, _, false>(i, t)
+            literal_::<_, _, _, false>(i, t)
         }
     })
 }
 
-fn tag_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
+fn literal_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
     i: &mut I,
     t: T,
 ) -> PResult<<I as Stream>::Slice, Error>
 where
     I: StreamIsPartial,
     I: Stream + Compare<T>,
-    T: SliceLen,
+    T: SliceLen + crate::lib::std::fmt::Debug,
 {
-    let tag_len = t.slice_len();
+    let literal_len = t.slice_len();
     match i.compare(t) {
-        CompareResult::Ok => Ok(i.next_slice(tag_len)),
-        CompareResult::Incomplete if PARTIAL && i.is_partial() => {
-            Err(ErrMode::Incomplete(Needed::new(tag_len - i.eof_offset())))
-        }
+        CompareResult::Ok(len) => Ok(i.next_slice(len)),
+        CompareResult::Incomplete if PARTIAL && i.is_partial() => Err(ErrMode::Incomplete(
+            Needed::new(literal_len - i.eof_offset()),
+        )),
         CompareResult::Incomplete | CompareResult::Error => {
             let e: ErrorKind = ErrorKind::Tag;
             Err(ErrMode::from_error_kind(i, e))
@@ -173,104 +201,33 @@
     }
 }
 
-/// Recognizes a case insensitive literal.
+/// Recognize a token that matches a [set of tokens][ContainsToken]
 ///
-/// The input data will be compared to the tag combinator's argument and will return the part of
-/// the input that matches the argument with no regard to case.
-///
-/// It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Tag)))` if the input doesn't match the pattern.
-///
-/// # Example
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// # use winnow::prelude::*;
-/// use winnow::token::tag_no_case;
-///
-/// fn parser(s: &str) -> IResult<&str, &str> {
-///   tag_no_case("hello").parse_peek(s)
-/// }
-///
-/// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
-/// assert_eq!(parser("hello, World!"), Ok((", World!", "hello")));
-/// assert_eq!(parser("HeLlO, World!"), Ok((", World!", "HeLlO")));
-/// assert_eq!(parser("Something"), Err(ErrMode::Backtrack(InputError::new("Something", ErrorKind::Tag))));
-/// assert_eq!(parser(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Tag))));
-/// ```
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// # use winnow::prelude::*;
-/// # use winnow::Partial;
-/// use winnow::token::tag_no_case;
-///
-/// fn parser(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
-///   tag_no_case("hello").parse_peek(s)
-/// }
-///
-/// assert_eq!(parser(Partial::new("Hello, World!")), Ok((Partial::new(", World!"), "Hello")));
-/// assert_eq!(parser(Partial::new("hello, World!")), Ok((Partial::new(", World!"), "hello")));
-/// assert_eq!(parser(Partial::new("HeLlO, World!")), Ok((Partial::new(", World!"), "HeLlO")));
-/// assert_eq!(parser(Partial::new("Something")), Err(ErrMode::Backtrack(InputError::new(Partial::new("Something"), ErrorKind::Tag))));
-/// assert_eq!(parser(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(5))));
-/// ```
-#[inline(always)]
-#[doc(alias = "literal")]
-#[doc(alias = "bytes")]
-#[doc(alias = "just")]
-#[deprecated(since = "0.5.20", note = "Replaced with `tag(ascii::Caseless(_))`")]
-pub fn tag_no_case<T, I, Error: ParserError<I>>(
-    tag: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream + Compare<T>,
-    T: SliceLen + Clone,
-{
-    trace("tag_no_case", move |i: &mut I| {
-        let t = tag.clone();
-        if <I as StreamIsPartial>::is_partial_supported() {
-            tag_no_case_::<_, _, _, true>(i, t)
-        } else {
-            tag_no_case_::<_, _, _, false>(i, t)
-        }
-    })
-}
-
-#[allow(deprecated)]
-fn tag_no_case_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
-    i: &mut I,
-    t: T,
-) -> PResult<<I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream + Compare<T>,
-    T: SliceLen,
-{
-    let tag_len = t.slice_len();
-
-    match i.compare_no_case(t) {
-        CompareResult::Ok => Ok(i.next_slice(tag_len)),
-        CompareResult::Incomplete if PARTIAL && i.is_partial() => {
-            Err(ErrMode::Incomplete(Needed::new(tag_len - i.eof_offset())))
-        }
-        CompareResult::Incomplete | CompareResult::Error => {
-            let e: ErrorKind = ErrorKind::Tag;
-            Err(ErrMode::from_error_kind(i, e))
-        }
-    }
-}
-
-/// Recognize a token that matches the [pattern][ContainsToken]
+/// <div class="warning">
 ///
 /// **Note:** [`Parser`] is implemented as a convenience (complete
 /// only) for
 /// - `u8`
 /// - `char`
 ///
+/// </div>
+///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::stream::ContainsToken;
+/// # use winnow::error::ContextError;
+/// pub fn one_of<'i>(set: impl ContainsToken<char>) -> impl Parser<&'i str, char, ContextError>
+/// # {
+/// #     winnow::token::one_of(set)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -310,24 +267,37 @@
 #[doc(alias = "char")]
 #[doc(alias = "token")]
 #[doc(alias = "satisfy")]
-pub fn one_of<I, T, Error: ParserError<I>>(list: T) -> impl Parser<I, <I as Stream>::Token, Error>
+pub fn one_of<Input, Set, Error>(set: Set) -> impl Parser<Input, <Input as Stream>::Token, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: Clone,
-    T: ContainsToken<<I as Stream>::Token>,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: Clone,
+    Set: ContainsToken<<Input as Stream>::Token>,
+    Error: ParserError<Input>,
 {
     trace(
         "one_of",
-        any.verify(move |t: &<I as Stream>::Token| list.contains_token(t.clone())),
+        any.verify(move |t: &<Input as Stream>::Token| set.contains_token(t.clone())),
     )
 }
 
-/// Recognize a token that does not match the [pattern][ContainsToken]
+/// Recognize a token that does not match a [set of tokens][ContainsToken]
 ///
 /// *Complete version*: Will return an error if there's not enough input data.
 ///
-/// *Partial version*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+/// *[Partial version][crate::_topic::partial]*: Will return `Err(winnow::error::ErrMode::Incomplete(_))` if there's not enough input data.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// # use winnow::stream::ContainsToken;
+/// # use winnow::error::ContextError;
+/// pub fn none_of<'i>(set: impl ContainsToken<char>) -> impl Parser<&'i str, char, ContextError>
+/// # {
+/// #     winnow::token::none_of(set)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -350,27 +320,41 @@
 /// assert_eq!(none_of::<_, _, InputError<_>>('a').parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
 /// ```
 #[inline(always)]
-pub fn none_of<I, T, Error: ParserError<I>>(list: T) -> impl Parser<I, <I as Stream>::Token, Error>
+pub fn none_of<Input, Set, Error>(set: Set) -> impl Parser<Input, <Input as Stream>::Token, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    <I as Stream>::Token: Clone,
-    T: ContainsToken<<I as Stream>::Token>,
+    Input: StreamIsPartial + Stream,
+    <Input as Stream>::Token: Clone,
+    Set: ContainsToken<<Input as Stream>::Token>,
+    Error: ParserError<Input>,
 {
     trace(
         "none_of",
-        any.verify(move |t: &<I as Stream>::Token| !list.contains_token(t.clone())),
+        any.verify(move |t: &<Input as Stream>::Token| !set.contains_token(t.clone())),
     )
 }
 
-/// Recognize the longest (m <= len <= n) input slice that matches the [pattern][ContainsToken]
+/// Recognize the longest (m <= len <= n) input slice that matches a [set of tokens][ContainsToken]
 ///
-/// It will return an `ErrMode::Backtrack(InputError::new(_, ErrorKind::Slice))` if the pattern wasn't met or is out
+/// It will return an `ErrMode::Backtrack(InputError::new(_, ErrorKind::Slice))` if the set of tokens wasn't met or is out
 /// of range (m <= len <= n).
 ///
-/// *Partial version* will return a `ErrMode::Incomplete(Needed::new(1))` if the pattern reaches the end of the input or is too short.
+/// *[Partial version][crate::_topic::partial]* will return a `ErrMode::Incomplete(Needed::new(1))` if a member of the set of tokens reaches the end of the input or is too short.
 ///
-/// To recognize a series of tokens, use [`repeat`][crate::combinator::repeat] to [`Accumulate`][crate::stream::Accumulate] into a `()` and then [`Parser::recognize`].
+/// To take a series of tokens, use [`repeat`][crate::combinator::repeat] to [`Accumulate`][crate::stream::Accumulate] into a `()` and then [`Parser::take`].
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] with `0..` or `1..` [ranges][Range]:
+/// ```rust
+/// # use std::ops::RangeFrom;
+/// # use winnow::prelude::*;
+/// # use winnow::stream::ContainsToken;
+/// # use winnow::error::ContextError;
+/// pub fn take_while<'i>(occurrences: RangeFrom<usize>, set: impl ContainsToken<char>) -> impl Parser<&'i str, &'i str, ContextError>
+/// # {
+/// #     winnow::token::take_while(occurrences, set)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -499,117 +483,65 @@
 #[doc(alias = "is_a")]
 #[doc(alias = "take_while0")]
 #[doc(alias = "take_while1")]
-pub fn take_while<T, I, Error: ParserError<I>>(
-    range: impl Into<Range>,
-    list: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
+pub fn take_while<Set, Input, Error>(
+    occurrences: impl Into<Range>,
+    set: Set,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
+    Input: StreamIsPartial + Stream,
+    Set: ContainsToken<<Input as Stream>::Token>,
+    Error: ParserError<Input>,
 {
     let Range {
         start_inclusive,
         end_inclusive,
-    } = range.into();
-    trace("take_while", move |i: &mut I| {
+    } = occurrences.into();
+    trace("take_while", move |i: &mut Input| {
         match (start_inclusive, end_inclusive) {
             (0, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_while0_::<_, _, _, true>(i, &list)
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till0::<_, _, _, true>(i, |c| !set.contains_token(c))
                 } else {
-                    take_while0_::<_, _, _, false>(i, &list)
+                    take_till0::<_, _, _, false>(i, |c| !set.contains_token(c))
                 }
             }
             (1, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_while1_::<_, _, _, true>(i, &list)
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till1::<_, _, _, true>(i, |c| !set.contains_token(c))
                 } else {
-                    take_while1_::<_, _, _, false>(i, &list)
+                    take_till1::<_, _, _, false>(i, |c| !set.contains_token(c))
                 }
             }
             (start, end) => {
                 let end = end.unwrap_or(usize::MAX);
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_while_m_n_::<_, _, _, true>(i, start, end, &list)
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till_m_n::<_, _, _, true>(i, start, end, |c| !set.contains_token(c))
                 } else {
-                    take_while_m_n_::<_, _, _, false>(i, start, end, &list)
+                    take_till_m_n::<_, _, _, false>(i, start, end, |c| !set.contains_token(c))
                 }
             }
         }
     })
 }
 
-fn take_while0_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
-    input: &mut I,
-    list: &T,
-) -> PResult<<I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
-{
-    if PARTIAL && input.is_partial() {
-        take_till0_partial(input, |c| !list.contains_token(c))
-    } else {
-        take_till0_complete(input, |c| !list.contains_token(c))
-    }
-}
-
-fn take_while1_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
-    input: &mut I,
-    list: &T,
-) -> PResult<<I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
-{
-    if PARTIAL && input.is_partial() {
-        take_till1_partial(input, |c| !list.contains_token(c))
-    } else {
-        take_till1_complete(input, |c| !list.contains_token(c))
-    }
-}
-
-fn take_while_m_n_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
-    input: &mut I,
-    m: usize,
-    n: usize,
-    list: &T,
-) -> PResult<<I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
-{
-    take_till_m_n::<_, _, _, PARTIAL>(input, m, n, |c| !list.contains_token(c))
-}
-
-/// Looks for the first element of the input type for which the condition returns true,
-/// and returns the input up to this position.
-///
-/// *Partial version*: If no element is found matching the condition, this will return `Incomplete`
-fn take_till0_partial<P, I: Stream, E: ParserError<I>>(
+fn take_till0<P, I: StreamIsPartial + Stream, E: ParserError<I>, const PARTIAL: bool>(
     input: &mut I,
     predicate: P,
 ) -> PResult<<I as Stream>::Slice, E>
 where
     P: Fn(I::Token) -> bool,
 {
-    let offset = input
-        .offset_for(predicate)
-        .ok_or_else(|| ErrMode::Incomplete(Needed::new(1)))?;
+    let offset = match input.offset_for(predicate) {
+        Some(offset) => offset,
+        None if PARTIAL && input.is_partial() => {
+            return Err(ErrMode::Incomplete(Needed::new(1)));
+        }
+        None => input.eof_offset(),
+    };
     Ok(input.next_slice(offset))
 }
 
-/// Looks for the first element of the input type for which the condition returns true
-/// and returns the input up to this position.
-///
-/// Fails if the produced slice is empty.
-///
-/// *Partial version*: If no element is found matching the condition, this will return `Incomplete`
-fn take_till1_partial<P, I: Stream, E: ParserError<I>>(
+fn take_till1<P, I: StreamIsPartial + Stream, E: ParserError<I>, const PARTIAL: bool>(
     input: &mut I,
     predicate: P,
 ) -> PResult<<I as Stream>::Slice, E>
@@ -617,50 +549,13 @@
     P: Fn(I::Token) -> bool,
 {
     let e: ErrorKind = ErrorKind::Slice;
-    let offset = input
-        .offset_for(predicate)
-        .ok_or_else(|| ErrMode::Incomplete(Needed::new(1)))?;
-    if offset == 0 {
-        Err(ErrMode::from_error_kind(input, e))
-    } else {
-        Ok(input.next_slice(offset))
-    }
-}
-
-/// Looks for the first element of the input type for which the condition returns true,
-/// and returns the input up to this position.
-///
-/// *Complete version*: If no element is found matching the condition, this will return the whole input
-fn take_till0_complete<P, I: Stream, E: ParserError<I>>(
-    input: &mut I,
-    predicate: P,
-) -> PResult<<I as Stream>::Slice, E>
-where
-    P: Fn(I::Token) -> bool,
-{
-    let offset = input
-        .offset_for(predicate)
-        .unwrap_or_else(|| input.eof_offset());
-    Ok(input.next_slice(offset))
-}
-
-/// Looks for the first element of the input type for which the condition returns true
-/// and returns the input up to this position.
-///
-/// Fails if the produced slice is empty.
-///
-/// *Complete version*: If no element is found matching the condition, this will return the whole input
-fn take_till1_complete<P, I: Stream, E: ParserError<I>>(
-    input: &mut I,
-    predicate: P,
-) -> PResult<<I as Stream>::Slice, E>
-where
-    P: Fn(I::Token) -> bool,
-{
-    let e: ErrorKind = ErrorKind::Slice;
-    let offset = input
-        .offset_for(predicate)
-        .unwrap_or_else(|| input.eof_offset());
+    let offset = match input.offset_for(predicate) {
+        Some(offset) => offset,
+        None if PARTIAL && input.is_partial() => {
+            return Err(ErrMode::Incomplete(Needed::new(1)));
+        }
+        None => input.eof_offset(),
+    };
     if offset == 0 {
         Err(ErrMode::from_error_kind(input, e))
     } else {
@@ -680,7 +575,10 @@
     P: Fn(I::Token) -> bool,
 {
     if n < m {
-        return Err(ErrMode::assert(input, "`m` should be <= `n`"));
+        return Err(ErrMode::assert(
+            input,
+            "`occurrences` should be ascending, rather than descending",
+        ));
     }
 
     let mut final_count = 0;
@@ -718,11 +616,31 @@
     }
 }
 
-/// Recognize the longest input slice (if any) till a [pattern][ContainsToken] is met.
+/// Recognize the longest input slice (if any) till a member of a [set of tokens][ContainsToken] is found.
 ///
-/// *Partial version* will return a `ErrMode::Incomplete(Needed::new(1))` if the match reaches the
+/// It doesn't consume the terminating token from the set.
+///
+/// *[Partial version][crate::_topic::partial]* will return a `ErrMode::Incomplete(Needed::new(1))` if the match reaches the
 /// end of input or if there was not match.
 ///
+/// See also
+/// - [`take_until`] for recognizing up-to a [`literal`] (w/ optional simd optimizations)
+/// - [`repeat_till`][crate::combinator::repeat_till] with [`Parser::take`] for taking tokens up to a [`Parser`]
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] with `0..` or `1..` [ranges][Range]:
+/// ```rust
+/// # use std::ops::RangeFrom;
+/// # use winnow::prelude::*;
+/// # use winnow::stream::ContainsToken;
+/// # use winnow::error::ContextError;
+/// pub fn take_till<'i>(occurrences: RangeFrom<usize>, set: impl ContainsToken<char>) -> impl Parser<&'i str, &'i str, ContextError>
+/// # {
+/// #     winnow::token::take_till(occurrences, set)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
@@ -757,191 +675,72 @@
 /// ```
 #[inline(always)]
 #[doc(alias = "is_not")]
-pub fn take_till<T, I, Error: ParserError<I>>(
-    range: impl Into<Range>,
-    list: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
+pub fn take_till<Set, Input, Error>(
+    occurrences: impl Into<Range>,
+    set: Set,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
+    Input: StreamIsPartial + Stream,
+    Set: ContainsToken<<Input as Stream>::Token>,
+    Error: ParserError<Input>,
 {
     let Range {
         start_inclusive,
         end_inclusive,
-    } = range.into();
-    trace("take_till", move |i: &mut I| {
+    } = occurrences.into();
+    trace("take_till", move |i: &mut Input| {
         match (start_inclusive, end_inclusive) {
             (0, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_till0_partial(i, |c| list.contains_token(c))
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till0::<_, _, _, true>(i, |c| set.contains_token(c))
                 } else {
-                    take_till0_complete(i, |c| list.contains_token(c))
+                    take_till0::<_, _, _, false>(i, |c| set.contains_token(c))
                 }
             }
             (1, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_till1_partial(i, |c| list.contains_token(c))
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till1::<_, _, _, true>(i, |c| set.contains_token(c))
                 } else {
-                    take_till1_complete(i, |c| list.contains_token(c))
+                    take_till1::<_, _, _, false>(i, |c| set.contains_token(c))
                 }
             }
             (start, end) => {
                 let end = end.unwrap_or(usize::MAX);
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_till_m_n::<_, _, _, true>(i, start, end, |c| list.contains_token(c))
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_till_m_n::<_, _, _, true>(i, start, end, |c| set.contains_token(c))
                 } else {
-                    take_till_m_n::<_, _, _, false>(i, start, end, |c| list.contains_token(c))
+                    take_till_m_n::<_, _, _, false>(i, start, end, |c| set.contains_token(c))
                 }
             }
         }
     })
 }
 
-/// Recognize the longest input slice (if any) till a [pattern][ContainsToken] is met.
-///
-/// *Partial version* will return a `ErrMode::Incomplete(Needed::new(1))` if the match reaches the
-/// end of input or if there was not match.
-///
-/// # Example
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError, error::Needed};
-/// # use winnow::prelude::*;
-/// use winnow::token::take_till0;
-///
-/// fn till_colon(s: &str) -> IResult<&str, &str> {
-///   take_till0(|c| c == ':').parse_peek(s)
-/// }
-///
-/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
-/// assert_eq!(till_colon(":empty matched"), Ok((":empty matched", ""))); //allowed
-/// assert_eq!(till_colon("12345"), Ok(("", "12345")));
-/// assert_eq!(till_colon(""), Ok(("", "")));
-/// ```
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::ErrorKind, error::InputError, error::Needed};
-/// # use winnow::prelude::*;
-/// # use winnow::Partial;
-/// use winnow::token::take_till0;
-///
-/// fn till_colon(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
-///   take_till0(|c| c == ':').parse_peek(s)
-/// }
-///
-/// assert_eq!(till_colon(Partial::new("latin:123")), Ok((Partial::new(":123"), "latin")));
-/// assert_eq!(till_colon(Partial::new(":empty matched")), Ok((Partial::new(":empty matched"), ""))); //allowed
-/// assert_eq!(till_colon(Partial::new("12345")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// assert_eq!(till_colon(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// ```
-#[deprecated(since = "0.5.21", note = "Replaced with `take_till(0.., ...)`")]
-#[inline(always)]
-pub fn take_till0<T, I, Error: ParserError<I>>(
-    list: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
-{
-    trace("take_till0", move |i: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() && i.is_partial() {
-            take_till0_partial(i, |c| list.contains_token(c))
-        } else {
-            take_till0_complete(i, |c| list.contains_token(c))
-        }
-    })
-}
-
-/// Recognize the longest (at least 1) input slice till a [pattern][ContainsToken] is met.
-///
-/// It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Slice)))` if the input is empty or the
-/// predicate matches the first input.
-///
-/// *Partial version* will return a `ErrMode::Incomplete(Needed::new(1))` if the match reaches the
-/// end of input or if there was not match.
-///
-/// # Example
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// # use winnow::prelude::*;
-/// use winnow::token::take_till1;
-///
-/// fn till_colon(s: &str) -> IResult<&str, &str> {
-///   take_till1(|c| c == ':').parse_peek(s)
-/// }
-///
-/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
-/// assert_eq!(till_colon(":empty matched"), Err(ErrMode::Backtrack(InputError::new(":empty matched", ErrorKind::Slice))));
-/// assert_eq!(till_colon("12345"), Ok(("", "12345")));
-/// assert_eq!(till_colon(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Slice))));
-///
-/// fn not_space(s: &str) -> IResult<&str, &str> {
-///   take_till1([' ', '\t', '\r', '\n']).parse_peek(s)
-/// }
-///
-/// assert_eq!(not_space("Hello, World!"), Ok((" World!", "Hello,")));
-/// assert_eq!(not_space("Sometimes\t"), Ok(("\t", "Sometimes")));
-/// assert_eq!(not_space("Nospace"), Ok(("", "Nospace")));
-/// assert_eq!(not_space(""), Err(ErrMode::Backtrack(InputError::new("", ErrorKind::Slice))));
-/// ```
-///
-/// ```rust
-/// # use winnow::{error::ErrMode, error::{InputError, ErrorKind}, error::Needed};
-/// # use winnow::prelude::*;
-/// # use winnow::Partial;
-/// use winnow::token::take_till1;
-///
-/// fn till_colon(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
-///   take_till1(|c| c == ':').parse_peek(s)
-/// }
-///
-/// assert_eq!(till_colon(Partial::new("latin:123")), Ok((Partial::new(":123"), "latin")));
-/// assert_eq!(till_colon(Partial::new(":empty matched")), Err(ErrMode::Backtrack(InputError::new(Partial::new(":empty matched"), ErrorKind::Slice))));
-/// assert_eq!(till_colon(Partial::new("12345")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// assert_eq!(till_colon(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
-///
-/// fn not_space(s: Partial<&str>) -> IResult<Partial<&str>, &str> {
-///   take_till1([' ', '\t', '\r', '\n']).parse_peek(s)
-/// }
-///
-/// assert_eq!(not_space(Partial::new("Hello, World!")), Ok((Partial::new(" World!"), "Hello,")));
-/// assert_eq!(not_space(Partial::new("Sometimes\t")), Ok((Partial::new("\t"), "Sometimes")));
-/// assert_eq!(not_space(Partial::new("Nospace")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// assert_eq!(not_space(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
-/// ```
-#[inline(always)]
-#[deprecated(since = "0.5.21", note = "Replaced with `take_till(1.., ...)`")]
-pub fn take_till1<T, I, Error: ParserError<I>>(
-    list: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream,
-    T: ContainsToken<<I as Stream>::Token>,
-{
-    trace("take_till1", move |i: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() && i.is_partial() {
-            take_till1_partial(i, |c| list.contains_token(c))
-        } else {
-            take_till1_complete(i, |c| list.contains_token(c))
-        }
-    })
-}
-
 /// Recognize an input slice containing the first N input elements (I[..N]).
 ///
 /// *Complete version*: It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Slice)))` if the input is shorter than the argument.
 ///
-/// *Partial version*: if the input has less than N elements, `take` will
+/// *[Partial version][crate::_topic::partial]*: if the input has less than N elements, `take` will
 /// return a `ErrMode::Incomplete(Needed::new(M))` where M is the number of
 /// additional bytes the parser would need to succeed.
 /// It is well defined for `&[u8]` as the number of elements is the byte size,
 /// but for types like `&str`, we cannot know how many bytes correspond for
 /// the next few chars, so the result will be `ErrMode::Incomplete(Needed::Unknown)`
 ///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] with `0..` or `1..` ranges:
+/// ```rust
+/// # use std::ops::RangeFrom;
+/// # use winnow::prelude::*;
+/// # use winnow::stream::ContainsToken;
+/// # use winnow::error::ContextError;
+/// pub fn take<'i>(token_count: usize) -> impl Parser<&'i str, &'i str, ContextError>
+/// # {
+/// #     winnow::token::take(token_count)
+/// # }
+/// ```
+///
 /// # Example
 ///
 /// ```rust
@@ -988,15 +787,17 @@
 /// assert_eq!(take6(Partial::new("short")), Err(ErrMode::Incomplete(Needed::Unknown)));
 /// ```
 #[inline(always)]
-pub fn take<C, I, Error: ParserError<I>>(count: C) -> impl Parser<I, <I as Stream>::Slice, Error>
+pub fn take<UsizeLike, Input, Error>(
+    token_count: UsizeLike,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream,
-    C: ToUsize,
+    Input: StreamIsPartial + Stream,
+    UsizeLike: ToUsize,
+    Error: ParserError<Input>,
 {
-    let c = count.to_usize();
-    trace("take", move |i: &mut I| {
-        if <I as StreamIsPartial>::is_partial_supported() {
+    let c = token_count.to_usize();
+    trace("take", move |i: &mut Input| {
+        if <Input as StreamIsPartial>::is_partial_supported() {
             take_::<_, _, true>(i, c)
         } else {
             take_::<_, _, false>(i, c)
@@ -1019,15 +820,34 @@
     }
 }
 
-/// Recognize the input slice up to the first occurrence of the literal.
+/// Recognize the input slice up to the first occurrence of a [literal].
 ///
-/// It doesn't consume the pattern.
+/// Feature `simd` will enable the use of [`memchr`](https://docs.rs/memchr/latest/memchr/).
+///
+/// It doesn't consume the literal.
 ///
 /// *Complete version*: It will return `Err(ErrMode::Backtrack(InputError::new(_, ErrorKind::Slice)))`
-/// if the pattern wasn't met.
+/// if the literal wasn't met.
 ///
-/// *Partial version*: will return a `ErrMode::Incomplete(Needed::new(N))` if the input doesn't
-/// contain the pattern or if the input is smaller than the pattern.
+/// *[Partial version][crate::_topic::partial]*: will return a `ErrMode::Incomplete(Needed::new(N))` if the input doesn't
+/// contain the literal or if the input is smaller than the literal.
+///
+/// See also
+/// - [`take_till`] for recognizing up-to a [set of tokens][ContainsToken]
+/// - [`repeat_till`][crate::combinator::repeat_till] with [`Parser::take`] for taking tokens up to a [`Parser`]
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream] with `0..` or `1..` [ranges][Range]:
+/// ```rust
+/// # use std::ops::RangeFrom;
+/// # use winnow::prelude::*;;
+/// # use winnow::error::ContextError;
+/// pub fn take_until(occurrences: RangeFrom<usize>, literal: &str) -> impl Parser<&str, &str, ContextError>
+/// # {
+/// #     winnow::token::take_until(occurrences, literal)
+/// # }
+/// ```
 ///
 /// # Example
 ///
@@ -1095,60 +915,47 @@
 /// assert_eq!(until_eof(Partial::new("eof")), Err(ErrMode::Backtrack(InputError::new(Partial::new("eof"), ErrorKind::Slice))));
 /// ```
 #[inline(always)]
-pub fn take_until<T, I, Error: ParserError<I>>(
-    range: impl Into<Range>,
-    tag: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
+pub fn take_until<Literal, Input, Error>(
+    occurrences: impl Into<Range>,
+    literal: Literal,
+) -> impl Parser<Input, <Input as Stream>::Slice, Error>
 where
-    I: StreamIsPartial,
-    I: Stream + FindSlice<T>,
-    T: SliceLen + Clone,
+    Input: StreamIsPartial + Stream + FindSlice<Literal>,
+    Literal: Clone,
+    Error: ParserError<Input>,
 {
     let Range {
         start_inclusive,
         end_inclusive,
-    } = range.into();
-    trace("take_until", move |i: &mut I| {
+    } = occurrences.into();
+    trace("take_until", move |i: &mut Input| {
         match (start_inclusive, end_inclusive) {
             (0, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_until0_::<_, _, _, true>(i, tag.clone())
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_until0_::<_, _, _, true>(i, literal.clone())
                 } else {
-                    take_until0_::<_, _, _, false>(i, tag.clone())
+                    take_until0_::<_, _, _, false>(i, literal.clone())
                 }
             }
             (1, None) => {
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_until1_::<_, _, _, true>(i, tag.clone())
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_until1_::<_, _, _, true>(i, literal.clone())
                 } else {
-                    take_until1_::<_, _, _, false>(i, tag.clone())
+                    take_until1_::<_, _, _, false>(i, literal.clone())
                 }
             }
             (start, end) => {
                 let end = end.unwrap_or(usize::MAX);
-                if <I as StreamIsPartial>::is_partial_supported() {
-                    take_until_m_n_::<_, _, _, true>(i, start, end, tag.clone())
+                if <Input as StreamIsPartial>::is_partial_supported() {
+                    take_until_m_n_::<_, _, _, true>(i, start, end, literal.clone())
                 } else {
-                    take_until_m_n_::<_, _, _, false>(i, start, end, tag.clone())
+                    take_until_m_n_::<_, _, _, false>(i, start, end, literal.clone())
                 }
             }
         }
     })
 }
 
-/// Deprecated, see [`take_until`]
-#[deprecated(since = "0.5.35", note = "Replaced with `take_until`")]
-pub fn take_until0<T, I, Error: ParserError<I>>(
-    tag: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream + FindSlice<T>,
-    T: SliceLen + Clone,
-{
-    take_until(0.., tag)
-}
-
 fn take_until0_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
     i: &mut I,
     t: T,
@@ -1156,29 +963,14 @@
 where
     I: StreamIsPartial,
     I: Stream + FindSlice<T>,
-    T: SliceLen,
 {
     match i.find_slice(t) {
-        Some(offset) => Ok(i.next_slice(offset)),
+        Some(range) => Ok(i.next_slice(range.start)),
         None if PARTIAL && i.is_partial() => Err(ErrMode::Incomplete(Needed::Unknown)),
         None => Err(ErrMode::from_error_kind(i, ErrorKind::Slice)),
     }
 }
 
-/// Deprecated, see [`take_until`]
-#[deprecated(since = "0.5.35", note = "Replaced with `take_until`")]
-#[inline(always)]
-pub fn take_until1<T, I, Error: ParserError<I>>(
-    tag: T,
-) -> impl Parser<I, <I as Stream>::Slice, Error>
-where
-    I: StreamIsPartial,
-    I: Stream + FindSlice<T>,
-    T: SliceLen + Clone,
-{
-    take_until(1.., tag)
-}
-
 fn take_until1_<T, I, Error: ParserError<I>, const PARTIAL: bool>(
     i: &mut I,
     t: T,
@@ -1186,12 +978,17 @@
 where
     I: StreamIsPartial,
     I: Stream + FindSlice<T>,
-    T: SliceLen,
 {
     match i.find_slice(t) {
         None if PARTIAL && i.is_partial() => Err(ErrMode::Incomplete(Needed::Unknown)),
-        None | Some(0) => Err(ErrMode::from_error_kind(i, ErrorKind::Slice)),
-        Some(offset) => Ok(i.next_slice(offset)),
+        None => Err(ErrMode::from_error_kind(i, ErrorKind::Slice)),
+        Some(range) => {
+            if range.start == 0 {
+                Err(ErrMode::from_error_kind(i, ErrorKind::Slice))
+            } else {
+                Ok(i.next_slice(range.start))
+            }
+        }
     }
 }
 
@@ -1204,29 +1001,105 @@
 where
     I: StreamIsPartial,
     I: Stream + FindSlice<T>,
-    T: SliceLen,
 {
     if end < start {
-        return Err(ErrMode::assert(i, "`start` should be <= `end`"));
+        return Err(ErrMode::assert(
+            i,
+            "`occurrences` should be ascending, rather than descending",
+        ));
     }
 
     match i.find_slice(t) {
-        Some(offset) => {
+        Some(range) => {
             let start_offset = i.offset_at(start);
             let end_offset = i.offset_at(end).unwrap_or_else(|_err| i.eof_offset());
-            if start_offset.map(|s| offset < s).unwrap_or(true) {
+            if start_offset.map(|s| range.start < s).unwrap_or(true) {
                 if PARTIAL && i.is_partial() {
                     return Err(ErrMode::Incomplete(Needed::Unknown));
                 } else {
                     return Err(ErrMode::from_error_kind(i, ErrorKind::Slice));
                 }
             }
-            if end_offset < offset {
+            if end_offset < range.start {
                 return Err(ErrMode::from_error_kind(i, ErrorKind::Slice));
             }
-            Ok(i.next_slice(offset))
+            Ok(i.next_slice(range.start))
         }
         None if PARTIAL && i.is_partial() => Err(ErrMode::Incomplete(Needed::Unknown)),
         None => Err(ErrMode::from_error_kind(i, ErrorKind::Slice)),
     }
 }
+
+/// Return the remaining input.
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn rest<'i>(input: &mut &'i str) -> PResult<&'i str>
+/// # {
+/// #     winnow::token::rest.parse_next(input)
+/// # }
+/// ```
+///
+/// # Example
+///
+/// ```rust
+/// # use winnow::prelude::*;
+/// # use winnow::error::ErrorKind;
+/// # use winnow::error::InputError;
+/// use winnow::token::rest;
+/// assert_eq!(rest::<_,InputError<_>>.parse_peek("abc"), Ok(("", "abc")));
+/// assert_eq!(rest::<_,InputError<_>>.parse_peek(""), Ok(("", "")));
+/// ```
+#[inline]
+pub fn rest<Input, Error>(input: &mut Input) -> PResult<<Input as Stream>::Slice, Error>
+where
+    Input: Stream,
+    Error: ParserError<Input>,
+{
+    trace("rest", move |input: &mut Input| Ok(input.finish())).parse_next(input)
+}
+
+/// Return the length of the remaining input.
+///
+/// <div class="warning">
+///
+/// Note: this does not advance the [`Stream`]
+///
+/// </div>
+///
+/// # Effective Signature
+///
+/// Assuming you are parsing a `&str` [Stream]:
+/// ```rust
+/// # use winnow::prelude::*;;
+/// pub fn rest_len(input: &mut &str) -> PResult<usize>
+/// # {
+/// #     winnow::token::rest_len.parse_next(input)
+/// # }
+/// ```
+///
+/// # Example
+///
+/// ```rust
+/// # use winnow::prelude::*;
+/// # use winnow::error::ErrorKind;
+/// # use winnow::error::InputError;
+/// use winnow::token::rest_len;
+/// assert_eq!(rest_len::<_,InputError<_>>.parse_peek("abc"), Ok(("abc", 3)));
+/// assert_eq!(rest_len::<_,InputError<_>>.parse_peek(""), Ok(("", 0)));
+/// ```
+#[inline]
+pub fn rest_len<Input, Error>(input: &mut Input) -> PResult<usize, Error>
+where
+    Input: Stream,
+    Error: ParserError<Input>,
+{
+    trace("rest_len", move |input: &mut Input| {
+        let len = input.eof_offset();
+        Ok(len)
+    })
+    .parse_next(input)
+}

crates/winnow/src/token/tests.rs

diff --git a/crates/winnow/src/token/tests.rs b/crates/winnow/src/token/tests.rs
index e8198f9..e00dca4 100644
--- a/crates/winnow/src/token/tests.rs
+++ b/crates/winnow/src/token/tests.rs
@@ -10,12 +10,19 @@
 use crate::error::InputError;
 use crate::error::Needed;
 use crate::stream::AsChar;
-use crate::token::tag;
+use crate::token::literal;
 use crate::unpeek;
 use crate::IResult;
 use crate::Parser;
 use crate::Partial;
 
+macro_rules! assert_parse(
+  ($left: expr, $right: expr) => {
+    let res: $crate::IResult<_, _, InputError<_>> = $left;
+    assert_eq!(res, $right);
+  };
+);
+
 #[test]
 fn complete_take_while_m_n_utf8_all_matching() {
     let result: IResult<&str, &str> =
@@ -98,6 +105,137 @@
 }
 
 #[test]
+fn complete_take_until_empty() {
+    fn take_until_empty(i: &str) -> IResult<&str, &str> {
+        take_until(0, "").parse_peek(i)
+    }
+    assert_eq!(take_until_empty(""), Ok(("", "")));
+    assert_eq!(take_until_empty("end"), Ok(("end", "")));
+}
+
+#[test]
+fn complete_literal_case_insensitive() {
+    fn caseless_bytes(i: &[u8]) -> IResult<&[u8], &[u8]> {
+        literal(Caseless("ABcd")).parse_peek(i)
+    }
+    assert_eq!(
+        caseless_bytes(&b"aBCdefgh"[..]),
+        Ok((&b"efgh"[..], &b"aBCd"[..]))
+    );
+    assert_eq!(
+        caseless_bytes(&b"abcdefgh"[..]),
+        Ok((&b"efgh"[..], &b"abcd"[..]))
+    );
+    assert_eq!(
+        caseless_bytes(&b"ABCDefgh"[..]),
+        Ok((&b"efgh"[..], &b"ABCD"[..]))
+    );
+    assert_eq!(
+        caseless_bytes(&b"ab"[..]),
+        Err(ErrMode::Backtrack(error_position!(
+            &&b"ab"[..],
+            ErrorKind::Tag
+        )))
+    );
+    assert_eq!(
+        caseless_bytes(&b"Hello"[..]),
+        Err(ErrMode::Backtrack(error_position!(
+            &&b"Hello"[..],
+            ErrorKind::Tag
+        )))
+    );
+    assert_eq!(
+        caseless_bytes(&b"Hel"[..]),
+        Err(ErrMode::Backtrack(error_position!(
+            &&b"Hel"[..],
+            ErrorKind::Tag
+        )))
+    );
+
+    fn caseless_str(i: &str) -> IResult<&str, &str> {
+        literal(Caseless("ABcd")).parse_peek(i)
+    }
+    assert_eq!(caseless_str("aBCdefgh"), Ok(("efgh", "aBCd")));
+    assert_eq!(caseless_str("abcdefgh"), Ok(("efgh", "abcd")));
+    assert_eq!(caseless_str("ABCDefgh"), Ok(("efgh", "ABCD")));
+    assert_eq!(
+        caseless_str("ab"),
+        Err(ErrMode::Backtrack(error_position!(&"ab", ErrorKind::Tag)))
+    );
+    assert_eq!(
+        caseless_str("Hello"),
+        Err(ErrMode::Backtrack(error_position!(
+            &"Hello",
+            ErrorKind::Tag
+        )))
+    );
+    assert_eq!(
+        caseless_str("Hel"),
+        Err(ErrMode::Backtrack(error_position!(&"Hel", ErrorKind::Tag)))
+    );
+
+    fn matches_kelvin(i: &str) -> IResult<&str, &str> {
+        literal(Caseless("k")).parse_peek(i)
+    }
+    assert_eq!(
+        matches_kelvin("K"),
+        Err(ErrMode::Backtrack(error_position!(&"K", ErrorKind::Tag)))
+    );
+
+    fn is_kelvin(i: &str) -> IResult<&str, &str> {
+        literal(Caseless("K")).parse_peek(i)
+    }
+    assert_eq!(
+        is_kelvin("k"),
+        Err(ErrMode::Backtrack(error_position!(&"k", ErrorKind::Tag)))
+    );
+}
+
+#[test]
+fn complete_literal_fixed_size_array() {
+    fn test(i: &[u8]) -> IResult<&[u8], &[u8]> {
+        literal([0x42]).parse_peek(i)
+    }
+    fn test2(i: &[u8]) -> IResult<&[u8], &[u8]> {
+        literal(&[0x42]).parse_peek(i)
+    }
+
+    let input = &[0x42, 0x00][..];
+    assert_eq!(test(input), Ok((&b"\x00"[..], &b"\x42"[..])));
+    assert_eq!(test2(input), Ok((&b"\x00"[..], &b"\x42"[..])));
+}
+
+#[test]
+fn complete_literal_char() {
+    fn test(i: &[u8]) -> IResult<&[u8], &[u8]> {
+        literal('B').parse_peek(i)
+    }
+    assert_eq!(test(&[0x42, 0x00][..]), Ok((&b"\x00"[..], &b"\x42"[..])));
+    assert_eq!(
+        test(&[b'A', b'\0'][..]),
+        Err(ErrMode::Backtrack(error_position!(
+            &&b"A\0"[..],
+            ErrorKind::Tag
+        )))
+    );
+}
+
+#[test]
+fn complete_literal_byte() {
+    fn test(i: &[u8]) -> IResult<&[u8], &[u8]> {
+        literal(b'B').parse_peek(i)
+    }
+    assert_eq!(test(&[0x42, 0x00][..]), Ok((&b"\x00"[..], &b"\x42"[..])));
+    assert_eq!(
+        test(&[b'A', b'\0'][..]),
+        Err(ErrMode::Backtrack(error_position!(
+            &&b"A\0"[..],
+            ErrorKind::Tag
+        )))
+    );
+}
+
+#[test]
 fn partial_any_str() {
     use super::any;
     assert_eq!(
@@ -134,7 +272,7 @@
 
 #[test]
 fn char_byteslice() {
-    fn f(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, u8> {
+    fn f(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, char> {
         'c'.parse_peek(i)
     }
 
@@ -143,12 +281,12 @@
         f(Partial::new(a)),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new(a),
-            ErrorKind::Verify
+            ErrorKind::Tag
         )))
     );
 
     let b = &b"cde"[..];
-    assert_eq!(f(Partial::new(b)), Ok((Partial::new(&b"de"[..]), b'c')));
+    assert_eq!(f(Partial::new(b)), Ok((Partial::new(&b"de"[..]), 'c')));
 }
 
 #[test]
@@ -162,7 +300,7 @@
         f(Partial::new(a)),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new(a),
-            ErrorKind::Verify
+            ErrorKind::Tag
         )))
     );
 
@@ -267,16 +405,14 @@
 }
 
 #[test]
-fn partial_recognize() {
+fn partial_take() {
     use crate::ascii::{
         alpha1 as alpha, alphanumeric1 as alphanumeric, digit1 as digit, hex_digit1 as hex_digit,
         multispace1 as multispace, oct_digit1 as oct_digit, space1 as space,
     };
 
     fn x(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        delimited("<!--", take(5_usize), "-->")
-            .recognize()
-            .parse_peek(i)
+        delimited("<!--", take(5_usize), "-->").take().parse_peek(i)
     }
     let r = x(Partial::new(&b"<!-- abc --> aaa"[..]));
     assert_eq!(r, Ok((Partial::new(&b" aaa"[..]), &b"<!-- abc -->"[..])));
@@ -284,43 +420,43 @@
     let semicolon = &b";"[..];
 
     fn ya(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        alpha.recognize().parse_peek(i)
+        alpha.take().parse_peek(i)
     }
     let ra = ya(Partial::new(&b"abc;"[..]));
     assert_eq!(ra, Ok((Partial::new(semicolon), &b"abc"[..])));
 
     fn yd(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        digit.recognize().parse_peek(i)
+        digit.take().parse_peek(i)
     }
     let rd = yd(Partial::new(&b"123;"[..]));
     assert_eq!(rd, Ok((Partial::new(semicolon), &b"123"[..])));
 
     fn yhd(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        hex_digit.recognize().parse_peek(i)
+        hex_digit.take().parse_peek(i)
     }
     let rhd = yhd(Partial::new(&b"123abcDEF;"[..]));
     assert_eq!(rhd, Ok((Partial::new(semicolon), &b"123abcDEF"[..])));
 
     fn yod(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        oct_digit.recognize().parse_peek(i)
+        oct_digit.take().parse_peek(i)
     }
     let rod = yod(Partial::new(&b"1234567;"[..]));
     assert_eq!(rod, Ok((Partial::new(semicolon), &b"1234567"[..])));
 
     fn yan(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        alphanumeric.recognize().parse_peek(i)
+        alphanumeric.take().parse_peek(i)
     }
     let ran = yan(Partial::new(&b"123abc;"[..]));
     assert_eq!(ran, Ok((Partial::new(semicolon), &b"123abc"[..])));
 
     fn ys(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        space.recognize().parse_peek(i)
+        space.take().parse_peek(i)
     }
     let rs = ys(Partial::new(&b" \t;"[..]));
     assert_eq!(rs, Ok((Partial::new(semicolon), &b" \t"[..])));
 
     fn yms(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        multispace.recognize().parse_peek(i)
+        multispace.take().parse_peek(i)
     }
     let rms = yms(Partial::new(&b" \t\r\n;"[..]));
     assert_eq!(rms, Ok((Partial::new(semicolon), &b" \t\r\n"[..])));
@@ -583,12 +719,12 @@
 
 #[test]
 #[cfg(feature = "std")]
-fn partial_recognize_take_while0() {
+fn partial_take_take_while0() {
     fn x(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
         take_while(0.., AsChar::is_alphanum).parse_peek(i)
     }
     fn y(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        unpeek(x).recognize().parse_peek(i)
+        unpeek(x).take().parse_peek(i)
     }
     assert_eq!(
         x(Partial::new(&b"ab."[..])),
@@ -600,87 +736,128 @@
     );
 }
 
-#[cfg(feature = "alloc")]
 #[test]
-fn partial_case_insensitive() {
-    fn test(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        tag(Caseless("ABcd")).parse_peek(i)
+fn partial_literal_case_insensitive() {
+    fn caseless_bytes(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
+        literal(Caseless("ABcd")).parse_peek(i)
     }
     assert_eq!(
-        test(Partial::new(&b"aBCdefgh"[..])),
+        caseless_bytes(Partial::new(&b"aBCdefgh"[..])),
         Ok((Partial::new(&b"efgh"[..]), &b"aBCd"[..]))
     );
     assert_eq!(
-        test(Partial::new(&b"abcdefgh"[..])),
+        caseless_bytes(Partial::new(&b"abcdefgh"[..])),
         Ok((Partial::new(&b"efgh"[..]), &b"abcd"[..]))
     );
     assert_eq!(
-        test(Partial::new(&b"ABCDefgh"[..])),
+        caseless_bytes(Partial::new(&b"ABCDefgh"[..])),
         Ok((Partial::new(&b"efgh"[..]), &b"ABCD"[..]))
     );
     assert_eq!(
-        test(Partial::new(&b"ab"[..])),
+        caseless_bytes(Partial::new(&b"ab"[..])),
         Err(ErrMode::Incomplete(Needed::new(2)))
     );
     assert_eq!(
-        test(Partial::new(&b"Hello"[..])),
+        caseless_bytes(Partial::new(&b"Hello"[..])),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new(&b"Hello"[..]),
             ErrorKind::Tag
         )))
     );
     assert_eq!(
-        test(Partial::new(&b"Hel"[..])),
+        caseless_bytes(Partial::new(&b"Hel"[..])),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new(&b"Hel"[..]),
             ErrorKind::Tag
         )))
     );
 
-    fn test2(i: Partial<&str>) -> IResult<Partial<&str>, &str> {
-        tag(Caseless("ABcd")).parse_peek(i)
+    fn caseless_str(i: Partial<&str>) -> IResult<Partial<&str>, &str> {
+        literal(Caseless("ABcd")).parse_peek(i)
     }
     assert_eq!(
-        test2(Partial::new("aBCdefgh")),
+        caseless_str(Partial::new("aBCdefgh")),
         Ok((Partial::new("efgh"), "aBCd"))
     );
     assert_eq!(
-        test2(Partial::new("abcdefgh")),
+        caseless_str(Partial::new("abcdefgh")),
         Ok((Partial::new("efgh"), "abcd"))
     );
     assert_eq!(
-        test2(Partial::new("ABCDefgh")),
+        caseless_str(Partial::new("ABCDefgh")),
         Ok((Partial::new("efgh"), "ABCD"))
     );
     assert_eq!(
-        test2(Partial::new("ab")),
+        caseless_str(Partial::new("ab")),
         Err(ErrMode::Incomplete(Needed::new(2)))
     );
     assert_eq!(
-        test2(Partial::new("Hello")),
+        caseless_str(Partial::new("Hello")),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new("Hello"),
             ErrorKind::Tag
         )))
     );
     assert_eq!(
-        test2(Partial::new("Hel")),
+        caseless_str(Partial::new("Hel")),
         Err(ErrMode::Backtrack(error_position!(
             &Partial::new("Hel"),
             ErrorKind::Tag
         )))
     );
+
+    fn matches_kelvin(i: Partial<&str>) -> IResult<Partial<&str>, &str> {
+        literal(Caseless("k")).parse_peek(i)
+    }
+    assert_eq!(
+        matches_kelvin(Partial::new("K")),
+        Err(ErrMode::Backtrack(error_position!(
+            &Partial::new("K"),
+            ErrorKind::Tag
+        )))
+    );
+
+    fn is_kelvin(i: Partial<&str>) -> IResult<Partial<&str>, &str> {
+        literal(Caseless("K")).parse_peek(i)
+    }
+    assert_eq!(
+        is_kelvin(Partial::new("k")),
+        Err(ErrMode::Backtrack(error_position!(
+            &Partial::new("k"),
+            ErrorKind::Tag
+        )))
+    );
 }
 
 #[test]
-fn partial_tag_fixed_size_array() {
+fn partial_literal_fixed_size_array() {
     fn test(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        tag([0x42]).parse_peek(i)
+        literal([0x42]).parse_peek(i)
     }
     fn test2(i: Partial<&[u8]>) -> IResult<Partial<&[u8]>, &[u8]> {
-        tag(&[0x42]).parse_peek(i)
+        literal(&[0x42]).parse_peek(i)
     }
     let input = Partial::new(&[0x42, 0x00][..]);
     assert_eq!(test(input), Ok((Partial::new(&b"\x00"[..]), &b"\x42"[..])));
     assert_eq!(test2(input), Ok((Partial::new(&b"\x00"[..]), &b"\x42"[..])));
 }
+
+#[test]
+fn rest_on_slices() {
+    let input: &[u8] = &b"Hello, world!"[..];
+    let empty: &[u8] = &b""[..];
+    assert_parse!(rest.parse_peek(input), Ok((empty, input)));
+}
+
+#[test]
+fn rest_on_strs() {
+    let input: &str = "Hello, world!";
+    let empty: &str = "";
+    assert_parse!(rest.parse_peek(input), Ok((empty, input)));
+}
+
+#[test]
+fn rest_len_on_slices() {
+    let input: &[u8] = &b"Hello, world!"[..];
+    assert_parse!(rest_len.parse_peek(input), Ok((input, input.len())));
+}

crates/winnow/src/trace.rs

diff --git a/crates/winnow/src/trace.rs b/crates/winnow/src/trace.rs
deleted file mode 100644
index 9c05576..0000000
--- a/crates/winnow/src/trace.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Deprecated, replaced with [`winnow::combinator`][crate::combinator]
-
-/// Deprecated, replaced with [`winnow::combinator::trace`][crate::combinator::trace]
-#[deprecated(since = "0.5.35", note = "Replaced with `winnow::combinator::trace`")]
-#[inline(always)]
-pub fn trace<I: crate::stream::Stream, O, E>(
-    name: impl crate::lib::std::fmt::Display,
-    parser: impl crate::Parser<I, O, E>,
-) -> impl crate::Parser<I, O, E> {
-    crate::combinator::trace(name, parser)
-}

pseudo_crate/Cargo.lock

diff --git a/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index a8d55ce..70a1107 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -193,8 +193,8 @@
  "flagset",
  "flate2",
  "fnv",
- "foreign-types",
- "foreign-types-shared",
+ "foreign-types 0.3.1",
+ "foreign-types-shared 0.1.0",
  "form_urlencoded",
  "fragile",
  "fs-err",
@@ -216,7 +216,7 @@
  "glam",
  "glob",
  "googletest",
- "googletest_macro 0.13.0",
+ "googletest_macro",
  "gpio-cdev",
  "grpcio",
  "grpcio-compiler",
@@ -338,7 +338,7 @@
  "predicates",
  "predicates-core",
  "predicates-tree",
- "prettyplease 0.2.25",
+ "prettyplease 0.2.29",
  "proc-macro2 1.0.93",
  "protobuf 3.2.0",
  "protobuf-codegen",
@@ -420,9 +420,9 @@
  "tokio-stream",
  "tokio-test",
  "tokio-util",
- "toml 0.8.10",
+ "toml 0.8.19",
  "toml_datetime",
- "toml_edit 0.22.4",
+ "toml_edit 0.22.20",
  "tonic",
  "tower",
  "tower-layer",
@@ -444,7 +444,7 @@
  "unicode-ident",
  "unicode-normalization",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.2.0",
  "unicode-xid 0.2.6",
  "uniffi",
  "uniffi_checksum_derive 0.28.3",
@@ -474,7 +474,7 @@
  "weak-table",
  "webpki",
  "which",
- "winnow",
+ "winnow 0.6.24",
  "x509-cert",
  "xml-rs",
  "yaml-rust",
@@ -536,7 +536,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.11",
  "yansi-term",
 ]
 
@@ -600,9 +600,9 @@
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arbitrary"
@@ -661,9 +661,9 @@
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -672,9 +672,9 @@
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2 1.0.93",
  "quote 1.0.38",
@@ -890,7 +890,7 @@
  "lazy_static",
  "lazycell",
  "log",
- "prettyplease 0.2.25",
+ "prettyplease 0.2.29",
  "proc-macro2 1.0.93",
  "quote 1.0.38",
  "regex",
@@ -1168,7 +1168,7 @@
  "bitflags 1.3.2",
  "strsim 0.8.0",
  "textwrap 0.11.0",
- "unicode-width",
+ "unicode-width 0.1.11",
  "vec_map",
 ]
 
@@ -1258,7 +1258,7 @@
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
  "termcolor",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -1319,12 +1319,6 @@
 checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b"
 
 [[package]]
-name = "const-cstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
-
-[[package]]
 name = "const-oid"
 version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1354,14 +1348,14 @@
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1378,13 +1372,13 @@
 
 [[package]]
 name = "core-text"
-version = "19.2.0"
+version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
 dependencies = [
  "core-foundation",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1594,9 +1588,9 @@
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
 
 [[package]]
 name = "debug_tree"
@@ -1669,24 +1663,24 @@
 ]
 
 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
 ]
 
 [[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1777,9 +1771,9 @@
 
 [[package]]
 name = "dwrote"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c"
+checksum = "70182709525a3632b2ba96b6569225467b18ecb4a77f46d255f713a6bebf05fd"
 dependencies = [
  "lazy_static",
  "libc",
@@ -1930,9 +1924,9 @@
 
 [[package]]
 name = "fdeflate"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
@@ -1976,9 +1970,9 @@
 
 [[package]]
 name = "float-ord"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
 
 [[package]]
 name = "fnv"
@@ -1988,19 +1982,19 @@
 
 [[package]]
 name = "font-kit"
-version = "0.11.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5"
+checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.7.0",
  "byteorder",
  "core-foundation",
  "core-graphics",
  "core-text",
- "dirs-next",
+ "dirs",
  "dwrote",
  "float-ord",
- "freetype",
+ "freetype-sys",
  "lazy_static",
  "libc",
  "log",
@@ -2017,7 +2011,28 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a21b40436003b2a1e22483c5ed6c3d25e755b6b3120f601cc22aa57e25dc9065"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.0",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.37",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2027,6 +2042,12 @@
 checksum = "baa1839fc3c5487b5e129ea4f774e3fd84e6c4607127315521bc014a722ebc9e"
 
 [[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
 name = "form_urlencoded"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2042,16 +2063,6 @@
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
-name = "freetype"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e"
-dependencies = [
- "freetype-sys",
- "libc",
-]
-
-[[package]]
 name = "freetype-sys"
 version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2286,11 +2297,11 @@
 
 [[package]]
 name = "googletest"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee44a233e2e661240ef77ed5de92ea9ecf70d4832963a8582a6681e1517f3673"
+checksum = "dce026f84cdd339bf71be01b24fe67470ee634282f68c1c4b563d00a9f002b05"
 dependencies = [
- "googletest_macro 0.11.0",
+ "googletest_macro",
  "num-traits",
  "regex",
  "rustversion",
@@ -2298,16 +2309,6 @@
 
 [[package]]
 name = "googletest_macro"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3057b7d1e628480193188ccb1a7850d034a3add3a350f4ed921b48e287ada9"
-dependencies = [
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "googletest_macro"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5070fa86976044fe2b004d874c10af5d1aed6d8f6a72ff93a6eb29cc87048bc"
@@ -2969,18 +2970,18 @@
 
 [[package]]
 name = "linkme"
-version = "0.3.10"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97f3302efc6ebb7b5f0810a1096dbbb44a536711a4576bc89264a8f9a1d634d8"
+checksum = "566336154b9e58a4f055f6dd4cbab62c7dc0826ce3c0a04e63b2d2ecd784cdae"
 dependencies = [
  "linkme-impl",
 ]
 
 [[package]]
 name = "linkme-impl"
-version = "0.3.10"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279a77bf40c85a08513aca203635b96610ebf0e37a92cb0cee76e04da100a426"
+checksum = "edbe595006d355eaf9ae11db92707d4338cd2384d16866131cc1afdbdd35d8d9"
 dependencies = [
  "proc-macro2 1.0.93",
  "quote 1.0.38",
@@ -3020,9 +3021,9 @@
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "lru-cache"
@@ -3163,7 +3164,7 @@
  "miette-derive",
  "once_cell",
  "thiserror 1.0.49",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -3598,7 +3599,7 @@
 dependencies = [
  "bitflags 2.7.0",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.1",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -3629,6 +3630,12 @@
 ]
 
 [[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
 name = "ordered-multimap"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3763,7 +3770,7 @@
  "heck",
  "pest",
  "pest_derive",
- "prettyplease 0.2.25",
+ "prettyplease 0.2.29",
  "proc-macro2 1.0.93",
  "quote 1.0.38",
  "serde",
@@ -3831,9 +3838,9 @@
 
 [[package]]
 name = "pest_generator"
-version = "2.7.6"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
@@ -3865,18 +3872,18 @@
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2 1.0.93",
  "quote 1.0.38",
@@ -3923,9 +3930,9 @@
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "chrono",
  "font-kit",
@@ -3949,9 +3956,9 @@
 
 [[package]]
 name = "plotters-bitmap"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cebbe1f70205299abc69e8b295035bb52a6a70ee35474ad10011f0a4efb8543"
+checksum = "72ce181e3f6bf82d6c1dc569103ca7b1bd964c60ba03d7e6cdfbb3e3eb7f7405"
 dependencies = [
  "gif",
  "image",
@@ -3969,9 +3976,9 @@
 
 [[package]]
 name = "png"
-version = "0.17.14"
+version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -4063,9 +4070,9 @@
 
 [[package]]
 name = "prettyplease"
-version = "0.2.25"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
 dependencies = [
  "proc-macro2 1.0.93",
  "syn 2.0.96",
@@ -5055,7 +5062,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -5066,7 +5073,7 @@
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -5308,14 +5315,14 @@
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.4",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
@@ -5335,7 +5342,7 @@
 dependencies = [
  "indexmap 2.4.0",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.37",
 ]
 
 [[package]]
@@ -5346,20 +5353,20 @@
 dependencies = [
  "indexmap 2.4.0",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.37",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.4"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap 2.4.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.24",
 ]
 
 [[package]]
@@ -5423,9 +5430,9 @@
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -5487,9 +5494,9 @@
 
 [[package]]
 name = "ttf-parser"
-version = "0.17.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "tungstenite"
@@ -5625,6 +5632,12 @@
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5649,9 +5662,9 @@
 
 [[package]]
 name = "uniffi_checksum_derive"
-version = "0.27.1"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae7e5a6c33b1dec3f255f57ec0b6af0f0b2bb3021868be1d5eec7a38e2905ebc"
+checksum = "d5c400339a9d1d17be34257d0b407e91d64af335e5b4fa49f4bf28467fc8d635"
 dependencies = [
  "quote 1.0.38",
  "syn 2.0.96",
@@ -5710,7 +5723,7 @@
  "anyhow",
  "bytes",
  "siphasher 0.3.11",
- "uniffi_checksum_derive 0.27.1",
+ "uniffi_checksum_derive 0.27.3",
 ]
 
 [[package]]
@@ -5796,9 +5809,9 @@
 
 [[package]]
 name = "uuid"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4"
+checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
 
 [[package]]
 name = "valuable"
@@ -6461,6 +6474,15 @@
 ]
 
 [[package]]
+name = "winnow"
+version = "0.6.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
 name = "wio"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6527,11 +6549,10 @@
 
 [[package]]
 name = "yeslogic-fontconfig-sys"
-version = "3.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386"
+checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd"
 dependencies = [
- "const-cstr",
  "dlib",
  "once_cell",
  "pkg-config",

pseudo_crate/Cargo.toml

diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 51dc17a..0ae1106 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -15,7 +15,7 @@
 anes = "=0.2.0"
 annotate-snippets = "=0.9.2"
 anstyle = "=1.0.10"
-anyhow = "=1.0.79"
+anyhow = "=1.0.95"
 arbitrary = "=1.4.1"
 arc-swap = "=1.7.1"
 argh = "=0.1.12"
@@ -23,8 +23,8 @@
 argh_shared = "=0.1.13"
 arrayvec = "=0.7.6"
 ash = "=0.37.3"
-async-stream = "=0.3.5"
-async-stream-impl = "=0.3.5"
+async-stream = "=0.3.6"
+async-stream-impl = "=0.3.6"
 async-task = "=4.7.1"
 async-trait = "=0.1.83"
 atomic = "=0.6.0"
@@ -82,7 +82,7 @@
 darling_core = "=0.20.10"
 darling_macro = "=0.20.10"
 dashmap = "=5.5.3"
-data-encoding = "=2.6.0"
+data-encoding = "=2.7.0"
 debug_tree = "=0.4.0"
 der = "=0.7.9"
 der_derive = "=0.7.3"
@@ -130,7 +130,7 @@
 getrandom = "=0.2.15"
 glam = "=0.29.2"
 glob = "=0.3.2"
-googletest = "=0.11.0"
+googletest = "=0.13.0"
 googletest_macro = "=0.13.0"
 gpio-cdev = "=0.6.0"
 grpcio = "=0.13.0"
@@ -173,11 +173,11 @@
 libusb1-sys = "=0.7.0"
 libz-sys = "=1.1.8"
 linked-hash-map = "=0.5.6"
-linkme = "=0.3.10"
-linkme-impl = "=0.3.10"
+linkme = "=0.3.31"
+linkme-impl = "=0.3.31"
 litrs = "=0.4.1"
 lock_api = "=0.4.12"
-log = "=0.4.22"
+log = "=0.4.25"
 lru-cache = "=0.1.2"
 lz4_flex = "=0.11.3"
 macaddr = "=1.0.1"
@@ -236,16 +236,16 @@
 percore = "=0.1.0"
 pest = "=2.7.15"
 pest_derive = "=2.7.6"
-pest_generator = "=2.7.6"
+pest_generator = "=2.7.15"
 pest_meta = "=2.7.15"
 petgraph = "=0.6.5"
-pin-project = "=1.1.3"
-pin-project-internal = "=1.1.3"
+pin-project = "=1.1.8"
+pin-project-internal = "=1.1.8"
 pin-project-lite = "=0.2.16"
 pin-utils = "=0.1.0"
 pkcs1 = "=0.7.5"
 pkcs8 = "=0.10.2"
-plotters = "=0.3.5"
+plotters = "=0.3.7"
 plotters-backend = "=0.3.7"
 plotters-svg = "=0.3.7"
 poll_token_derive = "=0.1.0"
@@ -253,7 +253,7 @@
 predicates = "=3.1.3"
 predicates-core = "=1.0.9"
 predicates-tree = "=1.0.11"
-prettyplease = "=0.2.25"
+prettyplease = "=0.2.29"
 proc-macro2 = "=1.0.93"
 protobuf = "=3.2.0"
 protobuf-codegen = "=3.2.0"
@@ -335,14 +335,14 @@
 tokio-stream = "=0.1.17"
 tokio-test = "=0.4.2"
 tokio-util = "=0.7.13"
-toml = "=0.8.10"
+toml = "=0.8.19"
 toml_datetime = "=0.6.8"
-toml_edit = "=0.22.4"
+toml_edit = "=0.22.20"
 tonic = "=0.11.0"
 tower = "=0.4.13"
 tower-layer = "=0.3.3"
 tower-service = "=0.3.3"
-tracing = "=0.1.40"
+tracing = "=0.1.41"
 tracing-attributes = "=0.1.28"
 tracing-core = "=0.1.33"
 tracing-subscriber = "=0.3.19"
@@ -359,7 +359,7 @@
 unicode-ident = "=1.0.8"
 unicode-normalization = "=0.1.24"
 unicode-segmentation = "=1.12.0"
-unicode-width = "=0.1.11"
+unicode-width = "=0.2.0"
 unicode-xid = "=0.2.6"
 uniffi = "=0.27.1"
 uniffi_checksum_derive = "=0.28.3"
@@ -372,7 +372,7 @@
 userfaultfd = "=0.8.1"
 userfaultfd-sys = "=0.5.0"
 utf-8 = "=0.7.6"
-uuid = "=1.11.1"
+uuid = "=1.12.0"
 vhost = "=0.8.1"
 vhost-user-backend = "=0.10.1"
 virtio-bindings = "=0.2.2"
@@ -389,7 +389,7 @@
 weak-table = "=0.3.2"
 webpki = "=0.22.4"
 which = "=4.4.0"
-winnow = "=0.5.37"
+winnow = "=0.6.24"
 x509-cert = "=0.2.5"
 xml-rs = "=0.8.19"
 yaml-rust = "=0.4.5"

pseudo_crate/deny.toml

diff --git a/pseudo_crate/deny.toml b/pseudo_crate/deny.toml
index bd776cf..a913d1c 100644
--- a/pseudo_crate/deny.toml
+++ b/pseudo_crate/deny.toml
@@ -30,6 +30,13 @@
     # particular target. target_features are currently not validated against
     # the actual valid features supported by the target architecture.
     #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
+    "aarch64-linux-android",
+    "armv7-linux-androideabi",
+    "i686-linux-android",
+    "i686-unknown-linux-gnu",
+    "riscv64-linux-android",
+    "x86_64-linux-android",
+    "x86_64-unknown-linux-gnu",
 ]
 # When creating the dependency graph used as the source of truth when checks are
 # executed, this field can be used to prune crates from the graph, removing them
@@ -64,9 +71,9 @@
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
 # The path where the advisory databases are cloned/fetched into
-#db-path = "$CARGO_HOME/advisory-dbs"
+db-path = "$CARGO_HOME/advisory-dbs"
 # The url(s) of the advisory databases to use
-#db-urls = ["https://github.com/rustsec/advisory-db"]
+db-urls = ["https://github.com/rustsec/advisory-db"]
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
@@ -89,6 +96,18 @@
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [
+    "0BSD",
+    "Apache-2.0",
+    "Apache-2.0 WITH LLVM-exception",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "ISC",
+    "MIT",
+    "MPL-2.0",
+    "OpenSSL",
+    "Unicode-DFS-2016",
+    "Zlib",
     #"MIT",
     #"Apache-2.0",
     #"Apache-2.0 WITH LLVM-exception",
@@ -109,20 +128,20 @@
 # Some crates don't have (easily) machine readable licensing information,
 # adding a clarification entry for it allows you to manually specify the
 # licensing information
-#[[licenses.clarify]]
+[[licenses.clarify]]
 # The package spec the clarification applies to
-#crate = "ring"
+crate = "ring"
 # The SPDX expression for the license requirements of the crate
-#expression = "MIT AND ISC AND OpenSSL"
+expression = "MIT AND ISC AND OpenSSL"
 # One or more files in the crate's source used as the "source of truth" for
 # the license expression. If the contents match, the clarification will be used
 # when running the license check, otherwise the clarification will be ignored
 # and the crate will be checked normally, which may produce warnings or errors
 # depending on the rest of your configuration
-#license-files = [
+license-files = [
 # Each entry is a crate relative path, and the (opaque) hash of its contents
-#{ path = "LICENSE", hash = 0xbd0eed23 }
-#]
+{ path = "LICENSE", hash = 0xbd0eed23 }
+]
 
 [licenses.private]
 # If true, ignores workspace crates that aren't published, or are only
@@ -142,7 +161,7 @@
 # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
 [bans]
 # Lint level for when multiple versions of the same crate are detected
-multiple-versions = "warn"
+multiple-versions = "allow"
 # Lint level for when a crate version requirement is `*`
 wildcards = "allow"
 # The graph highlighting used when creating dotgraphs for crates